From 5cd5661378114f556f00a6cdc35e883ebf009aec Mon Sep 17 00:00:00 2001 From: David Terry Date: Sun, 27 Oct 2019 14:09:57 +0100 Subject: python3Packages.pytest4: deterministic bytecode For reasons that are not clear to me, the pytest4 check phase produces a lot of non-deterministic bytecode files. This PR turns off bytecode generation and disables a test that force enables bytecode generation. --- pkgs/development/python-modules/pytest/4.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pytest/4.nix b/pkgs/development/python-modules/pytest/4.nix index 7a43a2e2517..3b3c7f66336 100644 --- a/pkgs/development/python-modules/pytest/4.nix +++ b/pkgs/development/python-modules/pytest/4.nix @@ -6,11 +6,6 @@ buildPythonPackage rec { version = "4.6.5"; pname = "pytest"; - preCheck = '' - # don't test bash builtins - rm testing/test_argcomplete.py - ''; - src = fetchPypi { inherit pname version; sha256 = "8fc39199bdda3d9d025d3b1f4eb99a192c20828030ea7c9a0d2840721de7d347"; @@ -25,7 +20,14 @@ buildPythonPackage rec { doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460 checkPhase = '' runHook preCheck - $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths" + + # don't test bash builtins + rm testing/test_argcomplete.py + + # determinism - this test writes non deterministic bytecode + rm -rf testing/test_assertrewrite.py + + PYTHONDONTWRITEBYTECODE=1 $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths" runHook postCheck ''; -- cgit v1.2.3 From 54816ec9590193e01208a4a20d617ff049877101 Mon Sep 17 00:00:00 2001 From: tilpner Date: Sat, 16 Nov 2019 13:52:14 +0100 Subject: weechatScripts: recurseIntoAttrs --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 914c4a01365..d7cd322e082 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21762,7 +21762,7 @@ in weechat = wrapWeechat weechat-unwrapped { }; - weechatScripts = dontRecurseIntoAttrs (callPackage ../applications/networking/irc/weechat/scripts { }); + weechatScripts = recurseIntoAttrs (callPackage ../applications/networking/irc/weechat/scripts { }); westonLite = weston.override { pango = null; -- cgit v1.2.3 From 757c7f377326205f3e04afe5d053c371600457f7 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 27 Nov 2019 15:44:32 -0600 Subject: docker-container: Remove /etc symlink The system output usually contains a symlink from /etc to the static configuration for the benefit of the stage-1 script in the initrd. The stage-2 script is usually started in the real root without such a symlink. In a container, there is no stage-1 and the system output is used directly as a real root. If the symlink is present, setup-etc.pl will create a symlink cycle and the system cannot boot. There is no reason for the /etc link to exist in a container because setup-etc.pl will create the necessary files. The container module will now remove the /etc symlink and create an empty directory. The empty /etc is for container managers to populate it with site-specific settings; for example, to set the hostname. This is required to boot NixOS in an LXC container on another host. See also: #9735 --- nixos/modules/profiles/docker-container.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/modules/profiles/docker-container.nix b/nixos/modules/profiles/docker-container.nix index 5d6b11498b5..183645de36f 100644 --- a/nixos/modules/profiles/docker-container.nix +++ b/nixos/modules/profiles/docker-container.nix @@ -2,6 +2,8 @@ with lib; +let inherit (pkgs) writeScript; in + let pkgs2storeContents = l : map (x: { object = x; symlink = "none"; }) l; @@ -30,7 +32,12 @@ in { ]; # Some container managers like lxc need these - extraCommands = "mkdir -p proc sys dev"; + extraCommands = + let script = writeScript "extra-commands.sh" '' + rm etc + mkdir -p proc sys dev etc + ''; + in script; }; boot.isContainer = true; -- cgit v1.2.3 From 0cf301d95f38c74cab403c424c6b318e3d5dfe79 Mon Sep 17 00:00:00 2001 From: tilpner Date: Mon, 2 Dec 2019 18:04:37 +0100 Subject: ferm: 2.4.1 -> 2.5 --- pkgs/tools/networking/ferm/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/ferm/default.nix b/pkgs/tools/networking/ferm/default.nix index 6f1660484e7..c2f8f2142c0 100644 --- a/pkgs/tools/networking/ferm/default.nix +++ b/pkgs/tools/networking/ferm/default.nix @@ -1,12 +1,14 @@ { stdenv, fetchurl, makeWrapper, perl, ebtables, ipset, iptables, nixosTests }: -stdenv.mkDerivation rec { - version = "2.4.1"; +let + inherit (stdenv.lib.versions) majorMinor; +in stdenv.mkDerivation rec { + version = "2.5"; pname = "ferm"; src = fetchurl { - url = "http://ferm.foo-projects.org/download/2.4/ferm-${version}.tar.xz"; - sha256 = "1fv8wk513yysp4q0i65rl2m0hg2lxwwgk9ppprsca1xcxrdpsvwa"; + url = "http://ferm.foo-projects.org/download/${majorMinor version}/ferm-${version}.tar.xz"; + sha256 = "0lxqcpirphihpvdqrh5kq0621aqq0h2vdy9q2v85gqdhd52js20p"; }; buildInputs = [ perl ipset ebtables iptables makeWrapper ]; -- cgit v1.2.3 From 706247fd107dc7048d38aeabec83f7ffe0df5879 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Fri, 6 Dec 2019 23:05:01 -0500 Subject: perlPackages.XMLParser: Work around cross-compilation regression MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since 2.44_01, the behaviour for `check_lib` in their `Makefile.PL` has been "fixed" to fail when the `assert_lib` function fails to build the test. * https://github.com/toddr/XML-Parser/commit/2bc1e90c04220a04a0b40d1047d464bc55f56210 Now, this wouldn't be so bad, since it's good to actually test what stuff is being compiled against. Except that *something* is wonky with the cross-compilation build-time Perl. ``` Undefined subroutine &File::Temp::mktemp called at inc/Devel/CheckLib.pm line 236. ``` As far as I know, this is a built-in function from Perl. * https://perldoc.perl.org/File/Temp.html Though, something *else* is wrong with `Checklib.pm`. Side-stepping the issue by (eww) shelling out to `mktemp`, we get these errors: ``` /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-armv7l-unknown-linux-gnueabihf-binutils-2.31.1/bin/armv7l-unknown-linux-gnueabihf-ld: assertlib_src1_0.553056903257133: file not recognized: file truncated collect2: error: ld returned 1 exit status -I/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-expat-2.2.8-armv7l-unknown-linux-gnueabihf-dev/include -L/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-expat-2.2.8-armv7l-unknown-linux-gnueabihf/lib -lexpat /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-armv7l-unknown-linux-gnueabihf-binutils-2.31.1/bin/armv7l-unknown-linux-gnueabihf-ld: assertlib_src2_0.262169388446154: file not recognized: file truncated collect2: error: ld returned 1 exit status Can't link/include C library 'expat.h', 'expat', aborting. ``` Meanwhile, the actual build, while building the library, seemingly has no issues building using those paths. `¯\_(ツ)_/¯` --- ...er-0001-HACK-Assumes-Expat-paths-are-good.patch | 45 ++++++++++++++++++++++ pkgs/top-level/perl-packages.nix | 3 +- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch diff --git a/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch b/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch new file mode 100644 index 00000000000..add6d9df3b7 --- /dev/null +++ b/pkgs/development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch @@ -0,0 +1,45 @@ +From e996904128653c67b04ddbdb1e10cef158098957 Mon Sep 17 00:00:00 2001 +From: Samuel Dionne-Riel +Date: Fri, 6 Dec 2019 23:00:51 -0500 +Subject: [PATCH] [HACK]: Assumes Expat paths are good. + +The `check_lib` check fails with the cross-compilation build platform's +Perl, since apparently `mktemp` is missing... + +Even then, side-stepping the issue, it seems it is not actually enough +to work, as the compilation fails. +--- + Makefile.PL | 17 +++++++++++------ + 1 file changed, 11 insertions(+), 6 deletions(-) + +diff --git a/Makefile.PL b/Makefile.PL +index 505d1df..fc38b76 100644 +--- a/Makefile.PL ++++ b/Makefile.PL +@@ -29,12 +29,17 @@ foreach (@ARGV) { + @ARGV = @replacement_args; + + unless ( +- check_lib( # fill in what you prompted the user for here +- lib => [qw(expat)], +- header => ['expat.h'], +- incpath => $expat_incpath, +- ( $expat_libpath ? ( libpath => $expat_libpath ) : () ), +- ) ++ #check_lib( # fill in what you prompted the user for here ++ # lib => [qw(expat)], ++ # header => ['expat.h'], ++ # incpath => $expat_incpath, ++ # ( $expat_libpath ? ( libpath => $expat_libpath ) : () ), ++ #) ++ # The check_lib implementation fails horribly with cross-compilation. ++ # We are giving known good paths to expat. ++ # And in all cases, the previous behaviour of not actually failing ++ # seemed to work just fine :/. ++ false + ) { + warn <<'Expat_Not_Installed;'; + +-- +2.23.0 + diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index e24c3a5f9a4..c221fd5eaaa 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -20404,7 +20404,8 @@ let url = mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.46.tar.gz; sha256 = "0pai3ik47q7rgnix9644c673fwydz52gqkxr9kxwq765j4j36cfk"; }; - patchPhase = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + patches = [ ../development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch ]; + postPatch = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' substituteInPlace Expat/Makefile.PL --replace 'use English;' '#' '' + stdenv.lib.optionalString stdenv.isCygwin '' sed -i"" -e "s@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. \$Config{_exe};@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. (\$^O eq 'cygwin' ? \"\" : \$Config{_exe});@" inc/Devel/CheckLib.pm -- cgit v1.2.3 From e9007b3e3ebc31db7ae893f325e3824e91fe85dd Mon Sep 17 00:00:00 2001 From: davidak Date: Fri, 6 Dec 2019 21:04:09 +0100 Subject: phoronix-test-suite: add tests --- pkgs/tools/misc/phoronix-test-suite/default.nix | 6 +++++- pkgs/tools/misc/phoronix-test-suite/tests.nix | 20 ++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/misc/phoronix-test-suite/tests.nix diff --git a/pkgs/tools/misc/phoronix-test-suite/default.nix b/pkgs/tools/misc/phoronix-test-suite/default.nix index 2436bbe4381..ebd317724f6 100644 --- a/pkgs/tools/misc/phoronix-test-suite/default.nix +++ b/pkgs/tools/misc/phoronix-test-suite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, php, which, gnused, makeWrapper, gnumake, gcc }: +{ stdenv, fetchurl, php, which, gnused, makeWrapper, gnumake, gcc, callPackage }: stdenv.mkDerivation rec { pname = "phoronix-test-suite"; @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { --prefix PATH : ${stdenv.lib.makeBinPath [ gnumake gcc ]} ''; + passthru.tests = { + simple-execution = callPackage ./tests.nix { }; + }; + meta = with stdenv.lib; { description = "Open-Source, Automated Benchmarking"; homepage = https://www.phoronix-test-suite.com/; diff --git a/pkgs/tools/misc/phoronix-test-suite/tests.nix b/pkgs/tools/misc/phoronix-test-suite/tests.nix new file mode 100644 index 00000000000..06bd9def9aa --- /dev/null +++ b/pkgs/tools/misc/phoronix-test-suite/tests.nix @@ -0,0 +1,20 @@ +{ runCommand, phoronix-test-suite }: + +let + inherit (phoronix-test-suite) pname version; +in + +runCommand "${pname}-tests" { meta.timeout = 3; } + '' + # automatic initial setup to prevent interactive questions + ${phoronix-test-suite}/bin/phoronix-test-suite enterprise-setup >/dev/null + # get version of installed program and compare with package version + if [[ `${phoronix-test-suite}/bin/phoronix-test-suite version` != *"${version}"* ]]; then + echo "Error: program version does not match package version" + exit 1 + fi + # run dummy command + ${phoronix-test-suite}/bin/phoronix-test-suite dummy_module.dummy-command >/dev/null + # needed for Nix to register the command as successful + touch $out + '' -- cgit v1.2.3 From 0dd0d03c32fb42fc54f6364f33985429efddeeeb Mon Sep 17 00:00:00 2001 From: Julien Langlois Date: Sun, 5 Jan 2020 16:22:33 -0500 Subject: profile-sync-daemon: fix psd-overlay-helper paths The installPhase for profile-sync-daemon does not properly replace all binary invocations in psd-overlay-help. This fixes it. --- pkgs/tools/misc/profile-sync-daemon/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix index c1496e0dbc9..d96feed7301 100644 --- a/pkgs/tools/misc/profile-sync-daemon/default.nix +++ b/pkgs/tools/misc/profile-sync-daemon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, utillinux}: +{ stdenv, fetchurl, utillinux, coreutils}: stdenv.mkDerivation rec { version = "6.35"; @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { # $HOME detection fails (and is unnecessary) sed -i '/^HOME/d' $out/bin/profile-sync-daemon substituteInPlace $out/bin/psd-overlay-helper \ - --replace "PATH=/usr/bin:/bin" "PATH=${utillinux.bin}/bin" + --replace "PATH=/usr/bin:/bin" "PATH=${utillinux.bin}/bin:${coreutils}/bin" \ + --replace "sudo " "/run/wrappers/bin/sudo " ''; preferLocalBuild = true; -- cgit v1.2.3 From a0c2892c060e6302d2a77ad420f31a45a6e03c66 Mon Sep 17 00:00:00 2001 From: "D. Guthrie" Date: Sat, 1 Feb 2020 22:21:31 +0000 Subject: Fix mg building on darwin. I am not happy with this at all. It avoids using libbsd at all on darwin because there are conflicting header files, particularly the header string.h. Ideally that would be the thing to fix. But in the meantime, this patch should do the trick. It declares a header file apple.h, which files include if target is darwin (checks for presence of __APPLE__). This header file also references the three source files futimens.c, reallocarray.c and strtonum.c. The former and latter are from https://github.com/ibara/mg which is another portable fork, but building against more platforms. From the OpenBSD source tree is _null.h and tree.h. There is a check so that if __APPLE__ is present then it will include them from this source tree. Now,the makefile GNUMakefile will not link against libbsd on darwin, by checking the output of uname in much the same way as it did already for FreeBSD. --- .../applications/editors/mg/darwin_no_libbsd.patch | 1402 ++++++++++++++++++++ pkgs/applications/editors/mg/default.nix | 13 +- 2 files changed, 1409 insertions(+), 6 deletions(-) create mode 100644 pkgs/applications/editors/mg/darwin_no_libbsd.patch diff --git a/pkgs/applications/editors/mg/darwin_no_libbsd.patch b/pkgs/applications/editors/mg/darwin_no_libbsd.patch new file mode 100644 index 00000000000..9b6df622324 --- /dev/null +++ b/pkgs/applications/editors/mg/darwin_no_libbsd.patch @@ -0,0 +1,1402 @@ +diff -Naur a/GNUmakefile b/GNUmakefile +--- a/GNUmakefile 2020-02-01 21:23:32.000000000 +0000 ++++ b/GNUmakefile 2020-02-01 21:56:01.000000000 +0000 +@@ -18,7 +18,7 @@ + STRIP= /usr/bin/strip + + UNAME:= $(shell uname) +-ifeq ($(UNAME),FreeBSD) ++ifeq ($(UNAME),Darwin) + BSD_CPPFLAGS:= + BSD_LIBS:= -lutil + else +@@ -35,11 +35,7 @@ + + CURSES_LIBS:= $(shell $(PKG_CONFIG) --libs ncurses) + ifeq ($(CURSES_LIBS),) +- $(error You probably need to install "libncurses5-dev" or "libncurses6-devel" or something like that.) +-endif +- +-ifdef STATIC +- LDFLAGS=-static -static-libgcc ++ $(error You probably need to install "libncurses5-dev" or "libnnurses6-devel" or something like that.) + endif + + CC?= gcc +@@ -47,14 +43,14 @@ + CFLAGS+= -g -Wall + CPPFLAGS= -DREGEX + CPPFLAGS+= -D_GNU_SOURCE +-CPPFLAGS+= $(BSD_CPPFLAGS) ++CPPFLAGS+= $(BSD_CPPFLAGS) -D__dead=__dead2 + LIBS= $(CURSES_LIBS) $(BSD_LIBS) + + + OBJS= autoexec.o basic.o bell.o buffer.o cinfo.o dir.o display.o \ +- echo.o extend.o file.o fileio.o funmap.o help.o kbd.o keymap.o \ ++ echo.o extend.o file.o fileio.o funmap.o futimens.o help.o kbd.o keymap.o \ + line.o macro.o main.o match.o modes.o paragraph.o \ +- re_search.o region.o search.o spawn.o tty.o ttyio.o ttykbd.o \ ++ re_search.o reallocarray.o region.o search.o spawn.o strtonum.o tty.o ttyio.o ttykbd.o \ + undo.o util.o version.o window.o word.o yank.o + OBJS+= cmode.o cscope.o dired.o grep.o tags.o + +@@ -68,6 +64,7 @@ + + all: $(name) + ++ + $(name): $(OBJS) + $(CC) $(LDFLAGS) $(OBJS) -o $(name) $(LIBS) + +diff -Naur a/_null.h b/_null.h +--- a/_null.h 1970-01-01 01:00:00.000000000 +0100 ++++ b/_null.h 2020-02-01 21:24:22.000000000 +0000 +@@ -0,0 +1,18 @@ ++/* $OpenBSD: _null.h,v 1.2 2016/09/09 22:07:58 millert Exp $ */ ++ ++/* ++ * Written by Todd C. Miller, September 9, 2016 ++ * Public domain. ++ */ ++ ++#ifndef NULL ++#if !defined(__cplusplus) ++#define NULL ((void *)0) ++#elif __cplusplus >= 201103L ++#define NULL nullptr ++#elif defined(__GNUG__) ++#define NULL __null ++#else ++#define NULL 0L ++#endif ++#endif +diff -Naur a/apple.h b/apple.h +--- a/apple.h 1970-01-01 01:00:00.000000000 +0100 ++++ b/apple.h 2020-02-01 21:41:50.000000000 +0000 +@@ -0,0 +1,27 @@ ++/* ++ * Mac OS X-specific support. ++ */ ++ ++#include ++#include ++ ++#include ++#include ++ ++/* ++ * fparseln() specific operation flags. ++ */ ++#define FPARSELN_UNESCESC 0x01 ++#define FPARSELN_UNESCCONT 0x02 ++#define FPARSELN_UNESCCOMM 0x04 ++#define FPARSELN_UNESCREST 0x08 ++#define FPARSELN_UNESCALL 0x0f ++ ++/* struct stat compatibilty */ ++#define st_atim st_atimespec ++#define st_mtim st_mtimespec ++#define st_ctim st_ctimespec ++ ++extern long long strtonum(const char *, long long, long long, const char **); ++extern void *reallocarray(void *, size_t, size_t); ++extern int futimens(int, const struct timespec[2]); +diff -Naur a/autoexec.c b/autoexec.c +--- a/autoexec.c 2020-02-01 21:23:32.000000000 +0000 ++++ b/autoexec.c 2020-02-01 21:34:02.000000000 +0000 +@@ -9,6 +9,9 @@ + #include + #include + ++#if defined(__APPLE__) ++# include "apple.h" ++#endif + #include "def.h" + #include "funmap.h" + +diff -Naur a/basic.c b/basic.c +--- a/basic.c 2020-02-01 21:23:32.000000000 +0000 ++++ b/basic.c 2020-02-01 21:34:26.000000000 +0000 +@@ -19,6 +19,9 @@ + #include + #include + ++#if defined(__APPLE__) ++# include "apple.h" ++#endif + #include "def.h" + + /* +diff -Naur a/cscope.c b/cscope.c +--- a/cscope.c 2020-02-01 21:23:32.000000000 +0000 ++++ b/cscope.c 2020-02-01 21:34:59.000000000 +0000 +@@ -20,6 +20,9 @@ + #include + #include + ++#if defined(__APPLE__) ++# include "apple.h" ++#endif + #include "def.h" + + #define CSSYMBOL 0 +diff -Naur a/display.c b/display.c +--- a/display.c 2020-02-01 21:23:32.000000000 +0000 ++++ b/display.c 2020-02-01 21:34:16.000000000 +0000 +@@ -19,6 +19,9 @@ + #include + #include + ++#if defined(__APPLE__) ++# include "apple.h" ++#endif + #include "def.h" + #include "kbd.h" + +diff -Naur a/fileio.c b/fileio.c +--- a/fileio.c 2020-02-01 21:23:32.000000000 +0000 ++++ b/fileio.c 2020-02-01 21:42:18.000000000 +0000 +@@ -1,4 +1,4 @@ +-/* $OpenBSD: fileio.c,v 1.105 2018/04/13 14:11:37 florian Exp $ */ ++/* $OpenBSD: fileio.c,v 1.104 2017/05/30 07:05:22 florian Exp $ */ + + /* This file is in the public domain. */ + +@@ -22,19 +22,13 @@ + #include + #include + #include +- ++#if defined(__APPLE__) ++# include "apple.h" ++#endif + #include "def.h" + #include "kbd.h" + #include "pathnames.h" + +-#ifndef MAXNAMLEN +-#define MAXNAMLEN 255 +-#endif +- +-#ifndef DEFFILEMODE +-#define DEFFILEMODE 0666 +-#endif +- + static char *bkuplocation(const char *); + static int bkupleavetmp(const char *); + +@@ -714,7 +708,7 @@ + struct stat statbuf; + const char *cp; + char user[LOGIN_NAME_MAX], path[NFILEN]; +- char *ret; ++ char *un, *ret; + size_t ulen, plen; + + path[0] = '\0'; +@@ -733,18 +727,21 @@ + return (NULL); + return(ret); + } +- if (ulen == 0) /* ~/ or ~ */ +- pw = getpwuid(geteuid()); +- else { /* ~user/ or ~user */ ++ if (ulen == 0) { /* ~/ or ~ */ ++ if ((un = getlogin()) != NULL) ++ (void)strlcpy(user, un, sizeof(user)); ++ else ++ user[0] = '\0'; ++ } else { /* ~user/ or ~user */ + memcpy(user, &fn[1], ulen); + user[ulen] = '\0'; +- pw = getpwnam(user); + } ++ pw = getpwnam(user); + if (pw != NULL) { + plen = strlcpy(path, pw->pw_dir, sizeof(path)); + if (plen == 0 || path[plen - 1] != '/') { + if (strlcat(path, "/", sizeof(path)) >= sizeof(path)) { +- dobeep(); ++ dobeep(); + ewprintf("Path too long"); + return (NULL); + } +diff -Naur a/futimens.c b/futimens.c +--- a/futimens.c 1970-01-01 01:00:00.000000000 +0100 ++++ b/futimens.c 2020-02-01 21:55:02.000000000 +0000 +@@ -0,0 +1,14 @@ ++/* This file is in the public domain. */ ++ ++#include ++ ++#include ++ ++int ++futimens(int fildes, const struct timespec times[2]) ++{ ++ struct timeval timevals[2]; ++ TIMESPEC_TO_TIMEVAL(&timevals[0], ×[0]); ++ TIMESPEC_TO_TIMEVAL(&timevals[1], ×[1]); ++ return futimes(fildes, timevals); ++} +diff -Naur a/grep.c b/grep.c +--- a/grep.c 2020-02-01 21:23:32.000000000 +0000 ++++ b/grep.c 2020-02-01 21:35:07.000000000 +0000 +@@ -16,6 +16,9 @@ + #include + #include + ++#if defined(__APPLE__) ++# include "apple.h" ++#endif + #include "def.h" + #include "kbd.h" + #include "funmap.h" +diff -Naur a/main.c b/main.c +--- a/main.c 2020-02-01 21:23:32.000000000 +0000 ++++ b/main.c 2020-02-01 21:34:42.000000000 +0000 +@@ -16,6 +16,9 @@ + #include + #include + ++#if defined(__APPLE__) ++# include "apple.h" ++#endif + #include "def.h" + #include "kbd.h" + #include "funmap.h" +diff -Naur a/paragraph.c b/paragraph.c +--- a/paragraph.c 2020-02-01 21:23:32.000000000 +0000 ++++ b/paragraph.c 2020-02-01 21:34:49.000000000 +0000 +@@ -14,6 +14,9 @@ + #include + #include + ++#if defined(__APPLE__) ++# include "apple.h" ++#endif + #include "def.h" + + static int fillcol = 70; +diff -Naur a/strtonum.c b/strtonum.c +--- a/strtonum.c 1970-01-01 01:00:00.000000000 +0100 ++++ b/strtonum.c 2020-02-01 21:55:24.000000000 +0000 +@@ -0,0 +1,65 @@ ++/* $OpenBSD: strtonum.c,v 1.7 2013/04/17 18:40:58 tedu Exp $ */ ++ ++/* ++ * Copyright (c) 2004 Ted Unangst and Todd Miller ++ * All rights reserved. ++ * ++ * Permission to use, copy, modify, and distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES ++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF ++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++#include ++#include ++#include ++ ++#define INVALID 1 ++#define TOOSMALL 2 ++#define TOOLARGE 3 ++ ++long long ++strtonum(const char *numstr, long long minval, long long maxval, ++ const char **errstrp) ++{ ++ long long ll = 0; ++ int error = 0; ++ char *ep; ++ struct errval { ++ const char *errstr; ++ int err; ++ } ev[4] = { ++ { NULL, 0 }, ++ { "invalid", EINVAL }, ++ { "too small", ERANGE }, ++ { "too large", ERANGE }, ++ }; ++ ++ ev[0].err = errno; ++ errno = 0; ++ if (minval > maxval) { ++ error = INVALID; ++ } else { ++ ll = strtoll(numstr, &ep, 10); ++ if (numstr == ep || *ep != '\0') ++ error = INVALID; ++ else if ((ll == LLONG_MIN && errno == ERANGE) || ll < minval) ++ error = TOOSMALL; ++ else if ((ll == LLONG_MAX && errno == ERANGE) || ll > maxval) ++ error = TOOLARGE; ++ } ++ if (errstrp != NULL) ++ *errstrp = ev[error].errstr; ++ errno = ev[error].err; ++ if (error) ++ ll = 0; ++ ++ return (ll); ++} +diff -Naur a/tags.c b/tags.c +--- a/tags.c 2020-02-01 21:23:32.000000000 +0000 ++++ b/tags.c 2020-02-01 21:27:56.000000000 +0000 +@@ -8,7 +8,11 @@ + + #include + #include +-#include ++#if defined(LIBBSD_OVERLAY) ++# include ++#else ++# include "tree.h" ++#endif + #include + #include + #include +@@ -18,11 +22,14 @@ + #include + #include + #include +-#if defined(LIBBSD_OVERLAY) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__GLIBC__) ++#if defined(LIBBSD_OVERLAY) || defined(__FreeBSD__) || defined(__GLIBC__) || defined(__APPLE__) + # include + #else + #include + #endif ++#if defined(__APPLE__) ++# include "apple.h" ++#endif + + #include "def.h" + +@@ -53,9 +60,6 @@ + char *pat; + }; + RB_HEAD(tagtree, ctag) tags = RB_INITIALIZER(&tags); +-#ifdef __DragonFly__ +-RB_PROTOTYPE(tagtree, ctag, entry, ctagcmp); +-#endif + RB_GENERATE(tagtree, ctag, entry, ctagcmp); + + struct tagpos { +diff -Naur a/tree.h b/tree.h +--- a/tree.h 1970-01-01 01:00:00.000000000 +0100 ++++ b/tree.h 2020-02-01 21:25:11.000000000 +0000 +@@ -0,0 +1,1006 @@ ++/* $OpenBSD: tree.h,v 1.29 2017/07/30 19:27:20 deraadt Exp $ */ ++/* ++ * Copyright 2002 Niels Provos ++ * All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * 1. Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * 2. Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in the ++ * documentation and/or other materials provided with the distribution. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR ++ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES ++ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ++ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, ++ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT ++ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, ++ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ++ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF ++ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ */ ++ ++#ifndef _SYS_TREE_H_ ++#define _SYS_TREE_H_ ++ ++#include "_null.h" ++ ++/* ++ * This file defines data structures for different types of trees: ++ * splay trees and red-black trees. ++ * ++ * A splay tree is a self-organizing data structure. Every operation ++ * on the tree causes a splay to happen. The splay moves the requested ++ * node to the root of the tree and partly rebalances it. ++ * ++ * This has the benefit that request locality causes faster lookups as ++ * the requested nodes move to the top of the tree. On the other hand, ++ * every lookup causes memory writes. ++ * ++ * The Balance Theorem bounds the total access time for m operations ++ * and n inserts on an initially empty tree as O((m + n)lg n). The ++ * amortized cost for a sequence of m accesses to a splay tree is O(lg n); ++ * ++ * A red-black tree is a binary search tree with the node color as an ++ * extra attribute. It fulfills a set of conditions: ++ * - every search path from the root to a leaf consists of the ++ * same number of black nodes, ++ * - each red node (except for the root) has a black parent, ++ * - each leaf node is black. ++ * ++ * Every operation on a red-black tree is bounded as O(lg n). ++ * The maximum height of a red-black tree is 2lg (n+1). ++ */ ++ ++#define SPLAY_HEAD(name, type) \ ++struct name { \ ++ struct type *sph_root; /* root of the tree */ \ ++} ++ ++#define SPLAY_INITIALIZER(root) \ ++ { NULL } ++ ++#define SPLAY_INIT(root) do { \ ++ (root)->sph_root = NULL; \ ++} while (0) ++ ++#define SPLAY_ENTRY(type) \ ++struct { \ ++ struct type *spe_left; /* left element */ \ ++ struct type *spe_right; /* right element */ \ ++} ++ ++#define SPLAY_LEFT(elm, field) (elm)->field.spe_left ++#define SPLAY_RIGHT(elm, field) (elm)->field.spe_right ++#define SPLAY_ROOT(head) (head)->sph_root ++#define SPLAY_EMPTY(head) (SPLAY_ROOT(head) == NULL) ++ ++/* SPLAY_ROTATE_{LEFT,RIGHT} expect that tmp hold SPLAY_{RIGHT,LEFT} */ ++#define SPLAY_ROTATE_RIGHT(head, tmp, field) do { \ ++ SPLAY_LEFT((head)->sph_root, field) = SPLAY_RIGHT(tmp, field); \ ++ SPLAY_RIGHT(tmp, field) = (head)->sph_root; \ ++ (head)->sph_root = tmp; \ ++} while (0) ++ ++#define SPLAY_ROTATE_LEFT(head, tmp, field) do { \ ++ SPLAY_RIGHT((head)->sph_root, field) = SPLAY_LEFT(tmp, field); \ ++ SPLAY_LEFT(tmp, field) = (head)->sph_root; \ ++ (head)->sph_root = tmp; \ ++} while (0) ++ ++#define SPLAY_LINKLEFT(head, tmp, field) do { \ ++ SPLAY_LEFT(tmp, field) = (head)->sph_root; \ ++ tmp = (head)->sph_root; \ ++ (head)->sph_root = SPLAY_LEFT((head)->sph_root, field); \ ++} while (0) ++ ++#define SPLAY_LINKRIGHT(head, tmp, field) do { \ ++ SPLAY_RIGHT(tmp, field) = (head)->sph_root; \ ++ tmp = (head)->sph_root; \ ++ (head)->sph_root = SPLAY_RIGHT((head)->sph_root, field); \ ++} while (0) ++ ++#define SPLAY_ASSEMBLE(head, node, left, right, field) do { \ ++ SPLAY_RIGHT(left, field) = SPLAY_LEFT((head)->sph_root, field); \ ++ SPLAY_LEFT(right, field) = SPLAY_RIGHT((head)->sph_root, field);\ ++ SPLAY_LEFT((head)->sph_root, field) = SPLAY_RIGHT(node, field); \ ++ SPLAY_RIGHT((head)->sph_root, field) = SPLAY_LEFT(node, field); \ ++} while (0) ++ ++/* Generates prototypes and inline functions */ ++ ++#define SPLAY_PROTOTYPE(name, type, field, cmp) \ ++void name##_SPLAY(struct name *, struct type *); \ ++void name##_SPLAY_MINMAX(struct name *, int); \ ++struct type *name##_SPLAY_INSERT(struct name *, struct type *); \ ++struct type *name##_SPLAY_REMOVE(struct name *, struct type *); \ ++ \ ++/* Finds the node with the same key as elm */ \ ++static __unused __inline struct type * \ ++name##_SPLAY_FIND(struct name *head, struct type *elm) \ ++{ \ ++ if (SPLAY_EMPTY(head)) \ ++ return(NULL); \ ++ name##_SPLAY(head, elm); \ ++ if ((cmp)(elm, (head)->sph_root) == 0) \ ++ return (head->sph_root); \ ++ return (NULL); \ ++} \ ++ \ ++static __unused __inline struct type * \ ++name##_SPLAY_NEXT(struct name *head, struct type *elm) \ ++{ \ ++ name##_SPLAY(head, elm); \ ++ if (SPLAY_RIGHT(elm, field) != NULL) { \ ++ elm = SPLAY_RIGHT(elm, field); \ ++ while (SPLAY_LEFT(elm, field) != NULL) { \ ++ elm = SPLAY_LEFT(elm, field); \ ++ } \ ++ } else \ ++ elm = NULL; \ ++ return (elm); \ ++} \ ++ \ ++static __unused __inline struct type * \ ++name##_SPLAY_MIN_MAX(struct name *head, int val) \ ++{ \ ++ name##_SPLAY_MINMAX(head, val); \ ++ return (SPLAY_ROOT(head)); \ ++} ++ ++/* Main splay operation. ++ * Moves node close to the key of elm to top ++ */ ++#define SPLAY_GENERATE(name, type, field, cmp) \ ++struct type * \ ++name##_SPLAY_INSERT(struct name *head, struct type *elm) \ ++{ \ ++ if (SPLAY_EMPTY(head)) { \ ++ SPLAY_LEFT(elm, field) = SPLAY_RIGHT(elm, field) = NULL; \ ++ } else { \ ++ int __comp; \ ++ name##_SPLAY(head, elm); \ ++ __comp = (cmp)(elm, (head)->sph_root); \ ++ if(__comp < 0) { \ ++ SPLAY_LEFT(elm, field) = SPLAY_LEFT((head)->sph_root, field);\ ++ SPLAY_RIGHT(elm, field) = (head)->sph_root; \ ++ SPLAY_LEFT((head)->sph_root, field) = NULL; \ ++ } else if (__comp > 0) { \ ++ SPLAY_RIGHT(elm, field) = SPLAY_RIGHT((head)->sph_root, field);\ ++ SPLAY_LEFT(elm, field) = (head)->sph_root; \ ++ SPLAY_RIGHT((head)->sph_root, field) = NULL; \ ++ } else \ ++ return ((head)->sph_root); \ ++ } \ ++ (head)->sph_root = (elm); \ ++ return (NULL); \ ++} \ ++ \ ++struct type * \ ++name##_SPLAY_REMOVE(struct name *head, struct type *elm) \ ++{ \ ++ struct type *__tmp; \ ++ if (SPLAY_EMPTY(head)) \ ++ return (NULL); \ ++ name##_SPLAY(head, elm); \ ++ if ((cmp)(elm, (head)->sph_root) == 0) { \ ++ if (SPLAY_LEFT((head)->sph_root, field) == NULL) { \ ++ (head)->sph_root = SPLAY_RIGHT((head)->sph_root, field);\ ++ } else { \ ++ __tmp = SPLAY_RIGHT((head)->sph_root, field); \ ++ (head)->sph_root = SPLAY_LEFT((head)->sph_root, field);\ ++ name##_SPLAY(head, elm); \ ++ SPLAY_RIGHT((head)->sph_root, field) = __tmp; \ ++ } \ ++ return (elm); \ ++ } \ ++ return (NULL); \ ++} \ ++ \ ++void \ ++name##_SPLAY(struct name *head, struct type *elm) \ ++{ \ ++ struct type __node, *__left, *__right, *__tmp; \ ++ int __comp; \ ++\ ++ SPLAY_LEFT(&__node, field) = SPLAY_RIGHT(&__node, field) = NULL;\ ++ __left = __right = &__node; \ ++\ ++ while ((__comp = (cmp)(elm, (head)->sph_root))) { \ ++ if (__comp < 0) { \ ++ __tmp = SPLAY_LEFT((head)->sph_root, field); \ ++ if (__tmp == NULL) \ ++ break; \ ++ if ((cmp)(elm, __tmp) < 0){ \ ++ SPLAY_ROTATE_RIGHT(head, __tmp, field); \ ++ if (SPLAY_LEFT((head)->sph_root, field) == NULL)\ ++ break; \ ++ } \ ++ SPLAY_LINKLEFT(head, __right, field); \ ++ } else if (__comp > 0) { \ ++ __tmp = SPLAY_RIGHT((head)->sph_root, field); \ ++ if (__tmp == NULL) \ ++ break; \ ++ if ((cmp)(elm, __tmp) > 0){ \ ++ SPLAY_ROTATE_LEFT(head, __tmp, field); \ ++ if (SPLAY_RIGHT((head)->sph_root, field) == NULL)\ ++ break; \ ++ } \ ++ SPLAY_LINKRIGHT(head, __left, field); \ ++ } \ ++ } \ ++ SPLAY_ASSEMBLE(head, &__node, __left, __right, field); \ ++} \ ++ \ ++/* Splay with either the minimum or the maximum element \ ++ * Used to find minimum or maximum element in tree. \ ++ */ \ ++void name##_SPLAY_MINMAX(struct name *head, int __comp) \ ++{ \ ++ struct type __node, *__left, *__right, *__tmp; \ ++\ ++ SPLAY_LEFT(&__node, field) = SPLAY_RIGHT(&__node, field) = NULL;\ ++ __left = __right = &__node; \ ++\ ++ while (1) { \ ++ if (__comp < 0) { \ ++ __tmp = SPLAY_LEFT((head)->sph_root, field); \ ++ if (__tmp == NULL) \ ++ break; \ ++ if (__comp < 0){ \ ++ SPLAY_ROTATE_RIGHT(head, __tmp, field); \ ++ if (SPLAY_LEFT((head)->sph_root, field) == NULL)\ ++ break; \ ++ } \ ++ SPLAY_LINKLEFT(head, __right, field); \ ++ } else if (__comp > 0) { \ ++ __tmp = SPLAY_RIGHT((head)->sph_root, field); \ ++ if (__tmp == NULL) \ ++ break; \ ++ if (__comp > 0) { \ ++ SPLAY_ROTATE_LEFT(head, __tmp, field); \ ++ if (SPLAY_RIGHT((head)->sph_root, field) == NULL)\ ++ break; \ ++ } \ ++ SPLAY_LINKRIGHT(head, __left, field); \ ++ } \ ++ } \ ++ SPLAY_ASSEMBLE(head, &__node, __left, __right, field); \ ++} ++ ++#define SPLAY_NEGINF -1 ++#define SPLAY_INF 1 ++ ++#define SPLAY_INSERT(name, x, y) name##_SPLAY_INSERT(x, y) ++#define SPLAY_REMOVE(name, x, y) name##_SPLAY_REMOVE(x, y) ++#define SPLAY_FIND(name, x, y) name##_SPLAY_FIND(x, y) ++#define SPLAY_NEXT(name, x, y) name##_SPLAY_NEXT(x, y) ++#define SPLAY_MIN(name, x) (SPLAY_EMPTY(x) ? NULL \ ++ : name##_SPLAY_MIN_MAX(x, SPLAY_NEGINF)) ++#define SPLAY_MAX(name, x) (SPLAY_EMPTY(x) ? NULL \ ++ : name##_SPLAY_MIN_MAX(x, SPLAY_INF)) ++ ++#define SPLAY_FOREACH(x, name, head) \ ++ for ((x) = SPLAY_MIN(name, head); \ ++ (x) != NULL; \ ++ (x) = SPLAY_NEXT(name, head, x)) ++ ++/* Macros that define a red-black tree */ ++#define RB_HEAD(name, type) \ ++struct name { \ ++ struct type *rbh_root; /* root of the tree */ \ ++} ++ ++#define RB_INITIALIZER(root) \ ++ { NULL } ++ ++#define RB_INIT(root) do { \ ++ (root)->rbh_root = NULL; \ ++} while (0) ++ ++#define RB_BLACK 0 ++#define RB_RED 1 ++#define RB_ENTRY(type) \ ++struct { \ ++ struct type *rbe_left; /* left element */ \ ++ struct type *rbe_right; /* right element */ \ ++ struct type *rbe_parent; /* parent element */ \ ++ int rbe_color; /* node color */ \ ++} ++ ++#define RB_LEFT(elm, field) (elm)->field.rbe_left ++#define RB_RIGHT(elm, field) (elm)->field.rbe_right ++#define RB_PARENT(elm, field) (elm)->field.rbe_parent ++#define RB_COLOR(elm, field) (elm)->field.rbe_color ++#define RB_ROOT(head) (head)->rbh_root ++#define RB_EMPTY(head) (RB_ROOT(head) == NULL) ++ ++#define RB_SET(elm, parent, field) do { \ ++ RB_PARENT(elm, field) = parent; \ ++ RB_LEFT(elm, field) = RB_RIGHT(elm, field) = NULL; \ ++ RB_COLOR(elm, field) = RB_RED; \ ++} while (0) ++ ++#define RB_SET_BLACKRED(black, red, field) do { \ ++ RB_COLOR(black, field) = RB_BLACK; \ ++ RB_COLOR(red, field) = RB_RED; \ ++} while (0) ++ ++#ifndef RB_AUGMENT ++#define RB_AUGMENT(x) do {} while (0) ++#endif ++ ++#define RB_ROTATE_LEFT(head, elm, tmp, field) do { \ ++ (tmp) = RB_RIGHT(elm, field); \ ++ if ((RB_RIGHT(elm, field) = RB_LEFT(tmp, field))) { \ ++ RB_PARENT(RB_LEFT(tmp, field), field) = (elm); \ ++ } \ ++ RB_AUGMENT(elm); \ ++ if ((RB_PARENT(tmp, field) = RB_PARENT(elm, field))) { \ ++ if ((elm) == RB_LEFT(RB_PARENT(elm, field), field)) \ ++ RB_LEFT(RB_PARENT(elm, field), field) = (tmp); \ ++ else \ ++ RB_RIGHT(RB_PARENT(elm, field), field) = (tmp); \ ++ } else \ ++ (head)->rbh_root = (tmp); \ ++ RB_LEFT(tmp, field) = (elm); \ ++ RB_PARENT(elm, field) = (tmp); \ ++ RB_AUGMENT(tmp); \ ++ if ((RB_PARENT(tmp, field))) \ ++ RB_AUGMENT(RB_PARENT(tmp, field)); \ ++} while (0) ++ ++#define RB_ROTATE_RIGHT(head, elm, tmp, field) do { \ ++ (tmp) = RB_LEFT(elm, field); \ ++ if ((RB_LEFT(elm, field) = RB_RIGHT(tmp, field))) { \ ++ RB_PARENT(RB_RIGHT(tmp, field), field) = (elm); \ ++ } \ ++ RB_AUGMENT(elm); \ ++ if ((RB_PARENT(tmp, field) = RB_PARENT(elm, field))) { \ ++ if ((elm) == RB_LEFT(RB_PARENT(elm, field), field)) \ ++ RB_LEFT(RB_PARENT(elm, field), field) = (tmp); \ ++ else \ ++ RB_RIGHT(RB_PARENT(elm, field), field) = (tmp); \ ++ } else \ ++ (head)->rbh_root = (tmp); \ ++ RB_RIGHT(tmp, field) = (elm); \ ++ RB_PARENT(elm, field) = (tmp); \ ++ RB_AUGMENT(tmp); \ ++ if ((RB_PARENT(tmp, field))) \ ++ RB_AUGMENT(RB_PARENT(tmp, field)); \ ++} while (0) ++ ++/* Generates prototypes and inline functions */ ++#define RB_PROTOTYPE(name, type, field, cmp) \ ++ RB_PROTOTYPE_INTERNAL(name, type, field, cmp,) ++#define RB_PROTOTYPE_STATIC(name, type, field, cmp) \ ++ RB_PROTOTYPE_INTERNAL(name, type, field, cmp, __attribute__((__unused__)) static) ++#define RB_PROTOTYPE_INTERNAL(name, type, field, cmp, attr) \ ++attr void name##_RB_INSERT_COLOR(struct name *, struct type *); \ ++attr void name##_RB_REMOVE_COLOR(struct name *, struct type *, struct type *);\ ++attr struct type *name##_RB_REMOVE(struct name *, struct type *); \ ++attr struct type *name##_RB_INSERT(struct name *, struct type *); \ ++attr struct type *name##_RB_FIND(struct name *, struct type *); \ ++attr struct type *name##_RB_NFIND(struct name *, struct type *); \ ++attr struct type *name##_RB_NEXT(struct type *); \ ++attr struct type *name##_RB_PREV(struct type *); \ ++attr struct type *name##_RB_MINMAX(struct name *, int); \ ++ \ ++ ++/* Main rb operation. ++ * Moves node close to the key of elm to top ++ */ ++#define RB_GENERATE(name, type, field, cmp) \ ++ RB_GENERATE_INTERNAL(name, type, field, cmp,) ++#define RB_GENERATE_STATIC(name, type, field, cmp) \ ++ RB_GENERATE_INTERNAL(name, type, field, cmp, __attribute__((__unused__)) static) ++#define RB_GENERATE_INTERNAL(name, type, field, cmp, attr) \ ++attr void \ ++name##_RB_INSERT_COLOR(struct name *head, struct type *elm) \ ++{ \ ++ struct type *parent, *gparent, *tmp; \ ++ while ((parent = RB_PARENT(elm, field)) && \ ++ RB_COLOR(parent, field) == RB_RED) { \ ++ gparent = RB_PARENT(parent, field); \ ++ if (parent == RB_LEFT(gparent, field)) { \ ++ tmp = RB_RIGHT(gparent, field); \ ++ if (tmp && RB_COLOR(tmp, field) == RB_RED) { \ ++ RB_COLOR(tmp, field) = RB_BLACK; \ ++ RB_SET_BLACKRED(parent, gparent, field);\ ++ elm = gparent; \ ++ continue; \ ++ } \ ++ if (RB_RIGHT(parent, field) == elm) { \ ++ RB_ROTATE_LEFT(head, parent, tmp, field);\ ++ tmp = parent; \ ++ parent = elm; \ ++ elm = tmp; \ ++ } \ ++ RB_SET_BLACKRED(parent, gparent, field); \ ++ RB_ROTATE_RIGHT(head, gparent, tmp, field); \ ++ } else { \ ++ tmp = RB_LEFT(gparent, field); \ ++ if (tmp && RB_COLOR(tmp, field) == RB_RED) { \ ++ RB_COLOR(tmp, field) = RB_BLACK; \ ++ RB_SET_BLACKRED(parent, gparent, field);\ ++ elm = gparent; \ ++ continue; \ ++ } \ ++ if (RB_LEFT(parent, field) == elm) { \ ++ RB_ROTATE_RIGHT(head, parent, tmp, field);\ ++ tmp = parent; \ ++ parent = elm; \ ++ elm = tmp; \ ++ } \ ++ RB_SET_BLACKRED(parent, gparent, field); \ ++ RB_ROTATE_LEFT(head, gparent, tmp, field); \ ++ } \ ++ } \ ++ RB_COLOR(head->rbh_root, field) = RB_BLACK; \ ++} \ ++ \ ++attr void \ ++name##_RB_REMOVE_COLOR(struct name *head, struct type *parent, struct type *elm) \ ++{ \ ++ struct type *tmp; \ ++ while ((elm == NULL || RB_COLOR(elm, field) == RB_BLACK) && \ ++ elm != RB_ROOT(head)) { \ ++ if (RB_LEFT(parent, field) == elm) { \ ++ tmp = RB_RIGHT(parent, field); \ ++ if (RB_COLOR(tmp, field) == RB_RED) { \ ++ RB_SET_BLACKRED(tmp, parent, field); \ ++ RB_ROTATE_LEFT(head, parent, tmp, field);\ ++ tmp = RB_RIGHT(parent, field); \ ++ } \ ++ if ((RB_LEFT(tmp, field) == NULL || \ ++ RB_COLOR(RB_LEFT(tmp, field), field) == RB_BLACK) &&\ ++ (RB_RIGHT(tmp, field) == NULL || \ ++ RB_COLOR(RB_RIGHT(tmp, field), field) == RB_BLACK)) {\ ++ RB_COLOR(tmp, field) = RB_RED; \ ++ elm = parent; \ ++ parent = RB_PARENT(elm, field); \ ++ } else { \ ++ if (RB_RIGHT(tmp, field) == NULL || \ ++ RB_COLOR(RB_RIGHT(tmp, field), field) == RB_BLACK) {\ ++ struct type *oleft; \ ++ if ((oleft = RB_LEFT(tmp, field)))\ ++ RB_COLOR(oleft, field) = RB_BLACK;\ ++ RB_COLOR(tmp, field) = RB_RED; \ ++ RB_ROTATE_RIGHT(head, tmp, oleft, field);\ ++ tmp = RB_RIGHT(parent, field); \ ++ } \ ++ RB_COLOR(tmp, field) = RB_COLOR(parent, field);\ ++ RB_COLOR(parent, field) = RB_BLACK; \ ++ if (RB_RIGHT(tmp, field)) \ ++ RB_COLOR(RB_RIGHT(tmp, field), field) = RB_BLACK;\ ++ RB_ROTATE_LEFT(head, parent, tmp, field);\ ++ elm = RB_ROOT(head); \ ++ break; \ ++ } \ ++ } else { \ ++ tmp = RB_LEFT(parent, field); \ ++ if (RB_COLOR(tmp, field) == RB_RED) { \ ++ RB_SET_BLACKRED(tmp, parent, field); \ ++ RB_ROTATE_RIGHT(head, parent, tmp, field);\ ++ tmp = RB_LEFT(parent, field); \ ++ } \ ++ if ((RB_LEFT(tmp, field) == NULL || \ ++ RB_COLOR(RB_LEFT(tmp, field), field) == RB_BLACK) &&\ ++ (RB_RIGHT(tmp, field) == NULL || \ ++ RB_COLOR(RB_RIGHT(tmp, field), field) == RB_BLACK)) {\ ++ RB_COLOR(tmp, field) = RB_RED; \ ++ elm = parent; \ ++ parent = RB_PARENT(elm, field); \ ++ } else { \ ++ if (RB_LEFT(tmp, field) == NULL || \ ++ RB_COLOR(RB_LEFT(tmp, field), field) == RB_BLACK) {\ ++ struct type *oright; \ ++ if ((oright = RB_RIGHT(tmp, field)))\ ++ RB_COLOR(oright, field) = RB_BLACK;\ ++ RB_COLOR(tmp, field) = RB_RED; \ ++ RB_ROTATE_LEFT(head, tmp, oright, field);\ ++ tmp = RB_LEFT(parent, field); \ ++ } \ ++ RB_COLOR(tmp, field) = RB_COLOR(parent, field);\ ++ RB_COLOR(parent, field) = RB_BLACK; \ ++ if (RB_LEFT(tmp, field)) \ ++ RB_COLOR(RB_LEFT(tmp, field), field) = RB_BLACK;\ ++ RB_ROTATE_RIGHT(head, parent, tmp, field);\ ++ elm = RB_ROOT(head); \ ++ break; \ ++ } \ ++ } \ ++ } \ ++ if (elm) \ ++ RB_COLOR(elm, field) = RB_BLACK; \ ++} \ ++ \ ++attr struct type * \ ++name##_RB_REMOVE(struct name *head, struct type *elm) \ ++{ \ ++ struct type *child, *parent, *old = elm; \ ++ int color; \ ++ if (RB_LEFT(elm, field) == NULL) \ ++ child = RB_RIGHT(elm, field); \ ++ else if (RB_RIGHT(elm, field) == NULL) \ ++ child = RB_LEFT(elm, field); \ ++ else { \ ++ struct type *left; \ ++ elm = RB_RIGHT(elm, field); \ ++ while ((left = RB_LEFT(elm, field))) \ ++ elm = left; \ ++ child = RB_RIGHT(elm, field); \ ++ parent = RB_PARENT(elm, field); \ ++ color = RB_COLOR(elm, field); \ ++ if (child) \ ++ RB_PARENT(child, field) = parent; \ ++ if (parent) { \ ++ if (RB_LEFT(parent, field) == elm) \ ++ RB_LEFT(parent, field) = child; \ ++ else \ ++ RB_RIGHT(parent, field) = child; \ ++ RB_AUGMENT(parent); \ ++ } else \ ++ RB_ROOT(head) = child; \ ++ if (RB_PARENT(elm, field) == old) \ ++ parent = elm; \ ++ (elm)->field = (old)->field; \ ++ if (RB_PARENT(old, field)) { \ ++ if (RB_LEFT(RB_PARENT(old, field), field) == old)\ ++ RB_LEFT(RB_PARENT(old, field), field) = elm;\ ++ else \ ++ RB_RIGHT(RB_PARENT(old, field), field) = elm;\ ++ RB_AUGMENT(RB_PARENT(old, field)); \ ++ } else \ ++ RB_ROOT(head) = elm; \ ++ RB_PARENT(RB_LEFT(old, field), field) = elm; \ ++ if (RB_RIGHT(old, field)) \ ++ RB_PARENT(RB_RIGHT(old, field), field) = elm; \ ++ if (parent) { \ ++ left = parent; \ ++ do { \ ++ RB_AUGMENT(left); \ ++ } while ((left = RB_PARENT(left, field))); \ ++ } \ ++ goto color; \ ++ } \ ++ parent = RB_PARENT(elm, field); \ ++ color = RB_COLOR(elm, field); \ ++ if (child) \ ++ RB_PARENT(child, field) = parent; \ ++ if (parent) { \ ++ if (RB_LEFT(parent, field) == elm) \ ++ RB_LEFT(parent, field) = child; \ ++ else \ ++ RB_RIGHT(parent, field) = child; \ ++ RB_AUGMENT(parent); \ ++ } else \ ++ RB_ROOT(head) = child; \ ++color: \ ++ if (color == RB_BLACK) \ ++ name##_RB_REMOVE_COLOR(head, parent, child); \ ++ return (old); \ ++} \ ++ \ ++/* Inserts a node into the RB tree */ \ ++attr struct type * \ ++name##_RB_INSERT(struct name *head, struct type *elm) \ ++{ \ ++ struct type *tmp; \ ++ struct type *parent = NULL; \ ++ int comp = 0; \ ++ tmp = RB_ROOT(head); \ ++ while (tmp) { \ ++ parent = tmp; \ ++ comp = (cmp)(elm, parent); \ ++ if (comp < 0) \ ++ tmp = RB_LEFT(tmp, field); \ ++ else if (comp > 0) \ ++ tmp = RB_RIGHT(tmp, field); \ ++ else \ ++ return (tmp); \ ++ } \ ++ RB_SET(elm, parent, field); \ ++ if (parent != NULL) { \ ++ if (comp < 0) \ ++ RB_LEFT(parent, field) = elm; \ ++ else \ ++ RB_RIGHT(parent, field) = elm; \ ++ RB_AUGMENT(parent); \ ++ } else \ ++ RB_ROOT(head) = elm; \ ++ name##_RB_INSERT_COLOR(head, elm); \ ++ return (NULL); \ ++} \ ++ \ ++/* Finds the node with the same key as elm */ \ ++attr struct type * \ ++name##_RB_FIND(struct name *head, struct type *elm) \ ++{ \ ++ struct type *tmp = RB_ROOT(head); \ ++ int comp; \ ++ while (tmp) { \ ++ comp = cmp(elm, tmp); \ ++ if (comp < 0) \ ++ tmp = RB_LEFT(tmp, field); \ ++ else if (comp > 0) \ ++ tmp = RB_RIGHT(tmp, field); \ ++ else \ ++ return (tmp); \ ++ } \ ++ return (NULL); \ ++} \ ++ \ ++/* Finds the first node greater than or equal to the search key */ \ ++attr struct type * \ ++name##_RB_NFIND(struct name *head, struct type *elm) \ ++{ \ ++ struct type *tmp = RB_ROOT(head); \ ++ struct type *res = NULL; \ ++ int comp; \ ++ while (tmp) { \ ++ comp = cmp(elm, tmp); \ ++ if (comp < 0) { \ ++ res = tmp; \ ++ tmp = RB_LEFT(tmp, field); \ ++ } \ ++ else if (comp > 0) \ ++ tmp = RB_RIGHT(tmp, field); \ ++ else \ ++ return (tmp); \ ++ } \ ++ return (res); \ ++} \ ++ \ ++/* ARGSUSED */ \ ++attr struct type * \ ++name##_RB_NEXT(struct type *elm) \ ++{ \ ++ if (RB_RIGHT(elm, field)) { \ ++ elm = RB_RIGHT(elm, field); \ ++ while (RB_LEFT(elm, field)) \ ++ elm = RB_LEFT(elm, field); \ ++ } else { \ ++ if (RB_PARENT(elm, field) && \ ++ (elm == RB_LEFT(RB_PARENT(elm, field), field))) \ ++ elm = RB_PARENT(elm, field); \ ++ else { \ ++ while (RB_PARENT(elm, field) && \ ++ (elm == RB_RIGHT(RB_PARENT(elm, field), field)))\ ++ elm = RB_PARENT(elm, field); \ ++ elm = RB_PARENT(elm, field); \ ++ } \ ++ } \ ++ return (elm); \ ++} \ ++ \ ++/* ARGSUSED */ \ ++attr struct type * \ ++name##_RB_PREV(struct type *elm) \ ++{ \ ++ if (RB_LEFT(elm, field)) { \ ++ elm = RB_LEFT(elm, field); \ ++ while (RB_RIGHT(elm, field)) \ ++ elm = RB_RIGHT(elm, field); \ ++ } else { \ ++ if (RB_PARENT(elm, field) && \ ++ (elm == RB_RIGHT(RB_PARENT(elm, field), field))) \ ++ elm = RB_PARENT(elm, field); \ ++ else { \ ++ while (RB_PARENT(elm, field) && \ ++ (elm == RB_LEFT(RB_PARENT(elm, field), field)))\ ++ elm = RB_PARENT(elm, field); \ ++ elm = RB_PARENT(elm, field); \ ++ } \ ++ } \ ++ return (elm); \ ++} \ ++ \ ++attr struct type * \ ++name##_RB_MINMAX(struct name *head, int val) \ ++{ \ ++ struct type *tmp = RB_ROOT(head); \ ++ struct type *parent = NULL; \ ++ while (tmp) { \ ++ parent = tmp; \ ++ if (val < 0) \ ++ tmp = RB_LEFT(tmp, field); \ ++ else \ ++ tmp = RB_RIGHT(tmp, field); \ ++ } \ ++ return (parent); \ ++} ++ ++#define RB_NEGINF -1 ++#define RB_INF 1 ++ ++#define RB_INSERT(name, x, y) name##_RB_INSERT(x, y) ++#define RB_REMOVE(name, x, y) name##_RB_REMOVE(x, y) ++#define RB_FIND(name, x, y) name##_RB_FIND(x, y) ++#define RB_NFIND(name, x, y) name##_RB_NFIND(x, y) ++#define RB_NEXT(name, x, y) name##_RB_NEXT(y) ++#define RB_PREV(name, x, y) name##_RB_PREV(y) ++#define RB_MIN(name, x) name##_RB_MINMAX(x, RB_NEGINF) ++#define RB_MAX(name, x) name##_RB_MINMAX(x, RB_INF) ++ ++#define RB_FOREACH(x, name, head) \ ++ for ((x) = RB_MIN(name, head); \ ++ (x) != NULL; \ ++ (x) = name##_RB_NEXT(x)) ++ ++#define RB_FOREACH_SAFE(x, name, head, y) \ ++ for ((x) = RB_MIN(name, head); \ ++ ((x) != NULL) && ((y) = name##_RB_NEXT(x), 1); \ ++ (x) = (y)) ++ ++#define RB_FOREACH_REVERSE(x, name, head) \ ++ for ((x) = RB_MAX(name, head); \ ++ (x) != NULL; \ ++ (x) = name##_RB_PREV(x)) ++ ++#define RB_FOREACH_REVERSE_SAFE(x, name, head, y) \ ++ for ((x) = RB_MAX(name, head); \ ++ ((x) != NULL) && ((y) = name##_RB_PREV(x), 1); \ ++ (x) = (y)) ++ ++ ++/* ++ * Copyright (c) 2016 David Gwynne ++ * ++ * Permission to use, copy, modify, and distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES ++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF ++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++struct rb_type { ++ int (*t_compare)(const void *, const void *); ++ void (*t_augment)(void *); ++ unsigned int t_offset; /* offset of rb_entry in type */ ++}; ++ ++struct rb_tree { ++ struct rb_entry *rbt_root; ++}; ++ ++struct rb_entry { ++ struct rb_entry *rbt_parent; ++ struct rb_entry *rbt_left; ++ struct rb_entry *rbt_right; ++ unsigned int rbt_color; ++}; ++ ++#define RBT_HEAD(_name, _type) \ ++struct _name { \ ++ struct rb_tree rbh_root; \ ++} ++ ++#define RBT_ENTRY(_type) struct rb_entry ++ ++static inline void ++_rb_init(struct rb_tree *rbt) ++{ ++ rbt->rbt_root = NULL; ++} ++ ++static inline int ++_rb_empty(struct rb_tree *rbt) ++{ ++ return (rbt->rbt_root == NULL); ++} ++ ++void *_rb_insert(const struct rb_type *, struct rb_tree *, void *); ++void *_rb_remove(const struct rb_type *, struct rb_tree *, void *); ++void *_rb_find(const struct rb_type *, struct rb_tree *, const void *); ++void *_rb_nfind(const struct rb_type *, struct rb_tree *, const void *); ++void *_rb_root(const struct rb_type *, struct rb_tree *); ++void *_rb_min(const struct rb_type *, struct rb_tree *); ++void *_rb_max(const struct rb_type *, struct rb_tree *); ++void *_rb_next(const struct rb_type *, void *); ++void *_rb_prev(const struct rb_type *, void *); ++void *_rb_left(const struct rb_type *, void *); ++void *_rb_right(const struct rb_type *, void *); ++void *_rb_parent(const struct rb_type *, void *); ++void _rb_set_left(const struct rb_type *, void *, void *); ++void _rb_set_right(const struct rb_type *, void *, void *); ++void _rb_set_parent(const struct rb_type *, void *, void *); ++void _rb_poison(const struct rb_type *, void *, unsigned long); ++int _rb_check(const struct rb_type *, void *, unsigned long); ++ ++#define RBT_INITIALIZER(_head) { { NULL } } ++ ++#define RBT_PROTOTYPE(_name, _type, _field, _cmp) \ ++extern const struct rb_type *const _name##_RBT_TYPE; \ ++ \ ++__unused static inline void \ ++_name##_RBT_INIT(struct _name *head) \ ++{ \ ++ _rb_init(&head->rbh_root); \ ++} \ ++ \ ++__unused static inline struct _type * \ ++_name##_RBT_INSERT(struct _name *head, struct _type *elm) \ ++{ \ ++ return _rb_insert(_name##_RBT_TYPE, &head->rbh_root, elm); \ ++} \ ++ \ ++__unused static inline struct _type * \ ++_name##_RBT_REMOVE(struct _name *head, struct _type *elm) \ ++{ \ ++ return _rb_remove(_name##_RBT_TYPE, &head->rbh_root, elm); \ ++} \ ++ \ ++__unused static inline struct _type * \ ++_name##_RBT_FIND(struct _name *head, const struct _type *key) \ ++{ \ ++ return _rb_find(_name##_RBT_TYPE, &head->rbh_root, key); \ ++} \ ++ \ ++__unused static inline struct _type * \ ++_name##_RBT_NFIND(struct _name *head, const struct _type *key) \ ++{ \ ++ return _rb_nfind(_name##_RBT_TYPE, &head->rbh_root, key); \ ++} \ ++ \ ++__unused static inline struct _type * \ ++_name##_RBT_ROOT(struct _name *head) \ ++{ \ ++ return _rb_root(_name##_RBT_TYPE, &head->rbh_root); \ ++} \ ++ \ ++__unused static inline int \ ++_name##_RBT_EMPTY(struct _name *head) \ ++{ \ ++ return _rb_empty(&head->rbh_root); \ ++} \ ++ \ ++__unused static inline struct _type * \ ++_name##_RBT_MIN(struct _name *head) \ ++{ \ ++ return _rb_min(_name##_RBT_TYPE, &head->rbh_root); \ ++} \ ++ \ ++__unused static inline struct _type * \ ++_name##_RBT_MAX(struct _name *head) \ ++{ \ ++ return _rb_max(_name##_RBT_TYPE, &head->rbh_root); \ ++} \ ++ \ ++__unused static inline struct _type * \ ++_name##_RBT_NEXT(struct _type *elm) \ ++{ \ ++ return _rb_next(_name##_RBT_TYPE, elm); \ ++} \ ++ \ ++__unused static inline struct _type * \ ++_name##_RBT_PREV(struct _type *elm) \ ++{ \ ++ return _rb_prev(_name##_RBT_TYPE, elm); \ ++} \ ++ \ ++__unused static inline struct _type * \ ++_name##_RBT_LEFT(struct _type *elm) \ ++{ \ ++ return _rb_left(_name##_RBT_TYPE, elm); \ ++} \ ++ \ ++__unused static inline struct _type * \ ++_name##_RBT_RIGHT(struct _type *elm) \ ++{ \ ++ return _rb_right(_name##_RBT_TYPE, elm); \ ++} \ ++ \ ++__unused static inline struct _type * \ ++_name##_RBT_PARENT(struct _type *elm) \ ++{ \ ++ return _rb_parent(_name##_RBT_TYPE, elm); \ ++} \ ++ \ ++__unused static inline void \ ++_name##_RBT_SET_LEFT(struct _type *elm, struct _type *left) \ ++{ \ ++ return _rb_set_left(_name##_RBT_TYPE, elm, left); \ ++} \ ++ \ ++__unused static inline void \ ++_name##_RBT_SET_RIGHT(struct _type *elm, struct _type *right) \ ++{ \ ++ return _rb_set_right(_name##_RBT_TYPE, elm, right); \ ++} \ ++ \ ++__unused static inline void \ ++_name##_RBT_SET_PARENT(struct _type *elm, struct _type *parent) \ ++{ \ ++ return _rb_set_parent(_name##_RBT_TYPE, elm, parent); \ ++} \ ++ \ ++__unused static inline void \ ++_name##_RBT_POISON(struct _type *elm, unsigned long poison) \ ++{ \ ++ return _rb_poison(_name##_RBT_TYPE, elm, poison); \ ++} \ ++ \ ++__unused static inline int \ ++_name##_RBT_CHECK(struct _type *elm, unsigned long poison) \ ++{ \ ++ return _rb_check(_name##_RBT_TYPE, elm, poison); \ ++} ++ ++#define RBT_GENERATE_INTERNAL(_name, _type, _field, _cmp, _aug) \ ++static int \ ++_name##_RBT_COMPARE(const void *lptr, const void *rptr) \ ++{ \ ++ const struct _type *l = lptr, *r = rptr; \ ++ return _cmp(l, r); \ ++} \ ++static const struct rb_type _name##_RBT_INFO = { \ ++ _name##_RBT_COMPARE, \ ++ _aug, \ ++ offsetof(struct _type, _field), \ ++}; \ ++const struct rb_type *const _name##_RBT_TYPE = &_name##_RBT_INFO ++ ++#define RBT_GENERATE_AUGMENT(_name, _type, _field, _cmp, _aug) \ ++static void \ ++_name##_RBT_AUGMENT(void *ptr) \ ++{ \ ++ struct _type *p = ptr; \ ++ return _aug(p); \ ++} \ ++RBT_GENERATE_INTERNAL(_name, _type, _field, _cmp, _name##_RBT_AUGMENT) ++ ++#define RBT_GENERATE(_name, _type, _field, _cmp) \ ++ RBT_GENERATE_INTERNAL(_name, _type, _field, _cmp, NULL) ++ ++#define RBT_INIT(_name, _head) _name##_RBT_INIT(_head) ++#define RBT_INSERT(_name, _head, _elm) _name##_RBT_INSERT(_head, _elm) ++#define RBT_REMOVE(_name, _head, _elm) _name##_RBT_REMOVE(_head, _elm) ++#define RBT_FIND(_name, _head, _key) _name##_RBT_FIND(_head, _key) ++#define RBT_NFIND(_name, _head, _key) _name##_RBT_NFIND(_head, _key) ++#define RBT_ROOT(_name, _head) _name##_RBT_ROOT(_head) ++#define RBT_EMPTY(_name, _head) _name##_RBT_EMPTY(_head) ++#define RBT_MIN(_name, _head) _name##_RBT_MIN(_head) ++#define RBT_MAX(_name, _head) _name##_RBT_MAX(_head) ++#define RBT_NEXT(_name, _elm) _name##_RBT_NEXT(_elm) ++#define RBT_PREV(_name, _elm) _name##_RBT_PREV(_elm) ++#define RBT_LEFT(_name, _elm) _name##_RBT_LEFT(_elm) ++#define RBT_RIGHT(_name, _elm) _name##_RBT_RIGHT(_elm) ++#define RBT_PARENT(_name, _elm) _name##_RBT_PARENT(_elm) ++#define RBT_SET_LEFT(_name, _elm, _l) _name##_RBT_SET_LEFT(_elm, _l) ++#define RBT_SET_RIGHT(_name, _elm, _r) _name##_RBT_SET_RIGHT(_elm, _r) ++#define RBT_SET_PARENT(_name, _elm, _p) _name##_RBT_SET_PARENT(_elm, _p) ++#define RBT_POISON(_name, _elm, _p) _name##_RBT_POISON(_elm, _p) ++#define RBT_CHECK(_name, _elm, _p) _name##_RBT_CHECK(_elm, _p) ++ ++#define RBT_FOREACH(_e, _name, _head) \ ++ for ((_e) = RBT_MIN(_name, (_head)); \ ++ (_e) != NULL; \ ++ (_e) = RBT_NEXT(_name, (_e))) ++ ++#define RBT_FOREACH_SAFE(_e, _name, _head, _n) \ ++ for ((_e) = RBT_MIN(_name, (_head)); \ ++ (_e) != NULL && ((_n) = RBT_NEXT(_name, (_e)), 1); \ ++ (_e) = (_n)) ++ ++#define RBT_FOREACH_REVERSE(_e, _name, _head) \ ++ for ((_e) = RBT_MAX(_name, (_head)); \ ++ (_e) != NULL; \ ++ (_e) = RBT_PREV(_name, (_e))) ++ ++#define RBT_FOREACH_REVERSE_SAFE(_e, _name, _head, _n) \ ++ for ((_e) = RBT_MAX(_name, (_head)); \ ++ (_e) != NULL && ((_n) = RBT_PREV(_name, (_e)), 1); \ ++ (_e) = (_n)) ++ ++#endif /* _SYS_TREE_H_ */ diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix index de1a5ce7879..f97e34aff8d 100644 --- a/pkgs/applications/editors/mg/default.nix +++ b/pkgs/applications/editors/mg/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, pkgconfig, libbsd, ncurses, buildPackages }: +{ stdenv, fetchurl, pkgconfig, ncurses, buildPackages, libbsd }: stdenv.mkDerivation rec { pname = "mg"; - version = "20171014"; + version = "20180927"; src = fetchurl { - url = "http://homepage.boetes.org/software/mg/${pname}-${version}.tar.gz"; - sha256 = "0hakfikzsml7z0hja8m8mcahrmfy2piy81bq9nccsjplyfc9clai"; + url = "https://github.com/hboetes/mg/archive/${version}.tar.gz"; + sha256 = "fbb09729ea00fe42dcdbc96ac7fc1d2b89eac651dec49e4e7af52fad4f5788f6"; }; enableParallelBuilding = true; @@ -17,10 +17,11 @@ stdenv.mkDerivation rec { install -m 555 -Dt $out/bin mg install -m 444 -Dt $out/share/man/man1 mg.1 ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libbsd ncurses ]; + patches = ./darwin_no_libbsd.patch; + + buildInputs = [ ncurses ] ++ stdenv.lib.optional (!stdenv.isDarwin) libbsd; meta = with stdenv.lib; { description = "Micro GNU/emacs, a portable version of the mg maintained by the OpenBSD team"; -- cgit v1.2.3 From aa53f61c2184fc88b9c15c816e0c23ed2d83940e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Wed, 5 Feb 2020 01:48:21 +0100 Subject: nixpkgs/brlaser: upgrade to v6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It introduces support for several additional Brother printers. Signed-off-by: Jakub Sokołowski --- pkgs/misc/cups/drivers/brlaser/default.nix | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/misc/cups/drivers/brlaser/default.nix b/pkgs/misc/cups/drivers/brlaser/default.nix index bf0f4ef8279..0c20a8d32f2 100644 --- a/pkgs/misc/cups/drivers/brlaser/default.nix +++ b/pkgs/misc/cups/drivers/brlaser/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "brlaser"; - version = "5"; + version = "6"; src = fetchFromGitHub { owner = "pdewacht"; repo = "brlaser"; rev = "v${version}"; - sha256 = "133fx49wkg1v8r4kcishd035hlsscv8kc2q4jnln5qmyhpyygjyy"; + sha256 = "1995s69ksq1fz0vb34v0ndiqncrinbrlpmp70rkl6az7kag99s80"; }; nativeBuildInputs = [ cmake ]; @@ -34,13 +34,19 @@ stdenv.mkDerivation rec { Brother DCP-7065DN Brother DCP-7080 Brother DCP-L2500D + Brother DCP-L2520D Brother DCP-L2540DW - Brother HL-1110 series - Brother HL-1200 series - Brother HL-L2300D series - Brother HL-L2320D series - Brother HL-L2340D series - Brother HL-L2360D series + Brother HL-1110 + Brother HL-1200 + Brother HL-2030 + Brother HL-2140 + Brother HL-2220 + Brother HL-2270DW + Brother HL-5030 + Brother HL-L2300D + Brother HL-L2320D + Brother HL-L2340D + Brother HL-L2360D Brother MFC-1910W Brother MFC-7240 Brother MFC-7360N -- cgit v1.2.3 From 4238308b91ad7dc5f80c9d92c30d928a4d65223c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 12 Feb 2020 23:41:55 +0000 Subject: mdds: 1.5.0 -> 1.6.0 --- pkgs/development/libraries/mdds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mdds/default.nix b/pkgs/development/libraries/mdds/default.nix index cdc3dfa5ca0..605346d5644 100644 --- a/pkgs/development/libraries/mdds/default.nix +++ b/pkgs/development/libraries/mdds/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mdds"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { url = "https://kohei.us/files/${pname}/src/${pname}-${version}.tar.bz2"; - sha256 = "03b8i43pw4m767mm0cnbi77x7qhpkzpi9b1f6dpp4cmyszmnsk8l"; + sha256 = "0zg0v9rfs92ff1gpnb06gzbxbnd9nqdar5fk8dnkmy0jpnf5qn7i"; }; postInstall = '' -- cgit v1.2.3 From f6e9deee3c05d18a3d454b830bc5894cf01a62d6 Mon Sep 17 00:00:00 2001 From: Chuck Date: Wed, 12 Feb 2020 17:30:49 -0800 Subject: nixos/bcache: Installer test for / on bcache --- nixos/tests/installer.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 983861911e0..f56c2724b71 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -651,6 +651,32 @@ in { ''; }; + bcache = makeInstallerTest "bcache" { + createPartitions = '' + machine.succeed( + "flock /dev/vda parted --script /dev/vda --" + + " mklabel msdos" + + " mkpart primary ext2 1M 50MB" # /boot + + " mkpart primary 50MB 512MB " # swap + + " mkpart primary 512MB 1024MB" # Cache (typically SSD) + + " mkpart primary 1024MB -1s ", # Backing device (typically HDD) + "modprobe bcache", + "udevadm settle", + "make-bcache -B /dev/vda4 -C /dev/vda3", + "echo /dev/vda3 > /sys/fs/bcache/register", + "echo /dev/vda4 > /sys/fs/bcache/register", + "udevadm settle", + "mkfs.ext3 -L nixos /dev/bcache0", + "mount LABEL=nixos /mnt", + "mkfs.ext3 -L boot /dev/vda1", + "mkdir /mnt/boot", + "mount LABEL=boot /mnt/boot", + "mkswap -f /dev/vda2 -L swap", + "swapon -L swap", + ) + ''; + }; + # Test a basic install using GRUB 1. grub1 = makeInstallerTest "grub1" { createPartitions = '' -- cgit v1.2.3 From a7dc5f524ccbb84c9053405977360f4b6adeeabc Mon Sep 17 00:00:00 2001 From: Tom Hall Date: Sat, 15 Feb 2020 20:54:01 +0000 Subject: gnutls: fix guile bindings --- pkgs/development/libraries/gnutls/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index cde8587acc3..76ba99b11f8 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -57,8 +57,12 @@ stdenv.mkDerivation { "--disable-dependency-tracking" "--enable-fast-install" "--with-unbound-root-key-file=${dns-root-data}/root.key" - ] ++ lib.optional guileBindings - [ "--enable-guile" "--with-guile-site-dir=\${out}/share/guile/site" ]; + ] ++ lib.optional guileBindings [ + "--enable-guile" + "--with-guile-site-dir=\${out}/share/guile/site" + "--with-guile-site-ccache-dir=\${out}/share/guile/site" + "--with-guile-extension-dir=\${out}/share/guile/site" + ]; enableParallelBuilding = true; -- cgit v1.2.3 From dc1efa99a08eec9d56fcd55b2a182a601ab7608e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20L=C3=BCtke-Stetzkamp?= Date: Sun, 23 Feb 2020 14:55:47 +0100 Subject: nixos/security/pam: Add nodelay option Closes #65551 --- nixos/modules/security/pam.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index bfc2a881387..1beb888fc36 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -219,6 +219,14 @@ let ''; }; + nodelay = mkOption { + default = false; + type = types.bool; + description = '' + Wheather the delay after typing a wrong password should be disabled. + ''; + }; + requireWheel = mkOption { default = false; type = types.bool; @@ -366,7 +374,7 @@ let || cfg.enableGnomeKeyring || cfg.googleAuthenticator.enable || cfg.duoSecurity.enable)) '' - auth required pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth + auth required pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} ${optionalString cfg.nodelay "nodelay"} likeauth ${optionalString config.security.pam.enableEcryptfs "auth optional ${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so unwrap"} ${optionalString cfg.pamMount @@ -382,7 +390,7 @@ let "auth required ${pkgs.duo-unix}/lib/security/pam_duo.so"} '') + '' ${optionalString cfg.unixAuth - "auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth try_first_pass"} + "auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} ${optionalString cfg.nodelay "nodelay"} likeauth try_first_pass"} ${optionalString cfg.otpwAuth "auth sufficient ${pkgs.otpw}/lib/security/pam_otpw.so"} ${optionalString use_ldap -- cgit v1.2.3 From 1320f23a6b5517e73bb886ffb23bec5b037914bf Mon Sep 17 00:00:00 2001 From: Jacek Galowicz Date: Fri, 14 Feb 2020 09:48:42 +0100 Subject: nixosTests.systemd-confinement: Port to Python --- nixos/tests/systemd-confinement.nix | 135 +++++++++++++++++------------------- 1 file changed, 64 insertions(+), 71 deletions(-) diff --git a/nixos/tests/systemd-confinement.nix b/nixos/tests/systemd-confinement.nix index b7b10fb36aa..af92d679585 100644 --- a/nixos/tests/systemd-confinement.nix +++ b/nixos/tests/systemd-confinement.nix @@ -1,4 +1,4 @@ -import ./make-test.nix { +import ./make-test-python.nix { name = "systemd-confinement"; machine = { pkgs, lib, ... }: let @@ -17,7 +17,7 @@ import ./make-test.nix { exit "''${ret:-1}" ''; - mkTestStep = num: { description, config ? {}, testScript }: { + mkTestStep = num: { config ? {}, testScript }: { systemd.sockets."test${toString num}" = { description = "Socket for Test Service ${toString num}"; wantedBy = [ "sockets.target" ]; @@ -34,52 +34,48 @@ import ./make-test.nix { }; } // removeAttrs config [ "confinement" "serviceConfig" ]; - __testSteps = lib.mkOrder num '' - subtest '${lib.escape ["\\" "'"] description}', sub { - $machine->succeed('echo ${toString num} > /teststep'); - ${testScript} - }; - ''; + __testSteps = lib.mkOrder num ('' + machine.succeed("echo ${toString num} > /teststep") + '' + testScript); }; in { imports = lib.imap1 mkTestStep [ - { description = "chroot-only confinement"; - config.confinement.mode = "chroot-only"; + { config.confinement.mode = "chroot-only"; testScript = '' - $machine->succeed( - 'test "$(chroot-exec ls -1 / | paste -sd,)" = bin,nix', - 'test "$(chroot-exec id -u)" = 0', - 'chroot-exec chown 65534 /bin', - ); + with subtest("chroot-only confinement"): + machine.succeed( + 'test "$(chroot-exec ls -1 / | paste -sd,)" = bin,nix', + 'test "$(chroot-exec id -u)" = 0', + "chroot-exec chown 65534 /bin", + ) ''; } - { description = "full confinement with APIVFS"; - testScript = '' - $machine->fail( - 'chroot-exec ls -l /etc', - 'chroot-exec ls -l /run', - 'chroot-exec chown 65534 /bin', - ); - $machine->succeed( - 'test "$(chroot-exec id -u)" = 0', - 'chroot-exec chown 0 /bin', - ); + { testScript = '' + with subtest("full confinement with APIVFS"): + machine.fail( + "chroot-exec ls -l /etc", + "chroot-exec ls -l /run", + "chroot-exec chown 65534 /bin", + ) + machine.succeed( + 'test "$(chroot-exec id -u)" = 0', "chroot-exec chown 0 /bin", + ) ''; } - { description = "check existence of bind-mounted /etc"; - config.serviceConfig.BindReadOnlyPaths = [ "/etc" ]; + { config.serviceConfig.BindReadOnlyPaths = [ "/etc" ]; testScript = '' - $machine->succeed('test -n "$(chroot-exec cat /etc/passwd)"'); + with subtest("check existence of bind-mounted /etc"): + machine.succeed('test -n "$(chroot-exec cat /etc/passwd)"') ''; } - { description = "check if User/Group really runs as non-root"; - config.serviceConfig.User = "chroot-testuser"; + { config.serviceConfig.User = "chroot-testuser"; config.serviceConfig.Group = "chroot-testgroup"; testScript = '' - $machine->succeed('chroot-exec ls -l /dev'); - $machine->succeed('test "$(chroot-exec id -u)" != 0'); - $machine->fail('chroot-exec touch /bin/test'); + with subtest("check if User/Group really runs as non-root"): + machine.succeed("chroot-exec ls -l /dev") + machine.succeed('test "$(chroot-exec id -u)" != 0') + machine.fail("chroot-exec touch /bin/test") ''; } (let @@ -87,62 +83,60 @@ import ./make-test.nix { target = pkgs.writeText "symlink-target" "got me\n"; } "ln -s \"$target\" \"$out\""; in { - description = "check if symlinks are properly bind-mounted"; config.confinement.packages = lib.singleton symlink; testScript = '' - $machine->fail('chroot-exec test -e /etc'); - $machine->succeed('chroot-exec cat ${symlink} >&2'); - $machine->succeed('test "$(chroot-exec cat ${symlink})" = "got me"'); + with subtest("check if symlinks are properly bind-mounted"): + machine.fail("chroot-exec test -e /etc") + machine.succeed( + "chroot-exec cat ${symlink} >&2", + 'test "$(chroot-exec cat ${symlink})" = "got me"', + ) ''; }) - { description = "check if StateDirectory works"; - config.serviceConfig.User = "chroot-testuser"; + { config.serviceConfig.User = "chroot-testuser"; config.serviceConfig.Group = "chroot-testgroup"; config.serviceConfig.StateDirectory = "testme"; testScript = '' - $machine->succeed('chroot-exec touch /tmp/canary'); - $machine->succeed('chroot-exec "echo works > /var/lib/testme/foo"'); - $machine->succeed('test "$(< /var/lib/testme/foo)" = works'); - $machine->succeed('test ! -e /tmp/canary'); + with subtest("check if StateDirectory works"): + machine.succeed("chroot-exec touch /tmp/canary") + machine.succeed('chroot-exec "echo works > /var/lib/testme/foo"') + machine.succeed('test "$(< /var/lib/testme/foo)" = works') + machine.succeed("test ! -e /tmp/canary") ''; } - { description = "check if /bin/sh works"; - testScript = '' - $machine->succeed( - 'chroot-exec test -e /bin/sh', - 'test "$(chroot-exec \'/bin/sh -c "echo bar"\')" = bar', - ); + { testScript = '' + with subtest("check if /bin/sh works"): + machine.succeed( + "chroot-exec test -e /bin/sh", + 'test "$(chroot-exec \'/bin/sh -c "echo bar"\')" = bar', + ) ''; } - { description = "check if suppressing /bin/sh works"; - config.confinement.binSh = null; + { config.confinement.binSh = null; testScript = '' - $machine->succeed( - 'chroot-exec test ! -e /bin/sh', - 'test "$(chroot-exec \'/bin/sh -c "echo foo"\')" != foo', - ); + with subtest("check if suppressing /bin/sh works"): + machine.succeed("chroot-exec test ! -e /bin/sh") + machine.succeed('test "$(chroot-exec \'/bin/sh -c "echo foo"\')" != foo') ''; } - { description = "check if we can set /bin/sh to something different"; - config.confinement.binSh = "${pkgs.hello}/bin/hello"; + { config.confinement.binSh = "${pkgs.hello}/bin/hello"; testScript = '' - $machine->succeed( - 'chroot-exec test -e /bin/sh', - 'test "$(chroot-exec /bin/sh -g foo)" = foo', - ); + with subtest("check if we can set /bin/sh to something different"): + machine.succeed("chroot-exec test -e /bin/sh") + machine.succeed('test "$(chroot-exec /bin/sh -g foo)" = foo') ''; } - { description = "check if only Exec* dependencies are included"; - config.environment.FOOBAR = pkgs.writeText "foobar" "eek\n"; + { config.environment.FOOBAR = pkgs.writeText "foobar" "eek\n"; testScript = '' - $machine->succeed('test "$(chroot-exec \'cat "$FOOBAR"\')" != eek'); + with subtest("check if only Exec* dependencies are included"): + machine.succeed('test "$(chroot-exec \'cat "$FOOBAR"\')" != eek') ''; } - { description = "check if all unit dependencies are included"; - config.environment.FOOBAR = pkgs.writeText "foobar" "eek\n"; + { config.environment.FOOBAR = pkgs.writeText "foobar" "eek\n"; config.confinement.fullUnit = true; testScript = '' - $machine->succeed('test "$(chroot-exec \'cat "$FOOBAR"\')" = eek'); + with subtest("check if all unit dependencies are included"): + machine.succeed('test "$(chroot-exec \'cat "$FOOBAR"\')" = eek') ''; } ]; @@ -162,7 +156,6 @@ import ./make-test.nix { }; testScript = { nodes, ... }: '' - $machine->waitForUnit('multi-user.target'); - ${nodes.machine.config.__testSteps} - ''; + machine.wait_for_unit("multi-user.target") + '' + nodes.machine.config.__testSteps; } -- cgit v1.2.3 From 60f4345e37d6b4c02ab8ca8fa104ae8a32ccf856 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 23 Feb 2020 18:45:29 +0100 Subject: linux config: Set TCP_CONG_CUBIC=yes to restore the default This will switch the default TCP congestion control algorithm from new Reno to CUBIC. CUBIC is the default since Linux kernel 2.6.19 (see 597811ec167fa) and most (all?) distributions keep this default (e.g. Debian and Ubuntu). On NixOS the default was still new Reno because generate-config.pl changes TCP_CONG_CUBIC from y to m (since we try to build everything as a module by default). To check the active and available algorithms: $ sysctl net.ipv4.tcp_congestion_control net.ipv4.tcp_congestion_control = cubic $ sysctl net.ipv4.tcp_available_congestion_control net.ipv4.tcp_available_congestion_control = cubic reno Note: E.g. x86_64_defconfig sets TCP_CONG_CUBIC=y indirectly via CONFIG_TCP_CONG_ADVANCED=y (but CUBIC is also the default if set to no, see net/ipv4/Kconfig). --- pkgs/os-specific/linux/kernel/common-config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index f9579a9fde5..dbac890dfd1 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -120,6 +120,7 @@ let XDP_SOCKETS = whenAtLeast "4.19" yes; XDP_SOCKETS_DIAG = whenAtLeast "4.19" yes; WAN = yes; + TCP_CONG_CUBIC = yes; # This is the default congestion control algorithm since 2.6.19 # Required by systemd per-cgroup firewalling CGROUP_BPF = option yes; CGROUP_NET_PRIO = yes; # Required by systemd -- cgit v1.2.3 From 3994f07caaffc02c0eab8e49a25d15bf2063923a Mon Sep 17 00:00:00 2001 From: Luke Clifton Date: Wed, 4 Mar 2020 18:04:55 +0800 Subject: catt: 0.10.3 -> 0.11.0 --- pkgs/applications/video/catt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/catt/default.nix b/pkgs/applications/video/catt/default.nix index 027c156be35..b3df290bfb0 100644 --- a/pkgs/applications/video/catt/default.nix +++ b/pkgs/applications/video/catt/default.nix @@ -8,11 +8,11 @@ buildPythonApplication rec { pname = "catt"; - version = "0.10.3"; + version = "0.11.0"; src = fetchPypi { inherit pname version; - sha256 = "08rjimcy9n7nvh4dz9693gjmkq6kaq5pq1nmjjsdrb7vb89yl53i"; + hash = "sha256:1vq1wg79b7855za6v6bsfgypm0v3b4wakap4rash45mhzbgjj0kq"; }; propagatedBuildInputs = [ -- cgit v1.2.3 From f1e9591de9eb8d65a79f8e7b4714ff3a8335fc37 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 4 Mar 2020 15:32:05 +0000 Subject: appstream-glib: 0.7.16 -> 0.7.17 --- pkgs/development/libraries/appstream-glib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix index 4b803554e66..5b777dff3ea 100644 --- a/pkgs/development/libraries/appstream-glib/default.nix +++ b/pkgs/development/libraries/appstream-glib/default.nix @@ -23,7 +23,7 @@ , pngquant }: stdenv.mkDerivation rec { - name = "appstream-glib-0.7.16"; + name = "appstream-glib-0.7.17"; outputs = [ "out" "dev" "man" "installedTests" ]; outputBin = "dev"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "appstream-glib"; rev = stdenv.lib.replaceStrings [ "." "-" ] [ "_" "_" ] name; - sha256 = "05x2pmsq18fcpgfvx0y54qdlryy5c9k3sxk6kgank8frkzhgnm9r"; + sha256 = "06pm8l58y0ladimyckbvlslr5bjj9rwb70rgjmn09l41pdpipy2i"; }; nativeBuildInputs = [ @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Objects and helper methods to read and write AppStream metadata"; - homepage = https://people.freedesktop.org/~hughsient/appstream-glib/; + homepage = "https://people.freedesktop.org/~hughsient/appstream-glib/"; license = licenses.lgpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ lethalman matthewbauer ]; -- cgit v1.2.3 From a77b14b84e142803e5a4b3f901dae9d26fa6b7ac Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sat, 7 Mar 2020 11:58:52 -0500 Subject: vivaldi: include libdrm and libgbm --- pkgs/applications/networking/browsers/vivaldi/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index d0e1114bdd3..a1d41c5c4f0 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -5,6 +5,7 @@ , libuuid , gstreamer, gst-plugins-base, libxml2 , glib, gtk3, pango, gdk-pixbuf, cairo, atk, at-spi2-atk, at-spi2-core, gnome2 +, libdrm, mesa , nss, nspr , patchelf, makeWrapper , isSnapshot ? false @@ -37,6 +38,7 @@ in stdenv.mkDerivation rec { atk at-spi2-atk at-spi2-core alsaLib dbus cups gtk3 gdk-pixbuf libexif ffmpeg systemd freetype fontconfig libXrender libuuid expat glib nss nspr gstreamer libxml2 gst-plugins-base pango cairo gnome2.GConf + libdrm mesa ] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs; libPath = stdenv.lib.makeLibraryPath buildInputs -- cgit v1.2.3 From 89a8a31bf36f95acc5efc31344d97d9e48cf51e3 Mon Sep 17 00:00:00 2001 From: Rakesh Gupta Date: Mon, 9 Mar 2020 19:47:57 +1100 Subject: nixos/nvidia : added nvidia-persistenced --- nixos/modules/hardware/video/nvidia.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index 7461e231402..8c3d64fceb9 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -34,10 +34,12 @@ let enabled = nvidia_x11 != null; cfg = config.hardware.nvidia; + pCfg = cfg.prime; syncCfg = pCfg.sync; offloadCfg = pCfg.offload; primeEnabled = syncCfg.enable || offloadCfg.enable; + nvidiaPersistencedEnabled = cfg.nvidiaPersistenced; in { @@ -129,6 +131,15 @@ in ). ''; }; + + hardware.nvidia.nvidiaPersistenced = mkOption { + default = false; + type = types.bool; + description = '' + Update for NVIDA GPU headless mode, i.e. nvidia-persistenced. It ensures all + GPUs stay awake even during headless mode. + ''; + }; }; config = mkIf enabled { @@ -220,6 +231,18 @@ in ++ optional (nvidia_x11.persistenced != null && config.virtualisation.docker.enableNvidia) "L+ /run/nvidia-docker/extras/bin/nvidia-persistenced - - - - ${nvidia_x11.persistenced}/origBin/nvidia-persistenced"; + systemd.services."nvidia-persistenced" = mkIf nvidiaPersistencedEnabled { + description = "NVIDIA Persistence Daemon"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "forking"; + Restart = "always"; + PIDFile = "/var/run/nvidia-persistenced/nvidia-persistenced.pid"; + ExecStart = "${nvidia_x11.persistenced}/bin/nvidia-persistenced --verbose"; + ExecStopPost = "${pkgs.coreutils}/bin/rm -rf /var/run/nvidia-persistenced"; + }; + }; + boot.extraModulePackages = [ nvidia_x11.bin ]; # nvidia-uvm is required by CUDA applications. -- cgit v1.2.3 From 906dccf5952ab48f743a45bf0d0595aad02dcb67 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 10 Mar 2020 02:27:25 +0100 Subject: afew: 2.0.0 -> 3.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit MailMover: many fixes Previously, MailMover didn't properly preserve flags when renaming files, and moved all mail to `cur`. This was fixed. Also, MailMover gained a test suite. New filters: PropagateTags[ByRegex]InThreadFilter These filters allow propagating tags set to a message to the whole thread. New command line argument: --notmuch-args= in move mode In move mode, afew calls `notmuch new` after moving mails around. This prevents `afew -m` from being used in a pre-new hook in `notmuch`. Now it's possible to specify notmuch args, so something like `afew -m --notmuch-args=--no-hooks` can live happily in a pre-new hook. Python 3.4 and 3.5 support dropped afew stopped supporting the older python versions 3.4 and 3.5, and removed some more Python 2 compatibility code. (`from __future__ import …`, utf-8 headers, relative imports, …) --- pkgs/applications/networking/mailreaders/afew/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/afew/default.nix b/pkgs/applications/networking/mailreaders/afew/default.nix index 54b3e10b5e2..b99629a58fd 100644 --- a/pkgs/applications/networking/mailreaders/afew/default.nix +++ b/pkgs/applications/networking/mailreaders/afew/default.nix @@ -2,18 +2,22 @@ python3Packages.buildPythonApplication rec { pname = "afew"; - version = "2.0.0"; + version = "3.0.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0j60501nm242idf2ig0h7p6wrg58n5v2p6zfym56v9pbvnbmns0s"; + sha256 = "18j3xyzchlslcrkycr2i59jg73cb6yh5s7l3qnl6sa7vgxcbhq7c"; }; nativeBuildInputs = with python3Packages; [ sphinx setuptools_scm ]; propagatedBuildInputs = with python3Packages; [ python3Packages.setuptools python3Packages.notmuch chardet dkimpy - ] ++ stdenv.lib.optional (!python3Packages.isPy3k) subprocess32; + ]; + + checkInputs = with python3Packages; [ + freezegun notmuch + ]; makeWrapperArgs = [ ''--prefix PATH ':' "${notmuch}/bin"'' -- cgit v1.2.3 From 7ebfcc1d4d847c8d67fe53b9f043701769f205a9 Mon Sep 17 00:00:00 2001 From: Mrinal Purohit Date: Wed, 11 Mar 2020 16:17:29 +0530 Subject: rescuetime: 2.14.5.2 -> 2.14.5.3 --- pkgs/applications/misc/rescuetime/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index 13ae1f1ba7d..7212563816b 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -5,15 +5,15 @@ let if stdenv.hostPlatform.system == "i686-linux" then fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_current_i386.deb"; - sha256 = "0mw8dh9z7pqan0yrhycmv39h5c1sc4mbw5l02cfnn17cy75xdiay"; + sha256 = "0rc744infrvs5l1c8qpsd1x2y40bpbxlwnmyj6nyli8fnqcnzh5l"; } else fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb"; - sha256 = "1a6pc8vi2ab721kzyhvg6bmw24dr85dgmx2m9j9vbf3jyr85fv10"; + sha256 = "1cjsgqcv76b798rpdn72fkbm79shlqnxyh1741isi8gcp1gnimji"; }; in mkDerivation { # https://www.rescuetime.com/updates/linux_release_notes.html - name = "rescuetime-2.14.5.2"; + name = "rescuetime-2.14.5.3"; inherit src; nativeBuildInputs = [ dpkg ]; # avoid https://github.com/NixOS/patchelf/issues/99 -- cgit v1.2.3 From 33b8f5dd21c140c1e5f0f0f66b8ef98c4677873e Mon Sep 17 00:00:00 2001 From: AmineChikhaoui Date: Thu, 12 Mar 2020 11:32:24 -0400 Subject: ec2 amis: update 19.09 AMIs this adds support for ap-east-1 and eu-north-1 regions as well. Fixes: https://github.com/NixOS/nixos-org-configurations/issues/105 --- nixos/modules/virtualisation/ec2-amis.nix | 33 +++++++++++++++++-------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix index 3b4e55d39d7..630c35bd08f 100644 --- a/nixos/modules/virtualisation/ec2-amis.nix +++ b/nixos/modules/virtualisation/ec2-amis.nix @@ -291,21 +291,24 @@ let self = { "19.03".sa-east-1.hvm-ebs = "ami-0c6a43c6e0ad1f4e2"; "19.03".ap-south-1.hvm-ebs = "ami-0303deb1b5890f878"; - # 19.09.981.205691b7cbe - "19.09".eu-west-1.hvm-ebs = "ami-0ebd3156e21e9642f"; - "19.09".eu-west-2.hvm-ebs = "ami-02a2b5480a79084b7"; - "19.09".eu-west-3.hvm-ebs = "ami-09aa175c7588734f7"; - "19.09".eu-central-1.hvm-ebs = "ami-00a7fafd7e237a330"; - "19.09".us-east-1.hvm-ebs = "ami-00a8eeaf232a74f84"; - "19.09".us-east-2.hvm-ebs = "ami-093efd3a57a1e03a8"; - "19.09".us-west-1.hvm-ebs = "ami-0913e9a2b677fac30"; - "19.09".us-west-2.hvm-ebs = "ami-02d9a19f77b47882a"; - "19.09".ca-central-1.hvm-ebs = "ami-0627dd3f7b3627a29"; - "19.09".ap-southeast-1.hvm-ebs = "ami-083614e4d08f2164d"; - "19.09".ap-southeast-2.hvm-ebs = "ami-0048c704185ded6dc"; - "19.09".ap-northeast-1.hvm-ebs = "ami-0329e7fc2d7f60bd0"; - "19.09".ap-northeast-2.hvm-ebs = "ami-03d4ae7d0b5fc364f"; - "19.09".ap-south-1.hvm-ebs = "ami-0b599690b35aeef23"; + # 19.09.2243.84af403f54f + "19.09".eu-west-1.hvm-ebs = "ami-071082f0fa035374f"; + "19.09".eu-west-2.hvm-ebs = "ami-0d9dc33c54d1dc4c3"; + "19.09".eu-west-3.hvm-ebs = "ami-09566799591d1bfed"; + "19.09".eu-central-1.hvm-ebs = "ami-015f8efc2be419b79"; + "19.09".eu-north-1.hvm-ebs = "ami-07fc0a32d885e01ed"; + "19.09".us-east-1.hvm-ebs = "ami-03330d8b51287412f"; + "19.09".us-east-2.hvm-ebs = "ami-0518b4c84972e967f"; + "19.09".us-west-1.hvm-ebs = "ami-06ad07e61a353b4a6"; + "19.09".us-west-2.hvm-ebs = "ami-0e31e30925cf3ce4e"; + "19.09".ca-central-1.hvm-ebs = "ami-07df50fc76702a36d"; + "19.09".ap-southeast-1.hvm-ebs = "ami-0f71ae5d4b0b78d95"; + "19.09".ap-southeast-2.hvm-ebs = "ami-057bbf2b4bd62d210"; + "19.09".ap-northeast-1.hvm-ebs = "ami-02a62555ca182fb5b"; + "19.09".ap-northeast-2.hvm-ebs = "ami-0219dde0e6b7b7b93"; + "19.09".ap-south-1.hvm-ebs = "ami-066f7f2a895c821a1"; + "19.09".ap-east-1.hvm-ebs = "ami-055b2348db2827ff1"; + "19.09".sa-east-1.hvm-ebs = "ami-018aab68377227e06"; latest = self."19.09"; }; in self -- cgit v1.2.3 From dcda9df724960e19713d856f1308ae4c1bae14ef Mon Sep 17 00:00:00 2001 From: Matt Wittmann Date: Fri, 13 Mar 2020 10:23:38 -0700 Subject: r-mvtnorm: add libiconv to buildInputs Fixes build failure with `ld: library not found for -liconv` --- pkgs/development/r-modules/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index d340f3c4636..9c4229a826b 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -452,6 +452,7 @@ let sundialr = [ pkgs.libiconv ]; ucminf = [ pkgs.libiconv ]; glmnet = [ pkgs.libiconv ]; + mvtnorm = [ pkgs.libiconv ]; }; packagesRequireingX = [ -- cgit v1.2.3 From d5528e39792680467e31d5cef4e591e521ee5bcc Mon Sep 17 00:00:00 2001 From: Alex Whitt Date: Tue, 10 Mar 2020 08:42:31 -0400 Subject: octoprint: 1.3.12 -> 1.4.0, use python3 --- pkgs/applications/misc/octoprint/default.nix | 73 +++++++++++++--------------- 1 file changed, 34 insertions(+), 39 deletions(-) diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 29a04627bef..9d7874e9010 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -1,5 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, python2 }: - +{ stdenv, lib, fetchFromGitHub, python3 }: let mkOverride = attrname: version: sha256: self: super: { @@ -11,11 +10,11 @@ let }); }; - py = python2.override { + py = python3.override { packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ - (mkOverride "flask" "0.10.1" "0wrkavjdjndknhp8ya8j850jq7a1cli4g5a93mg8nh1xz2gq50sc") - (mkOverride "flask_login" "0.2.11" "1rg3rsjs1gwi2pw6vr9jmhaqm9b3vc9c4hfcsvp4y8agbh7g3mc3") + (mkOverride "flask" "0.12.5" "fac2b9d443e49f7e7358a444a3db5950bdd0324674d92ba67f8f1f15f876b14f") (mkOverride "tornado" "4.5.3" "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d") + (mkOverride "psutil" "5.6.7" "ffad8eb2ac614518bbe3c0b8eb9dffdb3a8d2e3a7d5da51c5b974fb723a5c5aa") # Octoprint holds back jinja2 to 2.8.1 due to breaking changes. # This old version does not have updated test config for pytest 4, @@ -29,57 +28,44 @@ let }; doCheck = false; }); + + httpretty = psuper.httpretty.overridePythonAttrs (oldAttrs: rec { + doCheck = false; + }); + + celery = psuper.celery.overridePythonAttrs (oldAttrs: rec { + doCheck = false; + }); }) ]); }; ignoreVersionConstraints = [ - "Click" - "Flask-Assets" - "Flask-Babel" - "Flask-Principal" - "emoji" - "flask" - "future" - "futures" - "monotonic" - "markdown" - "pkginfo" - "psutil" - "pyserial" - "requests" - "rsa" - "sarge" - "scandir" - "semantic_version" - "watchdog" - "websocket-client" - "wrapt" "sentry-sdk" - "werkzeug" # 0.16 just deprecates some stuff ]; -in py.pkgs.buildPythonApplication rec { +in +py.pkgs.buildPythonApplication rec { pname = "OctoPrint"; - version = "1.3.12"; + version = "1.4.0"; src = fetchFromGitHub { owner = "foosel"; repo = "OctoPrint"; rev = version; - sha256 = "1lmqssgwjyhknjf3x58g7cr0fqz7fs5a3rl07r69wfpch63ranyd"; + sha256 = "1zla1ayr62lkvkr828dh3y287rzj3rv1hpij9kws44ynn4i582ga"; }; propagatedBuildInputs = with py.pkgs; [ - awesome-slugify flask_assets rsa requests pkginfo watchdog - semantic-version flask_principal werkzeug flaskbabel tornado - psutil pyserial flask_login netaddr markdown sockjs-tornado + awesome-slugify flask flask_assets rsa requests pkginfo watchdog + semantic-version werkzeug flaskbabel tornado + psutil pyserial flask_login netaddr markdown pylru pyyaml sarge feedparser netifaces click websocket_client - scandir chainmap future futures wrapt monotonic emoji - frozendict cachelib sentry-sdk typing filetype + scandir chainmap future wrapt monotonic emoji jinja2 + frozendict cachelib sentry-sdk filetype markupsafe ] ++ lib.optionals stdenv.isDarwin [ py.pkgs.appdirs ]; - checkInputs = with py.pkgs; [ nose mock ddt ]; + checkInputs = with py.pkgs; [ pytestCheckHook mock ddt ]; postPatch = '' sed -r -i \ @@ -89,14 +75,23 @@ in py.pkgs.buildPythonApplication rec { setup.py ''; - checkPhase = '' - HOME=$(mktemp -d) nosetests ${lib.optionalString stdenv.isDarwin "--exclude=test_set_external_modification"} + dontUseSetuptoolsCheck = true; + + preCheck = '' + export HOME=$(mktemp -d) + rm pytest.ini ''; + disabledTests = [ + "test_check_setup" # Why should it be able to call pip? + ] ++ lib.optionals stdenv.isDarwin [ + "test_set_external_modification" + ]; + meta = with stdenv.lib; { homepage = https://octoprint.org/; description = "The snappy web interface for your 3D printer"; license = licenses.agpl3; - maintainers = with maintainers; [ abbradar gebner ]; + maintainers = with maintainers; [ abbradar gebner WhittlesJr ]; }; } -- cgit v1.2.3 From 610da69d28166631b9a0259e54579d97956c5931 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 12 Mar 2020 11:00:21 +0100 Subject: pythonPackages.kombu: use importlib-metadata --- pkgs/development/python-modules/kombu/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index 5caab5a377e..fd3548716b7 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -5,6 +5,8 @@ , pytest , pytz , sqlalchemy +, importlib-metadata +, pythonOlder }: buildPythonPackage rec { @@ -23,7 +25,11 @@ buildPythonPackage rec { --replace "amqp==2.5.1" "amqp~=2.5" ''; - propagatedBuildInputs = [ amqp ]; + propagatedBuildInputs = [ + amqp + ] ++ lib.optionals (pythonOlder "3.8") [ + importlib-metadata + ]; checkInputs = [ pytest case pytz Pyro4 sqlalchemy ]; # test_redis requires fakeredis, which isn't trivial to package -- cgit v1.2.3 From 7066dc85baa1cd1e6d4d8bf81a46c2fa8e4825fc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 14 Mar 2020 11:02:07 +0100 Subject: octoprint-plugins: use same python as octoprint, use overlays - ensure the plugins use the same python as octoprint - overlay of overriding plugins - drop octoprint-plugins attribute --- nixos/modules/services/misc/octoprint.nix | 9 +- pkgs/applications/misc/octoprint/default.nix | 115 ++++--- pkgs/applications/misc/octoprint/plugins.nix | 490 +++++++++++++-------------- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 311 insertions(+), 305 deletions(-) diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix index 651ed374388..7a71d2c8c6a 100644 --- a/nixos/modules/services/misc/octoprint.nix +++ b/nixos/modules/services/misc/octoprint.nix @@ -17,9 +17,9 @@ let cfgUpdate = pkgs.writeText "octoprint-config.yaml" (builtins.toJSON fullConfig); - pluginsEnv = pkgs.python.buildEnv.override { - extraLibs = cfg.plugins pkgs.octoprint-plugins; - }; + pluginsEnv = package.python.withPackages (ps: [ps.octoprint] ++ (cfg.plugins ps)); + + package = pkgs.octoprint; in { @@ -106,7 +106,6 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; path = [ pluginsEnv ]; - environment.PYTHONPATH = makeSearchPathOutput "lib" pkgs.python.sitePackages [ pluginsEnv ]; preStart = '' if [ -e "${cfg.stateDir}/config.yaml" ]; then @@ -119,7 +118,7 @@ in ''; serviceConfig = { - ExecStart = "${pkgs.octoprint}/bin/octoprint serve -b ${cfg.stateDir}"; + ExecStart = "${pluginsEnv}/bin/octoprint serve -b ${cfg.stateDir}"; User = cfg.user; Group = cfg.group; }; diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 9d7874e9010..0f03cd7fae2 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -1,4 +1,7 @@ -{ stdenv, lib, fetchFromGitHub, python3 }: +{ pkgs, stdenv, lib, fetchFromGitHub, python3 +# To include additional plugins, pass them here as an overlay. +, packageOverrides ? self: super: {} +}: let mkOverride = attrname: version: sha256: self: super: { @@ -11,6 +14,7 @@ let }; py = python3.override { + self = py; packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ (mkOverride "flask" "0.12.5" "fac2b9d443e49f7e7358a444a3db5950bdd0324674d92ba67f8f1f15f876b14f") (mkOverride "tornado" "4.5.3" "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d") @@ -19,8 +23,8 @@ let # Octoprint holds back jinja2 to 2.8.1 due to breaking changes. # This old version does not have updated test config for pytest 4, # and pypi tarball doesn't contain tests dir anyways. - (pself: psuper: { - jinja2 = psuper.jinja2.overridePythonAttrs (oldAttrs: rec { + (self: super: { + jinja2 = super.jinja2.overridePythonAttrs (oldAttrs: rec { version = "2.8.1"; src = oldAttrs.src.override { inherit version; @@ -29,69 +33,72 @@ let doCheck = false; }); - httpretty = psuper.httpretty.overridePythonAttrs (oldAttrs: rec { + httpretty = super.httpretty.overridePythonAttrs (oldAttrs: rec { doCheck = false; }); - celery = psuper.celery.overridePythonAttrs (oldAttrs: rec { + celery = super.celery.overridePythonAttrs (oldAttrs: rec { doCheck = false; }); }) - ]); - }; - - ignoreVersionConstraints = [ - "sentry-sdk" - ]; + (self: super: { + octoprint = self.buildPythonPackage rec { + pname = "OctoPrint"; + version = "1.4.0"; -in -py.pkgs.buildPythonApplication rec { - pname = "OctoPrint"; - version = "1.4.0"; - - src = fetchFromGitHub { - owner = "foosel"; - repo = "OctoPrint"; - rev = version; - sha256 = "1zla1ayr62lkvkr828dh3y287rzj3rv1hpij9kws44ynn4i582ga"; - }; + src = fetchFromGitHub { + owner = "foosel"; + repo = "OctoPrint"; + rev = version; + sha256 = "1zla1ayr62lkvkr828dh3y287rzj3rv1hpij9kws44ynn4i582ga"; + }; - propagatedBuildInputs = with py.pkgs; [ - awesome-slugify flask flask_assets rsa requests pkginfo watchdog - semantic-version werkzeug flaskbabel tornado - psutil pyserial flask_login netaddr markdown - pylru pyyaml sarge feedparser netifaces click websocket_client - scandir chainmap future wrapt monotonic emoji jinja2 - frozendict cachelib sentry-sdk filetype markupsafe - ] ++ lib.optionals stdenv.isDarwin [ py.pkgs.appdirs ]; + propagatedBuildInputs = with super; [ + awesome-slugify flask flask_assets rsa requests pkginfo watchdog + semantic-version werkzeug flaskbabel tornado + psutil pyserial flask_login netaddr markdown + pylru pyyaml sarge feedparser netifaces click websocket_client + scandir chainmap future wrapt monotonic emoji jinja2 + frozendict cachelib sentry-sdk filetype markupsafe + ] ++ lib.optionals stdenv.isDarwin [ py.pkgs.appdirs ]; - checkInputs = with py.pkgs; [ pytestCheckHook mock ddt ]; + checkInputs = with super; [ pytestCheckHook mock ddt ]; - postPatch = '' - sed -r -i \ - ${lib.concatStringsSep "\n" (map (e: - ''-e 's@${e}[<>=]+.*@${e}",@g' \'' - ) ignoreVersionConstraints)} - setup.py - ''; + postPatch = let + ignoreVersionConstraints = [ + "sentry-sdk" + ]; + in '' + sed -r -i \ + ${lib.concatStringsSep "\n" (map (e: + ''-e 's@${e}[<>=]+.*@${e}",@g' \'' + ) ignoreVersionConstraints)} + setup.py + ''; - dontUseSetuptoolsCheck = true; + dontUseSetuptoolsCheck = true; - preCheck = '' - export HOME=$(mktemp -d) - rm pytest.ini - ''; + preCheck = '' + export HOME=$(mktemp -d) + rm pytest.ini + ''; - disabledTests = [ - "test_check_setup" # Why should it be able to call pip? - ] ++ lib.optionals stdenv.isDarwin [ - "test_set_external_modification" - ]; + disabledTests = [ + "test_check_setup" # Why should it be able to call pip? + ] ++ lib.optionals stdenv.isDarwin [ + "test_set_external_modification" + ]; - meta = with stdenv.lib; { - homepage = https://octoprint.org/; - description = "The snappy web interface for your 3D printer"; - license = licenses.agpl3; - maintainers = with maintainers; [ abbradar gebner WhittlesJr ]; + meta = with stdenv.lib; { + homepage = https://octoprint.org/; + description = "The snappy web interface for your 3D printer"; + license = licenses.agpl3; + maintainers = with maintainers; [ abbradar gebner WhittlesJr ]; + }; + }; + }) + (import ./plugins.nix {inherit pkgs;}) + packageOverrides + ]); }; -} +in with py.pkgs; toPythonApplication octoprint diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 10c4f2f8448..2b7c928a474 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -1,255 +1,255 @@ -{ stdenv, fetchgit, fetchFromGitHub, octoprint, python2Packages, marlin-calc }: +{ pkgs }: -let - buildPlugin = args: python2Packages.buildPythonPackage (args // { +with pkgs; + +self: super: let + buildPlugin = args: self.buildPythonPackage (args // { pname = "OctoPrintPlugin-${args.pname}"; inherit (args) version; - propagatedBuildInputs = (args.propagatedBuildInputs or []) ++ [ octoprint ]; + propagatedBuildInputs = (args.propagatedBuildInputs or []) ++ [ super.octoprint ]; # none of the following have tests doCheck = false; }); +in { + inherit buildPlugin; + + # Deprecated alias + m3d-fio = self.m33-fio; # added 2016-08-13 + + m33-fio = buildPlugin rec { + pname = "M33-Fio"; + version = "1.21"; + + src = fetchFromGitHub { + owner = "donovan6000"; + repo = "M33-Fio"; + rev = "V${version}"; + sha256 = "1la3611kkqn8yiwjn6cizc45ri8pnk6ckld1na4nk6mqk88jvjq7"; + }; + + patches = [ + ./m33-fio-one-library.patch + ]; + + postPatch = '' + rm -rf octoprint_m33fio/static/libraries/* + ( + cd 'shared library source' + make + ) + ''; + + meta = with stdenv.lib; { + description = "OctoPrint plugin for the Micro 3D printer"; + homepage = https://github.com/donovan6000/M33-Fio; + license = licenses.gpl3; + maintainers = with maintainers; [ abbradar ]; + }; + }; + + mqtt = buildPlugin rec { + pname = "MQTT"; + version = "0.8.6"; + + src = fetchFromGitHub { + owner = "OctoPrint"; + repo = "OctoPrint-MQTT"; + rev = version; + sha256 = "0y1jnfplcy8mh3szrfbbvngl02j49cbdizglrfsry4fvqg50zjxd"; + }; + + propagatedBuildInputs = with super; [ paho-mqtt ]; + + meta = with stdenv.lib; { + description = "Publish printer status MQTT"; + homepage = https://github.com/OctoPrint/OctoPrint-MQTT; + license = licenses.agpl3; + maintainers = with maintainers; [ peterhoeg ]; + }; + }; + + titlestatus = buildPlugin rec { + pname = "TitleStatus"; + version = "0.0.4"; + + src = fetchFromGitHub { + owner = "MoonshineSG"; + repo = "OctoPrint-TitleStatus"; + rev = version; + sha256 = "1l78xrabn5hcly2mgxwi17nwgnp2s6jxi9iy4wnw8k8icv74ag7k"; + }; + + meta = with stdenv.lib; { + description = "Show printers status in window title"; + homepage = https://github.com/MoonshineSG/OctoPrint-TitleStatus; + license = licenses.agpl3; + maintainers = with maintainers; [ abbradar ]; + }; + }; + + stlviewer = buildPlugin rec { + pname = "STLViewer"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "jneilliii"; + repo = "OctoPrint-STLViewer"; + rev = version; + sha256 = "0mkvh44fn2ch4z2avsdjwi1rp353ylmk9j5fln4x7rx8ph8y7g2b"; + }; + + meta = with stdenv.lib; { + description = "A simple stl viewer tab for OctoPrint"; + homepage = https://github.com/jneilliii/Octoprint-STLViewer; + license = licenses.agpl3; + maintainers = with maintainers; [ abbradar ]; + }; + }; + + curaenginelegacy = buildPlugin rec { + pname = "CuraEngineLegacy"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "OctoPrint"; + repo = "OctoPrint-${pname}"; + rev = version; + sha256 = "1cdb276wfyf3wcfj5g3migd6b6aqmkrxncrqjfcfx4j4k3xac965"; + }; + + meta = with stdenv.lib; { + description = "Plugin for slicing via Cura Legacy from within OctoPrint"; + homepage = "https://github.com/OctoPrint/OctoPrint-CuraEngineLegacy"; + license = licenses.agpl3; + maintainers = with maintainers; [ gebner ]; + }; + }; - self = { - - # Deprecated alias - m3d-fio = self.m33-fio; # added 2016-08-13 - - m33-fio = buildPlugin rec { - pname = "M33-Fio"; - version = "1.21"; - - src = fetchFromGitHub { - owner = "donovan6000"; - repo = "M33-Fio"; - rev = "V${version}"; - sha256 = "1la3611kkqn8yiwjn6cizc45ri8pnk6ckld1na4nk6mqk88jvjq7"; - }; - - patches = [ - ./m33-fio-one-library.patch - ]; - - postPatch = '' - rm -rf octoprint_m33fio/static/libraries/* - ( - cd 'shared library source' - make - ) - ''; - - meta = with stdenv.lib; { - description = "OctoPrint plugin for the Micro 3D printer"; - homepage = https://github.com/donovan6000/M33-Fio; - license = licenses.gpl3; - maintainers = with maintainers; [ abbradar ]; - }; - }; - - mqtt = buildPlugin rec { - pname = "MQTT"; - version = "0.8.6"; - - src = fetchFromGitHub { - owner = "OctoPrint"; - repo = "OctoPrint-MQTT"; - rev = version; - sha256 = "0y1jnfplcy8mh3szrfbbvngl02j49cbdizglrfsry4fvqg50zjxd"; - }; - - propagatedBuildInputs = with python2Packages; [ paho-mqtt ]; - - meta = with stdenv.lib; { - description = "Publish printer status MQTT"; - homepage = https://github.com/OctoPrint/OctoPrint-MQTT; - license = licenses.agpl3; - maintainers = with maintainers; [ peterhoeg ]; - }; - }; - - titlestatus = buildPlugin rec { - pname = "TitleStatus"; - version = "0.0.4"; - - src = fetchFromGitHub { - owner = "MoonshineSG"; - repo = "OctoPrint-TitleStatus"; - rev = version; - sha256 = "1l78xrabn5hcly2mgxwi17nwgnp2s6jxi9iy4wnw8k8icv74ag7k"; - }; - - meta = with stdenv.lib; { - description = "Show printers status in window title"; - homepage = https://github.com/MoonshineSG/OctoPrint-TitleStatus; - license = licenses.agpl3; - maintainers = with maintainers; [ abbradar ]; - }; - }; - - stlviewer = buildPlugin rec { - pname = "STLViewer"; - version = "0.4.2"; - - src = fetchFromGitHub { - owner = "jneilliii"; - repo = "OctoPrint-STLViewer"; - rev = version; - sha256 = "0mkvh44fn2ch4z2avsdjwi1rp353ylmk9j5fln4x7rx8ph8y7g2b"; - }; - - meta = with stdenv.lib; { - description = "A simple stl viewer tab for OctoPrint"; - homepage = https://github.com/jneilliii/Octoprint-STLViewer; - license = licenses.agpl3; - maintainers = with maintainers; [ abbradar ]; - }; - }; - - curaenginelegacy = buildPlugin rec { - pname = "CuraEngineLegacy"; - version = "1.0.2"; - - src = fetchFromGitHub { - owner = "OctoPrint"; - repo = "OctoPrint-${pname}"; - rev = version; - sha256 = "1cdb276wfyf3wcfj5g3migd6b6aqmkrxncrqjfcfx4j4k3xac965"; - }; - - meta = with stdenv.lib; { - description = "Plugin for slicing via Cura Legacy from within OctoPrint"; - homepage = "https://github.com/OctoPrint/OctoPrint-CuraEngineLegacy"; - license = licenses.agpl3; - maintainers = with maintainers; [ gebner ]; - }; - }; - - touchui = buildPlugin rec { - pname = "TouchUI"; - version = "0.3.13"; - - src = fetchFromGitHub { - owner = "BillyBlaze"; - repo = "OctoPrint-${pname}"; - rev = version; - sha256 = "0qk12ysabdzy6cna3l4f8v3qcnppppwxxsjx2i0xn1nd0cv6yzwh"; - }; - - meta = with stdenv.lib; { - description = "Touch friendly interface for a small TFT module or phone for OctoPrint"; - homepage = "https://github.com/BillyBlaze/OctoPrint-TouchUI"; - license = licenses.agpl3; - maintainers = with maintainers; [ gebner ]; - }; - }; - - psucontrol = buildPlugin rec { - pname = "PSUControl"; - version = "0.1.8"; - - src = fetchFromGitHub { - owner = "kantlivelong"; - repo = "OctoPrint-${pname}"; - rev = version; - sha256 = "0aj38d7b7d5pzmzq841pip18cpg18wy2vrxq2nd13875597y54b8"; - }; - - preConfigure = '' - # optional; RPi.GPIO is broken on vanilla kernels - sed /RPi.GPIO/d -i requirements.txt - ''; - - meta = with stdenv.lib; { - description = "OctoPrint plugin to control ATX/AUX power supply"; - homepage = "https://github.com/kantlivelong/OctoPrint-PSUControl"; - license = licenses.agpl3; - maintainers = with maintainers; [ gebner ]; - }; - }; - - printtimegenius = buildPlugin rec { - pname = "PrintTimeGenius"; - version = "2.2.1"; - - src = fetchFromGitHub { - owner = "eyal0"; - repo = "OctoPrint-${pname}"; - rev = version; - sha256 = "1dr93vbpxgxw3b1q4rwam8f4dmiwr5vnfr9796g6jx8xkpfzzy1h"; - }; - - preConfigure = '' - # PrintTimeGenius ships with marlin-calc binaries for multiple architectures - rm */analyzers/marlin-calc* - sed 's@"{}.{}".format(binary_base_name, machine)@"${marlin-calc}/bin/marlin-calc"@' -i */analyzers/analyze_progress.py - ''; - - patches = [ - ./printtimegenius-logging.patch - ]; - - meta = with stdenv.lib; { - description = "Better print time estimation for OctoPrint"; - homepage = "https://github.com/eyal0/OctoPrint-PrintTimeGenius"; - license = licenses.agpl3; - maintainers = with maintainers; [ gebner ]; - }; - }; - - abl-expert = buildPlugin rec { - pname = "ABL_Expert"; - version = "2019-12-21"; - - src = fetchgit { - url = "https://framagit.org/razer/Octoprint_ABL_Expert/"; - rev = "f11fbe05088ad618bfd9d064ac3881faec223f33"; - sha256 = "026r4prkyvwzxag5pv36455q7s3gaig37nmr2nbvhwq3d2lbi5s4"; - }; - - meta = with stdenv.lib; { - description = "Marlin auto bed leveling control, mesh correction, and z probe handling"; - homepage = "https://framagit.org/razer/Octoprint_ABL_Expert/"; - license = licenses.agpl3; - maintainers = with maintainers; [ WhittlesJr ]; - }; - }; - - gcodeeditor = buildPlugin rec { - pname = "GcodeEditor"; - version = "0.2.6"; - - src = fetchFromGitHub { - owner = "ieatacid"; - repo = "OctoPrint-${pname}"; - rev = version; - sha256 = "0c6p78r3vd6ys3kld308pyln09zjbr9yif1ljvcx6wlml2i5l1vh"; - }; - - meta = with stdenv.lib; { - description = "Edit gcode on OctoPrint"; - homepage = "https://github.com/Sebclem/OctoPrint-SimpleEmergencyStop"; - license = licenses.agpl3; - maintainers = with maintainers; [ WhittlesJr ]; - }; - }; - - simpleemergencystop = buildPlugin rec { - pname = "SimpleEmergencyStop"; - version = "0.2.5"; - - src = fetchFromGitHub { - owner = "Sebclem"; - repo = "OctoPrint-${pname}"; - rev = version; - sha256 = "10wadv09wv2h96igvq3byw9hz1si82n3c7v5y0ii3j7hm2d06y8p"; - }; - - meta = with stdenv.lib; { - description = "A simple plugin that add an emergency stop buton on NavBar of OctoPrint"; - homepage = "https://github.com/ieatacid/OctoPrint-GcodeEditor"; - license = licenses.agpl3; - maintainers = with maintainers; [ WhittlesJr ]; - }; + touchui = buildPlugin rec { + pname = "TouchUI"; + version = "0.3.13"; + + src = fetchFromGitHub { + owner = "BillyBlaze"; + repo = "OctoPrint-${pname}"; + rev = version; + sha256 = "0qk12ysabdzy6cna3l4f8v3qcnppppwxxsjx2i0xn1nd0cv6yzwh"; + }; + + meta = with stdenv.lib; { + description = "Touch friendly interface for a small TFT module or phone for OctoPrint"; + homepage = "https://github.com/BillyBlaze/OctoPrint-TouchUI"; + license = licenses.agpl3; + maintainers = with maintainers; [ gebner ]; }; }; -in self + psucontrol = buildPlugin rec { + pname = "PSUControl"; + version = "0.1.8"; + + src = fetchFromGitHub { + owner = "kantlivelong"; + repo = "OctoPrint-${pname}"; + rev = version; + sha256 = "0aj38d7b7d5pzmzq841pip18cpg18wy2vrxq2nd13875597y54b8"; + }; + + preConfigure = '' + # optional; RPi.GPIO is broken on vanilla kernels + sed /RPi.GPIO/d -i requirements.txt + ''; + + meta = with stdenv.lib; { + description = "OctoPrint plugin to control ATX/AUX power supply"; + homepage = "https://github.com/kantlivelong/OctoPrint-PSUControl"; + license = licenses.agpl3; + maintainers = with maintainers; [ gebner ]; + }; + }; + + printtimegenius = buildPlugin rec { + pname = "PrintTimeGenius"; + version = "2.2.1"; + + src = fetchFromGitHub { + owner = "eyal0"; + repo = "OctoPrint-${pname}"; + rev = version; + sha256 = "1dr93vbpxgxw3b1q4rwam8f4dmiwr5vnfr9796g6jx8xkpfzzy1h"; + }; + + preConfigure = '' + # PrintTimeGenius ships with marlin-calc binaries for multiple architectures + rm */analyzers/marlin-calc* + sed 's@"{}.{}".format(binary_base_name, machine)@"${pkgs.marlin-calc}/bin/marlin-calc"@' -i */analyzers/analyze_progress.py + ''; + + patches = [ + ./printtimegenius-logging.patch + ]; + + meta = with stdenv.lib; { + description = "Better print time estimation for OctoPrint"; + homepage = "https://github.com/eyal0/OctoPrint-PrintTimeGenius"; + license = licenses.agpl3; + maintainers = with maintainers; [ gebner ]; + }; + }; + + abl-expert = buildPlugin rec { + pname = "ABL_Expert"; + version = "2019-12-21"; + + src = fetchgit { + url = "https://framagit.org/razer/Octoprint_ABL_Expert/"; + rev = "f11fbe05088ad618bfd9d064ac3881faec223f33"; + sha256 = "026r4prkyvwzxag5pv36455q7s3gaig37nmr2nbvhwq3d2lbi5s4"; + }; + + meta = with stdenv.lib; { + description = "Marlin auto bed leveling control, mesh correction, and z probe handling"; + homepage = "https://framagit.org/razer/Octoprint_ABL_Expert/"; + license = licenses.agpl3; + maintainers = with maintainers; [ WhittlesJr ]; + }; + }; + + gcodeeditor = buildPlugin rec { + pname = "GcodeEditor"; + version = "0.2.6"; + + src = fetchFromGitHub { + owner = "ieatacid"; + repo = "OctoPrint-${pname}"; + rev = version; + sha256 = "0c6p78r3vd6ys3kld308pyln09zjbr9yif1ljvcx6wlml2i5l1vh"; + }; + + meta = with stdenv.lib; { + description = "Edit gcode on OctoPrint"; + homepage = "https://github.com/Sebclem/OctoPrint-SimpleEmergencyStop"; + license = licenses.agpl3; + maintainers = with maintainers; [ WhittlesJr ]; + }; + }; + + simpleemergencystop = buildPlugin rec { + pname = "SimpleEmergencyStop"; + version = "0.2.5"; + + src = fetchFromGitHub { + owner = "Sebclem"; + repo = "OctoPrint-${pname}"; + rev = version; + sha256 = "10wadv09wv2h96igvq3byw9hz1si82n3c7v5y0ii3j7hm2d06y8p"; + }; + + meta = with stdenv.lib; { + description = "A simple plugin that add an emergency stop buton on NavBar of OctoPrint"; + homepage = "https://github.com/ieatacid/OctoPrint-GcodeEditor"; + license = licenses.agpl3; + maintainers = with maintainers; [ WhittlesJr ]; + }; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e2bc8a135eb..305148b4350 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20900,7 +20900,7 @@ in octoprint = callPackage ../applications/misc/octoprint { }; - octoprint-plugins = callPackage ../applications/misc/octoprint/plugins.nix { }; + octoprint-plugins = throw ''octoprint-plugins are now part of the octoprint package set.''; ocrad = callPackage ../applications/graphics/ocrad { }; -- cgit v1.2.3 From 68cb570a92ac697a12e26c9fa89ceb9e88102287 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 14 Mar 2020 12:00:58 +0100 Subject: octoprint.python.pkgs.psucontrol: 0.1.8 -> 0.1.9 --- pkgs/applications/misc/octoprint/plugins.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 2b7c928a474..5e57d80bd5d 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -1,6 +1,6 @@ { pkgs }: -with pkgs; +with pkgs; self: super: let buildPlugin = args: self.buildPythonPackage (args // { @@ -146,13 +146,13 @@ in { psucontrol = buildPlugin rec { pname = "PSUControl"; - version = "0.1.8"; + version = "0.1.9"; src = fetchFromGitHub { owner = "kantlivelong"; repo = "OctoPrint-${pname}"; rev = version; - sha256 = "0aj38d7b7d5pzmzq841pip18cpg18wy2vrxq2nd13875597y54b8"; + sha256 = "1cn009bdgn6c9ba9an5wfj8z02wi0xcsmbhkqggiqlnqy1fq45ca"; }; preConfigure = '' -- cgit v1.2.3 From a11d4fd0733fc73abde2f90193abb705df079c26 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 14 Mar 2020 12:01:52 +0100 Subject: octoprint.python.pkgs.touchui: 0.3.13 -> 0.3.14 --- pkgs/applications/misc/octoprint/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 5e57d80bd5d..59a4391b9ec 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -127,13 +127,13 @@ in { touchui = buildPlugin rec { pname = "TouchUI"; - version = "0.3.13"; + version = "0.3.14"; src = fetchFromGitHub { owner = "BillyBlaze"; repo = "OctoPrint-${pname}"; rev = version; - sha256 = "0qk12ysabdzy6cna3l4f8v3qcnppppwxxsjx2i0xn1nd0cv6yzwh"; + sha256 = "033b9nk3kpnmjw9nggcaxy39hcgfviykcy2cx0j6m411agvmqbzf"; }; meta = with stdenv.lib; { -- cgit v1.2.3 From 254c72f560e8ea3a1769a92fb2301178b8b762b8 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sat, 14 Mar 2020 12:05:06 +0100 Subject: octoprint.python.pkgs.*: fix homepage --- pkgs/applications/misc/octoprint/plugins.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix index 59a4391b9ec..93c2d8c2edc 100644 --- a/pkgs/applications/misc/octoprint/plugins.nix +++ b/pkgs/applications/misc/octoprint/plugins.nix @@ -228,7 +228,7 @@ in { meta = with stdenv.lib; { description = "Edit gcode on OctoPrint"; - homepage = "https://github.com/Sebclem/OctoPrint-SimpleEmergencyStop"; + homepage = "https://github.com/ieatacid/OctoPrint-GcodeEditor"; license = licenses.agpl3; maintainers = with maintainers; [ WhittlesJr ]; }; @@ -247,7 +247,7 @@ in { meta = with stdenv.lib; { description = "A simple plugin that add an emergency stop buton on NavBar of OctoPrint"; - homepage = "https://github.com/ieatacid/OctoPrint-GcodeEditor"; + homepage = "https://github.com/Sebclem/OctoPrint-SimpleEmergencyStop"; license = licenses.agpl3; maintainers = with maintainers; [ WhittlesJr ]; }; -- cgit v1.2.3 From 40c012bc855b1e9f96df8cc2186a91332be2d3e6 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 15 Mar 2020 13:53:59 +0100 Subject: buildPythonPackage: always add interpreter to passthru --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0773a1984ab..0160eea663d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -78,6 +78,7 @@ let # Use passthru in order to prevent rebuilds when possible. passthru = (oldAttrs.passthru or {})// { pythonModule = python; + inherit python; pythonPath = [ ]; # Deprecated, for compatibility. requiredPythonModules = requiredPythonModules drv.propagatedBuildInputs; }; @@ -92,6 +93,7 @@ let # used by `nix-env`. name = removePythonPrefix oldAttrs.name; pythonModule = false; + inherit python; }; }); -- cgit v1.2.3 From 62e34d1c87ee8436bfa8ceaeac07ea3855fabd43 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 22 Mar 2020 05:27:20 +0000 Subject: nixos/acme: change default keyType to ec256 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously, the NixOS ACME module defaulted to using P-384 for TLS certificates. I believe that this is a mistake, and that we should use P-256 instead, despite it being theoretically cryptographically weaker. The security margin of a 256-bit elliptic curve cipher is substantial; beyond a certain level, more bits in the key serve more to slow things down than add meaningful protection. It's much more likely that ECDSA will be broken entirely, or some fatal flaw will be found in the NIST curves that makes them all insecure, than that the security margin will be reduced enough to put P-256 at risk but not P-384. It's also inconsistent to target a curve with a 192-bit security margin when our recommended nginx TLS configuration allows 128-bit AES. [This Stack Exchange answer][pornin] by cryptographer Thomas Pornin conveys the general attitude among experts: > Use P-256 to minimize trouble. If you feel that your manhood is > threatened by using a 256-bit curve where a 384-bit curve is > available, then use P-384: it will increases your computational and > network costs (a factor of about 3 for CPU, a few extra dozen bytes > on the network) but this is likely to be negligible in practice (in a > SSL-powered Web server, the heavy cost is in "Web", not "SSL"). [pornin]: https://security.stackexchange.com/a/78624 While the NIST curves have many flaws (see [SafeCurves][safecurves]), P-256 and P-384 are no different in this respect; SafeCurves gives them the same rating. The only NIST curve Bernstein [thinks better of, P-521][bernstein] (see "Other standard primes"), isn't usable for Web PKI (it's [not supported by BoringSSL by default][boringssl] and hence [doesn't work in Chromium/Chrome][chromium], and Let's Encrypt [don't support it either][letsencrypt]). [safecurves]: https://safecurves.cr.yp.to/ [bernstein]: https://blog.cr.yp.to/20140323-ecdsa.html [boringssl]: https://boringssl.googlesource.com/boringssl/+/e9fc3e547e557492316932b62881c3386973ceb2 [chromium]: https://bugs.chromium.org/p/chromium/issues/detail?id=478225 [letsencrypt]: https://letsencrypt.org/docs/integration-guide/#supported-key-algorithms So there's no real benefit to using P-384; what's the cost? In the Stack Exchange answer I linked, Pornin estimates a factor of 3× CPU usage, which wouldn't be so bad; unfortunately, this is wildly optimistic in practice, as P-256 is much more common and therefore much better optimized. [This GitHub comment][openssl] measures the performance differential for raw Diffie-Hellman operations with OpenSSL 1.1.1 at a whopping 14× (even P-521 fares better!); [Caddy disables P-384 by default][caddy] due to Go's [lack of accelerated assembly implementations][crypto/elliptic] for it, and the difference there seems even more extreme: [this golang-nuts post][golang-nuts] measures the key generation performance differential at 275×. It's unlikely to be the bottleneck for anyone, but I still feel kind of bad for anyone having lego generate hundreds of certificates and sign challenges with them with performance like that... [openssl]: https://github.com/mozilla/server-side-tls/issues/190#issuecomment-421831599 [caddy]: https://github.com/caddyserver/caddy/blob/2cab475ba516fa725d012f53ca417c3e039607de/modules/caddytls/values.go#L113-L124 [crypto/elliptic]: https://github.com/golang/go/tree/2910c5b4a01a573ebc97744890a07c1a3122c67a/src/crypto/elliptic [golang-nuts]: https://groups.google.com/forum/#!topic/golang-nuts/nlnJkBMMyzk In conclusion, there's no real reason to use P-384 in general: if you don't care about Web PKI compatibility and want to use a nicer curve, then Ed25519 or P-521 are better options; if you're a NIST-fearing paranoiac, you should use good old RSA; but if you're a normal person running a web server, then you're best served by just using P-256. Right now, NixOS makes an arbitrary decision between two equally-mediocre curves that just so happens to slow down ECDH key agreement for every TLS connection by over an order of magnitude; this commit fixes that. Unfortunately, it seems like existing P-384 certificates won't get migrated automatically on renewal without manual intervention, but that's a more general problem with the existing ACME module (see #81634; I know @yegortimoshenko is working on this). To migrate your certificates manually, run: $ sudo find /var/lib/acme/.lego/certificates -type f -delete $ sudo find /var/lib/acme -name '*.pem' -delete $ sudo systemctl restart 'acme-*.service' nginx.service (No warranty. If it breaks, you get to keep both pieces. But it worked for me.) --- nixos/modules/security/acme.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index b787a767539..dd9085b9a86 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -99,7 +99,7 @@ let keyType = mkOption { type = types.str; - default = "ec384"; + default = "ec256"; description = '' Key type to use for private keys. For an up to date list of supported values check the --key-type option -- cgit v1.2.3 From 0ee07ed92b33ad8a6b60ef5db4102286d1ace81f Mon Sep 17 00:00:00 2001 From: "Markus S. Wamser" Date: Sun, 22 Mar 2020 14:16:35 +0100 Subject: notable: use .desktop file from AppImage --- pkgs/applications/misc/notable/default.nix | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/notable/default.nix b/pkgs/applications/misc/notable/default.nix index 9a00959de02..923f5fb4528 100644 --- a/pkgs/applications/misc/notable/default.nix +++ b/pkgs/applications/misc/notable/default.nix @@ -3,14 +3,24 @@ let pname = "notable"; version = "1.8.4"; -in -appimageTools.wrapType2 rec { + sha256 = "0rvz8zwsi62kiq89pv8n2wh9h5yb030kvdr1vf65xwqkhqcrzrby"; + name = "${pname}-${version}"; + src = fetchurl { url = "https://github.com/notable/notable/releases/download/v${version}/Notable-${version}.AppImage"; - sha256 = "0rvz8zwsi62kiq89pv8n2wh9h5yb030kvdr1vf65xwqkhqcrzrby"; + inherit sha256; + }; + + appimageContents = appimageTools.extract { + inherit name src; }; +in +appimageTools.wrapType2 rec { + + inherit name src; + profile = '' export LC_ALL=C.UTF-8 export XDG_DATA_DIRS=${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS @@ -18,7 +28,14 @@ appimageTools.wrapType2 rec { multiPkgs = null; # no 32bit needed extraPkgs = p: (appimageTools.defaultFhsEnvArgs.multiPkgs p) ++ [ p.at-spi2-atk p.at-spi2-core ]; - extraInstallCommands = "mv $out/bin/{${name},${pname}}"; + extraInstallCommands = '' + mv $out/bin/{${name},${pname}} + install -m 444 -D ${appimageContents}/notable.desktop $out/share/applications/notable.desktop + install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/1024x1024/apps/notable.png \ + $out/share/icons/hicolor/1024x1024/apps/notable.png + substituteInPlace $out/share/applications/notable.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + ''; meta = with lib; { description = "The markdown-based note-taking app that doesn't suck"; -- cgit v1.2.3 From c304c1e7d0f5bc673c8e7626bfe09270caf5f733 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 23 Mar 2020 00:43:57 -0400 Subject: gcc: move .dll.a* outputs to $lib MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These are expected to be here for Windows compilation. The change in e1831ebea3bcb415800a74fe458f802e63549e1c didn’t move these correctly (while still patching the search paths). https://hydra.nixos.org/build/114202790 --- pkgs/development/compilers/gcc/builder.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index b153687980a..112439ba4d3 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -216,6 +216,7 @@ postInstall() { moveToOutput "${targetConfig+$targetConfig/}lib/lib*.so*" "$lib" moveToOutput "${targetConfig+$targetConfig/}lib/lib*.la" "$lib" moveToOutput "${targetConfig+$targetConfig/}lib/lib*.dylib" "$lib" + moveToOutput "${targetConfig+$targetConfig/}lib/lib*.dll.a" "$lib" moveToOutput "share/gcc-*/python" "$lib" for i in "$lib/${targetConfig}"/lib/*.{la,py}; do -- cgit v1.2.3 From 0c085950d76762a01acefc714b6d627c65df94c4 Mon Sep 17 00:00:00 2001 From: Rail Aliiev Date: Mon, 23 Mar 2020 15:52:40 -0400 Subject: znapzend: 0.18.0 -> 0.20.0 * Update znapzend and the dependencies * add autoreconfHook --- pkgs/tools/backup/znapzend/default.nix | 39 +++++++++++++++++----------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/pkgs/tools/backup/znapzend/default.nix b/pkgs/tools/backup/znapzend/default.nix index b44564efb82..ecfc19d3ef3 100644 --- a/pkgs/tools/backup/znapzend/default.nix +++ b/pkgs/tools/backup/znapzend/default.nix @@ -1,27 +1,28 @@ -{ stdenv, fetchFromGitHub, fetchurl, perl, perlPackages, wget, autoconf, automake }: +{ stdenv, fetchFromGitHub, fetchurl, perl, perlPackages, wget, autoconf, automake, autoreconfHook }: let - # when upgrade znapzend, check versions of Perl libs here: https://github.com/oetiker/znapzend/blob/master/PERL_MODULES - Mojolicious-6-46 = perlPackages.buildPerlPackage rec { + # when upgrade znapzend, check versions of Perl libs here: https://github.com/oetiker/znapzend/blob/master/cpanfile + # pinned versions are listed at https://github.com/oetiker/znapzend/blob/master/thirdparty/cpanfile-5.26.1.snapshot + Mojolicious-8-35 = perlPackages.buildPerlPackage rec { pname = "Mojolicious"; - version = "6.46"; + version = "8.35"; src = fetchurl { url = "mirror://cpan/authors/id/S/SR/SRI/${pname}-${version}.tar.gz"; - sha256 = "0i3axmx4506fx5gms148pj65x6ys7flaz1aqjd8hd9zfkd8pzdfr"; + sha256 = "1bll0ahh5v1y3x0ql29klwsa68cj46wzqc385srsnn2m8kh2ak8h"; }; }; - MojoIOLoopForkCall-0-17 = perlPackages.buildPerlModule rec { + MojoIOLoopForkCall-0-20 = perlPackages.buildPerlModule rec { pname = "Mojo-IOLoop-ForkCall"; - version = "0.17"; + version = "0.20"; src = fetchurl { url = "mirror://cpan/authors/id/J/JB/JBERGER/${pname}-${version}.tar.gz"; - sha256 = "090qxz1nbah2qxvfg4whl6yp6q03qkx7a42751iai521nk1yavc8"; + sha256 = "19pih5x0ayxs2m8j29qwdpi6ky3w4ghv6vrmax3ix9r59hj6569b"; }; - propagatedBuildInputs = [ perlPackages.IOPipely Mojolicious-6-46 ]; + propagatedBuildInputs = [ perlPackages.IOPipely Mojolicious-8-35 ]; }; - version = "0.18.0"; - checksum = "1nlvw56viwgafma506slywfg54z6009jmzc9q6wljgr6mqfmmchd"; + version = "0.20.0"; + checksum = "15lb5qwksa508m9bj6d3n4rrjpakfaas9qxspg408bcqfp7pqjw3"; in stdenv.mkDerivation { pname = "znapzend"; @@ -34,9 +35,9 @@ stdenv.mkDerivation { sha256 = checksum; }; - buildInputs = [ wget perl MojoIOLoopForkCall-0-17 perlPackages.TAPParserSourceHandlerpgTAP ]; + buildInputs = [ wget perl MojoIOLoopForkCall-0-20 perlPackages.TAPParserSourceHandlerpgTAP ]; - nativeBuildInputs = [ autoconf automake ]; + nativeBuildInputs = [ autoconf automake autoreconfHook ]; preConfigure = '' sed -i 's/^SUBDIRS =.*$/SUBDIRS = lib/' Makefile.am @@ -55,23 +56,23 @@ stdenv.mkDerivation { postInstall = '' substituteInPlace $out/bin/znapzend --replace "${perl}/bin/perl" \ "${perl}/bin/perl \ - -I${Mojolicious-6-46}/${perl.libPrefix} \ + -I${Mojolicious-8-35}/${perl.libPrefix} \ -I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \ - -I${MojoIOLoopForkCall-0-17}/${perl.libPrefix} \ + -I${MojoIOLoopForkCall-0-20}/${perl.libPrefix} \ -I${perlPackages.IOPipely}/${perl.libPrefix} \ " substituteInPlace $out/bin/znapzendzetup --replace "${perl}/bin/perl" \ "${perl}/bin/perl \ - -I${Mojolicious-6-46}/${perl.libPrefix} \ + -I${Mojolicious-8-35}/${perl.libPrefix} \ -I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \ - -I${MojoIOLoopForkCall-0-17}/${perl.libPrefix} \ + -I${MojoIOLoopForkCall-0-20}/${perl.libPrefix} \ -I${perlPackages.IOPipely}/${perl.libPrefix} \ " substituteInPlace $out/bin/znapzendztatz --replace "${perl}/bin/perl" \ "${perl}/bin/perl \ - -I${Mojolicious-6-46}/${perl.libPrefix} \ + -I${Mojolicious-8-35}/${perl.libPrefix} \ -I${perlPackages.TAPParserSourceHandlerpgTAP}/${perl.libPrefix} \ - -I${MojoIOLoopForkCall-0-17}/${perl.libPrefix} \ + -I${MojoIOLoopForkCall-0-20}/${perl.libPrefix} \ -I${perlPackages.IOPipely}/${perl.libPrefix} \ " ''; -- cgit v1.2.3 From ba7e3c6cbafcf4c40db0580ac36996d5e65d6397 Mon Sep 17 00:00:00 2001 From: Rail Aliiev Date: Mon, 23 Mar 2020 16:13:06 -0400 Subject: Add new znapzend features to modules --- nixos/modules/services/backup/znapzend.nix | 35 ++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/nixos/modules/services/backup/znapzend.nix b/nixos/modules/services/backup/znapzend.nix index 203631a577f..98cd647f61a 100644 --- a/nixos/modules/services/backup/znapzend.nix +++ b/nixos/modules/services/backup/znapzend.nix @@ -372,6 +372,41 @@ in and zfs8 for more info. ''; + features.sendRaw = mkEnableOption '' + sendRaw feature which adds the options -w to the + zfs send command. For encrypted source datasets this + instructs zfs not to decrypt before sending which results in a remote + backup that can't be read without the encryption key/passphrase, useful + when the remote isn't fully trusted or not physically secure. This + option must be used consistently, raw incrementals cannot be based on + non-raw snapshots and vice versa. + ''; + features.skipIntermediates = mkEnableOption '' + Enable the skipIntermediates feature to send a single increment + between latest common snapshot and the newly made one. It may skip + several source snaps if the destination was offline for some time, and + it should skip snapshots not managed by znapzend. Normally for online + destinations, the new snapshot is sent as soon as it is created on the + source, so there are no automatic increments to skip. + ''; + features.lowmemRecurse = mkEnableOption '' + use lowmemRecurse on systems where you have too many datasets, so a + recursive listing of attributes to find backup plans exhausts the + memory available to znapzend: instead, go the slower + way to first list all impacted dataset names, and then query their + configs one by one. + ''; + features.zfsGetType = mkEnableOption '' + use zfsGetType if your zfs get supports a + -t argument for filtering by dataset type at all AND + lists properties for snapshots by default when recursing, so that there + is too much data to process while searching for backup plans. + If these two conditions apply to your system, the time needed for a + --recursive search for backup plans can literally + differ by hundreds of times (depending on the amount of snapshots in + that dataset tree... and a decent backup plan will ensure you have a lot + of those), so you would benefit from requesting this feature. + ''; }; }; -- cgit v1.2.3 From 0cf2b462d61d8a79758dd061d04b6fd97137cbe2 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 25 Mar 2020 01:44:23 +0100 Subject: uefitool.new-engine: A56 -> A57 --- pkgs/tools/system/uefitool/variants.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/uefitool/variants.nix b/pkgs/tools/system/uefitool/variants.nix index cced17e6ddd..cb029fbc5bb 100644 --- a/pkgs/tools/system/uefitool/variants.nix +++ b/pkgs/tools/system/uefitool/variants.nix @@ -3,8 +3,8 @@ let common = opts: libsForQt5.callPackage (import ./common.nix opts) {}; in rec { new-engine = common rec { - version = "A56"; - sha256 = "0sxmjkrwcchxg2qmcjsw2vr42s7cdcg2fxkwb8axq2r2z23465gp"; + version = "A57"; + sha256 = "0algfdlxfjs582hsqmagbcmw06p8qlh0k5xczfkscs3prdn2vm7n"; installFiles = [ "UEFITool/UEFITool" "UEFIFind/UEFIFind" "UEFIExtract/UEFIExtract" ]; }; old-engine = common rec { -- cgit v1.2.3 From 15789d28f766f6ee3c03aa6adaebacec8f3c2bac Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 25 Mar 2020 01:44:37 +0100 Subject: uefitool.old-engine: 0.27.0 -> 0.28.0 --- pkgs/tools/system/uefitool/variants.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/uefitool/variants.nix b/pkgs/tools/system/uefitool/variants.nix index cb029fbc5bb..470c8a0ca4d 100644 --- a/pkgs/tools/system/uefitool/variants.nix +++ b/pkgs/tools/system/uefitool/variants.nix @@ -8,8 +8,8 @@ in rec { installFiles = [ "UEFITool/UEFITool" "UEFIFind/UEFIFind" "UEFIExtract/UEFIExtract" ]; }; old-engine = common rec { - version = "0.27.0"; - sha256 = "1i1p823qld927p4f1wcphqcnivb9mq7fi5xmzibxc3g9zzgnyc2h"; + version = "0.28.0"; + sha256 = "1n2hd2dysi5bv2iyq40phh1jxc48gdwzs414vfbxvcharcwapnja"; installFiles = [ "UEFITool" "UEFIReplace/UEFIReplace" "UEFIPatch/UEFIPatch" ]; }; } -- cgit v1.2.3 From 9bbd1037eca930b7ee9ed397c2f390a85a0dd7c3 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Thu, 26 Mar 2020 18:21:43 +0100 Subject: nixos/mediawiki: allow using default extensions --- nixos/modules/services/web-apps/mediawiki.nix | 23 +++++++++++++++++------ nixos/tests/mediawiki.nix | 7 +++++++ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/web-apps/mediawiki.nix b/nixos/modules/services/web-apps/mediawiki.nix index e9ed53857d8..0a5b6047bb5 100644 --- a/nixos/modules/services/web-apps/mediawiki.nix +++ b/nixos/modules/services/web-apps/mediawiki.nix @@ -29,7 +29,7 @@ let '') cfg.skins)} ${concatStringsSep "\n" (mapAttrsToList (k: v: '' - ln -s ${v} $out/share/mediawiki/extensions/${k} + ln -s ${if v != null then v else "$src/share/mediawiki/extensions/${k}"} $out/share/mediawiki/extensions/${k} '') cfg.extensions)} ''; }; @@ -204,17 +204,28 @@ in default = {}; type = types.attrsOf types.path; description = '' - List of paths whose content is copied to the 'skins' - subdirectory of the MediaWiki installation. + Attribute set of paths whose content is copied to the skins + subdirectory of the MediaWiki installation in addition to the default skins. ''; }; extensions = mkOption { default = {}; - type = types.attrsOf types.path; + type = types.attrsOf (types.nullOr types.path); description = '' - List of paths whose content is copied to the 'extensions' - subdirectory of the MediaWiki installation. + Attribute set of paths whose content is copied to the extensions + subdirectory of the MediaWiki installation and enabled in configuration. + + Use null instead of path to enable extensions that are part of MediaWiki. + ''; + example = literalExample '' + { + Matomo = pkgs.fetchzip { + url = "https://github.com/DaSchTour/matomo-mediawiki-extension/archive/v4.0.1.tar.gz"; + sha256 = "0g5rd3zp0avwlmqagc59cg9bbkn3r7wx7p6yr80s644mj6dlvs1b"; + }; + ParserFunctions = null; + } ''; }; diff --git a/nixos/tests/mediawiki.nix b/nixos/tests/mediawiki.nix index 9468c1de8cc..008682310cf 100644 --- a/nixos/tests/mediawiki.nix +++ b/nixos/tests/mediawiki.nix @@ -8,6 +8,13 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { services.mediawiki.virtualHost.hostName = "localhost"; services.mediawiki.virtualHost.adminAddr = "root@example.com"; services.mediawiki.passwordFile = pkgs.writeText "password" "correcthorsebatterystaple"; + services.mediawiki.extensions = { + Matomo = pkgs.fetchzip { + url = "https://github.com/DaSchTour/matomo-mediawiki-extension/archive/v4.0.1.tar.gz"; + sha256 = "0g5rd3zp0avwlmqagc59cg9bbkn3r7wx7p6yr80s644mj6dlvs1b"; + }; + ParserFunctions = null; + }; }; testScript = '' -- cgit v1.2.3 From b2c8626d618a8204ff6a5959653daec033e7362f Mon Sep 17 00:00:00 2001 From: Servilio Afre Puentes Date: Wed, 25 Mar 2020 17:09:51 -0400 Subject: emacs-modes: build MELPA package sets without null packages The current algorithm creates attributes with null values for packages with no source in a variant of MELPA. Though will satify dependencies they produce no files, and though a build that transitively depends on one them will be successful, Emacs won't find them and any code depending on them won't work. The solution with minimal code change would have been filtering the list of results from melpaDerivation by comparing the value against null, but that leads to an infinite recursion. This commit also moves legacy renames from the shared to the unstable set, as the corresponding null value elements won't exist in the stable set anymore. The test used for the problem was: $ nix-build --show-trace ./default.nix -A emacs26Packages.melpaStablePackages.findr error: expression does not evaluate to a derivation (or a set or list of those) The expected output, obtained with this commit is: $ nix-build --show-trace ./default.nix -A emacs26Packages.melpaStablePackages.findr error: attribute 'findr' in selection path 'emacs26Packages.melpaStablePackages.findr' not found --- .../editors/emacs-modes/libgenerated.nix | 9 ++++++--- .../editors/emacs-modes/melpa-packages.nix | 22 +++++++++++++--------- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/libgenerated.nix b/pkgs/applications/editors/emacs-modes/libgenerated.nix index 57bccc60818..d0c8b4565f5 100644 --- a/pkgs/applications/editors/emacs-modes/libgenerated.nix +++ b/pkgs/applications/editors/emacs-modes/libgenerated.nix @@ -61,8 +61,9 @@ in { pname = builtins.replaceStrings [ "@" ] [ "at" ] ename; broken = ! isNull error; in - lib.nameValuePair ename (if hasSource then ( - self.callPackage ({ melpaBuild, fetchurl, ... }@pkgargs: + if hasSource then + lib.nameValuePair ename ( + self.callPackage ({ melpaBuild, fetchurl, ... }@pkgargs: melpaBuild { inherit pname; ename = ename; @@ -85,6 +86,8 @@ in { }; } ) {} - ) else null); + ) + else + null; } diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 5c9456b76a6..0dacb317318 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -42,7 +42,9 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac }: let inherit (import ./libgenerated.nix lib self) melpaDerivation; - super = lib.listToAttrs (map (melpaDerivation variant) (lib.importJSON archiveJson)); + super = lib.listToAttrs (builtins.filter (s: s != null) + (map (melpaDerivation variant) + (lib.importJSON archiveJson))); overrides = rec { shared = rec { @@ -268,10 +270,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac # Map legacy renames from emacs2nix since code generation was ported to emacs lisp _0blayout = super."0blayout"; - _0xc = super."0xc"; - _2048-game = super."2048-game"; - _4clojure = super."4clojure"; - at = super."@"; desktop-plus = super."desktop+"; ghub-plus = super."ghub+"; git-gutter-plus = super."git-gutter+"; @@ -282,10 +280,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac markdown-mode-plus = super."markdown-mode+"; package-plus = super."package+"; rect-plus = super."rect+"; - term-plus = super."term+"; - term-plus-key-intercept = super."term+key-intercept"; - term-plus-mux = super."term+mux"; - xml-plus = super."xml+"; }; stable = shared // { @@ -414,6 +408,16 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac # Legacy alias emacs-libvterm = unstable.vterm; + # Map legacy renames from emacs2nix since code generation was ported to emacs lisp + _0xc = super."0xc"; + _2048-game = super."2048-game"; + _4clojure = super."4clojure"; + at = super."@"; + term-plus = super."term+"; + term-plus-key-intercept = super."term+key-intercept"; + term-plus-mux = super."term+mux"; + xml-plus = super."xml+"; + w3m = super.w3m.override (args: { melpaBuild = drv: args.melpaBuild (drv // { prePatch = -- cgit v1.2.3 From 4acda90e5acaff1379c06fbd856f82118e4b1c0f Mon Sep 17 00:00:00 2001 From: Rostislav Benes Date: Sun, 22 Mar 2020 18:32:59 +0100 Subject: alsa-ucm-conf: init at 1.2.2 --- maintainers/maintainer-list.nix | 6 ++++ pkgs/os-specific/linux/alsa-ucm-conf/default.nix | 36 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 44 insertions(+) create mode 100644 pkgs/os-specific/linux/alsa-ucm-conf/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8e8c9f2fb10..7fde51d8210 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6305,6 +6305,12 @@ fingerprint = "92B2 904F D293 C94D C4C9 3E6B BFBA F4C9 75F7 6450"; }]; }; + roastiek = { + email = "r.dee.b.b@gmail.com"; + github = "roastiek"; + githubId = 422802; + name = "Rostislav Beneš"; + }; rob = { email = "rob.vermaas@gmail.com"; github = "rbvermaa"; diff --git a/pkgs/os-specific/linux/alsa-ucm-conf/default.nix b/pkgs/os-specific/linux/alsa-ucm-conf/default.nix new file mode 100644 index 00000000000..6f2766ef9ff --- /dev/null +++ b/pkgs/os-specific/linux/alsa-ucm-conf/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "alsa-ucm-conf-${version}"; + version = "1.2.2"; + + src = fetchurl { + url = "mirror://alsa/lib/${name}.tar.bz2"; + sha256 = "0364fgzdm2qrsqvgqri25gzscbma7yqlv31wz8b1z9c5phlxkgvy"; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/alsa + cp -r ucm ucm2 $out/share/alsa + + runHook postInstall + ''; + + meta = with stdenv.lib; { + homepage = http://www.alsa-project.org/; + description = "ALSA Use Case Manager configuration"; + + longDescription = '' + The Advanced Linux Sound Architecture (ALSA) provides audio and + MIDI functionality to the Linux-based operating system. + ''; + + license = licenses.bsd3; + maintainers = [ maintainers.roastiek ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c3a7715b317..0d7f4e69070 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16251,6 +16251,8 @@ in alsaOss = callPackage ../os-specific/linux/alsa-oss { }; alsaTools = callPackage ../os-specific/linux/alsa-tools { }; + alsa-ucm-conf = callPackage ../os-specific/linux/alsa-ucm-conf { }; + inherit (callPackage ../misc/arm-trusted-firmware {}) buildArmTrustedFirmware armTrustedFirmwareTools -- cgit v1.2.3 From f0a6dfcbdf78ebc1fb30797d0ef0012a0acef837 Mon Sep 17 00:00:00 2001 From: Rostislav Benes Date: Sun, 22 Mar 2020 18:36:40 +0100 Subject: alsa-topology-conf: init at 1.2.2 --- .../linux/alsa-topology-conf/default.nix | 36 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/os-specific/linux/alsa-topology-conf/default.nix diff --git a/pkgs/os-specific/linux/alsa-topology-conf/default.nix b/pkgs/os-specific/linux/alsa-topology-conf/default.nix new file mode 100644 index 00000000000..26febf0daa7 --- /dev/null +++ b/pkgs/os-specific/linux/alsa-topology-conf/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "alsa-topology-conf-${version}"; + version = "1.2.2"; + + src = fetchurl { + url = "mirror://alsa/lib/${name}.tar.bz2"; + sha256 = "09cls485ckdjsp4azhv3nw7chyg3r7zrqgald6yp70f7cysxcwml"; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/alsa + cp -r topology $out/share/alsa + + runHook postInstall + ''; + + meta = with stdenv.lib; { + homepage = http://www.alsa-project.org/; + description = "ALSA topology configuration files"; + + longDescription = '' + The Advanced Linux Sound Architecture (ALSA) provides audio and + MIDI functionality to the Linux-based operating system. + ''; + + license = licenses.bsd3; + maintainers = [ maintainers.roastiek ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d7f4e69070..7ce8a77d0bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16253,6 +16253,8 @@ in alsa-ucm-conf = callPackage ../os-specific/linux/alsa-ucm-conf { }; + alsa-topology-conf = callPackage ../os-specific/linux/alsa-topology-conf { }; + inherit (callPackage ../misc/arm-trusted-firmware {}) buildArmTrustedFirmware armTrustedFirmwareTools -- cgit v1.2.3 From 4fef426da6eae92a524ea5ca34c9a482dcf5985f Mon Sep 17 00:00:00 2001 From: Rostislav Benes Date: Sun, 22 Mar 2020 18:40:47 +0100 Subject: alsaLib: 1.1.9 -> 1.2.2 --- pkgs/os-specific/linux/alsa-lib/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix index 8dcddf4baf9..e599ba1f3f1 100644 --- a/pkgs/os-specific/linux/alsa-lib/default.nix +++ b/pkgs/os-specific/linux/alsa-lib/default.nix @@ -1,25 +1,27 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, alsa-ucm-conf, alsa-topology-conf }: stdenv.mkDerivation rec { - name = "alsa-lib-1.1.9"; + name = "alsa-lib-1.2.2"; src = fetchurl { url = "mirror://alsa/lib/${name}.tar.bz2"; - sha256 = "0jwr9g4yxg9gj6xx0sb2r6wrdl8amrjd19hilkrq4rirynp770s8"; + sha256 = "1v5kb8jyvrpkvvq7dq8hfbmcj68lml97i4s0prxpfx2mh3c57s6q"; }; patches = [ ./alsa-plugin-conf-multilib.patch ]; + enableParallelBuilding = true; + # Fix pcm.h file in order to prevent some compilation bugs - # 2: see http://stackoverflow.com/questions/3103400/how-to-overcome-u-int8-t-vs-uint8-t-issue-efficiently postPatch = '' sed -i -e 's|//int snd_pcm_mixer_element(snd_pcm_t \*pcm, snd_mixer_t \*mixer, snd_mixer_elem_t \*\*elem);|/\*int snd_pcm_mixer_element(snd_pcm_t \*pcm, snd_mixer_t \*mixer, snd_mixer_elem_t \*\*elem);\*/|' include/pcm.h + ''; - - sed -i -e '1i#include ' include/pcm.h - sed -i -e 's/u_int\([0-9]*\)_t/uint\1_t/g' include/pcm.h + postInstall = '' + ln -s ${alsa-ucm-conf}/share/alsa/{ucm,ucm2} $out/share/alsa + ln -s ${alsa-topology-conf}/share/alsa/topology $out/share/alsa ''; outputs = [ "out" "dev" ]; -- cgit v1.2.3 From 62cdbd678cf2870267f230a412a8f44c6839dfe9 Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Sun, 29 Mar 2020 10:03:47 +0200 Subject: linux config: enable SND CA0132 DSP loading Since we select everything as a module, snd_hda_codec_ca0132 is built as well. DSP loading is not enabled by default, but without it the soundcard produces timeouts within ALSA and does not emit sound. Explicitly enable the firmware loading to ensure Soundblaster Z/Zx/ZxR/Recon devices can be used with NixOS. The patch to enable this by default in the kernel is staged for 5.8. --- pkgs/os-specific/linux/kernel/common-config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 2c8b8de65b3..efd49ab930d 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -244,6 +244,7 @@ let SND_HDA_RECONFIG = yes; # Support reconfiguration of jack functions # Support configuring jack functions via fw mechanism at boot SND_HDA_PATCH_LOADER = yes; + SND_HDA_CODEC_CA0132_DSP = whenOlder "5.8" yes; # Enable DSP firmware loading on Creative Soundblaster Z/Zx/ZxR/Recon SND_OSSEMUL = yes; SND_USB_CAIAQ_INPUT = yes; # Enable PSS mixer (Beethoven ADSP-16 and other compatible) -- cgit v1.2.3 From 9304c984e291da1e2d2213446f7793ecf895d443 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Mar 2020 01:56:54 +0000 Subject: libsignal-protocol-c: 2.3.2 -> 2.3.3 --- pkgs/development/libraries/libsignal-protocol-c/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libsignal-protocol-c/default.nix b/pkgs/development/libraries/libsignal-protocol-c/default.nix index f3549d52f69..6278f6234f0 100644 --- a/pkgs/development/libraries/libsignal-protocol-c/default.nix +++ b/pkgs/development/libraries/libsignal-protocol-c/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libsignal-protocol-c"; - version = "2.3.2"; + version = "2.3.3"; src = fetchFromGitHub { owner = "signalapp"; repo = "libsignal-protocol-c"; rev = "v${version}"; - sha256 = "1qj2w4csy6j9jg1jy66n1qwysx7hgjywk4n35hlqcnh1kpa14k3p"; + sha256 = "0z5p03vk15i6h870azfjgyfgxhv31q2vq6rfhnybrnkxq2wqzwhk"; }; nativeBuildInputs = [ cmake ]; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Signal Protocol C Library"; - homepage = https://github.com/signalapp/libsignal-protocol-c; + homepage = "https://github.com/signalapp/libsignal-protocol-c"; license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ orivej ]; -- cgit v1.2.3 From e96fa035096cd84515d099d8ee6414a8e72fd619 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 30 Mar 2020 06:27:57 +0000 Subject: netcdf: 4.7.3 -> 4.7.4 --- pkgs/development/libraries/netcdf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix index 1436fb02127..925cd7649e2 100644 --- a/pkgs/development/libraries/netcdf/default.nix +++ b/pkgs/development/libraries/netcdf/default.nix @@ -10,11 +10,11 @@ let mpi = hdf5.mpi; in stdenv.mkDerivation rec { pname = "netcdf"; - version = "4.7.3"; + version = "4.7.4"; src = fetchurl { url = "https://www.unidata.ucar.edu/downloads/netcdf/ftp/${pname}-c-${version}.tar.gz"; - sha256 = "12s4w2s96p51hlsa81lw92w56rdx8i3mk21pz2ydwcamw579z34f"; + sha256 = "1a2fpp15a2rl1m50gcvvzd9y6bavl6vjf9zzf63sz5gdmq06yiqf"; }; postPatch = '' @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { meta = { description = "Libraries for the Unidata network Common Data Format"; platforms = stdenv.lib.platforms.unix; - homepage = https://www.unidata.ucar.edu/software/netcdf/; + homepage = "https://www.unidata.ucar.edu/software/netcdf/"; license = { url = https://www.unidata.ucar.edu/software/netcdf/docs/copyright.html; }; -- cgit v1.2.3 From 321bc323a2a278fab59fa24e7dbc5cc1f609482c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Mon, 30 Mar 2020 16:52:50 +0200 Subject: krita: disable parallel building #35359 --- pkgs/applications/graphics/krita/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 3cc4834d756..9704476e73f 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -17,6 +17,9 @@ mkDerivation rec { sha256 = "1sx4j4brk71bas3cpqzk4bd8bknyl3x4fdg5pv4r7pcfd3vpq2vy"; }; + # *somtimes* fails with can't find ui_manager.h, also see https://github.com/NixOS/nixpkgs/issues/35359 + enableParallelBuilding = false; + nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ]; buildInputs = [ -- cgit v1.2.3 From 84f720d9a40aae4307ab40c877864f975012b2f9 Mon Sep 17 00:00:00 2001 From: Griffin Smith Date: Mon, 30 Mar 2020 16:42:55 -0400 Subject: cairo: pass --disable-xlib to config if no x11 It appears that cairo's configure script, at least on MacOS but perhaps elsewhere, unconditionally enables xlib support, even if the library isn't present, which breaks the build on MacOS always (since x11 is disabled by default now). This explicitly passes `--disable-x11` if x11Support is set to false, which fixes the build for me. --- pkgs/development/libraries/cairo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 80f8f9498d7..4f02cb057fa 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { ++ optional glSupport libGL ; # TODO: maybe liblzo but what would it be for here? - configureFlags = if stdenv.isDarwin then [ + configureFlags = (if stdenv.isDarwin then [ "--disable-dependency-tracking" "--enable-quartz" "--enable-quartz-font" @@ -71,7 +71,7 @@ in stdenv.mkDerivation rec { ++ optional xcbSupport "--enable-xcb" ++ optional glSupport "--enable-gl" ++ optional pdfSupport "--enable-pdf" - ); + )) ++ optional (!x11Support) "--disable-xlib"; preConfigure = # On FreeBSD, `-ldl' doesn't exist. -- cgit v1.2.3 From 4c31f28fa1e3051257f3542b5033cf013917f240 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Wed, 1 Apr 2020 10:01:18 +0200 Subject: cri-tools: v1.17.0 -> v1.18.0 Signed-off-by: Sascha Grunert --- pkgs/tools/virtualization/cri-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/tools/virtualization/cri-tools/default.nix index 910f2822c6f..c39781b1618 100644 --- a/pkgs/tools/virtualization/cri-tools/default.nix +++ b/pkgs/tools/virtualization/cri-tools/default.nix @@ -2,12 +2,12 @@ buildGoPackage rec { pname = "cri-tools"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "0h9gry56graif761lmcy91q9fzwvmwb15wcx8245927yfg5j0zgh"; + sha256 = "06sxjhjpd893fn945c1s4adri2bf7s50ddvcw5pnwb6qndzfljw6"; }; goPackagePath = "github.com/kubernetes-sigs/cri-tools"; -- cgit v1.2.3 From 83308dad20f72a92090218fc757eb76792bdc309 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 1 Apr 2020 04:20:00 -0500 Subject: protobuf3_11: 3.11.3 -> 3.11.4 Changelog: https://github.com/protocolbuffers/protobuf/releases/tag/v3.11.4 --- pkgs/development/libraries/protobuf/3.11.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/protobuf/3.11.nix b/pkgs/development/libraries/protobuf/3.11.nix index fa238fdca54..c5d8b21b1ac 100644 --- a/pkgs/development/libraries/protobuf/3.11.nix +++ b/pkgs/development/libraries/protobuf/3.11.nix @@ -1,6 +1,6 @@ { callPackage, ... }: callPackage ./generic-v3.nix { - version = "3.11.3"; - sha256 = "0cn6h6fg5h64q5h3ncfwr3m7yszf5n9gpvgpv7s1csndp0ffzmin"; + version = "3.11.4"; + sha256 = "00g61f1yd8z5l0z0svmr3hms38ph35lcx2y7hivw6fahslw0l8yw"; } -- cgit v1.2.3 From 15002f1cfd5bc9f8c0e089e0d6c69de8204382f3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 1 Apr 2020 14:40:51 +0200 Subject: tree-wide: Switch from gnome3.maintainers to lib.teams.gnome --- nixos/tests/gnome3-xorg.nix | 6 +++--- nixos/tests/gnome3.nix | 6 +++--- pkgs/applications/audio/gnome-podcasts/default.nix | 3 +-- pkgs/applications/editors/gnome-builder/default.nix | 2 +- pkgs/applications/graphics/gnome-photos/default.nix | 2 +- pkgs/applications/misc/almanah/default.nix | 2 +- pkgs/applications/misc/glom/default.nix | 3 +-- pkgs/applications/misc/gnome-firmware-updater/default.nix | 3 +-- pkgs/applications/misc/gnome-multi-writer/default.nix | 2 +- pkgs/applications/misc/gnome-recipes/default.nix | 2 +- pkgs/applications/misc/gnome-usage/default.nix | 2 +- pkgs/applications/misc/orca/default.nix | 2 +- pkgs/data/documentation/gnome-user-docs/default.nix | 2 +- pkgs/desktops/gnome-3/apps/accerciser/default.nix | 2 +- pkgs/desktops/gnome-3/apps/cheese/default.nix | 2 +- pkgs/desktops/gnome-3/apps/evolution/default.nix | 2 +- pkgs/desktops/gnome-3/apps/file-roller/default.nix | 2 +- pkgs/desktops/gnome-3/apps/gedit/default.nix | 2 +- pkgs/desktops/gnome-3/apps/ghex/default.nix | 2 +- pkgs/desktops/gnome-3/apps/glade/default.nix | 2 +- pkgs/desktops/gnome-3/apps/gnome-books/default.nix | 2 +- pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix | 2 +- pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix | 2 +- pkgs/desktops/gnome-3/apps/gnome-characters/default.nix | 2 +- pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix | 2 +- pkgs/desktops/gnome-3/apps/gnome-documents/default.nix | 2 +- pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix | 2 +- pkgs/desktops/gnome-3/apps/gnome-logs/default.nix | 2 +- pkgs/desktops/gnome-3/apps/gnome-maps/default.nix | 2 +- pkgs/desktops/gnome-3/apps/gnome-music/default.nix | 2 +- pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix | 2 +- pkgs/desktops/gnome-3/apps/gnome-notes/default.nix | 2 +- pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix | 2 +- pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix | 2 +- pkgs/desktops/gnome-3/apps/gnome-todo/default.nix | 2 +- pkgs/desktops/gnome-3/apps/gnome-weather/default.nix | 2 +- pkgs/desktops/gnome-3/apps/polari/default.nix | 2 +- pkgs/desktops/gnome-3/apps/seahorse/default.nix | 2 +- pkgs/desktops/gnome-3/apps/vinagre/default.nix | 2 +- pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix | 2 +- pkgs/desktops/gnome-3/core/baobab/default.nix | 2 +- pkgs/desktops/gnome-3/core/caribou/default.nix | 2 +- pkgs/desktops/gnome-3/core/dconf-editor/default.nix | 2 +- pkgs/desktops/gnome-3/core/empathy/default.nix | 2 +- pkgs/desktops/gnome-3/core/eog/default.nix | 2 +- pkgs/desktops/gnome-3/core/epiphany/default.nix | 2 +- pkgs/desktops/gnome-3/core/evince/default.nix | 2 +- pkgs/desktops/gnome-3/core/evolution-data-server/default.nix | 2 +- pkgs/desktops/gnome-3/core/gdm/default.nix | 2 +- pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix | 2 +- pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix | 2 +- pkgs/desktops/gnome-3/core/gnome-calculator/default.nix | 2 +- pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix | 2 +- pkgs/desktops/gnome-3/core/gnome-common/default.nix | 2 +- pkgs/desktops/gnome-3/core/gnome-contacts/default.nix | 2 +- pkgs/desktops/gnome-3/core/gnome-control-center/default.nix | 2 +- pkgs/desktops/gnome-3/core/gnome-desktop/default.nix | 2 +- pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix | 2 +- pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix | 2 +- pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix | 2 +- pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix | 2 +- pkgs/desktops/gnome-3/core/gnome-keyring/default.nix | 2 +- pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix | 2 +- pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix | 4 ++-- pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix | 2 +- pkgs/desktops/gnome-3/core/gnome-session/default.nix | 2 +- pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix | 2 +- pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix | 2 +- pkgs/desktops/gnome-3/core/gnome-shell/default.nix | 2 +- pkgs/desktops/gnome-3/core/gnome-software/default.nix | 2 +- pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix | 2 +- pkgs/desktops/gnome-3/core/gnome-terminal/default.nix | 2 +- pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix | 2 +- pkgs/desktops/gnome-3/core/gnome-tour/default.nix | 2 +- pkgs/desktops/gnome-3/core/gnome-user-share/default.nix | 2 +- pkgs/desktops/gnome-3/core/gucharmap/default.nix | 2 +- pkgs/desktops/gnome-3/core/mutter/3.28.nix | 2 +- pkgs/desktops/gnome-3/core/mutter/default.nix | 2 +- pkgs/desktops/gnome-3/core/nautilus/default.nix | 2 +- pkgs/desktops/gnome-3/core/rygel/default.nix | 2 +- pkgs/desktops/gnome-3/core/simple-scan/default.nix | 2 +- pkgs/desktops/gnome-3/core/sushi/default.nix | 2 +- pkgs/desktops/gnome-3/core/totem/default.nix | 2 +- pkgs/desktops/gnome-3/core/yelp-xsl/default.nix | 2 +- pkgs/desktops/gnome-3/core/yelp/default.nix | 2 +- pkgs/desktops/gnome-3/core/zenity/default.nix | 2 +- pkgs/desktops/gnome-3/default.nix | 4 ++-- pkgs/desktops/gnome-3/devtools/devhelp/default.nix | 2 +- pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix | 2 +- pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix | 2 +- pkgs/desktops/gnome-3/games/aisleriot/default.nix | 2 +- pkgs/desktops/gnome-3/games/atomix/default.nix | 2 +- pkgs/desktops/gnome-3/games/five-or-more/default.nix | 2 +- pkgs/desktops/gnome-3/games/four-in-a-row/default.nix | 2 +- pkgs/desktops/gnome-3/games/gnome-chess/default.nix | 2 +- pkgs/desktops/gnome-3/games/gnome-klotski/default.nix | 2 +- pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix | 2 +- pkgs/desktops/gnome-3/games/gnome-mines/default.nix | 2 +- pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix | 2 +- pkgs/desktops/gnome-3/games/gnome-robots/default.nix | 2 +- pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix | 2 +- pkgs/desktops/gnome-3/games/gnome-taquin/default.nix | 2 +- pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix | 2 +- pkgs/desktops/gnome-3/games/hitori/default.nix | 2 +- pkgs/desktops/gnome-3/games/iagno/default.nix | 2 +- pkgs/desktops/gnome-3/games/lightsoff/default.nix | 2 +- pkgs/desktops/gnome-3/games/quadrapassel/default.nix | 2 +- pkgs/desktops/gnome-3/games/swell-foop/default.nix | 2 +- pkgs/desktops/gnome-3/games/tali/default.nix | 2 +- pkgs/desktops/gnome-3/misc/geary/default.nix | 2 +- pkgs/desktops/gnome-3/misc/gnome-applets/default.nix | 2 +- pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix | 2 +- pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix | 2 +- pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix | 2 +- pkgs/desktops/gnome-3/misc/gnome-panel/default.nix | 2 +- pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix | 2 +- pkgs/desktops/gnome-3/misc/gpaste/default.nix | 3 +-- pkgs/desktops/gnome-3/misc/gtkhtml/default.nix | 2 +- pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix | 2 +- pkgs/desktops/gnome-3/misc/metacity/default.nix | 2 +- pkgs/desktops/gnome-3/misc/nautilus-python/default.nix | 2 +- pkgs/development/libraries/at-spi2-atk/default.nix | 2 +- pkgs/development/libraries/at-spi2-core/default.nix | 2 +- pkgs/development/libraries/dconf/default.nix | 2 +- pkgs/development/libraries/folks/default.nix | 2 +- pkgs/development/libraries/gcab/default.nix | 2 +- pkgs/development/libraries/gcr/default.nix | 2 +- pkgs/development/libraries/gdl/default.nix | 2 +- pkgs/development/libraries/geocode-glib/default.nix | 2 +- pkgs/development/libraries/gexiv2/default.nix | 2 +- pkgs/development/libraries/gfbgraph/default.nix | 2 +- pkgs/development/libraries/gjs/default.nix | 2 +- pkgs/development/libraries/glib-networking/default.nix | 2 +- pkgs/development/libraries/gnome-online-accounts/default.nix | 2 +- pkgs/development/libraries/gnome-video-effects/default.nix | 2 +- pkgs/development/libraries/gom/default.nix | 2 +- pkgs/development/libraries/grilo-plugins/default.nix | 2 +- pkgs/development/libraries/grilo/default.nix | 2 +- pkgs/development/libraries/gsettings-desktop-schemas/default.nix | 2 +- pkgs/development/libraries/gsound/default.nix | 2 +- pkgs/development/libraries/gspell/default.nix | 2 +- pkgs/development/libraries/gtksourceview/3.x.nix | 2 +- pkgs/development/libraries/gtksourceview/4.x.nix | 2 +- pkgs/development/libraries/gtksourceviewmm/4.x.nix | 2 +- pkgs/development/libraries/gvfs/default.nix | 2 +- pkgs/development/libraries/jsonrpc-glib/default.nix | 2 +- pkgs/development/libraries/libchamplain/default.nix | 2 +- pkgs/development/libraries/libdazzle/default.nix | 2 +- pkgs/development/libraries/libepc/default.nix | 2 +- pkgs/development/libraries/libgda/default.nix | 2 +- pkgs/development/libraries/libgdamm/default.nix | 2 +- pkgs/development/libraries/libgdata/default.nix | 2 +- pkgs/development/libraries/libgee/default.nix | 2 +- pkgs/development/libraries/libgepub/default.nix | 2 +- pkgs/development/libraries/libgit2-glib/default.nix | 2 +- pkgs/development/libraries/libgnomekbd/default.nix | 2 +- pkgs/development/libraries/libgrss/default.nix | 2 +- pkgs/development/libraries/libgtop/default.nix | 2 +- pkgs/development/libraries/libgudev/default.nix | 2 +- pkgs/development/libraries/libgweather/default.nix | 2 +- pkgs/development/libraries/libgxps/default.nix | 2 +- pkgs/development/libraries/libhttpseverywhere/default.nix | 2 +- pkgs/development/libraries/libmanette/default.nix | 2 +- pkgs/development/libraries/libmediaart/default.nix | 2 +- pkgs/development/libraries/libnotify/default.nix | 2 +- pkgs/development/libraries/libpeas/default.nix | 2 +- pkgs/development/libraries/librest/default.nix | 2 +- pkgs/development/libraries/librsvg/default.nix | 2 +- pkgs/development/libraries/libzapojit/default.nix | 2 +- pkgs/development/libraries/mm-common/default.nix | 2 +- pkgs/development/libraries/rarian/default.nix | 2 +- pkgs/development/libraries/template-glib/default.nix | 2 +- pkgs/development/libraries/totem-pl-parser/default.nix | 2 +- pkgs/development/libraries/tracker-miners/default.nix | 2 +- pkgs/development/libraries/tracker/default.nix | 2 +- pkgs/development/libraries/vte/default.nix | 2 +- pkgs/development/libraries/webkitgtk/default.nix | 3 +-- pkgs/development/tools/profiling/sysprof/default.nix | 2 +- pkgs/tools/networking/gupnp-tools/default.nix | 2 +- pkgs/tools/security/gnome-keysign/default.nix | 2 +- 180 files changed, 186 insertions(+), 191 deletions(-) diff --git a/nixos/tests/gnome3-xorg.nix b/nixos/tests/gnome3-xorg.nix index f793bb922ad..b59badcd5de 100644 --- a/nixos/tests/gnome3-xorg.nix +++ b/nixos/tests/gnome3-xorg.nix @@ -1,7 +1,7 @@ -import ./make-test-python.nix ({ pkgs, ...} : { +import ./make-test-python.nix ({ pkgs, lib, ...} : { name = "gnome3-xorg"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = pkgs.gnome3.maintainers; + meta = with lib; { + maintainers = teams.gnome.members; }; machine = { nodes, ... }: let diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix index 486c146d8dc..17e72c5f651 100644 --- a/nixos/tests/gnome3.nix +++ b/nixos/tests/gnome3.nix @@ -1,7 +1,7 @@ -import ./make-test-python.nix ({ pkgs, ...} : { +import ./make-test-python.nix ({ pkgs, lib, ...} : { name = "gnome3"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = pkgs.gnome3.maintainers; + meta = with lib; { + maintainers = teams.gnome.members; }; machine = diff --git a/pkgs/applications/audio/gnome-podcasts/default.nix b/pkgs/applications/audio/gnome-podcasts/default.nix index 26175085994..465b83ee9ca 100644 --- a/pkgs/applications/audio/gnome-podcasts/default.nix +++ b/pkgs/applications/audio/gnome-podcasts/default.nix @@ -9,7 +9,6 @@ , rustc , python3 , pkgconfig -, gnome3 , glib , libhandy , gtk3 @@ -76,7 +75,7 @@ rustPlatform.buildRustPackage rec { description = "Listen to your favorite podcasts"; homepage = https://wiki.gnome.org/Apps/Podcasts; license = licenses.gpl3; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index 6dd79fbf117..cc770bcc499 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -164,7 +164,7 @@ stdenv.mkDerivation rec { ''; homepage = https://wiki.gnome.org/Apps/Builder; license = licenses.gpl3Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix index 6cbe5448b40..180c1a7f1b1 100644 --- a/pkgs/applications/graphics/gnome-photos/default.nix +++ b/pkgs/applications/graphics/gnome-photos/default.nix @@ -119,7 +119,7 @@ stdenv.mkDerivation rec { description = "Access, organize and share your photos"; homepage = https://wiki.gnome.org/Apps/Photos; license = licenses.gpl3Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/almanah/default.nix b/pkgs/applications/misc/almanah/default.nix index 06321d9d621..b29f464869f 100644 --- a/pkgs/applications/misc/almanah/default.nix +++ b/pkgs/applications/misc/almanah/default.nix @@ -67,6 +67,6 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Apps/Almanah_Diary; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/applications/misc/glom/default.nix b/pkgs/applications/misc/glom/default.nix index b8f13d01424..c9d53dcbc64 100644 --- a/pkgs/applications/misc/glom/default.nix +++ b/pkgs/applications/misc/glom/default.nix @@ -28,7 +28,6 @@ , isocodes , gtksourceviewmm4 , postgresql -, gnome3 , gobject-introspection , yelp-tools , wrapGAppsHook @@ -127,7 +126,7 @@ in stdenv.mkDerivation rec { description = "An easy-to-use database designer and user interface"; homepage = http://www.glom.org/; license = [ licenses.lgpl2 licenses.gpl2 ]; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/gnome-firmware-updater/default.nix b/pkgs/applications/misc/gnome-firmware-updater/default.nix index f05c5fd210c..f007f0ae52e 100644 --- a/pkgs/applications/misc/gnome-firmware-updater/default.nix +++ b/pkgs/applications/misc/gnome-firmware-updater/default.nix @@ -6,7 +6,6 @@ , fwupd , gettext , glib -, gnome3 , gtk3 , libsoup , libxmlb @@ -70,7 +69,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/hughsie/gnome-firmware-updater"; description = "Tool for installing firmware on devices"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/gnome-multi-writer/default.nix b/pkgs/applications/misc/gnome-multi-writer/default.nix index 11bfbaaacd0..d408d6d921b 100644 --- a/pkgs/applications/misc/gnome-multi-writer/default.nix +++ b/pkgs/applications/misc/gnome-multi-writer/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { description = "Tool for writing an ISO file to multiple USB devices at once"; homepage = https://wiki.gnome.org/Apps/MultiWriter; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/gnome-recipes/default.nix b/pkgs/applications/misc/gnome-recipes/default.nix index 01f5af339ff..cf04f8e4bd0 100644 --- a/pkgs/applications/misc/gnome-recipes/default.nix +++ b/pkgs/applications/misc/gnome-recipes/default.nix @@ -72,7 +72,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Recipe management application for GNOME"; homepage = https://wiki.gnome.org/Apps/Recipes; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl3; platforms = platforms.unix; }; diff --git a/pkgs/applications/misc/gnome-usage/default.nix b/pkgs/applications/misc/gnome-usage/default.nix index 7484998ab20..17aa7e9aa06 100644 --- a/pkgs/applications/misc/gnome-usage/default.nix +++ b/pkgs/applications/misc/gnome-usage/default.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { 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; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 8f30f31c105..cd442f1bc3c 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -110,7 +110,7 @@ buildPythonApplication rec { Needs `services.gnome3.at-spi2-core.enable = true;` in `configuration.nix`. ''; - maintainers = with maintainers; [ berce ] ++ gnome3.maintainers; + maintainers = with maintainers; [ berce ] ++ teams.gnome.members; license = licenses.lgpl21; platforms = platforms.linux; }; diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix index a47ec9ea790..f2aab234cd4 100644 --- a/pkgs/data/documentation/gnome-user-docs/default.nix +++ b/pkgs/data/documentation/gnome-user-docs/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { description = "User and system administration help for the GNOME desktop"; homepage = "https://help.gnome.org/users/gnome-help/"; license = licenses.cc-by-30; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix index 0ceafeea439..5098ca0da6f 100644 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -66,7 +66,7 @@ meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Accerciser; description = "Interactive Python accessibility explorer"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix index b3bb1e1093c..b4916f23003 100644 --- a/pkgs/desktops/gnome-3/apps/cheese/default.nix +++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Cheese; description = "Take photos and videos with your webcam, with fun graphical effects"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index 4b4262a8f40..2a5c4b41da2 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -127,7 +127,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Evolution; description = "Personal information management application that provides integrated mail, calendaring and address book functionality"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.lgpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix index 72365a4266e..623667e6b9a 100644 --- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation rec { description = "Archive manager for the GNOME desktop environment"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix index 206edb41224..255bb5b05c4 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Gedit; description = "Official text editor of the GNOME desktop environment"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/ghex/default.nix b/pkgs/desktops/gnome-3/apps/ghex/default.nix index 0998dbd069d..bb599e8f21f 100644 --- a/pkgs/desktops/gnome-3/apps/ghex/default.nix +++ b/pkgs/desktops/gnome-3/apps/ghex/default.nix @@ -79,6 +79,6 @@ stdenv.mkDerivation rec { description = "Hex editor for GNOME desktop environment"; platforms = platforms.unix; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix index 7449e22d69d..23f5410e1ea 100644 --- a/pkgs/desktops/gnome-3/apps/glade/default.nix +++ b/pkgs/desktops/gnome-3/apps/glade/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Glade"; description = "User interface designer for GTK applications"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.lgpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix index 628442c3075..1d691c693a0 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Books; description = "An e-book manager application for GNOME"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index c211687a637..6663a4a8f80 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -136,6 +136,6 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Apps/Boxes; license = licenses.gpl3; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index db32efc62ea..31e1c22aef7 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -34,7 +34,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Calendar; description = "Simple and beautiful calendar application for GNOME"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix index fa9a7b003c3..987fa594ae5 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-characters/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Design/Apps/CharacterMap"; description = "Simple utility application to find and insert unusual characters"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix index e725c50983d..1c155c65241 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Clocks; description = "Clock application designed for GNOME 3"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix index 5aa39e09cd6..8d5501537a0 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Documents"; description = "Document manager application designed to work with GNOME 3"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix index f5261011d11..9889292b549 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://live.gnome.org/DocumentationProject; description = "Help a new user get started in GNOME"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.cc-by-sa-30; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index c80238740e5..aa9c7de0fd8 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Logs; description = "A log viewer for the systemd journal"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index 32b7fced417..75660d1987a 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -50,7 +50,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Maps; description = "A map application for GNOME 3"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index 2b800ee7b14..07d6c8370e1 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -103,7 +103,7 @@ python3.pkgs.buildPythonApplication rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Music"; description = "Music player and management application for the GNOME desktop environment"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix index 37401af3ce6..88072912b66 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-nettool/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://gitlab.gnome.org/GNOME/gnome-nettool"; description = "A collection of networking tools"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix index 7812ce52cbf..64610b55aed 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-notes/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation { description = "Note editor designed to remain simple to use"; homepage = https://wiki.gnome.org/Apps/Notes; license = licenses.gpl3; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix index fd47f54eb89..da3cc49760b 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-power-manager/default.nix @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://projects-old.gnome.org/gnome-power-manager/; description = "View battery and power statistics provided by UPower"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix index 3996a2e7564..b5389fa5db8 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "A simple and modern sound recorder"; homepage = https://wiki.gnome.org/Apps/SoundRecorder; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix index f5c4eedc48d..48f4a369f82 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-todo/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { description = "Personal task manager for GNOME"; homepage = https://wiki.gnome.org/Apps/Todo; license = licenses.gpl3Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix index c71baa146d1..b8655aed11d 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Weather; description = "Access current weather conditions and forecasts"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix index afeda1ba312..8fb2dedf19b 100644 --- a/pkgs/desktops/gnome-3/apps/polari/default.nix +++ b/pkgs/desktops/gnome-3/apps/polari/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Polari; description = "IRC chat client designed to integrate with the GNOME desktop"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix index 245a1b287a2..eabbd2dd167 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Seahorse; description = "Application for managing encryption keys and passwords in the GnomeKeyring"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/apps/vinagre/default.nix index c5377157ef0..75b604d89ac 100644 --- a/pkgs/desktops/gnome-3/apps/vinagre/default.nix +++ b/pkgs/desktops/gnome-3/apps/vinagre/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { description = "Remote desktop viewer for GNOME"; homepage = https://wiki.gnome.org/Apps/Vinagre; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix index 1fe5b6fb897..6eafa874b83 100644 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = with platforms; linux ++ darwin; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/core/baobab/default.nix b/pkgs/desktops/gnome-3/core/baobab/default.nix index 5817d8ff942..23c4a967ebb 100644 --- a/pkgs/desktops/gnome-3/core/baobab/default.nix +++ b/pkgs/desktops/gnome-3/core/baobab/default.nix @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { description = "Graphical application to analyse disk usage in any GNOME environment"; homepage = https://wiki.gnome.org/Apps/DiskUsageAnalyzer; license = licenses.gpl2; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/caribou/default.nix b/pkgs/desktops/gnome-3/core/caribou/default.nix index bad06bae405..0568c5822ec 100644 --- a/pkgs/desktops/gnome-3/core/caribou/default.nix +++ b/pkgs/desktops/gnome-3/core/caribou/default.nix @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { description = "An input assistive technology intended for switch and pointer users"; homepage = https://wiki.gnome.org/Projects/Caribou; license = licenses.lgpl21; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix index 45c3185bc29..ba8a85352fd 100644 --- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix @@ -33,6 +33,6 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix index 06777252462..0f692ca8d78 100644 --- a/pkgs/desktops/gnome-3/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/core/empathy/default.nix @@ -140,7 +140,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Empathy; description = "Messaging program which supports text, voice, video chat, and file transfers over many different protocols"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = [ licenses.gpl2 ]; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix index 8e23c6ff165..e910fdc219b 100644 --- a/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/pkgs/desktops/gnome-3/core/eog/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { description = "GNOME image viewer"; homepage = https://wiki.gnome.org/Apps/EyeOfGnome; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index 22793c6e7dc..a6d4137223b 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -113,7 +113,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Epiphany; description = "WebKit based web browser for GNOME"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix index 60bef883416..e24cc3b04ad 100644 --- a/pkgs/desktops/gnome-3/core/evince/default.nix +++ b/pkgs/desktops/gnome-3/core/evince/default.nix @@ -128,6 +128,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; platforms = platforms.linux; - maintainers = gnome3.maintainers ++ [ maintainers.vcunat ]; + maintainers = teams.gnome.members ++ [ maintainers.vcunat ]; }; } diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index ca122eaffd0..d9f1b180093 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { description = "Unified backend for programs that work with contacts, tasks, and calendar information"; homepage = https://wiki.gnome.org/Apps/Evolution; license = licenses.lgpl2; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/gdm/default.nix b/pkgs/desktops/gnome-3/core/gdm/default.nix index ba660a64418..04e88484cbf 100644 --- a/pkgs/desktops/gnome-3/core/gdm/default.nix +++ b/pkgs/desktops/gnome-3/core/gdm/default.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation rec { description = "A program that manages graphical display servers and handles graphical user logins"; homepage = https://wiki.gnome.org/Projects/GDM; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix index 518b86adf7f..e8463c5b704 100644 --- a/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-backgrounds/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.unix; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix index b52161f90ae..0edf7af3a54 100644 --- a/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-bluetooth/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en; description = "Application that let you manage Bluetooth in the GNOME destkop"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix index c3de61d6616..19a12235f72 100644 --- a/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-calculator/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Calculator; description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix index 200d038d0fb..f27656d46a5 100644 --- a/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-color-manager/default.nix @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A set of graphical utilities for color management to be used in the GNOME desktop"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/core/gnome-common/default.nix index f2eb65e50bb..fb0b0f87544 100644 --- a/pkgs/desktops/gnome-3/core/gnome-common/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-common/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome-common tends to require which meta = with stdenv.lib; { - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index 648e9d232b5..40bb6d634f9 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Contacts; description = "GNOME’s integrated address book"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index e198476b3f1..67ffb86bbaf 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -178,7 +178,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utilities to configure the GNOME desktop"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index 148b550db19..58baf0636f2 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { description = "Library with common API for various GNOME modules"; license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix index f43f98bdd9b..3819ab5bc5f 100644 --- a/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-dictionary/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Dictionary; description = "Dictionary is the GNOME application to look up definitions"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix index 2fbcef97a45..621c7b6ee47 100644 --- a/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-disk-utility/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://en.wikipedia.org/wiki/GNOME_Disks; description = "A udisks graphical front-end"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix index 0589dfe7285..d0ceef61c25 100644 --- a/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-font-viewer/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Program that can preview fonts and create thumbnails for fonts"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix index 521845a8a8a..060ba263df3 100644 --- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix @@ -103,6 +103,6 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/gnome-initial-setup"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix index 447a6bf654b..c506c7715f4 100644 --- a/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-keyring/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { description = "Collection of components in GNOME that store secrets, passwords, keys, certificates and make them available to applications"; homepage = https://wiki.gnome.org/Projects/GnomeKeyring; license = licenses.gpl2; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix index b21e3f6f68a..9459c359c97 100644 --- a/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-online-miners/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GnomeOnlineMiners; description = "A set of crawlers that go through your online content and index them locally in Tracker"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix index fb78aa41f78..005d6b98d28 100644 --- a/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitLab, meson, ninja, pkgconfig, python3, wrapGAppsHook -, glib, pipewire_0_2, systemd, libvncserver, libsecret, libnotify, gdk-pixbuf, gnome3 }: +, glib, pipewire_0_2, systemd, libvncserver, libsecret, libnotify, gdk-pixbuf }: stdenv.mkDerivation rec { pname = "gnome-remote-desktop"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/Mutter/RemoteDesktop; description = "GNOME Remote Desktop server"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix index 03a790967c3..960151738a0 100644 --- a/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-screenshot/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://en.wikipedia.org/wiki/GNOME_Screenshot; description = "Utility used in the GNOME desktop environment for taking screenshots"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/core/gnome-session/default.nix index 03a56db3ed9..e8e22deb225 100644 --- a/pkgs/desktops/gnome-3/core/gnome-session/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-session/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { description = "GNOME session manager"; homepage = https://wiki.gnome.org/Projects/SessionManagement; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix index c4b1ab867c7..6ff33660dc2 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -118,7 +118,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix index ef7b0fee26b..9f715559118 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GnomeShell/Extensions; description = "Modify and extend GNOME Shell functionality and behavior"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index d099e582839..21792fd249b 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -124,7 +124,7 @@ in stdenv.mkDerivation rec { description = "Core user interface for the GNOME 3 desktop"; homepage = https://wiki.gnome.org/Projects/GnomeShell; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/core/gnome-software/default.nix index 26debc798f7..7e240041b1a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-software/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-software/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { description = "Software store that lets you install and update applications and system extensions"; homepage = https://wiki.gnome.org/Apps/Software; license = licenses.gpl2; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix index 8b26a2a2d6d..6067636e7fd 100644 --- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/SystemMonitor; description = "System Monitor shows you what programs are running and how much processor time, memory, and disk space are being used"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index 4a167257603..eaf1d966ccc 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Apps/Terminal; platforms = platforms.linux; license = licenses.gpl3Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix index 5cd8f249481..9cbac8c7427 100644 --- a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix @@ -27,6 +27,6 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/core/gnome-tour/default.nix b/pkgs/desktops/gnome-3/core/gnome-tour/default.nix index 108ff9afca7..719e97647f7 100644 --- a/pkgs/desktops/gnome-3/core/gnome-tour/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-tour/default.nix @@ -74,7 +74,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { homepage = "https://gitlab.gnome.org/GNOME/gnome-tour"; description = "GNOME Greeter & Tour"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix index 6207dd42a61..257575e0f6a 100644 --- a/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-user-share/default.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://help.gnome.org/users/gnome-user-share/3.8; description = "Service that exports the contents of the Public folder in your home directory on the local network"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix index b6e8b4c11c0..927d70345e7 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix @@ -102,7 +102,7 @@ in stdenv.mkDerivation rec { description = "GNOME Character Map, based on the Unicode Character Database"; homepage = "https://wiki.gnome.org/Apps/Gucharmap"; license = licenses.gpl3; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/mutter/3.28.nix b/pkgs/desktops/gnome-3/core/mutter/3.28.nix index 85208163415..1e2f25e7790 100644 --- a/pkgs/desktops/gnome-3/core/mutter/3.28.nix +++ b/pkgs/desktops/gnome-3/core/mutter/3.28.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; }; } diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 3c8a139d3e1..c1f07cd7e53 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -149,7 +149,7 @@ stdenv.mkDerivation rec { description = "A window manager for GNOME"; homepage = "https://gitlab.gnome.org/GNOME/mutter"; license = licenses.gpl2; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index e4eb8988c9f..0d41bf2c00f 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -102,6 +102,6 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Apps/Files; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/core/rygel/default.nix b/pkgs/desktops/gnome-3/core/rygel/default.nix index 415974d0c2b..2f8ad38407f 100644 --- a/pkgs/desktops/gnome-3/core/rygel/default.nix +++ b/pkgs/desktops/gnome-3/core/rygel/default.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { description = "A home media solution (UPnP AV MediaServer) that allows you to easily share audio, video and pictures to other devices"; homepage = https://wiki.gnome.org/Projects/Rygel; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index eb4b7055231..9260099f317 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; homepage = https://gitlab.gnome.org/GNOME/simple-scan; license = licenses.gpl3Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix index 2d6d398fb45..4bdc409d816 100644 --- a/pkgs/desktops/gnome-3/core/sushi/default.nix +++ b/pkgs/desktops/gnome-3/core/sushi/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://en.wikipedia.org/wiki/Sushi_(software)"; description = "A quick previewer for Nautilus"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix index 50e30d2717e..ec90f48bc41 100644 --- a/pkgs/desktops/gnome-3/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/core/totem/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Videos; description = "Movie player for the GNOME desktop based on GStreamer"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix index 7d4f2f36515..92a538301ac 100644 --- a/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp-xsl/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Yelp; description = "Yelp's universal stylesheets for Mallard and DocBook"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = [licenses.gpl2 licenses.lgpl2]; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/yelp/default.nix b/pkgs/desktops/gnome-3/core/yelp/default.nix index 76a124b0c61..e42b1a6660f 100644 --- a/pkgs/desktops/gnome-3/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/core/yelp/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Yelp; description = "The help viewer in Gnome"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/core/zenity/default.nix b/pkgs/desktops/gnome-3/core/zenity/default.nix index 16ef06d8d9d..5750fa0d001 100644 --- a/pkgs/desktops/gnome-3/core/zenity/default.nix +++ b/pkgs/desktops/gnome-3/core/zenity/default.nix @@ -45,6 +45,6 @@ stdenv.mkDerivation rec { description = "Tool to display dialogs from the commandline and shell scripts"; homepage = "https://wiki.gnome.org/Projects/Zenity"; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 4fdaa42a1bf..d448aa490fd 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -18,8 +18,6 @@ lib.makeScope pkgs.newScope (self: with self; { in lib.filter (x: !(builtins.elem (lib.getName x) namesToRemove)) packages; - maintainers = lib.teams.gnome.members; - libsoup = pkgs.libsoup.override { gnomeSupport = true; }; libchamplain = pkgs.libchamplain.override { libsoup = libsoup; }; gnome3 = self // { recurseForDerivations = false; }; @@ -358,4 +356,6 @@ lib.makeScope pkgs.newScope (self: with self; { vino = throw "vino is deprecated, use gnome-remote-desktop instead."; # added 2020-03-13 gnome-screensaver = throw "gnome-screensaver is deprecated. If you are using GNOME Flashback, it now has a built-in lock screen. If you are using it elsewhere, you can try xscreenlock or other alternatives."; # added 2020-03-19 + + maintainers = lib.teams.gnome.members; }) diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix index d4b9e3f76f7..f6aa299d177 100644 --- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation rec { description = "API documentation browser for GNOME"; homepage = "https://wiki.gnome.org/Apps/Devhelp"; license = licenses.gpl3Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix index 81f63941729..3a620692bb5 100644 --- a/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix +++ b/pkgs/desktops/gnome-3/devtools/gnome-devel-docs/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/GNOME/gnome-devel-docs; description = "Developer documentation for GNOME"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.fdl12; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix index f04999a449c..5027815038b 100644 --- a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { To use the integration, install the browser extension, and then set to true. ''; license = licenses.gpl3; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/games/aisleriot/default.nix index 474c49fb584..3d527154e55 100644 --- a/pkgs/desktops/gnome-3/games/aisleriot/default.nix +++ b/pkgs/desktops/gnome-3/games/aisleriot/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Aisleriot; description = "A collection of patience games written in guile scheme"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl3Plus; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/atomix/default.nix b/pkgs/desktops/gnome-3/games/atomix/default.nix index ec9895b3bf5..d3cac22463c 100644 --- a/pkgs/desktops/gnome-3/games/atomix/default.nix +++ b/pkgs/desktops/gnome-3/games/atomix/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { description = "Puzzle game where you move atoms to build a molecule"; homepage = https://wiki.gnome.org/Apps/Atomix; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/games/five-or-more/default.nix index 4d0512f1adb..6c4519d021e 100644 --- a/pkgs/desktops/gnome-3/games/five-or-more/default.nix +++ b/pkgs/desktops/gnome-3/games/five-or-more/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Five_or_more"; description = "Remove colored balls from the board by forming lines"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix index d047db68ef5..6f2e2bbc686 100644 --- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix +++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Four-in-a-row; description = "Make lines of the same color to win"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix index c67d8fa8ffe..f2ab6ca1d68 100644 --- a/pkgs/desktops/gnome-3/games/gnome-chess/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-chess/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Chess; description = "Play the classic two-player boardgame of chess"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix index 62fc7bf8d67..01f61a56e34 100644 --- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Klotski; description = "Slide blocks to solve the puzzle"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix index 1a04b90c09e..131e053bc99 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Mahjongg; description = "Disassemble a pile of tiles by removing matching pairs"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix index 00b4d15b442..5d2afb36a52 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mines/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mines/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Mines; description = "Clear hidden mines from a minefield"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix index 1600ddc9e8a..9361ef5c3ef 100644 --- a/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-nibbles/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { description = "Guide a worm around a maze"; homepage = https://wiki.gnome.org/Apps/Nibbles; license = licenses.gpl2; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix index a4b083c7c2d..0aa131dbd71 100644 --- a/pkgs/desktops/gnome-3/games/gnome-robots/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-robots/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Robots; description = "Avoid the robots and make them crash into each other"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix index efeecf04aae..eb1d2c18474 100644 --- a/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-sudoku/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Sudoku; description = "Test your logic skills in this number grid puzzle"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix index 9ac0cf88b6e..8b3474bad83 100644 --- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Taquin; description = "Move tiles so that they reach their places"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix index de81e76d3cd..fa2f08a7754 100644 --- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Tetravex; description = "Complete the puzzle by matching numbered tiles"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/hitori/default.nix b/pkgs/desktops/gnome-3/games/hitori/default.nix index fa82365d166..56dd580e06f 100644 --- a/pkgs/desktops/gnome-3/games/hitori/default.nix +++ b/pkgs/desktops/gnome-3/games/hitori/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Hitori; description = "GTK application to generate and let you play games of Hitori"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix index cf4e8595f96..1fc0f90dbe7 100644 --- a/pkgs/desktops/gnome-3/games/iagno/default.nix +++ b/pkgs/desktops/gnome-3/games/iagno/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Iagno; description = "Computer version of the game Reversi, more popularly called Othello"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix index 3d0c3f72396..e73ab57a0cf 100644 --- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix +++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Lightsoff; description = "Puzzle game, where the objective is to turn off all of the tiles on the board"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix index 34dc18968da..2c104cd8f04 100644 --- a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix +++ b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "Classic falling-block game, Tetris"; homepage = https://wiki.gnome.org/Apps/Quadrapassel; license = licenses.gpl2; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/games/swell-foop/default.nix index 02a61d46c73..c5e0f99b243 100644 --- a/pkgs/desktops/gnome-3/games/swell-foop/default.nix +++ b/pkgs/desktops/gnome-3/games/swell-foop/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Swell%20Foop; description = "Puzzle game, previously known as Same GNOME"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome-3/games/tali/default.nix index 3fa76704a50..b1827fa0f6a 100644 --- a/pkgs/desktops/gnome-3/games/tali/default.nix +++ b/pkgs/desktops/gnome-3/games/tali/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Tali; description = "Sort of poker with dice and less money"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index 6122488ea12..96e2fbcb778 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Geary; description = "Mail client for GNOME 3"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.lgpl21Plus; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix index b04c7ece529..3e81b0e9081 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-applets/default.nix @@ -78,7 +78,7 @@ in stdenv.mkDerivation rec { description = "Applets for use with the GNOME panel"; homepage = https://wiki.gnome.org/Projects/GnomeApplets; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix index 8f1d193a6d3..baa43bdedb3 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-autoar/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.lgpl21; description = "Library to integrate compressed files management with GNOME"; }; diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix index 3d8196f12f4..4c6fe3efe1c 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix @@ -216,7 +216,7 @@ let description = "GNOME 2.x-like session for GNOME 3"; homepage = https://wiki.gnome.org/Projects/GnomeFlashback; license = licenses.gpl2; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; }; diff --git a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix index ce6d943c39f..8a53f12c17e 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-packagekit/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://www.freedesktop.org/software/PackageKit/; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; description = "Tools for installing software on the GNOME desktop using PackageKit"; }; diff --git a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix index c73d551cdc5..1dd6e654434 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-panel/default.nix @@ -93,7 +93,7 @@ in stdenv.mkDerivation rec { description = "Component of Gnome Flashback that provides panels and default applets for the desktop"; homepage = https://wiki.gnome.org/Projects/GnomePanel; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix index f40911577c1..81f6ad6df14 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix @@ -47,7 +47,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/action/show/Apps/GnomeTweakTool; description = "A tool to customize advanced GNOME 3 options"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl3; platforms = platforms.linux; }; diff --git a/pkgs/desktops/gnome-3/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/misc/gpaste/default.nix index 1ee9e5b933b..b6a88e5864b 100644 --- a/pkgs/desktops/gnome-3/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome-3/misc/gpaste/default.nix @@ -5,7 +5,6 @@ , clutter , gjs , glib -, gnome3 , gobject-introspection , gtk3 , meson @@ -77,6 +76,6 @@ stdenv.mkDerivation rec { description = "Clipboard management system with GNOME 3 integration"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix index a607a6eb6a0..9550de32fbe 100644 --- a/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix +++ b/pkgs/desktops/gnome-3/misc/gtkhtml/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix index c4c280fa733..f81f35d47ff 100644 --- a/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix +++ b/pkgs/desktops/gnome-3/misc/libgnome-games-support/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { description = "Small library intended for internal use by GNOME Games, but it may be used by others"; homepage = https://wiki.gnome.org/Apps/Games; license = licenses.lgpl3; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/desktops/gnome-3/misc/metacity/default.nix b/pkgs/desktops/gnome-3/misc/metacity/default.nix index a619bc8902b..566d1bbf8c4 100644 --- a/pkgs/desktops/gnome-3/misc/metacity/default.nix +++ b/pkgs/desktops/gnome-3/misc/metacity/default.nix @@ -64,7 +64,7 @@ in stdenv.mkDerivation rec { description = "Window manager used in Gnome Flashback"; homepage = https://wiki.gnome.org/Projects/Metacity; license = licenses.gpl2; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix b/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix index 4c2a551b1c7..4aec82a6ff1 100644 --- a/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix +++ b/pkgs/desktops/gnome-3/misc/nautilus-python/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { description = "Python bindings for the Nautilus Extension API"; homepage = https://wiki.gnome.org/Projects/NautilusPython; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/at-spi2-atk/default.nix b/pkgs/development/libraries/at-spi2-atk/default.nix index f16b38e3fd8..6a1ca6d24d3 100644 --- a/pkgs/development/libraries/at-spi2-atk/default.nix +++ b/pkgs/development/libraries/at-spi2-atk/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "D-Bus bridge for Assistive Technology Service Provider Interface (AT-SPI) and Accessibility Toolkit (ATK)"; homepage = "https://gitlab.gnome.org/GNOME/at-spi2-atk"; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix index 93e06e8be70..6914877b4f7 100644 --- a/pkgs/development/libraries/at-spi2-core/default.nix +++ b/pkgs/development/libraries/at-spi2-core/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { description = "Assistive Technology Service Provider Interface protocol definitions and daemon for D-Bus"; homepage = https://gitlab.gnome.org/GNOME/at-spi2-core; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/dconf/default.nix b/pkgs/development/libraries/dconf/default.nix index a41642745a5..261befbdd05 100644 --- a/pkgs/development/libraries/dconf/default.nix +++ b/pkgs/development/libraries/dconf/default.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Projects/dconf; license = licenses.lgpl21Plus; platforms = platforms.linux ++ platforms.darwin; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/folks/default.nix b/pkgs/development/libraries/folks/default.nix index d44f279d8de..ac75eae0d12 100644 --- a/pkgs/development/libraries/folks/default.nix +++ b/pkgs/development/libraries/folks/default.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { description = "A library that aggregates people from multiple sources to create metacontacts"; homepage = https://wiki.gnome.org/Projects/Folks; license = licenses.lgpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.gnu ++ platforms.linux; # arbitrary choice }; } diff --git a/pkgs/development/libraries/gcab/default.nix b/pkgs/development/libraries/gcab/default.nix index 9946ebc05a5..0034f7ed633 100644 --- a/pkgs/development/libraries/gcab/default.nix +++ b/pkgs/development/libraries/gcab/default.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { description = "GObject library to create cabinet files"; homepage = "https://gitlab.gnome.org/GNOME/gcab"; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix index f3625a0e355..55827b1ad0b 100644 --- a/pkgs/development/libraries/gcr/default.nix +++ b/pkgs/development/libraries/gcr/default.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; description = "GNOME crypto services (daemon and tools)"; homepage = "https://gitlab.gnome.org/GNOME/gcr"; license = licenses.lgpl2Plus; diff --git a/pkgs/development/libraries/gdl/default.nix b/pkgs/development/libraries/gdl/default.nix index c4baaa3fae9..dd5222f7b51 100644 --- a/pkgs/development/libraries/gdl/default.nix +++ b/pkgs/development/libraries/gdl/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Gnome docking library"; homepage = https://developer.gnome.org/gdl/; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/geocode-glib/default.nix b/pkgs/development/libraries/geocode-glib/default.nix index c1d0d7e8a4f..2d2a9a3c350 100644 --- a/pkgs/development/libraries/geocode-glib/default.nix +++ b/pkgs/development/libraries/geocode-glib/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A convenience library for the geocoding and reverse geocoding using Nominatim service"; license = licenses.lgpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gexiv2/default.nix b/pkgs/development/libraries/gexiv2/default.nix index 7203f8531c2..7e447a434e4 100644 --- a/pkgs/development/libraries/gexiv2/default.nix +++ b/pkgs/development/libraries/gexiv2/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { description = "GObject wrapper around the Exiv2 photo metadata library"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/gfbgraph/default.nix b/pkgs/development/libraries/gfbgraph/default.nix index 235cd195071..bd3aff61ee3 100644 --- a/pkgs/development/libraries/gfbgraph/default.nix +++ b/pkgs/development/libraries/gfbgraph/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GFBGraph; description = "GLib/GObject wrapper for the Facebook Graph API"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.lgpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index 31d95c44d85..c9fb5091239 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -145,7 +145,7 @@ in stdenv.mkDerivation rec { description = "JavaScript bindings for GNOME"; homepage = "https://gitlab.gnome.org/GNOME/gjs/blob/master/doc/Home.md"; license = licenses.lgpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 687852fb181..0eb5cb4225d 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { description = "Network-related giomodules for glib"; homepage = https://gitlab.gnome.org/GNOME/glib-networking; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/gnome-online-accounts/default.nix b/pkgs/development/libraries/gnome-online-accounts/default.nix index 8631cdee8cf..7b254b922bc 100644 --- a/pkgs/development/libraries/gnome-online-accounts/default.nix +++ b/pkgs/development/libraries/gnome-online-accounts/default.nix @@ -100,6 +100,6 @@ stdenv.mkDerivation rec { description = "Single sign-on framework for GNOME"; platforms = platforms.linux; license = licenses.lgpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/gnome-video-effects/default.nix b/pkgs/development/libraries/gnome-video-effects/default.nix index 03799c1ef7c..b46eb899ca8 100644 --- a/pkgs/development/libraries/gnome-video-effects/default.nix +++ b/pkgs/development/libraries/gnome-video-effects/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { description = "A collection of GStreamer effects to be used in different GNOME Modules"; homepage = https://wiki.gnome.org/Projects/GnomeVideoEffects; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; }; } diff --git a/pkgs/development/libraries/gom/default.nix b/pkgs/development/libraries/gom/default.nix index 2d5133afab4..aab40a556e2 100644 --- a/pkgs/development/libraries/gom/default.nix +++ b/pkgs/development/libraries/gom/default.nix @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Projects/Gom; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/grilo-plugins/default.nix b/pkgs/development/libraries/grilo-plugins/default.nix index 65be9d27df1..d6922dfdcd8 100644 --- a/pkgs/development/libraries/grilo-plugins/default.nix +++ b/pkgs/development/libraries/grilo-plugins/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/Grilo; description = "A collection of plugins for the Grilo framework"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.lgpl21; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/grilo/default.nix b/pkgs/development/libraries/grilo/default.nix index b52ddbb0408..b94d93935a0 100644 --- a/pkgs/development/libraries/grilo/default.nix +++ b/pkgs/development/libraries/grilo/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/Grilo; description = "Framework that provides access to various sources of multimedia content, using a pluggable system"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.lgpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix index a23027946a4..c1fa8af1271 100644 --- a/pkgs/development/libraries/gsettings-desktop-schemas/default.nix +++ b/pkgs/development/libraries/gsettings-desktop-schemas/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig python3 meson ninja glib ]; meta = with stdenv.lib; { - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/gsound/default.nix b/pkgs/development/libraries/gsound/default.nix index b1869193a09..7291ee40afd 100644 --- a/pkgs/development/libraries/gsound/default.nix +++ b/pkgs/development/libraries/gsound/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/GSound; description = "Small library for playing system sounds"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/gspell/default.nix b/pkgs/development/libraries/gspell/default.nix index 71a427eb2a6..887de1d76c1 100644 --- a/pkgs/development/libraries/gspell/default.nix +++ b/pkgs/development/libraries/gspell/default.nix @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { description = "A spell-checking library for GTK applications"; homepage = https://wiki.gnome.org/Projects/gspell; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/gtksourceview/3.x.nix b/pkgs/development/libraries/gtksourceview/3.x.nix index baef8062224..6a60785268c 100644 --- a/pkgs/development/libraries/gtksourceview/3.x.nix +++ b/pkgs/development/libraries/gtksourceview/3.x.nix @@ -53,6 +53,6 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Projects/GtkSourceView; platforms = with platforms; linux ++ darwin; license = licenses.lgpl21; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/gtksourceview/4.x.nix b/pkgs/development/libraries/gtksourceview/4.x.nix index d3a7d849062..025fc42553b 100644 --- a/pkgs/development/libraries/gtksourceview/4.x.nix +++ b/pkgs/development/libraries/gtksourceview/4.x.nix @@ -49,6 +49,6 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Projects/GtkSourceView; platforms = with platforms; linux ++ darwin; license = licenses.lgpl21; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/gtksourceviewmm/4.x.nix b/pkgs/development/libraries/gtksourceviewmm/4.x.nix index d60bb29c47a..c96f7ae820a 100644 --- a/pkgs/development/libraries/gtksourceviewmm/4.x.nix +++ b/pkgs/development/libraries/gtksourceviewmm/4.x.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { homepage = https://developer.gnome.org/gtksourceviewmm/; description = "C++ wrapper for gtksourceview"; license = licenses.lgpl2; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix index 44d9fc5ed9a..8c6c9dde878 100644 --- a/pkgs/development/libraries/gvfs/default.nix +++ b/pkgs/development/libraries/gvfs/default.nix @@ -126,6 +126,6 @@ stdenv.mkDerivation rec { description = "Virtual Filesystem support library" + optionalString gnomeSupport " (full GNOME support)"; license = licenses.lgpl2Plus; platforms = platforms.linux; - maintainers = [ maintainers.lethalman ] ++ gnome3.maintainers; + maintainers = [ maintainers.lethalman ] ++ teams.gnome.members; }; } diff --git a/pkgs/development/libraries/jsonrpc-glib/default.nix b/pkgs/development/libraries/jsonrpc-glib/default.nix index b1249546721..05f46b03b0a 100644 --- a/pkgs/development/libraries/jsonrpc-glib/default.nix +++ b/pkgs/development/libraries/jsonrpc-glib/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { description = "A library to communicate using the JSON-RPC 2.0 specification"; homepage = https://gitlab.gnome.org/GNOME/jsonrpc-glib; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 48446d87b8d..4a9cba82606 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { OpenCycleMap, OpenAerialMap, and Maps for free. ''; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.gnu ++ platforms.linux; # arbitrary choice }; } diff --git a/pkgs/development/libraries/libdazzle/default.nix b/pkgs/development/libraries/libdazzle/default.nix index 19f9a5f889a..d77db93ba15 100644 --- a/pkgs/development/libraries/libdazzle/default.nix +++ b/pkgs/development/libraries/libdazzle/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; homepage = https://wiki.gnome.org/Apps/Builder; license = licenses.gpl3Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libepc/default.nix b/pkgs/development/libraries/libepc/default.nix index 59780699fd1..4c17a800c17 100644 --- a/pkgs/development/libraries/libepc/default.nix +++ b/pkgs/development/libraries/libepc/default.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { description = "Easy Publish and Consume Library"; homepage = https://wiki.gnome.org/Projects/libepc; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libgda/default.nix b/pkgs/development/libraries/libgda/default.nix index a1871f6b2e6..a1e648468f4 100644 --- a/pkgs/development/libraries/libgda/default.nix +++ b/pkgs/development/libraries/libgda/default.nix @@ -47,7 +47,7 @@ assert postgresSupport -> postgresql != null; description = "Database access library"; homepage = https://www.gnome-db.org/; license = [ licenses.lgpl2 licenses.gpl2 ]; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/libgdamm/default.nix b/pkgs/development/libraries/libgdamm/default.nix index f5cc5efa06a..43e5e223480 100644 --- a/pkgs/development/libraries/libgdamm/default.nix +++ b/pkgs/development/libraries/libgdamm/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { description = "C++ bindings for libgda"; homepage = https://www.gnome-db.org/; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libgdata/default.nix b/pkgs/development/libraries/libgdata/default.nix index 91bb9869f3c..162b5d23395 100644 --- a/pkgs/development/libraries/libgdata/default.nix +++ b/pkgs/development/libraries/libgdata/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "GData API library"; homepage = "https://wiki.gnome.org/Projects/libgdata"; - maintainers = with maintainers; [ raskin lethalman ] ++ gnome3.maintainers; + maintainers = with maintainers; [ raskin lethalman ] ++ teams.gnome.members; platforms = platforms.linux; license = licenses.lgpl21Plus; }; diff --git a/pkgs/development/libraries/libgee/default.nix b/pkgs/development/libraries/libgee/default.nix index 92c9f214ab4..7623be579d7 100644 --- a/pkgs/development/libraries/libgee/default.nix +++ b/pkgs/development/libraries/libgee/default.nix @@ -30,6 +30,6 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Projects/Libgee; license = licenses.lgpl21Plus; platforms = platforms.unix; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/libgepub/default.nix b/pkgs/development/libraries/libgepub/default.nix index 70ec222f88f..cf62e0cabc9 100644 --- a/pkgs/development/libraries/libgepub/default.nix +++ b/pkgs/development/libraries/libgepub/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { description = "GObject based library for handling and rendering epub documents"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/libgit2-glib/default.nix b/pkgs/development/libraries/libgit2-glib/default.nix index f3e07b50917..9a05a01bee6 100644 --- a/pkgs/development/libraries/libgit2-glib/default.nix +++ b/pkgs/development/libraries/libgit2-glib/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { description = "A glib wrapper library around the libgit2 git access library"; homepage = "https://wiki.gnome.org/Projects/Libgit2-glib"; license = licenses.lgpl21; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libgnomekbd/default.nix b/pkgs/development/libraries/libgnomekbd/default.nix index f35f3f87fbe..c02fd503eb0 100644 --- a/pkgs/development/libraries/libgnomekbd/default.nix +++ b/pkgs/development/libraries/libgnomekbd/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Keyboard management library"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libgrss/default.nix b/pkgs/development/libraries/libgrss/default.nix index 8fc44fb6a8d..2652546a0fc 100644 --- a/pkgs/development/libraries/libgrss/default.nix +++ b/pkgs/development/libraries/libgrss/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { description = "Glib abstaction to handle feeds in RSS, Atom and other formats"; homepage = https://wiki.gnome.org/Projects/Libgrss; license = licenses.lgpl3Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix index fe7986bf21a..65f5e2750e5 100644 --- a/pkgs/development/libraries/libgtop/default.nix +++ b/pkgs/development/libraries/libgtop/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library that reads information about processes and the running system"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libgudev/default.nix b/pkgs/development/libraries/libgudev/default.nix index 8023acb75d2..2d3c83e6d17 100644 --- a/pkgs/development/libraries/libgudev/default.nix +++ b/pkgs/development/libraries/libgudev/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A library that provides GObject bindings for libudev"; homepage = https://wiki.gnome.org/Projects/libgudev; - maintainers = [ maintainers.eelco ] ++ gnome3.maintainers; + maintainers = [ maintainers.eelco ] ++ teams.gnome.members; platforms = platforms.linux; license = licenses.lgpl2Plus; }; diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix index f782176108a..efbdd785648 100644 --- a/pkgs/development/libraries/libgweather/default.nix +++ b/pkgs/development/libraries/libgweather/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { description = "A library to access weather information from online services for numerous locations"; homepage = https://wiki.gnome.org/Projects/LibGWeather; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/libgxps/default.nix b/pkgs/development/libraries/libgxps/default.nix index 30e5e247ab2..1682f123acd 100644 --- a/pkgs/development/libraries/libgxps/default.nix +++ b/pkgs/development/libraries/libgxps/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "A GObject based library for handling and rendering XPS documents"; homepage = https://wiki.gnome.org/Projects/libgxps; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix index c58812eca58..3d7784979e3 100644 --- a/pkgs/development/libraries/libhttpseverywhere/default.nix +++ b/pkgs/development/libraries/libhttpseverywhere/default.nix @@ -44,6 +44,6 @@ in stdenv.mkDerivation rec { homepage = https://gitlab.gnome.org/GNOME/libhttpseverywhere; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = with maintainers; [ sternenseemann ] ++ gnome3.maintainers; + maintainers = with maintainers; [ sternenseemann ] ++ teams.gnome.members; }; } diff --git a/pkgs/development/libraries/libmanette/default.nix b/pkgs/development/libraries/libmanette/default.nix index 2f7f46974b0..c6278552737 100644 --- a/pkgs/development/libraries/libmanette/default.nix +++ b/pkgs/development/libraries/libmanette/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { description = "A simple GObject game controller library"; homepage = "https://gitlab.gnome.org/aplazas/libmanette"; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libmediaart/default.nix b/pkgs/development/libraries/libmediaart/default.nix index 20a63fd6eb0..38adebb2a48 100644 --- a/pkgs/development/libraries/libmediaart/default.nix +++ b/pkgs/development/libraries/libmediaart/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Library tasked with managing, extracting and handling media art caches"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix index aacadc5ea0a..5b8ccb0e301 100644 --- a/pkgs/development/libraries/libnotify/default.nix +++ b/pkgs/development/libraries/libnotify/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { homepage = https://developer.gnome.org/notification-spec/; description = "A library that sends desktop notifications to a notification daemon"; platforms = platforms.unix; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.lgpl21; }; } diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix index 96da8a165ae..975445a4847 100644 --- a/pkgs/development/libraries/libpeas/default.nix +++ b/pkgs/development/libraries/libpeas/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Projects/Libpeas; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/librest/default.nix b/pkgs/development/libraries/librest/default.nix index e70ac9a5362..4d23511a341 100644 --- a/pkgs/development/libraries/librest/default.nix +++ b/pkgs/development/libraries/librest/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { homepage = https://wiki.gnome.org/Projects/Librest; license = licenses.lgpl21; platforms = platforms.linux; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 3846dc374ad..9767ea4fdeb 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { description = "A small library to render SVG images to Cairo surfaces"; homepage = https://wiki.gnome.org/Projects/LibRsvg; license = licenses.lgpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libzapojit/default.nix b/pkgs/development/libraries/libzapojit/default.nix index 215535fb8f1..5fc275e6f07 100644 --- a/pkgs/development/libraries/libzapojit/default.nix +++ b/pkgs/development/libraries/libzapojit/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "GObject wrapper for the SkyDrive and Hotmail REST APIs"; homepage = https://wiki.gnome.org/Projects/Zapojit; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/mm-common/default.nix b/pkgs/development/libraries/mm-common/default.nix index 9a789a58cca..890ab6fca11 100644 --- a/pkgs/development/libraries/mm-common/default.nix +++ b/pkgs/development/libraries/mm-common/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.gtkmm.org"; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/rarian/default.nix b/pkgs/development/libraries/rarian/default.nix index 18ab274bd19..6feb896911b 100644 --- a/pkgs/development/libraries/rarian/default.nix +++ b/pkgs/development/libraries/rarian/default.nix @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { description = "Documentation metadata library based on the proposed Freedesktop.org spec"; homepage = https://rarian.freedesktop.org/; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/template-glib/default.nix b/pkgs/development/libraries/template-glib/default.nix index 070953d0bbc..86a4a9cd903 100644 --- a/pkgs/development/libraries/template-glib/default.nix +++ b/pkgs/development/libraries/template-glib/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { description = "A library for template expansion which supports calling into GObject Introspection from templates"; homepage = https://gitlab.gnome.org/GNOME/template-glib; license = licenses.lgpl21Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/totem-pl-parser/default.nix b/pkgs/development/libraries/totem-pl-parser/default.nix index 08a2df3c02d..d5491b5da03 100644 --- a/pkgs/development/libraries/totem-pl-parser/default.nix +++ b/pkgs/development/libraries/totem-pl-parser/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Videos; description = "Simple GObject-based library to parse and save a host of playlist formats"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.lgpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/tracker-miners/default.nix b/pkgs/development/libraries/tracker-miners/default.nix index a60f1b1e79f..5278aeeb50c 100644 --- a/pkgs/development/libraries/tracker-miners/default.nix +++ b/pkgs/development/libraries/tracker-miners/default.nix @@ -132,7 +132,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/Tracker; description = "Desktop-neutral user information store, search tool and indexer"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2Plus; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index 4638788aee7..7ea690c602d 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Projects/Tracker; description = "Desktop-neutral user information store, search tool and indexer"; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index f62768727d3..6d63825bac6 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -92,7 +92,7 @@ stdenv.mkDerivation rec { the system's terminfo database. ''; license = licenses.lgpl2; - maintainers = with maintainers; [ astsmtl antono lethalman ] ++ gnome3.maintainers; + maintainers = with maintainers; [ astsmtl antono lethalman ] ++ teams.gnome.members; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index ee83adac098..ea339309ace 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -50,7 +50,6 @@ , libseccomp , xdg-dbus-proxy , substituteAll -, gnome3 , glib }: @@ -180,6 +179,6 @@ stdenv.mkDerivation rec { license = licenses.bsd2; platforms = platforms.linux; hydraPlatforms = []; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index da2043c5bd7..85ebf3d0dc2 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { be restarted. ''; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index 830d27fa6ce..7dc4d0b8243 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { description = "Set of utilities and demos to work with UPnP"; homepage = https://wiki.gnome.org/Projects/GUPnP; license = licenses.gpl2Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } diff --git a/pkgs/tools/security/gnome-keysign/default.nix b/pkgs/tools/security/gnome-keysign/default.nix index a559039d95a..685971382dc 100644 --- a/pkgs/tools/security/gnome-keysign/default.nix +++ b/pkgs/tools/security/gnome-keysign/default.nix @@ -84,7 +84,7 @@ python3.pkgs.buildPythonApplication rec { description = "GTK/GNOME application to use GnuPG for signing other peoples’ keys"; homepage = https://wiki.gnome.org/Apps/Keysign; license = licenses.gpl3Plus; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; platforms = platforms.linux; }; } -- cgit v1.2.3 From b18e7e5b6addc7c66500971a5905ee1e0f1c4015 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C8=98erb=C4=83nescu?= Date: Tue, 31 Mar 2020 11:23:41 +0200 Subject: cmake: 3.16.5 -> 3.17.0 --- pkgs/development/tools/build-managers/cmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 0a6335a3eb7..ac41394e6a8 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { + lib.optionalString useNcurses "-cursesUI" + lib.optionalString withQt5 "-qt5UI" + lib.optionalString useQt4 "-qt4UI"; - version = "3.16.5"; + version = "3.17.0"; src = fetchurl { url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt - sha256 = "1z4bb8z6b4dvq5hrvajrf1hyybqay3xybyimf71w1jgcp180nxjz"; + sha256 = "0iq8y1rb5dqnzrwy4lssr76hbnnvh54q2ympl97wrshma6shak5p"; }; patches = [ -- cgit v1.2.3 From f26b2afb938b2c6b094354f9995ffb741e1d0104 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 Apr 2020 22:33:24 +0000 Subject: apacheHttpd: 2.4.41 -> 2.4.43 --- pkgs/servers/http/apache-httpd/2.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index 252365098dd..2fba3c03e70 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/pkgs/servers/http/apache-httpd/2.4.nix @@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null; assert http2Support -> nghttp2 != null; stdenv.mkDerivation rec { - version = "2.4.41"; + version = "2.4.43"; pname = "apache-httpd"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "0h7a31yxwyh7h521frnmlppl0h7sh9icc3ka6vlmlcg5iwllhg8k"; + sha256 = "0hqgw47r3p3521ygkkqs8s30s5crm683081avj6330gwncm6b5x4"; }; # FIXME: -dev depends on -doc -- cgit v1.2.3 From e48a55dd7371c7a666819e1f2dd46f2a5c1b3ffb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 21 Mar 2020 08:58:46 +0100 Subject: openssl(_1_1): patch CVE-2019-1551 fetchpatch can't be used here and fetchurl from GitHub like in PR #82928 has the risk of breaking the hash later; fortunately the patches aren't too large. (cherry picked from commit 2071e3be28ee0d6ec46056352c88b88f5c0d7f60) --- .../openssl/1.1/cve-2019-1551-improve.patch | 181 +++++ .../libraries/openssl/1.1/cve-2019-1551.patch | 754 +++++++++++++++++++++ pkgs/development/libraries/openssl/default.nix | 3 + 3 files changed, 938 insertions(+) create mode 100644 pkgs/development/libraries/openssl/1.1/cve-2019-1551-improve.patch create mode 100644 pkgs/development/libraries/openssl/1.1/cve-2019-1551.patch diff --git a/pkgs/development/libraries/openssl/1.1/cve-2019-1551-improve.patch b/pkgs/development/libraries/openssl/1.1/cve-2019-1551-improve.patch new file mode 100644 index 00000000000..09405b4a15f --- /dev/null +++ b/pkgs/development/libraries/openssl/1.1/cve-2019-1551-improve.patch @@ -0,0 +1,181 @@ +From 46ac489a1369f6d938adda356accab83acf2987a Mon Sep 17 00:00:00 2001 +From: Bernd Edlinger +Date: Wed, 4 Dec 2019 12:57:41 +0100 +Subject: [PATCH] Improve the overflow handling in rsaz_512_sqr + +We have always a carry in %rcx or %rbx in range 0..2 +from the previous stage, that is added to the result +of the 64-bit square, but the low nibble of any square +can only be 0, 1, 4, 9. + +Therefore one "adcq $0, %rdx" can be removed. +Likewise in the ADX code we can remove one +"adcx %rbp, $out" since %rbp is always 0, and carry is +also zero, therefore that is a no-op. + +Reviewed-by: Paul Dale +(Merged from https://github.com/openssl/openssl/pull/10575) +--- + crypto/bn/asm/rsaz-x86_64.pl | 42 ++++++++++++++++++------------------ + 1 file changed, 21 insertions(+), 21 deletions(-) + +diff --git a/crypto/bn/asm/rsaz-x86_64.pl b/crypto/bn/asm/rsaz-x86_64.pl +index 7534d5cd03e5..f4d9c9b1297b 100755 +--- a/crypto/bn/asm/rsaz-x86_64.pl ++++ b/crypto/bn/asm/rsaz-x86_64.pl +@@ -242,9 +242,9 @@ + adcq \$0, %rbx + + mulq %rax ++ # rcx <= 2 and rax <= 0xFFFF..F9, so carry must be zero here + addq %rcx, %rax + movq 16($inp), %rbp +- adcq \$0, %rdx + addq %rax, %r9 + movq 24($inp), %rax + adcq %rdx, %r10 +@@ -298,9 +298,9 @@ + adcq \$0, %rcx + + mulq %rax ++ # rbx <= 2 and rax <= 0xFFFF..F9, so carry must be zero here + addq %rbx, %rax + movq 24($inp), %r10 +- adcq \$0, %rdx + addq %rax, %r11 + movq 32($inp), %rax + adcq %rdx, %r12 +@@ -349,8 +349,8 @@ + adcq \$0, %rbx + + mulq %rax ++ # rcx <= 2 and rax <= 0xFFFF..F9, so carry must be zero here + addq %rcx, %rax +- adcq \$0, %rdx + addq %rax, %r13 + movq %r12, %rax # 40($inp) + adcq %rdx, %r14 +@@ -389,8 +389,8 @@ + adcq \$0, %rcx + + mulq %rax ++ # rbx <= 2 and rax <= 0xFFFF..F9, so carry must be zero here + addq %rbx, %rax +- adcq \$0, %rdx + addq %rax, %r15 + movq %rbp, %rax # 48($inp) + adcq %rdx, %r8 +@@ -420,8 +420,8 @@ + adcq \$0, %rbx + + mulq %rax ++ # rcx <= 2 and rax <= 0xFFFF..F9, so carry must be zero here + addq %rcx, %rax +- adcq \$0, %rdx + addq %rax, %r9 + movq %r14, %rax # 56($inp) + adcq %rdx, %r10 +@@ -443,8 +443,8 @@ + adcq \$0, %rcx + + mulq %rax ++ # rbx <= 2 and rax <= 0xFFFF..F9, so carry must be zero here + addq %rbx, %rax +- adcq \$0, %rdx + addq %rax, %r11 + movq %r14, %rax # 56($inp) + adcq %rdx, %r12 +@@ -459,8 +459,8 @@ + adcq \$0, %rbx + + mulq %rax ++ # rcx <= 2 and rax <= 0xFFFF..F9, so carry must be zero here + addq %rcx, %rax +- adcq \$0, %rdx + addq %r13, %rax + adcq %rbx, %rdx + +@@ -572,9 +572,9 @@ + .byte 0x48,0x8b,0x96,0x10,0x00,0x00,0x00 # mov 16($inp), %rdx + + xor %rbx, %rbx ++ adox %r9, %r9 ++ # rcx <= 2 and rax <= 0xFFFF..F9, so carry must be zero here + adcx %rcx, %rax +- adox %r9, %r9 +- adcx %rbp, $out + adox %r10, %r10 + adcx %rax, %r9 + adox %rbp, %rbx +@@ -609,9 +609,9 @@ + mov 24($inp), %rdx + + xor %rcx, %rcx ++ adox %r11, %r11 ++ # rbx <= 2 and rax <= 0xFFFF..F9, so carry must be zero here + adcx %rbx, %rax +- adox %r11, %r11 +- adcx %rbp, $out + adox %r12, %r12 + adcx %rax, %r11 + adox %rbp, %rcx +@@ -642,9 +642,9 @@ + mov 32($inp), %rdx + + xor %rbx, %rbx ++ adox %r13, %r13 ++ # rcx <= 2 and rax <= 0xFFFF..F9, so carry must be zero here + adcx %rcx, %rax +- adox %r13, %r13 +- adcx %rbp, $out + adox %r14, %r14 + adcx %rax, %r13 + adox %rbp, %rbx +@@ -671,9 +671,9 @@ + adox %rbp, %r11 + + xor %rcx, %rcx ++ adox %r15, %r15 ++ # rbx <= 2 and rax <= 0xFFFF..F9, so carry must be zero here + adcx %rbx, %rax +- adox %r15, %r15 +- adcx %rbp, $out + adox %r8, %r8 + adcx %rax, %r15 + adox %rbp, %rcx +@@ -696,9 +696,9 @@ + mov 48($inp), %rdx + + xor %rbx, %rbx ++ adox %r9, %r9 ++ # rcx <= 2 and rax <= 0xFFFF..F9, so carry must be zero here + adcx %rcx, %rax +- adox %r9, %r9 +- adcx %rbp, $out + adox %r10, %r10 + adcx %rax, %r9 + adcx $out, %r10 +@@ -716,9 +716,9 @@ + mulx %rdx, %rax, $out + xor %rcx, %rcx + mov 56($inp), %rdx ++ adox %r11, %r11 ++ # rbx <= 2 and rax <= 0xFFFF..F9, so carry must be zero here + adcx %rbx, %rax +- adox %r11, %r11 +- adcx %rbp, $out + adox %r12, %r12 + adcx %rax, %r11 + adox %rbp, %rcx +@@ -731,9 +731,9 @@ + #eighth iteration + mulx %rdx, %rax, %rdx + xor %rbx, %rbx ++ adox %r13, %r13 ++ # rcx <= 2 and rax <= 0xFFFF..F9, so carry must be zero here + adcx %rcx, %rax +- adox %r13, %r13 +- adcx %rbp, %rdx + adox %rbp, %rbx + adcx %r13, %rax + adcx %rdx, %rbx diff --git a/pkgs/development/libraries/openssl/1.1/cve-2019-1551.patch b/pkgs/development/libraries/openssl/1.1/cve-2019-1551.patch new file mode 100644 index 00000000000..0e9916eb942 --- /dev/null +++ b/pkgs/development/libraries/openssl/1.1/cve-2019-1551.patch @@ -0,0 +1,754 @@ +From 419102400a2811582a7a3d4a4e317d72e5ce0a8f Mon Sep 17 00:00:00 2001 +From: Andy Polyakov +Date: Wed, 4 Dec 2019 12:48:21 +0100 +Subject: [PATCH] Fix an overflow bug in rsaz_512_sqr + +There is an overflow bug in the x64_64 Montgomery squaring procedure used in +exponentiation with 512-bit moduli. No EC algorithms are affected. Analysis +suggests that attacks against 2-prime RSA1024, 3-prime RSA1536, and DSA1024 as a +result of this defect would be very difficult to perform and are not believed +likely. Attacks against DH512 are considered just feasible. However, for an +attack the target would have to re-use the DH512 private key, which is not +recommended anyway. Also applications directly using the low level API +BN_mod_exp may be affected if they use BN_FLG_CONSTTIME. + +CVE-2019-1551 + +Reviewed-by: Paul Dale +Reviewed-by: Bernd Edlinger +(Merged from https://github.com/openssl/openssl/pull/10575) +--- + crypto/bn/asm/rsaz-x86_64.pl | 381 ++++++++++++++++++----------------- + 1 file changed, 197 insertions(+), 184 deletions(-) + +diff --git a/crypto/bn/asm/rsaz-x86_64.pl b/crypto/bn/asm/rsaz-x86_64.pl +index b1797b649f00..7534d5cd03e5 100755 +--- a/crypto/bn/asm/rsaz-x86_64.pl ++++ b/crypto/bn/asm/rsaz-x86_64.pl +@@ -116,7 +116,7 @@ + subq \$128+24, %rsp + .cfi_adjust_cfa_offset 128+24 + .Lsqr_body: +- movq $mod, %rbp # common argument ++ movq $mod, %xmm1 # common off-load + movq ($inp), %rdx + movq 8($inp), %rax + movq $n0, 128(%rsp) +@@ -134,7 +134,8 @@ + .Loop_sqr: + movl $times,128+8(%rsp) + #first iteration +- movq %rdx, %rbx ++ movq %rdx, %rbx # 0($inp) ++ mov %rax, %rbp # 8($inp) + mulq %rdx + movq %rax, %r8 + movq 16($inp), %rax +@@ -173,31 +174,29 @@ + mulq %rbx + addq %rax, %r14 + movq %rbx, %rax +- movq %rdx, %r15 +- adcq \$0, %r15 ++ adcq \$0, %rdx + +- addq %r8, %r8 #shlq \$1, %r8 +- movq %r9, %rcx +- adcq %r9, %r9 #shld \$1, %r8, %r9 ++ xorq %rcx,%rcx # rcx:r8 = r8 << 1 ++ addq %r8, %r8 ++ movq %rdx, %r15 ++ adcq \$0, %rcx + + mulq %rax +- movq %rax, (%rsp) +- addq %rdx, %r8 +- adcq \$0, %r9 ++ addq %r8, %rdx ++ adcq \$0, %rcx + +- movq %r8, 8(%rsp) +- shrq \$63, %rcx ++ movq %rax, (%rsp) ++ movq %rdx, 8(%rsp) + + #second iteration +- movq 8($inp), %r8 + movq 16($inp), %rax +- mulq %r8 ++ mulq %rbp + addq %rax, %r10 + movq 24($inp), %rax + movq %rdx, %rbx + adcq \$0, %rbx + +- mulq %r8 ++ mulq %rbp + addq %rax, %r11 + movq 32($inp), %rax + adcq \$0, %rdx +@@ -205,7 +204,7 @@ + movq %rdx, %rbx + adcq \$0, %rbx + +- mulq %r8 ++ mulq %rbp + addq %rax, %r12 + movq 40($inp), %rax + adcq \$0, %rdx +@@ -213,7 +212,7 @@ + movq %rdx, %rbx + adcq \$0, %rbx + +- mulq %r8 ++ mulq %rbp + addq %rax, %r13 + movq 48($inp), %rax + adcq \$0, %rdx +@@ -221,7 +220,7 @@ + movq %rdx, %rbx + adcq \$0, %rbx + +- mulq %r8 ++ mulq %rbp + addq %rax, %r14 + movq 56($inp), %rax + adcq \$0, %rdx +@@ -229,39 +228,39 @@ + movq %rdx, %rbx + adcq \$0, %rbx + +- mulq %r8 ++ mulq %rbp + addq %rax, %r15 +- movq %r8, %rax ++ movq %rbp, %rax + adcq \$0, %rdx + addq %rbx, %r15 +- movq %rdx, %r8 +- movq %r10, %rdx +- adcq \$0, %r8 ++ adcq \$0, %rdx + +- add %rdx, %rdx +- lea (%rcx,%r10,2), %r10 #shld \$1, %rcx, %r10 +- movq %r11, %rbx +- adcq %r11, %r11 #shld \$1, %r10, %r11 ++ xorq %rbx, %rbx # rbx:r10:r9 = r10:r9 << 1 ++ addq %r9, %r9 ++ movq %rdx, %r8 ++ adcq %r10, %r10 ++ adcq \$0, %rbx + + mulq %rax ++ addq %rcx, %rax ++ movq 16($inp), %rbp ++ adcq \$0, %rdx + addq %rax, %r9 ++ movq 24($inp), %rax + adcq %rdx, %r10 +- adcq \$0, %r11 ++ adcq \$0, %rbx + + movq %r9, 16(%rsp) + movq %r10, 24(%rsp) +- shrq \$63, %rbx + + #third iteration +- movq 16($inp), %r9 +- movq 24($inp), %rax +- mulq %r9 ++ mulq %rbp + addq %rax, %r12 + movq 32($inp), %rax + movq %rdx, %rcx + adcq \$0, %rcx + +- mulq %r9 ++ mulq %rbp + addq %rax, %r13 + movq 40($inp), %rax + adcq \$0, %rdx +@@ -269,7 +268,7 @@ + movq %rdx, %rcx + adcq \$0, %rcx + +- mulq %r9 ++ mulq %rbp + addq %rax, %r14 + movq 48($inp), %rax + adcq \$0, %rdx +@@ -277,9 +276,7 @@ + movq %rdx, %rcx + adcq \$0, %rcx + +- mulq %r9 +- movq %r12, %r10 +- lea (%rbx,%r12,2), %r12 #shld \$1, %rbx, %r12 ++ mulq %rbp + addq %rax, %r15 + movq 56($inp), %rax + adcq \$0, %rdx +@@ -287,36 +284,40 @@ + movq %rdx, %rcx + adcq \$0, %rcx + +- mulq %r9 +- shrq \$63, %r10 ++ mulq %rbp + addq %rax, %r8 +- movq %r9, %rax ++ movq %rbp, %rax + adcq \$0, %rdx + addq %rcx, %r8 +- movq %rdx, %r9 +- adcq \$0, %r9 ++ adcq \$0, %rdx + +- movq %r13, %rcx +- leaq (%r10,%r13,2), %r13 #shld \$1, %r12, %r13 ++ xorq %rcx, %rcx # rcx:r12:r11 = r12:r11 << 1 ++ addq %r11, %r11 ++ movq %rdx, %r9 ++ adcq %r12, %r12 ++ adcq \$0, %rcx + + mulq %rax ++ addq %rbx, %rax ++ movq 24($inp), %r10 ++ adcq \$0, %rdx + addq %rax, %r11 ++ movq 32($inp), %rax + adcq %rdx, %r12 +- adcq \$0, %r13 ++ adcq \$0, %rcx + + movq %r11, 32(%rsp) + movq %r12, 40(%rsp) +- shrq \$63, %rcx + + #fourth iteration +- movq 24($inp), %r10 +- movq 32($inp), %rax ++ mov %rax, %r11 # 32($inp) + mulq %r10 + addq %rax, %r14 + movq 40($inp), %rax + movq %rdx, %rbx + adcq \$0, %rbx + ++ mov %rax, %r12 # 40($inp) + mulq %r10 + addq %rax, %r15 + movq 48($inp), %rax +@@ -325,9 +326,8 @@ + movq %rdx, %rbx + adcq \$0, %rbx + ++ mov %rax, %rbp # 48($inp) + mulq %r10 +- movq %r14, %r12 +- leaq (%rcx,%r14,2), %r14 #shld \$1, %rcx, %r14 + addq %rax, %r8 + movq 56($inp), %rax + adcq \$0, %rdx +@@ -336,32 +336,33 @@ + adcq \$0, %rbx + + mulq %r10 +- shrq \$63, %r12 + addq %rax, %r9 + movq %r10, %rax + adcq \$0, %rdx + addq %rbx, %r9 +- movq %rdx, %r10 +- adcq \$0, %r10 ++ adcq \$0, %rdx + +- movq %r15, %rbx +- leaq (%r12,%r15,2),%r15 #shld \$1, %r14, %r15 ++ xorq %rbx, %rbx # rbx:r13:r14 = r13:r14 << 1 ++ addq %r13, %r13 ++ movq %rdx, %r10 ++ adcq %r14, %r14 ++ adcq \$0, %rbx + + mulq %rax ++ addq %rcx, %rax ++ adcq \$0, %rdx + addq %rax, %r13 ++ movq %r12, %rax # 40($inp) + adcq %rdx, %r14 +- adcq \$0, %r15 ++ adcq \$0, %rbx + + movq %r13, 48(%rsp) + movq %r14, 56(%rsp) +- shrq \$63, %rbx + + #fifth iteration +- movq 32($inp), %r11 +- movq 40($inp), %rax + mulq %r11 + addq %rax, %r8 +- movq 48($inp), %rax ++ movq %rbp, %rax # 48($inp) + movq %rdx, %rcx + adcq \$0, %rcx + +@@ -369,97 +370,99 @@ + addq %rax, %r9 + movq 56($inp), %rax + adcq \$0, %rdx +- movq %r8, %r12 +- leaq (%rbx,%r8,2), %r8 #shld \$1, %rbx, %r8 + addq %rcx, %r9 + movq %rdx, %rcx + adcq \$0, %rcx + ++ mov %rax, %r14 # 56($inp) + mulq %r11 +- shrq \$63, %r12 + addq %rax, %r10 + movq %r11, %rax + adcq \$0, %rdx + addq %rcx, %r10 +- movq %rdx, %r11 +- adcq \$0, %r11 ++ adcq \$0, %rdx + +- movq %r9, %rcx +- leaq (%r12,%r9,2), %r9 #shld \$1, %r8, %r9 ++ xorq %rcx, %rcx # rcx:r8:r15 = r8:r15 << 1 ++ addq %r15, %r15 ++ movq %rdx, %r11 ++ adcq %r8, %r8 ++ adcq \$0, %rcx + + mulq %rax ++ addq %rbx, %rax ++ adcq \$0, %rdx + addq %rax, %r15 ++ movq %rbp, %rax # 48($inp) + adcq %rdx, %r8 +- adcq \$0, %r9 ++ adcq \$0, %rcx + + movq %r15, 64(%rsp) + movq %r8, 72(%rsp) +- shrq \$63, %rcx + + #sixth iteration +- movq 40($inp), %r12 +- movq 48($inp), %rax + mulq %r12 + addq %rax, %r10 +- movq 56($inp), %rax ++ movq %r14, %rax # 56($inp) + movq %rdx, %rbx + adcq \$0, %rbx + + mulq %r12 + addq %rax, %r11 + movq %r12, %rax +- movq %r10, %r15 +- leaq (%rcx,%r10,2), %r10 #shld \$1, %rcx, %r10 + adcq \$0, %rdx +- shrq \$63, %r15 + addq %rbx, %r11 +- movq %rdx, %r12 +- adcq \$0, %r12 ++ adcq \$0, %rdx + +- movq %r11, %rbx +- leaq (%r15,%r11,2), %r11 #shld \$1, %r10, %r11 ++ xorq %rbx, %rbx # rbx:r10:r9 = r10:r9 << 1 ++ addq %r9, %r9 ++ movq %rdx, %r12 ++ adcq %r10, %r10 ++ adcq \$0, %rbx + + mulq %rax ++ addq %rcx, %rax ++ adcq \$0, %rdx + addq %rax, %r9 ++ movq %r14, %rax # 56($inp) + adcq %rdx, %r10 +- adcq \$0, %r11 ++ adcq \$0, %rbx + + movq %r9, 80(%rsp) + movq %r10, 88(%rsp) + + #seventh iteration +- movq 48($inp), %r13 +- movq 56($inp), %rax +- mulq %r13 ++ mulq %rbp + addq %rax, %r12 +- movq %r13, %rax +- movq %rdx, %r13 +- adcq \$0, %r13 ++ movq %rbp, %rax ++ adcq \$0, %rdx + +- xorq %r14, %r14 +- shlq \$1, %rbx +- adcq %r12, %r12 #shld \$1, %rbx, %r12 +- adcq %r13, %r13 #shld \$1, %r12, %r13 +- adcq %r14, %r14 #shld \$1, %r13, %r14 ++ xorq %rcx, %rcx # rcx:r12:r11 = r12:r11 << 1 ++ addq %r11, %r11 ++ movq %rdx, %r13 ++ adcq %r12, %r12 ++ adcq \$0, %rcx + + mulq %rax ++ addq %rbx, %rax ++ adcq \$0, %rdx + addq %rax, %r11 ++ movq %r14, %rax # 56($inp) + adcq %rdx, %r12 +- adcq \$0, %r13 ++ adcq \$0, %rcx + + movq %r11, 96(%rsp) + movq %r12, 104(%rsp) + + #eighth iteration +- movq 56($inp), %rax ++ xorq %rbx, %rbx # rbx:r13 = r13 << 1 ++ addq %r13, %r13 ++ adcq \$0, %rbx ++ + mulq %rax +- addq %rax, %r13 ++ addq %rcx, %rax + adcq \$0, %rdx +- +- addq %rdx, %r14 +- +- movq %r13, 112(%rsp) +- movq %r14, 120(%rsp) ++ addq %r13, %rax ++ adcq %rbx, %rdx + + movq (%rsp), %r8 + movq 8(%rsp), %r9 +@@ -469,6 +472,10 @@ + movq 40(%rsp), %r13 + movq 48(%rsp), %r14 + movq 56(%rsp), %r15 ++ movq %xmm1, %rbp ++ ++ movq %rax, 112(%rsp) ++ movq %rdx, 120(%rsp) + + call __rsaz_512_reduce + +@@ -500,9 +507,9 @@ + .Loop_sqrx: + movl $times,128+8(%rsp) + movq $out, %xmm0 # off-load +- movq %rbp, %xmm1 # off-load + #first iteration + mulx %rax, %r8, %r9 ++ mov %rax, %rbx + + mulx 16($inp), %rcx, %r10 + xor %rbp, %rbp # cf=0, of=0 +@@ -510,40 +517,39 @@ + mulx 24($inp), %rax, %r11 + adcx %rcx, %r9 + +- mulx 32($inp), %rcx, %r12 ++ .byte 0xc4,0x62,0xf3,0xf6,0xa6,0x20,0x00,0x00,0x00 # mulx 32($inp), %rcx, %r12 + adcx %rax, %r10 + +- mulx 40($inp), %rax, %r13 ++ .byte 0xc4,0x62,0xfb,0xf6,0xae,0x28,0x00,0x00,0x00 # mulx 40($inp), %rax, %r13 + adcx %rcx, %r11 + +- .byte 0xc4,0x62,0xf3,0xf6,0xb6,0x30,0x00,0x00,0x00 # mulx 48($inp), %rcx, %r14 ++ mulx 48($inp), %rcx, %r14 + adcx %rax, %r12 + adcx %rcx, %r13 + +- .byte 0xc4,0x62,0xfb,0xf6,0xbe,0x38,0x00,0x00,0x00 # mulx 56($inp), %rax, %r15 ++ mulx 56($inp), %rax, %r15 + adcx %rax, %r14 + adcx %rbp, %r15 # %rbp is 0 + +- mov %r9, %rcx +- shld \$1, %r8, %r9 +- shl \$1, %r8 +- +- xor %ebp, %ebp +- mulx %rdx, %rax, %rdx +- adcx %rdx, %r8 +- mov 8($inp), %rdx +- adcx %rbp, %r9 ++ mulx %rdx, %rax, $out ++ mov %rbx, %rdx # 8($inp) ++ xor %rcx, %rcx ++ adox %r8, %r8 ++ adcx $out, %r8 ++ adox %rbp, %rcx ++ adcx %rbp, %rcx + + mov %rax, (%rsp) + mov %r8, 8(%rsp) + + #second iteration +- mulx 16($inp), %rax, %rbx ++ .byte 0xc4,0xe2,0xfb,0xf6,0x9e,0x10,0x00,0x00,0x00 # mulx 16($inp), %rax, %rbx + adox %rax, %r10 + adcx %rbx, %r11 + +- .byte 0xc4,0x62,0xc3,0xf6,0x86,0x18,0x00,0x00,0x00 # mulx 24($inp), $out, %r8 ++ mulx 24($inp), $out, %r8 + adox $out, %r11 ++ .byte 0x66 + adcx %r8, %r12 + + mulx 32($inp), %rax, %rbx +@@ -561,24 +567,25 @@ + .byte 0xc4,0x62,0xc3,0xf6,0x86,0x38,0x00,0x00,0x00 # mulx 56($inp), $out, %r8 + adox $out, %r15 + adcx %rbp, %r8 ++ mulx %rdx, %rax, $out + adox %rbp, %r8 ++ .byte 0x48,0x8b,0x96,0x10,0x00,0x00,0x00 # mov 16($inp), %rdx + +- mov %r11, %rbx +- shld \$1, %r10, %r11 +- shld \$1, %rcx, %r10 +- +- xor %ebp,%ebp +- mulx %rdx, %rax, %rcx +- mov 16($inp), %rdx ++ xor %rbx, %rbx ++ adcx %rcx, %rax ++ adox %r9, %r9 ++ adcx %rbp, $out ++ adox %r10, %r10 + adcx %rax, %r9 +- adcx %rcx, %r10 +- adcx %rbp, %r11 ++ adox %rbp, %rbx ++ adcx $out, %r10 ++ adcx %rbp, %rbx + + mov %r9, 16(%rsp) + .byte 0x4c,0x89,0x94,0x24,0x18,0x00,0x00,0x00 # mov %r10, 24(%rsp) + + #third iteration +- .byte 0xc4,0x62,0xc3,0xf6,0x8e,0x18,0x00,0x00,0x00 # mulx 24($inp), $out, %r9 ++ mulx 24($inp), $out, %r9 + adox $out, %r12 + adcx %r9, %r13 + +@@ -586,7 +593,7 @@ + adox %rax, %r13 + adcx %rcx, %r14 + +- mulx 40($inp), $out, %r9 ++ .byte 0xc4,0x62,0xc3,0xf6,0x8e,0x28,0x00,0x00,0x00 # mulx 40($inp), $out, %r9 + adox $out, %r14 + adcx %r9, %r15 + +@@ -594,27 +601,28 @@ + adox %rax, %r15 + adcx %rcx, %r8 + +- .byte 0xc4,0x62,0xc3,0xf6,0x8e,0x38,0x00,0x00,0x00 # mulx 56($inp), $out, %r9 ++ mulx 56($inp), $out, %r9 + adox $out, %r8 + adcx %rbp, %r9 ++ mulx %rdx, %rax, $out + adox %rbp, %r9 ++ mov 24($inp), %rdx + +- mov %r13, %rcx +- shld \$1, %r12, %r13 +- shld \$1, %rbx, %r12 +- +- xor %ebp, %ebp +- mulx %rdx, %rax, %rdx ++ xor %rcx, %rcx ++ adcx %rbx, %rax ++ adox %r11, %r11 ++ adcx %rbp, $out ++ adox %r12, %r12 + adcx %rax, %r11 +- adcx %rdx, %r12 +- mov 24($inp), %rdx +- adcx %rbp, %r13 ++ adox %rbp, %rcx ++ adcx $out, %r12 ++ adcx %rbp, %rcx + + mov %r11, 32(%rsp) +- .byte 0x4c,0x89,0xa4,0x24,0x28,0x00,0x00,0x00 # mov %r12, 40(%rsp) ++ mov %r12, 40(%rsp) + + #fourth iteration +- .byte 0xc4,0xe2,0xfb,0xf6,0x9e,0x20,0x00,0x00,0x00 # mulx 32($inp), %rax, %rbx ++ mulx 32($inp), %rax, %rbx + adox %rax, %r14 + adcx %rbx, %r15 + +@@ -629,25 +637,25 @@ + mulx 56($inp), $out, %r10 + adox $out, %r9 + adcx %rbp, %r10 ++ mulx %rdx, %rax, $out + adox %rbp, %r10 ++ mov 32($inp), %rdx + +- .byte 0x66 +- mov %r15, %rbx +- shld \$1, %r14, %r15 +- shld \$1, %rcx, %r14 +- +- xor %ebp, %ebp +- mulx %rdx, %rax, %rdx ++ xor %rbx, %rbx ++ adcx %rcx, %rax ++ adox %r13, %r13 ++ adcx %rbp, $out ++ adox %r14, %r14 + adcx %rax, %r13 +- adcx %rdx, %r14 +- mov 32($inp), %rdx +- adcx %rbp, %r15 ++ adox %rbp, %rbx ++ adcx $out, %r14 ++ adcx %rbp, %rbx + + mov %r13, 48(%rsp) + mov %r14, 56(%rsp) + + #fifth iteration +- .byte 0xc4,0x62,0xc3,0xf6,0x9e,0x28,0x00,0x00,0x00 # mulx 40($inp), $out, %r11 ++ mulx 40($inp), $out, %r11 + adox $out, %r8 + adcx %r11, %r9 + +@@ -658,18 +666,19 @@ + mulx 56($inp), $out, %r11 + adox $out, %r10 + adcx %rbp, %r11 ++ mulx %rdx, %rax, $out ++ mov 40($inp), %rdx + adox %rbp, %r11 + +- mov %r9, %rcx +- shld \$1, %r8, %r9 +- shld \$1, %rbx, %r8 +- +- xor %ebp, %ebp +- mulx %rdx, %rax, %rdx ++ xor %rcx, %rcx ++ adcx %rbx, %rax ++ adox %r15, %r15 ++ adcx %rbp, $out ++ adox %r8, %r8 + adcx %rax, %r15 +- adcx %rdx, %r8 +- mov 40($inp), %rdx +- adcx %rbp, %r9 ++ adox %rbp, %rcx ++ adcx $out, %r8 ++ adcx %rbp, %rcx + + mov %r15, 64(%rsp) + mov %r8, 72(%rsp) +@@ -682,18 +691,19 @@ + .byte 0xc4,0x62,0xc3,0xf6,0xa6,0x38,0x00,0x00,0x00 # mulx 56($inp), $out, %r12 + adox $out, %r11 + adcx %rbp, %r12 ++ mulx %rdx, %rax, $out + adox %rbp, %r12 ++ mov 48($inp), %rdx + +- mov %r11, %rbx +- shld \$1, %r10, %r11 +- shld \$1, %rcx, %r10 +- +- xor %ebp, %ebp +- mulx %rdx, %rax, %rdx ++ xor %rbx, %rbx ++ adcx %rcx, %rax ++ adox %r9, %r9 ++ adcx %rbp, $out ++ adox %r10, %r10 + adcx %rax, %r9 +- adcx %rdx, %r10 +- mov 48($inp), %rdx +- adcx %rbp, %r11 ++ adcx $out, %r10 ++ adox %rbp, %rbx ++ adcx %rbp, %rbx + + mov %r9, 80(%rsp) + mov %r10, 88(%rsp) +@@ -703,31 +713,31 @@ + adox %rax, %r12 + adox %rbp, %r13 + +- xor %r14, %r14 +- shld \$1, %r13, %r14 +- shld \$1, %r12, %r13 +- shld \$1, %rbx, %r12 +- +- xor %ebp, %ebp +- mulx %rdx, %rax, %rdx +- adcx %rax, %r11 +- adcx %rdx, %r12 ++ mulx %rdx, %rax, $out ++ xor %rcx, %rcx + mov 56($inp), %rdx +- adcx %rbp, %r13 ++ adcx %rbx, %rax ++ adox %r11, %r11 ++ adcx %rbp, $out ++ adox %r12, %r12 ++ adcx %rax, %r11 ++ adox %rbp, %rcx ++ adcx $out, %r12 ++ adcx %rbp, %rcx + + .byte 0x4c,0x89,0x9c,0x24,0x60,0x00,0x00,0x00 # mov %r11, 96(%rsp) + .byte 0x4c,0x89,0xa4,0x24,0x68,0x00,0x00,0x00 # mov %r12, 104(%rsp) + + #eighth iteration + mulx %rdx, %rax, %rdx +- adox %rax, %r13 +- adox %rbp, %rdx ++ xor %rbx, %rbx ++ adcx %rcx, %rax ++ adox %r13, %r13 ++ adcx %rbp, %rdx ++ adox %rbp, %rbx ++ adcx %r13, %rax ++ adcx %rdx, %rbx + +- .byte 0x66 +- add %rdx, %r14 +- +- movq %r13, 112(%rsp) +- movq %r14, 120(%rsp) + movq %xmm0, $out + movq %xmm1, %rbp + +@@ -741,6 +751,9 @@ + movq 48(%rsp), %r14 + movq 56(%rsp), %r15 + ++ movq %rax, 112(%rsp) ++ movq %rbx, 120(%rsp) ++ + call __rsaz_512_reducex + + addq 64(%rsp), %r8 diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index a2a0c68c316..79bba38d4fc 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -161,6 +161,9 @@ in { (if stdenv.hostPlatform.isDarwin then ./1.1/use-etc-ssl-certs-darwin.patch else ./1.1/use-etc-ssl-certs.patch) + + ./1.1/cve-2019-1551.patch + ./1.1/cve-2019-1551-improve.patch ]; withDocs = true; }; -- cgit v1.2.3 From 6c8692feb4f0a37a88a1498ca4ad068c6e46ebcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 2 Apr 2020 11:30:46 +0200 Subject: openssl: 1.1.1d -> 1.1.1f https://github.com/pyca/pyopenssl/issues/899#issuecomment-607709065 The tests in python3.pkgs.pyopenssl succeed! Fixing this problem we experienced is listed as the only major change: https://www.openssl.org/news/openssl-1.1.1-notes.html --- .../openssl/1.1/cve-2019-1551-improve.patch | 181 ----- .../libraries/openssl/1.1/cve-2019-1551.patch | 754 --------------------- pkgs/development/libraries/openssl/default.nix | 7 +- 3 files changed, 2 insertions(+), 940 deletions(-) delete mode 100644 pkgs/development/libraries/openssl/1.1/cve-2019-1551-improve.patch delete mode 100644 pkgs/development/libraries/openssl/1.1/cve-2019-1551.patch diff --git a/pkgs/development/libraries/openssl/1.1/cve-2019-1551-improve.patch b/pkgs/development/libraries/openssl/1.1/cve-2019-1551-improve.patch deleted file mode 100644 index 09405b4a15f..00000000000 --- a/pkgs/development/libraries/openssl/1.1/cve-2019-1551-improve.patch +++ /dev/null @@ -1,181 +0,0 @@ -From 46ac489a1369f6d938adda356accab83acf2987a Mon Sep 17 00:00:00 2001 -From: Bernd Edlinger -Date: Wed, 4 Dec 2019 12:57:41 +0100 -Subject: [PATCH] Improve the overflow handling in rsaz_512_sqr - -We have always a carry in %rcx or %rbx in range 0..2 -from the previous stage, that is added to the result -of the 64-bit square, but the low nibble of any square -can only be 0, 1, 4, 9. - -Therefore one "adcq $0, %rdx" can be removed. -Likewise in the ADX code we can remove one -"adcx %rbp, $out" since %rbp is always 0, and carry is -also zero, therefore that is a no-op. - -Reviewed-by: Paul Dale -(Merged from https://github.com/openssl/openssl/pull/10575) ---- - crypto/bn/asm/rsaz-x86_64.pl | 42 ++++++++++++++++++------------------ - 1 file changed, 21 insertions(+), 21 deletions(-) - -diff --git a/crypto/bn/asm/rsaz-x86_64.pl b/crypto/bn/asm/rsaz-x86_64.pl -index 7534d5cd03e5..f4d9c9b1297b 100755 ---- a/crypto/bn/asm/rsaz-x86_64.pl -+++ b/crypto/bn/asm/rsaz-x86_64.pl -@@ -242,9 +242,9 @@ - adcq \$0, %rbx - - mulq %rax -+ # rcx <= 2 and rax <= 0xFFFF..F9, so carry must be zero here - addq %rcx, %rax - movq 16($inp), %rbp -- adcq \$0, %rdx - addq %rax, %r9 - movq 24($inp), %rax - adcq %rdx, %r10 -@@ -298,9 +298,9 @@ - adcq \$0, %rcx - - mulq %rax -+ # rbx <= 2 and rax <= 0xFFFF..F9, so carry must be zero here - addq %rbx, %rax - movq 24($inp), %r10 -- adcq \$0, %rdx - addq %rax, %r11 - movq 32($inp), %rax - adcq %rdx, %r12 -@@ -349,8 +349,8 @@ - adcq \$0, %rbx - - mulq %rax -+ # rcx <= 2 and rax <= 0xFFFF..F9, so carry must be zero here - addq %rcx, %rax -- adcq \$0, %rdx - addq %rax, %r13 - movq %r12, %rax # 40($inp) - adcq %rdx, %r14 -@@ -389,8 +389,8 @@ - adcq \$0, %rcx - - mulq %rax -+ # rbx <= 2 and rax <= 0xFFFF..F9, so carry must be zero here - addq %rbx, %rax -- adcq \$0, %rdx - addq %rax, %r15 - movq %rbp, %rax # 48($inp) - adcq %rdx, %r8 -@@ -420,8 +420,8 @@ - adcq \$0, %rbx - - mulq %rax -+ # rcx <= 2 and rax <= 0xFFFF..F9, so carry must be zero here - addq %rcx, %rax -- adcq \$0, %rdx - addq %rax, %r9 - movq %r14, %rax # 56($inp) - adcq %rdx, %r10 -@@ -443,8 +443,8 @@ - adcq \$0, %rcx - - mulq %rax -+ # rbx <= 2 and rax <= 0xFFFF..F9, so carry must be zero here - addq %rbx, %rax -- adcq \$0, %rdx - addq %rax, %r11 - movq %r14, %rax # 56($inp) - adcq %rdx, %r12 -@@ -459,8 +459,8 @@ - adcq \$0, %rbx - - mulq %rax -+ # rcx <= 2 and rax <= 0xFFFF..F9, so carry must be zero here - addq %rcx, %rax -- adcq \$0, %rdx - addq %r13, %rax - adcq %rbx, %rdx - -@@ -572,9 +572,9 @@ - .byte 0x48,0x8b,0x96,0x10,0x00,0x00,0x00 # mov 16($inp), %rdx - - xor %rbx, %rbx -+ adox %r9, %r9 -+ # rcx <= 2 and rax <= 0xFFFF..F9, so carry must be zero here - adcx %rcx, %rax -- adox %r9, %r9 -- adcx %rbp, $out - adox %r10, %r10 - adcx %rax, %r9 - adox %rbp, %rbx -@@ -609,9 +609,9 @@ - mov 24($inp), %rdx - - xor %rcx, %rcx -+ adox %r11, %r11 -+ # rbx <= 2 and rax <= 0xFFFF..F9, so carry must be zero here - adcx %rbx, %rax -- adox %r11, %r11 -- adcx %rbp, $out - adox %r12, %r12 - adcx %rax, %r11 - adox %rbp, %rcx -@@ -642,9 +642,9 @@ - mov 32($inp), %rdx - - xor %rbx, %rbx -+ adox %r13, %r13 -+ # rcx <= 2 and rax <= 0xFFFF..F9, so carry must be zero here - adcx %rcx, %rax -- adox %r13, %r13 -- adcx %rbp, $out - adox %r14, %r14 - adcx %rax, %r13 - adox %rbp, %rbx -@@ -671,9 +671,9 @@ - adox %rbp, %r11 - - xor %rcx, %rcx -+ adox %r15, %r15 -+ # rbx <= 2 and rax <= 0xFFFF..F9, so carry must be zero here - adcx %rbx, %rax -- adox %r15, %r15 -- adcx %rbp, $out - adox %r8, %r8 - adcx %rax, %r15 - adox %rbp, %rcx -@@ -696,9 +696,9 @@ - mov 48($inp), %rdx - - xor %rbx, %rbx -+ adox %r9, %r9 -+ # rcx <= 2 and rax <= 0xFFFF..F9, so carry must be zero here - adcx %rcx, %rax -- adox %r9, %r9 -- adcx %rbp, $out - adox %r10, %r10 - adcx %rax, %r9 - adcx $out, %r10 -@@ -716,9 +716,9 @@ - mulx %rdx, %rax, $out - xor %rcx, %rcx - mov 56($inp), %rdx -+ adox %r11, %r11 -+ # rbx <= 2 and rax <= 0xFFFF..F9, so carry must be zero here - adcx %rbx, %rax -- adox %r11, %r11 -- adcx %rbp, $out - adox %r12, %r12 - adcx %rax, %r11 - adox %rbp, %rcx -@@ -731,9 +731,9 @@ - #eighth iteration - mulx %rdx, %rax, %rdx - xor %rbx, %rbx -+ adox %r13, %r13 -+ # rcx <= 2 and rax <= 0xFFFF..F9, so carry must be zero here - adcx %rcx, %rax -- adox %r13, %r13 -- adcx %rbp, %rdx - adox %rbp, %rbx - adcx %r13, %rax - adcx %rdx, %rbx diff --git a/pkgs/development/libraries/openssl/1.1/cve-2019-1551.patch b/pkgs/development/libraries/openssl/1.1/cve-2019-1551.patch deleted file mode 100644 index 0e9916eb942..00000000000 --- a/pkgs/development/libraries/openssl/1.1/cve-2019-1551.patch +++ /dev/null @@ -1,754 +0,0 @@ -From 419102400a2811582a7a3d4a4e317d72e5ce0a8f Mon Sep 17 00:00:00 2001 -From: Andy Polyakov -Date: Wed, 4 Dec 2019 12:48:21 +0100 -Subject: [PATCH] Fix an overflow bug in rsaz_512_sqr - -There is an overflow bug in the x64_64 Montgomery squaring procedure used in -exponentiation with 512-bit moduli. No EC algorithms are affected. Analysis -suggests that attacks against 2-prime RSA1024, 3-prime RSA1536, and DSA1024 as a -result of this defect would be very difficult to perform and are not believed -likely. Attacks against DH512 are considered just feasible. However, for an -attack the target would have to re-use the DH512 private key, which is not -recommended anyway. Also applications directly using the low level API -BN_mod_exp may be affected if they use BN_FLG_CONSTTIME. - -CVE-2019-1551 - -Reviewed-by: Paul Dale -Reviewed-by: Bernd Edlinger -(Merged from https://github.com/openssl/openssl/pull/10575) ---- - crypto/bn/asm/rsaz-x86_64.pl | 381 ++++++++++++++++++----------------- - 1 file changed, 197 insertions(+), 184 deletions(-) - -diff --git a/crypto/bn/asm/rsaz-x86_64.pl b/crypto/bn/asm/rsaz-x86_64.pl -index b1797b649f00..7534d5cd03e5 100755 ---- a/crypto/bn/asm/rsaz-x86_64.pl -+++ b/crypto/bn/asm/rsaz-x86_64.pl -@@ -116,7 +116,7 @@ - subq \$128+24, %rsp - .cfi_adjust_cfa_offset 128+24 - .Lsqr_body: -- movq $mod, %rbp # common argument -+ movq $mod, %xmm1 # common off-load - movq ($inp), %rdx - movq 8($inp), %rax - movq $n0, 128(%rsp) -@@ -134,7 +134,8 @@ - .Loop_sqr: - movl $times,128+8(%rsp) - #first iteration -- movq %rdx, %rbx -+ movq %rdx, %rbx # 0($inp) -+ mov %rax, %rbp # 8($inp) - mulq %rdx - movq %rax, %r8 - movq 16($inp), %rax -@@ -173,31 +174,29 @@ - mulq %rbx - addq %rax, %r14 - movq %rbx, %rax -- movq %rdx, %r15 -- adcq \$0, %r15 -+ adcq \$0, %rdx - -- addq %r8, %r8 #shlq \$1, %r8 -- movq %r9, %rcx -- adcq %r9, %r9 #shld \$1, %r8, %r9 -+ xorq %rcx,%rcx # rcx:r8 = r8 << 1 -+ addq %r8, %r8 -+ movq %rdx, %r15 -+ adcq \$0, %rcx - - mulq %rax -- movq %rax, (%rsp) -- addq %rdx, %r8 -- adcq \$0, %r9 -+ addq %r8, %rdx -+ adcq \$0, %rcx - -- movq %r8, 8(%rsp) -- shrq \$63, %rcx -+ movq %rax, (%rsp) -+ movq %rdx, 8(%rsp) - - #second iteration -- movq 8($inp), %r8 - movq 16($inp), %rax -- mulq %r8 -+ mulq %rbp - addq %rax, %r10 - movq 24($inp), %rax - movq %rdx, %rbx - adcq \$0, %rbx - -- mulq %r8 -+ mulq %rbp - addq %rax, %r11 - movq 32($inp), %rax - adcq \$0, %rdx -@@ -205,7 +204,7 @@ - movq %rdx, %rbx - adcq \$0, %rbx - -- mulq %r8 -+ mulq %rbp - addq %rax, %r12 - movq 40($inp), %rax - adcq \$0, %rdx -@@ -213,7 +212,7 @@ - movq %rdx, %rbx - adcq \$0, %rbx - -- mulq %r8 -+ mulq %rbp - addq %rax, %r13 - movq 48($inp), %rax - adcq \$0, %rdx -@@ -221,7 +220,7 @@ - movq %rdx, %rbx - adcq \$0, %rbx - -- mulq %r8 -+ mulq %rbp - addq %rax, %r14 - movq 56($inp), %rax - adcq \$0, %rdx -@@ -229,39 +228,39 @@ - movq %rdx, %rbx - adcq \$0, %rbx - -- mulq %r8 -+ mulq %rbp - addq %rax, %r15 -- movq %r8, %rax -+ movq %rbp, %rax - adcq \$0, %rdx - addq %rbx, %r15 -- movq %rdx, %r8 -- movq %r10, %rdx -- adcq \$0, %r8 -+ adcq \$0, %rdx - -- add %rdx, %rdx -- lea (%rcx,%r10,2), %r10 #shld \$1, %rcx, %r10 -- movq %r11, %rbx -- adcq %r11, %r11 #shld \$1, %r10, %r11 -+ xorq %rbx, %rbx # rbx:r10:r9 = r10:r9 << 1 -+ addq %r9, %r9 -+ movq %rdx, %r8 -+ adcq %r10, %r10 -+ adcq \$0, %rbx - - mulq %rax -+ addq %rcx, %rax -+ movq 16($inp), %rbp -+ adcq \$0, %rdx - addq %rax, %r9 -+ movq 24($inp), %rax - adcq %rdx, %r10 -- adcq \$0, %r11 -+ adcq \$0, %rbx - - movq %r9, 16(%rsp) - movq %r10, 24(%rsp) -- shrq \$63, %rbx - - #third iteration -- movq 16($inp), %r9 -- movq 24($inp), %rax -- mulq %r9 -+ mulq %rbp - addq %rax, %r12 - movq 32($inp), %rax - movq %rdx, %rcx - adcq \$0, %rcx - -- mulq %r9 -+ mulq %rbp - addq %rax, %r13 - movq 40($inp), %rax - adcq \$0, %rdx -@@ -269,7 +268,7 @@ - movq %rdx, %rcx - adcq \$0, %rcx - -- mulq %r9 -+ mulq %rbp - addq %rax, %r14 - movq 48($inp), %rax - adcq \$0, %rdx -@@ -277,9 +276,7 @@ - movq %rdx, %rcx - adcq \$0, %rcx - -- mulq %r9 -- movq %r12, %r10 -- lea (%rbx,%r12,2), %r12 #shld \$1, %rbx, %r12 -+ mulq %rbp - addq %rax, %r15 - movq 56($inp), %rax - adcq \$0, %rdx -@@ -287,36 +284,40 @@ - movq %rdx, %rcx - adcq \$0, %rcx - -- mulq %r9 -- shrq \$63, %r10 -+ mulq %rbp - addq %rax, %r8 -- movq %r9, %rax -+ movq %rbp, %rax - adcq \$0, %rdx - addq %rcx, %r8 -- movq %rdx, %r9 -- adcq \$0, %r9 -+ adcq \$0, %rdx - -- movq %r13, %rcx -- leaq (%r10,%r13,2), %r13 #shld \$1, %r12, %r13 -+ xorq %rcx, %rcx # rcx:r12:r11 = r12:r11 << 1 -+ addq %r11, %r11 -+ movq %rdx, %r9 -+ adcq %r12, %r12 -+ adcq \$0, %rcx - - mulq %rax -+ addq %rbx, %rax -+ movq 24($inp), %r10 -+ adcq \$0, %rdx - addq %rax, %r11 -+ movq 32($inp), %rax - adcq %rdx, %r12 -- adcq \$0, %r13 -+ adcq \$0, %rcx - - movq %r11, 32(%rsp) - movq %r12, 40(%rsp) -- shrq \$63, %rcx - - #fourth iteration -- movq 24($inp), %r10 -- movq 32($inp), %rax -+ mov %rax, %r11 # 32($inp) - mulq %r10 - addq %rax, %r14 - movq 40($inp), %rax - movq %rdx, %rbx - adcq \$0, %rbx - -+ mov %rax, %r12 # 40($inp) - mulq %r10 - addq %rax, %r15 - movq 48($inp), %rax -@@ -325,9 +326,8 @@ - movq %rdx, %rbx - adcq \$0, %rbx - -+ mov %rax, %rbp # 48($inp) - mulq %r10 -- movq %r14, %r12 -- leaq (%rcx,%r14,2), %r14 #shld \$1, %rcx, %r14 - addq %rax, %r8 - movq 56($inp), %rax - adcq \$0, %rdx -@@ -336,32 +336,33 @@ - adcq \$0, %rbx - - mulq %r10 -- shrq \$63, %r12 - addq %rax, %r9 - movq %r10, %rax - adcq \$0, %rdx - addq %rbx, %r9 -- movq %rdx, %r10 -- adcq \$0, %r10 -+ adcq \$0, %rdx - -- movq %r15, %rbx -- leaq (%r12,%r15,2),%r15 #shld \$1, %r14, %r15 -+ xorq %rbx, %rbx # rbx:r13:r14 = r13:r14 << 1 -+ addq %r13, %r13 -+ movq %rdx, %r10 -+ adcq %r14, %r14 -+ adcq \$0, %rbx - - mulq %rax -+ addq %rcx, %rax -+ adcq \$0, %rdx - addq %rax, %r13 -+ movq %r12, %rax # 40($inp) - adcq %rdx, %r14 -- adcq \$0, %r15 -+ adcq \$0, %rbx - - movq %r13, 48(%rsp) - movq %r14, 56(%rsp) -- shrq \$63, %rbx - - #fifth iteration -- movq 32($inp), %r11 -- movq 40($inp), %rax - mulq %r11 - addq %rax, %r8 -- movq 48($inp), %rax -+ movq %rbp, %rax # 48($inp) - movq %rdx, %rcx - adcq \$0, %rcx - -@@ -369,97 +370,99 @@ - addq %rax, %r9 - movq 56($inp), %rax - adcq \$0, %rdx -- movq %r8, %r12 -- leaq (%rbx,%r8,2), %r8 #shld \$1, %rbx, %r8 - addq %rcx, %r9 - movq %rdx, %rcx - adcq \$0, %rcx - -+ mov %rax, %r14 # 56($inp) - mulq %r11 -- shrq \$63, %r12 - addq %rax, %r10 - movq %r11, %rax - adcq \$0, %rdx - addq %rcx, %r10 -- movq %rdx, %r11 -- adcq \$0, %r11 -+ adcq \$0, %rdx - -- movq %r9, %rcx -- leaq (%r12,%r9,2), %r9 #shld \$1, %r8, %r9 -+ xorq %rcx, %rcx # rcx:r8:r15 = r8:r15 << 1 -+ addq %r15, %r15 -+ movq %rdx, %r11 -+ adcq %r8, %r8 -+ adcq \$0, %rcx - - mulq %rax -+ addq %rbx, %rax -+ adcq \$0, %rdx - addq %rax, %r15 -+ movq %rbp, %rax # 48($inp) - adcq %rdx, %r8 -- adcq \$0, %r9 -+ adcq \$0, %rcx - - movq %r15, 64(%rsp) - movq %r8, 72(%rsp) -- shrq \$63, %rcx - - #sixth iteration -- movq 40($inp), %r12 -- movq 48($inp), %rax - mulq %r12 - addq %rax, %r10 -- movq 56($inp), %rax -+ movq %r14, %rax # 56($inp) - movq %rdx, %rbx - adcq \$0, %rbx - - mulq %r12 - addq %rax, %r11 - movq %r12, %rax -- movq %r10, %r15 -- leaq (%rcx,%r10,2), %r10 #shld \$1, %rcx, %r10 - adcq \$0, %rdx -- shrq \$63, %r15 - addq %rbx, %r11 -- movq %rdx, %r12 -- adcq \$0, %r12 -+ adcq \$0, %rdx - -- movq %r11, %rbx -- leaq (%r15,%r11,2), %r11 #shld \$1, %r10, %r11 -+ xorq %rbx, %rbx # rbx:r10:r9 = r10:r9 << 1 -+ addq %r9, %r9 -+ movq %rdx, %r12 -+ adcq %r10, %r10 -+ adcq \$0, %rbx - - mulq %rax -+ addq %rcx, %rax -+ adcq \$0, %rdx - addq %rax, %r9 -+ movq %r14, %rax # 56($inp) - adcq %rdx, %r10 -- adcq \$0, %r11 -+ adcq \$0, %rbx - - movq %r9, 80(%rsp) - movq %r10, 88(%rsp) - - #seventh iteration -- movq 48($inp), %r13 -- movq 56($inp), %rax -- mulq %r13 -+ mulq %rbp - addq %rax, %r12 -- movq %r13, %rax -- movq %rdx, %r13 -- adcq \$0, %r13 -+ movq %rbp, %rax -+ adcq \$0, %rdx - -- xorq %r14, %r14 -- shlq \$1, %rbx -- adcq %r12, %r12 #shld \$1, %rbx, %r12 -- adcq %r13, %r13 #shld \$1, %r12, %r13 -- adcq %r14, %r14 #shld \$1, %r13, %r14 -+ xorq %rcx, %rcx # rcx:r12:r11 = r12:r11 << 1 -+ addq %r11, %r11 -+ movq %rdx, %r13 -+ adcq %r12, %r12 -+ adcq \$0, %rcx - - mulq %rax -+ addq %rbx, %rax -+ adcq \$0, %rdx - addq %rax, %r11 -+ movq %r14, %rax # 56($inp) - adcq %rdx, %r12 -- adcq \$0, %r13 -+ adcq \$0, %rcx - - movq %r11, 96(%rsp) - movq %r12, 104(%rsp) - - #eighth iteration -- movq 56($inp), %rax -+ xorq %rbx, %rbx # rbx:r13 = r13 << 1 -+ addq %r13, %r13 -+ adcq \$0, %rbx -+ - mulq %rax -- addq %rax, %r13 -+ addq %rcx, %rax - adcq \$0, %rdx -- -- addq %rdx, %r14 -- -- movq %r13, 112(%rsp) -- movq %r14, 120(%rsp) -+ addq %r13, %rax -+ adcq %rbx, %rdx - - movq (%rsp), %r8 - movq 8(%rsp), %r9 -@@ -469,6 +472,10 @@ - movq 40(%rsp), %r13 - movq 48(%rsp), %r14 - movq 56(%rsp), %r15 -+ movq %xmm1, %rbp -+ -+ movq %rax, 112(%rsp) -+ movq %rdx, 120(%rsp) - - call __rsaz_512_reduce - -@@ -500,9 +507,9 @@ - .Loop_sqrx: - movl $times,128+8(%rsp) - movq $out, %xmm0 # off-load -- movq %rbp, %xmm1 # off-load - #first iteration - mulx %rax, %r8, %r9 -+ mov %rax, %rbx - - mulx 16($inp), %rcx, %r10 - xor %rbp, %rbp # cf=0, of=0 -@@ -510,40 +517,39 @@ - mulx 24($inp), %rax, %r11 - adcx %rcx, %r9 - -- mulx 32($inp), %rcx, %r12 -+ .byte 0xc4,0x62,0xf3,0xf6,0xa6,0x20,0x00,0x00,0x00 # mulx 32($inp), %rcx, %r12 - adcx %rax, %r10 - -- mulx 40($inp), %rax, %r13 -+ .byte 0xc4,0x62,0xfb,0xf6,0xae,0x28,0x00,0x00,0x00 # mulx 40($inp), %rax, %r13 - adcx %rcx, %r11 - -- .byte 0xc4,0x62,0xf3,0xf6,0xb6,0x30,0x00,0x00,0x00 # mulx 48($inp), %rcx, %r14 -+ mulx 48($inp), %rcx, %r14 - adcx %rax, %r12 - adcx %rcx, %r13 - -- .byte 0xc4,0x62,0xfb,0xf6,0xbe,0x38,0x00,0x00,0x00 # mulx 56($inp), %rax, %r15 -+ mulx 56($inp), %rax, %r15 - adcx %rax, %r14 - adcx %rbp, %r15 # %rbp is 0 - -- mov %r9, %rcx -- shld \$1, %r8, %r9 -- shl \$1, %r8 -- -- xor %ebp, %ebp -- mulx %rdx, %rax, %rdx -- adcx %rdx, %r8 -- mov 8($inp), %rdx -- adcx %rbp, %r9 -+ mulx %rdx, %rax, $out -+ mov %rbx, %rdx # 8($inp) -+ xor %rcx, %rcx -+ adox %r8, %r8 -+ adcx $out, %r8 -+ adox %rbp, %rcx -+ adcx %rbp, %rcx - - mov %rax, (%rsp) - mov %r8, 8(%rsp) - - #second iteration -- mulx 16($inp), %rax, %rbx -+ .byte 0xc4,0xe2,0xfb,0xf6,0x9e,0x10,0x00,0x00,0x00 # mulx 16($inp), %rax, %rbx - adox %rax, %r10 - adcx %rbx, %r11 - -- .byte 0xc4,0x62,0xc3,0xf6,0x86,0x18,0x00,0x00,0x00 # mulx 24($inp), $out, %r8 -+ mulx 24($inp), $out, %r8 - adox $out, %r11 -+ .byte 0x66 - adcx %r8, %r12 - - mulx 32($inp), %rax, %rbx -@@ -561,24 +567,25 @@ - .byte 0xc4,0x62,0xc3,0xf6,0x86,0x38,0x00,0x00,0x00 # mulx 56($inp), $out, %r8 - adox $out, %r15 - adcx %rbp, %r8 -+ mulx %rdx, %rax, $out - adox %rbp, %r8 -+ .byte 0x48,0x8b,0x96,0x10,0x00,0x00,0x00 # mov 16($inp), %rdx - -- mov %r11, %rbx -- shld \$1, %r10, %r11 -- shld \$1, %rcx, %r10 -- -- xor %ebp,%ebp -- mulx %rdx, %rax, %rcx -- mov 16($inp), %rdx -+ xor %rbx, %rbx -+ adcx %rcx, %rax -+ adox %r9, %r9 -+ adcx %rbp, $out -+ adox %r10, %r10 - adcx %rax, %r9 -- adcx %rcx, %r10 -- adcx %rbp, %r11 -+ adox %rbp, %rbx -+ adcx $out, %r10 -+ adcx %rbp, %rbx - - mov %r9, 16(%rsp) - .byte 0x4c,0x89,0x94,0x24,0x18,0x00,0x00,0x00 # mov %r10, 24(%rsp) - - #third iteration -- .byte 0xc4,0x62,0xc3,0xf6,0x8e,0x18,0x00,0x00,0x00 # mulx 24($inp), $out, %r9 -+ mulx 24($inp), $out, %r9 - adox $out, %r12 - adcx %r9, %r13 - -@@ -586,7 +593,7 @@ - adox %rax, %r13 - adcx %rcx, %r14 - -- mulx 40($inp), $out, %r9 -+ .byte 0xc4,0x62,0xc3,0xf6,0x8e,0x28,0x00,0x00,0x00 # mulx 40($inp), $out, %r9 - adox $out, %r14 - adcx %r9, %r15 - -@@ -594,27 +601,28 @@ - adox %rax, %r15 - adcx %rcx, %r8 - -- .byte 0xc4,0x62,0xc3,0xf6,0x8e,0x38,0x00,0x00,0x00 # mulx 56($inp), $out, %r9 -+ mulx 56($inp), $out, %r9 - adox $out, %r8 - adcx %rbp, %r9 -+ mulx %rdx, %rax, $out - adox %rbp, %r9 -+ mov 24($inp), %rdx - -- mov %r13, %rcx -- shld \$1, %r12, %r13 -- shld \$1, %rbx, %r12 -- -- xor %ebp, %ebp -- mulx %rdx, %rax, %rdx -+ xor %rcx, %rcx -+ adcx %rbx, %rax -+ adox %r11, %r11 -+ adcx %rbp, $out -+ adox %r12, %r12 - adcx %rax, %r11 -- adcx %rdx, %r12 -- mov 24($inp), %rdx -- adcx %rbp, %r13 -+ adox %rbp, %rcx -+ adcx $out, %r12 -+ adcx %rbp, %rcx - - mov %r11, 32(%rsp) -- .byte 0x4c,0x89,0xa4,0x24,0x28,0x00,0x00,0x00 # mov %r12, 40(%rsp) -+ mov %r12, 40(%rsp) - - #fourth iteration -- .byte 0xc4,0xe2,0xfb,0xf6,0x9e,0x20,0x00,0x00,0x00 # mulx 32($inp), %rax, %rbx -+ mulx 32($inp), %rax, %rbx - adox %rax, %r14 - adcx %rbx, %r15 - -@@ -629,25 +637,25 @@ - mulx 56($inp), $out, %r10 - adox $out, %r9 - adcx %rbp, %r10 -+ mulx %rdx, %rax, $out - adox %rbp, %r10 -+ mov 32($inp), %rdx - -- .byte 0x66 -- mov %r15, %rbx -- shld \$1, %r14, %r15 -- shld \$1, %rcx, %r14 -- -- xor %ebp, %ebp -- mulx %rdx, %rax, %rdx -+ xor %rbx, %rbx -+ adcx %rcx, %rax -+ adox %r13, %r13 -+ adcx %rbp, $out -+ adox %r14, %r14 - adcx %rax, %r13 -- adcx %rdx, %r14 -- mov 32($inp), %rdx -- adcx %rbp, %r15 -+ adox %rbp, %rbx -+ adcx $out, %r14 -+ adcx %rbp, %rbx - - mov %r13, 48(%rsp) - mov %r14, 56(%rsp) - - #fifth iteration -- .byte 0xc4,0x62,0xc3,0xf6,0x9e,0x28,0x00,0x00,0x00 # mulx 40($inp), $out, %r11 -+ mulx 40($inp), $out, %r11 - adox $out, %r8 - adcx %r11, %r9 - -@@ -658,18 +666,19 @@ - mulx 56($inp), $out, %r11 - adox $out, %r10 - adcx %rbp, %r11 -+ mulx %rdx, %rax, $out -+ mov 40($inp), %rdx - adox %rbp, %r11 - -- mov %r9, %rcx -- shld \$1, %r8, %r9 -- shld \$1, %rbx, %r8 -- -- xor %ebp, %ebp -- mulx %rdx, %rax, %rdx -+ xor %rcx, %rcx -+ adcx %rbx, %rax -+ adox %r15, %r15 -+ adcx %rbp, $out -+ adox %r8, %r8 - adcx %rax, %r15 -- adcx %rdx, %r8 -- mov 40($inp), %rdx -- adcx %rbp, %r9 -+ adox %rbp, %rcx -+ adcx $out, %r8 -+ adcx %rbp, %rcx - - mov %r15, 64(%rsp) - mov %r8, 72(%rsp) -@@ -682,18 +691,19 @@ - .byte 0xc4,0x62,0xc3,0xf6,0xa6,0x38,0x00,0x00,0x00 # mulx 56($inp), $out, %r12 - adox $out, %r11 - adcx %rbp, %r12 -+ mulx %rdx, %rax, $out - adox %rbp, %r12 -+ mov 48($inp), %rdx - -- mov %r11, %rbx -- shld \$1, %r10, %r11 -- shld \$1, %rcx, %r10 -- -- xor %ebp, %ebp -- mulx %rdx, %rax, %rdx -+ xor %rbx, %rbx -+ adcx %rcx, %rax -+ adox %r9, %r9 -+ adcx %rbp, $out -+ adox %r10, %r10 - adcx %rax, %r9 -- adcx %rdx, %r10 -- mov 48($inp), %rdx -- adcx %rbp, %r11 -+ adcx $out, %r10 -+ adox %rbp, %rbx -+ adcx %rbp, %rbx - - mov %r9, 80(%rsp) - mov %r10, 88(%rsp) -@@ -703,31 +713,31 @@ - adox %rax, %r12 - adox %rbp, %r13 - -- xor %r14, %r14 -- shld \$1, %r13, %r14 -- shld \$1, %r12, %r13 -- shld \$1, %rbx, %r12 -- -- xor %ebp, %ebp -- mulx %rdx, %rax, %rdx -- adcx %rax, %r11 -- adcx %rdx, %r12 -+ mulx %rdx, %rax, $out -+ xor %rcx, %rcx - mov 56($inp), %rdx -- adcx %rbp, %r13 -+ adcx %rbx, %rax -+ adox %r11, %r11 -+ adcx %rbp, $out -+ adox %r12, %r12 -+ adcx %rax, %r11 -+ adox %rbp, %rcx -+ adcx $out, %r12 -+ adcx %rbp, %rcx - - .byte 0x4c,0x89,0x9c,0x24,0x60,0x00,0x00,0x00 # mov %r11, 96(%rsp) - .byte 0x4c,0x89,0xa4,0x24,0x68,0x00,0x00,0x00 # mov %r12, 104(%rsp) - - #eighth iteration - mulx %rdx, %rax, %rdx -- adox %rax, %r13 -- adox %rbp, %rdx -+ xor %rbx, %rbx -+ adcx %rcx, %rax -+ adox %r13, %r13 -+ adcx %rbp, %rdx -+ adox %rbp, %rbx -+ adcx %r13, %rax -+ adcx %rdx, %rbx - -- .byte 0x66 -- add %rdx, %r14 -- -- movq %r13, 112(%rsp) -- movq %r14, 120(%rsp) - movq %xmm0, $out - movq %xmm1, %rbp - -@@ -741,6 +751,9 @@ - movq 48(%rsp), %r14 - movq 56(%rsp), %r15 - -+ movq %rax, 112(%rsp) -+ movq %rbx, 120(%rsp) -+ - call __rsaz_512_reducex - - addq 64(%rsp), %r8 diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index 79bba38d4fc..87c4452b911 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -153,17 +153,14 @@ in { }; openssl_1_1 = common { - version = "1.1.1d"; - sha256 = "1whinyw402z3b9xlb3qaxv4b9sk4w1bgh9k0y8df1z4x3yy92fhy"; + version = "1.1.1f"; + sha256 = "186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b629975da3f35"; patches = [ ./1.1/nix-ssl-cert-file.patch (if stdenv.hostPlatform.isDarwin then ./1.1/use-etc-ssl-certs-darwin.patch else ./1.1/use-etc-ssl-certs.patch) - - ./1.1/cve-2019-1551.patch - ./1.1/cve-2019-1551-improve.patch ]; withDocs = true; }; -- cgit v1.2.3 From da2146ddebf0f2acbcca7e5af340ebd47b822045 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 29 Mar 2020 15:46:57 +0200 Subject: go_1_14: 1.14 -> 1.14.1 This contains at least https://github.com/golang/go/issues/37807, which currently causes some of our go binaries to just fail when booted with older kernels. See https://github.com/golang/go/issues/37436 for context. --- pkgs/development/compilers/go/1.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix index b8038a5d9dd..28a680f8d76 100644 --- a/pkgs/development/compilers/go/1.14.nix +++ b/pkgs/development/compilers/go/1.14.nix @@ -30,11 +30,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.14"; + version = "1.14.1"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "12a3nzj4k4p5ica447sjfva9pvvj84a03b4xlg3mhl2nmm33wr3d"; + sha256 = "0xkna02clggcdgl5xxwani62krnf64x6p3hk9k5v9ldh2lhmglia"; }; # perl is used for testing go vet -- cgit v1.2.3 From 38b7aff1705642494e15f52f8f1112f52d477d3b Mon Sep 17 00:00:00 2001 From: hlolli Date: Thu, 2 Apr 2020 22:24:50 +0200 Subject: fix strace-graph shebang which points to perl --- pkgs/development/tools/misc/strace/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index 80852274102..31ce959ceaf 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional libunwind.supportsHost libunwind; # support -k + postPatch = "patchShebangs strace-graph"; + configureFlags = stdenv.lib.optional (!stdenv.hostPlatform.isx86) "--enable-mpers=check"; # fails 1 out of 523 tests with -- cgit v1.2.3 From 41d6bfe0ca456b7d523ca5b30f2df40256012f2a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 2 Apr 2020 22:17:29 +0200 Subject: iproute: 5.5.0 -> 5.6.0 "Not a lot of changes in this release, most are related to fixing output formatting and documentation." [0] File changes (additions/removals): +share/man/man8/tc-ets.8.gz +share/man/man8/tc-fq_pie.8.gz nix path-info -S: 5.5.0 51509616 5.6.0 51528680 [0]: https://marc.info/?l=linux-netdev&m=158585608413591 --- pkgs/os-specific/linux/iproute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 624644596d9..a6b2d4362bc 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "iproute2"; - version = "5.5.0"; + version = "5.6.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0ywg70f98wgfai35jl47xzpjp45a6n7crja4vc8ql85cbi1l7ids"; + sha256 = "14j6n1bc09xhq8lxs40vfsx8bb8lx12a07ga4rsxl8vfrqjhwnqv"; }; preConfigure = '' -- cgit v1.2.3 From 8e9e77ee7dc0d612616ebe0f93d67be89b931131 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 22 Nov 2019 21:49:16 +0100 Subject: nixosTests.cockroachdb: add to all-tests.nix --- nixos/tests/all-tests.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 2bdced6a3cc..6367f0b158e 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -51,6 +51,7 @@ in cloud-init = handleTest ./cloud-init.nix {}; codimd = handleTest ./codimd.nix {}; consul = handleTest ./consul.nix {}; + cockroachdb = handleTestOn ["x86_64-linux"] ./cockroachdb.nix {}; containers-bridge = handleTest ./containers-bridge.nix {}; containers-ephemeral = handleTest ./containers-ephemeral.nix {}; containers-extra_veth = handleTest ./containers-extra_veth.nix {}; -- cgit v1.2.3 From e7e05ad9575156e87468dafaf0964253cc628ea2 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 22 Nov 2019 21:01:22 +0100 Subject: nixosTests.cockroachdb: port to python --- nixos/tests/cockroachdb.nix | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/nixos/tests/cockroachdb.nix b/nixos/tests/cockroachdb.nix index 496283fddc7..33ff7c31b25 100644 --- a/nixos/tests/cockroachdb.nix +++ b/nixos/tests/cockroachdb.nix @@ -95,7 +95,7 @@ let ''; }; -in import ./make-test.nix ({ pkgs, ...} : { +in import ./make-test-python.nix ({ pkgs, ...} : { name = "cockroachdb"; meta.maintainers = with pkgs.stdenv.lib.maintainers; [ thoughtpolice ]; @@ -110,17 +110,13 @@ in import ./make-test.nix ({ pkgs, ...} : { # there's otherwise no way to guarantee that node1 will start before the others try # to join it. testScript = '' - $node1->start; - $node1->waitForUnit("cockroachdb"); - - $node2->start; - $node2->waitForUnit("cockroachdb"); - - $node3->start; - $node3->waitForUnit("cockroachdb"); - - $node1->mustSucceed("cockroach sql --host=192.168.1.1 --insecure -e 'SHOW ALL CLUSTER SETTINGS' 2>&1"); - $node1->mustSucceed("cockroach workload init bank 'postgresql://root\@192.168.1.1:26257?sslmode=disable'"); - $node1->mustSucceed("cockroach workload run bank --duration=1m 'postgresql://root\@192.168.1.1:26257?sslmode=disable'"); + for node in node1, node2, node3: + node.start() + node.wait_for_unit("cockroachdb") + node1.succeed( + "cockroach sql --host=192.168.1.1 --insecure -e 'SHOW ALL CLUSTER SETTINGS' 2>&1", + "cockroach workload init bank 'postgresql://root@192.168.1.1:26257?sslmode=disable'", + "cockroach workload run bank --duration=1m 'postgresql://root@192.168.1.1:26257?sslmode=disable'", + ) ''; }) -- cgit v1.2.3 From 4009ef44e9a1b0dec6ab1df418ad1f54647e9b63 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 22 Nov 2019 22:28:17 +0100 Subject: cockroachdb: remove stray trailing whitespace --- nixos/modules/services/databases/cockroachdb.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/databases/cockroachdb.nix b/nixos/modules/services/databases/cockroachdb.nix index b6f94a4881a..35fb46d69d8 100644 --- a/nixos/modules/services/databases/cockroachdb.nix +++ b/nixos/modules/services/databases/cockroachdb.nix @@ -153,7 +153,7 @@ in defaultText = "pkgs.cockroachdb"; description = '' The CockroachDB derivation to use for running the service. - + This would primarily be useful to enable Enterprise Edition features in your own custom CockroachDB build (Nixpkgs CockroachDB binaries only contain open source features and open source code). -- cgit v1.2.3 From 98906dfdefe322cb573c7c54b4744ef781bdd2cd Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 22 Nov 2019 22:28:38 +0100 Subject: nixosTests.cockroachdb: bump memory cockroachdb complained about not enough memory available. --- nixos/tests/cockroachdb.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/cockroachdb.nix b/nixos/tests/cockroachdb.nix index 33ff7c31b25..a03a223d66a 100644 --- a/nixos/tests/cockroachdb.nix +++ b/nixos/tests/cockroachdb.nix @@ -1,7 +1,7 @@ # This performs a full 'end-to-end' test of a multi-node CockroachDB cluster # using the built-in 'cockroach workload' command, to simulate a semi-realistic # test load. It generally takes anywhere from 3-5 minutes to run and 1-2GB of -# RAM (though each of 3 workers gets 1GB allocated) +# RAM (though each of 3 workers gets 2GB allocated) # # CockroachDB requires synchronized system clocks within a small error window # (~500ms by default) on each node in order to maintain a multi-node cluster. @@ -55,7 +55,7 @@ let { # Bank/TPC-C benchmarks take some memory to complete - virtualisation.memorySize = 1024; + virtualisation.memorySize = 2048; # Install the KVM PTP "Virtualized Clock" driver. This allows a /dev/ptp0 # device to appear as a reference clock, synchronized to the host clock. -- cgit v1.2.3 From f25a301a0a98a96b54b1a221c2dd410a3b32c4f1 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 23 Nov 2019 16:28:26 +0100 Subject: nixos/chrony: move to StateDirectory and tmpfiles.d --- nixos/modules/services/networking/ntp/chrony.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix index da9d960cc14..f1062edaa05 100644 --- a/nixos/modules/services/networking/ntp/chrony.nix +++ b/nixos/modules/services/networking/ntp/chrony.nix @@ -92,6 +92,11 @@ in systemd.services.systemd-timedated.environment = { SYSTEMD_TIMEDATED_NTP_SERVICES = "chronyd.service"; }; + systemd.tmpfiles.rules = [ + "d ${stateDir} 0755 chrony chrony - -" + "f ${keyFile} 0640 chrony chrony -" + ]; + systemd.services.chronyd = { description = "chrony NTP daemon"; @@ -103,13 +108,6 @@ in path = [ pkgs.chrony ]; - preStart = '' - mkdir -m 0755 -p ${stateDir} - touch ${keyFile} - chmod 0640 ${keyFile} - chown chrony:chrony ${stateDir} ${keyFile} - ''; - unitConfig.ConditionCapability = "CAP_SYS_TIME"; serviceConfig = { Type = "simple"; @@ -118,7 +116,7 @@ in ProtectHome = "yes"; ProtectSystem = "full"; PrivateTmp = "yes"; - + StateDirectory = "chrony"; }; }; -- cgit v1.2.3 From fe6dd71f72ad53f8556498f6c1fb97f4004df6d5 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 23 Nov 2019 19:31:27 +0100 Subject: nixosTests.cockroachdb: set ConditionPathExists=/dev/ptp0 to chronyd --- nixos/tests/cockroachdb.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/tests/cockroachdb.nix b/nixos/tests/cockroachdb.nix index a03a223d66a..d0cc5e19837 100644 --- a/nixos/tests/cockroachdb.nix +++ b/nixos/tests/cockroachdb.nix @@ -88,6 +88,8 @@ let services.cockroachdb.listen.address = myAddr; services.cockroachdb.join = lib.mkIf (joinNode != null) joinNode; + systemd.services.chronyd.unitConfig.ConditionPathExists = "/dev/ptp0"; + # Hold startup until Chrony has performed its first measurement (which # will probably result in a full timeskip, thanks to makestep) systemd.services.cockroachdb.preStart = '' -- cgit v1.2.3 From a5bf5e2db58581469f1a2d297bd6dabbfc814236 Mon Sep 17 00:00:00 2001 From: Michael Millwood <32425311+NotGate@users.noreply.github.com> Date: Thu, 2 Apr 2020 18:48:40 -0500 Subject: update libbass upstream changed which broke the install for libbass --- pkgs/development/libraries/audio/libbass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/libbass/default.nix b/pkgs/development/libraries/audio/libbass/default.nix index 3552e335fed..1e87f0ee566 100644 --- a/pkgs/development/libraries/audio/libbass/default.nix +++ b/pkgs/development/libraries/audio/libbass/default.nix @@ -9,13 +9,13 @@ let allBass = { bass = { h = "bass.h"; - version = "2.4.14"; + version = "2.4.15"; so = { i686_linux = "libbass.so"; x86_64-linux = "x64/libbass.so"; }; urlpath = "bass24-linux.zip"; - sha256 = "1nyzs08z0djyvz6jx1y9y99y0ksp4sxz9l2x43k1c9irls24xpfy"; + sha256 = "1z01im0l2ydi608vc0n0c1cfyp1vrh6681zn2zkhg98vvs20y805"; }; bass_fx = { -- cgit v1.2.3 From d01c1f35b80a713e54d42620070fdca28416ad76 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Fri, 20 Mar 2020 19:01:04 -0700 Subject: obs-v4l2sink: init at unstable-20181012 --- ...ind-ObsPluginHelpers.cmake-in-the-obs-src.patch | 25 +++++++++++++ pkgs/applications/video/obs-studio/v4l2sink.nix | 42 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 69 insertions(+) create mode 100644 pkgs/applications/video/obs-studio/0001-find-ObsPluginHelpers.cmake-in-the-obs-src.patch create mode 100644 pkgs/applications/video/obs-studio/v4l2sink.nix diff --git a/pkgs/applications/video/obs-studio/0001-find-ObsPluginHelpers.cmake-in-the-obs-src.patch b/pkgs/applications/video/obs-studio/0001-find-ObsPluginHelpers.cmake-in-the-obs-src.patch new file mode 100644 index 00000000000..b642fbc3ada --- /dev/null +++ b/pkgs/applications/video/obs-studio/0001-find-ObsPluginHelpers.cmake-in-the-obs-src.patch @@ -0,0 +1,25 @@ +From 5798a2691467604e89fd9fb1cd5289ebd1b1d7b8 Mon Sep 17 00:00:00 2001 +From: Graham Christensen +Date: Fri, 20 Mar 2020 22:32:02 -0400 +Subject: [PATCH] find ObsPluginHelpers.cmake in the obs src + +--- + external/FindLibObs.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/external/FindLibObs.cmake b/external/FindLibObs.cmake +index ab0a3de..53a46b8 100644 +--- a/external/FindLibObs.cmake ++++ b/external/FindLibObs.cmake +@@ -95,7 +95,7 @@ if(LIBOBS_FOUND) + + set(LIBOBS_INCLUDE_DIRS ${LIBOBS_INCLUDE_DIR} ${W32_PTHREADS_INCLUDE_DIR}) + set(LIBOBS_LIBRARIES ${LIBOBS_LIB} ${W32_PTHREADS_LIB}) +- include(${LIBOBS_INCLUDE_DIR}/../cmake/external/ObsPluginHelpers.cmake) ++ include(${OBS_SRC}/cmake/external/ObsPluginHelpers.cmake) + + # allows external plugins to easily use/share common dependencies that are often included with libobs (such as FFmpeg) + if(NOT DEFINED INCLUDED_LIBOBS_CMAKE_MODULES) +-- +2.25.0 + diff --git a/pkgs/applications/video/obs-studio/v4l2sink.nix b/pkgs/applications/video/obs-studio/v4l2sink.nix new file mode 100644 index 00000000000..19cfbf14076 --- /dev/null +++ b/pkgs/applications/video/obs-studio/v4l2sink.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub +, cmake, pkgconfig, wrapQtAppsHook +, obs-studio }: + +stdenv.mkDerivation { + pname = "obs-v4l2sink-unstable"; + version = "20181012"; + + src = fetchFromGitHub { + owner = "CatxFish"; + repo = "obs-v4l2sink"; + rev = "1ec3c8ada0e1040d867ce567f177be55cd278378"; + sha256 = "03ah91cm1qz26k90mfx51l0d598i9bcmw39lkikjs1msm4c9dfxx"; + }; + + nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; + buildInputs = [ obs-studio ]; + + patches = [ + ./0001-find-ObsPluginHelpers.cmake-in-the-obs-src.patch + ]; + + cmakeFlags = [ + "-DLIBOBS_INCLUDE_DIR=${obs-studio}/include/obs" + "-DLIBOBS_LIBRARIES=${obs-studio}/lib" + "-DCMAKE_CXX_FLAGS=-I${obs-studio.src}/UI/obs-frontend-api" + "-DOBS_SRC=${obs-studio.src}" + ]; + + installPhase = '' + mkdir -p $out/share/obs/obs-plugins/v4l2sink/bin/64bit + cp ./v4l2sink.so $out/share/obs/obs-plugins/v4l2sink/bin/64bit/ + ''; + + meta = with stdenv.lib; { + description = "obs studio output plugin for Video4Linux2 device"; + homepage = "https://github.com/CatxFish/obs-v4l2sink"; + maintainers = with maintainers; [ colemickens ]; + license = licenses.gpl2; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bb99a1aa2b4..648057be15d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21226,6 +21226,8 @@ in obs-wlrobs = callPackage ../applications/video/obs-studio/wlrobs.nix { }; + obs-v4l2sink = libsForQt5.callPackage ../applications/video/obs-studio/v4l2sink.nix { }; + obs-ndi = callPackage ../applications/video/obs-studio/obs-ndi.nix { }; octoprint = callPackage ../applications/misc/octoprint { }; -- cgit v1.2.3 From 40998c81a6741d44d4be7139d750b069f2d55c30 Mon Sep 17 00:00:00 2001 From: geistesk Date: Fri, 3 Apr 2020 15:58:16 +0200 Subject: platformio: 4.1.0 -> 4.3.1 --- pkgs/development/arduino/platformio/core.nix | 11 ++++------- .../arduino/platformio/use-local-spdx-license-list.patch | 6 +++--- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/development/arduino/platformio/core.nix b/pkgs/development/arduino/platformio/core.nix index 7beb2cba9c5..a52b299a47e 100644 --- a/pkgs/development/arduino/platformio/core.nix +++ b/pkgs/development/arduino/platformio/core.nix @@ -34,6 +34,8 @@ let "commands/test_test.py::test_local_env" "test_builder.py::test_build_flags" "test_builder.py::test_build_unflags" + "test_builder.py::test_debug_default_build_flags" + "test_builder.py::test_debug_custom_build_flags" "test_misc.py::test_api_cache" "test_misc.py::test_ping_internet_ips" "test_misc.py::test_platformio_cli" @@ -49,14 +51,14 @@ let in buildPythonApplication rec { pname = "platformio"; - version = "4.1.0"; + version = "4.3.1"; # pypi tarballs don't contain tests - https://github.com/platformio/platformio-core/issues/1964 src = fetchFromGitHub { owner = "platformio"; repo = "platformio-core"; rev = "v${version}"; - sha256 = "10v9jw1zjfqr3wl6kills3cfp0ky7xbm1gc3z0n57wrqbc6cmz95"; + sha256 = "1dxnjy60zpkgyrbvbf6b9qi6m37gm8gwjmxwfj30npr1y7rvxwrw"; }; propagatedBuildInputs = [ @@ -79,11 +81,6 @@ in buildPythonApplication rec { patches = [ ./fix-searchpath.patch - (fetchpatch { - url = "https://github.com/platformio/platformio-core/commit/442a7e357636522e844d95375c246644b21a7802.patch"; - sha256 = "0a3kj3k02237gr2yk30gpwc6vm04dsd1wxldj4dsbzs4a9yyi70m"; - excludes = ["HISTORY.rst"]; - }) ./use-local-spdx-license-list.patch ]; diff --git a/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch b/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch index 90251d668bc..16294a4d6cd 100644 --- a/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch +++ b/pkgs/development/arduino/platformio/use-local-spdx-license-list.patch @@ -1,14 +1,14 @@ diff --git a/platformio/package/manifest/schema.py b/platformio/package/manifest/schema.py -index f1d68e08..9b7b1da8 100644 +index be49b3ee..d1390a88 100644 --- a/platformio/package/manifest/schema.py +++ b/platformio/package/manifest/schema.py -@@ -174,9 +174,5 @@ class ManifestSchema(Schema): +@@ -240,9 +240,5 @@ class ManifestSchema(BaseSchema): @staticmethod @memoized(expire="1h") def load_spdx_licenses(): - r = requests.get( - "https://raw.githubusercontent.com/spdx/license-list-data" -- "/v3.7/json/licenses.json" +- "/v3.8/json/licenses.json" - ) - r.raise_for_status() - return r.json() -- cgit v1.2.3 From ef65b728d30335c1fca72e93504c205b547f0001 Mon Sep 17 00:00:00 2001 From: Evils Date: Tue, 24 Mar 2020 23:21:03 +0100 Subject: tuptime: init at 4.1.0 --- pkgs/tools/system/tuptime/default.nix | 35 +++++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/tools/system/tuptime/default.nix diff --git a/pkgs/tools/system/tuptime/default.nix b/pkgs/tools/system/tuptime/default.nix new file mode 100644 index 00000000000..acc96998952 --- /dev/null +++ b/pkgs/tools/system/tuptime/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, python3 }: + +stdenv.mkDerivation rec { + pname = "tuptime"; + version = "4.1.0"; + + src = fetchFromGitHub { + owner = "rfrail3"; + repo = "tuptime"; + rev = version; + sha256 = "0p5v1jp6bl0hjv04q3gh11q6dx9z0x61h6svcbvwp5ni0h1bkz1a"; + }; + + buildInputs = [ python3 ]; + + installPhase = '' + mkdir -p $out/bin + install -m 755 src/tuptime $out/bin/ + + mkdir -p $out/share/man/man1 + cp src/man/tuptime.1 $out/share/man/man1/ + + # upstream only ships this, there are more scripts there... + mkdir -p $out/usr/share/doc/tuptime/contrib + cp misc/scripts/uptimed-to-tuptime.py $out/usr/share/doc/tuptime/contrib/ + ''; + + meta = with stdenv.lib; { + description = "Total uptime & downtime statistics utility"; + homepage = "https://github.com/rfrail3/tuptime"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = [ maintainers.evils ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eba10401d5c..8527751e9bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7082,6 +7082,8 @@ in tuir = callPackage ../applications/misc/tuir { }; + tuptime = callPackage ../tools/system/tuptime { }; + turses = callPackage ../applications/networking/instant-messengers/turses { }; oysttyer = callPackage ../applications/networking/instant-messengers/oysttyer { }; -- cgit v1.2.3 From b29d48acfb9d1b489996726694030c5e3fc540c1 Mon Sep 17 00:00:00 2001 From: Evils Date: Tue, 24 Mar 2020 23:45:20 +0100 Subject: nixos/tuptime: init module --- nixos/modules/module-list.nix | 1 + nixos/modules/services/monitoring/tuptime.nix | 84 +++++++++++++++++++++++++++ 2 files changed, 85 insertions(+) create mode 100644 nixos/modules/services/monitoring/tuptime.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c3d2bb85809..8cadc9d1629 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -545,6 +545,7 @@ ./services/monitoring/teamviewer.nix ./services/monitoring/telegraf.nix ./services/monitoring/thanos.nix + ./services/monitoring/tuptime.nix ./services/monitoring/ups.nix ./services/monitoring/uptime.nix ./services/monitoring/vnstat.nix diff --git a/nixos/modules/services/monitoring/tuptime.nix b/nixos/modules/services/monitoring/tuptime.nix new file mode 100644 index 00000000000..731260a5c20 --- /dev/null +++ b/nixos/modules/services/monitoring/tuptime.nix @@ -0,0 +1,84 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.tuptime; + +in { + + options.services.tuptime = { + + enable = mkEnableOption "the total uptime service"; + + timer = { + enable = mkOption { + type = types.bool; + default = true; + description = "Whether to regularly log uptime to detect bad shutdowns."; + }; + + period = mkOption { + type = types.str; + default = "*:0/5"; + description = "systemd calendar event"; + }; + }; + }; + + + config = mkIf cfg.enable { + + environment.systemPackages = [ pkgs.tuptime ]; + + users.users.tuptime.description = "tuptime database owner"; + + systemd = { + services = { + + tuptime = { + description = "the total uptime service"; + documentation = [ "man:tuptime(1)" ]; + after = [ "time-sync.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + StateDirectory = "tuptime"; + Type = "oneshot"; + User = "tuptime"; + RemainAfterExit = true; + ExecStart = "${pkgs.tuptime}/bin/tuptime -x"; + ExecStop = "${pkgs.tuptime}/bin/tuptime -xg"; + }; + }; + + tuptime-oneshot = mkIf cfg.timer.enable { + description = "the tuptime scheduled execution unit"; + serviceConfig = { + StateDirectory = "tuptime"; + Type = "oneshot"; + User = "tuptime"; + ExecStart = "${pkgs.tuptime}/bin/tuptime -x"; + }; + }; + }; + + timers.tuptime = mkIf cfg.timer.enable { + description = "the tuptime scheduled execution timer"; + # this timer should be started if the service is started + # even if the timer was previously stopped + wantedBy = [ "tuptime.service" "timers.target" ]; + # this timer should be stopped if the service is stopped + partOf = [ "tuptime.service" ]; + timerConfig = { + OnBootSec = "1min"; + OnCalendar = cfg.timer.period; + Unit = "tuptime-oneshot.service"; + }; + }; + }; + }; + + meta.maintainers = [ maintainers.evils ]; + +} -- cgit v1.2.3 From b7b99c93f5a56aca8c726045c36f32bc3b3ed544 Mon Sep 17 00:00:00 2001 From: Evils Date: Tue, 24 Mar 2020 23:45:49 +0100 Subject: nixosTests.tuptime: init test --- nixos/tests/all-tests.nix | 1 + nixos/tests/tuptime.nix | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 nixos/tests/tuptime.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 2bdced6a3cc..d059f55adb5 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -308,6 +308,7 @@ in trilium-server = handleTestOn ["x86_64-linux"] ./trilium-server.nix {}; trezord = handleTest ./trezord.nix {}; trickster = handleTest ./trickster.nix {}; + tuptime = handleTest ./tuptime.nix {}; udisks2 = handleTest ./udisks2.nix {}; upnp = handleTest ./upnp.nix {}; uwsgi = handleTest ./uwsgi.nix {}; diff --git a/nixos/tests/tuptime.nix b/nixos/tests/tuptime.nix new file mode 100644 index 00000000000..36ce2b1ae19 --- /dev/null +++ b/nixos/tests/tuptime.nix @@ -0,0 +1,29 @@ +import ./make-test-python.nix ({ pkgs, ...} : { + name = "tuptime"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ evils ]; + }; + + machine = { pkgs, ... }: { + imports = [ ../modules/profiles/minimal.nix ]; + services.tuptime.enable = true; + }; + + testScript = + '' + # see if it starts + start_all() + machine.wait_for_unit("multi-user.target") + machine.succeed("tuptime | grep 'System startups:[[:blank:]]*1'") + machine.succeed("tuptime | grep 'System uptime:[[:blank:]]*100.0%'") + machine.shutdown() + + # restart machine and see if it correctly reports the reboot + machine.start() + machine.wait_for_unit("multi-user.target") + machine.succeed("tuptime | grep 'System startups:[[:blank:]]*2'") + machine.succeed("tuptime | grep 'System shutdowns:[[:blank:]]*1 ok'") + machine.shutdown() + ''; +}) + -- cgit v1.2.3 From 18f3661f929809bb1071bf4ad03add5e73f60e08 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Fri, 3 Apr 2020 19:22:19 +0200 Subject: libmicrodns: 0.1.0 -> 0.1.2 - CVE-2020-6071 - CVE-2020-6072 - CVE-2020-6073 - CVE-2020-6077 - CVE-2020-6078 - CVE-2020-6079 Buildsystem switched to Meson+Ninja. --- pkgs/development/libraries/libmicrodns/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libmicrodns/default.nix b/pkgs/development/libraries/libmicrodns/default.nix index 41d81f1f176..0728dddcb4d 100644 --- a/pkgs/development/libraries/libmicrodns/default.nix +++ b/pkgs/development/libraries/libmicrodns/default.nix @@ -1,28 +1,30 @@ { stdenv , fetchFromGitHub -, autoreconfHook +, meson +, ninja , pkgconfig }: stdenv.mkDerivation rec { - version = "0.1.0"; + version = "0.1.2"; pname = "libmicrodns"; src = fetchFromGitHub { owner = "videolabs"; repo = pname; rev = version; - sha256 = "1pmf461zn35spbpbls1ih68ki7f8g8xjwhzr2csy63nnyq2k9jji"; + sha256 = "1yb0j0acidp494d28wqhzhrfski2qjb2a5mp5bq5qrpcg38zyz6i"; }; nativeBuildInputs = [ - autoreconfHook + meson + ninja pkgconfig ]; meta = with stdenv.lib; { description = "Minimal mDNS resolver library, used by VLC"; - homepage = https://github.com/videolabs/libmicrodns; + homepage = "https://github.com/videolabs/libmicrodns"; license = licenses.lgpl21; platforms = platforms.linux; maintainers = [ maintainers.shazow ]; -- cgit v1.2.3 From da7ac56575d266942308f8ac1b4abc684894f0b4 Mon Sep 17 00:00:00 2001 From: Burke Libbey Date: Tue, 3 Dec 2019 16:47:16 -0500 Subject: itstool: fix double-shebang issue on macOS --- pkgs/development/tools/misc/itstool/default.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/itstool/default.nix b/pkgs/development/tools/misc/itstool/default.nix index a5c3623b699..6ad76b1dfcd 100644 --- a/pkgs/development/tools/misc/itstool/default.nix +++ b/pkgs/development/tools/misc/itstool/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python3 }: +{ stdenv, lib, fetchurl, python3 }: stdenv.mkDerivation rec { name = "itstool-2.0.6"; @@ -10,6 +10,22 @@ stdenv.mkDerivation rec { buildInputs = [ (python3.withPackages(ps: with ps; [ libxml2 ])) ]; + # bin/itstool's shebang is "#!${python3.withPackages(...)/bin/python} -s" + # withPackages' shebang is "#!#{bash}/bin/bash -e + # + # macOS won't allow the target of a shebang to be an interpreted script, + # causing bin/itstool to get interpreted as bash. + # + # By prefixing /usr/bin/env to the shebang, we have env fork/exec the python + # wrapper, which is perfectly happy to execute an interpreted script. + # + # However, we don't want to do this on Linux, which only allows one argument + # in a shebang. + postFixup = lib.optionalString stdenv.isDarwin '' + substituteInPlace $out/bin/itstool \ + --replace "#!/" "#!/usr/bin/env /" + ''; + meta = { homepage = http://itstool.org/; description = "XML to PO and back again"; -- cgit v1.2.3 From 2bec129116d04db2fc817eb5ccb28638e6bdc7b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 17 Mar 2020 15:56:04 +0000 Subject: itstool: use wrapPython to fix double shebang on macOS --- pkgs/development/tools/misc/itstool/default.nix | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/pkgs/development/tools/misc/itstool/default.nix b/pkgs/development/tools/misc/itstool/default.nix index 6ad76b1dfcd..e503aac5a28 100644 --- a/pkgs/development/tools/misc/itstool/default.nix +++ b/pkgs/development/tools/misc/itstool/default.nix @@ -8,22 +8,12 @@ stdenv.mkDerivation rec { sha256 = "1acjgf8zlyk7qckdk19iqaca4jcmywd7vxjbcs1mm6kaf8icqcv2"; }; - buildInputs = [ (python3.withPackages(ps: with ps; [ libxml2 ])) ]; + pythonPath = [ python3.pkgs.libxml2 ]; + buildInputs = [ python3 python3.pkgs.libxml2 ]; + nativeBuildInputs = [ python3.pkgs.wrapPython ]; - # bin/itstool's shebang is "#!${python3.withPackages(...)/bin/python} -s" - # withPackages' shebang is "#!#{bash}/bin/bash -e - # - # macOS won't allow the target of a shebang to be an interpreted script, - # causing bin/itstool to get interpreted as bash. - # - # By prefixing /usr/bin/env to the shebang, we have env fork/exec the python - # wrapper, which is perfectly happy to execute an interpreted script. - # - # However, we don't want to do this on Linux, which only allows one argument - # in a shebang. - postFixup = lib.optionalString stdenv.isDarwin '' - substituteInPlace $out/bin/itstool \ - --replace "#!/" "#!/usr/bin/env /" + postFixup = '' + wrapPythonPrograms ''; meta = { -- cgit v1.2.3 From bcd9b9b84749cf1c9820698797ad326b56a19c93 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 Apr 2020 12:37:32 +0000 Subject: graphite2: 1.3.13 -> 1.3.14 --- pkgs/development/libraries/silgraphite/graphite2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix index 6b1c4ca97ba..564c32bf10d 100644 --- a/pkgs/development/libraries/silgraphite/graphite2.nix +++ b/pkgs/development/libraries/silgraphite/graphite2.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, pkgconfig, freetype, cmake, python }: stdenv.mkDerivation rec { - version = "1.3.13"; + version = "1.3.14"; pname = "graphite2"; src = fetchurl { url = "https://github.com/silnrsi/graphite/releases/download/" + "${version}/graphite2-${version}.tgz"; - sha256 = "01jzhwnj1c3d68dmw15jdxly0hwkmd8ja4kw755rbkykn1ly2qyx"; + sha256 = "1790ajyhk0ax8xxamnrk176gc9gvhadzy78qia4rd8jzm89ir7gr"; }; nativeBuildInputs = [ pkgconfig cmake ]; -- cgit v1.2.3 From 4588e6a0cd249a1358d99388d4f6a0725de96f99 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 31 Mar 2020 22:43:05 +0800 Subject: pythonPackages.click: 7.0 -> 7.1.1 --- pkgs/development/python-modules/click/default.nix | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix index 9951b1711b3..ac96ef32618 100644 --- a/pkgs/development/python-modules/click/default.nix +++ b/pkgs/development/python-modules/click/default.nix @@ -1,31 +1,23 @@ -{ lib, buildPythonPackage, fetchPypi, locale, pytest }: +{ lib, buildPythonPackage, fetchPypi, locale, pytestCheckHook }: buildPythonPackage rec { pname = "click"; - version = "7.0"; + version = "7.1.1"; src = fetchPypi { - pname = "Click"; - inherit version; - sha256 = "5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7"; + inherit pname version; + sha256 = "1k60i2fvxf8rxazlv04mnsmlsjrj5i5sda3x1ifhr0nqi7mb864a"; }; postPatch = '' - substituteInPlace click/_unicodefun.py \ + substituteInPlace src/click/_unicodefun.py \ --replace "'locale'" "'${locale}/bin/locale'" ''; - buildInputs = [ pytest ]; - - checkPhase = '' - py.test tests - ''; - - # https://github.com/pallets/click/issues/823 - doCheck = false; + checkInputs = [ pytestCheckHook ]; meta = with lib; { - homepage = http://click.pocoo.org/; + homepage = "https://click.palletsprojects.com/"; description = "Create beautiful command line interfaces in Python"; longDescription = '' A Python package for creating beautiful command line interfaces in a -- cgit v1.2.3 From 022ebea84c46aa3a0c04aa933fc8a3013d638d06 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 31 Mar 2020 22:43:16 +0800 Subject: maestral: 0.6.1 -> 0.6.3 --- pkgs/applications/networking/maestral/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/maestral/default.nix b/pkgs/applications/networking/maestral/default.nix index 49348610be5..62be1a4118c 100644 --- a/pkgs/applications/networking/maestral/default.nix +++ b/pkgs/applications/networking/maestral/default.nix @@ -8,7 +8,7 @@ python3.pkgs.buildPythonApplication rec { pname = "maestral${lib.optionalString withGui "-gui"}"; - version = "0.6.1"; + version = "0.6.3"; disabled = python3.pkgs.pythonOlder "3.6"; @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { owner = "SamSchott"; repo = "maestral-dropbox"; rev = "v${version}"; - sha256 = "06i3c7i85x879np158156mba7kxz2cwh75390sc9gwwngc95d9h9"; + sha256 = "0h1vbx00mps2msdhsab1yz64c8sprwrg38nkqyj86mkb6jkirq92"; }; propagatedBuildInputs = with python3.pkgs; [ @@ -27,6 +27,7 @@ python3.pkgs.buildPythonApplication rec { keyring keyrings-alt lockfile + pathspec Pyro5 requests u-msgpack-python -- cgit v1.2.3 From 88a6078e1814672d05044f61920ef4a4d04ecba0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Mar 2020 21:43:16 +0000 Subject: help2man: 1.47.12 -> 1.47.13 --- pkgs/development/tools/misc/help2man/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 88a6a52d5e8..47af57dfb3d 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perlPackages, gettext }: stdenv.mkDerivation rec { - name = "help2man-1.47.12"; + name = "help2man-1.47.13"; src = fetchurl { url = "mirror://gnu/help2man/${name}.tar.xz"; - sha256 = "0q5ixbxz1v7wqnpg4bq7k7nbv9ssnmcvdbqsq5ycjvniz56ac2vx"; + sha256 = "08q5arxz4j4pyx5q4712c2rn7p7dw7as9xg38yvmsh1c3ynvpy5p"; }; nativeBuildInputs = [ gettext perlPackages.LocaleGettext ]; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ‘--version’ output of other commands. ''; - homepage = https://www.gnu.org/software/help2man/; + homepage = "https://www.gnu.org/software/help2man/"; license = licenses.gpl3Plus; platforms = platforms.all; -- cgit v1.2.3 From a44ac81f46ff99931281869879b7904851c1f5de Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Sun, 22 Mar 2020 14:42:47 +0100 Subject: automake: 1.16.1 -> 1.16.2 --- pkgs/development/tools/misc/automake/automake-1.16.x.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/automake/automake-1.16.x.nix b/pkgs/development/tools/misc/automake/automake-1.16.x.nix index 1e432a6e149..d6353fc0b9c 100644 --- a/pkgs/development/tools/misc/automake/automake-1.16.x.nix +++ b/pkgs/development/tools/misc/automake/automake-1.16.x.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, autoconf }: stdenv.mkDerivation rec { - name = "automake-1.16.1"; + name = "automake-1.16.2"; src = fetchurl { url = "mirror://gnu/automake/${name}.tar.xz"; - sha256 = "08g979ficj18i1w6w5219bgmns7czr03iadf20mk3lrzl8wbn1ax"; + sha256 = "1l7dkqbsmbf94ax29jj1jf6a0r6ikc8jybg1p5m0c3ki7pg5ki6c"; }; nativeBuildInputs = [ autoconf perl ]; @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { dontPatchShebangs = true; meta = { - branch = "1.15"; - homepage = https://www.gnu.org/software/automake/; + branch = "1.16"; + homepage = "https://www.gnu.org/software/automake/"; description = "GNU standard-compliant makefile generator"; license = stdenv.lib.licenses.gpl2Plus; -- cgit v1.2.3 From c7c3f8780fd45cbf885f7369260cb7a38543d85e Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 3 Apr 2020 22:26:05 +0200 Subject: freeciv: 2.6.0 -> 2.6.2 --- pkgs/games/freeciv/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/freeciv/default.nix b/pkgs/games/freeciv/default.nix index 9fc260e7406..3e860171294 100644 --- a/pkgs/games/freeciv/default.nix +++ b/pkgs/games/freeciv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, lua5_3, pkgconfig, python +{ stdenv, fetchFromGitHub, autoreconfHook, lua5_3, pkgconfig, python3 , zlib, bzip2, curl, lzma, gettext, libiconv , sdlClient ? true, SDL, SDL_mixer, SDL_image, SDL_ttf, SDL_gfx, freetype, fluidsynth , gtkClient ? false, gtk3 @@ -12,19 +12,19 @@ let in stdenv.mkDerivation rec { pname = "freeciv"; - version = "2.6.0"; + version = "2.6.2"; src = fetchFromGitHub { owner = "freeciv"; repo = "freeciv"; rev = "R${builtins.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "1b3q5k9wpv7z24svz01ybw8d8wlzkkdr6ia5hgp6cxk6vq67n67s"; + sha256 = "023slffi06j52amrnmd8n12rmf778cngxx6xg4hbsgckj2nyfmg9"; }; postPatch = '' for f in {common,utility}/*.py; do substituteInPlace $f \ - --replace '/usr/bin/env python' ${python.interpreter} + --replace '/usr/bin/env python3' ${python3.interpreter} done ''; -- cgit v1.2.3 From e64c579ad45e77f453cb1b412f32f376bfe5f526 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sat, 4 Apr 2020 14:17:00 +0200 Subject: sfizz: unstable-2020-01-24 -> 0.3.2 --- pkgs/applications/audio/sfizz/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/sfizz/default.nix b/pkgs/applications/audio/sfizz/default.nix index d785d378065..acec8c54e53 100644 --- a/pkgs/applications/audio/sfizz/default.nix +++ b/pkgs/applications/audio/sfizz/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub , cmake, libjack2, libsndfile }: +{ stdenv, fetchFromGitHub , cmake, libjack2, libsndfile, pkgconfig }: stdenv.mkDerivation rec { pname = "sfizz"; - version = "unstable-2020-01-24"; + version = "0.3.2"; src = fetchFromGitHub { owner = "sfztools"; repo = pname; - rev = "b9c332777853cb35faeeda2ff4bf34ea7121ffb9"; - sha256 = "0wzgwpcwal5a7ifrm1hx8y6vx832qixk9ilp8wkjnsdxj6i88p2c"; + rev = version; + sha256 = "1px22x9lb6wyqfbv1jg1sbl1rsnwrzs8sm4dnas1w4ifchiv3ymd"; fetchSubmodules = true; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ libjack2 libsndfile ]; -- cgit v1.2.3 From 4cfc499e1b69e2c9f07d6996ce155e5a966ff4aa Mon Sep 17 00:00:00 2001 From: Spencer Baugh Date: Sat, 4 Apr 2020 13:45:45 -0400 Subject: cataclysm-dda: 0.D -> 0.E --- pkgs/games/cataclysm-dda/default.nix | 18 +++--------------- pkgs/games/cataclysm-dda/patches/fix_locale_dir.patch | 12 +++++------- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/pkgs/games/cataclysm-dda/default.nix b/pkgs/games/cataclysm-dda/default.nix index ced19bffb31..ad1a9c409d5 100644 --- a/pkgs/games/cataclysm-dda/default.nix +++ b/pkgs/games/cataclysm-dda/default.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, lua, CoreFoundation +{ stdenv, callPackage, CoreFoundation , tiles ? true, Cocoa , debug ? false }: @@ -9,28 +9,16 @@ let in stdenv.mkDerivation (common // rec { - version = "0.D"; + version = "0.E"; name = "cataclysm-dda-${version}"; src = fetchFromCleverRaven { rev = version; - sha256 = "00zzhx1mh1qjq668cga5nbrxp2qk6b82j5ak65skhgnlr6ii4ysc"; + sha256 = "0pbi0fw37zimzdklfj58s1ql0wlqq7dy6idkcsib3hn910ajaxan"; }; - buildInputs = common.buildInputs ++ [ lua ]; - patches = [ ./patches/fix_locale_dir.patch ]; - postPatch = common.postPatch + '' - substituteInPlace lua/autoexec.lua --replace "/usr/share" "$out/share" - ''; - - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isGNU "-Wno-error=deprecated-copy"; - - makeFlags = common.makeFlags ++ [ - "LUA=1" - ]; - meta = with stdenv.lib.maintainers; common.meta // { maintainers = common.meta.maintainers ++ [ skeidel ]; }; diff --git a/pkgs/games/cataclysm-dda/patches/fix_locale_dir.patch b/pkgs/games/cataclysm-dda/patches/fix_locale_dir.patch index 60a3dc45745..5bfff892d2a 100644 --- a/pkgs/games/cataclysm-dda/patches/fix_locale_dir.patch +++ b/pkgs/games/cataclysm-dda/patches/fix_locale_dir.patch @@ -1,15 +1,13 @@ -diff --git a/src/translations.cpp b/src/translations.cpp -index 2585b7ec56..7bb005823c 100644 --- a/src/translations.cpp +++ b/src/translations.cpp -@@ -195,14 +195,12 @@ void set_language() +@@ -212,14 +212,12 @@ void set_language() auto env = getenv( "LANGUAGE" ); - locale_dir = std::string( FILENAMES["base_path"] + "lang/mo/" + ( env ? env : "none" ) + + locale_dir = std::string( PATH_INFO::base_path() + "lang/mo/" + ( env ? env : "none" ) + "/LC_MESSAGES/cataclysm-dda.mo" ); --#elif (defined __linux__ || (defined MACOSX && !defined TILES)) +-#elif (defined(__linux__) || (defined(MACOSX) && !defined(TILES))) +#else - if( !FILENAMES["base_path"].empty() ) { - locale_dir = FILENAMES["base_path"] + "share/locale"; + if( !PATH_INFO::base_path().empty() ) { + locale_dir = PATH_INFO::base_path() + "share/locale"; } else { locale_dir = "lang/mo"; } -- cgit v1.2.3 From 7cb24f9a8f8e8155eed55ef27abff8f0894bdd99 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Sat, 4 Apr 2020 22:04:07 +0200 Subject: gnutls: 3.6.12 -> 3.6.13 Fixes CVE-2020-11501. Changes: https://lists.gnupg.org/pipermail/gnutls-help/2020-March/004642.html --- pkgs/development/libraries/gnutls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index cde8587acc3..09cb217cb05 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -8,7 +8,7 @@ assert guileBindings -> guile != null; let - version = "3.6.12"; + version = "3.6.13"; # XXX: Gnulib's `test-select' fails on FreeBSD: # http://hydra.nixos.org/build/2962084/nixlog/1/raw . @@ -24,7 +24,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://gnupg/gnutls/v3.6/gnutls-${version}.tar.xz"; - sha256 = "0jvca1qahn9lrwv6f5kfs95icirc15b2a8x9fzczyj996ipg3b5z"; + sha256 = "0f1gnm0756qms5cpx6yn6xb8d3imc2gkqmygf12n9x6r8zs1s11j"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; -- cgit v1.2.3 From 52f82285f68116aa2d4559ef9628ebfd90b8f336 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 5 Apr 2020 00:02:54 +0200 Subject: gobject-introspection: Clean libregress symlink Adding phases to preInstallPhases is not possible in preBuild since by that time, phases is already populated. --- pkgs/development/libraries/gobject-introspection/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index f754756f768..cf889c28204 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -62,10 +62,10 @@ stdenv.mkDerivation rec { # We are using a symlink that we will delete before installation. mkdir -p $out/lib ln -s $PWD/tests/scanner/libregress-1.0${stdenv.targetPlatform.extensions.sharedLibrary} $out/lib/libregress-1.0${stdenv.targetPlatform.extensions.sharedLibrary} - cleanLibregressSymlink() { - rm $out/lib/libregress-1.0${stdenv.targetPlatform.extensions.sharedLibrary} - } - preInstallPhases="$preInstallPhases cleanLibregressSymlink" + ''; + + preInstall = '' + rm $out/lib/libregress-1.0${stdenv.targetPlatform.extensions.sharedLibrary} ''; passthru = { -- cgit v1.2.3 From e546afa5a5e51d1acce1904a1710e309c364ed97 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Apr 2020 02:35:17 +0000 Subject: micronaut: 1.3.2 -> 1.3.4 --- pkgs/development/tools/micronaut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index 6466f1c4a28..36df02ff712 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "1.3.2"; + version = "1.3.4"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-core/releases/download/v${version}/${pname}-${version}.zip"; - sha256 = "0jwvbymwaz4whw08n9scz6vk57sx7l3qddh4m5dlv2cxishwf7n3"; + sha256 = "0mddr6jw7bl8k4iqfq3sfpxq8fffm2spi9xwdr4cskkw4qdgrrpz"; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; -- cgit v1.2.3 From 79782065bc1791718a5dd28250d77f9d801d179f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Apr 2020 02:43:38 +0000 Subject: minio-client: 2020-03-06T23-29-45Z -> 2020-04-04T05-28-55Z --- pkgs/tools/networking/minio-client/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 885ffbe9157..3bd03f38564 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2020-03-06T23-29-45Z"; + version = "2020-04-04T05-28-55Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "1vqvp7mn841s5g9vvas3c8j4y9lp90maw5y49hdv7zcsqncqvzkv"; + sha256 = "09z28fq492d4l0089d1knq4zah9p2b212pkz777vznw9lzfqqip8"; }; - modSha256 = "1qjfsqmcc6i0nixwvdmm3vnnv19yvqaaza096cpdf5rl35knsp5i"; + modSha256 = "0cv824ar5ifsg93sylrfjmax6zqm5073y95hqqfcc1dfp0mv2ki3"; subPackages = [ "." ]; @@ -20,7 +20,7 @@ buildGoModule rec { ''; meta = with stdenv.lib; { - homepage = https://github.com/minio/mc; + homepage = "https://github.com/minio/mc"; description = "A replacement for ls, cp, mkdir, diff and rsync commands for filesystems and object storage"; maintainers = with maintainers; [ eelco bachp ]; platforms = platforms.unix; -- cgit v1.2.3 From a6580c31644a1f3cad187e15122ee756af57af4a Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sun, 5 Apr 2020 08:37:09 +0300 Subject: nixos/qt5: support adwaita-dark theme --- nixos/modules/config/qt5.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/config/qt5.nix b/nixos/modules/config/qt5.nix index d9dec74f155..eabba9ad95f 100644 --- a/nixos/modules/config/qt5.nix +++ b/nixos/modules/config/qt5.nix @@ -6,8 +6,8 @@ let cfg = config.qt5; - isQGnome = cfg.platformTheme == "gnome" && cfg.style == "adwaita"; - isQtStyle = cfg.platformTheme == "gtk2" && cfg.style != "adwaita"; + isQGnome = cfg.platformTheme == "gnome" && builtins.elem cfg.style ["adwaita" "adwaita-dark"]; + isQtStyle = cfg.platformTheme == "gtk2" && !(builtins.elem cfg.style ["adwaita" "adwaita-dark"]); packages = if isQGnome then [ pkgs.qgnomeplatform pkgs.adwaita-qt ] else if isQtStyle then [ pkgs.libsForQt5.qtstyleplugins ] @@ -55,6 +55,7 @@ in style = mkOption { type = types.enum [ "adwaita" + "adwaita-dark" "cleanlooks" "gtk2" "motif" @@ -71,6 +72,7 @@ in adwaita + adwaita-dark Use Adwaita Qt style with adwaita -- cgit v1.2.3 From e336bdf80e758eee6415196bf2340dc0980681c8 Mon Sep 17 00:00:00 2001 From: Gabor Greif Date: Tue, 25 Feb 2020 14:37:25 +0100 Subject: llvmPackages: change homepages to https:// scheme also: https://www.cmake.org/Wiki/CMake_RPATH_handling has moved --- pkgs/development/compilers/llvm/10/clang/default.nix | 2 +- pkgs/development/compilers/llvm/10/libc++/default.nix | 2 +- pkgs/development/compilers/llvm/10/libc++abi.nix | 4 ++-- pkgs/development/compilers/llvm/10/lld.nix | 2 +- pkgs/development/compilers/llvm/10/lldb.nix | 2 +- pkgs/development/compilers/llvm/10/llvm.nix | 2 +- pkgs/development/compilers/llvm/10/openmp.nix | 2 +- pkgs/development/compilers/llvm/5/clang/default.nix | 2 +- pkgs/development/compilers/llvm/5/libc++/default.nix | 2 +- pkgs/development/compilers/llvm/5/libc++abi.nix | 4 ++-- pkgs/development/compilers/llvm/5/lld.nix | 2 +- pkgs/development/compilers/llvm/5/lldb.nix | 2 +- pkgs/development/compilers/llvm/5/llvm.nix | 2 +- pkgs/development/compilers/llvm/5/openmp.nix | 2 +- pkgs/development/compilers/llvm/6/clang/default.nix | 2 +- pkgs/development/compilers/llvm/6/libc++/default.nix | 2 +- pkgs/development/compilers/llvm/6/libc++abi.nix | 4 ++-- pkgs/development/compilers/llvm/6/lld.nix | 2 +- pkgs/development/compilers/llvm/6/lldb.nix | 2 +- pkgs/development/compilers/llvm/6/llvm.nix | 2 +- pkgs/development/compilers/llvm/6/openmp.nix | 2 +- pkgs/development/compilers/llvm/7/clang/default.nix | 2 +- pkgs/development/compilers/llvm/7/libc++/default.nix | 2 +- pkgs/development/compilers/llvm/7/libc++abi.nix | 4 ++-- pkgs/development/compilers/llvm/7/lld.nix | 2 +- pkgs/development/compilers/llvm/7/lldb.nix | 2 +- pkgs/development/compilers/llvm/7/llvm.nix | 2 +- pkgs/development/compilers/llvm/7/openmp.nix | 2 +- pkgs/development/compilers/llvm/8/clang/default.nix | 2 +- pkgs/development/compilers/llvm/8/libc++/default.nix | 2 +- pkgs/development/compilers/llvm/8/libc++abi.nix | 4 ++-- pkgs/development/compilers/llvm/8/lld.nix | 2 +- pkgs/development/compilers/llvm/8/lldb.nix | 2 +- pkgs/development/compilers/llvm/8/llvm.nix | 2 +- pkgs/development/compilers/llvm/8/openmp.nix | 2 +- pkgs/development/compilers/llvm/9/clang/default.nix | 2 +- pkgs/development/compilers/llvm/9/libc++/default.nix | 2 +- pkgs/development/compilers/llvm/9/libc++abi.nix | 4 ++-- pkgs/development/compilers/llvm/9/lld.nix | 2 +- pkgs/development/compilers/llvm/9/lldb.nix | 2 +- pkgs/development/compilers/llvm/9/llvm.nix | 2 +- pkgs/development/compilers/llvm/9/openmp.nix | 2 +- 42 files changed, 48 insertions(+), 48 deletions(-) diff --git a/pkgs/development/compilers/llvm/10/clang/default.nix b/pkgs/development/compilers/llvm/10/clang/default.nix index 61008b5c12a..9b63b772ac0 100644 --- a/pkgs/development/compilers/llvm/10/clang/default.nix +++ b/pkgs/development/compilers/llvm/10/clang/default.nix @@ -95,7 +95,7 @@ let meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; - homepage = http://llvm.org/; + homepage = https://llvm.org/; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/10/libc++/default.nix b/pkgs/development/compilers/llvm/10/libc++/default.nix index 9e3529a046f..df009775978 100644 --- a/pkgs/development/compilers/llvm/10/libc++/default.nix +++ b/pkgs/development/compilers/llvm/10/libc++/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = http://libcxx.llvm.org/; + homepage = https://libcxx.llvm.org/; description = "A new implementation of the C++ standard library, targeting C++11"; license = with stdenv.lib.licenses; [ ncsa mit ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/compilers/llvm/10/libc++abi.nix b/pkgs/development/compilers/llvm/10/libc++abi.nix index b58c12bd9ab..5af88369e78 100644 --- a/pkgs/development/compilers/llvm/10/libc++abi.nix +++ b/pkgs/development/compilers/llvm/10/libc++abi.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { # this should be done in CMake, but having trouble figuring out # the magic combination of necessary CMake variables # if you fancy a try, take a look at - # http://www.cmake.org/Wiki/CMake_RPATH_handling + # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling install_name_tool -id $out/$file $file done make install @@ -58,7 +58,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://libcxxabi.llvm.org/; + homepage = https://libcxxabi.llvm.org/; description = "A new implementation of low level support for a standard C++ library"; license = with stdenv.lib.licenses; [ ncsa mit ]; maintainers = with stdenv.lib.maintainers; [ vlstill ]; diff --git a/pkgs/development/compilers/llvm/10/lld.nix b/pkgs/development/compilers/llvm/10/lld.nix index 4bde3d74636..672105d7c50 100644 --- a/pkgs/development/compilers/llvm/10/lld.nix +++ b/pkgs/development/compilers/llvm/10/lld.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "The LLVM Linker"; - homepage = http://lld.llvm.org/; + homepage = https://lld.llvm.org/; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/10/lldb.nix b/pkgs/development/compilers/llvm/10/lldb.nix index 46c991de817..6f83f5a2342 100644 --- a/pkgs/development/compilers/llvm/10/lldb.nix +++ b/pkgs/development/compilers/llvm/10/lldb.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (rec { meta = with stdenv.lib; { description = "A next-generation high-performance debugger"; - homepage = http://lldb.llvm.org; + homepage = https://lldb.llvm.org; license = licenses.ncsa; platforms = platforms.all; }; diff --git a/pkgs/development/compilers/llvm/10/llvm.nix b/pkgs/development/compilers/llvm/10/llvm.nix index 73265419cfb..9c8f4c5afcd 100644 --- a/pkgs/development/compilers/llvm/10/llvm.nix +++ b/pkgs/development/compilers/llvm/10/llvm.nix @@ -161,7 +161,7 @@ in stdenv.mkDerivation (rec { meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; - homepage = http://llvm.org/; + homepage = https://llvm.org/; license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/compilers/llvm/10/openmp.nix b/pkgs/development/compilers/llvm/10/openmp.nix index 4dd45ba94e6..f0229d0b48e 100644 --- a/pkgs/development/compilers/llvm/10/openmp.nix +++ b/pkgs/development/compilers/llvm/10/openmp.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Components required to build an executable OpenMP program"; - homepage = http://openmp.llvm.org/; + homepage = https://openmp.llvm.org/; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/5/clang/default.nix b/pkgs/development/compilers/llvm/5/clang/default.nix index e391ce046db..90a7ad966ce 100644 --- a/pkgs/development/compilers/llvm/5/clang/default.nix +++ b/pkgs/development/compilers/llvm/5/clang/default.nix @@ -83,7 +83,7 @@ let meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; - homepage = http://llvm.org/; + homepage = https://llvm.org/; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/5/libc++/default.nix b/pkgs/development/compilers/llvm/5/libc++/default.nix index b02e09a83a8..74e61a4a4dd 100644 --- a/pkgs/development/compilers/llvm/5/libc++/default.nix +++ b/pkgs/development/compilers/llvm/5/libc++/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = http://libcxx.llvm.org/; + homepage = https://libcxx.llvm.org/; description = "A new implementation of the C++ standard library, targeting C++11"; license = with stdenv.lib.licenses; [ ncsa mit ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/compilers/llvm/5/libc++abi.nix b/pkgs/development/compilers/llvm/5/libc++abi.nix index 1b891af09ed..9655b48088a 100644 --- a/pkgs/development/compilers/llvm/5/libc++abi.nix +++ b/pkgs/development/compilers/llvm/5/libc++abi.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { # this should be done in CMake, but having trouble figuring out # the magic combination of necessary CMake variables # if you fancy a try, take a look at - # http://www.cmake.org/Wiki/CMake_RPATH_handling + # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling install_name_tool -id $out/$file $file done make install @@ -42,7 +42,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://libcxxabi.llvm.org/; + homepage = https://libcxxabi.llvm.org/; description = "A new implementation of low level support for a standard C++ library"; license = with stdenv.lib.licenses; [ ncsa mit ]; maintainers = with stdenv.lib.maintainers; [ vlstill ]; diff --git a/pkgs/development/compilers/llvm/5/lld.nix b/pkgs/development/compilers/llvm/5/lld.nix index bfee91d91bf..608211efb58 100644 --- a/pkgs/development/compilers/llvm/5/lld.nix +++ b/pkgs/development/compilers/llvm/5/lld.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "The LLVM Linker"; - homepage = http://lld.llvm.org/; + homepage = https://lld.llvm.org/; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; badPlatforms = [ "x86_64-darwin" ]; diff --git a/pkgs/development/compilers/llvm/5/lldb.nix b/pkgs/development/compilers/llvm/5/lldb.nix index a91a7e4354e..6bdd7f4be7d 100644 --- a/pkgs/development/compilers/llvm/5/lldb.nix +++ b/pkgs/development/compilers/llvm/5/lldb.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A next-generation high-performance debugger"; - homepage = http://llvm.org/; + homepage = https://llvm.org/; license = licenses.ncsa; platforms = platforms.all; }; diff --git a/pkgs/development/compilers/llvm/5/llvm.nix b/pkgs/development/compilers/llvm/5/llvm.nix index 2ce17765d63..55eb61082e4 100644 --- a/pkgs/development/compilers/llvm/5/llvm.nix +++ b/pkgs/development/compilers/llvm/5/llvm.nix @@ -151,7 +151,7 @@ stdenv.mkDerivation ({ requiredSystemFeatures = [ "big-parallel" ]; meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; - homepage = http://llvm.org/; + homepage = https://llvm.org/; license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/compilers/llvm/5/openmp.nix b/pkgs/development/compilers/llvm/5/openmp.nix index 559377bcc1b..03a98f13148 100644 --- a/pkgs/development/compilers/llvm/5/openmp.nix +++ b/pkgs/development/compilers/llvm/5/openmp.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Components required to build an executable OpenMP program"; - homepage = http://openmp.llvm.org/; + homepage = https://openmp.llvm.org/; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/6/clang/default.nix b/pkgs/development/compilers/llvm/6/clang/default.nix index 9374fc0bda9..113b36e3229 100644 --- a/pkgs/development/compilers/llvm/6/clang/default.nix +++ b/pkgs/development/compilers/llvm/6/clang/default.nix @@ -83,7 +83,7 @@ let meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; - homepage = http://llvm.org/; + homepage = https://llvm.org/; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/6/libc++/default.nix b/pkgs/development/compilers/llvm/6/libc++/default.nix index 831c6c9c700..2dccac3938b 100644 --- a/pkgs/development/compilers/llvm/6/libc++/default.nix +++ b/pkgs/development/compilers/llvm/6/libc++/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = http://libcxx.llvm.org/; + homepage = https://libcxx.llvm.org/; description = "A new implementation of the C++ standard library, targeting C++11"; license = with stdenv.lib.licenses; [ ncsa mit ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/compilers/llvm/6/libc++abi.nix b/pkgs/development/compilers/llvm/6/libc++abi.nix index ac1f4f653e6..7c6d8974bbd 100644 --- a/pkgs/development/compilers/llvm/6/libc++abi.nix +++ b/pkgs/development/compilers/llvm/6/libc++abi.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { # this should be done in CMake, but having trouble figuring out # the magic combination of necessary CMake variables # if you fancy a try, take a look at - # http://www.cmake.org/Wiki/CMake_RPATH_handling + # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling install_name_tool -id $out/$file $file done make install @@ -42,7 +42,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://libcxxabi.llvm.org/; + homepage = https://libcxxabi.llvm.org/; description = "A new implementation of low level support for a standard C++ library"; license = with stdenv.lib.licenses; [ ncsa mit ]; maintainers = with stdenv.lib.maintainers; [ vlstill ]; diff --git a/pkgs/development/compilers/llvm/6/lld.nix b/pkgs/development/compilers/llvm/6/lld.nix index 58b9b8060fa..30e612cebec 100644 --- a/pkgs/development/compilers/llvm/6/lld.nix +++ b/pkgs/development/compilers/llvm/6/lld.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "The LLVM Linker"; - homepage = http://lld.llvm.org/; + homepage = https://lld.llvm.org/; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/6/lldb.nix b/pkgs/development/compilers/llvm/6/lldb.nix index 30d72d94426..90b147fe088 100644 --- a/pkgs/development/compilers/llvm/6/lldb.nix +++ b/pkgs/development/compilers/llvm/6/lldb.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A next-generation high-performance debugger"; - homepage = http://llvm.org/; + homepage = https://llvm.org/; license = licenses.ncsa; platforms = platforms.all; }; diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index 80acd3fa2fe..7bb3d38033d 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -149,7 +149,7 @@ stdenv.mkDerivation ({ meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; - homepage = http://llvm.org/; + homepage = https://llvm.org/; license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/compilers/llvm/6/openmp.nix b/pkgs/development/compilers/llvm/6/openmp.nix index 447904b9ad5..e1ed2d7438e 100644 --- a/pkgs/development/compilers/llvm/6/openmp.nix +++ b/pkgs/development/compilers/llvm/6/openmp.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Components required to build an executable OpenMP program"; - homepage = http://openmp.llvm.org/; + homepage = https://openmp.llvm.org/; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/7/clang/default.nix b/pkgs/development/compilers/llvm/7/clang/default.nix index 6e01f4259ee..52ddbeccdff 100644 --- a/pkgs/development/compilers/llvm/7/clang/default.nix +++ b/pkgs/development/compilers/llvm/7/clang/default.nix @@ -93,7 +93,7 @@ let meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; - homepage = http://llvm.org/; + homepage = https://llvm.org/; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/7/libc++/default.nix b/pkgs/development/compilers/llvm/7/libc++/default.nix index f2cdd2f6f5f..9537e97af99 100644 --- a/pkgs/development/compilers/llvm/7/libc++/default.nix +++ b/pkgs/development/compilers/llvm/7/libc++/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = http://libcxx.llvm.org/; + homepage = https://libcxx.llvm.org/; description = "A new implementation of the C++ standard library, targeting C++11"; license = with stdenv.lib.licenses; [ ncsa mit ]; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/compilers/llvm/7/libc++abi.nix b/pkgs/development/compilers/llvm/7/libc++abi.nix index 9067bf43a8f..99d7983691c 100644 --- a/pkgs/development/compilers/llvm/7/libc++abi.nix +++ b/pkgs/development/compilers/llvm/7/libc++abi.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { # this should be done in CMake, but having trouble figuring out # the magic combination of necessary CMake variables # if you fancy a try, take a look at - # http://www.cmake.org/Wiki/CMake_RPATH_handling + # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling install_name_tool -id $out/$file $file done make install @@ -45,7 +45,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://libcxxabi.llvm.org/; + homepage = https://libcxxabi.llvm.org/; description = "A new implementation of low level support for a standard C++ library"; license = with stdenv.lib.licenses; [ ncsa mit ]; maintainers = with stdenv.lib.maintainers; [ vlstill ]; diff --git a/pkgs/development/compilers/llvm/7/lld.nix b/pkgs/development/compilers/llvm/7/lld.nix index 823e9640cf4..275b551863a 100644 --- a/pkgs/development/compilers/llvm/7/lld.nix +++ b/pkgs/development/compilers/llvm/7/lld.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "The LLVM Linker"; - homepage = http://lld.llvm.org/; + homepage = https://lld.llvm.org/; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/7/lldb.nix b/pkgs/development/compilers/llvm/7/lldb.nix index ace6ae812fd..305f1ad3595 100644 --- a/pkgs/development/compilers/llvm/7/lldb.nix +++ b/pkgs/development/compilers/llvm/7/lldb.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A next-generation high-performance debugger"; - homepage = http://llvm.org/; + homepage = https://llvm.org/; license = licenses.ncsa; platforms = platforms.all; }; diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix index d7fb1fe4b93..4a019b5ad25 100644 --- a/pkgs/development/compilers/llvm/7/llvm.nix +++ b/pkgs/development/compilers/llvm/7/llvm.nix @@ -170,7 +170,7 @@ in stdenv.mkDerivation ({ meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; - homepage = http://llvm.org/; + homepage = https://llvm.org/; license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/compilers/llvm/7/openmp.nix b/pkgs/development/compilers/llvm/7/openmp.nix index 7adc2aa588e..772693e54c3 100644 --- a/pkgs/development/compilers/llvm/7/openmp.nix +++ b/pkgs/development/compilers/llvm/7/openmp.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Components required to build an executable OpenMP program"; - homepage = http://openmp.llvm.org/; + homepage = https://openmp.llvm.org/; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/8/clang/default.nix b/pkgs/development/compilers/llvm/8/clang/default.nix index 81a069e6c01..563986f1648 100644 --- a/pkgs/development/compilers/llvm/8/clang/default.nix +++ b/pkgs/development/compilers/llvm/8/clang/default.nix @@ -103,7 +103,7 @@ let meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; - homepage = http://llvm.org/; + homepage = https://llvm.org/; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/8/libc++/default.nix b/pkgs/development/compilers/llvm/8/libc++/default.nix index 883d9c8776f..f29b60fa731 100644 --- a/pkgs/development/compilers/llvm/8/libc++/default.nix +++ b/pkgs/development/compilers/llvm/8/libc++/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = http://libcxx.llvm.org/; + homepage = https://libcxx.llvm.org/; description = "A new implementation of the C++ standard library, targeting C++11"; license = with stdenv.lib.licenses; [ ncsa mit ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/compilers/llvm/8/libc++abi.nix b/pkgs/development/compilers/llvm/8/libc++abi.nix index 58a1241d823..dc2f02c1d99 100644 --- a/pkgs/development/compilers/llvm/8/libc++abi.nix +++ b/pkgs/development/compilers/llvm/8/libc++abi.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { # this should be done in CMake, but having trouble figuring out # the magic combination of necessary CMake variables # if you fancy a try, take a look at - # http://www.cmake.org/Wiki/CMake_RPATH_handling + # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling install_name_tool -id $out/$file $file done make install @@ -58,7 +58,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://libcxxabi.llvm.org/; + homepage = https://libcxxabi.llvm.org/; description = "A new implementation of low level support for a standard C++ library"; license = with stdenv.lib.licenses; [ ncsa mit ]; maintainers = with stdenv.lib.maintainers; [ vlstill ]; diff --git a/pkgs/development/compilers/llvm/8/lld.nix b/pkgs/development/compilers/llvm/8/lld.nix index fc52d691d03..fc7e4ca1c9d 100644 --- a/pkgs/development/compilers/llvm/8/lld.nix +++ b/pkgs/development/compilers/llvm/8/lld.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "The LLVM Linker"; - homepage = http://lld.llvm.org/; + homepage = https://lld.llvm.org/; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/8/lldb.nix b/pkgs/development/compilers/llvm/8/lldb.nix index 75be5b993df..8893371e2aa 100644 --- a/pkgs/development/compilers/llvm/8/lldb.nix +++ b/pkgs/development/compilers/llvm/8/lldb.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "A next-generation high-performance debugger"; - homepage = http://llvm.org/; + homepage = https://llvm.org/; license = licenses.ncsa; platforms = platforms.all; }; diff --git a/pkgs/development/compilers/llvm/8/llvm.nix b/pkgs/development/compilers/llvm/8/llvm.nix index a9c4a6b0ba2..47535148f88 100644 --- a/pkgs/development/compilers/llvm/8/llvm.nix +++ b/pkgs/development/compilers/llvm/8/llvm.nix @@ -145,7 +145,7 @@ in stdenv.mkDerivation ({ meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; - homepage = http://llvm.org/; + homepage = https://llvm.org/; license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/compilers/llvm/8/openmp.nix b/pkgs/development/compilers/llvm/8/openmp.nix index 166e7f68eb3..df3c8ab1702 100644 --- a/pkgs/development/compilers/llvm/8/openmp.nix +++ b/pkgs/development/compilers/llvm/8/openmp.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Components required to build an executable OpenMP program"; - homepage = http://openmp.llvm.org/; + homepage = https://openmp.llvm.org/; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/9/clang/default.nix b/pkgs/development/compilers/llvm/9/clang/default.nix index d8df52df553..e0e448390b1 100644 --- a/pkgs/development/compilers/llvm/9/clang/default.nix +++ b/pkgs/development/compilers/llvm/9/clang/default.nix @@ -98,7 +98,7 @@ let meta = { description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; - homepage = http://llvm.org/; + homepage = https://llvm.org/; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/9/libc++/default.nix b/pkgs/development/compilers/llvm/9/libc++/default.nix index 9e3525574d5..67672a45d40 100644 --- a/pkgs/development/compilers/llvm/9/libc++/default.nix +++ b/pkgs/development/compilers/llvm/9/libc++/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { ]; meta = { - homepage = http://libcxx.llvm.org/; + homepage = https://libcxx.llvm.org/; description = "A new implementation of the C++ standard library, targeting C++11"; license = with stdenv.lib.licenses; [ ncsa mit ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/compilers/llvm/9/libc++abi.nix b/pkgs/development/compilers/llvm/9/libc++abi.nix index fbc9a3731ef..4e3c7b6aeee 100644 --- a/pkgs/development/compilers/llvm/9/libc++abi.nix +++ b/pkgs/development/compilers/llvm/9/libc++abi.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { # this should be done in CMake, but having trouble figuring out # the magic combination of necessary CMake variables # if you fancy a try, take a look at - # http://www.cmake.org/Wiki/CMake_RPATH_handling + # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling install_name_tool -id $out/$file $file done make install @@ -58,7 +58,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = http://libcxxabi.llvm.org/; + homepage = https://libcxxabi.llvm.org/; description = "A new implementation of low level support for a standard C++ library"; license = with stdenv.lib.licenses; [ ncsa mit ]; maintainers = with stdenv.lib.maintainers; [ vlstill ]; diff --git a/pkgs/development/compilers/llvm/9/lld.nix b/pkgs/development/compilers/llvm/9/lld.nix index 775dc2e1905..7378cf912a6 100644 --- a/pkgs/development/compilers/llvm/9/lld.nix +++ b/pkgs/development/compilers/llvm/9/lld.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = { description = "The LLVM Linker"; - homepage = http://lld.llvm.org/; + homepage = https://lld.llvm.org/; license = stdenv.lib.licenses.ncsa; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/development/compilers/llvm/9/lldb.nix b/pkgs/development/compilers/llvm/9/lldb.nix index 506fc1c3e50..b1e375b336b 100644 --- a/pkgs/development/compilers/llvm/9/lldb.nix +++ b/pkgs/development/compilers/llvm/9/lldb.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A next-generation high-performance debugger"; - homepage = http://llvm.org/; + homepage = https://llvm.org/; license = licenses.ncsa; platforms = platforms.all; }; diff --git a/pkgs/development/compilers/llvm/9/llvm.nix b/pkgs/development/compilers/llvm/9/llvm.nix index 2cdc5a5fd06..089d66ba750 100644 --- a/pkgs/development/compilers/llvm/9/llvm.nix +++ b/pkgs/development/compilers/llvm/9/llvm.nix @@ -162,7 +162,7 @@ in stdenv.mkDerivation (rec { meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; - homepage = http://llvm.org/; + homepage = https://llvm.org/; license = stdenv.lib.licenses.ncsa; maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/compilers/llvm/9/openmp.nix b/pkgs/development/compilers/llvm/9/openmp.nix index 4e0a5535ae3..9bf57451f32 100644 --- a/pkgs/development/compilers/llvm/9/openmp.nix +++ b/pkgs/development/compilers/llvm/9/openmp.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "Components required to build an executable OpenMP program"; - homepage = http://openmp.llvm.org/; + homepage = https://openmp.llvm.org/; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.all; }; -- cgit v1.2.3 From fb015f809a2614bccad7b45e3f9d6f8462c52f72 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Sat, 4 Apr 2020 19:21:31 +0200 Subject: ghc883: fix structuredAttrs build --- pkgs/development/compilers/ghc/8.8.3.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.8.3.nix b/pkgs/development/compilers/ghc/8.8.3.nix index e4ece9b8d8c..237b03080f5 100644 --- a/pkgs/development/compilers/ghc/8.8.3.nix +++ b/pkgs/development/compilers/ghc/8.8.3.nix @@ -73,7 +73,7 @@ let ''; # Splicer will pull out correct variations - libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] + libDeps = platform: stdenv.lib.optional enableTerminfo ncurses ++ [libffi] ++ stdenv.lib.optional (!enableIntegerSimple) gmp ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; @@ -158,10 +158,10 @@ stdenv.mkDerivation (rec { "--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [ + ] ++ stdenv.lib.optionals (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) [ + ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ -- cgit v1.2.3 From af1cb9f1b5c1ea8cb94f620fd347df33540b87ae Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 3 Apr 2020 15:36:19 +0200 Subject: python3Packages.cryptography: 2.8 -> 2.9 Backwards incompatible changes: - Support for Python 3.4 has been removed due to low usage and maintenance burden. - Support for OpenSSL 1.0.1 has been removed. Users on older version of OpenSSL will need to upgrade. - Support for LibreSSL 2.6.x has been removed. - Reversed the order in which rfc4514_string() returns the RDNs as required by RFC 4514. Note: The first three changes should have no impact on Nixpkgs as we already removed Python 3.4 and OpenSSL 1.0.1. Additionally we don't support LibreSSL for this package. --- .../python-modules/cryptography/default.nix | 19 ++++++++----------- .../python-modules/cryptography/vectors.nix | 4 ++-- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 82d0b43bc35..8d655de97b8 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -8,8 +8,6 @@ , packaging , six , pythonOlder -, enum34 -, ipaddress , isPyPy , cffi , pytest @@ -21,11 +19,11 @@ buildPythonPackage rec { pname = "cryptography"; - version = "2.8"; # Also update the hash in vectors.nix + version = "2.9"; # Also update the hash in vectors.nix src = fetchPypi { inherit pname version; - sha256 = "0l8nhw14npknncxdnp7n4hpmjyscly6g7fbivyxkjwvlv071zniw"; + sha256 = "0vlqy2pki0fh1h6l6cbb43z3g2n9fv0849dzb5gqwjv0bkpx7b0c"; }; outputs = [ "out" "dev" ]; @@ -35,9 +33,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ packaging six - ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34 - ++ stdenv.lib.optional (pythonOlder "3.3") ipaddress - ++ stdenv.lib.optional (!isPyPy) cffi; + ] ++ stdenv.lib.optional (!isPyPy) cffi; checkInputs = [ cryptography_vectors @@ -48,9 +44,8 @@ buildPythonPackage rec { pytz ]; - # remove when https://github.com/pyca/cryptography/issues/4998 is fixed checkPhase = '' - py.test --disable-pytest-warnings tests -k 'not load_ecdsa_no_named_curve' + py.test --disable-pytest-warnings tests ''; # IOKit's dependencies are inconsistent between OSX versions, so this is the best we @@ -64,9 +59,11 @@ buildPythonPackage rec { common cryptographic algorithms such as symmetric ciphers, message digests, and key derivation functions. Our goal is for it to be your "cryptographic standard library". It - supports Python 2.7, Python 3.4+, and PyPy 5.3+. + supports Python 2.7, Python 3.5+, and PyPy 5.4+. ''; - homepage = https://github.com/pyca/cryptography; + homepage = "https://github.com/pyca/cryptography"; + changelog = "https://cryptography.io/en/latest/changelog/#v" + + replaceStrings [ "." ] [ "-" ] version; license = with licenses; [ asl20 bsd3 psfl ]; maintainers = with maintainers; [ primeos ]; }; diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index 86cc195b05b..6fd8259d78f 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "05pi3shqz0fgvy0d5yazza67bbnam8fkrx2ayrrclgkaqms23lvc"; + sha256 = "1h7dcgwrjxqk1bzkangbvlhhlgyqd7cfi894dv1cd5m2sp7csblc"; }; # No tests included @@ -15,7 +15,7 @@ buildPythonPackage rec { meta = with lib; { description = "Test vectors for the cryptography package"; - homepage = https://cryptography.io/en/latest/development/test-vectors/; + homepage = "https://cryptography.io/en/latest/development/test-vectors/"; # Source: https://github.com/pyca/cryptography/tree/master/vectors; license = with licenses; [ asl20 bsd3 ]; maintainers = with maintainers; [ primeos ]; -- cgit v1.2.3 From 5bea90df81040136b1df2af1f85eb209d9b33d93 Mon Sep 17 00:00:00 2001 From: volth Date: Sat, 21 Mar 2020 16:42:30 +0000 Subject: perl: 5.30.1 -> 5.30.2 --- pkgs/development/interpreters/perl/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 8f8b63a261e..0f9bee05946 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -170,11 +170,11 @@ let priority = 6; # in `buildEnv' (including the one inside `perl.withPackages') the library files will have priority over files in `perl` }; } // optionalAttrs (stdenv.buildPlatform != stdenv.hostPlatform) rec { - crossVersion = "ba90816ef2c24dc06fd6cd2c854abcfa1aae00a3"; # Nov 22, 2019 + crossVersion = "1.3.2"; # Mar 21, 2020 perl-cross-src = fetchurl { url = "https://github.com/arsv/perl-cross/archive/${crossVersion}.tar.gz"; - sha256 = "19jq5fz6l64s0v6j64n5mkk5v2srpyfn9sc09hwbpkp9n74q82j4"; + sha256 = "1283crdjsyi45mgdiak4jmy907mqn09frxzxp21b18hvxmfn4smq"; }; depsBuildBuild = [ buildPackages.stdenv.cc makeWrapper ]; @@ -202,15 +202,15 @@ in { perl530 = common { perl = pkgs.perl530; buildPerl = buildPackages.perl530; - version = "5.30.1"; - sha256 = "0r7r8a7pkgxp3w5lza559ahxczw6hzpwvhkpc4c99vpi3xbjagdz"; + version = "5.30.2"; + sha256 = "128nfdxcvxfn5kq55qcfrx2851ys8hv794dcdxbyny8rm7w7vnv6"; }; # the latest Devel version perldevel = common { perl = pkgs.perldevel; buildPerl = buildPackages.perldevel; - version = "5.31.6"; - sha256 = "08n3c8xm1brxpckqy8i1xgjrpl4afrhcva9bhxswr938n675x71k"; + version = "5.31.10"; + sha256 = "1gvv5zs54gzb947x7ryjkaalm9rbqf8l8hwjwdm9lbfgkpg07kny"; }; } -- cgit v1.2.3 From e4df9d6b54945bd3cbd1f9d1778c81f7f4705d70 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 13 Mar 2020 01:58:53 +0000 Subject: curl: 7.68.0 -> 7.69.1 --- pkgs/tools/networking/curl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index a732ddcb89e..0d8c90d5762 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -28,14 +28,14 @@ assert brotliSupport -> brotli != null; assert gssSupport -> libkrb5 != null; stdenv.mkDerivation rec { - name = "curl-7.68.0"; + name = "curl-7.69.1"; src = fetchurl { urls = [ "https://curl.haxx.se/download/${name}.tar.bz2" "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] name}/${name}.tar.bz2" ]; - sha256 = "1fgf4f33wj25jk6lkpxmrvmfnnxvc66z3k3561rxr8nngn8m8zr0"; + sha256 = "1s2ddjjif1wkp69vx25nzxklhimgqzaazfzliyl6mpvsa2yybx9g"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; -- cgit v1.2.3 From e895cacd9ba76ba43dc947c86e16c65dc86db1c7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 24 Mar 2020 06:48:50 +0000 Subject: gd: 2.2.5 -> 2.3.0 --- pkgs/development/libraries/gd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gd/default.nix b/pkgs/development/libraries/gd/default.nix index 6f57d735980..4a0d918cabe 100644 --- a/pkgs/development/libraries/gd/default.nix +++ b/pkgs/development/libraries/gd/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "gd"; - version = "2.2.5"; + version = "2.3.0"; src = fetchurl { url = "https://github.com/libgd/libgd/releases/download/${pname}-${version}/libgd-${version}.tar.xz"; - sha256 = "0lfy5f241sbv8s3splm2zqiaxv7lxrcshh875xryryk7yk5jqc4c"; + sha256 = "0n5czhxzinvjvmhkf5l9fwjdx5ip69k5k7pj6zwb6zs1k9dibngc"; }; hardeningDisable = [ "format" ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { doCheck = false; # fails 2 tests meta = with stdenv.lib; { - homepage = https://libgd.github.io/; + homepage = "https://libgd.github.io/"; description = "A dynamic image creation library"; license = licenses.free; # some custom license platforms = platforms.unix; -- cgit v1.2.3 From 92ffd641c8d905bde2ce3fc0c9b69a1efd42093c Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 11 Mar 2020 19:37:01 -0700 Subject: libsass: 3.6.1 -> 3.6.3 Contains fix for CVE-2019-18798 and CVE-2019-18799. Fixes #54804, #53571, #57155, #58266, #73660. --- pkgs/development/libraries/libsass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsass/default.nix b/pkgs/development/libraries/libsass/default.nix index 2092d72c9f8..2cb6f245a8a 100644 --- a/pkgs/development/libraries/libsass/default.nix +++ b/pkgs/development/libraries/libsass/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libsass"; - version = "3.6.1"; + version = "3.6.3"; src = fetchFromGitHub { owner = "sass"; repo = pname; rev = version; - sha256 = "1599j2lbsygy3883x9si7rbad1pkjhl6y72aimaapcv90ga5kxkm"; + sha256 = "1q6lvd8sj5k5an32qir918pa5khhcb8h08dzrg1bcxmw7a23j514"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' -- cgit v1.2.3 From 17b5600bf70e83723ee72e745876e48a9f207077 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Apr 2020 11:44:28 +0000 Subject: byacc: 20191125 -> 20200330 --- pkgs/development/tools/parsing/byacc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index 79e171d5fd7..be526085b75 100644 --- a/pkgs/development/tools/parsing/byacc/default.nix +++ b/pkgs/development/tools/parsing/byacc/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "byacc"; - version = "20191125"; + version = "20200330"; src = fetchurl { urls = [ "ftp://ftp.invisible-island.net/byacc/${pname}-${version}.tgz" "https://invisible-mirror.net/archives/byacc/${pname}-${version}.tgz" ]; - sha256 = "1phw8410ly3msv03dmjfi8xkmrl1lrrk928fp1489amg6sz2w707"; + sha256 = "1c0zyn6v286i09jlc8gx6jyaa5438qyy985rqsd76kb8ibfy56g0"; }; configureFlags = [ @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Berkeley YACC"; - homepage = https://invisible-island.net/byacc/byacc.html; + homepage = "https://invisible-island.net/byacc/byacc.html"; license = licenses.publicDomain; platforms = platforms.unix; }; -- cgit v1.2.3 From d7e7130f64138f6382fd648398547bff12091642 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 4 Mar 2020 15:08:13 +0000 Subject: bison: 3.5.1 -> 3.5.2 --- pkgs/development/tools/parsing/bison/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/default.nix index 41d28173da3..0fbf6a49b2f 100644 --- a/pkgs/development/tools/parsing/bison/default.nix +++ b/pkgs/development/tools/parsing/bison/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bison"; - version = "3.5.1"; + version = "3.5.2"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "09bg544pavpsivwh175ghgm7y3mkvdxfbwq41lfbwlb7v4i27vsc"; + sha256 = "1ylls1ba8y62q78vnzawy4ajpjkk5580crgi8krvfk8g13fvdnxl"; }; nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doInstallCheck = false; # fails meta = { - homepage = https://www.gnu.org/software/bison/; + homepage = "https://www.gnu.org/software/bison/"; description = "Yacc-compatible parser generator"; license = stdenv.lib.licenses.gpl3Plus; -- cgit v1.2.3 From 19afb22dd85f6e112fca58dba6ba832e97558591 Mon Sep 17 00:00:00 2001 From: Benjamin Andresen Date: Sun, 5 Apr 2020 15:17:59 +0200 Subject: clj-kondo: 2020.03.20 -> 2020.04.05 --- pkgs/development/tools/clj-kondo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix index 163bfeb688a..19b704e6b5f 100644 --- a/pkgs/development/tools/clj-kondo/default.nix +++ b/pkgs/development/tools/clj-kondo/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec{ pname = "clj-kondo"; - version = "2020.03.20"; + version = "2020.04.05"; reflectionJson = fetchurl { name = "reflection.json"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec{ src = fetchurl { url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "05z80cdzk8aw3j0nxfynzwpb9hhpbl54bbrv18dpqj5dj893mbgm"; + sha256 = "0k9samcqkpkdgzbzr2bpixf75987lsabh97101v1fg12qvjhf187"; }; dontUnpack = true; -- cgit v1.2.3 From 1e25c474d9e257a758a42934feec748a377b48e7 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 5 Apr 2020 11:34:22 -0300 Subject: [WIP] {help wanted} twolame: 2017-09-27 -> 0.4.0 --- pkgs/development/libraries/twolame/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/twolame/default.nix b/pkgs/development/libraries/twolame/default.nix index e1284c39aa3..42fc91f9deb 100644 --- a/pkgs/development/libraries/twolame/default.nix +++ b/pkgs/development/libraries/twolame/default.nix @@ -1,25 +1,27 @@ { stdenv, fetchFromGitHub -, autoreconfHook, pkgconfig -, libsndfile }: +, autoreconfHook +, pkgconfig +, libsndfile, xmlto, asciidoc }: -stdenv.mkDerivation { +with stdenv.lib; +stdenv.mkDerivation rec { pname = "twolame"; - version = "2017-09-27"; + version = "0.4.0"; src = fetchFromGitHub { owner = "njh"; repo = "twolame"; - rev = "977c8ac55d8ca6d5f35d1d413a119dac2b3b0333"; - sha256 = "1rq3yc8ygzdqid9zk6pixmm4w9sk2vrlx217lhn5bjaglv7iyf7x"; + rev = version; + sha256 = "0ckwdx5kmgmh1jq2wl6c9d57pf6z6p2wjdy6fw01a8f3clg21a8g"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig xmlto asciidoc ]; buildInputs = [ libsndfile ]; doCheck = false; # fails with "../build-scripts/test-driver: line 107: -Mstrict: command not found" - meta = with stdenv.lib;{ + meta = { description = "A MP2 encoder"; longDescription = '' TwoLAME is an optimised MPEG Audio Layer 2 (MP2) encoder based on -- cgit v1.2.3 From 88f46e7e7228e6057a20d400cbb5edba9a3322e3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Apr 2020 19:31:53 +0000 Subject: gsm: 1.0.18 -> 1.0.19 --- pkgs/development/libraries/gsm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gsm/default.nix b/pkgs/development/libraries/gsm/default.nix index 1405d4782ad..e24fca00a70 100644 --- a/pkgs/development/libraries/gsm/default.nix +++ b/pkgs/development/libraries/gsm/default.nix @@ -9,11 +9,11 @@ in stdenv.mkDerivation rec { pname = "gsm"; - version = "1.0.18"; + version = "1.0.19"; src = fetchurl { url = "http://www.quut.com/gsm/${pname}-${version}.tar.gz"; - sha256 = "041amvpz8cvxykl3pwqldrzxligmmzcg8ncdnxbg32rlqf3q1xh4"; + sha256 = "1xkha9ss5g5qnfaybi8il0mcvp8knwg9plgh8404vh58d0pna0s9"; }; patchPhase = '' -- cgit v1.2.3 From 91a20dac08ff1c2483befe90ccbd59c5b16aabde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 6 Apr 2020 02:19:15 +0200 Subject: gtk3: 3.24.14 -> 3.24.17 (#84367) --- pkgs/development/libraries/gtk/3.x.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index ac5a944334e..48b89c51772 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -48,7 +48,7 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "gtk+3"; - version = "3.24.14"; + version = "3.24.17"; outputs = [ "out" "dev" ] ++ optional withGtkDoc "devdoc"; outputBin = "dev"; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "120yz5gxqbv7sgdbcy4i0b6ixm8jpjzialdrqs0gv15q7bwnjk8w"; + sha256 = "1h5snvqz8f6zgwpmq7pblvfwj5dphfckj8bv7vdz1c0w49dja47j"; }; patches = [ @@ -70,11 +70,7 @@ stdenv.mkDerivation rec { url = "https://bug757142.bugzilla-attachments.gnome.org/attachment.cgi?id=344123"; sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p"; }) - # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/1528 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/3c28751dee115e969a58a733f2f19e71062b9d2d.patch"; - sha256 = "1rqrmymwd22dsiy7agjw13mcyic3by6020rxyaw7zslnmyzfiwc3"; - }) + # https://gitlab.gnome.org/GNOME/gtk/merge_requests/1002 ./patches/01-build-Fix-path-handling-in-pkgconfig.patch ] ++ optionals stdenv.isDarwin [ -- cgit v1.2.3 From 7d278d7e33dfe8f9f8dbe690648b06916e2f55a4 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 10 Mar 2020 22:54:31 -0400 Subject: retroarch: add wayland dependency and fix cross - Need custom pkg-config setting - add wayland & libxkbcommon --- pkgs/misc/emulators/retroarch/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index 02d09865432..812b9eabc5a 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -15,6 +15,8 @@ , enableNvidiaCgToolkit ? false, nvidia_cg_toolkit ? null , withVulkan ? stdenv.isLinux, vulkan-loader ? null , fetchurl +, wayland +, libxkbcommon }: with stdenv.lib; @@ -30,7 +32,7 @@ stdenv.mkDerivation rec { rev = "v${version}"; }; - nativeBuildInputs = [ pkgconfig ] + nativeBuildInputs = [ pkgconfig wayland ] ++ optional withVulkan makeWrapper; buildInputs = [ ffmpeg freetype libxml2 libGLU libGL python3 SDL2 which ] @@ -38,7 +40,11 @@ stdenv.mkDerivation rec { ++ optional withVulkan vulkan-loader ++ optionals stdenv.isDarwin [ libobjc AppKit Foundation ] ++ optionals stdenv.isLinux [ alsaLib libdrm libpulseaudio libv4l libX11 - libXdmcp libXext libXxf86vm mesa udev ]; + libXdmcp libXext libXxf86vm mesa udev + wayland libxkbcommon ]; + + # we use prefix-less pkg-config + PKG_CONF_PATH = "pkg-config"; enableParallelBuilding = true; -- cgit v1.2.3 From 2d05e1578122cd1c7ea5991eadceb01e5f1951ef Mon Sep 17 00:00:00 2001 From: Rohan Hart Date: Mon, 6 Apr 2020 14:32:22 +1200 Subject: Lutris using Proton 5 depends on libselinux fixes: ImportError: libselinux.so.1 --- pkgs/applications/misc/lutris/chrootenv.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/misc/lutris/chrootenv.nix b/pkgs/applications/misc/lutris/chrootenv.nix index 6f8d690779b..e2db330ff41 100644 --- a/pkgs/applications/misc/lutris/chrootenv.nix +++ b/pkgs/applications/misc/lutris/chrootenv.nix @@ -105,6 +105,9 @@ in buildFHSUserEnv { cups lcms2 mpg123 cairo unixODBC samba4 sane-backends openldap ocl-icd utillinux libkrb5 + # Proton + libselinux + # Winetricks fribidi ] ++ xorgDeps pkgs; -- cgit v1.2.3 From b2fe03baf49c3f7ded96a29be1a20946a05408e2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Apr 2020 06:17:27 +0000 Subject: modemmanager: 1.12.6 -> 1.12.8 --- pkgs/tools/networking/modem-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix index e9d925fb930..bf702261258 100644 --- a/pkgs/tools/networking/modem-manager/default.nix +++ b/pkgs/tools/networking/modem-manager/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "modem-manager"; - version = "1.12.6"; + version = "1.12.8"; package = "ModemManager"; src = fetchurl { url = "https://www.freedesktop.org/software/${package}/${package}-${version}.tar.xz"; - sha256 = "0k32rjh06p3q9yq054gxya6c7n39bilhi4s23p2hb02iwlz3bcrf"; + sha256 = "1zrsf57bn9rmaa2qvavr1aisci76vwlx0viqpwmkw3ds2l33vdb8"; }; nativeBuildInputs = [ vala gobject-introspection gettext pkgconfig ]; -- cgit v1.2.3 From 511cb624b79e859cbf7f463e3e55112ad0bdcf24 Mon Sep 17 00:00:00 2001 From: Louis Blin <45168934+lbpdt@users.noreply.github.com> Date: Fri, 27 Mar 2020 17:58:07 +0000 Subject: node-problem-detector: init at 0.8.1 Package is missing, built from Golang sources on GitHub. --- maintainers/maintainer-list.nix | 6 +++ .../cluster/node-problem-detector/default.nix | 50 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 58 insertions(+) create mode 100644 pkgs/applications/networking/cluster/node-problem-detector/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ac2b51881aa..8f65aa87781 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4162,6 +4162,12 @@ githubId = 32152; name = "Luka Blaskovic"; }; + lbpdt = { + email = "nix@pdtpartners.com"; + github = "lbpdt"; + githubId = 45168934; + name = "Louis Blin"; + }; ldelelis = { email = "ldelelis@est.frba.utn.edu.ar"; github = "ldelelis"; diff --git a/pkgs/applications/networking/cluster/node-problem-detector/default.nix b/pkgs/applications/networking/cluster/node-problem-detector/default.nix new file mode 100644 index 00000000000..a7a98de6d39 --- /dev/null +++ b/pkgs/applications/networking/cluster/node-problem-detector/default.nix @@ -0,0 +1,50 @@ +{ stdenv, buildGoModule, fetchFromGitHub, systemd }: + +buildGoModule rec { + pname = "node-problem-detector"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "kubernetes"; + repo = pname; + rev = "v${version}"; + sha256 = "02avknglmkr9k933a64hkw0rjfxvyh4sc3x70p41b8q2g6vzv2gs"; + }; + + # Project upstream recommends building through vendoring + overrideModAttrs = (_: { + buildCommand = '' + echo "Skipping go.mod, using vendoring instead." && touch $out + ''; + }); + + modSha256 = "0ip26j2h11n1kgkz36rl4akv694yz65hr72q4kv4b3lxcbi65b3p"; + + # Optionally, a log counter binary can be created to parse journald logs. + # The binary is dynamically linked against systemd libraries, making it a + # Linux-only feature. See 'ENABLE_JOURNALD' upstream: + # https://github.com/kubernetes/node-problem-detector/blob/master/Makefile + subPackages = [ "cmd/nodeproblemdetector" ] ++ + stdenv.lib.optionals stdenv.isLinux [ "cmd/logcounter" ]; + + preBuild = '' + export CGO_ENABLED=${if stdenv.isLinux then "1" else "0"} + ''; + + buildInputs = stdenv.lib.optionals stdenv.isLinux [ systemd ]; + + buildFlags = "-mod vendor" + + stdenv.lib.optionalString stdenv.isLinux " -tags journald"; + + buildFlagsArray = [ + "-ldflags=" + "-X k8s.io/${pname}/pkg/version.version=v${version}" + ]; + + meta = with stdenv.lib; { + description = "Various problem detectors running on the Kubernetes nodes"; + homepage = "https://github.com/kubernetes/node-problem-detector"; + license = licenses.asl20; + maintainers = with maintainers; [ lbpdt ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f4df97b0ae..3dbd038c482 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20767,6 +20767,8 @@ in geoip = geoipWithDatabase; }; + node-problem-detector = callPackage ../applications/networking/cluster/node-problem-detector { }; + notion = callPackage ../applications/window-managers/notion { }; nootka = qt5.callPackage ../applications/audio/nootka { }; -- cgit v1.2.3 From 9acb7daac2215fe7ec0724b82fa5e9048299d762 Mon Sep 17 00:00:00 2001 From: Flakebi Date: Fri, 7 Feb 2020 14:23:57 +0100 Subject: spirv-cross: init at 2020-04-03 --- pkgs/tools/graphics/spirv-cross/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/graphics/spirv-cross/default.nix diff --git a/pkgs/tools/graphics/spirv-cross/default.nix b/pkgs/tools/graphics/spirv-cross/default.nix new file mode 100644 index 00000000000..57b447b1ad7 --- /dev/null +++ b/pkgs/tools/graphics/spirv-cross/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, cmake, python3 }: + +stdenv.mkDerivation rec { + pname = "spirv-cross"; + version = "2020-04-03"; + + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Cross"; + rev = version; + sha256 = "0489s29kqgq20clxqg22y299yxz23p0yjh87yhka705hm9skx4sa"; + }; + + nativeBuildInputs = [ cmake python3 ]; + + meta = with stdenv.lib; { + description = "A tool designed for parsing and converting SPIR-V to other shader languages"; + homepage = "https://github.com/KhronosGroup/SPIRV-Cross"; + platforms = platforms.linux; + license = licenses.asl20; + maintainers = with maintainers; [ Flakebi ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f4df97b0ae..8bc68e8101d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14447,6 +14447,8 @@ in spice-up = callPackage ../applications/office/spice-up { }; + spirv-cross = callPackage ../tools/graphics/spirv-cross { }; + sratom = callPackage ../development/libraries/audio/sratom { }; srm = callPackage ../tools/security/srm { }; -- cgit v1.2.3 From aa46e1ae342feed39eaf1e63ffadfc69606dafb0 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 6 Apr 2020 13:50:15 +0200 Subject: iproute: Simplify and improve the expression --- pkgs/os-specific/linux/iproute/default.nix | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 624644596d9..fd7417839a1 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -1,4 +1,7 @@ -{ fetchurl, stdenv, flex, bash, bison, db, iptables, pkgconfig, libelf, libmnl }: +{ stdenv, fetchurl +, bison, flex, pkg-config +, db, iptables, libelf, libmnl +}: stdenv.mkDerivation rec { pname = "iproute2"; @@ -10,7 +13,7 @@ stdenv.mkDerivation rec { }; preConfigure = '' - patchShebangs ./configure + # Don't try to create /var/lib/arpd: sed -e '/ARPDDIR/d' -i Makefile # Don't build netem tools--they're not installed and require HOSTCC substituteInPlace Makefile --replace " netem " " " @@ -19,11 +22,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; makeFlags = [ - "DESTDIR=" - "LIBDIR=$(out)/lib" + "PREFIX=$(out)" "SBINDIR=$(out)/sbin" - "MANDIR=$(out)/share/man" - "BASH_COMPDIR=$(out)/share/bash-completion/completions" "DOCDIR=$(TMPDIR)/share/doc/${pname}" # Don't install docs "HDRDIR=$(dev)/include/iproute2" ]; @@ -36,17 +36,13 @@ stdenv.mkDerivation rec { "CONFDIR=$(out)/etc/iproute2" ]; + nativeBuildInputs = [ bison flex pkg-config ]; buildInputs = [ db iptables libelf libmnl ]; - nativeBuildInputs = [ bison flex pkgconfig ]; enableParallelBuilding = true; - postInstall = '' - PATH=${bash}/bin:$PATH patchShebangs $out/sbin - ''; - meta = with stdenv.lib; { - homepage = https://wiki.linuxfoundation.org/networking/iproute2; + homepage = "https://wiki.linuxfoundation.org/networking/iproute2"; description = "A collection of utilities for controlling TCP/IP networking and traffic control in Linux"; platforms = platforms.linux; license = licenses.gpl2; -- cgit v1.2.3 From 94f2a76718d30acee9fe16ae8c7b24f349c3cd75 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 6 Apr 2020 13:51:21 +0200 Subject: iproute: Build the netem tools They will be installed now and we can provide $HOSTCC for cross-compilation. New files: +lib/tc/experimental.dist +lib/tc/normal.dist +lib/tc/pareto.dist +lib/tc/paretonormal.dist Note: The distributions are generated in a reproducible way. Co-Authored-By: Benjamin Saunders --- pkgs/os-specific/linux/iproute/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index fd7417839a1..9f6df0fccd5 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, bison, flex, pkg-config +, buildPackages, bison, flex, pkg-config , db, iptables, libelf, libmnl }: @@ -15,8 +15,6 @@ stdenv.mkDerivation rec { preConfigure = '' # Don't try to create /var/lib/arpd: sed -e '/ARPDDIR/d' -i Makefile - # Don't build netem tools--they're not installed and require HOSTCC - substituteInPlace Makefile --replace " netem " " " ''; outputs = [ "out" "dev" ]; @@ -36,6 +34,7 @@ stdenv.mkDerivation rec { "CONFDIR=$(out)/etc/iproute2" ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; # netem requires $HOSTCC nativeBuildInputs = [ bison flex pkg-config ]; buildInputs = [ db iptables libelf libmnl ]; -- cgit v1.2.3 From 34999b030cd7933b0ba1a3904be4370b68a42cf3 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Fri, 1 Nov 2019 14:01:02 +0100 Subject: waylandpp: 0.2.5 -> 0.2.7, make it split-output package --- pkgs/applications/video/kodi/default.nix | 4 ++-- pkgs/development/libraries/waylandpp/default.nix | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index fcb6ed4860b..76fae544ac4 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -183,7 +183,7 @@ in stdenv.mkDerivation { ++ lib.optional usbSupport libusb ++ lib.optional vdpauSupport libvdpau ++ lib.optionals useWayland [ - wayland waylandpp + wayland waylandpp.dev # Not sure why ".dev" is needed here, but CMake doesn't find libxkbcommon otherwise libxkbcommon.dev ] @@ -200,7 +200,7 @@ in stdenv.mkDerivation { which pkgconfig gnumake autoconf automake libtool # still needed for some components. Check if that is the case with 19.0 - ] ++ lib.optionals useWayland [ wayland-protocols ]; + ] ++ lib.optionals useWayland [ wayland-protocols waylandpp.bin ]; cmakeFlags = [ "-Dlibdvdcss_URL=${libdvdcss.src}" diff --git a/pkgs/development/libraries/waylandpp/default.nix b/pkgs/development/libraries/waylandpp/default.nix index 4fd94a29f9c..51e141b66f9 100644 --- a/pkgs/development/libraries/waylandpp/default.nix +++ b/pkgs/development/libraries/waylandpp/default.nix @@ -1,19 +1,27 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, pugixml, wayland, libGL }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, pugixml, wayland, libGL +, docSupport ? true, doxygen ? null }: +assert docSupport -> doxygen != null; + +with stdenv.lib; stdenv.mkDerivation rec { pname = "waylandpp"; - version = "0.2.5"; + version = "0.2.7"; src = fetchFromGitHub { owner = "NilsBrause"; repo = pname; rev = version; - sha256 = "16h57hzd688664qcyznzhjp3hxipdkzgv46x82yhkww24av8b55n"; + sha256 = "1r4m0xhvwpcqxrqvp3hz1bzlkxqj2jiymd5r6hj8xjzz536hyprz"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig ] ++ optional docSupport doxygen; buildInputs = [ pugixml wayland libGL ]; + outputs = [ "bin" "dev" "lib" "out" ] ++ optionals docSupport [ "doc" "devman" ]; + + cmakeFlags = [ "-DCMAKE_INSTALL_DATADIR=${placeholder "dev"}" ]; + meta = with stdenv.lib; { description = "Wayland C++ binding"; homepage = https://github.com/NilsBrause/waylandpp/; -- cgit v1.2.3 From d0dbdfea4f4d3b5444a154f67e0b5215196d0c34 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 11 Mar 2020 23:40:57 -0400 Subject: git: fix cross compilation --- pkgs/applications/version-management/git-and-tools/git/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 02df27e745f..2e8be30ac49 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -80,6 +80,8 @@ stdenv.mkDerivation { configureFlags = stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "ac_cv_fread_reads_directories=yes" "ac_cv_snprintf_returns_bogus=no" + "ac_cv_iconv_omits_bom=no" + "ac_cv_prog_CURL_CONFIG=${curl.dev}/bin/curl-config" ]; preBuild = '' -- cgit v1.2.3 From 0f41c1582f612f1384eb316a39aa943cd6fed767 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 10 Mar 2020 18:55:56 -0400 Subject: cracklib: only use local binaries on native build --- pkgs/development/libraries/cracklib/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/cracklib/default.nix b/pkgs/development/libraries/cracklib/default.nix index ea3f5e6476b..66cab45bf7a 100644 --- a/pkgs/development/libraries/cracklib/default.nix +++ b/pkgs/development/libraries/cracklib/default.nix @@ -18,10 +18,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) buildPackages.cracklib; buildInputs = [ zlib gettext ]; - postPatch = '' + postPatch = stdenv.lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' chmod +x util/cracklib-format patchShebangs util + '' + '' ln -vs ${toString wordlists} dicts/ ''; -- cgit v1.2.3 From f8347478a8a1aceb9cc4a7df518b444eea756ab6 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 10 Mar 2020 22:57:39 -0400 Subject: vulkan-loader: make cmake a native build input --- pkgs/development/libraries/vulkan-loader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index b1f2663e7f8..17938542106 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { sha256 = "12n4mxc6db89258k8i47ql1zna7k94lkwv7lpxg39nm8ypa1ywrv"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake python3 xlibsWrapper libxcb libXrandr libXext wayland ]; + nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ python3 xlibsWrapper libxcb libXrandr libXext wayland ]; enableParallelBuilding = true; preConfigure = '' -- cgit v1.2.3 From 139fd8b3978931a4d0056d87dcebbc47307c32ec Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 26 Feb 2020 18:12:13 -0500 Subject: gdk-pixbuf: support cross compilation - add glib to nativeBuildInputs - only update loaders cache on native builds --- pkgs/development/libraries/gdk-pixbuf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix index 0ecbb35c167..b44fd34ac9d 100644 --- a/pkgs/development/libraries/gdk-pixbuf/default.nix +++ b/pkgs/development/libraries/gdk-pixbuf/default.nix @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig gettext python3 libxml2 libxslt docbook_xsl docbook_xml_dtd_43 - gtk-doc gobject-introspection makeWrapper + gtk-doc gobject-introspection makeWrapper glib ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; @@ -68,7 +68,7 @@ in stdenv.mkDerivation rec { + '' moveToOutput "bin" "$dev" moveToOutput "bin/gdk-pixbuf-thumbnailer" "$out" - + '' + stdenv.lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' # We need to install 'loaders.cache' in lib/gdk-pixbuf-2.0/2.10.0/ $dev/bin/gdk-pixbuf-query-loaders --update-cache ''; -- cgit v1.2.3 From 3a71e62c5646dab388af04743cbadda1f8374cb9 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 3 Mar 2020 23:03:53 -0500 Subject: plymouth: set systemd-tty-ask-password-agent path This is needed in cross where systemd is not in path. --- pkgs/os-specific/linux/plymouth/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/plymouth/default.nix b/pkgs/os-specific/linux/plymouth/default.nix index 1a8e3685e9c..ccce9de0e32 100644 --- a/pkgs/os-specific/linux/plymouth/default.nix +++ b/pkgs/os-specific/linux/plymouth/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libxslt, docbook_xsl -, gtk3, udev, systemd +, gtk3, udev, systemd, lib }: stdenv.mkDerivation rec { @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { "--enable-pango" "--enable-gdm-transition" "--enable-gtk" + "ac_cv_path_SYSTEMD_ASK_PASSWORD_AGENT=${lib.getBin systemd}/bin/systemd-tty-ask-password-agent" ]; configurePlatforms = [ "host" ]; -- cgit v1.2.3 From 65b967fd381a21e655e44da4d5b39f0660c63bbe Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 6 Mar 2020 21:35:56 -0500 Subject: libva: add wayland as native build input Also set wayland-scanner to proper path --- pkgs/development/libraries/libva/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index 0d00c9cb253..ef8cc54dae1 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -2,6 +2,7 @@ , libXext, libdrm, libXfixes, wayland, libffi, libX11 , libGL, mesa , minimal ? false, libva-minimal +, buildPackages }: stdenv.mkDerivation rec { @@ -18,7 +19,7 @@ stdenv.mkDerivation rec { outputs = [ "dev" "out" ]; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig wayland ]; buildInputs = [ libdrm ] ++ lib.optionals (!minimal) [ libva-minimal libX11 libXext libXfixes wayland libffi libGL ]; @@ -29,6 +30,7 @@ stdenv.mkDerivation rec { configureFlags = [ # Add FHS paths for non-NixOS applications. "--with-drivers-path=${mesa.drivers.driverLink}/lib/dri:/usr/lib/dri:/usr/lib32/dri" + "ac_cv_path_WAYLAND_SCANNER=${buildPackages.wayland}/bin/wayland-scanner" ] ++ lib.optionals (!minimal) [ "--enable-glx" ]; installFlags = [ -- cgit v1.2.3 From 777a2b4c56d7c3658771a0109acabaec92997db8 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 6 Mar 2020 17:54:01 -0500 Subject: xorg.libXScrnSaver: add utilmacros and malloc 0 --- pkgs/servers/x11/xorg/overrides.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 58ebc6d984e..7a58210b051 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -258,6 +258,12 @@ self: super: outputs = [ "out" "dev" "devdoc" ]; }); + libXScrnSaver = super.libXScrnSaver.overrideAttrs (attrs: { + buildInputs = with self; attrs.buildInputs ++ [ utilmacros ]; + configureFlags = attrs.configureFlags or [] + ++ malloc0ReturnsNullCrossFlag; + }); + libXv = super.libXv.overrideAttrs (attrs: { outputs = [ "out" "dev" "devdoc" ]; configureFlags = attrs.configureFlags or [] -- cgit v1.2.3 From 80be56bd6afc51f62b629672ff1d80423dfbd8b1 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 27 Feb 2020 18:00:20 -0500 Subject: epiphany: include gtk3 build dependency --- pkgs/desktops/gnome-3/core/epiphany/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix index 22793c6e7dc..bbe8b0ff947 100644 --- a/pkgs/desktops/gnome-3/core/epiphany/default.nix +++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix @@ -68,6 +68,7 @@ stdenv.mkDerivation rec { python3 wrapGAppsHook buildPackages.glib + buildPackages.gtk3 ]; buildInputs = [ -- cgit v1.2.3 From 36109cda6e909fa2f121df70c5150a2a222569d3 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 28 Feb 2020 11:54:40 -0500 Subject: glib: put gsettings directory in target These should be runtime, not build time deps --- pkgs/development/libraries/glib/setup-hook.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib/setup-hook.sh b/pkgs/development/libraries/glib/setup-hook.sh index 5d9c330b62e..8ead5510ec4 100644 --- a/pkgs/development/libraries/glib/setup-hook.sh +++ b/pkgs/development/libraries/glib/setup-hook.sh @@ -1,4 +1,3 @@ - make_glib_find_gsettings_schemas() { # For packages that need gschemas of other packages (e.g. empathy) for maybe_dir in "$1"/share/gsettings-schemas/*; do @@ -7,7 +6,7 @@ make_glib_find_gsettings_schemas() { fi done } -addEnvHooks "$hostOffset" make_glib_find_gsettings_schemas +addEnvHooks "$targetOffset" make_glib_find_gsettings_schemas # Install gschemas, if any, in a package-specific directory glibPreInstallPhase() { -- cgit v1.2.3 From 93a8887531ac95f3b5bf0b6a0520908ddf711df5 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 28 Feb 2020 11:55:45 -0500 Subject: hicolor-icon-theme: only add target icons to deps --- pkgs/data/icons/hicolor-icon-theme/setup-hook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh b/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh index f07bab4b269..f7c99418144 100644 --- a/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh +++ b/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh @@ -10,4 +10,4 @@ hicolorIconThemeHook() { } # I think this is meant to be a runtime dep -addEnvHooks "${hostOffset:?}" hicolorIconThemeHook +addEnvHooks "${targetOffset:?}" hicolorIconThemeHook -- cgit v1.2.3 From 6c5983a291530f040deb97881e80cca373a5b29e Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 28 Feb 2020 14:12:16 -0500 Subject: gdk-pixbuf: make target env hook MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Unfortunately, we need to emulate the system to get a real cache. Native version doesn’t know the right paths. --- nixos/modules/services/x11/gdk-pixbuf.nix | 4 ++-- pkgs/development/libraries/gdk-pixbuf/setup-hook.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/x11/gdk-pixbuf.nix b/nixos/modules/services/x11/gdk-pixbuf.nix index 9ad926369ec..e6a24a2f1a3 100644 --- a/nixos/modules/services/x11/gdk-pixbuf.nix +++ b/nixos/modules/services/x11/gdk-pixbuf.nix @@ -19,7 +19,7 @@ let continue fi GDK_PIXBUF_MODULEDIR="$module_dir" \ - ${pkgs.gdk-pixbuf.dev}/bin/gdk-pixbuf-query-loaders + ${pkgs.stdenv.hostPlatform.emulator pkgs.buildPackages} ${pkgs.gdk-pixbuf.dev}/bin/gdk-pixbuf-query-loaders done ) > "$out" ''; @@ -37,7 +37,7 @@ in # If there is any package configured in modulePackages, we generate the # loaders.cache based on that and set the environment variable # GDK_PIXBUF_MODULE_FILE to point to it. - config = mkIf (cfg.modulePackages != []) { + config = mkIf (cfg.modulePackages != [] || pkgs.stdenv.hostPlatform != pkgs.stdenv.buildPlatform) { environment.variables = { GDK_PIXBUF_MODULE_FILE = "${loadersCache}"; }; diff --git a/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh b/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh index 06958be3213..bdfd00009dc 100644 --- a/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh +++ b/pkgs/development/libraries/gdk-pixbuf/setup-hook.sh @@ -14,4 +14,4 @@ findGdkPixbufLoaders() { } -addEnvHooks "$hostOffset" findGdkPixbufLoaders +addEnvHooks "$targetOffset" findGdkPixbufLoaders -- cgit v1.2.3 From 8a5059e1cc717299b4e58459c70591e12db0fca2 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 4 Mar 2020 11:23:36 -0500 Subject: fontconfig: only generate cache on native compilation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We can’t cross-compile the cache, so just skip it for now. --- nixos/modules/config/fonts/fontconfig.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index 3bfa1893a8b..6ac64b0ec9c 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -45,6 +45,9 @@ let # generate the font cache setting file for a fontconfig version # use latest when no version is passed + # When cross-compiling, we can’t generate the cache, so we skip the + # part. fontconfig still works but is a little slower in + # looking things up. makeCacheConf = { version ? null }: let fcPackage = if version == null @@ -60,11 +63,13 @@ let ${concatStringsSep "\n" (map (font: "${font}") config.fonts.fonts)} + ${optionalString (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) '' ${cache} ${optionalString (pkgs.stdenv.isx86_64 && cfg.cache32Bit) '' ${cache32} ''} + ''} ''; -- cgit v1.2.3 From 7cc40e15e46033924d9d141b3869a94d9d31a973 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 28 Feb 2020 12:04:10 -0500 Subject: treewide/nixos: use stdenv.cc.libc instead of glibc when available MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This prevents duplication in cross-compiled nixos machines. The bootstrapped glibc differs from the natively compiled one, so we get two glibc’s in the closure. To reduce closure size, just use stdenv.cc.libc where available. --- nixos/modules/config/networking.nix | 2 +- nixos/modules/services/system/nscd.nix | 12 ++++++++---- pkgs/top-level/unix-tools.nix | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index dd36696b94d..03944de8249 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -197,7 +197,7 @@ in } // optionalAttrs (pkgs.stdenv.hostPlatform.libc == "glibc") { # /etc/rpc: RPC program numbers. - rpc.source = pkgs.glibc.out + "/etc/rpc"; + rpc.source = pkgs.stdenv.cc.libc.out + "/etc/rpc"; }; networking.proxy.envVars = diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix index e11f7e049d8..af26dd84707 100644 --- a/nixos/modules/services/system/nscd.nix +++ b/nixos/modules/services/system/nscd.nix @@ -7,6 +7,10 @@ let nssModulesPath = config.system.nssModules.path; cfg = config.services.nscd; + nscd = if pkgs.stdenv.hostPlatform.libc == "glibc" + then pkgs.stdenv.cc.libc.bin + else pkgs.glibc.bin; + in { @@ -59,16 +63,16 @@ in # files. So prefix the ExecStart command with "!" to prevent systemd # from dropping privileges early. See ExecStart in systemd.service(5). serviceConfig = - { ExecStart = "!@${pkgs.glibc.bin}/sbin/nscd nscd"; + { ExecStart = "!@${nscd}/sbin/nscd nscd"; Type = "forking"; DynamicUser = true; RuntimeDirectory = "nscd"; PIDFile = "/run/nscd/nscd.pid"; Restart = "always"; ExecReload = - [ "${pkgs.glibc.bin}/sbin/nscd --invalidate passwd" - "${pkgs.glibc.bin}/sbin/nscd --invalidate group" - "${pkgs.glibc.bin}/sbin/nscd --invalidate hosts" + [ "${nscd}/sbin/nscd --invalidate passwd" + "${nscd}/sbin/nscd --invalidate group" + "${nscd}/sbin/nscd --invalidate hosts" ]; }; }; diff --git a/pkgs/top-level/unix-tools.nix b/pkgs/top-level/unix-tools.nix index 56bab2fe411..cdad9de61f4 100644 --- a/pkgs/top-level/unix-tools.nix +++ b/pkgs/top-level/unix-tools.nix @@ -66,12 +66,12 @@ let linux = pkgs.utillinux; }; getconf = { - linux = if stdenv.hostPlatform.libc == "glibc" then pkgs.glibc + linux = if stdenv.hostPlatform.libc == "glibc" then pkgs.stdenv.cc.libc else pkgs.netbsd.getconf; darwin = pkgs.darwin.system_cmds; }; getent = { - linux = if stdenv.hostPlatform.libc == "glibc" then pkgs.glibc + linux = if stdenv.hostPlatform.libc == "glibc" then pkgs.stdenv.cc.libc else pkgs.netbsd.getent; darwin = pkgs.netbsd.getent; }; -- cgit v1.2.3 From 24f8bad37cceed22fffb5908c69c7fa5c8596c92 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 3 Mar 2020 23:08:24 -0500 Subject: libXres: enable cross-compilation - adds utilmacros - set null malloc flag --- pkgs/servers/x11/xorg/overrides.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 7a58210b051..fc3adf2c660 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -256,6 +256,9 @@ self: super: libXres = super.libXres.overrideAttrs (attrs: { outputs = [ "out" "dev" "devdoc" ]; + buildInputs = with self; attrs.buildInputs ++ [ utilmacros ]; + configureFlags = attrs.configureFlags or [] + ++ malloc0ReturnsNullCrossFlag; }); libXScrnSaver = super.libXScrnSaver.overrideAttrs (attrs: { -- cgit v1.2.3 From e446334824295c62c3cc121a644f7eb559564ed8 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 4 Mar 2020 20:50:17 -0500 Subject: libvpx: set proper target name - Needs to be like --gcc. - Remove unneeded --enable-external-build flag This confuses the feature detection and is not needed for cross compilation anymore. --- pkgs/development/libraries/libvpx/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix index ddde03e2876..ecb0268bb52 100644 --- a/pkgs/development/libraries/libvpx/default.nix +++ b/pkgs/development/libraries/libvpx/default.nix @@ -135,16 +135,10 @@ stdenv.mkDerivation rec { experimentalFpMbStatsSupport || experimentalEmulateHardwareSupport) "experimental") ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - #"--extra-cflags=" - #"--extra-cxxflags=" - #"--prefix=" - #"--libc=" - #"--libdir=" - "--enable-external-build" # libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version) # See all_platforms: https://github.com/webmproject/libvpx/blob/master/configure # Darwin versions: 10.4=8, 10.5=9, 10.6=10, 10.7=11, 10.8=12, 10.9=13, 10.10=14 - "--force-target=${stdenv.hostPlatform.config}${ + "--force-target=${stdenv.hostPlatform.parsed.cpu.name}-${stdenv.hostPlatform.parsed.kernel.name}${ if stdenv.hostPlatform.isDarwin then if stdenv.hostPlatform.osxMinVersion == "10.10" then "14" else if stdenv.hostPlatform.osxMinVersion == "10.9" then "13" -- cgit v1.2.3 From 0bbdba2d119caa0fccf48529cf374df7075403d2 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 7 Mar 2020 17:08:58 -0500 Subject: =?UTF-8?q?bluez:=20don=E2=80=99t=20build=20python=20packages=20wh?= =?UTF-8?q?en=20tests=20are=20disabled?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Can’t run these on cross anyway --- pkgs/os-specific/linux/bluez/default.nix | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix index 29b100a33c5..b8bedbe9f1b 100644 --- a/pkgs/os-specific/linux/bluez/default.nix +++ b/pkgs/os-specific/linux/bluez/default.nix @@ -11,9 +11,13 @@ , readline , systemd , udev -}: - -stdenv.mkDerivation rec { +}: let + pythonPath = with python3.pkgs; [ + dbus-python + pygobject3 + recursivePthLoader + ]; +in stdenv.mkDerivation rec { pname = "bluez"; version = "5.54"; @@ -22,12 +26,6 @@ stdenv.mkDerivation rec { sha256 = "1p2ncvjz6alr9n3l5wvq2arqgc7xjs6dqyar1l9jp0z8cfgapkb8"; }; - pythonPath = with python3.pkgs; [ - dbus-python - pygobject3 - recursivePthLoader - ]; - buildInputs = [ alsaLib dbus @@ -44,7 +42,7 @@ stdenv.mkDerivation rec { python3.pkgs.wrapPython ]; - outputs = [ "out" "dev" "test" ]; + outputs = [ "out" "dev" ] ++ lib.optional doCheck "test"; postPatch = '' substituteInPlace tools/hid2hci.rules \ @@ -79,7 +77,7 @@ stdenv.mkDerivation rec { doCheck = stdenv.hostPlatform.isx86_64; - postInstall = '' + postInstall = lib.optionalString doCheck '' mkdir -p $test/{bin,test} cp -a test $test pushd $test/test @@ -94,8 +92,8 @@ stdenv.mkDerivation rec { ln -s ../test/$a $test/bin/bluez-$a done popd - wrapPythonProgramsIn $test/test "$test/test $pythonPath" - + wrapPythonProgramsIn $test/test "$test/test ${toString pythonPath}" + '' + '' # for bluez4 compatibility for NixOS mkdir $out/sbin ln -s ../libexec/bluetooth/bluetoothd $out/sbin/bluetoothd -- cgit v1.2.3 From 024877e7b2ae4aca95c6867313414bdf6460b4f1 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 7 Mar 2020 17:09:49 -0500 Subject: alsa-plugins: move pkgconfig to native --- pkgs/os-specific/linux/alsa-plugins/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix index b524d7906da..a69d86c5c4d 100644 --- a/pkgs/os-specific/linux/alsa-plugins/default.nix +++ b/pkgs/os-specific/linux/alsa-plugins/default.nix @@ -9,9 +9,11 @@ stdenv.mkDerivation rec { sha256 = "0z9k3ssbfk2ky2w13avgyf202j1drsz9sv3834bp33cj1i2hc3qw"; }; + nativeBuildInputs = [ pkgconfig ]; + # ToDo: a52, etc.? buildInputs = - [ pkgconfig alsaLib libogg ] + [ alsaLib libogg ] ++ lib.optional (libpulseaudio != null) libpulseaudio ++ lib.optional (libjack2 != null) libjack2; -- cgit v1.2.3 From a656aeb7f134a3ac8376dcf527cf29327d2d796e Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 7 Mar 2020 17:12:03 -0500 Subject: libvisual: fix null malloc check on cross this is needed to build --- pkgs/development/libraries/libvisual/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/libvisual/default.nix b/pkgs/development/libraries/libvisual/default.nix index 6e8e2d95b6b..28d4331daaa 100644 --- a/pkgs/development/libraries/libvisual/default.nix +++ b/pkgs/development/libraries/libvisual/default.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" + ]; + meta = { description = "An abstraction library for audio visualisations"; homepage = https://sourceforge.net/projects/libvisual/; -- cgit v1.2.3 From 99355cc2e453b9ada4c3e7cff1f1599956fb34cf Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Sat, 7 Mar 2020 17:14:15 -0500 Subject: libasyncns: override malloc null check in cross This is needed to build and avoid malloc error. --- pkgs/development/libraries/libasyncns/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/libasyncns/default.nix b/pkgs/development/libraries/libasyncns/default.nix index f7805c9f375..feb6400ab06 100644 --- a/pkgs/development/libraries/libasyncns/default.nix +++ b/pkgs/development/libraries/libasyncns/default.nix @@ -8,6 +8,11 @@ stdenv.mkDerivation rec { sha256 = "0x5b6lcic4cd7q0bx00x93kvpyzl7n2abbgvqbrlzrfb8vknc6jg"; }; + configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" + ]; + meta = with stdenv.lib; { homepage = http://0pointer.de/lennart/projects/libasyncns/; description = "A C library for Linux/Unix for executing name service queries asynchronously"; -- cgit v1.2.3 From 71a9eb80e78698efcf4cdcdd10e66933d276c5bf Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 1 Apr 2020 22:17:58 -0400 Subject: waylandpp: fix cross compilation - add libffi dependency - provide wayland-scanner++ when cross compiling --- pkgs/development/libraries/waylandpp/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/waylandpp/default.nix b/pkgs/development/libraries/waylandpp/default.nix index 4fd94a29f9c..d2f41ede5c9 100644 --- a/pkgs/development/libraries/waylandpp/default.nix +++ b/pkgs/development/libraries/waylandpp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, pugixml, wayland, libGL }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, pugixml, wayland, libGL, libffi, buildPackages }: stdenv.mkDerivation rec { pname = "waylandpp"; @@ -11,8 +11,10 @@ stdenv.mkDerivation rec { sha256 = "16h57hzd688664qcyznzhjp3hxipdkzgv46x82yhkww24av8b55n"; }; + cmakeFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DWAYLAND_SCANNERPP=${buildPackages.waylandpp}/bin/wayland-scanner++"; + nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ pugixml wayland libGL ]; + buildInputs = [ pugixml wayland libGL libffi ]; meta = with stdenv.lib; { description = "Wayland C++ binding"; -- cgit v1.2.3 From 5c80a3585ba05a8179c51bd4889c31432f70dc70 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 1 Apr 2020 22:18:53 -0400 Subject: tinyxml2: fix cross compilation - use native unzip - add target prefix to LD --- pkgs/development/libraries/tinyxml/2.6.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix index 0cc4038b64e..22c7f6934d9 100644 --- a/pkgs/development/libraries/tinyxml/2.6.2.nix +++ b/pkgs/development/libraries/tinyxml/2.6.2.nix @@ -23,14 +23,14 @@ in stdenv.mkDerivation { ./2.6.2-cxx.patch ]; - preConfigure = "export LD=${if stdenv.isDarwin then "clang++" else "g++"}"; + preConfigure = "export LD=${stdenv.cc.targetPrefix}c++"; hardeningDisable = [ "format" ]; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-mmacosx-version-min=10.9"; - buildInputs = [ unzip ]; + nativeBuildInputs = [ unzip ]; buildPhase = '' # use STL (xbmc requires it) sed '1i#define TIXML_USE_STL 1' -i tinyxml.h -- cgit v1.2.3 From 5256aa688f097363ca701e60ca567799b9fed603 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 1 Apr 2020 22:20:21 -0400 Subject: libcrossguid: get prefixed utility --- pkgs/development/libraries/libcrossguid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcrossguid/default.nix b/pkgs/development/libraries/libcrossguid/default.nix index e5c09675c4b..ccd87544c68 100644 --- a/pkgs/development/libraries/libcrossguid/default.nix +++ b/pkgs/development/libraries/libcrossguid/default.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid ]; buildPhase = '' - g++ -c guid.cpp -o guid.o $CXXFLAGS -std=c++11 -DGUID_LIBUUID - ar rvs libcrossguid.a guid.o + $CXX -c guid.cpp -o guid.o $CXXFLAGS -std=c++11 -DGUID_LIBUUID + $AR rvs libcrossguid.a guid.o ''; installPhase = '' mkdir -p $out/{lib,include} -- cgit v1.2.3 From 433d5178ca50dd8225f5963b7cbec8da4ab70db9 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 1 Apr 2020 22:22:59 -0400 Subject: setup-hooks/auto-patchelf.sh: get prefixed readelf --- pkgs/build-support/setup-hooks/auto-patchelf.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/build-support/setup-hooks/auto-patchelf.sh index 52c50091d08..72970623ed7 100644 --- a/pkgs/build-support/setup-hooks/auto-patchelf.sh +++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh @@ -15,7 +15,7 @@ isExecutable() { # *or* there is an INTERP section. This also catches position-independent # executables, as they typically have an INTERP section but their ELF type # is DYN. - isExeResult="$(LANG=C readelf -h -l "$1" 2> /dev/null \ + isExeResult="$(LANG=C $READELF -h -l "$1" 2> /dev/null \ | grep '^ *Type: *EXEC\>\|^ *INTERP\>')" # not using grep -q, because it can cause Broken pipe [ -n "$isExeResult" ] @@ -207,7 +207,7 @@ autoPatchelf() { # outside of this function. while IFS= read -r -d $'\0' file; do isELF "$file" || continue - segmentHeaders="$(LANG=C readelf -l "$file")" + segmentHeaders="$(LANG=C $READELF -l "$file")" # Skip if the ELF file doesn't have segment headers (eg. object files). # not using grep -q, because it can cause Broken pipe [ -n "$(echo "$segmentHeaders" | grep '^Program Headers:')" ] || continue -- cgit v1.2.3 From 72363f71bf1168366c90f811824b0b405908d88f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 1 Apr 2020 22:23:48 -0400 Subject: libcec: get native cmake for cross --- pkgs/development/libraries/libcec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix index 070cb58149c..5f1de76a99c 100644 --- a/pkgs/development/libraries/libcec/default.nix +++ b/pkgs/development/libraries/libcec/default.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation { sha256 = "02j09y06csaic4m0fyb4dr9l3hl15nxbbniwq0i1qlccpxjak0j3"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake udev libcec_platform ] ++ + nativeBuildInputs = [ pkgconfig cmake ]; + buildInputs = [ udev libcec_platform ] ++ stdenv.lib.optional (libraspberrypi != null) libraspberrypi; cmakeFlags = [ "-DBUILD_SHARED_LIBS=1" ]; -- cgit v1.2.3 From a1c6dea2734bf51992feb28852179db9c7f18c17 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 1 Apr 2020 22:24:45 -0400 Subject: libcdio: get native help2man --- pkgs/development/libraries/libcdio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index 9c3132a3e63..92af7edee77 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { patchShebangs . ''; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libcddb ncurses help2man ] + nativeBuildInputs = [ pkgconfig help2man ]; + buildInputs = [ libcddb ncurses ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Carbon IOKit ]; doCheck = !stdenv.isDarwin; -- cgit v1.2.3 From bedd47ed4baaa227a7caa919044d3e929f6617ee Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 1 Apr 2020 22:25:22 -0400 Subject: libcddb: force malloc and realloc This needs to be set to avoid having undefined malloc symbol. --- pkgs/development/libraries/libcddb/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/libcddb/default.nix b/pkgs/development/libraries/libcddb/default.nix index 591369df83f..9911ea7625f 100644 --- a/pkgs/development/libraries/libcddb/default.nix +++ b/pkgs/development/libraries/libcddb/default.nix @@ -10,6 +10,11 @@ stdenv.mkDerivation rec { buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv; + configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "ac_cv_func_malloc_0_nonnull=yes" + "ac_cv_func_realloc_0_nonnull=yes" + ]; + doCheck = false; # fails 3 of 5 tests with locale errors meta = with stdenv.lib; { -- cgit v1.2.3 From 7887d50ae4990cf1e8187d5c036535bd796a2de2 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 1 Apr 2020 22:26:48 -0400 Subject: ftgl: add --with-ft-prefix for finding freetype freetype-config is not in PATH when cross-compiling. We need to provide our own. --- pkgs/development/libraries/ftgl/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix index a99228efcf4..dd99d60a689 100644 --- a/pkgs/development/libraries/ftgl/default.nix +++ b/pkgs/development/libraries/ftgl/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation { [ libGL libGLU ]) ; + configureFlags = [ "--with-ft-prefix=${stdenv.lib.getDev freetype}" ]; + enableParallelBuilding = true; meta = { -- cgit v1.2.3 From 89dac3c856b22d6fe9ac743da8dcd39943ad3e6d Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 1 Apr 2020 22:30:57 -0400 Subject: =?UTF-8?q?flatbuffers:=20don=E2=80=99t=20build=20tests=20when=20c?= =?UTF-8?q?ross=20compiling?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/flatbuffers/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix index 11e86703616..ac6a848949e 100644 --- a/pkgs/development/libraries/flatbuffers/default.nix +++ b/pkgs/development/libraries/flatbuffers/default.nix @@ -18,7 +18,9 @@ stdenv.mkDerivation (rec { nativeBuildInputs = [ cmake ]; enableParallelBuilding = true; - doCheck = true; + cmakeFlags = [ "-DFLATBUFFERS_BUILD_TESTS=${if doCheck then "ON" else "OFF"}" ]; + + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; checkTarget = "test"; meta = { -- cgit v1.2.3 From 97309f7fa247f9d9df637f8c91cb8be6e49fe3a8 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 2 Apr 2020 14:01:33 -0400 Subject: fstrcmp: patch for cross Patches fstrcmp to cross-compile --- pkgs/development/libraries/fstrcmp/cross.patch | 24 ++++++++++++++++++++++++ pkgs/development/libraries/fstrcmp/default.nix | 6 ++++-- 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/fstrcmp/cross.patch diff --git a/pkgs/development/libraries/fstrcmp/cross.patch b/pkgs/development/libraries/fstrcmp/cross.patch new file mode 100644 index 00000000000..f794e3b91da --- /dev/null +++ b/pkgs/development/libraries/fstrcmp/cross.patch @@ -0,0 +1,24 @@ +diff '--color=auto' -ur fstrcmp-0.7-D001-old/configure.ac fstrcmp-0.7.D001/configure.ac +--- fstrcmp-0.7-D001-old/configure.ac 2014-03-04 19:13:45.000000000 -0500 ++++ fstrcmp-0.7.D001/configure.ac 2020-04-02 13:57:52.805154634 -0400 +@@ -32,6 +32,8 @@ + AC_OBJEXT + AC_EXEEXT + ++LT_INIT ++ + dnl @synopsis AC_ADD_CFLAGS + dnl + dnl Add the given option to CFLAGS, if it doesn't break the compiler +diff '--color=auto' -ur fstrcmp-0.7-D001-old/Makefile.in fstrcmp-0.7.D001/Makefile.in +--- fstrcmp-0.7-D001-old/Makefile.in 2014-03-04 19:13:45.000000000 -0500 ++++ fstrcmp-0.7.D001/Makefile.in 2020-04-02 13:57:12.355269595 -0400 +@@ -37,6 +37,8 @@ + srcdir = @srcdir@ + VPATH = @srcdir@ + ++top_builddir = $(srcdir) ++ + # + # the name of the install program to use + # diff --git a/pkgs/development/libraries/fstrcmp/default.nix b/pkgs/development/libraries/fstrcmp/default.nix index 5e8197d5e81..0a5a35ec77b 100644 --- a/pkgs/development/libraries/fstrcmp/default.nix +++ b/pkgs/development/libraries/fstrcmp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, libtool, ghostscript, groff }: +{ stdenv, fetchzip, libtool, ghostscript, groff, autoreconfHook }: stdenv.mkDerivation rec { pname = "fstrcmp"; @@ -9,9 +9,11 @@ stdenv.mkDerivation rec { sha256 = "0yg3y3k0wz50gmhgigfi2dx725w1gc8snb95ih7vpcnj6kabgz9a"; }; + patches = [ ./cross.patch ]; + outputs = [ "out" "dev" "doc" "man" "devman" ]; - nativeBuildInputs = [ libtool ghostscript groff ]; + nativeBuildInputs = [ libtool ghostscript groff autoreconfHook ]; enableParallelBuilding = true; -- cgit v1.2.3 From dcb8c6fa8b389a44f7d72883705499213bb089fe Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 3 Apr 2020 23:52:33 -0400 Subject: kodi: fix cross compilation - provide native binaries - set cpu / os / etc. flags - fix wayland compilation --- pkgs/applications/video/kodi/default.nix | 74 +++++++++++++++++++++++--------- 1 file changed, 54 insertions(+), 20 deletions(-) diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index fcb6ed4860b..e917d58cbbd 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -4,22 +4,20 @@ , boost, avahi, lame, autoreconfHook , gettext, pcre-cpp, yajl, fribidi, which , openssl, gperf, tinyxml2, taglib, libssh, swig, jre -, libX11, xorgproto, libxml2 -, libXt, libXmu, libXext -, libXinerama, libXrandr -, libXtst, libXfixes, systemd +, libxml2, systemd , alsaLib, libGLU, libGL, glew, fontconfig, freetype, ftgl , libjpeg, libpng, libtiff , libmpeg2, libsamplerate, libmad , libogg, libvorbis, flac, libxslt , lzo, libcdio, libmodplug, libass, libbluray , sqlite, libmysqlclient, nasm, gnutls, libva, libdrm -, curl, bzip2, zip, unzip, glxinfo, xdpyinfo +, curl, bzip2, zip, unzip, glxinfo , libcec, libcec_platform, dcadec, libuuid , libcrossguid, libmicrohttpd -, bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1, libXdmcp +, bluez, doxygen, giflib, glib, harfbuzz, lcms2, libidn, libpthreadstubs, libtasn1 , libplist, p11-kit, zlib, flatbuffers, fmt, fstrcmp, rapidjson , lirc +, x11Support ? true, libX11, xorgproto, libXt, libXmu, libXext, libXinerama, libXrandr, libXtst, libXfixes, xdpyinfo, libXdmcp , dbusSupport ? true, dbus ? null , joystickSupport ? true, cwiid ? null , nfsSupport ? true, libnfs ? null @@ -32,6 +30,7 @@ , useWayland ? false, wayland ? null, wayland-protocols ? null , waylandpp ? null, libxkbcommon ? null , useGbm ? false, mesa ? null, libinput ? null +, buildPackages }: assert dbusSupport -> dbus != null; @@ -94,10 +93,18 @@ let sha256 = "1krsjlr949iy5l6ljxancza1yi6w1annxc5s6k283i9mb15qy8cy"; preConfigure = '' cp ${kodi_src}/tools/depends/target/ffmpeg/{CMakeLists.txt,*.cmake} . + sed -i 's/ --cpu=''${CPU}//' CMakeLists.txt + sed -i 's/--strip=''${CMAKE_STRIP}/--strip=''${CMAKE_STRIP} --ranlib=''${CMAKE_RANLIB}/' CMakeLists.txt ''; - buildInputs = [ gnutls libidn libtasn1 p11-kit zlib libva ] + cmakeFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DCROSSCOMPILING=ON" + "-DCPU=${stdenv.hostPlatform.parsed.cpu.name}" + "-DOS=${stdenv.hostPlatform.parsed.kernel.name}" + "-DPKG_CONFIG_EXECUTABLE=pkgconfig" + ]; + buildInputs = [ libidn libtasn1 p11-kit zlib libva ] ++ lib.optional vdpauSupport libvdpau; - nativeBuildInputs = [ cmake nasm pkgconfig ]; + nativeBuildInputs = [ cmake nasm pkgconfig gnutls ]; }; # We can build these externally but FindLibDvd.cmake forces us to build it @@ -152,29 +159,31 @@ in stdenv.mkDerivation { buildInputs = [ gnutls libidn libtasn1 nasm p11-kit - libxml2 yasm python2Packages.python + libxml2 python2Packages.python boost libmicrohttpd gettext pcre-cpp yajl fribidi libva libdrm - openssl gperf tinyxml2 taglib libssh swig jre - libX11 xorgproto libXt libXmu libXext - libXinerama libXrandr libXtst libXfixes - alsaLib libGL libGLU glew fontconfig freetype ftgl + openssl gperf tinyxml2 taglib libssh + alsaLib libGL libGLU fontconfig freetype ftgl libjpeg libpng libtiff libmpeg2 libsamplerate libmad libogg libvorbis flac libxslt systemd lzo libcdio libmodplug libass libbluray sqlite libmysqlclient avahi lame - curl bzip2 zip unzip glxinfo xdpyinfo + curl bzip2 zip unzip glxinfo libcec libcec_platform dcadec libuuid libgcrypt libgpgerror libunistring - libcrossguid cwiid libplist - bluez giflib glib harfbuzz lcms2 libpthreadstubs libXdmcp + libcrossguid libplist + bluez giflib glib harfbuzz lcms2 libpthreadstubs ffmpeg flatbuffers fmt fstrcmp rapidjson lirc # libdvdcss libdvdnav libdvdread ] + ++ lib.optional x11Support [ + libX11 xorgproto libXt libXmu libXext libXdmcp + libXinerama libXrandr libXtst libXfixes + ] ++ lib.optional dbusSupport dbus - ++ lib.optionals joystickSupport [ cwiid ] + ++ lib.optional joystickSupport cwiid ++ lib.optional nfsSupport libnfs ++ lib.optional pulseSupport libpulseaudio ++ lib.optional rtmpSupport rtmpdump @@ -183,7 +192,7 @@ in stdenv.mkDerivation { ++ lib.optional usbSupport libusb ++ lib.optional vdpauSupport libvdpau ++ lib.optionals useWayland [ - wayland waylandpp + wayland waylandpp wayland-protocols # Not sure why ".dev" is needed here, but CMake doesn't find libxkbcommon otherwise libxkbcommon.dev ] @@ -200,8 +209,16 @@ in stdenv.mkDerivation { which pkgconfig gnumake autoconf automake libtool # still needed for some components. Check if that is the case with 19.0 + jre yasm gettext python2Packages.python flatbuffers + + # for TexturePacker + giflib zlib libpng libjpeg lzo ] ++ lib.optionals useWayland [ wayland-protocols ]; + depsBuildBuild = [ + buildPackages.stdenv.cc + ]; + cmakeFlags = [ "-Dlibdvdcss_URL=${libdvdcss.src}" "-Dlibdvdnav_URL=${libdvdnav.src}" @@ -210,9 +227,14 @@ in stdenv.mkDerivation { "-DENABLE_EVENTCLIENTS=ON" "-DENABLE_INTERNAL_CROSSGUID=OFF" "-DENABLE_OPTICAL=ON" + "-DLIRC_DEVICE=/run/lirc/lircd" + "-DSWIG_EXECUTABLE=${buildPackages.swig}/bin/swig" + "-DFLATBUFFERS_FLATC_EXECUTABLE=${buildPackages.flatbuffers}/bin/flatc" + "-DPYTHON_EXECUTABLE=${buildPackages.python2Packages.python}/bin/python" ] ++ lib.optional useWayland [ "-DCORE_PLATFORM_NAME=wayland" "-DWAYLAND_RENDER_SYSTEM=gl" + "-DWAYLANDPP_SCANNER=${buildPackages.waylandpp}/bin/wayland-scanner++" ] ++ lib.optional useGbm [ "-DCORE_PLATFORM_NAME=gbm" "-DGBM_RENDER_SYSTEM=gles" @@ -224,6 +246,16 @@ in stdenv.mkDerivation { # I'm guessing there is a thing waiting to time out doCheck = false; + # Need these tools on the build system when cross compiling, + # hacky, but have found no other way. + preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + CXX=c++ LD=ld make -C tools/depends/native/JsonSchemaBuilder + cmakeFlags+=" -DWITH_JSONSCHEMABUILDER=$PWD/tools/depends/native/JsonSchemaBuilder/bin" + + CXX=c++ LD=ld make EXTRA_CONFIGURE= -C tools/depends/native/TexturePacker + cmakeFlags+=" -DWITH_TEXTUREPACKER=$PWD/tools/depends/native/TexturePacker/bin" + ''; + postPatch = '' substituteInPlace xbmc/platform/linux/LinuxTimezone.cpp \ --replace 'usr/share/zoneinfo' 'etc/zoneinfo' @@ -232,9 +264,11 @@ in stdenv.mkDerivation { postInstall = '' for p in $(ls $out/bin/) ; do wrapProgram $out/bin/$p \ - --prefix PATH ":" "${lib.makeBinPath [ python2Packages.python glxinfo xdpyinfo ]}" \ + --prefix PATH ":" "${lib.makeBinPath ([ python2Packages.python glxinfo ] ++ lib.optional x11Support xdpyinfo)}" \ --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath - ([ curl systemd libmad libvdpau libcec libcec_platform rtmpdump libass ] ++ lib.optional nfsSupport libnfs)}" + ([ curl systemd libmad libvdpau libcec libcec_platform libass ] + ++ lib.optional nfsSupport libnfs + ++ lib.optional rtmpSupport rtmpdump)}" done substituteInPlace $out/share/xsessions/kodi.desktop \ -- cgit v1.2.3 From 51ab06286322c76de70faaaf330b827426dd0f21 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 6 Apr 2020 11:04:25 -0400 Subject: dvtm: add ncurses dev input to PATH fixes cross compilation --- pkgs/tools/misc/dvtm/dvtm.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/dvtm/dvtm.nix b/pkgs/tools/misc/dvtm/dvtm.nix index df2e25c7ea3..a472d92ff17 100644 --- a/pkgs/tools/misc/dvtm/dvtm.nix +++ b/pkgs/tools/misc/dvtm/dvtm.nix @@ -9,6 +9,7 @@ stdenv.mkDerivation { cp ${builtins.toFile "config.h" customConfig} ./config.h ''; + nativeBuildInputs = [ ncurses ]; buildInputs = [ ncurses ]; prePatch = '' @@ -16,9 +17,7 @@ stdenv.mkDerivation { --replace /usr/share/terminfo $out/share/terminfo ''; - installPhase = '' - make PREFIX=$out install - ''; + makeFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { description = "Dynamic virtual terminal manager"; -- cgit v1.2.3 From c6ff360cc437d366c10f2f827edd5a7fb47e73c3 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 6 Apr 2020 11:05:02 -0400 Subject: python-dbusmock: avoid eval error when missing test output of bluez MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes an evaluation error that occurs when we don’t have bluez.test. getOutput defaults to "out" in these cases. --- pkgs/development/python-modules/python-dbusmock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-dbusmock/default.nix b/pkgs/development/python-modules/python-dbusmock/default.nix index 9cfc68dee46..9ab69612295 100644 --- a/pkgs/development/python-modules/python-dbusmock/default.nix +++ b/pkgs/development/python-modules/python-dbusmock/default.nix @@ -44,12 +44,12 @@ buildPythonPackage rec { checkInputs = [ nose dbus dbus-python which pycodestyle pyflakes - pygobject3 bluez bluez.test networkmanager + pygobject3 bluez (lib.getOutput "test" bluez) networkmanager ]; checkPhase = '' runHook preCheck - export PATH="$PATH:${bluez.test}/test"; + export PATH="$PATH:${lib.getOutput "test" bluez}/test"; nosetests -v runHook postCheck ''; -- cgit v1.2.3 From 75bb71bc7043a8d8ed1d9840057d015a906bd9e8 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 7 Apr 2020 16:48:32 +0200 Subject: pokerth: use mkDerivation from Qt --- pkgs/games/pokerth/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/pokerth/default.nix b/pkgs/games/pokerth/default.nix index 2e4ce270b82..d39d1d49869 100644 --- a/pkgs/games/pokerth/default.nix +++ b/pkgs/games/pokerth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, runCommand, fetchpatch, patchutils, qmake, qtbase +{ mkDerivation, stdenv, fetchFromGitHub, runCommand, fetchpatch, patchutils, qmake, qtbase , SDL, SDL_mixer, boost, curl, gsasl, libgcrypt, libircclient, protobuf, sqlite , tinyxml2, target ? "client" }: @@ -15,7 +15,7 @@ let ''; in -stdenv.mkDerivation rec { +mkDerivation rec { name = "pokerth-${target}-${version}"; version = "1.1.2"; @@ -65,7 +65,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - homepage = https://www.pokerth.net; + homepage = "https://www.pokerth.net"; description = "Poker game ${target}"; license = licenses.gpl3; maintainers = with maintainers; [ obadz yegortimoshenko ]; -- cgit v1.2.3 From cd00bc2ccd329744228be9ef3f979258947ccf4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 5 Apr 2020 20:04:15 +0200 Subject: atk: 2.35.1 -> 2.36.0 --- pkgs/development/libraries/atk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix index 10009c26d82..7dfb78bd575 100644 --- a/pkgs/development/libraries/atk/default.nix +++ b/pkgs/development/libraries/atk/default.nix @@ -4,7 +4,7 @@ let pname = "atk"; - version = "2.35.1"; + version = "2.36.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 = "111qajn7kxwmh40drc8i6jc3hnril2rp63n207q92pl47zx614xy"; + sha256 = "1217cmmykjgkkim0zr1lv5j13733m4w5vipmy4ivw0ll6rz28xpv"; }; outputs = [ "out" "dev" ]; -- cgit v1.2.3 From 95abd75a5940e2e066bbe6ced2cdb9300a722607 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 5 Apr 2020 20:04:45 +0200 Subject: librsvg: 2.48.0 -> 2.48.2 --- pkgs/development/libraries/librsvg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index 9767ea4fdeb..3aef4f8e772 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -4,14 +4,14 @@ let pname = "librsvg"; - version = "2.48.0"; + version = "2.48.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "19ndf9l99wcrmkwcrk20vd1ggrwgldksfz1kkj786ljcrxv8nd2a"; + sha256 = "1jmxd03fs8vkwycxpmx69kdfmgq52g64bhv82gmj3kjgw2h5h9i7"; }; outputs = [ "out" "dev" "installedTests" ]; -- cgit v1.2.3 From 34a0147072498354d9ff5dfcdad74c6c2d498569 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 5 Apr 2020 20:05:16 +0200 Subject: libsecret: 0.20.1 -> 0.20.2 --- pkgs/development/libraries/libsecret/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index a756caea8ef..8235b2e0d6b 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "libsecret"; - version = "0.20.1"; + version = "0.20.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0ir4ynpf8b64xss1azvsi5x6697lik7hkf3z0xxa2qv2xja3xxsp"; + sha256 = "1hzz34gmsxxf1jm1b7qin390rkwbg8sx198xdkwxqp3q6cw19sc1"; }; postPatch = '' -- cgit v1.2.3 From 29f47af27390a0ea5b6739515c315e5993bef55c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 5 Apr 2020 20:06:14 +0200 Subject: glib-networking: 2.64.0 -> 2.64.1 --- pkgs/development/libraries/glib-networking/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 0eb5cb4225d..6b684fb7db9 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.64.0"; + version = "2.64.1"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1fm1462v7z556qivlwflvc3qpz36jwpzqxxvsihh45j7aka2gnjw"; + sha256 = "0wmg5n2h0r1rcdmp4w48akqlsbpjrjrj6p59g5ylc5yqyzg4dhx4"; }; patches = [ -- cgit v1.2.3 From 247bddd3116917c00470c4da296f1c1c2fd38136 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 5 Apr 2020 20:06:50 +0200 Subject: gobject-introspection: 1.64.0 -> 1.64.1 --- pkgs/development/libraries/gobject-introspection/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index cf889c28204..d2988b5e6a9 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -10,11 +10,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "gobject-introspection"; - version = "1.64.0"; + version = "1.64.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "10pwykfnk7pw8k9k8iz3p72phxvyrh5q4d7gr3ysv08w15immh7a"; + sha256 = "19vz7vp10h0zj3f491yk72dp89bix6rgkzxg4qcm4d6151ksxgl0"; }; outputs = [ "out" "dev" "man" ]; -- cgit v1.2.3 From 4df94369519a724fdcb55ea2d0a7afc851ca7a82 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Tue, 7 Apr 2020 21:03:13 +0100 Subject: heatseeker: fix finding stty Otherwise this crashes at runtime. I've opened https://github.com/rschmitt/heatseeker/issues/42 upstream. --- pkgs/tools/misc/heatseeker/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/heatseeker/default.nix b/pkgs/tools/misc/heatseeker/default.nix index 22a7d8ec4a7..e0b8c02a08e 100644 --- a/pkgs/tools/misc/heatseeker/default.nix +++ b/pkgs/tools/misc/heatseeker/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ stdenv, fetchFromGitHub, rustPlatform, coreutils }: rustPlatform.buildRustPackage rec { pname = "heatseeker"; @@ -13,6 +13,13 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0jnlcm7v29m4nc318qgf7r7jvs80s7n04fw83imm506vwr9rxbx9"; + # https://github.com/rschmitt/heatseeker/issues/42 + # I've suggested using `/usr/bin/env stty`, but doing that isn't quite as simple + # as a substitution, and this works since we have the path to coreutils stty. + patchPhase = '' + substituteInPlace src/screen/unix.rs --replace "/bin/stty" "${coreutils}/bin/stty" + ''; + # some tests require a tty, this variable turns them off for Travis CI, # which we can also make use of TRAVIS = "true"; -- cgit v1.2.3 From f5afc20d0649428bb99ed4a4048d38e71e380dc4 Mon Sep 17 00:00:00 2001 From: Alex Branham Date: Wed, 8 Apr 2020 10:01:19 -0400 Subject: R: Update CRAN and bioconductor packages --- pkgs/development/r-modules/bioc-packages.nix | 28 +- pkgs/development/r-modules/cran-packages.nix | 5544 +++++++++++++------------- pkgs/development/r-modules/default.nix | 16 - 3 files changed, 2870 insertions(+), 2718 deletions(-) diff --git a/pkgs/development/r-modules/bioc-packages.nix b/pkgs/development/r-modules/bioc-packages.nix index a85290708fc..c02ea4dda4a 100644 --- a/pkgs/development/r-modules/bioc-packages.nix +++ b/pkgs/development/r-modules/bioc-packages.nix @@ -123,7 +123,7 @@ in with self; { CGHcall = derive2 { name="CGHcall"; version="2.44.0"; sha256="1k65kaiqvjyllzbpa2367n6f6kkmsy463kpflzs66hqhx2fshsmi"; depends=[Biobase CGHbase DNAcopy impute snowfall]; }; 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]; }; + CHARGE = derive2 { name="CHARGE"; version="1.2.0"; sha256="0230pvgsf775lq4n9cpxb95bqq438f4z0wx9mmbj4yir8bljy0mk"; depends=[cluster diptest factoextra FactoMineR GenomicRanges IRanges matrixStats plyr SummarizedExperiment]; }; 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]; }; @@ -192,12 +192,12 @@ in with self; { CopywriteR = derive2 { name="CopywriteR"; version="2.14.1"; sha256="1hbiw0m9hmx4na9v502pxf8y5wvxzr68r4d3fqr2755gxx86qck6"; depends=[BiocParallel chipseq CopyhelpeR data_table DNAcopy futile_logger GenomeInfoDb GenomicAlignments GenomicRanges gtools IRanges matrixStats Rsamtools S4Vectors]; }; CorMut = derive2 { name="CorMut"; version="1.24.0"; sha256="1p4xj8f5hf1z31943s51inc0mc28bphzy5qs4ay2nccwshbypq0l"; depends=[igraph seqinr]; }; Cormotif = derive2 { name="Cormotif"; version="1.28.0"; sha256="0lb691mvr9zim7z5yplncmlzyr799jym1wvrgfm1diqjz2daixai"; depends=[affy limma]; }; - CountClust = derive2 { name="CountClust"; version="1.10.1"; sha256="1b129r97wv3gm25pk3ccg5bmp2476jyhz1pphapqlrb1im3fixq6"; depends=[cowplot flexmix ggplot2 gtools limma maptpx picante plyr reshape2 slam SQUAREM]; }; + CountClust = derive2 { name="CountClust"; version="1.10.1"; sha256="1b129r97wv3gm25pk3ccg5bmp2476jyhz1pphapqlrb1im3fixq6"; depends=[cowplot flexmix ggplot2 gtools limma picante plyr reshape2 slam SQUAREM]; }; CoverageView = derive2 { name="CoverageView"; version="1.20.1"; sha256="164lla4v6ll0kqzapm3kmwz39k5shl0cwwashpbwiixrrxhcy8d2"; depends=[GenomicAlignments GenomicRanges IRanges Rsamtools rtracklayer S4Vectors]; }; CrispRVariants = derive2 { name="CrispRVariants"; version="1.10.1"; sha256="0n1mw3ybbdaybbcms12cj4vy21wahq5srny0qnbxjlzyl1zjbpr0"; depends=[AnnotationDbi BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridExtra IRanges reshape2 Rsamtools S4Vectors]; }; CytoDx = derive2 { name="CytoDx"; version="1.2.1"; sha256="05apvaf4dmkdfsp2aary14i7znjyzk0k6rqcbsk6m98fkp3d9r8b"; depends=[doParallel dplyr flowCore glmnet rpart rpart_plot]; }; CytoML = derive2 { name="CytoML"; version="1.8.1"; sha256="18isg4kjdn975q8vpziisnyxj1jxm4lkq7hi9jy4imf7bffc234i"; depends=[base64enc Biobase data_table flowCore flowUtils flowWorkspace ggcyto graph jsonlite ncdfFlow openCyto plyr RBGL Rgraphviz XML]; }; - DAPAR = derive2 { name="DAPAR"; version="1.14.5"; sha256="0s09y5kpivaichzmfchksaayxchdmqgldcba0waxfxzsapwfb9p1"; depends=[AnnotationDbi Cairo clusterProfiler cp4p DAPARdata doParallel dplyr factoextra FactoMineR foreach ggplot2 gplots graph highcharter imp4p impute knitr lattice limma lme4 Matrix MSnbase norm openxlsx pcaMethods png preprocessCore RColorBrewer readxl reshape2 scales siggenes stringr tidyr tidyverse tmvtnorm vioplot vsn]; }; + DAPAR = derive2 { name="DAPAR"; version="1.14.5"; sha256="0s09y5kpivaichzmfchksaayxchdmqgldcba0waxfxzsapwfb9p1"; depends=[AnnotationDbi Cairo clusterProfiler cp4p DAPARdata doParallel dplyr factoextra FactoMineR foreach ggplot2 gplots graph highcharter impute knitr lattice limma lme4 Matrix MSnbase norm openxlsx pcaMethods png preprocessCore RColorBrewer readxl reshape2 scales siggenes stringr tidyr tidyverse tmvtnorm vioplot vsn]; }; DART = derive2 { name="DART"; version="1.30.0"; sha256="0dxwy95p43c0shx30y95sj1pl64kqkh2bsnj680q196zgyg937s6"; depends=[igraph]; }; DBChIP = derive2 { name="DBChIP"; version="1.26.0"; sha256="1wk8nvfcfhsymhbi6id0kd1jzcykh6hhikl2040g0v6gi252gv2v"; depends=[DESeq edgeR]; }; DChIPRep = derive2 { name="DChIPRep"; version="1.12.0"; sha256="1avcjr7r54grh3yn5pjbzji3syc8vvah9as7asv3cwmyqzaya4r0"; depends=[assertthat ChIPpeakAnno DESeq2 fdrtool GenomicRanges ggplot2 plyr purrr reshape2 S4Vectors smoothmest soGGi SummarizedExperiment tidyr]; }; @@ -225,7 +225,7 @@ in with self; { DNABarcodes = derive2 { name="DNABarcodes"; version="1.12.0"; sha256="0g6j7ish0fk9jcib94wssjgp1m8ldcp42hyyg1ypr945fa3xghx0"; depends=[BH Matrix Rcpp]; }; DNAcopy = derive2 { name="DNAcopy"; version="1.56.0"; sha256="04cqdqxhva66xwh1s2vffi56b9fcrqd4slcrvqasj5lp2rkjli82"; depends=[]; }; DNAshapeR = derive2 { name="DNAshapeR"; version="1.10.0"; sha256="1rplgi36jn33npihhmk0vdsiali814y5v1wz5fdna3k9b47id6b6"; depends=[Biostrings fields GenomicRanges Rcpp]; }; - DOQTL = derive2 { name="DOQTL"; version="1.18.0"; sha256="0ligqm4l2x5dz794djapri770j27rhibhdzc48y980768gjpkm8k"; depends=[annotate annotationTools Biobase BiocGenerics biomaRt BSgenome_Mmusculus_UCSC_mm10 corpcor doParallel foreach fpc GenomicRanges hwriter IRanges iterators mclust QTLRel regress rhdf5 Rsamtools RUnit VariantAnnotation XML]; }; + DOQTL = derive2 { name="DOQTL"; version="1.18.0"; sha256="0ligqm4l2x5dz794djapri770j27rhibhdzc48y980768gjpkm8k"; depends=[annotate annotationTools Biobase BiocGenerics biomaRt BSgenome_Mmusculus_UCSC_mm10 corpcor doParallel foreach fpc GenomicRanges hwriter IRanges iterators mclust QTLRel rhdf5 Rsamtools RUnit VariantAnnotation XML]; }; DOSE = derive2 { name="DOSE"; version="3.8.2"; sha256="1gh7dhvfc71kawxcfx8xqlir7mwvg5mmz4lqrdrvw5knvi2h3mfa"; depends=[AnnotationDbi BiocParallel DO_db fgsea ggplot2 GOSemSim qvalue reshape2 S4Vectors]; }; DRIMSeq = derive2 { name="DRIMSeq"; version="1.10.1"; sha256="021xzx7ndvjdahi715qvq2xxnnhdsn9h8g6imps5ls3qmk5024d2"; depends=[BiocGenerics BiocParallel edgeR GenomicRanges ggplot2 IRanges limma MASS reshape2 S4Vectors]; }; DSS = derive2 { name="DSS"; version="2.30.1"; sha256="0m18793vqaqamx3rj3pwrirc7ygmmg4774il8d59qmwinlppyxqw"; depends=[Biobase bsseq DelayedArray]; }; @@ -370,7 +370,7 @@ in with self; { GoogleGenomics = derive2 { name="GoogleGenomics"; version="2.4.0"; sha256="0xcj10r85hxh5qy43cjb6ypd849b5wphhhv528simxq4glhgrhxp"; depends=[Biobase Biostrings GenomeInfoDb GenomicAlignments GenomicRanges httr IRanges rjson Rsamtools S4Vectors VariantAnnotation]; }; GraphAT = derive2 { name="GraphAT"; version="1.54.0"; sha256="1xfd0i0j1fai58c15mc3lrg2jc4iwswyfpyg0ff5hnyhmgr3wnsa"; depends=[graph MCMCpack]; }; GraphAlignment = derive2 { name="GraphAlignment"; version="1.46.0"; sha256="1qql33ikps9x0dkvc31sxvyf8w119ax7519v5bv35s3i5yxh16i6"; depends=[]; }; - GraphPAC = derive2 { name="GraphPAC"; version="1.24.0"; sha256="0dwh3xshp74isq3rljlivks04mw4r0vgzg74qwyc2ar5b2j96bbg"; depends=[igraph iPAC TSP]; }; + GraphPAC = derive2 { name="GraphPAC"; version="1.24.0"; sha256="0dwh3xshp74isq3rljlivks04mw4r0vgzg74qwyc2ar5b2j96bbg"; depends=[igraph iPAC RMallow TSP]; }; GreyListChIP = derive2 { name="GreyListChIP"; version="1.14.0"; sha256="1hsjv4r88ldb7pgl5a3im8vdhmbiaj0rrn0clij7jfh5p5r81r1r"; depends=[BSgenome GenomeInfoDb GenomicAlignments GenomicRanges MASS Rsamtools rtracklayer SummarizedExperiment]; }; Guitar = derive2 { name="Guitar"; version="1.20.1"; sha256="1d4j54jdnsi8gi6p0kk6zxkk6kzd1r1k77mw142xlvh8b6zrl3nq"; depends=[GenomicAlignments GenomicFeatures GenomicRanges ggplot2 IRanges Rsamtools rtracklayer]; }; Gviz = derive2 { name="Gviz"; version="1.26.5"; sha256="1dpkcaar7qgzg3vgafvkplprhwmhzpb7ph009kr6ajm36hx4z81c"; depends=[AnnotationDbi Biobase BiocGenerics biomaRt Biostrings biovizBase BSgenome digest GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges IRanges lattice latticeExtra matrixStats RColorBrewer Rsamtools rtracklayer S4Vectors XVector]; }; @@ -491,8 +491,8 @@ in with self; { MSnID = derive2 { name="MSnID"; version="1.16.1"; sha256="077n6ljcnnl7q4w0qj8v46vm4sjk9vzzfqf7wsc6lz0wmyzqdng3"; depends=[Biobase data_table doParallel dplyr foreach iterators MSnbase mzID mzR ProtGenerics R_cache Rcpp reshape2]; }; MSnbase = derive2 { name="MSnbase"; version="2.8.3"; sha256="1kl1d7byphnfpmbl5fzbgs68dxskhpsdyx7ka51bpfn0nv3pp492"; depends=[affy Biobase BiocGenerics BiocParallel digest ggplot2 impute IRanges lattice MALDIquant MASS mzID mzR pcaMethods plyr preprocessCore ProtGenerics Rcpp S4Vectors scales vsn XML]; }; MSstats = derive2 { name="MSstats"; version="3.14.1"; sha256="1bgvdq1mfq6rxjf5ag2slrhy4056906wghsirrymf53nw3qz5g6s"; depends=[data_table doSNOW dplyr foreach ggplot2 ggrepel gplots limma lme4 marray MASS minpack_lm preprocessCore randomForest reshape2 snow stringr survival tidyr]; }; - MSstatsQC = derive2 { name="MSstatsQC"; version="2.0.1"; sha256="1f6gv1fqm5h6xs91wc1bamyri47qggb872qzriwzvff7ydn0q1ag"; depends=[dplyr ggExtra ggplot2 MSnbase plotly qcmetrics RecordLinkage]; }; - MSstatsQCgui = derive2 { name="MSstatsQCgui"; version="1.2.1"; sha256="1k7dhiayf885ax1mg03yg1w4mamk3j1gsm7phszxl3i0j3c2gks7"; depends=[dplyr ggExtra gridExtra MSstatsQC plotly RecordLinkage shiny]; }; + MSstatsQC = derive2 { name="MSstatsQC"; version="2.0.1"; sha256="1f6gv1fqm5h6xs91wc1bamyri47qggb872qzriwzvff7ydn0q1ag"; depends=[dplyr ggExtra ggplot2 MSnbase plotly qcmetrics]; }; + MSstatsQCgui = derive2 { name="MSstatsQCgui"; version="1.2.1"; sha256="1k7dhiayf885ax1mg03yg1w4mamk3j1gsm7phszxl3i0j3c2gks7"; depends=[dplyr ggExtra gridExtra MSstatsQC plotly shiny]; }; MSstatsTMT = derive2 { name="MSstatsTMT"; version="1.1.2"; sha256="0aaw3qillcfrjczdmd7s21v551hclnq8fn2zvn91wyr4i82q43rr"; depends=[data_table dplyr ggplot2 limma lme4 matrixStats MSstats nlme reshape2 tidyr]; }; MTseeker = derive2 { name="MTseeker"; version="1.0.6"; sha256="0fsb7k6pkl15q8csygpsjrz4jvy20mfd5rfmhl7q7ffj4d7sprxh"; depends=[Biobase BiocGenerics Biostrings circlize GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges gmapR Homo_sapiens IRanges jsonlite Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation VariantTools viridis xml2]; }; MVCClass = derive2 { name="MVCClass"; version="1.56.0"; sha256="1hw36gd1z19dir6fl7j3dzqzi5p1668zbwpcz7l21hbyycv27l0j"; depends=[]; }; @@ -602,7 +602,7 @@ in with self; { PepsNMR = derive2 { name="PepsNMR"; version="1.0.2"; sha256="0x7n8faxrczqwn1kkcp22vwag905pswvr2q198kqbh4fjkxgkmrx"; depends=[ggplot2 gridExtra Matrix matrixStats ptw reshape2]; }; PharmacoGx = derive2 { name="PharmacoGx"; version="1.12.0"; sha256="1ddh6bmrddbdmqdpmyy5mlkqvhrk39c19lzybrirfclq6cydfh5g"; depends=[Biobase caTools downloader lsa magicaxis piano RColorBrewer reshape2]; }; PhenStat = derive2 { name="PhenStat"; version="2.18.1"; sha256="1fq01k4cb4gyzh9knbidcqds2qm1wvlz114s6nldzhl3h0x5h6x5"; depends=[car corrplot ggplot2 graph knitr lme4 logistf MASS msgps nlme nortest pingr reshape SmoothWin]; }; - Pi = derive2 { name="Pi"; version="1.10.0"; sha256="03wzmcz57kdflicjb2wmnxg0fvfmbgizvql5164cf24fsi2lvbgi"; depends=[caret dnet GenomeInfoDb GenomicRanges ggbio ggplot2 ggrepel glmnet Gviz igraph lattice MASS Matrix plot3D randomForest ROCR scales supraHex XGR]; }; + Pi = derive2 { name="Pi"; version="1.10.0"; sha256="03wzmcz57kdflicjb2wmnxg0fvfmbgizvql5164cf24fsi2lvbgi"; depends=[caret dnet GenomeInfoDb GenomicRanges ggbio ggplot2 ggrepel glmnet Gviz igraph lattice MASS Matrix plot3D randomForest ROCR scales supraHex]; }; Pigengene = derive2 { name="Pigengene"; version="1.8.1"; sha256="13pmw7nf8fvn9bnnh7fwqgrlg589796nqv83snanqwqsp4fcklid"; depends=[bnlearn C50 GO_db graph impute MASS matrixStats partykit pheatmap preprocessCore Rgraphviz WGCNA]; }; Polyfit = derive2 { name="Polyfit"; version="1.16.1"; sha256="0nlclhj5ni09blwf5prpcp2iiflqk17ca3gqjl5shvl9y9v8nbqb"; depends=[DESeq]; }; PowerExplorer = derive2 { name="PowerExplorer"; version="1.2.2"; sha256="14dzv3p79x95w6185r2srnmw1i8n6x2b1fd2chbx42b3xa65xliy"; depends=[Biobase BiocParallel data_table DESeq2 ggplot2 gridExtra MASS ROTS S4Vectors SummarizedExperiment vsn]; }; @@ -670,7 +670,7 @@ in with self; { 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.4"; sha256="1zvbin60p81qyk2c0m88dl94ivzyf4cpjdf2hnw8igmvlxszmb8k"; depends=[GENLIB gRain kinship2 snpStats]; }; + RVS = derive2 { name="RVS"; version="1.4.4"; sha256="1zvbin60p81qyk2c0m88dl94ivzyf4cpjdf2hnw8igmvlxszmb8k"; depends=[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]; }; @@ -932,7 +932,7 @@ in with self; { celaref = derive2 { name="celaref"; version="1.0.1"; sha256="0sb1mg2ql09jf7hc5kszh3h9cajma0pdwzf8f58pridwhafw5z0p"; depends=[BiocGenerics dplyr ggplot2 magrittr MAST Matrix readr rlang S4Vectors SummarizedExperiment tibble]; }; cellGrowth = derive2 { name="cellGrowth"; version="1.26.1"; sha256="0zmn45i6shr2d6q2dg2p2raz38cy6k8363maq4r4648fx2bmvkb2"; depends=[lattice locfit]; }; cellHTS2 = derive2 { name="cellHTS2"; version="2.46.1"; sha256="1fj1gshgphbbqhywwzvm3xrw8zfp19dc8fi6kbzv20ikf3am9fml"; depends=[Biobase BiocGenerics Category genefilter GSEABase hwriter locfit prada RColorBrewer splots vsn]; }; - cellTree = derive2 { name="cellTree"; version="1.12.1"; sha256="1qr68f39bqykvjbjp5bw71g41wfp369yc88dqz9wppkzi16vl6z0"; depends=[gplots igraph maptpx slam topGO topicmodels xtable]; }; + cellTree = derive2 { name="cellTree"; version="1.12.1"; sha256="1qr68f39bqykvjbjp5bw71g41wfp369yc88dqz9wppkzi16vl6z0"; depends=[gplots igraph slam topGO topicmodels xtable]; }; cellbaseR = derive2 { name="cellbaseR"; version="1.6.1"; sha256="0052wvb6jijs1v8yv1z049n6cy4qcjbrv20gqbsgl14xj0mif26x"; depends=[BiocParallel data_table doParallel foreach httr jsonlite pbapply R_utils Rsamtools tidyr]; }; cellity = derive2 { name="cellity"; version="1.10.1"; sha256="1ifm50ff9q6lwxyi52qzksimnwvd8yddrp7jkidzlykamh5dg05p"; depends=[AnnotationDbi e1071 ggplot2 mvoutlier org_Hs_eg_db org_Mm_eg_db robustbase topGO]; }; cellscape = derive2 { name="cellscape"; version="1.6.0"; sha256="062x43n5jq8hwlrlgd1ffgbpnifac79j9dzd35f6phb6vc1g63dl"; depends=[dplyr gtools htmlwidgets jsonlite plyr reshape2 stringr]; }; @@ -969,7 +969,7 @@ in with self; { coGPS = derive2 { name="coGPS"; version="1.26.0"; sha256="0jsbgx6xdasqii9wcfn4ilf2dfc790lzzby1bhpzlq94nwlr896h"; depends=[]; }; coMET = derive2 { name="coMET"; version="1.14.0"; sha256="09r81ag9ix4jh3zvwyzym9g7rc7vkyhagcv934r8i4fzzvpiqsz4"; depends=[biomaRt colortools corrplot GenomicRanges gridExtra Gviz hash IRanges psych rtracklayer S4Vectors]; }; coRdon = derive2 { name="coRdon"; version="1.0.3"; sha256="1v4zvzff4r54wjgp48l5vazvfy8w0gvvqxxhajm35p6d2bbpfsvd"; depends=[Biobase Biostrings data_table dplyr ggplot2 purrr stringr]; }; - cobindR = derive2 { name="cobindR"; version="1.20.0"; sha256="1bkwjj825srwm3rn3j88p1q35x03f129ca1hk919nnf92psh47nc"; depends=[BiocGenerics biomaRt Biostrings BSgenome gmp gplots IRanges mclust rtfbs seqinr yaml]; }; + cobindR = derive2 { name="cobindR"; version="1.20.0"; sha256="1bkwjj825srwm3rn3j88p1q35x03f129ca1hk919nnf92psh47nc"; depends=[BiocGenerics biomaRt Biostrings BSgenome gmp gplots IRanges mclust seqinr yaml]; }; codelink = derive2 { name="codelink"; version="1.50.0"; sha256="1nfnb9iz8j31ia9979mjvs9gzdbh9zwfy14qxvjrp3dv8d1gf2rx"; depends=[annotate Biobase BiocGenerics limma]; }; coexnet = derive2 { name="coexnet"; version="1.4.0"; sha256="0751781vsr46xs3dpq2n29li1zipzad9qv6xnfdm34v62yaggy94"; depends=[acde affy Biobase GEOquery igraph limma minet rmarkdown siggenes STRINGdb SummarizedExperiment vsn]; }; cogena = derive2 { name="cogena"; version="1.16.0"; sha256="12r86h6fzr6wqvf70jjxf02zm72ks577m6qcv60wiss609c0b0dn"; depends=[amap apcluster Biobase biwt class cluster corrplot devtools doParallel dplyr fastcluster foreach ggplot2 gplots kohonen mclust reshape2]; }; @@ -1336,7 +1336,7 @@ in with self; { nem = derive2 { name="nem"; version="2.56.0"; sha256="02j5rm0h9bjghgba244k0acshbnhrr38ghvx6cmf8za8fw19k3v2"; depends=[boot e1071 graph limma plotrix RBGL RColorBrewer Rgraphviz statmod]; }; netReg = derive2 { name="netReg"; version="1.6.0"; sha256="01qxq7zlbmvh0mazw069fm6bjw0ks90baj8y5i0jc7m101dsm2qi"; depends=[Rcpp RcppArmadillo]; }; netSmooth = derive2 { name="netSmooth"; version="1.2.0"; sha256="1cz3rca9ig9jl8ddcadbij129v5rpb86ncfrdmfj4m9qy0krlyac"; depends=[cluster clusterExperiment data_table entropy Matrix scater SingleCellExperiment SummarizedExperiment]; }; - netbenchmark = derive2 { name="netbenchmark"; version="1.14.0"; sha256="1gc8dnma4pr1j9wq422x8xh89mvb15kyvjvv86fhhshvdisihngw"; depends=[c3net corpcor fdrtool GeneNet GENIE3 grndata Matrix minet PCIT pracma Rcpp]; }; + netbenchmark = derive2 { name="netbenchmark"; version="1.14.0"; sha256="1gc8dnma4pr1j9wq422x8xh89mvb15kyvjvv86fhhshvdisihngw"; depends=[c3net corpcor fdrtool GeneNet GENIE3 grndata Matrix minet pracma Rcpp]; }; netbiov = derive2 { name="netbiov"; version="1.16.0"; sha256="0zg4wkf4z6yi84sdp4h8dg8cq5sm6m04abg15hm68y27vw42prs2"; depends=[igraph]; }; nethet = derive2 { name="nethet"; version="1.14.0"; sha256="1xp08ad4lsmrjgvqydr85k4y0b57hcaxicndh4hz4plqswzl7qpf"; depends=[CompQuadForm GeneNet ggm ggplot2 glasso glmnet GSA huge ICSNP limma mclust multtest mvtnorm network parcor]; }; netprioR = derive2 { name="netprioR"; version="1.8.1"; sha256="1phdaklcwhv1rv94dvz4mcwi5f1b3gya7bwv7489hsx7pa149sac"; depends=[doParallel dplyr foreach ggplot2 gridExtra Matrix pROC sparseMVN]; }; @@ -1501,7 +1501,7 @@ in with self; { savR = derive2 { name="savR"; version="1.20.0"; sha256="13bwq2a2pygdkmhrcmvz525wsi5i01j911711zgs6x93wj20b2w7"; depends=[ggplot2 gridExtra reshape2 scales XML]; }; scDD = derive2 { name="scDD"; version="1.6.1"; sha256="0dp2awajd5281dwpbs0wb8ij2pq9l60p0b80xhxrb41m5qybcri8"; depends=[arm BiocParallel EBSeq fields ggplot2 mclust outliers S4Vectors scran SingleCellExperiment SummarizedExperiment]; }; scFeatureFilter = derive2 { name="scFeatureFilter"; version="1.2.1"; sha256="04bk4kzs42mi022qr8whngkqxapngnvpxifd0m60r57skz3v6yqa"; depends=[dplyr ggplot2 magrittr rlang tibble]; }; - scPipe = derive2 { name="scPipe"; version="1.4.1"; sha256="1kl1ik1wd3cq7h2njzdnzs9r26qnim4r63c86pfbfymz23n4aqns"; depends=[AnnotationDbi BiocGenerics biomaRt dplyr GenomicRanges GGally ggplot2 glue hashmap magrittr MASS mclust org_Hs_eg_db org_Mm_eg_db Rcpp reshape Rhtslib robustbase rtracklayer S4Vectors scales SingleCellExperiment stringr SummarizedExperiment testthat zlibbioc]; }; + scPipe = derive2 { name="scPipe"; version="1.4.1"; sha256="1kl1ik1wd3cq7h2njzdnzs9r26qnim4r63c86pfbfymz23n4aqns"; depends=[AnnotationDbi BiocGenerics biomaRt dplyr GenomicRanges GGally ggplot2 glue magrittr MASS mclust org_Hs_eg_db org_Mm_eg_db Rcpp reshape Rhtslib robustbase rtracklayer S4Vectors scales SingleCellExperiment stringr SummarizedExperiment testthat zlibbioc]; }; scater = derive2 { name="scater"; version="1.10.1"; sha256="0rijhy7g5qmcn927y1wyd63la1fhyar9fv1hccsqd23jd98yc55a"; depends=[beachmat BiocGenerics BiocParallel DelayedArray DelayedMatrixStats dplyr ggbeeswarm ggplot2 Matrix plyr Rcpp reshape2 Rhdf5lib S4Vectors SingleCellExperiment SummarizedExperiment viridis]; }; scde = derive2 { name="scde"; version="2.10.1"; sha256="1n1r08wqx1bds7lwz2bbksw5l084cmcbgs03jr8s2l92z43kqmm6"; depends=[BiocParallel Cairo edgeR extRemes flexmix MASS mgcv nnet pcaMethods quantreg RColorBrewer Rcpp RcppArmadillo rjson RMTstat Rook]; }; scfind = derive2 { name="scfind"; version="1.4.1"; sha256="07lzjqxvdjjzli8ibqvlndgf9n1x477q1pniv91ynrh6jc8dz8cb"; depends=[bit dplyr hash Rcpp reshape2 SingleCellExperiment SummarizedExperiment]; }; @@ -1581,7 +1581,7 @@ in with self; { switchBox = derive2 { name="switchBox"; version="1.18.0"; sha256="1s49vi0vyh0bmrc6marn69hi9ln12j3kyjkkm2z5fpvv3rvxhgw7"; depends=[gplots pROC]; }; switchde = derive2 { name="switchde"; version="1.8.1"; sha256="1ydc9h62iyfz0786c5zhz3189p2f7sf3z6fjlvqwjqxva5j0f12b"; depends=[dplyr ggplot2 SingleCellExperiment SummarizedExperiment]; }; synapter = derive2 { name="synapter"; version="2.6.1"; sha256="19rf8kkqf070ldhnrdi3xl23j2slv4qadw9cx8wvc4p994f2abj9"; depends=[Biobase Biostrings cleaver knitr lattice MSnbase multtest qvalue RColorBrewer readr rmarkdown]; }; - synergyfinder = derive2 { name="synergyfinder"; version="1.8.0"; sha256="1idc0lnjw8zx6nih1hrzfq9h40zkbdv0iv9si214wx4ynf0w18iv"; depends=[drc ggplot2 gplots gridBase lattice nleqslv reshape2]; }; + synergyfinder = derive2 { name="synergyfinder"; version="1.8.0"; sha256="1idc0lnjw8zx6nih1hrzfq9h40zkbdv0iv9si214wx4ynf0w18iv"; depends=[drc ggplot2 gplots gridBase lattice nleqslv reshape2 SpatialExtremes]; }; synlet = derive2 { name="synlet"; version="1.12.1"; sha256="13rghqqbkxni121ds0slf6cnj2g5zbm3sbbcli95z7mxy2wn3syg"; depends=[doBy dplyr ggplot2 magrittr RankProd RColorBrewer reshape2]; }; systemPipeR = derive2 { name="systemPipeR"; version="1.16.1"; sha256="0qzydz87rld2nhwzbfgrw5jfgh8maa9y54mjx9c4285m11qj2shq"; depends=[annotate BatchJobs BiocGenerics Biostrings DESeq2 edgeR GenomicFeatures GenomicRanges ggplot2 GO_db GOstats limma pheatmap rjson Rsamtools ShortRead SummarizedExperiment VariantAnnotation]; }; tRNA = derive2 { name="tRNA"; version="1.0.0"; sha256="1kzl79q0zim9y7px0dirk41qay96nl2bz8sw76nx56pr1d5jh245"; depends=[assertive BiocGenerics Biostrings GenomicRanges ggplot2 IRanges S4Vectors scales stringr XVector]; }; diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix index 8c50affaeff..ae6197761d3 100644 --- a/pkgs/development/r-modules/cran-packages.nix +++ b/pkgs/development/r-modules/cran-packages.nix @@ -4,7 +4,7 @@ # Rscript generate-r-packages.R cran >new && mv new cran-packages.nix { self, derive }: -let derive2 = derive { snapshot = "2020-01-27"; }; +let derive2 = derive { snapshot = "2020-04-07"; }; in with self; { A3 = derive2 { name="A3"; version="1.0.0"; sha256="017hq9pjsv1h9i7cqk5cfx27as54shlhdsdvr6jkhb8jfkpdb6cw"; depends=[pbapply xtable]; }; ABACUS = derive2 { name="ABACUS"; version="1.0.0"; sha256="0m1dnkwjr1522l9ddbzzx7ayxvli17sbmk6s28adpmzzjwh2kd1i"; depends=[ggplot2 shiny]; }; @@ -19,7 +19,6 @@ in with self; { ACD = derive2 { name="ACD"; version="1.5.3"; sha256="1a67bi3hklq8nlc50r0qnyr4k7m9kpvijy8sqqpm54by5hsysfd6"; depends=[]; }; ACDm = derive2 { name="ACDm"; version="1.0.4"; sha256="0b4f02ga5ra66mbrm79g0bnlzmii82rks9kmxixxqgf18yhlyjil"; depends=[dplyr ggplot2 plyr Rsolnp zoo]; }; ACEt = derive2 { name="ACEt"; version="1.8.0"; sha256="0626d6kg485xjya164wagrr5z223jvi93ywbwpdns7fkm03c0dlq"; depends=[BH MASS Rcpp RcppArmadillo]; }; - ACMEeqtl = derive2 { name="ACMEeqtl"; version="1.6"; sha256="049xjv2ym35bbn43zwi68cq27fwdh404vp0r2ca5gxgmmx8kj1cz"; depends=[filematrix]; }; ACNE = derive2 { name="ACNE"; version="0.8.1"; sha256="0kzapsalzw6jsi990qicp4glijh5ddnfimsg5pidgbwxg4i05grl"; depends=[aroma_affymetrix aroma_core MASS matrixStats R_filesets R_methodsS3 R_oo R_utils]; }; ACSNMineR = derive2 { name="ACSNMineR"; version="0.16.8.25"; sha256="0gh604s8qall6zfjlwcg2ilxjvz08dplf9k5g47idhv43scm748l"; depends=[ggplot2 gridExtra scales]; }; ACSWR = derive2 { name="ACSWR"; version="1.0"; sha256="195vjrkang5cl7gwsna0aq4p0h4jym9xg9yh94bnf8vq6wf8j83n"; depends=[MASS]; }; @@ -34,22 +33,21 @@ in with self; { ADPF = derive2 { name="ADPF"; version="0.0.1"; sha256="1n7302xx77ngvp9i2h582i1mqslzllcdr0bn3pl2zk9jd8k97p7n"; depends=[]; }; ADPclust = derive2 { name="ADPclust"; version="0.7"; sha256="0s47cpsjykn7imsssa9w9b6g9d1sz2yah78yqzxmh0i3lqd757c1"; depends=[cluster dplyr fields knitr]; }; AEDForecasting = derive2 { name="AEDForecasting"; version="0.20.0"; sha256="16q2sn5zzvysyy3r32jnr21pbdkkn0k0sbarni6fdkx7pj27yijn"; depends=[changepoint forecast signal]; }; - AER = derive2 { name="AER"; version="1.2-8"; sha256="04qfqv36scl5r5fssz0qzbq64602x8bj02fy1f2gzrmvlf315gh9"; depends=[car Formula lmtest sandwich survival zoo]; }; + AER = derive2 { name="AER"; version="1.2-9"; sha256="03al0jfxdbi8sqkav7gz3aqbxm32qjdnh4l93vy1jr3n2h5kjy9v"; depends=[car Formula lmtest sandwich survival zoo]; }; AF = derive2 { name="AF"; version="0.1.5"; sha256="1r87ra55g0qm2s8cgsmdwck93ia2vr8zfab3in45mxm5xc501xgk"; depends=[data_table drgee ivtools stdReg survival]; }; AFM = derive2 { name="AFM"; version="1.2.6"; sha256="0yngk3j1wkamqzrwibn2csbn61jbdb872n0gi4d3hyhgilqzwbwf"; depends=[data_table dbscan fftwtools fractaldim ggplot2 gridExtra gstat igraph mixtools moments plyr png pracma rgl scales shiny shinyjs sp stringr]; }; AFheritability = derive2 { name="AFheritability"; version="0.1.0"; sha256="03w0a4z2x539ykyzdxm1mfqkhzz03cg0aqvgi062jrrm5m6f57ix"; depends=[ggplot2 mvtnorm reshape2 shiny]; }; AGD = derive2 { name="AGD"; version="0.39"; sha256="0hmq684snnffc2v7vmns4ky200a6zh1ggiap03n5cvpb3nlqc6lr"; depends=[gamlss gamlss_dist]; }; AGHmatrix = derive2 { name="AGHmatrix"; version="1.0.2"; sha256="0qipqk8p80463hfkbjnkw8ivziqj2xb15l54x52kcgbd9hl4zami"; depends=[Matrix zoo]; }; AGSDest = derive2 { name="AGSDest"; version="2.3.2"; sha256="0f3qchvdi2n1cr8ipjj332dw8hdza58dvfk21p0c6bhmxzg7f71i"; depends=[ldbounds]; }; - AGread = derive2 { name="AGread"; version="1.0.0"; sha256="0z0c43m7sgw9qfwmr9jv6ppx2zvrm3mpb5gljg5bvv5gd3cfxbpy"; depends=[anytime binaryLogic data_table DescTools dplyr GGIR lubridate magrittr PAutilities Rcpp rlang seewave stringr]; }; + AGread = derive2 { name="AGread"; version="1.1.1"; sha256="0ar0cnlaxxmvn2gdydmm9vr45xjhx06kky556d17l93k0xwfvzm3"; depends=[anytime binaryLogic data_table DescTools dplyr GGIR lubridate magrittr PAutilities Rcpp reshape2 rlang seewave stringr]; }; AHM = derive2 { name="AHM"; version="1.0.1"; sha256="00r1rn7d64a18rckbxvla5yapqv00p9ajxv72fx7s6p80kfal89w"; depends=[devtools dplyr glmnet Matrix mixexp plgp quadprog tibble tidyr]; }; AHMbook = derive2 { name="AHMbook"; version="0.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-2"; sha256="0kpdl31wmwk5i4cqcwlm66c9s0c2b793army9dx50hdgrrzqc0na"; depends=[lattice MASS Matrix nlme survival unmarked VGAM xtable]; }; AID = derive2 { name="AID"; version="2.5"; sha256="0il6qjv1gcbxdf1lknsfij4vxzc31qyp359abqzdvkzyxwgbbzsy"; depends=[ggplot2 MASS nortest psych tseries]; }; AIG = derive2 { name="AIG"; version="0.1.9"; sha256="1jnnfmcwxcv4fsdcz7jb2lgczxdwrq3qxg2bhsh1610iwz4gzii7"; depends=[dplyr magrittr mgcv rgl]; }; AIM = derive2 { name="AIM"; version="1.01"; sha256="11lkfilxk265a7jkc1wq5xlgxa56xhg302f1q9xb7gmjnzdigb21"; depends=[survival]; }; - ALA4R = derive2 { name="ALA4R"; version="1.7.0"; sha256="1vprq3w8pzla2ffsalpqgzkdv8wqialr45sq0qa0xjdlsrdwxipp"; depends=[assertthat data_table digest httr jsonlite sp stringr wellknown]; }; + ALA4R = derive2 { name="ALA4R"; version="1.8.0"; sha256="0bxfpzj6993sdhh5002vmf84r6gfd46s9vjw3d58hbyrxnsiaipr"; 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]; }; @@ -58,16 +56,16 @@ in with self; { ALTopt = derive2 { name="ALTopt"; version="0.1.2"; sha256="1nbbvniramajg6k83xqgx7r0abjrfja8zz0y3g3j8qmvbcqmjx13"; depends=[cubature lattice]; }; ALassoSurvIC = derive2 { name="ALassoSurvIC"; version="0.1.0"; sha256="0q02rz947bp6i7sbb5nzxq8ky74iprdnpbwnmnn7vg29vhca4b09"; depends=[Rcpp]; }; AMAP_Seq = derive2 { name="AMAP.Seq"; version="1.0"; sha256="0z0rrzps6rm58k4m1ybg77s3w05m5zfya4x8ril78ksxsjwi3636"; depends=[]; }; - AMCP = derive2 { name="AMCP"; version="0.0.4"; sha256="051xvnr4zc25w00kh4gkffgigmhmcbqpwh9654jv37glr8ip2v3l"; depends=[]; }; + AMCP = derive2 { name="AMCP"; version="1.0.0"; sha256="0qb5vcg351jd0ss17zqx6vvyin38qr4dbvc05xc5z8rbca8z6cap"; 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.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=[]; }; + AMORE = derive2 { name="AMORE"; version="0.2-16"; sha256="0vw6hhykg1r6xxja6d4zb2y00x7pfkmhcq9xkidz8p4arinb7xnl"; depends=[]; }; AMPLE = derive2 { name="AMPLE"; version="0.0.2"; sha256="0j19f8rl7gkads4n52l5gfc5k7dx27sswzrypwl7dnxhfp4ivql7"; depends=[dplyr ggplot2 shiny shinyjs tidyr wesanderson]; }; - AMR = derive2 { name="AMR"; version="0.9.0"; sha256="14y7ghqhx3apc2ad4lbjd2swzwgw1qzj0scdgx8jq4b2cv4z2gz6"; depends=[backports cleaner crayon data_table dplyr ggplot2 knitr microbenchmark pillar rlang tidyr]; }; - ANN2 = derive2 { name="ANN2"; version="2.3.2"; sha256="0ib6cs2az0hhfg7vj4dk6fxbwjlc305psqjs188fdya2jrxgq1gs"; depends=[ggplot2 Rcpp RcppArmadillo reshape2 testthat viridisLite]; }; + AMR = derive2 { name="AMR"; version="1.0.1"; sha256="06sqrwxd0zhp2i2shvq0lbh8arvvlfqymcf1jckgpsxidygr3j1q"; depends=[backports cleaner crayon data_table dplyr ggplot2 knitr microbenchmark pillar rlang tidyr]; }; + ANN2 = derive2 { name="ANN2"; version="2.3.3"; sha256="12l02fnnfa42qy4w1bv2zr963k61xn7mbpj9rycdzi8wl18hxrb8"; depends=[ggplot2 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]; }; ANOVAIREVA = derive2 { name="ANOVAIREVA"; version="0.1.0"; sha256="04z2g79nnh5yhn4aqw0i7ck2b1z5dbasf1zp1sj6rjjrp9aqmaa6"; depends=[car dplyr ggplot2 plotly rmarkdown shiny]; }; @@ -82,6 +80,7 @@ in with self; { APSIMBatch = derive2 { name="APSIMBatch"; version="0.1.0.2374"; sha256="0j44ijq1v1k60lka9nmw8m1jfjw7pidny9bvswqy5v82gzmwl29d"; depends=[]; }; APfun = derive2 { name="APfun"; version="0.1.4"; sha256="0k4m3zwxcjfb1y4njig6yyjqzsvqi99zmglbfpvp65s829zxd881"; depends=[maptools raster rgdal sp]; }; APtools = derive2 { name="APtools"; version="6.8.8"; sha256="171aydyd7s8qll7djl4ysy596wxdf5wfwpqwfi14jjglc9r9qrrr"; depends=[cmprsk survival]; }; + AQuadtree = derive2 { name="AQuadtree"; version="1.0.0"; sha256="159p1cymvgf8grpnkgkf6nind2kv6c62aa96qb32aiayrgrm4y4c"; depends=[dplyr sp]; }; AR = derive2 { name="AR"; version="1.1"; sha256="1wn4g2997c4vc3mzq2pv8ld0ryp0i78v4zlqqryvhshxgnz4f2pr"; depends=[DISTRIB]; }; AR1seg = derive2 { name="AR1seg"; version="1.0"; sha256="0v9adx5wj9r4jwl3bqqmj0byiqfp585jz013qfqrq601wj8v4zi3"; depends=[Segmentor3IsBack]; }; ARCensReg = derive2 { name="ARCensReg"; version="2.1"; sha256="05zjk1wxqfigzg80lvx1940a059jfdr9zbzgzmz2n01glj1lvj63"; depends=[msm mvtnorm numDeriv tmvtnorm]; }; @@ -91,9 +90,8 @@ in with self; { ARPobservation = derive2 { name="ARPobservation"; version="1.2.0"; sha256="1kgflalpymbsfzwg4c70mdxgrbsg8r8z44433v3y9rymhfyq9nmj"; depends=[]; }; ART = derive2 { name="ART"; version="1.0"; sha256="186w1ivj5v3h906crl953qxgai5wiznaih83dgvwgnmabs9p1wvk"; depends=[car]; }; ARTIVA = derive2 { name="ARTIVA"; version="1.2.3"; sha256="1jdvsslc8parz7wibcv51fx62brl2mc6i482hz43j1npsms2z1hl"; depends=[gplots igraph MASS]; }; - ARTP = derive2 { name="ARTP"; version="2.0.5"; sha256="0lwvhf5lamw28sd41vrhyin8ab92rl93j1ahk0aacwvnikgmfkpj"; depends=[]; }; ARTP2 = derive2 { name="ARTP2"; version="0.9.45"; sha256="12nqxry2jkl1n07rbms38mrnp39cn00d0h272d9f1z5x883flv62"; depends=[data_table Formula]; }; - ARTool = derive2 { name="ARTool"; version="0.10.6"; sha256="1wln9s3j3bs5svykp3as483q61fvlfsdcjlb8cs3mzw43nlp591i"; depends=[car dplyr lme4 magrittr plyr]; }; + ARTool = derive2 { name="ARTool"; version="0.10.7"; sha256="1qk029q5ikz33s0d1gpywdb54ljvdlyxkb9v6zrc86f5ixcc7dnd"; depends=[car dplyr lme4 magrittr plyr]; }; ARpLMEC = derive2 { name="ARpLMEC"; version="1.0"; sha256="0irgyf8acg1qn60npchvs258d0cf6cxm53xw0s8qg8iyqns52p75"; depends=[gmm lmec MASS Matrix mnormt mvtnorm numDeriv sandwich tmvtnorm]; }; ASGS_foyer = derive2 { name="ASGS.foyer"; version="0.2.1"; sha256="0f0bl1fxda012d8pgqpaqb80m0nn490xih3ddscfqgb87zgrp4sx"; depends=[sp]; }; ASIP = derive2 { name="ASIP"; version="0.4.9"; sha256="06f1nvy920vyx3bmdi77mwvfsn32xsfxaslhagnf1zh652vfkbwi"; depends=[raster rgdal stringr]; }; @@ -109,6 +107,7 @@ in with self; { AUC = derive2 { name="AUC"; version="0.3.0"; sha256="0ripcib2qz0m7rgr1kiz68nx8f6p408l1ww7j78ljqik7p3g41g7"; depends=[]; }; AUCRF = derive2 { name="AUCRF"; version="1.1"; sha256="00d7jcg2dyvf7sc9w7vxxd85m7nsbcmfqsavrv236vxfpfc9yn7i"; depends=[randomForest]; }; AUtests = derive2 { name="AUtests"; version="0.98"; sha256="0m2nl55qfwfzlf92f43b9q75xqvrlx7qzcz6qlnjbjcr80s0qj9q"; depends=[logistf]; }; + AWAPer = derive2 { name="AWAPer"; version="0.1.3"; sha256="0v753kp4acjhhfyq9492sr7x9931cq3i774yva322x4dskvk8n2w"; depends=[chron Evapotranspiration maptools ncdf4 R_utils raster sp zoo]; }; AWR = derive2 { name="AWR"; version="1.11.189"; sha256="0q9ss6cyx8vv85zif5v4s2bkv0amhyvzbs41mjjgmwb1csg53jgd"; depends=[rJava]; }; AWR_Athena = derive2 { name="AWR.Athena"; version="2.0.7-0"; sha256="1j9bqhyk0jzry4g379ml65gwxlszn7pjif1dywgns98jbry8mavh"; depends=[rJava RJDBC]; }; AWR_KMS = derive2 { name="AWR.KMS"; version="0.1"; sha256="00aqhyqlncsv0vfcyhaazxaclwm63v5kscssash7529avdwd4gqg"; depends=[AWR jsonlite rJava]; }; @@ -119,11 +118,10 @@ in with self; { AcceptanceSampling = derive2 { name="AcceptanceSampling"; version="1.0-6"; sha256="1z3rmln63ki2kik9kinbwr9qhr32ggbmh4mm3xqy6di119n47ca9"; depends=[]; }; AcousticNDLCodeR = derive2 { name="AcousticNDLCodeR"; version="1.0.2"; sha256="1fgzgwanpv2pzy74xdk3hamc44p8qch467wh163dxby8jr9ik0sb"; depends=[seewave tuneR zoo]; }; AcrossTic = derive2 { name="AcrossTic"; version="1.0-3"; sha256="03180h79jhjd66ibrnsfp3yyp2jlfysp7cymw46phzj2palghsc0"; depends=[lpSolve treeClust]; }; - ActFrag = derive2 { name="ActFrag"; version="0.1.0"; sha256="06l5a679j6289008ls57v420mnzpq9a4ln7svi5bh0vpvws7sr9d"; depends=[accelerometry dplyr ineq survival tidyr]; }; - Actigraphy = derive2 { name="Actigraphy"; version="1.3.2"; sha256="0y0ccmxhdfhdmi4k6pbfvnqknkqbgvfsf2qf7z7rc4xpfgym6574"; depends=[fda SDMTools]; }; + ActFrag = derive2 { name="ActFrag"; version="0.1.1"; sha256="08r3gwjz4fkyy85dxqix0ffm5xyq45032qv3snnzxnlqxslxbqn1"; depends=[accelerometry dplyr ineq survival tidyr]; }; + Actigraphy = derive2 { name="Actigraphy"; version="1.4.0"; sha256="0bpmvszzv5fm72nar3wgnmfl5am7znqfajmlbv38ihkbi7jbwk20"; depends=[fda]; }; ActiveDriver = derive2 { name="ActiveDriver"; version="1.0.0"; sha256="10c7ga48fwvpd5mc4dqiyw4kc2l0iz5qn4hg7xk15r1qmm5rsipa"; depends=[MASS]; }; ActiveDriverWGS = derive2 { name="ActiveDriverWGS"; version="1.0.1"; sha256="08l9dj8d3cd74z1dqn8n4yqykwvqjxsfa067wnxyh7xnfvvnm5v1"; depends=[Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19 GenomeInfoDb GenomicRanges IRanges plyr S4Vectors]; }; - ActivePathways = derive2 { name="ActivePathways"; version="1.0.1"; sha256="1xb0d1svmzw404pv8ja6wr4773k7x2lxkrzrayilvzqbfzj1wx20"; depends=[data_table ggplot2 metap]; }; 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]; }; AdaSampling = derive2 { name="AdaSampling"; version="1.3"; sha256="1c8dh8lxyb076317n4qk2g3qv5j4mc1dszbh3k1p2b0nxiprqk5i"; depends=[caret class e1071 MASS]; }; @@ -131,7 +129,7 @@ in with self; { AdapSamp = derive2 { name="AdapSamp"; version="1.1.1"; sha256="1jayjrsiib2ij4rxxj59g71r3xhzl5yqh0lhi8k6cfy03i7dkvis"; depends=[pracma]; }; AdaptFit = derive2 { name="AdaptFit"; version="0.2-2"; sha256="124lj1sq5cbp35z4ybkc7ci3fi6pgf8pc5k9mpqmyb6dj870q836"; depends=[cluster MASS nlme SemiPar]; }; AdaptFitOS = derive2 { name="AdaptFitOS"; version="0.67"; sha256="0s8vv960pkbccpwlfsg1jsfjnfmq9iy8cj1fak5fn2s60zb7nm0a"; depends=[MASS mgcv nlme SemiPar]; }; - AdaptGauss = derive2 { name="AdaptGauss"; version="1.5.4"; sha256="16p5q5lqq7ys1v4ciiqsp4sw8wlr0w8rjwibr0qgvvdp2wv0lmzd"; depends=[DataVisualizations ggplot2 pracma Rcpp shiny]; }; + AdaptGauss = derive2 { name="AdaptGauss"; version="1.5.6"; sha256="076jjnqp4ayq4kh95qns4kfzfvl6mjllhsq6hfp66bww7w976xxh"; depends=[DataVisualizations pracma Rcpp shiny]; }; AdaptiveSparsity = derive2 { name="AdaptiveSparsity"; version="1.6"; sha256="0imr5m8mll9j6n4icsv6z9rl5kbnwsp9wvzrg7n90nnmcxq2cz91"; depends=[MASS Matrix Rcpp RcppArmadillo]; }; AdequacyModel = derive2 { name="AdequacyModel"; version="2.0.0"; sha256="0amp6ic1wylk24sp9wpx3ci38njj7b9qjqfp89j39hkl6kc1q7sq"; depends=[]; }; AdhereR = derive2 { name="AdhereR"; version="0.5"; sha256="0wma06v02k50j0j8j5k1py3y6mwl8q7bsb288gyn67ms9wgv4fb5"; depends=[clipr colourpicker data_table DBI haven highlight knitr lubridate manipulate readODS readxl RMariaDB RSQLite scales shiny shinyjs shinyWidgets V8 viridisLite]; }; @@ -147,8 +145,8 @@ 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=[]; }; - AlphaPart = derive2 { name="AlphaPart"; version="0.7.0"; sha256="1bqwbjqmazjgmdpk5s0i3dl4hb3qhz2sy1drhazmgdxhf5qwsq85"; depends=[directlabels gdata ggplot2 pedigree quadprog Rcpp reshape]; }; - AlphaSimR = derive2 { name="AlphaSimR"; version="0.11.1"; sha256="0j8sw9pcxc1qbv6phcs92inyx6hwdfy05ww0y1a5dga39lap1r57"; depends=[BH R6 Rcpp RcppArmadillo]; }; + AlphaPart = derive2 { name="AlphaPart"; version="0.8.1"; sha256="0gmiwx6f1bzyakz6yz9bk25xlys7rlapglrqv5qkmn4l4ddqyhwq"; depends=[directlabels gdata ggplot2 pedigree Rcpp reshape]; }; + AlphaSimR = derive2 { name="AlphaSimR"; version="0.12.1"; sha256="1j7bz54lqh59fnlxcipg0v8iiaqib0prjnhvb0qinzxz0narh7gp"; depends=[BH R6 Rcpp RcppArmadillo]; }; AlphaVantageClient = derive2 { name="AlphaVantageClient"; version="0.0.1"; sha256="095m850v945lw7i3qd812p28srdb5hdk9h52zf6bkr166zai1ni0"; depends=[httr xts]; }; Amelia = derive2 { name="Amelia"; version="1.7.6"; sha256="1shvc8x1kmb0cincgggsv5c5w25k36kqvisdqd3ayy5g98vqvh33"; depends=[foreign Rcpp RcppArmadillo]; }; AmericanCallOpt = derive2 { name="AmericanCallOpt"; version="0.95"; sha256="1nhy44j5bmmjsp6g79nrn741rzzxikhdnxk4wwbdj9igcc1bs573"; depends=[]; }; @@ -168,10 +166,9 @@ in with self; { AnnotationBustR = derive2 { name="AnnotationBustR"; version="1.2"; sha256="1r52qry6xvn79b6qsbch35jhzg8y71kxqq9xm6gd302cv2xbwq7q"; depends=[ape seqinr]; }; AnnuityRIR = derive2 { name="AnnuityRIR"; version="1.0-0"; sha256="0yvfqzwhm5nhywfhzkxkfm07c0qi6z21j1cdaypz89qn567aj1d9"; depends=[actuar EnvStats fitdistrplus mc2d tseries]; }; AntAngioCOOL = derive2 { name="AntAngioCOOL"; version="1.2"; sha256="1krwms0y3xppc2y4m0az51wcbh4jq7mlr0jwinp66w8gh4k3qnp2"; depends=[caret rJava rpart RWeka]; }; - AntMAN = derive2 { name="AntMAN"; version="1.0"; sha256="1dm2fb59r4drbyi21bf48c9r6ajhm507q80syl3xwyqimgbgm8ss"; depends=[mcclust mvtnorm Rcpp RcppArmadillo sdols]; }; AntWeb = derive2 { name="AntWeb"; version="0.7"; sha256="1ykfg3zzjdvjppr2l4f26lx00cn5vaqhhz1j1b5yh113ggyl40qw"; depends=[assertthat httr leafletR plyr rjson]; }; AnthropMMD = derive2 { name="AnthropMMD"; version="3.0.1"; sha256="0f2j4nwni87r11zav4lvy0c8k9v6yrk2li3vls2xa02nlci64x26"; depends=[plotrix scatterplot3d shiny smacof]; }; - Anthropometry = derive2 { name="Anthropometry"; version="1.13"; sha256="1f568ri1s6psaby8y737vrkarbjg64v89d4jyw23hy17apdmszr8"; depends=[archetypes biclust cluster depth FNN ICGE nnls rgl shapes]; }; + Anthropometry = derive2 { name="Anthropometry"; version="1.14"; sha256="0y52g15pcgs4b68sfczn6nnpdqsialsb4mq3wb9a2gba7qdcf76y"; 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]; }; AppliedPredictiveModeling = derive2 { name="AppliedPredictiveModeling"; version="1.1-7"; sha256="1wi0sw5w1c51rmh9z98wdpk5rgzsylkkb6g019djiwxvj92l99hh"; depends=[CORElearn ellipse lattice MASS plyr reshape2]; }; @@ -185,20 +182,18 @@ in with self; { ArgumentCheck = derive2 { name="ArgumentCheck"; version="0.10.2"; sha256="0mgx7mzbg2wynixcf9hvs0i9p4zka7c3chrfvjmvvvwwgsy24hkc"; depends=[]; }; Arothron = derive2 { name="Arothron"; version="1.1.1"; sha256="18vman573mss704v5rqa13vq5nwlbdrg1j5b4wc441782znm34y3"; depends=[abind alphashape3d compositions doParallel foreach geometry Morpho rgl Rvcg stringr vegan]; }; ArrayBin = derive2 { name="ArrayBin"; version="0.2"; sha256="0jlhcv2d7pmqi32w71nz063ri1yj4i4isr3msnw7ckzvi9r42jwm"; depends=[SAGx]; }; - AsioHeaders = derive2 { name="AsioHeaders"; version="1.12.1-1"; sha256="0phcagfjxrakkap0kffclcqjspb2rmhq81k934mxgh1qz5a68ksv"; depends=[]; }; - AssayCorrector = derive2 { name="AssayCorrector"; version="2.0.0"; sha256="0d2444if5hyfbzyminnspw686r5l4pf9cdj9k48n2539vd61k452"; depends=[kSamples lattice latticeExtra RColorBrewer RVAideMemoire]; }; + AsioHeaders = derive2 { name="AsioHeaders"; version="1.12.2-1"; sha256="0ibbw8njqq53d2gvwh604xkmkjc02zf8z30gm0a1d6cx82n0w8h8"; depends=[]; }; AssetCorr = derive2 { name="AssetCorr"; version="1.0.3"; sha256="0xcyj9xw895p4j03j9c76k7ylhkmf777akg4m90av12ad05njjbv"; depends=[boot ggplot2 mvQuad mvtnorm numDeriv Rdpack VineCopula]; }; AssetPricing = derive2 { name="AssetPricing"; version="1.0-1"; sha256="0pbb1362dgdipbj3h50ykissl3gdqf1j1mpq53ixprvyc966c5h4"; depends=[deSolve polynom]; }; AssocAFC = derive2 { name="AssocAFC"; version="1.0.2"; sha256="1rjiiir472dnr15xyvpn81s62nf01gl70khr8mrni65ssp5m30fb"; depends=[CompQuadForm]; }; AssocTests = derive2 { name="AssocTests"; version="0.0-4"; sha256="1fhqzbj4aj4srkiba79w8wdyc7yy701izklxqqa7lsifnca6gn4j"; depends=[cluster combinat fExtremes mvtnorm]; }; AssotesteR = derive2 { name="AssotesteR"; version="0.1-10"; sha256="0aysilg79vprcyjirqz6c5s1ry1ia92xik3l38qrw1gf3vfli9cw"; depends=[mvtnorm]; }; - AsyK = derive2 { name="AsyK"; version="1.5.3"; sha256="0pa8j757kvb82n1hn2npvv3yam0s1l3mgd7130kz7pas2gkwwy5n"; depends=[decon ICV kedd kerdiest KernSmooth ks locfit OSCV sm]; }; + AsyK = derive2 { name="AsyK"; version="1.5.4"; sha256="0l2d6h1i5bvxizvcjq15z0dhq274qz07fq6hh4j6d6ifm0z34829"; depends=[decon ICV kedd kerdiest KernSmooth ks locfit OSCV sm]; }; AsynchLong = derive2 { name="AsynchLong"; version="2.1"; sha256="111kg1cacqlz4df1lnijybnrifjscjm78ji9p0ia615gacvdcfxa"; depends=[]; }; AtelieR = derive2 { name="AtelieR"; version="0.24"; sha256="0yialpmbsbx70gvps4r58xg9wvqcril8j8yd61lkkmz4b3195zai"; depends=[cairoDevice gWidgetsRGtk2 partitions proto]; }; AtmRay = derive2 { name="AtmRay"; version="1.31"; sha256="162078jd032i72sgaar9hqcnn1lh60ajcqpsz4l5ysxfkghcxlh8"; depends=[]; }; AurieLSHGaussian = derive2 { name="AurieLSHGaussian"; version="0.2.0"; sha256="0dzwqv396inbx4r6758vr4gip1y42ahavspadgm4xhafvipg73rb"; depends=[flexclust igraph lsa reshape2 stringdist]; }; AutoDeskR = derive2 { name="AutoDeskR"; version="0.1.3"; sha256="1n7c8ris8b517bs1wahpvrhwfbvn2q4jbq01kgiv9lfmkjckzfkc"; depends=[httr jsonlite shiny]; }; - AutoModel = derive2 { name="AutoModel"; version="0.4.9"; sha256="07wpdf5b1z6lk69nqybzx333zc57wbnga6dp0vkf1d50hxmpd9yc"; depends=[aod BaylorEdPsych broom car dplyr gtools lmtest MASS ROCR rowr]; }; AutoPipe = derive2 { name="AutoPipe"; version="0.1.6"; sha256="0bzllh92fgsmz79lh6m2f10vsx5qng4l7bwbwkp2kzwnncy7cq63"; depends=[annotate cluster clusterProfiler ConsensusClusterPlus fgsea msigdbr org_Hs_eg_db pamr RColorBrewer Rtsne siggenes]; }; AutoSEARCH = derive2 { name="AutoSEARCH"; version="1.5"; sha256="1s2ldhxijd8n9ba78faik6gn4f07pdzksy0030pqyafxlr3v1qdj"; depends=[lgarch zoo]; }; AutoStepwiseGLM = derive2 { name="AutoStepwiseGLM"; version="0.2.0"; sha256="0wwi8hg2q1zkf28rq7bj0f9fcxc5hj59hkmk0gl9p8i3rghlyrms"; depends=[caret formula_tools]; }; @@ -206,16 +201,15 @@ in with self; { AutoregressionMDE = derive2 { name="AutoregressionMDE"; version="1.0"; sha256="1dmg0q4sp2d2anzhw2my8xjhpyjsx0kf7r202q5bkw8yr57jnhvr"; depends=[]; }; AzureAuth = derive2 { name="AzureAuth"; version="1.2.3"; sha256="0vi5888qvsmdwvzz46wabg2244liwfzyjd13h1d3wvbarzy7m8wf"; depends=[httr jose jsonlite openssl R6 rappdirs]; }; AzureCognitive = derive2 { name="AzureCognitive"; version="1.0.0"; sha256="1yg8fq77fbgf21dg9zq7kkgqyx6ax9ma46yv1nhnvdhc3dpvax5a"; depends=[AzureAuth AzureRMR httr jsonlite]; }; - AzureContainers = derive2 { name="AzureContainers"; version="1.2.0"; sha256="1mr1xpb1wl8khzhi6hcbfvxmn7jc1p4n7m76rc13axjgv6cb00zr"; depends=[AzureGraph AzureRMR httr openssl processx R6]; }; + AzureContainers = derive2 { name="AzureContainers"; version="1.2.1"; sha256="0ihs0wv91y1klzwcbfy44yx12l8rxpa4g2vm2dbd7g9pz172w7hl"; depends=[AzureGraph AzureRMR httr openssl processx R6]; }; AzureGraph = derive2 { name="AzureGraph"; version="1.1.0"; sha256="0b7bfzvv0115giahs12b0h4qq4fdc5qf5kc8hmvjca6jlgysgvf4"; depends=[AzureAuth httr jsonlite openssl R6]; }; AzureKeyVault = derive2 { name="AzureKeyVault"; version="1.0.3"; sha256="06lz7cg3f9qrl9nzi54fsx37gm517skjl0jn1fwq4s4b07p4klia"; depends=[AzureAuth AzureGraph AzureRMR httr jose jsonlite openssl R6]; }; - AzureKusto = derive2 { name="AzureKusto"; version="1.0.4"; sha256="14gp9qif8p6h7dnw5isls2kvlf77bz3lwr15by2cpa0w5rvzamaj"; depends=[AzureAuth AzureRMR DBI dplyr httr jsonlite openssl R6 rlang tibble tidyselect]; }; - AzureRMR = derive2 { name="AzureRMR"; version="2.3.0"; sha256="01yj145897v2017asy31rxmkzng7zv1r6avnp2c8vl707cd7afd5"; depends=[AzureAuth AzureGraph httr jsonlite R6 uuid]; }; - AzureStor = derive2 { name="AzureStor"; version="3.1.0"; sha256="0wnb7mrchcd3s6zs6ry09xzsvsvgb3s95gagvsprns7y0adgb85m"; depends=[AzureRMR httr mime openssl R6 xml2]; }; - AzureVM = derive2 { name="AzureVM"; version="2.1.0"; sha256="0vb295kcz7j53xhzgsril56b4l8d69jyvkni67bqk8cxxh4qvsgx"; depends=[AzureRMR jsonlite R6]; }; + AzureKusto = derive2 { name="AzureKusto"; version="1.0.5"; sha256="0xzrhqysazcwwp5ismf6pi0kyyncwwp4a0p9s47m0gm8fyhz1h7g"; depends=[AzureAuth AzureRMR DBI dplyr httr jsonlite openssl R6 rlang tibble tidyselect]; }; + AzureRMR = derive2 { name="AzureRMR"; version="2.3.1"; sha256="0i00fkmyh25pih6cjcsxabz2rmpgpvzc708yk98jh89yz8cwxkmy"; depends=[AzureAuth AzureGraph httr jsonlite R6 uuid]; }; + AzureStor = derive2 { name="AzureStor"; version="3.1.1"; sha256="0la91z2d8qnvxar1y3mj8kpg0a44qr8slljaig6padv2wq16xals"; depends=[AzureRMR httr mime openssl R6 xml2]; }; + AzureVM = derive2 { name="AzureVM"; version="2.1.1"; sha256="0kls78lbyp5i0dg3a7nz183r7chw1hhwzqyvmp27jhihazls90ij"; depends=[AzureRMR jsonlite R6]; }; AzureVMmetadata = derive2 { name="AzureVMmetadata"; version="1.0.0"; sha256="0k99ncp9zkyxl0r51041rfgq49gb65f5d3yc89d1gg2aqavk3g2y"; depends=[httr openssl]; }; AzureVision = derive2 { name="AzureVision"; version="1.0.0"; sha256="1mvnq65sh3kgxfwxvfp26vv0nwa3xldkp65ya4mm0rqxr4zm3h4w"; depends=[AzureCognitive AzureRMR httr]; }; - 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]; }; BACCO = derive2 { name="BACCO"; version="2.0-9"; sha256="0i1dnk0g3miyv3b60rzgjjm60180wxzv6v2q477r71q74b0v0r1y"; depends=[approximator calibrator emulator]; }; BACCT = derive2 { name="BACCT"; version="1.0"; sha256="0bpm4l27vbblzi2hhfbjw2af3ic2jbnyghkvchpq8ww43k8068iv"; depends=[ggplot2 reshape2 rjags]; }; @@ -228,7 +222,8 @@ in with self; { BAMBI = derive2 { name="BAMBI"; version="2.2.0"; sha256="1ch74zwv01a42vpvr9irdb2a3ivs1zrgdb907p50pq2lasmqdxah"; depends=[bridgesampling coda future_apply gtools label_switching lattice loo mvtnorm qrng RColorBrewer Rcpp RcppArmadillo rootSolve scales]; }; BAMMtools = derive2 { name="BAMMtools"; version="2.1.7"; sha256="1xpks3in0mj1b82z3ax2k3q06bgr3sj0nhr2dbs2crbvszb8hcp2"; depends=[ape gplots Rcpp]; }; BANEScarparkinglite = derive2 { name="BANEScarparkinglite"; version="0.1.3"; sha256="0z2n4ikj9cr2vcafpn0kmn5v24pdy7cd98asdy7njg5l54hajsxc"; depends=[dplyr httr lubridate RCurl readr rvest XML xml2]; }; - BANOVA = derive2 { name="BANOVA"; version="1.1.6"; sha256="07lxnklz8a2jrrmljhngs1zdrasl7fmn8n60rp8ns394ar7w640m"; depends=[coda rjags rstan runjags]; }; + BAREB = derive2 { name="BAREB"; version="0.1.0"; sha256="1h3bgfxbs489cywgblrpl8jjhgs1krimdvv6fryjnc9rhw1mymdr"; depends=[Rcpp RcppArmadillo]; }; + BARIS = derive2 { name="BARIS"; version="1.0.0"; sha256="15bydzp1mldp2zxl343qd1fygah6cj1iavwxb0zddzjzgksnn3y9"; depends=[data_table downloader dplyr httr janitor jsonlite magrittr memoise rgdal rio sf stringi stringr XML]; }; BART = derive2 { name="BART"; version="2.7"; sha256="16klaqzp525da6swlcdcr13mjlm88zpqyqnzjk6l4nlcwa3b7z1m"; depends=[nlme nnet Rcpp survival]; }; BAS = derive2 { name="BAS"; version="1.5.5"; sha256="1iakx36r4lnl6xs77m9mfcj5w3mb4g482s2mpzq65v69k10nj8lj"; depends=[]; }; BASIX = derive2 { name="BASIX"; version="1.1"; sha256="18dkvv1iwskfnlpl6xridcgqpalbbpm2616mvc3hfrc0b26v01id"; depends=[]; }; @@ -237,13 +232,13 @@ in with self; { BAT = derive2 { name="BAT"; version="2.0.0"; sha256="0fwyarkgxxgckaky2wjf311ymlh78942j51a2dvjkwlbshcdqbij"; depends=[hypervolume nls2 raster spatstat vegan]; }; BAYESDEF = derive2 { name="BAYESDEF"; version="0.1.0"; sha256="030xskgqqg0n85mphjv32ks4ysvxb36f6ayy0176gps14jhmhcp7"; depends=[glmnet gWidgets readxl REdaS]; }; BAYSTAR = derive2 { name="BAYSTAR"; version="0.2-9"; sha256="0crillww1f1jvhjw639sf09lpc3wpzd69milah143gk9zlrkhmz2"; depends=[coda mvtnorm]; }; - BAwiR = derive2 { name="BAwiR"; version="1.2"; sha256="0j4vrngfddil4wyaskc0cgqhk496hq7wkrj85hxh76kn85gmfmiv"; depends=[Anthropometry dplyr ggplot2 ggthemes hrbrthemes httr lubridate magrittr plyr purrr reshape2 rvest rworldmap scales stringi stringr tidyr xml2]; }; + BAwiR = derive2 { name="BAwiR"; version="1.2.2"; sha256="0src5d7bi9d8mcg9rijrz20v0a8gif52j7qggbvl2xa15gksxdag"; depends=[Anthropometry dplyr ggplot2 ggthemes hrbrthemes httr lubridate magrittr plyr purrr reshape2 rvest rworldmap scales stringi stringr tidyr xml2]; }; BB = derive2 { name="BB"; version="2019.10-1"; sha256="0kf9sfsm3n036a8a8gjfpc9qdryvadb019kqjh80n1szdv7bdl04"; depends=[quadprog]; }; BBEST = derive2 { name="BBEST"; version="0.1-6"; sha256="1hvgi3679ixpq0c5qbxhkp1j0953k3lklglgxrq9mz2ry6z9n038"; depends=[DEoptim ggplot2 reshape2 shiny wmtsa]; }; BBI = derive2 { name="BBI"; version="0.3.0"; sha256="167sndfp3776p8n9zdpihc9xhqqi8wygzpl49dzkfj53gwa77rnn"; depends=[vegan]; }; BBMM = derive2 { name="BBMM"; version="3.0"; sha256="1cvv786wf1rr5906qg1di2krrv5jgw3dnyl8z2pvs8jyn0kb3fkj"; depends=[]; }; BBMV = derive2 { name="BBMV"; version="2.1"; sha256="11d4wd1zx99hrhwagw73jkk088rz5vgkjml6mckssc2iqvhj1dc9"; depends=[ape]; }; - BBRecapture = derive2 { name="BBRecapture"; version="0.1"; sha256="05xzp5zjmkh0cyl47qfsz0l8drg8mimssybhycc4q69aif9scqxb"; depends=[HI lme4 locfit secr]; }; + BBRecapture = derive2 { name="BBRecapture"; version="0.2"; sha256="1w0m8p4mwjsycv9krmsgdyjckic2nwxbyhrz1s2gng2v1h20zvlf"; depends=[HI lme4 locfit secr]; }; BBmisc = derive2 { name="BBmisc"; version="1.11"; sha256="1lh1n4bvxzivb5rbz69mvd8xdgr3gr2bnqd68a39sd1530l8r90y"; depends=[checkmate]; }; BCA = derive2 { name="BCA"; version="0.9-3"; sha256="0ksd6b0ykydgdn33x29bwwqkrp23cvdj3imps0l6qs1p4465j5nf"; depends=[car clv flexclust Rcmdr RcmdrMisc rpart]; }; BCA1SG = derive2 { name="BCA1SG"; version="0.1.0"; sha256="14jvi5gn19f72szcnyhfpdld00cc7gyih5qrm4bpzvp553f1svvk"; depends=[logOfGamma Matrix]; }; @@ -252,8 +247,8 @@ in with self; { BCDating = derive2 { name="BCDating"; version="0.9.8"; sha256="1px9fimg3fqx8bfkzq6rl34xclc9gcjxqjvj5islpdy4f1ifwph3"; depends=[]; }; BCE = derive2 { name="BCE"; version="2.1"; sha256="0dqp08pbq7r88yhvlwgzzk9dcdln7awlliy5mfq18j5jhiy7axiz"; depends=[FME limSolve Matrix]; }; BCEA = derive2 { name="BCEA"; version="2.3-1.1"; sha256="0ppjcbcapmg6j5gdalw1j86w50xwaanvhld9zpzp5fvj8b7f016b"; depends=[dplyr MASS rlang]; }; - BCEE = derive2 { name="BCEE"; version="1.2"; sha256="08jsnsy7l182n0gy2jy0l9a7grr62g57gz3217fzapk2im2q648b"; depends=[BMA leaps Rcpp RcppArmadillo]; }; - BCHM = derive2 { name="BCHM"; version="0.96"; sha256="1zmv6ghg76pdd98qngvkr9814sjq4ah5h0g2z6ch5fnvwry0r2bv"; depends=[cluster clValid coda crayon knitr plyr rjags]; }; + BCEE = derive2 { name="BCEE"; version="1.3.0"; sha256="19sg84qw44pa7dmr2l656zv988cj6ap6069l53vza5ynqswckbw2"; depends=[BMA boot leaps Rcpp RcppArmadillo]; }; + BCHM = derive2 { name="BCHM"; version="0.99"; sha256="1az0njkq30762n5khbm6hlj1knqi4sp723qihwnmkgn8cai130y3"; depends=[cluster coda crayon knitr plyr rjags]; }; BCRA = derive2 { name="BCRA"; version="2.1"; sha256="0n1f2qcwca7lb90qmim5dc3wj3hf5b31nh0xiw64k1cv8lhqc0mz"; depends=[]; }; BCSub = derive2 { name="BCSub"; version="0.5"; sha256="0c8dlxsx23qfyygmajg2amj78ax01kb3808d9hvy7g3hkgp2i2fp"; depends=[MASS mcclust nFactors Rcpp RcppArmadillo]; }; BCellMA = derive2 { name="BCellMA"; version="0.3.4"; sha256="1njprs7ksv0w18ffs0agz0290aa2akw48225iaa3bjhbl08dpidl"; depends=[ggplot2 reshape2]; }; @@ -266,16 +261,16 @@ in with self; { 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]; }; - BEDMatrix = derive2 { name="BEDMatrix"; version="2.0.1"; sha256="03jf8k1sa43ddb6m07g78r1z3rx8aznywmwllsivi674am0qk1qj"; depends=[crochet]; }; + BEDMatrix = derive2 { name="BEDMatrix"; version="2.0.2"; sha256="0azhxz2vq77fnw9678s2i04rws6cdw1prkqp9ng3fz8qphrz5q5y"; depends=[crochet]; }; BENMMI = derive2 { name="BENMMI"; version="4.3-6"; sha256="07jmf4icij8yb83bf7x0vsaf60gcvdzaijjckv5400xjykpm7scm"; depends=[benthos dplyr ggplot2 jsonlite knitr markdown purrr readr tidyr xtable]; }; - BEQI2 = derive2 { name="BEQI2"; version="2.0-0"; sha256="19q29kkwww5hziffkm2yx7n4cpfcsyh0z4mljdcnjkwfp732sjig"; depends=[jsonlite knitr markdown plyr reshape2 xtable]; }; BEST = derive2 { name="BEST"; version="0.5.1"; sha256="0yx3bkaaly0lriyd5xr7aay4c381a5iwanfixz9v37cmvs64rs4s"; depends=[coda HDInterval rjags]; }; BESTree = derive2 { name="BESTree"; version="0.5.2"; sha256="0yij6xdlvhbqifckaylgbhszwwp38d9x6vbpr1nl40mwwnv4bswz"; depends=[plyr]; }; BETS = derive2 { name="BETS"; version="0.4.9"; sha256="0daixk7mqmk2jq35i7mjaslz11gxbnnjgwxfvj8x1s88vz9l74sm"; depends=[DBI digest dplyr DT dygraphs forecast foreign ggplot2 grnn htmltools httr lubridate miniUI plotly rjson rmarkdown RMySQL rstudioapi rvest seasonal shiny sqldf stringr urca webshot xml2 zoo]; }; - BFS = derive2 { name="BFS"; version="0.2.2"; sha256="0if4p0y1yv95c8i0w4gvanzclq0j4pwzscyiq29bfkhcn4izqrmg"; depends=[janitor magrittr progress purrr pxR rvest tibble xml2]; }; - BFpack = derive2 { name="BFpack"; version="0.1.0"; sha256="1sqgn24k5sp928hpqyv0k5bjaz3yc5d7wsl3bkkxixm73w5p7g4j"; depends=[bain lme4 MASS Matrix MCMCpack mvtnorm pracma]; }; + BFS = derive2 { name="BFS"; version="0.2.5"; sha256="0qcqgxzj00n04p20w6hm60lcnccl2mpbxn9mri0x0wdad587jfgi"; depends=[janitor magrittr pins progress purrr pxR rvest tibble xml2]; }; + BFpack = derive2 { name="BFpack"; version="0.1.1"; sha256="0as8mr0g1arqds23k3gx7jcbg7g62yc6fpg45m7f7him4mxxi6k5"; depends=[bain lme4 MASS Matrix mvtnorm pracma]; }; BGData = derive2 { name="BGData"; version="2.1.0"; sha256="168lvmcfj9ch2dfp8haykgz8cwmrp1yqn01hbyssqfgpc42lrgf3"; depends=[BEDMatrix bigmemory bit crochet ff LinkedMatrix symDMatrix synchronicity]; }; BGGE = derive2 { name="BGGE"; version="0.6.5"; sha256="1h76c40y45xhf2vp9g0q5j9lfwh16q9axbk5c9aqn4md008xr1j2"; depends=[]; }; + BGGM = derive2 { name="BGGM"; version="1.0.0"; sha256="14skhkkf7jzc8b3gx8xjrf4xy42y2hrbcmm24gscz4pkfifyhvc0"; depends=[bayesplot cowplot doParallel foreach GGally ggplot2 ggridges MASS Matrix mvnfast mvtnorm network pracma reshape reshape2 shiny sna stringr]; }; BGLR = derive2 { name="BGLR"; version="1.0.8"; sha256="15cv5k44yj5cws9jjd70hvrkm8gzn5x4hfx408n2fbqbv289b5jy"; depends=[truncnorm]; }; BGPhazard = derive2 { name="BGPhazard"; version="2.0.0"; sha256="1qh3jylzdf66kx48gq83gc11d2qd27h4l88s965p25lw99lz528b"; depends=[dplyr ggplot2 ggthemes gridExtra magrittr purrr readr rlang survival tibble]; }; BGSIMD = derive2 { name="BGSIMD"; version="1.0"; sha256="0xkr56z8l72wps7faqi5pna1nzalc3qj09jvd3v9zy8s7zf5r7w4"; depends=[]; }; @@ -286,17 +281,18 @@ in with self; { BHSBVAR = derive2 { name="BHSBVAR"; version="2.0.2"; sha256="1y0fjdrg0wg66r3blb8app0h52f24v8vl04n0mgk9ypm45hm64my"; 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]; }; + BIEN = derive2 { name="BIEN"; version="1.2.4"; sha256="1dagrs54ciagm2mgqrvxl6k2akahr0qk63ifxqnks7iljm0x1gw6"; depends=[ape DBI doParallel fasterize foreach raster rgdal rgeos RPostgreSQL sf sp]; }; BIFIEsurvey = derive2 { name="BIFIEsurvey"; version="3.3-12"; sha256="1kphczvj3rxyjvi93cx2j714scvmmpqv5wrg5pdyy8l891jxsr89"; depends=[miceadds Rcpp RcppArmadillo]; }; BIGDAWG = derive2 { name="BIGDAWG"; version="2.3"; sha256="1lnw31dl161siml6vcp74c30g0rld962ry3am9ljxmd9mw83shnz"; depends=[haplo_stats httr knitr XML]; }; - BIGL = derive2 { name="BIGL"; version="1.4.2"; sha256="0lrc7d6g7kr28sjib21x6p7nivyy2s057l0zm4ml1f0h1dppkxdl"; depends=[ggplot2 MASS minpack_lm numDeriv progress rgl robustbase scales]; }; + BIGL = derive2 { name="BIGL"; version="1.4.3"; sha256="1x00n0z9y5qn9nflbrp086a0nzrak8582vhpvbqhj945q7ayvxvy"; 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.1.1"; sha256="0i7z0pxxp2b11gnsb51q89zk8wnxz1d86yv08xqf7zivgdf0sgpc"; depends=[data_table jsonlite minpack_lm rappdirs raster sp]; }; - BIOdry = derive2 { name="BIOdry"; version="0.7"; sha256="1psy1ckla8pdl3nshgzh7w6074fqfylkb3nn74hn0q02lgsz1vd6"; depends=[ecodist nlme]; }; + BIOdry = derive2 { name="BIOdry"; version="0.8"; sha256="1zga8g50wjnnz2h9b3ak9q67qnl1f14cq6hvdzf9f84pphsnpasa"; depends=[ecodist nlme]; }; + BIRDS = derive2 { name="BIRDS"; version="0.1"; sha256="1bfkwyc2hbd23adh11hgzkfr1dpffc3kzshjirizs6nzb7yyq0gz"; depends=[data_table dplyr esquisse geosphere leaflet lubridate magrittr mapedit nnet rgdal rgeos rlang sf shiny shotGroups sp stringr xts]; }; BIS = derive2 { name="BIS"; version="0.2.1"; sha256="0mngmchgc46wc9a7ksyqrvj6k46nm4ih7x69k3xijfia9bgkym0v"; depends=[dplyr readr rvest tidyr xml2]; }; BKPC = derive2 { name="BKPC"; version="1.0.1"; sha256="17gmhf6qq8jn2xzkqvjq60xzy0slz6kgfpd0d6hlpnf30ww7q923"; depends=[kernlab]; }; - BLCOP = derive2 { name="BLCOP"; version="0.3.1"; sha256="1qfkljw5b1k4b5jd08hw6dsmvgr7vg3kjyib5s13q0mkxvclasym"; depends=[fBasics fMultivar fPortfolio MASS quadprog RUnit timeSeries]; }; + BLCOP = derive2 { name="BLCOP"; version="0.3.2"; sha256="00x8xk7c8pdwpbmzshjg2ph1yz55vxmliblj1xr7y0gqhcmgyr27"; depends=[fBasics fMultivar fPortfolio MASS quadprog RUnit timeSeries]; }; BLModel = derive2 { name="BLModel"; version="1.0.2"; sha256="0l5f2v5ggadmrci3qhhmxm3j9i6jii0anq5rv5vk50y2qzii2q15"; depends=[]; }; BLOQ = derive2 { name="BLOQ"; version="0.1-0"; sha256="1ag0dy3cjdxhlspmzfdnpli030g6gwac50n5s30igcyrmw6kl4hf"; depends=[maxLik mvnmle mvtnorm]; }; BLPestimatoR = derive2 { name="BLPestimatoR"; version="0.3.2"; sha256="0prc2m3hixv8hmnyhr5549406ln509llkhpqra2ifpzif0waw704"; depends=[Formula Matrix mvQuad numDeriv randtoolbox Rcpp RcppArmadillo]; }; @@ -304,7 +300,7 @@ in with self; { BLRPM = derive2 { name="BLRPM"; version="1.0"; sha256="15q0jkw4swz35c58nv23k8g1dy1kkbqh5aydjck7pd0fmppqrhpx"; depends=[R6]; }; BLRShiny = derive2 { name="BLRShiny"; version="0.1.0"; sha256="0z3gr0bvjs7y0jkygh7h9habnk2807cwziajpgfmb7dxdrhccj68"; depends=[caret dplyr e1071 ggplot2 rhandsontable rmarkdown shiny]; }; BLSM = derive2 { name="BLSM"; version="0.1.0"; sha256="02xidwp91rh34rcqd0q552wzm2j80axs1nnwwv2aj04g96lf7myj"; depends=[Rcpp RcppEigen]; }; - BMA = derive2 { name="BMA"; version="3.18.11"; sha256="13b9agsra9lv00dkmx57zbf6n7xixxlihk7svxaafk8snbyyhk5z"; depends=[inline leaps robustbase rrcov survival]; }; + BMA = derive2 { name="BMA"; version="3.18.12"; sha256="0yfx6m0y8chxlpyngzw27xsgz3g7481ra0xdhsli36mhj9yvgayb"; depends=[inline leaps robustbase rrcov survival]; }; BMAmevt = derive2 { name="BMAmevt"; version="1.0.4"; sha256="10241cibzmgrmxzjw7fpw64qkayc1wig5xilahyc182841k4if6w"; depends=[coda]; }; BMRBr = derive2 { name="BMRBr"; version="0.2.0"; sha256="0v2ysap5jfkq9fc5blqlfhsv2bs8rqybmp5z4q3g6y3y7qzhypjw"; depends=[rvest xml2]; }; BMRSr = derive2 { name="BMRSr"; version="1.0.0"; sha256="0xdzzwmn2ibzgy68djsf7jxayfwd2yr1qsa0dcg9zl4rhl6b8nrl"; depends=[httr readr stringr tibble xml2]; }; @@ -312,18 +308,20 @@ in with self; { BMS = derive2 { name="BMS"; version="0.3.4"; sha256="0z3mk1xd1fphf80kdbashkn04jwsr2bghms4d7nav3pw73q41wql"; depends=[]; }; BMT = derive2 { name="BMT"; version="0.1.0.3"; sha256="1vdah5bsn41s2qriq15xi7dw9qzngaacmn5gk6yc7hi89dwyy3yj"; depends=[fitdistrplus partitions]; }; BMTME = derive2 { name="BMTME"; version="1.0.12"; sha256="0v1f1c2nk7f51c017jscyzkx7y21b3lmxp46xgs8hqcfjfw9b65m"; depends=[BGLR doSNOW dplyr foreach matrixcalc mvtnorm progress Rcpp RcppArmadillo snow tidyr]; }; - BMisc = derive2 { name="BMisc"; version="1.3.1"; sha256="0wh17bf1ii6zan09n59cf9257nb60nh08ig01id9k0bvm9f14ay6"; depends=[formula_tools plm]; }; + BMisc = derive2 { name="BMisc"; version="1.4.1"; sha256="176sqq24xyw9sz1pq721inmqwjxqqzbcp6w65f0m0n4b64yk5gyd"; depends=[]; }; BNDataGenerator = derive2 { name="BNDataGenerator"; version="1.0"; sha256="17zi83jhpn9ygavkpr9haffvd4622sca18jzzxxxmfq0ilrj201g"; depends=[]; }; BNN = derive2 { name="BNN"; version="1.0.2"; sha256="13h9xqfdqnc9d8brx1xlmvb4nrkpwncwjz98y7i3wijih85wkikd"; depends=[mvtnorm]; }; BNPMIXcluster = derive2 { name="BNPMIXcluster"; version="1.2.4"; sha256="06s0cs3anbby93n7pjcin9195agfzfq9im6f9k7ih3cbg8mzfaqy"; depends=[gplots MASS matrixcalc mvtnorm plyr Rcpp RcppArmadillo truncnorm]; }; BNPTSclust = derive2 { name="BNPTSclust"; version="2.0"; sha256="1ymvklv6d9684xzwdkvaxdjd1q20xmsf6kkfibn2wphlaqs2rh2n"; depends=[MASS mvtnorm]; }; - BNPdensity = derive2 { name="BNPdensity"; version="2019.9.18"; sha256="1s4mifmlvh0b0w4ckllg49z2jwfzy5d2x7lak38r92yg75nabng6"; depends=[coda dplyr ggplot2 gridExtra survival tidyr viridis]; }; + BNPdensity = derive2 { name="BNPdensity"; version="2020.3.4"; sha256="0775fcf5y78ibmhl5fljrlvznn1a74s5ihldb6wgixmm4c0xmz3x"; depends=[coda dplyr ggplot2 gridExtra survival tidyr viridis]; }; BNPmix = derive2 { name="BNPmix"; version="0.2.5"; sha256="16k7161yk1blpqwy9kj8lw565v9zl1298kqmf0agx8wjjjll4jyh"; depends=[coda ggplot2 Rcpp RcppArmadillo]; }; BNSL = derive2 { name="BNSL"; version="0.1.4"; sha256="0nrlx55364kgvkdpyaimgjxwnzmmdl1gmvyv3wkm8n2jyki92xxp"; depends=[bnlearn igraph Rcpp]; }; - BNSP = derive2 { name="BNSP"; version="2.1.2"; sha256="0ww09khxfi51spdh8b1qqi7hfms1djfs8pv2g3w5767aggr0b017"; depends=[coda corrplot cubature Formula ggplot2 gridExtra mgcv plot3D plyr threejs]; }; + BNSP = derive2 { name="BNSP"; version="2.1.3"; sha256="1dsic7vmmgklbd7ykkj1484j8gxkra1xjf0bpqc41wwjdc30gfj9"; depends=[coda corrplot cubature Formula ggplot2 gridExtra label_switching mgcv plot3D plyr threejs]; }; + BNrich = derive2 { name="BNrich"; version="0.1.1"; sha256="0m3cz7npc7mwq2vj68hllbd2vf5xqw00jaxv1pm3c28mq7pb459j"; depends=[bnlearn corpcor glmnet graph]; }; BOG = derive2 { name="BOG"; version="2.0"; sha256="0lz5af813b67hfl4hzcydn58sjhgn5706n2h44g488bks928k940"; depends=[DIME hash]; }; BOIN = derive2 { name="BOIN"; version="2.6.4"; sha256="0p1205pxa5a9sbw88fm8lbvzgzyq3mf62lsp0l2c0sfsvcfpydkg"; depends=[Iso]; }; BOSSreg = derive2 { name="BOSSreg"; version="0.1.0"; sha256="1nngs9j1hbb9ws423dxccjxwpkc5zl6l0zv46gb0v6m8y11d077b"; depends=[Matrix Rcpp RcppArmadillo]; }; + BPEC = derive2 { name="BPEC"; version="1.3.1"; sha256="0jvq56cq1wnhwd6wvg02hbx4b5vc2hz1lyxi63pl41rk0xva615a"; depends=[ape coda fields ggmap ggplot2 igraph maptools mvtnorm OpenStreetMap phytools sp]; }; BPM = derive2 { name="BPM"; version="1.0.0"; sha256="17k2d1xjfz85ygx0xnh6yqca9nyypd32d7sbna3k33ynsjqay3x8"; depends=[limma]; }; BRETIGEA = derive2 { name="BRETIGEA"; version="1.0.0"; sha256="176z7ajyfcfljv36d2sa15cvw047rsir3gn0l4lxmcyliw93r4lv"; depends=[]; }; BRISC = derive2 { name="BRISC"; version="0.2.0"; sha256="0dnkf4ld1blbadmxvgd0k021ihszrf2x19qypvv8jvgfrgcr8ax7"; depends=[matrixStats pbapply RANN rdist]; }; @@ -335,15 +333,16 @@ in with self; { BSL = derive2 { name="BSL"; version="3.0.0"; sha256="1cmydj59slj88awc2i7jg84hfaa9j3qp4d1042dgamc7xqvfh397"; depends=[coda copula foreach ggplot2 glasso gridExtra MASS mvtnorm Rcpp RcppArmadillo]; }; BSPADATA = derive2 { name="BSPADATA"; version="1.0"; sha256="1g709i0icxlxq2ljb2sm5iyc8ljqxadi62xc4mg702fsgl0x5ny9"; depends=[mvtnorm pscl spdep]; }; BSSasymp = derive2 { name="BSSasymp"; version="1.2-1"; sha256="0w141yxqpck59n85rjc6d3qy6bwhk1z80zsm21hda0bgfwy9v6wy"; depends=[fICA JADE]; }; + BSW = derive2 { name="BSW"; version="0.1.0"; sha256="0wh8m09nqzvsij8q8mdyr5yafdq7h568s28vih2wpplp0sv01945"; depends=[Matrix matrixStats quadprog]; }; BSagri = derive2 { name="BSagri"; version="0.1-10"; sha256="096l2ilr4x2fbjxchkksxkbiyaf7wwdmzn4xyjx001w873x9dgf6"; depends=[boot gamlss MCPAN mratios multcomp mvtnorm]; }; BTLLasso = derive2 { name="BTLLasso"; version="0.1-10"; sha256="0ab19dcn55nzkl3q865affiqjkd4j9yiil0a7kxcpbm0rva9x6zj"; depends=[Matrix psychotools Rcpp RcppArmadillo stringr TeachingDemos]; }; - BTM = derive2 { name="BTM"; version="0.2.1"; sha256="17h032dbg8n48dc74khab8vpprk76hlyngsgb52wlhczapkckf94"; depends=[Rcpp]; }; + BTM = derive2 { name="BTM"; version="0.3"; sha256="1vb3happ2fw3h7yilm87qxsrmncjnpaapiwqr7ai2p54vk7pax9m"; depends=[Rcpp]; }; BTSPAS = derive2 { name="BTSPAS"; version="2020.1.1"; sha256="004klyyg9gqalwx2i5lx57p1qxrm50nszzg839kv3v421b14qg80"; depends=[actuar coda data_table ggforce ggplot2 gridExtra plyr R2jags reshape2]; }; BTYD = derive2 { name="BTYD"; version="2.4"; sha256="13szcsgsrd7mwc4f47xrfrmsm2sg5sf7pfm21ly4cbvqcz8m0147"; depends=[hypergeo Matrix]; }; BTYDplus = derive2 { name="BTYDplus"; version="1.0.1"; sha256="0x8as4zskpbsvhh8gnvzgp833dkv01cs5fqfva9qri296343kppv"; depends=[bayesm BTYD coda data_table mvtnorm Rcpp]; }; BTdecayLasso = derive2 { name="BTdecayLasso"; version="0.1.0"; sha256="0x1s2zvv3vnapk5wp8582zwflsqvgc8khkvl5ch9i70v739jxp15"; depends=[ggplot2 optimr]; }; BUCSS = derive2 { name="BUCSS"; version="1.1.0"; sha256="1agx6yd29zq6gvwgnd0qahjnk5z7gdbijbg7rk85d5x6pihwmh9q"; depends=[]; }; - BVAR = derive2 { name="BVAR"; version="0.2.1"; sha256="0ql8ivnfkjy4sh376lxpm5bvy54h20zhhgwz8qrkl2x24lxsmwm0"; depends=[mvtnorm]; }; + BVAR = derive2 { name="BVAR"; version="0.2.2"; sha256="0gvzwxnscfny0xfr093bmbhyw82g93zabfd2y20b74l53f0asz9l"; depends=[mvtnorm]; }; BVS = derive2 { name="BVS"; version="4.12.1"; sha256="111g61bpwh80v6gy44q087swcrnnnzdcibm22pzzi9jsfphy6l0c"; depends=[haplo_stats MASS msm]; }; BVSNLP = derive2 { name="BVSNLP"; version="1.1.8"; sha256="0qlmvi189ky6h0a3jyvyil488asx3v6x52mvca7s93dvarxr6rw1"; depends=[doParallel foreach Rcpp RcppArmadillo RcppEigen RcppNumerical]; }; BWStest = derive2 { name="BWStest"; version="0.2.2"; sha256="02amzlfprmw5pyis0dg0kg0x8xqh50a4vfdcxxmklrzik3b1vzzs"; depends=[memoise Rcpp]; }; @@ -363,11 +362,12 @@ 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.5.4"; sha256="0a8p9k232ab36xjr5a8rkk19zf8cx8q1pvx54z0xg1dncn28lxwa"; depends=[curl dplyr furrr future lubridate purrr quantmod rvest scales stringr tibble tidyr XML zoo]; }; + BatchGetSymbols = derive2 { name="BatchGetSymbols"; version="2.5.6"; sha256="0cwnr4fxpjfm7l4jf3mmf14fdqnvavj5if0xf6fdx1spn59w8s97"; depends=[crayon curl dplyr furrr future lubridate purrr quantmod rvest scales stringr tibble tidyr XML zoo]; }; BatchJobs = derive2 { name="BatchJobs"; version="1.8"; sha256="1zz4sspj596pijxlz321g0jy2rg9ki83j6fihbwisjwr66p2vk1m"; depends=[backports BBmisc brew checkmate data_table DBI digest RSQLite sendmailR stringi]; }; BayHaz = derive2 { name="BayHaz"; version="0.1-3"; sha256="08ilghlkgyma5758yw7mdgqycqcillqmx73knzzdlg2kzc77dvg6"; depends=[]; }; BayLum = derive2 { name="BayLum"; version="0.1.3"; sha256="0hina84s8ax01zpnji4jqqkdap0phvxr78s4rnab0407xrydbf0w"; depends=[ArchaeoPhases coda hexbin KernSmooth Luminescence rjags]; }; BaySIC = derive2 { name="BaySIC"; version="1.0"; sha256="023ji6q1nvksmhp3ny8ad39xxccc0a1rv9iaiaagwavgzzc0pjd9"; depends=[fields poibin rjags]; }; + BayesARIMAX = derive2 { name="BayesARIMAX"; version="0.1.0"; sha256="1kz0x5l97l7zqpi3813ibqk6gsv3wsxnvgcw6lplg7gfxjavcz7w"; depends=[coda forecast TSA]; }; BayesBD = derive2 { name="BayesBD"; version="1.2"; sha256="10ik2lndqgmy6pvdm6cx4fsxgjb2fgi6hlz5ic35ab7fkpi90ka5"; depends=[jpeg mritc png Rcpp RcppArmadillo shiny]; }; BayesBEKK = derive2 { name="BayesBEKK"; version="0.1.0"; sha256="0fykcmf54820krwy7q573gmlcrx96i94knx7rgzc83i287lnpnfg"; depends=[coda MTS mvtnorm]; }; BayesBP = derive2 { name="BayesBP"; version="1.0"; sha256="1gmjljkp4pvm87qf6rq2kixqdx64sfg34b1xxdl242a3cckmjc5y"; depends=[iterators openxlsx]; }; @@ -382,12 +382,13 @@ in with self; { BayesFactor = derive2 { name="BayesFactor"; version="0.9.12-4.2"; sha256="1z083v7is21gm0a458jm5ph3xfdm7mh29a6sg2r1njq82f8x3s3g"; depends=[coda gtools hypergeo Matrix MatrixModels mvtnorm pbapply Rcpp RcppEigen stringr]; }; BayesGESM = derive2 { name="BayesGESM"; version="1.4"; sha256="0qw2byb48f67461m1k8a1rqh6a0c3zq1rc4ni9xzxv8dih4wkq0f"; depends=[Formula GIGrvg normalp]; }; BayesGOF = derive2 { name="BayesGOF"; version="5.2"; sha256="17wm0228xq3db431abyi9jr0q1q86nnajsn7hmy4dwzgvrlz5s0i"; depends=[Bolstad2 nleqslv orthopolynom VGAM]; }; - BayesLCA = derive2 { name="BayesLCA"; version="1.7"; sha256="0lsqgjqal9092v1wr07p8g5cqm24k2d80sp7hlr7r1xknakmm1b6"; depends=[coda e1071 fields MCMCpack nlme]; }; + BayesGPfit = derive2 { name="BayesGPfit"; version="0.1.0"; sha256="1sz0bb102h5fj1yz0k89cvcy0pvsh6rfm06i6lfz3pdhdjszsx00"; depends=[lattice]; }; + BayesLCA = derive2 { name="BayesLCA"; version="1.8"; sha256="1r62h8g2bjr68682pffjclcrxvpbz24gm28s03dnzjh4aha7f9y7"; depends=[coda e1071 fields MCMCpack nlme]; }; + BayesLN = derive2 { name="BayesLN"; version="0.1.2"; sha256="16nw6nxqqcqlcqjbz1nyk2laz5naqfj9hg1a616x1ms88bhxmcsx"; depends=[coda data_table fAsianOptions ghyp lme4 MASS optimx Rcpp RcppArmadillo]; }; BayesLogit = derive2 { name="BayesLogit"; version="2.1"; sha256="0w3bzk39sxdskwikcz5i0xwfsll4sqgkpr8vw8jvzlcy6dl3yhis"; depends=[]; }; BayesMAMS = derive2 { name="BayesMAMS"; version="0.1"; sha256="1qq3j9nm0k58gpyfavz77v1dwghy8pmpk0v52cj7l8sb3a3aiinm"; depends=[mvtnorm]; }; BayesMFSurv = derive2 { name="BayesMFSurv"; version="0.1.0"; sha256="1yxxzwjh1fgfh7qkzf9dfm3x0vbgb0v4p6bf6b5w14kvm06rzhkg"; depends=[coda FastGP MCMCpack mvtnorm Rcpp RcppArmadillo]; }; - BayesMallows = derive2 { name="BayesMallows"; version="0.4.1"; sha256="0q89al122393nym9i71gz5mh10d304fcnbw2naxwzmj744g3lpm2"; depends=[cowplot dplyr ggplot2 HDInterval igraph PerMallows purrr Rcpp RcppArmadillo Rdpack relations rlang sets tidyr]; }; - BayesMed = derive2 { name="BayesMed"; version="1.0.1"; sha256="1ysc7sh0drqxbisi2dz6gj4jlw6qsd879bbhr5pra7nxgmk4h650"; depends=[MCMCpack polspline R2jags]; }; + BayesMallows = derive2 { name="BayesMallows"; version="0.4.2"; sha256="0fxv2llly4ada34mvvbgmsjq0kypd5ln208c38wqp87im2lvalc6"; depends=[cowplot dplyr ggplot2 HDInterval igraph PerMallows purrr Rcpp RcppArmadillo Rdpack relations rlang sets tidyr]; }; BayesMixSurv = derive2 { name="BayesMixSurv"; version="0.9.1"; sha256="19kf39881q00pap9afwvvggk4s4w3qpz17b7065nig1mvk8dnp8r"; depends=[survival]; }; BayesNI = derive2 { name="BayesNI"; version="0.1"; sha256="0zvr6rkb5zxgl53xby69d0j3yrfnlcmac6kwkxz77q5616w9dwq0"; depends=[]; }; BayesNSGP = derive2 { name="BayesNSGP"; version="0.1.1"; sha256="11c83iafhl8yasyy8xwk9wladbj986xpmgc8d3yd9dxkic71flw8"; depends=[FNN Matrix nimble StatMatch]; }; @@ -396,42 +397,43 @@ in with self; { BayesPiecewiseICAR = derive2 { name="BayesPiecewiseICAR"; version="0.2.1"; sha256="1qrmw7zmygdzz84p76hyh2d8dx88b8xhbbd7radqm39g35zq5wz6"; depends=[mvtnorm]; }; BayesPostEst = derive2 { name="BayesPostEst"; version="0.2.0"; sha256="0yyf9mawpq8ynw5mx0684f8yw3ajf01wadfdvs2yanjlgqbmy1sj"; depends=[carData caTools coda dplyr ggmcmc ggplot2 ggridges HDInterval R2jags reshape2 rlang ROCR runjags texreg tidyr]; }; BayesRS = derive2 { name="BayesRS"; version="0.1.3"; sha256="0fhvnckabp0z1cdsbjgv3ijnzaxwhrk83fwcflgqbhvm3a9lzr77"; depends=[coda ggplot2 metRology reshape rjags]; }; - BayesS5 = derive2 { name="BayesS5"; version="1.31"; sha256="1azxn3r0s52zy6y5qsa6yx331795mkk7fb28fcinv2zx9iyvk33w"; depends=[abind Matrix snowfall]; }; + BayesReversePLLH = derive2 { name="BayesReversePLLH"; version="1.3"; sha256="07ijys5qd29qpa1hh6kbbp6fx97nmxydiijd0k0dh262vqfhh5ll"; depends=[Rcpp RcppArmadillo]; }; + BayesS5 = derive2 { name="BayesS5"; version="1.41"; sha256="0vs6s50h4gpxda9lbxfgn76k9kp81l62a6bv22r7ixsjlnd4baql"; depends=[abind Matrix snowfall splines2]; }; BayesSAE = derive2 { name="BayesSAE"; version="1.0-2"; sha256="1xbx9hr254agpcqs1fl7qi7h19fd2bbmjszn44l566n2svgvxwf5"; depends=[coda Formula lattice]; }; BayesSUR = derive2 { name="BayesSUR"; version="1.0-4"; sha256="1n38k9y1hvymfq556d5v2q69wqycvzdkjjgwzx0sz236wdqi64wv"; depends=[igraph Matrix Rcpp RcppArmadillo tikzDevice xml2]; }; - BayesSenMC = derive2 { name="BayesSenMC"; version="0.1.1"; sha256="0bvlhhivdaw386ir5zb47bxg5dbqlfjfxbs28gjdr0csskwvh107"; depends=[dplyr ggplot2 lme4 Rcpp rstan]; }; BayesSpec = derive2 { name="BayesSpec"; version="0.5.3"; sha256="17gchdijcjhbr2y4glbq9szjh4qmgivzh6p4fllh589da18nzjcr"; depends=[mvtnorm pscl trust]; }; BayesSummaryStatLM = derive2 { name="BayesSummaryStatLM"; version="1.0-1"; sha256="05mlgyi4fglvjkpqyw3vcjpipqllx37svcb20c1mrsa46m6fm4s7"; depends=[ff mvnfast]; }; BayesTree = derive2 { name="BayesTree"; version="0.3-1.4"; sha256="0saca1ln582szqzc2c78z24b1lszzhc9hvsin73kb7r2dlg5ciii"; depends=[nnet]; }; BayesTreePrior = derive2 { name="BayesTreePrior"; version="1.0.1"; sha256="13igmvw1wj8kzfijzsrhdqr52kv4vqrm91i71ay6f7jnkry3spaw"; depends=[]; }; BayesTwin = derive2 { name="BayesTwin"; version="1.0"; sha256="026blnhihbx9bpd63mxhbp0kpvj0lwbj7mg72alyfr2jnrh1n3lp"; depends=[coda foreign matrixStats rjags]; }; BayesValidate = derive2 { name="BayesValidate"; version="0.0"; sha256="1gli65avpkb90asx92l1yjbwaxcsyb920idyjwgd2sl2b3l657ly"; depends=[]; }; - BayesVarSel = derive2 { name="BayesVarSel"; version="1.8.0"; sha256="1sf18m4p8zaw2s5fv4p9s99n1n0cgzscgfhm5ngkzif43kwz1l6n"; depends=[MASS mvtnorm]; }; + BayesVarSel = derive2 { name="BayesVarSel"; version="2.0.1"; sha256="1107amhj3bclc434qizffjfmsa2w36qkp6gq7vgl0hwv0ncc0vyn"; depends=[MASS mvtnorm]; }; BayesX = derive2 { name="BayesX"; version="0.3-1"; sha256="0g4cdkvicqzg75qgr62j89dc9mni38ai7705j6jbfx59vn6dbrr5"; depends=[coda colorspace maptools shapefiles sp]; }; BayesXsrc = derive2 { name="BayesXsrc"; version="3.0-1"; sha256="0l8c6xsyqj09m722hdanr1d9n6a1ps77ybm1jaqmp86bqmq1br03"; depends=[]; }; BayesianAnimalTracker = derive2 { name="BayesianAnimalTracker"; version="1.2"; sha256="1pgjijqznfdpvw296h5vksnxgspxs7qhy6s84ww7abnlhg59bz5s"; depends=[TrackReconstruction]; }; - BayesianFROC = derive2 { name="BayesianFROC"; version="0.2.1"; sha256="017vdlw07mn0g3h8illvs0n4xdq6j6qvx1251gmhwvlnyb9lc2vh"; depends=[bridgesampling car crayon DiagrammeR ggplot2 knitr pracma Rcpp readxl rhandsontable rstan shiny shinydashboard shinythemes xlsx]; }; BayesianGLasso = derive2 { name="BayesianGLasso"; version="0.2.0"; sha256="09yb1qqx6qlsspk3ndrcqxy0956iqznw0rmyvqxgxxp3zd3y21xp"; depends=[MASS statmod]; }; BayesianNetwork = derive2 { name="BayesianNetwork"; version="0.1.5"; sha256="0vnnxzxz68dkfwr9wif8lam3a4khgbslbf49xkygqm8n1swysx2x"; depends=[bnlearn heatmaply lattice networkD3 plotly rintrojs shiny shinyAce shinydashboard shinytest shinyWidgets testthat]; }; BayesianPower = derive2 { name="BayesianPower"; version="0.1.6"; sha256="1n41blyqmjq2zdhbz8srsx32piyg26fwgzfphhka12ybk93b2d2h"; depends=[]; }; BayesianTools = derive2 { name="BayesianTools"; version="0.1.7"; sha256="0330bbnny35h4gsmwg31p3n3i511wrckzmp174ydm55pvsdkhjdg"; depends=[bridgesampling coda DHARMa ellipse emulator gap IDPmisc MASS Matrix msm mvtnorm numDeriv Rcpp tmvtnorm]; }; - Bayesrel = derive2 { name="Bayesrel"; version="0.1.0"; sha256="0nv5rar9h0yf2f710yb7g61lp8gvrkprp4qqqpc6r6vc22g8d02p"; depends=[coda ggplot2 ggridges LaplacesDemon lavaan MASS plotrix Rcsdp Rdpack]; }; + Bayesiangammareg = derive2 { name="Bayesiangammareg"; version="0.1.0"; sha256="0b0fqmig7vgmlrq2884q0apfd89nn5k4dj8rqjizkkbw4qpzmylb"; depends=[mvtnorm]; }; + Bayesrel = derive2 { name="Bayesrel"; version="0.6.1"; sha256="1mdc53g17c4r078mw74iiir03ks8kv60qh16l8fqy00vzwvbgpi9"; depends=[coda ggplot2 ggridges LaplacesDemon lavaan MASS plotrix Rcsdp Rdpack]; }; BaylorEdPsych = derive2 { name="BaylorEdPsych"; version="0.5"; sha256="1kq6nvzdqwawygp7k62lw5hyccsj81jg82hq60yidgxnmmnnf7y2"; depends=[]; }; BcDiag = derive2 { name="BcDiag"; version="1.0.10"; sha256="1gyinmx5wn2kk70hiy28ghilkhfirfjbfqdrqq5h3wfb4khnq6pz"; depends=[fabia]; }; - Bchron = derive2 { name="Bchron"; version="4.5.0"; sha256="0nxf0wzx2y3h7q0c23avn5hs7cqh9347xlk8l8fn65yd0d9xqrch"; depends=[coda dplyr ellipse ggforce ggplot2 ggridges magrittr MASS mclust purrr scales stringr viridis]; }; + Bchron = derive2 { name="Bchron"; version="4.7.0"; sha256="1wzi63szg6x6h8x5ngm8x3scp0qlgld5dyidqic5ibhvxd36rqhy"; depends=[coda dplyr ggforce ggplot2 ggridges magrittr MASS mclust purrr scales stringr]; }; Bclim = derive2 { name="Bclim"; version="3.1.2"; sha256="0dd4fx3rlljj3zb1m8q1bam1bswg497l3y8k0h0mkvjn94b4jbag"; depends=[ggplot2 MASS mclust statmod]; }; - BeSS = derive2 { name="BeSS"; version="1.0.6"; sha256="018gwcxhpmrblqh389krcpvxwrzl6fg25fg3mqrdvkalyx9xja5w"; depends=[glmnet Matrix Rcpp RcppEigen survival]; }; + BeSS = derive2 { name="BeSS"; version="1.0.8"; sha256="1yxinr3bfnk2ryal41l0j7i345aynrr62dd1rarrbyspxfrhimiq"; depends=[glmnet Matrix Rcpp RcppEigen survival]; }; Benchmarking = derive2 { name="Benchmarking"; version="0.28"; sha256="1f13m6fz9wd6zzknglcl0za16dbjsxn9f2714rpg8hcsr3hrlhdl"; depends=[lpSolveAPI ucminf]; }; BenfordTests = derive2 { name="BenfordTests"; version="1.2.0"; sha256="1nnj0w0zwcmg7maqmmpixx7alvsyxva370ssc26ahg6kxy5a621w"; depends=[]; }; Bergm = derive2 { name="Bergm"; version="5.0.1"; sha256="1zy2ar43v7pf1ibbhf7visy1ia24lfpa2kb921vxd7hiilky1h8v"; depends=[coda ergm Matrix matrixcalc MCMCpack mvtnorm network]; }; Bessel = derive2 { name="Bessel"; version="0.6-0"; sha256="0iwm08nhlivi4zwcqdi296a1l4n4lfanfxhaysh9vcsyk1kpiacf"; depends=[Rmpfr]; }; + Bestie = derive2 { name="Bestie"; version="0.1.1"; sha256="1vd139nl8dh707nvq35hylcng1hs8zycvjksnzxmwar1db9kgr7p"; depends=[BiDAG Rcpp]; }; BetaBit = derive2 { name="BetaBit"; version="1.3"; sha256="1x9mfnijgi8726p82d52g2zgmliwsc97v2g96mz9ccz2vqqnwq4w"; depends=[digest]; }; BetaPASS = derive2 { name="BetaPASS"; version="1.1-1"; sha256="17q1bfmijv38zyaj5fxlylf5zmkqry4ca9wm5km6zpksgsg2kjjq"; depends=[betareg ggplot2 pbapply]; }; - BeviMed = derive2 { name="BeviMed"; version="5.3"; sha256="01q5pr776ki973bcld20cqpsz9f10bb30vj95da9gbz5af6bvb14"; depends=[Rcpp]; }; + BeviMed = derive2 { name="BeviMed"; version="5.7"; sha256="1fjxin14x9i44wq6ad2i70k6sdfzy7zxyq1pibnmsyk4a0k2cfv1"; depends=[Rcpp]; }; BeyondBenford = derive2 { name="BeyondBenford"; version="1.2"; sha256="0319jva0b43xcx7l0jyn0cxkazv7qi05bzmpas8wphk9f8r9jlim"; depends=[ggplot2]; }; Bhat = derive2 { name="Bhat"; version="0.9-10"; sha256="1vg4pzrk3y0dk1kbf80mxsbz9ammkysh6bn26maiplmjagbj954v"; depends=[]; }; BiBitR = derive2 { name="BiBitR"; version="0.3.1"; sha256="0wfwph6nw12hb43j14i9ycj8m2zn0m5ynp7afq9cray8rbgvxfv6"; depends=[biclust cluster dendextend foreign lattice randomcoloR viridis]; }; - BiDAG = derive2 { name="BiDAG"; version="1.2.0"; sha256="0cn6aasrhqv5vkdb45a1mjzkgcppv1m57cx2bi97riy3siy5h0dy"; depends=[pcalg Rcpp]; }; + BiDAG = derive2 { name="BiDAG"; version="1.3.0"; sha256="0pbb77k0fipbd0bx9dxwlcqkgwyvx34865wc9b98g40zvzqn903f"; depends=[graph pcalg Rcpp Rgraphviz]; }; BiDimRegression = derive2 { name="BiDimRegression"; version="2.0.0"; sha256="0k0708z6xn04zjkc4sk15649wji6hl5q4rvd28sz5kbq7z54j1j5"; depends=[Formula]; }; BiProbitPartial = derive2 { name="BiProbitPartial"; version="1.0.3"; sha256="0y19b8bkwr7rpygmj03013slmfbyd7aj6714hm14w5rdbnckymw3"; depends=[coda Formula mvtnorm numDeriv optimr pbivnorm Rcpp RcppArmadillo RcppTN]; }; BiSEp = derive2 { name="BiSEp"; version="2.2"; sha256="1ha7rc1q54dr2xl4bpkiwl703igmmi9qphsgv2h0flq7iz0gr351"; depends=[AnnotationDbi GOSemSim mclust]; }; @@ -445,6 +447,7 @@ in with self; { BigVAR = derive2 { name="BigVAR"; version="1.0.6"; sha256="03d5a61clkngq67mkf2pyjj3k633kxp7g37myfplbxi55bdfmdlz"; depends=[lattice MASS Rcpp RcppArmadillo RcppEigen zoo]; }; BimodalIndex = derive2 { name="BimodalIndex"; version="1.1.9"; sha256="1m1dcj0ryjicaqjlkch7aymsklmvjvn2dvnbssi1cpi54bzn8l7g"; depends=[mclust oompaBase]; }; BinGSD = derive2 { name="BinGSD"; version="0.0.1"; sha256="0ygr5na7s82xa6vv9f3j6ns5sfhdacyykl1fg422lpkwbss39dnn"; depends=[mvtnorm]; }; + BinMat = derive2 { name="BinMat"; version="0.1.2"; sha256="17f5aaz8csfs1x1x7dxvbi4g97cp75kz7ikijsyk4pgpalld58a4"; depends=[magrittr MASS pvclust]; }; BinNonNor = derive2 { name="BinNonNor"; version="1.5.1"; sha256="1afxf0lcdsvw7ky3v25jyl9z9krknvw10ryi2fhgjbydq1nyijl6"; depends=[BB corpcor Matrix mvtnorm]; }; BinNor = derive2 { name="BinNor"; version="2.3.1"; sha256="07f08nn9sbpgddm849rgabka1cb19j3s1yg1c1wydbgfkjakv95x"; depends=[corpcor Matrix mvtnorm psych]; }; BinOrdNonNor = derive2 { name="BinOrdNonNor"; version="1.5"; sha256="0pw0a4g0v9g5k89hy5jz7hy4f3qg8fwyij6b1lj0b7bpy4mg0kv5"; depends=[BB corpcor GenOrd Matrix mvtnorm OrdNor]; }; @@ -472,19 +475,19 @@ in with self; { Bioi = derive2 { name="Bioi"; version="0.2.10"; sha256="1ay8889490nfhxhh72fvk9z4h58xknm2b145xhbx2wbzj65zf9ib"; depends=[assertthat dplyr igraph Rcpp]; }; Biolinv = derive2 { name="Biolinv"; version="0.1-2"; sha256="0g9vw1jcsjawmddkixssm5gbncy17fdd6a3c5b2qd4hx81kxz8q9"; depends=[classInt fields raster sp spatstat]; }; Biopeak = derive2 { name="Biopeak"; version="1.0"; sha256="1l08m1jl8yygbdfzk8klpj1q2m7icvxi98vmk7akxs0sswjc6wd2"; depends=[cluster dbscan factoextra gplots RColorBrewer]; }; - Bios2cor = derive2 { name="Bios2cor"; version="2.0"; sha256="1rrz0vs6wbkwys3l5jv1rdnlhyb4r1q9pv7jlnmsx6c1b4f4vz5n"; depends=[bigmemory bio3d circular igraph]; }; + Bios2cor = derive2 { name="Bios2cor"; version="2.1"; sha256="04wk1cjrrxhpv1kdhd67r1qvjv268xxi0z0r105wy912110z9m6x"; depends=[bigmemory bio3d circular igraph]; }; BisRNA = derive2 { name="BisRNA"; version="0.2.2"; sha256="11jl5109nlm272vncprwplkz4kpvg7yx6yfnbjg47lfrsxcj8n0g"; depends=[MASS]; }; - BisqueRNA = derive2 { name="BisqueRNA"; version="1.0.1"; sha256="0jbplh1vfcr5rwqbli2h5bg7b3rdkc9vbsyj7fzlz474blzfg6mr"; depends=[Biobase lsei]; }; + BisqueRNA = derive2 { name="BisqueRNA"; version="1.0.2"; sha256="0j3z704hnfdmmbs8jzsnk7mvklpg5bs8jika810j8ygl97skdk5h"; depends=[Biobase lsei]; }; BivGeo = derive2 { name="BivGeo"; version="2.0.1"; sha256="1sj52v1zmk425jw9acq9y0jdp3agx103yzf1bjbc5vrmk1x0i0qr"; depends=[]; }; BivRec = derive2 { name="BivRec"; version="1.2.0"; sha256="1q68qs2xm3qry7wc5ilrgjpyygfbcvvqy61yg98h5px302d1ixk3"; depends=[dplyr MASS Rcpp stringr survival]; }; BivRegBLS = derive2 { name="BivRegBLS"; version="1.1.1"; sha256="1kpl0pwm2g40pxrfbz2d95vcrm51flg6bgc83661349cmc9a2511"; depends=[ellipse]; }; - BivUnifBin = derive2 { name="BivUnifBin"; version="1.3.1"; sha256="1ppsayixsbq0f71il93m5ih6gjwf2pavg7dhfj8gm5y8qkiz7pwc"; depends=[BinOrdNonNor rootSolve]; }; + BivUnifBin = derive2 { name="BivUnifBin"; version="1.3.2"; sha256="14v00fycxwnnm4x4hckckqb90j5m8hsbkr65z2zln459l6rsdwx9"; depends=[BinOrdNonNor rootSolve]; }; BivarP = derive2 { name="BivarP"; version="1.0"; sha256="08f7sphylaj3kximy1avaf29hxj2n800adsnssh01p9bcxnzb2i4"; depends=[copula dfoptim survival]; }; Bivariate_Pareto = derive2 { name="Bivariate.Pareto"; version="1.0.3"; sha256="11knwynqfxdz6zl7vzr48jpygcilsxarpmwphaajh62asdlg5w6p"; depends=[compound_Cox]; }; BlakerCI = derive2 { name="BlakerCI"; version="1.0-6"; sha256="0dcmnaf0k195caajy8h4qymyfj45cjwmkcgsbwv0z7x3h9sx5k6v"; depends=[]; }; BlandAltmanLeh = derive2 { name="BlandAltmanLeh"; version="0.3.1"; sha256="11p30zqb3f9ifk3v18dspg18sclz5zxjygy7hw8ccb4bcqhx68lm"; depends=[]; }; Blaunet = derive2 { name="Blaunet"; version="2.0.8"; sha256="127nl041a1rbf8c4ffv8sbkn5y03ywaxkp51yd0sahs2anf415y4"; depends=[cairoDevice ergm foreign gWidgets gWidgetsRGtk2 haven network plot3D plot3Drgl rgl RGtk2 sna statnet_common]; }; - Blendstat = derive2 { name="Blendstat"; version="1.0.2"; sha256="04rn5yqkmqrcali75ly476x0dasysbxilynziy48mrm6q3h7xyjy"; depends=[lattice MASS]; }; + Blendstat = derive2 { name="Blendstat"; version="1.0.3"; sha256="0d5zzqiav7b5prh8332kwqy6ga96lkbkdjis8qwifa11j5qa087a"; depends=[lattice MASS]; }; BlockCov = derive2 { name="BlockCov"; version="0.1.1"; sha256="1ilqd8kvhlq0nc1n4y7g0aiwran3kyqs8i143j6dv2wy3myn5x0l"; depends=[BBmisc dplyr magrittr Matrix Rdpack rlang tibble]; }; BlockFeST = derive2 { name="BlockFeST"; version="1.6"; sha256="0hj7a5as7nxbgjac7lbj6qfwffx3g8x8phpf9a55f1c9cdzi73a5"; depends=[BASIX]; }; BlockMessage = derive2 { name="BlockMessage"; version="1.0"; sha256="1jrcb9j1ikbpw098gqbcj29yhffa15xav90y6vpginmhbfpwlbf4"; depends=[]; }; @@ -499,8 +502,9 @@ in with self; { BondValuation = derive2 { name="BondValuation"; version="0.1.0"; sha256="1sgnf5a6rm1br6i82bmp7s044012bwfxa9yb6bjkq8kr83mf7i6v"; depends=[Rcpp timeDate]; }; BoolFilter = derive2 { name="BoolFilter"; version="1.0.0"; sha256="14z4fzf8p4wgi939qs6v39a3xizccjcx7j4szsydllpkvxbwggbw"; depends=[BoolNet Rlab]; }; BoolNet = derive2 { name="BoolNet"; version="2.1.5"; sha256="11fysc39vfk3zb9qklryi8gl42c3hqgzlvci4jj0zkqnm0v9amqk"; depends=[igraph XML]; }; - Boom = derive2 { name="Boom"; version="0.9.3"; sha256="1mp8vp5fgfirlbgix5vncf05n6b7xyk5giqzxgxnd8g9l4j8r7rd"; depends=[MASS]; }; - BoomSpikeSlab = derive2 { name="BoomSpikeSlab"; version="1.2.1"; sha256="1fxh39rplcnpfyffvzl7kns04lvfc1jx70nsq1380471z1n144lj"; depends=[Boom igraph]; }; + Boom = derive2 { name="Boom"; version="0.9.4"; sha256="0m1yls9wm0p4k7v7760fycb4157k0f00h50gs1h6x17d5z9w2i7q"; depends=[MASS]; }; + BoomSpikeSlab = derive2 { name="BoomSpikeSlab"; version="1.2.2"; sha256="0wz0b7ayhk97zva3mkxbpsf9ddsqdldzl1b1cv9b7qvakn8k7if9"; depends=[Boom]; }; + BoostMLR = derive2 { name="BoostMLR"; version="1.0.2"; sha256="1iy8v9jc13wncz6z3rqlbxkf9lclq0qynp4m54b5xl35qz9xq676"; depends=[nlme Rcpp RcppArmadillo]; }; BootMRMR = derive2 { name="BootMRMR"; version="0.1"; sha256="07am80603pv1dh5ma3zb0idnslkzm5m3ym8sd1nhkh8zbc6qqmzs"; depends=[]; }; BootPR = derive2 { name="BootPR"; version="0.60"; sha256="03zw7hz4gyhp6iq3sb03pc5k2fhvrpkspzi22zks25s1l7mq51bi"; depends=[]; }; BootWPTOS = derive2 { name="BootWPTOS"; version="1.2"; sha256="1860l11xg7444l3x42rq3636csla23gg0mi5in1zibjwn1ddc202"; depends=[fractal wavethresh]; }; @@ -508,81 +512,80 @@ in with self; { Boptbd = derive2 { name="Boptbd"; version="1.0.5"; sha256="1p786avc37yq5g01zh6sqx7b1rvbxrh6gbxsad4bdvr12cjdsss6"; depends=[igraph MASS Matrix]; }; Boruta = derive2 { name="Boruta"; version="6.0.0"; sha256="1pp8zal1vhxlzdhl20phn39m3ffhw5glyqbcgwa0w14zw2mpm6hw"; depends=[ranger]; }; BosonSampling = derive2 { name="BosonSampling"; version="0.1.1"; sha256="0wxn12h903a0mlrkrr3w4qd9ld2a4bifs95i98cnl2dsb76rwf12"; depends=[Rcpp RcppArmadillo]; }; - BradleyTerry2 = derive2 { name="BradleyTerry2"; version="1.1-0"; sha256="13lhs6rynyj9cw13panqbn2jzkhq5fixhfd0ldr128gvw5d43hxg"; depends=[brglm gtools lme4 qvcalc]; }; - BradleyTerryScalable = derive2 { name="BradleyTerryScalable"; version="0.1.0"; sha256="0g12fkfs2sykyd6fzf924zv8gj2js452c4pf0pz2p6156chwrk8c"; depends=[dplyr igraph Matrix purrr Rcpp RcppArmadillo]; }; - BrailleR = derive2 { name="BrailleR"; version="0.30.2"; sha256="0n44qmy7hcxa09zh4wr22mrv61zgpl4w67l0iivm0wibnkgz6vx7"; depends=[devtools dplyr extrafont ggplot2 gridGraphics gridSVG hunspell knitr magrittr moments nortest reticulate rmarkdown roloc rolocISCCNBS whisker XML xtable]; }; + BoutrosLab_plotting_general = derive2 { name="BoutrosLab.plotting.general"; version="6.0.0"; sha256="156wigny50lzqkv6y4f7mww90bijjzdcz2dhjaa4sdkfz5q3kvm3"; depends=[cluster e1071 gridExtra gtable hexbin lattice latticeExtra MASS]; }; + BradleyTerry2 = derive2 { name="BradleyTerry2"; version="1.1-2"; sha256="0vss3ib74cz2zn1afmrvllawghj9z2ay4x1ysvk4rqvjmiia4a2i"; depends=[brglm gtools lme4 qvcalc]; }; Branching = derive2 { name="Branching"; version="0.9.4"; sha256="1c209gdasm7qipv2gg4d1hr0jmhnzz5rddgjxb7xacazc0c2mhff"; depends=[]; }; - BreedingSchemeLanguage = derive2 { name="BreedingSchemeLanguage"; version="0.9.6"; sha256="0lj8s42ndqqllnm8v978481zqmc751v31909rir1pkwcsm3irisx"; depends=[ggplot2 lme4 Matrix Rcpp rrBLUP snowfall]; }; Brobdingnag = derive2 { name="Brobdingnag"; version="1.2-6"; sha256="1m3ajvcksqfck5l5hj5xiflj4ry6d896ybv4f0xxks8chgnwmv0r"; depends=[]; }; BrownDog = derive2 { name="BrownDog"; version="0.2.1"; sha256="0wnf1jcf4cakbvj9j1l7jk9mq7gd4j1il1ha2vglghqn04f27938"; depends=[httpuv jsonlite RCurl]; }; Brq = derive2 { name="Brq"; version="2.5"; sha256="0b7xsamzvg2z746qrpq1nc9181awr7darnk06xi4wzqygbxgnll2"; depends=[]; }; Brundle = derive2 { name="Brundle"; version="1.0.9"; sha256="0z17wgmi272738n8pn6r60v5gbg8cbmwhc94s8f3vipa44h690bc"; depends=[DESeq2 DiffBind lattice Rsamtools]; }; BsMD = derive2 { name="BsMD"; version="2013.0718-1"; sha256="06w1dl5zp1cgjhk3m2zz6xsmcfwdk6ar3gmxdn96v71mqnhv81v1"; depends=[]; }; - Buddle = derive2 { name="Buddle"; version="1.0"; sha256="1aw0xmdw4m778vk9wqxy90dv9rkkb17d51f0sdwypb3l7d4d897b"; depends=[Rcpp RcppArmadillo]; }; + Buddle = derive2 { name="Buddle"; version="2.0.1"; sha256="0hi516cbl93z00jpdgyp3j5hz0xf594vn65p6ahpffwzh1l8s1cf"; depends=[plyr Rcpp RcppArmadillo]; }; BullsEyeR = derive2 { name="BullsEyeR"; version="0.2.0"; sha256="1p8b5w818zi7zs0n13cc3sw8z0z9mfr5cn5y5icsx1jam5amppci"; depends=[Matrix NLP slam tm topicmodels]; }; BurStFin = derive2 { name="BurStFin"; version="1.02"; sha256="16w2s0bg73swdps9r0i8lwvf1najiqyx7w7f91xrsfhmnqkkjzka"; depends=[]; }; BurStMisc = derive2 { name="BurStMisc"; version="1.1"; sha256="0cyi42zkn2dby162x9f95b3hpqxbzx25s7nahb4p86r60xj3a5c0"; depends=[]; }; BusinessDuration = derive2 { name="BusinessDuration"; version="0.2.0"; sha256="17923n1r3n8kp7qqzr2dv8ffax355yyc3b9f6mv2hxy6k31hrrb8"; depends=[chron]; }; - BuyseTest = derive2 { name="BuyseTest"; version="1.8.3"; sha256="0kwv4jcn4rqdcglj2y9xm3i1g47jz7xdkp7r9hnvxq4xh3sp4fqr"; depends=[data_table doParallel foreach lava prodlim Rcpp RcppArmadillo]; }; + BuyseTest = derive2 { name="BuyseTest"; version="1.8.5"; sha256="1czgkp1n9rvc9v8vzb991pn6hw1wx77gjrdz5bfgi2whzdj2dgn0"; depends=[data_table doParallel foreach lava prodlim Rcpp RcppArmadillo]; }; Bvalue = derive2 { name="Bvalue"; version="1.0"; sha256="17zlllzjrcq4grggal3hlg384990n62wnflr2g21fa6hcnglwy7d"; depends=[]; }; C443 = derive2 { name="C443"; version="1.0.0"; sha256="0d04769m9kkjqpj1cgfhqrri893nwi6qn7fz63z5pkym5cig5yyi"; depends=[cluster ggplot2 gridExtra igraph MASS partykit qgraph RColorBrewer reshape2 rpart]; }; C50 = derive2 { name="C50"; version="0.1.3"; sha256="01cbkilvp18r4f2khkj48w0znngvqckng91530kqqdqr2wc1ssac"; depends=[Cubist partykit]; }; CA3variants = derive2 { name="CA3variants"; version="2.0"; sha256="1wnc9qfcligpsi5ycmzw0igm14h6lvf4vd82aygnas6q41vnypwz"; depends=[ggplot2 ggrepel gridExtra multichull]; }; CADFtest = derive2 { name="CADFtest"; version="0.3-3"; sha256="06bwv728ckalzibxginzfica24w18m4g87i0i064m3q89ghmnlqm"; depends=[dynlm sandwich tseries urca]; }; CADStat = derive2 { name="CADStat"; version="3.0.8"; sha256="0wdglw1vyd5gz70r9ma0mwshvizv39nb4ahp8pvr70c4qqzsfhc0"; depends=[bio_infer car gdata gmodels JavaGD JGR lattice MASS quantreg rJava rpart XML]; }; - CAISEr = derive2 { name="CAISEr"; version="1.0.15"; sha256="0igm1yvhllnhqd0bc2z6bfjdmr3w2465xi7vyaa7a68dd5k81apj"; depends=[assertthat ggplot2 gridExtra pbmcapply]; }; + CAISEr = derive2 { name="CAISEr"; version="1.0.16"; sha256="08br6hdpgf9y2fix299diwd8r3q4gylpbzll4knpxq0vi18a3hz3"; depends=[assertthat ggplot2 gridExtra pbmcapply]; }; CALF = derive2 { name="CALF"; version="0.2.0"; sha256="12w1vr0rk6m4lv6zvqrf45k81d301ln1253wyy9xi6mv1hkabg0v"; depends=[ggplot2]; }; CAMAN = derive2 { name="CAMAN"; version="0.74"; sha256="0d932fbqzlxlhn7m8zfx7wr02pc7fm8398rym1jh2cdy2fk5im08"; depends=[mvtnorm sp]; }; CANSIM2R = derive2 { name="CANSIM2R"; version="1.14.1"; sha256="1dnzbd9lyqj3w80lx12qxcsbmv8wy6hxknyi5ijp99cfv7kaq1kc"; depends=[downloader Hmisc reshape2]; }; - CARBayes = derive2 { name="CARBayes"; version="5.1.3"; sha256="13l83wbacwg3mcl8njm872jaz9z15daj9qn5pb6w16iijcblk5ak"; depends=[CARBayesdata coda leaflet MASS matrixcalc MCMCpack Rcpp rgdal sp spam spdep truncnorm]; }; - CARBayesST = derive2 { name="CARBayesST"; version="3.0.2"; sha256="0gi5x0j1vzgkg8xhvsfqdvsn8n6dp6wzlzdsvf5sv9nydcdbac75"; depends=[CARBayesdata coda dplyr gtools leaflet MASS matrixcalc matrixStats Rcpp rgdal sp spam spdep testthat truncdist truncnorm]; }; + CARBayes = derive2 { name="CARBayes"; version="5.2"; sha256="08ajcgc0ycngcl2d757yjz1mpki88aq2jp07nr64j8aqpych5lw2"; depends=[CARBayesdata coda dplyr GGally leaflet MASS matrixcalc MCMCpack Rcpp rgdal sp spam spdep truncnorm]; }; + CARBayesST = derive2 { name="CARBayesST"; version="3.1"; sha256="12l4jdbaadnyngqphzc8fsspynryci9p9h6bl1196arqd5igax94"; depends=[CARBayesdata coda dplyr GGally ggplot2 gridExtra gtools leaflet MASS matrixcalc matrixStats Rcpp rgdal sp spam spdep testthat truncdist truncnorm]; }; CARBayesdata = derive2 { name="CARBayesdata"; version="2.1"; sha256="09rjxdrbpnqm6gv9g1jxh91jmww345wi9vlhb4s1n6b3xnh44fhs"; depends=[shapefiles sp]; }; CARE1 = derive2 { name="CARE1"; version="1.1.0"; sha256="1zwl4zv60mrzlzfgd7n37jjlr0j918a8ji36n94s5xw8wwipiznw"; depends=[]; }; CARLIT = derive2 { name="CARLIT"; version="1.0"; sha256="04kpjfps4ydf8fj75isqp16g1asdsyf8nszhbfkpw1zxkrmiksyp"; depends=[]; }; - CARRoT = derive2 { name="CARRoT"; version="2.0.0"; sha256="1x8y803rvfchmjfw608nframvdm3nvci36bv0bb9h42z8gviyh0v"; depends=[doParallel foreach nnet Rdpack]; }; + CARRoT = derive2 { name="CARRoT"; version="2.5.0"; sha256="1ijmj95gbxa2179bscbbz6qqaqjk7a5i6m4xla5z6h3vrddssxmz"; depends=[doParallel foreach nnet Rdpack]; }; CARS = derive2 { name="CARS"; version="0.2.2"; sha256="18l2bhfwma24q1zg1y1xmlcmnbzjqmmny3h7s179kslagnh3kmsj"; depends=[np]; }; CASMAP = derive2 { name="CASMAP"; version="0.6.0"; sha256="1z321l34da5ggwmbggs9d8m96syra1jm29gj68lfhd7ikbpmw96w"; depends=[Rcpp]; }; - CAST = derive2 { name="CAST"; version="0.3.1"; sha256="1cqadrww0w2wkqmh4mi2bmdr572q5qpnz2c4jpvwqrk2ynhz43qn"; depends=[caret ggplot2]; }; + CAST = derive2 { name="CAST"; version="0.4.0"; sha256="0s92a1ybjqi9d0f7xrk77jg42q3allizb627h28ndg6nj02h23ap"; depends=[caret ggplot2]; }; CATT = derive2 { name="CATT"; version="2.0"; sha256="12xdspl1gbf51snyrl44nn7alfyccdfihibkgvzr66lrby8b8fhg"; depends=[]; }; CATTexact = derive2 { name="CATTexact"; version="0.1.0"; sha256="0mklkmay9ph4d0z2l1gcg0lj429xkyhmz7srdil5rgwqxx9dnqs8"; depends=[]; }; CATkit = derive2 { name="CATkit"; version="3.3.3"; sha256="01q2ssyg0jcjgahaslfgpakjsv2wil654lc6xrg5xbbrkx7ccb90"; depends=[assertr CombMSC Hmisc magic MASS png rtf season signal]; }; - CAWaR = derive2 { name="CAWaR"; version="0.0.1"; sha256="1z8xmwnxwlk0nhi22nabwzggizzsp8jzwfln0h2hkk7h1p8xjlhk"; depends=[fieldRS ggplot2 lubridate raster rgdal rgeos rsMove RStoolbox sp spatialEco]; }; CAinterprTools = derive2 { name="CAinterprTools"; version="1.0.0"; sha256="1ia4qfvj0nzxi6pwqnha2vpfcx3qwaw4vrjqiza11sai274j0pjy"; depends=[ca classInt cluster FactoMineR ggplot2 ggrepel Hmisc RcmdrMisc reshape2]; }; - CAvariants = derive2 { name="CAvariants"; version="5.0"; sha256="0y87xg2iwsmn8klavapncd7vkqvl15z9crmx3ja56ksb36czn8kk"; depends=[ggplot2 ggrepel gridExtra]; }; + CAvariants = derive2 { name="CAvariants"; version="5.5"; sha256="0bxifvhpjay18k6gkppypc1d0zaln1zhnxabvvld0pz4h59s2hlv"; depends=[ggforce ggplot2 ggrepel gridExtra plotly]; }; CB2 = derive2 { name="CB2"; version="1.3.0"; sha256="050fpyj0zrgl03a2mdp9xrl72ad0d92kl7s9swgn2a7g8ca34c0k"; depends=[dplyr ggplot2 glue magrittr metap pheatmap R_utils Rcpp RcppArmadillo readr stringr tibble tidyr]; }; - CBCgrps = derive2 { name="CBCgrps"; version="2.6"; sha256="0kz7dqi5mbj4q6whdcizg85hw0ikdyb2vfh3xx1v40j09qv9w4vk"; depends=[nortest]; }; + CBCgrps = derive2 { name="CBCgrps"; version="2.7"; sha256="1hqndrz3snir3pibqsbyzgbllgmdiprgq27a31vl29vkswpiwwsm"; depends=[nortest]; }; CBDA = derive2 { name="CBDA"; version="1.0.0"; sha256="0qm77vvqjgi83i8izly995ziv9ski8kgzqyq4g81i2k7a5dp8vxv"; depends=[doParallel foreach prettydoc SuperLearner]; }; CBPS = derive2 { name="CBPS"; version="0.21"; sha256="0av9lgdn9z57xl9cp53pi9nq971a6fj4przczw7sdb5saml3yr30"; depends=[glmnet MASS MatchIt nnet numDeriv]; }; + CBSr = derive2 { name="CBSr"; version="1.0.3"; sha256="0lfs8p9nha1aq6dn6sd3pc9x0931zawxprpflfv9gqb8w7n1z4sd"; depends=[NlcOptim rJava]; }; CBT = derive2 { name="CBT"; version="1.0"; sha256="13h6sf7w03nfq2arqymwww13ywnv9xnqbqazlzn856mj3ggaqda7"; depends=[]; }; CC = derive2 { name="CC"; version="1.0"; sha256="189si37ggichqmzy8m686zw1cijix7yfy8ma5iqpnq1q9vm3pcvy"; depends=[]; }; CCA = derive2 { name="CCA"; version="1.2"; sha256="00zy6bln22qshhlll0y0adnvb8wa1f7famqyws71b6pcnwxki5ha"; depends=[fda fields]; }; CCAGFA = derive2 { name="CCAGFA"; version="1.0.8"; sha256="1jxb6d1h5p97wnr45s1fsspksqn771nib415ihxi4vj5w8s94j8b"; depends=[]; }; - CCAMLRGIS = derive2 { name="CCAMLRGIS"; version="3.0.1"; sha256="03wm2cbyvrrfh0f8jxxllqhm176xf06fnghwzakq5ivxpi5a1qsh"; depends=[dplyr geosphere magrittr raster rgdal rgeos sp]; }; + CCAMLRGIS = derive2 { name="CCAMLRGIS"; version="3.0.3"; sha256="0nwz007hn937y6ckkv7lcabyhcj7cvpy23hr03naggdbd4ql0gjf"; depends=[dplyr geosphere magrittr raster rgdal rgeos sp]; }; CCM = derive2 { name="CCM"; version="1.2"; sha256="1mhl7yppniybdffylddbbb65n7gmv029fb46wlsxm4yf2xkplmwy"; depends=[]; }; CCP = derive2 { name="CCP"; version="1.1"; sha256="07jxh33pb8llk1gx4rc80ppi35z8y1gwsf19zrca9w91aahcs8cx"; depends=[]; }; CCTpack = derive2 { name="CCTpack"; version="1.5.2"; sha256="1kkxsk9x4jz2bvldmba7fsri3zc1cjz15z0xicjmfc7lj72ngdig"; depends=[MASS mvtnorm polycor psych R2jags rjags]; }; 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.4-19"; sha256="1ln1r3rk004fmk55iy08bjh3vv4wnkb8zg2wj3r9rq7pi8jn8fv4"; depends=[mvtnorm polycor Rcpp RcppArmadillo]; }; + CDM = derive2 { name="CDM"; version="7.5-15"; sha256="159ny2dz0rf1r3k1mqlfwambffc8rx425sggf5bn51nybpzanq3l"; depends=[mvtnorm polycor Rcpp RcppArmadillo]; }; CDNmoney = derive2 { name="CDNmoney"; version="2012.4-2"; sha256="1isbvfq0lygs75y1hn3klqms8q7g1xbkcr8fgj75h1c99d4khvm6"; depends=[]; }; CDROM = derive2 { name="CDROM"; version="1.1"; sha256="0mvhqs4m8jp39x1rk31a1sqqmfq1avcnasgh8bizlyxx62igmi1b"; depends=[]; }; CDVine = derive2 { name="CDVine"; version="1.4"; sha256="0cp78pb6yny4n5q2j9k6xdql588536572gbphnw8zkdmrg65qyz7"; depends=[igraph MASS mvtnorm]; }; CDVineCopulaConditional = derive2 { name="CDVineCopulaConditional"; version="0.1.1"; sha256="1wyy324vrwipdsq0p021bj1gdhyxg09g3dkw8wv5v6rfrrs84m9k"; depends=[combinat VineCopula]; }; CEC = derive2 { name="CEC"; version="0.10.2"; sha256="03fxhqlpn7x3djfanlix3yzf1cy6zf854g70gq2d93ix9gis7knv"; depends=[]; }; CEGO = derive2 { name="CEGO"; version="2.4.0"; sha256="1rmx9ppiw7k5cznanz3m4lnhriz3fs4f7wk5h3q9wg9cyzfjhh38"; depends=[DEoptim fastmatch MASS Matrix ParamHelpers quadprog]; }; - CENFA = derive2 { name="CENFA"; version="1.0.0"; sha256="0ah8rh0gbwwhdfxzj9sj4i8iqbybkga09vinlh0r514ayv2qq2x8"; depends=[doSNOW foreach magrittr pbapply raster Rcpp snow sp]; }; + CENFA = derive2 { name="CENFA"; version="1.1.0"; sha256="03l0i24m2mh0gfmg7b48qg15zmfr8a39l1nswvmbmcj2a5hxybf4"; depends=[doSNOW foreach magrittr pbapply raster Rcpp snow sp]; }; CEoptim = derive2 { name="CEoptim"; version="1.2"; sha256="0bbjrhl63cbx1rsr5gclbqhjpnjid8ynk2ygaf1chf8z381n7650"; depends=[MASS msm sna]; }; CFC = derive2 { name="CFC"; version="1.1.2"; sha256="0k0685cgsd0lm7id6h216r4x236xn3nqj4h906qn2i0kvwmx4nda"; depends=[abind doParallel foreach Rcpp RcppArmadillo RcppProgress survival]; }; - CGE = derive2 { name="CGE"; version="0.2.8"; sha256="1bsrnrchwh2fjsx1gm8qx3f792ma5civw3w0j7is5lwyqff2q0cz"; depends=[]; }; - CGGP = derive2 { name="CGGP"; version="1.0.1"; sha256="0vpj2bmij8wwckyzbmid6dyzpwy4jcbgpch3j143rag7pvgmc87q"; depends=[Rcpp RcppArmadillo]; }; - CGManalyzer = derive2 { name="CGManalyzer"; version="1.2"; sha256="1993hxpaplb2qxrjfnm63alks0wb3msrffycmwd9p9md5glzci9y"; depends=[]; }; + CFF = derive2 { name="CFF"; version="1.0"; sha256="04z3q0s4b1yns5l7lplw8qrcdjzsdy9crnhakyzd6r449hjfsvnz"; depends=[]; }; + CGE = derive2 { name="CGE"; version="0.3.1"; sha256="0bn88m0mls7qyv40l2nd1g1hxjdj2rjxwaf9a08xigicix48j7i6"; depends=[]; }; + CGGP = derive2 { name="CGGP"; version="1.0.2"; sha256="0z71sl1vsz3f84scxa25444fb6wm1jbd05syapggjxnjcglmiq45"; depends=[Rcpp RcppArmadillo]; }; + CGManalyzer = derive2 { name="CGManalyzer"; version="1.3"; sha256="1wmp5im18s447rjkj891skrm7558xkqlbx43n9hyxiqg49zq1ng9"; depends=[]; }; CGP = derive2 { name="CGP"; version="2.1-1"; sha256="05a6gydlb99yk2jpy2hyg4c30hqyp8dg2i9dmbjc1n5cmgpg3im9"; depends=[]; }; - CGPfunctions = derive2 { name="CGPfunctions"; version="0.5.7"; sha256="0afyv64kqmjsymnp9vzn55zn8qri2ic4mhsc77rf5s1jzamcgjlp"; depends=[broomExtra car DescTools devtools dplyr ggplot2 ggrepel pwr rlang scales sjstats tibble]; }; + CGPfunctions = derive2 { name="CGPfunctions"; version="0.6.0"; sha256="0n3p49nnm2lj8gzaalrkfkjglxb5bnlgc8cxfgw3jiizikj3dla5"; depends=[BayesFactor broom car DescTools dplyr forcats ggmosaic ggplot2 ggrepel paletteer partykit purrr rlang scales sjstats stringr tidyr]; }; CHCN = derive2 { name="CHCN"; version="1.5"; sha256="18n8f002w0p0l1s5mrrsyjddn10kdbb6b7jx1v9h1m81ifdbv0xb"; depends=[bitops RCurl]; }; CHFF = derive2 { name="CHFF"; version="0.1.0"; sha256="0jv75p1bnwsad2vpxf1zwq97al9xxhk2hpnpsilf0jn0w7g9b2d3"; depends=[]; }; CHMM = derive2 { name="CHMM"; version="0.1.1"; sha256="07fdvnwhblwvljbl2z0vs42nwki67yl5ly3fj40p50k3rnqqmavj"; depends=[mclust]; }; - CHNOSZ = derive2 { name="CHNOSZ"; version="1.3.4"; sha256="01kvqyissybg28c275a2is9v45jrv20ggsz3z6qga2r9kr13a3c7"; depends=[]; }; + CHNOSZ = derive2 { name="CHNOSZ"; version="1.3.6"; sha256="0imfyvagvxqffvz3ksvkmfc2lbfli5lsxvnqby7iw2dp1gzpaxqc"; depends=[]; }; CHsharp = derive2 { name="CHsharp"; version="0.4"; sha256="19mb5zzi9x4pm2z9jbha5dz4k5f1iqjv31aisyv4qh14k5ysdz2i"; depends=[KernSmooth scatterplot3d]; }; CIAAWconsensus = derive2 { name="CIAAWconsensus"; version="1.3"; sha256="0yhay4fp5lyf0sdcf807yvys17qz9cr5f5ikim25mq336p7fp03x"; depends=[Matrix mvtnorm numDeriv stringr]; }; CIEE = derive2 { name="CIEE"; version="0.1.1"; sha256="03kq9cp0v41y0r2l9j5imcrsail2xsvlzhhhsrw454d4s9gqdql9"; depends=[survival]; }; @@ -602,13 +605,12 @@ in with self; { CLSOCP = derive2 { name="CLSOCP"; version="1.0"; sha256="0rkwq9rl2ph4h5zwb2i3yphjyzxmh6b6k23a8gcczycx6xdq4yhw"; depends=[Matrix]; }; CLUSTShiny = derive2 { name="CLUSTShiny"; version="0.1.0"; sha256="19mh5g1ylvlab4xjxw7girxk9zkpxxczhbfijf11b592hbw0qxqk"; depends=[cluster dplyr klaR MASS psycho rmarkdown shiny]; }; CMC = derive2 { name="CMC"; version="1.0"; sha256="1r9a5k79fyw01yiwxq02327hpn4l1v2lp0958jj9217wxmhn3pr5"; depends=[]; }; - CMF = derive2 { name="CMF"; version="1.0"; sha256="0hvqcbmg2vd0i1rjb1m1bkrbv2vkj1siank1v8w0n5b6881cyz7q"; depends=[Rcpp]; }; + CMF = derive2 { name="CMF"; version="1.0.2"; sha256="0hm6srsylg1syz86iz93qyxr7xgh1qvmp27k2hgkj1z1z8lsw1ca"; depends=[Rcpp]; }; CMLS = derive2 { name="CMLS"; version="1.0-0"; sha256="1542qqsl6sksrcpwhnn55d260hkbmy4ikd0v2an96yxk5w95spvn"; depends=[quadprog]; }; - CMPControl = derive2 { name="CMPControl"; version="1.0"; sha256="0cp29cibiydawsl0cq433l9abdivr16b431zlrh45wzr5kzfcs0v"; depends=[compoisson]; }; CMShiny = derive2 { name="CMShiny"; version="0.1.0"; sha256="0ciis3930yhn4dmazsg2yp7wi9hdfj5slr032x8qfllxis7m4k0w"; depends=[caret e1071 epitools Matrix rmarkdown shiny shinyMatrix]; }; CMapViz = derive2 { name="CMapViz"; version="0.1.0"; sha256="1s7xyp13p7fpbq0bghk07dfv90339kxs7k3343jqhrn8djf3as67"; depends=[dplyr ggplot2 readxl reshape2 scales stringr]; }; CMatching = derive2 { name="CMatching"; version="2.3.0"; sha256="0q0hplhsamj46z7g6pa7yg1bap5822ka1419yhcip551djhvnpmv"; depends=[lme4 lmtest Matching multiwayvcov]; }; - CMplot = derive2 { name="CMplot"; version="3.5.1"; sha256="15qplnwx6ma5cxm9v59hv7hca70slzbyaxvsddr9lpd0ph29ijhm"; depends=[]; }; + CMplot = derive2 { name="CMplot"; version="3.6.0"; sha256="1pwxbkslch10pyzyldj6rl32m0qjpbawpxv4f4z1jsbm1gjq1k5z"; depends=[]; }; CNLTreg = derive2 { name="CNLTreg"; version="0.1-2"; sha256="07yi0ajil1113663v3gp5d3453r4l9qm442jnpydx4ygvjk7m2ha"; depends=[adlift miscTools nlt]; }; CNLTtsa = derive2 { name="CNLTtsa"; version="0.1-2"; sha256="1vy0jjg6s8yvsvkx4pin183y5bnikm5cmjcpa9znz9dj1w6hwr5r"; depends=[adlift CNLTreg fields nlt]; }; CNOGpro = derive2 { name="CNOGpro"; version="1.1"; sha256="1frsmhfqrlg1vsa06cabqmrzngq4p5gqwyb9qgnsgg81a9ybm6l8"; depends=[seqinr]; }; @@ -618,17 +620,18 @@ in with self; { COBRA = derive2 { name="COBRA"; version="0.99.4"; sha256="1r1cw12d7c148pcgcg08bfsr1q1s736kfpyyss6b4d7ny7wgmqy4"; depends=[]; }; COCONUT = derive2 { name="COCONUT"; version="1.0.2"; sha256="1qjrhxn6dkxyimdca3nslaiw3hncfpk1pk4v01mcrnz550z001nz"; depends=[]; }; COMBAT = derive2 { name="COMBAT"; version="0.0.4"; sha256="0m700pl33frdpc9y16y4zyh1ixpardh0r5kmz8a78jrh1acn30id"; depends=[corpcor mvtnorm]; }; - COMBIA = derive2 { name="COMBIA"; version="1.0.6"; sha256="1640bfl5sn00czxnl6j2rrdrzc5arvfpy5b66viybxm2qqbiw49w"; depends=[gdata hash lattice latticeExtra oro_nifti]; }; COMPoissonReg = derive2 { name="COMPoissonReg"; version="0.7.0"; sha256="144vf3vfn5msc8p67q65frza8xyi9nqccjq47fnv33w5h0d9wlxj"; depends=[Rcpp]; }; + CONCUR = derive2 { name="CONCUR"; version="1.2"; sha256="1badxbc8lb5g52anl4dzrd3bpws8j7bx1c4mnzb6862g9jmr7280"; depends=[CompQuadForm dplyr mgcv]; }; CONDOP = derive2 { name="CONDOP"; version="1.0"; sha256="0si9nm93wk9lif3r6jh2nxr4sjq1iqyfavbykja3zcy6yn05i19s"; depends=[earth GenomeInfoDb GenomicRanges IRanges mclust plyr randomForest rminer S4Vectors seqinr]; }; CONS = derive2 { name="CONS"; version="0.1.1"; sha256="0w0rca4z3hij0lbabpdnhv2lb52gx574g7bqp6q16772pi4685hf"; depends=[FactoMineR gridExtra gWidgets pander raster readxl REdaS]; }; CORE = derive2 { name="CORE"; version="3.0"; sha256="0wq9i7nscnzqiqz6zh6hglm7924261bw169q3x6l9i6jgqhvn32d"; depends=[]; }; - CORElearn = derive2 { name="CORElearn"; version="1.53.1"; sha256="01jjw32awqjlvrn2wanljr3v4nphjb8mknzmz4skyhx0zgdm369x"; depends=[cluster nnet rpart]; }; + CORElearn = derive2 { name="CORElearn"; version="1.54.2"; sha256="0nsqmmwngv04dp4wpm9irybiv7bk35x78b8ib4mgk11yzm0wl1nn"; depends=[cluster nnet plotrix rpart rpart_plot]; }; CORM = derive2 { name="CORM"; version="1.0.2"; sha256="0g5plafx2h1ija8jd6rxvy8qsrqprfbwbi1kq1p4jdr9miha20nv"; depends=[cluster limma]; }; COSINE = derive2 { name="COSINE"; version="2.1"; sha256="10ypj849pmvhx117ph3k1jqa62nc4sdmv8665yahds7mh0ymhpjj"; depends=[genalg MASS]; }; COST = derive2 { name="COST"; version="0.1.0"; sha256="06xgnsccd621ihlrdmnnh14vh83q1r2bnp3iqi7vp5553b3y4l3w"; depends=[copula mvtnorm]; }; COUNT = derive2 { name="COUNT"; version="1.3.4"; sha256="02f7779fy0d2bql88x5v9csbxljhnyvl8wb8h83xrmwl7kaxsdpy"; depends=[MASS msme sandwich]; }; COUSCOus = derive2 { name="COUSCOus"; version="1.0.0"; sha256="1ykqi72v8v1b3g9qy6h34dvk5fynzf1rl2mby65p08axmaba5798"; depends=[bio3d matrixcalc]; }; + COVID19 = derive2 { name="COVID19"; version="0.2.1"; sha256="0fchc7a2g2q52ycbhbdrczvfrqvacwvkv72fdv4h4jsjn7j17hpl"; depends=[devtools dplyr gganimate ggplot2 ggthemes reshape2 rgdal sp tidyr]; }; CP = derive2 { name="CP"; version="1.6"; sha256="18zblf13riiz3mq3hkvg6vhiwjzpsn6mvgc2p0bqyldy98v4aisd"; depends=[survival]; }; CPAT = derive2 { name="CPAT"; version="0.1.0"; sha256="0zygncwww3cazwmx06bhzq0g41xcqfpw307azdhygc8jmcy6qj71"; depends=[purrr Rcpp RcppArmadillo Rdpack]; }; CPBayes = derive2 { name="CPBayes"; version="1.0.0"; sha256="0m9hy14xmaa0lswn2dlrjvqcsg14smxy3w1nmy48l3af1c2kjnxv"; depends=[forestplot MASS mvtnorm purrr]; }; @@ -646,33 +649,35 @@ in with self; { CRPClustering = derive2 { name="CRPClustering"; version="1.2"; sha256="19m7jg6ck2gqmry2p35h3vv8msm4w1x7qwwmm746r646q7w9ylml"; depends=[dplyr lucid MASS mvtnorm png randomcoloR]; }; CRTSize = derive2 { name="CRTSize"; version="1.0"; sha256="1d45zx26bf0zk0piham69gvb8djqf48g6iisbldv0ds3s2hhcsin"; depends=[]; }; CRTgeeDR = derive2 { name="CRTgeeDR"; version="2.0"; sha256="1fzw8618k152b8d4d6wmzp0bfkz2grwp0rqsplwvfdx23nxq437n"; depends=[ggplot2 MASS Matrix]; }; + CRUF = derive2 { name="CRUF"; version="0.5.1"; sha256="0mx7ksd5csy7v7v0wacfafs84sdfd41sy3f0yzpis9f07r7pqp3w"; depends=[aod miceadds survival survminer]; }; CRWRM = derive2 { name="CRWRM"; version="0.0.1"; sha256="0w6lg5q2c0w5p9vg5qr32pycyl8d1zp0s55jlvf2xhmqx34677hd"; depends=[]; }; CSESA = derive2 { name="CSESA"; version="1.2.0"; sha256="0pv6iabq1w22qbhlsbckdvva4n7igpzrjnrahmq83a6wxgvjbf5j"; depends=[Biostrings]; }; CSFA = derive2 { name="CSFA"; version="1.2.0"; sha256="1nkyhk8qhrrlx8v26yw86l954m4xfcxma4pqbhgw95jvqql5h3li"; depends=[elasticnet fabia FactoMineR pls randomcoloR snowFT]; }; + CSMES = derive2 { name="CSMES"; version="1.0.0"; sha256="1ddr2b39d7nwan6dqf5xx9h6gzfxxk50r1d9vbpb9hc8a7d15vnp"; depends=[caTools data_table mco ROCR rpart zoo]; }; + CSTools = derive2 { name="CSTools"; version="3.0.0"; sha256="1gdvkpq8iji0kxlk4ka10kq7i2qn3r5jcg2c5isf3zjkyjn2f218"; depends=[abind ClimProjDiags data_table ggplot2 maps multiApply ncdf4 plyr qmap rainfarmr reshape2 s2dverification verification]; }; CSclone = derive2 { name="CSclone"; version="1.0"; sha256="0lqsqsgh2sf44fr1r7g179556v294yr1wy7x4320g7adxshrwyh5"; depends=[DNAcopy lpSolve mcclust moments]; }; CSeqpat = derive2 { name="CSeqpat"; version="0.1.2"; sha256="1nqk873cagpn4fba4rmyzb6hni1p5lqcvsr9givrcm0gfx756w1h"; depends=[NLP tm]; }; CTAShiny = derive2 { name="CTAShiny"; version="0.1.0"; sha256="18qw8nx1r4gwlxj9zxn4hllpn29fv3i4fgwyl5fh3qsv9hmbvi0x"; depends=[epitools rpivotTable shiny shinyMatrix]; }; CTM = derive2 { name="CTM"; version="0.2"; sha256="0h1lpygjq46nwkn4km49bngvxmgrnh3csrfln3yjr9yyzs7d3lz1"; depends=[jiebaR plyr]; }; - CTRE = derive2 { name="CTRE"; version="0.1.0"; sha256="1v2327g78rva3n7lvn66rznzzf2qbdak0jp8gakgljpl30kpkv5v"; depends=[assertthat MittagLeffleR plyr tea zoo]; }; CTShiny = derive2 { name="CTShiny"; version="0.1.0"; sha256="0lmzf02w8j4rgz1kh7jwvl0sb6y38r56gwmsf7pkc00w1dskb722"; depends=[caret dplyr e1071 party rhandsontable rmarkdown rpart rpart_plot shiny]; }; CTT = derive2 { name="CTT"; version="2.3.3"; sha256="02z354gf7rzh9xzyflmsag4hgmqgv3sr9s9ja903rwdz1pjqrlff"; depends=[]; }; CTTShiny = derive2 { name="CTTShiny"; version="0.1"; sha256="1c9vsiqyig6kfjpy3dfrysc466h4v9530m49aynz65i1njplswyh"; depends=[CTT ltm psych shiny shinyAce]; }; CTTinShiny = derive2 { name="CTTinShiny"; version="0.1.0"; sha256="1dc6kaxajkvviszmrcvhh9cg2k8g1hbpf1f6fg3wlgnb80fsx9b7"; depends=[CTT foreign shiny]; }; - CUB = derive2 { name="CUB"; version="1.1.3"; sha256="1qdqqiax9yc0vzcqkkzx81nb7gix0x5pknvbqp1xv200776wsfc4"; depends=[Formula]; }; + CUB = derive2 { name="CUB"; version="1.1.4"; sha256="1l47fkfvd91mbfzgl0vwaahbyi53jv3md6zah9ns85ns6xlwap7n"; depends=[Formula]; }; CUFF = derive2 { name="CUFF"; version="1.6"; sha256="06ip6jrw6zgysz1lhlxxj26bv6hwg87qx6spqfinqrc9lz3p1y93"; depends=[DT lmerTest nlme openxlsx xtable]; }; CUMP = derive2 { name="CUMP"; version="2.0"; sha256="0rdscywmi4sylpjpr8r472iapddizb1mqyrd532cvw6frxins7w0"; depends=[]; }; - CUSUMdesign = derive2 { name="CUSUMdesign"; version="1.1.3"; sha256="149d16d5y7zxkzq8gmb5spfrvirv0vyhk2qx0v7vclkr8adz9sva"; depends=[]; }; + CUSUMdesign = derive2 { name="CUSUMdesign"; version="1.1.5"; sha256="1qxq1a8b5pnmlq6rpjzvcp32scn2qknafch3h7qjsy8499zzbxx8"; depends=[]; }; CVD = derive2 { name="CVD"; version="1.0.2"; sha256="0agb0liwbp4wvmxbyxgfb7471ki1agfb6ssh77kvwbkxqmrc8d96"; depends=[]; }; CVR = derive2 { name="CVR"; version="0.1.1"; sha256="1y8m9r409jq5h6xx1rvz7c7aj882jldfxly89zf3cvp2qg3jh7rj"; depends=[PMA Rcpp RcppArmadillo]; }; CVST = derive2 { name="CVST"; version="0.2-2"; sha256="05l3yzkfrbds09ah9cdwn2sn4ryhq78lz33ryzrgkv176jc8qjw5"; depends=[kernlab Matrix]; }; CVThresh = derive2 { name="CVThresh"; version="1.1.1"; sha256="19d7pslzj8r3z5gn3cplpz2h2ayz6k1nrfx3s2b7a8w1il3vmi69"; depends=[EbayesThresh wavethresh]; }; CVTuningCov = derive2 { name="CVTuningCov"; version="1.0"; sha256="1bwzis82lqwcqp2djy4bnd3vvjr47krlv3pdc5msh12wcs0xhs7n"; depends=[]; }; - CVXR = derive2 { name="CVXR"; version="0.99-7"; sha256="0jbw4gxcjrmzdm2681nfci34mkf16b9w6xi5slq6l5x273rfjh5v"; depends=[bit64 ECOSolveR gmp Matrix R_utils R6 Rcpp RcppEigen Rmpfr scs]; }; + CVXR = derive2 { name="CVXR"; version="1.0-1"; sha256="023pf67ar0g795jdm6k3xjagns7gacmvab0sivrgisl4s51firdk"; depends=[bit64 ECOSolveR gmp Matrix osqp R6 Rcpp RcppEigen Rmpfr scs]; }; CVcalibration = derive2 { name="CVcalibration"; version="1.0-1"; sha256="0ca582fnysrldlzxc3pihsph9pvdgygdh7sfzgxvr5fc3z1jbjzb"; depends=[]; }; CVglasso = derive2 { name="CVglasso"; version="1.0"; sha256="1bh09cd0yabhqv5yfahhvayx3f09yqapzl1yr9nc9xqwyx1d0cfd"; depends=[doParallel dplyr foreach ggplot2 glasso]; }; CaDENCE = derive2 { name="CaDENCE"; version="1.2.5"; sha256="1z3p5y1l67r470x6wrhnyjvw1ndppcm08fpj99x122j7kn6byff2"; depends=[pso]; }; CaPO4Sim = derive2 { name="CaPO4Sim"; version="0.1.0"; sha256="1ihkx0swj9adz2pgfm9c20pcipq748czkyg76q3y0zk1j987nfik"; depends=[DT htmltools magrittr plotly purrr rintrojs shiny shinycssloaders shinydashboard shinydashboardPlus shinyjqui shinyjs shinyWidgets visNetwork]; }; - Cairo = derive2 { name="Cairo"; version="1.5-10"; sha256="1mdmd5zmjkh1b0x928zizgzh42x8swbajffb88rvnjfdhk1z0dvq"; depends=[]; }; + Cairo = derive2 { name="Cairo"; version="1.5-11"; sha256="1k9kpxcg5n4g6x2gydv344f4w0snqbhww14fnbbj1bny0mmv28xg"; depends=[]; }; CalSim = derive2 { name="CalSim"; version="0.3.2"; sha256="1a4w9kh9ykms1i30hhd7h8gdkbfl6g071jmcy26j1sbshxrnq8s1"; depends=[spatstat]; }; Calculator_LR_FNs = derive2 { name="Calculator.LR.FNs"; version="1.3"; sha256="03qg9rnz623dwnp68xhhsh9788s49n6xp0migg1nnjaqhrahlgdd"; depends=[]; }; CalibratR = derive2 { name="CalibratR"; version="0.1.2"; sha256="1hnmhijckxd35h8mhpzqpglk1ykdih2c5kg17myc7cci5xjk9nfr"; depends=[doParallel fitdistrplus foreach ggplot2 pROC reshape2]; }; @@ -680,11 +685,13 @@ in with self; { CamelUp = derive2 { name="CamelUp"; version="0.1.1"; sha256="09i6bi2vnd7iyll9s8sbyy73l6kq8xrpf07qbcahs595x5iclgrg"; depends=[data_table R6 shiny shinyalert tidyverse]; }; Canopy = derive2 { name="Canopy"; version="1.3.0"; sha256="0979hpphzhf4v71jx0shh3l8nffmpsn9l6f8ip2wxzcyx571i1wd"; depends=[ape fields pheatmap scatterplot3d]; }; CarletonStats = derive2 { name="CarletonStats"; version="2.0"; sha256="0pgzvw6gf8kjv8ndprwp4wlgdgh5sb75ga8z5syfw57fb05v7ac3"; depends=[]; }; + Carlson = derive2 { name="Carlson"; version="1.0.0"; sha256="1m030x30cd0w2r6y280v9kpqalx6djhyx9hfzhk1qbqh5rk7br2l"; depends=[]; }; Cascade = derive2 { name="Cascade"; version="1.8"; sha256="0d75a9f43ligyjv62476plb86ipfq9y7g9njq4rx84cp17vbb662"; depends=[abind animation cluster igraph lars lattice limma magic nnls survival tnet VGAM]; }; CascadeData = derive2 { name="CascadeData"; version="1.2"; sha256="0czc41f1vj61rkdl6gnnnga3qliyxp0ffl5j9wrhrlwnbdaknics"; depends=[]; }; CatDyn = derive2 { name="CatDyn"; version="1.1-1"; sha256="0gkaxs7apqhq7mp3chjsyhrnk3qkk11f8p7smmyj6h73888ry8jn"; depends=[BB optimx]; }; CatEncoders = derive2 { name="CatEncoders"; version="0.1.1"; sha256="1q9wzq06lac8z9y8b65alsxpb48bw8wqmifd893kknk51xq6r9kl"; depends=[data_table Matrix]; }; CatPredi = derive2 { name="CatPredi"; version="1.1"; sha256="1fqz2mb3xhpzvamf0bpqfql3vd86vq6fq7n6p8xq7lraj1w77lys"; depends=[CPE mgcv rgenoud rms survival]; }; + CatReg = derive2 { name="CatReg"; version="1.0.0"; sha256="10qvp3v8bwsynxxl1a6qkp9ddfqygjc0cm1nbxi86dwyi26mcvz0"; depends=[Rcpp Rdpack]; }; CateSelection = derive2 { name="CateSelection"; version="1.0"; sha256="194lk6anrb05gaarwdg8lj5wm6k61b4r702cja3nf3z91i8paqi7"; depends=[]; }; CausalFX = derive2 { name="CausalFX"; version="1.0.1"; sha256="0v0diqq9fa1v9n3v5m5shvwlgmj91cbbb78243rwib1h3pyacihf"; depends=[igraph rcdd rje]; }; CausalGAM = derive2 { name="CausalGAM"; version="0.1-4"; sha256="1riz11hfg96iks7734rg692l75nfrd3hmr9gw563j27rkk1nfkl6"; depends=[gam]; }; @@ -692,35 +699,33 @@ in with self; { CausalKinetiX = derive2 { name="CausalKinetiX"; version="0.2.1"; sha256="0haxw4vvbw48hlvsl1d1y3xm48qm5vl0d3k5lj89ajwc618nk5jg"; depends=[cvTools deSolve fda glmnet pspline quadprog randomForest sundialr]; }; 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]; }; CautiousLearning = derive2 { name="CautiousLearning"; version="1.0.1"; sha256="1m5x93l4bscrpcxk0pva6d6n2qnzhzxh0a6a81p97l8lqgs1qw2q"; depends=[BH Rcpp sitmo spc]; }; - CePa = derive2 { name="CePa"; version="0.6"; sha256="1qpxx9x656g678wp190q29vxkb54sfkalg0csg0ndlcvi03dvl3d"; depends=[graph igraph Rgraphviz]; }; + CePa = derive2 { name="CePa"; version="0.7.0"; sha256="0jykh0f168azphjd3h1q81wlvj8zn8qy0c4wi275gvw0xwi104mk"; depends=[graph igraph Rgraphviz]; }; CeRNASeek = derive2 { name="CeRNASeek"; version="2.1.2"; sha256="1bjx474wbxs4wxy6j4n578cggmcj0061kbbkyhfif65qbsfgrcf8"; depends=[gtools igraph survival]; }; + CenBAR = derive2 { name="CenBAR"; version="0.1.0"; sha256="0qa1jzgvf33fi0vns7v49hjk0wkaxic7dw67m0wr33wjplf93wnh"; depends=[cvTools foreach glmnet MASS mvtnorm survival]; }; CensMFM = derive2 { name="CensMFM"; version="2.0"; sha256="1p129x2b6avv7h5ifjmkds2yfw0jwm3q1cqyrpy8j9nkli0crg1y"; depends=[ggplot2 gridExtra MomTrunc mvtnorm tlrmvnmvt]; }; - 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="2.1"; sha256="19nlvg61gcn9mf6nsd0ji7b05vh2qzlszif5bmm8bqxzf8wmilx3"; depends=[geoR lattice moments msm mvtnorm numDeriv optimx psych raster tlrmvnmvt tmvtnorm]; }; Census2016 = derive2 { name="Census2016"; version="0.2.0"; sha256="1c88jmd565v19w8dbvai10f9y5lyfmzsxsjblc3gdykf9kharvcq"; depends=[data_table]; }; CepLDA = derive2 { name="CepLDA"; version="1.0.0"; sha256="15vhk7l5mw2kicw2x60r4z71hc415g8kaf2p06jgf7ykxmzkj7kg"; depends=[astsa class MASS multitaper]; }; CerioliOutlierDetection = derive2 { name="CerioliOutlierDetection"; version="1.1.9"; sha256="0s3pd4y165v69m4wmg9jlc7dl4gz64la9yic67l3n4242wa84p19"; depends=[robustbase]; }; CfEstimateQuantiles = derive2 { name="CfEstimateQuantiles"; version="1.0"; sha256="1qf85pnl81r0ym1mmsrhbshwi4h1iv19a2wjnghbylpjaslgxp6i"; depends=[]; }; ChIPtest = derive2 { name="ChIPtest"; version="1.0"; sha256="1yn5b5s56k2dbhw6damxj18xbaiz180ym7fiq2i3p2gkcgwpddbz"; depends=[]; }; - ChainLadder = derive2 { name="ChainLadder"; version="0.2.10"; sha256="1mhmmxdy94qchsw8pc86hk78iwb9l3pfhljalxidk62f3qikrjxb"; depends=[actuar cplm ggplot2 lattice MASS Matrix statmod systemfit tweedie]; }; + ChainLadder = derive2 { name="ChainLadder"; version="0.2.11"; sha256="0qqfvhgybdp6l74nswc6xcilzbv54291p8mwjvdhjg29782szyyz"; 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.16"; sha256="02kxybv9299j36xl4wk6d50crdnz0f6qbyxjiy6xf0s7hnlcr44c"; depends=[Rcpp RcppArmadillo]; }; - ChannelAttributionApp = derive2 { name="ChannelAttributionApp"; version="1.1"; sha256="0qy92ij1riynz7dhri3z85pafww5w9j1gx1bcgr8phlr32a7had7"; depends=[ChannelAttribution data_table ggplot2 shiny]; }; + ChannelAttribution = derive2 { name="ChannelAttribution"; version="1.17"; sha256="0p05iy0ip2y9hndrwlny1d78dirfd5h2262xpcv1cr3mrgh93vvp"; depends=[Rcpp RcppArmadillo]; }; Chaos01 = derive2 { name="Chaos01"; version="1.2.1"; sha256="1wk70l1y0yzbjcjp0r334l1q3hzki0vzn6wbza97mq9pz8wp050r"; depends=[]; }; ChaosGame = derive2 { name="ChaosGame"; version="0.4"; sha256="10bq8i6b6zkg8nzq5np998xabyvijizxfbvw1m2nvfh74vxspj4p"; depends=[colorRamps ggplot2 gridExtra plot3D RColorBrewer rgl sphereplot]; }; ChargeTransport = derive2 { name="ChargeTransport"; version="1.0.2"; sha256="0mq06ckp3yyj5g1z2sla79fiqdk2nlbclm618frhqcgmq93h0vha"; depends=[]; }; CheckDigit = derive2 { name="CheckDigit"; version="0.1-1"; sha256="0091q9f77a0n701n668zaghi6b2k3n2jlb1y91nghijkv32a7d0j"; depends=[]; }; ChemoSpec = derive2 { name="ChemoSpec"; version="5.2.12"; sha256="1qr09n2yc009x8ag0lbmn1m93qhck05jc8vx7j5wfa0g4i1b2r7f"; depends=[ChemoSpecUtils plyr readJDX]; }; - ChemoSpec2D = derive2 { name="ChemoSpec2D"; version="0.3.166"; sha256="0b0pis55kz4r55qxwdlic87crnhkifvcylngkaxsfv1vqqz2wwlc"; depends=[ChemoSpecUtils]; }; + ChemoSpec2D = derive2 { name="ChemoSpec2D"; version="0.4.147"; sha256="0rmnkk9ddxr32l09bj8qkh1jpffwkyczjr6vwk1qliwfwsbc78rl"; depends=[ChemoSpecUtils colorspace readJDX]; }; ChemoSpecUtils = derive2 { name="ChemoSpecUtils"; version="0.4.38"; sha256="1b7czs41jsniw1hnrm1c5z6pc5yiybbdnp2bqr810farmv61slzz"; depends=[plyr]; }; ChemometricsWithR = derive2 { name="ChemometricsWithR"; version="0.1.13"; sha256="166va1g3m1wv21qkmw4wpz0bsrclh3jih8smxphdc13l9pqgclpq"; depends=[devtools kohonen MASS pls]; }; ChillModels = derive2 { name="ChillModels"; version="1.0.2"; sha256="06hgg893anh5z8an4l1xl4liz7d0m79n21h116vkdlymayccydbr"; depends=[]; }; ChoR = derive2 { name="ChoR"; version="0.0-4"; sha256="08mildsx542zfm0kcdakcv7c71hb4jgbcq1lhidf0fz76zj1pzk1"; depends=[commonsMath rJava]; }; ChoiceModelR = derive2 { name="ChoiceModelR"; version="1.2"; sha256="0dkp3354gvrn44010s8fjbmkpgn1hpl4xbfs5xslql8sk8rw0n2c"; depends=[]; }; CholWishart = derive2 { name="CholWishart"; version="1.1.0"; sha256="1p92i5ibv9805fg8s5wrpxx63k4c1ihs1x2zlaz9vbkqypkl8aqz"; depends=[]; }; - CircMLE = derive2 { name="CircMLE"; version="0.2.2"; sha256="0qavd67295ca8jrwllkgjp5b84kxf4pik226pm9y126bz3rss9a1"; depends=[circular]; }; - CircNNTSR = derive2 { name="CircNNTSR"; version="2.2"; sha256="0z29dsvcwpra1ny8kj486dpnrak272wmkfnaiyashzcqpnkmkg03"; depends=[]; }; + CircMLE = derive2 { name="CircMLE"; version="0.2.3"; sha256="02nhxw75w84m95p3hmkcgbrs547scvfap8130fxm480y0r3d0zc6"; depends=[circular]; }; + CircNNTSR = derive2 { name="CircNNTSR"; version="2.2-1"; sha256="0mpm6vrkl3ap67khky8dndwvl9yzycm0rlv0vzznlygvlsg8sc38"; depends=[]; }; CircOutlier = derive2 { name="CircOutlier"; version="3.2.3"; sha256="1vyac4mjkn6p4p9n5finqqak6g7m3hj04a66v3w797jn1wbd1xly"; depends=[CircStats circular]; }; CircSpaceTime = derive2 { name="CircSpaceTime"; version="0.9.0"; sha256="0dplgm5x4c1xxnv6062n643mn5zh0najw3f41pv2qafc1lil4wx8"; depends=[circular coda ggplot2 Rcpp RcppArmadillo RInside]; }; CircStats = derive2 { name="CircStats"; version="0.2-6"; sha256="07bg4zrs2iqh0pmi44pybi8hlvnxwcaa5zpg85rmf55kflxxkzlf"; depends=[boot MASS]; }; @@ -728,7 +733,7 @@ in with self; { Cite = derive2 { name="Cite"; version="0.1.0"; sha256="1gfjirhswh4dkz88z4gl8m8jznqrvcgd4z3mnszyg1k5w3avlf1q"; depends=[miniUI RefManageR rstudioapi shiny]; }; CityPlot = derive2 { name="CityPlot"; version="2.0"; sha256="0lskgxmagqjglvpq39hgbygkf4qp28i2bj6b4m2av1s3pzb4465g"; depends=[]; }; CityWaterBalance = derive2 { name="CityWaterBalance"; version="0.1.0"; sha256="0nvm6bv2cxszjf33xgn1xcvhrgrgbdcar0jahwf7bs03gdlpmgi1"; depends=[dataRetrieval dplyr EcoHydRology geoknife lubridate reshape2 tgp xts zoo]; }; - Ckmeans_1d_dp = derive2 { name="Ckmeans.1d.dp"; version="4.3.0"; sha256="0xl587a4yym2a8b1csdgrj6fmggb3084pj3p7z4hqr2pq5jdyadk"; depends=[Rcpp Rdpack]; }; + Ckmeans_1d_dp = derive2 { name="Ckmeans.1d.dp"; version="4.3.2"; sha256="18ypkjhgxdpcannddch9ipvf3xl3pwx6cgf3983p81cr15s0zgrz"; depends=[Rcpp Rdpack]; }; Claddis = derive2 { name="Claddis"; version="0.3.4"; sha256="161qgj4r8qah3r1m7gx2rwn9ng62y1p6gn62r1gp43pkrp2jlqj9"; depends=[ape clipr gdata phytools strap]; }; ClamR = derive2 { name="ClamR"; version="2.1-1"; sha256="0raz1n79g24a9mc93zj49r20xcmdziw6vvcw5sd3qyjp1ycia13c"; depends=[]; }; ClassComparison = derive2 { name="ClassComparison"; version="3.1.8"; sha256="0fd5s4697pvj295fzvvn5mislf42wfzrcvks17v98388rph586gl"; depends=[Biobase oompaBase]; }; @@ -740,12 +745,12 @@ 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]; }; ClimInd = derive2 { name="ClimInd"; version="0.1-2"; sha256="0brimmkr8ccdbpmcmgbd8ydx4cy0yblfrzcgx151x83wskzq04sj"; depends=[chron SPEI weathermetrics]; }; - ClimMobTools = derive2 { name="ClimMobTools"; version="0.2-7"; sha256="0y2dhf7j230hvsi54dl08ds170ad7aww4c8gk0f5c2v2zfxkbya8"; depends=[httr jsonlite Matrix nasapower PlackettLuce raster RSpectra tibble tidyr]; }; + ClimMobTools = derive2 { name="ClimMobTools"; version="0.3.2"; sha256="1nsisbqsgwk91by6bx8igf1bn94cbcvnw9dbs7gfb14wnng2422l"; depends=[climatrends httr jsonlite Matrix RSpectra tibble]; }; ClimProjDiags = derive2 { name="ClimProjDiags"; version="0.1.0"; sha256="00w7ffcv9axddjvmc0w58c9ncy8z58lf651c5pxsq7492x3vifcm"; depends=[multiApply PCICt plyr]; }; - ClinReport = derive2 { name="ClinReport"; version="0.9.1.14"; sha256="140hpg6ybz1rlql06gk851fcvlb2k53kp46dq22cbs36frggk3rj"; depends=[car dplyr emmeans flextable ggplot2 lme4 officer reshape2 xtable]; }; ClinicalTrialSummary = derive2 { name="ClinicalTrialSummary"; version="1.1.1"; sha256="0b5by4sn9yvrvxr9921yqsgp8ma3g1hi2qbp5j9m836db1zjhyla"; depends=[Rcpp]; }; CliquePercolation = derive2 { name="CliquePercolation"; version="0.2.0"; sha256="1zllhl1674734sr0hmfgwdyqlk4rcjdqqrd7rx30llqri478jdff"; depends=[colorspace igraph magrittr Matrix Polychrome qgraph]; }; CloneSeeker = derive2 { name="CloneSeeker"; version="1.0.9"; sha256="0xcdknh2fibg86h2ip8jzsv4sbai1yl19ni3g1h5p0zlyigkhs1s"; depends=[combinat gtools quantmod]; }; + CluMP = derive2 { name="CluMP"; version="0.8"; sha256="130aqfxdp1pj5z3hnmy06rp5ywcmr389wn114ja5c2imxxkm3fi3"; depends=[amap data_table dplyr ggplot2 MASS NbClust rlang tableone]; }; ClueR = derive2 { name="ClueR"; version="1.4"; sha256="0awl3ag48idg0396hcgqrh5f16mbgximr5xbxjiimib5zysdc558"; depends=[e1071]; }; ClusBoot = derive2 { name="ClusBoot"; version="1.0"; sha256="1wh9mv932zarl8w098lgv2jpanp6r8nzdkyayv8nxk7nddl0bn1k"; depends=[]; }; ClusVis = derive2 { name="ClusVis"; version="1.2.0"; sha256="06yckdl3gxjia1gjjqpc29lvy4f7qf47fncslng9ggjnks6il145"; depends=[MASS mgcv mvtnorm Rcpp RcppArmadillo Rmixmod VarSelLCM]; }; @@ -757,24 +762,24 @@ in with self; { ClustOfVar = derive2 { name="ClustOfVar"; version="1.1"; sha256="0grhkab7s58ji4cf7cxh7ahd2dxrj8aqfdf3119b40zxkxbwxcr0"; depends=[PCAmixdata]; }; ClustVarLV = derive2 { name="ClustVarLV"; version="2.0.1"; sha256="1wl4kkhf17fi3vgbv0ph0yii2l93cgisxm3s0g9w8zhyn60dwwb0"; depends=[doParallel foreach iterators plyr Rcpp RcppEigen]; }; Cluster_OBeu = derive2 { name="Cluster.OBeu"; version="1.2.3"; sha256="10i7mnaq968my1c5hi8bdsj05m64wlmrf4n4m118is5h1q7zss8r"; depends=[car cluster clValid data_tree dendextend jsonlite mclust RCurl reshape reshape2 stringr]; }; - ClusterBootstrap = derive2 { name="ClusterBootstrap"; version="1.0.0"; sha256="0m1lfp27vn3ybwimwkrihff5v2bvdc4c46x8bha8hw0wma14lw5i"; depends=[]; }; + ClusterBootstrap = derive2 { name="ClusterBootstrap"; version="1.1.0"; sha256="1n2zsl3y4yg1l5kyjfghv6x5hf5520lwz17cvfkvp0m5h6jqfqzg"; depends=[dplyr magrittr]; }; ClusterR = derive2 { name="ClusterR"; version="1.2.1"; sha256="131k4dsh11xx95rhbr9zx20j9y493hiil6gxbgqks8dqp7n895j7"; depends=[ggplot2 gmp gtools Rcpp RcppArmadillo]; }; ClusterRankTest = derive2 { name="ClusterRankTest"; version="1.0"; sha256="01gzalhibqcdx3a6yc2cm1v77rscva73v5m5m0qkrgqdp9c8ph2a"; depends=[]; }; ClusterStability = derive2 { name="ClusterStability"; version="1.0.3"; sha256="1laa5m3y1rc7jr8q3i9qb3izs7qmadz169w9xm8q3mm3834ngn9b"; depends=[cluster clusterCrit copula Rcpp WeightedCluster]; }; ClusteredMutations = derive2 { name="ClusteredMutations"; version="1.0.1"; sha256="1n31nnvpjh1faw751k8m3ga3wfl0yhdpnszwckqhfzlma1jr8z04"; depends=[seriation]; }; + Clustering = derive2 { name="Clustering"; version="1.1"; sha256="0qc01bgvf7r7v2y24w4g6ha56mr2p7ng23g406pfnj3vykki8h0w"; depends=[advclust amap apcluster cluster ClusterR data_table gama gmp pracma pvclust sqldf xtable]; }; CoClust = derive2 { name="CoClust"; version="0.3-2"; sha256="04xv807785xv9kdspsspx1302ardv8gda06kd590lgawjixai7dh"; depends=[copula gtools]; }; CoDiNA = derive2 { name="CoDiNA"; version="1.1.1"; sha256="00kda4grizdgh9xs0vywg9npjj7i97vbdf0hvzl96657rcillwdh"; depends=[data_table igraph magrittr plyr visNetwork]; }; CoFRA = derive2 { name="CoFRA"; version="0.1002"; sha256="0ldf84dxaanww3qkf64mz5gv3yv2rjp9m6dy64xckds66vw6x0m3"; depends=[gplots stringr]; }; CoImp = derive2 { name="CoImp"; version="1.0"; sha256="06y722flpiqpwq0p7ik86s09mdnvqw3hdybhdzn8vfns5swc8x1y"; depends=[copula gtools locfit nnet]; }; CoRpower = derive2 { name="CoRpower"; version="1.0.3"; sha256="007v6khv2kkf398cqy3vjv0ncd7zc8ad084a5qhpplsnj1f3ll2j"; depends=[osDesign survival]; }; - CoSMoS = derive2 { name="CoSMoS"; version="1.0.1"; sha256="1kh1ka428vv99vwxajyvaz9n5d1ss6h03w7kwwp89hjxrm8wnrc2"; depends=[data_table ggplot2 nloptr pracma]; }; + CoSMoS = derive2 { name="CoSMoS"; version="1.1.3"; sha256="0wzs1w8kbphrw8hmi0zan02yg1jgivdj7r15iqq7n6cd1l4jfc86"; depends=[data_table ggplot2 nloptr]; }; CodataGS = derive2 { name="CodataGS"; version="1.43"; sha256="1bjn6s1f5jn64gwrvjz5kvwfkbqrqhavib6dj9k37rb5nzqkwhp6"; depends=[Matrix]; }; CodeDepends = derive2 { name="CodeDepends"; version="0.6.5"; sha256="0l7kiv3awx50glf5cs841b4zzsff1ml90f0zr868ygvwsr4ps1hq"; depends=[codetools graph XML]; }; CoinMinD = derive2 { name="CoinMinD"; version="1.1"; sha256="0invnbj5589wbs0k2w5aq9qak7axc3s0g9nw85c48lnl0v95s91i"; depends=[MCMCpack]; }; Coinprofile = derive2 { name="Coinprofile"; version="0.1.9"; sha256="1bcip62gm34cx5m8a1mx9px2rhgvdmsgnn6q9q40k8p5hw4cx9g0"; depends=[coin exactRankTests ggplot2 plyr Rdpack zoo]; }; CollapsABEL = derive2 { name="CollapsABEL"; version="0.10.11"; sha256="0libm1wv34av3vm2vvbqcnxjh4y1rwfi8qzjca8qdz9490vngags"; depends=[biganalytics bigmemory collUtils dplyr ggplot2 haplo_stats R_utils rJava RSQLite stringr]; }; CollapseLevels = derive2 { name="CollapseLevels"; version="0.2.0"; sha256="1fn5k83lh0vw5j9vhq0x6ksbkrm25acpslav85wfyknsj9vzmzid"; depends=[dplyr ggplot2 lazyeval magrittr]; }; - CollessLike = derive2 { name="CollessLike"; version="2.0"; sha256="060iqvhyz36s28iyhlr6jj9ah3xd42yaps37kkprajxmyxldk6pp"; depends=[ape igraph]; }; CollocInfer = derive2 { name="CollocInfer"; version="1.0.4"; sha256="1iwf5g2y7i0j8dc19hdhya4m6g47jj968glnclj7a2yaq2yx37cj"; depends=[deSolve fda MASS Matrix spam]; }; ColorPalette = derive2 { name="ColorPalette"; version="1.0-1"; sha256="1dsj5njikx3qm2lnamqqg4qgwwyr11fwx9s5sdi7dkfx3nmf6dac"; depends=[]; }; ComICS = derive2 { name="ComICS"; version="1.0.4"; sha256="0brsb7y1bg23sdpxs4j1y3xdgr1q7iinxnnp17rravw72l991xqa"; depends=[glmnet]; }; @@ -794,11 +799,12 @@ in with self; { CompQuadForm = derive2 { name="CompQuadForm"; version="1.4.3"; sha256="1i30hrqdk64q17vsn918c3q79brchgx2wzh1gbsgbn0dh1ncabq4"; depends=[]; }; CompR = derive2 { name="CompR"; version="1.0"; sha256="1k4q0yanvhdh3ksia7d42lxky19yci5vxhmi6h716g9sxzfsjk6b"; depends=[MASS]; }; CompRandFld = derive2 { name="CompRandFld"; version="1.0.3-6"; sha256="1yr1d97l6yc07jwh30j26gda15pjfcwx2z3w55dh3nr15vds0qcp"; depends=[fields mapproj maps RandomFields scatterplot3d spam]; }; - CompareCausalNetworks = derive2 { name="CompareCausalNetworks"; version="0.2.4"; sha256="108x9a83pbk6xiv1fgzwi0fpbvhpiff7aiplrsq2rfv1isjb5xhq"; depends=[data_table expm Matrix]; }; + CompareCausalNetworks = derive2 { name="CompareCausalNetworks"; version="0.2.6.2"; sha256="0r8gdr834jqqwiq9h4yz19gcg92rbdd4fr3fwi083vfjml82f0v0"; depends=[data_table expm Matrix]; }; CompareTests = derive2 { name="CompareTests"; version="1.2"; sha256="1z96kh851bpr2szgyjszkpv6m5ma6abz7hrm50fgvfpgxkj7f4yi"; depends=[]; }; ComparisonSurv = derive2 { name="ComparisonSurv"; version="1.0.8"; sha256="1l6c6fwzrmj4sl37rcxhlglwvm1ln4rb138apj1jawnyg2i5si1x"; depends=[muhaz survival survRM2 TSHRC]; }; Compind = derive2 { name="Compind"; version="2.1"; sha256="1cjvpgankifiql67imhxx382q2lz1jq9k0nrwzq560h0xizkak6i"; depends=[Benchmarking boot GPArotation Hmisc lpSolve MASS nonparaeff np psych smaa spdep]; }; - Compositional = derive2 { name="Compositional"; version="3.6"; sha256="1ngyw7zxvwav65ly6rjqc1zfrgwv3s2a2kyihjf68in6qnqigqxm"; depends=[doParallel emplik foreach MASS mda mixture Rfast Rfast2 sn]; }; + Compositional = derive2 { name="Compositional"; version="3.8"; sha256="103kz32kfzniqbamy1gh7mc9v7q1pjrr03zw1dabzaxfpf9ps4df"; depends=[doParallel emplik foreach MASS mda mixture RANN Rfast Rfast2 sn]; }; + CompoundEvents = derive2 { name="CompoundEvents"; version="0.1.0"; sha256="03shw3016xc41a6by8pnpqs7mmnhs0qmg5aqd4hlfcy3dv2w9wkf"; depends=[]; }; Compounding = derive2 { name="Compounding"; version="1.0.2"; sha256="1xlb3ylwjv70850agir0mx79kcvs43h0n1sm22zcny3509s2r7lf"; depends=[hypergeo]; }; ConConPiWiFun = derive2 { name="ConConPiWiFun"; version="0.4.6"; sha256="1kkc4xp5b6q54b76wk4ga28wl668psbpyivl6bnh3xm21276yx5k"; depends=[Rcpp]; }; ConR = derive2 { name="ConR"; version="1.2.4"; sha256="1d36j1q364pakcm8xrbw323pg6dg9brsf6x3hcj1kahcqls9dcff"; depends=[doParallel fields foreach geosphere maptools raster rgdal rgeos sp spatstat spatstat_utils tibble writexl]; }; @@ -812,8 +818,9 @@ in with self; { CongreveLamsdell2016 = derive2 { name="CongreveLamsdell2016"; version="1.0.2"; sha256="0fs0r3k1hvnp241fa0ymq00868skcigizqr68sp3lsmvzsdyxha9"; depends=[Ternary]; }; Conigrave = derive2 { name="Conigrave"; version="0.4.4"; sha256="02nvk5ya9gr06ai8qnjw0xq6hfbrr91b6lx9gq08dbrnmpbmyvqz"; depends=[dplyr ggplot2 miceadds mitools ppcor stringdist stringr]; }; ConjointChecks = derive2 { name="ConjointChecks"; version="0.0.9"; sha256="097mhiz8zjmmkiiapr3zfx7v35xirg57nqp1swd72dixaa23nhr1"; depends=[]; }; - ConnMatTools = derive2 { name="ConnMatTools"; version="0.3.3"; sha256="0zsn3al3di0fd9hkqljpqqy4zbmh97xr6cdi4fzv80ax81fjfqyk"; depends=[]; }; + ConnMatTools = derive2 { name="ConnMatTools"; version="0.3.5"; sha256="082y4xxnp42xa7db5hnbc9qlvkb50wwb3wzi0my04l55a9s0ril7"; depends=[]; }; ConsRank = derive2 { name="ConsRank"; version="2.1.0"; sha256="0hp6zx3y8vwnpska7bnxpmkpgjlgfw6d7jpc0f7p77j0lqlj0xyc"; depends=[gtools proxy rgl rlist]; }; + ConsReg = derive2 { name="ConsReg"; version="0.1.0"; sha256="0ck188ahzprzvqdh2q05bcg9b68dw3xiqqb1xirbm4rp5chyr419"; depends=[adaptMCMC data_table DEoptim dfoptim FME forecast GA GenSA ggplot2 MCMCpack Metrics nloptr Rcpp rlang Rsolnp]; }; ContaminatedMixt = derive2 { name="ContaminatedMixt"; version="1.3.4"; sha256="148zpk5a091kxrn6f73k6piwfwbqdmiyd48qinn6cbfma012n13w"; depends=[caret mclust mixture mnormt mvtnorm]; }; ContourFunctions = derive2 { name="ContourFunctions"; version="0.1.1"; sha256="00p5bdiq8hj95lkr86iwyh50qw0d0d4gs9hhbzcix6lwn8dwqd3s"; depends=[]; }; ConvergenceClubs = derive2 { name="ConvergenceClubs"; version="2.2.1"; sha256="0mn0lnycz5pi821q52g1njjs2pcmvv8yynr13bh237c8cashk2n3"; depends=[lmtest sandwich]; }; @@ -821,7 +828,7 @@ in with self; { CoopGame = derive2 { name="CoopGame"; version="0.2.1"; sha256="1c11b5l6r5csa6zw5a6lfqaygzhnp5jfdf0vkrxpl7fb4bbxhm31"; depends=[geometry gtools rcdd rgl]; }; CoordinateCleaner = derive2 { name="CoordinateCleaner"; version="2.0-11"; sha256="0z1ksim2chwg5acbvav0dzsrnzch1qmbvr2k0dhjmn8lr9rdk4m5"; 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.7"; sha256="0bgw8493kv0skjdnwyml9m2ilgz0ac4k9nps9kilphw9l9f1if02"; depends=[]; }; + Copula_Markov = derive2 { name="Copula.Markov"; version="2.8"; sha256="0wyb80jj9zgh7kn0nah7dljps72083c92hpds94dw4ccmw6cfwf6"; depends=[]; }; Copula_Markov_survival = derive2 { name="Copula.Markov.survival"; version="0.1.0"; sha256="1r9m96r0mqqjlawhlb9d8d1hf2k2bkal2fmw6g0zabdjb19c75y7"; depends=[survival]; }; Copula_surv = derive2 { name="Copula.surv"; version="1.0"; sha256="1cq12vmsvrxd6anpv6b5jig7x1lf6pj589353h2ba9k0fhkpk51y"; depends=[]; }; CopulaCenR = derive2 { name="CopulaCenR"; version="1.1.2"; sha256="1ksxqgb91vww5q4njidchxwia64g5229dvpxhqhfp8w6hvmib1k1"; depends=[caret copula corpcor flexsurv icenReg magrittr plotly pracma survival]; }; @@ -830,17 +837,17 @@ in with self; { CopyDetect = derive2 { name="CopyDetect"; version="1.3"; sha256="1g3bwd805h62x93xvvn67acf9v6vn7s7ghxpvjhwcfdfj7fwzh6l"; depends=[mirt]; }; CorBin = derive2 { name="CorBin"; version="0.3.3"; sha256="0jf3d0mbr0vmcqmk5p4rcvc3nc4dn6cqcj8fcqyf32y9vwxd2wii"; depends=[]; }; CorDiff = derive2 { name="CorDiff"; version="1.0"; sha256="12rgfhygrdq1ign4ybr8g171wxic8zbp83n1xdsnqpj910k5jdr5"; depends=[mcc]; }; + CorReg = derive2 { name="CorReg"; version="1.2.17"; sha256="06r8a7swvbafkl7ynvhhwbvm8jgqi54q70fk5jv19plff2j4gxmf"; depends=[corrplot elasticnet glmnet lars MASS Matrix mclust mvtnorm Rcpp RcppEigen rpart]; }; Corbi = derive2 { name="Corbi"; version="0.5-0"; sha256="05jr0y0qjv2l5ikx8cj10nl16z5yvcjbzdz5gk7lp6kpnmgq3sbw"; depends=[Matrix]; }; - CoreGx = derive2 { name="CoreGx"; version="0.1.1"; sha256="160lf1hg4a8cxgbsiny8g0yhyp1x1c2pdlys6rc9smllhsmzd9yw"; depends=[Biobase lsa piano rlang]; }; CornerstoneR = derive2 { name="CornerstoneR"; version="1.1.1"; sha256="017j7s3m97sxahgnvk9sm7rfx81cjp1xzsmw7b1aqi7301zjrqa7"; depends=[checkmate data_table ranger vcd]; }; CorporaCoCo = derive2 { name="CorporaCoCo"; version="1.1-0"; sha256="1s3wlcy6mnw9riivw5lc4gd6bjbsd77m15ipr95g46isdcrli8zb"; depends=[data_table RColorBrewer rlist]; }; CorrBin = derive2 { name="CorrBin"; version="1.6"; sha256="0iwad5qf7hqii02s5f85155c5s7v8ghnac4l6l3c45dshrpapp2m"; depends=[boot combinat dirmult geepack mvtnorm]; }; CorrMixed = derive2 { name="CorrMixed"; version="1.0"; sha256="0rj987k8pzsw9n9a20ky23rwc3zyqsl0fcibpmry7p8pw2miaj0z"; depends=[nlme psych]; }; - CorrToolBox = derive2 { name="CorrToolBox"; version="1.6.1"; sha256="1hqbb3raw86g3ww8dmapyy8lac2avs6jbjklfvi9gx06lyw4kv9r"; depends=[BinNonNor BinOrdNonNor GenOrd moments mvtnorm psych]; }; + CorrToolBox = derive2 { name="CorrToolBox"; version="1.6.2"; sha256="0a12vdyqqhw46iladdkbc0hxsbq8pihg056k6hn1rv41g7r08y14"; depends=[BinNonNor BinOrdNonNor GenOrd moments mvtnorm psych]; }; CorrectOverloadedPeaks = derive2 { name="CorrectOverloadedPeaks"; version="1.2.17"; sha256="1g7irjbhwnbhk74y3qxcjlrsn2yz8q6wn7ih16wq669nswryxhxk"; depends=[bitops digest XML]; }; CorrectedFDR = derive2 { name="CorrectedFDR"; version="1.0"; sha256="15047cfjniljzhznkbzq3hyq221y9k7fa04f69zm0k0sxr627gxg"; depends=[]; }; CosW = derive2 { name="CosW"; version="0.1"; sha256="12l4w8b5jnr8773hxk7khrdn705x6bdbw7s8z8w95bfbbi12dj6v"; depends=[fdrtool pracma]; }; - Counterfactual = derive2 { name="Counterfactual"; version="1.1"; sha256="0mz0h5zsmca8fww7nq08m9cld2zbaydn8qad5f2g6vxn382842p9"; depends=[doParallel doRNG foreach Hmisc quantreg survival]; }; + Counterfactual = derive2 { name="Counterfactual"; version="1.2"; sha256="1spryxvnkdz728rl4nb7zlqhynnh0b4m7lnhq4i1n13gfsz1m5j4"; depends=[doParallel doRNG foreach Hmisc quantreg survival]; }; Countr = derive2 { name="Countr"; version="3.5.4"; sha256="10fzmqncbnr47x35xqpsmwzadv9j6r2svisrv8vfpp27mlvp9qwr"; depends=[boot car dplyr flexsurv Formula lattice lmtest MASS Matrix numDeriv optimx pscl RColorBrewer Rcpp RcppArmadillo Rdpack standardize VGAM xtable]; }; CountsEPPM = derive2 { name="CountsEPPM"; version="3.0"; sha256="0iw7sfrb4yyaagwm1f4q9av5zvzia1mp2ns287ppsw3k248lz0kb"; depends=[expm Formula lmtest numDeriv]; }; CovCombR = derive2 { name="CovCombR"; version="1.0"; sha256="07yd0zbvc9db2jw6xigfhxnbkxwb3gxlmywadz7fs3rva2if2ffx"; depends=[CholWishart Matrix nlme]; }; @@ -850,6 +857,7 @@ in with self; { CoxBoost = derive2 { name="CoxBoost"; version="1.4"; sha256="1bxkanc8zr4g3abn4ds5wqibv65flvm4y648fs9s0l4vc9vmyshg"; depends=[Matrix prodlim 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]; }; + CoxR2 = derive2 { name="CoxR2"; version="1.0"; sha256="1fjsa403lbx0hi7b0gsdaz0q9axw521q4xzphbfbknify4y72md6"; depends=[survival]; }; CoxRidge = derive2 { name="CoxRidge"; version="0.9.2"; sha256="0p65mg4hzdgks03k1lj90yj6qbk50s94rwvcwzkb5xxxwrijd10r"; depends=[survival]; }; CpGFilter = derive2 { name="CpGFilter"; version="1.1"; sha256="0ccvk7lawmay0wqdyhs6ww7396dcfzazn72sq6zwyw7dl45k2j0i"; depends=[matrixStats]; }; CpGassoc = derive2 { name="CpGassoc"; version="2.60"; sha256="1zx18x8pxjl2ajnj7a7lb8383m75ysg17f4mzz0vkgl5mnf617ny"; depends=[nlme]; }; @@ -873,23 +881,21 @@ in with self; { CytobankBridgeR = derive2 { name="CytobankBridgeR"; version="1.0.0"; sha256="0m8gxbm3p9gvdszymqx10n5rzb406r4f70a0in798c56mp2rcsl4"; depends=[CytobankAPI]; }; D3GB = derive2 { name="D3GB"; version="1.1"; sha256="1r4hxx2qdws7c7hsnswzfh6az8mn720sk8nygilljl2ghnwpq7pa"; depends=[DBI RSQLite]; }; D3partitionR = derive2 { name="D3partitionR"; version="0.5.0"; sha256="10067rdgbpjzgw2wiq75kdd0gd7bl41hp16sxc0k2p72ybqfpw03"; depends=[data_table functional htmlwidgets magrittr RColorBrewer titanic]; }; + DAAG = derive2 { name="DAAG"; version="1.24"; sha256="09fxd21p7v9mpy9s876n1jyc3l7w7s3vs5iglc3xphqbffgzfnvs"; depends=[lattice latticeExtra]; }; DAAGbio = derive2 { name="DAAGbio"; version="0.63-3"; sha256="0n82d9nsvpl6cwp95by8ff9fmdafs2fdi603dlik5890adaw42x4"; depends=[limma]; }; DAC = derive2 { name="DAC"; version="0.1.1"; sha256="0abnl70k4c98n29qi64sfd5nch10abw9fknhf2aksyi0qadsiyjq"; depends=[blavaan flexmix sfsmisc truncnorm]; }; DACF = derive2 { name="DACF"; version="1.0.0"; sha256="0hv7c9lk6ivj4iz953yn11iy5p611q4si4ghn9d5a9i229s5hig8"; depends=[]; }; - DAFOT = derive2 { name="DAFOT"; version="0.0.1"; sha256="18r5fhb6g0s1viifkkicplzab4aand2lxiwph86w80q80bzpjlpg"; depends=[ape gtools tibble tidytree]; }; - DAIME = derive2 { name="DAIME"; version="2.1.1"; sha256="0skj878ri6h1q16nsln58ssanh3nhxfq4124fhcmfc60h1jhv336"; depends=[]; }; + DAIME = derive2 { name="DAIME"; version="2.1.3"; sha256="099pbzgryz9lxhcqlrywcv8zl5af4ir5dyyqvgc16xi5bddxk7ld"; 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.4.9"; sha256="1zviaf7530v8w996lbma0vplabrapgwldi7h70pr0439sxaqd421"; depends=[ggplot2]; }; - DALEXtra = derive2 { name="DALEXtra"; version="0.2.0"; sha256="1brjc9lybc1sfyk0n6bd44rpapgvi3p60wxw5qaajfcxrxk1286b"; depends=[DALEX ggdendro ggplot2 glmnet gridExtra reticulate]; }; + DALEX = derive2 { name="DALEX"; version="1.0.1"; sha256="1jbyn57vn6d281a5y15h5d8ljin8cdb9lr7lbgggc950blyfv4g0"; depends=[ggplot2]; }; + DALEXtra = derive2 { name="DALEXtra"; version="0.2.1"; sha256="0r1vdjphmfwa95fpd3fx2hqfb23gb4i920j8l8xxraadr9hdac32"; depends=[DALEX ggdendro ggplot2 glmnet gridExtra reticulate]; }; DALY = derive2 { name="DALY"; version="1.5.0"; sha256="1v7ld01xcn5jiygl1c3xhd5h71ip90lks87fs9gmpnivp8jz5cr5"; depends=[]; }; DAMOCLES = derive2 { name="DAMOCLES"; version="2.2"; sha256="1rmm36k5w6y8pkb1vzkxnizx3my94kgai8h3x83cxr6mlbgn9lb8"; depends=[ape caper DAISIE DDD deSolve expm Hmisc Matrix matrixStats picante]; }; - DAMisc = derive2 { name="DAMisc"; version="1.5"; sha256="1m418lmzy4sv5hj90j4r4j1bb2q43hxnmpd0mp16010fyr0asbcy"; depends=[AICcmodavg boot car coda effects fANCOVA games gdata lattice latticeExtra MASS nnet optiscale pscl rstan VGAM xtable]; }; + DAMisc = derive2 { name="DAMisc"; version="1.5.3"; sha256="1lfhbynzbynaspgwc11prj0sd019nq7a7hhydim3znjb3i5q30z5"; depends=[AICcmodavg boot car clarkeTest coda effects fANCOVA gdata ggplot2 glue lattice latticeExtra MASS nnet optiscale rstan VGAM xtable]; }; DAP = derive2 { name="DAP"; version="1.0"; sha256="0zzb05yxfaqp6qnr979q20rqy8sl5l825mxs0x9366qr7mz5k5ws"; depends=[MASS]; }; - DATforDCEMRI = derive2 { name="DATforDCEMRI"; version="0.55"; sha256="0v26a1gi8l21ga5nqcnyfaa7gc8zxq6wk95b96ajgpdybb0l9s53"; depends=[akima lattice locfit matlab R_methodsS3 R_oo xtable]; }; DBEST = derive2 { name="DBEST"; version="1.8"; sha256="1a598g02hpfgv572gchllqkppynnsp4lx764jg0g66w3b66k0kdy"; depends=[zoo]; }; DBGSA = derive2 { name="DBGSA"; version="1.2"; sha256="04zqh9y3nqcdzs5jn8aaq5idy9zl450ikvl788xs860wlg692qv2"; depends=[fdrtool]; }; - DBHC = derive2 { name="DBHC"; version="0.0.2"; sha256="08sl6gv1dw2kpk1zylvyqqga6xvhzhpp5zxa9ql1hyzc2i43jivq"; depends=[ggplot2 reshape2 seqHMM TraMineR]; }; DBI = derive2 { name="DBI"; version="1.1.0"; sha256="1r03j9rdcxb9bhxk40dkmy10ikz4yzsxhy3f9k9ix3x577xbfvd9"; depends=[]; }; DBItest = derive2 { name="DBItest"; version="1.7.0"; sha256="10fvij1bz3pvqqrg0s55x7bfgxh7nrnnjaxp8cwpk3wkp3c77pi5"; depends=[blob callr DBI desc hms lubridate R6 rlang testthat withr]; }; DBKGrad = derive2 { name="DBKGrad"; version="1.7"; sha256="0q11kza0c1caph01f247h7qm4shqycq0g9i152739xzspprjf4i1"; depends=[lattice minpack_lm SDD TSA]; }; @@ -897,21 +903,22 @@ in with self; { DCA = derive2 { name="DCA"; version="2.0"; sha256="1acy33vyf814kr0aj6kdvi9f1qzgynwwzv57ll01gd0iqq36374f"; depends=[coin elasticnet GPArotation locfdr modeest mvtnorm PMA]; }; DCCA = derive2 { name="DCCA"; version="0.1.1"; sha256="06xdx79r7dr14dlk5vgcyd8ar4sc72imlyk66bnia1kvlynvdy69"; depends=[checkmate]; }; 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="2.0.1"; sha256="1ma6f7233jm0rzm12f406scgrj4b6xnv39aaplpgcvpx160nv3j1"; depends=[MASS matrixcalc mvtnorm Rcpp]; }; DCG = derive2 { name="DCG"; version="0.9.3"; sha256="08718x6v3g7kpfv0gpgm19cn3d3ynj7yagzs0jic1j5rwvn04pfb"; 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]; }; DCM = derive2 { name="DCM"; version="0.1.1"; sha256="191gwfv30hdr789jmdrimcc7aqisz635anydsw2v4s28a3zjbipw"; depends=[gWidgets pander readxl]; }; DCODE = derive2 { name="DCODE"; version="1.0"; sha256="19dwms88q0ylxd92l3ivig8p8jjyhk8mhgz0l36m9pcq11gyjc0n"; depends=[seqinr]; }; - DCchoice = derive2 { name="DCchoice"; version="0.0.15"; sha256="1qdqn45ipq0806r25ri4aygzq48k8j5k8rlhi1cafym421yq6bfg"; depends=[Formula interval MASS]; }; + DCPO = derive2 { name="DCPO"; version="0.5.0"; sha256="03j0aibh70ghh4nkna1iqsbylih3nc85zv9cb91mc4fp9ygcicag"; depends=[beepr BH dplyr forcats janitor purrr Rcpp RcppEigen rstan rstantools StanHeaders tibble tidyr]; }; + DCchoice = derive2 { name="DCchoice"; version="0.0.16"; sha256="0wwhdpljg1k70kydhh89lk6c461a9vjw6p2ijzhvgkv2pl5rxaag"; depends=[Formula interval MASS]; }; DChaos = derive2 { name="DChaos"; version="0.1-3"; sha256="12qi8m2rvd5r8clmi44hiwpnr6zf1sjw35wvbvm4nz3431xwf4ng"; depends=[entropy NeuralNetTools nnet outliers pracma sandwich xts zoo]; }; DCluster = derive2 { name="DCluster"; version="0.2-7"; sha256="008nyry64s5g80narcc58273v0jhqzfgwynka6mh7jgi7qsqnxjd"; depends=[boot MASS spdep]; }; - DClusterm = derive2 { name="DClusterm"; version="1.0-0"; sha256="19ifnj7y3zjp15hd6mafjjqbqqyff17zd0ivnl8bd843nalgfxbb"; depends=[DCluster gridExtra latticeExtra lme4 pscl RColorBrewer sp spacetime xts]; }; - DDD = derive2 { name="DDD"; version="4.1"; sha256="09aif9agypw765h148615b6dcjhzw1bvgrzz9dka6n3vk4r1lj5d"; depends=[ape deSolve expm Matrix phytools SparseM subplex]; }; + DClusterm = derive2 { name="DClusterm"; version="1.0-1"; sha256="04i9fyph2k3ffds0nv49371p8lw6dkzcf27pc98f99x0l6c8k5iq"; depends=[DCluster lme4 sp spacetime xts]; }; + DDD = derive2 { name="DDD"; version="4.3"; sha256="001zal1nqayglnwf8hgi1sm8m5gn5jzi9d3q3ckxdcnn36xkla7h"; 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.4"; sha256="0z994anrw746iy83503bah2n39rd7qvx4spxn4qwhxhxbjp4gkfw"; depends=[admisc haven readr tibble xml2]; }; DDM = derive2 { name="DDM"; version="1.0-0"; sha256="19g06qk3lzasj294x9wfij729mlq6ryvjqkn3rgl5xp1w0gx9wi2"; depends=[]; }; DDPGPSurv = derive2 { name="DDPGPSurv"; version="1.0"; sha256="1d271yv621jmwd4dmdnhpwrk95gbpw7g6r2v05lc3d6wzlzpd78c"; depends=[MASS mc2d mvnfast Rcpp RcppArmadillo survival]; }; - DDPNA = derive2 { name="DDPNA"; version="0.2.1"; sha256="0854zs6gay78dq0ivpmkrhg387llk0mbfjz8nkvhnkss0mh6bpmk"; depends=[ggalt ggplot2 Hmisc igraph MEGENA plyr scales VennDiagram]; }; DDRTree = derive2 { name="DDRTree"; version="0.1.5"; sha256="16s5fjw7kwlxhrkzdny62sx32fvmg3rxjc3wrh6krd31jh1fqlfk"; depends=[BH irlba Rcpp RcppEigen]; }; DDoutlier = derive2 { name="DDoutlier"; version="0.1.0"; sha256="1az5zq0l3kj959572mlpc4zl73f16iag0yrs217fa9m8xpd3c2sd"; depends=[dbscan pracma proxy]; }; DECIDE = derive2 { name="DECIDE"; version="1.2"; sha256="18kn2pm9r0ims2k1jfsfzh258wwxz0xg86rsbwgq6szh0azlq3qy"; depends=[]; }; @@ -921,21 +928,21 @@ in with self; { DEMOVA = derive2 { name="DEMOVA"; version="1.0"; sha256="09dqhhhihphhdnplmhdq4q5zwc0qvqhirdrxa9x6fr43vwa5zfp4"; depends=[leaps]; }; DES = derive2 { name="DES"; version="1.0.0"; sha256="16p38i8ykwc8gjw6c9dhdwjjpa1b17n9wqhz3rhkbzjh978pky31"; depends=[]; }; DESnowball = derive2 { name="DESnowball"; version="1.0"; sha256="012kdnxmzap6afc3ffkcvk1mazlkp286av6g9fwz2wcbf5mh9n1m"; depends=[clue cluster combinat MASS]; }; - DET = derive2 { name="DET"; version="2.0.1"; sha256="1jadxhq2jjjvmkz4bmakb7yzlnf080fpdkdi39czkm489bvjxgd5"; depends=[doParallel pROC]; }; - DEVis = derive2 { name="DEVis"; version="1.0.1"; sha256="0fb8q72gm9h52v6fc12jcvk9k59qrns74yqjvj73nch29gkr16hp"; depends=[DESeq2 ggdendro ggplot2 ggsci ggthemes gridExtra MASS pheatmap plyr PoiClaClu RColorBrewer reshape2 SummarizedExperiment]; }; - DEoptim = derive2 { name="DEoptim"; version="2.2-4"; sha256="10nlsvms5pf0wmn4z1lj6vnmpwr10q8nhdy5xy9rn7hd1627fm0a"; depends=[]; }; + DET = derive2 { name="DET"; version="2.0.2"; sha256="01vyb3mv4g7zpk7cn44i4069ndk9sn9qqs9k52clqbnf1kl1ynbx"; depends=[doParallel pROC]; }; + DEoptim = derive2 { name="DEoptim"; version="2.2-5"; sha256="0nlm2gdvd33yrwambmlrgj76inxz2a65ya7727l98fd4skfdw4mf"; depends=[]; }; DEoptimR = derive2 { name="DEoptimR"; version="1.0-8"; sha256="1vz546hyjyhly70z62h5n3mn62b8llhhmim8ffp9y6jnnb0i2sc4"; depends=[]; }; - DEploid = derive2 { name="DEploid"; version="0.5.2"; sha256="0xjczfql6jl4jxxwvdn3gmwj8bawhj5w6hdamrb0yjdjlhdwb11y"; depends=[htmlwidgets magrittr plotly Rcpp rmarkdown scales]; }; + DFA_CANCOR = derive2 { name="DFA.CANCOR"; version="0.1.6"; sha256="0pyql8xms08qn8kzf1h984ik1pbyy8z1wa1lf588pb6clwmd2mk8"; depends=[MASS MVN]; }; DFIT = derive2 { name="DFIT"; version="1.0-3"; sha256="1h0wvcplb7j7dqz9hkaw30x92ngxzkdvkwpg0142hrqb201zfrac"; depends=[ggplot2 mvtnorm simex]; }; DGCA = derive2 { name="DGCA"; version="1.0.2"; sha256="0k2a24ycagyxdx54dh9w8km25xhmmmhyyl26g76z4g5gqvcw092k"; depends=[matrixStats WGCNA]; }; - DGLMExtPois = derive2 { name="DGLMExtPois"; version="0.1.0"; sha256="1c6lys605sggni40792d1xq8ll5nbdc75r92c87grx7zh74sz98m"; depends=[compoisson COMPoissonReg nloptr progress]; }; + DGLMExtPois = derive2 { name="DGLMExtPois"; version="0.1.2"; sha256="11gfj1pnfk9f8ap66yswbc1pq6k2n6893jadh2nvnhlkdk47bm28"; depends=[COMPoissonReg nloptr progress]; }; DGM = derive2 { name="DGM"; version="1.7.2"; sha256="0z0f8bazzsahvjkpfif50db700mqb7arcglwsfxcar9qdy082vsn"; depends=[data_table ggplot2 Rcpp RcppArmadillo reshape2]; }; DGVM3D = derive2 { name="DGVM3D"; version="1.0.0"; sha256="17cxv8rm7kmxms7v7hzbwbdwa3xl1hwgiljf97ppwswglqyik9iv"; depends=[rgl]; }; - DHARMa = derive2 { name="DHARMa"; version="0.2.6"; sha256="0mv95409lr9psh8ia9llpx8a6861iakrfnw2h96gpi2r9scpr8fj"; depends=[ape doParallel foreach gap glmmTMB lme4 lmtest MASS mgcv qrnn sfsmisc spaMM]; }; + DHARMa = derive2 { name="DHARMa"; version="0.2.7"; sha256="13gs6v5z7lwjas7ln6nnlw125scmk517ma0y3jiwj1rn4vnhy41m"; depends=[ape doParallel foreach gap glmmTMB lme4 lmtest MASS mgcv qrnn sfsmisc spaMM]; }; DHBins = derive2 { name="DHBins"; version="1.1"; sha256="1g69acac7pxw8x0d9czyds7xljhbv9d686c99a3y8b4vh7dnx62s"; depends=[ggplot2]; }; 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]; }; + DIFplus = derive2 { name="DIFplus"; version="1.1"; sha256="1k03lr437gx5y762z3h40hz9kcl4m8xgrndxvbyvsgmn2h6pbwsd"; depends=[plyr TestDataImputation]; }; DIFtree = derive2 { name="DIFtree"; version="3.1.4"; sha256="1q02229vlmyxqasbxiscxvqpcip1r0sbwbp7ja909ljhc5b76pr8"; depends=[gridBase penalized plotrix VGAM]; }; DIME = derive2 { name="DIME"; version="1.2"; sha256="11l6mk6i3kqphrnq4iwk4b0ridbbpg2pr4pyqaqbsb06ng899xw0"; depends=[]; }; DIMORA = derive2 { name="DIMORA"; version="0.1.0"; sha256="0qcy2pqpx7za4ckf6wvmbhz5a52j44ksn81f8j1lj0z90idj6psn"; depends=[minpack_lm numDeriv]; }; @@ -944,14 +951,14 @@ in with self; { DIconvex = derive2 { name="DIconvex"; version="1.0.0"; sha256="0bnrq9nmryshir6ll43nz20aaqmmw0zjvfml72cpwbvrma8a3qmz"; depends=[lpSolveAPI]; }; DJL = derive2 { name="DJL"; version="3.2"; sha256="0vagpvmnbpnlxa1gj3y3gp0npf8hvpn8lyjrcggdn58rbcm2z3q9"; depends=[car lpSolveAPI]; }; DLASSO = derive2 { name="DLASSO"; version="2.0.2"; sha256="0xdygf6h89d9z4kqb46iqfxgdzq9dmkrxf9ypw78l4d8n9xx2gaa"; depends=[MASS]; }; - DLMtool = derive2 { name="DLMtool"; version="5.4.1"; sha256="0sfb1kx14qq4nxskgavbvsh78v4g5k9dmmp2vv8g2kfi73izwr83"; depends=[abind boot broom crayon devtools dplyr DT fmsb ggplot2 ggrepel gridExtra kableExtra knitr MASS mvtnorm openxlsx purrr Rcpp RcppArmadillo readxl rfishbase rmarkdown shiny snowfall tidyr]; }; - DMMF = derive2 { name="DMMF"; version="0.5.0.2"; sha256="02sk1ykispkjdclsi5xp1m4vmf8mhcqm4q2z73xanvax1kqfb3v3"; depends=[raster rgdal sp]; }; + DLMtool = derive2 { name="DLMtool"; version="5.4.2"; sha256="0ja0729wsjwannjffz0mv0m6f7sq6sy14c1pbpbjm1547d9v01bn"; depends=[abind dplyr ggplot2 Rcpp RcppArmadillo snowfall]; }; + DMMF = derive2 { name="DMMF"; version="0.5.1.2"; sha256="0p82cfp0561j4ki20rznx46z7vqdxh128a0m0zj8d2wp3csn1aag"; depends=[raster rgdal sp]; }; DMRMark = derive2 { name="DMRMark"; version="1.1.1"; sha256="15wr6j0v9kvbv8y6flkp4svfqy059ziv89nxv91vp0pjmavhpdlz"; depends=[ellipse MCMCpack mvtnorm]; }; DMRnet = derive2 { name="DMRnet"; version="0.2.0"; sha256="1rbba8w4li240gw5z675d7skm72rh0zxzp4rhsn6ivj72jya7jw4"; depends=[glmnet grpreg]; }; DMwR = derive2 { name="DMwR"; version="0.4.1"; sha256="1qrykl9zdvgm4c801iix5rxmhk9vbwnrq9cnc58ms5jf34hnmbcf"; depends=[abind class lattice quantmod ROCR rpart xts zoo]; }; DMwR2 = derive2 { name="DMwR2"; version="0.0.2"; sha256="1vzfbz2k05j8r2hpig3d2grb99rnnh2s1sviii3prcyqicxfh0i9"; depends=[class DBI dplyr quantmod readr rpart xts zoo]; }; DNAseqtest = derive2 { name="DNAseqtest"; version="1.0"; sha256="1mpmf40vrpw8m75rlqchsnyrz12pgg5bkz7wfca5yy5sbbiwk5pf"; depends=[]; }; - DNAtools = derive2 { name="DNAtools"; version="0.1-22"; sha256="1kkqbzwbivd78lpphsn9xqdxqc46ng6f86nqns18gq0s2g8gvys1"; depends=[multicool Rcpp Rsolnp]; }; + DNAtools = derive2 { name="DNAtools"; version="0.2-2"; sha256="1257gwjlqg4viw9n8g6cvv9anx5filh9d4zmjdm8zqvh7kchm8yf"; depends=[multicool Rcpp RcppParallel RcppProgress Rsolnp]; }; DNLC = derive2 { name="DNLC"; version="1.0.0"; sha256="05410xgpfjsydjmnzry454qcjpws9vhh252q2xq7l0scdj87ly00"; depends=[caTools fdrtool GOstats igraph locfdr mvtnorm spdep]; }; DNMF = derive2 { name="DNMF"; version="1.3"; sha256="09yp6x6vd44ahklcag96fpjgyphyn45rkqkbwr1n36a2d8vxk9nc"; depends=[doParallel foreach gplots Matrix]; }; DNetFinder = derive2 { name="DNetFinder"; version="1.0"; sha256="0q56c2389qaq3wsqpj8s95ncm0xmbl1slr0jmpixb48hhgk0l0ji"; depends=[flare]; }; @@ -971,34 +978,35 @@ in with self; { DREGAR = derive2 { name="DREGAR"; version="0.1.3.0"; sha256="15cplshs85r0z659mc7xmj5db7vc95wxs01c34isc22p8z0a287i"; depends=[msgps]; }; DRHotNet = derive2 { name="DRHotNet"; version="1.1"; sha256="040g9h2a2hmnd20y41xnms01iam68f6xhp2x0ckarmx961995bhg"; depends=[maptools PBSmapping raster sp spatstat spdep]; }; DRIP = derive2 { name="DRIP"; version="1.4"; sha256="1rds1161h19waqhiq08hqk5zcn48afccaggmb42xr1zyk31irpi6"; depends=[readbitmap]; }; - DRR = derive2 { name="DRR"; version="0.0.3"; sha256="1yd1fvllfkcrwg9v322n4wkk4q4q84nvy58y4vac9pdr3yf3i4vl"; depends=[CVST kernlab Matrix]; }; + DRR = derive2 { name="DRR"; version="0.0.4"; sha256="1y70si1gig4l7jx5jiqsqliyywfsvimkx53x3zh1lc3yj2j6bqwk"; depends=[CVST kernlab Matrix]; }; DRaWR = derive2 { name="DRaWR"; version="1.0.1"; sha256="1pfdczwzd236c64yw94bgbk0hbl4dhlgjfjwkljmqgqrzsddvgqh"; depends=[Matrix ROCR]; }; DRomics = derive2 { name="DRomics"; version="2.0-1"; sha256="0lfjk202fgvxjljjpakbmdqc41hbpgl39lym215hlqksfpi0jq7a"; depends=[DESeq2 ggplot2 limma]; }; DSAIDE = derive2 { name="DSAIDE"; version="0.8.3"; sha256="0n1ffv48202pnnsdcd3zpgpviy8613fcgx5c796whjffrc4v8m31"; depends=[adaptivetau deSolve dplyr ggplot2 gridExtra lhs nloptr plotly shiny XML]; }; DSAIRM = derive2 { name="DSAIRM"; version="0.8.2"; sha256="05m6hm9h8f41n3wswbp7z80kfvmn65jypj9fwlv3k8bdm4lw1mla"; depends=[adaptivetau boot deSolve dplyr ggplot2 gridExtra lhs nloptr plotly shiny XML]; }; DSBayes = derive2 { name="DSBayes"; version="1.1"; sha256="0iv4l11dww45qg8x6xcf82f9rcz8bcb9w1mj7c7ha9glv5sfb25v"; depends=[BB]; }; + DSI = derive2 { name="DSI"; version="1.0.0"; sha256="0dc9xhmz4pg5d8pm2wiya7b0m793kx1campnaxl8mcs2gvdfahm9"; depends=[progress R6]; }; DSL = derive2 { name="DSL"; version="0.1-7"; sha256="05wj3zypr2kqfbka930qnwnk2r43pqi13pbs5n6lm8vdq4zjblw4"; depends=[]; }; + DSSAT = derive2 { name="DSSAT"; version="0.0.1"; sha256="06a5n484pc49ynrzaf3fm04884z6qwhd6kw0n4834fynpnflkkym"; depends=[dplyr glue lubridate purrr readr rlang stringr tidyr]; }; DSpat = derive2 { name="DSpat"; version="0.1.6"; sha256="1v6dahrp8q7fx0yrwgh6lk3ll2l8lzy146r28vkhz08ab8hiw431"; depends=[mgcv RandomFields rgeos sp spatstat]; }; DSpoty = derive2 { name="DSpoty"; version="0.1.0"; sha256="18z8gk3zj7k2szxg9579qy5klrqjw6zsk5x9jmwrv4qhb98fyji6"; depends=[dplyr httr purrr stringr]; }; - DSsim = derive2 { name="DSsim"; version="1.1.4"; sha256="0cspyd6msh8aci3w1fv234ca2bwpi6ylkbl45d4k0v3wzzfj20hk"; depends=[fields mgcv mrds rgeos shapefiles sp splancs]; }; + DSsim = derive2 { name="DSsim"; version="1.1.5"; sha256="0dr8dc91m7s5c198k9cb26a09f14wb8ihr46c0mr9cg33l2wf3nv"; depends=[fields mgcv mrds rgeos shapefiles sp splancs]; }; DStree = derive2 { name="DStree"; version="1.0"; sha256="14wba25ylmsyrndh007kl377dv4r34wr1555yxl6kyxrs4yg3jir"; depends=[Ecdat pec Rcpp rpart rpart_plot survival]; }; DSviaDRM = derive2 { name="DSviaDRM"; version="1.0"; sha256="1hj2pgnldrpgapwwz1kf4k6mvyzwdvb1i6czd7sbimsx5hafwps8"; depends=[igraph ppcor]; }; - DT = derive2 { name="DT"; version="0.11"; sha256="09k9s07aah1apc308sj1abvr27mky6fkpl9j6lxl2x55n4immvkg"; depends=[crosstalk htmltools htmlwidgets jsonlite magrittr promises]; }; - DTAT = derive2 { name="DTAT"; version="0.3-3"; sha256="184b8qkwqlygdqzad2x2qf4hdrpsr7yffmf21jrz5yf946y621wl"; depends=[data_table dplyr Hmisc jsonlite km_ci pomp r2d3 shiny survival]; }; + DT = derive2 { name="DT"; version="0.13"; sha256="1db35mi4m4q3kha4vhvh693bv04y7h9pdawhsx8f234qjvz7783r"; depends=[crosstalk htmltools htmlwidgets jsonlite magrittr promises]; }; DTAXG = derive2 { name="DTAXG"; version="0.1.0"; sha256="1jxa0ix0z35i0xdnjl698j8iqjmp6nz8ckah9bap5ay9rkq0xd7f"; depends=[]; }; DTComPair = derive2 { name="DTComPair"; version="1.0.3"; sha256="1af2293ckkpz0gjcibgzzvz37852cav4wa4girpc87yn3p4ajlri"; depends=[gee PropCIs]; }; - DTDA = derive2 { name="DTDA"; version="2.1-1"; sha256="0hi2qjcwd6zrzx87mdn1kns5f2h6jh7sz9jpgbi0p0i80xg8jnn3"; depends=[]; }; - DTDA_cif = derive2 { name="DTDA.cif"; version="1.0.1"; sha256="1ams5annm0296y6i5ii54cf95i0739269b4p97rib6nniynpwwxk"; depends=[doParallel foreach Rcpp]; }; + DTDA = derive2 { name="DTDA"; version="2.1-2"; sha256="1nc4j6pzbk5g967k9vh06v8gfr88h611fw6zbvrp2iy6z22arpgf"; depends=[]; }; + DTDA_cif = derive2 { name="DTDA.cif"; version="1.0.2"; sha256="12vkhqxdhir06s35kr76dwns9m02wyicz3mv4r56fqglsfyw77xr"; depends=[doParallel foreach Rcpp]; }; DTDA_ni = derive2 { name="DTDA.ni"; version="1.0"; sha256="0c45cz4y629bc0jnf3m35ywqkrnjcdqbssbb6m10j8b4gszdi35i"; depends=[]; }; DTK = derive2 { name="DTK"; version="3.5"; sha256="0nxcvx25by2nfi47samzpfrd65qpgvcgd5hnq9psx83gv502g55l"; depends=[]; }; DTMCPack = derive2 { name="DTMCPack"; version="0.1-2"; sha256="0bibas5cf06qq834x9q2l2fyh6q9wrg07k8cn6almcyirzax6811"; depends=[]; }; DTR = derive2 { name="DTR"; version="1.7"; sha256="1lzvk9ar6xf3n2vvy8vb9mvrbx3nafzzhvz5g7vf79jd71yz54jd"; depends=[aod ggplot2 survival]; }; DTRlearn2 = derive2 { name="DTRlearn2"; version="1.0"; sha256="0aly8byygpgsjfa1lzarcig2dvz852ihdlw7xhb7kx62y8prjzz1"; depends=[foreach glmnet kernlab MASS Matrix]; }; DTRreg = derive2 { name="DTRreg"; version="1.5"; sha256="0milc5bmks6pxhl5f3zyv3w80ld733v05cvx8i531v2ynac4v6zb"; depends=[]; }; - DTSg = derive2 { name="DTSg"; version="0.3.0"; sha256="1dzzb51zash0r7afvnlv3sn738g6dxgb11s3f0skzl3s83jn15lh"; depends=[checkmate data_table R6]; }; + DTSg = derive2 { name="DTSg"; version="0.4.0"; sha256="0if4h5660wl5pb187lfhv00gdr9wp43w5xk1g4hf83jbnq06q424"; depends=[checkmate data_table R6]; }; DTWBI = derive2 { name="DTWBI"; version="1.1"; sha256="06lp4yc5nhacrgic78l014g2w1ibwgs8dp8zrahk5aripaczl25y"; depends=[dtw e1071 entropy lsa rlist]; }; DTWUMI = derive2 { name="DTWUMI"; version="1.0"; sha256="0pybgbfs2yp2ljbs0kra5z70x3llkiwdngp6cadgs3j9rar4vq4q"; depends=[dtw DTWBI e1071 entropy lsa rlist]; }; - DVHmetrics = derive2 { name="DVHmetrics"; version="0.3.9"; sha256="1m13lhxgw7yj44s5spmlb4xxkranfbmjfh8lhrksikd796vxms3s"; depends=[ggplot2 KernSmooth reshape2 shiny]; }; + DVHmetrics = derive2 { name="DVHmetrics"; version="0.3.10"; sha256="1d8zig3ljld05pwaqsahyvjf95y8k183al5ibx09h6hj3r5bfd8n"; depends=[DT ggplot2 KernSmooth reshape2 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]; }; @@ -1006,7 +1014,7 @@ in with self; { 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=[]; }; - DarkDiv = derive2 { name="DarkDiv"; version="0.1.0"; sha256="04yx2j3ywskyi5dq1lsnbkfjg2bhybpmckxlr76qi88v90q3nq6m"; depends=[vegan]; }; + DarkDiv = derive2 { name="DarkDiv"; version="0.2.0"; sha256="0ygd79bgyajm1p58l0anprglcgi0gsflnc4ml61zq91pf6nhczlf"; depends=[vegan]; }; Dasst = derive2 { name="Dasst"; version="0.3.3"; sha256="0nrcvcfzr2y1jc984rpi3fmggns65sphc6nqr9l91h5qvpdcw7cl"; depends=[]; }; DatAssim = derive2 { name="DatAssim"; version="1.0"; sha256="120gazyyxda9faydv2lyqgvflhqi2fhih1szq0sy5v1gh4xb0hhy"; depends=[Rcpp RcppArmadillo]; }; Data2LD = derive2 { name="Data2LD"; version="2.0.0"; sha256="145lvrscq3iyc7cy6xr0vrm5qa2323m3c3g2ikdhj18rhzx4r46k"; depends=[deSolve fda Matrix]; }; @@ -1014,21 +1022,21 @@ in with self; { 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.8.1"; sha256="0724ngcw2b1i2cf8jbak61saqk71f06wszvx7nhba4n0z8l503cz"; depends=[data_table ggplot2 gridExtra networkD3 reshape2 rmarkdown scales]; }; - DataGraph = derive2 { name="DataGraph"; version="1.0.1"; sha256="0rvysvkcs926jzhp7iz9d5np0pa31y825ajn9yyzhbdfk5dg2wry"; depends=[Rcpp]; }; + DataGraph = derive2 { name="DataGraph"; version="1.2.1"; sha256="164wbh3by8qf0p84l5v7vwrzf0f2s305fwmrl01khcll8pk34xlm"; depends=[Rcpp]; }; DataLoader = derive2 { name="DataLoader"; version="1.3"; sha256="18mih6mb95v5xjvmqwby2mma74fcxwyqdm5w8j3bhi4iwgfn6d7v"; depends=[plyr rChoiceDialogs readxl xlsx]; }; 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.7.3"; sha256="0jg77zq12fvwnzfdk83y6wi4547g9r5zlvhjmjj1bp0xp7spcbyk"; depends=[assertthat curl data_table digest httr jsonlite R6 Rlabkey]; }; - DataVisualizations = derive2 { name="DataVisualizations"; version="1.1.9"; sha256="13yrjs37ap8rmx842zp529brfr12rr4d77f2pqlj5wfppngxzv31"; depends=[ggplot2 Rcpp RcppArmadillo sp]; }; + DataVisualizations = derive2 { name="DataVisualizations"; version="1.1.11"; sha256="160jrajyr6vhj05233602b2k5lh3l1znd73hn4vxak7qjh2rajkm"; depends=[ggplot2 Rcpp RcppArmadillo sp]; }; DataViz = derive2 { name="DataViz"; version="0.2.8"; sha256="1dr5nvdzc63x9ymlysvv5i8b7zcffq13pa39q0ychdwr1s3x7vzw"; depends=[Rcpp tibble]; }; DatabaseConnector = derive2 { name="DatabaseConnector"; version="2.4.2"; sha256="1q83lw8zxzq2d1gdcsbr4mqjz6gz0c3m2vi4l8x4mj9kf497dvc3"; depends=[bit DatabaseConnectorJars DBI ff ffbase rJava SqlRender urltools]; }; DatabaseConnectorJars = derive2 { name="DatabaseConnectorJars"; version="1.1.0"; sha256="18m6ynj30r5xdy51b3s39h0jcz1k2wgka888skr6ds2233lhqk2w"; depends=[rJava]; }; - DatabionicSwarm = derive2 { name="DatabionicSwarm"; version="1.1.2"; sha256="02bg4gagd09gqdnlf5bz97d8pygfl7rl02r533y671dz2qqffpa9"; depends=[deldir GeneralizedUmatrix Rcpp RcppArmadillo]; }; + DatabionicSwarm = derive2 { name="DatabionicSwarm"; version="1.1.3"; sha256="1qjlczpxadvzjn4gl2q7rnmpgygsh8ylk8cfvmynx8p675g657cz"; depends=[deldir GeneralizedUmatrix Rcpp RcppArmadillo]; }; Davies = derive2 { name="Davies"; version="1.1-9"; sha256="19n2szki2dc8z01zh5a7bq4scgisnpd2qqbiimgrswjrykgh2fpm"; depends=[]; }; DeLorean = derive2 { name="DeLorean"; version="1.5.0"; sha256="1ry6j4mvxms9hddi9c56p9yhjh66fzss41wqkf6xq398h1wbn4q1"; depends=[BH broom coda dplyr fastICA functional ggplot2 kernlab lattice MASS memoise Rcpp RcppEigen reshape2 rstan rstantools seriation StanHeaders stringr]; }; DeRezende_Ferreira = derive2 { name="DeRezende.Ferreira"; version="0.1.0"; sha256="05c99z3hlwwm0p02cl9z6gjwfxfq2b2qn90l85270bi16llgf42h"; depends=[xts]; }; DealGPL570 = derive2 { name="DealGPL570"; version="0.2.0"; sha256="1c202gzbhqaisxvpiiajcbfsjnqrvygd19304m2n89ansv81vi8r"; depends=[affy dplyr GEOquery stringr tibble]; }; - DecisionAnalysis = derive2 { name="DecisionAnalysis"; version="1.0.0"; sha256="1d0b534s9fidgl5q8q8g5s58v6wv3md4pl5zm5r5q3jlr6z8q5n3"; depends=[Cairo data_tree DiagrammeR dplyr ggplot2 gridExtra tidyr viridisLite]; }; - DeclareDesign = derive2 { name="DeclareDesign"; version="0.20.0"; sha256="0zdpiwh74ljc57s4cgak2j8zg3zyz9f3b47dambw2zdiy0db6wk8"; depends=[estimatr fabricatr generics randomizr rlang]; }; + DeclareDesign = derive2 { name="DeclareDesign"; version="0.22.0"; sha256="1c4ij70d2002rj595fzik75x44jf0gdnrs4bbm5fv4lqnbrm5j37"; depends=[estimatr fabricatr generics randomizr rlang]; }; + DecomposeR = derive2 { name="DecomposeR"; version="1.0.1"; sha256="1p64l2h8c67faybw7v0zvl11y4wcm13i189ssnbh7m2bd460dpql"; depends=[colorRamps dplyr hexbin hht StratigrapheR]; }; DecorateR = derive2 { name="DecorateR"; version="0.1.1"; sha256="1dvyadlksqv8ns043yh91f6kw162k6r0zwn13j1g6pvismw04br9"; depends=[rJava RWeka RWekajars]; }; Deducer = derive2 { name="Deducer"; version="0.7-9"; sha256="14kakyf28i654pndlswjzp6h3h7szpznrg6xznqg150mmn0bs3s6"; depends=[car e1071 effects foreign ggplot2 JGR MASS multcomp plyr rJava scales]; }; DeducerPlugInExample = derive2 { name="DeducerPlugInExample"; version="0.2-0"; sha256="03aw7wr957xzw920ybyzxnck5kx0q2xpcrpq8jh2afyzszy6hzbi"; depends=[Deducer]; }; @@ -1047,20 +1055,21 @@ in with self; { 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.1.2"; sha256="1habp2jq376zwclr17n9aw611v422783r7nfzkh1bl6yv0mchnjy"; depends=[colorspace geometry ggplot2 lattice MASS np Rcpp RcppArmadillo rrcov sm zoo]; }; + DepthProc = derive2 { name="DepthProc"; version="2.1.3"; sha256="1dq5y6fgmm00imkim4v2s6kn4z5qnwa0dkfkcq4pap7imvi35aab"; depends=[colorspace geometry ggplot2 lattice MASS np Rcpp RcppArmadillo rrcov sm zoo]; }; Deriv = derive2 { name="Deriv"; version="4.0"; sha256="03mlfy8jzzzbh2l18gnmw0a71n9savx4cw72yhkxq93v2xj8fy3n"; depends=[]; }; - DescTools = derive2 { name="DescTools"; version="0.99.32"; sha256="14sywl9k59j5h84gwddphk1xfvyd55l72axii9fgiifcjvcwj0nk"; depends=[BH boot expm MASS mvtnorm Rcpp]; }; - DescToolsAddIns = derive2 { name="DescToolsAddIns"; version="1.6"; sha256="0hv0f5azzykwr407q0qxkwja34q5nyzr23bnbfqlxcymgkbhv380"; depends=[DescTools foreign manipulate rstudioapi writexl]; }; + DescTools = derive2 { name="DescTools"; version="0.99.34"; sha256="01sj4p27npxvljg68sn75wd334mm4fkan5ydvr0h2kik620swwqy"; depends=[BH boot expm MASS mvtnorm Rcpp]; }; + DescToolsAddIns = derive2 { name="DescToolsAddIns"; version="1.7"; sha256="0k9qsz6wn97gy23rzm1rr8c6az05xr01jnsqcxknalkx6hj8h1mg"; depends=[DescTools foreign manipulate rstudioapi writexl]; }; 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]; }; DesignLibrary = derive2 { name="DesignLibrary"; version="0.1.4"; sha256="16j9ca3y8mcdbd64yqm6js4lb9hjc74dh4r5y3h1ifvwzj0a78yc"; depends=[DeclareDesign estimatr fabricatr generics glue randomizr rlang]; }; DetMCD = derive2 { name="DetMCD"; version="0.0.5"; sha256="034wb5hwpikli6h2rwiqr19qvzxrr4qwi4q436y7c5a5wgkfzgl5"; depends=[pcaPP Rcpp RcppEigen robustbase]; }; DetR = derive2 { name="DetR"; version="0.0.5"; sha256="1dd4nzkgj5pl9397aa0z3q5fpl27xbdf7q0pqbs821dyynylxzn9"; depends=[MASS pcaPP Rcpp RcppEigen robustbase]; }; - DetSel = derive2 { name="DetSel"; version="1.0.3"; sha256="0rd047nkdhil9ydizrhpqr9pcmi86bq0r0f14rbix6i9hplxz42v"; depends=[ash]; }; + DetSel = derive2 { name="DetSel"; version="1.0.4"; sha256="01mpjy1cmgbrchdjl0gmrq3zx3mlkznml1qcradj2v5mgz26ifrv"; depends=[ash]; }; + DevTreatRules = derive2 { name="DevTreatRules"; version="1.1.0"; sha256="1h4p78mwl5ir31hfb38x1dwq5xxbdlsasvk5vxa3c7xdvhsd2yrf"; depends=[DynTxRegime glmnet modelObj]; }; Devore7 = derive2 { name="Devore7"; version="0.7.6"; sha256="1m18p8h9vv4v0aq2fkjyj39vzb8a09azbbczhfiv4y88w540i8nw"; depends=[lattice MASS]; }; Dforest = derive2 { name="Dforest"; version="0.4.2"; sha256="19jyph2zqfyq9vv22kb6fqy89l0vcviv19zgk10hbd7q850f6ryn"; depends=[ggplot2 rpart]; }; DiPhiSeq = derive2 { name="DiPhiSeq"; version="0.2.0"; sha256="11l2inf99vxz9k292307j8c2b25kc1066svy3vxrfl72rrm4fqa7"; depends=[]; }; - DiPs = derive2 { name="DiPs"; version="0.5.0"; sha256="1bm3zpdp20dz4bgi0jvp064nfb5van11v20605lfq4irf6nqs8j1"; depends=[liqueueR mvnfast plyr rcbalance]; }; + DiPs = derive2 { name="DiPs"; version="0.6.0"; sha256="03mi4f56896mnj5g0k7zdh90qcn3ahdxf62mvjy03ajvsdradm4p"; depends=[liqueueR mvnfast plyr]; }; DiSSMod = derive2 { name="DiSSMod"; version="1.0.0"; sha256="199yipbc2sx2lsl51rpfyh80bfxaahfd2llqmfsp946gvj7339hv"; depends=[MASS matrixcalc psych sfsmisc]; }; DiagrammeR = derive2 { name="DiagrammeR"; version="1.0.5"; sha256="0d73aiv4fra1xwq63n3139anp479ni7dh370lxc3rc15g5qayxq8"; depends=[downloader dplyr glue htmltools htmlwidgets igraph influenceR magrittr purrr RColorBrewer readr rlang rstudioapi scales stringr tibble tidyr viridis visNetwork]; }; DiagrammeRsvg = derive2 { name="DiagrammeRsvg"; version="0.1"; sha256="0j2cm1mx3zrb2k3pcrb96z2z3kws61gyyjsjjv5rqcb5lzdgi65k"; depends=[V8]; }; @@ -1074,37 +1083,37 @@ in with self; { Diderot = derive2 { name="Diderot"; version="0.12"; sha256="1cq8yk4r0csnslp286hzs04zzq44q0frz0kyll9jhqjil34qh0x7"; depends=[data_table doParallel foreach igraph RCurl splitstackshape stringi]; }; DiffCorr = derive2 { name="DiffCorr"; version="0.4.1"; sha256="1kxp9dbiww086rmvmjvfhbk7jl36dkj88qwii6zg57llf7l5l4hm"; depends=[fdrtool igraph multtest pcaMethods]; }; DiffNet = derive2 { name="DiffNet"; version="1.0-0"; sha256="04dvf0qxnc6jizwfjxw731j7d2fxyapk06rmqvga6h3p075q0mqk"; depends=[data_table doParallel foreach gplots Hmisc igraph lsa Matrix qlcMatrix Rcpp RcppEigen]; }; - DiffXTables = derive2 { name="DiffXTables"; version="0.0.2"; sha256="01kxa0barwy9khwf9yyzdxi4561n5c0q9s2fps8gwb2afxdhxjm0"; depends=[Matrix]; }; + DiffXTables = derive2 { name="DiffXTables"; version="0.1.0"; sha256="1la512kvq1ziw1b3zzn2khh4cjcq2lwq1r17b84x7f4spbfp5l2b"; depends=[]; }; DiffusionRgqd = derive2 { name="DiffusionRgqd"; version="0.1.3"; sha256="1gf5jpvimfrc9ccva0jk85rl4zfkbijm2305ky1rxcgm4kgw4lax"; depends=[colorspace Rcpp RcppArmadillo rgl]; }; DiffusionRimp = derive2 { name="DiffusionRimp"; version="0.1.2"; sha256="1h7145ldlgwrrwj4l1wxdp2rbg2pm4v3pngiq0saz0xi3vpcxwl6"; depends=[colorspace Rcpp RcppArmadillo rgl]; }; DiffusionRjgqd = derive2 { name="DiffusionRjgqd"; version="0.1.1"; sha256="1yb1jaq324qm2x8cl3bs2dflnsx8yfygpw2m3kk5hzaai9gfkqjf"; depends=[colorspace Rcpp RcppArmadillo rgl]; }; - Digiroo2 = derive2 { name="Digiroo2"; version="0.6"; sha256="1b1ahhqz5largjadlk5n6nw2183c05k28mksb1wm26y0lps0vdgr"; depends=[maptools spatstat spdep]; }; DirectEffects = derive2 { name="DirectEffects"; version="0.2"; sha256="0cawn1i1cyczsr9zpcaky79dfdl9anfjgiaa2404capacnj3call"; depends=[Formula glue sandwich]; }; - DirectStandardisation = derive2 { name="DirectStandardisation"; version="1.2"; sha256="060nscnn7wamnbb45a55wr6rirlbpwwjz0kxiw3aiqkm16ilzfbs"; depends=[]; }; + DirectStandardisation = derive2 { name="DirectStandardisation"; version="1.3"; sha256="1qlfvzlig3a2v78fiq6sbbpxklmjczikxdw57m6mqngzrl9vdl2g"; depends=[]; }; DirectedClustering = derive2 { name="DirectedClustering"; version="0.1.1"; sha256="1shdqz0c5bbgknvfqr3ais26cb5mpywnah3d3584w97sy8v7gxm2"; depends=[igraph]; }; - Directional = derive2 { name="Directional"; version="4.1"; sha256="1irg9spq859k26xn6f2pinlcrfzmwxlw56aq4vx27n6b1f2c4kqg"; depends=[bigstatsr doParallel foreach MASS Rfast Rfast2 rgl]; }; + Directional = derive2 { name="Directional"; version="4.3"; sha256="0kbwf3rzh776y7hk8zbb5yq01pm5m5bx5brap8dv5lgxg083jxq8"; depends=[bigstatsr doParallel foreach MASS RANN 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.5"; sha256="1n0lyzv6abvrrcxj4zglyl9b0j4ldj0zkznh57frn1j1imb1na1l"; depends=[dplyr magrittr purrr rlang tidyselect]; }; - DiscreteFDR = derive2 { name="DiscreteFDR"; version="1.3-3"; sha256="1qdcmn74mmnk61y6lh76mnqk7hw7v3v67y0zljfz7s3h4vxpad4g"; depends=[Rcpp]; }; + DisImpact = derive2 { name="DisImpact"; version="0.0.7"; sha256="1cd2v1f43lhvs7kk0vq1vyda336zzxyh0gxrkpg397qpqsfh61si"; depends=[dplyr purrr rlang tidyr tidyselect]; }; + DiscreteFDR = derive2 { name="DiscreteFDR"; version="1.3-4"; sha256="0r3z56xcb5als38rhydia482j5xl9kcgamdj6ibd22yi0ya6k4iv"; depends=[Rcpp]; }; DiscreteInverseWeibull = derive2 { name="DiscreteInverseWeibull"; version="1.0.2"; sha256="0vjsvl4m4zccfgizv7mzidbbpzqcm101x448vllcdcrn2xlnkmnq"; depends=[Rsolnp]; }; DiscreteLaplace = derive2 { name="DiscreteLaplace"; version="1.1.1"; sha256="17w4vjvsm7jacvwckjczyah3hglq044r3m6vqdcrg8haz884rav2"; depends=[]; }; - DiscreteQvalue = derive2 { name="DiscreteQvalue"; version="1.0"; sha256="19c2rmizrmpf5vmsfhnk5xswnngdlh1hfcj6k0qdp00kdfgj79ja"; depends=[]; }; + DiscreteQvalue = derive2 { name="DiscreteQvalue"; version="1.1"; sha256="1xl6m3sf02v4y26375jn846ixzcxpqim1r6d4j56y8b5c243jg4h"; depends=[]; }; DiscreteWeibull = derive2 { name="DiscreteWeibull"; version="1.1"; sha256="1rg3ax6jryagf5d3h8m44x9wyhr2qff3srfa9zrk6i64p1ahk9lr"; depends=[Rsolnp]; }; DiscriMiner = derive2 { name="DiscriMiner"; version="0.1-29"; sha256="1ii8aa4dwfk991qdnpmkva20wvs5fqcna9030c799ybf11qpdass"; depends=[]; }; Disequilibrium = derive2 { name="Disequilibrium"; version="1.0"; sha256="0cxwsn57rbwyq6lnr273z5z51nb83w45zg9msw4iqfsyq2z5r5a1"; depends=[Formula numDeriv optimr]; }; DisimForMixed = derive2 { name="DisimForMixed"; version="0.2"; sha256="00mknsalikangr17946877m5fy2jgkgasgl6ng4f2nr44f0q9l6q"; depends=[cluster dplyr]; }; - Distance = derive2 { name="Distance"; version="0.9.8"; sha256="19n1kjx7ikphp97118n0zwnv1prlxk9hcpn30ckxc4329m0cafvv"; depends=[mrds]; }; + Distance = derive2 { name="Distance"; version="1.0.0"; sha256="0pgrx2897fb3747vlgzkmr98vfl8wazvqbsbam705sp40mp0gwn7"; depends=[dplyr mrds rlang]; }; DistatisR = derive2 { name="DistatisR"; version="1.0.1"; sha256="0myzfki8yrk0nhgdgsqs4wjbqhzmkdil1g005hc7p4lz3gi09bfx"; depends=[car prettyGraphs]; }; - DistributionOptimization = derive2 { name="DistributionOptimization"; version="1.2.4"; sha256="0qyfi1l8908r98ian1l9q72iz2cyzp09ykgip7l3py2p3m9cg8wc"; depends=[AdaptGauss GA ggplot2]; }; - DistributionTest = derive2 { name="DistributionTest"; version="1.0"; sha256="0ga0cxk8i1n6p33ywy9j65df3p4ypnc6mimvkx3yi1diczln6dbx"; depends=[MASS]; }; + DistributionFitR = derive2 { name="DistributionFitR"; version="0.1"; sha256="0wg43gqsdy1ja0l489k27k9q1w2zq45wzmqnv9wfc734rf8kvlba"; depends=[doParallel foreach stringr]; }; + DistributionOptimization = derive2 { name="DistributionOptimization"; version="1.2.6"; sha256="0pp0f7c9szyx426bnnz4fz4vh5q73m8x896z6pqgx04b6v445361"; depends=[AdaptGauss GA ggplot2 pracma]; }; + DistributionTest = derive2 { name="DistributionTest"; version="1.1"; sha256="11xhr6yv42s1i4qqlb1pvzm8q2116v10gjlkhl0ml3id6lx27nmj"; depends=[MASS]; }; DistributionUtils = derive2 { name="DistributionUtils"; version="0.6-0"; sha256="08vq54pyqxlqsj6q6gsg5ikqa0z3x842j52ld5dxaq272p6xchvl"; depends=[]; }; - DivE = derive2 { name="DivE"; version="1.1"; sha256="1445pyw15dq48qsbnm2bgfm9xfffdww5xbhcs901ai0nyb3f7daa"; depends=[deSolve FME rgeos sp]; }; + DivE = derive2 { name="DivE"; version="1.2"; sha256="1czj89ljvpgl03471cknki2lc64swdqdpf5wsgicad35kgmlrwlh"; depends=[deSolve FME rgeos sp]; }; DivMelt = derive2 { name="DivMelt"; version="1.0.3"; sha256="03vkz8d283l3zgqg7bh5dg3bss27pxv4qih7zwspwyjk81nw3xmr"; depends=[glmnet]; }; DiversityOccupancy = derive2 { name="DiversityOccupancy"; version="1.0.6"; sha256="16x3fpchgd12mccvr1k11vjka97sy5vjvjcyd5y3pskgnpycc2sv"; depends=[dplyr ggplot2 glmulti MuMIn qpcR raster unmarked vegan]; }; DnE = derive2 { name="DnE"; version="2.1.0"; sha256="02cbfb3m9xf24wkgqc06k3k0rx7qlqh4ma43khg6fpvif6yyahrn"; depends=[]; }; DoE_MIParray = derive2 { name="DoE.MIParray"; version="0.13"; sha256="0lbcqfizgrnqmp0b2yn14br7xmabbhywy8h7161hx6hnvnam5r99"; depends=[combinat DoE_base]; }; - DoE_base = derive2 { name="DoE.base"; version="1.1-3"; sha256="0y195kf3fldis17z20blrqkav4xsmy9xq6ak3gw9mgb9x59y7661"; depends=[combinat conf_design lattice MASS numbers partitions vcd]; }; + DoE_base = derive2 { name="DoE.base"; version="1.1-4"; sha256="0x50fjjg5kjinr2yjwb84icw86nhcgc5dv26z1h44bcwablcz74n"; depends=[combinat conf_design lattice MASS numbers partitions vcd]; }; DoE_multi_response = derive2 { name="DoE.multi.response"; version="0.1.0"; sha256="1289jlp10999kvyg5adw3dyc2mhh20i6biyqjbxd6g80a8dajknx"; depends=[DoE_wrapper]; }; DoE_wrapper = derive2 { name="DoE.wrapper"; version="0.11"; sha256="08bgfaiivqqnkhjb18flk1cpa33rh70i6g8v25x1ma3ffxqrwh96"; depends=[AlgDesign DiceDesign DoE_base FrF2 lhs rsm]; }; DoEstRare = derive2 { name="DoEstRare"; version="0.2"; sha256="0y9ymw7114jk1rwiasq400bpgvkxv6rpc954c7v9mgxd3c2nfza7"; depends=[]; }; @@ -1119,27 +1128,25 @@ in with self; { DrBats = derive2 { name="DrBats"; version="0.1.5"; sha256="1iaffippp9kwfrwryf7klmn8nsm2k8pc0bkgpxcsl4vxyy2na3mp"; depends=[ade4 coda MASS Matrix rstan sde]; }; DrImpute = derive2 { name="DrImpute"; version="1.0"; sha256="1adzarrwqb282pqgx2yqswp9rpwd1naxsmar54kddr6qyd6b923b"; depends=[Rcpp RcppArmadillo]; }; DrInsight = derive2 { name="DrInsight"; version="0.1.1"; sha256="02lqf6bwbgcgyg5zx16nvnzpagmcmbsngnhmyv47256vsd9vppjd"; depends=[igraph qusage]; }; - DramaAnalysis = derive2 { name="DramaAnalysis"; version="3.0.1"; sha256="180qfialkkgi1yzl9r7pc75bhbh87n6rx6h5ic0wbdkwsrriwl9m"; depends=[data_table git2r httr readr reshape2 stringr tokenizers xml2]; }; - DriftBurstHypothesis = derive2 { name="DriftBurstHypothesis"; version="0.3.0"; sha256="0v6b8bm683c0np99bwvn3x0bp9xwf9qgli2050n05iiqibc894np"; depends=[Rcpp RcppArmadillo xts zoo]; }; + DriftBurstHypothesis = derive2 { name="DriftBurstHypothesis"; version="0.4.0"; sha256="0cmjysy4g0l9ddadc9g1jl280y999b956saz9v99lg1a3sm4gq9c"; depends=[Rcpp RcppArmadillo xts zoo]; }; DrillR = derive2 { name="DrillR"; version="0.1"; sha256="0n7pim5kk0wfdjcc67v4vvdb7wyhn5bcgi2a12nbyfyydss7pk1g"; depends=[httr]; }; DrugClust = derive2 { name="DrugClust"; version="0.2"; sha256="0acvjqwzkbjmy101m501l7fkfxzkp6zflwvn56li5307xv9ggnfg"; depends=[cclust cluster e1071 MESS ROCR]; }; DstarM = derive2 { name="DstarM"; version="0.3.0"; sha256="16vcv21dgnymhsy9j5x5pblnipf4hdyscajx6pr8kl6i95hs3hmj"; depends=[DEoptim ggplot2 Rcpp RcppArmadillo rtdists RWiener]; }; - DtD = derive2 { name="DtD"; version="0.2.1"; sha256="15xj4xwg8jis8v2d7yv4wqmihqdm47f4n4zy7kpp5n854dvv9f0p"; depends=[checkmate Rcpp RcppArmadillo]; }; + DtD = derive2 { name="DtD"; version="0.2.2"; sha256="1czspjdxjhbfk2df7wk0x3d1ilwrjqw4s4gdc4hq0gjcjqyx0c39"; depends=[checkmate Rcpp RcppArmadillo]; }; DunnettTests = derive2 { name="DunnettTests"; version="2.0"; sha256="1sf0bdxays10n8jh2qy85fv7p593x58d4pas9dwlvvah0bddhggg"; depends=[mvtnorm]; }; DySeq = derive2 { name="DySeq"; version="0.22"; sha256="1sx6mg0bcqb5ff6x305k43zx3fwd16rvxc7xb3ai5h3w7fs9zz7y"; depends=[boot MASS TraMineR]; }; Dykstra = derive2 { name="Dykstra"; version="1.0-0"; sha256="1rc1409ky0ysqr3ccq28yhbs94m6d0z2dfa66k4c7irxjvbagwz6"; depends=[]; }; DynClust = derive2 { name="DynClust"; version="3.13"; sha256="020zl2yljp47r03rcbzrbdmwk482xx27awwzv4kdrbchbzwhxqgm"; depends=[]; }; DynNom = derive2 { name="DynNom"; version="5.0.1"; sha256="1ahs93mks2z423sxk4wjgivdz4ggvwm87dha0aan4fg4jarai98s"; depends=[BBmisc compare dplyr ggplot2 magrittr plotly prediction rms shiny stargazer survival]; }; DynTxRegime = derive2 { name="DynTxRegime"; version="4.3"; sha256="1la4y560rcs163cqmvpwsb1n70n6714kprdxpnkd849caaa93zir"; depends=[dfoptim kernlab modelObj rgenoud]; }; - DynaRankR = derive2 { name="DynaRankR"; version="1.0.0"; sha256="1smxgsxl0s5ynlphssd2q59f40zxin8im91fdcvawchc4qj2lmgg"; depends=[dplyr rlang]; }; + DynaRankR = derive2 { name="DynaRankR"; version="1.1.0"; sha256="1fzicainh1dm016cglm2x6j1i2g5r71vgrj0dnsflbxc5v426sqm"; depends=[dplyr rlang]; }; DynamicDistribution = derive2 { name="DynamicDistribution"; version="1.1"; sha256="1s78hpj2pxjs4vixin1i816qjbn3wk7b8rd2zdjp4d4rbxifcqf5"; depends=[]; }; DynamicGP = derive2 { name="DynamicGP"; version="1.1-5"; sha256="12y56anyi3amn7czwkk4qakmgqq0mf80xrhb8ccy1sxzk7k86pfz"; depends=[lhs]; }; E4tools = derive2 { name="E4tools"; version="0.1.1"; sha256="1kmj1fddybjia9ninhcy75kdmq152zjw7s24chpqr5wsblffr3yx"; depends=[accelerometry anytime BBmisc chron data_table DataCombine doParallel doSNOW foreach ggplot2 hms scales signal]; }; EAinference = derive2 { name="EAinference"; version="0.2.3"; sha256="1kzcfya3z6rf1vqjn72yjymdhrn4dzgmwifh3w6k22cy5jxffzn4"; depends=[hdi limSolve MASS msm mvtnorm Rcpp RcppArmadillo]; }; EBASS = derive2 { name="EBASS"; version="0.1"; sha256="14hxzj06wrc4ihflr7dqk28fsjwbcizr0jy54vhv0mk1y1gd4201"; depends=[]; }; EBEN = derive2 { name="EBEN"; version="4.6"; sha256="0gcf5b2viiq69vs8bd8nhk65g9sbzgg212w7zpnz4y6cv9jkk5zz"; depends=[]; }; - EBMAforecast = derive2 { name="EBMAforecast"; version="0.52"; sha256="1809ia0dpkilprv7x19drp1v2qckk0wm596f1i1vl0k37wbhcziv"; depends=[abind Hmisc plyr Rcpp separationplot]; }; - EBPRS = derive2 { name="EBPRS"; version="2.0.1"; sha256="0xrkxfn3iw1gy89inl5k1654dcyjz8ipx2c2kfzi0522zrdpy9ff"; depends=[ROCR]; }; + EBPRS = derive2 { name="EBPRS"; version="2.0.3"; sha256="0fr0vqgsj4lc4kgqsvayzbjg2dzxn40y6nbwrhgx3j94ldl632zq"; depends=[ROCR]; }; EBglmnet = derive2 { name="EBglmnet"; version="4.1"; sha256="0wlscmimj74alcr8k5h1g3alvlpss4g2ah7zkpd42akam3zb4s5z"; depends=[]; }; EBrank = derive2 { name="EBrank"; version="1.0.0"; sha256="1qzhrr3n2zv31mjp224b35324nr9nigzazyfv11j4zhwl1ipf632"; depends=[]; }; ECFsup = derive2 { name="ECFsup"; version="0.1-2"; sha256="0fpcab0gjgsc3sx0plpx068rw3a7kfzs2nyrr477a5m0rcbqf1kh"; depends=[foreach Rcpp RcppArmadillo]; }; @@ -1154,20 +1161,20 @@ in with self; { EDISON = derive2 { name="EDISON"; version="1.1.1"; sha256="12cc13ng5fc4nm0nvqxqplpb2ycz4cln73xqkk85dka2fnpykjc7"; depends=[corpcor MASS]; }; EDMeasure = derive2 { name="EDMeasure"; version="1.2.0"; sha256="1gyv86vip0a3939dbbwz29xkqzncw24r68fzykdjnv3b995510iv"; depends=[dHSIC energy rBayesianOptimization]; }; EDOIF = derive2 { name="EDOIF"; version="0.1.1"; sha256="0lhaajiq01rrvpp2xq2n6ka7pd4xz0spxrf1xv8ljpi2w9kk4p7l"; depends=[boot distr ellipsis ggplot2 igraph simpleboot]; }; - EDR = derive2 { name="EDR"; version="0.6-6"; sha256="10m92p3fy5z2kca4h9awwmvs4pqri92habkvgjvjl5ira09yvyi7"; depends=[sm]; }; + EDR = derive2 { name="EDR"; version="0.6-7"; sha256="17rdqggladlnziql7s7iy2pgqv5n2parwsllsy3b358y0cc1bxdn"; depends=[sm]; }; EEM = derive2 { name="EEM"; version="1.1.1"; sha256="0w20kakgcpyhfi7fcrss4w67pbaj87hi2scy7g05q3sg2ygac7gj"; depends=[colorRamps ggplot2 R_utils reshape2 sp]; }; EFA_MRFA = derive2 { name="EFA.MRFA"; version="1.0.7"; sha256="0vblfagcr9zqdzygjrbbgg2pdd9v058ryac5mzy2ry02m534iadm"; depends=[ggplot2 optimbase PCovR psych reshape2 scales]; }; EFAutilities = derive2 { name="EFAutilities"; version="2.0.0"; sha256="1vbpz9papk6vvch3kb2qm6nspa4llp4mpck6ky1j8kvkhjzm1za0"; depends=[GPArotation mvtnorm plyr]; }; EFDR = derive2 { name="EFDR"; version="1.0"; sha256="1344ysvrniqn1qv2hx9b9afg9fivccfrj393xy9cqz4j395b6jx0"; depends=[copula doParallel dplyr foreach gstat Matrix sp tidyr waveslim]; }; EFS = derive2 { name="EFS"; version="1.0.3"; sha256="1q8cf8dnxpv5s3lr9145y0wjhak4rz18dzah4xfs5qr4c8nlpl54"; depends=[party pROC randomForest ROCR]; }; - EGAnet = derive2 { name="EGAnet"; version="0.9.0"; sha256="0cb1xjv0m1qxm2slvhs3salxhqjmq71nnqji1nf22yrawsknn2xv"; depends=[corpcor doParallel dplyr fdrtool fitdistrplus foreach ggplot2 ggpubr glasso igraph iterators lavaan MASS Matrix matrixcalc mvtnorm NetworkToolbox OpenMx pbapply plotly plyr psych psychTools qgraph semPlot tidyselect wTO]; }; + EGAnet = derive2 { name="EGAnet"; version="0.9.3"; sha256="1zz7fkr82nxlxs5vzzj3ihcrfb7l6dix5xazljabiilc849x8cas"; depends=[dplyr glasso igraph lavaan Matrix NetworkToolbox plotly qgraph semPlot]; }; EGRET = derive2 { name="EGRET"; version="3.0.2"; sha256="02c9cakj7szywx0r4rylbdnk63b4npqp2i5x1fhxjy0j5bn0hc2f"; depends=[dataRetrieval fields foreach survival truncnorm]; }; EGRETci = derive2 { name="EGRETci"; version="2.0.3"; sha256="1fzcndah890nfd3fg83jhp5lpwb0xfyrccabgvilkrrm4i4x675m"; depends=[binom EGRET]; }; EHR = derive2 { name="EHR"; version="0.1-3"; sha256="1y12j0sjr1zp3bzha1p31f903js674l6ifjccw0y9718sry8dbv2"; depends=[logistf]; }; - EHRtemporalVariability = derive2 { name="EHRtemporalVariability"; version="1.0.2"; sha256="14g1x4zdhzgm122nzsw9gfjqdgz5bcdzcywg0jk6p3df2vi6q6vb"; depends=[dplyr lubridate plotly RColorBrewer scales shiny viridis xts zoo]; }; + EHRtemporalVariability = derive2 { name="EHRtemporalVariability"; version="1.0.4"; sha256="0l91rc1dv63wxasg3n76xlkan9ni70qrznp9h7lhz5v3jafxqd0m"; depends=[dplyr lubridate plotly RColorBrewer scales shiny viridis xts zoo]; }; EIAdata = derive2 { name="EIAdata"; version="0.0.5"; sha256="1dg59shsamd5hrf65p3y6wybskfhw875jf9ssv561b241i6dkn3i"; depends=[XML xts zoo]; }; EILA = derive2 { name="EILA"; version="0.1-2"; sha256="0wxl9k4fa0f7jadw3lvn97iwy7n2d02m8wvm9slnhr2n8r8sx3hb"; depends=[class quantreg]; }; - EIX = derive2 { name="EIX"; version="1.0"; sha256="1is5dr5pqinshw2gnlsdq0byldiha076j2yn2z4vfg0pdws9lggc"; depends=[DALEX data_table ggiraphExtra ggplot2 ggrepel iBreakDown MASS Matrix purrr scales tidyr xgboost]; }; + EIX = derive2 { name="EIX"; version="1.1"; sha256="0mz7q35w304mm412x6jqlr65ji7xfkb293iwrqgifgi2pc6f77ny"; depends=[DALEX data_table ggiraphExtra ggplot2 ggrepel iBreakDown MASS Matrix purrr scales tidyr xgboost]; }; EKMCMC = derive2 { name="EKMCMC"; version="0.1.0"; sha256="0sfj6w8780fik0ar9bg8zrxkj10wqagvwrngd58g50fc0z4lhr53"; depends=[numDeriv]; }; EL = derive2 { name="EL"; version="1.0"; sha256="13r7vjy2608h8jph8kwy69rnkg98b2v69117nrl728r3ayc46a18"; depends=[]; }; EL2Surv = derive2 { name="EL2Surv"; version="1.1"; sha256="0bn2481rf61qnia468y7k95hhazjaghrv919a2y9ar5wcz5nq2kk"; depends=[survival]; }; @@ -1177,22 +1184,21 @@ in with self; { ELT = derive2 { name="ELT"; version="1.6"; sha256="0vbrf912m6f80sqyyrp0z4jhq38fnmcy6hgwy0qh8wgk3p1aqm7c"; depends=[lattice latticeExtra locfit xlsx]; }; ELYP = derive2 { name="ELYP"; version="0.7-5"; sha256="1j2vwcs443x3pf4zypyvbkn8fb5if9b9hf1s821jjjpgach573sc"; depends=[survival]; }; EM_Fuzzy = derive2 { name="EM.Fuzzy"; version="1.0"; sha256="0sz4zkjn6rdzdqmkq6j24bd4sj91y5lan31bldxdfskgz0jpzhbr"; depends=[DISTRIB FuzzyNumbers]; }; - EMA = derive2 { name="EMA"; version="1.4.6"; sha256="0zsc6n149wkn39sa0gw838x6pg3a2g6h4sqd74672sgj4rzx0iip"; depends=[affy AnnotationDbi Biobase biomaRt cluster FactoMineR gcrma GSA heatmap_plus MASS multtest siggenes survival xtable]; }; + EMA = derive2 { name="EMA"; version="1.4.7"; sha256="04srg03ywx78cw4w3apqlbiarz1rdk0mq9a5b7mcrif9kc9bg756"; 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-12"; sha256="03s828pczfll5fkwa0w6n4m4wb75paj6x0cxgg9r4qmw8w4ag464"; depends=[MASS Matrix]; }; EMD = derive2 { name="EMD"; version="1.5.8"; sha256="0bvwx5ry41cpj646v93vm50c6qb3m5d7mda9q7znmcr4sdf521j5"; depends=[fields locfit]; }; - EML = derive2 { name="EML"; version="2.0.1"; sha256="1d49ii08nmf16nyh16vlbvywkggwf4ljsdhv89bvfd6f07dly70h"; depends=[digest dplyr emld jqr jsonlite rmarkdown uuid xml2]; }; + EML = derive2 { name="EML"; version="2.0.2"; sha256="05hkm8kf17294by7jhvhbq0cqbpg042xkc5cgx9kzrgld8hxrwqm"; depends=[digest dplyr emld jqr jsonlite rmarkdown uuid xml2]; }; EMMAgeo = derive2 { name="EMMAgeo"; version="0.9.7"; sha256="1wz4zw45xfqbk589cpd188j7619h2ar2czfkisil9x8ksijfixls"; depends=[caTools GPArotation limSolve matrixStats shiny]; }; EMMIXcskew = derive2 { name="EMMIXcskew"; version="0.9-5"; sha256="1ys5kvns6jlw2lk9m6xcy71wx1d581cmphiaxnp3hsqimc8wz7hq"; depends=[MASS mnormt rgl]; }; - EMMIXgene = derive2 { name="EMMIXgene"; version="0.1.1"; sha256="0n23pkn7nfxd9bxhy2fggzadb034g31n4mcwcrvr366d40hqv3iq"; depends=[BH ggplot2 mclust Rcpp RcppArmadillo reshape scales]; }; + EMMIXgene = derive2 { name="EMMIXgene"; version="0.1.3"; sha256="0a5q78s9y6ba1641lrv87kglg39x9wbk5xg7ihzbpl4adrb5sz4f"; depends=[BH ggplot2 mclust Rcpp RcppArmadillo reshape scales]; }; EMMIXmfa = derive2 { name="EMMIXmfa"; version="2.0.11"; sha256="06lfmpw908chhzx512anqacixvvx3y02wm1n4wmpb890rd85n11r"; depends=[]; }; EMMIXskew = derive2 { name="EMMIXskew"; version="1.0.3"; sha256="05y1ivbzbsfab90925l3ahzd3b8y5kjfk3f0p2s9s3sfyxphqah7"; depends=[KernSmooth lattice mvtnorm]; }; EMMLi = derive2 { name="EMMLi"; version="0.0.3"; sha256="1b36kyzvrdljmkysggv8jyaip78pj32ms0xhj2y568hd419lkh2p"; depends=[]; }; EMMREML = derive2 { name="EMMREML"; version="3.1"; sha256="0qwj4jlfhppjxwcjldh49b6idnagazrxybaid3k2c269wvxwvddq"; depends=[Matrix]; }; EMP = derive2 { name="EMP"; version="2.0.5"; sha256="0piagbxk8siagmvzqv2bh12g1y0hy3c0vkxpddlmp7gm3i304rpi"; depends=[ROCR]; }; - EMSC = derive2 { name="EMSC"; version="0.9.0"; sha256="13d915g7iyv724x35i9mr8msy5mhrpqhhva21vdinxbjdy6vdlr9"; depends=[pracma]; }; - EMSHS = derive2 { name="EMSHS"; version="1.0.0"; sha256="1lpv3243z5765b1dihqz9hc3dpw76nwy14mmd4253sw8xpy25w41"; depends=[Rdpack]; }; + EMSC = derive2 { name="EMSC"; version="0.9.1"; sha256="1njqd9ns9d47zpxy5y6xcxhyd3ly5hr3w6q7m5qr2svk9gz1kl50"; depends=[pracma]; }; EMSNM = derive2 { name="EMSNM"; version="1.0"; sha256="0rhaadzhq9jfpnwxfqcsb3yz96rqlwkm165k5n5jxzwxpg1rg2n0"; depends=[]; }; EMSaov = derive2 { name="EMSaov"; version="2.3"; sha256="1hpvwimhkl7za5s8j9n4a8883vy89jrxrhlh0k3cfprnndh4zz05"; depends=[shiny]; }; EMT = derive2 { name="EMT"; version="1.1"; sha256="0m3av1x3jcp3hxnzrfb128kch9gy2zlr6wpy96c5c8kgbngndmph"; depends=[]; }; @@ -1201,7 +1207,7 @@ in with self; { ENMeval = derive2 { name="ENMeval"; version="0.3.0"; sha256="0q5s8nxig8kbr0cblfmf3k20ri19fjs770a0fnzsk0kwlac414hw"; depends=[dismo doParallel foreach maxnet raster]; }; ENiRG = derive2 { name="ENiRG"; version="1.0.1"; sha256="0yjy7g0pia4g18h7mawkxn77dnnqcajnbml21rrv63qwlr347355"; depends=[ade4 fgui gdata miniGUI raster rgrass7 sp]; }; ENmisc = derive2 { name="ENmisc"; version="1.2-7"; sha256="07rix4nbwx3a4p2fif4wxbm0nh0qr7wbs7nfx2fblafxfzhh6jc7"; depends=[Hmisc RColorBrewer vcd]; }; - EPT = derive2 { name="EPT"; version="0.7.3"; sha256="0ymg16wd2dkn6nb0hq43niycydpy5dnadq4011a3815qrkyj7670"; depends=[]; }; + EPT = derive2 { name="EPT"; version="0.7.5"; sha256="1llypf8600mk62cqxnwv5fds8ypfx5is2qkpbp4bh70l3s3lvj31"; depends=[]; }; EQL = derive2 { name="EQL"; version="1.0-1"; sha256="0pa33h0f30l352m6ix296l55lvqxdaib666x2dwy9zx0lmk23w8m"; depends=[lattice ttutils]; }; EQUIVNONINF = derive2 { name="EQUIVNONINF"; version="1.0"; sha256="103wrry0cmikprihmgx8y4kk1pnbjis7rs1xw13w14v902xkr2rq"; depends=[BiasedUrn]; }; ERP = derive2 { name="ERP"; version="2.2"; sha256="17i04rgfj9crnvpi7mf2spwmaw9jgw4kn5fx6x9xbl9cvwwx6q4k"; depends=[corpcor fdrtool irlba mnormt pacman]; }; @@ -1210,7 +1216,6 @@ in with self; { ESEA = derive2 { name="ESEA"; version="1.0"; sha256="06r5lki32mxkznj6yxvlz0ikqcxm3jbaralv4qp9xrw6dy6yyg27"; depends=[igraph parmigene XML]; }; ESG = derive2 { name="ESG"; version="0.1"; sha256="1jw6239asv6lwxrz5v0r5pzg6v500bqxg8361sh4jj67rsrc7g9m"; depends=[]; }; ESGtoolkit = derive2 { name="ESGtoolkit"; version="0.1"; sha256="0r09arhsvamdyahini5yhgc43msdxwvn45l57xbfszahsnr3b3aq"; depends=[CDVine ggplot2 gridExtra Rcpp reshape2 ycinterextra]; }; - ESKNN = derive2 { name="ESKNN"; version="1.0"; sha256="1w43v3q9i7dkx1qwcl5cgh9wdgg5r4s7vfbkk0vcsq9qd8nbcvfy"; depends=[caret]; }; ESTER = derive2 { name="ESTER"; version="0.2.0"; sha256="1jiyqq5hgqc754r434sik9jnlpw66xz56cjdf5ig95qkffzsg224"; depends=[brms cowplot doParallel dplyr foreach ggplot2 lme4 magrittr rlang tidyr]; }; ETAS = derive2 { name="ETAS"; version="0.4.6"; sha256="02xknf7acpha4y2mwn9q974dr2d75nw48wx28i7gprqc7hf6rcsw"; depends=[fields goftest lattice maps Rcpp spatstat]; }; ETC = derive2 { name="ETC"; version="1.3"; sha256="1nvb9n0my7h1kq996mk91canxi6vxy3mzhrshrvm13ixvl48lkkh"; depends=[mvtnorm]; }; @@ -1221,14 +1226,15 @@ in with self; { 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="2.0.0"; sha256="1arrd9zkssb8ixx7r4nxwayksz1mk7jkvlcbm264pv9ya6kh3yrh"; depends=[ada e1071 GA gbm optimx rpart]; }; - Eagle = derive2 { name="Eagle"; version="2.1.1"; sha256="0sx9fg3awv086861jyj18a814m6jdckzdvds6375wyd5cvi2ifqd"; depends=[data_table ggplot2 ggthemes matrixcalc mmap R_utils Rcpp RcppEigen shiny shinyBS shinyFiles shinyjs shinythemes]; }; + Eagle = derive2 { name="Eagle"; version="2.2"; sha256="04r2ii4wdxwmx82qd2csiiy6kjim6zmjnp0851qhz9iry84f0g5s"; depends=[data_table ggplot2 ggthemes matrixcalc mmap R_utils Rcpp RcppEigen shiny shinyBS shinyFiles shinyjs shinythemes]; }; EasyABC = derive2 { name="EasyABC"; version="1.5"; sha256="17qv6y8sf2iwwqcv5wfg6sii259gv5jyr72dnfpir2bw78wb3mqx"; depends=[abc lhs MASS mnormt pls tensorA]; }; EasyHTMLReport = derive2 { name="EasyHTMLReport"; version="0.1.1"; sha256="1hgg8i7py7bx48cldyc7yydf0bggmbj3fx3kwiv9jh1x5wyh929z"; depends=[base64enc ggplot2 knitr markdown reshape2 scales xtable]; }; EasyMARK = derive2 { name="EasyMARK"; version="1.0"; sha256="10slkblbyxq98c3sxgs194dnkx996khfcpxj6jhz355dp35z7c9d"; depends=[coda doParallel foreach MASS random rjags stringr]; }; - EasyMx = derive2 { name="EasyMx"; version="0.2-1"; sha256="03yshzb4wh3n667z9lmrwsz16chpgnl8qv3qlx425mj5iiyv626z"; depends=[OpenMx]; }; + EasyMx = derive2 { name="EasyMx"; version="0.2-12"; sha256="00wj08nwv5zi5d4a1fss40f4cms4svam1hmmxvh60hvc55ygsc3z"; depends=[OpenMx]; }; EbayesThresh = derive2 { name="EbayesThresh"; version="1.4-12"; sha256="07a2dd3za2dc81n6m2xy794sclp3yw7f46lg1igaflh7m9407198"; depends=[wavethresh]; }; - Ecdat = derive2 { name="Ecdat"; version="0.3-4"; sha256="07c6cv8dnz7781i9aavr0gx573nkmqam5v157kkq7478ia1cccpb"; depends=[Ecfun]; }; - Ecfun = derive2 { name="Ecfun"; version="0.2-0"; sha256="1clxwmwd4lmhh7zqspqgn13vrzg40lbqzb0a7b90qla4hk9r4zm4"; depends=[fda gdata jpeg MASS RCurl stringi TeachingDemos tis XML xml2]; }; + Ecdat = derive2 { name="Ecdat"; version="0.3-7"; sha256="0isaysjagpx10fq47xs57ywr5jidi62g18zjv5a1jd3c0wswxbkv"; depends=[Ecfun]; }; + Ecfun = derive2 { name="Ecfun"; version="0.2-2"; sha256="0gal91rhyrgpdxalnsy9pn7s0pj444zscv1m7pdgfzlnqcmf1vlf"; depends=[BMA fda gdata jpeg MASS mvtnorm RCurl stringi TeachingDemos tis XML xml2]; }; + EcoDiet = derive2 { name="EcoDiet"; version="1.0.0"; sha256="19x2ypmsw6jnq1s0nqk3pdkwi5g3g92r6fgxrxlnyvd0jqi9l8b3"; depends=[coda ggplot2 rjags]; }; 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.6"; sha256="1pichrwny5hyb19919ldbgkdxp1s6vs03yw0x43ww13ldi314zbn"; depends=[rgeos]; }; @@ -1239,7 +1245,7 @@ in with self; { 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.4.0"; sha256="1h27q1qml1ba1b39ymg2ma48738h3027hg5qpxpgkz01xvlzqii3"; 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.4"; sha256="1gqi3mnxnhsynk63hr0ny93m60xq4a0sjc5x0p67l6xybn2fk011"; depends=[editrules igraph Rcpp]; }; + EditImputeCont = derive2 { name="EditImputeCont"; version="1.1.6"; sha256="1hpm198awl30i7vbg1jk578s2i3f2kskirb33xvampcwn8mz0nhh"; depends=[editrules igraph Rcpp]; }; EffectLiteR = derive2 { name="EffectLiteR"; version="0.4-4"; sha256="17mhp4acj0myr2b54hgbb3wi5j6a6q999nqr9lwcbx3plyrwlljl"; depends=[car foreign ggplot2 lavaan lavaan_survey nnet shiny survey]; }; EffectStars = derive2 { name="EffectStars"; version="1.9-1"; sha256="131w5bdc615gaa2czi4wyc2f96jcg24ahcmggajrvyhxmi6rag5x"; depends=[VGAM]; }; EffectStars2 = derive2 { name="EffectStars2"; version="0.1-3"; sha256="0yh4krqjh1jb7gjxb9z4f5bzarps0g9jfqbbva782a881dhcdl1x"; depends=[miscTools VGAM]; }; @@ -1247,14 +1253,13 @@ in with self; { EffectsRelBaseline = derive2 { name="EffectsRelBaseline"; version="0.5"; sha256="1dsnakcrgmlx44599ii92wvhxbxrh0hij59709wsskx1x1152zvh"; depends=[]; }; EfficientMaxEigenpair = derive2 { name="EfficientMaxEigenpair"; version="0.1.4"; sha256="1s0i9a2vk2g4f5gadsvzjfkw91hcjsrbyjg2vgnj1v17xrwgp40w"; depends=[]; }; EleChemr = derive2 { name="EleChemr"; version="1.1.0"; sha256="109dv7ayg5nm6zjd70dp8h5qqwrijikymzgb41dl8vx4pqhv43v3"; depends=[ggplot2]; }; - ElemStatLearn = derive2 { name="ElemStatLearn"; version="2015.6.26.2"; sha256="1ynp3fxzi095im584bgw9v8pzgs9p2v64csyhmf0m2hqyrr4myd0"; depends=[]; }; EloChoice = derive2 { name="EloChoice"; version="0.29.4"; sha256="1g8ivvnv16c2gniwd9xa9z89bm4rac0nrg3mcg1risgf9yk4rgm5"; depends=[psychotools Rcpp RcppArmadillo Rdpack]; }; EloOptimized = derive2 { name="EloOptimized"; version="0.3.0"; sha256="185vh8h6r5wqcbaq3glq8k3fr8jp6h3q2h2ly54agi6bi3fvbs05"; depends=[BAMMtools dplyr lubridate magrittr reshape2 rlang rlist]; }; - EloRating = derive2 { name="EloRating"; version="0.46.10"; sha256="03cnbmm18cfh0awg221j478sb5r4r1v4hcilj5chr8qr4i1xmjvz"; depends=[network Rcpp RcppArmadillo Rdpack sna zoo]; }; + EloRating = derive2 { name="EloRating"; version="0.46.11"; sha256="09nh3ia4s3c9yjhw0f0haqb26fryfc4lf9rgfcbqqzzwgdr1invj"; depends=[network Rcpp RcppArmadillo Rdpack sna zoo]; }; ElstonStewart = derive2 { name="ElstonStewart"; version="1.1"; sha256="1y2g4x3fhi78c2406bk8r8c3x9zhx8ya3qlbnypdm65j0minixsn"; depends=[digest kinship2]; }; - EmbedSOM = derive2 { name="EmbedSOM"; version="1.9.1"; sha256="050j943774zmay6b62rqsb9ifd55cy5p77l0fkrb7b42jgxdqwpy"; depends=[]; }; + EmbedSOM = derive2 { name="EmbedSOM"; version="2.1.1"; sha256="1w61dni4vsglxqdhwdy5dcmzb6hx1wb9fhfki8wmal1yaza23ljy"; depends=[FNN ggplot2 igraph Matrix Rtsne umap uwot]; }; EmiStatR = derive2 { name="EmiStatR"; version="1.2.2.0"; sha256="0xwmwbybiyb9688l5n98vir3rwbbjgpw5qb25p20lhlj1pqg95w1"; depends=[doParallel foreach lattice xts zoo]; }; - EmissV = derive2 { name="EmissV"; version="0.665.1.0"; sha256="1xzpsr43pyvmvzbcw66cxv7qs9i8s7pg1w90l3ivx9mz7p8bfz8a"; depends=[data_table lwgeom ncdf4 raster sf sp units]; }; + EmissV = derive2 { name="EmissV"; version="0.665.2.1"; sha256="1525h28xwwq94maj07rnx13l7i9q7wcrssld5q99741clvzrygk0"; depends=[data_table ncdf4 raster sf sp units]; }; EmpiricalCalibration = derive2 { name="EmpiricalCalibration"; version="2.0.1"; sha256="0k37lncjq14py3fvcr925gh66i31aphkniv5dn86gibxzdvbjnqc"; depends=[ggplot2 gridExtra]; }; EncDNA = derive2 { name="EncDNA"; version="1.0.2"; sha256="0wy2cmcvyqjhg5mqbvdzmihfv8swx7ym2n9mjdqgx0kgnc7k614y"; depends=[Biostrings]; }; EnergyOnlineCPM = derive2 { name="EnergyOnlineCPM"; version="1.0"; sha256="1a3wvclqdwcvq5inhliwjnd7xzqbjvzs8h8ncy6qlhjq6s5n7nm8"; depends=[energy MASS]; }; @@ -1273,11 +1278,11 @@ in with self; { EnviroPRA = derive2 { name="EnviroPRA"; version="1.0"; sha256="0yirh3vy7wap0qmm3kvjz9y68gcvp9i8qshv80wh8aijxwklpr8n"; depends=[fitdistrplus kSamples MASS truncdist]; }; EnviroStat = derive2 { name="EnviroStat"; version="0.4-2"; sha256="0ckax6vkx0vwczn21nm1dr8skvpm59xs3dgsa5bs54a3xhn5z9hs"; depends=[MASS]; }; Epi = derive2 { name="Epi"; version="2.40"; sha256="046y10vwks5y84pzccmrn6d4pd6qz70imvp1hw5ywp8fnwzfh4g5"; depends=[cmprsk data_table etm MASS Matrix mgcv numDeriv plyr survival zoo]; }; - EpiContactTrace = derive2 { name="EpiContactTrace"; version="0.12.0"; sha256="1i84fslz8sdngvkv34zhzjwzrzzxx6f4s31p8f5smmf028jlpyys"; depends=[]; }; + EpiContactTrace = derive2 { name="EpiContactTrace"; version="0.13.0"; sha256="1m9gawd0fv0pl9q8n9rnid8shdy88kxw4hr5fvvf9ifngf8ffmqa"; depends=[]; }; EpiCurve = derive2 { name="EpiCurve"; version="2.2-1"; sha256="091q03lak2nfk83s10004qnwdng0gl4z92pc174mc41wns7f5d8v"; depends=[dplyr ggplot2 ISOweek RColorBrewer scales timeDate]; }; - EpiDynamics = derive2 { name="EpiDynamics"; version="0.3.0"; sha256="0hpysjl8wfgylbp4ddxmi5msvlp1w70c6pxggc2bwdgap3s127f3"; depends=[deSolve ggplot2 reshape2]; }; + EpiDynamics = derive2 { name="EpiDynamics"; version="0.3.1"; sha256="0m6yay3r7dqih19f76wxwgq6dh9p1zmp5d9ilj9nd262q61jcy53"; depends=[deSolve ggplot2 reshape2]; }; EpiEstim = derive2 { name="EpiEstim"; version="2.2-1"; sha256="1a21mskjvyz9qdvl3kkf0p15zn1nx1a49c5djp1lacrn6h7g8k9p"; depends=[coarseDataTools coda fitdistrplus ggplot2 gridExtra incidence reshape2 scales]; }; - EpiILM = derive2 { name="EpiILM"; version="1.4.2"; sha256="16vml2p7c4nv0lfis661x7b9wimrni1ncpa256dh99cps9508j28"; depends=[coda]; }; + EpiILM = derive2 { name="EpiILM"; version="1.5"; sha256="0726sb6jisicphchzbcswh8nkgx12cb6sfgwa4ll35nm3vrb5xb1"; depends=[adaptMCMC coda LaplacesDemon]; }; EpiILMCT = derive2 { name="EpiILMCT"; version="1.1.6"; sha256="0qhpmh28zmgqnsyfxgv06g2slix12nn2pglgpvagx2q40rs4fann"; depends=[coda igraph]; }; EpiModel = derive2 { name="EpiModel"; version="1.7.5"; sha256="0w7r26pcsw785rhd17j0sp840xa4mpsfiq04vk36afv27mgfx6wy"; depends=[ape deSolve doParallel ergm foreach ggplot2 lazyeval network networkDynamic RColorBrewer tergm]; }; EpiReport = derive2 { name="EpiReport"; version="0.1.0"; sha256="1bfh7nrwmplsk7whvmsf0wxg795xrwvarxw974v58mjb282yp87s"; depends=[dplyr extrafont flextable ggplot2 knitr officer png rmarkdown tidyr zoo]; }; @@ -1298,12 +1303,13 @@ in with self; { EvalEst = derive2 { name="EvalEst"; version="2015.4-2"; sha256="1jkis39iz3zvi5yfd0arvw7bym6naq45f5cravywg8c37n9v967x"; depends=[dse setRNG tfplot tframe]; }; EvaluationMeasures = derive2 { name="EvaluationMeasures"; version="1.1.0"; sha256="0b65y4rb650hhlgc18z0sm0danrrawqkazzdl9krl877djrgx87g"; depends=[]; }; Evapotranspiration = derive2 { name="Evapotranspiration"; version="1.14"; sha256="1v681m7zyhpydyx1mbkk4iwxkkf0mx1317c3z2v465zg9bssp3c7"; depends=[zoo]; }; + EventDetectGUI = derive2 { name="EventDetectGUI"; version="0.3.0"; sha256="02gwgbp692cfmf933jg1f7h4gghhc1v2cswz7rpcazm8h39mc4wh"; depends=[DT EventDetectR ggplot2 plotly shiny shinyBS shinydashboard shinyjs XML]; }; EventDetectR = derive2 { name="EventDetectR"; version="0.3.4"; sha256="1zyv9k0l1s5djvp5hbbrlz96gw3126n43nm2iv6xsil90k2fp827"; depends=[forecast ggplot2 gridExtra imputeTS neuralnet]; }; 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.5.0"; sha256="1xnikvdr2a1xahqg6rrpbsf269yppxg47b8ncdr8b3hiy1a5piwr"; depends=[corrplot dplyr DT ggplot2 kableExtra lfe lmtest multiwayvcov openssl rio scales shiny shinycssloaders stargazer tictoc tidyr zip]; }; + ExPanDaR = derive2 { name="ExPanDaR"; version="0.5.1"; sha256="10jgwvq04cf17kdsjggyvnvmkialgcl38r53k5vj64h2zfwyj2wx"; depends=[corrplot dplyr DT ggplot2 kableExtra lfe lmtest multiwayvcov openssl rio rlang scales shiny shinycssloaders stargazer tictoc tidyr zip]; }; ExPosition = derive2 { name="ExPosition"; version="2.8.23"; sha256="0x9400ggmgrnaish0cfgnyvw549g4ibfv9aj6vzq7j68n58vq405"; depends=[prettyGraphs]; }; Exact = derive2 { name="Exact"; version="2.0"; sha256="142yiz9bz1abgpdqkzgdsz3bp3dwbjlmyg29a62djb8630aicgyn"; depends=[]; }; ExactCIdiff = derive2 { name="ExactCIdiff"; version="1.3"; sha256="1vayq8x7gk1fnr1jrlscg6rb58wncriybw4m1z0glfgzr259103y"; depends=[]; }; @@ -1314,6 +1320,7 @@ in with self; { ExpDes = derive2 { name="ExpDes"; version="1.2.0"; sha256="0zisgb129fdg2igc3gp8jkrv9bz2r7bz2i20ap07mqlvhq88515a"; depends=[stargazer]; }; ExpDes_pt = derive2 { name="ExpDes.pt"; version="1.2.0"; sha256="0fny5hcg76bm04vpbkvlwzw78m5gj28rvich7k1hhrhlxm3xi3hf"; depends=[stargazer]; }; ExpRep = derive2 { name="ExpRep"; version="1.0"; sha256="0spv3wd9c8sr338n5kdzrs28yh7s90fl70wsdnkibmlxhnh3ay3g"; depends=[]; }; + ExpertChoice = derive2 { name="ExpertChoice"; version="0.2.0"; sha256="1pd4v240ywc4wzh249axxb4kz5dccizc08jdjnaygz35hjdg5hvj"; depends=[DoE_base dplyr far purrr rlist]; }; ExplainPrediction = derive2 { name="ExplainPrediction"; version="1.3.0"; sha256="14m3b9fsrpfpr8avsnhl8b3bzk2xlhwgkwag5iq8bj7bzvv4yck1"; depends=[CORElearn semiArtificial]; }; ExtMallows = derive2 { name="ExtMallows"; version="0.1.0"; sha256="0903jslp74s1vzbklq88y2dm0dgkhd6g77b7aipxam98933k0hzz"; depends=[]; }; ExtractTrainData = derive2 { name="ExtractTrainData"; version="5.0.3"; sha256="0a47b3zb4igx39jn609ll9s4zwbpid723xncdjxrmamdp8dvv8r6"; depends=[raster rgdal rgeos]; }; @@ -1325,7 +1332,7 @@ in with self; { FAMILY = derive2 { name="FAMILY"; version="0.1.19"; sha256="1912l2zj2cmh8yx8lkg8fpgvfddn6wbi1vrr4yx04mh73gk1s5mk"; depends=[pheatmap pROC]; }; FAMT = derive2 { name="FAMT"; version="2.5"; sha256="0mn85yy9zmiklfwqjbhbhzbawwp2yqrm9pvm8jhasn9c3kw1pcp2"; depends=[impute mnormt]; }; FAMoS = derive2 { name="FAMoS"; version="0.2.0"; sha256="08xyj7bnkckyk0d0kxkz7nqm7ib5by0wqmx54pwk3ak4mmh9arzi"; depends=[future R_utils]; }; - FAOSTAT = derive2 { name="FAOSTAT"; version="2.0"; sha256="06z8c964sf73ld4v9vybqjsdxskxp3ssyv0a3mpcs9la5y7n9jaz"; depends=[classInt data_table ggplot2 labeling MASS plyr RJSONIO scales]; }; + FAOSTAT = derive2 { name="FAOSTAT"; version="2.1.2"; sha256="11pmbjz4vkg8a68qfkbqlhnggln1vp8m5pllg2y7wwxxa4ld71qk"; depends=[classInt data_table ggplot2 labeling MASS plyr RJSONIO]; }; FARDEEP = derive2 { name="FARDEEP"; version="1.0.1"; sha256="0blvjakcpkh9vpxryk7qyaqnija0r375ckv37kjlr34xg8pg9qnm"; depends=[nnls preprocessCore]; }; FASeg = derive2 { name="FASeg"; version="0.1.9"; sha256="0lazx8dyycyycr8467m9rkxkxhp4r2w737kpkb40y59wncmbvkik"; depends=[]; }; FAdist = derive2 { name="FAdist"; version="2.2"; sha256="0nw3w4g7y846bm57xyjnb13g7z746kxf8mb2hnljwwsypcg6i2n8"; depends=[]; }; @@ -1335,17 +1342,17 @@ in with self; { FBN = derive2 { name="FBN"; version="1.5.1"; sha256="0723krsddfi4cy2i3vd6pi483qjxniychnsi9r8nw7dm052nb4sf"; depends=[]; }; FCGR = derive2 { name="FCGR"; version="1.0-0"; sha256="015nnnc9fasx0qjrc3lbxv14rqwyx36xzsw9076grwm5pqahrdsb"; depends=[kerdiest KernSmooth MASS mgcv nlme pspline sfsmisc]; }; FCMapper = derive2 { name="FCMapper"; version="1.1"; sha256="1yjh8rs65nqslvwv7x4rif469zds41s7v3vhq6pca1y17kvj2in1"; depends=[igraph]; }; - FCSlib = derive2 { name="FCSlib"; version="1.0.0"; sha256="0wgk3h03w5wlr8anlp779wqj7ivnlw3brlahc82mb92nq3yc0k5d"; depends=[tiff]; }; + FCPS = derive2 { name="FCPS"; version="1.1.0"; sha256="0svfd108nr9h45jiarnj686668hbp53g9gkl6kiiyskq3ws6hdn0"; depends=[DataVisualizations ggplot2 mclust]; }; + FCSlib = derive2 { name="FCSlib"; version="1.1.0"; sha256="0sxpzcj6lard3xf24pq42iaryc3idccb076y69swckm0ixhrg85w"; depends=[tiff]; }; FD = derive2 { name="FD"; version="1.0-12"; sha256="0xdpciq14i8rh7v6mw174hip64r7mrzhx7gwri3vp9y7a1380sbi"; depends=[ade4 ape geometry vegan]; }; - FDGcopulas = derive2 { name="FDGcopulas"; version="1.0"; sha256="1i86ns4hq74y0gnxfschshjlc6if3js0disjb4bwfizaclwbw3as"; depends=[numDeriv randtoolbox Rcpp]; }; FDRSeg = derive2 { name="FDRSeg"; version="1.0-3"; sha256="0dh6m5vlx664kryh56jzi3zxydjwa5217nhbwn6adp0q5qdh6d8a"; depends=[Rcpp stepR]; }; FDRreg = derive2 { name="FDRreg"; version="0.1"; sha256="17hppvyncbmyqpi7sin9qsrgffrnx8xjcla2ra6y0sqzam1145y4"; depends=[fda mosaic Rcpp RcppArmadillo]; }; FDRsampsize = derive2 { name="FDRsampsize"; version="1.0"; sha256="0g8kawzyi9x5yndvh330wzqw6rvcnprwq56ngd0j6z51hvvw8qhw"; depends=[]; }; + FDX = derive2 { name="FDX"; version="1.0.1"; sha256="1za2w2xykbfy2pvxxr9xq2lblk65mxrskx80cdcr00ivzj1jx2bn"; depends=[DiscreteFDR PoissonBinomial pracma Rcpp]; }; FDboost = derive2 { name="FDboost"; version="0.3-2"; sha256="1ahdq49ijj4j2yykmzbpgrjn0sm09nzmd33k317y157hnf6zyxvs"; depends=[gamboostLSS MASS Matrix mboost mgcv stabs zoo]; }; FENmlm = derive2 { name="FENmlm"; version="2.4.3"; sha256="1a205a4iv54haixanyzx210lzqg7cnryjvqayvkdj1lhmdql4anw"; depends=[Formula MASS numDeriv Rcpp]; }; FEprovideR = derive2 { name="FEprovideR"; version="1.1"; sha256="02hfdk9qhaq4y19p700w2i7qsdp4z2kyww0pr0pijfivkqks0vpi"; depends=[ggplot2 Matrix poibin]; }; FFD = derive2 { name="FFD"; version="1.0-6"; sha256="19yqb45qj54fmjkqfjbcqsx3wz6fk8inrqif9ds93xjkm6aaiqgp"; depends=[R2HTML tkrplot]; }; - FFTrees = derive2 { name="FFTrees"; version="1.4.0"; sha256="0s2h81vdh8d41kwz5ja831q11wrb7ywdd7aq46x3y9sgg3aabd44"; depends=[caret circlize e1071 igraph pROC progress randomForest rpart stringr yarrr]; }; FField = derive2 { name="FField"; version="0.1.0"; sha256="05q16v2vv64qhbnf2l66dwzmvgzyaq8vxwwdabp534bw7z7zpi8q"; depends=[]; }; FGSG = derive2 { name="FGSG"; version="1.0.2"; sha256="1r3sjhzf9gcnbcx6rqr1s555z8lcwm3fxl096md2jji336ijlk79"; depends=[]; }; FGalgorithm = derive2 { name="FGalgorithm"; version="1.0"; sha256="1dq6yyb3l6c9fzvk9gs6pb240xb5hvc6fh8p3qd3c91b3m289mcc"; depends=[]; }; @@ -1353,12 +1360,10 @@ in with self; { FHtest = derive2 { name="FHtest"; version="1.4"; sha256="1wsn0j9ydpp9nfswiqg21p09kgkvaq8fh0y0h8syqgizah7i8vs2"; depends=[interval KMsurv MASS perm survival]; }; FI = derive2 { name="FI"; version="1.0"; sha256="17qzl8qvxklpqrzsmvw4wq3lyqz3zkidr7ihxc4vdzmmz69pyh2f"; depends=[]; }; FIACH = derive2 { name="FIACH"; version="0.1.2"; sha256="151lc5m8pb7l07kxljm32zy5kd7a4zr5vgsgwsx7ywhijh0r0585"; depends=[Rcpp RcppArmadillo RNiftyReg tkrplot]; }; - FILEST = derive2 { name="FILEST"; version="1.0.3"; sha256="0i622rfr9sb22c922kk0gg4l1akx54m6zx7wy3w1p5xrr1zjjyvp"; depends=[KRIS rARPACK]; }; FIT = derive2 { name="FIT"; version="0.0.6"; sha256="1nkjms9cvigc9sjha1krzhd3nmwsfh8pi0f1plf5k8zpb773zzb2"; depends=[gglasso MASS Rcpp RcppEigen XML]; }; FITSio = derive2 { name="FITSio"; version="2.1-0"; sha256="021xmbavigg70m96xw1bvsdasi5yj2wmafgb6xw4b09fmyv9hvjp"; depends=[]; }; FKF = derive2 { name="FKF"; version="0.1.5"; sha256="1qzf7y3f4xfirjkm795rcxckjbw6sn7xpilhkyvayqm2vyhf7518"; depends=[RUnit]; }; FKSUM = derive2 { name="FKSUM"; version="0.1.3"; sha256="1zz4hyqlq4517jksgx3jfz9m4gfnp49q272n0m4y9yabsd5fdv3a"; depends=[MASS rARPACK Rcpp RcppArmadillo]; }; - FLAME = derive2 { name="FLAME"; version="1.0.0"; sha256="0va9mbwlnvr64hii203rmq4x3izpix0x36kpsns43yb9wdqq70hv"; depends=[dplyr gmp lattice latticeExtra reticulate rlang RPostgreSQL RSQLite]; }; FLLat = derive2 { name="FLLat"; version="1.2-1"; sha256="0306bpwp2az4x4m5sv88hlh7vs0y5isfby7lxrn2gjnk76gg6mw1"; depends=[gplots]; }; FLR = derive2 { name="FLR"; version="1.0"; sha256="0k50vi73qj7sjps0s6b2hq1cmpa4qr2vwkpd2wv2w1hhhrj8lm0n"; depends=[combinat]; }; FLSSS = derive2 { name="FLSSS"; version="8.5.6"; sha256="1c6j54ihc385m1f0r86yb83zqv2myfskq48bh9dcynlnc9crs428"; depends=[Rcpp RcppParallel]; }; @@ -1374,52 +1379,57 @@ in with self; { FOCI = derive2 { name="FOCI"; version="0.1.1"; sha256="1q5zchbm7h5jizk5rl8xr31bdx9h88mzf8ih8kdqmsvpk1ckk13f"; depends=[dplyr magrittr proxy RANN]; }; FPCA2D = derive2 { name="FPCA2D"; version="1.0"; sha256="18bb90ppd9gd8pg9jxfyfkmlsaqk8w25fgaj9fk18ybm2nhsxqm6"; depends=[corpcor]; }; FPCA3D = derive2 { name="FPCA3D"; version="1.0"; sha256="1hrk9caad2s76dx59clxhia45a85khk1y2ii7955f336x55q34a5"; depends=[]; }; + FPDclustering = derive2 { name="FPDclustering"; version="1.4.1"; sha256="19n6fx3fyvnlwh8w8bi8ki3wfmvzdlxl557cj3a9y1wmm3fv2drz"; depends=[cluster ExPosition mvtnorm rootSolve ThreeWay]; }; FPV = derive2 { name="FPV"; version="0.5"; sha256="0pxa8lbcxw2hx2n0frkx0pdndlcfm7gnh9qay9q53cf5gqzzwvvc"; depends=[FuzzyNumbers FuzzyNumbers_Ext_2]; }; FRACTION = derive2 { name="FRACTION"; version="1.0"; sha256="0g25dzsbharsq8bzfka96zccaqppdclax24mz5m080ddg4y8zj49"; depends=[]; }; FRAPO = derive2 { name="FRAPO"; version="0.4-1"; sha256="0mjcrplxr0cyybp5hzzwbq5j03w0f3iiiv1yk7mdqr5gb368dchq"; depends=[cccp Rglpk timeSeries]; }; FRCC = derive2 { name="FRCC"; version="1.0"; sha256="1g1rsdqsvwf7wc16dj16y6r0347j8jsv5l1pxvj1h0579zinaf2b"; depends=[calibrate CCP corpcor MASS]; }; FREQ = derive2 { name="FREQ"; version="1.0"; sha256="01nra30pbnqdd63pa87lcws3hnhhzybcjvx2jqyxjghn6khz47j0"; depends=[]; }; FRESA_CAD = derive2 { name="FRESA.CAD"; version="3.1.0"; sha256="1gi637fwfpwbghms96bmfqs7zirjskd9hxiw43s0765h3ypjqwx1"; depends=[Hmisc miscTools pROC Rcpp RcppArmadillo stringr]; }; - FRK = derive2 { name="FRK"; version="0.2.2"; sha256="0m0ngxanyq19myzza4fb75k9vb67mv17iny847bv9qrgg2vbm5r8"; depends=[digest dplyr ggplot2 Hmisc Matrix plyr Rcpp sp spacetime sparseinv]; }; + FRK = derive2 { name="FRK"; version="0.2.2.1"; sha256="0fjfhkv899v08419109qs1gabnc22h7a5b4z6s6fd1zk1dc4agjn"; 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.26"; sha256="1gnmch98y8b6bssnz769d987rmvyiadrpshpjf5qihcnnq6jp2sy"; depends=[car dplyr dunn_test epitools gplots lmtest plotrix plyr sciplot withr]; }; + FSA = derive2 { name="FSA"; version="0.8.30"; sha256="0f567dm1fcffjsmm4j8c81q748rl944ia5ll22b2ayvv3qf7v9y7"; depends=[car dplyr dunn_test lmtest plotrix plyr sciplot withr]; }; FSAdata = derive2 { name="FSAdata"; version="0.3.8"; sha256="0i7wkz0baxcf1dv6qvc891b4ja4x65p4qicil472k6a9gcf5d4qm"; 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]; }; + FSSF = derive2 { name="FSSF"; version="0.1.1"; sha256="024g2rv64yqxmbbwrbkpkrzdfshl0n6jll6axsgsp4q4ia4r9401"; depends=[Rcpp RcppArmadillo]; }; FSTpackage = derive2 { name="FSTpackage"; version="0.1"; sha256="1fjqsl59fg4x9vkbv4b0qmfxlaa2q3rzpl40grv24yg6ixfagmdb"; depends=[CompQuadForm MASS Matrix mvtnorm SKAT]; }; FSelector = derive2 { name="FSelector"; version="0.31"; sha256="1ryqrwz9h7ggxvmxyw4viajlkvd3r7i6ihcfrwsz6axyk5y0qarg"; depends=[digest entropy randomForest RWeka]; }; FSelectorRcpp = derive2 { name="FSelectorRcpp"; version="0.3.3"; sha256="0x0jysqjvplzmcjs223wma9ng2pyd9mcbdgqmgsiifv0wdic07vi"; depends=[BH foreach iterators Rcpp RcppArmadillo testthat]; }; - FSinR = derive2 { name="FSinR"; version="1.0.6"; sha256="1w2sw0z4qyhnz3h790kznwmka5ml4n0kdqkynnwprsyclvxsfdwn"; depends=[caret class digest dplyr e1071 GA mlbench neuralnet prodlim purrr Rdpack rlang rpart tidyr]; }; + FSinR = derive2 { name="FSinR"; version="1.0.8"; sha256="07cabw86x07sg3mhpzdfrgw20i2mhnxk21zxbzwv4dgld66g9g08"; depends=[caret class digest dplyr e1071 GA mlbench neuralnet prodlim purrr Rdpack rlang rpart tidyr]; }; FTICRMS = derive2 { name="FTICRMS"; version="0.8"; sha256="0kv02mdmwflhqdrkhzb55si5qnqqgdadgyabqc2hwr6iccn7aq8c"; depends=[lattice Matrix]; }; FUNTA = derive2 { name="FUNTA"; version="0.1.0"; sha256="02yxz95s2hs26mfmgwhv5d54yyjz0aczjpnay8b4gpzbpd6aci61"; depends=[]; }; FWDselect = derive2 { name="FWDselect"; version="2.1.0"; sha256="0w0hkmhcz7h1lixk7p3yffbbalgxwh2lv463vqz361k80sri6wz7"; depends=[cvTools mgcv]; }; FacPad = derive2 { name="FacPad"; version="3.0"; sha256="0h7knzin0rfk25li127zwjsyz223w7nx959cs328p6b2azhgn59b"; depends=[MASS Rlab]; }; FactMixtAnalysis = derive2 { name="FactMixtAnalysis"; version="1.0"; sha256="1l4wfp39b7g38vdk6jpd5zq08sjhsg0s71f662aca2rj6l3a2x3r"; depends=[MASS mvtnorm]; }; FactoClass = derive2 { name="FactoClass"; version="1.2.7"; sha256="0hvlr9cw6wfckl8rzl5qqyp0h8rv8gcnyj6x930jq7h44kj0ji7d"; depends=[ade4 ggplot2 ggrepel KernSmooth scatterplot3d xtable]; }; - FactoInvestigate = derive2 { name="FactoInvestigate"; version="1.5"; sha256="079x3n6jh69vrgqmjskccscd21g0vni6bsyga928gndz9nvh3807"; depends=[FactoMineR ggplot2 rmarkdown rrcov]; }; - FactoMineR = derive2 { name="FactoMineR"; version="2.1"; sha256="1b2jsv8vlaynknd7nlra6fdmr56n7678q5s28rqmagbadiqwvj4h"; depends=[car cluster ellipse flashClust ggplot2 ggrepel lattice leaps MASS scatterplot3d]; }; + FactoInvestigate = derive2 { name="FactoInvestigate"; version="1.6"; sha256="0y32k41i1mfh1yxkd8mcgw7x2xkibq9xqf2vgysnibgnabwi15w2"; depends=[FactoMineR ggplot2 rmarkdown rrcov]; }; + FactoMineR = derive2 { name="FactoMineR"; version="2.3"; sha256="0ldgf3daksh6lpblhqys67m4mxqx3q9s9n5plfam6dwshfik0ky6"; depends=[car cluster ellipse flashClust ggplot2 ggrepel lattice leaps MASS scatterplot3d]; }; + FactorAssumptions = derive2 { name="FactorAssumptions"; version="1.1.2"; sha256="0k5jjqfajrq5wc0vp07s6kbfyjks6124hpy09nxw2blrai66vhcm"; depends=[MASS psych]; }; FactorsR = derive2 { name="FactorsR"; version="1.4"; sha256="1nw63j9bi4x09pgdvdml0w0qxfy1dda5hkxbhd3d6f7rky1z0nyf"; depends=[]; }; - Factoshiny = derive2 { name="Factoshiny"; version="2.1"; sha256="0h2qf89z9yb8b1a9hh0l50vnhzbz1xb7akm5390xmlpybh22jagl"; depends=[colourpicker DT FactoInvestigate FactoMineR ggplot2 ggrepel missMDA shiny shinydashboard shinyjqui]; }; + Factoshiny = derive2 { name="Factoshiny"; version="2.2"; sha256="0niic7k9z1j3684l0wmyhkbm1x8a2djig6m2k0s49vgfdaf1hcc0"; depends=[colourpicker DT FactoInvestigate FactoMineR ggplot2 ggrepel missMDA shiny shinydashboard shinyjqui]; }; Fahrmeir = derive2 { name="Fahrmeir"; version="2016.5.31"; sha256="16fbc1zb9x9p04bl7y5nd375pha6bd3hfqqchlk1bqxrj4879y5g"; depends=[]; }; FamEvent = derive2 { name="FamEvent"; version="2.0"; sha256="07xb1k3yxsbwxxg6avw2gvai2qpjjd1imjggr8q6lkgcd8j3yxrb"; depends=[eha kinship2 MASS pracma survival truncnorm]; }; Familias = derive2 { name="Familias"; version="2.4"; sha256="1k6ig2zfkr1a4s3s85ygixmmsrb5m8vqqab8l5ffkspgjvh4dfz2"; depends=[kinship2 paramlink Rsolnp]; }; FarmSelect = derive2 { name="FarmSelect"; version="1.0.2"; sha256="174rzv9k0hdcfdkv7bisy70rip2iy0bnj3qa54i00wqwjdglgjdn"; depends=[fBasics ncvreg Rcpp RcppArmadillo]; }; - FarmTest = derive2 { name="FarmTest"; version="2.0.0"; sha256="0dr7cr3dcvsl02sll16zfyyq1kcv5qmj29psi75h73bzanx3h64n"; depends=[Rcpp RcppArmadillo]; }; + FarmTest = derive2 { name="FarmTest"; version="2.0.1"; sha256="1inwbaa4nckny4cwypqs2s2jmzj61vb6dpjyf8fn2mxdy4qjb9zd"; depends=[Rcpp RcppArmadillo]; }; FastBandChol = derive2 { name="FastBandChol"; version="0.1.1"; sha256="1hlgipn792vaylvc0r44clkjcnkns6p241a1fs8sb3gpq81naazk"; depends=[Rcpp RcppArmadillo]; }; + FastCUB = derive2 { name="FastCUB"; version="0.0.2"; sha256="04bphkfkkjp7gfnsgar5gcxzmkr437mz6y8mbf015m7f4cvdhzjz"; depends=[CUB Formula]; }; FastGP = derive2 { name="FastGP"; version="1.2"; sha256="120qai1yw3yhwm762zridk78n4qclpivwm9f2hkij4bz851qibqv"; depends=[MASS mvtnorm rbenchmark Rcpp RcppEigen]; }; FastGaSP = derive2 { name="FastGaSP"; version="0.5.1"; sha256="09dymlchc4ij5iwwi2hl7shlqr8610lv7r2qh3sbrh7j5vnr5sc9"; depends=[Rcpp RcppEigen RobustGaSP]; }; FastHCS = derive2 { name="FastHCS"; version="0.0.6"; sha256="0ds0g2lbzc33is8g8yxfs6hpvl2zdrgi9fqa7c71c3b3fwn9cqlv"; depends=[matrixStats Rcpp RcppEigen robustbase]; }; - FastImputation = derive2 { name="FastImputation"; version="2.0"; sha256="0zhin8000c78kba6zly9mvpxdxx68kcsh2hn697pxkl73wqsz3p5"; depends=[Matrix]; }; FastKM = derive2 { name="FastKM"; version="1.0"; sha256="0sqxd2pg9y6yn1lnxni32ca3bgbmz04k9z37q9pzgijvf9qvik3f"; depends=[rARPACK]; }; FastKNN = derive2 { name="FastKNN"; version="0.0.1"; sha256="1iz8ybzkvbyqwb00s7cp1zvy9xlmyjid441mf62dq08a0zncnyss"; depends=[assertthat pdist]; }; FastLZeroSpikeInference = derive2 { name="FastLZeroSpikeInference"; version="2018.12.10"; sha256="0ybpmns7bc1j5xzqjl7734grihmvvpa3h52gixv3h70l0r89d8ys"; depends=[]; }; FastPCS = derive2 { name="FastPCS"; version="0.1.3"; sha256="152fy5hq675n1mjdsi31a77rmi3vylvvbfgywrh62chy5xa1bf34"; depends=[matrixStats Rcpp RcppEigen]; }; FastRCS = derive2 { name="FastRCS"; version="0.0.8"; sha256="11kqd8aii9sy65m5inxiqggyajb41iy6w92zp5wggx7pbg9m6lmy"; depends=[matrixStats Rcpp RcppEigen]; }; - FastRWeb = derive2 { name="FastRWeb"; version="1.1-1.1"; sha256="08hqsiglv9ivcv4xmpqqjhqmg3ccba5xa7jahay0m71w2n8m271y"; depends=[base64enc Cairo]; }; + FastRWeb = derive2 { name="FastRWeb"; version="1.1-3"; sha256="1913pyjzxw8kw5hbr8mfwk2mjjfz7cyl6sh71z6cc0jl0af3p1kn"; 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.9"; sha256="0n02591wpi4n0ga42v4xd1jzskcl56nvvls48sdkcnvc7cyi0hjv"; depends=[lle locfit pheatmap princurve randomForest RColorBrewer Rtsne som umap]; }; - FeaLect = derive2 { name="FeaLect"; version="1.14"; sha256="1h6jc8n57mvyz3gi2jdx5xacwv5iim5sx86qzrg3v1higfr54b1l"; depends=[lars rms]; }; + FaultTree = derive2 { name="FaultTree"; version="0.99.4"; sha256="0f1pvi0vaaw29vghxi5qgbl6hn3fpwm2gxpdvchp3k2wk6p2gvk3"; depends=[Rcpp RcppArmadillo]; }; + FcircSEC = derive2 { name="FcircSEC"; version="1.0.0"; sha256="06c1n0xx1q0zh16bgylwbvqzp8q4c5bj626shm2c6r8f9kcjgysh"; depends=[Biostrings seqRFLP stringi]; }; + FeaLect = derive2 { name="FeaLect"; version="1.20"; sha256="1dfi0v313x4a4ck98zlk6yr3nfjrdwr5649x9dx3i7yfkypk2k5c"; depends=[lars rms]; }; FeatureHashing = derive2 { name="FeatureHashing"; version="0.9.1.4"; sha256="00yrji3grqgzg8c1hwqq5kb9xgqlnzwymy0b38cwixadc5w5lq8m"; depends=[BH digest magrittr Matrix Rcpp]; }; FedData = derive2 { name="FedData"; version="2.5.7"; sha256="07qgqhd3pg86qsih1ap7j02vriwabqna974q68bapfm52qnvm77z"; depends=[curl data_table devtools dplyr foreach Hmisc httr igraph lubridate magrittr ncdf4 raster readr rgdal rgeos sf sp stringr tibble xml2]; }; FeedbackTS = derive2 { name="FeedbackTS"; version="1.5"; sha256="120labhmisw1x1bq8c4bl6l14vayvb9xcm6jsj1awacypgrr2ar2"; depends=[automap gstat mapdata maps proj4 sp]; }; @@ -1437,6 +1447,7 @@ in with self; { FindAllRoots = derive2 { name="FindAllRoots"; version="1.0"; sha256="0n4wfm21qj5zn06jqnzxa0w9mfn18dqi6hk1jjqa56dxqw1k7vw0"; depends=[]; }; FindIt = derive2 { name="FindIt"; version="1.2.0"; sha256="0zrvkvj907fw86jnzzlwk4d90hi42nq45jprp16xryxb7xxii6i8"; depends=[arm glinternet glmnet igraph lars limSolve lmtest Matrix quadprog sandwich]; }; FinePop = derive2 { name="FinePop"; version="1.5.1"; sha256="184707yvh2mydx42vxrdgv0n4v2dad4an7c4yvlyb9d7z6h0sw2x"; depends=[]; }; + FinePop2 = derive2 { name="FinePop2"; version="0.4"; sha256="1rzsbxbxynn0pl6dlkmsjxiph403ffwlb2brsi8cm4r22jjhcx4i"; depends=[]; }; FisHiCal = derive2 { name="FisHiCal"; version="1.1"; sha256="1dds629jlja3vw2l010n1334yh3z10nijqksr0q98ckd2yrwg2rf"; depends=[igraph Rcpp RcppArmadillo]; }; FisPro = derive2 { name="FisPro"; version="1.0"; sha256="0wj5xf8qcrbmfixmsirwaf9yl5gk0bb588csp867c8n5jnqqyq0p"; depends=[Rcpp Rdpack]; }; FishResp = derive2 { name="FishResp"; version="1.0.3"; sha256="0cydxs9knbmsyxrhqi68aqa12x20k6wcs6jw7z58k2jisypwqclw"; depends=[chron lattice mclust respirometry rMR]; }; @@ -1452,7 +1463,6 @@ in with self; { FlexScan = derive2 { name="FlexScan"; version="0.1.0"; sha256="02p8rh3krh30hmzykm03qvm0g1qcrqzcgzlzlww61pswd9j1g53m"; depends=[smerc sp spdep]; }; FlickrAPI = derive2 { name="FlickrAPI"; version="0.1.0.0"; sha256="0bbk7ac4s3gbcjhfg3yz06pxjid3hpd0mqzxzlj5sghn95f479h9"; depends=[jsonlite magrittr RCurl stringr]; }; FloodMapper = derive2 { name="FloodMapper"; version="1.0"; sha256="09pr6324namqrwdr2impgqmdmsf34g9pq91091cg9b1031djgzyq"; depends=[magick raster rgdal sp]; }; - FlowCAr = derive2 { name="FlowCAr"; version="1.1.1"; sha256="0ddds4726rf38153biz5sgmmyi2knw43vmv2fa7njrjxadsiwclq"; depends=[enaR LIM limSolve]; }; FlowRegEnvCost = derive2 { name="FlowRegEnvCost"; version="0.1.1"; sha256="0lw4kv4z0s23jy11y53rxxh7zxa7vajxrcnjgxd74xxs64vjlj88"; depends=[zoo]; }; FlowScreen = derive2 { name="FlowScreen"; version="1.2.6"; sha256="1s9xyrvfsgrl2zxm2an5qj3rs1qx7v7j8wc83jzl28pkwa5xr351"; depends=[changepoint evir zyp]; }; FluMoDL = derive2 { name="FluMoDL"; version="0.0.3"; sha256="0vp3w6hpph6svz8940w9yk9c5iv4n9mj94f9si1ks0xjbi948rqd"; depends=[dlnm mvmeta tsModel]; }; @@ -1463,7 +1473,9 @@ in with self; { ForecastComb = derive2 { name="ForecastComb"; version="1.3.1"; sha256="07cbiv172mpkwvg6svhwgavlfy2144ir3y1l7w37wbd0ygs514id"; depends=[forecast ggplot2 Matrix mtsdi psych quadprog quantreg]; }; ForecastCombinations = derive2 { name="ForecastCombinations"; version="1.1"; sha256="07vzgm2jy992p1l9b8rsv2lbc8cbfzvql85n5ah4p4l3zjxdxgk9"; depends=[quadprog quantreg]; }; ForecastFramework = derive2 { name="ForecastFramework"; version="0.10.3"; sha256="1c57jfcd156468s0bj0v523clg6pnwbw5spkqchbyz0fxzadc14p"; depends=[abind dplyr lubridate magrittr R6 reshape2 tibble]; }; - ForestFit = derive2 { name="ForestFit"; version="0.4.7"; sha256="0p6nygykx4ad8vznpjdx2ipnxpbhmp9sz3pg50hgkhmhzdlpwk1h"; depends=[ars]; }; + ForecastTB = derive2 { name="ForecastTB"; version="1.0.1"; sha256="1wqgw4i65ajwj8la8mgv2qqm4ydgk90i6chdkd8h33rlwh8yddc6"; depends=[circlize decomposedPSF forecast ggplot2 gridExtra imputeTestbench PSF RColorBrewer reshape2]; }; + ForestDisc = derive2 { name="ForestDisc"; version="0.1.0"; sha256="1mzlrqjxsja51yyxckj4ym1vpfpq30vlhvs8clrg8jv7kz86hdwk"; depends=[moments nloptr randomForest]; }; + ForestFit = derive2 { name="ForestFit"; version="0.5.7"; sha256="08q4cibxhq02qawpyvc8cnr3x1gc8pi1rzdqq3i86764ssb2649a"; depends=[ars]; }; ForestGapR = derive2 { name="ForestGapR"; version="0.0.2"; sha256="0xig9nal83xg312kgq6dhi7n67sa8ixlnh79x957w3n5rv9kdyf2"; depends=[igraph raster rgeos sp spatstat VGAM viridis]; }; ForestTools = derive2 { name="ForestTools"; version="0.2.0"; sha256="0q9nk9n001bnz5hd8cxj6wmaf8c7g0kwfkpa0hk6ap42666rrrah"; depends=[APfun imager raster rgeos sp]; }; FormalSeries = derive2 { name="FormalSeries"; version="1.0"; sha256="09m4ifinasww0xfprs29xsrqhxxkw9zffb3919xnkkjkwp0nax4v"; depends=[]; }; @@ -1472,7 +1484,7 @@ in with self; { FossilSim = derive2 { name="FossilSim"; version="2.1.1"; sha256="1dffk14lszq84k61s1jar658qpjc1hm6rwa1gcwwvppvxj6gkvky"; depends=[ape TreeSim]; }; FourScores = derive2 { name="FourScores"; version="1.5.1"; sha256="1la9d1hfcmi0zg58yl0a7nj36giagh0fwrc7wxyqdq0c7zf1hfzq"; depends=[]; }; FourgameteP = derive2 { name="FourgameteP"; version="0.1.0"; sha256="15yn47737768fkjjv8ykc9lw7x58pq44k90d9d4c9hp20zw5f3by"; depends=[]; }; - FrF2 = derive2 { name="FrF2"; version="2.1"; sha256="01sihw40jyjy07i2cy7k4pk3ck13mb31djk15j2s37b786z05fmj"; depends=[BsMD DoE_base igraph scatterplot3d sfsmisc]; }; + FrF2 = derive2 { name="FrF2"; version="2.1-1"; sha256="0xvkhjn1rx7smval6jk78ck0z9qnjrccyrazw6bllss581vqlqjy"; depends=[DoE_base igraph scatterplot3d sfsmisc]; }; FrF2_catlg128 = derive2 { name="FrF2.catlg128"; version="1.2-1"; sha256="0i4m5zb9dazpvmnp8wh3k51bm0vykh4gncnhdg71mfk4hzrfpdac"; depends=[FrF2]; }; FractalParameterEstimation = derive2 { name="FractalParameterEstimation"; version="1.1.2"; sha256="16xm2g723dm1n1h6as6yvy92sigzhj31f269g5rrzqjcd4d5m8an"; depends=[]; }; Fragman = derive2 { name="Fragman"; version="1.0.9"; sha256="03vmvmnyza4i46v1awkdjz6ccbsiq49dm0mlmwsm801rq6yfihgp"; depends=[]; }; @@ -1481,11 +1493,10 @@ in with self; { FreeSortR = derive2 { name="FreeSortR"; version="1.3"; sha256="1m6ahhixbbizzn09pz71zvinrdshn3j6gmy05jdxa9d932agqk0w"; depends=[ellipse smacof vegan]; }; FreqProf = derive2 { name="FreqProf"; version="0.0.1"; sha256="1yqn2435l2sghfcv5mma0rv9yqvpa69z8cqqsjlrlbih9gib82d4"; depends=[ggplot2 reshape2 shiny]; }; Fstability = derive2 { name="Fstability"; version="0.1.2"; sha256="0kscdmrs5namvhi112b47c811w0bg9s3xg48mfa566pxwxz1nv45"; depends=[]; }; - FunChisq = derive2 { name="FunChisq"; version="2.4.9.1"; sha256="1yfpd6hccymx4s59d1yyz7c4fd478rxsimdkwkyg8cw12qq93nfl"; depends=[BH Rcpp]; }; + FunChisq = derive2 { name="FunChisq"; version="2.4.9.2"; sha256="1ap8319kfp6kixnj5qyjkxjwr8g5q0wdr10vng6ppjym8p8c6srn"; depends=[BH Rcpp Rdpack]; }; FunCluster = derive2 { name="FunCluster"; version="1.09"; sha256="0i73asn1w4s6ydf2ddn5wpr0mwbbxzgmaly1pslarzkx71wk03fz"; depends=[cluster Hmisc]; }; FuncMap = derive2 { name="FuncMap"; version="1.0.10"; sha256="0iaay6qz9a2s77xjfpp7wm37y7xwnvmlw6s5k5riccmqzc6dcjs7"; depends=[mvbutils]; }; - FunctionalNetworks = derive2 { name="FunctionalNetworks"; version="1.0.0"; sha256="071hjgiccbrf1gxrh7niw2w1p6vgc77qvrildi59xhk53qcwzqdp"; depends=[Biobase breastCancerVDX]; }; - FunnelPlotR = derive2 { name="FunnelPlotR"; version="0.2.2"; sha256="04i6h1s2p5pdm7g5q2ljrd6ix0hr8n47mczh9jf7c4bhap05zxqj"; depends=[dplyr ggplot2 ggrepel rlang scales]; }; + FunnelPlotR = derive2 { name="FunnelPlotR"; version="0.2.3"; sha256="16bw1fx2pzmxm8gavq791drnpsczxq5yyfbnl2h1xcrzlw4fw4b0"; depends=[dplyr ggplot2 ggrepel rlang scales]; }; FusionLearn = derive2 { name="FusionLearn"; version="0.1.1"; sha256="0n8bj7k2r2vf0v2nsw31k75hzkqj5l4hyfnmvid102hx9cl8hv3y"; depends=[]; }; Fuzzy_p_value = derive2 { name="Fuzzy.p.value"; version="1.1"; sha256="13h6armh9g57zqxyjqk6mq81jlfqxqrg2sb5p9rrhslka5m01zis"; depends=[FuzzyNumbers]; }; FuzzyAHP = derive2 { name="FuzzyAHP"; version="0.9.5"; sha256="02sx32vlvnr0fzw8rf0f6hiikqn7xp1ibpqzxhxwv8yij2qkiyci"; depends=[MASS]; }; @@ -1505,20 +1516,19 @@ in with self; { 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]; }; GADGET = derive2 { name="GADGET"; version="0.2.0"; sha256="0z259dahki3ci5jskm2qp5q89bkr0wr74h7yxy057airc2m1cm7z"; depends=[DiceKriging DiceOptim lhs pbapply]; }; - GADMTools = derive2 { name="GADMTools"; version="3.7-2"; sha256="0aabbs35wbcchab32phiaajzf5zgiis3qfv4nr5dc0mf0qjgsc6h"; 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.8-1"; sha256="02rqpvqawk0y8w20d89cbdbjlmpyvvp826gzzdajqba1wazj6ikx"; depends=[classInt dplyr ggmap ggplot2 ggspatial gridExtra jsonlite lattice maptools prettymapr raster RColorBrewer rgdal rgeos rosm sf sp stringr]; }; GAIPE = derive2 { name="GAIPE"; version="1.0"; sha256="04iarbwxrhn48bk329wxis7ifzndi67kpjx6dcakawkh3g2mzsfz"; depends=[]; }; GAMBoost = derive2 { name="GAMBoost"; version="1.2-3"; sha256="0450h9zf12r524lxk1lrv9imvvkk6fmyd3chnxp18nnvys7215pv"; depends=[Matrix]; }; GAMens = derive2 { name="GAMens"; version="1.2.1"; sha256="1z10wxcg277fra2lch464l0kb02lspw9qr1i2wmq11wcz0k9qnl8"; depends=[caTools gam mlbench]; }; GANPA = derive2 { name="GANPA"; version="1.0"; sha256="0ia8djv46jm397nxjrm9yc5gacf1r4z0ckiliz57cbrqwh7z2wpa"; depends=[GANPAdata]; }; GANPAdata = derive2 { name="GANPAdata"; version="1.0"; sha256="0mhdadl7zgsacn59ym42magg3214k1xhabwn78fv7kgccszcgc86"; depends=[]; }; - GAS = derive2 { name="GAS"; version="0.3.0"; sha256="0qyawq0chwj5xvzczn5vsakis9qdvwjdx3xdfjl5k233rk2hs7nk"; depends=[cubature MASS numDeriv Rcpp RcppArmadillo Rsolnp xts zoo]; }; GAabbreviate = derive2 { name="GAabbreviate"; version="1.3"; sha256="0cq6bg3w0ji44rsz1p4j17fk0jg8rafbjixwi3fjdndc3yd874r5"; depends=[GA psych]; }; GAparsimony = derive2 { name="GAparsimony"; version="0.9.4"; sha256="1p1s5q1basy9v3jy1qxpx5g8mzpkwdfarxmmf7s06c6wq0dl9vp8"; depends=[foreach iterators]; }; GB2 = derive2 { name="GB2"; version="2.1"; sha256="06rcck97pdm1rsb02cy0jd9fknv0mz5jwk364gsaahdk56ddk18a"; depends=[cubature hypergeo laeken numDeriv survey]; }; GB2group = derive2 { name="GB2group"; version="0.2.0"; sha256="185am9j88f3qjv0h8ag91x8qrck4qk0a4k0mcg5k56rf2lf7s7zi"; depends=[GB2 ineq minpack_lm numDeriv]; }; GBJ = derive2 { name="GBJ"; version="0.5.3"; sha256="12lsddkcxz37hn2fvjq158wb1bc6b3hx6wj8q8nj21zpmyl3n2qh"; depends=[BH mvtnorm Rcpp SKAT]; }; GCAI_bias = derive2 { name="GCAI.bias"; version="1.0"; sha256="10092mwpmfbcga0n39a0i6g8xxch8xiwg15cckipw6yxjyx0sivc"; depends=[]; }; - GCD = derive2 { name="GCD"; version="4.0.5"; sha256="1hinn8l2kppl0nysx5baz9am0avwdqfnspx2i8wj60w1ns41v5r8"; depends=[]; }; + GCD = derive2 { name="GCD"; version="4.0.6"; sha256="1lc2n9avg1rfh55gbj3q0yd1gvfw60088zg279s7aikx10zv4sx7"; depends=[raster]; }; GCPM = derive2 { name="GCPM"; version="1.2.2"; sha256="0k2ng78bk3bxpj6nz80j5cvjd56zjz328ga68vyyc3hvdjgpspqj"; depends=[Rcpp RcppProgress]; }; GCalcium = derive2 { name="GCalcium"; version="1.0.0"; sha256="0r84qmdsqsgpaqr08imh48mdvy26s2b62hi0hxxwhr9kg7qvj0rd"; depends=[caTools dplyr]; }; GCalignR = derive2 { name="GCalignR"; version="1.0.2"; sha256="1x0as6mmapvn3a28c3qk3wd5gjkx17xgf9c7yb68wp3lj8pknsnm"; depends=[ggplot2 pbapply readr reshape2 stringr]; }; @@ -1526,19 +1536,18 @@ 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.7.8"; sha256="1aj2ssd7vpszl7p22srkkkpx4a7gkc38vrv3bq7j1zr32096y4zj"; depends=[alabama ggplot2 MASS nloptr numDeriv Rcpp RcppArmadillo Rsolnp shiny shinydashboard]; }; + GDINA = derive2 { name="GDINA"; version="2.7.9"; sha256="13pmj069r04h38hg61ibyn1ab15zdy9m0qv60vi25ahgsmg6ccvx"; depends=[alabama ggplot2 MASS nloptr numDeriv Rcpp RcppArmadillo Rsolnp shiny shinydashboard]; }; + GE = derive2 { name="GE"; version="0.0.3"; sha256="1w3sm1rqgkcz2ggq8nch7c8p295y8z430a4lrv1wmhnngg48mvhq"; depends=[CGE data_tree DiagrammeR stringr]; }; GEEaSPU = derive2 { name="GEEaSPU"; version="1.0.2"; sha256="02pwjqd94kranc1f69bx9rzk27kchavhvhl9fygjhrr40nwq3pbg"; depends=[gee Rcpp RcppArmadillo]; }; GEEmediate = derive2 { name="GEEmediate"; version="1.1.3"; sha256="1xprkpjp1pkq4ci1n32d3yy80hx3r4xf2j7f6hv7dvsn4cvdp417"; depends=[gee]; }; GENEAclassify = derive2 { name="GENEAclassify"; version="1.4.18"; sha256="17m58i3jridgxzcckcm0ydd2ijw3zjvg9w4an8j5jbnr62hmcb2s"; depends=[changepoint GENEAread MASS rpart signal]; }; GENEAread = derive2 { name="GENEAread"; version="2.0.8"; sha256="1phiwdq05h92vlrjbvx4xvazzls5bdlnwfxn5mghx0v9j0n3ahrm"; depends=[bitops mmap]; }; GENEAsphere = derive2 { name="GENEAsphere"; version="1.5.1"; sha256="1kgj7i9v2yn0b8lvvsf0nc6lg3i2syrcygwa51pcrzp57vv7hxn5"; depends=[GENEAread ggplot2 MASS misc3d rgl]; }; - GENLIB = derive2 { name="GENLIB"; version="1.0.6"; sha256="0xyq3ggi814vi3x5kxffhi7ygvzcfj3pg0kfi7whcjpi3pjg05h8"; depends=[bootstrap doParallel foreach kinship2 lattice Matrix quadprog Rcpp]; }; GENMETA = derive2 { name="GENMETA"; version="0.1"; sha256="1mxwqnbg5bvx1qg62xcd62dl81k11l64yckhl3v854asnaczq3pp"; depends=[magic MASS Matrix]; }; GEOmap = derive2 { name="GEOmap"; version="2.4-4"; sha256="0wk2v0fwcwcm59k711fg829h2w58wkd36im4mg974iai6mqif7qh"; depends=[fields MBA RPMG splancs]; }; - GERGM = derive2 { name="GERGM"; version="0.13.0"; sha256="1h3fzkgc553bvxhcmvmlgk9sdais186h4gs1qagdihwpwn8ymbjk"; depends=[BH coda ggplot2 igraph matrixcalc plyr Rcpp RcppArmadillo RcppParallel scales slackr stringr vegan]; }; GESE = derive2 { name="GESE"; version="2.0.1"; sha256="0h3s2sbnv5wilr2mj6bnl2892p16pxrs341gg6jql1a540p669sk"; depends=[kinship2]; }; GESTr = derive2 { name="GESTr"; version="0.1"; sha256="1q12l2vcq6bcyybnknrmfbm6rpzcmxgq2vyj33xwhkmm9g2ii9k6"; depends=[gtools mclust]; }; - GET = derive2 { name="GET"; version="0.1-4"; sha256="1zn0jsl77xslf3rkm1py709jhqd3ciyyhiwph6d9ih2nkla9ivak"; depends=[ggplot2 gridExtra gstat plyr sp spatstat]; }; + GET = derive2 { name="GET"; version="0.1-6"; sha256="1di2vc6fgbchws6haz7jn840g1pvvy6xlkgjisjp7n312i5mz1fd"; depends=[ggplot2 gridExtra gstat plyr sp spatstat]; }; GEVStableGarch = derive2 { name="GEVStableGarch"; version="1.1"; sha256="1iypv0k4cbvsdyglgvf7y52sqvl5qcin627pjqwq42kisqynm8d7"; depends=[fExtremes fGarch Rsolnp skewt stabledist timeDate timeSeries]; }; GEVcdn = derive2 { name="GEVcdn"; version="1.1.6"; sha256="09lzhh16r1hsxa23jkq716yf3x9ap6fkkrz3ij2x83rvwznj8hb3"; depends=[VGAM]; }; GEint = derive2 { name="GEint"; version="0.1.5"; sha256="179gpq4qjhgx1fhyjdb80rf2ip80zhhfyn8xjgwq1a425163q1y7"; depends=[bindata geepack mvtnorm nleqslv pracma rje speedglm]; }; @@ -1547,7 +1556,6 @@ in with self; { GFD = derive2 { name="GFD"; version="0.2.6"; sha256="1z98j6nvaa4vrh840q1iy5r0h9ns4xbrk3qfkq51l2kmbrck8r7a"; depends=[magic MASS Matrix plotrix plyr]; }; GFE = derive2 { name="GFE"; version="0.1.0"; sha256="0ywrg23z13kp8ggw4wbm4jvr2rvb6kra7ma0mgfj8xzkrxs6vi6m"; depends=[data_table dplyr TeachingSampling]; }; GFGM_copula = derive2 { name="GFGM.copula"; version="1.0.4"; sha256="0cw8ih9dj86cvks0qcpffzjx8lv6qiwvk3f1wri8zashj8lk9am6"; depends=[cmprsk compound_Cox joint_Cox]; }; - GFORCE = derive2 { name="GFORCE"; version="0.1.4"; sha256="1x7dvzgnqfvyvp6ibdsnrn5q01ivcgkzkh0mv8nfwqg5zr78v2cz"; 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.11-0"; sha256="0r0k48qbmm5fnl6rgpwgd8jc4l8nyjp2f4vv2givdqkmylw22281"; depends=[bitops data_table doParallel foreach GENEAread matlab Rcpp signal tuneR zoo]; }; @@ -1555,15 +1563,15 @@ in with self; { GGMridge = derive2 { name="GGMridge"; version="1.1"; sha256="0zbfvvp7l836m118m8nmdvw1w7xq6d3b7qirskjsq1dkk23j41hs"; depends=[MASS mvtnorm]; }; GGMselect = derive2 { name="GGMselect"; version="0.1-12.4"; sha256="0p9djnkclnk64bcrd66agi2gw2j3bqvqhamfm0h59b810kh50kbn"; depends=[gtools lars mvtnorm]; }; GGUM = derive2 { name="GGUM"; version="0.4"; sha256="1l3kwj207c1660msxs085xrjcydxxb5q9i40m8rl25r2nrsm0yip"; depends=[abind psych Rdpack viridis xlsx]; }; - GGally = derive2 { name="GGally"; version="1.4.0"; sha256="1zjmcc5bzagvy7c5cmdcl39xmx07fwi98yrj4i05w7y40kqcsiws"; depends=[ggplot2 gtable plyr progress RColorBrewer reshape rlang]; }; + GGally = derive2 { name="GGally"; version="1.5.0"; sha256="082s321zspg5al6acigwrhg4fsrmkkk5caabg662qbcy8v6n34h6"; depends=[ggplot2 gtable plyr progress RColorBrewer reshape rlang]; }; GHQp = derive2 { name="GHQp"; version="1.0"; sha256="0qpcpwv7rz67qhz1p5k2im02jvs7l8z9sa6ypz13hig5fzm8j9bp"; depends=[statmod]; }; GHS = derive2 { name="GHS"; version="0.1"; sha256="1khjfy62a67r59s2rax9mmnqy5xnnwhbydzhqwwmyspl48mxycdj"; depends=[MASS]; }; GIFTr = derive2 { name="GIFTr"; version="0.1.0"; sha256="101vr2qasky8hnxp5i3lhlnymwzciypqwvhpl6mrr0r0czgpcz2f"; depends=[glue stringr]; }; GIGrvg = derive2 { name="GIGrvg"; version="0.5"; sha256="0mx4n4kf34343yiww80fw5yy0x624xsj71n8fr4dm0a2338pxq8v"; depends=[]; }; GISTools = derive2 { name="GISTools"; version="0.7-4"; sha256="06alb5d2k4qj344i9cpgm3lz9m68rkmjqfx5k2hzn7z458xjrlxs"; depends=[maptools MASS RColorBrewer rgeos sp]; }; - GJRM = derive2 { name="GJRM"; version="0.2-1"; sha256="12kbd8nd43fi4vwjc9qpjwcndwx9zq19w0adqxivmlvxhflh93mb"; depends=[copula distrEx evd gamlss_dist ggplot2 ismev magic matrixcalc matrixStats mgcv mnormt numDeriv psych Rmpfr scam survey survival trust trustOptim VGAM VineCopula]; }; + GJRM = derive2 { name="GJRM"; version="0.2-2"; sha256="0hwa3nnlk3q810x5gyx9la090vn8fysm9rdv2gg80j8jifzhs48h"; depends=[copula distrEx evd gamlss_dist ggplot2 ismev magic matrixcalc matrixStats mgcv mnormt numDeriv psych Rmpfr scam survey survival trust trustOptim VGAM VineCopula]; }; GK2011 = derive2 { name="GK2011"; version="0.1.3"; sha256="13vafhbgcsj485f12qv962y07v3hil3pla51vkl2b030amzy86jv"; depends=[]; }; - GLDEX = derive2 { name="GLDEX"; version="2.0.0.6"; sha256="0s8nahy2mdmqlp8z5zsa3mvynwikrna8ks6xj6g2v4j64qd19p09"; depends=[cluster]; }; + GLDEX = derive2 { name="GLDEX"; version="2.0.0.7"; sha256="1w5ahwbnz9xsn3rdxzcxxvc6m5cgq46nln3i5v8vp4imrs8aafb3"; depends=[cluster]; }; GLDreg = derive2 { name="GLDreg"; version="1.0.7"; sha256="1wjrr4x1k0fz8nx9idb4ysamldypriiypj96b5v028lx38jwsk3l"; depends=[ddst GLDEX]; }; GLIDE = derive2 { name="GLIDE"; version="1.0.2"; sha256="1z5h8br6aig24g5gsh8h6npm269id3h5gjjyf5avs4v08b51rpcv"; depends=[doParallel foreach MASS]; }; GLMMRR = derive2 { name="GLMMRR"; version="0.2.0"; sha256="0s3jfh720acfmbadilq2c6gql3yifsbijpmw1jkzbsdc87pqi1db"; depends=[lattice lme4]; }; @@ -1579,8 +1587,8 @@ in with self; { GMDHreg = derive2 { name="GMDHreg"; version="0.2.0"; sha256="07qk9jbav9gm3gh3ag7nz273iab5zlkn0yz31zs2hw646ik1yn14"; depends=[]; }; GMKMcharlie = derive2 { name="GMKMcharlie"; version="1.0.3"; sha256="1ncz3czjg1md1hfahc2403k33nby11ldlq0yixpjs4s8panwpgsb"; depends=[Rcpp RcppArmadillo RcppParallel]; }; GMMAT = derive2 { name="GMMAT"; version="1.1.2"; sha256="1xifcm6kv4v3hw4zskggifd16cn1v7cmnwsgwjfbgrgz3qvyac5c"; depends=[CompQuadForm foreach Matrix 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.11"; sha256="1by65202swxcj453q3frac02b2lwny1mm1i95vcjhkqihqkffl2z"; depends=[shiny shinydashboard shinyjs]; }; + GMMBoost = derive2 { name="GMMBoost"; version="1.1.3"; sha256="0p9jnwjc8g83qsxkjz9lhaip1hkpdg6n4fdpz34b96vb7qhzrrqc"; depends=[magic minqa]; }; + GMSE = derive2 { name="GMSE"; version="0.4.0.13"; sha256="0xvdm0q7ghw6hr26134m0g33wfclwf7q9rdrlkkyb6mnzasqdfgs"; depends=[shiny shinydashboard shinyjs]; }; GMSimpute = derive2 { name="GMSimpute"; version="0.0.1.0"; sha256="1hmn5ss81df9j9ibgibs95j98irqzif94vq0c861mq4a65y59fcp"; depends=[ggplot2 glmnet reshape2]; }; GNAR = derive2 { name="GNAR"; version="1.0"; sha256="0iv82f118b54g09dc5ggr2z793dgjhxj22v05kypz5fnbdxcl5qf"; depends=[igraph wordcloud]; }; GNE = derive2 { name="GNE"; version="0.99-3"; sha256="11pk9w4xj27dyfn05bna99xqdb89wp0ljl798d5dyk5fcnhh7217"; depends=[alabama BB nleqslv SQUAREM]; }; @@ -1593,16 +1601,19 @@ in with self; { GPCSIV = derive2 { name="GPCSIV"; version="0.1.0"; sha256="118l792mwd54xsi3g8afg3vc6wds8j6fyaz3mwmq04mlcyblym4l"; depends=[scatterplot3d sqldf]; }; GPFDA = derive2 { name="GPFDA"; version="2.2"; sha256="1xqk03g8b8hi1vdqh6a9wml8ln0ad6lmy14z8k8c4wdc5kbzdr0b"; depends=[fda fda_usc MASS spam]; }; GPGame = derive2 { name="GPGame"; version="1.1.0"; sha256="00qiqd7p84k22wbmlmj8a81fy5m5rl6afhj2q61j0akicnbzjfw9"; depends=[DiceDesign DiceKriging GPareto KrigInv MASS mnormt mvtnorm Rcpp]; }; + GPL2025 = derive2 { name="GPL2025"; version="1.0.1"; sha256="0af42g3v91fbcmla2yq98v8rd4ifaznb1xvw7ny41r3843d8appc"; depends=[dplyr]; }; GPLTR = derive2 { name="GPLTR"; version="1.2"; sha256="0b4s090jlp2qpqqr0b1ifwyf2fal156y7vg9mjkw53y623ms5pix"; depends=[rpart]; }; GPM = derive2 { name="GPM"; version="3.0.1"; sha256="01vd68w5pnwhng83x5i0k9c5fhsn9siyzzndkvkmpis4mjm42sgv"; depends=[doParallel foreach iterators lattice lhs pracma randtoolbox Rcpp RcppArmadillo]; }; 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.4"; sha256="1awacgvss2n9r6s7dydgkg05rj328si830rj97fj900qmlv5gg1p"; depends=[DiceDesign DiceKriging emoa KrigInv ks MASS pbivnorm pso randtoolbox Rcpp rgenoud rgl]; }; + GPareto = derive2 { name="GPareto"; version="1.1.4.1"; sha256="0kmy7v3sm1h91havzla0fzmzihncbk01i7pbzsdq6cwhz7225mqj"; depends=[DiceDesign DiceKriging emoa KrigInv ks MASS pbivnorm pso randtoolbox Rcpp rgenoud rgl]; }; GPfit = derive2 { name="GPfit"; version="1.0-8"; sha256="05mpiyi2vxv0wqp422n1mnxa8msc4daq40cwpnpngbcwqhlgqkby"; depends=[lattice lhs]; }; - GPoM = derive2 { name="GPoM"; version="1.2"; sha256="1hhwdpish8j3j9y5q6r5pdsl1kpbwp1hjhcq24iiz4lfssib4k9f"; depends=[deSolve rgl]; }; + GPoM = derive2 { name="GPoM"; version="1.3"; sha256="1c870dfbpswx78n4s1v6zy0l1qknrs9335af0z01v1miyrmi95gd"; depends=[deSolve float rgl]; }; GPoM_FDLyapu = derive2 { name="GPoM.FDLyapu"; version="1.0"; sha256="1hpgiwh7b50gazp1msjsh2840b91wfrxhl2l45lxg6jr1m34q8pj"; depends=[deSolve GPoM]; }; GPrank = derive2 { name="GPrank"; version="0.1.4"; sha256="06j5fk427jkp5lphqlx48vfp4fagnxxnv4iyjcha8nvkswcblwgy"; depends=[gptk matrixStats RColorBrewer tigreBrowserWriter]; }; GPvam = derive2 { name="GPvam"; version="3.0-5"; sha256="0inhhx5ll4ybkwp71ijigxlyxsa0rdyxb38kgfgxb588dsk4scjz"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; }; + GRANBase = derive2 { name="GRANBase"; version="2.6.20"; sha256="0z9378qimdpxrslib2avimik3xqd41angfg12j8vmcbg7zh3binh"; depends=[covr desc dplyr GRANCore htmlTable jsonlite markdown RCurl sendmailR stringi switchr]; }; + GRANCore = derive2 { name="GRANCore"; version="0.2.7"; sha256="0xnm7jb2s4ag4qvsfs1fq0f2ikvfqm3bvxhj8kmmxwynwl5pw287"; depends=[switchr]; }; GRAPE = derive2 { name="GRAPE"; version="0.1.1"; sha256="1jzvf45ch8x8f2x9kmvv02xz9bix5vplh8143vc4m1yyq42x09c6"; depends=[]; }; GRCdata = derive2 { name="GRCdata"; version="1.0"; sha256="0nshii6kfvffncgcrmm7wvniq94j9djj84jikcb6ck49viikkrky"; depends=[cubature nloptr]; }; GROAN = derive2 { name="GROAN"; version="1.2.0"; sha256="14n3k1wwz5pn82wcj00cdns4bp699f58k1nj8hp8jn0q7xr2sgv5"; depends=[plyr rrBLUP]; }; @@ -1615,7 +1626,7 @@ in with self; { GSAgm = derive2 { name="GSAgm"; version="1.0"; sha256="18bhk67rpss6gg1ncaj0nrz0wbfxv7kvy1cxria083vi60z0vwbb"; depends=[edgeR survival]; }; GSE = derive2 { name="GSE"; version="4.2"; sha256="0vrxn6j5brhwd38zqnr6m3in3hp1xfs1mfhps9qsj20d4w8d1rf9"; depends=[cellWise ggplot2 MASS Rcpp RcppArmadillo robustbase rrcov]; }; GSED = derive2 { name="GSED"; version="2.5"; sha256="0hz7rn0j62gy7bv67dxqpfdq86zv3yqhl9pwafcism94636h8vrj"; depends=[memoise R_utils rootSolve survival]; }; - GSIF = derive2 { name="GSIF"; version="0.5-5"; sha256="104v01yifpagj7kyjfy80c4dgn9wv76py0av90vmgc55qynmvv19"; depends=[aqp dismo gstat plotKML plyr raster rgdal RSAGA scales sp]; }; + GSIF = derive2 { name="GSIF"; version="0.5-5.1"; sha256="1nc177f200m3wfppmdh9cf6g2npx87c0mz2g17zdrw5crx688i8d"; depends=[aqp dismo gstat plotKML plyr raster rgdal RSAGA scales sp]; }; GSM = derive2 { name="GSM"; version="1.3.2"; sha256="04xjs9w4gaszwzxmsr7657ry2ywa9pvpwpczpvinxi8vpj347jbb"; depends=[gtools]; }; GSMX = derive2 { name="GSMX"; version="1.3"; sha256="1n1d7rixj14ari46snsmi48qfmy00ihmzvayk3hkrp2d2d0xi2gh"; depends=[MASS]; }; GSODR = derive2 { name="GSODR"; version="2.0.1"; sha256="0wy2qim636g5rfy046r3qab3r58j3w7ngx57k5gdarbwcjzxw07y"; depends=[countrycode curl data_table future_apply httr R_utils]; }; @@ -1625,21 +1636,21 @@ in with self; { GUIDE = derive2 { name="GUIDE"; version="1.2.7"; sha256="0klaczmn3jnlzyh45yaqlc897irjfk467f4w03awmflaiwan3h6v"; depends=[rpanel tkrplot]; }; GUILDS = derive2 { name="GUILDS"; version="1.3"; sha256="0zl6x0vn93ybps63fqazvd93f2zwdq0rqqrp7d6n5rnamx99mm8d"; depends=[pracma Rcpp]; }; GUIProfiler = derive2 { name="GUIProfiler"; version="2.0.1"; sha256="10m4d7f2rhw6cmkrnw3jh4iqlkfphf4v7mpfwzw17laq0ncmsx5r"; depends=[graph MASS Nozzle_R1 proftools Rgraphviz rstudioapi]; }; - GUIgems = derive2 { name="GUIgems"; version="0.1"; sha256="0lmx8hw0496vk437p32l933cdb4vpi94f4kz58x20jj07c20maz6"; depends=[ggplot2 igraph MASS msm plyr rpanel stringr]; }; GUTS = derive2 { name="GUTS"; version="1.1.1"; sha256="05njlykhxs62k5cjrfwgbqyckbvf2jxjshg3avf6vhwwf58qyjq9"; depends=[Rcpp]; }; GUniFrac = derive2 { name="GUniFrac"; version="1.1"; sha256="1vgij7c9b0afl5wzwcn0pjdvn8gqz2jxk5q0gchd9zk1qd10a1vl"; depends=[ape matrixStats vegan]; }; - GVARX = derive2 { name="GVARX"; version="1.2"; sha256="1syd2266i4v4xmz22g455y63sbk9jdzz7ni0rlhdvhsmn4pb2d53"; depends=[lmtest lubridate sandwich strucchange tsDyn urca vars xts]; }; + GVARX = derive2 { name="GVARX"; version="1.3"; sha256="00iqwkshp1i9338x9khh8hyszad6150qb11jlvky5fm488wcw1y3"; depends=[lmtest lubridate sandwich strucchange tsDyn urca vars xts]; }; GWAF = derive2 { name="GWAF"; version="2.2"; sha256="11lk1dy24y1d0biihy2aypdvlx569lw1pfjs51m54rhgpwzkw6yd"; depends=[coxme geepack lme4]; }; GWASExactHW = derive2 { name="GWASExactHW"; version="1.01"; sha256="19qmk8h7kxmn9kzw0x4xns5p3qqz27xkqq4q6zmh4jzizd0fsl78"; depends=[]; }; GWASbyCluster = derive2 { name="GWASbyCluster"; version="0.1.7"; sha256="0ivlkxbh8m23vbnjfmhk0vfczd5b8lzy9w4gm1m6jpvdm40kn70x"; depends=[Biobase limma rootSolve snpStats]; }; GWASinlps = derive2 { name="GWASinlps"; version="1.2"; sha256="036lv8f58kz6qdwaviyk1q1qsgcj9cimipq1cjrfpn8snkn7s1gh"; depends=[horseshoe mombf speedglm]; }; - GWASinspector = derive2 { name="GWASinspector"; version="1.4.2"; sha256="1xqrvgm2spwkyhrn215j5b2m6lc6hck9zkrmggbyyqakv04w507d"; depends=[data_table futile_logger ggplot2 gridExtra hash ini kableExtra knitr rmarkdown RSQLite]; }; + GWASinspector = derive2 { name="GWASinspector"; version="1.4.6.7"; sha256="18shkl73fjsa324jfriyx8xsspdpixfpkcpgvqszkb511wj4r2sj"; depends=[data_table futile_logger ggplot2 gridExtra hash ini kableExtra knitr rmarkdown RSQLite]; }; GWEX = derive2 { name="GWEX"; version="1.0.2"; sha256="0iykciifbskcrx1qv4874nxli1sq6nbmlfinq4ksir3p93y7ds87"; depends=[abind doParallel EnvStats fGarch foreach lmomco MASS mvtnorm nleqslv Renext]; }; GWG = derive2 { name="GWG"; version="1.0"; sha256="1va0cd229dhhi1lmrkpwapcm96hrdmxilrmba02xnl7ikhisw0my"; depends=[]; }; GWLelast = derive2 { name="GWLelast"; version="1.2.2"; sha256="1nm4w5m4ca6npmpvh9nb0cnrbzlyv95nvvhgs3pqcrw4igagm4hj"; depends=[doParallel foreach geosphere glmnet sp spgwr]; }; GWRM = derive2 { name="GWRM"; version="2.1.0.3"; sha256="16ahlf1pbcpgha50a7ml2c336by50r287kihwshiazshifi5p3n3"; depends=[doParallel foreach]; }; GWSDAT = derive2 { name="GWSDAT"; version="3.0.3"; sha256="10xvnnhqjs2p1r6yzflhkfi4985ljs57k5k8r6g85y2hq46m80p8"; depends=[deldir digest geometry Kendall lattice MASS Matrix officer readxl rhandsontable sf shiny shinycssloaders shinydashboard shinyjs sm sp splancs zoo]; }; GWmodel = derive2 { name="GWmodel"; version="2.1-3"; sha256="1xha645sx73sy35s856qd4hd3y0n682bnrw0ahfzcr4fvzykc6iy"; depends=[FNN maptools Rcpp RcppArmadillo robustbase sp spacetime spatialreg spdep]; }; + GWnnegPCA = derive2 { name="GWnnegPCA"; version="0.0.1"; sha256="1fdlrdsqdg5gi7w3np7qcqdvxzgrvzj5bzqvh0d32ps59n8agsjy"; depends=[GWmodel nsprcomp sf sp]; }; GWsignif = derive2 { name="GWsignif"; version="1.2"; sha256="0bss5s3ijnlckz44p7jj49bn2r8nwqckpzwzcv0vci915q8jfsj2"; depends=[]; }; GaDiFPT = derive2 { name="GaDiFPT"; version="1.0"; sha256="15fnj1w30h0zdj032f3js0bbb1qlyk4b54a4aclykwzicqdgalkg"; depends=[]; }; GameTheory = derive2 { name="GameTheory"; version="2.7"; sha256="0vb7sjia5s58gw9zpkzddps8knxvbrz7fbi3m6digl8bf5vwhxxw"; depends=[combinat gtools ineq kappalab lpSolveAPI]; }; @@ -1647,10 +1658,10 @@ in with self; { GauPro = derive2 { name="GauPro"; version="0.2.2"; sha256="127agnhqbbavcf7sx0zq1c8ldh3w1d1iz5bpd1ixxkyaapmiq4qy"; depends=[lbfgs R6 Rcpp RcppArmadillo]; }; GaussianHMM1d = derive2 { name="GaussianHMM1d"; version="1.0.1"; sha256="1j1cwh0p7czy2l4qf6nymqcp8kkfaki0j2rj8p99nqn2vgc3vcax"; depends=[doParallel foreach]; }; GeDS = derive2 { name="GeDS"; version="0.1.3"; sha256="1ddq4hnyl3m3s4cchccxiqphi742ljcm86zqpa01a5nrjbnr87x6"; depends=[Matrix Rcpp Rmpfr]; }; - GeNetIt = derive2 { name="GeNetIt"; version="0.1-2"; sha256="0frrbakgnng52fvf912rywmcay2ncc01akb6jw9hlixn2qjr0rr1"; depends=[nlme raster rgeos sp spatialEco spdep velox]; }; + GeNetIt = derive2 { name="GeNetIt"; version="0.1-4"; sha256="1z9h3prlf5r7ks0ys4wy0i5i3giaplqmngsqwxllsy70jjb9s90h"; depends=[exactextractr nlme raster rgeos sf sp spdep]; }; GenAlgo = derive2 { name="GenAlgo"; version="2.1.5"; sha256="0d3y9kc2njsbzdngv67d4qrdsnn7nsxph5acc09vmwxpv1cyhxiw"; depends=[ClassDiscovery MASS oompaBase]; }; GenBinomApps = derive2 { name="GenBinomApps"; version="1.0-2"; sha256="1ps1rq8cjlwh658mysdh3xbn5fihanzcwxb38xvg4031vnwv80in"; depends=[]; }; - GenEst = derive2 { name="GenEst"; version="1.4.0.1"; sha256="14scdz77vm5lfzvjqhhczlyyyv1iwqv9i3pssd5f7f7mw6ig16qd"; depends=[corpus DT gsl gtools hellno htmltools lubridate matrixStats mvtnorm Rcpp shiny shinyjs sticky survival]; }; + GenEst = derive2 { name="GenEst"; version="1.4.2"; sha256="0ljw1rlp686j7nkz11pqvmm0swb2ix0pkk5wc0z5hg4xic98vld8"; depends=[corpus DT gsl gtools hellno htmltools htmlwidgets lubridate MASS matrixStats mvtnorm Rcpp shiny shinyjs survival]; }; GenForImp = derive2 { name="GenForImp"; version="1.0"; sha256="1wcvi52fclcm6kknbjh4r9bpkc2rg8nk6cddnf5j8zqbvrwf4k5x"; depends=[mvtnorm sn]; }; GenKern = derive2 { name="GenKern"; version="1.2-60"; sha256="12qmd9ydizl7h178ndn25i4xscjnrssl5k7bifwv94m0wrgj4x6c"; depends=[KernSmooth]; }; GenOrd = derive2 { name="GenOrd"; version="1.4.0"; sha256="17mfrj1fwj8mri1w0bl2pw1rqriidmd67i7gpn9v56g9dzw5rzms"; depends=[MASS Matrix mvtnorm]; }; @@ -1661,51 +1672,52 @@ in with self; { GeneClusterNet = derive2 { name="GeneClusterNet"; version="1.0.1"; sha256="1xi4c041c4m39f9wb5fklgmhi6ng78iwzzqch5xk9hx5blq6zd4m"; depends=[G1DBN igraph MASS]; }; GeneCycle = derive2 { name="GeneCycle"; version="1.1.4"; sha256="0pivwfjz1plfhwz7k2c33k6p0pa1014d80qsrk8ig9yqqqlyhy1z"; depends=[fdrtool longitudinal MASS]; }; GeneF = derive2 { name="GeneF"; version="1.0"; sha256="0bizf47944b2zv9ayxb9rhrqx0ilz2xlvkw7x5vbg7l67y2g2l4d"; depends=[]; }; - GeneNet = derive2 { name="GeneNet"; version="1.2.13"; sha256="0w52apk0nnr8nsskf26ff7ana8xiksr8wqmkjxzwhzgg7fncm61p"; depends=[corpcor fdrtool longitudinal]; }; + GeneNet = derive2 { name="GeneNet"; version="1.2.14"; sha256="0cdhrj15rz0w0pyw3r8mikrzsdh95y5i1c0pa3cn0c2bjnjx3x3n"; depends=[corpcor fdrtool longitudinal]; }; GeneralOaxaca = derive2 { name="GeneralOaxaca"; version="1.0"; sha256="19j5c5xr6mdb6pmih94wbjas4yh0dmsqfggg8clvdxkpwk0h338v"; depends=[boot]; }; GeneralisedCovarianceMeasure = derive2 { name="GeneralisedCovarianceMeasure"; version="0.1.0"; sha256="02s1wbsdp5ma4pnmcsdl5dwm156zx12d3n1ypzkc33lxg21ashzj"; depends=[CVST kernlab mgcv xgboost]; }; GeneralizedHyperbolic = derive2 { name="GeneralizedHyperbolic"; version="0.8-4"; sha256="01gqfvmzfslhxdnigzbl3rd55hk6r0kgd8fm9xjl0kb9vmb735lm"; depends=[DistributionUtils MASS]; }; - GeneralizedUmatrix = derive2 { name="GeneralizedUmatrix"; version="1.1.6"; sha256="1s0bn3y0s541v4wzh7rh82cakxcx3i6aff6x1g9m7jan5q9c1gac"; depends=[ggplot2 Rcpp RcppArmadillo]; }; + GeneralizedUmatrix = derive2 { name="GeneralizedUmatrix"; version="1.1.9"; sha256="02wbs1q9wzzgbfnx8nfc8wiyqim8vznlps3w91hgx7s28biq37n7"; depends=[ggplot2 Rcpp RcppArmadillo]; }; GeneticSubsetter = derive2 { name="GeneticSubsetter"; version="0.8"; sha256="0bd4snv3dwabc7mknmd2rjmffj67xq535x0bycajhd83d1jhjars"; depends=[]; }; GenoScan = derive2 { name="GenoScan"; version="0.1"; sha256="0p98imfvvz7l94kim3pxypyjs2pbxng4a2nagbafbady82ylr2vi"; depends=[data_table MASS Matrix seqminer SKAT]; }; GenomicMating = derive2 { name="GenomicMating"; version="2.0"; sha256="02v1pkarmardf7g8hf2n4jj4cq4707g5lcc7gnwsiyyh7pknd1y6"; depends=[dplyr emoa kohonen LowRankQP magrittr plotly qtl Rcpp RcppArmadillo scatterplot3d SOMbrero]; }; - GenomicTools = derive2 { name="GenomicTools"; version="0.2.8"; sha256="060i014x2d7588vl7k0s66hphk23c1y7svcpv58lwwpal96v5cm0"; depends=[circlize data_table GenomicTools_fileHandler gMWT Rcpp RcppArmadillo snpStats stringr]; }; - GenomicTools_fileHandler = derive2 { name="GenomicTools.fileHandler"; version="0.1.4"; sha256="10g47rbqrnfa47fj2g45m79zrxx56fk2z9abzch91m134xhi8qja"; depends=[data_table snpStats]; }; + GenomicTools = derive2 { name="GenomicTools"; version="0.2.9.7"; sha256="196shxbrcgiwaa7aav2aipsbj1smrkbhinn44aw9qfvz2x9zdz0m"; depends=[circlize data_table GenomicTools_fileHandler gMWT Rcpp RcppArmadillo snpStats stringr]; }; + GenomicTools_fileHandler = derive2 { name="GenomicTools.fileHandler"; version="0.1.5.9"; sha256="09l87wf78bj49cdh7r3x81hn15c4pihxih8l59xxrpgdhp69268c"; depends=[data_table snpStats]; }; GeoBoxplot = derive2 { name="GeoBoxplot"; version="1.0"; sha256="164dh49ac3fx38fdglv32lmz92ca8jdd98cbhz6mxsk8r0jcladw"; depends=[]; }; GeoDE = derive2 { name="GeoDE"; version="1.0"; sha256="0wawkzj0344pprm8g884d7by8v74iw96b109rgm7anal48fl30im"; depends=[MASS Matrix]; }; GeoLight = derive2 { name="GeoLight"; version="2.0.0"; sha256="1i49hyj3f5rcw0s6j2csnfwc6mnp5zn44vxjnk05wdkpw6dpvx5i"; depends=[changepoint fields maps MASS]; }; GeoMongo = derive2 { name="GeoMongo"; version="1.0.1"; sha256="19wim724sgmxx9rd5yvmqdml0hppb92b8qvpl5zqrlnzxzm0ih5x"; depends=[data_table geojsonR R6 reticulate]; }; GeoRange = derive2 { name="GeoRange"; version="0.1.0"; sha256="0krj9570wkhdvpaqkq3nf0maglqd44mpwn4v1bymvgpk1i1wf5p3"; depends=[moments proj4 raster sp velociraptr]; }; - GeoTcgaData = derive2 { name="GeoTcgaData"; version="0.2.2"; sha256="0ac0wmd9vbridc7ngwyjgzj2n6wd784rv1dqfyxqjx82g2kxmgqh"; depends=[data_table]; }; + GeoTcgaData = derive2 { name="GeoTcgaData"; version="0.2.3"; sha256="0w53ng7q04wxc5ij1svck26liyy82z7vm8y0r19k9cjca0wjxi97"; depends=[data_table]; }; GeomComb = derive2 { name="GeomComb"; version="1.0"; sha256="05xb6m2ciszxd13yhqdkildh9nsq19ss8885ngj6ynvbchqkii7r"; depends=[forecast ForecastCombinations ggplot2 Matrix mtsdi psych]; }; - GerminaR = derive2 { name="GerminaR"; version="1.3"; sha256="1q52rp0xvs2mmc4mr7dx1zq78xags5j7kdgj8h05m8qh8dfhzvqf"; depends=[agricolae assertthat dplyr DT ggplot2 gsheet gtools magrittr readxl shiny shinydashboard tibble tidyr]; }; + GerminaR = derive2 { name="GerminaR"; version="1.4.2"; sha256="1sppkh42yj5p9kwlpiq3l1v720idbc9ni82m1hbdf9bg49h1gf3i"; depends=[agricolae assertthat dplyr DT ggplot2 gsheet gtools magrittr purrr readxl shiny shinydashboard tibble tidyr]; }; GetBCBData = derive2 { name="GetBCBData"; version="0.5"; sha256="1i5b5sawa8ngjp1afm1grm9hbmkhd5pcwqagkamlihsrmsvcdffn"; depends=[curl dplyr furrr future jsonlite lubridate memoise purrr RCurl readr stringr]; }; GetDFPData = derive2 { name="GetDFPData"; version="1.5.2"; sha256="1xa1dy1lm4v2lch3qmfa990bx8r1qzch7jkpnydlnzmd0qmcbvb4"; depends=[curl dplyr lubridate readr reshape2 stringr tibble xlsx XML]; }; GetHFData = derive2 { name="GetHFData"; version="1.7"; sha256="05xmr880n6arvpn6lb51yn9qssc8594rsxp6cinshk2jh6hq4fnj"; depends=[curl dplyr lubridate RCurl readr stringr]; }; - GetLattesData = derive2 { name="GetLattesData"; version="1.3.1"; sha256="1rq89110qgfi9v47pqahrzzcmh26r1724sgb8bbccsrydfscf994"; depends=[curl dplyr readr stringdist stringr XML]; }; + GetLattesData = derive2 { name="GetLattesData"; version="1.4"; sha256="129hnhmw8aw81whyj3g7npwgmg4fmvsji9h2xfg78nrp0abjxijv"; depends=[curl dplyr readr stringdist stringr XML]; }; GetQuandlData = derive2 { name="GetQuandlData"; version="0.1.0"; sha256="1g1as4m853ab1wp57rzqm0552g0vm7kxzypibv0xywc85084pnmc"; depends=[dplyr jsonlite memoise purrr readr scales stringr]; }; GetR = derive2 { name="GetR"; version="0.1"; sha256="1b2wirhz4nhvmf863czwb8z8b42ilsyjjrg9rc4nd9b7nz50bmjg"; depends=[party]; }; GetTDData = derive2 { name="GetTDData"; version="1.4.2"; sha256="1qz75hq1c89riq0jpzjkr9gbk5y7894kb0ydhdyji7kjl1kvgyvx"; depends=[bizdays curl RCurl readxl rvest stringi stringr tidyr XML xml2]; }; GetoptLong = derive2 { name="GetoptLong"; version="0.1.8"; sha256="1l8xkvyl152bsyvxazsvx2sm1vkygn75x0lsg3sbg7xp6drdn3kc"; depends=[GlobalOptions rjson]; }; Ghat = derive2 { name="Ghat"; version="0.1.0"; sha256="1w5agphnbngc0ldb3gbgh4b8ww956lf31bfyxw2zp56crx4akcxf"; depends=[rrBLUP]; }; + Ghost = derive2 { name="Ghost"; version="0.1.0"; sha256="0anrb1n3f3jnq2p0dgqzw5a0gby2slafv2bybgy5gm3f9fsj831w"; depends=[R6]; }; 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]; }; GibbsACOV = derive2 { name="GibbsACOV"; version="1.1"; sha256="1ikcdsf72sn1zgk527zmxw3zjhx0yvkal6dv001cgkv202842kll"; depends=[MASS]; }; Gifi = derive2 { name="Gifi"; version="0.3-9"; sha256="0rwyj60cldf3k118cnc5px16dc5p5bfxgl0w2m1lh6rsqlmza25a"; depends=[colorspace]; }; GillespieSSA = derive2 { name="GillespieSSA"; version="0.6.1"; sha256="0li0jqnbl9rfj8gbspq7fv327fii53rh93ffsxpic7804rmrnbi7"; depends=[]; }; - GillespieSSA2 = derive2 { name="GillespieSSA2"; version="0.2.5"; sha256="1mswjy9fvrgn5353w1mnkmbr98bn1jdinsyc50ygy42z7sd4ijp2"; depends=[assertthat dplyr dynutils Matrix purrr Rcpp RcppXPtrUtils readr rlang stringr tidyr]; }; + GillespieSSA2 = derive2 { name="GillespieSSA2"; version="0.2.6.1"; sha256="0nm9mdy537d2kza7x4bl6mvawgqpna4cva1xa0n9pcw70cc319nx"; depends=[assertthat dplyr dynutils Matrix purrr Rcpp RcppXPtrUtils readr rlang stringr tidyr]; }; GiniDistance = derive2 { name="GiniDistance"; version="0.1.0"; sha256="0jq1dwpsvh3k25lawvzf9ij72jsspzyqsbnrphz8aqwi1dkm3851"; depends=[energy randomForest Rcpp RcppArmadillo readxl]; }; GiniWegNeg = derive2 { name="GiniWegNeg"; version="1.0.1"; sha256="1wqwjalsyp55si839cil6na3khigm0mwn6qkg0kjylq10pabfk2a"; depends=[]; }; - GlmSimulatoR = derive2 { name="GlmSimulatoR"; version="0.2"; sha256="1bbxn8y17dk0n497fvfjl84ssn5qnp5kxlmqzzhzs264vvxfbz0l"; depends=[assertthat cplm dplyr ggplot2 magrittr MASS purrr rlang statmod stringr tweedie]; }; + GlmSimulatoR = derive2 { name="GlmSimulatoR"; version="0.2.1"; sha256="04zgjfzi1cbg7p0dv7f499yv9jf66w620kzrvxbx3yb6h5by6xz2"; depends=[assertthat cplm dplyr ggplot2 magrittr MASS purrr rlang statmod stringr tweedie]; }; GlobalDeviance = derive2 { name="GlobalDeviance"; version="0.4"; sha256="0s318arq2kmn8fh0rd5hd1h9wmadr9q8yw8ramsjzvdc41bxqq1a"; depends=[snowfall]; }; GlobalFit = derive2 { name="GlobalFit"; version="1.2"; sha256="01s51nxcsl8xxn6khbv5jsvpwblwf0iamvr477a1rraqqqj94zx0"; depends=[sybil]; }; GlobalOptions = derive2 { name="GlobalOptions"; version="0.1.1"; sha256="0x89hfz80avq4zcskxl71i4zi0mgniqqxfrvz050aa2189wfyja2"; depends=[]; }; - GmAMisc = derive2 { name="GmAMisc"; version="1.0.0"; sha256="14rs13y509hijg4ars3j55fm0133487alm8b9jlffbz8qiln48g4"; depends=[caTools classInt cluster coin corrplot DescTools dismo ggplot2 ggrepel gridExtra Hmisc InPosition kimisc lsr maptools plyr pROC raster RcmdrMisc rgdal rgeos rworldmap shape sp spatialEco spatstat]; }; - Gmedian = derive2 { name="Gmedian"; version="1.2.4"; sha256="0lr1hwprqy9mq5qyp83qqxj8dh5sy487xkqbv2y1qdinzj62pvcn"; depends=[Rcpp RcppArmadillo robustbase RSpectra]; }; - Gmisc = derive2 { name="Gmisc"; version="1.9.1"; sha256="1gskaaimiq65pl5h4h8cp1cp4klniw7qz80z8zlc5nrkzph8s1md"; depends=[abind checkmate forestplot Hmisc htmlTable knitr lattice magrittr Rcpp rmarkdown stringr XML]; }; + GmAMisc = derive2 { name="GmAMisc"; version="1.1.1"; sha256="0bvf5p779g8nn0wmna61jyns7wdjl0b0283r8b7m0s325mh6ckfv"; depends=[caTools classInt cluster coin corrplot DescTools dismo ggplot2 ggrepel gridExtra Hmisc InPosition kimisc lsr maptools plyr pROC raster RcmdrMisc rgdal rgeos sp spatstat]; }; + Gmedian = derive2 { name="Gmedian"; version="1.2.5"; sha256="0xx8x4g6wb9djmkx3q1bwwa1vgf10avi6ka3x1jzgsxk6x0jsx0i"; depends=[Rcpp RcppArmadillo robustbase RSpectra]; }; + Gmisc = derive2 { name="Gmisc"; version="1.9.2"; sha256="08wkdaf2dyji7vkc0w4ay0f2pkll3psc1ap4rn7pdvfz2wlgs7c9"; depends=[abind checkmate forestplot Hmisc htmlTable knitr lattice magrittr Rcpp rmarkdown stringr XML]; }; GoFKernel = derive2 { name="GoFKernel"; version="2.1-1"; sha256="0xygsdmggl35fafyp431mkwalwixw2r3f32qll1pf72dfwd8y8d3"; depends=[KernSmooth]; }; - GofKmt = derive2 { name="GofKmt"; version="2.0"; sha256="0018ljzlj7nkf12g0sqa8iyq3j2bnj9la3fwblx9lbdn8nxgllhn"; depends=[Rsolnp]; }; - GoodmanKruskal = derive2 { name="GoodmanKruskal"; version="0.0.2"; sha256="1qwarachkhc2yvjyxfcfbgjc1x9ni5xb7f93zviv8mz3c35bhs3b"; depends=[classInt corrplot]; }; + GofKmt = derive2 { name="GofKmt"; version="2.1.1"; sha256="11dspnx1cljbbwk4xhg1l5vv2c8q24k294c122rdgc2zqp8k2c04"; depends=[ggplot2 Rcpp RcppArmadillo Rsolnp]; }; + GoodmanKruskal = derive2 { name="GoodmanKruskal"; version="0.0.3"; sha256="1d0xkmkcfcwx0qs8m4b9dgrbkg1qpb859mmzg4d1rww8rc0wxh9h"; depends=[classInt corrplot]; }; GoogleKnowledgeGraphR = derive2 { name="GoogleKnowledgeGraphR"; version="0.1.0"; sha256="1jxiq1s48skn43pydsw8s67hf70v9fhhw2drcx9vni3c3szs44qd"; depends=[curl jsonlite]; }; GpGp = derive2 { name="GpGp"; version="0.2.1"; sha256="0sa2xfharyy21mfcxl7hzgmaq3x8iz834mbbcfkqm5qf689i08yj"; depends=[FNN Rcpp RcppArmadillo]; }; Grace = derive2 { name="Grace"; version="0.5.3"; sha256="0r41zvgdd5rqm15axqqssik6plwy7snpgw8m32labkfn3f0pp7n0"; depends=[glmnet MASS scalreg]; }; @@ -1717,7 +1729,8 @@ in with self; { GreedyExperimentalDesign = derive2 { name="GreedyExperimentalDesign"; version="1.2"; sha256="1x3hnyqq75krlygg82qm0ldd8nsv071nzgr63zkjmifc7hgi0nvb"; depends=[GreedyExperimentalDesignJARs rJava]; }; GreedyExperimentalDesignJARs = derive2 { name="GreedyExperimentalDesignJARs"; version="1.0"; sha256="14i6m5qlh1fca9xmzid01hicd3bkf6rzl139ss78gvw544zrapw7"; depends=[rJava]; }; GreedySBTM = derive2 { name="GreedySBTM"; version="1.0"; sha256="1r29cd8nxpyc82rz2xb9mk9wc17gcdlcl9lw1j3y4npr2z0qhf13"; depends=[Rcpp RcppArmadillo]; }; - Greg = derive2 { name="Greg"; version="1.3.2"; sha256="0df91kzhvcj85baz1z3kfih2kv2yvi8is4adpl4kx6nwfd2d3q82"; depends=[Epi forestplot Gmisc Hmisc htmlTable knitr magrittr nlme rms sandwich stringr]; }; + Greg = derive2 { name="Greg"; version="1.3.3"; sha256="1909lpsax1dwblrq0ab52vwz8iik9h8p5w2nmlsrwfwyv8018yha"; depends=[Epi forestplot Gmisc Hmisc htmlTable knitr magrittr nlme rms sandwich stringr]; }; + GridOnClusters = derive2 { name="GridOnClusters"; version="0.0.7"; sha256="009h5yx81by6jscvibkxb2j5xi4wqarcrw0504yxdnmgi8w3khmr"; depends=[cluster dqrng fossil Rcpp]; }; GriegSmith = derive2 { name="GriegSmith"; version="1.0"; sha256="1a7gnaig1wvxpph7d8c37kx51dznzk0457fzf7alw95iwpyb4z7j"; depends=[spatstat]; }; GrimR = derive2 { name="GrimR"; version="0.5"; sha256="005ywc31yn1cs54kjlkrryw0s7zm8dqqfjkdlkm4s1sbc9r3mssz"; depends=[car]; }; GroupComparisons = derive2 { name="GroupComparisons"; version="0.1.0"; sha256="0fxgh1mksrfmd4yjrpxg3nfby5wyx75lj0shb5xrdzl7pxzh56ai"; depends=[car]; }; @@ -1726,7 +1739,7 @@ in with self; { GrpString = derive2 { name="GrpString"; version="0.3.2"; sha256="14ss6assqk6s9kv4bvzlydm8qrbnslm4vj876q5dn2dw4k50dai1"; depends=[cluster plyr Rcpp]; }; GsymPoint = derive2 { name="GsymPoint"; version="1.1.1"; sha256="1fg8vqd86kcpciphmlcxlm0rk01iza7md5y8kcxp9i732n4zn7r8"; depends=[ROCR Rsolnp truncnorm]; }; GuardianR = derive2 { name="GuardianR"; version="0.9"; sha256="0z0bgm3kr7yqx0yfzhs07k1gs97zpjajfnxn1w1m5w76s7czfzl7"; depends=[RCurl RJSONIO]; }; - Guerry = derive2 { name="Guerry"; version="1.6-1"; sha256="1hpp49w2kd1npsd709cwg125pw6mrqxfv2nn3lcs1mg2r49ki2bl"; depends=[]; }; + Guerry = derive2 { name="Guerry"; version="1.7.0"; sha256="0r92xs1ps48yznc146gqmdvz47zvlqfb14yz2ys8bjlk0wna9agv"; depends=[sp]; }; GuessCompx = derive2 { name="GuessCompx"; version="1.0.3"; sha256="1xbkh1wh2z0n964w8lwi7q4rr7mls0awf5k7n5jjklhq4b6gswic"; depends=[boot dplyr ggplot2 lubridate reshape2]; }; GxM = derive2 { name="GxM"; version="1.1"; sha256="02rv8qb46ylk22iqn9cgh63vkyrg9a8nr1d0d3j5hqhi0wyhc41r"; depends=[minqa nlme Rcpp]; }; HAC = derive2 { name="HAC"; version="1.0-6"; sha256="1cdh3s8nm17mfjj0zdxzhlmakcd0m12xfjx0b4gyx24xkahklr8i"; depends=[copula numDeriv]; }; @@ -1744,6 +1757,7 @@ in with self; { HCTR = derive2 { name="HCTR"; version="0.1.1"; sha256="1hg8mpallwxpmamk6q8x87w5hlqqwvbahfw5zmr9pisiagbwcsay"; depends=[glmnet harmonicmeanp MASS ncvreg Rdpack]; }; HCmodelSets = derive2 { name="HCmodelSets"; version="1.1"; sha256="1krcwx6s4fh8ngx81lmdzd12i8k2yczvc4iv9k718xnaji1b8mkd"; depends=[ggplot2 mvtnorm survival]; }; HDCI = derive2 { name="HDCI"; version="1.0-2"; sha256="0wxbv54kbygymhh4r7052vnbj603c1kya01ykvmqzzkjyyfzidkz"; depends=[doParallel foreach glmnet iterators lattice Matrix mvtnorm slam]; }; + HDCurves = derive2 { name="HDCurves"; version="0.1.0"; sha256="1ifcbwcqgdxicqxcqrsl9kp3zadxhijpwff8ln309378vybr3gh1"; depends=[]; }; HDDesign = derive2 { name="HDDesign"; version="1.1"; sha256="1jim4h9bwn8r637va7m81kwwsfwyzs9pzn5a9i7c8xz8b1x191bj"; depends=[]; }; HDGLM = derive2 { name="HDGLM"; version="0.1"; sha256="0a5lnh3780lsczj8339sp97c5y64a2gsdf77i56fvpxpphq0dnf8"; depends=[]; }; HDInterval = derive2 { name="HDInterval"; version="0.2.0"; sha256="1y51q0dwav3x7c0vp571v89vq1a5mivsxsyahqrv1la12zw0m7il"; depends=[]; }; @@ -1753,14 +1767,14 @@ in with self; { HDclassif = derive2 { name="HDclassif"; version="2.2.0"; sha256="1l5zxhayhzh7q50ycl481hy0br66ylxyvzw1ahmjjrdkm8s3czyj"; depends=[MASS rARPACK]; }; HDclust = derive2 { name="HDclust"; version="1.0.3"; sha256="18l4qp261gj3kscfxs3s03kmb9y5ml31vnpgpm1iy125bks4mr2y"; depends=[Rcpp RcppProgress Rtsne]; }; HDcpDetect = derive2 { name="HDcpDetect"; version="0.1.0"; sha256="0ai35d9df5pmva52sb1rr20f11h0mbal6d179g865b7w6n90kfr1"; depends=[]; }; - HDoutliers = derive2 { name="HDoutliers"; version="1.0"; sha256="0pby640bad0jcf1lkwg2g6flassb1pimnjm411c6x8rgvmiphc23"; depends=[FactoMineR FNN mclust]; }; + HDoutliers = derive2 { name="HDoutliers"; version="1.0.1"; sha256="1h41x13lkvzxs6lswzdwc4zs1z8flrf1qq8cr16xjf1azqk00ac2"; depends=[FactoMineR FNN mclust]; }; HDtest = derive2 { name="HDtest"; version="2.1"; sha256="1c9x4s59762sp7drbm5h1xv22kpifq7p0x3dkrfcd0ficbbma5v8"; depends=[checkmate clime doParallel expm fastclime foreach MASS mvtnorm]; }; HDtweedie = derive2 { name="HDtweedie"; version="1.1"; sha256="14awd7sws0464f68f5xwnv1xvr0xflvx2z2zzcfj1csvk3af0zzj"; depends=[]; }; - HEMDAG = derive2 { name="HEMDAG"; version="2.6.0"; sha256="0mrxwm1a1axdm80by9xx0m3fla2v6sigcfiq3p9j7zg2myhk1bn9"; depends=[doParallel foreach graph plyr precrec preprocessCore RBGL]; }; + HEMDAG = derive2 { name="HEMDAG"; version="2.6.1"; sha256="138byk1vzkw9g58ml3vf2ivj0bdanj8klqv0y8s7af3s5swlis18"; depends=[doParallel foreach graph plyr precrec preprocessCore RBGL]; }; HETOP = derive2 { name="HETOP"; version="0.2-6"; sha256="1fjwyqh7l296pghmc4m81q8icgbhvqvxr61zd638fr46gls3ky2p"; depends=[R2jags]; }; HGNChelper = derive2 { name="HGNChelper"; version="0.8.1"; sha256="0qwkk5658j4j6w2wgvxkp38cyvscjp93d3zc7gb97vcihqx0ngxa"; depends=[]; }; HGSL = derive2 { name="HGSL"; version="1.0.0"; sha256="1p453xr3d1bmqc6mrmzb0hz9p0gp25m6v6qr0l3bapcf71vzbvq1"; depends=[]; }; - HH = derive2 { name="HH"; version="3.1-39"; sha256="0qhprqspks2zjxa82cicsr7nqhpaasklsc4apxkmqfyr5dva0q10"; depends=[abind colorspace gridExtra Hmisc lattice latticeExtra leaps multcomp RColorBrewer reshape2 Rmpfr shiny vcd]; }; + HH = derive2 { name="HH"; version="3.1-40"; sha256="18m8sj1s1v94a2nvrbii96ji0j9v3jajqyv9wrky72m903cj8nbr"; depends=[abind colorspace gridExtra Hmisc lattice latticeExtra leaps multcomp RColorBrewer reshape2 Rmpfr shiny vcd]; }; HHG = derive2 { name="HHG"; version="2.3.2"; sha256="159bs5cxdm770h66fam48451n9krpw2fn5gr397h730x2w7l41ki"; depends=[Rcpp]; }; HI = derive2 { name="HI"; version="0.4"; sha256="0i7y4zcdr6wcjy43lz9h8glzpdv0pz7livr95xb1j4p8zafykday"; depends=[]; }; HIMA = derive2 { name="HIMA"; version="1.0.7"; sha256="0mvphwmm8gmin933bji2l2gbpjzm42vyc7sdka4xpjfsaal9pp9i"; depends=[doParallel foreach iterators ncvreg]; }; @@ -1769,9 +1783,9 @@ in with self; { HK80 = derive2 { name="HK80"; version="0.0.2"; sha256="0c8scpzl5xgqm9rlsvh5nl3bz42i5pzvb873j9bn3bi15gcknbny"; depends=[]; }; HKprocess = derive2 { name="HKprocess"; version="0.0-2"; sha256="1j2yhb7k8zf4nlzdf0p6x9ca7ak4lwwak8mcc60kpilw2fws27k5"; depends=[gtools MCMCpack]; }; HLMdiag = derive2 { name="HLMdiag"; version="0.3.1"; sha256="02pgvfyj3xpy7laxryqivsws8jl3m79fwfzpqj8ad794a06gh87g"; depends=[ggplot2 MASS Matrix mgcv plyr Rcpp RcppArmadillo reshape2 RLRsim]; }; - HLSM = derive2 { name="HLSM"; version="0.8.1"; sha256="17y8xv5h6n0z99a858399wwskqcp897q157rl7b838rqip37xlh9"; depends=[coda igraph MASS]; }; + HLSM = derive2 { name="HLSM"; version="0.8.2"; sha256="1jqfk5mlx603s3v069dab7wm0wy8qil50rw1s5x6f21xrahaqks2"; depends=[abind coda igraph MASS]; }; HMB = derive2 { name="HMB"; version="1.0"; sha256="1a4h2d82hglv13q9mq98i67k1x9mkaf4bm2hr9dl3z0q6x0piwqr"; depends=[Rcpp RcppArmadillo]; }; - HMDHFDplus = derive2 { name="HMDHFDplus"; version="1.9.1"; sha256="0gqaagzzspw3a40dqsqhxhjb8kii6xsc62p9b464rkhrwrm5i4z8"; depends=[httr RCurl XML]; }; + HMDHFDplus = derive2 { name="HMDHFDplus"; version="1.9.13"; sha256="1n507nsqz1blikci56jhp48rdpq38dnadh8warc2jmvwizl22a3b"; depends=[httr RCurl XML]; }; HMM = derive2 { name="HMM"; version="1.0"; sha256="0z0hcqfixx1l2a6d3lpy5hmh0n4gjgs0jnck441akpp3vh37glzw"; depends=[]; }; HMMCont = derive2 { name="HMMCont"; version="1.0"; sha256="1drni4f72x83sprn65wnhw0pv1q8lfkgmxdr9h4rwv1accril85x"; depends=[]; }; HMMEsolver = derive2 { name="HMMEsolver"; version="0.1.2"; sha256="0msin7rq3npz221mvrw3zcs6bwz439six99iblx5p3hkp1n1ljf3"; depends=[Rcpp RcppArmadillo Rdpack]; }; @@ -1784,11 +1798,10 @@ in with self; { HMR = derive2 { name="HMR"; version="1.0.0"; sha256="128q3d8r3z9gwnhqszwj8z0kf4la7szkwd11a6x0yhglmyrs1905"; depends=[]; }; HMVD = derive2 { name="HMVD"; version="1.0"; sha256="0agzvsl2n3zg3i519b93jqpiq9zix0bbrjdzk3ymsbb42dzkmj0d"; depends=[MASS]; }; HPbayes = derive2 { name="HPbayes"; version="0.1"; sha256="1kpqnv7ymf95sgb0ik7npc4qfkzc1zb483vwnjpba4f42jhf508y"; depends=[boot corpcor MASS mvtnorm numDeriv]; }; - HRM = derive2 { name="HRM"; version="1.0.2"; sha256="0krd27raa2ys2gsgqpbxpfnmigj8s6mk3al7fh3czx5l0d73iqy1"; depends=[data_table doBy ggplot2 MASS matrixcalc mvtnorm plyr pseudorank Rcpp reshape2 xtable]; }; + HRM = derive2 { name="HRM"; version="1.2.1"; sha256="0qsxwi0v61k1waw21nrz86jazd5wgq2drhan3w8pmb35q2z20s35"; depends=[data_table doBy ggplot2 MASS matrixcalc mvtnorm plyr pseudorank Rcpp reshape2 xtable]; }; HRQoL = derive2 { name="HRQoL"; version="1.0"; sha256="1gr9rhr8gdnh7bw2v3r0xc3yhmzrx2gzgsd8wd5mmsp81ph0h5lz"; depends=[car fmsb Matrix matrixcalc numDeriv RColorBrewer rootSolve]; }; HRW = derive2 { name="HRW"; version="1.0-3"; sha256="12y43sl30949jc9ab10ipx8k4rvb9g8gwaazi8j3k1grh26ivpii"; depends=[KernSmooth]; }; HS = derive2 { name="HS"; version="1.1"; sha256="1vhbchc446j49jj7jgmy4l59n8ahk5l8jp1rl5xwsmn9iqir62mp"; depends=[data_table ggplot2 ggpubr partitions reshape2 tidyr zoo]; }; - HSAR = derive2 { name="HSAR"; version="0.4.2"; sha256="0rxb2klmyynr8rzq6ka8p40lw81wjd0jkw2wg3vg90zny0zps98j"; depends=[Rcpp RcppArmadillo spdep]; }; HSAUR = derive2 { name="HSAUR"; version="1.3-9"; sha256="0b2hyn59lr2pma87fcj7mli3qmrbnfhgd8fv02fa317rj52399qz"; depends=[]; }; HSAUR2 = derive2 { name="HSAUR2"; version="1.1-17"; sha256="0jc554lz5lj7180vd4rbrjkywar4bh38c7i9kyxhd5clg4afxpw8"; depends=[]; }; HSAUR3 = derive2 { name="HSAUR3"; version="1.0-9"; sha256="1rpvblak0xvkavbvbd35zq1lcsl5z1zp30vn70wqbkdj7szhj9b4"; depends=[]; }; @@ -1801,11 +1814,12 @@ in with self; { HTSCluster = derive2 { name="HTSCluster"; version="2.0.8"; sha256="0wnbfh6hdx8692jilgmv8sys1zm6fqc6mim7vvjhyqlmpm8gm0kg"; depends=[capushe edgeR plotrix]; }; HTSSIP = derive2 { name="HTSSIP"; version="1.4.1"; sha256="1j2f6f3i4di4bvsk44gxz0narg45ld2rahfn23wpgni5bszy0vb3"; depends=[ape coenocliner DESeq2 dplyr ggplot2 igraph lazyeval magrittr phyloseq plyr stringr tidyr vegan]; }; HUM = derive2 { name="HUM"; version="1.0"; sha256="1bq74l88jvscmq9ihv5wn06w2wng073ybvqb2bdx2dmiqlpv6jw2"; depends=[gtools Rcpp rgl]; }; + HURDAT = derive2 { name="HURDAT"; version="0.2.3.1"; sha256="0k80bll26wxn902m7p7va7f9xk5kbwkf538jvdw8qdlz5a77a2aa"; depends=[dplyr purrr readr rlang rvest tidyr xml2]; }; HW_pval = derive2 { name="HW.pval"; version="1.0"; sha256="14nmyqw2d9cmn64789yc54fmiqanh6n1dizp7vj94h7b0jwq63yy"; depends=[]; }; HWEBayes = derive2 { name="HWEBayes"; version="1.4"; sha256="1rbffx6pn031a278ps9aqxcaq8yi73s5kf60za143ysbfxv9dphw"; depends=[MCMCpack mvtnorm]; }; HWEintrinsic = derive2 { name="HWEintrinsic"; version="1.2.2"; sha256="035r5bi7m66g351cmrfmf4cj5qqm4fn5pgy3lzsp3gyp2dv0rkg5"; depends=[]; }; HYRISK = derive2 { name="HYRISK"; version="1.2"; sha256="1ngwwzv1pavmscpca3ryzfxzd9rppsh0sm7k4sp2kzc9c0bix4xp"; depends=[kerdiest pbapply reliaR rgenoud sets triangle]; }; - HaDeX = derive2 { name="HaDeX"; version="1.0"; sha256="14f4ql685wrhsmg9yklbfky7b3vsxm4dyiqmpmrl7199kqzinjc0"; depends=[data_table dplyr DT ggplot2 gsubfn latex2exp readr readxl reshape2 shiny stringr tidyr]; }; + HaDeX = derive2 { name="HaDeX"; version="1.1"; sha256="1c87bj4qiq28a51l90r5rhk9nzn8lgssby686fsin0d3y068krbg"; depends=[data_table dplyr DT ggplot2 gsubfn latex2exp readr readxl reshape2 shiny stringr tidyr]; }; HadoopStreaming = derive2 { name="HadoopStreaming"; version="0.2"; sha256="1l9msaizjvnsj1jrpghj4g057qifdgg6vbqhfxhn1fiqdqi2056q"; depends=[getopt]; }; HandTill2001 = derive2 { name="HandTill2001"; version="1.0.0"; sha256="0qxaxwizx24gm3iycdmwdn8mqvnwnjhacsp9nwl9w4djayb5a9sg"; depends=[]; }; Hapi = derive2 { name="Hapi"; version="0.0.3"; sha256="0jqjhfq38k161kqff5cx0vxpsmjm2y5ca7049mvqiwqwvi4fp08m"; depends=[ggplot2 HMM]; }; @@ -1815,11 +1829,11 @@ in with self; { HarmonicRegression = derive2 { name="HarmonicRegression"; version="1.0"; sha256="0inz3l610wl0ibqjyrhfbmwmcfzcmcfhixai4lpkbfsyx93z2i4d"; depends=[]; }; Harvest_Tree = derive2 { name="Harvest.Tree"; version="1.1"; sha256="021zmppy7p2iakaxirfjdb5jzakg1ijma9d25ly2ni0nx0p1mh6z"; depends=[rpart]; }; HellCor = derive2 { name="HellCor"; version="1.2"; sha256="1k7k8gj70wc31w27gykiy0fv2bs9q73414ma0hn3ziqg4cnrgl7m"; depends=[energy]; }; - HelpersMG = derive2 { name="HelpersMG"; version="3.9"; sha256="01az2cwz2vw1z3qjmwi8va4qp37fxy955sjdlk2jbk0cysf3p20q"; depends=[coda lme4]; }; + HelpersMG = derive2 { name="HelpersMG"; version="4.0"; sha256="18rv27xmvalhmshc847yq63srym0k7x352y1m033qpy5j0fjrijz"; depends=[coda lme4]; }; HeritSeq = derive2 { name="HeritSeq"; version="1.0.1"; sha256="0l1saxwj99xwkzcy43v0k9sicqwpw9gc8ywxpablagcddfj05pi3"; depends=[cplm DESeq2 lme4 MASS pbapply SummarizedExperiment tweedie]; }; HextractoR = derive2 { name="HextractoR"; version="1.4"; sha256="1wp7n92wgrjyklq159ymrw8y5ads6lhj2fcz54rzdnccdyx5naxi"; depends=[doParallel foreach seqinr]; }; HiCfeat = derive2 { name="HiCfeat"; version="1.4"; sha256="1imz7zfax74aakzk8457jww9r66qxpr2ncyvjj0y5paxdn76lnnq"; depends=[GenomeInfoDb GenomicRanges glmnet IRanges Matrix rtracklayer]; }; - HiClimR = derive2 { name="HiClimR"; version="2.1.5"; sha256="0qw0gpgp00gvm0kcsghwcnnhslyrigiknw4al6gs91ppq2fd2k78"; depends=[ncdf4]; }; + HiClimR = derive2 { name="HiClimR"; version="2.1.6"; sha256="1s7l78xjvld8cdbz18zk6mbzwwzpm9x6vj6fq4j4hrz11bzsr14y"; depends=[ncdf4]; }; HiCseg = derive2 { name="HiCseg"; version="1.1"; sha256="19581k3g71wrznyqrp4hmspqyzcbcfbc48xgjlq13zmqii45hcn6"; depends=[]; }; HiDimDA = derive2 { name="HiDimDA"; version="0.2-4"; sha256="0gxkxzys9mcy33xvsim8klaqmb2xwvy5bvgkn9r400j4qfjd3cgg"; depends=[]; }; HiLMM = derive2 { name="HiLMM"; version="1.1"; sha256="09135cwi6kqrvzdlivm86q1dqn6cbbi6nspdm0c2s700jl49pl5z"; depends=[]; }; @@ -1828,16 +1842,16 @@ in with self; { HierDpart = derive2 { name="HierDpart"; version="0.5.0"; sha256="1lrp5snkx5irrx6b19wdfmkpbxdy4gxkhpjibfin109s5r54jvvg"; depends=[ade4 adegenet ape diveRsity entropart GGally ggplot2 hierfstat mmod pegas permute reshape2 tibble vegan]; }; HierO = derive2 { name="HierO"; version="0.2"; sha256="1lqj5grjly4kzxl7wb192aagz2kdvpnjdan2kcg5yxwvg1xcvwv1"; depends=[bitops RCurl rneos tcltk2 XML]; }; HighDimOut = derive2 { name="HighDimOut"; version="1.0.0"; sha256="0r7mazwq4fsz547d3nyavmqya7144lg3fkl5f7amrp48l9h85vx2"; depends=[DMwR FNN foreach ggplot2 plyr proxy]; }; - HistDAWass = derive2 { name="HistDAWass"; version="1.0.3"; sha256="1kvq9q4lnbl2jkj7dvm2znp2ihvv1j6778pnfkkxflxa8aks29k6"; depends=[class FactoMineR ggplot2 ggridges histogram Rcpp RcppArmadillo]; }; + HighestMedianRules = derive2 { name="HighestMedianRules"; version="1.0"; sha256="01fj3xgrb9iav5v91bq04hzv9nhnwy8l00dx6yykghwvzjwfv3ih"; depends=[RMallow]; }; + HistDAWass = derive2 { name="HistDAWass"; version="1.0.4"; sha256="18l9hjkdcwk1lh19z240s9rqg49v9gpydllcaa5jndysylx8ybjr"; depends=[class FactoMineR ggplot2 ggridges histogram Rcpp RcppArmadillo]; }; HistData = derive2 { name="HistData"; version="0.8-6"; sha256="0an8cki2ahaf3ynbcqgikxi90l3bv7gcn6nnwnli9g1br89y3bd4"; depends=[]; }; HistogramTools = derive2 { name="HistogramTools"; version="0.3.2"; sha256="1wkv6ypn006d8j6bpbhc1knw0bky4y8r7jp87482yd19q5ljsgv0"; depends=[ash Hmisc stringr]; }; HiveR = derive2 { name="HiveR"; version="0.3.42"; sha256="09h061511pk7iy1k9gb3ifa5q6gd17ix9sn2fshl6gp5sxnysn4f"; depends=[jpeg plyr png RColorBrewer rgl tkrgl]; }; - Hmisc = derive2 { name="Hmisc"; version="4.3-0"; sha256="0rb1m6138lqzb46nss9ggvhghipd10vdnwsy6iq2wzynrynzkwkz"; depends=[acepack base64enc cluster data_table foreign Formula ggplot2 gridExtra gtable htmlTable htmltools lattice latticeExtra nnet rpart survival viridis]; }; - Hmsc = derive2 { name="Hmsc"; version="3.0-4"; sha256="1h2szg5qrqfx8h982n860bw0mcwqgj1x269vd7c191yhsfhqgkny"; depends=[abind ape BayesLogit coda fields FNN ggplot2 MASS Matrix MCMCpack mvtnorm nnet pdist pROC statmod truncnorm]; }; + Hmisc = derive2 { name="Hmisc"; version="4.4-0"; sha256="1ivfamwghd2z408fkhs7jy5zl3q0z1a2la16yi8js872br6cyvpi"; depends=[acepack base64enc cluster data_table foreign Formula ggplot2 gridExtra gtable htmlTable htmltools lattice latticeExtra nnet rpart survival viridis]; }; + Hmsc = derive2 { name="Hmsc"; version="3.0-6"; sha256="1n02akdrz4g33aqwigbh9ckdplxvgnzsznwlyx6j40s4rqgv2zrz"; depends=[abind ape BayesLogit coda fields FNN ggplot2 MASS Matrix MCMCpack mvtnorm nnet pdist pROC rlang statmod truncnorm]; }; HoRM = derive2 { name="HoRM"; version="0.1.2"; sha256="0vfsya6423i25szdj5s8pa8pwshiqykikxdbbj7r2nz73x3qp6hy"; depends=[ggplot2 MASS orthopolynom quantmod rsm]; }; Holidays = derive2 { name="Holidays"; version="1.0-7"; sha256="1srfbhlrf0pd6gzhp4hbic555lb7camk084rn1qz2g7fjvyijqiq"; depends=[TimeWarp]; }; Homeric = derive2 { name="Homeric"; version="0.1-3"; sha256="1vcs8fj39zpz45p7gph0mnx65hgr35na0b79i8llyw7i1h7zqzxr"; depends=[]; }; - HotDeckImputation = derive2 { name="HotDeckImputation"; version="1.1.0"; sha256="1mqfn6yw5846ynrcgzka0m6ikfppa5civjkhj42rhp2v2xk25li7"; depends=[Rglpk]; }; Hotelling = derive2 { name="Hotelling"; version="1.0-5"; sha256="1ism2lzi2kmi62gp319qsi64pj2kj5sfh50f1qnv8vgdkb76bdx5"; depends=[corpcor]; }; HyPhy = derive2 { name="HyPhy"; version="1.0"; sha256="0994ymv7sswbp8qw3pay34s926cflw2hq2gnchw7rknybvlsrinq"; depends=[ape R_utils]; }; HyRiM = derive2 { name="HyRiM"; version="1.0.3"; sha256="0zx292554kr2s4107db5y7sr869kia9q6dyzhdjy11ksw23sj9m4"; depends=[compare orthopolynom]; }; @@ -1864,7 +1878,7 @@ in with self; { ICAFF = derive2 { name="ICAFF"; version="1.0.1"; sha256="0zazx4nv81s75appg10aayks04mx6m5n9yf5hqrbxh3yj68vzxfy"; depends=[]; }; ICAMS = derive2 { name="ICAMS"; version="2.0.10"; sha256="1f22bwbxnqqccmkmsx4ll8qaviz9w7f64jx1whikvnhsxw634xp5"; depends=[Biostrings BSgenome data_table dplyr GenomeInfoDb GenomicRanges IRanges RColorBrewer stringi]; }; ICAOD = derive2 { name="ICAOD"; version="0.9.9"; sha256="04s51rxhr4axxr1rnhnq87lcn9mjj8g18xr35awnmc4sjg2aavaf"; depends=[cubature mnormt mvQuad nloptr Rcpp RcppEigen sn]; }; - ICBayes = derive2 { name="ICBayes"; version="1.1"; sha256="1bmxba3bv9szzxvjf1blwxwdhw87h7s04cfn63c1gqpnpwsmr03y"; depends=[coda HI survival]; }; + ICBayes = derive2 { name="ICBayes"; version="1.2"; sha256="1hdh7g4nk6yy0xz9564vpvh1blrw30lvyw2wc5mmgn78kwjqla34"; depends=[coda HI survival]; }; ICC = derive2 { name="ICC"; version="2.3.0"; sha256="0y8zh9715cp9bglxpygqwgigrarq37sj845lk1xl0ydwinl0a6kk"; depends=[]; }; ICC_Sample_Size = derive2 { name="ICC.Sample.Size"; version="1.0"; sha256="1w6v1jp8bfvf6c49ikswkc5527gdx5cyqnw95x00pgmm6riwlsp9"; depends=[]; }; ICCbin = derive2 { name="ICCbin"; version="1.1.1"; sha256="1pzlaj7w98pgrlg3zvpmdv0dpgi5gih0j73qv86ak75fkxvrnzzw"; depends=[]; }; @@ -1884,28 +1898,29 @@ in with self; { ICSShiny = derive2 { name="ICSShiny"; version="0.5"; sha256="0a13vps0mkv5qs6qnl7ar0mdbkbd7i1c6kgwahmkb3id3n9bw0cl"; depends=[DT ICS ICSNP ICSOutlier rrcov shiny simsalapar]; }; ICV = derive2 { name="ICV"; version="1.0"; sha256="1na87i39jy5d8ibldqcqz3a072ihkgcl0k629sxch9hk6v6j5lly"; depends=[]; }; ICcalib = derive2 { name="ICcalib"; version="1.0.8"; sha256="1y2w12ka0qxh9dg6dlcrnndz1xrv8gkppan64qkyk5vjrh18ajz4"; depends=[fitdistrplus icenReg ICsurv MASS msm numDeriv Rcpp RcppArmadillo survival]; }; - ICcforest = derive2 { name="ICcforest"; version="0.5.0"; sha256="0m4bqw06alpj8p0yska4rizra73mgvcpd4zlgmxr146cgdv2lrgd"; depends=[icenReg ipred partykit survival]; }; + ICcforest = derive2 { name="ICcforest"; version="0.5.1"; sha256="0z511d3drq5flxwvx7kjv3v5yanjhvs5ayvkm996jbiz3k49a12v"; depends=[icenReg ipred partykit survival]; }; ICsurv = derive2 { name="ICsurv"; version="1.0"; sha256="1mbndpy3x5731c9y955wscy76jrxlgv33bf6ldqp65cwyvdgxl86"; depends=[MASS matrixcalc]; }; ICtest = derive2 { name="ICtest"; version="0.3-2"; sha256="00h72rngcyjhin9g8x80mypm8zx765nm5jgsyjya9m4kw8x4h8la"; depends=[GGally ggplot2 ICS ICSNP JADE png Rcpp RcppArmadillo survey xts zoo]; }; IDCard = derive2 { name="IDCard"; version="0.3.0"; sha256="06b5zqmgh4clni3mv6ab2a52r4z34isbz0hd1i61793gps9fkc0y"; depends=[stringr]; }; IDE = derive2 { name="IDE"; version="0.3.0"; sha256="1m1y7gd8i14kl54qxhjy7bnf2md5vs7bb73k7k92nizv941qn0mn"; depends=[DEoptim dplyr FRK ggplot2 Matrix sp spacetime sparseinv tidyr]; }; - IDF = derive2 { name="IDF"; version="1.1"; sha256="19fx04gvzwzkxbd453l3wx46s22dbnh0nxdrmsr4f7l67kihbwdr"; depends=[evd ismev]; }; IDPSurvival = derive2 { name="IDPSurvival"; version="1.2"; sha256="0hifs8vw3rxlb5vlxs1433pcv2dh7p0mxpgb2n03d98f20vkdwfw"; depends=[gtools Rsolnp survival]; }; IDPmisc = derive2 { name="IDPmisc"; version="1.1.20"; sha256="0zy6mxqa8arq0vvhsdcifzm3085c23rnwa1n36fhircph1xwvfdw"; depends=[lattice]; }; IDSpatialStats = derive2 { name="IDSpatialStats"; version="0.3.10"; sha256="1980nsbcibsas99xcqfc54k6zhh9lg2xdgmihp846xhqgw9xjjy7"; depends=[doParallel foreach igraph spatstat]; }; IDetect = derive2 { name="IDetect"; version="0.1.0"; sha256="1q1jwgildhx6sp883ni7vcsa3gj997855v5ky41dyf34kv7hvdl1"; depends=[]; }; IDmeasurer = derive2 { name="IDmeasurer"; version="1.0.0"; sha256="0n7rziaaxm9dqixmw6rxgq9dwnwdl3dsdnpd9s59k5skdlaxnl5m"; depends=[infotheo lme4 MASS]; }; IDmining = derive2 { name="IDmining"; version="1.0.6"; sha256="0fsl1byz0n5jwswh2ydzz5lsycja54545cf7dr1r3h1a372yz2mv"; depends=[data_table doParallel foreach]; }; + IETD = derive2 { name="IETD"; version="1.0.0"; sha256="0avhyw0zcb8vj0nqfy41yq5kcd8yf9rmaawdvfcy5rqwxmi1mw9l"; depends=[doParallel dplyr foreach ggplot2 lubridate Rdpack]; }; IFP = derive2 { name="IFP"; version="0.2.1"; sha256="06zyadcr8p6q0c5h9n29yl02ixysdj6lfbn9hfir0bk9hyv9yfyr"; depends=[coda haplo_stats]; }; IGG = derive2 { name="IGG"; version="1.0"; sha256="1cibb9z18xc1zx1813lk14n6p5am84hm7w0hkrsif4j3p89lrwif"; depends=[GIGrvg glmnet MASS Matrix pscl]; }; IGP = derive2 { name="IGP"; version="0.1.0"; sha256="0xv89gmyfgnq5kzcmjbp5nx9zbr3gbdzkvffp99bxbkvf759m255"; depends=[PythonInR R6]; }; + IGST = derive2 { name="IGST"; version="0.1.0"; sha256="12ycrfsgwakaj3k39k1j4ky58wr7a2ibyz6j9cznvjjv6cgz9zg5"; depends=[BootMRMR e1071]; }; IHSEP = derive2 { name="IHSEP"; version="0.1"; sha256="1djc5509b5iyi6y0i36h77l6sq1h0w721v2isxqldcqk3gb0bx11"; depends=[lpint Rcpp]; }; IIS = derive2 { name="IIS"; version="1.0"; sha256="01h7nncxn1drnqf1h7snw0pvkgkn8dxq53k2sqcw3kdjlk5mj2l6"; depends=[asbio BSDA Hmisc NSM3 Rfit]; }; ILS = derive2 { name="ILS"; version="0.2"; sha256="0lj3ripkaq6jn00lpxjihjhm8g1gbkppmb1y9kkrymphg80k1by7"; depends=[depthTools fda_usc lattice MASS multcomp]; }; IM = derive2 { name="IM"; version="1.0"; sha256="1f1vr5zfqnanc5xmmlfkjkvxwbyyysi3mcvkg95p8r687a7zl0cx"; depends=[bmp jpeg png]; }; IMAGE = derive2 { name="IMAGE"; version="1.0"; sha256="0xgrja7qhklcmbm0zz5xg94gw5kl05nk3v77l7vxq2d5sk0435g3"; depends=[doParallel foreach Matrix Rcpp RcppArmadillo]; }; IMFData = derive2 { name="IMFData"; version="0.2.0"; sha256="1mlxpsbyvh1zi8ivdblbd58zfv5hflnknbasz5z8xk9911czrn6p"; depends=[httr jsonlite plyr]; }; - IMIFA = derive2 { name="IMIFA"; version="2.1.1"; sha256="1kw7lbi26fsyflrjfpn26xdf50yqsfcwnz7vh657j5jsfrgdhw2h"; depends=[matrixStats mclust mvnfast Rfast slam viridis]; }; + IMIFA = derive2 { name="IMIFA"; version="2.1.2"; sha256="1jim9dhiwm4jiwp6amfsfzl0wdk5k7fi08wgjj7l8pcjsrvv98ny"; depends=[matrixStats mclust mvnfast Rfast slam viridis]; }; IMIS = derive2 { name="IMIS"; version="0.1"; sha256="09zb48vdj0i3vf8vxrs07xwb9ji27vp2fyvmg6jfq631licsryc2"; depends=[mvtnorm]; }; IMP = derive2 { name="IMP"; version="1.1"; sha256="0ilvgz2bngffyx6ifqqx1snsn6mmq7rx3wg44093yrviaw39qdfv"; depends=[dplyr ggplot2 shiny tidyr]; }; IMPACT = derive2 { name="IMPACT"; version="0.1.1"; sha256="0ai22gvmfj9j00cw742szfqqay63b5lmnszkwwdfdvidls43v0bm"; depends=[]; }; @@ -1920,35 +1935,37 @@ in with self; { INLAMSM = derive2 { name="INLAMSM"; version="0.1"; sha256="0km7kwwif2hqqa9jhglvkinzcm6gfp7mn219hqm5ds5rfgrcyl75"; depends=[Matrix MCMCpack]; }; INSPIRE = derive2 { name="INSPIRE"; version="1.5"; sha256="0938l50yxnb5q628mp874ayx9ybvcjddis20y1hzm5cmlsg0hqhg"; depends=[missMDA]; }; IOHanalyzer = derive2 { name="IOHanalyzer"; version="0.1.3"; sha256="0l5baz68714vqlzfp6v1r93lwmv0nsq2wqidgf5zwj5r391y7c5g"; depends=[bsplus colorRamps colorspace colourpicker data_table dplyr DT ggplot2 igraph kableExtra magrittr markdown PlayerRatings plotly RColorBrewer Rcpp reshape2 scales shiny shinydashboard shinyjs withr]; }; - IPCAPS = derive2 { name="IPCAPS"; version="1.1.5"; sha256="0d1nws86k1yph2f4drwrh4jvmmc9nnqmmswpwirmgsp3ma58kc42"; depends=[apcluster expm fpc KRIS LPCM MASS Matrix Rmixmod]; }; + IPCWK = derive2 { name="IPCWK"; version="1.0"; sha256="0hah1xl6zli0346jh57rjc5x8vynhaysj0l481rmvznsghv6im23"; depends=[MASS survival]; }; IPDFileCheck = derive2 { name="IPDFileCheck"; version="0.6.2"; sha256="16fapss0y31y9ynizhv9z8zqywf0aam2v7g53dcwylvdjc6qpzi2"; depends=[dplyr eeptools GlobalOptions lubridate testthat]; }; IPEC = derive2 { name="IPEC"; version="0.1.2"; sha256="1fglr5hs61n13251145wqzvxy362fx32yzral96xd8li76ljxiic"; depends=[MASS numDeriv]; }; IPMRF = derive2 { name="IPMRF"; version="1.2"; sha256="1zvwwhiy0p134zvm5ldc92pdd1ap72bhbrlf02rz9m2hlsxmwy67"; depends=[gbm party randomForest]; }; - IPMpack = derive2 { name="IPMpack"; version="2.1"; sha256="08b79g5a9maxnxladvc2x2dgcmm427i8p6hhgda3mw2h5qmch2q3"; depends=[MASS Matrix nlme]; }; IPPP = derive2 { name="IPPP"; version="1.1"; sha256="19ccs25fd56ns7ssi51w2jzjd4d57vyimwmfvf27mmigb537bd5y"; depends=[]; }; + IPV = derive2 { name="IPV"; version="0.1.1"; sha256="0bd59sfqqz2g6lwzlg3vqpw0y8q989n4q76qr1dvnq847c6fg8wz"; depends=[ggforce ggplot2]; }; IPWboxplot = derive2 { name="IPWboxplot"; version="0.1.0"; sha256="0lyqcjnbissick5hzwrx21pykq4pww9j0i03j0gy43awl1cq5qq8"; depends=[isotone]; }; IPWsurvival = derive2 { name="IPWsurvival"; version="0.5"; sha256="0lmw0ifj8cds8lzyjkkv0i0zim23p0a3pawlhmhdm3nfvwawb853"; depends=[survival]; }; IQCC = derive2 { name="IQCC"; version="0.7"; sha256="1zalpmyywkrnci0jd8irakjhiqmr52zhj1sbxf9pz5c7wks2rdbc"; depends=[MASS miscTools qcc]; }; IRATER = derive2 { name="IRATER"; version="0.0.1"; sha256="0jxdvjmnmangbqy3ibb5qrj9jz3wrzs0wa1r2gjk4v8vsbk0ipcf"; depends=[coda lattice plyr R2admb]; }; IRISMustangMetrics = derive2 { name="IRISMustangMetrics"; version="2.3.0"; sha256="09nzzalz107l6dscl4xxd8znwd9fppjlfyvn1vfd9jhx7mkjlnlq"; depends=[dplyr IRISSeismic pracma RCurl seismicRoll signal stringr XML]; }; IRISSeismic = derive2 { name="IRISSeismic"; version="1.5.2"; sha256="117p2kh2r2iw758iqlpqaak83czfv34p15907g18x496r5vri429"; depends=[pracma RCurl seismicRoll signal stringr XML]; }; - IROmiss = derive2 { name="IROmiss"; version="1.0.1"; sha256="01l08s1g7h8cki372daa61pw3wac3pbv5d4yqnphg5p8ihsmrc5d"; depends=[equSA huge mvtnorm ncvreg]; }; + IROmiss = derive2 { name="IROmiss"; version="1.0.2"; sha256="0rcyijx5w8nn7n1hc4sdrphgggnq3676f8fpzxs85vkk52z0vp0a"; depends=[equSA huge mvtnorm ncvreg]; }; + IRTBEMM = derive2 { name="IRTBEMM"; version="1.0.2"; sha256="03a1kjhyaqamy4988ns4m9mwbdljcyppcf16hmmi9q0zrzn0d2ki"; depends=[]; }; IRTShiny = derive2 { name="IRTShiny"; version="1.2"; sha256="094ax94y6k5z4vlxfla2w19f57q0z32nwwd5npjbgmnkhvfhhl9v"; depends=[beeswarm CTT ltm psych shiny shinyAce]; }; IRdisplay = derive2 { name="IRdisplay"; version="0.7.0"; sha256="12chk53nf4zckgc4yl7gbvd7m5dvli52inp5b3f0zvcjvfncksli"; depends=[repr]; }; IRkernel = derive2 { name="IRkernel"; version="1.1"; sha256="1viqxs91dys1z4cf7gb59rmqvzb8lc7jdp4azrpmhgwa8qf46s94"; depends=[crayon digest evaluate IRdisplay jsonlite pbdZMQ repr uuid]; }; ISAT = derive2 { name="ISAT"; version="1.0.5"; sha256="0xlq568spfz527jxbqamrn1j87hnasg0kp2bcyjycaghmhsc6zmg"; depends=[gtools stringr]; }; ISBF = derive2 { name="ISBF"; version="0.2.1"; sha256="12mk4d0m5rk4m5bskkkng5j6a9dzh8l1d74wh8lnamq7kf9ai9if"; depends=[]; }; ISCO08ConveRsions = derive2 { name="ISCO08ConveRsions"; version="0.1.0"; sha256="0jqg03rxr3k01y29b7gq89jk2jd2qrshmq3338j8w6531r7y12lg"; depends=[]; }; - ISEtools = derive2 { name="ISEtools"; version="3.1.1"; sha256="1dipff8msky1rxbrckyxh7c5mh40q4a5hjdghsqkxklwh9zmrs44"; depends=[coda Xmisc]; }; + ISEtools = derive2 { name="ISEtools"; version="3.1.1.1"; sha256="00d6znqz2mfmyi9ijgrg2pwl4lnvvsy00ysa7a7vjq7ip8qvcjfq"; depends=[coda Xmisc]; }; ISLR = derive2 { name="ISLR"; version="1.2"; sha256="1bfay6cs40crhh34v2ksn4zdxivimfyjvk19wqbnjr7vs837l3xh"; depends=[]; }; ISM = derive2 { name="ISM"; version="0.1.0"; sha256="0by0w6zgnwcwzbmxx16s8mb1avhc6aiavqp0qkxx6hr70vrgb997"; depends=[rJava xlsx xlsxjars]; }; - ISOcodes = derive2 { name="ISOcodes"; version="2019.12.22"; sha256="1k2f2258bwzs0b3nxma9kcw395qkljvk514a7047rx4dn0iwd874"; depends=[]; }; + ISOcodes = derive2 { name="ISOcodes"; version="2020.03.16"; sha256="1hz1sj57qkkkrgn8slsz2n4jv1fkyp40503j9rg30lxy4gmb83hn"; depends=[]; }; ISOpureR = derive2 { name="ISOpureR"; version="1.1.3"; sha256="1ydhsh3v6n7prrg0dm7hsg8wx1244g791xnz1sjyhljhm31hgwc0"; depends=[futile_logger Rcpp RcppEigen]; }; ISOweek = derive2 { name="ISOweek"; version="0.6-2"; sha256="1f1h8pgjaa14cvaj8ldl87b4vslxwvyfj46m0hkylwp73sv3g2mm"; depends=[stringr]; }; ISR3 = derive2 { name="ISR3"; version="0.98"; sha256="0mmpdl9ndlj9i0k3zl7ja0g7y9pm67igw925ld5qnz7a36plygxs"; depends=[]; }; + ISRaD = derive2 { name="ISRaD"; version="1.2.3"; sha256="1xgk0mda2w22yf44flyyga15cxffzn25rg83g7dmqa8rqjiis51j"; depends=[assertthat devtools dplyr ggplot2 maps openxlsx pangaear raster rcrossref RCurl rgdal stringr tidyr tidyverse]; }; ISwR = derive2 { name="ISwR"; version="2.0-8"; sha256="1bay7na68awq68bw82dwhcfxp2d3di2dg33islq0mgrhd4sfdfza"; depends=[]; }; ITGM = derive2 { name="ITGM"; version="0.41"; sha256="0q278ga51asrr918l088v6qdl17vnmrcbz7y1xc4rzmb61lkwqy7"; depends=[data_table Fgmutils gsubfn plyr sqldf]; }; - ITNr = derive2 { name="ITNr"; version="0.3.0"; sha256="1aiqkpxnam13r4q8q03yzd6a1wvl2gf40kqncbrpfvcaiv5zsq68"; depends=[blockmodeling circlize comtradr cowplot dplyr fastmatch GGally ggplot2 GoodmanKruskal igraph intergraph maps network networkDynamic plyr RColorBrewer reshape2 sna tnet WDI xergm_common]; }; + ITNr = derive2 { name="ITNr"; version="0.6.0"; sha256="0yxn3768819ph49bizprj3arrvz9rzhb45rkcpfivwfwlyf010yy"; depends=[blockmodeling circlize cowplot dplyr fastmatch GGally ggplot2 igraph intergraph maps network networkDynamic plyr RColorBrewer reshape2 sna tnet WDI]; }; ITRLearn = derive2 { name="ITRLearn"; version="1.0-1"; sha256="03xdbpn3qddcq9krdpnywd3xbzfh2viym2qqx6rcqs7w7bdhhlk6"; depends=[Formula kernlab]; }; ITRSelect = derive2 { name="ITRSelect"; version="1.0-1"; sha256="0llr4hrlbnb728j5rw7vd3r9qlqf571hrldnm72kicis5di2v5di"; depends=[Formula Matrix ncvreg Rglpk svMisc]; }; IUPS = derive2 { name="IUPS"; version="1.0"; sha256="01pv03ink668fi2vxqybli0kgva13gxhqfdxkwz6qk5rnpzwvf5w"; depends=[boot Matching R2jags]; }; @@ -1959,21 +1976,22 @@ in with self; { ImaginR = derive2 { name="ImaginR"; version="0.1.7"; sha256="12ypfrqw6xym84i1axd3h0qd2md96rc0glas3rgzpdhdyw4lbfmn"; depends=[imager jpeg]; }; Imap = derive2 { name="Imap"; version="1.32"; sha256="0b4w0mw9ljw6zxwvi0qzb08yq9n169lzgkdcwizrd07x9k9xjxs7"; depends=[]; }; Immigrate = derive2 { name="Immigrate"; version="0.0.2"; sha256="1khxjh4lpsgv5qqk30ry6r8y3vjblwxsx9frv63pws4x1j6j2apm"; depends=[pROC Rcpp]; }; - ImpactEffectsize = derive2 { name="ImpactEffectsize"; version="0.3.0"; sha256="1r4cm8q72il5n1glgn3c4jyb0mb0mgyc44fy047ijcxwlrrwcswk"; depends=[AdaptGauss matrixStats parallelDist pracma RcppAlgos]; }; + ImpactEffectsize = derive2 { name="ImpactEffectsize"; version="0.4.0"; sha256="05cd3k5ccy0jpz20rrg7wlmpii7zn0bh104h8vg7caw8ilpx7v0x"; depends=[DataVisualizations Hmisc matrixStats parallelDist pracma]; }; ImpactIV = derive2 { name="ImpactIV"; version="1.0"; sha256="1bb6gw1h15hscr71hy779k2x5ywzx63ylim3hby02d7fnnj46p58"; depends=[nnet]; }; ImportExport = derive2 { name="ImportExport"; version="1.1"; sha256="12i9mwspk59zicn1mn21xrs90c8dqxm1q7alqbzscgkpf3xbjrnn"; depends=[chron gdata haven Hmisc RODBC xlsx]; }; ImputeRobust = derive2 { name="ImputeRobust"; version="1.3-1"; sha256="1zvwlpffpm4gqysz57clf8jkqr72yjbzx90pdy95la51m0b6cdbd"; depends=[extremevalues gamlss gamlss_dist lattice mice purrr]; }; InDisc = derive2 { name="InDisc"; version="1.0.2"; sha256="1mvd6r1ly924n17275n4i9p8sghvm929kbir0bq6850kk2m0dgq7"; depends=[optimbase psych]; }; InPosition = derive2 { name="InPosition"; version="0.12.7.1"; sha256="0d9c7dwaa1v0j8p5ff9223fc2gkbmbvyqylma2d8l4x5m92jmkv0"; depends=[ExPosition prettyGraphs]; }; - InSilicoVA = derive2 { name="InSilicoVA"; version="1.2.5"; sha256="1irbfdrab9mz50py8h3gnjj14swh7b1pbrqf2fj04ym206rsca02"; depends=[coda ggplot2 InterVA5 rJava]; }; - IncDTW = derive2 { name="IncDTW"; version="1.1.3"; sha256="1lbg1frx5hlv9pj56xsr4rdzhkq2h21r74hsjhlj0gvg1ykn6hvj"; depends=[data_table ggplot2 Rcpp RcppArmadillo RcppParallel scales]; }; + InSilicoVA = derive2 { name="InSilicoVA"; version="1.2.7"; sha256="0xfvrsq84wm31j0ih5khqhkhk4ygijfkh9w2bjrw3d5wgpdm0yv3"; depends=[coda ggplot2 InterVA5 rJava]; }; + IncDTW = derive2 { name="IncDTW"; version="1.1.3.1"; sha256="1hwwsh70mmdwqaqw4xxnbvc3g2nhmx64bd0hzxh63wr15jch0w8b"; depends=[data_table ggplot2 Rcpp RcppArmadillo RcppParallel scales]; }; + IncomPair = derive2 { name="IncomPair"; version="0.1.0"; sha256="156mc4csbxz976md7ikjd6sqamzsfc8ik9xf1qbhrfl8y7957kbb"; depends=[]; }; IncucyteDRC = derive2 { name="IncucyteDRC"; version="0.5.4"; sha256="1k7jqcyx5n4my5rbyfa693ganbk91xganyagq8x8szli9h1491ii"; depends=[cowplot dplyr drc DT ggplot2 magrittr shiny tidyr XML]; }; 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-2"; sha256="16fwbq4d9k3092qwj7yk2s66gp8rgv7g0ii4240imfjh28zlb6xa"; depends=[fGarch KernSmooth lubridate RcppBDT xts zoo]; }; - IndexNumR = derive2 { name="IndexNumR"; version="0.1.2"; sha256="0dip7v4z36k3fhl8szrbl11gcqy1rr7kgmcsajpdwd16jixj1d27"; depends=[]; }; - IndexNumber = derive2 { name="IndexNumber"; version="1.0"; sha256="03c01f7pk0bf1mlnfmnyc242gpc0ac6svzb6lfwhqkv964kdvhsy"; depends=[]; }; + IndexNumR = derive2 { name="IndexNumR"; version="0.1.3"; sha256="1jrbl2gwgp4msigkspgqcvgvxq169jiiz4acixky37i6hw0n34p6"; depends=[]; }; + IndexNumber = derive2 { name="IndexNumber"; version="1.1"; sha256="1db1bd44zm8wwqr6rpnq97xj6jrv297vzs156by33z18y79fdgbq"; depends=[]; }; IndianTaxCalc = derive2 { name="IndianTaxCalc"; version="1.0.2"; sha256="1fxw884wj9n8drk2xz3rgr4f7b4fckh5firrf5gdz6d1nk9hdvc1"; depends=[]; }; InfDim = derive2 { name="InfDim"; version="1.0"; sha256="0rh3ch0m015xjkxy08vf9pc6q7azjc6sgicd2j6cwh611pqq39wq"; depends=[]; }; InferenceSMR = derive2 { name="InferenceSMR"; version="1.0"; sha256="13d3v8kyk6br33659jgql6j1nqmnd8zszqrwfw2x3khkiqzgdmhk"; depends=[survival]; }; @@ -2013,12 +2031,13 @@ in with self; { IsingSampler = derive2 { name="IsingSampler"; version="0.2.1"; sha256="1cs4vk53b5fy6kywvycfjf62571yx92nvgp5i8hlvms1362ir7gv"; depends=[dplyr magrittr nnet plyr Rcpp]; }; Iso = derive2 { name="Iso"; version="0.0-18"; sha256="014mm5b1f7i6nwlz3kyg1biph0y542kcx5bd13p68cv5a928qzid"; depends=[]; }; IsoCI = derive2 { name="IsoCI"; version="1.1"; sha256="0r7ksfic6p2v95c953s4gbzzclk4ldxysm8szb8xba1w0nx2izil"; depends=[KernSmooth]; }; + IsoCheck = derive2 { name="IsoCheck"; version="0.1.0"; sha256="06g0srp14yiha95mbmifaqf5yr5ppjnc20nyr237ah3l776mhsif"; depends=[dplyr gtools plyr]; }; IsoGene = derive2 { name="IsoGene"; version="1.0-24"; sha256="0flm0mszankvl3aizwsazyhvz2xkr4gfqiqywpc0r1swqj19610r"; depends=[affy Biobase ff Iso xtable]; }; IsoSpecR = derive2 { name="IsoSpecR"; version="2.0.1"; sha256="1y101x7138pdylp2qsmyd10dh0d3wwic292qfi2kbn3z849dlhnn"; depends=[Rcpp]; }; - IsoplotR = derive2 { name="IsoplotR"; version="3.2"; sha256="00v2b7r537awxmns8m22gk3q225kkh68wwwzip5x6qrvykmnxdk6"; depends=[MASS]; }; + IsoplotR = derive2 { name="IsoplotR"; version="3.3"; sha256="1bldpa7j37k29k51lpbpyr4g4939zw1n9dv498v92w82kzj2p6zf"; 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-2"; sha256="0haqb8fsn1z532z42vjz60na7hlwv5rhayxzbd4rkzx2wcvnlbhn"; depends=[clue]; }; + JADE = derive2 { name="JADE"; version="2.0-3"; sha256="1fj2wawx5ac1fvlp28naqha0i17f1sb47j2qqzgccvx17ycqmmjn"; depends=[clue]; }; JASPAR = derive2 { name="JASPAR"; version="0.0.1"; sha256="0wiyn7cz45hwy9zkvacx28zdrg78q6715cg4r9xgcb39q25s0dcy"; depends=[gtools]; }; JBTools = derive2 { name="JBTools"; version="0.7.2.9"; sha256="0bynqn3daqgmi3l9asy34mfwyfjkn35k465dfqqi3xwx6cbzlg5k"; depends=[colorspace foreach gplots plotrix]; }; JFE = derive2 { name="JFE"; version="2.1.3"; sha256="16fbwi9znvf560vlrpdipg69vw1kyg2081iz1l2adc2wyxp81dda"; depends=[BurStFin fAssets fBasics fPortfolio FRAPO iClick MASS quantmod rugarch tcltk2 timeDate timeSeries xts zoo]; }; @@ -2035,7 +2054,7 @@ in with self; { JQL = derive2 { name="JQL"; version="3.6.9"; sha256="0d926hngv4r6zl5f6yai3jwhl9hql2hv6ja3yjgplglkns66g4lh"; depends=[caret pdist randomForest]; }; JRF = derive2 { name="JRF"; version="0.1-4"; sha256="1xpvscn9iawwa0vfh3kfwzdni436bf42nvm18b8abh033ljvqpij"; depends=[]; }; JSM = derive2 { name="JSM"; version="0.1.3"; sha256="1p5vlk2fcrb42pi7srkymjacfg05vlaspvhaw94lq1rhvxdw87yl"; depends=[nlme Rcpp RcppEigen statmod survival]; }; - JSmediation = derive2 { name="JSmediation"; version="0.1.0"; sha256="1qmjkachpvql0nrn7lf2n32w9zp12saha2y3zmdg086k1q12xifl"; depends=[broom data_table dplyr glue knitr magrittr MASS purrr rlang tibble]; }; + JSmediation = derive2 { name="JSmediation"; version="0.1.1"; sha256="06p413jfv02k88jdsbplnz696knxglgcqa4pjrgkhhic6awdh0jf"; depends=[broom data_table dplyr glue knitr magrittr MASS purrr rlang tibble]; }; JWileymisc = derive2 { name="JWileymisc"; version="1.1.0"; sha256="08c09jcax0ppl9q47px2anybcj8rfha8xdx226y002valqji5bz3"; depends=[cowplot data_table emmeans extraoperators ggplot2 ggthemes lavaan lme4 MASS mgcv mice multcompView psych quantreg rms robustbase VGAM]; }; JacobiEigen = derive2 { name="JacobiEigen"; version="0.3-3"; sha256="1zcs9qhf2216c590hj6qc837rnciyfsirg4zg655vxn59fgzpvyb"; depends=[Rcpp]; }; JamendoR = derive2 { name="JamendoR"; version="0.1.0"; sha256="1v5i4ggc4igp83pik32fqp07ff8iv7dp93b3qhxcsy1msa4l88lx"; depends=[dplyr httr jsonlite]; }; @@ -2043,16 +2062,16 @@ in with self; { Jaya = derive2 { name="Jaya"; version="0.1.9"; sha256="0b23l7xp4waxjy1vkk09xaali5axr5900v9hkki4f75wh4gb1l53"; depends=[GA]; }; Jdmbs = derive2 { name="Jdmbs"; version="1.3"; sha256="0jjnn1lrrakai34srp9ks8a563amd1rp9vd4ydnpmgfma5qlify0"; depends=[igraph png]; }; Jmisc = derive2 { name="Jmisc"; version="0.3.1"; sha256="1szn29dng54l2xmrm6pg3d5rmwdc1ks23vsnsmplnr5rx7yj002s"; depends=[]; }; + JoF = derive2 { name="JoF"; version="0.1.0"; sha256="1my6fc4awrc822ibsvx3hiz4l49vp8dx0j05v56r7d27xizy8j0j"; depends=[]; }; JoSAE = derive2 { name="JoSAE"; version="0.3.0"; sha256="1vjxzbfs8a7kpmn2lb9dca67d4njmzjr3pl16s0r9ihmmxxwwili"; depends=[nlme]; }; Johnson = derive2 { name="Johnson"; version="1.4"; sha256="12ajcfz5mwxvimv8nq683a2x3590gz0gnyviviyzf5x066a4q0lj"; depends=[]; }; - JointAI = derive2 { name="JointAI"; version="0.6.0"; sha256="13amg3s8hq73qfn6makmqhgdpmq6asqbwhgc0b0haj7iw9ck42ma"; depends=[coda doParallel foreach MASS mcmcse rjags rlang]; }; + JointAI = derive2 { name="JointAI"; version="0.6.1"; sha256="10q1wnyj56mdgkp9m2csxxxpsl7k71a8vq27cbpisf3b1anq9yyw"; depends=[coda doParallel foreach MASS mcmcse rjags rlang]; }; JointModel = derive2 { name="JointModel"; version="1.0"; sha256="1zgs5c7saqyqxvxmhw5sxy5w67abq344aid6igw1da05bfy2az6h"; depends=[lme4 statmod survival]; }; JointNets = derive2 { name="JointNets"; version="2.0.1"; sha256="18n9dsy0w0nh7dznp6gw6g5fhhjhf5y589nb49hri0721kq1h3rb"; depends=[brainR igraph JGL lpSolve MASS misc3d oro_nifti pcaPP rgl shiny]; }; Julia = derive2 { name="Julia"; version="1.1"; sha256="0i1n150d89pkds7qyr0xycz6h07zikb2y07d5fcpaqs4446a8prg"; depends=[]; }; JuliaCall = derive2 { name="JuliaCall"; version="0.17.1"; sha256="0v0mn3q9mp8xq6bpm870v9a228b20n22cph3s0ngphni07pi0kwr"; depends=[knitr Rcpp]; }; JumpTest = derive2 { name="JumpTest"; version="1.1"; sha256="0y375m5477nq0ybnjmfnd8hi45d8jmdnprqvw5f70llpd7bcghh0"; depends=[MASS Rcpp RcppEigen]; }; KANT = derive2 { name="KANT"; version="2.0"; sha256="169j72pmdkcj6hv8qgmc02aps0ppvvl1vnr1hzrb1gsf7zj7bs3y"; depends=[affy Biobase]; }; - KATforDCEMRI = derive2 { name="KATforDCEMRI"; version="1.0.1"; sha256="1wcm0h9lwpiw4crf15h5pfv9fxzpmf3g4jkylgnn9a36305rpdl8"; depends=[locfit matlab R_matlab]; }; KCSKNNShiny = derive2 { name="KCSKNNShiny"; version="0.1.0"; sha256="13gzqf3g7vj8cc0xm5902q7lad2way8d0ri1fs01dnv97wmwbxvn"; depends=[caret dplyr FNN rhandsontable shiny]; }; KCSNBShiny = derive2 { name="KCSNBShiny"; version="0.1.0"; sha256="1lv5r9qyvr3dnvcs00jyam0whv64qmv5vphhijlar1xa1g1llwqr"; depends=[caret dplyr e1071 rhandsontable shiny]; }; KDViz = derive2 { name="KDViz"; version="1.3.1"; sha256="1if4lkq9kvncqw56j7m9kh4piph091zkivvnhxzxj72zq661q5br"; depends=[htmlwidgets igraph mpa networkD3 rvest stringr tm xml2]; }; @@ -2065,62 +2084,61 @@ in with self; { KMgene = derive2 { name="KMgene"; version="1.2"; sha256="1yj9l1mqhvyhicyycnkd639q3zkrx15ba11z9911l4c0gql8syf1"; depends=[CompQuadForm coxme kinship2 MASS Matrix mgcv nlme survival]; }; KMsurv = derive2 { name="KMsurv"; version="0.1-5"; sha256="0hi5vvk584rl70gbrr75w9hc775xmbxnaig0dd6hlpi4071pnqjm"; depends=[]; }; KNNShiny = derive2 { name="KNNShiny"; version="0.1.0"; sha256="16zm8bhdivaap3mvhdx2qn1b1j2iqyarclb0y2qd1n4viwcfm9c1"; depends=[caret dplyr e1071 FNN psycho rhandsontable rmarkdown shiny]; }; - KODAMA = derive2 { name="KODAMA"; version="1.5"; sha256="1pb7qba7dp25x4znhvihc21z5jk6bgk6sg0v24gbvqhv5irm7kwf"; depends=[Rcpp RcppArmadillo]; }; + KOBT = derive2 { name="KOBT"; version="0.1.0"; sha256="0dw6s68x95d4z5a6p8bs1368jcxv5jx0wd87js28i2qm3q57ss71"; depends=[glmnet knockoff MASS Rdpack spcov xgboost]; }; KOGMWU = derive2 { name="KOGMWU"; version="1.2"; sha256="1vz0099gp1r10n7w4p480l8rswdw100sns196d9xin2ibmmd2fx9"; depends=[pheatmap]; }; - KONPsurv = derive2 { name="KONPsurv"; version="1.0.2"; sha256="0ylydb4qxf7apklgn8a2sjid92gfbswpn2fyhjjh9f972bg1vdmi"; 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]; }; + KONPsurv = derive2 { name="KONPsurv"; version="1.0.3"; sha256="1qijx7b6idjy23kqb5l58l6nc6dh35vrkxv370qpj3y2gvvn9d6x"; depends=[Rcpp survival]; }; KRLS = derive2 { name="KRLS"; version="1.0-0"; sha256="1zyf3smfzfm3n43i35rlj1w6vcip2hxkvk4f8lp77xbsry0gmwjw"; depends=[]; }; KRMM = derive2 { name="KRMM"; version="1.0"; sha256="0wxzhrrc4lx20nxjny7rcfw3bya7drn88zbrlzx9f531298xwbrk"; depends=[cvTools kernlab MASS robustbase]; }; KSD = derive2 { name="KSD"; version="1.0.0"; sha256="0wqmbr51yv7f87pnhph2nrj9y2d5jql2agizcaq6lax23lj6xfb7"; depends=[pryr]; }; KSEAapp = derive2 { name="KSEAapp"; version="0.99.0"; sha256="1gfgpa2d32y6bzvf4ww70sm7niq34sqmyrhi0phlqxshqq9xviqc"; depends=[gplots]; }; KSPM = derive2 { name="KSPM"; version="0.2.0"; sha256="0gysb4qb60xfixyj4slcxs2j1bn57vbq6j08i5ldfr9vfaf1pk0n"; depends=[CompQuadForm DEoptim expm]; }; KScorrect = derive2 { name="KScorrect"; version="1.4.0"; sha256="1khvwc610yp3fd4fn0wcgqpzxg9g7sicjjmwvfcahs8qxn3m5vfa"; depends=[doParallel foreach iterators MASS mclust]; }; - KSgeneral = derive2 { name="KSgeneral"; version="0.1.1"; sha256="1ldk3fvwbr6hw7x3ydgzixgc41a0fbbic699zjlnpj5x4mjg1qby"; depends=[dgof MASS Rcpp]; }; + KSgeneral = derive2 { name="KSgeneral"; version="0.1.2"; sha256="15h65pkkdkakqc86vh90qx2ny9pfmd2pm5vc3qrb797l4b02mqqc"; depends=[dgof MASS Rcpp]; }; KTensorGraphs = derive2 { name="KTensorGraphs"; version="0.2"; sha256="1851cqsn8ghp29hjp3806hl66lqjnz3d69qkmpcmk5nky426ypdr"; depends=[]; }; KappaGUI = derive2 { name="KappaGUI"; version="2.0.2"; sha256="0vklny804xpd9r60j4a01j2gak8jizwjw0abf7yvbcalv3zbpb3k"; depends=[irr shiny]; }; KappaV = derive2 { name="KappaV"; version="0.3"; sha256="13mmfb8ijpgvzfj20andqb662950lp9g25k5b26r5ba65p7nhva7"; depends=[maptools PresenceAbsence rgeos sp]; }; KarsTS = derive2 { name="KarsTS"; version="2.2"; sha256="0ay9qi3wws0vi7lygkljaz6xhskc0mzl6r8wsaia2f5f399ya1hp"; depends=[BaylorEdPsych circular forecast infotheo mgcv missForest MVN nonlinearTseries plot3D rgl stinepack stlplus tcltk2 tkrplot tseries tseriesChaos zoo]; }; - KbMvtSkew = derive2 { name="KbMvtSkew"; version="1.0.1"; sha256="0bbnsalyk6r5pzfpz7cniyck4ganm6jka6vijcrals5sxpg70w7x"; depends=[]; }; + KbMvtSkew = derive2 { name="KbMvtSkew"; version="1.0.2"; sha256="14g27a0dkj4gpf5l2k96fd3aa21fz8b85lf5a1jxj0qgjmr4kib0"; depends=[]; }; KenSyn = derive2 { name="KenSyn"; version="0.3"; sha256="0s8sq3caxn4swac81196dp52r9lbmxb3ni45yaxh53f5g34slsi8"; depends=[lme4 metafor nlme]; }; Kendall = derive2 { name="Kendall"; version="2.2"; sha256="0z2yr3x2nvdm81w2imb61hxwcbmg14kfb2bxgh3wmkmv3wfjwkwn"; depends=[boot]; }; KernSmooth = derive2 { name="KernSmooth"; version="2.23-16"; sha256="1acrkbdn3a74y4dndkcdl1njnpfqz7gk3bsz03g8lfj8l7z53hmq"; depends=[]; }; - KernSmoothIRT = derive2 { name="KernSmoothIRT"; version="6.2"; sha256="1dm3j779y630hxdlxycwha563i3n9viil2ksq49s7m65bnwhj33k"; depends=[plotrix Rcpp rgl]; }; + KernSmoothIRT = derive2 { name="KernSmoothIRT"; version="6.4"; sha256="0qqlmcd04m89pmhrbmxxx4lzzb6sksgrm0j8x7fs5r0sxdqy6rcp"; depends=[plotrix Rcpp rgl]; }; KernelKnn = derive2 { name="KernelKnn"; version="1.1.0"; sha256="1w8k4b2q5bh0kx72ixrdb43aificl991j1akh00xn1zx3gbrjb0p"; depends=[Rcpp RcppArmadillo]; }; - Kernelheaping = derive2 { name="Kernelheaping"; version="2.2.1"; sha256="1mc3jzgmg8gyxs6kk474yz911abqzigxwjwjrmhipc40rrdmmr2z"; depends=[fastmatch ks magrittr MASS mvtnorm plyr sp sparr]; }; + Kernelheaping = derive2 { name="Kernelheaping"; version="2.2.2"; sha256="1aq1yhbs07wl5rjz4v5b8k8brap4p25f76qwr5cif655fxdzxc20"; depends=[fastmatch ks magrittr MASS mvtnorm plyr sp sparr]; }; KnapsackSampling = derive2 { name="KnapsackSampling"; version="0.1.0"; sha256="17yzmd11k1n5iy54vbcvpzvkm8ypbl6n1kfi931wwrrcq9y7hg22"; depends=[lpSolve]; }; Knoema = derive2 { name="Knoema"; version="0.1.16"; sha256="0v6w8rrw8nd4l1by5w9xd4hbxp55cma89kljha47ykvmnflsrjsc"; depends=[base64enc digest httr jsonlite lubridate xts zoo]; }; KnowBR = derive2 { name="KnowBR"; version="2.0"; sha256="0i934gff8ldg0lm5cfcf3ip7abnparaaviq8avs7cbnacs6nw8i1"; depends=[fossil mgcv plotrix sp vegan]; }; KnowGRRF = derive2 { name="KnowGRRF"; version="1.0"; sha256="0nk0baibd184rsg23jx1wg4c2fcaqf8ww7822xrs3w5ym6vwd0rs"; depends=[MASS PRROC randomForest RRF]; }; - KoNLP = derive2 { name="KoNLP"; version="0.80.2"; sha256="1i2f684gsgdmmiricrlc8zgzhxk1r0smyzn08jbhfaxkf7adyczy"; depends=[devtools hash rJava RSQLite Sejong stringr tau]; }; KoulMde = derive2 { name="KoulMde"; version="3.1.0"; sha256="158lg1jr3lgn85wgdxww6nldy9blxnnjry6hwkp6kcjpg9jljjl8"; depends=[expm Rcpp RcppArmadillo]; }; Kpart = derive2 { name="Kpart"; version="1.2.2"; sha256="02df0pr8a0gm8558gbw9svxf5sybmg27grymy71ar9hjnhw5xlf2"; depends=[leaps]; }; KraljicMatrix = derive2 { name="KraljicMatrix"; version="0.2.1"; sha256="0yzilmiiyzd2x3v0cnjphf0wdwiblh37kgrvmfrdy49qly48pvi2"; depends=[dplyr ggplot2 magrittr tibble]; }; KrigInv = derive2 { name="KrigInv"; version="1.4.1"; sha256="0x12xff7lgr1v2243shfz9a8r02qs56p7i0b8j2s6bmrzj1abrwb"; depends=[anMC DiceKriging mvtnorm pbivnorm randtoolbox rgenoud]; }; + Kurt = derive2 { name="Kurt"; version="1.0"; sha256="03ivbvgkw3irmcv41zp1wcqzykz81pvvnh39b20qhbgrai2yln79"; depends=[expm labstatR matrixcalc polynom]; }; L0Learn = derive2 { name="L0Learn"; version="1.2.0"; sha256="17k006nxn9n66nh6nrnhv24p150s7icbhzsaimjidj7hx2c24lms"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2]; }; + L1mstate = derive2 { name="L1mstate"; version="1.0"; sha256="04gw078zyzpmnrxibqz27gf4dgyhhcn6lg15w10c6la079vfixx2"; depends=[colorspace MASS Matrix mstate Rcpp RcppEigen]; }; L1pack = derive2 { name="L1pack"; version="0.38.19"; sha256="09n1045lsx1ap47mhzcqghmwwhj24kvpjjr3ysprj058jp5g7ri0"; depends=[]; }; + L2DensityGoFtest = derive2 { name="L2DensityGoFtest"; version="0.1.0"; sha256="0yhcj58inmj3qafvvpghs1qi8h5f14jki4qxy28jc7g8ciqxcw60"; depends=[fGarch kedd nor1mix]; }; LAGOSNE = derive2 { name="LAGOSNE"; version="2.0.1"; sha256="1lay0zb24k5ms4nfr62pgpriy7nfafnkdjjrd7xxznsi7dqrav0y"; depends=[curl dplyr lazyeval magrittr memoise progress purrr rappdirs rlang sf stringr tibble tidyr]; }; LAM = derive2 { name="LAM"; version="0.4-17"; sha256="1isvhmrrpaamahwkxxsgyq6gbzcvfsk2s4ccjavnab4p79j0x782"; depends=[CDM Rcpp RcppArmadillo sirt]; }; LANDD = derive2 { name="LANDD"; version="1.1.0"; sha256="13szkww9nw8zywfrqd8mwgj9csgragm0bx8ia52rcpakpc3hv3hx"; depends=[BH doParallel fdrtool foreach GGally ggplot2 GOSemSim GOstats igraph intergraph Matrix modeest mvtnorm pROC Rcpp]; }; LARF = derive2 { name="LARF"; version="1.4"; sha256="1sqib7smgjacn07ishwls1nlbvcb6fpp1vhrjwf9g4xf9jk30i8h"; depends=[Formula]; }; LARisk = derive2 { name="LARisk"; version="0.1.0"; sha256="05pszgm53dndq114qqb3kcddbvc16a9mgalxjsyh56aa2a4wh7q6"; depends=[Rcpp]; }; - LBLGXE = derive2 { name="LBLGXE"; version="1.4"; sha256="0a5rhijkp9xmwxlc0sx2fj6nikdwgjh2rw9pqavq8bnvvxq6ykwa"; depends=[dummies hapassoc]; }; LBSPR = derive2 { name="LBSPR"; version="0.1.5"; sha256="0bkq7lj45c5inm4klwxkwv1y39rkhwis53d1qsr908k5xmkbgg0i"; depends=[dplyr ggplot2 gridExtra plotrix RColorBrewer Rcpp shiny tidyr]; }; LCA = derive2 { name="LCA"; version="0.1.1"; sha256="014kih33y8b9nls0pcigw68jbz7vgnq8w1xbwm2d37g1m5y6xlyw"; depends=[]; }; LCAextend = derive2 { name="LCAextend"; version="1.3"; sha256="1l75y3vkbsmsm3pjd5pwy0hlv6gz5ryxs4pkx9aiyhxz2y9wnhpb"; depends=[boot kinship2 mvtnorm rms]; }; LCAvarsel = derive2 { name="LCAvarsel"; version="1.1"; sha256="0aqc9rbrc8n6s9xllmamby219qsnxd4ajvffjr21qlkhkaklirb1"; depends=[doParallel foreach GA MASS memoise nnet poLCA]; }; LCF = derive2 { name="LCF"; version="1.7.0"; sha256="1n5gwnkj26b7w6bzapda049bd4aqb317cip05nf0vy04xjc8giyc"; depends=[quadprog]; }; LCFdata = derive2 { name="LCFdata"; version="2.0"; sha256="1x3vbr6hdviqvd6dxn1kb449g0q5zkfmjsmr5nxd2g82p69lv3xm"; depends=[]; }; - LCMCR = derive2 { name="LCMCR"; version="0.4.3"; sha256="1pzavzlr3fml4chrh0fmj8688a3xa153w5gp404nx3qld5sizqrm"; depends=[]; }; + LCMCR = derive2 { name="LCMCR"; version="0.4.11"; sha256="11vcqjjlcps3nqfrmncfqdadhrwk7fvrnx6xqwnc6l12hr98hic0"; depends=[]; }; LCox = derive2 { name="LCox"; version="0.1.0"; sha256="1cqkqmi6bkd41xxwqqzpdiwdv8m5nrqz3f6cajnnbmgfcjawmrzq"; depends=[fdapace survival]; }; - LDATS = derive2 { name="LDATS"; version="0.2.4"; sha256="1glzg2v8fmbmx9rv4smsy3fcswg8kdhh3g21m1lzld50nlvg2w1f"; depends=[coda digest dplyr extraDistr here lubridate magrittr memoise mvtnorm nnet progress reshape topicmodels viridis]; }; + LDATS = derive2 { name="LDATS"; version="0.2.7"; sha256="0im5lvhfbxvrkz9yvfg5xibzdlss869rdz5mixr4ric9lj0ixx0g"; depends=[coda digest extraDistr lubridate magrittr memoise mvtnorm nnet progress topicmodels viridis]; }; LDAvis = derive2 { name="LDAvis"; version="0.3.2"; sha256="1y9wd379rfv3rd3f65ll21nvh6i8yafvv11f8gw8nn06194dgfzg"; depends=[proxy RJSONIO]; }; LDOD = derive2 { name="LDOD"; version="1.0"; sha256="0mf2sy01yv57mqicrz08a17m6crigklx6fmw9zpxv7g85qw1iq4v"; depends=[Rmpfr Rsolnp]; }; LDPD = derive2 { name="LDPD"; version="1.1.2"; sha256="1khdx8vwlpliyjc4sxcdiywbxl8lc9f5s3457vcip1j8dv537lbm"; depends=[MASS nleqslv]; }; LDRTools = derive2 { name="LDRTools"; version="0.2-1"; sha256="05srfyplsypi3whfa71lx7pnad23irpf0p7rxmrpv28jgdmrz6wf"; depends=[]; }; LDcorSV = derive2 { name="LDcorSV"; version="1.3.2"; sha256="0lvk3xz400yd3w0cjdfi6hir1ym1mffd504vycwgck5fkzljpcvx"; depends=[]; }; LDheatmap = derive2 { name="LDheatmap"; version="0.99-7"; sha256="1r0j8bihi5z1x0sgaf7dwzpsw9i0nc1vylvipvc0cia2ka1lr9dc"; depends=[genetics Rcpp snpStats]; }; - LDlinkR = derive2 { name="LDlinkR"; version="1.0.1"; sha256="1k7g7z78fs2pjx436x9z0ikldk0ma9yl503xbx5xwpmw9q6c769k"; depends=[httr]; }; + LDlinkR = derive2 { name="LDlinkR"; version="1.0.2"; sha256="0143g41hcljqsfngly56g47pc2pj5xc3myyqia1akxrlwpzdlh7h"; depends=[httr]; }; LDtests = derive2 { name="LDtests"; version="1.0"; sha256="1jwqr7zlp9hv7vw8xp80xvrwbdv796wjgr914v393wfa07j5wbd1"; depends=[]; }; LEANR = derive2 { name="LEANR"; version="1.4.9"; sha256="053xy13ys5hibafdnbkwqdk36hw7dhanp4frfacpfpn5f9nfh95r"; depends=[foreach igraph]; }; LEAP = derive2 { name="LEAP"; version="0.2"; sha256="1yrhanxvr7krvllqzv17qkc4wvmd7mgl57am8sn53773dbfipfc4"; depends=[]; }; @@ -2148,21 +2166,21 @@ in with self; { LOST = derive2 { name="LOST"; version="1.3"; sha256="01ymnczsnfml04hb6hbi041khkz2aki78qr3hriw7n3bzs5i7xim"; depends=[e1071 gdata MASS miscTools pcaMethods rgl shapes]; }; LPBkg = derive2 { name="LPBkg"; version="1.2"; sha256="1pgv6cb7m2j7qnrzybnv6x67a3ry8kpvisqj86rvxzclc9q56fdn"; depends=[Hmisc orthopolynom polynom]; }; LPCM = derive2 { name="LPCM"; version="0.46-3"; sha256="1bm5y95lzwcv8arlh55sy17m6hz1x48bcjkrwf3x34ax90qimf66"; depends=[]; }; - LPGraph = derive2 { name="LPGraph"; version="2.0"; sha256="1d3czxihaz3f09bfb34knqb6prhcx50kh8y4qrhhakic999z6ifw"; depends=[car PMA SDMTools]; }; + LPGraph = derive2 { name="LPGraph"; version="2.1"; sha256="1d2kslravi3v9kf6sdabwfpa9s9xxqj3s3d7f7qfcrpfydqixq1q"; depends=[car PMA]; }; LPKsample = derive2 { name="LPKsample"; version="2.0"; sha256="1jg99025vk42rnjdymh3nj71npn4pmdsmk6rvnx3lykpi72f85dz"; depends=[apcluster igraph mclust]; }; LPM = derive2 { name="LPM"; version="2.8"; sha256="0a4cf7chjyfwp1s8dfyfgbm2k6nybfmfh4bhz8b8pfj1an68bdr6"; depends=[fracdiff MASS powdist]; }; - LPRelevance = derive2 { name="LPRelevance"; version="2.1"; sha256="0hcg8yl6l8r0aybprrn0zi8mkwp2wldbh53w9dagfrpnz5la05qa"; depends=[BayesGOF Bolstad2 ggplot2 leaps locfdr polynom reshape2]; }; + LPRelevance = derive2 { name="LPRelevance"; version="3.0"; sha256="0rrk9rs964jbvf2qfr7lzq8bfbl1zgyn84lhpqvr8ylppvs49raw"; depends=[BayesGOF Bolstad2 caret ggplot2 glmnet leaps locfdr MASS polynom reshape2]; }; 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="1.0.0"; sha256="0jgz8rkhhsdiwz7jq568axcsfwlkzdpwssr76zx33r0gz6mf3lln"; depends=[nleqslv]; }; LPmerge = derive2 { name="LPmerge"; version="1.7"; sha256="1wf7hfj670pnzzxyqm3vwrbrvxdbyprh42s5vpv4y54a0w4nr83g"; depends=[Matrix Rglpk]; }; LPower = derive2 { name="LPower"; version="0.1.1"; sha256="00sabp2snfm0175c0cfyv83yd1zb3b8h2wrr7yxgkmr4i3py1fn7"; depends=[MASS nlme]; }; - LRQMM = derive2 { name="LRQMM"; version="1.2.0"; sha256="0v8jxpg1rpr9fm9069zh8846z5l0ad71i229pvsilvdrn1m4vf3l"; depends=[corpcor GeneticsPed kinship2 Matrix MCMCglmm quantreg SparseM sparsesvd]; }; + LRQMM = derive2 { name="LRQMM"; version="1.2.1"; sha256="1lwhswzi1zn9yiqv9dgn5m6m03wwagldm2n804cwxdfq96c9vhcb"; depends=[corpcor GeneticsPed kinship2 Matrix MCMCglmm quantreg SparseM sparsesvd]; }; LRTH = derive2 { name="LRTH"; version="1.3"; sha256="08vakwb7ca7956gifynzijka441yyx0wd5bq5jfhz56lzcxgfb99"; depends=[]; }; LRcontrast = derive2 { name="LRcontrast"; version="1.0"; sha256="0fs06p853r42nws2camvs87py39hb1ssxhfm6d5n9kkq81snfx4q"; depends=[DoseFinding]; }; LS2W = derive2 { name="LS2W"; version="1.3.4"; sha256="1h4vvl1gfxkdjmy6syl0gf4fv03xxxw82cxwvy10b40sf20lwmnv"; depends=[MASS wavethresh]; }; - LS2Wstat = derive2 { name="LS2Wstat"; version="2.1-1"; sha256="0y9di5n8ls4xzw0yrh0kx8c73s4wf1kzdyy8ssk6garvjln9dn9v"; depends=[geoR LS2W matrixStats RandomFields spdep]; }; + LS2Wstat = derive2 { name="LS2Wstat"; version="2.1-2"; sha256="1rgca2np80m0jqdsp69xys3h6x1sz0jirl3gmww8mcls5gk4v30v"; depends=[LS2W matrixStats RandomFields spdep]; }; LSAfun = derive2 { name="LSAfun"; version="0.6.1"; sha256="1q43ds1779w4m4al8brqj4h4y7ys5q5ysw7jbdrxdrw4lwdh7qlf"; depends=[lsa rgl]; }; LSAmitR = derive2 { name="LSAmitR"; version="1.0-2"; sha256="15qyij193scrvc1ghcssr6qdzxc4l4qh199s09bz5hvr62zwfdgb"; depends=[Hmisc lme4]; }; LSC = derive2 { name="LSC"; version="0.1.5"; sha256="1nlnwqb24sbgvl96azh8a833ij5xknjr2wr8shs59lm2n63a3ql9"; depends=[fields gam LICORS Matrix RColorBrewer]; }; @@ -2173,15 +2191,14 @@ in with self; { LSPFP = derive2 { name="LSPFP"; version="1.0.0"; sha256="074qd7zxa54cawipmba1khb6hyrkg553vc25gf2z0ydyv14shm0w"; depends=[bit64 data_table R_utils RCurl seqinr tcltk2]; }; LSRS = derive2 { name="LSRS"; version="0.2.0"; sha256="0p70v5vbxi1rf055mqgsp8v0lxnaj53bmbghli1764yn3x1k3iw6"; depends=[]; }; LTPDvar = derive2 { name="LTPDvar"; version="1.2"; sha256="0r9v5g5y9n85jdcvm7zpapm73ism48m3mmybpcmgcs028h2ndv7v"; depends=[]; }; - LTR = derive2 { name="LTR"; version="1.0.0"; sha256="15g5hbrwhab80sarbjgwzvsn6c4fl18h014kz5fpzf0n1rijybik"; depends=[]; }; LTRCtrees = derive2 { name="LTRCtrees"; version="1.1.0"; sha256="07mvbk3hwl240r46ahha0a4fzq96awk963zl8dhky51b6abp83gz"; depends=[icenReg inum partykit rpart survival]; }; LUCIDus = derive2 { name="LUCIDus"; version="1.0.0"; sha256="1gkbfb7gnlk19iy7wnls80h3mqa0y13fld1l5ivhskr7sjlla2q0"; depends=[boot doParallel foreach glasso glmnet lbfgs Matrix mvtnorm networkD3 nnet]; }; LVGP = derive2 { name="LVGP"; version="2.1.5"; sha256="03sd777s16nv04ikn9b3rj67ad6n4bwi0rycc7wqdnq0dx6xgniy"; depends=[lhs randtoolbox]; }; LW1949 = derive2 { name="LW1949"; version="1.1.0"; sha256="147ymp7j98ihp1dcz3p5v9ar6h767phjdnga5q5vf1wwa2mxawg7"; depends=[MASS mgcv plotrix]; }; LZeroSpikeInference = derive2 { name="LZeroSpikeInference"; version="1.0.3"; sha256="15x29afaq13iwlj66h97k3kczg9rfgp6i9d76rji58hfgh8i8by6"; depends=[]; }; - LaF = derive2 { name="LaF"; version="0.8.0"; sha256="1nasj0502i0dbzqgm1pdvmc0wj1hk2q5fzanpcsh7zslsikiqxyq"; depends=[Rcpp]; }; + LaF = derive2 { name="LaF"; version="0.8.4"; sha256="1mj010bl4ql0hm33vl0dd08s9dab11y9fa32nsqs6kbb22gjzk6p"; depends=[Rcpp]; }; LabRS = derive2 { name="LabRS"; version="0.1.0"; sha256="1a9qafimia83qldsif5wfqx273mvqbx22p5i0hg8n4jvj4vzpy2w"; depends=[knitr]; }; - LabourMarketAreas = derive2 { name="LabourMarketAreas"; version="3.2.3"; sha256="0pi1f25mgqp9sxbxsjv8335bi70cinnvapzwp8m2mfizcpbqw9hq"; depends=[data_table maptools rgdal rgeos sp spdep]; }; + LabourMarketAreas = derive2 { name="LabourMarketAreas"; version="3.2.4"; sha256="0xm6rn8r5z3b04zd7gdrclhzmqcvqxyyjlch5npdyq8sbfd163hh"; depends=[data_table maptools rgdal rgeos sp spdep]; }; LadR = derive2 { name="LadR"; version="1.0.6"; sha256="14n58y1p14wwxwwrbdqv2kkplma8ficpqx8nd22qp931idijpsji"; depends=[L1pack]; }; LagSequential = derive2 { name="LagSequential"; version="0.1.1"; sha256="1i8h4acfx21r0kxbg4i0k48kvhwy2abri191wp4b22amhz4vqyyd"; depends=[]; }; Lahman = derive2 { name="Lahman"; version="7.0-1"; sha256="02f4402nsx3fr31j34lwc0jrygqwznzynn2c11nilgw5bcb29gh9"; depends=[dplyr]; }; @@ -2190,7 +2207,7 @@ in with self; { LambertW = derive2 { name="LambertW"; version="0.6.4"; sha256="09ygalklv0d767nwziqwaxa7h517rzqgaznmb04q43122x2gwb3k"; depends=[ggplot2 lamW MASS RColorBrewer Rcpp reshape2]; }; Langevin = derive2 { name="Langevin"; version="1.2.1"; sha256="1bl7145585z173jv8y6f36ba29q1iq29anm44bdq9hcpql235ihy"; depends=[Rcpp RcppArmadillo]; }; LaplaceDeconv = derive2 { name="LaplaceDeconv"; version="1.0.4"; sha256="0n56cmrb536j1vmfizzag1x8wm68c2znpclwbdl8qraqzp8rmffx"; depends=[orthopolynom polynom]; }; - LaplacesDemon = derive2 { name="LaplacesDemon"; version="16.1.1"; sha256="0xxx8967v015fy56m0hqfnr1mwgisj8ximdl05bs28ymzvdx37kp"; depends=[]; }; + LaplacesDemon = derive2 { name="LaplacesDemon"; version="16.1.4"; sha256="1nv1kx86cg8f2s8q15pzskc0lg94bb250p0fhybrx5sjqv1s2lj1"; depends=[]; }; LassoBacktracking = derive2 { name="LassoBacktracking"; version="0.1.2"; sha256="1z1cnj6r6cq3b8xa9qck3ijfmzsr70r2p9m1ndakijb36pgwrzcs"; depends=[Matrix Rcpp]; }; LassoNet = derive2 { name="LassoNet"; version="0.8.3"; sha256="02m0g078wg9ka3ck92nrpqrm3msw1m7r8k43brcaiffqwhky99vy"; depends=[Rcpp]; }; LassoSIR = derive2 { name="LassoSIR"; version="0.1.1"; sha256="0ap8335ms12nsc7jvd48244zya54w05wj91qkhb0i63730r508c3"; depends=[glmnet]; }; @@ -2205,9 +2222,9 @@ in with self; { LearnBayes = derive2 { name="LearnBayes"; version="2.15.1"; sha256="0ch54v2zz2yyyk0lvn5rfikdmyz1qh9j1wk3585wl8v58mc0h4cv"; depends=[]; }; LearnGeom = derive2 { name="LearnGeom"; version="1.4"; sha256="0qalhy4g47ik8cq2m1zajhv79rla8g72dmcwhnizwn6afhm6fnpm"; depends=[]; }; LearningRlab = derive2 { name="LearningRlab"; version="1.3"; sha256="14q8pm51yrfpny2wg5l0x02zibh7qn11zkg51igadq3r6256rfd1"; depends=[crayon magick]; }; - LendingClub = derive2 { name="LendingClub"; version="2.0.0"; sha256="13qh5p4ksvgd1pmc4mdp8p44ra34fvp3s5p5vhlkpclkv5d4mxq2"; depends=[dplyr httr jsonlite plyr readr]; }; LexisNexisTools = derive2 { name="LexisNexisTools"; version="0.3.0"; sha256="19fcyvq2gs6iyks5x2s0xvbxqzvh9h7hpympvyrsx4026zv8x5cz"; depends=[data_table pbapply quanteda stringdist stringi tibble]; }; LexisPlotR = derive2 { name="LexisPlotR"; version="0.4.0"; sha256="0vlm8wcaj3755cbxrfb7ybla9znd2cbklw2xwyyn6r9i4c9xsfih"; depends=[dplyr ggplot2 tidyr]; }; + LibOPF = derive2 { name="LibOPF"; version="2.5.0"; sha256="1jnqb9fbyfk3pakjj8mbkdp2ky8v8gsql02mxlfflji9vliy9dq5"; depends=[]; }; LiblineaR = derive2 { name="LiblineaR"; version="2.10-8"; sha256="17ykazac7iv02bxl8xg948vhbdr32icdm1v4bk31zmslp4xsk08g"; depends=[]; }; LiblineaR_ACF = derive2 { name="LiblineaR.ACF"; version="1.94-2"; sha256="1ldkb63yhm1ki8i585wp5byx6y0kvclwy3ncacgcdqqk0p41cyi6"; depends=[]; }; Libra = derive2 { name="Libra"; version="1.6"; sha256="0fqmc6fhcmpg9ragk4r4k000wrix9dsd52baz58bp1c80wpvvcf3"; depends=[nnls]; }; @@ -2216,7 +2233,7 @@ in with self; { LightningR = derive2 { name="LightningR"; version="1.0.2"; sha256="1va673aw2hgir8ybbjad6dhbs8izs1z4jcikwa7qp3mkv0zqd0vq"; depends=[httr R6 RCurl RJSONIO]; }; LilRhino = derive2 { name="LilRhino"; version="1.2.0"; sha256="1d1mg77k67b5ddlp41haygagash48b6jy30q20lb231lbiss9ncp"; depends=[beepr data_table dplyr e1071 fastmatch FNN ggplot2 keras neuralnet readr SnowballC stringi textclean tm]; }; LinCal = derive2 { name="LinCal"; version="1.0"; sha256="1xr9jnna20hh78dh9wjg70jm8fhaxvdwql894kdp0y5h4pchkdph"; depends=[]; }; - LinRegInteractive = derive2 { name="LinRegInteractive"; version="0.3-2"; sha256="0axczfd71i62bi82spraf3s780yq47p3gb0kpicgdnnmbrj683rl"; depends=[rpanel xtable]; }; + LinRegInteractive = derive2 { name="LinRegInteractive"; version="0.3-3"; sha256="1rkxvkv3ls0cgqcvs74dy6qabh62cjc0xh89dlk88bpc8mz76k8z"; depends=[rpanel xtable]; }; LindenmayeR = derive2 { name="LindenmayeR"; version="0.1.13"; sha256="01wnvmxdb91ai21h3plgsmy6ds7564s5wq2xyr905ma4a2d8afn5"; depends=[stringr]; }; LindleyPowerSeries = derive2 { name="LindleyPowerSeries"; version="0.1.0"; sha256="1nylsmxx1s6g5dzz69kaqccx3c7hzb49jan22b94816pnzd0k7zp"; depends=[lamW]; }; LindleyR = derive2 { name="LindleyR"; version="1.1.0"; sha256="163i604q683znp6q544hnv4vibygwvsxcfhh8m7iaqr42li3c0ak"; depends=[lamW]; }; @@ -2241,7 +2258,7 @@ in with self; { LogitNet = derive2 { name="LogitNet"; version="0.1-1"; sha256="08xi5rpbqkc1b3qj24blv3l0r68wcqbsbjcqxiypm75f3c2irc4i"; depends=[]; }; LogrankA = derive2 { name="LogrankA"; version="1.0"; sha256="005zkpzi8h03qvqlpkygrf9xv4q77klafkfxw47x04jvkhklwigb"; depends=[]; }; LogrankPower = derive2 { name="LogrankPower"; version="1.0.0"; sha256="04vynymfv01q423dd9i1li92rl3lp1af3rzn3z4mamkn51mi6my0"; depends=[survival survminer]; }; - LongCART = derive2 { name="LongCART"; version="1.0"; sha256="03fh4glvk48lhmx2lp3vcy9k6jnfnzn73dpljq73fl8zlbr8vv61"; depends=[Formula nlme rpart]; }; + LongCART = derive2 { name="LongCART"; version="1.1"; sha256="0arrv72jmp1v5vr0lf7ng56cbagjxad01hx80220a0nglbyjvgxf"; depends=[Formula nlme rpart]; }; LongMemoryTS = derive2 { name="LongMemoryTS"; version="0.1.0"; sha256="0n378sad8i283vs7q63spdhwpwjly2d5zj15d4v2085j7sc7z8vi"; depends=[fracdiff longmemo mvtnorm partitions Rcpp RcppArmadillo]; }; LoopAnalyst = derive2 { name="LoopAnalyst"; version="1.2-6"; sha256="1gy9v6qiwkwbwp4snif2imf6zn50ffjrig54ln57c5v5pk3phnvv"; depends=[nlme]; }; LoopRig = derive2 { name="LoopRig"; version="0.1.1"; sha256="11rarb9fg8abc4dpd8sd8safqw3v6g8k6rcrg2nw97xppwcz8c6b"; depends=[GenomicRanges IRanges S4Vectors]; }; @@ -2265,7 +2282,7 @@ in with self; { 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]; }; + MARSS = derive2 { name="MARSS"; version="3.10.12"; sha256="09b0q9aq1y4nrgpvr1xkzibv5xf9qdcaxlz02zl9sv4x1zmpi80w"; 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.5"; sha256="1k0m7pa4gb5apzrrkb5kx5d7bmkm2pl5g15vwb6j067hrqahck26"; depends=[]; }; MASSTIMATE = derive2 { name="MASSTIMATE"; version="1.4"; sha256="1lpmpxgqnczlizx5gwgw96kxqkjqvbjqwf373zkvfmax2pfqr6dn"; depends=[]; }; @@ -2285,8 +2302,8 @@ in with self; { MBESS = derive2 { name="MBESS"; version="4.6.0"; sha256="1fc2zcjfk9k107bl3fs3wf8fxxrcpwyhiz7j1iv3w6zqf2l4fb88"; depends=[boot gsl lavaan MASS mnormt nlme OpenMx sem semTools]; }; MBHdesign = derive2 { name="MBHdesign"; version="2.1.6"; sha256="188kx7594qsxq5wnkpzh3xm6rjvsyj5r4hv8kqaa2mcqp5730k1j"; depends=[class geometry mgcv mvtnorm randtoolbox]; }; MBI = derive2 { name="MBI"; version="1.0"; sha256="1lb0sjwa6x360n9a9pagz6yhxh37gxq1fk0f5c3i2sd56ny9jpns"; depends=[]; }; - MBNMAdose = derive2 { name="MBNMAdose"; version="0.2.4"; sha256="0d5fi1i2sr39z5fdl303rjhxvp5h622zbkpfsv3yjq4vp0ymwka0"; depends=[checkmate dplyr magrittr R2jags Rdpack reshape2 rjags scales]; }; - MBNMAtime = derive2 { name="MBNMAtime"; version="0.1.2"; sha256="13742y17aclqbsbc039vlnmrg5sa1y6kjsdayl8ii9xnhbb5f48l"; depends=[checkmate dplyr magrittr R2jags Rdpack reshape2 rjags]; }; + MBNMAdose = derive2 { name="MBNMAdose"; version="0.2.7"; sha256="1r8gz0kpkmgs1czyzwrv018l0z8gypwjdd4gmwbbhhaj84fr3gni"; depends=[checkmate dplyr magrittr R2jags Rdpack reshape2 rjags scales]; }; + MBNMAtime = derive2 { name="MBNMAtime"; version="0.1.3"; sha256="1yyynsdgxdw3zfv0byxbjli332wc3bm8pfhrcy4rsvvvhj458vy7"; depends=[checkmate dplyr magrittr R2jags Rdpack reshape2 rjags]; }; MBSGS = derive2 { name="MBSGS"; version="1.1.0"; sha256="1h5vhmpgrqza12j7ivhwgd5wyb7kkb8mjbxl5w756vyid8g03flz"; depends=[MASS MCMCpack mgcv mnormt truncnorm]; }; MBSP = derive2 { name="MBSP"; version="1.0"; sha256="0mds6jfqgmnm4saqqqqqfcg8zh4qsvd2503g3ij1sn70f0aakwaj"; depends=[coda GIGrvg MASS Matrix MCMCpack]; }; MBmca = derive2 { name="MBmca"; version="0.0.3-5"; sha256="0p7ddpsy4hwkfwyyszidi33qpdg4xllny7g9x24gk782p7kjfgq9"; depends=[chipPCR robustbase]; }; @@ -2298,31 +2315,34 @@ in with self; { MCI2 = derive2 { name="MCI2"; version="1.1.2"; sha256="1vxzfab8yn18icarsdvz8ky7frspxax22sb8c0ki91y1mj9m9mgj"; depends=[MCI osrm REAT reshape tmaptools]; }; MCL = derive2 { name="MCL"; version="1.0"; sha256="1w36h4vhd525h57pz6ik3abbsrvxnkcqypl2aj1ijb6wm7nfp4ri"; depends=[expm]; }; MCMC_OTU = derive2 { name="MCMC.OTU"; version="1.0.10"; sha256="15k3y4bm4cxjb6r30afpw9gksflsxigzb17zwm1ipygq0d0h0zkg"; depends=[coda ggplot2 MCMCglmm]; }; - MCMC_qpcr = derive2 { name="MCMC.qpcr"; version="1.2.3"; sha256="0b9n793spljmsb58jp41vnl9c753xqaw1g4wbi4ax348cvi09jk8"; depends=[coda ggplot2 MCMCglmm]; }; + MCMC_qpcr = derive2 { name="MCMC.qpcr"; version="1.2.4"; sha256="0v0d43wnq3swbrcsbg9qmwkmk4s50grd6cik4ng5baj2i6i4hd2n"; depends=[coda ggplot2 MCMCglmm]; }; MCMC4Extremes = derive2 { name="MCMC4Extremes"; version="1.1"; sha256="06p6xdbja7vrdq4vnhybpkmyf4rkaihcmy9sc81sb0h2wa21vcq0"; depends=[evir]; }; MCMCglmm = derive2 { name="MCMCglmm"; version="2.29"; sha256="1d37rk10zi2yymsxif9091z9lnav7p4cazjfq29fhj90x8vpifhk"; depends=[ape coda corpcor cubature Matrix tensorA]; }; - MCMCpack = derive2 { name="MCMCpack"; version="1.4-5"; sha256="1dfz3impsb70nq7qyk5aj5ixslj2zvwcl1mfqvqzy6zp8kx9r56s"; depends=[coda lattice MASS mcmc quantreg]; }; + MCMCpack = derive2 { name="MCMCpack"; version="1.4-6"; sha256="1ivkm35hkfxgd67hbsga7mghki6np4cfmg719s2sd2d5dy6h3kbb"; depends=[coda lattice MASS mcmc quantreg]; }; MCMCprecision = derive2 { name="MCMCprecision"; version="0.4.0"; sha256="0r0qchiv61sk3drrb0rhwsk55gci4w343hd2gsvclrlyb8r9qhaf"; depends=[combinat Matrix Rcpp RcppArmadillo RcppEigen RcppProgress]; }; MCMCtreeR = derive2 { name="MCMCtreeR"; version="1.1"; sha256="00r6f62h7ryil7qxd25icvkqypjjssjsrz4i5sbqsnw5cdy5al8z"; depends=[ape coda sn]; }; - MCMCvis = derive2 { name="MCMCvis"; version="0.13.5"; sha256="0pgihhmizp8dq9fb23ln2m2rbj97r2433n16krji3cm9ji33wndd"; depends=[coda overlapping rstan]; }; + MCMCvis = derive2 { name="MCMCvis"; version="0.14.0"; sha256="0j4a749rc5sj4jd000d28llx7kzn0z1n2p565yvsrj92qnja300p"; 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]; }; - MCPModGeneral = derive2 { name="MCPModGeneral"; version="0.1-0"; sha256="1660r7ibgj5jl5nf3p11911n8k3wbnnzagapn73f2g5racwrbx1d"; depends=[DoseFinding MASS]; }; + MCPMod = derive2 { name="MCPMod"; version="1.0-10.1"; sha256="0j15dpxy62vwbd6pcsvkbpi1nklh0yjzwf53kcmv4jhj0v6xmpp9"; depends=[lattice mvtnorm]; }; + MCPModGeneral = derive2 { name="MCPModGeneral"; version="0.1-1"; sha256="0izhbiivlb818ak49hl1f7li1chlyrxk5f80cmw4zkim3l6ddaxq"; depends=[DoseFinding MASS]; }; + MCPModPack = derive2 { name="MCPModPack"; version="0.1"; sha256="110v5gvxc3l138152lzkb98ljrcq5373bykd0dsczc315x4h5wp3"; depends=[devEMF flextable mvtnorm officer Rcpp RcppEigen RcppNumerical shiny shinydashboard]; }; MCS = derive2 { name="MCS"; version="0.1.3"; sha256="1kiz1jq1bm2n8f33nsybp5jfrzzl9xbsi3m9l8818ybmph99xms6"; depends=[]; }; MCSim = derive2 { name="MCSim"; version="1.0"; sha256="1nqry41qa5c02an5fxm3y1g3w1vcqjgsy1an95i3szz1w1ndaj14"; depends=[CircStats MASS]; }; MCTM = derive2 { name="MCTM"; version="1.0"; sha256="14xjfskyrqi0m58lkwjfjpss5j7wy3ajr148n526czrrpccg108j"; depends=[]; }; MChtest = derive2 { name="MChtest"; version="1.0-3"; sha256="1b3p6ry8gkvyphakn3504ibl2x8dbhx95saild0mj0iwm3sjyspf"; depends=[]; }; MConjoint = derive2 { name="MConjoint"; version="0.1"; sha256="02yik28mhvd4rfqwrprdbdjx9c49ds55fh042bsjajs2ip467w5c"; depends=[]; }; + MDBED = derive2 { name="MDBED"; version="1.0.0"; sha256="1r3sizb2mqd4pqjy25krwmsjfkr6cl7lkd8db5jn3hgxx3qh6sgc"; depends=[doParallel foreach ggplot2 lattice orthopolynom psych Rdpack]; }; MDFS = derive2 { name="MDFS"; version="1.0.5"; sha256="17ksjgzi8sxyqczscq1rd6a8zgdd0h9sm3c0ymsf0phr69msvpg0"; depends=[]; }; MDMR = derive2 { name="MDMR"; version="0.5.1"; sha256="1pv57xl7pjsqxz1j8mnfmjaa36mlr749yb4c44ppdrx6khvw662x"; depends=[car CompQuadForm lme4]; }; MDPtoolbox = derive2 { name="MDPtoolbox"; version="4.0.3"; sha256="0aaw787fvcyhw6mbl42icgqfdzvfr618vg179984xqifafr40dyc"; depends=[linprog Matrix]; }; MDSMap = derive2 { name="MDSMap"; version="1.1"; sha256="0knrkfwgl763fwdb3ln3g5y3rarnpqdfgzxf4m045664m7gkipsg"; depends=[princurve reshape rgl smacof]; }; MDSPCAShiny = derive2 { name="MDSPCAShiny"; version="0.1.0"; sha256="0qsjx4v9j5p5a7h1g0xk4j5ib1mdrjsy84bglnjdxr9rpqg2m7n5"; depends=[dplyr MASS psych rmarkdown shiny]; }; + MDSS = derive2 { name="MDSS"; version="1.0-0"; sha256="1shksvj31ygkz048jw4zhqy13dq9c9myrxqs7bizv5yxyzk4bi89"; depends=[]; }; MDimNormn = derive2 { name="MDimNormn"; version="0.8.0"; sha256="080m0irx5v8l45fg9ig5yzcj92s3ah8a9aha288byszli1cchgpn"; depends=[]; }; MDplot = derive2 { name="MDplot"; version="1.0.1"; sha256="1xijh18hrkb807nfkdr7g642aspn5psc8nw29q387jl5hly2w8s9"; depends=[gplots gtools MASS RColorBrewer]; }; MED = derive2 { name="MED"; version="0.1.0"; sha256="0fy0qmxirkdz5kigy2r7l5czjzws0fhjxy13kv1kqh628ldrp109"; depends=[]; }; MEDITS = derive2 { name="MEDITS"; version="0.1.7"; sha256="0n3llnvpxd4bs1vslhmsahvl9vm0pmbmc94gijss16linpskxxkj"; depends=[ggplot2 hms raster rgdal rgeos sp tibble vegan]; }; - MEDseq = derive2 { name="MEDseq"; version="1.0.1"; sha256="13b41hs2s3syb8xbxjdpfk8gh40jv3gxd4dnfwz0mixfppwd5kd0"; depends=[cluster matrixStats nnet seriation stringdist TraMineR WeightedCluster]; }; + MEDseq = derive2 { name="MEDseq"; version="1.1.0"; sha256="1i6y9vv8f9m5nigqz4i9phcnfq30ihd5g2cfhxq1ky9l0f9bnx9f"; depends=[cluster matrixStats nnet seriation stringdist TraMineR WeightedCluster]; }; MEGENA = derive2 { name="MEGENA"; version="1.3.7"; sha256="0cr10pmj1n831scz5kgaq3nkglr3imwgc62cxng2dvdxr9991g21"; depends=[BH cluster doParallel foreach fpc ggplot2 ggraph ggrepel igraph Matrix Rcpp reshape]; }; MEMSS = derive2 { name="MEMSS"; version="0.9-3"; sha256="0fq85jrajfwavq2fvsw2x9hknc57wc253zw2vw970f04khfbragd"; depends=[lme4]; }; MEPDF = derive2 { name="MEPDF"; version="3.0"; sha256="15hbp7g5dsdpvi239jm6jn11fn371ir6la31g0flqkilq6sr1sqd"; depends=[gtools mvtnorm plyr pracma]; }; @@ -2330,20 +2350,21 @@ in with self; { MEclustnet = derive2 { name="MEclustnet"; version="1.2.2"; sha256="0rs58dafxngk2lkq14cy14ayjwgnz1gmi12jmi4z74sdj0b3h0gw"; depends=[e1071 ellipse latentnet MASS mvtnorm nnet vegan]; }; MEtest = derive2 { name="MEtest"; version="1.1"; sha256="0dxm3fs0lqnas70a1ckikvjp2ib9rqsknwcs9n9jfsmm1fqhxdpf"; depends=[statmod]; }; MF = derive2 { name="MF"; version="4.3.2"; sha256="1arnhyqf1cjvngygcpqk2g4d52949rhkjmclbaskyxcrvp62qln0"; depends=[]; }; - MFAg = derive2 { name="MFAg"; version="1.5"; sha256="0av47syfb0jkiix0xjnd208bz78gx5ji2y9kb7ni1yd7njm7in9m"; depends=[]; }; + MFAg = derive2 { name="MFAg"; version="1.6"; sha256="0iy1lmky7nagkm03inn6gv7qzz1jyi7fsgzp9iff0xv6d54kwcls"; depends=[]; }; MFDFA = derive2 { name="MFDFA"; version="1.1"; sha256="0nr78p6y4jpg1hrl0h7b7hyvwbr61paf85y3f2dx815x5hscmdhy"; depends=[numbers]; }; MFHD = derive2 { name="MFHD"; version="0.0.1"; sha256="0gb8y297y1x03wy46530psmlawyv4z5dydilk36qcmadlk1wx02k"; depends=[deldir depth depthTools fda_usc matrixStats]; }; MFKnockoffs = derive2 { name="MFKnockoffs"; version="0.9.1"; sha256="1bcdqfzmllp3dri1phy365wgc9c37wlag65pzljn4p3mf43w10nq"; depends=[corpcor glmnet gtools Matrix Rdsdp RSpectra]; }; MFPCA = derive2 { name="MFPCA"; version="1.3-4"; sha256="18wbas1g848865di96a19kmv0fsnds7cfv81nwhz6l6q8qmlnkf6"; depends=[abind foreach funData irlba Matrix mgcv plyr]; }; MFT = derive2 { name="MFT"; version="2.0"; sha256="0n1xws3dw0650037qyqgp600p8cf098qa5hkbncdfdbl0w34qamy"; depends=[]; }; - MGBT = derive2 { name="MGBT"; version="1.0.2"; sha256="0jgdy8zw5lx2f567n3livgmwhpfcd1s42mp1bj859jx3z5kiwkiy"; depends=[]; }; - MGDrivE = derive2 { name="MGDrivE"; version="1.1.0"; sha256="16nm47vazd06hvi4k3z86lxilgk8y4b3p44h6cm2b8az90irmj5f"; depends=[data_table R6 Rcpp Rdpack]; }; + MGBT = derive2 { name="MGBT"; version="1.0.4"; sha256="1x2yqfb5diqkq82j81slh9kxzxgyy67axyqlqjpv237yf8p0djc0"; depends=[]; }; + MGDrivE = derive2 { name="MGDrivE"; version="1.5.0"; sha256="1dgmmc34m2pj1l2gkwg85sj4rbhhwyrp8cj4m9b9hlz134n3qgwy"; depends=[R6 Rcpp Rdpack]; }; MGL = derive2 { name="MGL"; version="1.1"; sha256="03q453swnangxyc4nvjhzw2zpcy5vp1wpilap5rwymnf0c0xi4j7"; depends=[]; }; MGLM = derive2 { name="MGLM"; version="0.2.0"; sha256="0yyqm53lvp59zy8lkffw9x3zhqrnh29j5v3yyzk6qrgj2slnc7nk"; depends=[]; }; MGMS2 = derive2 { name="MGMS2"; version="1.0.1"; sha256="0pai8cf4czsscsw35plrqldmqryzn6zji41n4a3x73cr00msfxrb"; depends=[MALDIquant MALDIquantForeign]; }; MGRASTer = derive2 { name="MGRASTer"; version="0.9"; sha256="0jmf2900r56v60981sabflkhid3yrqd9xd7crb56vgfl1qkva9zp"; depends=[]; }; MGSDA = derive2 { name="MGSDA"; version="1.4"; sha256="0grwl740yvz2av5nkvmyyrr8ji5f39sjs1c5gxp6lp9p36i2wc32"; depends=[MASS]; }; MHCtools = derive2 { name="MHCtools"; version="1.2.1"; sha256="1mf70x1vd8h8i0iapl54fp8q4gpqd61faxvhpxlhv49g8s5n9pbd"; depends=[rlist]; }; + MHMM = derive2 { name="MHMM"; version="1.0.0"; sha256="0d3djaydw0h7x3vlaghrbgmx024rgv36wfsjhlixzzssb2d6lqzi"; depends=[BH ggplot2 gridExtra Rcpp RcppArmadillo reshape2]; }; MHTcop = derive2 { name="MHTcop"; version="0.1.1"; sha256="1mr8y8brsi37b5qx3fqm0bj90dgknzzwhxfmvyd9kxbxh19whgxq"; depends=[copula matrixStats MCMCpack mvtnorm stabledist]; }; MHTdiscrete = derive2 { name="MHTdiscrete"; version="1.0.1"; sha256="0czpsk4jiwbzd6g2dwssmggsdhwchikmc1skv48d9j4xvglns7yw"; depends=[]; }; MHTmult = derive2 { name="MHTmult"; version="0.1.0"; sha256="1y3vh2kab6nfkiz4nzdhrpy9h6drk1ibfd2h62hpr3y09z9a2yld"; depends=[]; }; @@ -2354,6 +2375,7 @@ in with self; { MIICD = derive2 { name="MIICD"; version="2.4"; sha256="1xlvhyh3gg77cym10i8hrxm8r1jm4plvny2c4izic6w89snplyq6"; depends=[MASS mstate survival]; }; MIIVsem = derive2 { name="MIIVsem"; version="0.5.4"; sha256="1fb4xnbp6c3c2dx3jhyqw463ghj4ak8jld148dyrmi9031mqv4fy"; depends=[boot car lavaan Matrix numDeriv]; }; MILC = derive2 { name="MILC"; version="1.0"; sha256="14xsiw5al6kixwvf3ph0dlm8s13gsbqvzb92da6ng3x4iiyb1g0w"; depends=[]; }; + MIMSunit = derive2 { name="MIMSunit"; version="0.8.2"; sha256="1fl7lg4f0dbk9sfrh85ay5pmyfyfmxlsrx5y7x0d86ar76nmk5al"; depends=[caTools dplyr dygraphs ggplot2 lubridate magrittr matlab plyr R_utils RColorBrewer readr signal stringr xts]; }; MIPHENO = derive2 { name="MIPHENO"; version="1.2"; sha256="0hcaq66biv4izszdhqkgxgz91mgkjk1yrwq27fx07a2zmzj44sfv"; depends=[doBy gdata]; }; MIXFIM = derive2 { name="MIXFIM"; version="1.1"; sha256="1xx25b7hfyzynfh3vsqrkriqnqnn173gn8j1vwqmc434c1vy4nx2"; depends=[ggplot2 mvtnorm rstan]; }; MImix = derive2 { name="MImix"; version="1.0"; sha256="033gxr0z2xba0pgckiigblb1xa94wrfmpgv3j122cdynjch44j4r"; depends=[]; }; @@ -2362,6 +2384,8 @@ in with self; { MKdescr = derive2 { name="MKdescr"; version="0.5"; sha256="0dgdglr173pjlvbh9kd67pl890pnlzlcfm04ax4bdas6gp1cb6j6"; depends=[ggplot2 scales]; }; MKinfer = derive2 { name="MKinfer"; version="0.4"; sha256="1rs0vjq9d5hhrlw98vxnss4ph8hyqws4wx4wlikfqpp42v96yxl4"; depends=[arrangements boot ggplot2 MKdescr nlme]; }; MKmisc = derive2 { name="MKmisc"; version="1.6"; sha256="0x518icdgq4mrc6qm1flb5lpr9y7j9znh0ah3gw2xsbjiplqd323"; depends=[ggplot2 limma RColorBrewer robustbase scales]; }; + MKomics = derive2 { name="MKomics"; version="0.5"; sha256="0mr0y1ai3jf3jj4dqvs6xv3clgli7d7lzqk8ya6zah388rqmkg9s"; depends=[limma RColorBrewer robustbase]; }; + MKpower = derive2 { name="MKpower"; version="0.4"; sha256="1s9njvdjpqn4i4dxarb9agcdmx9dx1g4icg7mfp8bd6rnslsscn5"; depends=[coin ggplot2 matrixTests MKdescr MKinfer qqplotr]; }; ML_MSBD = derive2 { name="ML.MSBD"; version="1.2.0"; sha256="1dxvvyha984j3h170s2brhbf4lm53f16f12lhnqf3sl4sc0f4xv8"; depends=[ape foreach]; }; MLCIRTwithin = derive2 { name="MLCIRTwithin"; version="2.1.1"; sha256="1x0xmka7kkbjnh3yv4zxxyl17cpmf0rb9hxmdl1srb6ijld4np1b"; depends=[limSolve MASS MultiLCIRT]; }; MLCM = derive2 { name="MLCM"; version="0.4.2"; sha256="14sd9ybwyilympnbyaqmwdrbip4vyn1p93rh9mlxls3bmk6nc4hv"; depends=[]; }; @@ -2372,16 +2396,17 @@ in with self; { MLID = derive2 { name="MLID"; version="1.0.1"; sha256="0ygahmcfbydzic5q3h1ppv5b2ks4lh8mcyfqq27ssmn4g1n6hdvp"; depends=[lme4 nlme]; }; MLML2R = derive2 { name="MLML2R"; version="0.3.3"; sha256="1jgk0h3chab831g5nsppgc6p0xplv11j82491iymnxixqfswb08w"; depends=[]; }; MLMOI = derive2 { name="MLMOI"; version="0.1.1"; sha256="0fliax6ajacm2i416xi26qlwg3y7iw8y6hykkz0mcwp7djyn3n6s"; depends=[Rdpack rJava Rmpfr XLConnect]; }; + MLModelSelection = derive2 { name="MLModelSelection"; version="1.0"; sha256="1qfy2rfx2nvkwisl9wwllqsq2qhqzsdmrh90z5zn5qs07d0305wn"; depends=[MASS Rcpp RcppArmadillo RcppDist]; }; MLPUGS = derive2 { name="MLPUGS"; version="0.2.0"; sha256="1yda37073g640g1qrkjrwa8hbyq6bjlcw3wpznx0bk5h0639bc0s"; depends=[]; }; MLRShiny = derive2 { name="MLRShiny"; version="0.1.0"; sha256="06zcyz8l4754sjbcql3jd3nq1d2lgj92p5h2bh708z52mww71isw"; depends=[corrgram dplyr forecast psych QuantPsyc shiny shinyAce]; }; MLRShiny2 = derive2 { name="MLRShiny2"; version="0.1.0"; sha256="1ygamp0ldz1i0w2xyi205rpd1gd5asw61l36z06j41ghdyiz1lww"; depends=[corrgram dplyr forecast psych QuantPsyc shiny shinyAce]; }; MLZ = derive2 { name="MLZ"; version="0.1.3"; sha256="0yj9241k3yk8qy6w2q26gwbj9b9qynv3s3jpyfxixvkc9kji3wc2"; depends=[dplyr ggplot2 gplots RcppEigen reshape2 TMB]; }; - MLeval = derive2 { name="MLeval"; version="0.2"; sha256="1dv795x8v78b6kpwdzmy0zlyrhwpf7gdwiss51d2kpp4h74ylsgr"; depends=[ggplot2]; }; + MLeval = derive2 { name="MLeval"; version="0.3"; sha256="1g2w5lrr7199n4zyaalbp9xdgl858hdg1pqr3rpd7v5fmamawc69"; depends=[ggplot2]; }; 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="2.0.1"; sha256="1rmzzfzw1hpsmvgc9pcqqf9k8p4fvdh6pizy4sjvavphqvzjfnj6"; depends=[MASS Matrix Rcpp RcppEigen]; }; + MM4LMM = derive2 { name="MM4LMM"; version="2.0.2"; sha256="0zcaqxz1yxv2lkp39ly4jkl9wk94k7md5ks5wjk9l1qk7k5q7yx9"; depends=[MASS Matrix Rcpp RcppEigen]; }; MMAC = derive2 { name="MMAC"; version="0.1.2"; sha256="1xwz48iizf0lvmhc7krsraabc49ky85qvgr23w4ip6jzfv4sn1jr"; depends=[]; }; MMDai = derive2 { name="MMDai"; version="1.4.0"; sha256="0bb7hg8fkmzg87xr1b2hxhy75xi461ks6w12z85k4c77kswfpx3b"; depends=[DirichletReg]; }; MMDvariance = derive2 { name="MMDvariance"; version="0.0.9"; sha256="1yiqabifym7gdknqrhfnql6qc8p163npzrrckbyqjry3yvkqr5wi"; depends=[Biobase lawstat MASS]; }; @@ -2391,17 +2416,16 @@ in with self; { 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]; }; - MNLpred = derive2 { name="MNLpred"; version="0.0.1"; sha256="1h8qnirhvlskhm7zg7h8jbx76r53gywpswxyj4w7gb04qhdkzmhl"; depends=[MASS tibble]; }; + MNLpred = derive2 { name="MNLpred"; version="0.0.2"; sha256="0b3pgy9hqxwzvw61arvz9zlhx1j4fy9qmzwwzxf67b4ybmkzzsgl"; depends=[MASS]; }; MNM = derive2 { name="MNM"; version="1.0-3"; sha256="16b2yrm2kn943vzrr38qhk6qq20a842xv7iiln4is02csijxw2b3"; depends=[ellipse ICS ICSNP SpatialNP]; }; MNP = derive2 { name="MNP"; version="3.1-0"; sha256="06qs2vsmjs6rcpqlwfc1n5y5hzxf7pngbdmiza1wijm9hh54ikh0"; depends=[MASS]; }; MNS = derive2 { name="MNS"; version="1.0"; sha256="0if46a6rw0f2d72wnykkaa5z5b1p2c0r43il6cbwbcnnb3zd8acb"; depends=[doParallel glmnet igraph MASS mvtnorm]; }; - MOCCA = derive2 { name="MOCCA"; version="1.3"; sha256="1ffpnqcrkrr7vh0f1fyyai0c2wq3v8sk2qhnhds49z7p6xrsmh21"; depends=[cclust class cluster clv]; }; - MODIS = derive2 { name="MODIS"; version="1.1.6"; sha256="0nby3j356hglf2hdddqyq8vm99ynwk4wjmqrbjl5k9pr9yjkhda8"; depends=[bitops curl devtools mapdata mapedit maps maptools ptw raster rgdal rgeos sf sp]; }; + MOCCA = derive2 { name="MOCCA"; version="1.4"; sha256="0g70s7hnmrp4sm8gx49vsijj54y4amlcy6axc4k37k4c9g4sdics"; depends=[cclust class clue cluster]; }; + MODIS = derive2 { name="MODIS"; version="1.1.7"; sha256="0k82xs5nladx3jkiar77kag9a36w9fdf6fga924sfsk1i4rrsigb"; depends=[bitops curl devtools mapdata mapedit maps maptools ptw raster rgdal rgeos sf sp]; }; MODISSnow = derive2 { name="MODISSnow"; version="0.1.0.0"; sha256="1p0mil074gapw6v8paw9595rzp85hxrfsc65llh0ljalmacwgx04"; depends=[gdalUtils lubridate raster RCurl]; }; - MODISTools = derive2 { name="MODISTools"; version="1.1.0"; sha256="0242jxxdkwi39ra160p42psgcgf8alwaij004v29apy03g95rrvd"; depends=[httr jsonlite memoise sf]; }; + MODISTools = derive2 { name="MODISTools"; version="1.1.1"; sha256="0188cffsnpy7nmb0c03i64674xyizx6imkymrwsj3mf9s77wa2v0"; depends=[httr jsonlite memoise raster sf]; }; MODIStsp = derive2 { name="MODIStsp"; version="1.3.9"; sha256="0zjc8q3zi2i0i7l1bmw558sxdcsjba2lh31i428cy9pd886j5jn3"; depends=[bitops data_table gdalUtils gWidgets gWidgetsRGtk2 httr jsonlite pacman raster rgdal rgeos sp stringr xml2 xts]; }; - MOEADr = derive2 { name="MOEADr"; version="1.1.0"; sha256="0q0bm13v85raq5hdfpzg4v5kj12zjh31fr1x0zv9g5blxy10dqgy"; depends=[assertthat FNN]; }; - MOJOV = derive2 { name="MOJOV"; version="1.0.1"; sha256="11mcqxw83z4xx29s34v4rsbb3zvyhlb2lmvf97b77n455gsy5hab"; depends=[aod lattice saws survey]; }; + MOEADr = derive2 { name="MOEADr"; version="1.1.1"; sha256="0aqkqw5ph5rvsgpasc94i264lxapr37gpjhk4rkkynph2gnvq1zx"; depends=[assertthat FNN]; }; MOLHD = derive2 { name="MOLHD"; version="0.2"; sha256="1lrl24x7iig15jwxigvqm3jdwnxkn948sxmywn6zi2b1a5hqz05k"; depends=[arrangements fields]; }; MOQA = derive2 { name="MOQA"; version="2.0.0"; sha256="17w4iwf38k0r2fiwqr420hkbbz1a3r89sqwnd2yn300zmaz64hpr"; depends=[gplots psych readr]; }; MOST = derive2 { name="MOST"; version="0.1.0"; sha256="0nmjx5hsn67hdglcqyanq3az76rs15knv8qy28f8paah5s9w24xf"; depends=[]; }; @@ -2417,10 +2441,11 @@ in with self; { MPS = derive2 { name="MPS"; version="2.3.1"; sha256="08yzynznf33y7y3pf7fayks5hi3cdvzwzn8axg7aky5kvi2bfv22"; depends=[]; }; MPSEM = derive2 { name="MPSEM"; version="0.3-6"; sha256="0kw3aixhl5j8nq4lcx65l80v4lihvpa4qd12n2jrc96lnm6mw00b"; depends=[ape MASS]; }; MPTinR = derive2 { name="MPTinR"; version="1.12.0"; sha256="0iv7hy0lmxadw34cq4gsb5i2my8lbvdfp23qadhiw6ca179hgamy"; depends=[Brobdingnag numDeriv Rcpp RcppEigen]; }; - MPTmultiverse = derive2 { name="MPTmultiverse"; version="0.3-3"; sha256="0wl5ww7ii8vbgg3680zh3y5pqz1ipfnhjka1lz62fmp3rs09zmfq"; depends=[coda dplyr ggplot2 limSolve magrittr MPTinR purrr readr reshape2 rlang runjags tibble tidyr TreeBUGS]; }; + MPTmultiverse = derive2 { name="MPTmultiverse"; version="0.4-0"; sha256="0n46sbbnkg2czqmvz3csqkgrr4gpdjqj6488wb6inlaww55kzc99"; depends=[coda dplyr ggplot2 limSolve magrittr MPTinR purrr readr reshape2 rlang runjags tibble tidyr TreeBUGS]; }; MPV = derive2 { name="MPV"; version="1.55"; sha256="127m19q5dq38x2k29rkgvvfidazbmzsarzf9m2sjpx6ay8j8hvpl"; depends=[KernSmooth]; }; MPkn = derive2 { name="MPkn"; version="0.1.0"; sha256="0nvd6sv1wypcmphm0wcymbibcxrqzx3c9s9b191p1pmxyz607vxv"; depends=[]; }; MPsychoR = derive2 { name="MPsychoR"; version="0.10-7"; sha256="10nphm5dzxha4xb7a21b0nxbqy55fg8k748qax7nq3rj4nfjaml7"; depends=[]; }; + MQMF = derive2 { name="MQMF"; version="0.1.0"; sha256="0pg120003zgnxw51agmfjzj8snkb19r1d4hyssxxl5y0ykxk1hn0"; depends=[MASS mvtnorm]; }; MRCE = derive2 { name="MRCE"; version="2.1"; sha256="12q7mqn2qkgv992df71k1xmli61khhbfm7lw0n7z2l7qqldpiw1n"; depends=[QUIC]; }; MRCV = derive2 { name="MRCV"; version="0.3-3"; sha256="0m29mpsd3kackwrawvahi22j0aghfb12x9j18xk4x1w4bkpiscmf"; depends=[tables]; }; MRFA = derive2 { name="MRFA"; version="0.4"; sha256="1ivzyp3q2nb6h5mhykina75ak7ajfw62rh23yr4pljma7gmr1hhm"; depends=[fields foreach glmnet grplasso plyr randtoolbox]; }; @@ -2436,7 +2461,7 @@ in with self; { MRwarping = derive2 { name="MRwarping"; version="1.0"; sha256="13bcs7rlm4irx7yzdnib558w9014a4chh9xwc010m6pxvxv36qnv"; depends=[boa SemiPar]; }; MSCMT = derive2 { name="MSCMT"; version="1.3.4"; sha256="1vh0i9nxqiy3qdnb7z7cn5kpp2jahdmaqpnv7q5650pkswhwmfpc"; depends=[ggplot2 lpSolve lpSolveAPI Rdpack Rglpk]; }; MSCquartets = derive2 { name="MSCquartets"; version="1.0.5"; sha256="0gfbawv7ib31pxmcj8ki67a72jqacm8nlizgk95yg7afjlqiyz8v"; depends=[ape phangorn RandomFieldsUtils Rdpack zipfR]; }; - MSEtool = derive2 { name="MSEtool"; version="1.4.3"; sha256="1r4bnw49hhriwrgg1pkg6gkq789c63bhsp71srrf5fv7jna8z0zk"; depends=[abind coda corpcor DLMtool dplyr gplots MASS mvtnorm RcppEigen reshape2 rmarkdown snowfall TMB]; }; + MSEtool = derive2 { name="MSEtool"; version="1.5.0"; sha256="10kczcv468c9s1blh37bj2cyy8zhszlwg7azvw64w2xmqnc782g4"; depends=[abind coda corpcor DLMtool dplyr gplots MASS mvtnorm RcppEigen reshape2 rmarkdown snowfall TMB]; }; MSG = derive2 { name="MSG"; version="0.4"; sha256="0fdxgqfc87iwqnnrgh7m8bfxh8lv42ffi0xxy4i1rv94aiw8gfr5"; depends=[RColorBrewer]; }; MSGARCH = derive2 { name="MSGARCH"; version="2.31"; sha256="15df35l5nr6cl3q7xprl6ifswh7mg1fvix1x9374qgyafwr40sq4"; depends=[coda expm fanplot MASS numDeriv Rcpp RcppArmadillo zoo]; }; MSGLasso = derive2 { name="MSGLasso"; version="2.1"; sha256="1k17vnvzr647pwfbdxrpqcsp34iygq86wf0ns4rq8cj6q5mik1bv"; depends=[]; }; @@ -2449,37 +2474,41 @@ in with self; { MScombine = derive2 { name="MScombine"; version="1.4"; sha256="0s3gbf3s5mf00d5mkbqhd9wwnyps7qb4r3zbal8j8nsaspql9nd3"; depends=[plyr]; }; MSwM = derive2 { name="MSwM"; version="1.4"; sha256="1zhfar02s7hm4gjs1flkh9a4526d98hik8bqrksy75758baiqg7l"; depends=[nlme]; }; MTA = derive2 { name="MTA"; version="0.2.0"; sha256="1wic2rw63h2daha23fpyw80x7ywjwqq6rj5jg73iankvdg32mlvm"; depends=[cartography igraph sf sp]; }; + MTAR = derive2 { name="MTAR"; version="0.1.0"; sha256="1bq930m7rd1kgn5442p8dcycxi55vgkrmlwssva5w0p5javi4x4a"; depends=[CompQuadForm MASS Matrix seqMeta SKAT]; }; MTDrh = derive2 { name="MTDrh"; version="0.1.0"; sha256="0ass3b90nr4i0y7v30hk8xhq3hj9bxaxcsr4f8wfi0lnvzfv6aaa"; depends=[]; }; MTE = derive2 { name="MTE"; version="1.0.0"; sha256="009mrl9dgxafl4hrgfzvsfvgx3dljb0rbbs74j2cxc5ray87kp55"; depends=[parcor quantreg]; }; MTGS = derive2 { name="MTGS"; version="0.1.0"; sha256="0ijcw730xap5c38k8z4d976azwcnygxaiv2ksrad8j8nnvnh5zbd"; depends=[glmnet kernlab MRCE]; }; MTLR = derive2 { name="MTLR"; version="0.2.1"; sha256="070121qn7vmxmxgvzv7ymhk19j9kxks4xa7qpd8vkc2rp3ara4cp"; depends=[Rcpp RcppArmadillo survival]; }; + MTPS = derive2 { name="MTPS"; version="0.1.9"; sha256="125ja7wz8fz1w7hfxks7qs524vwk86rp459ahxw9cjnn1qxyv38k"; depends=[class e1071 glmnet MASS rpart]; }; MTS = derive2 { name="MTS"; version="1.0"; sha256="09pypanjmqrvxbrrckydxyyswsgjx4nhb052x4llk7va9w4lbcjs"; depends=[fBasics fGarch mvtnorm Rcpp]; }; MTSYS = derive2 { name="MTSYS"; version="1.2.0"; sha256="04dkan3hxl3difflskp7d1lw1bvxhg4s28ssy2v4m7z7wbpj3v1m"; depends=[]; }; MUACz = derive2 { name="MUACz"; version="1.0.0"; sha256="0sh5h2qn769bpp8l09mvh1cabr2j1vywaqbj6fci84h8zx5y55fj"; depends=[dplyr epiDisplay ggplot2]; }; - MUCflights = derive2 { name="MUCflights"; version="0.0-3"; sha256="03ksvv5nyzlqiml1nz405r3yqb2cl35kpm1h61zcv2nqq8cxqshs"; depends=[geosphere NightDay RSQLite sp XML]; }; 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.8"; sha256="1rk8zrf3bavywv4bca1aqsfrirxkvxh5lfwrnj0g8zncd69bd1fc"; 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]; }; + MVNtestchar = derive2 { name="MVNtestchar"; version="1.0.0"; sha256="1dsvpjxdf589ngwpga3kznpi6q4i9aaj09hwhvcj1inqg51wiwm6"; depends=[Hmisc]; }; + MVQuickGraphs = derive2 { name="MVQuickGraphs"; version="0.1.2"; sha256="1937w8y866bsn9kn6a98c91akhm9ddc5dr9wqm51lkbjyz1zm0j1"; depends=[plotrix]; }; MVR = derive2 { name="MVR"; version="1.33.0"; sha256="1ygz47a2p5r5axql5zsxvsn25pcqyxz6mpw50zfmzrcqdrfa3bg8"; depends=[statmod]; }; MVT = derive2 { name="MVT"; version="0.3"; sha256="0vinlv3d5daf8q7pd9xgs51nxz2njgdba5750vygmv883srlzi9d"; depends=[]; }; - MVar = derive2 { name="MVar"; version="2.1.1"; sha256="17fj2y739afmdrbhnd2la9qiywcyyk0nr1d8936c63nz8xivvssv"; depends=[MASS]; }; - MVar_pt = derive2 { name="MVar.pt"; version="2.1.1"; sha256="0jzsiawisr0378n9ph7s2c2j64xybf9mz00zriw38cjr1lxaqrnf"; depends=[MASS]; }; + MVar = derive2 { name="MVar"; version="2.1.2"; sha256="0j8b3q6nanymkdpilwbk9a1a9fvlawxjj91skpmxrx16kb7j2i3w"; depends=[MASS]; }; + MVar_pt = derive2 { name="MVar.pt"; version="2.1.2"; sha256="00kfaz7xfy3if3v2waji6h1xcjsa9pn4b5jn81q38a3yin78wsw6"; depends=[MASS]; }; 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]; }; MWright = derive2 { name="MWright"; version="0.3.2"; sha256="1c57f0wnlhl4gqy17vi93r4fknycvv67b9bifgcvabws390jpx7q"; depends=[cubature]; }; - MXM = derive2 { name="MXM"; version="1.4.5"; sha256="003068bq8lmc29pc6ac9yaskjiqalvhngacac4fnl705l58zhcyg"; depends=[bigmemory coxme doParallel dplyr energy foreach geepack Hmisc knitr lme4 MASS nnet ordinal quantreg relations Rfast Rfast2 survival visNetwork]; }; + MXM = derive2 { name="MXM"; version="1.4.6"; sha256="0dxrilf7frxw3ibwssb8ndi4p1xkbxh3wmrn3dpxjsvv46bvsqki"; depends=[bigmemory coxme doParallel dplyr energy foreach geepack Hmisc knitr lme4 MASS nnet ordinal quantreg relations Rfast Rfast2 survival visNetwork]; }; MaOEA = derive2 { name="MaOEA"; version="0.5.2"; sha256="1yaa8wr1gr1npqpls5g6mlr9dgjwiyvhk6p1dmjw29f7a4g2cam5"; depends=[e1071 gtools lhs MASS nnet nsga2R randtoolbox reticulate stringr]; }; MaXact = derive2 { name="MaXact"; version="0.2.1"; sha256="1n7af7kg54jbr09qk2a8gb9cjh25cnxzj2snscpn8sr8cmcrij0i"; depends=[mnormt]; }; - 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="2.0.0"; sha256="0whn6xp5339vbsjfs40lq1kz1pizzaaryfg8bgcscqfr4rlxs3av"; depends=[abind dials foreach ggplot2 kernlab magrittr party polspline recipes rlang rsample Rsolnp survival tibble]; }; + MachineLearning = derive2 { name="MachineLearning"; version="0.1.4"; sha256="0wrngi2gi2fp7f3dhjk6c4318z1wi7l9dj7j7fnlydp5dv86ls8n"; depends=[arules crayon dplyr formula_tools FSelectorRcpp ggplot2 magrittr NbClust rpart rpart_plot]; }; + MachineShop = derive2 { name="MachineShop"; version="2.2.0"; sha256="04357qgd95c9xjr0xm8791rf650rzkls5brz0gg8z3j1yywfc3x1"; depends=[abind dials foreach ggplot2 kernlab magrittr Matrix nnet party polspline recipes rlang rsample Rsolnp survival tibble]; }; Maeswrap = derive2 { name="Maeswrap"; version="1.7"; sha256="0cnnr5zq7ax1j7dx7ira7iccqppc6qpdjghjarvdb2zj0lf69yyb"; depends=[geometry lattice rgl stringr]; }; + MajKMeans = derive2 { name="MajKMeans"; version="0.1.0"; sha256="1zphrxyx3jd6rnh1y1qnc6bip34kfqk1a5ms4ps39gfngznh482m"; depends=[MASS]; }; MakefileR = derive2 { name="MakefileR"; version="1.0"; sha256="1pfjic2lsar8ghbb6byr4rqrs30qrgfih092z4rxdpsiwkk3y7l1"; depends=[magrittr]; }; Mangrove = derive2 { name="Mangrove"; version="1.21"; sha256="1qf3fjzf0sb6fqbfdbxwbw6wah3gg2qran4mgg13hcmk4n3j0hxp"; depends=[]; }; - ManifoldOptim = derive2 { name="ManifoldOptim"; version="0.1.4"; sha256="0c5hw01nlnxrys8d9qhwvnls834i0081pf9iic9kx5k6ckc7iwha"; depends=[Rcpp RcppArmadillo]; }; + ManifoldOptim = derive2 { name="ManifoldOptim"; version="0.1.5"; sha256="15549sgsrsq1b5l5bd3flcgzjyyw2ih211a7bdqv592jl672qq29"; depends=[Rcpp RcppArmadillo]; }; ManlyMix = derive2 { name="ManlyMix"; version="0.1.14"; sha256="0zpcc74965n435d4fah41r9nz0kjyn46hkjl1s0kvlllqj6n69wg"; depends=[]; }; ManyTests = derive2 { name="ManyTests"; version="1.2"; sha256="1mi7wvnkcd95126f1h8vl8skn397yd2zqvcswprqar54p161wgyi"; depends=[]; }; Map2NCBI = derive2 { name="Map2NCBI"; version="1.4"; sha256="1ssqnm9g5p0nnhdyp9dqbbsz3hw8jzdwy0rv3csp8fxm0f1bi1kb"; depends=[rentrez]; }; @@ -2489,19 +2518,19 @@ in with self; { MargCond = derive2 { name="MargCond"; version="1.0.0"; sha256="07qh1lgy8ds11cwlb4rxkl6aiph91zq29sy27b8wwxalycdgjrg8"; depends=[gee lme4 MASS Matrix]; }; MarginalMediation = derive2 { name="MarginalMediation"; version="0.7.0"; sha256="0jwp8rzv0ghir8k7dfmfrq4rvcqf7xww6va16p3jj2nk3r9hiq0x"; depends=[betareg boot cli crayon furniture magrittr purrr rstudioapi stringr tibble]; }; MarketMatching = derive2 { name="MarketMatching"; version="1.1.2"; sha256="0i3wccclrl7lixny24jif0xvmf6lgmwsgqxc6h5c3mv405cp0h1r"; depends=[bsts CausalImpact data_table doParallel dplyr dtw foreach ggplot2 iterators reshape2 scales zoo]; }; + Markovchart = derive2 { name="Markovchart"; version="1.0.6"; sha256="1r1rxsrdil7jxmhfzk8s4rqqs3v97kfvynbh5qa62g14acafm615"; depends=[doParallel foreach ggplot2 metR optimParallel]; }; MarkowitzR = derive2 { name="MarkowitzR"; version="1.0.2"; sha256="0p234zs7lvi83fv02mijrhp7hmr5cklddayb61krhx1h2hn4gzb9"; depends=[gtools matrixcalc]; }; MaskJointDensity = derive2 { name="MaskJointDensity"; version="1.0"; sha256="0nxhsz57cw96in0sg5xg7sicv920kcnxr2rikn39y2qk4vrw6r78"; depends=[ks MASS np plyr]; }; Massign = derive2 { name="Massign"; version="1.1.0"; sha256="09i32lsrx40rxrnb9alfipfrkipy4mza5nr4gcpn2a5h86ak9290"; depends=[]; }; MatManlyMix = derive2 { name="MatManlyMix"; version="1.1.1"; sha256="1d2vd5b9lirdybjclxh0nn4mghq64qjj4l8vnj95cni5pfa18a2c"; depends=[]; }; MatSkew = derive2 { name="MatSkew"; version="0.1.5"; sha256="019v2b1r0bvw84xs50smjb3jdz7gd2adz5d84xd8zq43lnml96d1"; depends=[]; }; - MatTransMix = derive2 { name="MatTransMix"; version="0.1.6"; sha256="07npn31abksi17s8g1cgxnciyw2nm1mzfmbys3kfkgb8nqq0d6g2"; depends=[]; }; + MatTransMix = derive2 { name="MatTransMix"; version="0.1.7"; sha256="1p67k2ysh7lahynlfyp30bxpzpc49jhdy2y5mfs09yhjwg0wl1by"; depends=[]; }; MatchIt = derive2 { name="MatchIt"; version="3.0.2"; sha256="1pp91pw2sy9hik4sgn4gcsp40hb01n9pfccrwdcffwji5fd1aavq"; depends=[MASS Matching]; }; - MatchIt_mice = derive2 { name="MatchIt.mice"; version="3.0.1"; sha256="04c078fz7s0wll4wizi0mj4s3gdx1kpr5g40gq7znn362z7q25ym"; depends=[MatchIt mice]; }; - MatchLinReg = derive2 { name="MatchLinReg"; version="0.7.0"; sha256="015s3xdaj56prq8lsdry3ibjkrb6gg0fwgzjh496gdx5axvpbk8g"; depends=[Hmisc Matching]; }; - MatchThem = derive2 { name="MatchThem"; version="0.9.1"; sha256="07sby3jyf3v7dmcm3pzjamsj5c6jfc65n1xdvakbd7nmlignb1m3"; depends=[broom dplyr MatchIt mice survey WeightIt]; }; - Matching = derive2 { name="Matching"; version="4.9-6"; sha256="1p36id8cds865b44jdbk6c3fnadvhh203qx6d3g54bi4s7bww3cf"; depends=[MASS]; }; + MatchLinReg = derive2 { name="MatchLinReg"; version="0.7.3"; sha256="1si0zn6vlgyj08841hfjx8an96a8ipnawl4zbalabmpy7r5bfwx8"; depends=[Hmisc Matching]; }; + MatchThem = derive2 { name="MatchThem"; version="0.9.3"; sha256="05m141qn0a9ahraga1lpcjffbddmm70bx9m3javrr9727nnar9wf"; depends=[broom dplyr MatchIt mice survey WeightIt]; }; + Matching = derive2 { name="Matching"; version="4.9-7"; sha256="0vgw0nm40bicda2nwgklc27qsjxbqbjpl9yd28hqxj71xfsyqmhr"; depends=[MASS]; }; Matrix = derive2 { name="Matrix"; version="1.2-18"; sha256="06b1rc1vq65b271f2wpzhqkvhng8hwwnvjflzxkng50i52603zzp"; depends=[lattice]; }; - Matrix_utils = derive2 { name="Matrix.utils"; version="0.9.7"; sha256="1x64r4aj3gy1dzjjysyrk1j9jq3qsnyrqws8i6bs7q8pf6gvr7va"; depends=[grr Matrix]; }; + Matrix_utils = derive2 { name="Matrix.utils"; version="0.9.8"; sha256="0a5fq1scykqk0kc9j051j6fix6j2dqwz5wbgb0amaxsiywz9vigb"; 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.3"; sha256="10r6h5bidj44kfbwiml9pkysbikqphfb21ig61qnx0qa12xcl6l8"; depends=[]; }; MatrixLDA = derive2 { name="MatrixLDA"; version="0.2"; sha256="0fixq35gp0fzmin75sfld2ln0zvnjgzrhk3b5yi7wdqzp99200yy"; depends=[glasso plyr Rcpp RcppArmadillo]; }; @@ -2513,7 +2542,6 @@ in with self; { MazamaCoreUtils = derive2 { name="MazamaCoreUtils"; version="0.4.2"; sha256="1p79wc3f1mcv9nlf8z277h1vzxl33w48knhn0yrw902vr5a0lzhf"; depends=[devtools dplyr futile_logger lubridate magrittr purrr rlang stringr tibble]; }; MazamaLocationUtils = derive2 { name="MazamaLocationUtils"; version="0.1.6"; sha256="187lrpc9z3k4jnd1nvqsb0qibz9xz9i1i61vssqm72h1hx1j9j6f"; depends=[digest dplyr geodist httr lubridate magrittr MazamaCoreUtils MazamaSpatialUtils readr revgeo rlang stringr]; }; MazamaSpatialUtils = derive2 { name="MazamaSpatialUtils"; version="0.6.4"; sha256="0wb221h8lwdcx5h5hkvpz9rarizry22qzydibcc2gs6b0d5514ms"; depends=[countrycode dplyr geojsonio lubridate magrittr rgdal rgeos rlang rmapshaper rvest shiny sp stringr xml2]; }; - MazamaWebUtils = derive2 { name="MazamaWebUtils"; version="0.1.7"; sha256="16k6wxwjkdwzx1cqcxpxwaj7i63khly90gyiyfw13di43h8cvsd1"; depends=[dplyr futile_logger lubridate mime stringr webutils]; }; McSpatial = derive2 { name="McSpatial"; version="2.0"; sha256="18nmdzhszqcb5z9g8r9whxgsa0w3g7fk7852sgbahzyw750k95n4"; depends=[lattice locfit maptools quantreg RANN SparseM]; }; Mcomp = derive2 { name="Mcomp"; version="2.8"; sha256="1wz5fr3dhxn4s0qvxm2mzq9dbz3x0vgh6pixjrgk9d4i9w2p7s60"; depends=[forecast ggplot2]; }; MeTo = derive2 { name="MeTo"; version="0.1.0"; sha256="14hdyh3p3q8yb9w2li2y9pc356jnymsn6n2750zdsrh52b751lpm"; depends=[lubridate]; }; @@ -2523,8 +2551,8 @@ in with self; { MediaK = derive2 { name="MediaK"; version="1.0"; sha256="19cmxl2wksw9kvjsfn1m4nkr5gpcx6bk0sqrabj1n0dla1l32v2a"; depends=[Rcpp RcppEigen]; }; Mediana = derive2 { name="Mediana"; version="1.0.8"; sha256="0j1ikc2iaxl70134v0gijj2i2g0xgjafvn8rc108r9fhm8rpw564"; depends=[doParallel doRNG foreach MASS mvtnorm survival]; }; Mega2R = derive2 { name="Mega2R"; version="1.0.5"; sha256="18fhkghlx4rkafyx0jpxxyjq20xv6y6sfjyz7m68fi73akjz2rw7"; depends=[AnnotationDbi DBI famSKATRC gdsfmt GenomeInfoDb kinship2 pedgene Rcpp RSQLite SKAT]; }; - MendelianRandomization = derive2 { name="MendelianRandomization"; version="0.4.1"; sha256="01irc5qnw7gsvnpifki05ksh7ys8znk0wvhqrzk1bv5294rnq6r1"; depends=[ggplot2 iterpc knitr Matrix plotly rjson rmarkdown robustbase]; }; - Mercator = derive2 { name="Mercator"; version="0.9.6"; sha256="09fk9cmnd636hnbhh3f1swmfk4j6nxfbz42hi2ylpriq7ygp7jq5"; depends=[ClassDiscovery cluster dendextend igraph KernSmooth Polychrome Rtsne Thresher]; }; + MendelianRandomization = derive2 { name="MendelianRandomization"; version="0.4.2"; sha256="0s5d9b66gf4ihbrypbkzkqsws19shw2gbkjrk6cr7l11vw7lfd57"; depends=[ggplot2 iterpc knitr Matrix plotly rjson rmarkdown robustbase]; }; + Mercator = derive2 { name="Mercator"; version="0.10.0"; sha256="04hfcg85vs7gkbbgbsymv7xadzzm2rvypw5awnxrnfmdhwn9r9bk"; depends=[ClassDiscovery cluster dendextend igraph KernSmooth Polychrome Rtsne Thresher]; }; MergeGUI = derive2 { name="MergeGUI"; version="0.2-1"; sha256="1hx03qv5jyjjmqdvylc3kz5dl5qsdqwlirjbrnxrw7grkgkhygap"; depends=[cairoDevice ggplot2 gWidgetsRGtk2 rpart]; }; MetABEL = derive2 { name="MetABEL"; version="0.2-0"; sha256="0rqjv85mgswrbbp8b8ip6cdmz0cvfy9lm5mcr8a7h38rzgx3g3i3"; depends=[]; }; MetFns = derive2 { name="MetFns"; version="3.2.2"; sha256="15fd2d0yysibi2x43qv6b8i1pa18l7z4n0zpmrqhsmvqkgy8sla0"; depends=[astroFns lubridate plotrix pracma]; }; @@ -2534,14 +2562,13 @@ in with self; { MetaAnalyser = derive2 { name="MetaAnalyser"; version="0.2.1"; sha256="0k58325nb7svihhpga7kdbryr9bi5470qsb8aa5llpiggs8j7sfz"; depends=[DT ggvis rstudioapi shiny]; }; MetaComp = derive2 { name="MetaComp"; version="1.1.2"; sha256="1yb115qdmf5rxmjl4y7qr0i6668n46scs4yjpfq9bmy3w9i4ji1x"; depends=[Cairo data_table dplyr ggplot2 plyr reshape2]; }; MetaCycle = derive2 { name="MetaCycle"; version="1.2.0"; sha256="1lh1msrcz70p5jixz5j83pqa3cid21y7m1zvlk872k16awmif00k"; depends=[gnm]; }; - MetaIntegrator = derive2 { name="MetaIntegrator"; version="2.1.1"; sha256="11jblzqid9xyigj916filclk8ih15g04r58msb7lwlh9srn4hjw4"; depends=[AnnotationDbi Biobase BiocManager boot COCONUT data_table DBI dplyr DT GEOmetadb GEOquery ggplot2 ggpubr gplots HGNChelper httpuv magrittr manhattanly Metrics multtest pheatmap plotly plyr pracma preprocessCore readr reshape2 rmarkdown rmeta Rmisc RMySQL ROCR RSQLite stringr zoo]; }; + MetaIntegrator = derive2 { name="MetaIntegrator"; version="2.1.3"; sha256="1763in7zcfr4abhwc0sy27c1qbzbhkyjsasrhwdjjmsc645sqxlx"; depends=[AnnotationDbi Biobase BiocManager boot COCONUT data_table DBI dplyr DT GEOmetadb GEOquery ggplot2 ggpubr gplots HGNChelper httpuv magrittr manhattanly Metrics multtest pheatmap plotly plyr pracma preprocessCore readr reshape2 rmarkdown rmeta Rmisc RMySQL ROCR RSQLite stringr zoo]; }; MetaLandSim = derive2 { name="MetaLandSim"; version="1.0.6"; sha256="1m7i1y9jmhwa3h3xbqqlskgr216x50jb4wx8n3ynh16hw54n07xi"; depends=[coda e1071 fgui googleVis igraph knitr maptools minpack_lm raster rgeos rgrass7 sp spatstat zipfR]; }; MetaLonDA = derive2 { name="MetaLonDA"; version="1.1.8"; sha256="0nalkmsii2anw07r16zcpgafb01l87hgpfr1mwc7nggvhdfp3w2g"; depends=[DESeq2 doParallel edgeR ggplot2 gss metagenomeSeq plyr pracma zoo]; }; MetaPCA = derive2 { name="MetaPCA"; version="0.1.4"; sha256="14g4v3hyxnds4l2q36mpz282yqg8ahgdw3b0qmj0xg17krrf5l2s"; depends=[foreach]; }; MetaPath = derive2 { name="MetaPath"; version="1.0"; sha256="1vvpfv6yc4rd4apqfs2yzm97xxsv43ghwqnjq6w1xrc4pdx2p634"; depends=[Biobase genefilter GSEABase impute]; }; - MetaSKAT = derive2 { name="MetaSKAT"; version="0.71"; sha256="1bfy1zqblwz7a9fr9i6hs18x2n422x52b928v77r3924nasa67a8"; depends=[SKAT]; }; - MetaStan = derive2 { name="MetaStan"; version="0.1.1"; sha256="0sln7hr892npq508qbswhnpx27vjd5qnh81glazma5m3k2li53jb"; depends=[BH Rcpp RcppEigen rstan rstantools StanHeaders]; }; - MetaSubtract = derive2 { name="MetaSubtract"; version="1.50"; sha256="1aggkvpyl2zpnmqzrr7k22wmb4dyagljcwrkm956nbyvlzx4sx2x"; depends=[]; }; + MetaSKAT = derive2 { name="MetaSKAT"; version="0.80"; sha256="1hkkirbxl17v7sdbj4646fijlwvdw3p10h97r9h46cw6cn77v5gq"; depends=[SKAT]; }; + MetaSubtract = derive2 { name="MetaSubtract"; version="1.60"; sha256="19xg95g2qgyi90pz3733l596gzdj6dmb0k9i4qmhaq4yck69rrhj"; depends=[]; }; MetaUtility = derive2 { name="MetaUtility"; version="2.1.0"; sha256="1lbqqh56pwxlcksv0kf463hc20jb4rkjqkcqal000rzyzd4bi2zj"; depends=[dplyr metafor purrr stringr]; }; MetaboList = derive2 { name="MetaboList"; version="2.0"; sha256="10skvf14ls4qll0l9p6cig4lmj7138khcksyjvd1pqym9axk3wxn"; depends=[dplyr enviPick ggplot2 scales]; }; MetaboLouise = derive2 { name="MetaboLouise"; version="1.0.0"; sha256="1agcp520in0wpxv3x2jvvmv61hasazdymnvjhzl66nwv8lifl98z"; depends=[igraph]; }; @@ -2561,16 +2588,14 @@ in with self; { MfUSampler = derive2 { name="MfUSampler"; version="1.0.4"; sha256="0i5siq1jacxbfvakb97qnj3h7pk471rrx8ckwm0d8nl3j586s36y"; depends=[ars coda HI]; }; MiDA = derive2 { name="MiDA"; version="0.1.2"; sha256="144gxsxqljzskxsw5k0y69ix0pxlfvyyznxkjpf2ng4l47pg11z5"; depends=[caret gbm genefilter limma preprocessCore pROC SQN]; }; MiRAnorm = derive2 { name="MiRAnorm"; version="1.0.0"; sha256="154wv0j82xyc4y5cd2czh0q8kzhgrk6qsn0ahc1zn3fnrzc9fgz0"; depends=[ArgumentCheck cluster dendextend ggplot2 MASS npmv plyr reshape2]; }; - MiRKAT = derive2 { name="MiRKAT"; version="1.0.1"; sha256="1adhy9ysjm8xa45sb4x17ryznvg91c9xdf0irpcgc7rbg34rxf5x"; depends=[GUniFrac MASS PearsonDS survival]; }; MiRSEA = derive2 { name="MiRSEA"; version="1.1"; sha256="0jpl6ws5yx1qjzdnip9a37nmvx81az4cbsjm57x613qjpwmg6by3"; depends=[]; }; MiSPU = derive2 { name="MiSPU"; version="1.0"; sha256="1l6q0fm5z5i6gigr940h8kc5rka08psmhcprp8grmsxk3qy2kply"; depends=[ape aSPU cluster Rcpp RcppArmadillo vegan]; }; MiST = derive2 { name="MiST"; version="1.0"; sha256="0gqln792gixqfh201xciaygmxbafa0wyv5gpbg9w5zkbbv44wrfk"; depends=[CompQuadForm]; }; MicSim = derive2 { name="MicSim"; version="1.0.15"; sha256="0nbrl013i1jz5hsq5a6526rlsp0qvvrbs86md6yrvhh90bsnf65p"; depends=[chron rlecuyer snowfall]; }; MicroDatosEs = derive2 { name="MicroDatosEs"; version="0.8.2"; sha256="0k0hmi3ciipizmgjw1i5rrsg34yx21s1msn40vc4qc9s1n4wd8dl"; depends=[readr]; }; MicroMacroMultilevel = derive2 { name="MicroMacroMultilevel"; version="0.4.0"; sha256="1q5cyqr4hdl1wp2isk6p4p084i83kg6hd406wdp1nj9lv5i0xvgw"; depends=[]; }; + MicroNiche = derive2 { name="MicroNiche"; version="1.0.0"; sha256="166ci4crkwnnh05rhs5hyrljgm4cdf7gp0ff8kjxjmd60byw80mz"; depends=[ggplot2 reshape2]; }; MicroStrategyR = derive2 { name="MicroStrategyR"; version="1.0-1"; sha256="0a6bk0wnwx8zy9081n7wb12lidgckrhn350r0q5m6aa82l6l8ihi"; depends=[gWidgetsRGtk2]; }; - MigClim = derive2 { name="MigClim"; version="1.6.1"; sha256="116zsmir0hz6ah3qwsr8bb8qhhfzvg1rciwm8a6lq02mvw0v0vrn"; depends=[raster]; }; - MinBAR = derive2 { name="MinBAR"; version="1.1.0"; sha256="03hzv6a56w0d6di3jp3w3fgckwxkqb1cy3xiwcvzyg5lzm4z9p2x"; depends=[dismo ecospat geosphere lattice latticeExtra maxnet raster rgdal sp]; }; MindOnStats = derive2 { name="MindOnStats"; version="0.11"; sha256="13995v4n0hfb53w02jk81pl7nazkvqwwv87y1sr99jr9ppzc08mz"; depends=[]; }; Miney = derive2 { name="Miney"; version="0.1"; sha256="0sgln0653rgglinr8rns5s2az0lgyp9slmynyhhhs265grkhrfj0"; depends=[]; }; Minirand = derive2 { name="Minirand"; version="0.1.3"; sha256="19lib0qh3xfzvpgsskl3yypmjygss0w7pimz0136av0px5b4jran"; depends=[]; }; @@ -2592,19 +2617,19 @@ 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=[]; }; - MoEClust = derive2 { name="MoEClust"; version="1.2.4"; sha256="1w54kfwc4l0fha63mgy7khqiikck9ffhyv9yy0icx3g03hkwmfky"; depends=[lattice matrixStats mclust mvnfast nnet vcd]; }; + MoBPS = derive2 { name="MoBPS"; version="1.4.87"; sha256="0wzmb02d9b49jrz8a4z28yri2zd8dh016an46h2dkmykr1asxg95"; depends=[]; }; + MoEClust = derive2 { name="MoEClust"; version="1.3.0"; sha256="0aqfbm44p48ywdxpy0x48civ927dd742a7sfxx645l65j99kzcxi"; depends=[lattice matrixStats mclust mvnfast nnet vcd]; }; MoLE = derive2 { name="MoLE"; version="1.0.1"; sha256="0bq19vwqjn5hl4mw5imkydbp39gal992vnh2dwrq8bb8cmj3qh91"; depends=[]; }; - MoTBFs = derive2 { name="MoTBFs"; version="1.2"; sha256="1k5xyz93bf10wslrbqygdhm9z14dfl53xzd2fcyjc4xgjzfv1v3b"; depends=[bnlearn ggm lpSolve quadprog]; }; + MoTBFs = derive2 { name="MoTBFs"; version="1.3"; sha256="14rj77g265j04wq3k24byg8i10z9rrsid24kjkfncz5pmrpv1a6g"; depends=[bnlearn ggm lpSolve quadprog]; }; MobileTrigger = derive2 { name="MobileTrigger"; version="0.0.31"; sha256="1zbnxdxh6gr4sgpi10i0pnd85f7i842105jgjswacziqamby6mcy"; depends=[caret ggplot2 kableExtra knitr mailR plyr XML yaml]; }; ModStatR = derive2 { name="ModStatR"; version="1.3.0"; sha256="1wdqkvbycjk4wzzkpc0pyxvxrzqm48xbi8y87nax5l1v5qdfm1n0"; depends=[BioStatR boot ellipse ggplot2 gsl hypergeo jmuOutlier]; }; Modalclust = derive2 { name="Modalclust"; version="0.7"; sha256="0ymzdxp6rh6baih1xm6kj8l8jxjclvnmq0gfp38cl8lpskspb26x"; depends=[class mvtnorm zoo]; }; ModelGood = derive2 { name="ModelGood"; version="1.0.9"; sha256="1y99a7bgwx167pncxj00lbw3cdjj23fhhzl8r24hwnhxr984kvzl"; depends=[prodlim]; }; ModelMap = derive2 { name="ModelMap"; version="3.4.0.1"; sha256="1279k5hznxrb6fq4zd1baw1pm5dj5437g5awkgb8kp7ll8raa2ql"; depends=[corrplot fields HandTill2001 mgcv PresenceAbsence randomForest raster rgdal]; }; - ModelMetrics = derive2 { name="ModelMetrics"; version="1.2.2.1"; sha256="17yw46yr0n9hddvlhh73jdpmpdlpa581n5xjpwkr6cpr2f7xxpqc"; depends=[data_table Rcpp]; }; + ModelMetrics = derive2 { name="ModelMetrics"; version="1.2.2.2"; sha256="0mrlsw4c5y1vdsqynxr2dcvmhh5h37pnd71jw5a5djpbda9g21jy"; depends=[data_table Rcpp]; }; Modelcharts = derive2 { name="Modelcharts"; version="0.1.0"; sha256="1jy78kyyh4r13px2d5bm7fra5bkcpimzfji0hmydspkfi3qla37x"; depends=[dplyr plotly]; }; Modeler = derive2 { name="Modeler"; version="3.4.5"; sha256="15gbg5568qj81wp6yy31amb2b7wl1wvlmgpmdp29lvz1p33jx2y1"; depends=[class ClassComparison ClassDiscovery e1071 neuralnet nnet oompaBase randomForest rpart TailRank]; }; - MomTrunc = derive2 { name="MomTrunc"; version="5.69"; sha256="14wvrkyasz9x54rk8cmdx523hsyvzhg2g6bx63gzah6wg5inmj25"; depends=[hypergeo mvtnorm Rcpp RcppArmadillo tlrmvnmvt]; }; - Momocs = derive2 { name="Momocs"; version="1.2.9"; sha256="13pgn31hv529z33mi020w8wm8ya7hyi5yfsp45a78wdhinqas9mm"; depends=[ape dplyr geometry geomorph ggplot2 jpeg magrittr MASS progress RColorBrewer rgeos sp]; }; + MomTrunc = derive2 { name="MomTrunc"; version="5.79"; sha256="01pbajb2vziw3hl4600mcwdljkh3lmacqz14mknj0fkd2qnqdrnm"; depends=[hypergeo mvtnorm Rcpp RcppArmadillo tlrmvnmvt]; }; Mondrian = derive2 { name="Mondrian"; version="1.0-0"; sha256="07r64q518diphai951pw4vfaw4sd6bqwhi6q5cp4pcl3aqjynkmj"; depends=[RColorBrewer]; }; MonetDB_R = derive2 { name="MonetDB.R"; version="1.0.1"; sha256="1r7vki0rrzwcrfg4f2lfx30g614vf2xi62qb1rs21a9j5741lxlx"; depends=[codetools DBI digest]; }; MonoInc = derive2 { name="MonoInc"; version="1.1"; sha256="14rykw3bfj0vznz0rw4vsg1k4vanfv9cy867vspw966ncl4bw70h"; depends=[compare doParallel foreach iterators sitar]; }; @@ -2612,17 +2637,16 @@ in with self; { MonoPoly = derive2 { name="MonoPoly"; version="0.3-10"; sha256="0ls3sjfkinp9c5002ww0xm4l2galf20w2f45nm5irkk9sbqas0jq"; depends=[quadprog]; }; Monte_Carlo_se = derive2 { name="Monte.Carlo.se"; version="0.1.0"; sha256="1d5gp4wvpvrlp82g8k8v668mzhmdlk2pvky34v7hxysap9xgmsqr"; depends=[]; }; MonteCarlo = derive2 { name="MonteCarlo"; version="1.0.6"; sha256="1jwq3by8zfy6sbzahcj5l0vicqn7yyqpb7xhfsaymfspm7xyq6pj"; depends=[abind codetools reshape rlecuyer snow snowfall]; }; - MoonFinder = derive2 { name="MoonFinder"; version="1.0.3"; sha256="1lwjrzk68x1xxa10mk2zwaj6kwlryyad7wcd5vf85di5bbbvpm7n"; depends=[annotate clusterProfiler igraph org_Hs_eg_db pheatmap RColorBrewer]; }; - Morpho = derive2 { name="Morpho"; version="2.7"; sha256="0zgq79yfgkl6g404j9hpdaza5m5qkklh1xpf9xpmyf940pqdw21c"; depends=[colorRamps doParallel foreach MASS Matrix Rcpp RcppArmadillo rgl Rvcg]; }; + Morpho = derive2 { name="Morpho"; version="2.8"; sha256="080ix1j0r67l0y66zq4xzfl8lhd3q4y4hzmmxphxkhmx83rhsik0"; depends=[colorRamps doParallel foreach MASS Matrix Rcpp RcppArmadillo rgl Rvcg]; }; MorseGen = derive2 { name="MorseGen"; version="1.2"; sha256="1kq35n00ky70zmxb20g4mwx0hn8c5g1hw3csmd5n6892mbrri8s9"; depends=[]; }; MortCast = derive2 { name="MortCast"; version="2.1-2"; sha256="0p5cjzrl3yhrbhjr31fm84rj7dl7n65qzccj447ky1lvb4c0v2x1"; depends=[wpp2017]; }; MortalityGaps = derive2 { name="MortalityGaps"; version="1.0.0"; sha256="0nfm8xa7gnshrl8hsvmvr3za8nbppp7f7i5h4ni204w7xwvh8jxc"; depends=[crch forecast MASS pbapply]; }; - MortalityLaws = derive2 { name="MortalityLaws"; version="1.8.3"; sha256="1k3wamxgrsl08sfymfqhlgal38nxxgqfibqkh1qkmm4006pp7xx3"; depends=[minpack_lm pbapply RCurl tidyr]; }; + MortalityLaws = derive2 { name="MortalityLaws"; version="1.8.4"; sha256="0sgxkw9f8s3iv6x2clsx6505wjflg6xa3w19m4q6gz8fkbh2sxfv"; depends=[minpack_lm pbapply RCurl tidyr]; }; MortalitySmooth = derive2 { name="MortalitySmooth"; version="2.3.4"; sha256="1clx8gb8jqvxcmfgv0b8jyvh39yrmcmwr472j9g3ymm95m4hr8fq"; depends=[lattice svcm]; }; MortalityTables = derive2 { name="MortalityTables"; version="1.0"; sha256="07pbjgc4qvznw1rfvmz6ndg0gzj0k61iajwn51ijpb7hscwi8937"; depends=[ggplot2 scales]; }; MplusAutomation = derive2 { name="MplusAutomation"; version="0.7-3"; sha256="0sidvznbknc4pdk4w6izpizap2yvbzxbjnmnrxmwj45ypm9pjpqc"; depends=[boot coda data_table digest ggplot2 gsubfn lattice pander plyr rlang texreg xtable]; }; MplusTrees = derive2 { name="MplusTrees"; version="0.1.1"; sha256="1s119p1fgr27rkh671zpzbfnd368m0s1607r8xwgjm0y5ncxwkv7"; depends=[MplusAutomation nlme rpart rpart_plot]; }; - Mqrcm = derive2 { name="Mqrcm"; version="1.0"; sha256="1z8zyjvjz1izaal5y6dnlm86pvydab45d9qnhcnibi2l9r1ladkc"; depends=[Hmisc pch]; }; + Mqrcm = derive2 { name="Mqrcm"; version="1.1"; sha256="15pxrh5i8pm6ckp44mlgq1ld5b1y9kg6vjvis5k812h64gm3aizq"; depends=[Hmisc pch]; }; MsdeParEst = derive2 { name="MsdeParEst"; version="1.7"; sha256="1zhi1jr30sl7jpsw37lc3akfzixlhm9k2hjkha1pjy5fmd5lddlx"; depends=[MASS moments mvtnorm sde]; }; MtreeRing = derive2 { name="MtreeRing"; version="1.4.2"; sha256="097w65ijhdkag26z39kzqqp7bs3bcx4iqapj3qc8inh0iynhnxp6"; depends=[bmp dplR dplyr imager jpeg magick magrittr measuRing png shiny shinydashboard shinyWidgets spatstat tiff]; }; MuChPoint = derive2 { name="MuChPoint"; version="0.6.1"; sha256="15bqsc7bsjg55qxjwxh58bxbwz61a6wv4xxph994g4020b98l01x"; depends=[capushe Matrix Rcpp shiny]; }; @@ -2632,7 +2656,7 @@ in with self; { MullerPlot = derive2 { name="MullerPlot"; version="0.1.2"; sha256="0am5brdmbh2mw74fbw9nha6h4qlhj8psg3142mql1ad99bd0zg4w"; depends=[RColorBrewer]; }; MultAlloc = derive2 { name="MultAlloc"; version="1.2"; sha256="0c3sqfaa08s8mk4yz77kh6q6v9ic5xp52g9prfw1k2kv4nw1k2qd"; depends=[Rglpk]; }; MultEq = derive2 { name="MultEq"; version="2.3"; sha256="0fshv7i97q8j7vzkxrv6f20kpqr1kp9v6pbw50g86h37l0jghj7r"; depends=[]; }; - MultNonParam = derive2 { name="MultNonParam"; version="1.3.0"; sha256="13xkwyvqqjvs5nv383y3hy1w0mz2qmqwih5rh9dqs7r7afx7928n"; depends=[]; }; + MultNonParam = derive2 { name="MultNonParam"; version="1.3.3"; sha256="10fkvi4iz9wc7vza2cpqpl85wywbiipbkvbqdxzz7wxr5a3agk2r"; depends=[ICSNP]; }; 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="1.0.1"; sha256="1hy2xsmdcsn4jwa06ffymhhd4prxjnqw0jxl77sxq8yb1fc2vk64"; depends=[data_table Rcpp RcppArmadillo]; }; @@ -2641,7 +2665,8 @@ in with self; { MultiLCIRT = derive2 { name="MultiLCIRT"; version="2.11"; sha256="1qls0qp5fz377h50lvpzq3vkw49i3nvizli98gss50nqci8ssqm4"; depends=[limSolve MASS]; }; MultiMeta = derive2 { name="MultiMeta"; version="0.1"; sha256="0gj0wk39fqd21xjcah20jk16jlfrcjarspbjk5xv74c9k4p5gmak"; depends=[expm ggplot2 gtable mvtnorm reshape2]; }; MultiOrd = derive2 { name="MultiOrd"; version="2.4.1"; sha256="09hwd9x0kn1f5p1jiypalvh5akjivhj8v2wh3iaavdf8c2vg04kg"; depends=[corpcor Matrix mvtnorm psych]; }; - MultiRNG = derive2 { name="MultiRNG"; version="1.2.2"; sha256="0ah7m9ykji0v35bnj012621y47qn9l6vk2q17dj4zx5qfi8wdy2l"; depends=[]; }; + MultiPhen = derive2 { name="MultiPhen"; version="2.0.3"; sha256="0razswg4wqsz4q0dvpxp3swmxk82ig8gkyi4vcmxh11nlhb258w3"; depends=[abind epitools HardyWeinberg MASS meta RColorBrewer]; }; + MultiRNG = derive2 { name="MultiRNG"; version="1.2.3"; sha256="12nspgk3iy698bik040mlxslysf6j9c9vww5bclsdm81ckymd0ca"; depends=[]; }; MultiRR = derive2 { name="MultiRR"; version="1.1"; sha256="1jrhx3nlqwsv3i6r8fs142llw88qad41rsh0sj1pv1gb928zpvl3"; depends=[lme4 MASS]; }; MultiRobust = derive2 { name="MultiRobust"; version="1.0.5"; sha256="15l23a2mkpcxc3y93f761c5fwcj5h13yma4qdfdlr8fiqkvc3acg"; depends=[]; }; MultiSV = derive2 { name="MultiSV"; version="0.0-67"; sha256="0924lvkx12aqjxxz8bwqdi4h9xc2acf8aynllx0m45ip5r4gh1g2"; depends=[nlme reshape]; }; @@ -2658,9 +2683,9 @@ in with self; { My_stepwise = derive2 { name="My.stepwise"; version="0.1.0"; sha256="10wka6kzk8krwdsyjfnn78dfqflq4zg3vjkk0i2ywjm5vap6aqa5"; depends=[car lmtest survival]; }; Myrrix = derive2 { name="Myrrix"; version="1.2"; sha256="05x2h4ppjhfm0wlpwyp8ycjg59qj3gv0yqdilxrzb1lkrzln92xb"; depends=[Myrrixjars rJava]; }; Myrrixjars = derive2 { name="Myrrixjars"; version="1.0-2"; sha256="1hhfg83z5kl6l250z3lippx3qc68k1wj1qlfzd6m66rgmk699gyl"; depends=[rJava]; }; - N2H4 = derive2 { name="N2H4"; version="0.5.4"; sha256="1sdxfi4618q9kz18ns1i1i2g5r0c4b6ydijaaxr21z206zi5i5wb"; depends=[dplyr httr jsonlite lubridate rvest tibble tidyr xml2]; }; + N2H4 = derive2 { name="N2H4"; version="0.5.7"; sha256="0wpwcv17jvrjgvr0qhjrjr1i2rdxcga49c1c6m7s58p9wmdi8fg2"; depends=[dplyr httr jsonlite lubridate rvest tibble tidyr xml2]; }; NACHO = derive2 { name="NACHO"; version="1.0.0"; sha256="0mnkfg45bcnrpxq3q7qpzw8kr5k6kdqd6022n0ld7m3wg9bwxzpb"; depends=[cli crayon dplyr ggbeeswarm ggforce ggplot2 ggrepel knitr magrittr purrr rlang rmarkdown rstudioapi scales sessioninfo shiny shinyWidgets tibble tidyr]; }; - NADA = derive2 { name="NADA"; version="1.6-1"; sha256="1jjlm6rljk4nv6b7l2w3xnj31j61wq30sp5pnna8wav6gyjqjfmb"; depends=[survival]; }; + NADA = derive2 { name="NADA"; version="1.6-1.1"; sha256="0jp4mqr77cx7q5lff84s6wb0dwjy9mi0jyhbjc5fsx50bdczc3v7"; depends=[survival]; }; NAEPprimer = derive2 { name="NAEPprimer"; version="1.0.1"; sha256="19p1livdnayfcl88f8r9x1vg30x522q8lgx66pfgwpkxjzvrqa2l"; depends=[]; }; NAM = derive2 { name="NAM"; version="1.7.3"; sha256="12d2yjl0af2ailvwk30fswalx1wzyj500qbrhiczsg1vr4rcqhkh"; depends=[Rcpp]; }; NAPPA = derive2 { name="NAPPA"; version="2.0.1"; sha256="0nn4wgl8bs7sy7v56xfif7i9az6kdz9xw7m98z1gnvl2g7damvn3"; depends=[NanoStringNorm plyr]; }; @@ -2671,6 +2696,7 @@ in with self; { NBDesign = derive2 { name="NBDesign"; version="1.0.0"; sha256="15iwrhwpx2c72xg2jk743qgm85vfv4yhyi5i6pm84ya8drsij70p"; depends=[MASS PWEALL]; }; NBLDA = derive2 { name="NBLDA"; version="0.99.0"; sha256="1fd6f43yhwvdb81r0b9hpmna5bphhqcgwiwjkpdyqz4h9cdmsj21"; depends=[ggplot2 sSeq]; }; NBPSeq = derive2 { name="NBPSeq"; version="0.3.0"; sha256="0l4ylxhs2k9ww21jjqs67fygk92avdchhx2y1ixzl7yr2yh1y9by"; depends=[qvalue]; }; + NBR = derive2 { name="NBR"; version="0.1.2"; sha256="0czl8n2k354i9bsqsd0fiifap2hpi0nhvdi51s6h321wf7khrv1z"; depends=[nlme]; }; NBShiny = derive2 { name="NBShiny"; version="0.1.0"; sha256="0hcmdhj26hc3c8d5nb6yb7amv0rbdxywima0l0jqkxipx56idlcx"; depends=[caret dplyr e1071 rhandsontable rmarkdown shiny]; }; NBShiny2 = derive2 { name="NBShiny2"; version="0.1.0"; sha256="0w4f19av8zl220zq3flmlqn86ivikclnsnkd7bc1wafhr12hmygp"; depends=[caret dplyr e1071 rhandsontable rmarkdown shiny]; }; NCA = derive2 { name="NCA"; version="3.0.2"; sha256="135zh39c19gwka7j4qsnvmr0zy3qld07cqg72mzghspi88v4fi8n"; depends=[doParallel foreach ggplot2 gplots iterators KernSmooth lpSolve quantreg sfa]; }; @@ -2690,8 +2716,8 @@ in with self; { NHEMOtree = derive2 { name="NHEMOtree"; version="1.0"; sha256="0ycprj2rz2fy6a7ps0bsr27iphmbfxi9pbvl8rcr6p8yagfb84mb"; depends=[emoa partykit rpart sets]; }; NHLData = derive2 { name="NHLData"; version="1.0.0"; sha256="0dfqalccbkmqrn3h1z6s78l818c8sqn7d6yc8mg872ygmszryci7"; depends=[]; }; NHMM = derive2 { name="NHMM"; version="3.10"; sha256="058p0lyizqhdhapvjxk2c7n0bpid340hv1dn0cypy5w12y7zml4s"; depends=[BayesLogit MASS MCMCpack msm Rcpp]; }; - NHMSAR = derive2 { name="NHMSAR"; version="1.15"; sha256="0fbv5jjrzir9i84pidigjhfnjyyzhnhi7j1mn7cx58wlh9qn9ark"; depends=[glasso lars ncvreg ucminf]; }; - NHPoisson = derive2 { name="NHPoisson"; version="3.2"; sha256="0k6m6ampp7g95d0jm5msvrgc12rqirpanb1ykbdf1ii027pqpwsn"; depends=[car]; }; + NHMSAR = derive2 { name="NHMSAR"; version="1.16"; sha256="0qwc7hnzr69xfwxgg151j7d8ffas66w48d4p76njrkq7l7rb9681"; depends=[glasso lars ncvreg ucminf]; }; + NHPoisson = derive2 { name="NHPoisson"; version="3.3"; sha256="1i6n59ckcxk1hwyz97jmnv4yb96ianjma6ka8lpz79ivs41jniad"; depends=[car]; }; NHSRdatasets = derive2 { name="NHSRdatasets"; version="0.1.2"; sha256="0xiqbqq7xjyi1vxza853ylyiq4nqr6y10x8i13c2kj756biz4h1n"; depends=[]; }; NIPTeR = derive2 { name="NIPTeR"; version="1.0.2"; sha256="0ll6amqyw33a93xiccihidrnbaqlx1q7kqcd4wks7cvqawd8pgv1"; depends=[Rsamtools S4Vectors sets]; }; NIRStat = derive2 { name="NIRStat"; version="1.0"; sha256="1hi8201zslp1f7m3jci8q03y3f1zlcck2x3i793l7lsyl7qbzd1z"; depends=[ggplot2 gridExtra mgcv]; }; @@ -2703,19 +2729,18 @@ in with self; { NLPclient = derive2 { name="NLPclient"; version="1.0"; sha256="0jhlz9mqziyk5574vl8qjjs4g75x27rlk90wvzm3q9kjrjyvad35"; depends=[curl NLP xml2]; }; NLPutils = derive2 { name="NLPutils"; version="0.0-5"; sha256="1jxxly85iajzb9qckkkar0przyxv005cyvry0qi5dkzhbyl5k490"; depends=[NLP qdap SnowballC]; }; NLRoot = derive2 { name="NLRoot"; version="1.0"; sha256="1x8mcdgqqrhyykr12bv4hl4wbh1zw2qgpnd2yrm68kb92iy95rh4"; depends=[]; }; + NMADiagT = derive2 { name="NMADiagT"; version="0.1.2"; sha256="0fskc3ldfdl17gazpfr2hixy79n7db4c1f5yl1jalhwxiabnxjwp"; depends=[coda ggplot2 imguR ks MASS MCMCpack plotrix Rdpack reshape2 rjags]; }; NMAoutlier = derive2 { name="NMAoutlier"; version="0.1.13"; sha256="0d3mg92ky5mhjz6y1903ssanl1lzq4q22yifgjyq29j9snx0jkx1"; depends=[ggplot2 gridExtra MASS netmeta reshape2]; }; - NMF = derive2 { name="NMF"; version="0.21.0"; sha256="1qq25n3k5sgh3srlshb3ic6q92s12c1ilqf5cd5anvq6cqfchc1v"; depends=[cluster colorspace digest doParallel foreach ggplot2 gridBase pkgmaker RColorBrewer registry reshape2 rngtools stringr]; }; + NMF = derive2 { name="NMF"; version="0.22.0"; sha256="0b2ls3x1nkrnam45hagpys624nzxj3v7kxnp0q216yakvx5h57cq"; depends=[Biobase BiocManager cluster colorspace digest doParallel foreach ggplot2 gridBase pkgmaker RColorBrewer registry reshape2 rngtools stringr]; }; NMFN = derive2 { name="NMFN"; version="2.0"; sha256="0n5fxqwyvy4c1lr0glilcz1nmwqdc9krkqgqh3nlyv23djby9np5"; depends=[]; }; NMI = derive2 { name="NMI"; version="2.0"; sha256="1rxphy9rhy9zhdiz48dvl9m26x6k681lnyn39lqxs0a6jhrxg7y3"; depends=[]; }; - NMOF = derive2 { name="NMOF"; version="2.0-1"; sha256="1p3qkgw255wn1xzrjp9bgvblmkpi3ngrv57m88r54s5m90h72z26"; depends=[]; }; + NMOF = derive2 { name="NMOF"; version="2.1-0"; sha256="10dxy35ps8qmyfqhrz0g1yyc30d84wwmf084m94nv0pk87blw7s3"; depends=[]; }; NMVANOVA = derive2 { name="NMVANOVA"; version="1.1.0"; sha256="1jlqyg5vn7j8srvifjghd5a7820kadl8kbwib4qxalrfprq81h8p"; depends=[]; }; - NNLM = derive2 { name="NNLM"; version="0.4.3"; sha256="0p7p26070w2j57z5i89pmpgd470yh2z0rrfzpalzdngc8mzp2rkj"; depends=[Rcpp RcppArmadillo RcppProgress]; }; NNMIS = derive2 { name="NNMIS"; version="1.0.1"; sha256="1w2i4xlx249p589yqdgbx1ra406ycxw729vbk1lqadbn71m6blaz"; depends=[survival]; }; - NNS = derive2 { name="NNS"; version="0.4.8"; sha256="09wdq55i8csnmj72dwm0ksmwnzh81w8ry7s55iq18sh7n3j4npn8"; depends=[data_table doParallel dtw rgl stringr]; }; + NNS = derive2 { name="NNS"; version="0.5.0"; sha256="0faqxl7bsf819qljr5v7zgrvpadkxbkawmfjwd9cy23qms8dwphg"; depends=[data_table doParallel dtw rgl stringr]; }; NNTbiomarker = derive2 { name="NNTbiomarker"; version="0.29.11"; sha256="0sqlf7vzhpmq2g98c2qlrcqn3ba4ycfxbczgcjiqqhqsvgkpacc1"; depends=[magrittr mvbutils shiny stringr xtable]; }; NORMA = derive2 { name="NORMA"; version="0.1"; sha256="193q6dwn8v7k8xq0amjpvb3v6mn7c6agqa487gvjj78dy1qz720a"; depends=[rootSolve]; }; NORMT3 = derive2 { name="NORMT3"; version="1.0-3"; sha256="041s0qwmksy3c7j45n4hhqhq3rv2hncm2fi5srjpwf9fcj5wxypg"; depends=[]; }; - NORTARA = derive2 { name="NORTARA"; version="1.0.0"; sha256="1q4dmn5q939d920spmxxw08afacs3pzhr2gzwyqa5kn8xiz4ffg8"; depends=[corpcor Matrix]; }; NPBayesImputeCat = derive2 { name="NPBayesImputeCat"; version="0.2"; sha256="0fxcs2l6g1gkvydl04ippkq192jn0zl2c304ww4hczzpvn7l8lsp"; depends=[Rcpp]; }; NPC = derive2 { name="NPC"; version="1.1.0"; sha256="06y6vdln5zyinq9bsp66yz6i1v5bkw9pa2hknl9brwc75z359apn"; depends=[coin dplyr matlab permute]; }; NPCD = derive2 { name="NPCD"; version="1.0-11"; sha256="107i33z4q5w2828sm0pm8234kmp1v3a2w72lmhvi0rpnjhg0x120"; depends=[BB R_methodsS3]; }; @@ -2728,18 +2753,18 @@ in with self; { NPMVCP = derive2 { name="NPMVCP"; version="1.1"; sha256="13jpm46abwziq8859jhl6hg1znk3ws1q7g4vlr2jyri3qa6h22dd"; depends=[]; }; NPP = derive2 { name="NPP"; version="0.2.0"; sha256="0zm67b9gs32snsd1knmdmz0ksksdin9cvqrqd94n7g378gdql96y"; depends=[]; }; NPS = derive2 { name="NPS"; version="1.1"; sha256="02idja149a2sj97sks4lhsaflpifyxi6n0rjlcq9993f84szfgsi"; depends=[]; }; - NPflow = derive2 { name="NPflow"; version="0.13.1"; sha256="0sq47frh665m8mibif1w3i2z5pb577v1ngdjirbya0a9chpmwc3s"; depends=[ellipse fastcluster ggplot2 gplots pheatmap Rcpp RcppArmadillo reshape2 truncnorm]; }; + NPflow = derive2 { name="NPflow"; version="0.13.3"; sha256="1bgdkm82pmzjv46pkxpvh5ffffmc6q68x5jjl7k330w9vwgx2kf0"; depends=[ellipse fastcluster ggplot2 pheatmap Rcpp RcppArmadillo reshape2 truncnorm]; }; NPsimex = derive2 { name="NPsimex"; version="0.2-1"; sha256="1k9i1f5ckvzdns8f5qnm2zq7qs3wsgzsnfwdz21zmhmi6d0pwchm"; depends=[]; }; - NSM3 = derive2 { name="NSM3"; version="1.12"; sha256="0spkzx2zm8q85h7ij9r52bsqlwgw2fsc7zw3aaz8644q0xlnjnvj"; depends=[agricolae ash binom BSDA coin combinat epitools fANCOVA gtools Hmisc km_ci MASS metafor nortest np partitions quantreg Rfit SemiPar SuppDists survival waveslim]; }; + NSM3 = derive2 { name="NSM3"; version="1.13"; sha256="0icjx9whn6ff25rh2p3pd8y3yc0f4ssw00g25dryzhfclqkcf006"; depends=[agricolae ash binom BSDA coin combinat fANCOVA gtools Hmisc km_ci MASS metafor nortest np partitions quantreg Rfit SemiPar SuppDists survival waveslim]; }; NSO1212 = derive2 { name="NSO1212"; version="1.0.0"; sha256="1yk07n9ksbazj27sax5jhs5f84zy80awrvkhziclsqm3h1g3h7w5"; depends=[httr jsonlite]; }; NST = derive2 { name="NST"; version="2.0.4"; sha256="0kwdfqr30av50k1s8sdf7714kzq9z1qrg85c3r7ljzrajj16vnl3"; depends=[ape permute vegan]; }; NSUM = derive2 { name="NSUM"; version="1.0"; sha256="1as4g3v7qlk9wxlpwhg293980jq9gy6qay77bbcrjf481gvkkbp6"; depends=[MASS MCMCpack]; }; NScluster = derive2 { name="NScluster"; version="1.3.4"; sha256="1bkzmm573ic6xrsqbbln865rfw2xnmby632m3jcgamddxppx3fjf"; depends=[]; }; NTS = derive2 { name="NTS"; version="1.1.0"; sha256="0sjzc42whb9wr0w6r8qis89sjcfqwci5wnm3ndxxvfhg6x6skmi3"; depends=[dlm MASS MSwM Rdpack tensor]; }; NUCOMBog = derive2 { name="NUCOMBog"; version="1.0.4.2"; sha256="0s6gm3adc9qdh94pxzgccbxx1f1lbgqyvd4xk37xp6f3b5hwljdz"; depends=[snowfall]; }; - NameNeedle = derive2 { name="NameNeedle"; version="1.2.4"; sha256="1f8hmabwafjmgx2z381a3m84zfrd0s9x51haa4c1phq41yfq2lm5"; depends=[]; }; + NameNeedle = derive2 { name="NameNeedle"; version="1.2.6"; sha256="0cs65hs6fbkxv8pc2m4394c68nqbahjcryjnhhrhg50wam3y03lq"; depends=[]; }; NanoStringNorm = derive2 { name="NanoStringNorm"; version="1.2.1"; sha256="05r1hvrxwi2mcq3pv6b699291qg120ijad96s5dah2f6cwx7gm7j"; depends=[gdata vsn XML]; }; - NatureSounds = derive2 { name="NatureSounds"; version="1.0.1"; sha256="1wd9kngkrxlldkzpvb5gxsbjd8z3m0rbjvbw6ca95zhv37kjz4lh"; depends=[]; }; + NatureSounds = derive2 { name="NatureSounds"; version="1.0.3"; sha256="0db7y6213bkmfjr2r3jkdbx0wja778cgnavap03v7fswrl61w61m"; depends=[knitr tuneR]; }; NbClust = derive2 { name="NbClust"; version="3.0"; sha256="1vwb48zy6ln1ddpqmfngii1i80n8qmqyxnzdp6gbaq96lakl3w3c"; depends=[]; }; NeatMap = derive2 { name="NeatMap"; version="0.3.6.2"; sha256="186y06zrh87q6vixl2da2d6apvcj1zkk79c95k081zj5awmryr9b"; depends=[ggplot2 rgl]; }; NegBinBetaBinreg = derive2 { name="NegBinBetaBinreg"; version="1.0"; sha256="0ryi9gdf4sis77c0qxm6r86mfkk1nq9djs297y64nr6ng3rv9p9d"; depends=[boot Matrix mvtnorm]; }; @@ -2749,7 +2774,7 @@ in with self; { NetComp = derive2 { name="NetComp"; version="1.6"; sha256="11rxpdihn575diqfvc7yvxhlr2c19fig4v4a5c6jhqyfdsd60fsv"; depends=[gdata]; }; NetData = derive2 { name="NetData"; version="0.3"; sha256="1jf05zwy0c6gmm7kvxlwvai61bz4wpsw7cl0h4i21ipzn1rqxmqj"; depends=[]; }; NetIndices = derive2 { name="NetIndices"; version="1.4.4"; sha256="0ydivbri8l8zkxi18ghj9h66915scyhca8i9mcyq4b06mjfigss8"; depends=[MASS]; }; - NetLogoR = derive2 { name="NetLogoR"; version="0.3.6"; sha256="02i9jd6sksxkbnm3ldadp1xfmhkb27n5ahhgs70fg2g5nhc2jxs9"; depends=[abind car CircStats data_table Hmisc matrixStats plyr quickPlot raster rgeos sp SpaDES_tools]; }; + NetLogoR = derive2 { name="NetLogoR"; version="0.3.7"; sha256="0w32sp5lc37bd9fb2wn3lnym82jz3wi24fpdrs33cvkbvry12c04"; depends=[abind car CircStats data_table Hmisc matrixStats plyr quickPlot raster rgeos sp SpaDES_tools]; }; NetMix = derive2 { name="NetMix"; version="0.1.5"; sha256="1s6h5d34fd6brpiank2mpvpscvsgw86zfyq677s8nh8bkrc4idzs"; depends=[clue gtools igraph lda MASS Matrix poisbinom Rcpp RcppArmadillo RSpectra]; }; NetOrigin = derive2 { name="NetOrigin"; version="1.0-3"; sha256="162dhyx7z1nd3z14lfvm3dz0qwwvrc3n17zswbnwcfj6g1b1p2f1"; depends=[colorspace Hmisc igraph]; }; NetPreProc = derive2 { name="NetPreProc"; version="1.1"; sha256="0r51dqymf2nqm86py4zwdlf7qf120j0bg9r6a9c0gsyyijh4z40p"; depends=[graph]; }; @@ -2757,16 +2782,16 @@ in with self; { NetSimR = derive2 { name="NetSimR"; version="0.1.0"; sha256="0iadlvc7m78svkjcwx18pk18jg7dv69gm1cvkz8k2a7b1absd9f5"; depends=[]; }; NetSwan = derive2 { name="NetSwan"; version="0.1"; sha256="1mwdy3ahagiifj2bd1ajrafvnxzi74a1x1d3i2laf1hqpz3fbgld"; depends=[igraph]; }; NetWeaver = derive2 { name="NetWeaver"; version="0.0.6"; sha256="058fi3vbp11mbg69n4yp1zf48akfdl6s2p0qpa0v6ngmk2zjk0bq"; depends=[]; }; - NetworkChange = derive2 { name="NetworkChange"; version="0.5"; sha256="1n4nnnds8m0waa64b1k14ph1jdj26pd6fphsd53ad5lpyglpzq0y"; depends=[abind GGally ggplot2 ggrepel ggvis gridExtra igraph LaplacesDemon MASS MCMCpack mvtnorm network qgraph RColorBrewer reshape rlang Rmpfr sna tidyr]; }; + NetworkChange = derive2 { name="NetworkChange"; version="0.6"; sha256="0p08fwxf99dybx6rgchjqhl9xym4x0hhmwwvmg3gvj5jm7rb4kj0"; depends=[abind GGally ggplot2 ggrepel ggvis gridExtra igraph MASS MCMCpack mvtnorm network qgraph RColorBrewer reshape rlang Rmpfr sna tidyr]; }; NetworkComparisonTest = derive2 { name="NetworkComparisonTest"; version="2.2.1"; sha256="0a4v69p1xykzb4s9sqj2bqm333a6sx2j8f8jdnp3l7dlkwg9clqp"; depends=[IsingFit IsingSampler Matrix qgraph reshape2]; }; NetworkDistance = derive2 { name="NetworkDistance"; version="0.3.2"; sha256="1sd5pnm95l0w3737gyrjxhxvnx4wgz72mw5d5q8vp3vygxagx86h"; depends=[doParallel foreach igraph Matrix network pracma Rcpp RcppArmadillo Rdpack RSpectra]; }; NetworkExtinction = derive2 { name="NetworkExtinction"; version="0.1.1"; sha256="1958kpdcqp4hhkqmfjg2qnrzhwcmfkbgdriq9iyqmmcr7qm8c1y7"; depends=[broom dplyr ggplot2 magrittr network scales sna tidyr]; }; NetworkInference = derive2 { name="NetworkInference"; version="1.2.4"; sha256="1x63szbns8wf3k89ibk2p66prngw4fr2ckfn1568mnxdwnzvhrb4"; depends=[assertthat checkmate ggplot2 ggrepel Rcpp RcppProgress]; }; - NetworkRiskMeasures = derive2 { name="NetworkRiskMeasures"; version="0.1.2"; sha256="0c10nahybjd1n0yr78ynbsdnkfa0p7kz6dx3rbwxwsp3x4mrcd6y"; depends=[dplyr expm ggplot2 Matrix]; }; + NetworkRiskMeasures = derive2 { name="NetworkRiskMeasures"; version="0.1.4"; sha256="1121ma43jxc4p9rw0sc8w32shf9xrmn5qd1xsqgzr8diymc49zhg"; depends=[dplyr expm ggplot2 Matrix]; }; NetworkSim = derive2 { name="NetworkSim"; version="0.1.0"; sha256="1gvhzlmq46p99wald4pjnv9wxxqdympjkh3bzi98qa7qi84lny7y"; depends=[igraph incgraph]; }; - NetworkToolbox = derive2 { name="NetworkToolbox"; version="1.3.3"; sha256="1i9kdwd989l53fcx59yg9ac9bi5calj978pgif0rnz8vv4vvsgm2"; depends=[corrplot doParallel fdrtool foreach igraph IsingFit MASS Matrix pbapply ppcor psych pwr qgraph R_matlab]; }; + NetworkToolbox = derive2 { name="NetworkToolbox"; version="1.4.0"; sha256="1z7qkcj2djxf9bgdhjk7bgfxhb54m013qcsi421lbdjlppsysm7a"; depends=[corrplot doParallel fdrtool foreach igraph IsingFit MASS Matrix pbapply ppcor psych pwr qgraph R_matlab]; }; NeuralNetTools = derive2 { name="NeuralNetTools"; version="1.5.2"; sha256="0d73rbp8v0k0j8dp4yigan7krhglx6qfbadvyg7nsj67xc00vbfd"; depends=[ggplot2 nnet reshape2 scales tidyr]; }; - NeuralSens = derive2 { name="NeuralSens"; version="0.1.3"; sha256="0xgn5x8vjfv0k3skyjm5j9wi0qfnmhdpfmg5q7564zylyjb0kvsh"; depends=[caret fastDummies ggforce ggplot2 gridExtra Hmisc NeuralNetTools reshape2 stringr]; }; + NeuralSens = derive2 { name="NeuralSens"; version="0.2.0"; sha256="08hq653mah2yp3fcx6wvv9cy4kb649ydibq12znxn8yhlws9kk3v"; depends=[caret fastDummies ggforce ggplot2 gridExtra Hmisc NeuralNetTools reshape2 scales stringr]; }; Newdistns = derive2 { name="Newdistns"; version="2.1"; sha256="1b5njkzj8b0wrvvfv904di0933k9d320gadmfm5zl6pzdp34bh1i"; depends=[AdequacyModel]; }; NewmanOmics = derive2 { name="NewmanOmics"; version="1.0.4"; sha256="1ny1w4kwdgfzm4jsj6mf3k0c10bwzwz4gmpb5vg3qffddly9wfaz"; depends=[oompaBase]; }; NightDay = derive2 { name="NightDay"; version="1.0.1.1"; sha256="1gwwxk428gkvci4dhfb3zikvidalpqkl0q2r6qpm58c12j14jk1h"; depends=[maps]; }; @@ -2776,10 +2801,11 @@ in with self; { NlinTS = derive2 { name="NlinTS"; version="1.3.8"; sha256="0wbwn33k774ib2849hr39fh89003jwpzimwlj1082zmjvssblc5c"; depends=[Rcpp Rdpack timeSeries]; }; NlsyLinks = derive2 { name="NlsyLinks"; version="2.0.6"; sha256="1kdqifwjkkk4x1ixg3ca6lbqx79ab907nnzwxca5iw721mbk5njg"; depends=[lavaan]; }; Nmisc = derive2 { name="Nmisc"; version="0.3.5"; sha256="1328sfxhkq1lyx8wx2k112iq9lxhg067gnk36vgxpcsq42vdzycr"; depends=[dplyr magrittr purrr rappdirs rlang stringr tibble tidyselect]; }; + NobBS = derive2 { name="NobBS"; version="0.1.0"; sha256="0i0jyny1c29knpcl4szqwyxvdc3dqjfk5lf2xvwjdx3qas92w03l"; depends=[coda dplyr magrittr rjags]; }; NoiseFiltersR = derive2 { name="NoiseFiltersR"; version="0.1.0"; sha256="0y90si8f5hsi273g10hw700r72la30hwqlwg59gaq76wqlkm8j0p"; depends=[caret e1071 kknn MASS nnet randomForest rJava rpart RWeka]; }; NominalLogisticBiplot = derive2 { name="NominalLogisticBiplot"; version="0.2"; sha256="0m9442d9i78x57gdwyl3ckwp1m6j27cam774zkb358dw5nmwxbmz"; depends=[gmodels MASS mirt]; }; NonCompart = derive2 { name="NonCompart"; version="0.4.5"; sha256="0z2iigr8nsyanx9lnf7hq5d5fbnm1kd3ir2scfhaqafxa8y8byq9"; depends=[]; }; - NonNorMvtDist = derive2 { name="NonNorMvtDist"; version="1.0.1"; sha256="135scrxwm52fg4drxfr8dgwp2jrgdgbi3fq13i4cka3i99bpx4lm"; depends=[cubature]; }; + NonNorMvtDist = derive2 { name="NonNorMvtDist"; version="1.0.2"; sha256="11xqdrx03q3anavyxpzb0hz6mcbdy252rzzjlpa2byfdlrfvn178"; depends=[cubature]; }; NonProbEst = derive2 { name="NonProbEst"; version="0.2.3"; sha256="0wpqsz06c5v42xijh7imv9fxz9p01354pw7s91sjn6m12w2a2d0z"; depends=[caret e1071 sampling]; }; NonpModelCheck = derive2 { name="NonpModelCheck"; version="3.0"; sha256="13qk2wbgpdf763q5xg29p2hxwqpml23pcgxrzmx12vnapnqfh71k"; depends=[dr]; }; Nonpareil = derive2 { name="Nonpareil"; version="3.3.4"; sha256="1hhshcggfv92ll5zqh8hd3pldp07n0684yh1252z2jv2vbl87v3z"; depends=[]; }; @@ -2788,19 +2814,17 @@ in with self; { NormalBetaPrime = derive2 { name="NormalBetaPrime"; version="2.2"; sha256="03il9c57dbwgw38rzckkk0wkc37z8kfdrb7b4k471gm7mqhsm3m3"; depends=[GIGrvg glmnet HyperbolicDist MASS Matrix pracma pscl truncnorm]; }; NormalGamma = derive2 { name="NormalGamma"; version="1.1"; sha256="0r3hhfscif0sx9v8f450yf119gpvf3ilpb8n3ziy4v4qf2jlcfnk"; depends=[histogram optimx]; }; NormalLaplace = derive2 { name="NormalLaplace"; version="0.3-0"; sha256="0njgjdx2yvvy5jb5zn6zr7jdz5hck5bbkicv15z4ai4ibmckqjmh"; depends=[DistributionUtils GeneralizedHyperbolic]; }; - NormalizeMets = derive2 { name="NormalizeMets"; version="0.25"; sha256="0hnyr2aklibbvs6b6q4l0zbb9g8qmp2ds4lqic8a9alqn66sfnf2"; depends=[AUC crmn e1071 GGally ggplot2 htmlwidgets impute knitr limma plotly rmarkdown]; }; NostalgiR = derive2 { name="NostalgiR"; version="1.0.2"; sha256="0rpvwi815sdhaxqpji1y6g0vy8mkn5k6wci0a4jf54pkywwkwrwp"; depends=[txtplot]; }; Nozzle_R1 = derive2 { name="Nozzle.R1"; version="1.1-1"; sha256="05sjip4sz12mwd3jcbvk342p83kdmrd4l2jrh17p18w4l7w4nn0z"; depends=[]; }; - Numero = derive2 { name="Numero"; version="1.4.0"; sha256="11fviqs5smbb33qjqc463w5dz8avmba3243wcadj87j60rclqnri"; depends=[Rcpp]; }; + Numero = derive2 { name="Numero"; version="1.4.2"; sha256="1g9jbgygpr22lbikslkdmf7zphrcw826ijkc567av7c96nr9wkib"; depends=[Rcpp]; }; NutrienTrackeR = derive2 { name="NutrienTrackeR"; version="0.99.2"; sha256="1vzha3ywjbd877fqy3r2xkgi8m44s3ss65bij0vcc4mx8lajhgb5"; depends=[ggplot2]; }; OAIHarvester = derive2 { name="OAIHarvester"; version="0.3-0"; sha256="1c57jxb9n397wdkrirbfh70sxllrg9zsy0np698z7kcx83rz5lqr"; depends=[curl xml2]; }; OBMbpkg = derive2 { name="OBMbpkg"; version="1.0.0"; sha256="01wch8wwij3fd0jambk0hpkhlnp4ryrq8qnnr2w1iad9zssjyii5"; depends=[]; }; - OBRE = derive2 { name="OBRE"; version="0.1-0"; sha256="1sxfb8mn0ky8x177l3v6wwcr96h5hfwd718h1akwrpir7acldchl"; depends=[pracma]; }; OBsMD = derive2 { name="OBsMD"; version="5.3"; sha256="10acj6d0nvf1zyirp001c2fhsg2gq33zywnp8w70gm1dk7pgzfzr"; depends=[]; }; OCA = derive2 { name="OCA"; version="0.1"; sha256="0kaf46gic8gp8f98y68kqvgm1baicwgvarfiwry1j0bd2rjad64d"; depends=[]; }; - OCNet = derive2 { name="OCNet"; version="0.1.1"; sha256="0s6r57flkgjj1j5lmgd2w34x0hifx3ia1h9sknk7i6l93w2w0a2y"; depends=[fields igraph rgdal rgl sp spam SSN]; }; - ODB = derive2 { name="ODB"; version="1.1.1"; sha256="1hha4rkbc2zh3karkqa0vn4v0nmcd7sljcymy1nh28bx1gx2ffgs"; depends=[DBI RJDBC]; }; - ODEnetwork = derive2 { name="ODEnetwork"; version="1.3.1"; sha256="0j6kw32hq9gfiwmyh4zxx7ibfxplhass7q309y8r656lkhvr9nin"; depends=[checkmate deSolve]; }; + OCNet = derive2 { name="OCNet"; version="0.2.0"; sha256="00gyc7wgzqal2cgc5g7ssq1bkl44xsl4ia7s4kis9z4wz0slkj7i"; depends=[fields igraph rgdal rgl sp spam SSN]; }; + ODB = derive2 { name="ODB"; version="1.2.1"; sha256="0frkbl99ilpmppm4fm97lbkqhmjgcwlz9j5vh5nzzcsxrh8qwicn"; depends=[DBI RJDBC]; }; + ODEnetwork = derive2 { name="ODEnetwork"; version="1.3.2"; sha256="0wicp0xxqq3jl0kjhc26iqpk8rwa9nv2aiwf18pkgnqxbyw6lgnp"; depends=[checkmate deSolve]; }; ODEsensitivity = derive2 { name="ODEsensitivity"; version="1.1.2"; sha256="0yddv5h3y0xfviqjgrbixawd00jc1rh9ngckfqka5j855vhchh66"; depends=[checkmate deSolve ODEnetwork sensitivity]; }; ODS = derive2 { name="ODS"; version="0.2.0"; sha256="0i7giibass7hadvv6mb7k9xrykgfss57jmm6gpbym8qcywhzq4ny"; depends=[cubature survival]; }; OData = derive2 { name="OData"; version="0.6"; sha256="10r4kfhdabramjmkgc4fl0bljaiqbvc7rq4byas7q8cmji2czw6f"; depends=[RJSONIO XML]; }; @@ -2811,7 +2835,7 @@ in with self; { OLScurve = derive2 { name="OLScurve"; version="0.2.0"; sha256="1zqapfwgwy9rxnbhmlgplkphw1bdia4cyi9q6iwcppw3rjw75f1n"; depends=[lattice]; }; ONETr = derive2 { name="ONETr"; version="1.0.3"; sha256="14l56qcmyyk2ivcfkfv7j2k4i1mfrngpi9zcc88w6xfhz5qlb548"; depends=[plyr RCurl XML]; }; OOBCurve = derive2 { name="OOBCurve"; version="0.3"; sha256="1i7prybs3b60ipl34zrq6mcr6w9kc1d44b14mxcd752k42k6xs2r"; depends=[mlr randomForest ranger]; }; - OOR = derive2 { name="OOR"; version="0.1.2"; sha256="1zw7g0365znyn828qqsn83l2a837wwj9cx7dzcbns28vhqmsn6hm"; depends=[]; }; + OOR = derive2 { name="OOR"; version="0.1.3"; sha256="13v04rx2q6pbiq7dyd29wvimkr4sbq2f5rnn3a0lcbwr3x35r7h9"; depends=[]; }; OOmisc = derive2 { name="OOmisc"; version="1.2"; sha256="09vaxn5czsgn6wpr27lka40kzd76jzqgqxavf26ms3m9kkdf83g4"; depends=[]; }; OPDOE = derive2 { name="OPDOE"; version="1.0-10"; sha256="04z944i4f3i0cjnxh32wf7n2dfyynnvkz4lxdkn90flam2np58yv"; depends=[crossdes gmp mvtnorm nlme orthopolynom polynom]; }; OPI = derive2 { name="OPI"; version="2.9"; sha256="0nkdzl4c6k77phiig3mjwp9dkyarcr4k07mxc6ff72yr776s2pma"; depends=[]; }; @@ -2825,36 +2849,34 @@ in with self; { OSMscale = derive2 { name="OSMscale"; version="0.5.1"; sha256="0rjhyhh1iafgd9h1pbd2clyg2sh0gg7y1aqmiislqyn6h6jrvgqn"; depends=[berryFunctions OpenStreetMap sp]; }; OSNMTF = derive2 { name="OSNMTF"; version="0.1.0"; sha256="0g83wqh97iz3g4ganj2dy3biyn8cmb0v8zz6rydald1hfszj8aa2"; depends=[dplyr MASS]; }; OSTSC = derive2 { name="OSTSC"; version="0.0.1"; sha256="0p92w25xvajsn44rd5hg1m7l9l4m0rpmw175nnqr438432hqh7cc"; depends=[doParallel doSNOW fields foreach MASS]; }; - OTE = derive2 { name="OTE"; version="1.0"; sha256="18w483syhs523yfib9sibzmj16bypqxk4sc4771kfr1958h3igai"; depends=[randomForest]; }; OTRselect = derive2 { name="OTRselect"; version="1.0"; sha256="1bh14228yz552ngywjf1qyh1isqj4cgiy7n7d4zg8dpqwxr04ykp"; depends=[lars survival]; }; OTUtable = derive2 { name="OTUtable"; version="1.1.2"; sha256="1sm037ihm12xyp7ns5f0c1psflvm1aj3xnsj5nzh2rsjn35hvd6h"; depends=[]; }; OTclust = derive2 { name="OTclust"; version="1.0.2"; sha256="1nrgjn13nbki59i51m28h3z0bppmvcp7qgv09h2r2vvdk858iy9z"; depends=[class ggplot2 magrittr RColorBrewer Rcpp]; }; OUwie = derive2 { name="OUwie"; version="1.57"; sha256="0faqyvap8jcz6k08k71lszns2h67csgd7q4s12fml153fm3lsjx9"; depends=[ape corHMM corpcor expm geiger lattice nloptr numDeriv paleotree phangorn phytools Rmpfr]; }; OWEA = derive2 { name="OWEA"; version="0.1.1"; sha256="00mx94v3krivsxha6sh13xhn2bdj77g8858vc4r2cy23ab4bg0g7"; depends=[gtools MASS shiny]; }; Oarray = derive2 { name="Oarray"; version="1.4-9"; sha256="04jng89s19rd8lbjm76wm4p4ggkffwnsa5qa60c4lwn2rj89a8a1"; depends=[]; }; - OasisR = derive2 { name="OasisR"; version="3.0.1"; sha256="1qc5zdxjdfayr9x239rrpc27rqnildix0mvc7p13ik5gzzddsxqr"; depends=[measurements outliers rgdal rgeos seg spdep]; }; Observation = derive2 { name="Observation"; version="0.2.0"; sha256="0v81manzcvv8x9hbf75c8klslzdabha53rasyba91vvcbrshhq6j"; depends=[AGread svDialogs]; }; OceanView = derive2 { name="OceanView"; version="1.0.5"; sha256="11gq15v3blisplbi6q6jgfsjbnbmfnyxdz8pq1ny9vgljzninvn1"; depends=[plot3D plot3Drgl rgl shape]; }; Ohit = derive2 { name="Ohit"; version="1.0.0"; sha256="132d4drc2phw9ppxnczb1ycdg3dv085k8p6bcaj3v866j0hfxjgb"; depends=[]; }; - OjaNP = derive2 { name="OjaNP"; version="0.9-12"; sha256="170hn5gx48n0i16cd5rwzs5inb4hsvqb7zwixxsg7pami6ild0vs"; depends=[ICS ICSNP Rcpp]; }; + OjaNP = derive2 { name="OjaNP"; version="1.0-0"; sha256="0xddspnnwlcxh2i66ilh6i920k53y7fv6m1hgj9h28qg2wy0vyah"; depends=[ICS ICSNP Rcpp]; }; OligoSpecificitySystem = derive2 { name="OligoSpecificitySystem"; version="1.3"; sha256="17mspf1ph2ybv046zckykfdcbrsiz40hrs6ib5mpwkfnrvsp1w7l"; depends=[tkrplot]; }; OmicKriging = derive2 { name="OmicKriging"; version="1.4.0"; sha256="08frr38yf5d0l3zwkbq9465xrbyzsn8sx9icqc3yvfnxrkhrpzig"; depends=[doParallel foreach irlba ROCR]; }; OmicsPLS = derive2 { name="OmicsPLS"; version="1.2.0"; sha256="108rp76g4cy7zaxv9q979rlv4pn9kb5i3f3iz29cdvxm55a55khv"; depends=[ggplot2 magrittr tibble]; }; Omisc = derive2 { name="Omisc"; version="0.1.2"; sha256="0ww83srfc7vr1gw2aaa5bahs6lvm11j4057hn06pclz1wb6fnbyw"; depends=[copula MASS psych]; }; OmnibusFisher = derive2 { name="OmnibusFisher"; version="1.0"; sha256="0x3q04g45nixgsrl4biqqi6bk4kx79spq5whm3n4ppr0nkv8dw4h"; depends=[CompQuadForm stringr survey]; }; OnAge = derive2 { name="OnAge"; version="1.0.1"; sha256="1zby5sf92c185b5m19jv4ndgbv6mz107nc47zn1d6bijrypzpc20"; depends=[]; }; - OncoBayes2 = derive2 { name="OncoBayes2"; version="0.5-8"; sha256="1nww1bshjg04zamh2jgmallm97xhdqs8vs7pbf3x8a7p2i3lcvnm"; depends=[abind assertthat bayesplot BH checkmate dplyr Formula ggplot2 RBesT Rcpp RcppEigen rstan rstantools StanHeaders tibble tidyr]; }; + OncoBayes2 = derive2 { name="OncoBayes2"; version="0.6-3"; sha256="1m05m6g98az7qy14j3w0r5vym997a6c564y4ispl711s609yg2rr"; depends=[abind assertthat bayesplot BH checkmate dplyr Formula ggplot2 RBesT Rcpp RcppEigen rstan rstantools StanHeaders tibble tidyr]; }; Oncotree = derive2 { name="Oncotree"; version="0.3.3"; sha256="147rc9ci66lxbb91ys2ig40sgmldi15p604yysrd4ccbxpbk2zwf"; depends=[boot]; }; OneArmPhaseTwoStudy = derive2 { name="OneArmPhaseTwoStudy"; version="1.0.3"; sha256="0q8g33s1jq0ipvwq83xhrly8idsh68licgyivxc628zbm1id5p38"; depends=[Rcpp]; }; OneR = derive2 { name="OneR"; version="2.2"; sha256="1k7rzhcwq5b2yi4zfsc1r0yb6w65gxj9835d2a1dclallja3zav2"; depends=[]; }; OneTwoSamples = derive2 { name="OneTwoSamples"; version="1.0-3"; sha256="0019rc2f4jmbm6sinkvalvjqwi822x78aiin88kg8qbbb5ml8l89"; depends=[]; }; - OpVaR = derive2 { name="OpVaR"; version="1.0.5"; sha256="14kq95i8n0g1wy3s32llw3803qzkxlyz9307clc1bwzi0wp22x5f"; depends=[actuar evmix goftest MASS pracma ReIns tea truncnorm vcd VineCopula]; }; OpasnetUtils = derive2 { name="OpasnetUtils"; version="1.3"; sha256="0mmn4dpk1wl8slg55xzhpk7jdwhkrka53rwmrsr73sikkh3mcyfn"; depends=[digest ggplot2 httpRequest igraph plyr RCurl reshape2 rgdal rjson sp triangle xtable]; }; - OpenCL = derive2 { name="OpenCL"; version="0.1-3.1"; sha256="0vxfsvin35idgvmc22178bq0r5193pdzba3wwv9djz52fzbj7zys"; depends=[]; }; + OpenCL = derive2 { name="OpenCL"; version="0.2-1"; sha256="1bhnqwrb8phldk5hr06iyvw8fx03x01ddqr4y5zs4a1wpyah7j2w"; depends=[]; }; OpenImageR = derive2 { name="OpenImageR"; version="1.1.6"; sha256="1yl7xvb86vxyf8d5g58hhmrva0gyg8iabb9npsdlnl8j0bg5gfiw"; depends=[jpeg png R6 Rcpp RcppArmadillo shiny tiff]; }; + OpenLand = derive2 { name="OpenLand"; version="1.0.0"; sha256="0y4hhld08dj82j1dqmm5ywq8dkfcnlgg3g6ndhcj4h6ihrwq4xc7"; depends=[circlize dplyr ggplot2 gridExtra networkD3 raster tidyr]; }; OpenML = derive2 { name="OpenML"; version="1.10"; sha256="132swv22ymm0wxq8y65y2niq8chmga1mnl1lgn6m3cgljvwad47r"; depends=[backports BBmisc checkmate curl data_table digest httr jsonlite memoise stringi XML]; }; OpenMPController = derive2 { name="OpenMPController"; version="0.2-5"; sha256="00hs8v47pr2d726z8izkfrgmayw147hdm16rr9rw1zs3ad216zjj"; depends=[]; }; - OpenMx = derive2 { name="OpenMx"; version="2.15.5"; sha256="1wbzhmyb1lnk39dkcyccmblxvniwsghh0jd94x05pk6yrcq8im5v"; depends=[BH digest MASS Matrix Rcpp RcppEigen rpf StanHeaders]; }; + OpenMx = derive2 { name="OpenMx"; version="2.17.3"; sha256="1s2pcg281ag3qz2wz8yi826f2d3kj3qg916js7zz0nsrljcyv5bc"; depends=[BH digest MASS Matrix Rcpp RcppEigen rpf StanHeaders]; }; OpenRepGrid = derive2 { name="OpenRepGrid"; version="0.1.12"; sha256="02p9b2y99z9yrrm2pl86p0yqwah0yjic2wdcd4k0mhccimmmkaip"; depends=[abind colorspace GPArotation openxlsx plyr psych pvclust rgl stringr XML]; }; OpenStreetMap = derive2 { name="OpenStreetMap"; version="0.3.4"; sha256="0kyv14lxi86n6aba4jqmsfpmn075k0ki34q6gkkvhq8yv48wg831"; depends=[ggplot2 raster rgdal rJava sp]; }; Opportunistic = derive2 { name="Opportunistic"; version="1.2"; sha256="0kaj11ziij1v65l972x4kbr7vzkx4dwa27ymabiip4dg57a976wr"; depends=[]; }; @@ -2870,7 +2892,7 @@ in with self; { OptimalDesign = derive2 { name="OptimalDesign"; version="1.0.1"; sha256="02vxxb25q7fl73y7zq0a89ra0s88wji4mrql7p88014p073lj2as"; depends=[lpSolve Matrix matrixcalc matrixStats plyr quadprog rgl]; }; OptimalTiming = derive2 { name="OptimalTiming"; version="0.1.0"; sha256="1mchb7wdk1v56la30ivi40aq6zma64lrdb94d64d0s7x67m8315w"; depends=[mstate survival]; }; OptionPricing = derive2 { name="OptionPricing"; version="0.1"; sha256="0j98h3fn29xfv7xyp7av459v56chw99pnvmsbqvrv4g77p60f5q2"; depends=[]; }; - Orcs = derive2 { name="Orcs"; version="1.2.0"; sha256="0fwji4w2089zlcjbsbz9pmy54ryl4y10kxms836v1dxrjc5az3sp"; depends=[bookdown knitr lattice latticeExtra plotrix raster Rcpp remotes rgdal sf sp]; }; + Orcs = derive2 { name="Orcs"; version="1.2.1"; sha256="0n693m8z0j4irk9zj6d1gpbn2vhfbfpf7z6iyx19iim3g242823q"; depends=[bookdown knitr lattice latticeExtra plotrix raster Rcpp remotes rgdal sf sp]; }; OrdFacReg = derive2 { name="OrdFacReg"; version="1.0.6"; sha256="16mavsmp6d8rfmimmp5ynwyzir0gycpg8rhd8cwanlrndyclqlpv"; depends=[eha MASS survival]; }; OrdMonReg = derive2 { name="OrdMonReg"; version="1.0.3"; sha256="1xca8pvvq79j484l2rmn4nva8ncx8z51g5diljikck231y8qjqaz"; depends=[]; }; OrdNor = derive2 { name="OrdNor"; version="2.2.1"; sha256="01w97ssdi6m6sdc0n3rvd9h42nri5ba1kzwb1643pijcgz3vl2b8"; depends=[corpcor GenOrd Matrix mvtnorm]; }; @@ -2886,12 +2908,11 @@ in with self; { OutrankingTools = derive2 { name="OutrankingTools"; version="1.0"; sha256="0z7pslkkinn7flc4xwjg0bsfswf8ad4jv9rmglaj3fmjcx9b6wgj"; depends=[igraph]; }; OwenQ = derive2 { name="OwenQ"; version="1.0.3"; sha256="0kra8pvz21kqwzwsrqh6vwfyq9qqrar3glcycd2gip19273whdim"; depends=[BH Rcpp RcppEigen RcppNumerical]; }; OxyBS = derive2 { name="OxyBS"; version="1.5"; sha256="11l3gm0jvw993jb13f6kpv77m6z0d1jswscma2v28qzkw053r3dc"; depends=[]; }; - PAC = derive2 { name="PAC"; version="1.1.1"; sha256="07f83i43nxf1s2c26kkpcv4iyq517w20y1l7yg41wnmbfi9xlk7s"; depends=[dplyr ggplot2 ggrepel igraph infotheo parmigene Rcpp Rtsne]; }; - PACBO = derive2 { name="PACBO"; version="0.1.0"; sha256="1v3j5bgvf0wh8s4d2yyz0fkc3acdwjlicwnbh1r241b1742x79cb"; depends=[mnormt]; }; + PAC = derive2 { name="PAC"; version="1.1.2"; sha256="1xh8y6ypicfabfm7kv0l4074mskjbcvyv5y13r10g5b7gqk35vkz"; depends=[dplyr ggplot2 ggrepel igraph infotheo parmigene Rcpp Rtsne]; }; PACLasso = derive2 { name="PACLasso"; version="1.0.0"; sha256="1qzzymhfsjy8mk0r0xpd5h4wrx4wk8gq3vi6fnawkq5xkrg26rld"; depends=[lars limSolve MASS penalized quadprog]; }; - PACVr = derive2 { name="PACVr"; version="0.8.2"; sha256="0bqv0zhcyp5v1wln11kkvygdwd70yrixd9cbm5fvjqkmmdvmnrv0"; depends=[BiocGenerics genbankr optparse RCircos]; }; - PAFit = derive2 { name="PAFit"; version="1.0.1.6"; sha256="134dl2hdk8nk0bkjzlln1k9q07m9cfnxqgs4p9sk4r6rwxza5xpg"; depends=[igraph knitr magicaxis mapproj MASS network networkDynamic plyr RColorBrewer Rcpp VGAM]; }; - PAFway = derive2 { name="PAFway"; version="0.1.2"; sha256="1sdfw9j6pzbnnhh3ghx7vkynd3523ayaimmpkidb300hdkblln6a"; depends=[GGally ggplot2 gplots igraph network scales sna]; }; + PACVr = derive2 { name="PACVr"; version="0.9.2"; sha256="0pn4k1yxja0blc89ksmhn7pwn3p647hvn6zmi7d0k47dfzy5rch5"; depends=[BiocGenerics Biostrings genbankr GenomicAlignments optparse RCircos]; }; + PAFit = derive2 { name="PAFit"; version="1.0.1.8"; sha256="12rqf7mcbsc4ngq75gw8nrllqc2nd9l5p8jdnx6gjn26ldydg6h6"; depends=[igraph knitr magicaxis mapproj MASS network networkDynamic plyr RColorBrewer Rcpp VGAM]; }; + PAFway = derive2 { name="PAFway"; version="0.1.3"; sha256="1ggmqbls8i5zqihzi66kaw09bbip2spiiizfzkx7amcvpm8zsr7r"; depends=[GGally ggplot2 igraph network scales sna]; }; PAGI = derive2 { name="PAGI"; version="1.0"; sha256="01j1dz5ihqslpwp9yidmhw86l112l7rfkswmf03vss872mpvyp3f"; depends=[igraph]; }; PAGWAS = derive2 { name="PAGWAS"; version="2.0"; sha256="0bz47ivd32kx1amgqllqbxyyvj773q7wasgk924hmibabiixa8nx"; depends=[foreach lars mnormt]; }; PAMA = derive2 { name="PAMA"; version="0.1.0"; sha256="19mz37h1kcfff7fkshg6qzgwm9vqgbzwjkcs5ydd1v6xq37lzapm"; depends=[mc2d PerMallows]; }; @@ -2924,11 +2945,11 @@ in with self; { PCFAM = derive2 { name="PCFAM"; version="1.0"; sha256="196jzv0f6j60zkyagm9n98339ipn8mrhmhl3q4g053z8f6mm9zmv"; depends=[]; }; 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.11"; sha256="010188p7f4nr5jxayq02a8q2r23a9w9rd6njxckca99d903cpwg5"; depends=[ape data_table expm ggplot2 mvtnorm xtable]; }; + PCMBaseCpp = derive2 { name="PCMBaseCpp"; version="0.1.9"; sha256="0k40mxs8w1vk7qwpkv8gnq6cq3kpj7wvf0i6f1qn1wmm2vvz1kfy"; depends=[abind data_table PCMBase Rcpp RcppArmadillo]; }; PCMRS = derive2 { name="PCMRS"; version="0.1-1"; sha256="10n4am4qm23aaghf8awv2llcq7392s62yr6mf5h8nf18hfz29wrn"; depends=[cubature ltm mvtnorm Rcpp RcppArmadillo statmod]; }; PCPS = derive2 { name="PCPS"; version="1.0.7"; sha256="0gxymz0yws1q1bxkpxi0lmbv57xx62h3dl7z3i2cnbagswkax3zh"; depends=[ape nlme phylobase picante RcppArmadillo SYNCSA vegan]; }; - PCRedux = derive2 { name="PCRedux"; version="1.0-4"; sha256="1p62brjmvpahxksjnmlfp8flk4yscpvl0g0j5alwp6wqndn2qxcl"; depends=[bcp changepoint chipPCR ecp fda_usc MBmca pbapply pracma qpcR robustbase shiny zoo]; }; + PCRedux = derive2 { name="PCRedux"; version="1.0-6"; sha256="0s7g6y8iw4w42ihpiqqhbgwaf4fim91pwsp8hh7fh5nawj2wg9k7"; depends=[bcp changepoint chipPCR ecp fda_usc MBmca pbapply pracma qpcR robustbase shiny zoo]; }; PCS = derive2 { name="PCS"; version="1.2"; sha256="0488h6s1yz6fwiqf88z2vgckn6i0kwls8cazmpw3wspnaqvl2n4s"; depends=[multtest statmod]; }; PCSinR = derive2 { name="PCSinR"; version="0.1.0"; sha256="1z8yjryw3c43vc6fxcwiindmyq6r63pc1zr3aybwmys6mv697bb4"; depends=[]; }; PCovR = derive2 { name="PCovR"; version="2.7"; sha256="00920h0qlw81vwh46inmvm4mdv0dfd8xvqvrj7l038hhmjb7qsjz"; depends=[GPArotation MASS Matrix ThreeWay]; }; @@ -2944,37 +2965,35 @@ in with self; { PEMM = derive2 { name="PEMM"; version="1.0"; sha256="18dd9hsbdrnhrrff7gpdqrw2jv44j8lg0v3lkcdpbd4pppcaq84h"; depends=[]; }; PGEE = derive2 { name="PGEE"; version="1.5"; sha256="1qcxbqnbpplnfjy83nm9fj9y4abzgbxnsggzx7ix3vb9qs18cdwh"; depends=[MASS mvtnorm]; }; PGM2 = derive2 { name="PGM2"; version="1.0-1"; sha256="03282pcq7gw47awc2mxjsbz6w3zpqjhqd7fzg8la4p00cd0vvmr4"; depends=[]; }; - PGRdup = derive2 { name="PGRdup"; version="0.2.3.4"; sha256="1arviyjmvbkiv4fwfs155360p3fnfqsdnhrjdn0r2pgzmsb66i1y"; depends=[data_table ggplot2 gridExtra igraph stringdist stringi]; }; + PGRdup = derive2 { name="PGRdup"; version="0.2.3.5"; sha256="11lq2l0j6l3ixi3fmz2gd0idypl18gkhqfwbgg41gzzwj92lsrq4"; depends=[data_table ggplot2 gridExtra igraph stringdist stringi]; }; PHENIX = derive2 { name="PHENIX"; version="1.3.1"; sha256="1gd9ycrwawi81al4f5v559km1112giwqnwvvk8ynj4kdb5bqpyq4"; depends=[ppcor SuppDists]; }; - PHEindicatormethods = derive2 { name="PHEindicatormethods"; version="1.2.0"; sha256="1x7wf1yhl2yvdmgv88z7ak6ihdjhyrm81wphnk2wpgsg6b4m9g12"; depends=[broom dplyr purrr rlang tidyr]; }; + PHEindicatormethods = derive2 { name="PHEindicatormethods"; version="1.3.0"; sha256="1skjmrbqh5jm9h7nsgw91bq1ca8jyp59r97m4pd4aahcslab4zaq"; depends=[broom dplyr purrr rlang tidyr]; }; + PHInfiniteEstimates = derive2 { name="PHInfiniteEstimates"; version="1.3"; sha256="097a1wqh6c8y0ny6ikpkfqym4fw2vz7rrhqpf6xfb71vf3big90k"; depends=[coxphf lpSolve mlogit Rdpack survival]; }; PHYLOGR = derive2 { name="PHYLOGR"; version="1.0.10"; sha256="17q760k5519alr2skvpnghz3c9jgw07lh5fpw4xf6hjk3qlqq82c"; depends=[]; }; PHeval = derive2 { name="PHeval"; version="0.5.4"; sha256="06fy5dm4mnp29f01163rw1d1hyl7rlcp4pfw18s87ckpr931qyma"; depends=[survival]; }; - PIGE = derive2 { name="PIGE"; version="1.1"; sha256="0pc24rvvxzpgrsx7xsj98n5vd462hjggakzwp36qdkib69yyr4bn"; depends=[ARTP snowfall survival xtable]; }; PIGShift = derive2 { name="PIGShift"; version="1.0.1"; sha256="115dnsh4b1rxx1d2kc8x3vl5366h5f0i6gg8l1w3v0f8309qigis"; depends=[ape mvtnorm]; }; - PINSPlus = derive2 { name="PINSPlus"; version="2.0.0"; sha256="0glyc9hw3s87h38r4wp8mgk9gqm4x408yf5iaf1yk5yjg9yqb1a1"; depends=[cluster doParallel entropy foreach pbmcapply]; }; + PINSPlus = derive2 { name="PINSPlus"; version="2.0.1"; sha256="0fx07nkmh467iql8s4sy9llnnmd2rcl33vjny04r4am28rwkq4k2"; depends=[cluster doParallel entropy FNN foreach matrixStats Rcpp RcppArmadillo RcppParallel]; }; PIPS = derive2 { name="PIPS"; version="1.0.1"; sha256="1c5v3s6xys9p1q32k6mpsffhi9gwsq951rh12hs76dmak862yspc"; depends=[]; }; - PK = derive2 { name="PK"; version="1.3-4"; sha256="1zkjq64p34gzbsbmbdqphssnplzz65wpl486qf4yhawnb4wnkj1v"; depends=[]; }; + PK = derive2 { name="PK"; version="1.3-5"; sha256="1wzz2qv6h6nc2hcsg4098951i608xbbhc9f9ngamfigh5sbmzbh6"; depends=[]; }; PKI = derive2 { name="PKI"; version="0.1-5.1"; sha256="1xs3jxbczhkxnp7cyw2yh1jcwha92y9pdsbka1ligbla70bnvxyj"; depends=[base64enc]; }; - PKNCA = derive2 { name="PKNCA"; version="0.9.1"; sha256="0b9ar6d487b7klvavv6c10q9a8q6ads8bv9x3pb5359jxbfilm3q"; depends=[digest dplyr nlme rlang tidyr]; }; - PKPDmisc = derive2 { name="PKPDmisc"; version="2.1.1"; sha256="1p47zdhilprzcwarfmisq7g7znr73wgxns43mn3d7w5sv671mygv"; depends=[BH data_table dplyr ggplot2 lazyeval magrittr purrr Rcpp readr rlang stringr tibble]; }; + PKNCA = derive2 { name="PKNCA"; version="0.9.2"; sha256="091gxv2ajrlxh73rwim6miz4pzpix5917f40hh6wz25c7fkdbafs"; depends=[digest dplyr nlme rlang tidyr]; }; PKPDmodels = derive2 { name="PKPDmodels"; version="0.3.2"; sha256="1h893civ77ahbgjnc6kq3l7rszmqmx9dlxwavldigpq3r79vd86k"; depends=[]; }; - PKconverter = derive2 { name="PKconverter"; version="1.3"; sha256="1ddhj1qwdwr6g89q55l9njm1ms1wr80d56klz50ai9xvb91qzn89"; depends=[shiny shinydashboard shinythemes]; }; + PKconverter = derive2 { name="PKconverter"; version="1.5"; sha256="1zk2sjrjhq7n2k2p29r2qc6qdghr3riyjvvawz0g74lidg7hm1ly"; depends=[shiny shinydashboard shinythemes]; }; PKgraph = derive2 { name="PKgraph"; version="1.7"; sha256="0g36cdv5cblqx69j48irxjc5nlw2cl3p714mlsblnd3362z1brwn"; depends=[cairoDevice ggplot2 gWidgetsRGtk2 lattice proto rggobi RGtk2]; }; PKreport = derive2 { name="PKreport"; version="1.5"; sha256="16hss9migbxpnw5f9gcw1nlvb81iyji00ylx5wd6kdwhz0ids9wj"; depends=[ggplot2 lattice]; }; PLIS = derive2 { name="PLIS"; version="1.1"; sha256="0b81s7677wglqvv1b5lx8k2iaks09kz0wrl07245a7j2pk9nxv7p"; depends=[]; }; PLMIX = derive2 { name="PLMIX"; version="2.1.1"; sha256="05mnzsi7y71cvg50qx8hp4m31gqslldl34k41r1f8npyb6ldpdca"; depends=[abind coda foreach ggmcmc ggplot2 gridExtra gtools label_switching MCMCpack PlackettLuce pmr prefmod radarchart rankdist rcdd Rcpp reshape2 StatRank]; }; - PLNmodels = derive2 { name="PLNmodels"; version="0.9.4"; sha256="1a2rdh4hz6pj28ahzwygyd5l44wcsqhsl4rqrnbnlnzabvs6fp9n"; depends=[corrplot dplyr ggplot2 glassoFast gridExtra igraph magrittr MASS Matrix nloptr R6 Rcpp RcppArmadillo tidyr]; }; + PLNmodels = derive2 { name="PLNmodels"; version="0.9.5"; sha256="0a80jjswdca3h1hkp39smavwbq47s0ydp04nb5jcj4yy4v1b9rx5"; depends=[corrplot dplyr ggplot2 glassoFast gridExtra igraph magrittr MASS Matrix nloptr R6 Rcpp RcppArmadillo tidyr]; }; PLRModels = derive2 { name="PLRModels"; version="1.1"; sha256="0dwnzfw7a1cxz9s00kxf19jmjsc8cy6cc9q2mjqf8z7690wrg7hb"; depends=[]; }; PLSbiplot1 = derive2 { name="PLSbiplot1"; version="0.1"; sha256="1l8d1k913ic0qwxvrrd447p5ni3mzc6v9lv45b7vqrpzkxdci6gy"; depends=[]; }; PLmixed = derive2 { name="PLmixed"; version="0.1.4"; sha256="1plkcv7k6jijywhxrsx2lxcbavzvagzl8wnz132nqq619wvb57ia"; depends=[lme4 Matrix numDeriv optimx]; }; PLordprob = derive2 { name="PLordprob"; version="1.1"; sha256="1g23h3121g9csr85falm6vgzbva42wz3skhfr2rxmvlc3ca4afyp"; depends=[mnormt]; }; - PMA = derive2 { name="PMA"; version="1.2"; sha256="0cmhkkkgwxi52cprxpx8kljfaz1a3pcinwcjp17b9j9xd9nd0kkv"; depends=[]; }; + PMA = derive2 { name="PMA"; version="1.2.1"; sha256="1rhiylm3jfarnqdkv7nwg536sgsa30ic80dk9byks9w0wf4mn59s"; depends=[]; }; PMCMR = derive2 { name="PMCMR"; version="4.3"; sha256="09bvdj2h1086r2cgy3myrhlylplxxlliv8nwx09c8kb1vn02i2ij"; depends=[]; }; - PMCMRplus = derive2 { name="PMCMRplus"; version="1.4.2"; sha256="0n71q8kcmk1ibqn0fq9p60xrxx1dg7hszn11i51cmsx9695wwk28"; depends=[BWStest gmp kSamples MASS multcompView mvtnorm Rmpfr SuppDists]; }; - PML = derive2 { name="PML"; version="1.1"; sha256="11fl7qm98n5wlfwczb6vzj9hswq7mqmb09nh9wl7986jp2wbrjlw"; depends=[dplyr rbokeh tibble tidyr trelliscopejs]; }; - PMmisc = derive2 { name="PMmisc"; version="0.1.2"; sha256="03bavk7ylmrrcc49zy9fb2q08w6138b3srxa4x038syr115k3l6k"; depends=[ggplot2 robust]; }; - PMwR = derive2 { name="PMwR"; version="0.12-0"; sha256="1w3zz3sh06vbyzngcpm52izi2ymnfy897q2zz7vrb6r8xxcbrlwi"; depends=[datetimeutils fastmatch NMOF orgutils textutils zoo]; }; - PNADcIBGE = derive2 { name="PNADcIBGE"; version="0.5.0"; sha256="1b9p7r588klxmwcszffcmn37w5r29n4ab2f54xm23lnlpix80yg6"; depends=[dplyr magrittr RCurl readr readxl survey timeDate]; }; + PMCMRplus = derive2 { name="PMCMRplus"; version="1.4.4"; sha256="1myj2hf1sx32j6hcql1zrbxkibg6l0qggcnrpsr2y40kzbw463pi"; depends=[BWStest gmp kSamples MASS multcompView mvtnorm Rmpfr SuppDists]; }; + PML = derive2 { name="PML"; version="1.2"; sha256="0r4mfnkbg7chrnm3lb78hjcz25fal6vvvqwvnzvicl46mdhl94yb"; depends=[dplyr rbokeh tibble tidyr]; }; + PMwR = derive2 { name="PMwR"; version="0.14-0"; sha256="15qfpsnnak8qf41cfq3n4g6iwxnzbifxqm50pnbk76v6727s21hy"; depends=[datetimeutils fastmatch NMOF orgutils textutils zoo]; }; + PNADcIBGE = derive2 { name="PNADcIBGE"; version="0.6.0"; sha256="1xwjw8wcr0xys3bwk7aj0rih2nzdw86rja7fwqis2rfcbk9r8cim"; depends=[dplyr magrittr RCurl readr readxl survey tibble timeDate]; }; POCRE = derive2 { name="POCRE"; version="0.5.0"; sha256="0aph1lmb0xkzm4l4ah2wrx13d138igf4k4w9wb9lca4vv6m7xzqf"; depends=[EbayesThresh ggplot2 pracma]; }; POD = derive2 { name="POD"; version="1.1.4"; sha256="0ivq7jpnyb5zvvi2dx788cawrsh26hyp8j0a8mkfcsnhyhhs7hnb"; depends=[]; }; POET = derive2 { name="POET"; version="2.0"; sha256="0w3jhj45sxisyrpcsazbrbcsz7rmraw71jjm0zixbcgc4klb98ar"; depends=[]; }; @@ -2985,7 +3004,7 @@ in with self; { POUMM = derive2 { name="POUMM"; version="2.1.6"; sha256="16yiymfaci9zklbx3klf3nn9xlf305mdbq5n1ccx4w7g7h0ivdi1"; depends=[adaptMCMC ape coda data_table foreach ggplot2 lamW Rcpp]; }; PP = derive2 { name="PP"; version="0.6.2"; sha256="1y6f8pnvdp59xnm0vh1rjhcxy3nyd3il7r76yyrrfamdr42hh8lc"; depends=[Rcpp]; }; PP3 = derive2 { name="PP3"; version="1.2"; sha256="1g36al9w1rxyhfzbvpw9siqq57h2xl0zr94wysz8i0jzqkkqkrvf"; depends=[]; }; - PPCI = derive2 { name="PPCI"; version="0.1.4"; sha256="18q9jjmmmmghwyzpj42k7xa55anvbg1jnqs2y6c5jzlb2cw3ga4h"; depends=[rARPACK]; }; + PPCI = derive2 { name="PPCI"; version="0.1.5"; sha256="141811iq0g2rq7lxpz9a44kyjfylj85yqgcjq7b23xfg2wbcp8dd"; depends=[rARPACK]; }; PPMR = derive2 { name="PPMR"; version="1.0"; sha256="07fky5xc1dmmn23wwdjm46c86i7q20dv5f2147828v52hhky873g"; depends=[Rcpp RcppArmadillo]; }; PPQplan = derive2 { name="PPQplan"; version="1.0.0"; sha256="159mgwd2d7qzfwj6dnxr77p0fm7rgq9bpks2ra54s446cm4ahgkd"; depends=[ggplot2 plotly tolerance]; }; PPRL = derive2 { name="PPRL"; version="0.3.5.2"; sha256="083al6xi9b62vbx71684bxq2xynvmxw25ak01gwngln1r84gsz5l"; depends=[Rcpp settings]; }; @@ -3001,9 +3020,9 @@ in with self; { PRISMA = derive2 { name="PRISMA"; version="0.2-7"; sha256="0sk2d07m8rhipa0kdbaf8ngryda6f1ihp5akpnyw2llajf0x8as5"; depends=[ggplot2 gplots Matrix]; }; PRISMAstatement = derive2 { name="PRISMAstatement"; version="1.1.1"; sha256="1vvab8h71g8c910s2h4d12qafqdncfzmsh5f1b4m79plpqi3s49z"; depends=[DiagrammeR]; }; PROBShiny = derive2 { name="PROBShiny"; version="0.1.0"; sha256="17p6pb8nwq36ha697f2lf8nwzj5cylmh8rdzyag49ks5hi9painb"; depends=[epitools LaplacesDemon rmarkdown rpivotTable shiny shinyMatrix]; }; - PROJ = derive2 { name="PROJ"; version="0.1.0"; sha256="0vxa0ysf0rs59vwx70ygr73m5rz77qrbv0jdrnxr502y6chz51ji"; depends=[]; }; + PROJ = derive2 { name="PROJ"; version="0.1.5"; sha256="0wff6cqyq3ixsglflz5fyfg10akmwhh6np6jc158llxbb3krxjx3"; depends=[]; }; PROMETHEE = derive2 { name="PROMETHEE"; version="1.1"; sha256="0r53mb9ndwm4yli3h50cfamsjzpq6b67g72mszm7lpbqpj58wqw6"; depends=[lpSolve]; }; - PROSPER = derive2 { name="PROSPER"; version="0.3.0"; sha256="1xrzsayrkna1njz77kwikzyyinfsny2jahv829w789698azr1ms4"; depends=[data_table]; }; + PROSPER = derive2 { name="PROSPER"; version="0.3.2"; sha256="1w58sv519fjrmbv5q7pvfd4b3d22v33nlx9m232dkxj6i7qs1dcx"; depends=[data_table]; }; PROTOLIDAR = derive2 { name="PROTOLIDAR"; version="0.1"; sha256="0bz3071b0wlcvh40vl3dyiiixk5avsj6kjjnvlvx264i5g08rij4"; depends=[]; }; PROreg = derive2 { name="PROreg"; version="1.0"; sha256="0c2vgzbdi29rlrnrb971dqrl7rlb9y3rw8nj5rjgwsjqxv607ssj"; depends=[car fmsb Matrix matrixcalc numDeriv RColorBrewer rootSolve]; }; PROscorer = derive2 { name="PROscorer"; version="0.0.1"; sha256="0mgj0mi0vzdk0agimsx4k9i4bss0j5lqiayzhldr1hrqrx2a4f3d"; depends=[PROscorerTools]; }; @@ -3019,13 +3038,12 @@ in with self; { PSLM2015 = derive2 { name="PSLM2015"; version="0.2.0"; sha256="1f8kzlqil2ac8a9fbj9fhdni2narh2yaaz044mlx7gsv2ns3ai19"; depends=[dplyr ggplot2 magrittr]; }; PSPManalysis = derive2 { name="PSPManalysis"; version="0.2.2"; sha256="0g59r13nc6w4a4gkjxnvkygp9hax1sw34a5rv6r170gwdj9fiswq"; depends=[pkgbuild]; }; PST = derive2 { name="PST"; version="0.94"; sha256="0f28zrnlficbi9iil6wbh51k9mghpkz63hw05lpmlpx1yl5nd0a6"; depends=[RColorBrewer TraMineR]; }; - PSTR = derive2 { name="PSTR"; version="1.2.4"; sha256="0d1j7khd0fx9fapak6arigzprsl8f5jadspbyzym4g2a78m7cnnq"; depends=[ggplot2 magrittr plotly snowfall tibble]; }; 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="1.0.0"; sha256="1jybr5smjnc2mm02f13gkcpapaxjqj8ajc6sswy9b23fbcbqzlkw"; depends=[data_table ggdendro ggplot2 gtable kableExtra knitr plyr RColorBrewer reshape2 rmarkdown seqinr UpSetR yaml]; }; + PTXQC = derive2 { name="PTXQC"; version="1.0.4"; sha256="1yywzmnnj3i53hkphjml78hrz5fk0k3nmkp9hzrsja79dpimwn40"; depends=[data_table ggdendro ggplot2 gtable kableExtra knitr plyr RColorBrewer reshape2 rmarkdown seqinr UpSetR yaml]; }; PTwins = derive2 { name="PTwins"; version="0.1.1"; sha256="166mc7w52n9d3n72h5jvvhbki87prkils3yigdf57dn9pyixrd66"; depends=[]; }; - PUPAIM = derive2 { name="PUPAIM"; version="0.1.0"; sha256="0lkfp1jlcf0m0h7hqvbcr0sq0kbdwpvqvz52rs8j5n7ywiky4q3i"; depends=[FSA Metrics minpack_lm]; }; + PUPAIM = derive2 { name="PUPAIM"; version="0.2.0"; sha256="1ky6f4yhm3hjrfxwk8vfalzzjgkq1922my26w457q8nfng7f2m53"; depends=[Metrics minpack_lm nls2]; }; PUlasso = derive2 { name="PUlasso"; version="3.2.3"; sha256="07jf81q898833qswwairkv21dxlz7890219fdgnw3ywgp5kvlp41"; depends=[doParallel foreach ggplot2 Matrix Rcpp RcppEigen]; }; PVAClone = derive2 { name="PVAClone"; version="0.1-6"; sha256="0fj5p3z2cwnyshrr4rq88wpij2xax5p4aq0x4p342kadx9d6x2ga"; depends=[coda dclone dcmle]; }; PVR = derive2 { name="PVR"; version="0.3"; sha256="0pcnazkiwmicr3k6k70r8skqk0pd46fcqhhxghawxjs4slgnygkj"; depends=[ape MASS splancs]; }; @@ -3051,20 +3069,20 @@ in with self; { PanCanVarSel = derive2 { name="PanCanVarSel"; version="0.0.3"; sha256="06xkzg2kvyr6ivm1z71x2pk20j37h36sx6kf4kmc8q50cq73k9jl"; depends=[Matrix msm mvtnorm smoothmest]; }; PanJen = derive2 { name="PanJen"; version="1.6"; sha256="18cl9rls98v286kk6lyxxws3w59zpzgmqi5250gdgcf71xy2lhvm"; depends=[mgcv]; }; PanelCount = derive2 { name="PanelCount"; version="1.0.9"; sha256="1b6c83qypjc3ylvhh24xm4pjk8w34s24v0i9ddlmg92f1518hlkj"; depends=[Rcpp RcppArmadillo statmod]; }; + PanelMatch = derive2 { name="PanelMatch"; version="1.0.0"; sha256="02nsi5bhzqdn3v164f70xs0lll929gi602jw2b1xza7wcszdchfd"; depends=[CBPS data_table ggplot2 MASS Matrix Rcpp RcppArmadillo RcppEigen]; }; Paneldata = derive2 { name="Paneldata"; version="1.0"; sha256="00hk340x5d4mnpl3k0hy1nypgj55as2j7y2pgzfk3fpn3zls5zib"; depends=[]; }; - ParBayesianOptimization = derive2 { name="ParBayesianOptimization"; version="0.2.0"; sha256="1sgb0wrk9h52v55qc4q0r11b7x7cjmjfk1klmmvigpjlz1dycz7k"; depends=[crayon data_table dbscan foreach GauPro ggplot2 lhs plotly]; }; + ParBayesianOptimization = derive2 { name="ParBayesianOptimization"; version="1.1.0"; sha256="1famkdri08qsamn5ji4knq42pj8z4lkhacbr8mbj439hkmpsfxkv"; depends=[crayon data_table dbscan DiceKriging foreach ggplot2 ggpubr lhs plotly]; }; ParDNAcopy = derive2 { name="ParDNAcopy"; version="2.0"; sha256="017xwznhfibi8kp0ifww02c0qcq0vxs06rjww4kcp2bvdmld8kc4"; depends=[DNAcopy]; }; - ParallelLogger = derive2 { name="ParallelLogger"; version="1.1.1"; sha256="0z2a777536yvqcypzxis7j4k3ns5v4lwdrkib9zx1ngxxzv6k9xn"; depends=[jsonlite snow XML]; }; + ParallelLogger = derive2 { name="ParallelLogger"; version="1.1.2"; sha256="1yp0kb0fv0qr8lg2qbssz3gdvlpjmim18dak08ibfznwyivkfrna"; depends=[jsonlite snow XML]; }; ParallelPC = derive2 { name="ParallelPC"; version="1.2"; sha256="07y7xb16865khxkvwsk1yglzyy7ja4aj2wpkipaz48i77c3x8bi2"; depends=[]; }; ParallelTree = derive2 { name="ParallelTree"; version="0.1.3"; sha256="1h53qwhc63fglm452b3by7f3g6f3hyqwkmwmbdqdb9rv3j4gvnvg"; depends=[ggplot2]; }; - ParamHelpers = derive2 { name="ParamHelpers"; version="1.13"; sha256="0yaf899yhia2773lkq5a16wz6srpsx7xzkbgf421ai2z90m23ddr"; depends=[backports BBmisc checkmate fastmatch]; }; - ParentOffspring = derive2 { name="ParentOffspring"; version="1.0"; sha256="117g8h0k65f2cjffigl8n4x37y41rr2kz33qn2awyi876nd3mh93"; depends=[]; }; - Pareto = derive2 { name="Pareto"; version="1.1.0"; sha256="07gvvcpcqr884xnd2kq4zn3c27h1xkx51qp1w3vfsqqccqdi08jw"; depends=[]; }; + ParamHelpers = derive2 { name="ParamHelpers"; version="1.14"; sha256="1sx2ddm8hwvvmk0z65wa689w80py3fny82zjd4d29qwxlv854xmi"; depends=[backports BBmisc checkmate fastmatch]; }; + Pareto = derive2 { name="Pareto"; version="1.1.5"; sha256="1w435yywdbsl8s5qrhxcai89s0qax31rx4faxydkqqhk47d5756r"; depends=[]; }; ParetoPosStable = derive2 { name="ParetoPosStable"; version="1.1"; sha256="1fwji5wrhbxr089dll812csamvb5q2pxn1607rpirarifgfbj28m"; depends=[ADGofTest doParallel foreach lmom]; }; PartCensReg = derive2 { name="PartCensReg"; version="1.39"; sha256="0blzv57cbxqghkz4fc3plvrcw80g0kx17dzmajkfv598m1wm6hc8"; depends=[Matrix optimx ssym]; }; Partiallyoverlapping = derive2 { name="Partiallyoverlapping"; version="2.0"; sha256="0pb0digyigqyzb0zqikgz002kqf1xprcjhxr62a7iqbzy1yycayf"; depends=[]; }; PathSelectMP = derive2 { name="PathSelectMP"; version="1.1"; sha256="036b70bpylmibny6dny79f7gdzn78arqgl2hfs031vygw63yyh9b"; depends=[mice MplusAutomation]; }; - PatternClass = derive2 { name="PatternClass"; version="2.0.0"; sha256="0z2qbg8diskk33ffiqkhkkp5va1p56cij2a6yqfhybrrcxizliw1"; depends=[landscapemetrics raster]; }; + PatternClass = derive2 { name="PatternClass"; version="2.0.1"; sha256="1xwlk6shms38nqxad3d15254wgnkfzy7jyf5w9bbm96kg05mndbz"; depends=[landscapemetrics raster]; }; Patterns = derive2 { name="Patterns"; version="1.2"; sha256="1dfy0jxr4h17j00yf2lfxlczvx6sdjz08hqsrj6r26qz3g6f16br"; depends=[abind animation Biobase c060 cluster elasticnet glmnet gplots igraph jetset KernSmooth lars lattice limma magic Mfuzz movMF msgps nnls pixmap plotrix SelectBoost spls survival tnet VGAM WGCNA]; }; PdPDB = derive2 { name="PdPDB"; version="2.0.1"; sha256="05aqg0rqrnlmvjxa32ms1vywgwhw5zlfkyf2ij0fn06rp8l2z3lv"; depends=[dendextend plyr tseries]; }; Peacock_test = derive2 { name="Peacock.test"; version="1.0"; sha256="0ypvwywipyh8lm8xkazsfjgjpvvyi2g8kid63qff11372p33m6xs"; depends=[]; }; @@ -3079,14 +3097,13 @@ in with self; { PeerPerformance = derive2 { name="PeerPerformance"; version="2.2.1"; sha256="1igh8svdbxkcfgi2s70cpwdcy7jb4yhxias80vck203skyiq97vx"; depends=[lmtest sandwich]; }; PenCoxFrail = derive2 { name="PenCoxFrail"; version="1.0.1"; sha256="0snjf8jxzyf30xj3wx9p6g073dqw592l1j1c6yxfg8y4kgzhzwq7"; depends=[Matrix Rcpp RcppArmadillo survival]; }; PenIC = derive2 { name="PenIC"; version="1.0.0"; sha256="0vcqawmbm8z6lkcxfq1b2png9viz5q669npbv0s7dn6smwhanlzz"; depends=[MASS Matrix numDeriv]; }; - PepPrep = derive2 { name="PepPrep"; version="1.1.0"; sha256="1s2xn05xry50l9kf1mj6yd1dpc7yp6g3d00960hswvhznb0a4l84"; depends=[biomaRt stringr]; }; PepSAVIms = derive2 { name="PepSAVIms"; version="0.9.1"; sha256="0m4jrq6wcjy0k80gvrnm9f7kvi1ifx9182xfq0psyaxpj0ggvzij"; depends=[elasticnet]; }; Peptides = derive2 { name="Peptides"; version="2.4.1"; sha256="05xhimjw7kdga07ycgwz6mq5ppcx04zy00mx5fvavp314zrqxnsv"; 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.3"; sha256="1wkhxwq15x2niabgnchr93h132ynswsjb81ignlk1rsqppm4hkr5"; depends=[]; }; + Perc = derive2 { name="Perc"; version="0.1.4"; sha256="0i3b7glnrv6vpc4zxkalh0ad0rf26dl2zwcgl86pz80qmzll8m9r"; depends=[]; }; PerfMeas = derive2 { name="PerfMeas"; version="1.2.1"; sha256="1x7ancmb41zd1js24rx94plgbssyc71z2bvpic6mg34xjkwdjw93"; depends=[graph limma RBGL]; }; - PerformanceAnalytics = derive2 { name="PerformanceAnalytics"; version="1.5.3"; sha256="0jhjldwyxwq7a47zmk5y1jjck7hvq92p8rlgjvdfy51hx2dmlqqd"; depends=[quadprog xts zoo]; }; + PerformanceAnalytics = derive2 { name="PerformanceAnalytics"; version="2.0.4"; sha256="0ci26hsj4wnw9g0mh4vrn0cg986cpcpx169rvw6v6rbnjxq718bq"; depends=[quadprog xts zoo]; }; PeriodicTable = derive2 { name="PeriodicTable"; version="0.1.2"; sha256="133rwbvapk99dmh3vi8p7sa81d7hjmy0g4a5hcmwr3mdq8jzgwrj"; depends=[]; }; PermAlgo = derive2 { name="PermAlgo"; version="1.1"; sha256="16fhdgr4nza9yknsbwiv8pgljfwp8hhva0crs4dbfd0w4j97n5fp"; depends=[]; }; PerseusR = derive2 { name="PerseusR"; version="0.3.4"; sha256="1k03flbnjndx5mm26hysk64z89858m50kjs8gyldm4s5f09iny6p"; depends=[Biobase plyr stringr XML]; }; @@ -3102,18 +3119,19 @@ in with self; { PhyInformR = derive2 { name="PhyInformR"; version="1.0"; sha256="10d720ww909b1xmdrms554pnn0757nzppnrniar4n157mh0qw7ms"; depends=[ape doParallel foreach geiger ggplot2 gplots gridExtra hexbin iterators PBSmodelling phytools RColorBrewer]; }; PhySortR = derive2 { name="PhySortR"; version="1.0.8"; sha256="19426xjdii74qds0wmq5sa88zys81nyqb9lvf9pfihbjgrjr770a"; depends=[ape phytools]; }; PhyloMeasures = derive2 { name="PhyloMeasures"; version="2.1"; sha256="01axs78s10y1bkx8dbs9vvnphdzik7hpibkwyib1x9mznmyg90hr"; depends=[ape]; }; - PhylogeneticEM = derive2 { name="PhylogeneticEM"; version="1.3.0"; sha256="03yqdg4qfzqvykfwc9cgfxjaj4n57kwz95dfdq6zb7lc56gs69ms"; depends=[ape capushe foreach gglasso glmnet LINselect MASS Matrix plyr Rcpp RcppArmadillo robustbase]; }; + PhylogeneticEM = derive2 { name="PhylogeneticEM"; version="1.4.0"; sha256="14a1lczwr8xhv27wqc88raj3yhy8gvflvxjrx8f5hlq15y3wfp4w"; depends=[ape capushe foreach gglasso glmnet LINselect MASS Matrix plyr Rcpp RcppArmadillo robustbase]; }; PhysActBedRest = derive2 { name="PhysActBedRest"; version="1.0"; sha256="0gmqh700cf6aiagb45iyyf85pgp3b86fx7fbv9lrsm4mda0r8h75"; depends=[chron lubridate stringr]; }; PhysicalActivity = derive2 { name="PhysicalActivity"; version="0.2-2"; sha256="14z6plgwyr46vs9m997rvlz8sdglfs9g087an8668zqkzzs2w4ln"; depends=[]; }; PieceExpIntensity = derive2 { name="PieceExpIntensity"; version="1.0.4"; sha256="023hq0gg1vi0j3yf8p5lisgs8wfp5qwyd4akxxzx7wad2985gxb3"; depends=[Rcpp RcppArmadillo]; }; Pijavski = derive2 { name="Pijavski"; version="1.0"; sha256="1027lmmk17br9zxah980j6l3k2p92065bwigw6gpy9g0g5jjl4f1"; depends=[Rcpp]; }; PivotalR = derive2 { name="PivotalR"; version="0.1.18.3.1"; sha256="1npfi5bdn0f4arp3wpi5ai21ad5fxx3lm7n5wjhvzvcyr6gl38as"; depends=[Matrix]; }; PlackettLuce = derive2 { name="PlackettLuce"; version="0.2-9"; sha256="1sv37wvvp44iwv4bpjhp3mnpyk77c60vi0xwrapzywszi222ynbl"; depends=[igraph Matrix partykit psychotools psychotree qvcalc RSpectra sandwich]; }; + PlaneGeometry = derive2 { name="PlaneGeometry"; version="1.1.0"; sha256="1yr0h2rasx0f7lp3vc30cmryfrsskbqdd1mdd5wv3w794y9fizs5"; depends=[gsl R6 sdpt3r stringr uniformly]; }; Planesmuestra = derive2 { name="Planesmuestra"; version="0.1"; sha256="0v7l4hrfckcf7zmk0ihq2ij0qli7x12j17vd6752d1yjk27fgk57"; depends=[]; }; PlasmaMutationDetector = derive2 { name="PlasmaMutationDetector"; version="1.7.2"; sha256="0qra7q2pzw212qylyrfhv6zjcsldfw84b93cari0qjqnw4gyfph2"; depends=[GenomicRanges ggplot2 robustbase Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation]; }; 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]; }; Plasmode = derive2 { name="Plasmode"; version="0.1.0"; sha256="1qcni9zdckhsnw616jn7rdfd09kbl5wd4hljdja0w73jz1wd1z14"; depends=[arm epiDisplay foreign gbm glm2 lattice latticeExtra lme4 MASS Matrix mgcv nlme nnet RColorBrewer survey survival twang xtable]; }; - PlayerRatings = derive2 { name="PlayerRatings"; version="1.0-3"; sha256="16wff9kqcp462qxvhifyx942jp1i6vpsl2y0llph7ahfs8f0prjn"; depends=[]; }; + PlayerRatings = derive2 { name="PlayerRatings"; version="1.1-0"; sha256="04hdjv1gb5b3zym2ryjpqrqhs823nlkmbimfnxw1cfn921ljjgpj"; depends=[]; }; PlotContour = derive2 { name="PlotContour"; version="0.1.0"; sha256="0jjzrxmx1k1s8fyfs9m5a864pmvjh2bdklbhrc3nbhb0c7wd3h9z"; depends=[KernSmooth MASS]; }; PlotPrjNetworks = derive2 { name="PlotPrjNetworks"; version="1.0.0"; sha256="13kbyx2phxb3kss6l32f7krf4k5i350indlsmbhav686v0h3nsgp"; depends=[ggplot2 reshape2]; }; PlotRegionHighlighter = derive2 { name="PlotRegionHighlighter"; version="1.0"; sha256="0n1nkfr3sdaq6f5p9kgx4slrsvhpdbax3rinrkfkb1vnjj4swj77"; depends=[]; }; @@ -3128,18 +3146,19 @@ in with self; { PoisBinOrdNor = derive2 { name="PoisBinOrdNor"; version="1.6.1"; sha256="12mchs62xq5jrq7y66l53yvwgm8iisa16120jmja0xdcr9sgcr84"; depends=[corpcor GenOrd Matrix mvtnorm psych]; }; PoisNonNor = derive2 { name="PoisNonNor"; version="1.6.1"; sha256="0pk1hqydpd6f8419kn986kf55gc3hyycfjyj1nvqsml7ic56ic98"; depends=[BB corpcor MASS Matrix]; }; PoisNor = derive2 { name="PoisNor"; version="1.3.1"; sha256="1s1z6bpxaa1ibdgv6bd5phccswd9bh26abwcywlnb55xl5vrgknv"; depends=[corpcor Matrix mvtnorm]; }; - PoissonBinomial = derive2 { name="PoissonBinomial"; version="1.0.0"; sha256="1yl01302r1b24qkanp8sd1n39s51yr0vyz99jrmpmdk2875zahi3"; depends=[BH Rcpp]; }; + PoissonBinomial = derive2 { name="PoissonBinomial"; version="1.1.0"; sha256="0khsp1jvm0b1nwrfas6d1qagf6m7m44k3yv9ghlknxlvkg79dyy5"; depends=[BH Rcpp]; }; PoissonPCA = derive2 { name="PoissonPCA"; version="1.0.2"; sha256="0rb30l0x8knwvh8li62cfxms9b20db77g4r8cwgwasb9jjljxv3s"; depends=[]; }; PoissonSeq = derive2 { name="PoissonSeq"; version="1.1.2"; sha256="1hhx0gv06cp6hm6h36mqy411qn9x15y45crpzbyf8crfs85c6gbg"; depends=[combinat]; }; PolyPatEx = derive2 { name="PolyPatEx"; version="0.9.2"; sha256="1z1hwvsw7b6cz5xfy35a5ldrzb3fhp3swiyz56v1zqblpsaz8n9g"; depends=[gtools]; }; PolyTrend = derive2 { name="PolyTrend"; version="1.2"; sha256="17n6phkzgaqrlzs8x1l5smnij1gxfklr0zj9pqfy5n8xqnpwssm5"; depends=[]; }; - Polychrome = derive2 { name="Polychrome"; version="1.2.3"; sha256="1frh21813ffgax487bcyc6a3z0j9jb27dq5djsbpi7ali38il738"; depends=[colorspace scatterplot3d]; }; - PolynomF = derive2 { name="PolynomF"; version="2.0-2"; sha256="06gkyhacc609s7si604rh4yyqdafc4mqy15wcz90qrwbrhr18gcm"; depends=[Rcpp]; }; + Polychrome = derive2 { name="Polychrome"; version="1.2.5"; sha256="028lzsswb36pdb6mmyysb4iggzlsvwrcxlcdbrkyz3338mvqabn2"; depends=[colorspace scatterplot3d]; }; + PolynomF = derive2 { name="PolynomF"; version="2.0-3"; sha256="067l71i2zjv6gvd0br2m034ls3r5lcmc0amml1qbj4wchd7mqlw9"; depends=[Rcpp]; }; Pomic = derive2 { name="Pomic"; version="1.0.4"; sha256="0xy5fgimbgqqac3n7akhwyvnrvd9fpvx9h8nk4spxrxc8x0km1w7"; depends=[]; }; PooledMeanGroup = derive2 { name="PooledMeanGroup"; version="1.0"; sha256="0i9s7qskjnji3mf6clsi69rnni57v8cysgr9gh3hvxjzlf1sq8y7"; depends=[]; }; PopED = derive2 { name="PopED"; version="0.4.0"; sha256="1cj6nj5w4ckvnldpc7g4mxdps619zlhzsdibd9ih8i2lxh1xbrfz"; depends=[boot codetools dplyr ggplot2 magrittr MASS mvtnorm purrr stringr tibble tidyr]; }; PopGenKit = derive2 { name="PopGenKit"; version="1.0"; sha256="0l4mbm0cyppgvcw2cbimrv29aiciyj00k8wfwcj5zr8sh7fgfhs4"; depends=[]; }; PopGenReport = derive2 { name="PopGenReport"; version="3.0.4"; sha256="0x9j9f9k65rfr4fxyrxqa9220psfh1bicls6vwbxmqsfdsfnvs0j"; depends=[ade4 adegenet calibrate data_table dismo gap gdistance genetics GGally ggplot2 knitr lattice mmod pegas plyr R_utils raster reshape rgdal RgoogleMaps sp vegan xtable]; }; + PopGenome = derive2 { name="PopGenome"; version="2.7.5"; sha256="0xdwgih1n7bkykbzrnp293yzrlj80vr2v6rlsww61nxlhynbh9yn"; depends=[ff]; }; PopVar = derive2 { name="PopVar"; version="1.2.1"; sha256="09az5wa0zai6axhvrljqdjn74nb7jikqwjqy8f570qxb6jbgfgay"; depends=[BGLR qtl rrBLUP]; }; PortRisk = derive2 { name="PortRisk"; version="1.1.0"; sha256="05yxqcv0cijy3s9zx68f9xy59jv55kmj3v0pz5pgl17j23kb9rlc"; depends=[copula MASS MCMCpack tseries zoo]; }; PortfolioAnalytics = derive2 { name="PortfolioAnalytics"; version="1.1.0"; sha256="1jy89brrdw8ilbi9pjxxq5yhqw85ik4kzdd2sa60crjlhvipx0ff"; depends=[foreach PerformanceAnalytics xts zoo]; }; @@ -3154,17 +3173,16 @@ in with self; { PowerNormal = derive2 { name="PowerNormal"; version="1.2.0"; sha256="1kryqcjvgwk0l4z3gqxdiz47mha3jw5583jlb9z7ml6v7cam06sm"; depends=[]; }; PowerTOST = derive2 { name="PowerTOST"; version="1.4-9"; sha256="08qac2482v2b5s7nfhdn9x5gbl348yfwnzgqprh38qp16zzcylhg"; depends=[cubature mvtnorm TeachingDemos tufte]; }; PowerUpR = derive2 { name="PowerUpR"; version="1.0.4"; sha256="0ng88x1zs4kb8cf2v51kynbp32iz41mh40my5sciyvjbw430bk59"; depends=[]; }; - PowerfulMaxEigenpair = derive2 { name="PowerfulMaxEigenpair"; version="0.1.1"; sha256="1hzp3dpcac5han2ij4w0fwk093lr3pgydb39p848jj7jma5hawxs"; depends=[formatR]; }; PracTools = derive2 { name="PracTools"; version="1.2.1"; sha256="1viwmwis9awr7maprnaj0vdzc5rf6md7xlc9l7hnn51xmaa734ih"; depends=[]; }; PreKnitPostHTMLRender = derive2 { name="PreKnitPostHTMLRender"; version="0.1.0"; sha256="1749cd734f4bf0n4068s2m617k6as8h9bwp44mm3la2xy3vjf5g1"; depends=[knitr rmarkdown XML]; }; PreProcess = derive2 { name="PreProcess"; version="3.1.7"; sha256="1fxzkmrj76mc94xdj7a0nq450021i1jxkigmh5jhrmamkp5581jf"; depends=[oompaBase]; }; PreciseSums = derive2 { name="PreciseSums"; version="0.3"; sha256="02w0pa9dd196sg6zg9w2fp4b0k6wibbw9rbvasr3aphh98kbd6ch"; depends=[]; }; PredPsych = derive2 { name="PredPsych"; version="0.4"; sha256="00h4p1szqzh4a2kjvlriyinh330cfwxsrvs6fi089mr207q890vj"; depends=[caret e1071 ggplot2 MASS mclust party plyr randomForest rpart statmod]; }; - PredictABEL = derive2 { name="PredictABEL"; version="1.2-2"; sha256="08c7j2in1wlas6nmy44s08cq86h5fizqbhsnq312dllqdzmb2h9s"; depends=[epitools Hmisc PBSmodelling ROCR]; }; - PredictionR = derive2 { name="PredictionR"; version="1.0-11"; sha256="1dljdbya93dirx715yqs4vz7hbbcwpgrsvyfgikkm2fj28nnn6k9"; depends=[fitdistrplus]; }; + PredictABEL = derive2 { name="PredictABEL"; version="1.2-4"; sha256="144xmfsp62ssmg501f4y173jrqyv8vps36j4yrwg6ghcmyc01wf8"; depends=[Hmisc lazyeval PBSmodelling ROCR]; }; + PredictionR = derive2 { name="PredictionR"; version="1.0-12"; sha256="0kgc8rjdqskasdaxsbir9gwvm55rw5cpdg3y9nsj7ccg9fc1ji19"; depends=[fitdistrplus Renext]; }; PredictiveRegression = derive2 { name="PredictiveRegression"; version="0.1-4"; sha256="15vkisj3q4hinc3d537s8inhj3wk62q67qhy050xmp9j563ainmd"; depends=[]; }; PresenceAbsence = derive2 { name="PresenceAbsence"; version="1.1.9"; sha256="17qn4ggkr5aqml45nkihj1j35y479ywkm1xcfkb2g8ky66jb0c0s"; depends=[]; }; - PrevMap = derive2 { name="PrevMap"; version="1.5.2"; sha256="0nr65vfdzny3y3mly7slm903h4llnn3rxbxz3ml07pnighf7rr3q"; depends=[geoR lme4 Matrix maxLik numDeriv pdist raster splancs truncnorm]; }; + PrevMap = derive2 { name="PrevMap"; version="1.5.3"; sha256="0pgrfrfw587vsci98lxd205r8wl7x7c9ns15ypnhwr8xaysdxnpf"; depends=[lme4 Matrix maxLik numDeriv pdist raster splancs truncnorm]; }; PriorCD = derive2 { name="PriorCD"; version="0.1.0"; sha256="1mb50w2i8sfxjzqd5xnfysn3jnzkkyv6l8algxnp0xpyhcq41pfs"; depends=[dplyr igraph ROCR visNetwork]; }; PriorGen = derive2 { name="PriorGen"; version="1.1.2"; sha256="0qvdqqdy7wdwwcq95mkgfyf7xf6xlpwdfs3gq299yyv2ba57flnm"; depends=[rootSolve]; }; PrivateLR = derive2 { name="PrivateLR"; version="1.2-22"; sha256="0d142fa3wk7yadvs8jszajs6hq9m03p0j6h5r4pbw7j0d1l72hgc"; depends=[]; }; @@ -3172,18 +3190,21 @@ in with self; { ProFit = derive2 { name="ProFit"; version="1.3.3"; sha256="0jrw0v7dg5mf4zxg7pqybh9qzsiqb3nnz8g5qlc4iz73mhr9gm2b"; depends=[celestial checkmate cubature FITSio LaplacesDemon magicaxis RColorBrewer]; }; ProFound = derive2 { name="ProFound"; version="1.3.4"; sha256="1kn9kj0vq18jxiavdzx4l4kgyfwjnflfbyqfdihrdfrkz4xz4w3c"; depends=[celestial data_table doParallel FITSio foreach magicaxis RColorBrewer Rcpp]; }; 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]; }; + ProTrackR = derive2 { name="ProTrackR"; version="0.3.7"; sha256="15m8g9v254avi68qr7v5q4fzhclkv1q849sj69fs0c9qcli1x384"; depends=[audio lattice signal tuneR XML]; }; + ProbBayes = derive2 { name="ProbBayes"; version="1.1"; sha256="0bkbqyrmpy9swaxsl91w6iiw81znjf1lk4b0vqgn6wdnrir6gkmn"; depends=[ggplot2 gridExtra LearnBayes shiny]; }; ProbForecastGOP = derive2 { name="ProbForecastGOP"; version="1.3.2"; sha256="0fnw3g19lx4vs8vmn4qdirvybkiy2cxkhwkn9qa3phz45iixnvx4"; depends=[fields RandomFields]; }; + ProbMarg = derive2 { name="ProbMarg"; version="1.0.0"; sha256="0jv5d5zk7jq5si80rs69bvl7wssv2nihg35f2q4g7jkd7qmsbrq3"; depends=[]; }; ProbYX = derive2 { name="ProbYX"; version="1.1-0"; sha256="0dphf6jr72l235v3yjhwi8bqmv6ac7yrbyfwhx4qjrrcdnsb7qhl"; depends=[rootSolve]; }; ProbeDeveloper = derive2 { name="ProbeDeveloper"; version="1.0.0"; sha256="1d2zr8ikia3mspp2arpx7iwf4a4pq1ywl82pxbxrw6xpz313d5x9"; depends=[Biostrings TmCalculator]; }; ProbitSpatial = derive2 { name="ProbitSpatial"; version="1.0"; sha256="0pq5bsjd00qc83c7x8vlpsxdksywlnfg7rlsvb6j21fz9wi3hpas"; depends=[Matrix numDeriv RANN Rcpp RcppEigen speedglm]; }; ProcMod = derive2 { name="ProcMod"; version="1.0.3"; sha256="17x4c9vgf14l1x3hx3vyv3ygl8bb5qzq7fxg2cnl910drcdnv5sz"; depends=[expm foreach MASS Matrix mvtnorm permute Rdpack]; }; ProfessR = derive2 { name="ProfessR"; version="2.4-1"; sha256="1wsbx0dsygc1ipzhgs1pd0lhdb0qvp4ydqzwarn6zv27rzf4p3bd"; depends=[RPMG]; }; ProfileLikelihood = derive2 { name="ProfileLikelihood"; version="1.1"; sha256="16cdp1nimhg1sd2x0qbffm7clgk54p0838y688z8lnsrjaggmb0x"; depends=[MASS nlme]; }; + ProfoundData = derive2 { name="ProfoundData"; version="0.2.1"; sha256="1zqg821pv3i5nf76s7yppnmy13y14pj0l7rjhk50wlxrxdb53ibz"; depends=[DBI RNetCDF RSQLite settings sqldf zoo]; }; ProgGUIinR = derive2 { name="ProgGUIinR"; version="0.0-4"; sha256="0srhk42ssx4i096sbs4jacqjsc1ffqjxjgvpplzshlqaby1h3795"; depends=[ggplot2 MASS svMisc]; }; ProjectManagement = derive2 { name="ProjectManagement"; version="1.2.4"; sha256="1lv1yf6xslskjqz7mgi8brvpix9g7k0yy6q03gckz1rmcakzqj5p"; depends=[GameTheory kappalab lpSolveAPI plotly triangle]; }; ProjectTemplate = derive2 { name="ProjectTemplate"; version="0.9.0"; sha256="07nj339k822xnjqcraivl85wcvnq3cp8gz051kq5zmfx19p1wvdv"; depends=[]; }; - ProjectionBasedClustering = derive2 { name="ProjectionBasedClustering"; version="1.0.7"; sha256="1nammbm9hjsgb46cqvhwx45lfaaxw13d12q43fgwk411a91rblm1"; depends=[deldir GeneralizedUmatrix geometry ggplot2 Rcpp shiny shinyjs vegan]; }; + ProjectionBasedClustering = derive2 { name="ProjectionBasedClustering"; version="1.1.1"; sha256="17y1yf8cbcl3yha7mbk22lxmk2v5n98mfqsa886a3012ang4m5sp"; depends=[deldir GeneralizedUmatrix geometry ggplot2 plotly Rcpp shiny shinyjs shinythemes vegan]; }; ProliferativeIndex = derive2 { name="ProliferativeIndex"; version="1.0.1"; sha256="03ipsbs8pfwr8wsx7j2y9c67ic4qcady7xpa47l8dr14ff63cfk7"; depends=[]; }; PropCIs = derive2 { name="PropCIs"; version="0.3-0"; sha256="1ywzi88igzaj2wnbrqa08cy7pw886z2m0x3j7rk45rin9mgpfdfd"; depends=[]; }; PropClust = derive2 { name="PropClust"; version="1.4-6"; sha256="1p15n98b6qprphgbhdqgnsxy9d9kik19h6j9f2dy6x1hkinrzsfa"; depends=[dynamicTreeCut fastcluster]; }; @@ -3196,16 +3217,17 @@ 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.1.0"; sha256="0prdwv3w9n0ppwizfqqvy5qj7krn3nm2zncz17zh7ijdw87xks4i"; depends=[dplyr ggplot2 metafor MetaUtility Rdpack robumeta]; }; + PublicationBias = derive2 { name="PublicationBias"; version="2.0.0"; sha256="15y5pigmv29m627jfkrwgfn224s257ns058p72mawl8yl10bj9fy"; depends=[dplyr ggplot2 metafor MetaUtility Rdpack robumeta]; }; Publish = derive2 { name="Publish"; version="2019.12.04"; sha256="0vcfz6hx2bkwrksz6b0rx0w6j24h3qswgca06jhgq3jzvsmjjckx"; depends=[data_table lava multcomp prodlim survival]; }; - PupilPre = derive2 { name="PupilPre"; version="0.6.1"; sha256="02ffcr4ccwx7m81hla0n1vgbhb79y2vvyv1k5928j7kz5p1lv782"; depends=[dplyr ggplot2 mgcv rlang robustbase shiny signal tidyr VWPre zoo]; }; + PupilPre = derive2 { name="PupilPre"; version="0.6.2"; sha256="123m1zqld0jl26vqz41iic7vxzyfs1aw8zi5ki2cy6wzw9ss87m6"; depends=[dplyr ggplot2 mgcv rlang robustbase shiny signal tidyr VWPre zoo]; }; + PupillometryR = derive2 { name="PupillometryR"; version="0.0.1"; sha256="0fn1cm43jzkdph06awg741x31v5674vxb8zgnz3pfh585jggkb3j"; depends=[data_table dplyr fda fractal ggplot2 lazyeval mgcv rlang signal tidyr zoo]; }; PurBayes = derive2 { name="PurBayes"; version="1.3"; sha256="0nbm4cyrwfbwwbjbjkylr86cshaqbvbif6dkp4fag8kbcgyyx5qh"; depends=[rjags]; }; - Pursuit = derive2 { name="Pursuit"; version="1.0.0"; sha256="0wcg9zcln2mpqdyi4k4fcah6s1n0xd0jvc98vl4p1gyygy1x2vdr"; depends=[MASS]; }; + Pursuit = derive2 { name="Pursuit"; version="1.0.1"; sha256="0c4bc0ldfx02a8ws3g3gn7smikg3fdjygybs3q764kxhq88kv42l"; depends=[MASS]; }; PxWebApiData = derive2 { name="PxWebApiData"; version="0.3.0"; sha256="1c2liqh1asd0mk4cvrwpl4pdid2rqfxrma284ah4hwr6sah5lk6w"; depends=[httr jsonlite pxweb rjstat]; }; - PythonInR = derive2 { name="PythonInR"; version="0.1-7"; sha256="1vrvf68sl2k25y3ppjwpi2j4952aq4k76r92qnq3fj92789ndyqv"; depends=[pack R6]; }; + PythonInR = derive2 { name="PythonInR"; version="0.1-11"; sha256="099wsy44g3vh19vixn1ili7fd0a6q5x09hj4hp4i8cf51nihmk2q"; depends=[pack R6]; }; QAIG = derive2 { name="QAIG"; version="0.1.5"; sha256="1cchf5x7wzc3mc6xzvq14kmd9yxr9kq237s8af4xqaz1pv0b093j"; depends=[Formula stringr]; }; QBAsyDist = derive2 { name="QBAsyDist"; version="0.1.2"; sha256="1yql29npaq9yz02bv3hqf5m2mhscjms7qqf4vlaxm8s665rxcxad"; depends=[ald Deriv GoFKernel locpol nloptr quantreg scdensity zipfR]; }; - QCA = derive2 { name="QCA"; version="3.6"; sha256="07n2652l56w5dyz1ph4q7n9xkf0i145dya2w05b7lbilfjzqqxd1"; depends=[admisc shiny venn]; }; + QCA = derive2 { name="QCA"; version="3.7"; sha256="0m78ky2w988d46jk5idhg2vyn8sw5sdvl0gv479snjxidjb78mml"; depends=[admisc lpSolve shiny venn]; }; QCAfalsePositive = derive2 { name="QCAfalsePositive"; version="1.1.1"; sha256="03qzb6vdnbri52gfx3laz14988p2swdv9m8i5z7gpsv3f3bjrxbp"; depends=[]; }; QCApro = derive2 { name="QCApro"; version="1.1-2"; sha256="1glfb1x1h05cs07nq5glqvlil58wp3c0kaxi1l7k94y797i8r7hq"; depends=[lpSolve]; }; QCAtools = derive2 { name="QCAtools"; version="0.2.3"; sha256="1q49l2mf02hqvz2ahqjdx7i3yxniy7dn2s74xjl9l6zdq8bypfw2"; depends=[directlabels ggplot2 QCA stringr]; }; @@ -3219,16 +3241,16 @@ in with self; { QGglmm = derive2 { name="QGglmm"; version="0.7.4"; sha256="0ghvicz4ia1180byj28lmg49889hqhb94g1jrkhm6hnzgqbjnfmd"; depends=[cubature]; }; 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]; }; QQperm = derive2 { name="QQperm"; version="1.0.1"; sha256="06xhv54zgnx8i22j23a0dqxhh7my416idpkkwq93qd1rdzgamzc8"; depends=[]; }; QRAGadget = derive2 { name="QRAGadget"; version="0.1.0"; sha256="0vmhbpfbbpbcs6s9zjam893yl54spbx4x4698c504g96hcc19kkp"; depends=[htmlwidgets leaflet magrittr miniUI raster scales shiny sp]; }; QRISK3 = derive2 { name="QRISK3"; version="0.3.0"; sha256="0aqqncmlhb5iks8081y34ydlls3g31j994fqqzsbsc3ckcks87qj"; depends=[]; }; + QRM = derive2 { name="QRM"; version="0.4-31"; sha256="15dyk3zfy92vj4xny04dh5mqcyb8qh61566m313qs17mxwibvn2a"; depends=[gsl Matrix mgcv mvtnorm numDeriv Rcpp timeDate timeSeries]; }; QRank = derive2 { name="QRank"; version="1.0"; sha256="1f924r5bf5vjfl12hk1n5m3f94g30f6vmvzq2bn8295dflyndck0"; depends=[quantreg]; }; QRegVCM = derive2 { name="QRegVCM"; version="1.2"; sha256="0fcydkf6r2qxd59ylr8vn76bkxks91v58gfzvq3rjd5mqf9vsaaq"; depends=[quantreg SparseM truncSP]; }; QSARdata = derive2 { name="QSARdata"; version="1.3"; sha256="0dhldnh0jzzb4assycc0l14s45ymvha48w04jbnr34lrwgr9krh4"; depends=[]; }; QTL_gCIMapping = derive2 { name="QTL.gCIMapping"; version="3.2"; sha256="0a4ki5scmc771sr79maian7y790bw71l67d1qpc09qprmf9i36jl"; depends=[data_table doParallel foreach MASS openxlsx parcor qtl Rcpp stringr]; }; QTL_gCIMapping_GUI = derive2 { name="QTL.gCIMapping.GUI"; version="2.0"; sha256="0jj6w8z99vpzgh76lv53zj8nv9p57y3502prr6xwkshj6rp8q1zv"; depends=[data_table doParallel foreach MASS openxlsx parcor qtl QTL_gCIMapping Rcpp shiny stringr]; }; - QTLRel = derive2 { name="QTLRel"; version="1.4"; sha256="1ni8hf7xiadfg4p05wa83x7wg26d030mfjm45phghg0i1n7lfc4b"; depends=[gdata lattice]; }; + QTLRel = derive2 { name="QTLRel"; version="1.6"; sha256="1198qrrl7samm4jzliy5i8wfvladz6wpm48l1g2x6ackm1asiw75"; depends=[gdata lattice]; }; QTOCen = derive2 { name="QTOCen"; version="0.1.1"; sha256="0wlbxk1rd56k02jf3pfzbx6xx5mmf6sb7gvds0067cvb7m42ghcr"; depends=[MatrixModels quantreg Rdpack rgenoud survival]; }; QUALYPSO = derive2 { name="QUALYPSO"; version="1.1"; sha256="0qpjv6krz66qfgyzndxihy5shmlsb0zs3wh49sxp00fh2bci5msw"; depends=[doParallel expm foreach MASS Rfast]; }; QUIC = derive2 { name="QUIC"; version="1.1"; sha256="021bp9xbaih60qmss015ycblbv6d1dvb1z89y93zpqqnc2qhpv3c"; depends=[]; }; @@ -3246,8 +3268,8 @@ in with self; { QuantileGradeR = derive2 { name="QuantileGradeR"; version="0.1.1"; sha256="1zwc6bg636gk8zll7wpznd3pzl611hcj2fmzp8b9505rra13p0g2"; depends=[]; }; QuantileNPCI = derive2 { name="QuantileNPCI"; version="0.9.0"; sha256="043lkg1pyaja7a4f9lmcwrvdjpfly2z378s15snwnxj8vb5pgr38"; depends=[]; }; QuantumClone = derive2 { name="QuantumClone"; version="1.0.0.6"; sha256="1520jgkzp8g7gv7ggqhvlrdnpdyhygqjgsd1my5jq30afdqj6qmp"; depends=[DEoptim doParallel foreach fpc ggplot2 gridExtra NbClust optimx]; }; - QuantumOps = derive2 { name="QuantumOps"; version="3.0.0"; sha256="0kysrfxwnxwll8i2hv0nci8kzmx799vchchkpylqs9ia7j8yn9i6"; depends=[]; }; - Quartet = derive2 { name="Quartet"; version="1.0.3"; sha256="0rgcgnk636jzqdylax0g40kdpvxpbksds73df6j4jxin7dc6b2nk"; depends=[ape memoise Rcpp Rdpack Ternary TreeSearch]; }; + QuantumOps = derive2 { name="QuantumOps"; version="3.0.1"; sha256="0gl1myf7q444imyvsjvxiaxaahf0n0bsggwbd0z3az73l6yf1gjh"; depends=[]; }; + Quartet = derive2 { name="Quartet"; version="1.1.0"; sha256="0sndc86dbd57hv75qm7g8611jayqfx4y6qp215bxgyskhscxv09v"; depends=[ape memoise Rcpp Rdpack Ternary TreeTools]; }; QuasiSeq = derive2 { name="QuasiSeq"; version="1.0-10-2"; sha256="1mr43vys9l1n859lzlcakjrvjllybgrwl0p8mc28h7m87yjkj670"; depends=[edgeR mgcv pracma]; }; R_SamBada = derive2 { name="R.SamBada"; version="0.1.2"; sha256="123a7s3rcmraq4chiqjkdp969jmr4c5br2xamdgvj6gzaf8zpmg0"; depends=[gdsfmt SNPRelate]; }; R_cache = derive2 { name="R.cache"; version="0.14.0"; sha256="1n8n5ihkryrbxv630dwhz4r048nyv676qd3i9f5z5fa04hvlxbqq"; depends=[digest R_methodsS3 R_oo R_utils]; }; @@ -3255,32 +3277,31 @@ in with self; { R_filesets = derive2 { name="R.filesets"; version="2.13.0"; sha256="124rygq0bl9n4akxcm868nl30cyk3rz0iprb98zlpk62gci9f5fg"; depends=[digest R_cache R_methodsS3 R_oo R_utils]; }; R_huge = derive2 { name="R.huge"; version="0.9.0"; sha256="13p558qalv60pgr24nsm6mi92ryj65rsbqa6pgdwy0snjqx12bgi"; depends=[R_methodsS3 R_oo R_utils]; }; R_matlab = derive2 { name="R.matlab"; version="3.6.2"; sha256="1fw6ny8xb2j088k3s9lzd15av3j6xc2bvbccyrp7yjx2f3s3i8qv"; depends=[R_methodsS3 R_oo R_utils]; }; - R_methodsS3 = derive2 { name="R.methodsS3"; version="1.7.1"; sha256="11z6v2i7jl647wxi9p5z66yvfnnqv6s7fxqmz7w2gkb6j8wl1f24"; depends=[]; }; + R_methodsS3 = derive2 { name="R.methodsS3"; version="1.8.0"; sha256="19c5870v7b59fs6xk58bh3rfkmhfralmgsax86zzpdmz47pga1g0"; depends=[]; }; R_oo = derive2 { name="R.oo"; version="1.23.0"; sha256="189fb7mmyzwg6nn8rza8iip7fbyws7i2vkmzy672x9mhvgilq4pm"; depends=[R_methodsS3]; }; R_rsp = derive2 { name="R.rsp"; version="0.43.2"; sha256="128zqyvbq9hm9gy86jzhj609lkfw57vr24mdxgh46ncmx66ag4gj"; depends=[digest R_cache R_methodsS3 R_oo R_utils]; }; R_temis = derive2 { name="R.temis"; version="0.1.2"; sha256="1bar4vyjnc9plwqm66vbgf6rakgj095zb7wsypmf3j3az694y62q"; depends=[crayon explor FactoMineR igraph NLP slam SnowballC stringi testthat tm tm_plugin_alceste tm_plugin_europresse tm_plugin_factiva tm_plugin_lexisnexis wordcloud]; }; R_utils = derive2 { name="R.utils"; version="2.9.2"; sha256="1krj1ny7y43lpm2q8c7swxfdc3ngy2j8knzv71f8bfsgh673nsxc"; depends=[R_methodsS3 R_oo]; }; R0 = derive2 { name="R0"; version="1.2-6"; sha256="1yvcgchxlj7hkgqkw6g8pxnracxkld1grgykkcr6wbhminbylqv8"; depends=[MASS]; }; R1magic = derive2 { name="R1magic"; version="0.3.2"; sha256="1xfldr5y7pfdi6qljjvckknsv2wi9rnzwmqxkpgnyc96md2fvwjr"; depends=[]; }; + R2019nCoV = derive2 { name="R2019nCoV"; version="0.1.0"; sha256="1959mwacn0zzq0g5ili2v6aqs51rb6qvlsv16xx7qwml8xahf215"; depends=[dplyr ggplot2 jsonlite maps pinyin]; }; R2BEAT = derive2 { name="R2BEAT"; version="1.0.1"; sha256="0x0gb3gpvjmwa6f2p0p45m86l9iy7nwmcjhyi68lg694cvd9ny37"; depends=[]; }; R2BayesX = derive2 { name="R2BayesX"; version="1.1-1"; sha256="1ff8cscl839ykp7l34sscc8zqp516mh64igk7dfv9n02l40w8ypf"; depends=[BayesXsrc colorspace mgcv]; }; R2DGC = derive2 { name="R2DGC"; version="1.0.3"; sha256="0f84fmpf3m2s2p6bllvjs8rgnhwjy54adblv02dq8gakwvb4j2aw"; depends=[]; }; - R2DT = derive2 { name="R2DT"; version="0.1"; sha256="0zydrdx6xdlacq6s01jwv4rv6ydmbwmiif40rilp8h76bim0kdbr"; depends=[data_table devFunc plyr]; }; - R2GUESS = derive2 { name="R2GUESS"; version="2.0"; sha256="16spx5wq755ar5fvkncikaabrw75hbgnxi7j32vjg8qk4knjiwj9"; depends=[fields MCMCpack mixOmics mvtnorm snowfall]; }; + R2DT = derive2 { name="R2DT"; version="0.2"; sha256="0hyisq6mij80v14sjspn9idd1h38sd1knbpd0dn2wy9k2w1fl0pk"; depends=[data_table devFunc plyr]; }; R2HTML = derive2 { name="R2HTML"; version="2.3.2"; sha256="00kxny7hajs9r2kw63qk7d03ggdxx2j1g8vbrmzp806y8aczvik9"; depends=[]; }; R2MLwiN = derive2 { name="R2MLwiN"; version="0.8-6"; sha256="1qhhigb9yryciq3j28q7wcvyw49nvf2mb8m9nj1c14z0pchi7xir"; depends=[coda digest doParallel foreach foreign lattice Matrix memisc R2WinBUGS texreg]; }; - R2OpenBUGS = derive2 { name="R2OpenBUGS"; version="3.2-3.2"; sha256="1cxr93g0fkdv3lqdh63l2gcp7qn3q42pm1r6nzf35550k9ahkhnv"; depends=[boot coda]; }; + R2OpenBUGS = derive2 { name="R2OpenBUGS"; version="3.2-3.2.1"; sha256="0689aqa034xkbyy46m3sjanjkxrii4ma1crm5qw5kaqbx7dg153c"; depends=[boot coda]; }; R2SWF = derive2 { name="R2SWF"; version="0.9-2"; sha256="1f7bj2jqm7ys3rimgpsn252j39mw0xd008p3zqi77x1flisla0z3"; depends=[sysfonts]; }; R2WinBUGS = derive2 { name="R2WinBUGS"; version="2.1-21"; sha256="0k8k214x712vjj2k1am4zzf6scccs3b98ysiz4lwxpzm818wp1ps"; depends=[boot coda]; }; - R2admb = derive2 { name="R2admb"; version="0.7.16"; sha256="0s8p82avxdp5zmkz7amvnphn3lcyhha31mbjghibnhm9g16k0b84"; depends=[coda lattice]; }; + R2admb = derive2 { name="R2admb"; version="0.7.16.2"; sha256="1gwp850ff76lqqn6amj75rjqb1szk6x2vlhqgwng4z45i56bmdf7"; depends=[coda lattice]; }; R2jags = derive2 { name="R2jags"; version="0.5-7"; sha256="0h1d27cddyacx5m5f23rlki97iwni7clffmb2k7a4bznlnjhn50a"; depends=[abind coda R2WinBUGS rjags]; }; R2ucare = derive2 { name="R2ucare"; version="1.0.0"; sha256="1nh2wf3syxjz9flxhf8x9fd2c2ndn4dha4k34lz1nq5j4qz7wfp1"; depends=[RMark stringr]; }; R330 = derive2 { name="R330"; version="1.0"; sha256="01sprsg7kph62abhymm8zfqr9bd6dhihrfxzgr4pzi5wj3h80bjm"; depends=[lattice leaps rgl s20x]; }; - R3port = derive2 { name="R3port"; version="0.1.1"; sha256="0ww0sqjx0la03qx353h0y5wr5qpc5fir3gjy4fsxkw6jrsyx9vaz"; depends=[plyr reshape2 whisker]; }; + R3port = derive2 { name="R3port"; version="0.2.3"; sha256="0m0nkmr0hj4dhb762vnin3iqhp6j4a73aslgz59wwlqi7v421vaj"; depends=[plyr reshape2 tinytex whisker]; }; R4CouchDB = derive2 { name="R4CouchDB"; version="0.7.5"; sha256="1wd1yqbs8m4zqvdm6x7mrcyk5b5pr4azm3r49nrilg8fnr2bk9rz"; depends=[bitops RCurl RJSONIO]; }; - R4dfp = derive2 { name="R4dfp"; version="0.2-4"; sha256="02crzjphlq4hi2crh9lh8l0acmc1rgb3wr1x8sn56cwhq4xzqzcb"; depends=[]; }; R6 = derive2 { name="R6"; version="2.4.1"; sha256="0gma5z41mx02ka9h96xdyf3p6i1rx0izczrzj26c4mbnh9jgvc16"; depends=[]; }; - R62S3 = derive2 { name="R62S3"; version="1.3.1"; sha256="168iyz9zhnvbfgqnshbk9cvmzalmn1m9gxspdwr5xqa1x17hw6az"; depends=[checkmate]; }; + R62S3 = derive2 { name="R62S3"; version="1.4.1"; sha256="0g01izg77spn79xqwva2gzrvk66i20xlb789wl5rgcz7pz7gpjd2"; depends=[data_table]; }; R6DS = derive2 { name="R6DS"; version="1.2.0"; sha256="0ai1yqfhn634vm88waxdb6j24vwcna29gdqzdrwm0nxwf7l6g0m3"; depends=[R6]; }; RAC = derive2 { name="RAC"; version="1.5"; sha256="0q0kk9j3blrnhv0rfmryc35lli5j4kds2vmjdpg77znagb45609k"; depends=[maps maptools matrixStats ncdf4 plotrix raster rgdal rgeos rstudioapi sp]; }; RAD = derive2 { name="RAD"; version="0.3"; sha256="0nmgsaykxavq2bskq5x0jvsxzsf4w2gqc0z80a59376li4vs9lpj"; depends=[MASS mvtnorm]; }; @@ -3294,22 +3315,21 @@ in with self; { RANN = derive2 { name="RANN"; version="2.6.1"; sha256="10kid40w9w7vkz2hpcfkdpxr4afxzms5dzvfwr0sl5xynzgw76dj"; depends=[]; }; RAP = derive2 { name="RAP"; version="1.1"; sha256="18dclijs72p6gxawpg8hk7n512ah4by5jfg2jnrp8mz79ajmdgir"; depends=[]; }; RAPIDR = derive2 { name="RAPIDR"; version="0.1.1"; sha256="14cnw4jjs5anb55zlg1yj6qc9yr51rsamigq2q7h8ypj2ggnna1d"; depends=[Biostrings data_table GenomicAlignments GenomicRanges PropCIs Rsamtools]; }; - RAPTOR = derive2 { name="RAPTOR"; version="1.0.0"; sha256="1i3p3qa56ghcwh69vv3gnxnw13cbd99ms654j2bqr7g9qb7nl8vj"; depends=[mgcv]; }; + RAPTOR = derive2 { name="RAPTOR"; version="1.0.1"; sha256="1bj3xsl83mb8zwap8icywrfdld382fram79b0n14jbk1l87rj9r4"; depends=[mgcv]; }; RATest = derive2 { name="RATest"; version="0.1.7"; sha256="0xam006fp8qapq2lggpa0bq33qi1ziads6kfsqprdgvcfk64qzsn"; depends=[ggplot2 gridExtra quantreg]; }; RAdwords = derive2 { name="RAdwords"; version="0.1.18"; sha256="1c3m2j2cf1s51p783rdng5ns913bv7rbjc1vpmrmsxg2kf5f6qyq"; depends=[RCurl rjson]; }; RAhrefs = derive2 { name="RAhrefs"; version="0.1.4"; sha256="0yd7jbv2x711dnhbvwjjg7qhg8h8bh5564amsv9bkqw661i042m3"; depends=[assertthat httr jsonlite testthat]; }; RApiDatetime = derive2 { name="RApiDatetime"; version="0.0.4"; sha256="0z08xwdn3vzwmprx5yh2xip5bqk13zrd47lwnsa2yin2phz6yry1"; depends=[]; }; RApiSerialize = derive2 { name="RApiSerialize"; version="0.1.0"; sha256="0gm2j8kh40imhncwwx1sx9kmraaxcxycvgwls53lcyy2ap344k9j"; depends=[]; }; - RAppArmor = derive2 { name="RAppArmor"; version="3.2"; sha256="0apw4l7z0jwa7bs7scfysv2amk2rxi7knw9x9j7vqlrgj0i059gm"; depends=[unix]; }; - RArcInfo = derive2 { name="RArcInfo"; version="0.4-12"; sha256="1j1c27g2gmnxwslff4l0zivi48qxvpshmi7s9wd21cf5id0y4za4"; depends=[RColorBrewer]; }; - RAthena = derive2 { name="RAthena"; version="1.7.0"; sha256="0l3pdachqiq42bf715a70849gyi0qvf62mg4m9zfnlaifck14fz8"; depends=[data_table DBI reticulate]; }; + RAppArmor = derive2 { name="RAppArmor"; version="3.2.1"; sha256="0n75clpha3452jqk4idb6kffc4zw3vim60k5wh7ajcpwab10j94s"; depends=[unix]; }; + RAthena = derive2 { name="RAthena"; version="1.8.0"; sha256="0i428qcw3myaiy9zyc2wzwaj2d4sv8lg7w8nqppkb00nslv00il8"; depends=[data_table DBI reticulate]; }; RBF = derive2 { name="RBF"; version="1.0.0"; sha256="0q2k2ar9cd62cykg99r86cflx2nknlg32fhhsjay4xs191fapw8j"; depends=[]; }; 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]; }; - RBaseX = derive2 { name="RBaseX"; version="0.1.4"; sha256="0wid1vvbj3vlj1l6z5gd7kkjmskmrggj3dmqba4y7nwyvfr0d0hg"; depends=[dplyr magrittr openssl R6 RCurl stringr]; }; - RBesT = derive2 { name="RBesT"; version="1.5-4"; sha256="1050lhwa7ph5xlzchx0lz7fx6bnfl5zhrim9cy2lh4fxw0vdm7xp"; depends=[assertthat bayesplot BH checkmate dplyr Formula ggplot2 mvtnorm Rcpp RcppEigen rstan StanHeaders]; }; + RBaseX = derive2 { name="RBaseX"; version="0.2.4"; sha256="0y3mza485jj7aj3x4hnspkkgsg8y3zmgvhd3zb9p01iafa3ck91p"; depends=[dplyr magrittr openssl R6 RCurl stringr tibble]; }; + RBesT = derive2 { name="RBesT"; version="1.6-0"; sha256="0wanwx42ayy4likabdjkamzrlwgkwvas1mpcjdrsxirrl7bs38ds"; 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]; }; - RBtest = derive2 { name="RBtest"; version="1.0"; sha256="1pyygx39r5dd81xqzqmxhkwapaq7pc5q1bp0gwx28cp4wi07mm6i"; depends=[mice nnet psych]; }; + RBtest = derive2 { name="RBtest"; version="1.1"; sha256="09da721zfj6cw4i9gifn5f0sv3nj0qfjb96c5w9g9gzx55ihssnk"; depends=[mice nnet psych]; }; RCA = derive2 { name="RCA"; version="2.0"; sha256="0pidb5czrf0dc3ywy6cwm5akgsc62pvf94kfyxibzmd1favykx1h"; depends=[gplots igraph]; }; RCAL = derive2 { name="RCAL"; version="1.0"; sha256="1hpn69891h9cildwr6wsssa3fnnzyw0xw9vfgf4qdg0m9x6il6qb"; depends=[trust]; }; RCALI = derive2 { name="RCALI"; version="0.3.1"; sha256="0hc7h55qi8bpmp9rfh1wgxqs28kbs4yqxch2jlgl42vk5383askq"; depends=[splancs]; }; @@ -3317,17 +3337,18 @@ in with self; { RCMIP5 = derive2 { name="RCMIP5"; version="1.2.0"; sha256="0bwp1ln0y48g2d0bj9b47y0rlwffzv0pi6gjfzv4sg5anhswc9x7"; depends=[abind assertthat digest dplyr Matrix]; }; RCPmod = derive2 { name="RCPmod"; version="2.190"; sha256="1r24g8fcizyqzgp0da90sxpwalgcsgz2b168j2smpylxraiqb037"; depends=[fishMod glmnet gtools MASS]; }; RCRnorm = derive2 { name="RCRnorm"; version="0.0.2"; sha256="1mz1jb7mc9c47hbk9flnddny4zir6r2k5qis30iynwqny521l6ln"; depends=[truncnorm]; }; - RCSF = derive2 { name="RCSF"; version="1.0.1"; sha256="0mqrv0bk17mm8ywicmns90n8g9h161hw1l77ji7hvadiv0y7vznq"; depends=[Rcpp]; }; + RCSF = derive2 { name="RCSF"; version="1.0.2"; sha256="1hjl7qsdgcddn3nh2likndhfhnw9gj3453xqq96gddgb1y0m3bh1"; depends=[Rcpp]; }; + RCT = derive2 { name="RCT"; version="1.0.1"; sha256="07lhss3v13nmn3hr3ky0vdc2miavy0bpymginibn302f07kf8hys"; depends=[broom dplyr forcats ggplot2 glue lfe magrittr MASS pracma purrr rlang stringr tidyr tidyselect]; }; RCarb = derive2 { name="RCarb"; version="0.1.3"; sha256="0z5hpnlzlvbh14f1wjy9rw4ljdsiqdzmqnmh3yqz7mbw5qxx4gzz"; depends=[interp matrixStats]; }; RCassandra = derive2 { name="RCassandra"; version="0.1-3"; sha256="0xa241s81cyw6lfjb522f2mlyrd0gav9yz3z5jab9hpdpgg9ri38"; depends=[]; }; RChronoModel = derive2 { name="RChronoModel"; version="0.4"; sha256="0haqxwic160pnnm90bgchzxmsdwmi6m97i9xrh8js8bp2xn76l5f"; depends=[hdrcde]; }; RCircos = derive2 { name="RCircos"; version="1.2.1"; sha256="1zdq3ga2pd0p2gzlm0vr8w3a4rq4hgka3r56kkcym0za0nmqk51v"; depends=[]; }; + RClickhouse = derive2 { name="RClickhouse"; version="0.5.2"; sha256="1ii4d1nh15km1savahpwgvdn3lb2y7sa44izqydckw1xawwgf7xr"; depends=[bit64 DBI dbplyr dplyr Rcpp]; }; RClone = derive2 { name="RClone"; version="1.0.2"; sha256="1kv02acj0mk5102wvmdnxnkb7qig3jb9amcs4k2r26fpa4hyfa7f"; depends=[]; }; RColetum = derive2 { name="RColetum"; version="0.2.1"; sha256="1hgk9p234m3w49sw2j2rg8c14z3gz1mabvb69b1bxrg7f1mz9slg"; depends=[dplyr httr jsonlite]; }; RColorBrewer = derive2 { name="RColorBrewer"; version="1.1-2"; sha256="1pfcl8z1pnsssfaaz9dvdckyfnnc6rcq56dhislbf571hhg7isgk"; depends=[]; }; RConics = derive2 { name="RConics"; version="1.0"; sha256="1lwr7hi1102gm8fi9k5ra24s0rjmnkccihhqn3byckqx6y8kq7ds"; depends=[]; }; RCriteo = derive2 { name="RCriteo"; version="1.0.2"; sha256="1vyhnblw9zr5h6c25lf76p9vn95k8vr0hpq1sjkccdwl9yvsyhfy"; depends=[httr plyr RCurl XML]; }; - RCrypto = derive2 { name="RCrypto"; version="0.1.0"; sha256="1lw7hq5ks36fixk0g3gcy4nw21ygwc14jq840hnhyds4glywfpvm"; depends=[dplyr httr jsonlite]; }; RCurl = derive2 { name="RCurl"; version="1.98-1.1"; sha256="1zqiawhx5v06vmcg87rmx2qdd9fa4svds3i9a1lphchvprr93jkf"; depends=[bitops]; }; RCzechia = derive2 { name="RCzechia"; version="1.4.5"; sha256="1ar3vkslwzqmljq01swdqk72i2q4pcr7x58pi79gaxwx2p1h4bsl"; depends=[curl dplyr httr jsonlite lwgeom magrittr rlang sf]; }; RDFTensor = derive2 { name="RDFTensor"; version="1.1"; sha256="1xbar13snwyls6rva91bs0632zplfc2qcqlwf7h07r8798m3234s"; depends=[Matrix pracma]; }; @@ -3343,7 +3364,7 @@ in with self; { REAT = derive2 { name="REAT"; version="3.0.2"; sha256="0x5cal502n8abynx1jk2ccmmggvd41rvd2gc6rxkbyvcp4794l82"; depends=[]; }; REBayes = derive2 { name="REBayes"; version="2.2"; sha256="1jh5vw9pbcf5gpmx3b5b36fh8rz5y8npx53aai0kxh49kjf8d63c"; depends=[Matrix reliaR]; }; RECA = derive2 { name="RECA"; version="1.7"; sha256="1xikj20flqajpkw4wyynmqd1pafbylzwfrmc8bz9pqgggjjhrqql"; depends=[]; }; - REDCapExporter = derive2 { name="REDCapExporter"; version="0.1.0"; sha256="1sqxx6qd7sg76ybpvhk0xzhmlc73bknn3v2cj3s24dyg783ywaqx"; depends=[lubridate RCurl]; }; + REDCapExporter = derive2 { name="REDCapExporter"; version="0.2.0"; sha256="0h9sz5hd5b0paqybid8xjx7lbirlknazx11phylqixmnl9a8qra3"; depends=[data_table keyring lubridate RCurl]; }; REDCapR = derive2 { name="REDCapR"; version="0.10.2"; sha256="0rdni325k0641yfv4g9l1szg1bl48767n6r1xkh8q3fnvqaqwnrg"; depends=[dplyr httr magrittr readr rlang tibble tidyr]; }; REEMtree = derive2 { name="REEMtree"; version="0.90.3"; sha256="01sp36p12ky8vgsz6aik80w4abs70idr9sn4627lf94r92wwwsbc"; depends=[nlme rpart]; }; REGENT = derive2 { name="REGENT"; version="1.0.6"; sha256="1f2sjqkhw3rbmwbcmx7l7imj696kblisi8y3fz77xygbcbxa6rmq"; depends=[]; }; @@ -3355,15 +3376,14 @@ 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.2"; sha256="1jwmxr9xl45n7r3h6h634lw81j07bn26nhjhwww5nnwwyyylcn4b"; depends=[dplyr magrittr mlegp purrr Rcpp rlang solartime tibble]; }; + REddyProc = derive2 { name="REddyProc"; version="1.2.2"; sha256="0b1vyv92wxbvdh1jaqmfb4qb1clpbh50j8h55nq777zc1l9ml4a7"; depends=[dplyr magrittr mlegp purrr Rcpp rlang solartime tibble]; }; REddyProcNCDF = derive2 { name="REddyProcNCDF"; version="1.1.4"; sha256="099f4mzqj7pjlrs8rdjg44mjm0058x3pj2imrfvk892hmlk4r53p"; depends=[REddyProc]; }; + REndo = derive2 { name="REndo"; version="2.3.1"; sha256="0v0p750nbvmr70qhmq4h995xfnp1phmwa990ifgk8y1ka7frwzrx"; depends=[AER corpcor data_table Formula lme4 Matrix mvtnorm optimx]; }; RFGLS = derive2 { name="RFGLS"; version="1.1"; sha256="13ggxj74h5b2hfhjyc50ndxznkvlg18j80m78hkzwh25d3948fsk"; depends=[bdsmatrix Matrix]; }; RFLPtools = derive2 { name="RFLPtools"; version="1.6"; sha256="1hl2crg7jl266zac41xvx151h7kl52346wnlvd8hba64s4s4apay"; depends=[RColorBrewer]; }; RFOC = derive2 { name="RFOC"; version="3.4-6"; sha256="0cs5wmpvrlag9aisbfiwkvwcb3skv5z4sawl30krmsq49mzj7yhd"; depends=[GEOmap MASS RPMG RSEIS splancs]; }; - RFgroove = derive2 { name="RFgroove"; version="1.1"; sha256="1ank7jvmn83w0xzylf7i0fjb60mbrzzydspksfzcy16rkl6f5dvb"; depends=[fda randomForest wmtsa]; }; RFinanceYJ = derive2 { name="RFinanceYJ"; version="0.3.1"; sha256="0qhmzsch7c2p0zckjkspsajzh8m10cf75ixjlgd0nj8rm41fngm3"; depends=[XML xts]; }; RFishBC = derive2 { name="RFishBC"; version="0.2.3"; sha256="1xhjsinb6dfr1zzzyvawc6bb10dnr3nbx86mi6lrzav42sbq31ni"; depends=[cli clisymbols crayon readbitmap rlang settings stringr tidyr withr]; }; - RFmarkerDetector = derive2 { name="RFmarkerDetector"; version="1.0.1"; sha256="1zd0sbcji620pka5600ilj4bq9gzdnk5kf82qfd5k5dcx7q9x7rk"; depends=[AUCRF ggplot2 randomForest ROCR UsingR WilcoxCV]; }; RFmerge = derive2 { name="RFmerge"; version="0.1-6"; sha256="1pskpfn9wcjq54szcskqakgnv0wwikyadhb1780icivmp10nklnn"; depends=[pbapply randomForest raster sf sp zoo]; }; RForcecom = derive2 { name="RForcecom"; version="1.1"; sha256="1ch1pwpnqagzb9n4qbgr804bmnz819kp36r5a4zhijmq8xpv3qr2"; depends=[httr plyr RCurl XML]; }; RFormatter = derive2 { name="RFormatter"; version="0.1.1"; sha256="0jmzdc2cl4vvffsyfwp493fiygh9xinhv970qxp1667rw8wlap8l"; depends=[formatR]; }; @@ -3371,7 +3391,7 @@ in with self; { RGA = derive2 { name="RGA"; version="0.4.2"; sha256="0pjizgvrh0gbjlyxlb3v93nhigg8rpq3mziv1qlp6r0s5y7cmpi9"; depends=[httr jsonlite lubridate plyr]; }; RGBM = derive2 { name="RGBM"; version="1.0-8"; sha256="0xd64g07y808nzs4zvbx6bxdpbj2ndqg6yzc3p0l43pxm4hyxva0"; depends=[doParallel foreach plyr]; }; RGCCA = derive2 { name="RGCCA"; version="2.1.2"; sha256="0zcxakqnmih0243y5b6r9nmcfanzxd6q344pd5bca5pnm3y43wr0"; depends=[Deriv MASS]; }; - RGCxGC = derive2 { name="RGCxGC"; version="1.1.0"; sha256="06f1jzs2x9im1vbsj2nfwvda8qchpmza1glgx6v4cn5nnli060fp"; depends=[colorRamps mixOmics ptw Rdpack RNetCDF]; }; + RGCxGC = derive2 { name="RGCxGC"; version="1.1-2"; sha256="03ihqra8q50a98adgxrx8l7js963f41kg2fy3lxzh9zma4gzj62q"; depends=[colorRamps mixOmics ptw Rdpack RNetCDF]; }; RGENERATE = derive2 { name="RGENERATE"; version="1.3.5"; sha256="12dq04xpl06zhkzwqx3zy0bkpvb5phbdj2inxsyczf6d4dk209mb"; depends=[RMAWGEN]; }; RGENERATEPREC = derive2 { name="RGENERATEPREC"; version="1.2.5"; sha256="1jqyp91x569la1vc6wl6v7jq6iq1cx2qkds9yiqm85bgzydp4lxw"; depends=[blockmatrix copula Matrix RGENERATE RMAWGEN stringr]; }; RGF = derive2 { name="RGF"; version="1.0.6"; sha256="11pnbiyp39r95c8ajj2jyxz4h1zf6fi8ki78rmn4vp7xm2bl3zff"; depends=[Matrix R6 reticulate]; }; @@ -3383,8 +3403,8 @@ in with self; { RGeode = derive2 { name="RGeode"; version="0.1.0"; sha256="1g8ha6zg4pvi8qimiihsa6rjfdcyj0q526l44jajjbqczmwg59lv"; depends=[MASS Rcpp]; }; RGoogleAnalytics = derive2 { name="RGoogleAnalytics"; version="0.1.6"; sha256="05wbcdksx5g6y7x4r1pvc9is3afxbpdxdbmc6b4jhn46rg4228z4"; depends=[digest httr lubridate]; }; RGoogleAnalyticsPremium = derive2 { name="RGoogleAnalyticsPremium"; version="0.1.1"; sha256="0d22pdd5kvnrspikfb66ny07pgx96rvykr0zi78rwn6g1symdb4q"; depends=[httr jsonlite lubridate]; }; - RGoogleFit = derive2 { name="RGoogleFit"; version="0.3.1"; sha256="0g4r5vb9zv6mqym1mh028ic9hkmlpklrhq4ks5sys7y60ps893k1"; depends=[bit64 httr jsonlite RCurl]; }; - RGraphics = derive2 { name="RGraphics"; version="2.0-14"; sha256="0bv95g17pvpq3nji0akphdaznh9k85hf5z78qypxwfqr76brxd05"; depends=[ggplot2 lattice]; }; + RGoogleFit = derive2 { name="RGoogleFit"; version="0.4.0"; sha256="0k1vvl4l6pq37llpbq996rbghdfld7mz7bhzbpw393fmrkd45vyi"; depends=[bit64 httr jsonlite RCurl]; }; + RGraphics = derive2 { name="RGraphics"; version="3.0-1"; sha256="1xd0i0k8870r0g7g4nq0dwr8mda5g2v0k66lzhr4znwll20zgg52"; depends=[ggplot2 gridBase gridGraphics gridSVG grImport grImport2 lattice]; }; RGreenplum = derive2 { name="RGreenplum"; version="0.1.2"; sha256="1mc0zmmnb9306j2cjn1j71bp35ri8p35rw6rlmrqyxgpvlw09r3d"; depends=[DBI RPostgres]; }; RGtk2 = derive2 { name="RGtk2"; version="2.20.36"; sha256="1vzb3wklm2iwhvggalalccr06ngx6zgv3bxjb8c3rsg9va82bzyp"; depends=[]; }; RH2 = derive2 { name="RH2"; version="0.2.4"; sha256="14590l3a2znd56nrq1zfbfv7fgii4672qy1xfwiynrh3mjad217k"; depends=[chron rJava RJDBC]; }; @@ -3396,31 +3416,32 @@ in with self; { RI2by2 = derive2 { name="RI2by2"; version="1.3"; sha256="0smc0fb9anq5ih9zx2slfbqyx02njm0hc7g22gpfggskmxf2l509"; depends=[gtools Rcpp]; }; RIA = derive2 { name="RIA"; version="1.4.2"; sha256="0i7z16viwgdsdnlkxq44p5l492asxv7ghn8005hlvpyxqihazkqw"; depends=[nat oro_dicom oro_nifti]; }; RIFS = derive2 { name="RIFS"; version="0.1-5"; sha256="0705dhirh7bhy2yf3b1mpk3m7lggg4pwy640lvaspwaxkd6zac5w"; depends=[]; }; - RISCA = derive2 { name="RISCA"; version="0.8"; sha256="0z6wq5bmfx6zrj7cnd7y0x8h7qkz4njcvb8jb1mil92zx2z47d43"; depends=[date MASS mvtnorm nlme relsurv riskRegression statmod survival]; }; + RISCA = derive2 { name="RISCA"; version="0.8.2"; sha256="16vpbg0grl497y5r6a3vm0nj1si6qbc6xxiyjb4wsmfgk13rw1dp"; depends=[caret date doParallel foreach glmnet kernlab MASS mvtnorm nlme nnet relsurv statmod SuperLearner survival]; }; RISmed = derive2 { name="RISmed"; version="2.1.7"; sha256="08dmkkxsmwp9b4h2g1bbx03cijn793fsnzkmbima8x9d42vxnm1l"; depends=[]; }; RIdeogram = derive2 { name="RIdeogram"; version="0.2.2"; sha256="0wvzlnisnxwzdzfh8ph4yspr8abi5qk6p4z2qa14ykzn8yry61ni"; depends=[ggplot2 grImport2 rsvg scales tidyr]; }; RImageJROI = derive2 { name="RImageJROI"; version="0.1.1"; sha256="0a4sa60klbpl31qxxvjjbksdhvs3vwm9na1v7014v93fzxy6bjas"; depends=[spatstat]; }; RImagePalette = derive2 { name="RImagePalette"; version="0.1.1"; sha256="054w8xzsn330qg7piq6ajhji9na2swkkdis2567cy3q099npfl5v"; depends=[ggplot2]; }; RImpact = derive2 { name="RImpact"; version="1.0"; sha256="010bdq6r2fv4rs78kl1ixnw1di39v90ckh8bblzi0wv4adlbaza4"; depends=[]; }; - RInSp = derive2 { name="RInSp"; version="1.2.3"; sha256="1nm29q2gysway4r7rdjr08m0w8lh2m9akhjh7swgjwrg4f15kfmy"; depends=[]; }; - RInside = derive2 { name="RInside"; version="0.2.15"; sha256="0azhialpdkfm5yzgazq2mfynm8ndyg9d9b569jmg6qa9b2iqf78y"; depends=[Rcpp]; }; + RInSp = derive2 { name="RInSp"; version="1.2.4"; sha256="1rfikmrz1y7sx9qwsqh5ifqryf6218n9dbhfmk2w2vl2pdgw4xyr"; depends=[]; }; + RInside = derive2 { name="RInside"; version="0.2.16"; sha256="03iabanmj5xkgq7r1n1rkmzjf2zz484637nmd1qg61ga53hsvr3s"; depends=[Rcpp]; }; RItools = derive2 { name="RItools"; version="0.1-17"; sha256="1shcvkgsyjk9jmpf7icj1zjlvmqa11scmymc8cycnffax604frbm"; depends=[abind SparseM survival svd xtable]; }; - RJDBC = derive2 { name="RJDBC"; version="0.2-7.1"; sha256="1d36js3kwlghsjxfhv7rl8nvg210hxwrx8sdxrxb0inwlqsash25"; depends=[DBI rJava]; }; - RJDemetra = derive2 { name="RJDemetra"; version="0.1.4"; sha256="0ddps7i7c9hj36jp0567x1fzks981vw45bz16c1dablskw87b0sf"; depends=[rJava]; }; - RJSDMX = derive2 { name="RJSDMX"; version="2.1-0"; sha256="1z1fhm6as9m35v11n5npv3mlaaal7w5c04g4yl2p26ljsmssfbsh"; depends=[rJava zoo]; }; + RJDBC = derive2 { name="RJDBC"; version="0.2-8"; sha256="1qfq1vjlxhg3hmb1169zkss7kng74jhjninqkfr3cca8x1fq9593"; depends=[DBI rJava]; }; + RJDemetra = derive2 { name="RJDemetra"; version="0.1.5"; sha256="16iri92h0smf2vqwr0za4698qidncmqb4fimbidizqr7205xa1cw"; depends=[rJava]; }; + RJSDMX = derive2 { name="RJSDMX"; version="2.3-3"; sha256="02lbg82g4abng5vcn2g8ghvmg69q35my8smnbvd09yvha8hb49ps"; depends=[rJava zoo]; }; RJSONIO = derive2 { name="RJSONIO"; version="1.3-1.4"; sha256="141ijm9570mg1180isvi0jb9vd3b08s5gb9dl1wa5v0m3s9jq52l"; depends=[]; }; RJSplot = derive2 { name="RJSplot"; version="2.5"; sha256="0p2zqbq29pfjl703wqqjzgmif7yfzz7l8rzarjf5axkdy7w7fcyl"; depends=[]; }; - RJafroc = derive2 { name="RJafroc"; version="1.3.1"; sha256="1sa5x9ya2sgddvvrp5x7v12wcm0x1f5v0ja4flpxqqiv4fcsfni3"; depends=[bbmle binom dplyr ggplot2 mvtnorm numDeriv openxlsx Rcpp stringr]; }; + RJafroc = derive2 { name="RJafroc"; version="1.3.2"; sha256="11waf05ljzfrizsbb2y6bd2cd8k7950kbq26sfyfgf4idh5w0mbp"; depends=[bbmle binom dplyr ggplot2 mvtnorm numDeriv openxlsx Rcpp stringr]; }; RKEA = derive2 { name="RKEA"; version="0.0-6"; sha256="1dncplg83b4zznh1zh90wr8jv5259cy93imrry86c5kqdijmhrrp"; depends=[rJava RKEAjars tm]; }; RKEAjars = derive2 { name="RKEAjars"; version="5.0-4"; sha256="1j4643xc8k3zy4rv0h8dd154jafihnjr43wzz3d93j11g2w9xhq3"; depends=[rJava]; }; - RKEEL = derive2 { name="RKEEL"; version="1.3.1"; sha256="0k13j460jalmjdicrm7rqxb1b25cx1h4c276xbiybmhrmzmjlv5y"; depends=[arules doParallel foreach gdata Matrix pmml R6 rJava RKEELdata RKEELjars XML]; }; + RKEEL = derive2 { name="RKEEL"; version="1.3.2"; sha256="120x49zblhs7grqj919m3ll9q5ddr3kkqicy1am5b8hahybiz5al"; depends=[arules doParallel foreach gdata Matrix pmml R6 rJava RKEELdata RKEELjars XML]; }; RKEELdata = derive2 { name="RKEELdata"; version="1.0.5"; sha256="1swzqw6j006ya48ahg6n1g8faxhqiv9v5q1zrnihpzj6868lf7y3"; depends=[]; }; RKEELjars = derive2 { name="RKEELjars"; version="1.0.19"; sha256="1a879b0xq5jk7r2pf4n41nm0c4himl4yqw083xh2ha4qdhab5kq0"; depends=[downloader]; }; RKHSMetaMod = derive2 { name="RKHSMetaMod"; version="1.1"; sha256="1h8gqqfmlrzyj4n997yn13vqpaw2kwzl45gscy3fdhskzmyg0ss3"; depends=[Rcpp RcppEigen RcppGSL]; }; RKUM = derive2 { name="RKUM"; version="0.1.1"; sha256="1w0v6l61dm7xixnyywsc7xziixz7k9r1ja26zcy77nry5kn6v60q"; depends=[]; }; RKelly = derive2 { name="RKelly"; version="1.0"; sha256="0mkpc95j67rg2gcj2fc4w8kv4v31cpiyvh660y8kc2fjr5q4aj3l"; depends=[]; }; RKlout = derive2 { name="RKlout"; version="1.0"; sha256="17mx099393b1m9dl3l5xjcpzmb9n3cpjghb90m9nidccxkhacmqf"; depends=[RCurl]; }; - RLRsim = derive2 { name="RLRsim"; version="3.1-3"; sha256="1r0xqay3jfg435dh9fqc6yy73wjffp658da194rx63vpfhshgz8w"; depends=[lme4 mgcv nlme Rcpp]; }; + RKorAPClient = derive2 { name="RKorAPClient"; version="0.5.7"; sha256="19sya8zajmpxl4yc9y9b6qmd816zxdlyymm8v6swykh4xlr3ghfg"; depends=[broom dplyr ggplot2 highcharter htmlwidgets httr jsonlite keyring lubridate magrittr plotly PTXQC purrr R_cache tibble tidyr]; }; + RLRsim = derive2 { name="RLRsim"; version="3.1-6"; sha256="1wkkibr250frsbfq70m9jdrylxb492zibf5w03z6zis98pjffssp"; depends=[lme4 mgcv nlme Rcpp]; }; RLT = derive2 { name="RLT"; version="3.2.2"; sha256="1a8cip975z99g8ljng4y86wv1gf1xwg0sqnxz79wj6zxpw8fk37c"; depends=[]; }; RLeafAngle = derive2 { name="RLeafAngle"; version="1.0"; sha256="1anks22hn6qpac556p99kilkhc80h572dvcyz3wj1nqffdrhgrh3"; depends=[]; }; RLogicalOps = derive2 { name="RLogicalOps"; version="0.1"; sha256="1qyn80x3x3bb5wgzyzw6pxs8a6q26yq1fkmkz7f5wywsnrj8hzfj"; depends=[rstackdeque stringr]; }; @@ -3437,7 +3458,8 @@ in with self; { RMTL = derive2 { name="RMTL"; version="0.9"; sha256="08da67wvzmibziqhnlzh43sydaihk4rsq2k5hs6ih3jkkidrhlgv"; depends=[corpcor doParallel foreach MASS psych]; }; RMThreshold = derive2 { name="RMThreshold"; version="1.1"; sha256="0wkc42vcggib002ad6ch43h6avpdgl12szrrrfd2p0wl72cwn5n1"; depends=[Matrix png]; }; RMTstat = derive2 { name="RMTstat"; version="0.3"; sha256="1nn25q4kmh9kj975sxkrpa97vh5irqrlqhwsfinbck6h6ia4rsw1"; depends=[]; }; - RMaCzek = derive2 { name="RMaCzek"; version="1.2.0"; sha256="02wkcn079pi5il7n0dqyq89qjn0jxwcdzmm5yr894cn9npmkxgzb"; depends=[GA seriation]; }; + RMaCzek = derive2 { name="RMaCzek"; version="1.3.2"; sha256="17w3ay8x8laqqfzzl34b7fsyk029rxss20bafh14yksw2qkvi8qy"; depends=[GA seriation]; }; + RMallow = derive2 { name="RMallow"; version="1.1"; sha256="1s6a3347739rfc8rrh2773b278gcbp8hf5j5psm61fz7bavy9gcj"; depends=[combinat]; }; RMariaDB = derive2 { name="RMariaDB"; version="1.0.8"; sha256="1xcr5lg9da4a49dcqy3hhrpz5jn51dqa6dc50vmkq1nw372yv2iw"; depends=[BH bit64 DBI hms plogr Rcpp]; }; RMark = derive2 { name="RMark"; version="2.2.7"; sha256="0qxa383cagzqrnfc3izybb4lrg8z1r3nw1j5b7h4wkjwy0k3kczb"; depends=[coda matrixcalc msm]; }; RMediation = derive2 { name="RMediation"; version="1.1.4"; sha256="19idqx0hwljbcfrpqwa81k7cxbd8kv77ji8yi4n4p7517jbkzma6"; depends=[e1071 lavaan MASS]; }; @@ -3445,37 +3467,37 @@ in with self; { RMixtComp = derive2 { name="RMixtComp"; version="4.1.0"; sha256="00hygbbzbr5sdbhjzg0k4a7wj88dscmaln6bnxl6ywbzhdh902x4"; depends=[ggplot2 plotly RMixtCompIO RMixtCompUtilities scales]; }; RMixtCompIO = derive2 { name="RMixtCompIO"; version="4.0.2"; sha256="03dlljykbn2jjnrys2s02vz091f09f92c7h53qxsd2r19l59ymnf"; depends=[BH doParallel foreach Rcpp RcppEigen]; }; RMixtCompUtilities = derive2 { name="RMixtCompUtilities"; version="4.1.0"; sha256="0c6sjn6j0g6zc44w5knsgd6ga138gci54yilak8w0xrv5kr7mj3w"; depends=[ggplot2 plotly scales]; }; - RMySQL = derive2 { name="RMySQL"; version="0.10.18"; sha256="0r4626sk78fhlgivr0c7mwg9mj29ayr0iz5x90rdl4d5nc2r6kq4"; depends=[DBI]; }; - RNAseqNet = derive2 { name="RNAseqNet"; version="0.1.2"; sha256="07wk0i8iz3cvkiqawxhm61g3nka8adw0zrrv60zx329gg49w0ycl"; depends=[ggplot2 glmnet hot_deck igraph PoiClaClu]; }; - RNAsmc = derive2 { name="RNAsmc"; version="0.4.0"; sha256="17gkhmnrxa1zwh6qhc0x48smgyq35g5gdb4wv0m5pnbyhkqzs7sq"; depends=[RRNA]; }; + RMySQL = derive2 { name="RMySQL"; version="0.10.20"; sha256="0lv9m6zpm8dgv7yixr6xhw379vbq45d7n7gkrmjrppdj8vcih77i"; depends=[DBI]; }; + RNAseqNet = derive2 { name="RNAseqNet"; version="0.1.3"; sha256="1fn3q49dswi8hsyxkkgmq35gbdmnn72kzmfk89vd7gjvm67skvm6"; depends=[ggplot2 glmnet hot_deck igraph PoiClaClu]; }; + RNAsmc = derive2 { name="RNAsmc"; version="0.6.0"; sha256="0q4b24baabzx41zqygy6l2jnyzc4m7knmlnhra4hhc5f5cl5ab8r"; depends=[circlize RRNA]; }; RNAstructureModuleMiner = derive2 { name="RNAstructureModuleMiner"; version="0.1.0"; sha256="026r1h4z1jdfww0ay9iixa77ax6b19pgp589bbn77xg1vwjjlbsk"; depends=[RRNA]; }; RNCBIEUtilsLibs = derive2 { name="RNCBIEUtilsLibs"; version="0.9"; sha256="1h1ywx8wxy6n2rbpmjbqw4c0djz29pbncisd0mlbshj1fw226jba"; depends=[rJava]; }; - RNCEP = derive2 { name="RNCEP"; version="1.0.8"; sha256="0nkx33997c5rgc3ch5a2bb6rrw5xw1y71rliygw5k1ldi335rsm7"; depends=[abind fields fossil maps RColorBrewer sp tgp]; }; + RNCEP = derive2 { name="RNCEP"; version="1.0.9"; sha256="1rbz8i4id5an95pcw6mbc30cjkj3pr5hc4hzfkcyhy5nnfxz784b"; depends=[abind fields maps RColorBrewer sp tgp]; }; RND = derive2 { name="RND"; version="1.2"; sha256="1rl5apgw43c841z0lapi9z2jn979dvqh4x1qkqx1ad77zcq87c85"; depends=[]; }; RNGforGPD = derive2 { name="RNGforGPD"; version="1.0.2"; sha256="0z1jawq3342ffbv1jp7kfzll9pac5ff09qb3fd0vz564kqcvik0n"; depends=[corpcor Matrix mvtnorm VGAM]; }; RNHANES = derive2 { name="RNHANES"; version="1.1.0"; sha256="045ykpgxvc22blbp47ysbk6a6x4akjd39pjr114cr23s7f48g6h4"; depends=[dplyr foreign rvest survey xml2]; }; RNOmni = derive2 { name="RNOmni"; version="0.7.1"; sha256="0lzd820x9yw90ddzmxvd89pkqc3nrljlc6kz4cab50zj3s755ack"; depends=[abind foreach plyr Rcpp RcppEigen]; }; RNRCS = derive2 { name="RNRCS"; version="0.2.5"; sha256="19q78l8mh4701vqvr36vqc87n39s5ivzhiy5lvnxbd4dgibk1jr2"; depends=[ggplot2 magrittr rvest xml2]; }; RNaviCell = derive2 { name="RNaviCell"; version="0.2"; sha256="15k8hkagn5520fy7x672fy329s2v7l0x44s44f6v7ql9mmg4b635"; depends=[RCurl RJSONIO]; }; - RNeXML = derive2 { name="RNeXML"; version="2.4.0"; sha256="164krdabq3xqw8djmbpwj20vx074x9dgcdy5l1hr06cmz2bahqp1"; depends=[ape dplyr httr lazyeval plyr reshape2 stringi stringr tidyr uuid XML xml2]; }; + RNeXML = derive2 { name="RNeXML"; version="2.4.3"; sha256="09d915hl8bfs3qg1lijh5kvs86rf0w25rh8p5p4mjnjdva9ir05z"; depends=[ape dplyr httr lazyeval plyr reshape2 stringi stringr tidyr uuid XML xml2]; }; RNentropy = derive2 { name="RNentropy"; version="1.2.2"; sha256="0chvmrvpyyghilwb63y6pd1zp94i5qhpv5w19x9nw0ypk86pp2dj"; depends=[]; }; RNetCDF = derive2 { name="RNetCDF"; version="2.1-1"; sha256="0i670giq741d78ps6y98xbnqdybkv2svmdd6jbvcbpgdry6pfw89"; depends=[]; }; RNetLogo = derive2 { name="RNetLogo"; version="1.0-4"; sha256="1z7jp454k197c0zbkn64zmf25wadkiznv3w2csgiz917cbx6xcn1"; depends=[igraph rJava]; }; - RNewsflow = derive2 { name="RNewsflow"; version="1.2.1"; sha256="07469svqqjskrf04cm0ga5h94yb5h845dhz5gp740f16ymm0gkci"; depends=[data_table igraph Matrix quanteda Rcpp RcppEigen RcppProgress scales stringi tm wordcloud]; }; - RNifti = derive2 { name="RNifti"; version="1.0.1"; sha256="0hfid40pgfi1ykqka8y3v0m7h0iyd6fbvycvqlad3ibmbg621f0w"; depends=[Rcpp]; }; - RNiftyReg = derive2 { name="RNiftyReg"; version="2.6.7"; sha256="1qx6igv0kdja2c139gbs42cwfjwj7ifcxxlswydvja03iz3k53wz"; depends=[ore Rcpp RcppEigen RNifti]; }; + RNewsflow = derive2 { name="RNewsflow"; version="1.2.3"; sha256="0cbvcz2dgx3nvhvj73k6s901v5p5fy8zl4hx4r696cf14n60c0yb"; depends=[data_table igraph Matrix quanteda Rcpp RcppEigen RcppProgress scales stringi tm wordcloud]; }; + RNifti = derive2 { name="RNifti"; version="1.1.0"; sha256="1z8ninp3aq18w0slcfn8r2fp48cdz8l0k0namsrnvgyp8lzcpqpn"; depends=[Rcpp]; }; + RNiftyReg = derive2 { name="RNiftyReg"; version="2.6.8"; sha256="19lij5zplw7jw65ykkjl85iqpfq3i6sia4wnq7fmkv1xlzwda2f4"; depends=[ore Rcpp RcppEigen RNifti]; }; 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]; }; ROCS = derive2 { name="ROCS"; version="1.3"; sha256="11vdf8701ap6ya7c7kx9jhvg7qfc6vkij3jridna6f4xj384grki"; depends=[poibin rgl]; }; ROCit = derive2 { name="ROCit"; version="1.1.1"; sha256="1bip1zz5chm06pfikkscahph2clsaf9rhhpsla6vmvpfy0d8p070"; depends=[]; }; + ROCnReg = derive2 { name="ROCnReg"; version="1.0"; sha256="0fz1s2a71bb1l60mqvrzmac5wiaa43h4s9xbpaw90y5w2kdpz1ji"; depends=[lattice MASS Matrix moments nor1mix np pbivnorm spatstat]; }; ROCt = derive2 { name="ROCt"; version="0.9.5"; sha256="0f7day0rv62ggm1nc7qkh45r6svr84mdk7xxpdf09pi4lbdx0rm6"; depends=[date relsurv survival timereg]; }; ROCwoGS = derive2 { name="ROCwoGS"; version="1.0"; sha256="029nramxwhzqim315g1vkg1zsszzkic28w6ahwg9n7bk9d08adzk"; depends=[]; }; RODBC = derive2 { name="RODBC"; version="1.3-16"; sha256="0fcnszrkk7llz26wccs97glddw793i0f9bd7rwxrld24vn1lng92"; depends=[]; }; RODBCDBI = derive2 { name="RODBCDBI"; version="0.1.1"; sha256="0jkcc1lm8drsx1pkfj5h6rlbr98cgpvbf9ndzdwr048f3s8gd26i"; depends=[DBI RODBC]; }; - RODBCext = derive2 { name="RODBCext"; version="0.3.1"; sha256="06ky97k93bbrlxm4fg770mnz6yqp2zzgwmvzdqrpanfbg7qkfwwn"; depends=[RODBC]; }; RODM = derive2 { name="RODM"; version="1.1"; sha256="0cyi2y3lsw77gqxmawla5jlm4vnhsagh3ykdgb6izxslc4j2fszx"; depends=[RODBC]; }; - ROI = derive2 { name="ROI"; version="0.3-2"; sha256="0kx71843sfbml05kdbaf9lx67aqcjhdk4klg8yr020j5100cf17w"; depends=[registry slam]; }; + ROI = derive2 { name="ROI"; version="0.3-3"; sha256="06d9cqa7g5n10cynkkmy42ilzs7jj2lfz9snimis6ipgkm5n0xr9"; depends=[registry slam]; }; ROI_models_globalOptTests = derive2 { name="ROI.models.globalOptTests"; version="1.1"; sha256="0cr4iy4p590zsp47jqyrvhamc4xa9nkpnnddmwqbkgvzmzxf83ap"; depends=[globalOptTests ROI]; }; ROI_models_miplib = derive2 { name="ROI.models.miplib"; version="0.0-2"; sha256="1brlqyprvrq32ww36j3aa4nqfcn1q1mfv58vv92rlv23cb6b94sv"; depends=[R_utils Rglpk ROI]; }; ROI_models_netlib = derive2 { name="ROI.models.netlib"; version="1.1"; sha256="0dhiiyw9srlih3x381jlgl11y0vr9qyn91b7xi208a0vpsmassa7"; depends=[ROI]; }; @@ -3490,9 +3512,9 @@ in with self; { ROI_plugin_neos = derive2 { name="ROI.plugin.neos"; version="0.3-1"; sha256="02apdbw5b0fknmm798g7nrfs25yjiyqza5b2cd4b6vvj2bjnwpsd"; depends=[ROI xml2 xmlrpc2]; }; ROI_plugin_nloptr = derive2 { name="ROI.plugin.nloptr"; version="0.3-3"; sha256="0ls241xahmd77q2s02mpzr1i10nq5vqgic5j786y9q00f6c3lxyd"; depends=[nloptr ROI]; }; ROI_plugin_optimx = derive2 { name="ROI.plugin.optimx"; version="0.3-2"; sha256="13dfczn6dl4d1sx15davn5f4vcri7lk2zzh8ib28268lbwh9ma2s"; depends=[optimx ROI]; }; - ROI_plugin_qpoases = derive2 { name="ROI.plugin.qpoases"; version="0.3-2"; sha256="1mclf6nf9ci331pgf3mw2fci502991vfzkiqx4l2l6n662jpxpqy"; depends=[checkmate Rcpp ROI slam]; }; + ROI_plugin_qpoases = derive2 { name="ROI.plugin.qpoases"; version="0.3-3"; sha256="132zr4nx220697j2x1vm4sl1wklbrnh549zh5gb0zn7q206r56r4"; depends=[checkmate Rcpp ROI slam]; }; ROI_plugin_quadprog = derive2 { name="ROI.plugin.quadprog"; version="0.2-5"; sha256="1c4fd16kgg60gfs52xc64ii4kzl8fb8qz3rpy69d08avb4q6grir"; depends=[quadprog ROI slam]; }; - ROI_plugin_scs = derive2 { name="ROI.plugin.scs"; version="0.3-1"; sha256="1n73qm0aw0azwg9m1r3i3qpymzqy7ly8cgsmr00n8pwsgg858h8v"; depends=[ROI scs slam]; }; + ROI_plugin_scs = derive2 { name="ROI.plugin.scs"; version="0.3-2"; sha256="0g48awvbsnmdlviksyc57piqvhwfx63iq68ymyrgfxfwkjrk4fwl"; depends=[ROI scs slam]; }; ROI_plugin_symphony = derive2 { name="ROI.plugin.symphony"; version="0.2-5"; sha256="1kpa82g33i2fdcnkpcqdpslj14ilrl7cp0fq1jmp4vj8ddz1s9g5"; depends=[ROI Rsymphony slam]; }; ROMDB = derive2 { name="ROMDB"; version="0.1.0"; sha256="14jijcqd2zmps8sacx5nwfclj5yvqf4nx72y8pfvr0nswqqb895i"; depends=[dplyr httr magick purrr RODBC stringr]; }; ROMIplot = derive2 { name="ROMIplot"; version="1.0"; sha256="1njbsvnz7wrsv9l1p70p1ygmckaibz5i6jmvb0sfalp5jdcgl85n"; depends=[MortalitySmooth RCurl]; }; @@ -3506,15 +3528,15 @@ in with self; { ROptEst = derive2 { name="ROptEst"; version="1.2.1"; sha256="0gjdgynmg8499jm5gbnmjipnn1bl7h1rja8lhgbaw48lmq5sr801"; depends=[distr distrEx distrMod MASS RandVar RobAStBase startupmsg]; }; ROptEstOld = derive2 { name="ROptEstOld"; version="1.2.0"; sha256="08njyxb8bnjb9nas3szqvqkfv83lc0187b7biis2nl2rgq6rljzy"; depends=[distr distrEx evd RandVar]; }; ROptRegTS = derive2 { name="ROptRegTS"; version="1.2.0"; sha256="1wy54kjrpfvj2k9ndmq27zzgx6aygh85f7c83g7gn8d5b2y91qy4"; depends=[distr distrEx RandVar ROptEstOld]; }; - ROptSpace = derive2 { name="ROptSpace"; version="0.2.1"; sha256="1sc7f2q9856c351nqb6dgq1d34jpahvfxb5l43npa04lm1hh7hqw"; depends=[Rdpack]; }; + ROptSpace = derive2 { name="ROptSpace"; version="0.2.2"; sha256="09crzp3anw9p9fknw9gv8kzk1gmmdw0hbw1fa2r8i6601xi81ap4"; depends=[Rcpp RcppArmadillo 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.7"; sha256="0gf25gj9461bl6hi205zvbc17pjw7r8900mirrp5zh08mjzpjmmd"; depends=[ape cluster coda corpcor deSolve fields fpc geiger glassoFast igraph Matrix mvMORPH mvtnorm phytools picante pracma pspline pvclust Rmpfr TESS]; }; + RPANDA = derive2 { name="RPANDA"; version="1.8"; sha256="0k9k3zc68kr17jd5r0m6jwmfhf43k5r44h4kqa6kdpd03h60m1rh"; depends=[ape cluster coda corpcor deSolve fields fpc geiger glassoFast igraph Matrix mvMORPH mvtnorm phytools picante pracma pspline pvclust Rmpfr TESS]; }; RPCLR = derive2 { name="RPCLR"; version="1.0"; sha256="03kpyszsjb656lfwx2yszv0a9ygxs1x1dla6mpkhcnqw00684fab"; depends=[MASS survival]; }; RPEClust = derive2 { name="RPEClust"; version="0.1.0"; sha256="1ysw45335lrxmj3j17xyvgz76p00v80f2m7wxfndh91wklqxzm8r"; depends=[clue clusteval mclust]; }; RPEGLMEN = derive2 { name="RPEGLMEN"; version="1.0.1"; sha256="1bcci0ih71bxdrwdz336c5wx47d094nczazy8mv3v41vivrk4jkh"; depends=[PerformanceAnalytics Rcpp RcppEigen RPEIF]; }; - RPEIF = derive2 { name="RPEIF"; version="1.0.3"; sha256="15v2z6iiai7vhbyhql199dpdb4762lhkqbzm24iraqfffxkbhyb8"; depends=[PerformanceAnalytics Rcpp RobStatTM xts zoo]; }; - RPESE = derive2 { name="RPESE"; version="1.0.1"; sha256="0hp7nc86gbmnchvhivywh1cg2w6cbvihypdq0mi1r86pxc0n2z61"; depends=[boot PerformanceAnalytics robustbase RPEGLMEN RPEIF sandwich xts zoo]; }; + RPEIF = derive2 { name="RPEIF"; version="1.0.7"; sha256="1n0b3fdl88wlncfm0k9cy7nj9mgkv3dv724ld2haypmmnbhkhr4j"; depends=[PerformanceAnalytics xts zoo]; }; + RPESE = derive2 { name="RPESE"; version="1.0.3"; sha256="0a9nq60jg2bhj5cbbgkpz0zisqwrv7cgifbiampx2y6sfrkmhbjg"; depends=[boot PerformanceAnalytics RPEGLMEN RPEIF sandwich xts zoo]; }; RPEXE_RPEXT = derive2 { name="RPEXE.RPEXT"; version="0.0.1"; sha256="0m5ml8ywxrf66mjz6m3xp1lajd7wdq9g7xsaln8n7ykq7h5615fc"; depends=[]; }; RPEnsemble = derive2 { name="RPEnsemble"; version="0.4"; sha256="0y9g22swcz0m5jbzi87ahxw27fb3jlf3iwvxb73kkzixqlvksw9y"; depends=[class MASS]; }; RPMG = derive2 { name="RPMG"; version="2.2-3"; sha256="1di2bcf58z6gc3xknzx35znsjsy1714swvxkdhlq1ljidbdbmmbl"; depends=[]; }; @@ -3526,7 +3548,7 @@ in with self; { RPostgres = derive2 { name="RPostgres"; version="1.2.0"; sha256="16fjwaj1qvr1i9naq19jg2z3dqssi3pp4wwviyqlkj1mmbyh28zx"; depends=[BH bit64 blob DBI hms plogr Rcpp withr]; }; RPresto = derive2 { name="RPresto"; version="1.3.4"; sha256="17hwq76vzr27prwisfxahs1ix9grldknaywnq3v2a3s2x79v8vbv"; depends=[DBI httr jsonlite openssl Rcpp stringi]; }; RProbSup = derive2 { name="RProbSup"; version="2.1"; sha256="0lmv4x235xiykc8jfnp15l4yypm99yz6spsnaxacp49y2aw23jpy"; depends=[]; }; - RProtoBuf = derive2 { name="RProtoBuf"; version="0.4.14"; sha256="1jn288796g61sfffnrfm0nm6igyv0yixlb09yhw8fqih7qg14lnx"; depends=[Rcpp RCurl]; }; + RProtoBuf = derive2 { name="RProtoBuf"; version="0.4.17"; sha256="0krbxalcfg47cmrwfajgbhmn6rs687ranaiq5j0daw7a1k4qdfd8"; depends=[Rcpp RCurl]; }; RPtests = derive2 { name="RPtests"; version="0.1.4"; sha256="1r30pslbjq3dip41la81jlin2vhxdmayg902x9ryjy554awfgh7j"; depends=[glmnet randomForest Rcpp]; }; RPublica = derive2 { name="RPublica"; version="0.1.3"; sha256="1w2pn1g44a00ls8kkzj53a739pq6vzp38px2k0yh10rlzimmb21l"; depends=[curl httr jsonlite]; }; RPushbullet = derive2 { name="RPushbullet"; version="0.3.3"; sha256="0acydm5xc1j6yjmjipfrg7pvc6h0jwihrg1rx97qwddds2xakkxy"; depends=[curl jsonlite]; }; @@ -3534,15 +3556,16 @@ 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.11"; sha256="0849967lkbcfpy9pnnibdjsv83byn85qrk98bzpxm4wmcd1jqqhk"; depends=[Rcpp zoo]; }; + RQuantLib = derive2 { name="RQuantLib"; version="0.4.12"; sha256="1bmjgsdwivrvdysba4hq60xpp7xg1c0p1p05mdm0338zvzix5kb8"; depends=[Rcpp zoo]; }; RRF = derive2 { name="RRF"; version="1.9.1"; sha256="135adnf7cfs8gddmmmgmzarjzg0qfrd7l67367yhy2b1k0s5ng1w"; depends=[]; }; RRI = derive2 { name="RRI"; version="1.1"; sha256="0msdc5j5vx4snl8r3q5nn0mw2i80jds5pjykhmigcrx6jzg6h6i7"; depends=[Rcpp RcppArmadillo]; }; RRNA = derive2 { name="RRNA"; version="1.0"; sha256="14rcqh95ygybci8hb8ays8ikb22g3850s9f3sgx3r4f0ky52dcba"; depends=[]; }; RRPP = derive2 { name="RRPP"; version="0.5.2"; sha256="0j31drphisckab9v93z6spdj9jgd0wx9dkbd2b22ff5la6bvil7k"; depends=[]; }; + RRRR = derive2 { name="RRRR"; version="1.0.0"; sha256="1xia8izpxlacas2qa508wy7d65b461cqqkkv78jbp85h0dzxa0k0"; depends=[expm ggplot2 magrittr matrixcalc mvtnorm]; }; RRTCS = derive2 { name="RRTCS"; version="0.0.3"; sha256="1riz1gjx3c0pf17xwybizb94nm5zgmfsnv6np3afvw831mb1x3l9"; depends=[sampling samplingVarEst]; }; RRate = derive2 { name="RRate"; version="1.0"; sha256="1q3f2gphdf50aijnk5xqfpxcqfd4jq7byb1gpb0vcnaxgi3a9lwm"; depends=[]; }; RRedshiftSQL = derive2 { name="RRedshiftSQL"; version="0.1.2"; sha256="03jbml8d19hcg6achnyc4hcnl5j10yvsx59j80r46zyn0flsnizq"; depends=[DBI RPostgreSQL]; }; - RRphylo = derive2 { name="RRphylo"; version="2.4.0"; sha256="1llrnhwmigcwhb5pr6yr3w91gmqsn5q7xsfk61l03nnslj9vp7aq"; depends=[ape binr car cluster ddpcr doParallel emmeans foreach geiger geomorph lmtest mvMORPH nlme outliers phangorn phytools picante plotrix pvclust R_utils RColorBrewer rlist scales smatr tseries vegan]; }; + RRphylo = derive2 { name="RRphylo"; version="2.4.4"; sha256="1wmd1hm51v2289cfglvx245frjs2c2908znfayvvd2gfhfj6r7rf"; depends=[ape binr car cluster ddpcr doParallel emmeans foreach geiger geomorph lmtest nlme outliers phangorn phytools picante plotrix R_utils RColorBrewer rlist scales smatr vegan]; }; RRreg = derive2 { name="RRreg"; version="0.7.1"; sha256="1mzc9ga5jdh3cf95bxbfy6kdxvqcca74v4hszb63jalzp8w624r9"; depends=[doParallel foreach lme4]; }; RSA = derive2 { name="RSA"; version="0.9.13"; sha256="19xkziixmwwmf7fxkzbsmp9bjii6mznnxyzghbw64kx0kq8bc1ll"; depends=[aplpack ggplot2 lattice lavaan plyr RColorBrewer tkrplot]; }; RSADBE = derive2 { name="RSADBE"; version="1.0"; sha256="1nzpm88rrzavk0n8iflsx8r3s1xcry15n80zqdw6jijjycz10w1q"; depends=[]; }; @@ -3559,17 +3582,18 @@ in with self; { RSNNS = derive2 { name="RSNNS"; version="0.4-12"; sha256="1fa32wrhv3q0sdgrcrqrazvvylbn83d75bw8d0ncjfspf7dgx3di"; depends=[Rcpp]; }; RSNPset = derive2 { name="RSNPset"; version="0.5.3"; sha256="1llx6anwkl4as0hdyvmsrlg9z8mkn9p1qxgs6kqs39w87gyx0j36"; depends=[doRNG fastmatch foreach qvalue Rcpp RcppEigen]; }; RSPS = derive2 { name="RSPS"; version="1.0"; sha256="0ynxhgnxsf27qm8r5d9lyd59zksnc3kvx35hy25vff8j3bg7fqgi"; depends=[gridExtra lattice plyr]; }; + RSQL = derive2 { name="RSQL"; version="0.1.1"; sha256="108jv8p0q4cmpjm701k6c2i5vcyaq9xn6wg97rih639gmdaqn28s"; depends=[DBI lgr R6 RSQLite]; }; RSQLite = derive2 { name="RSQLite"; version="2.2.0"; sha256="1m38sj8rwbf3p2lhqabcp7c7djk7s9ng37cz39yxk706v9pi4380"; depends=[BH bit64 blob DBI memoise pkgconfig plogr Rcpp]; }; - RSSL = derive2 { name="RSSL"; version="0.8"; sha256="0pynj5jppl2bxh0hh6lhqr6s54v0ny4mabk0zrx8xzcbidlwyhn1"; depends=[cluster dplyr ggplot2 kernlab MASS Matrix quadprog Rcpp RcppArmadillo reshape2 scales tidyr]; }; + RSSL = derive2 { name="RSSL"; version="0.9.1"; sha256="0845azknk90ix8xgcj18mdn7jbicalid4fcqyxzp747qswy4hh98"; depends=[cluster dplyr ggplot2 kernlab MASS Matrix quadprog Rcpp RcppArmadillo reshape2 scales tidyr]; }; RSSOP = derive2 { name="RSSOP"; version="1.1"; sha256="119xrxpaf68qdb2kj2pbaja6im2nbxsgibb1bnlpnc3fcxkmqcsf"; depends=[]; }; RSSampling = derive2 { name="RSSampling"; version="1.0"; sha256="0p10l7qmksx4ysz1jb84f9nbqzig8wxhwy33yk8hq29nb5i4c9ik"; depends=[LearnBayes]; }; RSVGTipsDevice = derive2 { name="RSVGTipsDevice"; version="1.0-7"; sha256="0jdr8l0hp4kzsvlgs8j1m74sr98z4v2lmiqinmc238m406nhppab"; depends=[]; }; RSarules = derive2 { name="RSarules"; version="1.0"; sha256="0lrql4q45hyhqbix86ixl12mknnjbz3137gx2zkvqpz91bsk145j"; depends=[arules Matrix]; }; RSauceLabs = derive2 { name="RSauceLabs"; version="0.1.6"; sha256="1p7hw6vnlg6w5ggmfpc3q3s6n1fikjkjnxzz97jifiy0zwn5dp9i"; depends=[data_table httr jsonlite whisker xml2]; }; - RScelestial = derive2 { name="RScelestial"; version="1.0.0"; sha256="1amvzp4a69cpm13affvpza8zs1n78a3y93bwpv0fzi2b60im4y9x"; depends=[Rcpp]; }; + RScelestial = derive2 { name="RScelestial"; version="1.0.1"; sha256="10d2kxlqy224y6qypr7g3pnbv9bkrj22zi77wg7y646f5bzdz9qd"; depends=[Rcpp]; }; RSclient = derive2 { name="RSclient"; version="0.7-3"; sha256="07mbw6mcin9ivsg313ycw2pi901x9vjpmi6q7sms1hml4yq50k6h"; depends=[]; }; RSeed = derive2 { name="RSeed"; version="0.1.60"; sha256="0rvb6w4z5c2wcdgx5w6vv7c8il8d0096pgv3fyvw21ag25z605jc"; depends=[graph RBGL sybil]; }; - RSelenium = derive2 { name="RSelenium"; version="1.7.5"; sha256="1ih22z3p1p673dhbjsfmli94bzqp5xk3psslf4c0r9dvmw9h6s5c"; depends=[binman caTools httr openssl wdman XML]; }; + RSelenium = derive2 { name="RSelenium"; version="1.7.7"; sha256="1xn5fdbzmq7b1f5fc9ls23g177bmnd8bn4p4d8aafr6z3jwkmfir"; depends=[binman caTools httr openssl wdman XML]; }; RSentiment = derive2 { name="RSentiment"; version="2.2.2"; sha256="15d1llzxg1apkwykpb7pic2d5lfj9i9a55hab067wrz2yq5jsyfa"; depends=[NLP openNLP plyr stringr]; }; RSiena = derive2 { name="RSiena"; version="1.2-23"; sha256="04picf0f9rahd37r9fm0cisgaiy2aqshnzfh7cvhcqfaqmpxc8kp"; depends=[lattice MASS Matrix]; }; RSiteCatalyst = derive2 { name="RSiteCatalyst"; version="1.4.16"; sha256="1plcmxj6sahdy3vvcmxry8cbq1j23bqzhnhn593bkwmzczka24cy"; depends=[base64enc digest httr jsonlite plyr stringr]; }; @@ -3585,9 +3609,11 @@ in with self; { RSurvey = derive2 { name="RSurvey"; version="0.9.3"; sha256="0yk969jdvpgv01zbmk4zyxcmrbdizh37bddj1k128ndyf191z37x"; depends=[colorspace inlmisc MBA raster rgdal rgeos sp]; }; RSvgDevice = derive2 { name="RSvgDevice"; version="0.6.4.4"; sha256="0vplac5jzg6bmvbpmj4nhiiimsr9jlbk8mzyifnnndk9iyf2lcmz"; depends=[]; }; RSwissMaps = derive2 { name="RSwissMaps"; version="0.1.0.1"; sha256="16sdd0115793yj74i9m64yfxxn3gkk4nvb0qk2w8j7jjbqhflis0"; depends=[downloader dplyr ggplot2]; }; + RTCC = derive2 { name="RTCC"; version="0.1.0"; sha256="11z5db4y7nfacp1xgmxa1dsain9sz4634ydnpa4rngcw2q3mx68p"; depends=[matrixStats Rcpp testthat vegan]; }; RTConnect = derive2 { name="RTConnect"; version="0.1.4"; sha256="1000jmmqzyhl6vh1ii75jdh88s9inaz52gvfwcin2k2zr7bi91ba"; depends=[]; }; RTD = derive2 { name="RTD"; version="0.1.1"; sha256="1f36wn9f7wjadvll234m97wqfj4adpvif4x0ywn4wfk91cwa5zib"; depends=[httr jsonlite openssl readr urltools]; }; RTDE = derive2 { name="RTDE"; version="0.2-1"; sha256="1dkv0g760384jmyypffl5kbnsancjx272j91ffpgmg3lmsy8nhqq"; depends=[]; }; + RTL = derive2 { name="RTL"; version="0.1.1"; sha256="1p5i9khwa470hc9bhxlxqh8w5vp73jcsr45mrhwpcyz3i2dlzdzr"; depends=[dplyr EIAdata fabletools feasts fGarch fitdistrplus forecast ggplot2 httr lubridate magrittr PerformanceAnalytics plotly purrr Quandl quantmod readr stringr tibble tibbletime tidyquant tidyr timetk tsibble xts zoo]; }; RTOMO = derive2 { name="RTOMO"; version="1.1-6"; sha256="03jb96ahzgp662vj2v65giv8ss61vad5w26kvq8hg9q06z879jza"; depends=[GEOmap RPMG RSEIS splancs]; }; RTaxometrics = derive2 { name="RTaxometrics"; version="2.3"; sha256="02446y86g21i37ycavg0xc1ggxk0k93d38n71fis9fav06lywxx3"; depends=[]; }; RTest = derive2 { name="RTest"; version="1.2.6"; sha256="0f7wxscswkg2r6isp0vjfs44dbgqijmh97p053w2mcqi6z1s5cip"; depends=[base64 glue jsonlite magick magrittr rlang stringr testthat XML]; }; @@ -3596,7 +3622,7 @@ in with self; { RTransferEntropy = derive2 { name="RTransferEntropy"; version="0.2.12"; sha256="066wyama0gk81l6kc0n31cmf007i1975i7hzvf46qbldvhsc52mc"; 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-74"; sha256="0m4xynjjl72znnxrpific8haqff33jsimn6ksaf96aims347lpgv"; depends=[ade4 boot car FactoMineR lme4 MASS mixOmics nnet pls pspearman vegan]; }; + RVAideMemoire = derive2 { name="RVAideMemoire"; version="0.9-75"; sha256="14wgxly7lc301i7avby3sy1prjr0bfyvky1krn89j217mz12qk1p"; depends=[ade4 boot car FactoMineR lme4 MASS mixOmics nnet pls pspearman vegan]; }; RVFam = derive2 { name="RVFam"; version="1.1"; sha256="0gw8rgq11zndnqmay6y3y5rmmljvwhxzm2pqa90vs5413dnchq92"; depends=[coxme kinship2 lme4 MASS Matrix survival]; }; RVenn = derive2 { name="RVenn"; version="1.1.0"; sha256="016m00xv59lkwm2is32v5nr4lw5a1ymdnz34r3ffflcv9bfrc6n4"; depends=[ggforce ggplot2 magrittr pheatmap purrr rlang vegan]; }; RVerbalExpressions = derive2 { name="RVerbalExpressions"; version="0.1.0"; sha256="1p9wmpgqwnz95sr8km8y6kqax8fcz6sqg54wfdx44kiqkf1ybdsp"; depends=[magrittr]; }; @@ -3605,16 +3631,16 @@ in with self; { RVowpalWabbit = derive2 { name="RVowpalWabbit"; version="0.0.13"; sha256="106lr6iz28gscczs18759zaki7dnxy1873swiakimfqmwpw9dp9n"; depends=[Rcpp]; }; RVtests = derive2 { name="RVtests"; version="1.2"; sha256="0k7w6ml981zvr5bix197qw4kaf7rz5jqnwqlxf7aryxbm39gk16c"; depends=[glmnet pls spls]; }; 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]; }; + RWDataPlyr = derive2 { name="RWDataPlyr"; version="0.6.3"; sha256="14p347v8vgbw471j3nxxn69cxpljriy9hp9haq6gnhx6d0739rcd"; depends=[data_table dplyr feather Rcpp tibble tidyr xts zoo]; }; RWebLogo = derive2 { name="RWebLogo"; version="1.0.3"; sha256="1n65mlnr163ywjnyyngnigbj0wpgkr38c3nx8hw5r8mwjnf3d617"; depends=[findpython]; }; - RWeka = derive2 { name="RWeka"; version="0.4-41"; sha256="1grsq6wkvci2hs0vcr9zwrf7iyfrlxwag43l0k5hf8icazp8ffmf"; depends=[rJava RWekajars]; }; + RWeka = derive2 { name="RWeka"; version="0.4-42"; sha256="0111n0hr3a2gjd2pv5vlh8mian6k86cp0xrw0yyh6ijxhwl31rc4"; depends=[rJava RWekajars]; }; RWekajars = derive2 { name="RWekajars"; version="3.9.3-2"; sha256="06nsylv65z9hxym1b6qnwllh306bq5phsgr0qn4nyr5im8cv1rhn"; depends=[rJava]; }; - RWiener = derive2 { name="RWiener"; version="1.3-1"; sha256="0w12xvc18l002m8q6ad3laa667xzqjbcfqf0vvcmicgw2j3bbq6h"; depends=[]; }; + RWiener = derive2 { name="RWiener"; version="1.3-2"; sha256="1sk4racp77jbhjaqkghalg139aznchyn1yknyrv975ck040zs8cw"; depends=[]; }; RWildbook = derive2 { name="RWildbook"; version="0.9.3"; sha256="1pznzmv8n33hhj61h07fha1gzafcx705n8323cnz3mx6ziijfh28"; depends=[data_table jsonlite marked]; }; - RWsearch = derive2 { name="RWsearch"; version="4.6.2"; sha256="1sak4ihzvba83q1zvn65983qz50cb1nbz1mwiasr3bzz27hhdp4a"; depends=[brew latexpdf networkD3 sig sos XML]; }; - RXKCD = derive2 { name="RXKCD"; version="1.8-2"; sha256="081zrx293z4009p6fj2za0mkf04nikxmg3i45l667qvy7nmajqlc"; depends=[jpeg png RJSONIO]; }; + RWsearch = derive2 { name="RWsearch"; version="4.7.0"; sha256="1h6m5h9kbb3sl49ppaazac4y0nz57xw87sh9f4m50immg33il16z"; depends=[brew latexpdf networkD3 sig sos XML]; }; + RXKCD = derive2 { name="RXKCD"; version="1.9.2"; sha256="1yk12ic6kdbwc44ppag2yfnga7xjmifkglhvcw93vc3qg469mm15"; depends=[jpeg plyr png RJSONIO]; }; RXMCDA = derive2 { name="RXMCDA"; version="1.5.5"; sha256="1ci73q8xf3xxqw8b7sk83v5vz2cqgcb4lkx7qi3hd1ff4xkz1fpa"; depends=[kappalab XML]; }; - RXshrink = derive2 { name="RXshrink"; version="1.3.1"; sha256="1kj661g4dkdnnkrc7vh7qpvfrgj77db6lwvvlpbynn8n3l3qbg94"; depends=[lars]; }; + RXshrink = derive2 { name="RXshrink"; version="1.3.2"; sha256="00igwc4v2dc9328akrqswac7f4hn4ij03x9ck932xd0l67zfp8ah"; depends=[lars]; }; RYandexTranslate = derive2 { name="RYandexTranslate"; version="1.0"; sha256="0qrv5mnnkn5fs7vx6i74z46s0qj9f98km5bizgj00832qyrq8q1s"; depends=[httr jsonlite RCurl]; }; RYoudaoTranslate = derive2 { name="RYoudaoTranslate"; version="1.0"; sha256="1i3iyqh97vpn02bm66kkmw52ni29js30v18n2aw8pvr88jpdgxm4"; depends=[RCurl rjson]; }; RZabbix = derive2 { name="RZabbix"; version="0.1.0"; sha256="0c5803chpzvp7dk9pjfx5f0nqynb76ywakz04ah2nw07ypvcyjyr"; depends=[httr jsonlite]; }; @@ -3622,13 +3648,12 @@ in with self; { RZooRoH = derive2 { name="RZooRoH"; version="0.2.3"; sha256="0ihfc8hxqmlkx1xhkz3psw8szwjp01imasvynxbzrjmjf4q6amvq"; depends=[data_table doParallel foreach iterators RColorBrewer]; }; RaPKod = derive2 { name="RaPKod"; version="0.9"; sha256="1qxzi2lf431zd44bcd98ybhzydy1cz12g864l6r668jk91aqy1qg"; depends=[kernlab MASS proxy Rcpp RcppArmadillo]; }; RaProR = derive2 { name="RaProR"; version="1.1-5"; sha256="11hwg609pjcd13qnbchbs86c3q8f4nmh1xfxg3dsiijljl6lzx3n"; depends=[]; }; - RaceID = derive2 { name="RaceID"; version="0.1.7"; sha256="0rpjcd3vgzd09mfjxc8ji73ncl6d7f5zkv1z1f2nzpz9rhxpd3sp"; depends=[cluster coop FateID FNN fpc ggplot2 ica igraph irlba locfit MASS Matrix pheatmap propr quadprog randomForest RColorBrewer Rcpp Rtsne umap vegan]; }; + RaceID = derive2 { name="RaceID"; version="0.1.8"; sha256="0pkn9fdf0xi55nrylmqris9by1ywy3mcxkj0bcf4gp6knyqz6wz0"; depends=[cluster coop FateID FNN fpc ggplot2 ica igraph irlba locfit MASS Matrix pheatmap propr quadprog randomForest RColorBrewer Rcpp Rtsne umap vegan]; }; RadData = derive2 { name="RadData"; version="1.0.0"; sha256="14npn5vjcpvymdjkby83msjr3f1gsmzh0083gz6cgrp270fglkaw"; depends=[]; }; RadOnc = derive2 { name="RadOnc"; version="1.1.5"; sha256="0yz2pzcpz32xs04xfs90i714nn28cky7701w1h99cqsxsp892jkq"; depends=[geometry oro_dicom ptinpoly rgl]; }; RadTran = derive2 { name="RadTran"; version="1.0"; sha256="1sb8d4y3b37akbxhdavxrkp34zn3ip061b7gzy0ga57pyn76cvpn"; depends=[ReacTran rootSolve]; }; - RadioGx = derive2 { name="RadioGx"; version="0.0.2"; sha256="1ls56zxsa5l6925ig7d9n3ffns1x0jkbd3zdk530nlffkralwz0k"; depends=[Biobase caTools cluster CoreGx KernSmooth magicaxis Matrix PharmacoGx RColorBrewer reshape2 scales]; }; RadioSonde = derive2 { name="RadioSonde"; version="1.4"; sha256="1v9jdpynmb01m3syhas1s08xxlvjawhlvjkyhils2iggi4xw4hiq"; depends=[]; }; - Radviz = derive2 { name="Radviz"; version="0.8.1"; sha256="1kk8xjlcyb52grj0xgjdkpx658678plrx1a3cfaf37xmvspid5j8"; depends=[dplyr ggplot2 rlang]; }; + Radviz = derive2 { name="Radviz"; version="0.9.1"; sha256="15zz426pqr8wv6wcyj3gnflvslz0123lwhk7878gk794fz74a7yi"; depends=[dplyr ggplot2 hexbin igraph pracma Rcpp RcppArmadillo rlang]; }; RagGrid = derive2 { name="RagGrid"; version="0.2.0"; sha256="0crnpd75lyhd0awzqzqy7bzw4ydgxpyhy1ybb1ff4qsnisbjdbba"; depends=[crosstalk htmltools htmlwidgets knitr]; }; RainfallErosivityFactor = derive2 { name="RainfallErosivityFactor"; version="0.1.0"; sha256="16yrr2bl62m1nr81nzvmdq7s78f7fg50dah5dg5q4j4j7z8qfsqz"; depends=[]; }; Ramble = derive2 { name="Ramble"; version="0.1.1"; sha256="0225za85i5nvf8l89i5bz7nxsxykd3v9fp1wgihmncca6n8vhgpl"; depends=[]; }; @@ -3637,18 +3662,17 @@ in with self; { RandPro = derive2 { name="RandPro"; version="0.2.0"; sha256="1bhbg6lvgr9h6rq3g3ljm2422ngjb18maj80l7f659ql88c8h6mj"; depends=[caret e1071]; }; RandVar = derive2 { name="RandVar"; version="1.2.1"; sha256="17c6bx644n604zpggmwx1z3krgd9v7c88il45cf5yhp7zf7cc718"; depends=[distr distrEx startupmsg]; }; RandomCoefficients = derive2 { name="RandomCoefficients"; version="0.0.2"; sha256="04l0aczrlbkjk0687w2gxs85ia71yy69mgankwkl37ksznh6y81m"; depends=[fourierin ks orthopolynom polynom RCEIM rdetools robustbase sfsmisc snowfall statmod tmvtnorm VGAM]; }; - RandomFields = derive2 { name="RandomFields"; version="3.3.7"; sha256="0fnl1450k33vn49x0gc6xljhrrbcb2m7bl9dpn5r8v6yqk2hwjjx"; depends=[RandomFieldsUtils sp]; }; + RandomFields = derive2 { name="RandomFields"; version="3.3.8"; sha256="1l4r67vmdisdawlhv6l4lqsn5i8wg2p1hs7v5553b3j2mvyy424a"; 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]; }; RankAggreg = derive2 { name="RankAggreg"; version="0.6.5"; sha256="031mff1zydxqygx8bn3g0qpwq08kaq5bpmzy6z2y0fa03hgsxz5c"; depends=[gtools]; }; RankResponse = derive2 { name="RankResponse"; version="3.1.1"; sha256="04s588zbxcjgvpmbb2x46bbf5l15xm7pwiaxjgc1kn1pn6g1080c"; depends=[]; }; - Rankcluster = derive2 { name="Rankcluster"; version="0.94.1"; sha256="1zc6cqbifs3qhd64dm4991sj1i8mxkdm5z797c4816j4hq7z3nn9"; depends=[Rcpp RcppEigen]; }; - RankingProject = derive2 { name="RankingProject"; version="0.1.1"; sha256="1n1282pym7q2b1bh18wlkmk9f0simzq149h7hacc23vyqzgkjs84"; depends=[]; }; + Rankcluster = derive2 { name="Rankcluster"; version="0.94.2"; sha256="1wm7vbv2a4py9yjpcqrzcpfig18n02ip4qkqi62rw32abdlmz6sx"; depends=[Rcpp RcppEigen]; }; + RankingProject = derive2 { name="RankingProject"; version="0.2.0"; sha256="1y2sydppi7y7j9c7r6xcqfm4v9z646w48pnksf11da8lq2nczww8"; depends=[]; }; RapidPolygonLookup = derive2 { name="RapidPolygonLookup"; version="0.1.1"; sha256="0h4snn3haa4a5rkafg98419by4nnz219wsm3y0dqgm4hw4bvha0g"; depends=[PBSmapping RANN RgoogleMaps sp]; }; Rarity = derive2 { name="Rarity"; version="1.3-6"; sha256="1m742qrgc0c5vda9sb2q5n3ghmqnlnfhr1cfpxfs7s5ic707gmlb"; depends=[]; }; RaschSampler = derive2 { name="RaschSampler"; version="0.8-8"; sha256="0y7dkgv1cy6r1mbmyqm27qwl10rl12g1svpx9jkzq5hq0hnm2xhw"; depends=[]; }; Rata = derive2 { name="Rata"; version="0.0.2"; sha256="1s7am08691lil5hbd8jpa5wnbvr0qqf0gkxczpm6yvizbjpx16qx"; depends=[ggplot2 glpkAPI lpSolveAPI reshape2 Rirt]; }; - RateDistortion = derive2 { name="RateDistortion"; version="1.01"; sha256="1micjlbir1v5ar51g1x7bgkqw9m8217qi82ii6ysgjkhwdvpm075"; depends=[]; }; RatingScaleReduction = derive2 { name="RatingScaleReduction"; version="1.2.2"; sha256="15xkfjp0bkx9wjp8y27vs0iq2ir4qxjdl8405ix59sjb6lkvv3l2"; depends=[ggplot2 pROC]; }; RationalExp = derive2 { name="RationalExp"; version="0.2.2"; sha256="0a51sfps3sfb71m93jdsmbvj6kafbyfrq790ix238j570f5xafpg"; depends=[snowfall]; }; Rbeast = derive2 { name="Rbeast"; version="0.2.2"; sha256="12i6jm7x1hwkj6skva9sli02rm4krzb2gmzny68d9cjhdcan5baq"; depends=[]; }; @@ -3658,25 +3682,24 @@ in with self; { RblDataLicense = derive2 { name="RblDataLicense"; version="0.2.2"; sha256="1xra0sn4s8rrjmayg36jg6l3i1cvx9ngh30xyhi18226h0qinx9n"; depends=[RCurl xts]; }; Rblpapi = derive2 { name="Rblpapi"; version="0.3.10"; sha256="14wkrjfbjc3rb3159sz8wdvshmrh3d17s01swp59s8if7hr94hq0"; depends=[BH Rcpp]; }; Rborist = derive2 { name="Rborist"; version="0.2-3"; sha256="0qf4m6ibr4mlrmsybb5b8f1hkmp9n6ksjsxc4msd3q4rr99zkczk"; depends=[data_table digest Rcpp]; }; - Rcan = derive2 { name="Rcan"; version="1.3.80"; sha256="1p9df622sqgmfxargwj63pgpdhqr1bc66y07sr6dv1j038776ysj"; depends=[data_table ggplot2 scales]; }; + Rcan = derive2 { name="Rcan"; version="1.3.81"; sha256="0w3c0hlhnkxgzd8ibddprisry3x45blbpxjkcgcldfnnyj5l7mpv"; depends=[data_table ggplot2 scales]; }; Rcapture = derive2 { name="Rcapture"; version="1.4-3"; sha256="1rk1zgab6zi7hcmyqlb18kycv3cd15c7lwhw5kig96f2n3xymzig"; depends=[]; }; RcellData = derive2 { name="RcellData"; version="1.3-2"; sha256="1zzkgpj2pc42xzz5pspyj981a04gjpna4br3lxna255366ijgz4l"; depends=[]; }; Rcereal = derive2 { name="Rcereal"; version="1.2.1"; sha256="0nl4p0wqpni16z62610sqcxsz1x6kannl2s1zakpmjkk80pyxlk6"; depends=[]; }; RcextTools = derive2 { name="RcextTools"; version="0.1.1"; sha256="1rrij4ryspff9mn1c3jlzjprnipak7nzlb488pk0ci0awaccp5ga"; depends=[data_table igraph sqldf visNetwork]; }; Rcgmin = derive2 { name="Rcgmin"; version="2013-2.21"; sha256="02igq7bdlxwa7ysfiyvqfhcvgm866lrp2z3060z5lmnp6afa0958"; depends=[numDeriv]; }; - RchivalTag = derive2 { name="RchivalTag"; version="0.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]; }; - RclusTool = derive2 { name="RclusTool"; version="0.91.2"; sha256="07d295fyiv0f19q75cppyqrac7fxlh2yx85nlmarkc6p3072jyrq"; depends=[class cluster conclust corrplot e1071 factoextra FactoMineR ggplot2 jpeg MASS mclust mda mmand nnet png randomForest reshape sp stringi stringr tcltk2 tkrplot]; }; + RchivalTag = derive2 { name="RchivalTag"; version="0.1.1"; sha256="0kcnzcpj2x23s2d75v6bk3rcp78c38b2dw28afndarmjl6ipzy24"; depends=[mapdata maps maptools ncdf4 oceanmap PBSmapping plyr pracma raster readr rgeos sp]; }; + RclusTool = derive2 { name="RclusTool"; version="0.91.3"; sha256="0f6v2p6dg3fq3vzys6hgwmmgyrxfj2kb4wpbywd7f9p5yd9cfd88"; depends=[class cluster conclust corrplot e1071 factoextra FactoMineR ggplot2 jpeg MASS mclust mda mmand nnet png randomForest reshape sp stringi stringr tcltk2 tkrplot]; }; Rcmdr = derive2 { name="Rcmdr"; version="2.6-2"; sha256="1fv4qx4w9x3gi64vba9qdkp6kghl83z5q7mmdjx7068n484kyhm1"; depends=[abind car effects lme4 RcmdrMisc relimp tcltk2]; }; RcmdrMisc = derive2 { name="RcmdrMisc"; version="2.7-0"; sha256="08k4x957x08cmhad1r5w502zan13gmcfap16wjfb92b4v3f6dzqy"; 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]; }; RcmdrPlugin_EACSPIR = derive2 { name="RcmdrPlugin.EACSPIR"; version="0.2-2"; sha256="10r6rb0fwlilcnqxa38zh7yxc54x1a0by5x4f6gzdn9zs7aj5l1r"; depends=[abind ez nortest R2HTML Rcmdr RcmdrMisc reshape]; }; RcmdrPlugin_EBM = derive2 { name="RcmdrPlugin.EBM"; version="1.0-10"; sha256="02zips1jbfn7cshjlrm1gr632px2zxlys8i0f1nrf1gifl44v1qw"; depends=[abind epiR Rcmdr]; }; - RcmdrPlugin_EZR = derive2 { name="RcmdrPlugin.EZR"; version="1.41"; sha256="0h84rr7scqpds1z0mbmsrhxppdh9rxykc5chvzvniab9hz2h7p05"; depends=[Rcmdr readstata13]; }; + RcmdrPlugin_EZR = derive2 { name="RcmdrPlugin.EZR"; version="1.41.1"; sha256="0nfb2fdhag4593rmbfi4s4lbsbx76yizfn06rrch4q0sshhrg06m"; depends=[Rcmdr readstata13]; }; RcmdrPlugin_EcoVirtual = derive2 { name="RcmdrPlugin.EcoVirtual"; version="1.0"; sha256="0q879wnrmgbaddv883q9zdnp0i7kjcgn8cffv7lp8nrsqil6l7mc"; depends=[EcoVirtual Rcmdr]; }; RcmdrPlugin_Export = derive2 { name="RcmdrPlugin.Export"; version="0.3-1"; sha256="17fn3si6b6h20c52k1k6fv9mslw3f9v0x1kxixzcvq54scdx0sk0"; depends=[Hmisc Rcmdr xtable]; }; - RcmdrPlugin_FactoMineR = derive2 { name="RcmdrPlugin.FactoMineR"; version="1.6-0"; sha256="07k9x3mdaqzk1503wjsha9f8bxzw1074i9g7sa16yqz5lwky4lr7"; depends=[FactoMineR Rcmdr]; }; + RcmdrPlugin_FactoMineR = derive2 { name="RcmdrPlugin.FactoMineR"; version="1.7"; sha256="1145rpzhq219sl0j2bg5xa0ihq13lmr7ahcn3db4a8mqlz2fp8zy"; depends=[FactoMineR Rcmdr]; }; RcmdrPlugin_FuzzyClust = derive2 { name="RcmdrPlugin.FuzzyClust"; version="1.1"; sha256="1lg6k3h4n45s6wjkl3ycwfngfr2i6mkhirifhbazsvv297bg0iba"; depends=[clue doParallel foreach ggplot2 iterators MASS Rcmdr reshape2 tcltk2 tkrplot]; }; RcmdrPlugin_GWRM = derive2 { name="RcmdrPlugin.GWRM"; version="1.0.2"; sha256="01q4k9s815pgd5cavm6nyxy5npmpxryari9v6wys4n5cjpn5g6xq"; depends=[GWRM Rcmdr RcmdrMisc]; }; RcmdrPlugin_HH = derive2 { name="RcmdrPlugin.HH"; version="1.1-47"; sha256="1bba11izs1jhjsyb0d45c34gcihapk231qbiabcxf8x93sdmg6ga"; depends=[HH lattice mgcv Rcmdr]; }; @@ -3711,25 +3734,26 @@ 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.3"; sha256="03h3zyjq948y0hrrs95lfk4zgx6wfrg64hjlrfrzf5na7bfh0d9b"; depends=[]; }; + Rcpp = derive2 { name="Rcpp"; version="1.0.4"; sha256="1m80pdhzi2p82db5xkbwc2m3fzv6df59955yj03nlq40fj7zx4nr"; 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.3.5"; sha256="0ir4m5lzph27c2cwxj32fds4ghx6n3mamxyakkpgr2arbd3sa3zq"; depends=[gmp Rcpp RcppThread]; }; - RcppAnnoy = derive2 { name="RcppAnnoy"; version="0.0.14"; sha256="1wiigx5g5788j6lyc3f6bs1rsvc4alyc3052g35hxl1giinxmhn4"; depends=[Rcpp]; }; - RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.9.800.4.0"; sha256="1csh54v4d0ccwmk4bqj4rca1d5rqpafvb4459x3q6k9sys0charx"; depends=[Rcpp]; }; + RcppAPT = derive2 { name="RcppAPT"; version="0.0.6"; sha256="0gkvs276hwa4yzd1bwf12p83cq2i1k021nq4y6ll1gcrj41mkdns"; depends=[Rcpp]; }; + RcppAlgos = derive2 { name="RcppAlgos"; version="2.4.1"; sha256="0s97v2agy8pzaqfjm7cabpfxpkidxl1zwi4vkjdhsfzxjp5xwwms"; depends=[gmp Rcpp RcppThread]; }; + RcppAnnoy = derive2 { name="RcppAnnoy"; version="0.0.16"; sha256="0bfa35lp6vc4b0h3ymvdx50br233q8vvyjml34ngi81rj0imz3fr"; depends=[Rcpp]; }; + RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.9.850.1.0"; sha256="0q9clhmbwwph47hrhx5827m7njrcl2klihyqbkf0ihwlbqrjijwz"; depends=[Rcpp]; }; RcppBDT = derive2 { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[BH Rcpp]; }; - RcppCCTZ = derive2 { name="RcppCCTZ"; version="0.2.6"; sha256="1bkrzdcm18z7qfkcfq5yc4s8z6a43y6cfsa09k6j9ni9bl2pd6hf"; depends=[Rcpp]; }; + RcppCCTZ = derive2 { name="RcppCCTZ"; version="0.2.7"; sha256="0q4vj0dh04m2v2p8x0wd78hbfxzj4zi1nmp52ndwnirhs6zfny4l"; depends=[Rcpp]; }; RcppCNPy = derive2 { name="RcppCNPy"; version="0.2.10"; sha256="175bn75akwgz3vcp0n59kiqqz7q9cwkvih241nj8v810cp4gpmkp"; depends=[Rcpp]; }; RcppCWB = derive2 { name="RcppCWB"; version="0.2.8"; sha256="15iiv5kwh7c3pprpyyvjnbj80x9245f3zmfiy41w661n3cnka68p"; depends=[Rcpp]; }; RcppClassic = derive2 { name="RcppClassic"; version="0.9.12"; sha256="0v9v34i1c4dkplavdl14kz1k2rnk4hsaiyv6rkc9403z9isvzzr0"; depends=[Rcpp]; }; RcppClassicExamples = derive2 { name="RcppClassicExamples"; version="0.1.2"; sha256="0dr2104miy7psr73nicfs84652ai0d5liw6wxcwyrx7fmys3p638"; depends=[Rcpp RcppClassic]; }; 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]; }; + RcppDate = derive2 { name="RcppDate"; version="0.0.1"; sha256="0psa7drm6chwn5w3h6yhaavf33mvzfaghzqa404l5yvxczy22xqi"; depends=[]; }; RcppDist = derive2 { name="RcppDist"; version="0.1.1"; sha256="02g57xwfipdcljv06krhm02dbqn9kfyj2km6rdg0a7vq9prwdz1x"; depends=[Rcpp RcppArmadillo]; }; RcppDynProg = derive2 { name="RcppDynProg"; version="0.1.3"; sha256="099hbm355d30rwxqjd7j4dfw678551dc5v4y7yy6q4xxyf527lbs"; depends=[Rcpp RcppArmadillo wrapr]; }; RcppEigen = derive2 { name="RcppEigen"; version="0.3.3.7.0"; sha256="1b78qcjim0n9klgkr82n794d6bj9r9f33g0kcsszsns2hir65sk2"; depends=[Matrix Rcpp]; }; RcppEigenAD = derive2 { name="RcppEigenAD"; version="1.0.0"; sha256="18zm9hsfqwiicxsdm87ix3qc261ljxxn2s736p6aayx82b6vwkz6"; depends=[BH functional memoise Rcpp RcppEigen Rdpack readr]; }; - RcppEnsmallen = derive2 { name="RcppEnsmallen"; version="0.2.11.1.1"; sha256="18m2ij98zsp897w9dwr8pjkrmqkjlgsxwiwa939i3cj75sjj3snh"; depends=[Rcpp RcppArmadillo]; }; + RcppEnsmallen = derive2 { name="RcppEnsmallen"; version="0.2.11.3.1"; sha256="03868qkz8miayjbgwlccrwqiy4yv7f3gmp89i4c96xs7q3ijwynn"; depends=[Rcpp RcppArmadillo]; }; RcppExamples = derive2 { name="RcppExamples"; version="0.1.9"; sha256="0568zipgjxgmx086mlfpp5n7v8kf50gwrylvhl1bgvzb2vvr9dhj"; depends=[Rcpp]; }; RcppFaddeeva = derive2 { name="RcppFaddeeva"; version="0.1.0"; sha256="1rah18sdfmbcxy83i7vc9scrwyr34kn9xljkv9pa31js68gn2jrl"; depends=[knitr Rcpp]; }; RcppGSL = derive2 { name="RcppGSL"; version="0.3.7"; sha256="0cnw2k7cfqrm79r6j283aybflxig80x4n4rjkfp2317wf10mrsa5"; depends=[Rcpp]; }; @@ -3743,12 +3767,13 @@ in with self; { RcppMsgPack = derive2 { name="RcppMsgPack"; version="0.2.3"; sha256="0ffdw5ckkax8j87q0ykjhyp45l7gvxjppdi73kc4r5qxvijll2g3"; depends=[BH Rcpp]; }; RcppNLoptExample = derive2 { name="RcppNLoptExample"; version="0.0.1"; sha256="1fml6hpa12q0lgg5fg6fi9lz6mckwh345pbh95mld2qagzvmg01n"; depends=[nloptr Rcpp]; }; RcppNumerical = derive2 { name="RcppNumerical"; version="0.4-0"; sha256="1a92fql6mijhnr1kxkcxwivf95pk9lhgmhzkshs51h0ybfv5krik"; depends=[Rcpp RcppEigen]; }; - RcppParallel = derive2 { name="RcppParallel"; version="4.4.4"; sha256="0p13f2mywjr7gmskf8ri4y8p5yr1bvr4xrpw2w11vdvafwz1vcia"; depends=[]; }; - RcppProgress = derive2 { name="RcppProgress"; version="0.4.1"; sha256="0yk01hfv961zyp569682k9igvhnwqyg5j0n5fm63sxigj82l2xhi"; depends=[]; }; + RcppParallel = derive2 { name="RcppParallel"; version="5.0.0"; sha256="1mhd6vp47xmfw533h0pkvydv96m57fspvd85g8m7iqb5rcxvhhdb"; depends=[]; }; + RcppProgress = derive2 { name="RcppProgress"; version="0.4.2"; sha256="0j2b37gwjpgmrnr00srdzm751hzlpsjb54ph63xxmcdfnwhlnqmi"; depends=[]; }; RcppQuantuccia = derive2 { name="RcppQuantuccia"; version="0.0.3"; sha256="0cj95y8jcjm33d65y42f5ijw775kq3mh2p0659mp3i3r9fvaishk"; depends=[BH Rcpp]; }; RcppRedis = derive2 { name="RcppRedis"; version="0.1.10"; sha256="07cxp0xdrg1bydlvgryf8jivlqicd880xdfdz6grhqqdxwss8qv1"; depends=[BH RApiSerialize Rcpp]; }; RcppRoll = derive2 { name="RcppRoll"; version="0.3.0"; sha256="0srzfhzkk42kzrdjnhbb37946jp1p688rgysy6k3i2is8jb21zyb"; depends=[Rcpp]; }; RcppSMC = derive2 { name="RcppSMC"; version="0.2.1"; sha256="0k2k1pj05i6hf7gpar3r4mbv9cs04bd4v657saq9vhy30300vg49"; depends=[Rcpp RcppArmadillo]; }; + RcppSimdJson = derive2 { name="RcppSimdJson"; version="0.0.4"; sha256="1bpsrbjhh9l84h2na2dk08xhd5k72vpha6zg0f81f373ckmvd6b3"; depends=[Rcpp]; }; RcppStreams = derive2 { name="RcppStreams"; version="0.1.3"; sha256="06il7q3afaws57m0fxf04f2p5dvs23l1f7gl78pxwzclacdy3839"; depends=[BH Rcpp]; }; RcppTN = derive2 { name="RcppTN"; version="0.2-2"; sha256="0m2wc5n1fzxv56s4gqqnygb24dbadgrpgjm4bs4hr6qazgjapymf"; depends=[Rcpp]; }; RcppTOML = derive2 { name="RcppTOML"; version="0.1.6"; sha256="1nyv4ynryh8vcrzyq01nzj13is40bjhxazlj9ilapyjdv9h5w3bs"; depends=[Rcpp]; }; @@ -3759,7 +3784,7 @@ in with self; { RcppZiggurat = derive2 { name="RcppZiggurat"; version="0.1.5"; sha256="0zmr3nvm5j0fpwxk3x9kxpwqbr66ldfvd10zy8xlgjbslz9myvfv"; depends=[Rcpp RcppGSL]; }; Rcrawler = derive2 { name="Rcrawler"; version="0.1.9-1"; sha256="1m6b1h72h8qjqcg3lzw6im6lpnkxhjg65g9fdjjqay6vy52ynznj"; depends=[callr data_table doParallel foreach httr jsonlite selectr webdriver xml2]; }; Rcriticor = derive2 { name="Rcriticor"; version="2.0"; sha256="1cnmmcdp2g3syrlld1pm7101cbzxh02cpvqvgsj7mp6zxm2k5plv"; depends=[]; }; - Rcsdp = derive2 { name="Rcsdp"; version="0.1.55"; sha256="1sskjf2vv5alnwirz676d8yphzk2a69wkghhkpxb8my1rjlfdgaw"; depends=[]; }; + Rcsdp = derive2 { name="Rcsdp"; version="0.1.57.1"; sha256="1dya0c0fcwr6ydcamz8m06nnq0b80vg7b22dg5jv3qi1n1fgp4lv"; depends=[]; }; Rcssplot = derive2 { name="Rcssplot"; version="1.0.0"; sha256="0hnzwjwk9zh4zbzy8sa0z6amikvpd9k1p1abd38khr8q8k1k8jiv"; depends=[]; }; Rd2md = derive2 { name="Rd2md"; version="0.0.2"; sha256="07j1nnsk5nyl8kvgvh9f684g6bhc01jiq1fcmq2pnpx57jdzfbpi"; depends=[knitr]; }; Rd2roxygen = derive2 { name="Rd2roxygen"; version="1.9"; sha256="029f85visar52002hdpfw5r2zq37kzbr8rgji76nnqi08jk0if4n"; depends=[formatR roxygen2]; }; @@ -3769,18 +3794,19 @@ in with self; { Rdpack = derive2 { name="Rdpack"; version="0.11-1"; sha256="080y15p2hl4jsq91ak2f1y2kx1iqq5c5wzyx3zyhjwp01cahy0jq"; depends=[bibtex gbRd]; }; Rdrools = derive2 { name="Rdrools"; version="1.1.1"; sha256="0awdj1q9ysrhwli16izi0lb6pppqxs1lb6wlv40111q483p41fj7"; depends=[dplyr magrittr purrr Rdroolsjars rJava rlang tibble]; }; Rdroolsjars = derive2 { name="Rdroolsjars"; version="1.0.1"; sha256="1l9bc1bwpj10irr973hzkhr04i1f3g998n8hcl2k2i9kgv1naqmz"; depends=[rJava]; }; - Rdsdp = derive2 { name="Rdsdp"; version="1.0.4-2"; sha256="05bk6yqvhzvyfzga1dz34w68nlwl2dc8bvhh3ghd07a61fsnkg4x"; depends=[]; }; + Rdsdp = derive2 { name="Rdsdp"; version="1.0.5"; sha256="04268fbajm7pgi5mxpghzw0yjwwx1dy9vdi6yhr20q2lmi6xh19w"; depends=[]; }; Rdsm = derive2 { name="Rdsm"; version="2.1.1"; sha256="07fc6c2hv0vvg15va552y54cla1mrqsd75w3zh02vc7yd226l4rj"; depends=[bigmemory]; }; Rdta = derive2 { name="Rdta"; version="1.0.0"; sha256="1zmyh61wrzqwyfjbfcxg41cri7hy9r0jfwnixcvd086y0vxq7fdn"; depends=[MCMCpack mvtnorm Rdpack]; }; Rdtq = derive2 { name="Rdtq"; version="0.1"; sha256="114pyf95nl132014ygn84xi41c2zf1ii2wfgd1acwnnmfzvdw24s"; depends=[Matrix Rcpp]; }; Rduino = derive2 { name="Rduino"; version="0.1"; sha256="0r1yy3a2n8a4niasfjn77gv130a062i802r7xhbg0abljv5m6ra5"; depends=[serial]; }; ReCiPa = derive2 { name="ReCiPa"; version="3.0"; sha256="019vlvgxnqqlwghxygfqggzp2b4x2pqzdrbhaa703zdhm58k0n1g"; depends=[]; }; - ReIns = derive2 { name="ReIns"; version="1.0.8"; sha256="1piwmjav32cwki3jhxzv3ld59gddlm5y5dwc8smwk5gzpfypdzm6"; depends=[doParallel foreach Rcpp survival]; }; + ReDaMoR = derive2 { name="ReDaMoR"; version="0.4.2"; sha256="1bvhplbzn3axpl9vwygd209dmfm123ix3c2dpx1i09nhvy2v65lv"; depends=[colourpicker crayon dplyr DT igraph jsonlite magrittr markdown readr rintrojs rstudioapi shiny shinyjs visNetwork]; }; + ReIns = derive2 { name="ReIns"; version="1.0.9"; sha256="1lvc39l42zwyrsr1s5zlj34rmi1i6pvp80z5jgkql0hr9i78fmq9"; depends=[doParallel foreach Rcpp survival]; }; ReacTran = derive2 { name="ReacTran"; version="1.4.3.1"; sha256="05c9jfvj134gy3by7m3r1fbar0m39vaydr7d2py9cakzs44fqfpj"; depends=[deSolve rootSolve shape]; }; RealVAMS = derive2 { name="RealVAMS"; version="0.4-3"; sha256="14jqrqza7bs11y1004wzi3bxkvkdfn43d82l0cyh6py8p37rfz28"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; }; Rearrangement = derive2 { name="Rearrangement"; version="2.1"; sha256="0q253nj62rl65vjsq6503r80qa2j35wac8lv7ydp9w260p28z923"; depends=[quantreg]; }; Recon = derive2 { name="Recon"; version="0.3.0.0"; sha256="11gag2bl00pcy7ysfycaa58qarh6aigznldkc4kkn2178bl4ii62"; depends=[rootSolve]; }; - RecordLinkage = derive2 { name="RecordLinkage"; version="0.4-11.2"; sha256="1gqf236bpxi0hbhv8bxscv78dwdb3z4x105qfyvzky01aydw5zgn"; depends=[ada data_table DBI e1071 evd ff ffbase ipred nnet rpart RSQLite xtable]; }; + RecordTest = derive2 { name="RecordTest"; version="0.1.2"; sha256="19gxghp8b56gbyv2crjq2bzgaw5m3agd467ihbwkkjqli8cisgip"; depends=[ggplot2]; }; 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=[]; }; @@ -3790,7 +3816,7 @@ in with self; { 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=[]; }; RegularizedSCA = derive2 { name="RegularizedSCA"; version="0.5.4"; sha256="1nw6hd9y2n1h3j1fqqkymz13xizv5xrsj93w702kkvkbwyl3yall"; depends=[colorspace ggplot2 gtools lattice mice psych RGCCA]; }; - ReinforcementLearning = derive2 { name="ReinforcementLearning"; version="1.0.4"; sha256="14xacbi0bfnb9yn5sn1zksc4av08qrncn0glmbfc9x9i88rfz5m2"; depends=[data_table ggplot2 hash]; }; + ReinforcementLearning = derive2 { name="ReinforcementLearning"; version="1.0.5"; sha256="0zk1hy4p5adyjm1430a8ad5acn9qaax1si8qqfxqayfmlj954sj9"; depends=[data_table ggplot2 hash]; }; RelValAnalysis = derive2 { name="RelValAnalysis"; version="1.0"; sha256="1jl1gfj44gfkmc1yp6g5wwn4miydwpvxwrg76rnkv9454zrc5pvp"; depends=[zoo]; }; Relatedness = derive2 { name="Relatedness"; version="2.0"; sha256="1aidklwk8q2wdfsmhlbd3vzq9kzsyh4wn1g28biyb6lq7iwq1hl4"; depends=[]; }; Relexon = derive2 { name="Relexon"; version="0.2.1"; sha256="1shq1v3y1jhrnkl3fdnrwv23zrh8dx0k7zwqcvn5dxpd3vzsxqxg"; depends=[readr]; }; @@ -3798,20 +3824,20 @@ in with self; { RelimpPCR = derive2 { name="RelimpPCR"; version="0.2.4"; sha256="0svfyh313wawzqx9hfb4cg0wn2ir6nd769z1k3dckdsb8d7xkh3q"; depends=[caret ggplot2 relaimpo reshape2 Rmisc]; }; Renext = derive2 { name="Renext"; version="3.1-0"; sha256="074djs4y71667aylpgh514pzijr90rgpzm4w5ayq9cgaqz22m3am"; depends=[evd numDeriv]; }; RenextGUI = derive2 { name="RenextGUI"; version="1.4-0"; sha256="0jfg4a85j06wxk8vq2q6j8md2kcss0s7k71218gfh9vybk7hl4h6"; depends=[gWidgets gWidgetstcltk R2HTML Renext]; }; - Renvlp = derive2 { name="Renvlp"; version="2.7"; sha256="1h65m1av2z5zj5mmhrf0vspnbws2dp6s6ihyrvcrm24ipcnkvinz"; depends=[Rsolnp]; }; + Renvlp = derive2 { name="Renvlp"; version="2.8"; sha256="1avpy3hz693qj4d64mg6085hd0w6igwl1gs63jcda08d10zy6hg6"; depends=[Rsolnp]; }; ReorderCluster = derive2 { name="ReorderCluster"; version="1.0"; sha256="0ss750frzvj0bm1w7zblmcsjpszhnbffwlkaw31sm003lbx9hy58"; depends=[gplots Rcpp]; }; RepaymentPlan = derive2 { name="RepaymentPlan"; version="0.1.0"; sha256="1fd4n24bd5s2kqmls7mmsidblaf8nzm97kz52mfsb6i6fci0pgah"; depends=[]; }; RepeatedHighDim = derive2 { name="RepeatedHighDim"; version="2.0.0"; sha256="1n9w4jb25pm0mmsahlfhkp9jmhgp5b21l1g85gm2wbxqkjsg7g0g"; depends=[MASS nlme]; }; Replicate = derive2 { name="Replicate"; version="1.2.0"; sha256="0kqy248c8n7qr5hwzvqm7flnjlwd60c577r1d4vzgfxn7azd5v3v"; depends=[ggplot2 metafor]; }; - Replication = derive2 { name="Replication"; version="0.1.1"; sha256="1jf08kd7zwsgrabg14p0ad5ga8gcr2xdiy5mgljb9hz4ffyhb6fs"; depends=[blavaan lavaan MASS mice quadprog rjags runjags]; }; Repliscope = derive2 { name="Repliscope"; version="1.1.0"; sha256="0hij4ng77bkd979ndbhx1nqq2rfb69q23ghyd7illgvgrc79y9mr"; depends=[colourpicker ggplot2 shiny]; }; RepoGenerator = derive2 { name="RepoGenerator"; version="0.0.1"; sha256="0d6s2sqyycaqrg32xdkp3pr5i7qmvwrfrjcd7f94a9y3lz4bz5b5"; depends=[git2r httr rmarkdown rstudioapi]; }; ResistorArray = derive2 { name="ResistorArray"; version="1.0-32"; sha256="0zqnl0bbqrj5hn5ywhlqyrlz5ryql88qahlgs9989v4rljcxxlam"; depends=[]; }; ResourceSelection = derive2 { name="ResourceSelection"; version="0.3-5"; sha256="1vg5fkjfwkganxf0ji70pkp071841hjgr5sjxlaky8mx7n0cy80x"; depends=[MASS Matrix pbapply]; }; + RestRserve = derive2 { name="RestRserve"; version="0.2.1"; sha256="10g3gk8nsw5a4yly89mvm453y65rk0vjqsa0fcm69wdjhri91n1h"; depends=[checkmate jsonlite mime R6 Rcpp Rserve uuid]; }; RevEcoR = derive2 { name="RevEcoR"; version="0.99.3"; sha256="1nym263ynjdir5kxv35jnmki9mshlplq0sk3xnjd4ac6f1cfbfqj"; depends=[gtools igraph magrittr Matrix plyr purrr stringr XML]; }; Rexperigen = derive2 { name="Rexperigen"; version="0.2.1"; sha256="158ksnd1gvzq7ii0ys2v0wrfnr001hni0i8m77p1fn1arixgmqdw"; depends=[digest jsonlite RCurl]; }; Rfacebook = derive2 { name="Rfacebook"; version="0.6.15"; sha256="0hp2mbm0hnyasizszvh5x9hv7z2q633zck1a1gvk36nbxb1shx7c"; depends=[httpuv httr rjson]; }; - Rfast = derive2 { name="Rfast"; version="1.9.8"; sha256="0y7r3svw4irbyhq42ncpldbf7mkrh9wcx1k0rjg41q04mj3720ch"; depends=[Rcpp RcppArmadillo RcppZiggurat]; }; + Rfast = derive2 { name="Rfast"; version="1.9.9"; sha256="18m8xhg24kygwhq7avdp1hibilicb5wppi2wdmc36fkqljc274y0"; depends=[Rcpp RcppArmadillo RcppZiggurat]; }; Rfast2 = derive2 { name="Rfast2"; version="0.0.5"; sha256="07w0ypwy19cqf4h94pzh0y8fmq5ibr048qzarrs1qzlnk2hx7k4c"; depends=[Rcpp RcppArmadillo Rfast]; }; Rfit = derive2 { name="Rfit"; version="0.24.2"; sha256="1b3pza2xdpifvrcqbdp5r2wy82ws1844bnpna01hqj65xbw2iix8"; depends=[]; }; Rfolding = derive2 { name="Rfolding"; version="1.0"; sha256="15lf73zxr1slin9faj9k0z8qkb1g9nb7h080nfv99gsi2ks68ssg"; depends=[]; }; @@ -3820,16 +3846,17 @@ in with self; { Rgb = derive2 { name="Rgb"; version="1.6.1"; sha256="0qs3dlv4g45dqphqjm23ky3w6rxh8ff2q6b17kvf57skyf1b1yn8"; depends=[]; }; Rgbp = derive2 { name="Rgbp"; version="1.1.4"; sha256="1y51sms321sbrl3rgzp5hq4y5mqkrjxsyrq75gkcbwfvlakjcfrg"; depends=[mnormt sn]; }; Rglpk = derive2 { name="Rglpk"; version="0.6-4"; sha256="19mzpyimzq9zqnbi05j79b2di3nzaln8swggs9p8sqdr60qvr3d2"; depends=[slam]; }; - Rgnuplot = derive2 { name="Rgnuplot"; version="1.0.3"; sha256="0mwpq6ibfv014fgdfsh3wf8yy82nzva6cgb3zifn3k9lnr3h2fj7"; depends=[]; }; - RgoogleMaps = derive2 { name="RgoogleMaps"; version="1.4.5.2"; sha256="1y2dinxmzx6mg6ynpk2q7f4k4rxjm66my185gafdcvpc4rl7svs7"; depends=[png]; }; + RgoogleMaps = derive2 { name="RgoogleMaps"; version="1.4.5.3"; sha256="02v8k0bw70q4qwx4lcdy8p25q7n3ql2ll46lfpqllxa1p26svmfi"; depends=[png sp]; }; Rhpc = derive2 { name="Rhpc"; version="0.19-276"; sha256="1wbdkqmaq3rdj5r9w0mddkcyiabyd9r26jp3i7i4w055mq2r1gs1"; depends=[]; }; RhpcBLASctl = derive2 { name="RhpcBLASctl"; version="0.20-17"; sha256="0iwc06blr5sx7rylwczi2jrha8sk8qs0jklflwpidl0zj1jxdggp"; depends=[]; }; Ricetl = derive2 { name="Ricetl"; version="0.2.5.1"; sha256="1d7229ylnxgh2rvarwga229378ja79l978zjabf3sph4cqc1b965"; depends=[devtools gWidgets gWidgetsRGtk2 plyr readr readxl stringr tidyverse writexl]; }; RichR = derive2 { name="RichR"; version="1.0.0"; sha256="0z0ri90jqdmw0vwxd1b4wr9if5cgm1gqpf6g9p1fdvncf4sdi9by"; depends=[magrittr metap plyr reshape2]; }; RidgeFusion = derive2 { name="RidgeFusion"; version="1.0-3"; sha256="10llmrsfpcqrkcbw7zj44kvfy7ywn9rk49n7zplilz8h94zzcmjv"; depends=[mvtnorm]; }; Ridit = derive2 { name="Ridit"; version="1.1"; sha256="02cni6hzf1bsns7vi8vklnhc0pfb5vwqhjnnfnjnnaxpzpsbvdfn"; depends=[]; }; - RiemBase = derive2 { name="RiemBase"; version="0.2.3"; sha256="08dwnzjy7fhipvqb7p4kbhcfhrnz9i025czci6d0a9nnyscqcgfv"; depends=[pracma Rcpp RcppArmadillo Rdpack]; }; - RiemBaseExt = derive2 { name="RiemBaseExt"; version="0.1.1"; sha256="17899bsb6s4jaql71hsq5abcnf1ybji5236zwh25apc6k7br14fc"; depends=[cluster dbscan energy fastcluster kernlab Rcpp RcppArmadillo Rdpack RiemBase]; }; + RiemBase = derive2 { name="RiemBase"; version="0.2.4"; sha256="1h3ascbdgvp56k5ki6qr849296cdkr2bzc33pwwp033rmd8khpr3"; depends=[pracma Rcpp RcppArmadillo Rdpack]; }; + RiemBaseExt = derive2 { name="RiemBaseExt"; version="0.1.2"; sha256="0g0gkwjh1x18ay03f557g3zvb2cfivpx0pcgsrr3gm0gphli96v8"; depends=[cluster dbscan energy fastcluster kernlab Rcpp RcppArmadillo Rdpack RiemBase]; }; + RiemGrassmann = derive2 { name="RiemGrassmann"; version="0.1.0"; sha256="05dann9sdkdzmjp8jalxb963x42j7w007dk7vgkfngm62z6dr24v"; depends=[Rcpp RcppArmadillo RiemBase RiemBaseExt]; }; + RiemStiefel = derive2 { name="RiemStiefel"; version="0.1.1"; sha256="1sdib0xih81n059gi207q01gfb1ac1n02dsyq0qrdqnz1bhffk69"; depends=[Rcpp RcppArmadillo Rdpack RiemBase RiemBaseExt]; }; Riex = derive2 { name="Riex"; version="1.0.1"; sha256="1jri01s08g819bvw0bgd5z5iaf9rlikkqq993lm0455k909wm34v"; depends=[dplyr ggplot2 httr purrr quantmod rjson stringr tibble tidyr tidyverse TTR urltools xts zoo]; }; Rilostat = derive2 { name="Rilostat"; version="1.0.1"; sha256="0k8x2z3vxfwbynn22wpkfbc1i237bl61dh612nhw19c7v48lhdgg"; depends=[data_table dplyr DT haven plyr RCurl readr stringr tibble xml2]; }; Rinstapkg = derive2 { name="Rinstapkg"; version="0.1.0"; sha256="0fvj4jc00g5b8cc4mrsjj72fdcdmvlky05s2ca0g2gndrjs6vxic"; depends=[digest dplyr httr jsonlite lubridate purrr readr rlang uuid]; }; @@ -3844,7 +3871,7 @@ in with self; { RkMetrics = derive2 { name="RkMetrics"; version="1.3"; sha256="1k6vnr1r4h69iznib638z45gd0f8wc4g4h0ji9f0017883g77li1"; depends=[]; }; Rknots = derive2 { name="Rknots"; version="1.3.2"; sha256="1krhma8hy3l5lbm6d8rxjlj9jw1zrd16h4wy4p1clfa5vlhh3bwi"; depends=[bio3d rgl rSymPy]; }; Rlab = derive2 { name="Rlab"; version="2.15.1"; sha256="1pb0pj84i1s4ckdmcglqxa8brhjha4y4rfm9x0na15n7d9lzi9ag"; depends=[]; }; - Rlabkey = derive2 { name="Rlabkey"; version="2.3.3"; sha256="14jiksm93c8qn9x0slc5v1f5d1fxcyg2fdxd82czdgp8j2ijwh55"; depends=[httr jsonlite Rcpp]; }; + Rlabkey = derive2 { name="Rlabkey"; version="2.3.4"; sha256="08f220a0blfvzn5qzvsydxdgbx44jlch5avaavlqixzizzwfrfhs"; depends=[httr jsonlite Rcpp]; }; Rlda = derive2 { name="Rlda"; version="0.2.6"; sha256="0i8n01h9072q339p1kiqhcpwphw0d2x6bsszbhgfqc2b160dk2bl"; depends=[coda doParallel foreach gtools Rcpp RcppArmadillo RcppProgress]; }; Rlgt = derive2 { name="Rlgt"; version="0.1-3"; sha256="0g610v5rch5s31gc7dy9zx4mcgsdhn82y1pmr2rs14qma0v7x515"; depends=[BH forecast Rcpp RcppEigen rstan rstantools sn StanHeaders]; }; Rlibeemd = derive2 { name="Rlibeemd"; version="1.4.1"; sha256="06bb939awawpwn4g63b9jzq5b658lsznzy272zl0fy19x62c6bwr"; depends=[Rcpp]; }; @@ -3863,7 +3890,6 @@ in with self; { Rmpi = derive2 { name="Rmpi"; version="0.6-9"; sha256="1rhycla98hxgnnxlxxldr1x51djak7c2jjvlrv3jcsvgwp1ymqdj"; depends=[]; }; Rmst = derive2 { name="Rmst"; version="0.0.3"; sha256="1fykpii17k460qlsjhhh5vag02lhkyk5l3zjmg8hifqp0cjhz2fl"; depends=[ggplot2 Rata reshape2 Rirt]; }; RnavGraphImageData = derive2 { name="RnavGraphImageData"; version="0.0.4"; sha256="1k1gnkghap878fck0bbz9mm0fr4cli6lh1d11r0cf47fvl6cc4gr"; depends=[]; }; - Rnets = derive2 { name="Rnets"; version="1.2.1"; sha256="08441hhmf1i97z5xb9pq651y6hwr2yraiyg1ns7qkxm2svz3kwxs"; depends=[data_table glasso ICSNP igraph rlang stringr]; }; Rnmr1D = derive2 { name="Rnmr1D"; version="1.2.5"; sha256="0z97pmkksma225s948r0myd4638cy8vl1x2244w1r6n0cybymnd9"; depends=[base64enc doParallel foreach ggplot2 igraph impute MASS MassSpecWavelet Matrix plotly plyr ptw Rcpp signal speaq XML]; }; Rnumerai = derive2 { name="Rnumerai"; version="0.3"; sha256="0zvfp9zp73gm6pflf9bx1xk1s45xwwvcd56cbris08d2zfj3b3nl"; depends=[httr lubridate]; }; RobAStBase = derive2 { name="RobAStBase"; version="1.2.1"; sha256="0dn93bcyz9kxbj38sc1wisfa6v0666v9gk6y3zq0ihjkkhkmdwq3"; depends=[distr distrEx distrMod RandVar rrcov startupmsg]; }; @@ -3872,13 +3898,14 @@ in with self; { RobGARCHBoot = derive2 { name="RobGARCHBoot"; version="1.0.0"; sha256="0m739ix7qj89ppz3k87pc5rgiasmgii467l95clkn6wschfnpfgx"; depends=[Rcpp RcppArmadillo]; }; RobLox = derive2 { name="RobLox"; version="1.2.0"; sha256="1lcylkskfidg576lqfi84l14rvrpfbzmr53hcgzzmfipxhli4dr8"; depends=[Biobase distr distrMod lattice RandVar RColorBrewer RobAStBase]; }; RobLoxBioC = derive2 { name="RobLoxBioC"; version="1.2.0"; sha256="01lydp67v7mc4v3svsnl4zqq2jy1czwg9l9blngjn9ky0hv3haf5"; depends=[affy AnnotationDbi beadarray Biobase BiocGenerics distr distrMod lattice RColorBrewer RobLox]; }; + RobMixReg = derive2 { name="RobMixReg"; version="0.1.0"; sha256="171kwgfxmnwsrhjy3bwl6sl4z8nw9cx588a3snavpvsl7kwdlmmr"; depends=[flexmix gtools MASS robustbase]; }; 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.2.0"; sha256="1npgbdvdzb0p0w77fsngrwg968y621p3lx8qw69ns8qgxjkismqp"; depends=[distr RandVar RobAStBase ROptRegTS]; }; - RobStatTM = derive2 { name="RobStatTM"; version="1.0.1"; sha256="05bhly32gi5w5n4w7c276dfvyj9ax1kfiwlj2s7x7l6r8yxkjp25"; depends=[DEoptimR DT fit_models ggplot2 gridExtra PerformanceAnalytics pyinit robust robustbase rrcov shiny shinyjs xts]; }; - RobinHood = derive2 { name="RobinHood"; version="1.2.1"; sha256="0lq06m7zdny5230afssr8cjx7rlfnhmrzi02972dqcc6w9p62270"; depends=[dplyr httr jsonlite lubridate magrittr profvis uuid]; }; + RobStatTM = derive2 { name="RobStatTM"; version="1.0.2"; sha256="14fnz01n0dd0qdlnd9vcqqj0xzfn8av8fvsy2ay0lk22ma3jw83v"; depends=[DEoptimR DT fit_models ggplot2 gridExtra PerformanceAnalytics pyinit robustbase rrcov shiny shinyjs xts]; }; + RobinHood = derive2 { name="RobinHood"; version="1.2.4"; sha256="00riiz1csxmncsd79xj85bl5vbhyp8vj43b2s7wc3zhq0d89kizc"; depends=[dplyr httr jsonlite lubridate magrittr profvis uuid]; }; Robocoap = derive2 { name="Robocoap"; version="0.1-1"; sha256="0aj6iv85a1zfaknjhrzf6lnf0qn726dvnj4dywg9nii1kkqrkq2w"; depends=[data_table igraph markovchain tm]; }; - RobustAFT = derive2 { name="RobustAFT"; version="1.4-4"; sha256="17qjfpagz0wpl8hbyksnag51nj6b9arl9mk5a56avykd2nii95kd"; depends=[robustbase survival]; }; + RobustAFT = derive2 { name="RobustAFT"; version="1.4-5"; sha256="1i119qqlavfj7k0srb8fbbyy2nhsjv9rgrni854liizr9m51cgac"; depends=[robustbase survival]; }; RobustCalibration = derive2 { name="RobustCalibration"; version="0.5.1"; sha256="0wsnvryvrl37acljrda2dm1d8aynqiy66yd2i857m035whixfpqa"; depends=[Rcpp RcppEigen RobustGaSP]; }; RobustGaSP = derive2 { name="RobustGaSP"; version="0.5.7"; sha256="1zjil79a5zwi51bsrifplj2yyxpqg4v9471bsclwzyzll24c46vk"; depends=[nloptr Rcpp RcppEigen]; }; RobustRankAggreg = derive2 { name="RobustRankAggreg"; version="1.1"; sha256="1pslqyr1lji1zvcrwyax4zg2s81p1jnhfldz8mdfhsp5y7v8iar3"; depends=[]; }; @@ -3887,7 +3914,8 @@ in with self; { RonFHIR = derive2 { name="RonFHIR"; version="0.4.0"; sha256="1ajpgpp300m0zzqzzwsn8sfy8x751hrr8py9n9xvzjmkgyrh4hhw"; depends=[httr jsonlite R6 stringr]; }; Rook = derive2 { name="Rook"; version="1.1-1"; sha256="00s9a0kr9rwxvlq433daxjk4ji8m0w60hjdprf502msw9kxfrx00"; depends=[brew]; }; RootsExtremaInflections = derive2 { name="RootsExtremaInflections"; version="1.2.1"; sha256="0qd6cmzp8fkb75ac79xbh4032vqwax7nk7d6yykpdbn0bnk2kvdi"; depends=[doParallel foreach inflection iterators]; }; - Ropj = derive2 { name="Ropj"; version="0.2-2"; sha256="1jdn4m5xfnm7z7pjchqsy1zhh6kgbi8fw2jl8hw1pckjfyzhlwhw"; depends=[Rcpp]; }; + Ropj = derive2 { name="Ropj"; version="0.3"; sha256="01yzlzab7pldyxqb1g8fmc6iig2d4y887bfxqjxckvd4f76vlkqs"; depends=[Rcpp]; }; + Rosenbrock = derive2 { name="Rosenbrock"; version="0.1.0"; sha256="0qfdyr66g244jvbnssbnj2b2ng740dr4qmillpnwl4h2hh811syv"; depends=[MASS]; }; 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-7"; sha256="0g6nx0cak6619hxv1fq3b30xv0bdwxb776qkdj6ihig6nhkm2hkj"; depends=[Rcpp]; }; @@ -3901,14 +3929,14 @@ in with self; { Rpoet = derive2 { name="Rpoet"; version="1.1.0"; sha256="11gp4zg0wc2a21956355rkr3i3dyaabfz0z30z4phn8s7y3yqr92"; depends=[]; }; 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]; }; + Rprofet = derive2 { name="Rprofet"; version="2.2.1"; sha256="150123vxdd31p96f3vsri46ryfng2xvnjgm6mdiqczg48xyfpbdp"; 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]; }; - Rquefts = derive2 { name="Rquefts"; version="1.0-5"; sha256="0c3738rn3abmah61kxyys3ab807r7mhcj10shkraq3li6v7aw5kv"; depends=[meteor Rcpp]; }; + Rquefts = derive2 { name="Rquefts"; version="1.0-7"; sha256="1r1b2ga7kfhxsgr2d6ncfyrcpwx1jy0q1h06xajhfpd7i2sk7i84"; depends=[meteor Rcpp]; }; Rramas = derive2 { name="Rramas"; version="0.1-6"; sha256="16aapvz9j81lvi5ryj41bvn3wf51b0gynnzs0jpvva4m3mvzw6an"; depends=[diagram]; }; - Rraven = derive2 { name="Rraven"; version="1.0.8"; sha256="00qlisn7026y0dhgb9ig8liky5k8xrw7app5dj6f8123bi6ligv6"; depends=[NatureSounds pbapply seewave tuneR warbleR]; }; + Rraven = derive2 { name="Rraven"; version="1.0.9"; sha256="00iwjwqwjam45zcsggckdaqcd6sygh8ysahpvrx7xg4h5rdnhg92"; depends=[NatureSounds pbapply seewave tuneR warbleR]; }; Rrdrand = derive2 { name="Rrdrand"; version="0.1-16"; sha256="0j9yyvq8r1cgwj3kw1ak6hyazr67f2q0c1m651wdm0wcvm1ajx7f"; depends=[]; }; - Rsagacmd = derive2 { name="Rsagacmd"; version="0.0.2"; sha256="02mz1q6zjrrjrf40d8y7xpzilk2f14zpsczcw9qr5v9zzch4kjxb"; depends=[foreign magrittr minpack_lm raster rgdal sf stringr XML]; }; - Rsampletrees = derive2 { name="Rsampletrees"; version="1.0.2"; sha256="1wz3dp1myjkxzf9l5mfli3dfbkc2fwg70xx7m9cxa06vq0a4w5pv"; depends=[ape haplo_stats Rcpp]; }; + Rsagacmd = derive2 { name="Rsagacmd"; version="0.0.5"; sha256="06mgynndkm0syzqxryvjcjcjcd7a9fcwq2v1r2qq5073har6r1iy"; depends=[foreign magrittr minpack_lm raster rgdal rlang sf stringr tibble XML]; }; + Rsampletrees = derive2 { name="Rsampletrees"; version="1.0.3"; sha256="1qnvnhhzhyfbka4zjblddj5ad5d6q7rzb8rpikzpvcqn9s57lnqk"; depends=[ape haplo_stats Rcpp]; }; Rsampling = derive2 { name="Rsampling"; version="0.1.1"; sha256="14rp3j7iaii4rc3jkbijmbgvlagxxqjkz3vvfwwpxix43rsi8zsk"; depends=[]; }; Rsconctdply = derive2 { name="Rsconctdply"; version="0.1.3"; sha256="12xc1laxgivv4szp8341pvhmxnzzzzc2s4jhnqsqrbx71lbd9szg"; depends=[dplyr rjson rsconnect]; }; Rserve = derive2 { name="Rserve"; version="1.7-3.1"; sha256="16cg0cak9pvd9l35fjy1lsplxr5ncvb4apzg5mish5kff0cyk89v"; depends=[]; }; @@ -3918,37 +3946,37 @@ in with self; { Rsomoclu = derive2 { name="Rsomoclu"; version="1.7.5.3"; sha256="1l1kvr92n0pd6rkr663701lpz81mf0i4hpf80ssd27773m6yw0kg"; depends=[kohonen Rcpp]; }; Rspc = derive2 { name="Rspc"; version="1.2.2"; sha256="1cnzqpnh009wfs51dc4id9q3giaa8b6dc75b1lhzpwcvw0cxcy4y"; depends=[]; }; Rspotify = derive2 { name="Rspotify"; version="0.1.2"; sha256="1q8ajjx5ghlgxgch9gifvhi2gmsi0ph8pygwrb9jrd3ijahlw5k4"; depends=[dplyr httr jsonlite magrittr plyr]; }; - Rssa = derive2 { name="Rssa"; version="1.0"; sha256="0alh0vq3qqzrn1kklqfp52qknasfq6yzk2dprz3g9pyq05qhmhlw"; depends=[forecast lattice svd]; }; + RsqMed = derive2 { name="RsqMed"; version="0.1.7.1"; sha256="18r78svwbnri5283s5nxg4vrp29r6xx13h0n6w634jdpwaiw56gk"; depends=[GMMAT SIS]; }; + Rssa = derive2 { name="Rssa"; version="1.0.2"; sha256="14gzd6mz9v8c0c15sinf67f1ii6b6ximpfz8daq3800pw2cav49r"; depends=[forecast lattice svd]; }; Rsurrogate = derive2 { name="Rsurrogate"; version="2.0"; sha256="1pjyhlxqi8mcbywa7qa1vxgxr5jca0nc9vm1bx53vr231wgnb7gf"; depends=[survival]; }; Rsymphony = derive2 { name="Rsymphony"; version="0.1-28"; sha256="02x54ygbcd2600prcww1l9pb02skn96rj0jdljpky1228jbib4nx"; depends=[]; }; Rtauchen = derive2 { name="Rtauchen"; version="1.0"; sha256="09282k6qsjxgm26682npfjymmbx5g8flcc44awmkjl2k4fa1q9ha"; depends=[]; }; - RtextSummary = derive2 { name="RtextSummary"; version="0.1.0"; sha256="1kqzml8zmkqx6200g2jw5mmg5g043h6mr1skms1c2q905avd46gv"; depends=[dplyr Matrix_utils mlapi R6 stringr text2vec tidyr tokenizers]; }; - Rtextrankr = derive2 { name="Rtextrankr"; version="1.0.0"; sha256="16dby3xsfcjyp35xdflmgnh7zkqygfbffvj4jqa565vj9ksnq5ir"; depends=[igraph KoNLP sets stringi]; }; Rtnmin = derive2 { name="Rtnmin"; version="2016-7.7"; sha256="0f8ii87v29v61b93hx2yxdppp3nvgnl5imp80sbb4bjsdg0mf989"; depends=[]; }; - Rtrack = derive2 { name="Rtrack"; version="0.9.3"; sha256="0b73cr299hv2k6ia4ama6ciq9506wy2w2cyh1bv5wdqiyvf8hzia"; depends=[crayon KernSmooth openxlsx pbapply randomForest raster readxl rgeos rjson sp]; }; + Rtrack = derive2 { name="Rtrack"; version="0.9.6"; sha256="00xbgfv5a02f05pwlrn3v93ydi3xsil9hznj4rjisf0mc2pmzfj0"; depends=[crayon KernSmooth openxlsx pbapply randomForest raster readxl rgeos rjson sp]; }; Rtsne = derive2 { name="Rtsne"; version="0.15"; sha256="0v17vxizrs1msay24xl2bckfajr2c82wpqj07lyssbrq197nwdsn"; depends=[Rcpp]; }; Rttf2pt1 = derive2 { name="Rttf2pt1"; version="1.3.8"; sha256="0b3f2zkmbyshn19cnaaf042d0zwf43l9jnkqizfhxxwb93a4c1jn"; depends=[]; }; 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.27"; sha256="0nvrxv3a0wl3rk5885qm20wxcnfy2lrxv5d99wjd02j3636gq353"; depends=[]; }; + Runuran = derive2 { name="Runuran"; version="0.30"; sha256="1a3z49nrx1azbm4blqcwwcbwnxcrcr8md350viakl8a0b3y2v59q"; 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]; }; + Rvcg = derive2 { name="Rvcg"; version="0.19.1"; sha256="0brqnvhqj9052kkic1i8mxx7y1si9na5rwj1fmslsf5mih8n4grr"; depends=[Rcpp RcppArmadillo RcppEigen]; }; Rvmmin = derive2 { name="Rvmmin"; version="2018-4.17"; sha256="0mhzzwk311wa157l3n4x5x038asvjd81l45g1jclfsjr0smsffym"; depends=[optextras]; }; Rvoterdistance = derive2 { name="Rvoterdistance"; version="1.1"; sha256="16il36hkq1j6gyl5d8bx5khiiv6fy2m8vkhwiaaiqsliw2sspy4j"; depends=[Rcpp]; }; 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=[]; }; + Rwofost = derive2 { name="Rwofost"; version="0.6-3"; sha256="0a6fp2hkf51hqmbyp7mlhhnzzxj2gcq0kdrlcm3qmpkv0y44wmmw"; depends=[meteor Rcpp]; }; Rwordseg = derive2 { name="Rwordseg"; version="0.3-2"; sha256="10jhfalh45rrcm76hwz4b5yl408ndx2wkr0i3q1avx6z6i45d8s6"; depends=[HMM tmcn]; }; RxCEcolInf = derive2 { name="RxCEcolInf"; version="0.1-4"; sha256="0qyhxqd5yi4d1prj0i4g3k29zi0mx6wkjx24ynb4arxw6h1vabh4"; depends=[coda lattice MASS MCMCpack mvtnorm]; }; - RxODE = derive2 { name="RxODE"; version="0.9.1-9"; sha256="09qi26ksqznkmmi5sq6sq0jicn1yc4l25dq4snb6r03vbbbq399c"; depends=[assertthat brew cli crayon digest dparser ggforce ggplot2 inline lotri magrittr Matrix memoise mvnfast pillar PreciseSums Rcpp RcppArmadillo remotes rex sys units]; }; + RxODE = derive2 { name="RxODE"; version="0.9.2-0"; sha256="1ynn38wk08szi34pk0hmlnanmfg19arazsqzafyw5kd1v3fdx4g4"; depends=[assertthat brew cli dparser ggplot2 inline knitr lotri magrittr Matrix memoise mvnfast pillar PreciseSums Rcpp RcppArmadillo rex sys units]; }; RxnSim = derive2 { name="RxnSim"; version="1.0.3"; sha256="0fi4aic2brfbl6rsnnfwqq7l8ygvlmr98w0v749l3djpgn7sfrig"; depends=[data_table fingerprint rcdk rJava]; }; Rxnat = derive2 { name="Rxnat"; version="1.0.6"; sha256="1wzb4dihzbyp23yggi1n7c5ikbq6h2gl9v7bgwxf00y2gwlabjx4"; depends=[httr RCurl]; }; Ryacas = derive2 { name="Ryacas"; version="1.1.2"; sha256="1m5z6x4w461rwk5ay6fc7y3l4b1nwlhma0lis2q8v93adnwgmg7n"; depends=[magrittr Rcpp]; }; Ryacas0 = derive2 { name="Ryacas0"; version="0.4.2"; sha256="0k8q9v9016x8vfskwa6zmh2rbblqqfk8bryxslxaj8irzvkggnvl"; 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="1.1"; sha256="123kbksamx30l4kib8pkv44knra8yqhvjwbx61xxi7k88qaxvmin"; depends=[mgcv R6 testit]; }; + SACOBRA = derive2 { name="SACOBRA"; version="1.2"; sha256="1v45l56vifkg3v2bfhk3kfg4fn0dfvrjcgy13zzymm8blr7vazi5"; depends=[mgcv R6 testit]; }; SADEG = derive2 { name="SADEG"; version="1.0.0"; sha256="02ilykbdanx1isbd80c43hqpzkckq6dg40y0rklcnck6v96qky3n"; depends=[]; }; SADISA = derive2 { name="SADISA"; version="1.2"; sha256="0yn7f360wl5ykys5zln159xh2h8bx7zb5ddwhv1migjlqry506hp"; depends=[DDD pracma]; }; SAFD = derive2 { name="SAFD"; version="2.1"; sha256="078ki9wrmcf80bwhx4d56gas79xrc17a0081i13yxvjqn6w7f7jd"; depends=[]; }; @@ -3956,25 +3984,27 @@ in with self; { 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.2.1"; sha256="01gj9k1gf35vm11p0p590irqc5daaiwmq05rl2v3n8h2azaz1c7l"; depends=[Rcpp RcppEigen]; }; + SAMBA = derive2 { name="SAMBA"; version="0.9.0"; sha256="0gxc1s82bfhqj1rpmp0fm87frv77rgr8qjqai7zdgfz3jm474any"; depends=[optimx survey]; }; 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.1"; sha256="0i6ffssr5iyh4z1ygbg0kg2nq4mlvshym7380f93gf85wpdql5gv"; depends=[AzureRMR AzureStor dplyr httr jsonlite Matrix R6 Rcpp RcppArmadillo RcppParallel]; }; - SARP_compo = derive2 { name="SARP.compo"; version="0.1.0"; sha256="0y1dmpdancnir609csf6i8565sn5hch3lgl3gq69i04nlfvf49f9"; depends=[car igraph]; }; + SARP_compo = derive2 { name="SARP.compo"; version="0.1.3"; sha256="1rps2zfwhxf579v29p929jh1qq71ayy1ij6a5ja6y8rdflzhp4hb"; depends=[car igraph]; }; SARP_moodle = derive2 { name="SARP.moodle"; version="0.3.10"; sha256="0wi6b25cd47kgj09pmfxf1hjsyqnhwj2liyv8f5nfxl9wzkdsxc5"; 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]; }; SASmixed = derive2 { name="SASmixed"; version="1.0-4"; sha256="0491x4a3fwiy26whclrc19alcdxccn40ghpsgwjkn9sxi8vj5wvm"; depends=[]; }; - SASxport = derive2 { name="SASxport"; version="1.6.0.1"; sha256="0cswsp19w41g30hqzpazg20b45xw0gypmr213w7cqp6r7zjrxis6"; depends=[Hmisc stringi]; }; + SASxport = derive2 { name="SASxport"; version="1.7.0"; sha256="1na94lxrn8kbhxpiflg14nkdx13rjq9bvvqbxyxh1mq0q7vz7a2l"; depends=[Hmisc stringi]; }; SAVE = derive2 { name="SAVE"; version="1.0"; sha256="1m9rrga8x00hlvn0c1jcz6yz14pdm6h3dq14905mq49sw63c7zll"; depends=[coda DiceKriging]; }; SAVER = derive2 { name="SAVER"; version="1.1.2"; sha256="1s1kw8idkaj7j90fw4qn9k0wd4vz0sblsk06ry6lm4afcar0p158"; depends=[doParallel foreach glmnet iterators Matrix]; }; SAutomata = derive2 { name="SAutomata"; version="0.1.0"; sha256="0d9q7bm2f7s4aslml40n43vwcdkc8rnn9ygydccwi4b9a7y23k58"; depends=[]; }; SBRect = derive2 { name="SBRect"; version="0.26"; sha256="16g0ciy9q9irypsl8x36i0lavl41j3af13r2si0by8q6wj56pxi4"; depends=[rJava]; }; SBSA = derive2 { name="SBSA"; version="0.2.3"; sha256="1v23lzzziyjlvgn5p2n1qcq2zv9hsyz2w15lbnfi5wvinxhlg8sc"; depends=[Rcpp RcppArmadillo]; }; SBSDiff = derive2 { name="SBSDiff"; version="0.1.0"; sha256="0mw1646dmhxw6zz4pq7j0g3mf9bjn72g43sq7m72r8ma8ciqj7r2"; depends=[]; }; + SBmedian = derive2 { name="SBmedian"; version="0.1.0"; sha256="1flydpajgak0sh6v8r67fvjg3fjaylinqjgfrvi91lf29r822zdw"; depends=[expm Rcpp RcppArmadillo Rdpack]; }; 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]; }; @@ -3988,24 +4018,24 @@ in with self; { SCMA = derive2 { name="SCMA"; version="1.3.1"; sha256="0j0np99mcr8vgpcg664769gdb3rxm665h4jgj3zplihbh5ihxfj1"; depends=[]; }; SCOR = derive2 { name="SCOR"; version="1.1.0"; sha256="0r462g3wciz0kkvzwnd7660giy16q8bk8chm73syrw4fnfk2vdkv"; depends=[doParallel foreach iterators]; }; SCORER2 = derive2 { name="SCORER2"; version="0.99.0"; sha256="1a28wga69ip9s98ch2dqgl0qkwa3w6frmaqcvhclc360ik813mxq"; depends=[]; }; - SCORPIUS = derive2 { name="SCORPIUS"; version="1.0.5"; sha256="01zifl85gw9c3f34yr8llwv6xfdxdrx5z25dfa898hyc100rk9gc"; depends=[dplyr dynutils dynwrap ggplot2 lmds MASS Matrix mclust pbapply pheatmap princurve purrr ranger RANN RColorBrewer tidyr TSP]; }; + SCORPIUS = derive2 { name="SCORPIUS"; version="1.0.6"; sha256="1lrpy96v9wcf143nljrh8md6pr6why22xai59f5k1pvva07rn4vc"; depends=[dplyr dynutils dynwrap ggplot2 lmds MASS Matrix mclust pbapply pheatmap princurve purrr ranger RANN RColorBrewer tidyr TSP]; }; SCPME = derive2 { name="SCPME"; version="1.0"; sha256="0yhsaaa349wbrswcvp7w8c52wzp7rs3528rs4wqa8b3r3fh983mh"; depends=[doParallel dplyr foreach ggplot2 Rcpp RcppArmadillo RcppProgress]; }; SCRSELECT = derive2 { name="SCRSELECT"; version="1.3-3"; sha256="118vwnd5gggvdhq7fbs0553l84vh5mhiag41q4svprd7p0pqd9hd"; depends=[mvtnorm]; }; SCRT = derive2 { name="SCRT"; version="1.3.1"; sha256="0wkxc22hv08riivjl09lhxvffqxxdy4xnvdmc2y69gssyinkbln1"; depends=[]; }; SCVA = derive2 { name="SCVA"; version="1.3.1"; sha256="1gdicpnbr8bdgrbwwslpwpzw2adpp94p8nhsrkdx0bjlpfhd4g9h"; depends=[ggExtra ggplot2 plotly scales]; }; SCperf = derive2 { name="SCperf"; version="1.1.1"; sha256="1kqi3sv9ds58l20pdcnjrrbf7fin82j73yqj5rbx4kjdw560ylb2"; depends=[]; }; SCtools = derive2 { name="SCtools"; version="0.3.0"; sha256="0iw7ckgfpijnbqicky69la3mpxmd1i5p4rgzznymprra3q1lx35h"; depends=[cvTools dplyr furrr future ggplot2 purrr stringr Synth]; }; - SDALGCP = derive2 { name="SDALGCP"; version="0.2.0"; sha256="04yqa0dlr4p6fpc4dsiqwb02j056fz9j8qwf7939b5hpg8k9qwjg"; depends=[geoR maptools mapview Matrix pdist plyr PrevMap progress raster sp spacetime spatstat splancs]; }; + SDALGCP = derive2 { name="SDALGCP"; version="0.3.0"; sha256="1mrx39rspbynnwdpww8vv3rf03589qym70vc9508k7iird5cn0qh"; depends=[geoR maptools mapview Matrix pdist PrevMap progress raster sp spacetime spatstat splancs]; }; SDAR = derive2 { name="SDAR"; version="0.9-3"; sha256="173qssvca1ds37x3518q3vfl2185b4fnkprvb52pp7mpv1w1xdrp"; depends=[grImport2 linbin readxl]; }; SDD = derive2 { name="SDD"; version="1.2"; sha256="0wzgm1hgjv5s00bpd7j387qbvn5zvyrrd5fr2rgyll4cw9p4sd33"; depends=[Hmisc rgl rpanel sm tseries]; }; SDDE = derive2 { name="SDDE"; version="1.0.1"; sha256="14vql1bypn409w9xcx1jdzff6apiagcz2wng3y24h3mk7yjv9bzy"; depends=[doParallel foreach igraph iterators]; }; + SDEFSR = derive2 { name="SDEFSR"; version="0.7.21"; sha256="02p46vbyzx5lmyxyhks10l94kz18pldgkxxg2zi5vys80gpy5jd2"; depends=[]; }; SDLfilter = derive2 { name="SDLfilter"; version="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.2"; sha256="1xvcd97ikqsfdpk2fddy3k0z1ajqga7nv9bgac9c1wnjk1gqrpgh"; depends=[R_utils]; }; - SDMtune = derive2 { name="SDMtune"; version="1.0.1"; sha256="0214r8qv3lc74vsrz8sb5bl4c9jbc85vlgl6qgj49w5hw9pqidzx"; depends=[cli crayon dismo gbm ggplot2 htmltools jsonlite kableExtra maxnet nnet plotROC progress randomForest raster rasterVis Rcpp reshape2 rstudioapi scales stringr whisker]; }; + SDMPlay = derive2 { name="SDMPlay"; version="1.3"; sha256="0653yzw00ix1kh302h1fs735956dw0m2zvp2ng472f8qywrb395s"; depends=[dismo gbm raster]; }; + SDMtune = derive2 { name="SDMtune"; version="1.1.0"; sha256="0n876g5ddbnn50py0hgxp1p8ck54553w8aacbap3ylsa3ylz08g5"; depends=[dismo gbm ggplot2 jsonlite maxnet nnet progress randomForest raster Rcpp rstudioapi stringr whisker]; }; SDT = derive2 { name="SDT"; version="1.0.0"; sha256="1jwpfd1pnzy9wcl90qv5bgwi19shsw9064dvml9zwbif8yw8dzjj"; depends=[quadprog]; }; SDaA = derive2 { name="SDaA"; version="0.1-3"; sha256="0z10ba4s9r850fjhnrirj2jgnfj931vwzi3kw9502r5k7941lsx0"; depends=[]; }; - SDraw = derive2 { name="SDraw"; version="2.1.8"; sha256="05yn0mqdv5a3zyvd6jhmkjh4w06ry8zy0libr56jmp8fcnninvyw"; depends=[deldir rgeos sp spsurvey]; }; + SDraw = derive2 { name="SDraw"; version="2.1.11"; sha256="0l4yxxqsszfzdkr4fbbxrvy29dk0d9fz4rhjmv95ynbmvbx5yqw4"; depends=[covr deldir rgeos sp spsurvey]; }; SEA = derive2 { name="SEA"; version="1.0"; sha256="1jcjgiy8459d8f603kiipcdq6d2awfcqzdv13hrdjgxpfnd1n1ha"; depends=[data_table doParallel foreach kolmim KScorrect MASS shiny]; }; SEAsic = derive2 { name="SEAsic"; version="0.1"; sha256="1mg01sag6n1qldjvmvbasac86s7sbhi4k99kdkav2hdh6n9jg467"; depends=[]; }; SECFISH = derive2 { name="SECFISH"; version="0.1.7"; sha256="0yd9k6anz9g4psg5kh1bhp0lr1i4y7in1m0mxk4qp14nl1zqy4fy"; depends=[ggplot2 Hmisc optimization]; }; @@ -4021,15 +4051,15 @@ in with self; { SEchart = derive2 { name="SEchart"; version="0.1"; sha256="19gqcd6xzwg37nzc67p88ip4i0v2f59ds85xfw9qq8lybvdm76k2"; depends=[JM]; }; SFS = derive2 { name="SFS"; version="0.1.4"; sha256="1pig64pj30yyfzyv97f74gshw4lnklrx0npp4da3absk6anb3iv7"; depends=[Rcpp RcppArmadillo]; }; SFtools = derive2 { name="SFtools"; version="0.1.0"; sha256="08k2ywkpk1pzp0qcwm7qx9gnv9hglspl9hrsrrfblagdpkw6rm2x"; depends=[doParallel ff wordspace]; }; - SGB = derive2 { name="SGB"; version="1.0"; sha256="11x0db241c9nkgpdd9p3v48klvkbrxrrbj73xb7lp6ldkdsi7gl2"; depends=[alabama Formula MASS numDeriv]; }; + SGB = derive2 { name="SGB"; version="1.0.1"; sha256="0j48fx9bf2k8k3ykp629jfi1jbs23673nz6rg54rvcrrsl6hb9v3"; depends=[alabama Formula MASS numDeriv]; }; SGCS = derive2 { name="SGCS"; version="2.7"; sha256="12kyfkd2phdmiyflgay2ndl6z5f9gz425mxi48wqs9ar3gh6akdw"; depends=[spatstat]; }; SGL = derive2 { name="SGL"; version="1.3"; sha256="055mx876ydg4kzvcm6rxfkxqz849zgzkzsskvrfgwj9fs1k6ja2v"; 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]; }; + SGP = derive2 { name="SGP"; version="1.9-5.0"; sha256="0jsn6fvd5vaw6m6d7l83nphl19xmql4ir50av5x84rsi7qv461gg"; depends=[Cairo callr colorspace crayon data_table digest doParallel doRNG equate foreach gridBase gtools iterators jsonlite matrixStats plotly quantreg randomNames rngtools RSQLite sn toOrdinal]; }; SGPdata = derive2 { name="SGPdata"; version="23.0-0.0"; sha256="0801v5fq18bpy6sqsp1g6g7azi5ldl3xqpkrp19gsfbl4kcfbp3m"; depends=[crayon data_table]; }; - SHAPforxgboost = derive2 { name="SHAPforxgboost"; version="0.0.2"; sha256="1d0sq27qs6k8rjrjq0g54s76523a3khb873wdy4hinxhcqwqzcaz"; depends=[BBmisc data_table ggExtra ggforce ggplot2 ggpubr RColorBrewer xgboost]; }; - SHELF = derive2 { name="SHELF"; version="1.6.0"; sha256="1w26vv2r7hd8jpfn6vi4g9z3pav4gy58akvq2vzlcxiaxwv8lvnm"; depends=[ggExtra ggplot2 ggridges gridExtra Hmisc MASS rmarkdown scales shiny shinyMatrix tidyr]; }; + SHAPforxgboost = derive2 { name="SHAPforxgboost"; version="0.0.3"; sha256="09gwjw6pbq9b9fg1nsf2jv6dh2g6nmd5iyq6c8c2imgq0la1khgj"; depends=[BBmisc data_table ggExtra ggforce ggplot2 ggpubr RColorBrewer xgboost]; }; + SHELF = derive2 { name="SHELF"; version="1.7.0"; sha256="0rhxagblk8bmwd4wfbjf52dh6y1brajp6xn8rsjx7q0z4brgcr23"; depends=[ggExtra ggplot2 ggridges gridExtra Hmisc MASS rmarkdown scales shiny shinyMatrix tidyr]; }; SHIP = derive2 { name="SHIP"; version="1.0.2"; sha256="0b83cclibdz1r7sz968nmca4najwgps9wrdlsh4gxrl7fq40k4ln"; depends=[]; }; - SHT = derive2 { name="SHT"; version="0.1.2"; sha256="0h93yky87rgrydn994j3anq7n2s2vgli47v5ra09gwlv8p1ijpxn"; depends=[fastclime pracma Rcpp RcppArmadillo Rdpack]; }; + SHT = derive2 { name="SHT"; version="0.1.3"; sha256="016ll3dclnd3arr7x9vvwls84kypqnnm24r9jmcxkk7n8zl0xwb9"; 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]; }; @@ -4039,15 +4069,14 @@ in with self; { SII = derive2 { name="SII"; version="1.0.3.1"; sha256="1xvk04b7725ksfd7h4p7px5zanbf6s7xlmjpb7w0nvbi6km2f7ri"; depends=[]; }; SILGGM = derive2 { name="SILGGM"; version="1.0.0"; sha256="1lhmisgg2zbfksl7czz0fqag3732gkjc44n615ipxbdi2pvnc7m0"; depends=[glasso MASS Rcpp reshape]; }; SILM = derive2 { name="SILM"; version="1.0.0"; sha256="1iaivpdx18djfm5dqak0q9kfl1xfrnx3gk5x9a4y53h1d7jhl9p6"; depends=[glmnet hdi scalreg SIS]; }; - SIMMS = derive2 { name="SIMMS"; version="1.2.0"; sha256="1hss3p2xdrbgnh6710ix0l9dghribiw5fhabhicj7gkjjv6szny6"; depends=[doParallel foreach glmnet MASS survival]; }; SIN = derive2 { name="SIN"; version="0.6"; sha256="0vq80m3vl8spdnlkwvwy0gk3ziyybqzjp3scnfdcpn942ds7sgg9"; depends=[]; }; SIRE = derive2 { name="SIRE"; version="1.1.0"; sha256="0f624j087k7krg73bqn2qxdgzq66jyhvzz8n024vz3h4hwagxs5n"; depends=[dplyr igraph magrittr MASS Matrix matrixcalc numDeriv psych Rsolnp stringr systemfit]; }; SIRItoGTFS = derive2 { name="SIRItoGTFS"; version="0.2.4"; sha256="1hyhjwkv26fpplzqrdh41r8j91la5j0jidbwnh2vla6s3wf7jg47"; depends=[data_table dplyr easycsv reshape2 rgdal rgeos sp]; }; - SIS = derive2 { name="SIS"; version="0.8-7"; sha256="17fvl58qfwdfn29x9ar9w9v3a26cihcnqb55zgyhmamc57dinchy"; depends=[glmnet ncvreg survival]; }; + SIS = derive2 { name="SIS"; version="0.8-8"; sha256="1f5czwcgpmmn8habm24p3xh4w7jn2faais2x2gmaiq4dpjfnv6h8"; depends=[glmnet ncvreg survival]; }; SISIR = derive2 { name="SISIR"; version="0.1"; sha256="08lw9y38j5qq00m2vcxsac97lg14j4w1y6607vw8isrb3qb5db9z"; depends=[doParallel expm foreach glmnet Matrix RSpectra]; }; SIfEK = derive2 { name="SIfEK"; version="0.1.0"; sha256="037ps6yfy7w6i8vm0b78c8w9kdmw312dl5nc2qz86rfk8kjg7w27"; depends=[MASS numDeriv ramcmc smfsb]; }; SK = derive2 { name="SK"; version="1.1"; sha256="19yg7yc2k4zz29bh42lw2jpjvkdj33f26xkfs8vz8lpp98yjf2vx"; depends=[FitAR GD MASS RColorBrewer rgeos rtop sp]; }; - SKAT = derive2 { name="SKAT"; version="1.3.2.1"; sha256="0ylfz63xiq2zw9nc8nqr89qbhl3fnkhjgg9x7yxjm78vrn640hkl"; depends=[]; }; + SKAT = derive2 { name="SKAT"; version="2.0.0"; sha256="1qkc95n31bmz5y3saai0z50a081mngjlsypc259hbw355xayj2xr"; depends=[Matrix SPAtest]; }; SLC = derive2 { name="SLC"; version="0.3"; sha256="0l0y1sjj0glsb7vwla99ijclcgaq2y85bgz1wqm348n4shsmm2rs"; depends=[]; }; SLDAssay = derive2 { name="SLDAssay"; version="1.8"; sha256="04ykj7s9kpvg5bmf7x16154kfpdy45b7y7hhyh31sxlscv7c5bbp"; depends=[]; }; SLEMI = derive2 { name="SLEMI"; version="1.0"; sha256="1yfyqxl9sszym418p64zalc2yna9s9qgk9wvviz7n44icsdps33q"; depends=[caret corrplot doParallel e1071 foreach ggplot2 ggthemes gridExtra Hmisc nnet reshape2 stringr]; }; @@ -4064,7 +4093,7 @@ in with self; { SMITIDstruct = derive2 { name="SMITIDstruct"; version="0.0.5"; sha256="12ffxj96w3pi18l0scz5sd3dl37vd4vg2wcfykaxdhf8z142ha3k"; depends=[Biostrings ggplot2 sf]; }; SMITIDvisu = derive2 { name="SMITIDvisu"; version="0.0.6"; sha256="0563z9dypxsd9g532i1xfxdi8d29zwdla5ria15harimfda55ksq"; depends=[htmlwidgets jsonlite magrittr Rcpp yaml]; }; SMLoutliers = derive2 { name="SMLoutliers"; version="0.1"; sha256="10frs7wcyn368m7fvw2f1cyd0xqr6sv5jziixnyvr8q5fadyl2p0"; depends=[]; }; - SMM = derive2 { name="SMM"; version="1.0.1"; sha256="0g2blwcir0sxvqrivcyn9a8ssx34834lgcwrjwb6kcrq224dchws"; depends=[DiscreteWeibull seqinr]; }; + SMM = derive2 { name="SMM"; version="1.0.2"; sha256="1g1c7ssdcnzgv6b221ya1xrypg2ksahc7qj1042j8nlx5wg29cld"; depends=[DiscreteWeibull seqinr]; }; SMMA = derive2 { name="SMMA"; version="1.0.2"; sha256="13psgrpljnaxpcq4amiyg5mqhpzmb2hyb7jzh3h8wyq18rvs3s4d"; depends=[Rcpp RcppArmadillo]; }; SMNCensReg = derive2 { name="SMNCensReg"; version="3.0"; sha256="06542jacy74mw6ic0i1ml09pn45sll96bya7dqja6bg9yp0m6bvr"; depends=[Matrix PerformanceAnalytics]; }; SMPracticals = derive2 { name="SMPracticals"; version="1.4-3"; sha256="0zxq84f9i3b86xx6msb25b61gyj9k09iab2b7wg4d93yas9qzayf"; depends=[ellipse MASS nlme survival]; }; @@ -4076,17 +4105,18 @@ in with self; { SNPassoc = derive2 { name="SNPassoc"; version="1.9-2"; sha256="113byj8zbg6xyxb1qzm76sqfyk3fap0sd90691zzm1x2pbfnb3mh"; depends=[haplo_stats mvtnorm survival]; }; SNPknock = derive2 { name="SNPknock"; version="0.8.2"; sha256="121pdgvdffj61hw8x8m76na0cg5iw5gb586q05ikw5d959mmbzrs"; depends=[Rcpp RcppArmadillo RcppProgress Rdpack]; }; SNPmaxsel = derive2 { name="SNPmaxsel"; version="1.0-3"; sha256="0pjvixwqzjd3jwccc8yqq9c76afvbmfq0z1w0cwyj8bblrjpx13z"; depends=[combinat mvtnorm]; }; - SNSequate = derive2 { name="SNSequate"; version="1.3.2"; sha256="0aln71h4g6xayh59zd7bsh66l0jv34zn5kc43ldm2g0d82gh6xr4"; depends=[emdbook knitr magic plyr progress statmod]; }; + SNSequate = derive2 { name="SNSequate"; version="1.3.3"; sha256="1qadhk2acpr0lkh2z37ivif9dbp7zb31lfn32ch2sb0z9pp56his"; depends=[emdbook knitr magic plyr progress statmod]; }; SNscan = derive2 { name="SNscan"; version="1.0"; sha256="1s7dxi7faih0phx5wk2xrrzhvfwicq3h2cg8x2klwbrslin973lz"; depends=[igraph poweRlaw Rmpfr]; }; SOAR = derive2 { name="SOAR"; version="0.99-11"; sha256="1n38gx5sxpkqfkk4y6vpp6g19b8bs5bisni9wn6311s0csizp86m"; depends=[]; }; SODC = derive2 { name="SODC"; version="1.0"; sha256="18s4rcp5dzchvwrzzbfhbs3x91zlg1rymjarxjk5i429mfrn0krx"; depends=[magic MASS ppls psych]; }; SOFIA = derive2 { name="SOFIA"; version="1.0"; sha256="1jlaggxa2nz2r5yb2xmf0dh5wmxfdk6xwn0l3nwsqh82vyxhp7l9"; depends=[png]; }; SOIL = derive2 { name="SOIL"; version="1.1"; sha256="0dvfh84xjzald51kmdb546par2rbjdn3nys9y9w7cvafv2lc5yj9"; depends=[brglm2 glmnet MASS ncvreg]; }; SOLOMON = derive2 { name="SOLOMON"; version="1.0-1"; sha256="0z91wsrgdir25ks4dnirzsg4f1ngal7n40235m3w43j6y6dhkqrc"; depends=[]; }; - SOMbrero = derive2 { name="SOMbrero"; version="1.2-4"; sha256="0l9cw17l18pp99yrqczg8d7zbdbp65iyyy24iq91fsfwr5p1w4xn"; depends=[igraph RColorBrewer scatterplot3d shiny wordcloud]; }; + SOMbrero = derive2 { name="SOMbrero"; version="1.2-5"; sha256="0scr6dfp70im3nf5frkagb2di6n3b5c1yiiwq9d3c0r4gxi40dzc"; depends=[igraph RColorBrewer scatterplot3d shiny wordcloud]; }; SOPIE = derive2 { name="SOPIE"; version="1.5"; sha256="0isvb2vzzpn57bq0ix2pfaqdnl5z8qk6v6fvf15vnxcqg2sm63q5"; depends=[ADGofTest circular]; }; SOR = derive2 { name="SOR"; version="0.23.1"; sha256="1accs4bqy080nfmgkdg7bgamdrcwcn01y6nydvvq12w3v8asdvwh"; depends=[Matrix]; }; SOUP = derive2 { name="SOUP"; version="1.1"; sha256="0k8nlvl4681cz07xjazprcc0jhknfa5hgr7w1qxxmgrp3sprr8r4"; depends=[tensor]; }; + SP2000 = derive2 { name="SP2000"; version="0.0.5"; sha256="0ny7a3i7hb1j3vkdnjy8gyhbvpqnzj588l127p6wxal48ks2g7zp"; depends=[jsonlite pbmcapply purrr rlist tibble]; }; SPADAR = derive2 { name="SPADAR"; version="1.0"; sha256="0xzhcy5nglwx9j2jkm3i9xj1iw1y9wbf6rwfjyhpiwwq6qn8mn5r"; depends=[mapproj RCEIM]; }; SPARQL = derive2 { name="SPARQL"; version="1.16"; sha256="0gak1q06yyhdmcxb2n3v0h9gr1vqd0viqji52wpw211qp6r6dcrc"; depends=[RCurl XML]; }; SPAS = derive2 { name="SPAS"; version="2020.1.1"; sha256="1bvnyxg3npxv63kikmr30jgc14f1s1a5vfh40qs50nbzq84pl6bx"; depends=[BB MASS Matrix msm numDeriv plyr RcppEigen TMB]; }; @@ -4108,6 +4138,7 @@ in with self; { 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-9"; sha256="0kf6mmbvavid3dw2l4fkclk669wi13wkyykhwn5272d6qnhlhhca"; depends=[]; }; + SPUTNIK = derive2 { name="SPUTNIK"; version="1.3"; sha256="0xmd7y0w1wnbavpjhnap2wczprl1xccrgdwgrmv9031lasrd9xv9"; depends=[e1071 edgeR ggplot2 imager infotheo irlba reshape 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]; }; @@ -4115,18 +4146,20 @@ in with self; { SQB = derive2 { name="SQB"; version="0.4"; sha256="12ii8xlwd2r77bj76j7l43898ras25z3plhhv106jaklhpcnk23m"; depends=[caret nnet pls rpart]; }; SQDA = derive2 { name="SQDA"; version="1.0"; sha256="0nfimk625wb64010r5r7hzr64jfwgc6rbn13wvrpn0jgayji87h6"; depends=[limma mvtnorm PDSCE]; }; SQN = derive2 { name="SQN"; version="1.0.5"; sha256="0kb8kf6g482zqdp4avwvhs3pqghfny757dbzfl1abaigmvwvx4qj"; depends=[mclust nor1mix]; }; - SQRL = derive2 { name="SQRL"; version="0.7.0"; sha256="166sl5vy1nf854wr9ps66h8166l1l8yla5d6c9icivyik77nqqjv"; depends=[RODBC]; }; - SQUAREM = derive2 { name="SQUAREM"; version="2020.1"; sha256="0v4ax1v8diw2w7fdhfzz1z0bwixkmcrc39ax3y116f399rc06qbs"; depends=[]; }; + SQRL = derive2 { name="SQRL"; version="0.7.1"; sha256="1ipkd1pl3v9an88maailz8ypikyh6rnxzpnb7wfxphks6m2swgfy"; depends=[RODBC]; }; + SQUAREM = derive2 { name="SQUAREM"; version="2020.2"; sha256="1j6sa93xjvynnzx9jx79a3fysbykmbqyknknsqif5bcha6xp6cvf"; depends=[]; }; SRCS = derive2 { name="SRCS"; version="1.1"; sha256="13zf3cqs53w68f9zc1fkb9ql84rvzn7g1hbykqrbvss8hjaq8x1r"; depends=[]; }; SRRS = derive2 { name="SRRS"; version="0.1.1"; sha256="0jv545a97q4pyl89lmhn3y0jhdzyq033mvx144x8lcgx59s7cyi3"; depends=[gtools tcltk2]; }; SRTtools = derive2 { name="SRTtools"; version="1.2.0"; sha256="1203i6nqclx0faxyvhdaapmfxy8h95jj83svxriqh1hpava5s1dy"; depends=[magrittr]; }; - SSBtools = derive2 { name="SSBtools"; version="0.5.0"; sha256="0z6nzsg8mfmnzzf24w7s7lhkp3xd7vlkgjn34x6yps82ry3mhyra"; depends=[Matrix stringr]; }; - SSDM = derive2 { name="SSDM"; version="0.2.6"; sha256="0qyx755h6rqgc6i3mw0vdaw2jx1yclkm9qxb98njkfk8if7wmbmn"; depends=[dismo e1071 earth gbm gplots mgcv nnet randomForest raster rpart SDMTools shiny shinydashboard shinyFiles sp spThin]; }; + SSBtools = derive2 { name="SSBtools"; version="0.6.0"; sha256="1p00kacf49h475jdq9lf955dpzw81n399zzpzx7igp8d2snccy3f"; depends=[Matrix stringr]; }; + SSDM = derive2 { name="SSDM"; version="0.2.8"; sha256="19l78dkjk76ababkd7xsfn0fy99khfa4i502q4vllpvch4cjz51c"; depends=[dismo e1071 earth gbm ggplot2 mgcv nnet poibin randomForest raster reshape2 rpart scales shiny shinydashboard shinyFiles sp spThin]; }; SSDforR = derive2 { name="SSDforR"; version="1.5.12"; sha256="12vhdh808w4qbr7ipidx79y0lsn04za7d0m6dxpn8mgbplr64kdb"; depends=[MAd MASS metafor psych SingleCaseES TSA TTR]; }; SSLASSO = derive2 { name="SSLASSO"; version="1.2-2"; sha256="0vnn9ksdf0qgjflgx1sfj6q6j9jfnarbx2222rh9kb10jy8b16jv"; depends=[]; }; + SSLR = derive2 { name="SSLR"; version="0.9.0"; sha256="1k7a8f25jhswfhagbn8dr0lhc9148475v264kh0a4p0852vsbdlr"; depends=[dplyr foreach generics magrittr parsnip plyr proxy purrr RANN Rcpp RcppArmadillo rlang RSSL]; }; SSM = derive2 { name="SSM"; version="1.0.1"; sha256="1h8yyzh5rn5jay70kyzvwirfndi049a5w28qigrjv5rxd7ml84l7"; depends=[]; }; - SSN = derive2 { name="SSN"; version="1.1.13"; sha256="0hk138p1jnlda7d2wxlrf2ipkgliqlip1i5xp67aym979g0b3aaj"; depends=[BH igraph lattice maptools MASS Matrix rgdal rgeos RSQLite sp]; }; + SSN = derive2 { name="SSN"; version="1.1.15"; sha256="057lh2ym82ff3c25vyh97csns4jwlbvxwc4jai0i4yplxf0ccmha"; depends=[BH igraph lattice maptools MASS Matrix rgdal rgeos RSQLite sp]; }; SSOSVM = derive2 { name="SSOSVM"; version="0.2.1"; sha256="11wlalpw6yhvv95xr8vvgxgl4jafc2ghzsk5wqyv71ahxarmrlss"; depends=[MASS mvtnorm Rcpp RcppArmadillo]; }; + SSP = derive2 { name="SSP"; version="1.0.1"; sha256="0ccg81rsjki1fcqvj6lgmmmy5yw1gxy8khajl1i80qyi4v7ny9hk"; depends=[ggplot2 sampling vegan]; }; SSRA = derive2 { name="SSRA"; version="0.1-0"; sha256="1d0lg2dz8vf1d63366s5apm0ygrsfxivbrsij907r244zj6i1c37"; depends=[shape stringr]; }; SSRMST = derive2 { name="SSRMST"; version="0.1.1"; sha256="15s6vcmk8a27yw3rlfkajby6qkizp4sfiyi63m7hc86svd15x4wg"; depends=[survival survRM2]; }; SSrat = derive2 { name="SSrat"; version="1.1"; sha256="1mmwla7yqqldv0s5hqljq2k2qljdfhq97m5128gvf3iy7n2yjzgj"; depends=[plyr sna]; }; @@ -4147,7 +4180,7 @@ in with self; { STRAH = derive2 { name="STRAH"; version="1.0"; sha256="0a2av8by99sq7l28c7cjwm6nqhp1i4pd5qxcsarvwd8f9fckvr5z"; depends=[BiocManager Biostrings BSgenome BSgenome_Hsapiens_UCSC_hg19]; }; STRMPS = derive2 { name="STRMPS"; version="0.5.8"; sha256="0vlmhrna0laqzjpbg4sgnscrli3cly2lc5d69n6iqfl213zsfz78"; depends=[Biostrings dplyr IRanges purrr ShortRead stringr tibble tidyr]; }; STV = derive2 { name="STV"; version="1.0.1"; sha256="1gzy47s4qg83fagvm19jwpbbplkvxi9qv6ac0j86i0s8v0yrlrks"; depends=[]; }; - STraTUS = derive2 { name="STraTUS"; version="1.1.1"; sha256="0hl8kyg9hsrsqcxg8bcmp5wm70s92scahlac617h2c7rirbjdsxz"; depends=[ape ggplot2 ggtree gmp igraph phangorn RcppAlgos]; }; + STraTUS = derive2 { name="STraTUS"; version="1.1.2"; sha256="0n3i7gbycp1f10058h9xlh3yk21w2izdb3xgs793mmh1i1sjy394"; depends=[ape ggplot2 ggtree gmp igraph phangorn RcppAlgos]; }; SUE = derive2 { name="SUE"; version="1.0"; sha256="0akv724s84v2zixvwywj1ydfnfvcjnaabv6gm0601nsrh6ij1mi6"; depends=[]; }; SUMMER = derive2 { name="SUMMER"; version="0.3.0"; sha256="17ymbwga6m2npbvvqqhcnjd89f0jsaz8kwf7n68wwkqvgiqh3qcm"; depends=[ggplot2 maptools Matrix reshape2 sp spdep survey survival viridis]; }; SVMMaj = derive2 { name="SVMMaj"; version="0.2.9"; sha256="1405gigyjfp8by8nfx4g3rhw9x6r6g7dkpgw52jllv6n4036xa3h"; depends=[dplyr ggplot2 gridExtra kernlab reshape2 scales]; }; @@ -4155,18 +4188,18 @@ in with self; { SVN = derive2 { name="SVN"; version="1.0.1"; sha256="0n93lqb1f2s2qvzc8lrcqmr0fhd57xqbi0ymrqqmll31ns679m92"; depends=[data_table igraph memoise]; }; SWIM = derive2 { name="SWIM"; version="0.2.0"; sha256="120rr71hlvwbb3qdwl7s7mhrbjikl11yp55xmddk6xqs13qvi5j0"; depends=[ggplot2 Hmisc nleqslv plyr Rdpack reshape2]; }; SWMPr = derive2 { name="SWMPr"; version="2.3.1"; sha256="1az6ss8wkdgq4l1cmfflajzs7z6w6140bclb289gb090pi69p7gy"; depends=[data_table dplyr ggmap ggplot2 gridExtra httr lattice maptools oce openair RColorBrewer reshape2 tictoc tidyr XML zoo]; }; - SWMPrExtension = derive2 { name="SWMPrExtension"; version="1.1.2"; sha256="0123lcb6jfh3gbh2jmdpargry44fncm7j505vpkcp661fcjckymd"; depends=[broom dplyr EnvStats flextable ggplot2 ggthemes leaflet lubridate magrittr maptools officer RColorBrewer rgdal rgeos rlang scales sp SWMPr tidyr]; }; + SWMPrExtension = derive2 { name="SWMPrExtension"; version="1.1.3"; sha256="1xyn802aadx3fxckqvimkpwbx0pv6g3wqjzjx2k46qnm2gl6ck0v"; depends=[broom dplyr EnvStats flextable ggplot2 ggthemes leaflet lubridate magrittr maptools officer RColorBrewer rgdal rgeos rlang scales sp SWMPr tidyr]; }; SYNCSA = derive2 { name="SYNCSA"; version="1.3.4"; sha256="0n9za302x638s666xs86zy94qch9wn0rln8xy6x9jymhhq9zn0kj"; depends=[FD permute RcppArmadillo vegan]; }; SafeBayes = derive2 { name="SafeBayes"; version="1.1"; sha256="09bhd3z9ia2mvpn1h0hil00j6cm4x9y9ymxc3gj8wd4ybdi3jqlm"; depends=[]; }; SafeQuant = derive2 { name="SafeQuant"; version="2.3.1"; sha256="0rgi0ij33sdvkpmjynfmsj0f29kl9l9ylsqckg5x4v49m6mzq1yh"; depends=[Biobase corrplot data_table epiR gplots limma optparse seqinr]; }; SailoR = derive2 { name="SailoR"; version="1.0"; sha256="1gb50qd9s3dwdvl6qihpkgwlhckbhn7h3wpz9k74xgyd874krcld"; depends=[]; }; Sample_Size = derive2 { name="Sample.Size"; version="1.0"; sha256="1vfnb2gg3rax4sxd81xqznfvh300nv45nn7zjsyrdjyg1n3ym7nw"; depends=[]; }; - SampleSize4ClinicalTrials = derive2 { name="SampleSize4ClinicalTrials"; version="0.1.1"; sha256="15q1jsvnz3bhnjil0wbladahac0ppx3qgg5qz7z70vnivgjah606"; depends=[]; }; + SampleSize4ClinicalTrials = derive2 { name="SampleSize4ClinicalTrials"; version="0.2.2"; sha256="19dl5sfrsmahrf1q0ljpjmp2821mn2h9d53ds9jyci0wv287gzs9"; depends=[]; }; SampleSizeMeans = derive2 { name="SampleSizeMeans"; version="1.1"; sha256="1wbc46n8b8wbcxl21blbzs5728dr8r0l8d3jpzbha8pcav0xrh1m"; depends=[]; }; SampleSizeProportions = derive2 { name="SampleSizeProportions"; version="1.0"; sha256="0mvkvx3nni0l8ys68sq3h2zlbjvksdcdzxqlf03k0ca5bbcmdf9l"; depends=[]; }; SamplerCompare = derive2 { name="SamplerCompare"; version="1.3.0"; sha256="1lqnkgbg1naa3crk3rakrf37vvxj6mbilbpxrv0k5iifdmh0b7k1"; depends=[mvtnorm]; }; SamplingBigData = derive2 { name="SamplingBigData"; version="1.0.0"; sha256="0khrh7vfqqzpfp16x0ic5ml854wr2fj28cx95s6c0pz91hzlxkns"; depends=[]; }; - SamplingStrata = derive2 { name="SamplingStrata"; version="1.5"; sha256="1rh26jcb2ksjfabpqprc0glw4b6ig8hagqjhxrm6pgji9para31x"; depends=[doParallel formattable memoise pbapply]; }; + SamplingStrata = derive2 { name="SamplingStrata"; version="1.5-1"; sha256="01kjm45pc1zfy2xlp9fhynv4x2mzsgjwymr5j7narpmdsm14mxcx"; depends=[doParallel formattable memoise pbapply]; }; SanFranBeachWater = derive2 { name="SanFranBeachWater"; version="0.1.0"; sha256="18w2q3hzcrbmagnjyrn1ikwiyjh723mjb2vy0d8p1a6za0460p9w"; depends=[dplyr lubridate magrittr readr rvest tibble xml2]; }; SanzCircos = derive2 { name="SanzCircos"; version="0.1.0"; sha256="0vw41qldp1gsj4mx2hdd5jfhx9r8pv62i8gvs86p6bvfzy2l1lq4"; depends=[dplyr pbapply purrr randomcoloR readr tibble tidyr]; }; Scale = derive2 { name="Scale"; version="1.0.4"; sha256="1fa3840kji34qpbw6mxfavk8wq0vq0vx2w6ya71idbkxnvwc3y06"; depends=[Hmisc MASS psych]; }; @@ -4193,53 +4226,54 @@ in with self; { Sejong = derive2 { name="Sejong"; version="0.01"; sha256="1d9gw42dbs74w7xi8r9bs6dhl23y16yxqzyhqqayvcm98q3l77nf"; depends=[]; }; SeleMix = derive2 { name="SeleMix"; version="1.0.1"; sha256="1qzy59wbjh8llm66l70xi0p3lv94iawh2h5vwa9sqy2ra5vmpaxk"; depends=[mvtnorm]; }; Select = derive2 { name="Select"; version="1.4"; sha256="1qx4wwxxwjq31vf645xvwb0y2z5h4v6ca8fcrfpaj5kc33f333v2"; depends=[ade4 FD lattice latticeExtra Rsolnp]; }; - SelectBoost = derive2 { name="SelectBoost"; version="1.4.0"; sha256="14i6dgg1yqnghjjfvi7l58kqm6pry9b91sy9gkwrvfqg0nz1dpny"; depends=[Cascade glmnet igraph lars msgps Rfast]; }; + SelectBoost = derive2 { name="SelectBoost"; version="2.0.0"; sha256="137fxvlpc2vyn5w93ih8bm6pp198xwlbb9ky8dhxgarh0syz8g4v"; depends=[abind Cascade glmnet igraph lars msgps Rfast spls varbvs]; }; SelvarMix = derive2 { name="SelvarMix"; version="1.2.1"; sha256="02d16ffw5syq0d3yiim9jgrjlz99n956zxp23idpsmq6lb2whq66"; depends=[glasso Rcpp RcppArmadillo Rmixmod]; }; - SemNeT = derive2 { name="SemNeT"; version="1.1.2"; sha256="07vgnfj4wirfpc9mjy6m0qd3pc0423qq8bvpk5zzmynvaqgnb89j"; depends=[doParallel dplyr foreach ggplot2 igraph lsa magrittr NetworkToolbox networktools pbapply plyr purrr qgraph RColorBrewer SemNetCleaner]; }; - SemNetCleaner = derive2 { name="SemNetCleaner"; version="1.1.3"; sha256="177r9z2z8l5ri2h3s94day8d19n13hc4861vc6fcymaa35nh0z02"; depends=[foreign hunspell R_matlab readxl searcher SemNetDictionaries stringdist]; }; + SemNeT = derive2 { name="SemNeT"; version="1.2.0"; sha256="1j1i0c5l490l5h38ni9ylycfmks9giirzk44qhyx2mdqvy1sq5sn"; depends=[doParallel dplyr foreach ggplot2 igraph lsa magrittr NetworkToolbox networktools pbapply plyr purrr qgraph RColorBrewer SemNetCleaner]; }; + SemNetCleaner = derive2 { name="SemNetCleaner"; version="1.1.5"; sha256="1ak6y3jc2dbfl7bd5qg6hh5lrpisxfp87v8408qvvji6962h5fm5"; depends=[foreign htmlTable hunspell knitr R_matlab readxl rmarkdown searcher SemNetDictionaries stringdist stringi]; }; SemNetDictionaries = derive2 { name="SemNetDictionaries"; version="0.1.5"; sha256="179dgq65m4kzbqxgcicnchahslildc43f506sa7x2prbr7by27d3"; depends=[]; }; Semblance = derive2 { name="Semblance"; version="1.1.0"; sha256="1kzrg5z3244nx9y37p092wpangni3fxpx04i5fb4dhrmav4rvgab"; depends=[DescTools fields msos PerformanceAnalytics]; }; SemiCompRisks = derive2 { name="SemiCompRisks"; version="3.3"; sha256="06anhf0kqaz4i84g73w3l4gf0q2mwi00vlkciqfbxpwgrbacplf6"; depends=[Formula MASS survival]; }; SemiMarkov = derive2 { name="SemiMarkov"; version="1.4.6"; sha256="0nga790kcrvmbrx5asp4062711x0kjsccc246l4syiiw30b769ig"; depends=[MASS numDeriv Rsolnp]; }; SemiPar = derive2 { name="SemiPar"; version="1.0-4.2"; sha256="0pa3drpvclkw81ji5m1h5arj5c2rh03dnlff97cnnr1v5kvg1i4w"; depends=[cluster MASS nlme]; }; SenSrivastava = derive2 { name="SenSrivastava"; version="2015.6.25"; sha256="0r4p6wafnfww07kq19lfcs96ncfi0qrl8n9ncp441ri9ajwj54qk"; depends=[]; }; - SensMixed = derive2 { name="SensMixed"; version="2.1-0"; sha256="0ykg94amnm9clf8d3naap8fmv9qqc6j1q52wnb83zk7ry44dp7dh"; depends=[doBy ggplot2 Hmisc lme4 MASS plyr reshape2 shiny shinyBS xtable]; }; 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]; }; + SensoMineR = derive2 { name="SensoMineR"; version="1.25"; sha256="0bnb8cx3vhmzlrnhgaarbr94l41c5jx4761vzc5xa7m0ih40q3s0"; 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-3"; sha256="0k6sf25hqisjjc97n17vdihpblab0ywv77lfxdzwpsbcv2x6gsx9"; depends=[ggplot2 glmnet moments ngramrr qdapDictionaries spikeslab stringdist tm]; }; SeqAlloc = derive2 { name="SeqAlloc"; version="1.0"; sha256="04rhr3gb2p9i35a3x4k8m0lv42ncfqlhx6sf3bq8yihppwrag8x3"; depends=[]; }; + SeqDetect = derive2 { name="SeqDetect"; version="1.0.7"; sha256="054b5v0jzk9pj9hrxk31kvcdm789lx8gzh70ivskixz57kajmiss"; depends=[dplyr eventdataR igraph Rcpp]; }; SeqFeatR = derive2 { name="SeqFeatR"; version="0.3.1"; sha256="1dvl65n60j7wl0jdb0myi9hprlr9grq6nf9m68gzxm9sz3h8lpvh"; 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]; }; + SeqKat = derive2 { name="SeqKat"; version="0.0.8"; sha256="09b5zrp41241ha5q8bxll9n12sn11hsbv46g2ld1lqsy2razivr4"; depends=[doParallel foreach Rcpp]; }; SeqMADE = derive2 { name="SeqMADE"; version="1.0"; sha256="0nf1xjhk0kpmmzgcxycg3ccxvwq6gydjq7xq6n9m7k7v35v9v3qf"; depends=[MASS]; }; SeqNet = derive2 { name="SeqNet"; version="1.1.0"; sha256="0dbiafqgqnmws38lpa58mkzciprkan5qnrw9aivi89s065ykjd74"; depends=[fitdistrplus ggplot2 igraph mvtnorm purrr RColorBrewer Rcpp rlang tibble]; }; SequenceSpikeSlab = derive2 { name="SequenceSpikeSlab"; version="0.1.1"; sha256="079qm4klgaml99j4cshy3n54pg7q537zlagib4xd8mswdmqdvll6"; depends=[Rcpp RcppProgress selectiveInference]; }; Sequential = derive2 { name="Sequential"; version="3.1"; sha256="0wh5bxqgmkmlbz9bmvpv3lp8mq4iih86a73ccl6fycfpqvq6nf6i"; depends=[boot]; }; SequentialDesign = derive2 { name="SequentialDesign"; version="1.0"; sha256="1gi37pixwbpy7358id1c75rckr352hs8vjs8sk8qgsr97pkm5xdq"; depends=[Sequential]; }; - SetMethods = derive2 { name="SetMethods"; version="2.4"; sha256="06fcin03mvqbg4mk09ygn54li0wdyp57mv902c49zs9v4y8r88cs"; depends=[betareg fmsb ggplot2 ggrepel lattice QCA scatterplot3d]; }; SetRank = derive2 { name="SetRank"; version="1.1.0"; sha256="0p7vwsw05s5hfw1mfh3fbm9nfzsymnxzrdjin7k21dx7asb618wy"; depends=[data_table igraph XML]; }; SetTest = derive2 { name="SetTest"; version="0.2.0"; sha256="08wc6cbnannmwkncqhpcw6l0y7c1v7z3awk5j7fd853nszfmpbk0"; depends=[]; }; - Seurat = derive2 { name="Seurat"; version="3.1.2"; sha256="0m1qi39snbmkkv1p07bzg1r7snc9x6a1y0dghvpk1nzgcfpmnsj4"; depends=[ape cluster cowplot fitdistrplus future future_apply ggplot2 ggrepel ggridges httr ica igraph irlba KernSmooth leiden lmtest MASS Matrix metap pbapply plotly png RANN RColorBrewer Rcpp RcppAnnoy RcppEigen RcppProgress reticulate rlang ROCR rsvd Rtsne scales sctransform SDMTools tsne uwot]; }; + Seurat = derive2 { name="Seurat"; version="3.1.4"; sha256="0lhjbjhv1hnx5i3gkx41k68i8ykay3f24708h30wx9xywww9lsvi"; depends=[ape cluster cowplot fitdistrplus future future_apply ggplot2 ggrepel ggridges httr ica igraph irlba KernSmooth leiden lmtest MASS Matrix metap patchwork pbapply plotly png RANN RColorBrewer Rcpp RcppAnnoy RcppEigen RcppProgress reticulate rlang ROCR rsvd Rtsne scales sctransform tsne uwot]; }; ShapeChange = derive2 { name="ShapeChange"; version="1.4"; sha256="1ch7avx8mxjk8vrp17inaihmbsv968wflyk1n4fbjvacbl24vn2b"; depends=[coneproj quadprog]; }; - ShapePattern = derive2 { name="ShapePattern"; version="1.0.1"; sha256="18jzs0sq21qhldm86mgx7yb9kl473vv1aljl9hm4560xy5pd5fnb"; depends=[rgdal rgeos sp]; }; - ShapeSelectForest = derive2 { name="ShapeSelectForest"; version="1.3"; sha256="1vvfl1ldrn0l9w38hx0hhszvj5a2dpmfl6ljzw7f0ji181lrx96m"; depends=[coneproj raster rgdal]; }; - SharpeR = derive2 { name="SharpeR"; version="1.2.0"; sha256="1gw8wwdqbra4bccbcamqn2j7d853rga1vcvk1p6naih6vbnfqn2s"; depends=[matrixcalc sadists]; }; + ShapePattern = derive2 { name="ShapePattern"; version="2.0.3"; sha256="13sp9hv0ynab1d9fmr8531qvrrx4x958pw50b5828mqbqsgk24ff"; depends=[landscapemetrics raster rgdal rgeos sp]; }; + ShapeSelectForest = derive2 { name="ShapeSelectForest"; version="1.4"; sha256="15ds3024qcvnq3pnbhpyd6hbif26mdzw1srqv44hwsllgzpi7602"; depends=[coneproj raster]; }; + SharpeR = derive2 { name="SharpeR"; version="1.2.1"; sha256="1xcnbjwcqc9mhb6kqcarkmjcr5zrn5hryfp4i4rayra9yk9k18r8"; depends=[matrixcalc sadists]; }; ShiftShareSE = derive2 { name="ShiftShareSE"; version="1.0.1"; sha256="09sm3frapxv1zhxy84wqyaxdk5jx62ijszfa34zlknlgivividfy"; depends=[Formula]; }; ShinyImage = derive2 { name="ShinyImage"; version="0.1.0"; sha256="0nhsaq6i9lr8gqpdkahw3qr0c0cb0qwc0nqpk1ism21l6zg6ahc9"; depends=[EBImage R6 shiny shinyjs]; }; - ShinyItemAnalysis = derive2 { name="ShinyItemAnalysis"; version="1.3.1"; sha256="1s1kb1rrppk0kfqywgsmyfl32hrq9ywv8241n9d3xv88cflxz237"; depends=[corrplot cowplot CTT data_table deltaPlotR difNLR difR DT ggdendro ggplot2 gridExtra knitr latticeExtra ltm mirt moments msm nnet plotly psych psychometric reshape2 rmarkdown shiny shinyBS shinydashboard shinyjs stringr VGAM xtable]; }; + ShinyItemAnalysis = derive2 { name="ShinyItemAnalysis"; version="1.3.2"; sha256="1h6zja2yvg0dj01x7l29jv6rx0h3adqnkkjqgajd8vyj5hv536v7"; depends=[corrplot cowplot CTT data_table deltaPlotR difNLR difR DT ggdendro ggplot2 gridExtra knitr latticeExtra ltm mirt moments msm nnet plotly psych psychometric reshape2 rmarkdown shiny shinyBS shinydashboard shinyjs stringr VGAM xtable]; }; ShinyTester = derive2 { name="ShinyTester"; version="0.1.0"; sha256="0wm4rl2p8ggw6v2chk9b6ygh5y8p8cwzbyra0nr0qr2ka97didp8"; depends=[dplyr purrr readr stringr tidyr visNetwork]; }; - ShortForm = derive2 { name="ShortForm"; version="0.4.4"; sha256="05ia1x8hmaa8df77jbs4nd04jfbglr5z6hfg9v702zhvap0mkijj"; depends=[ggplot2 lavaan stringr tidyr]; }; + ShortForm = derive2 { name="ShortForm"; version="0.4.6"; sha256="0r8flmfhm47kyzy97j3mr87srfsxwlqqsx7v0ay9qm7q2jfg6xsw"; depends=[ggplot2 lavaan stringr tidyr]; }; ShrinkCovMat = derive2 { name="ShrinkCovMat"; version="1.4.0"; sha256="0iyri3syjk9xv49d87fdyhnxg5c5x827vnak8vgckkkp62sdln2q"; depends=[Rcpp RcppArmadillo]; }; SiER = derive2 { name="SiER"; version="0.1.0"; sha256="1ng6vnh30z6z1nvclsdzc9gdbrsrb2kqdqvs6fwm0j1zqlk12x0y"; depends=[]; }; SiMRiv = derive2 { name="SiMRiv"; version="1.0.4"; sha256="1sdq1mdm5jm66jmq7mas9skq8014xd7iz16av64x645l4qxkawzw"; depends=[mco raster rgdal sp]; }; - SiZer = derive2 { name="SiZer"; version="0.1-5"; sha256="1ldl7rza58fzfbqidr1kanhfhy744nrsxrm13qdpxirdxx3vji6q"; depends=[boot]; }; + SiZer = derive2 { name="SiZer"; version="0.1-7"; sha256="068xaawc9vhi7a0b52jfq5r81kwnxn2wnqar1b35wwckmsd40b20"; depends=[boot]; }; SigOptR = derive2 { name="SigOptR"; version="0.0.1"; sha256="1sylchhhz6kx4r8jx95cvsmjsacjh8pin7acf2fyw2a4nlx9r1a6"; depends=[httr jsonlite]; }; SigTree = derive2 { name="SigTree"; version="1.10.6"; sha256="18gh7azjr979ijc2y4yyskj24ay697rw3j7znc5p4a63s4vpxr9w"; depends=[ape MASS phyext2 phylobase phyloseq RColorBrewer vegan]; }; SightabilityModel = derive2 { name="SightabilityModel"; version="1.3"; sha256="0rgv5735y07yyv5y9c3flzha97ykn34ysmzy6as1z94hqfr4w746"; depends=[]; }; - SignifReg = derive2 { name="SignifReg"; version="2.1"; sha256="01h6cz602m9jpnkpgbr5smmn3xp5aw5h5xl32kyhxqhybg75j6fj"; depends=[]; }; - Sim_DiffProc = derive2 { name="Sim.DiffProc"; version="4.4"; sha256="14qdz49gyjaja6yj053iv998mrib3nbzzf02g30sl5y0cxkpmnd1"; depends=[Deriv MASS]; }; + Signac = derive2 { name="Signac"; version="0.2.4"; sha256="1szc4a4g8c2qrjm3i597byw0sj2sksvj2w7fr93d6n5w1y251260"; depends=[BiocGenerics Biostrings BSgenome data_table dplyr future future_apply GenomeInfoDb GenomicFeatures GenomicRanges gggenes ggplot2 ggseqlogo IRanges irlba Matrix patchwork pbapply Rsamtools S4Vectors Seurat tidyr zoo]; }; + SignifReg = derive2 { name="SignifReg"; version="2.1.1"; sha256="1796qy77fm8h0gnrwfm4sdfcbf2y3c8vvz4c6yrig0h4pjhhh07h"; depends=[]; }; + Sim_DiffProc = derive2 { name="Sim.DiffProc"; version="4.5"; sha256="1rrdkmyv9fj7jjafl8zvyzpdjli2s004v1wdsifnq1zp0vmv1m9q"; depends=[Deriv MASS]; }; Sim_PLFN = derive2 { name="Sim.PLFN"; version="1.0"; sha256="1jmsydhpfv2z9cr99hfy8cairhkkxpwk4wnz1adixwxazkn7qfah"; depends=[DISTRIB FuzzyNumbers]; }; - SimBIID = derive2 { name="SimBIID"; version="0.1.3"; sha256="1vbib8ajpph35ahyv0x431y9xscinnvzvjzwhw9l810n1agbfay9"; depends=[coda dplyr ggplot2 mvtnorm purrr RColorBrewer Rcpp RcppArmadillo RcppXPtrUtils tibble tidyr]; }; + SimBIID = derive2 { name="SimBIID"; version="0.1.4"; sha256="1kqa1bm0f9kx7nr936hhpsi6hjjb3mlppxycwwi5pmzv9snm83hg"; depends=[coda dplyr ggplot2 mvtnorm purrr RColorBrewer Rcpp RcppArmadillo RcppXPtrUtils tibble tidyr]; }; SimComp = derive2 { name="SimComp"; version="3.3"; sha256="04qkis20zk0z42bv4nznffqlpwby0y0ij27gj4sa0ha864pg0hi5"; depends=[mratios multcomp mvtnorm]; }; SimCop = derive2 { name="SimCop"; version="0.7.0"; sha256="1yrdy77a9h14v92c63ng8phi2ig73wy4xjjdb75322grc0bd3jq6"; depends=[quadprog]; }; SimCorMultRes = derive2 { name="SimCorMultRes"; version="1.7.0"; sha256="10snjwrh95407iracbc52b5cvr3sp2539rrjp7fw63q50pjl285v"; depends=[evd]; }; @@ -4248,26 +4282,24 @@ in with self; { SimDissolution = derive2 { name="SimDissolution"; version="0.1.0"; sha256="1rdsxykh740h22ln635m0ysm00pdw94vp7qhgify4mcvc46c3632"; depends=[alabama dplyr mvtnorm]; }; SimEUCartelLaw = derive2 { name="SimEUCartelLaw"; version="1.0.1"; sha256="1wg9sayk55mp3f2qykvfk0cbqh050vh0n1fhpq4fmlxqll87aml9"; depends=[plot3D plot3Drgl rgl]; }; SimHaz = derive2 { name="SimHaz"; version="0.1"; sha256="04q4xyc1ki1zr3grm3khfg0kbykjy3j9qpg332l7pxp4j3wa3aw3"; depends=[survival]; }; - SimInf = derive2 { name="SimInf"; version="6.4.0"; sha256="0nq20amk41xs4dpxxrllrxnnb8wqf5sshbvgdlm93y7dhamlv8x3"; depends=[Matrix]; }; - SimJoint = derive2 { name="SimJoint"; version="0.3.5"; sha256="117jv2wzi3aqbim9w30k1cvwjnzb23kh6z0p78hm4bz37wm5vdw3"; depends=[Rcpp RcppArmadillo RcppParallel]; }; + SimInf = derive2 { name="SimInf"; version="6.5.1"; sha256="1sacky971igk2x8kmiqfavxvzvyxl53snjpb8zf72ffh3d2nn32c"; depends=[Matrix]; }; SimMultiCorrData = derive2 { name="SimMultiCorrData"; version="0.2.2"; sha256="0brszbqxf40y65xp96c5hp7hhvz3gv0xlg93r5ik8qdh0bn0y1sw"; depends=[BB GenOrd ggplot2 Matrix nleqslv psych triangle VGAM]; }; SimPhe = derive2 { name="SimPhe"; version="0.2.0"; sha256="01kzypahw41jk8s2c92h0k9w32yaicis07wb6k8qlqcmv0zj8xry"; depends=[]; }; 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.2.3"; sha256="188sd1xyi2iaw5ra23wa2ilz5zi7vl6vjcswfcpn49r2yw5i9w4n"; depends=[dplyr intervals kinship2 magrittr Matrix reshape2 rlang SimRVPedigree]; }; + SimRVPedigree = derive2 { name="SimRVPedigree"; version="0.4.4"; sha256="0z7wwwl814bwaijkmg9wcdj5xisiamc9yqypmk0hzj950569aj8p"; depends=[dplyr kinship2]; }; + SimRVSequences = derive2 { name="SimRVSequences"; version="0.2.4"; sha256="0j10dr8mc0jmwixjvzfc20l50z2ismga142cq935jj3cd24j19b6"; depends=[dplyr intervals kinship2 magrittr Matrix reshape2 rlang SimRVPedigree]; }; SimReg = derive2 { name="SimReg"; version="3.0"; sha256="188q399xcrvjw7y7lf3hfbb7x0m0hc4zaf9i1w2c4xzswmvljd8r"; depends=[ontologyIndex ontologyPlot ontologySimilarity Rcpp]; }; SimSCRPiecewise = derive2 { name="SimSCRPiecewise"; version="0.1.1"; sha256="0mhlx9m5db8a40wf275qh59345676m8bpjjmyx1v22f6m9p3b2n4"; depends=[]; }; SimSeq = derive2 { name="SimSeq"; version="1.4.0"; sha256="068gg484w07qb4wajik2s3z79xfj0jg5l4pz69267dxi5kzd9fas"; depends=[fdrtool]; }; SimTimeVar = derive2 { name="SimTimeVar"; version="1.0.0"; sha256="1x0lkgqwx1vz1gbyvy0hx20n638n30j0dny1iz5vs0cvviq3cdv8"; depends=[car corpcor ICC metafor miscTools mvtnorm plyr psych]; }; SimVitD = derive2 { name="SimVitD"; version="0.1.1"; sha256="0xq9qi3vf1aggcwy2hn7q57zvis6ws1z4azvgp2xsndbn7rg9qda"; depends=[poisson]; }; - SimilaR = derive2 { name="SimilaR"; version="1.0.6"; sha256="1cdcpl8mhzx0yp9x1djpana6fh3wi75350xdjxrikhpx1pmfl8mi"; depends=[BH Rcpp stringi]; }; + SimilaR = derive2 { name="SimilaR"; version="1.0.7"; sha256="1zabx25wqvspyl8yxknr8glz9b0dmk9wn4yz8fry4wd1nx2hl28q"; depends=[BH Rcpp stringi]; }; SimilarityMeasures = derive2 { name="SimilarityMeasures"; version="1.4"; sha256="1w4klcln4hy9vcik9csg7b3b8kk4raxgckwfrhqg089d80xbqsxj"; depends=[]; }; 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="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]; }; SingleCaseES = derive2 { name="SingleCaseES"; version="0.4.3"; sha256="05bd03ka6qxmq8ls9w0nfklya3qay90s3i0iqjpcd6id4g8cz2kb"; depends=[dplyr magrittr purrr rlang tidyr tidyselect]; }; SitesInterest = derive2 { name="SitesInterest"; version="1.0"; sha256="06l6i6jnzwj683cvd9a9dg4nlb1wy1v3wb561y97a25bikm3mfy6"; depends=[plotrix]; }; @@ -4281,7 +4313,7 @@ in with self; { Sleuth3 = derive2 { name="Sleuth3"; version="1.0-3"; sha256="0ngwri80cwqs50wjza8qyzzwign4ag1ck7fa1x7q5x08w9x6w08m"; depends=[]; }; SmCCNet = derive2 { name="SmCCNet"; version="0.99.0"; sha256="0ixvh1pd1gzbscwg4xjlcgxq5c9vqahil0fysfjc3fnba3wiidzx"; depends=[igraph Matrix pbapply PMA]; }; SmallCountRounding = derive2 { name="SmallCountRounding"; version="0.4.0"; sha256="0rx47hvm4wkmrj1hrwaa8j61y3agfb09n048j9xlda5rismaqk8z"; depends=[Matrix SSBtools]; }; - SmartEDA = derive2 { name="SmartEDA"; version="0.3.3"; sha256="0harv4ybs5qy7qcj9disissw2kj46q54pkra50ysjfs1li1dw860"; depends=[data_table GGally ggplot2 gridExtra ISLR rmarkdown sampling scales]; }; + SmartEDA = derive2 { name="SmartEDA"; version="0.3.4"; sha256="0mw49hjf9k25hnml579dmmijgfq3n6ydqrr0308bw009j5m9rzw9"; depends=[data_table GGally ggplot2 gridExtra ISLR rmarkdown sampling scales]; }; SmartSVA = derive2 { name="SmartSVA"; version="0.1.3"; sha256="10a8s2znsg8ywqkq9fsxiyqfsprrx33pqissazp2vmabs11mg4np"; depends=[isva Rcpp RcppEigen RSpectra sva]; }; SmartSifter = derive2 { name="SmartSifter"; version="0.1.0"; sha256="16rzma87k27qg6qy39mzywdj8pzkp7r9q7bpqyikazp3fk2nmfri"; depends=[mvtnorm rootSolve]; }; SmarterPoland = derive2 { name="SmarterPoland"; version="1.7"; sha256="03vs6hcd96va9kfhl2yq77alnm33j1dxy79kgrx17hlijsy65qqv"; depends=[ggplot2 htmltools httr jsonlite rjson]; }; @@ -4289,7 +4321,7 @@ in with self; { SmoothHazard = derive2 { name="SmoothHazard"; version="1.4.1"; sha256="147wjxgxnijpmixrfyl8kd4scz2w1xb8dcwvpr60zg32nv22g17r"; depends=[lava mvtnorm prodlim]; }; SmoothWin = derive2 { name="SmoothWin"; version="3.0.0"; sha256="0zq2sq0w4rs3hrra24wgbbzv88d1hx6m8q8gmc5h6nbs1172hs66"; depends=[nlme Rfast]; }; SnakesAndLaddersAnalysis = derive2 { name="SnakesAndLaddersAnalysis"; version="2.1.0"; sha256="0h3664h6d32q201qfyv9y2gg4fhg3azdpwpmx4qfbc10hsc1ghl9"; depends=[]; }; - SnowballC = derive2 { name="SnowballC"; version="0.6.0"; sha256="0b7pqdavf5jbf8si4ybnii5fff39p3b1rb5rym05j8s48hs7sqb1"; depends=[]; }; + SnowballC = derive2 { name="SnowballC"; version="0.7.0"; sha256="1wwm71mp4b2mjb5985x782p6xj519dfrpd40qli7lmig6afyw3xi"; depends=[]; }; SoDA = derive2 { name="SoDA"; version="1.0-6"; sha256="0sh2dan4ga2k14rirnkvgzsvbksx1k4ika5gkf5cy247rjkqnpj0"; depends=[]; }; SobolSequence = derive2 { name="SobolSequence"; version="1.0"; sha256="1vmp5jix3zvasvdirv8m88jc0cd8f34b4m1jvhs8g3v9lk8pxrrr"; depends=[Rcpp]; }; SocialNetworks = derive2 { name="SocialNetworks"; version="1.1"; sha256="0d868xka6d35i17r28cvm0ya971xk6y1kycsfff0279w27cjd9x0"; depends=[Rcpp]; }; @@ -4305,21 +4337,21 @@ in with self; { SongEvo = derive2 { name="SongEvo"; version="1.0.0"; sha256="0mc5wlf5axbflys6g8b7xg0di3wwkli7q0a9fby6598fq9hbaqpd"; depends=[boot geosphere lattice sp]; }; SorptionAnalysis = derive2 { name="SorptionAnalysis"; version="0.1.0"; sha256="0drns1ajcga5z56hcgjxld1riwjn7vli8k1ma1xqifpy1qwy7ci6"; depends=[]; }; SortableHTMLTables = derive2 { name="SortableHTMLTables"; version="0.1-3"; sha256="1jgrqsm0cj8qlk0s4qn3b83w96mgpp5gmhgcg9q2glc72v8c4ljh"; depends=[brew testthat]; }; - SortedEffects = derive2 { name="SortedEffects"; version="1.1.0"; sha256="14ddalkbk2bfjxpx3ppcm9ffdqxfi1d44nngbczi8923s9v2y1nc"; depends=[boot dummies Hmisc pbapply quantreg rlist SparseM]; }; + SortedEffects = derive2 { name="SortedEffects"; version="1.2.0"; sha256="0p16kxzss0inzvsd23sh7yiry1znpzdl36wf9dzhb9w7y9js8nxr"; depends=[boot dummies Hmisc pbapply quantreg rlist SparseM]; }; SoundexBR = derive2 { name="SoundexBR"; version="1.2"; sha256="0chc332v3wcz30v70yvdxhvcfdmvf4fj193cn00gl899xfxal89p"; depends=[]; }; SourceSet = derive2 { name="SourceSet"; version="0.1.3"; sha256="159kg4pna24yihkghxc2k5f56dqk8aypxcmj1whgnajmgab29ry1"; depends=[graph gRbase gtools igraph plyr progress reshape2 scales]; }; SoyNAM = derive2 { name="SoyNAM"; version="1.6"; sha256="1vwl2mknk6x0sgk0baxsvb6xy4i7mf2ypkmc9lx869nakrx1ypah"; depends=[lme4 NAM reshape2]; }; - SpATS = derive2 { name="SpATS"; version="1.0-10"; sha256="0h1xf01kar69nr96vf1y19rd543fzysv391z992mqrr98dzws9dc"; depends=[data_table fields plot3Drgl spam]; }; + SpATS = derive2 { name="SpATS"; version="1.0-11"; sha256="00xw6xz764sqlfr7pw2mxzxvm4i1p76n9h8wz62n0p3afn1d1glm"; depends=[data_table fields plot3Drgl spam]; }; SpNMF = derive2 { name="SpNMF"; version="0.1.1"; sha256="1xybxx47i3ww5d7chwl38xc48fbsclgyxcki8h85c6dkm49dxy8i"; depends=[NMF]; }; SpNetPrep = derive2 { name="SpNetPrep"; version="1.1"; sha256="1y3j7mwjxv69lrgqvi8kxvhlmdyr8v7gbg17741008xb32kgma8h"; depends=[leaflet maptools prodlim raster rgdal shiny shinythemes sp spatstat]; }; SpaCCr = derive2 { name="SpaCCr"; version="0.1.0"; sha256="0qm1fr6nnax3i1i77fi73x1z8db557avh6kivs0nskb1dfj8ri4m"; depends=[abind dplyr ggplot2 Rcpp RcppArmadillo tidyr]; }; SpaDES = derive2 { name="SpaDES"; version="2.0.4"; sha256="1ihxkr2c7rfpb02chmdv393nfc1id1cg7lq8pbb64xm5vdpyj0bv"; depends=[quickPlot reproducible SpaDES_addins SpaDES_core SpaDES_tools]; }; SpaDES_addins = derive2 { name="SpaDES.addins"; version="0.1.2"; sha256="0z1n48kfwy460zfam88ayfiq8sbzvnf6cpkasr74nykr4fabs5ha"; depends=[devtools magrittr miniUI reproducible rstudioapi shiny SpaDES_core stringi]; }; - SpaDES_core = derive2 { name="SpaDES.core"; version="0.2.7"; sha256="0m2yn907p884xq6da75ji87r5p3zzygkwxa50isz8lgnp31xmgpy"; depends=[backports codetools crayon data_table DiagrammeR dplyr fastdigest fpCompare future httr igraph lubridate quickPlot R_utils raster RCurl reproducible stringi whisker]; }; + SpaDES_core = derive2 { name="SpaDES.core"; version="1.0.0"; sha256="1bz9j787nynjxfa3dnv0ij39bsf5qq9kmqrhlas1sx9qvvzsnfaz"; depends=[backports crayon data_table dplyr fastdigest fpCompare igraph lubridate quickPlot R_utils raster RCurl reproducible rlang stringi whisker]; }; SpaDES_tools = derive2 { name="SpaDES.tools"; version="0.3.4"; sha256="0iz6mnppp2p036b7z0rcv0hbcb3m1s4262ws797qpgxqj22d0hpy"; depends=[backports 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.4"; sha256="181qys7whk061bk8gl8ah34g4wk3a0lw40dnx18nj8yf5iq6yvzd"; depends=[]; }; + SparkR = derive2 { name="SparkR"; version="2.4.5"; sha256="1bdq2qalirrd018hwj95ab1cmg10mp8innrdgc9m3xcwzdc75nrv"; depends=[]; }; SparseBiplots = derive2 { name="SparseBiplots"; version="3.5.0"; sha256="00ynx0cr543zyx9b633cbdalza9wmfgbvvgvr8b6s5r71lpjii8f"; depends=[sparsepca]; }; 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]; }; @@ -4332,10 +4364,12 @@ in with self; { SpatEntropy = derive2 { name="SpatEntropy"; version="0.1.0"; sha256="0nk399anjhsdki9cra650ynk6sa0366495470sawxcfs3vxmlzrl"; depends=[spatstat]; }; SpatMCA = derive2 { name="SpatMCA"; version="1.0.1.0"; sha256="1sjrm1md4lmhyq1yw3np4llkgdskw3mk667jr0k3isjmr6z88gxa"; depends=[fields MASS Rcpp RcppArmadillo RcppParallel]; }; SpatPCA = derive2 { name="SpatPCA"; version="1.2.0.1"; sha256="0vqajxcjjdp9dv53w0s4d1z63yrnzvs90h7cqs0f6daaihyvm130"; depends=[Rcpp RcppArmadillo RcppParallel]; }; - SpatialAcc = derive2 { name="SpatialAcc"; version="0.1-3"; sha256="0nx3x4jiiwwa2983lbszpm22xgc41gcdcm967h1p9a4xz2a6wgcs"; depends=[]; }; + SpatialAcc = derive2 { name="SpatialAcc"; version="0.1-4"; sha256="09rkzfzg6nh4n7dizkqrz651kp617l2557c9qpxacspl3ngbm82i"; depends=[sp]; }; + SpatialBSS = derive2 { name="SpatialBSS"; version="0.8"; sha256="0dbra7m99b1jn107gp88fdv08whaq02ny3fdddgdxvyf4mlqid8p"; depends=[JADE Rcpp RcppArmadillo sp]; }; SpatialBall = derive2 { name="SpatialBall"; version="0.1.0"; sha256="09iy1smfqnb0rd2s9a1wqgscb1plwcwwph6a8215l4zrs6svszv2"; depends=[dplyr ggplot2 hexbin lubridate RColorBrewer]; }; SpatialEpi = derive2 { name="SpatialEpi"; version="1.2.3"; sha256="0d0kyh591m3hvalqpbj67pynpb9v00kdx1idc5mw4p9hsbfs10xm"; depends=[maptools MASS Rcpp RcppArmadillo sp spdep]; }; SpatialEpiApp = derive2 { name="SpatialEpiApp"; version="0.3"; sha256="0svnnzqshk08s58ishy8xhqch44mb5svgfphkvpgysdd68dgaysr"; depends=[dplyr dygraphs ggplot2 htmlwidgets knitr leaflet mapproj maptools RColorBrewer rgdal rgeos rmarkdown shiny shinyjs SpatialEpi spdep xts]; }; + SpatialExtremes = derive2 { name="SpatialExtremes"; version="2.0-8"; sha256="0r2byz5xxc46zqnigdax28q7446ibmzmsmi10lmm2hdks3ml6sl3"; depends=[fields maps]; }; SpatialFloor = derive2 { name="SpatialFloor"; version="1.1.0"; sha256="07mwgcvkkq478l6wxvrdjs9d578x0kgs5xy86lgy5my0xqfcv6y8"; depends=[blocksdesign fields reshape2 taRifx]; }; SpatialGraph = derive2 { name="SpatialGraph"; version="1.0-2"; sha256="0cwswa5g3a6ng8qkwi04jz9pma4i0c16m7jpq6z3djzjin0znyk2"; depends=[igraph rgeos shape sp splancs]; }; SpatialKDE = derive2 { name="SpatialKDE"; version="0.5.0"; sha256="15v8msvmpy72d0vjrra1rmkkxn7pm11bngr3liw2n43lwkh19l9i"; depends=[dplyr glue magrittr raster Rcpp rlang sf]; }; @@ -4343,47 +4377,46 @@ in with self; { SpatialNP = derive2 { name="SpatialNP"; version="1.1-4"; sha256="1hj9fjhyxcvl2d0wdqyc899wy4f6iyi03g65icavkmqnwcs8c7hc"; depends=[]; }; SpatialPack = derive2 { name="SpatialPack"; version="0.3-8"; sha256="0laixlr37048x2dr1zbk41kjp533w47khc1d9rihmlrwxrflprd0"; depends=[]; }; SpatialPosition = derive2 { name="SpatialPosition"; version="2.0.0"; sha256="00z1kbkd7as4xnzqnizaap9qga4vakx7swyayli26ghp11krgfwr"; depends=[isoband lwgeom raster rgeos sf sp]; }; + SpatialRoMLE = derive2 { name="SpatialRoMLE"; version="0.1.0"; sha256="1m80vcd27g11v0gxnjz6p4ghljpxdb8jpkns8ry5yzhfvcpf29jc"; depends=[]; }; SpatialTools = derive2 { name="SpatialTools"; version="1.0.4"; sha256="0jgbrzsx2klvihv65y1ycqyr8awp5kqqz4qwfyfibx3b56lzna1q"; depends=[Rcpp RcppArmadillo spBayes]; }; SpatialVS = derive2 { name="SpatialVS"; version="1.1"; sha256="1xghfiz9wmmx11ssms7zjy3ggkjmc6kkbdwp3v5wjwpwapafzdk3"; depends=[fields MASS nlme]; }; SpatialVx = derive2 { name="SpatialVx"; version="0.6-5"; sha256="1n2d686aa6y8dy1y78i6ncl9abiafj96prfgkgcv8w8jmg0d23z5"; 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.3.1"; sha256="0k3c1db19ngqlaxc2842gfls5936hb0vb6x0za3f3hcdpd7b5mlc"; depends=[Rcpp RcppArmadillo]; }; + Spbsampling = derive2 { name="Spbsampling"; version="1.3.3"; sha256="14km5g0yngp4ikndnlfmsgrahpklgsclry269fhmxgk9ingr1isx"; 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]; }; + SpecsVerification = derive2 { name="SpecsVerification"; version="0.5-3"; sha256="1v76lilyj65f04881yw19v0qi7n08ysdnr7sc4hf5d8wnmvdh3v3"; depends=[Rcpp RcppArmadillo]; }; SpectralMap = derive2 { name="SpectralMap"; version="1.0"; sha256="15689023k9jzg3s7bx5m97dmn00z876amqhxsxksy8n8wf09wr57"; depends=[fields scatterplot3d]; }; - Spectrum = derive2 { name="Spectrum"; version="1.0"; sha256="0ayvzkbbklzvnz3vd6xknsgjw9avp7k0bd4hqz0rkmdfl30jjash"; depends=[ClusterR diptest ggplot2 Rfast]; }; + Spectrum = derive2 { name="Spectrum"; version="1.1"; sha256="0n38d360azkck6vvhr771zsh0gbvd9qsf9ygg5r18vhz0pb1xcfw"; depends=[ClusterR diptest ggplot2 Rfast]; }; SphericalCubature = derive2 { name="SphericalCubature"; version="1.4"; sha256="14xrxhmhavz82rcixnyharnbrvdzs6rh7gbxihaxh431d90w2q3k"; depends=[abind cubature mvmesh SimplicialCubature]; }; SphericalK = derive2 { name="SphericalK"; version="1.2"; sha256="18py4ylm10s75pihjvcy7w948379zy9l9azriw7g7pyp7px29wda"; depends=[]; }; - SplitReg = derive2 { name="SplitReg"; version="1.0.1"; sha256="0gifj5jk88xyda7sb7l0wbpx86gcj7d4yx2mfljlm882yr0ic7aa"; depends=[Rcpp RcppArmadillo]; }; - SplitSoftening = derive2 { name="SplitSoftening"; version="2.0-0"; sha256="0nlli8nap6ilb5ns1xavyb06nhj2dlf4p0gajmsgrz32s2ljhr8s"; depends=[]; }; + SplitReg = derive2 { name="SplitReg"; version="1.0.2"; sha256="1s012qldrsq8rpfpzf7kyd7631b65zai269x53xcaqn75r5ssh3f"; depends=[Rcpp RcppArmadillo]; }; + SplitSoftening = derive2 { name="SplitSoftening"; version="2.0-1"; sha256="0jk46ymgkjh8jg9b9zzn9490cq92fzchvi2yzqiwisww0k15xlvb"; depends=[]; }; SportsAnalytics = derive2 { name="SportsAnalytics"; version="0.2"; sha256="1vb080ak1mfvr6d0q9i3r8hd547ba80bavjdcri0gclqqcjf1ach"; depends=[]; }; - SqlRender = derive2 { name="SqlRender"; version="1.6.3"; sha256="08w40d3cnnqdw11i4ycr11m3xn2a5gg7blqgmdn336dlhqsc9mdc"; depends=[rJava]; }; + SqlRender = derive2 { name="SqlRender"; version="1.6.5"; sha256="17hp55fpa54jgxr668d2lq53wd31zr1yz1rzc9hlih47zy9zmac1"; depends=[rJava]; }; Sstack = derive2 { name="Sstack"; version="1.0.1"; sha256="137vsas2kw3l37c141g51sgx0j6z8ys6hbxjmsdymz1fxsjr4adg"; depends=[doParallel dplyr foreach randomForest]; }; - StAMPP = derive2 { name="StAMPP"; version="1.5.1"; sha256="0yyssscx3l4csban66gb4q35h37gf7pqvvycfsy56n96pnnlrgkf"; depends=[adegenet doParallel foreach pegas]; }; + StAMPP = derive2 { name="StAMPP"; version="1.6.1"; sha256="1x6b032xadjn8yq3n662r9f0lyg5xl71q2lksvx8rn5fmpjlqqrs"; depends=[adegenet doParallel foreach pegas]; }; StMoMo = derive2 { name="StMoMo"; version="0.4.1"; sha256="1c4v2gjipq1y4crc6bqvz2x5c02bl10mh9jacg8dqb2dffsh5y44"; depends=[fanplot fields forecast gnm MASS RColorBrewer reshape2 rootSolve]; }; StMoSim = derive2 { name="StMoSim"; version="3.1.1"; sha256="1y4lnbpgdza6r6w3q161nlmg8775g3zv323amcwxcj41r4v41p96"; depends=[Rcpp RcppParallel]; }; StVAR = derive2 { name="StVAR"; version="1.1"; sha256="0wz5f5i9927fs1s8yczwqs022k912220m28l1sv5f0r081iv656i"; depends=[ADGofTest matlab MCMCpack numDeriv]; }; + StabilizedRegression = derive2 { name="StabilizedRegression"; version="1.0"; sha256="11hfq13b5rc1jj832msrfb0f3fsklx4clp72aqxfccw0z0n8mdq0"; depends=[corpcor ggplot2 ggrepel glmnet MASS R6]; }; StableEstim = derive2 { name="StableEstim"; version="2.1"; sha256="0agi3bfp1xy5pfxxb9ib6xn434agmplgn7kg47nhbh47vf57vang"; depends=[fBasics MASS Matrix numDeriv stabledist testthat xtable]; }; Stack = derive2 { name="Stack"; version="2.0-1"; sha256="09fgfhw9grxnpl5yg05p9gvlz38iw4prns1jn14nj3qx01k5rnxb"; depends=[bit ff ffbase plyr stringr]; }; StagedChoiceSplineMix = derive2 { name="StagedChoiceSplineMix"; version="1.0.0"; sha256="1008gm6zv5k8lpv0qg42qjriajmx0n4kshjh76mvx91dpi788ivh"; depends=[plyr]; }; StakeholderAnalysis = derive2 { name="StakeholderAnalysis"; version="1.2"; sha256="164mah8h8izxaqp8hc43l6mlnf95pydkcx2laqrlqr9b0bybadxb"; depends=[]; }; - StanHeaders = derive2 { name="StanHeaders"; version="2.21.0-1"; sha256="0gqdp5galy3fgrx9c7ks5hlcla76idfp4awc40xj03wnya51952f"; depends=[RcppEigen]; }; + StanHeaders = derive2 { name="StanHeaders"; version="2.19.2"; sha256="0cmk0fzczx7dcywcw1dhm6gfq84qlsx77qrsk4z3bf3dhr4bznam"; depends=[]; }; StandardizeText = derive2 { name="StandardizeText"; version="1.0"; sha256="0s267k2b109pcdiyd26gm4ag5afikrnnb55d3cs6g2fvzp744hfp"; depends=[]; }; Stat2Data = derive2 { name="Stat2Data"; version="2.0.0"; sha256="1fpp3b4k7x915a9wkpyj4dvvqp0wz7c3lpbh154vrxrdsr712z0k"; depends=[]; }; StatCharrms = derive2 { name="StatCharrms"; version="0.90.94"; sha256="16056gd3wx5qcm9bnrl8hk8dk85j9ikan2dz4acpsfhpga80vp0n"; 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]; }; + StatDA = derive2 { name="StatDA"; version="1.7.4"; sha256="1ld7fx1lip54n24r2d9zvd4hri3w02vd174bdi8pi9j5n8xpxl02"; depends=[cluster e1071 geoR MASS MBA mgcv rgl robustbase sgeostat sp xtable]; }; StatDataML = derive2 { name="StatDataML"; version="1.0-26"; sha256="1lcckapbhqdbg6alnhm2yls66lnkxnxamdlzx6pbfqv1dhsy36gf"; depends=[XML]; }; StatMatch = derive2 { name="StatMatch"; version="1.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]; }; SteinIV = derive2 { name="SteinIV"; version="0.1-1"; sha256="1bm4lc7g9h9jkb1dpzb84289bwxcywp0a8vylv6ipvhiqbqk5d95"; depends=[]; }; - SteinerNet = derive2 { name="SteinerNet"; version="3.0.1"; sha256="1jkvv0hsj85i1zfr1bmdsrbwgl11mxpfci3z7997m5vvb5fb5cxn"; depends=[igraph]; }; Stem = derive2 { name="Stem"; version="1.0"; sha256="1fr02mi5qyxbqavdh2hg8ggw4nfjh3vs7g0vh834h6y0v53l71r5"; depends=[MASS mvtnorm]; }; StempCens = derive2 { name="StempCens"; version="0.1.0"; sha256="11gspjrcl6yiyr19hankan5mcxipfsdkhha6nsiybs1chg5wx6f4"; depends=[distances ggplot2 gridExtra Matrix MCMCglmm mvtnorm optimx sp spTimer ssym tmvtnorm]; }; - StepReg = derive2 { name="StepReg"; version="1.3.4"; sha256="1fqvz9b2mh1i8zlqnpxfqygydh15y145wszdcvijcbgn5albkl7x"; depends=[Rcpp RcppEigen]; }; + StepReg = derive2 { name="StepReg"; version="1.4.1"; sha256="1ash73v9qwy1717w00vajamkd4rb8rsaxch7y9479yqagclfbl18"; depends=[Rcpp RcppEigen]; }; StepSignalMargiLike = derive2 { name="StepSignalMargiLike"; version="2.6.0"; sha256="0j85lvs2bljfhf482r31sq3xgk8l73hcw22wgxxp8z8nla38cwf9"; depends=[Rcpp]; }; StepwiseTest = derive2 { name="StepwiseTest"; version="1.0"; sha256="1fdm4s9l6grgd45r98ybbsh40rnmnn16c0id6lv28cpmssi0iphi"; depends=[Rcpp RcppArmadillo]; }; StereoMorph = derive2 { name="StereoMorph"; version="1.6.3"; sha256="0sr8i6hq9iir2f717yvm5kdda047hamsqcrl553jjzzcbxg0y5m1"; depends=[bezier jpeg MASS png Rcpp rjson shiny svgViewR tiff]; }; @@ -4393,9 +4426,8 @@ in with self; { StratSel = derive2 { name="StratSel"; version="1.3"; sha256="0hd6q8s8aiymcd33kv0gd0a4wzr86xxdzwn18jgpyk9q8pmg8gvl"; depends=[Formula MASS memisc mnormt pbivnorm]; }; Strategy = derive2 { name="Strategy"; version="1.0.1"; sha256="0phja1r0qfvcswvw5w1x6ny86p84wkqb029fdqgw10djdm9xp0f2"; depends=[xts zoo]; }; StratifiedBalancing = derive2 { name="StratifiedBalancing"; version="0.3.0"; sha256="0pklnm0q0imdhyzhwyb4i0j441dkk4k6qqlx8d4q2xnl62drqnvv"; depends=[bnlearn plyr]; }; - StratifiedMedicine = derive2 { name="StratifiedMedicine"; version="0.2.1"; sha256="0g7r6jz9gqy66784sygg20l0gyikqmkm69hssyqdsvhgslwmdq5r"; depends=[dplyr ggparty ggplot2 glmnet mvtnorm partykit ranger survival]; }; StratifiedRF = derive2 { name="StratifiedRF"; version="0.2.2"; sha256="0a5djia6xacs17nnr5knr1acwzicrffz73q9nvnhdmihazq8v27d"; depends=[C50 dplyr]; }; - StratigrapheR = derive2 { name="StratigrapheR"; version="0.0.7"; sha256="0650qrip02r079zqfaii9097p2d8dm90356v0f3gialg140rsbys"; depends=[diagram dplyr shiny stringr XML]; }; + StratigrapheR = derive2 { name="StratigrapheR"; version="1.0.1"; sha256="0b63n91ns4z745nrdrrnjmj1pmqi5plj1fkbh9ix7i6a7bd2n023"; depends=[diagram dplyr shiny stringr XML]; }; StreamMetabolism = derive2 { name="StreamMetabolism"; version="1.1.2"; sha256="1sv30i7armk7jhxg5x9lh0r9qq3xixn1k2h0q89halkh1yraal8a"; depends=[chron maptools zoo]; }; StressStrength = derive2 { name="StressStrength"; version="1.0.2"; sha256="1fq26bzmwsk4nzz9bgasyxz9alw8x2ssahz67mham7vw483w79pd"; depends=[]; }; String2AdjMatrix = derive2 { name="String2AdjMatrix"; version="0.1.0"; sha256="058r30kjjna02nmd6ngqfcnn1yk5390i20xvl6qb5qk3bcp2wmxn"; depends=[stringr]; }; @@ -4403,9 +4435,9 @@ in with self; { StructFDR = derive2 { name="StructFDR"; version="1.3"; sha256="1y0wj7y36iq0lznc4qpsr2yis3an34iilpabkaxxmas2q4abg0qb"; depends=[ape cluster dirmult matrixStats nlme]; }; StructureMC = derive2 { name="StructureMC"; version="1.0"; sha256="1pj3inznw6flvmk22dzjcfjnwjhx7r98ngckz0axf6ipp3hb85jn"; depends=[MASS matrixcalc]; }; SubCultCon = derive2 { name="SubCultCon"; version="1.0"; sha256="08q6k4nsv3gl5qk87s87smdg047yc2a4i7kg0fp08i7q7h62jkvz"; depends=[]; }; - SubTite = derive2 { name="SubTite"; version="3.0.0"; sha256="1kv5083zfxla4v1y7zhkd2rhld8mhmnilkz78q26qp121qqbf93r"; depends=[Rcpp RcppArmadillo]; }; + SubTite = derive2 { name="SubTite"; version="3.0.1"; sha256="12wbipx024p1wrnvjvv82armji6ryzv15i8yry6kaf49zp6wfxiq"; depends=[Rcpp RcppArmadillo]; }; SubVis = derive2 { name="SubVis"; version="2.0.2"; sha256="1nb3zgm6i5lwfwdrn8mk3wkg8a4ldfvs27ai8v46l4316qc1fa9p"; depends=[Biostrings shiny]; }; - SubgrPlots = derive2 { name="SubgrPlots"; version="0.1.2"; sha256="1hiaa4zwk3ll6ans1v7r76pmzbq7j8mhw72s30j7mhgkkkqpnr12"; depends=[alluvial circlize colorspace diagram dplyr geoR ggplot2 ggrepel gridBase gridExtra plyr polyclip scales shape sp survival survRM2 UpSetR VennDiagram]; }; + SubgrPlots = derive2 { name="SubgrPlots"; version="0.1.3"; sha256="1bi5zndkpgvyk563i0jdfrw73kkpa6zi3yx922dv90w6bdb9kvl2"; depends=[alluvial circlize colorspace diagram dplyr ggplot2 ggrepel gridBase gridExtra plyr polyclip scales shape sp survival survRM2 UpSetR VennDiagram]; }; SubgrpID = derive2 { name="SubgrpID"; version="0.11"; sha256="1by23gdkbls7l5xa9nl055nbm0d3138pmfmasqmcy42h62wf7dw6"; depends=[AIM ggplot2 glmnet Matrix rpart survival]; }; SubpathwayGMir = derive2 { name="SubpathwayGMir"; version="1.0"; sha256="1rw94idhbnaszr2xv1wgnjcxlnxkml912pvmqh2a1nqpwca5mscy"; depends=[igraph XML]; }; SubpathwayLNCE = derive2 { name="SubpathwayLNCE"; version="1.0"; sha256="051csjavr9549y54yirfdn266i7swsvpbcakhziyz4sl4afwx5kl"; depends=[BiasedUrn graph igraph RBGL]; }; @@ -4416,16 +4448,17 @@ in with self; { SunterSampling = derive2 { name="SunterSampling"; version="1.0.1"; sha256="0qfld3j8xlpgp7c58zqw6gzm38m4d740lvdj5vmcflfcc6ja98sf"; depends=[]; }; SupMZ = derive2 { name="SupMZ"; version="0.2.0"; sha256="1n81wqacrpk5x6i1pd1zsjivv2jk41743kg1h7gnp0rb3k58vp7r"; depends=[dplyr magrittr]; }; SuperExactTest = derive2 { name="SuperExactTest"; version="1.0.7"; sha256="1ysfsdzbkldcn7hzxhqikf5h2h9747xhfrirqgr8xx8q81wq989s"; depends=[]; }; - SuperGauss = derive2 { name="SuperGauss"; version="1.0.1"; sha256="0pkk8aaghkrh87g6ahikngp6hahaxwhr8i9vz30vv2bzxpgba54b"; depends=[fftw Rcpp RcppEigen]; }; + SuperGauss = derive2 { name="SuperGauss"; version="1.0.2"; sha256="08nrw96y7b04a9xpyklcnqgisbjxd35pqffpay6cr67zxx0zg81i"; depends=[fftw Rcpp RcppEigen]; }; SuperLearner = derive2 { name="SuperLearner"; version="2.0-26"; sha256="10b0fh71ky92mp0ydi81s6zm3sn47k5agppcg4zpgqmailn94qj4"; depends=[cvAUC nnls]; }; - SuperPCA = derive2 { name="SuperPCA"; version="0.2.0"; sha256="1g2qf2y83clmjx327b9yk6bkx4l7rm0hj0sjvia2fll24m4hxcjz"; depends=[fBasics glmnet MASS matlab matlabr Matrix matrixStats pracma psych R_matlab RSpectra spls timeSeries]; }; + SuperPCA = derive2 { name="SuperPCA"; version="0.3.0"; sha256="139nym0szr7l7hq3xy60jwpx61896h5g7vrklxy7098w53iczyj4"; depends=[fBasics glmnet MASS matlab matlabr Matrix matrixStats pracma psych R_matlab RSpectra spls timeSeries]; }; SuperRanker = derive2 { name="SuperRanker"; version="1.1.1"; sha256="1yiklw9zk7yw0xz5g3lmyl5lv325fnysimdwbxa37nyj6qdfv0ls"; depends=[prodlim Rcpp]; }; SuperpixelImageSegmentation = derive2 { name="SuperpixelImageSegmentation"; version="1.0.1"; sha256="15d611ik6qg0602n6yk34a1pgfciv42nzd8qaarmxnqqrn8i584n"; depends=[ClusterR OpenImageR R6 Rcpp RcppArmadillo]; }; + Superpower = derive2 { name="Superpower"; version="0.0.3"; sha256="0hwlgscygjcqiclgac97ffcmw081g91rvqbd2pj0z0kijz7g597x"; depends=[afex dplyr emmeans ggplot2 gridExtra magrittr MASS mvtnorm reshape2]; }; SuppDists = derive2 { name="SuppDists"; version="1.1-9.5"; sha256="1i3iq12a5x5k49ac01mikzcrrq9gc148xq3m08h4xm07bha6f2v8"; depends=[]; }; SurfaceTortoise = derive2 { name="SurfaceTortoise"; version="1.0.1"; sha256="0q0swp0xs3lmfx2dxffqrna2spyr2l9ka0zbhmw8nkgb1w5rq5q6"; depends=[gstat raster rgeos sp]; }; - Surrogate = derive2 { name="Surrogate"; version="1.5"; sha256="104k7fgbl7aqgapm6qrkx0vhlfvbwl5gqdllrrks74ws7hbmmfgd"; depends=[extraDistr ks lattice latticeExtra lme4 logistf MASS mixtools msm nlme OrdinalLogisticBiplot rgl rms rootSolve survival]; }; + Surrogate = derive2 { name="Surrogate"; version="1.7"; sha256="17f91s6fdlbgwxqggnylx45n3j2mdsqi9613ayrhi77yhqhjpm16"; depends=[extraDistr ks lattice latticeExtra lme4 logistf MASS mixtools msm nlme OrdinalLogisticBiplot rgl rms rootSolve survival]; }; SurrogateOutcome = derive2 { name="SurrogateOutcome"; version="1.0"; sha256="0x91bmr4n9zn9cc72s91fzzsqhzhrkfpcbcla00gcsfmbjqz3997"; depends=[survival]; }; - SurrogateTest = derive2 { name="SurrogateTest"; version="1.1"; sha256="0m6m44vsfdgv47sswi2s8snmypa7s2ppad73fqnvymq8fm2b3yl2"; depends=[survival]; }; + SurrogateTest = derive2 { name="SurrogateTest"; version="1.2"; sha256="0wkyz9qkmvsrhvdga6w0qkbgqr7kr0yh04kkc19824sqnx452dc5"; depends=[survival]; }; SurvBoost = derive2 { name="SurvBoost"; version="0.1.2"; sha256="17av00iwa3kpw0ihrvvynrfcghnq492b5k7n9fxfgf2nily24x2p"; depends=[directlabels ggplot2 mvtnorm plyr Rcpp RcppArmadillo RcppParallel reshape2 survival]; }; SurvCorr = derive2 { name="SurvCorr"; version="1.0"; sha256="01rqdl503q1qnkn49iqnsjzis6azdsfi6s2hjky5k2zd6c9g18k5"; depends=[fields survival]; }; SurvDisc = derive2 { name="SurvDisc"; version="0.1.1"; sha256="0ajvnm0a4krbm0m584bg58hd7dzl0f2rz5as1zsajx8agywb5qmv"; depends=[cubature MASS mvtnorm nlme simex survival]; }; @@ -4435,7 +4468,7 @@ in with self; { SurvTrunc = derive2 { name="SurvTrunc"; version="0.1.0"; sha256="0b6s7llljp75agd57lmc1yq5acnfwy113khrfjcbm1l5ply6pz7f"; depends=[survival]; }; Survgini = derive2 { name="Survgini"; version="1.0"; sha256="1gxkdv2j1njbgnwb52vyhz7p2lrcg3hp6sry3kyhp4wkvf6gnhxi"; depends=[survival]; }; SvyNom = derive2 { name="SvyNom"; version="1.1"; sha256="1jym2x6nd9a3y7nk5hflqpy54gs67y4sqqspkvkalf5l2cc64did"; depends=[Hmisc rms survey survival]; }; - SwarmSVM = derive2 { name="SwarmSVM"; version="0.1-5"; sha256="0nmlnvc1vxk68sc5jv3kvnnf5dpqxn4dxzrn06b9sn2bcxfpmkhy"; depends=[BBmisc checkmate e1071 kernlab LiblineaR Matrix SparseM]; }; + SwarmSVM = derive2 { name="SwarmSVM"; version="0.1-6"; sha256="09xq7jx70qjyhblzh6kc40hdr0636rqqdnbka7m6rawhd8ivp8yz"; depends=[BBmisc checkmate e1071 kernlab LiblineaR Matrix SparseM]; }; SwimmeR = derive2 { name="SwimmeR"; version="0.1.0.0"; sha256="0979527aaacfq8arp1qh7z3p9crq8x2v90899z2ab0fa6f9n282m"; depends=[dplyr purrr stringr tibble]; }; SwissAir = derive2 { name="SwissAir"; version="1.1.5"; sha256="0lh69924vhyilgn562jqn8m7z4dq3xmdj09501sbs7hbxfaiiyly"; depends=[]; }; SyNet = derive2 { name="SyNet"; version="2.0"; sha256="0mb9dscddkvmkf7l3bbcy4dlfmrvvy588vxdqy5dr783bpa5dkiw"; depends=[tkrplot]; }; @@ -4445,10 +4478,10 @@ in with self; { SyncRNG = derive2 { name="SyncRNG"; version="1.3.0"; sha256="0sywfmmy6mq6qsxkxjc67665snn1jds01j3h7ni1200igja139g2"; depends=[]; }; SynchWave = derive2 { name="SynchWave"; version="1.1.1"; sha256="127hllvig8kcs9gr2q14crswzhacv6v2s4zrgj50qdyprj14is18"; depends=[fields]; }; Synth = derive2 { name="Synth"; version="1.1-5"; sha256="1cfvh91nz6skjk8jv04fhwv3ga9kcsfgq3mdy8lx75jkx16zr0pk"; depends=[kernlab optimx]; }; - SynthTools = derive2 { name="SynthTools"; version="1.0.0"; sha256="0izsp1gcch3bb7ssq3w5na5k0nli18mcqkx757icnb32jpy9m3a8"; depends=[dplyr magrittr Rdpack]; }; + SynthTools = derive2 { name="SynthTools"; version="1.0.1"; sha256="19vasz3nnm5vgwqs6g2a5bibmk44br1bxga5zavsx938x3jw9gnd"; depends=[dplyr magrittr Rdpack]; }; T2EQ = derive2 { name="T2EQ"; version="1.1"; sha256="1skkkryw63pfx1xslia1lczb2psja6v6hcbph4isdcksb4l4pcig"; depends=[]; }; TAG = derive2 { name="TAG"; version="0.2.0"; sha256="0s4n2f9x36df1pb5p8n98926lgg9z79fka5r9xqxxsc91h35q9aw"; depends=[DiceKriging doParallel FastGP Matrix mgcv mlegp randtoolbox Rcpp RcppArmadillo]; }; - TAM = derive2 { name="TAM"; version="3.3-10"; sha256="1rkjp5x6wrk1dfspp1imvfals0wvy4w1wb8a5mhfbnilc7vgnlbq"; depends=[CDM Rcpp RcppArmadillo]; }; + TAM = derive2 { name="TAM"; version="3.4-26"; sha256="111d7qkxhwh1lfvldyh9d61pdb5vb6x8lr8n9h95ssvw07vjqvk9"; depends=[CDM Rcpp RcppArmadillo]; }; TANDEM = derive2 { name="TANDEM"; version="1.0.3"; sha256="151rm95q2naw9y58df1lr2qiadnkgfb5j9v47v41bw4iipsmlp4p"; depends=[glmnet Matrix]; }; TAQMNGR = derive2 { name="TAQMNGR"; version="2018.5-1"; sha256="0bf0sgqa53l9y2bhwg2ngiwlcgrmj0nvxchlsmcc8zin388qf4pb"; depends=[Rcpp]; }; TAR = derive2 { name="TAR"; version="1.0"; sha256="0wjh2n9x3yn9by9a6mjvkl96qy7z549g6dsqp7b4d96xwmyqxlbv"; depends=[mvtnorm]; }; @@ -4457,7 +4490,6 @@ in with self; { TBFmultinomial = derive2 { name="TBFmultinomial"; version="0.1.3"; sha256="0cd0dr8vkf0sfriaafp2x63dilxmirm0fljxm82zw77c9j5ly3kv"; depends=[nnet plotrix stringr VGAM]; }; TBSSurvival = derive2 { name="TBSSurvival"; version="1.3"; sha256="1r87qvnlvc18i12yi25lfpdb8b5p33fywi38hs2xp1y2vbvz5s9b"; depends=[BMS coda mcmc normalp R_utils Rsolnp survival]; }; TCA = derive2 { name="TCA"; version="1.1.0"; sha256="0pj052kd378x1gmg5wcbk8c0dca3c2ra65hnagljmsplv169vimy"; depends=[config data_table futile_logger glmnet gmodels Matrix matrixcalc matrixStats nloptr pbapply pracma quadprog rsvd]; }; - TCGA2STAT = derive2 { name="TCGA2STAT"; version="1.2"; sha256="15a5lh0nrdcxdwj7wj5m9rsvk1ygpp6wdjb4swilk91rb1lblikv"; depends=[CNTools XML]; }; TCGAretriever = derive2 { name="TCGAretriever"; version="1.5"; sha256="1xg1rz2h5jbpdd5axli3ripqxb0bj64yrd4y5nzr8axajiaybkj9"; depends=[httr]; }; TCIApathfinder = derive2 { name="TCIApathfinder"; version="1.0.6"; sha256="15f3w6vhbqy4xzidxasjnqigxchd3jbr2kpm3gggjnkp7rzsfgaf"; depends=[httr jsonlite]; }; TDA = derive2 { name="TDA"; version="1.6.9"; sha256="023jwhh1qc2y30g42pgfaha4n4pixzwrrghxlyss4889fr66q9vw"; depends=[BH FNN igraph Rcpp RcppEigen scales]; }; @@ -4465,12 +4497,11 @@ in with self; { TDAstats = derive2 { name="TDAstats"; version="0.4.1"; sha256="1zmickqk60vm9rzy67hib835v3c45aqjk441p31vpbvhbiy58nq5"; depends=[ggplot2 Rcpp]; }; TDCor = derive2 { name="TDCor"; version="0.1-2"; sha256="18085prcwhl5w717f1f7jcqskw2jvigvjjs2l5y6106ibiam6hxx"; depends=[deSolve]; }; TDD = derive2 { name="TDD"; version="0.4"; sha256="193y8brybkjsajrbnlx1sdnw1wyyn9rhlm5wvp4aamqhvi8z13vn"; depends=[pracma RSEIS signal]; }; - TDMR = derive2 { name="TDMR"; version="2.1"; sha256="10lx1yksz61byjcwqi9v59pqka0fs5dhrq4qjmp0i2zvn6cgh1zj"; depends=[adabag SPOT testit twiddler]; }; - TDPanalysis = derive2 { name="TDPanalysis"; version="0.99"; sha256="1kyhs4rpkm3gr55l6hrz4xcb9igk95si1m1sp175580k16n885z0"; depends=[plyr]; }; + TDMR = derive2 { name="TDMR"; version="2.2"; sha256="19ljgj5iy41m7rrawzkxkln7acydssk8zm05k3sfb483s8zygwiq"; depends=[adabag SPOT testit twiddler]; }; + TDPanalysis = derive2 { name="TDPanalysis"; version="1.0"; sha256="0kvbsgwl7b9a3hn4d3snajqmynbajd2d8lc1na0hri2cv8qm8x9h"; depends=[plyr]; }; TDboost = derive2 { name="TDboost"; version="1.2"; sha256="0sc9vby4892gm5b5h8gbdl4misqvgbkfp8fms53dk83malxkw1zx"; depends=[lattice]; }; TE = derive2 { name="TE"; version="0.3-0"; sha256="15530a5qjlh74c1qji76j25mm4c59gifp34y066f8j21f70rahfs"; depends=[MASS rainbow]; }; TEAM = derive2 { name="TEAM"; version="0.1.0"; sha256="1yj7fw935rr7fh7h2p4ra8d3ynz5c6b30fqzm1djgav1k84wcin2"; depends=[ggplot2 ks plyr]; }; - TEEReg = derive2 { name="TEEReg"; version="1.1"; sha256="0v5qz3vvmcm3fh16kjb05j1r0yj23r7hrxf2www20ng3dmga5q0f"; depends=[]; }; TELP = derive2 { name="TELP"; version="1.0"; sha256="0wzm3dz0489ha7dd6lkashvvjydck9jw2pavlx9plpksvzr4q9ph"; depends=[arules arulesViz ggplot2 gridExtra RColorBrewer tcltk2 tm wordcloud]; }; TEQR = derive2 { name="TEQR"; version="6.0-0"; sha256="112znsz36jqh3krnr4j05xl70picih8qpmqky2gllgyr8nky39fr"; depends=[]; }; TERAplusB = derive2 { name="TERAplusB"; version="1.0"; sha256="0mshx615awcf2arm39mgw2gzgpyn7a3f767484g7z4nqqlikwpgc"; depends=[]; }; @@ -4489,7 +4520,7 @@ in with self; { TLMoments = derive2 { name="TLMoments"; version="0.7.5"; sha256="0v86rs7f63f59ng9m6lnjgv52czg1xk814flnhz153fjy7y2pidl"; depends=[ggplot2 hypergeo Rcpp]; }; TLdating = derive2 { name="TLdating"; version="0.1.3"; sha256="12lmakk1zd6wqh1318pnl14i7km2hynjn4ymchfjr2bwmp45c1ra"; depends=[gplots Luminescence]; }; TMB = derive2 { name="TMB"; version="1.7.16"; sha256="0lly12hdi99iklwr0vg9xkyhi038w4gncbf895qcwbndmqp0lx44"; depends=[Matrix RcppEigen]; }; - TMDb = derive2 { name="TMDb"; version="1.0"; sha256="0bbcmsv7b3vvskhdjww03gbcgql44vsvyjz2fajy9w2vgkr6ga90"; depends=[httr jsonlite]; }; + TMDb = derive2 { name="TMDb"; version="1.1"; sha256="062n9mi2f9g2xxpnymja57xnpl855d8mwyfwci7a8cq4c7w7avj7"; depends=[httr jsonlite stringi]; }; TNC = derive2 { name="TNC"; version="0.1.0"; sha256="0639wvylmk9mapvmz79ij65g1phv3ylc683awi4pgaf9yfwlmjkn"; depends=[]; }; TOC = derive2 { name="TOC"; version="0.0-4"; sha256="1c16d4wrzir6v3c323sck6r9yz6mv1a70xamlj5ha1ydmfixcza9"; depends=[bit raster rgdal]; }; TOHM = derive2 { name="TOHM"; version="1.3"; sha256="08qwqryy9vdh906k3rhq4csysxlxgki4jjr505shfrxjvnlc662i"; depends=[EQL igraph Matrix nloptr Rmpfr]; }; @@ -4498,13 +4529,12 @@ in with self; { TPD = derive2 { name="TPD"; version="1.1.0"; sha256="1ppj6ppi0lhlz079ygjnwx1l5f36bsi8zax23ssr1w6h4csw748m"; depends=[ggplot2 gridExtra ks mvtnorm]; }; TPEA = derive2 { name="TPEA"; version="3.1.0"; sha256="1yyc3q4dyf4d8m7wi851dnxf3xnvvfnvj28kl8z8py4r4jsb2hfy"; depends=[foreach igraph Matrix MESS RCurl XML]; }; TPES = derive2 { name="TPES"; version="1.0.0"; sha256="00g1limcappjrly93x7xb1llrgaxivmiky3kw40w2fs0303ha3d7"; depends=[]; }; - TPMplt = derive2 { name="TPMplt"; version="0.1.3"; sha256="0y2adbswgd8z3lzy9hi6qx7hm9ns2ky269q83y50ykyg2ms5qjhg"; depends=[directlabels dlm e1071 ggplot2 RColorBrewer rgl rowr VBTree]; }; TPmsm = derive2 { name="TPmsm"; version="1.2.2"; sha256="1ibb3ayd808x3a562qldaww7czmfq1cd1j4g4ch5k7q38jw5x835"; depends=[KernSmooth]; }; TR8 = derive2 { name="TR8"; version="0.9.20"; sha256="01xkjl269q1qlpm8cxpnb64czcv2xhrjjwp3brhxywx07za1q8lq"; depends=[gWidgets gWidgetstcltk plyr rappdirs RCurl readxl reshape taxize XML]; }; TRADER = derive2 { name="TRADER"; version="1.2-3"; sha256="1w9m2b866dyj82s118m64q8j9a1chpq2km2pnn9mfwwj8sivgdgn"; depends=[dplR]; }; - TRAMPR = derive2 { name="TRAMPR"; version="1.0-8"; sha256="0nxp8wdr7yx94fk14m0r4dh2jxcvjqp6lg02092zww5y7jlbf4ds"; depends=[]; }; + TRAMPR = derive2 { name="TRAMPR"; version="1.0-9"; sha256="16fbzp6b6y25k9h7m4qpmbgj10przywm2rh8kvw8a8p0xkskc9k5"; depends=[]; }; TRD = derive2 { name="TRD"; version="1.1"; sha256="0bhn4bcrq39f5dgqc74jqsfhs1iqfxhawacqqyncbk2372013nqp"; depends=[Rlab]; }; - TRES = derive2 { name="TRES"; version="1.1.0"; sha256="0brj8wszgf9fkqfa3v0qg5wg9wi1b8k2ddixv3p29cdb57gsacdw"; depends=[ManifoldOptim MASS pracma rTensor]; }; + TRES = derive2 { name="TRES"; version="1.1.1"; sha256="0fx52911sjqlgkj3ad8frj3xnd2jlzmzcian9qj3hkmpyjx65648"; depends=[ManifoldOptim MASS pracma rTensor]; }; TRSbook = derive2 { name="TRSbook"; version="1.0.2"; sha256="0lj20i6gybinc196nzjfi6ayzmm970s9vp43lj60v96g5dl7qv1b"; depends=[gdata IndependenceTests RColorBrewer xtable]; }; TSA = derive2 { name="TSA"; version="1.2"; sha256="0gjfqibwdznz0nka95k4fjm935svxjpnqfywwz403crn2lh30h6q"; depends=[leaps locfit mgcv]; }; TSCS = derive2 { name="TSCS"; version="0.1.1"; sha256="0dllaw69rl26hgqac5q66k13gfmnxhn3wf0j8nx5xvi7yclzc3ay"; depends=[ggplot2 rgl tseries]; }; @@ -4523,7 +4553,7 @@ in with self; { TSMSN = derive2 { name="TSMSN"; version="0.0.1"; sha256="0zy9r6i1p161h1zh0vnz1npsh48q3nc2c5hcgzvf78nfznnn6wg1"; depends=[mvtnorm numDeriv progress sn]; }; TSMining = derive2 { name="TSMining"; version="1.0"; sha256="1n32acagffiw31pr485ly3phx33zw7vj009bvw4lbqpixa1pszj2"; depends=[foreach ggplot2 plyr reshape2]; }; TSMySQL = derive2 { name="TSMySQL"; version="2015.4-1"; sha256="1gdda7li320ba9qfxfl5c4cwl2ln5jdbvid98cryj175g0nbmx7b"; depends=[DBI RMySQL tframe TSdbi TSsql]; }; - TSP = derive2 { name="TSP"; version="1.1-8"; sha256="0g44f2a4m7rfx6y51cdbr6vcmmpbwgyzpvfjksq3lb7gcpbr7xrx"; depends=[foreach]; }; + TSP = derive2 { name="TSP"; version="1.1-9"; sha256="183m6crb0dv17llj86059n3hbgsahbhfcqlx0ijdzkssg11i1cy7"; depends=[foreach]; }; TSPostgreSQL = derive2 { name="TSPostgreSQL"; version="2015.4-1"; sha256="11201zpbrva6gwc9hg8pynadrps6d8pb3syzba9nyjpv2ck6x3ry"; depends=[DBI RPostgreSQL tframe tframePlus TSdbi TSsql]; }; TSPred = derive2 { name="TSPred"; version="4.0"; sha256="0zjx33llkvvj7m4z16crybw0y6s6zvlblxn2in3j7v9cv0ihhsa8"; depends=[EMD forecast KFAS MuMIn vars wavelets]; }; TSS_RESTREND = derive2 { name="TSS.RESTREND"; version="0.2.13"; sha256="0wbwkhc1b5dql87sj1441cknidpgwcflwlid2yj6d64a6wsipn1l"; depends=[bfast broom ggplot2 RcppRoll strucchange]; }; @@ -4541,8 +4571,7 @@ in with self; { 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]; }; TSodbc = derive2 { name="TSodbc"; version="2015.4-1"; sha256="0m6r97gs483jg6jlmfkbzxg3jvf6q140kvpidjccj224zb1sqlcq"; depends=[DBI RODBC tframe tframePlus TSdbi TSsql]; }; - TSplotly = derive2 { name="TSplotly"; version="1.1.1"; sha256="0amy8lmxl4mid6f5jhd0mcaqwpr8smxj0wa5561md15ix4qnvwmi"; depends=[dcemriS4 forecast ggplot2 plotly prettydoc zoo]; }; - TSrepr = derive2 { name="TSrepr"; version="1.0.3"; sha256="1sbspq2pyyrc9zh2dx8nq3yv58rwziv2a2j1jfgkz8v9zqrsbhqf"; depends=[dtt MASS mgcv quantreg Rcpp wavelets]; }; + TSrepr = derive2 { name="TSrepr"; version="1.0.4"; sha256="1dskk23465gw07bnhq0rf3gig4v69z2w2yzh9wdyfkw0i7vk876g"; depends=[dtt MASS mgcv quantreg Rcpp wavelets]; }; TSsdmx = derive2 { name="TSsdmx"; version="2016.8-1"; sha256="06h1iwgshiq4bvly5l1nrddrh2knc82z2aqxh8ls9ipbs7qjsvaf"; depends=[DBI rJava RJSDMX tframe tframePlus TSdbi]; }; TSsmoothing = derive2 { name="TSsmoothing"; version="0.1.0"; sha256="1m4y6hfw5ghqmvbnha05w6k0abbr08xdcahmh897g68b06vcrjsl"; depends=[ggplot2 gridExtra MASS Matrix]; }; TSsql = derive2 { name="TSsql"; version="2017.4-1"; sha256="0f71q6gqfx4r3ghsmr572cvkpmf2xf7kipf10ii99z1y23dxmsdn"; depends=[DBI tframe tframePlus TSdbi zoo]; }; @@ -4553,8 +4582,8 @@ in with self; { TTS = derive2 { name="TTS"; version="1.0"; sha256="0dhxj474dqjxqg0fc2dcx8p5hrjn9xfkn0rjn2vz3js92fa9ik9h"; depends=[mgcv sfsmisc]; }; TTmoment = derive2 { name="TTmoment"; version="1.0"; sha256="0a4rdb4fk1mqnvvz0r15kni0g5vcj4xkkcwwv7c2gxc94xh5i5ih"; depends=[mvtnorm]; }; TULIP = derive2 { name="TULIP"; version="1.0"; sha256="0v0qnhlgj31mdl8xhhcbdlnmfcfn2scpr0bf2jxkxpyxiavqdfxy"; depends=[glmnet MASS Matrix tensr]; }; - TUWmodel = derive2 { name="TUWmodel"; version="1.0-2"; sha256="1b07isi7s22q65h9yabrz515nr4vxp2ynpl37l2lsf4mcpjjzg4x"; depends=[]; }; - TVsMiss = derive2 { name="TVsMiss"; version="0.1.1"; sha256="1lvswq3syp2mfcf0higmyg5k5qhg1q6jaz8g75az3xajn4jylm0k"; depends=[glmnet Rcpp]; }; + TUWmodel = derive2 { name="TUWmodel"; version="1.1-1"; sha256="1am3ywcj1rqgz5i2g9c6d6fgiv8b2nabllfy84xx1n18pin7mfbk"; depends=[]; }; + TVMM = derive2 { name="TVMM"; version="2.0"; sha256="1ijrni80i4d4mli5c8rf9jmazs3hanhvhhk20fjgalk94zvbp7md"; depends=[MASS robustbase]; }; Taba = derive2 { name="Taba"; version="0.1.0"; sha256="0pqmz7gyf719s5b7mjmmmxr5il3pzgsymibxir6ljpgdsdgbgi5s"; depends=[robustbase]; }; Table1Heatmap = derive2 { name="Table1Heatmap"; version="1.1"; sha256="1nrabjivfsdhaqmlq365pskkrp99jqsxn8vy03mdnqn5h5zv7wvx"; depends=[colorRamps]; }; TableHC = derive2 { name="TableHC"; version="0.1.2"; sha256="1il86xjc4h1sdq3gpi4s7xbkcgzpgfqy5ivzjdkbq45d06pssk21"; depends=[]; }; @@ -4574,23 +4603,23 @@ in with self; { TcGSA = derive2 { name="TcGSA"; version="0.12.7"; sha256="0l28sldpavyvhm9hab9gb7i7rmlxpj7ivffi6xx8lg7qjn6d21v5"; depends=[cluster cowplot ggplot2 GSA gtools lme4 multtest reshape2 stringr]; }; Tcomp = derive2 { name="Tcomp"; version="1.0.1"; sha256="1k0gsf3yr5n9zc2yi6szxm6s7bf61lz4fx8m3v48jlp5w900prwb"; depends=[forecast Mcomp]; }; TeXCheckR = derive2 { name="TeXCheckR"; version="0.6.0"; sha256="1qrzslcipg3j1317dhizxhcxyx2dpx7jh91vkms10wgc6vpqgrw4"; depends=[clisymbols crayon data_table fastmatch hunspell hutils magrittr rstudioapi zoo]; }; - TeachBayes = derive2 { name="TeachBayes"; version="1.0"; sha256="1mfhlkm7wp2i4hvc63xzfyw3q4z1xhlbi933pkqkbrhih94z4rz7"; depends=[dplyr ggplot2 gridExtra LearnBayes shiny]; }; TeachNet = derive2 { name="TeachNet"; version="0.7.1"; sha256="12kkpr96mq0jr07k7ivcmwhrfgas1qrfqfhxa4gm7vv3vkjn0gs9"; depends=[]; }; TeachingDemos = derive2 { name="TeachingDemos"; version="2.10"; sha256="016pivvy8gzz8f3clnr5dg488rb1lf0l5s00c3v34gm1dgiw5x1f"; depends=[]; }; TeachingSampling = derive2 { name="TeachingSampling"; version="4.0.1"; sha256="1hh56j1l8wyglnmy92cvh0awcyfjzk6iwgwnhdbc2infjq8fr1lg"; depends=[dplyr magrittr]; }; 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.1.3"; sha256="1hpm6ybksyizzkpig88jczj58kzgc82dmm22wy61hqhlbs4pmj1z"; depends=[viridisLite]; }; + Temporal = derive2 { name="Temporal"; version="0.2.0"; sha256="114ld41l2dipw7cpyh7fy3n332v1dkiqvdng6vkk9wm6jmda7wya"; depends=[expint numDeriv plyr Rcpp RcppArmadillo]; }; + Tendril = derive2 { name="Tendril"; version="2.0.4"; sha256="1wvczfklsccs8jd081vb6d6h7i35lhf6na925fm7wq8ars0b23wd"; depends=[dplyr ggplot2 magrittr plotly plyr reshape2 scales]; }; + Ternary = derive2 { name="Ternary"; version="1.1.4"; sha256="0js2ylif6171f1548d05lfw4kdlqkmqa6a510x6i9px93bvvkhsq"; depends=[viridisLite]; }; TestCor = derive2 { name="TestCor"; version="0.0.1.1"; sha256="1rxw5rz687ax3zlpaxb9bak6dd2jdl49h3fdzbz7r8vycwanwydq"; depends=[MASS Rcpp]; }; TestDataImputation = derive2 { name="TestDataImputation"; version="1.1"; sha256="10b1g9m2s6nbs8lrpcx3s1jf0fmqyd07mg3vx1pnma8r3vwy1yh7"; depends=[Amelia mice]; }; - TestDesign = derive2 { name="TestDesign"; version="1.0.1"; sha256="0d4j4ck4w2hhdmbp0cjp483xxgw0dhf226mbrkhfaimr2nddfbpl"; depends=[crayon foreach logitnorm lpsymphony Matrix Rcpp Rdpack]; }; - TestDimorph = derive2 { name="TestDimorph"; version="0.2.9"; sha256="0f2np7rqlcqxj2x1lwx6fryvdizan21j9962i51yi9b6pvkbpn6h"; depends=[caret corrplot DescTools dplyr ggplot2 klaR MASS mda multcompView plotROC plyr purrr randomForest reshape2 Rfast rlang stringr tibble tidyr tmvtnorm truncnorm]; }; + TestDesign = derive2 { name="TestDesign"; version="1.0.2"; sha256="1vz0bbbk74g3i4dlsd972n41mf0dhd74f9p2n47mgs3fh1r598zd"; depends=[crayon foreach logitnorm lpSolve Matrix Rcpp Rdpack]; }; + TestDimorph = derive2 { name="TestDimorph"; version="0.3.0"; sha256="0r9v32hz1gy1xyrz5yw8jsncnn8camzv8ha7k3df43rvnprv6xhf"; depends=[caret corrplot DescTools dplyr ggplot2 klaR MASS mda multcompView plotROC plyr purrr randomForest reshape2 Rfast rlang stringr tibble tidyr tmvtnorm truncnorm]; }; TestFunctions = derive2 { name="TestFunctions"; version="0.2.0"; sha256="018nkz8r6vqahrzq3d588i3ffb1bmd1pdk87j4ivcdsx99mq15sn"; depends=[]; }; TestScorer = derive2 { name="TestScorer"; version="1.7.2"; sha256="006c3g3gx55mfr93srldwvgz5vm6nkr3f57yi4qg6krn0d32865f"; depends=[]; }; TestingSimilarity = derive2 { name="TestingSimilarity"; version="1.1"; sha256="1iq0wh13rl6rby44ql4d286r1akzwmbpsvnq9p8lkl8709z0d34w"; depends=[alabama DoseFinding lattice]; }; TexExamRandomizer = derive2 { name="TexExamRandomizer"; version="1.2.3"; sha256="0l0vpx4rkib2m8hwhwy9j8pqyf7gpb9qg8wpnh3238snwpadgy3a"; depends=[assertthat jsonlite Rcpp stringr]; }; + TexMix = derive2 { name="TexMix"; version="0.5.3"; sha256="0qp7rlw4y2kw6bvh3rwy33p1g404q4ar1gg8ycdapwsyckq76nhn"; depends=[classInt Formula maptools RColorBrewer sp]; }; TextForecast = derive2 { name="TextForecast"; version="0.1.2"; sha256="0yj2m22imzllz07wx04nar2mfpyl06jiq0ya1nwgaq74kaiym42p"; depends=[doParallel dplyr forcats ggplot2 glmnet Matrix pdftools plyr pracma RColorBrewer tidyr tidytext tm udpipe wordcloud]; }; ThankYouStars = derive2 { name="ThankYouStars"; version="0.2.0"; sha256="0r77ns3102wj1wvrfsa06l427imxyfhigpbs36cdxl2j87qrjzl6"; depends=[httr jsonlite]; }; ThermIndex = derive2 { name="ThermIndex"; version="0.2.0"; sha256="0s9d55577dq61qixwwfwmqc2k2c8my00j2ng97ng42cw0jc7aylm"; depends=[]; }; @@ -4600,7 +4629,7 @@ in with self; { ThreeGroups = derive2 { name="ThreeGroups"; version="0.21"; sha256="0hipxa45v9ysb2qbk33kjycnvqar7bff1ajxd6fzhpc3jc9hflw4"; depends=[]; }; ThreeWay = derive2 { name="ThreeWay"; version="1.1.3"; sha256="17yl8zq029wiy3c0f4ssljx85dnm9n862wj2d24w7p0lxlvarmz6"; depends=[]; }; Thresher = derive2 { name="Thresher"; version="1.1.3"; sha256="16zf5cwc2c5j61xcrqsycwrsc162spyqgk9mac7n37mymn5agbwp"; depends=[ade4 ClassDiscovery colorspace MASS movMF oompaBase PCDimension]; }; - ThresholdROC = derive2 { name="ThresholdROC"; version="2.8"; sha256="0w5sxi6fgy3w1qj129g9z83822i7qx5s4js7dvzcdp2yfchj7pb3"; depends=[MASS numDeriv pROC]; }; + ThresholdROC = derive2 { name="ThresholdROC"; version="2.8.2"; sha256="1fsxf43syp371149wmbxjc13rrai69gc61xdlgrqplv4v0nqqk73"; depends=[MASS numDeriv pROC]; }; TickExec = derive2 { name="TickExec"; version="1.1"; sha256="0v0m0wi49yw0ply19vnirl2zwnk61sxalx24l8cadvkssgs13509"; depends=[]; }; TiddlyWikiR = derive2 { name="TiddlyWikiR"; version="1.0.1"; sha256="0vwwjdmfc8c0y2gfa8gls1mzvp29y39c9sxryrgpk253jj9px1kr"; depends=[]; }; TideCurves = derive2 { name="TideCurves"; version="0.0.4"; sha256="1i5qm6wwm6m0xrmr6dvk3pn6apxxqw9hznv8vypzwnky7bizkl90"; depends=[chron data_table fields]; }; @@ -4614,7 +4643,6 @@ in with self; { TimeWarp = derive2 { name="TimeWarp"; version="1.0.15"; sha256="1v6f6d1h9dc8npdy0ph5hhc4jjkzh8kac48lz4ahgngi9n0xwql9"; depends=[]; }; Tinflex = derive2 { name="Tinflex"; version="1.5"; sha256="15nbzr3q8rfrqywvlqi48r30fgq4lhlhp1fbnf12j49k6q2aixb1"; depends=[]; }; TipDatingBeast = derive2 { name="TipDatingBeast"; version="1.1-0"; sha256="07lw6jnr76qrxwrwv90hi5ih2xf6g4sz4hfapk5vf1y3ayfskkl0"; depends=[DescTools mclust TeachingDemos]; }; - 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.22"; sha256="0h25k5xs8wnyzhl8alzlwircdl1hmclljjpcapnfg7na4yskzsaq"; depends=[dplyr rstudioapi tibble]; }; @@ -4625,9 +4653,8 @@ in with self; { TopicScore = derive2 { name="TopicScore"; version="0.0.1"; sha256="1x6s3yn25rj8mbd25yi7f2rz0nwg8n0l1vs6r250kyjb17d2javm"; depends=[combinat Matrix quadprog RSpectra slam]; }; TotalCopheneticIndex = derive2 { name="TotalCopheneticIndex"; version="1.0.1"; sha256="0yc21vs10rzmwx0z6d0gyyncr25835vb7wpn392csc5big6d73xc"; depends=[memoise]; }; TouRnament = derive2 { name="TouRnament"; version="0.2.5"; sha256="09i0frzzxi5ymjlvh81rmisxh35amrvhxbkjq5351fhlpf1n977z"; depends=[]; }; - ToxicoGx = derive2 { name="ToxicoGx"; version="0.1.1"; sha256="06xkz08ppq99s7zrjpkb463rqj2vn7abgm50knac5hi5ixmirdlb"; depends=[Biobase caTools CoreGx data_table downloader dplyr ggplot2 magrittr RColorBrewer reshape2 scales SummarizedExperiment tibble tidyr]; }; - TraMineR = derive2 { name="TraMineR"; version="2.0-14"; sha256="15lcyy9pwm5gfwihb6nkcjjhkl4jan12hfqrwa6rlzzv9z5304j5"; depends=[boot cluster Hmisc RColorBrewer]; }; - TraMineRextras = derive2 { name="TraMineRextras"; version="0.4.6"; sha256="135s6aqkx18c364y9z0an0sbnwkgb2yrzxim3nd5khnbbnqdb5z2"; depends=[cluster RColorBrewer survival TraMineR]; }; + TraMineR = derive2 { name="TraMineR"; version="2.0-15"; sha256="0yfgrbdkzy5gpd7q7s64rd7i7k4b9myr3gd1zb7spl16pgvmp7zv"; depends=[boot cluster colorspace Hmisc RColorBrewer]; }; + TraMineRextras = derive2 { name="TraMineRextras"; version="0.4.7"; sha256="0lls9683jq0ws62sqfj3zm1v2v3ymn0flpkv3iwqb5i84mj63aq6"; depends=[cluster RColorBrewer survival TraMineR]; }; TrackReconstruction = derive2 { name="TrackReconstruction"; version="1.2"; sha256="1kpdiwwzxsdwv5255xlvcnxvnp39ky0aws41g1l5i7cpbv88kca5"; depends=[fields RColorBrewer]; }; Trading = derive2 { name="Trading"; version="1.2"; sha256="0wlwpf1iygcs0cy7ms57b1bbp8f3s193bvc6fcm31ih5ph8pr48i"; depends=[]; }; TrafficBDE = derive2 { name="TrafficBDE"; version="0.1.0"; sha256="1lnh9lbjxaradivnd1dkd2szggjh2r4v7klpyxb862dxsmdxxrqw"; depends=[caret data_table dplyr lubridate neuralnet RCurl zoo]; }; @@ -4640,22 +4667,21 @@ in with self; { 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.3.2"; sha256="1h7s3i65n5j7mk2qxqyqy0h379jlszywh8hfmd93pn1yh01v3sz3"; depends=[ape clue colorspace memoise phangorn R_cache Rcpp Rdpack]; }; + TreeSearch = derive2 { name="TreeSearch"; version="0.4.0"; sha256="1mlvm0j2farxwyivjsx1994bh8l9qb4cx65096fi5zqzi5ybqigd"; depends=[ape phangorn R_cache Rdpack TreeTools]; }; TreeSim = derive2 { name="TreeSim"; version="2.4"; sha256="0nmzx2723n1f5lr951zz2ih2gnpfim5qzihlayhpf181z1qijv93"; depends=[ape geiger]; }; - TreeSimGM = derive2 { name="TreeSimGM"; version="2.3"; sha256="0qwqvmmdn290llz5hmmx2q24jjmd1bxssrslzv31kzi1yq5h6w0b"; depends=[ape TreeSim]; }; - TreeTools = derive2 { name="TreeTools"; version="0.1.3"; sha256="084kizkldrqj0q7gwl6v7r2v1pazd78qdxwjhnadllcxqid54ay7"; depends=[ape colorspace phangorn R_cache Rcpp]; }; - TrendInTrend = derive2 { name="TrendInTrend"; version="1.1.2"; sha256="1kdjrzv2s5vpyg1lx6qkxj3dyi84qwhrvz17mx731f9pp70cz29j"; depends=[pROC rms]; }; + TreeSimGM = derive2 { name="TreeSimGM"; version="2.5"; sha256="125c9rim272h0dfyygmmijz8dcnch3g9wy1ngki77dyrmdl77yfx"; depends=[ape TreeSim]; }; + TreeTools = derive2 { name="TreeTools"; version="0.1.4"; sha256="103ymrgwq41f2h5v31brxg4cjrqk82wqx0hhasrcpf1vq37dc512"; depends=[ape colorspace phangorn R_cache Rcpp]; }; + TrendInTrend = derive2 { name="TrendInTrend"; version="1.1.3"; sha256="0ijkijyhxhjc7202qssa9wnrmwgv4miv5n8jbml4qqj80kcsbdwp"; depends=[nleqslv pracma pROC rms]; }; TrendSLR = derive2 { name="TrendSLR"; version="1.0"; sha256="1x8j2dg3m7b22gva33y4s318a41wl60sz93y868z4j65hp13jb5k"; depends=[changepoint forecast imputeTS plyr Rssa tseries zoo]; }; TriMatch = derive2 { name="TriMatch"; version="0.9.9"; sha256="17v8hdm594i9qs5hvrzb1k94wrzvx07479rmvbk4314fim27mabg"; depends=[ez ggplot2 gridExtra PSAgraphics psych randomForest reshape2 scales]; }; TriadSim = derive2 { name="TriadSim"; version="0.1.1"; sha256="0m14k512b7q09zx51v2kxa8q9pk2i179w6ckl6jxj2acc860xw3k"; depends=[doParallel foreach snpStats]; }; TrialSize = derive2 { name="TrialSize"; version="1.3"; sha256="1hikhw2l7d3c7cg4p7zzrgdwhy9g4rv06znpw5mc6kwinyakp75q"; depends=[]; }; TrioSGL = derive2 { name="TrioSGL"; version="1.1.0"; sha256="0xzyv1vppw0v1xjpf83nnv1sx1xy7197ay6l7dzvr0vllappdam9"; depends=[]; }; TripleR = derive2 { name="TripleR"; version="1.5.3"; sha256="13s1vlmr4sqa2sq2fbcld86bh3g73yb204aawbks11rjblwzvb0h"; depends=[ggplot2 plyr reshape2]; }; - TropFishR = derive2 { name="TropFishR"; version="1.6.1"; sha256="06793rgidq1hdm3jwg1fxpglf5vh7w3xbk4hzj1pgw04na464ibv"; depends=[doParallel GA GenSA Hmisc MASS msm propagate reshape2]; }; + TropFishR = derive2 { name="TropFishR"; version="1.6.2"; sha256="1mmb573gf82rxsvrjal4iy5f5gjhjaws6kcabnhhp6cn5ainl64r"; depends=[doParallel GA GenSA Hmisc MASS msm propagate reshape2]; }; TruncatedNormal = derive2 { name="TruncatedNormal"; version="2.1"; sha256="13aw1lvfq8mz91fqy65zs5aps231m9mq5v0r82c2ps72jaa7mcpw"; depends=[nleqslv randtoolbox Rcpp RcppArmadillo]; }; Tsphere = derive2 { name="Tsphere"; version="1.0"; sha256="0xgxw2hfj40k5s0b54dcmz7savl8wy4midmmgc7lq4pyb8vd58xx"; depends=[glasso rms]; }; TukeyC = derive2 { name="TukeyC"; version="1.3-3"; sha256="0bdnfr44hk4c1yh7i9ya95gwbwnplj3hf0k0pl1wm4ghiav39vcq"; depends=[doBy]; }; - TukeyRegion = derive2 { name="TukeyRegion"; version="0.1.2"; sha256="03lik9vkah3hjhn0l4ci95v2h4q8mnziq006idipn69l4gmnddxl"; depends=[bfp BH ddalpha MASS Rcpp rgl Rglpk]; }; TunePareto = derive2 { name="TunePareto"; version="2.5"; sha256="0v1ylh4m5s80zp346pxxlvhm5070w83mlzfxjyp4n000c8r2nkf4"; depends=[]; }; TurtleGraphics = derive2 { name="TurtleGraphics"; version="1.0-8"; sha256="0h77pj7rs3lrqi1y2dm1cbrmj13mjpq6y5nw8bcq0s2kbnkfw67l"; depends=[]; }; Tushare = derive2 { name="Tushare"; version="0.1.3"; sha256="12aabkwlifc82yiym3yijpfpjhmhfwpw8mz4fb11qm6n4igr1yhg"; depends=[data_table forecast httr tidyverse]; }; @@ -4668,7 +4694,7 @@ in with self; { UBL = derive2 { name="UBL"; version="0.0.6"; sha256="0238irg7r3g248h4x4bdb308wvfqq99hwykywf4k2bssdd25kwjk"; depends=[automap gstat MBA randomForest sp]; }; UCR_ColumnNames = derive2 { name="UCR.ColumnNames"; version="0.1.0"; sha256="1nwwq93f60r9aik51l7mzckg81f81nz5kgzynyzp5sm4y2wmpzwn"; depends=[]; }; UCSCXenaShiny = derive2 { name="UCSCXenaShiny"; version="0.4.0"; sha256="1m67ahh2k0mc8215nnb32r8nf9niax7y5nn3qpwg1fcav7g9ns66"; depends=[dplyr DT ggplot2 ggpubr magrittr plotly RColorBrewer shiny shinyBS shinyjs shinythemes shinyWidgets tibble UCSCXenaTools zip]; }; - UCSCXenaTools = derive2 { name="UCSCXenaTools"; version="1.2.10"; sha256="10aansvqf2abgppk7mx9nr7ingy994qci59ikr8rv1y2hnfar2l2"; depends=[dplyr httr jsonlite magrittr readr rlang]; }; + UCSCXenaTools = derive2 { name="UCSCXenaTools"; version="1.3.1"; sha256="1s4mkl9bf4lgqlfb5rjdk3fas9dsvqd5sgypw6jl2dbdf40krza8"; depends=[dplyr httr jsonlite magrittr readr rlang]; }; UKgrid = derive2 { name="UKgrid"; version="0.1.2"; sha256="135lvzaw4gjnc40aw28706fhiz7p06l1jhw830iyg03w2v4j0ar0"; depends=[data_table dplyr lubridate magrittr tsibble 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]; }; @@ -4686,22 +4712,22 @@ in with self; { UWHAM = derive2 { name="UWHAM"; version="1.0"; sha256="1qaj8anaxqnx4nc6vvzda9hhhzqk9qp8q7bxm26qgia4hgascnrv"; depends=[trust]; }; UdderQuarterInfectionData = derive2 { name="UdderQuarterInfectionData"; version="1.0.0"; sha256="084bq5ai1ccp4www64z0ipic74zkd8j1ygv0py900164a25wdr9b"; depends=[]; }; Ultimixt = derive2 { name="Ultimixt"; version="2.1"; sha256="0fh2qpm7qpv1170jzbmzqhvwsn69lblizzisgasswy2nix2jjz4y"; depends=[coda gtools]; }; - Umatrix = derive2 { name="Umatrix"; version="3.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.8"; sha256="1cxglmvzf4s97588x4hdky475wbzz74lay3ry076c7jxxx7pwipz"; depends=[]; }; + Umatrix = derive2 { name="Umatrix"; version="3.3"; sha256="188h959s5pawnny0fxlqmma03iww6af4x0y8p514bwh5xh9rj3kg"; depends=[abind AdaptGauss deldir fields geometry ggplot2 pdist plyr png pracma Rcpp reshape2 shiny shinyjs]; }; + Umoments = derive2 { name="Umoments"; version="0.1.1"; sha256="089d0xmsp0419mxjp6fs0s1palvdkr0i5dzqckcn6r2kjqj7izjg"; depends=[]; }; + Umpire = derive2 { name="Umpire"; version="1.3.9"; sha256="0wqbi27mnjafg1cm82mrlavb9jcrxvh2z28m63gl7jw3zcyxn816"; depends=[]; }; UncDecomp = derive2 { name="UncDecomp"; version="1.0.1"; sha256="1m44pgk7nffay09m4gkwb0khq0qjd7bq1p72blsmib46wmnwqfsa"; depends=[dplyr ggplot2]; }; - UncerIn2 = derive2 { name="UncerIn2"; version="2.0"; sha256="08cg7armz9xwwn1222aws98cwrvmw0s73pxpnszmrmrli1qs92k1"; depends=[automap fields geoR gstat RandomFields Rcpp sp]; }; - UncertainInterval = derive2 { name="UncertainInterval"; version="0.5.0"; sha256="11vwf45bhgzzriwjjzjvbbwpzknbf6xl5s9ng7gxh58q20jy038j"; depends=[nloptr reshape2 rootSolve zoo]; }; + UncertainInterval = derive2 { name="UncertainInterval"; version="0.5.2"; sha256="0ha3j34bzrrwywlww7370mnpx61vhf4gdz6hz0fbad7raf1ry2m1"; depends=[car MASS nloptr psych reshape2 rootSolve zoo]; }; UniDOE = derive2 { name="UniDOE"; version="1.0.2"; sha256="14jz4acrvbv59sbr7gya8g0z749vv0i04gl5wl0y4218byjvw6bs"; depends=[Rcpp]; }; UniIsoRegression = derive2 { name="UniIsoRegression"; version="0.0-0"; sha256="0lmrmb9sbk41ak7sbcrzhfnijb1skgb4lqg9m9imc98lcp69h7z0"; depends=[Rcpp]; }; - Unicode = derive2 { name="Unicode"; version="12.0.0-1"; sha256="1wpzj5jwmb9d9iz1xvgn8mc2xjri28g97k4lpafybb1v4xnxqk54"; depends=[]; }; - UniprotR = derive2 { name="UniprotR"; version="1.2.3"; sha256="0xlszwlrfi51day88ailgwr88wn7n0fdc0ms39gqy5jcw0xc9yky"; depends=[alakazam data_tree dplyr ggplot2 ggpubr gridExtra httr magick magrittr plyr scales tidyverse]; }; + Unicode = derive2 { name="Unicode"; version="13.0.0-1"; sha256="12q98hdh46bbx17z6869bmn1j9bbhf524flvn76sqf20phk81xjy"; depends=[]; }; + UniprotR = derive2 { name="UniprotR"; version="1.2.4"; sha256="1zzxm93390nxw27fr62vhd8pafkq6fiy8if0cx4raznlym5615is"; depends=[alakazam data_tree dplyr ggplot2 ggpubr gridExtra httr magick magrittr plyr scales tidyverse]; }; UnitCircle = derive2 { name="UnitCircle"; version="0.1.3"; sha256="0z5ssps8l5ka4aw4984qml15scw4pfssara5dls82afhfhpkszsr"; depends=[]; }; UnivRNG = derive2 { name="UnivRNG"; version="1.2"; sha256="0cx6bdzzypxnaqi4wkb20saqd5sfa2rga5cqh694l70vj9c3zw26"; depends=[]; }; UpSetR = derive2 { name="UpSetR"; version="1.4.0"; sha256="007i0njnjjy7vbrxabwav7a1kk2n0hn2mkvqsdzzfk10ckp5y7im"; depends=[ggplot2 gridExtra plyr scales]; }; UsingR = derive2 { name="UsingR"; version="2.0-6"; sha256="1lr8z45r5s7fxrd42rswm6w7s3k5nds244b9d525jb5v4n8w9kpw"; depends=[HistData Hmisc MASS]; }; UtilityFrailtyPH12 = derive2 { name="UtilityFrailtyPH12"; version="1.0"; sha256="06f5gmwwk1r14ab6v5jcxz0pmdph7ffi4y57mjg9byn7pjnibflk"; depends=[bindata mvtnorm Phase123 Rcpp RcppArmadillo]; }; - V8 = derive2 { name="V8"; version="3.0.1"; sha256="0xkyja3722qbs2ndyw3171yfsakijnydm2bfqv76cf0gbzxdab5b"; depends=[curl jsonlite Rcpp]; }; + V8 = derive2 { name="V8"; version="3.0.2"; sha256="0cwhdk77fgmlaihh2mf0iclqz7fps7s7hvsw2s65m62w9gbwfhlk"; depends=[curl jsonlite Rcpp]; }; + VALERIE = derive2 { name="VALERIE"; version="1.0.0"; sha256="0rll02y0virzifn5xvsi52kn17j99vwmd23awkbqw50wvp5qkgss"; depends=[GenomicAlignments GenomicRanges ggplot2 ggplotify ggpubr IRanges pheatmap plyr Rsamtools scales]; }; VAR_etp = derive2 { name="VAR.etp"; version="0.7"; sha256="0py5my3ilhcmz44m15hh0d219l9cz7rda4a9gbmf8wh9cgvvj1s3"; depends=[]; }; VARSEDIG = derive2 { name="VARSEDIG"; version="1.9"; sha256="18j73wm22bjvf2y0c09bfmdyx4x2gd0jhfcqhbk1sgsk24zjr63z"; depends=[]; }; VARshrink = derive2 { name="VARshrink"; version="0.3.1"; sha256="09hysmxxawcbyfx6bia546aqydryl2r5p3ai7bvl6ghdckw5mnpl"; depends=[ars corpcor MASS mvtnorm strucchange vars]; }; @@ -4719,24 +4745,21 @@ in with self; { VGAMdata = derive2 { name="VGAMdata"; version="1.0-3"; sha256="1jicadjaqmys1bbgkp64hmm8wwmi6f734il00v8qjz3jl9b02pkn"; depends=[]; }; VGAMextra = derive2 { name="VGAMextra"; version="0.0-1"; sha256="0rlj4q6ry6v3fnpmg4s33ynn7qzs5m98csap55nyn6r9ynrh5gk5"; depends=[VGAM]; }; VHDClassification = derive2 { name="VHDClassification"; version="0.3"; sha256="1ij4h3gzxb9mm9q743kc3sg2q609mnqz6mhlrbim1wcjji2b7bv4"; depends=[e1071 lattice]; }; - VICmodel = derive2 { name="VICmodel"; version="0.1.2"; sha256="0hrnj8jl31pbzz9rji5g5bc53da5mg75bf1lqgp8igqvhgy0a08k"; depends=[foreach Rcpp]; }; VIF = derive2 { name="VIF"; version="1.0"; sha256="0yvg6ikrcs7mhg0pavhcywrfysv7ylvnhxpc5sam86dbp69flx9x"; depends=[]; }; VIFCP = derive2 { name="VIFCP"; version="1.2"; sha256="0w41k25vss806m5vpwmmcfsmwaixmln0pliql3a6xlwsihha5i34"; depends=[]; }; VIGoR = derive2 { name="VIGoR"; version="1.0"; sha256="1c24s917aafqy46b3xlsw8v3afs11nd5bq83vlygpgnz1612jpga"; depends=[]; }; - VIM = derive2 { name="VIM"; version="4.8.0"; sha256="08x4a4yzgp8adgrv7a3666yma4b60n64mcsnvhzmwdy023f4ysrw"; depends=[car colorspace data_table e1071 laeken MASS nnet ranger Rcpp robustbase sp vcd]; }; - VIMGUI = derive2 { name="VIMGUI"; version="0.10.0"; sha256="14na9ss0vkcys979kdcciynwssqsvy2w566nydgzd3n7gcmx2agm"; depends=[Cairo foreign gWidgets gWidgetsRGtk2 Hmisc RGtk2 survey tkrplot VIM]; }; + VIM = derive2 { name="VIM"; version="5.1.1"; sha256="0w22ir0gvym7gqd6nw2j7w5ivlb3az1dkfxv33imimkb7c83056a"; depends=[car colorspace data_table e1071 laeken magrittr MASS nnet ranger Rcpp robustbase sp vcd]; }; VIRF = derive2 { name="VIRF"; version="0.1.0"; sha256="0bdkmbmkmmj78h9x025qsdzjzcx8xr2s98wlspcsghlz4hxkzcas"; depends=[BigVAR expm gnm ks matlib matrixcalc mgarchBEKK rmgarch]; }; VLF = derive2 { name="VLF"; version="1.0"; sha256="1il8zhm80mc22zj16dpsy4s6s9arj21l9ik0vccyrpnlr8ws3d3l"; depends=[]; }; VLMC = derive2 { name="VLMC"; version="1.4-3-1"; sha256="0cwfpxcj8g68j9z9fl66i0amj8ypf199iv3yyxzsmniqv4w5x4ar"; depends=[MASS]; }; VLTimeCausality = derive2 { name="VLTimeCausality"; version="0.1.0"; sha256="1fsdxpd9vxnx7919a601g6qf2db8f1p7ch5bfrwc0x89y6abzavv"; depends=[dtw ggplot2 RTransferEntropy tseries]; }; VNM = derive2 { name="VNM"; version="7.1"; sha256="19qglcibb7r6jjz0n0piklwfv3hi4jphd6vmyfbm0ccjjkmn5nin"; depends=[Rcpp]; }; VOSONDash = derive2 { name="VOSONDash"; version="0.5.1"; sha256="1mg38fh7rrf1b2madk7lqqg0rmkh73hl20f920b4pdggqnrpmqq6"; depends=[httpuv httr igraph lattice magrittr RColorBrewer rtweet shiny syuzhet tm vosonSML wordcloud]; }; - VRPM = derive2 { name="VRPM"; version="1.2"; sha256="1cai5a71vzkx0d7cwzsxbcz7r9cdkqjk4l4bp2ffj5pp7nrlh15r"; depends=[fields ggplot2 Hmisc kernlab R2HTML ROCR shiny survival viridis]; }; VSE = derive2 { name="VSE"; version="0.99"; sha256="07m5080nw72b77238v2wwdh4dxsvv6y78d4j1329n90wyj2crxl4"; depends=[car GenomicRanges igraph IRanges]; }; VSURF = derive2 { name="VSURF"; version="1.1.0"; sha256="1azfd4sb89mp27l86k293qj81x94gfiy1ihwnb6c558p8h69xsgf"; depends=[doParallel foreach randomForest ranger Rborist rpart]; }; VTShiny = derive2 { name="VTShiny"; version="0.1.0"; sha256="1zq6irla3q7hqs8jpjdya7vy3frqrj72rwmd1sgxwrkgpmpxw6x7"; depends=[EnvStats rmarkdown shiny]; }; VTrack = derive2 { name="VTrack"; version="1.21"; sha256="1acf2b8zy72shc4768rhikfa3590h3l3nwk32jk7pwsms0nb87rf"; depends=[checkmate doParallel foreach gdistance gstat Hmisc intervals lubridate plotKML plyr raster sp spacetime XML]; }; - VWPre = derive2 { name="VWPre"; version="1.2.2"; sha256="02fki480jxf869kaxawwyj9yznhqci8gmhxz45klayyghr90vd4g"; depends=[dplyr ggplot2 mgcv rlang shiny tidyr]; }; + VWPre = derive2 { name="VWPre"; version="1.2.3"; sha256="0pvk7qmi6s8yqf6s0vbf1ldwrs2b37kgayrdsvfpvxhljg79zl1i"; depends=[dplyr ggplot2 mgcv rlang shiny tidyr]; }; VaRES = derive2 { name="VaRES"; version="1.0"; sha256="0gw05jiqgirhz3c8skbb07y4h44r6vi68gnd5y7ql455v0c2raza"; depends=[]; }; VancouvR = derive2 { name="VancouvR"; version="0.1.1"; sha256="1nzjdassan5kh7wk3xf6kry4jifgjn0gan61ibwhyzy1awpcfngv"; depends=[digest dplyr httr purrr readr rlang sf tibble urltools]; }; VarBundle = derive2 { name="VarBundle"; version="0.3.0"; sha256="0jfx9gkb3f29lgc0nrz3xc7m2ham0scx9lay7x5a6ira7crga6cr"; depends=[crayon dplyr glue magrittr R6 stringr tibble]; }; @@ -4754,21 +4777,21 @@ in with self; { VennDiagram = derive2 { name="VennDiagram"; version="1.6.20"; sha256="1ic1jaxzw98si2p4n1fl4n3myhd7fpw0njb634cwhviwybzv6775"; depends=[futile_logger]; }; VertexSimilarity = derive2 { name="VertexSimilarity"; version="0.1"; sha256="0f638y272dbmz5747wxqy9pxasxk3a9f9wf31gf297qx7268ab1m"; depends=[igraph]; }; VertexSort = derive2 { name="VertexSort"; version="0.1-1"; sha256="0n9m5l85ylin6756rsksak94nv0626qd7czhhj6plz4nfrr27sgl"; depends=[igraph snowfall]; }; - VeryLargeIntegers = derive2 { name="VeryLargeIntegers"; version="0.1.6"; sha256="1ccl4j3vb6aw1qfbqil67dy74daldajwzm7s5hqcidm73fd0wknc"; depends=[Rcpp]; }; + VeryLargeIntegers = derive2 { name="VeryLargeIntegers"; version="0.1.8"; sha256="0yvm3kkc7ssk85ripdgbxj8gazqb1dfswgjy63c3gb135zi2cbqk"; depends=[Rcpp]; }; VetResearchLMM = derive2 { name="VetResearchLMM"; version="1.0.0"; sha256="1a7wm04bsr5shak7l8ypxlhlnx3qkq1jdpjnji1n05p6b00ih9h1"; depends=[ggplot2 lme4 lmerTest multcomp nlme]; }; ViSiElse = derive2 { name="ViSiElse"; version="1.2.2"; sha256="1ay09dahlqnfrgf4gl4s45a4ahrk2xliagxqz5h826w2vzsawqcc"; depends=[chron colorspace ggplot2 Matrix reshape2 stringr]; }; VineCopula = derive2 { name="VineCopula"; version="2.3.0"; sha256="0w9lpdb9mjia2vg9h4v418g8zw8xfq83hmih37hf3yp7p88vja1k"; depends=[ADGofTest lattice MASS mvtnorm]; }; + Visualize_CRAN_Downloads = derive2 { name="Visualize.CRAN.Downloads"; version="1.0"; sha256="0hzq00dbddzwvhryl38sffchxqz52xk8fizsfjgk1xxjr3g8icw4"; depends=[cranlogs htmlwidgets plotly]; }; Voss = derive2 { name="Voss"; version="0.1-4"; sha256="056izh1j26vqjhjh01fr7nwiz1l6vwr5z4fll87w99nc5wc4a467"; depends=[fields]; }; - VoxR = derive2 { name="VoxR"; version="0.5.1"; sha256="07lsp6lrkq0gv55m84dl9w7gz5246d9avypqnkz96n3rbbgd0w5z"; depends=[]; }; W2CWM2C = derive2 { name="W2CWM2C"; version="2.0"; sha256="139rbbhshiap3iq4s4n84sip3cwwjn2x7lm7kmzwj5glhl5dc6ga"; depends=[colorspace wavemulcor waveslim]; }; W3CMarkupValidator = derive2 { name="W3CMarkupValidator"; version="0.1-6"; sha256="0nfay5nqss3zlw4nikj8h3zzlnjfxjch4pm3qky15qrcigrybrbl"; depends=[curl xml2]; }; WARN = derive2 { name="WARN"; version="1.2-4"; sha256="18gfk9vqcqarj7j5i240wqv2dclg3csng4mih5izj40xaaxaf6q5"; depends=[MASS]; }; WCE = derive2 { name="WCE"; version="1.0.2"; sha256="105pwpd9ikm0gwz4r12jl6cgs1riwsk9pn5qk9cn3msgwa0sdynx"; depends=[plyr survival]; }; - WCM = derive2 { name="WCM"; version="0.2.1"; sha256="0d2yw6kzn7mvxwllxfbk6vfiy8l1fd7ggjgi92kjn0j0y66cadw4"; depends=[pracma raster]; }; + WCM = derive2 { name="WCM"; version="0.2.2"; sha256="0w1m2vcxc64ksw3dm94wdigil2fpv3cvzyqmkhs2zrfjlgrdchcd"; depends=[pracma raster]; }; WCQ = derive2 { name="WCQ"; version="0.2"; sha256="1yhkr2iazd7lh9r68xz1lh32z6r1sdnmqrjshcrm4rbwai0j3lkr"; depends=[]; }; WDI = derive2 { name="WDI"; version="2.6.0"; sha256="00y8i69yfnflv0xyfpxl0628p5iivr38cjih7w11sfprdgbzawcx"; depends=[RJSONIO]; }; WEE = derive2 { name="WEE"; version="1.0"; sha256="0i3h67p72lr708mwdw3rbzr1lqqr8n2dxv7f0bwyqzxv41sx1iz3"; depends=[doParallel foreach quantreg]; }; - WGCNA = derive2 { name="WGCNA"; version="1.68"; sha256="1s7gy5vd7x67hpgli8r7ba2z99w3psiyv5hqmrh94zw141dg210a"; depends=[AnnotationDbi doParallel dynamicTreeCut fastcluster foreach GO_db Hmisc impute matrixStats preprocessCore Rcpp robust survival]; }; + WGCNA = derive2 { name="WGCNA"; version="1.69"; sha256="022hkprnrafvggi8pkjffkvk1qlnibmbbxxrni00wkrdbga5589f"; depends=[AnnotationDbi doParallel dynamicTreeCut fastcluster foreach GO_db Hmisc impute matrixStats preprocessCore Rcpp survival]; }; WGScan = derive2 { name="WGScan"; version="0.1"; sha256="0jma6di9hbdimswdfm58568vahcjy46hbhb78idjsdz4bl9apvq3"; depends=[data_table MASS Matrix seqminer SKAT]; }; 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]; }; @@ -4776,36 +4799,36 @@ in with self; { WMWssp = derive2 { name="WMWssp"; version="0.4.0"; sha256="16m4hvjqdcpkvswvqwgm0pq9nm7vjrlqldzi4i69izlwccp37v47"; depends=[]; }; WPC = derive2 { name="WPC"; version="1.0"; sha256="0li502hwa4n945yfnilslyvl12ls66kazbfmxb4kkjbaf500mjp9"; depends=[msm survival]; }; WPKDE = derive2 { name="WPKDE"; version="0.1"; sha256="100vla11fbw16x5n4w4kbslz4n725v4x6j0hrxzrk99ryl0crmf6"; depends=[]; }; - WR = derive2 { name="WR"; version="0.1.0"; sha256="00781l9rmfm8sqsmhqn59ihw3jsjphg8jnvk34bzh6aaxzdfybm9"; depends=[survival]; }; + WR = derive2 { name="WR"; version="0.1.1"; sha256="153f64b2zsykl5f8iwxlcqby96ag1an4w8lhs7dxx72gy5k4vs6c"; depends=[survival]; }; WRS2 = derive2 { name="WRS2"; version="1.0-0"; sha256="1ax7lchbg0f5miq5779p1zmk6pw36hvwwmbpvsfqwahl5wlvii0s"; depends=[MASS mc2d plyr reshape]; }; WRSS = derive2 { name="WRSS"; version="3.0"; sha256="16a7i6glgl5cshsn3w7gxviybmka06ylw5znz94gigyx0vhgv97p"; depends=[GGally ggplot2 Hmisc network nloptr]; }; WRTDStidal = derive2 { name="WRTDStidal"; version="1.1.2"; sha256="1ssrqqf2hypif4nnfyl4lq03glyyg9ry9s14llf1njxamhjggfgg"; depends=[caret dplyr fields foreach forecast ggplot2 gridExtra lubridate purrr quantreg RColorBrewer survival tidyr]; }; - WVPlots = derive2 { name="WVPlots"; version="1.2.3"; sha256="061gzahn3sqzl7kn20k6151qf364sq048z765l0n8995rmv2z08b"; depends=[cdata ggplot2 gridExtra mgcv rqdatatable rquery sigr wrapr]; }; + WVPlots = derive2 { name="WVPlots"; version="1.2.4"; sha256="1mjfk4dijfgaibhrlnxq1iv6q9c2r8zb5ky6f7v840jhwx2k2pnz"; depends=[cdata ggplot2 gridExtra mgcv rqdatatable rquery sigr wrapr]; }; WWGbook = derive2 { name="WWGbook"; version="1.0.1"; sha256="0q8lnd1fp4rmz715x0lf61py3xw8wg55yq3gvswaqwy68dlqrzjc"; depends=[]; }; WWR = derive2 { name="WWR"; version="1.2.2"; sha256="0ia1dd12r1l08s9nhgvk55jmqwv58jawm25gd2ni6wpa3mcmq02g"; depends=[inline]; }; WaMaSim = derive2 { name="WaMaSim"; version="1.0.0"; sha256="0sa7qd2bpn3sp06mlpissxxkfhg7j1d07nnwlnz7nyg7pivwnpan"; depends=[magrittr]; }; + WaterML = derive2 { name="WaterML"; version="1.9.0"; sha256="1wp7ps6xypxar89lbndk56sc3px62xz098jlnr9hq124mqac01qb"; depends=[httr XML]; }; Watersheds = derive2 { name="Watersheds"; version="1.1"; sha256="1gn52nl0rr29pqq94gjasc4fi1kjxlrpjdkgm2x56j5jbd162drk"; depends=[lattice maptools rgeos sp splancs]; }; WaveLetLongMemory = derive2 { name="WaveLetLongMemory"; version="0.1.2"; sha256="1p9ld6w2qgbvkvp7xkzzd14v89rxcwl6vlr1zgxkpc5awl1ln1a8"; depends=[fracdiff wmtsa]; }; - WaveSampling = derive2 { name="WaveSampling"; version="0.1.0"; sha256="1xyi4aj2l9bjj6f2y11wl29rabhzmkdph1bd8jh8jwwf2p3502wh"; depends=[Matrix Rcpp RcppArmadillo]; }; + WaveSampling = derive2 { name="WaveSampling"; version="0.1.1"; sha256="081pqxbrz8vsmjgammh0802frl8lqrw9z1svhdqjc65lqkwghh75"; depends=[Matrix Rcpp RcppArmadillo]; }; 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=[]; }; - WaveletGARCH = derive2 { name="WaveletGARCH"; version="0.1.0"; sha256="1sgpwdhg7snm0in93ky7jv8lgynnxwlmpgznyj747j7jl9cxz5qn"; depends=[FinTS forecast fracdiff rugarch wavelets]; }; + WaveletGARCH = derive2 { name="WaveletGARCH"; version="0.1.1"; sha256="0dj5bmvzfhj1cpn8qi2ax3iipr7jlq0f9vk4b1idqgh5dmdi8lh6"; depends=[FinTS forecast fracdiff rugarch wavelets]; }; WaverR = derive2 { name="WaverR"; version="1.0"; sha256="084fhzggzm075w6wp2lqd3j0an21idhw8z5l8ynz4y96mpmn204a"; depends=[kimisc MASS]; }; WeMix = derive2 { name="WeMix"; version="3.1.3"; sha256="0407ph8cbci4qwgk525r0y88iz45faq52ljlqa46q9076r9j7sng"; depends=[lme4 Matrix minqa NPflow numDeriv Rmpfr statmod]; }; WebGestaltR = derive2 { name="WebGestaltR"; version="0.4.3"; sha256="0l068mikd8ys7w2643kzmzy2qnj0khz3k780n1lm78ikzbk43sr0"; depends=[apcluster doParallel doRNG dplyr foreach httr igraph jsonlite Rcpp readr rlang svglite whisker]; }; WebPower = derive2 { name="WebPower"; version="0.5.2"; sha256="11255q41zai4q6n2mpk3fzhi2lyyr3g8dxqfajkb93f68m1b38jp"; depends=[lavaan lme4 MASS PearsonDS]; }; WeibullFit = derive2 { name="WeibullFit"; version="0.1.0"; sha256="1a80gcqbmvb1rz2dr2syy16wn6ixjn6l40gayys9zy8302hky9ir"; depends=[e1071 FAdist glue kSamples mixdist optimx R_methodsS3 R_oo sqldf xtable]; }; WeibullR = derive2 { name="WeibullR"; version="1.0.12"; sha256="0rj4q9hd49b914lz8q1d8n96xrl0h29avn95aigb3z7f8knf7g9g"; depends=[Rcpp RcppArmadillo]; }; - WeightIt = derive2 { name="WeightIt"; version="0.8.0"; sha256="0pw9pspyls0jk6w0i3dcwxmsfbvagncwgh1ilfgyq0v8mlilvr0y"; depends=[ggplot2]; }; + WeightIt = derive2 { name="WeightIt"; version="0.9.0"; sha256="0p16q0zc7xdxwsvdf15h97zj7cdhr1rmzawljsjn4yzqwqby7nsy"; depends=[backports crayon ggplot2]; }; + WeightSVM = derive2 { name="WeightSVM"; version="1.7-3"; sha256="0w0czic90fswiy7jdr0fqvwnj91755821kzpj7rl1dd5123qxacc"; depends=[class]; }; Weighted_Desc_Stat = derive2 { name="Weighted.Desc.Stat"; version="1.0"; sha256="030i12mnwlj976avvk3grrccgprsckmc35dm2ajwdfc9dijhypnj"; depends=[]; }; 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="2019.11.12"; sha256="1zznzvd2nlxq3c5gr88f6midglavmk6368wfqdbg7bwvfxsccgbz"; depends=[]; }; + WeightedROC = derive2 { name="WeightedROC"; version="2020.1.31"; sha256="1f43hwsabciraj1qxfh5wcqnnx1vvcf4pwqs376rcfd9161k15xv"; depends=[]; }; WgtEff = derive2 { name="WgtEff"; version="0.1.2"; sha256="1z8pndv43ssgmzldwaq0088lmf1g2mkmrbmzyaismcpngn9fqxsk"; depends=[]; }; - WhatIf = derive2 { name="WhatIf"; version="1.5-9"; sha256="0ihpp3wbhpsg00g0s31l0ca4q0a2sch2a2j8cgz14g8na43x8831"; depends=[lpSolve pbmcapply Zelig]; }; WhiteStripe = derive2 { name="WhiteStripe"; version="2.3.2"; sha256="0kzwglaazn820fzxd2g1fsiw2rnq0qxagns8b5mm3inflsgs35ng"; depends=[mgcv oro_nifti]; }; - WhopGenome = derive2 { name="WhopGenome"; version="0.9.7"; sha256="1xa7d9x5ny8g79scfkv7v5ix9m3mfzg0fks2bsan9zqyhcd01fsq"; depends=[]; }; WiSEBoot = derive2 { name="WiSEBoot"; version="1.4.0"; sha256="1fch78884ay7m2gy602k8df78gkvjiwzkjk550w0k4xbv430ld0h"; depends=[FAdist wavethresh]; }; WikidataQueryServiceR = derive2 { name="WikidataQueryServiceR"; version="0.1.1"; sha256="1bqgp3wldfmnwwh9llig8xpa4x0rcp1hcwyw7d7pw4ym61b2v65x"; depends=[dplyr httr jsonlite]; }; WikidataR = derive2 { name="WikidataR"; version="1.4.0"; sha256="0ajbizsyk5a7fgbfn26qydxpp5d8qfnlcwbslxrrn913f0yxbcb4"; depends=[httr jsonlite WikipediR]; }; @@ -4813,19 +4836,18 @@ in with self; { WikipediaR = derive2 { name="WikipediaR"; version="1.1"; sha256="0fxk247jb82g0f3nmwraa4kvdpjxy5s4dcyzj9vkjw2lq8by3l0h"; depends=[httr XML]; }; WilcoxCV = derive2 { name="WilcoxCV"; version="1.0-2"; sha256="1kbb7ikgnlxybmvqrbn4cd8xnqrkwipk4xd6yja1xsi39a109xzl"; depends=[]; }; WindCurves = derive2 { name="WindCurves"; version="0.1.3"; sha256="0bvbnrkdk0g0radgcw4zbhq6czpvq3f7f34x83qk09i8ngmwd28c"; depends=[drc imputeTestbench readbitmap]; }; + WordOfMouth = derive2 { name="WordOfMouth"; version="1.0.0"; sha256="1ir928rv0xk27arca8bzsdxjvmrkd0azy4ijwnaziqrrm5dpiasj"; depends=[LambertW]; }; WordPools = derive2 { name="WordPools"; version="1.1-1"; sha256="081qnsq7wn1vczgf6ipz8wjmyg4vwhj1s5nrzh0dw4p9yz28dxv2"; depends=[]; }; WordR = derive2 { name="WordR"; version="0.3.1"; sha256="17g8v3xhdy57y0b95zrakhi0zamqi35v0zcmjpy47xyqyk4b2grs"; depends=[dplyr flextable officer]; }; - WorldFlora = derive2 { name="WorldFlora"; version="1.2"; sha256="1pjzxcnmkckq5r04lmsspyh4kijzjwk5aa6d8hpbfci63ab54dhp"; depends=[]; }; + WorldFlora = derive2 { name="WorldFlora"; version="1.5"; sha256="0q7kp0jgn4kb31i5wpvh3f8wfsajg17g7b883av1x097a0jndnjm"; depends=[]; }; Wrapped = derive2 { name="Wrapped"; version="2.0"; sha256="1z5kypsd39z9arsw57axckvl8b4jnr5wv60s9z58f5s89gn5vxxg"; depends=[AdequacyModel ald cubfits evd fBasics gamlss_dist GeneralizedHyperbolic GEVStableGarch glogis irtProb LCA lqmm metRology NormalLaplace normalp ordinal sgt SkewHyperbolic sld sn VarianceGamma VGAM]; }; - WrightMap = derive2 { name="WrightMap"; version="1.2.1"; sha256="16zp7h28fap5hq5xzvkb4lc217yhfmwzfbvw2lsni0gf9qxqkgqd"; depends=[]; }; + WrightMap = derive2 { name="WrightMap"; version="1.2.2"; sha256="0w1iwl45kv6vq5fg88hlkv93bpbrw8jm1wnhk9qxznlm0g13z33x"; depends=[]; }; WriteXLS = derive2 { name="WriteXLS"; version="5.0.0"; sha256="1gypq7zh22kpraz0bgj4jyvy2hbj1l8r7m6y34531vjdgwf67sss"; depends=[]; }; 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.7"; sha256="1s65n4d67wj24rn6gi9hh3dlmghrxxjhm6nknhnsdjysab24njnv"; 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]; }; - XLConnectJars = derive2 { name="XLConnectJars"; version="0.2-15"; sha256="1ipqyjgsh5a1ygsbhyqxyj9wfjv1f73cyfrpx6jvf0is5jklhvxx"; depends=[rJava]; }; + XLConnect = derive2 { name="XLConnect"; version="1.0.1"; sha256="0fbfkl26v42bvbz27kjw8cqnq67mwalxqpp5avqjphc17i5a6ylj"; depends=[rJava]; }; XML = derive2 { name="XML"; version="3.99-0.3"; sha256="0lzpqwajs5xaqdna50vl24qkp9xvh00zypjjzy6kgdzk11isgdw1"; depends=[]; }; XML2R = derive2 { name="XML2R"; version="0.0.6"; sha256="0azfh950r2b7ck3n1vzk3mdll7zy844nx3mbk676jxnj8gg7nxk5"; depends=[plyr RCurl XML]; }; XMRF = derive2 { name="XMRF"; version="1.0"; sha256="0jnyy9pcksfadznidqsbwh8nlqv3k0yppj76q8a2g0aidbdmg2cc"; depends=[glmnet igraph MASS Matrix snowfall]; }; @@ -4836,26 +4858,23 @@ in with self; { XRSCC = derive2 { name="XRSCC"; version="0.1"; sha256="0hs2whjsd02avaz79zkrd8gjw9qd7l6ysxmhx4w1r7gb1cj9rr7c"; depends=[]; }; 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.2.1"; sha256="1c19i367vbcf8ikb364kz8488lcd5ignyagg9bhza282grhla7kn"; depends=[FactoMineR flashClust flexclust ggdendro ggplot2 gridExtra MASS slam stringi stringr tm]; }; + Xplortext = derive2 { name="Xplortext"; version="1.3.1"; sha256="03mw84bmwrzl1g5z0dlmfphlslhcgy09lrjw8l13ahfj0a51cvn1"; depends=[FactoMineR flashClust flexclust ggdendro ggplot2 gridExtra MASS slam stringi stringr tm]; }; YPInterimTesting = derive2 { name="YPInterimTesting"; version="1.0.3"; sha256="0fca963rsbs9k7ivffsqk4hzap6ll7s709kqs6aby0plghrdla2w"; depends=[MASS Rcpp]; }; YPPE = derive2 { name="YPPE"; version="1.0.1"; sha256="01q0l22nwfpld2wcygk5x28c2c6cv35hxy2fm1azn8bqsv7xy5il"; depends=[BH Formula MASS Rcpp RcppEigen rstan rstantools StanHeaders survival]; }; - YPmodel = derive2 { name="YPmodel"; version="1.3"; sha256="1vll33nm7xynnbq15wksk9c38jhjfd6l1bbzijn5skqc5yik1r5x"; depends=[]; }; - YRmisc = derive2 { name="YRmisc"; version="0.1.5"; sha256="0vdxw67j4sx3m713s2spvj7jlk9h2g9hg4169zabfah8ni7gdman"; depends=[ggplot2 gridExtra robust]; }; + YRmisc = derive2 { name="YRmisc"; version="0.1.6"; sha256="1crms7dqmhj7br1a5p5j0j7p6sdfimnip31207i6g24f9jkkysv1"; depends=[ggplot2 gridExtra]; }; YaleToolkit = derive2 { name="YaleToolkit"; version="4.2.2"; sha256="12wggdyz0wgnmxnqhp8bypyy1x1p50g49fwdzl2l43il44cdyv0g"; depends=[foreach iterators]; }; + Yamm = derive2 { name="Yamm"; version="1.3.1"; sha256="0av5q1vx2f8dvxv0br9w65qmw3zr3y4vja45g8qbqyfb3gkfclhn"; depends=[depth interp OjaNP pcaPP]; }; YieldCurve = derive2 { name="YieldCurve"; version="4.1"; sha256="0w47j8v2lvarrclnixwzaq98nv1xh2m48q5xvnmk7j9nsv2l3p68"; depends=[xts]; }; YuGene = derive2 { name="YuGene"; version="1.1.6"; sha256="1kv9n82wrms0c4y5fz9ckzhm1a609mnqp0pwvd0fpyscp8krmlpp"; depends=[mixOmics]; }; Z10 = derive2 { name="Z10"; version="0.1.0"; sha256="02kxlzplmss68zj1z97fvpcjyhhpic9hlx8f5j3gqn3m1mqm1dja"; depends=[dplyr lubridate magrittr rjson stringr]; }; ZIBBSeqDiscovery = derive2 { name="ZIBBSeqDiscovery"; version="1.0"; sha256="12g9rga9z6318ni6x6q9hdqlgl93y2xn8vf3gc6sm97fz8pliswx"; depends=[mcc]; }; ZIBseq = derive2 { name="ZIBseq"; version="1.2"; sha256="13rjy4jl9wil6hhpra4qmdis0iyqxchzsf9l7q6r0dz1f7dpd2nq"; depends=[gamlss gamlss_dist nlme]; }; ZIM = derive2 { name="ZIM"; version="1.1.0"; sha256="0scyfjn4ilsvha3x41c3b8bcfi31hlhwm77wn2a8hj5dsvnnmzig"; depends=[MASS]; }; - ZIPFA = derive2 { name="ZIPFA"; version="0.8.0"; sha256="0dx0v01sc769lqvkrk9fyhlifiif2xva20m2d9p341cgzp5875c6"; depends=[doParallel foreach Matrix optimx trustOptim]; }; + ZIPFA = derive2 { name="ZIPFA"; version="0.8.1"; sha256="134pkdn4slhiv27rdkkmh2z7xch30ns0jhzxgd7r05bky0z1iri1"; depends=[doParallel foreach Matrix optimx trustOptim]; }; ZOIP = derive2 { name="ZOIP"; version="0.1"; sha256="0fraxzr2mfd7w705j2fryhh9vpg6nkag6kmk7p7in3zknxwipfh3"; depends=[boot GHQp numDeriv rmutil]; }; ZRA = derive2 { name="ZRA"; version="0.2"; sha256="1sx1q5yf68hhlb5j1hicpj594rmgajqr25llg7ax416j0m2rnagi"; depends=[dygraphs forecast]; }; ZVCV = derive2 { name="ZVCV"; version="1.0.0"; sha256="1npw836q2skx54843lgxvb0rfwafckjc8k8dljykm60ad3z7zak8"; depends=[abind glmnet mvtnorm partitions Rcpp RcppArmadillo]; }; ZeBook = derive2 { name="ZeBook"; version="1.1"; sha256="0v98kbz9njjdx60x9dn8hl8mc6x19i5knjyg2gkwfd667yy1rkl6"; depends=[deSolve triangle]; }; - Zelig = derive2 { name="Zelig"; version="5.1.6.1"; sha256="0mnq397kp3glgc5c2802r3q2gxdbrz05qnpl3431avzywmbjn55s"; depends=[AER Amelia coda dplyr Formula geepack jsonlite MASS MatchIt maxLik MCMCpack quantreg sandwich survey survival VGAM]; }; - ZeligChoice = derive2 { name="ZeligChoice"; version="0.9-6"; sha256="1whfwc42lsi54xfr423h6jwbvpj6yjyyf0854k1f1ms13liahm8w"; depends=[dplyr Formula jsonlite MASS VGAM Zelig]; }; - ZeligEI = derive2 { name="ZeligEI"; version="0.1-2"; sha256="0kilzfqmm6a41mmjvlynh3rnj30fqiq8gsja28fzwpf0lbl89slg"; depends=[dplyr ei eiPack Formula jsonlite MASS MCMCpack Zelig]; }; ZillowR = derive2 { name="ZillowR"; version="0.1.0"; sha256="1wrr58p76ps29fqzzwgfvfibxrvc72p2yzs5kc2rv1yxzzcpyxvb"; depends=[RCurl XML]; }; ZipRadius = derive2 { name="ZipRadius"; version="1.0.1"; sha256="00q4a2bsajs5ns4vdm289iaj9mczxjn3ssyrnmg2z4wicr2ljizv"; depends=[dplyr geosphere ggplot2 magrittr rlang testthat]; }; Zseq = derive2 { name="Zseq"; version="0.2.0"; sha256="06dndi2b1q79bmxax11bv0l5ifcz1mhpvbn90y6a6xymrgcq0ivi"; depends=[gmp]; }; @@ -4863,6 +4882,7 @@ in with self; { aGE = derive2 { name="aGE"; version="0.0.9"; sha256="17niwni6sd2mdvhskq6vfwplynh67hwq9ijrlgjvhkcslpb2ilp3"; depends=[MASS nlme survey]; }; aLFQ = derive2 { name="aLFQ"; version="1.3.6"; sha256="0kphpvhz36859f5l0k8mbf59g9871mynbs4ybdi0h5nm2cdjy9vx"; depends=[bio3d caret data_table lattice plyr randomForest reshape2 ROCR seqinr]; }; aMNLFA = derive2 { name="aMNLFA"; version="0.1"; sha256="0sj6rxsdib5zmz78c94bjdlcdwhfkvbc7sp3pncj6vsvvzgqcjdp"; depends=[devtools ggplot2 gridExtra MplusAutomation plyr reshape2 stringr]; }; + aPCoA = derive2 { name="aPCoA"; version="1.0"; sha256="0vgwja5309nml34ann46as5qjw7z9qwqapcvnr8b5n38zdw4dz4y"; depends=[ape car cluster mvabund randomcoloR vegan]; }; aRpsDCA = derive2 { name="aRpsDCA"; version="1.1.1"; sha256="0ghg43rd6bnv4jp8pkpd1ixp5l6kq5pr0mxq61q24s24g0m3s64p"; depends=[]; }; aRxiv = derive2 { name="aRxiv"; version="0.5.19"; sha256="0rik0jkh1xi9fizzw46xmcw139g6nla072p7f8jgvzbhp7k58ba2"; depends=[httr XML]; }; aSPC = derive2 { name="aSPC"; version="0.1.2"; sha256="1q301rw7dax5v58srg4jlcam1qq2igkaj7kg8wlnlml0hsck4c4a"; depends=[energy mvtnorm]; }; @@ -4876,7 +4896,7 @@ in with self; { abcADM = derive2 { name="abcADM"; version="1.0"; sha256="0vcabnnnwc0psv9v3rda5aap9s8cq1pjh02zva3ki64hlavf2a10"; depends=[BH Rcpp]; }; abcdeFBA = derive2 { name="abcdeFBA"; version="0.4"; sha256="1rxjripy8v6bxi25vdfjnbk24zkmf752qbl73cin6nvnqflwxkx4"; depends=[corrplot lattice rgl Rglpk]; }; abcrf = derive2 { name="abcrf"; version="1.8.1"; sha256="1ghbd24yhqy3xhdxas6ccn84nkavqpgldx5ck8kijknc7qjm8k27"; depends=[doParallel foreach MASS matrixStats ranger Rcpp RcppArmadillo readr stringr]; }; - abcrlda = derive2 { name="abcrlda"; version="1.0.1"; sha256="0j29ifsvmxfx2g6v4bpbb4s6miwfpf4vlkpbgj6f2q078s4clc85"; depends=[]; }; + abcrlda = derive2 { name="abcrlda"; version="1.0.2"; sha256="0zjdrbg3zx0znqnh0dvmifs9c12b8vjhbaf3nbwab9xh25nsmg75"; depends=[]; }; abctools = derive2 { name="abctools"; version="1.1.3"; sha256="07s9dg10i8lsxl73b4n2hynca2fjgb0ykb0dz8c3zv6cgw3cyx97"; depends=[abc abind Hmisc plyr]; }; abd = derive2 { name="abd"; version="0.2-8"; sha256="191gspqzdv573vaw624ri0f5cm6v4j524bjs74d4a1hn3kn6r9b7"; depends=[lattice mosaic nlme]; }; abdiv = derive2 { name="abdiv"; version="0.2.0"; sha256="053l94br8sdy30078ssncq5i5zvdxa3m72ymbwbh0cm3zmsljj29"; depends=[ape]; }; @@ -4894,11 +4914,11 @@ in with self; { accSDA = derive2 { name="accSDA"; version="1.0.0"; sha256="0sgxy5y8kkc1n35657kifwfjsba7y5m1vbr7rkk5lmbpkzahqm61"; depends=[ggplot2 ggthemes gridExtra MASS rARPACK sparseLDA]; }; accelerometry = derive2 { name="accelerometry"; version="3.1.2"; sha256="13xzrwhr4i1nj9c8vrmfdg2rmrc8n446iihcyxmy99sm99hpzyip"; depends=[dvmisc Rcpp]; }; accelmissing = derive2 { name="accelmissing"; version="1.4"; sha256="1nql9inx6azdzi3z4sfm2vdml2mms6krl8wzlf1dn1c97ahn57fy"; depends=[mice pscl]; }; - accept = derive2 { name="accept"; version="0.7.0"; sha256="1r4mhy9g4wjcjgdd0gwdarmr09292il3vdkmx0hz7vh9mffyr9kx"; depends=[dplyr extrafont MASS plotly stringr viridis]; }; + accept = derive2 { name="accept"; version="0.7.1"; sha256="0pn8q0jsi0nb2mm2kv6sjczflflshhy55y7nqqnk70yx9f6wm83y"; depends=[dplyr extrafont MASS plotly stringr viridis]; }; accrual = derive2 { name="accrual"; version="1.3"; sha256="11clm9s5c5518nmp6hd6pjnp0s28y92b2i2x0xgj4j5g816p4j3z"; depends=[fgui SMPracticals tcltk2]; }; accrued = derive2 { name="accrued"; version="1.4.1"; sha256="05g1jb5914z18rcai1ahn7nihn27vr2rnadwv94gc1j7ivvikvs5"; depends=[]; }; ace2fastq = derive2 { name="ace2fastq"; version="0.6.0"; sha256="09kk3yyqnr2xp820g0p3aai9a21figigjr9lxkr3zjq2d8gzwfic"; depends=[stringr]; }; - acebayes = derive2 { name="acebayes"; version="1.8"; sha256="1xm6bw0qm2vlcrk274x0bawzb2lnacb1wsmzba5mg3i75a55pqln"; depends=[compare lhs randtoolbox Rcpp RcppArmadillo]; }; + acebayes = derive2 { name="acebayes"; version="1.9"; sha256="1imfwm1vpbb24vfmfn1nljhmaz8429mwjihw34892p387s8h7xz2"; depends=[compare lhs randtoolbox Rcpp RcppArmadillo]; }; acepack = derive2 { name="acepack"; version="1.4.1"; sha256="1f98rpfjmhd92rdc3j004plyfpjailz6j0ycysbac0kgj83haxc2"; depends=[]; }; acfMPeriod = derive2 { name="acfMPeriod"; version="1.0.0"; sha256="1yww8isfrbs2v9s94hx7p2imyszcgadwafdgpj438n2ik0q6p9d5"; depends=[MASS]; }; acid = derive2 { name="acid"; version="1.1"; sha256="030i0y8s283ivbsmjccpbv9v7mgbcg2jk9df7vgcbbns74swf9hd"; depends=[gamlss gamlss_dist Hmisc]; }; @@ -4912,11 +4932,13 @@ in with self; { acss = derive2 { name="acss"; version="0.2-5"; sha256="0cqa60544f58l5qd7h6xmsir40b9hqnq6pqgd5hfx2j2l5n7qhmk"; depends=[acss_data zoo]; }; acss_data = derive2 { name="acss.data"; version="1.0"; sha256="09kl4179ipr8bq19g89xcdi1xxs397zcx5cvgp6viy8gn687ilgv"; depends=[]; }; activPAL = derive2 { name="activPAL"; version="0.1.3"; sha256="1h6hp5z89ji73gdzxy1dgbfwjysiy5lvcqh90xagpb7sa7ahs3na"; depends=[devtools dplyr ggplot2 lubridate magrittr tidyr]; }; + activegp = derive2 { name="activegp"; version="1.0.3"; sha256="04yiaj908z7sl7g2z5c2irk79wym27mjdvyg5mz4c67hxmpkaj25"; depends=[hetGP lhs numDeriv Rcpp RcppArmadillo]; }; activity = derive2 { name="activity"; version="1.3"; sha256="12imqj366dp6pam5gap6ji56p5wf1073xz5g4iikfxf5l8snxw92"; depends=[circular insol pbapply]; }; activityCounts = derive2 { name="activityCounts"; version="0.1.2"; sha256="0zgxr2sk3a8kmygfxx1p5hnrfwdkxx7php6jlrhm8wv6052ck8jz"; depends=[lubridate magrittr seewave signal tibble]; }; activpalProcessing = derive2 { name="activpalProcessing"; version="1.0.2"; sha256="1y0bjx2qx53iy930y9iww4q1yzjj8y16cwgixk1mq3w4g1f116d1"; depends=[chron]; }; actogrammr = derive2 { name="actogrammr"; version="0.2.3"; sha256="1jzvarmd41yqlrkagzlc8m19n5mn0w0b36fy50lyvgrfsafjfbqa"; depends=[dplyr ggplot2 lubridate readr tidyr]; }; actuar = derive2 { name="actuar"; version="2.3-3"; sha256="0aw3hlan5y22mdqk1wvnw9ksqhwp4yy5hi0dpv21p7s0hyxhphih"; depends=[expint]; }; + actuaryr = derive2 { name="actuaryr"; version="1.1.0"; sha256="0v33rrw1m030a5w3v3f7pigfw1vwsclh48av0yjiha26mpvi3cal"; depends=[crayon dplyr lubridate magrittr purrr]; }; ada = derive2 { name="ada"; version="2.0-5"; sha256="1h3a07czp0w3hrhjcg1fz721y8vsfclzqi3rq8qfzgpfb4h1f06r"; depends=[rpart]; }; adabag = derive2 { name="adabag"; version="4.2"; sha256="109wrl1pwvmyv2l909hrvk7dg4aa9pv449mvdycp50zwrsw9w0a7"; depends=[caret doParallel foreach rpart]; }; adagio = derive2 { name="adagio"; version="0.7.1"; sha256="1h9l0ddrxq8y35iy9hdkxdvdwsqpnpkzzbkbwwhm4380lq1m7a3k"; depends=[]; }; @@ -4929,6 +4951,7 @@ in with self; { adaptiveGPCA = derive2 { name="adaptiveGPCA"; version="0.1.2"; sha256="0bb6hw77dfa66b12xyazlp992gwjb1plylixlmq4cv4yjhnl9n5z"; depends=[ape ggplot2 phyloseq shiny]; }; 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]; }; + add2ggplot = derive2 { name="add2ggplot"; version="0.3.0"; sha256="0c94i1cfp2pvplvxmfvvz2fyj026r1jnax05mrzrc7ppnqzy25y0"; depends=[ggplot2 magick magrittr RColorBrewer zeallot]; }; 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]; }; addinsOutline = derive2 { name="addinsOutline"; version="0.1.6"; sha256="125qfqbpv5xflw8qlyh8m3iyd6biyp3arls3z7y8bqkbghifl730"; depends=[dplyr DT fs miniUI rmarkdown rstudioapi shiny shinyFiles stringr tibble yaml]; }; @@ -4936,29 +4959,29 @@ in with self; { additiveDEA = derive2 { name="additiveDEA"; version="1.1"; sha256="15nxpdybsda6yhjk23bpafr8v1zdx8332pcxf26k795q3ypjpiy2"; depends=[Benchmarking lpSolveAPI]; }; additivityTests = derive2 { name="additivityTests"; version="1.1-4"; sha256="048ds90wqjdjy1nyhna3m06asdklbh8sx1n556kss2j1r1pma1sw"; depends=[]; }; addreg = derive2 { name="addreg"; version="3.0"; sha256="13bwmgxylwi02g60j1rr51cr5jvvkl2nvf2lnnhnq46fhvs2ma7s"; depends=[combinat glm2 turboEM]; }; - ade4 = derive2 { name="ade4"; version="1.7-13"; sha256="16z9jk4qj35ghsk4lwmq241dgc770y8a70dlmp9q4gz6d8ssgl7m"; depends=[MASS]; }; + ade4 = derive2 { name="ade4"; version="1.7-15"; sha256="1xpxznlqm8wb4d5z2dcrl0wi3jjciq2hr5rcx2b5aaipiiyzm1ij"; depends=[MASS pixmap sp]; }; ade4TkGUI = derive2 { name="ade4TkGUI"; version="0.3-0"; sha256="1k1d5vck8plv6rq9nn664p73nhd4k3kah52fvqc3vg2zv1hbizzk"; depends=[ade4 adegraphics lattice tkrplot]; }; adeba = derive2 { name="adeba"; version="1.1.2"; sha256="1z1law3qh6l902g62y8yapk4nypdmb20jmpwhxp9jbglalw9lm73"; depends=[mixtools pdist Rcpp]; }; adegenet = derive2 { name="adegenet"; version="2.1.2"; sha256="01fgrgbiddz2q4l3mx637hhwbs7r0c43yw7vpwl8p8pwbm3nykz0"; depends=[ade4 ape boot dplyr ggplot2 igraph MASS reshape2 seqinr shiny spdep vegan]; }; adegraphics = derive2 { name="adegraphics"; version="1.0-15"; sha256="12k77x6vnjz9s9dvz1r81ajqcl1nh9g33r7dymaqk2cs5q3wvfw7"; depends=[ade4 KernSmooth lattice latticeExtra RColorBrewer sp]; }; - adehabitatHR = derive2 { name="adehabitatHR"; version="0.4.16"; sha256="0qzgshdlayx28j4ziivv1fy925bvbfnqk6dbd1wx5vjgp3c32ppg"; depends=[ade4 adehabitatLT adehabitatMA deldir sp]; }; + adehabitatHR = derive2 { name="adehabitatHR"; version="0.4.18"; sha256="0ss3fhpa7i2m4g55ajy9pgwgj393jbw58khgywc3gw9ys53h02sd"; depends=[ade4 adehabitatLT adehabitatMA deldir sp]; }; adehabitatHS = derive2 { name="adehabitatHS"; version="0.3.15"; sha256="1qhdwyjic4q24kk0pwrd0r8vdg5clv4g1hbdq07rl71jbcscdhvz"; depends=[ade4 adehabitatHR adehabitatMA sp]; }; adehabitatLT = derive2 { name="adehabitatLT"; version="0.3.25"; sha256="1v83iw9argh11fi47hlb8ykigd8xh70hww3i4j8yrzfqwcr9aj4p"; depends=[ade4 adehabitatMA CircStats sp]; }; adehabitatMA = derive2 { name="adehabitatMA"; version="0.3.14"; sha256="0lfqg9g0wpq70md35b7gdgav3lliaxv8c8i13j3k0q436ids68iy"; 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]; }; + adepro = derive2 { name="adepro"; version="3.0.0"; sha256="0dx57kypg3hqppxpw4aqldnlmfkvxc1z60j3kw78zjm7vam43jcz"; depends=[audio Cairo dplyr gclus haven jsonlite MASS readr rlang seriation shape shiny shinyBS shinyjs shinyWidgets TeachingDemos tidyr V8]; }; adept = derive2 { name="adept"; version="1.1.2"; sha256="0j8sd337j2c583pnwsfgc4r2251y8s5s4pkx79ifrhyc7c2qgfai"; depends=[dplyr dvmisc future magrittr tibble]; }; adeptdata = derive2 { name="adeptdata"; version="1.0.1"; sha256="07146kv1llj5kci7s7v2jrqd7bl6h3rczx43nha5fhr57ldpcm40"; depends=[]; }; - adespatial = derive2 { name="adespatial"; version="0.3-7"; sha256="0chbz14jii0gra6f7zncjrd1m2d2n5wwpq1ihjnwwk8jvyqskd1a"; depends=[ade4 adegraphics adephylo lattice MASS shiny sp spdep vegan]; }; + adespatial = derive2 { name="adespatial"; version="0.3-8"; sha256="01i90802w98zyni6krcngk49f5jgi267w64l0wm8c2izrq4k5zg3"; depends=[ade4 adegraphics adephylo lattice MASS shiny sp spdep vegan]; }; adfExplorer = derive2 { name="adfExplorer"; version="0.1.4"; sha256="11z6jm20giqmmz4dwcpa9fshvrmlmv8m0y1vg053nch05884niz2"; depends=[]; }; adhoc = derive2 { name="adhoc"; version="1.1"; sha256="0a59fv9glcqh4zzd0887ndrhlcaylja6vay2ifajp8an29gjk1vv"; depends=[ape pegas polynom]; }; adimpro = derive2 { name="adimpro"; version="0.9.2"; sha256="1ajq2889y70lxjdpf5zdg7zkz35i3i92li72wb7nbfngxmw47xzv"; depends=[awsMethods]; }; - adiv = derive2 { name="adiv"; version="1.4"; sha256="1gavg22hd0szxqiqws67j993xclgw79ifbqk0108nj13vjfj07kh"; depends=[ade4 adegraphics adephylo ape cluster FactoMineR phylobase phytools rgl]; }; + adiv = derive2 { name="adiv"; version="2.0"; sha256="1lp5vylqj8n29smjp3611gxw0nfgk5blcwrhk3c73w1v6695488b"; depends=[ade4 adegraphics adephylo ape cluster FactoMineR phylobase phytools rgl]; }; adjclust = derive2 { name="adjclust"; version="0.5.9"; sha256="1nrsl9ca7729qfmxi5xzsvkqrx3dkjyr3al4vz3iqphfxv9sdl4h"; depends=[capushe Matrix matrixStats]; }; adjustedcranlogs = derive2 { name="adjustedcranlogs"; version="0.1.0"; sha256="08apfvpqvnnalx230p4qf5ckrwm1sgzras4zfrysgym5d4map9ci"; depends=[cranlogs dplyr lubridate rvest xml2]; }; adklakedata = derive2 { name="adklakedata"; version="0.6.1"; sha256="1lzj3ib4bgfkq5lq12n47pwc52h7k35xbbwj6brwsgx1gd4fx3x6"; depends=[httr rappdirs]; }; adlift = derive2 { name="adlift"; version="1.4-1"; sha256="14q7fnhlqvxdhnfjhdhfmadz241srplbm069a7ybbsql21cphpf3"; depends=[EbayesThresh]; }; - admisc = derive2 { name="admisc"; version="0.5"; sha256="0jqlac39rbvxi6xhyadkyxwmpjcpgl6fl8dn2yjnnn0qgs61y5c3"; depends=[]; }; + admisc = derive2 { name="admisc"; version="0.7"; sha256="0y3id9g792brvb7xdbg0cklsdpy4m9ayrkkaca8qmkdm1yarjmna"; depends=[]; }; admixturegraph = derive2 { name="admixturegraph"; version="1.0.2"; sha256="0ld4qyyvbnr5lz9ff64wjwif4c9xnqyjmbfgbl9bk6pia98zppl3"; depends=[doParallel dplyr foreach ggplot2 MASS neldermead pracma]; }; admmDensestSubmatrix = derive2 { name="admmDensestSubmatrix"; version="0.1.0"; sha256="1a5lfm10aj6wdjibdnmffn75zvy6x69w8nqcx2i23gxg6v0xlqcl"; depends=[Rdpack]; }; adnuts = derive2 { name="adnuts"; version="1.0.1"; sha256="1l52f33yzbvcz27iw0k6iwcnfanr65lw206d7w4609k2vmlw8ink"; depends=[ellipse R2admb rstan]; }; @@ -4969,15 +4992,15 @@ in with self; { advclust = derive2 { name="advclust"; version="0.4"; sha256="1g8a8q4zh6d4152jb66fh7wj7k6ks5k4kfcazzw70jdn10yi6b38"; depends=[clue ggplot2 knitr MASS reshape2]; }; adwave = derive2 { name="adwave"; version="1.3"; sha256="11iy50ng0zxvwsvdsvx262j8zgqaai308lp5is47az7xzvk57mx7"; depends=[waveslim]; }; adwordsR = derive2 { name="adwordsR"; version="0.3.1"; sha256="1w5qg4psm8pj89f09pz7in8zkafaimik1n6hx29y55jpmbxbk2gn"; depends=[RCurl rjson]; }; - aemo = derive2 { name="aemo"; version="0.2.0"; sha256="11msifszq7pzmcmwibf2dk2j5dqjc74hrxdxshlprkp6p8sfhijh"; depends=[assertthat dplyr lubridate stringr]; }; + aemo = derive2 { name="aemo"; version="0.3.0"; sha256="108scwyf0dyvn969cks3ikbj2pf2g4dw051asahx26pl0ggw7ijw"; depends=[assertthat dplyr lubridate stringr]; }; afCEC = derive2 { name="afCEC"; version="1.0.2"; sha256="0jdppp93z5nb8m5qbry6cvd472mwiq1yrmm11906c3z2bfz7791f"; depends=[Rcpp RcppArmadillo rgl]; }; afc = derive2 { name="afc"; version="1.4.0"; sha256="1iy1wa88kf6zi6x7lbd0jdir653cvzvdraliqpxbac413wwb5gwl"; depends=[]; }; - afex = derive2 { name="afex"; version="0.26-0"; sha256="0h3p1svgk1ap3lj08fi8nzdb3710h99bv150krf1x8wci1a0r1if"; depends=[car lme4 lmerTest pbkrtest reshape2]; }; + afex = derive2 { name="afex"; version="0.27-2"; sha256="0qsmcddy4449qjj3ajmqvdiqdkhkswmz5dqf150wxwq897p3bvf2"; depends=[car lme4 lmerTest pbkrtest reshape2]; }; affluenceIndex = derive2 { name="affluenceIndex"; version="1.0"; sha256="1nb2dlsnvjsvkyrfdaskmpr3kv3qgdfb60xgmzvscfli0yf4dzr1"; depends=[]; }; afmToolkit = derive2 { name="afmToolkit"; version="0.0.1"; sha256="1pm3xyh9vq10mmfgknlvlfr9f027xprrgy1dvbbxpi7f111hv1gl"; depends=[assertthat DBI dplyr ggplot2 gridExtra minpack_lm scales tibble]; }; - afpt = derive2 { name="afpt"; version="1.0.0"; sha256="0kshyzvw8sp7p686xi98g758zld3n7kq44lnvly8d0y8fg6ahcl2"; depends=[]; }; + afpt = derive2 { name="afpt"; version="1.1.0.1"; sha256="0cg5cdm9nl1hs6f3j0ljpw4bkqvh3ksyj615b9nnbqs5k28lyds9"; depends=[]; }; aftgee = derive2 { name="aftgee"; version="1.1.3"; sha256="1zkb99938q8pp318a0c0bpgzcqxc8ijygfz904lz6n40c5i2i9lz"; depends=[BB geepack MASS survival]; }; - agRee = derive2 { name="agRee"; version="0.5-2"; sha256="1fhpkhnq8gbdy8k2w5wwn7h7gj0mmvk052fqxfazksxrlqicbbhb"; depends=[coda lme4 miscF R2jags]; }; + agRee = derive2 { name="agRee"; version="0.5-3"; sha256="1wi8jn14kpsj5z49my6fz8j6zxysddxm8svw86cnzsmnbj6mzq7x"; depends=[coda lme4 miscF R2jags]; }; aggregation = derive2 { name="aggregation"; version="1.0.1"; sha256="0j9g604m2ccc7hcy02539yja9cf3xcbl25gvp838bp4x8w18my46"; depends=[]; }; agop = derive2 { name="agop"; version="0.2-3"; sha256="1z90a07wzn5z4cbafwpfh3l3v1bgq9g89qbdjm51f78zynnb27dk"; depends=[]; }; agriTutorial = derive2 { name="agriTutorial"; version="0.1.5"; sha256="0c0p0bqcrnx34q5brnvgq10wkzahvgyybaz2xfmcghbdvzahd2dx"; depends=[emmeans ggplot2 lattice lmerTest nlme pbkrtest]; }; @@ -4985,23 +5008,27 @@ in with self; { 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=[]; }; + agroclim = derive2 { name="agroclim"; version="0.1.0"; sha256="16cyqplzmwziqwkicix0sr06zhc0yx615iv3hda0cxbdyf2rllk3"; depends=[abind cowplot easyNCDF ggforce ggplot2 ggpubr gtable multiApply ncdf4 plyr raster reshape sp zoo]; }; agrostab = derive2 { name="agrostab"; version="0.1.0"; sha256="0mcskv3144j594wqljzn5pwbhkxh6sb76b1c2wabzjvi61zrapiv"; depends=[dplyr ggplot2 rlang]; }; agsemisc = derive2 { name="agsemisc"; version="1.3-1"; sha256="1905q35jgjhghlawql43yh296kbpysp927x3hj750yshz5zayzyr"; depends=[lattice MASS]; }; ahaz = derive2 { name="ahaz"; version="1.14"; sha256="1z7w5rxd5cya7kxhgxqvn72k87y33ginxra9g7j9wrfs5jgx6kvx"; depends=[Matrix survival]; }; ahnr = derive2 { name="ahnr"; version="0.3.1"; sha256="1g8m3q108ricfyn4fjjaihpr93xz7fm2sfzg3i0fz1n1i703jwm8"; depends=[ggplot2 magrittr matrixcalc pdist pracma purrr visNetwork]; }; ahp = derive2 { name="ahp"; version="0.2.12"; sha256="0zjhgl0smzx4bkhmdm4rmpyrq4hmxy1nkxvwqjr40pz7vm69icqx"; depends=[data_tree DiagrammeR formattable yaml]; }; ahpsurvey = derive2 { name="ahpsurvey"; version="0.4.1"; sha256="1r7x4c318nzbx0ppm9272kfpz2bln1cafkv9irnj85nsdcravr33"; depends=[dplyr knitr magrittr randomNames Rdpack tidyr]; }; + aiRly = derive2 { name="aiRly"; version="0.1.0"; sha256="0d3w5dwk0b3pd49zw2005rili4p3l1i3x4hzp8cf6rljr86x01cy"; depends=[httr jsonlite reshape2 tibble]; }; aiRthermo = derive2 { name="aiRthermo"; version="1.2.1"; sha256="058082qdfi1pbdgf26vbfahri1kbc8b2l816q4dq89j5aj5is0a2"; depends=[]; }; + aibd = derive2 { name="aibd"; version="0.1.8"; sha256="1pgfvz3b276y9pl6m3rghjlvhkrqp04w8gj3zzl7j446d372lm9h"; depends=[commonsMath rscala]; }; aidar = derive2 { name="aidar"; version="1.0.5"; sha256="1q2iz2qzh2yl0v0sc537xq4vbx2nblym3kv419vr7jvrghdpx3vj"; depends=[XML]; }; aimPlot = derive2 { name="aimPlot"; version="1.0.0"; sha256="1d52b7kccxba6j7n0gbd7pzs0p87zn32vv8gdf2f7lyr75qzgz7x"; depends=[ggplot2]; }; aimsir17 = derive2 { name="aimsir17"; version="0.0.1"; sha256="0d3zygsnflymmfh7pflnynsf1klxjjyrqz5g5fnj2vwsicb40l4x"; depends=[tibble]; }; - airGR = derive2 { name="airGR"; version="1.4.3.52"; sha256="0rknrfpyb6qs0ppai8qvqqvf89cvz8f4wk1xf03ks0i4aln1np44"; depends=[]; }; - airGRteaching = derive2 { name="airGRteaching"; version="0.2.6.29"; sha256="15sjwkyvgxihiz35qc8rg1f7f3vb4wdwbrfb37gx8mzql0mwqx4q"; depends=[airGR dygraphs markdown plotrix shiny shinyjs xts]; }; + airGR = derive2 { name="airGR"; version="1.4.3.65"; sha256="1x9zf6bbcaflszqzaki940xy33g4wj4yqsgbg836a1dwv1crd1l7"; depends=[]; }; + airGRteaching = derive2 { name="airGRteaching"; version="0.2.8.69"; sha256="0z2iwqr0qm9wv7hl337l0kbjnc9h0pjahwnk3y89x8frisa2cc32"; depends=[airGR dygraphs markdown plotrix shiny shinyjs xts]; }; aire_zmvm = derive2 { name="aire.zmvm"; version="0.8.2"; sha256="0z9knqdl7ihx2vph154qi1lh4s6yvlcw6kwry8k47mhh3p7pynsd"; depends=[dplyr httr lubridate progress readr readxl rvest sp stringr tidyr xml2]; }; airportr = derive2 { name="airportr"; version="0.1.3"; sha256="1h8h0cdfqgxv8cf9hp82sx5n4a1z88qyyxicj7d2kmmybqqz2r5n"; depends=[dplyr]; }; + airqualityES = derive2 { name="airqualityES"; version="1.0.0"; sha256="1kf673ajk06ggy9524lip5flpfgq0gql7d46kgnri8l3kbzw7zcj"; depends=[tibble]; }; 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]; }; - akc = derive2 { name="akc"; version="0.9.3"; sha256="15sams52pzf5d0b1nmixff9xddgl1c1xdni9s1vfj0vnrf64kkn1"; depends=[data_table dplyr ggforce ggplot2 ggraph igraph magrittr rlang stringr textstem tibble tidygraph tidytext widyr]; }; + akc = derive2 { name="akc"; version="0.9.4"; sha256="1bvlj3h1fa3n9dkfhr5zhh8j3m8wafr6370sfg24vjwmiqpmx96j"; depends=[data_table dplyr ggforce ggplot2 ggraph ggwordcloud igraph magrittr rlang stringr textstem tibble tidygraph tidytext widyr]; }; 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.5"; sha256="0yn5rjgb5rrhphgbjn49098ybkmzda6yxzfqgbsppfgjidrafhza"; depends=[ggplot2 Hmisc kml longitudinalData reshape2 signal]; }; @@ -5021,14 +5048,16 @@ in with self; { alleHap = derive2 { name="alleHap"; version="0.9.9"; sha256="1fqrw645s3f5363p7jl3dzy8xphxdr1v6wdsjmqcqwpgvjqfr2zz"; depends=[abind]; }; allelematch = derive2 { name="allelematch"; version="2.5.1"; sha256="00117cj01psax4rjvy2nja5r2ss9l8zzjicczh46kp401i1ghmwc"; depends=[dynamicTreeCut]; }; allelic = derive2 { name="allelic"; version="0.1"; sha256="0xs4kd3vqb5ph8kqc3lcqgirrdkz8b627pvnczvci2g0sr3cl18j"; depends=[]; }; + allestimates = derive2 { name="allestimates"; version="0.1.6"; sha256="1jrp5nh9g2alx8aycysiymhylm2r7lqf8s68ppbgy6liw3iazym2"; depends=[broom dplyr ggplot2 MASS speedglm stringr survival tibble tidyr]; }; alluvial = derive2 { name="alluvial"; version="0.1-2"; sha256="039frwrsxq1lb97s7vf2vbyyadimkigs628ymym06fxka53drdkp"; depends=[]; }; + alookr = derive2 { name="alookr"; version="0.3.0"; sha256="0xd80mypg07ifsx17aivciknk231yhi34c8vzwjnyasg2h88s3is"; depends=[caTools cli dlookr dplyr future ggmosaic ggplot2 MASS MLmetrics party purrr randomForest ranger RColorBrewer rlang ROCR rpart tibble tidyr tidyselect unbalanced]; }; alpaca = derive2 { name="alpaca"; version="0.3.2"; sha256="07r13gyqb876p6zx3pydl414zrgc473dnyn5ja6hmzjmkv19lw4k"; depends=[data_table Formula MASS Rcpp RcppArmadillo]; }; alphaOutlier = derive2 { name="alphaOutlier"; version="1.2.0"; sha256="09yrbv7jsiymw5gzp8p92ki70v1fys2k75x4sb9s7wy3c58wn1cd"; depends=[nleqslv quantreg Rsolnp]; }; alphabetr = derive2 { name="alphabetr"; version="0.2.2"; sha256="1pmp6zwhgycb38y5jbvrbv2nza7gyjh508vy09ml483c2cysvc1r"; depends=[clue dplyr multicool Rcpp]; }; alphahull = derive2 { name="alphahull"; version="2.2"; sha256="024d70z9pasyfp83zwgh7fkjky70l74pbzw1wvazzq75p9m91vzv"; depends=[ggplot2 R_utils sgeostat spatstat splancs tripack]; }; alphashape3d = derive2 { name="alphashape3d"; version="1.3"; sha256="15l8hsn3jcn5jzwfpya99v2mzrgmhl3i587nw6cx4aky75ajslcx"; depends=[geometry rgl]; }; alphastable = derive2 { name="alphastable"; version="0.2.1"; sha256="01gwrcxlj2jlb8axs5qmrsixk3a8b7044ypyjg6dpdcxfbcf5fvp"; depends=[mvtnorm nlme nnls stabledist]; }; - alphavantager = derive2 { name="alphavantager"; version="0.1.1"; sha256="0rbvbws0g50z76pvkydadf97gq5yg1l03xlfqyy3yblqh59cj5s6"; depends=[dplyr glue httr jsonlite purrr readr stringr tibble tidyr timetk]; }; + alphavantager = derive2 { name="alphavantager"; version="0.1.2"; sha256="0c97p8njga4xffvsa0kj0s4y0agjr44y9bnjxs5phm1ldcqjs0yj"; depends=[dplyr glue httr jsonlite purrr readr stringr tibble tidyr timetk]; }; alr3 = derive2 { name="alr3"; version="2.0.8"; sha256="1vkwgf5c9zb8pphcw47vfwwk12nfj4nggj8dr88jwbdnv7yd257h"; depends=[car]; }; alr4 = derive2 { name="alr4"; version="1.0.6"; sha256="0v98yzi0fcjxq0ak0w05001h8m9nfa9l0ann9bqvz8bwcmb3jlr2"; depends=[car effects]; }; altR2 = derive2 { name="altR2"; version="1.0.0"; sha256="15nvbq3n76p2857ipyf3q6rs2mwjqsp9gr3rmzbjfm8lrj0faxsv"; depends=[gsl purrr]; }; @@ -5036,9 +5065,8 @@ in with self; { alterryx = derive2 { name="alterryx"; version="0.5.0"; sha256="1p9q4244bm7hf6my8q951idw41xa5gcrdl7znmsng9pwxh8dnz3h"; depends=[base64enc digest httr jsonlite]; }; altmeta = derive2 { name="altmeta"; version="2.3"; sha256="0fcd2pzp62871b37fcwz1zcidch5akj6a5npcvwzg4zwp8i9rmyl"; depends=[coda rjags]; }; amap = derive2 { name="amap"; version="0.8-18"; sha256="0zpcb73w413na23f6giml9311jh0j0y766w2fh9i40d2h7bbvyvs"; depends=[]; }; - amber = derive2 { name="amber"; version="0.1.6"; sha256="0n9idgmkqnnsajybkbgczlrr1hyj5z98rixk451lh1r1j2cv8252"; depends=[classInt doParallel foreach Hmisc latex2exp ncdf4 raster rgdal rgeos scico sp viridis xtable]; }; ambhasGW = derive2 { name="ambhasGW"; version="0.0.2"; sha256="0v517i4whip45pk6bwlwval9pz367pcgzz62b2z22mrwgi6m6bck"; depends=[raster rgdal yaml]; }; - ambient = derive2 { name="ambient"; version="0.1.0"; sha256="142q30rhi0wz0gp1v0swm83gbli8j6plpzzpqjwnjc693wd3a1ih"; depends=[Rcpp]; }; + ambient = derive2 { name="ambient"; version="1.0.0"; sha256="0b8nd8g0ydglql2cwi4wmlnv5kyid8q51vz0p08f9m5x73k3z2bd"; depends=[Rcpp rlang]; }; ameco = derive2 { name="ameco"; version="0.2.9"; sha256="0vzwsy7gp17ghl1hgcsbfs9rarzl8dl36x6lplnzrisqv3dqmk25"; depends=[]; }; amelie = derive2 { name="amelie"; version="0.2.1"; sha256="0f4rfijskrw9nmyzbrbz6yfa9d0a5cxjw8n9c36hc6jvh377i7k7"; depends=[]; }; amen = derive2 { name="amen"; version="1.3"; sha256="1qaznfmnh3dlnp41afd37lr328qzy50hn8hi0c302wj0f992ycqg"; depends=[]; }; @@ -5047,44 +5075,43 @@ in with self; { ammistability = derive2 { name="ammistability"; version="0.1.1"; sha256="1vp2857cwn4dd86vj8qf6h4z8hh5q2jvrlpmply8bf70mnmnq18h"; depends=[agricolae ggcorrplot ggplot2 Rdpack reshape2]; }; ampd = derive2 { name="ampd"; version="0.2"; sha256="0bi8qngd37n60ym516yjcahxc536vdwm60rq5ld32170hww69j7c"; depends=[]; }; ampir = derive2 { name="ampir"; version="0.1.0"; sha256="1z9ha329fbji9jlly84cn7z2fxclk3n3w0xddq1mw1gqq3dyb8ba"; depends=[caret kernlab Peptides Rcpp]; }; - amt = derive2 { name="amt"; version="0.0.7"; sha256="1az11vi5kd1sp76xvgshvamyw59dydhp6g4m6c2wqcdll88dlfgn"; 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]; }; + amt = derive2 { name="amt"; version="0.0.9"; sha256="0hqs954gimpd24bwnac9mz91mgsw7v1nw7rw48j5ql7q0vd2bmxh"; 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]; }; anMC = derive2 { name="anMC"; version="0.2.2"; sha256="0ab215nrqn535g9ayqzvgdckhwcrij1mc1296pvlj3grn3f8rhws"; depends=[mvtnorm Rcpp RcppArmadillo]; }; anacor = derive2 { name="anacor"; version="1.1-3"; sha256="0mj8g9p4fla0ax9jvcq7kii4lrhj8g872p11nys06anva22qjp51"; depends=[car colorspace fda]; }; - analogsea = derive2 { name="analogsea"; version="0.7.2"; sha256="1dfvdizbxdc00rcabcv1jpy3py4ncb3g2p1kim8m4sy9rdc299yq"; depends=[aws_s3 httr jsonlite magrittr yaml]; }; - analogue = derive2 { name="analogue"; version="0.17-3"; sha256="1dd94hs517f7a11zjxm7wygcc1g72r5hff4figgmqf8c699p5d9y"; depends=[brglm lattice MASS mgcv princurve vegan]; }; + analogsea = derive2 { name="analogsea"; version="0.8.0"; sha256="1naw9qh6rp1hz3mk19jir0qia1daizbfa695qbp1sg6rdh6is8ag"; depends=[httr jsonlite magrittr yaml]; }; + analogue = derive2 { name="analogue"; version="0.17-4"; sha256="02n4imkkfa4gqzwicvz3dpcfwk68rbh48pj5vn6cx6q15bzxdv0i"; depends=[brglm lattice MASS mgcv princurve vegan]; }; analogueExtra = derive2 { name="analogueExtra"; version="0.1-1"; sha256="1s3qs10hf6hkna0bicid1mc8x8r449bl93xpgyw6lnsjgh2yx62c"; depends=[analogue rgl vegan3d]; }; analysisPipelines = derive2 { name="analysisPipelines"; version="1.0.0"; sha256="1q0xhqzc2x3kvz6kray7ckm2i88k488jicsw7wngnywmjhl4z3ni"; depends=[devtools dplyr futile_logger ggplot2 magrittr pipeR proto purrr RCurl rlang]; }; - analytics = derive2 { name="analytics"; version="3.0"; sha256="0js3c8lwj3knccb55nq03cbjlf4w390p9aid2mi5x80l3ayd9in1"; depends=[car cluster fractal lmtest MASS np powerplus robust trend TSA urca VIM]; }; analyz = derive2 { name="analyz"; version="1.4"; sha256="0qdh1gld2dkl0krbhm2vcqg8dfs03dn51rclgsw02554s06dlgxw"; depends=[]; }; anapuce = derive2 { name="anapuce"; version="2.3"; sha256="05k3ypy4dc8q4jv0by37k66pdwb1wmsd24i6nciris5knfdy9csg"; depends=[]; }; anchoredDistr = derive2 { name="anchoredDistr"; version="1.0.3"; sha256="07q4np0zryb49cpi7w5iz0qna63cyp9nz13d8ws6x9ccg417r99a"; depends=[DBI dplyr ggplot2 np plyr reshape2 Rmisc RSQLite]; }; anchors = derive2 { name="anchors"; version="3.0-8"; sha256="12gd2526y7s2a8i6b9xma2c3sc6zxnwzl6sn8b50hbxizwr8d34j"; depends=[MASS rgenoud]; }; andrews = derive2 { name="andrews"; version="1.0"; sha256="130i86qkdy1xpcf611jpzqgmd17iik7j7spdcfwzk48f31biyp8v"; depends=[]; }; 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.4"; sha256="1h19q3f16g6kacawd2i9i5lg64q436dsbzk9isf3p2mr7p24xbas"; depends=[rptR]; }; anim_plots = derive2 { name="anim.plots"; version="0.2.1"; sha256="0z811y4zzrqas1ynrq4syhxvbcw2girxa6g9biry9d0qgq1w8cp1"; depends=[animation]; }; animalTrack = derive2 { name="animalTrack"; version="1.0.0"; sha256="0jlvfflpaq64s48sblzh1n1vx8g3870iss97whigri29s6hn79ry"; depends=[rgl]; }; + animaltracker = derive2 { name="animaltracker"; version="0.1.0"; sha256="1c2qx03yawfdcg992l2k3w52r4hfxakd74ws56phbn5c3bm540k9"; depends=[dplyr elevatr forcats geosphere ggplot2 leaflet leaflet_extras lubridate raster rgdal scales shiny shinyBS shinycssloaders shinyjs shinythemes shinyWidgets sp tibble tidyr V8 zoo]; }; animation = derive2 { name="animation"; version="2.6"; sha256="02jv4h9hpp8niw9656r5n36kqr71jbyynxnywkkkdi0aj8w3cach"; depends=[magick]; }; - animint2 = derive2 { name="animint2"; version="2019.7.3"; sha256="13s6s0py5hfywgknl0521d0xhdb86988pqwymwsw054l9xhp5dns"; depends=[digest gtable lazyeval MASS plyr reshape2 RJSONIO scales tibble]; }; - anipaths = derive2 { name="anipaths"; version="0.9.7"; sha256="1h6rcrybjfc4kn377bay2c3nfv6qwwi0nk14xh6jfdsxqybq6dw2"; depends=[animation ggmap knitr mgcv RColorBrewer rgdal scales sp]; }; + anipaths = derive2 { name="anipaths"; version="0.9.8"; sha256="02d2z236gjh40p29h86ikspnxim49c3c33r4dnf3yzns622ckm2c"; depends=[animation ggmap mgcv raster RColorBrewer scales sp]; }; + aniview = derive2 { name="aniview"; version="0.1.0"; sha256="1klakkmdk4xllaxd0pllvxi4396n6rz2idz55niy91mp0fhcjhwf"; depends=[htmltools jsonlite]; }; anocva = derive2 { name="anocva"; version="0.1.1"; sha256="1byg40jla71k1901js5h9yq89j63d00vkm60id1fxlpv95c4wdrr"; depends=[cluster]; }; anoint = derive2 { name="anoint"; version="1.4"; sha256="10gdqgag9pddvxh80h458gagvv1474g4pcpa71cg3h7g62rqvmv5"; depends=[glmnet MASS survival]; }; anomalize = derive2 { name="anomalize"; version="0.2.0"; sha256="155la2j9bfdwvaq8qv8gjgfy0y4bjpvrymgk0qzbz80hd771lh2j"; depends=[cli crayon dplyr ggplot2 glue purrr rlang rstudioapi sweep tibble tibbletime tidyr timetk]; }; - anomaly = derive2 { name="anomaly"; version="2.0.2"; sha256="1vhbmf1q2rj21bxzh7s969x3j21r8i5crnvzndal4pryyb8bm97a"; depends=[assertive BH dplyr ggplot2 Rcpp Rdpack reshape2 rlang robust]; }; + anomaly = derive2 { name="anomaly"; version="3.0.1"; sha256="1ccgvlv8vq3p1lpkj66da73v5z8ffl3bkx01j08mcgqkv90lppys"; depends=[assertive BH cowplot dplyr ggplot2 Rcpp Rdpack reshape2 rlang robustbase]; }; anominate = derive2 { name="anominate"; version="0.6"; sha256="01p2qkqf88bzhwywyass5r8dwg2ycflmkbzmsps7fzy0kv3xyb02"; depends=[coda MCMCpack pscl wnominate]; }; - antaresEditObject = derive2 { name="antaresEditObject"; version="0.1.7"; sha256="0whwlqsjc9ygh2iv9bmgxglqk061l3mgfsq1a0848180wci6frwb"; depends=[antaresRead assertthat data_table whisker]; }; - antaresProcessing = derive2 { name="antaresProcessing"; version="0.17.0"; sha256="0mq2b1dkkgli8d53mpcllilh72gf8189f5mf0dxjcv4qinnhrrvm"; depends=[antaresRead data_table stringi]; }; - antaresRead = derive2 { name="antaresRead"; version="2.2.4"; sha256="0vi7g3mz92djxhraii788j4ialyvq013cw0grwndp2rz2bmxmgd8"; 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]; }; + antaresEditObject = derive2 { name="antaresEditObject"; version="0.1.9"; sha256="09zmhzfdzxpp01wmdk230gff6zwgd5p2w3ppbq3a0df3f56x0hix"; depends=[antaresRead assertthat data_table whisker]; }; + antaresProcessing = derive2 { name="antaresProcessing"; version="0.18.0"; sha256="1rw7g4706g4fdx7c7magxqj71h6iwkbslmyrqfwna4irnifjmv7g"; depends=[antaresRead data_table]; }; + antaresRead = derive2 { name="antaresRead"; version="2.2.5"; sha256="10c3ql08211ylc271xk8ffnix3pzmnaylgf0ynwayp34hkgkf37h"; depends=[bit64 data_table lubridate plyr shiny stringr]; }; + antaresViz = derive2 { name="antaresViz"; version="0.15.1"; sha256="1qak4gkqpglmpavm5xm0amszqfzm3zgapxk81l5gn6ff9ilby7fp"; 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.2"; sha256="15857msr80wqikf2rr7db3f8hhfwnaay10wnj27yig0yls46a99f"; depends=[survey]; }; - antitrust = derive2 { name="antitrust"; version="0.99.11"; sha256="025pm7n06yid28b34llm4rh0mlz0daz9ygh5z0hd87scp8f9gy00"; depends=[BB evd MASS numDeriv rhandsontable shiny]; }; 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]; }; anytime = derive2 { name="anytime"; version="0.3.7"; sha256="0vkckxaq1ga73iszwr4lyf12c1cann1w9lhflz4p3xdgx468fzb9"; depends=[BH Rcpp]; }; aod = derive2 { name="aod"; version="1.3.1"; sha256="1g03ajhs6bid80i83xn3917abhymzgrydqx86wxxpkqga018hb85"; depends=[]; }; aods3 = derive2 { name="aods3"; version="0.4-1.1"; sha256="1kdmgzd5nkzm0awdjls6fc8p9hxsph9ha9k1jxbppdi4i6f0i7rv"; depends=[boot lme4]; }; + aof = derive2 { name="aof"; version="0.1.2"; sha256="0552i5wvm04dq8a8y1x36sprc9cbx6k7c3bmsgqxm71dpsxajb0i"; depends=[bcpa]; }; aoos = derive2 { name="aoos"; version="0.5.0"; sha256="0y92vs27i0mkpjdclqzq4j9g1axkymhi3v8xp1v6hazh35yzjkfj"; depends=[magrittr roxygen2]; }; aoristic = derive2 { name="aoristic"; version="0.6"; sha256="0b9h2l59vvrvbjjwwb43j74frvwa8lsj4x5kwhwpsfjfch1yqwjl"; depends=[classInt ggplot2 GISTools lubridate maptools MASS plotKML RColorBrewer reshape2 rgdal sp spatstat]; }; apTreeshape = derive2 { name="apTreeshape"; version="1.5-0"; sha256="0mnydk157557pnkjvcadlghn5d8w9kxas4kwz4y4w21xg7z1jrig"; depends=[ape coda cubature pbapply quantreg]; }; @@ -5092,61 +5119,56 @@ in with self; { apaTables = derive2 { name="apaTables"; version="2.0.5"; sha256="0h986jqdl65fd33gfa433ik77r6lm9zrq75qfk5r8xsdgzb4wgva"; depends=[boot broom car dplyr tibble]; }; apaText = derive2 { name="apaText"; version="0.1.1"; sha256="1r217k60w027i63nbj24b1rm37m4qf7a6iirc941s945babkxcmb"; depends=[dplyr]; }; apc = derive2 { name="apc"; version="1.3"; sha256="1hgkqkvry9is8kjk2w46k637sig7fdznnc75wbrc8bq1hbrmf785"; depends=[lattice]; }; - apcf = derive2 { name="apcf"; version="0.1.3"; sha256="0wpq0739bpiqqlkl18c81x2g1g4k7xkam03vpj46wmmpa4z0glaa"; depends=[Rcpp]; }; + apcf = derive2 { name="apcf"; version="0.1.4"; sha256="0hylflzcfb2ziys5fdnwqlcmlzs45mch1plb5p0wf2aq5p8cdlx7"; depends=[Rcpp]; }; apcluster = derive2 { name="apcluster"; version="1.4.8"; sha256="0lzf2jqm56i74wif6x5sw3j0w2qc4sni49zq2fgbl89b7lwkvchj"; depends=[Matrix Rcpp]; }; apdesign = derive2 { name="apdesign"; version="1.0.0"; sha256="041zyd7ih9nnj92jj9vb9ya1ij9lmj1dzx64q74vyiadw1ix5l66"; depends=[Matrix]; }; ape = derive2 { name="ape"; version="5.3"; sha256="08wbk1kxhs32bmmvqlqanbdg1w235amd35k8m00fngsj9h9xzc08"; depends=[lattice nlme Rcpp]; }; apercu = derive2 { name="apercu"; version="0.2.4"; sha256="046gf4dzypl6mmq7xqkyrdasq9rsjxzsii7w4nxkbn4c40kh7bf7"; depends=[pls]; }; apex = derive2 { name="apex"; version="1.0.3"; sha256="157i67yvb9xqlhzcgkxj7n5lq65svxs82z38dv2c0k8p4krjl1pd"; depends=[adegenet ape phangorn]; }; - apexcharter = derive2 { name="apexcharter"; version="0.1.3"; sha256="1kgn5bs329l2brrsd0qda87jgkjxa9ksm2plffl4v46nqkz53038"; depends=[ggplot2 htmlwidgets jsonlite magrittr rlang scales]; }; + apexcharter = derive2 { name="apexcharter"; version="0.1.4"; sha256="1kn0i10wrkb48r3gxxv82mih575csv5695d1l90mh35x45hjgir6"; depends=[ggplot2 htmlwidgets jsonlite magrittr rlang shiny]; }; aphid = derive2 { name="aphid"; version="1.3.3"; sha256="1jqpn7w5sgy4k49qd9ci6yj89s55gzwl5w5ldw793mzpg6if7lfn"; depends=[kmer openssl Rcpp]; }; aplore3 = derive2 { name="aplore3"; version="0.9"; sha256="0af6klscsxvh4amp519b6r41bzysf61p040fj4l5706bbya1arhw"; depends=[]; }; + aplot = derive2 { name="aplot"; version="0.0.3"; sha256="1njlqna2m4p75jh4amqx658r48mkzfmnyjs1kg04p6sfbr5kycls"; depends=[ggplot2 magrittr patchwork]; }; aplpack = derive2 { name="aplpack"; version="1.3.3"; sha256="010saim43d3hr83ksi916846rh6qfbb0gvhsf5jbdx95m4bai9g3"; depends=[]; }; apmsWAPP = derive2 { name="apmsWAPP"; version="1.0"; sha256="1azgif06dsbadwlvv9nqs8vwixp6balrrbpj62khzmv1jvqr4072"; depends=[aroma_light Biobase DESeq edgeR genefilter gtools multtest seqinr]; }; apng = derive2 { name="apng"; version="1.0"; sha256="13hvr1w566anrhdicaqwqjgfq2lk3zkn5gcfgy8zazjnad4vy07y"; depends=[bitops]; }; - apollo = derive2 { name="apollo"; version="0.0.9"; sha256="1gzwfra74bb8jihc75lgymf5m194xmk6wz7p9mhjchgvb98czjqz"; depends=[coda maxLik mnormt mvtnorm numDeriv randtoolbox Rcpp RcppArmadillo RcppEigen RSGHB sandwich]; }; - apparent = derive2 { name="apparent"; version="1.1"; sha256="03n3pq620xg1vykzsmvxp6wr9hs561pl5ds50g7zmxk9z0ijcb32"; depends=[outliers]; }; + apollo = derive2 { name="apollo"; version="0.1.0"; sha256="0i80js5gxz3rj6977iwnm7pi9qgq2iz4h83nz8301ra94g7kjv40"; depends=[coda Deriv maxLik mnormt mvtnorm numDeriv randtoolbox Rcpp RcppArmadillo RcppEigen RSGHB sandwich]; }; apple = derive2 { name="apple"; version="0.3"; sha256="194z2f6hwdjjxdkjwlmfhpfp26p9yp3gparklhdbb6zlb4a9nnhz"; depends=[MASS]; }; appnn = derive2 { name="appnn"; version="1.0-0"; sha256="0wkpr6lcd68wlzk6n622ab7sd99l837073czn4k56hw8bw9v68j3"; depends=[]; }; approximator = derive2 { name="approximator"; version="1.2-7"; sha256="0smqjdla9mvzy164nsb0pw0sgal3w2wnyhqidp74h0smyczrr1zw"; depends=[emulator mvtnorm]; }; - approxmatch = derive2 { name="approxmatch"; version="1.0"; sha256="1z1lrbfvm380p2az88hrxr3f2cgbv2h70wzm99vi9a2dmh0pl7qy"; depends=[]; }; + approxmatch = derive2 { name="approxmatch"; version="2.0"; sha256="1n6v1h4zf1nf8j1a5d0h95v6q8dff39v9061i7zzi9ci3lw04748"; depends=[]; }; aprean3 = derive2 { name="aprean3"; version="1.0.1"; sha256="17rnq02sncl6rzwyln10200s43b8z1s2j0kdi9kgcb6qr51v12rv"; depends=[]; }; apricom = derive2 { name="apricom"; version="1.0.0"; sha256="1gyd1yln14cn0iswj7sjs4hav6j6d4f3ncps4gqbci5fwha5blcr"; depends=[logistf penalized rms shrink]; }; aprof = derive2 { name="aprof"; version="0.4.1"; sha256="14qclp88j4ygd4vrxxpgy2s9939wcajjsqycdzpvn64ws29sdpvh"; depends=[testthat]; }; apsimr = derive2 { name="apsimr"; version="1.2"; sha256="14vhsm6am2c2q2sgabnhxr0lgldifss0anjpisrhjqk04njllviy"; depends=[ggplot2 lubridate MASS mgcv reshape2 XML]; }; apsrtable = derive2 { name="apsrtable"; version="0.8-8"; sha256="1qmm89npjgqij0bh6p393wywl837lfsshp2mv9b5izh1sg2qfwvw"; depends=[]; }; apt = derive2 { name="apt"; version="2.5"; sha256="1y18bqnnxy5p0xx9gbfrnrzq3nlhw3psl5zlibrw6lfhb8lxd4mk"; depends=[car copula erer gWidgets urca]; }; - aptg = derive2 { name="aptg"; version="0.1.0"; sha256="06z8041h1k9v0ymd7azn11xzhqxb8lda4r7nyg51h8z3i8mpq1ba"; depends=[ape brranching phytools taxize xml2]; }; - apyramid = derive2 { name="apyramid"; version="0.1.0"; sha256="0r0mx5m3jwjdw0npvlch4h6n73sy277wzcrffm6zz0ki9rkm0can"; depends=[dplyr forcats ggplot2 glue rlang scales tidyselect]; }; - aqfig = derive2 { name="aqfig"; version="0.8"; sha256="0ha0jb5ag3zx6v7c63lsm81snslzb8y8g565mxjmf7vxpcmzzqsi"; depends=[geoR]; }; + apyramid = derive2 { name="apyramid"; version="0.1.1"; sha256="0lqmk2cm4dflzq1f67mfdxpq9slfz2k9fnsvhrwb5dj5kw2az3i6"; depends=[dplyr forcats ggplot2 glue rlang scales tidyselect]; }; aqp = derive2 { name="aqp"; version="1.19"; sha256="1z5qbzhsn79xz17i53hy48xnwf64k5cc24jxwvysyv8p2ylrir0i"; depends=[cluster digest lattice MASS plotrix plyr RColorBrewer reshape scales sp stringr]; }; aqr = derive2 { name="aqr"; version="0.4"; sha256="04frgil3nbxsww66r9x0c6f308pzqr1970prp20bdv9qm3ym5axw"; depends=[RCurl xts]; }; ar_matrix = derive2 { name="ar.matrix"; version="0.1.0"; sha256="1d531hkl50szfa1q0zbp8dp1a9jli63kwvxjgc9n0ar279y47qdz"; depends=[MASS Matrix sp sparseMVN]; }; arabicStemR = derive2 { name="arabicStemR"; version="1.2"; sha256="1vflynbi7aln7x2p4jg9gsvfrxn4v6qkb4wbrzxmj561lqy9fcay"; depends=[]; }; arc = derive2 { name="arc"; version="1.2"; sha256="1advs0aqxh84c5n9akww8cdafh7npgaibrb42wncwhv9nfi7wy1v"; depends=[arules discretization Matrix R_utils]; }; archdata = derive2 { name="archdata"; version="1.2"; sha256="0igh6qy3yv5hzprj9izpkqp3f6jkb7pydqzmnl8sqhqjqvb3lnij"; depends=[]; }; - archetypal = derive2 { name="archetypal"; version="1.0.0"; sha256="1b5c881balv4p0zr7bgg741mzfnw5fvg6ns303rsqashydxcnyiv"; depends=[doParallel geometry inflection lpSolve Matrix]; }; + archetypal = derive2 { name="archetypal"; version="1.1.0"; sha256="1x1642p2l19drp22mi1pci7v3s19j885pkx0s2kn7aawpjfis9nw"; depends=[doParallel geometry inflection lpSolve Matrix plot3D]; }; archetypes = derive2 { name="archetypes"; version="2.2-0.1"; sha256="0ibxsr173ib77gjhid91m85s8gjii4mi2w3d52q5301igv20p7r0"; depends=[modeltools nnls]; }; archiDART = derive2 { name="archiDART"; version="3.3"; sha256="01fmyp3f26v5rdgi00qyn139fgq55yxz5nhx223hg78qwrrbjvpw"; depends=[geometry gtools rgl sp TDA XML]; }; archivist = derive2 { name="archivist"; version="2.3.4"; sha256="1i11hrcq1910jgd6diw6h3sxx624v57zjianm49pqvb2dvd0b8y7"; depends=[DBI digest flock httr lubridate magrittr RCurl RSQLite]; }; archivist_github = derive2 { name="archivist.github"; version="0.2.6"; sha256="092fzi505vx9xbk41m86d0isxna42iflp7q2kjiqa6z1ccvim2yx"; depends=[archivist digest git2r httr jsonlite]; }; - arcos = derive2 { name="arcos"; version="0.8.2"; sha256="055sr3brad4p47d018s14zsxlqyzfcvk7zdkqfdi9bxqway8vm7q"; depends=[dplyr jsonlite magrittr stringr urltools vroom]; }; areal = derive2 { name="areal"; version="0.1.5"; sha256="01fh4al7hz9hxnvkp4my8937czhr8jnxyvpnj4gmhsm4alv25yfc"; depends=[dplyr glue purrr rlang sf]; }; areaplot = derive2 { name="areaplot"; version="1.2-1"; sha256="1bmr092pgflgyss50xy1hs5xjl57i2wmfg7qa513sh120fi2mina"; depends=[]; }; 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.2.0"; sha256="1wykr7y5375g1nb18ynybccxmd948xrr0gdwxxqsfjf782vlgd2d"; depends=[argonR htmltools shiny]; }; argonR = derive2 { name="argonR"; version="0.2.0"; sha256="15hlvansqnky9bnq4r7xza3hb1hzylmhz8117wxz9lxa1wiky2is"; depends=[htmltools rstudioapi]; }; argosfilter = derive2 { name="argosfilter"; version="0.63"; sha256="0rrc2f28hla0azw90a5gk3zj72vxhm1b6yy8ani7r78yyfhgm9ig"; depends=[]; }; argparse = derive2 { name="argparse"; version="2.0.1"; sha256="1as7h6z7kzgv0fqzpnp76qbm96b4jcd37azd58b7rz0l1n94764l"; depends=[findpython jsonlite R6]; }; argparser = derive2 { name="argparser"; version="0.6"; sha256="1pxiz9jlhlnpzqn1lz349r07i7glw708w202x6dlnxp112fg7k4x"; depends=[]; }; - ari = derive2 { name="ari"; version="0.3.3"; sha256="1gbbims0vqm3rnkrg064aa2h359hl4il4grdpy0va8hq3mrkvkrb"; depends=[hms progress purrr rmarkdown rvest text2speech tuneR webshot xml2]; }; + ari = derive2 { name="ari"; version="0.3.5"; sha256="03w99c918jp23d0kl26vx4m7xjicpgwl5rhn9d0fsm4kvv7j87li"; depends=[hms progress purrr rmarkdown rvest text2speech tuneR webshot xml2]; }; aricode = derive2 { name="aricode"; version="0.1.2"; sha256="0w5ap0lhp9x67qvz3z80y49311g6h24x11yn8ziv75s3kaxy2wvz"; depends=[Matrix Rcpp]; }; arkdb = derive2 { name="arkdb"; version="0.0.5"; sha256="00ih2in6q0kismpc5jc8w3609nxjkmybx8i19cjlbr93y2zjm29i"; depends=[DBI progress]; }; - arkhe = derive2 { name="arkhe"; version="0.2.0"; sha256="0qw5n73vzzkqlb7c1n4f38v3vlmc2cqwq59j4zqvs9h5ipbf15bm"; depends=[]; }; + arkhe = derive2 { name="arkhe"; version="0.2.2"; sha256="0wfi6wgarjfkni4l1wy863i1cbqsckcw3ar357rkcwz3kks47f6p"; depends=[]; }; 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.2"; sha256="098c59hdzr4ly8sx72xkcbjmiz5y65id1slsscwjji1yssb23lqq"; depends=[Rcpp]; }; @@ -5154,30 +5176,31 @@ in with self; { aroma_affymetrix = derive2 { name="aroma.affymetrix"; version="3.2.0"; sha256="19xh67ncr8cs8i9k803qsnx7jhwj2b72ls7nznf3dn3frw9wyyfj"; 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]; }; aroma_cn = derive2 { name="aroma.cn"; version="1.6.1"; sha256="1d9g81b12a3m03wrvb3cvg33fjybgiabpxhci2y2rr6diay42pmr"; depends=[aroma_core matrixStats PSCBS R_cache R_filesets R_methodsS3 R_oo R_utils]; }; - aroma_core = derive2 { name="aroma.core"; version="3.2.0"; sha256="1c4spy2sc80clz49irzilsqy65k6q2vl86qaydnymkzljcz7bbpg"; depends=[future listenv matrixStats PSCBS R_cache R_devices R_filesets R_methodsS3 R_oo R_rsp R_utils RColorBrewer]; }; + aroma_core = derive2 { name="aroma.core"; version="3.2.1"; sha256="1nc88h7khjabgzyj4nvjkx9dzmic6bhhfskf024yq3rf1d55v09g"; depends=[BiocManager future listenv matrixStats PSCBS R_cache R_devices R_filesets R_methodsS3 R_oo R_rsp R_utils RColorBrewer]; }; arpr = derive2 { name="arpr"; version="0.1.1"; sha256="0j69nbmhmhmyfna011gv68wvxv1x2lijz94pyg9g2ax720x74i2q"; depends=[magrittr]; }; arrApply = derive2 { name="arrApply"; version="2.1"; sha256="0qy7iwi580rrf3sycsbv6qgxsqcdy9pdbnkdrx81j68qni9iw737"; depends=[Rcpp RcppArmadillo]; }; arrangements = derive2 { name="arrangements"; version="1.1.8"; sha256="03dzvahy8mwp6w1smnbp83zk8w8pfkmsfd1f68bd8jjvdb5lrz71"; depends=[gmp R6]; }; - arrayhelpers = derive2 { name="arrayhelpers"; version="1.0-20160527"; sha256="1ib91hpg6xgy0jr4sb8ib19x0v4f5n96lak0qm0z5vksawgcnp1l"; depends=[svUnit]; }; - arrow = derive2 { name="arrow"; version="0.15.1.1"; sha256="0qdzq22x3cqfwa9a62rl718kbmq87rk3s0k17hsh5122sb8lwvh1"; depends=[assertthat bit64 purrr R6 Rcpp rlang tidyselect]; }; + arrayhelpers = derive2 { name="arrayhelpers"; version="1.1-0"; sha256="02rl530qxi1idiqpmzg5wr9vl5c7phizhpj64k5pn8xq9zfxbpaz"; depends=[svUnit]; }; + arrow = derive2 { name="arrow"; version="0.16.0.2"; sha256="1h7c46qraz15dra38hfs6avv27j4d5x4s4cs10vnwyqik11gb2mv"; depends=[assertthat bit64 purrr R6 Rcpp rlang tidyselect vctrs]; }; ars = derive2 { name="ars"; version="0.6"; sha256="0zs1rk3i7pc9wcvxrvjcls194mfbvmkz7cb6pwd1cm3fzjwsyxsp"; depends=[]; }; arse = derive2 { name="arse"; version="1.0.0"; sha256="0ssaalc058m09gfcr1n0s729rx2plia3zkhlynj67drclyvhyb0i"; depends=[dplyr pracma]; }; - arsenal = derive2 { name="arsenal"; version="3.3.0"; sha256="1bn1i5cdy6caw6ndqcfy41x3qb0hj3g4r8p4jl24gljygd3rvzgh"; depends=[]; }; + arsenal = derive2 { name="arsenal"; version="3.4.0"; sha256="090q0kjpcjdxa6r22pb7wzhvgcdq41khh1af7pqgg1rvn2d97x4n"; depends=[knitr]; }; artfima = derive2 { name="artfima"; version="1.5"; sha256="1nqsq9fsqk9kag9n7i2r9yvf578nkdfrkkv7qy8650prka0jca2p"; depends=[gsl ltsa]; }; - arules = derive2 { name="arules"; version="1.6-4"; sha256="003c5cd3xzq39h7c19px077ygm0n1v7k83icy5zzrnkagyds2p8n"; depends=[Matrix]; }; + arules = derive2 { name="arules"; version="1.6-5"; sha256="0bcvfn8lvcv74vv9z3kgg7yq5hm7wjqhmzadi55cbm8zxd76g84v"; depends=[Matrix]; }; arulesCBA = derive2 { name="arulesCBA"; version="1.1.6"; sha256="1b82am0sv5211x65r45k7pw52hfywv5i8zqr5asczdkx07s6273s"; depends=[arules discretization glmnet Matrix testthat]; }; arulesNBMiner = derive2 { name="arulesNBMiner"; version="0.1-5"; sha256="1q4sx6c9637kc927d0ylmrh29cmn4mv5jxxpl09yaclzfihjlk9a"; depends=[arules rJava]; }; - arulesSequences = derive2 { name="arulesSequences"; version="0.2-22"; sha256="0m4g1mgc1swixq9z2v30bjvgnkqsjrinsmwqznrycxyzcgwbn8b3"; depends=[arules]; }; + arulesSequences = derive2 { name="arulesSequences"; version="0.2-24"; sha256="0sgysrvmdsr6l0661llrmsnnn397n2niv0bhlm0i31ak0fwh1ljz"; depends=[arules]; }; arulesViz = derive2 { name="arulesViz"; version="1.3-3"; sha256="1c51l4hqai07qx20lbdvffxw9kx0vkgbccw7b9wz1h2n5ma90c8y"; depends=[arules colorspace DT igraph plotly scatterplot3d seriation vcd visNetwork]; }; asVPC = derive2 { name="asVPC"; version="1.0.2"; sha256="07nfwr0lsfpwgfdgzcdn1svw8dnjfni5ga9q77yjd1bj0wf76ci2"; depends=[ggplot2 plyr]; }; asaur = derive2 { name="asaur"; version="0.50"; sha256="0c1rgic76w3i2xhna7i52lyc0p01s5b1mxyn55gqw6i19v9mq0b3"; depends=[]; }; - asbio = derive2 { name="asbio"; version="1.6-1"; sha256="0fhn0c743ndirqc9sbjq819xbrhjky2adk7nrjh2khjfbfrf0fw6"; depends=[deSolve gWidgets lattice multcompView mvtnorm pixmap plotrix scatterplot3d]; }; - asciiSetupReader = derive2 { name="asciiSetupReader"; version="2.3.0"; sha256="1gfd1pqanxc3wsl1pmqc9csbzlffryvjkd1p2fa7b0kbwl1ln63s"; depends=[data_table haven miniUI readr rstudioapi shiny stringr vroom zoo]; }; + asbio = derive2 { name="asbio"; version="1.6-3"; sha256="15b3018wyf41iajy92a0nzhhz0qfawi05zy5my1hq3l5mrlkidh1"; depends=[deSolve gWidgets gWidgetstcltk lattice multcompView mvtnorm pixmap plotrix scatterplot3d tkrplot]; }; + asciiSetupReader = derive2 { name="asciiSetupReader"; version="2.3.1"; sha256="031x6kvzpfh2falzg2qgch2czj74a4mskl8cn83y9rs0shswvmhx"; depends=[data_table haven miniUI readr rstudioapi shiny stringr vroom zoo]; }; asciicast = derive2 { name="asciicast"; version="1.0.0"; sha256="0vga88cq2hzi0bwq43n1yz5cm8kaag9xpg8v73gj06fb93lhha9x"; depends=[curl jsonlite processx tibble uuid V8]; }; asciiruler = derive2 { name="asciiruler"; version="0.2"; sha256="0xhkbsy9dypk09avazgxczyfkh3rhdxhwci688dw1lxnhxv1hj24"; depends=[stringr]; }; asd = derive2 { name="asd"; version="2.2"; sha256="0p3r4qjam3sl3rpcilb0pgx4xx3ly71xqnvkv31vzjs885lgxz4l"; depends=[mvtnorm]; }; asdreader = derive2 { name="asdreader"; version="0.1-3"; sha256="15a922aw0v5w4hrha03xifx8cpifcc773gambgwqq6i5nz08ya26"; depends=[]; }; ash = derive2 { name="ash"; version="1.0-15"; sha256="1ay2a2agdmiz7zzvn26mli0x0iwk09g5pp4yy1r23knhkp1pn2lb"; depends=[]; }; + ashr = derive2 { name="ashr"; version="2.2-47"; sha256="1rqb5j30ylaf1h4l66x4jxyn5inrvhc42d90qd5mgkxsq0ghdlr4"; depends=[etrunct invgamma Matrix mixsqp Rcpp SQUAREM truncnorm]; }; asht = derive2 { name="asht"; version="0.9.4"; sha256="1aq384vgf26ig3isyp99z09glcjhl2qd43kp8qdcwk75dcrmxd7z"; depends=[bpcp coin exact2x2 exactci perm ssanv]; }; askpass = derive2 { name="askpass"; version="1.1"; sha256="07q0ik8jzk44vpwh48rr3fnpd7dzsdhjjsl4l850rffv3dyq4h6v"; depends=[sys]; }; aslib = derive2 { name="aslib"; version="0.1"; sha256="0dkb6bb6dqavjklbciqxqhi3fdqib9asdnhiap2gp9b9wfnkyq7k"; depends=[BatchExperiments BatchJobs BBmisc checkmate corrplot ggplot2 llama mlr parallelMap ParamHelpers plyr reshape2 RWeka stringr yaml]; }; @@ -5185,7 +5208,7 @@ in with self; { aspace = derive2 { name="aspace"; version="3.2"; sha256="1g51mrzb6amafky2kg2mx63g6n327f505ndhna6s488xlsr1sl49"; depends=[Hmisc shapefiles splancs]; }; aspect = derive2 { name="aspect"; version="1.0-5"; sha256="0pbc0daxw20xcbgqyyd5gbs9kmbaf2dq8ajllx0mnfwdcak9jfgj"; depends=[]; }; aspi = derive2 { name="aspi"; version="0.2.0"; sha256="0rhvxw243vvdv3hxa6pi343gcjc2cbxq1jzqirl9k1l4i3897l87"; depends=[]; }; - asremlPlus = derive2 { name="asremlPlus"; version="4.1-36"; sha256="1qh6k1vf3a01dzllapjwrz7qw7bl2pxbbwij20pwhb4v8njpy1y7"; depends=[dae doParallel dplyr foreach ggplot2 plyr RColorBrewer reshape stringr]; }; + asremlPlus = derive2 { name="asremlPlus"; version="4.2-18"; sha256="1v83ahb7rndybfzaw6gnv0m4fvp8nv8gsrsasa8x59n6pd5jkjd9"; depends=[dae doParallel dplyr foreach ggplot2 plyr RColorBrewer reshape stringr]; }; assertable = derive2 { name="assertable"; version="0.2.7"; sha256="1npks9rcrnchmd0silq6qrvqkmdkp9fwjkyyvvp1lqjclyxk6vkk"; depends=[data_table]; }; assertive = derive2 { name="assertive"; version="0.3-5"; sha256="0blbbhlxcb5ffdxqxi62xs33ljiawh6s22a0pyvbbh79jf46rzr3"; depends=[assertive_base assertive_code assertive_data assertive_data_uk assertive_data_us assertive_datetimes assertive_files assertive_matrices assertive_models assertive_numbers assertive_properties assertive_reflection assertive_sets assertive_strings assertive_types knitr]; }; assertive_base = derive2 { name="assertive.base"; version="0.0-7"; sha256="1xs3ysvj0z57c58jw57pckq2rynia6ks4rmjmc02alczhk54wbgh"; depends=[]; }; @@ -5203,9 +5226,9 @@ in with self; { assertive_sets = derive2 { name="assertive.sets"; version="0.0-3"; sha256="1cqvh2syvh5b6d85h601zjmsdbbf3h8q98ids4dfl4frdshpasc7"; depends=[assertive_base]; }; 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]; }; + assertr = derive2 { name="assertr"; version="2.7"; sha256="1x868pd4dac1c7b1q5390wqh2f6s50km8nqcpim3nxcj2l4qkqdb"; depends=[dplyr MASS rlang]; }; assertthat = derive2 { name="assertthat"; version="0.2.1"; sha256="17wy5bdfzg73sg2clisg1k3zyn1adkj59x56m5nwia2k8z67zkw5"; depends=[]; }; - assignPOP = derive2 { name="assignPOP"; version="1.1.7"; sha256="0zx7cblfzfpi5jvagni56845lg198zkx5q43ip3lg8h0sq2h8qp2"; depends=[caret doParallel e1071 foreach ggplot2 MASS randomForest reshape2 stringr tree]; }; + assignPOP = derive2 { name="assignPOP"; version="1.1.9"; sha256="1cbk2l827mfi4fi1jai0lzbcj2wvrzd3kw4frmqn4anx6nbcr0qf"; depends=[caret doParallel e1071 foreach ggplot2 MASS randomForest reshape2 stringr tree]; }; assignR = derive2 { name="assignR"; version="1.1.3"; sha256="0pmzgz955nqxlcnb0f0kbv415kysjl12niyh704ksvhs5yw0xhah"; depends=[maptools raster rgdal sp]; }; assist = derive2 { name="assist"; version="3.1.6"; sha256="13r029z32f2xcspafx01jkgmabbjcvnp8wg1wx1liwxh3mf2zalg"; depends=[lattice nlme]; }; assocInd = derive2 { name="assocInd"; version="1.0.1"; sha256="16yzgvlqbapjhvzm5nw8vfrhh8mp9llnhck4bpgmszyrh93z1ha5"; depends=[]; }; @@ -5223,71 +5246,77 @@ in with self; { 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.5"; sha256="0jvlch6yhcz5azxj9yllah0x98plws5camxqis58qyqiapgvl9h8"; depends=[DescTools doBy effsize Hmisc plyr reshape2 settings]; }; - atakrig = derive2 { name="atakrig"; version="0.9.5"; sha256="0lw4mx029aks0w1lhxv58v9r4c01rrayq79bapdbd8lf8ivpcp3n"; depends=[doSNOW FNN foreach gstat MASS Rcpp rgeos snow sp]; }; atlas = derive2 { name="atlas"; version="1.0.0"; sha256="02wm22j40llmdi6z3rzgbc5fpkzmjfq0xar33bypvj1dx1zxygnd"; depends=[httr testthat]; }; atmcmc = derive2 { name="atmcmc"; version="1.0"; sha256="05k69b5wlysz3kh0yiqvshgvr0nyz34zkvn6bjs30cwz7s9j21pn"; depends=[]; }; atmopt = derive2 { name="atmopt"; version="0.1.0"; sha256="1h79ngq1236gz4w29fs3nj46a3m1x8a28z3xnhc6wn3a46cf8zzi"; depends=[DoE_base gtools hierNet]; }; atsd = derive2 { name="atsd"; version="1.2.0"; sha256="0jan8r5f2r3l2xpdf9rrv4smkr2l645rfdgdfjb1xa54jd3pqvqs"; depends=[httr RCurl]; }; - attachment = derive2 { name="attachment"; version="0.0.9"; sha256="0z47v5nqvw0grgll2bl66zy82igg1ncy78jm9dwv45yd4dl2xi10"; depends=[desc devtools glue knitr magrittr rmarkdown stringr]; }; + attachment = derive2 { name="attachment"; version="0.1.0"; sha256="0j3zm0ibf1iv67jy4mq1fzckgbxhxyx74frplsl2np0fbdgsxdz6"; depends=[desc glue knitr magrittr rmarkdown roxygen2 stringr]; }; attempt = derive2 { name="attempt"; version="0.3.0"; sha256="1q0r4r0hirw2kxsvcq5rqkmbxzi7fa6fxaqi6rmzwiz25025iv71"; depends=[rlang]; }; attenuation = derive2 { name="attenuation"; version="1.0.0"; sha256="0ys4psvkvimmym4qj9cmhq8y7x10kv0x6bsvpjkrsc3l8p2g3474"; depends=[]; }; atus = derive2 { name="atus"; version="0.2"; sha256="1i67rx8p5v4shgbfcym4lbnlw55xx7w2fdzhgsgjjyfpwbpm7h4h"; depends=[]; }; - auRoc = derive2 { name="auRoc"; version="0.2-0"; sha256="1q5cpa1y96bs5x0vifi0h6ca4yasg3z57yhq29vicd433h3phy3x"; depends=[coda MBESS ProbYX rjags]; }; + auRoc = derive2 { name="auRoc"; version="0.2-1"; sha256="152jdvzigcplii5amj0mnral3g2jyy3rfsc745mx36sspw1396yx"; depends=[coda MBESS ProbYX rjags]; }; aucm = derive2 { name="aucm"; version="2019.12-1"; sha256="1vjb5jiq2iz6c8nhfcbqg21nms7nf485xlrgd7mdkbzvqxxl43h6"; depends=[kyotil]; }; auctestr = derive2 { name="auctestr"; version="1.0.0"; sha256="15b1x0c9yhl91gir7jmivp8vxzc8q7wvb0mgam9454avc6l29x4y"; depends=[dplyr tidyr]; }; - audio = derive2 { name="audio"; version="0.1-6"; sha256="1f3k7n8x716kqx439jd0g0dc5iwc33jzzas4ikjrlgidp89i89iz"; depends=[]; }; + audio = derive2 { name="audio"; version="0.1-7"; sha256="0x4wcl8nlymmzhsdd255ybxdwnshksmr92y6drcajnij8mx3kq2j"; 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="1.1.0"; sha256="10f9vk92w35rd56jsp81a31fm7ys28f9acnp2qr1n28c14m4pbvz"; depends=[DALEX ggplot2 ggrepel gridExtra hnp scales]; }; + auditor = derive2 { name="auditor"; version="1.2.0"; sha256="14swypvjfkd8qi34dsv2sg2fj0ls4xz42vy4csd2qxj0zwi3rlap"; depends=[DALEX ggplot2 ggrepel gridExtra hnp scales]; }; augSIMEX = derive2 { name="augSIMEX"; version="3.7.3"; sha256="0cdqpckc4aiwi2dnkcvk2m9n0bg9f7qmd84n3rdw6clcrd0f95wz"; depends=[Formula MASS nleqslv Rcpp rootSolve]; }; - augmentedRCBD = derive2 { name="augmentedRCBD"; version="0.1.1"; sha256="0l2x8f8xqrvsn4gbi707xw2nfxcvcmxwgpzq4vh8ngxnq89m2179"; depends=[dplyr emmeans flextable ggplot2 moments multcomp multcompView officer Rdpack reshape2 stringi]; }; - auk = derive2 { name="auk"; version="0.4.0"; sha256="1wrplqbzfa0jp91hxc1jd5vjm587pz1768s7csfqvrgn8ziy9akx"; depends=[assertthat countrycode dplyr httr magrittr rlang stringi stringr tidyr]; }; + augmentedRCBD = derive2 { name="augmentedRCBD"; version="0.1.2"; sha256="1m5iwsy6a580k8b2ph186w2aa9nqy1551mwr4zx4cwyh06m8hrq3"; depends=[dplyr emmeans flextable ggplot2 moments multcomp multcompView officer Rdpack reshape2 stringi]; }; + auk = derive2 { name="auk"; version="0.4.1"; sha256="0xrxl8qzmc0dnjn7s32wwrdv1z7v7a4wfpz4vrradfn84vxway30"; depends=[assertthat countrycode dplyr httr magrittr rlang stringi stringr tidyr]; }; aurelius = derive2 { name="aurelius"; version="0.8.4"; sha256="00bpf9sggvnajpmg3zsdgfjinkb6wbrcf1ris7qfhh1rp5rz4m4m"; depends=[gbm glmnet jsonlite]; }; auth0 = derive2 { name="auth0"; version="0.2.1"; sha256="077nqh28q3b9jb25fy0157l06zpx3x0rg4z5dz2dqsh88xy4nhqj"; depends=[htmltools httr shiny shinyjs yaml]; }; auto_pca = derive2 { name="auto.pca"; version="0.3"; sha256="01m2ldpcxzj7fhgmr9wp4ha3gqdyh7l5bkrnw83smcbq5229hsyy"; depends=[plyr psych]; }; autoBagging = derive2 { name="autoBagging"; version="0.1.0"; sha256="01k44rgkpbbr3m2x360aq0fz2qi7nz036g5dsh2y3jy94rmddbyy"; depends=[abind caret cluster CORElearn e1071 entropy infotheo lsr MASS minerva party rpart xgboost]; }; autoFRK = derive2 { name="autoFRK"; version="1.2.0"; sha256="0xj4wh8m0zjhbcp3s6gfyakkqp2i9dm19hij0nl1x02xz8gl9kij"; 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]; }; + autocogs = derive2 { name="autocogs"; version="0.1.3"; sha256="1xv2sv5p5pskp7mw9zcgcbwsbfzjiabigld92npd3mzy8n7zdli6"; depends=[broom checkmate diptest dplyr ggplot2 hexbin MASS mclust moments progress tibble]; }; autoencoder = derive2 { name="autoencoder"; version="1.1"; sha256="0ly1aanayk28nx6yqfhl7d0zm4vg6rfjikf5ibn8zhmkrfyflj1y"; depends=[]; }; - autoimage = derive2 { name="autoimage"; version="2.0.1"; sha256="1mwkrnyk7ygjmqbhpz86kzzmgk57q3kppp13m6rv2a65macbby2z"; depends=[fields ggplot2 mapproj maps MBA viridisLite]; }; + autoimage = derive2 { name="autoimage"; version="2.1"; sha256="0xqx2cmh7wfaj3mk3y5bld64frawaj3k0cnbd2cd13mrq8ma6j7b"; depends=[fields ggplot2 mapproj maps MBA viridisLite]; }; + autokeras = derive2 { name="autokeras"; version="1.0.1"; sha256="171q7i1zygzmkm34bi7grx5rvnjwks60ifk4k86kki5aiipzx4d5"; depends=[keras reticulate]; }; automagic = derive2 { name="automagic"; version="0.5.1"; sha256="1mmm6kj6mxrn3s4v8ryszkxr9z7bh9cvhin7xjq111fkwly7wjkq"; depends=[dplyr formatR knitr magrittr purrr remotes yaml]; }; automap = derive2 { name="automap"; version="1.0-14"; sha256="1190kbmp0x80x0hyifdbblb4ijq79kvrfn9rkp5k6diig4v30n0w"; depends=[gstat lattice reshape sp]; }; automl = derive2 { name="automl"; version="1.3.2"; sha256="1nrg8q3y6rv69nmnsylg8rps4b4prx46j5a8ljlr24yc34504ck3"; 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]; }; autoshiny = derive2 { name="autoshiny"; version="0.0.2"; sha256="0s06ynnirgsh19x8qq4020piirkhvjqpvz372syygvlal062y6cn"; depends=[shiny]; }; + autota = derive2 { name="autota"; version="0.1.3"; sha256="07n34v4lpql5n0y94pm07ywl2z9azjgjrpw7qyfxa6qw6gv71gid"; depends=[base64enc glue httpuv magrittr memoise purrr RJSONIO rlang rlist rstudioapi stringdist stringr xml2]; }; autothresholdr = derive2 { name="autothresholdr"; version="1.3.5"; sha256="1dvc21w57ir34vhcrbz58scl4ly057yn1ibmdkly99hwfkpihv3x"; depends=[checkmate filesstrings glue ijtiff magrittr purrr Rcpp rlang]; }; - av = derive2 { name="av"; version="0.4.0"; sha256="0r9z3iahrjlwpvcc29450c669576yprchg1znivq7p9lzff83plc"; depends=[]; }; + av = derive2 { name="av"; version="0.5.0"; sha256="0v99y47dsa2z3c4qawipdrzynla2aab3x0c8qzdi5w9r5y9a38sh"; depends=[]; }; available = derive2 { name="available"; version="1.0.4"; sha256="18dqm10dicbvjd5wli4nkv4fip0fgh2b9h9gm5511ayfsdg8lc8l"; depends=[cli clisymbols crayon desc glue jsonlite memoise SnowballC stringdist tibble tidytext udapi yesno]; }; avar = derive2 { name="avar"; version="0.1.1"; sha256="1i0bk3y0ca58ihwn4di8rpkp5vs2j5b80rcvaf72n9h2hp8i2ncz"; depends=[Rcpp RcppArmadillo simts]; }; averisk = derive2 { name="averisk"; version="1.0.3"; sha256="02j27d4jxgy2bk5sgxp1xdfyqr321civs99qj0g8cp34gwqk0j3m"; depends=[MASS]; }; aweek = derive2 { name="aweek"; version="1.0.0"; sha256="0a9d4yp694qch34mf08qc5fwsn21h9mw1ak6vylaq73nwiihajw9"; depends=[]; }; - aws = derive2 { name="aws"; version="2.4-0"; sha256="1jwa2n8n4ngznd8na89gnab97m94sz4bsmd3fld5h4pppilac80h"; depends=[awsMethods gsl]; }; + aws = derive2 { name="aws"; version="2.4-1"; sha256="00mc1qwah6i4ajmm01sklz86vz9rwchdsdrck5yrva2a2b1war22"; depends=[awsMethods gsl]; }; aws_alexa = derive2 { name="aws.alexa"; version="0.1.7"; sha256="0k3kwkmi13j2nrkyi6ahpc98s24idx4m5s4wkqkgqhi8xaljpp7c"; depends=[aws_signature dplyr httr xml2]; }; + aws_comprehend = derive2 { name="aws.comprehend"; version="0.2.1"; sha256="0qn4mkdd17c8kmrm4ml7l1x3rzaw3gbykhrj3m0ga53crcqdhqri"; depends=[aws_signature httr jsonlite]; }; aws_ec2metadata = derive2 { name="aws.ec2metadata"; version="0.2.0"; sha256="1lbljg2fp3yh1hwlbmprkc1prw80jv0ycvpg1vggagm68wm5x288"; depends=[curl jsonlite]; }; - aws_polly = derive2 { name="aws.polly"; version="0.1.2.1"; sha256="10wr30a52m0nq3a6bqqvfzic86g5sq485zy5xfgay2y5ivsdz6k8"; depends=[aws_signature httr jsonlite tuneR]; }; - aws_s3 = derive2 { name="aws.s3"; version="0.3.12.1"; sha256="1nwj5yqgqpc475cia39x5277w9jalm6lmsa4j3spcr254qdkjl7q"; depends=[aws_signature base64enc digest httr xml2]; }; + aws_polly = derive2 { name="aws.polly"; version="0.1.5"; sha256="1xfx9g5iq1wcl27cmj4ss3y3f5yr1qmma77ki09g3ji2xvd50101"; depends=[aws_signature httr jsonlite tuneR]; }; + aws_s3 = derive2 { name="aws.s3"; version="0.3.20"; sha256="02n4h5y792q9xr5mcv7lylv3p6nqbi754hj63c0vslx759p0yvbc"; depends=[aws_signature base64enc curl digest httr xml2]; }; aws_signature = derive2 { name="aws.signature"; version="0.5.2"; sha256="0skibgf2l6n7ql51gnlmvjyfmaqa8ijc9gywmyhvrcj9bix2pydf"; depends=[base64enc digest]; }; + aws_transcribe = derive2 { name="aws.transcribe"; version="0.1.3"; sha256="1nni1b935i2ir67lfhcj0106vzr310mk2jvln32gvzbnqxcggz7m"; depends=[aws_signature httr jsonlite]; }; + aws_translate = derive2 { name="aws.translate"; version="0.1.4"; sha256="1x6cvpfddgwywsji4ywygmqn3pwy3i1aci9lk4nsrrfkzggwcbpb"; depends=[aws_signature httr jsonlite]; }; awsMethods = derive2 { name="awsMethods"; version="1.1-1"; sha256="0hbmrcpdyg15zg4rysscsmxpxlpy0dkxx2aa63qibq7l1k14v4sh"; depends=[]; }; awsjavasdk = derive2 { name="awsjavasdk"; version="0.2.0"; sha256="1461h565il4y68g0a3k7wgn9jyb6pys8405f780ldg6g44aa7p60"; depends=[assertthat R_utils rappdirs rJava]; }; - azuremlsdk = derive2 { name="azuremlsdk"; version="0.5.7"; sha256="1r9s1avkr03hradzr66lz7xxz4s6ax8d6amxkhcnphyaykss8gh1"; depends=[DT ggplot2 htmltools plyr reticulate rstudioapi]; }; + aziztest = derive2 { name="aziztest"; version="0.1.0"; sha256="0ida4n8dxliq3i1mhjknr5zn0vglfdp4mcg1frz423vds0grzdcn"; depends=[]; }; + azuremlsdk = derive2 { name="azuremlsdk"; version="0.6.85"; sha256="16w4gispm3sk48zaw1mi0qxg3qgkpy995p6rak7liqkndqfpzh7s"; depends=[DT ggplot2 htmltools plyr reticulate rstudioapi servr shiny shinycssloaders]; }; + b3archives = derive2 { name="b3archives"; version="1.0.0"; sha256="0hhf6nj1k3xngrjfywylx0f6jsi5vsi9wns7h4c3fck76p09rrfq"; depends=[dplyr purrr xml2]; }; 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]; }; bSims = derive2 { name="bSims"; version="0.2-1"; sha256="024k9s42a9w5pmw024b15sj5ilcfpkm7lv59yimjicr9lmw246kb"; depends=[deldir intrval MASS mefa4 pbapply]; }; bWGR = derive2 { name="bWGR"; version="1.6.6"; sha256="1m5spafvl5pn0s60vaf8wz7iaibsa7laq7kp8y9xj20pp3f76hvr"; depends=[Rcpp]; }; - baRcodeR = derive2 { name="baRcodeR"; version="0.1.4"; sha256="17vf4rrw6p2b7ynxgldc7f24i8ml7h486ip2mv60gj4kz1cjzx0y"; depends=[DT miniUI qrcode rstudioapi shiny]; }; + baRcodeR = derive2 { name="baRcodeR"; version="0.1.5"; sha256="1fdywv7mvxx3q8pildsfllmw814f2p71xcwvfmplngv2vgrpzz9w"; depends=[DT miniUI qrcode rstudioapi shiny]; }; + baRulho = derive2 { name="baRulho"; version="1.0.1"; sha256="0wclqjh7pwb0hrhj04mrcchdxvi4ma56gxphgi3x04gx6n04pczg"; depends=[pbapply seewave tuneR warbleR]; }; babar = derive2 { name="babar"; version="1.0"; sha256="13j5klrcnd4dwrgdbxlvwcj56l9mzi4j9ga6jj5i04pgdc6vsfx5"; depends=[]; }; babel = derive2 { name="babel"; version="0.3-0"; sha256="1iwvx69051yhlxbcl6bypvc3mcih0q8bf3i29r3i79356hp12xqa"; depends=[edgeR]; }; babelwhale = derive2 { name="babelwhale"; version="1.0.1"; sha256="0mgkg9hji4mab3l33vvyyyc1d2q84l1zrmg63vr3b3gr0d62jcnl"; depends=[crayon dplyr dynutils processx purrr]; }; - babette = derive2 { name="babette"; version="2.1.1"; sha256="1zfc1xlaqrwbg0q9bzxbc7s1jqy2cnip1dmw9qgacxnjwxmz8hj2"; depends=[beastier beautier mauricer phangorn remotes stringr testit tracerer xml2]; }; + babette = derive2 { name="babette"; version="2.1.2"; sha256="06985zzibckrjqxfvbdxg88yv3jssbaaildjdp68zb8qk5bsds12"; depends=[beastier beautier mauricer phangorn remotes stringr testit tracerer xml2]; }; babynames = derive2 { name="babynames"; version="1.0.0"; sha256="1vchzyk5pkr0zhh1q8k9g771n45jxiislipwkgrgamv7yzr49xsp"; depends=[tibble]; }; bacistool = derive2 { name="bacistool"; version="0.9.9"; sha256="06734pi829xhfkpdhysa62x1sc0shhbdn6l9vls2cyfr30w6y6md"; depends=[rjags]; }; backShift = derive2 { name="backShift"; version="0.1.4.2"; sha256="1nj7mcdpzfzq68qg86rrys752gzw69n99yyb0jzg6r8qrgpcxj49"; depends=[clue ggplot2 igraph MASS matrixcalc mvnmle reshape2]; }; backbone = derive2 { name="backbone"; version="1.1.0"; sha256="1ggs22s5pxy0y8plnnr1mkvgcc3bvpz9a2427cw3kpp61gcsh5a8"; depends=[Matrix poibin]; }; backpipe = derive2 { name="backpipe"; version="0.2.3"; sha256="12k2cv9x8h0b002m9c8g4vj5a7chp4b8jqz377ia0diqw89dydpm"; depends=[]; }; - backports = derive2 { name="backports"; version="1.1.5"; sha256="0k19w68b2aihyj5mflw3732gkkzs78sssqdns960pdw3yfnkiv33"; depends=[]; }; + backports = derive2 { name="backports"; version="1.1.6"; sha256="170rphqq28j0pcr28g6dxv3isp436ajhyzkpri31pn0lfm3szs6h"; depends=[]; }; backtest = derive2 { name="backtest"; version="0.3-4"; sha256="1s0mf247dz2vvyf4m3sp9xiqhv7xcs4rphyg9gdcy73060sah2ad"; depends=[lattice]; }; bacondecomp = derive2 { name="bacondecomp"; version="0.1.1"; sha256="1sd6pbhmx8vxz5c2cvvadbjy7p15y91gzs3n0ish7h5br1vq8fpm"; depends=[]; }; bacr = derive2 { name="bacr"; version="1.0.1"; sha256="14zr1v4rihx0ra3x0vsb81vsz0g8gzskkdxkg7nhiz835hp2fiy8"; depends=[MCMCpack]; }; @@ -5295,27 +5324,30 @@ in with self; { badger = derive2 { name="badger"; version="0.0.7"; sha256="1djgzn6ixfsdr0v4f3714mv2z2kl776dd2hq670g7bla4lp6344s"; depends=[desc dlstats rvcheck]; }; bagRboostR = derive2 { name="bagRboostR"; version="0.0.2"; sha256="1k9w98p3ad3myzyqhcrc4rsn7196qvhnmk5ddx3fpd1rdvy2dnby"; depends=[randomForest]; }; baggedcv = derive2 { name="baggedcv"; version="1.0"; sha256="1rqs4sm6g1anck5s2dxlm1vcmylpphcbs2dpvf1sjki5lrzdq9z4"; depends=[doParallel foreach kedd mclust]; }; - baggr = derive2 { name="baggr"; version="0.3.0"; sha256="084w2a5y0d060hihl5n88ai4pbg312g6y5lapy4kb2qcjd7i9zg1"; depends=[bayesplot BH crayon forestplot ggplot2 gridExtra Rcpp RcppEigen rstan rstantools StanHeaders testthat]; }; - bain = derive2 { name="bain"; version="0.2.3"; sha256="0n5z9sdvjbx1xagxyvyiqdwyxrlkfd2vjnrzhlshamr4xh0csa48"; depends=[lavaan]; }; + baggr = derive2 { name="baggr"; version="0.4.0"; sha256="1cbajifb4gavamj46zs9vk6ihhg6wnv2hn75452bdc2mc4ingn5n"; depends=[bayesplot BH crayon forestplot ggplot2 gridExtra Rcpp RcppEigen rstan rstantools StanHeaders testthat]; }; + bahc = derive2 { name="bahc"; version="0.1.0"; sha256="1i5s3qjwwsm94vplkifv72kql8wgiwsc7n1d0707rva92iyv7rcy"; depends=[fastcluster matrixStats]; }; + bain = derive2 { name="bain"; version="0.2.4"; sha256="15car9j11s0ywss13g5swf1dxjjc91xmbkvx200mivca9bj6245m"; depends=[lavaan]; }; bairt = derive2 { name="bairt"; version="0.1.2"; sha256="17nc0lp0bzwshik33v0gq5d6nd2gvm4799b7rfiq089zhnzv90kj"; depends=[coda mvtnorm shiny shinyjs]; }; baitmet = derive2 { name="baitmet"; version="1.0.1"; sha256="02ydakqr8v41hdnhcsgigwnic8d48qswryg1srb5w1fqdmdglnkl"; depends=[erah HiClimR Rcpp signal XML]; }; balance = derive2 { name="balance"; version="0.2.4"; sha256="13ksd1ysd2by8qdc3vn1fgnaj1c2v0py7f501bajiyq6hpcwn1c5"; depends=[ggplot2]; }; ballr = derive2 { name="ballr"; version="0.2.6"; sha256="0434b7hr5lcz2f7mdfkkmvh407ypyycki0bjda6lgiy0pr22hwsc"; depends=[dplyr janitor lubridate magrittr rlang rvest xml2]; }; bama = derive2 { name="bama"; version="0.9.1"; sha256="1yx0gv5qxq3si5vzrrjy8y6d3b0v433aljyniyx9dp6q6mcqrhvw"; depends=[Rcpp RcppArmadillo]; }; - bamboo = derive2 { name="bamboo"; version="0.9.24"; sha256="1fw1wniba0kxb44d2w9r9nh5sy1jhrk48bn0zblz2y6gvwn8m2vn"; depends=[rscala]; }; + bamboo = derive2 { name="bamboo"; version="0.9.25"; sha256="1il8sn8ck36b1m9hazhf6gmr58iqi2hjn0rrpcv1laij0lybrcws"; depends=[rscala]; }; bamdit = derive2 { name="bamdit"; version="3.3.2"; sha256="11v9hy8ijbcqhwim0s3y69dz11jvys4vjvfnshj4p5qdz38sji6l"; depends=[ggExtra ggplot2 gridExtra MASS R2jags rjags]; }; - bamlss = derive2 { name="bamlss"; version="1.1-1"; sha256="06i0yfmq5k98yqs8mfw3ppkanlp34v18fb1xynxaxwgj9d58h5k3"; depends=[coda colorspace Formula Matrix MBA mgcv mvtnorm sp survival]; }; + bamlss = derive2 { name="bamlss"; version="1.1-2"; sha256="0s0i2qpwcshfqxciwp5w7mxvw0a1x52y4yaspvf1gx9jms7bqn8b"; depends=[coda colorspace Formula Matrix MBA mgcv mvtnorm raster sp survival]; }; bamp = derive2 { name="bamp"; version="2.0.8"; sha256="0p7vi9gqplqnrc0vl55m1xx160k5kdxs4sxqxyrg908yhsnr5vj6"; depends=[abind coda]; }; banR = derive2 { name="banR"; version="0.2.1"; sha256="0bqy8srxsd0r872scpij8lyrvb0n8jicwpvf9wh1xk1bjmlq3vb5"; depends=[dplyr httr magrittr purrr readr rlang tibble]; }; bandit = derive2 { name="bandit"; version="0.5.0"; sha256="03mv4vbn9g4mqikd9map33gmw2fl9xvb62p7gpxs1240w5r4w3fp"; depends=[boot gam]; }; - bang = derive2 { name="bang"; version="1.0.0"; sha256="16wy2imrdvhpdzi6ix9k69afqdyc44d1xr655yd3q1cl12x1nr04"; depends=[bayesplot rust]; }; + bang = derive2 { name="bang"; version="1.0.1"; sha256="0m7p9gzspkyp40ir842ff4b1827w9rh7x49kpp3y4dpi83krqy5a"; depends=[bayesplot rust]; }; bannerCommenter = derive2 { name="bannerCommenter"; version="0.1.1"; sha256="0ndm4z6gkd9flxsh1sx08c5ahm8297hzn8f5hc1mpn5m998ajjsj"; depends=[]; }; banter = derive2 { name="banter"; version="0.9.3"; sha256="1ziys0zy66477ynr8rp2kv7w82n6226whn47aa06kkb4nhcqfk2c"; depends=[dplyr ggplot2 gridExtra magrittr plyr randomForest ranger rfPermute rlang tibble tidyr]; }; 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]; }; barplot3d = derive2 { name="barplot3d"; version="1.0.1"; sha256="182kpiknv3id1bsgcc6b3ahbxmm8x3lxcpf1r6rckpr3s0whfx3g"; depends=[rgl]; }; - barsurf = derive2 { name="barsurf"; version="0.3.1"; sha256="07s43sy5200mwxasmcar4lsw7bm1112ck7z62rbyxnawg1zmrwq5"; depends=[colorspace]; }; + barsurf = derive2 { name="barsurf"; version="0.4.0"; sha256="1n8kwzawdgbazd4cshavlki1di5xfczgfpd7vv2rrb8cmwlsnw61"; depends=[colorspace kubik]; }; + bartBMA = derive2 { name="bartBMA"; version="1.0"; sha256="15syk5a3lgzfyp17wk8mk14317yxsr47br26kyah5jg3dq4cyqdg"; depends=[BH mvnfast Rcpp RcppArmadillo Rdpack]; }; + bartCause = derive2 { name="bartCause"; version="1.0-2"; sha256="1cg5z9hn78zmymls7dpqpg439mfvh6np3gj7qwb9y682va4ky34h"; depends=[dbarts]; }; 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]; }; @@ -5324,38 +5356,38 @@ in with self; { base64enc = derive2 { name="base64enc"; version="0.1-3"; sha256="13b89fhg1nx7zds82a0biz847ixphg9byf5zl2cw9kab6s56v1bd"; depends=[]; }; base64url = derive2 { name="base64url"; version="1.4"; sha256="0n1c2b68vza1dh7sk38v6biiwm72c4jpl79kpdg1bsb0hq9qy18x"; depends=[backports]; }; baseballDBR = derive2 { name="baseballDBR"; version="0.1.2"; sha256="0w54g1avcqamc12lmvjchlqbqck9jfjccm441k03nsql460mpydq"; depends=[dplyr magrittr rvest xml2]; }; - baseflow = derive2 { name="baseflow"; version="0.11.2"; sha256="10y73s22xmrzvm697vdmnr7zal83jrxy4ifvskyhdqzsljj53p3j"; depends=[airGR]; }; - basefun = derive2 { name="basefun"; version="1.0-6"; sha256="08ys5iqzbf95pimgaj1g2q7lwhxj73jc737ap55358h75dx0nzdx"; depends=[Matrix orthopolynom polynom variables]; }; - baseline = derive2 { name="baseline"; version="1.2-2"; sha256="044m1znvz2c6h0z7x4zkqxld2l138kpv2pirbiz41pk72gvzv50v"; depends=[SparseM]; }; + baseflow = derive2 { name="baseflow"; version="0.12.0"; sha256="0zz7clrqifxk0igvqr38ic8sif86nli8gp8np8nfx89md2zz1njk"; depends=[airGR]; }; + basefun = derive2 { name="basefun"; version="1.0-7"; sha256="1g72g77yzf6ji4aglm4hpaqbz5ma2d6y93g7r17066iwyzl0ygn3"; depends=[Matrix orthopolynom polynom variables]; }; + baseline = derive2 { name="baseline"; version="1.2-3"; sha256="1d8k5py3wn82nm9pnsnh9ylbdkmkm3j938cdil3igwd3qzkjp63b"; depends=[limSolve SparseM]; }; basetheme = derive2 { name="basetheme"; version="0.1.2"; sha256="0yck4qc7qd406s7kw95xgnfc0pfvzk3ylhkv6mk6l2wbkfm8ldrb"; depends=[]; }; - basicMCMCplots = derive2 { name="basicMCMCplots"; version="0.2.4"; sha256="03mggvdasqrkq41dpfwsrhnxh98hfqfr3z58hrfhnjrzydwxbci9"; depends=[]; }; + basicMCMCplots = derive2 { name="basicMCMCplots"; version="0.2.5"; sha256="0sdvhm7n9n67gwymv7whk6f6lfgp74gczisqw90096la566ndd2f"; depends=[]; }; basicTrendline = derive2 { name="basicTrendline"; version="2.0.3"; sha256="10rq9hriyn50b28ikvl0vsvchbkrc0pjzxamq4ix1xd04n4drkl9"; depends=[investr scales]; }; basicspace = derive2 { name="basicspace"; version="0.24"; sha256="1cy226njbax7dcgql89fns4l4w9fq328x3h0vb93l5jk883jgi8h"; depends=[]; }; - basictabler = derive2 { name="basictabler"; version="0.3.0"; sha256="1dzjdgc8ffnr219m5zb410ln1rbnzz96g1aqb70pkg9gp0ykgk29"; depends=[dplyr htmltools htmlwidgets jsonlite R6]; }; - basket = derive2 { name="basket"; version="0.9.10"; sha256="1773f0abhz854sdb0jfhmfpgxpkagb3x6mzi77jycfl6ywhry48h"; depends=[cli crayon dplyr foreach GenSA ggplot2 gridExtra igraph itertools RColorBrewer tibble tidyr]; }; + basictabler = derive2 { name="basictabler"; version="0.3.1"; sha256="1yrrg0mgxfqrn068ggx7b5xqj8wccigb5x6aya2hw3b035cbfprs"; depends=[dplyr htmltools htmlwidgets jsonlite R6]; }; + basket = derive2 { name="basket"; version="0.10.1"; sha256="1hwcfm7hgi6khqkw643n5i40pmr55117b6fh5als91r60k966w2m"; depends=[cli crayon dplyr foreach GenSA ggplot2 ggraph gridExtra igraph itertools RColorBrewer rlang tibble tidygraph tidyr]; }; 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=[]; }; batchmeans = derive2 { name="batchmeans"; version="1.0-3"; sha256="1qkdljngvlahk0pbrkarkjh2g4sxxwiva9f3m5y8gz8pjw9fpy9n"; depends=[]; }; batchscr = derive2 { name="batchscr"; version="0.1.0"; sha256="094l2cq7lcdrlsdmsxmbal7srxdg20rxbms46h1sd414wq26d413"; depends=[]; }; - batchtools = derive2 { name="batchtools"; version="0.9.12"; sha256="16x524hvy9d8p7r4fi1c8mixcvzgsjbf3y0vxaa56ssbbab4p7f9"; depends=[backports base64url brew checkmate data_table digest fs progress R6 rappdirs stringi withr]; }; + batchtools = derive2 { name="batchtools"; version="0.9.13"; sha256="02bwfinwgn5nl638997javig61jmr0ci0qybmprz13jnvmam1yns"; depends=[backports base64url brew checkmate data_table digest fs progress R6 rappdirs stringi withr]; }; batman = derive2 { name="batman"; version="0.1.0"; sha256="0ccgx506p4iri23k2ikb8jmh04dp08w66785bv52iy8kd359h43f"; depends=[Rcpp]; }; batteryreduction = derive2 { name="batteryreduction"; version="0.1.1"; sha256="0j838q7063bplkzd50kmnxji80cgysfsq7m1qifv8z7a2zsh8c8g"; depends=[pracma]; }; - baycn = derive2 { name="baycn"; version="1.0.0"; sha256="1wjm7isdvb4z5lyhix849sxzngbmk8ccdvc8qgjgdcfmnx15binq"; depends=[egg ggplot2 MASS]; }; - bayes4psy = derive2 { name="bayes4psy"; version="1.2.0"; sha256="0dv285nq44a971hyha8rkynac3gaq78pp5bicmznxds53lhnw2ji"; depends=[BH circular cowplot dplyr emg ggplot2 mcmcse metRology Rcpp RcppEigen reshape rstan rstantools StanHeaders]; }; + baycn = derive2 { name="baycn"; version="1.1.0"; sha256="1nimy9vc1i9an9992wwdr0qq8zi9363rjiv5ci81wliys1qlggaq"; depends=[egg ggplot2 gtools MASS]; }; + bayes4psy = derive2 { name="bayes4psy"; version="1.2.3"; sha256="0f8rlivqc36x15c16dybpqgankhc73gcn206yhnr7nyb896nfnl0"; depends=[BH circular cowplot dplyr emg ggplot2 mcmcse metRology Rcpp RcppEigen reshape rstan rstantools StanHeaders]; }; bayesAB = derive2 { name="bayesAB"; version="1.1.2"; sha256="0xg29s3h4dy43snlc365q80ix96hwh4mfy1qvv87yys3i9zfinm5"; depends=[ggplot2 Rcpp rlang]; }; - bayesCL = derive2 { name="bayesCL"; version="0.0.1"; sha256="1l278lxidn16nma2ny14wjajcqyzbr6j5xl2lj08cic26c7hvjbm"; depends=[]; }; - bayesDccGarch = derive2 { name="bayesDccGarch"; version="2.0"; sha256="1s2b8f43wi9ja966n2p2r4l4s79vk6xb8mqaxsagnw90g969p681"; depends=[coda numDeriv]; }; + bayesCT = derive2 { name="bayesCT"; version="0.99.2"; sha256="11y22xg7f47vj47pd5z44g20ff2jjn67s39win0qngl69ii1ph98"; depends=[bayesDP dplyr magrittr msm purrr survival]; }; + bayesDP = derive2 { name="bayesDP"; version="1.3.3"; sha256="0g2kw8rsa9s5ahvsr4j363nqs4s49pmbaxgsqrlg8nizjsmj8p49"; depends=[ggplot2 MCMCpack Rcpp RcppArmadillo survival]; }; bayesDem = derive2 { name="bayesDem"; version="2.5-1"; sha256="1cxrqil1p692mbzkcj1fvsx335qyy6c1y43mq48s4shs1hhc69bn"; depends=[bayesLife bayesPop bayesTFR gWidgets gWidgetsRGtk2 RGtk2 wpp2015]; }; bayesGARCH = derive2 { name="bayesGARCH"; version="2.1.3"; sha256="1480mmzfshchfbfh3x420cq5qblfh59jkl21hkq2jvnwppksdn9w"; depends=[coda mvtnorm]; }; bayesImageS = derive2 { name="bayesImageS"; version="0.6-0"; sha256="1m0az3z8hwaxpqd1ljly9vlp41dp7c7p39r0rx7k9vcs201vlcg8"; depends=[Rcpp RcppArmadillo]; }; bayesLife = derive2 { name="bayesLife"; version="4.1-0"; sha256="1sswnwv4x77sd07d3hpsf3wfd5szrdnc4fni8glzl8rk3y0r3jns"; depends=[bayesTFR car coda data_table hett wpp2019]; }; bayesPop = derive2 { name="bayesPop"; version="8.1-1"; sha256="1xhzind6k23rcgy1iw0bqks6wz77755qs9pw6sqinfi8qbv0ax1l"; depends=[abind bayesLife bayesTFR data_table fields googleVis MortCast plyr reshape2 rworldmap wpp2012 wpp2019]; }; bayesQR = derive2 { name="bayesQR"; version="2.3"; sha256="1c6y7r9h9626ghp68pl5k1g0l95fwd6dp0jfznmhy53qza0ny8z4"; depends=[]; }; - bayesSurv = derive2 { name="bayesSurv"; version="3.2"; sha256="1zp302pfi64nnqdiqldvfi1lm0wv2dplz5sfjp0ydl1qc16z0axp"; depends=[coda smoothSurv survival]; }; + bayesSurv = derive2 { name="bayesSurv"; version="3.3"; sha256="00brysldz0zbjbjs0qnd2mbpc3ipyz7224bnbwlf8d3b6ivw8iwv"; depends=[coda smoothSurv survival]; }; bayesTFR = derive2 { name="bayesTFR"; version="6.4-0"; sha256="159lcii3hpl91vypl16adzair6ik85fyjybyy6fjibxvjkn3fh3b"; depends=[coda MASS mvtnorm wpp2019]; }; bayesammi = derive2 { name="bayesammi"; version="0.1.0"; sha256="1vfcmk47x71c5akj3ppxzb74293pikspknkkv08f8p15v0chk7fs"; depends=[dplyr ggplot2 lme4 magrittr MASS mvtnorm rlang rstiefel scales tibble tidyr tmvtnorm]; }; - bayesanova = derive2 { name="bayesanova"; version="1.2"; sha256="1qn3bjy2k12xg67xrlscrl6nql2g0v3i3r5c0349xpq1ya2kaiya"; depends=[]; }; + bayesanova = derive2 { name="bayesanova"; version="1.3"; sha256="11ask03l4s0459bbd968686hsbzgmm5qjwjwb9nqvfaqhwmjl0z2"; depends=[]; }; bayesbio = derive2 { name="bayesbio"; version="1.0.0"; sha256="08qa4lzkrcwin7n3kzfqfdlnlqahdmjl1lxpdh29n780cgyjfvs0"; depends=[]; }; bayesboot = derive2 { name="bayesboot"; version="0.2.2"; sha256="0976ryd0gbw3kpmxg2qxyp1m2swnrpa86vdhvqrqxp7fcrs8cs2z"; depends=[HDInterval plyr]; }; bayescount = derive2 { name="bayescount"; version="0.9.99-5"; sha256="0c2b54768wn72mk297va3k244256xlsis9cd6zn6q5n1l7ispj6j"; depends=[coda rjags runjags]; }; @@ -5373,28 +5405,30 @@ in with self; { bayesreg = derive2 { name="bayesreg"; version="1.1"; sha256="12g5sklip3i8fpzrhvbikhgnl6kx8fxb88hfv8f34jy71r3h7zyp"; depends=[pgdraw]; }; bayess = derive2 { name="bayess"; version="1.4"; sha256="0axipk5hn2hw3g4dfh7y3xa0dxqmi8kqpbr77nl14y7ydpija6xm"; depends=[combinat gplots MASS mnormt]; }; bayest = derive2 { name="bayest"; version="1.1"; sha256="0nl3zq5bp6yqw351vcrzph5y0jn9bml7isf4nsxl7braivalf72n"; depends=[]; }; - bayestestR = derive2 { name="bayestestR"; version="0.5.0"; sha256="172ilq2h8gkn6ggxafvkjq7bgjs2rymm15w5b4ql7i8cv41cdll2"; depends=[insight]; }; + bayestestR = derive2 { name="bayestestR"; version="0.5.3"; sha256="1q24qh5p6bz4nbf4546kckh7d518x5pm1yhhbc8fwcnbca4kgqjz"; depends=[insight]; }; bayesvl = derive2 { name="bayesvl"; version="0.8.5"; sha256="1gb2in8hjiqb3daqz6phn1639i6p2w641kxrm3zh4rm3d6hg6hzr"; depends=[bayesplot bnlearn coda dplyr ggplot2 reshape2 rstan StanHeaders viridis]; }; bayfoxr = derive2 { name="bayfoxr"; version="0.0.1"; sha256="1295296mbjpmd0bg1pfxvyp0az3sry6gsq9ir3l8x64w5a4qrzd5"; depends=[]; }; baymedr = derive2 { name="baymedr"; version="0.1.0"; sha256="0y01s6dpnhnxqqvl15cdxmb5ysb685bbp47xifyp5nz8sjh2pci0"; depends=[rlang stringr]; }; - 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.1.0"; sha256="0yml560cbamp7pf433va28vsfi5rcrjm61rbk8384bbjlslpsdkj"; depends=[dataRetrieval digest gdata lubridate memoise mgcv plyr survival XML zCompositions]; }; + baytrends = derive2 { name="baytrends"; version="1.2.1"; sha256="05vd748wp72dnlc5p1higwlvxpyk2pq2xhcl2i58fy3pky2bxsg5"; 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]; }; - bbl = derive2 { name="bbl"; version="0.3.0"; sha256="0vlmdxhq9vgyff6sab6i90rq54z09kqdckysmhfcdr05zfwgcd5l"; depends=[pROC RColorBrewer Rcpp]; }; - bbmle = derive2 { name="bbmle"; version="1.0.22"; sha256="1idn55w5f3iw4r0ydyww8xyinninw07sxlwfqb565vmdrs87dwl4"; depends=[bdsmatrix lattice MASS Matrix mvtnorm numDeriv]; }; + bbl = derive2 { name="bbl"; version="0.3.1"; sha256="1a6f5744xwn28qkqxlc5q7crarlx0jjg4z7wpp7jwr6ar152apvm"; depends=[pROC RColorBrewer Rcpp]; }; + bbmle = derive2 { name="bbmle"; version="1.0.23.1"; sha256="0p3l9shbr2846qmw8n0fyzf4j7gmi08aypl82jml3dwh26q1whk0"; depends=[bdsmatrix lattice MASS Matrix mvtnorm numDeriv]; }; bbo = derive2 { name="bbo"; version="0.2"; sha256="19xrbla3bb3csg3gjjrpkgyr379zfwyh293bcrcd6j8rnm6g4i01"; depends=[]; }; + bbreg = derive2 { name="bbreg"; version="1.0.0"; sha256="1v2m7ky9kd16psm9w8njfjzkwc4prvyq0fgbl6i210pjwwv9zvhr"; depends=[betareg expint Formula statmod]; }; + bbricks = derive2 { name="bbricks"; version="0.1.1"; sha256="0y5d01sr9351skvj5xqpiirz3yl3l0sdcmgbz2gb0wfffdqzkllc"; depends=[]; }; bbw = derive2 { name="bbw"; version="0.1.3"; sha256="1z3an561qh0rfi3jhh1ghsdbg8aimqmf4hpqri2jz39in3p0gwg4"; depends=[car]; }; bc3net = derive2 { name="bc3net"; version="1.0.4"; sha256="15dghd0v1s71h77iw8b49v5h7wcda5mb4540lfyibsdipbashv2h"; depends=[c3net igraph infotheo lattice Matrix]; }; - bcROCsurface = derive2 { name="bcROCsurface"; version="1.0-3"; sha256="1g9l4abnpp1iq5wy3rl2jv47ql9zh6s2qrhyj06x22358lpinjnl"; depends=[boot nnet Rcpp RcppArmadillo rgl]; }; + bcROCsurface = derive2 { name="bcROCsurface"; version="1.0-4"; sha256="0bhwwr9pa78a8lhjz2cfbm09jq585p89l6dr2ihpil4q5r8cmsjr"; depends=[boot nnet Rcpp RcppArmadillo rgl]; }; bcRep = derive2 { name="bcRep"; version="1.3.6"; sha256="1fibx11ykkkjv4sgg6zc2a0g270384z2cf68hwghnld0wi002b5z"; depends=[ape doParallel foreach gplots ineq plotrix proxy stringdist vegan]; }; bcaboot = derive2 { name="bcaboot"; version="0.2-1"; sha256="0wf1igkb0lidz4pvh3kfccs9858m1g9650wprrvrpwsdfrcd7rc9"; depends=[]; }; bcdata = derive2 { name="bcdata"; version="0.1.2"; sha256="0h5mrcpq64d2i9q6m5n8bq4g06zfyyscllwg6k1zm22vsw1yi1ki"; depends=[cli crul dbplyr dplyr glue jsonlite leaflet leaflet_extras purrr readr readxl rlang sf tidyselect xml2]; }; bcf = derive2 { name="bcf"; version="1.3"; sha256="1f8szjgsyhnff3zzmmy7bnsam12ywj46n3fxsj1y3fn1m5wnd8mz"; depends=[Rcpp RcppArmadillo]; }; bcgam = derive2 { name="bcgam"; version="1.0"; sha256="1dg2fcjw8xal77irviiz260qpar2iqkjvi2k4qfm71jyq0ir0axk"; depends=[coda igraph nimble]; }; bcmaps = derive2 { name="bcmaps"; version="0.18.0"; sha256="0zq5fp9r6n2mpjd96ri7lmp63g8lm5sjwgfmc4cligrch3kakzxy"; depends=[httr rappdirs sf]; }; + bcmixed = derive2 { name="bcmixed"; version="0.1.4"; sha256="0am6amk1axfxkxgp9nmfys4fp4snplfncwkzh02im7a6zr3v1m63"; depends=[MASS nlme]; }; bcp = derive2 { name="bcp"; version="4.0.3"; sha256="0vhs89lb2wpanqsljclpvwbjmgdsc3jicws8bzqiqh8mbs3nzpxy"; depends=[Rcpp RcppArmadillo]; }; bcpa = derive2 { name="bcpa"; version="1.1"; sha256="0rwbd39szp0ar9nli2rswhjiwil31zgl7lnwm9phd0qjv8q0ppar"; depends=[plyr Rcpp]; }; bcpmeta = derive2 { name="bcpmeta"; version="1.0"; sha256="02fw1qz9cvr7pvmcng7qg7p04wxxpmvb2s8p78f52w4bf694iqhl"; depends=[mvtnorm]; }; @@ -5402,11 +5436,13 @@ in with self; { bcrypt = derive2 { name="bcrypt"; version="1.1"; sha256="1wwdin8x09y8n8zrwj1ylh5ikcz0v0la4wmrsvbdr61cg336wzx4"; depends=[openssl]; }; bcv = derive2 { name="bcv"; version="1.0.1"; sha256="0yqcfariw9sw0b8cpljcr7vf5rf0cwr1wbif23icchfaxk2m42gj"; depends=[]; }; bdDwC = derive2 { name="bdDwC"; version="0.1.15"; sha256="0yraq8a0wgz12rzi2dx0gdcz5rx99qd2pzw972wjqyq3rs41pwx0"; depends=[shiny shinyBS shinydashboard shinyFiles shinyjs]; }; + bda = derive2 { name="bda"; version="14.3.19"; sha256="0x2aw5lb32f4i1g1ls68rf92356vvmsr1rxps7laaiqh5xjzvqv2"; depends=[]; }; bdchecks = derive2 { name="bdchecks"; version="0.1.7"; sha256="1pzsvn1m1f9bdmhxmh57pvn9jm4z41rkvv6h60hq2lfgkapnjy7q"; depends=[bdDwC data_table DT finch knitr rgbif shiny shinyBS shinydashboard shinyjs spocc yaml]; }; bdclean = derive2 { name="bdclean"; version="0.1.15"; sha256="14cy8yaqd6bg2zyh2wvndydk9sigaydavxl4cfypqz5kqdhj82z9"; depends=[bdchecks bdDwC data_table DT finch knitr leaflet rgbif rmarkdown shiny shinydashboard shinyjs spocc]; }; bde = derive2 { name="bde"; version="1.0.1"; sha256="1f25gmjfl58x4pns89abfk85yq5aad3bgq9yqpv505g5gxk62d3v"; depends=[ggplot2 shiny]; }; + bdl = derive2 { name="bdl"; version="1.0.2"; sha256="0zkfpv540cadl8vsy6n85120jmmbla78kmx2k6ifglwx7i7m5ps7"; depends=[dplyr ggplot2 ggpubr httr jsonlite magrittr purrr randomcoloR sf tibble tidyr tmap tmaptools]; }; bdots = derive2 { name="bdots"; version="0.1.19"; sha256="1cj6ly62d50z6713119hadl90cxf5x30wpnpx6mssmd49zds6nxb"; depends=[doParallel doRNG foreach Matrix mvtnorm nlme]; }; - bdpar = derive2 { name="bdpar"; version="1.0.1"; sha256="1i0xhw0nqdpmmddvfp4scf3wgld7ng2pcw8685grv5vxrlgc308p"; depends=[ini magrittr pipeR purrr R6 rlist svMisc]; }; + bdpar = derive2 { name="bdpar"; version="2.0.0"; sha256="0vn53pzr8j3jdl03jzcyjgf0n486l472jm3mm92df3219733l2wi"; depends=[magrittr pipeR purrr R6 rlist]; }; bdpopt = derive2 { name="bdpopt"; version="1.0-1"; sha256="1z7mdqklw3frsdzyhvx8s8wvblwm28fr1gca2yrivqjng0r47lx4"; depends=[coda rjags]; }; bdpv = derive2 { name="bdpv"; version="1.3"; sha256="0wcnmamqrbqwskgv2yhnxq2kb179n63c825y9hsl20rfca0ijh6m"; depends=[]; }; bdribs = derive2 { name="bdribs"; version="1.0.4"; sha256="19qakmdw3l8vfxkr4p1ydkyfs4cmq37lqzw7l5zx5rdn6zlhqwh4"; depends=[rjags]; }; @@ -5417,75 +5453,75 @@ in with self; { bea_R = derive2 { name="bea.R"; version="1.0.6"; sha256="15pdbwz7av8862bl144n998qk0w9rqwip9m2brdm5hj7id5xdlif"; depends=[chron colorspace data_table DT ggplot2 googleVis gtable htmltools htmlwidgets httpuv httr jsonlite magrittr munsell plyr Rcpp scales shiny shinydashboard stringi stringr xtable yaml]; }; beadarrayFilter = derive2 { name="beadarrayFilter"; version="1.1.0"; sha256="044dq5irc00v2f2gjz0vb69w7q7b84lppc55ganabdv4f0dxdblc"; depends=[beadarray RColorBrewer]; }; beadarrayMSV = derive2 { name="beadarrayMSV"; version="1.1.0"; sha256="0785vmjsli37hjyppk7hlqmn0b683s1apysx9dghbw4h6rgvr8n9"; depends=[Biobase geneplotter limma rggobi]; }; - beadplexr = derive2 { name="beadplexr"; version="0.2.0"; sha256="0ci19jai28hizcfdgj3a69vw20yk25xg6vp6fk1xhkkp0hh9wnd2"; depends=[cluster dplyr drc flowCore fpc ggplot2 lazyeval magrittr mclust purrr raster tibble tidyr yaml]; }; - beam = derive2 { name="beam"; version="2.0.0"; sha256="1b61cabaw3pixzmzsrxh4mnbdrnxfd7ffyibn3kgk1dr0sc9d1da"; depends=[assertthat BH fdrtool igraph knitr Matrix Rcpp RcppArmadillo]; }; + beadplexr = derive2 { name="beadplexr"; version="0.4.0"; sha256="0y5xrs88zm2bp2dlz8bndldispyj6ipgjr7vzrfl26yd2p7qjqd0"; depends=[cluster dplyr drc fpc ggplot2 magrittr mclust purrr raster rlang tibble tidyr yaml]; }; + beakr = derive2 { name="beakr"; version="0.3.1"; sha256="1mir7scqwmsqs6hhi0xramdxk75x7zs4ppwrgc688y8j7dgg01ys"; depends=[base64enc httpuv jsonlite magrittr mime R6 stringr webutils]; }; + beam = derive2 { name="beam"; version="2.0.1"; sha256="0z95d5kjfv6byk8j5smkn74kgcircav739jrawmx161lxvznf49i"; depends=[assertthat BH fdrtool igraph knitr Matrix Rcpp RcppArmadillo]; }; beanplot = derive2 { name="beanplot"; version="1.2"; sha256="0wmkr704fl8kdxkjwmaxw2a2h5dwzfgsgpncnk2p2wd4768jknj9"; depends=[]; }; beanz = derive2 { name="beanz"; version="2.4"; sha256="18i4ygz83l60fdfkl4yg9kp5n2vmqn6yd7qkpkiplq0mzg5s4nk9"; depends=[BH loo Rcpp RcppEigen rstan rstantools StanHeaders survival]; }; beast = derive2 { name="beast"; version="1.1"; sha256="0ikbnzdzp2lv1nh5mxxanra81v4dl6svg3ywqcqd6wgzri70a4ry"; depends=[RColorBrewer]; }; beastier = derive2 { name="beastier"; version="2.1.1"; sha256="17qzjk4lq83khj5f04jhkr3q2w7snv4aq4zrbnsziszwnlazyqqy"; depends=[ape assertive beautier phangorn rappdirs remotes rJava stringr xml2]; }; - beautier = derive2 { name="beautier"; version="2.3.2"; sha256="0wwlv1z030mi2q895z9m9xpkfq348ka3ljyiaddzp9niappszpcj"; depends=[ape assertive geiger rappdirs seqinr stringr testit]; }; + beats = derive2 { name="beats"; version="0.1.1"; sha256="1vg8h2lyn61lii346pf3b5vwxf5cfswmi4b5mmimvgx1ix2i6sxb"; depends=[dplyr ggplot2 lubridate purrr readr shiny zoo]; }; + beautier = derive2 { name="beautier"; version="2.3.5"; sha256="12yiq8z95w69gch9kd15p8vvwx8i2q6gpgix5ih2h6x5g4gzl72a"; depends=[ape assertive pryr rappdirs seqinr stringr testit]; }; bedr = derive2 { name="bedr"; version="1.0.7"; sha256="0zpqvyjgwyqawxm8qrhcv8zq2b3yxgcqkkc87br29yrl7sjb8h6j"; depends=[data_table R_utils testthat VennDiagram yaml]; }; beepr = derive2 { name="beepr"; version="1.3"; sha256="061sfld23b516jws4llml0a4jsdk4z74rll4z58l2rvahkqsdrfp"; depends=[audio stringr]; }; beeswarm = derive2 { name="beeswarm"; version="0.2.3"; sha256="0hy89bwv7jixlg91li1fywa77916am2whqp1m1fx1khd45g44581"; depends=[]; }; beezdemand = derive2 { name="beezdemand"; version="0.1.0"; sha256="1i6p36cfvz87k6llpibklmdbjb7vp1v38ijxaqkmv1jzc28sj3cl"; depends=[ggplot2 nlmrt nls2 nlstools reshape2]; }; beginr = derive2 { name="beginr"; version="0.1.7"; sha256="1a1lzjmq0qimm8yrb4n6knh23gyqxgax60n95rih95sg34904d0m"; depends=[cranlogs]; }; - behaviorchange = derive2 { name="behaviorchange"; version="0.2.1"; sha256="12dakzc3k85na3wvnwisynpzy4i2vw2i2amkrf4lf6rahn0rkfs1"; depends=[BiasedUrn data_tree DiagrammeR DiagrammeRsvg ggplot2 googlesheets gridExtra gtable magrittr ufs viridis]; }; + behaviorchange = derive2 { name="behaviorchange"; version="0.2.2"; sha256="1xqvlybfmgpr0dg0ys6yjshlghgph6zg81d3bbx8cpbxdysm8lkl"; depends=[BiasedUrn data_tree DiagrammeR DiagrammeRsvg ggplot2 googlesheets gridExtra gtable magrittr png ufs viridis yum]; }; behavr = derive2 { name="behavr"; version="0.3.2"; sha256="01ny099m2zmvlalwiq3nqkgynnxn1mdspch15lkawwd40q8s9s4p"; depends=[data_table]; }; belex = derive2 { name="belex"; version="0.1.0"; sha256="1563yngc1lvncmx3h6kgsj1r6k3hvxidh6h9rb7apxs2rq5k32ms"; depends=[XML]; }; - belg = derive2 { name="belg"; version="1.0.1"; sha256="162f3rayxz05qzfbry4x98aissyd8gzcp7aa1x59q0vl8jd5dcid"; depends=[Rcpp RcppArmadillo]; }; + belg = derive2 { name="belg"; version="1.0.2"; sha256="0daiqhpdwbl3l4civfq9v51hdgj9vams102fcb8n4v2qj83kx1wv"; depends=[raster Rcpp RcppArmadillo]; }; bench = derive2 { name="bench"; version="1.1.1"; sha256="1ldqmf0anwgw6b9jgy5mnnjjncayc1x54pvjm6f5gqv0225ksdw3"; depends=[glue pillar profmem rlang tibble]; }; benchden = derive2 { name="benchden"; version="1.0.5"; sha256="1cwcgcm660k8rc8cpd9sfpzz66r55b4f4hcjc0hznpml35015zla"; depends=[]; }; benchmarkme = derive2 { name="benchmarkme"; version="1.0.3"; sha256="003d97rs0gb6l6hq7d4lxgdngrgb5lii6fxw2n7l50m14hib2sv2"; depends=[benchmarkmeData doParallel dplyr foreach httr Matrix tibble]; }; benchmarkmeData = derive2 { name="benchmarkmeData"; version="1.0.3"; sha256="1qiw9d93y4m2ch20hsgvf1k3r9dqf60mrdr6cc647m1qv2syjgrk"; depends=[dplyr tibble]; }; - benchr = derive2 { name="benchr"; version="0.2.3-1"; sha256="1q8g9v7zbspd2gmydwwfi3avdsnmn5ahr9iybdqsicgfch5plsf5"; depends=[Rcpp RcppProgress]; }; + benchr = derive2 { name="benchr"; version="0.2.5"; sha256="1xh1n41ll50zz3v26i8lg5f92i90rc78ywnl0rczryh621whx80n"; depends=[Rcpp RcppProgress]; }; 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-6"; sha256="1vywnc6k37gpaq7g59v3qa6619svcmnd8ri5zm5l0ila2s3ccb2c"; depends=[dplyr lazyeval readr]; }; - ber = derive2 { name="ber"; version="4.0"; sha256="0gl7rms92qpa5ksn8h3ppykmxk5lzbcs13kf2sjiy0r2535n8ydi"; depends=[MASS]; }; berryFunctions = derive2 { name="berryFunctions"; version="1.18.2"; sha256="0yicwsz6v5nffvw2wmjmc2zhcik7avz3xmj8zhb77xhaq9dazk9s"; depends=[abind]; }; - bestNormalize = derive2 { name="bestNormalize"; version="1.4.2"; sha256="0df4fspcmf8scifgy2v69qlqp7zzyicjmscmyxp1m8wzd7cwzd0q"; depends=[doParallel doRNG dplyr foreach LambertW nortest]; }; + bestNormalize = derive2 { name="bestNormalize"; version="1.4.3"; sha256="14snx2cv0bmks8lfvmvaggazak8fjch3143922lb3b1pnvcpxhg5"; depends=[doParallel doRNG dplyr foreach LambertW nortest]; }; bestSDP = derive2 { name="bestSDP"; version="0.1.2"; sha256="1rff6jij9wmlpalzilvid8jvj2pczrchx0yrg0vhy00j64zg6jzs"; depends=[dplyr DT ggplot2 readxl rlist shiny shinyBS shinydashboard shinyjs shinythemes shinyWidgets stringr tidyr]; }; - bestglm = derive2 { name="bestglm"; version="0.37.1"; sha256="13wd1jnh9d82s4qz81k78y1v47ld0csdgn9k4izca2g039jqjxmq"; depends=[glmnet grpreg lattice leaps pls]; }; + bestglm = derive2 { name="bestglm"; version="0.37.3"; sha256="1zncy958hlwyyxrp6yvq1inq6mpyrbr6cdkf8maijfirr5j8f0ya"; depends=[glmnet grpreg lattice leaps pls]; }; betaboost = derive2 { name="betaboost"; version="1.0.1"; sha256="1zdyzxl2kp2i5lkiz280wz4av9wqklbn25zmq6n4yb6a579yjfn8"; depends=[gamboostLSS mboost]; }; betacal = derive2 { name="betacal"; version="0.1.0"; sha256="19wgpgf9yhckl9qx9v24f4yh055wfalphcxwm7lg68px6ap2pxl9"; depends=[]; }; betafam = derive2 { name="betafam"; version="1.0"; sha256="1nf5509alqnr5qpva36f1wb7rdnc084p170h91jv89xvzsidqxca"; depends=[]; }; betalink = derive2 { name="betalink"; version="2.2.1"; sha256="1wskr8nh1jzcrnc8fn58lscphsvj5z9p1i1pnpfdjn60mdb09rkp"; depends=[igraph plyr stringr]; }; betapart = derive2 { name="betapart"; version="1.5.1"; sha256="0j72rfvnn0ag6vxp8nw5v68n3qblyp5gd0y8z1kchs4dbq1v288g"; depends=[ape fastmatch geometry picante rcdd]; }; - betareg = derive2 { name="betareg"; version="3.1-2"; sha256="0k9g39wgdr10rvcl8aq3vxm7vfix9cvdxd4nz4cg59vi4l82f239"; depends=[flexmix Formula lmtest modeltools sandwich]; }; - betas = derive2 { name="betas"; version="0.1.1"; sha256="1v85r6lrk21viwzam42gi42bgbwh5ibn3dpbh3aqrf3dnn1rdsyd"; depends=[robust]; }; + betaper = derive2 { name="betaper"; version="1.1-1"; sha256="0ids2k783lrrf376nfccflzp3alrq15ym484ixjcnxxz84ncmmcl"; depends=[vegan]; }; + betareg = derive2 { name="betareg"; version="3.1-3"; sha256="0ik2qydr75dwaphw35l1myi50fbkw43zmkarrw8jsj8nqmz3h6fc"; depends=[flexmix Formula lmtest modeltools sandwich]; }; betategarch = derive2 { name="betategarch"; version="3.3"; sha256="0hqvyps3lwix2fkzk18wrkhxpqhgardvib9sq1ip8gn8sn1dsi8y"; depends=[zoo]; }; bethel = derive2 { name="bethel"; version="0.2"; sha256="1zlkw672k1c5px47bpa2vk3w2906vkhvifz20h6xm7s51gmm64i0"; depends=[]; }; beyondWhittle = derive2 { name="beyondWhittle"; version="1.1.1"; sha256="1nr414wvfwycp3s9v592jd4gk5wdjfklk7ypqabx73k5fsxrcc0g"; depends=[BH forecast ltsa MASS MTS Rcpp RcppArmadillo]; }; bezier = derive2 { name="bezier"; version="1.1.2"; sha256="1vw5128v8h973xwa1fdm9cw2jvrldj87nd55lddlp3qsz3ag4br6"; depends=[]; }; bfast = derive2 { name="bfast"; version="1.5.7"; sha256="0n75minka55rxpvs3qkj0c65ydn1gc3i8lkr2gdyn1adjkl5yn01"; depends=[forecast raster sp strucchange zoo]; }; bfp = derive2 { name="bfp"; version="0.0-40"; sha256="03risiq2b7bc3gwlgpcsy1gvja6n5w1j3kw13s2wrd420hddzk4s"; depends=[Rcpp]; }; + bfsMaps = derive2 { name="bfsMaps"; version="0.9.3"; sha256="10vp4hqha25h8hwc436zpyvryjcnswcrxmmx14cy31vsdfci571s"; depends=[DescTools maptools rgdal rlang sp spdep]; }; bfsl = derive2 { name="bfsl"; version="0.1.0"; sha256="1hl53nis8bb1ffgkx91ij9vh680cpkb80y548y67y9w18iyd4aw4"; depends=[]; }; bfw = derive2 { name="bfw"; version="0.4.1"; sha256="1dwl6p70wbgippysl7vk8nv6rc78f6h5xl8fna98zv99qf0ib31c"; depends=[coda MASS runjags]; }; bgeva = derive2 { name="bgeva"; version="0.3-1"; sha256="0qm4xknyab8hdyn3in2hsvm8s062cnmqqf41b5jvax1mi5hs0z8c"; depends=[magic mgcv trust]; }; bggum = derive2 { name="bggum"; version="1.0.2"; sha256="04vr9z81awavkhk3lbi8yasmi242lrbnq0pzqp38xlrn5xkf8b1w"; depends=[Rcpp RcppDist]; }; bgmfiles = derive2 { name="bgmfiles"; version="0.0.6"; sha256="10qldfjjq5fx5jrrakdxc8k2pf0vp8ifg18nq56lvx9n28mqigim"; depends=[]; }; - bgmm = derive2 { name="bgmm"; version="1.8.3"; sha256="09hsqjjyzlpl0fqb7832j5ydrr0yc42zb1c9q1y5hbrms7yp00p8"; depends=[car combinat lattice mvtnorm]; }; + bgmm = derive2 { name="bgmm"; version="1.8.4"; sha256="1r8qd4niah18jg0lw3vqq1465likal5j7nvlgnblpidd5svn4a2n"; depends=[car combinat lattice mvtnorm]; }; bgsmtr = derive2 { name="bgsmtr"; version="0.7"; sha256="17706qims9637ppwg0vszkcm6kmvhzyrdihkgigpiv5lknhk2q3m"; depends=[CholWishart coda EDISON glmnet inline LaplacesDemon Matrix matrixcalc miscTools mnormt mvtnorm Rcpp sparseMVN statmod]; }; bhm = derive2 { name="bhm"; version="1.15"; sha256="1xfm1k3wf4k1c65pd9201c00y4qda3lw9aycjh6q34ixyl6g5jg5"; depends=[coda MASS survival]; }; - bhrcr = derive2 { name="bhrcr"; version="1.0.3"; sha256="1w52f4ghl328vdcr8hwvmdrnxnj45fy4r21yqzg5q1fpd4mpjw2i"; depends=[AER Cairo MASS MCMCpack msm mvtnorm survival]; }; + bhpm = derive2 { name="bhpm"; version="1.7"; sha256="0fhk2gmghibf7la864dzm19bm76525gzbj03vw0y0zwbv9shbpcp"; depends=[coda]; }; biasbetareg = derive2 { name="biasbetareg"; version="1.0"; sha256="1562zdin0y5mrp36ih11ir3h9cv49cx1l98chxd89fkj8x3c1fbg"; depends=[betareg]; }; bib2df = derive2 { name="bib2df"; version="1.1.1"; sha256="0d57883df774qqwpssmly3f1gci32yc5sgwc3x8f2rjih23s1nf6"; depends=[dplyr httr humaniformat stringr]; }; bibliometrix = derive2 { name="bibliometrix"; version="2.3.2"; sha256="02sikbjnsfd1gxwlbdiafp35af22gmz2p6i951l3syxpcvylxfc8"; depends=[dplyr DT factoextra FactoMineR ggplot2 ggraph ggrepel igraph Matrix networkD3 RColorBrewer reshape2 rio RISmed rscopus shiny shinycssloaders shinythemes SnowballC stringdist stringr]; }; bibtex = derive2 { name="bibtex"; version="0.4.2.2"; sha256="140hkjzdp3033cvji861rd06z1ixgpnn4n5amygqsmhnixk8ff07"; depends=[stringr]; }; - biclique = derive2 { name="biclique"; version="1.0.4"; sha256="0jflbl1fbi3v3igi447f8i2zs9vh84xk1rci6dmwm0k9s9zqfrs2"; depends=[]; }; - biclust = derive2 { name="biclust"; version="2.0.1"; sha256="1y5n6wfa1lx88ck3x09rcg0dh3pw89225h85hmq2la1s1fpa48i0"; depends=[additivityTests colorspace flexclust ggplot2 lattice MASS tidyr]; }; - biclustermd = derive2 { name="biclustermd"; version="0.2.0"; sha256="075qr8bizwf08zac87a0xhhcgf1d3qvdd29jwl79yd63vlczf38k"; depends=[biclust clues doParallel dplyr foreach ggplot2 magrittr nycflights13 tidyr]; }; + biclique = derive2 { name="biclique"; version="1.0.5"; sha256="1fdf2r1jc2x8yw0fcw7yyjdxz4b870w6y7mr68qixqxwpl6943zq"; depends=[]; }; + biclust = derive2 { name="biclust"; version="2.0.2"; sha256="1pk7mvwlg4hkc4cn4w6wr2c192qx03d1xfwlzclk5bw1nmcg483b"; depends=[additivityTests colorspace flexclust ggplot2 lattice MASS tidyr]; }; + biclustermd = derive2 { name="biclustermd"; version="0.2.1"; sha256="0raszh41yag08icxm1g2jbsg4xxkxmc8kn7viz0ns08w3snpvr2v"; depends=[biclust clusteval doParallel dplyr foreach ggplot2 magrittr nycflights13 phyclust tidyr]; }; bife = derive2 { name="bife"; version="0.7"; sha256="04wnc6n3wcykzmhrnd2zkj507ymzbw1n8wssi3bwcylanzj59a3h"; depends=[data_table Formula Rcpp RcppArmadillo]; }; bigGP = derive2 { name="bigGP"; version="0.1-6"; sha256="0fwm06rzx1qbh16ii93x26i4v4yb50jk67k3qmzyr3gr4z9b9xhg"; depends=[Rmpi]; }; - bigKRLS = derive2 { name="bigKRLS"; version="3.0.5.1"; sha256="1za8pxij1nwpdz3lz51zqib99pc73s92lz0k01fkcgw5rj78kgs8"; 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.5.0"; sha256="051c8rkj77dm78237dzhf3lcdawv0xv72pwfiim9bi89z9mp6f9m"; depends=[assertthat googleAuthR googleCloudStorageR httr jsonlite]; }; bigReg = derive2 { name="bigReg"; version="0.1.2"; sha256="1hmvh5j40zpzz6c88hmikphps8rb741yvkg60dxmkfl8gxqsrp3w"; depends=[MASS Rcpp RcppArmadillo uuid]; }; - bigalgebra = derive2 { name="bigalgebra"; version="0.8.4.2"; sha256="0xgaks6yx6gh333g27rij28hhxlziknxaqw5cbw1cr7srdl295i9"; depends=[BH bigmemory]; }; biganalytics = derive2 { name="biganalytics"; version="1.1.14"; sha256="1hsqdg5hkhs6z9pwvn055q02hzpksjwrf33q5zdnkm387g188ca6"; depends=[BH biglm bigmemory foreach Rcpp]; }; - bigassertr = derive2 { name="bigassertr"; version="0.1.1"; sha256="0jyycg9qkqswqakbc2p80s7qrv0hm3mn0zwg4v373zcf4z21rvlh"; depends=[]; }; - bigchess = derive2 { name="bigchess"; version="1.5.2"; sha256="021l5pvbh6v95wavxl118k2gvlaadwr18d8f712jzarcnfi1hvy3"; depends=[ff ffbase RSQLite subprocess]; }; + bigassertr = derive2 { name="bigassertr"; version="0.1.3"; sha256="1f0abvsixdkrr8nfm0knby69j0pac4srlg8nlsmrymz6nzcf82d9"; depends=[]; }; + bigchess = derive2 { name="bigchess"; version="1.7.1"; sha256="1h8i8qmnr9030xr8ld4rk7v6zpxbirw09i71imrrja6lsxr7v3qn"; depends=[ff ffbase processx RSQLite]; }; 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]; }; @@ -5493,27 +5529,26 @@ in with self; { bigleaf = derive2 { name="bigleaf"; version="0.7.1"; sha256="0hsssz5973vapkmmh9dgzrijyjj1s75iarq3cpfi7ljm4n748qig"; 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]; }; bigmemory = derive2 { name="bigmemory"; version="4.5.36"; sha256="03pg8mxdc7q0249visjmc8bc3xmwxsfg3i2n6higicj4cfz7zihq"; depends=[BH bigmemory_sri Rcpp]; }; bigmemory_sri = derive2 { name="bigmemory.sri"; version="0.1.3"; sha256="0mg14ilwdkd64q2ri9jdwnk7mp55dqim7xfifrs65sdsv1934h2m"; depends=[]; }; - bigml = derive2 { name="bigml"; version="0.1.2"; sha256="0vl5krjbgckknxwl26b2hn63jhb80zbn7abpckhxzxfxzncpnfz9"; depends=[plyr RCurl RJSONIO]; }; bigparallelr = derive2 { name="bigparallelr"; version="0.2.3"; sha256="1xg48zbwhchclc6lc67hc3j1d0b7cajd4whspj68ipm38w8h7l23"; depends=[bigassertr doParallel flock foreach RhpcBLASctl]; }; bigreadr = derive2 { name="bigreadr"; version="0.2.0"; sha256="0d5fgs16kdsl23jqrgz7in63pwhh7bvj7m8pa8nj11v84ji6lagr"; depends=[bigassertr data_table Rcpp]; }; bigrquery = derive2 { name="bigrquery"; version="1.2.0"; sha256="1ggh2gngr5x0g6y7d55y6kvn94anf7qi1bkc28cjmw61hxjq38fb"; depends=[assertthat bit64 curl DBI gargle glue httr jsonlite prettyunits progress rapidjsonr Rcpp rlang tibble]; }; + bigsnpr = derive2 { name="bigsnpr"; version="1.3.0"; sha256="1021nxqpl018ph2np50n02szjdlwc71r6yx5sbszd8dxbpb0hfjn"; depends=[bigassertr bigparallelr bigreadr bigstatsr bigutilsr data_table foreach ggplot2 magrittr Matrix Rcpp RcppArmadillo rmio]; }; bigsplines = derive2 { name="bigsplines"; version="1.1-1"; sha256="1kf04p2lglzdi1fdryk27nmj2a2jca2ii7ki8vak93sq21isb179"; depends=[quadprog]; }; - bigstatsr = derive2 { name="bigstatsr"; version="1.1.2"; sha256="1bp53gbsgxlizv9vq68scbadiq08isvzl0iv9nwa22ywlpaabybf"; depends=[bigassertr bigparallelr bigreadr cowplot foreach ggplot2 Rcpp RcppArmadillo rmio RSpectra tibble]; }; + bigstatsr = derive2 { name="bigstatsr"; version="1.2.3"; sha256="0386hrfjsdnm5ns9kkym8nhzfadcn0shdr3yj77051lwxfngdmbx"; depends=[bigassertr bigparallelr cowplot foreach ggplot2 Rcpp RcppArmadillo rmio RSpectra tibble]; }; bigstep = derive2 { name="bigstep"; version="1.0.3"; sha256="0ygp1vljqqn5vzpjxlv9d6fxxv3bi2kfyqfs1gf0jgxwb9417b82"; depends=[bigmemory magrittr matrixStats R_utils RcppEigen speedglm]; }; bigtabulate = derive2 { name="bigtabulate"; version="1.1.5"; sha256="1jvp3m0ms2cav9z8vvhh80gsa0kvc351brv2jq99rxv1mwvpa4xj"; depends=[BH biganalytics bigmemory Rcpp]; }; bigtcr = derive2 { name="bigtcr"; version="1.1"; sha256="1l03yc28afdm7glbw4ay0zsywjgqg5l90qz1hfhslsy8gg7d5wq5"; depends=[]; }; bigtime = derive2 { name="bigtime"; version="0.1.0"; sha256="136gy2i4qwa2drklllyzp3z0dbijlavgf3sxy73bf84df2yq1c9i"; depends=[corrplot lattice MASS Rcpp RcppArmadillo RcppEigen zoo]; }; - bigutilsr = derive2 { name="bigutilsr"; version="0.2.2"; sha256="19d4rj598094fncblncd0bampm19srrmczrsmwvj5njf3cxkvxdp"; depends=[bigparallelr nabor Rcpp robust robustbase RSpectra]; }; + bigutilsr = derive2 { name="bigutilsr"; version="0.3.0"; sha256="0fjmczbfap20y39vaym01wxl0c4vckqxgjkki9z1s66rglxr6zg9"; depends=[bigassertr bigparallelr nabor Rcpp robustbase RSpectra]; }; bikeshare14 = derive2 { name="bikeshare14"; version="0.1.2"; sha256="1sib83driqv9k4aa131nw3xasslrxvnxkn3mr8kxycxccky025n9"; depends=[]; }; - bikm1 = derive2 { name="bikm1"; version="0.9.0"; sha256="09ibaj5nd7ql5l30z726nifym5bnmkx4nbw982p9h2440rdx0g5b"; depends=[ade4 ggplot2 gtools pracma reshape2]; }; + bikm1 = derive2 { name="bikm1"; version="1.0.0"; sha256="1pj41d59n3iflwc4iwnwv6g2vhjs9498k85cml7jwb814xpl9jsj"; depends=[ade4 ggplot2 gtools pracma reshape2]; }; bild = derive2 { name="bild"; version="1.1-5"; sha256="03has1zi57inicahl52ja006vv5cdndyxfsxp77l6nc3zc6ixna8"; depends=[]; }; billboard = derive2 { name="billboard"; version="0.1.0"; sha256="1z3y8dijhc1381y91n5zq305xzm1gpvs0g4mdpfr7zrblpa8ws39"; depends=[tibble]; }; billboarder = derive2 { name="billboarder"; version="0.2.8"; sha256="1n51xildr8h3fqm3yhalgvq6pwlpzbcv230jg7skp8147wmwcmi7"; depends=[ggplot2 htmltools htmlwidgets jsonlite magrittr scales shiny]; }; bimetallic = derive2 { name="bimetallic"; version="1.0"; sha256="181qi4dr0zc7x6wziq7jdc1his20jmprfpq3hrfm56fr5n1sj8wl"; depends=[]; }; - bimets = derive2 { name="bimets"; version="1.4.2"; sha256="13gv3p3mldmdwvbvivh4fx8ygmjvf0gza69gprv4z1wphb6rz7yn"; depends=[xts zoo]; }; + bimets = derive2 { name="bimets"; version="1.4.3"; sha256="00gbfjp4gshc5izbjlzsc6vib1rfkilbwd89xc4fn51z1hfsvpzl"; depends=[xts zoo]; }; bimixt = derive2 { name="bimixt"; version="1.0"; sha256="0nhszpzjqy8z3vngl5jdzqxzshnn92wgi0ci5n3n5kzi24xkfrzc"; depends=[pROC]; }; binGroup = derive2 { name="binGroup"; version="2.2-1"; sha256="0cb7j6b0s3y56mv1967awwri0kv0rf3sr3vwf9gc2zbjggxi9ffp"; depends=[partitions Rdpack]; }; binMto = derive2 { name="binMto"; version="0.0-7"; sha256="0rg9rsdy14jx7zjv60krcz1vh0sxqimsai0wynhx2sx0kydw4ngy"; depends=[mvtnorm]; }; @@ -5533,32 +5568,34 @@ in with self; { binnednp = derive2 { name="binnednp"; version="0.4.0"; sha256="1qswrr982x5hy2vl2fc603j98cjli9l40zzvvjy2l91p8xxrc5dn"; depends=[doParallel fitdistrplus foreach kedd mclust nor1mix Rcpp Rdpack]; }; binom = derive2 { name="binom"; version="1.1-1"; sha256="0mjj92dqf5q69jxzqya4izb1mly3mkydbnmlm4wb3zqqg82a324c"; depends=[]; }; binomSamSize = derive2 { name="binomSamSize"; version="0.1-5"; sha256="1an6dcqsjh5r0w4kc3n6yfvvha5qhrb2i4bpf7g5ykhl3i60zfcc"; depends=[binom]; }; - binomialMix = derive2 { name="binomialMix"; version="1.0"; sha256="01l3083bc6k2n18nfi1alc737l5zcankv30f4i0z3ajlqpd2jqr9"; depends=[dplyr gmp lubridate MASS rlang Rmpfr stringr]; }; + binomialMix = derive2 { name="binomialMix"; version="1.0.1"; sha256="1ak3h0lgjmrv9miwn7fl6jvcp8xdld53swjz71q67q999s42np0m"; depends=[dplyr gmp lubridate MASS rlang Rmpfr stringr]; }; + binomialRF = derive2 { name="binomialRF"; version="0.1.0"; sha256="1liqhnp4j3fxy552fi4yz5vmfzh5blpmxx6fa3g62dgnhcm9sy18"; depends=[data_table randomForest rlist]; }; binomialcftp = derive2 { name="binomialcftp"; version="1.0"; sha256="00c7ymlxk1xnx3x1814x7bcyir7q5sy4rb82dcpzf2bdly4xa1qr"; depends=[]; }; binomlogit = derive2 { name="binomlogit"; version="1.2"; sha256="1njz1g9sciwa8q6h0zd8iw45vg3i1fwcvicj5y8srpk8wqw3qp7k"; depends=[]; }; binostics = derive2 { name="binostics"; version="0.1.2"; sha256="1izcck2dq8ay9ni1wjg426w5rj39gxwzls1sgnngggapl3pmqzz2"; depends=[]; }; + binovisualfields = derive2 { name="binovisualfields"; version="0.1.1"; sha256="0s2p0miqjckkj4v9l0c7zsdnnq69j08p4c5sgdxvkzlv23rnrkyd"; depends=[gtools plotrix shiny]; }; binr = derive2 { name="binr"; version="1.1"; sha256="0kgk91zy7bdrhpkh9c5bi206y9hjwjwzb508i8qqmznqyxmza70r"; depends=[]; }; binseqtest = derive2 { name="binseqtest"; version="1.0.3"; sha256="0661a2bqmv6bckq23c6m04ggwrp8z10lfgjg9dgkz4bfxsd297gs"; depends=[clinfun]; }; - binsmooth = derive2 { name="binsmooth"; version="0.2.1"; sha256="0izfgsjajq64n9x7lv19dscg7z39jspwa9fpvxmyxhiv3d3fz8f0"; depends=[ineq pracma triangle]; }; + binsmooth = derive2 { name="binsmooth"; version="0.2.2"; sha256="1sidv8ra377glaacib1j4ksg5bg759hk7h6fadrfzip3hgxgjg9x"; depends=[ineq pracma triangle]; }; binsreg = derive2 { name="binsreg"; version="0.2.0"; sha256="031a794bkb9qdy51p4jgjg3hvh8ga0hwakcdrjn0hv4ls9f5gsm7"; depends=[ggplot2 sandwich]; }; binst = derive2 { name="binst"; version="0.2.1"; sha256="09kzk7n1j9nzgyijwirzk33z6p6hc67zkd05hv1i9qfijy31gci4"; depends=[rpart]; }; bio_infer = derive2 { name="bio.infer"; version="1.3-3"; sha256="14pdv6yk0sk6v8g9p6bazbp7mr3wmxgfi6p6dj9n77lhqlvjcgm9"; depends=[]; }; bio3d = derive2 { name="bio3d"; version="2.4-1"; sha256="07rw6c2d95gb5myxh31727j0jrchd0xisa3x89jjmf4zzs3vv7v7"; depends=[Rcpp]; }; + bioC_logs = derive2 { name="bioC.logs"; version="1.1"; sha256="18v8hj426vdfz30jifhd17fv65w5nv0f55ff9r8s2ahi6qv3w828"; depends=[]; }; bioOED = derive2 { name="bioOED"; version="0.2.1"; sha256="0wx58bngpzlrbbcnx8l1lqhsg51y98wcym1238p87drf64x2mj1n"; depends=[bioinactivation corrplot dplyr FME ggplot2 MEIGOR rlang tidyr tidyselect tidyverse]; }; bioPN = derive2 { name="bioPN"; version="1.2.0"; sha256="0mvqgsfc7d4h6npgg728chyp5jcsf49xhnq8cgjxfzmdayr1fwr8"; depends=[]; }; - bioRad = derive2 { name="bioRad"; version="0.4.0"; sha256="100b1fz7dxpvsc452r4yvd4g6gmzz80pvw1l0sp6g4310gyzs2fb"; depends=[curl fields ggmap ggplot2 maptools raster rgdal rhdf5 sp]; }; + bioRad = derive2 { name="bioRad"; version="0.5.1"; sha256="0vkq7dsmqsxdghs6g55iv9wcnjw0qs50djswjscn0yz3gyl95w6x"; depends=[assertthat curl fields ggmap ggplot2 maptools raster rgdal rhdf5 sp tidyr viridis viridisLite]; }; bioacoustics = derive2 { name="bioacoustics"; version="0.2.2"; sha256="13m5w888fap7nxn3pwimi04zdp848n20ha01v7gkzdkchdnbbchb"; depends=[htmltools moments Rcpp stringr tuneR]; }; biocompute = derive2 { name="biocompute"; version="1.0.3"; sha256="1c23yd0vhar1hvzskr7h6g3a78mcrwminm2pkdmc9qlpy8s8smvv"; depends=[cli crayon curl digest httr jsonlite jsonvalidate magrittr rmarkdown stringr uuid yaml]; }; biogas = derive2 { name="biogas"; version="1.23.2"; sha256="05g6nyi872skvr34kw5c71ggnnjc3fv95imc327yjqhmqmwx3m19"; depends=[]; }; biogeo = derive2 { name="biogeo"; version="1.0"; sha256="14sqgg8b06gp5dajxvyj9s3ndsk7jpkfr0mkyl2l61kgp6qx53rh"; depends=[maptools raster sp stringr vegan]; }; - biogram = derive2 { name="biogram"; version="1.6.1"; sha256="0n9ahj0lbq3hsk6v9brjwqh3iha5dyg2xn5kngn8m8rvl0flf9k2"; depends=[bit combinat entropy partitions slam]; }; + biogram = derive2 { name="biogram"; version="1.6.3"; sha256="1y7yaa6xwv11b6a4qf4qb3d7rsz0yiiq1k5mb0dbm3avydnl9c4b"; depends=[combinat entropy partitions slam]; }; bioimagetools = derive2 { name="bioimagetools"; version="1.1.4"; sha256="078xqgq4bgphzflfajxnyfxrmhs28224abby0fq5q9bh1hngkn58"; depends=[EBImage httr tiff]; }; bioinactivation = derive2 { name="bioinactivation"; version="1.2.3"; sha256="0gz1bbakf6b23jsbvrr8314yxajxcr1akm5srgm883lrf1p5ax13"; depends=[deSolve dplyr FME ggplot2 lazyeval MASS purrr rlang]; }; biolink = derive2 { name="biolink"; version="0.1.6"; sha256="1szsplhzrn660aw442ad73rwhmyqjwqq6faaz4bw86khsvxh993y"; depends=[DBI glue memoise rentrez RMySQL xml2]; }; biomartr = derive2 { name="biomartr"; version="0.9.2"; sha256="12bw15hvjg7fbrq1mwn2xgzbplydy8rlq982hs118mlwdrlqb06q"; depends=[biomaRt Biostrings curl data_table downloader dplyr fs httr jsonlite philentropy purrr R_utils RCurl readr stringr tibble XML]; }; - biomod2 = derive2 { name="biomod2"; version="3.3-7.1"; sha256="0g8knlkrxlwxbh1qzxhv2lf1zxrlqf7s6yhzvch18y8w021d8d9c"; depends=[abind dismo earth gbm ggplot2 MASS mda nnet PresenceAbsence pROC randomForest raster rasterVis reshape rpart sp]; }; + biomod2 = derive2 { name="biomod2"; version="3.4.6"; sha256="0nvxg0a78ynydx3wd16vaildw9x4hiagmx4wkrwkzbyhyi2pgza1"; depends=[abind caret checkmate dismo doParallel dplyr earth ENMeval foreach gbm ggplot2 lattice MASS maxnet mda nnet PresenceAbsence pROC purrr randomForest raster rasterVis reshape rlang rpart sp tidyr]; }; bionetdata = derive2 { name="bionetdata"; version="1.0.1"; sha256="1l362zxgcvxln47b1vc46ad6ww8ibwhqr2myxnz1dnk2a8nj7r2q"; depends=[]; }; - bioplots = derive2 { name="bioplots"; version="0.0.1"; sha256="184wp1jvgf7a80srrfq72a4r1la2psr8b16kxs00v2gcbgjyvr10"; depends=[ggplot2 gplots RColorBrewer reshape2]; }; bios2mds = derive2 { name="bios2mds"; version="1.2.2"; sha256="1avzkbk91b7ifjba5zby5r2yw5mibf2wv05a4nj27gwxfwrr21cd"; depends=[amap cluster e1071 rgl scales]; }; bioset = derive2 { name="bioset"; version="0.2.3"; sha256="15vchim8cim42j1if0jars696rh50vmbggr9748q321f6ngm1w1i"; depends=[dplyr magrittr rlang tibble tidyr]; }; biosignalEMG = derive2 { name="biosignalEMG"; version="2.1.0"; sha256="0bbkrfqkmks4z8c7rh0k43lvm71vn3fzrw3kpj012ym77whwkvay"; depends=[signal]; }; @@ -5566,27 +5603,27 @@ in with self; { biostat3 = derive2 { name="biostat3"; version="0.1.4"; sha256="12inmmy5xjd0c6vs2s00z13rm5ykndxpmmgi8h7pkw30rhq4snyc"; depends=[car MASS muhaz survival]; }; biotic = derive2 { name="biotic"; version="0.1.2"; sha256="1p18jkdd263dgk90626n9awkj6m4zn1n7897596fzrzrahksa978"; depends=[]; }; biotools = derive2 { name="biotools"; version="3.1"; sha256="15y3ccmj1gslzc0lp0gvc66hf0yigx3zkqnw46crgrizjm2kmjay"; depends=[boot lattice MASS rpanel SpatialEpi tkrplot]; }; - bipartite = derive2 { name="bipartite"; version="2.14"; sha256="0wy7ciw59b7z2gzp5qiphss9p208qf6dyprl59nksb462fg4rxyq"; depends=[fields igraph MASS permute sna vegan]; }; + bipartite = derive2 { name="bipartite"; version="2.15"; sha256="0gr1wm9bvvrvwv5gzzfic7yknp826ga44vjbil84x1kp0h0k1f46"; depends=[fields igraph MASS permute sna vegan]; }; bipartiteD3 = derive2 { name="bipartiteD3"; version="0.2.0"; sha256="1jvhlycmxii4vcm9qbj246qkwhd1bcggqq56b5rmbyqwd4vhqh8f"; depends=[downloader dplyr purrr r2d3 RColorBrewer stringr tibble tidyr]; }; biplotbootGUI = derive2 { name="biplotbootGUI"; version="1.2"; sha256="07lrs2n6s54h97vjriszszhksdbi14s2i234kwfhg7aq47k6l0jl"; depends=[cluster dendroextras MASS matlib rgl shapes tcltk2 tkrplot]; }; - birankr = derive2 { name="birankr"; version="1.0.0"; sha256="004ckrr9jiclh1wfzchrv2s1b33y9lv465kx1jb2q4pr2m1j027c"; depends=[data_table Matrix]; }; + birankr = derive2 { name="birankr"; version="1.0.1"; sha256="1azgrzgw5bnfac8p287ir5zl6kxc6jij20p6cfc3lbbl03f8sa1k"; depends=[data_table Matrix]; }; birdring = derive2 { name="birdring"; version="1.4"; sha256="0rskrf0r5nrzfcac0zvc60vabvs9dws2zx1rxssvw6xmwyiiy1z6"; depends=[geosphere ks lazyData raster rgdal rgeos rworldmap rworldxtra sp]; }; birk = derive2 { name="birk"; version="2.1.2"; sha256="07ck59m5mw897a60vmdn1b3qrmqj20qpfsn3093haqbpn8z13dmn"; depends=[]; }; birtr = derive2 { name="birtr"; version="1.0.0"; sha256="0bcxvj30wzwclw1lcyhvwj3k7awd39lrvzia1nrg53hw90bfs811"; depends=[]; }; biscale = derive2 { name="biscale"; version="0.1.2"; sha256="1m7b1sjqngcfqc5z1b10i3s9m6lml2jiw6ab5dk9dr01i4yw0nhw"; depends=[classInt dplyr ggplot2 glue rlang tidyr]; }; bisect = derive2 { name="bisect"; version="0.9.0"; sha256="1dr95gnc9rb3i8603wspf0hznmvk5akk46nyf1bhv88mjz2i5q77"; depends=[]; }; bisectr = derive2 { name="bisectr"; version="0.1.0"; sha256="1vjsjshvzj66qqzg32rviklqswrb00jyq6vwrywg1hpqhf4kisv7"; depends=[devtools]; }; - bisque = derive2 { name="bisque"; version="1.0.1"; sha256="05rx8fcmb46486iqxgkcf69dih80iwswx41ml1f5d2dnjf5b1p34"; depends=[doRNG foreach itertools mvQuad Rcpp RcppArmadillo RcppEigen]; }; - bit = derive2 { name="bit"; version="1.1-15.1"; sha256="0y351ajlrn9ywbiai46mjpwmw5pqc9ik2z24rf0bnbdcvaxdr7r8"; depends=[]; }; + bisque = derive2 { name="bisque"; version="1.0.2"; sha256="0zp2r1vg29q2ds34hhyjv9pz761mi0qncx9p4ilwnfd5yj9pmzwq"; depends=[foreach itertools mvQuad Rcpp RcppArmadillo RcppEigen]; }; + bit = derive2 { name="bit"; version="1.1-15.2"; sha256="12xjkkkmflkz8s435by4r23b57cz7z67z84907f6qg99hn1yg0qb"; depends=[]; }; bit64 = derive2 { name="bit64"; version="0.9-7"; sha256="07znvz9vp1nz1y5ljng4qyskvm943cdbmy996s67560ijxzsm6kv"; depends=[bit]; }; bitops = derive2 { name="bitops"; version="1.0-6"; sha256="176nr5wpnkavn5z0yy9f7d47l37ndnn2w3gv854xav8nnybi6wwv"; depends=[]; }; bitsqueezr = derive2 { name="bitsqueezr"; version="0.1.1"; sha256="0dy180r9cclq46mh0fzc68p5zm9x2z5pa8ajgsk7qycdkyw5v829"; depends=[]; }; biva = derive2 { name="biva"; version="0.1.0"; sha256="1vppvk2n60hhi7p8y8rdyckmh4yk70wqyhbg7rbgh833s66whypw"; depends=[corrgram rpivotTable shiny shinyAce]; }; bivarRIpower = derive2 { name="bivarRIpower"; version="1.2"; sha256="0vgi0476rwali6k8bkp317jawzq5pf04v75xmycpmadb7drnpzy0"; depends=[]; }; - bivariate = derive2 { name="bivariate"; version="0.4.1"; sha256="13qmwz8lwgxppjsq491f8grsg2myhwma4ikhx2k40lag98dpgc9f"; depends=[barsurf intoo KernSmooth mvtnorm]; }; + bivariate = derive2 { name="bivariate"; version="0.5.0"; sha256="0b8wrzh51wqxiksja4jgjfqfqq3nlnx8vcvnmyhl1nzn9jyzdrfg"; depends=[barsurf intoo KernSmooth mvtnorm]; }; bivgeom = derive2 { name="bivgeom"; version="1.0"; sha256="1cn8k7q011whr4f7zig85dsrkz04614z9ns2ky6k6i16s5n3glxy"; depends=[bbmle copula]; }; bivquant = derive2 { name="bivquant"; version="0.1"; sha256="05dn4qik2dvmgqc2613vddh312bqhza1vnf94an75888gxri5h03"; depends=[copula cubature lpSolve MASS mvtnorm regpro]; }; - bivrp = derive2 { name="bivrp"; version="1.2"; sha256="1yrciaadxlkxzbgdsig80yjn9iqrv8a6ccz62hsnyb3knycpcln1"; depends=[MASS mrfDepth]; }; + bivrp = derive2 { name="bivrp"; version="1.2-2"; sha256="0b38nh38vgqjllb1z9627dm86yp0s06ky1g829g8kkz7rffdp2za"; depends=[MASS]; }; biwavelet = derive2 { name="biwavelet"; version="0.20.19"; sha256="0pdjjjjiwnl7ihlwzjd9hwl5kzq5wbnbqfmm5pp8gvkcypj9k7rb"; depends=[fields foreach Rcpp]; }; biwt = derive2 { name="biwt"; version="1.0"; sha256="1mb3x8ky3x8j4n8d859i7byyjyfzq035i674b2dmdca6mn7paa14"; depends=[MASS rrcov]; }; bizdays = derive2 { name="bizdays"; version="1.0.6"; sha256="1av96rj4fllfais9xwh1p8601xvsj0awfh9n2n1x5kzca966h8fq"; depends=[jsonlite]; }; @@ -5596,27 +5633,27 @@ in with self; { blaise = derive2 { name="blaise"; version="1.3.4"; sha256="14jk62sw4xs0yip8gh1w2795l8p0ybv83c24ijizxymg16h7i9g7"; depends=[dplyr readr stringr tibble]; }; blandr = derive2 { name="blandr"; version="0.5.1"; sha256="1rqas71hlf000b3z824d8ljshf8bx91bbrzaxxnx5n3chv19w6z6"; depends=[ggplot2 jmvcore knitr R6 rmarkdown stringr]; }; blastula = derive2 { name="blastula"; version="0.3.1"; sha256="0vanb8ghzskicnk7gw7mw67790lw953jf3jgyyhd71qdgz6wjli7"; depends=[base64enc commonmark curl dplyr fs getPass here htmltools httr jsonlite magrittr mime rlang rmarkdown stringr uuid]; }; - blavaan = derive2 { name="blavaan"; version="0.3-8"; sha256="0sspwr2pfm5an8lg3xwgmq45nxv39yll66bkgk0qjdbfxb2zhzzx"; depends=[bayesplot BH coda future_apply lavaan loo MCMCpack mnormt nonnest2 Rcpp RcppEigen rstan rstantools StanHeaders]; }; + blavaan = derive2 { name="blavaan"; version="0.3-9"; sha256="1a79hvpn1ynd28wj137dmqq6gjxdl7x3ml1mx111vrdlbw8whdmv"; depends=[bayesplot BH coda future_apply lavaan loo MCMCpack mnormt nonnest2 Rcpp RcppEigen rstan rstantools StanHeaders]; }; blendedLink = derive2 { name="blendedLink"; version="1.0"; sha256="19d1pnjag89jjvkl5a6wx531qjqp4cv5jk95md6jby27yr52r8vp"; depends=[]; }; blender = derive2 { name="blender"; version="0.1.2"; sha256="1qqkfgf7fzwcz88a43cqr8bw86qda33f18dg3rv1k77gpjqr999c"; depends=[vegan]; }; blin = derive2 { name="blin"; version="0.0.1"; sha256="1h94azm7gli9i4v3li5c1p36p3rkcj2p5j6rqzlzf0pcqs0bsc09"; depends=[abind glmnet MASS Matrix mvtnorm]; }; - blink = derive2 { name="blink"; version="1.0.0"; sha256="1a1rc4k78604ypgwrb3ysd2ak27vqhbwjn662mrr4a36kgw1z0w3"; depends=[plyr RecordLinkage stringdist]; }; blkbox = derive2 { name="blkbox"; version="1.0"; sha256="14bl0b5w46gb7v8p94df5r56nj849r7jqisajagvd1irda3vkc7z"; depends=[bartMachine caret dplyr e1071 ggplot2 glmnet gtools kknn knitr magrittr nnet pamr party plyr pROC randomForest reshape reshape2 rJava rmarkdown shiny shinyjs stringr tibble tidyr xgboost]; }; blm = derive2 { name="blm"; version="2013.2.4.4"; sha256="1w6c30cq38j4i1q4hjg12l70mhy5viw886l1lsnxyvniy113in4i"; depends=[]; }; blme = derive2 { name="blme"; version="1.0-4"; sha256="1ca2b0248k0fj3lczn9shfjplz1sl4ay4v6djldizp2ch2vwdgy2"; depends=[lme4]; }; blmeco = derive2 { name="blmeco"; version="1.4"; sha256="1370djpy87816bfr0g8730x7q4d4xx9aa41iqm622q5b5zm2jzmp"; depends=[arm lme4 MASS]; }; blob = derive2 { name="blob"; version="1.2.1"; sha256="1slb5mvxfyi92i8ifx2qa31hp57inilwhq1g9lzvgha6jrxbqm7g"; depends=[rlang vctrs]; }; + blockCV = derive2 { name="blockCV"; version="2.1.1"; sha256="0431d38zzkbpri65p5vnr8wc5b27124c4jaj845rgjlkvvb0xysm"; depends=[progress raster sf]; }; blockForest = derive2 { name="blockForest"; version="0.2.4"; sha256="14xggdm34hmdlz3hvvp5layk6mb016yppqf9x9rbia9lmmjbhgfh"; depends=[Matrix Rcpp RcppEigen survival]; }; blockRAR = derive2 { name="blockRAR"; version="1.0.2"; sha256="1d9izlcgz85kcz1sh11mcxq96qh0cwv6638jha851h2f4lnc8aa4"; depends=[arm dplyr ldbounds magrittr tibble]; }; blockTools = derive2 { name="blockTools"; version="0.6-3"; sha256="0023p0msfmp8swq4f5aff40m976np7y051x8hjizzw91hrfa4w2n"; depends=[MASS tibble]; }; 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]; }; + blockmodeling = derive2 { name="blockmodeling"; version="0.3.6"; sha256="12paf76l3wlxad14bkxn37lw9rg6ka473m86wlcf3yhriw8kbaiz"; depends=[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.8"; sha256="1vjx94i3n63hzs9nx0gs9cjc4947lrgq9ld60cxjrdsgk53f53s5"; depends=[lme4 plyr PolynomF]; }; - blogdown = derive2 { name="blogdown"; version="0.17"; sha256="1ijfskdl9apvs95km2f7p2m1imcbxvqxd8wkp3rdmgfs73pfk33r"; 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]; }; + blockrand = derive2 { name="blockrand"; version="1.5"; sha256="0bic3b8l7mp2hpwd8k1diwy6a4lj92i7s5k20i2wy8kw0c74jwfh"; depends=[]; }; + blocksdesign = derive2 { name="blocksdesign"; version="3.9"; sha256="12misnycbfqr5la4h35dx33cs7jxjxrh8cxmsh4pwbw38b6kjc86"; depends=[lme4 plyr PolynomF]; }; + blogdown = derive2 { name="blogdown"; version="0.18"; sha256="10alz3s803pw8yy8c540xfnn86zhvgk7lyx7c3v0q50b64m4arjl"; depends=[bookdown htmltools httpuv knitr rmarkdown servr xfun yaml]; }; + blorr = derive2 { name="blorr"; version="0.2.2"; sha256="1fwpaj4sc4jh4f25zlx8z2gn2gfnj5ibic95rn60iq75mp9r6x44"; depends=[car caret checkmate cli clisymbols crayon dplyr e1071 ggplot2 gridExtra magrittr purrr Rcpp rlang scales tibble xplorerr]; }; blrm = derive2 { name="blrm"; version="1.0-1"; sha256="0p0nmbxil4l89fcryrgsg9mxzb5fyg93p50aqkjy00ms05hwd0hx"; depends=[boot mvtnorm openxlsx reshape2 rjags]; }; blsAPI = derive2 { name="blsAPI"; version="0.2.1"; sha256="0p45g4qqaialh5m9bxgrvnc7nqmm0429syw0bml8h4h8vy4014a7"; depends=[httr rjson]; }; blscrapeR = derive2 { name="blscrapeR"; version="3.2.0"; sha256="0dq9yg9xik715b36vc3fch4ab3njqa22w7b7b905b9gyagkv2zbv"; depends=[dplyr ggplot2 httr jsonlite magrittr purrr stringr tibble]; }; @@ -5632,7 +5669,7 @@ in with self; { bmotif = derive2 { name="bmotif"; version="2.0.0"; sha256="1vvh20hzf2nfc28pp2vjgip3xjv617lawfjawd51v3xmfnk3bvj2"; depends=[gtools Rcpp reshape2 tensor]; }; bmp = derive2 { name="bmp"; version="0.3"; sha256="0jd67r11bn98hjwgyr6gas423787xy7ji2hq7ay80blkkcj91xxx"; depends=[]; }; bmrm = derive2 { name="bmrm"; version="4.1"; sha256="1brdd5mhr5282wkdc62lgsqcxw077p69rknjk7fjcs282ahcik2s"; depends=[LowRankQP lpSolve matrixStats Rcpp]; }; - bnclassify = derive2 { name="bnclassify"; version="0.4.4"; sha256="1jjyqh850glllvghgfbxsji6yw1grzyxm59pcbxkwm3yynviq0ml"; depends=[assertthat BH entropy matrixStats Rcpp rpart]; }; + bnclassify = derive2 { name="bnclassify"; version="0.4.5"; sha256="1ik3n0g6gw7504ryg5skwygyc545150r297gii4mr2zj252lf069"; depends=[assertthat BH entropy matrixStats Rcpp rpart]; }; bnlearn = derive2 { name="bnlearn"; version="4.5"; sha256="0y452cw1dxm1cik4na1zq6g0zv5ybiwc1cq9sdashq1jacjpc158"; depends=[]; }; bnma = derive2 { name="bnma"; version="1.0.0"; sha256="1gaplf5lw7x6nfihk6n0kyf67vx4d8zq6mylhwlmfhpfrpiy030k"; depends=[coda ggplot2 igraph rjags]; }; bnnSurvival = derive2 { name="bnnSurvival"; version="0.1.5"; sha256="1d9jmfx0id4lmw122zga7hb52vlfdfqn4amhzpsmhyck99rv92j4"; depends=[pec prodlim Rcpp]; }; @@ -5648,7 +5685,8 @@ in with self; { boilerpipeR = derive2 { name="boilerpipeR"; version="1.3"; sha256="0467bjqhdmi3p02fp0r7rgm00x9ry464f2hniav990qzsw8i16q6"; depends=[rJava]; }; bold = derive2 { name="bold"; version="0.9.0"; sha256="0ppdhbpdffvs0sgh7ykkhr585nhk66w6vqw793wa4ia57yl49s25"; depends=[crul data_table jsonlite plyr reshape stringr tibble xml2]; }; bomrang = derive2 { name="bomrang"; version="0.7.0"; sha256="0xlsivhnank7bc3y06wk5avlzlc24mfvn9c18rhgxxib8mzf8aak"; depends=[crayon curl data_table dplyr foreign hoardr httr janitor jsonlite lubridate magrittr raster readr rgdal rvest tidyr xml2]; }; - bookdown = derive2 { name="bookdown"; version="0.17"; sha256="10b4gnd6z3w13pysqqan43blxcbk7bgbzc7wr83b23ag1lh2n40j"; depends=[htmltools knitr rmarkdown tinytex xfun]; }; + bookdown = derive2 { name="bookdown"; version="0.18"; sha256="1my6g16phx21v5cvfqcnjibh3zcv02xkix347aafd6a7r3hnxpq5"; depends=[htmltools knitr rmarkdown tinytex xfun]; }; + bookdownplus = derive2 { name="bookdownplus"; version="1.5.8"; sha256="1cdxz5c69cgdk7wxr0xwhzw361rpg7j8xjv9hjf1877qqmhxbrkd"; depends=[bookdown knitr magick xaringan]; }; boostmtree = derive2 { name="boostmtree"; version="1.4.1"; sha256="16adb9akrdw1cfcarrv9l5cxhn1nzskir6nwl9nawl1r727s57z6"; depends=[nlme randomForestSRC]; }; boostr = derive2 { name="boostr"; version="1.0.0"; sha256="123ag8m042i1dhd4i5pqayqxbkfdj4z0kq2fyhxfy92a7550gib2"; depends=[foreach iterators stringr]; }; boot = derive2 { name="boot"; version="1.3-24"; sha256="0yv0l55kjmlfdx1xhgyjdi0bskxhfal74wr5jxaib1qj99nmkm49"; depends=[]; }; @@ -5667,10 +5705,9 @@ in with self; { bootstrapFP = derive2 { name="bootstrapFP"; version="0.4.3"; sha256="19bsahkxh6g2fjz5j1bdq47vnyy38xd0vr4ahkbjz61x0h8g4nli"; depends=[sampling]; }; boottol = derive2 { name="boottol"; version="2.0"; sha256="01dps9rifzrlfm4lvi7w99phfi87b7khx940kpsr4m9s168a2dzv"; depends=[boot plyr]; }; bor = derive2 { name="bor"; version="0.1.0"; sha256="1r5jacmin0cq9zipxa9nmp3jnh6wsddd4wnzw2n5sggnf24ryp8g"; depends=[]; }; - boral = derive2 { name="boral"; version="1.7"; sha256="0li7jdzgq2ffhrf0nly96syp72vv3c6rbcni19kk2wgyv16mjwcm"; depends=[abind coda fishMod MASS mvtnorm R2jags]; }; + boral = derive2 { name="boral"; version="1.8"; sha256="1m3c58hsm87dpv5z9fqik6d29z3ar5iylgl93qn676xgjli0283x"; depends=[abind coda corpcor fishMod MASS mvtnorm R2jags reshape2]; }; borrowr = derive2 { name="borrowr"; version="0.1.1"; sha256="0q9lkdzf7v9rggrwcny551cx7lfqli60dxqgqx0d2x819d7h0k1d"; depends=[BART mvtnorm Rcpp]; }; - bossMaps = derive2 { name="bossMaps"; version="0.1.0"; sha256="0w4ks1xicvfm8ari4fr18wjm0qj2nxdsapl6lpfjz8l1id0y78cg"; depends=[doParallel foreach ggplot2 raster rgdal rgeos scales sp tidyr]; }; - botor = derive2 { name="botor"; version="0.2.0"; sha256="13lyw6pmz923vdkyaa9n623h134kq0n5gb6qi8bpx8rhq2sycbdb"; depends=[checkmate logger reticulate]; }; + botor = derive2 { name="botor"; version="0.3.0"; sha256="1izhpc491f54p3hz32kcp2b2yxkg59ni1caglyllg22bckw228sg"; depends=[checkmate logger reticulate]; }; boussinesq = derive2 { name="boussinesq"; version="1.0.3"; sha256="1j1jarc3j5rby1wvj1raj779c1ka5w68z7v3q8xhzjcaccrjhzxk"; depends=[]; }; boxcoxmix = derive2 { name="boxcoxmix"; version="0.21"; sha256="0pav4nksh1zbic11l38jyyq8i58hfvwzkp88ra6nny3jn2axzipl"; depends=[npmlreg qicharts statmod]; }; boxplotdbl = derive2 { name="boxplotdbl"; version="1.3.0"; sha256="1y1b45q69sxbszd83s8ch10z4i55h34ixm8q7yxr7byx3px8y65n"; depends=[]; }; @@ -5680,8 +5717,9 @@ in with self; { bpca = derive2 { name="bpca"; version="1.3-0"; sha256="16a7b94nk5psnm435vrwilcsria9mhr5d31fwzxy53pzp8n78kcr"; depends=[rgl scatterplot3d]; }; bpcp = derive2 { name="bpcp"; version="1.4"; sha256="0jwz9vrz6ivz70qzgvpvksk94rw5m7vi6yijbg8dj6biq5rq01lv"; depends=[ggplot2 survival]; }; bpgmm = derive2 { name="bpgmm"; version="1.0.5"; sha256="0dxyrcf1qyf3ymj36d9flaw8405m7c1cqxbv6yrqm2dhba0ymyxq"; depends=[gtools label_switching MASS mcmcse mvtnorm pgmm Rcpp RcppArmadillo]; }; - bpnreg = derive2 { name="bpnreg"; version="1.0.2"; sha256="0lacfg4qdc3006f9ydxs9x50asdixm12s7ljwzm71a8phcqfimsv"; depends=[BH haven MASS Rcpp RcppArmadillo]; }; + bpnreg = derive2 { name="bpnreg"; version="1.0.3"; sha256="0s1whwi12fs77lycngrm0394cp6cy3g1pikhf670n94y21pk2bvi"; depends=[BH haven MASS Rcpp RcppArmadillo]; }; bpp = derive2 { name="bpp"; version="1.0.0"; sha256="11fgn92vvl7kklv0xdisf8gnf2rbhq11qyckqsxvc5wa821lmnkm"; depends=[mvtnorm]; }; + bqror = derive2 { name="bqror"; version="0.1.0"; sha256="1rgf4m4vh1rfrmsxx8227xm1pdnb1fq5kipdinz9zi99wiw75x2m"; depends=[GIGrvg invgamma MASS NPflow pracma truncnorm]; }; bqtl = derive2 { name="bqtl"; version="1.0-32"; sha256="0jjqgsm9fmvz5nkgz608xfljjpmaf4rs4f7kxvpqn4b1l9s5lhci"; depends=[]; }; braQCA = derive2 { name="braQCA"; version="1.0.0.1"; sha256="1chyy8sk3iqs54sqg79dp1vjz3gcvnbzqbmgasdynir38b45scjh"; depends=[bootstrap dplyr QCA]; }; bracer = derive2 { name="bracer"; version="1.1.1"; sha256="1l722jg88i4898v8fwb9klwl9mbpaz1phypbpqc1j2kp2n2vq0vb"; depends=[stringr]; }; @@ -5695,30 +5733,30 @@ in with self; { brant = derive2 { name="brant"; version="0.2-0"; sha256="1hdwdrdl6ad112zd7q248am3qk19alnj647nrk9xxxgd7s6a9pnb"; depends=[MASS Matrix]; }; brazilmaps = derive2 { name="brazilmaps"; version="0.1.0"; sha256="1nvd8x4m4m3966qph6390kqwpsrv7vy4yf6pam98xxkjbl9a41nf"; depends=[dplyr ggplot2 magrittr sf sp]; }; brea = derive2 { name="brea"; version="0.2.0"; sha256="0mb043fdhxrg9gyf4g55ydjx37j20394nvd4d0fmiym98lccyi04"; depends=[]; }; - breakDown = derive2 { name="breakDown"; version="0.1.6"; sha256="13vcqcrm8h4bwr6rd24z0q0nbx2bpxkg39irhv2aybjg3ll8xq77"; depends=[ggplot2]; }; + breakDown = derive2 { name="breakDown"; version="0.2.0"; sha256="1ywa7122id4infcb31rbazdd2w2hm0ff8p0a7insy3lvq0xmqd44"; depends=[ggplot2]; }; breakage = derive2 { name="breakage"; version="1.1-1"; sha256="0zjazyz92criiimpz4wyd4hd8ccspvh3hhqpd4qkfdzdf9wp3kns"; depends=[Imap]; }; - breakaway = derive2 { name="breakaway"; version="3.0"; sha256="0y3h7gifv279z3x77jmr97c0i3vy58m5wsr8pa2vyn26m02rbkpc"; depends=[]; }; breakfast = derive2 { name="breakfast"; version="1.0.0"; sha256="0p0svsqphd5w99pf5c5jmak1xxl8md881lapa8aps9xr73m4x6lf"; depends=[plyr]; }; breakpoint = derive2 { name="breakpoint"; version="1.2"; sha256="004vi1qr7iib8ykg6sp7xzv0bb841h4vsz2x0cyrhkdp41frglx9"; depends=[doParallel foreach ggplot2 MASS msm]; }; - 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]; }; + breathtestcore = derive2 { name="breathtestcore"; version="0.6.0"; sha256="1nk1hnnb8qd6hhsh56k3zkmhx27q0xxx1igxvrgd3gd28rm6c1vb"; depends=[assertthat broom dplyr ggfittext ggplot2 MASS multcomp nlme purrr readr readxl signal stringr tibble tidyr xml2]; }; + breathteststan = derive2 { name="breathteststan"; version="0.6.0.0"; sha256="0r89h9m6s6qsbzsfp0br95gzpb5cq33yanc2h2m5x8l4wp5n38vi"; depends=[BH dplyr purrr Rcpp RcppEigen rstan rstantools StanHeaders stringr tibble tidyr]; }; brew = derive2 { name="brew"; version="1.0-6"; sha256="1vghazbcha8gvkwwcdagjvzx6yl8zm7kgr0i9wxr4jng06d1l3fp"; depends=[]; }; brglm = derive2 { name="brglm"; version="0.6.2"; sha256="0c9ngscc6zlfm90fqyggnj04qfkhp5qgf5q3wnfpxwyc8cm47by2"; depends=[profileModel]; }; - brglm2 = derive2 { name="brglm2"; version="0.6.0"; sha256="1955fqnw97hn9r2q15a06xn80ijbrkfkxjihq91dfj82mb38fqyv"; depends=[enrichwith lpSolveAPI MASS Matrix nnet numDeriv]; }; + brglm2 = derive2 { name="brglm2"; version="0.6.2"; sha256="13apd1p770slnbrqs44khgv7fsh6g3fzd3n04hq36zz308avns9z"; depends=[enrichwith lpSolveAPI MASS Matrix nnet numDeriv]; }; + brickr = derive2 { name="brickr"; version="0.3.2"; sha256="1sr1bpf8alvm09l0b5cy564b1nc8zcm13ibbngxxwrc7mq3gawk1"; depends=[colorspace dplyr farver ggplot2 magrittr purrr rgl scales tidyr]; }; bridgedist = derive2 { name="bridgedist"; version="0.1.0"; sha256="0hqkpwpi3nv6mfhljl65zcflf4wy72ag36hdam6s7kynfj41qz6w"; depends=[]; }; bridger2 = derive2 { name="bridger2"; version="0.1.0"; sha256="0clp42nnbvd01n65azdi2ghp0mfqwsipzdl2d30q04lcvfkdpxrf"; depends=[BSDA data_table ggplot2 outliers plotly shiny shinydashboard]; }; - bridgesampling = derive2 { name="bridgesampling"; version="0.8-1"; sha256="1gjklf88yi6xw0idfm720bdmryhj7dxir211rfl6wk7jsiasxhlh"; depends=[Brobdingnag coda Matrix mvtnorm scales stringr]; }; - brinton = derive2 { name="brinton"; version="0.1.3"; sha256="0nirqv0r53873jk0g7ip0n5ll5qasm0jbj2rlk1c7mms5lad9lzy"; depends=[forcats ggplot2 gridExtra lubridate pander qpdf RColorBrewer rmarkdown sm tibble]; }; + bridgesampling = derive2 { name="bridgesampling"; version="1.0-0"; sha256="1awhvv0v42w2q6llqi1wqpaiv5zx74cqzigdsvphy2jfp8ajw64y"; depends=[Brobdingnag coda Matrix mvtnorm scales stringr]; }; + brinton = derive2 { name="brinton"; version="0.1.5"; sha256="1mc6xksf2zwpgs3q0nx4zz77307ysrsgdk3d96xb9rjxdx7l1xnh"; depends=[forcats GGally ggplot2 glue gridExtra lubridate pander RColorBrewer rmarkdown sm tibble]; }; + brio = derive2 { name="brio"; version="1.0.0"; sha256="10gjg205vvdwbw3nr8bfrxy5fzqd27y1fsbyn17xnpk57c66igvc"; depends=[]; }; briqr = derive2 { name="briqr"; version="0.1.0"; sha256="073pdk1094ng4kggzdjvihl791r2qlja1j2w3pfmh2027kn520r8"; depends=[dplyr httr jsonlite magrittr tibble]; }; briskaR = derive2 { name="briskaR"; version="0.1.2"; sha256="1y9sabj7pfgyvv6s3bbvrb0xhjhwc4pcfsfx847kqdajid92qx8w"; depends=[deldir fftwtools fields MASS mvtnorm pracma raster rgdal rgeos sp]; }; brlrmr = derive2 { name="brlrmr"; version="0.1.7"; sha256="0s47qz8y416x0gz91pzdpr97pmlvddwkvll454vnlafxxk9p5lds"; depends=[boot brglm MASS profileModel Rcpp]; }; - brm = derive2 { name="brm"; version="1.0"; sha256="0h4kgig28hkqv1amadznc0n9256dx613rxbn8s8si11ygx79x2dd"; depends=[]; }; - brms = derive2 { name="brms"; version="2.11.1"; sha256="1k3b8ax5d7d2m0b9h3hkivj3wfvp3rpq62v2caq1wnk9irxsciab"; depends=[abind backports bayesplot bridgesampling coda future ggplot2 glue loo Matrix matrixStats mgcv nleqslv nlme Rcpp rstan rstantools shinystan]; }; + brms = derive2 { name="brms"; version="2.12.0"; sha256="1699lwkklfhjz7fddawlig552g2zvrc34mqwrzqjgl35r9fm08gs"; 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.8"; sha256="119lxm691ci2bf62jwmbhqsl39xy3jvsi988rr6sdslwaxqyx35b"; depends=[Formula truncnorm]; }; broman = derive2 { name="broman"; version="0.69-5"; sha256="1y1l1p0ddy4a3vwa01yhrc5zcgnl673ar9prkn89pspbdab7km2s"; depends=[assertthat ggplot2 jsonlite RPushbullet]; }; - broom = derive2 { name="broom"; version="0.5.3"; sha256="177m249dxbf9pf249610qrl58v025ws41ipfihy66751pwsv2n8d"; depends=[backports dplyr generics nlme purrr reshape2 stringr tibble tidyr]; }; + broom = derive2 { name="broom"; version="0.5.5"; sha256="0n7zd64263kfavdi28rl2bxrsa00c3m4vjhhjdrfwvvmrcxj39fx"; 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="1.0.1"; sha256="0jb3s4fzy2s0bnpp8dz1dp1lhnaag18bi7gay738i5bx8f558if8"; depends=[broom broom_mixed dplyr magrittr rlang]; }; + broomExtra = derive2 { name="broomExtra"; version="2.5.0"; sha256="0m00sws1gzwydyyqhddgyzsc71q0z7fmnn4c3mc3yfsd6mgbb2jf"; depends=[broom broom_mixed dplyr magrittr parameters performance rlang tibble]; }; brotli = derive2 { name="brotli"; version="1.2"; sha256="07rgdgxh9bvn0qavpclxmkglwyl6ndqasxcs6j12if698dkn976b"; depends=[]; }; brr = derive2 { name="brr"; version="1.0.0"; sha256="050ivnqcaxiyypd1sxfpy6ianhzzmvs6c77ga40g3440cvfigkgw"; depends=[gsl hypergeo pander stringr SuppDists TeachingDemos]; }; brranching = derive2 { name="brranching"; version="0.5.0"; sha256="07dxynk8pbpbsqwaxg9vhpjv4wx8mb1lqxy1nkczjayn1yrpjfm5"; depends=[ape conditionz crul curl phylocomr phytools taxize]; }; @@ -5726,21 +5764,20 @@ in with self; { brunnermunzel = derive2 { name="brunnermunzel"; version="1.4.1"; sha256="1lba5cpiray65zg1pv3xv6yl1xg78rqlwxkcmhgizlh1rhpd430p"; depends=[]; }; bs4Dash = derive2 { name="bs4Dash"; version="0.5.0"; sha256="1y75i6bsdy1bsbzwjblsnimw1zzk0zl3qnzqfq9zcnf6q2ghi3r2"; depends=[htmltools shiny]; }; bsam = derive2 { name="bsam"; version="1.1.2"; sha256="1m2lpqm2i4i35hzr1iylrb8skx8rsys3w542xjyqw030bs7b1rdk"; depends=[coda dplyr ggplot2 gridExtra lubridate msm mvtnorm rjags rworldxtra sp tibble]; }; - bsamGP = derive2 { name="bsamGP"; version="1.2.2"; sha256="1r7jmrj91na9718digggsjqfqc2l0s0md68vr3s9xcb77c4bbhyi"; depends=[ggplot2 gridExtra MASS]; }; + bsamGP = derive2 { name="bsamGP"; version="1.2.3"; sha256="1wqs2y9f7fgdvshhzwpjp811h4xhdd1lplpadnpffa2lmyv7vh5s"; depends=[ggplot2 gridExtra MASS]; }; bsearchtools = derive2 { name="bsearchtools"; version="0.0.61"; sha256="11fqz8kdhqpc3jq34vgv3frzawgsl5y0s83rb2p54yb5yhd3p68w"; depends=[Rcpp]; }; bshazard = derive2 { name="bshazard"; version="1.1"; sha256="1kidypyqlilf794mksjvhja8bmnd9hdhz91ywy0mcddgc6wbar4h"; depends=[Epi survival]; }; bspec = derive2 { name="bspec"; version="1.5"; sha256="0jynvir7z4q1vrvhdn6wijdrjfrkk4544nlawabw2fnfxss91a91"; depends=[]; }; bsplinePsd = derive2 { name="bsplinePsd"; version="0.6.0"; sha256="0f785l02hiq3f7anxqhm09f7lrqgkkqhly7f1x78cxm22hvrqyhg"; depends=[Rcpp]; }; bsplus = derive2 { name="bsplus"; version="0.1.1"; sha256="0s3407z48b7sdbkjkqcjk2j1wvs0z7chvdjzphil83l0vp3j5x0s"; depends=[glue htmltools lubridate magrittr purrr rmarkdown stringr]; }; bspmma = derive2 { name="bspmma"; version="0.1-2"; sha256="1a3p1h7bks5yrxv791wfa680v4a6q10p59iz6wvfifhf3ndlaw49"; depends=[]; }; - bssm = derive2 { name="bssm"; version="0.1.8-1"; sha256="1754n6cgfnq4q6b0yqbgrkgwnp2ia1pv5xnppqaij2m9gbycrznw"; depends=[BH coda diagis ggplot2 ramcmc Rcpp RcppArmadillo sitmo]; }; - bssn = derive2 { name="bssn"; version="0.7"; sha256="1g2xhb7bqapwd5zbc4bl4h1fskd7k6gd0rz74hnydiiwxrwiihf6"; depends=[sn]; }; + bssm = derive2 { name="bssm"; version="0.1.11"; sha256="05hdpq0zkwg66hj2hv79mp6df85lxm7hw4z1i7crqz7yx6s37dld"; depends=[BH coda diagis ggplot2 ramcmc Rcpp RcppArmadillo sitmo]; }; + bssn = derive2 { name="bssn"; version="1.0"; sha256="1brxbvcvqy8n9xpvp5kz47x5ps8hdqgnh6s49051qaylp95qm432"; depends=[ClusterR mvtnorm sn ssmn]; }; bst = derive2 { name="bst"; version="0.3-17"; sha256="0x7hv0gx5kn8dwgbkabz7d4dh2l75zdawgdj5zxan13k7b9n3l8y"; depends=[doParallel foreach gbm rpart]; }; bsts = derive2 { name="bsts"; version="0.9.2"; sha256="1v32wsjcfcq0zwklrp0c83xw4h49v49nmjs973mdzh4q05wzlpmp"; depends=[Boom BoomSpikeSlab xts zoo]; }; btb = derive2 { name="btb"; version="0.1.30"; sha256="1f94zzpg3q6ldd436cv1wqpfbpw5f706073wk38a4dkg57dwrbgi"; depends=[BH Rcpp RcppArmadillo RcppParallel sf sp]; }; - btergm = derive2 { name="btergm"; version="1.9.4"; sha256="17bjd1d2yj1l98mbflklznxd3q7zi5nzj943nxzva7ij3hdsn6l4"; depends=[boot coda ergm ggplot2 igraph Matrix network ROCR RSiena sna speedglm statnet_common xergm_common]; }; bucky = derive2 { name="bucky"; version="1.0.6"; sha256="01rlx0m6h66y1p9k5llg17qpajjhk2vmhbpwc4i5igf5x5g4clgc"; depends=[lmtest sandwich]; }; - buildmer = derive2 { name="buildmer"; version="1.4"; sha256="1g18kx525mb9hi8f4msrzqwxsgfxhzpc6yh2q4wn159ca3j0wgs7"; depends=[lme4 mgcv nlme plyr]; }; + buildmer = derive2 { name="buildmer"; version="1.5"; sha256="0m9dz2fb2cwc5l7wnb2dsnqyfkh1ppnlfz9r38ihanav7awsrb17"; depends=[lme4 mgcv nlme plyr]; }; bujar = derive2 { name="bujar"; version="0.2-7"; sha256="1r14mh5j2w87mc6b192hi4qg97si2xv6v826j6c1awh7w3vqbbr9"; 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]; }; @@ -5760,7 +5797,7 @@ in with self; { bvls = derive2 { name="bvls"; version="1.4"; sha256="18aaf7kk5mks3a59wwqhm1ckpn6s704l9m5nzy0x5iw0s98ijbm2"; depends=[]; }; bwd = derive2 { name="bwd"; version="0.1.0"; sha256="1ryd5cqbpns9dsis2a9vjg6fcg23284c3dr3j3l18krdshdksfr0"; depends=[]; }; bwimage = derive2 { name="bwimage"; version="1.2"; sha256="1wm17spxfrgf8kfc6fadri54sdk0b9813s9y4rp2xiwmy5sp6aj2"; depends=[jpeg png]; }; - bwsTools = derive2 { name="bwsTools"; version="1.0.1"; sha256="15pa0nxk3wksi11p1bs48cyaqxk0lxqvnwiwznw8f7bjkacnn1hl"; depends=[crossdes dplyr igraph magrittr rlang tidyr]; }; + bwsTools = derive2 { name="bwsTools"; version="1.1.0"; sha256="06gvw966p2qgkw1c2rdr5hiha47aclb398kjf8sgh5dcka9sv256"; depends=[crossdes dplyr ggplot2 igraph magrittr rlang tidyr]; }; bysykkel = derive2 { name="bysykkel"; version="0.2.3"; sha256="1cbfmmmw7a37fwgwgfvc8yqxl4dh5n30qcnva9wsm903wccmb2cr"; depends=[glue httr jsonlite lubridate magrittr tibble]; }; bytescircle = derive2 { name="bytescircle"; version="1.1"; sha256="0c83d37kijcvr00pc4qqdci14cpbg6988izyjfjk1yliavyc6mwf"; depends=[]; }; bzinb = derive2 { name="bzinb"; version="1.0.4"; sha256="1424lwsm2ra124h0ahbl42szbx500fqkf9ccw9k1688iwxnfg7f2"; depends=[BH Rcpp]; }; @@ -5768,46 +5805,46 @@ in with self; { c14bazAAR = derive2 { name="c14bazAAR"; version="1.2.0"; sha256="0bgf7fa428zp55qnkzhgghrj4hyv2lkhzg8b6msbq3bz2bah7jlz"; depends=[crayon data_table dplyr httr magrittr pbapply rlang tibble tidyr]; }; c212 = derive2 { name="c212"; version="0.95"; sha256="1cgmldy2ysz3934fxh0mmzrb2vw33j3pmws53ng7yxg79mb9ixja"; depends=[coda]; }; c2c = derive2 { name="c2c"; version="0.1.0"; sha256="149np512wjnlr9glmqxpiamf6c31v0bh6ym95jpdhk0iw3ic9kvh"; depends=[]; }; - c3 = derive2 { name="c3"; version="0.2.0"; sha256="1af4lrgck1bff8jjp9vwyw2rpq54d1ng13rpcqlf58asdja29s9h"; depends=[data_table dplyr htmlwidgets jsonlite lazyeval viridis]; }; + c3 = derive2 { name="c3"; version="0.3.0"; sha256="1c2k7ml153bby749qi3a6nckhwwr71mvvps9dkbzkxkwnmlwpz1h"; depends=[data_table dplyr htmlwidgets jsonlite lazyeval viridis]; }; c3net = derive2 { name="c3net"; version="1.1.1"; sha256="0m4nvrs41kmlakc6m203zlncqwgj94wns8kzcb31xngjcacmcq42"; depends=[igraph]; }; cAIC4 = derive2 { name="cAIC4"; version="0.9"; sha256="0imy4kq09an9azqi3aahw3lsmby8km2am0w7fb314xq6ghzf9xmp"; depends=[lme4 Matrix mgcv mvtnorm nlme RLRsim]; }; - cIRT = derive2 { name="cIRT"; version="1.3.0"; sha256="0jbjkmzw3z935pq12k5kmy3vdpqlpm70siv8f0bnlw42sai1qcw1"; depends=[Rcpp RcppArmadillo]; }; + cIRT = derive2 { name="cIRT"; version="1.3.1"; sha256="1x7cbawzzpzripzyg4yavc9s6kx06ff4q151kbvylr9wsf78s6qg"; depends=[Rcpp RcppArmadillo]; }; cNORM = derive2 { name="cNORM"; version="1.2.2"; sha256="1lid4j6i65xmmakab0bbs7vyhkrvax3l5kv7r66x665gm8y00h0b"; depends=[lattice latticeExtra leaps]; }; cOde = derive2 { name="cOde"; version="1.0.0"; sha256="12222wlsk9l6m9y477mjl8x279xhs8c1l1wsq92khwycm1j06jfy"; depends=[]; }; cPCG = derive2 { name="cPCG"; version="1.0"; sha256="1pfbsv2rcjsryn6nr56a7i4yb7k0m3gdfn4q9l1kpzhmv9lic7m1"; depends=[Rcpp RcppArmadillo]; }; - cRegulome = derive2 { name="cRegulome"; version="0.3.1"; sha256="0j3rv7vakv27r1n1yxmd50nlnyc4y329w0dmrw56dwkdkk4zzbsg"; depends=[DBI ggplot2 ggridges httr igraph R_utils RSQLite UpSetR VennDiagram]; }; - cSEM = derive2 { name="cSEM"; version="0.1.0"; sha256="1vqqlajyvcwk0nd546kq03x14vi7iq9bs2mq2zlp571v7g5gmfi1"; depends=[abind alabama cli crayon expm future future_apply lavaan magrittr MASS Matrix matrixcalc matrixStats polycor psych purrr Rdpack symmoments]; }; + cSEM = derive2 { name="cSEM"; version="0.2.0"; sha256="0ynqclr78vi97bd4wds0zws2iydziwzqsfjhpcpi87wca0chm4z8"; depends=[abind alabama cli crayon expm future future_apply lavaan magrittr MASS Matrix matrixcalc matrixStats polycor psych purrr Rdpack symmoments]; }; ca = derive2 { name="ca"; version="0.71.1"; sha256="095lk7p2b9835hc3a03c4019wg0baf0dhz6c2vqpaq1m9k4jy304"; depends=[]; }; caMST = derive2 { name="caMST"; version="0.1.3"; sha256="1hhxyw7sbzm2v09xaxvq347gl8p5wkjxx43187mqbw0nzknlg5bg"; depends=[catR diagram mstR]; }; caRamel = derive2 { name="caRamel"; version="1.1"; sha256="06nppjx66xwdqchna5j6xlhfzs5g36nv8srwivbnfixys29awabb"; depends=[geometry]; }; caRpools = derive2 { name="caRpools"; version="0.83"; sha256="10m7fw1zfr9i6v2qg235diwf3fmfr88incxnqpvnhmqcn082mxrp"; depends=[biomaRt DESeq2 rmarkdown scatterplot3d seqinr sm VennDiagram xlsx]; }; caTools = derive2 { name="caTools"; version="1.18.0"; sha256="0y1kgyiy322yhb0phzwvf2zgjz9awp13lhzhk9v1ddg88656jhq3"; depends=[bitops]; }; - cabinets = derive2 { name="cabinets"; version="0.3.1"; sha256="1f6pkh2vpnqdqhbd6ipy5553xh7bppc7y7xbz9lw27wn5fppilzl"; depends=[crayon fs glue here purrr R6 rjson rstudioapi stringr usethis withr]; }; + cabinets = derive2 { name="cabinets"; version="0.4.0"; sha256="1crxr1pxs4if86g405x47709zdyv8fqdmlm2wpilcl2bdcpia0y4"; depends=[crayon fs git2r glue here purrr R6 rjson rstudioapi stringr usethis withr]; }; cabootcrs = derive2 { name="cabootcrs"; version="2.0"; sha256="1a473ca90306brhfrzf5hw6d6v252kd2vfwkvgblwy26jmrrr2km"; depends=[lpSolve]; }; cacIRT = derive2 { name="cacIRT"; version="1.4"; sha256="145j6isqa8yj2nvlqkxagd076zs10ng3n44khi5p4jj77fjc8gh6"; depends=[]; }; caesar = derive2 { name="caesar"; version="1.0.0"; sha256="0z1bb5cmjr97l3h9svy4r4bj58jkmq6kdkip577cvy2xf5q9n410"; depends=[binhf]; }; caffsim = derive2 { name="caffsim"; version="0.2.2"; sha256="00bkgmmqrydpji2pvhcchgl2p8w5ksby4g80i3h76q0bm2325w9h"; depends=[dplyr ggplot2 markdown mgcv shiny tibble tidyr]; }; cairoDevice = derive2 { name="cairoDevice"; version="2.28"; sha256="14885gpmhdzmxbz3q59s5sd3kjkyi5yf9lpnjwmvc482n8ix4lpq"; 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]; }; - calculus = derive2 { name="calculus"; version="0.2.0"; sha256="0ks92pis7471p2qq66lysb3hw99qbm068v5gf82mknk56lfbymdc"; depends=[Rcpp]; }; + calcWOI = derive2 { name="calcWOI"; version="1.0.3"; sha256="1bxsn9b99hnb365qvlzr0ymwavamlyhs5sm9s2fdjh4zv3f32n3l"; depends=[dualtrees LS2W wavethresh]; }; + calculus = derive2 { name="calculus"; version="0.2.1"; sha256="0hs7hzjl6xjza20v9zx9a1piywxa6w3h2rskr52d1dcbc0vwhinp"; depends=[Rcpp]; }; 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.5"; sha256="1s423nr176l2sc66wp7hzgqkv7c2bq8d2bjrrvrrm5qa9y3zdx1k"; depends=[MASS]; }; calibrateBinary = derive2 { name="calibrateBinary"; version="0.1"; sha256="1k6sl4bg05piyczpk6wsva914gcmy8viyz4423gx9i6ddflb7xdb"; depends=[gelnet GPfit kernlab randtoolbox]; }; calibrator = derive2 { name="calibrator"; version="1.2-8"; sha256="1m9g1pmnr6d9jkg5ab0l0cbqfj7kmx7sdmcdqdhn9ifyhhn7812y"; depends=[cubature emulator mvtnorm]; }; - callr = derive2 { name="callr"; version="3.4.1"; sha256="0nyba0knzd44zz2xmr7zd9qh3rny0q8msysxf49843d9rlyv6y70"; depends=[processx R6]; }; + callr = derive2 { name="callr"; version="3.4.3"; sha256="1dc20gdawy9mhnc452qlshv2p4krs6c2gymvpv365mn141zjgdq1"; 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.2.3"; sha256="0sjniyi36ri0yz2bbhc0f8kwghz3wqcp1hi7sf2fx0y6hg33z6xn"; depends=[data_table overlap secr sp]; }; - cancensus = derive2 { name="cancensus"; version="0.2.0"; sha256="1vggqpv7l472dc889fh2ldsijgwpv9s6ai8jhqhz2q2xdg099v7c"; depends=[digest dplyr httr jsonlite rlang]; }; + cancensus = derive2 { name="cancensus"; version="0.2.1"; sha256="09ck076csz9srz660c1y2lmmvdjk2k14w1bmwizfl5vs3sb1k010"; depends=[digest dplyr httr jsonlite rlang]; }; cancerGI = derive2 { name="cancerGI"; version="1.0.0"; sha256="1chkcyf9m98gbn6b3vmb1baw7kii4g5vxvg2xfi7i6wwdn8sqr65"; depends=[igraph qvalue reshape2 survival systemfit]; }; cancerTiming = derive2 { name="cancerTiming"; version="3.1.8"; sha256="1sfi8q2f5ag7iak0sf9pmqncb89w3gnxdiwjwpivkwhr28ais4mq"; depends=[gplots LearnBayes]; }; candisc = derive2 { name="candisc"; version="0.8-0"; sha256="0hq5bwvq791rhff2c29xdjbbkcyydii1lbsy05c1fapyn88ir0mi"; depends=[car heplots]; }; canprot = derive2 { name="canprot"; version="0.1.2"; sha256="0lc31vw49sc2zsrn52aqqljcc4n79j4i4845sr201ga67w07vrrb"; depends=[CHNOSZ xtable]; }; - cansim = derive2 { name="cansim"; version="0.3.3"; sha256="17rhhqzs49zhgkhcdi4xq7cgj4hb6900bxvw43nbwqr3gcif1wpq"; depends=[dplyr httr jsonlite purrr readr rlang rvest stringr tibble xml2]; }; - canvasXpress = derive2 { name="canvasXpress"; version="1.26.5"; sha256="0bgba7sz1xd3r8l130m40p0wyiq5mvsww6n5lji3qkiqihzdd0ra"; depends=[htmlwidgets httr]; }; + cansim = derive2 { name="cansim"; version="0.3.5"; sha256="0lqkyq2n8v2y172ihyb9vh3mimrkg2yx2c42cxdaz4p7gqiq7z8r"; depends=[dplyr httr jsonlite purrr readr rlang rvest stringr tibble xml2]; }; + canvasXpress = derive2 { name="canvasXpress"; version="1.27.6"; sha256="0dhfkxmdmk3172pvby6ksysypg5z26byg26ny7wfy7b81rdwhqxk"; depends=[htmlwidgets httr]; }; + canvasXpress_data = derive2 { name="canvasXpress.data"; version="1.27.6"; sha256="0kh5g3incl5lv4pb8fd9nzvlvfvyfs3bms78hlf71z8kkag9hzn1"; depends=[]; }; cap = derive2 { name="cap"; version="1.0"; sha256="1pv8hskxjbp589dn7rx80yaa1ld76x1w37bss2fyrys1p3qr78aa"; depends=[MASS multigroup]; }; caper = derive2 { name="caper"; version="1.0.1"; sha256="0md0sngj7wsv2d4d7fmyyz9qqismk3ps9l3qk1blqz1yi19pq124"; depends=[ape MASS mvtnorm]; }; capitalR = derive2 { name="capitalR"; version="1.3.0"; sha256="08lvncia9mdrnw84zydf1k7336xawiirh2swziqfwx3z1n172n52"; depends=[]; }; @@ -5817,32 +5854,34 @@ in with self; { captr = derive2 { name="captr"; version="0.3.0"; sha256="13j2nq9hm37g4h5fjdpz7kix0sqajdd7zssjfgil06ixfmnsijkx"; depends=[curl jsonlite]; }; capushe = derive2 { name="capushe"; version="1.1.1"; sha256="1aa76ir1kp67hiz7dr60azyc71yzslshyc640fjh0fpw0sp5kwbc"; depends=[MASS]; }; capwire = derive2 { name="capwire"; version="1.1.4"; sha256="18a3dnbgr55yjdk6pd7agmb48lsiqjpd7fm64dr1si6rpgpl4i9c"; depends=[]; }; - car = derive2 { name="car"; version="3.0-6"; sha256="0yv5mwaa0ymrbis9590mx0zcj3w6j4drhs6ab13zhx4zc3x1b7b6"; depends=[abind carData lme4 maptools MASS mgcv nlme nnet pbkrtest quantreg rio]; }; + car = derive2 { name="car"; version="3.0-7"; sha256="11sfk1l41j27mrfy16g7b02c570n3gy9icvpcrfjh1biykqa565d"; depends=[abind carData lme4 maptools MASS mgcv nlme nnet pbkrtest quantreg rio]; }; carData = derive2 { name="carData"; version="3.0-3"; sha256="0cg2yxzn0pdjqykr60my1fzpfkqac21fll5hv3m9w5c9sayq8swq"; depends=[]; }; carSurv = derive2 { name="carSurv"; version="1.0.0"; sha256="0wv7lp10i4sdfqyizg77ghblp3pcp7wzhs946sm0wl6w00krav9j"; depends=[corpcor fdrtool mboost Rcpp survival]; }; caracas = derive2 { name="caracas"; version="0.0.1"; sha256="1pn6qf6m32psylnw1rnp2pdkwpsa5jz0lhfwj5c0ll23a8ln7627"; depends=[reticulate]; }; - carat = derive2 { name="carat"; version="0.1.0"; sha256="09vqcljl74x6qbk88mf9xnp1hwzg1mwvmxi43gmw8qcg13zcfiai"; depends=[ggplot2 gridExtra Rcpp RcppArmadillo stringr]; }; - carbonate = derive2 { name="carbonate"; version="0.1.2"; sha256="1v4ssdk7j60sm4iahywb4x710ijvzj0yczcmr75zvq9rjfki1b54"; depends=[clipr httr magick R6 RSelenium rtweet wdman yaml]; }; + carat = derive2 { name="carat"; version="0.1.1"; sha256="1ql4lr3x6kiwq1xj671bm1y9mc8iw41j5y5796dfnw7a5251sy67"; depends=[ggplot2 gridExtra Rcpp RcppArmadillo stringr]; }; + carbonate = derive2 { name="carbonate"; version="0.1.3"; sha256="0y1wjrlh0rbfl1wz9028b637gs20giifp9ykg1yir2ak7fpwbq85"; depends=[clipr details httr magick R6 RSelenium rtweet wdman yaml]; }; carcass = derive2 { name="carcass"; version="1.6"; sha256="0nhp35nxjqqmy15rf9vc0qyymy7d0v8mc84570b9nc62g5xac8xy"; depends=[arm expm lme4 MASS survival]; }; cardidates = derive2 { name="cardidates"; version="0.4.8"; sha256="1mfd5sgzswhs9rln2bgxx8c54z69xp8l5dfmx7jfh8jl43qkzpjf"; depends=[boot lattice pastecs]; }; cardioModel = derive2 { name="cardioModel"; version="1.4"; sha256="1a2nvn4a4zc89pb01m20pxqgbj0ypzzvx9w2vfzwly1kzkhvc9hr"; depends=[lubridate nlme]; }; care = derive2 { name="care"; version="1.1.10"; sha256="00h36by40v60mqzbf615a99sdfz0i42i57wybxrcm7y1y2la0da8"; depends=[corpcor]; }; careless = derive2 { name="careless"; version="1.1.3"; sha256="07yq6sfp110pkd3khfn8ajdqz2r4ipcs90mpaiynh12xl0n67x7k"; depends=[psych]; }; - caret = derive2 { name="caret"; version="6.0-85"; sha256="0jxbf2zcvbb5s2pnjzg182awjvylc57q7z5plx6gs6gm62zxjafs"; depends=[foreach ggplot2 lattice ModelMetrics nlme plyr pROC recipes reshape2 withr]; }; + caret = derive2 { name="caret"; version="6.0-86"; sha256="0dyflixdw98lvk2x3w136sw24ij0fwx5c7l709dmqr5z7xy1qjns"; depends=[foreach ggplot2 lattice ModelMetrics nlme plyr pROC recipes reshape2 withr]; }; caretEnsemble = derive2 { name="caretEnsemble"; version="2.0.1"; sha256="127gqd23xjis62irqviihzk80zydrdplwh65zcmd7ng29ih5wnby"; depends=[caret data_table digest ggplot2 gridExtra lattice pbapply plyr]; }; + carfima = derive2 { name="carfima"; version="2.0.2"; sha256="1n68jqn42m54xn7jq8qywrpnvggrcsgvgnlqg6nw0pgiplbkynih"; depends=[DEoptim invgamma mvtnorm pracma truncnorm]; }; caribou = derive2 { name="caribou"; version="1.1"; sha256="0ibl3jhvsgjfcva0113z0di9n5n30bs90yz0scckfv1c0pjhn4xd"; depends=[]; }; caroline = derive2 { name="caroline"; version="0.7.6"; sha256="1afxxbrd7w628l4pxdmvwbs7mbgxlhnfq3nxk2s93w47gn7r9fp7"; depends=[]; }; carpenter = derive2 { name="carpenter"; version="0.2.2"; sha256="13ahhdc6f5ngrhb7slqbxzfs3wswixh0argyr6l46cv4fdkaa80s"; depends=[dplyr lazyeval magrittr pander tibble tidyr]; }; carrier = derive2 { name="carrier"; version="0.1.0"; sha256="0bqnwnnjqjk9q0lxq6kkz9s75ss10lfyyywyyi24m8wppxpw1vqc"; depends=[pryr rlang]; }; cartograflow = derive2 { name="cartograflow"; version="1.0.0"; sha256="1sczhvkkrdhcn2phjpsvb86ik0bgyhbgcza7dz6d4qmpl8195bs9"; depends=[dplyr g_data ggplot2 maptools plotly reshape2 rgdal rgeos rlang sp]; }; cartogram = derive2 { name="cartogram"; version="0.2.0"; sha256="1b6jr6sf821xa2cbm09zmnvvai6azh7p9zhz78a4yqpiwdw122sc"; depends=[packcircles sf]; }; - cartography = derive2 { name="cartography"; version="2.2.1"; sha256="0fbgaaq354j6hg7m9wgpw4z1b26njl4liysb2vzgi3py5n9xg3dp"; depends=[classInt raster Rcpp rgeos rosm sf sp]; }; + cartography = derive2 { name="cartography"; version="2.4.0"; sha256="1kfzs6dg3kgcs8z08qb22w2ji8fn1g5b4jcii4s76vqmwhs9rdmr"; depends=[classInt curl png raster Rcpp rgeos sf slippymath sp]; }; cartools = derive2 { name="cartools"; version="0.1.0"; sha256="0gc5502373f0c2m2rh6awvyfqrg1wx1f341dm2byk9znba887lgs"; depends=[animation devtools dplyr gapminder ggplot2 knitr rlist rmarkdown roxygen2 sde shiny tidyverse usethis]; }; carx = derive2 { name="carx"; version="0.7.1"; sha256="1qyqsj6pfzzqyaj6076zvgcimhl4cll6sxfb6aigm02rwfkq5gvh"; depends=[matrixStats mvtnorm nlme tmvtnorm xts zoo]; }; caschrono = derive2 { name="caschrono"; version="2.1"; sha256="0p103r6v37c4li1j9x5mdflhx24zil8nhgpdvw5ijrvyixds0nn2"; depends=[Hmisc zoo]; }; cascsim = derive2 { name="cascsim"; version="0.4"; sha256="0n6frnbby1pjpx1z9lzxflmja2mg0dy99c5f7biakpaqi82x5xjb"; depends=[copula fitdistrplus moments R2HTML scatterplot3d]; }; caseMatch = derive2 { name="caseMatch"; version="1.0.8"; sha256="0bp2g0zzcspa6riinsa3bp1qwiip6z058hn2y5mw0w9xah8a685a"; depends=[]; }; casebase = derive2 { name="casebase"; version="0.1.0"; sha256="0216qzyxv44cl9f806lal9lx4n0zzr9csx8ggyjva04h5iiqrq6w"; depends=[data_table ggplot2 survival VGAM]; }; + casen = derive2 { name="casen"; version="0.1.3"; sha256="0yg02n379l38b0hyg7ra1x8bbbi3ai68gzd03ykqr8y5f3s9wbcf"; depends=[dplyr fs glue haven janitor labelled magrittr purrr Rcpp rlang srvyr survey tibble tidyr]; }; casino = derive2 { name="casino"; version="0.1.0"; sha256="07fphn46718gr1zm0xr43mwv7yk697xrc40lxxin315cf3gm0cka"; depends=[crayon dplyr ggplot2 magrittr purrr R6 tibble tidyr]; }; cassandRa = derive2 { name="cassandRa"; version="0.1.0"; sha256="0rwqzxbflxn1iyggm3mq6pkbl61mhk4vdwqwzlwrhrvvr2ib236r"; depends=[bipartite boot dplyr ggplot2 magrittr purrr reshape2 tidyr vegan]; }; castor = derive2 { name="castor"; version="1.5.5"; sha256="1bsdyi905zafk8av0svw6ql0pg4ns1q7w810xx448k0hpq4v468l"; depends=[naturalsort nloptr Rcpp]; }; @@ -5854,20 +5893,23 @@ in with self; { catch = derive2 { name="catch"; version="1.0"; sha256="16gdjrmlsnpyc38fihggj6c7wpgpmf4phcwrimnncdhwlk038yn8"; depends=[MASS Matrix tensr]; }; catchr = derive2 { name="catchr"; version="0.2.2"; sha256="02swyg21wd6793nk590lis5bh36lb2mjvv1k05szf22k08vsqv77"; depends=[purrr rlang]; }; catcont = derive2 { name="catcont"; version="0.5.0"; sha256="0ix6ipm3nn9aq5vxirjga2kwwfnxn4v8ggfjlg5v9027v2r8rb96"; depends=[dplyr]; }; - catdap = derive2 { name="catdap"; version="1.3.4"; sha256="0i877l61f6c75pczi235rzci67w29zv1d7z5zn5p5ymndclvlpl2"; depends=[]; }; - catdata = derive2 { name="catdata"; version="1.2.1"; sha256="0fjylb55iw8w9sd3hbg895pzasliy68wcq95mgrh7af116ss637w"; depends=[MASS]; }; + catdap = derive2 { name="catdap"; version="1.3.5"; sha256="0fyhl69z2lznymvpzxra9qvcg85ggzkfjy68c6mzdmf1ja44d2k5"; depends=[]; }; + catdata = derive2 { name="catdata"; version="1.2.2"; sha256="14kx7yi0cv6dyh9wjasb8gn6cp1bhglgwql7dc2a7lqvdcp0d5vj"; depends=[MASS]; }; cate = derive2 { name="cate"; version="1.1"; sha256="1mw4h03gbrrf69jhw3g8a761gxrz2i7aiqdb0vc1dv75pkjspwmj"; depends=[corpcor esaBcv leapp MASS Matrix ruv sva]; }; + categoryEncodings = derive2 { name="categoryEncodings"; version="1.4.3"; sha256="0ns8ml2hm41650bi8yag6w3k9nb2ky43370444cgy3i7ajpzw87w"; depends=[data_table glmnet sparsepca]; }; catenary = derive2 { name="catenary"; version="1.1.2"; sha256="1n64kq3lkaf00a2mghs67hnxvi4dp6g12pwifyx0bd418wkw9wf3"; depends=[boot broom dplyr ggplot2 tidyverse]; }; catfun = derive2 { name="catfun"; version="0.1.4"; sha256="1482rll333fvy4h58f15flfs7qrck3vk9bzpdn3hayhnmc7svmma"; depends=[broom cli DescTools epitools Hmisc magrittr rlang]; }; + cati = derive2 { name="cati"; version="0.99.3"; sha256="0hq6hdzriab380pc0mx6g8xqflqj5mznr4b7fqw2f51kx8ang8hg"; depends=[ade4 ape e1071 FD geometry hypervolume nlme rasterVis vegan]; }; catlearn = derive2 { name="catlearn"; version="0.7.1"; sha256="194gqx94wkl4zr01ms5g684ma328q35cfqpwa63jv98scrybrbwj"; depends=[doParallel dplyr foreach Rcpp tidyr]; }; catmap = derive2 { name="catmap"; version="1.6.4"; sha256="18449qh10jxfi8p49gmbnib5y013nfdgdblbs4n0mfs0nnzb10sx"; depends=[forestplot metafor]; }; - catnet = derive2 { name="catnet"; version="1.15.5"; sha256="1mwhchja3k9mrhclg6janxsjjs4x20ppg3gx6jymfai2bdv23azh"; depends=[]; }; + catnet = derive2 { name="catnet"; version="1.15.7"; sha256="015qh9k0jj5plp777j3kl20601qiwadkaqrdb0483h3gwqwy828g"; depends=[]; }; catseyes = derive2 { name="catseyes"; version="0.2.3"; sha256="1p0jnjjfl1jqqqk8q6yfsxrh30idfbss7v6lrrm25x8zrhxah0ww"; depends=[]; }; catspec = derive2 { name="catspec"; version="0.97"; sha256="1crry0vg2ijahkq9msbkqknljx6vnx2m88bmy34p9vb170g9dbs1"; depends=[]; }; - cattonum = derive2 { name="cattonum"; version="0.0.3"; sha256="03xshvf1yna9i0gbxx1ackq375890lvbkw6pp5zjs0fyidg0fmww"; depends=[dplyr purrr Rcpp rlang tibble tidyselect]; }; + cattonum = derive2 { name="cattonum"; version="0.0.4"; sha256="0w2b1v871vhmsglh2islmr1hjvxinnzaygl1rqpplr21274glj1m"; depends=[dplyr purrr Rcpp rlang tibble tidyselect]; }; causalMGM = derive2 { name="causalMGM"; version="0.1.1"; sha256="13qx71rfc6m7mvlpwma7ks09f3mlxknxw3jlv3b4iq5pjs8f1v5r"; depends=[rJava]; }; causaldrf = derive2 { name="causaldrf"; version="0.3"; sha256="16gqx8b8alwm8a4lm69qamnqr3bg2qbz0d6q4lyqyrwsk12grid6"; depends=[mgcv survey]; }; causaleffect = derive2 { name="causaleffect"; version="1.3.10"; sha256="0z7vdhm9g95s9nkyx4jdzqrap24nb63n8mr23b9gqm6s1m47sc0z"; depends=[ggm igraph XML]; }; + causaloptim = derive2 { name="causaloptim"; version="0.6.5"; sha256="0197mxaag1hmj20ljcybrwvyjjbhxi0xyybz3hiaxwcfhn5zdxld"; depends=[igraph Rcpp shiny]; }; causalsens = derive2 { name="causalsens"; version="0.1.2"; sha256="1xy8nybflbw6hymc15mmz27ic6hcq89wryb8q6d4zi216lwv2nww"; depends=[]; }; causalweight = derive2 { name="causalweight"; version="0.1.3"; sha256="0bg3xxnbixz2p5qrkziwf3jh6rpcp6c1fngv0vpq1y957j3fw5f2"; depends=[hdm LARF mvtnorm np]; }; cba = derive2 { name="cba"; version="0.2-21"; sha256="0j2hbp0xlfp28gqgnkcvmb4yp1kc5m2bp5x7pr4m1pz2b1s7h7m6"; depends=[proxy]; }; @@ -5878,7 +5920,7 @@ in with self; { cblasr = derive2 { name="cblasr"; version="1.0.0"; sha256="1bz8d4124qpja4bvzn6k1swi89cfyrcpwg2nwyj4r8y0m1hbpc71"; depends=[Rcpp]; }; cbq = derive2 { name="cbq"; version="0.1.0.0"; sha256="1h02pf0jb5qg1ww9phmm3m49ix2qgvk7kyyav6923vp1hn5y5hbj"; depends=[BH Formula Rcpp RcppEigen rstan StanHeaders]; }; cbsem = derive2 { name="cbsem"; version="1.0.0"; sha256="0gc14rhfy566yw2yqzq7yk0xanpzcz7zp3km483azgk816vakbn4"; depends=[]; }; - cbsodataR = derive2 { name="cbsodataR"; version="0.3.5"; sha256="1j0v360q5vwl4xqzd35glwilcz8hv6kh4kky19zkzckkj4qqzidi"; depends=[jsonlite whisker]; }; + cbsodataR = derive2 { name="cbsodataR"; version="0.4.1"; sha256="1nrkh2505xkpdrvs1wlibp8md0qvlpknwiydiiqn216ipzjyp8p7"; depends=[jsonlite whisker]; }; ccChooser = derive2 { name="ccChooser"; version="0.2.6"; sha256="1vgp4zhg46hcf9ma2cmwgnfrqkmq1arh0ahyzjpfk3817vh7disc"; depends=[cluster]; }; ccRemover = derive2 { name="ccRemover"; version="1.0.4"; sha256="1npd0vx2hyg7qbwd650987i49v5cxr6i1hlj5rw6fxc0b808s596"; depends=[]; }; ccaPP = derive2 { name="ccaPP"; version="0.3.3"; sha256="1p08gih67950khfkzhiksa8qw2f9mrmyqiiapsjpv6zc5g0lchhk"; depends=[pcaPP Rcpp RcppArmadillo robustbase]; }; @@ -5888,22 +5930,23 @@ in with self; { cccrm = derive2 { name="cccrm"; version="1.2.1"; sha256="180hzxm4z91hh008lysq1f0zky7qngg5z1laa1c119g4rqqcdskl"; depends=[gdata nlme]; }; ccda = derive2 { name="ccda"; version="1.1.1"; sha256="1kka4vmhpcnl4skdmijzsxrfj6dgax6hhlxvp7gkqlfaazq8pzf0"; depends=[MASS]; }; ccdrAlgorithm = derive2 { name="ccdrAlgorithm"; version="0.0.5"; sha256="171k70p4qyasr385ma3cvcga2b4nbz2dfry78wqx5yb1aa6wwcyc"; depends=[Rcpp sparsebnUtils]; }; - ccfa = derive2 { name="ccfa"; version="1.1.0"; sha256="1paxk1jkkl8yy71h8zqw7kmhy5yz93sp7z9mpnckwyxmsbs58ps8"; depends=[BMisc doParallel foreach formula_tools ggplot2 pbapply quantreg TempleMetrics tidyr]; }; cchs = derive2 { name="cchs"; version="0.4.1"; sha256="1aq6mc3hyhp3g8yzk6y82zz8nriwmxms9lgpw06rf857im6bn5ls"; depends=[survival]; }; + cchsflow = derive2 { name="cchsflow"; version="1.6.0"; sha256="0fj27d4hz4yrs7crqi1zbn7xwbibkjr1nr6srj1zy8lkl7rhicy2"; depends=[dplyr haven magrittr sjlabelled stringr]; }; cclust = derive2 { name="cclust"; version="0.6-21"; sha256="1n5hh0017bcq8ck52qq89jm9zgdfpmiksrypsnv2vvhk3nr0s91c"; depends=[]; }; ccmm = derive2 { name="ccmm"; version="1.0"; sha256="0855nr74xxpy7in2vrw15g8pv7nm1374irc1c5hikr5hadk5pf8v"; depends=[MASS]; }; ccostr = derive2 { name="ccostr"; version="0.1.0"; sha256="0yfmj8v7ip595v87w9dmlzl5rih2j0lsapswh9b9vvc20wnk48ld"; depends=[data_table dplyr forcats ggplot2 knitr msm Rdpack rlang survival tibble]; }; ccrs = derive2 { name="ccrs"; version="0.1.0"; sha256="1nyw4ip9v7y6yfbfdz3bwhy4r6hpp1hiip3ycldxlkl9wrxkxgrw"; depends=[cds colorspace dplyr limSolve lsbclust msm]; }; ccss = derive2 { name="ccss"; version="1.0"; sha256="0m2facn6kwxrjxg9a8z0pjnhp0rkgw6nxj6sac93ig24zygx4380"; depends=[]; }; cctools = derive2 { name="cctools"; version="0.1.2"; sha256="03lp9pa9qr2hi584ivvmswxmwjw1c3a6xqladpqldjhzvzpxvcwi"; depends=[qrng Rcpp RcppArmadillo]; }; - cdata = derive2 { name="cdata"; version="1.1.5"; sha256="1ls1hc455j48rv7l5nh4dqpi27r4gnm65w7yd70m226h0ch6hsjb"; depends=[rqdatatable rquery wrapr]; }; + cdata = derive2 { name="cdata"; version="1.1.6"; sha256="06a5bj9nzafp6aamvnjij6xf7flqp2b01rpmir9chg05rvkjhb2b"; depends=[rqdatatable 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]; }; + cdcfluview = derive2 { name="cdcfluview"; version="0.9.1"; sha256="0j892zwg7y9gm057n1nk7r08wa8b611dzbanphfplh33j66rm4yg"; depends=[dplyr httr jsonlite MMWRweek purrr readr sf tibble units xml2]; }; cdcsis = derive2 { name="cdcsis"; version="2.0.3"; sha256="0hv52valyig3zzywm3058c5nxb2n7y3j2vfibxdbfg8414wwapd9"; depends=[ks mvtnorm Rcpp]; }; cde = derive2 { name="cde"; version="0.4.1"; sha256="19aifi2wh3hi929bf15v96z6gbzawgawjdipvx1v95krzij8fl2n"; depends=[data_table viridisLite]; }; cder = derive2 { name="cder"; version="0.2-2"; sha256="0aw2c170sqx2y4iz16avqijahwxlsaz590mxvsx4bicfd8nrcynk"; depends=[curl dplyr glue lubridate readr rlang stringr tibble]; }; cdfquantreg = derive2 { name="cdfquantreg"; version="1.2.2"; sha256="094mk2hvxww2lndx5wkw368ynqx6klbdwl30d1yv7kqmr2yy7388"; depends=[Formula MASS pracma]; }; cdlTools = derive2 { name="cdlTools"; version="0.14"; sha256="0zf00y8qcklz2yp7vx6mjvx2h2p4kq44r51z4qy88kq9v62rqz3k"; depends=[httr raster]; }; + cdlei = derive2 { name="cdlei"; version="1.0"; sha256="1zsgryrwr1nqhcyizrh67lm953b87ih9l4rvc6i59s4vg2ph1ph1"; depends=[]; }; cdom = derive2 { name="cdom"; version="0.1.0"; sha256="00xqqqhskjlkz8ii7kqyabxk8995w7g9jiz1isyqjpwg8nsa3x28"; depends=[broom ggplot2 minpack_lm tidyr]; }; cdparcoord = derive2 { name="cdparcoord"; version="1.0.1"; sha256="0ym2ypw4bsvmx9q4vskrq4pdd92y47vs8pay8san40rgzwqr2agb"; depends=[data_table freqparcoord partools plotly]; }; cds = derive2 { name="cds"; version="1.0.3"; sha256="1h34k96h7ajkaqsw4dlqri63hrbnshaqwrdl74wlgycdlbvrqj05"; depends=[clue colorspace copula limSolve MASS]; }; @@ -5915,8 +5958,10 @@ in with self; { cellVolumeDist = derive2 { name="cellVolumeDist"; version="1.3"; sha256="00hq3nbfbnmg2lhrqd0glkh5ld50fv54ll3q6v875d1lgs44sln1"; depends=[gplots minpack_lm]; }; cellWise = derive2 { name="cellWise"; version="2.1.0"; sha256="1zwpgzwrmpr354bdvqdd5hxx7a39m1057ncqzrk2azki37byhdqg"; depends=[ggplot2 gridExtra matrixStats Rcpp RcppArmadillo reshape2 robustbase rrcov scales svd]; }; cellranger = derive2 { name="cellranger"; version="1.1.0"; sha256="16fgi3annn34c3cxi0pxf62mmmmxi21hp0zzlv7bkfsjqy4g4f2x"; depends=[rematch tibble]; }; + celltrackR = derive2 { name="celltrackR"; version="0.3.1"; sha256="1mnqaklc3rkx5mm41n99ky11bjs4l0dppapkwfvkyg3a0h0xzsbb"; depends=[ellipse]; }; cem = derive2 { name="cem"; version="1.1.19"; sha256="17i6jp6czjgchg16zndnh828hs8v28x25gy5f8mkzfhc5pfjd8mq"; depends=[combinat lattice MatchIt nlme randomForest]; }; cenGAM = derive2 { name="cenGAM"; version="0.5.3"; sha256="0qic2g2bq24k9jimxdk8g7bsmi4br2r6159ipdhh5ym81ji3sf5p"; depends=[mgcv]; }; + cenROC = derive2 { name="cenROC"; version="1.0.0"; sha256="1y7l4pmvky41n22l35rk984v2wmd3ss0gc08nijxb78nxx3kvs7p"; depends=[condSURV]; }; censCov = derive2 { name="censCov"; version="1.0-0"; sha256="0i9vmyi12f1m5xnrl4cxk3z9qv7ymzxsyf4gbnpg1ph63yfnhv3g"; depends=[survival]; }; censNID = derive2 { name="censNID"; version="0-0-1"; sha256="1ij5ci6nkqf0rq51vyh4jw5sr3y46yndfkjmwl78ppdj66axxir5"; depends=[]; }; censReg = derive2 { name="censReg"; version="0.5-30"; sha256="1zpbswyl1l7z4rfb1rws66g5vf150vj4d1y54681lvvbawhlnym3"; depends=[glmmML maxLik miscTools plm sandwich]; }; @@ -5936,8 +5981,9 @@ in with self; { ceramic = derive2 { name="ceramic"; version="0.6.0"; sha256="0n0l1b7gb05kqjrh696faq868q3nbwlg34y6wgr0w205kdq6qs17"; depends=[curl dplyr fs glue jpeg magrittr png purrr rappdirs raster reproj rlang slippymath sp spex tibble]; }; cernn = derive2 { name="cernn"; version="0.1"; sha256="0gz2x20pgsiq85hwkkpg4s1cdlw9plygx0446djc7qsymp469p2w"; depends=[]; }; cetcolor = derive2 { name="cetcolor"; version="0.2.0"; sha256="0kygdcr9ldanr0z4qpygwh0padki7s2ad0j6myky601g4228z79q"; depends=[]; }; - ceterisParibus = derive2 { name="ceterisParibus"; version="0.3.1"; sha256="1vysa4yq5qjvhpl0x3snaqa45ywsn8hhpnc657v02kvvzlgx508j"; depends=[DALEX ggplot2 gower knitr]; }; + ceterisParibus = derive2 { name="ceterisParibus"; version="0.4.2"; sha256="0hxklydsqb69y5sv2hanp5ja9k0063swf5si1j6gcj15lp7phpif"; depends=[DALEX ggplot2 gower knitr]; }; cfa = derive2 { name="cfa"; version="0.10-0"; sha256="12z58y4ls9m58wpj1xa4ir2p2apzxaskps05sxy2946m24i71zfk"; depends=[]; }; + cfdecomp = derive2 { name="cfdecomp"; version="0.1.0"; sha256="1cgm55z05ksd1zga8qhk8z2cskaxgs9rbm0nnz9wyphaq42vsiq6"; depends=[]; }; cffdrs = derive2 { name="cffdrs"; version="1.8.6"; sha256="1acj27ip4grrji5zyx7hv5b6x3bx87f29id9rnn19gj35mj5a9fl"; depends=[data_table doParallel foreach geosphere raster rgdal spatial_tools]; }; cfma = derive2 { name="cfma"; version="1.0"; sha256="006z5g3rqpg44jqdf6ivyxr47sxm5cd9cqhayfi8qk73xx5w4lv9"; depends=[]; }; cg = derive2 { name="cg"; version="1.0-3"; sha256="1kbyal1sicbr10yvxpwgcij710kqpi23vmndp9kyfzn3k8zfird3"; depends=[Hmisc lattice MASS multcomp nlme rms survival VGAM]; }; @@ -5948,12 +5994,13 @@ in with self; { cghRA = derive2 { name="cghRA"; version="1.6.0"; sha256="16dlw27s8wckc75xcwc2g74pw6bar0y0ii3h53w1hql05d4f7sb8"; depends=[DNAcopy Rgb]; }; cglasso = derive2 { name="cglasso"; version="1.1.1"; sha256="0d3r6jxrh1z4qnpxcfvwd7bcayzya2dhfl3hpfqd2dzm8fwwc2lf"; depends=[igraph MASS]; }; cglm = derive2 { name="cglm"; version="1.1"; sha256="1r3wrds5lbirzzqsi12prwykxa5361jb95pq7j95nlp6y8kcb94j"; depends=[data_table nleqslv Rcpp RcppArmadillo]; }; - cgmanalysis = derive2 { name="cgmanalysis"; version="2.5"; sha256="0mpdd56zhvdlwl305752ivmabmlqb2pkayqrscraq7kshb3fm8cr"; depends=[ggplot2 lubridate pastecs pracma readr readxl zoo]; }; - cgraph = derive2 { name="cgraph"; version="5.0.1"; sha256="14x0q2353kfd66788amxydayqigrhfgdkf9i6rcliwc0cx9hqcck"; depends=[]; }; + cgmanalysis = derive2 { name="cgmanalysis"; version="2.6.1"; sha256="0jrsn5i04gaxkcgjyrmlpx66gw27smq7r0s2v1j7hfd15q875sz6"; depends=[ggplot2 lubridate pastecs pracma readr readxl XML zoo]; }; + cgraph = derive2 { name="cgraph"; version="6.0.1"; sha256="0hmp07iz7ya3j8jaghm4pa0b84lsinc48rsibbh47sd3i6pkxfik"; depends=[]; }; cgwtools = derive2 { name="cgwtools"; version="3.0.1"; sha256="15qllfcgls6hpj51xa7mklr5ppxrs2avbiwq3y4bqbb20fld78w3"; depends=[]; }; chandwich = derive2 { name="chandwich"; version="1.1.2"; sha256="196k13qg9kl94yki989ncx2mrvvj82vv8mi453s8lqmv9s875841"; depends=[numDeriv]; }; changedetection = derive2 { name="changedetection"; version="0.2.0"; sha256="0j8x7qyna7qgjhx56yxav1g3wj3r47zvx2hivybsjis2gqbl82hr"; depends=[glmnet L1pack Rdpack]; }; changepoint = derive2 { name="changepoint"; version="2.2.2"; sha256="1jbki95pck10phpxna0b4i79hhl912zqi5ii9mjqb673y64dszkj"; depends=[zoo]; }; + changepoint_geo = derive2 { name="changepoint.geo"; version="1.0.1"; sha256="1jlixdrq97n6bh09jq3hamlwkqfqbmqs14kr8swx20f8fvfr3fj2"; depends=[changepoint changepoint_np ggplot2 Rdpack]; }; changepoint_mv = derive2 { name="changepoint.mv"; version="1.0.1"; sha256="1cv7gkfzzb8qmm49ygrkcsvlj3hx41wj8h2msa9rrawj33awj1c6"; depends=[assertive ggplot2 Rcpp Rdpack reshape2 tbart zoo]; }; changepoint_np = derive2 { name="changepoint.np"; version="1.0.1"; sha256="0ai5p77x3261ps22x8z00qiv1d3z2mf8qgi0bfc5bqnnzf44k0c2"; depends=[changepoint Rdpack zoo]; }; changepointsHD = derive2 { name="changepointsHD"; version="0.3.3"; sha256="1wdhmkg21kb5jd95a0aqqp2qgdkndc69rbdxjf792gq8f1rigarh"; depends=[Rcpp RcppArmadillo]; }; @@ -5965,29 +6012,31 @@ in with self; { chebpol = derive2 { name="chebpol"; version="2.1-2"; sha256="126cgqnl9jy332q0ywg9dr11d4q1aichwwakb1xcrxrqw2j26zzi"; depends=[geometry]; }; checkLuhn = derive2 { name="checkLuhn"; version="1.1.0"; sha256="1s1ix5n98bcbzcvrz5h19sk9pchdvrhpy3ppmw96ys8vylzm58mv"; depends=[dplyr stringr]; }; checkarg = derive2 { name="checkarg"; version="0.1.0"; sha256="0rkdjs2c4yx9laqgayxz57bwxhwgdh6ndrr4i3b1kh31lcmk1xc6"; depends=[]; }; - checkmate = derive2 { name="checkmate"; version="1.9.4"; sha256="08ddpgs4mv5d5y4j054pm8drmxkn7yvhfpbghwxlizjpnxa5g8ps"; depends=[backports]; }; - checkpoint = derive2 { name="checkpoint"; version="0.4.8"; sha256="0j5z6kmpfns8i28bkdbmwcmbv8cxmfws9d57kv3g1g3km2fmiwcl"; depends=[]; }; + checkdown = derive2 { name="checkdown"; version="0.0.3"; sha256="0bl8207lyjgjcrd55jn0dlrkbhk7qavxxrixni8jgsf5v83ydkrm"; depends=[knitr markdown]; }; + checkmate = derive2 { name="checkmate"; version="2.0.0"; sha256="193gkifr9spp0x0rwnjq1spdhjkfkh4mv27iklskcj604075phhd"; depends=[backports]; }; + checkpoint = derive2 { name="checkpoint"; version="0.4.9"; sha256="0kwbfkk3zm60w993gvwxxrikbxjdw4sgjrs9h18v3yw19kw1q9m5"; depends=[]; }; checkr = derive2 { name="checkr"; version="0.5.0"; sha256="14hkpfbw5ibdwz2jygir2f2bb2qgrj62gn3449n4dif31nswaj2f"; depends=[err]; }; - cheese = derive2 { name="cheese"; version="0.0.2"; sha256="08947y0zh3kp4ggvbrv7rl5rgj3yhmdwpbbkg8vd0hmbyz8vycc0"; depends=[dplyr forcats kableExtra knitr magrittr purrr rlang stringr tibble tidyr tidyselect]; }; + cheddar = derive2 { name="cheddar"; version="0.1-636"; sha256="1lf39v0p583jgiyb02vx0rgbwzmmhgkfpwjib2fzh9ffbs8bfk66"; depends=[]; }; + cheese = derive2 { name="cheese"; version="0.0.3"; sha256="0li828ijwgiggn80s3y1x6d7nblifzhc05biln9knvg2g3d22ca7"; 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]; }; cherry = derive2 { name="cherry"; version="0.6-13"; sha256="1bpahdymkc2w6mc5pjyq4q59iwzskw37swx3sw4rnbmnhzhwaf8n"; depends=[bitops hommel lpSolve Matrix]; }; - chest = derive2 { name="chest"; version="0.2.0"; sha256="1p5ggkx73k1ji40y94sbihwh05lbwy6pb060nf3spx0vfs0y8q4m"; depends=[broom forestplot MASS scales speedglm survival tibble tidyselect tidyverse]; }; + chest = derive2 { name="chest"; version="0.3.1"; sha256="0m37x5jqlpfr3gbfc3yacwv2aqzcszjxrav7janxsckpxngxrarb"; depends=[broom dplyr forestplot ggplot2 magrittr MASS speedglm survival tibble]; }; chi = derive2 { name="chi"; version="0.1"; sha256="1y91mwahj4j2wz0y5k5vdpq7ygq834h8jkn37n74lqnwvv1968rr"; depends=[]; }; chi2x3way = derive2 { name="chi2x3way"; version="1.1"; sha256="13qc8sigiw4gcxk8y50q7yfgzbssjyl41fizzjqzcp3p14kpsmzw"; depends=[]; }; chicane = derive2 { name="chicane"; version="0.1.1"; sha256="1d2rvaxdcambawf8l4sn566nr3s8xgf8nfpqa5n6lazvik8vb7kb"; depends=[data_table doParallel foreach gamlss gamlss_tr iterators MASS]; }; childesr = derive2 { name="childesr"; version="0.1.2"; sha256="170xjsk0sjwlw3w3nf9jmq4yd6ivbznmjhqq2np5grn1rwlswawb"; depends=[DBI dbplyr dplyr jsonlite magrittr purrr RMySQL]; }; childhoodmortality = derive2 { name="childhoodmortality"; version="0.3.0"; sha256="1ixd10jyzgr1ssnjas35kngpsqyjzl73wwpvcspv06cn12sv2b8d"; depends=[dplyr matrixStats plyr]; }; childsds = derive2 { name="childsds"; version="0.7.4"; sha256="1dyzidmbr7608y65kymf7x5s19qjsz9hxzfv51ml1kaymml1hbf3"; depends=[boot class dplyr gamlss gamlss_dist magrittr purrr purrrlyr reshape2 tibble tidyr VGAM]; }; - chilemapas = derive2 { name="chilemapas"; version="0.1.4"; sha256="1y873bb94chjkskzbj1k8dh7jvcx1qsifafaqkp3544y7si1l0lv"; depends=[dplyr magrittr rlang rmapshaper sf stringr]; }; + chilemapas = derive2 { name="chilemapas"; version="0.2"; sha256="0s2f5bhr7d64rlk4x7cv6zjrbnf5g86lgg026svgrdxvs1vqa4as"; depends=[dplyr magrittr rlang rmapshaper sf stringr]; }; chillR = derive2 { name="chillR"; version="0.70.21"; sha256="0sj97c4sgmywr5fl5csjyk9g6sy4a6vw2ryvg0idsfidklrdfvxd"; depends=[assertthat dplyr fields ggplot2 httr jsonlite Kendall pls plyr R_utils raster RCurl readxl reshape2 rlang RMAWGEN sp XML]; }; chinese_misc = derive2 { name="chinese.misc"; version="0.2.1"; sha256="17sffxjpga8mq8xfxhas9jqj71bb80ayz4m2dgnmg1w6bb3p7bsp"; 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]; }; chisq_posthoc_test = derive2 { name="chisq.posthoc.test"; version="0.1.2"; sha256="0lvj3jqhaj1ijjpzvpq3fn3a1y3fgv69pxh91j6k958pn6vmp40i"; depends=[]; }; - chk = derive2 { name="chk"; version="0.3.0"; sha256="1s819nkcyfipa2fz684850xv4hh6x4iph6dyxd6xrfxx7mi5vvw8"; depends=[lifecycle rlang]; }; + chk = derive2 { name="chk"; version="0.4.0"; sha256="0d7vjbz8s77r3s8i78bgzb7vgni0ryr9jh0h5nr20aqig68dr82k"; depends=[lifecycle rlang]; }; chlorpromazineR = derive2 { name="chlorpromazineR"; version="0.1.2"; sha256="0zg3xjq67na98n4amsm5v4cn9ba1k7c0lb7k2lvxa3n1w7rndpw3"; depends=[]; }; - chngpt = derive2 { name="chngpt"; version="2019.11-30"; sha256="1yw6hsshpsavmx3v1ndh4b0crr8wsak8h1vbv5qrbj3g1jzazrx7"; depends=[boot kyotil MASS survival]; }; + chngpt = derive2 { name="chngpt"; version="2020.2-26"; sha256="103fwjxm1z9k9l7nw8ckj8zjwlk9dkqrk58gn8hpzd44rxv1476c"; depends=[boot kyotil MASS survival]; }; choiceDes = derive2 { name="choiceDes"; version="0.9-3"; sha256="1nsc8p4svfc6z7ckffl24c0acnaxi6cnpz7jq03vzn6spxvpjcmw"; depends=[AlgDesign]; }; cholera = derive2 { name="cholera"; version="0.7.0"; sha256="0ja013k431vd0sjy74y2mlrii46rbwb5x886jaza4ihb48mgz7ah"; depends=[deldir ggplot2 HistData igraph KernSmooth pracma RColorBrewer sp threejs TSP]; }; choplump = derive2 { name="choplump"; version="1.0-0.4"; sha256="0fn6m3n81jb7wjdji4v04m53gakjfsj3ksm546xxz5zm7prk237s"; depends=[]; }; @@ -5996,22 +6045,22 @@ in with self; { choroplethr = derive2 { name="choroplethr"; version="3.6.3"; sha256="0m6kyrgnv5s1q2ncc63rfxcwqdqx5adqk14q57ss4r84i14dm5yb"; depends=[acs dplyr ggmap ggplot2 gridExtra Hmisc R6 RgoogleMaps stringr tigris WDI]; }; choroplethrAdmin1 = derive2 { name="choroplethrAdmin1"; version="1.1.1"; sha256="13ljs21hdhiv6n4napmk1gjnjhpll6j5wyijzv4xnnbi1y3ns7a9"; depends=[ggplot2]; }; choroplethrMaps = derive2 { name="choroplethrMaps"; version="1.0.1"; sha256="0ghqb2d1h0qkbcsll6ck2qk5sfvdwsrlh3phlbsjbak30832j7fr"; depends=[]; }; - chorrrds = derive2 { name="chorrrds"; version="0.1.9.2"; sha256="0g999i5nlxhbjcnx3kfv4qzd16ybj0da5bwkkn0bsb9qbp8s7lll"; depends=[dplyr forcats magrittr purrr stringr XML zoo]; }; + chorrrds = derive2 { name="chorrrds"; version="0.1.9.4"; sha256="1sdj2x6qiqp787v1xzwixjaidi2pyg42snrrkyhmnflfksgdbmys"; depends=[dplyr forcats magrittr purrr rvest stringr xml2]; }; christmas = derive2 { name="christmas"; version="1.0.0"; sha256="06a2r56vh7m6j0kfbf3b3aapn52x693fzdn29sxfvyackdk5dhj3"; depends=[animation]; }; chromer = derive2 { name="chromer"; version="0.1"; sha256="0fzl2ahvzyylrh4247w9yjmwib42q96iyhdlldchj97sld66c817"; depends=[data_table dplyr httr]; }; chromoMap = derive2 { name="chromoMap"; version="0.2"; sha256="1ljjwkv7rdy1mcrkb8dd5lfkg54gxzclsjvla4qnc8j5hmfp0p8g"; depends=[htmltools htmlwidgets]; }; chromoR = derive2 { name="chromoR"; version="1.0"; sha256="1x11byr6i89sdk405h6jd2rbvgwrcvqvb112bndv2rh9jnrvcw4z"; depends=[gdata haarfisz]; }; - chron = derive2 { name="chron"; version="2.3-54"; sha256="0vc7dxqwx0jqzwszax6di3091npsxnhnbvr7sy7rlip0jqzarwqd"; depends=[]; }; - chronosphere = derive2 { name="chronosphere"; version="0.2.0"; sha256="0c1qahgjnnncckyizdrpsxywq5120xflv9cgwdwhypgda3r05kql"; depends=[raster sp]; }; + chron = derive2 { name="chron"; version="2.3-55"; sha256="09gbs7c1ynlg0kl1m6nkbn75ysk16g13r17snnaws64qwywiywqg"; depends=[]; }; + chronosphere = derive2 { name="chronosphere"; version="0.2.2"; sha256="11vc7ids362jm1xd4z4mfmjbpsxw8wmjnn26ivy7n42xlqqzzpnf"; depends=[raster sp]; }; chunkR = derive2 { name="chunkR"; version="1.1.1"; sha256="1kw3hsx5k4cdicx0hc1v0mf2nzvqg95shx2xv05vb2pass48qw48"; depends=[Rcpp]; }; - chunked = derive2 { name="chunked"; version="0.4"; sha256="0pqk6nnxxnlsw9zal62ajjalrlmvkdrzyz2l8r10jd7s61vhra40"; depends=[DBI dplyr LaF lazyeval]; }; + chunked = derive2 { name="chunked"; version="0.5.0"; sha256="1b28hqngdkkn4wnkd3b8vcaf3md6jan73nbx240v6s2nj2anlnc8"; depends=[DBI dplyr LaF progress rlang]; }; ciTools = derive2 { name="ciTools"; version="0.5.1"; sha256="02jgi09vkzsan47mvg65ciqc1q4vmrl14v2i5bsaqxbvxwd65lww"; depends=[arm boot dplyr lme4 magrittr MASS survival tibble]; }; + cicerone = derive2 { name="cicerone"; version="1.0.1"; sha256="02dzd82vldn1k5i0j8kw1pp1jwakqnsvd1k88czh3qqfaa4wsrq5"; depends=[assertthat R6 shiny]; }; cifti = derive2 { name="cifti"; version="0.4.5"; sha256="092334lcpkzv52bg53hzx64dnrwq67f3p9fzwchmafx1l46xrqx9"; depends=[gifti oro_nifti R_utils xml2]; }; cimir = derive2 { name="cimir"; version="0.4-0"; sha256="0sp8hd354hnrmbyn3gm2sgvkf32n7kqpg9bc56583ibyfc8s4gwm"; depends=[curl dplyr glue jsonlite purrr rlang stringr tidyr]; }; cin = derive2 { name="cin"; version="0.1"; sha256="1pwvy5nh5nrnysfqrzllb9fcrpddqg02c7iw3w9fij2h8s2v6kq5"; depends=[]; }; cinterpolate = derive2 { name="cinterpolate"; version="1.0.0"; sha256="1aw6hs41xin2hhgmi4pr5510v4sn6x735lachpc5gpbxch5h3f82"; 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.8"; sha256="0jvr9hmxyhg0zx101iiqkrg8wfaj86kp62xpv42n2j9fkn5r1mi2"; depends=[colorspace GlobalOptions shape]; }; circular = derive2 { name="circular"; version="0.4-93"; sha256="0hki85rs8wc5950pjaw28q54rly2napfbcrx3pchlfap6wwy5kkn"; depends=[boot mvtnorm]; }; circumplex = derive2 { name="circumplex"; version="0.3.5"; sha256="1qbh1piwbbwri3m3b00n4rlicmihfivsqq7gh02vqw01fckg60sl"; depends=[assertthat boot dplyr ggforce ggplot2 glue htmlTable magrittr purrr Rcpp RcppArmadillo rlang tibble tidyr]; }; @@ -6021,45 +6070,45 @@ in with self; { citecorp = derive2 { name="citecorp"; version="0.2.2"; sha256="1a5hw9xaa84n847rb8a317svhya1dpfbb79sabaw6m6db4nagm6z"; depends=[crul data_table fauxpas jsonlite]; }; citr = derive2 { name="citr"; version="0.3.2"; sha256="1qbarvafjb8jgkrnrhh6jw7mcglmjwf7dpdiibxf39jkmlhf7las"; depends=[assertthat curl httr miniUI RefManageR rstudioapi shiny shinyjs yaml]; }; ciuupi = derive2 { name="ciuupi"; version="1.1.0"; sha256="0czfmmf62p1vml24s87pdwv52spqycchpkqzwk8vyd4n1z27r5s2"; depends=[functional nloptr pracma statmod]; }; - civis = derive2 { name="civis"; version="2.1.0"; sha256="0bpm42q243ghq03x9vajs0yjdhy4lgn7fqndc53172inmkxwp7dy"; depends=[future httr jsonlite memoise]; }; + civis = derive2 { name="civis"; version="2.1.2"; sha256="085cy1icqn78vimkjv2zdd5m1qf47qj9hl8vkpd29a948nkiv9xf"; depends=[future httr jsonlite memoise]; }; cjoint = derive2 { name="cjoint"; version="2.1.0"; sha256="1bs380ji9vsc1d77wqhl0ij9xblww3g9x3hiwpcpz26wihqcx7ac"; depends=[DT ggplot2 lmtest Matrix sandwich shiny shinyBS shinyjs survey]; }; ckanr = derive2 { name="ckanr"; version="0.4.0"; sha256="17mb8ank4p39mkmkrpj40hk2g1wpn06k0rx65hqd5h49pvlj21d3"; depends=[DBI dbplyr dplyr httr jsonlite magrittr]; }; clValid = derive2 { name="clValid"; version="0.6-6"; sha256="1l9q7684vv75jnbymaa10md13qri2wjjg7chr1z1m0rai8iq3xxw"; depends=[class cluster]; }; cladoRcpp = derive2 { name="cladoRcpp"; version="0.15.1"; sha256="0msay6yvm6wc964gwrz31ky5w4mizakji3j6rpkydz0zlrl52v1j"; depends=[Rcpp RcppArmadillo]; }; - clam = derive2 { name="clam"; version="2.3.2"; sha256="1za0njc10mcvdmyyy4yy6sgzl6kk2kix319w84d5mcs2zrfb83j4"; depends=[]; }; + clam = derive2 { name="clam"; version="2.3.4"; sha256="1d86m3mf18h0rx03bxc8rx9zsjd77b60ik85mblxg4d4apvzh096"; depends=[]; }; clampSeg = derive2 { name="clampSeg"; version="1.0-5"; sha256="05922fddvi7s4imdnr9fb27aqskgd489amw9h86g5vw4l494lnl9"; depends=[Rcpp stepR]; }; clarifai = derive2 { name="clarifai"; version="0.4.2"; sha256="0igi4xl27nz0r85hpws2zfc2gn5z2nmywp3saxgp74mh2y99lg6s"; depends=[curl jsonlite]; }; - class = derive2 { name="class"; version="7.3-15"; sha256="1x1hqz8xyhbpq4krsh02glqnlzcch25agkmn4a3da9n723b37gzn"; depends=[MASS]; }; + clarkeTest = derive2 { name="clarkeTest"; version="0.1.0"; sha256="0vbb3j9rnh42qyp78a4jykp7p560d0ryfp28xgvxax8h8hr80457"; depends=[]; }; + class = derive2 { name="class"; version="7.3-16"; sha256="1jpdgj0lsi60q0mqbhfw809w8d66whix27y6wpdzll6775g3j3ll"; depends=[MASS]; }; classGraph = derive2 { name="classGraph"; version="0.7-5"; sha256="19jb9jr1gfg4karymrbilh0zjrlsczhy2q03x5b0jxnh4ykhxfj8"; depends=[graph Rgraphviz]; }; classInt = derive2 { name="classInt"; version="0.4-2"; sha256="0w980hrw8sgfdfyd5dsimalq7gwhvqm7507abk7k363pvgks23dv"; depends=[class e1071 KernSmooth]; }; - classiFunc = derive2 { name="classiFunc"; version="0.1.1"; sha256="1qaima3sii394741p5n06lcqkk4fiv9apb7qqnpi6srx5h02lfl5"; depends=[BBmisc checkmate dtw fda fda_usc fdasrvf proxy rucrdtw zoo]; }; classifierplots = derive2 { name="classifierplots"; version="1.3.3"; sha256="01rvn0jwliyxj7q4cmyv8an5g7fzn6y3sccp8mj6bcqjyblfcfaa"; depends=[caret data_table ggplot2 gridExtra png Rcpp ROCR]; }; classifly = derive2 { name="classifly"; version="0.4"; sha256="0mw1vcas0gr1r4yvh0j02zhk7kp5342r0bhhg776hqgqdczgh5zj"; depends=[class plyr]; }; - classyfireR = derive2 { name="classyfireR"; version="0.3.0"; sha256="1cagdwr8i3f4c4hjdgg64f3kp7ibndh766na7psd0pmki5s8grsv"; depends=[cli clisymbols crayon dplyr httr jsonlite magrittr purrr stringr tibble]; }; + classyfireR = derive2 { name="classyfireR"; version="0.3.3"; sha256="17h9xx5ap77ry50rbpl9gi1hbp1vahdwl99kkqsra79b8aixs2kj"; depends=[cli clisymbols crayon dplyr httr jsonlite magrittr purrr stringr tibble]; }; cld2 = derive2 { name="cld2"; version="1.2"; sha256="03ffg1nxdlmg66sgg0w2jdx2s5jzdp8qhja24z0il2qy3qsa915k"; depends=[Rcpp]; }; - cld3 = derive2 { name="cld3"; version="1.2"; sha256="11bjkbhjxaf6lc96qm8zk4k1i66b69f8dmc303i1560b2jj2zah3"; depends=[Rcpp]; }; + cld3 = derive2 { name="cld3"; version="1.3"; sha256="1xaac0phck00i2pm81m2xphy7r3lvbvj9z14y6asfz0cfjm7acx3"; depends=[Rcpp]; }; clean = derive2 { name="clean"; version="1.1.0"; sha256="11jfg9xh6xyhcva4pq5bl7bg2d2ar12mp568j8j79dqlci3f53zx"; depends=[crayon knitr pillar rlang]; }; - cleanEHR = derive2 { name="cleanEHR"; version="1.0"; sha256="0i8q7y4izc7q1pshdajy0n9wyihj4wlzzkd52ykam3dxqnwlnyh4"; depends=[data_table ggplot2 knitr pander Rcpp XML yaml]; }; - cleanNLP = derive2 { name="cleanNLP"; version="3.0.0"; sha256="15prwj32rq28dqqpfagaq4vfbimjws7ldrjm7waf4w6rcavz7r93"; depends=[Matrix reticulate stringi udpipe]; }; + cleanNLP = derive2 { name="cleanNLP"; version="3.0.2"; sha256="0fwi717mmw6nb81x4wlq6pfcgv0jizrw2fkiaxz0wnhvkh3i82y6"; depends=[Matrix reticulate stringi udpipe]; }; cleancall = derive2 { name="cleancall"; version="0.1.1"; sha256="1gq7bjywgslybfk97k3fxglp6j78a0cklaammccvffs3b94i4zh4"; depends=[]; }; cleandata = derive2 { name="cleandata"; version="0.3.0"; sha256="1lm7k25j16p888xvd7rzzd3sb3namzjlpjn22xmmpzlzyl0h7dhk"; depends=[]; }; - cleaner = derive2 { name="cleaner"; version="1.3.0"; sha256="0k0nhq6ap3gwdx6vdq226d7x1sp7inrm4cgxlibvaycrg8zbcjxb"; depends=[crayon knitr pillar rlang]; }; + cleaner = derive2 { name="cleaner"; version="1.4.0"; sha256="0y35cshg2a31s4ykbmzchgca7bckzr53xzzbm6941liwrfysn278"; depends=[crayon knitr pillar rlang vctrs]; }; cleanerR = derive2 { name="cleanerR"; version="0.1.1"; sha256="0rghn8rx7dj5clmc1dqvqwfm9kiva04k9gxsjjga3109l4jcpg63"; depends=[data_table plyr]; }; cleangeo = derive2 { name="cleangeo"; version="0.2-3"; sha256="02py25pir16yklffpdicljxhwdf7bqchqllgdk069f5gikfc8yrr"; depends=[maptools rgeos sp]; }; cleanr = derive2 { name="cleanr"; version="1.3.0"; sha256="15icq6p2sxaz5jsdwqlqg7mgal4310vk96w53wzv3dzpzxndz7s4"; depends=[checkmate pkgload rprojroot]; }; - clere = derive2 { name="clere"; version="1.1.4"; sha256="1nk3chcnaa4y1c5rr6c3bapvi106ikbk9grqcq6s6j0imny1jp4a"; depends=[lasso2 Rcpp RcppEigen]; }; + clere = derive2 { name="clere"; version="1.2.0"; sha256="0qc26ycycxphrbksk7jb1m6vh66a2zsnw8k4jnazs23sqdg24im9"; depends=[Rcpp RcppEigen]; }; clespr = derive2 { name="clespr"; version="1.1.2"; sha256="1993kd70w48a110im47vcpll0c6nfrm7m33r6l8rzgwnpsmcls8g"; depends=[AER clordr doParallel foreach magic MASS pbivnorm survival]; }; clhs = derive2 { name="clhs"; version="0.7-2"; sha256="093hqqbmwbrcggqjcz4yiaavvwpv6xi12nc50ca9sg5ajlg4xg65"; depends=[cluster ggplot2 plyr raster reshape2 scales sp]; }; - cli = derive2 { name="cli"; version="2.0.1"; sha256="0x28i7kj4qndk6mnn99qn9w2nfldv8csjnsn0n8phfnxq5hnmp5y"; depends=[assertthat crayon fansi glue]; }; + cli = derive2 { name="cli"; version="2.0.2"; sha256="1dhkah6jvr96k4h4agcc2rfls75bpjb0j58fzaz3dc0fp3jk8229"; depends=[assertthat crayon fansi glue]; }; cliapp = derive2 { name="cliapp"; version="0.1.0"; sha256="152hllp4iiva2qib79700v1mx1biy8bg4sy496vwq6mi4afvswjy"; depends=[cli crayon fansi glue prettycode progress R6 selectr withr xml2]; }; - clickR = derive2 { name="clickR"; version="0.4.40"; sha256="1wwipqg5d158f4j26bvz2ig2wrcnlxqc713pxnnfml0nmrvnx41w"; 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]; }; + clickR = derive2 { name="clickR"; version="0.4.47"; sha256="1fs0zh9djgvy8cicvab9i6dji85l1z8wlr6wpfypnwvnblc64qam"; depends=[beeswarm boot flextable lme4 lmerTest officer xtable]; }; + clickstream = derive2 { name="clickstream"; version="1.3.1"; sha256="0z1yy5lr9m5x9ybimjy3f6kn490abdi038xi0qw7ny80f1ca6ry7"; depends=[arules ClickClust data_table ggplot2 igraph linprog MASS plyr reshape2 Rsolnp]; }; + clifford = derive2 { name="clifford"; version="1.0-2"; sha256="17br7p4zj1cjf1nbwbk0a2jjxj589qgvlnzi6yp4dqlf2g0w01z6"; depends=[BH Rcpp]; }; clifro = derive2 { name="clifro"; version="3.2-2"; sha256="11bfvaf1b1wv83dw8ggj7ldsc6fs8s3gl7jdzyq7l1w7innihp9s"; depends=[ggplot2 lubridate magrittr RColorBrewer RCurl reshape2 scales xml2]; }; clikcorr = derive2 { name="clikcorr"; version="1.0"; sha256="0zdnbcl5q293mmm6pbn4ri7p1q6z6sff74axsb3nyd153v2xamr5"; depends=[mvtnorm]; }; - climate = derive2 { name="climate"; version="0.3.0"; sha256="1pabgfx25rza823jrbmk6x2yzv3s7y3zwgiags34z62h9m51772a"; depends=[imgw RCurl XML]; }; + climate = derive2 { name="climate"; version="0.9.3"; sha256="00gkfwzbfbpyd27w0rygmr7z143mx4dki7rj2631bc63rwj9dbch"; depends=[RCurl XML]; }; climateStability = derive2 { name="climateStability"; version="0.1.3"; sha256="1zag722sznr22xid2v1k4a9sh3sr3grfa3wwd2m943zpvyi1sk9a"; depends=[raster]; }; climatol = derive2 { name="climatol"; version="3.1.2"; sha256="0p3nk4n7izj0cmmqd9apa1gix5lfdzp08ydy0n7rkl5kbkmrkb6n"; depends=[mapdata maps]; }; - climbeR = derive2 { name="climbeR"; version="0.0.1"; sha256="10i74bph7dhv2xj01qdhymlmfwj32lzxivanif11zmzmq9p5bqsw"; depends=[ggplot2]; }; + climatrends = derive2 { name="climatrends"; version="0.1.0"; sha256="1jn7xib07n6f9vq614cxahxph4mrs8xbv484npl0702klpk6fjqg"; depends=[nasapower tibble]; }; climdex_pcic = derive2 { name="climdex.pcic"; version="1.1-11"; sha256="01ax0kas43g3h21ixzc80f9gl4m9846gmk8v48rr0gkhcmbcc6jx"; depends=[PCICt Rcpp]; }; clime = derive2 { name="clime"; version="0.4.1"; sha256="0qs9i7cprxddg1cmxhnmcfhl7v7g1r519ff2zfipxbs59m5xk9sf"; depends=[lpSolve]; }; climextRemes = derive2 { name="climextRemes"; version="0.2.1"; sha256="1ii79zfdz90agirh3kbq80qk8nib9ks8f42f6y664j4pwk9550w3"; depends=[boot extRemes]; }; @@ -6075,14 +6124,12 @@ 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.1"; sha256="1j15q9yb2rc4fbjxfh21fiq6is8dnb8nfyi7g8iazgfwb3p9ahpx"; depends=[config jsonlite packrat processx rprojroot rstudioapi tfruns withr yaml]; }; - clpAPI = derive2 { name="clpAPI"; version="1.2.11"; sha256="0xwwv4ccflrrapqlzwccblyhda5bmbhs7agwwwjriwxnhxghlpbm"; depends=[]; }; + clpAPI = derive2 { name="clpAPI"; version="1.2.13"; sha256="1v1ff7plr9x212cfsva9xp80q7x3vgkgmwj8qj0cch36p5p4973h"; depends=[]; }; clr = derive2 { name="clr"; version="0.1.2"; sha256="088ks9lrhlyvg3yvlfmb0091yp6qp5bzg9h5r6ryv3bk6y56sajx"; depends=[dplyr lubridate magrittr]; }; - clrdag = derive2 { name="clrdag"; version="0.6.0"; sha256="1py5x1783c9d83hgar3g70qgbsakgs6n5ckpx87fiw32l040abwa"; depends=[Rcpp RcppArmadillo]; }; clttools = derive2 { name="clttools"; version="1.3"; sha256="0va9k1b4xsb2sgpxzvid6sa8m6b8i3r4kgghclmb78nnrs480cwi"; depends=[]; }; - clubSandwich = derive2 { name="clubSandwich"; version="0.4.0"; sha256="1kz68vmfahsszxkck3c59qi35sr7987ym0znp07h3smrw1r85xcd"; depends=[sandwich]; }; + clubSandwich = derive2 { name="clubSandwich"; version="0.4.1"; sha256="0m0akad9fs1nzwgz1b2kd9ndf40vr780fha32k1i9m3p6cynn9n8"; depends=[sandwich]; }; clue = derive2 { name="clue"; version="0.3-57"; sha256="05rdcahawxlxci3fjxihjvvh33wqpxw50sx015165ab4nh3rsdkf"; depends=[cluster]; }; clues = derive2 { name="clues"; version="0.6.2.2"; sha256="1pvalkpvxjj6qrvffbx0sqvfmcxf6dkzrpklshkx1b2k5s4z8791"; depends=[]; }; cluscov = derive2 { name="cluscov"; version="1.1.0"; sha256="0345v5r6b53243h5bir29v0w77pmwjqjkqfrjnk5j5r1wbh98q1w"; depends=[MASS quantreg]; }; @@ -6091,9 +6138,8 @@ in with self; { 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.2-1"; sha256="1m6pv1r3wdszji8nqs6yyl2405092yrdxq3vl8z1x15lnj1c87yh"; depends=[RColorBrewer]; }; - clustRcompaR = derive2 { name="clustRcompaR"; version="0.2.0"; sha256="151xq8qf1mrl35kyhdliwl2jpdkpkbl3gdnrvrybanihry2p0kqg"; depends=[dplyr ggplot2 ppls quanteda]; }; - clustcurv = derive2 { name="clustcurv"; version="1.0.0"; sha256="055hxwpvfm37gvgc5ar8qk6ksny89hmr79w1jmxyynml47lwllrl"; depends=[doParallel doRNG foreach ggfortify ggplot2 Gmedian survival wesanderson]; }; + clustMixType = derive2 { name="clustMixType"; version="0.2-2"; sha256="143xq457migvdfylgyfs19arlmzc9gy360sva49fi56jaz6xqhvr"; depends=[RColorBrewer]; }; + clustcurv = derive2 { name="clustcurv"; version="2.0.0"; sha256="1zjyf81ifd2sgkgs548iy1awjhjmb541rrrw2pb92cn8ph7z7nc1"; depends=[data_table doParallel doRNG foreach ggfortify ggplot2 Gmedian KernSmooth npregfast RColorBrewer survival tidyr wesanderson]; }; cluster = derive2 { name="cluster"; version="2.1.0"; sha256="055af3yz2biqbsbwm4arwr1yqnj4gicpzv2i6dbfl5pnz2z5byga"; depends=[]; }; cluster_datasets = derive2 { name="cluster.datasets"; version="1.0-1"; sha256="0i68s9305q08fhynpq24qnlw03gg4hbk4184z3q3ycbi8njpr4il"; depends=[]; }; clusterCrit = derive2 { name="clusterCrit"; version="1.2.8"; sha256="10pz1bikdbkm2ky3xnagp0qv60whalavp6j39b4p7d75jj5xcxgk"; depends=[]; }; @@ -6103,24 +6149,24 @@ in with self; { clusterRepro = derive2 { name="clusterRepro"; version="0.9"; sha256="0s7qqvaf5yxxwhw6qyzfmk65c49yz405gljarwav6aglkx9883cl"; depends=[]; }; clusterSEs = derive2 { name="clusterSEs"; version="2.6.2"; sha256="15a9hn8g70y64v5lq91mwjbx411ji2b5zvm1wm4qz820jri5wy20"; depends=[AER Formula lmtest mlogit plm sandwich]; }; clusterSim = derive2 { name="clusterSim"; version="0.48-3"; sha256="1037d9nwj214vgmva6590kvyqr19brbnmb36inkgph4mg3276lsf"; depends=[ade4 cluster e1071 MASS R2HTML rgl]; }; - clusterability = derive2 { name="clusterability"; version="0.1.0.0"; sha256="1zc6b8j4vq1dz7f15x7ip2qwh56srj0wk1pkjwjca0ddlagaj72z"; depends=[diptest]; }; + clusterability = derive2 { name="clusterability"; version="0.1.1.0"; sha256="15gimcs6wrasafg1ys7id0mkg9fvacxbwpgg9d4b5avk4gff39bs"; depends=[diptest]; }; 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.8"; sha256="10z5p79a7nafnljl3s17mw22zasxp45nfbxmhilmyfq6kblxj1zm"; depends=[ggplot2 reshape]; }; - clustermole = derive2 { name="clustermole"; version="1.0.0"; sha256="05sip8zis5i0sin9fsz39yin06154si63h45sp5pkzb0qwacyqbr"; depends=[dplyr GSVA magrittr rlang tibble tidyr]; }; - clustermq = derive2 { name="clustermq"; version="0.8.8.1"; sha256="1xx2dq3rhyxq3qzgr6gh1yh2qli0s5hrvn096ak18z6ydzyn2g0z"; depends=[narray progress purrr R6 rzmq]; }; + clustermole = derive2 { name="clustermole"; version="1.0.1"; sha256="15d7khwg4rjshbkkcqrmw9dk8wy683z8ix5n6xdrlvp0rq3l3n2c"; depends=[dplyr GSVA magrittr rlang tibble tidyr]; }; + clustermq = derive2 { name="clustermq"; version="0.8.9"; sha256="128b71h9vxai3j7bbbkx9pm5mabpxdad5qwgxrc8a6sws790yn4b"; depends=[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]; }; + clusternor = derive2 { name="clusternor"; version="0.0-4"; sha256="19ac45jn9lkd600nnaib2f0ricdvh0dv3l1ap6c9vn655rgl9i3s"; 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.3.6-2"; sha256="06njv48sb3j7d5517l6c886hqmlyp5vk6pk5zpmdmzcxay6c81qy"; depends=[ca cluster corpcor dplyr fpc GGally ggplot2 ggrepel plyr rARPACK tibble]; }; - clustree = derive2 { name="clustree"; version="0.4.1"; sha256="0jsffqd25ad08q35a3ggzblhia7y6m5gj972kij6nrbah920qk0x"; depends=[checkmate dplyr ggplot2 ggraph ggrepel igraph rlang tidygraph viridis]; }; + clustrd = derive2 { name="clustrd"; version="1.3.7-2"; sha256="0j0nmqc9q9djg824g89z27xizdy1jdsygz1gc0r0mrzdd3dyk2ya"; depends=[ca cluster corpcor dplyr fpc GGally ggplot2 ggrepel plyr rARPACK tibble]; }; + clustree = derive2 { name="clustree"; version="0.4.2"; sha256="0bpqvy49vyvfmmrbbkf1kv87x125kr10fhdyg9d27pdwrgiqwssx"; 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]; }; + clv = derive2 { name="clv"; version="0.3-2.2"; sha256="072jn3xh6ii7vfp0gx03k1hiafnla1lkyn5hpj17nmqc0jvzp683"; depends=[class cluster]; }; cmaes = derive2 { name="cmaes"; version="1.0-11"; sha256="1hwf49d1m660jdngqak9pqasysmpc4jcgr8m04szwbyzyy6xrm5k"; depends=[]; }; cmaesr = derive2 { name="cmaesr"; version="1.0.3"; sha256="03zx2nrw24wmmjjpyh8pswasjjq0amf0g375fm2b3s111dx8fbj9"; depends=[BBmisc checkmate ggplot2 ParamHelpers smoof]; }; cmce = derive2 { name="cmce"; version="0.1.0"; sha256="0d52ci906zbd4q43qylcyw93acxh7f20jn3r0k74ynyy47131dnd"; depends=[]; }; @@ -6129,7 +6175,6 @@ in with self; { cmmr = derive2 { name="cmmr"; version="0.1.2"; sha256="0nik1pzd1rckalvn7xh6s699kkdjnra3q3bn5x16c1lmpz5bp2s4"; depends=[httr progress RJSONIO]; }; cmna = derive2 { name="cmna"; version="1.0.2"; sha256="18vbqa258m0g5pvfhqi2vbr8n2bil07n9spgz1wh2axw1c3bcf76"; depends=[]; }; cmocean = derive2 { name="cmocean"; version="0.2"; sha256="0v1bm2qgvjb82ynakglr61swx5jy41ngn6vml5gllv3r7skqr1is"; depends=[]; }; - cmpprocess = derive2 { name="cmpprocess"; version="1.1"; sha256="03r0sfkf955w59dixya5agff0xdlwmxrlwvik7716l1alydcl4vl"; depends=[compoisson numDeriv]; }; cmprsk = derive2 { name="cmprsk"; version="2.2-9"; sha256="0xhgfg5b4i9skkaxp7gzkafgg5bqs5q1rp4hpw2jjmykg2nifn99"; depends=[survival]; }; cmprskQR = derive2 { name="cmprskQR"; version="0.9.2"; sha256="1b3di5fsgglriv00fxydpc4p8lh0xcgi6jc04awq2vmp6s8kvjmw"; depends=[quantreg survival]; }; cmrutils = derive2 { name="cmrutils"; version="1.3.1"; sha256="0nrq84bkd23lvvg8ls2smkjcnfnydhbcni3n6s8w0579i9xga8dv"; depends=[chron]; }; @@ -6140,13 +6185,16 @@ in with self; { cnbdistr = derive2 { name="cnbdistr"; version="1.0.1"; sha256="05qi41jimslbngjgbwzfda0q25hb28ax79v9yckvrbpgjc8dk990"; depends=[hypergeo]; }; cncaGUI = derive2 { name="cncaGUI"; version="1.0"; sha256="1v55kvrc05bsm1qdyfw3r3h64wlv3s6clxbr8k512lfk99ry42kn"; depends=[MASS plotrix rgl shapes tcltk2 tkrplot]; }; cnmlcd = derive2 { name="cnmlcd"; version="1.2-0"; sha256="1vpn926wf8vkifscnb35y4c74721iar2wykrl50fcv0fg16yggnd"; depends=[lsei]; }; - coRanking = derive2 { name="coRanking"; version="0.1.4"; sha256="03wvy19jrb3q31yfpmakji25zwc6zx26irj4rwkad81iwdqihq3s"; depends=[]; }; + cnum = derive2 { name="cnum"; version="0.1.0"; sha256="0hiinaa5sp5fvklgdwb3wb58cr7sczd87i4jmp23jm2nx5f4hjs6"; depends=[stringr]; }; + coRanking = derive2 { name="coRanking"; version="0.2.1"; sha256="10489vbd917mzz5lw7ygi6q8q5qa7sp5d8xgv1ykn4lfx0avch69"; depends=[]; }; coala = derive2 { name="coala"; version="0.6.0"; sha256="0h7kc12yc90y5i733l6sfd9h12h0a2c7wv9wscjslj18sl3w3ccv"; depends=[assertthat digest R6 Rcpp RcppArmadillo rehh scrm]; }; coalescentMCMC = derive2 { name="coalescentMCMC"; version="0.4-1"; sha256="0xxv1sw5byf84wdypg5sfazrmj75h4xpv7wh4x5cr9k0vgf80b3s"; depends=[ape coda lattice Matrix phangorn]; }; + coalitions = derive2 { name="coalitions"; version="0.6.12"; sha256="11844sz65axj23xwv505jxck37xv3a5n36jpdr9ywvmb19gshar7"; depends=[checkmate dplyr ggplot2 gtools jsonlite lubridate magrittr purrr RCurl rlang rvest stringr tidyr xml2]; }; coarseDataTools = derive2 { name="coarseDataTools"; version="0.6-5"; sha256="1k42vl49kfbllc5d66yn7y9f4jgbkfibmd85nl7hwm0gkgkssg36"; depends=[MCMCpack]; }; cobalt = derive2 { name="cobalt"; version="4.0.0"; sha256="14g5a0j3lcd61igsi2phhfpcfxwgiq7jlakr9nr4yb5h345zwvx7"; depends=[backports crayon ggplot2 ggstance gridExtra gtable]; }; cobiclust = derive2 { name="cobiclust"; version="0.1.0"; sha256="068cqrhx7lxsvcjb62rgrca7y20cybz4445bl1qc6k16ca4bh0m9"; depends=[cluster]; }; cobs = derive2 { name="cobs"; version="1.3-4"; sha256="0hiw5smk6kgk0gb9840kcqkhkybl7n30s77xhjc395x09izbgix1"; depends=[quantreg SparseM]; }; + coca = derive2 { name="coca"; version="1.0.4"; sha256="1mk6vhy3s243rn4bwfr72900x0fcfs729k179kc81zvjj3v7m0h9"; depends=[caret cluster fpc glmnet Matrix nnet pheatmap RColorBrewer]; }; cocktailApp = derive2 { name="cocktailApp"; version="0.2.1"; sha256="1aq7m3qb4s5v59ym8p5vh7lr5s1xfp8b04x64a014k47gakgiw1d"; depends=[dplyr DT forcats ggplot2 ggtern magrittr shiny shinythemes tibble tidyr]; }; cocor = derive2 { name="cocor"; version="1.1-3"; sha256="106zyrrypil8jyg0pva5zj4hgb53z81nca3d0mh2q3j55zq3wl12"; depends=[]; }; cocoreg = derive2 { name="cocoreg"; version="0.1.1"; sha256="0jrrkak964pl1vih592jgqgl6bw08j0fa1rh3j85x64bqq4m7278"; depends=[abind CCAGFA combinat e1071 ggplot2 glmnet gridExtra MASS multiway pls reshape RGCCA]; }; @@ -6167,38 +6215,43 @@ in with self; { coenocliner = derive2 { name="coenocliner"; version="0.2-2"; sha256="0r4h0r3av2d1cxmjpwaabjn807626pzqnra2x542wdnnf7h8nmdf"; depends=[]; }; coenoflex = derive2 { name="coenoflex"; version="2.2-0"; sha256="06f75spl4wkbgicm0bksnid2lb1gkvi05915wn5y4km45d82fkkr"; depends=[mgcv]; }; coexist = derive2 { name="coexist"; version="1.0"; sha256="15ydhrx996i6caa0360c2bgn2zvgwfg5wdhsqq1gvrggs15w7nml"; depends=[]; }; - cofad = derive2 { name="cofad"; version="0.1.0"; sha256="034ihvg2bqlfhpwivza15slksn7zxk3k20rdyx9zlriqzfgvlwws"; depends=[]; }; + cofad = derive2 { name="cofad"; version="0.1.1"; sha256="0c27wfdk98mq0531avlgfxf2wmxcjyg39pgl9i37im7ri2s7kpnr"; depends=[]; }; cofeatureR = derive2 { name="cofeatureR"; version="1.1.1"; sha256="1awfrlnbpw9ivfvaahznx6dx5jp8ln0154vh2pznp520q59h1mbs"; depends=[dplyr ggplot2 lazyeval tibble]; }; coga = derive2 { name="coga"; version="1.1.0"; sha256="0p2mdia89gj7w0j33qxil1l2zg6civj18i3pqym7aijzz1fgwnzp"; depends=[cubature Rcpp RcppGSL]; }; cogmapr = derive2 { name="cogmapr"; version="0.9.1"; sha256="1iz776avw05a0lcna78fycixacby4bjf8ar1jazsf34yss6zka23"; depends=[car dplyr ggplot2 graph magrittr Rgraphviz tidyr]; }; - cohorttools = derive2 { name="cohorttools"; version="0.1.0"; sha256="0350q0dyy0rfk2g8anc62cib2gq7hi4zzg3gsd02fhwadz5gnjga"; depends=[DiagrammeR DiagrammeRsvg Epi epitools rsvg survival]; }; - coil = derive2 { name="coil"; version="1.1.0"; sha256="1b73r51vyw4cb4ck3xvig0nhjf3hglg58s4kc1b28zzqzl7ay78k"; depends=[ape aphid seqinr]; }; + cognitoR = derive2 { name="cognitoR"; version="1.0.0"; sha256="0nyfsfnmwx3a19imr3r49c4ga6gb13x2w5czn1n0qy0qsp5881w0"; depends=[base64enc config dplyr httr jsonlite shiny shinyjs yaml]; }; + cohorttools = derive2 { name="cohorttools"; version="0.1.2"; sha256="0hfpl2dm5ykagwmmdmk0hpbkzzd0zqmf9andm510safjp4mlbcy0"; depends=[cmprsk DiagrammeR DiagrammeRsvg Epi ggplot2 rsvg survival]; }; + coil = derive2 { name="coil"; version="1.2.1"; sha256="0s11v1hcksljpxnlkmrlnnamx4mlsck45hsjm4xlhc1zb7x9kqf5"; depends=[ape aphid seqinr]; }; coin = derive2 { name="coin"; version="1.3-1"; sha256="0qi03fyqw42a2vnqcia5l2m1mzyarj2q1iblknx9n19bdsd53qjx"; depends=[libcoin matrixStats modeltools multcomp mvtnorm survival]; }; coindeskr = derive2 { name="coindeskr"; version="0.1.0"; sha256="0iwkg9qx5gymzjxw3w1zlwq9336kbqp4z8a9wf9a1p2gp9727qcm"; depends=[httr jsonlite]; }; - coinmarketcapr = derive2 { name="coinmarketcapr"; version="0.3"; sha256="149ilps378rvk4g3icasb843d90vmx69kfdcl6a8828v1mg0pcvs"; depends=[cli crayon curl data_table ggplot2 jsonlite]; }; + coinmarketcapr = derive2 { name="coinmarketcapr"; version="0.3.2"; sha256="0n62kcw7yxpvxd2bzki432cis5rvfw8b8syfvgv5wpq53bavq3px"; depends=[cli crayon curl data_table ggplot2 jsonlite]; }; cointReg = derive2 { name="cointReg"; version="0.2.0"; sha256="0n4s809avhlrmrjdqzc2s752m7x96c4432gnjd4qv77r2nns7dw4"; depends=[checkmate MASS matrixStats]; }; cointmonitoR = derive2 { name="cointmonitoR"; version="0.1.0"; sha256="0rsacvib9prgb199m5ndi0zlgfsvf1giqc5s41wp0yvxdxjdq5lw"; depends=[cointReg matrixStats]; }; - cold = derive2 { name="cold"; version="2.0-0"; sha256="10kn2kycyc6di30ji6lk5agsczh1zdv65s8ryj6q2f40v0y0zlck"; depends=[cubature]; }; + cold = derive2 { name="cold"; version="2.0-1"; sha256="143zmccaiijz4cfiwh1a48h95bqa0ypa9ivv43qkx9y55911a05x"; depends=[cubature MASS]; }; colf = derive2 { name="colf"; version="0.1.3"; sha256="1av82yrp6csw7700ymipd02j73cmzn0apv7ykachjw09nzk86kvj"; depends=[nlsr]; }; collUtils = derive2 { name="collUtils"; version="1.0.5"; sha256="0gbk3lrb2lwq2ixrpcngng6qz6axjb4iyqy5606x1zmjm71c060p"; depends=[Rcpp rJava]; }; + collapse = derive2 { name="collapse"; version="1.1.0"; sha256="0pypbs6g6gvsyagdxfk6x0qsh9byrwyqv9v0ajp20cqbx0s22kxi"; depends=[lfe Rcpp]; }; 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.2.3"; sha256="1fkajfmh7zx2a111js2sdlkzx5q0an67s7ns9jsy65zl7iqis3i0"; depends=[xptr]; }; + collections = derive2 { name="collections"; version="0.2.5"; sha256="195i6kxy3h0q99jr5hi20m15zpk8fgb17126w7qyxfq7mhrsvhmh"; depends=[xptr]; }; + collector = derive2 { name="collector"; version="0.1.3"; sha256="1yn6gzccdbp7n4qnwqpv66617qldjabzrlww41v6wqn9b7qyr0ii"; depends=[dplyr EnvStats evaluator flextable ggplot2 ggpubr magrittr officer purrr quanteda readr rlang rmarkdown stringr tibble tidyr xaringan]; }; collidr = derive2 { name="collidr"; version="0.1.2"; sha256="1b8yy0p1r4gs6azcl1aqkny3hws5hhl9bvsrkrhgk2r2xni9sk6f"; depends=[dplyr jsonlite stringr]; }; collpcm = derive2 { name="collpcm"; version="1.1"; sha256="14rlipdww5sm1ijp2ggpnd23m14qh10zm99cfq1w0kky9jfl0fkn"; depends=[latentnet network vegan]; }; colmozzie = derive2 { name="colmozzie"; version="1.1.1"; sha256="0sn7dqg7rnddnmdb10c6scws6kgi1lz4lw8nc698x63z431ah1p8"; depends=[]; }; coloc = derive2 { name="coloc"; version="3.2-1"; sha256="0sm2mji8bihvcshkh9g18sgbwznhh8j4hip50rk7ckac3vc8y75h"; depends=[BMA data_table ggplot2 reshape snpStats]; }; colocalization = derive2 { name="colocalization"; version="1.0.1"; sha256="0ax560r5f629zv8rfa91ynx8g3kcn5ga553k5svircl21n65zb1y"; depends=[ggplot2]; }; colocalized = derive2 { name="colocalized"; version="0.2.0"; sha256="1q98wfqk0p9p92jgjf8liamz6grzwy6h57k7681fm07wfnyr268g"; depends=[doParallel foreach purrr]; }; + colorBlindness = derive2 { name="colorBlindness"; version="0.1.6"; sha256="18922caddz7c5dj5mbyl7qihgsnk384w31k17rwngm5hckz2d5yi"; depends=[colorspace cowplot ggplot2 gridGraphics gtable]; }; colorRamps = derive2 { name="colorRamps"; version="2.3"; sha256="0shbjh83x1axv4drm5r3dwgbyv70idih8z4wlzjs4hiac2qfl41z"; depends=[]; }; - colorSpec = derive2 { name="colorSpec"; version="1.1-1"; sha256="0c1da94abjq439h7y2rylidp9lnh6i2wc7m27cawkr983jpxcq0m"; depends=[MASS spacesXYZ]; }; + colorSpec = derive2 { name="colorSpec"; version="1.2-1"; sha256="1y6wq4g4rf2carqi387v94502nb5jmw7f6f7grbdzbkixs77bkg2"; depends=[MASS spacesXYZ]; }; colordistance = derive2 { name="colordistance"; version="1.1.0"; sha256="0aiqvx0mlraczkcfhzfcaavmqqmxiffnghhw266f84bphxw6b5q2"; depends=[abind ape clue emdist gplots jpeg magrittr mgcv plotly png scales scatterplot3d spatstat]; }; coloredICA = derive2 { name="coloredICA"; version="1.0.0"; sha256="1xj4dsrwgqzm2644nk3y8nj47m036b4ylh6v60jccj3707spb32r"; depends=[MASS]; }; colorednoise = derive2 { name="colorednoise"; version="1.0.5"; sha256="094iil7f8w5cinw5j1ja3a2l1w352hlj6f3vfsvs6k1ww5f1sd6l"; depends=[dplyr purrr Rcpp RcppArmadillo tibble tidyr]; }; colorfindr = derive2 { name="colorfindr"; version="0.1.4"; sha256="175h476dzq1f2x25vdd268xj4ja4lv8fhfj9vld85waqi0sq515g"; depends=[bmp dplyr jpeg magrittr pixmap plotly plotwidgets png purrr rsvg stringr tibble tiff treemap]; }; colorfulVennPlot = derive2 { name="colorfulVennPlot"; version="2.4"; sha256="01b3c060fbnap78h9kh21v3zav547ak2crdkvraynpd2096yk51w"; depends=[]; }; colorhcplot = derive2 { name="colorhcplot"; version="1.3.1"; sha256="009pyyb30kwshldd7v7zfy5rxys6i0dhlc5w8ail61acbg4rlrmz"; depends=[]; }; + colorist = derive2 { name="colorist"; version="0.1.0"; sha256="1j5gd1fis62xylgaf7dj5n0dnalarz7mg824iakzmqgcqzjm06l4"; depends=[colorspace ggplot2 magrittr raster scales tidyr]; }; colormap = derive2 { name="colormap"; version="0.1.4"; sha256="0032ji9n8pivl70jppq989fgg781wil8zag7pfl1hs9xrpin8asy"; depends=[ggplot2 stringr V8]; }; colorpatch = derive2 { name="colorpatch"; version="0.1.2"; sha256="18p9hgccp37pbdf437xffkv6z500896v08fsw2jm8zcl9ladygaf"; depends=[colorspace ggplot2 gridExtra TSP]; }; colorr = derive2 { name="colorr"; version="1.0.0"; sha256="1wwrgb9fc9gzxxwxrdrkwwrmhqqllv29wr4q8y1shj9d3nzcpwmh"; depends=[]; }; @@ -6207,11 +6260,11 @@ in with self; { colortools = derive2 { name="colortools"; version="0.1.5"; sha256="0z9sx0xzfyb5ii6bzhpii10vmmd2vy9vk4wr7cj9a3mkadlyjl63"; depends=[]; }; colourlovers = derive2 { name="colourlovers"; version="0.3.5"; sha256="172ny0w9n2ys8pa7zxkfjsl7lv6fa59bmmbkzlwfx59wamxahmky"; depends=[httr jsonlite png XML]; }; colourpicker = derive2 { name="colourpicker"; version="1.0"; sha256="0z3v2083g7kwdp21x9s2n1crfh24agpdq3yxkcdzc2awn2pwpnpi"; depends=[ggplot2 htmltools htmlwidgets jsonlite miniUI shiny shinyjs]; }; - colourvalues = derive2 { name="colourvalues"; version="0.3.2"; sha256="1ap2k9b4f0x8di0vk4756x05im64ypxhcz6s584w6j7hx4jfl3wr"; depends=[BH Rcpp]; }; + colourvalues = derive2 { name="colourvalues"; version="0.3.4"; sha256="0b5ni3wx8hid6kf13mihphjxdrfz7srlgd9vhrlbxk9mlxzh593y"; depends=[BH Rcpp]; }; colourvision = derive2 { name="colourvision"; version="2.0.2"; sha256="15ndhqpp5fi9jgiri9ysl68nf4rdamh9c25svf5nvh2wvv8shrd9"; depends=[Matrix rgl]; }; colr = derive2 { name="colr"; version="0.1.900"; sha256="0ilz1y0jd2vgyh81g3dwx2l64sir6z6sgmqx7lnvr1hafsqnwfc8"; depends=[]; }; colt = derive2 { name="colt"; version="0.1.1"; sha256="028jqvgr14ig8jxp8h2lrf7mainzppgqh6v1479qfv4l9is3bnwy"; depends=[crayon]; }; - comat = derive2 { name="comat"; version="0.7.2"; sha256="1rca5n47ypw8mbhx40x9vi4wvkpnzzyxgm4vb7sq32w5pnydnkcn"; depends=[Rcpp RcppArmadillo]; }; + comat = derive2 { name="comat"; version="0.8.2"; sha256="0yhldgbz992pplxpsmkyhw54b35yr3x9fdd05iprnnq1r04hsr09"; depends=[Rcpp RcppArmadillo]; }; comato = derive2 { name="comato"; version="1.1"; sha256="0lidwr5vw10655p7q0iqzq3phq5y1i86w3bjdv87cwx3m6333bz6"; depends=[cluster clusterSim gdata igraph lattice Matrix XML]; }; combinat = derive2 { name="combinat"; version="0.0-8"; sha256="1h9hr88gigihc4na7lb5i7rn4az1xa7sb34zvnznaj6pdrmwy4qm"; depends=[]; }; combiter = derive2 { name="combiter"; version="1.0.3"; sha256="11pcvrpbvkzkjwks2z6ww7s9d5fkh8zl0jw52a5ya3y1wkqcs3n6"; depends=[iterators itertools Rcpp]; }; @@ -6221,33 +6274,31 @@ in with self; { commandr = derive2 { name="commandr"; version="1.0.1"; sha256="1d6cha5wc1nx6jm8jscl7kgvn33xv0yxwjf6h3ar3dfbvi4pp5fk"; depends=[]; }; 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.4"; sha256="12hwl3xjm7kl5y36v3y4jyr2gk4l87mff237qms2hy8y41nwwagr"; depends=[]; }; + commonsMath = derive2 { name="commonsMath"; version="1.2.5"; sha256="1c4lgmggpc22mhwcpy521b2pg8wf4bbjp0a6rbcn0aki90xw9ckk"; depends=[]; }; comorbidity = derive2 { name="comorbidity"; version="0.5.3"; sha256="10zlq1586abngdrw5hgba78ridn3xj4q68f34slxpk0gxwa94n7p"; depends=[checkmate data_table]; }; compHclust = derive2 { name="compHclust"; version="1.0-3"; sha256="0agay7rn5mrw07imz4l547b7m9pfcg3rhz4krfxrvg1q2z2kryvj"; depends=[]; }; compactr = derive2 { name="compactr"; version="0.1"; sha256="0f2yds6inmx0lixj08ibqyd2i61l2cbg1ckgpb8dl2q7kcyyd6mx"; depends=[]; }; compare = derive2 { name="compare"; version="0.2-6"; sha256="0k9zms930b5dz9gy8414li21wy0zg9x9vp7301v5cvyfi0g7xzgw"; depends=[]; }; compareC = derive2 { name="compareC"; version="1.3.1"; sha256="0dachfr23lps2jj1y5gc958k54vskmww84gdgk4amihsdgjsnphg"; depends=[]; }; - compareDF = derive2 { name="compareDF"; version="2.0.0"; sha256="1h93kh2bzy94ylghwixwhg8s6issz94ya0358xff3v9f6nlwh7k6"; depends=[dplyr htmlTable magrittr openxlsx stringr tidyr]; }; - compareGroups = derive2 { name="compareGroups"; version="4.2.0"; sha256="0lq5yd6d1vz8lzy1lnfav2726g3xdfxlbza055g0paxbxzxgs2n0"; depends=[chron epitools flextable HardyWeinberg kableExtra knitr officer rmarkdown SNPassoc survival writexl]; }; + compareDF = derive2 { name="compareDF"; version="2.0.2"; sha256="1bsrb9v1rr4s67q01gqf9bjp7hla47kxxkc4a4kflmjjixb4fzz3"; depends=[dplyr htmlTable magrittr openxlsx stringr tidyr]; }; + compareGroups = derive2 { name="compareGroups"; version="4.4.1"; sha256="1pyqlqfb3km4ggl8z8nf5hyfa4az0nav98ik1f6zlrdydswdyl71"; depends=[chron flextable HardyWeinberg kableExtra knitr officer rmarkdown SNPassoc survival writexl]; }; compareODM = derive2 { name="compareODM"; version="1.2"; sha256="019hq8j56asjvh4x1p65785mf38xr05j3by0749gl9k9yl8645da"; depends=[XML]; }; + comparer = derive2 { name="comparer"; version="0.2.1"; sha256="1ric6niwx9718qrdkiclmjbrx4vjbg7jwvd6917hihzyjgbsi9fj"; depends=[R6]; }; comparison = derive2 { name="comparison"; version="1.0-4"; sha256="0pc462rhk8gr8zrf08ksi315kmhydlp027q5gd40ap5mmhk7rd82"; depends=[isotone]; }; compas = derive2 { name="compas"; version="0.1"; sha256="1ckryllwd8avz6456970qhfa3wpcsmhkicnibnv7gl4crzf44xgx"; depends=[bio3d Rcpp RcppEigen]; }; compboost = derive2 { name="compboost"; version="0.1.0"; sha256="0q7jfj5yc2jvddyyhnzv8fnlmngjfws7cg2blxai76s2fw6bmgxp"; depends=[checkmate glue R6 Rcpp RcppArmadillo]; }; - compeir = derive2 { name="compeir"; version="1.0"; sha256="1bb5459wcqpjic2b9kjn0l0qdn7sqmmx34hdb2aqg80q22mhx5dv"; depends=[etm lattice]; }; compendiumdb = derive2 { name="compendiumdb"; version="1.0.3"; sha256="0glaqlzz5wr14yfhka1y7yw5ha6yc4waw61msbz0vkwj5z2hd2hk"; depends=[Biobase GEOquery RMySQL]; }; - comperank = derive2 { name="comperank"; version="0.1.0"; sha256="0fxg32kp4v42455fia48rnbd3v84g4vsh4r4qc29d0gg93ymz9hp"; depends=[comperes dplyr Rcpp rlang tibble]; }; + comperank = derive2 { name="comperank"; version="0.1.1"; sha256="0wz46rkpx1cjjng3i03pms2x27cik9wbx7al5r289ym3664zb83m"; depends=[comperes dplyr Rcpp rlang tibble]; }; comperes = derive2 { name="comperes"; version="0.2.3"; sha256="1mz8002zqyyzdd2ija0iqc1fm10px6ll0bsl3pmfwwdqbqx17rmz"; depends=[dplyr magrittr rlang tibble tidyr]; }; - competitiontoolbox = derive2 { name="competitiontoolbox"; version="0.1.2"; sha256="1k45y7zcckvpcx4pdin9zlsx1vrqlqx9lz67cbsawb254wbylc4l"; depends=[antitrust ggplot2 rhandsontable shiny trade]; }; completejourney = derive2 { name="completejourney"; version="1.1.0"; sha256="0ysbpmd7rglz3diy2cpcgvmmcnysradb4ddiwix7kbhzrhvhrdrs"; depends=[curl dplyr progress stringr tibble zeallot]; }; complexity = derive2 { name="complexity"; version="1.1.1"; sha256="1lpsvry88jpqfw0wkdlwjzkqjl17f4adjcqvq0dwk483mi54xnfk"; depends=[combinat shiny]; }; complexplus = derive2 { name="complexplus"; version="2.1"; sha256="16w9v7d1ckavqmr86l34frr37pkvdn0iqnb17ssb8xaggns5lgqx"; depends=[expm Matrix]; }; complmrob = derive2 { name="complmrob"; version="0.7.0"; sha256="0dvkc5y53041agkjz3rl898hkq686pxzr6flf2qx1g3jbza3pk1y"; depends=[boot ggplot2 robustbase scales]; }; - compoisson = derive2 { name="compoisson"; version="0.3"; sha256="0v5dl7xydqi4p97nipn4hyhpq2gghmx81ygvl0vc8b65jhq89y0p"; depends=[MASS]; }; - compositions = derive2 { name="compositions"; version="1.40-3"; sha256="103hbmibrf1n333pn4xpll1gqqsv4szms0n5gdq7zak31aar0bg4"; depends=[bayesm robustbase tensorA]; }; + compositions = derive2 { name="compositions"; version="1.40-4"; sha256="0z40llyij3cc80ac1vzzrpykk6ysp89bn6dyyh40fbnc4anwx69a"; depends=[bayesm robustbase tensorA]; }; compound_Cox = derive2 { name="compound.Cox"; version="3.19"; sha256="1wl8jg916567nk0wy37in6syh7z2rw70v5jm7s0w3ifiqs5v7nzb"; depends=[numDeriv survival]; }; comprehenr = derive2 { name="comprehenr"; version="0.6.7"; sha256="0c0wid4lch7yrz41b8n773hy4zj80sfb1lhy4pclvlsjdr5zryk6"; depends=[]; }; compstatr = derive2 { name="compstatr"; version="0.2.0"; sha256="07kak4dc1q44m58wb7ps4bf5ikcnjfkvd7fn1mxfxvqljrdy6978"; depends=[dplyr fs httr janitor lubridate purrr readr rlang rvest sf stringr tibble tidyr xml2]; }; - compute_es = derive2 { name="compute.es"; version="0.2-4"; sha256="1b5i8z66zbag0vdv98mmpwmizpm68vc3ajh0n3q94zdcmhcbx12d"; depends=[]; }; + compute_es = derive2 { name="compute.es"; version="0.2-5"; sha256="00133s3l3g70xrfnxgxhvbjr8izvaj9h0c73iaiyjmlgj84x69m8"; 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=[]; }; conStruct = derive2 { name="conStruct"; version="1.0.4"; sha256="1klhzsxrkbz16dnm3r2qxyq2z02zqrps9kij2jy6241ni9qmnn2f"; depends=[BH caroline doParallel foreach gtools Rcpp RcppEigen rstan rstantools StanHeaders]; }; @@ -6260,16 +6311,16 @@ in with self; { concurve = derive2 { name="concurve"; version="2.3.0"; sha256="1bjdlr3hpnv69g5jg2y18zkly0al3g9qj8cq0dlpk7x6930imqx7"; depends=[bcaboot boot dplyr flextable ggplot2 knitr MASS metafor officer pbmcapply ProfileLikelihood rlang scales survival survminer tibble tidyr]; }; cond = derive2 { name="cond"; version="1.2-3.1"; sha256="1j0gf28mg2j6ahs83nk662bix1lb2c9184vn8sblw433zxqaa2ny"; depends=[statmod survival]; }; condGEE = derive2 { name="condGEE"; version="0.1-4"; sha256="0mqj2pc91n8h3arpd4b9f7ndbcnai21c67is22qg22wj7vhhs87h"; depends=[numDeriv rootSolve]; }; - condMVNorm = derive2 { name="condMVNorm"; version="2015.2-1"; sha256="04563jljnjhbiaiq33gn5dxjfvv05xp3lhl3w942v0smy0cdhrh4"; depends=[mvtnorm]; }; + condMVNorm = derive2 { name="condMVNorm"; version="2020.1"; sha256="115pxnff2ckdxx0avbs0hfdhh1sljiz1y6h7ggd5hidrxd3559m4"; depends=[mvtnorm]; }; condSURV = derive2 { name="condSURV"; version="2.0.1"; sha256="0xjpypc4fzrnfjcznyc2bslkkza4fib8nx8ff2j7xh2nf84lk3f1"; depends=[doParallel doRNG foreach KernSmooth np survival]; }; condformat = derive2 { name="condformat"; version="0.8.0"; sha256="1x3sm3fn5lb07gmxvfaa0xnhk5mjnim90p7mwail8dmi9nygrb9d"; depends=[dplyr gridExtra gtable htmlTable htmltools knitr lazyeval magrittr rlang rmarkdown scales tibble tidyselect]; }; - condir = derive2 { name="condir"; version="0.1.1"; sha256="133598h1ga4jyr77lchnby6m8bh3adq6s38cgw45q4fyvzad4qds"; depends=[BayesFactor effsize knitr psych shiny xtable]; }; + condir = derive2 { name="condir"; version="0.1.2"; sha256="1vd3nw2hhldy7igpx58p6if6q2h99d7ypb2ldxkssq6y79n8hq99"; depends=[BayesFactor effsize knitr psych shiny xtable]; }; conditionz = derive2 { name="conditionz"; version="0.1.0"; sha256="0ijnsg6n3p3y8y9il012xg5if57hdzvrgxjcykfrrlil4m7ixn6c"; depends=[R6 uuid]; }; condusco = derive2 { name="condusco"; version="0.1.0"; sha256="0zydinzlksynkz4r712rzv9qqdx8dkdz3h1ygi9cfmd6hya3580s"; depends=[assertthat bigrquery DBI jsonlite]; }; condvis = derive2 { name="condvis"; version="0.5-1"; sha256="1ngxqfa0mr86cv610da4ljypxpdvx0n5pfgj3zfksnwxlwc0dvbj"; depends=[MASS]; }; condvis2 = derive2 { name="condvis2"; version="0.1.0"; sha256="1xvxqr311wwi8ns31zqnxxb7bji3vl296j3qfq7vh0alxlhd4n4r"; depends=[cluster DendSer ggplot2 kmed plyr RColorBrewer scales shiny]; }; coneproj = derive2 { name="coneproj"; version="1.14"; sha256="0km7njsxjgrv4d8bx709nci59ngm00jg1r55702yapyjl0f2zg93"; depends=[Rcpp RcppArmadillo]; }; - conf = derive2 { name="conf"; version="1.6.2"; sha256="0q5cs0m2r0pickx2w27nq01rshfzfrxj95lxic1r2lyblf06hqgz"; depends=[fitdistrplus pracma STAR statmod]; }; + conf = derive2 { name="conf"; version="1.6.3"; sha256="0i8ayn47jli06d76y5a7n087zj7ag6hhjwq5xi109jbfynzxv1h0"; depends=[fitdistrplus pracma 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]; }; @@ -6278,30 +6329,32 @@ in with self; { 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.4"; sha256="0xp04cdvmp3b1phazhmjqn0vmax1b2218xsb5854ffv43m7qvrra"; depends=[memoise rlang]; }; + conflr = derive2 { name="conflr"; version="0.1.0"; sha256="1ppmg3n0r5wlnhw60lkbbfdakq3q79zf2vsnzh0wjmdb34w3p535"; depends=[askpass commonmark curl glue httr knitr miniUI purrr R6 rlang rmarkdown rstudioapi shiny stringi xml2]; }; conformalClassification = derive2 { name="conformalClassification"; version="1.0.0"; sha256="03v6xbgipb97byarqj0d38z9yb2g54mkkw343jxmi2j058z26yw7"; depends=[doParallel foreach mlbench randomForest]; }; confoundr = derive2 { name="confoundr"; version="1.2"; sha256="000vf828qv04pplx8yc8q3mafxf4g0axip6z5zbsj2581yxv9jjh"; depends=[dplyr ggplot2 gridExtra magrittr purrr rlang Rmpfr scales stringr tidyr]; }; - confreq = derive2 { name="confreq"; version="1.5.4-3"; sha256="1jn9v9z04a2yni4l3i7969kzzpgaxkdfdggi74dgp3jchda6vip7"; depends=[gmp]; }; + confreq = derive2 { name="confreq"; version="1.5.5-0"; sha256="1aww0i9mh08y05941di40f9jagy7s48rw0cs7w55gsyffl5yy1ir"; depends=[gmp]; }; congressbr = derive2 { name="congressbr"; version="0.2.2"; sha256="1br6bhfy0i0ashz9dpv63ag2d4yqvpl7ml82hsf15gjq6mwvr1nr"; depends=[dplyr glue httr janitor lubridate magrittr progress pscl purrr stringi stringr tibble tidyr xml2]; }; conicfit = derive2 { name="conicfit"; version="1.0.4"; sha256="1d704xgiyqmbwfxnsmhqg885x10q8yqxmrk4khqpg3lh696bw97d"; depends=[geigen pracma]; }; conics = derive2 { name="conics"; version="0.3"; sha256="06p6dj5dkkcy7hg1aa7spi9py45296dk0m6n8s2n3bzh3aal5nzq"; depends=[]; }; conjoint = derive2 { name="conjoint"; version="1.41"; sha256="1iq3226a6fn1gddmh2nxlzvjcvbj7502r9520g9d4xdmk8smfx33"; depends=[AlgDesign broom cluster fpc ggfortify ggplot2]; }; - conjurer = derive2 { name="conjurer"; version="1.0.0"; sha256="0mhdl6wwvdjgal0qagyqlfs7fa0fnm24hg452dmszy85crk832dm"; depends=[]; }; - connections = derive2 { name="connections"; version="0.1.0"; sha256="1jkk9s3w6d3751hb2y4d2lilndhpfs2alqgg6k23q7bav6848wyp"; depends=[DBI dbplyr dplyr pins rscontract uuid]; }; + conjurer = derive2 { name="conjurer"; version="1.1.1"; sha256="0rxbmr2s270sy7rbyb876sidbcjzv0g99s1n0w6pd6aymmf0715c"; depends=[]; }; + connections = derive2 { name="connections"; version="0.1.1"; sha256="08fbyzyp26nh1a46p0zi3q0wzgl0cd9bjp4lhw2bwv1bv7yayamp"; depends=[DBI dbplyr dplyr pins rscontract uuid]; }; conover_test = derive2 { name="conover.test"; version="1.1.5"; sha256="0f1p10klidk1xic1wd48j9rjh2fb3z6pfjx4y021lglx1w3av68k"; depends=[]; }; - conquestr = derive2 { name="conquestr"; version="0.3.7"; sha256="13pkbgw0z2icpc2l16g1wy92bbhmrk3l0jfhvh0sa8zj5idw35z1"; depends=[]; }; + conquestr = derive2 { name="conquestr"; version="0.5.1"; sha256="1ha2jxh4xi39w4cznbdbbdhq5s5csmbf4p4j7blr80g72b46jvcp"; depends=[Rcpp reshape]; }; constants = derive2 { name="constants"; version="0.0.2"; sha256="1j9d52riwx7v1ppfdw0x517j7xh92qgskd4mj5yk9qa233brcwyy"; depends=[]; }; constellation = derive2 { name="constellation"; version="0.2.0"; sha256="1d49rnyf2z3bvx158nsmgmb0x7xcgxl9f8y98pwg5wlqck7af99q"; depends=[data_table]; }; constrainedKriging = derive2 { name="constrainedKriging"; version="0.2.4"; sha256="1a91s0b7yka37fb5pm172fmlqrhm6da370cqb9knvkg5n8vi4hys"; depends=[RandomFields rgeos sp spatialCovariance]; }; - contact = derive2 { name="contact"; version="1.0.1"; sha256="16dqvfkdckd59yx48s3qv5iz1jn087v4m93yjzmmvv78agqdi1m2"; depends=[ape data_table geosphere igraph lubridate raster rgdal rgeos sf sp]; }; + contact = derive2 { name="contact"; version="1.2.1"; sha256="1xh6m6qsz4lhjy2mhzygxwjxp5d94y3sp6sfnhdp395y56zxp211"; depends=[ape data_table doParallel foreach geosphere igraph lubridate raster rgdal rgeos sf sp]; }; container = derive2 { name="container"; version="0.3.0"; sha256="128fj97mx52kap299fmhn3whnaismsd4cq3zqpbfvwxx2ii4fd33"; depends=[R6]; }; - contextual = derive2 { name="contextual"; version="0.9.8.2"; sha256="03123mghmixy9v2c5lqg0df5ycxa09mir94rkjgs8lp62ncq170r"; depends=[data_table doParallel foreach Formula iterators itertools R_devices R6 rjson]; }; + contextual = derive2 { name="contextual"; version="0.9.8.3"; sha256="0mpbbg13ba5lwsh6rcy5g8vbfycv3182bqkgw66rn3r8fvkmy516"; depends=[data_table doParallel foreach Formula iterators itertools R_devices R6 rjson]; }; contfrac = derive2 { name="contfrac"; version="1.1-12"; sha256="0sq5c7ny235yrkv2xc4insgxby6rvzc1qsj8h301cd2if3lwbgwm"; depends=[]; }; conting = derive2 { name="conting"; version="1.7"; sha256="08f271j3gxcp4shda08kkv0v9ayaadvxgcglfsn6hjmw4hn298zg"; depends=[BMS coda gtools mvtnorm tseries]; }; 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]; }; + contrast = derive2 { name="contrast"; version="0.22"; sha256="11zz59dn63gpn455ryp0cmrx32li30yylf6ldrmw1wnn0zq702ww"; depends=[nlme rms sandwich]; }; contribution = derive2 { name="contribution"; version="0.1.0"; sha256="06y6qa7c0zifg6fqfpwry4z367ckiyk9v09n8cqc6q98c3ddkwj3"; depends=[dplyr ggplot2 gh magrittr rlang tidyr]; }; control = derive2 { name="control"; version="0.2.5"; sha256="02s8h5kwpzfrivx3ign84gwlybkcs03ibawyxdny9zz5yhb7x3bs"; depends=[expm Matrix pracma signal]; }; controlTest = derive2 { name="controlTest"; version="1.1.0"; sha256="19r8nvi35ldzgayifskjj706fv76hv6sj68yvggybp27rgyqbjfl"; depends=[survival]; }; + convergEU = derive2 { name="convergEU"; version="0.4.1"; sha256="0ycp26h54acvhzivkp5065h3bmd6jg6v5giqjashj9lzpr8ixihc"; depends=[broom caTools devtools dplyr eurostat formattable ggplot2 ggpubr gridExtra kableExtra knitr magrittr purrr readr readxl rlang rmarkdown stringr tibble tidyr tidyverse]; }; convertGraph = derive2 { name="convertGraph"; version="0.1"; sha256="1jsrygj6ydzc0nzyzaq95j4blqavj7dqz182vgm1ckv8an3if0jx"; depends=[]; }; convertr = derive2 { name="convertr"; version="0.1"; sha256="1y9aq5in2qv1323amblmq3g22flpqvpkgkrw12kahg56mqf2b3iq"; depends=[DT miniUI rstudioapi shiny]; }; convevol = derive2 { name="convevol"; version="1.3"; sha256="1b0lygbrdm6rqascck5iwjnm248lklc4cxr71qlgand5jsblpcnn"; depends=[ape cluster geiger MASS phytools]; }; @@ -6313,19 +6366,18 @@ in with self; { coop = derive2 { name="coop"; version="0.6-2"; sha256="052n2h7yhjj88x87sd3ci9ahhhn5r5rvsm79kh3r2zqbxsr8zzrh"; depends=[]; }; coopProductGame = derive2 { name="coopProductGame"; version="2.0"; sha256="1348pgqfvvysdixsjibgkvwjsmqasnlmwf9kyr39lw8jb81z25h0"; depends=[dplyr GameTheory ggplot2 gtools kappalab lpSolveAPI]; }; cooptrees = derive2 { name="cooptrees"; version="1.0"; sha256="0izvwna1jsqik3v5fz1r4c86irvma42clw0p4rdvwswv5pk698i1"; depends=[gtools igraph optrees]; }; - copBasic = derive2 { name="copBasic"; version="2.1.4"; sha256="0bcnpqc54lxgnxr6zgp2rz8vcbsicnjcs3vs3lsdhymlxifps7la"; depends=[lmomco randtoolbox]; }; + copBasic = derive2 { name="copBasic"; version="2.1.5"; sha256="0p7ngjpfhl4mjrcjmadik2ly5zzyjfafywjmaxza7frgrj6bflf4"; depends=[lmomco randtoolbox]; }; copCAR = derive2 { name="copCAR"; version="2.0-2"; sha256="032gphv64v2mmy63q86qgpa31i36ix6fkjsdxmzgqyxcyzgb0jcy"; depends=[mcmcse numDeriv Rcpp RcppArmadillo spam]; }; cope = derive2 { name="cope"; version="0.2.3"; sha256="1r02nb6wy25ixhdcbqqz167s7ny3hydpxfxry5ar4136qvcamgyy"; depends=[abind fields maps MASS Matrix mvtnorm nlme]; }; coppeCosenzaR = derive2 { name="coppeCosenzaR"; version="0.1.3"; sha256="1chwsfyaf5rmlsypr43n7px8b2220dfa5mzcriq1swylgbx4181l"; depends=[]; }; coprimary = derive2 { name="coprimary"; version="1.0"; sha256="0pjln9p5lzv6wl5xrz0kb90hnjlnp7ch2kvh054nxdbmlxv5akc3"; depends=[digest gsDesign plyr proto]; }; cops = derive2 { name="cops"; version="1.0-2"; sha256="0ifp3cai490lw6dnyyjj4822x8g2mswhaamnw5ljwnxdbmjwhhrw"; depends=[cmaes cordillera crs dfoptim GenSA MASS minqa NlcOptim nloptr pso rgenoud rgl Rsolnp scatterplot3d smacof subplex]; }; - copula = derive2 { name="copula"; version="0.999-19.1"; sha256="0bk92fx71282dx0whwv4rsfchw7pm7axicrl3r6f3gm4rlldf68r"; depends=[ADGofTest colorspace gsl lattice Matrix mvtnorm numDeriv pcaPP pspline stabledist]; }; + copula = derive2 { name="copula"; version="0.999-20"; sha256="1c0gbjfhvm839cdmy7n15an9jg6qygdq8bvp9awhbjysway4fgbx"; depends=[ADGofTest colorspace gsl lattice Matrix mvtnorm numDeriv pcaPP pspline stabledist]; }; copulaData = derive2 { name="copulaData"; version="0.0-1"; sha256="1s917g8wasxndg1xq4b4fjaq29nyzzigpflgqcy4rxdb7r54dl0z"; depends=[]; }; copulaedas = derive2 { name="copulaedas"; version="1.4.3"; sha256="01wp8jnz7kndknj7lh9ia7mm41k1vbaksalyy9v19bb77yhgzmba"; depends=[copula mvtnorm truncnorm vines]; }; corHMM = derive2 { name="corHMM"; version="1.22"; sha256="03di9250hjn5fiwn47f0pr4zprmsza4if3xpmy3j1czahc8zlqnj"; depends=[ape corpcor expm GenSA nloptr nnet numDeriv phangorn Rmpfr]; }; 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]; }; cordillera = derive2 { name="cordillera"; version="0.8-0"; sha256="0cpysfivwmim36gcqn1i7450a33hv4pdbvil7syb0hr7vdm083dd"; depends=[dbscan yesno]; }; coreCT = derive2 { name="coreCT"; version="1.3.2"; sha256="0xxcgd5qar9fwhyzs5g3fc45naca4xmcgmw88ygav02vv5y93w03"; depends=[igraph oro_dicom plyr raster]; }; @@ -6335,11 +6387,12 @@ 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.3"; sha256="0f0fwyz2kp59xb4a7kxa66h0y9940fba56dlyncin5szr5nhfrpp"; depends=[glmnet palasso]; }; + cornet = derive2 { name="cornet"; version="0.0.4"; sha256="0chp7ifcc0a9dz6ang4wjiwj7q309g9nsgyql6qmml985d8bazcy"; depends=[glmnet palasso]; }; coroICA = derive2 { name="coroICA"; version="1.0.1"; sha256="0hjy1sdii8kk859bj1xv3vh1hzxznhymhgdb583z57i0hqxnijiv"; depends=[MASS]; }; + coronavirus = derive2 { name="coronavirus"; version="0.1.0"; sha256="19im0kb6pv8czbq3h675nhfa1r6jj9whi2mq2wi3ldnzfa925bqw"; depends=[]; }; corpcor = derive2 { name="corpcor"; version="1.6.9"; sha256="1hi3i9d3841snppq1ks5pd8cliq1b4rm4dpsczmfqvwksg8snkrf"; depends=[]; }; corpora = derive2 { name="corpora"; version="0.5"; sha256="0b4yw37msx9h8hf5mjs4h10gdmc1qc2gv5bzyj1r90n4gcli042d"; depends=[]; }; - corporaexplorer = derive2 { name="corporaexplorer"; version="0.8.0"; sha256="0rn35wqi4bb90k440dk1sm862azx3pfgc2d6z489fdqq7xsjnk3a"; depends=[data_table dplyr forcats ggplot2 lubridate magrittr padr plyr RColorBrewer re2r rlang rmarkdown scales shiny shinycssloaders shinydashboard shinyjs shinyWidgets stringi stringr tibble tidyr zoo]; }; + corporaexplorer = derive2 { name="corporaexplorer"; version="0.8.2"; sha256="14l64mcqfa2ayyl6d48s9fc2qh485wk02s23cy4nssn7sg1b3a5z"; depends=[data_table dplyr ggplot2 lubridate magrittr padr plyr RColorBrewer rlang rmarkdown scales shiny shinydashboard shinyjs shinyWidgets stringi stringr tibble tidyr]; }; corpus = derive2 { name="corpus"; version="0.10.0"; sha256="0c984rsnbai2qrm2s10lkdfgx31m0ax46zhl74bns2bxfmagcn3l"; depends=[utf8]; }; corpustools = derive2 { name="corpustools"; version="0.4.2"; sha256="00v61i4c43s69mchy5zkbxgvxjx8kqlzm2vcb7snjblmd84w4id5"; depends=[data_table digest igraph Matrix quanteda R6 Rcpp RcppProgress RNewsflow SnowballC stringi tokenbrowser udpipe wordcloud]; }; corr2D = derive2 { name="corr2D"; version="1.0.0"; sha256="12k6vbqyb33kfj2xdg8rbydnp2yk15kv4b0m4lid4gf2lqmy3jwz"; depends=[colorspace doParallel fields foreach mmand profr rgl xtable]; }; @@ -6347,14 +6400,16 @@ in with self; { corrcoverage = derive2 { name="corrcoverage"; version="1.2.1"; sha256="0r5n2g341jlinwrxxwxkav9i6qsf097pmfi07aiq663b13r3864x"; depends=[data_table magrittr matrixStats Rcpp RcppArmadillo]; }; correctedAUC = derive2 { name="correctedAUC"; version="0.0.3"; sha256="0c2kq7asq5mp48p8niqb84wnw4q2q2985wxbrywrhsszm9p3xspb"; depends=[ICC mnormt]; }; corregp = derive2 { name="corregp"; version="2.0.2"; sha256="1v048dibn2x3y5mi2damcsr9i5kdig5n53g5j9gf31lqkzzjmnh3"; depends=[data_table diagram ellipse gplots rgl]; }; + correlation = derive2 { name="correlation"; version="0.1.0"; sha256="0idhw015s1a84z87mzy35rly700bd2mgsp3g9943c5yxnda2g17z"; depends=[bayestestR boot effectsize insight parameters]; }; correlationfunnel = derive2 { name="correlationfunnel"; version="0.1.0"; sha256="0kg770nfr1cd31b8y8g1kx046k401lha9hbj7lq543gl7s77aw2x"; depends=[cli crayon dplyr forcats ggplot2 ggrepel magrittr plotly purrr recipes rlang rstudioapi stringr tibble tidyr]; }; correlbinom = derive2 { name="correlbinom"; version="0.0.1"; sha256="1ix3ccxzr7vqblbda5awsva3h95b69v7kc6adz622bbi8r36xxcq"; depends=[Rmpfr]; }; corrgram = derive2 { name="corrgram"; version="1.13"; sha256="1g5159vihsz5a2cfmg4g4i1lildn2x2wzck5sd0vml5810rxjpma"; depends=[seriation]; }; corrplot = derive2 { name="corrplot"; version="0.84"; sha256="1k03qd8db7pwg1v318xapx5mpiypiz2n07qr19c4b45diri5xkhd"; depends=[]; }; - corrr = derive2 { name="corrr"; version="0.4.0"; sha256="0zjqkgsnwgcyi8hdskr7in0liqhpj9qml96agawzj11iy0bf6387"; depends=[dplyr ggplot2 ggrepel purrr rlang seriation tibble]; }; + corrr = derive2 { name="corrr"; version="0.4.2"; sha256="1mk6vvsmankrc6m5rm3y58wblsbyqar6js36c73x5g3fs95s58fj"; depends=[dplyr ggplot2 ggrepel purrr rlang seriation tibble]; }; corrsieve = derive2 { name="corrsieve"; version="1.6-8"; sha256="0ak3j9khcwv5rxbicck2sr260wpmd3xj254y7pdavx2fk0b72yxs"; depends=[]; }; corset = derive2 { name="corset"; version="0.1-4"; sha256="0ladyqvkys4cldvbhkii9jwn1k5p1ym2g5bgdlz1hq1sv30ixn2f"; depends=[]; }; - corto = derive2 { name="corto"; version="0.99.10"; sha256="0ss28d0fi30waywgz47j7vxqqxxgiixk4qandlvaxjyik3yy0n4g"; depends=[dplyr knitr pbapply rmarkdown]; }; + cort = derive2 { name="cort"; version="0.3.0"; sha256="1krb3d0g060b9a5a3pb782vd632lfncbxbmcvh6q21as0flm2hpv"; depends=[furrr magrittr nloptr osqp purrr Rcpp Rdpack]; }; + corto = derive2 { name="corto"; version="1.0.5"; sha256="042bz48qiwkhms5ad6189dlng91nz6mdfwjar7816ry7vzfn92iw"; depends=[dplyr knitr pbapply plotrix rmarkdown]; }; corx = derive2 { name="corx"; version="1.0.2"; sha256="1k9k1w5i5yky6c9jn5s80rf0r5r6qn7w0xwamjbankp2i4ryna5z"; depends=[clipr crayon ggcorrplot glue moments ppcor psych tidyselect]; }; cosa = derive2 { name="cosa"; version="2.0.0"; sha256="1ra1m75ay829xlhjax82px4ffflnfgh2mrmzzj4i8ml545d9hmgr"; depends=[msm nloptr]; }; cosinor = derive2 { name="cosinor"; version="1.1"; sha256="02nnqg51vq48lzk667cyarnmhcf5mifnsdij7dlgqvz2k4fdq4pl"; depends=[ggplot2 shiny]; }; @@ -6363,7 +6418,7 @@ in with self; { cosso = derive2 { name="cosso"; version="2.1-1"; sha256="1wyq27qak0kz4bbzynm24r5ksvb6ddd43h2ykh6m935xck16blyb"; depends=[glmnet quadprog Rglpk]; }; costat = derive2 { name="costat"; version="2.4"; sha256="0c47bklqjgjmdglw3mi9lvygwjr5w6i1zv91ll3vpnl5dnay0692"; depends=[wavethresh]; }; costsensitive = derive2 { name="costsensitive"; version="0.1.2.10"; sha256="192q55123yzcjjh4047ppxa3h7gk9afqnvm1nlhzs4ccqz71g411"; depends=[]; }; - cotram = derive2 { name="cotram"; version="0.1-1"; sha256="0rjwx94gpdndpwagy2wdjdvr5b8n8qrjv9yjyxph9xw533paiz49"; depends=[basefun mlt tram variables]; }; + cotram = derive2 { name="cotram"; version="0.2-0"; sha256="1jp3qmypgbdyilxf3x93pzrw36ha9xd66n8bmv38q4hkhha3z8ar"; depends=[basefun mlt tram variables]; }; cotrend = derive2 { name="cotrend"; version="1.0.2"; sha256="17h67vnpnlv11bf3ka5mlnah9bizxjhvicsvbygy91dqbhjhj9wb"; depends=[xts]; }; couchDB = derive2 { name="couchDB"; version="1.4.1"; sha256="1n99amvnsjp88y091603hjsvp243c5i6dbrsvdjfmzgj5dsrv70m"; depends=[bitops httr RCurl rjson]; }; countHMM = derive2 { name="countHMM"; version="0.1.0"; sha256="12z0nz7in2msb5wa5yyjxx19ih8psw06m7xwlapvjksslippp6gs"; depends=[]; }; @@ -6372,7 +6427,7 @@ in with self; { 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.2"; sha256="0k6fjg0v9n7vi89wd025gdjh1q3l6nnc5yn8i2bfw0i5vmv8rhi3"; depends=[MASS]; }; - countrycode = derive2 { name="countrycode"; version="1.1.0"; sha256="1pmv2jxr1ydgv8r5n20s5z80hdmzgvhm4cxdqhbkf7nfyipwl8xl"; depends=[]; }; + countrycode = derive2 { name="countrycode"; version="1.1.1"; sha256="1ys76s1sa6xj0mr5kryscwsh3dlrn9w35fx3fnr325j35xalyka4"; depends=[]; }; countyfloods = derive2 { name="countyfloods"; version="0.1.0"; sha256="0ld8p8dfk9khvwffbn8sad0j3an25s7cvbi6jxljgx4zc6ldh699"; depends=[dataRetrieval dplyr ggplot2 lubridate maps plyr R_utils tidyr]; }; countytimezones = derive2 { name="countytimezones"; version="1.0.0"; sha256="0sk22fmz9d3wvlfvjl1xdavvl04q1ywy8ww2gi5am3yiizkf0v9w"; depends=[dplyr lubridate]; }; countyweather = derive2 { name="countyweather"; version="0.1.0"; sha256="0q56bnh9x6jyj1sdd1q4yv2n774mbv268pgp285bjybgqm2pyisz"; depends=[dplyr geosphere ggmap ggplot2 lubridate purrr raster rnoaa sp stringi tibble tidyr tigris]; }; @@ -6381,28 +6436,31 @@ in with self; { covRobust = derive2 { name="covRobust"; version="1.1-3"; sha256="0zcfala4l0j4w0sx5hlw40vxiypans3d7pgkxy25nj0d2m1jkvba"; depends=[]; }; covTestR = derive2 { name="covTestR"; version="0.1.4"; sha256="0j9kay8lwkhpdyg0fbfars1m58v0i58v1v5sm7m72s7kz8qh2yfs"; depends=[purrr Rcpp RcppArmadillo rlang]; }; covafillr = derive2 { name="covafillr"; version="0.4.4"; sha256="1vsay0qlqcw3l6xp18rxrkhwsadsv9rpxwpj9f4d3vlr8inkiv4h"; depends=[Rcpp RcppEigen]; }; - covatest = derive2 { name="covatest"; version="1.1.1"; sha256="0fnm3ljk4my3xinv0qswi57l51z0j6cva7by00p8f5992hhk3sn9"; depends=[gstat lubridate matrixcalc sp spacetime zoo]; }; - coveffectsplot = derive2 { name="coveffectsplot"; version="0.0.4"; sha256="0lx42f86w5z7i0p2z5kwrm8rbcm4vriaagfhpixc8n7aq6mkb7bl"; depends=[colourpicker dplyr egg ggplot2 ggstance markdown shiny shinyjs tidyr]; }; + covatest = derive2 { name="covatest"; version="1.1.2"; sha256="08cff9ppw94r7bicgc4hrcgymslgn390hw26z7xnhdgfj7swq1nn"; depends=[gstat lubridate matrixcalc sp spacetime zoo]; }; + coveffectsplot = derive2 { name="coveffectsplot"; version="0.0.9"; sha256="1nz7r2fqmfgfg37dcnifljm22ifipjydfcvf2dl03d10av67c0cn"; depends=[colourpicker data_table dplyr egg ggplot2 ggstance markdown shiny shinyjs table1 tidyr]; }; covequal = derive2 { name="covequal"; version="0.1.0"; sha256="1qj6djqf1rnjmnaz1nryj9dc104082w258dzjjp5q18gg1ck8v0c"; depends=[corpcor RMTstat]; }; covfefe = derive2 { name="covfefe"; version="0.1.0"; sha256="178qc77y4bn04qad3g70wr8y4v0ggyg807w67m8wvhbcxqr8yq7c"; depends=[tokenizers]; }; - covglasso = derive2 { name="covglasso"; version="1.0"; sha256="1i5k61jivmipzpk53hpab9vnc57rnyl24jy503lnk5r1plb9w93i"; depends=[Rcpp RcppArmadillo]; }; - covr = derive2 { name="covr"; version="3.4.0"; sha256="0p44kr6yz5sqza5zvq6divqglzkpv0if9pjpjmzhmdaaddjrqzg5"; depends=[crayon digest httr jsonlite rex withr yaml]; }; + covglasso = derive2 { name="covglasso"; version="1.0.1"; sha256="1wyh5f7rhwrk042wcr31db4v0wpd12kxwfg1qqszdg3jq6xbyz25"; depends=[Rcpp RcppArmadillo]; }; + covid19_analytics = derive2 { name="covid19.analytics"; version="1.0"; sha256="18gk0n93f8by9695xpxbk16np7m925r8s5mghsbg2r85m8d3z70y"; depends=[ape deSolve gplots htmlwidgets pheatmap plotly]; }; + covid19italy = derive2 { name="covid19italy"; version="0.1.0"; sha256="1wd4f97gmw7l9zc0dpfwxii8gfhnwhk0c04gjvwk9xjdp5psx5gb"; depends=[devtools]; }; + covid19us = derive2 { name="covid19us"; version="0.1.1"; sha256="1rqfi0rgx7kl6pdvjiwrh4x4hr5x7jxr1v9sxma9jgqhg82mlmpi"; depends=[curl dplyr glue httr lubridate magrittr purrr snakecase stringr tibble tidyr]; }; + covr = derive2 { name="covr"; version="3.5.0"; sha256="1pvr95h7jg9hqq1qq1cccy323pkxldrwafl08151cc410499k4fb"; depends=[crayon digest httr jsonlite rex withr yaml]; }; covreg = derive2 { name="covreg"; version="1.0"; sha256="0v19yhknklmgl58zhvg4szznb374cdh65i7s8pcj2nwrarycwzaq"; depends=[]; }; covsep = derive2 { name="covsep"; version="1.1.0"; sha256="19dvwhl85yx9ddwxvnq5sdd534s6llcw61gckrav48hq49x1bqld"; depends=[mvtnorm]; }; cowbell = derive2 { name="cowbell"; version="0.1.0"; sha256="1zz0g30zvqfk5lh09y90iq3s7x2wwbs852i3d56mfp926gxdxc2y"; depends=[ggplot2 misc3d rgl]; }; cowplot = derive2 { name="cowplot"; version="1.0.0"; sha256="19cqdhgfyr1wj0fz0c5ly8f0aiy9sfgzq6lzb78hkx0hdp2agybh"; depends=[ggplot2 gtable rlang scales]; }; - cowsay = derive2 { name="cowsay"; version="0.7.0"; sha256="1f5hc1sj79yd3l2c6vrcj6xx2hdfxb16c3d2sgr7yps8j5fyrb9h"; depends=[crayon fortunes rmsfact]; }; + cowsay = derive2 { name="cowsay"; version="0.8.0"; sha256="12hximrdpikkczpwqjmah11nbwzyf7j1x7zcxa7igqwq8nfgv2yv"; depends=[crayon fortunes rmsfact]; }; coxed = derive2 { name="coxed"; version="0.3.2"; sha256="1pj0w7a40zmnsmvlqi8kxa4psyijqwwjyjmvcvbs9xylqlwna6ih"; depends=[dplyr ggplot2 gridExtra mgcv PermAlgo rms survival tidyr]; }; coxinterval = derive2 { name="coxinterval"; version="1.2"; sha256="0vb7vmzbb2dsihx04jbp2yvzcr033g435mywmwimqhfqdrmjx3fi"; depends=[Matrix survival timereg]; }; coxme = derive2 { name="coxme"; version="2.2-16"; sha256="04aid8v0y2afwwbfm39np1pgdla4jw427gy2wazsphf495b4pkm0"; depends=[bdsmatrix Matrix nlme survival]; }; - coxmeg = derive2 { name="coxmeg"; version="1.0.9"; sha256="19p2j6i34jg6akfyr6hv2xmashpsvf8y5bbql6a62b3f5yz5639v"; depends=[coxme MASS Matrix matrixcalc microbenchmark nloptr rARPACK Rcpp RcppEigen SNPRelate]; }; + coxmeg = derive2 { name="coxmeg"; version="1.0.10"; sha256="00gp0a7fx7xjk6wccrmwywgvxk8bcdqv9ph1z53qx8mqxyqnz4g6"; depends=[coxme MASS Matrix matrixcalc microbenchmark nloptr rARPACK Rcpp RcppEigen SNPRelate]; }; coxphMIC = derive2 { name="coxphMIC"; version="0.1.0"; sha256="0lmma5wzcczr762xqa4yamvwvyviqxk8gdrps3sydg3n14hckp6d"; depends=[numDeriv survival]; }; coxphSGD = derive2 { name="coxphSGD"; version="0.2.1"; sha256="17ga33v7a89dsygk5yypkz03x7dvjhibnwlvwfvgb2p7djd8w465"; depends=[survival]; }; coxphf = derive2 { name="coxphf"; version="1.13"; sha256="16bman8xv5xx7gg8s54sj3hc4isqxk4h3q93h4q3h3j0bdvww2yy"; depends=[survival]; }; coxphw = derive2 { name="coxphw"; version="4.0.1"; sha256="116dp6zispa8k7y6jrn4v9ipf0jqdhj68w9qqc2qwcapawvrd0nh"; depends=[survival]; }; coxrobust = derive2 { name="coxrobust"; version="1.0"; sha256="08hp0fz5gfxgs3ipglj6qfr6v63kzxkrzg650bmzabq8dvrxd97q"; depends=[survival]; }; coxrt = derive2 { name="coxrt"; version="1.0.3"; sha256="1xggczjx5psl4m4m83vh4y6swnh3pf9rngnzx3268iznfz1g43h2"; depends=[BB ggplot2 gss inline Rcpp RcppArmadillo survival]; }; - coxsei = derive2 { name="coxsei"; version="0.1"; sha256="1agr0gmyy1f2x6yspj04skgpi1drpbc1fcbwhhhjsz1j6c64xagy"; depends=[]; }; + coxsei = derive2 { name="coxsei"; version="0.3"; sha256="1k3xsjwv1ji8n2qry2j93svr8a114mxkdl5y2zwz7mp82dmv0ld6"; depends=[]; }; cp4p = derive2 { name="cp4p"; version="0.3.6"; sha256="1zddkkj0ynvfck3kw1682wffbxw0d3dc4flmxxp03lclq70fc8bd"; depends=[limma MESS multtest qvalue]; }; cpa = derive2 { name="cpa"; version="1.0"; sha256="14kcxayw4cdbjfa6bvfzqp8flwc0sr3hmh2dnr1dfax0hnccd71m"; depends=[]; }; cpca = derive2 { name="cpca"; version="0.1.2"; sha256="1pccsjahb1qynnxa0akhfpcmhfmdg4rd1s6pfqrdl7bwbcmq4lqf"; depends=[]; }; @@ -6414,6 +6472,7 @@ in with self; { cplots = derive2 { name="cplots"; version="0.4-0"; sha256="1k4kazw7lw2d991brnzhma6qvg8kwslrbi9q4gy61x02wcig927n"; depends=[circular]; }; cpm = derive2 { name="cpm"; version="2.2"; sha256="1n1iqhalp99mbh8jha0pv759fb97sqxdiiq9bxy3wm6aqmssvdb1"; depends=[]; }; cppRouting = derive2 { name="cppRouting"; version="2.0"; sha256="0yfiyg1clnl85lk5ah8dcchv71drk6r093vpl82xnczyan5z94sr"; depends=[data_table Rcpp RcppParallel RcppProgress]; }; + cppcor = derive2 { name="cppcor"; version="1.2"; sha256="0x55dx7q5mqqr3mhkkq9qs6gwfzrlgay9clasp9a736drmpgm6vb"; depends=[caret doParallel e1071 foreach gWidgets gWidgetsRGtk2 mvtnorm pacman]; }; 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.2.0"; sha256="049xnma0rdnya7zp05iraq15nwjgmdmli9g7xxprab822047vld7"; depends=[]; }; cpsurvsim = derive2 { name="cpsurvsim"; version="1.2.0"; sha256="1fn88cqryji1syzhnx726m5svxnrlyynxk4jhp5ny8g3knai6nnk"; depends=[Hmisc knitr plyr]; }; @@ -6436,19 +6495,20 @@ in with self; { crblocks = derive2 { name="crblocks"; version="1.0-0"; sha256="0y101kgi7ryjv18fyjp0ralp4qj7kgshmbd4mf7n3hdjay0znss5"; depends=[]; }; crch = derive2 { name="crch"; version="1.0-4"; sha256="18qjvh1lkw1f6rrhnb21f30xxrcq8whbs3x1jgkw6q14rf1483ri"; depends=[Formula ordinal sandwich scoringRules]; }; credentials = derive2 { name="credentials"; version="1.1"; sha256="0izwskymymkxdwsdj7zapqpkc6g37c0m6c2na0y00s1kwr73d2qd"; depends=[askpass curl jsonlite openssl sys]; }; + creditmodel = derive2 { name="creditmodel"; version="1.1.8"; sha256="1l9l56cs9kh22j8ky2iklakwsw69j89gb6kz57yklj2sj543hzir"; depends=[cli data_table doParallel dplyr foreach ggplot2 glmnet rpart xgboost]; }; 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]; }; - crevents = derive2 { name="crevents"; version="0.1.0"; sha256="0f8xa2dn1896523am61k1ajqgmn8v6k772van6d0lajlz7crmw2c"; depends=[crul jsonlite tibble]; }; crfsuite = derive2 { name="crfsuite"; version="0.3"; sha256="10mify8y1f6iwfckfrhhhw6j01p1cd9bq5xwcyz121wkfhnny6rx"; depends=[data_table Rcpp]; }; - cricketr = derive2 { name="cricketr"; version="0.0.22"; sha256="10dfzm297knwcqnznsprrwgrfa83hxqvr3px9mdgqj9q97c2bn3b"; depends=[dplyr forecast ggplot2 lubridate plotrix scatterplot3d XML]; }; + cricketr = derive2 { name="cricketr"; version="0.0.23"; sha256="0daxw2rdx4j1b4h557zhqlbbqbzdai5vzy3fal4mp6hgv350d5ks"; depends=[dplyr forecast ggplot2 httr lubridate plotrix scatterplot3d XML]; }; crimCV = derive2 { name="crimCV"; version="0.9.6"; sha256="14ckk88i7jk8a7kl51d7qfdis44jng6zz9zd72cdp80a57dvrvzq"; depends=[]; }; crimedata = derive2 { name="crimedata"; version="0.2.0"; sha256="073zlk9b4saz72d33z73mc9qzfk49bxwjhph6zbw27nl38k74j7d"; depends=[digest dplyr httr magrittr purrr readr sf stringr tibble]; }; crimelinkage = derive2 { name="crimelinkage"; version="0.0.4"; sha256="1zzk50kyccvnp51vzp28c9yi23hsp25arrgdn88lwfwa0m43rlar"; depends=[geosphere igraph]; }; crisp = derive2 { name="crisp"; version="1.0.0"; sha256="1gs8jnd9y9pd55w6kwv9mvmg3wd8hjiw3lwx7k242pxccsxklfxq"; depends=[MASS Matrix]; }; crmPack = derive2 { name="crmPack"; version="1.0.0"; sha256="11zy1ci9d0zjbmc0gws9j9qrnfcqvky1ws9p41wjn0zifcckc5gi"; depends=[GenSA ggplot2 gridExtra MASS mvtnorm rjags]; }; - crminer = derive2 { name="crminer"; version="0.2.0"; sha256="1rlh7bxk8bry2v9fnqzy0ph62dda1pzifksr7v4pmdyhji9mjw33"; depends=[crul hoardr jsonlite pdftools xml2]; }; - crmn = derive2 { name="crmn"; version="0.0.20"; sha256="1kl1k1s2gm63f9768cg8w4j6y1gq4hws3i7hdfhj7k9015s0a25p"; depends=[Biobase pcaMethods]; }; + crmReg = derive2 { name="crmReg"; version="1.0.1"; sha256="1i3i4pd1ff7cmyd268p5kmncrk0lrq4q4cjhkhxbp2pah041q4wk"; depends=[FNN ggplot2 gplots pcaPP plyr robustbase rrcov]; }; + crminer = derive2 { name="crminer"; version="0.3.0"; sha256="03ynpnk3ni0l2cdlfk69vm1swlva0wjm7lnrb7b1dl9xdjr57lzn"; depends=[crul hoardr jsonlite pdftools xml2]; }; + crmn = derive2 { name="crmn"; version="0.0.21"; sha256="0wp99fsw7y859gp1x22f77r9rv1m0xspbzhzgshzf7hi86xb57k5"; depends=[Biobase pcaMethods]; }; crn = derive2 { name="crn"; version="1.1"; sha256="1fw0cwx478bs6hxidisykz444jj5g136zld1i8cv859lf44fvx2d"; depends=[chron RCurl]; }; crochet = derive2 { name="crochet"; version="2.2.0"; sha256="1cbv79nyycxk6f8ldcsnn2pvgxqlnrj0qs19nhafnq2clxy863k6"; depends=[]; }; cromwellDashboard = derive2 { name="cromwellDashboard"; version="0.5.1"; sha256="0d57c1wdd1ds9fr7p256la63qbv8mirljgrvl1k8fp5gcnkps5wb"; depends=[dplyr DT httr shiny shinydashboard stringr]; }; @@ -6460,12 +6520,11 @@ in with self; { crossdes = derive2 { name="crossdes"; version="1.1-1"; sha256="1d7lv3ibq1rwxx8kc3ia6l9dbz2dxdd5pnf2vhhjmwm448iamcfd"; depends=[AlgDesign gtools]; }; crossmatch = derive2 { name="crossmatch"; version="1.3-1"; sha256="082lrv2129mfhwlh99z3g8id3a29s8854skl152bl3ig8pk2gbjz"; depends=[nbpMatching survival]; }; crossrun = derive2 { name="crossrun"; version="0.1.0"; sha256="0br57nraqhs5f1cpidc8kd31izm82wvhiw9pxcdj9v51l9vifbmx"; depends=[Rmpfr]; }; - crosstalk = derive2 { name="crosstalk"; version="1.0.0"; sha256="0lfa89vhrzi7a1rghmygcjr8gzddw35sinb3jx6g49mc9jias7mk"; depends=[ggplot2 htmltools jsonlite lazyeval R6 shiny]; }; + crosstalk = derive2 { name="crosstalk"; version="1.1.0.1"; sha256="03ihj7cimkklrbad9zic78xsrfcisygmgy859hqnx0hiph80p9rn"; depends=[htmltools jsonlite lazyeval R6]; }; crossval = derive2 { name="crossval"; version="1.0.3"; sha256="0acpcisg6pkxblyc4j9hiri58h1rn7ay43p5ib5ia8a4a8bnfa4p"; depends=[]; }; crosswalkr = derive2 { name="crosswalkr"; version="0.2.6"; sha256="1rxd6vy7vdrawmg7zkydl1f2wwklnzgh9dsnxbg966xrr3l9x1n9"; depends=[haven labelled readr readxl tibble]; }; 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.3.3"; sha256="0jkh4jq0pwz1pqgckdylcdjg7d45z0xl3pdvyb93pcvi073na9na"; 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]; }; @@ -6475,43 +6534,46 @@ in with self; { crs = derive2 { name="crs"; version="0.15-31.1"; sha256="1p16nnxskjf3fdrdm5y1n5zj0acyrmc73ff75rgry1b1fd4yk61x"; depends=[boot np quantreg rgl]; }; crseEventStudy = derive2 { name="crseEventStudy"; version="1.2"; sha256="1fgjj78p54fk0bkvx0fq1h7c5j4c64g10cdjzmmqhhxlyjwp5z7y"; depends=[sandwich]; }; crskdiag = derive2 { name="crskdiag"; version="1.0.1"; sha256="0100wbyvchx6jwlrwc6rwhdjanips5c0f5zqzs2c0dgwygpqw30w"; depends=[cmprsk]; }; + crsmeta = derive2 { name="crsmeta"; version="0.3.0"; sha256="19v0bq80cma74jjl0k42pmlpd5jfv6b0hr7j2iq0d47h50pvrd02"; depends=[]; }; crsnls = derive2 { name="crsnls"; version="0.2"; sha256="0rv0xrdl9ix6bhaf554gma8zf923w47f8j1dkbs8g6xjqjr1c40a"; depends=[]; }; crso = derive2 { name="crso"; version="0.1.1"; sha256="1r10vz8z5y52a5v5phw22fhqwv9p7g66xfsx0906bcx74dn3f2b3"; depends=[foreach]; }; crsra = derive2 { name="crsra"; version="0.2.3"; sha256="1rkqm88zmvp9gw442cby6qpvfw4pfw65wz0gyl2h37w87c3wwvrw"; depends=[digest dplyr knitr purrr rcorpora readr tibble tidytext]; }; crtests = derive2 { name="crtests"; version="0.2.1"; sha256="0z8idz37dgwvi1q2vryldii7fn9yxd32gds77ml76jfplxbkikpd"; depends=[caret plyr stringr]; }; crul = derive2 { name="crul"; version="0.9.0"; sha256="1h1iyp625x2fx22dai9y0pmg64q65p9iiilkkd0qlr1ir9ljrd57"; depends=[curl httpcode jsonlite mime R6 urltools]; }; - crunch = derive2 { name="crunch"; version="1.26.1"; sha256="01ajcvn31nb8cdmqmalmxvp1pvh7nmd9fyg2fc1zm7yy3a2klp9l"; depends=[crayon curl httpcache httr jsonlite]; }; + crunch = derive2 { name="crunch"; version="1.26.3"; sha256="1hnzx9kc0h1x9pjpq9vmdk79vxqwwgh1ncskj9zvmjdmbaj6vyj3"; depends=[crayon curl httpcache httr jsonlite]; }; crunchy = derive2 { name="crunchy"; version="0.3.1"; sha256="1qvwzym2hj61zjlm7j34j8jl5kfpkpx35xfjjyl5y35a5y50sz8g"; 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.3"; sha256="0n8b5cp7fp65zp99i8mr6gxi4w0m0l9pyjzq572p2fd8pss1g5nr"; depends=[cli crayon curl dplyr httr jsonlite lubridate progress reshape2 rstudioapi rvest tibble tidyr xml2 xts]; }; + cruts = derive2 { name="cruts"; version="1.1"; sha256="1ih6h9qk4yflzars00d61smjqj7s4bfvc2ikp6vlki9f6k012xcx"; depends=[lubridate ncdf4 raster sp stringr]; }; cryst = derive2 { name="cryst"; version="0.1.0"; sha256="04da19dy3mkngd3ma44cd8cdkb5acjy9lbhfipa9flp339j1pp57"; depends=[flux pracma]; }; csSAM = derive2 { name="csSAM"; version="1.2.4"; sha256="1ms8w4v5m9cxs9amqyljc2hr1178cz6pbhmv7iiq9yj1ijnl4r1x"; depends=[]; }; csabounds = derive2 { name="csabounds"; version="1.0.0"; sha256="15l7i15w5jk4h3148dlk8v2i4awns5vxvv6m59qcv0hzns6jhx9j"; depends=[BMisc ggplot2 pbapply progress qte]; }; csampling = derive2 { name="csampling"; version="1.2-2.1"; sha256="0kqx7j96yafsqi9cz551fqpwkbcabxl8zpwa2jms862z41xbgsv3"; depends=[marg statmod survival]; }; cshapes = derive2 { name="cshapes"; version="0.6"; sha256="0mp6grkibmqk4k1yi4w2sglpp9ari5cfw4iip49a0z58qa98npw7"; depends=[maptools plyr sp]; }; csn = derive2 { name="csn"; version="1.1.3"; sha256="102w1qh9hgz4j9lh5hnbw1z3b7p034si73q4pkk564a2mhzlksw4"; depends=[mvtnorm]; }; - csodata = derive2 { name="csodata"; version="0.1.5.0"; sha256="0qngazgky4nzcvz994652291dk2jizqykxjmqf0j3cv6wgsrhfrz"; depends=[dplyr httr jsonlite R_cache reshape2 rjstat sf]; }; + csodata = derive2 { name="csodata"; version="1.0.1.1"; sha256="1aldw10cjqz9563v5d4i1m4jb7pfimada3sdhwxkzsqqylvh6chg"; depends=[dplyr httr jsonlite R_cache reshape2 rjstat sf]; }; csp = derive2 { name="csp"; version="0.1.0"; sha256="1pc5mcn9difpp4cmfb0a8pqhbpkfakxjkbr7bpqmfiwcfk8rzr1h"; depends=[]; }; csrplus = derive2 { name="csrplus"; version="1.03-0"; sha256="0kljndmiwblsvvdnxfywida9k0dmdwjq63d934l5yl6z7k4zd0xa"; depends=[sp]; }; cssTools = derive2 { name="cssTools"; version="1.0"; sha256="1p8c21c1hilmd9ibqyz493fy1x95hb2pidybsyicch53gkb542br"; depends=[sna]; }; cstab = derive2 { name="cstab"; version="0.2-2"; sha256="1lr401fvi88f4jv8jh4brx95ymncfw8clripz1r6a46inj80nj4j"; depends=[cluster fastcluster Rcpp]; }; cstar = derive2 { name="cstar"; version="1.0"; sha256="1zws4cq5d37hqdxdk86g85p2wwihbqnkdsg48vx66sgffsf1fgxd"; depends=[]; }; - csv = derive2 { name="csv"; version="0.5.4"; sha256="019hagmz68bg10x4ykbr67i5dx7277pxdsqlvq06fzlf47kgizm5"; depends=[]; }; + csv = derive2 { name="csv"; version="0.5.5"; sha256="1i5apqdljr201jqd3r7mdlxczwfj9kz5b6k2myjalisgrgwgy642"; depends=[]; }; csvread = derive2 { name="csvread"; version="1.2.1"; sha256="1r9jvf7nbkxgl6dycdnb89yh39vacrzy8z04g8qz225rklg5b288"; depends=[]; }; csvy = derive2 { name="csvy"; version="0.3.0"; sha256="0id015szw1c63vd1h0515jsqdhyn32sxpxm89f3sb1qkgq3yynmy"; depends=[data_table jsonlite yaml]; }; + ctDNAtools = derive2 { name="ctDNAtools"; version="0.4.0"; sha256="0apdz3dv6snlshiq314clkpqycppd3mmyq4skyd1bdrbycnm5s96"; depends=[assertthat BiocGenerics Biostrings BSgenome dplyr ellipsis furrr GenomeInfoDb GenomicAlignments GenomicRanges IRanges magrittr purrr rlang Rsamtools tidyr VariantAnnotation]; }; + ctgt = derive2 { name="ctgt"; version="1.0"; sha256="0iznqskyi80xs8xn2hrrlal9qz9cwq6m9ml6wfwyynbzgn7vmvvh"; depends=[BH Rcpp]; }; cthreshER = derive2 { name="cthreshER"; version="1.1.0"; sha256="18b66d08dq8pvnixmm4ir4r800b37z5yillaa88l317mdilbci9s"; depends=[Matrix]; }; ctl = derive2 { name="ctl"; version="1.0.0-4"; sha256="027cij4vdsq3xhi38izzn07q6xwja7n8v95l7kk1pp92y9qkvqv3"; depends=[MASS qtl]; }; ctmcd = derive2 { name="ctmcd"; version="1.4.1"; sha256="01nflgdyb70kh4f8bnxpavr31fz4fh02kgz2nlx3zzblnm2idbcx"; depends=[coda expm numDeriv Rcpp RcppArmadillo]; }; ctmcmove = derive2 { name="ctmcmove"; version="1.2.9"; sha256="1pxyxbbhfa8arqfb7qw10ya1b8hy9ylqbqqzys6d9dsixvdk98h0"; depends=[fda gdistance Matrix raster sp]; }; ctmle = derive2 { name="ctmle"; version="0.1.2"; sha256="0qc1ji8fjpr88dn6mrpijfcx1ij4zkrxsbcw405hxal7rli0gyp3"; depends=[glmnet SuperLearner tmle]; }; - ctmm = derive2 { name="ctmm"; version="0.5.8"; sha256="17bqq67pwkkdmhv45n85w6y2n59vgaf5zhma2bhq1bn6dimgf1dq"; depends=[data_table digest expm fasttime Gmedian gsl manipulate MASS numDeriv pbivnorm pracma raster rgdal shape sp]; }; - ctqr = derive2 { name="ctqr"; version="1.0"; sha256="1q4icv8qicgwr664cbrmkh2x9xmlrc80yvz8gnaqh86248kn4yp3"; depends=[pch survival]; }; + ctmm = derive2 { name="ctmm"; version="0.5.9"; sha256="0in7dc83gbqpf6gcz0nz23a2fq5xwjx8qkgy0bgsnsrwmx32b0ar"; depends=[data_table digest expm fasttime Gmedian gsl manipulate MASS numDeriv pbivnorm pracma raster rgdal shape sp]; }; + ctqr = derive2 { name="ctqr"; version="1.1"; sha256="1iv6mms7p0xca91mpj61cj8kxv2bwqrpvwdsbx2lk6hgys8g70y2"; depends=[pch survival]; }; ctrdata = derive2 { name="ctrdata"; version="1.2"; sha256="146nb5sv6mj43kqs8iz58nzyx4xrrk5khay2hjjpfrh1g076bw8k"; depends=[clipr curl httr jsonlite nodbi rvest xml2]; }; ctrlGene = derive2 { name="ctrlGene"; version="1.0.1"; sha256="0x7j11v7jj4k1jml6lrnjq79awhrvsm3pig1yxsd337jlfml3ra9"; depends=[psych]; }; - ctsem = derive2 { name="ctsem"; version="3.0.9"; sha256="0kkkyvmdz43npgh2xx4dsr0s02xj6x9d89rahqn2h0560qjd1059"; depends=[BH cOde data_table Deriv ggplot2 MASS Matrix mize mvtnorm numDeriv OpenMx pkgbuild plyr quantreg Rcpp RcppEigen rstan rstantools StanHeaders]; }; + ctsem = derive2 { name="ctsem"; version="3.1.1"; sha256="0l45bfvjjy4ak5bg6nfj8i9adl3qy79nllb0ldmhmg0wqxw76zs4"; depends=[BH cOde data_table Deriv ggplot2 MASS Matrix mize mvtnorm numDeriv OpenMx pkgbuild plyr quantreg Rcpp RcppEigen rstan rstantools StanHeaders]; }; ctv = derive2 { name="ctv"; version="0.8-5"; sha256="0kl6z8dbbjgm29q0c5xy6lihjgf5cdihrllm27x0zbcvy8lyl51p"; depends=[]; }; cuRe = derive2 { name="cuRe"; version="1.0.0"; sha256="0bdj3ak1s6rg84d82iy95g1sdanl6y5a4rdsnixqzrhb9kvnrv0s"; depends=[date numDeriv relsurv rootSolve rstpm2 statmod survival]; }; cubature = derive2 { name="cubature"; version="2.0.4"; sha256="0jpyq8j7x06dpiz29w48av879ygldzgls9z810192hsymkmfaz6r"; depends=[Rcpp]; }; + cubelyr = derive2 { name="cubelyr"; version="1.0.0"; sha256="0h9s5j9q05bdzdv7dbghzfbhqf96kyxyrxx1mqf8phzc77w4yh25"; depends=[dplyr glue pillar purrr rlang tibble tidyselect]; }; cubeview = derive2 { name="cubeview"; version="0.2.0"; sha256="1352hi2j9x9rx4iy3xvsca86nsh39x1vnymd17f5qc8c3plfm8db"; depends=[base64enc htmltools htmlwidgets lattice raster stars viridisLite]; }; cubfits = derive2 { name="cubfits"; version="0.1-3"; sha256="0i2iybm9vpyqnahzka66yms1namdd36bz1i1yjy74qsc1h995rga"; depends=[coda foreach]; }; cubing = derive2 { name="cubing"; version="1.0-5"; sha256="1q23fplvklaaldicqic0zpnh301m08zb9k21l47zj47g9m9pj4bc"; depends=[rgl]; }; @@ -6534,7 +6596,6 @@ in with self; { cusum = derive2 { name="cusum"; version="0.4.1"; sha256="0vjq3slkjdgls41xm637xkrg8jhv6y75xiyfcgpwrp32ixmakpcd"; depends=[checkmate data_table Rcpp]; }; cutoff = derive2 { name="cutoff"; version="1.3"; sha256="0anrvmlvcxah620il3fkq6ldp7hx4nwdnzcpmfc5mhlsry0lp178"; depends=[do ROCit set survival]; }; cutoffR = derive2 { name="cutoffR"; version="1.0"; sha256="1801jylmpp4msyf07rhg4153kky1zvi4v0kkjb9d51dc7zkhh531"; depends=[ggplot2 reshape2]; }; - cutpointr = derive2 { name="cutpointr"; version="1.0.1"; sha256="0nny2zp97ldfcd3ficyzlphv9fcwmpji9ynw7ygvx24skp291f35"; 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]; }; cvGEE = derive2 { name="cvGEE"; version="0.3-0"; sha256="085qjm520l2441nakfxy851s6bfy5832b5fy54z5fp4xr1jn6snm"; depends=[]; }; @@ -6561,29 +6622,30 @@ 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.2"; sha256="0wfwkjn0a99n90f46c3y6vqpz5w549vm5slrjql9mz6l1r7jz0cf"; depends=[getPass openssl sodium]; }; + cyphr = derive2 { name="cyphr"; version="1.1.0"; sha256="03w26b5vvy9zwzp001g0lpwcndwqdsfsz80x11kik0cih1g8apsw"; 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]; }; cytometree = derive2 { name="cytometree"; version="2.0.2"; sha256="18g7av73lmnyga1kk24bf8jy599zn9n6qhr13mxsqgi0zdinicfa"; depends=[cowplot ggplot2 GoFKernel igraph mclust Rcpp RcppArmadillo]; }; + cytominer = derive2 { name="cytominer"; version="0.2.1"; sha256="0snifz15ijn5bfl3ppfqjp7ac68hsx0rzxlcnxj3285d10p0wljq"; depends=[caret doParallel dplyr foreach futile_logger magrittr Matrix purrr rlang tibble tidyr]; }; d3Network = derive2 { name="d3Network"; version="0.5.2.1"; sha256="1gh979z9wksyxxxdzlfzibn0ysvf6h1ij7vwpd55fvbwr308syaw"; depends=[plyr rjson whisker]; }; d3Tree = derive2 { name="d3Tree"; version="0.2.0"; sha256="0xjr36hdd00dy8s8z1a1s44dn2wg0nm6yqc1rri2l0dqrbh4nrbn"; depends=[dplyr htmlwidgets magrittr plyr stringr]; }; d3heatmap = derive2 { name="d3heatmap"; version="0.6.1.2"; sha256="1ici8j0wzzklhmw94qlxm292qs562vc32wq8mnjsas2n1p35vkmk"; depends=[base64enc dendextend htmlwidgets png scales]; }; d3plus = derive2 { name="d3plus"; version="0.1.0"; sha256="0kadz83pals03n0v3zqhmhf6visigk52yn58xckhb57fid4xzj5w"; depends=[htmlwidgets magrittr]; }; d3r = derive2 { name="d3r"; version="0.8.7"; sha256="0xl3im76lp7pd5lhp8jfyqdm4j4zvjrx5a5fl81xv2cf7x3n4f2a"; depends=[dplyr htmltools tidyr]; }; - dBlockmodeling = derive2 { name="dBlockmodeling"; version="0.1.1"; sha256="17vw8mf03ry2qz3nbwch51p2x1j18vrzyf881dh604wql5k8yfjc"; depends=[]; }; + dBlockmodeling = derive2 { name="dBlockmodeling"; version="0.2.0"; sha256="0c1hvawb9gw6vckims3g8kzn2c4f0as5x1vw39sdvkwc92xy26lv"; depends=[]; }; dChipIO = derive2 { name="dChipIO"; version="0.1.5"; sha256="1xrafw5h071d8rfqaic3gifc80jpiddjz5x6l2cr8kgjvph60gqh"; depends=[]; }; dCovTS = derive2 { name="dCovTS"; version="1.1"; sha256="1pd50nfmfcqpi8zj20ngl0hc23qa4rabqhc1xci3ivyhs0valhsl"; depends=[doParallel energy foreach]; }; dGAselID = derive2 { name="dGAselID"; version="1.2"; sha256="0da7fi872i3ycb3j5v4isr4x2z39a68w4mdq859zslmqhiqd43b6"; depends=[ALL Biobase genefilter MLInterfaces]; }; dHSIC = derive2 { name="dHSIC"; version="2.1"; sha256="1c1xz1f1fp937w4rlylvqv3ii0p9dafvmn4fqq8rzxhcg5rn9j4l"; depends=[Rcpp]; }; - dLagM = derive2 { name="dLagM"; version="1.0.21"; sha256="0ppgisp76a9fc3p63ckm445sh2dy5jybh5q7karg9hsx4y13appd"; depends=[AER dynlm formula_tools lmtest MASS nardl plyr roll strucchange wavethresh]; }; - dMod = derive2 { name="dMod"; version="1.0.0"; sha256="1mj2a9hpfldxbsiggi27nz3w0klp7qwpplpwh4bi9ik25vll25a0"; depends=[cOde deSolve doParallel dplyr foreach ggplot2 plyr rootSolve stringr]; }; + dLagM = derive2 { name="dLagM"; version="1.1.2"; sha256="0mn90jl9648q9r8mw6h0jsjrjhiqylry55f7zi1rjbr4p838djn9"; depends=[AER dynlm formula_tools lmtest MASS nardl plyr roll strucchange wavethresh]; }; + dMod = derive2 { name="dMod"; version="1.0.1"; sha256="1xw52kliyiv9vrw0m9y7baqdcpqz4706625if8b63nfr70i77a9p"; depends=[cOde deSolve doParallel dplyr foreach ggplot2 plyr rootSolve stringr]; }; dSVA = derive2 { name="dSVA"; version="1.0"; sha256="0vy0flyg82x0n9vw6jf9f76qy84sp0wnis91faj37ac5hdv3pvsb"; depends=[sva]; }; daarem = derive2 { name="daarem"; version="0.4.1"; sha256="1krixphwjh4wp38in7ypwc4y4ncdrryhsnjnn1y48fm2jgc8zvjl"; depends=[]; }; - dabestr = derive2 { name="dabestr"; version="0.2.2"; sha256="10vzp28bx4vf9jc3l9jjw94wir75j8h60lcncafbdwvxjh5alpfs"; depends=[boot cowplot dplyr ellipsis forcats ggbeeswarm ggforce ggplot2 magrittr rlang simpleboot stringr tibble tidyr]; }; - dad = derive2 { name="dad"; version="3.3.0"; sha256="1154jk4j1h5wr3c68pj0slh90jxccia28wpmygn9mz0mlvx9km9l"; depends=[DescTools e1071 lattice]; }; - dae = derive2 { name="dae"; version="3.1-21"; sha256="0b562s3w5h0nmq32yfw4y55w9ax2kgf67w3mdy5qaipqhjf35jq6"; depends=[ggplot2 plyr]; }; - daewr = derive2 { name="daewr"; version="1.1-8"; sha256="1p5nblh745mq2zk48qa5dfpplywrz9yycmckv6ky4dv67j40qpqx"; depends=[BsMD FrF2 lattice stringi]; }; + dabestr = derive2 { name="dabestr"; version="0.2.4"; sha256="1xy1fzfjajphpqwa3x0hsl6fyr55zq1az7la5wpdh0n3sbj1wkbd"; depends=[boot cowplot dplyr ellipsis forcats ggbeeswarm ggforce ggplot2 magrittr plyr rlang simpleboot stringr tibble tidyr]; }; + dad = derive2 { name="dad"; version="3.4.0"; sha256="0jgirdnp3gaychnjg4mp4p1mdn31hlngs1znzvlxhrd0cqyi4ccd"; depends=[DescTools e1071 ggplot2]; }; + dae = derive2 { name="dae"; version="3.1-23"; sha256="1qpsnyjq2imci45hn0c00cwgvhdrcbrfrvwmjm87k8vb3g0wqhgr"; depends=[ggplot2 plyr]; }; + daewr = derive2 { name="daewr"; version="1.2-3"; sha256="0ic7lpydsdiilqsbvc5yskrrl6a2l6kmgiz1idz0ic0klyk6rnig"; depends=[FrF2 lattice stringi]; }; daff = derive2 { name="daff"; version="0.3.5"; sha256="00zcdf215m7p3xm9yv571v09znhdqacxg69hb5b5j749mp4wdsyj"; depends=[jsonlite V8]; }; dafs = derive2 { name="dafs"; version="1.0-37"; sha256="1vdi57qaqdn39yf1ih2gzry02l289q4bffpksglsl4shs6bg2206"; depends=[s20x]; }; dagR = derive2 { name="dagR"; version="1.1.3"; sha256="13jyhwjvvrjjja18rqzfdcw9ck90qm5yjwd25nygxgdf1894y03b"; depends=[]; }; @@ -6594,7 +6656,8 @@ in with self; { dams = derive2 { name="dams"; version="0.2"; sha256="0hf5s8i61r5q4h3s8dfmdl3vkj7v15ha59pjvpjqx3yihsgziqz9"; depends=[RCurl]; }; dang = derive2 { name="dang"; version="0.0.11"; sha256="14bxzbkrqzs0ic7n4rlaa429lwdgldlcx97h8l7ma6jh8c0fx3qr"; depends=[]; }; dani = derive2 { name="dani"; version="0.1-1"; sha256="0ff0hcb5r8k6m6kv1zhjrpvl7gr1al3q0zlk4yjj89qd2j5byqp8"; depends=[Epi]; }; - dann = derive2 { name="dann"; version="0.1.0"; sha256="0v6dnf7acjg6w64nwrscxhi3g7pr6bdiwdbiyaa8k760yg4r965n"; depends=[dplyr fpc ggplot2 magrittr MASS mlbench purrr rlang stringr tibble]; }; + dann = derive2 { name="dann"; version="0.2.0"; sha256="18c9rx7qg76pnmg2h4zazqq7k0vxgqh70j85cb7cc8lf0qsj6l8i"; depends=[fpc ggplot2 MASS purrr Rcpp RcppArmadillo rlang stringr tibble]; }; + danstat = derive2 { name="danstat"; version="0.1.0"; sha256="1wb4v4s9qc7qna7jgd1kk0xvyaqmxhnmjvr5wlk5jjl355lhjxbc"; depends=[httr jsonlite readr]; }; dapr = derive2 { name="dapr"; version="0.0.3"; sha256="136chxijyxrl5sbiggxf56zga26zqds647z1z2igwn5mdff1wxyb"; depends=[]; }; darksky = derive2 { name="darksky"; version="1.3.0"; sha256="1740cw5qifgvqa0nafd6lmllxi32n1zm45zlify1yn3h1qdcszhb"; depends=[ggplot2 gridExtra gtable httr plyr]; }; dartR = derive2 { name="dartR"; version="1.1.11"; sha256="0k768ppm4iw4fi72dp8f1684kizqp1spfb4cnnqxq1dy6w0qz5i8"; depends=[adegenet ape data_table directlabels dismo doParallel foreach gdistance ggplot2 hierfstat igraph leaflet MASS mmod pca3d pegas plyr PopGenReport qvalue reshape2 rgdal rrBLUP seqinr SNPassoc SNPRelate sp StAMPP stringr tidyr vegan]; }; @@ -6606,38 +6669,41 @@ in with self; { dataCompareR = derive2 { name="dataCompareR"; version="0.1.2"; sha256="0n10dqnrlpwafxys68b3ly156235lhqby71qay0vb0r6bvl2g349"; depends=[dplyr knitr markdown stringi]; }; dataMaid = derive2 { name="dataMaid"; version="1.4.0"; sha256="133ipl06sc8iicvkbgjxfs0qia76r2p1qhi693vacgfdbd7cmak5"; depends=[ggplot2 gridExtra haven htmltools magrittr pander rmarkdown robustbase stringi whoami]; }; dataMeta = derive2 { name="dataMeta"; version="0.1.1"; sha256="13xxayqxbps07h0xr5b7sb7q30gy5zm7jzzaq4k20fskkjrzhzcm"; depends=[dplyr]; }; - dataPreparation = derive2 { name="dataPreparation"; version="0.4.2"; sha256="12707zncdzsj05gw336g37qigbzq3iqmxx7agca32prx0mj39wdj"; depends=[data_table lubridate Matrix progress stringr]; }; + dataPreparation = derive2 { name="dataPreparation"; version="0.4.3"; sha256="1fchr68siq6vxz4qzlkrm2p6zld3s8mw7izmyzqffvrlqmrh0bdm"; depends=[data_table lubridate Matrix progress stringr]; }; dataQualityR = derive2 { name="dataQualityR"; version="1.0"; sha256="0f2410sd6kldv7zkqsmbz1js0p5iq7zwlnfwmmnlbrd303p35p3j"; depends=[]; }; - dataRetrieval = derive2 { name="dataRetrieval"; version="2.7.5"; sha256="0aagj04x5792rp73h5lwvrx63nh739jn3cmhhrzchm9symq8x8mx"; depends=[curl httr jsonlite lubridate readr xml2]; }; + dataRetrieval = derive2 { name="dataRetrieval"; version="2.7.6"; sha256="0375gqpj7xhbj7b2445984swcqhp6389w1jy3llvkdwzrf3pfvnc"; depends=[curl httr jsonlite lubridate readr xml2]; }; datacheck = derive2 { name="datacheck"; version="1.2.2"; sha256="1i3n5g1b6ix8gpn4c74s7ll1dbrllrzgpb1f3hk449d6p4kmisq6"; depends=[Hmisc shiny stringr]; }; 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]; }; dataesgobr = derive2 { name="dataesgobr"; version="1.0.0"; sha256="10znkaq45m4bgiyjx4x8s6ilvxlry6h0z54pkg8jgmblrpfazmqb"; depends=[dplyr DT httr jsonlite readODS readr readxl shiny shinycssloaders shinyFiles shinyjs shinythemes stringi stringr yaml]; }; dataframes2xls = derive2 { name="dataframes2xls"; version="0.4.7"; sha256="10krlv0l5w021z0qd7rj93pzfjjmcjlda4xz4vq470bxbjmn1bss"; depends=[]; }; datafsm = derive2 { name="datafsm"; version="0.2.3"; sha256="18q6s8sz8bm2xlfvhj0x5sagpn363s3k21s428wd0bqzqlppwbmb"; depends=[caret GA Rcpp]; }; + datagovsgR = derive2 { name="datagovsgR"; version="0.3.1"; sha256="03ynpga01yh8xm4p41kq32wvmbh9cf1jp1mbyzzl6ziwgz95n0q8"; depends=[data_table dplyr httr purrr stringr]; }; datamap = derive2 { name="datamap"; version="0.1-1"; sha256="0qm4zb9ldg4wz1a7paj5ilr1dhyagq81rk9l2v43hmkv52sssgkv"; depends=[DBI]; }; datamaps = derive2 { name="datamaps"; version="0.0.3"; sha256="00pvns98miq56z3prbb5qg608d5ns9wbp0711x3mmqg0bld1xwmp"; depends=[htmlwidgets magrittr]; }; datamart = derive2 { name="datamart"; version="0.5.2"; sha256="0c0l157fzkcp30ch4ymaalcx18zhz6sa5srr50w9izhbx3pmldxp"; depends=[base64 gsubfn markdown RCurl RJSONIO XML]; }; datanugget = derive2 { name="datanugget"; version="1.0.0"; sha256="1ki4kgz6y9a313f07jml39pdxhadgs287rkpnlwvcw6kgj5qxala"; depends=[doSNOW foreach]; }; dataonderivatives = derive2 { name="dataonderivatives"; version="0.3.1"; sha256="0q1zd1l7l0hmbs1bx469d706rmprjbz2f2dgcnfp9wxfgqpfxkz1"; depends=[assertthat httr lubridate readr tibble]; }; + dataone = derive2 { name="dataone"; version="2.1.4"; sha256="19v5c2xbdsz06dcx7xz4jld3dgp98k66cps2hnxpd33wbm8n7x6h"; depends=[base64enc datapack hash httr jsonlite parsedate plyr stringr uuid XML]; }; datapack = derive2 { name="datapack"; version="1.3.2"; sha256="0v9m7fbzi1w5p3arb0ywl4yglyw87civc59ndqsdm8rp84gbvnbl"; depends=[digest hash redland uuid XML]; }; - datapackage_r = derive2 { name="datapackage.r"; version="0.1.2"; sha256="0y4adfgdf2k04aaimxzj1fz50j6w6fqc8gvjls47nlqhi3dgmdav"; depends=[config future httr iterators jsonlite jsonvalidate purrr R_utils R6 readr rlist stringr tableschema_r urltools V8]; }; + datapackage_r = derive2 { name="datapackage.r"; version="1.3.0"; sha256="0njvv5g64yp29wz7vdcfqqf0xjzp9pcs79mmll07bm9jfr528rd5"; depends=[config future httr iterators jsonlite jsonvalidate purrr R_utils R6 readr rlist stringr tableschema_r urltools V8]; }; datapasta = derive2 { name="datapasta"; version="3.1.0"; sha256="0sqv29iv2rv50rbw1601rn8p7gv7rsw00djhl7h1znr0igzi5b82"; depends=[clipr readr rstudioapi]; }; + dataresqc = derive2 { name="dataresqc"; version="1.0.3"; sha256="1b04lzb479p95iv7gzb5ds6c48l8kcps857qjy3wqkhr67jhd0dc"; depends=[]; }; datarium = derive2 { name="datarium"; version="0.1.0"; sha256="1v98yxsxhfqlalz5qy3x5axb7fy067vf3y0qg7ngixphmy9qybym"; depends=[]; }; - datarobot = derive2 { name="datarobot"; version="2.16.0"; sha256="0hks5qww2m3l65qbmhybdc9zsbd8i8wj8vb5n9ss00bva1syi92v"; depends=[curl httr jsonlite yaml]; }; + datarobot = derive2 { name="datarobot"; version="2.17.0"; sha256="1k4idrbc9fgw8afc7cq9fqg189b86h1q0fkpq06k7dc4fl65wyna"; depends=[curl httr jsonlite yaml]; }; + datasailr = derive2 { name="datasailr"; version="0.8.2"; sha256="18zqvhgdhkgmwh01plz8n8vdga2yas76lqwsqhk7qxnjd2hnj0hx"; depends=[Rcpp]; }; datasauRus = derive2 { name="datasauRus"; version="0.1.4"; sha256="1w1yhwwrmh95bklacz44wjwynxd8cj3z8b9zvsnzmk18m5a4k0fl"; depends=[]; }; dataseries = derive2 { name="dataseries"; version="0.2.0"; sha256="11wc2p5m8qbdmkpbd21lpwl28a1dpab88c3gqyrhsn0298lpnip4"; depends=[]; }; datasets_load = derive2 { name="datasets.load"; version="1.2.0"; sha256="0x2m3k4grqizm97p41gjy3zkmhshicndp6cwyncl149yay6x8y5i"; depends=[DT miniUI shiny]; }; datastepr = derive2 { name="datastepr"; version="0.0.2"; sha256="039yggdj8jdici7hwmkjwgix45lvwjl7rw5h2rfzsm9xaq6vw1z2"; depends=[dplyr lazyeval magrittr R6 tibble]; }; datastructures = derive2 { name="datastructures"; version="0.2.8"; sha256="1lf48c77z4br1sv8kdbxadn30v5ygn9shjgsf8g37rci7nngpx1k"; depends=[BH purrr Rcpp]; }; datasus = derive2 { name="datasus"; version="0.4.1.1"; sha256="1vcyn0iia71c58959d3wcdqlh6336p3lsxbvwsj0fd9sll0a605s"; depends=[dplyr httr magrittr RCurl readr rvest stringi stringr xml2]; }; - datautils = derive2 { name="datautils"; version="0.1.5"; sha256="1yy25a84zmfh54jvxwa7mv4j296rmjgd40m4p81mrsswlqvncmfn"; depends=[deldir gplots gtools]; }; dataverse = derive2 { name="dataverse"; version="0.2.0"; sha256="0lyga8rdsir2yr1n9nr10iiaf6a7dxp1nb04bx8mq8ljrvpkgr8n"; depends=[httr jsonlite xml2]; }; - date = derive2 { name="date"; version="1.2-38"; sha256="1ziy17kz02j7lals14s43rs9lmxxfn2ppfi55q4b3m4gfj9pr4jc"; depends=[]; }; + date = derive2 { name="date"; version="1.2-39"; sha256="0mwp1619rxqyyyyxk224fh0x6g4rgyvr97q0kj076cxp71b97cdm"; depends=[]; }; + daterangepicker = derive2 { name="daterangepicker"; version="0.1.0"; sha256="1605ch84ad3nmmad0yy3id0izv0nz536lxwib6rkdkjik5761gqk"; depends=[htmltools jsonify shiny]; }; datetime = derive2 { name="datetime"; version="0.1.4"; sha256="0nn1yxknsn3crmwbkws5kvfjhd65dw0fkfbg67gba0dyaqp1jg37"; depends=[]; }; - datetimeutils = derive2 { name="datetimeutils"; version="0.3-0"; sha256="1f63vzinj39pf85bw9xa4szkwmy4d4rxxnqm1jd396ywppgxzn7c"; depends=[]; }; + datetimeutils = derive2 { name="datetimeutils"; version="0.4-0"; sha256="0m98v8jv8n0yyaqxwqwkagwnj4xqx8dygdsmv564jifc355ghc5b"; depends=[]; }; datoramar = derive2 { name="datoramar"; version="0.1.0"; sha256="0zq6vhq6dmsyagmqrmb85z6fy9qhwra3s3iasr3jgc4ryr009pml"; depends=[httr jsonlite tibble]; }; - datos = derive2 { name="datos"; version="0.2.0"; sha256="0ndwgqh8jvnl328k4zg2mn8j6nvz9526jk6h10y676v2pffcfgvw"; depends=[dplyr rlang yaml]; }; datr = derive2 { name="datr"; version="0.1.0"; sha256="0sqwhn6zdaq8i45ry207mpbda1djjaxp9mcn13hi5wkry6z0bmlr"; depends=[devtools]; }; datrProfile = derive2 { name="datrProfile"; version="0.1.0"; sha256="1bhyk3xjgwf92i765z3bkdnzkxg8fshriz9r6m371q1c75xysfil"; depends=[dplyr odbc RSQLite]; }; dave = derive2 { name="dave"; version="2.0"; sha256="1rraphpp34czyjj15xzvj1ihlnqzcppqls9n2g85n49zv0n1ngn8"; depends=[cluster labdsv nnet tree vegan]; }; @@ -6646,22 +6712,22 @@ in with self; { dbConnect = derive2 { name="dbConnect"; version="1.0"; sha256="1vab5l4cah5vgq6a1b9ywx7abwlsk0kjx8vb3ha03hylcx546w42"; depends=[gWidgets RMySQL]; }; dbEmpLikeGOF = derive2 { name="dbEmpLikeGOF"; version="1.2.4"; sha256="0vhpcxy702cp3lvlif2fzmvccys8iy7bv1fbg6ki2l8bvn2f7c5p"; depends=[]; }; dbEmpLikeNorm = derive2 { name="dbEmpLikeNorm"; version="1.0.0"; sha256="0h5r2mqgallxf9hin64771qqn9ilgk1kpsjsdj2dqfl3m8zg967l"; depends=[dbEmpLikeGOF]; }; - dbarts = derive2 { name="dbarts"; version="0.9-13"; sha256="1i9f1nc1ky6bav639x6kgszy91986q2m64147icdiv4diijzdcfx"; depends=[]; }; + dbarts = derive2 { name="dbarts"; version="0.9-17"; sha256="1zbjri8d22m56dkj3rdzfvwn4h046367vjzl6l173wkq1fhraxwh"; depends=[]; }; dbfaker = derive2 { name="dbfaker"; version="0.1.0"; sha256="00n2z4q5drpg26pw826i16rg07m7w66a0r466q2lrl14hxs4rcaq"; depends=[assertive DBI dplyr foreach parsedate RPostgreSQL tidyr]; }; dbflobr = derive2 { name="dbflobr"; version="0.0.1"; sha256="1j97gwmqr8mv05yfd1dxm0v3l0vxrjrqf0drvkms2nja5asbhinq"; depends=[checkr DBI flobr glue RSQLite]; }; dblcens = derive2 { name="dblcens"; version="1.1.7"; sha256="02639vyaqg7jpxih8cljc8snijb78bb084f4j3ns6byd09xbdwcw"; depends=[]; }; dblr = derive2 { name="dblr"; version="0.1.0"; sha256="0wzmhmp706mw0pkh81nsb7qzclwyhm6f2mjvpvz043ng5xrxwvvw"; depends=[CatEncoders data_table Metrics xgboost]; }; dbmss = derive2 { name="dbmss"; version="2.7-1"; sha256="0gasvpgmmpq8x776qmfrv4xiniz2fi1zxywzi7rm8xgmwr5q9kp3"; depends=[cubature ggplot2 Rcpp RcppParallel reshape2 spatstat spatstat_utils tibble]; }; - dbparser = derive2 { name="dbparser"; version="1.0.4"; sha256="0s69da7czznnmv2kgipss1cdklx5ijh0q5aa2lg2gx3an1rjbgp2"; depends=[DBI odbc purrr readr RMariaDB tibble tidyr XML]; }; - dbplot = derive2 { name="dbplot"; version="0.3.2"; sha256="0xw1zjvf1fa092kyryq2pk7dd4y60ka8yczaxk0f231mmsm1741p"; depends=[dplyr ggplot2 purrr rlang]; }; + dbnR = derive2 { name="dbnR"; version="0.3.4"; sha256="0m273disj1byg4g21zgwspryjsxsdqj9scih2m0hcghf76n22822"; depends=[bnlearn data_table magrittr Rcpp]; }; + dbparser = derive2 { name="dbparser"; version="1.1.0"; sha256="12fx17bj076nl493mian9rz3iv1fx86qr0q2k2z6hqsvg4866q1j"; depends=[DBI dplyr odbc purrr readr RMariaDB RSQLite tibble XML]; }; + dbplot = derive2 { name="dbplot"; version="0.3.3"; sha256="1svizj9hcd417yii8ll9s3mnvdqpa5awy9xl71kbwpfcnpdzqf1r"; depends=[dplyr ggplot2 magrittr purrr rlang]; }; dbplyr = derive2 { name="dbplyr"; version="1.4.2"; sha256="1q2dflr88s5a1amzfld3087q422vf70052qn84zyd8895kdg10xp"; depends=[assertthat DBI dplyr glue purrr R6 rlang tibble tidyselect]; }; dbscan = derive2 { name="dbscan"; version="1.1-5"; sha256="1vh29nmmana2755zcy15i1mhj3amwc2r84cq9d71wqr7ygzynphk"; depends=[Rcpp]; }; dbstats = derive2 { name="dbstats"; version="1.0.5"; sha256="0pr80mx8y87l96hhg0rp3ajxl7yx2f8qr0y1zrjkbzxavjmp9k34"; depends=[cluster pls]; }; dbx = derive2 { name="dbx"; version="0.2.5"; sha256="1g1pm0zw667m0wdzndak1qzym527lcl6gmdfzi5b3rlinkk2y0s2"; depends=[DBI]; }; dc3net = derive2 { name="dc3net"; version="1.2.0"; sha256="19ibsvbnq6y88vqvgkm31zrqwjhpml59d792bz0zkk50r1q5bnyr"; depends=[c3net igraph RedeR]; }; dcGOR = derive2 { name="dcGOR"; version="1.0.6"; sha256="0rvwa25r23yayx1i6xhkfaw2z85d2iyfx3slg3aq1m0fa7kj380p"; depends=[dnet igraph Matrix]; }; - dccvalidator = derive2 { name="dccvalidator"; version="0.1.0"; sha256="1b8w2bq5fmxriyvfj76cispfp5bz7gpqf774z4i6yd6hbswa5ilw"; depends=[config ggplot2 glue golem jsonlite jsonvalidate knitr markdown purrr readr readxl reticulate rlang shiny shinyBS shinydashboard shinyjs skimr stringr tibble visdat]; }; - dcemriS4 = derive2 { name="dcemriS4"; version="0.55"; sha256="15x4hjc5fwpn80h90q5x9a3p84pp3mxsmcx4hq5l0j52l9dy9nv3"; depends=[oro_nifti]; }; + dccvalidator = derive2 { name="dccvalidator"; version="0.2.0"; sha256="141vzkmzbm0wwc5pmkxw4hf5iqra6gnw97gdx6fq473fk22c6cd2"; depends=[config ggplot2 glue golem htmltools knitr markdown purrr reactable readr readxl reticulate rlang shiny shinyBS shinydashboard shinyjs skimr tibble visdat]; }; dclone = derive2 { name="dclone"; version="2.3-0"; sha256="0w1bhzsnmnhsrrw5ffm89pj2wy2fmx14y7g6b1mb2wlwbczjzzsh"; depends=[coda Matrix rjags rstan]; }; dclust = derive2 { name="dclust"; version="0.1.0"; sha256="1icfx52v3g7kkkc11pw0xlrc8dlx5q3n2zbrd3fccmw17jzxqbg7"; depends=[openssl phylogram]; }; dcminfo = derive2 { name="dcminfo"; version="0.1.7"; sha256="03r0ynzc5cck2rz20zbg5zx8v6s66ivizqav1pjkyvp6kxkmnf8q"; depends=[CDM]; }; @@ -6674,14 +6740,14 @@ in with self; { ddi = derive2 { name="ddi"; version="0.1.0"; sha256="0pnkylz7l6brx6i73wys637w811psxhnr39lcmkag41s6jcgabd5"; depends=[]; }; ddiv = derive2 { name="ddiv"; version="0.1.0"; sha256="1r2sxlkw1vxf2svdi1nary3hb7c5k1b4j820mj268r9swmy632ch"; depends=[MASS segmented]; }; ddpca = derive2 { name="ddpca"; version="1.1"; sha256="1qsanid7sr2nc9pwzyz4cbjc1vg0rj255d3rnh1rb22agrgj2bc1"; depends=[MASS Matrix quantreg RSpectra]; }; - ddpcr = derive2 { name="ddpcr"; version="1.12"; sha256="0kda154m588vdkjzm1vdr9irbb57l4w25pqjhqhawasvrna8nicf"; depends=[dplyr DT ggplot2 lazyeval magrittr mixtools plyr readr shiny shinyjs]; }; - ddsPLS = derive2 { name="ddsPLS"; version="1.1.1"; sha256="03vi7dwg24sa3bmwkhvvw8x0vll2i59zlqa5w17fs9c7cbc77w3y"; depends=[corrplot doParallel foreach MASS RColorBrewer Rcpp Rdpack]; }; + ddpcr = derive2 { name="ddpcr"; version="1.14"; sha256="16f80bg5zfjq2vzd7f9bk2s6alia3rcv21p04bjvj47aq5pk22ys"; depends=[dplyr DT ggplot2 lazyeval magrittr mixtools plyr readr shiny shinyjs tibble]; }; + ddsPLS = derive2 { name="ddsPLS"; version="1.1.4"; sha256="0h0iiycprham72k3yq81d15gnliln0i2r71lxhsqrcbrly9hpanr"; depends=[corrplot doParallel foreach MASS RColorBrewer Rcpp Rdpack]; }; ddst = derive2 { name="ddst"; version="1.4"; sha256="1y0immm337adkd2bjx8c5pf02w9wysv3gj26f4qf0jiba0f2wk8n"; depends=[evd orthopolynom]; }; deBInfer = derive2 { name="deBInfer"; version="0.4.2"; sha256="108vijk71sgsj14hwfv78r4lnn68cybvnpr92zvrvl0d82b7qxfd"; depends=[coda deSolve MASS mvtnorm PBSddesolve plyr RColorBrewer truncdist]; }; deGradInfer = derive2 { name="deGradInfer"; version="1.0.1"; sha256="0yczn63fhpirvz1g1kq9q0m04sisflxxgxy70c87jyvrw12nfwss"; depends=[deSolve gdata gptk]; }; - deSolve = derive2 { name="deSolve"; version="1.27.1"; sha256="05sax045qrk550gsn2i7krb9rbg51rx88x4v190acsigqknxffrv"; depends=[]; }; + deSolve = derive2 { name="deSolve"; version="1.28"; sha256="0jasvdzig0pzhzspmy20089az19r91xjfb9q6h8gj7c4mr6fymac"; depends=[]; }; deTS = derive2 { name="deTS"; version="1.0"; sha256="08yq7vfcd8fv8qw2w0f1rnj3rzys9kslmkqspmiz6prmzqvj1zf1"; depends=[pheatmap RColorBrewer]; }; - deaR = derive2 { name="deaR"; version="1.2.0"; sha256="1p3lsck0zwzfgjxyvzgvxig9g5p7i67pf71hrhzpmkxvafafx9jw"; depends=[dplyr ggplot2 gridExtra igraph lpSolve plotly tidyr writexl]; }; + deaR = derive2 { name="deaR"; version="1.2.1"; sha256="16rhpdw3fyc2fyrm0yfmq0im5r4svhs4v52gjh9y6lx4n8pmncph"; depends=[dplyr ggplot2 gridExtra igraph lpSolve plotly tidyr writexl]; }; deadband = derive2 { name="deadband"; version="0.1.0"; sha256="02pq3d0l0wy8bdlyfir3zf46j1ascx4qajyq5cf28yl62q6ngq5d"; depends=[TTR]; }; deal = derive2 { name="deal"; version="1.2-39"; sha256="0sw0v1mm004ky1gjw3dmvf2vb7nf2j9s9386bhqxijw63j7xnjd3"; depends=[]; }; deamer = derive2 { name="deamer"; version="1.0"; sha256="1xbxr78n6s1yhf192ab4syi1naqlwl9z4cxzchrkw80q7bxqfiz8"; depends=[]; }; @@ -6691,7 +6757,7 @@ in with self; { decido = derive2 { name="decido"; version="0.2.0"; sha256="17myg67qry1sbd1scv9bbvdh67fpcnqcb6r8n0kajdxb96vnlqk0"; depends=[Rcpp]; }; decision = derive2 { name="decision"; version="0.1.0"; sha256="13d0yyg5zp7n3r92l0l1dsffxfph6vacrlzga9rz41l5pja72z6g"; depends=[]; }; decisionSupport = derive2 { name="decisionSupport"; version="1.105.2"; sha256="095qwgsw6y1clv2hyjr56s2wg8q1nhd22ikh9b3l2mcsw2xdzvjy"; depends=[chillR fANCOVA ggplot2 msm mvtnorm nleqslv rriskDistributions]; }; - deckgl = derive2 { name="deckgl"; version="0.1.8"; sha256="0nm9jf166343sd01mchw2v6qpsfjgdhf6zd2p92rqyhp9k0hq5lv"; depends=[base64enc htmltools htmlwidgets jsonlite magrittr readr tibble yaml]; }; + deckgl = derive2 { name="deckgl"; version="0.2.5"; sha256="1rqw84pzbip9752q4zmhrhv8gis5dc8q6v1kkgnblhkg10wrb0lw"; depends=[base64enc htmltools htmlwidgets jsonlite magrittr readr tibble yaml]; }; decode = derive2 { name="decode"; version="1.2"; sha256="1qp0765gl3pgfdzjwj7icf3zminxxmrlw6gx3vj51y6c2y5ws4as"; depends=[]; }; decoder = derive2 { name="decoder"; version="1.1.13"; sha256="1kpcx754djfr8y0flpa1hrr92s0wbxw23rlvb6q3k9absvdvvmg6"; depends=[backports]; }; decomposedPSF = derive2 { name="decomposedPSF"; version="0.1.3"; sha256="0p9n0qi21facdp9c4fzs78ap4w1wvpvkv51kgx1gkr949kw8cv4n"; depends=[forecast PSF Rlibeemd tseries]; }; @@ -6702,8 +6768,10 @@ in with self; { deducorrect = derive2 { name="deducorrect"; version="1.3.7"; sha256="10lvhdnnc6xiy20hy6s5rpqcvilj8x0y6sn92rfjkdbfsl00sslp"; depends=[editrules]; }; deductive = derive2 { name="deductive"; version="0.1.3"; sha256="19h41a20c27gmky9xrgqkf0n2s8fzn2hiivs5dg71kl9gc4m1jhn"; depends=[lintools stringdist validate]; }; deep = derive2 { name="deep"; version="0.1.0"; sha256="1764cnsax8jwp2pb6rnmlb0f5m99jss84yi9rp017hdm20izvzrq"; depends=[]; }; - deepNN = derive2 { name="deepNN"; version="0.3"; sha256="1h2hk95ja8r4c9ha0phsndp4h5j3d4q4dw3mjmhycij7igy4m3kd"; depends=[Matrix]; }; + deepNN = derive2 { name="deepNN"; version="1.0"; sha256="0jpf25i0f3a0dfqykx8dl8qq7f37l1n28pzp715bxc0izsrrx9bk"; depends=[Matrix]; }; deepboost = derive2 { name="deepboost"; version="0.1.6"; sha256="1nf9gjk9gjl2dz7cr3vh5lg8nxkbqwr82a132nw853axbdgbs9ga"; depends=[Rcpp]; }; + deepdep = derive2 { name="deepdep"; version="0.2.0"; sha256="1yl1vnz9qysv38zn7dhz05s38l701zrbrx58bcpg862i8xf1nl40"; depends=[cranlogs ggforce ggplot2 ggraph graphlayouts httr igraph jsonlite scales]; }; + deepdive = derive2 { name="deepdive"; version="1.0.1"; sha256="1385pxkcdaf3rs2br1dghm7d7zd94mfgmqjns4z09mryv72n7cl0"; depends=[data_table fastDummies plyr rpart stringr treeClust]; }; deepgmm = derive2 { name="deepgmm"; version="0.1.59"; sha256="1kmvk0vmfzs49n67j2cd1d46fi9gvmxklcqghgmwfw25k4xmpgkb"; depends=[corpcor mvtnorm]; }; deeplr = derive2 { name="deeplr"; version="1.0.0"; sha256="0pg1vy4x53qns8qn5sv0nqplf23w8dwj0b0wbibpr52lgqjc34r7"; depends=[httr purrr rjson stringr tibble tokenizers utf8]; }; deepnet = derive2 { name="deepnet"; version="0.2"; sha256="09crwiq12wzwvdp3yxhc40vdh7hsnm4smqamnk4i6hli11ca90h4"; depends=[]; }; @@ -6713,7 +6781,8 @@ in with self; { deformula = derive2 { name="deformula"; version="0.1.1"; sha256="0h85yzl8kvjwrn1mkzyblvknf7gg8kx8y85qnvkwfbr9ik42ngn1"; depends=[]; }; degreenet = derive2 { name="degreenet"; version="1.3-3"; sha256="07mkj2sdp09624mmb1x3djjypnrzn43qn2j4m93blli51j6zchm3"; depends=[igraph network]; }; deisotoper = derive2 { name="deisotoper"; version="0.0.7"; sha256="0lpmx3qy44xjlil4nsbvcbczxq22vr8xn6v9a5bdx7cd31qwm2l3"; depends=[rJava]; }; - deldir = derive2 { name="deldir"; version="0.1-23"; sha256="0790dwxb2mz1ffz8gd5vwdr0if2q76dzy3vab5rsykf9kz72n4g0"; depends=[]; }; + delayed = derive2 { name="delayed"; version="0.3.0"; sha256="04f4k683jzb763sb9knb81lw8df56y1378g4i3c1x8m83bvj1mhs"; depends=[assertthat BBmisc data_table future igraph progress R6 rlang rstackdeque uuid visNetwork]; }; + deldir = derive2 { name="deldir"; version="0.1-25"; sha256="0kdglv8rc1pb4ilcid4xc9wpv5kkj2y6x6wg7919k3hya7mz58ph"; depends=[]; }; delt = derive2 { name="delt"; version="0.8.2"; sha256="06g03wy9r2qvly0lnv5fv4k366mhlk56qkvak0xaxy99p1i34kmv"; depends=[denpro]; }; deltaPlotR = derive2 { name="deltaPlotR"; version="1.6"; sha256="15vjg3viyfrxvvh34p8i7j8p0vpg5628g8198adhi0i2ri3ygz9a"; depends=[MASS]; }; deltar = derive2 { name="deltar"; version="1.0.0"; sha256="1ki89ysz4qlq5z094ybg3aqfcb6g633ccvpj1cg6nri9z5qjwpm1"; depends=[Bchron]; }; @@ -6724,13 +6793,13 @@ in with self; { demogR = derive2 { name="demogR"; version="0.6.0"; sha256="06x82ffbdv6ifl8xh52d3npdwha67v1ylfjp78j5pa4wdqkg221b"; depends=[]; }; demography = derive2 { name="demography"; version="1.22"; sha256="1m15capbfknr4rqxmfgj1vb7rmgambk6r9ic37149525sg7wn3j6"; depends=[cobs forecast ftsa mgcv rainbow RCurl strucchange]; }; demu = derive2 { name="demu"; version="0.3.0"; sha256="1mp5iz8mg0d6cyqi3f6fdhk6x5xxvng5bi13b7jnlp60wpjrq0il"; depends=[ClusterR fields Matrix Rcpp RcppArmadillo spam]; }; - dendextend = derive2 { name="dendextend"; version="1.13.2"; sha256="1iclvd9cyckd4djpa87ynm05fk6zl4b4m735za1w4irimc130m3r"; depends=[ggplot2 magrittr viridis]; }; + dendextend = derive2 { name="dendextend"; version="1.13.4"; sha256="1pjbz6sb4pgh3d5pm53vmf3q8y6lq3hrgjd6547xxs3m63sb8mn4"; depends=[ggplot2 magrittr viridis]; }; dendroTools = derive2 { name="dendroTools"; version="1.0.7"; sha256="052957wbrwgnm5lab3ynwlziih4d0hhm7agaa907zfbrz2xl6nr0"; depends=[boot brnn Cubist dplyr ggplot2 gridExtra knitr lubridate magrittr MLmetrics oce plotly psych randomForest reshape2 scales viridis]; }; 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=[]; }; denoiSeq = derive2 { name="denoiSeq"; version="0.1.1"; sha256="18w69gxbnazg5k8bzi76slcqxnbfmrndp548zazz8bpxz3jns699"; depends=[]; }; - denoiseR = derive2 { name="denoiseR"; version="1.0"; sha256="094nknr3hyx4kv18vnpdzrcpmfb4r7x9jgrp3p6x4nwrgzdh3r95"; depends=[FactoMineR irlba Matrix]; }; + denoiseR = derive2 { name="denoiseR"; version="1.0.2"; sha256="1q5kxiwfkrf2k0gpidzhl4hyzyjcm33rwlw4dan9nkx1181naw9l"; depends=[FactoMineR irlba Matrix]; }; denovolyzeR = derive2 { name="denovolyzeR"; version="0.2.0"; sha256="03ya5clzqp12lfhw073ri0pwgxn53a6pvnais317a8bv1yinxspb"; depends=[dplyr reshape2]; }; denpro = derive2 { name="denpro"; version="0.9.2"; sha256="19hrpfd44jaavq81dbyj3frris4aflfc8lig0471whv0pc6jci2k"; depends=[]; }; denseFLMM = derive2 { name="denseFLMM"; version="0.1.2"; sha256="1lfhd73zvvz6glq41lb2a9x63fjwjfp53zmy9g78fg6gz5lbnbpm"; depends=[MASS Matrix mgcv mvtnorm]; }; @@ -6752,13 +6821,12 @@ in with self; { descr = derive2 { name="descr"; version="1.1.4"; sha256="05maviw8l8qhmy7p80gs3dlyy6pqk5k1686ny4xla4psj8mr7lbk"; depends=[xtable]; }; describedata = derive2 { name="describedata"; version="0.1.0"; sha256="10ryy886jr2gwi6h90girl82ivwrmhz1vcwi4f6khmmpwsy95hav"; depends=[broom dplyr forcats ggplot2 haven lmtest purrr rlang stringr tibble tidyr]; }; describer = derive2 { name="describer"; version="0.2.0"; sha256="1pjyihmn4gkaamixsc3qwynsc02pwv9bgn6s7z7acmmsybhhs6xn"; depends=[]; }; - descriptr = derive2 { name="descriptr"; version="0.5.0"; sha256="0bbd3h07s4mfhryh6yyvgs4xs0nshxngyapz89jsc1drl3dn6plh"; depends=[cli dplyr forcats ggplot2 gridExtra magrittr purrr rlang scales tibble tidyr vistributions xplorerr]; }; + descriptr = derive2 { name="descriptr"; version="0.5.1"; sha256="0s4zjh5vw73sj5pxq6v4nnrprbdxz470hnw8m2hzx6n04abbkzd1"; depends=[cli dplyr 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.6"; sha256="1qmwfhsy8lvz7gi49gdka3jizdhrnrnk08ka36h46kf7b7lv0p1g"; depends=[dplyr DT htmltools pander purrr]; }; + desctable = derive2 { name="desctable"; version="0.1.7"; sha256="12axy5knsvzh2pxzax9k9zl69vasvabchcspy6ssirfbln660z1f"; 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=[]; }; - designGLMM = derive2 { name="designGLMM"; version="0.1.0"; sha256="0ya246mqclkhg8cq6f5mzqn67qks22f3fribyjcvhrx395n0f21v"; depends=[]; }; designmatch = derive2 { name="designmatch"; version="0.3.1"; sha256="0px6iyqik4sfs25yybamvf3ay0vd6r75acj8hin76jl6l7fwk30f"; depends=[lattice MASS Rglpk slam]; }; designr = derive2 { name="designr"; version="0.1.9"; sha256="1rdnz7xq2h7bxb8fvsimj4bjdqx9z0xnsg59ibb0gi69vvlswac8"; depends=[crossdes dplyr MASS tibble]; }; desirability = derive2 { name="desirability"; version="2.1"; sha256="094gxvp6a60lfcc0a0gk9rv1p6ajnzq9m58sy8cvhcj5337g4fmk"; depends=[]; }; @@ -6768,19 +6836,19 @@ in with self; { detect = derive2 { name="detect"; version="0.4-2"; sha256="03xzv13y2l15afyp00lgvbh51vxg1jaakxjcbnsxzdgb11039x2g"; depends=[Formula Matrix pbapply]; }; detectRUNS = derive2 { name="detectRUNS"; version="0.9.6"; sha256="0yl1x0jz66hingbl094picsiyrxzxvnz0grq63rva6nwn7pv1c0b"; depends=[data_table ggplot2 gridExtra iterators itertools plyr Rcpp reshape2]; }; detector = derive2 { name="detector"; version="0.1.0"; sha256="010i063b94hzx7qac8gpl67gmk7hzgqm9i1c7pbbw4la3wcd9lz7"; depends=[stringr]; }; + detectseparation = derive2 { name="detectseparation"; version="0.1"; sha256="0y0d1irw3pzvyvc7smii0ikx7dv376s2cdixjcs5c3jsw0iqxyim"; depends=[lpSolveAPI pkgload ROI ROI_plugin_lpsolve]; }; detpack = derive2 { name="detpack"; version="1.1.3"; sha256="1mk2k9akagz7knd4n5p8nxkmnm2mdv9izk4i5yl2v9nv5v39mc4h"; depends=[]; }; detrendeR = derive2 { name="detrendeR"; version="1.0.4"; sha256="1z10gf6mgqybb9ml6z3drq65n7g28h2pqpilc2h84l6y76sy909c"; depends=[dplR]; }; - detrendr = derive2 { name="detrendr"; version="0.6.4"; sha256="0n7mrh05y5jg2y77xv25yadw01lr8ms5ki32i32k38zlc635c1sl"; depends=[assertthat autothresholdr checkmate doParallel dplyr filesstrings foreach fs glue ijtiff iterators magrittr matrixStats plyr purrr Rcpp RcppParallel rlang sigmoid stringi stringr withr]; }; + detrendr = derive2 { name="detrendr"; version="0.6.5"; sha256="1xl6vr3hf47drfyg0mfxdkdpcxphc8skbkdijz4csjgki875i6a6"; depends=[autothresholdr checkmate doParallel dplyr filesstrings foreach ijtiff iterators magrittr matrixStats plyr purrr Rcpp RcppParallel rlang stringr withr]; }; detzrcr = derive2 { name="detzrcr"; version="0.3.0"; sha256="1f4c6l9nk7cis5gnf3f97nys4b9c13cxcn2h1m60mva1d5p9zzpb"; depends=[DT ggplot2 MASS shiny]; }; devEMF = derive2 { name="devEMF"; version="3.7"; sha256="0fv44y440xr52xymh1zyrryf7xrkm9lbs3qgybwfzz0ssx2iy6al"; depends=[]; }; devFunc = derive2 { name="devFunc"; version="0.1"; sha256="0f2s5gssk9napmah7zcss1rnh7pzlq90gzwcnvyr9rrq6k118n8q"; depends=[plyr stringr]; }; devRate = derive2 { name="devRate"; version="0.1.10"; sha256="0c5hg98w83d02lvb7rbgx8c24li58vpxjy71if337p7cyzzd1lqg"; depends=[]; }; devoid = derive2 { name="devoid"; version="0.1.0"; sha256="1aq7yyfpid3r41c6v5v92im2iq9m3d7gnisc9rkc9zpjfpbpzpx8"; depends=[]; }; - devtools = derive2 { name="devtools"; version="2.2.1"; sha256="0i2f549hxkn0j1x1avkhwy68c9r48v9284j7x9cak2q6dfsqz61f"; depends=[callr cli covr crayon desc digest DT ellipsis git2r glue httr jsonlite memoise pkgbuild pkgload rcmdcheck remotes rlang roxygen2 rstudioapi rversions sessioninfo testthat usethis withr]; }; - dexter = derive2 { name="dexter"; version="1.0.3"; sha256="1400m0wq1yqsiyihycfc41pa5zjzbjjh81aj4k20h627bkj75dn7"; depends=[DBI dplyr MASS Rcpp RcppArmadillo rlang RSQLite tidyr]; }; + devtools = derive2 { name="devtools"; version="2.2.2"; sha256="1bhb2j8ilpdzwd0c678mcgfpdw88vncsjma79afcikxmzcsz9279"; depends=[callr cli covr crayon desc digest DT ellipsis git2r glue httr jsonlite memoise pkgbuild pkgload rcmdcheck remotes rlang roxygen2 rstudioapi rversions sessioninfo testthat usethis withr]; }; + dexter = derive2 { name="dexter"; version="1.0.7"; sha256="0didyrdiyv3vcimkmr7g4nl9pl6678vj0a7750nbi5zyn6q6dll9"; depends=[DBI dplyr MASS Rcpp RcppArmadillo rlang RSQLite tidyr]; }; dexterMST = derive2 { name="dexterMST"; version="0.1.2"; sha256="1h56dr2z2pzi4zdy3dmyb2vg2jg1v5602c497khkvrbr7qfx8zra"; depends=[crayon DBI dbplyr dexter dplyr fastmatch igraph Rcpp rlang RSQLite tibble tidyr]; }; - dextergui = derive2 { name="dextergui"; version="0.2.1"; sha256="1c92j70zihzsqi83rs7hgnp70qgg6y0hdcs3gxin80grsihj1frw"; depends=[Cairo DBI dexter dplyr DT ggExtra ggplot2 ggridges htmltools htmlwidgets jsonlite networkD3 RCurl readODS readxl rlang shiny shinyBS shinyFiles shinyjs tibble tidyr writexl]; }; - df2json = derive2 { name="df2json"; version="0.0.2"; sha256="10m7xn7rm4aql1bzpckjcx5kvdw44m1pxgzqkgkd40lzqb1cwk18"; depends=[rjson]; }; + dextergui = derive2 { name="dextergui"; version="0.2.2"; sha256="1g6qxjmxkrna10lahsdfilpjw587kk6zh8vs1saw9l27i3izpbi9"; depends=[Cairo DBI dexter dplyr DT ggExtra ggplot2 ggridges htmltools htmlwidgets jsonlite networkD3 RCurl readODS readxl rlang shiny shinyBS shinyFiles shinyjs tibble tidyr writexl]; }; dfCompare = derive2 { name="dfCompare"; version="1.0.0"; sha256="1lhx69j0bkjbnp5jz23hrbxjcf04vf3big4k593ixz003xs2077f"; depends=[]; }; dfConn = derive2 { name="dfConn"; version="0.2.1"; sha256="03yl00mqj6r7p2xmrwam2chgqlq4qpfcm85n4b3b41vrm27xg11g"; depends=[data_table doParallel fields foreach ggplot2 gplots gtools nlme Rcpp RcppArmadillo stringr]; }; dfadjust = derive2 { name="dfadjust"; version="1.0.1"; sha256="0hzfkgf84j670vi4jfhlggbnzj96xa860212y3b0h5liwz1iazsy"; depends=[]; }; @@ -6788,14 +6856,15 @@ in with self; { 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]; }; - dfmta = derive2 { name="dfmta"; version="1.7-0"; sha256="0ci5faqkrpqkqkl0hrx9j78cid3cr1bs5mlkw4xargf3n4lfgk5j"; depends=[BH Rcpp RcppArmadillo RcppProgress]; }; + dfmta = derive2 { name="dfmta"; version="1.7-1"; sha256="13i4ck32z2p4plmy7lz2y4zakc1w915f5h6d9s6vj71212rrg9qm"; depends=[BH Rcpp RcppArmadillo RcppProgress]; }; + dfoliatR = derive2 { name="dfoliatR"; version="0.1.0"; sha256="1vgcz763fvapwh98453040yddyka83p9bhgqssx9c0n69z20ylix"; depends=[dplR dplyr forcats ggplot2 ggpubr MASS plyr reshape2 rlang]; }; dfoptim = derive2 { name="dfoptim"; version="2018.2-1"; sha256="1gya0sx8ajy04kscds06d6m9prxdwr1dmyfc6awsm6r1jwbibzb3"; depends=[]; }; dfped = derive2 { name="dfped"; version="1.1"; sha256="11ffsah14igba276m9d3cla0kgb3isizm5d7j1iqcd0wq23il7hq"; depends=[ggplot2 rstan]; }; dfphase1 = derive2 { name="dfphase1"; version="1.1.1"; sha256="0bk4bl5lqd7m4mzk6kg71fmh918wcy85zghr3lyayxlk30fl4ppc"; depends=[lattice Rcpp robustbase]; }; dfpk = derive2 { name="dfpk"; version="3.5.1"; sha256="010rlxj66ar3y61fnm7ys3p6aimlr8ylqq4q4flzr9m88klz8701"; depends=[BH dfcrm ggplot2 PK Rcpp RcppEigen rstan StanHeaders]; }; + dfvad = derive2 { name="dfvad"; version="0.3.0"; sha256="1n6hwpgnpd8vlv187ajl6js8z3yvl60h87q3kzgi9hvn9v73ip5z"; depends=[]; }; dga = derive2 { name="dga"; version="1.2"; sha256="13mfampnghcs5xplzq69bw948lqhw561pn54j3gb0ydsg5bm5vmr"; depends=[chron]; }; - dggridR = derive2 { name="dggridR"; version="2.0.3"; sha256="1gdwxrl5c5mprfk7rx5mk8davi4mmg1crccxaaipnbnsilg9j9vh"; depends=[dplyr ggplot2 Rcpp rgdal sp]; }; - dglars = derive2 { name="dglars"; version="2.1.5"; sha256="0d66vcn16l9w638vwplj9cmhdq6q1rlg9rhaycxpa6788x44di85"; depends=[Matrix]; }; + dglars = derive2 { name="dglars"; version="2.1.6"; sha256="13bnvinqgpmkisjri0sjsyzsh9nqplpry3n3galkv8dqhgpncq4w"; 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]; }; @@ -6807,37 +6876,36 @@ in with self; { dhh = derive2 { name="dhh"; version="0.0.1"; sha256="00kg2x1was85aq2vr15bak8y5p4mymbs8pbriijlbw64401djmb0"; depends=[]; }; di = derive2 { name="di"; version="1.1.4"; sha256="1w2gjhyi410z98d8wnhbd69jxm69nz4pmnr4fb09i70a90f53s25"; depends=[scales]; }; diagis = derive2 { name="diagis"; version="0.1.3-1"; sha256="1cagcr5znhrg4fp96d79ly0z7bs3hhh3zfspclyfc88p2p3qsd96"; depends=[coda ggplot2 gridExtra Rcpp RcppArmadillo]; }; - diagmeta = derive2 { name="diagmeta"; version="0.3-1"; sha256="1hbh0j9bybz1dv5krygzaharpg4prfj29h8jn4x88jiiip64f4rc"; depends=[lme4 meta]; }; + diagmeta = derive2 { name="diagmeta"; version="0.4-0"; sha256="1z7h1sxcqn53121m33d2w196lyzkrgj1afc8i8h9iab99fgqvpk7"; depends=[lme4 meta]; }; diagonals = derive2 { name="diagonals"; version="1.0.1"; sha256="0m9hlxww6n405fn26gbw36kjlb7b9759hj56lz820wkj972zw301"; depends=[]; }; diagram = derive2 { name="diagram"; version="1.6.4"; sha256="0f6ffprn5k0ir1s7m9s7izc64aa17r3gnygagz5bihrlsvawaavw"; depends=[shape]; }; - dialr = derive2 { name="dialr"; version="0.3.0"; sha256="1wdl3m6mlpxhy75kyzxypf053n2zaf8skk0xq1m4gklq4disbg32"; depends=[dialrjars rJava]; }; - dialrjars = derive2 { name="dialrjars"; version="8.10.14"; sha256="0xzgrqgydgrljp3ylqk24hwgj9mcpxsfd4xp3wx8k1d4jmz80gw8"; depends=[rJava]; }; - dials = derive2 { name="dials"; version="0.0.4"; sha256="04vz6spp8lw011a9fn8z0bkba9nghgj2hvsxy3n6dqqs3ajd4nfa"; depends=[DiceDesign dplyr glue purrr rlang scales tibble withr]; }; + dialr = derive2 { name="dialr"; version="0.3.1"; sha256="0lh3glgh95r1rnbnbx2qii429kp3dk4yhwf6zm3n0zxiibmsrhgf"; depends=[dialrjars rJava]; }; + dialrjars = derive2 { name="dialrjars"; version="8.12.0"; sha256="0c68n2i29v69xlyzsivzajhrh55b1ih55sr6j907klxgds1hb767"; depends=[rJava]; }; + dials = derive2 { name="dials"; version="0.0.6"; sha256="0hvhn8adkb8pywfh058vj681bccm4iyky11ijc01xk2w3iaslyr9"; depends=[DiceDesign dplyr glue lifecycle purrr rlang scales tibble withr]; }; diaplt = derive2 { name="diaplt"; version="1.3.0"; sha256="1kkqhkv3s8rrpqd05jidjdnqmlnb3s9f8rr34rfqj7k4nh0qzzcz"; depends=[]; }; dice = derive2 { name="dice"; version="1.2"; sha256="0gic7lqnsdmwv3dbzwwmcwdfyfqlq8kpr2pciqphd1j2ligzwl3s"; depends=[gtools]; }; diceR = derive2 { name="diceR"; version="0.6.0"; sha256="1jwgngvajnm80g079z4jks5f3y2hy7hz3h9cf7c6wlb8spmaffxr"; depends=[abind apcluster assertthat blockcluster caret class cli clue cluster clusterCrit clValid dbscan dplyr e1071 flux ggplot2 gplots Hmisc infotheo kernlab klaR kohonen magrittr mclust NMF poLCA progress purrr quantable RankAggreg RColorBrewer Rcpp Rtsne sigclust stringr tibble tidyr]; }; dichromat = derive2 { name="dichromat"; version="2.0-0"; sha256="1l8db1nk29ccqg3mkbafvfiw0775iq4gapysf88xq2zp6spiw59i"; depends=[]; }; dicionariosIBGE = derive2 { name="dicionariosIBGE"; version="1.6"; sha256="1rss1ydhcn6sma2lmlpq6s0h3dglwc20w499x1jzkcjnzc1rc7gl"; depends=[]; }; - did = derive2 { name="did"; version="1.2.2"; sha256="0slc0rdajwri1zrlxaw251b2xlkc002f67bq5v68iirys3hlm37n"; depends=[BMisc ggplot2 gridExtra knitr MASS pbapply]; }; + did = derive2 { name="did"; version="1.2.3"; sha256="05xc41491mq0v9gm841m8l3cdjhjip3z1aqjqaqpaz05rwp3bngx"; depends=[BMisc ggplot2 gridExtra knitr MASS pbapply]; }; didrooRFM = derive2 { name="didrooRFM"; version="1.0.0"; sha256="12clfnbm56jwldw0afb0nb0argnd97mx7369jiywhxy0p4xqibqq"; depends=[dplyr]; }; dief = derive2 { name="dief"; version="1.2"; sha256="1i4icdfqvw7imaj1fh392zmzfyz8aqlv9s5naqxm1pm0lqfxl6ca"; depends=[flux fmsb ggplot2 plyr]; }; dielectric = derive2 { name="dielectric"; version="0.2.3"; sha256="1p1c0w7a67zxp1cb99yinylk5r1v89mmpfybcy94ydydhydbhivk"; depends=[]; }; - diem = derive2 { name="diem"; version="1.0"; sha256="09qf47y3mbhkdy7nmy9mcvx371hyss81igc5frbhbp85z2pf5zzb"; depends=[dbscan ggplot2 igraph Matrix Rcpp RcppEigen scales]; }; dietr = derive2 { name="dietr"; version="1.0"; sha256="0wz7nvhn1c3l36kpmdv4j3ia3wp77qzjlx8rmqv7al0wpmjnxcb6"; depends=[rfishbase]; }; diezeit = derive2 { name="diezeit"; version="0.1-0"; sha256="0rq1k08byvqn99wpql7drnrcxlzcqrcxixh7bczbc8dv1hhsgk9i"; depends=[brew httr jsonlite]; }; - difNLR = derive2 { name="difNLR"; version="1.3.0"; sha256="1p3iiaw1wy9ni74y96yp4003406wy1jz773nq919hmrqj0agxkg7"; depends=[CTT ggplot2 msm nnet plyr reshape2 VGAM]; }; + difNLR = derive2 { name="difNLR"; version="1.3.2"; sha256="13kzd2c96nymi27d0yladpl2fyd2sl0rlbbfk55cv5w5zlachggl"; depends=[CTT ggplot2 msm nnet plyr reshape2 VGAM]; }; difR = derive2 { name="difR"; version="5.0"; sha256="0k0vw5l3pig514ngpvf0rwhwxc316ws352fgw49c3c95ydsz6wd8"; depends=[deltaPlotR lme4 ltm mirt]; }; difconet = derive2 { name="difconet"; version="1.0-4"; sha256="0cjadi4mnpfmy18vyp0dw55mnhs0zddf51w59gvq6gszk145z3bq"; depends=[data_table gplots mvtnorm stringr]; }; diffEnrich = derive2 { name="diffEnrich"; version="0.1.1"; sha256="19bq2frd2h8gh6mdy3pcwd54zzv170c0m1m3wnp5c4gadb9424qf"; depends=[dplyr ggnewscale ggplot2 here reshape2 rlang stringr]; }; diffIRT = derive2 { name="diffIRT"; version="1.5"; sha256="0kip6wz9l9q80qsqwf32pwz7d9vqin6dgfwf0nxlrlzf8xjsxgim"; depends=[statmod]; }; diffMeshGP = derive2 { name="diffMeshGP"; version="0.1.0"; sha256="1dc37hxh3fi27gw11kij57j78p87bza77s82niagdv6dqhldj5a4"; depends=[]; }; diffdepprop = derive2 { name="diffdepprop"; version="0.1-9"; sha256="0mgrm1isr26v2mcm6fkzc7443ji00vpnqmw4zngx81n7442b3cl2"; depends=[gee PropCIs rootSolve]; }; - diffdf = derive2 { name="diffdf"; version="1.0.3"; sha256="0nz0jwa02yc16cx51z5hp5zaw40gbcyqli3jpxgrnzw76f8jhkah"; depends=[tibble]; }; + diffdf = derive2 { name="diffdf"; version="1.0.4"; sha256="03cr0gvspchdj49kiggsm6i9h5d9z07aswggj4n46lnyz52ihivj"; depends=[tibble]; }; diffeR = derive2 { name="diffeR"; version="0.0-6"; sha256="0ivdcfirs3jbd6m3rryq590szkhplm2kr9chjgcgd88ar5nrqfg7"; depends=[ggplot2 raster reshape2 rgdal]; }; diffee = derive2 { name="diffee"; version="1.1.0"; sha256="01lb1prz70mxgymhhsvx48kbfy69xyyaabsmfhf28af9wfb89662"; depends=[igraph pcaPP]; }; diffeqr = derive2 { name="diffeqr"; version="0.1.3"; sha256="1696bxh916688zlfxbm6jaqk245xw51ar7rqz7m2nla0ibka86sj"; depends=[JuliaCall stringr]; }; - diffman = derive2 { name="diffman"; version="0.1.0"; sha256="03m8qbzxyinknx0d87kq8hnag8xdv09vwaafahk80x1lvg389559"; depends=[data_table dplyr igraph Matrix progress Rcpp sf tidyverse]; }; - diffobj = derive2 { name="diffobj"; version="0.2.3"; sha256="17wq3haj2i8x5cy1xx2c8hj2p65hasrjyiqxcq61kzvxd0zyjxzw"; depends=[crayon]; }; + diffman = derive2 { name="diffman"; version="0.1.1"; sha256="08b4kqxfg8pmyl2xg8flb581s9wnkdcy5rrmrxp8a89y265qmirx"; depends=[data_table dplyr igraph Matrix progress Rcpp sf tidyverse]; }; + diffobj = derive2 { name="diffobj"; version="0.2.4"; sha256="1nygk8qly4jypwsvxwrvgq2v9mj1d619g6qrzxk3v1bi89vqws18"; 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]; }; @@ -6845,24 +6913,25 @@ in with self; { diffusion = derive2 { name="diffusion"; version="0.2.7"; sha256="1j9s9vw5sc4k956bk4yp3bf4fnp7lhhkwcvlzvsh1w4dyaj8l35h"; depends=[dfoptim nloptr systemfit]; }; diffusionMap = derive2 { name="diffusionMap"; version="1.2.0"; sha256="1rvk7069brlm1s9kqj4c31mwwr3mw4hmhay95cjjjfmw5xclff2j"; depends=[igraph Matrix scatterplot3d]; }; diffusr = derive2 { name="diffusr"; version="0.1.4"; sha256="1f3h387kblw1xzdnxphwgfl1n7f6i07kk7kfslvbfxkalbish6ii"; depends=[igraph Rcpp RcppEigen]; }; - digest = derive2 { name="digest"; version="0.6.23"; sha256="18h5s8vkdcz2vhpsx6g3ig00zalrihr03skn95zw3lr2y56pafmp"; depends=[]; }; + digest = derive2 { name="digest"; version="0.6.25"; sha256="1r9dkq0kxkps54gkmgcdngsd068p054va2vhnqhs5jmwp2vsvk0m"; depends=[]; }; digitalPCR = derive2 { name="digitalPCR"; version="1.1.0"; sha256="0hwqq84yr1hnvf4bygc5425887dhqjjjyy1ils71iavcal04s8pb"; depends=[]; }; digitize = derive2 { name="digitize"; version="0.0.4"; sha256="1qw4x4z9vrs79sd9b2daw668nc6nvjl4qhayfqmd87yxa2ydv6x0"; depends=[readbitmap]; }; dils = derive2 { name="dils"; version="0.8.1"; sha256="1q6ba9j14hzf7xy895mzxc6n9yjgind55jf350iqscwzxf7ynp33"; depends=[igraph Rcpp]; }; dimRed = derive2 { name="dimRed"; version="0.2.3"; sha256="110d6y83ib1nfpxzmvkvb3fn3brskwkdbsk4dqrdrswrd4znxrg6"; depends=[DRR magrittr]; }; + dimensionsR = derive2 { name="dimensionsR"; version="0.0.1"; sha256="1g0jwf3lvv3zaarrcvqh3a8fgzm4p8d7g73hqg29lgmb6q8shb8d"; depends=[httr jsonlite]; }; dina = derive2 { name="dina"; version="2.0.0"; sha256="1sq7998xc5qhvd8clc8r32ch7axinh2a2dc7i1w2p148wv130yhd"; depends=[Rcpp RcppArmadillo rgen simcdm]; }; dinamic = derive2 { name="dinamic"; version="1.0"; sha256="0mx72q83bbwm10ayr3f1dzwr5wgz7gclw7rh39yyh95slg237nzr"; depends=[]; }; dineq = derive2 { name="dineq"; version="0.1.0"; sha256="1xrhrdc970f7hm9xng9z7xmshnmmz89cn3gmnyabzprx44ccr9sl"; depends=[boot Hmisc]; }; - dint = derive2 { name="dint"; version="2.1.2"; sha256="01z3fw3rhhnwgibgrcgv0n2664s78xndk1k2jghz7ig07sgrmr8p"; depends=[]; }; - dipsaus = derive2 { name="dipsaus"; version="0.0.4"; sha256="1qh4aqhg9y1z4wf81fjc42418wz6rz0mn537ys6av8ln2qy4b2v9"; depends=[base64enc base64url cli crayon data_table digest fastmap future future_apply jsonlite R6 Rcpp RcppParallel rlang shiny stringr synchronicity txtq]; }; + dint = derive2 { name="dint"; version="2.1.3"; sha256="0nxppn7gx4sjwn7jns5bwbqfid3jkbsx2lxi0rjdkbsawy77fc85"; depends=[]; }; + dipsaus = derive2 { name="dipsaus"; version="0.0.6"; sha256="1vbyzlz6ci43ckz5hl8j67fm6g34jqn2rwaq799jz0c1zz0fjlww"; depends=[base64enc base64url cli crayon digest fastmap future future_apply jsonlite progressr R6 Rcpp RcppParallel rlang shiny startup stringr synchronicity txtq]; }; diptest = derive2 { name="diptest"; version="0.75-7"; sha256="0rcgycgp0bf8vhga1wwgfcz3pqs5l26hgzsgf2f97dwfna40i1p1"; depends=[]; }; directPA = derive2 { name="directPA"; version="1.4"; sha256="0rbdygdslr2gvg4mvnp09lc9rv0sg9jwdf5a5ks50v67n25x6y5d"; depends=[calibrate rgl]; }; - directlabels = derive2 { name="directlabels"; version="2018.05.22"; sha256="0xcpc56ssb9430b0xcdhayk3qaak2qcakyss2pz14y5w2027hblv"; depends=[quadprog]; }; + directlabels = derive2 { name="directlabels"; version="2020.1.31"; sha256="08s1gnwp4bn8xahwjaq0f1qzhwh2dvybzhq3z7xyzn8cnyzmis6c"; depends=[quadprog]; }; directotree = derive2 { name="directotree"; version="1.0.0"; sha256="1yv703mb3fnvjxr2rrxvb8x869hbbjx4l94qbbsmy0ssknayq60y"; depends=[collapsibleTree data_tree]; }; - dirichletprocess = derive2 { name="dirichletprocess"; version="0.3.1"; sha256="09ibrlsbn80ghrblk6qblrs0s8fzfnjash1v7x6a2hpg92h9g86y"; depends=[ggplot2 gtools mvtnorm]; }; + dirichletprocess = derive2 { name="dirichletprocess"; version="0.3.1.1"; sha256="1sxypnhi7pnz08ys2z0riyk7x80qg7sbilkgsz3jnpqjsal6d0ha"; depends=[ggplot2 gtools mvtnorm]; }; dirmcmc = derive2 { name="dirmcmc"; version="1.3.3"; sha256="117p3jvinmha7a2phcpzq38ig05kcranp15xbxqvv0cgh3c95fjr"; depends=[mcmcse]; }; dirmult = derive2 { name="dirmult"; version="0.1.3-4"; sha256="1r9bhw1z0c1cgfv7jc0pvdx3fpnwplkxwz8j8jjvw14zyx803rnz"; depends=[]; }; - disaggregation = derive2 { name="disaggregation"; version="0.1.2"; sha256="1ga87gawbivgf3zb34m0qc72v16ds5vq49gx8y5xmrgnk0975x12"; depends=[cowplot doParallel dplyr foreach ggplot2 maptools Matrix raster RcppEigen rgdal rgeos sp sparseMVN splancs TMB]; }; + disaggregation = derive2 { name="disaggregation"; version="0.1.3"; sha256="04wmwwhmcgi1cdr8iyhilsphpzb7r5xs04vhqx5z01y7cgardivx"; depends=[cowplot doParallel dplyr foreach ggplot2 maptools Matrix raster RcppEigen rgdal rgeos sp sparseMVN splancs TMB]; }; discSurv = derive2 { name="discSurv"; version="1.4.1"; sha256="0xi016ah8xc8bv92qvyslvx30anncrki49ccg3qw79yh5vzns1wk"; depends=[data_table functional mgcv mvtnorm]; }; discfrail = derive2 { name="discfrail"; version="0.1"; sha256="1ll8c0fwwmz2yw8w582422r8bk9lr1570d7m7w2n1flrnqpqmk8j"; depends=[Matrix numDeriv survival]; }; discgolf = derive2 { name="discgolf"; version="0.2.0"; sha256="07clh1awnibgrh7vl4a51r8dbya2rbmicm8v8x8mq8h8am2b3j0s"; depends=[crul jsonlite xml2]; }; @@ -6871,17 +6940,18 @@ in with self; { 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]; }; + discourseGT = derive2 { name="discourseGT"; version="1.0.0"; sha256="1faq344prjmya13jxpxfdq1vh1gqkssjmsq62i8lhmk8kwkp6nax"; depends=[GGally ggplot2 ggpubr igraph network]; }; discoveR = derive2 { name="discoveR"; version="1.2.4"; sha256="0f1f4wmh4ys3awlf5kxm6l0xj2qw86y14sj03bd1gs252r43zrbg"; depends=[colourpicker DT factoextra ggplot2 rmarkdown rstudioapi shiny shinyAce shinydashboard shinydashboardPlus shinyjs stringi zip]; }; discreteMTP = derive2 { name="discreteMTP"; version="0.1-2"; sha256="13qsf1kc3rph0kkdkz31qj072www5dwjyk73lfpy141rzhcn1v1x"; depends=[]; }; discreteRV = derive2 { name="discreteRV"; version="1.2.2"; sha256="1lhf67cccr96zl3j1sysh2bv0pbgvkbgjdzm35fvrdm7k74ypjsi"; depends=[MASS plyr]; }; - discretecdAlgorithm = derive2 { name="discretecdAlgorithm"; version="0.0.6"; sha256="10rw3x58xlhyvrnsryypy8r8hqp3nswsii37z9hzm2wa00ffl3sf"; depends=[igraph Rcpp RcppEigen sparsebnUtils]; }; + discretecdAlgorithm = derive2 { name="discretecdAlgorithm"; version="0.0.7"; sha256="01x3qfjj7dwv0m9q8zdhfrpbj9ys9y5p7d3z8ywjrqy4jw88svjs"; depends=[igraph Rcpp RcppEigen sparsebnUtils]; }; discretization = derive2 { name="discretization"; version="1.0-1"; sha256="00vq2qsssnvgpx7ihbi9wcafpb29rgv01r06fwqf9nmv5hpwqbmp"; depends=[]; }; discrim = derive2 { name="discrim"; version="0.0.1"; sha256="1g698bimrvzbzzv6mfafwmdyyziscr055zhssnz69j250mh81kyw"; depends=[dials parsnip purrr rlang tibble withr]; }; diseasemapping = derive2 { name="diseasemapping"; version="1.4.6"; sha256="16y2w8qjq442qdbqlrg3s2mn53rlcipl22m3q168gda5klm4f7sl"; depends=[sp]; }; - disk_frame = derive2 { name="disk.frame"; version="0.3.3"; sha256="0wxc73sh8k5inwxlgrv3cjmkc6bqvdh9i1dqdpnfmxs2kirr17i8"; depends=[bigreadr bit64 crayon data_table dplyr fs fst furrr future future_apply globals glue jsonlite pryr purrr Rcpp rlang stringr]; }; + disk_frame = derive2 { name="disk.frame"; version="0.3.4"; sha256="03mm73fps4hsryk3mlw088jx2z1a75xifwbixbv4fy38xihs973j"; depends=[benchmarkme bigreadr bit64 crayon data_table dplyr fs fst furrr future future_apply globals glue jsonlite pryr purrr Rcpp rlang stringr]; }; diskImageR = derive2 { name="diskImageR"; version="1.0.0"; sha256="1r19k5fdjn6vkn11p5df77fnxfqaz3nciiaai0f3pr2bgpfppzka"; depends=[subplex zoo]; }; dismo = derive2 { name="dismo"; version="1.1-4"; sha256="1j4pzbyvn8msi3k2y79nc6pqlrald46168ibznjwrr6rdiqhy4gj"; depends=[raster sp]; }; - dispRity = derive2 { name="dispRity"; version="1.3.3"; sha256="0lq6zf335312phriyh1mz4w6rwljjdipdj0qfb3298f6nkwp2miy"; depends=[ade4 ape Claddis geiger geometry geoscale mnormt paleotree phangorn phyclust vegan]; }; + dispRity = derive2 { name="dispRity"; version="1.3.5"; sha256="1nn2bqjs0krib5z7m1mlpv5rwwv7m85vbdfz2rszx4rbfvg1nbkr"; depends=[ade4 ape Claddis geiger geometry geoscale mnormt 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=[]; }; @@ -6902,11 +6972,11 @@ in with self; { 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.8.0"; sha256="1dyff4m33xmw6hxb3jxzr8vvajg3qz3rfcrfxjxwsswlddfz0zdv"; depends=[MASS sfsmisc startupmsg]; }; - distr6 = derive2 { name="distr6"; version="1.3.2"; sha256="04v98si3slhzl5z424ylpp6d9m3220w9sppjfnr1py9b1kap43gx"; depends=[checkmate data_table pracma R6 R62S3]; }; + distr6 = derive2 { name="distr6"; version="1.3.5"; sha256="0qx5r8rwxpw6sqnyygr3z76srdfnkz1b72ymirpwbp865kmphx3j"; depends=[checkmate data_table R6 R62S3 set6]; }; distrDoc = derive2 { name="distrDoc"; version="2.8.0"; sha256="1iq2gbfbsf3h279yh3fnqsi39gdw15vc6r1g33xcb8kgmmqmvf0p"; depends=[distr distrEx distrMod distrSim distrTeach distrTEst MASS RandVar startupmsg]; }; distrEllipse = derive2 { name="distrEllipse"; version="2.8.0"; sha256="1ymfa8xpgs8zjp4psiwmll5z0vji496fivxmcavspzxy31cw70wx"; depends=[distr distrEx distrSim mvtnorm setRNG startupmsg]; }; distrEx = derive2 { name="distrEx"; version="2.8.0"; sha256="1gwhsnlrnzyp2x97d9wfdy5pa9z3q5il934wjv4kxs9wsvkwsr5h"; depends=[distr startupmsg]; }; - distrMod = derive2 { name="distrMod"; version="2.8.3"; sha256="0zg7wc9khfi66yl80k472hwvyc3wf2kbqwd1zsp6sb44jh9hlzsw"; depends=[distr distrEx MASS RandVar sfsmisc startupmsg]; }; + distrMod = derive2 { name="distrMod"; version="2.8.4"; sha256="1mddy0pqza99x9jccxqz8gf6c4zj6cxqrk38dhd3p5lc52r76hwa"; 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]; }; @@ -6920,9 +6990,10 @@ in with self; { divagis = derive2 { name="divagis"; version="1.0.0"; sha256="1kcz7i3h9xxpqhlq0rl08pgcwd16ygjjmm0jjv9knn2ggc3j1jzz"; depends=[rgdal sp]; }; 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]; }; + diverge = derive2 { name="diverge"; version="1.0.3"; sha256="0vpmlfarl9h4wymz0q4kclbycia4j6a5bclpjdbz1hac4ciw7nih"; depends=[truncnorm]; }; diverse = derive2 { name="diverse"; version="0.1.5"; sha256="10kmx3qv58xhqs1icsxqq0y0cm8y2hx9ysb65brd3hhg33alzvk3"; depends=[foreign proxy reshape2]; }; diversitree = derive2 { name="diversitree"; version="0.9-13"; sha256="00vi4klywi35hd170ksjv3xja3hqqbkcidcnrrlpgv4179k0azix"; depends=[ape deSolve Rcpp subplex]; }; - diversityForest = derive2 { name="diversityForest"; version="0.1.0"; sha256="1vxn0qzv509sqcg5ra94yw9anagrpvj90j9rkfh8v9bmmcj6pcjy"; depends=[Matrix Rcpp RcppEigen]; }; + diversityForest = derive2 { name="diversityForest"; version="0.2.0"; sha256="16qwmz6fmh7jxypp5myj55fx6fwzzm2mq59v30spp2c2zd89aya7"; depends=[Matrix Rcpp RcppEigen]; }; divest = derive2 { name="divest"; version="0.8.2"; sha256="0kzl3niscd88kzlpnx75xx6mk1jkwxwn7gm2a6vnhpvniyyk6rs8"; depends=[Rcpp RNifti]; }; divo = derive2 { name="divo"; version="1.0.1"; sha256="06c4kjl6llvvdr2gk480jcmj2abmqwph7x4vk5nflxm7piimvg7v"; depends=[cluster]; }; dixon = derive2 { name="dixon"; version="0.0-6"; sha256="1prvr16a9n7qyaznir2bl7mg6nlvbdv9pk75p3xipzjg36hwyam8"; depends=[spatstat splancs]; }; @@ -6938,27 +7009,28 @@ in with self; { dlookr = derive2 { name="dlookr"; version="0.3.13"; sha256="1i1aiy4v3bvlrz0w0hc5qlv5flqgzbgavqmaql6bc8nz5s9p071s"; depends=[classInt corrplot DMwR dplyr ggplot2 gridExtra kableExtra knitr magrittr mice moments prettydoc purrr RcmdrMisc RColorBrewer rlang rmarkdown rpart smbinning tibble tidyr tidyselect tinytex xtable]; }; dlsem = derive2 { name="dlsem"; version="2.4.5"; sha256="0ywcssjzkdqxlmjbsqdcgl9kivih5zw865556lnxx3zqnfygxzlv"; depends=[graph Rgraphviz]; }; dlstats = derive2 { name="dlstats"; version="0.1.3"; sha256="0inij1rzw8i683lyzvnjhfzrng7zx727y9wcijv6ny2fw64cdd6n"; depends=[ggplot2 jsonlite magrittr RColorBrewer scales]; }; + dm = derive2 { name="dm"; version="0.1.1"; sha256="15268znsb90ndpq7x55lb7brg67ydshki8mc6b53c5y6b8icl5mr"; depends=[backports cli DBI dplyr DT glue igraph lifecycle magrittr pillar purrr rlang tibble tidyr tidyselect vctrs]; }; dma = derive2 { name="dma"; version="1.4-0"; sha256="003snr09hazszwqnvjrbv8vyz6ihgcfcfhrlshg451dddn920615"; depends=[MASS]; }; dmacs = derive2 { name="dmacs"; version="0.1.0"; sha256="1prw6h8sj6fcpajg6xwqhi8v5jfl74mbjdjrdy524miw56fh9h0r"; depends=[lavaan MplusAutomation]; }; dmai = derive2 { name="dmai"; version="0.4.0"; sha256="0ma89jl0l598sffpikvjj40f2djjcnjq29k6y1bav4dm2g51qgmq"; depends=[dplyr ggplot2 magrittr stringr tibble tidyr]; }; - dmdScheme = derive2 { name="dmdScheme"; version="1.0.0"; sha256="1l3s7nf0xik8q0j7krrmh1n0g06671l4p2grmswgd4s2wgjq48k2"; depends=[digest dplyr knitr magrittr openxlsx rappdirs readxl rlang rmarkdown tibble writexl xml2 yaml]; }; + dmdScheme = derive2 { name="dmdScheme"; version="1.1.0"; sha256="1s1s16jjfmlwg29wsszmnr3a70sx5gij8gi4ign2rmgwiiyfi7ra"; depends=[digest knitr magrittr openxlsx rappdirs readxl rlang rmarkdown writexl xml2 yaml]; }; dml = derive2 { name="dml"; version="1.1.0"; sha256="0z1dalgxh5nhrac49vh60d5awzjylc8b8mn5fk379c324milm59l"; depends=[lfda MASS]; }; dmm = derive2 { name="dmm"; version="2.1-5"; sha256="1i94bsgc12ysivpy9mdmzcdfki1f84x036danki7ynrbym2b3c7a"; depends=[MASS Matrix nadiv pls robustbase]; }; dmt = derive2 { name="dmt"; version="0.8.20"; sha256="0rwc8l9k2y46hslsb3y8a1g2yjxalcvp1l3v7jix0c5kz2q7917w"; depends=[MASS Matrix mvtnorm]; }; dmutate = derive2 { name="dmutate"; version="0.1.2"; sha256="06gr49j5jz6ns1zydwsqysgkigi2sbm4hdd2jbb82f05rd9spyf3"; depends=[dplyr MASS]; }; - dnet = derive2 { name="dnet"; version="1.1.6"; sha256="11zvqrlwhil19fpss14fd8iq1mbz0xn0r2cibyd40hdhaixz7nkl"; depends=[graph igraph Matrix Rgraphviz supraHex]; }; + dnet = derive2 { name="dnet"; version="1.1.7"; sha256="05mqgp8x2h6vjf8j9466kpng7bbga134c2y808qgdmjdnv9fcaxc"; depends=[graph igraph Matrix Rgraphviz supraHex]; }; dng = derive2 { name="dng"; version="0.2.1"; sha256="0yi1fs4yvlsy3j128l7s5kwq8mhdd5fr74y2bzj7cjrxi7wgz2hg"; depends=[Rcpp]; }; dnr = derive2 { name="dnr"; version="0.3.4"; sha256="0hzaa308pppq2cqpb067f3y3nyv1p2xdmgy3dykf90psnn5v011p"; depends=[arm ergm glmnet igraph network sna]; }; - do = derive2 { name="do"; version="1.1.0.0"; sha256="1v80vq8rc8ywajgi08xxkpcbhi800qjix5fyqi12ynq83wqmn93x"; depends=[data_table plyr]; }; - doBy = derive2 { name="doBy"; version="4.6-3"; sha256="1d0d6pwai1g4i5jls0jm9va29ci5hy92n5957608f3fzi1jwy635"; depends=[broom Deriv dplyr magrittr MASS Matrix pbkrtest plyr tibble]; }; + do = derive2 { name="do"; version="1.2.0.0"; sha256="093rgvwhfsgv3qmc78p69il9zk12xzzbq14dfy4x79318jaz42wh"; depends=[data_table plyr tmcn]; }; + doBy = derive2 { name="doBy"; version="4.6.5"; sha256="1ckazh701b4ilg8bj17ji903538jmb49d997gm49ah5j5jc1x0g7"; depends=[broom Deriv dplyr magrittr MASS Matrix pbkrtest plyr tibble]; }; doFuture = derive2 { name="doFuture"; version="0.9.0"; sha256="1sfymhgjph1xrw49dxyc2slxxgal7v4yanklr4zql7r4vqinhk19"; depends=[foreach future globals iterators]; }; doMC = derive2 { name="doMC"; version="1.3.6"; sha256="1cn9gxavhvjswip8pwvkpi7q6wpzdllcsdjabga8akf55nggqxr9"; depends=[foreach iterators]; }; doMPI = derive2 { name="doMPI"; version="0.2.2"; sha256="0ahwm17p3gq1yvc8v6sr6sb8z7i6zws8d1pf46qynl0gd4amg938"; depends=[foreach iterators Rmpi]; }; doParallel = derive2 { name="doParallel"; version="1.0.15"; sha256="0vnqbha3gig3awbfvsfx3ni5jir398md1n7xmsb8jihnjsk7xbbi"; depends=[foreach iterators]; }; - doRNG = derive2 { name="doRNG"; version="1.7.1"; sha256="1sb75aqkliprglfxc4x4wds6alqgzhvl2n812g1d32a88ra3slr7"; depends=[foreach iterators pkgmaker rngtools]; }; - doRedis = derive2 { name="doRedis"; version="1.1.1"; sha256="10ldfzq6m83b9w24az9bf5wbfm6y9gi233s8qgsk4dnr84n3nizx"; depends=[foreach iterators rredis]; }; + doRNG = derive2 { name="doRNG"; version="1.8.2"; sha256="1jff27zzrvd1fd61x2m9468h8xn3s1c9f6wibviy5zdhj5dx9s9k"; depends=[foreach iterators rngtools]; }; + doRedis = derive2 { name="doRedis"; version="2.0.0"; sha256="0lw8j339az2dgcrahmkhp7k5dpvy1dalk1sfsjp2hzfhm3xqabc8"; depends=[foreach iterators redux]; }; doSNOW = derive2 { name="doSNOW"; version="1.0.18"; sha256="0rj72z5505cprh6wykhhiz08l9bmd966srqh2qypwivf321bvrvh"; depends=[foreach iterators snow]; }; - dobin = derive2 { name="dobin"; version="1.0.1"; sha256="11k97bmgigkiqkz9r5ilap5l2xdpwprl9v7f73rckxcw6pwsnlk3"; depends=[FNN pracma]; }; + dobin = derive2 { name="dobin"; version="1.0.2"; sha256="1vhvwdl7a8bf4q64jz8a6afm3smdn3jgxvs17jjlilarpdazl3p5"; depends=[pracma RANN]; }; dobson = derive2 { name="dobson"; version="0.4"; sha256="0xfn7s3wzrv1md40bdjrnjfiqyxg5c6lrcpnvayjdgrhxq161hhq"; depends=[]; }; dockerfiler = derive2 { name="dockerfiler"; version="0.1.3"; sha256="128648s9lj96p3nlxwy4gs108w5kjcg6w48nfx3r52gb8w2z7948"; depends=[attempt glue R6]; }; docknitr = derive2 { name="docknitr"; version="1.0.1"; sha256="1mhdjv6yznzyx911f0m3m0i7jlzj7h12ikkxb9b6zj68bdplv30b"; depends=[knitr rstudioapi sys]; }; @@ -6975,7 +7047,7 @@ in with self; { doex = derive2 { name="doex"; version="1.2"; sha256="1r999z30ipa04pgck0hfalqxihb1bj8sdhlkkhf4plb7maaz3qm3"; depends=[]; }; dominanceanalysis = derive2 { name="dominanceanalysis"; version="1.3.0"; sha256="0850z2ppdgbfwbv8l40ngl00n4mdj4ciky1g918zazd3jrg88s38"; depends=[]; }; domino = derive2 { name="domino"; version="0.3.1"; sha256="0f67w0z5jy82kgm3l1rji430ayigw30vmmwp3i1nz0xibsx7jxv4"; depends=[]; }; - donut = derive2 { name="donut"; version="1.0.0"; sha256="1m10kcdcr9ma4zmc1gj3lyza8zxvnn57wvxznaappaba4a5b47v2"; depends=[]; }; + donut = derive2 { name="donut"; version="1.0.1"; sha256="17qiy9j0qm2q2gcysd5717bdl9nmkd7pd5z22pcj3icvxcpssval"; depends=[]; }; doremi = derive2 { name="doremi"; version="0.1.1"; sha256="1h36sj60l5sd5ybbdyrv0wkr9p18j7iwg111khq0znb71xi5nzp7"; depends=[data_table ggplot2 lme4 lmerTest zoo]; }; dosearch = derive2 { name="dosearch"; version="1.0.4"; sha256="1hq85jym0plf8hj77bfd623nhyjgfqqzm1w92n3lii3j5lv9vrwg"; depends=[Rcpp]; }; dosresmeta = derive2 { name="dosresmeta"; version="2.0.1"; sha256="0qdalzdk7q4wx3vl5f3i64m8cb7vhi4pqzghar32j0a7l6gla04z"; depends=[mvmeta]; }; @@ -6987,6 +7059,7 @@ in with self; { doubcens = derive2 { name="doubcens"; version="1.1"; sha256="1hn65n67by3xqbcnaf5jja5pli0g6wpbbz2sfzd7i2nms7kiywhp"; depends=[]; }; double_truncation = derive2 { name="double.truncation"; version="1.4"; sha256="190fwl119ycmiszkq0mqc6dh8adwqx7b0ipmhz71qvqdzgh9gjm9"; depends=[]; }; downloader = derive2 { name="downloader"; version="0.4"; sha256="1axggnsc27zzgr7snf41j3zd1vp3nfpmq4zj4d01axc709dyg40q"; depends=[digest]; }; + downloadthis = derive2 { name="downloadthis"; version="0.1.2"; sha256="1d22xyy11gwvhqd8fks4gfq3j1sirbll2irj7jai01s7c4q2qswc"; depends=[base64enc bsplus fs htmltools magrittr mime purrr readr rmarkdown writexl]; }; downscale = derive2 { name="downscale"; version="3.0-1"; sha256="0kmv4d5fa6mmhmbfqfxzk1gv55j15d7madsdqi8470bwh0kkya4y"; depends=[cubature minpack_lm raster Rmpfr sp]; }; downscaledl = derive2 { name="downscaledl"; version="1.0"; sha256="0lqxngzpxj65b48j5w0n8dg6fp4lgg5zpgxc2wj6d9wh5f97l71b"; depends=[dplyr keras magrittr raster Rcpp RcppArmadillo rgdal rstack sp tensorflow]; }; downsize = derive2 { name="downsize"; version="0.2.2"; sha256="18b9shd79z0bsdnp0apqqwv6c73j4wnfiv41ywqz761nmxbldxbn"; depends=[magrittr R_utils]; }; @@ -6994,10 +7067,9 @@ in with self; { dparser = derive2 { name="dparser"; version="0.1.8"; sha256="1yx425s3iq03j043g41pyfp3cgmajb4qh50zirhd0qpplzwy8xj5"; depends=[digest]; }; dpcR = derive2 { name="dpcR"; version="0.5"; sha256="17l9g11qqs2fkskg331889m8nkkrwzrq0n684rdn62pnd5j2n5pi"; depends=[binom chipPCR dgof e1071 evd multcomp pracma qpcR rateratio_test readxl shiny signal spatstat]; }; dpcid = derive2 { name="dpcid"; version="1.0"; sha256="1gx8gyrxvm07mjiasl0b80y0x3crq6gy170v6s817d11jw44n86z"; depends=[]; }; - dpglasso = derive2 { name="dpglasso"; version="1.0"; sha256="1mx28xbm2z2bxyp33wv2v6vgn1yfsdsa0bzjjdxasgd6lvr51myf"; depends=[]; }; - dplR = derive2 { name="dplR"; version="1.7.0"; sha256="1ylzki6wvsbcxlz4k532a8yh0kwc6817vkbks7l060acssbycipr"; depends=[digest lattice Matrix matrixStats plyr png R_utils signal stringi stringr XML]; }; + dplR = derive2 { name="dplR"; version="1.7.1"; sha256="1df4g9zz47h0flx5ww6bvlm364q81l2c5flzpa985sv87rq6cz4j"; depends=[digest lattice Matrix matrixStats plyr png R_utils signal stringi stringr XML]; }; dplRCon = derive2 { name="dplRCon"; version="1.0"; sha256="10xnawgnhxp5y949fxs1vvadc1qz2ldy0s9w9w7kf6iqh59d35sw"; depends=[]; }; - dplyr = derive2 { name="dplyr"; version="0.8.3"; sha256="032c89wa04g9rih9shyvwl3il0bsrv3xk489x6867sk9bb3amd38"; depends=[assertthat BH glue magrittr pkgconfig plogr R6 Rcpp rlang tibble tidyselect]; }; + dplyr = derive2 { name="dplyr"; version="0.8.5"; sha256="0602b4a9nffxx67q57csqp87nkrv33nn9wlaw1458yys9fzx6l2p"; depends=[assertthat BH ellipsis glue magrittr pkgconfig plogr R6 Rcpp rlang tibble tidyselect]; }; dplyr_teradata = derive2 { name="dplyr.teradata"; version="0.3.2"; sha256="1pq630hlvpfrhaxqn6yh0kgapgibrnbic78g130d40visak60j1p"; 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]; }; dpmr = derive2 { name="dpmr"; version="0.1.9"; sha256="1cnjywkvjb4fhbf4shjmsrq47f1fg2x21hcm1q5512bm0wg9i6jd"; depends=[digest httr jsonlite magrittr rio]; }; @@ -7011,7 +7083,7 @@ in with self; { dragon = derive2 { name="dragon"; version="0.2.1"; sha256="1y2dav9151zdcqw1maxhh3s4c1syk5rs8yb8grx8xkffvg5123w7"; depends=[broom colorspace colourpicker cowplot DT igraph magrittr RColorBrewer shiny shinyBS shinydashboard shinythemes shinyWidgets tidyverse visNetwork]; }; 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="7.9.0"; sha256="1p3d14yi65p7x2hpvfhvwpbaasawvj3i0h9ws1ic4c096gclw1b3"; depends=[base64url digest igraph rlang storr txtq vctrs]; }; + drake = derive2 { name="drake"; version="7.12.0"; sha256="1whiw94qmmwf0q3kl2r6qh759zmrfzm39ba3yciillykc8xqmnkh"; depends=[base64url digest igraph rlang storr txtq vctrs]; }; 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]; }; @@ -7022,7 +7094,6 @@ in with self; { drmdel = derive2 { name="drmdel"; version="1.3.1"; sha256="1bpm9jj9dxk2daxp1yb7pn9jd750p27qa84vdfxpacm5r0mggnys"; depends=[]; }; dropR = derive2 { name="dropR"; version="0.1"; sha256="0sw5lqlfdn64dbykxdhk1pz18f83if871vkapa2nxgcfiy79b0vs"; depends=[plyr shiny]; }; droptest = derive2 { name="droptest"; version="0.1.3"; sha256="1wlfhj6c4pb5mcybyd2bcn55y3azk7dv7d7il97qwbhl8kf59csl"; depends=[data_table]; }; - drsmooth = derive2 { name="drsmooth"; version="1.9.0"; sha256="1wgi961bvbsnq4bygxbpy4sy5fy34lrrkaaj0r2rxcahwa1sc38n"; depends=[boot car DTK lubridate mgcv multcomp pgirmess segmented]; }; drtmle = derive2 { name="drtmle"; version="1.0.5"; sha256="1gnzprdjs4aws5q92a0dmlfzpwi3in3rsylbwr0r6cnghymgs69s"; depends=[doFuture future future_apply future_batchtools np SuperLearner]; }; drugCombo = derive2 { name="drugCombo"; version="1.1.1"; sha256="0f4akxmj5jd89jm7kzkmqksxmb6fqj7jawvm3hpw6limyry3mp4z"; depends=[BIGL Deriv ggplot2 minpack_lm nlme rgl]; }; drumr = derive2 { name="drumr"; version="0.1.0"; sha256="09xi3sf424bpq10fq25j209dylfbi1lfd911r44ffadkxzvp5p1s"; depends=[audio stringr]; }; @@ -7030,37 +7101,39 @@ in with self; { ds4psy = derive2 { name="ds4psy"; version="0.1.0"; sha256="15knnl0ld8vnb3mv06p7425h7w5y5m598k4dny8svqwranhs856a"; depends=[cowplot ggplot2 here readr stringr tibble tidyr tidyverse unikn]; }; 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]; }; - dscore = derive2 { name="dscore"; version="1.0.0"; sha256="1569bv769izsbqslbij69nq5lagd2676zavs9fkwbsqw7j9nb5x0"; depends=[dplyr Rcpp RcppArmadillo stringr tidyr]; }; - dse = derive2 { name="dse"; version="2015.12-1"; sha256="1976h57zallhzq43nshg77bsykcvkfwnasha1w59c44fjpl1gs9w"; depends=[setRNG tfplot tframe]; }; + dscore = derive2 { name="dscore"; version="1.2.0"; sha256="01lv9yq5d817rx686l1cw1s2265a7wx9g41xhsdx59wkz37wrzwv"; depends=[dplyr Rcpp RcppArmadillo stringr tidyr]; }; + dse = derive2 { name="dse"; version="2020.2-1"; sha256="170rxrniszs8h59ah4mn4mz8d7kzix4g3vlz4icd8w6bl40c6ykc"; depends=[setRNG tfplot tframe]; }; dslabs = derive2 { name="dslabs"; version="0.7.3"; sha256="0fhd6zwa4lmgrrybywvj1vxd98a483yca605dj2pwipqifh1x6ka"; depends=[ggplot2]; }; dslice = derive2 { name="dslice"; version="1.2.0"; sha256="1k9hxpmr563p8bpd9m991lx5ig366mzk9j1lzldci9pq4jiayin1"; depends=[ggplot2 Rcpp scales]; }; - dsm = derive2 { name="dsm"; version="2.2.17"; sha256="0n2nn05zb8zd2wah1cfzv8a9qwbh6an3jwsfy0x6lbkk63bs5mxw"; depends=[ggplot2 mgcv mrds nlme numDeriv plyr statmod]; }; - dsmodels = derive2 { name="dsmodels"; version="1.1.0"; sha256="0gidxi4ph49mjm2hdf9flphfb9916al4cpdkiig504n7ms2sbpbg"; depends=[latex2exp pryr shape]; }; dsr = derive2 { name="dsr"; version="0.2.2"; sha256="0bs5aspi2khs9n60q7d2ah6zv4rzhbyk2bafd17c12jzjqlh1228"; depends=[dplyr frailtypack rlang]; }; dsrTest = derive2 { name="dsrTest"; version="0.2.1"; sha256="1kljlfi7jf6fa8b5f3wxjsa9rlmzcp4qix3m2qyapz2lqd85mbb7"; depends=[asht exactci loglognorm]; }; - dssd = derive2 { name="dssd"; version="0.2.0"; sha256="0g99aaywqlvs9ycb3mkbkziclvrsdknpv3jg340z03panph4yr1q"; depends=[lwgeom plot3D rgdal sf]; }; - dst = derive2 { name="dst"; version="1.4.0"; sha256="0zr04m33ky98y5n6jbczcfn898i7y8zc1hygfm8p9rrnw93d2lin"; depends=[]; }; + dssd = derive2 { name="dssd"; version="0.2.1"; sha256="0lfr3bb3nba6pkg13d3kiblbp4naqxcdkvdqsa0y1zlhak74cgcj"; depends=[plot3D rgdal sf]; }; + dst = derive2 { name="dst"; version="1.4.1"; sha256="1cz1fcyxpyv0ywmwlqdhgj3nzidnzcaxc1nkh8y5mph9wm612c25"; depends=[]; }; + dstack = derive2 { name="dstack"; version="0.1.0"; sha256="05a44d9wzl7jxd1q1jcrnih6w99rblchwh072fw3bhxsh7x35hga"; depends=[base64enc httr nanotime rjson rlist uuid yaml]; }; dstat = derive2 { name="dstat"; version="1.0.4"; sha256="023jp0xdbg200ww1gnr3fzgjqd82acag0jps7q6j6m27q11psvgz"; depends=[]; }; dtangle = derive2 { name="dtangle"; version="2.0.9"; sha256="0yg1fbrqixqp93vdw3grvz1la5l2kidgs730qp6yihkp3260cxf3"; depends=[DEoptimR]; }; + dti = derive2 { name="dti"; version="1.5.1"; sha256="08da7v7sl88g2jixfplvw9rc5rvlifq3fvyrgh9naa5jsmd8h5ia"; depends=[adimpro aws awsMethods gsl oro_dicom oro_nifti quadprog rgl]; }; dtp = derive2 { name="dtp"; version="0.1.0"; sha256="0qy8nrbq22bfbajkxq6blkq7583pc5mb392gmqb3c9daxmqn42vb"; depends=[Formula gtools plyr]; }; dtpcrm = derive2 { name="dtpcrm"; version="0.1.1"; sha256="0k25fm0z3snpx1v2kwd50svgnkjhn5c0hy1gnlw2lif6rjz1fzd9"; depends=[dfcrm diagram]; }; dtplyr = derive2 { name="dtplyr"; version="1.0.1"; sha256="0jgisglpaj1n6jhwqwsa1583i4ifazqdd9hh581w5akx5p0f05mp"; depends=[crayon data_table dplyr rlang tibble tidyselect]; }; dtree = derive2 { name="dtree"; version="0.4.2"; sha256="1cpv0pyf515610djxzfw1c83p3alk5a93clg4x9gk7a7qy4cyhr1"; depends=[caret evtree party partykit rpart]; }; dtt = derive2 { name="dtt"; version="0.1-2"; sha256="0n8gj5iylfagdbaqirpykb01a9difsy4zl6qq55f0ghvazxqdvmn"; depends=[]; }; - dttr2 = derive2 { name="dttr2"; version="0.0.1"; sha256="042zll9hw4ljwr85x4dmkv8nz6r0mpawaa5s58ngxypshss8sbg0"; depends=[checkr hms]; }; + dttr2 = derive2 { name="dttr2"; version="0.1.0"; sha256="0fy4prwbg1jr27d6xfs46gyrqn21w513vq48cgw7pyls7zrqigys"; depends=[chk hms lifecycle]; }; dtw = derive2 { name="dtw"; version="1.21-3"; sha256="02hyhx1sy5h3vzh9zixy18a7d47df4k5d0wyflcvlcbsbcl6p90s"; depends=[proxy]; }; - dtwSat = derive2 { name="dtwSat"; version="0.2.5"; sha256="0qvjzqmi6plkq5l4r52c7wil58n41l5f5dxzpk9r4yis8bdm5zlq"; depends=[caret dtw ggplot2 lubridate mgcv plyr proxy raster RColorBrewer Rdpack reshape2 rgdal scales snow sp xtable zoo]; }; + dtwSat = derive2 { name="dtwSat"; version="0.2.6"; sha256="1mx3xxhf2ywi6cia47sn77wzxd8rg9wir7r8dx92k5dvawr425ki"; depends=[caret data_table dtw ggplot2 lubridate mgcv plyr proxy raster RColorBrewer Rdpack reshape2 rgdal scales snow sp xtable zoo]; }; dtwclust = derive2 { name="dtwclust"; version="5.5.6"; sha256="05dszmj89id2hk9apxa7721737s6292w2l7vazj7aqwk1jyghjpm"; depends=[bigmemory clue cluster dplyr dtw flexclust foreach ggplot2 ggrepel Matrix nloptr proxy Rcpp RcppArmadillo RcppParallel RcppThread reshape2 RSpectra shiny shinyjs]; }; dual = derive2 { name="dual"; version="0.0.3"; sha256="1alxh9mj610m7wgr6a97mpzy5ia9vzckhz6wmxyix7xh9mzbn1gw"; depends=[]; }; + dualtrees = derive2 { name="dualtrees"; version="0.1.4"; sha256="05mxwiwnv48jf6ya5qmfc7g2w8wkzhk56k9g0gr2m4cpfab7d5h2"; depends=[]; }; duawranglr = derive2 { name="duawranglr"; version="0.6.5"; sha256="04w8ll6p8m0ljcp96sfp028afgxddk4wyncfdwiywi0ps34zh084"; depends=[digest dplyr haven readr readxl]; }; dub = derive2 { name="dub"; version="0.2.0"; sha256="066lzyk44380mf17vx4db4a3a4rs7zl85mj5hjg172khjbqnbixw"; depends=[]; }; duckduckr = derive2 { name="duckduckr"; version="1.0.0"; sha256="1wki8xvqp5hr27iafd9jbryl9faywfkdkpn0pa0afywbic39k2cm"; depends=[crul jsonlite]; }; dummies = derive2 { name="dummies"; version="1.5.6"; sha256="01f84crqx17xd6xy55qxlvsj3knm8lhw7jl26p2rh2w3y0nvqlbm"; depends=[]; }; dummy = derive2 { name="dummy"; version="0.1.3"; sha256="081a5h33gw6ym4isy91h6mcf247c2vsdygv9ll07a3mgjcjnk79p"; depends=[]; }; + dundermifflin = derive2 { name="dundermifflin"; version="0.1.1"; sha256="0rp8p4ln92kfxkczl7vi9r2jhxb1ky203s02940cjjkczsphpcc1"; depends=[crayon stringi]; }; dunn_test = derive2 { name="dunn.test"; version="1.3.5"; sha256="0lqwvyl3pyygfc73nf81gzw3zl3w43r7ki0yw2dgrzhkpb2iji4a"; depends=[]; }; dupiR = derive2 { name="dupiR"; version="1.2"; sha256="0p649yw7iz6hnp7rqa2gk3dqkjbqx1f6fzpf1xh9088nbf3bhhz3"; depends=[plotrix]; }; dupree = derive2 { name="dupree"; version="0.2.0"; sha256="12dlqmvk2zlxh283xjf2d6x12cy6r3rsy88y5g40h9002m7i2jqy"; depends=[dplyr lintr magrittr purrr rlang stringdist tibble]; }; - durmod = derive2 { name="durmod"; version="1.1-2"; sha256="1mp97x8px4s53m91m5vnkixgz087wgd4bas64xdbki6y53zimzjj"; depends=[data_table mvtnorm nloptr numDeriv Rcpp]; }; + durmod = derive2 { name="durmod"; version="1.1-4"; sha256="0d721sbxjfh00gpxd4hj8iq04awfd0pcd6bw8cv7kny21l2f3w44"; depends=[data_table mvtnorm nloptr numDeriv Rcpp]; }; dvmisc = derive2 { name="dvmisc"; version="1.1.4"; sha256="01v6sixx0f3nrn6ymfifb3pvd2msfrwm21kmdv38laxq29vc4rsi"; depends=[cubature data_table dplyr ggplot2 MASS mvtnorm pracma rbenchmark Rcpp survey tab]; }; dwdradar = derive2 { name="dwdradar"; version="0.2.0"; sha256="06wa3m77931lv47530hyczwdjrrfdmgczmbhwy0z9fzhn8kz0ipp"; depends=[]; }; dwlm = derive2 { name="dwlm"; version="0.1.0"; sha256="0n5dil9qvyy4gish3wnv8bzq0ci1p0dr2vmbbadl29jl7rd1v0rc"; depends=[]; }; @@ -7073,14 +7146,14 @@ in with self; { dynOmics = derive2 { name="dynOmics"; version="1.2"; sha256="0fsck5wx4rcfckjr6xg0s3a6cvh4881cqzy0af91icqg0p3zjj2l"; depends=[ggplot2 gplots]; }; dynRB = derive2 { name="dynRB"; version="0.15"; sha256="0fa6g4aj2cncg6mi0yc2yn6321qi7fz9d9cvqrnxhcnbbghdyzq9"; depends=[corrplot dplyr foreign ggplot2 RColorBrewer reshape2 vegan]; }; dynaTree = derive2 { name="dynaTree"; version="1.2-10"; sha256="1ng672mlv98xnsbd4xq70hxc8j158la4n63y46rw74granaz29ya"; depends=[]; }; - dynamac = derive2 { name="dynamac"; version="0.1.10"; sha256="10qz2wx39rb7d1z0drzxm4m30bg9hvi3bjr9m10z3hdkzsg1ybvw"; depends=[lmtest MASS]; }; + dynamac = derive2 { name="dynamac"; version="0.1.11"; sha256="0dzw4h128z53vwdpkikhxqil0xjrcjrp1zmz0fy2qhq0n74sdyar"; depends=[lmtest MASS]; }; dynamicGraph = derive2 { name="dynamicGraph"; version="0.2.2.6"; sha256="1xnsp8mr3is4yyn0pyrvqhl893gdx2y1zv8d2d55aah2xbfk0fjj"; depends=[ggm]; }; dynamicTreeCut = derive2 { name="dynamicTreeCut"; version="1.63-1"; sha256="1fadbql7g5r2vvlkr89nlrjxwp4yx4xrdqmv077qvmnx9vv0f4w3"; depends=[]; }; dynamichazard = derive2 { name="dynamichazard"; version="0.6.6"; sha256="1ad4ymi28yx6vh3x8p4pm4ph81fb9fkhk4zfhbl60522d4kjbsjq"; depends=[boot Rcpp RcppArmadillo survival]; }; dynamo = derive2 { name="dynamo"; version="1.0"; sha256="0arsv686ix7xpca57ayqgifim1q35dl4w2mx7fw8bc0lidapilyp"; depends=[abind glamlasso MortalitySmooth Rcpp RcppArmadillo]; }; dynatopmodel = derive2 { name="dynatopmodel"; version="1.2.1"; sha256="0lpfhj69bvagqzzg2kjqvn9xx8f93ii34flrrns20z3bxla6gds9"; depends=[deSolve lubridate maptools raster rgdal rgeos sp topmodel xts zoo]; }; dyncomp = derive2 { name="dyncomp"; version="0.0.2-1"; sha256="13wp2k8nbgrbrqng2dmgy0ixgidk51wq9y7mv5pdbvdajxdsyh11"; depends=[zoo]; }; - dyndimred = derive2 { name="dyndimred"; version="1.0.2"; sha256="1iqn28vl1vf0jbs0jrngg711lzsrliksvxyf1c8d9zp8k4glris0"; depends=[dynutils irlba]; }; + dyndimred = derive2 { name="dyndimred"; version="1.0.3"; sha256="03znghb5nygggwfmy9id07fn1wfkhwyzyzahdrlx68pg03dhlbg5"; depends=[dynutils irlba lmds]; }; dynetNLAResistance = derive2 { name="dynetNLAResistance"; version="0.1.0"; sha256="018y3m648ni31rlisjfnrx1d10mm48wpxanlnnxxpnqxjcywg2x8"; depends=[doParallel foreach igraph]; }; dynfrail = derive2 { name="dynfrail"; version="0.5.2"; sha256="1q7ml24j0ycy2bwpa14vl96315ni7x9rfp0qmf36w00mylgc3ry6"; depends=[dplyr magrittr Rcpp RcppArmadillo survival tibble tidyr]; }; dynia = derive2 { name="dynia"; version="0.2"; sha256="1swip4kqjln3wsa9xl0g92zklqafarva923nw7s44g4pjdy73d5l"; depends=[]; }; @@ -7089,38 +7162,39 @@ in with self; { 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.1"; sha256="11zsx2c4hv7k22pw85aa01zk4r0qpzwnf73ynylkfxfbi87rda9s"; depends=[rlang]; }; - dynr = derive2 { name="dynr"; version="0.1.15-1"; sha256="1vd93mckc8q8wvs3sgly7j1vn1i2qis6pcyqiag6nqz5xjfv6rn4"; depends=[car deSolve fda ggplot2 latex2exp magrittr MASS Matrix mice numDeriv plyr Rdpack reshape2 stringi tibble xtable]; }; - dynsbm = derive2 { name="dynsbm"; version="0.6"; sha256="0sdy42ihymhzx577jc2qr7lwirc9lviz3sagfy09zhbwizz5a4kw"; depends=[RColorBrewer Rcpp riverplot]; }; + dynr = derive2 { name="dynr"; version="0.1.15-25"; sha256="1kwrx1wg7hwgwkdgws8pvdv2yj5m77xp7fnpxlj50c7xm3chjm78"; depends=[car deSolve fda ggplot2 latex2exp magrittr MASS Matrix mice numDeriv plyr Rdpack reshape2 stringi tibble xtable]; }; + dynsbm = derive2 { name="dynsbm"; version="0.7"; sha256="169yk539vynjbn89q6vs3l3fx7hk8n3i1msa4jws5vypgljc2rir"; depends=[RColorBrewer Rcpp riverplot]; }; dynsim = derive2 { name="dynsim"; version="1.2.1"; sha256="0nkxn9v4f353fhcn1vsdrh29mrms10zid63b84flg3c6hvc0x4qr"; depends=[ggplot2 gridExtra MASS]; }; dynsurv = derive2 { name="dynsurv"; version="0.3-7"; sha256="0ar8n84fpfy68cx321syg8hvjxjnh00mw0a9sid9dw58f956phf8"; depends=[BH ggplot2 nleqslv plyr reshape survival]; }; - dynutils = derive2 { name="dynutils"; version="1.0.4"; sha256="1rzwcfbv5aqa08fy9i1fiz4a7v3z2skyyjz392rjsbwpnlk77ryh"; depends=[assertthat crayon desc dplyr magrittr Matrix proxyC purrr Rcpp remotes stringr tibble]; }; - dynwrap = derive2 { name="dynwrap"; version="1.1.4"; sha256="11c8rd9yv54a7g1ypdniw4vchcpa3lbijnh67srp6fymrlf82z7d"; depends=[assertthat babelwhale crayon dplyr dynparam dynutils FNN glue hdf5r igraph jsonlite magrittr Matrix processx purrr readr reshape2 stringr testthat tibble tidyr yaml]; }; + dynutils = derive2 { name="dynutils"; version="1.0.5"; sha256="1vcnz0yrss64i8pw459z2kp17b0fqgw41rpxbzpixhsqsz9sy22x"; depends=[assertthat crayon desc dplyr magrittr Matrix proxyC purrr Rcpp remotes stringr tibble]; }; + dynwrap = derive2 { name="dynwrap"; version="1.2.0"; sha256="10j1lp3118ad4q09i0ml162lq33mlipr22nfib120mzx5dj3fgp2"; depends=[assertthat babelwhale crayon dplyr dynparam dynutils FNN glue igraph magrittr Matrix processx purrr readr reshape2 stringr testthat tibble tidyr yaml]; }; e1071 = derive2 { name="e1071"; version="1.7-3"; sha256="0pf2pjb590z0jikgv1037xcp7dq06mg3dzmyffjw6gk7dd9blbdv"; depends=[class]; }; 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]; }; eGST = derive2 { name="eGST"; version="1.0.0"; sha256="0qi4vg0pwy55js9ww1cw85ssim3x7s2p98cjijxvlrvid8sns5bq"; depends=[MASS matrixStats mvtnorm purrr]; }; eMLEloglin = derive2 { name="eMLEloglin"; version="1.0.1"; sha256="087zw48lykls2jcsmpqd5jkrlpr0j423snp00liszjhdpdh59saq"; depends=[lpSolveAPI]; }; + eNchange = derive2 { name="eNchange"; version="1.0"; sha256="07vdi05fr6mynb86haas21izdcjiagw14p1h8n0qr1hb3klvs8n5"; depends=[ACDm doParallel foreach hawkes iterators Rcpp]; }; eNetXplorer = derive2 { name="eNetXplorer"; version="1.1.0"; sha256="1n84rf9axvvjf6s0mamf5z889hg3y32mhypasmxc455698z3d1k5"; depends=[calibrate expm glmnet gplots Matrix progress RColorBrewer survcomp survival survivalROC]; }; ePCR = derive2 { name="ePCR"; version="0.9.9-11"; sha256="0bkvjvygdnzcc23sslgkcrx11mzwgsqss37lwnbr7rq0jp1sw46s"; depends=[Bolstad2 glmnet hamlet impute pracma survival timeROC]; }; eRTG3D = derive2 { name="eRTG3D"; version="0.6.2"; sha256="04m39jkp4lvv145wmcswc87qx36wpfkm95kq9fik8a3jb5myvjll"; depends=[CircStats ggplot2 gridExtra pbapply plotly plyr raster rasterVis sp tiff]; }; - eRm = derive2 { name="eRm"; version="1.0-0"; sha256="11p8j61arq1ih2qi33wf0442vcdbp3zvknzm5aknsifwl4mbzzly"; depends=[lattice MASS Matrix]; }; + eRm = derive2 { name="eRm"; version="1.0-1"; sha256="0njqzznnhnkvalmhiq5yq1w7gwp2myki5cv61w42ydvd27hdyyg9"; depends=[colorspace lattice MASS Matrix psych]; }; eSDM = derive2 { name="eSDM"; version="0.3.2"; sha256="0vjphknba4a6y1wdgv9v6r3a6kj088fq83b4387d4z72g0kkwcmc"; depends=[colorRamps colourpicker dichromat dplyr DT leaflet lwgeom purrr raster RColorBrewer rlang ROCR sf shiny shinycssloaders shinydashboard shinyjs tmap units viridis zip]; }; - eaf = derive2 { name="eaf"; version="1.8"; sha256="1plzvfa2vs3njky7xk9dvic2xapdnzb5iycrksv0qj03ylbh6410"; depends=[modeltools]; }; + eaf = derive2 { name="eaf"; version="1.9-1"; sha256="0h7nilqa11s4casalilmk4ssgcl1lqn1w4033zxgc20y7f9rxhsg"; depends=[modeltools]; }; earlyR = derive2 { name="earlyR"; version="0.0.1"; sha256="14davqhh3n5dfsddnfd79ni56bssrpwhvkqkdb77a8x9fn8w32pv"; depends=[distcrete EpiEstim epitrix]; }; earlygating = derive2 { name="earlygating"; version="1.0"; sha256="0y6xjkh9p8bvanc9p5sycah8v81k85xr8i7vyvjb9g4a64srwhd7"; depends=[betareg doParallel foreach]; }; earlywarnings = derive2 { name="earlywarnings"; version="1.0.59"; sha256="06j5g5lrzl4p5pb1pp79h00iqpbwralzhpzxmaiymv7j8kz87nr0"; depends=[fields ggplot2 Kendall KernSmooth lmtest moments nortest quadprog som spam tgp tseries]; }; earth = derive2 { name="earth"; version="5.1.2"; sha256="13a8qfv94bqnjkacnr0nz1g8yd99cnyz4k2qslyclrckqbl9hvrj"; depends=[Formula plotmo TeachingDemos]; }; - earthtide = derive2 { name="earthtide"; version="0.0.9"; sha256="14i1ihswvspqlis9h9m4xfjmhqwz1nj6blhdzqanvd05abw6qnkx"; depends=[BH R6 Rcpp RcppArmadillo RcppParallel]; }; + earthtide = derive2 { name="earthtide"; version="0.0.10"; sha256="09cd4vwkl33zgdwvhvi9jl6za9w61zjj9fyq3x2cxz4hgj346fbm"; depends=[BH R6 Rcpp RcppArmadillo RcppParallel]; }; earthtones = derive2 { name="earthtones"; version="0.1.1"; sha256="17biiw0ig8i8ihc2f8csp0bqryygg27ic2v1vrf81ax3qzhngy4l"; depends=[ggmap]; }; easyAHP = derive2 { name="easyAHP"; version="0.1.1"; sha256="161mn90j9ph1p9277mj61hch8ndcv7k9izs32q93y5wp474gzynd"; depends=[]; }; easyCODA = derive2 { name="easyCODA"; version="0.31.1"; sha256="1g3k8a06zsif5a7xma4dz5zcdbxyc6i58jf5rnnyypxhj6xm5abc"; depends=[ca ellipse vegan]; }; 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]; }; - easyPSID = derive2 { name="easyPSID"; version="0.1.0"; sha256="10373pbgkgc2aizff54qx95yixlcdbp3xbwlml0lm2rm449bjd6x"; depends=[foreign LaF stringr]; }; + easyNCDF = derive2 { name="easyNCDF"; version="0.1.0"; sha256="1p6b1lcbw2ix6hqqghgfid5yd58yqg1cqnj99r5svli3ivr7x6js"; depends=[abind ClimProjDiags ncdf4]; }; + easyPSID = derive2 { name="easyPSID"; version="0.1.1"; sha256="07m560j8bpzifik305ix33b26xg7w4xjn7lz9g9gp120cqs765dx"; depends=[foreign LaF stringr]; }; 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]; }; + easySdcTable = derive2 { name="easySdcTable"; version="0.5.0"; sha256="0qv0w5pfhbvf1zfi1zjq304a8z50fmi4l9vqjfqy7gz5gb6y5z43"; depends=[sdcTable shiny SSBtools]; }; easyVerification = derive2 { name="easyVerification"; version="0.4.4"; sha256="08mih1arx01vj7cs1jsln644pcvslpyw1rgr6jmv2czr6xd8qb7d"; depends=[pbapply Rcpp SpecsVerification]; }; easyalluvial = derive2 { name="easyalluvial"; version="0.2.2"; sha256="0x7rkxvpc9xbkhnb5r1bal0fircn412v34fwgpm42h21rkjwiybw"; depends=[caret dplyr e1071 forcats ggalluvial ggplot2 ggridges gridExtra magrittr progress purrr randomForest RColorBrewer recipes rlang stringr tibble tidyr]; }; easyanova = derive2 { name="easyanova"; version="7.0"; sha256="1zpwh3r1r0n11hgqzph8f2aac44qb6rpnhk73hcblq0f9vs0an55"; depends=[nlme]; }; @@ -7128,58 +7202,58 @@ in with self; { easynls = derive2 { name="easynls"; version="5.0"; sha256="1ma2q4y5dxk6q99v880vqfsgy1fha96j7pi8ch699l0pi6bx0d6c"; depends=[]; }; easypackages = derive2 { name="easypackages"; version="0.1.0"; sha256="00paxdwz4bw3imqhcsw6hj1h0gmnpishlxcj79n826vhdy23jc4y"; depends=[assertthat devtools]; }; easypower = derive2 { name="easypower"; version="1.0.1"; sha256="1vf0zv55yf96wjxja6ifdjvgc9nw0jl0hnc1ygyjd8pmwbgdz9bl"; depends=[pwr]; }; + easyr = derive2 { name="easyr"; version="0.3-1"; sha256="139xg91j01i5sczbifga3476j98qv9n3vs5wp4ai66blfsiqf1yy"; depends=[data_table digest dplyr foreign glue Hmisc lubridate openssl qs readxl rlang stringr tibble XML]; }; easyreg = derive2 { name="easyreg"; version="4.0"; sha256="1w4wlhziyhdyldm0zgnm73fnxrh0fv8hwcw5j8ircxb4npx7bcgg"; depends=[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.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]; }; + ebirdst = derive2 { name="ebirdst"; version="0.2.1"; sha256="1cmi0hdh6363hcbqwglald3bn22rlvl4yqg4l3by6005mirjgx2i"; depends=[car data_table dplyr ggplot2 gridExtra magrittr mgcv PresenceAbsence rappdirs raster rgdal rlang scales sf stringr tidyr viridisLite xml2]; }; ebmc = derive2 { name="ebmc"; version="1.0.0"; sha256="0v9hkzy8ljddmi6wdjd1jga4ib566ikr1vgrvxba67ka524r6bbp"; depends=[C50 DMwR e1071 pROC randomForest rpart]; }; ebreg = derive2 { name="ebreg"; version="0.1.0"; sha256="033ldzj9r9y14nq5bsy1ds9vys8imk1ysii8b889zd1bi319b05y"; depends=[lars Rdpack]; }; 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]; }; ecdfHT = derive2 { name="ecdfHT"; version="0.1.1"; sha256="1n3n9n86pj8c54l3xvp7knvi0ajbnjmz9pi79p7wfq92a90fqx48"; depends=[rgl]; }; - ecespa = derive2 { name="ecespa"; version="1.1-10"; sha256="1n6wvz463w0ainn9a52arjhs5q9pwciknb5328pr6y287fwa3nnn"; depends=[spatstat]; }; + ecespa = derive2 { name="ecespa"; version="1.1-11"; sha256="154zny4ny5cbba9wpm2wmgvsi7wl77aiagc660xpwfvpiwmbxsmk"; depends=[spatstat]; }; echarts4r = derive2 { name="echarts4r"; version="0.2.3"; sha256="0yxgxwsyhmbnw3llcgr4xh0i0d74awgsapdw7xsh57wzc539666m"; depends=[broom corrplot countrycode d3r data_tree dplyr htmltools htmlwidgets jsonlite magrittr purrr scales shiny stringi]; }; echelon = derive2 { name="echelon"; version="0.1.0"; sha256="0dw15igx8jwgfr1f7p5pspxjiqhqmfp7shdhq8g07f4bj76irzm4"; depends=[]; }; echo_find = derive2 { name="echo.find"; version="3.0"; sha256="15rrja2z01y4pbh2w4h2xcnwv9c81ppnb848203vavvlilm475y1"; depends=[boot minpack_lm]; }; echogram = derive2 { name="echogram"; version="0.1.2"; sha256="0kir7x32fk3fc63kr3b2j0hfkmivs2pwrlxyjvdg7xqc59hjp3ma"; depends=[geosphere readHAC]; }; - echor = derive2 { name="echor"; version="0.1.3"; sha256="1m843219038jvmwd5fsnlh63nl7as7d4030i6wnksg6pw6v6f1s8"; depends=[dplyr geojsonsf httr lubridate plyr purrr readr rlang tibble tidyr]; }; - ecipex = derive2 { name="ecipex"; version="1.0"; sha256="0pzmrpnis52hvy80p3k60mg9xldq6fx8g9n3nnqi3z56wxmqpdv7"; depends=[CHNOSZ]; }; + echor = derive2 { name="echor"; version="0.1.4"; sha256="0c14nhq97m7m0597ss0qddr9dys7sf3qw2pw0gfwr4xmk2bzdxih"; depends=[dplyr geojsonsf httr plyr purrr readr rlang tibble tidyr]; }; + ecipex = derive2 { name="ecipex"; version="1.1"; sha256="16iyi6n0pnyfmy47b0ranjbh3spvq8cgkmcamzhgjfj7qn0ix184"; depends=[CHNOSZ]; }; eclust = derive2 { name="eclust"; version="0.1.0"; sha256="01x327w02m357lngmgv3drni2s67sass25xk9vni1z434n8i4428"; depends=[caret data_table dynamicTreeCut magrittr pacman pander stringr WGCNA]; }; ecm = derive2 { name="ecm"; version="4.4.0"; sha256="1f9x3lcihvnkc5fr4g94h0m5a9h4rjmq9hkjs34il2id8bw92gj7"; depends=[car]; }; - ecmwfr = derive2 { name="ecmwfr"; version="1.2.1"; sha256="0crqmr3rph0xkxkfgl3rz3aqc75vh7kn7sjnixspg04mh2p27cpb"; depends=[httr keyring memoise]; }; - eco = derive2 { name="eco"; version="4.0-1"; sha256="08fblbr9qp2v0cp69hy68c18xjqvx0nsnx42n2vd1gc6r7apapj6"; depends=[MASS]; }; + ecmwfr = derive2 { name="ecmwfr"; version="1.2.2"; sha256="0gr1cqvl6p3x63kqg8v1xnk8h6g1acqb3agq9p51zqzcx40hdsrc"; depends=[curl getPass httr keyring memoise]; }; ecodist = derive2 { name="ecodist"; version="2.0.3"; sha256="1fhlsiywvfyw03dhbwk2g9blymsjvzhcbwdsqn59bmdjk7aiy79x"; depends=[]; }; - ecoengine = derive2 { name="ecoengine"; version="1.11.0"; sha256="1d5x6hvqrqjj0wg07m4dbgb9ljdq73ibavzy2q5magnfn50a7rzm"; depends=[assertthat data_table dplyr httr jsonlite lubridate magrittr plyr whisker]; }; ecolMod = derive2 { name="ecolMod"; version="1.2.6"; sha256="1n30faldfhpm2jkaw793vr220kgn3bmn8hxhw32rax294krmwn4v"; depends=[deSolve diagram rootSolve shape]; }; ecolottery = derive2 { name="ecolottery"; version="1.0.0"; sha256="0w5aq1aaqzz74vlj8hgnmn60l8rdrchx022dpspqnpvpzdlh65z5"; depends=[abc ggplot2]; }; econet = derive2 { name="econet"; version="0.1.81"; sha256="0hm1v4fjzyzdaxiw6lar7fxnqsckis3n7nrsravhbllhcf0aqq7w"; depends=[bbmle dplyr igraph intergraph MASS Matrix minpack_lm plyr sna spatstat_utils tnet]; }; - econetwork = derive2 { name="econetwork"; version="0.2"; sha256="0ilqxyvpkiwhhgml19f1rf08bn061nf76d7fby3084ypgc4iwi1b"; depends=[igraph Matrix_utils rdiversity]; }; - economiccomplexity = derive2 { name="economiccomplexity"; version="0.3"; sha256="058cyzr01jrgi9090wn8vpjhf074bq7g76vfbyk58jic0k78k634"; depends=[dplyr igraph magrittr Matrix rlang tibble tidyr]; }; + econetwork = derive2 { name="econetwork"; version="0.4"; sha256="0p20yj4xki4cj4pww51i6wj6cxp5k3ksc2vcb4f4qh7lr82hnb09"; depends=[bipartite blockmodels igraph Matrix_utils rdiversity]; }; + economiccomplexity = derive2 { name="economiccomplexity"; version="1.0"; sha256="1bqayzpfz26lb985l66j27qybyqx0148fiikb8diamq0mbx3picc"; depends=[igraph Matrix]; }; econullnetr = derive2 { name="econullnetr"; version="0.2.0"; sha256="1amgwcsm42ffrdx5a11nkvdx37qqjfh7z54z1hl4b07n8rg1rp7c"; depends=[bipartite gtools reshape2]; }; - ecoreg = derive2 { name="ecoreg"; version="0.2.2"; sha256="1yzyqvhshgc7ip251y7hsvip4xwf8i92bvvz84mn0mzv5b4mq3im"; depends=[]; }; + ecoreg = derive2 { name="ecoreg"; version="0.2.3"; sha256="1bhh4bnvrvgz49wim5r0b4awfsn9l23wvl4kl0vny0s4hm7cgahc"; depends=[]; }; ecoseries = derive2 { name="ecoseries"; version="0.1.5"; sha256="1q35hp5hl6z28hns5rnp3mjn6hqp5qh714pagw7fw4d4a6wnvacy"; depends=[magrittr RCurl readr rjson rvest tibble xml2 zoo]; }; ecosim = derive2 { name="ecosim"; version="1.3-1"; sha256="0gpgjswqmibnz9lpcidvw3y1wmd38l4lyha4fbs0agiz6yyfiyjn"; depends=[deSolve stoichcalc]; }; ecospace = derive2 { name="ecospace"; version="1.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.4.1"; sha256="12dfnsvqwk4iy8r3iks51hh1gcj3hhws10hsng6daqc0xp1y6dpr"; depends=[tibble]; }; + ecospat = derive2 { name="ecospat"; version="3.1"; sha256="17mxny0m0pl0b4vn7slc2qqabjp3i91nz0yjwfvrd827s2hhcra9"; depends=[ade4 adehabitatHR adehabitatMA ape biomod2 classInt dismo doParallel ecodist foreach gbm gtools iterators maps maptools matrixStats poibin PresenceAbsence randomForest raster rms snowfall sp spatstat vegan]; }; + ecotox = derive2 { name="ecotox"; version="1.4.2"; sha256="0i4wjarg8gj4hfr0d4fqk74ymhkzrq3vkklpv5v1511ci19hpv16"; depends=[tibble]; }; ecotoxicology = derive2 { name="ecotoxicology"; version="1.0.1"; sha256="084xkr59d7x9zxmsnsyym2x8jshz6ag6rvnmhd1i6fzar8ypwccb"; depends=[]; }; - ecoval = derive2 { name="ecoval"; version="1.2.5"; sha256="0rlgi8cd7jdybb2dqx6ndp8rg02bvsvhksmh8vk8g5fg2wk0rll3"; depends=[jpeg rivernet utility]; }; + ecoval = derive2 { name="ecoval"; version="1.2.6"; sha256="1kizssw71a0sq4z48lqsj5yrnq8f0iw4p4xsbbskiz45c6j8nsa5"; depends=[jpeg rivernet utility]; }; ecp = derive2 { name="ecp"; version="3.1.2"; sha256="11f9p869xr0zg779i46gmflxlq4xclk9wxbab0nj2fan26pn4sfy"; 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.1"; sha256="058p1750ba5hp4rczi26grgwjia2ny1880v1vfp6wxad13r459pq"; depends=[boot]; }; ed50simulation = derive2 { name="ed50simulation"; version="0.1.1"; sha256="00fknpssrpin8bpjhf2lsjx3lbpinrmqa6jzmgy3nslkc51x0939"; depends=[boot]; }; eda4treeR = derive2 { name="eda4treeR"; version="0.2.0"; sha256="0fh6nfgvbkvjm1f0b292ggi0mr8ylq5pg2wp8cph46j8rhbgbdxz"; depends=[dae dplyr emmeans ggplot2 lme4 magrittr pbkrtest tidyverse]; }; - edarf = derive2 { name="edarf"; version="1.1.1"; sha256="0f27hs7vn4v2jis3d66s48hr0ki8m8ndspcw1cwns5vjwb77iqwm"; depends=[data_table ggplot2 mmpf]; }; + edbuildmapr = derive2 { name="edbuildmapr"; version="0.1.0"; sha256="1wk0xxdlvpa9wj2cbiwj23kh6f24x29391lmwvw1rnhlqxrfypk7"; depends=[dplyr lwgeom magrittr sf spdep stringr tidyselect tmap]; }; + edbuildr = derive2 { name="edbuildr"; version="0.1.1"; sha256="0cbwkvlj5w3vbg2k20fqxanrahly3ca22zdlfqk62v38i78cpldq"; depends=[dplyr magrittr openxlsx scales stringr tidyselect]; }; edcc = derive2 { name="edcc"; version="1.0-0"; sha256="036fi6mnn9480hkb378xb5jilkfvdydjmkyw4mcc9s1lz195f62w"; depends=[spc]; }; edci = derive2 { name="edci"; version="1.1-3"; sha256="1f1ry2adfranfrrvf1gkiy58pra3z6bray4v5fgr0z9n1ybcaff0"; depends=[]; }; eddi = derive2 { name="eddi"; version="0.0.1"; sha256="19cgrqdcji509igb6rmlwb75xyyvrh34nv6zyjjfcsc31p5nvf95"; depends=[raster rgdal]; }; + eddington = derive2 { name="eddington"; version="2.1.1"; sha256="0v88v2xmvirnj661jsg2qh7n8afaw71mqks9csnmmz3c16agp7b6"; depends=[Rcpp]; }; edeR = derive2 { name="edeR"; version="1.0.0"; sha256="1dg0aqm5c4zyf015hz1hhn3m4lfvybc4gc1s7sp8jcsk46rxz0cc"; depends=[rJava rjson rJython]; }; - edeaR = derive2 { name="edeaR"; version="0.8.3"; sha256="18v85mzs5gys3x4vj9dh941xxbfajlp6zly2q7pf842hs33fipbi"; depends=[bupaR data_table dplyr ggplot2 ggthemes glue hms lubridate miniUI purrr rlang shiny shinyTime stringr tibble tidyr zoo]; }; + edeaR = derive2 { name="edeaR"; version="0.8.4"; sha256="14skrsgnd4nslmhi3cpg5v8vz8q11diywd5ad0wbr01aak2bv10c"; depends=[bupaR data_table dplyr ggplot2 ggthemes glue hms lubridate miniUI purrr rlang shiny shinyTime stringr tibble tidyr zoo]; }; edf = derive2 { name="edf"; version="1.0.0"; sha256="14ikm6j0ndxrk7c7lh5mbd2aci46d4j9a30mvcgnxy3kq6046a7b"; depends=[]; }; edfReader = derive2 { name="edfReader"; version="1.2.1"; sha256="076far4fhd6rpa6fwffad4cgchjvar135yblvlrm33s9pd5bf0hn"; depends=[]; }; edfun = derive2 { name="edfun"; version="0.2.0"; sha256="1wxx6bgy03z7c1d6556bbjl1cb49n2vn734fw2d5c1jk0zsh3fmz"; depends=[]; }; @@ -7187,13 +7261,14 @@ in with self; { edgeCorr = derive2 { name="edgeCorr"; version="1.0"; sha256="19n67yc58ksin7xydrnfsyyw7fqawm5xli67cz4lv4wb62w6r6ld"; depends=[]; }; edgeRun = derive2 { name="edgeRun"; version="1.0.9"; sha256="0d5nc8fwlm61dbi00dwszj1zqlij4gfds3w1mpcqnnfilr2g3di1"; depends=[data_table edgeR]; }; edgebundleR = derive2 { name="edgebundleR"; version="0.1.4"; sha256="0pajr95qqppk2m4l7rfi46rll32z8a7lmq0vmb3p8n0aks5ajn1n"; depends=[htmlwidgets igraph rjson shiny]; }; + edina = derive2 { name="edina"; version="0.1.1"; sha256="1lpmidyxi54byrsnwwadkh5rr454635xrwa4v2wz8mqr2hngxis3"; depends=[ggplot2 jjb Rcpp RcppArmadillo reshape2 rgen]; }; editData = derive2 { name="editData"; version="0.1.2"; sha256="1ibpd2rlm6i9izyizmdhzxv8agrw920hxbin5y79cmf78rdg1sxy"; depends=[DT miniUI rstudioapi shiny tibble]; }; editrules = derive2 { name="editrules"; version="2.9.3"; sha256="07j8wj0fk34irqgsz70h2wad3wdjv5xl1cl702vxbr0nvmpw2ngl"; depends=[igraph lpSolveAPI]; }; 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]; }; + edwards97 = derive2 { name="edwards97"; version="0.1.0"; sha256="1ybksvrp7pd78ncmzdn67q9w3baxx6kf886214cqa5yfbi8jsc4z"; depends=[broom cli glue rlang tibble withr]; }; eechidna = derive2 { name="eechidna"; version="1.4.0"; sha256="07537brbdinkrmygbd2galyl6acbcbg2pkjafkdhxdgklpxv7j9m"; depends=[colourpicker dplyr ggplot2 ggthemes magrittr plotly purrr rgdal rgeos shiny sp stringi tibble tidyr tidyselect]; }; - eefAnalytics = derive2 { name="eefAnalytics"; version="1.0.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]; }; @@ -7203,34 +7278,34 @@ in with self; { effectFusion = derive2 { name="effectFusion"; version="1.1.2"; sha256="0m392wrkmgvys7a2bk2w1swfkjikkllng8sy8wb8s2j9y6c3wanp"; depends=[bayesm cluster ggplot2 GreedyEPL gridExtra MASS Matrix mcclust]; }; effectR = derive2 { name="effectR"; version="1.0.2"; sha256="1icr1sx98x3h8rbky1agdh809arhjqcypyajl7y50yis8a5pkycb"; depends=[ggplot2 reshape2 rmarkdown seqinr shiny viridis]; }; effects = derive2 { name="effects"; version="4.1-4"; sha256="1jbpyji7qn5hz8a6afsfbng0nx0a7w0v3v51wpmnbipfjchyalhy"; depends=[carData colorspace estimability lattice lme4 nnet survey]; }; - effectsize = derive2 { name="effectsize"; version="0.0.1"; sha256="07vgmxdl75798hgdh90zysafjh97rmmj2wjjyr6xff4fbhi8rlkb"; depends=[bayestestR insight parameters]; }; + effectsize = derive2 { name="effectsize"; version="0.2.0"; sha256="1liix8rf8xq3hzi7684bl0s20iflsq6g5mxr5k59wp2qwn1i6aww"; depends=[bayestestR insight parameters]; }; effectsizescr = derive2 { name="effectsizescr"; version="0.1.0"; sha256="0shfjk6r3bz04jakrn5nwgymjx60lk83i0akcx7zqfxp3k8yncs5"; depends=[Kendall]; }; efflog = derive2 { name="efflog"; version="1.0"; sha256="1sfmq7xrr6psa6hwi05m44prjcpixnrl7la03k33n0bksj8r1w6b"; depends=[]; }; - effsize = derive2 { name="effsize"; version="0.7.6"; sha256="129vs8kp10h6yhrrmn77518120bmfr55l6nkpbxkvylnr641b5a2"; depends=[]; }; + effsize = derive2 { name="effsize"; version="0.7.9"; sha256="01gl6bacsn7yyg9a3s5f6z6i115rxrdfi19vz551xq287k4i6qqn"; depends=[]; }; efreadr = derive2 { name="efreadr"; version="0.2.2"; sha256="1h27by1m451wrnw017005avs5yj3fjzrm2lq5153aqm1mbbxxwvs"; depends=[dplyr ensurer magrittr readr]; }; efts = derive2 { name="efts"; version="0.9-0"; sha256="1cdn37sij3q73z9gal6x3nnnds55whfj5ywyww119hx092xcb2h4"; depends=[lubridate magrittr ncdf4 plyr stringr udunits2 xts]; }; ega = derive2 { name="ega"; version="2.0.0"; sha256="04kwh24aap22yclmcrix3vi553qb30hd43mgfzpdl0cw3ibrh7xg"; depends=[ggplot2 mgcv]; }; egcm = derive2 { name="egcm"; version="1.0.12"; sha256="0nssf5six1j7z6fss7478zdbsfx60myzw833m7nsnaf1r8n4ixaf"; depends=[ggplot2 MASS pracma quantmod tseries urca xts zoo]; }; egg = derive2 { name="egg"; version="0.4.5"; sha256="1fy7srpiavfn8kyrr1m84an7acgwi6ydzrg71m3b0vk7y9ybmj0m"; depends=[ggplot2 gridExtra gtable]; }; eggCounts = derive2 { name="eggCounts"; version="2.3"; sha256="0y74dd8s406yz6nhwlb09hgarw90a68wji2vykxpqcrfll814g7q"; depends=[BH boot coda lattice numbers Rcpp RcppEigen rootSolve rstan StanHeaders]; }; - egoTERGM = derive2 { name="egoTERGM"; version="2.1.1"; sha256="1zp3kr7s43rjp45qbd6lv48mbmby5rrz1vdz9s64v43rjm8v2jyz"; depends=[boot btergm ergm GGally Matrix network sna speedglm xergm_common]; }; - egor = derive2 { name="egor"; version="0.19.10"; sha256="0s9s15j1v5z2v8jhfz8zrmfl43hmn7rw1afs1wjw1kvzz41k1jlm"; depends=[dplyr igraph network plyr purrr rlang shiny survey tibble tidygraph tidyr]; }; - eha = derive2 { name="eha"; version="2.8.0"; sha256="0nsspy1v780hlvhbpp78ybmxrwqbj12nz98pnh495dnlkq5fa5h5"; depends=[survival]; }; + egor = derive2 { name="egor"; version="0.20.03"; sha256="03np4p2pf1nc5rmzg9wxjrqi7h3f7672l574cfi731j0yw8bfcwx"; depends=[dplyr igraph network purrr rlang shiny survey tibble tidygraph tidyr]; }; + eha = derive2 { name="eha"; version="2.8.1"; sha256="00sny5wm415drcsvvzq6gk9r4fc4z7f7y9lix61hnf8ibqfv7bb1"; depends=[survival]; }; ehaGoF = derive2 { name="ehaGoF"; version="0.1.0"; sha256="1qrx9rmf4ifasxycnzj06xn3gl0gp9w1vplb4wrghiziqw5cqird"; depends=[]; }; - ehelp = derive2 { name="ehelp"; version="1.1.1"; sha256="1sd8g0a94dg8l568srxxsvyc0nmvbsy1rq75sn8cc2cdxv4vilq8"; depends=[]; }; + ehelp = derive2 { name="ehelp"; version="1.2"; sha256="0264nx4bidrbwhlxx9llarvh4zb3xnzln8km14823q1hclkpm2fq"; depends=[]; }; ei = derive2 { name="ei"; version="1.3-3"; sha256="0i8pvpal23zwsqldhmm3iis4vw9s08mlydpshaig2dsd9549gn11"; depends=[cubature eiPack ellipse foreach MASS mnormt msm mvtnorm plotrix sp tmvtnorm ucminf]; }; - eiCompare = derive2 { name="eiCompare"; version="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-9"; sha256="1rivccqfr5hz80xgfw652993zg0pw7yd0by52hyp7bwm89gsjksq"; depends=[coda MASS msm]; }; - eiPartialID = derive2 { name="eiPartialID"; version="0.1.2"; sha256="0721p89llzjznz2b6zlf54v7fy9lb9c5qb7w8q0l582iy5cwaw35"; depends=[eco MASS sandwich]; }; + eiPack = derive2 { name="eiPack"; version="0.2-1"; sha256="0xcgl9pr6d960zhp8fd944ba5p5ybp520lp2a4jgsj1lcvqf8xbn"; depends=[coda MASS msm]; }; eia = derive2 { name="eia"; version="0.3.4"; sha256="1yjrgmf6s9c35wpgpg66gi0wmfynm3kbcyaknsw44blpkd35c6yq"; depends=[dplyr httr jsonlite lubridate magrittr memoise purrr readxl tibble]; }; + eicm = derive2 { name="eicm"; version="1.0.0"; sha256="1xa4rfwq64zf5zkdxqslzmph3qc99mfrb8gvf00mqx6qvdzj3475"; depends=[doSNOW foreach GA iterators pso snow ucminf]; }; eigeninv = derive2 { name="eigeninv"; version="2011.8-1"; sha256="18dh29js824d7mrvmq3a33gl05fyldzvgi8mmmr477573iy9r30g"; depends=[]; }; eigenmodel = derive2 { name="eigenmodel"; version="1.11"; sha256="1l3n0z736xf3x6cyxzmmq1jb2glxi2b75z7v39y4471knh6nbb4d"; depends=[]; }; eigenprcomp = derive2 { name="eigenprcomp"; version="1.0"; sha256="156qyv7sl8nng55n3ay6dnpayyfrqv27ndz40xf4w92is9zmymy0"; depends=[]; }; eikosograms = derive2 { name="eikosograms"; version="0.1.1"; sha256="13s5wqcc8iwnhn3msrh9dfrvq9bwlby93p9v5wcnrm8m9iskax1s"; depends=[plyr]; }; + eimpute = derive2 { name="eimpute"; version="0.1.0"; sha256="0q8b98fmfrbk00jr7gzqaij781g5v9wj883xphyrvr0khlr499xl"; depends=[Rcpp RcppEigen]; }; eive = derive2 { name="eive"; version="2.3"; sha256="073hwx944db7zxq6yib6yvciaic11k49zl1iqphippcd5ygkad80"; depends=[Rcpp]; }; eivtools = derive2 { name="eivtools"; version="0.1-8"; sha256="0ynmrql6dv10m7cwba5mzwlbvp6ab53nzqqvk3ihwyiqzmnnmpk4"; depends=[R2jags]; }; eiwild = derive2 { name="eiwild"; version="0.6.7"; sha256="1fp4kvlmcjjnzn2a5cmlzaf6y5q6cdbbi2nmvjyqc4y1bmwh3srf"; depends=[coda gtools lattice]; }; - eixport = derive2 { name="eixport"; version="0.4.0"; sha256="06knza8mm7d8i1h72axq3s9id1cdrrq0gjc6lc3q65hf5hx89k1q"; depends=[cptcity ncdf4 raster sf sfheaders silicate sp tidyr]; }; + eixport = derive2 { name="eixport"; version="0.4.5"; sha256="13c717ws4b71x2dd7x33v72plqkd88nhsbxr0w3wm09xfana7l5b"; depends=[cptcity ncdf4 raster sf sfheaders silicate sp tidyr]; }; + elaborator = derive2 { name="elaborator"; version="1.0"; sha256="1jhs1hiwlww0sr3yacg5amr1mhwjwa10b374klrkkvzzw2y20p1x"; depends=[bsplus dendextend dplyr forcats gclus haven plotly purrr RColorBrewer reshape2 rlang seriation shape shiny shinyBS shinycssloaders shinydashboard shinyjs shinyWidgets tidyr V8]; }; elasso = derive2 { name="elasso"; version="1.1"; sha256="0nz3vw803dvk4s45zc9swyrkjwna94z84dn4vfj3j17h74a0cij2"; depends=[glmnet SiZer]; }; elastic = derive2 { name="elastic"; version="1.1.0"; sha256="1xg8gqa0maasx85fbff4vid2r8s0fgzj4iswyayybzik99zb26ly"; depends=[crul curl jsonlite R6]; }; elasticIsing = derive2 { name="elasticIsing"; version="0.2"; sha256="1zjgvz7w5j06x2cd1fzjl85di95ah67m1lanw01kic2bvhfwfbn6"; depends=[cvTools glmnet magrittr qgraph reshape2]; }; @@ -7255,21 +7330,23 @@ in with self; { 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="2.1.1"; sha256="1i6qcw2plw12v065142kx58d911zr1gcsd1xic152zxvh89nmhxx"; depends=[pROC Rcpp]; }; - emIRT = derive2 { name="emIRT"; version="0.0.9"; sha256="0861xa299qkdmmbxl2zsr1al4ysznzbx4yj9z655mrm9b11sh4bj"; depends=[pscl Rcpp RcppArmadillo]; }; + elsa = derive2 { name="elsa"; version="1.1-28"; sha256="01sj2a4yhv5m6qj6ih26zw4yzd8s27lll7yp0yysjjrwz79a0fbq"; depends=[raster sp]; }; + emIRT = derive2 { name="emIRT"; version="0.0.11"; sha256="1h91q9vi9cv14bmkaakyynw2z9sx51w0c2kw2in0x91wx7scmd0p"; depends=[pscl Rcpp RcppArmadillo]; }; emax_glm = derive2 { name="emax.glm"; version="0.1.2"; sha256="04di6bp97cxjbbszakb64y15bjmnd2j8zvxdj8gdbgmhxk9wmbwd"; depends=[AER MASS pander pracma pROC]; }; - emba = derive2 { name="emba"; version="0.1.1"; sha256="0sgh97jzfxna4dww8xmj1qy5435d4lm2yar2ra6nf416snlppjxv"; depends=[Ckmeans_1d_dp igraph magrittr rje usefun visNetwork]; }; - embed = derive2 { name="embed"; version="0.0.5"; sha256="0iwhif1yq3wb6xy0k03w0ygyl8rlcal0h2ncxc9rwqlny8xgvxph"; depends=[dplyr generics keras lme4 purrr recipes rlang rstanarm tensorflow tibble tidyr uwot withr]; }; + emayili = derive2 { name="emayili"; version="0.3.9"; sha256="0cc4i0d56k1l87ifa0x9vpfw0615hk7hzgyxfp68fh5yrj0fc6ab"; depends=[base64enc curl glue httr magrittr mime stringi]; }; + emba = derive2 { name="emba"; version="0.1.2"; sha256="0bf0wvzhjr0xig9rz6jkb08bb6jfv8za48lyqgp9fkkv1nnz9hjg"; depends=[Ckmeans_1d_dp igraph magrittr purrr rje usefun visNetwork]; }; + embed = derive2 { name="embed"; version="0.0.6"; sha256="1bwr32923b04cnvsm3pqzsw4rnihjqdfpqkh6pga520dw9x2w1dd"; depends=[dplyr generics keras lme4 purrr recipes rlang rstanarm tensorflow tibble tidyr uwot withr]; }; embryogrowth = derive2 { name="embryogrowth"; version="7.6"; sha256="0bsg904jikb1dqichkinpgm0difg17sfczw6q4zab6r02s7yb53s"; depends=[deSolve HelpersMG numDeriv optimx]; }; - emdbook = derive2 { name="emdbook"; version="1.3.11"; sha256="0a515jdzvg87npvrh7md7zp0v5nlz7c2jr7pba5dql6slb0d8j7q"; depends=[bbmle coda lattice MASS plyr]; }; - emdi = derive2 { name="emdi"; version="1.1.6"; sha256="1zxbbn0rl2z7zksh1k8wznry4k1bs08ipla1kaxyadj3i2wdk2y3"; depends=[boot ggplot2 gridExtra HLMdiag maptools MASS moments MuMIn nlme openxlsx parallelMap readODS reshape2 rgeos]; }; + emdbook = derive2 { name="emdbook"; version="1.3.12"; sha256="0ls3zxxlwmdv7zn1v9i1y9zc2sn0hbgmyjvsj7zn3ajsw7wwlih6"; depends=[bbmle coda lattice MASS plyr]; }; + emdi = derive2 { name="emdi"; version="1.1.7"; sha256="0zkvkw4vbr19zc6ac1yvg8nsd70zl1vkdxlcydsadybgff4kq55b"; depends=[boot ggplot2 gridExtra HLMdiag maptools MASS moments MuMIn nlme openxlsx parallelMap readODS reshape2 rgeos]; }; emdist = derive2 { name="emdist"; version="0.3-1"; sha256="1z14pb9z9nkd0f2c8pln4hzkfqa9dk9n3vg8czc8jiv0ndnqi7rq"; depends=[]; }; emg = derive2 { name="emg"; version="1.0.8"; sha256="05j96ch20nca4dci25w0m9y8l6yhm26fapkmm4rfqg6si8agr52s"; depends=[moments]; }; emhawkes = derive2 { name="emhawkes"; version="0.9.0"; sha256="1h6map6w66q91s6g1qr9wfk589cbvva1banqrxzzf29g7ihl15vh"; depends=[maxLik]; }; - emld = derive2 { name="emld"; version="0.3.0"; sha256="16f1za636bbdp9y5mq40n2v77l2zbmwrph870wm12rmn7cjl9bwq"; depends=[jsonld jsonlite xml2 yaml]; }; + emld = derive2 { name="emld"; version="0.4.0"; sha256="16ikzkvl4xn7ixa4sfh21isx2gpppvx5ajpann26f35645pm51xk"; depends=[jsonld jsonlite xml2 yaml]; }; emma = derive2 { name="emma"; version="0.1-0"; sha256="0psd8lrbcqla8mkhp0wlassaaimgwlmqy5yv2wwcq59mc5k1v27f"; depends=[clusterSim earth]; }; emme2 = derive2 { name="emme2"; version="0.9"; sha256="035s4h95ychqb14wib0dqbg4sjy9q01fsryr0ri25g1hsi5f8lpm"; depends=[reshape]; }; - emmeans = derive2 { name="emmeans"; version="1.4.3.01"; sha256="16v5j31516nbqnj2zhgqvyp5yxd4zcs5zi0aspa5plr2qikvrkmg"; depends=[estimability mvtnorm numDeriv plyr xtable]; }; - emoa = derive2 { name="emoa"; version="0.5-0"; sha256="1wcnsnkdmpcn21dyql5dmj728n794bmfr6g9hgh9apzbhn4cri8p"; depends=[]; }; + emmeans = derive2 { name="emmeans"; version="1.4.5"; sha256="10fmvmd6q4zjr6b18hhc85mwrzv778qzj6lwl9kbs2fsfvsgw7mm"; depends=[estimability mvtnorm numDeriv plyr xtable]; }; + emoa = derive2 { name="emoa"; version="0.5-0.1"; sha256="0rkr4d4fyqxmsrlbzar27z97qkw4cl1dkvfnhbdwpgg9fi1cixmz"; depends=[]; }; emojifont = derive2 { name="emojifont"; version="0.5.3"; sha256="1cdrrl3hvrs8rskyy6zgr7q2mmg8yb9k8sld1m64zsp7y009g19k"; depends=[ggplot2 proto showtext sysfonts]; }; emon = derive2 { name="emon"; version="1.3.2"; sha256="19khjjpyxvzhzihqq15w02l5v5ryyvxlklz1ch2gkmqcpnvyga32"; depends=[MASS mgcv]; }; emov = derive2 { name="emov"; version="0.1.1"; sha256="04w0bjyxvfb4ky573byp7j9b7x4gqycr5pgpnsl6rzag00zsf45a"; depends=[]; }; @@ -7277,14 +7354,15 @@ in with self; { 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.7"; sha256="1l4javnfhlb6y40dpdvri2795yj0s9zqf8bi02s5llx5lcq3bxbd"; depends=[]; }; + ems = derive2 { name="ems"; version="1.3.2"; sha256="1ambmd183f9959kwms71q3ks187y2ngpab45xlclpm2108n5j3pb"; depends=[boot rms survival]; }; emstreeR = derive2 { name="emstreeR"; version="2.2.0"; sha256="1qbv61j2ya6zvyp8494xi8dhjlb58jmqil9cm5z0pr7p2sr6l32r"; depends=[BBmisc BH ggplot2 Rcpp RcppArmadillo RcppMLPACK scatterplot3d]; }; emuR = derive2 { name="emuR"; version="2.0.4"; sha256="152lg7sf98a7qrblz1ryjdpsprk2arfzwlq8z7b4ilr771lq0plw"; depends=[base64enc compare DBI dplyr git2r httpuv jsonlite MASS mime purrr RCurl readr rlang RSQLite rstudioapi shiny stringr tibble tidyr uuid wrassp]; }; 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]; }; + enRich = derive2 { name="enRich"; version="3.1"; sha256="0xl9rhz6mflzp1g5d51xz74dsm8qp16jbkflhzrha3vfirn2jh8q"; depends=[]; }; enc = derive2 { name="enc"; version="0.2.2"; sha256="16x8cckw0ah2yfczvv4j1jy4f8m23fkac38fz068964sv4l8z645"; depends=[]; }; encode = derive2 { name="encode"; version="0.3.6"; sha256="04zwclmqasbx54m77wqfr9jg4axhkkqnykaxv3if8lnr46fl3zyc"; depends=[]; }; encryptr = derive2 { name="encryptr"; version="0.1.3"; sha256="01gsimhrb9c7k5d9h5dbvm4h9i7fc9vzi8wgqb5f191ki27fsw9w"; depends=[dplyr knitr openssl purrr readr rlang]; }; + endoSwitch = derive2 { name="endoSwitch"; version="1.0.0"; sha256="1cj4skk317ppnayk1ph63vll49vs74fljc25cn1iviwgjq64ly0k"; depends=[data_table maxLik msm]; }; endogMNP = derive2 { name="endogMNP"; version="0.2-1"; sha256="0maxcp321ngbxrg0i23nlwhj849v771xahh53367x928ss4f8v7i"; depends=[]; }; endogenous = derive2 { name="endogenous"; version="1.0"; sha256="079fmfxl9gf080zq5m1ixmgry9dawg2y6ixbfyc5da5jxf3zk9h8"; depends=[mvtnorm]; }; endorse = derive2 { name="endorse"; version="1.6.1"; sha256="067wrb5vhi9qn66rwp38cb4kss2yc55blh5dnl99fsvpc0qs146p"; depends=[coda]; }; @@ -7296,7 +7374,6 @@ in with self; { engsoccerdata = derive2 { name="engsoccerdata"; version="0.1.5"; sha256="06fdgjgnk4lwshrkd0jad411x5nz9sxlri9fdhxrf2dr2hik4l8q"; depends=[dplyr magrittr tidyr]; }; enpls = derive2 { name="enpls"; version="6.1"; sha256="12088v9xnj5b3dlakqz1hbzxz4mdai7xi7s2fpx8lj3y3lx7znmb"; depends=[doParallel foreach ggplot2 plotly pls reshape2 spls]; }; enrichR = derive2 { name="enrichR"; version="2.1"; sha256="0ymhzs9d2wl0s9rvbqc1hqb78mlzwhlc7mmijpfqkm5r720pf6m1"; depends=[httr rjson]; }; - enrichvs = derive2 { name="enrichvs"; version="0.0.5"; sha256="0x91s03hz1yprddm6mqi75bm45ki3yapfrxmap7d4qc0hi06h22k"; depends=[]; }; enrichwith = derive2 { name="enrichwith"; version="0.3.1"; sha256="05fhx323ani86wdxbjp8dgw4d1iq4kr1887646w072a6iq93bwhm"; depends=[]; }; ensembleBMA = derive2 { name="ensembleBMA"; version="5.1.5"; sha256="0p744151pbj278lyc8d8p7rc20n70abpfgxz6jr10jarmq3r6x7l"; depends=[chron]; }; ensembleMOS = derive2 { name="ensembleMOS"; version="0.8.2"; sha256="16d8030zfdwifqrh45vz3gf5n0bix0mhsmsnydgjq1fghdklcmyx"; depends=[chron ensembleBMA evd]; }; @@ -7304,13 +7381,14 @@ in with self; { ensemblepp = derive2 { name="ensemblepp"; version="1.0-0"; sha256="08k7v61p2sgr07dklabl0g7apsn9da60sfb14gfrwipwi8bsd4pv"; depends=[]; }; ensr = derive2 { name="ensr"; version="0.1.0"; sha256="18b81iswvby7k5akbfdyc6a8j1621d4d35hxmgjip5kyvf5cb3p8"; depends=[data_table ggplot2 glmnet]; }; ensurer = derive2 { name="ensurer"; version="1.1"; sha256="1gbbni73ayzcmzhxb88pz6xx418lqjbp37sdkggbrxcyhsxpdkid"; depends=[]; }; + entcn = derive2 { name="entcn"; version="0.1.0"; sha256="0wpa1293d1bdlx8pikzfh4vqhw7p45bi140aj3x4m8p21h5b4gd6"; depends=[bitops RCurl rjson RYoudaoTranslate stringr]; }; entropart = derive2 { name="entropart"; version="1.6-4"; sha256="1wr3pkn786crklsjzg1kq3dm1ks230jp391g31cgf5hfm537c3qb"; depends=[ade4 ape EntropyEstimation ggplot2 ggpubr reshape2 SPECIES vegan]; }; entropy = derive2 { name="entropy"; version="1.2.1"; sha256="10vg4818q5g54pv2nn9x5i7pvky5nsv96syy47pz2mgqp1273cpd"; depends=[]; }; - entrymodels = derive2 { name="entrymodels"; version="0.1.0"; sha256="0clyv5ws5nnnyys596zbmdndds43xrvnnkbdk59kj3wscw0hq982"; depends=[dplyr magrittr readr]; }; + entrymodels = derive2 { name="entrymodels"; version="0.2.0"; sha256="18byy6ky37n0a3ixrl6jik9pqbv07sbfkm9vb7wrziyywdfqmzp8"; depends=[dplyr magrittr readr]; }; envDocument = derive2 { name="envDocument"; version="2.4.1"; sha256="074m7adnasvys28kjdgj9071fi90vsl4yv5zvpxik4crlx098dlw"; depends=[]; }; envalysis = derive2 { name="envalysis"; version="0.3.3"; sha256="1ys93g5gxr9x1v4hg98dcpwa40n5xkh1j8drrmpnmxwq6gv01r6r"; depends=[drc ggplot2]; }; enveomics_R = derive2 { name="enveomics.R"; version="1.7.0"; sha256="0nk356svi25lzw5iza0jmg6krxhizilm7ja3sgym65319jpcflbp"; depends=[fitdistrplus investr sn]; }; - enviGCMS = derive2 { name="enviGCMS"; version="0.5.7"; sha256="00hydrvawm2zx6d8dcfd5p5l01lvrk5hsfq8k67b2iysjn2sh531"; depends=[animation BiocParallel broom crosstalk data_table dplyr DT genefilter ggplot2 ggraph ggridges igraph iterators itertools mixtools plotly rcdk RColorBrewer reshape2 rmarkdown shiny shinythemes]; }; + enviGCMS = derive2 { name="enviGCMS"; version="0.6.0"; sha256="0d0a7zv3nlsk8dq7wn3mg0nnvry56r9zm4y593mr1shcnmfm6nyn"; depends=[animation BiocParallel broom crosstalk data_table dplyr DT genefilter ggplot2 ggraph ggridges igraph mixtools plotly RColorBrewer Rdisop reshape2 rmarkdown shiny shinythemes]; }; enviPat = derive2 { name="enviPat"; version="2.4"; sha256="1gvb7jmwwh4l44b50xmrq3bysr2iv6442yh9pdk6n81g3bgpz1d0"; depends=[]; }; enviPick = derive2 { name="enviPick"; version="1.5"; sha256="04q6zwqq2ip8b8h2n1jpgx1bzcvi7lazljs0806wiakbc79x232p"; depends=[readMzXmlData shiny]; }; envirem = derive2 { name="envirem"; version="2.1"; sha256="175190l81r24v6ygr759l4qwi4i3v6n57jmgswamr01px4pvhxag"; depends=[huxtable palinsol raster RSAGA sp]; }; @@ -7318,38 +7396,39 @@ in with self; { envnames = derive2 { name="envnames"; version="0.4.0"; sha256="12mfbcksrp733jycasaiavlsmx138xmjpywly1wha4ds6bfw93hr"; depends=[]; }; envoutliers = derive2 { name="envoutliers"; version="1.0.0"; sha256="1wkd6xpsw5n9jx0qq5p88h6j8vkcyiyajd3zb6im5bc4d73nmi07"; depends=[car changepoint ecp ismev lokern MASS robustbase]; }; eoR = derive2 { name="eoR"; version="0.4.0"; sha256="0vn4s4af94n9h6x7z14qwpz94rgsd5m3mv55wva7x3h99ryhm83s"; depends=[data_table]; }; - eoffice = derive2 { name="eoffice"; version="0.1.8"; sha256="03yjw8yy3x81hnisiznx2gch4flhp7b9vafavx2r8ny86mqya1k9"; depends=[broom devEMF dplyr flextable ggplot2 ggplotify gplots htmlwidgets magick magrittr officer plotly R_devices rvg tibble]; }; + eoffice = derive2 { name="eoffice"; version="0.1.9"; sha256="019z09jml67ymc2y8y853nflcsvibkligvnngar8f9qv3k2j5k7j"; depends=[broom devEMF dplyr flextable ggplot2 ggplotify htmlwidgets magick magrittr officer plotly R_devices rvg]; }; epade = derive2 { name="epade"; version="0.3.8"; sha256="1alvsifc6i71ilm1xxs1d7sqlapb48bqd6z2n4wi6pqcjvwp7bif"; depends=[plotrix]; }; epandist = derive2 { name="epandist"; version="1.1.1"; sha256="0hxgbjns5bk82rgcmykxifnnxcnqdzmkimkkmpdif64zr5g3gjdg"; depends=[]; }; epanetReader = derive2 { name="epanetReader"; version="0.7.3"; sha256="05pwa6z03qsjwr9pxpbxycsd21p7mf5j5ajyg4yaas5g100s1k8c"; depends=[]; }; - eph = derive2 { name="eph"; version="0.2.0"; sha256="0j41hmiw59q9mwzsw94s0m0hrh4fqhbmayqbblfizh7gr7wijz53"; depends=[assertthat attempt curl dplyr expss glue janitor magrittr purrr questionr readr readxl stringr tibble tidyr tidyverse zoo]; }; + eph = derive2 { name="eph"; version="0.3.0"; sha256="19v892mryggsvr4w8sbxr8zpwfm94hs52am4r8gc7wxrdid2h3c0"; depends=[assertthat attempt curl dplyr expss glue htmltools janitor leaflet magrittr purrr questionr readr readxl rlang rvest sf stringr tibble tidyr tidyverse xml2 zoo]; }; epiDisplay = derive2 { name="epiDisplay"; version="3.5.0.1"; sha256="08ym6hcbmajzr4rasdb35fxk79vgpzfc16rmcm34f7f3zzz09dyl"; depends=[foreign MASS nnet survival]; }; epiGWAS = derive2 { name="epiGWAS"; version="1.0.2"; sha256="0jqblfmz02za3b2pgi15379bzgh98yv5kyv8kh0lkzhrmpgph2zj"; depends=[DescTools glmnet matrixStats SNPknock]; }; - epiR = derive2 { name="epiR"; version="1.0-11"; sha256="1f9v22g7pfsywq44pck436x0dxp6nxicl3jv0d5bbppzjyf1ghp7"; depends=[BiasedUrn survival]; }; + epiR = derive2 { name="epiR"; version="1.0-14"; sha256="134jswcln8y7fwphn8x926wxvb6ax848jcwnhfa8jzs6jw0f1csi"; depends=[BiasedUrn survival]; }; epibasix = derive2 { name="epibasix"; version="1.5"; sha256="0ivr51x37cbdryli9b4p4iq9v2c90zwmywrwdmg7ryq5vprvvbp0"; depends=[]; }; epicontacts = derive2 { name="epicontacts"; version="1.1.0"; sha256="0f4a1y311z3fxw7ygj6fgsq6d2qn0ivxsjlh742pkmg3jb63s0f3"; depends=[colorspace dplyr igraph magrittr threejs visNetwork]; }; epidata = derive2 { name="epidata"; version="0.3.0"; sha256="1b00k086wiwhhrlh4348wqqza1v0whakwy5h7q95rmgxz7lppiim"; depends=[dplyr httr jsonlite purrr readr rvest stringi tidyr xml2]; }; epiflows = derive2 { name="epiflows"; version="0.2.0"; sha256="09ri1p73ih0i08irc06ff169hi5vcl8bdi63b056kzxgmv17yqkp"; depends=[epicontacts geosphere ggmap ggplot2 htmltools htmlwidgets leaflet sp tibble visNetwork]; }; + epikit = derive2 { name="epikit"; version="0.1.0"; sha256="0whb36y8z5apyiywd2bhqnay3qr6b8h5rqp8mxkksrhifibjjx4w"; depends=[binom dplyr forcats glue rlang scales tibble tidyr tidyselect]; }; epimdr = derive2 { name="epimdr"; version="0.6-5"; sha256="1nxdlz7gl9vrha9iw92y0s9dmm101gkz0rsqxqg1rdxanr6hs6sh"; depends=[deSolve polspline shiny]; }; epinet = derive2 { name="epinet"; version="2.1.8"; sha256="10bgq66n99kkz0nhmsz508aypxk57zk19p5l3xrb28n72k4rfgrf"; depends=[network]; }; epiphy = derive2 { name="epiphy"; version="0.3.4"; sha256="04wsppjycnrzrml3zxrpr0xdxxas3hj8rskiivx5vfmfjpwipq4r"; depends=[ggplot2 msm pbapply Rcpp transport]; }; episcan = derive2 { name="episcan"; version="0.0.1"; sha256="02687f8gpc2czn19lapvazd6mnm8902ay0lhgi3wdrzfhir42m4r"; depends=[]; }; - episensr = derive2 { name="episensr"; version="0.9.4"; sha256="1cjfmj9alf46mpfzx7jfh6yrn7i4ldpnks28zxk42ln1zhb6jh6f"; depends=[actuar boot ggplot2 gridExtra magrittr plyr reshape trapezoid triangle]; }; + episensr = derive2 { name="episensr"; version="0.9.6"; sha256="193abdngrvxriv1dxjv0panf0whczli637xfs2fr05p588lljpr6"; depends=[actuar boot ggplot2 gridExtra magrittr plyr reshape trapezoid triangle]; }; episheet = derive2 { name="episheet"; version="0.4.0"; sha256="0y3wy91hr3b9iky5k81mf897wg2gcdv05afhndjqwcfb0xkn2f9q"; depends=[assertthat dplyr ggplot2 magrittr rlang tidyr]; }; episplineDensity = derive2 { name="episplineDensity"; version="0.0-1"; sha256="0nmh97xajnnh54i04yq8fdici4n5xvcbpdbjdbz79483gnils4vn"; depends=[nloptr pracma]; }; epistasis = derive2 { name="epistasis"; version="0.0.1-1"; sha256="0dfh26bs72i01hpxpgpgyiwpmg9mjpib8zynhc5ssxa0skm518wz"; depends=[glasso igraph Matrix tmvtnorm]; }; epitab = derive2 { name="epitab"; version="0.2.2"; sha256="0yi65bblsikwsa9i7wys1mqf6pp6j01kyc8xkyrhs5n62y1k68nc"; depends=[kableExtra knitr MASS survival xml2]; }; - epitools = derive2 { name="epitools"; version="0.5-10"; sha256="1qqa2kam3j3mkbgk62g6lwygk2fkdlrpbi27wl37j4dkdkvx013m"; depends=[]; }; + epitools = derive2 { name="epitools"; version="0.5-10.1"; sha256="0jqn3pas4lsans50jwakmvpyc7m7x0kxq6dzyckd3vgww56qa65l"; depends=[]; }; epitrix = derive2 { name="epitrix"; version="0.2.2"; sha256="1rqpvdky002h6mz636b77l4kd0im16pww62l6vnwh83si1m9pkki"; depends=[distcrete sodium stringi]; }; - eplusr = derive2 { name="eplusr"; version="0.11.0"; sha256="081qxdr2yhb3yyjgrxd94f11izlxv6x9s9ka1ms1wqhip8gkvssi"; depends=[callr cli crayon data_table lubridate processx progress R6 RSQLite stringi units]; }; + eplusr = derive2 { name="eplusr"; version="0.12.0"; sha256="1h8adyh1cjy3giqc3vj5gdx77h5fqfx44abw816k640h758lkjmp"; depends=[callr cli crayon data_table lubridate processx progress R6 RSQLite stringi units]; }; eply = derive2 { name="eply"; version="0.1.2"; sha256="0al44pvqf6ls3dh129vlv3g56hk1nbql09rj0qsb04d9kaz9anrp"; depends=[magrittr]; }; epoc = derive2 { name="epoc"; version="0.2.6-1.1"; sha256="1qlj4cl7mh5k52v2ippfs3cish5iadnix5w46p25hjqiriksclna"; depends=[elasticnet irr lassoshooting Matrix survival]; }; - epos = derive2 { name="epos"; version="0.1.0"; sha256="0b9r552hbrs281z7pxxw1hxgv9d15qmyzvgk5xsrgh8wivkh4lwp"; depends=[dplyr ggplot2 gridExtra hashmap stringr testthat tidyr TopKLists xtable]; }; + eponge = derive2 { name="eponge"; version="0.1.0"; sha256="19wd80l35acij793spxglcwz346i2iivk6n0q2304wjcca6qzds7"; depends=[rlang]; }; epr = derive2 { name="epr"; version="3.0"; sha256="0czfz6qkcpa2qqs3pqii27hgpdvdzfrvxl0ip67v58hamq7kvjfv"; depends=[car lme4]; }; epsiwal = derive2 { name="epsiwal"; version="0.1.0"; sha256="0lmcmiqcc1pjj1d0zyn0hc23if1lkm85p6vcjqbddpnv9ags2mbh"; depends=[]; }; epubr = derive2 { name="epubr"; version="0.6.1"; sha256="0rp9q6hriilps5h6nc1226w5dvzws1g78pg3ldrq2r4dakpvsmjj"; depends=[dplyr magrittr tibble tidyr xml2 xslt]; }; epxToR = derive2 { name="epxToR"; version="0.4-0"; sha256="1vw9czdxp80jpvcc8bj5m4fshlavlawc1735m0s0d0x14z3giy6g"; depends=[httr XML]; }; - eq5d = derive2 { name="eq5d"; version="0.5.0"; sha256="0h5vrrl1kgq1kp1xli8safp6iig526ib0lz1hs067awkvxnka5yn"; depends=[]; }; + eq5d = derive2 { name="eq5d"; version="0.7.0"; sha256="0k9hvazynphhpwpbxi9dgmrjqp0nlmgkikx6qpdg5hp2psl0lmyx"; depends=[]; }; eqn2svg = derive2 { name="eqn2svg"; version="0.1.0"; sha256="01hqmhjy62ic28jsx8zn0zg87pipxmd82795pj66661qkq306lb0"; depends=[htmltools magrittr]; }; eqs2lavaan = derive2 { name="eqs2lavaan"; version="3.0"; sha256="1lj6jwkfd84h9ldb6l74lrx2pnsl1c0d7mnrcrjkska87djb2nzd"; depends=[lavaan stringr]; }; eqtl = derive2 { name="eqtl"; version="1.1-7"; sha256="0xfr8344irhzyxs9flnqn4avk3iv1scqhzac5c2ppmzqhb398azr"; depends=[qtl]; }; @@ -7366,59 +7445,61 @@ in with self; { erboost = derive2 { name="erboost"; version="1.3"; sha256="09hlpn6mqsmxfrrf7j3iy8ibb2lc4aw7rxy21g3pgqdmd9sbprim"; depends=[lattice]; }; ercv = derive2 { name="ercv"; version="1.0.1"; sha256="0rs4yhm9sjnqkrgqqy6b8wj9fgk910hxc8d7zi4qwql0v1gid27l"; depends=[]; }; erer = derive2 { name="erer"; version="2.5"; sha256="0wgzd7r63d20vghmbilqn1p5033i5p31asya1gzwlipgyfxmqp0b"; depends=[lmtest systemfit tseries urca]; }; - ergMargins = derive2 { name="ergMargins"; version="0.1.0"; sha256="0f65150ahlxx75k72f2shmlryq5qbszl9p0qxxpl87sfpclsaa0x"; depends=[btergm ergm Matrix network numDeriv statnet xergm_common]; }; ergm = derive2 { name="ergm"; version="3.10.4"; sha256="08hzhc06sfchbq8kq5yvs7gxz0v6nvx0qdb2g6ac38n54cd0npw8"; depends=[coda dplyr lpSolve MASS Matrix network purrr rlang robustbase statnet_common tibble trust]; }; ergm_count = derive2 { name="ergm.count"; version="3.4.0"; sha256="1bvbqckssqj91q56nz17mrvadk1i2mm301z9rj8qkh8116fwf93w"; depends=[ergm network statnet_common]; }; ergm_ego = derive2 { name="ergm.ego"; version="0.5"; sha256="1vvyfjvkddc1qr189wqbp8sbqmd317y71ml9jjjjns3znahriqv3"; depends=[coda ergm network purrr RColorBrewer rlang statnet_common tibble]; }; ergm_rank = derive2 { name="ergm.rank"; version="1.2.0"; sha256="1vc96rjsqvs6ybnzkpv12h0hsrx2s96k4hjilzjpjnhbazh5vynz"; depends=[ergm network statnet_common]; }; ergm_userterms = derive2 { name="ergm.userterms"; version="3.10.0"; sha256="1aqrgdayh73dkr71gf8vawlj6qgv66pxr4klxgqb6ffan66b5p8g"; depends=[ergm network statnet_common]; }; ergmharris = derive2 { name="ergmharris"; version="1.0"; sha256="1bfijhsljlykb94wi25lbpv35zkmgqpmgzmxcq98gjvzbn5j9pdq"; depends=[]; }; + ergmito = derive2 { name="ergmito"; version="0.2-1"; sha256="0g823winannv0i0v4b1mdsivcgrmr1y7nr3iia4si7gvx3r07fgk"; depends=[ergm MASS network Rcpp RcppArmadillo texreg]; }; erp_easy = derive2 { name="erp.easy"; version="1.1.0"; sha256="193n45w0rq3cy0nmxvv0h6s3yr8kfjlg90nd4dnqlsq85zlsizij"; depends=[gtools plyr signal]; }; erpR = derive2 { name="erpR"; version="0.2.0"; sha256="1y6abc5fkcyyjh36maj1zbxppqzwd5wkvzvqahyvzsz5fqpjkcdx"; depends=[rpanel]; }; err = derive2 { name="err"; version="0.2.0"; sha256="1915b0vmqdd8whwdrqjphld1jaxawh5b7di6wf7q3sx779lblsrs"; depends=[]; }; errint = derive2 { name="errint"; version="1.0"; sha256="1ya7fsvwhmgxw87r32m4345n8pw2pbpv026xvml03s1kiam8qwbw"; depends=[rootSolve VGAM]; }; - errorist = derive2 { name="errorist"; version="0.0.2"; sha256="061v8z11sgzbhzcnyixfv9ff0vhiszjh0dy1rvzbyjsvjzmdimq0"; depends=[searcher]; }; + errorist = derive2 { name="errorist"; version="0.1.0"; sha256="0zq5h2wffn9d3f3blzh736478k91smlvz5hxy55hcjqffpxcp4ah"; depends=[searcher]; }; errorizer = derive2 { name="errorizer"; version="0.2.1"; sha256="10p7ydm81x2gls0wn692llgj2rxhg4s96rv7gvihmgi5dflraypq"; depends=[]; }; - errorlocate = derive2 { name="errorlocate"; version="0.2.0"; sha256="0lm0fp7b4ggx744b7kymman813rqw18qr7pd8r3j52spy3kq90lk"; depends=[lpSolveAPI validate]; }; + errorlocate = derive2 { name="errorlocate"; version="0.3.0"; sha256="04vr2ll3mdy1znm11lv739drckv82n45qbpda3qyjyzlffvgkmhg"; depends=[lpSolveAPI validate]; }; errors = derive2 { name="errors"; version="0.3.3"; sha256="037spyvw4rm2fcsq7a53svljlsgssrzrshyq01fnky0kq3z0iqqm"; depends=[]; }; + errum = derive2 { name="errum"; version="0.0.3"; sha256="18frrfnhnmg4fjlpfwj8aklzfwafpwqvagm0aschkqc8mz6wnjbz"; depends=[Rcpp RcppArmadillo]; }; es_dif = derive2 { name="es.dif"; version="1.0.1"; sha256="0cpncj68dhqfcpw7fjqc23d84rq767hqpw6la6iszfrrc27bx4lw"; depends=[]; }; esDesign = derive2 { name="esDesign"; version="1.0.2"; sha256="16dhddw4gp210bb1mmx5df1ziffadiz06s4i3znnzac8rv5564hp"; depends=[]; }; esaBcv = derive2 { name="esaBcv"; version="1.2.1"; sha256="0hgjcdbiy1a71vsb2vcyp0xmhy6wi4nlh1sqsfb2vxckc95i9i21"; depends=[corpcor svd]; }; esaddle = derive2 { name="esaddle"; version="0.0.6"; sha256="0i89yid4zryc95aj8n512wj3cs5nx351w4rc1nghq5a7vp139fa7"; depends=[doParallel mvnfast plyr Rcpp RcppArmadillo]; }; esaps = derive2 { name="esaps"; version="0.1.0"; sha256="1rchs4i7n221gyhj9kbka4zmi2lf72q3ak2pdxkr7w6pcx6803yz"; depends=[plyr readODS readxl]; }; esc = derive2 { name="esc"; version="0.5.1"; sha256="0gns7gz55p6pha05413r3hlvd7f2v1amxkg13d197mab1ypqic7q"; depends=[]; }; + escalation = derive2 { name="escalation"; version="0.1.1"; sha256="16dw8c6cjmzazchwxyh5x2gqpbiaqwrfbjiv7bp5b06kazy106s1"; depends=[BOIN dfcrm dplyr gtools magrittr purrr stringr tibble tidyr tidyselect]; }; eseis = derive2 { name="eseis"; version="0.5.0"; sha256="03pjcms3aj7sm2wrld64v1dw53bqn9pmsayndma03abjh66rblii"; depends=[caTools fftw IRISSeismic matrixStats multitaper raster Rcpp reticulate rgdal rmarkdown shiny signal sp XML]; }; eshrink = derive2 { name="eshrink"; version="0.1.0"; sha256="0s1jl652za7qwv70kmc1h3vbwlijl49527pwpm0z347lz2jdcigj"; depends=[glmnet MASS]; }; esmisc = derive2 { name="esmisc"; version="0.0.3"; sha256="1d6xrdxwn85c8s60s7vzaymh7wa9f7fzd79hq5spzd12fr3zisvj"; depends=[ggplot2 raster readr]; }; esmprep = derive2 { name="esmprep"; version="0.2.0"; sha256="076sm26mkkvig2g04k32z2dlp2h9gnqgzckhirl4pqm01siknl61"; depends=[lubridate]; }; - esquisse = derive2 { name="esquisse"; version="0.2.3"; sha256="0xx9d4xhcbbjc5nzwq0azhilkkn2q0q3xl1nbidj10c9f3ma699j"; depends=[ggplot2 ggthemes hrbrthemes htmltools jsonlite miniUI rlang rstudioapi scales shiny shinyWidgets stringi]; }; + esquisse = derive2 { name="esquisse"; version="0.3.0"; sha256="1cb30qmsxpkx62rjaasly13l00bvz03i9jq5apsr4fk26vw7gfrk"; depends=[ggplot2 htmltools jsonlite miniUI rlang rstudioapi scales shiny shinyWidgets stringi]; }; esreg = derive2 { name="esreg"; version="0.5.0"; sha256="1njwqm3hrcxwl6y7gwa4zq0q5139293qk503ahw23dxwzdsiy2z5"; depends=[Formula quantreg Rcpp RcppArmadillo]; }; essHist = derive2 { name="essHist"; version="1.2.2"; sha256="0rvlxfcl42h4pjqf37mx7bc4k21iwvnys6l5rf2jsl7yk1b9hmbn"; depends=[Rcpp]; }; essurvey = derive2 { name="essurvey"; version="1.0.5"; sha256="078bm5knrhij4rdv7hqv5ci0dfdci7lw4yrqbikp8miapivv88vp"; depends=[haven httr rvest tibble xml2]; }; estatapi = derive2 { name="estatapi"; version="0.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.20.0"; sha256="0mrx14chg9qb90hlivn90l1jv9la4n1bkznbdx58ghli73k8dvdz"; depends=[Formula generics Rcpp RcppEigen rlang]; }; + estimatr = derive2 { name="estimatr"; version="0.22.0"; sha256="1kfih2fak7w9zqbhjgfrysdzrk4lpcx9p23x0gys4f9hxl9j1pm2"; depends=[Formula generics Rcpp RcppEigen rlang]; }; 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.9.1"; sha256="1hc90jcnbb69f8p5h2vv6qlnx2n1pzdpbk4xcqw6mi7472dsmz7l"; depends=[matrixStats quantmod Rcpp zoo]; }; - esvis = derive2 { name="esvis"; version="0.2.0"; sha256="0l4c87l9n94q14hwky7d7i4h9c5zh8r04zlcz9w4mx7ixfd34zir"; depends=[sfsmisc]; }; + esvis = derive2 { name="esvis"; version="0.3.0"; sha256="0h64m3ay4q1l7rgz7vscpnh2x6gkxzzkqkam1hkfnvmxiy2a95f2"; depends=[dplyr ggplot2 Hmisc magrittr purrr rlang sfsmisc tibble tidyr]; }; etable = derive2 { name="etable"; version="1.2.0"; sha256="17xahaf2fz1qgqjaw8qbnss95il6g47m3w00yqc5nkvv37gs0q7c"; depends=[Hmisc xtable]; }; etasFLP = derive2 { name="etasFLP"; version="1.4.0"; sha256="04d526yajakzivlcsz8631p0j482cbbgfpdmzkc9zr1m4495xxif"; depends=[fields mapdata maps rgl]; }; ether = derive2 { name="ether"; version="0.1.6"; sha256="1f3phh5vdfvlxqrpzsn6ysz0q3mbhr862fzsd3sp8m8qhry86cbx"; depends=[dplyr httr jsonlite Rmpfr]; }; - ethnobotanyR = derive2 { name="ethnobotanyR"; version="0.1.6"; sha256="1v1vsj1nzmgji6kzgfkdmy08ajn8iag4jzw0lwh81b3vmdx8f4g2"; depends=[circlize cowplot dplyr ggplot2 magrittr reshape]; }; + ethnobotanyR = derive2 { name="ethnobotanyR"; version="0.1.7"; sha256="13xbiywrw6ixby9s1ipwb45p9c96d75vw906fpzy6axdv2c4pp70"; depends=[circlize cowplot dplyr ggplot2 ggridges magrittr reshape]; }; etl = derive2 { name="etl"; version="0.3.8"; sha256="19m1sp3ryqb1gw7i9lh8dpmwbgy0c0dpsivj27wkr36bdhfvrfls"; depends=[DBI downloader dplyr janitor lubridate readr rlang rvest stringr tibble usethis xml2]; }; - etm = derive2 { name="etm"; version="1.0.5"; sha256="1yivbq8y0ijcl1m4nir4q9hp4pi6iphwxgjprygsdf7vp98wq677"; depends=[data_table lattice Rcpp RcppArmadillo survival]; }; + etm = derive2 { name="etm"; version="1.0.5.1"; sha256="0m41pm277sd50pharigcqzr1a2g92wnmdf6fcab6fx16ia2fzrm7"; depends=[data_table lattice Rcpp RcppArmadillo survival]; }; etma = derive2 { name="etma"; version="1.1-1"; sha256="0g9244yx50y1gw0f37hskbcgyv4nldmzr86v3rmf3afabmjbyzjj"; depends=[]; }; etrunct = derive2 { name="etrunct"; version="0.1"; sha256="0ayazgyqlc8jcqr03cwfmfhm4pck6xri1r6vkgqy4arqkrrnrcqr"; depends=[]; }; - eudract = derive2 { name="eudract"; version="0.9.0"; sha256="0idxccm3cqb34gjypbh635rlqvjgcwbmywp1cv41mz2g56kbrcnb"; depends=[dplyr magrittr tidyr xml2 xslt]; }; + eudract = derive2 { name="eudract"; version="0.9.2"; sha256="1yl72vhfaqq005h00bxafdqxpbm0qf9349gd9fq80h5vy20qrm3q"; depends=[dplyr magrittr tidyr xml2 xslt]; }; eulerian = derive2 { name="eulerian"; version="1.0"; sha256="0yhpnx9vnfly14vn1c2z009m7yipv0j59j3s826vgpczax6b48m0"; depends=[graph]; }; - eulerr = derive2 { name="eulerr"; version="6.0.0"; sha256="0pvyg91xamhmz4k1b18g96imkddk64d6dadg74v1mnbzjiq742wh"; depends=[GenSA polyclip polylabelr Rcpp RcppArmadillo]; }; + eulerr = derive2 { name="eulerr"; version="6.1.0"; sha256="1r7y01vj293r1lhxk4anqqq6k2gnflzx2a2sfsyf7ccqmw95w0cj"; depends=[GenSA polyclip polylabelr Rcpp RcppArmadillo]; }; europepmc = derive2 { name="europepmc"; version="0.3"; sha256="1ngqs1sqzkbwv98dd5z4cxj8bnz41wyd0g060a2vpqi3s99s4i2h"; depends=[dplyr httr jsonlite plyr progress purrr urltools xml2]; }; europop = derive2 { name="europop"; version="0.3.1"; sha256="1ym257bxr4a0dmln1j8x3pf87wrryzgqyzhvk61whc6n2bj62x1s"; depends=[]; }; - eurostat = derive2 { name="eurostat"; version="3.5.2"; sha256="02xixnsz04ll2kidv6kmcpgf8681p6brf2vcxhr0p0qcl0ibvpcw"; depends=[broom classInt countrycode curl dplyr httr jsonlite lubridate RColorBrewer readr RefManageR sf sp stringi stringr tibble tidyr]; }; - ev_trawl = derive2 { name="ev.trawl"; version="0.1.0"; sha256="14yhnhqq1gz2rfy13v1dybnf55pyyimajbarxyp7gaqnd66nfq3p"; depends=[eva evir fExtremes ghyp hypergeo testthat]; }; - eva = derive2 { name="eva"; version="0.2.5"; sha256="03hyzbqi2mgdrmzrjnwzvy0ndf7ha5959b63sgd1g0b998fibbmd"; depends=[EnvStats Matrix]; }; + eurostat = derive2 { name="eurostat"; version="3.6.1"; sha256="1l2j9fdq33ivb3wns5bdr1dccaf494vwbyya3f2gz2g8mc2qpn0a"; depends=[broom classInt countrycode curl dplyr httr jsonlite lubridate RColorBrewer readr RefManageR sf sp stringi stringr tibble tidyr tidyselect]; }; + evabic = derive2 { name="evabic"; version="0.0.1"; sha256="196gmq8v8a45zkk4qqr3hzbrrxnmwryb0q81bqcdap5zf4w7153x"; depends=[]; }; + evalITR = derive2 { name="evalITR"; version="0.1.0"; sha256="05nqcy9x3f2ks9xvzd3cd000q2kybdycgrlvz5pv7ipw1dlysgg2"; depends=[]; }; evaluate = derive2 { name="evaluate"; version="0.14"; sha256="0a2y7j534gbgixkwj9r1z76l2vssw4g1hznzbpclc076wkdqpj58"; depends=[]; }; evaluator = derive2 { name="evaluator"; version="0.4.1"; sha256="1h1s2n09i6r9w17lr8ry9acg6kfsmf3c4w45jdwvz1pmy1ss8whi"; depends=[cli crayon dplyr extrafont ggplot2 magrittr mc2d purrr readr readxl rlang rstudioapi scales stringi tibble tidyr vctrs viridis]; }; evclass = derive2 { name="evclass"; version="1.1.1"; sha256="00lbhcgswpv0amz0mb93kx9p91sf0d7zvxfw9i8x1zpmpfd6nhcj"; depends=[FNN]; }; @@ -7430,13 +7511,14 @@ in with self; { eventdataR = derive2 { name="eventdataR"; version="0.2.0"; sha256="11apbbj68x1kxpwvihf4ng7wxy54jl1aw7r9hyq6gn7h8sk6lpjn"; depends=[]; }; events = derive2 { name="events"; version="0.5"; sha256="1zka4ygymifs8snd7cabl11b5lg3f8g8370dkm9ybl40bn8vvqq2"; depends=[]; }; eventstream = derive2 { name="eventstream"; version="0.1.0"; sha256="0imrs872b6fjvw74smniiiicvizyign6wmwwybljk704cshzcy2f"; depends=[abind AtmRay changepoint dbscan glmnet MASS tensorA]; }; + evgam = derive2 { name="evgam"; version="0.1.1"; sha256="0hhhbawmaywv3fb2qclngdsa4bdmrrl1kgy297hdhmlg9nqzanp6"; depends=[mgcv Rcpp RcppArmadillo]; }; evian = derive2 { name="evian"; version="2.1.0"; sha256="1slnzq55gg3p16fs22v69mafiggiy5f70sj8fh65lc0hphybh6w2"; depends=[doParallel foreach ProfileLikelihood sandwich]; }; evidence = derive2 { name="evidence"; version="0.8.10"; sha256="02kqk95kx4nv13fg6z55a5rv6sq6lv8azg0jjxbkg1j6hg15p7ai"; depends=[LaplacesDemon lattice LearnBayes loo rstan rstanarm]; }; - evidenceFactors = derive2 { name="evidenceFactors"; version="1.00"; sha256="12wndimbygn7h57f3q0xmxmvqrcdj98f0a58m22z2l0vmym53rhb"; depends=[sensitivitymv]; }; + evidenceFactors = derive2 { name="evidenceFactors"; version="1.8"; sha256="0g9w1q8ir6qmvk5vvbpipiyias7nj74ks2h94ja7al8sz68gralx"; depends=[sensitivitymv]; }; evir = derive2 { name="evir"; version="1.7-4"; sha256="1h7a7z7v5k33y5hsdfczsri3vpbwspfgazhv4saknv2h11rgfpki"; depends=[]; }; evmix = derive2 { name="evmix"; version="2.12"; sha256="02rabc9snci00s1x7h0svfr66lmw1wjcdg0149wc52mnccsdaivf"; depends=[gsl MASS SparseM]; }; evobiR = derive2 { name="evobiR"; version="1.1"; sha256="0502xj1gv2g943vfqyllz4sr5z4mixf5vqlqi2v96mymnv9iwsr8"; depends=[ape geiger phytools seqinr shiny]; }; - evolqg = derive2 { name="evolqg"; version="0.2-6"; sha256="1jc6mndlmd0y8wxcqqrlyk211i4ay3yna9clm0p1cnxy4cbn8lq5"; depends=[ape coda expm ggplot2 igraph Matrix matrixcalc MCMCpack mvtnorm plyr Rcpp RcppArmadillo reshape2 vegan]; }; + evolqg = derive2 { name="evolqg"; version="0.2-7"; sha256="1ib39whfx1hpjgy8g9pfcix1ki7w6bf2ka8z15avcmj32jl8ns6f"; depends=[ape coda expm ggplot2 igraph Matrix matrixcalc MCMCpack mvtnorm plyr Rcpp RcppArmadillo reshape2 vegan]; }; evolvability = derive2 { name="evolvability"; version="1.1.0"; sha256="0lbyidb86yzvcfw86jfwnzbpijn64jr8fasycqq4h3r9c0x2by3j"; depends=[coda]; }; evoper = derive2 { name="evoper"; version="0.5.0"; sha256="064fcpd04ws8v6sl0bakiw34jmmfpg1w5pkq94y2gh1c576x4vwz"; depends=[boot data_table deSolve futile_logger ggplot2 plot3D plyr reshape RNetLogo rrepast]; }; evt0 = derive2 { name="evt0"; version="1.1-3"; sha256="08sbyvx49kp3jsyki60gbbnci26d6yk0yj2zcl4bhfac8c3mm6ya"; depends=[evd]; }; @@ -7449,14 +7531,14 @@ in with self; { exactLoglinTest = derive2 { name="exactLoglinTest"; version="1.4.2"; sha256="0j146ih9szzks9r45vq1jf47hrwjq081q1nsja5h1gpllks8217h"; depends=[]; }; exactRankTests = derive2 { name="exactRankTests"; version="0.8-31"; sha256="1154dkcid3njhamdp87qs9bnx7l8bdqkcjsds9q9f2xmizs9x8gw"; depends=[]; }; exactci = derive2 { name="exactci"; version="1.3-3"; sha256="03r35f6dyrck5pf43ypb1sjwfnvkhjkm1mbms3wh67ayfs2ypn0s"; depends=[ssanv]; }; - exactextractr = derive2 { name="exactextractr"; version="0.1.2"; sha256="18f01431cs4dziq3x77pni7axvmnh2hnvs97jh9sbanjdx6iqvj2"; depends=[raster Rcpp sf]; }; + exactextractr = derive2 { name="exactextractr"; version="0.2.1"; sha256="0wspmg4vb96yq38g17f10q54k8ijpzlhh3hac1d2dn9zgk3riffh"; depends=[raster Rcpp sf]; }; exactmeta = derive2 { name="exactmeta"; version="1.0-2"; sha256="1v807ns799qajffky4k18iah0s3qh2ava6sz5i85hwx9dhkz19h4"; depends=[]; }; exampletestr = derive2 { name="exampletestr"; version="1.5.2"; sha256="0lfhgjirsl2b1vksjfrw3wlvw6x34d20vldh313qkjrg2yihpk1q"; depends=[checkmate filesstrings fs glue magrittr ore purrr readr rlang roxygen2 stringr styler usethis withr]; }; - exams = derive2 { name="exams"; version="2.3-4"; sha256="1sa76qnzf7llj97xc41l2s8n4fqlg1wcvyq9sq59f1blfwxcnnd7"; depends=[]; }; + exams = derive2 { name="exams"; version="2.3-6"; sha256="1cn0gmaayv857zl7l7zmnblmpx84qkjxqrigrymy578y04qjc4zx"; depends=[]; }; exceedProb = derive2 { name="exceedProb"; version="0.0.1"; sha256="02pb8b0rxygbv6501rcr2hb0bhz1r78k5znav161kk25fb9bxs5v"; depends=[BH Rcpp]; }; - excelR = derive2 { name="excelR"; version="0.3.1"; sha256="15frhi1laiwbd2izfm91ilvzcyl97svmx6slca5j2c6v5db3vzmq"; depends=[htmlwidgets jsonlite]; }; + excelR = derive2 { name="excelR"; version="0.4.0"; sha256="1pb4sy54zjv5vrh7gjjv7qlpab74km6mfsmfyl0yhmr0jx01hrw0"; depends=[htmlwidgets jsonlite]; }; excerptr = derive2 { name="excerptr"; version="2.0.0"; sha256="1xglpg9i45dd103ahj46lin42x9c8lgff2b5c4k3799gaki9sjzz"; depends=[checkmate reticulate]; }; - excursions = derive2 { name="excursions"; version="2.4.4"; sha256="140p0vks40vsj1bi89rhdqih5jh7795pxzzqm9140vfiv8b0aya5"; depends=[Matrix sp]; }; + excursions = derive2 { name="excursions"; version="2.4.5"; sha256="13as2zwwa1fbbcrdda10v1lbkkj9mazyhrzckndfbvpnskm10wb6"; depends=[Matrix sp]; }; exdex = derive2 { name="exdex"; version="1.0.1"; sha256="15wdi24fq8q4ja4527k1adv6lkzyhylp8nwlsrb91q0sbmmprrqs"; depends=[chandwich Rcpp RcppArmadillo RcppRoll]; }; exif = derive2 { name="exif"; version="0.1.0"; sha256="12phqn5x1x0xs2xczl3064q983dalm261vqpyafhdcndm1y3gwbc"; depends=[Rcpp]; }; exifr = derive2 { name="exifr"; version="0.3.1"; sha256="0394f04wq5dnqbnbaq7gxv4ggis4kf3b8dhhjzlybsbip6nmv54x"; depends=[curl jsonlite plyr rappdirs tibble]; }; @@ -7469,15 +7551,14 @@ in with self; { expert = derive2 { name="expert"; version="1.0-0"; sha256="0y9vcigvzhymalpv31b9nvmr86z1dz7x29yj838vks0dsv23rgrf"; depends=[]; }; expint = derive2 { name="expint"; version="0.1-6"; sha256="0iai25cglcdnf44d2d1fz1xpw4q600my4zq4493fk4cs5673mlf7"; depends=[]; }; explor = derive2 { name="explor"; version="0.3.5"; sha256="1v3z067w5kskwr0wmrr26m3yfsmg9pf17ma9ck2srgyxqmddc0sj"; depends=[dplyr DT formatR ggplot2 highr RColorBrewer scatterD3 shiny tidyr]; }; - explore = derive2 { name="explore"; version="0.5.3"; sha256="0fji8klf2wxrkyp1vdlcvj8i0b9c4c68qvsakbm45fnyz20q3v4a"; depends=[assertthat broom DBI dplyr DT forcats ggplot2 gridExtra magrittr MASS odbc rlang rmarkdown rpart rpart_plot shiny stringr tibble]; }; + explore = derive2 { name="explore"; version="0.5.5"; sha256="0xivjnbic4jnbr21l1rvs2799qhkk3jrwsgdlgnmr6s6ddnqiif7"; depends=[assertthat broom DBI dplyr DT forcats ggplot2 gridExtra magrittr MASS odbc rlang rmarkdown rpart rpart_plot shiny stringr tibble]; }; exploreR = derive2 { name="exploreR"; version="0.1"; sha256="154j5wiiy9vqdvh1qvdkz2fdp2phcygbbjl7nj5nkn07xwxbsc77"; depends=[ggplot2]; }; expm = derive2 { name="expm"; version="0.999-4"; sha256="15k0acg2aqb2ajhwal6l7vhhp03m4lg579805d34554cl0kn9l2q"; depends=[Matrix]; }; - export = derive2 { name="export"; version="0.2.2"; sha256="03i3jk4b9q1sak6m36p349bzqcwfq3bw6y8sgrw65475mrwipm4m"; depends=[broom flextable officer openxlsx rgl rvg stargazer xml2 xtable]; }; expose = derive2 { name="expose"; version="0.0.3"; sha256="0dlxlxm3g9d8vmgp13i1825z1jzah94ih1vyif46s43xq0nf9anj"; depends=[e1071 foreach gam ggplot2 glmnet Matrix nnet polspline RColorBrewer Rcpp repmis SuperLearner xgboost]; }; expp = derive2 { name="expp"; version="1.2.4"; sha256="00r5f80wnz91n0ksp1dvrxpd6zyfis2v3rizsnm7qqnnwj3d4q1c"; depends=[deldir rgeos sp spatstat spdep]; }; expperm = derive2 { name="expperm"; version="1.6"; sha256="0cybna0q3qn3slyc4lv5rby4pr0xkwq0h6n7hl1zhsaqv4c2zc5b"; depends=[Rcpp]; }; expsmooth = derive2 { name="expsmooth"; version="2.3"; sha256="0alqg777g7zzbjbg86f00p2jzzlp4zyswpbif7ndd0zr8xis6zdc"; depends=[forecast]; }; - expss = derive2 { name="expss"; version="0.10.1"; sha256="0pqvv8y3v00ymamz0xxbccb1pyic6h62hr5qm4hyw2sa82hh74dp"; depends=[data_table foreign htmlTable magrittr matrixStats]; }; + expss = derive2 { name="expss"; version="0.10.2"; sha256="15f5xdapqx3bhw3xdlx5v76mmbyd72qkyn1adwxiclx03sylqjf2"; depends=[data_table foreign htmlTable magrittr matrixStats]; }; expstudies = derive2 { name="expstudies"; version="0.0.5"; sha256="07li3lf7gnziws452arv38dayc30dym30qkw5d3ifp6za1aih5pv"; depends=[dplyr lubridate magrittr Rcpp]; }; exptest = derive2 { name="exptest"; version="1.2"; sha256="0wgjg62rjhnr206hkg5h2923q8dq151wyv54pi369hzy3lp8qrvq"; depends=[]; }; exreport = derive2 { name="exreport"; version="0.4.1"; sha256="0vj60rchhrc5q6x1kv7b95fcmh2a5qynli2w54rrrw1nx54xm8c2"; depends=[ggplot2 reshape2]; }; @@ -7495,14 +7576,15 @@ in with self; { extrafont = derive2 { name="extrafont"; version="0.17"; sha256="0b9k2n9sk23bh45hjgnkxpjyvpdrz1hx7kmxvmb4nhlhm1wpsv9g"; depends=[extrafontdb Rttf2pt1]; }; extrafontdb = derive2 { name="extrafontdb"; version="1.0"; sha256="115n42hfvv5h4nn4cfkfmkmn968py4lpy8zd0d6w5yylwpzbm8gs"; depends=[]; }; extraoperators = derive2 { name="extraoperators"; version="0.1.1"; sha256="1clyp97ssmdq9ggbv3w5yskx7khnlm4ji7ym3k3b4bx1pazcw4q4"; depends=[]; }; - extremeIndex = derive2 { name="extremeIndex"; version="0.0.1"; sha256="0qyf7ban7cm9fnznbf78xffcfp5sc32s7kb3wn53mc5abgiad90b"; depends=[boot evd evir gmm goftest]; }; + extraterrestrial = derive2 { name="extraterrestrial"; version="0.1.0"; sha256="0clss1zwgw1497n2xif82kplr1w1ajs4xs02041ads3l8craj7y1"; depends=[]; }; + extremeIndex = derive2 { name="extremeIndex"; version="0.0.2"; sha256="1zdw6ik2jh1fir01ay3ynw1l756ba05d5vqqcphnawvg0jkvhxvk"; depends=[boot evd evir gmm goftest]; }; extremeStat = derive2 { name="extremeStat"; version="1.4.0"; sha256="0fvkvlm47ri05w9h5qa937ijsc5lg51jc825wq9pmn7aiv58yxzm"; depends=[berryFunctions evd evir extRemes fExtremes ismev lmomco pbapply RColorBrewer Renext]; }; extremefit = derive2 { name="extremefit"; version="1.0.2"; sha256="07gx6dp0kz4y1jn90hsfvkhn6k7i4flh7ghdz9v5nwda86f55q2s"; depends=[]; }; extremevalues = derive2 { name="extremevalues"; version="2.3.2"; sha256="0pyngxljdnjwnbwcb0gmxcirv70r1s1wyq4m1wm5rprpdj8v9xil"; depends=[gWidgets gWidgetstcltk]; }; extremis = derive2 { name="extremis"; version="0.90"; sha256="1cnwn70d9swks5b2y915l18gky9v23vaqlaaggshi0ghn3snb4sm"; depends=[emplik]; }; extremogram = derive2 { name="extremogram"; version="1.0.2"; sha256="13k869v6j4ik9p8w0gf1absvb45xbd3nnwghsz0ix7y0vyvry358"; depends=[boot MASS]; }; exuber = derive2 { name="exuber"; version="0.3.0"; sha256="1g0cr7lgj8j5qdvrm7zmafhqafi1iwln590pcmfrfs37cynd5fkx"; depends=[cli doSNOW dplyr foreach generics ggplot2 glue gridExtra lubridate purrr Rcpp RcppArmadillo rlang tibble tidyr zoo]; }; - eyeTrackR = derive2 { name="eyeTrackR"; version="1.0.0"; sha256="1spv9167fw0nkwm98l5dkl9xs293c624gh87zrisjq4b4xawgxgx"; depends=[data_table plyr stringr]; }; + eyeTrackR = derive2 { name="eyeTrackR"; version="1.0.1"; sha256="14m7l8v0ry1ami1jl0xjp743m1ycklgfwi06vk5amppdp5w3w3qr"; depends=[data_table plyr stringr]; }; eyelinker = derive2 { name="eyelinker"; version="0.2.0"; sha256="14rfcdxad9iazwd46q6bm8gg1ryh6s8kf7arj00hhb7xz3gvk9c2"; depends=[intervals readr stringi stringr tibble]; }; eyetracking = derive2 { name="eyetracking"; version="1.1"; sha256="0ajas96s25hjp3yrg42hp78qjhl1aih04mjirkskx32qsyq5hfpv"; depends=[]; }; eyetrackingR = derive2 { name="eyetrackingR"; version="0.1.8"; sha256="18bz8fhy2hph7h8mm7hdhjfhi5gznj4qcl05rk3n99hkxl24qn73"; depends=[broom dplyr ggplot2 lazyeval purrr tidyr zoo]; }; @@ -7514,43 +7596,42 @@ in with self; { ezknitr = derive2 { name="ezknitr"; version="0.6"; sha256="060a2175zh1nhzmqgz1mpj2c6721n5w5bv695jj4rbl2s2b2h4qj"; depends=[knitr markdown R_utils]; }; ezmmek = derive2 { name="ezmmek"; version="0.2.1"; sha256="06cjp0hbq4blg7jj0jzp372xi1vgd1nwp27nzfsbchszn3j85lgf"; depends=[assertable dplyr ggplot2 magrittr nls2 purrr scales tidyr]; }; ezpickr = derive2 { name="ezpickr"; version="2.0.0"; sha256="1x7v7zsr8hjrwi48dkryqryp607550gs77b058qcdgcdznlqwzp2"; depends=[haven jsonlite magrittr mboxr purrr readxl rmarkdown stringr textreadr tibble vroom writexl]; }; - ezplot = derive2 { name="ezplot"; version="0.3.1"; sha256="1cs5i3ik6q6s30z8nh6ckc68vcqkf1hnzy3wn6d0rypmny7jkfkc"; depends=[dplyr forcats ggplot2 rlang]; }; + ezplot = derive2 { name="ezplot"; version="0.4.0"; sha256="0w3hf0a8q897v452cgr7hkw7354ifmp8paw646sy98n2ykyz506l"; depends=[dplyr forcats ggplot2 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=[]; }; fAsianOptions = derive2 { name="fAsianOptions"; version="3042.82"; sha256="13p1r93rgnf03wj0kkfpw4w4dlzd1ypkam50xqpjfm38qm4zvkds"; depends=[fBasics fOptions timeDate timeSeries]; }; fAssets = derive2 { name="fAssets"; version="3042.84"; sha256="0aj3gjd54ajviikwh075bympw7dx2dcsgj5p8j96vx2qbbwjmgvb"; depends=[ecodist energy fBasics fMultivar MASS mvnormtest robustbase sn timeDate timeSeries]; }; - fBasics = derive2 { name="fBasics"; version="3042.89"; sha256="0x6s6js52sz0rv3y66ax1bkf4mn9ihjmkyrm5clf7ymw5hvd5f5q"; depends=[gss MASS spatial stabledist timeDate timeSeries]; }; + fBasics = derive2 { name="fBasics"; version="3042.89.1"; sha256="1m8x1f9kvsbdcn3ys24hw0vgbxrzdrcp11ai0s3pilp7q91j095d"; depends=[gss MASS spatial stabledist timeDate timeSeries]; }; fBonds = derive2 { name="fBonds"; version="3042.78"; sha256="1yb5vyqj66m82xks5qi5cnsppylpprbk656z4lxzg30873hi8pcf"; depends=[fBasics timeDate timeSeries]; }; fCertificates = derive2 { name="fCertificates"; version="0.5-4"; sha256="1a49gkzvb83lqqw65lxlaszpicn663hwi9wrbsb3f6z7znylkzaf"; depends=[fBasics fExoticOptions fOptions]; }; - fChange = derive2 { name="fChange"; version="0.2.1"; sha256="1kg0rja62ds8ajazcajkh6jyc9qn3czd3fs2bhrbjcpav13ld51x"; depends=[fda lattice reshape2 sandwich sde]; }; - fCopulae = derive2 { name="fCopulae"; version="3042.82"; sha256="10wknqrrs5j63v7qnp5qmk85688r36vli4r99i49y2i2nv10yp5r"; depends=[fBasics fMultivar timeDate timeSeries]; }; - fDMA = derive2 { name="fDMA"; version="2.2.4"; sha256="0lpp6gyynfziyn5ar3wlq628b5lvw5dhxzw6wr5xwwfaarqf7qfx"; depends=[doParallel foreach forecast gplots iterators itertools MSwM png psych Rcpp RcppArmadillo tseries xts zoo]; }; + fCopulae = derive2 { name="fCopulae"; version="3042.82.1"; sha256="005ydbgyz7b1g3l2dn4r46113siyza9ag27f51r28md885dnbjpi"; depends=[fBasics fMultivar timeDate timeSeries]; }; + fDMA = derive2 { name="fDMA"; version="2.2.5"; sha256="12frifhrwmkkmlm28nc48985r8543f28xy13nyfa8xigyj3mcz40"; depends=[doParallel foreach forecast gplots iterators itertools MSwM png psych Rcpp RcppArmadillo tseries xts zoo]; }; fExoticOptions = derive2 { name="fExoticOptions"; version="3042.80"; sha256="1b3y7j5ywic6xhsj2afq6y5f5l0npgav854rb87938rjckz95d4h"; depends=[fBasics fOptions timeDate timeSeries]; }; fExpressCertificates = derive2 { name="fExpressCertificates"; version="1.3"; sha256="0dcfwl0ib87p748hvwscm5ii9fhfarqfl3zqxa8kin2n0hrvkdb6"; depends=[fCertificates fExoticOptions fOptions Matrix mvtnorm tmvtnorm]; }; fExtremes = derive2 { name="fExtremes"; version="3042.82"; sha256="1n0afql4csgsqf7j9x2v8yxncvpknms643l9knm0fqb4pdbaw58c"; depends=[fBasics fGarch timeDate timeSeries]; }; - fGarch = derive2 { name="fGarch"; version="3042.83.1"; sha256="0cmdjw419iad0f7iv1wjznddiag6khp4k011hz85nr5hrzzj3c1d"; depends=[fastICA fBasics Matrix timeDate timeSeries]; }; - fICA = derive2 { name="fICA"; version="1.1-0"; sha256="0lfs31clax57qsrriq9wxjrjv2bckl7lf1csffzfwiqm6sp6mgxg"; depends=[JADE Rcpp RcppArmadillo]; }; + fGarch = derive2 { name="fGarch"; version="3042.83.2"; sha256="06c6f07bg05cbn7s40ak6ywyja4cfbznazj5my9rcyahjvc6b553"; depends=[fastICA fBasics Matrix timeDate timeSeries]; }; + fICA = derive2 { name="fICA"; version="1.1-1"; sha256="0bnvhpr5w84bb8147gx5jwpz762b462nddgagv9ylhra3wxp44mz"; depends=[JADE Rcpp RcppArmadillo]; }; fImport = derive2 { name="fImport"; version="3042.85"; sha256="0rm4mwhk5ial016vl6dny8s87gd5i9p04akdyg2fndpcqwfmb5lc"; depends=[timeDate timeSeries]; }; - fMultivar = derive2 { name="fMultivar"; version="3042.80"; sha256="0d9ijyjqqnzvy04ncx4vqd38gvgprrnzwiy5mn61wj9a4zsfgnbc"; depends=[cubature fBasics mvtnorm sn timeDate timeSeries]; }; + fMultivar = derive2 { name="fMultivar"; version="3042.80.1"; sha256="0v61sf9x54ymka9x15vz38afj1lxmgfpcwrr73lzhccf6ci6fx9m"; depends=[cubature fBasics mvtnorm sn timeDate timeSeries]; }; fNonlinear = derive2 { name="fNonlinear"; version="3042.79"; sha256="0kwjs7xx4ykw14mw3pff2axrq497jl4g23gbayswb8vrx1qhjibd"; depends=[fBasics timeDate timeSeries]; }; fOptions = derive2 { name="fOptions"; version="3042.86"; sha256="1cqyggb1hb7z0gfgkziynz7nm85z0fn3bvz1iwpy49yy8ll7rfzr"; depends=[fBasics timeDate timeSeries]; }; - fPortfolio = derive2 { name="fPortfolio"; version="3042.83"; sha256="05dprxn0h2cd13m84rb1s5n8nr9m4v4dslqmm99481rp66kgc004"; depends=[fAssets fBasics fCopulae kernlab MASS quadprog Rglpk rneos robustbase Rsolnp slam timeDate timeSeries]; }; + fPortfolio = derive2 { name="fPortfolio"; version="3042.83.1"; sha256="1knyrjgfzwf4ppvnb5n325p5f6sidr6q53ss0zw8binhj22gli4y"; depends=[fAssets fBasics fCopulae kernlab MASS quadprog Rglpk rneos robustbase Rsolnp slam timeDate timeSeries]; }; fRLR = derive2 { name="fRLR"; version="1.1"; sha256="005bmljxgvx8v87nz4l3ycg09sahyd34pg8arjz5gdc17d4mjjfc"; depends=[Rcpp]; }; fRegression = derive2 { name="fRegression"; version="3042.82"; sha256="0pi777xfk101g0r2qpcd0qxqqfnvck3sii990d946ljw6366mamc"; depends=[fBasics lmtest mgcv nnet polspline timeDate timeSeries]; }; fSRM = derive2 { name="fSRM"; version="0.6.4"; sha256="1n91gzjx9r3r3xl400w38miva0b69c0f23h2056kq9p1bax2nm86"; depends=[foreign ggplot2 gridExtra lavaan plyr reshape2 scales tcltk2]; }; fTrading = derive2 { name="fTrading"; version="3042.79"; sha256="0xnfg4npfdrvmp1n6vbsm7if16n5j83b7y1i2m5b34cqnlz9d69y"; depends=[fBasics timeDate timeSeries]; }; fUnitRoots = derive2 { name="fUnitRoots"; version="3042.79"; sha256="1hsv47dm0hx3s04g9h0bjdgi79zbfihnfxxdc2jskqp94yl7azsy"; depends=[fBasics timeDate timeSeries urca]; }; fabCI = derive2 { name="fabCI"; version="0.1"; sha256="123bc56nnx6hcj257imsd8sc6d0pggw08lf4m0lr90631gcm1mkn"; depends=[]; }; - fabMix = derive2 { name="fabMix"; version="4.6"; sha256="1xh3x9qbg61jgm80s2qrx43b55vmiam1i8mciijax8ipf56pk6j7"; depends=[coda corrplot doParallel foreach ggplot2 label_switching MASS mclust mvtnorm RColorBrewer Rcpp RcppArmadillo]; }; - fable = derive2 { name="fable"; version="0.1.1"; sha256="1h71slynwfsmv59yf7mm3gk3i56c5ggk3sd44fm83yhvv6080w3m"; depends=[dplyr fabletools Rcpp rlang tidyr tsibble]; }; - fabletools = derive2 { name="fabletools"; version="0.1.1"; sha256="0cbiqd7cx4kws9lhwydrjlcxcm46vl6srslzw1h5ljfmgjkvkf8p"; depends=[dplyr generics ggplot2 R6 rlang tibble tidyr tidyselect tsibble]; }; + fabMix = derive2 { name="fabMix"; version="5.0"; sha256="1gii3mdii9nw423xxn9mhv1pjbw967wdarn828w04zm9dkdcwm48"; depends=[coda corrplot doParallel foreach ggplot2 label_switching MASS mclust mvtnorm RColorBrewer Rcpp RcppArmadillo]; }; + fable = derive2 { name="fable"; version="0.1.2"; sha256="0v5nqxdjwvzanzzl0fcb04zlrah8irbz09grlhd04lz8mmj8n8ih"; depends=[dplyr fabletools Rcpp rlang tidyr tsibble]; }; + fabletools = derive2 { name="fabletools"; version="0.1.3"; sha256="16lkr26sl88vnww2fsqiqdv4ljk0y1fyha55g0sq4vsnypg9bhdz"; depends=[dplyr generics ggplot2 R6 rlang tibble tidyr tidyselect tsibble vctrs]; }; fabricatr = derive2 { name="fabricatr"; version="0.10.0"; sha256="0kh2mfgyqz3fpilc4wycxj3vihhbdnjzsjrsp88nmsk0p5mjmljj"; 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]; }; facilitation = derive2 { name="facilitation"; version="0.5.2"; sha256="0gyqa3njyynvdhfziq33xqc7cjhszii67mk8809ncvh6abkdx1hw"; depends=[animation Matrix Rcpp]; }; - factoextra = derive2 { name="factoextra"; version="1.0.6"; sha256="0bpsbcmp6jpa9qk53dhfzghrz98dh0h0n68brl7rjz724yjbvhn8"; depends=[abind cluster dendextend FactoMineR ggplot2 ggpubr ggrepel reshape2 tidyr]; }; + factoextra = derive2 { name="factoextra"; version="1.0.7"; sha256="1allvdjhd3pq8xz30b1cymwcik5iaahghrjrlnn54cwkfhfg0kv2"; depends=[abind cluster dendextend FactoMineR ggplot2 ggpubr ggrepel reshape2 tidyr]; }; factoptd = derive2 { name="factoptd"; version="1.0.3"; sha256="1ir50im3kr1xhqk4qwrm2h5fq9gqgrwshbamvjlf8n1wnn03mcb6"; depends=[MASS partitions]; }; + factor_switching = derive2 { name="factor.switching"; version="1.0"; sha256="14h8m73lmayvwgi2mnfggs2q1nr2apbsddr7m46ws22nyzz6q7am"; depends=[coda HDInterval lpSolve]; }; factorEx = derive2 { name="factorEx"; version="1.0.0"; sha256="12ykf42x5fqddlsvv3556sawfakribj0pwm5vfcg3y2y99a26qxg"; depends=[arm doParallel estimatr foreach genlasso igraph mvtnorm pbapply pbmcapply prodlim sandwich stringr]; }; factorMerger = derive2 { name="factorMerger"; version="0.4.0"; sha256="127k5h1gbbnjr6gxgck2n9glvvwkd69xq7n6gzmrq8gszk8v1x5m"; depends=[agricolae colorRamps dplyr forcats formula_tools ggplot2 ggpubr knitr magrittr MASS mvtnorm proxy reshape2 scales survival]; }; factorQR = derive2 { name="factorQR"; version="0.1-4"; sha256="1vl01fm5qfyhnqbl5y86vkr50b8cv07vzlqs3v6smqaqq6yp4lv4"; depends=[lattice]; }; @@ -7559,6 +7640,7 @@ in with self; { factorplot = derive2 { name="factorplot"; version="1.1-2"; sha256="025lfk122w66yxym3njcpzwnbhg40xi7p1c9vnxczcb8kz31745s"; depends=[multcomp nnet]; }; factorstochvol = derive2 { name="factorstochvol"; version="0.9.3"; sha256="15gamzznss9vfmbvbk61sgabxfsra2i49bs142jl1ahk7wchiskw"; depends=[corrplot GIGrvg Rcpp RcppArmadillo stochvol]; }; factory = derive2 { name="factory"; version="0.1.0"; sha256="1715bx2rn8kk5qd196jnrv5f95l54n4y0aqqdzfkgrmqihcy8ahx"; depends=[purrr rlang]; }; + factset_analyticsapi_engines = derive2 { name="factset.analyticsapi.engines"; version="3.0.1"; sha256="0v96z837dii1q7mbpd48zwpl2qjzqnhignb80g0xkc4iygsnrrms"; depends=[caTools httr jsonlite R6 rlang]; }; factset_protobuf_stach = derive2 { name="factset.protobuf.stach"; version="1.0.2"; sha256="0qdvgq0w58pb0bn4x5v25i8pvij3lc8l9x9bj68s9zb29ankl3ss"; depends=[R6 RProtoBuf]; }; factualR = derive2 { name="factualR"; version="0.5"; sha256="1wz8ibcmilcx62yy29nd2i1pdmjf7fm0g9i5s58gdn8cjlhnw1jl"; depends=[RCurl RJSONIO]; }; fad = derive2 { name="fad"; version="0.2-1"; sha256="09lbakil37fyji3bwydspzvrnwm0992x8783zyyv2jk37y0wr1ip"; depends=[Matrix Rcpp RSpectra]; }; @@ -7567,7 +7649,7 @@ in with self; { fairness = derive2 { name="fairness"; version="1.0.1"; sha256="1n17vrp0a3zii3444a2a7k33ffmyxmm15c8m7ln2fypya1z2pc5l"; depends=[caret devtools e1071 ggplot2 pROC]; }; 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.6.0"; sha256="019dwh7n7k2djrpm0kik5qn7w3ifszppmpraqn4jyddn1jmllsn3"; depends=[callr igraph MakefileR withr]; }; + fakemake = derive2 { name="fakemake"; version="1.7.0"; sha256="09z0pxpyk13m9bkw8b39axznrpa3l3ifrhfs3256il6kkq6sm749"; 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=[]; }; @@ -7587,7 +7669,7 @@ in with self; { fasstr = derive2 { name="fasstr"; version="0.3.1"; sha256="1msafxyx2xwgjw87yfbqqfn5ajfc6gla2nf41s6g4wjzg245n5zn"; depends=[dplyr e1071 fitdistrplus ggplot2 lubridate openxlsx PearsonDS plyr purrr RcppRoll scales tidyhydat tidyr zyp]; }; fast = derive2 { name="fast"; version="0.64"; sha256="098rk6kszdx3szcwvwzcv7zlcd6qvqvbqch7q8ilas6vbki81ba4"; depends=[zoo]; }; fastAdaboost = derive2 { name="fastAdaboost"; version="1.0.0"; sha256="1pv1y6znvc37pgwk99v4r0hljhipq8v6r3r5cb5vhgyl0bfi8g38"; depends=[Rcpp rpart]; }; - fastDummies = derive2 { name="fastDummies"; version="1.6.0"; sha256="0fkmc1kr11vf3pikj5is5951dx79705c7djfvg7bsbbvpvll0crj"; depends=[data_table tibble]; }; + fastDummies = derive2 { name="fastDummies"; version="1.6.1"; sha256="1vqpzrrahwabvpcfzzkgw98yxclsmjqrjzfa7jvd5dsz0bgil4r7"; depends=[data_table stringi tibble]; }; fastGHQuad = derive2 { name="fastGHQuad"; version="1.0"; sha256="1rjia8wggadr9xwxcmzmal0rc4g6pa3dr5888fbbnb6abl8b2lrj"; depends=[Rcpp]; }; fastGraph = derive2 { name="fastGraph"; version="2.1"; sha256="0lz199607hqpwxzhff4jzhmjq6cbakd335iyclmlscllgfzgnhql"; depends=[]; }; fastHICA = derive2 { name="fastHICA"; version="1.0.2"; sha256="1h794ybbii0k7v3x0r1499zxdqa1i1dpi3i7idzqdrffnb5kmwlv"; depends=[energy fastICA]; }; @@ -7595,8 +7677,7 @@ in with self; { fastJT = derive2 { name="fastJT"; version="1.0.5"; sha256="1knk4zjrkkv1i3a8n68vdrpxkwdkf19zw75p93hygfmbbz6r88v4"; 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="2.1.0"; sha256="0gjhprbgrvc42nzz6ya6331cgrfqn08q3vwnd3s3fd4a2ig5xn2k"; depends=[Matrix]; }; - fastR = derive2 { name="fastR"; version="0.10.3"; sha256="1sz6krxiamq3rp4h9ah2b1zvyyrlvsn7lpvrjv1xda2c1kqqkvmk"; depends=[lattice mosaic mosaicCalc mosaicData]; }; + fastNaiveBayes = derive2 { name="fastNaiveBayes"; version="2.2.0"; sha256="11cxylh68wy8q6j979ba5awghmav57gnyzmssra4az6p4i4wvv9i"; depends=[Matrix]; }; fastR2 = derive2 { name="fastR2"; version="1.2.1"; sha256="15mqsdy79zvd4srrszdjp0kh9lfcq3yxp7j5d4xcqbjbwsgy68il"; depends=[dplyr ggplot2 lattice maxLik miscTools mosaic numDeriv]; }; fastSOM = derive2 { name="fastSOM"; version="1.0.1"; sha256="1fzy7lfx1fn9993h0qh6vbwq0w4gfgbdrprmzb1z3aqq6nqvmngm"; depends=[]; }; fastStat = derive2 { name="fastStat"; version="1.3"; sha256="1f4554p487l7cig2xihfbgl55x7w04xbazd01pic0l8819mgmy5n"; depends=[car do e1071 ggplot2 ggrepel plyr reshape2 set survival tseries]; }; @@ -7610,21 +7691,22 @@ in with self; { fastdigest = derive2 { name="fastdigest"; version="0.6-3"; sha256="02csl261v7nassi5119ygw6jglm8q6rssg7lgyxzj73mkyilm832"; depends=[]; }; fasterElasticNet = derive2 { name="fasterElasticNet"; version="1.1.2"; sha256="1hr0wc6s6zpq1hkfgshf0dqjxb7s2849bb8lb04nmi6p42r3628g"; depends=[Rcpp RcppArmadillo]; }; fasteraster = derive2 { name="fasteraster"; version="1.1.1"; sha256="1ycr2h046jds2758xvxn00rhglx3zarbzn3r38j66j5pnz2iiq4f"; depends=[Rcpp]; }; - fasterize = derive2 { name="fasterize"; version="1.0.0"; sha256="0q8n1r5n06yr6vmnwrdajx8923646bzm7ywgn2f0zxl214plf56s"; depends=[raster Rcpp RcppArmadillo sp]; }; + fasterize = derive2 { name="fasterize"; version="1.0.2"; sha256="1sffpjp4ycn495qfzragqq73zd5ykbhkbw89yj65nnifcyr1krhl"; depends=[raster Rcpp RcppArmadillo sp]; }; fastglm = derive2 { name="fastglm"; version="0.0.1"; sha256="1vqw02j4y28mngki87r42f1mhlkvajqp2gpbvk0l2adrkz70l0bn"; depends=[Rcpp RcppEigen]; }; - fastlogranktest = derive2 { name="fastlogranktest"; version="0.1.0"; sha256="0c0cv0a0y97grjywlcp71z6cnjgvaih4bnf2f332iq2lh6kb0j1x"; depends=[BH Rcpp]; }; + fastlogranktest = derive2 { name="fastlogranktest"; version="0.1.1"; sha256="0plvflhf5xcgw62hxp67ryy60sci69cbzm7klv786h2gz62v5qms"; depends=[BH Rcpp]; }; fastmaRching = derive2 { name="fastmaRching"; version="1.1.0"; sha256="085xr5i6h6vwl1flzbkwqsm8d815s0p02p0mir60jqjvy0s7haip"; depends=[raster rgdal sp]; }; fastmap = derive2 { name="fastmap"; version="1.0.1"; sha256="1v7sp56xiha0bh78g3w92k52p9vkp7ryzpw0z66nyddxzrfv0y27"; depends=[]; }; fastmatch = derive2 { name="fastmatch"; version="1.1-0"; sha256="0z80jxkygmzn11sq0c2iz357s9bpki548lg926g85gldhfj1md90"; depends=[]; }; fastmit = derive2 { name="fastmit"; version="0.1.1"; sha256="13hczsfbzssd272kpbq8l2l64lqrkmi2j6f3xyp9jvvxdd506kq0"; depends=[Rcpp RcppArmadillo]; }; fastnet = derive2 { name="fastnet"; version="0.1.6"; sha256="16jdwvk1xhl6bn9fx5s8pzvbizx6c0jmg6arqf201a7ghw2wi4xh"; depends=[doParallel foreach igraph tidygraph]; }; - fastpos = derive2 { name="fastpos"; version="0.2.0"; sha256="117b2hi1x9qh9q39sdwg9g69r70axivwyb8qs1jk2yrfh9fbrz2k"; depends=[MASS plyr Rcpp RcppArmadillo RcppProgress]; }; + fastpos = derive2 { name="fastpos"; version="0.3.0"; sha256="0w11pfbnh0px33i2myfdzi2xhskc61dan1yf2h8hvsr5x7y490lw"; depends=[MASS plyr Rcpp RcppArmadillo RcppProgress]; }; fastpseudo = derive2 { name="fastpseudo"; version="0.1"; sha256="0paag4pjh3gs270j663bsl65sfrq43gk2zzqmalr03fmcckp6aaj"; depends=[]; }; fastqcr = derive2 { name="fastqcr"; version="0.1.2"; sha256="12x3lkg5zc4ckyg4x3xxqb779yhrr0fys7asf5b8shz49f86fmm9"; depends=[dplyr ggplot2 gridExtra magrittr readr rmarkdown rvest scales tibble tidyr xml2]; }; fastrtext = derive2 { name="fastrtext"; version="0.3.4"; sha256="0k38290pz92ysw57298nng7bbghf5cicvin7l9q6l89pk3qa5wp0"; depends=[assertthat Rcpp]; }; - fastshap = derive2 { name="fastshap"; version="0.0.4"; sha256="0ll1ak1ps24q2m8h71swszcm3p8qzj29gaaznihws3mvppkygc57"; depends=[abind ggplot2 gridExtra matrixStats plyr Rcpp RcppArmadillo tibble]; }; + fastshap = derive2 { name="fastshap"; version="0.0.5"; sha256="08f25ib5mry6h8lvj0g3clc9kfl5g2wdd8x8bw455wwmbcm6x5vg"; depends=[abind ggplot2 gridExtra matrixStats plyr Rcpp RcppArmadillo tibble]; }; fasttime = derive2 { name="fasttime"; version="1.0-2"; sha256="11i4c0zrkvvqsax0az1fvmc0jxfsjyx28434k1qgzhj9g2j9m9cf"; depends=[]; }; fat2Lpoly = derive2 { name="fat2Lpoly"; version="1.2.4"; sha256="01a9d6b2f6g858vg64kr0w0qmv2jqhk9kk3hb6jdr2rly4j8p14x"; depends=[kinship2 multgee]; }; + fauxnaif = derive2 { name="fauxnaif"; version="0.5.6"; sha256="1fgaj3rl2aqdf2x8z9lp8p5g7bfii98g4h2mmlhic4g135r7bznp"; depends=[glue magrittr rlang]; }; fauxpas = derive2 { name="fauxpas"; version="0.2.0"; sha256="0l77gxcf06p984z9vgaf1kag609h9qyrgav84lxkv97h6f3fflnc"; depends=[httpcode R6 whisker]; }; favnums = derive2 { name="favnums"; version="1.0.0"; sha256="0siax7gjr25lpf1li3hawx6nviggs68c0lap2d9i38azlhvj891w"; depends=[]; }; fbRads = derive2 { name="fbRads"; version="0.2"; sha256="1a65gfvizzm6psspcvlhkxligdf9j1whrgzkg7ww520lk3z8lnnd"; depends=[bit64 data_table digest futile_logger jsonlite plyr RCurl]; }; @@ -7641,57 +7723,56 @@ in with self; { fcros = derive2 { name="fcros"; version="1.6.1"; sha256="04yr6lqs38lczsmdvdm78qn63836qj7xwspgh3h3n3gh8cssd83x"; depends=[]; }; fcuk = derive2 { name="fcuk"; version="0.1.21"; sha256="1sb7p1m5qb88028mrw95lhh8l7dxj696hjh88nfsdpnscryknfpv"; depends=[magrittr purrr stringdist tibble]; }; fdANOVA = derive2 { name="fdANOVA"; version="0.1.2"; sha256="1pycq5a4czqzi8wcfmlc9ncg827j7n0qxyj90wcv39nbcrnl3da1"; depends=[doBy doParallel fda foreach ggplot2 magic MASS]; }; - fda = derive2 { name="fda"; version="2.4.8"; sha256="0n39rzbhg1hipzn51rzmbchn2358qgapg08iv7lmiqj5y7i9qns2"; depends=[Matrix]; }; - fda_usc = derive2 { name="fda.usc"; version="2.0.1"; sha256="0ii00vv4c4cvswd5vs82a1j7gbxl328bjxdk39r1xcd26iz94vlb"; depends=[doParallel fda foreach iterators MASS mgcv nlme]; }; + fda = derive2 { name="fda"; version="2.4.8.1"; sha256="0g50kj1dx7zarjv0lgwyzd2c7bv6di7nkndmywday5vjywgl8m7a"; depends=[Matrix]; }; + fda_usc = derive2 { name="fda.usc"; version="2.0.2"; sha256="0z44vkzjm2h6r5af0k1iic1szvw82rbwjrm541zlwn2jycj4q96a"; depends=[doParallel fda foreach iterators MASS mgcv nlme]; }; fdaACF = derive2 { name="fdaACF"; version="0.1.0"; sha256="19cnjs05cdln1jg568ybj1qsb8s848l8fzcw1p5i8rh92gm2x4w4"; depends=[CompQuadForm pracma]; }; fdaMixed = derive2 { name="fdaMixed"; version="0.6"; sha256="0hyhb67qvvhyq68k5h4ffvsl4lmw66nfy5l14kwxnn42h3b810sc"; depends=[Formula Rcpp RcppArmadillo]; }; - fdaPDE = derive2 { name="fdaPDE"; version="1.0"; sha256="15x5n48hn151j9h8bnqjyjnaq575mckz6dcb9lxr9zmwidg58gb2"; depends=[geometry Matrix plot3D plot3Drgl RcppEigen rgl]; }; fdadensity = derive2 { name="fdadensity"; version="0.1.2"; sha256="1i2xzchlsixgjzyfmbv547sy6mq90xrnyc2kpd11wwfgfrpj1ix3"; depends=[fdapace Rcpp]; }; fdakma = derive2 { name="fdakma"; version="1.2.1"; sha256="0j9qgblrl7v4586dd6v0hjicli6jh8pkk5lzn8afpl75xfs24six"; depends=[]; }; - fdapace = derive2 { name="fdapace"; version="0.5.1"; sha256="0i9y9vz676jspanbbrfbygyq5bxplcv4c5q4yql1y0r8zkg4xq2z"; depends=[Hmisc MASS Matrix numDeriv pracma Rcpp RcppEigen]; }; - fdasrvf = derive2 { name="fdasrvf"; version="1.9.2"; sha256="0hdxpin1ydc9sl9wp5axn6sj2mwlhndxya92ss1i8lj1cxmlz42d"; depends=[coda doParallel fields foreach matrixcalc mvtnorm Rcpp RcppArmadillo testthat tolerance viridisLite]; }; + fdapace = derive2 { name="fdapace"; version="0.5.2"; sha256="02kxd6604jnn0gg2bgpdalhhj390qyqk7zkzz2li5mgq8ym61n1p"; depends=[Hmisc MASS Matrix numDeriv pracma Rcpp RcppEigen]; }; + fdasrvf = derive2 { name="fdasrvf"; version="1.9.3"; sha256="148rkidnflrdjmid9p2m08qz0li21mibyr0ahqzhry14dcw24g01"; depends=[coda doParallel fields foreach matrixcalc mvtnorm Rcpp RcppArmadillo testthat tolerance viridisLite]; }; fdatest = derive2 { name="fdatest"; version="2.1"; sha256="0zdnmssir5jz2kbfz4f4xshjfv4pivqx7cbh2arlx6ypkjrjws8n"; depends=[fda]; }; fdcov = derive2 { name="fdcov"; version="1.1.0"; sha256="0savsgcifcjjqrmbpn6m30gncq5iigqxpb19l710wlx8nm98svjh"; depends=[corrplot matlab]; }; fdistr = derive2 { name="fdistr"; version="0.1.0"; sha256="1i9nq4jmszbmwk4m6jfn7rifsn7aay40cj6kz23b9ihj3phqffi8"; depends=[dplyr ggplot2 magrittr usethis]; }; - fdm2id = derive2 { name="fdm2id"; version="0.9.1"; sha256="0dnjhrwwk5lqb2niqakp4fi7k8jgzdzaw62bbrqp3y409m49kcy9"; depends=[arules car caret class cluster e1071 FactoMineR flexclust fpc glmnet ibr irr kohonen leaps MASS mclust mda meanShiftR NMF nnet pls questionr randomForest ROCR rpart Rtsne SnowballC stopwords text2vec wordcloud xgboost]; }; + fdm2id = derive2 { name="fdm2id"; version="0.9.3"; sha256="0ylr8843hdilzj2c38csxw98pvib9pgw25j7kbgw8531931xqls0"; depends=[arules car caret class cluster e1071 FactoMineR flexclust fpc glmnet ibr irr kohonen leaps MASS mclust mda meanShiftR nnet pls questionr randomForest ROCR rpart Rtsne SnowballC stopwords text2vec wordcloud xgboost]; }; fdq = derive2 { name="fdq"; version="0.11"; sha256="1lzv1pmzjixp8wpap0w3lad1ns9z2hjbxkfpyp9jy9mxprj1w3q9"; depends=[data_table Fgmutils ggplot2 plyr randomcoloR sqldf]; }; fdrDiscreteNull = derive2 { name="fdrDiscreteNull"; version="1.3"; sha256="17nzqy4i1c5kcqyps52827q5apyjn4znb1ql4qvfm8v2m1fvily3"; depends=[MCMCpack qvalue]; }; fdrci = derive2 { name="fdrci"; version="2.1"; sha256="1sgrsmlz7sbr1maw3qnpzqz3z75fh5nyiibpsq8j0y12xac8d0x3"; depends=[]; }; fdrtool = derive2 { name="fdrtool"; version="1.2.15"; sha256="1h46frlk7d9f4qx0bg6p55nrm9wwwz2sv6d1nz7061wdfsm69yb5"; depends=[]; }; fds = derive2 { name="fds"; version="1.8"; sha256="1284vncixrzrz9x6b52gslrbrbia07sd0xac7nwdqhp5f5v5wfi0"; depends=[rainbow RCurl]; }; fdth = derive2 { name="fdth"; version="1.2-1"; sha256="0rr9p2rns5ws111iqcicrlpcv47fkbxf161yxkkzfs2l3f1kgw14"; depends=[]; }; - feasts = derive2 { name="feasts"; version="0.1.2"; sha256="139ra1dgh6zy862gyr2w2agdrhplhh3rv7zv8k5vhi06sm59zggs"; depends=[dplyr fabletools ggplot2 lubridate rlang scales tibble tidyr tsibble]; }; + feasts = derive2 { name="feasts"; version="0.1.3"; sha256="16fzwgyhb99cxn6ynq3qxdzf0gyqjh9q7sa9ma5rr23cr460rsab"; depends=[dplyr fabletools ggplot2 lubridate rlang scales slider tibble tidyr tsibble vctrs]; }; feather = derive2 { name="feather"; version="0.3.5"; sha256="1gxd0h2m56sjjlzn4dry6s13nddxc4l5i11gsvavaf2dwbahdzsh"; depends=[hms Rcpp tibble]; }; feature = derive2 { name="feature"; version="1.2.13"; sha256="07hkw0bv38naj2hdsx4xxrm2dngi6w3rbvgr7s50bjic8hlgy1ra"; depends=[ks misc3d rgl]; }; featurefinder = derive2 { name="featurefinder"; version="1.1"; sha256="024g3adhxx1ynl9wnc2yl3illj4347ak6wkfmvqxfwd6llsa79ld"; depends=[plyr rpart rpart_plot]; }; features = derive2 { name="features"; version="2015.12-1"; sha256="0rd8r1dxzddb6718hcm8ck7531c9wdrjfy8n67875bbxgzcvds61"; depends=[lokern]; }; featuretoolsR = derive2 { name="featuretoolsR"; version="0.4.3"; sha256="1qgk9z8ld9yyw37r3birbds4a7jffq3qqkvlnldvz3yk81ir7kw7"; depends=[caret cli dplyr magrittr purrr reticulate stringr testthat tibble]; }; featurizer = derive2 { name="featurizer"; version="0.2"; sha256="05jvwsvpbdj94q3wl7ld6xmfc9p7ff9zsmryd3mmxz0hzbq2cnkc"; depends=[]; }; - febr = derive2 { name="febr"; version="1.0.3"; sha256="0rpk9k33ykcb8m475p420hpc1rj64i29dq8h0r9d49yl90ixhrn6"; depends=[dplyr glue googlesheets pedometrics readr sp stringr xlsx]; }; + febr = derive2 { name="febr"; version="1.1.0"; sha256="12580kbssixrgpr147vw52h88i0wvvpj44pp1n0ivxzmmzbvpqrv"; depends=[dplyr glue pedometrics sf stringr]; }; fechner = derive2 { name="fechner"; version="1.0-3"; sha256="0bassigcipwlr2g8cdjh8jyhmb903k3hla9gnigcbz7qwzlfwa86"; depends=[]; }; federalregister = derive2 { name="federalregister"; version="0.2.0"; sha256="0qr8nd3ylnwcv1wxspw5i7ray5sh30zr648spg0lpqq8dp2b8p7b"; depends=[curl httr jsonlite]; }; fedregs = derive2 { name="fedregs"; version="1.0.0"; sha256="171j6r6qxnx9gk9x9gpdyh51ssrgmf7sczc4889qr3qqw15sm4bn"; depends=[dplyr httr magrittr purrr rvest stringi tidyr tidytext xml2]; }; fedreporter = derive2 { name="fedreporter"; version="0.2.1"; sha256="18hs358iyxmbh28jy9f65zvanpr6bk4gq75qbj255y1zzdsjr9x1"; depends=[httr jsonlite]; }; feedeR = derive2 { name="feedeR"; version="0.0.7"; sha256="08mnfi96qkr1fj53ywqmya957swcwrfd3hqk0qaf2ni96sxxnp98"; depends=[digest dplyr lubridate RCurl XML]; }; feisr = derive2 { name="feisr"; version="1.0.1"; sha256="0pwaj509qz6z4rz54b10xmv2476qygmrm4bpc3szah6pf2pf0zmm"; depends=[aod Formula plm Rdpack]; }; + fellov = derive2 { name="fellov"; version="0.1"; sha256="0z4b08ykajzwa5852dknqz5qqlmhklbwdq8x5zhyfmwba5zfbjav"; depends=[]; }; felp = derive2 { name="felp"; version="0.2.2"; sha256="1kd2619cj8697l1zpigz78vshc5gd8yvrg7zmw3mik7pjafz1k32"; depends=[prettycode]; }; fence = derive2 { name="fence"; version="1.0"; sha256="18l3fliww60d9n9hbfdny5vr9mi78krwpjj5sypdsb77d6332h9q"; depends=[fields ggplot2 lme4 MASS sae snow snowfall]; }; fergm = derive2 { name="fergm"; version="1.1.4"; sha256="1d979z2m5f13i1w9d8kh9rnaafavsap169w0nycpd5j2f3dfhyn7"; depends=[ergm extrafont ggplot2 matrixStats network reshape2 rstan]; }; fermicatsR = derive2 { name="fermicatsR"; version="1.4"; sha256="1587f67fypj22rdi1319zq765lcc9z518bzl1jr4lz6c8lrzfm9i"; depends=[]; }; - 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]; }; + ffbase = derive2 { name="ffbase"; version="0.12.8"; sha256="0mjk7dkq1ginqqfvngzny747ggf9a8fd7kblq96n5ys1jrwjyqhq"; depends=[bit fastmatch ff]; }; 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=[]; }; + fftw = derive2 { name="fftw"; version="1.0-6"; sha256="1kkhn79x3akp2v28aqmif0dd2fn1pw145fjgyy29i4ab6pngazir"; depends=[]; }; fftwtools = derive2 { name="fftwtools"; version="0.9-8"; sha256="1nqvpzda281rxi1cmwajxxsn3sc3gz7scv8bvs5jm34kf36whha6"; depends=[]; }; fgac = derive2 { name="fgac"; version="0.6-1"; sha256="0paddf5a4w0g2i0ay7my0bppwh534d8ghy6csfxl5jj034xjgwkk"; depends=[]; }; fgdr = derive2 { name="fgdr"; version="1.0.0"; sha256="0wf0ayn2vx2pkid08ssr7ygq9k9qxsw86wwppm2r9b7i8cw7kbf8"; depends=[jpmesh magrittr purrr raster readr rlang sf sp stars stringr tibble xml2]; }; fgeo = derive2 { name="fgeo"; version="1.1.4"; sha256="0axglmk05li3plb79rccskhddjzq3pdx3mgxr8yqysymf1nscrq6"; depends=[cli crayon dplyr fgeo_analyze fgeo_plot fgeo_tool fgeo_x glue magrittr purrr rlang rstudioapi]; }; - fgeo_analyze = derive2 { name="fgeo.analyze"; version="1.1.11"; sha256="148ks0y8k29v5z69g04k2l1ncml18xcwgagi6mngj72b4h3cpc6p"; depends=[dplyr fgeo_tool glue lubridate magrittr MASS purrr rlang tibble tidyr withr]; }; + fgeo_analyze = derive2 { name="fgeo.analyze"; version="1.1.13"; sha256="1cj4bazggpic0i5sq9iqq0y0j2xvp01i9ccv0pchg82xlgis33gw"; depends=[dplyr fgeo_tool glue lubridate magrittr MASS purrr rlang tibble tidyr withr]; }; fgeo_plot = derive2 { name="fgeo.plot"; version="1.1.9"; sha256="18zw4bsqdqdpy103kdyl40162mii6s1lp2w4cpi50svx7g7xhgh5"; depends=[dplyr fgeo_tool ggplot2 ggrepel glue magrittr purrr rlang stringr]; }; - fgeo_tool = derive2 { name="fgeo.tool"; version="1.2.5"; sha256="1sy0w2n2727v44fv56zijj03q732q3qnxyn1r1j8spmb257bhvn6"; depends=[dplyr glue magrittr purrr readr rlang tibble tidyselect]; }; + fgeo_tool = derive2 { name="fgeo.tool"; version="1.2.6"; sha256="0di1alxmxh47akbhy75b7vpix674xg4iynac4ga859nia56fisz1"; depends=[dplyr glue magrittr purrr readr rlang tibble tidyselect]; }; fgeo_x = derive2 { name="fgeo.x"; version="1.1.4"; sha256="0swps9rli74fmfb2j4kf55kw39gxz0q49m74ad4vcs0ylyp0sxrb"; depends=[memoise]; }; fgm = derive2 { name="fgm"; version="1.0"; sha256="0i6lbqxxjq78dql14qwqs7slnn0kyls2g3a9biabny2narwf6n3m"; depends=[fdapace JGL]; }; fgof = derive2 { name="fgof"; version="0.2-1"; sha256="0bclkb3as0fl2gyggqxczndfyj9pfnni5pa3inpn5msrnjg4g2j2"; depends=[mvtnorm numDeriv]; }; @@ -7700,8 +7781,7 @@ in with self; { fhidata = derive2 { name="fhidata"; version="2019.8.27"; sha256="0cm8ixpr3gjzprjcv43zdnysw8qhv72pf3fd2vckql01mlk16p42"; depends=[data_table]; }; fiberLD = derive2 { name="fiberLD"; version="0.1-6"; sha256="1i3bl2qsc77m81l11an9ihl4vy86s8jd5x6pasib77rl2877ad4x"; depends=[doParallel foreach Matrix VGAM]; }; fic = derive2 { name="fic"; version="1.0.0"; sha256="18xz94w1ab17jfi61bdg9z3pm63g488v17ns2ivizkza4gg07pv8"; depends=[abind ggplot2 mvtnorm numDeriv scales survival tensor]; }; - fieldRS = derive2 { name="fieldRS"; version="0.2.2"; sha256="0jrcdsv46zx7six9ll5sha32wx36wqajaladj6z8xym2n9ay8d5b"; depends=[caret concaveman ggplot2 raster rgeos sp spatialEco stringdist]; }; - fields = derive2 { name="fields"; version="10.0"; sha256="173zm5vr236ydiq0v27qy0l3x7h9fc7jly38iakg77j26i0a01il"; depends=[maps spam]; }; + fields = derive2 { name="fields"; version="10.3"; sha256="12k97vfjlz5h8vynirnvik1nyj1iw25n8xl7awmx9mpd6wvgy2s9"; depends=[maps spam]; }; fiery = derive2 { name="fiery"; version="1.1.2"; sha256="01ahdvcag8ifpp6jl6cgjjrchwxbr9fzvzqysj77kg3n5dcqm6cl"; depends=[assertthat crayon future glue httpuv later R6 reqres stringi uuid]; }; filehash = derive2 { name="filehash"; version="2.4-2"; sha256="14zv7h5195dmfksgk8qvjgc2qq8253vga6267aa1bqs5bpvmdl5n"; depends=[]; }; filehashSQLite = derive2 { name="filehashSQLite"; version="0.2-4"; sha256="1higvkmj4wvnwpvayqinzaygiksij20d77dx118q0gffsczadamh"; depends=[DBI filehash RSQLite]; }; @@ -7710,9 +7790,9 @@ in with self; { filenamer = derive2 { name="filenamer"; version="0.2.3"; sha256="19gavhh5q7dziv0yc000w06qp58wk2cm52cxjl33p1q4cjk6gg3m"; depends=[]; }; files = derive2 { name="files"; version="0.0.1"; sha256="1vhhawqjjbb6fadkn3l10mvz63w3vmcwvl93fk0q9mhkifzlj9kc"; depends=[]; }; filesstrings = derive2 { name="filesstrings"; version="3.1.5"; sha256="072alawp6j08mwlw1pz50g3lfi726kpsc744x5fvy71d7w4gqn6l"; depends=[checkmate magrittr matrixStats ore rlang strex stringi stringr tibble withr]; }; - filling = derive2 { name="filling"; version="0.2.0"; sha256="0yxixwgvn7jq09j4r3q33mmdda9a4anfi7y0xqscbdjz6p9bx48w"; depends=[CVXR nabor Rcpp RcppArmadillo Rdpack ROptSpace RSpectra]; }; - fillr = derive2 { name="fillr"; version="0.1.1"; sha256="01z4841hxnpf8s9s327fqprb4gl9k8pkyv2mgc5vfl86r1pd7m1b"; depends=[]; }; - finalfit = derive2 { name="finalfit"; version="0.9.7"; sha256="1y1fllbrqy4q79w4l3830aqlf32v4clfzajqnwiylxwxw71v7yaa"; depends=[boot broom dplyr forcats GGally ggplot2 gridExtra Hmisc lme4 magrittr mice pillar plyr pROC purrr scales stringr survival survminer tibble tidyr]; }; + filling = derive2 { name="filling"; version="0.2.1"; sha256="17bhfzvzdyri8yx7b40yhdx3x2gb2vy2i8sz2cyjyw9idnd8svmr"; depends=[CVXR nabor Rcpp RcppArmadillo Rdpack ROptSpace RSpectra]; }; + fillr = derive2 { name="fillr"; version="1.0.0"; sha256="1gx1ihp8j90ywmm6mmmfq4jd6apxawk9s5dfw3jq0wm1c290zqpv"; depends=[]; }; + finalfit = derive2 { name="finalfit"; version="1.0.0"; sha256="16bddxbj02yzlkvsn50r5qmqjbhlhpzi3q6mc8hp1afd1vydpmd3"; depends=[boot broom dplyr forcats GGally ggplot2 gridExtra lme4 magrittr mice pillar pROC purrr scales stringr survival tidyr]; }; finbif = derive2 { name="finbif"; version="0.2.0"; sha256="1wb4hl5j2g3fgapd7x8jl2180s48p51nngyb8zvs7jacl32a04bh"; depends=[digest httr jsonlite lubridate lutz]; }; finch = derive2 { name="finch"; version="0.3.0"; sha256="1cglyq3b0cvl05yrnpy6xn0nj0n817hgpcsxp3m07cvj8xidib02"; depends=[data_table digest EML hoardr plyr rappdirs xml2]; }; findR = derive2 { name="findR"; version="0.2.1"; sha256="1a7cf6kd7i2l4ffr2b17nb9xnpsjhf6fcwpjy06r0qgcapnfp54b"; depends=[pdftools stringr]; }; @@ -7720,11 +7800,12 @@ in with self; { findviews = derive2 { name="findviews"; version="0.1.3"; sha256="1l1yhw5hvrn0rpkdsch8m69d2q5284jwccvv7r4ia4m0iqjfipj7"; depends=[ggplot2 gridExtra scales shiny]; }; fingerPro = derive2 { name="fingerPro"; version="1.1"; sha256="1a1lj8gyrbgcg8hr03cj2bjzlaafddspri7abc83ys1raqwd4j68"; depends=[car GGally ggplot2 gridExtra klaR MASS plyr Rcmdr Rcpp RcppGSL RcppProgress reshape rgl scales]; }; fingerprint = derive2 { name="fingerprint"; version="3.5.7"; sha256="04jcwkydjrs31pia6kq8z2n9s54im950q08hs2ay15xjxxkmb8ic"; depends=[]; }; - fingertipsR = derive2 { name="fingertipsR"; version="1.0.0"; sha256="0hk2qlq7saqxlkd3yh4vq3s9cwcrjs65dwzhcglz5296w90dyscl"; depends=[curl dplyr DT httr jsonlite miniUI readr rlang shiny shinycssloaders]; }; + fingertipsR = derive2 { name="fingertipsR"; version="1.0.2"; sha256="15zhvdxp2l48b69hwq9bzafp94v405k5cw6824pi8kyslh95ibp8"; depends=[curl dplyr DT httr jsonlite miniUI readr rlang shiny shinycssloaders]; }; fingertipscharts = derive2 { name="fingertipscharts"; version="0.0.10"; sha256="1l3mirspz28djlzma04lkkynfbz8qfq0asr662q102j31qx6vnm4"; depends=[curl dplyr geojsonio ggplot2 httr leaflet lemon mapproj purrr rlang scales sf stringr tibble tidyr]; }; finiteruinprob = derive2 { name="finiteruinprob"; version="0.6"; sha256="0z4l0crymh58chxniqq70fqmvi6f5jkgvz72vbc7s3l9lrrapgr3"; depends=[numDeriv sdprisk]; }; finreportr = derive2 { name="finreportr"; version="1.0.1"; sha256="1mansiyl4p4zqc1h2aw9zgzb3fy4mppgmshdm8mcf4nbm340g4vk"; depends=[curl dplyr httr rvest XBRL xml2]; }; fipe = derive2 { name="fipe"; version="0.0.1"; sha256="055jav8h4wws76jahm2d5dj49wkvzchh3f2vk5d50pny4dc7smar"; depends=[dplyr forcats furrr future httr jsonlite lubridate magrittr purrr readr stringr tibble tidyr]; }; + firebase = derive2 { name="firebase"; version="0.1.0"; sha256="154a386ga9bjgam9rxp0y9033hx55p7f3294z52r6dz2y87h3lz2"; depends=[cli R6 shiny]; }; firebehavioR = derive2 { name="firebehavioR"; version="0.1.2"; sha256="10krny60dkpgwjjnriap91qmrnfq1rl5ck4ynf4h6x016bv0m374"; depends=[ggplot2]; }; fishMod = derive2 { name="fishMod"; version="0.29"; sha256="0pbs4z27vwa3c42xdw3mr6l2i581bgvn2pk52kawbcnnlsff92ar"; depends=[]; }; fishdata = derive2 { name="fishdata"; version="0.1.3"; sha256="04162m1j570cdwhffkwjs1x1qlsc20djj1jwx2hl2cqmbp584ppq"; depends=[]; }; @@ -7751,9 +7832,9 @@ in with self; { fivethirtyeight = derive2 { name="fivethirtyeight"; version="0.5.0"; sha256="00cc7kjs54wk2cxbkd14gldsrjmf4i35vwr6c2kfsassvjjhbmpm"; depends=[]; }; fixedTimeEvents = derive2 { name="fixedTimeEvents"; version="1.0"; sha256="0z7ji8yzp4pj76ad64l7ivknkbi82ijx6abd3a18wicqhrh433sj"; depends=[]; }; fixerapi = derive2 { name="fixerapi"; version="0.1.6"; sha256="0ikf8dn0l9c9gshp4bph3wasl0bh6lfybinc8n1rvb202231hmgb"; depends=[jsonlite tibble tidyr]; }; - fixest = derive2 { name="fixest"; version="0.2.1"; sha256="1zs3jzrsg25hg8jrk1vc82xh5l07qc20109gvyv1m2arxs2ggnhs"; depends=[Formula MASS nlme numDeriv Rcpp]; }; + fixest = derive2 { name="fixest"; version="0.4.0"; sha256="0sajxi2sxljmj4614iwvrd48xhwcnr9z9lr5dy5n68iyps05s509"; depends=[Formula MASS nlme numDeriv Rcpp]; }; fizzbuzzR = derive2 { name="fizzbuzzR"; version="0.1.1"; sha256="119gbi9y4n8r52hk9vj7zf795dv9xnk7lnngljjcd7ydnhygwd4h"; depends=[]; }; - flacco = derive2 { name="flacco"; version="1.7"; sha256="1w77smmbrwglayr2rj88b00x7wan9f3x1fq8h6xyhybfvrw7vr0r"; depends=[BBmisc checkmate mlr]; }; + flacco = derive2 { name="flacco"; version="1.8"; sha256="15h2q9xgddy7gw6r52c2nk618f3z1mjn4xz9pzdvhm1d3kqggwa4"; 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]; }; flamingos = derive2 { name="flamingos"; version="0.1.0"; sha256="0gic6y8wpxffpyi3zy0wh7apy4z6argxbz284n80k2mzh6lh029k"; depends=[Rcpp RcppArmadillo]; }; @@ -7761,21 +7842,21 @@ in with self; { flare = derive2 { name="flare"; version="1.6.0.2"; sha256="1ybrsx1djqldw0l5l1iz4pfh6xxb8ckkg1ric7wnsr51wm9ljlh5"; depends=[igraph lattice MASS Matrix]; }; flars = derive2 { name="flars"; version="1.0"; sha256="06qma1ar1nj7n6g9alk1qydm5bkj6lsjx0pqkikxpb41d91civqk"; depends=[fda MASS Matrix Rcpp RcppEigen]; }; flashClust = derive2 { name="flashClust"; version="1.01-2"; sha256="0l4lpz451ll7f7lfxmb7ds24ppzhfg1c3ypvydglcc35p2dq99s8"; depends=[]; }; - flashlight = derive2 { name="flashlight"; version="0.6.0"; sha256="11ihz72kq77asg6lk2yfasxb99z4ixpddklvs26fglss58p24041"; depends=[dplyr ggplot2 ggpubr MetricsWeighted rlang tidyr]; }; + flashlight = derive2 { name="flashlight"; version="0.7.1"; sha256="0sbq4jklp5idh850wvkszw2cpcxsyfrcn8icdg0fn3bbn55gls6x"; depends=[dplyr ggplot2 ggpubr MetricsWeighted rlang rpart rpart_plot tidyr]; }; flatr = derive2 { name="flatr"; version="0.1.1"; sha256="10l98a3f57wahfpdqxj70r25zfhk4vzzd014pdnriy458yrfd7rw"; depends=[dplyr magrittr tibble]; }; flatxml = derive2 { name="flatxml"; version="0.0.2"; sha256="1f7pc3chzimkg23490qvppy63sk4ds3aaahc36sa4dc4qmhabyms"; depends=[RCurl xml2]; }; - flexPM = derive2 { name="flexPM"; version="2.0"; sha256="0h3qs9w9pc2nc24q1diz7j3s93y40ijpmgq2l0xg9mzcgjz9kz8c"; depends=[survival]; }; + flexCWM = derive2 { name="flexCWM"; version="1.92"; sha256="1fxwq12mki10ikf5lyh1pb58svfzs4llg68v4d9iznia8aa0grhq"; depends=[ContaminatedMixt mclust numDeriv statmod]; }; flexclust = derive2 { name="flexclust"; version="1.4-0"; sha256="0x7wxk8y46ndyz6fdacym0rd6p9wh3pcfr28chjcg5d7fm849zl2"; depends=[class lattice modeltools]; }; flexdashboard = derive2 { name="flexdashboard"; version="0.5.1.1"; sha256="0fy3nbrr67zqgd44r2mc850s5sp0hzfcw3zqs15m8kxzj1aw067x"; depends=[htmltools htmlwidgets jsonlite knitr rmarkdown shiny]; }; 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]; }; flexmixNL = derive2 { name="flexmixNL"; version="0.0.1"; sha256="0bk5v0cnsn1qkd1b86vj0bnpr4l9d6523kpkgzb1l1sqyscawfmm"; depends=[flexmix gnm]; }; - flexrsurv = derive2 { name="flexrsurv"; version="1.4.4"; sha256="08xhanbrd4pfm014ydh8dz6dpm6xw7qjdq0wr2flld04924yv9p8"; depends=[Epi formula_tools matrixcalc orthogonalsplinebasis statmod survival]; }; + flexrsurv = derive2 { name="flexrsurv"; version="1.4.5"; sha256="1xwh6fj854hr5j1mdh4cbp3hbrbdl4nb2ili876rq08wb9wq5pkf"; depends=[Epi formula_tools matrixcalc orthogonalsplinebasis statmod survival]; }; flexsurv = derive2 { name="flexsurv"; version="1.1.1"; sha256="0x7p1rv51pplfyyzcg63ssb8z56mig7y0363hkr0219w3cvyq9nr"; depends=[deSolve mstate muhaz mvtnorm quadprog Rcpp survival tibble tidyr]; }; flexsurvcure = derive2 { name="flexsurvcure"; version="1.0.0"; sha256="1blhwbkp0a3a7xnqyxp952wxkihdxb0xh68sk827h8rxis9zr4z4"; depends=[flexsurv gtools survival]; }; - flextable = derive2 { name="flextable"; version="0.5.6"; sha256="1f869f2dfqkzhf6yix7xcbs8rn1nwq3sg623h74zg6h1pl6px66w"; depends=[base64enc data_table gdtools htmltools knitr officer rlang rmarkdown xml2]; }; + flextable = derive2 { name="flextable"; version="0.5.9"; sha256="1rkz0nhwjy1l8sb0kmna5v492n2ydnk7gydswnmf88r8vfyjczhw"; depends=[base64enc data_table gdtools htmltools knitr officer rlang rmarkdown xml2]; }; flifo = derive2 { name="flifo"; version="0.1.5"; sha256="03x66l3ryrjvwbxxd0ncjrb5w9kc7fswmp5psb1cb7r87f395gm3"; depends=[bazar pryr]; }; - flightplanning = derive2 { name="flightplanning"; version="0.7.2"; sha256="0l7pm4sdjdr0n5njnh4lxydayr55p4i5w2a6i3b998z8fdl0vpv9"; depends=[rgdal rgeos sp]; }; + flightplanning = derive2 { name="flightplanning"; version="0.8.0"; sha256="0q5xdjgjj9j73djpvzc34ig2gk43xan5jg9pn195m1x8lz41yvk9"; depends=[rgdal rgeos sp]; }; 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]; }; flipscores = derive2 { name="flipscores"; version="0.2"; sha256="0b55qxdrn6m0pbk4aj9zr1d9s7id6pclsaz939p48jmqx07zayjg"; depends=[]; }; @@ -7789,20 +7870,18 @@ 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.5.1"; sha256="0x4fksps364841qckp218rfslx1dvwns1rhw2w7dcnhj7kfkcv59"; depends=[]; }; + flsa = derive2 { name="flsa"; version="1.5.2"; sha256="0c6cdf3hkl3s5yqwbn1qhqhyaw5pgd83a5bc30wbzq03hk7rh9ks"; depends=[]; }; fluoSurv = derive2 { name="fluoSurv"; version="1.0.0"; sha256="1dv4lf7k28bih2qqkpy15f7d14ibxk48p3z6sj3dj5yvh25mhv81"; depends=[]; }; fluspect = derive2 { name="fluspect"; version="1.0.0"; sha256="0j80wx00s8ljqg1qaqw66rj7kxhhk438hb0syv0lr9vld03cxy2w"; depends=[pracma]; }; flux = derive2 { name="flux"; version="0.3-0"; sha256="0pc9cab2pwrfl0fnz29wp7a398r49hvbi50jp8i2fk2rfvck21a7"; depends=[caTools]; }; fluxweb = derive2 { name="fluxweb"; version="0.2.0"; sha256="1ssq90fqm4p0j4g171mx208lmgz3hkxs8hgsffkawpmxgacs0gh1"; depends=[]; }; - flying = derive2 { name="flying"; version="0.1.1"; sha256="0mjn2h8101hkdhas746iqy97dsyyi50bfpi02q0ypfr6zsxji2bq"; depends=[kableExtra knitr Rcpp rmarkdown]; }; - flyio = derive2 { name="flyio"; version="0.1.4"; sha256="1mrv5gvsr4zbh8bghrrizgrqz1cqn4pl3gizr77jl9mlxxpmhx20"; depends=[assertthat aws_s3 googleCloudStorageR stringr]; }; + flying = derive2 { name="flying"; version="0.1.3"; sha256="04wfcsbq8icvk1nnczvic5cp4nb40hxj3g6lasyb1dvhsh0svg0q"; depends=[kableExtra knitr Rcpp rmarkdown]; }; fma = derive2 { name="fma"; version="2.4"; sha256="1x175mhljvplm7b2iwcvkzalv3a79p8gqj9d4f06l5v4shxlrab9"; depends=[forecast]; }; fmbasics = derive2 { name="fmbasics"; version="0.3.0"; sha256="1dnf09rgwpc7n7ydlp7r5cwy2fa4vh1h9mbjqzfhk0208kz6jpl0"; depends=[assertthat fmdates lubridate tibble]; }; fmcmc = derive2 { name="fmcmc"; version="0.2-0"; sha256="0hczf41pykxz8j9y8d2mqawzk5q9w44875jk4p4pf7jbkff5rzxf"; depends=[coda]; }; fmdates = derive2 { name="fmdates"; version="0.1.4"; sha256="1bbcwkh65nf2gak9b81zgg32c5ihwhmai3nc43ayf6ivhqsxw8x0"; depends=[assertthat lubridate]; }; - fmri = derive2 { name="fmri"; version="1.9.2.1"; sha256="0ij6j3hk3rb2vinhh2jxac085qd258zr4jk60difh5krsk9kksyc"; depends=[aws awsMethods metafor nlme]; }; + fmri = derive2 { name="fmri"; version="1.9.3"; sha256="0is9lgp27g8dv3rmxn4mlf9m53izx5j7h974cy3ls3lq0pdp99va"; depends=[aws metafor nlme]; }; fmriqa = derive2 { name="fmriqa"; version="0.3.0"; sha256="1z09nf1c305a78c129jvs21b9z91wyhazz41wrn4bimmhfhx7szv"; depends=[ggplot2 gridExtra imager optparse pracma RcppEigen reshape2 RNifti tidyr viridisLite]; }; - fmrs = derive2 { name="fmrs"; version="1.0-9"; sha256="1x9g67701kcnz3p97iynr74sn0mfpxpp16mv1l4zxlhhfn2v5lwx"; depends=[survival]; }; fmsb = derive2 { name="fmsb"; version="0.7.0"; sha256="0x1wkzfdvv4s5xmr0whcwjz4aac71gacwymj2c3mzj2bbswwlw45"; depends=[]; }; foba = derive2 { name="foba"; version="0.1"; sha256="1af8whgl66v0vwzdf03b6141k3dysdc0svymlgifcga5gqkwzsl0"; depends=[]; }; focusedMDS = derive2 { name="focusedMDS"; version="1.3.3"; sha256="18s86dbbpyajscqr9frprf2vp1zif7vh4lw5m0cjskfc6gmsdp2p"; depends=[htmlwidgets]; }; @@ -7819,21 +7898,20 @@ in with self; { foodweb = derive2 { name="foodweb"; version="1-0"; sha256="1zm2a87g9bkpz90j9lax28s5hq1w7ia28qqb6vnvr1d7a47g9zi9"; depends=[rgl]; }; foolbox = derive2 { name="foolbox"; version="0.1.1"; sha256="06lcr5v6bcqqxskrwdm16b46zq4h67x8bwqya88jxs5bgi5w0hj3"; depends=[magrittr rlang]; }; forams = derive2 { name="forams"; version="2.0-5"; sha256="1fh3m9896ksv1h7b027yb955bzyv70yafhqvn5crkzalzk3jpb0s"; depends=[vegan]; }; - forcats = derive2 { name="forcats"; version="0.4.0"; sha256="1cnjh23z59fhbjmy7y95425hcq3m5wrwqvahsxwi7zm6d9bwp0vw"; depends=[ellipsis magrittr rlang tibble]; }; + forcats = derive2 { name="forcats"; version="0.5.0"; sha256="1i4hblsjgwkrcwgvgsb5yj33pw1hwdj3lr9dvxymkv1kjdw0x5lg"; depends=[ellipsis magrittr rlang tibble]; }; foreSIGHT = derive2 { name="foreSIGHT"; version="0.9.81"; sha256="1p3w5cs52ph79p2l78apvibr82w7sfbwf8436jfbb4gcahjhmrnk"; depends=[cowplot directlabels doParallel GA ggplot2 moments zoo]; }; - foreach = derive2 { name="foreach"; version="1.4.7"; sha256="0q7iyniw5iri4hl57bhil3r69s5wnaijzn0q0x4h3z42245jqqwm"; depends=[codetools iterators]; }; + foreach = derive2 { name="foreach"; version="1.5.0"; sha256="0584nv49x8d8m1cak5drb54sxs3y594gd521kjsdwk4c849sgy8s"; depends=[codetools iterators]; }; forecTheta = derive2 { name="forecTheta"; version="2.2"; sha256="1a7ip3czm8k82kb8dx95m8q47kjhifdj51gzavd1zj9ni3vwbhfn"; depends=[forecast tseries]; }; - forecast = derive2 { name="forecast"; version="8.10"; sha256="0jccr2wg7sii38lyqrs58fkxf2az7nw6v0jya27hpbz9bg8ib3kr"; depends=[colorspace fracdiff ggplot2 lmtest magrittr nnet Rcpp RcppArmadillo timeDate tseries urca zoo]; }; - forecastHybrid = derive2 { name="forecastHybrid"; version="4.2.17"; sha256="1k3jwxqwkprcf2qr5x1b8hzzdvbyzdiablpvqnr0482x4vza8lmc"; depends=[doParallel foreach forecast ggplot2 purrr thief zoo]; }; - forecastML = derive2 { name="forecastML"; version="0.7.0"; sha256="00zxwdv6nsm8fzizv1gqm682kpr7cnp0j49ihziayp7i9il4wa6k"; depends=[data_table dplyr dtplyr future_apply ggplot2 lubridate magrittr purrr rlang tidyr]; }; + forecast = derive2 { name="forecast"; version="8.12"; sha256="1ycj5z4wd5a16nlcjy07dqm8jkih240xa02cn4wvysnnhkapyq7b"; depends=[colorspace fracdiff ggplot2 lmtest magrittr nnet Rcpp RcppArmadillo timeDate tseries urca zoo]; }; + forecastHybrid = derive2 { name="forecastHybrid"; version="5.0.18"; sha256="0sgz50dl2939jl3azkxpv8kd00jcbkcgd5s6cng3kivrbrfslahp"; depends=[doParallel foreach forecast ggplot2 purrr thief zoo]; }; + forecastML = derive2 { name="forecastML"; version="0.8.0"; sha256="18a05lp4v4gpplldwx3kwkblnhkplgjiis0jq529sjxk53plyfi1"; depends=[data_table dplyr dtplyr future_apply ggplot2 lubridate magrittr purrr rlang tibble tidyr]; }; forecastSNSTS = derive2 { name="forecastSNSTS"; version="1.3-0"; sha256="0p47x7ic2ib7znqbp8br4b2ci75f5w8x413z9g4n30m002p7irp1"; depends=[Rcpp]; }; - foreign = derive2 { name="foreign"; version="0.8-75"; sha256="0g4mi101srjbl17ydb2hl3854m3xj0llj6861lfr30sp08nkqavl"; depends=[]; }; + foreign = derive2 { name="foreign"; version="0.8-76"; sha256="1z6x2x1z12wnv0z4p74d91r5wfaq30sdz4ynwx0lncz1q45mhbh5"; 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.6"; sha256="13zzng022m1jhca0d2w868kqp9h0wfpjmh0xnlb8jl1l4vfc68r9"; depends=[curl raster rgdal rvest SDMTools xml2]; }; + forestChange = derive2 { name="forestChange"; version="1.0"; sha256="1d9qza1f16sz8pyafn3q7cyg9hw0ix4nqcgb9ipcnvmkyrc00f1a"; depends=[curl dplyr gdalUtils ggplot2 landscapemetrics raster rgdal rvest sp tibble xml2]; }; forestControl = derive2 { name="forestControl"; version="0.2.1"; sha256="1m75s98bs8n3qad8gp6a333dh3mbi0rbbic9iwnsqyklzkhmx1nr"; depends=[dplyr magrittr purrr Rcpp tibble]; }; - forestError = derive2 { name="forestError"; version="0.1.0"; sha256="1pmrhzcqywm0qj6csiywfavf5vc6qg66j5qgfhd6yk7h9nvd5gnm"; depends=[doParallel foreach Rcpp]; }; - forestFloor = derive2 { name="forestFloor"; version="1.11.1"; sha256="1sslxq44qmmmdhr7800bz8lj9w2l7f7x1vly3w2z7j1qdijc7nw7"; depends=[kknn randomForest Rcpp rgl]; }; + forestError = derive2 { name="forestError"; version="0.2.0"; sha256="093qf50b4isiba4dcv06c1h0fy4db06605fiazwqd2cyd2gar46p"; depends=[data_table purrr]; }; forestHES = derive2 { name="forestHES"; version="1.0-1"; sha256="05l04ly3l8xkdz3rnnrfa4y0wfmh1am2ixbz1vfarnqkc0zppwpj"; depends=[]; }; forestRK = derive2 { name="forestRK"; version="0.0-5"; sha256="0zm0q7bckmjl1j3yh5pw4r6rq64rfmzjvmvqniza5691jagjz60m"; depends=[ggplot2 igraph knitr mlbench partykit pkgKitten rapportools]; }; forestSAS = derive2 { name="forestSAS"; version="1.0.1"; sha256="1jva2nivvcrczvqfhxa6vv1hsazp5m7djgfp7mfp1kpr136lyf2d"; depends=[spatstat]; }; @@ -7841,33 +7919,37 @@ in with self; { forestmangr = derive2 { name="forestmangr"; version="0.9.1"; sha256="1b0yijc1yzgwkypyxb6v03sw32r3zz9rfjw63xiwzspq7hkbpinx"; depends=[broom car dplyr FinCal formattable ggdendro ggplot2 ggpmisc ggthemes gridExtra magrittr minpack_lm plyr purrr rlang scales systemfit tibble tidyr]; }; forestmodel = derive2 { name="forestmodel"; version="0.5.0"; sha256="09gwgsh42gkmhs8ijq5xfbbkb1hk6sjb0q32mw2ymc6x9ycr1a9j"; depends=[broom dplyr ggplot2 lazyeval tibble]; }; forestplot = derive2 { name="forestplot"; version="1.9"; sha256="1vcma7dvlvyhz6n25pj19h70i8xmz6vibkf945qkmj5hhrb7zxia"; depends=[checkmate magrittr]; }; + forestr = derive2 { name="forestr"; version="2.0.1"; sha256="1rxyp7d6np9qawrhc66fkdwylddnkha4d311c9w1x09pbnkwqzs8"; depends=[dplyr ggplot2 moments plyr viridis]; }; foretell = derive2 { name="foretell"; version="0.2.0"; sha256="18vi438n480gizfhnciw67gngvbjnmky19186b1wy75av7fgc1gp"; depends=[nloptr]; }; forge = derive2 { name="forge"; version="0.2.0"; sha256="0pjfzsc35agkh0zfw2czwajkbsyn6liys5irl5bhz5r1vim3jmwa"; depends=[magrittr rlang]; }; formatR = derive2 { name="formatR"; version="1.7"; sha256="1nsxbrx31k3y6yql30qkrvdfyznlia2qfvwv95mfiy7m7wdn4rm3"; depends=[]; }; formattable = derive2 { name="formattable"; version="0.2.0.1"; sha256="1s7jjgm0j24vdwm39933ygh6xnxcfvzy4kl2mmfgas4czfcmd4rf"; depends=[htmltools htmlwidgets knitr rmarkdown]; }; formula_tools = derive2 { name="formula.tools"; version="1.7.1"; sha256="15d3ikfmsh9zszfgfkrxb3jkipl41inm7n6bhs73kwlnklnygq2g"; depends=[operator_tools]; }; formulaic = derive2 { name="formulaic"; version="0.0.6"; sha256="020sbchj445kwwfj17ixmhsgl38qpwb723r6r8pbc6b3q0zw4b3d"; depends=[data_table DT]; }; + formulops = derive2 { name="formulops"; version="0.5.0"; sha256="1mkpv5xjykrhgknq0gh4yg2a3j4xb8q2d6dh0wv8zd9h59hvrzda"; depends=[]; }; + forrel = derive2 { name="forrel"; version="1.0.1"; sha256="0apx62cwg3xb64gmflgq500h8vclqbwazd9aj0s6c7ix0j0phs73"; depends=[glue maxLik pedmut pedprobr pedtools]; }; fortunes = derive2 { name="fortunes"; version="1.5-4"; sha256="109ly9kpfn6hy294ava8795wy5z9l1bnl98hhhv8kn9naf4camdg"; depends=[]; }; forward = derive2 { name="forward"; version="1.0.5"; sha256="0cc0s534s32b9ark2zazwqhgy0zsxb2p63r6503v82784rpqv2yv"; depends=[MASS]; }; forwards = derive2 { name="forwards"; version="0.1.3"; sha256="07374a1ak5h8q3diqyvsw3q1grqi3679w9sshf1jkhlrj7wn0dmv"; depends=[]; }; - fossil = derive2 { name="fossil"; version="0.3.7"; sha256="188hyb3r1dnxkmqf2czh1kdzmk4mjc0v1kn1zml2yvxaxk7adsrz"; depends=[maps shapefiles sp]; }; + fossil = derive2 { name="fossil"; version="0.4.0"; sha256="1hbls9m8yapnfzpv9s850ixakmnan8min1ynk7dqkbpb2px85h1p"; depends=[maps shapefiles sp]; }; foto = derive2 { name="foto"; version="1.0.0"; sha256="10mfxgg5f1r85cwr0jjnsa4csp1afcrjvyjvp31060nm638clcgh"; depends=[raster]; }; fourPNO = derive2 { name="fourPNO"; version="1.1.0"; sha256="0a0z2403kdh3fjb0ypjjk3m6fg77bg6m7hwb5jhlymcy2rwkay7w"; depends=[Rcpp RcppArmadillo]; }; fourierin = derive2 { name="fourierin"; version="0.2.4"; sha256="140721p4h5mjr7r25ckv8wfhbj88xw6v47b613r5bpalg8gw650l"; depends=[Rcpp RcppArmadillo]; }; fpCompare = derive2 { name="fpCompare"; version="0.2.3"; sha256="1pyv52rvbqd5v6ns86pc119q019ps070bd819x7a98s4hmbf76zq"; depends=[]; }; fpa = derive2 { name="fpa"; version="1.0"; sha256="0kgpl9qq0l10h0vdd2f8vnir0kdylh1jvvv5z4d9ygj1pl9qywhk"; depends=[fields reshape]; }; - fpc = derive2 { name="fpc"; version="2.2-4"; sha256="1gsnl5sbdg86b2wdrsy6wq83xj6mrziiq7rxa8cqksgljc7gp6yf"; depends=[class cluster diptest flexmix kernlab MASS mclust prabclus robustbase]; }; + fpc = derive2 { name="fpc"; version="2.2-5"; sha256="10504hzivbn89ip0cd5bcxd36ivbgin1lw1xhyh3xfckcm25v1a5"; depends=[class cluster diptest flexmix kernlab MASS mclust prabclus robustbase]; }; fpca = derive2 { name="fpca"; version="0.2-1"; sha256="13b102026xlfb7c2rb3xsqsymm7xpmaxppaafjkb5dx0b1lz0jrc"; depends=[sm]; }; fpeek = derive2 { name="fpeek"; version="0.1.1"; sha256="0x7q5rl02ih0zmjfzvsc1vmn7s7yzdkf2gbmzc3mh7qadwpnf89p"; depends=[Rcpp]; }; fpest = derive2 { name="fpest"; version="0.1.1"; sha256="013r8295spm02j558aqvnrnbkg2g73gl5vi4lqzngbw8yr8qlkri"; depends=[]; }; - fplot = derive2 { name="fplot"; version="0.2.0"; sha256="0sq662qblkq6yngi5d98byjmf2xyfq9rlrg8pl1gr3pn000wi8b3"; depends=[data_table Formula Rcpp]; }; + fplot = derive2 { name="fplot"; version="0.2.1"; sha256="0ryb1pfx1qp4vlzpy4a3c0wqk6k9ds44xy12n056jyqiggc7kd12"; depends=[data_table Formula Rcpp]; }; + fplyr = derive2 { name="fplyr"; version="1.1.0"; sha256="0s76hzmqal9fmpwgg996l86vz156lwkhfb2ag996m4h6m37zgqx7"; depends=[data_table iotools]; }; fpmoutliers = derive2 { name="fpmoutliers"; version="0.1.0"; sha256="108bp3smk9jnckd5237xly4ywmal03rq1kidq5z61l6zrhc3yfh9"; depends=[arules doParallel foreach Matrix pmml pryr R_utils XML]; }; fpop = derive2 { name="fpop"; version="2019.08.26"; sha256="1gz5db9hlkvzkp5y7zzn9h57qz7ilpdyxyf05vy9kxbj36kgc19n"; depends=[]; }; fpow = derive2 { name="fpow"; version="0.0-2"; sha256="0am3nczimcfrm9hi02vl2xxsh703qjmr2j11y014mll3f2v1l8cy"; depends=[]; }; fpp = derive2 { name="fpp"; version="0.5"; sha256="1jqnx6bgpvnbbj2fa2b6m6aj8jd5cb9kz877r8kp7a5qj62xv1ww"; depends=[expsmooth fma forecast lmtest tseries]; }; fpp2 = derive2 { name="fpp2"; version="2.3"; sha256="1krrvwg25qjfpfjdwd3n0d87ihl4zf7y1bnh6gbi92sdja3ljq48"; depends=[expsmooth fma forecast ggplot2]; }; - fpp3 = derive2 { name="fpp3"; version="0.1"; sha256="17j5y1y46dn21049rfiwr7j0f5q2kc6jvxdpw252l063dqdb9pd9"; depends=[cli crayon dplyr fable fabletools feasts ggplot2 lubridate magrittr purrr rstudioapi tibble tidyr tsibble tsibbledata]; }; - fptdApprox = derive2 { name="fptdApprox"; version="2.1"; sha256="00vxwcwca7zfm4fr0x9898snr6j0474ci1bahjmpj2jxiclwnhzs"; depends=[]; }; + fpp3 = derive2 { name="fpp3"; version="0.2"; sha256="0346g5cj876kd34hvkjl3yn25i3k3ypbnp5qnqk7nahz8akdk0g2"; depends=[cli crayon dplyr fable fabletools feasts ggplot2 lubridate magrittr purrr rstudioapi tibble tidyr tsibble tsibbledata]; }; + fptdApprox = derive2 { name="fptdApprox"; version="2.2"; sha256="10f9n6cx5n6djblj97a2zw4khaj3phchmq4l8gk2fy535jjqaqlr"; depends=[]; }; fracdiff = derive2 { name="fracdiff"; version="1.5-1"; sha256="1dhfjlhr9sb38qgpsx0sm73l9lgc13d0fk32l7fmjfnalhr3n45q"; depends=[]; }; fracprolif = derive2 { name="fracprolif"; version="1.0.7"; sha256="124p5x59smqf8ba0xwhlq69w77zga2bv9plzwkadf700lzvaj2wx"; depends=[emg numDeriv]; }; fractal = derive2 { name="fractal"; version="2.0-4"; sha256="18lr9z0gslvfc3z8vyj3krqj3bfhg60zv1fzinrwwkc4cpk1w7mp"; depends=[ifultools MASS sapa scatterplot3d splus2R wmtsa]; }; @@ -7887,17 +7969,15 @@ in with self; { fredr = derive2 { name="fredr"; version="1.0.0"; sha256="1hv51m0ihdpb73rp2gwj2q2xpjzlqpf9p3xzqdmy9nhwpfbj14nh"; depends=[httr jsonlite rlang tibble]; }; freealg = derive2 { name="freealg"; version="1.0-0"; sha256="0a3s89379lxr0dw068wfwzlqjq70zbaxil1vwwa4bf2i7s46mcgl"; depends=[Rcpp]; }; freegroup = derive2 { name="freegroup"; version="1.1-0"; sha256="0ssshs2d6l2ip1xx9x581w0cdnd2459a1mh360ybwajkjgak2ci6"; depends=[magic magrittr plyr]; }; - freeknotsplines = derive2 { name="freeknotsplines"; version="1.0.1"; sha256="1yl53rnngrpj5mv1fgd0rgiqaw431g4ckxl1bq0l712647njx02a"; depends=[]; }; - freestats = derive2 { name="freestats"; version="0.0.3"; sha256="0b18n8idap089gkmjknzzb94dvs2drpdqs0mrw7dqnacxgbbqwfj"; depends=[MASS mvtnorm]; }; - freesurfer = derive2 { name="freesurfer"; version="1.6.5"; sha256="0g5rpskwgxx37b60vxn89kf2d6b2y66v508xyrsx3h47q973kjia"; depends=[neurobase R_utils reshape2]; }; - freesurferformats = derive2 { name="freesurferformats"; version="0.1.7"; sha256="0451m10kcn8zngsv8nfz9na7pw7apf15zxdp9ny63plfs063340z"; depends=[pkgfilecache]; }; + freesurfer = derive2 { name="freesurfer"; version="1.6.7"; sha256="1wk0xjx0a99zm7gdn7i5z92wmqnlzng6n6g8w9whxvmy0rq6i19j"; depends=[neurobase R_utils reshape2]; }; + freesurferformats = derive2 { name="freesurferformats"; version="0.1.8"; sha256="13lqkw5bmbqviqsxb75ij8jicrgdxpahng5x5arazn38sksb9cg9"; depends=[pkgfilecache]; }; freetypeharfbuzz = derive2 { name="freetypeharfbuzz"; version="0.2.5"; sha256="11agmqdp6sy32jk2840cj8wmgywq0yjar18zsnsn56qfvn4b1k1c"; depends=[fontquiver]; }; freqdist = derive2 { name="freqdist"; version="0.1"; sha256="1pb45jabv9s3qa7v1isd5wm9b0g9p04q5h18spcaax8397s0d2fv"; depends=[]; }; freqdom = derive2 { name="freqdom"; version="2.0.1"; sha256="0ig0ygnlcb5ndjjm5x8jpp37gvgwli9xv6zsvbbgfh72q418qswp"; depends=[matrixcalc mvtnorm]; }; freqdom_fda = derive2 { name="freqdom.fda"; version="0.9.1"; sha256="15wq9s3v441dybc8kglpbv9hdvsr9rjjq4qp4d2ipxglfp0iqj9p"; depends=[fda freqdom mvtnorm]; }; freqparcoord = derive2 { name="freqparcoord"; version="1.0.1"; sha256="011p8xh0i0x0w5rv5qz5a7fxwdhxd8l2bqi9bxv5almxd0y7ajqx"; depends=[FNN GGally ggplot2 mvtnorm]; }; - frequency = derive2 { name="frequency"; version="0.3.1"; sha256="0m3vgcwldl7zv0nwdwfz80qanibmfp8j5iv79kydhrmzzr04rbf5"; depends=[DT ggplot2 gtools knitr rmarkdown]; }; - frequencyConnectedness = derive2 { name="frequencyConnectedness"; version="0.2.1"; sha256="006cb7x65if7md5w6w90nacdmg39pv7dc8zxvchc52kmfzlps0ds"; depends=[knitr pbapply urca vars]; }; + frequency = derive2 { name="frequency"; version="0.4.0"; sha256="1m3hrbkspnmcl956f7m4fpfd980qdxmyagsm5kd79dzh3qka2xly"; depends=[DT ggplot2 gtools knitr rmarkdown]; }; + frequencyConnectedness = derive2 { name="frequencyConnectedness"; version="0.2.2"; sha256="1mn20isy146ya4i33xxszmhvdwqkkg0cd18002mq8bvnkb65fxd2"; depends=[knitr pbapply urca vars]; }; frequentdirections = derive2 { name="frequentdirections"; version="0.1.0"; sha256="0rmifh221c8z3cqyqg0bfxnih9f64hvv98jz44i6grnlablfwwgw"; depends=[ggplot2]; }; fresh = derive2 { name="fresh"; version="0.1.0"; sha256="101ycxwk1z59zb2p6hfg4a8l565gfqbzmhw60nz22fql4gyhl8q9"; depends=[htmltools rstudioapi sass shiny]; }; frm = derive2 { name="frm"; version="1.2.2"; sha256="1dl0vca9r2dams99sc13pfpi0b3yb02x59f4c1jz07zz005c8l23"; depends=[]; }; @@ -7910,7 +7990,8 @@ in with self; { frost = derive2 { name="frost"; version="0.0.4"; sha256="03snjlq4b9j84v0yimc3xzgjvryzzi76b9n53k0s2lvv1yzrri7x"; depends=[]; }; frostr = derive2 { name="frostr"; version="0.1.0"; sha256="02ygg5dxpnv72gpwwsarhkl5hk6hldxjqpw875p7hb1ny7khgmfg"; depends=[httr jsonlite tibble tidyr]; }; frt = derive2 { name="frt"; version="0.1"; sha256="1qy76a1wkznaqzlyj1nq74mf1pnyly1s8gnff8q30zfccqk68cxv"; depends=[]; }; - fs = derive2 { name="fs"; version="1.3.1"; sha256="1g26rgx13dzigp2vrlld6h28q33lwbax97zvwdrq2pc3iz54v4yn"; depends=[Rcpp]; }; + fs = derive2 { name="fs"; version="1.4.1"; sha256="0kksig9pk8aid9l6r250na8z8j9919jvs20lj0s6m9bcybgh74df"; depends=[]; }; + fsMTS = derive2 { name="fsMTS"; version="0.1.5"; sha256="1vxj9wkzpbk44hby4fdyhj72748c65by612kpphs6vmgzmw4y471"; depends=[freqdom glasso lars mpmi randomForestSRC]; }; fsbrain = derive2 { name="fsbrain"; version="0.0.3"; sha256="1s7i9rpazp5s3vnm9y6ajpy06wbd7gjdzr9mbndjnsb9w985957a"; depends=[dplyr fields freesurferformats pkgfilecache reshape rgl squash]; }; fscaret = derive2 { name="fscaret"; version="0.9.4.4"; sha256="18fhyfl3f8syyc3g937qx87dmwbv7dray6b97p1s6lnssiv61gsw"; depends=[caret gsubfn hmeasure]; }; fsdaR = derive2 { name="fsdaR"; version="0.4-9"; sha256="1iaqqdwhh29fhq4r64adfrjmsyzq4v60bz9111vkazj4kr45wxxv"; depends=[ggplot2 rJava rrcov]; }; @@ -7918,15 +7999,16 @@ in with self; { fslr = derive2 { name="fslr"; version="2.24.1"; sha256="1psjqvjv8krlkj7dcfwygz563a4cpn7h21z330hxh5q10rwhabi8"; 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.6"; sha256="1l80anvlf21kvwb95w5mn0i2q773z0vbznx1lqvgsawprhcdiv20"; depends=[glmnet igraph MASS Matrix mvtnorm qtl Rcpp RcppEigen stringr]; }; - fst = derive2 { name="fst"; version="0.9.0"; sha256="0ya5lh8p0qy5pcr6wxsrn43wj1r9gb9qycyn8gvl26ic3hxwk2rf"; depends=[Rcpp]; }; + fst = derive2 { name="fst"; version="0.9.2"; sha256="11r35v8irv6a4gnbw06wrlipsrqq2m86dmcfijp5k07n59hgipi3"; depends=[Rcpp]; }; fsthet = derive2 { name="fsthet"; version="1.0.1"; sha256="0z6az1jcvdahgn97r6cpj1s6fn0lvr7j12gcw2r7wbpajrvyl5j6"; depends=[]; }; ftDK = derive2 { name="ftDK"; version="1.0"; sha256="1xs2rr2afjza97kpym5zkas3k78pilxjlh7lp1gc66banldr71g2"; depends=[dplyr httr pbapply purrr tibble]; }; + ftExtra = derive2 { name="ftExtra"; version="0.0.1"; sha256="0zgz4sjxx6ls27afb9djmxvwq46pp5jwxxbb87wnjc9fn5vvnnxy"; depends=[dplyr flextable jsonlite magrittr purrr rlang rmarkdown stringr tidyr tidyselect]; }; ftnonpar = derive2 { name="ftnonpar"; version="0.1-88"; sha256="0df9zxwjpfc939ccnm1iipwhpf76b34v0x74nsi1mm1g927dfl0i"; depends=[]; }; fts = derive2 { name="fts"; version="0.9.9.2"; sha256="08pwhi19db173d4nsk5rl8xa8qmaddj4bn3cjxb8ql4kny59i57q"; depends=[BH zoo]; }; ftsa = derive2 { name="ftsa"; version="5.5"; sha256="1c7b3b6zrm45y2110j0dqlgilfiiyx4wqhgdiq82q6kagng32cl1"; depends=[colorspace fda forecast MASS pcaPP pdfCluster rainbow sde]; }; ftsspec = derive2 { name="ftsspec"; version="1.0.0"; sha256="12f9yws1r26i240ijq0xqprl3pgbw50wv68jsm75ycplbs2jsyhs"; depends=[sna]; }; fuel = derive2 { name="fuel"; version="1.0.2"; sha256="0ziw370ch8g2hnlimxfgski4n28b83jnwrhlh7ibszk0lz593rkr"; depends=[]; }; - fueleconomy = derive2 { name="fueleconomy"; version="0.1"; sha256="1svy5naqfwdvmz98l80j38v06563vknajisnk596yq5rwapl71vj"; depends=[]; }; + fueleconomy = derive2 { name="fueleconomy"; version="1.0.0"; sha256="16a8wyliiidi6rw14ksimygfkl4a7yhxvss7l9bcvr1wfiplrn65"; depends=[]; }; fugeR = derive2 { name="fugeR"; version="0.1.2"; sha256="0kd90s91vzv0g3v9ii733h10d8y6i05lk21p5npb3csizqbdx94l"; depends=[Rcpp snowfall]; }; fugue = derive2 { name="fugue"; version="0.1.7"; sha256="1myvi9cizxvahb6wn2k26v3x958xsrm2p414ar05injmfjdfnsmi"; depends=[]; }; fullfact = derive2 { name="fullfact"; version="1.3"; sha256="1dy5ppa22i9axqcwx2184qv2vjcbml0yh5b89zx9rg2zsnv4ygym"; depends=[afex lme4]; }; @@ -7941,17 +8023,17 @@ 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]; }; + funest = derive2 { name="funest"; version="0.0.1.3"; sha256="1pi556klfnbmrsx5c0f3v4hdn5m4dxxm71ijivanpwfqnfls8xh3"; depends=[funData MFPCA pec prodlim purrr ranger Rdpack survival tdROC]; }; fungible = derive2 { name="fungible"; version="1.95.2"; sha256="031z94a5ayc8sd7vgwj0g1wxzq28mibnr9a0wskgfgvhm80f8pmd"; depends=[clue GPArotation lattice MASS mvtnorm nleqslv Rcsdp RSpectra]; }; funique = derive2 { name="funique"; version="0.0.1"; sha256="0p9k4nxjns1xid9vmslkaap0hm6yq6pbyvylgygd808if4q1z8k6"; depends=[]; }; funnelR = derive2 { name="funnelR"; version="0.1.0"; sha256="143lb048krgh8rkkz6sm8h464kdy62w29fvvyar795vqi10bb5fy"; depends=[ggplot2]; }; funneljoin = derive2 { name="funneljoin"; version="0.1.0"; sha256="17g1mvq9z5m29r0v2r2nn8980j515jamnpwvvnzj83vk84bz94rq"; depends=[broom dplyr glue magrittr purrr rlang tibble tidyr]; }; - funprog = derive2 { name="funprog"; version="0.1.0"; sha256="1npyijpsbb9n3z8pyvf2pbnf67jlcqw4wl2jm860i3z13j1cnhmn"; depends=[]; }; + funprog = derive2 { name="funprog"; version="0.2.0"; sha256="1gs0mahvzgnv5pfvz32acq0jk3rnssg6bxqzlqpyqg0r3g4m80mf"; depends=[]; }; funr = derive2 { name="funr"; version="0.3.2"; sha256="11mjd1ba9kwawh7k5py54mkq4g1df79d7qivan8fj11qfwfzm679"; depends=[]; }; - funrar = derive2 { name="funrar"; version="1.3.1"; sha256="1i206awpkc5vvi3aii5kszf57wipqqkqply2xfn0b969fnd0ln6x"; depends=[cluster dplyr]; }; + funrar = derive2 { name="funrar"; version="1.4.0"; sha256="15pbc5v6ncs96hbka4nxxm33nbd7q0nign7wa136prziqnsyndwi"; depends=[cluster dplyr]; }; funreg = derive2 { name="funreg"; version="1.2"; sha256="199zvqali0sb0z4yp20rm5da0kd7z3rgv47g1cb1apsbcw0cq51n"; depends=[MASS mgcv mvtnorm]; }; funtimes = derive2 { name="funtimes"; version="6.1"; sha256="1qr0z0nn3dv2yxq4sacsm0xs4pnda31zc10rz427rdyjrps85838"; depends=[dbscan Jmisc Kendall Rdpack]; }; - furniture = derive2 { name="furniture"; version="1.9.5"; sha256="1vls4x1nppi1ivra7jyhh9cqixpjf6gixk6hcirqnbb4vr4zww2p"; depends=[crayon dplyr knitr magrittr rstudioapi tibble]; }; + furniture = derive2 { name="furniture"; version="1.9.7"; sha256="1czc1ayfpqf6h7n5fjzx1vwkzm9vg1dr62hl5k511b9kdc8lfsfh"; depends=[dplyr knitr magrittr]; }; furrr = derive2 { name="furrr"; version="0.1.0"; sha256="1ld9aa9hydna94hgm6p91zjbfv1dz1vsgchjlpknkg6irbvkfafx"; depends=[future globals purrr rlang]; }; fusedest = derive2 { name="fusedest"; version="1.3.1"; sha256="1nz5bkvn8y9f8h0ya6wblryg7bwj1vnz1vyqmd1hfr85bxfgl83c"; depends=[igraph Matrix Rcpp RcppEigen]; }; fuser = derive2 { name="fuser"; version="1.0.1"; sha256="17lsfpd9hdichj3wflac896zyjbq7a8w2gmlgj8nbgg80f646fgr"; depends=[glmnet irlba Matrix Rcpp RcppEigen RSpectra]; }; @@ -7967,12 +8049,13 @@ in with self; { future_apply = derive2 { name="future.apply"; version="1.4.0"; sha256="1kgq6dv96hdy35kysqkn606nj7s9dp4ibgpm6n46gqhc5n75lzkk"; depends=[future globals]; }; future_batchtools = derive2 { name="future.batchtools"; version="0.8.1"; sha256="034sgd5pcv6d4jbi21ishwz5r1ym82g1pvyv3s0sl1jsy5g55v0w"; depends=[batchtools future]; }; future_callr = derive2 { name="future.callr"; version="0.5.0"; sha256="0rjvjmffc4m9kr4p40q1gyv1zf49m8q0fb04kmdi7a8q2jfflpna"; depends=[callr future]; }; + future_tests = derive2 { name="future.tests"; version="0.2.1"; sha256="1f75y7s9yrsz8c3vbsvp55zllp6sbpjrxbxknm1rfhg4sc2ak33c"; depends=[cli crayon future prettyunits sessioninfo]; }; futureheatwaves = derive2 { name="futureheatwaves"; version="1.0.3"; sha256="122b2z86bzxfch67y6cpq8wj62mw0dgkzbmnpwi247kdx7w5mw1f"; depends=[data_table dplyr ggplot2 ggthemes leaflet Rcpp stringr tidyr]; }; fuzzr = derive2 { name="fuzzr"; version="0.2.2"; sha256="1cwq7a5j6lzrlz9dw3hsfap988rh1kkgf03yni7c33zl69xp5w77"; depends=[assertthat progress purrr]; }; fuzzyFDR = derive2 { name="fuzzyFDR"; version="1.0"; sha256="0zd8i9did0d9gp42xjmwrccm32glabvvy08kl8phhwb1yaq53h7w"; depends=[]; }; fuzzyRankTests = derive2 { name="fuzzyRankTests"; version="0.3-10"; sha256="1xj5xsm2s4ylv3b8v80qny201iddjym07h8d50asas7xy1k7945z"; depends=[]; }; - fuzzySim = derive2 { name="fuzzySim"; version="2.0"; sha256="00rl5npz656hwpd1ah8bgh9baqpa9z2lgxc44amm5w3pb9pqjkbs"; depends=[]; }; - fuzzyforest = derive2 { name="fuzzyforest"; version="1.0.6"; sha256="1g8vmz0srddw879prk7br535rdrgngpiyz2m0zchwahfjkn7yqz5"; depends=[doParallel doRNG foreach ggplot2 mvtnorm randomForest]; }; + fuzzySim = derive2 { name="fuzzySim"; version="3.0"; sha256="18h0lxzqyp7fzjv7vnyfbwpaxjx15sw0h9l5yq846xzhkza79xxp"; depends=[]; }; + fuzzyforest = derive2 { name="fuzzyforest"; version="1.0.8"; sha256="0sb7qia01a5h6p12riq6vdq9likmqb6i949axsxszy5sf1zk50v5"; depends=[doParallel foreach ggplot2 mvtnorm randomForest]; }; fuzzyjoin = derive2 { name="fuzzyjoin"; version="0.1.5"; sha256="1lz7zxpqn206rgk956c4z9sfj3rg66pwcyci7d3r63cbgynq1gcs"; depends=[dplyr geosphere purrr stringdist stringr tibble tidyr]; }; fuzzyreg = derive2 { name="fuzzyreg"; version="0.5.1"; sha256="19ppb1m655z3n7h4wcd5bwjciw4ynjbi883ki50mr5di3zy64n4r"; depends=[limSolve quadprog]; }; fuzzywuzzyR = derive2 { name="fuzzywuzzyR"; version="1.0.3"; sha256="1kbli1m44317m95a0r34vza9p27vd9ala05jrbrdkadninwdynal"; depends=[R6 reticulate]; }; @@ -7988,54 +8071,54 @@ in with self; { gDefrag = derive2 { name="gDefrag"; version="0.2"; sha256="0z2jbb53x0knxajap1f2w25s732xqy1fyayxh2mzlbhm0zf3pjjw"; depends=[igraph maptools rgdal rgeos sp]; }; gIPFrm = derive2 { name="gIPFrm"; version="3.1"; sha256="08rfdac442picbw1r3xyxjzf2dc57svg44am0714z4r72mshvj04"; depends=[]; }; gLRTH = derive2 { name="gLRTH"; version="0.2.0"; sha256="1drmmr576n3pbr0q1cnnx4k7r4iz061n2cizv1kpr3wcc1g291pn"; depends=[]; }; - gMCP = derive2 { name="gMCP"; version="0.8-14"; sha256="11q2d4a352z7c0ln10mdpms1cl4bh5hqmg9avmbxw54z4i00mdvy"; depends=[CommonJavaJars JavaGD MASS Matrix multcomp mvtnorm PolynomF rJava xlsxjars]; }; - gMOIP = derive2 { name="gMOIP"; version="1.3.0"; sha256="0v3hxy95g9nl5njmlskb18c5icsyq5n1sg41lm8gpgx4qp5fd4zb"; depends=[geometry ggplot2 ggrepel MASS plyr rgl]; }; - gMWT = derive2 { name="gMWT"; version="1.1"; sha256="1ws96x3vjswh6m6s9zn3r9gp7xp6ybdkkxsq9a73ng2zqz2qjdl0"; depends=[clinfun Rcpp RcppArmadillo]; }; + gMCP = derive2 { name="gMCP"; version="0.8-15"; sha256="01048j9489rrhv9syqrbw4c5i5gsll41ysm27awxw6l1rshbqsqn"; depends=[CommonJavaJars JavaGD MASS Matrix multcomp mvtnorm PolynomF rJava xlsxjars]; }; + gMOIP = derive2 { name="gMOIP"; version="1.4.3"; sha256="0zk2m81kbsb40bjgvv29cl7azr2kfa528ph1lhrp88zsiv3hv3py"; depends=[dplyr geometry ggplot2 ggrepel MASS Matrix plyr purrr Rfast rgl rlang]; }; + gMWT = derive2 { name="gMWT"; version="1.1.1"; sha256="1vbw548fyrf012ry54p3gybdsil8c9llg2r9njhsiy7rb0gz2613"; depends=[clinfun Rcpp RcppArmadillo]; }; gPCA = derive2 { name="gPCA"; version="1.0"; sha256="1ylb1d24dxnzpws9bbanwhyizjr3ljky2bhrph4c5yaq0zwwbrkw"; depends=[]; }; gPdtest = derive2 { name="gPdtest"; version="0.4"; sha256="00dlhnklfg2yp4hp7yjgr2nfswv22c007xq1mxdbkll62zgd94mq"; depends=[]; }; gProfileR = derive2 { name="gProfileR"; version="0.7.0"; sha256="1h1v0kgpsn04ald2izznh7fr2riwisj5hcgz4k7h3qc931rf0r4k"; depends=[plyr RCurl]; }; - gRain = derive2 { name="gRain"; version="1.3-3"; sha256="1vbsvnipy014lda8djxz5a81c0c967hci31jlmkkg5523p8l2g6r"; depends=[graph gRbase igraph magrittr Rcpp RcppArmadillo RcppEigen Rgraphviz]; }; + gRain = derive2 { name="gRain"; version="1.3-4"; sha256="0gd04qd92mnd9j9r1ln3m19dywkbx4aq979lxm0csm7d0vhbdq99"; depends=[graph gRbase igraph magrittr Rcpp RcppArmadillo RcppEigen Rgraphviz]; }; gRapfa = derive2 { name="gRapfa"; version="1.0"; sha256="07yzwzna9pdyzndxk6wwyl6v3gkfc7dvy1ixmdl3d38mcl1ahwyq"; depends=[igraph]; }; - gRbase = derive2 { name="gRbase"; version="1.8-5.1"; sha256="04xccgrprzv1hs6v19fiy4fcyp9frsrrsw6nyw1ksh8cx4w681ar"; depends=[graph igraph magrittr Matrix RBGL Rcpp RcppArmadillo RcppEigen Rgraphviz]; }; + gRbase = derive2 { name="gRbase"; version="1.8-6.4"; sha256="08rp6jjpcxzzad617fycc4yq7jlkclkvfa3dvb2qj4k4g1xpl2h9"; depends=[graph igraph magrittr Matrix RBGL Rcpp RcppArmadillo RcppEigen Rgraphviz]; }; gRc = derive2 { name="gRc"; version="0.4-3.2"; sha256="0f8m83wqhmsn6p0v0msdzyy9vl900nc9ddr8y78181jxcd9mqd0d"; depends=[gRbase MASS]; }; - gRim = derive2 { name="gRim"; version="0.2-0"; sha256="0ihl4vsnp6xkcpcf37p2xcqnbvyvjamcz5060f1kirn8xzwzq29y"; depends=[gRain graph gRbase igraph Rcpp RcppArmadillo]; }; + gRim = derive2 { name="gRim"; version="0.2.1"; sha256="0j5r4pnjmyc9z0yfs8bgp0w8w4prlqwvnxmg5pm5gz09h8kkd2qq"; depends=[gRain graph gRbase igraph magrittr Rcpp RcppArmadillo RcppEigen Rgraphviz]; }; gSEM = derive2 { name="gSEM"; version="0.4.3.4"; sha256="18kh41ibvfflz59gykiq7j2c6a72i8b0w8c2mcprd1nzhnyhvmhy"; depends=[DiagrammeR htmlwidgets knitr MASS]; }; gSeg = derive2 { name="gSeg"; version="0.6"; sha256="19njl093qidwjcwzxkzip78ahgq3zwhc0kscvhjpzb49qkg3srrj"; depends=[]; }; gStream = derive2 { name="gStream"; version="0.2.0"; sha256="1f4xnbavm99yhjmaahazigps41mqlfvvl29kf4fs1yjqr531y36b"; depends=[]; }; gTests = derive2 { name="gTests"; version="0.2"; sha256="1h1sd8mrzcniq7rx7frdlxwpnsn8lifng1x99fqq703hs3znl1yq"; depends=[ade4]; }; - gWQS = derive2 { name="gWQS"; version="2.0.0"; sha256="1ip8zmnvdrw5m2rcfzj4xw9fv5i74909lnxk9m3y8l3vl5iavn8y"; depends=[broom dplyr future future_apply ggplot2 ggrepel kableExtra knitr MASS nnet plotROC pscl reshape2 rlist Rsolnp]; }; - gWQSRS = derive2 { name="gWQSRS"; version="1.1.0"; sha256="1k8yxql65grp2nr4i966139ywz3wwj5vf5nqwgqv4fwxfsmv9mga"; depends=[aods3 broom dplyr future future_apply ggplot2 ggrepel gWQS kableExtra knitr MASS nnet plotROC pscl reshape2 rlist Rsolnp]; }; + gWQS = derive2 { name="gWQS"; version="2.0.1"; sha256="1yl8c9v66n5zbkdcxbrzmjdf24in3gkrxgnyr2lc7pi414zb2dbg"; depends=[broom dplyr future future_apply ggplot2 ggrepel kableExtra knitr MASS nnet plotROC reshape2 rlist Rsolnp]; }; + gWQSRS = derive2 { name="gWQSRS"; version="1.1.1"; sha256="1nhh4g40fl60fnbjn92i6knj9cxd73hd4zr553cmrdr5i3gsmsl2"; depends=[aods3 broom dplyr future future_apply ggplot2 ggrepel gWQS kableExtra knitr MASS nnet plotROC reshape2 rlist Rsolnp]; }; 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]; }; gWidgets2tcltk = derive2 { name="gWidgets2tcltk"; version="1.0-6"; sha256="0arh0yxx63m4df1ccrv0q3vkjncwv3ink8vkalp6ashi2932yfma"; depends=[digest gWidgets2 memoise]; }; gWidgetsRGtk2 = derive2 { name="gWidgetsRGtk2"; version="0.0-86"; sha256="0b1xqffbzxlaaaqf1vzfl0a7b6wnnslsp8v5fbxblv7w951rsc4m"; depends=[cairoDevice gWidgets RGtk2]; }; gWidgetstcltk = derive2 { name="gWidgetstcltk"; version="0.0-55"; sha256="06991rqh4927bal7j718bn2ziy6rws8yq682lmp5vbqhdd36afv2"; depends=[digest gWidgets]; }; + gadget2 = derive2 { name="gadget2"; version="2.3.5"; sha256="1v1qg6rj3q09vkwhj5l3ijzyrgdp36fxkpv55q7l22b47b2krv17"; depends=[]; }; gafit = derive2 { name="gafit"; version="0.5.1"; sha256="160z3cv22prf7118447dla9g1gimwkfad8zdil3fg8n4l22rk51a"; depends=[]; }; gaiah = derive2 { name="gaiah"; version="0.0.2"; sha256="1qc3crjxramyxl86dp8mcmvskixny7x6ji0jqf5dqf5r5qc7zrs9"; depends=[dplyr geosphere ggplot2 lazyeval magrittr maptools raster rgeos sp stringr tidyr]; }; gainML = derive2 { name="gainML"; version="0.1.0"; sha256="1mqhrdjdmc2n7dxilxkqn6xq7z0qnxpigw5bbffnjvvsmdamah0n"; depends=[fields FNN]; }; gains = derive2 { name="gains"; version="1.2"; sha256="1nmrhc7qjlyzn04r1qyjdws5fin3idmi789kbxzilax12ya8xr7k"; depends=[]; }; - galgo = derive2 { name="galgo"; version="1.4"; sha256="1v150flk1x0rixpgvi8crd5iq28w4jk8h2iyv48hz5qmm2pvz1li"; depends=[e1071 MASS nnet R_oo randomForest rpart]; }; galts = derive2 { name="galts"; version="1.3.1"; sha256="0jg0yng1kc6s0qdhq8ps38dsxdcrgdcn8dl2dlclw6rcbknb6h4k"; depends=[DEoptim genalg]; }; gam = derive2 { name="gam"; version="1.16.1"; sha256="1fbldshnfy37bpqprazwp1rkyh9f67mr2krnxpl4688mqq143l40"; depends=[foreach]; }; - gamCopula = derive2 { name="gamCopula"; version="0.0-6"; sha256="0fz6phhdmk0zd3irki4kj5wkpdjbgxd4svw6pinpk4vg3qwz83jd"; depends=[copula doParallel foreach gsl igraph MASS mgcv numDeriv VineCopula]; }; + gamCopula = derive2 { name="gamCopula"; version="0.0-7"; sha256="0zi9g2vxkn1hxc2qyyr1x8p1f9w7fc1j5dmm2mmm333gixkkz9nb"; depends=[copula doParallel foreach gsl igraph MASS mgcv numDeriv VineCopula]; }; gamRR = derive2 { name="gamRR"; version="0.7.0"; sha256="0zn8921a4i1lz5wpdfbd72pqb25r12abyqw7y2w53kfhdzs57f3l"; 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-2"; sha256="1cjrd576l9md1jb1fc1y6iay5y49i0d8by024qsc7yik6f6mdl13"; depends=[]; }; - gambin = derive2 { name="gambin"; version="2.4.1"; sha256="03n5zcwfq8g1vk5w22hw8fhqkc63zz4g9d3gdxa5g8v7v56l3dqy"; depends=[doParallel foreach gtools]; }; - gamboostLSS = derive2 { name="gamboostLSS"; version="2.0-1"; sha256="06n2xk7k24gz95jy1cr6shpfd89ylispq6mn3fvxblqdf8vhdixj"; depends=[mboost stabs]; }; + gambin = derive2 { name="gambin"; version="2.4.3"; sha256="0rb4yh01kk2nbw9dl9vhsd9c7c1fi3pq5f0h7lmngi8zlf80rk69"; depends=[doParallel foreach gtools]; }; + gamboostLSS = derive2 { name="gamboostLSS"; version="2.0-1.1"; sha256="1zrmn2r9814q37nmc29p9lyvpgrz6q7pwby5h37ldsxzzwxqz1ig"; depends=[mboost stabs]; }; gamboostMSM = derive2 { name="gamboostMSM"; version="1.1.87"; sha256="0if0x92lch57ksll8d5i3jzk0kh40593b20c17g3hvc33920c7r0"; depends=[mboost]; }; - gameofthrones = derive2 { name="gameofthrones"; version="1.0.0"; sha256="15jgpv197aqb56iyp4afjajx2rcxz21dhigx9mxipa0b8g2h0s6k"; depends=[ggplot2 gridExtra MASS]; }; + gameofthrones = derive2 { name="gameofthrones"; version="1.0.2"; sha256="10ns4yl1s8adlf334gl8yararj1fpxbg3gy7h69s554m4h878awk"; depends=[ggplot2 gridExtra MASS]; }; games = derive2 { name="games"; version="1.1.2"; sha256="01hbbr2hsxi5j9axpdl0jihpd55pa9hacjxmab8p7cixk3xqqqbf"; depends=[Formula MASS maxLik stringr]; }; - gamesGA = derive2 { name="gamesGA"; version="1.1.3.6"; sha256="1agvh27m5sy8psbsw9nbi39wl7cf406fl9sd9hkc14139w9drfwv"; depends=[shiny]; }; + gamesGA = derive2 { name="gamesGA"; version="1.1.3.7"; sha256="0km0z2haqgykl01xkzsbkpwibavgqfjygx7cg08ni68gw501689l"; depends=[shiny]; }; gamlr = derive2 { name="gamlr"; version="1.13-5"; sha256="0fc27b6qcm01drb7pb14wri2hlb464jig3x7sb8njwrxcqqia14n"; depends=[Matrix]; }; - gamlss = derive2 { name="gamlss"; version="5.1-5"; sha256="0gcngfck0dk2rhjg0z1fnc61dqs0s049jy2rkywaf57531s2k8bc"; depends=[gamlss_data gamlss_dist MASS nlme survival]; }; - gamlss_add = derive2 { name="gamlss.add"; version="5.1-5"; sha256="1fw60f07b7yx7aw00915z49w1d6d7dm4b2sqvcji1682milnxa3n"; depends=[gamlss gamlss_dist mgcv nnet rpart]; }; + gamlss = derive2 { name="gamlss"; version="5.1-6"; sha256="16b7ick1khvldbvfmmpw9cjs1vznnrisvifq7717fxzd8c9s5jdr"; depends=[gamlss_data gamlss_dist MASS nlme survival]; }; + gamlss_add = derive2 { name="gamlss.add"; version="5.1-6"; sha256="0g80bn0nszs2nmka6dypyvqnsgxp7mzhf5nd82n5x4jm3ca3dbdj"; depends=[gamlss gamlss_dist mgcv nnet rpart]; }; gamlss_cens = derive2 { name="gamlss.cens"; version="5.0-1"; sha256="1s83dgifidvc6cbrqirwlvwfzg08mlhmxxiqkbmnsy09i5j9fzd3"; depends=[gamlss gamlss_dist survival]; }; gamlss_countKinf = derive2 { name="gamlss.countKinf"; version="3.5.1"; sha256="1xalp909gxxhyhh4chlr1ssyfhydhw1w3szzbynajji98576zaqv"; depends=[gamlss gamlss_dist]; }; gamlss_data = derive2 { name="gamlss.data"; version="5.1-4"; sha256="1dgfspbmps6ipzcmw681wjdp320nm50dwsxafgrcwxndqgc7fdqd"; 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-5"; sha256="1rl7hzdg5xpvaq3yyzwxhsaqzzs0qidi3ibv454fisijgv8l4vqw"; depends=[MASS]; }; + gamlss_dist = derive2 { name="gamlss.dist"; version="5.1-6"; sha256="1p904x0b07z4amaqdn2xhs7qzbq8lisr6lqc844s3pkxzmny7w1z"; 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]; }; @@ -8043,32 +8126,31 @@ in with self; { gamlss_tr = derive2 { name="gamlss.tr"; version="5.1-0"; sha256="1px9lhwad13s544g4ba8m7nxxd425jyakh6x1p4byxl8bn9w9qgr"; depends=[gamlss gamlss_dist]; }; gamlss_util = derive2 { name="gamlss.util"; version="4.3-4"; sha256="0p8lnwrn7cx97qnxls1x532f3ywszdyib2qiwx5qc7sam59h9c8j"; depends=[gamlss gamlss_dist zoo]; }; gamlssbssn = derive2 { name="gamlssbssn"; version="0.1.0"; sha256="1l8d4qwmq9dklm9imb3cvlncwa6jygf8kg2j1599h1nfhyyhj2vv"; depends=[gamlss gamlss_dist MASS]; }; - gamm4 = derive2 { name="gamm4"; version="0.2-5"; sha256="11wblnh22xq3m3z25i30v2kd0zlf8wa3cm5z38z56rhk3l2wf5bc"; depends=[lme4 Matrix mgcv]; }; + gamm4 = derive2 { name="gamm4"; version="0.2-6"; sha256="128c725y9s07c1m9cvd9hgi9hldrymcs5divd8pw7bdjh9jvdiap"; depends=[lme4 Matrix mgcv]; }; gamm4_test = derive2 { name="gamm4.test"; version="0.1.0"; sha256="0ab6rksr88fsv6whp6cxyshpv5ixmf9lw51cl3rzk870r8q326wg"; depends=[doParallel foreach gamm4 Matrix mgcv plotly RColorBrewer]; }; gammSlice = derive2 { name="gammSlice"; version="2.0-2"; sha256="1klxg1yhmfaz1zjnw1kxl1lm5plkakqh014rpkak2lj8zgf8qnyy"; depends=[KernSmooth lattice mgcv]; }; gamreg = derive2 { name="gamreg"; version="0.3"; sha256="1svrgbb8qdy2hzpq1g38v2lzmlbrn7qljix827biqzwgiajy69gg"; depends=[doParallel foreach glmnet Rcpp RcppArmadillo robustHD]; }; gamsel = derive2 { name="gamsel"; version="1.8-1"; sha256="107hbshi36dcyykhy6w1i1ih84xwdqv1q3nad73d3krf7bhvhg5f"; depends=[foreach mda]; }; ganalytics = derive2 { name="ganalytics"; version="0.10.7"; sha256="03jf7325cgg5p6lzcrzzzx0b40vf3l5vhw95lih098kpmlr1zadf"; depends=[assertthat googleAnalyticsR httpuv httr jsonlite lazyeval lubridate plyr R6 rvest scales selectr stringr tibble XML xml2]; }; - gap = derive2 { name="gap"; version="1.2.1"; sha256="1dbgijnwgmzhrfs2jml5sl09zv73dkai11844chrlfshgv6as82s"; depends=[]; }; + gap = derive2 { name="gap"; version="1.2.2"; sha256="0d5qcmf1lvipf28v3pdcn9prmm8idbcbsxjn54h2na0v6wmsarlw"; depends=[]; }; gap_datasets = derive2 { name="gap.datasets"; version="0.0.4"; sha256="1zlxm3nh1b1mqb94fq2b7sc7v99m9ywz7bz9lz5bhwblk5fzmjii"; depends=[]; }; gapfill = derive2 { name="gapfill"; version="0.9.6"; sha256="0384v7capab7dbyvz6b2jvnh840z6ab3857my0h3cgsys3lhn3c5"; depends=[fields foreach ggplot2 quantreg Rcpp]; }; - 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]; }; gargle = derive2 { name="gargle"; version="0.4.0"; sha256="08zhfk2sl342w35i5n2c93ayypg3z0kbl0020l3y9adqka1vazgx"; depends=[fs glue httr jsonlite rlang withr]; }; garray = derive2 { name="garray"; version="1.1.2"; sha256="0s2dgi556x9jnhafvzz4qkxdbq9dm12gsvsqd2g9iy3468fx9flq"; depends=[]; }; - gaselect = derive2 { name="gaselect"; version="1.0.7"; sha256="0bivbvs8yyspqskvka1s1sr6w3k0m5kk4b66wfz9bfdygnywd6wz"; depends=[Rcpp RcppArmadillo]; }; - gasfluxes = derive2 { name="gasfluxes"; version="0.4-3"; sha256="017y3d67f22r6pxpjxab634kpdcxjd5mq53h3g45cxic1jz3znym"; depends=[AICcmodavg data_table MASS sfsmisc]; }; + gaselect = derive2 { name="gaselect"; version="1.0.9"; sha256="089gyllcmq5rgf5yffclifc7rc8rmq4wk1dhznigxkij4zap67hx"; depends=[Rcpp RcppArmadillo]; }; + gasfluxes = derive2 { name="gasfluxes"; version="0.4-4"; sha256="0gi0zk0h5rw75n6znada0cwa9qzy8higsiiqwgdm3q827j1x8iva"; depends=[AICcmodavg data_table MASS sfsmisc]; }; 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.5"; sha256="0xiy36wrl480lzfcidw5k39arjmwzx4vx5qq8d4qb7ykq25hkjzz"; depends=[Rcpp RcppEigen RcppParallel]; }; + gaston = derive2 { name="gaston"; version="1.5.6"; sha256="1bx6iqfjb9lf3vn0z7v8wjv9m7issvqsnymm4qsgl3622s6qz6rg"; 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=[]; }; - gausscov = derive2 { name="gausscov"; version="0.0.2"; sha256="1a0m7br0yrj8k30rhqxq63jr6vdqhr6n983l34d1c9snspiyqxck"; depends=[]; }; + gausscov = derive2 { name="gausscov"; version="0.0.3"; sha256="012fjyx2gfkab1pfpwrpah81v21rdvj0adnihy150c7y9r773bzz"; depends=[]; }; gaussfacts = derive2 { name="gaussfacts"; version="0.0.2"; sha256="095x7k7m7sy1gqkbm6wiqn26252dclz62sbnkv6cjvmbdxajl7m9"; depends=[]; }; gaussquad = derive2 { name="gaussquad"; version="1.0-2"; sha256="0bcvkssmwwngcd4cnv924n9h3c8z1w3x9c9bkwn5jbz9zyv1lfms"; depends=[orthopolynom polynom]; }; - gazepath = derive2 { name="gazepath"; version="1.2"; sha256="0h5a9bpgx268yh0zy3y4xfvij1ncx92x5qphjc94xmzbrl0br1mf"; depends=[jpeg scales SDMTools shiny zoo]; }; + gazepath = derive2 { name="gazepath"; version="1.3"; sha256="1sv0vdwzmvpnj2k8lphnf4y12fi5md0j2725fjkv1n7a3dkd6faa"; depends=[jpeg scales shiny sp zoo]; }; gb = derive2 { name="gb"; version="2.3.3"; sha256="0gkdkbwr168vi7lgccla49l43rkmjcfrwlqdr65mg5syzcxrh7nh"; depends=[boot KernSmooth]; }; gbRd = derive2 { name="gbRd"; version="0.4-11"; sha256="06x97rw5i6v6cgjxkfhxnw4dn7lghn5q6ra7ri5ag1x9dkfzcl82"; depends=[]; }; - gbfs = derive2 { name="gbfs"; version="1.3.1"; sha256="0kw884fziiczdlvwxrmrxbpikiyglwfa6sf7xqqp4x5vwfrjqmn5"; depends=[curl dplyr httr jsonlite lubridate purrr readr stringr]; }; + gbfs = derive2 { name="gbfs"; version="1.3.2"; sha256="1sgs026bhap2kyla4s7dq9vgxk0daxs3ggixfhin1jqvriqx2b18"; depends=[curl dplyr httr jsonlite lubridate purrr readr stringr]; }; gbm = derive2 { name="gbm"; version="2.1.5"; sha256="0vs6ljaqhwwpgr8wlbhmm4v147rd82kl16rpaijqiylxcc8dxyq6"; depends=[gridExtra lattice survival]; }; gbm2sas = derive2 { name="gbm2sas"; version="2.1"; sha256="0ssjlv849vssmncn01ccpp2myqib5f3g88g0d4rqma2z0ivdpk23"; depends=[gbm]; }; gbp = derive2 { name="gbp"; version="0.1.0.4"; sha256="0awg724gsfwlb0fjcvw0450qdsk4m8x8is16pj5c8fx6nc8rn8bv"; depends=[data_table magrittr Rcpp RcppArmadillo rgl]; }; @@ -8082,42 +8164,43 @@ in with self; { gcerisk = derive2 { name="gcerisk"; version="19.05.24"; sha256="1dn3x9afb6lwys5adi621s6357s66lsif5zv64ilxmckmy2j71zl"; depends=[cmprsk ggplot2 survival]; }; gcite = derive2 { name="gcite"; version="0.10.1"; sha256="0ljgzzl4yy1in5iz42iqkrsq6da4qx838anwdlvbdy96dyafl4ad"; depends=[data_table httr pbapply rvest tm wordcloud xml2]; }; gclus = derive2 { name="gclus"; version="1.3.2"; sha256="1cz0g0i972955hhaji30rx8448x7f3as7z1sww9i5h86ybgirilw"; depends=[cluster]; }; - gcmr = derive2 { name="gcmr"; version="1.0.1"; sha256="093j1cmfw83rck00lx2ns7sfaya7kfc8k7af0q80az7w2g9hmmpv"; depends=[betareg car Formula geoR lmtest nlme sandwich sp]; }; + gcmr = derive2 { name="gcmr"; version="1.0.2"; sha256="0mh542na2byb4aha548lfkzllfnk4rmzcm23jm6642pndvxpnfmj"; depends=[betareg car Formula lmtest nlme sandwich sp]; }; gconcord = derive2 { name="gconcord"; version="0.41"; sha256="1n3pfwk6vip19q1zhbz1n164f9vi7mig8pcd07c4wxnm5ir9dagy"; depends=[]; }; gcookbook = derive2 { name="gcookbook"; version="2.0"; sha256="11g1q187l4j31b6cdzdx5z3s14z3s09l7ynl36pzzn9j19l8cmrc"; depends=[]; }; gdalUtilities = derive2 { name="gdalUtilities"; version="1.0.0"; sha256="1z452lh1n65g78dqynnwq3rcrmm7g4jz7qr25px7qav0zi6944mf"; depends=[raster sf]; }; - gdalUtils = derive2 { name="gdalUtils"; version="2.0.3"; sha256="00q9lcwm1nr2j31wyk567vy89ifhgh0lxv8h869x4k0r6xlqxp7i"; depends=[foreach R_utils raster rgdal sp]; }; - gdalcubes = derive2 { name="gdalcubes"; version="0.2.3"; sha256="04wxy0w1sh1d64995m0b1ss9ly7n2dz7vdgmxgrdn07w7vhbhacx"; depends=[jsonlite ncdf4 Rcpp RcppProgress]; }; + gdalUtils = derive2 { name="gdalUtils"; version="2.0.3.2"; sha256="0krapdy50nd5dvcdflz39dzxpig3zklng3hgxavqg2nvwazalvsc"; depends=[foreach R_utils raster rgdal sp]; }; + gdalcubes = derive2 { name="gdalcubes"; version="0.2.4"; sha256="1xsii3aj11q96xw1zkdri5crynd1g8d499qa74p2c75wqp296mrh"; depends=[jsonlite ncdf4 Rcpp RcppProgress]; }; gdata = derive2 { name="gdata"; version="2.18.0"; sha256="0zwdj7lscgxr8r62ii8hbdh4mb7sa9w4f5nv32zzrxdvymcpya2b"; depends=[gtools]; }; 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]; }; + gdistance = derive2 { name="gdistance"; version="1.3-1"; sha256="04v86kdpag3dvp4zm4ia9y0g9nxa39ka0nmqyw7rkhkmzfs7m6hf"; depends=[igraph Matrix raster sp]; }; + gdm = derive2 { name="gdm"; version="1.4.1"; sha256="0nzjqc138fsd2fh4crblzhnvgcf9iaak9l866xvmzzimw3lrp7qw"; depends=[doParallel foreach raster Rcpp reshape2 vegan]; }; 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]; }; + gdpc = derive2 { name="gdpc"; version="1.1.1"; sha256="1wdfmsc8g7paj3rj75wcvqcjw92bkgc57nz1wc90y67gh1xvxs1i"; depends=[doParallel foreach Rcpp RcppArmadillo xts zoo]; }; gds = derive2 { name="gds"; version="0.1.0"; sha256="0kc3l93640x8d6g3pa9gbr7ci5hmryg9i1nqpasgnvb6ixv6azbm"; depends=[]; }; - gdtools = derive2 { name="gdtools"; version="0.2.1"; sha256="1aax50wyrs4336zpf247l8wmp4spab2n70msziy1ip4gbjn26wa1"; depends=[Rcpp systemfonts]; }; + gdtools = derive2 { name="gdtools"; version="0.2.2"; sha256="08njzin0c6biw62j5w30r9j85vr1m2cg4hmv5d76nym860yrlqjf"; depends=[Rcpp systemfonts]; }; gdxdt = derive2 { name="gdxdt"; version="0.1.0"; sha256="1yrjixq4srmaiy5iaprix4096yhf3ldyklgjag4kxd3l5acwap4h"; depends=[data_table]; }; - gear = derive2 { name="gear"; version="0.1.4"; sha256="1wa35965fw4ga3p72z9w40pcc3jdc3fl7gdkfbwgakg7vc6f24xq"; depends=[lattice optimx sp]; }; + gear = derive2 { name="gear"; version="0.2.0"; sha256="1mb2brw0gasmvfj5kajlyqfxiw1kg3fy56fqlldss5gbl29y67qr"; depends=[autoimage ggplot2 lattice optimx sp]; }; gee = derive2 { name="gee"; version="4.13-20"; sha256="167pzgnmj4cjc41ykps1mfwi6s7y32zxyycn5z17vn4v0pp4q0ak"; depends=[]; }; gee4 = derive2 { name="gee4"; version="0.1.0.0"; sha256="1vvzb9sc69g292zmh9djd15jgc7falypd5p7mzw6ps7mirpbnicf"; depends=[Formula Rcpp RcppArmadillo]; }; geeM = derive2 { name="geeM"; version="0.10.1"; sha256="1r9zyjv7r7r7avdqi54dvczf971frz8pgrs1a04kan5mh4ls6xpy"; depends=[Matrix]; }; geecure = derive2 { name="geecure"; version="1.0-6"; sha256="0nmnrkfgblv38qvk66bdk8933icr59mayqwljkvmpy59sm6br2k5"; depends=[geepack MASS Matrix survival]; }; geepack = derive2 { name="geepack"; version="1.3-1"; sha256="1pyn50pn18ffnraqjb6ncgh3a70c91wq4xyy8n5bva7153556cc2"; depends=[broom magrittr MASS]; }; geesmv = derive2 { name="geesmv"; version="1.3"; sha256="0gm953z8q5cc1adl3d6vj5djg2inc880zfcdl5gd56fnb5gl6h1w"; depends=[gee MASS matrixcalc nlme]; }; - geex = derive2 { name="geex"; version="1.0.11"; sha256="19qqgr16cd4zsmfgl9ny92ncvf1418ilvhb9h3axw24mkycins61"; depends=[lme4 Matrix numDeriv rootSolve]; }; + geex = derive2 { name="geex"; version="1.0.12"; sha256="0zqfd416wl6inr423xzxrnc0as0yrxfqy7fdjyc39i60kghfqyh3"; depends=[lme4 Matrix numDeriv rootSolve]; }; geigen = derive2 { name="geigen"; version="2.3"; sha256="0blg4w9wjprbax8z6md3285v12ajcjmcrpca52l3kd5qmxlvizy7"; depends=[]; }; geiger = derive2 { name="geiger"; version="2.0.6.4"; sha256="0r5g50lpq2cawh3cirj8g954wy129s6a4wjw78blpcc6kdvi5p4d"; depends=[ape coda colorspace deSolve digest MASS mvtnorm ncbit Rcpp subplex]; }; gelnet = derive2 { name="gelnet"; version="1.2.1"; sha256="10ygdfz9f5xhahlqb2divwvaljhiz8jhsd12wvq0qalx0v1h5j0p"; depends=[]; }; gemlog = derive2 { name="gemlog"; version="0.36"; sha256="06av0gg9b96fdfq275wany036jxzrym3g5klbjmj1cjvl1kyvjim"; depends=[signal]; }; gemma2 = derive2 { name="gemma2"; version="0.1.1"; sha256="1kbjb5cjgrbdf695nz916w40a78zy5xjmr99l835iy27k3i2p61i"; depends=[Matrix readr]; }; gems = derive2 { name="gems"; version="1.1.1"; sha256="174mjnpldb0rwjvwdgpcg1acm526gs0pjf9gi5mn9d3x9yz4r5jx"; depends=[data_table MASS msm plyr]; }; - gemtc = derive2 { name="gemtc"; version="0.8-2"; sha256="0c2a9gz6rvsc5qh66ixxa4dz6lwhcmmsf2vnvxl98c9kbvdwfqm9"; depends=[coda igraph meta plyr Rglpk rjags truncnorm]; }; + gemtc = derive2 { name="gemtc"; version="0.8-4"; sha256="1vg71vskvpky84371vq9i2x1i8axd7dcsbbv4zac9h2xlf63l39j"; depends=[coda igraph meta plyr Rglpk rjags truncnorm]; }; gen2stage = derive2 { name="gen2stage"; version="1.0"; sha256="16xbzgkjskzm1wik3dznvwhqddrpmcgsgd372n4a67rbb46jgx6r"; depends=[clinfun]; }; gen5helper = derive2 { name="gen5helper"; version="1.0.1"; sha256="0z7hisn57md18vcfb6f44hy6zzp9dirrjyxi4x1id3mqa3mligb6"; depends=[dplyr ggplot2 minpack_lm naturalsort plyr pracma rlang tidyr]; }; genBaRcode = derive2 { name="genBaRcode"; version="1.2.2"; sha256="0ls5xly4rrwjby04015yrs8f072fdg492bk4lj1zr2hy0z4m98jc"; depends=[ape Biostrings dplyr futile_logger future future_apply ggnetwork ggplot2 ggraph ggseqlogo ggtree igraph network phangorn RColorBrewer reshape2 S4Vectors shiny ShortRead stringdist VennDiagram visNetwork]; }; genBart = derive2 { name="genBart"; version="1.0.1"; sha256="12z5vj41npwawz954zqkjfmg9inh063ilh7m82pn73asrxif0ay3"; depends=[clValid data_table fastcluster ggplot2 gtools limma NMF pca3d psych qusage RColorBrewer reshape2 rmarkdown scales shiny shinydashboard shinyjs statmod stringr VennDiagram]; }; genSurv = derive2 { name="genSurv"; version="1.0.3"; sha256="0k5rfpq603szjb76gxffvsbqcav8182h8zwvg4kar68k72yfw1xs"; depends=[]; }; + genTS = derive2 { name="genTS"; version="0.1.3"; sha256="1ky8h8yzqfkb91ny9z08gr7irzvjqr1b42k89ahcrmk458hjwgqr"; depends=[shiny]; }; genalg = derive2 { name="genalg"; version="0.2.0"; sha256="1wzfamq8k5yhwbdx0wy1w5bks93brj0p890xxc4yqrja4w38ja3s"; depends=[]; }; genasis = derive2 { name="genasis"; version="1.0"; sha256="1r0733cc2hss3f8dp19s1ji55yp72mds7p3x1zvvpiks2r7w712p"; depends=[fitdistrplus Kendall]; }; gencve = derive2 { name="gencve"; version="0.3"; sha256="00wbmaffm7mbfv3zl6mb24w1df1a8p24girwdh3a522lw3045iwf"; depends=[C50 class e1071 glmnet lars MASS nnet plus randomForest rpart]; }; @@ -8131,11 +8214,13 @@ in with self; { geneSignatureFinder = derive2 { name="geneSignatureFinder"; version="2014.02.17"; sha256="1s9jj87wnzzgm9hnws09yhrxdlb6jw56i3ddwznvmh8vpzrspv4h"; depends=[class cluster survival]; }; genemodel = derive2 { name="genemodel"; version="1.1.0"; sha256="1x6n6k9ifv2swhyrghvm6fsz5vh85cdik8225175i9msvmkh928n"; depends=[stringr]; }; genepi = derive2 { name="genepi"; version="1.0.1"; sha256="1whhdlq9p8gmygv7464hvfz6dhm65gqq1dqls6hgpmw822zxgbd5"; depends=[]; }; - genepop = derive2 { name="genepop"; version="1.1.4"; sha256="1i7pifh7dyz3vr7138hxcsfixz8y5q5g503gcairvrisf7ggj9fr"; depends=[Rcpp RcppProgress stringr]; }; + genepop = derive2 { name="genepop"; version="1.1.7"; sha256="0b36nspq3kkad52k0viw1pdsf7h9h5ivi0ix7zg8i0z7vkhnm0cy"; depends=[Rcpp RcppProgress stringr]; }; generalCorr = derive2 { name="generalCorr"; version="1.1.5"; sha256="1kjmg9paxhpd6csia69k169qgm8s388iysrjnm4bqv9zxn21zwwg"; depends=[lattice meboot np psych xtable]; }; + generalKSStat = derive2 { name="generalKSStat"; version="1.0.3"; sha256="03jnklvji78xwfspz29jy2jmww893x9xxd25y9gbb73nqmjvgmmr"; depends=[Rcpp]; }; generalhoslem = derive2 { name="generalhoslem"; version="1.3.4"; sha256="0fmfhmdb16gf3v9h50vif4f3f6bm03qq7wplnmzyxa80jb60fcc0"; depends=[MASS reshape]; }; generator = derive2 { name="generator"; version="0.1.0"; sha256="0xjvnmnpdms8rrxxcz6pd8w4rnbv3ghzqv4m63zxia2l98x7z4rf"; depends=[]; }; generics = derive2 { name="generics"; version="0.0.2"; sha256="0xk1xhpy7gpv3pvaygzhpfdxj72zmb38pb4nscfyg2ff36vx3cvi"; depends=[]; }; + genero = derive2 { name="genero"; version="0.1.0"; sha256="0akwwy5xbh7s40v8dr1zr7jfglv0iyh4zn0sb0rnz4r57qr6nh8w"; depends=[]; }; genesysr = derive2 { name="genesysr"; version="1.0.0"; sha256="05jp8z7313r5wi9a5yw7fh198l7nd2ywzwg4f23yp4kfrkkgawn5"; depends=[dplyr httr jsonlite]; }; genetics = derive2 { name="genetics"; version="1.3.8.1.2"; sha256="1v0ylnia6c44v356dsmnkx6054vcxazpzsrdh3yph5ch5vg6gjrh"; depends=[combinat gdata gtools MASS mvtnorm]; }; genie = derive2 { name="genie"; version="1.0.4"; sha256="0ymrn42ik0rfildmyq4z0gsd7injda0dsjgx69nqb6hq0x8s5hqa"; depends=[Rcpp]; }; @@ -8154,61 +8239,59 @@ in with self; { 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.1"; sha256="1vz4pq8rfvw0pbxhm83mbgsrj17ldcssq92b48p6vlpb403jsm91"; depends=[ggplot2 MASS nleqslv]; }; - genridge = derive2 { name="genridge"; version="0.6-6"; sha256="1hqarvd767h2vbjqfjzdr0548hxj87kv1073hfqyq5fybdlzsjx3"; depends=[car]; }; + genridge = derive2 { name="genridge"; version="0.6.7"; sha256="07mdkkq4j8i5x8d4yfsp2rfpf7gkcgdcsw9b2ng5f7gdnblrw0dr"; 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]; }; gensvm = derive2 { name="gensvm"; version="0.1.3"; sha256="1r9vd6h3divmjd73p3541mngv452v1dkxc41q7mbkd5qhy34km74"; depends=[]; }; genvar = derive2 { name="genvar"; version="0.0.2.0"; sha256="1agkyq84kl64q77n5sml44ind16c1zf16ivr6c7n08746gra3mbc"; depends=[clubSandwich foreign Formula plm readstata13 rlang sandwich]; }; geoBayes = derive2 { name="geoBayes"; version="0.6.3"; sha256="153a7kp73wxm5hzzq038p3mnykhakv0c9qa8fpbjijccmbi89970"; depends=[coda optimr sp]; }; - geoCount = derive2 { name="geoCount"; version="1.150120"; sha256="1kcjqls91r6p8ykn901c5p3v2lzbyainahhjpnr5c3a57v8s73ms"; depends=[Rcpp RcppArmadillo]; }; geoGAM = derive2 { name="geoGAM"; version="0.1-2"; sha256="0q09pk2npn4hjymklwfrhz2ybmjpcb6kvqkpn9l3a6cdjgk6bkmj"; depends=[grpreg MASS mboost mgcv]; }; - geoR = derive2 { name="geoR"; version="1.7-5.2.2"; sha256="0ynns6961sbylmqyy1lq0l000gab9kq5pz9ciffj0spdw8s91sxc"; depends=[MASS RandomFields sp splancs]; }; - geoRglm = derive2 { name="geoRglm"; version="0.9-11"; sha256="0qf3nm0snrmplbwgcac0iinni7h2wqm13lm34zzfl00idzv0k9b9"; depends=[geoR sp]; }; - geoSpectral = derive2 { name="geoSpectral"; version="0.17.4"; sha256="0i2k5k66gmf7zvipcd0a489rnpj14j4a4xw9k5dccpj6ybwd47l7"; depends=[dplyr leaflet maps plotly rbokeh rgdal sp spacetime xts]; }; + geoR = derive2 { name="geoR"; version="1.8-1"; sha256="1lvgkpvv4a05lsb1dgphpv733lxbpcj7p2bj1yjjbfch8n04f1lr"; depends=[MASS RandomFields sp splancs]; }; + geoSpectral = derive2 { name="geoSpectral"; version="0.17.5"; sha256="0bw8mv1kq27hql37zcalz3zjj57bhs7g724wfpvzav2rlzvs8n7f"; depends=[dplyr leaflet maps plotly rbokeh rgdal sp spacetime xts]; }; + geoTS = derive2 { name="geoTS"; version="0.1.3"; sha256="12v50r2ym3nb21sskq7h4xsk6nzci06l9iync2ny91iwl7c9nrjc"; depends=[doParallel ff foreach iterators raster sp]; }; geoaxe = derive2 { name="geoaxe"; version="0.1.0"; sha256="043y7kb24hp66j7pnpqsdixvdmppwp72y8i4f8q7xrkhaqlfb93v"; depends=[jsonlite rgeos sp]; }; - geobr = derive2 { name="geobr"; version="1.1"; sha256="1j6g62c4nrjqgvk0yk8b9p52p7a7czwkzly1ld0svvh1hz3yv93x"; depends=[httr readr sf]; }; - geodetector = derive2 { name="geodetector"; version="1.0-3"; sha256="1x6mr05976vdxxgcb4fd3v7mq2lanrl44nqz6f6rk2dy3yhdqi5c"; depends=[maptools rgdal rgeos sp]; }; + geobr = derive2 { name="geobr"; version="1.3"; sha256="0xgjlpxpdkh46gv4pz91hq1q6hxz1ikbfqh5g3xrzwf58hw6mz7h"; depends=[httr readr sf]; }; + geocacheR = derive2 { name="geocacheR"; version="0.1.0"; sha256="04ckxmird6n179xvsx50cjdz046igjxxqdnz5pfxi8pdklnky20c"; depends=[dplyr magrittr stringr threewords tibble]; }; + geodetector = derive2 { name="geodetector"; version="1.0-4"; sha256="00zyx68jjl4mldah8mxfvwvv5yfkd4f1s2rlx6fsw6h8y2cwzj3l"; depends=[maptools rgdal rgeos sp]; }; geodist = derive2 { name="geodist"; version="0.0.3"; sha256="1qxrbpx265l5vwvicspbqzr2s0k3k6lsrzvxnbhnds95jgq9yw4q"; depends=[]; }; + geodiv = derive2 { name="geodiv"; version="0.1.1"; sha256="0vww273947isk9ds6hjg9k47k8kbsbgyjap6iqgqyd9bl9437yrm"; depends=[dplyr e1071 phonTools pracma raster Rcpp RcppArmadillo rgdal rgeos sf sp spatial tibble zoo]; }; geoelectrics = derive2 { name="geoelectrics"; version="0.2.0"; sha256="1dmpaf16750ni4yr36cglfz9pv9jax8jxb3kwn47kxgnx3l8qq98"; depends=[fields lattice rgl]; }; 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]; }; + geofd = derive2 { name="geofd"; version="2.0"; sha256="1rsgy4nxfp1gi4vwh8zfzksr6sr2ga31kmd56q5m56gw530570ra"; depends=[fda]; }; geogrid = derive2 { name="geogrid"; version="0.1.1"; sha256="0b8afwgj9x56z6zh525y7qkiwbv77mjcw3v19kfba0426jn4vi87"; depends=[Rcpp RcppArmadillo rgeos sf sp]; }; geohashTools = derive2 { name="geohashTools"; version="0.3.0"; sha256="0lc5ib6iylbxn02bl72sh3b6j51zm3b1rnjrj5jdyjj22hm7n7sa"; depends=[]; }; geojson = derive2 { name="geojson"; version="0.3.2"; sha256="0iqf8jkqgl97a07v8ixr2pbvamwyjswqckdwl3kkxgx7bycndprv"; depends=[jqr jsonlite lazyeval magrittr protolite sp]; }; - geojsonR = derive2 { name="geojsonR"; version="1.0.7"; sha256="11d6rn7z2i8x4j3myzk9gkaw6y5asi92ya9lxc9cn1zv8jlsamvr"; depends=[R6 Rcpp RcppArmadillo]; }; - geojsonio = derive2 { name="geojsonio"; version="0.8.0"; sha256="00gh6wq1gxnvcx5fswmjc2qxw3jjcc5kf4gdrqn7lv1lip9qm3m1"; depends=[geojson httr jqr jsonlite magrittr maptools readr rgdal rgeos sf sp V8]; }; - geojsonlint = derive2 { name="geojsonlint"; version="0.3.0"; sha256="1ww52fg80mqwpn9rxz7qy698djjgzngp3fdhhhvixfrzl0ha810r"; depends=[crul jsonlite jsonvalidate V8]; }; - geojsonsf = derive2 { name="geojsonsf"; version="1.3.0"; sha256="1wr3g4rcvv7wh0gjw5mic3msz7wgcg6ra3zai5kxbv3wq2i9hfcg"; depends=[BH curl jsonify rapidjsonr Rcpp]; }; + geojsonR = derive2 { name="geojsonR"; version="1.0.8"; sha256="015g1xpvbwgng5vh79q8gx6900skv3p7s2v3xbka08qllvsg5by1"; depends=[R6 Rcpp RcppArmadillo]; }; + geojsonio = derive2 { name="geojsonio"; version="0.9.0"; sha256="0w0qfag64js72qbm15gapgrh6xlh87dzwf0qs9gcrrlr69r5kvk1"; depends=[crul geojson jqr jsonlite magrittr maptools readr rgeos sf sp V8]; }; + geojsonlint = derive2 { name="geojsonlint"; version="0.4.0"; sha256="0l6xlf6l9shyvdd2ghkhcgbkxpmycapfpxakzbvd92j1x8dmr9az"; depends=[crul jsonlite jsonvalidate V8]; }; + geojsonsf = derive2 { name="geojsonsf"; version="1.3.3"; sha256="0a1ij0nq5d4cvrmqs0mpnc2a1c4h9ms29yln9iay9qi5c5pjdd1k"; depends=[curl jsonify rapidjsonr Rcpp sfheaders]; }; geoknife = derive2 { name="geoknife"; version="1.6.3"; sha256="092in9wihgijhbkawzjqwfyazz22n4sc06x2gj14yvmp63x5dj36"; depends=[curl httr progress sp whisker xml2]; }; geomapdata = derive2 { name="geomapdata"; version="1.0-4"; sha256="1g89msnav87kim32xxbayqcx1v4439x4fsmc8xhlvq4jwlhd5xxw"; depends=[]; }; - geomedb = derive2 { name="geomedb"; version="2.0.0"; sha256="1lrxhgrrx12irbk9rlvyqcvzhw842c4hp9mqw7gzqcldhpc40isd"; depends=[ape data_table httr jsonlite]; }; - geomerge = derive2 { name="geomerge"; version="0.3.1"; sha256="0pvyhpv4vq8mvvlybxhviq8rbazw29dgf9m0xnldaxg9r6lqdp4d"; depends=[geosphere ggplot2 gridExtra inlmisc lubridate raster scales sp spdep]; }; + geomerge = derive2 { name="geomerge"; version="0.3.2"; sha256="1i6n88k8icwihr9w7ipjb50f68zad602dipb3hd887y4kyf14wni"; depends=[geosphere ggplot2 gridExtra inlmisc lubridate raster scales sp spdep]; }; geometa = derive2 { name="geometa"; version="0.6-1"; sha256="0q06vj2r8xyiwrkrzixv0ymvwvznk2a6i2sdmykwyzm7vw7phwkw"; depends=[httr jsonlite R6 XML]; }; - geometr = derive2 { name="geometr"; version="0.1.1"; sha256="0bh8m76273vk2hnn2d4fbr9a89av0f8fnww9lfa1v392i56zfi2z"; depends=[checkmate crayon deldir dplyr raster Rcpp rgdal rlang sf sp spatstat tibble]; }; + geometr = derive2 { name="geometr"; version="0.2.4"; sha256="0r7cxc69fchrify0gsll4nzdbx5hcw8221y0q0yns5x10zqrscvk"; depends=[checkmate crayon deldir dplyr raster Rcpp readr rgdal rlang sf sp spatstat tibble]; }; geometry = derive2 { name="geometry"; version="0.4.5"; sha256="1n10l8ax3783v3lgaacb15qsn8b3f0wpmhg3k39j31s6ciyd3vcg"; depends=[linprog 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.2.0"; sha256="0i9i9xcpiqfsh1gk8xar46q6bqv5vkv8kxshxq26wgpyysnls88a"; depends=[ape jpeg rgl RRPP]; }; + geomorph = derive2 { name="geomorph"; version="3.2.1"; sha256="0cndp449szvkmmm0lvz4dggg3xym6xycvx9iyhmmvmpm3qhpjlfg"; depends=[ape jpeg rgl RRPP]; }; geonames = derive2 { name="geonames"; version="0.999"; sha256="0yz1b7y3vwa4izrhpry4n3iwzb7y67s5p3kgnd7d29cl5pcbpmqx"; depends=[rjson]; }; geonapi = derive2 { name="geonapi"; version="0.3-1"; sha256="137g89qbwayd3iw4hfy85a40c8wyyhqd2qsrbqr6j5x155q39wlf"; 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.2"; sha256="0vca4ijybqgk5dmbk0af4ykvbdkny8dm9d4frh5ikzk28hkvnlik"; 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-11"; sha256="1rl1wyr9splx58a1y8vgi2gmy9y6ngm4lydwbkp0fk77wiyv9s26"; depends=[abind constrainedKriging fields lmtest nleqslv nlme quantreg RandomFields robustbase snowfall sp]; }; + georob = derive2 { name="georob"; version="0.3-13"; sha256="1ddynk8ss5jslxrwz7rg650d05qa5sh5qc3rzkrq8s4hpvw1zqgw"; 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.4-1"; sha256="00c2566r50v4vgqzjvghf4spyfqqxnwkhxj38ivym3l8b0d5fd2x"; depends=[httr openssl R6 XML]; }; geoscale = derive2 { name="geoscale"; version="2.0"; sha256="0gisds0in32xhw54fxfyxvwxgrfjs871wmqf6l915nr896rlx0bm"; depends=[]; }; geosed = derive2 { name="geosed"; version="0.1.1"; sha256="07j4q6sgrf83h2gi2j5qap5rifz8gimdacd3b7ld1p3b6ai6kv3r"; depends=[]; }; - geospacom = derive2 { name="geospacom"; version="0.5-8"; sha256="14qyjbq0n43c2zr9gp11gdqgarvmicx3gpq2ql2vjfzrmirxwjgg"; depends=[classInt geosphere maptools rgeos sp]; }; - geospark = derive2 { name="geospark"; version="0.2.1"; sha256="0r5zf80lb5jmqjahv7iszz8kr0983bwnb3cgrm78fg9fs3sv1sjn"; depends=[dbplyr dplyr sparklyr]; }; + geospark = derive2 { name="geospark"; version="0.3.1"; sha256="004axa0k9xg1hra8jihwgnc379k8pib1h0zkr82j0m9sii4wrk6r"; depends=[dbplyr dplyr sparklyr]; }; geosphere = derive2 { name="geosphere"; version="1.5-10"; sha256="15xlgsmn0vwky1l13n6acdz6jn2b2na3gf6x367y3qh1f5w4zkan"; depends=[sp]; }; geospt = derive2 { name="geospt"; version="1.0-2"; sha256="1814nn0naxvbn0bqfndpmizjbqcs6rm87g2s378axkn6qpii4bh8"; depends=[fields genalg gsl gstat limSolve MASS minqa plyr sgeostat sp TeachingDemos]; }; geosptdb = derive2 { name="geosptdb"; version="0.5-0"; sha256="0m0dlazhq2za71mi3q8mz2zvz7yrmda7lha02kh9n820bx89v33z"; depends=[FD fields geospt gsl limSolve minqa sp StatMatch]; }; - geostatsp = derive2 { name="geostatsp"; version="1.7.8"; sha256="1wjjwy365c6wlsxv9l50ph6drzmsyl0mkad36zrgzl9arxhnbkwx"; depends=[abind Matrix numDeriv raster sp]; }; + geostatsp = derive2 { name="geostatsp"; version="1.8.0"; sha256="0vn5zklrw3ds440babgzdm2k8z7pvdqsbwwwcg94d6l188v9mgd3"; depends=[abind Matrix numDeriv raster sp]; }; 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.5.3"; sha256="06mi13gzilp844bramrly9ar52vs3747m3236g0bwjy3b7gqdq9c"; depends=[raster rgdal stringr zoo]; }; + geotoolsR = derive2 { name="geotoolsR"; version="1.1"; sha256="162s37j7wh14h91b6acn453bvgpk3cakfi7mgrdvr5bjdqqn7j7v"; depends=[dplyr geoR ggplot2 tidyr]; }; + geotopbricks = derive2 { name="geotopbricks"; version="1.5.4"; sha256="1mn15mchxkv9qqjrcsyx0pf56sdz0ba7i5jd1ci1ilr6rig81ckz"; depends=[raster rgdal stringr zoo]; }; + geouy = derive2 { name="geouy"; version="0.1.9"; sha256="180s3xkfyg281483x6kdh64ydlpd073xxrl7vakzymnm3qv83mql"; depends=[dplyr fs ggplot2 ggsn ggthemes glue raster rgdal rlang sf sp stringr xml2]; }; geoviz = derive2 { name="geoviz"; version="0.2.2"; sha256="1wx1p72532xpg6y3rlrvaiwx57xad3d9fvy9mbadvj418xwxnmim"; depends=[abind chron curl dplyr ggplot2 glue magrittr png progress purrr raster readr rgdal rgeos rgl rlang sf slippymath sp stringr tibble tidyr]; }; geozoning = derive2 { name="geozoning"; version="1.0.0"; sha256="0cqdi2jgqrxc339qkr57dp11jp40x99f9inwamnh7ymg2q7kq14s"; depends=[deldir fields ggplot2 gstat maptools RandomFields raster rgeos sp]; }; geozoo = derive2 { name="geozoo"; version="0.5.1"; sha256="0g91yhg7zw1bp0lxxblr2irckjg2rl4pg1vgglccnmxkzn0ji2qi"; depends=[bitops]; }; @@ -8218,7 +8301,7 @@ in with self; { gert = derive2 { name="gert"; version="0.3"; sha256="0caxjcdc2karsxasivkh5sasjkzlif25pw0whdjyq6zh3bvmdlkp"; depends=[askpass credentials openssl]; }; gesca = derive2 { name="gesca"; version="1.0.4"; sha256="1ndn8wgp22pr017x6v7jw8jy4gd06x8110qa860hw8i6pn47wfwv"; depends=[]; }; gestalt = derive2 { name="gestalt"; version="0.1.8"; sha256="1cb04rd3yvkd47byynrn0pq6brlsi2z2iavh4gfrwmqyvks34k51"; depends=[rlang]; }; - gestate = derive2 { name="gestate"; version="1.3.2"; sha256="1fr811f4d7zc75wxdrasd91wsa5ngzzb0p73ycy6lfwpm839i28q"; depends=[doParallel foreach shiny shinythemes survival survRM2]; }; + gestate = derive2 { name="gestate"; version="1.4.0"; sha256="1ybwi1733w8z97sdj38l66mb8ynhqhl68ijns6rvwqxphac6v5x8"; depends=[doParallel foreach shiny shinythemes survival]; }; getCRUCLdata = derive2 { name="getCRUCLdata"; version="0.3.1"; sha256="1961w8vpgamna5a9m367mc9szl3vlv8wgmbhfjc0yxp818p07g3a"; depends=[curl data_table hoardr raster tibble]; }; getMet = derive2 { name="getMet"; version="0.3.2"; sha256="0j1h1vy8rd7czpnb4msdb9k560pnh7kjkmpqqwzwin2ms1c0mggb"; depends=[EcoHydRology jsonlite]; }; getPass = derive2 { name="getPass"; version="0.2-2"; sha256="03ydafhh0sk3rcnpr3paajyji64x2ddp6p814p9mvbmyrblcgzcc"; depends=[rstudioapi]; }; @@ -8226,21 +8309,20 @@ in with self; { getTBinR = derive2 { name="getTBinR"; version="0.7.0"; sha256="03xfi6cdsw5h7pmnzaxh9ig2j05jmyzzcjrslayanwdfwk370zas"; depends=[data_table dplyr ggplot2 ggthemes magrittr plotly purrr rlang 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.2.0"; sha256="0rxj1dyfqy3fw2jhv05sw9x70p67rxmq3aqffymzal61rz6cnr3y"; depends=[ggplot2 gridExtra gtable metafor psych stargazer]; }; + getmstatistic = derive2 { name="getmstatistic"; version="0.2.1"; sha256="0jbg668kwkvnzgk6678w000mijch28ni9rr5b9c1l9icwcsphmlc"; depends=[ggplot2 gridExtra gtable metafor psych stargazer]; }; getopt = derive2 { name="getopt"; version="1.20.3"; sha256="0zzmzgwl9a4y3s34600vmih22d6y32294f9bvxrnmffnvkgmy7sk"; depends=[]; }; - gets = derive2 { name="gets"; version="0.21"; sha256="0frpfwb1sbbnhs1j77dlxrpsfl9nk6nyjg6aly0hn2vpi9p934ns"; depends=[zoo]; }; - getspres = derive2 { name="getspres"; version="0.1.0"; sha256="1y51l9bq5p025nyv37q7mmda7yw2qrw42dz50pwlrmi8h27l9zkf"; depends=[colorRamps colorspace dplyr metafor plotrix RColorBrewer]; }; + gets = derive2 { name="gets"; version="0.22"; sha256="0k5lji4gglb1is3j2596yibr6cx4h82aslwcbm4hb6jjb76ajmcv"; depends=[zoo]; }; + getspres = derive2 { name="getspres"; version="0.1.1"; sha256="1k69b7by1398pc9knp97r3k6pv8hixzianqal71ggdrwsb3n1gis"; depends=[colorRamps colorspace dplyr metafor plotrix RColorBrewer]; }; gettz = derive2 { name="gettz"; version="0.0.3"; sha256="1i06nfm824131q8lwwhrbzg2g9lbnmyp8k57w2vag7v8jj5rdrda"; depends=[]; }; - gexp = derive2 { name="gexp"; version="1.0-0"; sha256="0jasxyr9rwdj1lmsc5zr77kkzm4nci3pxgc4npr7j0wcim7k8lby"; depends=[jpeg mvtnorm png]; }; + gexp = derive2 { name="gexp"; version="1.0-1"; sha256="1i3sarsawax1landjbm8gxrcrimwzdgrbybzipqwxdrmlgvxslqk"; depends=[jpeg mvtnorm png]; }; 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]; }; - gfoRmula = derive2 { name="gfoRmula"; version="0.2.1"; sha256="0hqjpav6zaxgk5mwx72qphcpc4gvm2072kl15419arr6aqf79kkq"; depends=[data_table ggplot2 ggpubr nnet stringr survival truncnorm truncreg]; }; + gfoRmula = derive2 { name="gfoRmula"; version="0.3.1"; sha256="1y1k5zwv06kc6qk7ki7x7c1618irvwd6iw26gs5n8lv8z3cifqmy"; depends=[data_table ggplot2 ggpubr nnet progress stringr survival truncnorm truncreg]; }; gg_gap = derive2 { name="gg.gap"; version="1.3"; sha256="0m66050ryn31xmsmmikjsssllasvjdmp9yjbwfdwfpwdv106zn9h"; depends=[cowplot ggplot2]; }; ggBubbles = derive2 { name="ggBubbles"; version="0.1.4"; sha256="116rl8j0s9xwhh9jl5yj9fspkhv2zrirbx9247hhns9ngrdn4i3x"; depends=[dplyr ggplot2]; }; ggChernoff = derive2 { name="ggChernoff"; version="0.2.0"; sha256="09bh9isvx3hwwvg72fv6z3fvp8dimpbhvbp328z8amq8jjhph4vf"; depends=[ggplot2 scales]; }; ggExtra = derive2 { name="ggExtra"; version="0.9"; sha256="18mbi6gblqmrsciad1d2c9ngllk6mayaqj43k40hjq9ydqnvjbgj"; depends=[colourpicker ggplot2 gtable miniUI R6 scales shiny shinyjs]; }; - ggPMX = derive2 { name="ggPMX"; version="1.0"; sha256="0cv99y4w2p8g0q2w1yv0fc5r2prwcniqlawks86z9avr7963ppmq"; depends=[assertthat checkmate data_table GGally ggplot2 gtable knitr magrittr R6 rmarkdown stringr yaml zoo]; }; ggQC = derive2 { name="ggQC"; version="0.0.31"; sha256="1j9cs97hcj5zmqvn5rjr3gl0b9748s3pv2nb7v66dsyjdwvj7wyy"; depends=[dplyr ggplot2 tidyr]; }; ggQQunif = derive2 { name="ggQQunif"; version="0.1.5"; sha256="0vrxmqxy946mwdq0mb2m1ch41r0chrw7hcn18dr3mp10bv7pl7wj"; depends=[dplyr ggplot2 scales]; }; ggROC = derive2 { name="ggROC"; version="1.0"; sha256="0p9gdy7ia59d5m84z9flz5b03ri7nbigb3fav2v2wrml300d24vn"; depends=[ggplot2]; }; @@ -8253,55 +8335,59 @@ in with self; { ggalluvial = derive2 { name="ggalluvial"; version="0.11.1"; sha256="05c59w9rmp59ajw8ybr155c9xfxzlgc76xcnxh3890nh7nn7h0m1"; depends=[dplyr ggplot2 lazyeval rlang tidyr tidyselect]; }; ggalt = derive2 { name="ggalt"; version="0.4.0"; sha256="0ssa274d41vhd6crzjz7jqzbwgnjimxwxl23p2cx35aqs5wdfjpc"; depends=[ash dplyr extrafont ggplot2 gtable KernSmooth maps MASS plotly proj4 RColorBrewer scales tibble]; }; ggamma = derive2 { name="ggamma"; version="1.0.1"; sha256="1zc4p2bz4pxqycrzgb9wwl53lxqcikxsihna6ff8pmw1n623j85z"; depends=[]; }; - gganimate = derive2 { name="gganimate"; version="1.0.4"; sha256="0z25fanxakc4vh67dnx99iygkxkpv8rjh9vlyypbwgy6rrg2mvpc"; depends=[ggplot2 glue plyr progress rlang scales stringi tweenr]; }; - ggasym = derive2 { name="ggasym"; version="0.1.2"; sha256="1nhsiamiv8dwn5cb2l7z7dzy46x6qcygxr2ncp0nqp6rnl7mh712"; depends=[broom corrr dplyr ggplot2 magrittr purrr rlang scales stringr tibble tidyr]; }; + gganimate = derive2 { name="gganimate"; version="1.0.5"; sha256="0kvz9gm56zz61bq7sky0m9mrlk8awjx0xm3yw9dawz1vw4a5fr3x"; depends=[ggplot2 glue plyr progress rlang scales stringi tweenr]; }; + ggasym = derive2 { name="ggasym"; version="0.1.3"; sha256="1vfwzjwmh27ki0j7nadmnl28wddjs4nzmraak868hmph9a2bjdgj"; depends=[dplyr ggplot2 magrittr purrr rlang scales stringr tibble tidyr]; }; ggbeeswarm = derive2 { name="ggbeeswarm"; version="0.6.0"; sha256="0crk29p5vi1r3a988kms4y7r0iqwgwzsikgvh18r9wbzyr98bb5v"; depends=[beeswarm ggplot2 vipor]; }; ggbuildr = derive2 { name="ggbuildr"; version="0.1.0"; sha256="0pld635v6fv46ky7s4icwxlcnr7z6bp5ikf20adpkljwhy0wwxak"; depends=[ggplot2 purrr readr]; }; + ggcharts = derive2 { name="ggcharts"; version="0.1.0"; sha256="0prv174ifhj4chp23r4wwmgkhw2g8q8chm2jixzbks2z08xqvahs"; depends=[dplyr ggplot2 magrittr patchwork rlang]; }; ggconf = derive2 { name="ggconf"; version="0.1.3"; sha256="0g4xasqhdiqfqahakv6p5npl56f2iakx4bnc9v9zcjr077kdda4n"; depends=[ggplot2 rly]; }; ggcorrplot = derive2 { name="ggcorrplot"; version="0.1.3"; sha256="0hi9lz121ya1l2lbm7rqlxg6fs6bvxck396dngnidrhl5fvqb41b"; depends=[ggplot2 reshape2]; }; - ggdag = derive2 { name="ggdag"; version="0.2.1"; sha256="0cqshv72fd188z58k0df67i52x4ss764x28x7xn2m9f7cypnqw38"; depends=[dagitty dplyr forcats ggforce ggplot2 ggraph ggrepel igraph magrittr pillar plyr purrr stringr tibble tidygraph]; }; + ggdag = derive2 { name="ggdag"; version="0.2.2"; sha256="0gv7gf2bbrd0m1hjvk6j39ckyvxn5lj749q4fzlzzc5mxr3qdfyz"; depends=[dagitty dplyr forcats ggplot2 ggraph ggrepel igraph magrittr pillar purrr stringr tibble tidygraph]; }; ggdark = derive2 { name="ggdark"; version="0.2.1"; sha256="1w93g2j4g45x9s841v9zi18lxzda81ipa13fajqc6p9xk8frvgrf"; depends=[ggplot2]; }; ggdemetra = derive2 { name="ggdemetra"; version="0.2.1"; sha256="1d5adnamv2gnnj3q8779brl827d2zbqpkgfz2r097jndy5ng1021"; depends=[ggplot2 ggrepel gridExtra RJDemetra]; }; ggdendro = derive2 { name="ggdendro"; version="0.1-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.6.0"; sha256="1gncv7npl548k3zd41x2gwg5qywn5rp6zb4i7ga78sy77mvi3x92"; depends=[coda data_table ggplot2 matrixStats Rcpp RcppArmadillo]; }; gge = derive2 { name="gge"; version="1.4"; sha256="0plwk5j2n0309ghgn8r4ws3azwn7n4jb7yfykiiwwalhs3k05lsa"; depends=[nipals reshape2 rgl]; }; + ggeasy = derive2 { name="ggeasy"; version="0.1.2"; sha256="06rynzv6vqngay5cjrig550dfada66075qs69l4rpfqci0vh05km"; depends=[ggplot2 rlang]; }; 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.14.0"; sha256="1djz82xww86h8f33m2vm40lliicppgyhm6hyn3h6rzrqjrlrsmdw"; depends=[insight magrittr MASS purrr sjlabelled sjmisc]; }; - ggenealogy = derive2 { name="ggenealogy"; version="1.0.0"; sha256="1wi29f7allky84w9w2512v8gs687gvypsbd7r4vyxs24l6pfssyc"; 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]; }; + ggeffects = derive2 { name="ggeffects"; version="0.14.2"; sha256="1y3yfb07jrr6vkc8hk6rp52l70dj7042jvqgjzllslzy7hx2jhyw"; depends=[insight MASS sjlabelled]; }; + ggenealogy = derive2 { name="ggenealogy"; version="1.0.1"; sha256="19six9ln1yaqv268abm9qvb61nl8zdz3gghwr8hmwsa94xwhzhkq"; depends=[ggplot2 igraph plotly plyr reshape2 tibble]; }; + ggetho = derive2 { name="ggetho"; version="0.3.5"; sha256="1gwd4mkja2xypzm2c1w61lq126cn1fdcw8l8gkzsl2ljn2xd2phi"; 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.8.1"; sha256="1a5k8fba2qjxnpd14vqkakpzcwkzqbpvs8h6fb9zh62y91n6p26v"; depends=[ggplot2 shades stringi]; }; ggfocus = derive2 { name="ggfocus"; version="1.0.0"; sha256="03q0rz7flm8sc8hrlkcm5fz66qiyxb8z8q4bh9dglhw0jc8q1fvb"; depends=[dplyr ggplot2 magrittr RColorBrewer rlang]; }; ggforce = derive2 { name="ggforce"; version="0.3.1"; sha256="04926cqrda6psvy2nzkkw4czwyxdp7fnxg76byp14v12kgd72lm0"; depends=[ggplot2 gtable MASS polyclip Rcpp RcppEigen rlang scales tidyselect tweenr withr]; }; - ggformula = derive2 { name="ggformula"; version="0.9.2"; sha256="16ycabhnp78fsiv1dc63ccgh9gmpsy2683vbmq0fdzl6w3pd87sr"; depends=[ggplot2 ggstance magrittr mosaicCore rlang stringr tibble tidyr]; }; - ggfortify = derive2 { name="ggfortify"; version="0.4.8"; sha256="191q2z7w0l4v7swjlxs2hjgbjngw2838688s7ygnj0kigsm310f3"; depends=[dplyr ggplot2 gridExtra scales stringr tibble tidyr]; }; + ggformula = derive2 { name="ggformula"; version="0.9.4"; sha256="04vdhg1bbc1psrx9ggaphz7cx4fw5xsmhkqpqfcg2w4ba2bjy46f"; depends=[ggforce ggplot2 ggstance magrittr mosaicCore rlang stringr tibble]; }; + ggfortify = derive2 { name="ggfortify"; version="0.4.9"; sha256="1p6knrbyaynaqwd939w09hpf1zz1gn95cb46sfgppl8l98krb2h5"; depends=[dplyr ggplot2 gridExtra scales stringr tibble tidyr]; }; gggenes = derive2 { name="gggenes"; version="0.4.0"; sha256="13hrjh80rlri8vm736p85v2jwwpck8gc5jfps1qrqcq86kv2xgkn"; depends=[ggfittext ggplot2 rlang]; }; ggghost = derive2 { name="ggghost"; version="0.2.1"; sha256="0kvsjadxxdf6yvzk4a6yqkg02q1ysslvf3m0a369bdim396z4hnv"; depends=[animation ggplot2]; }; gggibbous = derive2 { name="gggibbous"; version="0.1.0"; sha256="1g6igmj2nh4b516p1wcs1cwgzdnawvf3snxzwxjkmdc4yqbzyz24"; depends=[ggplot2 scales]; }; ggguitar = derive2 { name="ggguitar"; version="0.1.1"; sha256="1lmfs54h91gzcxin37v4flkywbq3fs648mm1h9ak03xlj5nagzsi"; depends=[dplyr ggplot2 gridExtra lazyeval readr tibble]; }; gghalfnorm = derive2 { name="gghalfnorm"; version="1.1.2"; sha256="1sy0m6pqmnjbqv60rljyblhis0dxwkhw751jhlad5arcgrcwf4k8"; depends=[ggplot2 ggrepel]; }; - gghalves = derive2 { name="gghalves"; version="0.0.1"; sha256="03s1wrfgkd55zmf3scv6kp32s3lcpbm5prnc5ndgad43zq8jyi09"; depends=[ggplot2 gtable]; }; - gghighlight = derive2 { name="gghighlight"; version="0.2.0"; sha256="1500lv7lsf2aaw4jny61apx62nnj76mnwfvr8kl3qidip53cah48"; depends=[dplyr ggplot2 ggrepel lifecycle magrittr purrr rlang scales tibble]; }; - ggimage = derive2 { name="ggimage"; version="0.2.7"; sha256="01yymg5q4bjnchlxpc7yjskjaz1bkf707fvr01kn18cr4bb606mg"; depends=[ggplot2 ggplotify jsonlite magick rvcheck scales tibble]; }; - gginference = derive2 { name="gginference"; version="0.1.0"; sha256="0dikyqryz25ikm047clkwn0ihlxa5zia2bxp71fh8ynxxvzixz3k"; depends=[ggplot2 rlang]; }; + gghalves = derive2 { name="gghalves"; version="0.1.0"; sha256="17adlc7p8visbjn2camia6z4mnxxkiij16lbqrjbkrxb8j8m3b78"; depends=[ggplot2 gtable]; }; + gghighlight = derive2 { name="gghighlight"; version="0.3.0"; sha256="13zs3wy1zm1h1zdh0lpp19fw54giswnqbxxcimz9iyzbpg3da9va"; depends=[dplyr ggplot2 ggrepel lifecycle purrr rlang tibble]; }; + ggimage = derive2 { name="ggimage"; version="0.2.8"; sha256="0p2bbcw1fwzpfnmdq2h9h18xka9jrzfd2v705rbniv8nas0ga14d"; depends=[ggplot2 ggplotify jsonlite magick rvcheck scales tibble]; }; + ggimg = derive2 { name="ggimg"; version="0.1.0"; sha256="0lgak04690xvy0j1g8rgbj9x81ychkx6hp1f8d92piz432wb1z71"; depends=[abind ggplot2 jpeg png]; }; + gginference = derive2 { name="gginference"; version="0.1.1"; sha256="1nla93arkq68j6w56y4p6mj4i8j6rg8rpl0p2yhdzcq8bgzkqym8"; depends=[ggplot2 rlang]; }; gginnards = derive2 { name="gginnards"; version="0.0.3"; sha256="15ly88wjsd2fqvp483376rm2fczcbmj1s1vagb70z9z7968407xy"; depends=[ggplot2 magrittr rlang stringr tibble]; }; ggiraph = derive2 { name="ggiraph"; version="0.7.0"; sha256="1002mf2dp7ram5yrj9qlg9rawz083k130k6bjvdidq0x800ps7b4"; depends=[gdtools ggplot2 htmltools htmlwidgets purrr Rcpp rlang uuid 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]; }; - gglasso = derive2 { name="gglasso"; version="1.4"; sha256="0r4zfgkys8104iw1vzww3qid8a6dyn03x0jlgwrdvavfj86yhq54"; depends=[]; }; - gglogo = derive2 { name="gglogo"; version="0.1.4"; sha256="0yqjafak83rjbxydqlkys68yvpakjqhdlh2b4rk94wsb40j5kq4p"; depends=[dplyr ggplot2 jpeg knitr magrittr plyr purrr reshape2]; }; + gglasso = derive2 { name="gglasso"; version="1.5"; sha256="12l0ac1n54z41yw7c00fm6q2mjmhp9blk4f8vp7q2my2xxwh1fmj"; depends=[]; }; + gglogo = derive2 { name="gglogo"; version="0.1.5"; sha256="08wg0svcksdzchp6bdllmsnklxia3d0ygqwzgmqb2sga8nbkf5hl"; depends=[dplyr ggplot2 jpeg knitr magrittr plyr purrr reshape2 rlang tidyr]; }; ggloop = derive2 { name="ggloop"; version="0.1.0"; sha256="0jpbgb16jfsv557zvishln98y7nd6p1ryp6hxkrkmhp9p35vzvc0"; depends=[assertthat ggplot2 lazyeval magrittr plyr]; }; gglorenz = derive2 { name="gglorenz"; version="0.0.1"; sha256="0ar9ih6yvxb5pyba8y8jjsbwaq808baysjhpd15psjzhfbimjqfm"; depends=[ggplot2 ineq]; }; - ggm = derive2 { name="ggm"; version="2.3"; sha256="1n4y459x2i0jil8chjjqqjs28a8pzfxrws2fcjkg3il7zy0zwbw3"; depends=[igraph]; }; + ggm = derive2 { name="ggm"; version="2.5"; sha256="11wc6k2kj2ydy0dyks5mbvbhxm1r43id87anl1jg6dn0yv4m78di"; depends=[graph igraph]; }; ggmap = derive2 { name="ggmap"; version="3.0.0"; sha256="13dmzl6z62pzjiffilarkji46vy0sacxa8a7mhrhc3biq3ylzhln"; depends=[bitops digest dplyr ggplot2 glue httr jpeg magrittr plyr png purrr RgoogleMaps rjson scales stringr tibble tidyr]; }; - ggmcmc = derive2 { name="ggmcmc"; version="1.3"; sha256="0p3akjbi0044nma8ynvqa42bkrgrb0jjx323k2pbrnlkq8x3ma1b"; depends=[dplyr GGally ggplot2 tidyr]; }; + ggmcmc = derive2 { name="ggmcmc"; version="1.4.1"; sha256="05dsxp5694hljbjz13gpb4f9sxv5jphsihza101ck08yzgn6kpvf"; depends=[dplyr GGally ggplot2 tidyr]; }; + ggmix = derive2 { name="ggmix"; version="0.0.1"; sha256="19dp4ic3mxrqdzr0hi44fm2axfi2b693k4xfs28h664123c9kyvn"; depends=[glmnet MASS Matrix]; }; ggmosaic = derive2 { name="ggmosaic"; version="0.2.0"; sha256="0byhp7125r015wbbnv6fq13bx38krf11r39jx9dzbr0ci6kqzkdb"; depends=[dplyr ggplot2 plotly productplots purrr rlang tidyr]; }; ggmr = derive2 { name="ggmr"; version="0.1.1"; sha256="0941rvh7m5knlhp0m0mhm4j8spmch0pyvwhzs3bycq3vzlvzv1w7"; depends=[MASS]; }; ggmsa = derive2 { name="ggmsa"; version="0.0.2"; sha256="1ryzifcm1qsqng5gljdhgx6p81i8wg9s86j9bnlcllp0d6mbca2x"; depends=[Biostrings ggplot2 ggseqlogo magrittr tidyr treeio]; }; ggmuller = derive2 { name="ggmuller"; version="0.5.4"; sha256="0y7bm9fm5i8acpy6fa903ca2r9yasky7kg2hicm4xz5ni09jm20x"; 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.4.0"; sha256="0w9lykxdrifm69mr157x1hirz37ws9m5lpmxaqbfq5picqyvplsx"; depends=[ggplot2 stringi]; }; + ggnetwork = derive2 { name="ggnetwork"; version="0.5.8"; sha256="1gdvywx2n4ph0dr8q1c5gfsmv4jjy0g41cnhjn68kkmg5fdc3ix8"; depends=[ggplot2 ggrepel igraph network sna]; }; + ggnewscale = derive2 { name="ggnewscale"; version="0.4.1"; sha256="1ryg0zs5qa2gjch3c21ylwwzr6kqbla2jpwfkrwbqbgjryhbphlm"; depends=[ggplot2]; }; ggnormalviolin = derive2 { name="ggnormalviolin"; version="0.1.2"; sha256="1gbv2b86nznw5bs05c4ns96b8hsxkhikhcf8syl2qbbafzy8vx6y"; depends=[dplyr ggplot2 magrittr scales]; }; ggpage = derive2 { name="ggpage"; version="0.2.3"; sha256="1qi8ydq3fxb1smk0jg9z1cv2xjq8c1lsnmz8l7c61rvdbjm3710v"; depends=[dplyr ggplot2 magrittr purrr rlang stringr tidytext]; }; ggparallel = derive2 { name="ggparallel"; version="0.2.0"; sha256="0zxaff0jbqkbavsmh1yyp3vdrxsam6a66hjw8lamv9pksdw1s2wf"; depends=[ggplot2 plyr reshape2]; }; @@ -8309,26 +8395,27 @@ in with self; { ggparty = derive2 { name="ggparty"; version="1.0.0"; sha256="0s6hr5p930kl3pj6ajwgwqz6yikc3l9hhzy1yn0nqc0r8pp2jyqf"; depends=[checkmate ggplot2 gtable partykit rlang survival]; }; ggperiodic = derive2 { name="ggperiodic"; version="1.0.0"; sha256="1cig715qy1kjjrn89cf505njdl2xccvjc5l0fwbqh86xgjayslxb"; depends=[data_table dplyr ggplot2 sticky tidyselect]; }; ggplot_multistats = derive2 { name="ggplot.multistats"; version="1.0.0"; sha256="1afzfa86vc484bcwpg7m1ky03jpax584rigzgai8w06pifkmz0il"; depends=[ggplot2 hexbin rlang scales]; }; - ggplot2 = derive2 { name="ggplot2"; version="3.2.1"; sha256="0mjswqiqcwm0aqxll16bx2kwa6c9km3aql87bdj4347n1ali94g3"; depends=[digest gtable lazyeval MASS mgcv reshape2 rlang scales tibble viridisLite withr]; }; + ggplot2 = derive2 { name="ggplot2"; version="3.3.0"; sha256="0j21am605kqqzlwhm45kaj0m2irnmy2vz0j7kzi9f0qdzrv3q3ij"; depends=[digest glue gtable isoband MASS mgcv rlang scales tibble withr]; }; ggplot2movies = derive2 { name="ggplot2movies"; version="0.0.1"; sha256="067ld6djxcpbliv70r2c1pp4z50rvwmn1xbvxfcqdi9s3k9a2v8q"; depends=[]; }; ggplotAssist = derive2 { name="ggplotAssist"; version="0.1.3"; sha256="1g0s1dkbrxmwqjqppagdbnx24s0nbjn09xwxix3dkfssz6drhala"; depends=[dplyr editData gcookbook ggplot2 ggthemes magrittr miniUI moonBook rstudioapi scales shiny shinyAce shinyWidgets stringr tibble tidyverse]; }; ggplotgui = derive2 { name="ggplotgui"; version="1.0.0"; sha256="1yfglg5438mwyml845isimzma5q6824x19jka509ng49bzmf1za0"; depends=[ggplot2 haven plotly RColorBrewer readr readxl shiny stringr]; }; - ggplotify = derive2 { name="ggplotify"; version="0.0.4"; sha256="0nv3wdmxnc5ww9m3xlgnb0jp30j45dg33nqc6gg3y36svg8anjcg"; depends=[ggplot2 gridGraphics rvcheck]; }; + ggplotify = derive2 { name="ggplotify"; version="0.0.5"; sha256="0pfnp4lrissf21z7867kdm6slr979kchyva8iaf83i1302kscph3"; depends=[ggplot2 gridGraphics rvcheck]; }; ggplotlyExtra = derive2 { name="ggplotlyExtra"; version="0.0.1"; sha256="1m2rhylpzj934gb50lxjp47rxz0kwl9i1p3n7w1rz4qi96pr5p1c"; depends=[ggplot2 plotly rlang]; }; ggpmisc = derive2 { name="ggpmisc"; version="0.3.3"; sha256="1m5ajcy6l8gb2h2ph32ij9dgn6fqpcsf9nf5dr5gas7a15ihpcas"; depends=[broom dplyr ggplot2 gridExtra lubridate magrittr MASS plyr polynom rlang scales splus2R stringr tibble xts zoo]; }; ggpointdensity = derive2 { name="ggpointdensity"; version="0.1.0"; sha256="0c9a14j3b0hvamqylhzldw2hjdxmfbllwahjkf3gg2rw337ld9iy"; depends=[ggplot2]; }; - ggpol = derive2 { name="ggpol"; version="0.0.5"; sha256="0n54mmk9alc3bd9q3jb64xvxnszqndfwpi6h6n09gpvlrbj8mkdx"; depends=[dplyr ggplot2 gtable plyr rlang]; }; + ggpol = derive2 { name="ggpol"; version="0.0.6"; sha256="1316g0y0i4nm4nsa422pbrv4w3g0rv1jxy6m7qasarq2mml9lxjs"; depends=[dplyr ggplot2 glue gtable plyr rlang tibble]; }; ggpolypath = derive2 { name="ggpolypath"; version="0.1.0"; sha256="0g9zfal3vqcx16fi4abxm6l5sam475lk1f6bdik487wc2v0dkq83"; depends=[ggplot2]; }; - ggpubr = derive2 { name="ggpubr"; version="0.2.4"; sha256="0ln1gh3zlfx5s7zqcpvfdiksq74v1pma5kwkhc6r0riqnjjd19pf"; depends=[cowplot dplyr ggplot2 ggrepel ggsci ggsignif glue gridExtra magrittr polynom purrr rlang scales tidyr]; }; + ggpubr = derive2 { name="ggpubr"; version="0.2.5"; sha256="0kb3hpmnhj4mkbx1kx0kv5y22himr8dijqx7ra0h8hi0pf2l2ha7"; depends=[cowplot dplyr ggplot2 ggrepel ggsci ggsignif glue gridExtra magrittr polynom purrr rlang scales tidyr]; }; ggpval = derive2 { name="ggpval"; version="0.2.3"; sha256="04s0pwi0pljdd8r6wnjyb3i3php6qgvpc1mdvhywcx2i2zqip2qx"; depends=[data_table ggplot2]; }; ggquickeda = derive2 { name="ggquickeda"; version="0.1.5"; sha256="13kszfsxnpbkcn3lnlcmrw5a0c3ny8gv9dn4ciphl40rk7qpi26v"; depends=[colourpicker dplyr DT Formula GGally ggplot2 ggpmisc ggpubr ggrepel ggstance gridExtra Hmisc lazyeval markdown plotly quantreg rlang scales shiny shinyjs stringr survival survminer table1 tidyr]; }; ggquiver = derive2 { name="ggquiver"; version="0.2.0"; sha256="1hsayqxf4brck1rx97yyprw1axc83lksgf7mn3rh8hqx4h1f5f0f"; depends=[dplyr ggplot2]; }; - ggraph = derive2 { name="ggraph"; version="2.0.0"; sha256="0qj7w3af0pgmd9mil6y571jikfkln7b8csvzg6b08spwbglfy1s3"; depends=[digest dplyr ggforce ggplot2 ggrepel graphlayouts gtable igraph MASS Rcpp rlang scales tidygraph viridis]; }; + ggraph = derive2 { name="ggraph"; version="2.0.2"; sha256="1ckq82hg52vr2wydkqv2wrppgjyvddd6bwqzrngqlm7j71xapjl0"; depends=[digest dplyr ggforce ggplot2 ggrepel graphlayouts gtable igraph MASS Rcpp rlang scales tidygraph viridis]; }; ggraptR = derive2 { name="ggraptR"; version="1.2"; sha256="18r70pnz7x8728lg447ds7swgk539gga9shax7rs4x56a710pf3q"; depends=[dplyr ggplot2 pacman purrr shiny]; }; ggrasp = derive2 { name="ggrasp"; version="1.0"; sha256="0lini89mcxl30kx38vny9896hdf4afrz5dgivbbikkb2yyfh2cq1"; depends=[ape bgmm colorspace ggplot2 mixtools]; }; - ggrepel = derive2 { name="ggrepel"; version="0.8.1"; sha256="10vjrcmx8yknfbx93d9a4y3z8gafri0fhimw6hcq733dmdvkml6m"; depends=[ggplot2 Rcpp scales]; }; + ggrepel = derive2 { name="ggrepel"; version="0.8.2"; sha256="1qaifn3dazdqbqlii210xhw7yf142iw7g9p2axmmxbz90p0by08d"; depends=[ggplot2 Rcpp scales]; }; ggridges = derive2 { name="ggridges"; version="0.5.2"; sha256="03pz257aw0mkh5k75rby9givkc1ky3n5scvhjhjiz9vry9fpffmh"; depends=[ggplot2 plyr scales withr]; }; - ggroups = derive2 { name="ggroups"; version="1.2.1"; sha256="159bzdck1npcp3spfi3ash1y5zhga9y0fbgw5vzrkayqrw4ayx4n"; depends=[]; }; + ggrisk = derive2 { name="ggrisk"; version="1.0"; sha256="02a11q0mz3a5qqssakys8jxy5rqmi6cwk6japv65fkz741fh65wx"; depends=[cutoff do egg fastStat ggplot2 nomogramFormula rms set survival]; }; + ggroups = derive2 { name="ggroups"; version="2.0.3"; sha256="1qlx1jfmmpygswwbrqs7pxm426zggxgvd4q3jp9abfaq9aczs10p"; 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]; }; @@ -8339,40 +8426,42 @@ in with self; { ggsom = derive2 { name="ggsom"; version="0.4.0"; sha256="0qsih00rm3ng2zh6p2s7a35rh1qlvbkn82s53v765w60fjmhwkwf"; depends=[assertthat data_table dplyr entropy ggplot2 kohonen magrittr tibble tidyr]; }; ggspatial = derive2 { name="ggspatial"; version="1.0.3"; sha256="0ka15qj3f0yq9nfkgk77wp490nz9ymi80918apv9zp6x39kcprj9"; depends=[abind ggplot2 plyr raster reshape2 rlang rosm scales sf tibble tidyr]; }; ggspectra = derive2 { name="ggspectra"; version="0.3.5"; sha256="0pvkh4cr9nyhhv9ikjs7nhjagal63k8zfbik28cmw2c2x31m019v"; depends=[dplyr ggplot2 ggrepel lubridate photobiology photobiologyWavebands scales tidyr]; }; - ggstance = derive2 { name="ggstance"; version="0.3.3"; sha256="0kdksay61hyb6612b07r84chh7a9aibjyclk3qcypvr9aang8hkh"; depends=[ggplot2 plyr rlang withr]; }; - ggstatsplot = derive2 { name="ggstatsplot"; version="0.1.4"; sha256="09dzph9h4zj6msz9d5dn7g8rbvl5781gagsad5hfjqn8m7vc1a47"; depends=[broomExtra cowplot crayon dplyr forcats ggcorrplot ggExtra ggplot2 ggrepel ggsignif groupedstats insight metaBMA metafor pairwiseComparisons paletteer parameters psych purrr rlang scales statsExpressions tibble tidyr WRS2]; }; + ggstance = derive2 { name="ggstance"; version="0.3.4"; sha256="0aqz3dn02cgij018a4sglqwrwr9dzzj12l8xr1064q7hfd4f64m1"; depends=[ggplot2 plyr rlang withr]; }; + ggstar = derive2 { name="ggstar"; version="0.0.4"; sha256="02mvbp3pdx90b36nwpm975h0c11vza9177h3pym9nqxyx2dp72qa"; depends=[ggplot2 gridExtra scales]; }; + ggstatsplot = derive2 { name="ggstatsplot"; version="0.3.1"; sha256="05ily9798akg53w1k0sr9paizmz121y6acc74pghi09x9xdv3lbm"; depends=[broomExtra cowplot dplyr ggcorrplot ggExtra ggplot2 ggrepel ggsignif groupedstats insight ipmisc pairwiseComparisons paletteer purrr rlang statsExpressions tidyr]; }; 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.2.0"; sha256="0rrkzfggc1nlda1w1lbqdycx6nawxbkac1szhvkwrqlzh6agxcsv"; depends=[ggplot2 purrr scales stringr tibble]; }; - ggupset = derive2 { name="ggupset"; version="0.1.0"; sha256="157dqwc185y2nqrqka0b14im7k1yzj8swr0jaxz46xxm0qgqk8cc"; depends=[ggplot2 gtable rlang scales tibble]; }; + ggupset = derive2 { name="ggupset"; version="0.2.1"; sha256="1hqd1csli8iifxdghkvbyrjal7h4dd92ya287llaa2v4wdsqa1hm"; depends=[ggplot2 gtable rlang scales tibble]; }; ggversa = derive2 { name="ggversa"; version="0.0.1"; sha256="0xqn8iznrm8q30pxwka88wi1z7lndi6lm12rq6ngcaxf294fbz01"; depends=[]; }; ggvis = derive2 { name="ggvis"; version="0.4.5"; sha256="091i9f17912j8qcyxppjgwzjnyqj7769ixs9d2gjg6f2clskqdw2"; depends=[assertthat dplyr htmltools jsonlite lazyeval magrittr shiny]; }; ggvoronoi = derive2 { name="ggvoronoi"; version="0.8.3"; sha256="04dv33vnip0rrli1diq43v7vhr86bmxjdyxjbxz5x4371kbb312j"; depends=[deldir ggplot2 raster rgeos sp]; }; ggwordcloud = derive2 { name="ggwordcloud"; version="0.5.0"; sha256="0mr92738s3j9wm6mkr5hd2flqsqw3vfjifv3fajsygysbwrl8dn8"; depends=[colorspace ggplot2 png Rcpp scales]; }; gh = derive2 { name="gh"; version="1.1.0"; sha256="1bc9bn1078s664hc806dh0y1ncxif77q479rfmxfir9z7hwaz7yy"; depends=[cli httr ini jsonlite]; }; - ghibli = derive2 { name="ghibli"; version="0.3.0"; sha256="1527225yp9czmq7y1r08jvzwhxdxi50n5szay92hl9ln829x9phh"; depends=[]; }; - ghyp = derive2 { name="ghyp"; version="1.5.8"; sha256="0ncaib6k4z02p3lw4c0l5b7dhxjylmqxqbx96kgj7z1na6jkvmf3"; depends=[MASS numDeriv]; }; - gibble = derive2 { name="gibble"; version="0.2.0"; sha256="11fhswszdgackwkvals4k7pn8syfphkwvfx7kiv7psnsr94q376n"; depends=[dplyr rlang tibble]; }; + ghibli = derive2 { name="ghibli"; version="0.3.1"; sha256="1wnz26n0a3pgzigb2vp08v7swk061whi2zvfm6bih0aniqv5n7ml"; depends=[]; }; + ghql = derive2 { name="ghql"; version="0.1.0"; sha256="19awg98r2hwwwwrwh0166y8ij1clf58vrf02i8fhhfzddx3an6bz"; depends=[crul graphql jsonlite R6]; }; + ghyp = derive2 { name="ghyp"; version="1.5.9"; sha256="1lvx8jq0gjz9398nxkra0pq3q2cl4zbnggj4z4pqp3p6dahb0364"; depends=[MASS numDeriv]; }; + gibble = derive2 { name="gibble"; version="0.3.0"; sha256="19sj32jbq12a8zf03a39yqj8jln53nhb4b2v3khbq60nr9bxlm1r"; depends=[dplyr rlang tibble]; }; gibbs_met = derive2 { name="gibbs.met"; version="1.1-3"; sha256="1yb5n8rkphsnxqn8rv8i54pgycv9p7x1xhinx4l5wzrds3xhf2dc"; depends=[]; }; gifski = derive2 { name="gifski"; version="0.8.6"; sha256="00w4bzp0rrp4isy1rnxs6g1q07r3wndadk3mqdrxk2wxi7jmghna"; depends=[]; }; gifti = derive2 { name="gifti"; version="0.7.5"; sha256="1y64bc33b5f64a4khp916s9zb7kbb24xgdg3pdlh0f8m6zrbmp4a"; depends=[base64enc R_utils xml2]; }; gim = derive2 { name="gim"; version="0.28.0"; sha256="1m9pb3dcphyjmadxr87lrd4fb2jacrx2mmcgrvqzc16gfm66n6d5"; depends=[numDeriv]; }; - gimme = derive2 { name="gimme"; version="0.6-1"; sha256="1ipak83ma1fl24snsd7xlbbhgv67m03r3g8xh9rhvmr6ajag7ada"; depends=[data_tree igraph imputeTS lavaan MIIVsem qgraph]; }; + gimme = derive2 { name="gimme"; version="0.7-1"; sha256="117157nyyyzb102cs2in7s44dl3v6d0aqbfyybq4rqb5cqqmfsvj"; depends=[data_tree igraph imputeTS lavaan MIIVsem nloptr qgraph]; }; gimmeTools = derive2 { name="gimmeTools"; version="0.1"; sha256="1g170rz3c3qx27yy67f7xab4gkm0pbbvwlwkcsczfxphad609ryl"; depends=[easycsv magrittr miniUI rhandsontable rintrojs rstudioapi shiny shinyjs shinyWidgets]; }; - gimms = derive2 { name="gimms"; version="1.1.1"; sha256="06vq0apsadyfgnz7906v2kjy0nx3yn0agq4yschxz1r1zmgrnyki"; depends=[curl Kendall ncdf4 raster RCurl zyp]; }; + gimms = derive2 { name="gimms"; version="1.1.3"; sha256="0ij252zz75nfngh5idzznrdi4jn1ymbn24s6qilpf2qf8zilh89i"; depends=[curl Kendall ncdf4 raster zyp]; }; giphyr = derive2 { name="giphyr"; version="0.2.0"; sha256="0273f7lama8bhaalafs66m6ksp32vx0j6rmh1qr4484i7wkmdfqn"; depends=[dplyr httr miniUI purrr rstudioapi shiny tibble]; }; gistr = derive2 { name="gistr"; version="0.5.0"; sha256="07k9p5sfy0k45frx63dwp6pk3gyh5zdv79f4knsciakk6xq9ds59"; depends=[assertthat dplyr httr jsonlite knitr magrittr rmarkdown]; }; git2r = derive2 { name="git2r"; version="0.26.1"; sha256="0dbl845sahv2i641ncaf06w06djravwc5wknp9syzx0ad8l0kmhk"; depends=[]; }; - git2rdata = derive2 { name="git2rdata"; version="0.2.0"; sha256="1hzvr1h6rbqqf69xkjc1c2x3c5wqp8za40yim7vd7sb398f1iq4q"; depends=[assertthat git2r yaml]; }; + git2rdata = derive2 { name="git2rdata"; version="0.2.1"; sha256="11mdalfgarqscb6yg0p9g4mwzwnbkq40migpv5sk0i3vdz0xpapp"; depends=[assertthat git2r yaml]; }; gitgadget = derive2 { name="gitgadget"; version="0.5.2"; sha256="0la0x3p50wk5wv2p4vkf3rh72psz3k18lcymxn354nqb7m1xdggs"; depends=[callr curl dplyr jsonlite markdown miniUI rstudioapi shiny shinyFiles usethis]; }; githubinstall = derive2 { name="githubinstall"; version="0.2.2"; sha256="0hqh86r2007hzdbm8rr0fwqhhsna7ji8sdgmdnrxkxraa5f2pfz3"; depends=[curl data_table devtools httr jsonlite mockery]; }; gitignore = derive2 { name="gitignore"; version="0.1.3"; sha256="0ckvl5i99k9sjvlk3cfjyclhmchrlqdz4379nmlckh4jpmnckzk0"; depends=[clipr clisymbols crayon curl glue here jsonlite purrr xfun]; }; gitlabr = derive2 { name="gitlabr"; version="1.1.6"; sha256="1p68w0q8mjpz2hr6ys1qbfw1y4b35hgs27kzfkzv9hfi1vxqfd1h"; depends=[arpr base64enc dplyr httr magrittr purrr stringr tibble yaml]; }; gitlink = derive2 { name="gitlink"; version="0.1.3"; sha256="1g34cyx35wlpq42alsayk69x708zxqgvbdndb7j6n1q0rm4vncvd"; depends=[htmltools rlang]; }; givitiR = derive2 { name="givitiR"; version="1.3"; sha256="0y2slhxhj7k413kjaydin9hq3x2xgx4cgjshdplwnmg3x2nakn31"; depends=[alabama rootSolve]; }; - gjam = derive2 { name="gjam"; version="2.2.7"; sha256="008g394sqcxr3jdhivldaaqi3d6h2mn16wdxcsqmspk80kiljnvr"; depends=[MASS RANN Rcpp RcppArmadillo]; }; + gjam = derive2 { name="gjam"; version="2.3.1"; sha256="1mz4d0ivlrmas73wb8mcs6cw5f34ilakpr59mffyli4wkkplqf4k"; depends=[MASS RANN Rcpp RcppArmadillo]; }; gk = derive2 { name="gk"; version="0.5.1"; sha256="1hgxb1lp78pbnj22i7ryf46im301j05y7hh75z2fxvv5nqgg2v75"; depends=[Ecdat lubridate progress]; }; - gkmSVM = derive2 { name="gkmSVM"; version="0.79.0"; sha256="04dakbgfvfalz4rm4fvvybp506dn5fbj5g86ybfhrc6wywjllsz3"; depends=[BiocGenerics Biostrings GenomeInfoDb GenomicRanges IRanges kernlab Rcpp ROCR rtracklayer S4Vectors seqinr]; }; + gkmSVM = derive2 { name="gkmSVM"; version="0.80.0"; sha256="0ljcga246ad0ql8x3drvrdsyp0f20mgp3p6lnl79xb76qgfdnm0p"; depends=[kernlab Rcpp ROCR seqinr]; }; glacierSMBM = derive2 { name="glacierSMBM"; version="0.1"; sha256="0117fzz2b1lccs0kkwz59w2yysi72j54yvz7373pz11w7rjds84f"; depends=[raster sp udunits2]; }; glamlasso = derive2 { name="glamlasso"; version="3.0"; sha256="1ynhl868kh25l8m04ln6ix31z9r26lrbr5ajprpq9yfhqs4l9ddc"; depends=[Rcpp RcppArmadillo]; }; glancedata = derive2 { name="glancedata"; version="1.0.1"; sha256="01j7syjn33pc7hq032nmyak38wn35yv3n7is9g2ggs14kj3xqb0c"; depends=[dplyr forcats GGally ggplot2 gridExtra openxlsx purrr tibble tidyr]; }; @@ -8381,7 +8470,7 @@ in with self; { glasso = derive2 { name="glasso"; version="1.11"; sha256="02p3612rpydk195n2qr77lp1j2w8zsw1ckkk98c8angm4r5q8dsc"; depends=[]; }; glassoFast = derive2 { name="glassoFast"; version="1.0"; sha256="1sgmh4l06q7mrmgnimphpqgix4k4jzaj2l30kpmnf92caa2v7ngw"; depends=[]; }; glba = derive2 { name="glba"; version="0.2"; sha256="0ckcz6v6mfbv34s8sp086czhb5l58sky79k84332rrz6wj47p3md"; depends=[]; }; - glcm = derive2 { name="glcm"; version="1.6.4"; sha256="1al4i8r9g7izl5d4c3ccqx6zw9vfcvdr6zgzql8wjkq9fsdrrnq1"; depends=[Rcpp RcppArmadillo]; }; + glcm = derive2 { name="glcm"; version="1.6.5"; sha256="13my6y9jqd86cg5n74p4b8mqbdgwnanxx4qf1rrhm5jxf6sa31qm"; depends=[raster Rcpp RcppArmadillo]; }; gld = derive2 { name="gld"; version="2.6.2"; sha256="1wrw7i5bq7rb2ahadm57y9fmr697r7lp9ln7ajcd592b0nn60n4i"; depends=[e1071 lmom]; }; gldrm = derive2 { name="gldrm"; version="1.5"; sha256="1mbdxqjw6sa47kigwrjq1gn6vi36zhg9j2lck144iwa10ms0y9xp"; depends=[]; }; glinternet = derive2 { name="glinternet"; version="1.0.10"; sha256="15dikazmhs7md7j8p45f67h3947br18hsrjl74cjk10vazd0ihng"; depends=[]; }; @@ -8394,21 +8483,22 @@ in with self; { glmaag = derive2 { name="glmaag"; version="0.0.6"; sha256="1yk5bx1gyj97b5qjy30q1gsjlp9amklwf070i0129f8dj7vjyaf0"; depends=[data_table foreach ggplot2 gridExtra huge Matrix maxstat OptimalCutpoints plotROC pROC Rcpp RcppArmadillo shiny survival survminer]; }; glmbb = derive2 { name="glmbb"; version="0.3"; sha256="12yabwswps0fmprh8nb9jdny9xrm13jvc0d9m3w04ppmsvalrmwl"; depends=[digest]; }; glmc = derive2 { name="glmc"; version="0.3-1"; sha256="0x6jk2l5rpjkp5x815gpiwv8maa7mhmy6m8gaxbv1cbn3zyccynn"; depends=[emplik]; }; - glmdisc = derive2 { name="glmdisc"; version="0.3"; sha256="13x5ri4kig0h49j3fqpj5ad37jnm0phnxr42h64562fcj7bmiidq"; depends=[caret gam MASS nnet Rcpp RcppEigen RcppNumerical]; }; + glmdisc = derive2 { name="glmdisc"; version="0.5"; sha256="0985j4gh4069pwcf3spsi8czq6xn9vhajliprxjwlv3xbisjcf8s"; depends=[caret gam MASS nnet Rcpp RcppEigen RcppNumerical]; }; glmdm = derive2 { name="glmdm"; version="2.60"; sha256="09vljki24fccqkvxkmg2i6a8pxqhfwm155b41m2q51lqaq29bfw7"; depends=[]; }; glmertree = derive2 { name="glmertree"; version="0.2-0"; sha256="0lfn6dap38i6cnfy4gdap13aq81h9cm3bip7ci57q9br9b00x7ib"; depends=[Formula lme4 partykit]; }; + glmglrt = derive2 { name="glmglrt"; version="0.1.0"; sha256="0y3bwf6lg6wh2kq5p4flmvnc15c87w4xgxb0qnbvwmdnabsjd7zh"; depends=[MASS parameters]; }; glmgraph = derive2 { name="glmgraph"; version="1.0.3"; sha256="16sq6i7kbw20nvwikpa02z3pb7wqw3270j6ss7f8sgf548skhmx0"; depends=[Rcpp RcppArmadillo]; }; glmlep = derive2 { name="glmlep"; version="0.2"; sha256="0rq2vxbr732r725pn8qdvppxcrhjhyvlr550svfgy1inq985c1w4"; depends=[]; }; glmm = derive2 { name="glmm"; version="1.3.0"; sha256="088m626c2f75ij457mskdyi927y6g01m5rgfsjaxpm7xbywk51sw"; depends=[doParallel foreach itertools Matrix mvtnorm trust]; }; glmmEP = derive2 { name="glmmEP"; version="1.0-3.1"; sha256="0fql85m0mxn58jh3mgrcw56bb4dx7amrz39ngqrljwi5pv5i7aj4"; depends=[lme4 matrixcalc]; }; glmmLasso = derive2 { name="glmmLasso"; version="1.5.1"; sha256="1az9vdnyqyrfn1q7zrn6x4ywx77b0vg65cni45x37b0ybkwpis39"; depends=[Matrix minqa]; }; glmmML = derive2 { name="glmmML"; version="1.1.0"; sha256="121iclp86nfm9mybvfwascs937i0z2mbv982hn894q6g7jkqiw1l"; depends=[]; }; - glmmTMB = derive2 { name="glmmTMB"; version="0.2.3"; sha256="035hkywa37bz555fv6znxd4hfcs5w884365wfnwk4jx5vann4vvb"; depends=[lme4 Matrix nlme RcppEigen TMB]; }; - glmmboot = derive2 { name="glmmboot"; version="0.5.0"; sha256="0d1nym28svij00wjp2lx42fczllxmjl95hy45dgy6j3k70pvvgfi"; depends=[]; }; + glmmTMB = derive2 { name="glmmTMB"; version="1.0.1"; sha256="0sdx1q7wc7895xh8747r4p0wkij0xjgn5ij62ipi9423zd0sr0mm"; depends=[lme4 Matrix nlme RcppEigen TMB]; }; + glmmboot = derive2 { name="glmmboot"; version="0.5.1"; sha256="1q4lp5s00vmymvln4qcsnfgcn918dsvkdhq16h0f94yiqczadsb9"; depends=[]; }; glmmfields = derive2 { name="glmmfields"; version="0.1.3"; sha256="1sygppwm58hvwj95nlyz59cjlnkrq82kpws6izbivl7p6wb06lil"; depends=[assertthat BH broom cluster dplyr forcats ggplot2 loo mvtnorm nlme Rcpp RcppEigen reshape2 rstan rstantools StanHeaders]; }; glmmsr = derive2 { name="glmmsr"; version="0.2.3"; sha256="1fbg5zji0xjr9q1yc6phsp37nsrj7nfs8yiri0j9s84wzgwjili1"; depends=[BH lme4 Matrix numDeriv R6 Rcpp RcppEigen]; }; glmnet = derive2 { name="glmnet"; version="3.0-2"; sha256="0b3nnfzp8dxcdkvxr0yvy6d58yk3xg4kz1wqa42bxqppbakmd2gl"; depends=[foreach Matrix shape]; }; - glmnetUtils = derive2 { name="glmnetUtils"; version="1.1.4"; sha256="1bf5gn3wrlm3mzgrf9dyv07yv90aly5zqgzf597ws6600ln1j9nd"; depends=[glmnet Matrix]; }; + glmnetUtils = derive2 { name="glmnetUtils"; version="1.1.5"; sha256="0q8h3pniblcgvghffsiz0qqipq8cpln4dg8nwg0k4m1j2n6h582h"; depends=[glmnet Matrix]; }; glmnetcr = derive2 { name="glmnetcr"; version="1.0.5"; sha256="0s21kaky23wgm0nbgncrg6xiwnp5x5s2zcv854493rrclx2s6r5w"; depends=[glmnet]; }; glmpath = derive2 { name="glmpath"; version="0.98"; sha256="1jbiqqd1s93i941dhyyx50zlgwavhyjfw8bx13z4gz05rdvi4gn8"; depends=[survival]; }; glmpathcr = derive2 { name="glmpathcr"; version="1.0.8"; sha256="00hbgp1kdbvihqvx03vv6gq32whrkcfq3n32bbj3cda85dnivlwq"; depends=[glmpath]; }; @@ -8424,48 +8514,48 @@ in with self; { globals = derive2 { name="globals"; version="0.12.5"; sha256="1ha8iasgijp4q3v2b0b17y1wh7cd3nvzd9b03w49qm2bidkaf68m"; depends=[codetools]; }; globe = derive2 { name="globe"; version="1.2-0"; sha256="0xa0q5dac0g7xdlr679f3km8nqxlm7gi4msp9fbfivfvy0rmri96"; depends=[]; }; glogis = derive2 { name="glogis"; version="1.0-1"; sha256="1sbvcg5slvd2c7fasvbj534x36rh11zq3mxv5z0jwpqd6h1xadmd"; depends=[sandwich zoo]; }; - glpkAPI = derive2 { name="glpkAPI"; version="1.3.1"; sha256="06p8zvmshymcw994mmf1ar00kfj645z8dp18yy4i5bl6qydbpb8k"; depends=[]; }; + glpkAPI = derive2 { name="glpkAPI"; version="1.3.2"; sha256="1qwq6vbx1symly6k72xgj5qzqw7j6wdsgiflm649pdxnisfgzh00"; depends=[]; }; glrt = derive2 { name="glrt"; version="2.0"; sha256="0p2b0digndvnn396ynv56cdg436n3ll7pxkb81rs3dhwbyqyc948"; depends=[survival]; }; - glue = derive2 { name="glue"; version="1.3.1"; sha256="1a1ycg9r3gd91visp49q49rsrdgyf8kr9dxdy3hk99kikn4z5hag"; depends=[]; }; + glue = derive2 { name="glue"; version="1.4.0"; sha256="1hb9j2519jv9zgkgjb25hnqi22i7zxnaksqd16m4nxa1f6gl0v7a"; depends=[]; }; gluedown = derive2 { name="gluedown"; version="1.0.2"; sha256="1vq5zgwlwj5rzdwj7z9ypnvj2fw9m653bdbivb2hx2z2hl8qwfp9"; depends=[glue]; }; - gluvarpro = derive2 { name="gluvarpro"; version="2.0"; sha256="0ka9ymajkm910r8nzvcx19zvpmz8vr59k1a5vhbz49sqqc0ri68g"; depends=[ggplot2 gridExtra pracma scales tidyr zoo]; }; + gluvarpro = derive2 { name="gluvarpro"; version="4.0"; sha256="09l9yincr1k5j9wnj3zvfzsffjh3r54aa8fn0ik8vhlbq13ag8kp"; depends=[ggplot2 gridExtra pracma scales tidyr zoo]; }; 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="1.0.0"; sha256="0wgh428qrwn6rxkcv9xmpya4ygrmc5pblxp0fw0ddgwbl99dhhi5"; depends=[base64enc crayon gargle httr jsonlite lifecycle magrittr mime rematch2]; }; gmapsdistance = derive2 { name="gmapsdistance"; version="3.4"; sha256="1hazf6xb4ja6h2lrl63kbd78wzny9sljiid9rq1r3szn3l1mc7dn"; depends=[RCurl XML]; }; gmat = derive2 { name="gmat"; version="0.2.1"; sha256="035x8b982qk3ik9qhxa9jhkczmafix6nbpbz0r5smby6q6bhj6jz"; depends=[gRbase igraph]; }; gmediation = derive2 { name="gmediation"; version="0.1.1"; sha256="0md4h298vqw67qrjcaia6xz8s7akdpcmxa83irm12qgbh56a5rpr"; depends=[MASS plyr VGAM]; }; - gmeta = derive2 { name="gmeta"; version="2.3-0"; sha256="1izfz6gkisa8rskhfka6q73rcgzwdsmkdhy79jwcaqk25jrwfk60"; depends=[BiasedUrn binom]; }; gmfd = derive2 { name="gmfd"; version="1.0.1"; sha256="03sag09x7pjyzsp6w1z06108ig068krmw75064cnl3pqfvfyjfgr"; depends=[]; }; gmm = derive2 { name="gmm"; version="1.6-4"; sha256="15dwf3dgr88n3s1i4lqmv75vfmrc85kdhhgs2gprqkhpgprmzb83"; 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.6"; sha256="0j2sz2nw41y9306rl1b8hbn0spz7453z5iawcq0bvslyrhc1d9ir"; depends=[]; }; gmt = derive2 { name="gmt"; version="2.0-1"; sha256="1g1sj9gq3h3s0pdcfvzg7iifkns5azn3pa83if0d3yzc28cjf0yz"; depends=[]; }; - gmvarkit = derive2 { name="gmvarkit"; version="1.1.2"; sha256="02m6brh7rj35a0yjzmfc1p16rlyb97fsqbsqjj0ndcdadbqcxz73"; depends=[Brobdingnag mvnfast pbapply]; }; + gmvarkit = derive2 { name="gmvarkit"; version="1.1.3"; sha256="08vfyad8fs6zpwgvxs2qrvnbii824fx4yxghrvcqx25x1j71vvnl"; depends=[Brobdingnag mvnfast pbapply]; }; gnFit = derive2 { name="gnFit"; version="0.2.0"; sha256="0cji4zjslh18dfj0l827r6br4hx2f0akiaxrg7fhhyyyhgdcjnsm"; depends=[ismev rmutil]; }; gnlm = derive2 { name="gnlm"; version="1.1.1"; sha256="1krbz791l5qc06sh6my0bkq420b5afncw87lhyx1yiml2yg46zrk"; depends=[rmutil]; }; - gnm = derive2 { name="gnm"; version="1.1-0"; sha256="01d7wxsh4d9w4jh8vn62sjzgpll650yl3klfhlaa8j0qwpxr2fml"; depends=[MASS Matrix nnet qvcalc relimp]; }; + gnm = derive2 { name="gnm"; version="1.1-1"; sha256="1lddsdsg43wpg681s906i4xqqfbjdd1qb9ml5dfprb02i1806aa2"; depends=[MASS Matrix nnet qvcalc relimp]; }; gnmf = derive2 { name="gnmf"; version="0.7.1"; sha256="1vbcsxg61mlsdir8szd0rdxfswr7kr6a07750ar2l9b4rkg3yfqz"; depends=[]; }; - gnn = derive2 { name="gnn"; version="0.0-1"; sha256="1wjir501l9cfkl9xrga06h3nwrz9lqsl9ypqxjj3iz6yi7jd12w1"; depends=[keras qrng tensorflow]; }; + gnn = derive2 { name="gnn"; version="0.0-2"; sha256="0sh9b6d0zvrml7d1bnirxld2lwrgrd7ma3ky7xl71kis0x3fjdq9"; depends=[keras qrng tensorflow]; }; gnorm = derive2 { name="gnorm"; version="1.0.0"; sha256="17h43qwb07wk5hiif89k6dgn6bbdsqfy2jy3k5blbdhhp3b9jcqp"; depends=[]; }; gnumeric = derive2 { name="gnumeric"; version="0.7-8"; sha256="0iwl00mzsg8h8q67bjp6485idjlmj24362b1rbmkifckss8hrc98"; depends=[XML]; }; goeveg = derive2 { name="goeveg"; version="0.4.2"; sha256="0k9pyph065x8wp452x8kz28ikhsbrm80ln4yssmcgqm7085dyyya"; depends=[cluster fields Hmisc mgcv vegan]; }; - gofCopula = derive2 { name="gofCopula"; version="0.3-1"; sha256="05n30mvy7rn1pkyy2pfhk05nab6pkagydws8ri3ixmyvrspal23b"; depends=[copula doSNOW foreach MASS numDeriv progress R_utils SparseGrid VineCopula yarrr]; }; - gofMC = derive2 { name="gofMC"; version="1.1.2"; sha256="0hbqx0z2517qgmp6sjg76hv74yrkfbswb9rmfjmsmcyzj2x67w86"; depends=[ggplot2 scales]; }; + gof = derive2 { name="gof"; version="1.0.1"; sha256="0m9g3g5aw8wiz6am56ms2a5ipyk68gxd00bgs840lprgfdd4iw1n"; depends=[lava mets Rcpp RcppArmadillo]; }; + gofCopula = derive2 { name="gofCopula"; version="0.3-2"; sha256="068l2xik9i7z58dcj0nyp24w7lh97nimdfcs74cyfv15av23x0n7"; depends=[copula crayon doSNOW foreach MASS numDeriv progress R_utils SparseGrid VineCopula yarrr]; }; gofastr = derive2 { name="gofastr"; version="0.3.0"; sha256="02jn4xbbafl7siwvkqns1818wmw813x9cvqfcnpnmcippiqhrb0b"; depends=[data_table quanteda slam SnowballC tm]; }; goffda = derive2 { name="goffda"; version="0.0.6"; sha256="0j2fx3vzd4rda4hlhgkkcq1rgn79rah2r5dkx2rikl3rkfjjj6yi"; depends=[fda_usc glmnet ks Rcpp RcppArmadillo]; }; goft = derive2 { name="goft"; version="1.3.4"; sha256="15n1av7r6w8hihxlgw9pd570qgrlcprkkacln15chvjs3b0i60la"; depends=[fitdistrplus]; }; goftest = derive2 { name="goftest"; version="1.2-2"; sha256="0ivnkqhv5xgiv05dm648nngacymd8x8g0fyppv3bc0mhcqk9k5z4"; depends=[]; }; gogarch = derive2 { name="gogarch"; version="0.7-2"; sha256="03gpl73zc6kx4gni59xbg7b38dkpd7p4c7kvlqm46f58j257viik"; depends=[fastICA fGarch]; }; goldi = derive2 { name="goldi"; version="1.0.1"; sha256="191ac02bwrxr3khq6qirhxzfhv7pqfhqyg7jb473p5vwygpvc53l"; depends=[dplyr futile_logger magrittr Rcpp RcppArmadillo SnowballC tm]; }; - golem = derive2 { name="golem"; version="0.1"; sha256="06nn0a3l4zxjz732wsglyqjgz39frzn8dcr2k39h7b37vkwwkk2m"; depends=[attempt cli crayon desc dockerfiler DT glue htmltools pkgload processx remotes rlang roxygen2 rsconnect rstudioapi shiny stringr testthat usethis yesno]; }; + golem = derive2 { name="golem"; version="0.2.1"; sha256="07g5sagdq1n5i24bc8pnx9y303adraqppq1j9lyd4n5q0phbgh2y"; depends=[attempt cli config crayon desc dockerfiler fs here htmltools jsonlite pkgload remotes rlang roxygen2 rstudioapi shiny testthat usethis yaml]; }; gomms = derive2 { name="gomms"; version="1.0"; sha256="1i9d5y28wrhal990x7xxy99v3z9y2pzlakj7wnynd3dpx5pqr0jj"; depends=[]; }; goodpractice = derive2 { name="goodpractice"; version="1.0.2"; sha256="08rnm8z0pry5mwpc7p37r6f2rd56dry9djpcvvs9yl170w56psx0"; depends=[clisymbols covr crayon cyclocomp desc jsonlite lintr praise rcmdcheck rstudioapi whoami withr xml2 xmlparsedata]; }; googleAnalyticsR = derive2 { name="googleAnalyticsR"; version="0.7.1"; sha256="1px57a5kqmnlny11p0niak6096pz1q8jvd9xbyld99hrwicav13r"; depends=[assertthat dplyr googleAuthR httr jsonlite magrittr memoise purrr rlang tibble tidyr]; }; googleAuthR = derive2 { name="googleAuthR"; version="1.1.1"; sha256="053s6n28cq35gn18ywipygw3bpwsi1qv6rr4vv2bi9q6sy6rb8q3"; depends=[assertthat digest gargle httr jsonlite memoise rlang]; }; + googleCloudRunner = derive2 { name="googleCloudRunner"; version="0.1.1"; sha256="0pdy9z3k2pz2vvp64g60ddigy5nvy3p9qwaqh2bxiw6vs5g4yaqs"; depends=[assertthat googleAuthR googleCloudStorageR httr jsonlite openssl yaml]; }; googleCloudStorageR = derive2 { name="googleCloudStorageR"; version="0.5.1"; sha256="0sd6ca1ksv22avr5rcvkf5089f9igb8gqa83kidlc4xklaj6g92m"; depends=[assertthat curl googleAuthR httr jsonlite openssl yaml zip]; }; - googleCloudVisionR = derive2 { name="googleCloudVisionR"; version="0.1.0"; sha256="1n7lbqx7qiahmirydli9nvq4w4i26qnyk3s2kxy4aj413619ym67"; depends=[caTools data_table googleAuthR jsonlite purrr]; }; + googleCloudVisionR = derive2 { name="googleCloudVisionR"; version="0.2.0"; sha256="1n4gkmnwp9wadxz1izggxnpcpm4bz3imhq5y3i2szr8zwafcqqjv"; depends=[data_table glue googleAuthR jsonlite purrr]; }; googleComputeEngineR = derive2 { name="googleComputeEngineR"; version="0.3.0"; sha256="1s0qvnijzkja645lim373swk815n3s1292q6sk3q36ss70q42cfg"; depends=[assertthat future googleAuthR httr jsonlite]; }; googleLanguageR = derive2 { name="googleLanguageR"; version="0.2.0"; sha256="1l0gnynild95k9fw1d398zd4dkws97p13vvfv6jaklqj0xmh9ib8"; depends=[assertthat base64enc googleAuthR jsonlite magrittr purrr tibble]; }; googlePolylines = derive2 { name="googlePolylines"; version="0.7.2"; sha256="0czfsmf8gv38g950l9xkk67q9v53pk9xk9yr2flbdpm8nlrdpjz7"; depends=[BH Rcpp]; }; @@ -8477,7 +8567,7 @@ in with self; { googlenlp = derive2 { name="googlenlp"; version="0.2.0"; sha256="0d0g18i3im2s5f14k69ym3vwf9a7zkaval3nwrip97xcl6kf4x9h"; depends=[dplyr httr jsonlite purrr readr rlang]; }; googler = derive2 { name="googler"; version="0.0.1"; sha256="1aayji3ncqxl58k29d93dbx05s9rp9bc63fl2cpl1cys7gilblxx"; depends=[jsonlite tibble]; }; googlesheets = derive2 { name="googlesheets"; version="0.3.0"; sha256="11q07nxys72wkxx9mawmjyf20gvwvrb7h3gpa73h6lgh2vgrwnv8"; depends=[cellranger dplyr httr jsonlite purrr readr stringr tibble tidyr xml2]; }; - googlesheets4 = derive2 { name="googlesheets4"; version="0.1.0"; sha256="1n12s92cbn6cnnkm629brdkghvj0r8x7rz191c0lbdfd8mgbw1pw"; depends=[cellranger curl gargle glue googledrive httr magrittr purrr rematch2 rlang tibble]; }; + googlesheets4 = derive2 { name="googlesheets4"; version="0.1.1"; sha256="1vj6viw9mbmwn0gs9s9yr9lsjl83dlzf37g64qi4vr3p28vg5cjs"; depends=[cellranger curl gargle glue googledrive httr magrittr purrr rematch2 rlang tibble]; }; googleway = derive2 { name="googleway"; version="2.7.1"; sha256="0axpr81p3gdp1nmfn000lk288sdn8z5qmzjvagdxqn5j44hq6sj1"; depends=[curl googlePolylines htmltools htmlwidgets jpeg jqr jsonlite magrittr scales shiny viridisLite]; }; goric = derive2 { name="goric"; version="1.1-0"; sha256="1smjq9vljszgngs5i6x55jwg0imzc5gsfdqxzcs4541fp3pvk999"; depends=[MASS Matrix mvtnorm nlme quadprog]; }; gorica = derive2 { name="gorica"; version="0.1.0"; sha256="09b5i6r2s449gvk0vagvf7kd6y0pgr4cz7hdwplq01x246bhjs6q"; depends=[bain lavaan lme4 MASS mvtnorm quadprog]; }; @@ -8486,11 +8576,11 @@ in with self; { gower = derive2 { name="gower"; version="0.2.1"; sha256="007ivwn1nagpi26qq8iih1c2l61c53glvv60n90hi341ry8vwgxg"; depends=[]; }; gpDDE = derive2 { name="gpDDE"; version="0.8.2"; sha256="100g2f8zlpbwxb46h62pgvidll8aflz1zl4inyh8dml6vhm9pilp"; depends=[CollocInfer deSolve fda forecast lars limSolve MASS nnls penalized trustOptim TSA]; }; gpairs = derive2 { name="gpairs"; version="1.2"; sha256="09mkdbs9hklxnmqcsnf65s3dfsfcr7kppp6zxj08v5hxym1gpz3l"; depends=[barcode colorspace lattice MASS vcd]; }; - gpclib = derive2 { name="gpclib"; version="1.5-5"; sha256="08j81b8wymsgin20n54gvm6m54rmdic51p6qzs9cz4pmgl7dkkjv"; depends=[]; }; + gpclib = derive2 { name="gpclib"; version="1.5-6"; sha256="11jjgg74l8hy9jz4jylhriqnzv8jcf12y1bkx22v29z3fhgkwkps"; depends=[]; }; gpg = derive2 { name="gpg"; version="1.2.2"; sha256="1qc7w4d6frp0j4yk0q7slkj1mps80bv78lixcpw1shgx48rp41kh"; depends=[askpass curl]; }; gpk = derive2 { name="gpk"; version="1.0"; sha256="1zfhkqyypb24mhbj2zi9qy3gw0kqxvlp8j5ni3zm7k5rz1bnrygg"; depends=[]; }; gplm = derive2 { name="gplm"; version="0.7-4"; sha256="0apvj14nl5qbi4dhhdx5nih5lvjwfcipvr8cyk6xsz4r5gfr2iw4"; depends=[AER]; }; - gplots = derive2 { name="gplots"; version="3.0.1.2"; sha256="0vrm7wqrmqsmfrc070r9chpzb0vv60pay2lyar9qxfry6bsrvx86"; depends=[caTools gdata gtools KernSmooth]; }; + gplots = derive2 { name="gplots"; version="3.0.3"; sha256="0hs6mk48i9yd43rg9wfjc2nxsjjwrnpifxqvxkv8ah18kvpd6xnp"; depends=[caTools gdata gtools KernSmooth]; }; gpmap = derive2 { name="gpmap"; version="0.1.1"; sha256="00jhslbxbp6dgq7bw346hfpw0gans048vsn7chyzjhyr7ah5xrfg"; depends=[foreach ggplot2 isotone plyr]; }; gppm = derive2 { name="gppm"; version="0.2.0"; sha256="1n9is3xj52lsck2fiy9j320p2ca6ib36s251i7g3iz99a77b0ahh"; depends=[ggplot2 ggthemes MASS mvtnorm Rcpp rstan]; }; gprofiler2 = derive2 { name="gprofiler2"; version="0.1.8"; sha256="0xa2r40alsj9d1kgkchli7p9wcffbjqbz16f8crribgl47zwlvxc"; depends=[crosstalk dplyr ggplot2 gridExtra jsonlite plotly plyr RCurl tidyr viridisLite]; }; @@ -8500,6 +8590,7 @@ in with self; { gquad = derive2 { name="gquad"; version="2.1-1"; sha256="19k7cqp2j5vb6m9hxdm951wfjh6nsswb64pdz9g93ypcqrg02wa4"; depends=[ape seqinr]; }; grImport = derive2 { name="grImport"; version="0.9-3"; sha256="109mrdvq06xq3zgn9ngz0c7zzgqkv5zbpvsb2i636vmlk6y4dpkd"; depends=[XML]; }; grImport2 = derive2 { name="grImport2"; version="0.2-0"; sha256="19q0dd8fpp1g4xf6sg5f8dxybwxjfw553ra6wgjd8b74fzca40m1"; depends=[base64enc jpeg png XML]; }; + grabsampling = derive2 { name="grabsampling"; version="1.0.0"; sha256="031a4ak84k2mbhrmjbai3q8qnf2z3d9rp0xra67x74a99av9lzs9"; depends=[extraDistr ggplot2 ggthemes plyr reshape2]; }; gradDescent = derive2 { name="gradDescent"; version="3.0"; sha256="1jxgvnjw9qk5bkb0fw4kyks4vb9d1933jn79ry0w6956mq2xbb79"; depends=[]; }; grade = derive2 { name="grade"; version="0.2-1"; sha256="085hfvqn880yk19axdjv3z9jr33kls212vs172a8mzhnkallph1r"; depends=[]; }; gradeR = derive2 { name="gradeR"; version="1.0.5"; sha256="1c7x16z1mn7ys63vdwpy8b2x21k35pbmnpl52h372pfrsvxxhb23"; depends=[testthat]; }; @@ -8510,7 +8601,7 @@ in with self; { granova = derive2 { name="granova"; version="2.1"; sha256="161fznqlnwmw53abmg2n62lhxxda7400ljnadvcdvsm8f6kcjf80"; depends=[car]; }; granovaGG = derive2 { name="granovaGG"; version="1.4.0"; sha256="0khqlqc6jg9cpdq06g6jlpfjcw3m6rj40ipljfai8g1630ril6q4"; depends=[ggplot2 gridExtra plyr RColorBrewer reshape2]; }; grapes = derive2 { name="grapes"; version="1.0.0"; sha256="079b7w2xhb0a481s7qihhka0l9ydkjdph0865wjjkcbpr4775p26"; depends=[magrittr]; }; - graph4lg = derive2 { name="graph4lg"; version="0.2.0"; sha256="1y0kc7jm878ck287h3088nmfwfky1m7j88085zb5fd04273cy8hl"; depends=[ade4 adegenet diveRsity doBy ecodist ggplot2 igraph Imap MASS Matrix mclust pegas raster Rdpack rgdal sf sp spatstat stringr tidyr vegan]; }; + graph4lg = derive2 { name="graph4lg"; version="0.3.0"; sha256="0sy8jd771r16hnzpal0di4w0qmjmdpgny7zj4xq1y2bnsnlhv5bh"; depends=[ade4 adegenet diveRsity doBy ecodist ggplot2 igraph Imap MASS Matrix mclust pegas raster Rdpack rgdal sf sp spatstat stringr tidyr vegan]; }; graphTweets = derive2 { name="graphTweets"; version="0.5.3"; sha256="0jf52lclwvqgybdj6fknzx046bh6jgwxvqs4c5g1ii8f2lsz9y07"; depends=[combinat dplyr igraph magrittr purrr rlang tidyr zeallot]; }; grapherator = derive2 { name="grapherator"; version="1.0.0"; sha256="071by9b8figbsf4g0f8a8mgcdksjksc57mnlgggilw7py1yjnjlh"; depends=[BBmisc checkmate deldir ggplot2 lhs reshape2 vegan]; }; graphframes = derive2 { name="graphframes"; version="0.1.2"; sha256="1bv7d0sggwab4rd486ayw9gkb5ja5p5fin5pn92xnrmz8cgwsfxq"; depends=[forge sparklyr tibble]; }; @@ -8518,51 +8609,53 @@ 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.5.0"; sha256="03dizbhhdhnzbj2i5zvqgs617kwcv4h2pha4f16adic0fph1rxl3"; depends=[igraph Rcpp RcppArmadillo]; }; + graphlayouts = derive2 { name="graphlayouts"; version="0.6.0"; sha256="1la016m37kp79zk8p1yx9kaha8y6d4w52w39h0mzv1mfsi6d75w0"; depends=[igraph Rcpp RcppArmadillo]; }; graphon = derive2 { name="graphon"; version="0.3.3"; sha256="1jsjbyk1hbmdlgap3gaf1cdrrbgfccr4lgpdi7g3bzp3mjjbijh5"; 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.3.0"; sha256="0n0ps6r65bh8yl6rq6jdh9lxcm66py3rphcz6649v3qz24ijq110"; depends=[cowplot dplyr ggplot2 mgcv mvnfast purrr rlang tibble tidyr]; }; + graphsim = derive2 { name="graphsim"; version="0.1.2"; sha256="12ck2svjwfl2zqyhzzm3h9a57hy3gklpbbw8j9nnmagskxags5x3"; depends=[igraph Matrix matrixcalc mvtnorm]; }; + gratia = derive2 { name="gratia"; version="0.3.1"; sha256="0jgbx0mzm4a31fy9r046n4q9pkzmjxbbnbh9jsrlvj811qyni7gb"; depends=[cowplot dplyr ggplot2 mgcv mvnfast purrr rlang tibble tidyr]; }; graticule = derive2 { name="graticule"; version="0.1.2"; sha256="1yvrijvyjilfql72dxj32b3sczqv065zj61729wrrzn63xcifvmb"; depends=[raster sp]; }; - grattan = derive2 { name="grattan"; version="1.8.0.0"; sha256="1604hrbh897hdgxg2ack4c47xzqlgwgy4nn96lyc2sk3qvw0l7s7"; depends=[assertthat data_table fastmatch forecast fy hutils ineq magrittr Rcpp rsdmx zoo]; }; - gravitas = derive2 { name="gravitas"; version="0.1.0"; sha256="0w53rz6ips5cl2xigb16ffskjdnlx98f20slkpvdh4s2vwvbvk74"; depends=[dplyr ggplot2 ggridges ineq lubridate lvplot magrittr RColorBrewer rlang shiny stringr tibble tidyr tsibble]; }; + grattan = derive2 { name="grattan"; version="1.8.0.1"; sha256="113f4rsmmv9czc4khdfndxw5cxsiad7scqmnrfcj2ar03ybbp2gn"; depends=[assertthat data_table fastmatch forecast fy hutils ineq magrittr Rcpp rsdmx zoo]; }; + gravitas = derive2 { name="gravitas"; version="0.1.2"; sha256="1hgxr6yq98w3vfbl9h575bi7l2g10ahgdqcq06r3apksikfn6pc2"; depends=[dplyr ggplot2 ggridges ineq lubridate lvplot magrittr RColorBrewer rlang shiny stringr tibble tidyr tsibble]; }; gravity = derive2 { name="gravity"; version="0.9.8"; sha256="1yx71gidv3ivjfip994ciaiwk2cvvm8z16yax4lwpwgl1fxj1p4k"; depends=[censReg dplyr glm2 lmtest magrittr MASS multiwayvcov purrr Rdpack rlang sandwich survival tibble tidyr]; }; + grec = derive2 { name="grec"; version="1.4.1"; sha256="1vy3idjvayzx9j9pf5bv5bxycjca3w3c4x4lzzbrdi3c97508sa8"; depends=[imagine raster]; }; greenclust = derive2 { name="greenclust"; version="1.1.0"; sha256="198ix55x8cl5wx09p6ahzy3bvig86mvqf2qywjfilp6b4hnjgk7l"; depends=[]; }; gremlin = derive2 { name="gremlin"; version="0.1.0.1"; sha256="1qsjj910lmwdnmbn0fxakw713sk7myavgrmp5xm86my7cm866hmb"; 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]; }; + greport = derive2 { name="greport"; version="0.7-2"; sha256="1p5x4sar88ss8n1m0c73arac10mq4ircjad38kbin6l0nk9z1mh2"; depends=[data_table Formula ggplot2 Hmisc lattice latticeExtra rms survival]; }; greta = derive2 { name="greta"; version="0.3.1"; sha256="0wy1619drj8ir6r44xcliiirgibksd80gmjx21am2h580k0x0xq2"; depends=[coda future progress R6 reticulate tensorflow]; }; gretel = derive2 { name="gretel"; version="0.0.1"; sha256="1yyj4aing56f2vy0gshxwb623g9idg8k4701v3s53lqn4m2ybazk"; depends=[Rcpp ResistorArray]; }; grex = derive2 { name="grex"; version="1.9"; sha256="0s6nan76rrmh3yhgvzb7pqdrzx2w9px8ay4v9yiib4bamy9wmhpb"; depends=[]; }; - greybox = derive2 { name="greybox"; version="0.5.7"; sha256="1igx5lv0li3j5kaz70255fbh8w3icnvvqcqifr381q1jbhv3zal1"; depends=[forecast lamW nloptr numDeriv Rcpp statmod]; }; + greybox = derive2 { name="greybox"; version="0.5.9"; sha256="15xpw17v5msnfrxi42w9jd1cb9jwzx2hgjq4v31pdrl5kdc2yn0w"; depends=[forecast lamW nloptr pracma Rcpp statmod]; }; greyzoneSurv = derive2 { name="greyzoneSurv"; version="1.0"; sha256="115i0d4fy4p4g4vd419hj9f23hi8cbiyfilgpgmag91ilr1xpcdp"; depends=[Hmisc survAUC survival]; }; - grf = derive2 { name="grf"; version="1.0.1"; sha256="0m2r60w5w1c2h3rnia0zxbdvn2mrixq7p4qcw54lv491lyyxl0my"; depends=[DiceKriging lmtest Matrix Rcpp RcppEigen sandwich]; }; + grf = derive2 { name="grf"; version="1.1.0"; sha256="0bm5r26iabpk2yjln5i14vlcv3kg3p9n8sv9q1xm9v33j0qda507"; depends=[DiceKriging lmtest Matrix Rcpp RcppEigen sandwich]; }; gridBase = derive2 { name="gridBase"; version="0.4-7"; sha256="09jzw4rzwf2y5lcz7b16mb68pn0fqigv34ff7lr6w3yi9k91i1xy"; depends=[]; }; gridBezier = derive2 { name="gridBezier"; version="1.1-1"; sha256="1n5d6svxblcxpzf79px0qjxsydpwjpnfcagnwk35ljinyd0wv68z"; depends=[]; }; gridDebug = derive2 { name="gridDebug"; version="0.5-0"; sha256="12zrl7p8p7071w5viymdipycja7a2arvy0aahgahd5nlx1k1gha0"; depends=[graph gridGraphviz gridSVG]; }; gridExtra = derive2 { name="gridExtra"; version="2.3"; sha256="0fwfk3cdwxxim7nd55pn7m31bcaqj48y06j7an2k1v1pybk0rdl1"; depends=[gtable]; }; gridGeometry = derive2 { name="gridGeometry"; version="0.2-0"; sha256="0y7y1ld03cqpibmjssid6n3n8gf98hi9ngcfbkh6acyzck812bc7"; depends=[polyclip]; }; - gridGraphics = derive2 { name="gridGraphics"; version="0.4-1"; sha256="1kr3p54bkv2q7agxrva30y9bkwkiq1k2cfl5z1kvyjv6f5xi4w5p"; depends=[]; }; + gridGraphics = derive2 { name="gridGraphics"; version="0.5-0"; sha256="0rlyc3xk8kfrfzbfd8n4javq3yxqd7lsfmi4q5n6s61srnrl6c1r"; depends=[]; }; gridGraphviz = derive2 { name="gridGraphviz"; version="0.3"; sha256="1jz0d6kc8ci55ffm6dns8bhak9xnaq7mg5mpv3fk53lircn7mwl5"; depends=[graph Rgraphviz]; }; gridSVG = derive2 { name="gridSVG"; version="1.7-1"; sha256="03ra820lm0gydrvxmck658aaj3mqqkqrinxc134r5npl8bv4x2hg"; depends=[jsonlite XML]; }; gridsample = derive2 { name="gridsample"; version="0.2.1"; sha256="062aryy26x07m31r6m0fj1zgnjhivlh1fikx9lv2rdgk0rh4yzz0"; depends=[data_table geosphere maptools raster rgdal rgeos sp spatstat spatstat_utils]; }; gridsampler = derive2 { name="gridsampler"; version="0.6"; sha256="0wqpqg9c372sv8zqks6v93gawiyfghw58hn7m8q45dxpqm16ss3k"; depends=[BiasedUrn ggplot2 plyr reshape2 shiny shinyBS shinythemes]; }; - gridtext = derive2 { name="gridtext"; version="0.1.0"; sha256="1fk1ywb088fr1cyfjjsc1qrrvpn6khb3vv8ilxss0d2nclx6zkar"; depends=[jpeg markdown png Rcpp RCurl rlang stringr testthat xml2]; }; + gridtext = derive2 { name="gridtext"; version="0.1.1"; sha256="06rb3xn8zf9m1v8kam39a7cp6iaw4xpirwjvp0y99gx3q5ijf5d7"; depends=[jpeg markdown png Rcpp RCurl rlang stringr testthat xml2]; }; gripp = derive2 { name="gripp"; version="0.2.20"; sha256="0rshipm8rdynl19a4dsvvvlhkd0n4vjfkidwnv5iilc5ini7c4qr"; depends=[GA GenSA usethis]; }; grnn = derive2 { name="grnn"; version="0.1.0"; sha256="1dxcmar42g9hz4zlyszlmmnnsnja0gxfggav5jxv0gkp32rkd0wh"; depends=[]; }; - groc = derive2 { name="groc"; version="1.0.6"; sha256="0x7rrf5bw05s257xhzklpc6hslpjnzjx02hlrz4r9zixbfffmawc"; depends=[MASS mgcv pls robust robustbase rrcov]; }; + groc = derive2 { name="groc"; version="1.0.7"; sha256="1qi16br426z90d58130n47riy7q1lcq19zl585a001av4lrmmqzv"; depends=[MASS mgcv pls robustbase rrcov]; }; gromovlab = derive2 { name="gromovlab"; version="0.7-6"; sha256="02s7x23610dbpmrqh7pimspa10v3fnmj48fwmh0a6igd74rmj2mg"; depends=[ape cluster glpkAPI igraph quadprog]; }; groupICA = derive2 { name="groupICA"; version="0.1.1"; sha256="1wl828ligvvw55xic383gdn7aq4mbwsnkl4ym6f71jn5g3p36d0i"; depends=[MASS]; }; groupRemMap = derive2 { name="groupRemMap"; version="0.1-0"; sha256="1bfp746j0dx7kk44nyjqmimvgw14par9ayvqxnzldc05qsazjdwx"; depends=[]; }; - groupdata2 = derive2 { name="groupdata2"; version="1.1.2"; sha256="0v206sq4h50v1scb2i8qwwi3kxiqamxwrnn1gblwk9i3xkmqs48y"; depends=[dplyr numbers plyr rlang tibble]; }; + groupdata2 = derive2 { name="groupdata2"; version="1.2.0"; sha256="119ianzcv5dwvdyfxmgm7qgv99zbanm1ikal0rxc70c5n5lagv83"; depends=[checkmate dplyr lifecycle numbers plyr rlang tibble]; }; grouped = derive2 { name="grouped"; version="0.6-0"; sha256="1glxgacpwk7yjbkwg5ci6bmb2il6hf5zhydwi5bbq6hc032m9976"; depends=[MASS]; }; - groupedSurv = derive2 { name="groupedSurv"; version="1.0.4"; sha256="106z47icn680nyzj9gkq7g8gv73ajgmx0ypiv4l1j01cd3nripj2"; depends=[BH doParallel doRNG foreach qvalue Rcpp RcppEigen]; }; - groupedstats = derive2 { name="groupedstats"; version="0.1.1"; sha256="0fp073mf2qghi4l1jfr41r1b7n0h3zaa96q7wk7xwi3a3d7vs152"; depends=[broomExtra dplyr glue haven lme4 parameters purrr rlang rstudioapi sjstats skimr tibble tidyr]; }; + groupedSurv = derive2 { name="groupedSurv"; version="1.0.4.1"; sha256="1kapz07hswpcvm9mmgc06l71f7ymx7aq816mzwca6cvccvqnrl5n"; depends=[BH doParallel foreach qvalue Rcpp RcppEigen]; }; + groupedstats = derive2 { name="groupedstats"; version="0.2.2"; sha256="0znxy8nshc3c95ninarsgxv3r894p4kk8k9sv7a5qkpw7v4fj2mm"; depends=[broomExtra dplyr glue haven ipmisc lme4 parameters purrr rlang 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]; }; growfunctions = derive2 { name="growfunctions"; version="0.14"; sha256="1pvyiw20fxm3l4giyq4iizc67yy36i6wq4ch2qyqg4mfd4bki2g4"; depends=[ggplot2 mvtnorm Rcpp RcppArmadillo reshape2 spam]; }; growth = derive2 { name="growth"; version="1.1.1"; sha256="05yxjlbv1i4ly8yp3aqbxzq1z2mp7sfx7xyqw48qsdv0acqai7jy"; depends=[rmutil]; }; - growthPheno = derive2 { name="growthPheno"; version="1.0-21"; sha256="1lhzf1i1k786c6j0vn3ay6mnmk3bh7xhymq2ywwjz228hszn1bf2"; depends=[dae GGally ggplot2 Hmisc RColorBrewer readxl reshape]; }; + growthPheno = derive2 { name="growthPheno"; version="1.0-22"; sha256="0xhy6w8xcyavb10z5qnzc2bfzn158vmajrcm318s4afwm1ynqix5"; depends=[dae GGally ggplot2 Hmisc RColorBrewer readxl reshape]; }; growthcurver = derive2 { name="growthcurver"; version="0.3.0"; sha256="0q7g00b9sxxlq8yscmmccr8r4mwzpc707arbrr46iii8ra9icvlb"; depends=[minpack_lm]; }; growthmodels = derive2 { name="growthmodels"; version="1.2.0"; sha256="1wy5z77819s3daa0mifafcjfkggsq0ac522yagj86ml3vf7yqppj"; depends=[]; }; growthrate = derive2 { name="growthrate"; version="1.3"; sha256="1ak3yqlm7dnkdjlmikwa57qnf7yd9n1ixz36gv3shr252750x9cd"; depends=[clime Matrix mvtnorm]; }; @@ -8570,9 +8663,7 @@ in with self; { 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]; }; + grpreg = derive2 { name="grpreg"; version="3.2.2"; sha256="12432rdyv6b837n3b6kwjrqsmx7bs6qdmyz02x4l956pwmp5g7z5"; depends=[Matrix]; }; grr = derive2 { name="grr"; version="0.9.5"; sha256="0arbcgrvhkwb5xk4nry1ffg2qj0v8ivhjghdr505ib4357g0c9i9"; depends=[]; }; grt = derive2 { name="grt"; version="0.2.1"; sha256="1dw5rjs82r82l6qryyyq9cczm770v4iv60d7pi1nb4b0733ndbd5"; depends=[MASS]; }; gsDesign = derive2 { name="gsDesign"; version="3.0-1"; sha256="0cixg176ihbkwkcllabr2klc15cssdnfzwklf0q1wd23lmv6aj43"; depends=[ggplot2 plyr xtable]; }; @@ -8580,36 +8671,38 @@ 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.0-1"; sha256="0wb62y4fcca1qq27kgk59qxm1nx5njcs94cr8x1bsnk88z945p9p"; depends=[gsDesign lattice]; }; + gsbm = derive2 { name="gsbm"; version="0.1.0"; sha256="0slx4063fnys60mxa9gqdmza9h9pif3qqyjw7y5nfcm8p06ckdbn"; depends=[softImpute]; }; gscaLCA = derive2 { name="gscaLCA"; version="0.0.2"; sha256="0s6rnyd632xq04pnyq1j3571qv7j5bzxir2nhk5jk9i8myf9fc9k"; depends=[devtools doSNOW fastDummies fclust foreach ggplot2 gridExtra MASS progress psych stringr]; }; gscounts = derive2 { name="gscounts"; version="0.1-3"; sha256="1xcsvnam858l9am30mmqb6m0vcflijhli22ix8g56rcvfsh208q1"; depends=[Rcpp]; }; gset = derive2 { name="gset"; version="1.1.0"; sha256="1gingqw6la8n7mnl47wpz9sicxca4zi2m8p35n6cnihrniibhajc"; depends=[Hmisc MCMCpack mvtnorm]; }; - 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="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.1.1"; sha256="0yjxzc69ihsx5ni6jb4shsvl9vskqlls3gmpckmzx5nsh1l5s5vb"; depends=[ldbounds mvtnorm xtable]; }; - gss = derive2 { name="gss"; version="2.1-10"; sha256="1qhywsn9244fc7ir705xc8s832ygd7w0j72k3d58bdx9wv57xi16"; depends=[]; }; + gss = derive2 { name="gss"; version="2.1-12"; sha256="02qpxx8lwkxsxv3xhkkxgpsj7i5nqaqs04afd2aby7b746v2pjdw"; depends=[]; }; gstar = derive2 { name="gstar"; version="0.1.0"; sha256="1582f7jcphb32j3wdc345qa5sgm2xyimlc6r5r5jay7ca5ll8c98"; depends=[dplyr ggplot2 reshape2 xts zoo]; }; - gstat = derive2 { name="gstat"; version="2.0-4"; sha256="0sksk3a08bx70h8230ca7sz8jhwp37f4d34igh192668vz0cvljp"; depends=[FNN lattice sp spacetime zoo]; }; + gstat = derive2 { name="gstat"; version="2.0-5"; sha256="1c6dhjzn9rmb67j51izx9lvjdxnvvc4h5sxgixqd19vg9bh5694d"; depends=[FNN lattice sp spacetime zoo]; }; gsubfn = derive2 { name="gsubfn"; version="0.7"; sha256="00j6b8b6xsx6v370h220x233rpk6asca78165y3d48jpwvwisdc9"; depends=[proto]; }; gsw = derive2 { name="gsw"; version="1.0-5"; sha256="0lv4x4is53xybgg205dncizpnqnakqk47b5wgys2kr4ixqc8jipb"; depends=[testthat]; }; gsynth = derive2 { name="gsynth"; version="1.0.9"; sha256="1m9s3gymm0z6frfzmz7kv8cbdnla2vp4aam5b2zzcxwflzwbplm3"; depends=[abind doParallel foreach GGally ggplot2 MASS mvtnorm Rcpp RcppArmadillo]; }; + gt = derive2 { name="gt"; version="0.2.0.5"; sha256="1kc8x3bzlpqnxr1in8s3a6d52hvhs93vgbdamxzz67q7rgdzfhhk"; depends=[checkmate commonmark dplyr fs ggplot2 glue htmltools magrittr rlang sass scales stringr tibble tidyselect]; }; gt4ireval = derive2 { name="gt4ireval"; version="2.0"; sha256="1d567iz57xqszm45l1wq4n2qrrmyz8ssll1vllfmncb9ibbnx4f3"; depends=[]; }; gtWAS = derive2 { name="gtWAS"; version="1.1.0"; sha256="1kbkz0iwc3gfj982m93m2wdr1xm5rhy70k6bdc7kms9ivh5fh6sh"; 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]; }; + gtfs2gps = derive2 { name="gtfs2gps"; version="1.0-7"; sha256="1g0aswyp10d77agz62h2wa6s83bh255dv3ygbp1cplpa1r6szsp8"; depends=[data_table furrr future lwgeom magrittr pbapply Rcpp sf sfheaders units]; }; 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=[]; }; + gtools = derive2 { name="gtools"; version="3.8.2"; sha256="1pnwy412wvhhvnnx8qg6s9hrgcnsfhnfcpf2560ipipk845acfsh"; depends=[]; }; gtop = derive2 { name="gtop"; version="0.2.0"; sha256="1nvvbf181x0miw3q0r2g0nklz29ljdsd07cazaajfls7pmhi0xw9"; depends=[hts lassoshooting quadprog]; }; gtrendsR = derive2 { name="gtrendsR"; version="1.4.4"; sha256="0b05m5jbgbhdjmwp89zaa276z1h2qib2h30msg69lhwbdcsva96q"; depends=[anytime curl ggplot2 jsonlite]; }; - gtsummary = derive2 { name="gtsummary"; version="1.2.4"; sha256="0sn05c68p74zk90j3zxj9jqa1aim28ydqlw3gfn8j4h72pnklyv0"; depends=[broom broom_mixed crayon dplyr glue knitr lifecycle magrittr purrr rlang stringr survival tibble tidyr tidyselect usethis]; }; - gtx = derive2 { name="gtx"; version="0.0.8"; sha256="0x71jji2yldi9wpx8d3nldbjfj4930j7zcasayzbylf9094gmg26"; depends=[survival]; }; + gtsummary = derive2 { name="gtsummary"; version="1.2.6"; sha256="12ah610w1ry69rwlxdj3qq1hhcgsgmqq1wbh6bd6w48s389929y1"; depends=[broom broom_mixed crayon dplyr forcats glue knitr lifecycle magrittr purrr rlang stringr survival tibble tidyr tidyselect usethis]; }; guardianapi = derive2 { name="guardianapi"; version="0.1.1"; sha256="17xmmr6pfzhdnmf45jzvk84gbfnmlw1qfv1gqjaw85vgm8b6jn6l"; depends=[dplyr httr jsonlite rlang tibble]; }; guess = derive2 { name="guess"; version="0.1"; sha256="198pxi0yipgm9wccpj3y4a0gkibhyxcmb7v5dz7ipzrk44ha5g6j"; depends=[Rsolnp]; }; + guf = derive2 { name="guf"; version="1.0.2"; sha256="1dfmja2da211pcid4hr7x9q0sgz37756rpykm1ax862avdl8hsmc"; depends=[]; }; gumbel = derive2 { name="gumbel"; version="1.10-2"; sha256="0s9idcrssnl683abwky9zvqylciy0b51z935yfvb2bm8b0b0b4ij"; depends=[]; }; gunit = derive2 { name="gunit"; version="1.0.0"; sha256="0vmm47f21n9f334aj38gzrmv1c4sp76njk95ld9gv6fcfxgsipyh"; depends=[magrittr stringr tibble units]; }; gunsales = derive2 { name="gunsales"; version="0.1.2"; sha256="02vz16lhym72vvf48yai1g371wygdlmi63a6ylc147l0b69jgw31"; depends=[data_table dplyr ggplot2 seasonal x13binary zoo]; }; @@ -8625,20 +8718,23 @@ in with self; { gwfa = derive2 { name="gwfa"; version="0.0.4"; sha256="0jz82d9lfyd07z0jjlfqzsg7a3vnyz0s1j0rrb5sg9pnvcfjk9qy"; depends=[Rcpp sp]; }; gwrpvr = derive2 { name="gwrpvr"; version="1.0"; sha256="0x15nv2pfv99c04lgs6q6hgczarld34xc4aqw9bn179m7j02v6m3"; depends=[]; }; gwrr = derive2 { name="gwrr"; version="0.2-1"; sha256="1fjk217pimnmxsimqp9sn02nr1mwy3hw3vsr95skbfsd6vdda14d"; depends=[fields lars]; }; + gwsem = derive2 { name="gwsem"; version="0.1.17"; sha256="1f2hym3md1agq2ml7f2v1dkb308iy1rl68c12f7n3ycsw0ql70ix"; depends=[BH data_table lifecycle OpenMx qqman Rcpp]; }; gym = derive2 { name="gym"; version="0.1.0"; sha256="0vcwzgawqwjsf65hr1mbjkz3px8zsibfkn42jpsg39n13jpfjq8v"; depends=[httr jsonlite]; }; - gyriq = derive2 { name="gyriq"; version="1.0.2"; sha256="12vbnhianzi4l43czaxrbnbkz1h8lvmwjys0y3c2ml3g6dmwwfji"; depends=[CompQuadForm irlba mvtnorm survival]; }; - h2o = derive2 { name="h2o"; version="3.28.0.2"; sha256="1975898p9bh61qa01aqzdkxjcnblgbkn0ld7das9ibav4w5jjva5"; depends=[jsonlite RCurl]; }; + h2o = derive2 { name="h2o"; version="3.28.0.4"; sha256="1nsbw4fbwizj30y0qvw8ln078ayaisl4zydjx9917hlsbc8wc3aq"; depends=[jsonlite RCurl]; }; h2o4gpu = derive2 { name="h2o4gpu"; version="0.2.0"; sha256="06d2rrr27xvnsai6zjiaiw0jjfzdza1cc39c03d6pjkvnh0mqh2c"; depends=[magrittr reticulate]; }; hBayesDM = derive2 { name="hBayesDM"; version="1.0.2"; sha256="04p4d0hy2l6bmxyh2k5q0g19b7fbpsl9frmcvrf5rxkaasxyxwn6"; depends=[BH data_table ggplot2 loo Rcpp RcppEigen rstan StanHeaders]; }; - hIRT = derive2 { name="hIRT"; version="0.2.0"; sha256="1vgmr36dbcn2ah9pzhc46zh1va7y7w3zr4mpmyf626m1bq0alb39"; depends=[pryr rms]; }; + hIRT = derive2 { name="hIRT"; version="0.3.0"; sha256="0s0i6p9iv0yv0l15dnwkpcmc91751jyjs1y1nz671lz6jpb8rz5c"; depends=[ltm Matrix pryr rms]; }; + hJAM = derive2 { name="hJAM"; version="1.0.0"; sha256="1pnjcn54zi4d7h9zc9wr1gv51dzb0vasfcrw4c1kqymhxsq2yfh3"; depends=[dplyr ggplot2 ggpubr reshape2]; }; hNMF = derive2 { name="hNMF"; version="0.9"; sha256="0qavavgiqah4dv0gz8v5ssz637sd341n9s0pyc232n2jhqpzl0cz"; depends=[MASS NMF nnls oro_nifti R_matlab rasterImage spatialfil]; }; hR = derive2 { name="hR"; version="0.2.1"; sha256="1y0rzcrxb21fhxnpvhijxg0syhj8n20882cy79g5x4rv4xrngw1z"; depends=[data_table data_tree knitr rhandsontable shiny]; }; hSDM = derive2 { name="hSDM"; version="1.4.1"; sha256="1jwqjzr0zpckzh2jpqh17v6ypq4mzn5khlv6p37y59zz8bh9mvxp"; depends=[coda]; }; haarfisz = derive2 { name="haarfisz"; version="4.5"; sha256="1qmh4glwzqwqx3pvxc71rlcimp1l0plgdf380v9hk0b4gj7g3pkf"; depends=[wavethresh]; }; - hablar = derive2 { name="hablar"; version="0.2.0"; sha256="0242gqcjh04kgv1zf9idm4v2vrxm1vm8nvwhcl3mf08w9a8la2aw"; depends=[dplyr]; }; + hablar = derive2 { name="hablar"; version="0.3.0"; sha256="12gm5n3p2kmjwhkf60n4bjn3lrj7lrs5sgmvads9sfp2ckhaiysk"; depends=[dplyr lubridate purrr]; }; hackeRnews = derive2 { name="hackeRnews"; version="0.1.0"; sha256="0vrdbk4dxbykb3hs35nxkl3s2ds92gs5qz66p85w8j5zjmwbw2x6"; depends=[future_apply httr jsonlite tibble]; }; hagis = derive2 { name="hagis"; version="3.0.1"; sha256="1bljpva3j7x87hdmy8s9sh37r5vd8wkjzjqbk57akl654x6b0gfv"; depends=[data_table ggplot2 pander]; }; hail = derive2 { name="hail"; version="0.1.1"; sha256="1nrc9msqyy5iq2i6p8875anbqswxl2z6vdd4hvihnl22qh5fnbvh"; depends=[]; }; + hal9001 = derive2 { name="hal9001"; version="0.2.5"; sha256="16pzcjk0d7kvj3f8dxxzz5sjcsa6m5axc8rb29vxpmg54kyqypys"; depends=[assertthat glmnet Matrix origami Rcpp RcppEigen]; }; + haldensify = derive2 { name="haldensify"; version="0.0.5"; sha256="02bmch7impx5cyv7nifhqln2ppk1qyyzr8w6my77p18wx52h1d4l"; depends=[assertthat data_table future_apply ggplot2 hal9001 origami Rdpack]; }; halfcircle = derive2 { name="halfcircle"; version="0.1.0"; sha256="1gbqbv3cn8w09i3f2ji3qq0snb4fy9243y12agw686fx46dfmhxs"; depends=[scales]; }; hamlet = derive2 { name="hamlet"; version="0.9.6"; sha256="076fh28grlrv38qywshi79m84jsz1ck9k4n0rg4svvr3gqkdbcn2"; depends=[]; }; handlr = derive2 { name="handlr"; version="0.2.0"; sha256="1p14q9swvy8yvd52wcms777vfcb9vandi0pd4cmqmyz1hpsi31d8"; depends=[crul jsonlite mime RefManageR urltools xml2]; }; @@ -8650,18 +8746,17 @@ in with self; { haploR = derive2 { name="haploR"; version="3.0.1"; sha256="162wqjpmgapy54n8msrw5apgzj586ps0kkc5wmbqay3l94xgnvzk"; depends=[DT httr plyr RCurl RUnit tibble XML]; }; haploReconstruct = derive2 { name="haploReconstruct"; version="0.1.2"; sha256="17zdl9c3yy6jdzv1wp0ailbga456pmmybzxh3dldymhj8qf32cx0"; depends=[data_table dbscan foreach gplots igraph matrixStats stringi zoo]; }; haplotyper = derive2 { name="haplotyper"; version="0.1"; sha256="0pcshlh29c4zazhkcq4371kqh9inrbx494y5a1qb1k2c92fkax31"; depends=[]; }; - haplotypes = derive2 { name="haplotypes"; version="1.1"; sha256="0qnsrjzanyyiar8zpmwvfks3gj7cl8libnyg8bx983p25jwifcwl"; depends=[ape network pegas phangorn plotrix sna]; }; + haplotypes = derive2 { name="haplotypes"; version="1.1.2"; sha256="07grdwli0kxnnnf7mg8z7gjpny88h71vf867g50f08yybgb46y70"; depends=[ape network phangorn plotrix sna]; }; happybiRthday = derive2 { name="happybiRthday"; version="0.0.1"; sha256="0rrvi5kx09p74xwxvqcwibbh4qjlk4jxb89grx74chjxk9ak2yv8"; depends=[data_table dplyr gh lubridate tidyr]; }; happytime = derive2 { name="happytime"; version="0.1.0"; sha256="03iblwb6w2dh9sibfi4nlswidck13hzsn7123838zp4sxfnrp041"; depends=[]; }; hapsim = derive2 { name="hapsim"; version="0.31"; sha256="0jw6iw89d4y8wjy58biv40szp123ql7frz1mmdjdxljmwaby963h"; depends=[MASS]; }; - hardhat = derive2 { name="hardhat"; version="0.1.1"; sha256="06l4zcqz76c2m9lxa5d6wqcbq1xkkxk0wynka09y5fyh9q82c0g6"; depends=[glue rlang tibble vctrs]; }; + hardhat = derive2 { name="hardhat"; version="0.1.2"; sha256="1fhs6inbjh7kdv6jamibpb2fccysg1k0w99hbdwhrc5yyljpqfil"; depends=[glue rlang tibble vctrs]; }; harmonicmeanp = derive2 { name="harmonicmeanp"; version="3.0"; sha256="17irfw8788yhh36698p9w8wab6wcin1yzfinlbs3gdg70d42zcnd"; depends=[FMStable]; }; harrietr = derive2 { name="harrietr"; version="0.2.3"; sha256="0n6vsqysj4ijh06z6nqmj8x1z4w9711dxhbfp8p8fwi0l75pj0cj"; depends=[ape dplyr ggtree lazyeval magrittr rlang tidyr]; }; - harrypotter = derive2 { name="harrypotter"; version="2.1.0"; sha256="151kpg47b1hyv6rc3cksykqw8pz0xqm0q9xf9sxa2w14ibymvc8k"; depends=[ggplot2 gridExtra]; }; + harrypotter = derive2 { name="harrypotter"; version="2.1.1"; sha256="1j3sv0rpp4lcrf09j4a3an4lkwi2x1z18iv62fk6c2kpp9b14b8r"; depends=[ggplot2 gridExtra]; }; hash = derive2 { name="hash"; version="2.2.6.1"; sha256="0b3fl0rvgwb992knl81vm99lsldg5clvaqjh6mamm6zqmb6dz056"; depends=[]; }; hashFunction = derive2 { name="hashFunction"; version="1.0"; sha256="1v57xj8xwv6xhxvgp0zxgvs5vcjw8z5k2ciwbn0jxf4ilyd66cgj"; depends=[]; }; hashids = derive2 { name="hashids"; version="0.9.0"; sha256="0233qly4rb1g4znxm9h9h8gskzrjyav6nd26xkdl7990m5hcbcwh"; depends=[]; }; - hashmap = derive2 { name="hashmap"; version="0.2.2"; sha256="1qypmyi033rjxjk055rv94qfqa99gm5hj5gfd9fiiq1xln3z700j"; depends=[BH Rcpp]; }; hashr = derive2 { name="hashr"; version="0.1.0"; sha256="1ri2zz2l1rrc1qmpqamzw21d9y06c7yb3wr60izw81l8z4mmyc3a"; depends=[]; }; hasseDiagram = derive2 { name="hasseDiagram"; version="0.1.3"; sha256="1r9z6jc9lbdj2xc81gpnbswrl8rhs8zrlsnypfrny40g3j402iap"; depends=[graph Rgraphviz]; }; haven = derive2 { name="haven"; version="2.2.0"; sha256="0g9d6mxqmrw2zdms78jpx2sx73pczlyy771v1h5hmxqz9sqyk7hr"; depends=[forcats hms Rcpp readr rlang tibble tidyselect]; }; @@ -8685,7 +8780,7 @@ in with self; { hdd = derive2 { name="hdd"; version="0.1.0"; sha256="0hnqjfp78s8fiabibf0dl57sj170ri1ysf7pyrk45z4qsnizbyn2"; depends=[data_table fst readr]; }; 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.3.1"; sha256="0hvi2cvyv6zlxgpawnmsihxclp2ln88slbrnmaxagmjswskxsrpx"; depends=[bit64 R6]; }; + hdf5r = derive2 { name="hdf5r"; version="1.3.2"; sha256="0c2p06k9bp9rf0fyavnxw5d8jr2bbgx3gjblahz581cpvsfksj9i"; depends=[bit64 R6]; }; hdfqlr = derive2 { name="hdfqlr"; version="0.6-1"; sha256="1z8sylaaki8ab9k7m4hp3530rnkxjh39zvw4n962fw5fb9a11dx3"; depends=[]; }; hdi = derive2 { name="hdi"; version="0.1-7"; sha256="1q58bvlqh59hv3vb3dw92r0w1nwyifnqm5ccss54fzmf2gjsj1cj"; depends=[glmnet linprog MASS scalreg]; }; hdlm = derive2 { name="hdlm"; version="1.3.1"; sha256="1zl6bksw0apkmn5shf8qjpxjyx6vb40dc4m4db76hhn5nhcp10ic"; depends=[foreach glmnet iterators MASS Matrix]; }; @@ -8695,19 +8790,20 @@ in with self; { hdpca = derive2 { name="hdpca"; version="1.1.3"; sha256="09h96wm6r6w1imkm4k9bg5l0vcq2yvbp6iqx786x99ds8jzppsb9"; depends=[boot lpSolve]; }; hdrcde = derive2 { name="hdrcde"; version="3.3"; sha256="0c2qbw4c3mq1cb068kjs72rxlbibz8svwcrx853jyr8ybs23z7ab"; depends=[ash ggplot2 KernSmooth ks locfit RColorBrewer]; }; hds = derive2 { name="hds"; version="0.8.1"; sha256="1smg5ixrl7f2x3wn7s5i26dyadn5sigpf4jsk236z1bhnz617ax4"; depends=[survival tensor]; }; - healthcareai = derive2 { name="healthcareai"; version="2.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]; }; + healthcareai = derive2 { name="healthcareai"; version="2.4.0"; sha256="04bv187agpmzb1igfdjb4naqlpffp4za7skb75xxr2hb1rcgcdvw"; depends=[caret cowplot data_table dplyr e1071 generics ggplot2 glmnet lubridate MLmetrics purrr ranger recipes rlang ROCR stringr tibble tidyr xgboost]; }; healthforum = derive2 { name="healthforum"; version="0.1.0"; sha256="13ih00amv9hrpngm6pxc8vzqzhx8c0yqgaprxdcp5li90lg5r3av"; depends=[magrittr purrr rvest stringr tokenizers xml2]; }; 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.6"; sha256="13aa9rd16k67b1fr6471bdz2a1i04k7279ck1i4rjdly9rbksnjx"; depends=[fastcluster]; }; + heatmap3 = derive2 { name="heatmap3"; version="1.1.7"; sha256="1gdjc5b4f4nf5zpfdl0ch352p3bwbcw5hkd5vlarxvb2qkf9pcxs"; depends=[fastcluster]; }; heatmapFit = derive2 { name="heatmapFit"; version="2.0.4"; sha256="1rswp1wp58f21fpyjybcvvmnn53kr54ij83hp05qbvl7yn1fsnrb"; depends=[]; }; - heatmaply = derive2 { name="heatmaply"; version="1.0.0"; sha256="0576gml3bcl7r1biigzj1rag2xzz422knbw7arc8d2gsakjj757g"; depends=[assertthat colorspace dendextend egg ggplot2 htmlwidgets magrittr plotly RColorBrewer reshape2 scales seriation viridis webshot]; }; + heatmaply = derive2 { name="heatmaply"; version="1.1.0"; sha256="133q8ir45vhfxs2lnd96k97g21ihg2arfhp349kmk339pk32fcxz"; depends=[assertthat colorspace dendextend egg ggplot2 htmlwidgets magrittr plotly RColorBrewer reshape2 scales seriation viridis webshot]; }; heatwaveR = derive2 { name="heatwaveR"; version="0.4.2"; sha256="1fp38vlb4646jg397gsxmf5ws15grmmg6hdzijwll5zsg6a9xhg4"; depends=[data_table dplyr ggplot2 lubridate plotly Rcpp RcppArmadillo RcppRoll tibble zoo]; }; heavy = derive2 { name="heavy"; version="0.38.196"; sha256="05k788ynw9fhhmjydzp8dbk1vhl44j2rz2shqwn02i40jmwdvwrk"; depends=[]; }; - heddlr = derive2 { name="heddlr"; version="0.5.0"; sha256="1xjlp283vv6fwdjyschjriijczhiiinjmkd3i1m5f57n0yvwpq03"; depends=[rlang utf8 yaml]; }; + heddlr = derive2 { name="heddlr"; version="0.6.0"; sha256="0ixmcgvfbq4hi3wv1fyzpwacmxmixsw5yq6mq5xygk6ji03m1v23"; depends=[rlang utf8 yaml]; }; hedgehog = derive2 { name="hedgehog"; version="0.1"; sha256="1mvjnm2zlc4pvw9vnhxr0dj1g1sfqvlrnnhcipzfbvr147yan9l5"; depends=[rlang testthat]; }; heemod = derive2 { name="heemod"; version="0.11.0"; sha256="0zzjq4cmyr25p4x91jw542jiqmds6qikbp8gyix34dcmk765drnk"; depends=[dplyr ggplot2 lazyeval memoise mvnfast plyr pryr rlang tibble]; }; heims = derive2 { name="heims"; version="0.4.0"; sha256="0vnq31jwn09grni4gdhf1hzd87b62as4f65b2qw7ky6mi38ahr5d"; depends=[bit64 data_table fastmatch hutils lubridate magrittr]; }; + helda = derive2 { name="helda"; version="1.0.1"; sha256="1qfnqa94csq7c67prpmyvnkkzbylv4cq4zsmici9c19s9yw4kf76"; depends=[dplyr ggplot2 rlang sqldf stringr]; }; helixvis = derive2 { name="helixvis"; version="1.0.1"; sha256="113rnpnrcnw18ks78fgq79zdrw3kmpzpimlc45gvj0za2fbyci3p"; depends=[ggforce ggplot2 rlang]; }; hellno = derive2 { name="hellno"; version="0.0.1"; sha256="1j787rw9hh75bvkckmlz5xkgwc22gd7si3mgjd7v60dd6lykfa88"; depends=[]; }; helloJavaWorld = derive2 { name="helloJavaWorld"; version="0.0-9"; sha256="1a8yxja54iqdy2k8bicrcx1y3rkgslas03is4v78yhbz42c9fi8s"; depends=[rJava]; }; @@ -8715,35 +8811,35 @@ 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]; }; - hereR = derive2 { name="hereR"; version="0.3.0"; sha256="119py0lpbnc03v2md3wg5pbq7kz40rw82jhmc529i6hkz4qf65js"; depends=[curl data_table jsonlite lwgeom sf stringr]; }; + hereR = derive2 { name="hereR"; version="0.3.2"; sha256="1kjz4g616i572n0kanwg1hbc5x9kmhwijpbm4jmyspvj4b2hlsxi"; depends=[curl data_table jsonlite lwgeom sf stringr]; }; heritability = derive2 { name="heritability"; version="1.3"; sha256="0a0pw8hppkgypl4jaa38hks9nxfwz2zbsd4w6w40j1hxlyy4km8m"; depends=[MASS]; }; hermite = derive2 { name="hermite"; version="1.1.2"; sha256="0j9s7ayvbvmgwybrvf703b72qbn8gskb105pis19ig2sslllzda3"; depends=[maxLik]; }; hero = derive2 { name="hero"; version="0.4.7"; sha256="129v2pjbxm5aalr5lfx0kh20rhwksnb80pc459pxg0xkwxvy1l3d"; depends=[fields Matrix optimx pbapply rgeos sp]; }; - hesim = derive2 { name="hesim"; version="0.2.2"; sha256="1wchccw9761iz0sk5sd8ahdzpphrd4k9rmgg8f9cgp43aza68ic2"; depends=[data_table flexsurv MASS R6 Rcpp RcppArmadillo survival]; }; + hesim = derive2 { name="hesim"; version="0.2.3"; sha256="1x4bhg2rmp8vf0fhpnj7pkfaywcss203c9n23b43hafzy5pkcd6w"; 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.2"; sha256="0r7hzw6ccyrqpq51adljd2ljv9dl00c0dr8frjrhibpzpc68z3sz"; depends=[DiceDesign MASS Rcpp]; }; hett = derive2 { name="hett"; version="0.3-2"; sha256="1kmspw0738pdall5scmllsa79dynliai2glk1h5rzm4030r5rd6j"; depends=[lattice MASS]; }; 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.2"; sha256="1wqdwggnma6p667ivr0xja4vvn3jgzbkc5whkkijmdmxpjzg1wz6"; depends=[Hmisc]; }; - heuristicsmineR = derive2 { name="heuristicsmineR"; version="0.2.1"; sha256="0zpkkz20jlppdvsxcxs0w2n79af21ry1vvmbqlm1scgkr86674yd"; depends=[BH bupaR data_table DiagrammeR dplyr ggplot2 ggthemes magrittr petrinetR processmapR purrr Rcpp rlang scales tidyr]; }; + heuristicsmineR = derive2 { name="heuristicsmineR"; version="0.2.4"; sha256="0dp85yvn0fr22l174ff34pv9xfxh3d7na9dxim2z7f4ialdnialw"; depends=[BH bupaR data_table DiagrammeR dplyr ggplot2 ggthemes magrittr petrinetR processmapR purrr Rcpp rlang scales stringr tidyr]; }; hexSticker = derive2 { name="hexSticker"; version="0.4.6"; sha256="02zdnxnhci0d9dclb6z3zc8sm1c4bj8zzbapwy34h8bs3sz1c8xn"; depends=[ggimage ggplot2 hexbin showtext sysfonts]; }; hexView = derive2 { name="hexView"; version="0.3-4"; sha256="01hiqyibsd4as7jcklzg09pl12la341mg561vn16z4jzdarfvkfc"; depends=[]; }; - hexbin = derive2 { name="hexbin"; version="1.28.0"; sha256="0b58jb1kz39wzrnkv077cfzns889xly7psvhxnm3xmnx6yvd986d"; depends=[lattice]; }; + hexbin = derive2 { name="hexbin"; version="1.28.1"; sha256="1ry6jm3lqz3mj0s5rzbs6mpkz2hxpnvbw8c1vwc4pj7b173r5l22"; depends=[lattice]; }; hextri = derive2 { name="hextri"; version="0.6"; sha256="05rvigi225npncbr1brc6apc7gsg9a5jzcbmhvflwp3hbcg3hn02"; depends=[FNN hexbin]; }; hflights = derive2 { name="hflights"; version="0.1"; sha256="1rb6finck13i6949i6hsgfk90q4ybxh1m3is2mlw2m6087bpzfbd"; depends=[]; }; 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]; }; + hgm = derive2 { name="hgm"; version="1.18"; sha256="0d0s4hkn46cg85wl7nmjn707iw38kjs69p6xz33pzc1yf51l8z7w"; depends=[deSolve]; }; hgutils = derive2 { name="hgutils"; version="0.2.7"; sha256="1svxhz80h84wn1fj58p8g3rp553ima1wfdbbkm2cqnihwjxhha62"; depends=[crayon dplyr limSolve magrittr stringr]; }; - hhh4contacts = derive2 { name="hhh4contacts"; version="0.13.0"; sha256="17f31xhh6kk7sx5d5dvpwpvl72wd45zgb4fcpdayx3yrm719csz9"; depends=[surveillance]; }; + hhh4contacts = derive2 { name="hhh4contacts"; version="0.13.1"; sha256="1cqwn09iqgh6131cm4b5j0kx7k5vil0ak42v064g4maayj0yqy7p"; depends=[surveillance]; }; hhi = derive2 { name="hhi"; version="1.2.0"; sha256="1yl52c3nqdi8v60sr01l0vv8359803dm2i4c9ifazgj3h3a4h0yp"; depends=[ggplot2]; }; hht = derive2 { name="hht"; version="2.1.3"; sha256="022a8zz2m34q89h29jglfj21knlqd8dwi85qmsi78ly1vacnzap8"; depends=[EMD fields spatstat]; }; hiPOD = derive2 { name="hiPOD"; version="1.0"; sha256="1i15ickz2s0kffh99qq30pl5hsl0lbj0kp55jnbv4x72hndzhmla"; depends=[rgl]; }; hiddenf = derive2 { name="hiddenf"; version="2.0"; sha256="0shc1kfiq527mkc5i97zcm51hsvknnhjg7dyfvbfqyk145v6sz00"; depends=[]; }; - hier_part = derive2 { name="hier.part"; version="1.0-4"; sha256="03acdgzkhbk4p0wxw2g1hzklmq9hzmdkkvfj742vzfswdd803yg9"; depends=[gtools]; }; + hier_part = derive2 { name="hier.part"; version="1.0-6"; sha256="15wlpb2rsn6am8galsbjiy4psp78nlv1x2hz3cnqbwj508w6gsj0"; depends=[betareg gtools MASS]; }; hierDiversity = derive2 { name="hierDiversity"; version="0.1"; sha256="1n4jg003h9hvr2n43jwxgfpazvc5ij5lqvspxi49w8fpzpcrqrjj"; depends=[]; }; - hierNet = derive2 { name="hierNet"; version="1.8"; sha256="06ag2vnpdjpmw9q0gzghkxsqx6mh743j8wpsbah4ff742h23hy0w"; depends=[]; }; + hierNet = derive2 { name="hierNet"; version="1.9"; sha256="0fdnj50s985w06wrjc67hcy6fc4lj8jbxlskgrli9m0181vbdj69"; depends=[]; }; hierarchicalDS = derive2 { name="hierarchicalDS"; version="3.0"; sha256="16d6l3y21nhynfjk4swp3pnjr6vhcxq369djgxz907zsjby35gkz"; depends=[coda ggplot2 Matrix mc2d MCMCpack mvtnorm rgeos truncnorm xtable]; }; hierarchicalSets = derive2 { name="hierarchicalSets"; version="1.0.2"; sha256="0m5mnx1zmiscj0k1gnljr7fla4y1qhysi32a8q9jlah2q7grk7x9"; depends=[ggdendro ggplot2 gtable MASS Matrix RColorBrewer Rcpp scales]; }; hierband = derive2 { name="hierband"; version="1.0"; sha256="0d95hrgkd8b5sww3wsgs6v9zg9pm71ick8x8kj8d6vyib350h6yn"; depends=[]; }; @@ -8753,9 +8849,9 @@ in with self; { highSCREEN = derive2 { name="highSCREEN"; version="0.3"; sha256="179l82n7l7dfn40k6zgigw56ggwqyi34gllc2wvcw3yvfnd3l7s4"; depends=[gplots]; }; highTtest = derive2 { name="highTtest"; version="1.1"; sha256="18hgxlr0y8y1d4ldqmfcg4536lhyn5p6w88sq1vj74qr5wzydga1"; depends=[]; }; highcharter = derive2 { name="highcharter"; version="0.7.0"; sha256="0qfv25dqr7l54jq3vrnwphsj7wzk0an3vfx1zik36wi05yf2w8br"; depends=[assertthat broom crosstalk dplyr htmltools htmlwidgets igraph jsonlite lubridate magrittr purrr quantmod rlang rlist stringr tibble tidyr whisker xts yaml zoo]; }; - highfrequency = derive2 { name="highfrequency"; version="0.6.3"; sha256="0fhkarhqgrigbfakf5lmandc5wmdb4q9dq974wygifa3j6khqxz4"; depends=[cubature data_table lubridate mvtnorm Rcpp RcppArmadillo RcppRoll readr robustbase xts zoo]; }; + highfrequency = derive2 { name="highfrequency"; version="0.6.4"; sha256="0ikxrjzssqcv6r96d86apiwsizcycj49jlzv4i0kxwfyxvvchkvq"; depends=[cubature data_table lubridate mvtnorm Rcpp RcppArmadillo RcppRoll readr robustbase xts zoo]; }; highlight = derive2 { name="highlight"; version="0.5.0"; sha256="1shar4y07wyixg0ichdrn2xhgwkl3mv2pxkalqzisc69w605b3hf"; depends=[]; }; - highlightHTML = derive2 { name="highlightHTML"; version="0.2.1"; sha256="06k2idx9aadjd6xp6kadm9jh7ap1hwg7vh0bc8vw9ll82wcp1nv1"; depends=[]; }; + highlightHTML = derive2 { name="highlightHTML"; version="0.2.4"; sha256="0mww4n8g8d3mmmic56wcchg2k09fhf1i4ndjk6q4ic7mvxbcpcc8"; depends=[]; }; highmean = derive2 { name="highmean"; version="3.0"; sha256="1lq7z0l1737j4wvsy7951405afylyywp7vf2i7girzh459fdfzpc"; depends=[MASS mnormt mvtnorm]; }; 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]; }; @@ -8765,7 +8861,7 @@ in with self; { hillR = derive2 { name="hillR"; version="0.4.0"; sha256="0wivagbn4clfm3vbxbl3p93d9yxms94gkvi7p15lh0jfdppzm4c9"; depends=[ade4 ape FD plyr tibble]; }; hilldiv = derive2 { name="hilldiv"; version="1.5.1"; sha256="1jp4xvrpqd575y2x0i73s0bq708bzi6gdhqgz85bia6d5kf05lq9"; depends=[ape data_table FSA geiger ggplot2 ggpubr qgraph RColorBrewer scales vegan]; }; hillmakeR = derive2 { name="hillmakeR"; version="0.2"; sha256="1baynibgn4xqmpsxna8irggxvdc484mq5nza00rwg58vh1bc7wzq"; depends=[]; }; - hindex = derive2 { name="hindex"; version="0.1.0"; sha256="12w1zz467grihjvan1db7c30psm0j85k82p01fzqgwdam3cd8as3"; depends=[foreach ggplot2]; }; + hindex = derive2 { name="hindex"; version="0.2.0"; sha256="01mcd2br33qqkfcyxl584f3l6kyb2cgzpd207p0mynzdaallgxgc"; depends=[foreach ggplot2 purrr]; }; hindexcalculator = derive2 { name="hindexcalculator"; version="1.0.0"; sha256="06b4dn629avmnyqxb0l39m00wz9cg9dddmm6qhgwgnzlxh14ifgk"; depends=[]; }; hint = derive2 { name="hint"; version="0.1-1"; sha256="1n18j2hcb1qynhsln10nzryi20l5aqhr7i1aanww10y5dz573zi3"; depends=[]; }; hipread = derive2 { name="hipread"; version="0.2.1"; sha256="0zll3w0arwjaz16dr9dxns3s25p3fiq4ccnziq4nw7i552zaixd7"; depends=[BH R6 Rcpp rlang tibble]; }; @@ -8785,7 +8881,6 @@ in with self; { hmi = derive2 { name="hmi"; version="0.9.17"; sha256="08cppa061xn13lyp7d9jsybn0cc6k2ffml79m5bp7fk11gzq18mb"; depends=[boot coda linLIR lme4 MASS Matrix MCMCglmm mice msm mvtnorm nlme nnet ordinal pbivnorm rlang tmvtnorm VGAM]; }; hmlasso = derive2 { name="hmlasso"; version="0.0.1"; sha256="0ydcyz9pw30ji8ghrvkgcbmp27d661vajl97b8cwis52605a3gfx"; depends=[BH MASS Matrix Rcpp RSpectra]; }; hmm_discnp = derive2 { name="hmm.discnp"; version="2.1-12"; sha256="1jxbwqh0cc0f07qza0kjbhh3zy7xlk5q7gb8078kprg37if1qd2p"; depends=[nnet]; }; - hmmhdd = derive2 { name="hmmhdd"; version="1.0"; sha256="16jz951d1ssai0gmfnnfikkkvc8yca29a82dq7092kbzwc4i90sk"; depends=[gmfd mvtnorm roahd]; }; hmmm = derive2 { name="hmmm"; version="1.0-4"; sha256="1sbr85lcmcw3lv0ygqwfbarr91dp3br1xnlygy49145cvl93nfci"; depends=[MASS mvtnorm nleqslv quadprog]; }; hms = derive2 { name="hms"; version="0.5.3"; sha256="1baki0qw5ijgiflvsdvqj3apg4yanf12vx14kwbqdzk5rz46fasf"; depends=[pkgconfig rlang vctrs]; }; hmstimer = derive2 { name="hmstimer"; version="0.0.2"; sha256="0qv2pls6mplnv3mylbiwh83gnvq2qkdpnnjnxnhrgmwia9fapixs"; depends=[]; }; @@ -8807,7 +8902,7 @@ in with self; { hornpa = derive2 { name="hornpa"; version="1.0"; sha256="0pfvk2jkrwgvshgq9g55qijgpjh0677rpbya0r8759n92v3axbp4"; depends=[]; }; horserule = derive2 { name="horserule"; version="1.0.0"; sha256="0d348pn0ld7lr9lfl1z05905l9kl296j0xic1pib6r5l1c5600r9"; depends=[gbm ggplot2 inTrees MASS mvnfast randomForest RColorBrewer Rdpack]; }; horseshoe = derive2 { name="horseshoe"; version="0.2.0"; sha256="1qhkw6agkhpmgf27429c3kqqhbvpg61l0dvfxg7n564y2ha76r3c"; depends=[]; }; - hot_deck = derive2 { name="hot.deck"; version="1.1"; sha256="13pfgcyqaf5ik3pi8vgm06xmqli4hgslzlmhy1zi951anzdr49bd"; depends=[mice]; }; + hot_deck = derive2 { name="hot.deck"; version="1.1-2"; sha256="089sfkpl9m1xxpxxxa9kpc99lcswsz90dhq1k7iji2f7wby5i905"; depends=[mice]; }; hotspot = derive2 { name="hotspot"; version="1.0"; sha256="0a4w5d6rg324hd06lfwr1hxf6bwr10n55s3ynz5bpkh9c61yik3n"; depends=[]; }; hotspots = derive2 { name="hotspots"; version="1.0.3"; sha256="12v88k3yz1bsxx9p5dx8y54ccqcglwknm2jr7ybygdj2yasjr5l0"; depends=[ineq lattice]; }; housingData = derive2 { name="housingData"; version="0.3.0"; sha256="0ngfx2vjx705xixzpz0rgx1481cr2szj4yfi5g7ma1hhivddl7d1"; depends=[]; }; @@ -8815,46 +8910,48 @@ in with self; { hpa = derive2 { name="hpa"; version="1.0.1"; sha256="18055gh3nasdh6fh1xw95zl2vidqkw5b99b1zhh78j84lzs6r3gm"; depends=[Rcpp RcppArmadillo]; }; hpackedbubble = derive2 { name="hpackedbubble"; version="0.1.0"; sha256="1br7q4958f1zgvisglsaf41nz2ahnqi3bzazvlfnmk3nq03cb1ri"; depends=[htmlwidgets]; }; hpcwld = derive2 { name="hpcwld"; version="0.5"; sha256="17k4mw41gygwgvh7h78m0jgzh1bivrvrsr8lgxxw3sbkw88lwb40"; depends=[multicool partitions]; }; - hpiR = derive2 { name="hpiR"; version="0.3.0"; sha256="0i15hmcf35kh16nrlc03y5jmrssr3k734s7vym7wbiwfy4x8d37b"; depends=[caret dplyr forecast ggplot2 gridExtra imputeTS lubridate magrittr MASS pdp plyr purrr ranger rlang robustbase zoo]; }; + hpiR = derive2 { name="hpiR"; version="0.3.2"; sha256="0gz9ngnjgys7hzijsma2iyywwiv7vjar5gls28ds11wq8pmsv96n"; depends=[dplyr forecast ggplot2 gridExtra imputeTS lubridate magrittr MASS pdp plyr purrr ranger rlang robustbase zoo]; }; hpoPlot = derive2 { name="hpoPlot"; version="2.4"; sha256="176bf93gjwbi2z7nz81w4aycwax6f7jxvs3236zrmf0f0f4m7bkc"; depends=[functional magrittr Rgraphviz]; }; hqmisc = derive2 { name="hqmisc"; version="0.1-1"; sha256="0jcy2hb3dmzf9j4n92aq7247mx9w7n30wpsx0dkchqnjwlqwwncw"; depends=[]; }; hqreg = derive2 { name="hqreg"; version="1.4"; sha256="1j6zp3rmpjx409vm7kq159mlawg87wsq0ypdkan34yxxv9py2jmi"; depends=[]; }; hrIPW = derive2 { name="hrIPW"; version="0.1.2"; sha256="0bgcz4v9cj3aajcp25bv4g7magj54n86qy5nmgr6kqm8sspy260x"; depends=[survival]; }; - hrbrthemes = derive2 { name="hrbrthemes"; version="0.6.0"; sha256="0k6agxva3zqq3z9j8g7ismabvyr7j96qqidck23dgbgwgivjfkkq"; depends=[extrafont gdtools ggplot2 htmltools knitr magrittr rmarkdown scales]; }; + hrbrthemes = derive2 { name="hrbrthemes"; version="0.8.0"; sha256="057h60b5p53dcyjyfwlgjc1ry968s9s64dw78p443w8717zk7zpc"; depends=[extrafont gdtools ggplot2 htmltools knitr magrittr rmarkdown scales]; }; hrcomprisk = derive2 { name="hrcomprisk"; version="0.1.1"; sha256="0w0ij2yqgg6gkn3pdaism1xqw3dfnm670j2pmsd85qk1ybxzq9l5"; depends=[survival]; }; - hsdar = derive2 { name="hsdar"; version="1.0.0"; sha256="0lm92bznyhyfzjfd2j6bfqh78pa8qbwf1q7hai9880ghf99fz81m"; depends=[caret raster rgdal signal]; }; + hscovar = derive2 { name="hscovar"; version="0.1.2"; sha256="1w6iz6z7zbk4wh5bjf6qhalngm30c7kdc1qkyjmnc1ajvzk1r992"; depends=[foreach Matrix rlist]; }; + hsdar = derive2 { name="hsdar"; version="1.0.1"; sha256="1apcch51hagrbm7x3s7wl78bm2mpyxg4py7syz37b58r9dph1905"; depends=[caret raster rgdal signal]; }; hsicCCA = derive2 { name="hsicCCA"; version="1.0"; sha256="1d4lkjrihwhl3jrsj7250ccd90nfwpllyavc3mp15fhcy2jnjci8"; depends=[]; }; hsm = derive2 { name="hsm"; version="0.2.0"; sha256="066shjikqrrkxpnra4zknax1a0sk5nx9ms1br58vwqqvqq479rym"; depends=[]; }; hsmm = derive2 { name="hsmm"; version="0.4"; sha256="1fh8c5kfv4brygdq6bfkrhrhkm99mxl4ljb1mhp9nf2bjlla11mc"; depends=[mvtnorm]; }; hsphase = derive2 { name="hsphase"; version="2.0.2"; sha256="1b62k9sc6604djy37anslvqjpbrj9wsc9mvnfbrnmhqf4g0nnpdq"; depends=[Rcpp RcppArmadillo snowfall]; }; + hsrecombi = derive2 { name="hsrecombi"; version="0.1.3"; sha256="1b74dq0hry1867zsv52fpxspq1hzzrdvplkfr6n4zg3p9wf2kkxd"; depends=[data_table dplyr hsphase Rcpp rlist]; }; hsstan = derive2 { name="hsstan"; version="0.6"; sha256="14k63agcq8m2lg5pw2309pi78950254v3z2m92pl4wjsikmsqrc1"; depends=[BH ggplot2 loo pROC Rcpp RcppEigen rstan rstantools StanHeaders]; }; htdp = derive2 { name="htdp"; version="0.1.4"; sha256="0w579qp0p544xryb5r08m1nhqf7rmgv9q0lyx6my4av62l70ka5w"; depends=[Rcpp]; }; htm2txt = derive2 { name="htm2txt"; version="2.1.1"; sha256="09q026yy8qm1fb3a4bf9vsp4j09kayl7xmk0p58ikar5l3bmfdjv"; depends=[]; }; htmlTable = derive2 { name="htmlTable"; version="1.13.3"; sha256="0g9r156k9yl1f092hfw3b9wjx11akf0shbi3x0d0mvpnflvc8nfl"; depends=[checkmate htmltools htmlwidgets knitr magrittr rstudioapi stringr]; }; - htmltab = derive2 { name="htmltab"; version="0.7.1"; sha256="0lymagm7z6zn0ddygqxi831ikk74112lkqkbvs5j1djhmr359ajc"; depends=[httr XML]; }; + htmltab = derive2 { name="htmltab"; version="0.7.1.1"; sha256="0nmb8zq6n13zj4rzgg74xpc6y8vkkwn8cqnyszq5h23gnn61inyl"; depends=[httr XML]; }; htmltidy = derive2 { name="htmltidy"; version="0.5.0"; sha256="1djkjff3750fm1sp54kf9cjvsqz2x7ia1ns12h5vqqcvwzfd0701"; depends=[htmltools htmlwidgets Rcpp XML xml2]; }; htmltools = derive2 { name="htmltools"; version="0.4.0"; sha256="06l17d8jkf438yk2mchpsp4j90bynnapz3nabh5vkcc324p5a62v"; depends=[digest Rcpp rlang]; }; htmlwidgets = derive2 { name="htmlwidgets"; version="1.5.1"; sha256="10fp306l1nybkah6jrlrqwwdb6zvklbddp8i3w9v9naj8la5jbnl"; depends=[htmltools jsonlite yaml]; }; htree = derive2 { name="htree"; version="2.0.0"; sha256="15bi5c2p4aghihp3k12s78447j2x9hbsaq56b5lc8jmd1vf0jdwb"; depends=[]; }; - hts = derive2 { name="hts"; version="5.1.5"; sha256="0mvsxrk7wkfn81hbk8a80fckiqiwdbvhq42k7c6lm69gamnbak2f"; depends=[forecast Matrix matrixcalc Rcpp RcppEigen SparseM]; }; - httk = derive2 { name="httk"; version="1.10.1"; sha256="05zbxyxlq94i6v4wwx7znr9p4k5gn9z7yi818v9f76bv8xi7mxv2"; depends=[data_table deSolve magrittr msm mvtnorm survey truncnorm]; }; + hts = derive2 { name="hts"; version="6.0.0"; sha256="17bqby360fnl7gzy6a8immpp711abdj5lf7kvjv13zypgrix3cn9"; depends=[forecast Matrix matrixcalc Rcpp RcppEigen SparseM]; }; + httk = derive2 { name="httk"; version="2.0.1"; sha256="02msk6nb3sscww7pa68finfvpmrf8z4jsw08672q4qz50sjccjlp"; depends=[data_table deSolve magrittr msm mvtnorm purrr survey truncnorm]; }; httpRequest = derive2 { name="httpRequest"; version="0.0.10"; sha256="0f6mksy38p9nklsr44ki7a79df1f28jwn2jfyb6f9kbjzh98746j"; depends=[]; }; httpcache = derive2 { name="httpcache"; version="1.1.0"; sha256="11hdc1jj2jbgvsps1h55azq0cr2fl556k631ns9k0747sjfmy2k9"; depends=[digest httr]; }; httpcode = derive2 { name="httpcode"; version="0.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]; }; + httptest = derive2 { name="httptest"; version="3.3.0"; sha256="1xcq0siyjb17yggaycxgp3byi276vwfa71450zbbzcb8617wsapd"; depends=[curl digest httr jsonlite testthat]; }; httpuv = derive2 { name="httpuv"; version="1.5.2"; sha256="13ax0hs2lc39ilznh1zarwqdzahcbhb8adilrfik3xg0fkljpcwk"; depends=[BH later promises R6 Rcpp]; }; httr = derive2 { name="httr"; version="1.4.1"; sha256="0mp1il13q6n49n2hv1p2p8x6avjan6dr5az19ql4hb78pc3pwp37"; depends=[curl jsonlite mime openssl R6]; }; hues = derive2 { name="hues"; version="0.2.0"; sha256="062i7yc16nmnp15c1jh4xffw2lpklp36wkn1yvagh186ahnlgffx"; depends=[colorspace]; }; - huge = derive2 { name="huge"; version="1.3.4"; sha256="07n3j1va2z4v30rj22cww72khgzbz2xsp0yc0qswlrwyxi4my5i3"; depends=[igraph MASS Matrix Rcpp RcppEigen]; }; + huge = derive2 { name="huge"; version="1.3.4.1"; sha256="11m80dnaxqw5v006q6kvhndl2y5ih5553fcqg4jcaljd8sp9xvvq"; 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]; }; - humanleague = derive2 { name="humanleague"; version="2.1.0"; sha256="1mp7lqwx97r60amllz9cjsixw21zspgs4zkp0nc63z315vgfzwrx"; depends=[Rcpp]; }; + humanleague = derive2 { name="humanleague"; version="2.1.2"; sha256="181gz1plz9g8bbjaf67ndhfd2qz5ksnd2l212wm1a383ddc58pmr"; depends=[Rcpp]; }; humidity = derive2 { name="humidity"; version="0.1.5"; sha256="143pn8jjinlda76b94qh5zw2sfajw0ifcx774x6adr2il5a5wm99"; depends=[]; }; hunspell = derive2 { name="hunspell"; version="3.0"; sha256="0mwqw5p0ph083plm2hr2hqr50bjg2dw862dpsfm4l2fgyy3rryq1"; depends=[digest Rcpp]; }; hurdlr = derive2 { name="hurdlr"; version="0.1"; sha256="1ryrqsxa07isxv2zx156bcn36d4yjvwpirb8jqcmqm97q7rmihmq"; depends=[]; }; - 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]; }; + hurricaneexposure = derive2 { name="hurricaneexposure"; version="0.1.1"; sha256="0a8xy71dkq2bzdnc90irxmbcxhi0anh87ic22x7b22c3m5605w6s"; depends=[data_table dplyr ggmap ggplot2 lazyeval lubridate mapproj maps purrr RColorBrewer rlang stringr tidyr]; }; hutils = derive2 { name="hutils"; version="1.5.1"; sha256="1x2x8gg2hdwxj1gz81pjls4y3yilssksirsbjnjd665rjs3jx7fj"; depends=[data_table fastmatch magrittr]; }; hutilscpp = derive2 { name="hutilscpp"; version="0.3.0"; sha256="1x7h1fq6qyylda8k3a1v6s0cx7pf169k86akb6ccwgiikqqsp51h"; depends=[data_table hutils Rcpp]; }; huxtable = derive2 { name="huxtable"; version="4.7.1"; sha256="0nkx6kpvh4z0fby7cv9bvripkqdha4f4c893h53a543q0ap06pjh"; depends=[assertthat generics glue memoise rlang stringr tibble tidyselect]; }; @@ -8863,67 +8960,67 @@ in with self; { 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]; }; - hydroTSM = derive2 { name="hydroTSM"; version="0.5-1"; sha256="053id9ldr10mafww3vas9fiy16lz0n1mqqfg6wjsbm5r15jkz3ha"; depends=[automap e1071 gstat lattice maptools sp xts zoo]; }; + hydroGOF = derive2 { name="hydroGOF"; version="0.4-0"; sha256="0fw8b66k7gdkdjxgmdpp3lk9d8p0wmlvhq2rkcvajjb5wd09f43a"; depends=[hydroTSM xts zoo]; }; + hydroPSO = derive2 { name="hydroPSO"; version="0.5-0"; sha256="1g7h4x9d0kadpvcpw6km8mp6d913ff0wjavxz1dcxrz3ix7z7bza"; depends=[data_table Hmisc hydroGOF hydroTSM lattice lhs scatterplot3d sp vioplot zoo]; }; + hydroTSM = derive2 { name="hydroTSM"; version="0.6-0"; sha256="1msavd2k05apsky88zkk1l3c6y3v95fwhmr6xmwsap70bj25krsv"; depends=[automap e1071 gstat lattice maptools sp xts zoo]; }; hydrogeo = derive2 { name="hydrogeo"; version="0.6-1"; sha256="16m6yvr9yhvb0vdh9pqd6gzf3h9km7gd89y6risjddv6g83469k8"; depends=[]; }; hydrolinks = derive2 { name="hydrolinks"; version="0.10.0"; sha256="0004a03bx9l9wq6zdz5az41rjxv1ka4qmnxk6ksy8i7365wsay88"; depends=[dbplyr dplyr httr rappdirs RSQLite sf units]; }; - hydroscoper = derive2 { name="hydroscoper"; version="1.2"; sha256="1aq35rz46ylkwlc6m55c73xyyrcx7p6mmvqj6sac9jdjwn74jvaj"; depends=[jsonlite pingr readr stringi stringr tibble]; }; + hydroscoper = derive2 { name="hydroscoper"; version="1.3"; sha256="03g841a1sbhp2kcdl39b9577lyd9i1241smn41578dcyrxshc2in"; depends=[jsonlite pingr readr stringi stringr tibble]; }; hydrostats = derive2 { name="hydrostats"; version="0.2.7"; sha256="16xrl94289kk1fb6pj0j8q8b40rmsm86fz2msmrmxh7mdp6hmxx9"; depends=[]; }; - hyfo = derive2 { name="hyfo"; version="1.4.0"; sha256="03xd4nm8zmc8gw8rml8svfim64xcslvpmdcldlri9cf89s8v35br"; depends=[data_table ggplot2 lmom maps maptools MASS moments ncdf4 plyr reshape2 rgdal rgeos zoo]; }; + hyfo = derive2 { name="hyfo"; version="1.4.2"; sha256="1wpncjrp6ks5s939csf2grcndgg8gkhh9513s1bsqkymf3nq57rk"; depends=[data_table ggplot2 lmom maps maptools MASS moments ncdf4 plyr reshape2 rgdal rgeos zoo]; }; hyper_fit = derive2 { name="hyper.fit"; version="1.1.1"; sha256="1xibiydfkhzsw0yqfc0xfzj4yz8xyxqlvnfpyxg33v5fwp9wap3v"; depends=[LaplacesDemon magicaxis MASS rgl]; }; hyper2 = derive2 { name="hyper2"; version="1.0-7"; sha256="155ycb26mgk0ic899ji1pv1k2mmwfzwaa0zj38a9v6fwdgw87rpl"; depends=[cubature magrittr partitions Rcpp]; }; hyperSMURF = derive2 { name="hyperSMURF"; version="2.0"; sha256="1aczsph6ax5xfd5rfvsd9bmgaq3j2f5f82fx8whrgbin0hxz19d8"; depends=[randomForest unbalanced]; }; - hyperSpec = derive2 { name="hyperSpec"; version="0.99-20200115"; sha256="19z65pc6fvgs7dl050fhvljs8ylwag2gdnsvdlniy7q3qr5mv16i"; depends=[dplyr ggplot2 lattice latticeExtra lazyeval testthat XML]; }; - hypercube = derive2 { name="hypercube"; version="0.2.0"; sha256="13b521vpxzk80ldr0v4bayxm4kwssqzpmzlykv5xhghvfdsqxqri"; depends=[dplyr plotly stringr]; }; - hypergate = derive2 { name="hypergate"; version="0.8.1"; sha256="17n8bs869c56jm76nq82alkajbyhbgn6nydzb1zh82i0ns269rlz"; depends=[]; }; + hyperSpec = derive2 { name="hyperSpec"; version="0.99-20200213.1"; sha256="1a1isalw10i7gqhxl0hi6qklv5x089bxhi2jg9fbbk0vw4axr2yx"; depends=[dplyr ggplot2 lattice latticeExtra lazyeval testthat xml2]; }; + hypercube = derive2 { name="hypercube"; version="0.2.1"; sha256="0m0n64rl5fnhvhfdknrza8a0h5lw8vbgakaqbyfx77ixhwqhjn1l"; depends=[dplyr plotly stringr]; }; + hypergate = derive2 { name="hypergate"; version="0.8.3"; sha256="0h36wi4bdxinv7p9alyb7jv1902vdanxx7yvyaw2dcqkdjlzzj49"; depends=[]; }; hypergea = derive2 { name="hypergea"; version="1.3.6"; sha256="1k1525bkkj83j2nn9ixidb8vjvdmc4l9jvfarzgg532gg7wn3841"; depends=[]; }; hypergeo = derive2 { name="hypergeo"; version="1.2-13"; sha256="13jdiy216znwhr91iqnh03mvkmyscw439syb3h4i67dd78sphnvd"; depends=[contfrac deSolve elliptic]; }; hypersampleplan = derive2 { name="hypersampleplan"; version="0.1.1"; sha256="1sk3s1jm46ac4i7p433s3kyngj86kq2821zzhp30a3y8vi1j2psq"; depends=[]; }; hypervolume = derive2 { name="hypervolume"; version="2.0.12"; sha256="0jd49jncmg23vm9rkcy6sd4zjwlw75hwps7wahpb36zs9kb63ssq"; depends=[data_table e1071 fastcluster geometry hitandrun ks maps MASS mvtnorm pdist progress raster Rcpp RcppArmadillo rgeos rgl sp]; }; hypothesestest = derive2 { name="hypothesestest"; version="1.0"; sha256="0g8sm386m1zm9i3900r62x83wb600cy8hqk7dlvbx6wcgrxg82sm"; depends=[]; }; hypothesisr = derive2 { name="hypothesisr"; version="0.1.1"; sha256="0z06risagphhvqiw4lrxy52q6q2yr10w2yxsm8iz1wh9ik097pcv"; depends=[dplyr httr jsonlite]; }; - hypr = derive2 { name="hypr"; version="0.1.5"; sha256="0xd4vy4zl0anxgisldxag5qciawcii4v41ix846gn16vd46npfrk"; depends=[MASS pracma]; }; + hypr = derive2 { name="hypr"; version="0.1.6"; sha256="01zn533q43221542m24ybnyx5lhb6sz76qqzfglsaq794l8sr0my"; depends=[MASS pracma]; }; + hystReet = derive2 { name="hystReet"; version="0.0.1"; sha256="08zdsyh82xvnbybwnz5015ds0pcqqid339pvmm3044filk46vyki"; depends=[httr jsonlite lubridate]; }; hysteresis = derive2 { name="hysteresis"; version="2.6"; sha256="00v19m52bg2i3zg8p7yj56axzj9sm64qr61226p5h7sn0zrpws3b"; depends=[car MASS msm]; }; hzar = derive2 { name="hzar"; version="0.2-5"; sha256="000l4ki3hvznnhkxc5j422h5ifnsfqalv666j48yby1hsf1lc3kg"; depends=[coda foreach MCMCpack]; }; iAdapt = derive2 { name="iAdapt"; version="0.1.0"; sha256="0ykcvqm1aswc4iypapml22194nxi6mxvxipy6wj7l9g4cazfa8j8"; depends=[shiny shinydashboard]; }; iBATCGH = derive2 { name="iBATCGH"; version="1.3"; sha256="0pnkkabzi57czcwd9i15nwv8ggwvyxmvn1wam7yrrrbvmi17lmrm"; depends=[msm Rcpp RcppArmadillo]; }; iBST = derive2 { name="iBST"; version="1.0"; sha256="02p7lcr1wrf21v4568jc8hmjcijy3fnbv77s8nlhv2s4p0pgzh5x"; depends=[Rcpp rpart survival]; }; - iBreakDown = derive2 { name="iBreakDown"; version="0.9.9"; sha256="1sxd2x837qmi47p0c9bmy1lqldv2l214qw5n28w3bkwalbdaizyk"; depends=[DALEX ggplot2]; }; + iBreakDown = derive2 { name="iBreakDown"; version="1.0"; sha256="1pqw2hgxg96x3v9y7wf8m8n1czhlhyxcwpavj4vl0s95d1dzzpcj"; 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=[]; }; iCARH = derive2 { name="iCARH"; version="2.0.1.1"; sha256="0722dfydq16vhdk7hrdwngkppq0g20ghak614jfnrfr6rnrn630s"; depends=[abind ggplot2 igraph KEGGgraph MASS Matrix mc2d RCurl reshape2 rstan]; }; - iCellR = derive2 { name="iCellR"; version="1.3.0"; sha256="060kyq67aql7ykhr888qd3w8qm65sgix5nhiaxvwsz6jgq7lrrl2"; depends=[ape ggdendro ggplot2 ggpubr ggrepel gridExtra hdf5r Hmisc htmlwidgets knitr Matrix NbClust pheatmap plotly plyr RColorBrewer reshape Rtsne scatterplot3d shiny uwot]; }; + iCellR = derive2 { name="iCellR"; version="1.4.0"; sha256="1hrn6afhl4ggpz145l0wxnjy6jpfqjc09w0g0lws31l1hpzakrhs"; depends=[ape ggdendro ggplot2 ggpubr ggrepel gridExtra hdf5r Hmisc htmlwidgets knitr Matrix NbClust pheatmap plotly plyr progress RColorBrewer reshape Rtsne scatterplot3d shiny uwot]; }; iCiteR = derive2 { name="iCiteR"; version="0.2.1"; sha256="0hbps2q5i7yj6zvqawlayhqqr5iv39yqc0xnk7fvra7rimzc1qid"; depends=[httr]; }; iClick = derive2 { name="iClick"; version="1.5"; sha256="0yq0r9nz1mf9ci6l30ylqxbgl8mf1ahyqzr7m6nks0ygxabipdnd"; depends=[boot car coefplot fBasics forecast lattice lmtest lubridate openair papeR rugarch sandwich timeDate timeSeries xts zoo]; }; iCluster = derive2 { name="iCluster"; version="2.1.0"; sha256="09j36xv87d382m5ijkhmp2mxaajc4k97cf9k1hb11ksk7fxdqz6r"; depends=[caTools gdata gplots gtools lattice]; }; iDINGO = derive2 { name="iDINGO"; version="1.0.3"; sha256="0aa7g7shcbjzjwhnrh6hd4idjdka9rd7jawkvqvyjnwcql2qlapv"; depends=[GGMridge glasso igraph mvtnorm scales visNetwork]; }; iDOS = derive2 { name="iDOS"; version="1.0.0"; sha256="1jj98ikzvfp6qbnh2j6msi0m89sbmjjafgry43rq7qmczzs81hl8"; depends=[VennDiagram]; }; iDynoR = derive2 { name="iDynoR"; version="1.0"; sha256="01702vl10191mbq2wby1m0y6h8i6y6ic4pa83d27cg3yccsrhziz"; depends=[vegan XML]; }; - iECAT = derive2 { name="iECAT"; version="0.8"; sha256="0kv8db7ss3vk21ccl8qfj4x69npfzwmm3piddj9l0vwrwd3ccl32"; depends=[MetaSKAT SKAT]; }; iFad = derive2 { name="iFad"; version="3.0"; sha256="0jrl9bayihp3wb4k5w9kc71qlsdxk7vl83ydfibx2bg79c4hf3cs"; depends=[coda MASS Rlab ROCR]; }; 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.2.1"; sha256="0n0i37cqj82cv5ksyva5pkwm5lasgpwljsqm692n4dkmkimc1wv9"; depends=[]; }; + iIneq = derive2 { name="iIneq"; version="1.0.1"; sha256="1mcr084ik1dc5fndj6ci7px4l1y8jz9kr59riqkf0bm6hras5rfg"; depends=[doParallel foreach]; }; + iMRMC = derive2 { name="iMRMC"; version="1.2.2"; sha256="12ljry3gqzqjk72ndc557pn6jz3c23y5hcjlphw4kggrz7wb7b91"; depends=[]; }; iMediate = derive2 { name="iMediate"; version="0.5.5"; sha256="1lwhrzm4g2fcazh782g7p11v5pyx165ig1dzgkmdmjffpwk0w8b4"; depends=[MBESS mvtnorm plotly]; }; - iNOTE = derive2 { name="iNOTE"; version="1.0"; sha256="1969xmgfv9405r09zpd2icvjd9vvzw4dx5qaqxk1a0jvbvhp3h88"; depends=[CompQuadForm mixtools plyr]; }; + iNEXT = derive2 { name="iNEXT"; version="2.0.20"; sha256="14bagsb0ja3j53i0g4a2ax2gj7lyc6sjcc7isdjx94clbnc2zcsg"; depends=[ggplot2 reshape2]; }; + iNZightTools = derive2 { name="iNZightTools"; version="1.8.3"; sha256="1sf3gsxss4xnncjrlw49ljvlzz70zckq14mm5n6kmsz9nwaay2jk"; depends=[chron dplyr forcats haven lubridate magrittr readr readxl stringr survey tibble tidyr validate zoo]; }; iRF = derive2 { name="iRF"; version="2.0.0"; sha256="1ll4lxg743p2zipxcq13yjsc7j7dk766dcyixwxilllbisg0dh8y"; depends=[AUC data_table doParallel dplyr foreach Matrix RColorBrewer Rcpp]; }; iRafNet = derive2 { name="iRafNet"; version="1.1-1"; sha256="0w9bry49apkrrrabglnv5w9l47jakmc30jh8q22a8gazwss293fb"; depends=[ROCR]; }; - iRefR = derive2 { name="iRefR"; version="1.13"; sha256="17kjfga62xc4s1kii5clxszbag2dr1dyxfm7jasr20prx28ya6pp"; depends=[graph igraph RBGL]; }; iRegression = derive2 { name="iRegression"; version="1.2.1"; sha256="1kwsrmsflmqan96aj0dczlszfww1dlg6rwycyid52f7ghg9810rn"; depends=[mgcv]; }; iRepro = derive2 { name="iRepro"; version="1.1"; sha256="1sqg1n83m1308v6bk8ilra8w01frqyd8vpvmv63rllxz38r3vyhz"; depends=[]; }; iSDM = derive2 { name="iSDM"; version="1.0"; sha256="1hzs187mwv3k2wx6dpvkizjhkcx63mznd06wiw6047lf5jrlif0a"; depends=[ade4 colorRamps geometry geosphere maptools MASS pdist raster rgdal rgl sp virtualspecies]; }; - iSTATS = derive2 { name="iSTATS"; version="1.1.0"; sha256="0hkyf3qa35hk8hs4qraz2y433ad93bjmi1mlmzfaw132x96f8zvf"; depends=[Cairo data_table ggplot2 gtools plotly rstudioapi shiny shinyBS shinyWidgets]; }; + iSTATS = derive2 { name="iSTATS"; version="1.2"; sha256="0ddkgszkihlpfi3vq3m3jyr293471vgj27c5frpap0bs404lhqh8"; depends=[Cairo data_table ggplot2 gtools plotly rstudioapi shiny shinyBS shinyWidgets]; }; iTOP = derive2 { name="iTOP"; version="1.0.2"; sha256="1n6nlmmx2h63nksycgzr7qsnd1j6bxa629av7cfd3ihriim7dj47"; depends=[corpcor Matrix]; }; iWISA = derive2 { name="iWISA"; version="1.0-2"; sha256="0jqi1kh7jlc04nb9d1w711q4i8j1vgwbxjls09z7853kv22wxfyz"; depends=[fda ggplot2 waveslim]; }; iWeigReg = derive2 { name="iWeigReg"; version="1.0"; sha256="09ajbqllr4ajmpk8qs6qw019fx8a7vsabm37867zycssn77z9nc8"; depends=[MASS trust]; }; iZID = derive2 { name="iZID"; version="0.0.1"; sha256="1jaqdh6i5xyfw4y2wd9qivzjklf4j2xxnya8ssn7rv5bz6misgcz"; depends=[doParallel extraDistr foreach rootSolve]; }; - iadf = derive2 { name="iadf"; version="0.1.0"; sha256="02zx9n4ncg10bbydrr05631vzc4w2b1jg3x6xiaffg7x5rh4mnyf"; depends=[dplR dplyr manipulate rlang tibble tidyr]; }; - iai = derive2 { name="iai"; version="1.1.0"; sha256="1ck5znn3l80ahh6n6qvp8rw4307blkqyr1jmq9ksifb5hkqpxyfw"; depends=[JuliaCall rlang stringr]; }; + iadf = derive2 { name="iadf"; version="0.1.1"; sha256="0ys8rd05s0j6cs7snmp1car7lp7k4awvs8gnlqaw9zcd7w7k9r06"; depends=[dplR dplyr manipulate rlang tibble tidyr tidyselect]; }; + iai = derive2 { name="iai"; version="1.2.0"; sha256="0v1xsnhx73ldpsbnki5g0q86dih1pcgb1f10mmq7dn47s2mm6zxg"; depends=[JuliaCall rlang stringr]; }; iarm = derive2 { name="iarm"; version="0.3.0"; sha256="0v5zb2pgzqb9brmq0calmghq20i8w3wx147781v4f6ll0abkhvxx"; depends=[eRm PP psychotools vcdExtra]; }; ibd = derive2 { name="ibd"; version="1.5"; sha256="0rxvy4hn4fpbv6y214ggkmgfvzwns5mkanp4h8201rjk3v84mk2r"; depends=[car emmeans lpSolve multcomp]; }; ibdreg = derive2 { name="ibdreg"; version="0.2.5"; sha256="1kaa5q1byi30wzr0mw4w2cv1ssxprzcwf91wrpqwkgcsdy7dkh2g"; depends=[]; }; @@ -8949,31 +9046,29 @@ in with self; { icdGLM = derive2 { name="icdGLM"; version="1.0.0"; sha256="1mh9kwn21n19v4lrmj33ghpna7dl66fx19gi6lcjanmrpzrkwdnz"; depends=[Matrix]; }; icemelt = derive2 { name="icemelt"; version="1.0"; sha256="13pjbyh2ggns36m8s43m2cb0kvisjlfxq75gqscldp75zjli2wi8"; depends=[survival]; }; icenReg = derive2 { name="icenReg"; version="2.0.13"; sha256="1kyzvhcrmafprwdpc4dhjdg8dxf0zic4r22hzdnah9rfihds086l"; depends=[coda foreach MLEcens Rcpp RcppEigen survival]; }; - icensBKL = derive2 { name="icensBKL"; version="1.1"; sha256="12zx5x81jy48mp0l6a5ga0ikkjxvndv5cv2xf6d2lczfk7fz9lbp"; depends=[gtools Icens MASS mvtnorm smoothSurv survival TeachingDemos]; }; + icensBKL = derive2 { name="icensBKL"; version="1.2"; sha256="1zzv80jnn8ilnc1gv4nj24l2fl8805rjhqjgkb0xx4y9zhpg1jkp"; depends=[gtools Icens MASS mvtnorm smoothSurv survival TeachingDemos]; }; icensmis = derive2 { name="icensmis"; version="1.3.1"; sha256="1c0j43wffb5h99chlj8j45lpan7dpn2i0r4rr6b2kq16p1zabfjw"; depends=[Rcpp]; }; 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="3.3-2"; sha256="113qbqpna6dvf9vrrnlapm0rix1fc1hawaa7jsa2rj7q4pbyijc7"; depends=[bibtex lattice]; }; + icesTAF = derive2 { name="icesTAF"; version="3.3-3"; sha256="1jah3f7hicw66rwa0jfpr489c81im3h4cjihmdmk4fgq2kjnrdyb"; depends=[bibtex lattice]; }; 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]; }; + icosa = derive2 { name="icosa"; version="0.10.0"; sha256="1vd1qn1070rml7mygj9k13b96zrc77bw90g8f44s7wmhabn6214q"; depends=[igraph Rcpp sp]; }; icpsrdata = derive2 { name="icpsrdata"; version="0.4.0"; sha256="01whs8wssjx3qgdnc1ixh59gvn1bajqm5q3zj1jpw1dqjh71qzf0"; depends=[httr purrr rvest]; }; - icr = derive2 { name="icr"; version="0.6.1"; sha256="1hmlh01p286zq26ya2x7hn4xba2g0q988pmvmxy6lfv0nigys0gs"; depends=[Rcpp]; }; + icr = derive2 { name="icr"; version="0.6.2"; sha256="1xqvzn02x13d706irv83zycpxhm8yq1c34rh1nphddy5gri7gwjb"; depends=[Rcpp]; }; icrf = derive2 { name="icrf"; version="1.0.0"; sha256="1qz4wv23hspbrfzrj80qmhi0759zh3gn23rnns18j3020f506jdd"; depends=[Icens]; }; icsw = derive2 { name="icsw"; version="1.0.0"; sha256="0g7bcqs0rpbs1p202i9wjbl8hhy3r196zambm044xyf7kvsbzzf6"; depends=[]; }; idar = derive2 { name="idar"; version="1.1"; sha256="0nac7sav4rrp6a94aqgp8qyb22wg7y7gc5n1dhid894yc9z47a5f"; 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.2"; sha256="0nn7i6gr1ggk43xn9a454jbrxhqxw37srjvz4va0kcc02wy5pxq9"; depends=[bayesplot BH dplyr forcats gghighlight ggplot2 ggrepel lazyeval Rcpp RcppEigen rlang rstan rstantools scales shinystan StanHeaders stringr svDialogs tidyr]; }; ideamdb = derive2 { name="ideamdb"; version="0.0.9"; sha256="1f4dcv6c8ny7pik547f4840vhll26mzfcijnfsiqx31xhn0gsizd"; depends=[dplyr ggplot2 stringr tidyr]; }; - idefix = derive2 { name="idefix"; version="0.4.0"; sha256="03gmhmpdkiy0721k14ig6aaqj304kjgi3g9l9v5s59h716r1cfyv"; depends=[dplyr MASS 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.4"; sha256="06xk9ghvh3fb79lbkmbqsk07xj06qaigiw41rzbi3bji3fjq1prw"; depends=[matrixcalc mvtnorm pdist Rcpp RcppArmadillo rgen]; }; ider = derive2 { name="ider"; version="0.1.0"; sha256="021s4fybki7a6mdsr6gkjrzfhaqdcg0m2a6r24y91jklxlxqxmws"; depends=[FNN]; }; - idiogramFISH = derive2 { name="idiogramFISH"; version="1.12.1"; sha256="0apmq28pb7wj4pyd3iv9872mq7bp5qrx5kiz9f6swlvr7mc0js1m"; depends=[crayon dplyr plyr]; }; + idiogramFISH = derive2 { name="idiogramFISH"; version="1.14.7"; sha256="1cr7s2cw3dq0rh3k6hdgxhdmgpp3ynhjiikkn9f63lgrrgyzizgq"; depends=[crayon dplyr tidyr]; }; idm = derive2 { name="idm"; version="1.8.2"; sha256="04f0i0kwdxywmj2i184knx5a5v9svx0lbam6wpz49hghg7qpy0w5"; depends=[animation ca corpcor dummies ggplot2 ggrepel]; }; idmTPreg = derive2 { name="idmTPreg"; version="1.1"; sha256="1329sjb4dnw3yiyg16whbj4l2v0kg8phg1x4ysvyp2kqkmw14yq6"; depends=[doParallel foreach survival]; }; idmodelr = derive2 { name="idmodelr"; version="0.3.1"; sha256="147rlcm7dj20xbwi392w82m1mnw90mvcp4yjgfplm34z6y90ljir"; depends=[deSolve dplyr furrr future ggplot2 magrittr purrr rlang stringr tibble tidyr viridis]; }; @@ -8982,17 +9077,17 @@ in with self; { idx2r = derive2 { name="idx2r"; version="1.0.0"; sha256="14d3rasnf8mghwzpg6h4larybgy7drrv0jh71x28qwry49acsqyh"; depends=[]; }; ie2misc = derive2 { name="ie2misc"; version="0.8.5"; sha256="1i59836a3kjsra5ibk66ic35yqk28p3biylall8gngjssiig92c1"; depends=[data_table gWidgets2 gWidgets2tcltk lubridate openxlsx qdap reader readxl stringi]; }; ieeeround = derive2 { name="ieeeround"; version="0.2-0"; sha256="0xaxrlalyn8w0w4fva8fd86306nvw3iyz44r0hvay3gsrmgn3fjh"; depends=[]; }; - iemisc = derive2 { name="iemisc"; version="0.9.7"; sha256="152qmwyfpdzif9wbjk6j60sfamy8l2fhrr3vjw5m3c05grczyn7m"; depends=[CHNOSZ data_table fpCompare gsubfn IAPWS95 iemiscdata listless pracma r_import rgdal sp stringi testit units zoo]; }; + iemisc = derive2 { name="iemisc"; version="0.9.8"; sha256="0xpgafv1zl3gxs3jydqni5icdz74n7f0bgbdvw8gykrr1a6rarln"; depends=[CHNOSZ data_table fpCompare gsubfn IAPWS95 iemiscdata pracma r_import rgdal sp stringi testit units zoo]; }; iemiscdata = derive2 { name="iemiscdata"; version="0.6.1"; sha256="0a9x90kisgmrka0frk9myb1qdq3nl092n78wrif31b42arifa8h9"; depends=[]; }; iemisctext = derive2 { name="iemisctext"; version="0.9.99"; sha256="02rr7sjjbrvfxwjl87f2ki245a8cw5fvx7z2z4rl8ixxlyxj9p5v"; depends=[]; }; ifa = derive2 { name="ifa"; version="7.0"; sha256="1cxafd7iwvyidzy27lyk1b9m27vk785ipj9ydkyx9z1v0zna2wnl"; depends=[mvtnorm]; }; - ifaTools = derive2 { name="ifaTools"; version="0.20"; sha256="0fkhnfnpa41z8hw72jgfqwgbfgzfqqnl8j2xwnqng1jymrwx97jv"; depends=[ggplot2 OpenMx reshape2 rpf shiny]; }; + ifaTools = derive2 { name="ifaTools"; version="0.21"; sha256="1vnrf67d0b83nmvk91sw1w2lgjlldp7dslxnrxh7lb94h3z6jigd"; depends=[ggplot2 OpenMx reshape2 rpf shiny]; }; ifctools = derive2 { name="ifctools"; version="0.3.2"; sha256="18g0l0vh9z4nvl6jil32983c4z1dvawrivi4kz4g562q3habm279"; depends=[]; }; ifs = derive2 { name="ifs"; version="0.1.5"; sha256="03g9cgs0zp89b1d7rpcn5clkvmg0spnariwrifd8hha476ldvfcy"; depends=[]; }; ifultools = derive2 { name="ifultools"; version="2.0-5"; sha256="040kvbczcmmbaiaz0k0pdq9af541pjj6iwzh1a3w4szh9w6b5a3j"; depends=[MASS splus2R]; }; ig_vancouver_2014_topcolour = derive2 { name="ig.vancouver.2014.topcolour"; version="0.1.2.0"; sha256="0yclvm6xppf4w1qf25nf82hg1pliah68z7h3f683svv0j62q748h"; depends=[]; }; igate = derive2 { name="igate"; version="0.3.3"; sha256="0b8dk976z0764cmxwcq6w2f3akv7iivivharinq029p90b600qza"; depends=[dplyr ggplot2 kableExtra knitr rmarkdown stringr xtable]; }; - igraph = derive2 { name="igraph"; version="1.2.4.2"; sha256="0scrbqb26pam8akblb4g9rkz888s0xffw3gcly78s4ijj67barxd"; depends=[magrittr Matrix pkgconfig]; }; + igraph = derive2 { name="igraph"; version="1.2.5"; sha256="126z1ygbmi3g7hk97snf22rnx680dyi30idssm5zacba5rdngp8c"; depends=[magrittr Matrix pkgconfig]; }; igraphdata = derive2 { name="igraphdata"; version="1.0.1"; sha256="19w5npa4b8c054v94xlr7nmhhg2fhq4m8jbds86skp8zvipl4rkl"; depends=[]; }; igraphinshiny = derive2 { name="igraphinshiny"; version="0.1"; sha256="1ww5s4jfihzcx4k35lbhzsf54z720xh7b2p5alzk843m6rx77986"; depends=[igraph shiny]; }; igraphtosonia = derive2 { name="igraphtosonia"; version="1.0"; sha256="0vy9jnpjp68l8s0hi1l57j9p41c543h3iqv16pwl550f38zqp8j6"; depends=[igraph]; }; @@ -9000,33 +9095,33 @@ in with self; { ihpdr = derive2 { name="ihpdr"; version="1.1.0"; sha256="0ga90dwnxygz63m894h4aj2lkjqi99qalkgw9ncfqggq5255h6l3"; depends=[dplyr httr lubridate magrittr purrr readxl rlang rvest tidyr xml2]; }; ihs = derive2 { name="ihs"; version="1.0"; sha256="1c5c9l6kdalympb19nlgz1r9zq17575ivp3zrayb9p6w3fn2i06h"; depends=[maxLik]; }; iilasso = derive2 { name="iilasso"; version="0.0.2"; sha256="043m1n5840459zsknkb54801apb0a2cqfprncmj2wp235rbqj832"; depends=[BH Matrix Rcpp]; }; - ijtiff = derive2 { name="ijtiff"; version="2.0.4"; sha256="1jfvqn22v2rji8rnyjmpa2y3q14r514q2wdmh7ykiplvhlm9kyga"; depends=[checkmate dplyr filesstrings fs glue magrittr purrr Rcpp readr rlang stringr withr]; }; + ijtiff = derive2 { name="ijtiff"; version="2.0.5"; sha256="1qrp82vvd6gz6a0jjnbhwzfs5qcxv6f97cpl4hpqdq5gmlsahjjv"; depends=[checkmate dplyr filesstrings fs magrittr purrr Rcpp readr rlang stringr withr]; }; ilc = derive2 { name="ilc"; version="1.0"; sha256="0hs0nxv7cd300mfxscgvcjag9f2igispcskfknb7sn7p8qvwr5ki"; depends=[date demography forecast rainbow survival]; }; - imageData = derive2 { name="imageData"; version="0.1-59"; sha256="096y589r1mrbvzax5i7sdczkl613kyn8g93qcddqb6jjljw03qmi"; depends=[dae GGally ggplot2 Hmisc RColorBrewer reshape XLConnect]; }; + imageData = derive2 { name="imageData"; version="0.1-60"; sha256="1ry4l45az9az8wk1k16jxbszxwh0m9s3g838w7dad0midr2hs8qr"; depends=[dae GGally ggplot2 Hmisc RColorBrewer readxl reshape]; }; imagefluency = derive2 { name="imagefluency"; version="0.2.3"; sha256="0f4kizxc86q6pgx5dbp14y6866b1ldyf7zgpfikd2iqhvxbs7qwa"; depends=[magick OpenImageR pracma R_utils readbitmap]; }; - imagefx = derive2 { name="imagefx"; version="0.3.0"; sha256="1jw85kb2xxq1yzjnvpd8l5avvamyh12kimss7w31ry2wgsad2mdz"; depends=[moments signal]; }; - imager = derive2 { name="imager"; version="0.41.2"; sha256="19fqgjhg04garbipx20g72h9dd6k0jj4ac48nby6km4h665vrs4v"; depends=[Cairo downloader igraph jpeg magrittr plyr png purrr Rcpp readbitmap stringr]; }; + imagefx = derive2 { name="imagefx"; version="0.4.1"; sha256="1mxd33y8zbq8kig6m6xihb5w8wrjppgmpyjspvaxjwk7si9a09k1"; depends=[moments signal]; }; + imager = derive2 { name="imager"; version="0.42.1"; sha256="1d7a49lcna77wyfjf5q1b89jck3p3vnysnkgz4drb0qkpy6hz76b"; depends=[downloader igraph jpeg magrittr png purrr Rcpp readbitmap stringr]; }; imagerExtra = derive2 { name="imagerExtra"; version="1.3.2"; sha256="1f6mxfn7am4ph9acbbx53r4bk4vsm73p7arh8rvrsic9pgma3gqf"; depends=[fftwtools imager magrittr Rcpp]; }; imageviewer = derive2 { name="imageviewer"; version="0.1.0"; sha256="1rsrwy5v0gnsmbay1zqijhvll2l1bs844m52w65588j9nlx4fci9"; depends=[htmlwidgets]; }; - imagine = derive2 { name="imagine"; version="1.5.2"; sha256="1k017a1qw7bahk1aif3ky7f1aynvrppmhvxbcmai646pmx99kbxn"; depends=[Rcpp]; }; + imagine = derive2 { name="imagine"; version="1.5.3"; sha256="1ss0gm769s8cmma3hnah15vmc2c5wxn0l3s4vas7jbvkwi62am6h"; depends=[Rcpp]; }; imbalance = derive2 { name="imbalance"; version="1.0.2"; sha256="1vkzxm8wb9g1mibnlp63gnky2gcgai5j09v63zki3jpxwxwli4nx"; 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.7"; sha256="1ch05d37gp0niml80k2apab1942aa05r77s52vgh2pfcx9kklv20"; depends=[dplyr httr jsonlite]; }; imgpalr = derive2 { name="imgpalr"; version="0.3.0"; sha256="1kb1ggrlkrh086nwq47sf2y20r7ydk4ww2j3gq0s4iz00aa34pxg"; depends=[downloader dplyr farver jpeg magrittr tibble]; }; imgrec = derive2 { name="imgrec"; version="0.1.0"; sha256="1v4q2hxil7f0jnj4nql44d9dssh8kz1mnj8ah5slndnn1fbymy8f"; depends=[base64enc dplyr httr jsonlite knitr rlang]; }; imguR = derive2 { name="imguR"; version="1.0.3"; sha256="14f7ghgc8rbrpqb21rinfbrj1wh80i6ii0awwi814152v5qzj4b3"; depends=[httr jpeg png]; }; - imgw = derive2 { name="imgw"; version="0.2.0"; sha256="00zkjxqnw1zwcpj8mmdw1ydpcq0sbhs54ismm1i8r6ymb13j5fgj"; depends=[RCurl XML]; }; - iml = derive2 { name="iml"; version="0.9.0"; sha256="15rv943q1kqilsr1h0pkm2gci1cl7775xma4swjfmbqmdc6acjq0"; depends=[checkmate data_table foreach Formula ggplot2 glmnet gridExtra Metrics partykit prediction R6 yaImpute]; }; + iml = derive2 { name="iml"; version="0.10.0"; sha256="0xm3q42qahq798ilgg050df0mahhbdfd3fx3i7cpx606h38si0x7"; depends=[checkmate data_table Formula future future_apply ggplot2 gridExtra Metrics prediction R6]; }; immer = derive2 { name="immer"; version="1.1-35"; sha256="1nmf9wxxyq3p8b5kikpsr8b0v4s84zjpahg1rxvcrhc8blg26hjq"; depends=[CDM coda MASS psychotools Rcpp RcppArmadillo sirt TAM]; }; immuneSIM = derive2 { name="immuneSIM"; version="0.8.7"; sha256="0brj12xnkzmn3n91vb39fq3q68wmzmwx9l38dl38yypp0l8pknjl"; depends=[Biostrings data_table ggplot2 ggthemes igraph Metrics plyr poweRlaw RColorBrewer repmis reshape2 stringdist stringr]; }; - imp4p = derive2 { name="imp4p"; version="0.8"; sha256="0k126zp38n1bw3q0b77smr6plpcim87i66amvwbv61w84ansgbv6"; depends=[Iso norm Rcpp truncnorm]; }; impactflu = derive2 { name="impactflu"; version="0.1.0"; sha256="0wpaq2q61g6hl9fffs5cjbzdz1qc8dxsbknfs0iarwkn08460bn5"; depends=[dplyr glue lubridate magrittr Rcpp rlang tibble]; }; impimp = derive2 { name="impimp"; version="0.3.1"; sha256="0xkxph4f1rcpkryx9v339bfbsnq3xwdj1flb4j2dgh99apj126sq"; depends=[]; }; - implicitMeasures = derive2 { name="implicitMeasures"; version="0.1.0"; sha256="0j0mzsfli9m063nmy547jcwrzbdqs3m06k9jj4bjn8fdv45pabzk"; depends=[dplyr ggplot2 plyr qpdf tidyr xtable]; }; + implicitMeasures = derive2 { name="implicitMeasures"; version="0.1.2"; sha256="0fss5rws8m53p3a26s2gb8bvg3ddiddnp25qj8jspa8f0iyzj48i"; depends=[ggplot2 stringr tidyr xtable]; }; + implied = derive2 { name="implied"; version="0.2.5"; sha256="0bw45vl19xvprh37rikmhh1dhykpgqy4pbq6l8pgdf7h118mvy2g"; depends=[]; }; implyr = derive2 { name="implyr"; version="0.3.0"; sha256="1i0m95azyi46wnh59dcs52l78i1yqy677rlr4b6c0r945m67advn"; depends=[assertthat DBI dbplyr dplyr rlang tidyselect]; }; r_import = derive2 { name="r_import"; version="1.1.0"; sha256="0blf9539rbfwcmw8zsb4k58slb4pdnc075v34vmyjw752fznhcji"; depends=[]; }; importar = derive2 { name="importar"; version="0.1.1"; sha256="0xv445fmjhsbdlsq03k2rlycnggn3rcyq5a49zrg4jvjamzr0rgr"; depends=[]; }; - importinegi = derive2 { name="importinegi"; version="1.0.0"; sha256="0rlnvc2m0cy5jqvylfbgg31dxpdsd37ca1bcpwcpgwcx3d3l373j"; depends=[data_table dplyr foreign haven rgdal]; }; + importinegi = derive2 { name="importinegi"; version="1.1.1"; sha256="0lhlrmij4ggwpjcyimyhjywp18i0rr2f9fkvs4nf9pj1xb87rd3l"; depends=[data_table dplyr foreign haven rgdal]; }; + impressionist_colors = derive2 { name="impressionist.colors"; version="1.0"; sha256="03z5w7y7vbvlnn30r9y3ip93h364f87nhwdb9hcki26csiq2bnlv"; depends=[]; }; imptree = derive2 { name="imptree"; version="0.5.1"; sha256="0f087000092ydnpj3ch4mbip8wp32scn8xw4vlkq5lf6130gfs1b"; depends=[Rcpp]; }; imputeFin = derive2 { name="imputeFin"; version="0.1.0"; sha256="1k61q4cd3j7rj0d35y3gyahjz4ac970m6mifc9pzxryi3w5373c4"; depends=[MASS zoo]; }; imputeLCMD = derive2 { name="imputeLCMD"; version="2.0"; sha256="10v3iv1iw6mnss6ry836crq9zdgid2y1h3pvigzjsrmnp5n89mfz"; depends=[impute norm pcaMethods tmvtnorm]; }; @@ -9041,17 +9136,16 @@ in with self; { 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]; }; inTrees = derive2 { name="inTrees"; version="1.2"; sha256="1mwn2ijkyw0y9xcgrr56wxd2326ikarlsi79l59dplvlx2iwbi6c"; depends=[arules data_table gbm RRF xgboost xtable]; }; - inaparc = derive2 { name="inaparc"; version="0.2.0"; sha256="0rgbnvvqzbx4j40qz32l1bxmg3wwzbl6719wb9m3xpakblvhhxs2"; depends=[kpeaks lhs]; }; - inarmix = derive2 { name="inarmix"; version="0.4"; sha256="11a1vaxq22d5lab07jp5pw0znkaqj6bmkn6vsx62y6m4mmqk04yr"; depends=[Matrix Rcpp]; }; + inaparc = derive2 { name="inaparc"; version="1.1.0"; sha256="0ni34bkl7v1ypci8j8qhkfbf7gnx77wi4v9w1ww18z2jizsrk5h3"; depends=[kpeaks lhs]; }; inbreedR = derive2 { name="inbreedR"; version="0.3.2"; sha256="09fr13ckyn2skiigkn4qdx5g080gcmyyrvzhcp0wrml9wpmy0h4z"; depends=[data_table]; }; incR = derive2 { name="incR"; version="1.1.0"; sha256="0q41bs7pf6hqyfwvcwc2sxq44jq95qq3qsddz53f8gphwjsyf1v7"; depends=[dplyr ggplot2 lubridate maptools rgeos]; }; inca = derive2 { name="inca"; version="0.0.4"; sha256="1r3niibd6pja59am8in9gpyvxi2g5bh8bqqhdixzwaj3xzyyipii"; depends=[Matrix Rcpp RcppArmadillo]; }; incadata = derive2 { name="incadata"; version="0.8.2"; sha256="1ayr7krqcs25b5zg80m2s4g3pdasfaj2qfdnjp871im5i6bplai5"; depends=[backports decoder dplyr 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.7.0"; sha256="1ljn9phxsf47qp12xv1ly76lm4gcqfnhrisx4sy9f6pz5rx6k5s3"; depends=[aweek ggplot2]; }; + incidence = derive2 { name="incidence"; version="1.7.1"; sha256="1d76d1pm4g8y0jalc18dcipi1fzwx843gcbrspcbk8nhdkjxlny4"; depends=[aweek ggplot2]; }; inctools = derive2 { name="inctools"; version="1.0.15"; sha256="0ikldiwgizs2p9vcalk5729dr6krysnyr4ni0ybg9gljw7iafdlf"; depends=[binom cubature doParallel dplyr foreach ggplot2 glm2 magrittr plyr pracma rlang tibble tmvtnorm]; }; indelmiss = derive2 { name="indelmiss"; version="1.0.9"; sha256="0i4qnvc0xb3ngnk8xdscmx7qnicfs7s6czawf6schb1nh2pjpzyq"; depends=[ape numDeriv phangorn Rcpp]; }; - indicspecies = derive2 { name="indicspecies"; version="1.7.8"; sha256="1j70plalgn9y69m958q5jxhrzd14prcjbniiljnjl243xbbydgv9"; depends=[permute]; }; + indicspecies = derive2 { name="indicspecies"; version="1.7.9"; sha256="1xza0ha42frz5wizf268j49y3201vpsm4kgj0czsw9wygzjl008f"; depends=[permute]; }; indirect = derive2 { name="indirect"; version="0.2.0"; sha256="1k7xwsx655nzl43s1mkaysyn5gydq973gynmqip67lssnm7cnch4"; depends=[gplots MASS]; }; inegiR = derive2 { name="inegiR"; version="3.0.0"; sha256="1rhkdmpz7mxi7ddyygss5rlh3c8hgxhzdk3fnvnlizc1l55cc6c0"; depends=[jsonlite lubridate plyr tibbletime XML zoo]; }; ineq = derive2 { name="ineq"; version="0.2-13"; sha256="09fsxyrh0j7mwmb5hkhmrzgcy7kf85jxkh7zlwpgqgcsyl1n91z0"; depends=[]; }; @@ -9060,22 +9154,25 @@ in with self; { inference = derive2 { name="inference"; version="0.1.0"; sha256="0j92isfkbhk13yx2hd3a5dd7ikcbgjc04zisd1n5kmg6ajw2aj6r"; depends=[sandwich]; }; inferference = derive2 { name="inferference"; version="1.0.0"; sha256="1x6i8ycba9z57m1n143p1j9pmlfrhjhi4iw0fsny8xmcvqrlr85p"; depends=[Formula lme4 numDeriv]; }; inferr = derive2 { name="inferr"; version="0.3.0"; sha256="1z5bfq0gv1h6iw8nwc19ar6f2sgsvgs3ghq52s09wclqk2yy4azz"; depends=[dplyr magrittr purrr Rcpp rlang shiny tibble tidyr]; }; + infinitefactor = derive2 { name="infinitefactor"; version="1.0"; sha256="0j6f9q8z81znwakyx4h0l8ypz0y4yv11d7l3rwljmn4rgspyjl5c"; depends=[ggplot2 Rcpp RcppArmadillo reshape2]; }; infix = derive2 { name="infix"; version="0.1.0"; sha256="1zgy8f8b9pmpvpgqh3niczkr94xkc53xcjim73djmd10azw3kgrk"; depends=[magrittr]; }; inflection = derive2 { name="inflection"; version="1.3.5"; sha256="1xyx2jnvyjn7n1xsg3m2qpl03qrnmlp9b8fa2h77f922fwj1zxgv"; depends=[]; }; influence_ME = derive2 { name="influence.ME"; version="0.9-9"; sha256="0f6d2hvs9qllyfpsp2cgh7w8yjxafclbk47n8av7j9zpp7s5yg9v"; depends=[lattice lme4 Matrix]; }; influence_SEM = derive2 { name="influence.SEM"; version="2.2"; sha256="1cabl6486mlrmk0418s18wii3n6nl1ckv6w9281wdk4fy27y9qk2"; depends=[lavaan]; }; + influenceAUC = derive2 { name="influenceAUC"; version="0.1.1"; sha256="10iflbcx3hrd0f7y0izkpc9xkhn5bi8if8qdqk8151idzwq6g2jp"; depends=[dplyr geigen ggplot2 ggrepel ROCR]; }; influenceR = derive2 { name="influenceR"; version="0.1.0"; sha256="12p9362hkndlnz1rd8j2rykg57kbm6l7ks60by3rd25xg50k5jag"; depends=[igraph Matrix]; }; + influential = derive2 { name="influential"; version="0.1.0"; sha256="057nz5p7m903s78656wvw073w62xw783wf2r14xcdw5sj24c7lcl"; depends=[igraph]; }; influxdbr = derive2 { name="influxdbr"; version="0.14.2"; sha256="03dzw86mvbc8w38q9skjki1z17vc04k9q8dx7sd3xg6xbr10f9d9"; depends=[dplyr httr jsonlite magrittr purrr rlang tibble tidyr xts zoo]; }; - infoDecompuTE = derive2 { name="infoDecompuTE"; version="0.6.1"; sha256="04fgmz58nvw0jwbj8y1r42ny84024h47w9cc0z96aqag5kg1wmxm"; depends=[MASS]; }; + infoDecompuTE = derive2 { name="infoDecompuTE"; version="0.6.2"; sha256="0r1capiv4zr31dsy0sqly9zb00i86zq2ihbgsmb5g4cy0f04xlqz"; depends=[MASS]; }; informR = derive2 { name="informR"; version="1.0-5"; sha256="16pz47wlr1gr8z5hdnrjpczm967khqiqgdfiw15a0bby6qdvni2y"; depends=[abind relevent]; }; infotheo = derive2 { name="infotheo"; version="1.2.0"; sha256="18xacczfq3z3xpy434js4nf3l19lczngzd0lq26wh22pvg1yniwv"; depends=[]; }; infra = derive2 { name="infra"; version="0.1.2"; sha256="0jycnnmrrjq37lv67xbvh6p63d6l4vbgf3i1z9y7r75d6asspzn1"; depends=[]; }; infraFDTD_assist = derive2 { name="infraFDTD.assist"; version="0.6"; sha256="04j5nl5vxk79iciz6s9bpiyn319c2dbh7fdahgwira2r30w2fxv9"; depends=[fields]; }; infutil = derive2 { name="infutil"; version="1.0"; sha256="02d0hfbkdqjj0lm1fzwwxy60831kbcjn2m4rfblpib0krkbpz72n"; depends=[ltm]; }; - ingredients = derive2 { name="ingredients"; version="0.5.0"; sha256="1vq3ym3vvjz11ixi0ggmqggw7s88ha7kk1y6li5cpnsjiqqyv09k"; depends=[DALEX ggplot2 scales]; }; + ingredients = derive2 { name="ingredients"; version="1.1"; sha256="0aim57f7b1pfb6cv28m8xlca40d84gickq32mzikqn20ini27xw7"; depends=[DALEX ggplot2 gridExtra scales]; }; ini = derive2 { name="ini"; version="0.3.1"; sha256="04yqij344dwm0xqgara8xia42mlmij3i8711qbb5534w05a1l6bv"; depends=[]; }; injectoR = derive2 { name="injectoR"; version="0.2.4"; sha256="0sa32cspp6y3m04yfmd02kxx55mk7l9jxf4r9pk1a6k3sqnj6fl8"; depends=[]; }; - inlabru = derive2 { name="inlabru"; version="2.1.12"; sha256="0ry32hsf9f4hd1jka51d7jbxlalhknwnc3zj9i9bggx38bb9w9fg"; depends=[ggplot2 Matrix rgdal rgeos sp]; }; + inlabru = derive2 { name="inlabru"; version="2.1.13"; sha256="1khsfhays6xna060f4h0rc7yjsq89xl42d36fy33ixgk0rh9vlnc"; depends=[ggplot2 Matrix rgdal rgeos sp]; }; inline = derive2 { name="inline"; version="0.3.15"; sha256="0s4wssvpan189fijahknxq5s22ww9bzmdlmyhnra748r7khky17z"; depends=[]; }; inlinedocs = derive2 { name="inlinedocs"; version="2019.12.5"; sha256="11d8cnrzgq95w7hn234rcwrr1mmrv63f69807pnzxizxbgnp7wz3"; depends=[]; }; inlmisc = derive2 { name="inlmisc"; version="0.4.9"; sha256="0yd8bysa5l3ihypckmx4g5zh176s6p4xsyw5pavc6pz8239wj5k2"; depends=[checkmate data_table GA htmltools htmlwidgets igraph knitr leaflet raster rgdal rgeos rmarkdown scales sp tinytex xtable yaml]; }; @@ -9084,18 +9181,18 @@ 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.8.0"; sha256="1bkcwvjpfy4q4k478x8x42yiqz6v0fk6z6hfp6fli3h63smlmck0"; depends=[]; }; + insight = derive2 { name="insight"; version="0.8.2"; sha256="0fjf7dwpv1a7qfbzixppg348z1ksq19kdjm08vcb2am7w0k3plcj"; depends=[]; }; insol = derive2 { name="insol"; version="1.2.1"; sha256="1d2vqmbp94ff80mfkmq4a8y12r6ryym8hh1568ip9qbn7snc64v1"; depends=[raster]; }; inspectdf = derive2 { name="inspectdf"; version="0.0.7"; sha256="03yli2fiyb3kw189aga9hiyxm9f9b2lhpx1cjv9silfgm0xj54lh"; depends=[dplyr ggfittext ggplot2 magrittr progress Rcpp tibble tidyr]; }; instaR = derive2 { name="instaR"; version="0.2.4"; sha256="0c4m471ragkpksr0h21cdgnjxcknf01xqz543dahxgzjg9ncjwhg"; depends=[httr jsonlite]; }; install_load = derive2 { name="install.load"; version="1.2.1"; sha256="148q0rjal5hfcb8ilxzd1bz38mn8vxqrsfg5x4jy48psk00fk3d9"; depends=[]; }; insuranceData = derive2 { name="insuranceData"; version="1.0"; sha256="0wryh8i1v3bnpbqn6d6dpxr9bwwl6mnh5cb5igz0yanh4m1rx96w"; depends=[]; }; - insurancerating = derive2 { name="insurancerating"; version="0.4.3"; sha256="0m4ndbyinmqd1207qmw796zm7xs10bqyc5k3pqvvjy765fcni95k"; depends=[classInt data_table evtree ggplot2 lubridate mgcv stringr]; }; + insurancerating = derive2 { name="insurancerating"; version="0.5.2"; sha256="09zy2gdwqslv5jy46lnqr2w2j45n2ma0i2bgksi378mn21h9m14h"; depends=[classInt data_table dplyr evtree ggplot2 lubridate mgcv patchwork stringr]; }; intRegGOF = derive2 { name="intRegGOF"; version="0.85-5"; sha256="0xjq8vdlgqlzrvp752gd4qfrpnpapx7k6xzfsvfril8ngvm9a162"; depends=[]; }; intRvals = derive2 { name="intRvals"; version="1.0.0"; sha256="0391raj5wq6issvzqm8bfnv1ap2hh5nfsqi9r1x5ss37fvcq5fjm"; depends=[lme4 plyr]; }; intamap = derive2 { name="intamap"; version="1.4-9"; sha256="060sghkqsdrxpa340rvjskh2wafdkffa5q8nlbg1msnsmk639lkn"; depends=[automap doParallel evd foreach gstat MASS mvtnorm rgdal sp]; }; intamapInteractive = derive2 { name="intamapInteractive"; version="1.1-12"; sha256="1h8kzinfpp2rwal11xqs9g99rmigs0jlsr5h0qh0zsill73minid"; depends=[automap gstat intamap rgdal sp spatstat spcosa]; }; - intccr = derive2 { name="intccr"; version="3.0.1"; sha256="1yp94cr59i120aqbzss48b4n6z29dcgd97qz06vnh812lfrj1wxd"; depends=[alabama doParallel foreach MASS]; }; + intccr = derive2 { name="intccr"; version="3.0.2"; sha256="1v2zhyap414w41dgy2jjz3fnrvk0vawf02dvb1nprrid7fqsnf9i"; depends=[alabama doParallel foreach MASS]; }; intcensROC = derive2 { name="intcensROC"; version="0.1.1"; sha256="0qkgp6iw2s772zk2533jsar64f5mqgy4874swgarnfgd4jvkwy2k"; depends=[pracma Rcpp RcppEigen]; }; intdag = derive2 { name="intdag"; version="1.0.1"; sha256="0mb0a1ccc67clfa75b4hl901zdmx7fxw713c4ybx3i5wc2ldl8ph"; depends=[]; }; intePareto = derive2 { name="intePareto"; version="0.0.1"; sha256="0mynqvmdb39zqx1z2y6bscfjkwf880b7pd149xsdbc6f49hlnfw6"; depends=[apeglm biomaRt DESeq2 GenomeInfoDb GenomicAlignments GenomicRanges IRanges rPref Rsamtools]; }; @@ -9104,8 +9201,7 @@ in with self; { 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.2"; sha256="0ycr839l07xahakr4r2jvlmd0fcxfm4qi3g8agnyh24c2kwl3ck2"; depends=[]; }; - interactions = derive2 { name="interactions"; version="1.1.1"; sha256="0xsqsylfgqgdy7bh32v8x0yn5naf1jclv05dvpyvhladgd0q1c0m"; depends=[cli crayon generics ggplot2 jtools rlang tibble]; }; - intercure = derive2 { name="intercure"; version="0.1.0"; sha256="0j71dqcbcfl1zpfidh3xys5h3ggyhrzq3avkdm9v18pv464x8xlv"; depends=[foreach iterators MASS Matrix survival]; }; + interactions = derive2 { name="interactions"; version="1.1.3"; sha256="11nn3w4qsnh0idf7cwnrclg9h8vdjfl9rbvfk1c4l65pm4f61xrv"; depends=[cli crayon generics ggplot2 jtools rlang tibble]; }; interep = derive2 { name="interep"; version="0.3.0"; sha256="03a51vambjl7gwxk43k47iff65lc6xs66vmkiw3dhxjr3b3nxrh8"; depends=[MASS Rcpp RcppArmadillo]; }; interferenceCI = derive2 { name="interferenceCI"; version="1.1"; sha256="19ky10nn6ygma6yy5h1krxx61aikh3yx5y39p68a944mz8f72vsn"; depends=[gtools]; }; interflex = derive2 { name="interflex"; version="1.0.8"; sha256="117bq8cid36v6d2lrcywv5xqh6wm2z0fj9hwkjzwqhfkd8qhpq0a"; depends=[doParallel foreach ggplot2 lfe Lmoments lmtest mgcv pcse Rcpp RcppArmadillo sandwich]; }; @@ -9120,11 +9216,12 @@ in with self; { interpret = derive2 { name="interpret"; version="0.1.24"; sha256="0nhxxcdw21qi356nxs0abp2fv87izs3667rw774251r9sbpq5vn1"; depends=[]; }; interpretR = derive2 { name="interpretR"; version="0.2.4"; sha256="0nfh3pyr7nn0r41xk0mfb4fs5rjkbh43lbw14x7pdmbgzpgsc22c"; depends=[AUC randomForest]; }; interval = derive2 { name="interval"; version="1.1-0.1"; sha256="1lln9jkli28i4wivwzqrsxvv2n15560f7msjy5gssrm45vxrxms8"; depends=[Icens MLEcens perm survival]; }; - intervals = derive2 { name="intervals"; version="0.15.1"; sha256="1r2akz8dpix1rgvdply4r3m2zc08r0n96w9c97hma80g61a3i2ws"; depends=[]; }; + intervals = derive2 { name="intervals"; version="0.15.2"; sha256="0mvwfwc03ifb30a3dzbmkv9adwqb8ajxhcw24d8xip8px063plhb"; depends=[]; }; intervcomp = derive2 { name="intervcomp"; version="0.1.2"; sha256="1l6x1fl84li6is3b92b96q3fbv0rpgqy2lvw9cbi2cq8nh9imnyx"; depends=[]; }; interventionalDBN = derive2 { name="interventionalDBN"; version="1.2.2"; sha256="0wpp4bfi22ncvl0vdivniwwvcqgnpifpgxb4g5jbyvr0z735cd9w"; depends=[]; }; - intkrige = derive2 { name="intkrige"; version="1.0.0"; sha256="1x0jg4vdbf3ipns1slw2pb1myiswnpka9lyxma69lgk2nmwmz9p2"; depends=[gstat raster Rcpp RcppArmadillo Rdpack sp]; }; - intoo = derive2 { name="intoo"; version="0.3.1"; sha256="0i1141r95zv8sv6l047avsgyq1kbxilczrhsn6gkvjg5vkmqn9rr"; depends=[]; }; + intkrige = derive2 { name="intkrige"; version="1.0.1"; sha256="1p3fn5nzn1iliy025187k590qrsw3z3d47p67gzwwd6h050yrl86"; depends=[gstat raster Rcpp RcppArmadillo Rdpack sp]; }; + intmed = derive2 { name="intmed"; version="0.1.1"; sha256="1y9ryz7sxhal4s35cbplfs67596dh57kqy10wyg49x8aq80gpgnr"; depends=[doParallel dplyr EValue foreach MASS mice stringr tibble tidyverse]; }; + intoo = derive2 { name="intoo"; version="0.4.0"; sha256="0s4jii34cgvyi573z569l1827yf90vj4ih9krsgvpbvk7lfdbagg"; depends=[]; }; intrinsicDimension = derive2 { name="intrinsicDimension"; version="1.2.0"; sha256="0cka20ifxx9njnvp18bzhrvmh3cwjnxkc0a23qzi43dahc51ijbc"; depends=[yaImpute]; }; introgress = derive2 { name="introgress"; version="1.2.3"; sha256="1j527gf7pmfy5365p2j2jbxq0fb0xh2992hj4d7dxapn4psgmvsk"; depends=[genetics nnet RColorBrewer]; }; intrval = derive2 { name="intrval"; version="0.1-1"; sha256="1p66cjpn43xib7rrnyv3jqr6bb49d3dxf888p8hxnr7kx9wfalkn"; depends=[]; }; @@ -9141,15 +9238,17 @@ 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.2"; sha256="1cyl8wvbngdrdkkckng1bs699rjp737j99kbd8r155fjj0370nx4"; depends=[filenamer stringr]; }; - ioanalysis = derive2 { name="ioanalysis"; version="0.2.1"; sha256="14bmi6kk8ra9b7px3l98sdm1zjr8516cfkya8fpdfbaxqjdv4byj"; depends=[ggplot2 plot3D]; }; + ioanalysis = derive2 { name="ioanalysis"; version="0.2.2"; sha256="1z7awlbll7lxarl18x5rmlxr36kp0yvx0blvhn2q7fr7zyjffgk4"; depends=[ggplot2 plot3D]; }; 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]; }; iopsych = derive2 { name="iopsych"; version="0.90.1"; sha256="0adxwxnb1zdlld3icdggx7cq6cp8z4h1jf105485w322a8c6s9ik"; depends=[mco mvtnorm]; }; iosmooth = derive2 { name="iosmooth"; version="0.94"; sha256="06xgzhjgb6pznjzfli193q7kn8sh5jmqsssgymwj98bw7iwn4q3z"; depends=[]; }; iotables = derive2 { name="iotables"; version="0.4.2"; sha256="1ds6j8x965fc2j11r507ljqwcaam0zz5q2vkhq9gkl53fjfgajlk"; depends=[dplyr eurostat forcats kableExtra knitr lubridate magrittr plyr purrr readxl tibble tidyr]; }; - iotools = derive2 { name="iotools"; version="0.2-5"; sha256="0rn6kvlcijnhlwajh6nmi80qlamxgz0x3pn09yp4hyfpl3zxg1fz"; depends=[]; }; + iotools = derive2 { name="iotools"; version="0.3-1"; sha256="0x24s38shvgqvxpx57qjf86g6f9p9y201yymdl61n5yw439pg88f"; depends=[]; }; ip2location = derive2 { name="ip2location"; version="8.0.0"; sha256="1rhy3jlcl4hcynhjgy3gjx9g9kyn30gq1jwfpll23jixvmrx64by"; depends=[jsonlite reticulate stringr]; }; + ipADMIXTURE = derive2 { name="ipADMIXTURE"; version="0.1.0"; sha256="1fl7nyxg7gakjdggdc311wf037zaxwpqsw3ax7liq1pvw6flb9h7"; depends=[ape treemap]; }; + ipaddress = derive2 { name="ipaddress"; version="0.2.0"; sha256="0i9l6lflapc890cb4vvyhgr69lc64z2ci7yxv5qgafpk8wq4fr03"; depends=[AsioHeaders blob Rcpp rlang vctrs]; }; ipc = derive2 { name="ipc"; version="0.1.3"; sha256="10h54j83l7khk1lkpdwn6hwaz31i3v6svg4q1lxzvr2aqdsj7hy0"; depends=[R6 shiny txtq]; }; ipcwswitch = derive2 { name="ipcwswitch"; version="1.0.3"; sha256="1pqlfkglgsahzsw7z9wsx7k0i9n0kx77g9p1j7i9dz7j74s6g09r"; depends=[survival]; }; ipdmeta = derive2 { name="ipdmeta"; version="2.4"; sha256="0k9wqpmrvqdh73brmdzv86a2dbyddjyyyqzqgp1vqb3k48k009s2"; depends=[nlme]; }; @@ -9157,10 +9256,12 @@ in with self; { ipeadatar = derive2 { name="ipeadatar"; version="0.1.0"; sha256="1qg67xmp9x5yv1gm0k6czycg89rpfa8cscrihmqibhscp5dansnj"; depends=[curl dplyr jsonlite lubridate magrittr purrr sjlabelled]; }; ipflasso = derive2 { name="ipflasso"; version="1.1"; sha256="0gf1yj35vr92qi59hffcf4hzrh2b439kfd6m745wgpxq6wic1hs3"; depends=[glmnet survival]; }; ipfp = derive2 { name="ipfp"; version="1.0.1"; sha256="12aklhf9p70r9b2wi0qgbl835b4lil805c31n1ka4kdix4b4cpr4"; depends=[]; }; - ipfr = derive2 { name="ipfr"; version="1.0.1"; sha256="1gd2nh88xip7dw5sfb79b4g3jhhkzrqwii1vczcjdnghbk0yp96r"; depends=[dplyr ggplot2 magrittr mlr tidyr]; }; + ipfr = derive2 { name="ipfr"; version="1.0.2"; sha256="0q44zw5g76qfqrqv6w2a8p905n4ljxab9jmyqk6fv9vs8j2kyivg"; depends=[dplyr ggplot2 magrittr mlr tidyr]; }; ipft = derive2 { name="ipft"; version="0.7.2"; sha256="0jifmkwac5yfl110200ljm3pas3321j068af9xqzqs0av20m8hps"; depends=[apcluster cluster dplyr ggplot2 Rcpp]; }; iplots = derive2 { name="iplots"; version="1.1-7.1"; sha256="1bz8n9cnx6zy3wsr49h55r0l5ikfl0xjg4r76fi4giid2a3ba4lf"; depends=[png rJava]; }; + ipmisc = derive2 { name="ipmisc"; version="1.2.0"; sha256="0ga92xpq3inc1anwn4qr3xzrnlp79szb46ybvgyvxmg682wphlnf"; depends=[broomExtra crayon dplyr forcats rlang rstudioapi tibble tidyr zeallot]; }; ipptoolbox = derive2 { name="ipptoolbox"; version="1.2"; sha256="0scbny4crgr23qcp0vgsxhwmj5g5q5c1c4mb5mmb5njyvc34s01l"; depends=[AlgDesign copula evd kolmim triangle]; }; + ipr = derive2 { name="ipr"; version="0.1.0"; sha256="1db06r784c6jga0anp6p5b3k47yfhr84nzxyjn52pc9zkg3yifjm"; depends=[]; }; ipred = derive2 { name="ipred"; version="0.9-9"; sha256="0vs1hqfx7yd0xdbmfsf2gim7spkni0845cj6gswn0nhdfdq7ma0d"; depends=[class MASS nnet prodlim rpart survival]; }; 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.11"; sha256="02jxanfhsjrabj33nwjv71vdc87hiyzikyqrfdj9ix6dky6lm199"; depends=[ape phangorn plyr seqinr XML]; }; @@ -9172,7 +9273,7 @@ in with self; { ipwErrorY = derive2 { name="ipwErrorY"; version="2.1"; sha256="14p22mwc120kdlf6r1hfx4kp7nqrz2nl2vpvy45j8rbrc571b6ka"; depends=[nleqslv]; }; iq = derive2 { name="iq"; version="1.3"; sha256="1bs5gmj0vc396pc6ybmfq2wmv4hfn6lbiyqzdsr4zq01r4y4iwgs"; depends=[]; }; iqLearn = derive2 { name="iqLearn"; version="1.5"; sha256="1zn43zvx0mjzh96bm73scacmladamy8jmhxim7hcfq39cfhiw3c8"; depends=[]; }; - irace = derive2 { name="irace"; version="3.3"; sha256="040d1cl8q5hmcji66bvgvm9wb8w6v7xzfsggbrar8490s9ldjhj4"; depends=[]; }; + irace = derive2 { name="irace"; version="3.4.1"; sha256="1dhlspv1gqg7cm7j95zhl0k2zr0s159krjmxm07k5fp68ax95sky"; depends=[R6]; }; ircor = derive2 { name="ircor"; version="1.0"; sha256="07apa4l4ib11xw25d44b403s3la29sqlid13q41hjrlfxafm91ld"; depends=[]; }; irg = derive2 { name="irg"; version="0.1.1"; sha256="0g5rhahiq2k269n8ip4yj6ncra07j7flraphzxmis931sfpdsvam"; depends=[data_table RcppRoll]; }; irlba = derive2 { name="irlba"; version="2.3.3"; sha256="1h7mzrqdjc41814cf6c93sbyl7nxwvsf3x8apl9rhmydgdlk7qkf"; depends=[Matrix]; }; @@ -9184,25 +9285,25 @@ in with self; { irtDemo = derive2 { name="irtDemo"; version="0.1.4"; sha256="0rpwryybnj7b4bxn0mn1m496y85s2fpqdd78lmdl6jg1ck4j4pb3"; depends=[fGarch shiny]; }; irtProb = derive2 { name="irtProb"; version="1.2"; sha256="12wnvbzkh0mx9i3iyh1v2n2f2wjsjj7ad3dgv9xj949x4nbz16j0"; depends=[lattice moments]; }; irtoys = derive2 { name="irtoys"; version="0.2.1"; sha256="0h6iiaxikhbxhbyksbjnb09qdxinlkwr2v9yzs5wslbni14paq5q"; depends=[ltm sm]; }; - irtplay = derive2 { name="irtplay"; version="1.4.0"; sha256="0v2zwb9jqfbbmfs8zshzvmmhz7g98pm3k9q83yb38q2zakvg1jip"; depends=[dplyr ggplot2 gridExtra pbapply purrr reshape2 rlang statmod tidyr]; }; + irtplay = derive2 { name="irtplay"; version="1.4.1"; sha256="0blc1jlj44rk9jgpffdwlx3pw1n72xkfi6mxb5mhd8qyc5ri1a8m"; depends=[dplyr ggplot2 gridExtra pbapply purrr reshape2 rlang statmod tidyr]; }; irtrees = derive2 { name="irtrees"; version="0.1.0"; sha256="03jmfyx1ia987zhi74fmmcdz70wnm8c7z5z30rwzd1cs11dijjwv"; depends=[]; }; irtreliability = derive2 { name="irtreliability"; version="0.1-1"; sha256="15qs8bvgrwajj5kfd57rd34l1p2805ilyd7w60ngrqc14d6az9d2"; depends=[fastGHQuad ltm mirt]; }; isa2 = derive2 { name="isa2"; version="0.3.5"; sha256="17vm0906szhrh2k5x694vwcfijbzmd1v3axpszfybc0lgds437cv"; depends=[lattice]; }; isdals = derive2 { name="isdals"; version="2.0-4"; sha256="15p432fskdz2r8523cw122mfhvrq8vdsdsrd0kz9yfin4b5z3zfh"; depends=[]; }; - isdparser = derive2 { name="isdparser"; version="0.3.0"; sha256="1fdp4zk3pzpi5m026rlsrhyl4r5rfxy9sr8d04w2i0316rziv7kc"; depends=[data_table tibble]; }; + isdparser = derive2 { name="isdparser"; version="0.4.0"; sha256="05xkffmiiyhas5hzdjdylbrvh6fjc2fjh7s00iwjxkp4ba7rwq3g"; depends=[data_table lubridate tibble]; }; isingLenzMC = derive2 { name="isingLenzMC"; version="0.2.5"; sha256="1pd1s3a1rv7vlxd5db1pgwdjps8w5im4zz2h3qzal9cwbis0hb51"; depends=[]; }; - island = derive2 { name="island"; version="0.2.4"; sha256="1jwqyrkxljhrxnd4jnfzm2bdgg192865nm1pxizbr7ws0b4z9fyi"; depends=[]; }; - islasso = derive2 { name="islasso"; version="1.1.0"; sha256="1kp94lscl738wlw0hn1xakcgi10zbxpnvkpvzj5ybwvpbjy3qb9a"; depends=[glmnet Matrix]; }; + island = derive2 { name="island"; version="0.2.5"; sha256="0kmrdxpfybmc9l3rqr1b7r1k0js2ri8r2rlg0zk1nd5m14p7c4l2"; depends=[]; }; + islasso = derive2 { name="islasso"; version="1.1.1"; sha256="1jqshk18g6fj51ppz8fxi2a2hydcqf469ff0h9k7lha7a46h26ff"; depends=[glmnet Matrix]; }; ismev = derive2 { name="ismev"; version="1.42"; sha256="19giigxwf62cdkf7mglsca649n2ignb9bxyg9zl7im1vm3ngnmqd"; depends=[mgcv]; }; - isni = derive2 { name="isni"; version="1.1"; sha256="0m7z8gxam4f3d0ggyk502c42aaxvjanxcv5c1p62jv13vgb0jrik"; depends=[Formula lme4 matrixcalc mixor mvtnorm nlme nnet]; }; + isni = derive2 { name="isni"; version="1.2"; sha256="1nw7i20fli3sg1g1dl17g8rz5bpx49gcmlyw4nvfyhdxqr38nb0r"; depends=[Formula lme4 matrixcalc mixor mvtnorm nlme nnet]; }; isnullptr = derive2 { name="isnullptr"; version="1.0.1"; sha256="0kwjxq59n3qncdw63vsdvz7v5mzbl5lmckdfgiiw35pzmahnxzh9"; depends=[]; }; + isoSurv = derive2 { name="isoSurv"; version="0.1.0"; sha256="00dbrblqdylh2z636hwxr79lk2f8sa15wqcm7m6vd5m2jdhw4xay"; depends=[Iso survival]; }; isoband = derive2 { name="isoband"; version="0.2.0"; sha256="1r023s73qypnvpx18znr9ymylr022m90v65mz2jasn0a1kjrfcbq"; depends=[Rcpp testthat]; }; isoboost = derive2 { name="isoboost"; version="1.0.0"; sha256="0arah62y2gyjhrwjyf4hbzlzyvnx3594436pvk8jjcjyfk7bzr6c"; depends=[Iso isotone rpart]; }; - isocat = derive2 { name="isocat"; version="0.2.4"; sha256="0hbkkzcsw7hy40jilb4dahckxi8wfrcvpzrlbfigsc2hdlgm7591"; depends=[dplyr foreach magrittr plyr raster sp]; }; + isocat = derive2 { name="isocat"; version="0.2.5"; sha256="15y1pjyf1lcwxybrsr1n7z8w2dx1cpldcshc3fprqgy0zm2d9ij7"; depends=[foreach magrittr plyr raster sp]; }; isocir = derive2 { name="isocir"; version="2.0-6"; sha256="0dkxdx2g1c579q97r45shws2gylkwqlvrhmc14ddmzi45xhxlql6"; depends=[circular combinat TSP]; }; isopam = derive2 { name="isopam"; version="0.9-13"; sha256="0y1yy0922kq5jxyc40gz8sk9vlzwfkfg5swmc6lk4007g9mgc8fm"; depends=[cluster vegan]; }; isopat = derive2 { name="isopat"; version="1.0"; sha256="0fznvgycyd35dh7pbq1xhp667gsficlmycn5pcrqcbs89069xr1s"; depends=[]; }; - isoph = derive2 { name="isoph"; version="1.1.3"; sha256="0905qw3aa7l09ljzm4q78pgy1z8kzv0jzhxa49293z9jy6g3x0mm"; depends=[Iso survival]; }; isotone = derive2 { name="isotone"; version="1.1-0"; sha256="0alk0cma5h3yn4w2nqcahprijsm89b0gby9najbngzi5vnxr6nvn"; depends=[nnls]; }; isotonic_pen = derive2 { name="isotonic.pen"; version="1.0"; sha256="1lgw15df08f4dhrjjfr0jqkcvxwad92kflj2px526pcxwkj7cj3i"; depends=[coneproj Matrix]; }; isotree = derive2 { name="isotree"; version="0.1.8"; sha256="043bxl7qfwwh6pirbk65rjb81bk6xmg5isqf9p3bygjpa910pqfi"; depends=[Rcereal Rcpp]; }; @@ -9223,17 +9324,16 @@ in with self; { its_analysis = derive2 { name="its.analysis"; version="1.4.1"; sha256="0f3wn7d3j6c0hhg2gp439y5m3namlswgdln18xxbvzzr4s8kz0wx"; depends=[boot car forecast ggplot2 plyr]; }; itsadug = derive2 { name="itsadug"; version="2.3"; sha256="0wzdy82h05264n9cr84w5j98vz24was9hh1y0wdp56ws3dfbav9m"; depends=[mgcv plotfunctions]; }; itsmr = derive2 { name="itsmr"; version="1.9"; sha256="0dmijaq6q31irwrjqv5gq1yfbgggwb3m6rwbg4lx1r9l3cqays7i"; depends=[]; }; - itunesr = derive2 { name="itunesr"; version="0.1.3"; sha256="1czwkrqy3jqw1x0z5zj2kvp4p11s5zdiswwhx9jfxdcsg86zhr45"; depends=[curl jsonlite lubridate xml2]; }; iva = derive2 { name="iva"; version="0.1.0"; sha256="0dchb263ygilxapwsw2gpl18z12wcjsz8zz5fg7h068hmcysa88g"; depends=[Formula ucminf]; }; ivdesc = derive2 { name="ivdesc"; version="1.0.0"; sha256="134dia4wwg7pazc92ccsb3pmsp9kpszr3j5ziyh0ld53qdmcsmz3"; depends=[knitr purrr rsample]; }; ivfixed = derive2 { name="ivfixed"; version="1.0"; sha256="0a26zrkvz0ffq4zxdx5vhr1nvsi9c15s6gvc1zy2pddjz31x2xi5"; depends=[Formula]; }; - ivmodel = derive2 { name="ivmodel"; version="1.7.1"; sha256="0v8alqn141s9rymk29xqmdx7gpp8ivz4525afvarxmp9sm2rqq0q"; depends=[Formula ggplot2 Matrix reshape2]; }; + ivmodel = derive2 { name="ivmodel"; version="1.8.1"; sha256="0c0lzjvp9dzj92p65v5lqmr701ksklx06lf6fcylj2w9hczf5klw"; depends=[Formula ggplot2 Matrix reshape2]; }; ivmte = derive2 { name="ivmte"; version="1.1.0"; sha256="0a7m04n7lyqykfix0shjhbgnl502zlyigxb997v8wbmx9sx2vk56"; depends=[Formula]; }; ivpack = derive2 { name="ivpack"; version="1.2"; sha256="0cr5acjrn41d3q0b77hlg2jmsbf1msvys9gcavm1blsryg2bc03c"; depends=[AER lmtest sandwich]; }; ivpanel = derive2 { name="ivpanel"; version="1.0"; sha256="0irjmkw3nnd8ssidvj23lr0hihlhd9acsbaznh88lknx53ijc2qv"; depends=[Formula]; }; ivprobit = derive2 { name="ivprobit"; version="1.1"; sha256="05b5gf5gmi2yrkg61n7w12qlgpnjakd1z8hhqxy6py8hahsf84gm"; depends=[Formula]; }; ivregEX = derive2 { name="ivregEX"; version="1.0"; sha256="0zh3rqvhn8ald6lxv9kywy2v1p0nr9ijv6plhpbxc6k51zzsgyl8"; depends=[AER Formula lmtest sandwich]; }; - ivtools = derive2 { name="ivtools"; version="2.2.0"; sha256="183lfv18r763jki8i37b8hk1k1kiglmhvjnfzigqzkzqc4cwibm1"; depends=[ahaz data_table nleqslv numDeriv Rcpp survival]; }; + ivtools = derive2 { name="ivtools"; version="2.3.0"; sha256="1wv0r9dy893hafbbrjcjrphb8dgql71ya4zfbkl5dfp7d4ncfxl0"; depends=[ahaz data_table nleqslv numDeriv Rcpp survival]; }; ivx = derive2 { name="ivx"; version="1.0.0"; sha256="0gxq0w9cmgg17y7kdjxfzaq8nr4knashfav0vjpq6ba9jh5grk9l"; depends=[magrittr Rcpp RcppArmadillo tibble]; }; jSDM = derive2 { name="jSDM"; version="0.1.0"; sha256="0lkapg6v5lh53vnsg5hcr9qis8qimb6ilds23dqcyhi6w3dys9nb"; depends=[coda corrplot Rcpp RcppArmadillo RcppGSL]; }; jSonarR = derive2 { name="jSonarR"; version="1.1.1"; sha256="054q3ly471xa64yyz2as6vkr440ip1y8n5wl6s3zbhqy3bqkdqif"; depends=[jsonlite RCurl]; }; @@ -9241,7 +9341,7 @@ in with self; { jabr = derive2 { name="jabr"; version="0.1.2"; sha256="19hcg2jn7vxmnqwq1828396pgnq53nyw30s19rhy1d7rk5k7dy1p"; depends=[ckanr dplyr glue httr magrittr pillar purrr rappdirs rlang stringr tibble tidyr]; }; jaccard = derive2 { name="jaccard"; version="0.1.0"; sha256="1dmla6qc1k8iw2d7zfjqhf13gqd2lpsrj09yh47ljf994fpab936"; depends=[dplyr magrittr qvalue Rcpp]; }; jack = derive2 { name="jack"; version="1.1.1"; sha256="1mp7cfmh3bzfansb3dyqq347qk6kkf4ndn23pbd78h1xcb54555b"; depends=[DescTools gmp multicool mvp partitions]; }; - jackalope = derive2 { name="jackalope"; version="1.0.0"; sha256="1v2n8ip0nfrdpd263yvr9jnmz9yx9m76vdwds18wj8504y95fzcv"; depends=[ape R6 Rcpp RcppArmadillo RcppProgress Rhtslib zlibbioc]; }; + jackalope = derive2 { name="jackalope"; version="1.1.0"; sha256="0mhsns4q7q7m3dzwkskmrsz3ppp6xvrc89salg62kqhpcay324al"; depends=[ape R6 Rcpp RcppArmadillo RcppProgress Rhtslib zlibbioc]; }; jackknifeKME = derive2 { name="jackknifeKME"; version="1.2"; sha256="0c5shl6s46kz7a623gccqk2plrrf2g29nwr6vbny6009pq3jvzam"; depends=[imputeYn]; }; jackstraw = derive2 { name="jackstraw"; version="1.3"; sha256="02qcaf2p0fyni6n2zhd7vp65kniz74di0pf5jzz79jwj15cfd1b0"; depends=[cluster ClusterR corpcor irlba lfa qvalue rsvd]; }; jacpop = derive2 { name="jacpop"; version="0.6"; sha256="0kq6rn33civ2g6i5nwfqvcgmnn5k2dwmw60lkmz4ywm0y4xxlkai"; depends=[]; }; @@ -9267,16 +9367,18 @@ in with self; { jjb = derive2 { name="jjb"; version="0.1.1"; sha256="0y9yvnzg6xngz1fvzl5jm4yb1pg6wrp3id0gysv214wcznf3gna9"; depends=[]; }; jlctree = derive2 { name="jlctree"; version="0.0.1"; sha256="17n39jc7cwv6hiayy7h1859prdwy2j3pz1vhi6jqnzm4wy6p8a9a"; depends=[lme4 rpart survival]; }; jmcm = derive2 { name="jmcm"; version="0.2.1"; sha256="1giyd0agjz1qpgj7q55maxk7jjmpwc3mrj02ailvwl44rdvhl90v"; depends=[Formula lattice Rcpp RcppArmadillo roptim]; }; - jmdem = derive2 { name="jmdem"; version="1.0"; sha256="1qz2l02m4gnxrm1ankr5qqlskl8amphzj8r763yas218fvzfa34q"; depends=[statmod VGAM]; }; + jmdem = derive2 { name="jmdem"; version="1.0.1"; sha256="15zrxgd5fgi4wzp4s963pnwj3vkgxs4ygqrcpncy9b6j2cxrivdc"; depends=[statmod VGAM]; }; jmdl = derive2 { name="jmdl"; version="0.3.0"; sha256="0167yj368lh1n79jwbqs4g2asb67hfmgh97519linmfpx0n6xdpa"; depends=[boot Formula MASS minqa mnormt mvtnorm]; }; jmetrik = derive2 { name="jmetrik"; version="1.1"; sha256="1if1kxx8apgkbxpkjnlj2lpsfnyj2splsg1p3j5vxa7q6wx70f9j"; depends=[]; }; + jmotif = derive2 { name="jmotif"; version="1.1.1"; sha256="0b2qllpfgs6q5fwfhxl5b4xdyzbvnja7ld766akf0xxznxvglkrg"; depends=[Rcpp RcppArmadillo]; }; jmuOutlier = derive2 { name="jmuOutlier"; version="2.2"; sha256="1vj9n1hsf780f7l0a22kmi3qm84j4dzjybjkh5zwh6bhwfjnjws3"; depends=[]; }; - jmv = derive2 { name="jmv"; version="1.0.8"; sha256="0h62kmg7z08a5kz4fyz0l1s1hx6i8p75xm5k2pq80jryd6nk3xkg"; 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.9"; sha256="1x74zwnp3cdwqsv7djnqcv6k0nrf7v7ng6pk79lzninbssm24sr1"; depends=[BH evaluate httr jmvcore rappdirs Rcpp]; }; - jmvcore = derive2 { name="jmvcore"; version="1.0.8"; sha256="11g6cmiw6l3xkppm6xz1k2lm6xl69ll2av9vn755ngbvf09fgywn"; depends=[base64enc R6 rjson rlang stringi]; }; + jmv = derive2 { name="jmv"; version="1.2.5"; sha256="1hqiclddizvfyvylkak8ia990bfncb9f7gcyljgxmra3djn9mhdn"; 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.2.8"; sha256="0nfd8zxb9pcvn0180vhwccgy5m00lziq0wh0pwxmnazg1x6n0raw"; depends=[BH evaluate httr jmvcore rappdirs Rcpp]; }; + jmvcore = derive2 { name="jmvcore"; version="1.2.5"; sha256="16ki47sm9ng6jqvyyrgw7s09ag4b28dyaqgn5fck1r7ph2l82lp8"; 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]; }; + joineR = derive2 { name="joineR"; version="1.2.5"; sha256="07rsxqvy62w2z48fkgbhfk5b3q9qwkmz11n8j8qkhipqs0h1zwwq"; depends=[lattice MASS nlme statmod survival]; }; + joineRML = derive2 { name="joineRML"; version="0.4.3"; sha256="0pry2kr53svv2jpzycmm0z9nirxmxxid8p332n6pn5j3bydh7jb4"; depends=[cobs doParallel foreach ggplot2 lme4 MASS Matrix mvtnorm nlme randtoolbox Rcpp RcppArmadillo survival]; }; joineRmeta = derive2 { name="joineRmeta"; version="0.1.2"; sha256="0lkj3rry8kvdcl3dxrkvnql8rl3fsgc4lk5qdifhl41aws2q7ccs"; depends=[ggplot2 gridExtra gtools JM joineR lme4 MASS Matrix meta msm statmod survival]; }; joinet = derive2 { name="joinet"; version="0.0.3"; sha256="01rql7nidmzhrz6agy5kphsln5nl4lpyrqdrfmf5w98zjr8yqkpr"; depends=[cornet glmnet palasso]; }; joint_Cox = derive2 { name="joint.Cox"; version="3.7"; sha256="1h9cqmly5rrrqvxzkx5fxjaqzks9hpvb2ggaw8b5rn67wbyblrl9"; depends=[survival]; }; @@ -9289,32 +9391,32 @@ in with self; { josaplay = derive2 { name="josaplay"; version="0.1.3"; sha256="0q6kjk3mjxwbqvq3zz0ylpi1viznp9pxzngqpjzv5sibv0ndh0lf"; depends=[magrittr utf8]; }; jose = derive2 { name="jose"; version="1.0"; sha256="1yna3x4hi0vn23dqi605nn1y313brwh2wcv527bm3mdbscgsi2jf"; depends=[jsonlite openssl]; }; jpeg = derive2 { name="jpeg"; version="0.1-8.1"; sha256="1a8mi70x79a691r40yiw684jkg1mr9n8agkxlcksxcnrdybs9c0x"; depends=[]; }; - jpmesh = derive2 { name="jpmesh"; version="1.1.3"; sha256="0ybv19bmrcwzan151p4px0vv6qnaqmk4fgqvqlh4syjnrb6xv0c5"; depends=[leaflet magrittr miniUI purrr rlang sf shiny tibble units]; }; - jpndistrict = derive2 { name="jpndistrict"; version="0.3.4"; sha256="1z1rgqibksxrz0048zk78xlsm595jbm3y6xkrqcifm1xnqgh1fys"; depends=[dplyr jpmesh leaflet magrittr miniUI purrr rlang sf shiny tibble tidyr tidyselect]; }; + jpmesh = derive2 { name="jpmesh"; version="1.2.0"; sha256="0n2il3y9fix0hrva08hk6hdqqqw5y0vwh5m89vqssr4pccyd1syd"; depends=[leaflet magrittr miniUI purrr rlang sf shiny tibble units]; }; + jpndistrict = derive2 { name="jpndistrict"; version="0.3.5"; sha256="0khhxk7s2kj2icms38vysbq031axq9kiia7873g2vxcn5d8aa6mf"; depends=[dplyr googlePolylines jpmesh leaflet lwgeom magrittr miniUI purrr rlang sf shiny tibble tidyr tidyselect]; }; jqr = derive2 { name="jqr"; version="1.1.0"; sha256="00x5a61bsn2ywzc2haz19f6h0sqhlx7z3k1n9y0729dwm4id89ms"; depends=[lazyeval magrittr]; }; - jrc = derive2 { name="jrc"; version="0.3.0"; sha256="1sa6rpmnj48mlwz5h5nfvq4h3yi64bbh5lkxmhs5lc2x03a6nqd6"; depends=[httpuv jsonlite mime R6 stringi stringr]; }; + jquerylib = derive2 { name="jquerylib"; version="0.1"; sha256="0spq9x6fmnw9nnxanwrm17pwsc29mfw7v7v91ypzwb79wkyx3lys"; depends=[htmltools]; }; + jrc = derive2 { name="jrc"; version="0.3.1"; sha256="0vzmmzblwx055jvd90bz6s5iy901kqanbrs64c3wpaxvjigwf87z"; depends=[httpuv jsonlite mime R6 stringi stringr]; }; jrich = derive2 { name="jrich"; version="0.60-35"; sha256="1y486bfqmfg3f22wm0lfk3lh20ljgi8qrgn5jji0f417wh48nf0x"; depends=[ape]; }; jrt = derive2 { name="jrt"; version="1.0.1"; sha256="023i0xqz8mhnjnii92vjw64mjnnlf8jaji99i4c2vxcr7m83jm0r"; depends=[directlabels dplyr ggplot2 ggsci irr mirt psych tidyr]; }; jrvFinance = derive2 { name="jrvFinance"; version="1.4.1"; sha256="1gkivmvc0njm32w7yhbh02h9p212xa3m4cvrwcy7yray8g6phdxp"; depends=[]; }; js = derive2 { name="js"; version="1.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.8"; sha256="1z420lx4ayn19k8d13p4ii8r035jingli618mpfjl3wk95hzigqf"; depends=[ggplot2 gridExtra plyr scales survey survival]; }; - jsmodule = derive2 { name="jsmodule"; version="1.0.4"; sha256="1b81k4kgx0bzwdvq777gfj36mhw1832fbb8bijx6np2w46z1xkyg"; depends=[data_table devEMF DT epiDisplay geepack GGally ggplot2 haven Hmisc jskm jstable labelled MatchIt maxstat pROC purrr RColorBrewer readr readxl rstudioapi see shiny shinycustomloader shinyWidgets survC1 survey survIDINRI survival tableone timeROC]; }; + jsmodule = derive2 { name="jsmodule"; version="1.0.6"; sha256="0qf82yrf3jdhwydwcwiqxlznsn5ayiqigdilyp0xqrrx8s8mkb26"; depends=[data_table devEMF DT epiDisplay geepack GGally ggplot2 haven Hmisc jskm jstable labelled MatchIt maxstat pROC purrr RColorBrewer readr readxl rstudioapi see shiny shinycustomloader shinyWidgets survC1 survey survIDINRI survival tableone timeROC]; }; json64 = derive2 { name="json64"; version="0.1.3"; sha256="19q8qgf4wnd3np12ajy180klpjy0g2csw5micwb4sl7qfzl6wc7j"; depends=[jsonlite]; }; - jsonify = derive2 { name="jsonify"; version="1.0.0"; sha256="0cxdbihcl4w43gvskjw420i6dm689jcydp2dzc371152ysdsjjzd"; depends=[BH rapidjsonr Rcpp]; }; + jsonify = derive2 { name="jsonify"; version="1.1.1"; sha256="14zlg99bryxwhdcydpapjykzqml08ld13mj0kkgijgph2jmzm140"; depends=[rapidjsonr Rcpp]; }; jsonld = derive2 { name="jsonld"; version="2.1"; sha256="0lp0lp9nbk31dia2nq6xba29ymak9h5wl4zbq4pdqw6qm9iwz6ww"; depends=[curl jsonlite V8]; }; - jsonlite = derive2 { name="jsonlite"; version="1.6"; sha256="0lyvhnr6n57h3a89bvipii7x17nvfaycm9j5j50bfrlr48jv9ic8"; depends=[]; }; + jsonlite = derive2 { name="jsonlite"; version="1.6.1"; sha256="0xrki07wc17bkmhz0h7jay784j1sls2i9bf1mfpj6yl59791v4kl"; depends=[]; }; jsonstat = derive2 { name="jsonstat"; version="0.0.2"; sha256="0p0d3snl1971p5ikrkmwqrjjh4fy0b89qk3rnd1dayfb0r80xnnj"; depends=[cli dplyr jsonlite rlang]; }; jsonvalidate = derive2 { name="jsonvalidate"; version="1.1.0"; sha256="1vxklvkva547mzbgi7hll46sfx274c6j4m70algygphz783x3dsx"; depends=[V8]; }; jsr223 = derive2 { name="jsr223"; version="0.3.3"; sha256="0i00nbsj6b4mx9pgp5rana1kj57hi4lz3lsiniv7baz5avmhp65n"; depends=[curl jdx R6 rJava]; }; jstable = derive2 { name="jstable"; version="0.9.2"; sha256="0vp6bb2yqnh81avy085y6ylb3qll671xmjddi6gilzmbxpks9xl6"; depends=[car coxme data_table dplyr geepack labelled lme4 magrittr purrr survey survival tableone tibble]; }; - jstor = derive2 { name="jstor"; version="0.3.7"; sha256="0if7ngqs9ncnkg9kiag3k51ipxiyrkaqm7lzmvp84hysqq8536jc"; depends=[cli crayon dplyr furrr magrittr pryr purrr readr rlang stringr tibble tidyr xml2]; }; + jstor = derive2 { name="jstor"; version="0.3.8"; sha256="034n9x4skn7l0d9c4qfa01vlrqpkvk0dgplmc6cz07qm0hl35xcw"; depends=[cli crayon dplyr furrr magrittr pryr purrr readr rlang stringr tibble tidyr xml2]; }; jtGWAS = derive2 { name="jtGWAS"; version="1.5.1"; sha256="06cgsncgrqslxcc7s0lb3zwa85bhzkmjzz3f04716xpzwa186vxq"; depends=[Rcpp]; }; - jtools = derive2 { name="jtools"; version="2.0.2"; sha256="1vm2jd70w4a9qfnq2wjixnvpv9yilal6xpfjajgqx289c19csvq9"; depends=[crayon generics ggplot2 magrittr pander pkgconfig rlang tibble]; }; + jtools = derive2 { name="jtools"; version="2.0.3"; sha256="1xnifd77ygvkq73wyfw2ic6x3m00k7jj1rw0q8jf0q29qbpda6an"; depends=[crayon generics ggplot2 magrittr pander pkgconfig rlang tibble]; }; jtrans = derive2 { name="jtrans"; version="0.2.1"; sha256="18zggqdjzjhjwmsmdhl6kf35w9rdajpc2nffag4rs6134gn81i3m"; depends=[]; }; jubilee = derive2 { name="jubilee"; version="0.3.3"; sha256="1j2y44pfx9z2k169lh42b4dnfrrnk8jqsjn3wz4l9iscr6r91lx7"; depends=[data_table dplyr readxl xts yaml zoo]; }; junctions = derive2 { name="junctions"; version="1.1"; sha256="1v5jx4mw6x4q3fivsvidd49b8czzbvv5icj39h6jrpmqvrnc8w32"; depends=[Rcpp]; }; - junr = derive2 { name="junr"; version="0.1.3"; sha256="0wcglpziyi6z4n7w70srziljba3jkb27iqxbxz4kk6774c7valbf"; depends=[httr jsonlite]; }; justifier = derive2 { name="justifier"; version="0.1.0"; sha256="14795pf94bzcnnaf5w0xqzy06vqvs76gdvr1rn4ihqh2az00l6n7"; depends=[data_tree DiagrammeR purrr ufs yum]; }; jvcoords = derive2 { name="jvcoords"; version="1.0.2"; sha256="1mlamzg0qz5l23v2w08imrlbnzc3b3amr6yz5hbaf8vc3k3cff5f"; depends=[]; }; jvnVaR = derive2 { name="jvnVaR"; version="1.0"; sha256="0zh0dc6wqlrxn5r2yv9vkpyfb8xsbdidkjv9g6qr94fyxlbs4yci"; depends=[]; }; @@ -9323,9 +9425,8 @@ in with self; { kStatistics = derive2 { name="kStatistics"; version="1.0"; sha256="1bfxn38lx5yvz65l9kn29wmqjlv80jar3sra6d89rn58l6rszj6n"; depends=[]; }; kableExtra = derive2 { name="kableExtra"; version="1.1.0"; sha256="1nicvw06xsf3a1f5c10mih07b76m2v5s5h165vmz0qx6n1a3492i"; depends=[digest glue htmltools knitr magrittr readr rmarkdown rstudioapi rvest scales stringr viridisLite webshot xml2]; }; kader = derive2 { name="kader"; version="0.0.8"; sha256="15f2swgngw5rdjdsh5kd55wm2nivlfs8pv4mdn0b75qihwgg1zkk"; depends=[]; }; - 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]; }; + kamila = derive2 { name="kamila"; version="0.1.2"; sha256="01rwalv2qigxl3j3jyhrdbxlarwf0xdc8xa6c42sgcl6qpna5vn7"; depends=[abind gtools KernSmooth plyr Rcpp]; }; + kangar00 = derive2 { name="kangar00"; version="1.4"; sha256="0cgyxvgk6bxvh77y9vl0p024dya9ffr9fhmwlcxbysbr4p3kyiaj"; depends=[bigmemory biomaRt CompQuadForm data_table igraph KEGGgraph lattice sqldf]; }; kaos = derive2 { name="kaos"; version="0.1.2"; sha256="0hzzb8ldydl4g3cl1579q8jv835q4cdmn8agafp6qqdhwi1xxw8k"; depends=[ggplot2 reshape2]; }; kaphom = derive2 { name="kaphom"; version="0.3"; sha256="081drgckirc0wv2viyhhnabrlfzi0nkpq6pffw2rxfjyxdsyvnwa"; depends=[]; }; kappaSize = derive2 { name="kappaSize"; version="1.2"; sha256="0lrcyj85zcl73m6bhbzl6rkprrfpfwmm4amyjkg1xsasy5zlwk67"; depends=[]; }; @@ -9348,22 +9449,23 @@ in with self; { kehra = derive2 { name="kehra"; version="0.1"; sha256="1cc0bmbg0dncay50ap7cs2516qngzz3ddaab0jk5r6lwfq87h8qx"; depends=[Hmisc raster reshape2 sp stringr xts zoo]; }; 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.2"; sha256="08p2dv5swp5458n9sx262s330cj8iy86vr6d8989mjzfys2jyb4q"; depends=[equateIRT ltm mirt]; }; + kequate = derive2 { name="kequate"; version="1.6.3"; sha256="1ii3wlypm2qqkfxr3z1sdnmgc43h2zzlw6v4h2xxjdlznzxkp3mr"; depends=[equateIRT ltm mirt]; }; keras = derive2 { name="keras"; version="2.2.5.0"; sha256="14a1mhx95446s8smd4s7adzlmpzx18kqsbgzva4gbya1b48bkw3l"; depends=[generics magrittr R6 reticulate tensorflow tfruns zeallot]; }; kerasR = derive2 { name="kerasR"; version="0.6.1"; sha256="1yi7710vgcwz0jhishbga41sc6qyk83a0avmq01dvqjsz3cdfsfc"; depends=[reticulate]; }; + kerastuneR = derive2 { name="kerastuneR"; version="0.1.0.1"; sha256="09vvs6pbjdniyfip86kbfrfyjzqzvf382sba4c733ww8qgbngv9i"; depends=[data_table dplyr plotly reticulate rjson RJSONIO rstudioapi tensorflow tidyjson]; }; kerdiest = derive2 { name="kerdiest"; version="1.2"; sha256="16xj2br520ls8vw5qksxq9hqlpxlwmxccfk5balwgk5n2yhjs6r3"; depends=[chron date evir]; }; - kergp = derive2 { name="kergp"; version="0.5.0"; sha256="000hs9mi22k0wyafnj5a3vnhfq9la0s159afnd9133bjx0l6q2g7"; depends=[doFuture doParallel lattice MASS nloptr numDeriv Rcpp testthat]; }; + kergp = derive2 { name="kergp"; version="0.5.1"; sha256="16zb7gsbp3bg4kpn7lszw8rn24i40f6jmxcf751vca1f7pfn38pj"; depends=[doFuture doParallel lattice MASS nloptr numDeriv Rcpp testthat]; }; kernDeepStackNet = derive2 { name="kernDeepStackNet"; version="2.0.2"; sha256="04bdggxvggmppp289n2zw6ijdm7y05gws6z7bp6fr8n1zsxy2w3c"; depends=[caret DiceKriging DiceOptim GA GenSA glmnet globalOptTests lhs matrixStats mvtnorm Rcpp RcppEigen]; }; kerndwd = derive2 { name="kerndwd"; version="2.0.2"; sha256="0nf5hyb274gn02n4lygwryv1jaqff77i040bd8gs1xykgvy6jxny"; depends=[]; }; kernelFactory = derive2 { name="kernelFactory"; version="0.3.0"; sha256="001kw9k3ivd4drd4mwqapkkk3f4jgljiaprhg2630hmll064s89j"; depends=[AUC genalg kernlab randomForest]; }; kernelPSI = derive2 { name="kernelPSI"; version="1.1.1"; sha256="1gnp3ixqmijy6xanlc4l8255biwxmlfyhd3y68arry9rzfjkmxpz"; depends=[CompQuadForm kernlab lmtest pracma Rcpp RcppArmadillo]; }; kernelTDA = derive2 { name="kernelTDA"; version="0.1.1"; sha256="0rghj0yx32r6565mb06k83qfmnf7lajdhdg2zf8kjd9jyzidqdrn"; depends=[BH mvtnorm Rcpp RcppEigen Rdpack]; }; - kernelboot = derive2 { name="kernelboot"; version="0.1.6"; sha256="151jksyd316wdlinzikpik9g4x4qnqyl87sg4lbdnzq6w35c5j38"; depends=[future future_apply Rcpp]; }; + kernelboot = derive2 { name="kernelboot"; version="0.1.7"; sha256="1465n9fasyxwm4xx9vajaf5n355z2qdkfzhpp3a6mkv58pydbjss"; depends=[future future_apply Rcpp]; }; kernhaz = derive2 { name="kernhaz"; version="0.1.0"; sha256="1cxwjnfyhxfjdbhs21airycs704jic21pdpsbxsx37wkl11cxpai"; depends=[doParallel foreach GA rgl]; }; kernlab = derive2 { name="kernlab"; version="0.9-29"; sha256="0vqhndl4zm7pvkfvq0f6i9cbrm7pij6kmdp7d7w39pa100x6knn3"; depends=[]; }; kernplus = derive2 { name="kernplus"; version="0.1.2"; sha256="0z5zpj89nw7cdphg6frmjwqjxsl6g95xsa8zgsxmw2q75wwj1saz"; depends=[circular KernSmooth mixtools]; }; kernscr = derive2 { name="kernscr"; version="1.0.5"; sha256="1kcj710q8jbc34g6fcv2nk07hpsb81mfx8hvivgxq8x58028gjzs"; depends=[MASS mvtnorm]; }; - keyholder = derive2 { name="keyholder"; version="0.1.3"; sha256="0r45wd36bf3ir3j3llcy40w6l8440ncvx3c1f6qvb8zgl4bl6z22"; depends=[dplyr rlang tibble]; }; + keyholder = derive2 { name="keyholder"; version="0.1.4"; sha256="1k648a16015qq29msls2s5y5ql9myi1908klih5gj09pf2fr93wq"; depends=[dplyr rlang tibble]; }; keyplayer = derive2 { name="keyplayer"; version="1.0.3"; sha256="0j4n46r9ivkbzqz8g22dq2bpmx7bs05yb5qp27p9jnfh5x19v2ds"; depends=[igraph matpow sna]; }; keypress = derive2 { name="keypress"; version="1.2.0"; sha256="19l33519f726i3q20y34v1aavrn4fpj3zn5caij3l9q2asw2kqk2"; depends=[]; }; keyring = derive2 { name="keyring"; version="1.1.0"; sha256="1hpfd4hbx43i39l995rg86kfxi7wlyla1gv8mwcdr4xx7z122zzq"; depends=[assertthat filelock getPass openssl R6 rappdirs sodium yaml]; }; @@ -9373,11 +9475,11 @@ in with self; { kgc = derive2 { name="kgc"; version="1.0.0.2"; sha256="14zbcimnglh5jj07dcaxp1dfjaz8syswy29nf8z39qmslv1hg9kk"; depends=[plyr shiny shinythemes]; }; kgschart = derive2 { name="kgschart"; version="1.3.5"; sha256="1gdsrmnv8z99cldvig7grlq8gsbv3wpx7zdamw85lz563n4ln94d"; depends=[abind deepnet ggplot2 gridExtra magrittr matrixStats nnet png shiny stringr]; }; khroma = derive2 { name="khroma"; version="1.3.0"; sha256="1bpap5ljnsjwj0d6r90zhxvgs87j6v2pwxxd6ny14jzn402f1zp8"; depends=[]; }; - kidney_epi = derive2 { name="kidney.epi"; version="1.1.0"; sha256="191yrqdviwvfl62c62qqfa154hglxpfwcxllhgwlm8nsysg46z5i"; depends=[]; }; + kidney_epi = derive2 { name="kidney.epi"; version="1.2.0"; sha256="1hd6w7kxim5slmmqalf5sfjg8jcvhyzn5g4gf6h0lmaprsfszhja"; depends=[]; }; kimisc = derive2 { name="kimisc"; version="0.4"; sha256="0nbjspbq9akhmamfdn192p5b6ki7xqhp422ih6v77xsnrhl5m24z"; depends=[memoise plyr pryr]; }; kin_cohort = derive2 { name="kin.cohort"; version="0.7"; sha256="0wijsjz0piz5j9rm2nr3d5dfpiyba740mbfbkmfll9pz72s58wz8"; depends=[survival]; }; kineticF = derive2 { name="kineticF"; version="1.0"; sha256="1k54zikgva9fw9c4vhkc9b0kv8sq5pmc962s8wxr6qv97liv9p46"; depends=[circular lqmm MASS plotrix sp splancs]; }; - kinship2 = derive2 { name="kinship2"; version="1.8.4"; sha256="18qljqzdv2pc8i3lp6y68ifsqkh3j7gd2bq773myadarapnm7n1k"; depends=[Matrix quadprog]; }; + kinship2 = derive2 { name="kinship2"; version="1.8.5"; sha256="1mhnb805l1q5n4nf1gqb0jw8nbpg1yc0l1c61k3zr7mdrjv2dhkj"; depends=[Matrix quadprog]; }; kirby21_base = derive2 { name="kirby21.base"; version="1.7.0"; sha256="0drm9h1f91yb75v9jzcaysj2cijcana949xvq8bgkqklmf9zwfl5"; depends=[git2r]; }; kirby21_fmri = derive2 { name="kirby21.fmri"; version="1.7.0"; sha256="1z2l6bn53mwkll9ki4169lqlz6wcfp29xzdrqyw606j2xrs4wc22"; depends=[kirby21_base]; }; kirby21_t1 = derive2 { name="kirby21.t1"; version="1.7.0"; sha256="0bv8rrk9jh02h3gill1g2w246j4zv98cjchz7i2c092lvqps8szs"; depends=[kirby21_base]; }; @@ -9385,12 +9487,13 @@ in with self; { kitagawa = derive2 { name="kitagawa"; version="2.2-2"; sha256="0hl2l42jz4wkcx94cqycw8zb3ffg72fp2f310sh5icrcnyw43bmp"; depends=[kelvin]; }; kiwisR = derive2 { name="kiwisR"; version="0.1.8"; sha256="0nncb1xvic0gmj4gllsk1lgwsizlq3vsnifjcf4dp716iik0h0sr"; depends=[dplyr httr jsonlite lubridate purrr tibble]; }; kknn = derive2 { name="kknn"; version="1.3.1"; sha256="1nzkg3dxaiqp87p56wm895qx5xn86hv5hjr73qvl1yiaxiq0x112"; depends=[igraph Matrix]; }; - klaR = derive2 { name="klaR"; version="0.6-14"; sha256="1g995df6286sd64nw7q9bihzkqhrasks45n8xk678y57kcadksai"; depends=[combinat MASS questionr]; }; + klaR = derive2 { name="klaR"; version="0.6-15"; sha256="1bhgkq6spjawy5lsh663rnby4fzrx4k2qwqp4ci4p9pq8g35pzjv"; depends=[combinat MASS questionr]; }; klassR = derive2 { name="klassR"; version="0.1.2"; sha256="1wfgqy4pfbaikm0qqf6dirjw0imbl6si9i0nwn8l17i7c8g8g55s"; depends=[httr jsonlite tm]; }; klausuR = derive2 { name="klausuR"; version="0.12-10"; sha256="12fjs4dnwaki8sz718xgsg8qrqhsgf87cs0bylf0p3f5k8hrmk4b"; depends=[polycor psychometric xtable]; }; + klic = derive2 { name="klic"; version="1.0.2"; sha256="1fwzm6cn9jx1xi2ffn21nq6h3i46saiawjk5kdhwwjp8vy83krys"; depends=[cluster coca gplots Matrix pheatmap RColorBrewer wesanderson]; }; klustR = derive2 { name="klustR"; version="0.1.0"; sha256="1g2q6h3cbm8v3gqz0f6v8bl5na9972k38d94czjfxmx4cv7wfgx8"; depends=[htmlwidgets jsonlite]; }; km_ci = derive2 { name="km.ci"; version="0.5-2"; sha256="1l6kw8jppaa1802yc5pbfwwgac56nhwc9p076ivylhms4w7cdf8v"; depends=[survival]; }; - kmc = derive2 { name="kmc"; version="0.2-3"; sha256="0r1zm8r51zijv67d0dri7mg5z5ihy7h1n16kpf7ap9ravkc8zbik"; depends=[emplik Rcpp rootSolve]; }; + kmc = derive2 { name="kmc"; version="0.2-4"; sha256="0y8bdgdxsz53fiqc2yr39agndxs4zxj7mmplj273map9k0slnnqk"; depends=[emplik Rcpp rootSolve]; }; kmconfband = derive2 { name="kmconfband"; version="0.1"; sha256="10n5w8k57faqcclwshs4m66i2i5b70i6f3xq5nqlgsi2ldkysbc9"; depends=[survival]; }; kmcudaR = derive2 { name="kmcudaR"; version="1.1.0"; sha256="16dkv9ag5375zc23nqakbg7v6knxvh1pips9rjsls0d7rw2bg1bs"; depends=[Rcpp RcppEigen]; }; kmeRs = derive2 { name="kmeRs"; version="1.1.0"; sha256="1wafa9wgqlwrk6jwmbn34n3rmvbc9s6s235z8mscbqgw67snwcq6"; depends=[Biostrings rDNAse tcR]; }; @@ -9404,37 +9507,36 @@ in with self; { kmodR = derive2 { name="kmodR"; version="0.1.0"; sha256="1y1pqrrralklflyb1dw8bslfcyqrw8ryijfbhkwba7ykpxcf9fda"; depends=[]; }; knitLatex = derive2 { name="knitLatex"; version="0.9.0"; sha256="1igacc2sx8897wmnhh8kngd0fq6zqbi30chy5c8jw60zc38mi3wi"; depends=[knitr]; }; knitcitations = derive2 { name="knitcitations"; version="1.0.10"; sha256="0d73qr1zhkx0255vzzf7fs8vpmfnzl91ni4zp5y0l42h8p98vdn5"; depends=[digest httr RefManageR]; }; - knitr = derive2 { name="knitr"; version="1.27"; sha256="02nysgnx6xv0kd351s1d59yx4g0drsd9lmcgxs0rsw5f1jiycgdg"; depends=[evaluate highr markdown stringr xfun yaml]; }; + knitr = derive2 { name="knitr"; version="1.28"; sha256="0ai382fmpz25qrhdgchs3vph2cdvyd73xyryg4jby5fp67d03vh5"; depends=[evaluate highr markdown stringr xfun yaml]; }; knitrBootstrap = derive2 { name="knitrBootstrap"; version="1.0.2"; sha256="1aj60j7f0gcs120fdrnfbnb7vk7lfn1phil0mghg6a5zldz4cqs3"; depends=[knitr markdown rmarkdown]; }; knitrProgressBar = derive2 { name="knitrProgressBar"; version="1.1.0"; sha256="18v5jrscfrin3mcs63bpj0q1drxk3zkhlbw93sqh0qrq04d4x02v"; depends=[R_oo R6]; }; knn_covertree = derive2 { name="knn.covertree"; version="1.0"; sha256="0msfcmwydws7q7m5jdb0dxab0nkbl7mq5llg6v3r4qrnlvrdggvz"; depends=[Matrix Rcpp RcppEigen]; }; knnGarden = derive2 { name="knnGarden"; version="1.0.1"; sha256="1gmhgr42l6pvc6pzlq5khrlh080795b0v1l5xf956g2ckgk5r8m1"; depends=[cluster]; }; knnIndep = derive2 { name="knnIndep"; version="2.0"; sha256="1fwkldgs2994svf3sj90pwsfx6r22cwwa22b30hdmd24l8v9kzn7"; depends=[]; }; - knncat = derive2 { name="knncat"; version="1.2.2"; sha256="1d392910y3yy46j8my1a7m0xkij2rc6vwq5fg22qk00vqli8drz2"; depends=[]; }; knnp = derive2 { name="knnp"; version="2.0.0"; sha256="0qgq8la3zndlb1wwqv9b2kw52y9ns36pi4ds68pkm81bhzq5nqis"; depends=[doParallel foreach forecast parallelDist plyr]; }; knockoff = derive2 { name="knockoff"; version="0.3.2"; sha256="1ky69f3hwwgy2il097mx0z7aakxsq692g9ink8z8cb4wnrp4bk07"; depends=[corpcor glmnet gtools Matrix Rdsdp RSpectra]; }; knor = derive2 { name="knor"; version="0.0-7"; sha256="1xxv210sjj9w06pf36q7haz9fkqdc17jyqdsiqsxj3q8zj585qfc"; depends=[Rcpp]; }; knotR = derive2 { name="knotR"; version="1.0-2"; sha256="0kd1b9wibpwyaanz9ny61qgfvcg4d3rzpy05sfshlpp0b1y8d3xj"; depends=[]; }; - kntnr = derive2 { name="kntnr"; version="0.4.2"; sha256="0y2is6ww13dzkm9p7wl8n5rmbcx4qlnzhbidc1h6bg75r5anpphq"; depends=[base64enc dplyr httr jsonlite lubridate purrr rlang rstudioapi stringr tibble tidyr]; }; + kntnr = derive2 { name="kntnr"; version="0.4.3"; sha256="1hr4c6yr2ddi69fpnmppmwn2hyc593gk8hc0p7qky5cdlllvqgbd"; depends=[base64enc dplyr httr jsonlite lubridate purrr rlang rstudioapi stringr tibble tidyr]; }; koRpus = derive2 { name="koRpus"; version="0.11-5"; sha256="053882fnz6c7yjiz72jg6sawd9q57h110nd4yjay65piadi9mci5"; depends=[data_table sylly]; }; koRpus_lang_en = derive2 { name="koRpus.lang.en"; version="0.1-3"; sha256="013zxm5x5hwdx1hqgb7mh3zmn8dri3fhq1brmzg936gddhxap6is"; depends=[koRpus sylly_en]; }; - kofdata = derive2 { name="kofdata"; version="0.1.3.3"; sha256="08rmqm8z1xqf2kdjrxlj90v2fc2cqj43yynm1k46vmcs9m224y9k"; depends=[httr jsonlite xts zoo]; }; + kofdata = derive2 { name="kofdata"; version="0.1.3.4"; sha256="036d3mvhdlpaisms3vg6v35lvy48w8yld7mz3rdd3dw6bszzrg5k"; depends=[httr jsonlite xts zoo]; }; kofnGA = derive2 { name="kofnGA"; version="1.3"; sha256="0w0881ydnqdah04sifi25ypzxdwnsiqxfq1xam4yhr670bdak1vm"; depends=[bigmemory]; }; kohonen = derive2 { name="kohonen"; version="3.0.10"; sha256="1ck7j13x701g67bx81x7plszz804jfhl1yg42krcj9x88vm5cscr"; depends=[Rcpp]; }; kokudosuuchi = derive2 { name="kokudosuuchi"; version="0.4.2"; sha256="1nwydfyr9waa5h8h8nrmwxy0jx7i4893g5khfv6b4g09z6g5cyly"; depends=[curl dplyr glue httr purrr rlang sf shiny stringr tibble xml2]; }; kolmim = derive2 { name="kolmim"; version="1.0"; sha256="0g1i0cazi4nhfwdd3ywqrar1sn7bw77w38qjii045w5vqg05srkp"; depends=[]; }; komaletter = derive2 { name="komaletter"; version="0.3.2"; sha256="0gw86j9fvklz2x9hcl4h3kxjjki5fagmh2dskkpvabmgpk3725z1"; depends=[rmarkdown]; }; - konfound = derive2 { name="konfound"; version="0.1.2"; sha256="1sza54hvg16jxrl37zmsrqvdlxjqhyd0kaxpb9fqd7rkbjqdp0m2"; depends=[broom dplyr ggplot2 margins pbkrtest purrr rlang tidyr]; }; + konfound = derive2 { name="konfound"; version="0.2.1"; sha256="16c7wqifcsr4rmx6gi1n1lhmmn183gmgmqnvy9lc71vz6b8w31xq"; depends=[broom crayon dplyr ggplot2 mice purrr rlang tidyr]; }; kosel = derive2 { name="kosel"; version="0.0.1"; sha256="1gdsy4i58byqxddpsm5nk1r3hlgik5gs2b8jqcm8n1r4ib6pg0ay"; depends=[glmnet ordinalNet]; }; kpcalg = derive2 { name="kpcalg"; version="1.0.1"; sha256="1gd5bisyfwb12l9jmwhi2arlxrabc01vgv4m1qqs23vybsd6yh52"; depends=[energy graph kernlab mgcv pcalg RSpectra]; }; - kpeaks = derive2 { name="kpeaks"; version="0.1.0"; sha256="1qxpncwyshv35h1190py6a69mljabfcjjs7v17a2rb5asahy3rk8"; depends=[]; }; + kpeaks = derive2 { name="kpeaks"; version="1.1.0"; sha256="057xfqn08lqczgrj1r63d7vbncg24x9va9lnk8c47nwzl1x8aphd"; depends=[]; }; kpmt = derive2 { name="kpmt"; version="0.1.0"; sha256="15d26khc0v3kc1c7l1avqp48pfqmc6xj32029mv7myivr41ashk3"; depends=[matrixStats]; }; kpodclustr = derive2 { name="kpodclustr"; version="1.0"; sha256="1fywgdj4q3kg8y9lwnj6vxg9cwgs5ccwj6m3knfgg92f8ghnsbsw"; depends=[clues]; }; kriens = derive2 { name="kriens"; version="0.1"; sha256="1qi65k9fsbbkbw0w40rv60p5ygrvr10rmlyxdaqa5bdpcmrbly5z"; depends=[]; }; - krige = derive2 { name="krige"; version="0.3-1"; sha256="1dxn9prl79ln0m5dlwh62m553lrah1w1kwix02xafhiawl4rxp40"; depends=[MASS mvtnorm]; }; + krige = derive2 { name="krige"; version="0.4.1"; sha256="1mpg1zqabgpi4f4dfnmlpdhs8hnc560sdpp41k4whjnbhqg9flxd"; depends=[invgamma MASS mvtnorm]; }; kriging = derive2 { name="kriging"; version="1.1"; sha256="04bxr34grf2nlrwvgrlh84pz7yi0r8y7dc2wk0v5h5z6yf5a085w"; depends=[]; }; krm = derive2 { name="krm"; version="2019.12-11"; sha256="1dzgvj30bjq4af0470hyxad6bf1y676wk789gqf8rgfwywkk8rr6"; depends=[kyotil]; }; - ks = derive2 { name="ks"; version="1.11.6"; sha256="0hcccjfqnzdxkmnfzq8c5a7yhc138azwyl7rp29d1vl1jawwrwfq"; depends=[FNN kernlab KernSmooth Matrix mclust mgcv multicool mvtnorm]; }; + ks = derive2 { name="ks"; version="1.11.7"; sha256="1f6jvxy0hmngyvnvrknzbmhl42njk0vqyycvydm4qnp8cqirqvba"; depends=[FNN kernlab KernSmooth Matrix mclust mgcv multicool mvtnorm]; }; ksNN = derive2 { name="ksNN"; version="0.1.2"; sha256="06x471hck95xqy7rbh53ibhzh6kfjra7y9ipqdj2rqdkmfdj72q8"; depends=[Rcpp]; }; kselection = derive2 { name="kselection"; version="0.2.0"; sha256="1arg96r2pldvb89rfqnfpjxwksyac2mhmbimbkwzm7wrnbnrcn5d"; depends=[]; }; ksharp = derive2 { name="ksharp"; version="0.1.0.1"; sha256="1dnkj838y8c1b53mlljhjqs3nd864i9xcqsv9n4fw28b4br9m570"; depends=[]; }; @@ -9445,35 +9547,35 @@ in with self; { ktaucenters = derive2 { name="ktaucenters"; version="0.1.0"; sha256="15ddjr4c90b5hc4977gk35zb2kswrcvai3xighy7qj6g9lgiszgf"; depends=[dbscan dplyr GSE MASS]; }; ktsolve = derive2 { name="ktsolve"; version="1.2"; sha256="1606b9anlqjwcbf3jp1rpwzvyx94k79q6zw3p9j0a4nxdvgxlx1j"; depends=[BB nleqslv rootSolve]; }; ktspair = derive2 { name="ktspair"; version="1.0"; sha256="1v63982jidxlcf2syahcb29myv34kc790l7lwyfxx9l50ssb812n"; depends=[Biobase]; }; - kubik = derive2 { name="kubik"; version="0.1.2"; sha256="1cjr8vcvjgy425sgr23cl2xrsz9smgil4lkkzm94b8g5rwyk731g"; depends=[intoo]; }; + kubik = derive2 { name="kubik"; version="0.2.0"; sha256="1f5v88pfm9szkshbnkkd0pdphqwrbblfmmys7j8k60y919lwgv0z"; depends=[]; }; kuiper_2samp = derive2 { name="kuiper.2samp"; version="1.0"; sha256="0gcgayh7qdic9zprdvs6r8qvpqs467zrm0qzp2acb7alcp01jhpi"; depends=[]; }; kulife = derive2 { name="kulife"; version="0.1-14"; sha256="070ayy6fr9nsncjjljikn2i5sp2cx3xjjqyc64y2992yx74jgvvd"; depends=[]; }; kutils = derive2 { name="kutils"; version="1.69"; sha256="12pg26a85h0jxlfcyai68dbh4bq1gnq8v1ngi8k9qvafbrpc6gx8"; depends=[foreign lavaan openxlsx plyr RUnit xtable]; }; kvh = derive2 { name="kvh"; version="1.4.1"; sha256="0hnqlybphx8qnx98ynykxpz4ys4prp9zbmkak02qlvmnxwc2cqg0"; depends=[Rcpp]; }; kwb_hantush = derive2 { name="kwb.hantush"; version="0.3.0"; sha256="1rlm7i95yw66asgkag93phig2y9lic4xl2fv3cbnr3v751f6a59m"; depends=[hydroGOF lattice]; }; kyotil = derive2 { name="kyotil"; version="2019.11-22"; sha256="13ihijshgzi3lg07p24yzyxjsrfy9nsf6r5vcssz19y9w26scaj2"; depends=[]; }; - kza = derive2 { name="kza"; version="4.1.0"; sha256="128r4xmqxy1i1svcmv8786qqmriyqygd8d49cp53x8gb56k011xa"; depends=[]; }; + kza = derive2 { name="kza"; version="4.1.0.1"; sha256="1vx7wc8iwmr9d6ff2kcy6y3nyfj6jfzv4hxkv1fsas0rbjgfick4"; depends=[]; }; kzfs = derive2 { name="kzfs"; version="1.5.0.2"; sha256="0x0fc807p0pwsjkhjq51ymwr9nhs6cb0m82029cz8bbn3yf6cymq"; depends=[digest kzft]; }; kzft = derive2 { name="kzft"; version="0.17"; sha256="1y6almhs1x21cr4bbf5fj3mnhp65ivzs869660cyg70sva853sv7"; depends=[polynom]; }; kzs = derive2 { name="kzs"; version="1.4"; sha256="1srffwfg0ps8zx0c6hs2rc2y2p01qjl5g1ypqsbhq88vkcppx1w9"; depends=[lattice]; }; - l0ara = derive2 { name="l0ara"; version="0.1.5"; sha256="15qajzpvqnikg9k199cqvwp9qbrxx4zr9lsvyad96pa9qr156gvb"; depends=[Rcpp RcppArmadillo]; }; + l0ara = derive2 { name="l0ara"; version="0.1.6"; sha256="1cv48rbq080z7zx32hmlkpq7mi5axr09a1hyv3knl1vb9gql4qjq"; depends=[Rcpp RcppArmadillo]; }; l1kdeconv = derive2 { name="l1kdeconv"; version="1.2.0"; sha256="1mk92sz9nsmxsn7yplhfcz07k022lrr61114ckrmm0x8hfd89zj8"; depends=[ggplot2 mixtools]; }; l2boost = derive2 { name="l2boost"; version="1.0.1"; sha256="0f2gapzpvjnr8n1jgn60jpmcas4s8nk2q8q4k5v4ypwvpfqp7kk1"; depends=[MASS]; }; laGP = derive2 { name="laGP"; version="1.5-5"; sha256="1a269cy9qmjldb5hv1nl9naq1rr35z37xjpp4kannj6p560fm476"; depends=[tgp]; }; labdsv = derive2 { name="labdsv"; version="2.0-1"; sha256="099rzl9hy70rmb5fg0vx26mlhr4ra2s0hl3jgv22s8hqpvlmakas"; depends=[cluster MASS mgcv Rtsne]; }; label_switching = derive2 { name="label.switching"; version="1.8"; sha256="0xwwhn249aibip12yxjwlrpyqj6zvc95zc7n9jf2vjjpashyc3yk"; depends=[combinat lpSolve]; }; - labelVector = derive2 { name="labelVector"; version="0.1.0"; sha256="08ydgmvks09hbln10zmqxv9hxgiha0n9w5cgych9bnkqdca74gah"; depends=[]; }; + labelVector = derive2 { name="labelVector"; version="0.1.1"; sha256="156066jbsmqal1q4xwwkyrqfzq0as6r2add0x240y21zak6i8x9q"; depends=[]; }; labeledLoop = derive2 { name="labeledLoop"; version="0.1"; sha256="0gq392h0sab8k7k8bzx6m7z5xpdsflldhwbpdf92zbmkbzxsz00m"; depends=[]; }; labeling = derive2 { name="labeling"; version="0.3"; sha256="13sk7zrrrzry6ky1bp8mmnzcl9jhvkig8j4id9nny7z993mnk00d"; depends=[]; }; - labelled = derive2 { name="labelled"; version="2.2.1"; sha256="1mrpsayrar5m3w2s7ck3m5x62bcns1jhyc6jw12b3bdca251v1ai"; depends=[dplyr haven]; }; + labelled = derive2 { name="labelled"; version="2.2.2"; sha256="1hs83kb0z9ri7q1lpxczf65prf2kgpp7ljb7d5dx9bffqdy1j5h6"; depends=[dplyr haven]; }; labelmachine = derive2 { name="labelmachine"; version="1.0.0"; sha256="18l7argmf7d60cv34w7acjg4bk08nhi2cc5p61sx2zmq28v8nndr"; depends=[yaml]; }; labelrank = derive2 { name="labelrank"; version="0.1"; sha256="03pmpkjdhgw80473kdzdz4s4828pa8f5bja2zqicxrhvyvicvz6f"; depends=[pdist]; }; labstatR = derive2 { name="labstatR"; version="1.0.9"; sha256="1ysk23dwan1lsfwnf9v86yqyzc8wsgzmy18ycz34s4d9biq6y1zd"; depends=[]; }; labstats = derive2 { name="labstats"; version="1.0.1"; sha256="1780slp9l1rqwr5ika6hv606jzbaa3g1ywzkjkd3ff2gb0cby3ni"; depends=[]; }; - lacm = derive2 { name="lacm"; version="0.0.3"; sha256="0qhvffiw2bcpnv6l4y4h12ss59yc2j0hwsg2nr4a7w4nh6yk9fwc"; depends=[numDeriv statmod]; }; + lacm = derive2 { name="lacm"; version="0.1.0"; sha256="0nlk9fzpbz55zzjizlwnsgfj9ik4zfq1s7b68yw1nndaq47lpljy"; depends=[numDeriv statmod]; }; lactcurves = derive2 { name="lactcurves"; version="1.0.0"; sha256="06dj8ajg6ndnyakywy16wbqjjr2jkidvnjv33vxcacwijympaqqy"; depends=[orthopolynom]; }; - lacunaritycovariance = derive2 { name="lacunaritycovariance"; version="1.0-8"; sha256="1dya5jbrr76p20k37v07g8wck8vrdr2j3r04pqhmwq6i7h0w2c30"; depends=[RcppRoll spatstat]; }; - laeken = derive2 { name="laeken"; version="0.5.0"; sha256="1g9r3y7b0gl91hijk9awa8rjk97mqpkxinzq2cgmx0m38ng9ylpa"; depends=[boot MASS]; }; + lacunaritycovariance = derive2 { name="lacunaritycovariance"; version="1.0-13"; sha256="041vldak0s24hci4fm2k1vwm5nvv1nxld94psiaz1v1fh4k781jm"; depends=[RcppRoll spatstat]; }; + laeken = derive2 { name="laeken"; version="0.5.1"; sha256="199rjkhjjygpr6cjzab87as46acb5npi44m4yycvk7lnd0blma8s"; depends=[boot MASS]; }; laercio = derive2 { name="laercio"; version="1.0-1"; sha256="0la6fxv5k9zq4pyn8dxjiayx3vs9ksm9c6qg4mnyr9vs12z53imm"; depends=[]; }; lagged = derive2 { name="lagged"; version="0.3-0"; sha256="0bm3d6pgb25rw1njarki60j4d7mx7rni25a21iw1l650slg7sscm"; depends=[]; }; lagsarlmtree = derive2 { name="lagsarlmtree"; version="1.0-1"; sha256="1v3a580scxb1v5na3ab3ax9qlzbnay7nhm3ln5l8f9zgsqrg5lyh"; depends=[Formula partykit spatialreg]; }; @@ -9488,12 +9590,13 @@ in with self; { landsat = derive2 { name="landsat"; version="1.1.0"; sha256="15ymmwhkgw0lqyy2sryss3nsmkrjf4cc0bzlsr41vh5c2636srfd"; depends=[lmodel2 mgcv rgdal sp]; }; landsat8 = derive2 { name="landsat8"; version="0.1-10"; sha256="169b5ka98ka9chbmksz6syaygc9wgl8i2gz1h2xkxj3lk9jcg01r"; depends=[rgdal sp]; }; landscapeR = derive2 { name="landscapeR"; version="1.2"; sha256="1zm5mj861ycbc2m28yjqnkifx8grc4l718mf8r422m78jfakvcjy"; depends=[raster Rcpp]; }; - landscapemetrics = derive2 { name="landscapemetrics"; version="1.4.2"; sha256="04hv1v4nzvsnvhl1sdsvi4ga6kajj5qipyxyqw4y9ps3h1iw1c41"; depends=[cli ggplot2 raster Rcpp RcppArmadillo sp tibble]; }; + landscapemetrics = derive2 { name="landscapemetrics"; version="1.4.3"; sha256="1yy9n4dg8q9r7h34rc40idqmvrgnd06fj95jcs6fwfdqnq78mc2j"; depends=[cli ggplot2 raster Rcpp RcppArmadillo sp tibble]; }; landscapetools = derive2 { name="landscapetools"; version="0.5.0"; sha256="11zp6r414nkj8vhsbryzhkxmpal2bva8msaxf1v69xax70ilxyf1"; depends=[ggplot2 raster Rcpp tibble]; }; landsepi = derive2 { name="landsepi"; version="0.0.8"; sha256="0k2hkrj0r3hx5jvmgx852s030md3cqhm7yixl0xxlkxwqrylw7qc"; 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.3.3"; sha256="16x5a63x49xzgh32sqxfriabax45ng01vmr5i1srp30am55sxa18"; depends=[callr collections desc jsonlite lintr R6 readr repr stringr styler xml2 xmlparsedata]; }; + languageserver = derive2 { name="languageserver"; version="0.3.5"; sha256="04i7pasvj2varq3khk6w0z1liwnwfr648gwvqz9qs7gkyknydp4y"; depends=[callr collections desc fs jsonlite lintr R6 repr stringi styler xml2 xmlparsedata]; }; + languageserversetup = derive2 { name="languageserversetup"; version="0.1.1"; sha256="07vwfgdw79zcr8wlmzs4b5mqmd7fa2ja76vpyjvlf07ifg7x82jw"; depends=[]; }; 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=[]; }; @@ -9503,18 +9606,17 @@ in with self; { lassopv = derive2 { name="lassopv"; version="0.2.0"; sha256="0yawnjw063jypk3riy9xab9cmliv6c9dnabi18670khd3gzb2r9z"; depends=[lars]; }; lassoscore = derive2 { name="lassoscore"; version="0.6"; sha256="1i3i07da8sw9w47rcflhylz8zxvzkyycbc1a4gf6hbcpp21rqd7d"; depends=[glasso glmnet Matrix]; }; lassoshooting = derive2 { name="lassoshooting"; version="0.1.5-1"; sha256="0ixjw8akplcfbzwyry9p4bhbcm128yghz2bjf9yr8np6qrn5ym22"; depends=[]; }; - latdiag = derive2 { name="latdiag"; version="0.2-4"; sha256="051chvky3hlfr4hwm9qickl6aaxwnxa88zksmzczqfspby771hq6"; depends=[]; }; - latentnet = derive2 { name="latentnet"; version="2.10.1"; sha256="1xabby9b5idbs2q04shg05sw26mnrvc3dsngcdrcz7s2crz9mr57"; depends=[abind coda ergm MASS mvtnorm network sna statnet_common]; }; + latdiag = derive2 { name="latdiag"; version="0.3"; sha256="13wk8vhiwr9drcx5f4wlgbin6hc83zv54yr4h3qhjagm3hxcxbw0"; depends=[Rdpack]; }; + latentnet = derive2 { name="latentnet"; version="2.10.5"; sha256="05yjf7a16imv1p2lg5dmfk183xll49crnkg0mbz4c4b39nksy85v"; depends=[abind coda ergm MASS mvtnorm network sna statnet_common]; }; later = derive2 { name="later"; version="1.0.0"; sha256="11xjavj7siz0xv2ffq1ld4bwl35jyrcfpvvs4p3ilpifxx49hyr7"; 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]; }; + lattice = derive2 { name="lattice"; version="0.20-41"; sha256="1dapkmh4jlb9sxfrpvapvlfhczl4s8p3r20bn47gcgdk1izmbjjl"; depends=[]; }; latticeExtra = derive2 { name="latticeExtra"; version="0.6-29"; sha256="04fzwcqs594rk5qp98yilh3kdh3sw4xf8wld5rp94ggpaqfw7bbc"; depends=[jpeg lattice png RColorBrewer]; }; - lava = derive2 { name="lava"; version="1.6.6"; sha256="0nfab5fgnmxh8cplg8rd8cp34fny5j0k5wn4baj51r6ck7fq9g3s"; depends=[numDeriv SQUAREM survival]; }; + lava = derive2 { name="lava"; version="1.6.7"; sha256="0ffzxbb8pvfh1m6j61az4ga37snyhylq2941fyc76w7w9i2sixv3"; depends=[numDeriv SQUAREM survival]; }; lava_tobit = derive2 { name="lava.tobit"; version="0.5"; sha256="15dlcjgnvrpdxymcwf4rvk72ssr650dy1ayp50zlrp2va0p6h4kw"; depends=[lava mets mvtnorm survival]; }; - lavaSearch2 = derive2 { name="lavaSearch2"; version="1.5.4"; sha256="0zq5i568pd0xwjbxwi0ndhmjxglyd9y2x8yfvnrmg3pq1wxqys6h"; depends=[doParallel ggplot2 lava MASS Matrix multcomp mvtnorm nlme Rcpp RcppArmadillo reshape2 sandwich]; }; + lavaSearch2 = derive2 { name="lavaSearch2"; version="1.5.5"; sha256="1rb330dzmknrgy2fzbgr76js1izd635sj3jxb7bmm4rfg2z09r6n"; depends=[doParallel ggplot2 lava MASS Matrix multcomp mvtnorm nlme Rcpp RcppArmadillo reshape2 sandwich]; }; lavaan = derive2 { name="lavaan"; version="0.6-5"; sha256="04kvsh2m6mnzlhv83phr3hjzy4sx1ck6f7dgsm7xb8cs84dnxszy"; 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]; }; @@ -9529,27 +9631,29 @@ in with self; { lazyraster = derive2 { name="lazyraster"; version="0.5.0"; sha256="0zf9xlxyzmgxy1nl2kg7fvpfamjz04gf4yxjn3r9j7fjkik35cnp"; depends=[quadmesh raster vapour]; }; 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]; }; - lazytrade = derive2 { name="lazytrade"; version="0.3.9"; sha256="1lms83qf0vpflszxjzpxrsr7991lkzqr1ch9ivx70anjaaijgql3"; depends=[dplyr ggplot2 h2o lubridate magrittr openssl readr ReinforcementLearning stringr]; }; + lazytrade = derive2 { name="lazytrade"; version="0.3.10"; sha256="1m8wv5ii4inqw45nzqfqyrhzajr37mk9v4h8vxvy0ya00cibs9hb"; depends=[dplyr ggplot2 h2o lubridate magrittr openssl readr ReinforcementLearning stringr]; }; lba = derive2 { name="lba"; version="2.4.4"; sha256="0izqndm992zv3sg8v5lpnxbdbxhpxl6hq3bf6xgq3pnw8vl3f6nb"; depends=[alabama MASS plotrix rgl scatterplot3d]; }; lbfgs = derive2 { name="lbfgs"; version="1.2.1"; sha256="0p99g4f3f63vhsw0s1m0y241is9lfqma86p26pvja1szlapz3jf5"; depends=[Rcpp]; }; lbfgsb3 = derive2 { name="lbfgsb3"; version="2015-2.13.1"; sha256="15g465dy4izybmgmbgzmiyaxdfa6l1mcvyh6rc3hgapnlmnvb66m"; depends=[numDeriv]; }; - lbfgsb3c = derive2 { name="lbfgsb3c"; version="2019-11.26"; sha256="1wp4vhagh1pvvg6v7gayj7ljicipaa3jz4wbnml4fnzpwzp0irgv"; depends=[numDeriv Rcpp RcppArmadillo]; }; + lbfgsb3c = derive2 { name="lbfgsb3c"; version="2020-3.2"; sha256="07mhiaxhjjma5c65z3pz7wchgsqn4b19labzyq25ncnmj319fxrg"; depends=[numDeriv Rcpp RcppArmadillo]; }; lbiassurv = derive2 { name="lbiassurv"; version="1.1"; sha256="1i6l3y4rasqpqka7j39qjx22wjbilgc9pkp05an52aysfvfxy193"; depends=[actuar]; }; lbreg = derive2 { name="lbreg"; version="1.3"; sha256="1z9vixf6sl0k9lizngc3859lk32srkk1d8y133sl6s37ppmqb4s2"; depends=[MASS]; }; - lcc = derive2 { name="lcc"; version="1.0.3"; sha256="0jvih9j6r8q26m3rjzng6sn2l41n5hgfsg2w298ac1v6asv3a1kn"; depends=[gdata ggplot2 gridExtra hnp nlme]; }; + lcars = derive2 { name="lcars"; version="0.3.1"; sha256="14h6p4cbvx586zmaw480cy8gnjc6w7081dps9imvmf5lwcag66mb"; depends=[ggplot2 shiny trekcolors]; }; + lcc = derive2 { name="lcc"; version="1.0.4"; sha256="1g4j4m21jpxphw264kdnxnqnqlp29asc5h5qziqcbxdgmly087ns"; depends=[gdata ggplot2 gridExtra hnp nlme]; }; lcda = derive2 { name="lcda"; version="0.3"; sha256="1ximsyn6qw2gfn7b1hdpbjs6h6nk7hrignlii0np1lbf0k8l4xxl"; depends=[poLCA]; }; + lchemix = derive2 { name="lchemix"; version="0.1.0"; sha256="1g2w57fi6kvsyir14hnxh0v6xwjdnbisafvjxvn1g6a4h55dg9i0"; depends=[MCMCpack mvtnorm]; }; lclGWAS = derive2 { name="lclGWAS"; version="1.0.3"; sha256="03b6ijqvyirv96hc3dsqf4f0zzqlmq5451mcb14d2mw3s6xy1vmq"; depends=[BH Rcpp]; }; lcmm = derive2 { name="lcmm"; version="1.8.1"; sha256="1n7g4m8r8n2zi53ah35gn0nx666fh6brbysgbsyb2yv4hjrf5v08"; depends=[survival]; }; lconnect = derive2 { name="lconnect"; version="0.1.0"; sha256="0wk1kx0awj6d9w4sn0csws0sksx9cb4b4l9xpjqnyavc4zfhxj8l"; depends=[igraph sf]; }; lcopula = derive2 { name="lcopula"; version="1.0.4"; sha256="11rjymm4zj3brifzrrfwqv9v8rzkzqk072xlzyjxm2p08dd11xxb"; depends=[copula pcaPP Rcpp]; }; lcpm = derive2 { name="lcpm"; version="0.1.1"; sha256="0pqmizli5rhyaxvxrjycf8d5kqrm23i3vdz00r8zmijjpiz2p9s2"; depends=[Matrix numDeriv plyr]; }; - lctools = derive2 { name="lctools"; version="0.2-7"; sha256="1pllm5jf9mpy4nf4bn4vifhr173kddabzybjwq4rg9cni92zm3dn"; depends=[MASS pscl reshape weights]; }; - lcyanalysis = derive2 { name="lcyanalysis"; version="1.0.3"; sha256="0nkqrm8r5iyvw2gbixvi0bnqx2wafg67cqz9mn99halzk9hpynl9"; depends=[quantmod TTR xts zoo]; }; + lctools = derive2 { name="lctools"; version="0.2-8"; sha256="03k6d78lzc8jxndnwh39h6fagr6ibhr9354vzvsw873912sxs8c9"; depends=[MASS pscl reshape sp weights]; }; + lcyanalysis = derive2 { name="lcyanalysis"; version="1.0.4"; sha256="0pwr6r8nbvmppqwd9gxap6v49l7iaq5syaq11spxp5yc2h3pa2rg"; depends=[quantmod TTR xts zoo]; }; lda = derive2 { name="lda"; version="1.4.2"; sha256="03r4h5kgr8mfy44p66mfj5bp4k00g8zh4a1mhn46jw14pkhs21jn"; depends=[]; }; lda_svi = derive2 { name="lda.svi"; version="0.1.0"; sha256="1x72zqks8163qpmld21n5vn5q3jazp6g54arf53038rd0c59191q"; depends=[BH Rcpp RcppArmadillo Rdpack reshape2 tm]; }; ldaPrototype = derive2 { name="ldaPrototype"; version="0.1.1"; sha256="0r78x7sn6mg4hgwydk1lgvfzkmgwkzqq0kvn8pqawx9pg8d8h4jb"; depends=[checkmate colorspace data_table dendextend fs lda progress]; }; ldamatch = derive2 { name="ldamatch"; version="1.0.1"; sha256="1dmmjw7h0rrgwga7235bryzzvmx68gmkpy5v1pwvnkk4rxp8xamh"; depends=[car data_table entropy foreach gmp iterators iterpc kSamples MASS RUnit]; }; - ldat = derive2 { name="ldat"; version="0.3.0"; sha256="1bmj5pwkj89mkha74lash4j24b7mj1c7q9as3c4pi5pk4m2s7xwl"; depends=[BH lvec Rcpp]; }; + ldat = derive2 { name="ldat"; version="0.3.3"; sha256="1n8v4nzfv3ayr46ahrz60vasam8mx1phb4vss05d9xh7sxlkx7gv"; depends=[BH lvec Rcpp]; }; ldatuning = derive2 { name="ldatuning"; version="1.0.0"; sha256="021k91a76yxjpda2850jcnxvawlrisvw35rw2p6ylfwkylaf4sz9"; depends=[ggplot2 reshape2 Rmpfr scales slam topicmodels]; }; ldbod = derive2 { name="ldbod"; version="0.1.2"; sha256="1ylzkswnhf4jnjx2ijasy49pj78ffx333za0bx2fnf3g85kicqiv"; depends=[mnormt RANN]; }; ldbounds = derive2 { name="ldbounds"; version="1.1-1.1"; sha256="10rmkidvvhwnrkc62c5ld44xhbvx1k8mch28h1yryakn8gznp3p8"; depends=[lattice]; }; @@ -9559,7 +9663,7 @@ in with self; { leaderCluster = derive2 { name="leaderCluster"; version="1.2"; sha256="1lqhckarqffm2l3ynji53a4hrfn0x7zab7znddia76r2h6nr02zb"; depends=[]; }; leafR = derive2 { name="leafR"; version="0.3"; sha256="0bb05y0py2q0qmvapbv3ibrycjb8i4adl25807i8l7g768y3llsr"; depends=[data_table lazyeval lidR raster sp]; }; leafSTAR = derive2 { name="leafSTAR"; version="1.0"; sha256="16zfaj0v6dx6mhy6m126lxa6w0dzfw4acm83jlbrizaz52amhv6a"; depends=[]; }; - leafem = derive2 { name="leafem"; version="0.0.1"; sha256="0yjbwhxjifhf1yw3phc12hlrr080y4331dwgpxdg62x7v0y5xl31"; depends=[htmltools htmlwidgets leaflet raster sf sp]; }; + leafem = derive2 { name="leafem"; version="0.1.1"; sha256="00wbi5mlrpy81py4g2l8hijyb07shk0cy2pxxb8xvy4sjgyq80jw"; depends=[base64enc htmltools htmlwidgets leaflet mapdeck png raster scales sf sp]; }; leaflet = derive2 { name="leaflet"; version="2.0.3"; sha256="053kn4a2lbhzq2c68c4q782yrbyx4a7zw7j1s6p7k2d75chk1aja"; depends=[base64enc crosstalk htmltools htmlwidgets leaflet_providers magrittr markdown png raster RColorBrewer scales sp viridis]; }; leaflet_esri = derive2 { name="leaflet.esri"; version="1.0.0"; sha256="01bwzxh2rdhpvvazaxsji8axl765q1ix1fdxla6i61nvqkpw3dz1"; depends=[htmltools leaflet leaflet_extras]; }; leaflet_extras = derive2 { name="leaflet.extras"; version="1.0.0"; sha256="0li7651cwlz7sg04xdrmvhkrf0n6amaydck7gqz0wkb6wq8hcyzw"; depends=[htmltools htmlwidgets leaflet magrittr stringr]; }; @@ -9578,20 +9682,21 @@ in with self; { learNN = derive2 { name="learNN"; version="0.2.0"; sha256="0q0j25vi7hrwaf38y10m24czf3rsvj937jvkz3ns12bd8srlflah"; depends=[]; }; learnPopGen = derive2 { name="learnPopGen"; version="1.0.4"; sha256="04wxina3n2bspxdp3d4bgqrwyxqxx46pfp8zgzr3rsj89ml8if9l"; depends=[gtools phytools]; }; learningr = derive2 { name="learningr"; version="0.29.1"; sha256="0z3rs7y9yd81f14sbk3dwq1ifr4vca2s3kl1gnkqlns3dycgyp08"; depends=[plyr]; }; - learnr = derive2 { name="learnr"; version="0.10.0"; sha256="0278q9nbkc4nb0rp930kjrwyidf0v7y38d1s187m4f4bs7ha82k6"; depends=[checkmate ellipsis evaluate htmltools htmlwidgets jsonlite knitr markdown rappdirs renv rmarkdown rprojroot shiny withr]; }; + learnr = derive2 { name="learnr"; version="0.10.1"; sha256="08xwmms6x58y3dsfbl9c6d03145hb4ij97nqr1cc9dxxilmr6x31"; depends=[checkmate ellipsis evaluate htmltools htmlwidgets jsonlite knitr markdown rappdirs renv rmarkdown rprojroot shiny withr]; }; learnrbook = derive2 { name="learnrbook"; version="0.0.2"; sha256="1k17dk8ahn1ifwid1hhx0k7fpgc62zg82y66bbf6nhd4dgdbbv2p"; depends=[]; }; learnstats = derive2 { name="learnstats"; version="0.1.1"; sha256="1sa064cr7ykl4s1ssdfmb3v1sjrnkbwdh04hmwwd9b3x0llsi9vv"; depends=[ggplot2 Rcmdr shiny]; }; - ledger = derive2 { name="ledger"; version="2.0.4"; sha256="19jqy24c8xkpcs9d5w4a1ih474xpnxjnq1q8940mfkx1vq2bz1m5"; depends=[dplyr rio rlang stringr tibble tidyr tidyselect]; }; + leastcostpath = derive2 { name="leastcostpath"; version="1.2.1"; sha256="0fkkvdribvpis0gy951dn6ph0znziqfxjyhpl4mvzbsn0np75n34"; depends=[gdistance pbapply raster rgdal rgeos sp]; }; + ledger = derive2 { name="ledger"; version="2.0.6"; sha256="11j4mzkkgphpwda5g9wl0ppxh5kslx7gqip5b7frmq1vk08fxf1p"; 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]; }; + legco = derive2 { name="legco"; version="0.1.3"; sha256="1615whdqihpzfhp5ll3x3jg4py04l52dc87kbdmgln4ygxyy5sqh"; depends=[httr jsonlite]; }; legocolors = derive2 { name="legocolors"; version="0.2.0"; sha256="06jbq12jzga1p5jajhnnkk11s9gjw5ngmnrvhmbvirhsbafp0fjv"; depends=[]; }; - leiden = derive2 { name="leiden"; version="0.3.2"; sha256="0kf6fxqf5l5vilm9g7vspc18daw84cwhpafs5szb1skwd6vrfdzw"; depends=[igraph Matrix reticulate]; }; + leiden = derive2 { name="leiden"; version="0.3.3"; sha256="1hh6bmbz6cpqwl4i94gxylgv9x92zbqdg81r8r4ymfy8c70f3df2"; depends=[igraph Matrix 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]; }; + lemon = derive2 { name="lemon"; version="0.4.4"; sha256="0m9hqwi709j9iwsxn8jh63741jiyr7ppwgqaw2zkv285p3m5wvd5"; depends=[ggplot2 gridExtra gtable knitr lattice plyr rlang scales]; }; lenses = derive2 { name="lenses"; version="0.0.3"; sha256="08akwzlc5gk2rxbh9xp67n5ahdcld60932ascczjv0accrkxizhk"; depends=[magrittr rlang tidyselect]; }; leri = derive2 { name="leri"; version="0.0.1"; sha256="1309v58xdw3p6y2wpnl64vgsds5kvfiary2a3fa041kz23jzbp3c"; depends=[ncdf4 raster]; }; lero_lero = derive2 { name="lero.lero"; version="0.2"; sha256="03ll7jzcay0swwpmxyf0y9k2h8mxx4p5v3ggm9dgdz4j99934l70"; depends=[]; }; - lessR = derive2 { name="lessR"; version="3.9.0"; sha256="1sia0x9rlfy0p7ilpkb32klv5ydd6jgqcl8n877d1m6xn947fy0z"; depends=[colorspace ellipse foreign lattice latticeExtra leaps openxlsx png rmarkdown robustbase sas7bdat triangle viridisLite wesanderson]; }; + lessR = derive2 { name="lessR"; version="3.9.3"; sha256="1r4hsznvrsy6cb1qwy5vnc9b8wbjsya87161z3w9crgxrw1dbls8"; depends=[colorspace ellipse foreign lattice latticeExtra leaps openxlsx png rmarkdown robustbase sas7bdat triangle viridisLite wesanderson]; }; lest = derive2 { name="lest"; version="1.1.0"; sha256="1d69kvdl31crv4ik8bwylq3s3f4skzrjc4x49c79w443g64n2jp9"; depends=[]; }; lestat = derive2 { name="lestat"; version="1.9"; sha256="1skxymdf3ncmdbskh7711xxgwsmwxfxnl52gcgw06jscx6s6wrsd"; depends=[MASS]; }; lexRankr = derive2 { name="lexRankr"; version="0.5.2"; sha256="0vb4m4g88k05yhjla1gwp8ck08356r9dzwal6cq7lb6xm6pl5gvi"; depends=[igraph Rcpp SnowballC]; }; @@ -9600,12 +9705,12 @@ in with self; { lfactors = derive2 { name="lfactors"; version="1.0.4"; sha256="1r8qlwj3zsm233jfx9ag0q5g1knvjmbwl3785pwcd12zi6f68dcc"; depends=[]; }; lfda = derive2 { name="lfda"; version="1.1.3"; sha256="0sk409jx4chs2wzhpfw7rlg9pwpdqg32ncfl3w243ypq73jq0qv3"; depends=[plyr rARPACK]; }; lfe = derive2 { name="lfe"; version="2.8-5"; sha256="1hi3jw2s0xwly5lbvhs8ysm9ky69sixzcf7z6fwlsn9lsdrwb07x"; depends=[Formula Matrix sandwich xtable]; }; - lfl = derive2 { name="lfl"; version="1.4.2"; sha256="0lr7r04jpsrp54g4flpwihymvwa3idxhzfjxfbx4ah16rd47nk5x"; depends=[e1071 foreach forecast plyr Rcpp tseries zoo]; }; + lfl = derive2 { name="lfl"; version="2.0"; sha256="1qlsj2lhgz5ivdlyvlg3gjr99qy88nwf78app0bmb2abq3ym82sc"; 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.4.1"; sha256="1srlklq6hkb4yd3lbbazswj866i3wzk2524hhj1v45yr7d5qhxv0"; depends=[ggplot2 ks localgauss logspline mvtnorm np tseries]; }; lgarch = derive2 { name="lgarch"; version="0.6-2"; sha256="05xksc4d6dbf5ls4lf2gpk9xyi99fikr7dva88b84rfgads1yhrh"; depends=[zoo]; }; - lgcp = derive2 { name="lgcp"; version="1.5"; sha256="1n1f87qg0y9r22p3q1qjnfrs7xarvsidgqgg6v2bsb55viwy11g3"; depends=[fields iterators maptools Matrix ncdf4 RandomFields raster rgeos rpanel sp spatstat spatstat_utils]; }; - lgr = derive2 { name="lgr"; version="0.3.3"; sha256="1ivab8vw4bp206yq21dz7ix3slghjdzh4k6q6w9xpvphwscx0h48"; depends=[R6]; }; + lgcp = derive2 { name="lgcp"; version="1.6"; sha256="1bsf69l81w7182ay4lrq1miqdr4f4jv5ppcalrqhqjcwhkq1nlkb"; depends=[fields iterators maptools Matrix ncdf4 RandomFields raster rgeos rpanel sp spatstat spatstat_utils]; }; + lgr = derive2 { name="lgr"; version="0.3.4"; sha256="14qq2q526iv2wxdssddv0sqqaz8vj7xgw1rrqspjvqnl8l6bckab"; depends=[R6]; }; lgrdata = derive2 { name="lgrdata"; version="0.1.1"; sha256="0h1crdhqfp6hzx30lp0w015scf2566hhrl2i7mkxy868rkl3aig9"; depends=[]; }; lgtdl = derive2 { name="lgtdl"; version="1.1.5"; sha256="1sixq56d2px36q0xq3kl0zwj2yzm3q8fhgqjvmajcdd5jl8l7130"; depends=[]; }; lhmixr = derive2 { name="lhmixr"; version="0.1.0"; sha256="1c4ydgq1z2y0xk8xqdsim6xvgxdbl3gglfk5kcr9k4m01arvv0rf"; depends=[]; }; @@ -9616,16 +9721,16 @@ in with self; { librarysnapshot = derive2 { name="librarysnapshot"; version="0.1.2"; sha256="0v4x564zpm58kxs5n84bi6mcjhbzjg6a2lc30vsc8kbm3qy0nq38"; depends=[]; }; libsoc = derive2 { name="libsoc"; version="0.7"; sha256="1r548rvj98wl0yp6jx5d2qhvy1y4883qp0w3jjk97vp07a1cywn8"; depends=[]; }; libstableR = derive2 { name="libstableR"; version="1.0.2"; sha256="1gkcgbc8a7ks9x8mqmlz98hk55q3qy62izam7csz1s0r5dzsyqcr"; depends=[Rcpp RcppGSL]; }; - lidR = derive2 { name="lidR"; version="2.2.1"; sha256="1yg26r6rhjl44k2x3magij2gn30z7w8vr3njhrwqgmawhgvg0dqq"; depends=[BH data_table future gdalUtils glue lazyeval raster Rcpp RcppArmadillo RCSF rgdal rgeos rgl rlas sf sp]; }; + lidR = derive2 { name="lidR"; version="2.2.3"; sha256="05xz64c1f362gjsdhqjz3za444fjkssijhadn2f1qqqbb1bdd664"; depends=[BH data_table future gdalUtils glue lazyeval raster Rcpp RcppArmadillo RCSF rgdal rgeos rgl rlas sf sp]; }; lifecontingencies = derive2 { name="lifecontingencies"; version="1.3.6"; sha256="0v8xrnmviq938x779f3h55iq8bhvbkwgz35v1dxgzbxwclj7jycl"; depends=[markovchain Rcpp]; }; lifecourse = derive2 { name="lifecourse"; version="2.0"; sha256="1m8ihqvzhzpq2m2pdvh37bpq9pdbj23r3y0jkl3q8farh3qj473d"; depends=[TraMineR]; }; - lifecycle = derive2 { name="lifecycle"; version="0.1.0"; sha256="11rk7hkw63rfrf4aqmb4xrb88kg95xh8hajpjvjfwjym2v02h74n"; depends=[glue rlang]; }; + lifecycle = derive2 { name="lifecycle"; version="0.2.0"; sha256="0912865c6675fsblrfdk6s568krsj1x8qbk1kipy7m05xs6nwx19"; depends=[glue rlang]; }; lifelogr = derive2 { name="lifelogr"; version="0.1.0"; sha256="1wygvw61ygpww0kahxhmjdncwg4zc2cshs0brzw18nfqaj8vpfav"; depends=[dplyr fitbitScraper ggplot2 lazyeval lubridate modelr plyr R6 shiny stringr tibble tidyr]; }; lift = derive2 { name="lift"; version="0.0.2"; sha256="0ynsyl6lw7z7bvwzk2idgxzzqji5ffnnc3bll9h4gwdw666g7fln"; depends=[]; }; liftLRD = derive2 { name="liftLRD"; version="1.0-8"; sha256="1m24f4mc70l808cpkcdm91hzb5b3bkzibvgyfi9zs6cs8apcvmy3"; depends=[adlift nlt]; }; liftr = derive2 { name="liftr"; version="0.9.2"; sha256="0azi831c4f0vcq27a3q86vj90zvwrzcy4plhj9hqkk4qz8xw113x"; depends=[knitr rmarkdown rstudioapi stringr yaml]; }; liger = derive2 { name="liger"; version="1.0"; sha256="0vn49p8ldb7ss35by04qh7r1arn5w8gci1rqbyfqw8ignwjrdc7s"; depends=[matrixStats Rcpp RcppArmadillo]; }; - lightr = derive2 { name="lightr"; version="0.1"; sha256="0ijqsgszjgxp3xci6fr17krbzns6r0qyxna60ad85c5ri868rmzs"; depends=[pbmcapply xml2]; }; + lightr = derive2 { name="lightr"; version="1.1"; sha256="0qwz8c9d68sdb5592l8xwpj7kiwli6qg78a3w74vhk8hj8q18g0r"; depends=[future_apply progressr xml2]; }; lightsout = derive2 { name="lightsout"; version="0.3"; sha256="0ypniqf9wk35dd9j57wd7gxchr5hy25fwhmkndz2z8b9ajhm3c9b"; depends=[magrittr shiny shinyjs]; }; likeLTD = derive2 { name="likeLTD"; version="6.3.0"; sha256="1mjf4667xd9pf2684d7vqaj54l5s9pgljn4vkfp32wzbfknq6y8r"; depends=[DEoptim gdata ggplot2 gtools rtf]; }; likelihood = derive2 { name="likelihood"; version="1.7"; sha256="0q8lvwzlniijyzsznb3ys4mv1cqy7ibj9nc3wgyb4rf8676k4f8v"; depends=[nlme]; }; @@ -9633,7 +9738,7 @@ in with self; { likelihoodExplore = derive2 { name="likelihoodExplore"; version="0.1.0"; sha256="13cnql7pbx8qq1j3cfb3lkzzf2k55shpfa0jd00z30ys6imxzcfn"; depends=[lazyeval plyr]; }; likert = derive2 { name="likert"; version="1.3.5"; sha256="0c4irxs7pp1z8nj4s8cq23daw4h94n3h7x4f6q1d85614qcl9l3p"; depends=[ggplot2 gridExtra plyr psych reshape2 xtable]; }; lilikoi = derive2 { name="lilikoi"; version="0.1.0"; sha256="1v7xrkv8xxmq6cdww4z1p9vlvy71cqgd3yb5mal4v9w2wrfaps6z"; depends=[caret corrplot devtools dplyr e1071 gbm ggplot2 glmnet hash Hmisc infotheo Matrix pamr princurve pROC R_oo randomForest reshape2 RWeka stringr]; }; - lillies = derive2 { name="lillies"; version="0.2.5"; sha256="0cqlxcq8yyw87m018hv8s82d6qmh9x93j0hyqycl6w5fdpp62hf0"; depends=[ddpcr dplyr knitr pracma progress rlang survival tidyr]; }; + lillies = derive2 { name="lillies"; version="0.2.7"; sha256="167hlqj9ivsjxhlfv3z1c017iqbj08aig86ncrk9inpqj3zvkyxy"; depends=[ddpcr dplyr knitr pracma progress rlang survival tidyr]; }; limSolve = derive2 { name="limSolve"; version="1.5.6"; sha256="1829rd2cnd8qj80z9a7sgc7gx4sf3kvl5g6d2a0lqqw30f9sjzmr"; depends=[lpSolve MASS quadprog]; }; lime = derive2 { name="lime"; version="0.5.1"; sha256="021wz43dfc3f2k275c98hcnnx7dyyjj18dm2zf8vh7rbk9bnf0sj"; depends=[assertthat ggplot2 glmnet gower htmlwidgets Matrix Rcpp RcppEigen shiny shinythemes stringi]; }; limitplot = derive2 { name="limitplot"; version="1.2"; sha256="0wj1xalm80fa5pvjwh2zf5hpvxa3r1hnkh2z9z285wkbrcl0qfl2"; depends=[]; }; @@ -9648,11 +9753,11 @@ in with self; { linemap = derive2 { name="linemap"; version="0.1.0"; sha256="0qkbmpfr742xbs3xn5ppx6q0prwrr9mk1c1mv050cm47dm7jcs6l"; depends=[sf]; }; lineqGPR = derive2 { name="lineqGPR"; version="0.1.1"; sha256="180rvmpasdw8r3w5lw6dxg5jkj875dklvifi2msyp0vaq1nbpbwp"; depends=[broom ggplot2 MASS Matrix mvtnorm nloptr plot3D purrr quadprog tmg TruncatedNormal]; }; lineup = derive2 { name="lineup"; version="0.37-11"; sha256="0lk2wm8wsaaxw3j7yvmg6qif0r0s1jlwqyg73d3xjnjhxgy03zp4"; depends=[class qtl]; }; - lingtypology = derive2 { name="lingtypology"; version="1.0.15"; sha256="1iy33d29fdwpsw13094ykjijidhpcgkxqdqxfmlw4s6ma08sx4gh"; depends=[leaflet leaflet_minicharts rowr stringdist]; }; + lingtypology = derive2 { name="lingtypology"; version="1.1.2"; sha256="079xh4h8fwa9pm6q145fnvrj1bzi7j2lm7850qqmbqkpz62b1yg6"; depends=[leaflet leaflet_minicharts stringdist]; }; linguisticsdown = derive2 { name="linguisticsdown"; version="1.2.0"; sha256="1y2g8h0p4q4mjrawzyprsdw8ynqcbpnjypyhdaf03pcwqglcirkl"; depends=[DT knitr magrittr miniUI rstudioapi shiny stringr]; }; - link2GI = derive2 { name="link2GI"; version="0.4.1"; sha256="1frxm3xyz9bjym4h95bnwgmvgix6n8jz1bvg3pvhxczb2qld52wb"; depends=[devtools R_utils roxygen2 sf stringr]; }; + link2GI = derive2 { name="link2GI"; version="0.4.3"; sha256="1f6pp8cw2cgg669dwgbsmcbq870y5v5qjbdkrrxzfxbyk4j24fqx"; depends=[devtools R_utils raster roxygen2 sf stringr]; }; linkR = derive2 { name="linkR"; version="1.1.1"; sha256="1748r7s5g0gvsmghrb7l5lmdbzb9f4vkbgj51v308jr64r1k7l93"; depends=[svgViewR]; }; - linkcomm = derive2 { name="linkcomm"; version="1.0-11"; sha256="1w5sfmzvrk30fr161pk0cy5nj8kasqm6hqgyafq6r280b5s272cb"; depends=[dynamicTreeCut igraph RColorBrewer]; }; + linkcomm = derive2 { name="linkcomm"; version="1.0-12"; sha256="04725prwikkzqjq8say8b7f1k5z2c5qzsmsflynp1my893dlal0j"; depends=[dynamicTreeCut igraph RColorBrewer]; }; linkim = derive2 { name="linkim"; version="0.1"; sha256="0yvyid9x59ias8h436a202hd2kmqvn8k1zcrgja2l4z2pzcvfn91"; depends=[]; }; linkprediction = derive2 { name="linkprediction"; version="1.0-0"; sha256="0p2abdq6ad689236w2d0khlycpjgy6j7xrlb96ngl6csgxwm07bl"; depends=[igraph intergraph]; }; linkspotter = derive2 { name="linkspotter"; version="1.2.0"; sha256="0wk27jn8jr5rskjxbixshmp2dl0l74hrc8r6x3rvhy0x0b00zks2"; depends=[dplyr energy ggplot2 Hmisc infotheo mclust minerva pbapply rAmCharts shiny tidyr visNetwork]; }; @@ -9660,19 +9765,19 @@ in with self; { linpk = derive2 { name="linpk"; version="1.0"; sha256="14l3vv507z7x63ziynp07902599syah0icvzq4rxfjf48bf96l63"; depends=[mvtnorm]; }; linprog = derive2 { name="linprog"; version="0.9-2"; sha256="1ki14an0pmhs2mnmfjjvdzd76pshiyvi659zf7hqvqwj0viv4dw9"; depends=[lpSolve]; }; lintools = derive2 { name="lintools"; version="0.1.3"; sha256="1wv94j0j89zq15b80x0cylfxar5ajrdrcdn62mkgjij3m8zqs7fa"; depends=[]; }; - lintr = derive2 { name="lintr"; version="2.0.0"; sha256="09gbci4v5n4gsfzminly8332fw7faxdi1kkyvpa10dydx02sjcwb"; depends=[codetools crayon cyclocomp digest httr jsonlite knitr rex rstudioapi stringdist testthat xml2 xmlparsedata]; }; + lintr = derive2 { name="lintr"; version="2.0.1"; sha256="14yfh641afg6griaadbdciyr3k94fl55s055qwzghgk5gdsj61zy"; depends=[codetools crayon cyclocomp digest httr jsonlite knitr rex rstudioapi testthat xml2 xmlparsedata]; }; + lipidomeR = derive2 { name="lipidomeR"; version="0.1.2"; sha256="1a9zi821mn7w18lg7psc9bagi3c5snvwqgda2f10rw5jff60fkfd"; depends=[BiocManager dplyr ggplot2 knitr limma reshape2 shadowtext stringr tableone tidyr]; }; liqueueR = derive2 { name="liqueueR"; version="0.0.1"; sha256="0rpjib0dz39la63gy9bw9gmdfq2fcx40y4y4wcb6ky41qcjdp1nd"; depends=[itertools]; }; liquidSVM = derive2 { name="liquidSVM"; version="1.2.4"; sha256="1fka0jbc200n0il1qbp5nb9819afi11b1ndwqpsd6bhfjgrcga8m"; depends=[]; }; lira = derive2 { name="lira"; version="2.0.1"; sha256="10bjmapnlw5z5cnbdpkwisvjkmk7zi9xqrvgmb5psj317zcxfc2p"; depends=[coda rjags]; }; lisa = derive2 { name="lisa"; version="0.1.1"; sha256="1i5fbcac24rp8s7z2v23aqy7xv0p610zj5xfb6vscsvhdlvg4w1a"; depends=[]; }; 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]; }; + list = derive2 { name="list"; version="9.2"; sha256="1gn0g4qq9rr6vwnwq6525hx7iy3q3vmy3g2v3ba69v4jcdc0a0mx"; 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.3.0"; sha256="0y3485wcirr7srjn4ahx0ym3z9y4a66v6g1pyb6czxzj1wi0i0sn"; depends=[]; }; + listarrays = derive2 { name="listarrays"; version="0.3.1"; sha256="0nfpqywq9pl9yj566y0jw0h89g0ppsc614538ns1jc3l5r2myils"; depends=[]; }; listdtr = derive2 { name="listdtr"; version="1.0"; sha256="08drps03nndpdxswyv8bjm1bcckjav5pjj7fdx3dzyn0v4dfy619"; depends=[ggplot2]; }; listenv = derive2 { name="listenv"; version="0.8.0"; sha256="0ps8bk7zlhbviawrw7vw25skjq81hkk3ijyi6g74dmfqy8zsyapx"; depends=[]; }; - listless = derive2 { name="listless"; version="0.0-2"; sha256="1gr6l4vih7j28kg2mj1xj2yhlpwjc4p894vsxri25vq0r9kgcdym"; depends=[magrittr tidyr]; }; listviewer = derive2 { name="listviewer"; version="3.0.0"; sha256="0zirxdj58h43062f68h6nqcgmpnvdglxx3kjbs4i4k0z9wvqhx8r"; depends=[htmltools htmlwidgets shiny]; }; liteq = derive2 { name="liteq"; version="1.1.0"; sha256="0w3w9f6374qwvlrqknavqh9b38n5q1r6aw5zmz5lahvadalwdbwi"; depends=[assertthat DBI rappdirs RSQLite]; }; litteR = derive2 { name="litteR"; version="0.7.0"; sha256="070g65z50dqffa6c5b3n7yp3zmx9hpk7k3vspnpcmsgpd32r0h6n"; depends=[dplyr fs ggplot2 purrr readr rlang rmarkdown stringr tidyr yaml]; }; @@ -9701,8 +9806,8 @@ in with self; { lmeVarComp = derive2 { name="lmeVarComp"; version="1.1"; sha256="0m6syydy89c52hhi0w503l5vkgya2d5ps70z5wmdd39nm4jna68w"; depends=[]; }; lmec = derive2 { name="lmec"; version="1.0"; sha256="09shj01h2dl5lh7ch0wayr7qyhlmk0prv3p1vfgy91sn0wpbqlxr"; depends=[mvtnorm]; }; lmem_qtler = derive2 { name="lmem.qtler"; version="0.1.1"; sha256="0qbllj66y294n1m8dsyrnwyvzscbzg8mb2dmjyghcrfaz925vkin"; depends=[lattice lme4 pastecs qtl stringr]; }; - lmenssp = derive2 { name="lmenssp"; version="1.2"; sha256="1vc90x3y1vzmzblc15kqar3nd3c3p8p9nvmpk0ib52n0qv5pr6wz"; depends=[geoR MASS mvtnorm nlme]; }; lmerTest = derive2 { name="lmerTest"; version="3.1-1"; sha256="0r2vvs3nl6p8xla3gd943khb4ixp0alvspqpnz2y6n3wk8zgh3jj"; depends=[ggplot2 lme4 MASS numDeriv]; }; + lmeresampler = derive2 { name="lmeresampler"; version="0.1.1"; sha256="13i0crk6agw5pcj3znvxj60jfsmncnir7ahwdczgm7kh08hk0f6l"; depends=[boot dplyr Matrix nlmeU plyr RLRsim]; }; lmf = derive2 { name="lmf"; version="1.2"; sha256="1xqlqmjl7wf5b2s2a1k1ara21v74b3wvwl4mhbj9dkdb0jcrgfva"; depends=[]; }; lmfor = derive2 { name="lmfor"; version="1.4"; sha256="012bk6r6gf6y9skfch2pqr2irv70108sz1x6hakl1bifb4lgnbjp"; depends=[magic nlme spatstat]; }; lmm = derive2 { name="lmm"; version="1.2"; sha256="1xymcizqfqh2jp0rxgfgniflyqzgcwg04g9mllva5xgc1ydcg69k"; depends=[]; }; @@ -9715,7 +9820,7 @@ in with self; { 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.3"; sha256="113sz2lgb3yv3ayy3x831qww3d088yw2iyjrdc8jfhq6id1w9giq"; depends=[lmom]; }; - lmomco = derive2 { name="lmomco"; version="2.3.2"; sha256="1gqwn5yjd3zcwd5nysayf88vjhj2j1qxfgqcw63q7f2ih0xk1lqp"; depends=[goftest Lmoments MASS]; }; + lmomco = derive2 { name="lmomco"; version="2.3.6"; sha256="18qpkx601gzy33d9kfrpf6mxxb9z6rkz030cx3drb4w5n6langjb"; depends=[goftest Lmoments MASS]; }; lmreg = derive2 { name="lmreg"; version="1.2"; sha256="02a4nqqcfkjlq21mpk8abd4lj4ib2nps3ndf7zgmzygkd1z0df18"; depends=[MASS]; }; lmridge = derive2 { name="lmridge"; version="1.2"; sha256="091rznzh77bmsv7sw9xmsq6s9pnljyq7qyl74kgcxss718134jr3"; depends=[]; }; lmtest = derive2 { name="lmtest"; version="0.9-37"; sha256="02nasm0j2vwkhz11dxqixs23msy1s3yj0jps6949fmgh9gwjkjfx"; depends=[zoo]; }; @@ -9725,20 +9830,21 @@ in with self; { loa = derive2 { name="loa"; version="0.2.45.4"; sha256="0dcpadv453885a2s8l064zn1xswi2v819154j822jr22kd7bj57v"; depends=[lattice MASS mgcv plyr png RColorBrewer rgdal RgoogleMaps sp]; }; loadr = derive2 { name="loadr"; version="0.1.2"; sha256="1zqg90hxw6c3k3gd0caj8fh5ym3f97gsr9cvi6ndlzqh4957cd5n"; depends=[]; }; lobstr = derive2 { name="lobstr"; version="1.1.1"; sha256="0vkif17825x33cz8r89j0qph4wj5l8fzfgl8nh2g7m2v140cxjdq"; depends=[crayon Rcpp rlang]; }; - locStra = derive2 { name="locStra"; version="1.2"; sha256="1aka3fl8g0v3md1nx50z2zw3bb365lskysdy64n6rlgibmlflwc5"; depends=[Matrix Rcpp RcppEigen Rdpack]; }; - localICE = derive2 { name="localICE"; version="0.1.0"; sha256="0pch4mdn0bj3rlqsai3lqrkv6pw04238n9qvlwzwcwii3wyqhkgs"; depends=[checkmate ggplot2]; }; - localIV = derive2 { name="localIV"; version="0.2.1"; sha256="09z5iqqa9ia4v88fbgf23ww8wxywpyndhzl5mhsp5dvpnj0vyhx1"; depends=[KernSmooth mgcv sampleSelection]; }; + locStra = derive2 { name="locStra"; version="1.3"; sha256="1lrdjr63ybdmdm74b76ahc71d9vhrlqbcc9193s7kbhzcms7f60a"; depends=[Matrix Rcpp RcppEigen Rdpack]; }; + localICE = derive2 { name="localICE"; version="0.1.1"; sha256="1pyq6kdahsy9qa0jzmring48r0i9h4rkp8lxpf9afksgm1qn0c5z"; depends=[checkmate ggplot2]; }; + localIV = derive2 { name="localIV"; version="0.3.0"; sha256="0h5hjh30y5273qb7a4kdr3l63g9m9ni2avx5ccqv7xcv49jq296k"; depends=[KernSmooth mgcv rlang sampleSelection]; }; localModel = derive2 { name="localModel"; version="0.3.12"; sha256="1yg61zia8gqgzbg33k6q43ni04cj6y9l3k8vdcw8j1qzasnhz0b2"; depends=[ggplot2 glmnet ingredients partykit]; }; localgauss = derive2 { name="localgauss"; version="0.40"; sha256="0y0pcg2i7lr4wipxawn06hy0q11znhcn2ah6rqwnlyy8pab70pyq"; depends=[foreach MASS matrixStats]; }; localsolver = derive2 { name="localsolver"; version="2.3"; sha256="1d18rihzqf1f5j9agfp8jysll7lqk1ai23hkdqkn6wwxj442llv4"; depends=[]; }; locfdr = derive2 { name="locfdr"; version="1.1-8"; sha256="1falkbp2xz07am8jlhwlvyqvxnli4nwl188kd0g58vdfjcjy3mj2"; depends=[]; }; - locfit = derive2 { name="locfit"; version="1.5-9.1"; sha256="0lafrmq1q7x026m92h01hc9cjjiximqqi3v1g2hw7ai9vf7i897m"; depends=[lattice]; }; + locfit = derive2 { name="locfit"; version="1.5-9.4"; sha256="1vcw16qww4v4547w0gfvhqg60l051bsdlxa6zfcgcj9xbxf6dlyr"; depends=[lattice]; }; locits = derive2 { name="locits"; version="1.7.3"; sha256="0sjnwqiqwzdkglvbdxbkg17gjp0vyqvywsy0qq7adxj5hh0yah05"; depends=[igraph wavethresh]; }; locpol = derive2 { name="locpol"; version="0.7-0"; sha256="1p915n0l09kbwkly627074jslxl01yssp1rf0c7sygvsw6sgy5lm"; depends=[]; }; lodGWAS = derive2 { name="lodGWAS"; version="1.0-7"; sha256="0g5b44d3wb5hnx5l2n76myb1pc9ml3a052n1a4gvgqapa5as35s2"; depends=[rms survival]; }; loder = derive2 { name="loder"; version="0.2.0"; sha256="0m6g8c25dmq0wgpy8y6cbggymxdvqwb6lp2yzs5bgpq183512spb"; depends=[]; }; - lodi = derive2 { name="lodi"; version="0.9.1"; sha256="1207lbin53wlacs6kk8gwzbwllddh4byvs6ai6b9d345k6f9gr56"; depends=[rlang]; }; + lodi = derive2 { name="lodi"; version="0.9.2"; sha256="16xqcza87gsqi6kzx0bdv3w9zyvvppjd20rq08lc8vb75nlkx1yb"; depends=[rlang]; }; loe = derive2 { name="loe"; version="1.1"; sha256="1n16pgfxg9vcn729xxjbbvavg2ywbdcch9v2ph8nv3z7psc0q46c"; depends=[MASS]; }; + loewesadditivity = derive2 { name="loewesadditivity"; version="0.1.0"; sha256="0j9vvh2ys09hy2k3mbrlf0p493ymrxvfsdcjw0p6rlls54z9lqqc"; depends=[dplyr ggplot2 gridExtra magrittr metR rlang rootSolve tidyr viridis]; }; log4r = derive2 { name="log4r"; version="0.3.2"; sha256="18r5g0817wfn0kmqwv6vf7r2vavi0xh6mqmxrh59y9w3c84npfhl"; depends=[]; }; logKDE = derive2 { name="logKDE"; version="0.3.2"; sha256="09gachibj0klqa9ijw572lwphbh9qj6zqray5byq1dh7zsiq516q"; depends=[pracma Rcpp]; }; logNormReg = derive2 { name="logNormReg"; version="0.3-0"; sha256="172d0y9rb7j0d3m7d22ycfip6s8hk8hlp9810d7r95ra5dr5dx8z"; depends=[]; }; @@ -9750,14 +9856,13 @@ in with self; { logcondiscr = derive2 { name="logcondiscr"; version="1.0.6"; sha256="08wwxsrpflwbzgs6vb3r0f52hscxz1f4q0xabr1yqns06gir1kxd"; depends=[cobs Matrix mvtnorm]; }; logger = derive2 { name="logger"; version="0.1"; sha256="00gfy2i58qn5na8cxxrkm1pvsw85xx2gdk0y6dzxhcjfx3wyplaw"; depends=[]; }; logging = derive2 { name="logging"; version="0.10-108"; sha256="13gd40ygx586vs6xcp6clg69a92aj8zxlk1rn3xzkx8klfjimjc5"; depends=[]; }; - loggit = derive2 { name="loggit"; version="1.1.1"; sha256="1w9a3mbf863dk6lnd95mwr15rxjpv1rra1z45jnqk8w56g1s7q4d"; depends=[dplyr jsonlite]; }; - loggle = derive2 { name="loggle"; version="1.0"; sha256="0r1r8m2ckva17vbvwkzhq1lx6bap0kbfj9hxyk46adslcf3xxrxp"; depends=[doParallel foreach glasso igraph Matrix sm]; }; + loggit = derive2 { name="loggit"; version="1.2.0"; sha256="0nr6hmmdxgqaf3d0fjvc2l40vfwm6xsw5k87gcqdck0knal8pw7d"; depends=[dplyr jsonlite]; }; logiBin = derive2 { name="logiBin"; version="0.3"; sha256="06y5bqm3j6xdr1cd607v2sqkghnd2bv6bvxc6cz8dvp8jabqa0zm"; depends=[data_table doParallel foreach iterators partykit]; }; logihist = derive2 { name="logihist"; version="1.0"; sha256="1q3322rh3g31c5i80aw54pln0m1jgxmbx30cn31nlh3ijkvnpq9a"; depends=[ggplot2]; }; logistf = derive2 { name="logistf"; version="1.23"; sha256="0f1qn7q3h0qg2qdiz69ab03qvl4xhizqg304vjak72390nj25nss"; depends=[mgcv mice]; }; logistic4p = derive2 { name="logistic4p"; version="1.5"; sha256="0h0dxyklqc95ykyril1a3d2bdnszj5l9dqbxzh2wbfmk06prvh8b"; depends=[MASS]; }; logisticPCA = derive2 { name="logisticPCA"; version="0.2"; sha256="07ikyn127ld0fjdw7x911wrswqwqpw4lbcz0iffvh6jfjkgyk341"; depends=[ggplot2]; }; - logisticRR = derive2 { name="logisticRR"; version="0.2.0"; sha256="1ammq50p26hyjgqwhpza4225zk813r1vfs42r9lqv7pf0gkl4zid"; depends=[nnet]; }; + logisticRR = derive2 { name="logisticRR"; version="0.3.0"; sha256="0i9x7rynxcybdnjqbjsny8jsl96mivzdazdgmcg72qrv8qfwpszl"; depends=[nnet]; }; logitnorm = derive2 { name="logitnorm"; version="0.8.37"; sha256="1a9plxsxy29j9xpvwsznbbj150h9daay5zfzlmkh5y0f7f15w3a9"; depends=[]; }; loglognorm = derive2 { name="loglognorm"; version="1.0.1"; sha256="0rhx769a5nmidpbpngs2vglsbkpgw9badz3kj3jfmpj873jfnbln"; depends=[]; }; logmult = derive2 { name="logmult"; version="0.7.1"; sha256="0y9z5l93hm8p3r1rd6g11miqg1a02b9hy5mgcxv2q0hm1pg2vh0q"; depends=[gnm qvcalc]; }; @@ -9773,7 +9878,7 @@ in with self; { 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.3.2.1"; sha256="03nqglxyz6qfalxdnyh2aarxv3agn0b3r4nhsji4v9703h4m1fvg"; depends=[dplyr ggplot2 lubridate rlang scales survival tidyr zoo]; }; - longmemo = derive2 { name="longmemo"; version="1.1-1"; sha256="0myn2xpg0mw3x5zma0y1dza2jg3x9zj9z8xv2z8l2q9pm228xn0d"; depends=[]; }; + longmemo = derive2 { name="longmemo"; version="1.1-2"; sha256="01rj5x9cgscsrakbx9155mbvs35fd3j484cfz5cds9vl521fjr3r"; 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.2.0"; sha256="1hq1zcj76x55z9kic6cwf7mfq9pzqfbr341jbc9wp7x8ac4zcva6"; depends=[checkmate matrixStats]; }; @@ -9787,7 +9892,7 @@ in with self; { lorec = derive2 { name="lorec"; version="0.6.1"; sha256="0mgypd8awixh1lzbh5559br4k7vi3pfmwniqhgh68wc06sc6bn65"; depends=[]; }; lorentz = derive2 { name="lorentz"; version="1.0-2"; sha256="0napn1j6gwilskjnv2hjrxzrbcbh7cvfj578h0la9bpkm1xhi7di"; depends=[emulator magrittr tensor]; }; lori = derive2 { name="lori"; version="2.2.0"; sha256="1jsnfrkn6zn20gs8qhw5znfzaqp9j274yfqajcgfvy916j50acac"; depends=[data_table rARPACK svd]; }; - lotri = derive2 { name="lotri"; version="0.1.1"; sha256="1zqp56hxqyf9a820p2d272ykqnrym2qc5sbmah68qv8ql9n1z9qg"; depends=[Matrix]; }; + lotri = derive2 { name="lotri"; version="0.2.1"; sha256="0szhng56b4pa3wp4ffyvz647ad1xnk14xavnfqcr9wi022r22mc1"; depends=[Matrix]; }; lowmemtkmeans = derive2 { name="lowmemtkmeans"; version="0.1.2"; sha256="08zhdw48rzw47yzhg4s37bkliyngxs46cyb57dvng1s3m0w0dhvi"; depends=[Rcpp RcppArmadillo]; }; lpSolve = derive2 { name="lpSolve"; version="5.6.15"; sha256="1fpkyjyqykwa1dxnhiky01pm09syxg169lm7hpy39bdbg10vw9s6"; depends=[]; }; lpSolveAPI = derive2 { name="lpSolveAPI"; version="5.5.2.0-17.6"; sha256="04ah9xjr3574i3sfif90f6mln1cxpq7ia2nza30j5pfijqr7vwgd"; depends=[]; }; @@ -9814,7 +9919,7 @@ in with self; { lshorth = derive2 { name="lshorth"; version="0.1-6"; sha256="0nbjakx0zx4fg09fv26pr9dlrbvb7ybi6swg84m2kwjky8399vvx"; depends=[]; }; lsl = derive2 { name="lsl"; version="0.5.6"; sha256="1hwzklx1qp5ljc059j2hridg3caw4cgn7rbqs8xh2arzcvqdw3rb"; depends=[ggplot2 lavaan reshape2]; }; lslx = derive2 { name="lslx"; version="0.6.9"; sha256="0jfy6j5z53daarv8d8vqsgqdiy6s720m7qlcvrhicc8drvj88mrm"; depends=[ggplot2 lavaan R6 Rcpp RcppEigen]; }; - lsm = derive2 { name="lsm"; version="0.1.9"; sha256="1cyqbsd12m5m8f1vx8lyv21jdcs308fkp4zqlz2482m5fiinlaj2"; depends=[]; }; + lsm = derive2 { name="lsm"; version="0.2.0"; sha256="1rc55w526ss99parjb40w3fbqlxfkhzknxysmqn4fkxrhrylzqn5"; depends=[]; }; lsmeans = derive2 { name="lsmeans"; version="2.30-0"; sha256="1z35dzfgib0fk201gzjhgmnryhl3mkz50gz8g6nfv4mj9kzc5x5f"; depends=[emmeans]; }; lspartition = derive2 { name="lspartition"; version="0.4"; sha256="1n0pag5l4kx211dl5z9xbqijp7l04jcm0i6jgvkk2b0x9v32q4r5"; depends=[combinat dplyr ggplot2 MASS matrixStats mgcv pracma]; }; lspline = derive2 { name="lspline"; version="1.0-0"; sha256="0bc1nfpp1r5fi8rrg295k4r8pm03baqplrzwmk3sn4kdbp0apvgk"; depends=[]; }; @@ -9826,18 +9931,18 @@ in with self; { ltbayes = derive2 { name="ltbayes"; version="0.4"; sha256="0kv5k56hmc1m7bv5pmmmk46822szsgwqgpwydn0x56az7xn6hjk6"; depends=[mcmc MHadaptive numDeriv]; }; ltm = derive2 { name="ltm"; version="1.1-1"; sha256="1qrgzwx5l58qf5rfp1knxc84r0g943q5sdr3ky74zzwpnmrf2vf7"; depends=[MASS msm polycor]; }; ltmix = derive2 { name="ltmix"; version="0.2.0"; sha256="1p0p904lvhxwwj3vn0rrl6ydygnldgxqpk82y3b9p2ywvvfh86yv"; depends=[gtools pracma]; }; - ltmle = derive2 { name="ltmle"; version="1.1-0"; sha256="1mlsggl0vdnlgf8j0bjmh4zrfdpmkfi9jhar35npxz9r0yfjmw8f"; depends=[Matrix matrixStats speedglm]; }; + ltmle = derive2 { name="ltmle"; version="1.2-0"; sha256="1mqrf77319cjs3q48iigrkjc3rjibz7qyij49a7l0nim3c1hd0b0"; depends=[Matrix matrixStats speedglm]; }; ltsa = derive2 { name="ltsa"; version="1.4.6"; sha256="10wmw9r00400ng2zlysd8jqgypjclshxj83x32002j2a9cz4f186"; depends=[]; }; ltsbase = derive2 { name="ltsbase"; version="1.0.1"; sha256="16p5ln9ak3h7h0icv5jfi0a3fbw5wdqs3si69sjbn8f5qs2hz7yp"; depends=[MASS robustbase]; }; ltsk = derive2 { name="ltsk"; version="1.0.8"; sha256="1ykgz5cas924kmq9ak2j8vhr7gg9s458qarqkmyg9wdfj1srqi7p"; depends=[fields gstat sp]; }; ltsspca = derive2 { name="ltsspca"; version="0.1.0"; sha256="0hgl2zd8y01z8mhnqg1hlv1l7klpwhwk7q8b99pw9vgnh1f2gnfs"; depends=[pracma Rcpp RcppArmadillo]; }; ltxsparklines = derive2 { name="ltxsparklines"; version="1.1.2"; sha256="1jnygg7wm2768lrrzball8rn8f60xy4nc3a18h4d32jpnbhifj13"; depends=[]; }; - lubridate = derive2 { name="lubridate"; version="1.7.4"; sha256="14a823il77w3wmmnzr89vwrqp50y56dh5raycnaw6c8nv5xsh32i"; depends=[Rcpp stringr]; }; + lubridate = derive2 { name="lubridate"; version="1.7.8"; sha256="0g2m9dyhgds4shdrk76w7rqdl9msam4rii2qrhz12gipzhi9k89x"; depends=[generics Rcpp]; }; lucid = derive2 { name="lucid"; version="1.7"; sha256="0hrb8qlm8g4h1ziwxq7m53pf7g8fxhcb2xryavm6rniqpcx8yb7g"; depends=[nlme]; }; ludic = derive2 { name="ludic"; version="0.1.8"; sha256="1yvv3h7arm8hp89j9nr5vdl8ahxcpggi2qq431l7xbw9jka41qdp"; depends=[fGarch landpred Matrix Rcpp RcppArmadillo]; }; lue = derive2 { name="lue"; version="0.2.1"; sha256="0is5rd1dz91bzphmfbbzi3s6rgc5g9qza2r26k70xs67dgn0qbjq"; depends=[ncdf4 raster]; }; lulcc = derive2 { name="lulcc"; version="1.0.4"; sha256="00ymbp20kbjyzrsrxa262y0y7fj4jgsbqf56aapb657xvafxvy5q"; depends=[lattice raster rasterVis ROCR]; }; - lumberjack = derive2 { name="lumberjack"; version="1.1.3"; sha256="086xm1br03pwyv6qjmv4fjq5pm9p287zglpxrirr4s4giv3q45am"; depends=[R6]; }; + lumberjack = derive2 { name="lumberjack"; version="1.1.4"; sha256="18idnirla4v0571gilc4qmjz2s25rsmjy4f1y98pdazrbxdllds9"; depends=[R6]; }; lunar = derive2 { name="lunar"; version="0.1-04"; sha256="0nkzy6sf40hxkvsnkzmqxk4sfb3nk7ay4rjdnwf2zym30qax74kk"; depends=[]; }; lutz = derive2 { name="lutz"; version="0.3.1"; sha256="15b8gzwykxyqycjba319jpsbny07j8ny9y4lnrg8mcf488ycz57y"; depends=[lubridate Rcpp]; }; luzlogr = derive2 { name="luzlogr"; version="0.2.0"; sha256="0n0cm94aianwcypa0gwdjvyy3dwbkfv6zi1gq2jn57b41fg20lq5"; depends=[assertthat]; }; @@ -9846,7 +9951,7 @@ in with self; { lvmcomp = derive2 { name="lvmcomp"; version="1.2"; sha256="08hs97bdz4n0bdhvqqq5xywfy140s69c750rn38criq4cw4gm3z7"; depends=[coda Rcpp RcppArmadillo]; }; lvnet = derive2 { name="lvnet"; version="0.3.5"; sha256="1wqqxavs2s0hmlifyaa1jrlc8hj4z72fkgjckkmh9m2r4jp9zy0g"; depends=[corpcor dplyr glasso lavaan Matrix mvtnorm OpenMx psych qgraph semPlot]; }; lvplot = derive2 { name="lvplot"; version="0.2.0"; sha256="01sisj2vbx2yb5w9cjzyaf9j46vh4kkw05xccq1f7wmsg69zmj6b"; depends=[ggplot2 RColorBrewer]; }; - lwgeom = derive2 { name="lwgeom"; version="0.1-7"; sha256="1l3f9six3x56j32l7jdb2iym8641k2vy94xjxzf5219cvx6p6abp"; depends=[Rcpp sf units]; }; + lwgeom = derive2 { name="lwgeom"; version="0.2-1"; sha256="00vm7dvy3s2vkggry9knmr3f39nbiacmwiwd0nvrd21yg47k2qi2"; depends=[Rcpp sf units]; }; lxb = derive2 { name="lxb"; version="1.5"; sha256="16x1mvhxqhvibzmv6mlqcmkgic2sha1xagf7r2azmn4z8x1m9w6n"; depends=[]; }; lymphclon = derive2 { name="lymphclon"; version="1.3.0"; sha256="1jns41sk2rx1j3mg06dzy434k30gpfhbkn6s47fmyv1y8701vfl0"; depends=[corpcor expm MASS]; }; m2b = derive2 { name="m2b"; version="1.0"; sha256="0agzw67mmwrw1f61yn24z5w1pgjssdapg3li0a53i3ylnij45mzr"; depends=[caret caTools e1071 geosphere ggplot2 randomForest]; }; @@ -9855,6 +9960,7 @@ in with self; { mBvs = derive2 { name="mBvs"; version="1.3"; sha256="0vxwdi45pd79c3lz507wlw2alvf501q27lwvd34j6y68p3vyv1vj"; depends=[]; }; mDAG = derive2 { name="mDAG"; version="1.2.2"; sha256="0k85sl0jmpcpiz92cz6x3kd8jc6yyfv9z4wm1kyaikcf5q4qlad4"; depends=[bnlearn logistf mgm nnet pcalg Rcpp RcppArmadillo]; }; mExplorer = derive2 { name="mExplorer"; version="1.0.0"; sha256="1563d9r7f25vw5vsph21z3dwz9n40dpaiyx28ay1bbp5i1x2l3rb"; depends=[nnet qusage]; }; + mFLICA = derive2 { name="mFLICA"; version="0.1.1"; sha256="0r7jpbshmb2p090f2bd7f458rlp2gck1wv7yspf1v55xxjwb6r5x"; depends=[dtw ggplot2]; }; mFilter = derive2 { name="mFilter"; version="0.1-5"; sha256="0anc93mciq8j64knd0i38sfgv10w1gd375wnfzn1fq8sj3lby7kb"; depends=[]; }; mGSZ = derive2 { name="mGSZ"; version="1.0"; sha256="08l98i75h2h8kx9ksvzp5qr8jhf0l6n4j7rg8fcn7hk8chn8v5zh"; depends=[Biobase GSA ismev limma MASS]; }; mHG = derive2 { name="mHG"; version="1.1"; sha256="1rz5ncrvvv9h9grls15apa63v2nh9j87fmp4mwjjil37jx6a5zki"; depends=[]; }; @@ -9865,23 +9971,24 @@ in with self; { mRpostman = derive2 { name="mRpostman"; version="0.3.0"; sha256="18ky3xpgb4rns65574jr9fy8jwi6nrz6py9ai8nqf2r1s0bdmww3"; depends=[assertthat base64enc curl magrittr stringr]; }; mSTEM = derive2 { name="mSTEM"; version="1.0-1"; sha256="0mh09mqqpq9k8jrxs9d39009idld3b4y98ik75czdy580jmdg7mm"; depends=[doParallel foreach latex2exp]; }; mSimCC = derive2 { name="mSimCC"; version="0.0.1"; sha256="1f15r214srcdb4yacmy4hq890a674iqd2s7bry5dk20k46qdl026"; depends=[doParallel foreach]; }; - maSAE = derive2 { name="maSAE"; version="1.0.0"; sha256="0z349p4bipqrfn60cf14b19d1d1b30a302mxkyaknf32n0rz18lk"; depends=[]; }; - mable = derive2 { name="mable"; version="2.0.1"; sha256="1jz0nnjx0sidxgvqfsmps3h4g4f73fpks37r6v11da0dmkcb1biz"; depends=[aftgee icenReg survival]; }; + mStats = derive2 { name="mStats"; version="3.2.2"; sha256="0bvv2133813qfqbqx45x7g3h82jkz8b322ldjj89x2wxc7alwmhs"; depends=[]; }; + maSAE = derive2 { name="maSAE"; version="2.0.1"; sha256="0c7vs0pc4yva726g2vly07r1dnf4ahdkdkq6y6ni0d1hgz296w87"; depends=[]; }; + mable = derive2 { name="mable"; version="2.1.1"; sha256="14bjyij9m86bha1g79aay6x127aq6pqw3hgdklf943inggqb3ava"; depends=[aftgee icenReg survival]; }; maboost = derive2 { name="maboost"; version="1.0-0"; sha256="18d36cgvn8p75nidfr6al458jbzwc1i7x77y1ks50y9phrz3wf65"; depends=[C50 rpart]; }; macc = derive2 { name="macc"; version="1.0.1"; sha256="1qj4mlikbqrxa6m46527xmxdbk7b3l95z6jdgpmi0ifywjiv52a4"; depends=[car lme4 MASS nlme optimx]; }; machQA = derive2 { name="machQA"; version="0.1.4"; sha256="1rdrjy9sxql2c9y691a1jrmgsv7m1ihsschixxb6wc7aahf7mav6"; depends=[machina plyr]; }; machina = derive2 { name="machina"; version="0.1.6"; sha256="009mzqb5jgnilj9b5ldmm5600008bljlqacm8jjxvqsfnfdfg8zv"; depends=[DT httr jsonlite lubridate rhandsontable xts]; }; - macleish = derive2 { name="macleish"; version="0.3.4"; sha256="18pxb1ayqiw8irh05hib6gi5fqyxxgx93jrdd69wwcd455lmn7dv"; depends=[dplyr etl lubridate readr sf]; }; + macleish = derive2 { name="macleish"; version="0.3.5"; sha256="13s8fv9827xjcxxnf74n6f814v27v5jdss45wb5fdzq8ingaq41x"; depends=[dplyr etl lubridate readr sf]; }; mada = derive2 { name="mada"; version="0.5.9"; sha256="1l07dbgm9ghvqq9gh7g6yjfvxk0iq8xfyxz03j4nklbs10k3a0pz"; depends=[ellipse mvmeta mvtnorm]; }; maddison = derive2 { name="maddison"; version="0.1"; sha256="1ji51wnj0ybjd30b4bwn5npyswrmcfrbxcmdlngwzvca1knh8g1c"; depends=[]; }; maditr = derive2 { name="maditr"; version="0.6.3"; sha256="12ycnn384k0hsxlwk2pc3qhaz6rk71sr5qg6harpv3y6w84df8n1"; depends=[data_table magrittr]; }; - madness = derive2 { name="madness"; version="0.2.6"; sha256="1nk6kzjv0fgzbsp3crldq12id2k2wzm4bk9h9bnlkyrjf1hmfiaf"; depends=[expm Matrix matrixcalc]; }; + madness = derive2 { name="madness"; version="0.2.7"; sha256="0vcpydqnpmg9rvvzyjyqvd3qgs42n8cr9cafai51989v2w2bcf85"; depends=[expm Matrix matrixcalc]; }; madr = derive2 { name="madr"; version="1.0.0"; sha256="0lzg75kphz4a0w6n0jbsq87g72jvrbkyas4j813mryq2nv4lmsl4"; depends=[]; }; madrat = derive2 { name="madrat"; version="1.64.5"; sha256="1gccfpzbm5cq9q288k86mq0madh8x9nhw06hrrcfjj5waqhi30lj"; depends=[assertthat digest magclass rlang spam stringr]; }; mads = derive2 { name="mads"; version="0.1.5"; sha256="1ac34iff9hvl1bxk3gs5s3i311g9y59nd6v9jhvnfd6wfhck7krs"; depends=[mrds]; }; madsim = derive2 { name="madsim"; version="1.2.1"; sha256="11gfyimbz363p5xy1x6rsz5fcgzcr55myc5aaz5lazjkcnfn17aq"; depends=[]; }; mafs = derive2 { name="mafs"; version="0.0.3"; sha256="1apacrk8y5b5ids62vd1kn2k28bya9pydxxmdw2dhjyzkgrakdhn"; depends=[cmprsk colorspace CombMSC Epi etm forecast forecastHybrid fracdiff ggplot2 ggseas gtable munsell numDeriv plyr quadprog Rcpp scales tictoc tidyr timeDate tseries zoo]; }; - magclass = derive2 { name="magclass"; version="5.7.0"; sha256="0r4zkx90djh5nnv56icd2na0zsr7daig28gxkldcpj2c6l2n6526"; depends=[abind maptools reshape2 sp]; }; + magclass = derive2 { name="magclass"; version="5.7.3"; sha256="072hcp9m80c1r2vdhk6xp9gpbmiljpslalzh1i9hh7h7hgvp0bj7"; depends=[abind maptools reshape2 sp]; }; magic = derive2 { name="magic"; version="1.5-9"; sha256="0snmdh6vk0p6ar1swsihisinxrx7l8371dri5lk0z24ysgr5w7gs"; depends=[abind]; }; magicLamp = derive2 { name="magicLamp"; version="0.1.0"; sha256="1nfcnbqd6vawz8l3vgkbhmm462xdvaa4pn6axzmz8hl05xv2k3cv"; depends=[httr tibble]; }; magicaxis = derive2 { name="magicaxis"; version="2.0.10"; sha256="053l455si22mddc5cgihhnpkmxr2anfqvbzsa89djjpw5ah2vg1x"; depends=[celestial mapproj MASS plotrix RColorBrewer sm]; }; @@ -9897,7 +10004,7 @@ in with self; { makeProject = derive2 { name="makeProject"; version="1.0"; sha256="09q8xa5j4s5spgzzr3y06l3xis93lqxlx0q66s2nczrhd8nrz3ca"; depends=[]; }; makedummies = derive2 { name="makedummies"; version="1.2.1"; sha256="062rvijhy2dybpgxzp44cg46bfyb8lp9yasv3mhskhf3yg717sqp"; depends=[tibble]; }; malani = derive2 { name="malani"; version="1.0"; sha256="1jps28gfkiysr356ackxf1my5xz6rpx3a2bv68pziy2614hrqbs9"; depends=[e1071]; }; - malariaAtlas = derive2 { name="malariaAtlas"; version="0.0.5"; sha256="1hz23b7yq8vq5ydj1xwazg1zkl4f4kykgy6qhh6v8mwk70yg4s1w"; depends=[curl dplyr ggplot2 gridExtra httr raster rgdal rlang sp stringi tidyr xml2]; }; + malariaAtlas = derive2 { name="malariaAtlas"; version="1.0.0"; sha256="0ibnsk8ibkcikkw8fiiyw2xiyy61bmrirlrv4l4ili4wna0h9w0q"; depends=[curl dplyr ggplot2 gridExtra httr raster rgdal rlang sp stringi tidyr xml2]; }; mallet = derive2 { name="mallet"; version="1.0"; sha256="06rksf5nvxp4sizgya7h4sb6fgw3yz212a01dqmc9p5a5wqi76x0"; depends=[rJava]; }; managelocalrepo = derive2 { name="managelocalrepo"; version="0.1.5"; sha256="180b7ikas1kb7phm4l2z1d8wi45wi0qyz2c8rl8ml3f71b4mlzgc"; depends=[assertthat stringr]; }; mandelbrot = derive2 { name="mandelbrot"; version="0.2.0"; sha256="04a288jj8h1a04r584a02wg9dm3c6zifhqwj964ybsvgb4m6g99s"; depends=[reshape2]; }; @@ -9905,56 +10012,56 @@ in with self; { mangoTraining = derive2 { name="mangoTraining"; version="1.0-7"; sha256="0lw46j44jhdcyh079a7zjmxcnv5c6qsfachinlwv3ild1gwggr3p"; depends=[]; }; manhattanly = derive2 { name="manhattanly"; version="0.2.0"; sha256="185fkakx4v35n4gmlpk2kfm2bm8p320q4khkw936m09zx3aqz398"; depends=[ggplot2 magrittr plotly]; }; manhplot = derive2 { name="manhplot"; version="1.1"; sha256="17yw10gpfp6bqmilb09v61jd2amz6cv1z38si4nqnhbvmac065qd"; depends=[ggplot2 ggrepel gridExtra reshape2]; }; - manifestoR = derive2 { name="manifestoR"; version="1.3.0"; sha256="1bxmlg6fmr4ky9m7b65rrylspwhwc8k9s1cbxnx9dyl33wh39ci6"; depends=[base64enc dplyr DT functional htmltools htmlwidgets httr jsonlite magrittr NLP psych tibble tm zoo]; }; manipulate = derive2 { name="manipulate"; version="1.0.1"; sha256="1klknqdfppi5lf6zbda3r2aqzsghabcsaxmvd3vw3cy3aa984zky"; depends=[]; }; - manipulateWidget = derive2 { name="manipulateWidget"; version="0.10.0"; sha256="1zagrbwkn2d50zzw8i2vyb1hsq4cydmfsqiy1a2qlp6zrv8a6q9x"; depends=[base64enc codetools htmltools htmlwidgets knitr miniUI shiny webshot]; }; - manymodelr = derive2 { name="manymodelr"; version="0.2.2"; sha256="02jswli6k4m9662zf48maix28lr7w93rgwvzgm0nv1zf2mdrh6qb"; depends=[caret dplyr e1071 magrittr Metrics plyr purrr reshape2 tibble]; }; - maotai = derive2 { name="maotai"; version="0.1.2"; sha256="0j95q2b9719ffw4nbm0ziyprkj3p8s958xyqyrx202d1r9i0igs6"; depends=[Matrix mclust Rcpp RcppArmadillo Rdpack RSpectra shapes]; }; + manipulateWidget = derive2 { name="manipulateWidget"; version="0.10.1"; sha256="1vi71sjh7z1a880wffk8qqw7iysvk42q78giqxmm2sqz2a912qlx"; depends=[base64enc codetools htmltools htmlwidgets knitr miniUI shiny webshot]; }; + manymodelr = derive2 { name="manymodelr"; version="0.2.4"; sha256="13d1lgz22wpvbn56m32w5m1w2gk2jz0p3m2130lmwain4nb9rsmk"; depends=[caret dplyr e1071 ggplot2 magrittr Metrics plyr purrr reshape2 tibble]; }; + maotai = derive2 { name="maotai"; version="0.1.4"; sha256="1kzhizprdq5fmvhm0s1qyn0kcrm5qkc6wjggvngr1bjpnh9kkds9"; depends=[cluster Matrix mclust Rcpp RcppArmadillo Rdpack RSpectra shapes]; }; mapReasy = derive2 { name="mapReasy"; version="1.0"; sha256="13va0z967ckwxnnianki5aj66km0x6r37nj4mz9qd3b0bps4g2kj"; depends=[Hmisc rgdal sp]; }; mapStats = derive2 { name="mapStats"; version="2.4"; sha256="18pp1sb9p4p300ffvmzjrg5bv1i7f78mhpggq83myc26c3a593na"; depends=[classInt colorspace Hmisc lattice maptools RColorBrewer reshape2 sp survey]; }; mapcan = derive2 { name="mapcan"; version="0.0.1"; sha256="1a4135wc1h4nzcv6xq0bg75i744wyq8p7q0ix7y2x2gb6s35w46k"; depends=[dplyr ggplot2 magrittr]; }; 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.5.0"; sha256="16rdksnkx6s7w92as896scfdnl1smp00fdnxmlz4ayym2a26wagb"; depends=[dplyr htmltools htmlwidgets jsonlite leaflet leaflet_extras leafpm mapview miniUI sf shiny]; }; + mapdeck = derive2 { name="mapdeck"; version="0.3.2"; sha256="15xy8gdv7nwlqk61sfwa0m7miwyr776sqvhqn9x0jzm4r9y2cp4d"; depends=[BH colourvalues geojsonsf googlePolylines htmlwidgets jsonify magrittr rapidjsonr Rcpp sfheaders shiny spatialwidget]; }; + mapedit = derive2 { name="mapedit"; version="0.6.0"; sha256="1ix0sjsqb6646xyi73am9ic97plw9y9p4pl8mrkpzvqzm0pxdhxx"; depends=[dplyr htmltools htmlwidgets jsonlite leafem leaflet leaflet_extras leafpm mapview miniUI raster scales sf shiny sp]; }; mapfit = derive2 { name="mapfit"; version="0.9.7"; sha256="16a318bz3my27qj0xzf40g0q4bh9alg2bm6c8jbwgswf1paq1xmx"; depends=[Matrix]; }; mapi = derive2 { name="mapi"; version="1.0.1"; sha256="0qfwxrd0ya5amw7f96pfxf3f8m97s7vhaz62clqn083mw8ddaz2l"; depends=[data_table pbapply Rcpp sf]; }; mapmisc = derive2 { name="mapmisc"; version="1.7.7"; sha256="07hnfn0fnydckniyhixrsw7m22hmvzksqxlwcw2i0jb7qq3h3vqa"; depends=[raster sp]; }; mapplots = derive2 { name="mapplots"; version="1.5.1"; sha256="18s2y66f8vi8g2r8a25zbgp2xm079r8v8qxv0w71h8krycs6vs9p"; depends=[]; }; - mapproj = derive2 { name="mapproj"; version="1.2.6"; sha256="1rggww8cbwv0vzlj5afzhbsbngg4bzj5znbkz7wmxsbshfbsm9b2"; depends=[maps]; }; + mapproj = derive2 { name="mapproj"; version="1.2.7"; sha256="0nscsfq8md6ri9258xz57c3dj81wdl6kdwf4a9qcrwwbn20i427h"; depends=[maps]; }; 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=[]; }; + mapsFinland = derive2 { name="mapsFinland"; version="0.1.1"; sha256="0kx9r28lvc6bbl478i9gyy58kbp5hi7akysyld87fxk5x0601j19"; depends=[]; }; mapsRinteractive = derive2 { name="mapsRinteractive"; version="1.0.0"; sha256="0lpmizhaan7zp201wjaq544wadizwpswch7sn6m3sjwn8rswg6av"; depends=[gstat raster rgdal rgeos sp]; }; mapsapi = derive2 { name="mapsapi"; version="0.4.2"; sha256="1l7sp65ghdcli6ajkvlnhfizjq16mw2cmlf8jbif3al1vhbv4dvw"; depends=[bitops magrittr plyr sf xml2]; }; maptools = derive2 { name="maptools"; version="0.9-9"; sha256="0v4llkxk8qs61vq4ykvaim4k23aagdaz0p62ns7zfq02sln3pfk9"; 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]; }; mapview = derive2 { name="mapview"; version="2.7.0"; sha256="1cqa7hw7h0n6ing87bq903ax2m4iw82xb2jdgl55z9v9rdhxp0xh"; depends=[base64enc brew htmltools htmlwidgets lattice leafem leaflet leafpop png raster Rcpp satellite scales sf sp svglite uuid viridisLite webshot]; }; mar1s = derive2 { name="mar1s"; version="2.1.1"; sha256="1ljkvgxrramfx1rnp2rg6516mjxaa6s96amrnmqymnyjz7wlf37l"; depends=[cmrutils fda zoo]; }; march = derive2 { name="march"; version="3.1"; sha256="1y3ndnkxrqxavp7b5dwhn1mijhhn06k5b6iickzjr4bfmpfnk340"; depends=[]; }; marcher = derive2 { name="marcher"; version="0.0-2"; sha256="0hcxbfrwniih4kvx5sxhlffz1pc87kf52v8hvaf193rhhdykis5q"; depends=[magrittr Matrix minpack_lm mvtnorm numDeriv plyr RColorBrewer scales zoo]; }; - marelac = derive2 { name="marelac"; version="2.1.9"; sha256="07xhlsdzz2j5smh3v4hpm8zp4ljg9aa3i67j65hs1cq27q1jg1n7"; depends=[seacarb shape]; }; + marelac = derive2 { name="marelac"; version="2.1.10"; sha256="08phsghzvi0z78pkb5lkamni83fsw0bqfri99j6bjf6y14aygif9"; depends=[seacarb shape]; }; marg = derive2 { name="marg"; version="1.2-2.1"; sha256="1r6rl7dhvm8dghm7pm4hfw3924qja65hczl6d47v9ixnv4rxyzr9"; depends=[statmod survival]; }; margins = derive2 { name="margins"; version="0.3.23"; sha256="1gn18bmz7zwdv5fm62g4kj1x0y4lzhwvwgk4xc9hfi2mh5w08j4f"; depends=[data_table MASS prediction]; }; marima = derive2 { name="marima"; version="2.2"; sha256="03nvh93r4052li84yjqzc106gwh1542q9s192s980gs6sgy8scm6"; depends=[]; }; marindicators = derive2 { name="marindicators"; version="1.0.0"; sha256="1id055jc624n34vxb68gdy2kgfsm5y61dkfskzhlrwq9d5npxv6m"; depends=[]; }; markdown = derive2 { name="markdown"; version="1.1"; sha256="06zwbrp14bri3470anadd7dvgmw06xf8df6v2pk64wx3f9sd934d"; depends=[mime xfun]; }; + markdownInput = derive2 { name="markdownInput"; version="0.1.2"; sha256="1qxil2liikbbn6w8niyc03fwqvwvdv6wiy98ip8j77729i7g2hln"; depends=[markdown shiny shinyAce]; }; marked = derive2 { name="marked"; version="1.2.6"; sha256="0k367sjyac1w894rndz5m0drmbd56nzyx5mr7mvhsqzq3gnv4dw5"; depends=[bookdown coda data_table expm kableExtra knitr lme4 Matrix numDeriv optimx R2admb Rcpp TMB truncnorm]; }; + marketr = derive2 { name="marketr"; version="0.0.1"; sha256="0pchyfhim18m88r9m9dhihj89isvjwgmka9bdi64n0hnmv0qv8ds"; depends=[dplyr magrittr rlang tibble tidyr]; }; markmyassignment = derive2 { name="markmyassignment"; version="0.8.2"; sha256="1jrx72k3glwv5nci3h3qbqbs0x9mqld92v4irw2sfjzcmb7qyma3"; depends=[checkmate codetools httr lazyeval rlang testthat yaml]; }; markophylo = derive2 { name="markophylo"; version="1.0.7"; sha256="09rg5rwm0dm881fpm9yzygd6d3dyrxjsrvl0yhfpkzbpdihfympn"; depends=[ape numDeriv phangorn Rcpp RcppArmadillo]; }; - markovchain = derive2 { name="markovchain"; version="0.8.2"; sha256="1dqkrwk9xmclwzk76lqj9s87jchvfcnmqi9rfjha6lyr5hy7c79g"; depends=[expm igraph matlab Matrix Rcpp RcppArmadillo RcppParallel]; }; + markovchain = derive2 { name="markovchain"; version="0.8.4"; sha256="154prv8bwx9a9956l3vkph60j8cg49q78q217qfqh2j2v7h7rfb9"; 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.3"; sha256="0hjy58kk2kg7v2nq7kfw5rdcrpfhikwr30lz71pfgis34833i7yy"; depends=[adehabitatMA DBI gdistance geosphere ggplot2 ncdf4 plotrix raster reshape2 RSQLite shape sp]; }; - marqLevAlg = derive2 { name="marqLevAlg"; version="2.0.1"; sha256="0lcr5bn101krgqwjnbk9r3xizwwxnsgyi84hg95jpb5f2sa2bpg8"; depends=[doParallel foreach]; }; + marqLevAlg = derive2 { name="marqLevAlg"; version="2.0.2"; sha256="0q3whfhi17qa8dfd5hjyqxc7a7p8hdfkkmvccdigfbqvksf24fxs"; depends=[doParallel foreach]; }; mase = derive2 { name="mase"; version="0.1.2"; sha256="1023xvv6yngbc183hb13057spjildywqd0jw2w9jway3zv4dbw9v"; depends=[boot dplyr foreach glmnet magrittr Matrix Rdpack rpms survey]; }; mason = derive2 { name="mason"; version="0.2.6"; sha256="01ppc7f18kf4xv4lrhib0cfm85v658grmxpny3h3kdb4pi4rbspy"; depends=[broom dplyr lazyeval magrittr tidyr]; }; - mastif = derive2 { name="mastif"; version="1.0"; sha256="1xxfql4d298ib9h8821jp717a60vgxq7nzs08yb3xyzp0c3djja2"; depends=[corrplot RANN Rcpp RcppArmadillo repmis xtable]; }; matR = derive2 { name="matR"; version="0.9.1"; sha256="1qw2vqmpq7gc3dmr9r000ccjj7xa0h82waxnvryz3l17ggryyjjm"; depends=[BIOM_utils MGRASTer]; }; - matahari = derive2 { name="matahari"; version="0.1.2"; sha256="1bn30c2xf9vw0p4jnw3mjjlr6f5nsib0ffb8736n2v4rrifgxqsg"; depends=[clipr jsonlite purrr readr rlang rstudioapi tibble]; }; + matahari = derive2 { name="matahari"; version="0.1.3"; sha256="03mhn4qh1vcz2hr0mxp6gijwgrzvbpfb8dq7lqhchbk5gq5g3fnh"; depends=[clipr jsonlite purrr readr rlang rstudioapi tibble]; }; matchMulti = derive2 { name="matchMulti"; version="1.1.7"; sha256="0k5psmjzcyr7pm603vni7w2hvslck05r81cngm26pql2prdrv5yk"; depends=[coin Hmisc MASS mvtnorm plyr rcbsubset weights]; }; matchbook = derive2 { name="matchbook"; version="1.0.7"; sha256="0xfqg8z2zkn215kqmjjkqdwrgsk7cn4jdpxfgd6razhcbvflg48j"; depends=[]; }; matchingMarkets = derive2 { name="matchingMarkets"; version="1.0-2"; sha256="1jj5hzxiivqinkpddmkqdxgi83jm6blann9wgv4g8prn3lvp0i85"; depends=[lattice lpSolve partitions Rcpp RcppArmadillo RcppProgress rJava]; }; matchingR = derive2 { name="matchingR"; version="1.3.0"; sha256="1rpw5a52alh5diiqr7f87vhpgp3w3f8lg8wkaqvr5idid9fkll1i"; depends=[Rcpp RcppArmadillo]; }; - matchmaker = derive2 { name="matchmaker"; version="0.1.0"; sha256="162zyvnz80rivy99na1hwp0drq913gvp1gs2jiaficpv4xlxl6ia"; depends=[cli forcats rlang]; }; + matchmaker = derive2 { name="matchmaker"; version="0.1.1"; sha256="1sa2cah8gjvg0159rv1sfw9p0aljg66xmij31mz2vfk5683r4b00"; depends=[cli forcats rlang]; }; matconv = derive2 { name="matconv"; version="0.4.0"; sha256="0kl0647m45mrk13fyr0mkx1x9v3im66ciky8k8nmy4ahkffyasi4"; depends=[]; }; mateable = derive2 { name="mateable"; version="0.3.1"; sha256="1ka9xxicibpfg6k3njq5f5576jwj734r1mb46a2cmiyq676ks7pp"; depends=[FNN Rcpp sn]; }; mathgraph = derive2 { name="mathgraph"; version="0.9-14"; sha256="11wcnjligjc0m0ibi7v5f9w4j2g0fmw33za8407d9fqdb0i5pf60"; depends=[]; }; @@ -9962,19 +10069,20 @@ in with self; { matie = derive2 { name="matie"; version="1.2"; sha256="1ymx49cyvz63imqw5n48grilphiqvvdirwsrv82p7jgxdyav2xv0"; depends=[cba dfoptim gplots igraph mvtnorm seriation]; }; matlab = derive2 { name="matlab"; version="1.0.2"; sha256="0m21k2vzbc5d3c93p2hk4208xyd2av2slg55q5j1ibjidiryqgd2"; depends=[]; }; matlabr = derive2 { name="matlabr"; version="1.5.2"; sha256="1ba6cajnzldb1gmn7rf0b198h6mdh58r3frm0z0cmvbinspwz3x7"; depends=[stringr]; }; - matlib = derive2 { name="matlib"; version="0.9.2"; sha256="09afscydrn5bk91qb26r8w7f33nhxp1ih4h55y6adcw7p6hjrw27"; depends=[car MASS rgl xtable]; }; + matlib = derive2 { name="matlib"; version="0.9.3"; sha256="09fndv9dpc48s1i263amhgk7bjhz0wzksbhkzkl392v85r84bj6x"; depends=[car MASS rgl xtable]; }; matpow = derive2 { name="matpow"; version="0.1.1"; sha256="1a6q21ba16qfdpykmjwgmrb1kkvvyx48qg8cbgpdmch0vhibcgcp"; depends=[]; }; + matricks = derive2 { name="matricks"; version="0.8.2"; sha256="0ik61jxd4hpw149dbbmis3wsfsim60mw9d0qjwh047qfg6sm1vsc"; depends=[ggplot2 Rcpp reshape2 rlang]; }; matrixLaplacian = derive2 { name="matrixLaplacian"; version="1.0"; sha256="1ixqdv3sz3sc79wn3vqhlq79j7x7cvl878m5hgvbcg6klfvlmmci"; depends=[scatterplot3d]; }; matrixNormal = derive2 { name="matrixNormal"; version="0.0.1"; sha256="1nvsgcp8x691pa2rjz2fgknybwpni6fppm16l5bjkrg47ka0pbcd"; depends=[mvtnorm]; }; matrixProfile = derive2 { name="matrixProfile"; version="0.5.0"; sha256="0nd54k878xf7hzwxawh03c3na4jfvb68afarkwrmmffjlp3i8a9g"; depends=[fftw signal TTR zoo]; }; - matrixStats = derive2 { name="matrixStats"; version="0.55.0"; sha256="06fvx0rlaz80k0lkqq2n7v0309xpz7h7ss0m9kgyikp4xs8bvmhn"; depends=[]; }; + matrixStats = derive2 { name="matrixStats"; version="0.56.0"; sha256="09qgfv9x32x6ncgf19iy7yjp26fwy6p5wm8spc2xzfc0qhylmqrr"; depends=[]; }; matrixStrucTest = derive2 { name="matrixStrucTest"; version="1.0.0"; sha256="06la9xmpi1viyjml4m1akbna3lwkz5lnq95v1nnf73i9zpfwz03k"; depends=[]; }; matrixTests = derive2 { name="matrixTests"; version="0.1.8"; sha256="18f0nklhq5xsh8dwqqz2kdq5csyxc8jdx3r0d1hcm27l3l48h56s"; 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]; }; + matrixpls = derive2 { name="matrixpls"; version="1.0.9"; sha256="13wsd0kbn77mjd5rkfdv9di8pxg898adrgdpqcyridvikjhqlh0j"; depends=[assertive lavaan MASS matrixcalc psych]; }; matrixsampling = derive2 { name="matrixsampling"; version="2.0.0"; sha256="05dbn7rj07jx1hj7i6k3akf11hysxg6v32kav9fvsqmiy2zkippa"; depends=[keep]; }; - matsbyname = derive2 { name="matsbyname"; version="0.4.11"; sha256="0v236k0wsj1i92fmh1jikh7qwq7gxsi7dc7kamls611p48wk9082"; depends=[dplyr Hmisc magrittr]; }; - matsindf = derive2 { name="matsindf"; version="0.3.2"; sha256="1jjfsavhmhjicvccfzh3j1a1ayfhvp81d6fybq660b076ya1hkrr"; depends=[dplyr magrittr matsbyname purrr rlang rlist tibble tidyr]; }; + matsbyname = derive2 { name="matsbyname"; version="0.4.12"; sha256="0pryr18xz06w9jlnq2wcy0nddlr456zqwcc4d8bfj1mm3mr9q9j7"; depends=[dplyr Hmisc magrittr purrr rlang tibble]; }; + matsindf = derive2 { name="matsindf"; version="0.3.4"; sha256="0r8hs53c4xv7lldz8mzh3hy5jq64c3cza9yifjjzpwvlw42y631l"; depends=[dplyr magrittr matsbyname purrr rlang rlist tibble tidyr]; }; mau = derive2 { name="mau"; version="0.1.2"; sha256="1wgiai8f1kbjh9hfwv4m0kavd44ib5xb33p8m16zpawnw14m7sj5"; depends=[data_table ggplot2 gtools igraph RColorBrewer Rdpack stringr]; }; mauricer = derive2 { name="mauricer"; version="2.0.5"; sha256="01x1cigwr95hzyz1pm9w5xi2j9z4zf54p6bwhn0y865gln80wvnz"; depends=[beastier stringr]; }; maxLik = derive2 { name="maxLik"; version="1.3-8"; sha256="1rfzd2n7ak69pbnnzbvd0c4kk9h812sq1f17hamnqx77pw84sh1k"; depends=[miscTools sandwich]; }; @@ -9984,17 +10092,18 @@ in with self; { maxlike = derive2 { name="maxlike"; version="0.1-8"; sha256="0lbj212dbx8lbkw808xlhniw5864bh86xs8zwvxcnngj0abapalh"; depends=[raster]; }; maxmatching = derive2 { name="maxmatching"; version="0.1.0"; sha256="1xbwrhmr8gzvlcprib7nzvqrcd355bhx7wkqxrvfk4g7dvskf9ka"; depends=[igraph]; }; maxnet = derive2 { name="maxnet"; version="0.1.2"; sha256="1rfcylbv068pz4jgry5ijszwf5fibz566s5iv0ar8dhv0fhjr86z"; depends=[glmnet]; }; + maxnodf = derive2 { name="maxnodf"; version="1.0.0"; sha256="1czhy3177bb4a5rxi2s4j3c9xn9f0b2pbkdka1dzw6ga389wdwb3"; depends=[Rcpp]; }; maxstat = derive2 { name="maxstat"; version="0.7-25"; sha256="114z1rwxwvk05ijjhdppzm148n1h192fp0w12ky10zkrhf6kphbg"; depends=[exactRankTests mvtnorm]; }; mazeGen = derive2 { name="mazeGen"; version="0.1.3"; sha256="192xygg3l4rpqp49sgd5hpp4h3f8wjhyldn0l8abxhsks7jd2kfb"; depends=[igraph]; }; mazealls = derive2 { name="mazealls"; version="0.2.0"; sha256="14j6syw1zkgs4cnmxzqpm6klmgvck2gg97wkzmy9al6n0biy8gmb"; depends=[TurtleGraphics]; }; mazeinda = derive2 { name="mazeinda"; version="0.0.1"; sha256="0ns4ib73y4fghf7p1wg0a05js4mqr66dpp49p1h039pqrb0f1vwd"; depends=[foreach]; }; mbbefd = derive2 { name="mbbefd"; version="0.8.8.5"; sha256="1bnbavhii2wm9944l4j5x21y9b3kp0sdshz32r1k7cy1y569zd6r"; depends=[actuar alabama fitdistrplus gsl MASS Rcpp]; }; mbclusterwise = derive2 { name="mbclusterwise"; version="1.0"; sha256="1ilqaxcxf1k3ck910s0xqwnp88w8ag5rn1dpvaa1i7jlcldsbnhp"; depends=[ade4 doParallel foreach kknn]; }; - mbend = derive2 { name="mbend"; version="1.2.3"; sha256="0w1rrj1zcbvi8nlspzqa8142ilvbw9q6m26kmxqcp9mvqzbnbd30"; depends=[]; }; + mbend = derive2 { name="mbend"; version="1.2.5"; sha256="0p9clxfrrj0j58splarb8ljvini1gi7mmn2fqay7w4hc5l8rhh6d"; depends=[]; }; mbest = derive2 { name="mbest"; version="0.6"; sha256="1x0f7y5hj6a35wq1xn6g7jyjn9c4zryahwlf07qrypgrcnj2m8vx"; depends=[abind bigmemory foreach lme4 logging nlme]; }; mbir = derive2 { name="mbir"; version="1.3.5"; sha256="10sd5gk2k94cmi49nbpywqvh9bxj9q3psa3d00zmw1a7d6c0jjpd"; depends=[effsize psych]; }; mblm = derive2 { name="mblm"; version="0.12.1"; sha256="1fipb3bryaimr30lcxsxrn0ymv24z39swca7s4z7p9xcfg3ban1b"; depends=[]; }; - mboost = derive2 { name="mboost"; version="2.9-1"; sha256="02ia3y0fxfjl02fb1nnl93j640fyl18jm15cgxyybhf27w4jdvb7"; depends=[lattice Matrix nnls partykit quadprog stabs survival]; }; + mboost = derive2 { name="mboost"; version="2.9-2"; sha256="1ajlspdkh7zj9jhjhz7zsllv3dzwpx272ksrk91gzidda4hbmiil"; depends=[lattice Matrix nnls partykit quadprog stabs survival]; }; mboxr = derive2 { name="mboxr"; version="0.2.0"; sha256="1d11fpz17k65dzw9sjc7zfs1jpajzrh2pvr2s435p83g3mpf40vz"; depends=[dplyr lubridate magrittr purrr reticulate stringr tibble tidyr]; }; mbrglm = derive2 { name="mbrglm"; version="0.0.1"; sha256="0yxq1xk8qy5hpiqqldyrs78lp4ggdp5lj2lmh8rqq1xvsfr6nrh4"; depends=[enrichwith nleqslv]; }; mbsts = derive2 { name="mbsts"; version="1.0"; sha256="0wkglh1g0kdlgw4afqxvwb26difnqhf6g5jsbf8y39mpipxla365"; depends=[KFAS MASS Matrix MCMCpack pscl]; }; @@ -10004,7 +10113,7 @@ in with self; { mcGlobaloptim = derive2 { name="mcGlobaloptim"; version="0.1"; sha256="1p8841y9a4yq51prv6iirgw9ln8jznx8nk547sc5xlznksjy1g9n"; depends=[randtoolbox snow]; }; mcMST = derive2 { name="mcMST"; version="1.0.1"; sha256="18ka76g9pgpycaw0hl8vxpabd8584q1l5d3xmrzy1zwincsg7vgs"; depends=[BBmisc checkmate ecr ggplot2 gtools lhs parallelMap reshape2 vegan]; }; mcPAFit = derive2 { name="mcPAFit"; version="0.1.4"; sha256="1h5kiry8bvdrgyqf7cqsag0b7rscwc7phayzf6h4css1667bvm0g"; depends=[PAFit RColorBrewer Rcpp]; }; - mcStats = derive2 { name="mcStats"; version="0.1.1"; sha256="1jc9mzk97d8fcbn6rh6prgwbdir2hzjfxm0ydw75h6mkgiqchcz0"; depends=[dplyr ggplot2 ggthemes gridExtra magrittr rlang tidyr]; }; + mcStats = derive2 { name="mcStats"; version="0.1.2"; sha256="1r8dxdfcvznl2968xr6fbany1rh7wq5z1p7fhdf5g4b5l28j8pf9"; depends=[dplyr ggplot2 ggthemes gridExtra magrittr rlang tidyr]; }; mcbiopi = derive2 { name="mcbiopi"; version="1.1.6"; sha256="1caw2sy15hw2zw0bdynwnsa7hn4rly34hlxp06nwm5lssz8l2597"; depends=[]; }; mcc = derive2 { name="mcc"; version="1.0"; sha256="0p661a870bvh3xhcahqqq85azn9rjl3vacjy96jsdn86irj4s0vi"; depends=[]; }; mcca = derive2 { name="mcca"; version="0.7.0"; sha256="01nm0plgkik241qhd06v1vs84lf7agc0vkxa27cpr5qlfl4cm4zb"; depends=[caret e1071 MASS nnet pROC rgl rpart]; }; @@ -10012,36 +10121,38 @@ in with self; { mcclust = derive2 { name="mcclust"; version="1.0"; sha256="00qprmsjwbn2d0jl7p9mz8pv7k8ld3mzk862pr1grigk0lqwhx06"; depends=[lpSolve]; }; mccmeiv = derive2 { name="mccmeiv"; version="2.1"; sha256="1lkghvvwxvg474p37h1mpbackr5qmy05qkx8yiq4x066wrfq1w1i"; depends=[MASS numDeriv survival]; }; mccr = derive2 { name="mccr"; version="0.4.4"; sha256="1scqds1yx317qmjappy2h1m564dcmsqqfpdm8pm3plalag16xrhj"; depends=[]; }; - mcemGLM = derive2 { name="mcemGLM"; version="1.1"; sha256="07ky3bvcns24qia9pyvf5lp7764h8gn2g8zr304iz4x9bq6jvsi0"; depends=[Rcpp RcppArmadillo trust]; }; + mcemGLM = derive2 { name="mcemGLM"; version="1.1.1"; sha256="0p6z32c69ik8wjjn50vzjmr4plsfbxr2p0hr50wknkwwb7i20hp6"; depends=[Rcpp RcppArmadillo trust]; }; mcen = derive2 { name="mcen"; version="1.0"; sha256="0dgic137n3qvxljj3f7j3kq3x2rkblxzg55hjbknspwp0i7i4lx8"; depends=[faraway flexclust glmnet Matrix]; }; mcga = derive2 { name="mcga"; version="3.0.3"; sha256="109m01mab5awjf8zjzwl9j7hzac15dyq3x6zba9hsy5i02k5d5w4"; depends=[GA Rcpp]; }; mcgfa = derive2 { name="mcgfa"; version="2.2.1"; sha256="19z5008274pwlwv47imixnfd4nxwnrhdhsq2m3grjzndxp41i4xz"; depends=[]; }; mcgibbsit = derive2 { name="mcgibbsit"; version="1.1.0"; sha256="09ydcbjz3abmh46966v01dh26fy79dfklk3zjf262zp3c62ld9yf"; depends=[coda]; }; - mcglm = derive2 { name="mcglm"; version="0.5.0"; sha256="154js7nzxw7wvvz3vbcyh4iws33k1ckq0wcp4mkz9s6374lgw25s"; depends=[assertthat Matrix Rcpp RcppArmadillo]; }; mcheatmaps = derive2 { name="mcheatmaps"; version="1.0.0"; sha256="1gglm32xpmim38m7fziczgqfbpcq2899lxardsrzg6j1vhmf765y"; depends=[gridBase]; }; mclcar = derive2 { name="mclcar"; version="0.1-9"; sha256="0bwnivmajsrvmwskhk44qhz4nnc0irxq83g0kzbj4wshhivnwryp"; depends=[fields maxLik nleqslv rsm spam spdep]; }; mcll = derive2 { name="mcll"; version="1.2"; sha256="0i9zqbh0l9a9mv4558gbdq9mh52chanykyfwmiymmxygxhp809sz"; depends=[locfit statmod]; }; mclogit = derive2 { name="mclogit"; version="0.6.1"; sha256="1flq3g5jbp8nnx066wz35bg8wzlnnp9jp731w87vba483amakcds"; depends=[Matrix memisc]; }; mclust = derive2 { name="mclust"; version="5.4.5"; sha256="0whandnda1fnjn5k3hgxdbp3b0xr7nlzy1j37saqb536h8q9dwkm"; depends=[]; }; mclustcomp = derive2 { name="mclustcomp"; version="0.3.1"; sha256="0jdfdmgd46w7b38nbpd0lj9vqzi2nnf8fv0crj08lfin5ng7jvaa"; depends=[Rcpp RcppArmadillo Rdpack]; }; - mcmc = derive2 { name="mcmc"; version="0.9-6"; sha256="1fc6a6asn53lx7x7pnlb5mb716nv4pcmbp99f1i30y4hzygihfj4"; depends=[]; }; - mcmcabn = derive2 { name="mcmcabn"; version="0.2"; sha256="0mn12dkag1wlr0sdzfxxl1hkwkkwl9p2c4imnm4nzhw510zaa4fj"; depends=[abn coda cowplot ggplot2 ggpubr gRbase]; }; + mcmc = derive2 { name="mcmc"; version="0.9-7"; sha256="0q42m8ab7b6bxhns494ksjdss5f3c5m2jjfdlfj6fk1nz7ax7i5p"; depends=[]; }; + mcmcabn = derive2 { name="mcmcabn"; version="0.3"; sha256="0p4g7bnaq87kgfhsc3a8wdifngs4lb5il5wy9im81gz30ji9gbn7"; depends=[abn coda cowplot ggplot2 ggpubr gRbase]; }; mcmcderive = derive2 { name="mcmcderive"; version="0.0.1"; sha256="12asjw8rnnr7249fb7z7mp5w8y5vb0zig93jzsf77gghhfjmp4dl"; depends=[abind checkr err mcmcr purrr]; }; mcmcplots = derive2 { name="mcmcplots"; version="0.4.3"; sha256="0187z79gmvcrwqybxh3ckhcrqi0nqhvcvlczgxfkpq95y5czprdq"; depends=[coda colorspace denstrip sfsmisc]; }; mcmcr = derive2 { name="mcmcr"; version="0.2.0"; sha256="0jiyr0ncwhkgvkq4jb27iv1pxra9jbrjkv57lla71afr6glisqp2"; depends=[abind checkr coda err]; }; - mcmcse = derive2 { name="mcmcse"; version="1.3-2"; sha256="0yz0zhqhsxxg1b0cf15ijxfj4q8csjng18bmq45anabllq16ymkj"; depends=[ellipse Rcpp RcppArmadillo]; }; + mcmcse = derive2 { name="mcmcse"; version="1.4-1"; sha256="05sxz2bjb1y389vrmykcn6hwhgpykzpnh94aq34mbpqdsrb1y63b"; depends=[ellipse Rcpp RcppArmadillo]; }; mco = derive2 { name="mco"; version="1.0-15.1"; sha256="14y10zprpiflqsv5c979fsc2brgxay69kcwm7y7s3gziq74fn4rw"; depends=[]; }; - mcompanion = derive2 { name="mcompanion"; version="0.5-1"; sha256="11drfgy0knixhwjsywcr95b0isfmqkx9ygxq4phdnz839m2bki30"; depends=[gbutils MASS Matrix Rdpack]; }; + mcompanion = derive2 { name="mcompanion"; version="0.5-3"; sha256="0051agyzbhrsxi9wpfpqcq98h7y25627s2czf30qxcq80m7xbhj0"; depends=[gbutils MASS Matrix Rdpack]; }; mcp = derive2 { name="mcp"; version="0.2.0"; sha256="19bckg1wzv6k2j57s38rpjqrimj34lzaa3f0izxz36sahavyy2vj"; depends=[bayesplot coda dplyr future future_apply ggplot2 loo magrittr patchwork purrr rjags rlang stringr tibble tidybayes tidyr tidyselect]; }; mcparallelDo = derive2 { name="mcparallelDo"; version="1.1.0"; sha256="1ivh0d4f7ks6xwcjywk62h1zhr7h5bbhzpisky7973wi4g8vipbn"; depends=[checkmate R_utils R6]; }; mcprofile = derive2 { name="mcprofile"; version="0.2-3"; sha256="0rakaa1p6z0p4jl4df357vi58wzph81ik6plc8zzl370r8mj1y8q"; depends=[ggplot2 mvtnorm quadprog]; }; mcr = derive2 { name="mcr"; version="1.2.1"; sha256="0237w41xichd418ax9xviq4wxbcc6c0cgr5gvzkca67nnqgc4jaz"; depends=[]; }; mcsm = derive2 { name="mcsm"; version="1.0"; sha256="13sx7s3ywis5n4a70ld2szld9fb8jkfsc82dy6iskhy17vy8pml0"; depends=[coda MASS]; }; mctest = derive2 { name="mctest"; version="1.2.5"; sha256="1brqa8rvb5jvwmjz4wms7rhzv9xpvqydzkjm46ckz9fsiwrkq5mf"; depends=[]; }; + mcunit = derive2 { name="mcunit"; version="0.3.1"; sha256="12zlm14gcfid7h9szrggwmhy54d0wk57r8w8l3p3x3yp49144v67"; depends=[Rdpack rlang simctest testthat]; }; md = derive2 { name="md"; version="1.0.4"; sha256="13z8f3p84kivk6j58fb1qpzrmml41mq9pgv9nv2gvxrhyhanzi46"; depends=[]; }; md_log = derive2 { name="md.log"; version="0.1.1"; sha256="0ix5nz38xzlhrga40hfhlfss938mrfbni2wysvz2qbpm59qxrhg0"; depends=[futile_logger]; }; mda = derive2 { name="mda"; version="0.4-10"; sha256="19g6kn6g0shidrjfffklbmzc5w7mcimrxhagx4nmpslg59ibqdkh"; depends=[class]; }; - mdatools = derive2 { name="mdatools"; version="0.9.4"; sha256="1w3q3mzxbclzfllj277miap89161i6l1jf278iq07d0q9v0x7lnv"; depends=[]; }; + mdapack = derive2 { name="mdapack"; version="0.0.1"; sha256="1lz620nb51ih79djlma2hnasjr499dqkbvdn077n9pq14912z8q0"; depends=[covr curl devtools ggplot2 gh git2r httr knitr openssl pkgbuild reshape2 rlang rmarkdown roxygen2 spelling testthat]; }; + mdatools = derive2 { name="mdatools"; version="0.10.3"; sha256="0xpwysdqyimcxhkmkwq2pwhsv23i4nhfjwsdjrfywnjghw90a286"; depends=[]; }; + mde = derive2 { name="mde"; version="0.1.0"; sha256="129h28fhnfl4b0sm8q4ivaw0h5jhkglnkg8dzsvnis1gg2vn46hw"; depends=[dplyr magrittr purrr]; }; mded = derive2 { name="mded"; version="0.1-2"; sha256="1j8fcz5yc70p9qd9l010xj1b625scdps8z1pqh75b45p2hiqbhlc"; depends=[]; }; mdendro = derive2 { name="mdendro"; version="1.0.1"; sha256="0pk7b7zn9afc947parkj1qa4d85gq16lalg07fjfripxjnmvjahw"; depends=[rJava]; }; mdftracks = derive2 { name="mdftracks"; version="0.2.0"; sha256="0l8dc6ljrhbm8jwadaa3xkf6nx90vyiig15p7rryswczz9hw5ga6"; depends=[hellno]; }; @@ -10049,11 +10160,12 @@ in with self; { mdir_logrank = derive2 { name="mdir.logrank"; version="0.0.4"; sha256="0bhsr005dq9v85sjm2g9xlpksxwzsmsk14g0q5v3hkjvm5wk6xmv"; depends=[MASS]; }; mdmb = derive2 { name="mdmb"; version="1.3-18"; sha256="0jvwwdblky080j8cwfjna2d11z7hr672cdw9bkjz7ngd44blyp8x"; depends=[CDM coda miceadds Rcpp RcppArmadillo sirt]; }; mdpeer = derive2 { name="mdpeer"; version="1.0.1"; sha256="1vsqhah8h47s8k687fwa352549mdz16mwk1g7rcmhx75c2k85w2q"; depends=[boot ggplot2 glmnet magic nlme nloptr psych reshape2 rootSolve]; }; - mds = derive2 { name="mds"; version="0.3.0"; sha256="098ynvwra7ylli1pklmmfl9xnmiyd13iw5zd7g2xlqmg3rrphysg"; depends=[lubridate parsedate]; }; + mds = derive2 { name="mds"; version="0.3.1"; sha256="1zqd595c06b9mdy7iczx41p1xdm140161chmlpsj82mphjjinh88"; depends=[lubridate parsedate]; }; mdsOpt = derive2 { name="mdsOpt"; version="0.4-3"; sha256="0chk95n8gvj8jxvqq3bkdsw3hjaizcqd0x2lk32rkaq52lp3l9d8"; depends=[animation clusterSim plotrix smacof smds spdep symbolicDA]; }; mdscore = derive2 { name="mdscore"; version="0.1-3"; sha256="10cl5r6kd9chdik5v0q91x40xpw2cjvvyi220z4bvngpb0989x8j"; depends=[MASS]; }; mdsdt = derive2 { name="mdsdt"; version="1.2"; sha256="0nbzc54jac4wmfyrs821ycxh749cb1zfxcws0nbpk35rydqkc627"; depends=[ellipse mnormt polycor]; }; mdsr = derive2 { name="mdsr"; version="0.1.7"; sha256="1angy75nyhzwfhmb4axs14yl0jsxjaiqh5nz2jpmi5j890y32zda"; depends=[babynames DBI dbplyr downloader dplyr fs ggplot2 mosaic RMySQL]; }; + mdsstat = derive2 { name="mdsstat"; version="0.3.2"; sha256="1ff53ddvn9rla02a0g4hgp9c1grlwja05ans9gjk5ya2nwilpj2l"; depends=[lubridate mds]; }; mdw = derive2 { name="mdw"; version="2017.12-03"; sha256="054vssnypbik0yf6smicggnkrqf6kx8k21nbf5rminsh00sx39k1"; depends=[]; }; meaRtools = derive2 { name="meaRtools"; version="1.0.4"; sha256="1nxyvdq4670696mhg0svxxlvk9hnr8szai8b18pw6754kmw1bjvn"; depends=[emdist ggplot2 gridExtra gtools lattice plyr Rcpp reshape2]; }; meanShiftR = derive2 { name="meanShiftR"; version="0.53"; sha256="1pla9hr9nbbnc3hcmk0ywfh6129zng5lp3dmjqb3cgdrmwkdrx9i"; depends=[]; }; @@ -10062,52 +10174,52 @@ in with self; { measurements = derive2 { name="measurements"; version="1.4.0"; sha256="1kihavs9vgxwqjm9z1zjjngkmcwfsv8dg7nn9nrv5r06k5hv8bz6"; depends=[]; }; measures = derive2 { name="measures"; version="0.2"; sha256="1pp6nz30fbsqsvznim9j4vvz3z57sq5r234807flxfy0w7knydbd"; depends=[]; }; meboot = derive2 { name="meboot"; version="1.4-7"; sha256="1i0h71aj49hyj889447s611gz668ys7xlr1i82b5nvaf6chfbfin"; depends=[dynlm nlme]; }; + mechkar = derive2 { name="mechkar"; version="1.14.6"; sha256="1yrxp0qkfr96sf8lprn33cjfjmpkhpw0wpbz7w2600a923zdhwqc"; depends=[car coxphw dplyr ggplot2 givitiR gmodels Hmisc InformationValue MASS pROC ResourceSelection rlang ROSE tibble writexl]; }; medExtractR = derive2 { name="medExtractR"; version="0.1"; sha256="08hzl5kk3jqs8vc53zrd1qj5g24dkpvwwvswqp57719c4ybi3ia3"; depends=[stringr]; }; mederrRank = derive2 { name="mederrRank"; version="0.0.8"; sha256="1fvvik3bhjm6c0mhi2ma915986k2nj3lr2839k5hfrr7dg3lw3f4"; depends=[BB numDeriv]; }; - medfate = derive2 { name="medfate"; version="0.8.2"; sha256="0f86cpczzkpx8sy6krx970zy1fmsn93mjkm9mq00w2nw91kqjrh6"; depends=[ggplot2 GSIF meteoland Rcpp sp spdep]; }; + medfate = derive2 { name="medfate"; version="0.9.0"; sha256="0vxrj9x9f975vxfjsv83riyazlvbpn5q9z49ywnayiikn1snbrnh"; depends=[ggplot2 meteoland Rcpp sp spdep]; }; medflex = derive2 { name="medflex"; version="0.6-6"; sha256="04cjqhyihxf1imbl9y9s58qpy6lmxsh2gwy4bras03hx52slzl5r"; depends=[boot car Matrix multcomp sandwich]; }; mediacloudr = derive2 { name="mediacloudr"; version="0.1.0"; sha256="1r11mpz44msla71lqw45r9s8z7rwvbnqi026l0ljx6crby183h0w"; depends=[httr jsonlite rvest xml2]; }; mediation = derive2 { name="mediation"; version="4.5.0"; sha256="0i88wvqqw8cmxmh9i78rqzp4s16zhf12dgl9fsk9bhw7hxhhc0i1"; depends=[boot Hmisc lme4 lpSolve MASS Matrix mvtnorm sandwich]; }; - medicalrisk = derive2 { name="medicalrisk"; version="1.2"; sha256="1zdxv3rj7768kbyxfvr9n0hp4z7y0sf3r7ssqv731hjjp656l6xp"; depends=[hash plyr reshape2]; }; + medicalrisk = derive2 { name="medicalrisk"; version="1.3"; sha256="12p3mjy6lphjajxz7is04cahp0598ip9ixfkdimvw1k8n5hs9mj0"; depends=[hash plyr reshape2]; }; medicare = derive2 { name="medicare"; version="0.2.1"; sha256="00a1gml2khzisdavnaip6ap4bw45b17nbl9cqb1mqrm4y0p9gm16"; depends=[]; }; meditate = derive2 { name="meditate"; version="0.1.3"; sha256="02mgnbxlvi73zpnghlcx89jvri8144cf0bzq0hrbhh2nq2c1sdjg"; depends=[audio checkmate deldir wesanderson]; }; meditations = derive2 { name="meditations"; version="1.0.1"; sha256="0wnx3zadpngfch0sb0ifqvsmzl613639f1yazwsgvhk29mycx4ss"; depends=[]; }; medmod = derive2 { name="medmod"; version="1.0.0"; sha256="1f7bzdcjnbz9izlfblxcaa85qxx8kzn62qgjd3qlb7jl7mdy5q54"; depends=[ggplot2 jmvcore lavaan R6]; }; meetupapi = derive2 { name="meetupapi"; version="0.1.0"; sha256="1iaxpfzgn478np9cjwz0zalfy1p7jwabnwpfv31svw052i8bs9yl"; depends=[dplyr httr magrittr purrr]; }; mefa = derive2 { name="mefa"; version="3.2-7"; sha256="1qrf6d3y38q7yy6bg3bxg7514d9paz1f8y6sr7lbksi30qn92fmj"; depends=[]; }; - mefa4 = derive2 { name="mefa4"; version="0.3-6"; sha256="0zl30ag3v7ywaw3i0mngwg6f75cmd29z8ivxqzm6lqzgapcjlw2m"; depends=[Matrix]; }; + mefa4 = derive2 { name="mefa4"; version="0.3-7"; sha256="0iq3n77gbl3zbplaqp1nwb72y9w797m938albx27727pkzyanxf1"; depends=[Matrix]; }; meifly = derive2 { name="meifly"; version="0.3"; sha256="1x3lhy7fmasss0rq60z5qp74ni32sahw62s8cnp2j431sp95pczc"; depends=[leaps MASS plyr]; }; mekko = derive2 { name="mekko"; version="0.1.0"; sha256="09y50k4r4mnx351a5zhkqg9s2xyl3d149dhmfy2z6hzm5yg2ajyi"; depends=[ggplot2]; }; - meltt = derive2 { name="meltt"; version="0.4.0"; sha256="0m0r7in1s8vq2pvq7pxgwjfhqds8pwhcrn5hy0wa126s1y88v34x"; depends=[dplyr ggplot2 leaflet plyr Rcpp RcppArmadillo reticulate shiny shinyjs tibble tidyr]; }; + meltt = derive2 { name="meltt"; version="0.4.1"; sha256="1113rdw0jglwkcd3g31llhgzqmwpxfz2bp60m3x2zdbdrvwc1z9n"; depends=[dplyr ggplot2 leaflet plyr Rcpp RcppArmadillo reticulate shiny shinyjs tibble tidyr]; }; melviewr = derive2 { name="melviewr"; version="0.0.1"; sha256="19syc3d6zc0hmcjjdj7ibrdqxcdlh95ny970f3ska453qh1898b2"; depends=[cairoDevice gtools gWidgets gWidgetsRGtk2 jsonlite RColorBrewer RGtk2 RNifti]; }; mem = derive2 { name="mem"; version="2.15"; sha256="1q8h6mbpzybg1vzi2pgp8fpxfrp4d729n5ghh0a54wjdwdjgkpq1"; depends=[boot dplyr EnvStats ggplot2 mclust RColorBrewer RcppRoll sm tidyr]; }; memapp = derive2 { name="memapp"; version="2.13"; sha256="0n4awpxsz34rrz53bp4dyfgs9zssrxd4f8zyj6zw89j6ahkz85w6"; depends=[dplyr DT foreign formattable ggplot2 haven mem openxlsx plotly RColorBrewer readxl RODBC shiny shinyBS shinydashboard shinyjs shinythemes shinyWidgets stringi stringr tidyr]; }; meme = derive2 { name="meme"; version="0.2.2"; sha256="1q78q8080vvqni8ncqp326pidfjfia0f2b6pis08m7fr1q1gcqca"; depends=[ggplot2 gridGraphics magick showtext sysfonts]; }; memery = derive2 { name="memery"; version="0.5.2"; sha256="1hr52g69lr2n84yczm8i8yxh7rys5nr8jk1hcmv548p5y79l8k9s"; depends=[Cairo colourpicker cowplot ggplot2 jpeg magrittr png purrr shiny shinyBS shinycssloaders showtext sysfonts]; }; memgene = derive2 { name="memgene"; version="1.0.1"; sha256="1x3vf2f1yh40xw5vqcjlrn07zn9zh3sx4kc9dijxzygd9crl5a29"; depends=[ade4 gdistance raster vegan]; }; - memisc = derive2 { name="memisc"; version="0.99.21"; sha256="0fbljiz6ifyfjkqk4nsxmnqafdklqsbzihnbdg4cwbr25dx83hyq"; depends=[data_table lattice MASS repr]; }; - memnet = derive2 { name="memnet"; version="0.1.0"; sha256="1lhpij3dm4whsawy6cxcfcwn9q881i8jbjpkrwvdsn63ibxrm55s"; depends=[BH igraph Rcpp]; }; + memisc = derive2 { name="memisc"; version="0.99.22"; sha256="0w1p7zcdrif692i40r5m06lykr2f0vhibrh5pwz7ndhbxlr1pk8x"; depends=[data_table lattice MASS repr]; }; memo = derive2 { name="memo"; version="1.0.1"; sha256="14nvqi1qsin45ksd0wp9cigjk1gghr4jijdqkaqh177dwa244r9j"; depends=[digest]; }; memochange = derive2 { name="memochange"; version="1.1.0"; sha256="1im6342by0pf1kmz8jps9d3y752k87bl02v5ddywbvh0idkdnba5"; depends=[forecast fracdiff longmemo LongMemoryTS sandwich strucchange urca]; }; memoise = derive2 { name="memoise"; version="1.1.0"; sha256="034qfc2xlh30x1q2vya239w34a3ir3y2fwnx2agbgbi6592zjxmj"; depends=[digest]; }; memor = derive2 { name="memor"; version="0.2"; sha256="10w2jw9ma7yds2d179l7bv4rzpggp3l04kvqnncii6yf5f4lj9cd"; depends=[knitr rmarkdown yaml]; }; memoria = derive2 { name="memoria"; version="1.0.0"; sha256="05nx6xkgf1mkn1ajjizwp66xhn7ddbvgdnmkdbcl4s7sq456vczw"; depends=[cowplot ggplot2 HH ranger stringr tidyr viridis viridisLite zoo]; }; - memuse = derive2 { name="memuse"; version="4.0-0"; sha256="1g63nssxrgqgzw8qjz8202qpwhps8fbck6pn77j2wsc82dm73y7v"; depends=[]; }; - merDeriv = derive2 { name="merDeriv"; version="0.1-7"; sha256="0zvsbpz8v8bw458rvafw4cm8dwxbnvakm01ry3bxvq34hzg8ffg6"; depends=[lavaan lme4 Matrix nonnest2 sandwich]; }; + memuse = derive2 { name="memuse"; version="4.1-0"; sha256="1bbjp8y0ji71956fbaxiil7ynq2nkmmgz7i9xps83m3bbp5d3mjq"; depends=[]; }; + merDeriv = derive2 { name="merDeriv"; version="0.1-9"; sha256="1zp9w79pm3n8673h3h7ic9zx6p5i0cd6kpmbyfs365flgvcbdmsg"; depends=[lavaan lme4 Matrix matrixcalc nonnest2 numDeriv sandwich]; }; merTools = derive2 { name="merTools"; version="0.5.0"; sha256="19qf3nn57hvd80x2l0m34w2jaky0jgsgc4nh0vdqjl8kpx4044cr"; depends=[abind arm blme broom dplyr foreach ggplot2 lme4 mvtnorm shiny]; }; mergeTrees = derive2 { name="mergeTrees"; version="0.1.3"; sha256="17aqgfd1ky5zq6i9s1djvdqjdd8lzkblf0cdw82i9mpzfhcz1fav"; depends=[Rcpp]; }; mergedblocks = derive2 { name="mergedblocks"; version="1.0.0"; sha256="0g209f9vr5gjgsljnb6i8jr48azv982dbfc1anggfip82qivicqn"; depends=[randomizeR]; }; merlin = derive2 { name="merlin"; version="0.0.2"; sha256="0r1hxbpqhih0nyya26hphymz4jrw88zfd3bypf1hwj5dsk60341f"; 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.5.0"; sha256="0dpbzyawswlvzydx54i4f75zv79qww1p5hk1p4pzjc7fmgx9ba57"; depends=[checkmate curl data_table digest dplyr fields Formula formula_tools ggplot2 gridExtra gtable lubridate maps maptools Matrix memoise plyr purrr RCurl scales sp stringr]; }; + metR = derive2 { name="metR"; version="0.6.0"; sha256="0z2s84i953l5wa0pa9zkspk4hjjgrd9j2ssn5ahgqriqg65w29q2"; depends=[checkmate data_table digest fields Formula formula_tools ggplot2 gtable lubridate memoise plyr purrr scales sp stringr]; }; metRology = derive2 { name="metRology"; version="0.9-28-1"; sha256="1syjwblyd18myxrs0hx4m91fgb6zs3r4g7w701j2f2pw6j9mvz0y"; depends=[MASS numDeriv robustbase]; }; metScanR = derive2 { name="metScanR"; version="1.2.3"; sha256="1v7zrxj3wspx6f5n5s75skcygbf3r85rn4p0z9iwbrbrgxwi4qgs"; depends=[geosphere leaflet matlab plyr RCurl]; }; - meta = derive2 { name="meta"; version="4.9-9"; sha256="1z475n7g6rawz07p6myqgg6cgz4rbsfgmn6phbfpz4hf7wx84g9q"; depends=[CompQuadForm lme4 metafor]; }; + meta = derive2 { name="meta"; version="4.11-0"; sha256="06miv0yjxqxabi9iff08hydzb6qjdahy3dswxgkdp5zybma6dva6"; depends=[CompQuadForm lme4 metafor]; }; meta4diag = derive2 { name="meta4diag"; version="2.0.8"; sha256="1ila8x9r1rdmlwfpzfx1zj5yx1m4yrbhyb74db4wqbh1dswn7zsm"; depends=[caTools shiny shinyBS sp]; }; metaBLUE = derive2 { name="metaBLUE"; version="1.0.0"; sha256="0ppn4bvr10z32pghmv4wjv86k6n5y5bkfxc6h5mvb556v6jnl6d8"; depends=[Matrix]; }; metaBMA = derive2 { name="metaBMA"; version="0.6.2"; sha256="0g2npgr9rqf0f9xqdp4wl3263shrp28j4i63j4fwd91xk9qmy8my"; depends=[BH bridgesampling coda LaplacesDemon logspline mvtnorm Rcpp RcppEigen rstan rstantools StanHeaders]; }; - metaDigitise = derive2 { name="metaDigitise"; version="1.0.0"; sha256="04hycv9dpy39l8fhql69mcn5w97f7sjxrhiz5vbpbawvfbkl0f0l"; depends=[magick purrr]; }; + metaDigitise = derive2 { name="metaDigitise"; version="1.0.1"; sha256="1cwvb6b4a1pfixbknbjjylsmpkccgi163h0kbf7zfjaqjg2y9mzh"; depends=[magick purrr]; }; metaLik = derive2 { name="metaLik"; version="0.43.0"; sha256="1li40pgd9z00nrph9njwn6wysb1i9dkpqzcp6fzds6asvcxlqqfl"; depends=[]; }; metaMA = derive2 { name="metaMA"; version="3.1.2"; sha256="1mjyz06q1kc8lhfixpym4ndpnisi1r849fj3da6riwfd6ab1v181"; depends=[limma SMVar]; }; metaMix = derive2 { name="metaMix"; version="0.3"; sha256="17qkwg9iz5v63ybyvqppbf044l0pi0ym5pw283174dlx8lfac60q"; depends=[data_table ggplot2 gtools Matrix Rmpi]; }; @@ -10119,23 +10231,23 @@ in with self; { metabolighteR = derive2 { name="metabolighteR"; version="0.1.0"; sha256="1kbwxwcx5f836bhwx32a41c6753832wigx0b6gi9zblc4qsnqvlq"; depends=[dplyr httr magrittr purrr]; }; metacart = derive2 { name="metacart"; version="2.0-2"; sha256="1rn246avzisbrw9parap7hpgxb7pj5y43zfvayaiz4ilhdl5vj4y"; depends=[ggplot2 gridExtra Rcpp rpart]; }; metacoder = derive2 { name="metacoder"; version="0.3.3"; sha256="0d7fpx5zpggc8k3y882mlw4szn7ghzckyiaxj9x652xink8zi397"; depends=[ape biomformat cowplot crayon dplyr GA ggfittext ggplot2 ggrepel igraph lazyeval magrittr phylotate RColorBrewer Rcpp RCurl readr reshape reshape2 rlang scales seqinr stringr svglite taxa taxize tibble traits vegan viridisLite zoo]; }; - metacom = derive2 { name="metacom"; version="1.5.2"; sha256="0v2rscql8vks12v5s9rvfrylh175if2mnpr69wsvr2snlcjxmirq"; depends=[vegan]; }; + metacom = derive2 { name="metacom"; version="1.5.3"; sha256="0c0gzn28cl2sl52wx2n36jm9c18d9s3yqjyx88kgbmd9069z1nvk"; depends=[vegan]; }; metacor = derive2 { name="metacor"; version="1.0-2.1"; sha256="0y3z7jbhw5c2dbn9fx9wlw1311irjc2xvnm5hnaixbbj53qz24n0"; depends=[gsl rmeta]; }; metadynminer = derive2 { name="metadynminer"; version="0.1.6"; sha256="0zg08lwnimnmfwac0d5kg8yhsl88gmn029dra18phy1jzkfnsx34"; depends=[Rcpp]; }; metadynminer3d = derive2 { name="metadynminer3d"; version="0.0.1"; sha256="0riqr2hhk4h0rm7m4njb2dd2f24jff7lzf9chh83sq4q3wldgpz5"; depends=[metadynminer misc3d Rcpp rgl]; }; metafolio = derive2 { name="metafolio"; version="0.1.0"; sha256="18s78lljwnn3j0l3mqc0svszcb3c8yzyzlpnimndbiq9yxagxnnf"; depends=[colorspace MASS plyr Rcpp RcppArmadillo]; }; - metafor = derive2 { name="metafor"; version="2.1-0"; sha256="009x5w163g4pbak23i5xw3ipk5s9xljkdj9py5vir3vpxxazk267"; depends=[Matrix nlme]; }; + metafor = derive2 { name="metafor"; version="2.4-0"; sha256="1b599fxk7s0brkchmx698fr5k4g1kzkia2rnlvhg349ffs5nfjmn"; depends=[Matrix nlme]; }; metaforest = derive2 { name="metaforest"; version="0.1.3"; sha256="1q6m60cd7gl7y0gdjd10ky25hwv5jc4x5g5sr5w61xc3j2hnw8in"; depends=[data_table ggplot2 gtable metafor ranger]; }; metafuse = derive2 { name="metafuse"; version="2.0-1"; sha256="1zdw22f5kzvy2xr3c2csy873hcags60as567brc2sw17d0apfy8j"; depends=[evd glmnet MASS Matrix]; }; - metagear = derive2 { name="metagear"; version="0.4"; sha256="0ww1j34600y99wyanj9ffg1019xqshb9c32wiqnsblyw8pq4va5f"; depends=[EBImage gWidgets gWidgetsRGtk2 hexView MASS Matrix metafor RCurl stringr]; }; + metagam = derive2 { name="metagam"; version="0.1.0"; sha256="1mya00bvbxz3fg506s4km1193yamgzqqq8v6v286jcp19w4jr07s"; depends=[dplyr furrr ggplot2 knitr metafor metap purrr rlang stringr tibble tidyr viridis]; }; + metagear = derive2 { name="metagear"; version="0.5"; sha256="12q8g8dwz3xb31kqlj9d2k8czmkibcr3ll9s0xdl756pf5408l6y"; depends=[EBImage hexView MASS Matrix metafor RCurl stringr]; }; metagen = derive2 { name="metagen"; version="1.0"; sha256="0jvbm22976aqvmfnjzs51n2w099yj5hpx6hd0pgvbia80jk7b9vk"; depends=[BatchExperiments BatchJobs BBmisc ggplot2 lhs MASS metafor ParamHelpers plyr]; }; - metaheur = derive2 { name="metaheur"; version="0.2.0"; sha256="1rr5mjx3v87alj7cl9hxldvhhbpkz1fzmymmkqv0hs65pny6gbqw"; depends=[doParallel foreach ggplot2 preprocomb reshape2]; }; metaheuristicOpt = derive2 { name="metaheuristicOpt"; version="2.0.0"; sha256="0ra4hl9l1jlzymj218m2i6xrxfacyx4aaln5pk7q4di2ks0nq11m"; depends=[]; }; - metamedian = derive2 { name="metamedian"; version="0.1.4"; sha256="00jzgf8zdcbgnz89g55lq9c6ybh3praa68b9wwj6sx63hnkicvgd"; depends=[estmeansd Hmisc metafor]; }; + metamedian = derive2 { name="metamedian"; version="0.1.5"; sha256="1v2nha2qc9vs2s9nfvbia033ppprkwxj5fadlrpy20fj2lr8z7z6"; depends=[estmeansd Hmisc metafor]; }; metamer = derive2 { name="metamer"; version="0.2.0"; sha256="0wdhr83mph9v7vb9mfhf7lcwmp0smz72sniass7kxcbj6j9hga4g"; depends=[FNN progress]; }; metamicrobiomeR = derive2 { name="metamicrobiomeR"; version="1.1"; sha256="16ymdhhr7h2785gfgrw7qi1fjvawiz599h42qi7l0v6djinbxlw2"; depends=[caret compositions dplyr foreign gamlss gdata ggplot2 gplots gridExtra httr jsonlite knitr lme4 lmerTest magrittr matrixStats meta mgcv plyr randomForest RColorBrewer RCurl repmis reshape2 rmarkdown tidyr zCompositions]; }; metamisc = derive2 { name="metamisc"; version="0.2.2"; sha256="0ll245a3f442n7jyjshcn87l725mgk132ri73kynrwh0z8g2r7i5"; depends=[ggplot2 lme4 metafor mvtnorm plyr pROC]; }; - metan = derive2 { name="metan"; version="1.2.1"; sha256="0bgyrza03fdjd8hannzc70hrmd2cn6cvs58kq4lmjds5vckk27w5"; depends=[ade4 cowplot dendextend dplyr FWDselect GGally ggforce ggplot2 ggrepel gplots lattice lme4 lmerTest magrittr progress rlang tibble tidyr tidyselect]; }; + metan = derive2 { name="metan"; version="1.4.0"; sha256="0wzq2r22yzi7cr2algxq4fgmz58hv8zhk03r3qzhdvvxrm66rd9q"; depends=[ade4 cowplot dendextend dplyr FWDselect GGally ggforce ggplot2 ggrepel lme4 lmerTest magrittr progress purrr rlang tibble tidyr tidyselect]; }; metansue = derive2 { name="metansue"; version="2.3"; sha256="18vy294862lfgxiw9cikai9svy3wpwk2bvz3vp20fcslg90mn3xp"; depends=[]; }; metap = derive2 { name="metap"; version="1.3"; sha256="1jmmmmjiklaxfl604hwqil193ydaghvd5jv8xsr4bx3pzn5i9kvz"; depends=[lattice mutoss Rdpack TFisher]; }; metaplot = derive2 { name="metaplot"; version="0.8.3"; sha256="1zw8bq2fy9m15dfc92ag0dz2k9dqrf5jbvfaycizcgsgaqd79s1c"; depends=[dplyr encode ggplot2 gridExtra gtable lattice magrittr rlang scales tidyr]; }; @@ -10143,8 +10255,10 @@ in with self; { metaplus = derive2 { name="metaplus"; version="0.7-11"; sha256="05pkgw0zlq3q9mvdw2yxz9mxzqwq3c8q6cwvh87cigw1pf8y9an7"; depends=[bbmle boot fastGHQuad lme4 MASS metafor numDeriv]; }; metapost = derive2 { name="metapost"; version="1.0-6"; sha256="098f7sifg814mc4sb1nb4d6dlr1xms5hwyp08ksxg0i4ayf9jf3c"; depends=[gridBezier]; }; metapro = derive2 { name="metapro"; version="1.5.8"; sha256="0ymbqzm317fiywzxaizddhvjzwp2wyx9y7zgbg4nrz11l3r2bp2n"; depends=[metap rSymPy]; }; + metarep = derive2 { name="metarep"; version="1.0.1"; sha256="0jnxx11jxj63ry0bkjlh9g2x2pr2qi24nql99iibz2ckbx8344p3"; depends=[meta]; }; metasens = derive2 { name="metasens"; version="0.4-0"; sha256="1rgb2b48lwvrg1f39dzg6d9jr1ya2p7la2jrc3zs3jks28arjr2x"; depends=[meta]; }; metatest = derive2 { name="metatest"; version="1.0-5"; sha256="1h3dcs1m7606b3a41yw2lak3lrqmsbpnx67qv24wvq003apz1sfd"; depends=[]; }; + metathis = derive2 { name="metathis"; version="1.0.2"; sha256="07aha4j401zlm6abfmq70vqc215bpsi5hqi50npz33rpb1m3r9rq"; depends=[htmltools knitr magrittr purrr]; }; metavcov = derive2 { name="metavcov"; version="1.1"; sha256="1x87knvypkfg0x223aiak7fy7zdlfn74crmvnqzhxf2vmxljnvnh"; depends=[corpcor]; }; metaviz = derive2 { name="metaviz"; version="0.3.0"; sha256="1ayz9za3zwmyna1hanzm83gb7vw3dclj3z4g35rk5dz6s4zgqsvm"; depends=[dplyr ggplot2 ggpubr gridExtra metafor nullabor RColorBrewer]; }; metawho = derive2 { name="metawho"; version="0.2.0"; sha256="1mflkrlnb1wk9vbbj621cy64s78q677d8fcnsi1ybh49k7sqmw20"; depends=[dplyr forestmodel magrittr metafor purrr rlang]; }; @@ -10152,26 +10266,24 @@ in with self; { meteo = derive2 { name="meteo"; version="0.1-5"; sha256="0n37plka9vsxwd03lca3h6m8dcz3f1bi46jn3bz7vyilnkq9hcdk"; depends=[gstat plyr raster rgdal snowfall sp spacetime]; }; meteoForecast = derive2 { name="meteoForecast"; version="0.53"; sha256="15bjhkcn4zcll3cfgpzcdj0zv753x29qsjndy3h2zzqn83qywx9s"; depends=[ncdf4 raster sp XML zoo]; }; meteogRam = derive2 { name="meteogRam"; version="1.0"; sha256="167gyxjnl4dyfqs3znv8sdpkvpqdxzdqi1g730s30gycrm9snap9"; depends=[ggplot2 RadioSonde]; }; - meteoland = derive2 { name="meteoland"; version="0.8.3"; sha256="0xbnb5kpb565ivi1qx2jmbgx5zg3bv65q4a7aylhdxijsjdr8vcv"; depends=[httr jsonlite ncdf4 Rcpp rgdal sp spdep]; }; + meteoland = derive2 { name="meteoland"; version="0.9.2"; sha256="0mrkdvc6dj7jny5b4fqshq2wmc9mvmvixbdzsgcyfqlxzzg5r1qz"; depends=[httr jsonlite ncdf4 Rcpp rgdal sp spdep]; }; meteor = derive2 { name="meteor"; version="0.3-4"; sha256="01009d9wpxybig4n82m48hqqg1k4x4shcjxfy8y0kk7cgfdb4naw"; depends=[Rcpp]; }; meteorits = derive2 { name="meteorits"; version="0.1.1"; sha256="1vk8pbhfc5mbkbpw7ml81gx9i8187xp3vx36pbyyhjbrpy6gqabx"; depends=[MASS pracma Rcpp RcppArmadillo]; }; methcon5 = derive2 { name="methcon5"; version="0.1.0"; sha256="08xsi6j65izxqcrlh37f2d7m3pwna1v6zvdv96mqylsjqgqmbk5x"; depends=[dplyr magrittr purrr rlang]; }; - metricTester = derive2 { name="metricTester"; version="1.3.6"; sha256="0m49sl42bf0rlkvg3sq87vgx3dv65pxvcm07gflx5wlr26x1r0s1"; depends=[ape doParallel dplyr foreach geiger MASS picante plotrix spacodiR vegan]; }; metricsgraphics = derive2 { name="metricsgraphics"; version="0.9.0"; sha256="1zbx82b34y0rr4w7rzvyc1nzk95w6cdkg0j1kkshbmkvplq6v9i4"; depends=[htmltools htmlwidgets magrittr]; }; metropolis = derive2 { name="metropolis"; version="0.1.5"; sha256="0nhkzy1miycqa2jqh9gh1l48n03nig99q19f46dm8qqci7a90vlp"; depends=[coda]; }; - mets = derive2 { name="mets"; version="1.2.6"; sha256="0vaqizmr27144dkh5mh095vih0p70j3ly9zwk5h0fklmn8bf2qhl"; depends=[lava mvtnorm numDeriv Rcpp RcppArmadillo survival timereg]; }; + mets = derive2 { name="mets"; version="1.2.7.1"; sha256="1b3bsxdwzl5rilnsga9cgzb7dafcfk2q39582rif34wim8xxzzv7"; depends=[lava mvtnorm numDeriv Rcpp RcppArmadillo survival timereg]; }; metsyn = derive2 { name="metsyn"; version="0.1.2"; sha256="0iwp0nz07yd33qd93fjblmvik1l1xkv6rkccn3054zs2bkrzjq4f"; depends=[foreach readr stringr tibble]; }; - mev = derive2 { name="mev"; version="1.13"; sha256="0mcjis66v9jzcdamagizvz5c58qpzqa9dzj0ypqfv1cl061d6c4j"; depends=[alabama boot evd nleqslv nloptr Rcpp RcppArmadillo TruncatedNormal]; }; + mev = derive2 { name="mev"; version="1.13.1"; sha256="1zbr5f8w56c9z0lp4ak47fxnnfrdm74liqcjvij0n4ajqs6glaak"; depends=[alabama boot evd nleqslv nloptr Rcpp RcppArmadillo TruncatedNormal]; }; mewAvg = derive2 { name="mewAvg"; version="0.3.0"; sha256="16gc78ccjffp9qgc7rs622jql54ij83ygvph3hz19wpk22m96glm"; depends=[]; }; mexhaz = derive2 { name="mexhaz"; version="1.7"; sha256="1z0516i7asyn3248xzvvc377slcy2zv6f9qalkd33r3dlc0js4s8"; depends=[lamW MASS numDeriv statmod survival]; }; mfGARCH = derive2 { name="mfGARCH"; version="0.1.9"; sha256="0vmxyjg2jj39dd1307d5jwz3033j8ldfqhysmmzl3i1b5ypfd5q5"; depends=[maxLik numDeriv Rcpp zoo]; }; - mfbvar = derive2 { name="mfbvar"; version="0.5.2"; sha256="02gvh3qvqb08j684y3ylwz1rddi11884xs8nr7b93p5nypgfr9bp"; depends=[dplyr ggplot2 GIGrvg lubridate magrittr Rcpp RcppArmadillo RcppParallel RcppProgress stochvol tibble]; }; + mfbvar = derive2 { name="mfbvar"; version="0.5.3"; sha256="065bpwlzqmvgrdm9jp8030jcs4sqnckyxvrgdn0jcnmmgiq88vgx"; depends=[dplyr ggplot2 GIGrvg lubridate magrittr Rcpp RcppArmadillo RcppParallel RcppProgress stochvol tibble]; }; mfe = derive2 { name="mfe"; version="0.1.4"; sha256="1lif39zr6x1ysv8s90b1wgshp5pa175fxcjvx0hz6g15d29gwgy6"; depends=[cluster clusterCrit e1071 ECoL infotheo MASS rpart rrcov]; }; mfp = derive2 { name="mfp"; version="1.5.2"; sha256="1i90ggbyk2p1ym7xvbf4rhyl51kmfp6ibc1dnmphgw15wy56y97a"; depends=[survival]; }; mfx = derive2 { name="mfx"; version="1.2-2"; sha256="04pwp67i4sn4rf497pgy6qifwvrcmwyxn8x5sn96fy8qyrdzjfhj"; depends=[betareg lmtest MASS sandwich]; }; 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.4"; sha256="0gxxmnawvq88jljdszhjw85px4w0q73nmgyq61hlfvjd2k8lscc8"; depends=[gamm4 GGally ggplot2 gridExtra KernSmooth matrixStats mgcv miniUI plyr qgam rgl shiny viridis]; }; + mgcViz = derive2 { name="mgcViz"; version="0.1.6"; sha256="12isaqpbhdg2qhw76wj6hqi233dw3md061bbirkgzr5clrb8kxlk"; depends=[gamm4 GGally ggplot2 gridExtra KernSmooth matrixStats mgcv miniUI plyr qgam rgl shiny viridis]; }; mgcv = derive2 { name="mgcv"; version="1.8-31"; sha256="1if34mqsn9r7g0l82lxvvx0wjhi9paqdymyd73nschxcl1if8vbk"; depends=[Matrix nlme]; }; mglmn = derive2 { name="mglmn"; version="0.0.2"; sha256="1ijkmr85s4yya0hfwcyqqskbprnkcbq8sc9c889i0gy0543fgqz4"; depends=[mvabund snowfall]; }; mgm = derive2 { name="mgm"; version="1.2-7"; sha256="1s0m9xjq2d067ba2cx87q83nqmdza34vw9g0g0mqd8ap53rmqhas"; depends=[glmnet gtools Hmisc matrixcalc qgraph stringr]; }; @@ -10192,26 +10304,26 @@ in with self; { micEconAids = derive2 { name="micEconAids"; version="0.6-18"; sha256="0s2gkf6widdnxqqb1xjqdvji8vhdz5a4q05clbbbyq1h409q7qvl"; depends=[lmtest micEcon miscTools systemfit]; }; micEconCES = derive2 { name="micEconCES"; version="0.9-8"; sha256="06g6z8hf7y9d942w6gya0fd5aidzfjkx3280gjygdlwpv7nlpqzv"; depends=[car DEoptim micEcon minpack_lm miscTools systemfit]; }; micEconIndex = derive2 { name="micEconIndex"; version="0.1-6"; sha256="1ihly6qpyg1pms4nkvs6khxxqwr3fwg57i8pg0yhyy1apqxyj2xl"; depends=[miscTools]; }; - micEconSNQP = derive2 { name="micEconSNQP"; version="0.6-6"; sha256="1n3pxapc90iz1w3plaqflayd0b1jqd65yw5nbbm9xz0ih132dby9"; depends=[MASS miscTools systemfit]; }; + micEconSNQP = derive2 { name="micEconSNQP"; version="0.6-8"; sha256="183hg4iap97is8cdaqxmnj9z8yybvpfnhg2kf85nfy1nl7b30xl2"; depends=[MASS miscTools systemfit]; }; micar = derive2 { name="micar"; version="1.1.1"; sha256="09vpijva39fwpvdpfglwr3xmz469pnmz371ms7z5av6w2193ls5n"; depends=[httr jsonlite]; }; - mice = derive2 { name="mice"; version="3.7.0"; sha256="1wx1s1gc07iz63w4m8z0i1n5mc273f89grp5d3hfla7ypicjkasf"; depends=[broom dplyr lattice MASS mitml nnet Rcpp rlang rpart survival]; }; + mice = derive2 { name="mice"; version="3.8.0"; sha256="1ibybvigqkkla4xwhqs2w4m6c68alfcdsljx99nn4p92rzb1ig04"; depends=[broom dplyr lattice Rcpp tidyr]; }; miceFast = derive2 { name="miceFast"; version="0.5.1"; sha256="0n09l6y7jwcskv2lfynyzl614c7x84yyc52wqwyhnzvd8lzapp5d"; depends=[data_table Rcpp RcppArmadillo]; }; miceMNAR = derive2 { name="miceMNAR"; version="1.0.2"; sha256="1s607icaf3c25mn8xdi3zkzmm8m7qd9a6vjdlz5j7ig2gc9f2y2d"; depends=[GJRM mice mvtnorm pbivnorm sampleSelection]; }; - miceRanger = derive2 { name="miceRanger"; version="1.2.0"; sha256="1bjg7qmywls76cqcyz5pwg00cryk4hf495jbk5a6j3rq9ihdagkm"; depends=[corrplot crayon data_table DescTools FNN foreach ggplot2 ggpubr ranger]; }; - miceadds = derive2 { name="miceadds"; version="3.7-6"; sha256="1jpddrw7vrm4v7n01qg7kigaicljnnrhqfjwnm9hl13mc2r928cg"; depends=[mice mitools Rcpp RcppArmadillo]; }; + miceRanger = derive2 { name="miceRanger"; version="1.3.5"; sha256="07h3ah2z2nnwcs63mhlxvli9a9fsv9pnjbl5d0khgwpn7w4gmyxj"; depends=[corrplot crayon data_table DescTools FNN foreach ggplot2 ggpubr ranger]; }; + miceadds = derive2 { name="miceadds"; version="3.8-9"; sha256="1n5blg3vbl9sknwp9y123m597cvp6l1c25fyxqdbamw7b8ymzncp"; depends=[mice mitools Rcpp RcppArmadillo]; }; micemd = derive2 { name="micemd"; version="1.6.0"; sha256="1n8kzdf2713dw9mbzvbwl0gknzi9amdqnabfw2wmb70gsvma3f48"; depends=[abind digest jomo lme4 MASS Matrix mice mvmeta mvtnorm nlme]; }; michelRodange = derive2 { name="michelRodange"; version="1.0.0"; sha256="1pykqb9hmpvn77k0vhfh36iyhamz9h5kpswq3ql31h9nknfy3ixi"; depends=[magrittr]; }; micompr = derive2 { name="micompr"; version="1.1.0"; sha256="0qsxs35mmqx8hpszcb1z87xczh0vh0m0plqrj22af5mjjvif76n9"; depends=[]; }; microPop = derive2 { name="microPop"; version="1.5"; sha256="1gikp20n2b50fkybbg2hmlfjdcm0imjwygjsjnyv3wrjzypm2i78"; depends=[deSolve]; }; microbats = derive2 { name="microbats"; version="0.1-1"; sha256="1mahvblaiwg1xk2s34wd1ic8ddc9lh6g0azik2pd97bsf0krkyw8"; depends=[]; }; microbenchmark = derive2 { name="microbenchmark"; version="1.4-7"; sha256="1xl4m4yl4h2zcjiz8wsa7f3sh55qg2xr3sgpvz18rlix6b3173r6"; depends=[]; }; - microdemic = derive2 { name="microdemic"; version="0.4.0"; sha256="0i4pkrw02ad8ssvryndf7pxgk5wcyn4126yvl28fxk38249kvc9v"; depends=[crul data_table jsonlite tibble]; }; + microdemic = derive2 { name="microdemic"; version="0.5.0"; sha256="1i89vq3b7gq0pdh8hf92jzh0fyghhhxf8hmb72naz0vpl6xa301a"; depends=[crul data_table httpcode jsonlite tibble]; }; microhaplot = derive2 { name="microhaplot"; version="1.0.1"; sha256="0g15g7d19yz11nn2g0h8h2m8k1cvmpryz72pnalgv5yi58md5l5i"; depends=[dplyr DT ggiraph ggplot2 gtools magrittr scales shiny shinyBS shinyWidgets tidyr]; }; micromap = derive2 { name="micromap"; version="1.9.3"; sha256="1iciwy0kcg4qa0xc4gkqcilq33ac1s184vw13cbbkv0d1b5cgkgv"; depends=[ggplot2 maptools RColorBrewer rgdal sp]; }; micromapST = derive2 { name="micromapST"; version="1.1.1"; sha256="15ch132x3wnpf7rmy25nah7iyfxfk90p7lvavqjhrnavhjsfxbxx"; depends=[labeling RColorBrewer stringr]; }; - micropan = derive2 { name="micropan"; version="2.0"; sha256="0hn5k1mj60bn2hm1c87206q9hr5qqswbihdzkc27w3bpxwglgvl7"; depends=[dplyr igraph microseq rlang stringr tibble]; }; + micropan = derive2 { name="micropan"; version="2.0.1"; sha256="1hij7cqrcqlxfr5mbambi32f59zrrfi28fhaaqrlf0lkh4jnfbnj"; depends=[dplyr igraph microseq rlang stringr tibble]; }; microplot = derive2 { name="microplot"; version="1.0-42"; sha256="062dd4k6ryyl44lwbc2qgdsfcs1fiv9j2n6lx9driw6vng533b6q"; depends=[cowplot flextable ggplot2 HH Hmisc htmltools lattice officer]; }; - 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]; }; + microsamplingDesign = derive2 { name="microsamplingDesign"; version="1.0.7"; sha256="1cd9h331gvapa6p72mlyddrixb0jzka7q10i78fmpc2mcdl7alw0"; depends=[abind deSolve devtools ggplot2 gridExtra gtools knitr MASS matrixcalc matrixStats plyr Rcpp RcppArmadillo readr reshape2 shiny stringr]; }; microseq = derive2 { name="microseq"; version="2.0"; sha256="1i4xw7v5c3fzkz4gbcdp35idj1sm47gc4fmjwjsk9czi8nh591wr"; depends=[dplyr Rcpp rlang stringr tibble]; }; microsynth = derive2 { name="microsynth"; version="2.0.13"; sha256="1ijv7kbxl087m0wzdbzl9p74116dfwid03dlamy4b1l308azc4ag"; depends=[boot kernlab LowRankQP MASS nleqslv pracma survey]; }; midas = derive2 { name="midas"; version="1.0.1"; sha256="1alqxk23651jnkg0xn4rpvk71z5rhvx3y0wjrgkw2qw95s7jjn72"; depends=[shiny xml2]; }; @@ -10222,16 +10334,19 @@ in with self; { migration_indices = derive2 { name="migration.indices"; version="0.3.0"; sha256="0h0yjcj70wzpgrv3wl1f2h2wangh1klsllq0i0935plgzw736mwd"; depends=[calibrate]; }; migui = derive2 { name="migui"; version="1.1"; sha256="1qchjsc7ff2b6s9w6ncj9knjv6pyp90jd4jxljn2rr1ix1gc45za"; depends=[arm gWidgets2 mi]; }; miic = derive2 { name="miic"; version="1.0.3"; sha256="088szscn9v9279w86mypxphp3avv17iijvcvlckx3h1ka75lkx27"; depends=[bnlearn igraph MASS ppcor Rcpp]; }; + milorGWAS = derive2 { name="milorGWAS"; version="0.3"; sha256="1z44sbs3lmrx32wagk5rr3rc2k8iqq860fz0bi983llmgmhaqdxn"; depends=[gaston Rcpp RcppEigen]; }; milr = derive2 { name="milr"; version="0.3.0"; sha256="0z4d22fd6gd3zbi973vws9jqyh4c4m4i4ajcpxv934vxmbj0cma9"; depends=[glmnet numDeriv pipeR Rcpp RcppArmadillo RcppParallel]; }; - mime = derive2 { name="mime"; version="0.8"; sha256="18w98prfbivvygiyamsf9yg090kzbnvw2fn9b27823gmis4d08ny"; depends=[]; }; + mime = derive2 { name="mime"; version="0.9"; sha256="107sqarmyhxlch5nrg796i5z03p9mshskisiq2fm628ajk99gkrc"; depends=[]; }; mimi = derive2 { name="mimi"; version="0.2.0"; sha256="1ig34qd37my74nmlv3jcfrj7cnd55alxpf2flf2sssk2ws1y56xh"; depends=[data_table doParallel FactoMineR foreach glmnet rARPACK softImpute]; }; - mimsy = derive2 { name="mimsy"; version="0.4.2"; sha256="0f2yy5s9dxl8k12lrnc0w5d8vl0c9by0zc7gv05a2sq5jl7zrr8j"; depends=[dplyr lubridate magrittr openxlsx]; }; + mimsy = derive2 { name="mimsy"; version="0.4.3"; sha256="1mj0g2j0fw3j36r59yad7bfqhpjl1mjlca9fmmvxfjr878b4ld5g"; depends=[dplyr lubridate magrittr openxlsx]; }; minMSE = derive2 { name="minMSE"; version="0.1.1"; sha256="11m34nmxi2v80lsix8k44vl8ms5541js4av6h3pvx11px3i3c841"; depends=[MASS]; }; + mindr = derive2 { name="mindr"; version="1.2.3"; sha256="1slglva5ipbzj748k7rxvlw6g2iqdkvyf8qnplnzcjc2qsjljd1q"; 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-2"; sha256="1py6gylya8dhmxcyfrcwbwc5q226m041rs3cmj4q0dhqy8iy2zsw"; depends=[Rcpp RcppEigen]; }; minerva = derive2 { name="minerva"; version="1.5.8"; sha256="0k4ww3qfqrsnkccxk9dyq39xrc42g8gvj5g8drglg4fyci7jfs9h"; depends=[Rcpp RcppArmadillo]; }; miniCRAN = derive2 { name="miniCRAN"; version="0.2.12"; sha256="1jyrx86y8qdb3xdfpj812k0v492z3i6dnwy761qslwmn15xx8845"; depends=[assertthat httr igraph XML]; }; miniGUI = derive2 { name="miniGUI"; version="0.8-1"; sha256="0qb2fbkjwzn909yrk89d4951bwf8n05i0s265l8v2d4lpns9hc2i"; depends=[]; }; + miniMeta = derive2 { name="miniMeta"; version="0.2"; sha256="03r6xwcgchw42irqr8jy5hsbv8brk6f77h4zi9qhhz3zmkryjbw2"; depends=[colourpicker jsonlite markdown meta metafor readxl rhandsontable shiny shinyjs shinyWidgets WriteXLS]; }; miniUI = derive2 { name="miniUI"; version="0.1.1.1"; sha256="1h5h2sc57h95d6bsgs95l26911g38hvjc1v50bc31xl9689l2as5"; depends=[htmltools shiny]; }; minimalRSD = derive2 { name="minimalRSD"; version="1.0.0"; sha256="1p1jpi8lnv952k4c1wjgbgpb0hv4zg0f9qrd43cx0caibkqvhzf7"; depends=[]; }; minimap = derive2 { name="minimap"; version="0.1.0"; sha256="0y5yzic9pwpzs01gnl82syankijcjp85n22jn5zda0bp3y01r53r"; depends=[]; }; @@ -10247,35 +10362,38 @@ in with self; { mipred = derive2 { name="mipred"; version="0.0.1"; sha256="0kijn2xj0dh28rm2sjgd8j1a3c5avc3fjfvvcmzfasvxqdjflv6j"; depends=[mice]; }; mirt = derive2 { name="mirt"; version="1.31"; sha256="1jfpb69ih0kyffjf9k7z8yhfyw6ngqhkjxmpzgmm0v8lr2mnw0gq"; depends=[dcurver Deriv GPArotation lattice mgcv Rcpp RcppArmadillo vegan]; }; mirtCAT = derive2 { name="mirtCAT"; version="1.9.3"; sha256="1yd03rkviqxl9rsqnny3fgn2rj0hss49nav11b9w4np8lv9zkwgh"; depends=[lattice lpSolve markdown mirt pbapply Rcpp RcppArmadillo shiny]; }; - mirtjml = derive2 { name="mirtjml"; version="1.3.0"; sha256="12m2qhxgjc4qappw4w159326kgbz069xiqqc44qgzw3xhpl5lm5q"; depends=[GPArotation Rcpp RcppArmadillo]; }; misaem = derive2 { name="misaem"; version="0.9.2"; sha256="0awn0dvriycgmrx31ibckwjm2cq1wxrqjjjaq0bjgjsl37f4xnkk"; depends=[MASS mvtnorm]; }; misc3d = derive2 { name="misc3d"; version="0.8-4"; sha256="0qjzpw3h09qi2gfz52b7nhzd95p7yyxsd03fldc9wzzn6wi3vpkm"; depends=[]; }; - miscF = derive2 { name="miscF"; version="0.1-4"; sha256="1kvkbvrmaqclwdfghkrsmnzb6xbi97icay2wwb7k5m34xhx4ha82"; depends=[MASS MCMCpack mvtnorm R2jags]; }; - miscFuncs = derive2 { name="miscFuncs"; version="1.2-10"; sha256="1kqya581n76ff9avhj6xm6nwsbw7zlm4mwy0vyvdlqlf7c381qq0"; depends=[mvtnorm roxygen2]; }; + miscF = derive2 { name="miscF"; version="0.1-5"; sha256="0g6wk2zxqq6j949hnbvwmfd72y25zjfbrfrfxsj21q84w41fgjkb"; depends=[MASS MCMCpack mvtnorm R2jags]; }; + miscFuncs = derive2 { name="miscFuncs"; version="1.3"; sha256="0wn7i9656km53wlml360qgpzqxlv1jsjnh4swhqgf5dyjva8i141"; depends=[mvtnorm roxygen2]; }; miscIC = derive2 { name="miscIC"; version="0.1.0"; sha256="0pnwc3b318xxnmb7scrj4qkqlvqfyczspdg496kl0ixsiaafr1ad"; depends=[nnls]; }; miscTools = derive2 { name="miscTools"; version="0.6-26"; sha256="16pwfxpyl0zv3hjxx2kjchkg7p6kbj0s2rrpskj7rkhjr9imlg5y"; depends=[digest]; }; - misclassGLM = derive2 { name="misclassGLM"; version="0.2.0"; sha256="1dz36q2gl0q8d0s2rxn28b8ykw31wcdxf91s7ypmjggfdj64i8br"; depends=[bigmemory foreach MASS Matrix mlogit numDeriv ucminf]; }; + misclassGLM = derive2 { name="misclassGLM"; version="0.3.2"; sha256="1b344dy5fm45jkjrqcx16905n9x0iwihr73mq2m0qfq7ay87nsrh"; depends=[bigmemory foreach MASS Matrix mlogit numDeriv ucminf]; }; miscor = derive2 { name="miscor"; version="0.1-1"; sha256="1vn0q0i2f1szjywddb7h7krpbf0qch6gmbzs03m4zb03xd70983b"; depends=[]; }; miscset = derive2 { name="miscset"; version="1.1.0"; sha256="1gwi7jnqdf2fa8yk8gmcc7dcv72bbdl7yj3yccj3r5jjk41vdp91"; depends=[data_table devtools ggplot2 gridExtra Rcpp xtable]; }; mise = derive2 { name="mise"; version="0.1.0"; sha256="1ydbm76w3y0p5h82shxjblwlzbrmzwx0bgq9w2axjwz2nx8jfw0a"; depends=[]; }; + miselect = derive2 { name="miselect"; version="0.9.0"; sha256="0dfqni7r5zwdvwmrmvqhycmxhazivz6vnz2ccjy0hyfad29g0v7s"; depends=[]; }; mispr = derive2 { name="mispr"; version="1.0.0"; sha256="166piax3f7di8h0i07fbdx45lxz1p47j378v6yl6zdc3525adpjx"; depends=[e1071 MASS penalized]; }; misreport = derive2 { name="misreport"; version="0.1.1"; sha256="1f78zcw4cg51mjvflhwd64hip2gj8x9ng1mhh4w43yv3x8hmbd6h"; depends=[mvtnorm numDeriv VGAM]; }; missCompare = derive2 { name="missCompare"; version="1.0.1"; sha256="0f173463dsr2xcj228aysfnabrdv8i2c9sprmd2jndn65dv8hhsz"; depends=[Amelia data_table dplyr ggdendro ggplot2 Hmisc ltm magrittr MASS Matrix mi mice missForest missMDA pcaMethods plyr rlang tidyr VIM]; }; missDeaths = derive2 { name="missDeaths"; version="2.5.1"; sha256="1vj1d4r2ikc7ppm5kgivc7bj81qkyymrs11cxj1gdll6xyfn1g1d"; depends=[cmprsk MASS mitools Rcpp relsurv rms survival]; }; missForest = derive2 { name="missForest"; version="1.4"; sha256="0y02dhrbcx10hfkakg5ysr3kpyrsh2d9i5b0qzhj9x5x0d5q11gp"; depends=[foreach itertools randomForest]; }; missMDA = derive2 { name="missMDA"; version="1.16"; sha256="0c5a9ygvvx2qi9hgbwnhl4hcljy2b4hi2x3py2qyay9bp0zvchxm"; depends=[doParallel FactoMineR foreach mice mvtnorm]; }; + missMethods = derive2 { name="missMethods"; version="0.1.0"; sha256="0c2bzi1q8mqcma47j8l6yf24figf493rn671svrrsfz38gdirmpv"; depends=[]; }; missRanger = derive2 { name="missRanger"; version="2.1.0"; sha256="06ic99zg91ikzvmwbj05ma46rc4ayfwylv8cnj21sbr5nxw0qpz9"; depends=[FNN ranger]; }; missSBM = derive2 { name="missSBM"; version="0.2.1"; sha256="00jxj1f7hr78srlm49finf9j2q14y1cl66rwdkm1i81l8db5fvcp"; depends=[ape corrplot ggplot2 igraph magrittr nloptr R6 Rcpp RcppArmadillo]; }; missingHE = derive2 { name="missingHE"; version="1.3.2"; sha256="0i4af7479nnrbljbianwq4r6f0gs80y29mq9chykjyrbh0fpj15n"; depends=[bayesplot BCEA coda ggmcmc ggplot2 ggthemes gridExtra loo mcmcplots mcmcr R2jags]; }; mistat = derive2 { name="mistat"; version="1.0-5"; sha256="1vyx918b7iv1wcnk23bnlxljwy0hglpdx5drhrs5qcd45f6jrghc"; depends=[]; }; - mistr = derive2 { name="mistr"; version="0.0.2"; sha256="12zh6ys3lfc5ylidjhbmbxvbhjd3rg9vd89pv94547z9y1yf6sx5"; depends=[bbmle]; }; + mistr = derive2 { name="mistr"; version="0.0.3"; sha256="00pq56zlp27wsa88830pwqx1s2m3x7klzaw96jan8mp3r7hwskr4"; depends=[bbmle]; }; mistral = derive2 { name="mistral"; version="2.1.0"; sha256="1cr79p8q82lpj9d0y6q24xmfkxmnlqv8ivkd0baj7fxfb1nb8sak"; depends=[DiceKriging doParallel e1071 emoa foreach ggplot2 iterators Matrix mvtnorm quadprog]; }; + misty = derive2 { name="misty"; version="0.3.0"; sha256="1yiiqdpl5bfgy4y41195a5fvbbx1v1g5idw4swbadzz2sxn66w57"; depends=[haven lavaan readxl]; }; mitml = derive2 { name="mitml"; version="0.3-7"; sha256="0yqyxkyi1kmv5k63wxj5kkg5g8igk1axk2csb4xhj6wz0p89dxy6"; depends=[haven jomo pan]; }; mitools = derive2 { name="mitools"; version="2.4"; sha256="0c2x2n1p53lcw0vx4vmy5j7m2f95i7g2iwbryl89imr99rvz617j"; depends=[DBI]; }; mix = derive2 { name="mix"; version="1.0-10"; sha256="0z16ddbh79kqxi64bl1h2sd8anpgc48n9d1nyr2zlln39nhv8w8g"; depends=[]; }; - mixAK = derive2 { name="mixAK"; version="5.1"; sha256="0i9gp66d1mzskiif0bk0w88cinc923fsj4vi7pv0im2cwmxksiiq"; depends=[coda colorspace fastGHQuad lme4 mnormt]; }; + mixAK = derive2 { name="mixAK"; version="5.2"; sha256="1fgyky6giscldrk13wjbkk26lbg6jzn6xzxm4wy4bjgbfmbar42m"; depends=[coda colorspace fastGHQuad lme4 mnormt]; }; mixEMM = derive2 { name="mixEMM"; version="1.0"; sha256="0344ay1avi37kvh5w9bknayx67yh7rflj6zhw68d2888v7cbghjy"; depends=[]; }; - mixKernel = derive2 { name="mixKernel"; version="0.3"; sha256="1kf8niplqf97n10zi6hkp9gmyyd15v6vsy741c089iwiazmixhdf"; depends=[corrplot ggplot2 LDRTools Matrix mixOmics phyloseq psych quadprog vegan]; }; + mixIndependR = derive2 { name="mixIndependR"; version="0.2.1"; sha256="0m858jjspkacfyxikisqij4d5ipz6fklgcczxzh7i4kv248p43w3"; depends=[stringr]; }; + mixKernel = derive2 { name="mixKernel"; version="0.4"; sha256="0bqa4inim7819pl3dr2kfzdvv7phqkjqfx3zal8mmxcjpkpxs4mf"; depends=[corrplot ggplot2 LDRTools Matrix mixOmics phyloseq psych quadprog reticulate vegan]; }; mixPHM = derive2 { name="mixPHM"; version="0.7-2"; sha256="1wvkdb9zj2j8dpppnyins05rg877zbydqsl3qaan62wznkknxcac"; depends=[lattice survival]; }; mixR = derive2 { name="mixR"; version="0.1.1"; sha256="1xd3v5rk59380zh7r6l5blmcy4gib9xp44j5dcrk6ivs6fgycsxh"; depends=[ggplot2 Rcpp]; }; mixRasch = derive2 { name="mixRasch"; version="1.1"; sha256="1r067pv7b54y1bz8p496wxv4by96dxfi2n1c99gziqf5ramx3qzp"; depends=[]; }; @@ -10290,25 +10408,25 @@ in with self; { mixedsde = derive2 { name="mixedsde"; version="5.0"; sha256="0ss1ng4nx91gxj85wxxfyh9ljxsj3ag6lsj1a5d2815p9jzl7dsv"; depends=[MASS moments plot3D sde]; }; mixexp = derive2 { name="mixexp"; version="1.2.5"; sha256="0nbf10xhrr51rb1b2apcj4p3ci8xbi7flgz500ar3mxh8h8l74sq"; depends=[daewr gdata lattice]; }; mixggm = derive2 { name="mixggm"; version="1.0"; sha256="1wiiayld7rwp3mwz93zizrv0dzw02mqrzprc4z6c4jj25c8pypw5"; depends=[foreach GA mclust memoise network Rcpp RcppArmadillo]; }; - mixl = derive2 { name="mixl"; version="1.1"; sha256="0v3yxhar1ms6y2j73a5hgyh1c9v6lg5xl646mv0ischqj21bysbh"; depends=[maxLik numDeriv randtoolbox Rcpp readr sandwich stringr]; }; + mixl = derive2 { name="mixl"; version="1.1.2"; sha256="03ylzl5fyypyxhjfhbnhcswmq2cngzspvkzn8bnlgkd496qr14j8"; depends=[maxLik numDeriv randtoolbox Rcpp readr sandwich stringr]; }; mixlink = derive2 { name="mixlink"; version="0.1.5"; sha256="0ywgrcplhspc0x5fniw52xqz20y7j9mwgy4ky8lv3vii659mr52m"; depends=[mvtnorm numDeriv Rcpp RcppGSL]; }; mixlm = derive2 { name="mixlm"; version="1.2.4"; sha256="0jwz918qnz1p71y82ayrgir9rpij8zk3jgmn63nq5xrlf0jbjcdd"; depends=[car leaps multcomp pls pracma]; }; - mixmeta = derive2 { name="mixmeta"; version="1.0.7"; sha256="0y0q38w9ljadh64kmmfn8chsmmrhpik54rh64iiq45b8ihxb1sq8"; depends=[]; }; + mixmeta = derive2 { name="mixmeta"; version="1.0.8"; sha256="1wx95pgd096d359n5mrl98hpwc2c1r2jw3pzvilkawx0y8lw68na"; depends=[]; }; mixor = derive2 { name="mixor"; version="1.0.4"; sha256="1l296z0a3kamb1m94pfx3vczp36pa0np101fy5c23kh45s59pbs7"; depends=[survival]; }; mixreg = derive2 { name="mixreg"; version="0.0-6"; sha256="04g863yxrlj0wqsmzzxph5110g3gjk094r59zzk0b9r89m8vhpsl"; depends=[]; }; mixsep = derive2 { name="mixsep"; version="0.2.1-2"; sha256="1ywwag02wbx3pkd7h0j9aab44bdmwsaaz0p2pcqn1fs3cpw35wa2"; depends=[MASS RODBC tcltk2]; }; mixsmsn = derive2 { name="mixsmsn"; version="1.1-6"; sha256="0zlbs0yn336xdzymrb065rbg1zj8f7zri77lmd7c4w1rxhfjh9a9"; depends=[mvtnorm]; }; + mixsqp = derive2 { name="mixsqp"; version="0.3-17"; sha256="0dmk5xpgq55bwdjfrnv6frfx708frszscx03h8l9cdsj3l1d002n"; depends=[irlba Rcpp RcppArmadillo]; }; mixtNB = derive2 { name="mixtNB"; version="1.0"; sha256="0lqbm1yl54zfs0xcmf3f2vcg78rsqyzlgvpydhmhg7x6dkissb22"; depends=[]; }; - mixtools = derive2 { name="mixtools"; version="1.1.0"; sha256="13wdm0xs5bakhpa8ypg6lvhjaqkxyabwz4glxdwn0jwdvkcdhgsl"; depends=[MASS segmented survival]; }; + mixtools = derive2 { name="mixtools"; version="1.2.0"; sha256="08whic8hmmzi55b7azwj11l2x5r9s5qbyrv7s9jr08156vqkw0zg"; depends=[kernlab MASS segmented survival]; }; mixtox = derive2 { name="mixtox"; version="1.3.2"; sha256="0mdnp1yrcxvan5l7jj91s41vq5y1kdnkhhinqrklmg4ph5f29dmq"; depends=[minpack_lm]; }; mixture = derive2 { name="mixture"; version="1.5"; sha256="1ahr8jw93xnd5hmy3h4sr209ql7gmkwbvnnfmiplbpc17czqgcn4"; depends=[]; }; mize = derive2 { name="mize"; version="0.2.3"; sha256="1rc3mhcwidmfbkfyxwldm9hg25lh7a81jlj2zv45vsj5hbrmvk6c"; depends=[]; }; - mizer = derive2 { name="mizer"; version="1.0.1"; sha256="1vn03f3j9vd8hwz18i67blif33y3cd7hc8m1h4aw7wkgdpqsyb4b"; depends=[deSolve ggplot2 plyr progress Rcpp reshape2]; }; + mizer = derive2 { name="mizer"; version="2.0.0"; sha256="152bjz37b1sjg1x9sl6286hisk2qpcckfh4gxw1wbdn7kh99law1"; depends=[assertthat deSolve dplyr ggplot2 plotly plyr progress Rcpp reshape2]; }; mkde = derive2 { name="mkde"; version="0.1"; sha256="04v84arpnmjrkk88ffphnhkz32x7y0dypk75jfmbbgcgv59xlglv"; depends=[raster Rcpp sp]; }; - mkin = derive2 { name="mkin"; version="0.9.49.8"; sha256="01sjahhwz80aixxjksfb2bnilryggzs57cmhw6r6crq2sarzcqin"; depends=[deSolve inline lmtest numDeriv R6]; }; + mkin = derive2 { name="mkin"; version="0.9.49.9"; sha256="14wnmyrhf6b6cswgfv1a8caji1zk2r1xphg59fgw7527zbdzqm0r"; depends=[deSolve inline lmtest numDeriv pkgbuild R6]; }; mknapsack = derive2 { name="mknapsack"; version="0.1.0"; sha256="1kzmx7d512681a4hjirfgcd7a8rvndb4da66p16gms5nnxzsby9c"; depends=[assertthat data_table lpSolve]; }; mkssd = derive2 { name="mkssd"; version="1.1"; sha256="1qqzy6fn6sc3lxahc19hzzf1hzxsyvxqi7npynw0vkknlrvh2ijp"; depends=[]; }; - mlDNA = derive2 { name="mlDNA"; version="1.1"; sha256="0d9lydiwar98hin26slnym4svn0g1xmyn212vvzsx9lzlvs5a9k4"; depends=[e1071 igraph pROC randomForest ROCR rsgcc snowfall]; }; mlPhaser = derive2 { name="mlPhaser"; version="0.01"; sha256="1s2mqlnbcjdkx0ghvr2sw9rzggqa4jy2vzi9vbyqkh6795lgck6n"; depends=[]; }; mlVAR = derive2 { name="mlVAR"; version="0.4.4"; sha256="0ib566qygm28lqhr3w9vzfxnpsmazlipzrfsdm3cw21wpz2lvxcr"; 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]; }; @@ -10324,45 +10442,46 @@ in with self; { mlergm = derive2 { name="mlergm"; version="0.5"; sha256="145004r8xihphsng8pna430a8rqg0ibqx92jwyjkn7hzpx17p7xf"; depends=[cowplot ergm GGally ggplot2 lpSolve Matrix network plyr reshape2 sna stringr]; }; mleur = derive2 { name="mleur"; version="1.0-6"; sha256="0mddphq3b6y2jaafaa9y41842kcaqdl3dh7j4pva55q2vcjcclj7"; depends=[fGarch lattice stabledist urca]; }; mlf = derive2 { name="mlf"; version="1.2.1"; sha256="09ihnibpknpp26hdlbxyr99yz7z0n8qpsjs5aq3zngng0yh3wdn9"; depends=[]; }; - mlflow = derive2 { name="mlflow"; version="1.5.0"; sha256="1aks7azc3s51f40jhqgkr5hl43h18w5njzms7q6vchbdhb8cydrq"; depends=[base64enc forge fs git2r glue httpuv httr ini jsonlite openssl processx purrr reticulate rlang swagger tibble withr xml2 yaml zeallot]; }; + mlflow = derive2 { name="mlflow"; version="1.7.0"; sha256="1hdqdwj8j59a2x15alihv0p8hz4hlr9pk6c1qkyimcgfbvj8py04"; depends=[base64enc forge fs git2r glue httpuv httr ini jsonlite openssl processx purrr reticulate rlang swagger tibble withr xml2 yaml zeallot]; }; mlgt = derive2 { name="mlgt"; version="0.16"; sha256="1nvdq6mvgr39ikkf73aggsb6pmbw132injj8fdkr8hgcmwm6lgd9"; depends=[seqinr]; }; mlica2 = derive2 { name="mlica2"; version="2.1"; sha256="0c3m1zd9x99n6lw12hfzmd59355z51xa8rhg1h7qwfn9p86r826f"; depends=[]; }; - mlmRev = derive2 { name="mlmRev"; version="1.0-7"; sha256="0gj7yk2gll6y99q4h6ggds37fcww8d326h44rygcl155y0482rky"; depends=[lme4]; }; + mlmRev = derive2 { name="mlmRev"; version="1.0-8"; sha256="0ln4nazhc1prnlmvhfzhx268vx3klb0xnz1nsiwh0pwyskskyzym"; depends=[lme4]; }; mlma = derive2 { name="mlma"; version="4.0-1"; sha256="0pk2h4m74r95dfkqzliixi6z1rwdfc6gbz8c3162y22m919f00vc"; depends=[car gplots lme4]; }; mlmc = derive2 { name="mlmc"; version="1.0.0"; sha256="01h7w0ajyg3bccynlpbi3yjpy089wczbfbajpg6yw5v4dppw7k7a"; depends=[ggplot2 Rcpp]; }; mlmi = derive2 { name="mlmi"; version="1.0.0"; sha256="08sm836y40af3jd5gcl5pnyv1gqpx4ngkkw4xfp82h1j4yk47sy5"; depends=[cat gsl MASS Matrix mix norm]; }; mlmm_gwas = derive2 { name="mlmm.gwas"; version="1.0.6"; sha256="14xp8k7sww1skyw5l2006gpaw2c6yrri5nmfx4yav4vqdlhcj2k1"; depends=[coxme Matrix multcomp multcompView sommer]; }; mlmmm = derive2 { name="mlmmm"; version="0.3-1.2"; sha256="1m5ziiqs3ll1xjm1yf7x4sdc910jypn3kjnbadf95xxkvqmfrsqq"; depends=[]; }; - mlogit = derive2 { name="mlogit"; version="1.0-2"; sha256="18dnwbs0jlsp8sli6qr4j5gpg8v619hyq0cwkb1ms1kwngpszhsw"; depends=[Formula lmtest MASS Rdpack statmod zoo]; }; + mlogit = derive2 { name="mlogit"; version="1.0-3.1"; sha256="034vymf296abpajkic303j0x4mak62m8iav86k3d3g6hy3c03dp4"; depends=[Formula lmtest MASS Rdpack statmod zoo]; }; mlogitBMA = derive2 { name="mlogitBMA"; version="0.1-6"; sha256="1wl8ljh6rr1wx7dxmd1rq5wjbpz3426z8dpg7pkf1x9wr94a2q25"; depends=[abind BMA maxLik]; }; - mlr = derive2 { name="mlr"; version="2.17.0"; sha256="0x7jggvhg8pf1hw013qrg7zdaf8yq5znjl2ap0f9a6w2j34b32yf"; depends=[backports BBmisc checkmate data_table ggplot2 parallelMap ParamHelpers stringi survival XML]; }; - mlr3 = derive2 { name="mlr3"; version="0.1.6"; sha256="096rn1ljkimhfvd487wyp3qb28dm7qhpyj35nghgci7y7cq50jam"; depends=[backports checkmate data_table digest lgr mlbench mlr3measures mlr3misc paradox R6 uuid]; }; - mlr3db = derive2 { name="mlr3db"; version="0.1.3"; sha256="0zg5hmlc7mybhrz0hrz4rmvdhbvjp4d0im0r22qvsd3phv614v8m"; depends=[checkmate data_table digest dplyr mlr3 R6]; }; - mlr3filters = derive2 { name="mlr3filters"; version="0.1.1"; sha256="0xis7yk3ycchpykl2kp0w1rx806rxnyrrcxnw9m240svzs3367x3"; depends=[backports checkmate data_table mlr3 mlr3misc paradox R6]; }; - mlr3learners = derive2 { name="mlr3learners"; version="0.1.5"; sha256="0yraazjfrd3vpbl9na5c77yy8lcdhisq30d7nl13ha2pssn7ifb3"; depends=[data_table mlr3 mlr3misc paradox R6]; }; - mlr3measures = derive2 { name="mlr3measures"; version="0.1.1"; sha256="0pbsj1yra3wx5xny4ak901qfj983lk8nsiqw2x8kzz46dskx4wzl"; depends=[checkmate]; }; - mlr3misc = derive2 { name="mlr3misc"; version="0.1.6"; sha256="1kcxkpm66n71rc2pzy1xpkfm797palfz2axj0shms4xpjilzfzf1"; depends=[backports checkmate data_table R6]; }; - mlr3pipelines = derive2 { name="mlr3pipelines"; version="0.1.2"; sha256="14clmipbqinmyrxfa363gjffdzijz1vd2zzbgkkldv44xszgb7p9"; depends=[backports checkmate data_table digest mlr3 mlr3misc paradox R6 withr]; }; - mlr3proba = derive2 { name="mlr3proba"; version="0.1.1"; sha256="0cangy4j3haglsc356az9l73k62m8i9b5wdvc5kpb848f63yzafc"; depends=[BBmisc checkmate data_table distr6 mboost mlr3 mlr3misc mlr3pipelines paradox R6 survival]; }; - mlr3tuning = derive2 { name="mlr3tuning"; version="0.1.1"; sha256="09wmil8v5vn705zhsj0rjag6sh3n1mdsjb79xca8x4a72lv09i45"; depends=[checkmate data_table lgr mlr3 mlr3misc paradox R6]; }; + mlr = derive2 { name="mlr"; version="2.17.1"; sha256="0fwjl5dy516vrh2lx5rgps85q0jz8ka5dx61bz7lfxk21k8bjw8b"; depends=[backports BBmisc checkmate data_table ggplot2 parallelMap ParamHelpers stringi survival XML]; }; + mlr3 = derive2 { name="mlr3"; version="0.1.8"; sha256="02928qw5yc2zhfj69zrnmz0zraq2xf5vb7q7d11np2wdb0vsj1zk"; depends=[backports checkmate data_table digest lgr mlbench mlr3measures mlr3misc paradox R6 uuid]; }; + mlr3data = derive2 { name="mlr3data"; version="0.1.0"; sha256="0cdicfrrmba87adkcnpzm9gkcspjskqsbs8xryj1d0c48lzws7ab"; depends=[]; }; + mlr3db = derive2 { name="mlr3db"; version="0.1.5"; sha256="09hins00pc569vz26mkyg3736vhl01szl8hbwp2vyrh3mdn21c9m"; depends=[backports checkmate data_table digest dplyr mlr3 R6]; }; + mlr3filters = derive2 { name="mlr3filters"; version="0.2.0"; sha256="1dps9v4w82qnhvlrshwpaqppjmy405syp4qdirm456ydfw2gywcy"; depends=[backports checkmate data_table mlr3 mlr3misc paradox R6]; }; + mlr3learners = derive2 { name="mlr3learners"; version="0.1.6"; sha256="1wifc8757klkcb84pvs602wa3kc2n7g4vz0m63a83vgxwghlpp6q"; depends=[data_table mlr3 mlr3misc paradox R6]; }; + mlr3measures = derive2 { name="mlr3measures"; version="0.1.3"; sha256="1hvhpshmdd76136srndd60d5xijpil5daf392y9lalqq0if6903d"; depends=[checkmate]; }; + mlr3misc = derive2 { name="mlr3misc"; version="0.1.8"; sha256="168d6az4paf3am4id6c9dnsyggnac3ccazr14594zs87a6cv87mn"; depends=[backports checkmate data_table R6]; }; + mlr3pipelines = derive2 { name="mlr3pipelines"; version="0.1.3"; sha256="0qkhd4gcfh3higz0zqgrblxj70pszg8xb6l5flwp08hlwj1cw44j"; depends=[backports checkmate data_table digest mlr3 mlr3misc paradox R6 withr]; }; + mlr3proba = derive2 { name="mlr3proba"; version="0.1.4"; sha256="13bmpn20hkh19lhp6hpi9lbz8y5fily2mr5j931dm7839zc735q4"; depends=[checkmate data_table distr6 mlr3 mlr3misc mlr3pipelines paradox R6 survival]; }; + mlr3shiny = derive2 { name="mlr3shiny"; version="0.1.1"; sha256="0jn5n6k1dq59g5m6pvpp964pcjv1mjbdbdz7dag7gs26g8c215jb"; depends=[data_table DT e1071 mlr3 mlr3learners mlr3measures plyr purrr ranger readxl shiny shinyalert shinydashboard shinyjs shinythemes shinyWidgets stringr]; }; + mlr3tuning = derive2 { name="mlr3tuning"; version="0.1.2"; sha256="0559jj4xbzg63df2rn0sw6r6fz5b463k2lcx83l4q3mki72pl9xx"; depends=[checkmate data_table lgr mlr3 mlr3misc paradox R6]; }; mlr3verse = derive2 { name="mlr3verse"; version="0.1.1"; sha256="1spwmylnsks479nkj688nd8h3slkh8cnmrxrvh7s2zyqla6arigx"; depends=[mlr3 mlr3db mlr3filters mlr3learners mlr3misc mlr3pipelines mlr3tuning mlr3viz paradox]; }; - mlr3viz = derive2 { name="mlr3viz"; version="0.1.0"; sha256="1c28hrpp3majw781jaayjhg9rwr52r0v00dfv78jy6rgaps9r37h"; depends=[checkmate data_table ggplot2 mlr3misc]; }; - mlrCPO = derive2 { name="mlrCPO"; version="0.3.4-4"; sha256="0v8d336f7xghs2pdh6r5j21i6mcy0p2wdzx4nkj69fsc5gn0n058"; depends=[backports BBmisc checkmate mlr ParamHelpers stringi]; }; - mlrMBO = derive2 { name="mlrMBO"; version="1.1.3"; sha256="1y67kc8kcbim23kkymkn10h761r5pyq80cfzz6a7f0rnmagzvqxp"; depends=[backports BBmisc checkmate data_table lhs mlr parallelMap ParamHelpers smoof]; }; + mlr3viz = derive2 { name="mlr3viz"; version="0.1.1"; sha256="0k5a0h2jhk375hl4hwn1dxapjnm2hxhayw8rfh1i1p3qvswhgwla"; depends=[checkmate data_table ggplot2 mlr3misc]; }; + mlrCPO = derive2 { name="mlrCPO"; version="0.3.6"; sha256="1z9s52y318wp43q7n28h89m5s58bcfawzj9zx03ji1adf68sk9ah"; depends=[backports BBmisc checkmate mlr ParamHelpers stringi]; }; + mlrMBO = derive2 { name="mlrMBO"; version="1.1.4"; sha256="007944cb6hz7rah0bk66mpfa22jinz9i224wljgnj0w51lpipbjv"; depends=[backports BBmisc checkmate data_table lhs mlr parallelMap ParamHelpers smoof]; }; mlsjunkgen = derive2 { name="mlsjunkgen"; version="0.1.1"; sha256="109ag52x4y3rzx8yccilrnl24mz4ximzx6v4lrbak7dpiclqrw7a"; depends=[]; }; - mlt = derive2 { name="mlt"; version="1.1-1"; sha256="0n2avjmi53y69wf0cz6v1n358n9vaf6shlf3vcppy2c2zny5l8rn"; depends=[alabama basefun BB coneproj nloptr numDeriv sandwich survival variables]; }; - mlt_docreg = derive2 { name="mlt.docreg"; version="1.0-4"; sha256="07x3qnfrlb3m71jyd0rqa3svdplcia3zis1qmcwm1c936p7nvjg4"; depends=[mlt numDeriv]; }; + mlt = derive2 { name="mlt"; version="1.1-2"; sha256="0dxfyq9wf49sy57gjvp2v6wp50wbiracvfsd4mbrgz4k36h3w5ra"; depends=[alabama basefun BB coneproj nloptr numDeriv sandwich survival variables]; }; + mlt_docreg = derive2 { name="mlt.docreg"; version="1.0-5"; sha256="1dp5h86bcga9lkc1hy5sbc3as0piyzxlz6z5iwli2a33ssyihxql"; depends=[mlt numDeriv]; }; mltest = derive2 { name="mltest"; version="1.0.1"; sha256="14gyssfph088v936mpywmd4y8z9vdv0zk8638vlg23j8cf5j4al2"; depends=[]; }; mltools = derive2 { name="mltools"; version="0.3.5"; sha256="045v28w7vz1zjxim8vfc6ncvg2mavr1q332x0hzlqpfzrk7gz4vh"; depends=[data_table Matrix]; }; mlxR = derive2 { name="mlxR"; version="4.1.0"; sha256="1jb214isf0zbx1j7xkidmc4jrvlw3hfvs7q2if3489p0si1n2k23"; depends=[ggplot2]; }; - mma = derive2 { name="mma"; version="9.0-0"; sha256="1nam7gn3a7jp4dcy9q6ypk7icknflvgmsdzv218qhf28zaw2ybza"; depends=[car doParallel foreach gbm gplots lattice plotrix survival]; }; + mma = derive2 { name="mma"; version="10.2-2"; sha256="021nc865rdis0m939y8qvk9nnhp9lmfn4rlqhvfxfc4774sphmll"; depends=[car 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]; }; + mmand = derive2 { name="mmand"; version="1.6.1"; sha256="19s6v083iry95akhc2ccj617sjcddalb6dp87j3lqjlgybxws62q"; depends=[Rcpp]; }; mmap = derive2 { name="mmap"; version="0.6-19"; sha256="0s3vlwdcwifl2a2byr0f2cc4vmbdparc55x889a3h115ga7k91w2"; depends=[]; }; mmapcharr = derive2 { name="mmapcharr"; version="0.3.0"; sha256="175qb6ay6zlcdcxzc86lmlddfzjc8j8i1b8cvi2q0j6nbl2kl50r"; depends=[Rcpp rmio]; }; mmc = derive2 { name="mmc"; version="0.0.3"; sha256="03nhfhiiadga8mcp33kj20g33v9n5i62fdqgi20h5p80g849k719"; depends=[MASS survival]; }; - mmcm = derive2 { name="mmcm"; version="1.2-7"; sha256="11dgb8crz5pjpx66cxxzn4lg58jbaxxhfqlcw3hdp9wpvyqjh3sb"; depends=[mvtnorm OpenMPController]; }; - mmds = derive2 { name="mmds"; version="1.1"; sha256="0f5qzkfhi7vg8vsd8r41idmbwrrgc7qzfnp81adms2yzrza17wrw"; depends=[]; }; + mmcm = derive2 { name="mmcm"; version="1.2-8"; sha256="09xcvgzgg5x890jibmmbcd3rr8q8vmwxwk6s8zgn9a8hfdwqny9a"; depends=[mvtnorm]; }; mme = derive2 { name="mme"; version="0.1-6"; sha256="1k60y1yrf7fv939v32kf3il7r3cws0kih4bpm0ap28fvbx3vr3yb"; depends=[MASS Matrix]; }; mmeln = derive2 { name="mmeln"; version="1.4"; sha256="0q5w3ajc1v798dyvryny2a0c52hzhxrjm4md08mqvww65pdzhqc4"; depends=[]; }; mmeta = derive2 { name="mmeta"; version="2.3"; sha256="0hyxpph2hfjwiy95r0n3h64aab5ziqp2a8gmmpp6nyc77h638czb"; depends=[aod]; }; @@ -10371,21 +10490,22 @@ in with self; { mmm2 = derive2 { name="mmm2"; version="1.2"; sha256="1h9pn5s3jjs4bydrr1qysjb4hv7vs4h3m7mvi22ggs2dzyz3b298"; depends=[gee]; }; mmmgee = derive2 { name="mmmgee"; version="1.20"; sha256="0y3pwnc9h7y2l9cvgfl62nl1vnnkla2y8082jhdvxsb3mk88rgad"; depends=[Matrix mvtnorm]; }; mmod = derive2 { name="mmod"; version="1.3.3"; sha256="1dz6887mlqbagjj98wcabmxj9hvsz8pgsizy1fqkwjhhs44c62y4"; depends=[adegenet pegas]; }; - mmpca = derive2 { name="mmpca"; version="1.0.2"; sha256="0km129g98bbzi48akqad97nxss5qkxpsx77hpmam4nsbfj4idn6f"; depends=[CMF digest gsl Rcpp RcppEigen]; }; + mmpca = derive2 { name="mmpca"; version="2.0.1"; sha256="05vir7hjv5dccfcizyn5n6qxx2p53111if16l44a7ifg5k599xj9"; depends=[digest gsl Rcpp RcppEigen]; }; mmpf = derive2 { name="mmpf"; version="0.0.5"; sha256="1w1ll1l7yzwb1wmlrcfpgqyzni7yb20kxy422y867hx2ndxlfwpz"; depends=[checkmate data_table]; }; mmpp = derive2 { name="mmpp"; version="0.6"; sha256="16aypjf4i0ya3qgxqrrg8y0xbnq1pnqky1dpkgln5q494hphyg91"; depends=[]; }; mmppr = derive2 { name="mmppr"; version="0.1"; sha256="0fswkqcw0xkqd9gmqabb61i32zscp5jzfx0z43wq7mrlwynryylv"; depends=[expm reshape2]; }; mmsample = derive2 { name="mmsample"; version="0.1"; sha256="0mdd2zryadd31a5pls5fvlxx52mr54jsi1i6mwrs4y7rl3i9v95z"; depends=[MASS Rcpp RcppArmadillo]; }; - 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]; }; mniw = derive2 { name="mniw"; version="1.0"; sha256="1iamq6cq027ncakm4rfx2p1k2mcj7nk5vk57m8ndnbmmi2y9wwv9"; depends=[Rcpp RcppEigen]; }; mnj = derive2 { name="mnj"; version="1.0"; sha256="05rz6krcq56zqvvaz3myf1aki2z635g2zrqyl25n2da1cvyjwdzq"; depends=[rpart]; }; mnlfa = derive2 { name="mnlfa"; version="0.1-53"; sha256="1hw4m6zpb2322041aizam1l71zxz3i7siawid8npig8v9dhkaqrf"; depends=[CDM Rcpp RcppArmadillo]; }; mnlogit = derive2 { name="mnlogit"; version="1.2.6"; sha256="0dfwpkl8g7ap5xr48smiv8vdbamd2r1liy9nwpsn0kcsr9cj65n9"; depends=[Formula lmtest mlogit]; }; + mnonr = derive2 { name="mnonr"; version="1.0.0"; sha256="143qkn3bx37a6r7kgmspqh55l2r8k9f93jgxr6qpg51w411k5ilb"; depends=[]; }; mnormpow = derive2 { name="mnormpow"; version="0.1.1"; sha256="0z53vwhkhkkr6zrjhd3yr14mb02vh7lr63frf0ivajndxiap0s9v"; depends=[]; }; - mnormt = derive2 { name="mnormt"; version="1.5-5"; sha256="1b34xxrnf35khsx82mhvmk96sgfr2flyasaah7qkb2976pwxay7z"; depends=[]; }; + mnormt = derive2 { name="mnormt"; version="1.5-6"; sha256="0k8y08gj6z525yvc7y3dl2kzgnafbj3i7lvpamypsmqxf74zql99"; depends=[]; }; mnreadR = derive2 { name="mnreadR"; version="2.1.4"; sha256="11mfpf12pjpgvcih6q8l9fwspj2gy78fcirimzv7gn061nr4v7sg"; depends=[dplyr ggplot2 nlme tibble tidyr]; }; + mob = derive2 { name="mob"; version="0.1.0"; sha256="0zxp02fl514wb3apcyg072wdydqbnbfqkjj9gq5ql1kkvgh9wqf8"; depends=[gbm Hmisc Rborist]; }; mobForest = derive2 { name="mobForest"; version="1.3.1"; sha256="1g5yfs70abl7pacprijlwdq3l72aqkbqs09z1pmw64wv4wa1vm25"; depends=[modeltools party sandwich strucchange zoo]; }; mobsim = derive2 { name="mobsim"; version="0.1.0"; sha256="077hw1162giwc90y5dvj9052i5hxdf2ii29m9q8ky028375dsd0f"; depends=[Rcpp sads vegan]; }; moc = derive2 { name="moc"; version="2.0"; sha256="0fgp8dg9qf7aw1qawmszlxs4bcccqmd87y4kkzdqggm807c2k5gh"; depends=[]; }; @@ -10403,25 +10523,25 @@ in with self; { modeLLtest = derive2 { name="modeLLtest"; version="1.0.0"; sha256="1f80bgw1l6zgwlhz1agdrl5d44jfrk50yi3jgwf14l4zjx8x8rp3"; depends=[coxrobust MASS quantreg Rcpp RcppArmadillo survival]; }; modeest = derive2 { name="modeest"; version="2.4.0"; sha256="087dw0013y4m7fcl06mxylh9lnp6acysl80d80r9srv4pw4r950s"; depends=[fBasics stable stabledist statip]; }; modehunt = derive2 { name="modehunt"; version="1.0.7"; sha256="0qz9kmf1qfs2dr7kzm9l7ac0h5rvi3b9j9896p991sk4bcalsl0b"; depends=[]; }; - modelDown = derive2 { name="modelDown"; version="1.0.1"; sha256="0rdpma8g461a17n6qsdvjb9s5nnhap1n05mavjy8cpj7d8j7ikkv"; depends=[archivist auditor breakDown DALEX devtools drifter DT ggplot2 kableExtra psych svglite whisker]; }; + model4you = derive2 { name="model4you"; version="0.9-5"; sha256="1l94196x594ff61f8iaywpmw9ra3g27bnlchjl14hb9h0l21vbgm"; depends=[Formula ggplot2 gridExtra partykit sandwich survival]; }; modelObj = derive2 { name="modelObj"; version="4.0"; sha256="1py2y80x37mmnl2y0pxdbhqkjrln6x210hg0g224d34lxk71m172"; depends=[]; }; - modelStudio = derive2 { name="modelStudio"; version="0.2.1"; sha256="0fxrfd9ylgy39ivrvcg3gfvfbwbxwwrjx0bvgzibmvb6p8fg68qr"; depends=[iBreakDown ingredients jsonlite r2d3]; }; - modelbased = derive2 { name="modelbased"; version="0.1.1"; sha256="08ck275nfvskrnvlixclyz994bagwlc1gcca0qnh3x9mq9xcspiy"; depends=[bayestestR emmeans insight parameters]; }; + modelStudio = derive2 { name="modelStudio"; version="1.0.1"; sha256="0lghbxa27kyg1m8d3n8a6z9b248nzi4ahzvm221gbvxjgk0mrgi4"; depends=[iBreakDown ingredients jsonlite progress r2d3]; }; + modelbased = derive2 { name="modelbased"; version="0.1.2"; sha256="0440pckpw9vfbvvhxsikayb0b6k479icr2m9ps0yr0xph240x9hw"; depends=[bayestestR emmeans insight parameters]; }; modeldata = derive2 { name="modeldata"; version="0.0.1"; sha256="0dzjgb5g60hgqppxvzin8m51clkw8d89if7dw5ha46j2paw1n5r9"; depends=[]; }; - modeldb = derive2 { name="modeldb"; version="0.2.0"; sha256="1qcgmv31gd1x0mzxq4lcarmswsr75qgq5zpfcwchxzrz97ncbwgd"; depends=[dplyr ggplot2 progress purrr rlang tibble tidypredict]; }; + modeldb = derive2 { name="modeldb"; version="0.2.2"; sha256="14s8xh05qxv414xcnww1b3s0jqwnjb3l1dqf7q1qbw33ilwcmsfb"; depends=[dplyr ggplot2 progress purrr rlang tibble tidypredict]; }; modelfree = derive2 { name="modelfree"; version="1.1-1"; sha256="0ammka2wxx90z31zfzypw9dk5n118l0vxhykxbx6srfig2vdyn82"; depends=[PolynomF SparseM]; }; modelgrid = derive2 { name="modelgrid"; version="1.1.1.0"; sha256="1z6g0akczry7vldkk6anfq572zbsfzbd6qnyllgjpbxhy3rrrq0r"; depends=[caret dplyr ggplot2 lattice magrittr purrr]; }; modelplotr = derive2 { name="modelplotr"; version="1.0.0"; sha256="1b1pcah28b2fsr5l7v3lwxgvl03jr2cyxk5x5plnc3vwy5g0bnpm"; depends=[dplyr ggfittext ggplot2 gridExtra magrittr RColorBrewer rlang scales]; }; - modelr = derive2 { name="modelr"; version="0.1.5"; sha256="0nnfhlzz75ihs8azy963cc4cwg1kx81rybk4z3wm98bbghwfxfs5"; depends=[broom dplyr magrittr purrr rlang tibble tidyr]; }; - modelsummary = derive2 { name="modelsummary"; version="0.1.0"; sha256="1g6yc89q267zjplqpwiy6wwvdswyhr6lhg2sldm8zhmbm81jcvks"; depends=[broom checkmate dplyr generics magrittr purrr stringr tibble tidyr]; }; - modeltools = derive2 { name="modeltools"; version="0.2-22"; sha256="1s9lmkac3rl0nknf4wizfhg7ryq7c8yvvyc4z619238br27hhsi5"; depends=[]; }; + modelr = derive2 { name="modelr"; version="0.1.6"; sha256="1x2m34m4qirb401krmgc5wg3g7ndbcglfab2l0655rmky3fz7rfp"; depends=[broom dplyr magrittr purrr rlang tibble tidyr tidyselect]; }; + modelsummary = derive2 { name="modelsummary"; version="0.2.0"; sha256="16z9cdjdg8inp21sq54sc0s30w09draznq8x2zyg5cmsilrbn9p7"; depends=[broom checkmate dplyr generics gt magrittr purrr stringr tibble tidyr]; }; + modeltests = derive2 { name="modeltests"; version="0.1.0"; sha256="00g6jc41caxz2fqynv1pcwdabzwhppqmrrf2x4xzlxpf9sfxr919"; depends=[dplyr generics purrr testthat tibble]; }; + modeltools = derive2 { name="modeltools"; version="0.2-23"; sha256="1vqh69256h344sbj5affm0kmc77dakrxp6442xfdnfd0y5d8sgkb"; depends=[]; }; modelwordcloud = derive2 { name="modelwordcloud"; version="0.1"; sha256="0ardib0h923i7jk8bgcq6pn2zazx9acf9sdggifsk46hdz8hvqnm"; depends=[]; }; moderndive = derive2 { name="moderndive"; version="0.4.0"; sha256="16fbr80v0f5v6is19d5zh9s2qgqw2cb5q71lna7lp0hi22xljl98"; depends=[broom dplyr formula_tools ggplot2 glue infer janitor knitr magrittr rlang stringr tibble]; }; - modes = derive2 { name="modes"; version="0.7.0"; sha256="185qjrmz2sj0l5931g4d3kx3jpgjn4rf4lln84h6g97prk1ykqmj"; depends=[]; }; 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.4.0"; sha256="0dcriw45qmh1r05kf7v6r6q1qz58zfyfi8diskzvj7zclicg59md"; depends=[boot]; }; + modifiedmk = derive2 { name="modifiedmk"; version="1.5.0"; sha256="171l3ls7icaanqf6jb64jabwq0mis2g1fswr0jfkpkrw5iw1c66q"; depends=[boot]; }; modiscloud = derive2 { name="modiscloud"; version="0.14"; sha256="0vwhfp50yb21xkanvzk983vk0laflv60kj1ybx3fydfljwqx0rwj"; depends=[date raster rgdal sfsmisc sp]; }; modmarg = derive2 { name="modmarg"; version="0.9.2"; sha256="1clyfvn5k87nyh5cj4b0yi2zkavwvnirhlirxkzi8m2qijdl9vgh"; depends=[]; }; modopt_matlab = derive2 { name="modopt.matlab"; version="1.0-2"; sha256="0g5mswalv4y7p1k3n8a6qf7wb072m4bjq2ml2j83dz2j2bmvygsd"; depends=[ROI ROI_plugin_glpk ROI_plugin_quadprog]; }; @@ -10430,16 +10550,17 @@ in with self; { modygliani = derive2 { name="modygliani"; version="1.0"; sha256="01g96cdm4hgbsh6xsdfjg7vp7zb138sxwgv0msrlm27a6p4fcnlx"; depends=[]; }; moezipfR = derive2 { name="moezipfR"; version="1.0.2"; sha256="0sfl1c7cvm1milcglcvz9lyvgricsdm7shx0jxyn50y7xz0padww"; depends=[tolerance VGAM]; }; mogavs = derive2 { name="mogavs"; version="1.1.0"; sha256="0lhmwdv991bv7j8k066jr7ii94w60ydjpf5pzmv8jlblf3w2pr02"; depends=[cvTools]; }; - mokken = derive2 { name="mokken"; version="2.8.11"; sha256="1dypdf5gdz0hr3izafzfknyqx2vbr1z77c4c7vqdygv2wzhwy5i1"; depends=[poLCA]; }; - moko = derive2 { name="moko"; version="1.0.1"; sha256="1d1gyv44z8k196hfh8a9iccmlrwb42bj1xzabs07h306gpi9m73d"; depends=[DiceKriging DiceOptim emoa GenSA GPareto mco]; }; - molaR = derive2 { name="molaR"; version="4.4"; sha256="0prd2avg3aj4y8zi7yd2sgcary8igqxrjcp0igail84kpnal53zq"; depends=[alphahull rgl Rvcg]; }; + mokken = derive2 { name="mokken"; version="3.0.0"; sha256="0fng0dh08f6h80z5q4gwkpkyinvhb52kf5i75gywhqz5cb2yfknl"; depends=[poLCA Rcpp]; }; + moko = derive2 { name="moko"; version="1.0.2"; sha256="16hcr570h73ljgfb14pcli358m5vy022bqx1davn26z21n3ls44y"; depends=[DiceKriging DiceOptim emoa GenSA GPareto mco]; }; + molaR = derive2 { name="molaR"; version="4.5"; sha256="1mfb05cfg0jh60yxnmwhja6m38185r58kbz2ak0ikgaqd9lls07s"; depends=[alphahull rgl Rvcg]; }; mombf = derive2 { name="mombf"; version="2.2.9"; sha256="0z7crgvl1c15s0pn6isa9i4phfsbhl6msc1jdbk88ckh09ilx0z7"; depends=[mclust mgcv mvtnorm ncvreg Rcpp RcppArmadillo survival]; }; momentchi2 = derive2 { name="momentchi2"; version="0.1.5"; sha256="1fv0jmwws4mkl9dsaybfpj29ncvqx2idsijgwz2qjblcg309a6k9"; depends=[]; }; + momentfit = derive2 { name="momentfit"; version="0.1-0"; sha256="0f9303plxg5f58s2ypyzly5sghk535cfm078sigj0c9izam3nhmc"; depends=[sandwich]; }; moments = derive2 { name="moments"; version="0.14"; sha256="0f9y58w1hxcz4bqivirx25ywlmc80gbi6dfx5cnhkpdg1pk82fra"; depends=[]; }; - momentuHMM = derive2 { name="momentuHMM"; version="1.5.0"; sha256="0qbl6vl9s30z3qh7c7g9ml7dr0rjicpw0m6wbjsan3isqj3aa6p6"; depends=[argosfilter Brobdingnag car CircStats conicfit crawl data_tree doParallel doRNG dplyr extraDistr foreach geosphere ggmap ggplot2 lubridate magrittr MASS mitools moveHMM mvtnorm nleqslv numDeriv prodlim qdapRegex raster Rcpp RcppArmadillo rlang scatterplot3d sp survival]; }; + momentuHMM = derive2 { name="momentuHMM"; version="1.5.1"; sha256="01s0nv37w7nzg4jpm94sxi2m9kxlswcr00l1fm1y1c6x1asx4hpq"; depends=[argosfilter Brobdingnag car CircStats conicfit crawl data_tree doParallel doRNG dplyr extraDistr foreach geosphere ggmap ggplot2 lubridate magrittr MASS mitools moveHMM mvtnorm nleqslv numDeriv prodlim qdapRegex raster Rcpp RcppArmadillo rlang scatterplot3d sp survival]; }; momr = derive2 { name="momr"; version="1.1"; sha256="091vzaw8dm29q89lg2iys25rbg2aslgdn9sk06x038nngxdrn95r"; depends=[gplots Hmisc nortest]; }; mondate = derive2 { name="mondate"; version="0.10.01.02"; sha256="18v15y7fkll47q6kg7xzmj5777bz0yw4c7qfiw2bjp0f3b11qrd2"; depends=[]; }; - mongolite = derive2 { name="mongolite"; version="2.1.0"; sha256="0w9szs80a6isff6f2mwhh0wcigssf80v3njvisfczcj3cbwdqxnr"; depends=[jsonlite mime openssl]; }; + mongolite = derive2 { name="mongolite"; version="2.2.0"; sha256="1q9vj5jhvwvzjjcaanyj6zhmplyk7rmibp4hvyabp9lpig2clnsm"; depends=[jsonlite mime openssl]; }; monitoR = derive2 { name="monitoR"; version="1.0.7"; sha256="1h1g0m1j13mz37xxwck4s7a0bfqvi0nrzfw60j7bkzaah8zxcc9n"; depends=[tuneR]; }; monkeylearn = derive2 { name="monkeylearn"; version="0.2.0"; sha256="18lpfs64h0hy4vkdjlnmxwgagvf54kn8a1c866vv00ckyp85fvn2"; depends=[cowsay digest dplyr httr jsonlite magrittr purrr ratelimitr tibble tidyr]; }; monmlp = derive2 { name="monmlp"; version="1.1.5"; sha256="19cx60csm8mnf6ksg64vlhi8wi1c7bmv9l55y9zmaljblr0kmzxf"; depends=[optimx]; }; @@ -10456,12 +10577,11 @@ in with self; { morse = derive2 { name="morse"; version="3.2.5"; sha256="1y3daw8ccn0n61kj6lj6m3m4pfj936k786d385lyq05211rkdgqr"; depends=[coda deSolve dplyr epitools ggplot2 gridExtra magrittr reshape2 rjags tibble tidyr zoo]; }; mortAAR = derive2 { name="mortAAR"; version="1.0.2"; sha256="047xagjmqj6sla0zlz0ljdivggkv04i45yn7637a33ni1pmb83al"; depends=[magrittr Rdpack reshape2]; }; mortyr = derive2 { name="mortyr"; version="0.0.1"; sha256="1mpgb9rcknghwm9xsn3d8s6fy4j319sinb6l76s8aq06n4f3hr7g"; depends=[httr jsonlite tibble]; }; - mosaic = derive2 { name="mosaic"; version="1.5.0"; sha256="1j3dq8y2zpr3cad5pgbd3qm9ls17z0s6f9qqp5ddh110wf5kz0h4"; depends=[broom dplyr ggdendro ggformula ggplot2 ggrepel glue gridExtra lattice latticeExtra lazyeval leaflet MASS Matrix mosaicCore mosaicData readr tidyr]; }; - mosaicCalc = derive2 { name="mosaicCalc"; version="0.5.0"; sha256="05s14rmgi15xcz50hcz7l26l95yx9g4i3kihzh0laz8bpi443i39"; depends=[MASS mosaic mosaicCore]; }; + mosaic = derive2 { name="mosaic"; version="1.6.0"; sha256="07964r7mjq050ddm0n5j20zgx08qfhwxazkxlm63scwpkx3kskj9"; depends=[broom dplyr ggdendro ggformula ggplot2 ggrepel glue gridExtra lattice latticeExtra leaflet MASS Matrix mosaicCore mosaicData readr rlang tidyr]; }; mosaicCore = derive2 { name="mosaicCore"; version="0.6.0"; sha256="1klw97h6lchw1cpcl8s637ikcl428cckmjq0czi7mibh9q9mw72z"; depends=[dplyr lazyeval MASS rlang tidyr]; }; mosaicData = derive2 { name="mosaicData"; version="0.17.0"; sha256="04z0mdm52mykqsxsinhmsihn181zf6cw321gayk2rjp7lj7mwdq9"; depends=[]; }; mosaicModel = derive2 { name="mosaicModel"; version="0.3.0"; sha256="1gx4rzh0h922gyb50vz6q5vqqp5ry5hf2mq95948q2gcady91k5w"; depends=[caret dplyr ggformula ggplot2 knitr lazyeval MASS mosaicCore testthat tibble tidyr tidyverse]; }; - mosmafs = derive2 { name="mosmafs"; version="0.1.0"; sha256="1i12w3k9wcr7n28z8wwrrajclalfiwiavlf6i5whbn4z5wpnmh4l"; depends=[BBmisc checkmate ecr MASS mlr mlrCPO parallelMap ParamHelpers smoof]; }; + mosmafs = derive2 { name="mosmafs"; version="0.1.2"; sha256="04syr5qr91hyv1m5hfrjsriq0qgidaln06m7f3jgc1qyrni930rw"; depends=[BBmisc checkmate ecr MASS mlr mlrCPO parallelMap ParamHelpers smoof]; }; mosum = derive2 { name="mosum"; version="1.2.3"; sha256="1xrrx0gaby5gbqssvhwracm8wny31lqzd64hkmr81s41z8srkxx9"; depends=[plot3D RColorBrewer Rcpp]; }; motmot = derive2 { name="motmot"; version="2.1.3"; sha256="09qsyc4ifdl316kjqqkarmflpjcd0ivkhx5fzi3502anj6dxpjnq"; depends=[ape caper coda ks mvtnorm Rcpp]; }; motoRneuron = derive2 { name="motoRneuron"; version="1.0.0"; sha256="1hdsf4c1v5hfaqpi5y1v60zqq5fdmlqdvzpsq77diclp9vzdshja"; depends=[dygraphs ggplot2]; }; @@ -10470,25 +10590,25 @@ in with self; { mousetrack = derive2 { name="mousetrack"; version="1.0.0"; sha256="0lf0xh0c3xl27nh5w8wwyrm2jfzfajm2f73xjdgf746dp365qc8n"; depends=[pracma]; }; mousetrap = derive2 { name="mousetrap"; version="3.1.4"; sha256="1iizlcq6ak9hfqwaz8d0zmijfnw2v7fwgksxng9mxiqiva98is8a"; depends=[cstab diptest dplyr fastcluster fields ggplot2 magrittr pracma psych RColorBrewer Rcpp scales tidyr]; }; movMF = derive2 { name="movMF"; version="0.2-4"; sha256="0j5gp1l374479lsijw1hz00pxs09zzh7hapljv80lsvr24vfscpa"; depends=[clue skmeans slam]; }; - move = derive2 { name="move"; version="3.2.2"; sha256="14wmiyk52iar90kbzi6ksl75i0kg2nmsq08sms9rr2wgswr9f7km"; depends=[geosphere httr memoise raster Rcpp rgdal sp xml2]; }; + move = derive2 { name="move"; version="3.3.0"; sha256="03i3qin4yjg7dvk78r4hgb5v3pqs4mgq9i88q63ma1fd0qs2fx9r"; depends=[geosphere httr memoise raster Rcpp rgdal sp xml2]; }; moveHMM = derive2 { name="moveHMM"; version="1.7"; sha256="031msh427hgjyr37imalr7smd79yqscw9xq5rjrixxc2w5qly9jj"; depends=[boot CircStats geosphere ggmap ggplot2 MASS numDeriv Rcpp RcppArmadillo sp]; }; - moveVis = derive2 { name="moveVis"; version="0.10.3"; sha256="1sphh8v16k0qis1ajc81sg0lb3dca7mf0wz4khlxra8sg6cj4gk2"; depends=[av cowplot curl dplyr geosphere ggplot2 gifski lubridate magick magrittr move pbapply plyr raster RStoolbox sf slippymath sp zoo]; }; + moveVis = derive2 { name="moveVis"; version="0.10.5"; sha256="1lj22yr6v3vg795r72gkbhyabycppxbjsaldqiqgckhkdfh3lziw"; depends=[av cowplot curl ggplot2 gifski lubridate lwgeom magick magrittr move pbapply raster sf slippymath]; }; moveWindSpeed = derive2 { name="moveWindSpeed"; version="0.2.3"; sha256="14a2iymn4j831xlh42z5qxmhnh7xpp5bxasgpkhnb3v0b5ldyilh"; depends=[move Rcpp]; }; movecost = derive2 { name="movecost"; version="0.3"; sha256="0lrnk09sdbamxc4xhrkgggjcim1xhbsnq13f3ysadn7d1rjazl9i"; 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]; }; mpa = derive2 { name="mpa"; version="0.7.3"; sha256="0mhnsbgr77fkn957zfiw8skyvgd084rja1y4wk5zf08q5xjs2zvn"; depends=[network]; }; - mpath = derive2 { name="mpath"; version="0.3-21"; sha256="0sgfzpyzl2494d9nj09qs1dszpzsv9wwf79wj9aypjm8sndl18yj"; depends=[bst doParallel foreach MASS numDeriv pscl]; }; + mpath = derive2 { name="mpath"; version="0.3-24"; sha256="0bwshhjmb5p5lm4c948yfr2dqms3k4g97xcd4avy5znxh30ra71z"; depends=[bst doParallel foreach MASS numDeriv pscl]; }; mpbart = derive2 { name="mpbart"; version="0.2"; sha256="1145n0lxmm0kjm2lc358d79hqws48crj17pjvmchl1pbfd7zi4r8"; depends=[bayesm cvTools mlbench mlogit]; }; mpcmp = derive2 { name="mpcmp"; version="0.1.3"; sha256="11j12ns04g2xdw5r34x86bacwacf3618rzpqz8wvfs1l192l001c"; depends=[]; }; mpcv = derive2 { name="mpcv"; version="1.1"; sha256="0vwycspiw9saj811f6alkbijivy7szpahf35bxn2rpn2bdhbn21i"; depends=[lpSolve]; }; mpe = derive2 { name="mpe"; version="1.0"; sha256="17bgdbg1zrf78djd3mwycidwibxvsis7pwkrcynvghcc8l2zfci9"; depends=[mvtnorm]; }; - mplot = derive2 { name="mplot"; version="1.0.3"; sha256="0mjxfk9j83d4ldj62clf71ygxqhc48mdszggnh2mf30waiqnlcbc"; depends=[bestglm doParallel doRNG dplyr foreach ggplot2 glmnet googleVis leaps plyr reshape2 scales shiny shinydashboard tidyr]; }; + mplot = derive2 { name="mplot"; version="1.0.4"; sha256="1f3llh1599q8259la02nvdigrs4p4j1l4qsp5bxi19my6gff0l10"; depends=[bestglm doParallel doRNG dplyr foreach ggplot2 glmnet googleVis leaps plyr reshape2 scales shiny shinydashboard tidyr]; }; mpm = derive2 { name="mpm"; version="1.0-22"; sha256="0wijw8v0wmbfrda5564cmnp788qmlkk21yn5cp5qk8aprm9l1fnk"; depends=[KernSmooth MASS]; }; mpmcorrelogram = derive2 { name="mpmcorrelogram"; version="0.1-4"; sha256="0gv9xswrfvndcjal0csab1w2cnl4rg8pznyxbz84b0qr95jg81ag"; depends=[vegan]; }; mpmi = derive2 { name="mpmi"; version="0.43"; sha256="15nhh7lizx06mws6gibsvmv29mz1q9id5rqmdbzlk8h1050lcg20"; depends=[KernSmooth]; }; - mpoly = derive2 { name="mpoly"; version="1.1.0"; sha256="1ixidhgp6bfb31kwv7gfvra47zs2f9qa3pf00qrqxkn6zgjkbspd"; depends=[ggplot2 orthopolynom partitions plyr polynom stringr tidyr]; }; - mppR = derive2 { name="mppR"; version="1.2.0"; sha256="0ij1r4pihlm79mywacz5fmgd6nww9026mp9a3hamslpn68pflvpz"; depends=[ggplot2 igraph qtl]; }; + mpoly = derive2 { name="mpoly"; version="1.1.1"; sha256="10is69ks22ka1cqw3xk0fvy4z3b2drm8lanqwj178qrzj7ipf7i0"; depends=[ggplot2 orthopolynom partitions plyr polynom stringi stringr tidyr]; }; + mppR = derive2 { name="mppR"; version="1.2.1"; sha256="0q4pyfwypicmx8lqkgjkmagh6kyr6iww8xa64fxv0ayf8pcbzrca"; depends=[ggplot2 igraph qtl]; }; mppa = derive2 { name="mppa"; version="1.0"; sha256="06v6vq2nfh4b407x2gyvcp5wbdrcnk3m8y58akapi66lj8xplcx4"; depends=[]; }; mpr = derive2 { name="mpr"; version="1.0.5"; sha256="132ahy05zrh2164bffiywgbarxvzkc30k79w7ph9ca8d9mpgj70b"; depends=[survival]; }; mpt = derive2 { name="mpt"; version="0.6-1"; sha256="13f48nflz6b3dk1d22ndfn22sdkz1rzhbh8c85lxk23qhfyc6fv6"; depends=[]; }; @@ -10499,30 +10619,33 @@ in with self; { mra = derive2 { name="mra"; version="2.16.11"; sha256="0268msdy4cs2ifpagmwiabi6aav54ckn214ai18aqv2h97hmixw0"; depends=[]; }; mratios = derive2 { name="mratios"; version="1.4.0"; sha256="0pjcwqx3zykpwyykwgqziwignd41sjm2s1blyjwc1lhymis4ldzq"; depends=[mvtnorm]; }; mrbayes = derive2 { name="mrbayes"; version="0.1.0"; sha256="0p0a1g6xv7g3scmn290ja4bicbdz5c9y6c4hfn4c7advd6ha6ang"; depends=[]; }; - mrbsizeR = derive2 { name="mrbsizeR"; version="1.2.1"; sha256="0kvzvbvw3ygx09bjil7wqw2345dzh1bkbaqdk4q5c1szk95rw93b"; depends=[fields maps Rcpp]; }; + mrbin = derive2 { name="mrbin"; version="1.3.0"; sha256="1wn80icmg1fcjrv739l47wcbx9l1p4zl0l0vphw5pmj4kd03x7sh"; depends=[]; }; + mrbsizeR = derive2 { name="mrbsizeR"; version="1.2.1.1"; sha256="0v06sd5sh7ghlr8lgrv6l4glmv7chj3951pw4ssxrly4hz2rh6i0"; depends=[fields maps Rcpp]; }; mrds = derive2 { name="mrds"; version="2.2.1"; sha256="1prhzyps4sckl24d4fpmkafiawx8c0xdwiixn9fa3i2cxv9ia6hd"; depends=[mgcv numDeriv optimx Rsolnp]; }; mreg = derive2 { name="mreg"; version="1.1"; sha256="06la0yy2yys161jhlzlcm5lcv0664wm6sa8gjdnpd1s1nx52jkqf"; depends=[]; }; mregions = derive2 { name="mregions"; version="0.1.6"; sha256="0ix77hqcllhcpldchlnvciiflm6ysylynnnqvczpf8vx7gwa3lrk"; depends=[data_table httr jsonlite rappdirs sp tibble wellknown xml2]; }; - mrfDepth = derive2 { name="mrfDepth"; version="1.0.11"; sha256="0x4z4agwbzlyzbkf6aj7y9061cm05dvhzpg05wc7k59xbq1ns1sv"; depends=[abind geometry ggplot2 matrixStats Rcpp RcppArmadillo RcppEigen reshape2]; }; - mrfse = derive2 { name="mrfse"; version="0.1"; sha256="156qy6g2s6cxyd1ijzn709jniml6308gdzvkzcks5q6s7gs9sl2m"; depends=[]; }; - mrgsolve = derive2 { name="mrgsolve"; version="0.10.0"; sha256="1z2i3sl5s6z1pk3fy324zfm9gpdzr1g4af2fhrwhsdk97l6580ij"; depends=[BH dplyr magrittr Rcpp RcppArmadillo rlang tibble tidyselect]; }; + mrf2d = derive2 { name="mrf2d"; version="0.2.0"; sha256="0h8v4iyz24pi2md6l5kcdnhksafjqr41xqrxxyly4nfx4fqz16s7"; depends=[dplyr ggplot2 Rcpp RcppArmadillo Rdpack reshape2]; }; + mrfDepth = derive2 { name="mrfDepth"; version="1.0.12"; sha256="14kc0rjrdgh1zyiibiq79gd1npdxydml6lcxyf4pwdzipaa1yrg4"; depends=[abind geometry ggplot2 matrixStats Rcpp RcppArmadillo RcppEigen reshape2]; }; + mrfse = derive2 { name="mrfse"; version="0.2"; sha256="1dx21m54jsprlngj20q1bgvbw1bbm0sm8i01xanj68bx796ng14j"; depends=[]; }; + mrgsolve = derive2 { name="mrgsolve"; version="0.10.1"; sha256="19l6xvqax8gk9gy6svdhap61hprd6h7gv046isqsy03cv65hbkhq"; depends=[BH dplyr glue lifecycle magrittr Rcpp RcppArmadillo rlang tibble tidyselect]; }; mri = derive2 { name="mri"; version="1.0.1"; sha256="1dssq556kid6c3djp0s6v853cranv2wjs2c9521l5ykg5g33hfmv"; depends=[]; }; - mritc = derive2 { name="mritc"; version="0.5-1"; sha256="12sfyw5b1lryczl92xvyvhl37qfx3ybg4y9awsl0b7f51zi0lzy3"; depends=[lattice misc3d oro_nifti]; }; + mritc = derive2 { name="mritc"; version="0.5-2"; sha256="07b1b2k1ka43ikj2mhwnazw3ig7w10bf759fimxpksvk5k6wanx2"; depends=[lattice misc3d oro_nifti]; }; mro = derive2 { name="mro"; version="0.1.1"; sha256="00gc2hd8q5hb2xrswclcqqw1gxl83zmpma6bhsggg3kppsw1dpjv"; depends=[MASS matrixcalc]; }; ms_sev = derive2 { name="ms.sev"; version="1.0.4"; sha256="1sr2rgiskgwjhwif70qj6ga8i8kg4bh342hff66b2a54rxrchmw5"; depends=[]; }; msBP = derive2 { name="msBP"; version="1.4"; sha256="17hsnfipb6mgwhbc9rxzx5azc57ravz7zfnbc8r73sn1b270ydpb"; depends=[]; }; msSurv = derive2 { name="msSurv"; version="1.2-2"; sha256="02qm3mq17d2yj5mbz6gapd3zfi1wmiad5hpyimcb39impk43n2hf"; depends=[class graph lattice]; }; msaFACE = derive2 { name="msaFACE"; version="0.1.0"; sha256="1lh8crz507nlddm946lmn73xbnsh4cs0kg238ysnsvxs726c83fs"; depends=[]; }; msaR = derive2 { name="msaR"; version="0.3.0"; sha256="0lj9yhsissr4rgavyhgdxi2nrkq2088darzraisx9jsirjr49jf8"; depends=[ape htmlwidgets]; }; + msae = derive2 { name="msae"; version="0.1.1"; sha256="00snnml0vg0zx8cngc9ghma4y6fm8a20lmlf7f7bb2cgffa7q0ip"; depends=[magic]; }; msaenet = derive2 { name="msaenet"; version="3.1"; sha256="067p97z54dwhxy0w4ihi8dddcbvglh8ssynbh29fl9jyxfwjr1ms"; depends=[foreach glmnet Matrix mvtnorm ncvreg survival]; }; msap = derive2 { name="msap"; version="1.1.8"; sha256="0z5lm782jjb9w1h5vgz8bmxjdcrq9zb3xp1w5cb479jjc7krlgg3"; depends=[ade4 ape]; }; mschart = derive2 { name="mschart"; version="0.2.5"; sha256="08j342slv4ca6qkd12hh7jmmv5wv6kfxamw34dr6sd89kzrfdj0p"; depends=[cellranger data_table htmltools officer R6 writexl xml2]; }; mscstexta4r = derive2 { name="mscstexta4r"; version="0.1.2"; sha256="1hjcasmn33xav2mw085lcndv0432l6sz327aikf63491wj1sj7mw"; depends=[dplyr httr jsonlite pander stringi]; }; mscstts = derive2 { name="mscstts"; version="0.5.2"; sha256="1zvicr1c9lh7cscbx7j5d98zkjwq7piggyz6ssz19gpp2gfc4igy"; depends=[httr jsonlite tuneR]; }; mscsweblm4r = derive2 { name="mscsweblm4r"; version="0.1.2"; sha256="031s00wpr9zfjpii56m67q1phn05vqlhb8cfzhyf6fbrxvpb8k7n"; depends=[httr jsonlite pander]; }; + msd = derive2 { name="msd"; version="0.1.0"; sha256="03j50vq8mypidxzplznsa874inh5zy2v9rbw9yd7wsxwi8jf0s2b"; depends=[]; }; msda = derive2 { name="msda"; version="1.0.2"; sha256="05khpa5qasnngn6yvk87gv5262plqpw4knb6hzgy52w401k0y80r"; depends=[MASS Matrix]; }; msde = derive2 { name="msde"; version="1.0.4"; sha256="1jyvsadkha4976vdf8nn2dbrsymr4n932cqrkmhawmy6pxa2c45g"; depends=[Rcpp RcppArmadillo RcppProgress]; }; - mseapca = derive2 { name="mseapca"; version="1.0"; sha256="115njdk8cv55zxd38hq9qaca686ykckni0f3xl8w3bn32gb5g9a7"; depends=[XML]; }; msgl = derive2 { name="msgl"; version="2.3.9"; sha256="0793d12cd1mcnr97byhfwpnvm329w78f56n7dcs4116hlizp8l9h"; depends=[BH Matrix Rcpp RcppArmadillo RcppProgress sglOptim]; }; msgpackR = derive2 { name="msgpackR"; version="1.1"; sha256="0a6vm4q1zfy8wlvhl9wfy09ig1iag9fvjasz5w9bll7idky4ldx5"; depends=[]; }; msgps = derive2 { name="msgps"; version="1.3.1"; sha256="0r8i0sw412jr148bid8sfpjcfbkf5589dqcqyvf5cm84cj7axnpz"; depends=[]; }; @@ -10531,7 +10654,7 @@ in with self; { 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.8"; sha256="1d32y8f0vb2dfv3999liigpns788j145nrvd1xpxb9i2lsg8mwgk"; depends=[expm mvtnorm survival]; }; - msma = derive2 { name="msma"; version="2.0"; sha256="15g8cwafbd5bsff3cd53yzgxacsswgl0rzygr40drs7nwsi4qbk1"; depends=[mvtnorm]; }; + msma = derive2 { name="msma"; version="2.1"; sha256="1k1xfbwyapwjs7bp9v0vrdfrz54hsyxh562xni1n8m61l4gwkvzx"; depends=[mvtnorm]; }; msme = derive2 { name="msme"; version="0.5.3"; sha256="0mq57zdas1s87nblnvbif9lisgahfhvmabglvp9imr1mvpwybpbh"; depends=[lattice MASS]; }; msmtools = derive2 { name="msmtools"; version="1.3"; sha256="0p7xpj78cjc1s015ma7vc38kqiy6wvpyixrdinx4ngig1pqfrq4p"; depends=[data_table msm survival]; }; msos = derive2 { name="msos"; version="1.1.1"; sha256="0jp4xw03iwc6dkk93kkky9k6xd285ylzp1x7jxkl3h0884jvyjyf"; depends=[mclust tree]; }; @@ -10541,7 +10664,7 @@ in with self; { mstate = derive2 { name="mstate"; version="0.2.12"; sha256="0qnhivbibzss8yfsg44cvbf73n4jj4i28rbdysl88g14ig5sabgv"; depends=[RColorBrewer survival]; }; mstherm = derive2 { name="mstherm"; version="0.4.7"; sha256="04jrp0w17svwmrvx356jmh04npbwhk9nvfy3r39vqr82yrvn6jip"; depends=[doParallel foreach nls2 plotrix RColorBrewer]; }; mstknnclust = derive2 { name="mstknnclust"; version="0.2.0"; sha256="10fwl90ykk4i839shy588gxag185x6c397brn57917yiiyqfamq2"; depends=[amap igraph]; }; - mstrio = derive2 { name="mstrio"; version="11.2.0"; sha256="1d4vgmbrkalbdglydnwld09jgw5zidiwrzy83f1168zmm5lfg30x"; depends=[httr jsonlite miniUI openssl R6 rstudioapi shiny shinyjs]; }; + mstrio = derive2 { name="mstrio"; version="11.2.1"; sha256="1lkkl4qc6vjl3b5crpsf27d6fwbk2d96v3ybxq9ndc8ia2jc8fkf"; depends=[crul data_table httr jsonlite miniUI openssl R6 rstudioapi shiny shinyjs]; }; msu = derive2 { name="msu"; version="0.0.1"; sha256="1vhh9725dbywmzihnmsq1jircpn91r8227j2f76fvma9rwss90p7"; depends=[entropy]; }; mtconnectR = derive2 { name="mtconnectR"; version="1.2.1"; sha256="0hl46h535mjqwgrhmxlixhfsych3blzcynffp55nr1ynrra4dn06"; depends=[data_table dplyr dtw ggplot2 lubridate magrittr plyr proxy stringr tidyr XML]; }; mthapower = derive2 { name="mthapower"; version="0.1.1"; sha256="0g6dn0qn7z6qc1gbzspy1n7b803427bc9fv5yqk7j8i1is1p8h94"; depends=[]; }; @@ -10549,17 +10672,17 @@ in with self; { mtsdi = derive2 { name="mtsdi"; version="0.3.5"; sha256="0j4hl690n8x7zfpygw5qv0m0jyl8dnz1d3r4314w06h7c578n2kp"; depends=[gam]; }; muHVT = derive2 { name="muHVT"; version="1.0.1"; sha256="0qxfnnz88h00a2zfx0kagv7g4w3ck74x1zqcmxgrvwpdy3z851zn"; depends=[conf_design deldir dplyr ggplot2 gtools Hmisc magrittr MASS plyr polyclip purrr rgeos sp splancs]; }; muRL = derive2 { name="muRL"; version="0.1-12"; sha256="1nzi0nyspva5ach0q0rvlljlfgmac8vxxggkwdzz1pr1cxhkprwd"; depends=[maps stringr]; }; - muRty = derive2 { name="muRty"; version="0.3.0"; sha256="1125182flpz6a90dh3gldyhlnh9l605cb59b92j3d0p754ansdrm"; depends=[clue lpSolve]; }; + muRty = derive2 { name="muRty"; version="0.3.1"; sha256="0v7wfb6347h4inf9jcbp6n4xfsqjzgj0i5sdfgqmbw0d5pcpnvhz"; depends=[clue 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.1.0"; sha256="094xvcw80grfz1q8al8pcnz14drf69amyn3phpav90znnk6b9bhn"; depends=[dplyr fs ggplot2 glue jsonlite lubridate magrittr readr rlang stringr tibble tidyr tidyselect withr]; }; + mudata2 = derive2 { name="mudata2"; version="1.1.2"; sha256="0c8x39m7cy9l2r3ywbircgp79g7lmd37m2500z3icmkx6x6k6393"; depends=[dplyr fs ggplot2 glue 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.2"; sha256="1g66axwrrvlsb03yhwa16pvxbl2wvpm7fzzl6nlw0cxlh99w7r33"; depends=[boot broom dplyr ggplot2 glmnet mgcv reshape2 zoo]; }; mueRelativeRisk = derive2 { name="mueRelativeRisk"; version="0.1.1"; sha256="16yclfmgxc32pv00vyb9fjdh4syax8ynizr8a29haiq22q5fqclh"; depends=[]; }; muhaz = derive2 { name="muhaz"; version="1.2.6.1"; sha256="08qh43zx6h3yby44q2vxphfvmfdmqxpgyp0734yn341sy9n8pkkk"; depends=[survival]; }; muir = derive2 { name="muir"; version="0.1.0"; sha256="0h3qaqf549v40ms7c851sspaxzidmdpcj89ycdmfp94b2q3bmz98"; depends=[DiagrammeR dplyr stringr]; }; mulset = derive2 { name="mulset"; version="1.0.0"; sha256="0pigiy6hfiqh6x4zx6zqn3ykk36s3abzzyb67jdlf4jzc5zhrl9g"; depends=[digest gtools]; }; - multDM = derive2 { name="multDM"; version="1.0"; sha256="06vjbsjmqdnndpqacfpgq5w8q6xg81s7vd9fhwdkww3adr7r8cg3"; depends=[]; }; + multDM = derive2 { name="multDM"; version="1.1.1"; sha256="06r9dxp1ww5prp1gq67ch1n173dqa93islbjhqnsdaqrhaa7wav2"; depends=[MTS]; }; multbxxc = derive2 { name="multbxxc"; version="1.0.1"; sha256="1ip5awjc2ljpy6nsr4y42x0yg4n7lyaxp9kzfjvwp41k9lriz4gm"; depends=[Rcpp RcppArmadillo rmumps]; }; multcomp = derive2 { name="multcomp"; version="1.4-12"; sha256="14c2f10rz546w7ly5f4r6wnd07yj5gic38an17gxny1vf2nsff0b"; depends=[codetools mvtnorm sandwich survival TH_data]; }; multcompView = derive2 { name="multcompView"; version="0.1-8"; sha256="1rfq9wvvrghq0542ff40wy8vdmsyd8spzz6ihcywcvxdfa8m6g8j"; depends=[]; }; @@ -10579,27 +10702,29 @@ in with self; { multicastR = derive2 { name="multicastR"; version="1.3.0"; sha256="07y3a7apk6pjnfqki52jc5vbzb1w53fla7wcpc184f4zpqfc783q"; depends=[curl data_table gsubfn stringi XML xml2 xtable]; }; multichull = derive2 { name="multichull"; version="1.0.0"; sha256="1gc7kxxlbanc6rmmbf6h85jf7kj0a78h23m5vwwqqliv018qsv2n"; depends=[igraph plotly shiny shinythemes]; }; multicmp = derive2 { name="multicmp"; version="1.1"; sha256="0mz7ksc5h6dy95l3kbsamm191372blhlrj573krc57bj93lmp1a5"; depends=[numDeriv]; }; - multicolor = derive2 { name="multicolor"; version="0.1.3"; sha256="0jniqa8zrl13534pyl200i54m52lhfwq7h7irf806ga70lvfgk0k"; depends=[cowsay crayon dplyr glue magrittr purrr stringi stringr tibble tidyr]; }; + multicolor = derive2 { name="multicolor"; version="0.1.4"; sha256="1yswpqm62cvpfj6zxrprbvamjah3zxhsvn19qgpqmha0098lx5g2"; depends=[cowsay crayon dplyr glue magrittr purrr stringi stringr tibble tidyr]; }; multicon = derive2 { name="multicon"; version="1.6"; sha256="16glkgnm4vlpxkhf1xw1gl1q10yavx9479i21v29lldag35z8pqx"; depends=[abind foreach mvtnorm psych sciplot]; }; multicool = derive2 { name="multicool"; version="0.1-11"; sha256="0xk408qbz9cxwf51j3pmy55gcjcnws8mc6j3vyn9zhramxj7x40w"; depends=[Rcpp]; }; multicross = derive2 { name="multicross"; version="2.0.0"; sha256="1ic632ig0mzvq00hrkjs8vfa5mzp8vwrqflfqfdr5wkdvcqqnhbb"; depends=[AnnotationDbi crossmatch MASS Matrix nbpMatching org_Ce_eg_db org_Hs_eg_db org_Mm_eg_db Seurat]; }; multifluo = derive2 { name="multifluo"; version="1.1"; sha256="1hnh1gj6lfnh2fn0v064bszydgsr6p9f7p8yxyw5rdxfrxymiw09"; depends=[agricolae ellipse imager]; }; multifwf = derive2 { name="multifwf"; version="0.2.2"; sha256="1l6z3pzz6g6w1spp1f918jh6w0jm93qyc882rj8jhn1198d2s8nd"; depends=[]; }; - multigraph = derive2 { name="multigraph"; version="0.92"; sha256="1wxia62qjy94cbcpf85nyxba6gb9d9607pkqhgy2dc5dyhhw61vs"; depends=[multiplex]; }; - multigroup = derive2 { name="multigroup"; version="0.4.4"; sha256="1r79zapziz3jkd654bwsc5g0rphrk9hkp1fpik8jvjsa1cix40mq"; depends=[MASS]; }; + multigraph = derive2 { name="multigraph"; version="0.93"; sha256="1966c38y7a7ik1a0sn3vcprckjphz7xvd6hkq3nhf4xdarbnwrxv"; depends=[multiplex]; }; + multigroup = derive2 { name="multigroup"; version="0.4.5"; sha256="1d3m2c3md9iiv1gfqfyik1xj3fsas85bmf2vbkaks8ljxa42f55k"; depends=[MASS]; }; multilaterals = derive2 { name="multilaterals"; version="1.0"; sha256="11zfdhn6qzqz0n31g23bn40wnfzkjndb753iiqvihirphzb74v5v"; depends=[ape igraph]; }; multilevel = derive2 { name="multilevel"; version="2.6"; sha256="19zrvpq23dn69d7kai1rgw5b8ibmgybnbg6isliq0n8bv9jvrzia"; depends=[MASS nlme]; }; multilevelPSA = derive2 { name="multilevelPSA"; version="1.2.5"; sha256="0926jaicdxk846vyfphb2hyg3zan3wal44x1bwamws0zf4flc4hj"; depends=[ggplot2 MASS party plyr PSAgraphics psych reshape xtable]; }; - multilinguer = derive2 { name="multilinguer"; version="0.0.3"; sha256="0j7v0d0xibxk8ir09pxb3v13xlm7h35phhgw2cxfd934z146x8v9"; depends=[askpass fs rstudioapi rvest sys usethis xml2 zip]; }; + multilevelTools = derive2 { name="multilevelTools"; version="0.1.1"; sha256="01fzx7j0mkb4fr7axv34184w6w5nfsdcr51nscci1mi5b2805x1s"; depends=[cowplot data_table extraoperators ggplot2 JWileymisc lavaan lme4 lmerTest nlme zoo]; }; + multilinguer = derive2 { name="multilinguer"; version="0.0.4"; sha256="0kavgvbzv8bvv9qlr92j8mx7b802w513mqalrdyln0pw36c9i13x"; depends=[askpass fs rstudioapi rvest sys usethis xml2 zip]; }; + multimark = derive2 { name="multimark"; version="2.1.2"; sha256="15qdj3h5j30i56yx089pq8iii5kkk3ay6xr6z2msk22zj1rv7ahh"; 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.2"; sha256="00v0ac3pizdf8r6sm45hdrpj487pgcw9snf26zqcyhhlx5b8wicz"; depends=[igraph RColorBrewer Rcpp]; }; multinets = derive2 { name="multinets"; version="0.2.2"; sha256="1i5jsq1xy0g0l5d1z3hz4gj6inj4rhd6lf2s5xzd5k8ccp5aba8c"; depends=[igraph Rcpp]; }; multinomRob = derive2 { name="multinomRob"; version="1.8-6.1"; sha256="1fdjfk77a79fy7jczhpd2jlbyj6dyscl1w95g64jwxiq4hsix9s6"; depends=[MASS mvtnorm rgenoud]; }; multinomineq = derive2 { name="multinomineq"; version="0.2.1"; sha256="09h5nccfcrnl78rdxwsw5cqirfq40a6x4dmpkibc475z3xndk2rm"; depends=[coda quadprog Rcpp RcppArmadillo RcppProgress RcppXPtrUtils Rglpk]; }; - multipanelfigure = derive2 { name="multipanelfigure"; version="2.0.2"; sha256="0f24b0msx6y9ccdi65d8rxf589vw5rz6pxwa55bivq8cy5s4gc27"; depends=[assertive_base assertive_files assertive_numbers assertive_properties assertive_types ggplot2 gridGraphics gtable magick magrittr stringi]; }; - multipleNCC = derive2 { name="multipleNCC"; version="1.2-1"; sha256="080wpyifpw41p6jip2ia7439jdhzyb7lbhs2qzzg0hn6c0qq7mrr"; depends=[mgcv survival]; }; - multiplex = derive2 { name="multiplex"; version="2.9.2"; sha256="1qwxyzm4i33siybh65qny6bbmv039kdp7mfd5cbbx252qrz9379s"; depends=[]; }; + multipanelfigure = derive2 { name="multipanelfigure"; version="2.1.2"; sha256="0cm5bd7k0fx6d3gybcll6vvh14byanyk6dj4civqij7psa48iagc"; depends=[assertive_base assertive_files assertive_numbers assertive_properties assertive_types ggplot2 gridGraphics gtable magick magrittr stringi]; }; + multipleNCC = derive2 { name="multipleNCC"; version="1.2-2"; sha256="0bnc14l5b3x68qnwf3ma8wrclmp6n7fxsc0sbd7cfaayhp8dzcb1"; depends=[mgcv survival]; }; + multiplex = derive2 { name="multiplex"; version="2.9.4"; sha256="0c1gpmh1jric8zzip5m3fr8wjxiqa7jhfklgdni22shlccnjxn33"; depends=[]; }; multipol = derive2 { name="multipol"; version="1.0-7"; sha256="1rkrg3kayxa05jayg8bk1mm3hcvi76570wqfja5953hd9j4krgha"; depends=[abind]; }; multirich = derive2 { name="multirich"; version="2.1.1"; sha256="04jr5jvds70j2psyxz12d2my61jcj5hvdyv10pvar2rpqaw0yxyh"; depends=[]; }; multiselect = derive2 { name="multiselect"; version="0.1.0"; sha256="1cda38zq7c1r56wdfpr5dg0jfw4kzi9p7jq59qm04j461j9ag3q6"; depends=[Hmisc]; }; @@ -10620,11 +10745,12 @@ in with self; { mumm = derive2 { name="mumm"; version="0.2.1"; sha256="1wjg2pqn2wb9hk9mqgpi3k26qwjnkmp4apx09lxcwrz35bbwhfzv"; depends=[lme4 Matrix Rcpp RcppEigen stringr TMB]; }; munfold = derive2 { name="munfold"; version="0.3.5"; sha256="17zizx9r0f8dxb7dkgn1nn0fp7ydy6r155p1zfz0v93jc26lc1hb"; depends=[MASS memisc]; }; munsell = derive2 { name="munsell"; version="0.5.0"; sha256="16g1fzisbpqb15yh3pqf3iia4csppva5dnv1z88x9dg263xskwyh"; depends=[colorspace]; }; - munsellinterpol = derive2 { name="munsellinterpol"; version="2.5-1"; sha256="1x5nh4h35mkajsdgi4vrvs1cd4iagdrp9al2a6lll96jw0y1c65y"; depends=[rootSolve spacesRGB spacesXYZ]; }; + munsellinterpol = derive2 { name="munsellinterpol"; version="2.6-1"; sha256="02fj62hfxg2zvkbmlqxka5j9mkc7j07czqhs18wbcz38kamfgw2j"; depends=[rootSolve spacesRGB spacesXYZ]; }; murphydiagram = derive2 { name="murphydiagram"; version="0.12.2"; sha256="0f699cdfsl4f9w9f18cxkdlq1vyhsv83ynl6ck0r3wwh8f1zsmnd"; depends=[]; }; music = derive2 { name="music"; version="0.1.1"; sha256="04ygmlga7i8bpxcrlmj8wc956asf73krghga6fnh2flm675dp42f"; depends=[audio crayon]; }; musicNMR = derive2 { name="musicNMR"; version="0.0.2"; sha256="09xxc78ajk428yc3617jfxqp5fy89nfc24f1rig6cw28fflwqj0k"; depends=[seewave]; }; musica = derive2 { name="musica"; version="0.1.3"; sha256="0cfzfar706l0xdb0n11m18mayj5rrplvf4qry36vgxsiaxcba90r"; depends=[data_table lubridate magrittr qmap]; }; + mustashe = derive2 { name="mustashe"; version="0.1.1"; sha256="1ds6b1dbp669yys5946mfawxzxy0n9cqd6lqixy5a7jj8al5whnp"; depends=[digest formatR readr tibble]; }; mut = derive2 { name="mut"; version="1.1"; sha256="0v0vviarsmaiap3fa82ia01cblana65fd3cbj7jkd3aral6pm6yz"; depends=[expm Familias IBDsim paramlink]; }; mutSignatures = derive2 { name="mutSignatures"; version="1.2"; sha256="1kbp221lm43a5wiw754yjkd3qidmca20m0i8jlxsqk8ijbp40ky2"; depends=[cluster doParallel foreach ggplot2 pracma proxy]; }; mutoss = derive2 { name="mutoss"; version="0.1-12"; sha256="1yk7p7pb2xm38d3j19ysgwmix48lvimbhkhjjwk5jmr1a0ysx298"; depends=[multcomp multtest mvtnorm plotrix]; }; @@ -10634,20 +10760,18 @@ in with self; { mvMORPH = derive2 { name="mvMORPH"; version="1.1.1"; sha256="101ds24bir84yj7cnc4l4yv85xga981mk5ap420f3r9lp8db3h6x"; depends=[ape corpcor glassoFast pbmcapply phytools spam subplex]; }; mvMonitoring = derive2 { name="mvMonitoring"; version="0.1.0"; sha256="03nvq8nmrmrpzyxlsqzww5ghk640115l1jgmgwfahhjxkdpkzfxx"; depends=[BMS dplyr lazyeval plyr rlang robustbase xts zoo]; }; mvPot = derive2 { name="mvPot"; version="0.1.4"; sha256="04l9dn8amwp366b6lic5fkl4kck0x2m3xcsqz6as4c3h772nhq1w"; depends=[evd gmp MASS numbers]; }; - 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.2"; sha256="1df9lwj9f65sw8jd2cxjg08p6z9llpxjzyjcryn764a4ncnx7gf3"; depends=[abind ape Matrix matrixcalc mvtnorm ouch PCMBase TreeSim]; }; + mvSLOUCH = derive2 { name="mvSLOUCH"; version="2.4"; sha256="06bpg2pp3kq9bvr4ab3c0ma7bxb56k514dgqvc3n6pfvavcgxkvf"; depends=[abind ape Matrix matrixcalc mvtnorm ouch PCMBase TreeSim]; }; mvShapiroTest = derive2 { name="mvShapiroTest"; version="1.0"; sha256="0zcv5l28gwipkmymk12l4wcj9v047pr8k8q5avljdrs2a37f74v1"; depends=[]; }; - mvabund = derive2 { name="mvabund"; version="4.0.1"; sha256="0la935gsiryfc0zixxr1dqj0av271x96pqxbi3bp6dksbw5gm68k"; depends=[MASS Rcpp RcppGSL statmod tweedie]; }; + mvabund = derive2 { name="mvabund"; version="4.1.3"; sha256="1z58h4dk3mc2hfnfvc7pghk471cbp7ah2s1z2ria5igw4s80962b"; depends=[MASS Rcpp RcppGSL statmod tweedie]; }; mvbutils = derive2 { name="mvbutils"; version="2.8.232"; sha256="0awd0jy492ha321c20kmmgl20kqphdmrmswakc0rq6h8z9d55kdg"; depends=[]; }; mvc = derive2 { name="mvc"; version="1.3"; sha256="0kmh6vp7c2y9jf71f4a29b0fxcl0h7m4p8wig4dk3fi7alhjf7ym"; depends=[rattle]; }; mvcluster = derive2 { name="mvcluster"; version="1.0"; sha256="0yfl31scdgsiljvpv1yxc5bwwzr6kbhpjwqh2kql7xf0m0hc1pr4"; depends=[Rcpp RcppArmadillo]; }; mvctm = derive2 { name="mvctm"; version="1.2"; sha256="0810bmk748cvbls4djspqvkk65j605djqicqg4rkwy2a799l3rgc"; depends=[Formula MNM nlme quantreg Rfit SpatialNP]; }; mvdalab = derive2 { name="mvdalab"; version="1.4"; sha256="18wchy517qd45w5y0sr8lcafb7kmscy0q9vsryk9if6x2jq22lqz"; depends=[car dummies ggplot2 MASS moments penalized plyr reshape2 sn]; }; mvglmmRank = derive2 { name="mvglmmRank"; version="1.2-2"; sha256="00zxqby8syb959fqgw9i7b0yamgjwddq32jlin6qmnzys5bg1556"; depends=[MASS Matrix numDeriv]; }; - mvgraphnorm = derive2 { name="mvgraphnorm"; version="1.81"; sha256="14sfnm0pikv82abiqfv2m1bziwyy2r0bmhq64j783cyppv5fb69z"; depends=[bnlearn corpcor igraph Matrix mvtnorm qpgraph]; }; mvinfluence = derive2 { name="mvinfluence"; version="0.8-3"; sha256="0nygsldkm61ny5ljcc1r667rywj239j4x59ssi81cb2005kkjgm5"; depends=[car heplots]; }; - mvmesh = derive2 { name="mvmesh"; version="1.5"; sha256="0my43559jh8ln1fx5rh5vw24vr6kxpd2h5scylfxfv2qfk794l0b"; depends=[abind geometry rcdd rgl SimplicialCubature]; }; + mvmesh = derive2 { name="mvmesh"; version="1.6"; sha256="1y6p7xp9fv0xswjdc6py1xqlx1ys1iyr559s9wkyja4hzcpya2my"; depends=[abind geometry rcdd rgl SimplicialCubature]; }; mvmeta = derive2 { name="mvmeta"; version="1.0.3"; sha256="08zki4bxd7l5hpa9dly9jw796kn4rfv6v6gmx21yvfppyryrvmvd"; depends=[mixmeta]; }; mvnTest = derive2 { name="mvnTest"; version="1.1-0"; sha256="0p37skzpljzz19x1hwh2hbxqins19zkbz7nlgfws5pgp9apazafq"; depends=[MASS mvtnorm]; }; mvna = derive2 { name="mvna"; version="2.0.1"; sha256="10i42hjm5bk62c20pmxhya283yzw1902ivkflmyqy79jri266dxf"; depends=[lattice]; }; @@ -10660,41 +10784,45 @@ in with self; { mvoutlier = derive2 { name="mvoutlier"; version="2.0.9"; sha256="1d562h3xicq962h27fi95qhrz9vkwxk0p8axhps1cy4b49w4bygi"; depends=[robCompositions robustbase sgeostat]; }; mvp = derive2 { name="mvp"; version="1.0-8"; sha256="0i2fd9s0dlpaa4vwkiq5is2d4vxc90hkdl0yk57gl651i8nxwnha"; depends=[magic magrittr mpoly partitions Rcpp]; }; mvprpb = derive2 { name="mvprpb"; version="1.0.4"; sha256="1kcjynz9s7vrvcgjb9sbqv7g50yiymbpkpg6ci34wznd33f7nrxm"; depends=[]; }; + mvrsquared = derive2 { name="mvrsquared"; version="0.0.3"; sha256="1bnfw8524zwlcixr7dmhm0liijs7fjxv1a8jrnrd6hzih04a9h6j"; depends=[Matrix Rcpp RcppArmadillo]; }; mvrtn = derive2 { name="mvrtn"; version="1.0"; sha256="0k0k76wk5zq0cjydncsrb60rdhmb58mlf7zhclhaqmli1cy697k8"; depends=[]; }; mvsf = derive2 { name="mvsf"; version="1.0"; sha256="1krvsxvj38c5ndvnsd1m18fkqld748kn5j2jbgdr3ca9m3i5nlwf"; depends=[mvnormtest nortest]; }; mvst = derive2 { name="mvst"; version="1.1.0"; sha256="03q0kdychsmn4wcn50b6dqhxn4f2mjvrr5rac942xdv75w8qklc9"; depends=[MCMCpack mnormt mvtnorm]; }; - mvtmeta = derive2 { name="mvtmeta"; version="1.0"; sha256="0g0d4lrz854wkd0dz5aiad54i46aqkfhsq6cpbsfv0w5l2kwiqqz"; depends=[gtools]; }; - mvtnorm = derive2 { name="mvtnorm"; version="1.0-12"; sha256="03rfmii9j8x8fjv7hp8qd28z0svl4w0x54k2f4jpwv4qa7079i24"; depends=[]; }; + mvtmeta = derive2 { name="mvtmeta"; version="1.1"; sha256="0s0s5922c5rs8cqk100nci3akqnhbvibm2n2gn8049v3qcyfajyb"; depends=[gtools]; }; + mvtnorm = derive2 { name="mvtnorm"; version="1.1-0"; sha256="0pfb6qk4yb6xaya8i1wvx6dnc3jj4s2g94sq2kzv4p8zn4pf24l1"; 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]; }; + mwa = derive2 { name="mwa"; version="0.4.2"; sha256="18qrj3v99y1rykz82xmkbhzfjrm54dr620p8hm1s1pxjmlysyyc8"; depends=[cem MASS rJava]; }; mwaved = derive2 { name="mwaved"; version="1.1.7"; sha256="0g0yddsgdfyvqaj59qi6k3sknpbppdmgvq0rgnil5q8ki5skvgis"; depends=[Rcpp shiny]; }; mwshiny = derive2 { name="mwshiny"; version="2.0.0"; sha256="07x36dymd79aziz8k3sfx7l82xzmv43pkwndsfv9ii58q7nli1hz"; depends=[shiny]; }; mxkssd = derive2 { name="mxkssd"; version="1.1"; sha256="0m9763dqrk8qkrvp18bsv96jv0xhc2m8sbxdk6x3w6kdjcl663p2"; depends=[]; }; + mxmmod = derive2 { name="mxmmod"; version="1.0.1"; sha256="0rb0dqd4dzf5agij4cikz9a8cf6saz2q7bybxjagb8y4yjyhy2xv"; depends=[OpenMx]; }; myTAI = derive2 { name="myTAI"; version="0.9.2"; sha256="1inf6625qxr57jkwx5h3f3rdmlxf74my8bvigl8hxivd9z5z3wbl"; 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]; }; mztwinreg = derive2 { name="mztwinreg"; version="1.0-1"; sha256="1rg6ikaqdrc7q44s3r3km8h45prnvcpzpxd7nxbmh209iz9j19ai"; depends=[mclogit rms]; }; - n1qn1 = derive2 { name="n1qn1"; version="6.0.1-3"; sha256="1k13x4h2rbcra3b8873ymvn4bgj6psaw05ba0hac0spymbp01fzi"; depends=[Rcpp RcppArmadillo]; }; + n1qn1 = derive2 { name="n1qn1"; version="6.0.1-7"; sha256="1mwcv8gp6c2vj8n9w8y17318a2qrl6rjq8qcfx611fqf6dfrfchq"; depends=[Rcpp RcppArmadillo]; }; nCDunnett = derive2 { name="nCDunnett"; version="1.1.0"; sha256="0q2db1pixqr0wbx4bd05c98i1p0vgaqsfa1iwjxr08c62a5xhkks"; depends=[]; }; nCal = derive2 { name="nCal"; version="2018.8-20"; sha256="1idgpzivw5wa423z86rf60ri50cyh8p38p4r493i9b2m9qzzqf1x"; depends=[drc gdata gWidgets kyotil]; }; nCopula = derive2 { name="nCopula"; version="0.1.1"; sha256="03qbfvx0lg9prg52fk1jxar2bng2x6scac4g2c64kvp6vmf6x4mv"; depends=[copula Deriv stringi stringr]; }; nFCA = derive2 { name="nFCA"; version="0.3"; sha256="1jyyzagmppm3i7vh3ia4ic0zql1w04f66z81v0zpdihd4cbl5ra7"; depends=[]; }; - nFactors = derive2 { name="nFactors"; version="2.3.3.1"; sha256="0qylbwn064smdw2adyx1hxwy4m320g78ihllfnss4kkmxk0ki05z"; depends=[boot lattice MASS psych]; }; + nFactors = derive2 { name="nFactors"; version="2.4.1"; sha256="1diybai7pwaj9adn60b7nhvvpjjkwg3jimwp2ahgca9askmv93h2"; depends=[lattice MASS psych]; }; + nJira = derive2 { name="nJira"; version="0.1.1"; sha256="0vh167kxljp68f0dx307wl6fp8nlp34vgrkr815z30mhx03p8j9r"; depends=[httr plyr rjson]; }; nLTT = derive2 { name="nLTT"; version="1.4.3"; sha256="0gpmlvam7k4gsiidblfl4f57mgkbq2pakzqak4yx4pxa9f8gpilm"; depends=[ape coda deSolve testit]; }; nVennR = derive2 { name="nVennR"; version="0.2.1"; sha256="11qkwd8laf67iqyzx3ia424vykvsvy0k9d7labdgqfx2ihd95hh2"; depends=[Rcpp]; }; na_tools = derive2 { name="na.tools"; version="0.3.1"; sha256="1lbzsckfg297n85kzbin65x1l6qgg9l50hd3xi2gflxc7n2xb8bw"; depends=[]; }; naaccr = derive2 { name="naaccr"; version="1.0.0"; sha256="1hw74a2gjm3gxq0s0qlndhqw0vij6p31walz1ic741z7hqsffqq7"; depends=[data_table stringi]; }; nabor = derive2 { name="nabor"; version="0.5.0"; sha256="1nj39cdfwrmhgsi3cq8imxv3n6xzc1v6dzdb2cf2hybjk368v4s7"; depends=[BH Rcpp RcppEigen]; }; nadiv = derive2 { name="nadiv"; version="2.16.2.0"; sha256="0gvpl8jrczk9afc7qg6w8w0gn28nia5mh3vanlsp7j0kj3vzqqc5"; depends=[Matrix]; }; - naivebayes = derive2 { name="naivebayes"; version="0.9.6"; sha256="1rmpc7ynnl909m20njdy5nc7siqqlj5xra3ry41b0pgb966ijcdz"; depends=[]; }; - naivereg = derive2 { name="naivereg"; version="1.0.2"; sha256="11prmwb6jc0la4w2qlmbr9n529sn4mv3zm9h80svg6gs119a9yb0"; depends=[gmm grpreg ncvreg]; }; + naijR = derive2 { name="naijR"; version="0.0.7"; sha256="1q93y959b2r8gf5ccw897kk3ky7i7mc6wrcspnpaipznrc4pnidi"; depends=[mapdata maps]; }; + naivebayes = derive2 { name="naivebayes"; version="0.9.7"; sha256="070m78d8hsbqfbapb6g8vvh91gyznqfdpqsaq6z3raps8zlybsag"; depends=[]; }; + naivereg = derive2 { name="naivereg"; version="1.0.5"; sha256="1cxfl419pp7xh1xrad29gvpn6hm0rhk40vylj97ypndh6gmnynzz"; depends=[glmnet gmm grpreg ncvreg]; }; nakagami = derive2 { name="nakagami"; version="1.0.0"; sha256="1i9m1nlqfdk9k3bzf8qlfc11spzfqly49n1pk7phvykzjgd1c1s4"; depends=[assertthat]; }; - namedCapture = derive2 { name="namedCapture"; version="2019.7.30"; sha256="12cnd16015ig0qx41gfkf7915iyzlaa7ixdv72x9vx3rylw86y4q"; depends=[]; }; + namedCapture = derive2 { name="namedCapture"; version="2020.4.1"; sha256="0zdw3h3n4qjv9cpidb3g523ld6rrh49l2c1yhfqhk5wb7vddrs46"; depends=[]; }; namer = derive2 { name="namer"; version="0.1.5"; sha256="1687x6rc46bp2bmqkixzry5cc7lxjqwjk8ngrbg2fk7mzb4pwvnq"; depends=[dplyr fs glue magrittr purrr rstudioapi tibble]; }; namespace = derive2 { name="namespace"; version="0.9.1"; sha256="1bsx5q19l7m3q2qys87izvq06zgb22b7hqblx0spkvzgiiwlq236"; depends=[]; }; - nandb = derive2 { name="nandb"; version="2.0.5"; sha256="0y1lw79mpvyfbxfzjrdfnpgny4s2axbl23gl67fj45jrbjh56wxz"; depends=[assertthat autothresholdr BBmisc checkmate detrendr dplyr filesstrings ggplot2 glue ijtiff magrittr purrr Rcpp reshape2 rlang stringr viridis withr]; }; - naniar = derive2 { name="naniar"; version="0.4.2"; sha256="0qy3wgb4wixn01yyhbjf0dmx5xq42m4c3d46y2ysfj59181p39lm"; depends=[dplyr forcats ggplot2 glue magrittr purrr rlang tibble tidyr UpSetR viridis visdat]; }; + nandb = derive2 { name="nandb"; version="2.0.6"; sha256="0gxpm22lmjbh63cifii5hwrh4wgk3f58wvp0frj5ns9jyfl6k4ik"; depends=[assertthat autothresholdr BBmisc checkmate detrendr dplyr filesstrings ggplot2 glue ijtiff magrittr purrr Rcpp reshape2 rlang stringr viridis withr]; }; + naniar = derive2 { name="naniar"; version="0.5.0"; sha256="0n0x7s7rd7zwp0jrzwl6c246yha514nwn77avd5iiq53kwypnlg9"; 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.4"; sha256="1g1hm5kz2bl3qqs2cz4nhvmak7mbh5pry34lp6lwnbxrgi97i1iz"; depends=[assertthat ccaPP dplyr epiR magrittr purrr rlang]; }; nanotime = derive2 { name="nanotime"; version="0.2.4"; sha256="115i9v3h2fakq14jfc0yf7i96xvy8qas4qvmp0s9digy6ms7xyrd"; depends=[bit64 RcppCCTZ zoo]; }; @@ -10704,18 +10832,19 @@ in with self; { nasadata = derive2 { name="nasadata"; version="0.9.0"; sha256="0y88qdy8c1y0prsajxic5vdqfixv9knjsbhw3vbfac8wv3a69bjl"; depends=[dplyr jsonlite plyr png]; }; nasapower = derive2 { name="nasapower"; version="1.1.3"; sha256="1grfbj68vxsy50a0zylgfddwgr3ilrk2v60755vra9ckpmnf31zi"; depends=[APSIM crul curl jsonlite lubridate readr tibble]; }; nasaweather = derive2 { name="nasaweather"; version="0.1"; sha256="05pqrsf2vmkzc7l4jvvqbi8wf9f46854y73q2gilag62s85vm9xb"; depends=[]; }; - nat = derive2 { name="nat"; version="1.8.13"; sha256="12n81jzlzamnpkf5inczfc1x8qmfibszpkakpyc0q7r7wgpykbgv"; depends=[digest filehash igraph nabor nat_utils plyr rgl yaml]; }; + nat = derive2 { name="nat"; version="1.8.14"; sha256="02v1hvxsp3z7rday2mr5f52kkyszcl3ind3p8vllyl705s3ci2ll"; depends=[digest filehash igraph nabor nat_utils plyr rgl yaml]; }; nat_nblast = derive2 { name="nat.nblast"; version="1.6.5"; sha256="0fp01rrvz7n84sdmfhi0wzd9mvg7wi682l4qg5dj82cm98v80l3p"; depends=[dendroextras nabor nat plyr rgl spam]; }; nat_templatebrains = derive2 { name="nat.templatebrains"; version="0.9"; sha256="0r0ydhxnax4x4gwp60bgarhgp59g4sis7msa3rq4kddv8qdi3gix"; depends=[digest igraph memoise nat rappdirs rgl]; }; nat_utils = derive2 { name="nat.utils"; version="0.5.1"; sha256="12g87ar795xfbz7wljksb24x9hqvcirjr50y4mbpx1427r0l7clv"; depends=[]; }; - nationwider = derive2 { name="nationwider"; version="1.1.0"; sha256="01hp8igbvbn1qa203cdnlwnfzymjifzmzcyfaszzf9q4f17f07r8"; depends=[dplyr httr lubridate magrittr readxl rvest stringr tidyr xml2 zoo]; }; + nationwider = derive2 { name="nationwider"; version="1.1.1"; sha256="1crflv2wvrsyrhl612f7awvm0yfhl381q7pq190n3ydg093y32r6"; depends=[dplyr httr lubridate magrittr readxl rvest stringr tidyr xml2 zoo]; }; + natmanager = derive2 { name="natmanager"; version="0.4.0"; sha256="03vqy6kwc749ccydmjwjl49sydg534ijn0kpm11s4jp6nmybgzsa"; depends=[curl gh remotes usethis withr]; }; natserv = derive2 { name="natserv"; version="0.3.0"; sha256="0plfcf9c1lwfmac3nnx07hyhpr12q6mfmmj0dz8xyxdspd2ps81w"; depends=[crul data_table tibble xml2]; }; natural = derive2 { name="natural"; version="0.9.0"; sha256="0zxwbf3gg2h0bhl2w0md3rd162vlsgg0dv3187hc0ax7333cc4cx"; depends=[glmnet Matrix]; }; naturalsort = derive2 { name="naturalsort"; version="0.1.3"; sha256="0mz801y9mzld9ypp3xmsjw2d8l9q97sdnv09wrci9xi3yg2sjf6d"; depends=[]; }; nbc4va = derive2 { name="nbc4va"; version="1.1"; sha256="025p9h1ghrsq4h439gx25ffpyvh2kp1i51hm7kbzx8nmh4ka8aff"; depends=[]; }; nbconvertR = derive2 { name="nbconvertR"; version="1.3.2"; sha256="0yhmz177r1miain65vspclahhz8cg7638ldbpsw8ylgf7a60l0sg"; depends=[]; }; nbpMatching = derive2 { name="nbpMatching"; version="1.5.1"; sha256="0f90k9vq05gkc0sgywb98frig63df0ih4z41dq7m2inx1zk5rqns"; depends=[Hmisc MASS]; }; - nc = derive2 { name="nc"; version="2019.10.19"; sha256="1z8v8i2bvqj1vdhijxabv0rw6ammfgzxxmwax1ywcka9jr0x1fnw"; depends=[data_table]; }; + nc = derive2 { name="nc"; version="2020.3.23"; sha256="18hjwa86y14sdwzz46k6w9hb8s8w58bxmnqy2spib8qy6dvvpfj4"; depends=[data_table]; }; ncappc = derive2 { name="ncappc"; version="0.3.0"; sha256="0bf00iskrd3x43839bwn957mi3qvm2dhcmqa7hl1ib0gp2r1cnzx"; depends=[bookdown Cairo dplyr ggplot2 gridExtra gtable knitr lazyeval magrittr PopED purrr readr reshape2 rlang rmarkdown scales tibble tidyr xtable]; }; ncar = derive2 { name="ncar"; version="0.4.2"; sha256="12cz4mlcmg8vdcn6747q1vz20wyypf89jq3nzx17s3aki0vlnwmj"; depends=[NonCompart rtf]; }; ncbit = derive2 { name="ncbit"; version="2013.03.29"; sha256="0f07h8v68119rjvgm84b75j0j7dvcrl6dq62vp41adlm2hgjg024"; depends=[]; }; @@ -10723,38 +10852,40 @@ in with self; { ncdf4 = derive2 { name="ncdf4"; version="1.17"; sha256="1xls44ln2zjrrlimxl8v4bk2ni3g45c9j0gxdnjx31rikmrc95fv"; depends=[]; }; ncdfgeom = derive2 { name="ncdfgeom"; version="1.1.0"; sha256="19gbpf19vjzfigi9awhqjx6zsv92h4w1lg3dps3sgaibym9lq3zk"; depends=[dplyr ncmeta RNetCDF sf]; }; ncdump = derive2 { name="ncdump"; version="0.0.3"; sha256="09g98mzpky32z41jf23ahzhyv34l34y1gqq99j2hl4pqlvvhxs9i"; depends=[dplyr ncdf4]; }; - ncf = derive2 { name="ncf"; version="1.2-8"; sha256="1j2q1dqhr8xk9fhzjkpnx8ff427d1m8qr07l2zj5lwyh9wbr1jzn"; depends=[]; }; + ncf = derive2 { name="ncf"; version="1.2-9"; sha256="0wxn004jn4wba2zqnfrd513pw4mjxkmk4n1xj829nxadn1zbkcax"; depends=[]; }; ncg = derive2 { name="ncg"; version="0.1.1"; sha256="1jzkzp61cc5jxmdnl867lcrjjm7y2iw9imzprbd098p1j3w8fvj7"; depends=[]; }; ncmeta = derive2 { name="ncmeta"; version="0.2.0"; sha256="1qrb2mnb4qjgx1ss1zwz7z034xrb9p0w0q9mqdh6rg4qgdsfhdxh"; depends=[dplyr rlang RNetCDF tibble tidyr]; }; ncodeR = derive2 { name="ncodeR"; version="0.2.0.1"; sha256="1pxiqxhq2rxs8rxxhw1hbds7z2qkf7ws26a8wsbw815yn6jm10n8"; depends=[cli R6 rhoR]; }; ncpen = derive2 { name="ncpen"; version="1.0.0"; sha256="0vl4cbrsifr5s1691gacmp0lk3aqyq0yfafafzv6g3zygi4igrsa"; depends=[Rcpp RcppArmadillo]; }; - ncvreg = derive2 { name="ncvreg"; version="3.11-1"; sha256="09s8k8gqsnwm6f5x1rr1f32pzam67migxwkbj4lfvw85v3pljdmr"; depends=[]; }; + ncvreg = derive2 { name="ncvreg"; version="3.11.2"; sha256="047z848chp1c10ijhw50a9mkjhhi9pd8d21c7jc9h9r2q3zgkixq"; depends=[]; }; ndjson = derive2 { name="ndjson"; version="0.8.0"; sha256="0lvzbgfi1sg4kya1mvv67z14qk3vz9q57x22qh57xq8ampdkg812"; depends=[data_table Rcpp tibble]; }; ndl = derive2 { name="ndl"; version="0.2.18"; sha256="0b235v6jf98rrqp5aqw3jkk7mq8dbqmhb758zbzza1mavh4n2k7s"; depends=[Hmisc MASS Rcpp]; }; ndtv = derive2 { name="ndtv"; version="0.13.0"; sha256="1qfjvq5wch256gmg7pw9jwda33r4963a8p8jmp27cmpzdwycvnzy"; depends=[animation base64 jsonlite MASS network networkDynamic sna statnet_common]; }; nearfar = derive2 { name="nearfar"; version="1.2"; sha256="116rq797a5fascirz8xg465fywjf40j1k5czryvqzpik0if0w00r"; depends=[car GenSA MASS nbpMatching]; }; neariso = derive2 { name="neariso"; version="1.0.1"; sha256="1b2gnws75kkqsi8mg9n0zzdaawx57a6zz47cswabj5m6nb09ikh8"; depends=[]; }; neat = derive2 { name="neat"; version="1.2.1"; sha256="0ifx2qbr8g6myz380rwayas26vg13wkblssvma4kbgfksw7cccgj"; depends=[igraph]; }; - neatRanges = derive2 { name="neatRanges"; version="0.1.0"; sha256="0g6b5mi57ajqwn8s09rw1njc1v4lrqy5dcnlphwx9i89lfa8lbah"; depends=[data_table]; }; + neatRanges = derive2 { name="neatRanges"; version="0.1.3"; sha256="1zfp6f1q7m0bks0shvzr120nd5jxba28xhi7vrd55qfy7g72167g"; depends=[data_table Rcpp]; }; + neatStats = derive2 { name="neatStats"; version="1.0.4"; sha256="0fh06q7136azsl0ml0f67vgw90pqcpp0b57r1gmq9f5kwjbwg1yy"; depends=[BayesFactor bayestestR Exact ez ggplot2 MBESS pROC]; }; neatmaps = derive2 { name="neatmaps"; version="2.1.0"; sha256="1kz1na3fzpd8vkxmpp5rz8ksyf8q2wk456csiii82winv9a2zxc9"; depends=[ConsensusClusterPlus dplyr ggplot2 heatmaply igraph]; }; needmining = derive2 { name="needmining"; version="0.1.1"; sha256="0qsj0ihjchrnl4s44rpsizbcz033z00dmzvic2y1msv0bnfawl6p"; depends=[randomForest rtweet SnowballC SparseM stringr tau tm]; }; needs = derive2 { name="needs"; version="0.0.3"; sha256="16dkjpijz3rz7kd5ggxsdg55iwd42nll1vk6g5ix4xdbqrx6cp9x"; depends=[]; }; needy = derive2 { name="needy"; version="0.2"; sha256="1ixgpnwrg6ph1n5vy91qhl1mqirli9586nzkmfvzjrhdvrm0j5l0"; depends=[]; }; negenes = derive2 { name="negenes"; version="1.0-12"; sha256="0b82822vl86gni0pv5f6pjfzmks35i7q2rqkhgyb9z9c677g991q"; depends=[]; }; - neighbr = derive2 { name="neighbr"; version="1.0.2"; sha256="1l85x3p4h2z2npj1xqggviyd3kvkgni5cnx5p3g52s9jwqrj43kb"; depends=[]; }; + neighbr = derive2 { name="neighbr"; version="1.0.3"; sha256="1rmglfjmx6bfd4w1cpx4rvp7hy2vqvcamy854h5dq0l3kwk4pjcm"; depends=[]; }; neldermead = derive2 { name="neldermead"; version="1.0-11"; sha256="0gf9rfwz48sadl6960mpfb6a3l9n5p28yq3n0a9vz8mr57vh1dzg"; depends=[optimbase optimsimplex]; }; + neo2R = derive2 { name="neo2R"; version="2.1.0"; sha256="1fhi74d4730pxrmv1p2gz8ylvnilxn4l837nha6ndyhy00xfgkk6"; depends=[base64enc jsonlite RCurl]; }; neo4r = derive2 { name="neo4r"; version="0.1.1"; sha256="0s4rjhn2mc8ca4p8p474a83dc277vrf7l968xwxkiac0d4fgbra7"; depends=[attempt data_table glue httr igraph jsonlite magrittr purrr R6 rlang rstudioapi shiny tibble tidyr tidyselect]; }; neonUtilities = derive2 { name="neonUtilities"; version="1.3.3"; sha256="1lmk2h58ablfggyicyhndw3n74lrpb7zcp5y1nh24i0mkqrf6gfm"; depends=[data_table downloader dplyr gdata httr jsonlite lubridate pbapply plyr readr stringr tidyr]; }; neotoma = derive2 { name="neotoma"; version="1.7.4"; sha256="1fknzp7qg5l5lkfvqfld0x67zj3xmi8vivsg70m47mbpcs92hmcf"; depends=[analogue dplyr httr jsonlite leaflet plyr reshape2 xml2]; }; nephro = derive2 { name="nephro"; version="1.2"; sha256="1izmzx8lah322xzb42asfnrvr2c9yqd0zf7fmrhwd3p4rr1rqa7d"; depends=[]; }; - nesRdata = derive2 { name="nesRdata"; version="0.3.0"; sha256="06wnm1bv7i2r6sj2hyk1zypwhr3ir89gh2bkd6kmhb7s5wv6cd5v"; depends=[dplyr purrr rappdirs readr]; }; + neptune = derive2 { name="neptune"; version="0.1.0"; sha256="0nynxvkzcdsmznyviw18gqky1kw7dxgc13nrsbf6999lr3s3shkj"; depends=[reticulate]; }; nestfs = derive2 { name="nestfs"; version="1.0"; sha256="0lzbjj287s5kmw9635gfyl3jdgfh5mxbwxqxmnwynbwccixk0akc"; depends=[dgof pROC]; }; - netCoin = derive2 { name="netCoin"; version="1.1.23"; sha256="0v5ia8iwn7i21a5xa6wjnm1pn1z1y0ccbg6qqnfzg01x1d751s5q"; depends=[haven igraph Matrix]; }; + netCoin = derive2 { name="netCoin"; version="1.1.24"; sha256="14g7b5z1l5hc30pchwlyrgh6ggzfiq7n07h4yznz64cb459ishrh"; depends=[haven igraph Matrix]; }; netSEM = derive2 { name="netSEM"; version="0.5.1"; sha256="0k4ngl4p1v2rp1sf2x65m7p0cd6ha98fyx21b73ki0531q0d9fil"; depends=[DiagrammeR DiagrammeRsvg gtools htmlwidgets knitr magrittr MASS png rsvg segmented svglite]; }; netassoc = derive2 { name="netassoc"; version="0.6.3"; sha256="1hyshnbpq60a3y13b4sh1c2rk78x09q01b7q6xrgv10w7bn9r2sg"; depends=[corpcor huge igraph infotheo vegan]; }; - netchain = derive2 { name="netchain"; version="0.1.0"; sha256="187pgsp6dn15n9bx9sj1pjx8wyfp2cs5s89s72hclanic479pv4g"; depends=[gtools igraph Matrix Rcpp stringr]; }; - netcoh = derive2 { name="netcoh"; version="0.2"; sha256="0q60hvyparlwdww6as6hcdzfs6q3n8z1rfpj53r5q2s77x6q07xx"; depends=[Matrix Rcpp RcppArmadillo]; }; + netchain = derive2 { name="netchain"; version="0.2.0"; sha256="1skpf1n6a17mjkcxqpl6vrskk04yvqa0v4n2zw9x5r1h46q9m6qk"; depends=[gtools igraph Matrix Rcpp stringr]; }; netcom = derive2 { name="netcom"; version="1.0.4"; sha256="0fka14sffm0p1gldk27fd62ng05spfpbn665b4w5hdf1z4z0bs20"; depends=[clue expm igraph Matrix pdist pracma vegan]; }; + netcontrol = derive2 { name="netcontrol"; version="0.1"; sha256="1gskb728ycnhz9a9g9ghm0dz3ajf3dzgyv23bsk9i01wj9hrxhc0"; depends=[expm MASS Matrix pracma Rcpp RcppArmadillo Rdpack]; }; netdep = derive2 { name="netdep"; version="0.1.0"; sha256="0mrbqn5d8iqvs98a0kski0vya135z7l902xafya96s2h288jchx7"; depends=[igraph igraphdata MASS mvrtn]; }; netgen = derive2 { name="netgen"; version="1.3.2"; sha256="1yqi4rb6w9ipxgbl1j1s2s81cg7nzrn65irn5gs82hsq94d6vv2j"; depends=[BBmisc checkmate ggplot2 igraph lhs mvtnorm stringr]; }; netgsa = derive2 { name="netgsa"; version="3.1.0"; sha256="0mn4dnvckdskigdfbszjnfmb3m6yfbz4qc26qwh1wznwx5wmcbf0"; depends=[corpcor dplyr glassoFast glmnet graph graphite igraph magrittr Matrix msigdbr quadprog rlang]; }; @@ -10766,7 +10897,7 @@ in with self; { nets = derive2 { name="nets"; version="0.9"; sha256="1wcr0fj50w3rqxw0k9cb81c2psdkb0dwwwzrjvxv50hksbhyi8kn"; depends=[igraph]; }; netstat = derive2 { name="netstat"; version="0.1.1"; sha256="1h87cl3ry5hwwqxza3n24zpvwn89hhclsa2400sw4ijdy2ivpn2j"; depends=[]; }; network = derive2 { name="network"; version="1.16.0"; sha256="0dnf1wl3za2lhx2lwd8smhlijl1cfhckgr8zz9piiirrfi2m2kx2"; depends=[magrittr tibble]; }; - networkABC = derive2 { name="networkABC"; version="0.5-3"; sha256="0f3wbm76i8m9f52b0zvb2fvziqh43xy67llnv4lm54yj5szxvjr0"; depends=[network RColorBrewer sna]; }; + networkABC = derive2 { name="networkABC"; version="0.7-0"; sha256="0vn5hgry4i1dzgp34vdfa6wifsz54jh05avs9xrbzg6zmf1y2cif"; depends=[network RColorBrewer sna]; }; networkD3 = derive2 { name="networkD3"; version="0.4"; sha256="02wxki67drppgfka1is1ykg1f2rxf0x0657c0crj7ipfy62jbf1k"; depends=[htmlwidgets igraph magrittr]; }; networkDynamic = derive2 { name="networkDynamic"; version="0.10.1"; sha256="183cnxbcly887vmxcvyvwcn19i8s7yyb57k1q5vhimx8vvcxivi2"; depends=[network statnet_common]; }; networkDynamicData = derive2 { name="networkDynamicData"; version="0.2.1"; sha256="176al8jp0gha6yzhyn5flmyackmmdnh1h8sasqrdcmba7ha7cya6"; depends=[network networkDynamic]; }; @@ -10775,38 +10906,39 @@ in with self; { networkTomography = derive2 { name="networkTomography"; version="0.3"; sha256="1hd7av231zz0d2f9ql5p6c95k7dj62hp0shdfshmyfjh8900amw7"; depends=[coda igraph KFAS limSolve plyr Rglpk]; }; networkreporting = derive2 { name="networkreporting"; version="0.1.1"; sha256="1ssbz8lw4mlwcblwfbyffvayvb2gmihq4qlz5q9222fn4aa3raxd"; depends=[dplyr functional ggplot2 lazyeval plyr reshape2 stringr surveybootstrap]; }; networksis = derive2 { name="networksis"; version="2.1-3"; sha256="1kvil3qs7xd94ak9jgvj1nss55gjg0y7d35zmass9h1hjkcrq7bg"; depends=[network]; }; - networktools = derive2 { name="networktools"; version="1.2.1"; sha256="0s7xcan0qkzpri6r2jm6c1d62f5lx88m3wa2rgkn1mvdq0sh3igg"; depends=[cocor eigenmodel ggplot2 gridExtra igraph IsingFit NetworkComparisonTest nnet psych qgraph R_utils RColorBrewer reshape2 smacof wordcloud]; }; - networktree = derive2 { name="networktree"; version="0.2.1"; sha256="1fl2zh5b7avkkp4c34szrm37fp7jamn54vzyhrzamjd3jqr32hmy"; depends=[Formula gridBase Matrix mvtnorm partykit qgraph]; }; + networktools = derive2 { name="networktools"; version="1.2.2"; sha256="1j6jqz02lgafykfdnvv4zgpglhijyhirc9zgjl7pj930wmnpy9p4"; depends=[cocor eigenmodel ggplot2 gridExtra igraph IsingFit NetworkComparisonTest nnet psych qgraph R_utils RColorBrewer reshape2 smacof wordcloud]; }; + networktree = derive2 { name="networktree"; version="0.2.2"; sha256="0dlci3sqdh6f3w82h0p6c2pn15d170m9ls8zllgscd1sbyry4k4x"; depends=[Formula gridBase Matrix mvtnorm partykit qgraph reshape2]; }; neuRosim = derive2 { name="neuRosim"; version="0.2-12"; sha256="1hsnw9xipdr74fydq9013252ycbi9igh28s0j4dbdx52pv3iixzl"; depends=[deSolve]; }; neural = derive2 { name="neural"; version="1.4.2.2"; sha256="05hrqgppgwp38rdzw86naglxj0bz3wqv04akq7f0jxbbjc6kwy4j"; depends=[]; }; neuralnet = derive2 { name="neuralnet"; version="1.44.2"; sha256="09l808vgjh059a3f94vgsprfyp5c1hrbjn6i1cn34cxnbljwsrjz"; depends=[Deriv MASS]; }; neurobase = derive2 { name="neurobase"; version="1.29.0"; sha256="16y1d4qg4d57l43080vlpn5jnh462qnv9z0w6dv0zwlk74psm9ha"; depends=[abind matrixStats oro_nifti R_utils RNifti]; }; neuroblastoma = derive2 { name="neuroblastoma"; version="1.0"; sha256="0hs87fvwaq53xxbh2dw3hjsmf1zkyqli9qyacxf72fnkyhhl8b45"; depends=[]; }; + neurocInstall = derive2 { name="neurocInstall"; version="0.12.0"; sha256="1fkb6ji9gigqdjl50hbgdgfidqpjgqlh1aidf6vn4qnfr92bsvqf"; depends=[devtools]; }; neurohcp = derive2 { name="neurohcp"; version="0.8.1"; sha256="01q9dkrpmwfj4r7is97f3lsmn84vm5qpvf44zfm1a6hhpxa0n7z0"; depends=[base64enc digest httr xml2]; }; neuroim = derive2 { name="neuroim"; version="0.0.6"; sha256="00cjr6pkip6zi2d0q3qbn3lb3k0z82v6c19qslvgpa9n0g63dr5p"; depends=[abind assertthat hash iterators Matrix Rcpp readr rgl stringr yaImpute]; }; neuropsychology = derive2 { name="neuropsychology"; version="0.5.0"; sha256="0hlbjf8hxz4cl7fvg9mbyfmcyyxncc2nh9h1mrd2yzgrpgn0d0b5"; depends=[BayesFactor caret dplyr ggcorrplot ggplot2 Hmisc htmlTable lme4 MuMIn png ppcor psych stringi tidyr tidyverse tm wordcloud2]; }; neutralitytestr = derive2 { name="neutralitytestr"; version="0.0.2"; sha256="1p1zjc3fiphkxflsyzrxx8af98aa0gp9pvby63mmrsjb0z7ps948"; depends=[cowplot dplyr ggplot2 ggpmisc pracma scales]; }; - neverhpfilter = derive2 { name="neverhpfilter"; version="0.2-0"; sha256="0m4gbqnjw2nmhf25svznlf6pd0b0mslk52lpirmlj1iv04w1aq1i"; depends=[xts zoo]; }; + neverhpfilter = derive2 { name="neverhpfilter"; version="0.3-1"; sha256="1x2sc9v40hrlg60v3887a680359zdql9c7n8y97dh7v8w7mw547x"; depends=[xts zoo]; }; newTestSurvRec = derive2 { name="newTestSurvRec"; version="1.0.2"; sha256="06p782md33wqh5wa1735yg5i01d42p74kl7h5qhqs9cd732ls6pz"; depends=[]; }; newsanchor = derive2 { name="newsanchor"; version="0.1.1"; sha256="1s8qhq9jk5gnsimnvy7kdayya0ks0ly309l7zxm5rafj5x7k5vwn"; depends=[askpass devtools httr jsonlite lubridate tidyr xml2]; }; - newsmap = derive2 { name="newsmap"; version="0.7.0"; sha256="1fhpkih37i4abrv9ili1vpwk4pgmnhq5d5flqjdi025h9gb0zq8y"; depends=[Matrix quanteda stringi]; }; + newsmap = derive2 { name="newsmap"; version="0.7.1"; sha256="0cm9xrpsvhxlqvnqp7r44gx2rzy50hsvmqdlriw0yqd3fp9357qd"; depends=[Matrix quanteda stringi]; }; ngram = derive2 { name="ngram"; version="3.0.4"; sha256="1q4y64dy7vcjikbfx20fpdiy1kwvxay4y90xr5j8d8zkqnva0way"; depends=[]; }; ngramrr = derive2 { name="ngramrr"; version="0.2.0"; sha256="1p8s4p3h27g647rxx9qjfad5dzbngjbmvhw4gz0jbsmfqrsf72by"; depends=[tau tm]; }; ngspatial = derive2 { name="ngspatial"; version="1.2-1"; sha256="1c65ws9b9s2grr44lqg8026c4p2875d0426dfmrakpb44mw2zppp"; depends=[batchmeans Rcpp RcppArmadillo]; }; - 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.2"; sha256="0qi7ls10pdjcihkdnhbvbnv8dwcy1448pd5fzhpy0kjky7hfi7bj"; depends=[curl dplyr foreign gdalUtils ggplot2 httr maps memoise purrr rappdirs rgdal rlang rvest sf stringr units xml2]; }; - nhdplusTools = derive2 { name="nhdplusTools"; version="0.3.12"; sha256="0111yy4pqxhqz7lk30zm7lryzarpjlxnvkzvix630xzvms8jkx1n"; depends=[dplyr httr igraph jsonlite magrittr prettymapr R_utils RANN rosm sf tidyr units xml2]; }; + nhdR = derive2 { name="nhdR"; version="0.5.3"; sha256="0zd10zy9kn97nm2i0y8h5wjdmzxblv5azybycwf08aqr0x6axh3n"; depends=[curl dplyr foreign gdalUtils ggplot2 httr maps memoise purrr rappdirs rgdal rlang rvest sf stringr units xml2]; }; + nhdplusTools = derive2 { name="nhdplusTools"; version="0.3.13"; sha256="1r2rcdlx1wsxrr931nwlprkbsmbj1bxgkjmafd1v8fxnl6cgdkk7"; depends=[dplyr httr igraph jsonlite magrittr prettymapr R_utils RANN rosm sf tidyr units xml2]; }; nhds = derive2 { name="nhds"; version="1.0.3"; sha256="1cgw3hmsik3vlnb1lgalhvhrqzwdv08dp80vwpw1nwbf8whcbxjn"; depends=[]; }; - nhlscrape = derive2 { name="nhlscrape"; version="0.1.2"; sha256="06k7pabyz0nbx1z6p2d3cymf6jph4gxa4fhzfgqzzqg9ai5kmccq"; depends=[DBI httr jsonlite RSQLite rvest xml2]; }; + nhlscrape = derive2 { name="nhlscrape"; version="0.1.3"; sha256="0x6y747j6lha3jw4v2wavgd12xw5nx4m8biv9rmq9z0qy53vncjc"; depends=[DBI httr jsonlite RSQLite rvest xml2]; }; nhm = derive2 { name="nhm"; version="0.1.0"; sha256="1yf9hnbmfb7xj8mbhnq40wvd0pd88x9qspy1jr3x0n8nb75i3jlp"; depends=[deSolve maxLik mvtnorm]; }; 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]; }; + nichevol = derive2 { name="nichevol"; version="0.1.19"; sha256="0qj5cb0fyw0x1bczl6l0kl6jqir4yg8sb9fsfkd3h64d0ls2arl5"; depends=[ape castor concaveman geiger raster rgdal rgeos sf sp stringr]; }; nilde = derive2 { name="nilde"; version="1.1-3"; sha256="0h88if7dh16inyy5zh0yjqmc0c57k99la038p5vlwkj62vvjscmm"; depends=[]; }; - nima = derive2 { name="nima"; version="0.6.1"; sha256="0rfb624pap2ga19vll6hbvjh2jr8dh3i1bj1h8qpqpb5nk6lkf4x"; depends=[assertthat dplyr ggplot2 ggthemes gridExtra gtools scales]; }; + nima = derive2 { name="nima"; version="0.6.2"; sha256="0n8r8h1m0v0ssbpv6p32jby49f45qbicwr0awm7x054p48qk49cy"; depends=[assertthat dplyr ggplot2 ggthemes gridExtra gtools scales]; }; nimble = derive2 { name="nimble"; version="0.9.0"; sha256="04anz8xfkdv2c00hax305lycp0gzjspsq34hfgm3w51kz6nqzhpb"; depends=[coda igraph R6]; }; - nimbleEcology = derive2 { name="nimbleEcology"; version="0.1.0"; sha256="195g1hcx7fyqx2la2ci88m2bykcnzrv27k4q4qq3z69c54fc5p7d"; depends=[nimble]; }; + nimbleEcology = derive2 { name="nimbleEcology"; version="0.2.0"; sha256="0c8qs5j1n4fag8gw095rabmc619dwv9qyfzix29djjc4wr638xsd"; depends=[nimble]; }; nipals = derive2 { name="nipals"; version="0.7"; sha256="14rq54qy4gc4l9f5h48vrsrh7sb0wzzxbvjn0zax82pz2fw6nybx"; 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]; }; @@ -10818,17 +10950,18 @@ in with self; { nlgeocoder = derive2 { name="nlgeocoder"; version="0.1.3"; sha256="13d30kfgfsny5gnn3yjfnclky6yixaa8sg0m689rszqxrvbrj79x"; depends=[jsonlite]; }; nlirms = derive2 { name="nlirms"; version="3.4.4"; sha256="1njyfip377a0f6hf9y32s077b4jv4h8ydbjgnl68yfypxbfn2xyx"; depends=[gridExtra gtable]; }; nlist = derive2 { name="nlist"; version="0.1.0"; sha256="0i5appxx79fcv2g0frkzlv2yfym6kmmzbsk76rbh7ap8hram04jg"; depends=[abind chk coda purrr term]; }; - nlme = derive2 { name="nlme"; version="3.1-143"; sha256="13iixbs2ibldc75rl7rav5n5kx33zwm33xnfw1yvlkpcqf38bd22"; depends=[lattice]; }; + nlme = derive2 { name="nlme"; version="3.1-145"; sha256="1i9a3afdmn2ziks0imz0j09ay9n0zb9mhrymy9mg97vvlz5diwrh"; depends=[lattice]; }; nlmeODE = derive2 { name="nlmeODE"; version="1.1"; sha256="1zp1p98mzbfxidl87yrj2i9m21zlfp622dfnmyg8f2pyijhhn0y2"; depends=[deSolve lattice nlme]; }; nlmeU = derive2 { name="nlmeU"; version="0.70-3"; sha256="05kxymgybziiijpb17bhcd9aq4awmp5km67l2py9ypakivi0hc6l"; depends=[nlme]; }; - nlmixr = derive2 { name="nlmixr"; version="1.1.1-3"; sha256="04gm74mjwz8fidapk0040fghy4wpj19412n54v8wli10xjwwb76w"; depends=[BH brew cli crayon digest dparser fastGHQuad flextable generics ggplot2 huxtable lattice lbfgs lbfgsb3c magrittr Matrix memoise minqa n1qn1 nlme R_utils Rcpp RcppArmadillo RcppEigen rex RxODE StanHeaders stringr sys tidyr vpc yaml]; }; + nlmixr = derive2 { name="nlmixr"; version="1.1.1-7"; sha256="1dl3f0lns8cm32gx64i2jims4wknannl776mn2spzqh5z6g3nnzw"; depends=[BH brew cli dparser fastGHQuad flextable generics ggplot2 huxtable lbfgsb3c magrittr Matrix memoise n1qn1 nlme Rcpp RcppArmadillo RcppEigen RxODE StanHeaders stringr tidyr vpc yaml]; }; + nlmm = derive2 { name="nlmm"; version="1.0.1"; sha256="0q5vz4xqdb510i26zbcq4djcribn7h477akh8f56nzjgq231vhcq"; depends=[BH HI lqmm MASS Matrix mvtnorm nlme numDeriv Qtools Rcpp RcppArmadillo statmod]; }; nlmrt = derive2 { name="nlmrt"; version="2016.3.2"; sha256="1g0qq0a933ay65gkp04qgn2wqk6vw79pj2a228c2ski4rcmkjxyn"; depends=[]; }; - nloptr = derive2 { name="nloptr"; version="1.2.1"; sha256="15yz60kljxwnhm2m3gryjzxl3ynhkhd5jiwc179b1hz6rlzf71hz"; depends=[]; }; - nlpred = derive2 { name="nlpred"; version="1.0.0"; sha256="0a13agsacn7qw2i8ggd9v8w7k44r4faby1vv163gsa764ppj70m4"; depends=[assertthat bde cvAUC data_table np Rdpack ROCR SuperLearner]; }; + nloptr = derive2 { name="nloptr"; version="1.2.2.1"; sha256="1bhh2v14phzndjhiq7yw9vych6vzn5yy3vk9q35zcp3jhjjbwdyh"; depends=[]; }; + nlpred = derive2 { name="nlpred"; version="1.0.1"; sha256="05jna8hzd5v36a0dwag6zr8ms1pkryas3qarwb946bkxlslffp27"; depends=[assertthat bde cvAUC data_table np Rdpack ROCR SuperLearner]; }; nlraa = derive2 { name="nlraa"; version="0.53"; sha256="064mbajrpwm2pkiyb9lwmhhf3gxzkixay3vdz9lgfd3rr9gfrk06"; depends=[knitr nlme]; }; nlreg = derive2 { name="nlreg"; version="1.2-2.2"; sha256="0gkcxg5m287axhvkl00xy26vidawhhb1ii1s13rh49v0yccwvvqh"; depends=[statmod survival]; }; nlrr = derive2 { name="nlrr"; version="0.1"; sha256="09wm8s5sadkhkq9pb3fjk66cb2xn8py46w1d7yp7fjhczh31bjsq"; depends=[Hmisc rms]; }; - nlrx = derive2 { name="nlrx"; version="0.4.0"; sha256="0b5szfg20szzip6ylafgv94nx34dp4qcyg83lcip0kvz597ymd66"; depends=[crayon dplyr EasyABC furrr genalg GenSA igraph lhs magrittr purrr raster readr rstudioapi sensitivity sf stringr tibble tidyr XML]; }; + nlrx = derive2 { name="nlrx"; version="0.4.1"; sha256="1p29x6ayf3daahn8addh6xfrwl45rsllf4vx1k8l7hqwgxfa73rl"; depends=[crayon dplyr EasyABC furrr genalg GenSA igraph lhs magrittr purrr raster readr rstudioapi sensitivity sf stringr tibble tidyr XML]; }; nls_multstart = derive2 { name="nls.multstart"; version="1.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]; }; @@ -10843,45 +10976,45 @@ in with self; { nlt = derive2 { name="nlt"; version="2.2-1"; sha256="10wf00qzf28dxjfvv12wsqxlfn6xz15wk8njrzgsgm9px1g6s21f"; depends=[adlift EbayesThresh]; }; nltm = derive2 { name="nltm"; version="1.4.2"; sha256="02f3rn5l1hfvjpymy7vljmh6iq9w1w96016kx75qw563zwhmp5kx"; depends=[survival]; }; nlts = derive2 { name="nlts"; version="1.0-2"; sha256="0s49qjwavl9ns2746nn4zy4h4dh0njfcvznm3qd61qhs7np9w1db"; depends=[acepack locfit]; }; - nmaINLA = derive2 { name="nmaINLA"; version="0.1.2"; sha256="0layk1pqry2g3xiwmasrnsvmw91sgg7iz15d6iz6hbq4za61hr0k"; depends=[]; }; nmadb = derive2 { name="nmadb"; version="1.2.0"; sha256="17r5vc57ilhy6cfcqpfyp9nzzjaa5gc8qkgfn3y8sppqh1g1mi40"; depends=[devtools jsonlite RCurl readxl]; }; - nmathresh = derive2 { name="nmathresh"; version="0.1.4"; sha256="0nsywahzph06c7grk3ch65fvll4ninqz97y007d6qdqgmym9vxjq"; depends=[ggplot2 gridExtra gtable Matrix nnls]; }; + nmathresh = derive2 { name="nmathresh"; version="0.1.5"; sha256="0ndrkd68wkkj0ib0qamfmawfy4j07cg1nx4rx32amx2j0rc851yl"; depends=[ggplot2 gridExtra gtable Matrix nnls]; }; nmfem = derive2 { name="nmfem"; version="1.0.5"; sha256="0hlddml20bp38yp1dji3l9mc1vnzmdrj6myf19n9p9xb85a30b9c"; depends=[capushe 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]; }; + nmslibR = derive2 { name="nmslibR"; version="1.0.4"; sha256="1fw565n4128nswl2qx248ab60is98iqijq5blwskxc9hjddf95a4"; depends=[KernelKnn Matrix R6 Rcpp RcppArmadillo reticulate]; }; nmw = derive2 { name="nmw"; version="0.1.4"; sha256="1vj7b2p40x0h3xp45qzar86i9439mj8y3r5hnlbwa025jqdf2g0q"; depends=[numDeriv]; }; + nnGarrote = derive2 { name="nnGarrote"; version="1.0.2"; sha256="1rci3m362wlis8z9afbkcr9vk0ihvay389cq4c8jd9gmcwdrv61g"; depends=[caret glmnet multicool]; }; nnTensor = derive2 { name="nnTensor"; version="1.0.2"; sha256="12h25kn3d70ldlqpd4nqnycv3mnzfx1f9gcw1yaspmnhs1x6gddf"; depends=[fields plot3D rTensor tagcloud]; }; nna = derive2 { name="nna"; version="0.0.2.1"; sha256="17cz1jf7iv61wspqldfdwbdjhlr0wq09idkzlivfb8aik5w9f0z5"; depends=[]; }; - nnet = derive2 { name="nnet"; version="7.3-12"; sha256="17amqnw9dpap2w8ivx53hxha2xrm0drwfnj32li0xk41hlz548r7"; depends=[]; }; + nnet = derive2 { name="nnet"; version="7.3-13"; sha256="1z0rj5cm4ycw1y0gd5wwwg8c2298v90iybgqdqh17967jbi2125f"; depends=[]; }; nnetpredint = derive2 { name="nnetpredint"; version="1.2"; sha256="1c6s9wm6vhylwv4xhp2hkllw18zj8hdr17ls9vlxm9qs3wx1v48w"; depends=[RSNNS]; }; nnfor = derive2 { name="nnfor"; version="0.9.6"; sha256="0bciy6k79g7abvj3pmmdc4wzg5mp11zgmdbx17x4by993p2clhw9"; depends=[forecast glmnet MASS neuralnet plotrix tsutils uroot]; }; - nngeo = derive2 { name="nngeo"; version="0.3.0"; sha256="056xsffd7sn430lqmjsisk04929d44zqnwyikcdp46zhqyqpnk2m"; depends=[igraph lwgeom RANN raster Rcpp sf sp stars units]; }; + nngeo = derive2 { name="nngeo"; version="0.3.7"; sha256="1xyj5zjhim2scigkr4ycz7ma18a0sgi60jrhrcv9rnn2fg1hx5c7"; depends=[lwgeom RANN sf 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.2.0"; sha256="1hvjkma14kl8f69ichk27ddxlg9cqnzif8x43ckxyny6h341bbkf"; depends=[httr jsonlite rvest xml2]; }; noaastormevents = derive2 { name="noaastormevents"; version="0.1.1"; sha256="1ra852r5hw1ng3f4jk866jx0z2dszwvbidmfrdjchv9bfrjwmlmx"; depends=[choroplethr choroplethrMaps data_table dplyr forcats ggplot2 htmltab hurricaneexposure lubridate maps plyr RColorBrewer rlang stringr tidyr viridis XML]; }; - noctua = derive2 { name="noctua"; version="1.5.0"; sha256="0r6fwrvhss64hp6kpk2qg9pawav3sfapxqj65fm32zi8643ly5hc"; depends=[data_table DBI paws]; }; + noctua = derive2 { name="noctua"; version="1.6.0"; sha256="1gdlfjgxrhkdp8klis2rz60hvldw5qlzhrcp8frbyjvb8qa83b76"; depends=[data_table DBI paws]; }; nodbi = derive2 { name="nodbi"; version="0.4.0"; sha256="1jlqzj9lv9wnsb8hwy8y91369i6ykp8av35abakfpxg0302svay9"; depends=[data_table jsonlite]; }; nodeHarvest = derive2 { name="nodeHarvest"; version="0.7-3"; sha256="0nh3g50rk9qzrarpf29kijwkz9v60682i0ag77j2ipyvhhbpwpkc"; depends=[quadprog randomForest]; }; nofrills = derive2 { name="nofrills"; version="0.3.0"; sha256="18hryq6clywlr2f45az6ryslkkarly45nacln4bwk6ip0yfl5s98"; depends=[rlang]; }; noia = derive2 { name="noia"; version="0.97.1"; sha256="0yldfmnb4ads4s9v9cj1js8zf1w1hxasqq6qjyzwknmvmp7kh62h"; depends=[]; }; noise = derive2 { name="noise"; version="1.0"; sha256="1a48s9vpz3nc058966lad8hydmg7z0vbzfwcf6nxc9g3c8mw4nig"; depends=[preprocessCore]; }; noisyCE2 = derive2 { name="noisyCE2"; version="1.0.0"; sha256="11cf7b472i6lsb4kh04rhp5mhj7l8ig0kxmkz05kazkr6cs41s6i"; depends=[magrittr]; }; - nomclust = derive2 { name="nomclust"; version="1.1.1106"; sha256="17hb89k72sw3ya0wm3n95mpx4vj7mpl4mzs8qwl2773dh2mcjgjq"; depends=[cluster dummies]; }; - nomisr = derive2 { name="nomisr"; version="0.4.1"; sha256="0a94s1xqij6k2kkzdzxp5837qgv9czzgl6wp0z9a95xizy3hkjsx"; depends=[dplyr httr jsonlite readr rlang rsdmx tibble]; }; + nomclust = derive2 { name="nomclust"; version="2.1.4"; sha256="02zmkcv41zbbdz62wmrg4hj7dqcp5q8bd0rwyaq57p4630lcv02m"; depends=[cluster plyr]; }; + nomisr = derive2 { name="nomisr"; version="0.4.3"; sha256="0p1vc6qzs7lyflw9jndimylv614dny27nz18xkmay2419vwh463f"; depends=[dplyr httr jsonlite readr rlang rsdmx snakecase tibble]; }; nomnoml = derive2 { name="nomnoml"; version="0.1.0"; sha256="0yzbs9by2fvwvxpl2xzjikzcjv8dvcr5v2v82ibz5jpnnsbl1ac4"; depends=[htmlwidgets png webshot]; }; nomogramEx = derive2 { name="nomogramEx"; version="3.0"; sha256="16235rwblnzn8k53817llwy2pzhnpifh6ij159nxymjm8ar9qpbp"; depends=[pracma rms]; }; - nomogramFormula = derive2 { name="nomogramFormula"; version="1.1.0.0"; sha256="1cblsxyyizsjz079qlbvhmb51n2cmxxsrh1ca7xwxc0zj6ihg02w"; depends=[rms]; }; + nomogramFormula = derive2 { name="nomogramFormula"; version="1.2.0.0"; sha256="1j6g5kndl0n2g8acwq8pn09sk0bjcsphbcd77ha1j5dnwdmy73c0"; depends=[do Hmisc rms]; }; noncompliance = derive2 { name="noncompliance"; version="0.2.2"; sha256="1lcybgj95z7lz7p26xbsdiv0vvms4ab4f8kad0pclacf1l43v0j6"; depends=[data_table Rcpp]; }; noncomplyR = derive2 { name="noncomplyR"; version="1.0"; sha256="1a9m6r9cizw42nmy24jdsrsbllg5z84fs8b239axnh1fxzskg2qy"; depends=[MCMCpack]; }; nonet = derive2 { name="nonet"; version="0.4.0"; sha256="1043vplj8libbzll172h82dfwnz2lsdba5na2g9liryg8p08h4v8"; depends=[caret dplyr e1071 ggplot2 glmnet pROC purrr randomForest rlang rlist tidyverse]; }; nonlinearICP = derive2 { name="nonlinearICP"; version="0.1.2.1"; sha256="1m9a1f0yrbjl0nx2l7r76pyi78b2bxj8v4jx92yga91f975mw6np"; depends=[caTools CondIndTests data_tree randomForest]; }; - nonlinearTseries = derive2 { name="nonlinearTseries"; version="0.2.7"; sha256="0p6gkhiajk168jw92gkfl4nf93fp6a4ya0c3gvsn9vz8r07pvkbr"; depends=[Matrix Rcpp RcppArmadillo rgl TSA tseries zoo]; }; + nonlinearTseries = derive2 { name="nonlinearTseries"; version="0.2.8"; sha256="0m1pmw1vj6qsn5iavxbcpjlx5higp2viqvah5ivxxbvf0595zy1v"; depends=[Matrix Rcpp RcppArmadillo rgl TSA tseries zoo]; }; nonmem2R = derive2 { name="nonmem2R"; version="0.2.1"; sha256="0a7h9wb8dqjgzyk4hd9ivhy90n80wrrp4zkrxnvgfvza1619qd52"; depends=[ggplot2 gridExtra lattice latticeExtra MASS mvtnorm reshape2 splines2]; }; - nonmemica = derive2 { name="nonmemica"; version="0.9.0"; sha256="1vn70qynw2j2sf0z55dr9cl0inqzdk48xybsavcivn5dbl5lzzg2"; depends=[csv dplyr encode lazyeval magrittr metaplot rlang spec tidyr xml2]; }; + nonmemica = derive2 { name="nonmemica"; version="0.9.1"; sha256="0hhrg29wjqhb5pk13scg2zgqzzhf5azvfbph0rrfdb5qkj585awd"; depends=[csv dplyr encode lazyeval magrittr metaplot rlang spec tidyr xml2]; }; nonneg_cg = derive2 { name="nonneg.cg"; version="0.1.6"; sha256="15361k0kjy1465s8pr9jb5jy22mibi37zcnza7mbfh5l66hr29kh"; depends=[Rcpp]; }; - nonnest2 = derive2 { name="nonnest2"; version="0.5-2"; sha256="1bq44qqmm59j91m0sny4xnqmxqlga4cm48qdsw8xfs3x19xwmxk6"; depends=[CompQuadForm lavaan mvtnorm sandwich]; }; + nonnest2 = derive2 { name="nonnest2"; version="0.5-3"; sha256="1mnv4pa583ir9s03h952hk40lwdywr3g88g76sk1zsa54rcmn82c"; depends=[CompQuadForm lavaan mvtnorm sandwich]; }; nonpar = derive2 { name="nonpar"; version="1.0.1"; sha256="0pxks3nga7jrcvq0pzr1axj3a9xvzky836fl7966a09ws1vff7i4"; depends=[]; }; nonparaeff = derive2 { name="nonparaeff"; version="0.5-8"; sha256="1kkn68m7cqlzx3v539cjxw3x5a2y86lvmyv2k98s87m3yvqg0gdk"; depends=[gdata geometry Hmisc lpSolve psych pwt rms]; }; nontarget = derive2 { name="nontarget"; version="1.9"; sha256="0ndqcr73sja5ks5kdahhakpz9lw3rp26imklagdv4f5agqnb608s"; depends=[enviPat mgcv nontargetData]; }; @@ -10892,8 +11025,7 @@ in with self; { nord = derive2 { name="nord"; version="1.0.0"; sha256="1gisqca85vzbqq5hs5bgqjgrjyksxj176x97kv9vv6mwll8kijl9"; depends=[ggplot2]; }; nordklimdata1 = derive2 { name="nordklimdata1"; version="1.2"; sha256="0c2hbh3qy8nrs275lxpzfgqsfgwp81m4kv0layvnjj09fcybm54x"; depends=[]; }; norm = derive2 { name="norm"; version="1.0-9.5"; sha256="01j1h412yfjx5r4dd0w8rhlf55997spgb6zd6pawy19rgw0byp1h"; depends=[]; }; - norm2 = derive2 { name="norm2"; version="2.0.2"; sha256="1bpkxgcz940mn7r62sn1w38kii93sjdxbvfayp0nhl4a2qanwxsm"; depends=[]; }; - normalp = derive2 { name="normalp"; version="0.7.0.1"; sha256="1gvbqirvb0q6c3831qqm5x7nj7rls1v7nfj7mf1nmwg5b0ljakp0"; depends=[]; }; + normalp = derive2 { name="normalp"; version="0.7.2"; sha256="0fqpz6v9v3xjmyh7mh2yvkjdn3v4d0nk93x7s0gj28kazl7137kz"; depends=[]; }; normalr = derive2 { name="normalr"; version="1.0.0"; sha256="1ahrg188vbhnrnwag0zi6lcb3g0y1mbz06sl3j1wyllq5l918cc7"; depends=[magrittr MASS purrr rlang shiny]; }; normtest = derive2 { name="normtest"; version="1.1"; sha256="073r2mwfs6c4vqh8921nlyygl0f20nhv997s0iwf00d3jckkc4pp"; depends=[]; }; normwhn_test = derive2 { name="normwhn.test"; version="1.0"; sha256="1kr45bfydk40hgdg24i2f28cdaw65hg9gmsgv4lsvvr2m3r74vi6"; depends=[]; }; @@ -10902,13 +11034,13 @@ in with self; { nortestARMA = derive2 { name="nortestARMA"; version="1.0.2"; sha256="11ala9z0snsbn1xmj9yzs4kyh9js1w19x0dnnmh5cbr9bi7aag50"; depends=[astsa]; }; nos = derive2 { name="nos"; version="1.1.0"; sha256="0hbncama8cx8q0rc56bil38fbj33z49v4d6zdkvxs6wgmmglnrfs"; depends=[dplyr gmp]; }; nose = derive2 { name="nose"; version="1.0"; sha256="17l78vmfqc22inq6zaqpnk2m91wp0nfjbbwfcpfqykf8lk9ipqna"; depends=[]; }; - nosoi = derive2 { name="nosoi"; version="1.0.0"; sha256="0g4s8324k46m8gfj1mdjiqz2cw4ips7nnzl8xyar89ylqy7gvqiw"; depends=[data_table dplyr magrittr raster reshape2 stringr]; }; + nosoi = derive2 { name="nosoi"; version="1.0.2"; sha256="1inmcbl39msfbw7f055p1qrpnpj4hi27anlbj6ig86jpkbjp5b2q"; depends=[data_table dplyr magrittr raster reshape2 stringr]; }; not = derive2 { name="not"; version="1.2"; sha256="1671j3yirzdyhb02khx1yddslyig5jlnb0bdbgdlkb21n4zwaqa4"; depends=[]; }; notifyR = derive2 { name="notifyR"; version="1.02"; sha256="0jx76ic5r1crcgg0n0yqnka0gwniflfxakh838a98j9wb11wi6h5"; depends=[RCurl rjson]; }; notifyme = derive2 { name="notifyme"; version="0.3.0"; sha256="0b6xrv6c4id7rs0dafg96pl4brn4yma5xh9wjz78ql44bg3w5s91"; depends=[dplyr httr magrittr]; }; nowcasting = derive2 { name="nowcasting"; version="1.1.4"; sha256="1nj34cbkv1xlhmcfhxs32shv00mz02rp95xj59qkq5by53sx8qwq"; depends=[corpcor DBI httr lubridate magic matlab Matrix RCurl RMySQL vars xts zoo]; }; noweb = derive2 { name="noweb"; version="1.1-2"; sha256="1h0v92l5jzgiy5rz33pan1l6rb3mykckmvn5c8jm3hhph6ipgqad"; depends=[]; }; - np = derive2 { name="np"; version="0.60-9"; sha256="1z4jcpx8bbgwslv42wrphfd1qfq965qjn0kmfxm5f6hbbycahcgy"; depends=[boot cubature quadprog quantreg]; }; + np = derive2 { name="np"; version="0.60-10"; sha256="06h8k0kdv5s258jr6s08fabvlycrbs7iq34jk2f2hfmqm2y4nyx2"; depends=[boot cubature quadprog quantreg]; }; npExact = derive2 { name="npExact"; version="0.2"; sha256="055wm5lcj98wb71lqp2zdyl8kkwvi6lwmnaylynvr907xqabaqvd"; depends=[]; }; npIntFactRep = derive2 { name="npIntFactRep"; version="1.5"; sha256="14ms66ppzb4jjsa3fparic6gdn913f6wv2ccjyb02j1ahs4iaa4g"; depends=[ez plyr]; }; npROCRegression = derive2 { name="npROCRegression"; version="1.0-5"; sha256="09ngfj0bd9cp19lpwsbknp2y71x36k03ph84bmf67wm1q2na7f93"; depends=[lattice]; }; @@ -10920,7 +11052,7 @@ in with self; { 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-11"; sha256="0zkf01rv065x6sg8b8yal6125wbvjzaris5l9ghn2279q1fwdqz3"; depends=[]; }; - npcure = derive2 { name="npcure"; version="0.1-4"; sha256="0fdl903akry53cbk3cpmsfgzj71vmpz9qksk1dzrg8yzsql37mf6"; depends=[permute zoo]; }; + npcure = derive2 { name="npcure"; version="0.1-5"; sha256="0hf6w8w76qmjdsd6zgg85jj5ypmmg1a1ryzqwnxcypsdjxaq539z"; depends=[permute zoo]; }; nph = derive2 { name="nph"; version="2.0"; sha256="037vh3x3zlgg7jcbbwvcrlhm38d17zgz0m6d54y84mcclzzyc746"; depends=[ggplot2 mvtnorm]; }; nplplot = derive2 { name="nplplot"; version="4.5"; sha256="1dpbs0jb34gv0zj528357z1j2pwahjbp04rm7jir6qk0jhyaxxgh"; depends=[]; }; nplr = derive2 { name="nplr"; version="0.1-7"; sha256="1h3qv9dlw2gx8km3slyvrl588nif1n87df8xwmm6p75ziqhn2f56"; depends=[]; }; @@ -10933,7 +11065,7 @@ in with self; { npphen = derive2 { name="npphen"; version="1.1-0"; sha256="0pbf9sqdapl5q09g1hj5hi4j2wigrd0b6s0gbv1gx4wn68alrals"; depends=[ks lubridate raster rgdal rts snow]; }; npreg = derive2 { name="npreg"; version="1.0-1"; sha256="0fsx71hc26zc26rwnvmmbrcy970xq92s63zllfa2q81c3jyf2qsh"; depends=[]; }; npregfast = derive2 { name="npregfast"; version="1.5.1"; sha256="0s9ci3nybzwykrgi9z2rqp6l15mqbxf759ks0clvkbm7wxv3whk5"; depends=[doParallel foreach ggplot2 mgcv sfsmisc shiny shinyjs wesanderson]; }; - nprobust = derive2 { name="nprobust"; version="0.2.1"; sha256="086x6p4ipd910nnm2whsvbjkvmjny69ryh0lw0j5jjq2ddah5p1i"; depends=[ggplot2 Rcpp RcppArmadillo]; }; + nprobust = derive2 { name="nprobust"; version="0.3.0"; sha256="0nb2ca6ljg1c2jmjhxrpfynrvmjzp5zr8dxwyhdhzl0smrkjybj4"; depends=[ggplot2 Rcpp RcppArmadillo]; }; nproc = derive2 { name="nproc"; version="2.1.5"; sha256="1p5wjz0rafg27fsl48l9pmki3px1k0pav3ignz4swik5i1nhnc8w"; depends=[ada e1071 glmnet MASS naivebayes randomForest ROCR tree]; }; nprotreg = derive2 { name="nprotreg"; version="1.0.0"; sha256="06n82i5m7sgfj759zdwwh8fqybkbchvnaaqcds64m6hbms592bh3"; depends=[expm]; }; npsf = derive2 { name="npsf"; version="0.5.2"; sha256="0iz4dh2cv1bi90wdf08x70rdm44xmzblck69rlg7vnsb6n2q2is9"; depends=[Formula randtoolbox Rcpp sfsmisc]; }; @@ -10945,7 +11077,7 @@ in with self; { npsurvSS = derive2 { name="npsurvSS"; version="1.0.1"; sha256="0k9xvxii5527vynf7yy50j7z4jhxgk5ydhdcaaygm9ynx5yq14ip"; depends=[]; }; nptest = derive2 { name="nptest"; version="1.0-0"; sha256="13h93sx5fsbfiy3q88j4bl0p3hwqzi8l4ab0r0qha78dzd6skq2v"; depends=[]; }; nricens = derive2 { name="nricens"; version="1.6"; sha256="0fpgp6k3mhb0qxbx6248k9bscnmlzwj70mqh631a1nc4cpdjvw3q"; depends=[survival]; }; - nsRFA = derive2 { name="nsRFA"; version="0.7-14"; sha256="0sd3br2a5jf6mqbxk8s2i7px9vi9bk3pl8bd5884k40xqcj77irs"; depends=[]; }; + nsRFA = derive2 { name="nsRFA"; version="0.7-15"; sha256="004dm143v032b80knpz7pj3z71lci7vgd6hz1zz22rpfg27ghgdd"; depends=[]; }; nsROC = derive2 { name="nsROC"; version="1.1"; sha256="1fi7k61fja98kpn528jprjdycwz01rnqm368m82anxh21k7q4s1m"; depends=[sde survival]; }; nsapi = derive2 { name="nsapi"; version="0.1.1"; sha256="06xf2p6f911vwpzky47r35fjgjvlhp13p9pf1zlvjrv66kdw8vbp"; depends=[crul xml2]; }; nsarfima = derive2 { name="nsarfima"; version="0.1.0.0"; sha256="0iw1daha6c2l4zmqa0m917kgbx3d7mh7bhwbrsyxmvr5qs81drhk"; depends=[]; }; @@ -10960,18 +11092,15 @@ in with self; { nsprcomp = derive2 { name="nsprcomp"; version="0.5.1-2"; sha256="1zlc1ximx96f235c0l8qfs6vbp1kpnbf943wxsfahnnlnxvwi59f"; depends=[]; }; nsrr = derive2 { name="nsrr"; version="0.1.3"; sha256="11g0xgznd2n29cc9zxr0rrkqhxhjnp277gb7z871kgk6qnjswpwv"; depends=[digest httr jsonlite]; }; nucim = derive2 { name="nucim"; version="1.0.6"; sha256="0bw9a2xz2w5jlr2qlbia6jfm2yp09n3gzg8a630p1ks75xvlmkbx"; depends=[bioimagetools EBImage fields stringr]; }; - nullabor = derive2 { name="nullabor"; version="0.3.5"; sha256="0hnrawf8s2g0xjc9kh2p3pbdnbai7q71z7arab5mnrz6qbiyym34"; depends=[dplyr forecast fpc ggplot2 magrittr MASS moments purrr rlang tibble tidyr tidyverse tsibble]; }; + nullabor = derive2 { name="nullabor"; version="0.3.9"; sha256="19nfmsnzndg9pdjg7m9w4vm4c3209ny52cpjdhmmhggvf7dxaiyg"; depends=[dplyr forecast fpc ggplot2 magrittr MASS moments purrr rlang tibble tidyr tsibble viridis]; }; numDeriv = derive2 { name="numDeriv"; version="2016.8-1.1"; sha256="0idk02pqkziik932bd8k72d1q775g1is3m4bc861pcxfz6gx3i6q"; depends=[]; }; numGen = derive2 { name="numGen"; version="0.1.1"; sha256="1y41wq31r8126dz1sj23smq2k6v9yqczq4ddgzqb73dsrx9dmmc0"; depends=[]; }; - numKM = derive2 { name="numKM"; version="0.1.0"; sha256="0pnwb7skp5jx5ibgfkympq59m9sf71gvk5zc0fwik539vrzfykdf"; depends=[survival]; }; + numKM = derive2 { name="numKM"; version="0.2.0"; sha256="0g5jw12fmfc6nl6a3ghpslkjd2d7pbihl70sks35r7dalmr6ihzk"; depends=[survival]; }; numOSL = derive2 { name="numOSL"; version="2.6"; sha256="03h1p56650x4my5vq5jlmjsz5xj0w2j75qfr08rh7nr38dwgp1k8"; depends=[]; }; numbers = derive2 { name="numbers"; version="0.7-5"; sha256="1dz23rmjzdns4av28kk8bc9psj71q2bpcgm1m7sxnyzcxpm8hczc"; depends=[]; }; numbersBR = derive2 { name="numbersBR"; version="0.0.2"; sha256="0ihxlny745gpz1ngq862rydn1zwn8zni1xw9mmgw8hkylsrnjfq8"; depends=[stringr]; }; numform = derive2 { name="numform"; version="0.5.0"; sha256="1c9vhzm4rjh8b5bkzkv1r9j2y1iqndq9ndandix28wdgn2v6lzv6"; depends=[glue]; }; nutriNetwork = derive2 { name="nutriNetwork"; version="0.1.1"; sha256="0ya95h88jkiwc7cg7ic8bmyd7b0lgnhxrywwqvi2j6m6nbvvaxzy"; depends=[glasso huge igraph Matrix tmvtnorm]; }; - nutshell = derive2 { name="nutshell"; version="2.0"; sha256="1v11g5wqyxnj29b7akl0cwa34hcqs79ijbiv735pg3df4ggyrzvm"; depends=[nutshell_audioscrobbler nutshell_bbdb]; }; - nutshell_audioscrobbler = derive2 { name="nutshell.audioscrobbler"; version="1.0"; sha256="10fvc5d22gnfb0bkgbww48f0vvcaja96g5gfv85kap939j11172j"; depends=[]; }; - nutshell_bbdb = derive2 { name="nutshell.bbdb"; version="1.0"; sha256="19c4047rjahyh6wa6kcf82pj09smskskvhka9lnpchj13br8rizw"; depends=[]; }; nvctr = derive2 { name="nvctr"; version="0.1.1"; sha256="0hjrimg0hvwgkx2hbln6k8z0f2bp9kln7mxxh623qjp0hg4mcvcn"; depends=[magrittr pracma]; }; nvmix = derive2 { name="nvmix"; version="0.0-3"; sha256="0dvx21nfp82s7bk5vd9xxp9979w4mq8v1hx1zxa97sv2xr4g2m5y"; depends=[Matrix qrng]; }; nws = derive2 { name="nws"; version="1.7.0.1"; sha256="1fn92n6brjhh8hpvhax7211cphx2cn0rl99kjqksig6z7242c316"; depends=[]; }; @@ -10982,7 +11111,6 @@ in with self; { oaColors = derive2 { name="oaColors"; version="0.0.4"; sha256="040sdqrk9dciylnnrrshlj06s9qhvngii9shx1p8412ip7mk8r1m"; depends=[MASS RColorBrewer]; }; oaPlots = derive2 { name="oaPlots"; version="0.0.25"; sha256="0c5ig1ar02vg38pjjmp3gd53ij1j7pzajs0zrlfajz141qkv2ysr"; depends=[ggplot2 oaColors]; }; oai = derive2 { name="oai"; version="0.3.0"; sha256="1ipw9bq3ra66d1ddj1rylyyd20mlcb2i7phzhywra53s1fdifq1g"; depends=[httr plyr stringr tibble xml2]; }; - oak = derive2 { name="oak"; version="0.2.3"; sha256="1119llsv9pik6fpw3zhiz6xnqc2svsf0dfwcg9iywdjclv4bqqbs"; depends=[foreach purrr R6 rlang rlist rstudioapi]; }; oaqc = derive2 { name="oaqc"; version="1.0"; sha256="1rc0l79xygmr2rp5sjadzigbj65a13z5xlvrxzy26cl0wsxwhmjf"; depends=[]; }; oasis = derive2 { name="oasis"; version="3.0.4"; sha256="1h1w46rbkbsjvh3fjniy3v7y30r2vf1kiqs807kavf0bpb6a1202"; depends=[fslr mmand neurobase oro_nifti]; }; oaxaca = derive2 { name="oaxaca"; version="0.1.4"; sha256="12w5l2a8i2964rxy9km2srlycx35y7ia8p07ra7gsxr4h8156z3c"; depends=[Formula ggplot2 reshape2]; }; @@ -10998,15 +11126,17 @@ in with self; { 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]; }; occ = derive2 { name="occ"; version="1.1"; sha256="1aka29qqwbd494kvi15yyyqkb9hks4ky2gcvykxhx2drm2fnsn4g"; depends=[]; }; - oce = derive2 { name="oce"; version="1.1-1"; sha256="0hwfnpb6q6pmckzgh67ryvqd1jkrzzhn187x1655rnmkmp9zis1c"; depends=[gsw Rcpp testthat]; }; - oceanis = derive2 { name="oceanis"; version="1.0.6"; sha256="16sww5552xx04np8dxlqlhn1qzhjdmwd1z7b8dp9pskxbr9fhdb4"; depends=[classInt dplyr DT foreign ggplot2 leaflet leaflet_extras lwgeom mapview munsell readODS sf sfc shiny shinyBS shinyjs shinythemes stringr tidyr units xlsx]; }; - oceanmap = derive2 { name="oceanmap"; version="0.1.0.1"; sha256="0cdv5rizrlbzz1ifcqh726kmki0j68w829k9f0cfnckmh3rwj2y6"; depends=[abind extrafont fields lubridate mapdata maps maptools ncdf4 plotrix raster sp]; }; + ocd = derive2 { name="ocd"; version="1.0"; sha256="0r14w09wzyxp685jbzqj3dirnhsq106d23igl1jd5xpwbj2192n5"; depends=[]; }; + oce = derive2 { name="oce"; version="1.2-0"; sha256="18ls8c8ia00dn9f9lxk01mvwqmxd1ilx1d7y59d1nixd40mjy1wr"; depends=[gsw Rcpp testthat]; }; + oceanis = derive2 { name="oceanis"; version="1.0.7"; sha256="0vlac6clq8902x3s6abl9ljwwk5a5gzxs66hij0080lj28l1wr82"; depends=[classInt dplyr DT ggplot2 leaflet leaflet_extras lwgeom mapview sf shiny shinyBS shinyjs shinythemes stringr units]; }; + oceanmap = derive2 { name="oceanmap"; version="0.1.1"; sha256="06h4yxqcn3rjr3m2n82w128z110a4k5rg6msrbd0gcqksxc4vd2v"; depends=[abind extrafont fields lubridate mapdata maps maptools ncdf4 plotrix raster sp]; }; oceanwaves = derive2 { name="oceanwaves"; version="0.1.0"; sha256="0izgnqjji3xrvv8xbpsdbrx53wdb3rg3045xx6gcknfl2fj5iky7"; depends=[bspec ggplot2 signal]; }; - ocedata = derive2 { name="ocedata"; version="0.1.5"; sha256="0rs3nzacvg5mbbmbhcj8g9ikjlw26x2mka7lp644l17kgmzzynh6"; depends=[testthat]; }; + ocedata = derive2 { name="ocedata"; version="0.1.6"; sha256="0rf02bx7bb00ipp23jbpj2xdmj15xzi54qw3hms3ccghmaj40a28"; depends=[testthat]; }; ockc = derive2 { name="ockc"; version="1.0"; sha256="0chzrs3ipa2518r4d35z4fxffgq12p1mwj0hzkxw19gdgq6aa8s7"; depends=[flexclust modeltools]; }; oclust = derive2 { name="oclust"; version="0.1.0"; sha256="005ml6vhi9rw6js2v4f1dc2ci8kcd7iwrkgbs4c1qxc836ygq0yx"; depends=[entropy mclust]; }; ocomposition = derive2 { name="ocomposition"; version="1.1"; sha256="0fk8ia95yjlvyvmjw7qg72piqa40kcqq9wlb3flc6a81pys1ycb5"; depends=[bayesm coda]; }; ocp = derive2 { name="ocp"; version="0.1.1"; sha256="0q52s8j3z3xwnma3sxx6019qxid66bf0a43w4g8xjagplwps57dx"; depends=[]; }; + ocs4R = derive2 { name="ocs4R"; version="0.1"; sha256="1sm2fl503ky4pxv9873zykidb56f7dygq1xckjsh0d7m78n4gzx5"; depends=[curl httr jsonlite openssl R6 XML]; }; odbc = derive2 { name="odbc"; version="1.2.2"; sha256="1p30n1f6yfx80rk29l94asdi0chk4c7h6pp09aq9bbsq9g8109dq"; depends=[BH bit64 blob DBI hms Rcpp rlang]; }; odds_converter = derive2 { name="odds.converter"; version="1.4.8"; sha256="09s8pg55gpsxmrbimzg5rsr1n07la93781sar6vab5p9zn9zxgx4"; depends=[]; }; odds_n_ends = derive2 { name="odds.n.ends"; version="0.1.1"; sha256="0kgdv4m14h4a16b0k2s2qjyjn0kxk5sf4qkbi6ikm6kqdh5ashp4"; depends=[MASS]; }; @@ -11015,11 +11145,11 @@ in with self; { odeintr = derive2 { name="odeintr"; version="1.7.1"; sha256="0wfb5lgv10p0qyfbn9hdg14bda37v43lpgbwv6nbw63zzbsbazqi"; depends=[BH Rcpp]; }; odin = derive2 { name="odin"; version="1.0.1"; sha256="1m1rqlh9z6hpna6qhyxhavqph3j66hbd2b5md5ha2hrbjq93yynm"; depends=[cinterpolate crayon deSolve digest jsonlite R6 ring]; }; odk = derive2 { name="odk"; version="1.5"; sha256="0fcnr4c1clwx1sk6fgg4cx506gdi90n2h05g0i47p4s5bra0qwwl"; depends=[gsheet openxlsx]; }; - 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=[]; }; + odpc = derive2 { name="odpc"; version="2.0.2"; sha256="0wmra56w9k1bp27lhv6ssz400ggzmggl7l32vxkhynnxr0aphx7c"; depends=[doParallel foreach forecast Rcpp RcppArmadillo]; }; + odr = derive2 { name="odr"; version="1.0.2"; sha256="0dj5piyd6h92q6agv8yvzky3qpxjn6zpgvf502hf0n6k9gx6kdpl"; depends=[]; }; + oenb = derive2 { name="oenb"; version="0.0.1"; sha256="1x1jlqp6r27c4gb7wafzpmh5rq6yq61a2d395r5lsmv2g5jb4biz"; depends=[dplyr XML]; }; ofGEM = derive2 { name="ofGEM"; version="1.0"; sha256="0xdkl8k12an9pdy6i5nay4m2iakrwsp0lr3zl8gphii75j0ywz7k"; depends=[CompQuadForm forestplot MASS]; }; - officer = derive2 { name="officer"; version="0.3.6"; sha256="1i6jmnbkx7gd0qyf6akhizmxp7y1dh3h7a886mcbmrzka9d60zh4"; depends=[base64enc digest htmltools magrittr R6 Rcpp rlang uuid xml2 zip]; }; - offlineChange = derive2 { name="offlineChange"; version="0.0.2"; sha256="1d8jm8mm8g1fcbffk697qap58dcw3yyvrm9daviy42jsz59nbsxs"; depends=[Rcpp]; }; + officer = derive2 { name="officer"; version="0.3.8"; sha256="0xhx5n6qksyh2s9hvwhnc8y0hn362asc5y94ld06snad786hz0rw"; depends=[magrittr R6 uuid xml2 zip]; }; oglmx = derive2 { name="oglmx"; version="3.0.0.0"; sha256="13axmhbqhv4kkcdsdmp9r7p0d0kyqlsaqgyyllbkxlxb4hfz79b6"; depends=[maxLik]; }; ohenery = derive2 { name="ohenery"; version="0.1.1"; sha256="0i7cc110c30y7dm86srh2xkikkmlr28mvy0kkjxywxmiwnrsmzjq"; depends=[dplyr magrittr maxLik Rcpp]; }; ohtadstats = derive2 { name="ohtadstats"; version="2.1.1"; sha256="0hkjs322vii1dsminlkwpwi12sc9pd88jag7p4dmy6nfw2hh2d69"; depends=[lattice]; }; @@ -11027,20 +11157,24 @@ in with self; { okcupiddata = derive2 { name="okcupiddata"; version="0.1.0"; sha256="1l04rr4yr73a6q2am9ylyr5prf347hkf2jx735w78rsb6472kbaq"; depends=[]; }; okmesonet = derive2 { name="okmesonet"; version="0.1.5"; sha256="1kzyzmg702ayzphn9jsk64m51mlnz37ylxiwq5gsr23vaiida680"; depends=[plyr]; }; olctools = derive2 { name="olctools"; version="0.3.0"; sha256="1gbchwynvmryarz32f24v56kj57h7x6nrrm878fkjkpq140cqwzz"; depends=[Rcpp]; }; + ollggamma = derive2 { name="ollggamma"; version="1.0.2"; sha256="1990hr9gww636xr4gkvc816hd0pc78nw3ypbzflkh5g3pmsn7bc2"; depends=[]; }; olr = derive2 { name="olr"; version="1.1"; sha256="1l6m2gbglh8idy4k2q23qgfb7in1a6pnwiji1gbygfan6paw4xza"; depends=[plyr]; }; - olsrr = derive2 { name="olsrr"; version="0.5.2"; sha256="13qampcc07qfjj4r3ira0m1j2wgnrkf5p1wswr9g814azhm52haz"; depends=[car checkmate cli clisymbols crayon dplyr ggplot2 gh glue goftest gridExtra magrittr nortest purrr Rcpp recipes rlang shiny stringr tibble tidyr]; }; + olsrr = derive2 { name="olsrr"; version="0.5.3"; sha256="0rh1jb0z0ypspzcp4vbpzjz960yj76myk2j4zb1vi9gnnj3clw8y"; depends=[car data_table ggplot2 goftest gridExtra nortest Rcpp]; }; omd = derive2 { name="omd"; version="1.0"; sha256="0s1wcgivqapbkzjammga8m12gqgw113729kzfzgn02nsfzmsxspv"; depends=[]; }; omics = derive2 { name="omics"; version="0.1-5"; sha256="1y2x33mfgq98nglhvpr1wq1v6nfiq4njy2yac47x72rpwxsj9vb1"; depends=[lme4 pheatmap]; }; + omicwas = derive2 { name="omicwas"; version="0.3.1"; sha256="14vx9mhy51ma05m85plsnx53rhq1rd4nw9709sf8ibc55gdrfg5l"; depends=[broom data_table dplyr ff glmnet magrittr MASS matrixStats PCDimension R_utils ridge rlang sva tidyr]; }; ompr = derive2 { name="ompr"; version="0.8.0"; sha256="1nmd5wa1g2xzmwqfqf882bxcrmkxbb5b414cbbzvmqzfs34yk6bl"; depends=[data_table lazyeval Matrix progress Rcpp rlang]; }; ompr_roi = derive2 { name="ompr.roi"; version="0.8.0"; sha256="1cbrchvpd31lxpxvw2l3q9k5jmffarb1shca8kwm76y5a6zxxq63"; depends=[Matrix ompr ROI slam]; }; omu = derive2 { name="omu"; version="1.0.2"; sha256="03mj5xk447gadsnvqrm97cjcyfq4xzkgc46kw85gishv7w9qmqrk"; depends=[dplyr ggfortify ggplot2 KEGGREST magrittr plyr reshape2 stringr tidyr]; }; oncomodel = derive2 { name="oncomodel"; version="1.0"; sha256="1jyyq9znffiv7rg26mjldbwc5yi2f4f8npsd2ykhxyacb3g96fp1"; depends=[ade4]; }; - oncrawlR = derive2 { name="oncrawlR"; version="0.1.8"; sha256="0l7b3gx21jli97jq0i87bkp01v1b4xmmh9k4zjhdij6412rv0rfh"; depends=[caret DALEX dplyr e1071 formattable fs ggplot2 htmltools jsonlite pdp pROC RCurl readr rlang rlist scales sparkline tidyr webshot xgboost]; }; + oncrawlR = derive2 { name="oncrawlR"; version="0.2.0"; sha256="0cm26diaf3jlzfrpgh13q0hakakmj6vy41wk9z0w81az4jcg9sn9"; depends=[caret DALEX dplyr e1071 formattable fs ggplot2 htmltools jsonlite pdp pROC RCurl readr rjson rlang rlist scales sparkline tidyr webshot xgboost]; }; onehot = derive2 { name="onehot"; version="0.1.1"; sha256="1cdsz007wr054k5phvihhg4qx0fc039k2s6484m92kws8mb2ziix"; depends=[]; }; onelogin = derive2 { name="onelogin"; version="0.2.0"; sha256="06p3a8kaxmvsj8nn7dy8w6wv1jjw67is991hqg9q0fa20ifym3dl"; depends=[glue jsonlite magrittr R6 safer tibble]; }; - onemap = derive2 { name="onemap"; version="2.1.2"; sha256="142yasn8pyd046d8s0k3i4ynmpq7rh6v2vjdnj88yn99zshaxfig"; depends=[ggplot2 MDSMap plotly Rcpp reshape2]; }; + onemap = derive2 { name="onemap"; version="2.1.3"; sha256="0fwkr845zz0j8ccrwpksb28lly1rsgj3603ak1aqqgmlx6481p08"; depends=[ggplot2 MDSMap plotly Rcpp reshape2]; }; + onemapsgapi = derive2 { name="onemapsgapi"; version="1.0.0"; sha256="11w3xkjxhjf0b78hfjxjk650giswaf1js471backz4pcb97gaigl"; depends=[dplyr furrr future httr purrr rlang stringr tidyr]; }; onewaytests = derive2 { name="onewaytests"; version="2.4"; sha256="1rsamf6mwpah02zwpv270sn17aaav0c030wlsv90k2awmkms2ka6"; depends=[car ggplot2 moments nortest]; }; onion = derive2 { name="onion"; version="1.2-7"; sha256="17jx7saxcsahyyivln4v9fzzcmidy6ygjd9n81skv5jpr491zkgk"; depends=[]; }; + onlineCOV = derive2 { name="onlineCOV"; version="1.3"; sha256="04ikvsd76f6xhja7djyv433m88lfj2vf0y9qi6x1s4i9kh8xkbz9"; depends=[]; }; onlinePCA = derive2 { name="onlinePCA"; version="1.3.1"; sha256="08qivsfnwz5vp089lv9czsaz3nfi42kn9yhgzf27dji18y2xscic"; depends=[Rcpp RcppArmadillo RSpectra]; }; onlineVAR = derive2 { name="onlineVAR"; version="0.1-1"; sha256="01z2d91mbdjvwwiqjq1dbqp50jbc9v6d7nw4gs7d1abhsqyiqa13"; depends=[lattice]; }; onls = derive2 { name="onls"; version="0.1-1"; sha256="0m7pnlzkqwzi6jncjzxzfvznipd4wg03zd9fc0ymwm9jvhm4p14g"; depends=[minpack_lm]; }; @@ -11048,72 +11182,74 @@ in with self; { ontologyIndex = derive2 { name="ontologyIndex"; version="2.5"; sha256="127hlf0z5fmbgnq4p9h8nvn6p72d2fpcn846zzb99s213421jnry"; depends=[]; }; ontologyPlot = derive2 { name="ontologyPlot"; version="1.4"; sha256="0sj1jg9lr1w3ahzw7fj86vp2bnvf4nq0x3hiqb3hzngwyj9bykpn"; depends=[ontologyIndex paintmap Rgraphviz]; }; ontologySimilarity = derive2 { name="ontologySimilarity"; version="2.3"; sha256="1rh3cpj3r82xp4gqvspvgwwi3a29gyi0azrf4r1nshhi8qdx9avw"; depends=[ontologyIndex Rcpp]; }; + oolong = derive2 { name="oolong"; version="0.3.4"; sha256="1zhgk9y1iy90kn6kwx2r80jy6fymgkd59c03xx936sijk0wnpwrq"; depends=[cowplot digest dplyr ggplot2 irr miniUI purrr quanteda R6 shiny stm text2vec tibble]; }; oompaBase = derive2 { name="oompaBase"; version="3.2.9"; sha256="1cmw2s5dznmv675484jgvkzgvi6vhg0zbxsq6zhpqsisf672pjhl"; depends=[cluster]; }; oompaData = derive2 { name="oompaData"; version="3.1.1"; sha256="0by9qfxlx6fdmp12qnphlli5hdn5balvx4ckg64fw6vwa291g7b0"; depends=[]; }; opalr = derive2 { name="opalr"; version="1.3.0"; sha256="029sxy31in377p7s25y601vmdhcxxs6cn36xvqhkxcx15j96mprp"; depends=[httr jsonlite mime progress xml2]; }; opart = derive2 { name="opart"; version="2019.1.0"; sha256="0yw4vlip4whhvp23yjr57h5j0ii8ighp77g3fjjzr3l56slmrmcz"; depends=[]; }; openCR = derive2 { name="openCR"; version="1.4.1"; sha256="046ijw5ss8nb0m11p7r682zi7242m0ljydnsrr3gwrnmc4ayk6xv"; depends=[abind MASS nlme plyr Rcpp RcppParallel secr stringr]; }; - openEBGM = derive2 { name="openEBGM"; version="0.8.2"; sha256="0v6jr1yry937knvkrn448rkilwfl7w90169lm5vnp53ds6fhh7bj"; depends=[data_table ggplot2]; }; + openEBGM = derive2 { name="openEBGM"; version="0.8.3"; sha256="120lp7fy6abj6f8g6naq4018d0dfzz6bq3dlh0xdhd4iclb7pplv"; depends=[data_table ggplot2]; }; openNLP = derive2 { name="openNLP"; version="0.2-7"; sha256="15yl74wv6w1d2wwpn1xlkkpam3c62977gnqal651fv623v29gg35"; depends=[NLP openNLPdata rJava]; }; openNLPdata = derive2 { name="openNLPdata"; version="1.5.3-4"; sha256="0j45rh9qki8r5wavaysrfsvb3wc3x8jjicqff2yi0r34j58xvlv8"; depends=[rJava]; }; openSTARS = derive2 { name="openSTARS"; version="1.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]; }; + openVA = derive2 { name="openVA"; version="1.0.9"; sha256="0pzcnyq45mb7041jx0krws65sxq4wldx01aafnsxqp1p5ly13y3p"; depends=[cli crayon ggplot2 InSilicoVA InterVA4 InterVA5 Tariff]; }; openadds = derive2 { name="openadds"; version="0.2.0"; sha256="1jb8zd3rpxfkjkg895iab6m4cfi53p5vy3nnpjkgq7ym6499qjcv"; depends=[crul dplyr jsonlite maptools rappdirs readr tibble xml2]; }; - openair = derive2 { name="openair"; version="2.7-0"; sha256="1h2hyk93xvcw3i86k1kw7w9y2s39l6xnj7hjqp3wawgm4nnsr5kp"; depends=[cluster dplyr hexbin lattice latticeExtra lubridate mapproj MASS mgcv purrr Rcpp readr rlang tidyr]; }; - openblender = derive2 { name="openblender"; version="0.3.4"; sha256="0lf6gm1kzslqkrps2wasavfqwaz80q67jjrzf38m1dls0nwzvh1x"; depends=[httr jsonlite xml2]; }; + openair = derive2 { name="openair"; version="2.7-2"; sha256="1bbhnbg9v2n3g4cnd3ryivdbid9kdcd45m0rfxr0hxbcq3a8gwmk"; depends=[cluster dplyr hexbin lattice latticeExtra lubridate mapproj MASS mgcv purrr Rcpp readr rlang tidyr]; }; + openblender = derive2 { name="openblender"; version="0.5.71"; sha256="0imk1pam0rcdwclnz66n4bvwj94l6dc63fayar3ampd8j2mxpa4q"; depends=[httr jsonlite]; }; opencage = derive2 { name="opencage"; version="0.1.4"; sha256="1lqs38lml73axsjlsjkmcsb2irgs40mjrx2cn3k0bjb63qyb9hf5"; depends=[dplyr httr jsonlite memoise]; }; - opencastR = derive2 { name="opencastR"; version="0.1.2"; sha256="0fnp4bsr35knff7q19jqmlwdnfh9qzk2zsvg92y3pg1g64fmxazv"; depends=[httr jsonlite]; }; - opencpu = derive2 { name="opencpu"; version="2.1.5"; sha256="1s2jzssiqcf4n6zqb1hj78zpm6rh13r6vbk0drydc6iwqdhg302h"; depends=[brew curl evaluate httpuv jsonlite knitr mime openssl protolite rappdirs remotes sys webutils zip]; }; + opencastR = derive2 { name="opencastR"; version="0.1.3"; sha256="1ljn7bzrqc2sgah1a6q2g9hi38nm8davhdc2vyzx7d40z7ysfpas"; depends=[httr jsonlite]; }; + opencpu = derive2 { name="opencpu"; version="2.1.6"; sha256="0wv357288j3wl8mgm8yr7yzm2z0hzdg7k1056smhxjlrb42bww95"; depends=[brew curl evaluate httpuv jsonlite knitr mime openssl protolite rappdirs remotes sys webutils zip]; }; opencv = derive2 { name="opencv"; version="0.1"; sha256="0m649g6k6cgxnljjx8czypjawbyzx7xjcg32wddxkrgi2b236lwh"; depends=[magrittr Rcpp]; }; - opendatatoronto = derive2 { name="opendatatoronto"; version="0.1.1"; sha256="1rabbpq1jmihrm5wz8i5pkxfhpbm8x6dk3bqj56fnkzqkmg6zwjj"; depends=[ckanr geojsonsf magrittr readxl sf tibble xml2]; }; + opendatatoronto = derive2 { name="opendatatoronto"; version="0.1.3"; sha256="1rcdv2zk3ckrp2fig71lgzw5i06767qqlrdj80r4b522nxx7npyn"; depends=[ckanr curl magrittr readxl sf tibble xml2]; }; opendotaR = derive2 { name="opendotaR"; version="0.1.4"; sha256="17cygsw3nkg6zincfrcdh1509rlz3n5zrv9wvv7mjngm61sn79nf"; depends=[dplyr jsonlite lubridate]; }; openintro = derive2 { name="openintro"; version="1.7.1"; sha256="059azlasdkmp8f54qpjf3mq5dyqakw0dgx0kx85wfdmhq38zal5n"; depends=[]; }; openssl = derive2 { name="openssl"; version="1.4.1"; sha256="1ihz2qi33lhngl19xdanq0pbmfaacy63794mg8ll7z2lab3yryzp"; depends=[askpass]; }; opentraj = derive2 { name="opentraj"; version="1.0"; sha256="13nqal96199l8vkgmkvl542ksnappkscb6rbdmdapxyi977qrgxk"; depends=[doParallel foreach maptools openair plyr raster reshape rgdal sp]; }; - opentripplanner = derive2 { name="opentripplanner"; version="0.2.0.4"; sha256="15r6n3bkmiwir30v82ajzl2drhw2x2shjnwjs3ddqkczak2v4q8c"; depends=[checkmate dplyr geodist googlePolylines httr jsonlite pbapply sf]; }; + opentripplanner = derive2 { name="opentripplanner"; version="0.2.0.8"; sha256="0irk885r8s6xq0krnmb1ylz29z3dg9ypj7k7pf0lcxd5l74kh4jm"; depends=[checkmate dplyr geodist googlePolylines httr jsonlite pbapply sf]; }; openxlsx = derive2 { name="openxlsx"; version="4.1.4"; sha256="1mwxldw9i9nfksx1i6h1kfs7vmsz9fgyllbsipar4vnfyqhqp8q7"; depends=[Rcpp stringi zip]; }; + opera = derive2 { name="opera"; version="1.1"; sha256="1nvm7a1g0pzzlpyk7g5plys1byl4xq2wz59hqys5gxiq0y5sgqwm"; depends=[]; }; operator_tools = derive2 { name="operator.tools"; version="1.6.3"; sha256="1v4dg7xhz24dnp0zxn815x1405ig64ibii6y40la1gvmzcc41dz5"; depends=[]; }; operators = derive2 { name="operators"; version="0.1-8"; sha256="0zgcv2q46qyqv4dhbd33s4044zjw38w8dqfpzs0c1lxjpkil3dnx"; depends=[]; }; - oppr = derive2 { name="oppr"; version="0.0.4"; sha256="1wxdrcchg8izdr4zdvq8dpgz5n2m4b5w4lavmvd3vhvjs6i6bb60"; depends=[ape assertthat cli ggplot2 lpSolveAPI magrittr Matrix proto Rcpp RcppArmadillo RcppProgress tibble tidytree uuid viridisLite]; }; + oppr = derive2 { name="oppr"; version="1.0.1"; sha256="17jmwag893ccl9x9xixig91yamb8xl8g8ahbdrhcnrr8jnxnswi2"; 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]; }; - optCluster = derive2 { name="optCluster"; version="1.2.0"; sha256="144pk0iqng5qqpq40r65hakpqllnpd184wpgf4j9za1mkwb4il45"; depends=[cluster clValid gplots kohonen MBCluster_Seq mclust RankAggreg]; }; + optCluster = derive2 { name="optCluster"; version="1.3.0"; sha256="0vzdd9awxli0zzyh2xb7j7wxza3fz5awyz6bjwf13qbjrrq43q2q"; depends=[cluster gplots kohonen MBCluster_Seq mclust RankAggreg]; }; optDesignSlopeInt = derive2 { name="optDesignSlopeInt"; version="1.1"; sha256="0vpm4359rq5v231k63vgaac6iv2ybfkcpy59n86djb710b3h2qcn"; depends=[MCMCpack neldermead]; }; optR = derive2 { name="optR"; version="1.2.5"; sha256="0q7jf4m0gzm11izl5lff17pvr855smqmc6zzi1bc7m6h3z865l32"; depends=[]; }; optband = derive2 { name="optband"; version="0.2.1"; sha256="1rv4r7h7x3xipav917cz9bcr6nqjzbinfrqxv8mcls9gdl9ha3y9"; depends=[LambertW]; }; optbdmaeAT = derive2 { name="optbdmaeAT"; version="1.0.1"; sha256="1y1mvcyjihpj1wgjmifhmd10717wr1srp7h87azs4gfypgsiqchn"; depends=[igraph MASS Matrix]; }; optextras = derive2 { name="optextras"; version="2019-12.4"; sha256="1sqkid6h13h8i8wzri26s828ycwlxlwpwxd85r8bw9h8hs1n602r"; depends=[numDeriv]; }; optiRum = derive2 { name="optiRum"; version="0.40.1"; sha256="1kl9mzh53pwhrxbn89dsjjpfji7k8vmysscd1qd9sw7vqdan8g6x"; depends=[AUC data_table ggplot2 knitr plyr scales stringr XML]; }; - optiSel = derive2 { name="optiSel"; version="2.0.2"; sha256="0k3651h7ih59w13jzkbh8m5pddi1g1zci5rn9dm3b873yjr2nalx"; depends=[data_table doParallel ECOSolveR foreach kinship2 magic MASS Matrix nadiv optiSolve pedigree plyr pspline purrr quadprog Rcpp RcppArmadillo reshape2 stringr]; }; - optiSolve = derive2 { name="optiSolve"; version="0.1"; sha256="1wnpj7z0vqf91gzgz6r2ympnljq4mczxnnyk3sq7gvf6df4ic2m1"; depends=[alabama cccp MASS Matrix nloptr plyr Rcpp Rcsdp shapes stringr]; }; + optiSel = derive2 { name="optiSel"; version="2.0.3"; sha256="0wkvpwvcckhsjnk17pgdrbsl0qihdpibjbmw2x5izc0vj2zw7fzf"; depends=[data_table doParallel ECOSolveR foreach kinship2 magic MASS Matrix nadiv optiSolve pedigree plyr pspline purrr quadprog Rcpp RcppArmadillo reshape2 stringr]; }; + optiSolve = derive2 { name="optiSolve"; version="0.1.2"; sha256="0jlxn2rkq6dj59p84f0xdkdgl1yzfbf3ldxryb612j9ivcfkcrvp"; depends=[alabama cccp MASS Matrix nloptr plyr Rcpp shapes stringr]; }; opticskxi = derive2 { name="opticskxi"; version="0.1"; sha256="1vdz5sgjgyh2nj034w87d2yxcbbg97f1b0vijlwzwjkrfz5knfhl"; depends=[ggplot2 magrittr]; }; opticut = derive2 { name="opticut"; version="0.1-2"; sha256="1j479wa7mlp62c2y7shha1w7ybhfy8wvjfaz27kmwd1f61ma1g0l"; depends=[betareg MASS mefa4 pbapply pscl ResourceSelection]; }; optifunset = derive2 { name="optifunset"; version="1.0"; sha256="18pvdl04ln1i0w30ljdb3k86j27zg2nvrn3ws54c1g6zg9haqhbg"; depends=[]; }; 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]; }; optimCheck = derive2 { name="optimCheck"; version="1.0"; sha256="1qjkv1mfyn7sw0dkxxcdaqj85vl71cgffpf3k3mvzy0s8yhxjb4n"; depends=[]; }; - optimParallel = derive2 { name="optimParallel"; version="0.8-1"; sha256="176m425pp3jf48jip513hvbrvgjv78qzylmksqw5ks8yhylq41l9"; depends=[]; }; - optimStrat = derive2 { name="optimStrat"; version="2.0"; sha256="0n9igrxyasl2h2xjsx044ma3nqbd8258psc2h6za2pw6jjwwlz4g"; depends=[cubature mvtnorm shiny]; }; + optimParallel = derive2 { name="optimParallel"; version="1.0"; sha256="1m7rny7c1x1kaa4swqndhmb83ilihp3ksyfpys9mqlzchja96229"; depends=[]; }; + optimStrat = derive2 { name="optimStrat"; version="2.1"; sha256="0splvrnrs8ayiycyxs02vcs5m0s2r68sblmcdlbi49fmxgw48di9"; depends=[cubature mvtnorm shiny]; }; optimalThreshold = derive2 { name="optimalThreshold"; version="1.0"; sha256="1m39q36p7i7z31b90awriq5jf9rfybyw5lj3m1w33v2ssipkzp1n"; depends=[ars coda HDInterval mgcv rjags]; }; optimbase = derive2 { name="optimbase"; version="1.0-9"; sha256="0ivz24kf3yacgq5bl3s3az1pcyhsz0cza5f8vdksy5gchwqplm8n"; depends=[Matrix]; }; optimization = derive2 { name="optimization"; version="1.0-7"; sha256="09s62ax3w8zijfp2cmh2lvdqbl3nijbjkwq4n3icasi53lzg2179"; depends=[colorspace Rcpp]; }; - optimos_prime = derive2 { name="optimos.prime"; version="0.1.1"; sha256="0r7xjx86m4bklqss7h4cfsw69q74z4z6y40vfrbd6j3qz9ay66xg"; depends=[ggplot2 plotly tidyverse]; }; + optimos_prime = derive2 { name="optimos.prime"; version="0.1.2"; sha256="1a76gfzpd2s4gq15cd3frndak7wc6q3xqh9sllkk665031fx6z1h"; depends=[ggplot2 plotly tidyverse]; }; optimr = derive2 { name="optimr"; version="2019-12.16"; sha256="003wz9r3xdi47ad22l4dkhp0dalknb2s9fp82yamjx7x1xbfvcbk"; depends=[numDeriv optextras Rcgmin Rvmmin setRNG]; }; optimsimplex = derive2 { name="optimsimplex"; version="1.0-7"; sha256="1if32133556zwmijlz6085fg1h65442hy03lzia0ahap3yndqfqy"; depends=[optimbase]; }; optimus = derive2 { name="optimus"; version="0.2.0"; sha256="01njyjfrm6kjwx2qq41c0hsgxzydnrmr3538cpbfdn5i0z5blgyx"; depends=[mvabund ordinal]; }; - optimx = derive2 { name="optimx"; version="2018-7.10"; sha256="0npzgb5ky3p2iky4917grmysawh7mb5gwz4i7ssmh73ypqnndfhk"; depends=[numDeriv]; }; + optimx = derive2 { name="optimx"; version="2020-2.2"; sha256="1dr281q21563ysh60sqca7in1pvzx776qn9v7wv1sp8hk7w99x21"; depends=[numDeriv]; }; + optinterv = derive2 { name="optinterv"; version="0.1.0"; sha256="1yvjb9fyqj3pfglfdwdq4kpw9i5g5i3klgpqb05xdnacbnpdxvmp"; depends=[boot distances Hmisc lattice pbapply rootSolve weights]; }; optional = derive2 { name="optional"; version="2.0"; sha256="0hj0gwvk9svllv44kfdgv3a2mriwqnaxvn3rj7w1djha7mryl6jl"; depends=[magrittr]; }; optionstrat = derive2 { name="optionstrat"; version="1.4.1"; sha256="0vidaf888zdls5yxy7637fqg6r39l3rxw9bhn16s4xmag7kawljv"; depends=[]; }; - optiscale = derive2 { name="optiscale"; version="1.1"; sha256="1c263w9df66m7lgvzpdfm2zwx9nj8wcdpgh5gijachr2dzffmrp2"; depends=[lattice]; }; - optismixture = derive2 { name="optismixture"; version="0.1"; sha256="0nacfbqlnzajp1hfhf0yzm2d86fxpp4kw2zy33q8k2d4sr56bird"; depends=[Matrix mvtnorm]; }; + optiscale = derive2 { name="optiscale"; version="1.2"; sha256="185yv0xizrrjik0ydyknms28p8ql9x54bhnq3wpyrbiinjm51fms"; depends=[lattice]; }; optmatch = derive2 { name="optmatch"; version="0.9-13"; sha256="1n6h6j0rk750jqxwxkbzdid1ig5xp8xpjw356xrqg02wm7x2gwzq"; depends=[digest Rcpp RItools survival]; }; optparse = derive2 { name="optparse"; version="1.6.4"; sha256="0wyrc42ja3ab5szx46zmz8lm7vzfqxkjca0m0sms8g9hqbmmay6d"; depends=[getopt]; }; optpart = derive2 { name="optpart"; version="3.0-3"; sha256="18h659gbgzflq81lcchc058xjgljkmhpsjkh51ylygwrv1qjrz2i"; 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]; }; optweight = derive2 { name="optweight"; version="0.2.5"; sha256="1mfk9sp47flqq7i762wip5191j8m0q9kbyxs4a7f0pd76qwf67q2"; depends=[ggplot2 Matrix osqp]; }; - opusminer = derive2 { name="opusminer"; version="0.1-0"; sha256="1m4gsjylz58pbmhgcy4l9hqdsgy8ra1zg0d3rb6h2qiwfyfm0yh4"; depends=[arules Matrix Rcpp]; }; + opusminer = derive2 { name="opusminer"; version="0.1-1"; sha256="1vw6pbk1iiaxmfws95wmwf56p3afk10s5c3x9f0lliamckpyzkck"; depends=[arules Matrix Rcpp]; }; orQA = derive2 { name="orQA"; version="0.2.1"; sha256="0vivjrpcbql42y078gi91kfpfdpv73j23jkiv8fpazzwzdi8ydqq"; depends=[genefilter gtools nlme Rcpp]; }; ora = derive2 { name="ora"; version="2.0-1"; sha256="0albxqma220rnrpfdq3z9cawr83q1a0zzczbbcy4nijjm4mswphy"; depends=[DBI ROracle]; }; orca = derive2 { name="orca"; version="1.1-1"; sha256="1wd5nh2vh6j1rp78hbw17qipi67f0wimrbkiarak8f7k5pfiy1zn"; depends=[]; }; @@ -11125,7 +11261,6 @@ in with self; { ordcrm = derive2 { name="ordcrm"; version="1.0.0"; sha256="1hy24s23l099b21w5j3p2f0748s8xmhxhslfp65fg7ycwda5qsyw"; depends=[rms]; }; orddom = derive2 { name="orddom"; version="3.1"; sha256="165axs15fvwhrp89xd87l81q3h2qjll1vrwcsap645cwvb85nwsh"; depends=[psych]; }; 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=[]; }; orderly = derive2 { name="orderly"; version="1.0.4"; sha256="0z83aha45nhi7mym1mygp60jim8znyknmc254gd2cvmg7cmifzb7"; depends=[DBI digest docopt fs ids R6 RSQLite withr yaml zip]; }; orders = derive2 { name="orders"; version="0.1.3"; sha256="14p0wk7y9hbhxwifr4fjp3h9dll0sin8q88an6a536d4f2045j7c"; depends=[Newdistns]; }; @@ -11137,22 +11272,23 @@ in with self; { ordinalForest = derive2 { name="ordinalForest"; version="2.3-1"; sha256="1yhaq6bg9npxsc9v6v9viqlwyrpdag1hy0z25h10cfygg8h1ranl"; depends=[combinat ggplot2 nnet Rcpp]; }; ordinalLBM = derive2 { name="ordinalLBM"; version="1.0"; sha256="1sfzkm3f9s5nbalakgk5v919wr7hdlr5p280rw2p8dy4wxr3xk3s"; depends=[RColorBrewer reshape2]; }; ordinalNet = derive2 { name="ordinalNet"; version="2.7"; sha256="13d7mvjfqdikd9lvdpsn3xr7yhkcqlv9ljy21qai9qna1cfd4x2q"; depends=[]; }; - ordinalRR = derive2 { name="ordinalRR"; version="1.0"; sha256="07gihg8hppxa7bp5wxcshqawj3vkzicmdsrnjyrasr3glv08b9lj"; depends=[rjags]; }; + ordinalRR = derive2 { name="ordinalRR"; version="1.1"; sha256="1sfkq8gryyls22208ympw5scgb4jkd27pyc1qklw4x7cz9wfnfbp"; depends=[rjags]; }; ordinalgmifs = derive2 { name="ordinalgmifs"; version="1.0.6"; sha256="0axpndyyns649mwifq8f16l8n8x9nic8cv8l71ljyr2gwlm0nqz0"; depends=[survival]; }; + ordinalpattern = derive2 { name="ordinalpattern"; version="0.2.0"; sha256="0nf7323wd8wm4qxlhr6cvm1l87rwfdr5c4qivhncy0m2n5vknc1c"; depends=[gtools mvtnorm]; }; ore = derive2 { name="ore"; version="1.6.3"; sha256="1vh6w3arrhgkfjjjw7ci91xmz4wpfr3cmwd5zkqch89dgn07skkv"; depends=[]; }; ores = derive2 { name="ores"; version="0.3.1"; sha256="12war455cfcn2llig7pkx05b70dp5y7warjq03ayqq6i7c945mhb"; depends=[httr]; }; - orf = derive2 { name="orf"; version="0.1.2"; sha256="123lx1wa3sbi5l5zy92rq30f0hqq1pjpjyaklq9n1k9z28aa7p14"; depends=[ggplot2 ranger Rcpp xtable]; }; + orf = derive2 { name="orf"; version="0.1.3"; sha256="19drrxvnh9y33p0g8pv9bhl6i8jpsdc7nkcpbpxbrsc5hs96dycp"; depends=[ggplot2 ranger Rcpp xtable]; }; org = derive2 { name="org"; version="2019.4.2"; sha256="0jrnr22slgzwsdb4a1jb1l878smhvfb680cgmgb3a88jqj4jfscl"; depends=[]; }; orgR = derive2 { name="orgR"; version="0.9.0"; sha256="1q4qbwnbhmja8rqiph7g7m4wxhzhk9mh91x1jgbnky8bs4ljdgrx"; depends=[data_table ggplot2 ggthemes lubridate stringr]; }; 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.3"; sha256="034h9dnllzllqd0pzx2if69x17gaxfjrfi4ini6gh23asr3krls3"; depends=[abind assertthat 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.8"; sha256="01fq3sas2xlp56f6s8jn5079pchszg2pbvzy8d5psxpb5jz59mwc"; depends=[knitr png rmarkdown ucminf]; }; - orloca_es = derive2 { name="orloca.es"; version="4.6"; sha256="1yfsvihm8p4ggdfam50i2xg7dy7khww5qqk6g4lry3m1icwx6vsy"; depends=[orloca]; }; + orloca = derive2 { name="orloca"; version="4.9"; sha256="02fqak8s68q522kgvrqqz9rfhpzby0ln032cisjwgk7nlcx4wbjk"; depends=[knitr png rmarkdown ucminf]; }; + orloca_es = derive2 { name="orloca.es"; version="4.9"; sha256="00zb08dqcsh1ljl4f2djm1pwbrfbaddgapn3v8nascmwxlhb2hkw"; depends=[orloca]; }; ormPlot = derive2 { name="ormPlot"; version="0.3.2"; sha256="0sdn7vrc35pl763snfrrcn0fa6i3agr57sjayjz93friijddkcp6"; depends=[ggplot2 gtable rms]; }; oro_dicom = derive2 { name="oro.dicom"; version="0.5.3"; sha256="1ar70xk2bqk7jgckfivgp4np3dxaynmgdg41n8x0sg9cpxl2lc38"; depends=[oro_nifti]; }; - oro_nifti = derive2 { name="oro.nifti"; version="0.9.1"; sha256="19w9dzyfmfgxgxb5i0l06b6gzqksx879iwicfs76fwmb1q2ph540"; depends=[abind bitops RNifti]; }; + oro_nifti = derive2 { name="oro.nifti"; version="0.10.1"; sha256="02hyc2b9azdlsbl6zb4xd4hc523hi091jimxlv1sp0044ynqzczv"; depends=[abind bitops RNifti]; }; oro_pet = derive2 { name="oro.pet"; version="0.2.6"; sha256="1dczii7knh9241ksswxk9zg1d69mhk2ilrk4kjv7cj9nfm8fgmja"; depends=[minpack_lm msm oro_dicom oro_nifti]; }; orsifronts = derive2 { name="orsifronts"; version="0.1.1"; sha256="1js4q2s1mn263x8szl5q47ajfxv9lsjd5zyphwyhbkqrnd8ijd3w"; depends=[sp]; }; orsk = derive2 { name="orsk"; version="1.0-5"; sha256="19bpvsdjwjm62a2kfh3xjpqnn39kls656kh832frkqa08bdd7zjk"; depends=[BB BHH2]; }; @@ -11162,53 +11298,56 @@ in with self; { osDesign = derive2 { name="osDesign"; version="1.7"; sha256="0y68pnsmq4nlmfsn28306q2kxab200pirr6ha0w4himzpnw1sil3"; depends=[]; }; osc = derive2 { name="osc"; version="1.0.5"; sha256="00a0ys5ni0hg5zxi0sr5ak3n4c252vhvd6gynnx1b0lqna7bz9qi"; depends=[raster]; }; osd = derive2 { name="osd"; version="0.1"; sha256="1py9p15nrcydr8w9ilxkxabiz9zlqnls8xn9avjkxd8x6602jx6p"; depends=[JADE nnls]; }; + osfr = derive2 { name="osfr"; version="0.2.8"; sha256="1yzi8k6ddr8kfgsliigbwzaiqapqa65ismbvxn30ny6raa4rf2xx"; depends=[crul fs httr jsonlite memoise purrr rlang stringi tibble]; }; oshka = derive2 { name="oshka"; version="0.1.2"; sha256="02hglpq5lknq93zbcf219lhnhppzgygkhxqixb15f89rxf9fczgs"; depends=[]; }; osmar = derive2 { name="osmar"; version="1.1-7"; sha256="0q6d8nw7d580bnx66mjc282dx45zw9srczz90b520hjcli4w3i3r"; depends=[geosphere RCurl XML]; }; - osmdata = derive2 { name="osmdata"; version="0.1.2"; sha256="1zz3ba2f74fllpg5ggbhyixzdkrz4kxmk74ml717kjh49kj3wl4j"; depends=[curl httr jsonlite lubridate magrittr Rcpp rvest sp tibble xml2]; }; + osmdata = derive2 { name="osmdata"; version="0.1.3"; sha256="1a57fg8j7ski050l17hv137mlb5ir7qx7212y9d49arbwlh9bpcq"; 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.6.0.3"; sha256="1266n04c8zsv4ixf7y25jkccv9lx3rvmd7bnkxynbwga9psd3l0j"; depends=[Matrix R6 Rcpp]; }; osrm = derive2 { name="osrm"; version="3.3.2"; sha256="10adkq8sm0jvyd35m8vvjxiqvay976fsgffyxh9sh564l053srkp"; depends=[gepaf isoband jsonlite lwgeom RCurl sf 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.2.0"; sha256="1l34fda1y1y359khr1flwk7848rq7hhfmkqnifxhdsz73i2hcrr0"; depends=[checkmate geojsonsf httr jsonlite]; }; + otpr = derive2 { name="otpr"; version="0.3.0"; sha256="02p0wiz791023zpwy8dq8blsax2yfji3cpp4b77n7ri1fsisfy39"; depends=[checkmate geojsonsf httr janitor jsonlite]; }; otrimle = derive2 { name="otrimle"; version="1.3"; sha256="1vq2sm3g32cr8x0nzxq9g3zk0qhcd2syzrcvrfx5ncf3i3f9gq5n"; depends=[doParallel foreach mclust]; }; otsad = derive2 { name="otsad"; version="0.2.0"; sha256="1jb6raxm70aywbgs7bdyw8vccy1nj924f4hkpjrlgnvzmy0hyhvs"; depends=[ggplot2 plotly reticulate sigmoid]; }; - otuSummary = derive2 { name="otuSummary"; version="0.1.0"; sha256="15sjjkivh37kjcj02s2l8xabn3x1kg348i69kyhbvsbqawh2s9y0"; depends=[fossil reldist reshape2 vegan]; }; + otuSummary = derive2 { name="otuSummary"; version="0.1.1"; sha256="04l667qmp7wqkbdsk87j92gf89s13090kzs8cjlmxsp6i69r34z2"; depends=[reshape2 vegan]; }; otvPlots = derive2 { name="otvPlots"; version="0.2.1"; sha256="0fjx0kl9y77mazwy7lg4mxc9sg8ysvvbl4h3k6bvfpnjm5x62hff"; depends=[data_table ggplot2 gridExtra Hmisc moments quantreg scales stringi]; }; ouch = derive2 { name="ouch"; version="2.14-1"; sha256="0ddf9bw5lhj8vb0ja78jf99i0smq4rgmm842k4a4ygap41vdyn2b"; depends=[subplex]; }; outForest = derive2 { name="outForest"; version="0.1.0"; sha256="0wkji836xrf7izx3ibrf1ylcm4ph766ih3qd7wqjsjfx2cz5bpjr"; depends=[FNN missRanger ranger]; }; outbreaker = derive2 { name="outbreaker"; version="1.1-8"; sha256="0przz78jzkwl580w83p0aigaykfki2hdzprwqic7dy6yxnpqlpm3"; depends=[adegenet ape igraph]; }; - outbreaker2 = derive2 { name="outbreaker2"; version="1.1.0"; sha256="0ijyrlbg9xg2p7zr1klyd450ffiddp4fa7arxlhdjf7lsxhbl0h9"; depends=[ape ggplot2 magrittr Rcpp visNetwork]; }; + outbreaker2 = derive2 { name="outbreaker2"; version="1.1.1"; sha256="01i8abwg3g352nbrpaf8iahsjc4cbpph993x867yyvgj12nvsgs3"; depends=[ape ggplot2 magrittr Rcpp visNetwork]; }; outbreaks = derive2 { name="outbreaks"; version="1.5.0"; sha256="00369lnh65nfkcbjd5i39irdv2hcwy5cinb2dvv2x4c2q2ax9f0d"; depends=[]; }; outcomerate = derive2 { name="outcomerate"; version="1.0.1"; sha256="07mwml7r98qjgvrp938sqf7klyspz110583j0zwb72j69n4whmrj"; depends=[Rdpack]; }; outliers = derive2 { name="outliers"; version="0.14"; sha256="0vcqfqmmv4yblyp3s6bd25r49pxb7hjzipiic5a82924nqfqzkmn"; depends=[]; }; outliertree = derive2 { name="outliertree"; version="1.1.3"; sha256="07spgpvw665f53ifcsxgdq5q8wm4fsvjmqf7qsbwknlvly06cmcn"; depends=[Rcereal Rcpp]; }; outreg = derive2 { name="outreg"; version="0.2.2"; sha256="04f1x7mxq4swbd7bfwjjgx4838jm6qj4piaighmhcscwrdkxa1cp"; depends=[magrittr reshape2 sandwich stringr tidyr]; }; ouxy = derive2 { name="ouxy"; version="1.1"; sha256="0f07m8zs4vnr0vpsdw1qdzdrq80qyq4477l06w9i3bb0n64yxcaa"; depends=[abc adephylo ape coda EasyABC geiger maps MCMCpack nlme phytools Sim_DiffProc TreeSim]; }; + overdisp = derive2 { name="overdisp"; version="0.1.0"; sha256="0j1rr9grzhlma9hgljxhn70ia268pc6f3gbinrlqky3pg73xjg2k"; depends=[]; }; overlap = derive2 { name="overlap"; version="0.3.2"; sha256="1j3m6ir1chdz0si2fhcw6gs7c9h09bv0chz18rpzxsywww6d4rzy"; depends=[]; }; - overlapping = derive2 { name="overlapping"; version="1.5.4"; sha256="1j3jmv15hy6h4d3v4rwg0796dz6np3pv67xrn2vcgvh1s1rmqnzs"; depends=[ggplot2 testthat]; }; + overlapping = derive2 { name="overlapping"; version="1.6"; sha256="0qy5jw4nn4l6rb36sxd9waz7x4g18q42dsk12hvsnan5jyzcdwfn"; depends=[ggplot2 testthat]; }; overlapptest = derive2 { name="overlapptest"; version="1.1"; sha256="0r732za6lm7dk5r237nhadgbpinaz5dmb6f7pn3mbg0plkdy3mff"; depends=[spatstat]; }; overture = derive2 { name="overture"; version="0.4-0"; sha256="1s16x5kn0apb0w1f7hqzcsqvw3x621y5n6yr1qn7yb7431pdw3cz"; depends=[bigmemory]; }; owdbr = derive2 { name="owdbr"; version="1.0.1.1"; sha256="0q4654zr5aw04sssy7127vafry72b7p3d8i44fqvqg3055awin0i"; depends=[data_table dplyr httr jsonlite magrittr tibble]; }; + owl = derive2 { name="owl"; version="0.1.1"; sha256="1wc2i04pn8aimnyqbi02hhzmzi5kmh7ikbjccqbb6zb9i89v7gkx"; depends=[lattice Matrix Rcpp RcppArmadillo]; }; owmr = derive2 { name="owmr"; version="0.8.2"; sha256="0qlb5aw6n06yf8y2gd2fjp8kp3w0xgqh3fka7rxqndgvaqmin1a6"; depends=[httr jsonlite magrittr plyr tibble tidyr]; }; ows4R = derive2 { name="ows4R"; version="0.1-4"; sha256="1chvb7i9a6kalnjacfvwrnp5j0fhr6da6v6llazqarij9njxfing"; depends=[geometa httr openssl R6 rgdal sf XML]; }; oxcAAR = derive2 { name="oxcAAR"; version="1.0.0"; sha256="19inf2bcpfj4jzfym1v5f1w5fkmcycz5jrfc2hf0wsvixy53lfxa"; depends=[jsonlite stringr]; }; oz = derive2 { name="oz"; version="1.0-21"; sha256="0p4r8qbpv7q6vad940540pd3lk79pyfj41h2cn22hsy1j0va1qbv"; depends=[]; }; - ozmaps = derive2 { name="ozmaps"; version="0.3.0"; sha256="0f6is4kn24wl2rxs5826zv3w0nl8fnbxrxdlxb3larlprbkln5y8"; depends=[oz tibble]; }; + ozmaps = derive2 { name="ozmaps"; version="0.3.6"; sha256="17lh5lgblyryvgk2cman1xwqz5hc0v4s58f3xz36z5qjrcs1599r"; depends=[oz sf tibble]; }; p2distance = derive2 { name="p2distance"; version="1.0.1"; sha256="1ims8i5z5k97kjpdysgx8g7lgvnvf7amahcrssw7bk38bvbxawni"; depends=[]; }; p3state_msm = derive2 { name="p3state.msm"; version="1.3"; sha256="0gbrka62ylxx64r3abpk60y92k2lk5smlf8na68qazph8llsl2rv"; depends=[survival]; }; pAnalysis = derive2 { name="pAnalysis"; version="2.0"; sha256="0pykdlbynzgcbnjs8xs8frgncf53l8qgf6na34adq7da76n570hi"; depends=[coin ggplot2]; }; pBrackets = derive2 { name="pBrackets"; version="1.0"; sha256="0cwv609hzp8anfv3cgfbspz8w0g1ljfz05wm4xfhwy15v32fckrj"; depends=[]; }; pCODE = derive2 { name="pCODE"; version="0.9.3"; sha256="067hhlj75l04b404fidvb2rkj6bb3zxrjy37p5vzvc5a1p1pcnf5"; depends=[deSolve fda MASS pracma]; }; - pCalibrate = derive2 { name="pCalibrate"; version="0.1-1"; sha256="04a7dmf9sjw44y53i469f8fjm8as2vwr0pgk4s91l63pxdqnjvfl"; depends=[epitools exact2x2 MCMCpack]; }; + pCalibrate = derive2 { name="pCalibrate"; version="0.2-1"; sha256="0gi4hjnykn4gbj9krmw4z1qy4lbxkvacczkks3zkwalw9ylwkpxl"; depends=[exact2x2 MCMCpack]; }; pGLS = derive2 { name="pGLS"; version="0.0-1"; sha256="1rlk8q09sikf4vpzsx0c7s6qqh2hxf8dy2bgcm4nnkbv2nfjz438"; depends=[MASS]; }; pGMGM = derive2 { name="pGMGM"; version="1.0"; sha256="1hkczz38g8a8253jm8vhm8948fs91g6b2rfzkz47srkkby9ksa4x"; depends=[JGL MASS mvtnorm]; }; pGPx = derive2 { name="pGPx"; version="0.1.1"; sha256="0b3pjrk7496nlw1cv5m6yfp02c663452z67y21yhhm26b17nrldv"; depends=[DiceKriging KrigInv pbivnorm pracma randtoolbox Rcpp RcppArmadillo rgenoud]; }; pKSEA = derive2 { name="pKSEA"; version="0.0.1"; sha256="1k9javxbhx28hf5k3i66ggqwlws2w9qwp01g8f7jmyp92pxr3qqd"; depends=[]; }; pMineR = derive2 { name="pMineR"; version="0.31"; sha256="1j71dcldzmk4kzspx4v5s3vqqkllgwkckfm1g145qgg26c1gyc6l"; depends=[cluster DiagrammeR stringr XML]; }; pRF = derive2 { name="pRF"; version="1.2"; sha256="17srabk7mam16rdzc5g9ggdrhjjk8wibny40gxvgzkv7qgq7m80x"; depends=[dplyr ggplot2 multtest permute randomForest reshape2]; }; - pROC = derive2 { name="pROC"; version="1.16.1"; sha256="0qkp1byl2xspxaaf0by6mvvrhg7wlz6fxmynz2hkh0ds24w7ig9m"; depends=[plyr Rcpp]; }; + pROC = derive2 { name="pROC"; version="1.16.2"; sha256="0apwa5zzqh74pjnvf5a1s5qf6i9r5h44jdllfrwymkd2v479d2xn"; depends=[plyr Rcpp]; }; pRSR = derive2 { name="pRSR"; version="3.1.1"; sha256="1irx95b7cwvx3gpn9brjjn4k947m8frz542r18nilc9f1159mb3s"; depends=[]; }; pSI = derive2 { name="pSI"; version="1.1"; sha256="0cvw38dqqlyx7cpl27hq33f5xns2d0019lyr98pwndcnbp09mx0b"; depends=[gdata]; }; pa = derive2 { name="pa"; version="1.2-1"; sha256="1pfgzxirkb0p8f6smjlrbp1qpsh0vsvqf306cvldaj9zx8cw0q9f"; depends=[ggplot2]; }; @@ -11216,12 +11355,13 @@ in with self; { pack = derive2 { name="pack"; version="0.1-1"; sha256="0x4p8clwp49s2y67y7in530xwhjngnqwagf9xnyb1jp0z3myd3r7"; depends=[]; }; packClassic = derive2 { name="packClassic"; version="0.5.2"; sha256="04a1sg9vx3r0sq54q9kj0kpahp6my246jy3bivgy09g5fjk0dmkj"; depends=[]; }; packHV = derive2 { name="packHV"; version="2.2"; sha256="0bj7zhlz2283y1hfdqdn7xil4wscwri1f5hszarwjwczx4n5sv81"; depends=[survival WriteXLS]; }; - packMBPLSDA = derive2 { name="packMBPLSDA"; version="0.6"; sha256="0dnj99f8gl5qwn7xjg5jm7hj2ywdmmixbl2ak429ygilf8hlxzwd"; depends=[ade4 DiscriMiner doParallel FactoMineR foreach MASS pROC]; }; + packMBPLSDA = derive2 { name="packMBPLSDA"; version="0.8.0"; sha256="0jn47zhcfssa2rwjh8jc2zc93g766pslxx8vjm0bsnzyzjl2yqb9"; depends=[ade4 DiscriMiner doParallel FactoMineR foreach MASS pROC]; }; packS4 = derive2 { name="packS4"; version="0.9.3"; sha256="0kkh4lfdbr2ydyfpymwrdkms1d4mj8430p6vxvj5wrgl4vh85gwd"; depends=[codetools]; }; packageDiff = derive2 { name="packageDiff"; version="0.1"; sha256="0qxgx2ac0x7p9j9clj7hgjahf7xwzcjkcw0d2n6w0r9c4g0mw9w2"; depends=[diffr htmlwidgets]; }; packageRank = derive2 { name="packageRank"; version="0.3.0"; sha256="1617xah0c8rnyjq09k69yrmalfryx921fflpx7k7bk52zwrrblc9"; depends=[cranlogs data_table ggplot2 memoise RCurl rversions]; }; 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.1.5"; sha256="11dv9684370jnk4lsyqnqcqngrix3fwjhlhgsar6m01vvhy9w1c0"; depends=[crayon formattable httr jsonlite lubridate pander stringr tidyr]; }; + packagefinder = derive2 { name="packagefinder"; version="0.2.1"; sha256="01nfh9han9k6gg59c6qhahfkwl9bi45ncs7mhrp0fkmxw6z21fyh"; depends=[crayon formattable htmlTable httr jsonlite lubridate pander stringr textutils tidyr]; }; + packager = derive2 { name="packager"; version="1.1.0"; sha256="1fsdh21ahhxrw77a3nwib0hypb5wn4xhz02qmm7r6z9bkg5njhak"; depends=[callr checkmate codetools crayon cyclocomp desc devtools fakemake git2r httr pkgbuild pkgload rcmdcheck remotes rprojroot usethis whisker whoami withr]; }; packagetrackr = derive2 { name="packagetrackr"; version="0.1.1"; sha256="0xjq27j7bd7lps0vp9gdinxn19wl10k2cp9wb2xjih7p6l0wd57g"; depends=[dplyr httr magrittr rappdirs]; }; packcircles = derive2 { name="packcircles"; version="0.3.3"; sha256="0gik0splf48zfl40297nh7lbgvd2qqlci99wv841mfy7858ai933"; depends=[Rcpp]; }; packrat = derive2 { name="packrat"; version="0.5.0"; sha256="1xy5dd2hrpqa07jfl4s7dsrya05mf36ms74j833scdz0zf89586n"; depends=[]; }; @@ -11229,10 +11369,10 @@ in with self; { paco = derive2 { name="paco"; version="0.4.1"; sha256="0vlvvmkx2yhm28vly68gapzi2rjf7zilnl96hvysip9n8hq4w71d"; depends=[ape plyr vegan]; }; pacotest = derive2 { name="pacotest"; version="0.3.1"; sha256="0mpdgd8pr7clh5ickz245kqlhh197cnmm8kzxp84fddjb3i1m011"; depends=[ggplot2 gridExtra numDeriv Rcpp RcppArmadillo VineCopula]; }; pact = derive2 { name="pact"; version="0.5.0"; sha256="043hbydj5f6889xrfsrn8jrgid2nnbsz6d7jpn4hywwa97snw4ny"; depends=[glmnet survival]; }; - padr = derive2 { name="padr"; version="0.5.0"; sha256="1lckaizlffgdzs7rhlkafam2clqkn3130r4fdnanm2bvd6b0z220"; depends=[dplyr lubridate Rcpp rlang]; }; + padr = derive2 { name="padr"; version="0.5.1"; sha256="19cl8h27ddwm40hw3kbkzcg32xnry40xns6ikmknl4zpws65m8wl"; depends=[dplyr lubridate Rcpp rlang]; }; paf = derive2 { name="paf"; version="1.0"; sha256="0wrqn67jfrjjxwcrkka6dljgi3mdk00vfjkzzcv2v7c97gx1zvwn"; depends=[survival]; }; pafdR = derive2 { name="pafdR"; version="1.0"; sha256="1yimsd4h23hcf752p5flda3dqk8hgn6qm9k0pmbapxj4jbsw14w5"; depends=[curl exams stringr]; }; - pagedown = derive2 { name="pagedown"; version="0.7"; sha256="1qvi327y6mll8ig1gnvbvyq4m9apw7ayh6i9bjzrwds0x8s4f3bp"; depends=[bookdown htmltools httpuv jsonlite later processx rmarkdown servr websocket xfun]; }; + pagedown = derive2 { name="pagedown"; version="0.9"; sha256="018hd456y58qn887v58hrzwij18s03rvizkj1gdays0z5pbzpspp"; depends=[bookdown htmltools httpuv jsonlite later processx rmarkdown servr websocket xfun]; }; pagenum = derive2 { name="pagenum"; version="1.1"; sha256="0908rlr9sd1a2qwz0idw8ccxhji73sk24gyrdl071lpnd1rs2wl7"; depends=[]; }; pageviews = derive2 { name="pageviews"; version="0.3.0"; sha256="031y67nqqvf3fa2273m7z2cldda0ijh63qwkh4gis3hz9hfril0v"; depends=[curl httr jsonlite]; }; painter = derive2 { name="painter"; version="0.1.0"; sha256="0qr6p13h50rlavcsamxmijfr4dfrbv1k088m28qf8a4gam3ap85b"; depends=[]; }; @@ -11240,9 +11380,9 @@ in with self; { pairedCI = derive2 { name="pairedCI"; version="0.5-4"; sha256="03wf526n3bbr2ai44zwrdhbfx99pxq1nbng9wsbndrdg2ji4dar2"; depends=[]; }; pairheatmap = derive2 { name="pairheatmap"; version="1.0.1"; sha256="1awmqr5n9gbqxadkblpxwcjl9hm73019bwwfwy1f006jpn050d6l"; depends=[]; }; pairsD3 = derive2 { name="pairsD3"; version="0.1.0"; sha256="0ql6pqijf24pfyid52hmf5fmh4w1ca3sm47z9vknqpnjbn47v8q2"; depends=[htmlwidgets shiny]; }; - pairwise = derive2 { name="pairwise"; version="0.4.4-5.1"; sha256="0j15qbpym0y9ipc4l3z95f0bzc0pgzayspyqv81p7xakksnj2y02"; depends=[]; }; + pairwise = derive2 { name="pairwise"; version="0.4.4-7"; sha256="1cgan403p9p08q3cwxnfwgrjg1l23dpmy4fjzcfla6mw24qn60wh"; depends=[]; }; pairwiseCI = derive2 { name="pairwiseCI"; version="0.1-27"; sha256="0yp9nibdrsddjqq6vdlfbpvmfgm209h99b6qqqd6wgfzng327822"; depends=[boot coin MASS MCPAN mcprofile]; }; - pairwiseComparisons = derive2 { name="pairwiseComparisons"; version="0.1.3"; sha256="1m36zm49alsw871lh0can5c6hjsdpb23vchh8srg0rgd2zxnaw5q"; depends=[broomExtra dplyr forcats jmv purrr rlang stringr tibble tidyr WRS2]; }; + pairwiseComparisons = derive2 { name="pairwiseComparisons"; version="0.2.5"; sha256="1kvpa05102vy2dgcg7x7dmj2dk8h2z8ncpfcjfihaw32nabcrprx"; depends=[dplyr forcats ipmisc jmv purrr rlang tibble tidyr WRS2]; }; pak = derive2 { name="pak"; version="0.1.2"; sha256="05s8rg84w4xhpbaa98p3lgvsnbjrxfbcz5izgkamqa1dw4gdxml4"; depends=[assertthat base64enc callr cli cliapp crayon curl desc filelock glue jsonlite lpSolve pkgbuild pkgcache prettyunits processx ps R6 rematch2 rprojroot tibble]; }; palaeoSig = derive2 { name="palaeoSig"; version="2.0-3"; sha256="1sn2nbiq037l81qvrqbg7gf1312g8vy574hsfng07qk1jpx7vwkk"; depends=[assertr dplyr forcats ggplot2 ggrepel magrittr MASS mgcv purrr rioja rlang TeachingDemos tibble tidyr vegan]; }; palasso = derive2 { name="palasso"; version="0.0.7"; sha256="1r7kcx0i1xqvqpqwvh5khsv3g0hj3j8f56q9jbya18scywk2ivzg"; depends=[glmnet Matrix survival]; }; @@ -11252,17 +11392,17 @@ in with self; { paleofire = derive2 { name="paleofire"; version="1.2.4"; sha256="1vgai4my6kl0fldghp6a1qr8xhxiyw137kd80d0zir6q47nlnc2x"; depends=[GCD ggplot2 lattice locfit plyr raster rgdal]; }; paleomorph = derive2 { name="paleomorph"; version="0.1.4"; sha256="05l55miahkmj8ikq8qz20y6kgxvxmdf04kji898i7fp8qyj4vfpa"; depends=[]; }; paleotree = derive2 { name="paleotree"; version="3.3.25"; sha256="04l7mh198sm1j8b75ydm7sq55l3nnwns29wj8cli4n3m009bjr5a"; depends=[ape jsonlite phangorn phytools png RCurl]; }; - paletteer = derive2 { name="paletteer"; version="1.0.0"; sha256="02r7d78pvbw0xyghvngacqn0sg2zh8g8qldi8ix7khvxgh03xlvy"; depends=[gameofthrones ggthemes glue harrypotter jcolors oompaBase palr pals prismatic rematch2 rlang rstudioapi scico viridisLite]; }; + paletteer = derive2 { name="paletteer"; version="1.1.0"; sha256="0w81ssvykqaamsdwc27m57x2cl4qmby1ny18aj0fihsh2rk5cg02"; depends=[gameofthrones ggthemes harrypotter jcolors oompaBase palr pals prismatic rematch2 rlang rstudioapi scico viridisLite]; }; palettesForR = derive2 { name="palettesForR"; version="0.1.2"; sha256="0nkb0dszj3a9ba7w6kfyn8lxacqsjw60i87p3g2gyl098kjwv7qv"; depends=[]; }; palettetown = derive2 { name="palettetown"; version="0.1.1"; sha256="1kjj1sqib1ns7895plp8c7h317pxwbyxi2shjkcgadkcsv2yjsxn"; depends=[]; }; palinsol = derive2 { name="palinsol"; version="0.93"; sha256="0k29sl2j7yf4yc0dhb047rxwg9np9l6pdwv6wyb4j80yc07vc9am"; depends=[gsl]; }; palm = derive2 { name="palm"; version="1.1.3"; sha256="1w13a1517h9dqfkc0863fsb08mapx8cafypk3b61djh69hcpbl0v"; depends=[gsl minqa mvtnorm R6 Rcpp spatstat]; }; palmtree = derive2 { name="palmtree"; version="0.9-0"; sha256="0cd5p82gp2g1zq8kf9ybi4wa1r2jg4dbxbp5n01qs4apmyyncl4d"; depends=[Formula partykit]; }; - palr = derive2 { name="palr"; version="0.1.0"; sha256="1v0bajsnzqamx9y275qhvzp56vzzs3hyp4mr5ijqynqj4376fqys"; depends=[]; }; + palr = derive2 { name="palr"; version="0.2.0"; sha256="0c9fg3kbl2n6m01ck2pmavgxbk953vdxqsc3cw6phnnav93kr5cf"; depends=[]; }; pals = derive2 { name="pals"; version="1.6"; sha256="18bl15figc9mhlvxz71da6s2mzyja6rdb2cpm6h5vya1lpv3snmk"; depends=[colorspace dichromat mapproj maps]; }; pamctdp = derive2 { name="pamctdp"; version="0.3.2"; sha256="0qs8lj5g2fx5rfd0afv76x9x7wqm333qmjv6zzip6pf11dzkghyj"; depends=[ade4 FactoClass xtable]; }; pamm = derive2 { name="pamm"; version="1.121"; sha256="191f0g90s1m3w68mszmdsdv5yw7xd1vsdbwsfvmyydgxn4261pwk"; depends=[lattice lme4 lmerTest mvtnorm]; }; - pammtools = derive2 { name="pammtools"; version="0.1.14"; sha256="1zr8n6j9220qv3a2q309n1ckjd4b6l2k24kfx3p4wibam8g9pqbc"; depends=[checkmate dplyr Formula ggplot2 lazyeval magrittr mgcv msm mvtnorm purrr rlang survival tibble tidyr]; }; + pammtools = derive2 { name="pammtools"; version="0.2.2"; sha256="03znv9ajy1y5lks42d8vhd7a20n9hv8xnrl6mxw7cjhh94h1x1gl"; depends=[checkmate dplyr Formula ggplot2 lazyeval magrittr mgcv mvtnorm pec purrr rlang survival tibble tidyr]; }; pampe = derive2 { name="pampe"; version="1.1.2"; sha256="092n04nrp886kd163v32f5vhp9r7gnayxzqb6pj57ilm5w1yrcsk"; depends=[leaps]; }; pamr = derive2 { name="pamr"; version="1.56.1"; sha256="0ycpgkk23y3zzkb42n2skcyl35ps1n7jmyzfj7pbxr3f6gr2grfh"; depends=[cluster survival]; }; pan = derive2 { name="pan"; version="1.6"; sha256="1dk3jjj826p7xrz10qz04vyc068xnypg7bp0pj4c32z3da0xzh5d"; depends=[]; }; @@ -11273,7 +11413,7 @@ in with self; { panelView = derive2 { name="panelView"; version="1.1.2"; sha256="0kbh2g8yynv2mvvndy89lkm5yhy2hr04z52i2ccv9yfrkyignlfp"; depends=[ggplot2 gridExtra]; }; panelWranglR = derive2 { name="panelWranglR"; version="1.2.13"; sha256="0zj0m08518zi6xsa7qik61ys1qqa2lqiar4l7acclkw58w5zrmbc"; depends=[caret data_table Hmisc]; }; panelaggregation = derive2 { name="panelaggregation"; version="0.1.1"; sha256="0x8ldqb9216pclfvs4ymdpian43v2ydkyflpf0k6lcn35r04xfr6"; depends=[data_table]; }; - panelr = derive2 { name="panelr"; version="0.7.1"; sha256="0xd3f3acfjvnryhwdf3aqa3vgpagl87sgd7annn29rk3lznv8rv2"; depends=[crayon dplyr Formula ggplot2 jtools lme4 lmerTest magrittr purrr rlang stringr tibble]; }; + panelr = derive2 { name="panelr"; version="0.7.2"; sha256="1xbhrz4lpxxyraiyyh1dqh3fpck3gx5yd8laibzqb7mxb0ili2n7"; depends=[crayon dplyr Formula ggplot2 jtools lme4 lmerTest magrittr purrr rlang stringr tibble]; }; panelvar = derive2 { name="panelvar"; version="0.5.2"; sha256="1rr7d0cyz6afxhwqslvcnbfb03cizpfldzwsfnkzxqmxpqasbw80"; depends=[ggplot2 knitr MASS Matrix matrixcalc progress reshape2 texreg]; }; pangaear = derive2 { name="pangaear"; version="1.0.0"; sha256="0i7k1sdhslw33dzpnrmajynq52svg8ri4mxz6aww2cah9y8vxlzl"; depends=[crul hoardr jsonlite oai png tibble xml2]; }; papayar = derive2 { name="papayar"; version="1.0"; sha256="11vkjhazfwfixsr6dba5jrcsr3r3mqgvj5s070b4gp70d6k1z8s5"; depends=[htmltools neurobase oro_nifti servr]; }; @@ -11283,13 +11423,12 @@ in with self; { parade = derive2 { name="parade"; version="0.1"; sha256="07x02j9jlldz4p0cyhw292041l3pziv56bhbzp4f0qpxhcbn5zn4"; depends=[]; }; paradox = derive2 { name="paradox"; version="0.1.0"; sha256="00rhn8vwlcl4gnvgkqbaqyx9j1ymmgmqjry3smhc5xqnclx2spzs"; depends=[backports checkmate data_table mlr3misc R6]; }; parallelDist = derive2 { name="parallelDist"; version="0.2.4"; sha256="0gqf9vi9hlbflxj941jv7hli8jiy2sqg8b312h401f8rkfqa9ckv"; depends=[Rcpp RcppArmadillo RcppParallel]; }; - parallelMCMCcombine = derive2 { name="parallelMCMCcombine"; version="1.0"; sha256="05krkd643awqhfrylq9lxr2cmgvnm1msn2x8p1l1483n2gzyklz7"; depends=[mvtnorm]; }; parallelML = derive2 { name="parallelML"; version="1.2"; sha256="05j0rb81i8342m8drwgmgi1w30q96yf501d83cdq4zhjbchphbl1"; depends=[doParallel foreach]; }; - parallelMap = derive2 { name="parallelMap"; version="1.4"; sha256="0nzd4vzdmqahvzccav4w0rbyi7lh41yb2s47472z2agp4piiavzv"; depends=[BBmisc checkmate]; }; + parallelMap = derive2 { name="parallelMap"; version="1.5.0"; sha256="0kjyskwvkqvsyjq55rhypif6z92r33llb7krrhc9f9w68xzp5yja"; depends=[BBmisc checkmate]; }; parallelSVM = derive2 { name="parallelSVM"; version="0.1-9"; sha256="0nhxkllpjc3775gpivj8c5a9ssl42zgvswwaw1sdhwg3cxcib99h"; depends=[doParallel e1071 foreach]; }; parallelize_dynamic = derive2 { name="parallelize.dynamic"; version="0.9-1"; sha256="03zypcvk1iwkgy6dmd5bxg3h2bqvjikxrbzw676804zi6y49mhln"; depends=[]; }; - paramGUI = derive2 { name="paramGUI"; version="2.1.3"; sha256="1z7k4wgzm1bga8djyk44r1kr1mzdb9mrd6fvb5nrd69d76pvldji"; depends=[colorspace fields shiny shinydashboard TIMP]; }; - parameters = derive2 { name="parameters"; version="0.4.1"; sha256="0xkdn1079sr6kgyhc1zmn9imca4bghnxs3f91h0z7vkzjj73qdbi"; depends=[bayestestR insight]; }; + paramGUI = derive2 { name="paramGUI"; version="2.1.4"; sha256="0k2wkl99ji3w7xmd9k7zzvrr3dbf3237q7lxm527dnrq331pmxmi"; depends=[colorspace fields shiny shinydashboard TIMP]; }; + parameters = derive2 { name="parameters"; version="0.6.0"; sha256="0zin3ikc013hc713n5zs0dbhc3m4nfw1vhc3924z0mrww8r241xn"; depends=[bayestestR insight]; }; paramhetero = derive2 { name="paramhetero"; version="0.2.0"; sha256="16gvs8328bnqvhx47f0xwnmbmlakxmp4ivnjxk2b13z6qjs70ij4"; depends=[ggplot2 ggpubr lme4 survey]; }; paramlink = derive2 { name="paramlink"; version="1.1-2"; sha256="0y6wsrxwyavipmrjjznr2n920w0p6qlwapxc9mnkh9c6w3yznka2"; depends=[assertthat kinship2 maxLik]; }; params = derive2 { name="params"; version="0.6.1"; sha256="0w7k8k7z8p1y2w0dhpfssa868xaikfzfdjw2vlj1yl299k5yisax"; depends=[whisker]; }; @@ -11300,7 +11439,6 @@ in with self; { parcoords = derive2 { name="parcoords"; version="1.0.0"; sha256="15w0g789a2igagfrgv1978ib4ipxpfkid5jpj4q344mpdvgp6ip2"; depends=[crosstalk htmlwidgets]; }; 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]; }; - parglm = derive2 { name="parglm"; version="0.1.4"; sha256="15xwij5nq95dykmg4i356fm8pf4ml8vxcphwnr14371bk3l026vl"; depends=[Matrix Rcpp RcppArmadillo]; }; parlitools = derive2 { name="parlitools"; version="0.4.1"; sha256="05xii25acmbdbhrkwgw812352vhxqpp5m8qbl346bp6v74ixi8aj"; 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=[]; }; @@ -11308,7 +11446,7 @@ in with self; { parsec = derive2 { name="parsec"; version="1.2.3"; sha256="142zxj34qsf0s537bcabf04yi2qfmy65bgczpkvbyv5vkajxl10v"; depends=[igraph netrankr]; }; parsedate = derive2 { name="parsedate"; version="1.2.0"; sha256="0gb3w6hmwxayhijpf36p5dk4h6bbdps57x3cgikwvvxkgi83rarr"; depends=[rematch2]; }; parsemsf = derive2 { name="parsemsf"; version="0.1.1"; sha256="0ks4503k06ib5lq4ar2rg0sdni99rjcqxj76b0mclasxbi07kjsa"; depends=[DBI dbplyr dplyr lazyeval RSQLite stringr tidyr]; }; - parsetools = derive2 { name="parsetools"; version="0.1.1"; sha256="0fl06h4aph0rr55n3c4gw9wkblvjipgyl5drpycmpldj8kix1nz2"; depends=[]; }; + parsetools = derive2 { name="parsetools"; version="0.1.2"; sha256="0rdznny4wqq721ikcarpf4lcp9cb6911zpvjsn37flnclhvjwj0i"; depends=[]; }; parsnip = derive2 { name="parsnip"; version="0.0.5"; sha256="1y3bkxkk1ib5p6zzz5js28n761rmxgws3rl1ravq37vk0h16bhg1"; depends=[dplyr generics globals glue magrittr prettyunits purrr rlang tibble tidyr vctrs]; }; partDSA = derive2 { name="partDSA"; version="0.9.14"; sha256="1kp0cdsdjiay349jz22iqfzvspny8s343cfan8xahgf931k9h8p6"; depends=[survival]; }; partialAR = derive2 { name="partialAR"; version="1.0.11"; sha256="1x7vsrjn91nr4bbkzz9mp8h93j9yhwwaqw1abh5n3bsrkq3xmgqj"; depends=[data_table ggplot2 KFAS MASS plot3D Rcpp tseries urca zoo]; }; @@ -11323,9 +11461,10 @@ in with self; { partitions = derive2 { name="partitions"; version="1.9-22"; sha256="1qqy4df28wy4q0g572azrj171jlhvrnzbh7x0wr2g7v6gr20y0ns"; depends=[gmp polynom sets]; }; partools = derive2 { name="partools"; version="1.1.6"; sha256="0w7p88y4ab4v14k16k95cyb5f3yl2g6ban11775rmi2h9xqkfxk8"; depends=[data_table pdist regtools]; }; partsm = derive2 { name="partsm"; version="1.1-2"; sha256="0cv3lgkdkn97bc85iwlv9w5pmqwwwsgb717zxnbgb5mzf4xn3f3g"; depends=[]; }; - party = derive2 { name="party"; version="1.3-3"; sha256="1sbwpwxdz81ikp64kc0s06vdwy04bccff2kr0phwx9235nhfwwlz"; depends=[coin modeltools mvtnorm sandwich strucchange survival zoo]; }; - partykit = derive2 { name="partykit"; version="1.2-5"; sha256="17324y5v65i0va2mvm26gl89s01xwcffg34fwq1mvylk1xwk13pl"; depends=[Formula inum libcoin mvtnorm rpart survival]; }; + party = derive2 { name="party"; version="1.3-4"; sha256="0zqyyzpri61kj300b6kqspfhwqvx4c8svia726cg33lnwx7vv2bn"; depends=[coin modeltools mvtnorm sandwich strucchange survival zoo]; }; + partykit = derive2 { name="partykit"; version="1.2-7"; sha256="1h8jld63mm7ri9cny8jz0cibma68n7p66qvyn9g0jx99kir3r6aw"; depends=[Formula inum libcoin mvtnorm rpart survival]; }; parviol = derive2 { name="parviol"; version="1.1"; sha256="1sfgic86ssd5wjf9ydss9kjd3m4jmm2d1v896sjsv8bydwymbpx3"; depends=[vioplot]; }; + parzer = derive2 { name="parzer"; version="0.1.4"; sha256="09rlqz4vhlg6zl48y2xpm6hdmwc74lcpid3qyha9bvy0gnimz5f4"; depends=[Rcpp]; }; pass_lme = derive2 { name="pass.lme"; version="0.9.0"; sha256="1rxm509vnkdvdxii4jwniirdb2pv90rjkf6wjc9zrjh88jrl678k"; depends=[]; }; passport = derive2 { name="passport"; version="0.2.0"; sha256="1jiwivrz7781zmwxmw13rxl80cr9r5pinnk5bvqz8nhfmlx0zmgd"; depends=[]; }; passt = derive2 { name="passt"; version="0.1.1"; sha256="03ymx1bvbz2qwlkxb5iis6k3d3d5fivhcz1w23fwqhgq976zrdj2"; depends=[dplyr magrittr rlang tidyr]; }; @@ -11334,7 +11473,6 @@ in with self; { pastis = derive2 { name="pastis"; version="0.1-2"; sha256="0211pzj3xrmqgxjpspij95kmlpa2klpicw49n6pnz2g1fapjy2bd"; depends=[ape caper]; }; patPRO = derive2 { name="patPRO"; version="1.1.0"; sha256="1l6q6glklmfgivs4gw0v8q4qa57wr2bna477sn2v401hcwmgnfyn"; depends=[ggplot2 gridExtra plyr RColorBrewer reshape2]; }; patchDVI = derive2 { name="patchDVI"; version="1.9.1616"; sha256="1akdlzw8v2p1zz09bm88d63jyxj7fv5h50p459p9ml4yc816xvji"; depends=[]; }; - patchPlot = derive2 { name="patchPlot"; version="0.1.5"; sha256="1b4k0dvvj6qwyxbqb36knyrawvy5qq8hl45pz896c9rkqhlg02bx"; depends=[datautils]; }; patchSynctex = derive2 { name="patchSynctex"; version="0.1-4"; sha256="1li3kw7a77sx6dss8pnxzb0p0sdy1kfm1zdnmhhj043zihrryd5p"; depends=[stringr]; }; patchwork = derive2 { name="patchwork"; version="1.0.0"; sha256="0qrwbcswh7ylrmghi17k6wk7w51cz6mcmvcyyd41hy3m2ywmkywb"; depends=[ggplot2 gtable]; }; patentsview = derive2 { name="patentsview"; version="0.2.2"; sha256="003pcddz6adsh893xvlb9d72r316z14nlp3fwm1vbc50hpa24w6z"; depends=[httr jsonlite]; }; @@ -11348,62 +11486,62 @@ in with self; { patternize = derive2 { name="patternize"; version="0.0.2"; sha256="0hd6l66ybrjjndad5m2li9qqsjd0k2blhvjm469j6ab95073zq9f"; depends=[abind dplyr imager magrittr Morpho purrr raster rgdal RNiftyReg sp vegan]; }; patternplot = derive2 { name="patternplot"; version="0.3.2"; sha256="0bzy1fq9za1251h8iiixyq397wnw9k3s59i3wi2pyjca2dydhr9a"; depends=[dplyr ggplot2 gridExtra gtable jpeg png R6 Rcpp RcppParallel]; }; pauwels2014 = derive2 { name="pauwels2014"; version="1.0"; sha256="1b7whn13lgydc69kg1fhnwkxirw0nqq75cfvii0yg0j4p8r1lw42"; depends=[deSolve ggplot2]; }; - pavo = derive2 { name="pavo"; version="2.3.0"; sha256="0ix4jaqzzz5gqazhm4wmjkwyhk9xkgmwlabns1lyixl57l22p6s7"; depends=[cluster geometry magick pbmcapply plot3D sp viridisLite]; }; + pavo = derive2 { name="pavo"; version="2.4.0"; sha256="1f71plrm5j5k66lw0za1a16rfjbl1gq4cwczybrc9rpzz6a0i6li"; depends=[cluster future_apply geometry lightr magick plot3D progressr 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 = derive2 { name="paws"; version="0.1.6"; sha256="1d47i4bjqd1dam98w7wyy3zbqmjb4gaplybzir9sl3k0fwr0sk1n"; depends=[paws_analytics paws_application_integration paws_compute paws_cost_management paws_customer_engagement paws_database paws_machine_learning paws_management paws_networking paws_security_identity paws_storage]; }; - paws_analytics = derive2 { name="paws.analytics"; version="0.1.6"; sha256="1wyc8br5vv8cp4axy9vi0asbk9fw3w7nbw5lgwrakz1zs29rhrcy"; depends=[paws_common]; }; - paws_application_integration = derive2 { name="paws.application.integration"; version="0.1.6"; sha256="11dyi8pir23zh18z4w516gkgpddx6pz9zzlcrsh6nik0389zrrid"; depends=[paws_common]; }; - paws_common = derive2 { name="paws.common"; version="0.2.5"; sha256="12rjhxqqypckjiiiic1474kbvf0hiv38wz3gj9z8c0wks7sp94ck"; depends=[base64enc digest httr ini jsonlite xml2]; }; - paws_compute = derive2 { name="paws.compute"; version="0.1.6"; sha256="0ls2d25c9w5hn0h2cw0an06x3fhiff0dnxipws81rxi9vnplqb8g"; depends=[paws_common]; }; - paws_cost_management = derive2 { name="paws.cost.management"; version="0.1.6"; sha256="1fwp4v32hkvzjks79ri5732am09dm4mh42iwg5lk5dl16im6xj13"; depends=[paws_common]; }; - paws_customer_engagement = derive2 { name="paws.customer.engagement"; version="0.1.6"; sha256="1xsprrm7k7hakhvisfm6j29j9any1rc73cs3ilfcjfqqdf54jkpw"; depends=[paws_common]; }; - paws_database = derive2 { name="paws.database"; version="0.1.6"; sha256="16nr5fg0q2afhzji0b74pgarhhhbqjipd200hsv9plfhwl4s3ylc"; depends=[paws_common]; }; - paws_machine_learning = derive2 { name="paws.machine.learning"; version="0.1.6"; sha256="194vwvafhixn1hw3z3gpcimf2d2a978037xwl81wbpyzjrzmk3w2"; depends=[paws_common]; }; - paws_management = derive2 { name="paws.management"; version="0.1.6"; sha256="1jazj6fj2akkk4dldcdbp24phy5pi32gv367jjsl9x9z85jfbvj2"; depends=[paws_common]; }; - paws_networking = derive2 { name="paws.networking"; version="0.1.6"; sha256="1jbn3y0qkzyiw2bnz14rys3z2l88hailnpbsyd4k83azfy9s5vx5"; depends=[paws_common]; }; - paws_security_identity = derive2 { name="paws.security.identity"; version="0.1.6"; sha256="1lgidvngdjkpniwzydk3xxr9aqjqrpgjc8s9f6am5llxg7jx5g9m"; depends=[paws_common]; }; - paws_storage = derive2 { name="paws.storage"; version="0.1.6"; sha256="15y1qkzfyyqjqzyh68s17n7qavaq08js8vmx64c93zdlj11y6hag"; depends=[paws_common]; }; + paws = derive2 { name="paws"; version="0.1.7"; sha256="02kg1mlcpmf8z69xqc1ylbpzr3mwizkzkzz7kwb769wzd2k9d1m5"; depends=[paws_analytics paws_application_integration paws_compute paws_cost_management paws_customer_engagement paws_database paws_machine_learning paws_management paws_networking paws_security_identity paws_storage]; }; + paws_analytics = derive2 { name="paws.analytics"; version="0.1.7"; sha256="135s4sxix8jf3gzk5b8v8z6x6afkhbv48pkbn0l0kzx05jvpy1py"; depends=[paws_common]; }; + paws_application_integration = derive2 { name="paws.application.integration"; version="0.1.7"; sha256="07pllnyrmv1az00n5y76zqd0zsln29d1q9zynw9xpjwrbplialb8"; depends=[paws_common]; }; + paws_common = derive2 { name="paws.common"; version="0.3.0"; sha256="0x6s30qacz0czvshamfr1p9q4x10kmwx9iwa23yv7jmd0l44gj2k"; depends=[base64enc digest httr ini jsonlite xml2]; }; + paws_compute = derive2 { name="paws.compute"; version="0.1.7"; sha256="1c2g4wdfv0s876va4qpma5rv2hr5gkj60si820dwk6zqrv8l48f4"; depends=[paws_common]; }; + paws_cost_management = derive2 { name="paws.cost.management"; version="0.1.7"; sha256="01hf9z967bflxb0xplilay3mrwk8sg376hh2fc4a3plnqbg05cap"; depends=[paws_common]; }; + paws_customer_engagement = derive2 { name="paws.customer.engagement"; version="0.1.7"; sha256="1s5p4cp5hndk4saf8y5bl6ml0gk83g7bh0wqdb4phxqgcyg1c7rq"; depends=[paws_common]; }; + paws_database = derive2 { name="paws.database"; version="0.1.7"; sha256="09nnq3x1fd7m30gyr49ip5x4yq0bbm3l1dqbs0h8pifsrajajb0h"; depends=[paws_common]; }; + paws_machine_learning = derive2 { name="paws.machine.learning"; version="0.1.7"; sha256="0kdlsgw9pkkdzy2km0f16gc170yifincbcsj2xzp9968wllpz0q1"; depends=[paws_common]; }; + paws_management = derive2 { name="paws.management"; version="0.1.7"; sha256="1cfrqii3ablrmq82jz8ak7j81c5nzg7fs3vhmgqf6jxpr098hwrq"; depends=[paws_common]; }; + paws_networking = derive2 { name="paws.networking"; version="0.1.7"; sha256="1zwpyfs9vxljgb48da1cilb0b5vn9cqizykhywysnp1cs89xjb0r"; depends=[paws_common]; }; + paws_security_identity = derive2 { name="paws.security.identity"; version="0.1.7"; sha256="1pjcd6g8kml9vs5cqzingg22prp85dfdkwgicgqbm20r18chc7lw"; depends=[paws_common]; }; + paws_storage = derive2 { name="paws.storage"; version="0.1.7"; sha256="1v33i75vd30arhqa98snd4fq4b0wpwpjys72781myfcb64l7fph4"; depends=[paws_common]; }; pbapply = derive2 { name="pbapply"; version="1.4-2"; sha256="1xmk4p006v8gij26rs6kp5prjyf2n32nqjxiyp8a6kvgyc4z46dc"; depends=[]; }; pbatR = derive2 { name="pbatR"; version="2.2-13"; sha256="01ra1ggdpxdl1xqjdh86qynr5gkgzw01ww6j9bwgx4mj20i6j1ha"; depends=[rootSolve survival]; }; - pbdMPI = derive2 { name="pbdMPI"; version="0.4-2"; sha256="1lbm0a2hm2pxfm1fws4bsh4xk986q9zlqhs1qcdr46m74l3lrq2m"; depends=[float rlecuyer]; }; + pbdBASE = derive2 { name="pbdBASE"; version="0.5-3"; sha256="1f90bk1mp1s03177b9g5w5ni77jzrzc1pl3bjx0w0fjbjs1myn79"; depends=[pbdMPI pbdSLAP]; }; + pbdMPI = derive2 { name="pbdMPI"; version="0.4-3"; sha256="1mxikhr0qfqksr62v5dxvzgqx07391p7ikjk9g2w4xzrzmxs8fc3"; depends=[float rlecuyer]; }; pbdNCDF4 = derive2 { name="pbdNCDF4"; version="0.1-4"; sha256="0fd29mnbns30ck09kkh53dgj24ddrqzks4xrrk2hh1wiy7ap1h95"; depends=[]; }; pbdPROF = derive2 { name="pbdPROF"; version="0.4-0"; sha256="174jwrkvw5qz1430y6id01w1czlw45j1yw8a8dyw36knrmvmdz10"; depends=[]; }; pbdRPC = derive2 { name="pbdRPC"; version="0.2-1"; sha256="1pz71zfs9qw96dj3h5mrm734vbbi4drlv9hrw91dbzm3a7jsxg4q"; depends=[]; }; - pbdSLAP = derive2 { name="pbdSLAP"; version="0.2-8"; sha256="0xwg3yr6125iyhq80qjh3vjs2akxnfgh66h372dsniv89x8qaaaz"; depends=[pbdMPI rlecuyer]; }; + pbdSLAP = derive2 { name="pbdSLAP"; version="0.3-0"; sha256="1jxpgsxkzi3s1qf3g01xma9mqwgi1b22x5lh5xnr78wa0764dyd3"; depends=[pbdMPI rlecuyer]; }; pbdZMQ = derive2 { name="pbdZMQ"; version="0.3-3"; sha256="1jkfcfhspvqra7vbllrvkz3jx8j7d0ang6zzcdjgpb7200sc29mf"; depends=[]; }; 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]; }; + pbkrtest = derive2 { name="pbkrtest"; version="0.4-8.6"; sha256="0s5xhhrhv5i9680lw6af9lj2x4jc3fygmzzk0jjpxnb8g4b3p1jz"; depends=[lme4 magrittr MASS Matrix]; }; pbm = derive2 { name="pbm"; version="1.1.0"; sha256="054navz4fmn25nq3lsfnsnm35shj9wq4qz69d4ajw0q09gnb1cy8"; depends=[]; }; pbmcapply = derive2 { name="pbmcapply"; version="1.5.0"; sha256="0i58gcqpnbyvc448qfgm45b7rpbmrnagsvk1h1hsqchbbicfslnz"; depends=[]; }; pbo = derive2 { name="pbo"; version="1.3.4"; sha256="0v522z36q48k4mx5gym564kgvhmf08fsadp8qs6amzbgkdx40yc4"; depends=[lattice]; }; pbs = derive2 { name="pbs"; version="1.1"; sha256="0cpgs6k5h8y2cia01zs1p4ri8r7ljg2z4x8xcbx73s680dvnxa2w"; depends=[]; }; pbv = derive2 { name="pbv"; version="0.3-19"; sha256="18cypzbyamafq942bwp3k0ml3crwcpxa6rdck8657kkc22lq05g5"; depends=[Rcpp RcppArmadillo]; }; - pcFactorStan = derive2 { name="pcFactorStan"; version="1.3.0"; sha256="1jifdqf9zip16i2sycn05123hmf19rhq2wrdfixfd2rfcbjwcaab"; depends=[BH igraph loo mvtnorm Rcpp RcppEigen reshape2 rstan StanHeaders]; }; + pcFactorStan = derive2 { name="pcFactorStan"; version="1.4.0"; sha256="0fj2732q5kyal8x4s30dxmgpngq9x4wzgjsna5r5lg7izd0s0hk1"; depends=[BH igraph loo mvtnorm Rcpp RcppEigen reshape2 rstan StanHeaders]; }; pcIRT = derive2 { name="pcIRT"; version="0.2.4"; sha256="0crll51s14nisnaxjln7bc3b1a181v358nfkh1p5iiyn98clacl6"; depends=[combinat Rcpp]; }; pcLasso = derive2 { name="pcLasso"; version="1.1"; sha256="1wdwin6xszysydspxjb8b6r3y416ri3zndh0s142b2487lhmqkb6"; depends=[svd]; }; pca3d = derive2 { name="pca3d"; version="0.10.1"; sha256="1fz7p95hhvgzlh1vxlifyzbqccv4rsm7yldzca5p0dwm4rgsdkd4"; depends=[ellipse rgl]; }; pcaBootPlot = derive2 { name="pcaBootPlot"; version="0.2.0"; sha256="1320d969znk9xvm1ylhc3a31nynhzyjpbg1fsryq72nhf8jxijaa"; depends=[FactoMineR RColorBrewer]; }; - pcaL1 = derive2 { name="pcaL1"; version="1.5.3"; sha256="1pf1vsprng83yd4j0rhx4fvj54fr2ra4wng61bw9npzmnshkymwk"; depends=[]; }; + pcaL1 = derive2 { name="pcaL1"; version="1.5.4"; sha256="1myl12537bxwmyicm8v891rflq8g6bhz9j0gcjcqgf9z80y52ayc"; depends=[]; }; pcaPP = derive2 { name="pcaPP"; version="1.9-73"; sha256="1z2kdf9gfp965xbcd4rg6vf20d1bl443na0qjkpq7gmzpaq6cifa"; depends=[mvtnorm]; }; - pcadapt = derive2 { name="pcadapt"; version="4.1.0"; sha256="0631qx37ffz21bgwvjq2y5xn4dvz6kpmwg3rlmkxa93kwsx2b7rb"; depends=[data_table ggplot2 magrittr mmapcharr plotly Rcpp rmio robust RSpectra vcfR]; }; - pcalg = derive2 { name="pcalg"; version="2.6-8"; sha256="1pp7y0v3li8y5q599cz10ws6nql4xqdmgxfjp69h1dmc5635kr06"; depends=[abind bdsmatrix BH clue corpcor fastICA ggm graph igraph RBGL Rcpp RcppArmadillo robustbase sfsmisc vcd]; }; + pcadapt = derive2 { name="pcadapt"; version="4.3.1"; sha256="0xa2dsr0f0a5kdbnbf3c4fznzvv9s3h3yp1wfgjyd8ilp4lk8nlx"; depends=[bigutilsr data_table ggplot2 magrittr mmapcharr Rcpp rmio RSpectra]; }; + pcalg = derive2 { name="pcalg"; version="2.6-10"; sha256="0sjxkbplrdgql2xap8p3025n7hnmp5cf5j17bay5riv3wwhfd225"; depends=[abind bdsmatrix BH clue corpcor fastICA ggm graph igraph RBGL Rcpp RcppArmadillo robustbase sfsmisc vcd]; }; pccc = derive2 { name="pccc"; version="1.0.3"; sha256="1dd1kh0gx7ffwnmxqn3zbcsxiav4z70psis24dgqxwq42r0kw5mk"; depends=[dplyr Rcpp]; }; pcdpca = derive2 { name="pcdpca"; version="0.4"; sha256="0ys4hrin0w3f87d1d986wvrfkfwapzj9hz7d7v92r60ns74g7r5m"; depends=[fda freqdom]; }; + pcds = derive2 { name="pcds"; version="0.1.1"; sha256="1y6msc2b35gcd99yb1zv13li1ilw6c53pcw7jmly4p7sb35kqlqb"; depends=[combinat interp plot3D plotrix Rdpack]; }; pcensmix = derive2 { name="pcensmix"; version="1.2-1"; sha256="1yrz4hdj52in8z65qyl18kh7frv75rb8ss5ljv3vbm6yhxi32jnd"; depends=[]; }; pcev = derive2 { name="pcev"; version="2.2.2"; sha256="1l0afcdzkxzkhkc8ln2fzi50hc7nfq46lg6hhx6rrzkb41w82iqw"; depends=[corpcor RMTstat]; }; 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]; }; + pch = derive2 { name="pch"; version="1.4"; sha256="0vfx0jirmfcy47l6xw1yvss68624605378cpqc58ygllwddcqz1y"; depends=[survival]; }; pcmabc = derive2 { name="pcmabc"; version="1.1"; sha256="1x4qvs5v134z93j1r3zg08kynqyhgd2yc3y2vk0vif8mabvx3zv4"; depends=[ape mvSLOUCH phangorn TreeSim yuima]; }; pcnetmeta = derive2 { name="pcnetmeta"; version="2.6"; sha256="0rpd1bgg932xhj03fnskhbg7ni9nfd8qrvxvix8qmbgw8bwdsbgd"; depends=[coda rjags]; }; pco = derive2 { name="pco"; version="1.0.1"; sha256="0k1m450wfmlym976g7p9g8arqrvnsxgdpcazk5kh3m3jsrvrcchf"; depends=[]; }; - pcr = derive2 { name="pcr"; version="1.2.0"; sha256="0817ibih6rs52g560z8cbw2zpr0hbzrz94c913x4114w1k737bq9"; depends=[ggplot2]; }; - pcrcoal = derive2 { name="pcrcoal"; version="1.2.0"; sha256="0rd610ny8p7by3gi6kk130ii0qcswqsng5mzmxz8hrxqk0cs4c9x"; depends=[ape ggplot2 phylosim]; }; + pcr = derive2 { name="pcr"; version="1.2.2"; sha256="1lmgm8k3s7780ivrdj0zk1ninx7b5jffir6q5p2p47h62qqjmp5d"; depends=[ggplot2]; }; 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.2.7"; sha256="1bpmfrdidnz1aqg8llz00rrvk70f7gy2jdb0i8l3kvf8gg3ws3qb"; depends=[boot readr sf stplanr]; }; - pcts = derive2 { name="pcts"; version="0.14-3"; sha256="16ldn685ninrnn095wnckfki12jicwj15m9806a0dw1g51qy1699"; depends=[BB gbutils lagged ltsa lubridate Matrix mcompanion PolynomF Rdpack sarima zoo]; }; + pct = derive2 { name="pct"; version="0.4.0"; sha256="0wsf3n1yisxjcd9gbfx94671bkfdh2j4il6c6gdqmr6wkj0n74kp"; depends=[boot readr sf stplanr]; }; + pcts = derive2 { name="pcts"; version="0.14-4"; sha256="0c5r71d6c08g5v5cwvy93fwp1lhmqh99azq8nn1ikfxadi7kndln"; depends=[BB gbutils lagged ltsa lubridate Matrix mcompanion PolynomF Rdpack sarima zoo]; }; pdR = derive2 { name="pdR"; version="1.7"; sha256="05rnyb9znb71ilr9kf62x30knby1rm0p4ain220wvb62vkz054d7"; depends=[boot car coefplot lmtest papeR plm sandwich]; }; pdSpecEst = derive2 { name="pdSpecEst"; version="1.2.4"; sha256="1sf2d7vh7a1qc0cq230an8pzg9qi9g640z0ql8x2pp9wfawfzn1f"; depends=[ddalpha multitaper Rcpp RcppArmadillo Rdpack]; }; pdc = derive2 { name="pdc"; version="1.0.3"; sha256="0503n7aiy0qrl790yfjvpm7bbyz1i4818rlg96q0fvzb58zqmyvc"; depends=[]; }; @@ -11418,6 +11556,7 @@ in with self; { pdp = derive2 { name="pdp"; version="0.7.0"; sha256="0wcszaq4c14f9a2r1gd32mzhs035jlg2w8mkfklzigcj7fv9xmi8"; depends=[ggplot2 gridExtra lattice magrittr mgcv plyr viridis]; }; pdqr = derive2 { name="pdqr"; version="0.2.1"; sha256="1444r51lh66kmhvkp8ivr95zlnxfgv28whl0axwb56hf5vi44lp9"; depends=[]; }; pds3 = derive2 { name="pds3"; version="0.5.0"; sha256="1hipi4ygk30khrrslxq3m9qdichazhrl34k444shs7gi6wjx9ilr"; depends=[rly]; }; + pdynmc = derive2 { name="pdynmc"; version="0.8.0"; sha256="1m87vgr6hh3g0j1x0725b4x6a28h6ks59v0vl8c4hki131k4rmf5"; depends=[data_table dplyr MASS Matrix optimx qlcMatrix Rdpack]; }; peRiodiCS = derive2 { name="peRiodiCS"; version="0.5.0"; sha256="1366gmn6qfciwcjsfnbl3hfa16ffn11g00fm0kv74ilvm3nnawk3"; depends=[Hmisc rms]; }; peRspective = derive2 { name="peRspective"; version="0.1.0"; sha256="1zz3znzaa80k60jddys5fhxwx4c8lyqymx5fw2zvj654rnk0mmzc"; depends=[crayon dplyr glue httr jsonlite magrittr purrr rlang rlist stringr tibble]; }; peacots = derive2 { name="peacots"; version="1.3"; sha256="128qpz06b0giz80lp9yq9l6pxcjglfr97yickg7z64vzzl2jilmq"; depends=[]; }; @@ -11426,16 +11565,16 @@ in with self; { pear = derive2 { name="pear"; version="1.2"; sha256="1ixmyzm72s18qrfv2m8xzh5503k1q90lhddq4sp46m0q7qyxb192"; depends=[]; }; pearson7 = derive2 { name="pearson7"; version="1.0-2"; sha256="0x8bnlzgmfah8lzdg8skxs7bm8yq0nkrhqi7q43h902j4jl5b8jy"; depends=[]; }; pec = derive2 { name="pec"; version="2019.11.03"; sha256="1h6fk3k9w61a9xqhvkm1zdv75nsl06n78036qvcxkcf0bkfxl360"; depends=[foreach prodlim rms survival timereg]; }; - pedgene = derive2 { name="pedgene"; version="3.2"; sha256="1cl95fw6wdh4k6rg1nlydh09gf96pcgyfd3bxdcaisq0vfn05g0j"; depends=[CompQuadForm kinship2 Matrix survey]; }; + pedgene = derive2 { name="pedgene"; version="3.3"; sha256="0y6kr5ad4fmxljsj0czs9h1dkz63wvqiira9ibgsf0707xb0vh7f"; depends=[CompQuadForm kinship2 Matrix survey]; }; pedigree = derive2 { name="pedigree"; version="1.4"; sha256="1dqfvzcl6f15n4d4anjkd0h8vwsbxjg1lmlj33px8rpp3y8xzdgw"; depends=[HaploSim Matrix reshape]; }; pedigreeTools = derive2 { name="pedigreeTools"; version="0.1"; sha256="0kgbjyw9dlp4s91cyg5w0p2vn2h9pg9ixrhc5pwvkp3v1acd0xfm"; depends=[Matrix]; }; pedigreemm = derive2 { name="pedigreemm"; version="0.3-3"; sha256="1bpkba9nxbaxnivrjarf1p2p9dcz6smf9k2djawis1wq9dhylvsb"; depends=[lme4 Matrix]; }; pedmut = derive2 { name="pedmut"; version="0.1.0"; sha256="0b8qlcl4g8kjix4q1drs1yk7wnilxqslv4p8svyabcg8wb4bnvwa"; depends=[]; }; - pedometrics = derive2 { name="pedometrics"; version="0.6-6"; sha256="1w9wa73wva6z0d56g221l8qmc5igfypwsa2xq4sn4r501bdy8qpq"; depends=[lattice latticeExtra Rcpp]; }; - pedprobr = derive2 { name="pedprobr"; version="0.1.0"; sha256="1nn8pmxzj1lnfynaws87lbrk2p5y8im4cdm46vw91lbk00z7j3vc"; depends=[pedmut pedtools]; }; - pedquant = derive2 { name="pedquant"; version="0.1.2"; sha256="18shjp241ihy01ksmp2sqrpq5y693njml4wqaayypb961s1850kj"; depends=[curl data_table ggplot2 gridExtra httr jsonlite readr readxl rvest scales stringi TTR webdriver xml2 zoo]; }; - pedtools = derive2 { name="pedtools"; version="0.9.1"; sha256="1qki2yf0dy9yl7b0n8va2knzpjnrai4v5qg6538kqsbpx1i9rxcy"; depends=[kinship2]; }; - pegas = derive2 { name="pegas"; version="0.12"; sha256="0sb8cmz4d238mcb56hv9fa0cagm00k82r7aj4cj4lxa1flxlpy8p"; depends=[adegenet ape]; }; + pedometrics = derive2 { name="pedometrics"; version="0.7.0"; sha256="0rqldc67yrcg16i5q9wrmfmh3lw3qrfdxwdb4mxkjxx18v4fv737"; depends=[lattice latticeExtra Rcpp]; }; + pedprobr = derive2 { name="pedprobr"; version="0.2.0"; sha256="1s986n05wciq0nwvaqhq5d4rdzdh9sli66qihmfm43rqy246kjlr"; depends=[pedmut pedtools]; }; + pedquant = derive2 { name="pedquant"; version="0.1.3"; sha256="11l6h0pvysb02f81rnwsyc8c2xj3p4smgi9dbmsv41ka54v6rss7"; depends=[curl data_table ggplot2 gridExtra httr jsonlite readr readxl rvest scales stringi TTR xml2 zoo]; }; + pedtools = derive2 { name="pedtools"; version="0.9.3"; sha256="1jc11d1hd4wwc3lfa5h7g9sy6crybidc2mlasc3sbasjdzr1cyxb"; depends=[kinship2]; }; + pegas = derive2 { name="pegas"; version="0.13"; sha256="002i7s4g0nhnq0v05gs0yssqiyhpq2f7rw2rhn31hsbgxc86frvy"; depends=[adegenet ape]; }; pems_utils = derive2 { name="pems.utils"; version="0.2.26.4"; sha256="13d5cg2wdz84inby017bra6xzwhkp5qcy1b213r387fq771h2xrx"; depends=[baseline dplyr ggplot2 lattice latticeExtra loa RColorBrewer Rcpp rlang]; }; penDvine = derive2 { name="penDvine"; version="0.2.4"; sha256="0znpvsr7zy2wgy7znha1qiajcrz1z6mypi3f5hpims33z7npa7dl"; depends=[doParallel fda foreach lattice latticeExtra Matrix quadprog TSP]; }; penMSM = derive2 { name="penMSM"; version="0.99"; sha256="1xdcxnagvjdpgnfa5914gb41v5y4lsvh63lbz1d2l8bl9mpff3lm"; depends=[Rcpp]; }; @@ -11444,11 +11583,10 @@ in with self; { penalizedLDA = derive2 { name="penalizedLDA"; version="1.1"; sha256="1bw5wiixmmg1vr3v0d59vh67f0gy2rvr30bi58skvrkb25qcjq6l"; depends=[flsa]; }; penalizedSVM = derive2 { name="penalizedSVM"; version="1.1.2"; sha256="03zw95bc6svbnzak9x72s3b8l9gh581mxn2di1fl89gxlh864amd"; depends=[corpcor e1071 lhs MASS mlegp statmod tgp]; }; penaltyLearning = derive2 { name="penaltyLearning"; version="2019.5.29"; sha256="0m4smrpsw9pr8vpnx75yxp3q2z8fn25c9f2sxaqv2vjwdnyza5sx"; 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]; }; pendensity = derive2 { name="pendensity"; version="0.2.13"; sha256="1wcsib7m2161nqqrmgdvrj7lr8zq6njc9xr935hwfh3qbbgkmfjb"; depends=[fda lattice]; }; - pense = derive2 { name="pense"; version="1.2.5"; sha256="05v63xfmriipgziqw87h2y1m2dyvxwq6qd67x0kw5rq37zvyj3ak"; depends=[Matrix Rcpp RcppArmadillo robustbase]; }; - pensim = derive2 { name="pensim"; version="1.2.9"; sha256="10nrnxwfs41bhybs7j6xgnx0pq3c802n9k8irngmh8iy4w3wbhrq"; depends=[MASS penalized]; }; + pense = derive2 { name="pense"; version="1.2.9"; sha256="0ls573kx3z09v848fi5pvidc5l2dhmqv9vvyjspzzfiff3z6w09i"; depends=[Matrix Rcpp RcppArmadillo robustbase]; }; + pensim = derive2 { name="pensim"; version="1.3.1"; sha256="0n4f4vyyvr362fd8sbppwhbhrfr6wvfa5706ynhx82xmq04rkfcn"; 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]; }; pequod = derive2 { name="pequod"; version="0.0-5"; sha256="0mwrgyrxgiifpnpy15qxpdrdmd7dxqihccrnj5nh8fq9fvwymamg"; depends=[car ggplot2]; }; @@ -11456,18 +11594,17 @@ in with self; { perccal = derive2 { name="perccal"; version="1.0"; sha256="1akak068d0g70amj5sbvnqbywzy21l4wz11mhp71b7cp4xmr9n12"; depends=[Rcpp RcppArmadillo RcppEigen]; }; perccalc = derive2 { name="perccalc"; version="1.0.5"; sha256="14557k7khc3l5m0vlam0fvbsb6p78v9gfcnx5ksxcvrab28xj7p3"; depends=[multcomp tibble]; }; perfectphyloR = derive2 { name="perfectphyloR"; version="0.2.0"; sha256="00gvmn66lb9hfli7yc3l5913xpngib1vksg5zjnxqxiwdibjfqx8"; depends=[ape phytools Rcpp RcppArmadillo]; }; - performance = derive2 { name="performance"; version="0.4.3"; sha256="1164585ywbnrcy7an57kifh2gdb6g08z9pxw75ywqdcfyd51i3dz"; depends=[bayestestR insight]; }; + performance = derive2 { name="performance"; version="0.4.5"; sha256="0j6wmnwhfdd3v1a17qmg491q50579knjzscmyr4yk3xr0jbsbg8x"; depends=[bayestestR insight]; }; performanceEstimation = derive2 { name="performanceEstimation"; version="1.1.0"; sha256="08jx2zl6xh0rp54xa70gb717wbfdzfrx9b47i3b3ly41qaf85vrc"; depends=[dplyr ggplot2 parallelMap tidyr]; }; pergola = derive2 { name="pergola"; version="1.0"; sha256="1650ipp2b455xdkznwm7bnxvimad7nbyr9i1lg2vdh64j1qfh7gl"; depends=[seriation]; }; - periscope = derive2 { name="periscope"; version="0.4.7"; sha256="1kzk8vp7w3ki4z9arhf340hkbh44jzwf5p2lzyy5wx6z92s4lv5d"; depends=[DT ggplot2 logging lubridate openxlsx shiny shinyBS shinydashboard shinydashboardPlus]; }; + periscope = derive2 { name="periscope"; version="0.4.9-1"; sha256="1cnvzg3gvv5xf0parx55qxd9dp8zdr9gqlz2h5fqhs9d384zb8dl"; depends=[DT ggplot2 logging lubridate openxlsx shiny shinyBS shinydashboard shinydashboardPlus]; }; perm = derive2 { name="perm"; version="1.0-0.0"; sha256="0075awl66ynv10vypg63fcxk33qzvxddrp8mi4w08ysvimcyxijk"; depends=[]; }; - permDep = derive2 { name="permDep"; version="1.0.2"; sha256="0dv740vnjy99rc6px8w4ngis3w6zc4c67m0bx2lh327sqb7q3zsd"; depends=[BB survival]; }; permGPU = derive2 { name="permGPU"; version="0.14.9"; sha256="10r2qxbvzjxv3520lrn6cwi5akhhwgkhz7yaqxi5vh2f5l0s49wy"; depends=[Biobase foreach RUnit survival]; }; permGS = derive2 { name="permGS"; version="0.2.5"; sha256="0d2kp3c1fmnjjmsvc2qwh6m66yqvy2vrrxgv1fj2i4clsbavfa0y"; depends=[coin survival]; }; permPATH = derive2 { name="permPATH"; version="1.1"; sha256="06h1lqpmkg4ajjh4r837qp094h105n4mpvafnp2nsbv9yyayd4h8"; depends=[R2HTML xtable]; }; permubiome = derive2 { name="permubiome"; version="1.3"; sha256="0x5c9yf9xl14p1dxbhdggw75pnp0pzvm6bdigfpmhkq9qamdyscf"; depends=[dabestr ggplot2 gridExtra Matrix]; }; permuco = derive2 { name="permuco"; version="1.1.0"; sha256="1mp3yp4p1b382c31a3jcmq1n90zvb1lggacb3zdblpmz1yrj4v1c"; depends=[Matrix permute]; }; - permutations = derive2 { name="permutations"; version="1.0-5"; sha256="0891yqrj45fn11762d4an3bri8ihlxf0102z06mbfdy4hf8582h0"; depends=[magic numbers partitions]; }; + permutations = derive2 { name="permutations"; version="1.0-6"; sha256="1bygr2fa2qjka4bbx9i6l1iiy15anz427y3zh8hdq0r21aygmi7v"; depends=[magic numbers partitions]; }; permute = derive2 { name="permute"; version="0.9-5"; sha256="0ra8p5mf2590azrkas8z2ry7mif77xqxd29n4zgyi5vll225726j"; depends=[]; }; permutes = derive2 { name="permutes"; version="1.0"; sha256="1lrhlqwv1y2vgklgwp16jw90vmgifnp4rlxw55hhj8gs97agv5y8"; depends=[ggplot2 lmPerm plyr viridis]; }; perry = derive2 { name="perry"; version="0.2.0"; sha256="1lfmcq2xsxmfs7cxvhgxcsggslgjicbaks4wcjw1yjh67n559j46"; depends=[ggplot2 robustbase]; }; @@ -11477,15 +11614,14 @@ in with self; { perspectev = derive2 { name="perspectev"; version="1.1"; sha256="175s1nq5z4gfs5qb39lq230g6n0v8fxzs5hr9j2rgx0knpbjfq03"; depends=[ape boot doParallel foreach ggplot2 mapproj sp]; }; perturb = derive2 { name="perturb"; version="2.10"; sha256="07c84x67hzyr70zkmd00f4gxqzcrpizc7w7h2hs22xy6p719a5i2"; depends=[gdata]; }; perturbR = derive2 { name="perturbR"; version="0.1.3"; sha256="1sdk5ls8x66lds4cy40xbl383px4xmrh21cw4bgy83rzbjjzwp2h"; depends=[ggplot2 igraph]; }; - pesel = derive2 { name="pesel"; version="0.7.2"; sha256="08f4nmiyisq6zb55zxy0ipwbp4x2vslcy1a2hkbpvzpns5472cnb"; depends=[]; }; + pesel = derive2 { name="pesel"; version="0.7.3"; sha256="125rgbar1aiw7x3ywfb09s3gh3k0zal0p44h4928d854mn4m986s"; depends=[]; }; petitr = derive2 { name="petitr"; version="1.0"; sha256="0i13zhdrdka0ij0khdzj6ylvvcn4wxvplb8a368i1s64cpgak30c"; depends=[]; }; petrinetR = derive2 { name="petrinetR"; version="0.2.1"; sha256="0h9nsjsj87b6qvvkg81kn0j2c4xkzq89sddp9l6pjh636bdqwf8i"; depends=[DiagrammeR dplyr purrr visNetwork xml2]; }; petro_One = derive2 { name="petro.One"; version="0.2.3"; sha256="1xky85vfk2mpj8xxdqggismzirm3rx2wr51g12zr80i1dx5wak4i"; depends=[cluster data_table dplyr ggplot2 graph magrittr RColorBrewer Rgraphviz rvest RWeka SnowballC tibble tm urltools wordcloud xml2]; }; - pewdata = derive2 { name="pewdata"; version="0.3.0"; sha256="01h4h8rxsg7ykz10qajvq2cdlj3mwj5jf2gzv1mswga8g86dkdhq"; depends=[foreign magrittr purrr rio RSelenium stringr]; }; + pewdata = derive2 { name="pewdata"; version="0.3.1"; sha256="1dn6v41kwrs8dj66063y7l6vryih2q49qcfvmhaiaxzvbpzymiyc"; depends=[foreign magrittr purrr rio RSelenium stringr]; }; 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.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]; }; @@ -11500,37 +11636,37 @@ in with self; { ph2mult = derive2 { name="ph2mult"; version="0.1.1"; sha256="0w3w18fkr9xzv6mpb00cz5id33zgsnl6s8zgjpchzvrhmpjpp437"; depends=[clinfun]; }; phangorn = derive2 { name="phangorn"; version="2.5.5"; sha256="0ihkaykqjmf80d8wrk3saphxvnv58zma6pd13633bd3cwanc33f5"; 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]; }; + phase1PRMD = derive2 { name="phase1PRMD"; version="1.0.2"; sha256="0gr73nsp0an0ci6l86h9fw6l791jdw0b1497qi58w25zypggdyac"; depends=[arrayhelpers coda dplyr ggplot2 gridExtra kableExtra knitr MASS plyr RColorBrewer reshape2 rjags]; }; + phase1RMD = derive2 { name="phase1RMD"; version="1.0.9"; sha256="0dnyqa6jias2jqjqjpiq32jnd21ghb2shw45vdq8b5xyb8rxclwj"; depends=[arrayhelpers boot coda ggplot2 mvtnorm rjags]; }; phaseR = derive2 { name="phaseR"; version="2.1.3"; sha256="1xqh6k8zl0jc2srklb8vg57f88kssm80b286asg2cawanj06qs2k"; depends=[deSolve]; }; phateR = derive2 { name="phateR"; version="1.0.0"; sha256="1xfbzqhly569i4ic2gv4vn4sqnyqzhgqil17z1133sx78r4yj83a"; depends=[ggplot2 Matrix reticulate]; }; phd = derive2 { name="phd"; version="0.1"; sha256="1scwan3pkhdl0nyhpjrkcal1f58x0jkdkhixdcxppr1363r1v22a"; depends=[glmnet]; }; pheatmap = derive2 { name="pheatmap"; version="1.0.12"; sha256="1hdh74az3vyzz6dqa311rhxdm74n46lyr03p862kn80p0kp9d7ap"; depends=[gtable RColorBrewer scales]; }; phenModel = derive2 { name="phenModel"; version="1.0"; sha256="07jsc8jiwgxvhv4m6nr7llm22zzh5hd3pakw5c93jzim2835zvkp"; depends=[dplyr ggplot2 reshape]; }; phenability = derive2 { name="phenability"; version="2.0"; sha256="0can8qgdpfr4h6jfg23cnwh7hhmwv6538wg2jla9w138la7rhpd1"; depends=[calibrate]; }; - phenesse = derive2 { name="phenesse"; version="0.1.0"; sha256="0f9fwa0x7wmgkwmqx5afffhv1c5x6p67kpb9pki85x8b7nd1gqgl"; depends=[boot fitdistrplus]; }; + phenesse = derive2 { name="phenesse"; version="0.1.1"; sha256="18jhsycs3whrxamm50pavnqmjfjs27fyp4iy61d9m7mqbkg18js2"; depends=[boot fitdistrplus]; }; phenex = derive2 { name="phenex"; version="1.4-5"; sha256="00lsymflbmlxzxz8rxcpc94pc9zmhybial9f2xkz98h6h45zgrjl"; depends=[DEoptim foreach]; }; phenmod = derive2 { name="phenmod"; version="1.2-3"; sha256="0dxwx8c7zka29fq7svrvn8bghj8jh8grbrgsw4pvavx2439cldak"; depends=[gstat lattice pheno RColorBrewer]; }; pheno = derive2 { name="pheno"; version="1.6"; sha256="0xdya1g1ap7h12c6zn3apbkxr725rjhcp4gbdchkvcnwz4y9vw8c"; depends=[nlme quantreg SparseM]; }; - 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.5"; sha256="1kvb7lsixhh2sqdd5r9si0wbnrzfg3fbs29pb2nvl3086hnshl9i"; 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.5-2"; sha256="1mjwg56v6b0mak7hrm821lrckq0j8nzc4w2lyqxsancil5xlqnqd"; depends=[data_table dplyr foreach ggplot2 gridExtra iterators jsonlite lubridate magrittr numDeriv optimx plyr purrr Rcpp RcppArmadillo reshape2 shiny spam stringr tibble tidyr ucminf zoo]; }; + phenocamr = derive2 { name="phenocamr"; version="1.1.4"; sha256="1abcwbds406m1dncn188n8y3fqwxx2h7g7xrca8j6bw2ld69jswd"; depends=[changepoint daymetr httr jsonlite memoise MODISTools zoo]; }; + phenofit = derive2 { name="phenofit"; version="0.2.7"; sha256="0159jn606hm9mzrfhfnjl9dab9k8118x8g6pg3y86l31mwri6skv"; depends=[data_table dplyr foreach ggplot2 gridExtra iterators jsonlite JuliaCall lubridate magrittr numDeriv optimx plyr purrr Rcpp RcppArmadillo reshape2 shiny spam stringr tibble tidyr ucminf zoo]; }; phenology = derive2 { name="phenology"; version="7.3"; sha256="0hklk5k0i6vv733dm3npphg0zrhlb14ps6j6wwvsx50sqr3xl9jg"; depends=[HelpersMG lmf numDeriv optimx]; }; phenomap = derive2 { name="phenomap"; version="1.2.1"; sha256="0kpngxqrbahild5nblfvgx2kna43hqqldx5q3b127dnqwzbhfvbb"; depends=[doParallel dplyr phenex plyr raster rgdal stringr]; }; - phenopix = derive2 { name="phenopix"; version="2.3.1"; sha256="1yy163nh2b74m0v7f2gkgxaplvw4whs2h30bkw4chl0zyrcrci86"; depends=[bcp doParallel foreach gtools iterators jpeg plyr raster SDMTools sp stringr strucchange zoo]; }; + phenopix = derive2 { name="phenopix"; version="2.4"; sha256="0l6g4zc2wlmdizgbi3c8580ahyx59izpdas9sjbnas719hn59wvc"; depends=[bcp doParallel foreach gtools iterators jpeg plyr raster sp stringr strucchange zoo]; }; phiDelta = derive2 { name="phiDelta"; version="1.0.1"; sha256="0g1g5516p8i1gfpvsy75rdirib8sx1ki2mbf1cvgsnzh70h72gbv"; depends=[]; }; phia = derive2 { name="phia"; version="0.2-1"; sha256="0rv2akl5a488vax4sd9wnx765mch4vvcmg3iyxyljzl5kpqh5r00"; depends=[car Matrix]; }; philentropy = derive2 { name="philentropy"; version="0.4.0"; sha256="09vi6mfcig397226kq2fgymwg5ng8iysi6b2f616masscgshplxz"; depends=[dplyr KernSmooth Rcpp]; }; + phmm = derive2 { name="phmm"; version="0.7-14"; sha256="1kq7xgw3afzy1crbzqjpf2zqavmhiqkxh66j3nfisa1h4cq4kj9l"; depends=[lattice Matrix survival]; }; phonR = derive2 { name="phonR"; version="1.0-7"; sha256="0al2cbynnbvmd90lk1w1g1ppslqq0ng8vbb6bl7m4kqwd2lgv056"; depends=[deldir plotrix splancs]; }; phonTools = derive2 { name="phonTools"; version="0.2-2.1"; sha256="01i481mhswsys3gpasw9gn6nxkfmi7bz46g5c84m13pg0cv8hxc7"; depends=[]; }; phonenumber = derive2 { name="phonenumber"; version="0.2.2"; sha256="1m5idp538lvynmfp8m7l89js6hk5lpp26k419bdvj3hd3ap0n9lg"; depends=[]; }; phonfieldwork = derive2 { name="phonfieldwork"; version="0.0.3"; sha256="1d7rhyzdhm17hdd7ibvkgz3js01c7wskvxlhr1c6kzbvf0mibmb6"; depends=[phonTools rmarkdown tuneR]; }; phonics = derive2 { name="phonics"; version="1.3.2"; sha256="03iacdpzzw90jgh38mhs49gswz3292nlkizc1xr02xry6nd7357a"; depends=[BH data_table Rcpp]; }; - photobiology = derive2 { name="photobiology"; version="0.9.30"; sha256="0q15x9lgz0mvqnykg36iryz7nb0c92mz6zqyy56cypc6wwakym2i"; depends=[dplyr lubridate plyr polynom rlang splus2R stringr tibble zoo]; }; + photobiology = derive2 { name="photobiology"; version="0.10.0"; sha256="04i8s658r4y1aynhnv58xgwcqc9la6yjn0gax791qs29ilxqs5zp"; depends=[dplyr lubridate plyr polynom rlang splus2R stringr tibble zoo]; }; photobiologyFilters = derive2 { name="photobiologyFilters"; version="0.5.0"; sha256="1zijk6g9xf29ql7pybjs1zqkyn8s2zav4vz2pskj548v6hmrcw3x"; depends=[photobiology]; }; - photobiologyInOut = derive2 { name="photobiologyInOut"; version="0.4.21-1"; sha256="1n9vhxp4qvwqnqqpbkd8iz4pfl4x81kjyxm7fj9yzyjvdjfiq0sq"; depends=[colorSpec dplyr lazyeval lubridate photobiology readr readxl stringr tibble tidyr]; }; + photobiologyInOut = derive2 { name="photobiologyInOut"; version="0.4.22"; sha256="0zk9cikvvxh8k9yixq3ssv9yk9i6142fp7iijm4n48nzma61fdd3"; depends=[colorSpec dplyr lazyeval lubridate photobiology readr readxl stringr tibble tidyr]; }; photobiologyLEDs = derive2 { name="photobiologyLEDs"; version="0.4.3-1"; sha256="0inhl6ba1fzkak4752m60hkm6fzapzyz5kchvz18yv33dmm13v1c"; depends=[photobiology]; }; photobiologyLamps = derive2 { name="photobiologyLamps"; version="0.4.3"; sha256="1df7ngcyrmvhab80w1ggyv1p9srsvwr9f6pm8yl7hvkpkv6jbdsk"; depends=[photobiology]; }; photobiologyPlants = derive2 { name="photobiologyPlants"; version="0.4.2"; sha256="0ab5ks72mb5x03xc0ww9fcl0h13ja8402b1s670lqmmhyvp6fj3s"; depends=[photobiology photobiologyWavebands]; }; @@ -11538,9 +11674,7 @@ in with self; { photobiologySun = derive2 { name="photobiologySun"; version="0.4.1"; sha256="15wp8q29m5c4qplind9098ikxmm1r60lw8cm0pa48lmh33638ia3"; depends=[photobiology]; }; photobiologyWavebands = derive2 { name="photobiologyWavebands"; version="0.4.3"; sha256="04nc3yhd97k2pb1jv2bgda8mii4y4ph1884wagw8y3lc0g4dkicv"; depends=[photobiology]; }; photosynthesis = derive2 { name="photosynthesis"; version="1.0.0"; sha256="089b42s4277j6pmxa3jsg0bcrilqanp7dblnz6hlmgprqcbmlhwb"; depends=[crayon dplyr furrr future glue gunit magrittr purrr rlang stringr tealeaves tidyr tidyselect units]; }; - phrasemachine = derive2 { name="phrasemachine"; version="1.1.2"; sha256="1145c8ymarhbza8253rw4ybnq0k5pcckqxpdcr8s2y23pj182r1p"; depends=[NLP openNLP stringr]; }; phreeqc = derive2 { name="phreeqc"; version="3.6.0"; sha256="17dv4c94y7z5yaqx1g8llbmwpg15pkkixkhmi5knyyvi2fd23vkl"; 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.2.2"; sha256="0aihiz0gkvs7bq9f9fmfxsv7wk5yifcnmgnjl3y9qf2dzl5787bb"; depends=[git2r httr jsonlite RCurl rlist SASxport shiny stringr yaml]; }; phybreak = derive2 { name="phybreak"; version="0.2.0"; sha256="0vapc0w308wv1cd72p2xbj3q7jfnxwp08g5g8855a38pcn3njbfg"; depends=[ape phangorn Rcpp stringr]; }; @@ -11548,7 +11682,7 @@ in with self; { phyext2 = derive2 { name="phyext2"; version="0.0.4"; sha256="0j871kgqm9fll0vdgh071z77ib51y8pxxm0ssjszljvvpx1mb8rb"; depends=[ape phylobase]; }; phylin = derive2 { name="phylin"; version="2.0.2"; sha256="0v6fyk2prja448vdi7ipwzws28fjfi188pfncjf9mhn8jrgpfxl6"; 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]; }; + phylobase = derive2 { name="phylobase"; version="0.8.10"; sha256="0jzr1gdvmi4l640hwwzh9bxqmpja69bn3ygnaqx37awvyh7khi2s"; depends=[ade4 ape Rcpp rncl RNeXML]; }; phylocanvas = derive2 { name="phylocanvas"; version="0.1.3"; sha256="1l5br500lwwf7vp8wph5ykpkpqd15lypvhzy0c1cc8g8c6f7pckn"; depends=[ape htmlwidgets phylobase]; }; phyloclim = derive2 { name="phyloclim"; version="0.9.5"; sha256="107kilh0gwr84ig54g92zyk7zv553pky2bzpjqgf9fjwbm6fvmrs"; depends=[ape raster sp]; }; phylocomr = derive2 { name="phylocomr"; version="0.3.2"; sha256="1qdhf6a7cqp12i4macy5wcbk6mf01fqbm4rc11yl63qr72zwrbhy"; depends=[sys tibble]; }; @@ -11558,25 +11692,24 @@ in with self; { phylolm = derive2 { name="phylolm"; version="2.6"; sha256="0vah8ibicldi57wab4sk1kx7gdq6h34bm6swmxzhq7kikxfwmmyj"; depends=[ape future_apply]; }; phylometrics = derive2 { name="phylometrics"; version="0.0.1"; sha256="1pmr6l3wmaf91wdlsc5m63l07fibngnly2qzkma0rdi463ii03il"; depends=[mvtnorm]; }; phylopath = derive2 { name="phylopath"; version="1.1.2"; sha256="15fs845ay7nbhaxwapc2b33f134nqj1m365l44iyikdm4cacmdx0"; depends=[ape ggm ggplot2 ggraph igraph MuMIn pbapply phylolm purrr tibble]; }; - phyloseqGraphTest = derive2 { name="phyloseqGraphTest"; version="0.0.2"; sha256="1xgv2kf7j3ia5vk10r7w9588rfv7asdaf8f3yxwp5q7aqn3krm6q"; depends=[ggnetwork ggplot2 igraph intergraph phyloseq]; }; - phylosim = derive2 { name="phylosim"; version="3.0.5"; sha256="07adqgkxng0jj51nhwlsxxnd0bdxrk54lvj1fs53yxy236q6xwkf"; depends=[ape compoisson ggplot2 R_methodsS3 R_oo]; }; - phylotaR = derive2 { name="phylotaR"; version="1.0.0"; sha256="0plxc3l9fxxj9mfnhnpp5wrxyvxm292fxrwx2g8xysasmjb301v9"; depends=[ggplot2 igraph R_utils rentrez sys treeman treemapify XML]; }; + phyloregion = derive2 { name="phyloregion"; version="1.0.2"; sha256="1zqra1d9r2djwbd04p9wiadvms81hvg1idpji9yq11im10c47pcb"; depends=[ape betapart cluster colorspace data_table fastmatch igraph Matrix phangorn raster rgeos sp vegan]; }; + phyloseqGraphTest = derive2 { name="phyloseqGraphTest"; version="0.1.0"; sha256="0y1hxj68dcic4i7ihnw9hgf28qp6s6kpq4c08dy7gv19gq7sllgd"; depends=[ggnetwork ggplot2 igraph intergraph phyloseq]; }; + phylosignal = derive2 { name="phylosignal"; version="1.3"; sha256="1h73wwczwak5v89mybq16lmmfr0fxfv5mx347ffipy6q9vgvwqx5"; depends=[adephylo ape boot DBI igraph phylobase Rcpp RcppArmadillo]; }; phylotate = derive2 { name="phylotate"; version="1.3"; sha256="092kvn32j06vm8ilwjkgidcz11r3qhsmi0cb0g0nnykw0a0vii4p"; depends=[]; }; phylotools = derive2 { name="phylotools"; version="0.2.2"; sha256="1dhk1ncp5zi4zl1xfnjz64v983dm7bq7iimfjin80j0bdcpps44w"; depends=[ape]; }; phyr = derive2 { name="phyr"; version="1.0.2"; sha256="1qk4mbchi5dcz6vsmwb93gj5ihp2ygvm1ya63mkw11vkyy2nv67c"; depends=[ape dplyr gridExtra latticeExtra lme4 Matrix mvtnorm nloptr Rcpp RcppArmadillo]; }; phyreg = derive2 { name="phyreg"; version="1.0.2"; sha256="0m1psq79zl7h8791pl8g6i0ybda7vgddza8r9mwqhg4sw1q4bzcp"; depends=[]; }; physiology = derive2 { name="physiology"; version="1.2.1"; sha256="1z7xymwgj7bqn0yvcz3q8pvwhpr5vx5qd0x8sayal1vgpqc0nccb"; depends=[Rcpp]; }; - phytools = derive2 { name="phytools"; version="0.6-99"; sha256="03rrcx2r8sbf6510xdd0259p02apy2z84ifk7f076pvwlz5k5x9f"; depends=[animation ape clusterGeneration coda combinat expm gtools maps MASS mnormt nlme numDeriv phangorn plotrix scatterplot3d]; }; + phytools = derive2 { name="phytools"; version="0.7-20"; sha256="12fs20w7f921kn6qj397l2n9q9q6ri6hqpikmhbssah58a973isy"; depends=[animation ape clusterGeneration coda combinat expm gtools maps MASS mnormt nlme numDeriv phangorn plotrix scatterplot3d]; }; phytotools = derive2 { name="phytotools"; version="1.0"; sha256="049znviv2vvzv23biy1l28axm7bc7biwmq4bnn0cnjqgkk48ysz3"; depends=[FME insol]; }; - picante = derive2 { name="picante"; version="1.8"; sha256="1bcq2j7fs89c2jib68qq6la67rxyg9raryf162mwvjakpf6k19l1"; depends=[ape nlme vegan]; }; + picante = derive2 { name="picante"; version="1.8.1"; sha256="1b16zm8zjjsl181b8krkdcrbcw347kf772c4w7y5332qmfi7jhz0"; depends=[ape nlme vegan]; }; picasso = derive2 { name="picasso"; version="1.3.1"; sha256="1z7zm88wjp7fia7054l7i55f152iddrjj9wbcpcskhc8s6kfg53c"; depends=[MASS Matrix]; }; pid = derive2 { name="pid"; version="0.50"; sha256="05s3xqf95d4avh7gkr49jsm8jzacbv694c3wgppkkc40zip6vkc7"; depends=[DoE_base FrF2 FrF2_catlg128 ggplot2 png]; }; piecepackr = derive2 { name="piecepackr"; version="1.2.1"; sha256="1mh3b862pyxl9zkxmvcflnn4b0nx27s8fj3srs5ph2gwhh7l3zcy"; depends=[grImport2 jpeg png purrr R6 stringr tibble]; }; piecewiseSEM = derive2 { name="piecewiseSEM"; version="2.1.0"; sha256="1dpl3kyph0ry9g9321cknznjdizh03klg0s6hx56g6h8ygb0ar6h"; depends=[car DiagrammeR emmeans igraph lme4 MASS nlme]; }; - pifpaf = derive2 { name="pifpaf"; version="1.0.1"; sha256="0wj1fbhd871fnw7fjlbh0gdjz848mbwl1bzjp3cgmh9s7jnd2kci"; depends=[ggplot2 gridExtra MASS matrixcalc numDeriv sfsmisc]; }; - piggyback = derive2 { name="piggyback"; version="0.0.10"; sha256="08d7jxw7mvfyhjbr8zy95p952j2p94ii6zq38b8xw96g6k1380bz"; depends=[clisymbols crayon fs gh git2r httr jsonlite lubridate magrittr memoise usethis]; }; + piggyback = derive2 { name="piggyback"; version="0.0.11"; sha256="17cmkzp4g5gcapab3g5jxpabsmw4s3zsizqd99bh36xyw76v1jds"; depends=[clisymbols crayon fs gh git2r httr jsonlite lubridate magrittr memoise usethis]; }; pillar = derive2 { name="pillar"; version="1.4.3"; sha256="02sn7zw80wq33jgxk2i6m5jb83sk7y72dfhgyy0apfinv05w92ss"; depends=[cli crayon fansi rlang utf8 vctrs]; }; - pim = derive2 { name="pim"; version="2.0.1"; sha256="1m804clxc8m4nyzi4hhfy118527lgf2sb7589qd61fb83yh6hi8p"; depends=[BB nleqslv]; }; + pim = derive2 { name="pim"; version="2.0.2"; sha256="0kwlm6n23ccs0jz4plsqprg6inj3qv74zhvg9gpxyj3ksvdxp58i"; depends=[BB nleqslv]; }; pimeta = derive2 { name="pimeta"; version="1.1.3"; sha256="1mx0m438db4n041bns6sm8sr8vrj6w8b2kvpmrkkp0bly2vpv40q"; depends=[ggplot2 Rcpp RcppEigen scales]; }; pinbasic = derive2 { name="pinbasic"; version="1.2.2"; sha256="0mcw68wrixz2jf62nfifdgg8bnp4h1p3byivz28wi61blj8iaa75"; depends=[fastcluster ggplot2 lubridate Rcpp reshape2 scales]; }; pinfsc50 = derive2 { name="pinfsc50"; version="1.1.0"; sha256="1fja8xdqwsm4g223wmb2yg5fqmsg94hchzjd4qrqah1zb8vbdfdn"; depends=[]; }; @@ -11586,7 +11719,7 @@ in with self; { pinnacle_data = derive2 { name="pinnacle.data"; version="0.1.4"; sha256="1sl36i2857b3xwx7iwgy8mkgjvz7nfa74ch1n8kcxbj59ib7mp8p"; depends=[tibble]; }; pinochet = derive2 { name="pinochet"; version="0.1.0"; sha256="0qy18mlw34cv9p7b3qb5bidxyq44k0hzj91hm5vp6wkjhik4knvi"; depends=[]; }; pinp = derive2 { name="pinp"; version="0.0.9"; sha256="1hdj0mqwz0hwl6jsh5zknbgg10bj49giqnr4y3lavfbk8d7qmmvs"; depends=[knitr rmarkdown]; }; - pins = derive2 { name="pins"; version="0.3.1"; sha256="187n23r099fgv6d0xsb4hjah74nni14q380lldv5y17swv0vl89r"; depends=[base64enc crayon httr jsonlite magrittr mime openssl rappdirs withr yaml zip]; }; + pins = derive2 { name="pins"; version="0.3.2"; sha256="0bjax4zwjx0csxqrn5v80mqx8aw4apsrqggxncvwprd98wlyakjr"; depends=[base64enc crayon httr jsonlite magrittr mime openssl rappdirs withr yaml zip]; }; pinyin = derive2 { name="pinyin"; version="1.1.6"; sha256="0rw9qd5hbcmpi30vdqs31ijy37d8jlpqv0xif2nndb8cwj8x5bw2"; depends=[data_table splitstackshape]; }; pipe_design = derive2 { name="pipe.design"; version="0.5.1"; sha256="0r0szkdzifxmnnbr6675w8ij4zwqgxj3gwahc7a74mxr51f7qh8j"; depends=[ggplot2 gtools xtable]; }; pipeGS = derive2 { name="pipeGS"; version="0.4"; sha256="0ki4i70r5f195b4jfv3hxlxz3zj57mhy2yf4984bwr11impilz5w"; depends=[]; }; @@ -11599,27 +11732,27 @@ in with self; { piton = derive2 { name="piton"; version="0.1.1"; sha256="1265y4lv2m5nwrh25sahjkxwmivpxgh9shrdidlmaman7zs6cclr"; depends=[Rcpp]; }; pivmet = derive2 { name="pivmet"; version="0.2.0"; sha256="0xcm0pb5qn2vikhnf7fnp6942syq0xax7fgwmspixa6la5bdkksg"; depends=[bayesmix cluster corpcor MASS mclust mvtnorm RcmdrMisc rjags rstan runjags]; }; pivotaltrackR = derive2 { name="pivotaltrackR"; version="0.1.0"; sha256="024srncm288mn3bz6hv7ljzkchmnljk4yc2d4z7i05vsn7dzd2c6"; depends=[curl httr]; }; - pivottabler = derive2 { name="pivottabler"; version="1.2.3"; sha256="08aapjisah7q0lyw70cfiqkyic633z8cfiq760nnngh88cp1hkc7"; depends=[data_table dplyr htmltools htmlwidgets jsonlite R6]; }; + pivottabler = derive2 { name="pivottabler"; version="1.3.1"; sha256="0c82jd07g5fh9c36izc1brkz0rc7lryp5r1d50cvhlaap7dys588"; 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.5"; sha256="0nnib0gv9g22b9p01xigsgj04jv29fv7f444invfphfh9cc866m4"; depends=[]; }; pkgbuild = derive2 { name="pkgbuild"; version="1.0.6"; sha256="0xnlz6ivhkbmncg9hfw5p69lm4rjy3wn5lyxmygxyf4rrfnnqwxx"; depends=[callr cli crayon desc prettyunits R6 rprojroot withr]; }; - pkgcache = derive2 { name="pkgcache"; version="1.0.5"; sha256="0d0w3gqw3429dwmfc9804f9pl71l14phh03ppk2q5q1kyp49xw92"; depends=[assertthat cli cliapp crayon curl digest filelock glue prettyunits R6 rappdirs rematch2 rlang tibble uuid withr]; }; + pkgcache = derive2 { name="pkgcache"; version="1.0.6"; sha256="1wxxrcrckgrbsqrk2l4xrrkmya85pzjij1nc8cqcym8q0sgy7vph"; depends=[assertthat callr cli curl digest filelock glue prettyunits processx R6 rappdirs rlang tibble uuid]; }; pkgcond = derive2 { name="pkgcond"; version="0.1.0"; sha256="0pxj798042g23cf19r67nbgdyhpd868n2pkqjvjgrgr8ivwnkf1h"; depends=[]; }; pkgconfig = derive2 { name="pkgconfig"; version="2.0.3"; sha256="0l1qph8zyi2sic3k2qcd7vlfl7rzfh1q7z7zvjkl5f7y1x2fy3rk"; depends=[]; }; - pkgdown = derive2 { name="pkgdown"; version="1.4.1"; sha256="1y0mnsiq05snzschh2y5a0y1wrwh79c4jclsljjyflibbffhxxcf"; depends=[callr cli crayon desc digest evaluate fansi fs highlight httr magrittr MASS memoise openssl processx purrr rematch2 rlang rmarkdown rstudioapi tibble whisker withr xml2 yaml]; }; + pkgdown = derive2 { name="pkgdown"; version="1.5.0"; sha256="03r33cdnbq3xzm9485xhq2pn3vwxiji6rz5s7lvrcyq2k0gmdw7g"; depends=[callr cli crayon desc digest evaluate fansi fs highlight httr magrittr MASS memoise openssl processx purrr rematch2 rlang rmarkdown rstudioapi tibble whisker withr xml2 yaml]; }; pkgfilecache = derive2 { name="pkgfilecache"; version="0.1.2"; sha256="07x63w19fg7sl547501r2dx2ds5sfdfb29xvqrvjibf8265x25fw"; depends=[downloader rappdirs]; }; pkggraph = derive2 { name="pkggraph"; version="0.2.3"; sha256="1isiywgm20rypc5qr03p0k7lis76zzd96x5ncbvia644d2n13brm"; depends=[curl data_table dplyr ggnetwork ggplot2 htmltools igraph intergraph Matrix network networkD3 plyr RColorBrewer tibble]; }; pkgload = derive2 { name="pkgload"; version="1.0.2"; sha256="0z7jvharafahi2gv5547mk1n499isjzw06kfwymmxc0gd575d1ii"; depends=[desc pkgbuild rlang rprojroot rstudioapi withr]; }; - pkgmaker = derive2 { name="pkgmaker"; version="0.31"; sha256="0cc6v6kpwxwwh7k7zyw13wqdp0f9qzzr1a7vv02lskgii54aa4nb"; depends=[assertthat bibtex codetools digest magrittr registry stringi stringr withr xtable]; }; - 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]; }; + pkgmaker = derive2 { name="pkgmaker"; version="0.31.1"; sha256="0r0ga20dy25v9y5gjbds4y6kaa5a7qknh503qdkzllcpzbibh0hp"; depends=[assertthat bibtex codetools digest magrittr registry stringi stringr withr xtable]; }; + pkgnet = derive2 { name="pkgnet"; version="0.4.1"; sha256="194ynbhq6k7gp8l4ccq6m37qhhf791ynbppjh77cc0q50w2jz387"; depends=[assertthat covr data_table DT futile_logger glue igraph knitr magrittr R6 rlang rmarkdown visNetwork]; }; pkgsearch = derive2 { name="pkgsearch"; version="3.0.2"; sha256="1dvlqav7hp43x30rmwr8h3dscc0hc01i6mfc7hxvf7ny1rzckfv0"; depends=[assertthat httr jsonlite parsedate prettyunits tibble]; }; pkgverse = derive2 { name="pkgverse"; version="0.0.1"; sha256="0lsv7s9vsjvfpy19nxbdlbm363j01wwqqnrp0nlrik590hfq4w83"; depends=[devtools usethis]; }; pkmon = derive2 { name="pkmon"; version="1.0"; sha256="0j2v4zlf7vgy5gld29xiii15m9i85cpiwc25rmzjm02cz2p32c72"; depends=[]; }; pkr = derive2 { name="pkr"; version="0.1.2"; sha256="0m045dlcq3rls1w0smy4jvk3c57ckpqdv8xnz261k1gnnyjmz1k2"; depends=[binr foreign forestplot rtf]; }; pks = derive2 { name="pks"; version="0.4-1"; sha256="1lwm65s2b9y6vr1yr683n535yz8hbzc6j289a6yp45v2yai72m07"; depends=[sets]; }; - pksensi = derive2 { name="pksensi"; version="1.1.4"; sha256="0bsl7w96z6hsljdsg9g9xng1sspq2h3ik064g238firxvdyclb46"; depends=[data_table deSolve dplyr getPass ggplot2 magrittr reshape]; }; + pksensi = derive2 { name="pksensi"; version="1.1.5"; sha256="108qm4y1ss1pd6nhckwmg8b45hc3pg0xn5ch8q2xzi1h9imm7hz3"; depends=[data_table deSolve dplyr getPass ggplot2 magrittr reshape]; }; 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]; }; @@ -11628,21 +11761,22 @@ in with self; { 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]; }; planets = derive2 { name="planets"; version="0.1.0"; sha256="01zh7lgaykr9p186yy0vksn2pmc69b3xxh78w7z6wclvqjb7zh1p"; depends=[]; }; - planor = derive2 { name="planor"; version="1.5-1"; sha256="06xkn12v7ld5fxqjvpmx01jb0a87hnzs8d2clia67sk2h33nlnka"; depends=[bit64 conf_design Rcpp RcppArmadillo]; }; + planor = derive2 { name="planor"; version="1.5-3"; sha256="0klnl8c5h1db8dl9jn159f4ypa8sga0yqdhlh1x8gdkbx7amzrzj"; depends=[bit64 conf_design Rcpp RcppArmadillo]; }; plantecophys = derive2 { name="plantecophys"; version="1.4-4"; sha256="005js9r7xg4jf2aqgsqddkkxhcdnhsiyzc1cqa7j59r4g5xbmh1j"; depends=[]; }; + plantecowrap = derive2 { name="plantecowrap"; version="1.0.4"; sha256="0syxf63xy5whzw03ys5cxyw7689mr7ihgmqddv53jb8rlbwm84p8"; depends=[ggplot2 minpack_lm plantecophys tidyr]; }; plaqr = derive2 { name="plaqr"; version="2.0"; sha256="15pdb57123m3cahvcsyrrvxjwxvs2f389yxip91gjxn68jf6cx1l"; depends=[quantreg]; }; - plater = derive2 { name="plater"; version="1.0.1"; sha256="0v5b9r6iha18qvrjpbr1p8fy06nf31x63ch5cnb4axyqa0x5skpp"; depends=[dplyr]; }; + plater = derive2 { name="plater"; version="1.0.2"; sha256="0z3s33xpfkd1ln37bpsgycbb35hgjq23yi151imdxyv80493vy4w"; depends=[dplyr]; }; platetools = derive2 { name="platetools"; version="0.1.2"; sha256="026i0xxci33r1c4zrjwjpw1wqdnj44nryqzzapa367160p9f2v5y"; depends=[ggplot2 RColorBrewer]; }; plde = derive2 { name="plde"; version="0.1.2"; sha256="1g1b1sgyfxgfkjcr3sdkan8jd6r7yyi0izc83vyj11bdk08jx22h"; depends=[]; }; pleiades = derive2 { name="pleiades"; version="0.2.0"; sha256="1h3q4yf0w0al7n8l7ca4vgx2bhrrz8clli15svlds7n402s8rzp5"; depends=[crul DBI dbplyr dplyr gistr jsonlite rappdirs RSQLite]; }; pleio = derive2 { name="pleio"; version="1.6"; sha256="0av1sl0fdn2ia7ddalbvidhcnsvs36iq618s1bknjw29y5yyq020"; depends=[Matrix rms]; }; - plethem = derive2 { name="plethem"; version="0.1.7"; sha256="1ajcy3wwc23hd6n9jsvr9x82rnpnq5y8h588wgy1jfwydgrshn06"; depends=[data_table deSolve devtools dplyr DT formatR gdata ggplot2 httk magrittr miniUI plotly readxl reshape2 rhandsontable RSQLite rstudioapi shiny shinyBS shinydashboard shinyjs shinythemes shinyWidgets sqldf truncdist V8]; }; plfMA = derive2 { name="plfMA"; version="1.0.4"; sha256="0q6wiiknmgw812kcf9qq309zlizyry7ldn6m08lkw6xq6i4f4s85"; depends=[cairoDevice gWidgets gWidgetsRGtk2 limma RGtk2]; }; plfm = derive2 { name="plfm"; version="2.2.2"; sha256="1jgf3jrkdpsf77i4lf68s6sxax95c9is4nryhnzanq9i5f23j24v"; depends=[abind sfsmisc]; }; plgp = derive2 { name="plgp"; version="1.1-7"; sha256="02g6saabrsd8pra0szbwcbilf6w5ywg2gxqb5zdvbxds2vw36hn0"; depends=[mvtnorm tgp]; }; plink = derive2 { name="plink"; version="1.5-1"; sha256="0rn2i9i8af9aq0xgxhpcdchs2952lq2d2sg8x3js0zi3vcml76k0"; depends=[lattice MASS statmod]; }; + plinkFile = derive2 { name="plinkFile"; version="0.1.0"; sha256="0803hp822v9rqh4h437q2nmab19yamc4dbyi6iimm67ykp0d5xss"; depends=[]; }; plinkQC = derive2 { name="plinkQC"; version="0.3.0"; sha256="1s458cg4y1zisjk3var3fnm1q54hfbl228i9qdxgzkkrhzc9mghw"; depends=[cowplot data_table dplyr ggforce ggplot2 ggrepel igraph optparse R_utils sys UpSetR]; }; - plm = derive2 { name="plm"; version="2.2-0"; sha256="0sn8a3f5xaa1c98br454c6h5jfba7s3jscl61km1gm47qcr8a0vz"; depends=[bdsmatrix Formula lattice lmtest MASS maxLik nlme Rdpack sandwich zoo]; }; + plm = derive2 { name="plm"; version="2.2-3"; sha256="10bwd5xpim12038bxs8bmlaf33smlqy5f0cn7p3j6ipfygdwryld"; depends=[bdsmatrix Formula lattice lmtest MASS maxLik nlme Rdpack sandwich zoo]; }; plmm = derive2 { name="plmm"; version="0.1-1"; sha256="1dfxd1mqqjy2mf7qc6mh4wx5ya9q8fkqgrf01apisb66xxx5zya7"; depends=[Formula nlme sm]; }; pln = derive2 { name="pln"; version="0.2-1"; sha256="09zg7zwmmqpjr1j59lqsjf4blrkya9wfwddgzfm9rr5jxrzvqcv8"; depends=[]; }; plogr = derive2 { name="plogr"; version="0.2.0"; sha256="0a8dhzlna79ggyhfr0nncgh15a9n6r0dsz664pz0ah323wpblqqf"; depends=[]; }; @@ -11651,16 +11785,16 @@ in with self; { plot3Drgl = derive2 { name="plot3Drgl"; version="1.0.1"; sha256="12p4qc9vmhr86ssx6xnz3cmx84q5jgd28bw9dp4wjrn04n6l4va6"; depends=[plot3D rgl]; }; plot3logit = derive2 { name="plot3logit"; version="1.0.2"; sha256="0pgqlq8rpkrv277d1mfy2z22mkykc5zmhvkg07wsz3hdxr0ifx80"; depends=[ellipse ggplot2 ggtern magrittr reshape2 Ternary]; }; plotGMM = derive2 { name="plotGMM"; version="0.2.1"; sha256="1gp99gvb886kcwjk9yvfd7s6mgy3jf3x0zhpaj9zp0fky12ivz7b"; depends=[amerika ggplot2 wesanderson]; }; - plotKML = derive2 { name="plotKML"; version="0.6-0"; sha256="18c2lwdlxbzlfhlf0bip825v2mfrnqd9gg30l967zv112j7x0hrf"; depends=[aqp classInt colorRamps colorspace dismo gstat pixmap plotrix plyr raster RColorBrewer rgdal RSAGA scales sp spacetime stringr XML zoo]; }; + plotKML = derive2 { name="plotKML"; version="0.6-1"; sha256="1k5bfajgzcj912ja8s3ashsvfqz0sx10746x4ggyknyp17qrlbzw"; depends=[aqp classInt colorRamps colorspace dismo gstat pixmap plotrix plyr raster RColorBrewer rgdal RSAGA scales sp spacetime stringr XML zoo]; }; plotMCMC = derive2 { name="plotMCMC"; version="2.0-0"; sha256="0i4kcx6cpqjd6i16w3i8s34siw44qigca2jbk98b9ligbi65qnqb"; depends=[coda gplots lattice]; }; plotMElm = derive2 { name="plotMElm"; version="0.1.5"; sha256="0wwqzrpkmq9gzazdzlk62qig6vz43niada6fxh1wcsjqjwkcccgp"; depends=[ggplot2 interactionTest]; }; plotROC = derive2 { name="plotROC"; version="2.2.1"; sha256="0bk8j2lp80zcz4kkig1y5a1ig8vbjh7b4inzc46bn07ns1rdjgzg"; depends=[ggplot2 gridSVG plyr rlang shiny]; }; plotSEMM = derive2 { name="plotSEMM"; version="2.4"; sha256="0fircrayhz92zvkigkyb1zpn07bvssqs1ip15p926zj3rl77fqgy"; depends=[MplusAutomation plotrix plyr Rcpp shiny]; }; - plotdap = derive2 { name="plotdap"; version="0.0.5"; sha256="0c0ixynfn7a0n9h78vngsy6rqsypji6ybb4iwbrm14a42q0krhy3"; depends=[cmocean dplyr gganimate ggplot2 lazyeval lubridate magrittr maps raster rerddap rgeos scales sf tidyr viridis]; }; + plotdap = derive2 { name="plotdap"; version="0.0.7"; sha256="1zwf4s2myw20klbc0jnfrbg0hll9528m8vcxnc419nsgm3m2nskb"; depends=[cmocean dplyr gganimate ggnewscale ggplot2 lazyeval lubridate magrittr maps raster rerddap rgeos scales sf tidyr viridis]; }; plotfunctions = derive2 { name="plotfunctions"; version="1.3"; sha256="0cnmwkfjg45187j490sf01gxijhajrpi6j13hfckli2ysn6xrgz3"; depends=[]; }; - plothelper = derive2 { name="plothelper"; version="0.1.6"; sha256="00bwv2ih967sg81pr8ahyc80j24i1dvcay416andg12674k6gj2w"; depends=[ggfittext ggplot2 gridExtra magick plyr scales]; }; + plothelper = derive2 { name="plothelper"; version="0.1.8"; sha256="0g8dnhr1v0k6m1ws35f3mj99fc32i51jxryg1iy5p852g500qqkr"; depends=[farver ggfittext ggplot2 gridExtra magick plyr scales]; }; plotluck = derive2 { name="plotluck"; version="1.1.1"; sha256="16wqj4xfa8b7kal6v8mp2zlhwf9l3y6y5n44qbpvy652gzb2rw2z"; depends=[ggplot2 hexbin Hmisc plyr quantreg RColorBrewer scales]; }; - plotly = derive2 { name="plotly"; version="4.9.1"; sha256="0gadam4qw81q9gpjp7sqrpd7ikmcdsc78d8vjn39g0xzs5j8r845"; depends=[base64enc crosstalk data_table digest dplyr ggplot2 hexbin htmltools htmlwidgets httr jsonlite lazyeval magrittr promises purrr RColorBrewer rlang scales tibble tidyr viridisLite]; }; + plotly = derive2 { name="plotly"; version="4.9.2.1"; sha256="1f0x83a2s7200iqi6gpngijks06fcvcbm6701d5r5rxpb8rawppl"; depends=[base64enc crosstalk data_table digest dplyr ggplot2 hexbin htmltools htmlwidgets httr jsonlite lazyeval magrittr promises purrr RColorBrewer rlang scales tibble tidyr viridisLite]; }; plotlyGeoAssets = derive2 { name="plotlyGeoAssets"; version="0.0.2"; sha256="1c6i4dz5qmym1pcddgffcqgb76jz84252xldprg2caylrqvzv6b7"; depends=[]; }; plotmo = derive2 { name="plotmo"; version="3.5.6"; sha256="15555b7y62sc0z3r41gb56fmc6rmj1icnanyibx22v8kjz48vw3q"; depends=[Formula plotrix TeachingDemos]; }; plotpc = derive2 { name="plotpc"; version="1.0.4"; sha256="1sf7n7mfyaijldm24bc8r8pfm8pp9cyaja7am14z2wpj2j9f9vyq"; depends=[]; }; @@ -11673,7 +11807,7 @@ in with self; { 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]; }; - plsVarSel = derive2 { name="plsVarSel"; version="0.9.4"; sha256="19xz7ds4jx5ql999mwn9zs983rlshf14y4nlah8cfy9gpi0vl1g1"; depends=[bdsmatrix genalg MASS mvtnorm pls progress]; }; + plsVarSel = derive2 { name="plsVarSel"; version="0.9.6"; sha256="0z8igm7ldz2z2vc2fmlqv2pry5lb4mckrcw9rky7cakr3q0gciqw"; depends=[bdsmatrix genalg MASS MSQC mvtnorm pls praznik progress]; }; plsdepot = derive2 { name="plsdepot"; version="0.1.17"; sha256="1i00wxr451xpfy6dnvcm11aqf9106jsh5hj7gpds22ysgm4iq5w4"; depends=[]; }; plsdof = derive2 { name="plsdof"; version="0.2-9"; sha256="1g41nbycgzjwrackbdf08q1phqpyy6zihm5ak2728683vd88fxzv"; depends=[MASS]; }; plsgenomics = derive2 { name="plsgenomics"; version="1.5-2"; sha256="1pvb50nv6jc99bm2hsxpzazg26y49yi24wwwim5xcjj6j1szbip4"; depends=[boot fields MASS plyr reshape2 RhpcBLASctl]; }; @@ -11688,14 +11822,14 @@ in with self; { plus = derive2 { name="plus"; version="1.0"; sha256="1l7lvnq7vahj8m7knmr4q3wj00ar7iq89j45a2dqn2bh0qyj68ls"; depends=[]; }; 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.5"; sha256="0x4mbb3rgv1ayxqidw0p9i10khbg51fz5r62vw4il8d7licqq07a"; depends=[Rcpp]; }; + plyr = derive2 { name="plyr"; version="1.8.6"; sha256="11sjjdn146w95s1vsfmmgdls082cbnm1slv98xvyjhsl2mpx4mga"; depends=[Rcpp]; }; pm4py = derive2 { name="pm4py"; version="1.2.7"; sha256="11xbsmsc9pxd98fy28l3nxzhb6c2pwvh1gmm34jnqn0rjbpb2n9i"; 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]; }; pmd = derive2 { name="pmd"; version="0.1.5"; sha256="18a7j5lvsl2jsay4g7790slj12xkljlnrpvg66cq5cvsid8qm8x8"; depends=[rcdk RColorBrewer rmarkdown shiny]; }; - pmdplyr = derive2 { name="pmdplyr"; version="0.3.0"; sha256="1gyd55h718zf3crhgkdln48jw7y7djgsdjf4j06zr3rgy5mk2sp3"; depends=[dplyr lubridate magrittr pillar rlang tibble tidyr tidyselect vctrs]; }; + pmdplyr = derive2 { name="pmdplyr"; version="0.3.1"; sha256="1155hikxfz9rp111sy96kj2dkka45ip1xi7kximq9ilsn5kwswzn"; depends=[dplyr lubridate magrittr pillar rlang tibble tidyr tidyselect vctrs]; }; pmhtutorial = derive2 { name="pmhtutorial"; version="1.5"; sha256="1hcw8hwpsivbhz86lnzy08q9n8vahnq8f7rmi4xkmg6b44582cqx"; depends=[mvtnorm Quandl]; }; - pmml = derive2 { name="pmml"; version="2.2.0"; sha256="0j2gznmjgzv9ccpgkhpkww99sa165b7jwhx3g61rvbcmg89l3i3m"; depends=[stringr XML]; }; + pmml = derive2 { name="pmml"; version="2.3.0"; sha256="13w5i98yj3ksbryzsgkx3i59iafywygyq1dk8x2c0nlb1nm0dji9"; depends=[stringr XML]; }; pmmlTransformations = derive2 { name="pmmlTransformations"; version="1.3.3"; sha256="0315kb5x04pidpzr04yaxyynp0mz4ilzp7vkspq4agjkds5hyc88"; depends=[]; }; pmpp = derive2 { name="pmpp"; version="0.1.1"; sha256="1srmkih6zsyf8yf1f045xy1afcz0if6nf1ncslgrq6rgm7330lkw"; depends=[data_table dplyr ggplot2 magrittr MASS Matrix minqa moments plm pracma]; }; pmr = derive2 { name="pmr"; version="1.2.5"; sha256="0dq97dfjmgxlhr3a2n20vyyzfmamcicw878hdxpw31lw02xs6yls"; depends=[]; }; @@ -11711,12 +11845,11 @@ in with self; { poibin = derive2 { name="poibin"; version="1.5"; sha256="1sxryvwwz6ldsnkzdy56p8c895s5yvpcai9ndyjv1x5q3l05wf9v"; depends=[]; }; poilog = derive2 { name="poilog"; version="0.4"; sha256="0bg03rd5rn4rbdpiv87i8lamhs5m7n7cj8qf48wpnirg6jpdxggs"; depends=[]; }; pointRes = derive2 { name="pointRes"; version="1.1.3"; sha256="0yfzidc93ghpf116lxbx4fr0d71wl79y3nz6mkirx4pli6gb8x8d"; depends=[ggplot2 gridExtra plyr TripleR]; }; - pointblank = derive2 { name="pointblank"; version="0.3.0"; sha256="0r94yplk5s9ckj8xlrqzc2xb77aik18anvhg6kbprzjzmhmahhrm"; depends=[dplyr magrittr rlang tidyselect]; }; + pointblank = derive2 { name="pointblank"; version="0.3.1.1"; sha256="0qqj3x4zvh14b2kirvvyzscm9jsk6k11s6cqjdwv6pyb32afn1iq"; depends=[blastula cli DBI dbplyr dplyr ggforce ggplot2 glue gt htmltools magrittr rlang scales tibble tidyselect]; }; pointdensityP = derive2 { name="pointdensityP"; version="0.3.4"; sha256="0vv8j1yz8n2vmmp6bg2i8w3dchdbybsdxn3sk5d1ync2knih8l2s"; depends=[data_table]; }; - 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]; }; + poisFErobust = derive2 { name="poisFErobust"; version="2.0.0"; sha256="1i6y3745i385y3r45i0xk7ciw1k6brmn709k5qhx8xphq0k4an5n"; depends=[data_table glmmML]; }; poisbinom = derive2 { name="poisbinom"; version="1.0.1"; sha256="0mjxg0s3nck7qrmq4bbrhwxfwr6fqml54s9k8q1mkfzlifa7qyf7"; depends=[Rcpp]; }; poismf = derive2 { name="poismf"; version="0.1.3"; sha256="19jznsz59ch3ksgxii9j7lzaqlpc0wlvxx59ax60w76w2c9m0ify"; depends=[Matrix nonneg_cg Rcpp SparseM]; }; poisson = derive2 { name="poisson"; version="1.0"; sha256="1diyf1b84sr6iai3ghd3kcp6fc6w7fan49wzs1lzvxxsmp15ag2d"; depends=[]; }; @@ -11724,18 +11857,20 @@ in with self; { poissonMT = derive2 { name="poissonMT"; version="0.3-5"; sha256="14qkc8qz3423b13gp6gsp8cbb1nv9wwjjfa4i9zc15qy5i99ha26"; depends=[checkmate MASS robcbi robustbase]; }; poistweedie = derive2 { name="poistweedie"; version="1.0"; sha256="18992fafypds3qsb52c09fasm3hzlyh5zya6cw32wnhipmda643m"; depends=[]; }; poker = derive2 { name="poker"; version="0.8.8"; sha256="14ik77440z22k4kwq0p1fn7adzi0p8mh8j8hd7ayinvrab4b5r85"; depends=[]; }; - policytree = derive2 { name="policytree"; version="0.9.0"; sha256="15cqmcdxk25y300z5qvhh981bmzph272sciaa40swj5jw5fz357y"; depends=[BH grf Rcpp]; }; + polaroid = derive2 { name="polaroid"; version="0.0.1"; sha256="0m3jbiz4n7mgbbdkd28m6dqsclyjcgshpxd6ws8df7zchx7fch07"; depends=[argonDash argonR colourpicker ggplot2 hexSticker png shiny shinyWidgets]; }; + policytree = derive2 { name="policytree"; version="0.9.2"; sha256="0d0b3rdmcr692rkbg223l0cwc86zlj2p75m9jlgk6w07f1n2h68p"; depends=[BH grf Rcpp]; }; poliscidata = derive2 { name="poliscidata"; version="2.2.3"; sha256="18mmdzf9hrfz36rh1rg1j5q1m131xadppy272y4f4yay0ljafbm2"; depends=[abind car descr ENmisc gplots Hmisc plotrix plyr survey weights xtable]; }; polite = derive2 { name="polite"; version="0.1.1"; sha256="15hiifaf63hx0xn453lr0xhdnxqifrgyrgrymp0a9k3j7qja59jk"; depends=[here httr magrittr memoise ratelimitr robotstxt rvest usethis]; }; - politeness = derive2 { name="politeness"; version="0.4.1"; sha256="0jb5s62qbf5904j0990iv4z1zlqmyvci4dbahkd2lzxsz51ykdq3"; depends=[data_table ggplot2 glmnet quanteda spacyr stringr textir tm]; }; + politeness = derive2 { name="politeness"; version="0.5.1"; sha256="0vvqh53kj4vm6wfg2fk5gdxyiycg7zg72m8d7qym9si930jbm32s"; depends=[data_table ggplot2 glmnet quanteda spacyr stringr textclean textir tm]; }; politicaldata = derive2 { name="politicaldata"; version="0.1.3"; sha256="1n25k53mmlmmg9p9a36jh4z6xhl1yyv9v1c56mav873105h359wi"; depends=[]; }; - pollen = derive2 { name="pollen"; version="0.71.0"; sha256="0g0g6n8y87jyk7l4s6xpdk60dz4lkg2xp5c5agakkrah8a233920"; depends=[dplyr lubridate purrr]; }; + pollen = derive2 { name="pollen"; version="0.72.0"; sha256="0plxc7rys5q4c1dwammv3b2pnys1hdh5ic0b2ndmv5cbyspf2h0y"; depends=[dplyr lubridate purrr]; }; pollimetry = derive2 { name="pollimetry"; version="1.0.1"; sha256="09zmcwlgzl4fnkdg2m424ibv3izzrm595c7pi4mc3bd1g8sa2ypn"; depends=[brms repmis]; }; pollstR = derive2 { name="pollstR"; version="2.0.1"; sha256="13g5z1hix1bmsxznq5qx82yf445rvvyn67ch9bihxm1hr4cr4sbl"; depends=[httr lubridate purrr stringr]; }; + pollster = derive2 { name="pollster"; version="0.1.0"; sha256="1hyh9xc6h6lzsbgymg3m1660ia7bg9c9nv2dgsy83lzpjrzc7yn5"; depends=[dplyr forcats labelled lubridate rlang stringr tidyr]; }; polmineR = derive2 { name="polmineR"; version="0.8.0"; sha256="1j9f83b1lfb02q830zaffrspxrhp58j9l3cc80cxiflmkm9s1jm9"; depends=[data_table DT jsonlite knitr magrittr Matrix pbapply R6 RcppCWB slam stringi tm xml2]; }; polspline = derive2 { name="polspline"; version="1.1.17"; sha256="0c7fnxpqpy3hibiim4yib6l6bq363s97wwvllxp4lp8h06fjcyyn"; depends=[]; }; polyCub = derive2 { name="polyCub"; version="0.7.1"; sha256="0ln1n5w64vgq63gm4mm9wzl9lbp7ppgaxg0ba0yw0xsr5cmkyp37"; depends=[sp]; }; - polyMatrix = derive2 { name="polyMatrix"; version="0.2.4"; sha256="1z7n2ankfd9nrr7l3rm3pcm26pjss0f8wv187g9dxq4db5qx490k"; depends=[MTS polynom]; }; + polyMatrix = derive2 { name="polyMatrix"; version="0.2.5"; sha256="18s2213wdx9jgwq04b5k6vd7xkq39pcpn4z70n9w0h9l0zmjriaw"; depends=[MTS polynom]; }; polyPK = derive2 { name="polyPK"; version="3.1.0"; sha256="0cb83sq8iz4swr73vwhh8n4k62p6321nsy1sz5fba0wiicycxf55"; depends=[circlize corrplot gplots Hmisc impute imputeLCMD mixOmics pcaMethods pkr plyr ropls sqldf xlsx]; }; polyRAD = derive2 { name="polyRAD"; version="1.1"; sha256="04rhff7yzswilx67ak56vsr4sxfjzhd3d9fihnx2mnyddf1mhamq"; depends=[fastmatch pcaMethods Rcpp]; }; polySegratio = derive2 { name="polySegratio"; version="0.2-5"; sha256="0djw49mbhd7x6jr0f5qkb9akw3fw3ax4w9xv8iwa5f65q5gbxpdf"; depends=[gdata]; }; @@ -11750,48 +11885,51 @@ in with self; { polymapR = derive2 { name="polymapR"; version="1.0.20"; sha256="16gyzlvj2nfyl9ypv5cmvqvn3phxpxf36b0bnvslkxyyx0fsyxrx"; depends=[combinat doParallel foreach igraph knitr MDSMap]; }; polynom = derive2 { name="polynom"; version="1.4-0"; sha256="1pflscwc0qzdf0y60j7s0dkglgmz18xajywfbn6s263idyr8idy5"; depends=[]; }; polypoly = derive2 { name="polypoly"; version="0.0.2"; sha256="00c1hrnf575awvh0rlsnf6nkgi9p3fnqhd1knamkgb4icwi5s46d"; depends=[ggplot2 reshape2 rlang tibble]; }; - polyreg = derive2 { name="polyreg"; version="0.6.4"; sha256="0q1zs56b59xq8g1lvqryfdkq3zwix1dhr4606dq4mbf2hsjkvkd5"; depends=[dummies nnet partools RSpectra]; }; + polyreg = derive2 { name="polyreg"; version="0.6.7"; sha256="1znl46m4zfd0f4qwg3r2anz3nyn8hk607772pzxiwj5w3xc96g56"; depends=[dummies nnet partools regtools RSpectra]; }; polysat = derive2 { name="polysat"; version="1.7-4"; sha256="08jmkik4s2171znp3w4i0v0g0k2s0di3xqwr9sf9hyd0sf8af8dp"; depends=[Rcpp]; }; polywog = derive2 { name="polywog"; version="0.4-1"; sha256="02qk1cyvkd77mwlvhj1zzzi0bmy7qxz29j2v730wp7rz4w7h5x5n"; depends=[foreach Formula glmnet iterators Matrix miscTools ncvreg Rcpp stringr]; }; pom = derive2 { name="pom"; version="1.1"; sha256="02jv19apn0kmp1ric2cxajlaad2fmsz4nm4izd2c3691vzas7l83"; depends=[matrixcalc]; }; pomdp = derive2 { name="pomdp"; version="0.9.2"; sha256="0bzppkda355zj467ahcyaf2dsjajyiznzi0y07n9pf9ccr6rh5lg"; depends=[igraph]; }; - pomp = derive2 { name="pomp"; version="2.4"; sha256="19j8aqsxx54xacw6vd3yva8jznqrycc831zs5f08x9r2q1ld6yjp"; depends=[coda deSolve digest magrittr mvtnorm plyr reshape2]; }; + pomp = derive2 { name="pomp"; version="2.7"; sha256="0gqc84hsxms3s2qcb082vsvzfawbc5xyl11f3lkmqkpxmqyazs7h"; depends=[coda deSolve digest magrittr mvtnorm plyr reshape2]; }; pompom = derive2 { name="pompom"; version="0.2.0"; sha256="1alz3lrj7m16vhymsvvrcmf0kmgx88q2f3v4j6wiciqv77bnyai1"; depends=[ggplot2 lavaan qgraph reshape2]; }; pooh = derive2 { name="pooh"; version="0.3-2"; sha256="0qwa5j91aypasvsf4xcfbl6lz7llawdr38jiflzmfak2ad72rv7j"; depends=[]; }; pool = derive2 { name="pool"; version="0.1.4.3"; sha256="065pbvhgvvgv00df4kj4zn7mlbrv2iqa1583k0hlgavn15gfm6d2"; depends=[DBI dbplyr dplyr later R6]; }; poolVIM = derive2 { name="poolVIM"; version="1.0.0"; sha256="19yw6pp5l3jmla4wjbvpjq132f645yks49pzsdv123f3qfr8f0m6"; depends=[EmpiricalBrownsMethod Hmisc ranger]; }; poolfstat = derive2 { name="poolfstat"; version="1.1.1"; sha256="12iwhfj1a87mbis7whgp4z3qg97xkj90rw8b9jsqnfmzhz6fn0yp"; depends=[doParallel foreach]; }; - pooling = derive2 { name="pooling"; version="1.1.1"; sha256="0011w80pxz01scj2sa69m1bcfq797hq3ihpw46fdlxsxavz8prwy"; depends=[cubature dplyr dvmisc ggplot2 ggrepel mvtnorm pracma]; }; + pooling = derive2 { name="pooling"; version="1.1.2"; sha256="19mrzax3k35fhgjpnlrigf0nscsdl3xb7k82s5q472k4bcz7ya5b"; depends=[cubature data_table dplyr dvmisc ggplot2 ggrepel mvtnorm numDeriv]; }; + poolr = derive2 { name="poolr"; version="0.8-2"; sha256="1rkfnrz5x7f9kqpivj0gvs3fxfb9agnm8sybb7wmvvcsmshzrpkf"; depends=[Matrix]; }; + poorman = derive2 { name="poorman"; version="0.1.9"; sha256="0g3f02752i890pq3yayhjwlczddmwqcc67xza3249301k508vbpv"; depends=[]; }; pop = derive2 { name="pop"; version="0.1"; sha256="0hbxdrkasb69x7ipddvyrzl5vvc7dd6rzj1vy7v3chg3rzgq89cj"; depends=[igraph MASS]; }; popEpi = derive2 { name="popEpi"; version="0.4.8"; sha256="1gc7kyik0209pc8mvl6c69lzb3dnkif0mby4l4pq8zfdz73lmi06"; depends=[data_table Epi survival]; }; popKorn = derive2 { name="popKorn"; version="0.3-0"; sha256="1zcl6ms7ghbcjyjgfg35h37ma8nspg15rk2ik82yalqlzxjf7kxw"; depends=[boot]; }; popReconstruct = derive2 { name="popReconstruct"; version="1.0-6"; sha256="0nmf93dy2qf7z9mafpy99ry53aapbxlismn7drn732r8gvravapx"; depends=[coda]; }; - popbio = derive2 { name="popbio"; version="2.6"; sha256="1j8q4rdq8b9r56p0slwkfsknv6linjnmcprrzbck9yr99zfqp067"; depends=[]; }; + popbio = derive2 { name="popbio"; version="2.7"; sha256="02dbb2sinn1n8a9dg8lvf35sc8hb14c90mjymz2gk64xdysf0m2j"; depends=[]; }; popdemo = derive2 { name="popdemo"; version="1.3-0"; sha256="0760ajqaq822m0j092gdqzhgw1mk413k09mmmwyzb0jzj6bd15q3"; depends=[expm MCMCpack]; }; popkin = derive2 { name="popkin"; version="1.3.0"; sha256="1gr2glyavvf2r89zwiama3qhmq32rdzjsqkhv70afmsapk6f4dhr"; depends=[RColorBrewer Rcpp RcppEigen]; }; poplite = derive2 { name="poplite"; version="0.99.23"; sha256="0kf5k4iz4cvzd3avq753jn1gkpnhzi9m4148lq7rgv7h433qydwn"; depends=[DBI dbplyr dplyr igraph lazyeval RSQLite]; }; - poppr = derive2 { name="poppr"; version="2.8.3"; sha256="158sb5v3qmnka431fvgg84pvv1j3mbqmydry63m5yrflzsninv1z"; depends=[ade4 adegenet ape boot dplyr ggplot2 igraph magrittr pegas phangorn polysat rlang shiny vegan]; }; + poppr = derive2 { name="poppr"; version="2.8.5"; sha256="0jq8ykz77z3rgijmhav1sz34a5hkjzs9mlcp5y0354i2l229ylqd"; 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.1"; sha256="11hzsr69rjklyxkp8jbp6794a4r3cyid0k40dz8d35ca068y2vcl"; depends=[class fields ggplot2 som]; }; poptrend = derive2 { name="poptrend"; version="0.1.0"; sha256="0hypxpb18azg6q1mqrphbx3x262h9ybwhlkb8fyd6vr7jjb5wn3h"; depends=[mgcv]; }; populationPDXdesign = derive2 { name="populationPDXdesign"; version="1.0.3"; sha256="0p73ddv3j1s1vs4j3axnsf39n626qjv0w1qlq9p7km4s6729bhgv"; depends=[devtools ggplot2 plyr roxygen2 shiny shinycssloaders]; }; porridge = derive2 { name="porridge"; version="0.0.4"; sha256="1b43yxhqfrkz777rp6yqw4in5i22lkfnh41f05dqnns2qg5hdlyp"; depends=[MASS mvtnorm Rcpp RcppArmadillo]; }; - portalr = derive2 { name="portalr"; version="0.3.1"; sha256="0i3xg3ccccrcamk7yx3nzllf4ir1xg15d3w6byvi4yx6w25khqcn"; depends=[clisymbols crayon dplyr forecast gh httr lubridate lunar magrittr rlang tibble tidyr usethis]; }; + portalr = derive2 { name="portalr"; version="0.3.3"; sha256="0fxk08666xp3ak207l90qqkz6a0si2mi9sjhb92k304l4j1zjb84"; depends=[clisymbols crayon dplyr forecast gh httr lubridate lunar magrittr rlang tidyr usethis]; }; portes = derive2 { name="portes"; version="3.0"; sha256="144fipskh6yb6xcz3m5bgh2kwjwa58zaw24y88hzzrdvh9glvyrc"; depends=[forecast]; }; - portfolio = derive2 { name="portfolio"; version="0.4-7"; sha256="0gs1a4qh68xsvl7yi6mz67lamwlqyqjbljpyax795piv46kkm06p"; depends=[lattice nlme]; }; + portfolio = derive2 { name="portfolio"; version="0.5-0"; sha256="1hpz5jhnffsb6qzwh0vciszi5wx7x184mk2dai5ph0xvaxbm23r1"; depends=[lattice nlme]; }; portfolio_optimization = derive2 { name="portfolio.optimization"; version="1.0-0"; sha256="1rdhwffsjc1pa1qq7rqy6dwk8yrcblkmijz94p2w7sf2v4jmwxxr"; depends=[magrittr MASS modopt_matlab xts]; }; portfolioBacktest = derive2 { name="portfolioBacktest"; version="0.2.1"; sha256="15yh3vi8qdahmsy2lic77vfv9c5ssalw08lmhq6vk9dbcl04z5n1"; depends=[digest doSNOW evaluate foreach ggplot2 PerformanceAnalytics quantmod R_utils rlang snow xts zoo]; }; portfolioSim = derive2 { name="portfolioSim"; version="0.2-7"; sha256="1vf46882ys06ia6gfiibxx1b1g81xrg0zzman9hvsj4iky3pwbar"; depends=[lattice portfolio]; }; portsort = derive2 { name="portsort"; version="0.1.0"; sha256="0swl39dn7lzwvps18bva4l64a441gkf6lbwcwrhlf93f1ardvxji"; depends=[xts zoo]; }; postDoubleR = derive2 { name="postDoubleR"; version="1.4.12"; sha256="19z8wisi16g7a78gw16r72dkxh3x5qh888qz260ih5naq0p8vy71"; depends=[doParallel ggplot2 glmnet grf neuralnet progress]; }; postGIStools = derive2 { name="postGIStools"; version="0.2.4"; sha256="04d6iqnk7j2lgv1h5c94j6y89jk75pmv26sxa51s5iwkjq7rchym"; depends=[DBI jsonlite rgdal rgeos RPostgreSQL sp stringr]; }; + postHoc = derive2 { name="postHoc"; version="0.1.1"; sha256="0sfwhgh8y6y3df5qx0n488fvddg5fj6cql3gml7fwzjw0hsgkdsw"; depends=[igraph multcomp]; }; posterdown = derive2 { name="posterdown"; version="1.0"; sha256="13plrrnylw3yldm0md1gr5drccfjk9f2wwlhz6lrmb3px7w5nqs0"; depends=[pagedown rmarkdown yaml]; }; postinfectious = derive2 { name="postinfectious"; version="0.1.0"; sha256="1v327zxxiwc1cdksk6s39lkkgck5dxg169pp3jiqmm7xs35dcl6y"; depends=[]; }; postlightmercury = derive2 { name="postlightmercury"; version="1.2"; sha256="1345ckp50jplcdqp3a250c6mhapqh9322jzpxj5dyqmbg2nmgp9i"; depends=[crul jsonlite purrr rvest tibble xml2]; }; postlogic = derive2 { name="postlogic"; version="0.1.0.1"; sha256="11bpmfn375zpyg90dh44h86cvppzri1smmkn26jyydqjz74f4q9w"; depends=[]; }; - potts = derive2 { name="potts"; version="0.5-8"; sha256="0j3c7sh50r1lqd8gl0rq7pq8j9v33wcz46gv7lm0n7y89qj6f45x"; depends=[]; }; + potts = derive2 { name="potts"; version="0.5-9"; sha256="1kiha209w9nyyx4qqsdp51q2y7ny67nzqkdanlrh2106lcab3hj8"; depends=[]; }; povcalnetR = derive2 { name="povcalnetR"; version="0.1.0"; sha256="11hwb52lrvdxplsx85ps54k2k7cvr0k4g5s2cj2a5l3rlqbyayx8"; depends=[dplyr ggplot2 ggthemes httr js jsonlite memoise naniar purrr readr stringr tibble tidyr]; }; - powdR = derive2 { name="powdR"; version="1.1.0"; sha256="0by1jxqpqjgpsqzgagirz7z6cgvxa5k33m15qsc4dina12hi21n8"; depends=[baseline ggplot2 ggpubr memisc nnls plotly plyr reshape shiny shinyWidgets tidyr]; }; + powdR = derive2 { name="powdR"; version="1.2.0"; sha256="0l1sb4bxam53jg1zfzqy851652c0yr88gz04z97cqdcn7smg6fgi"; depends=[baseline DT ggplot2 ggpubr nnls plotly plyr reshape shiny shinyWidgets tidyr]; }; powdist = derive2 { name="powdist"; version="0.1.4"; sha256="1my88ag5q9hwkn2wy79jl9008gpvg0bsrnyc81gkdfi7pjh2mp1z"; depends=[gamlss_dist normalp rmutil]; }; poweRlaw = derive2 { name="poweRlaw"; version="0.70.2"; sha256="1asr6ikr7hmj78jyg8r1gwvcjg14addkxdiz92nh06lv71a183r4"; depends=[VGAM]; }; powerAnalysis = derive2 { name="powerAnalysis"; version="0.2.1"; sha256="0cma4v402n6wcb2gy9g1ymydzh8vimy9nfrrn8xhnjsf7x6jh215"; depends=[]; }; @@ -11805,10 +11943,11 @@ in with self; { powerpkg = derive2 { name="powerpkg"; version="1.5"; sha256="0mbk2fda2fvyp1h5lk5b1fg398xybbjv0z6kdx7w7xj345misf7l"; depends=[]; }; powerplus = derive2 { name="powerplus"; version="3.1"; sha256="0ayp6x34hkzgris4j3zbbs0r23n81bhww3wgfyy630ri4sk6brrn"; depends=[complexplus expm MASS Matrix phonTools]; }; ppcSpatial = derive2 { name="ppcSpatial"; version="0.2.0"; sha256="1gi57zngc42wcrihg29nn7qa3gaq105ckp76qmczkldshlpd7x4r"; depends=[dplyr ggplot2 htmltools htmlwidgets leaflet magrittr PakPC2017 rgdal scales shiny tidyr tmap]; }; - ppcc = derive2 { name="ppcc"; version="1.1"; sha256="0c22nkp6c6rl2d6c868pnrda1l6h9bxssmdbca3pdc5s8wjxi0nd"; depends=[]; }; - ppclust = derive2 { name="ppclust"; version="0.1.3"; sha256="1480fcjzz1vfmz3sgcdrpfilqklmb1f0h4vna6xkfib5xh624lxb"; depends=[inaparc MASS]; }; + ppcc = derive2 { name="ppcc"; version="1.2"; sha256="17kf97rh0b1zxh7r12rxc2qd1zlrcvlljk69k8w2jchdxiw398sb"; depends=[]; }; + ppclust = derive2 { name="ppclust"; version="1.1.0"; sha256="0vmgjjy7gin88qailzfcwapndl5s8fm6i8kw9gv6aykg9mr75xlv"; depends=[inaparc MASS]; }; ppcong = derive2 { name="ppcong"; version="0.0.2"; sha256="0k34ibzyxak2a8xhsf4jdp50w8k8dsd1nn3gcdcakx8s2rgymq7v"; depends=[curl jsonlite tfse tibble]; }; ppcor = derive2 { name="ppcor"; version="1.1"; sha256="1x9b2kb8s0bp92b17gby0jwzzr3i4cf3ap9c4nq7m8fav72g0y3a"; depends=[MASS]; }; + ppgam = derive2 { name="ppgam"; version="1.0.0"; sha256="0wna2z8pvr0zxvlp7zbvjnl99r1z976jiq44gwh425ypnla6wgpp"; depends=[evgam MASS mgcv]; }; ppgmmga = derive2 { name="ppgmmga"; version="1.2"; sha256="1dq0p3xna5r1kiyhiziz3wc78dfqh362qhna5hmkjzhljawr9jg0"; depends=[cli crayon GA ggplot2 ggthemes mclust Rcpp RcppArmadillo]; }; ppitables = derive2 { name="ppitables"; version="0.5.2"; sha256="1fwl2mscnfkbdpdjb0vkyv6xrbi73rfkxlbpri35hfqscaxlzk98"; depends=[tibble tidyr]; }; ppls = derive2 { name="ppls"; version="1.6-1.1"; sha256="1zyrisy3c4cz896j1bjh61sf57wdl9p8ywdq268cl819szfq78mx"; depends=[MASS]; }; @@ -11824,20 +11963,19 @@ in with self; { 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="7.0.0"; sha256="0v0z8d2cxisfqci9kr19z8q15pckzmh8z5n753b8kahg2xn0zhj4"; depends=[]; }; + praznik = derive2 { name="praznik"; version="8.0.0"; sha256="037lcic87b6136b5fi9g557idd3rvglw995b94xadcdaqcpy906z"; depends=[]; }; prc = derive2 { name="prc"; version="2019.1-23"; sha256="1aw02sj7kkzzkrxs1jpm2skfz2jrd7fyqlfc1mvkqwac39c6a9ma"; depends=[kyotil nlme]; }; - prcbench = derive2 { name="prcbench"; version="0.8"; sha256="0bidf7268c130xj4c2pxljgkrppvjg8bmivj9zq0cm9nwhm0fdf5"; depends=[assertthat ggplot2 gridExtra memoise precrec PRROC R6 rJava ROCR]; }; + prcbench = derive2 { name="prcbench"; version="0.8.2"; sha256="1b8dmahkymbnf3xxaprzkpizpibnyhjynv352qf4c7l5gvg0d7nq"; depends=[assertthat ggplot2 gridExtra memoise precrec PRROC R6 rJava ROCR]; }; prclust = derive2 { name="prclust"; version="1.3"; sha256="0p0sf8248aigs99py8mpzz743jnrf7n1nv5shag15arxz9yx7zn3"; depends=[Rcpp]; }; - prcr = derive2 { name="prcr"; version="0.1.5"; sha256="1hfr0jijnj5nd25rh16i81bsz8kwz0q9vmn7bqgy467cwvypg9k2"; depends=[class dplyr ggplot2 irr lpSolve purrr tibble tidyr]; }; - pre = derive2 { name="pre"; version="0.7.2"; sha256="156wgyv88a5qvdksfhyyim2h1igaba8gf4mgaq6ii6sxppmik4a8"; 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]; }; + prcr = derive2 { name="prcr"; version="0.2.1"; sha256="0k5vl14akqf8qvak6h7a19qxn4wzpyxq7lyvdhxfh8l4gs4ca2l6"; depends=[class dplyr forcats ggplot2 irr lpSolve magrittr purrr tibble tidyr]; }; + pre = derive2 { name="pre"; version="1.0.0"; sha256="07iai8vkxmx0dhnqy28gwh1hwc2iqg7bb0mwm8c68qpp8ffxwplm"; depends=[earth Formula glmnet Matrix MatrixModels partykit rpart stringr survival]; }; precintcon = derive2 { name="precintcon"; version="2.3.0"; sha256="1sf0mfqa77aqhbx3hg8pv582ibmfnv6vigqcd3xqsbq7nigy2ms9"; depends=[ggplot2 scales]; }; precrec = derive2 { name="precrec"; version="0.11"; sha256="1y0d0jqpvh0c96zi2fp7q1f25n5sm6ai2k6l54j9c3plkk1vw3lp"; depends=[assertthat data_table ggplot2 gridExtra Rcpp]; }; - predhy = derive2 { name="predhy"; version="0.1.0"; sha256="1m4ysryh66blqnvnskfwmjbz85pziqlii12jv9gpf2a3jnl5dvij"; depends=[]; }; + predhy = derive2 { name="predhy"; version="0.2.0"; sha256="0l3x9ivrlb43x3qbrpw5gjyfc3n3b4bbsav1r4hl96znypwi7j9f"; depends=[]; }; predict3d = derive2 { name="predict3d"; version="0.1.3.3"; sha256="1kb3jacpgzln1ddnkfzhvfpzzf9wig60lppca6iy0fvq5cm8ddr4"; depends=[dplyr ggiraphExtra ggplot2 magrittr modelr moonBook plyr prediction purrr reshape2 rgl rlang stringr TH_data tidyr]; }; prediction = derive2 { name="prediction"; version="0.3.14"; sha256="0awlq5lxfia6m2b91w73rksp93rbwv5gwqb36wbji4rgq41rzbrx"; depends=[data_table]; }; predictionInterval = derive2 { name="predictionInterval"; version="1.0.0"; sha256="029hc57cblfcbqckrghf95l2rkn7acgb4yr36da01bx8bmpww0bn"; depends=[ggplot2 MASS MBESS pbapply]; }; - predictmeans = derive2 { name="predictmeans"; version="1.0.1"; sha256="06zspg1v0x1qqaah7xj5jdaqjv7asnzmgybyyzx3j26v4h59p350"; depends=[ggplot2 lme4 Matrix nlme numDeriv pbkrtest plyr]; }; + predictmeans = derive2 { name="predictmeans"; version="1.0.2"; sha256="191kidf66xy8g779chpsyxp02hgn1npb4acga9nnd5f428bvzfc7"; depends=[ggplot2 lme4 Matrix nlme numDeriv pbkrtest plyr]; }; predictoR = derive2 { name="predictoR"; version="1.1.0"; sha256="12y23q08m7v4dl6anbkhf7zxy8wkah5bxy1c2fdcwb6ng3snpfvb"; depends=[ada colourpicker corrplot DT e1071 flexdashboard glmnet kknn neuralnet randomForest rattle ROCR rpart shiny shinyAce shinydashboardPlus shinyjs shinyWidgets tidyverse xgboost zip]; }; predictrace = derive2 { name="predictrace"; version="1.0.0"; sha256="1vpamn1j1jqdjar14j7fn4gvr8wq8lpqfnrwifgl0qvpa4y1938y"; depends=[dplyr here tidyr]; }; predkmeans = derive2 { name="predkmeans"; version="0.1.1"; sha256="0352c50zlyzn8fczrkinayllj9jp978njjl7dazzkzypx0p20va5"; depends=[e1071 maxLik mgcv Rcpp RcppArmadillo]; }; @@ -11848,9 +11986,6 @@ in with self; { prefmod = derive2 { name="prefmod"; version="0.8-34"; sha256="1fkqp75w3im6b0l4sfs1yr2id8ffp2xbpb6lkgnv833cri787d5x"; depends=[colorspace gnm]; }; prepdat = derive2 { name="prepdat"; version="1.0.8"; sha256="19rxyss96cmjhzm69f6l1cd3vkw3wskzhxnbmrz4546x00gf9g5v"; depends=[dplyr psych reshape2]; }; prepplot = derive2 { name="prepplot"; version="0.7"; sha256="1yqiq78iqsk49ky913x4h8f3638blyamrwdhhcmzfgy4n7dnk11x"; depends=[plotrix shape]; }; - preprocomb = derive2 { name="preprocomb"; version="0.3.0"; sha256="08dhzil8prmjb6if0yba9pjncfxf5zzvlrrabva7c5jhny806c5g"; depends=[arules caret clustertend DMwR doParallel e1071 foreach randomForest zoo]; }; - preprosim = derive2 { name="preprosim"; version="0.2.0"; sha256="1z10ranfal51vzsnndfaw5aqddh2w1xx8h50j1p7gx4fi90d0waq"; depends=[caret DMwR doParallel e1071 foreach ggplot2 reshape2]; }; - preproviz = derive2 { name="preproviz"; version="0.2.0"; sha256="0jb85qkzywsd2iyfynd8ngkc136m4qc38phc3fgxm2qw30dacmyh"; depends=[caret ClustOfVar DMwR ggdendro ggplot2 gridExtra randomForest reshape2]; }; preputils = derive2 { name="preputils"; version="1.0.2"; sha256="0cww3x7375ck56cm14ssalvpgvsdi4myr3p19zy4fcjy6fgyyxc5"; depends=[data_table]; }; prereg = derive2 { name="prereg"; version="0.4.0"; sha256="1jhlgp7ajq6mx7gn4kf3b7wqzs3v0678pa1r6p4mgvvynic8rnqj"; depends=[rmarkdown]; }; presens = derive2 { name="presens"; version="2.1.0"; sha256="175nr9pqn3m6kh9bcc1gxqmqv05xdsqdw9lx385lmm1g947d2159"; depends=[marelac measurements]; }; @@ -11868,9 +12003,10 @@ in with self; { prevalence = derive2 { name="prevalence"; version="0.4.0"; sha256="0vnmglxj1p66sgkw4ffc4wgn0w4s281fk2yifx5cn4svwijv30q0"; depends=[coda rjags]; }; prevederer = derive2 { name="prevederer"; version="0.0.1"; sha256="0vkx9nrlgp36xbl95lrb5sb5yivxlcw4yvbs8hgbm31kh0vbz32f"; depends=[httr]; }; prevtoinc = derive2 { name="prevtoinc"; version="0.12.0"; sha256="0ypdxcx9gh87a7ih3cw3yai47rzv41qwh4kpk6007ai8jkjv4n9w"; depends=[dplyr purrr rlang tibble]; }; - priceR = derive2 { name="priceR"; version="0.1.0"; sha256="09jlf8c1lfiqmpm2vdgkacsracwcjgi6xgvlakny2c4iyir45sh5"; depends=[dplyr gsubfn stringr]; }; + prewas = derive2 { name="prewas"; version="1.1.0"; sha256="0lsfy3sr59pzhrr4nz1ryvnmb54vk9hhdlnx8mrxlhfg8hs59l6r"; depends=[ape future future_apply phangorn vcfR]; }; + priceR = derive2 { name="priceR"; version="0.1.1"; sha256="1r276jh95ji6340yya6rnzjy5wpapa192a66cv07qhafvhi8yqfs"; depends=[curl dplyr gsubfn jsonlite lubridate purrr stringi stringr]; }; pricesensitivitymeter = derive2 { name="pricesensitivitymeter"; version="1.1.1"; sha256="0zlvrzrqndnrwawwzqwpj7c7r86mb80njhv7dcm8l5qygnc4xz3b"; depends=[survey]; }; - prim = derive2 { name="prim"; version="1.0.16"; sha256="0i5jpk798qbvyv9adgjbzpg4dvf7x51bcgbdp38fzdnam6g88y5a"; depends=[misc3d rgl]; }; + prim = derive2 { name="prim"; version="1.0.17"; sha256="037gfs6ibkk7rjv21vi2k5jx24plss0jsxkn12arvfg5p6xan08k"; depends=[misc3d rgl]; }; primePCA = derive2 { name="primePCA"; version="1.0"; sha256="0kpyqv3l58xcyd98a7c7ggsna30j6k62aliidlyxgv2ya0g0dshv"; depends=[MASS Matrix softImpute]; }; primefactr = derive2 { name="primefactr"; version="0.1.1"; sha256="11hi75jwjxrl9p5m8yjwjb20pc9y9vkhi8sjrnisdq2hm53m483w"; depends=[]; }; primer = derive2 { name="primer"; version="1.1.1"; sha256="1hw7qd0xq3bvzk5ms9q568a3nkj3ws4jnzbmlypy8c5x3ly6pl1d"; depends=[deSolve lattice]; }; @@ -11879,15 +12015,15 @@ in with self; { princurve = derive2 { name="princurve"; version="2.1.4"; sha256="1b3grra328wkfsmqkkwp3lwdzhbdiwyq380qi5pl9r2jc6arnppj"; depends=[Rcpp]; }; prinsimp = derive2 { name="prinsimp"; version="0.8-8"; sha256="074a27ml0x0m23hlznv6qz6wvfqkv08qxh3v1sbkl9nxrc7ak4vn"; depends=[]; }; printr = derive2 { name="printr"; version="0.1"; sha256="13yqqcwfqnbhvcxwrr6j45qhnbxng3qwn2ygkr809gibg9grw471"; depends=[knitr]; }; - prioGene = derive2 { name="prioGene"; version="1.0.0"; sha256="0s4vcx5v9agzf84k45lb4ziqqhj9krf096m66m927lb6ik8gx58h"; depends=[AnnotationDbi org_Hs_eg_db]; }; - prioritizr = derive2 { name="prioritizr"; version="4.1.4"; sha256="1z8p9faacbi61sfxyqz0k7zlxyqc03gg9rc9f4a5zbdcnx83bhf3"; depends=[ape assertthat BH data_table doParallel igraph magrittr Matrix plyr proto raster Rcpp RcppArmadillo rgeos sp tibble uuid]; }; + prioGene = derive2 { name="prioGene"; version="1.0.1"; sha256="0k1rlvmfhj1m2zp5zaac8wcwjypd6f4dd8fxxsyrzsafp9aw189l"; depends=[AnnotationDbi org_Hs_eg_db]; }; + prioritizr = derive2 { name="prioritizr"; version="4.1.5"; sha256="08ahfwpyvvz0faii5b4r8dxrkdhvj85gvys1yz1hsnxhnya6m5pi"; depends=[ape assertthat BH data_table doParallel igraph magrittr Matrix plyr proto raster Rcpp RcppArmadillo rgeos sp tibble uuid]; }; prioritizrdata = derive2 { name="prioritizrdata"; version="0.2.2"; sha256="1gljrll89r2y6nb4jwcp1pyjs5qrahqawi84kgg74w2q6xq65kga"; depends=[raster sp]; }; prioritylasso = derive2 { name="prioritylasso"; version="0.2.3"; sha256="1hmf81vcri0sfaphc0221skpvb2gz0zvxlmlhv7k8rhs1pvnqi8g"; depends=[glmnet survival]; }; prism = derive2 { name="prism"; version="0.1.0"; sha256="0d2llrpw5y0svrdzbk52pjrfp76lknrw4r8ciqq0cq3l6kbynh9r"; depends=[dplyr ggplot2 httr lubridate magrittr purrr raster readr stringr]; }; prismatic = derive2 { name="prismatic"; version="0.2.0"; sha256="0j077khvagzs9lxrryi4q1czk1129r93cqf1i1hiz0b3wij2bwsg"; depends=[farver]; }; prisonbrief = derive2 { name="prisonbrief"; version="0.1.0"; sha256="1fnhg6vqdabdnhvgd19vnkfrdgz8a53snfrx6m6mmdwb6cvavb8m"; depends=[data_table dplyr httr magrittr passport rlang rnaturalearth rnaturalearthdata rvest stringr tibble tidyr xml2]; }; prithulib = derive2 { name="prithulib"; version="1.0.2"; sha256="12ybksrvxzc5gjz8m38cs35b7r3kd8m0zqm2c67pqw38vq82sjxm"; depends=[]; }; - prnsamplr = derive2 { name="prnsamplr"; version="0.1.0"; sha256="0hdxbdkmxfd3ax1qfc4fj9bbxz8cv08qzcjwpxgkapgm2jwgxpgc"; depends=[]; }; + prnsamplr = derive2 { name="prnsamplr"; version="0.1.1"; sha256="1nwssm5h43qakqfk4m54m0ks5n0942p4r1ad0v57lmpx50pnnaaw"; depends=[]; }; pro = derive2 { name="pro"; version="0.1.1"; sha256="0f0iliq7bhf313hi0jbwavljic4laxfc0n3gac5y6hzm39gvvgag"; depends=[]; }; proPubBills = derive2 { name="proPubBills"; version="0.1"; sha256="1fpn9x31jjahdyk0f30mbb3ijj4dsghrq9q94r04pjsgr2jw23zx"; depends=[dplyr httr stringr]; }; prob = derive2 { name="prob"; version="1.0-1"; sha256="05qcrsl790hn7p3ap4zj5i1b1sf674wvvrh42lyb7a0nsc09iq9n"; depends=[combinat fAsianOptions]; }; @@ -11896,24 +12032,22 @@ in with self; { probemod = derive2 { name="probemod"; version="0.2.1"; sha256="1cgjr03amssc9rng8ky4w3abhhijj0d2byzm118dfdjzrgmnrf9g"; depends=[]; }; probhat = derive2 { name="probhat"; version="0.2.0"; sha256="04pzvrny045p8rpvh7va55qfak0b3751x2bi3sp9hqiwr8dys02z"; depends=[barsurf intoo kubik]; }; probout = derive2 { name="probout"; version="1.1.1"; sha256="1hasrvxdig8n3fhzsbmq27050dyanzp1j0qlybnrkb41k9gyljda"; depends=[FNN MASS mclust]; }; - probsvm = derive2 { name="probsvm"; version="1.00"; sha256="1k0zysym7ncmjy9h7whwi49qsfkpxfk7chfdjrydl6hn6pscis37"; depends=[kernlab]; }; proccalibrad = derive2 { name="proccalibrad"; version="0.14"; sha256="0vr55rpcqh9wvy3bklssrimp42x85w3sanjgshfij657v68vmx46"; depends=[]; }; - processR = derive2 { name="processR"; version="0.1.0"; sha256="1c36f1l9ylj01hr5fs1413kixd3jx6fdhha4rw1mpcjbn9cxnjgq"; depends=[diagram dplyr flextable ggiraphExtra ggplot2 jtools lavaan magrittr modelr mycor officer prediction psych purrr rlang rrtable semTools shiny shinyWidgets stringr TH_data tidyr tidyselect]; }; - processanimateR = derive2 { name="processanimateR"; version="1.0.2"; sha256="0yz61m5f71lqz3f1y1lsnpbp3cpypsvj7k2cbiixl95qlpxhd1is"; depends=[bupaR DiagrammeR dplyr htmlwidgets magrittr processmapR rlang stringr tidyr]; }; + processR = derive2 { name="processR"; version="0.2.3"; sha256="0zdckw8c4xavrlkaihj3il35whfcam27ra7f4xxhypf9fa9dhzr4"; depends=[diagram dplyr flextable ggplot2 ggrepel interactions lavaan officer predict3d psych purrr rlang rmarkdown rrtable semTools stringr tidyr tidyselect ztable]; }; + processanimateR = derive2 { name="processanimateR"; version="1.0.3"; sha256="1ywn2hv2wg35i6ww1ckr6gcb709sf1c836ml542g8iiggwk3cvz5"; depends=[bupaR DiagrammeR dplyr htmltools htmlwidgets magrittr processmapR rlang stringr tidyr]; }; processcheckR = derive2 { name="processcheckR"; version="0.1.2"; sha256="1l8qx7ivw6vwmw7d7x7dawv11aklbyjwpyial3crhamnj5389ngj"; depends=[bupaR dplyr edeaR glue rlang stringr]; }; 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]; }; + processmapR = derive2 { name="processmapR"; version="0.3.4"; sha256="0kq940j8frmbal1nqxwv7wshkyv7y3vhax6zr0ngkf18xv73y76z"; depends=[BH bupaR data_table DiagrammeR dplyr edeaR forcats ggplot2 ggthemes glue hms htmltools miniUI plotly purrr RColorBrewer Rcpp rlang scales shiny stringr tidyr]; }; processmonitR = derive2 { name="processmonitR"; version="0.1.0"; sha256="1ckr438yifpsh095j6bb65dq3rdm7cfm8k7qsjmcqwjkww4j74z8"; depends=[bupaR dplyr edeaR ggplot2 magrittr miniUI shiny]; }; - processx = derive2 { name="processx"; version="3.4.1"; sha256="1g6ipcaxg9y94lyrnbp7kkbqfkcdh1fyrqjjclbjp3x7iysdvazi"; depends=[ps R6]; }; + processx = derive2 { name="processx"; version="3.4.2"; sha256="02awswxq6wh3rl99dncw5n6c1xmd0v81xcdp2dfyi6vm6b3gz84l"; 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.5.0"; sha256="1h15fwd4rclja0q80y119sah1qbyjlbaqxg360ywq9ig151lxsjq"; depends=[fs git2r rmarkdown rprojroot usethis withr]; }; prodlim = derive2 { name="prodlim"; version="2019.11.13"; sha256="03wvh3kirp1prac5nky6a5whs97rvaf4hc27x0fnh51sa17r42b8"; depends=[KernSmooth lava Rcpp survival]; }; productivity = derive2 { name="productivity"; version="1.1.0"; sha256="1g8b4vlyqq3xyzd4dki01glhc3g9j3ywgwpxylkmzp0ivqic53yc"; depends=[doParallel foreach iterators lpSolveAPI]; }; productplots = derive2 { name="productplots"; version="0.1.1"; sha256="1igs6d0qwgsfk0z3vxabgv5kva9w2kpzi535gjfdrbx34j4pf3gx"; depends=[ggplot2 plyr]; }; prof_tree = derive2 { name="prof.tree"; version="0.1.0"; sha256="0mjvxaacrgkzl0f1wn3fpgah4jh720safni66ri0dnriwcxis6rz"; depends=[data_tree]; }; - 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=[]; }; - proffer = derive2 { name="proffer"; version="0.0.2"; sha256="083cxxpwkdjnj15ficfb77yiq96j0xf7z5j7h5slm9spazkr38v6"; depends=[processx profile RProtoBuf]; }; + profExtrema = derive2 { name="profExtrema"; version="0.2.1"; sha256="0gdhamnngh1yh3nb7l656qhdr61s0zn6h1hagh22k2fn11z3xhsl"; depends=[DiceKriging KrigInv lhs MASS microbenchmark pGPx quantreg rcdd RColorBrewer]; }; + proffer = derive2 { name="proffer"; version="0.1.0"; sha256="19bri9v1i5ghh9az247k9wmj8dpkbfzdykmzx26jrkzqqsdbilzg"; depends=[cli processx profile RProtoBuf withr]; }; profile = derive2 { name="profile"; version="1.0"; sha256="0m7fm490gqkbmnbdq3lac87zqb9qyx6546rlpa130rq1jnlgxfp6"; depends=[rlang tibble withr]; }; profileModel = derive2 { name="profileModel"; version="0.6.0"; sha256="0yq8hy43h62hlz8bbf9ila4a3xcwizi1if27b78xc5y857ncwad8"; depends=[]; }; profileR = derive2 { name="profileR"; version="0.3-5"; sha256="0fgc7585a7194c67irafjnx8g2j6mn3qhcfn76c6dh28clp20qp9"; depends=[ggplot2 lavaan RColorBrewer reshape]; }; @@ -11925,22 +12059,23 @@ in with self; { prognosticROC = derive2 { name="prognosticROC"; version="0.7"; sha256="0lscsyll41hpfzihdavygdzqw9xxjp48dmy4i17qsx5h01jl1h4i"; depends=[survival]; }; progress = derive2 { name="progress"; version="1.2.2"; sha256="0dgzb362641aqm8xd88iqa8jmpdm43xs0aba0d5kk6fvapnxi95l"; depends=[crayon hms prettyunits R6]; }; progressr = derive2 { name="progressr"; version="0.4.0"; sha256="1wgqabp8qmg58gymv3wq9ci5mp64isbdgg1by5s9g8ncwyhnfalb"; depends=[digest]; }; - proj4 = derive2 { name="proj4"; version="1.0-8.1"; sha256="0zhal76wd9k8l1hjm00sgzlxi6c2sc7l8msr9firzmsg07qai8m3"; depends=[]; }; + proj4 = derive2 { name="proj4"; version="1.0-10"; sha256="1l6i4735ki6y2qhmg1gmrj93rzrvgpzi23rr3a1akkqp58bnyfaz"; depends=[]; }; projections = derive2 { name="projections"; version="0.3.1"; sha256="12vskql6x04jzik72a0vx83amfj01w9f7mxn052vsv7aaljbi124"; depends=[distcrete ggplot2 incidence]; }; - projects = derive2 { name="projects"; version="2.0.0"; sha256="0m9177ldp0d3f9k2ifrbww5snhvaql8h96shcdm46i1kjnzj4070"; depends=[dplyr fs lubridate magrittr purrr readr rlang rstudioapi sessioninfo stringr tibble zip]; }; + projects = derive2 { name="projects"; version="2.1.0"; sha256="0clrspmrlfi8w8h8afbpfjfg74qn1ys6zsb8gj3g5p0lcap2269g"; depends=[dplyr fs lubridate magrittr purrr readr rlang rstudioapi sessioninfo stringr tibble vctrs zip]; }; projmgr = derive2 { name="projmgr"; version="0.1.0"; sha256="1iysxcl6awvp7zbm04zyq4d9659fcz3sy711jnycsxhsk8hsvmc2"; depends=[gh magrittr]; }; + projpred = derive2 { name="projpred"; version="1.1.6"; sha256="07bixjpnvj9i5hsr9bfycnxryzsw2vg27z1lw86aj7948wdjgar1"; depends=[ggplot2 loo Rcpp RcppArmadillo]; }; promises = derive2 { name="promises"; version="1.1.0"; sha256="01l0ydjvvy6afcg5d6pzvk1ikd3djq8n2flv8c831ksn68z0zsn8"; depends=[later magrittr R6 Rcpp rlang]; }; promote = derive2 { name="promote"; version="1.1.1"; sha256="1cdz4xqinyzpbbgkxxd4f86n1h8zj88vp5z6w01cxd5ykyjf5411"; depends=[httr jsonlite stringr]; }; - promotionImpact = derive2 { name="promotionImpact"; version="0.1.2"; sha256="1mx745q37fqgn46y9qj3ql54r747qfab1yq8878g08cq6y696rmp"; depends=[crayon data_table dplyr ggplot2 ggpubr KernSmooth lmtest prophet Rcpp reshape2 scales stringr strucchange]; }; + promotionImpact = derive2 { name="promotionImpact"; version="0.1.3"; sha256="1aik47g82mian7yv5a4vi7wr4a7vx8larfqgar1mf2a7kqv5ik7w"; depends=[crayon data_table dplyr ggplot2 ggpubr KernSmooth lmtest prophet Rcpp reshape2 scales stringr strucchange]; }; prop_comb_RR = derive2 { name="prop.comb.RR"; version="1.2"; sha256="10s52fkq7rv6v4gw1yd46f0fbg89ksim0qhgb5jbglzrqh585ny5"; depends=[rootSolve]; }; propOverlap = derive2 { name="propOverlap"; version="1.0"; sha256="0q72z9vbkpll4i3wy3fq06rz97in2cm3jjnvl6p9w8qc44zjlcyl"; depends=[Biobase]; }; propagate = derive2 { name="propagate"; version="1.0-6"; sha256="17jinz1jramlsf87i7vyn2qp82rc1dacljfaxxplrk3crhw3bhs7"; depends=[ff MASS minpack_lm Rcpp tmvtnorm]; }; properties = derive2 { name="properties"; version="0.0-9"; sha256="1zd66cg31yd53rqsc0cwxhlpfn7kvc67qdh3vyj9qib8kwxaw1zl"; depends=[]; }; - prophet = derive2 { name="prophet"; version="0.5"; sha256="0jqzmzgx3z4rl5478mw620sg539b2fwijcrzhd7jikrsv2fy7jcn"; depends=[dplyr dygraphs extraDistr ggplot2 Rcpp rlang rstan scales tidyr xts]; }; + prophet = derive2 { name="prophet"; version="0.6"; sha256="17whiynwfff7xajj89flr80kz2k4x559cbhf72fvyf9xpqg3vg09"; depends=[dplyr dygraphs extraDistr ggplot2 Rcpp rlang rstan scales tidyr xts]; }; proportion = derive2 { name="proportion"; version="2.0.0"; sha256="0a71f6hz6blb7550m9x0di84vp51yjhnn952301rwlrh3axf6dbr"; depends=[ggplot2 TeachingDemos]; }; propr = derive2 { name="propr"; version="4.2.6"; sha256="16ghgzpwz6q9zlaa0pc8wqv0wpz81c75n7zwjyr1lv9y19qwlkfg"; depends=[fastcluster ggplot2 igraph Rcpp]; }; - prospectr = derive2 { name="prospectr"; version="0.1.3"; sha256="18lh03xg6bgzsdsl56bjd63xdp16sqgr3s326sgifkkak8ffbv7q"; depends=[foreach iterators Rcpp RcppArmadillo]; }; - protViz = derive2 { name="protViz"; version="0.5.1"; sha256="0cznzm1ijlq33yd5wsa61prav77y2vi698w0n2fx1xcv504c4bjv"; depends=[Rcpp]; }; + prospectr = derive2 { name="prospectr"; version="0.2.0"; sha256="16ba2dmg1v2gsd66s25c28s413vg5xcbhicb75qwpijlgmjvfpgi"; depends=[foreach iterators Rcpp RcppArmadillo]; }; + protViz = derive2 { name="protViz"; version="0.6.3"; sha256="1ldciqh3f43xr9663yyhd9r6qwrg4c4vmkprlcancbnd460wakg7"; depends=[Rcpp]; }; protag = derive2 { name="protag"; version="1.0.0"; sha256="1iaw2w1d7hdvlg5vplpqc49wq08dgmm0ifvp2v0ggqb8invvdnw8"; depends=[dplyr ggplot2 RColorBrewer]; }; proteomicdesign = derive2 { name="proteomicdesign"; version="2.0"; sha256="01s47pgwxy4xx10f3qmbfv59gbaj0qw017kpkpsn33s8w7ad63r0"; depends=[MASS]; }; proteomics = derive2 { name="proteomics"; version="0.2"; sha256="01cd4sb79gcx8gbzl624scvjbwhgcsca1wdvvfkhsv7jfwdd2ry2"; depends=[foreach ggplot2 plyr reshape2]; }; @@ -11956,17 +12091,17 @@ in with self; { provParseR = derive2 { name="provParseR"; version="0.2"; sha256="13fb4fl395aqjcs2kyvm5z1ac5jkqn5nh2ylzig2p54h313bg0dk"; depends=[jsonlite]; }; provSummarizeR = derive2 { name="provSummarizeR"; version="1.3"; sha256="0bbiz3lvk0lxxrcgsqww0q79505i0mzxfl03r3pm34amvqc7kl75"; depends=[dplyr provParseR]; }; provViz = derive2 { name="provViz"; version="1.0.6"; sha256="0pnrprybn48jb02888pzn2y7vi1l24fxk6063sv6aiwpncminf9n"; depends=[]; }; - provenance = derive2 { name="provenance"; version="2.3"; sha256="1nzgnjfy91r9995jhn7s96jqqlc35s4kxhqscpj9jv93ngddq3zd"; depends=[IsoplotR MASS]; }; + provenance = derive2 { name="provenance"; version="2.4"; sha256="14dawdlimzbyjwq13kl0z2nkqfykwrj4kqa6pd8id4zyv7kls885"; depends=[IsoplotR MASS]; }; proxy = derive2 { name="proxy"; version="0.4-23"; sha256="17b6qfllqrhzrxqgx7dccffgybnkcria5a68ap5ly3plg04ypm4x"; depends=[]; }; proxyC = derive2 { name="proxyC"; version="0.1.5"; sha256="159bc42x4shm6n3rh9fc8ziv3ivq0ipmpbasrh279hhn1prc8gg6"; depends=[Matrix Rcpp RcppArmadillo RcppParallel]; }; prozor = derive2 { name="prozor"; version="0.2.11"; sha256="1a2k69fvgi6vxgczk81kh8r2jxc6nirc51w6ac239rqjzb1zyhjm"; depends=[AhoCorasickTrie doParallel dplyr foreach Matrix plyr readr seqinr stringr]; }; prrd = derive2 { name="prrd"; version="0.0.2"; sha256="0ifs55yqvwbcs3xyc90yi763fgavdhajk1ba73g1kchn2ak39qhb"; depends=[config crayon data_table DBI liteq RSQLite]; }; pryr = derive2 { name="pryr"; version="0.1.4"; sha256="06vj5xl9x37kbd3l5bw7sbgfdnp37spvrjrn976rxi04clqk966k"; depends=[codetools Rcpp stringr]; }; - ps = derive2 { name="ps"; version="1.3.0"; sha256="1lcq7r0q4jb8x6k023zr2ydj2dg925bqqbkhx1phpnyjrk897498"; depends=[]; }; + ps = derive2 { name="ps"; version="1.3.2"; sha256="0127q6pw9iw8hhcfp231gmdh29nahh2n5jzc38avrzy7yrm4bwl9"; depends=[]; }; psData = derive2 { name="psData"; version="0.2.2"; sha256="013hb6lk9rm2w08m5jbw90ndrcd4wyy2h125jx07c9bs60wh4mp4"; depends=[countrycode DataCombine reshape2 rio xlsx]; }; psSubpathway = derive2 { name="psSubpathway"; version="0.1.1"; sha256="1jzymhh1dy5w735fppqza7ilspsvyidkrdpq2yd3j5xfjckzfh5w"; depends=[GSVA igraph mpmi pheatmap]; }; psbcGroup = derive2 { name="psbcGroup"; version="1.4"; sha256="0l1hmgw4sislryws8hv7r2nglhcs6g9khg0372a70djvhz2l6gfi"; depends=[LearnBayes mvtnorm SuppDists]; }; - pscl = derive2 { name="pscl"; version="1.5.2"; sha256="1phf3awsfr4ncqfqzin5m1pz0g7y1zhbcm2sz7358ssw914fd7rc"; depends=[MASS]; }; + pscl = derive2 { name="pscl"; version="1.5.5"; sha256="0vzf5wazs92bhqhqd66v3vwmbfmnh67gb2466g1xxawim649nk05"; depends=[MASS]; }; pscore = derive2 { name="pscore"; version="0.1-2"; sha256="1sfkxs2kv8lq87j3q9ci7j38c7gzfkp2l36lwcdhiidr2nls2x0c"; depends=[ggplot2 lavaan reshape2]; }; psd = derive2 { name="psd"; version="1.2.0"; sha256="017iqz6awc7k3kv74jdc8wak62zzgnxvakl0qp774kx1kpv6hgji"; depends=[RColorBrewer Rcpp RcppArmadillo signal zoo]; }; psda = derive2 { name="psda"; version="1.3.3"; sha256="0asw6pq8zifacr42dwhy52xhgvl82q95a34x4ymbylj1mipka54k"; depends=[ggplot2 plyr raster rgeos sp]; }; @@ -11974,10 +12109,10 @@ in with self; { 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]; }; pseval = derive2 { name="pseval"; version="1.3.1"; sha256="1jgnv1l9adhwrmkmp6wkzz7jf7w1hyqy47ajr29l21p4g037py45"; depends=[survival]; }; - psfmi = derive2 { name="psfmi"; version="0.1.0"; sha256="1gp3gk5qjdfjh6aw2a4y8r9dk1gjsmd9lidr9j43zvc3xsk7pina"; depends=[car foreign ggplot2 miceadds mitools norm pROC ResourceSelection rms survival]; }; - psgp = derive2 { name="psgp"; version="0.3-18"; sha256="1jfkqwqnmzj3m1d9gxbp2rjkbqb0di75gh78zg861by5qhhaz1a7"; depends=[automap doParallel foreach gstat intamap Rcpp RcppArmadillo rgdal sp]; }; - psica = derive2 { name="psica"; version="1.0.1"; sha256="1xgq2xqs26v6y91b2b23b5imzjgxv5dihbn69yyjq91a3nvrfk7p"; depends=[BayesTree gridBase party partykit randomForest Rdpack rpart]; }; - psidR = derive2 { name="psidR"; version="1.9"; sha256="0ljfjxsj6krxyk3ss1n0ccymca4hiwkp9fdb1h1l4rqm0dsj8jj8"; depends=[data_table foreign futile_logger openxlsx RCurl SAScii]; }; + psfmi = derive2 { name="psfmi"; version="0.2.0"; sha256="11gmc48frayyn9w5hnjfis1v92mg1v640s69dzkdvqxdkrzh50bg"; depends=[car dplyr foreign ggplot2 lme4 magrittr mice miceadds mitml mitools norm pROC purrr ResourceSelection rms rsample survival tibble tidyr]; }; + psgp = derive2 { name="psgp"; version="0.3-19"; sha256="0yaf69zk4zkpgx5zyksdxb2g4az0ci8v6r23phzcis9fd21y70ds"; depends=[automap doParallel foreach gstat intamap Rcpp RcppArmadillo rgdal sp]; }; + psica = derive2 { name="psica"; version="1.0.2"; sha256="1cnrd1p8ikv0hl97jwypw8np1ypa0d8k2mizwd1clkv7inbb264g"; depends=[BayesTree gridBase party partykit randomForest Rdpack rpart]; }; + psidR = derive2 { name="psidR"; version="2.0"; sha256="033bi61l9jslz4xhii19i23c10n4irqbzsfm5n54nzznwg85i6d9"; depends=[data_table foreign futile_logger openxlsx RCurl SAScii]; }; pso = derive2 { name="pso"; version="1.0.3"; sha256="0alar695c6kc1rsvwipsrvlxc93f3sy9l0yhp0mggyqgxkkvy406"; depends=[]; }; psoptim = derive2 { name="psoptim"; version="1.0"; sha256="1yziabkd3h05cfl5jy5l8ji2y3w21acvxsq3inxyh0iwyr8qdkkl"; depends=[]; }; pspearman = derive2 { name="pspearman"; version="0.3-0"; sha256="1l5mqga7b5nvm6v9gbl1xsspdqsjqyhhdn4gc4qlz6ld7fqfq6cx"; depends=[]; }; @@ -11987,33 +12122,36 @@ in with self; { pstest = derive2 { name="pstest"; version="0.1.3.900"; sha256="1rhd4vgqpr9yq0pc3xql3nfgl30v20ldywapp9n967ky2dja4k0z"; depends=[glmx MASS]; }; psy = derive2 { name="psy"; version="1.1"; sha256="027whr670w65pf8f7x0vfk9wmadl6nn2idyi6z971069lf01wdlk"; depends=[]; }; psych = derive2 { name="psych"; version="1.9.12.31"; sha256="02i9p6appf15hjdsi58g39bzs9as40f9qhy8m7ki30hd1fz1vrr5"; depends=[lattice mnormt nlme]; }; - psychNET = derive2 { name="psychNET"; version="0.0.3"; sha256="14z2hiq2acc5jar8shhmp310f7fing916yhljjhy3knksdd05mjq"; depends=[bigtime car crayon fastDummies glmnet graphicalVAR gtools Hmisc igraph imputeTS longitudinal MASS Matrix mgm mlVAR networktools ordinalNet qgraph SparseTSCGM sparsevar vars]; }; + psychNET = derive2 { name="psychNET"; version="0.0.4.1"; sha256="1h30ag185h9jw1w9119a9hxp984g2yj85hgi4vcwznjj18ssx377"; depends=[bigtime car corpcor crayon doParallel fastDummies glmnet graphicalVAR gtools Hmisc igraph imputeTS longitudinal MASS Matrix mgm mlVAR ncvreg networktools ordinalNet picasso qgraph reshape2 SparseTSCGM vars]; }; psychReport = derive2 { name="psychReport"; version="0.7"; sha256="1dapzq20aw9l4r5grfjd2sf14ga3wcxg67pq5fj6q4bcg5dggc9l"; depends=[cli crayon dplyr ez testthat xtable]; }; psychTools = derive2 { name="psychTools"; version="1.9.12"; sha256="1l1q3l6i40kkbvfjx7nri21jqy9vhdbcc7b5g56a5cqdimkddvkn"; depends=[foreign psych]; }; - psychmeta = derive2 { name="psychmeta"; version="2.3.4"; sha256="0nbgv7abi9i96piqggq9gsyv5p4x2h3rnr50f347mnfg55syha18"; depends=[boot cli crayon data_table dplyr ggplot2 MASS metafor nor1mix progress purrr RCurl reshape2 rlang stringi stringr tibble tidyr tmvtnorm xml2]; }; + psychmeta = derive2 { name="psychmeta"; version="2.3.6"; sha256="16fqy75a5zrfp7jnm49fl6qmagw747zwdd5nkg3a3k4wc0kbn56w"; depends=[boot cli crayon curl data_table dplyr ggplot2 MASS metafor nor1mix progress purrr reshape2 rlang stringi stringr tibble tidyr tmvtnorm]; }; psycho = derive2 { name="psycho"; version="0.5.0"; sha256="0vcabk9j1yf7nz8fh3xg5rr2ia97mfkka23vbv9jya75dhgd84h2"; depends=[bayestestR dplyr effectsize ggplot2 insight parameters performance scales stringr tidyr]; }; psychometric = derive2 { name="psychometric"; version="2.2"; sha256="1b7cx6icixh8k3bv60fqxjjks23qn09vlcimqfv2x3m3nkf8p1s9"; depends=[multilevel nlme]; }; - psychomix = derive2 { name="psychomix"; version="1.1-7"; sha256="16dh2y2z37h72ym1dv2xg0v20wjzlnp06h8f923cdy1zigk69d2r"; depends=[flexmix Formula lattice modeltools psychotools]; }; - psychonetrics = derive2 { name="psychonetrics"; version="0.5.1"; sha256="1sa0dkicr7v0wxi0b900zx43z30bcf9pzdw7kihcnykjd8q3vzwd"; depends=[abind corpcor crayon dplyr glasso IsingSampler lavaan magrittr Matrix matrixcalc mgcv mvtnorm numDeriv optimx pbapply pbv qgraph Rcpp RcppArmadillo ucminf VCA]; }; - 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]; }; + psychomix = derive2 { name="psychomix"; version="1.1-8"; sha256="0lfhfcmrk65gkr1yp317b515vmadbcf0vjcnc76d07yp6yfkz5qw"; depends=[flexmix Formula lattice modeltools psychotools]; }; + psychonetrics = derive2 { name="psychonetrics"; version="0.7"; sha256="0mcldwy70wj210v4z389lzcawrvjrgc1pv10556wciazcriwhzwk"; depends=[abind combinat corpcor dplyr GA ggplot2 glasso IsingSampler lavaan magrittr Matrix matrixcalc mgcv mvtnorm numDeriv optimx pbapply pbv psych qgraph Rcpp RcppArmadillo roptim tidyr ucminf VCA]; }; + psychotools = derive2 { name="psychotools"; version="0.5-1"; sha256="0nm5ngdkyskkj5akbqavdz8njsa8mr61kzknnn1kkdz6bn6zy6lq"; depends=[]; }; + psychotree = derive2 { name="psychotree"; version="0.15-3"; sha256="18lr9dlv5l5fw88n61ch251ddgy1cv6klcj7ba3fg109b86p3bgf"; depends=[Formula partykit psychotools]; }; + psychrolib = derive2 { name="psychrolib"; version="2.4.0"; sha256="0dz3lwds9lxwqdid88l6bkndk6lv1q7b0qzgf9imxmi8f8zhkrbh"; depends=[Rcpp]; }; 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]; }; + psyosphere = derive2 { name="psyosphere"; version="0.1.5"; sha256="14xnni31p2dh4wfnr2cmr3ymz5phx4506cq2n7ymy4k1587w25g6"; depends=[geosphere ggmap ggplot2 Hmisc lubridate plyr rgdal RgoogleMaps sp]; }; psyphy = derive2 { name="psyphy"; version="0.1-9"; sha256="1ndc6sy662wj2qfx7r97crlqjd8fdkfvfy59qmf34bcbzbg33riz"; depends=[]; }; + psyverse = derive2 { name="psyverse"; version="0.1.0"; sha256="0q402z884fwnd812bs44xqbsank89risli13v3njhjc337lj29wx"; depends=[yaml yum]; }; pterrace = derive2 { name="pterrace"; version="1.0"; sha256="15k5149jqjy20cck5121zsv2mk63amn5b8qgdlacivri9dpxjns1"; depends=[doParallel foreach plotly TDA viridis]; }; ptest = derive2 { name="ptest"; version="1.0-8"; sha256="1d30a23yknf7xgqj8adgr36pnh9dpffl1v5fq682f26fk3ss30qp"; depends=[quantreg]; }; ptinpoly = derive2 { name="ptinpoly"; version="2.4"; sha256="1jbj8z7lqg7w1mqdh230qjaydx2yb6ffgkc39k7dx8xl30g00i5b"; depends=[misc3d]; }; - ptmixed = derive2 { name="ptmixed"; version="0.4.2"; sha256="02cyifia87zqgxcg1an5aq73clvkk39lamb9cdvj41145kdnz9ph"; depends=[aod GLMMadaptive lme4 matrixcalc moments mvtnorm numDeriv tweeDEseq]; }; - pts2polys = derive2 { name="pts2polys"; version="0.1.1"; sha256="1pnh8ajh95c8xzfa4bvd2w41fi7h0jcg003rsji6xsasly3q34vr"; depends=[Rcpp]; }; + ptmixed = derive2 { name="ptmixed"; version="0.4.3"; sha256="0n62zrv4j7h9605izzpxjknhr495ir3yjlvzgmk9hil15r8n0w06"; depends=[aod GLMMadaptive lme4 matrixcalc moments mvtnorm numDeriv tweeDEseq]; }; + pts2polys = derive2 { name="pts2polys"; version="0.1.3"; sha256="0rmgryv0vds20npvaqvvwrhrx0grfcz9qwdy2w3bx945r0chhw39"; depends=[Rcpp]; }; 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-15"; sha256="0ikvzc5vfcs50jl5n49mhk39pcijyfdxd26adgs01h0b50zh1yi2"; depends=[nloptr]; }; ptwikiwords = derive2 { name="ptwikiwords"; version="0.0.3"; sha256="129dad1vy52sf97dqrkwa49vjhv2kvs4pmd5zvq8pxd51hqm6wy9"; depends=[]; }; ptycho = derive2 { name="ptycho"; version="1.1-4"; sha256="1llk3rpk0lf80vwvs23d6dqhgyic3a6sfjc393csj69hh01nrdvc"; depends=[coda plyr reshape2]; }; pubchunks = derive2 { name="pubchunks"; version="0.2.0"; sha256="119ihi6xi9k3p5lv2qkch2jc2fqmf8h0wi7mqh57asg7n6f0qb6r"; depends=[data_table rcrossref xml2]; }; - pubh = derive2 { name="pubh"; version="1.1.3"; sha256="0wr54x88ja4d0bpid1blz235q5kdlpyprha9nzrmwsr30s3c060n"; depends=[car dplyr emmeans Epi epiR epitools ggformula ggplot2 Hmisc lmtest magrittr sandwich sjlabelled sjPlot survival]; }; + pubh = derive2 { name="pubh"; version="1.1.6"; sha256="0788h08nmqxihymb8l46xwjs9j00vmxyim031p29392i8zbqkhc5"; depends=[car dplyr emmeans Epi epiR epitools finalfit ggformula ggplot2 Hmisc lmtest magrittr sandwich sjlabelled sjPlot survival]; }; publipha = derive2 { name="publipha"; version="0.1.1"; sha256="0ssmkz4bbrp5yvqb2da0i6shzm59ydw2sqkmqkid039782sibjch"; depends=[BH loo Rcpp RcppEigen rstan rstantools StanHeaders truncnorm]; }; pubmed_mineR = derive2 { name="pubmed.mineR"; version="1.0.16"; sha256="1dcviy347lypbzwwz506d37wy5swla2vjgyqijwc37daic71bnih"; depends=[boot R2HTML RCurl XML]; }; + pubmedR = derive2 { name="pubmedR"; version="0.0.2"; sha256="03ff0n6qrxglclnpd8kz35wn95fghiqahc7qbq2r3xmp7q0xk3zz"; depends=[rentrez XML]; }; pubtatordb = derive2 { name="pubtatordb"; version="0.1.4"; sha256="0i5azbf75bwxxzpsr5fc2hh22pbwix00hz9dcdpn5jgp2957f7wx"; depends=[assertthat DBI dplyr R_utils readr RSQLite]; }; pullword = derive2 { name="pullword"; version="0.2"; sha256="14rln0nbd4k2cvf18iwvc56776b9g3m3cs67i7fgzabfrgj8y6db"; depends=[RCurl]; }; pulsar = derive2 { name="pulsar"; version="0.3.6"; sha256="0r1myng3wmirlp1ixqkkzlgv5i0my37irligah3wwfh0cprip1dm"; depends=[Matrix]; }; @@ -12033,7 +12171,7 @@ in with self; { pvclass = derive2 { name="pvclass"; version="1.4"; sha256="1g6x75qz3xybq1xnik0hzi7mcs0gzzqd3f0iwfkzi5d1zcddnw13"; depends=[Matrix]; }; pvclust = derive2 { name="pvclust"; version="2.2-0"; sha256="0082icm54k2yq60k06qpr92a626k39j2jr0046lva4ylmhxqb4kq"; depends=[]; }; pvsR = derive2 { name="pvsR"; version="0.3"; sha256="1ijmqlcsc8z0aphdd3j37ci8yqsy50wnr2fwn7h8fxbyd12ax2nj"; depends=[httr nnet XML]; }; - pwr = derive2 { name="pwr"; version="1.2-2"; sha256="0r5g781lr677vp3zyhgmi7r68c87l8gd05l1s3ffnxgn5wf043sm"; depends=[]; }; + pwr = derive2 { name="pwr"; version="1.3-0"; sha256="1kfzy73v3z6ipc3kdfkcjrp4b4p5k54nwk796gqi36srm93hgc2v"; depends=[]; }; pwr2 = derive2 { name="pwr2"; version="1.0"; sha256="0zfv7z5yymw310r1sqm8ivsc2pv6dgk2k4b1axmm92gsaj53cn7p"; depends=[]; }; pwr2ppl = derive2 { name="pwr2ppl"; version="0.1.1"; sha256="1n34cmsnia6gskwqh5l1czi4cx8vi96nzs100am3vkcxx1xlq7ss"; depends=[afex car dplyr ez lavaan MASS MBESS nlme phia tidyr]; }; pwrAB = derive2 { name="pwrAB"; version="0.1.0"; sha256="0ifyw40m9gsijw3vm9qb8qk4yydmdixfdpdp45x2hk93j8v61jm1"; depends=[]; }; @@ -12044,7 +12182,7 @@ in with self; { pwt9 = derive2 { name="pwt9"; version="9.1-0"; sha256="0m2df89lali9945avcv4gdjpxch9in7vdd042nx0q8nv0alb4ijd"; depends=[]; }; pxR = derive2 { name="pxR"; version="0.42.2"; sha256="1q1xwsrs1ch1a1d1clz6sl7vnsyz5wjqivczk5n5d772y4w60bz5"; depends=[plyr reshape2 RJSONIO stringr]; }; pxweb = derive2 { name="pxweb"; version="0.9.1"; sha256="00xp7idhsirmpl970yxnxp6xn128jm5kwsmdwhys32wlbd9kzspc"; depends=[checkmate httr jsonlite]; }; - pyMTurkR = derive2 { name="pyMTurkR"; version="1.1"; sha256="0pvv8fgg40vv36mf3cc8ysrjj3gk9hnmzyvwix2ndxvc1nlzzahc"; depends=[curl reticulate XML]; }; + pyMTurkR = derive2 { name="pyMTurkR"; version="1.1.4"; sha256="1dv8v01gd79jvqr54rb7k9x8i7v279f82slbmpvsd5r0k9zg2bfq"; depends=[curl reticulate XML]; }; pycno = derive2 { name="pycno"; version="1.2"; sha256="0ha5css95xb98dq6qk98gnp1al32gy6w5fkz74255vs4hmkwfzw2"; depends=[maptools rgeos sp]; }; pyinit = derive2 { name="pyinit"; version="1.0.3"; sha256="0sj7r52a53x57ff8b34s6p2y638b85fin0cxrndhpsk392sds0ki"; depends=[robustbase]; }; pyramid = derive2 { name="pyramid"; version="1.5"; sha256="0lakn9knmhqvhrp98sc3hhwd4bilpplxbr5j9bv8w6li0qd3d04a"; depends=[]; }; @@ -12053,12 +12191,14 @@ in with self; { qCBA = derive2 { name="qCBA"; version="0.4"; sha256="1230sh9riazx1shhgbkkxfrks7klypj2x1vc173q09hq8bkam2ha"; depends=[arc arules rJava]; }; qGaussian = derive2 { name="qGaussian"; version="0.1.8"; sha256="02xy35xg4swr1ldnsbywnz2h0ga1pbsivnj0aqmpll7kvwl9qz4c"; depends=[Rcpp robustbase zipfR]; }; qLearn = derive2 { name="qLearn"; version="1.0"; sha256="1ilxmgazm8gjz8c1hhbp4fccibnvnalxrag8b0rn081zsqmhf094"; depends=[]; }; + qMRI = derive2 { name="qMRI"; version="1.2"; sha256="10x59g8awxjib5j5mc1yd5wsibk3z6ki6zifxsg8azl0zblxbscf"; depends=[adimpro aws awsMethods oro_nifti stringr]; }; qVarSel = derive2 { name="qVarSel"; version="1.0"; sha256="13x2hnqjsm0ifzmqkkl9ilhykrh80q04lhlkkp06hkysmh5w9rkx"; depends=[lpSolveAPI Rcpp]; }; - qad = derive2 { name="qad"; version="0.1.1"; sha256="11v291swfl4llgzfffm786xqp9cn82vl8xlqjlma5wah7ig73rgh"; depends=[copula data_table doParallel foreach ggplot2 plyr viridis]; }; + qad = derive2 { name="qad"; version="0.1.2"; sha256="0xpzv1cliilrc1v4w6k848lphvdamr9ps63zh27bs3gkwncr47qa"; depends=[copula data_table doParallel foreach ggplot2 plyr viridis]; }; qap = derive2 { name="qap"; version="0.1-1"; sha256="0d2d1ni1camixyi45lfy00f4pn3p063k7bsi8gj5scp6n15mdgb0"; depends=[]; }; qat = derive2 { name="qat"; version="0.74"; sha256="04n1jnbkf9dzafjh1n5d4q9p7hvyhnr63nmgl51jqxcf3nan5rlx"; depends=[boot fields gdata gplots moments ncdf4 XML]; }; qboxplot = derive2 { name="qboxplot"; version="0.2"; sha256="07f05n7zxgwyxg2r5fz691ra64m218w9v874xfzjx6671c40y1q2"; depends=[]; }; qcQpcr = derive2 { name="qcQpcr"; version="1.5"; sha256="1298zla8z5w9z4idc07v3ca9rc1afx853y7iz3jmqnqnv8mr0s48"; depends=[ggplot2]; }; + qcapower = derive2 { name="qcapower"; version="0.1.0"; sha256="14vszidjvyi8namwv5k0hpgdw1dpns5ilvxfwa920ivdg35709ki"; depends=[devtools ggforce ggplot2]; }; qcc = derive2 { name="qcc"; version="2.7"; sha256="0lc26w7p3d023lfr8v6v75m2vwqg9vi9pdipap19l4vbdq29l4zz"; depends=[MASS]; }; qccrs = derive2 { name="qccrs"; version="0.1.0"; sha256="0lwrmf2809zzdj5f25bb1psh57ibyw90ra41fy2i9vjmgph9wgiq"; depends=[dplyr magrittr purrr tibble]; }; qcr = derive2 { name="qcr"; version="1.0"; sha256="1251naica44kccmikyzdi3ncxfmvyqbc4qspfqnc0w54cqpsy5rw"; depends=[fda_usc MASS mvtnorm qcc qualityTools]; }; @@ -12068,22 +12208,21 @@ in with self; { qdapRegex = derive2 { name="qdapRegex"; version="0.7.2"; sha256="1xa8q1way3gjadrjh3mv3xr4c6b4h16nd2c6lgl969difplpfz9p"; depends=[stringi]; }; qdapTools = derive2 { name="qdapTools"; version="1.3.3"; sha256="0a28jn57d2fas3009cm10z07fq77ql3ffcrhcxsiimb57179wj0n"; depends=[chron data_table RCurl XML]; }; qdm = derive2 { name="qdm"; version="0.1-0"; sha256="0cfxyy8s5zfb7867f9xv9scq9blq2qnw68x66m7y7nqlrrff5xdr"; depends=[]; }; - qfasar = derive2 { name="qfasar"; version="1.2.0"; sha256="067wnwwz8s0yxig13wrjq37w62kf8p5pa8my5lfpc1ik1b7iysby"; depends=[Rsolnp]; }; - qgam = derive2 { name="qgam"; version="1.3.0"; sha256="0i0irz2jqi73d97zyy8xz2yi95y93kw3sr9xf4hmrjdd4k15l0wk"; depends=[doParallel mgcv plyr shiny]; }; - qgcomp = derive2 { name="qgcomp"; version="2.0.0"; sha256="0q2mz5yynri26yfscicw344bjar7ygjmmy7hspjvqgg10mj8sla7"; depends=[arm future future_apply ggplot2 gridExtra pscl survival]; }; - qgg = derive2 { name="qgg"; version="1.0.2"; sha256="1bxm6gg52ja8n2b54i8zhd4wp3711dq94ch7sr2lqrr6kd7w033s"; depends=[data_table MASS MCMCpack statmod]; }; - qgraph = derive2 { name="qgraph"; version="1.6.4"; sha256="1glg814h7fwl1jfm6dw1d9i80bilmj5jcjjrfln15byrdh4mm1j3"; depends=[abind BDgraph colorspace corpcor d3Network dplyr fdrtool ggm ggplot2 ggraph glasso gtools Hmisc huge igraph jpeg lavaan Matrix pbapply plyr png psych Rcpp reshape2 tidygraph]; }; + qfasar = derive2 { name="qfasar"; version="1.2.1"; sha256="14370bmq4qx5j02va13wz52m2lgl4vb992p9587z9v2sxl1v4jjg"; depends=[Rsolnp]; }; + qgam = derive2 { name="qgam"; version="1.3.2"; sha256="0lks2cj0p7irp1i01756v1l7i26d7alax1fbkc20qd6wpz840fi7"; depends=[doParallel mgcv plyr shiny]; }; + qgcomp = derive2 { name="qgcomp"; version="2.2.2"; sha256="0dszh56drh9h4gc4vb31749hjgl9k3yvj8x10d2nkr8ba29ng4x2"; depends=[arm future future_apply generics ggplot2 gridExtra pscl survival tibble]; }; + qgraph = derive2 { name="qgraph"; version="1.6.5"; sha256="0pwys9irxvp0ap158drplyypkplbmwqinv0fmlsblk7q875cr592"; depends=[abind BDgraph colorspace corpcor d3Network dplyr fdrtool ggplot2 ggraph glasso gtools Hmisc huge igraph jpeg lavaan Matrix pbapply plyr png psych Rcpp reshape2 tidygraph]; }; qgtools = derive2 { name="qgtools"; version="2.0"; sha256="1gj7vbam53yr2rnxzfxng1p107bjcyjmyj47cxyzaiv19pznkbmw"; depends=[]; }; qha = derive2 { name="qha"; version="0.0.8"; sha256="0sdf6g6884wn73i237xkwszg2mq8xddhvyy225qzpplh5za4pnhl"; depends=[ade4 FactoClass FactoMineR]; }; qicharts = derive2 { name="qicharts"; version="0.5.5"; sha256="0bl1f64b5n8q9jhzh3rqfyh9613qiy9mhcy2xsn16jyrj4hmj0jd"; depends=[ggplot2 lattice latticeExtra scales]; }; - qicharts2 = derive2 { name="qicharts2"; version="0.6.0"; sha256="0310xczb8zzl8xl0l2fn1mw58cbkgs0xpsp3q061psv1achapxbr"; depends=[dplyr ggplot2 scales]; }; + qicharts2 = derive2 { name="qicharts2"; version="0.6.1"; sha256="14s8fji9hmsi3675n6nsy0mh1myj54bm18fssax2h0s96742lz79"; depends=[ggplot2 scales]; }; qif = derive2 { name="qif"; version="1.5"; sha256="12azs7c0anpd71d5663y1jrhirry6cr78wislp4fk64hmsbx7sx4"; depends=[MASS]; }; qiitr = derive2 { name="qiitr"; version="0.1.0"; sha256="1p0mcwgzvbib20l05wrnshkqx99vwr69dgy15dfwp75skyy5l797"; depends=[httr jsonlite purrr rstudioapi]; }; qkerntool = derive2 { name="qkerntool"; version="1.19"; sha256="14inry2hqvkmy0y2y3cl75ri4vri0hirv98gw2rymny69lia5x0s"; depends=[class]; }; qlcData = derive2 { name="qlcData"; version="0.2.1"; sha256="0n1r7462zmyzkyi7mp3hf7pn7bgw1m1zs9flm3n199kjm8f6yyzy"; depends=[ape data_tree docopt phytools shiny stringi yaml]; }; qlcMatrix = derive2 { name="qlcMatrix"; version="0.9.7"; sha256="0iqkcvvy8rxlk0s83sjq57dd6fadb18p5z31lzy0gnzv1hsy1x8y"; depends=[docopt Matrix slam sparsesvd]; }; qmap = derive2 { name="qmap"; version="1.0-4"; sha256="02xvq1mw83gln7phacbi3vhkvb100crggbldv13mhwq3wjnmg5k2"; depends=[fitdistrplus]; }; - qmethod = derive2 { name="qmethod"; version="1.5.4"; sha256="1c64b7jy9llz5dhfnk75yamjva043213gd08dsr27pyjkmbyqms1"; depends=[digest GPArotation knitr psych xtable]; }; + qmethod = derive2 { name="qmethod"; version="1.5.5"; sha256="1s787big5f1m91n9s7yhxpsfx0161l7pyihlvfp9406k8qxs3jnl"; depends=[digest GPArotation knitr psych xtable]; }; qmix = derive2 { name="qmix"; version="0.1.2.0"; sha256="172lhvj7adphxq9gws2i9lysc9bj1wpk60f4hf2h5sisnli15v0x"; depends=[BH Formula Rcpp RcppEigen rstan StanHeaders]; }; qmrparser = derive2 { name="qmrparser"; version="0.1.5"; sha256="0sl9n42j0dx9jqz5vv029ra6dyrg9v7mvdlya8ps3vyd6fjhwh0z"; depends=[]; }; qoma_smuggler = derive2 { name="qoma.smuggler"; version="0.0.1"; sha256="03p9i0kr6i3adpb9lcszcmdr9p26nfy7f8hw2sbydazglaw4hscr"; depends=[lubridate rhli tibble]; }; @@ -12091,15 +12230,14 @@ in with self; { qpdf = derive2 { name="qpdf"; version="1.1"; sha256="03lnfncw8qd1fwfyqh1mjvnsjr3b63wxbah0wp5g7z7gba90dwbi"; depends=[askpass curl Rcpp]; }; qqid = derive2 { name="qqid"; version="1.0.3"; sha256="1j2s5zilz97x4kl10g85qr3rxg022p9i601r6gvkaa57xcx6smw1"; depends=[qrandom]; }; qqman = derive2 { name="qqman"; version="0.1.4"; sha256="1v9s9ag1hfb47py87wb2nad4mbsfx35832hdmrh5kxrb2f11zl1s"; depends=[calibrate]; }; - qqplotr = derive2 { name="qqplotr"; version="0.0.3"; sha256="0qijdgma702ryi0q2ii2sa04jpz12i8c7xnh9a9zngi9n630a0f2"; depends=[dplyr ggplot2 knitr MASS purrr rmarkdown robustbase]; }; - qqtest = derive2 { name="qqtest"; version="1.1.1"; sha256="08vfpbrgvyhv1w0gqmys9zkhfxh85sk74ig5fn12ma2p87zv7r5l"; depends=[robust]; }; + qqplotr = derive2 { name="qqplotr"; version="0.0.4"; sha256="1zy7mlnll0infr2las5c28vi5da04rm869dpccwcws1467mhys3k"; depends=[dplyr ggplot2 knitr MASS robustbase]; }; + qqtest = derive2 { name="qqtest"; version="1.2.0"; sha256="1v0qbbp2dpqflpg7yif7hipwdbz27isfyfwcia1ln7z0nnvkjm8c"; depends=[]; }; qqvases = derive2 { name="qqvases"; version="1.0.0"; sha256="1fli4v1slmnwcmzmmfw84sa4mx3xzv3im1q0plb8811sbsgmwdvl"; depends=[shiny shinythemes]; }; qrLMM = derive2 { name="qrLMM"; version="2.0"; sha256="0ci4679kfif1sk4009v89yfm5p6nyk7nhvikgd00rhrbqi9qaqy4"; depends=[ald lqr mvtnorm psych quantreg]; }; qrNLMM = derive2 { name="qrNLMM"; version="2.0"; sha256="0j69zhs1v4546xrkwra9c2q3kmhf593vi05yjn3b3s5nzh2k0i1x"; depends=[ald lqr mvtnorm psych quantreg]; }; qrage = derive2 { name="qrage"; version="1.0"; sha256="00j74bnkcpp0h8v44jwzj67q9aaw47ajc2fvgr6dckj9rymydinl"; depends=[htmlwidgets]; }; qrandom = derive2 { name="qrandom"; version="1.2.2"; sha256="1s0frb3qjaraigx79g0sm60dj216jrmp1lgzcvjk3rh7xdjhjrkn"; depends=[curl jsonlite Rmpfr]; }; - qrcm = derive2 { name="qrcm"; version="2.1"; sha256="0wp6ynckh66gxi569wbvn5szwih4g0c21zrrpz3zfavhqwk7srgf"; depends=[pch survival]; }; - qrcmNP = derive2 { name="qrcmNP"; version="0.1.2"; sha256="0psgnz2fdj530wjj14pv5x2889yzphnlsg10lry9i6dvmxd8m47k"; depends=[qrcm survival]; }; + qrcm = derive2 { name="qrcm"; version="2.2"; sha256="04cd78vqqp7pprrfpcza03g4pcffgl42qsax1285fbmxjqhb3yks"; depends=[pch survival]; }; qrcode = derive2 { name="qrcode"; version="0.1.1"; sha256="12j0db8vidlgkp0dcjyrw5mhhvazl7v7gpn9wsf2m0qnz1rm4igq"; depends=[R_utils stringr]; }; qrencoder = derive2 { name="qrencoder"; version="0.1.0"; sha256="1lg60lg2fiqdw0m228i8pln2p0kqp9f21qmrx6r6rwxifvwlfhv8"; depends=[base64enc png raster Rcpp]; }; qrjoint = derive2 { name="qrjoint"; version="2.0-3"; sha256="1ymnq8mbvxfdi63f4554mjlix5n864v2nask27pkf3yfxmkr346k"; depends=[coda kernlab Matrix quantreg]; }; @@ -12108,13 +12246,12 @@ in with self; { qrmtools = derive2 { name="qrmtools"; version="0.0-12"; sha256="1gbnc8cl0iv5snkrz5vrg3k6c5zz74amrb6yxwnlhh69yh63zxhi"; depends=[ADGofTest lattice Quandl quantmod rugarch xts zoo]; }; qrng = derive2 { name="qrng"; version="0.0-7"; sha256="1dw1qqajxavlnfyh6xn58069fpfza28x1xjzd3diqlcxxlb4hjaf"; depends=[copula randtoolbox]; }; qrnn = derive2 { name="qrnn"; version="2.0.5"; sha256="0ligz67kbfg5cmvacnb7y0ms1v0c7mbvbcfsxyfiz543ppl3xn1v"; depends=[]; }; - qrsvm = derive2 { name="qrsvm"; version="0.2.1"; sha256="0qpj3c8qwrwr2asvp921av0mbdba1ayz0pdq4a52i1waqng4fgis"; depends=[doParallel foreach kernlab Matrix quadprog]; }; - qs = derive2 { name="qs"; version="0.20.2"; sha256="12iqfa5rmcvw8dhprg4w8xvk2qd5796rmdsl9bsj59ijzr7zwg82"; depends=[RApiSerialize Rcpp]; }; + qs = derive2 { name="qs"; version="0.21.2"; sha256="1i4xrm9vz8ffl4mbw1qmgwkcm3j6ajw25ilj08n87ghy798pyab3"; depends=[RApiSerialize Rcpp]; }; qsort = derive2 { name="qsort"; version="0.2.3"; sha256="1xvp29dijfa2207wyw3z09rmffn61fngfy0f00qjk284n1jnnvrg"; depends=[cowplot ggplot2 gridExtra purrr]; }; qsub = derive2 { name="qsub"; version="1.1.0"; sha256="0i52bibc782k09f5hp3ic9ll14fsrwjnkdxlb0mhkjvsqm7m5hc5"; depends=[dplyr glue pbapply processx purrr random readr ssh stringr tidyr]; }; qtbase = derive2 { name="qtbase"; version="1.0.14"; sha256="1pcgjycq61x9h52sqr6fz83qjnlpbawvpavnn9hyw2b7jlv3nwfd"; depends=[]; }; qte = derive2 { name="qte"; version="1.3.0"; sha256="0x65n2qyq1py0nrachxkqd273mywkw433ai5x6ni3ak4ckbp3g66"; depends=[BMisc formula_tools ggplot2 Hmisc knitr msm pbapply quantreg texreg]; }; - qtl = derive2 { name="qtl"; version="1.44-9"; sha256="03lmvydln8b7666b6w46qbryhf83vsd11d4y2v95rfgvqgq66l1i"; depends=[]; }; + qtl = derive2 { name="qtl"; version="1.46-2"; sha256="0rbwcnvyy96gq1dsgpxx03pv423qya26h6ws5y0blj3blfdmj83a"; depends=[]; }; qtl2pleio = derive2 { name="qtl2pleio"; version="1.2.3"; sha256="0ihlp6glsw4pk97vpqlcbd6zmg0qww3i19c1b76vx1wkazjg6pd8"; depends=[dplyr gemma2 ggplot2 magrittr MASS Matrix Rcpp RcppEigen rlang stringr testthat tibble]; }; qtlDesign = derive2 { name="qtlDesign"; version="0.941"; sha256="138yi85i5xiaqrns4v2hw46b731bdgnb301wg2h4cfrxvrw4l0d5"; depends=[]; }; qtlbook = derive2 { name="qtlbook"; version="0.18-8"; sha256="1c849xy2ki7niddajv5wnsm0zdp5381w8zm9lc8rvkdbs2v6rhf4"; depends=[]; }; @@ -12136,22 +12273,23 @@ in with self; { qualityTools = derive2 { name="qualityTools"; version="1.55"; sha256="1c2p78dhwqvzb2k01dvwb41a6hlr2iwpw6fv91036x30rphjzb88"; depends=[MASS Rsolnp]; }; qualmap = derive2 { name="qualmap"; version="0.1.1"; sha256="1z085zyqxnizpx4y1891shhijs2a9gg5ap800ryvfxncg6gk35wa"; depends=[dplyr glue leaflet purrr rlang sf]; }; qualpalr = derive2 { name="qualpalr"; version="0.4.3"; sha256="1hlssqj2129796d00gnip3ih5b705qasw0hkj25xfz7xak0vdbkm"; depends=[assertthat randtoolbox Rcpp RcppArmadillo RcppParallel]; }; - qualtRics = derive2 { name="qualtRics"; version="3.1.1"; sha256="092f8d59g5b5619q6v4vkpjw8za5rrmhv805xg95m3z0xcscg1rl"; depends=[assertthat dplyr httr jsonlite purrr readr rlang sjlabelled stringr tibble yaml]; }; + qualtRics = derive2 { name="qualtRics"; version="3.1.2"; sha256="18pl7ni5m0xb1rkpw118cxcbhbwqqvq4cm4wx1jddknn4kx7cjbx"; depends=[assertthat dplyr httr jsonlite purrr readr rlang sjlabelled stringr tibble]; }; qualvar = derive2 { name="qualvar"; version="0.2.0"; sha256="1c7b7lcyq2l46sslk185r6xfh5fb35z9qihrhnh294sw1k52bffa"; depends=[]; }; qualypsoss = derive2 { name="qualypsoss"; version="1.0.0"; sha256="1pvf9b9yw8317wnh1x1jkmwl4cl0r9q7npfw0xzgbs8mfpl9j2ah"; depends=[doParallel foreach MASS mvtnorm]; }; quantable = derive2 { name="quantable"; version="0.3.6"; sha256="15q4phc2j7aihl8f4qzpdwxcvshq2cfzkfcxc8k4qypsxk9a00sb"; depends=[caret dplyr e1071 ggplot2 ggrepel gplots Matrix plyr pROC RColorBrewer readr reshape2 rlang scales stringr tibble tidyr]; }; - quanteda = derive2 { name="quanteda"; version="1.5.2"; sha256="0iv25rpx5cl9ansazjs0qb97pniajrxf4mqsnb5q98y2hil9ipd3"; depends=[data_table extrafont fastmatch ggplot2 ggrepel lubridate magrittr Matrix network proxyC Rcpp RcppArmadillo RcppParallel RSpectra sna SnowballC spacyr stopwords stringi xml2 yaml]; }; + quanteda = derive2 { name="quanteda"; version="2.0.1"; sha256="0pym6vdzqbkyj87m3pla229092xvvx4j830x67qflxzzdmc9dzhz"; depends=[data_table extrafont fastmatch ggplot2 ggrepel jsonlite magrittr Matrix network proxyC Rcpp RcppArmadillo RcppParallel sna SnowballC stopwords stringi xml2 yaml]; }; + quanteda_textmodels = derive2 { name="quanteda.textmodels"; version="0.9.1"; sha256="04c43hk6yx06m11s01aw0sqjd2yip7l7wzlbif600hvwxgs74knn"; depends=[ggplot2 LiblineaR Matrix quanteda Rcpp RcppArmadillo RcppParallel RSpectra RSSL SparseM stringi]; }; 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.3"; sha256="0crcwcr53bpqj07q5hvqkpq1sg9ikwz3nig2ifshqq5g2a3m57qs"; depends=[errors Rcpp units]; }; - quantmod = derive2 { name="quantmod"; version="0.4-15"; sha256="0lyzaf5ypk93v6zj9gdghy05cc7cxgn9yasv1apx5r6qsjcfgwky"; depends=[curl TTR xts zoo]; }; + quantkriging = derive2 { name="quantkriging"; version="0.1.0"; sha256="0v6kckgzhgsn3158sc06xszdhmk8sfny10j1qyppxsl2hk89n8jf"; depends=[ggplot2 hetGP Matrix reshape2]; }; + quantmod = derive2 { name="quantmod"; version="0.4.17"; sha256="1ss441rwlr88kz212m0wgx0hwgwi41rhy1jncg2lgqzqfvr5dzqa"; depends=[curl TTR xts zoo]; }; quantoptr = derive2 { name="quantoptr"; version="0.1.3"; sha256="0f9vy9yhya4wpya8n345s6n7a5sb29chdkl5fz6dwa31lp1mvvj3"; depends=[quantreg Rdpack rgenoud stringr]; }; - quantreg = derive2 { name="quantreg"; version="5.54"; sha256="19nh79qrkb75q348nk148l8wqjwnq5jgq29wpzqym5cfv1kjqfvh"; depends=[Matrix MatrixModels SparseM]; }; + quantreg = derive2 { name="quantreg"; version="5.55"; sha256="1zjc8p95kb0ypxa6nxp0lkdq8armkjmmhf8484m25n5f14a59qfb"; depends=[Matrix MatrixModels SparseM]; }; quantreg_nonpar = derive2 { name="quantreg.nonpar"; version="1.0"; sha256="1f9120awnkwsgdiqg98lg7xs5l4y80930869x6k9q76595r5m92k"; depends=[fda mnormt quantreg Rearrangement]; }; quantregForest = derive2 { name="quantregForest"; version="1.3-7"; sha256="0lk7r02i6zpx9sdl2rp0r7fc3a84s8qhg49nh2x7k3vxwa095pjz"; depends=[randomForest RColorBrewer]; }; quantregGrowth = derive2 { name="quantregGrowth"; version="0.4-3"; sha256="0q2yk51hcn7jnvh14nxa7szfj4pr9grh5rdfwazaziilbwqdmw4f"; depends=[quantreg]; }; quantregRanger = derive2 { name="quantregRanger"; version="1.0"; sha256="1a9q2prr790bpw6s0y5ni5ppd3vqkjr0v4nqp6ywcj5n3sk69pvx"; depends=[ranger Rcpp]; }; - quantspec = derive2 { name="quantspec"; version="1.2-1"; sha256="0kvwifdwy3big0lls5h3wcb48v3jvlfp1l0zjd07jnvj43zj3ysd"; depends=[abind quantreg Rcpp snowfall zoo]; }; quarrint = derive2 { name="quarrint"; version="1.0.0"; sha256="13fdmmrgn23xd9vpywmcl7pf729gmcxjfl1wxs30axsbp4h1s6rk"; depends=[neuralnet]; }; queryparser = derive2 { name="queryparser"; version="0.2.0"; sha256="1fsp64rm4jch2jjw7czw9qmwb4f3s46avbf3z3gpvcfdq4aw65kb"; depends=[]; }; questionr = derive2 { name="questionr"; version="0.7.0"; sha256="1cschww3g2jhrfh87bxcaaig84yr0zcj0virmpx033yal606hmn4"; depends=[classInt highr htmltools labelled miniUI rstudioapi shiny]; }; @@ -12171,17 +12309,18 @@ in with self; { quokar = derive2 { name="quokar"; version="0.1.0"; sha256="1qnl3x1aa665xpyb3ac07xrnnjdwbmj645p103144k5is5b8likc"; depends=[ald ALDqr bayesQR dplyr ggplot2 GIGrvg gridExtra knitr magrittr MCMCpack purrr quantreg robustbase tidyr]; }; quotedargs = derive2 { name="quotedargs"; version="0.1.3"; sha256="11cswg9bmddsl1axxcdz11flq46p1zkpv022526f2vgl4qsprwbm"; depends=[]; }; qut = derive2 { name="qut"; version="2.1"; sha256="1wkk4c4f10a1whrspr5yalp7flcxckzxlx187ymmpnz7qcncz619"; depends=[flare glmnet lars Matrix]; }; - qvcalc = derive2 { name="qvcalc"; version="1.0.1"; sha256="1wr5zivnfwscrzhw9myc5llpac0xjkz51s6hravjhflmp8s8lm7k"; depends=[]; }; + qvcalc = derive2 { name="qvcalc"; version="1.0.2"; sha256="0banzv78kb53ybfbh1hmgx7kxvpbbdxzg4dsn7vrwhmxs72srkch"; depends=[]; }; qwraps2 = derive2 { name="qwraps2"; version="0.4.2"; sha256="14h9xwv6x5lci17hg048a6n0cp3d2rif4v0g7dr05w504h157kw9"; depends=[dplyr ggplot2 knitr magrittr Rcpp RcppArmadillo rlang tidyr]; }; 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]; }; r2d3 = derive2 { name="r2d3"; version="0.2.3"; sha256="0v612mbzdjr8cq1ffall9hagbwxfv7fh963x8f0w5r84v1m3y2bl"; depends=[htmltools htmlwidgets jsonlite rstudioapi]; }; r2dRue = derive2 { name="r2dRue"; version="1.0.4"; sha256="1apdq7zj5fhs349wm9g6y06nn33x24pg3gdp4z1frd18qlacf8z5"; depends=[matrixStats rgdal sp]; }; + r2dii_data = derive2 { name="r2dii.data"; version="0.0.3"; sha256="0vsl1kpprvy0q6yr0ky132qnjdgc8j6pjkwzy8r4g5igqbp07d4d"; depends=[]; }; + r2dii_match = derive2 { name="r2dii.match"; version="0.0.1"; sha256="0qk0yxqhyw4xxllbm62ayzphh6zg0gswyzm2wn6y4qqds9k70v3r"; depends=[dplyr glue magrittr purrr r2dii_data rlang stringdist stringi tibble tidyr tidyselect]; }; r2glmm = derive2 { name="r2glmm"; version="0.1.2"; sha256="0iim92blpa59vgz97c2pi05yhbjjmaffdbkbmk5kplfb2vmazgiy"; depends=[afex data_table dplyr ggplot2 gridExtra lmerTest MASS Matrix mgcv pbkrtest]; }; - r2pmml = derive2 { name="r2pmml"; version="0.23.0"; sha256="1md7fzx7yc6b3plflcq4c109v2plhvb1a6dg628bhyiicjs1s83c"; depends=[]; }; - r2stl = derive2 { name="r2stl"; version="1.0.0"; sha256="18lvnxr40cm450s8qh09c3cnkl1hg83jhmv1gzsv6nkjrq4mj5wh"; depends=[]; }; - r2sundials = derive2 { name="r2sundials"; version="5.0.0-4"; sha256="1zwwrphix4smvxmb93ni1lb1vz0j9r3j3fr3n0b29y8z6lvk1q9k"; depends=[Rcpp RcppArmadillo rmumps]; }; + r2pmml = derive2 { name="r2pmml"; version="0.24.0"; sha256="0fl2kh1b7rvghschadsdp12za0r16xpak29f0w7dh38i5sw5scrk"; depends=[]; }; + r2rtf = derive2 { name="r2rtf"; version="0.1.1"; sha256="04612jnmqrdl3ps66zxj515fbnvaxzcw8bl9dg2gjqh7lr23a0dj"; depends=[stringr]; }; + r2sundials = derive2 { name="r2sundials"; version="5.0.0-7"; sha256="11l8z7h0gm71yqns2blrd26p084gcdc4x1xwv0knp8830xqjdsmw"; depends=[Rcpp RcppArmadillo rmumps]; }; r4lineups = derive2 { name="r4lineups"; version="0.1.1"; sha256="1p0dnrp21zx1l9lqx01jnq54d5ppb8siibv47i4gsp7c7db9ymxc"; depends=[boot dplyr ggplot2 ggrepel here magick magrittr pROC psych purrr]; }; r4ss = derive2 { name="r4ss"; version="1.36.1"; sha256="03xin7avdbg5ayrcdbw5rx9sh6ingjq2kv3405h01vqf1jhkfsxk"; depends=[coda corpcor gdata gplots gtools kableExtra pso truncnorm]; }; r511 = derive2 { name="r511"; version="0.1.1"; sha256="1njsnjf0746cv6x7fznq4cg556fczqcfawwb869r3w9zv0zj1iy9"; depends=[assertthat dplyr httr tibble xml2]; }; @@ -12198,20 +12337,19 @@ in with self; { rCMA = derive2 { name="rCMA"; version="1.1"; sha256="0dswshg80hbgcib5x9w791sh71q5s4435q8sm9dh170v4ngbax0w"; depends=[]; }; rCRM = derive2 { name="rCRM"; version="0.1"; sha256="01xxkrwd0iwhmq8dshgbn84qi6kky757y01alqrk0pkq2n8ghms4"; depends=[Rcpp RcppEigen]; }; rCUR = derive2 { name="rCUR"; version="1.3"; sha256="1f38xbc5n91k2y88cg0sv1z2p4g5vl7v2k1024f42f7526g2p2lx"; depends=[lattice MASS Matrix]; }; - rCarto = derive2 { name="rCarto"; version="0.8"; sha256="08813l4xfahjyn0jv48q8f6sy402n78dqsg01192pxl2dfc2i9ry"; depends=[classInt maptools RColorBrewer]; }; rChoiceDialogs = derive2 { name="rChoiceDialogs"; version="1.0.6"; sha256="0lp8amdalirpsba44aa3r31xnhmi36qb9qf8f8gdxxbarpgprsbi"; depends=[rJava]; }; rClinicalCodes = derive2 { name="rClinicalCodes"; version="1.0.1"; sha256="1p4p8r2n0k8h9xdzbngb95rshjp3376f5lsx228biqmswhpkhvlf"; depends=[RCurl rjson stringr tm XML]; }; - rDEA = derive2 { name="rDEA"; version="1.2-5"; sha256="1wsi2dkq9izvbhdqmd4qk8i277r1j38dk59fcmnxnwqvk6ar6nrb"; depends=[maxLik slam truncnorm truncreg]; }; + rDEA = derive2 { name="rDEA"; version="1.2-6"; sha256="0045crn7azsy3ggzr28vw5jd4f5aw5nj16cjnjxy2md3skfbc3zw"; depends=[maxLik slam truncnorm truncreg]; }; rDNAse = derive2 { name="rDNAse"; version="1.1-1"; sha256="0cl51q61kwvdsm5f49cjjbzggqam1fnr6gp15cmy6m2yahyxg1lk"; depends=[]; }; rDecode = derive2 { name="rDecode"; version="0.1.0"; sha256="1d0rrhycw9anhvx6czz7axkzhzqprdgi9sqfglmc962zf1x3hmn2"; depends=[]; }; rDotNet = derive2 { name="rDotNet"; version="0.9.1"; sha256="18cd5373pdfi1x958llb4cgjqdi1fb7h7m5nkdwcd4xw9hxhinzd"; depends=[Rcpp testthat]; }; + rEDM = derive2 { name="rEDM"; version="1.2.3"; sha256="1zz7rn57afax2hcffchzbkn0z6sbmbyhz6s6qbj5k92b48b1xdxb"; depends=[Rcpp RcppEigen]; }; rEMM = derive2 { name="rEMM"; version="1.0-11"; sha256="0ynjn10gcmxs8qnh6idb34ppmki91l8sl720x70xkzcqpahy0nic"; depends=[cluster clusterGeneration igraph MASS proxy]; }; rENA = derive2 { name="rENA"; version="0.2.0.1"; sha256="0sljnrhc710xbcdbsjx1rqrivbklgcnh7l4nqpnxdknvrxz6ky5y"; depends=[data_table doParallel foreach magrittr plotly R6 Rcpp RcppArmadillo scales]; }; - rERR = derive2 { name="rERR"; version="0.1"; sha256="1ymf0v3r2sv9m72c19csk38fy5kmld3i18jh06rir5kxkb5l245p"; depends=[dplyr ggplot2 numDeriv plyr reshape2 survival]; }; rFDSN = derive2 { name="rFDSN"; version="0.0.0"; sha256="1ffiqpdzy4ipy2aci22zkih4373ifkjkpvsrza8awhyf9fwqwdsl"; depends=[XML]; }; - rFIA = derive2 { name="rFIA"; version="0.2.0"; sha256="092h380z1rjwyf3s070icpcw10xnsjk6hk3phpbl7kxhx215bdjb"; depends=[bit64 data_table dplyr gganimate ggplot2 progress sf sp stringr tidyr]; }; - rFSA = derive2 { name="rFSA"; version="0.9.1"; sha256="14qpxmzy4vy1fydn8yqh1001mqrgv1i67ai42w61dkk0d4m75z60"; depends=[hashmap tibble]; }; + rFIA = derive2 { name="rFIA"; version="0.2.1"; sha256="1jg44m2m04s5pk5nkqk0hkz2rn96b8ys9j8dzby3qj0f1bx2bixs"; depends=[bit64 data_table dplyr gganimate ggplot2 progress sf sp stringr tidyr]; }; rFerns = derive2 { name="rFerns"; version="3.0.0"; sha256="0z12201y1b9d3rd02k4y64hpnlrgkg7pi1jpzsh1br4pchdf7rrm"; depends=[]; }; + rGEDI = derive2 { name="rGEDI"; version="0.1.6"; sha256="0w046fszs8738h378rp2wnm9jk9q5w1grwkhv9s9hfvs7phciypz"; depends=[bit64 curl data_table fs getPass ggplot2 hdf5r jsonlite lazyeval raster RColorBrewer sp]; }; rGammaGamma = derive2 { name="rGammaGamma"; version="1.0.12"; sha256="1051ah6q11qkxj1my4xybbzc8xcqkxfmps8mv2his5cyfllwidbs"; depends=[gsl]; }; rGoodData = derive2 { name="rGoodData"; version="0.1.1"; sha256="092sgy6y3dkyr32hrir4jvjwh7n6gfvv9z7i631fipg59255g0zy"; depends=[data_table httr jsonlite]; }; rGroovy = derive2 { name="rGroovy"; version="1.3"; sha256="172vm4diygzi4ipmw8bl03k0x3aps0h1vkvwvw539kamy7xb5w98"; depends=[rJava]; }; @@ -12221,8 +12359,8 @@ in with self; { rIntervalTree = derive2 { name="rIntervalTree"; version="0.1.0"; sha256="0xd6wcra4zvphfgnz1rnnslx96p840zlgms367370xm4hyg6d37x"; depends=[]; }; 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.1"; sha256="1a3rpj66sncawwa0hi0w6066h188hl5ssdqqgn1jnn4l7bax156j"; depends=[magrittr quanteda Rcpp RcppArmadillo RcppProgress reshape2 SnowballC]; }; - rJava = derive2 { name="rJava"; version="0.9-11"; sha256="0s9cjy1wh7snmbqwznh8f1r4ipylr7mgda4a979z963a8lqy32n2"; depends=[]; }; + rJST = derive2 { name="rJST"; version="1.3"; sha256="0l8znqvg4qiygv6mxwff1ipanzxvcdn54m879sk8z7zn3x5sg6iw"; depends=[magrittr quanteda Rcpp RcppArmadillo RcppProgress reshape2 SnowballC]; }; + rJava = derive2 { name="rJava"; version="0.9-12"; sha256="03vv0pj6san03c51iyqsyb1rwh3097dfpl2s8iswzzmc7k3shj12"; 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]; }; @@ -12232,68 +12370,68 @@ in with self; { rLindo = derive2 { name="rLindo"; version="8.0.1"; sha256="05qyc4wvpjgw8jxmwn2nwybi695fjn0cdilkprwmjg07c82f0q5n"; depends=[]; }; rMEA = derive2 { name="rMEA"; version="1.1.0"; sha256="1aarnik0qjxg6h55xpskx1dwkp78nfdyrwpy9r6ffyxhz9jbplnj"; depends=[]; }; rMR = derive2 { name="rMR"; version="1.1.0"; sha256="0da1hclfnnlkp9by6zf2p079643p8nimplr9p3ipbjdy739j344z"; depends=[biglm]; }; - rMVP = derive2 { name="rMVP"; version="0.99.17"; sha256="1ddnvpi5m3z52z0prcsi9bd2cp2axgl7nry50rmgxjfv7nal61bl"; depends=[BH bigmemory MASS Rcpp RcppArmadillo RcppEigen RcppProgress]; }; + rModeling = derive2 { name="rModeling"; version="0.0.3"; sha256="0xrjxayp59f31wwcqqkzs5my2j2lpbv1f4pp709fmqxz02vbdzhv"; depends=[caret e1071 MASS]; }; 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]; }; + rNOMADS = derive2 { name="rNOMADS"; version="2.4.2"; sha256="0mir7b2693s27gll5j6fsgy7wq0fg48ddx6h78j7cgg7md75756f"; 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=[]; }; rPAex = derive2 { name="rPAex"; version="1.0.1"; sha256="1v85qy8fg6vf1fqqqawzw4i9sfaihdqzbs0h91hpqbzkc4v7n2bb"; depends=[agricolae raster]; }; rPackedBar = derive2 { name="rPackedBar"; version="0.2.2"; sha256="1nh0kvj4bqkinczj8llcgy63ibsnk9vgsvm0vqg8g526x0vffdma"; 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.3"; sha256="1ngd8q6jpzrn09042w68662hkx238ai96z9bfy0danvdii3xplyh"; depends=[dplyr dygraphs readr stringr tuneR]; }; + rPraat = derive2 { name="rPraat"; version="1.3.1"; sha256="01bz0ja35k8q3ncj9jaqbfh42sf5s73yrb6gsj11lapmfb3g8scf"; 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]; }; - rQCC = derive2 { name="rQCC"; version="0.19.8.2"; sha256="091c53jggq3k9sf48pnds8s4kkqia6x268lbkb2fx88b408i0iny"; depends=[]; }; + rQCC = derive2 { name="rQCC"; version="1.20.3"; sha256="01gi447qwm6j682s7ka034g28k74l3fr9ijam6l9n0f228q930gp"; depends=[]; }; rRAP = derive2 { name="rRAP"; version="1.1"; sha256="1nzvs8bjkbjraa33azxf9mrxsxh87qhh3qlldrcs5y4fq4ancyqb"; depends=[lars lassoshooting MASS]; }; - rSEA = derive2 { name="rSEA"; version="2.1.0"; sha256="0zym2kg7vzi61xiglwr3dw5kvavjqcgjj56219aqyclkqrnf67rc"; depends=[hommel]; }; + rSCA = derive2 { name="rSCA"; version="3.1"; sha256="0dhd5325x05cbnw34mlipndw5xnncl9kj7kppb2s5bx2gllcdqqd"; depends=[]; }; + rSEA = derive2 { name="rSEA"; version="2.1.1"; sha256="18108ds65ykxygbw1s4i5rb1ngzwymv1x3dhcv1lcwkmqplnaar9"; depends=[ggplot2 hommel]; }; rSFA = derive2 { name="rSFA"; version="1.04"; sha256="0gd6ji1ynbb04rfv8jfdmp7dqnyz8pxcl5636fypd9a81fggl0gs"; depends=[MASS]; }; rSHAPE = derive2 { name="rSHAPE"; version="0.3.2"; sha256="0z6dizsxlkmaymbd24b1m1i8kmndcf21nxxnyfzq6gvdii7bal4h"; depends=[abind DBI doParallel evd foreach RSQLite sn VGAM]; }; - rSPARCS = derive2 { name="rSPARCS"; version="0.0.7"; sha256="0z9l7d03r5qxnnl9as2dl1z8r8a28qbwp8n69sxrnd7rffcwm17l"; depends=[data_table geosphere plyr raster sp spatialEco tigris]; }; - rSPDE = derive2 { name="rSPDE"; version="0.4.6"; sha256="1fdk7mhrkp5r7lr9rn9wz1rbxinrr8yvfcss9ky8namp7f65vwa1"; depends=[Matrix]; }; + rSPDE = derive2 { name="rSPDE"; version="0.4.8"; sha256="1m8ys6k3f1jy9iiby36sw0gvz282bhpzgnwa801hv59k411wrh2g"; depends=[Matrix]; }; rSQM = derive2 { name="rSQM"; version="1.3.14"; sha256="0m69n2pnfv2085dln6p149a5gw0gif9xk00xmad5s9j68hwjdmym"; depends=[dplyr EcoHydRology ggplot2 gsubfn mise ncdf4 qmap reshape2 stringr yaml zoo]; }; rSymPy = derive2 { name="rSymPy"; version="0.2-1.2"; sha256="0jdl8ss3dbgjqrmmppb0ix1gqk9g28pbh6w5sybil046ic83s13i"; depends=[rJython]; }; - rSymbiota = derive2 { name="rSymbiota"; version="1.0.0"; sha256="0dld8li5b8ylhdmll6iz5pk4pxh2dk37hbx0458jn0zhd4fl1cm7"; depends=[crayon dplyr ggplot2 Hmisc httr knitr magick maps mapview RCurl RSelenium rvest rworldmap sf sp stringr sys treemap XML xml2]; }; rTRNG = derive2 { name="rTRNG"; version="4.20-1"; sha256="0l0gs65rbl080f1l67xiygz551q5lj0q48nz8m6gsjfq5ias5gn6"; depends=[Rcpp RcppParallel]; }; rTableICC = derive2 { name="rTableICC"; version="1.0.7"; sha256="1z896675kmm9p5dnmcnsz2205ynf05laqcxvlc9y0g5i0x8rf8v6"; depends=[aster partitions]; }; - rTensor = derive2 { name="rTensor"; version="1.4"; sha256="08i94vvk5i25j40dwn497svgrmz90iwzp6qgiir37wgvx355xwzr"; depends=[]; }; + rTensor = derive2 { name="rTensor"; version="1.4.1"; sha256="1ir2zqs3bvcfi9xwhj1l29qhnh5qvagz9cpw99lb2w73i28x47vz"; depends=[]; }; rTephra = derive2 { name="rTephra"; version="0.1"; sha256="045f2sp2j4hiwa9k1vs6cxr59x1yr34jq1z2crasxflsxbwa3xz8"; depends=[]; }; rTorch = derive2 { name="rTorch"; version="0.0.3"; sha256="1v7zvjkbllcjria7slv958bpwv1r0p3li2i8wq55hgm7g7iyfz1j"; depends=[data_table jsonlite logging R6 reticulate rstudioapi]; }; rUnemploymentData = derive2 { name="rUnemploymentData"; version="1.1.0"; sha256="0p5hba8iv060szp23s05hvpmwan518ykakm6vqzdcki0inxw0hyv"; depends=[choroplethr rvest stringr]; }; rWBclimate = derive2 { name="rWBclimate"; version="0.1.3"; sha256="0vs56hx7a85pw4jx8nb8bdlr9dbkl4zdhzhqsm0505xc3qz18vxh"; depends=[ggplot2 httr jsonlite plyr reshape2 rgdal sp]; }; - rWind = derive2 { name="rWind"; version="1.1.3"; sha256="1q9f7mrjks7nb9lgkmi6w774dz479d2hhzhns0v0mrllmv9nck1s"; depends=[gdistance lubridate Matrix raster]; }; + rWind = derive2 { name="rWind"; version="1.1.5"; sha256="1fdnbh6yprgbysv6j6i108q9z6b7r17kb2hg4i4sa97c2jlcb39s"; depends=[gdistance lubridate Matrix raster]; }; rWishart = derive2 { name="rWishart"; version="0.1.2"; sha256="0wzijc454mrvmggb7a5jqwjbmk0kzr4bmy0iwniz5cn343pr1rri"; depends=[lazyeval MASS Matrix]; }; rYoutheria = derive2 { name="rYoutheria"; version="1.0.3"; sha256="1r63ggy4knwzxnpjkmsn7zwmwfaznm8mmxl7r9ph10wz4sblgygl"; depends=[plyr RCurl reshape2 RJSONIO]; }; - rabhit = derive2 { name="rabhit"; version="0.1.1"; sha256="010ayd8hyk02gwpnpa06n2rymxl1hy3j4jm5cn4x2xl3mj2kzg8h"; depends=[alakazam cowplot data_table dendextend dplyr ggdendro ggplot2 gridExtra gtable gtools htmlwidgets plotly RColorBrewer reshape2 rlang stringi tidyr tigger]; }; + rabhit = derive2 { name="rabhit"; version="0.1.4"; sha256="1r02brl2ca33ccd2b3dhf1zfx9zg0vqsvnqlbvd68mqgl74xqlbl"; depends=[alakazam cowplot data_table dendextend dplyr fastmatch ggdendro ggplot2 gridExtra gtable gtools htmlwidgets plotly RColorBrewer reshape2 rlang splitstackshape stringi tidyr tigger]; }; rabi = derive2 { name="rabi"; version="1.0.2"; sha256="0jndx1gvsnsv1xrx3ismgvjp7d4kj3436zcawvw32c5klvxx0y4j"; depends=[numbers polynom shiny stringdist]; }; - raceland = derive2 { name="raceland"; version="1.0.3"; sha256="0gd5x3k1mdk6s1svgv9vgy2bzml6qg74rfr6p009g2bkbxpcjydy"; depends=[comat fasterize plotwidgets raster Rcpp RcppArmadillo sf]; }; + raceland = derive2 { name="raceland"; version="1.0.8"; sha256="0f12z0g27wrk9mq3vh0qqcjp4qh882853h6ps1iaspwajkb22f3k"; depends=[comat fasterize plotwidgets raster Rcpp RcppArmadillo rgdal sf]; }; radar = derive2 { name="radar"; version="1.0.0"; sha256="1wh5j3cfbj01jx2kbm9ca5cqhbb0vw7ifjn426bllm4lbbd8l273"; depends=[]; }; radarBoxplot = derive2 { name="radarBoxplot"; version="1.0.0"; sha256="16s38yy984mb1hmsdw17z4nk2z4xg03xi0yrp7445yqv3fs1fghl"; depends=[]; }; radarchart = derive2 { name="radarchart"; version="0.3.1"; sha256="0gcxnbgj8ja1m4wzhbjy67m6zphf0c5ni9yx7sr7f0abm03ry753"; depends=[htmltools htmlwidgets]; }; radiant = derive2 { name="radiant"; version="0.9.9.1"; sha256="18zj6lbs04vqslm4zgga6fvm868a0m55sk45kj5vl46jadb6a52f"; depends=[r_import radiant_basics radiant_data radiant_design radiant_model radiant_multivariate shiny]; }; - radiant_basics = derive2 { name="radiant.basics"; version="1.0.0"; sha256="188dzsr8lwbam9hvvwqgcf08aj4ja04fvfcw315g4jy1nbhbvg33"; depends=[dplyr ggplot2 gridExtra magrittr psych r_import radiant_data scales shiny tidyr]; }; - radiant_data = derive2 { name="radiant.data"; version="1.0.6"; sha256="08x7zasxf429m021482p86lx3zc6dqz2mih0id8s34isg4gafapg"; 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]; }; - radiant_model = derive2 { name="radiant.model"; version="1.0.0"; sha256="14zk2yl40694kyri5wr7czc2ymwqa68n7jzk6j1a28l7cbgs8xfx"; depends=[car data_tree DiagrammeR dplyr e1071 ggplot2 gridExtra lubridate magrittr NeuralNetTools nnet psych r_import radiant_basics radiant_data rlang rpart sandwich shiny stringr tidyr yaml]; }; - radiant_multivariate = derive2 { name="radiant.multivariate"; version="0.9.9.1"; sha256="154q06vbj13y15rz2apvy521gda8jh66yhr87kqvlv9mh2k9ws2h"; depends=[car dplyr ggplot2 ggrepel Gmedian GPArotation gridExtra magrittr MASS psych r_import radiant_data radiant_model rlang scales shiny]; }; + radiant_basics = derive2 { name="radiant.basics"; version="1.3.4"; sha256="0y4s3zhphkaxlgwmiz96nwxq1s87i2i1mnph062xghlm7x92bwc3"; depends=[dplyr ggplot2 lubridate magrittr patchwork polycor psych r_import radiant_data scales shiny tidyr]; }; + radiant_data = derive2 { name="radiant.data"; version="1.3.4"; sha256="19sjjb49inrfl7jzq4zpwhdslni0zrp30bl58pisin29ka3ylpzs"; depends=[base64enc broom car curl dplyr DT ggplot2 glue jsonlite knitr lubridate magrittr markdown MASS patchwork plotly psych r_import randomizr readr readxl rlang rmarkdown rstudioapi scales shiny shinyAce shinyFiles stringi tibble tidyr writexl]; }; + radiant_design = derive2 { name="radiant.design"; version="1.3.5"; sha256="1514s21jybyvpi2sx06xsxfrzgg07x7xxhwsazc61v3w1mllj2xw"; depends=[AlgDesign dplyr magrittr mvtnorm polycor pwr r_import radiant_data randomizr shiny]; }; + radiant_model = derive2 { name="radiant.model"; version="1.3.10"; sha256="1i9l819n8xlx9dzw9hdrpl9bfar22ly5dpqlywciffi4p08p3lrl"; depends=[broom car data_tree DiagrammeR dplyr e1071 ggplot2 ggrepel lubridate magrittr NeuralNetTools nnet patchwork pdp psych r_import radiant_basics radiant_data ranger rlang rpart sandwich shiny stringr tidyr xgboost yaml]; }; + radiant_multivariate = derive2 { name="radiant.multivariate"; version="1.3.5"; sha256="1khgy3zj0q155dyky1bd2wfdj6r8jgw8aa6a2nj0rbnwa5zam913"; depends=[car clustMixType dplyr ggplot2 ggrepel gower GPArotation lubridate magrittr MASS patchwork polycor psych r_import radiant_data radiant_model rlang scales shiny]; }; radiomics = derive2 { name="radiomics"; version="0.1.3"; sha256="1ra94yaqw88slznhyv70kbfricxi44m4pnx1zh4ijghm491rphr5"; depends=[Rcpp reshape2 spatstat]; }; radir = derive2 { name="radir"; version="1.0.4"; sha256="12a99ig3n6kp5wa5rjp2w1nal4qqjs6vq05d3lrqcyl3bind6lqb"; depends=[hermite]; }; radix = derive2 { name="radix"; version="0.6"; sha256="0290n0yax8649srdjbq4439h0d9f6jsmxayyhp86igcnszcxilnb"; depends=[base64enc bookdown digest downloader htmltools jsonlite knitr lubridate mime png progress rmarkdown rprojroot rstudioapi stringr whisker xfun xml2 yaml]; }; radjust = derive2 { name="radjust"; version="0.1.0"; sha256="0krryhqid16a6jfb007n0k6rc8r7c808h859a9pjid2jbkg0bm7l"; depends=[]; }; radlibs = derive2 { name="radlibs"; version="0.1.0"; sha256="1yyd63shc35mdixkz8gigwqb9g2l1baxgmzijhshpqavixdhazmk"; depends=[data_table lexicon stringr]; }; radmixture = derive2 { name="radmixture"; version="0.0.1"; sha256="0rs60xjd43lg5c9972qhpg6bsqfg2578qvrz7gz3bdip10jb1ryj"; depends=[magrittr MCMCpack plyr quadprog]; }; - radsafer = derive2 { name="radsafer"; version="2.1.0"; sha256="01xsrl39rv8jjm7rkqy24q6p92i4axyia6gn4d174c18kavz1rj1"; depends=[dplyr ggplot2 magrittr RadData readr rlang stringr]; }; + radsafer = derive2 { name="radsafer"; version="2.2.0"; sha256="0xkmyxw2lslgy22rnb1ll4zw4h06p4ldvaavvwnzy8l7mzqlr6in"; depends=[dplyr ggplot2 ggthemes magrittr RadData readr rlang stringr]; }; rafalib = derive2 { name="rafalib"; version="1.0.0"; sha256="1dmxjl66bfdgrybhwyaa8d4i460liqcdw8b29a6w7shgksh29m0k"; depends=[RColorBrewer]; }; - ragg = derive2 { name="ragg"; version="0.1.3"; sha256="116dmzy81y3r4jpbv7gqx76y33rgrsdzklr0vhblzsph52a59i7m"; depends=[systemfonts]; }; + ragg = derive2 { name="ragg"; version="0.1.5"; sha256="1fqklwwmaf3vyj87kir46bpa9cv1fwyw3amgayh0zcdjfrk6flww"; depends=[systemfonts]; }; rags2ridges = derive2 { name="rags2ridges"; version="2.2.2"; sha256="1xayfj9ac1czl6pipfnr3a3r0jrdfvsqiksf9w4blavpp9xv9dbp"; depends=[expm fdrtool ggplot2 graph gRbase Hmisc igraph RBGL Rcpp RcppArmadillo reshape RSpectra sfsmisc snowfall]; }; - ragt2ridges = derive2 { name="ragt2ridges"; version="0.3.3"; sha256="1vk1pvfbf0b59wkvwj33y80wlvvqmqc0k6l64li7avig1im3n088"; depends=[abind expm fdrtool igraph MASS Matrix mvtnorm rags2ridges Rcpp RcppArmadillo]; }; - ragtop = derive2 { name="ragtop"; version="1.1.0"; sha256="1gz4hdfb4yxjqcmclxw2yacpk0km29n3gfpqkcj48wr1s6vv7djb"; depends=[futile_logger limSolve]; }; + ragt2ridges = derive2 { name="ragt2ridges"; version="0.3.4"; sha256="17i3z0p3a4dqa0bch5l1r830w5nlxhdg71y82jipp6cfiwli588z"; depends=[abind Biobase CGHbase expm fdrtool igraph MASS Matrix mvtnorm rags2ridges Rcpp RcppArmadillo]; }; + ragtop = derive2 { name="ragtop"; version="1.1.1"; sha256="0vgc2q71g8ysccq19kbk9a4swxgd5qj91xm4bshfgdg5chxqnb50"; depends=[futile_logger limSolve]; }; rai = derive2 { name="rai"; version="1.0.0"; sha256="0qimfzchbrarkwmv3mxxbdgvqzk16sc8m1h140zm0cnfgr2pvi5p"; depends=[dplyr ggplot2 readr rlang]; }; rainbow = derive2 { name="rainbow"; version="3.6"; sha256="11vfcck17d2xjc049ci5i8l1nqv345anmd110gdz7654i1pj9lb3"; depends=[cluster colorspace hdrcde ks MASS pcaPP]; }; - raincpc = derive2 { name="raincpc"; version="0.4"; sha256="0yzpyidvf24frf82pj7rarjh0ncm5dhm0mmpsf2ycqlvp0qld10i"; depends=[SDMTools]; }; + raincpc = derive2 { name="raincpc"; version="1.1.0"; sha256="1f59z989q0ipwnkxwiwqj9m6v37qli6c5f1ks5kml5ndpmjxf1h1"; depends=[raster]; }; + rainette = derive2 { name="rainette"; version="0.1"; sha256="0rchm02bzahmwa11riyypfgb72dz5003y9zsyfknin0ckvqycysv"; depends=[dendextend dplyr formatR future future_apply ggplot2 ggwordcloud gridExtra highr miniUI progressr purrr quanteda RColorBrewer Rcpp rlang RSpectra shiny stringr tidyr]; }; rainfarmr = derive2 { name="rainfarmr"; version="0.1"; sha256="1gasnmyjnis6vv0krx6299ck2a6v9v1fgqajzqdpjaz2fsxn245i"; depends=[]; }; rakeR = derive2 { name="rakeR"; version="0.2.1"; sha256="0cd89q6k0y9z1qk9k06iw56lhj4c52ckr0g4qv6q95lkyrbi3qg8"; depends=[ipfp wrswoR]; }; - ralger = derive2 { name="ralger"; version="1.0.0"; sha256="069cnlxj7kclw84wsx9mcrs7zhxzsg1983vi78c0zksii6q8lbqa"; depends=[dplyr magrittr rvest stringr testthat tidyr xml2]; }; + ralger = derive2 { name="ralger"; version="1.1.0"; sha256="077yi2xba2ilhsr0r689r74axazb3wpxz0w8ic6c17jplm828q7s"; depends=[crayon dplyr magrittr purrr robotstxt rvest stringr testthat tidyr xml2]; }; ramchoice = derive2 { name="ramchoice"; version="1.1"; sha256="1im9r95109919hfmici6avdqxh3a375wmg2lfy75z1gjivvcygbr"; depends=[MASS]; }; ramcmc = derive2 { name="ramcmc"; version="0.1.0-1"; sha256="0x8q0bah8fcyqlwap9iw52xhl6b989va5c144kgmfimh2b4yinc7"; depends=[Rcpp RcppArmadillo]; }; ramify = derive2 { name="ramify"; version="0.3.3"; sha256="0cxmkxhshg0vrcxai2gbm4iih04f44liv5nh5jiq85hjz8qbhdi2"; depends=[]; }; @@ -12323,23 +12461,22 @@ in with self; { randquotes = derive2 { name="randquotes"; version="0.1.1"; sha256="0fj9vx0c4059511wka7ip30yz87y144pz7ny840gp72qm73pp8li"; depends=[curl httr jsonlite xml2]; }; randstr = derive2 { name="randstr"; version="0.2.0"; sha256="17593lbk6r089yasafd21i3v90ya9n92rflpzl0qicd2kqqk2gdh"; depends=[random stringi truncnorm]; }; randtests = derive2 { name="randtests"; version="1.0"; sha256="03z3kxl4x0l91dsv65ld9kgc58z82ld1f4lk18i18dpvwcgkqk82"; depends=[]; }; - randtoolbox = derive2 { name="randtoolbox"; version="1.30.0"; sha256="141p13ajgzmb2s89rlac7zrra92mi1izvpfrngb4kqzlf3igdsqd"; depends=[rngWELL]; }; + randtoolbox = derive2 { name="randtoolbox"; version="1.30.1"; sha256="0qg20ar6qns858jdzqhmfq7yji81czhr6cim257958gqpj66sn95"; depends=[rngWELL]; }; rangeBuilder = derive2 { name="rangeBuilder"; version="1.5"; sha256="17wyf9ljgdbpxgl9gy6f1279h88k0rjfcarw7kgp145bm3c36jwf"; depends=[alphahull cleangeo pbapply raster Rcpp rgdal rgeos sp stringi]; }; rangeMapper = derive2 { name="rangeMapper"; version="0.3-7"; sha256="0b457qxlhwcnsw9x60mccvivq7a5cg7lkyfmsfva7qaipnjixcmh"; depends=[classInt data_table doFuture foreach future future_apply ggplot2 gridExtra lattice magrittr maptools raster RColorBrewer rgdal rgeos RSQLite sp]; }; - rangeModelMetadata = derive2 { name="rangeModelMetadata"; version="0.1.2"; sha256="1d31nz2izppkj0zsm6iq74py5s7zg4w3vvjjxzbzprnj2x6r9zlw"; depends=[biomod2 dismo dplyr ecospat ENMeval googlesheets jsonlite MASS raster rgbif rgdal rgeos shiny sp spatstat spocc spThin]; }; - rangemodelR = derive2 { name="rangemodelR"; version="1.0.4"; sha256="0y8hdqi04n3pc3iwz82gikn61h42bmfi7iccwgbglk8wkrkg4gy0"; depends=[]; }; + rangeModelMetadata = derive2 { name="rangeModelMetadata"; version="0.1.3"; sha256="028q6lxz1ljna38cz5647yv0vzjw3jpsqwqhzf5rshmvfi8c0vv2"; depends=[dplyr jsonlite MASS raster rgbif rgdal rgeos shiny sp spatstat spocc spThin]; }; ranger = derive2 { name="ranger"; version="0.12.1"; sha256="1vr5akgh388iivrxi0g4pl2npq9dc4cim3ljk4kjf637q058wc7w"; depends=[Matrix Rcpp RcppEigen]; }; - rankFD = derive2 { name="rankFD"; version="0.0.3"; sha256="0cqvr01hbq3cz2zxmysl2k88wfckyvnlsdk8ypdxdkap4gavnvqv"; depends=[coin lattice MASS Matrix]; }; + rankFD = derive2 { name="rankFD"; version="0.0.5"; sha256="0988fr18faahb9z0514pljmby6pxmn3b0ynb6ymmi3n4vpzzj4ki"; depends=[coin lattice MASS Matrix]; }; rankdist = derive2 { name="rankdist"; version="1.1.4"; sha256="1xqrkss8d5vv3blqpvrvdczsygphbx259hy9j7w9b2ahssw8cjr5"; depends=[hash optimx permute Rcpp]; }; rankhazard = derive2 { name="rankhazard"; version="1.1.0"; sha256="0kljn9b74alrd22b5pwfnamdbaqi2wa2z6yzpmgpfs3x0hv72fw7"; depends=[survival]; }; rapbase = derive2 { name="rapbase"; version="1.10.0"; sha256="0x1xr0qw5qq9rsas3ysxlvmim3jhkf5za4lxr6f15vx4rjfx77wv"; depends=[DBI devtools digest gistr httr knitr magrittr readr RJDBC RMariaDB sendmailR shiny yaml]; }; rapiclient = derive2 { name="rapiclient"; version="0.1.3"; sha256="1pm4kdga2nz1cpmchdb0ad8gr3bqfm84b1kl32cyc0x3x5rr2syz"; depends=[httr jsonlite yaml]; }; - rapidjsonr = derive2 { name="rapidjsonr"; version="1.1"; sha256="0h4phjjhykbb45rg5b1xn48vqxdcvcngbm0416ds8in7j469wbwd"; depends=[]; }; + rapidjsonr = derive2 { name="rapidjsonr"; version="1.2.0"; sha256="07zdirhbzmvq3cp4xn8ngk1lgxbbabzays315zxbs3sxrz6lzjb2"; depends=[]; }; 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]; }; - raptr = derive2 { name="raptr"; version="0.1.4"; sha256="0vh28js06rzf9d7j4ijkfjxn9ppk12705mr8xh4147xnxi1ivn7k"; depends=[adehabitatHR assertthat BH boot doParallel gdalUtils ggplot2 hypervolume ks Matrix mvtnorm PBSmapping plyr RandomFields raster RColorBrewer Rcpp RcppEigen rgdal rgeos RgoogleMaps scales shape sp]; }; + raptr = derive2 { name="raptr"; version="0.1.6"; sha256="0jx3g04c1yzvk42hiwkmbb8hf2lmg909lvjhka2f528wbg80lh1r"; depends=[adehabitatHR assertthat BH boot doParallel gdalUtils ggplot2 hypervolume ks Matrix mvtnorm PBSmapping plyr RandomFields raster RColorBrewer Rcpp RcppEigen rgdal rgeos RgoogleMaps scales shape sp]; }; rare = derive2 { name="rare"; version="0.1.1"; sha256="0j78ilswiaxdp9107psiw8ibxncd7i81z2njhfqf0n7532pbvjss"; depends=[glmnet Matrix Rcpp RcppArmadillo]; }; rareGE = derive2 { name="rareGE"; version="0.1"; sha256="0v3a2wns77q923ilddicqzg0108f8kmfdnsff1n65icin7cfzsny"; depends=[MASS nlme survey]; }; rareNMtests = derive2 { name="rareNMtests"; version="1.1"; sha256="13r2hipqsf8z9k48ha5bh53n3plw1whb7crpy8zqqkcac8444b2z"; depends=[vegan]; }; @@ -12347,7 +12484,8 @@ in with self; { rasciidoc = derive2 { name="rasciidoc"; version="2.0.1"; sha256="0mj3qn048ppxddq2ml06hvccixxg7kvb9rsx9iy9mn4rr2caw67v"; depends=[document highr knitr]; }; rasclass = derive2 { name="rasclass"; version="0.2.2"; sha256="1lsmv8kh519mz3szb4k9s17fz1480cw0i4qk12givhhm2rpzjy50"; depends=[car e1071 nnet randomForest RSNNS]; }; rase = derive2 { name="rase"; version="0.3-3"; sha256="03jqf5y5vj354m9psp81wzw6d7dfqr76bfjqv9kannsakkj587sy"; depends=[ape mvtnorm polyCub rgl sm spatstat]; }; - raster = derive2 { name="raster"; version="3.0-7"; sha256="0faxv71hlxkblvbi3ps1vfzm3wwi0brwzmpsr5114bddcqyiqkvn"; depends=[Rcpp sp]; }; + raster = derive2 { name="raster"; version="3.0-12"; sha256="0rrbsigkqxsdic8fly6nrsc79zsliwvr1x2b4xqpl9d34vr50dvg"; depends=[Rcpp sp]; }; + rasterDT = derive2 { name="rasterDT"; version="0.3.1"; sha256="1dl083jm4x0shl7lq4in2alksgi63hp1p7j2cnsvkmwjaxygzm9v"; depends=[data_table fasterize raster sf]; }; rasterImage = derive2 { name="rasterImage"; version="0.4.0"; sha256="191m5k1rbbwziznmxbsq4g55afkw8gb5011i70f3wx3dscr3phxz"; depends=[plotrix]; }; rasterKernelEstimates = derive2 { name="rasterKernelEstimates"; version="1.0.1"; sha256="1733ic1hxym3gyibk2ysy5zzq7s9rbf6jx63x7irnrcavq151f8s"; depends=[raster]; }; rasterList = derive2 { name="rasterList"; version="0.5.8"; sha256="0q7apglxzpah04463z07cpkzyd6l6dbbdhm601brzh6yk75z20vh"; depends=[raster]; }; @@ -12356,7 +12494,7 @@ in with self; { rasterly = derive2 { name="rasterly"; version="0.1.0"; sha256="128699nc1y2parfwqfx31afdy3f91z5iarpx8q1v5qfmbmb12ppx"; depends=[data_table ggplot2 magrittr plotly Rcpp rlang]; }; rasterpdf = derive2 { name="rasterpdf"; version="0.1.1"; sha256="0zi54nifbb4dzb29i8rskynblw3z42vzaykwbq30ia5zs9q1bvm5"; depends=[png]; }; ratelimitr = derive2 { name="ratelimitr"; version="0.4.1"; sha256="06x759jxr5zcnvg9q120n5bpipkb16piw15kxrpk7i918mby889b"; depends=[assertthat]; }; - ratematrix = derive2 { name="ratematrix"; version="1.2.1"; sha256="0hbwfgwkkd5a83f3nqk5gdyiqbpzsgshvcjcslaz73si05zsrkgs"; depends=[ape coda corpcor ellipse geiger MASS mvMORPH phylolm Rcpp RcppArmadillo readr]; }; + ratematrix = derive2 { name="ratematrix"; version="1.2.2"; sha256="08zc3yacgmd7y50nykbdqwq655jn3gz4x1ywrhvz8fymsdhdd39g"; depends=[ape coda corpcor ellipse geiger MASS mvMORPH phylolm Rcpp RcppArmadillo readr]; }; rateratio_test = derive2 { name="rateratio.test"; version="1.0-2"; sha256="1a2v12z2dr893ha80fhada1820z5ih53w4pnsss9r9xw3hi0m6k5"; depends=[]; }; raters = derive2 { name="raters"; version="2.0.1"; sha256="16jnx6vv39k4niqkdlj4yhqx8qbrdi99bwzxjahsxr12ab5npbp1"; depends=[]; }; ratesci = derive2 { name="ratesci"; version="0.3-0"; sha256="1mdx47xpgjrjbb3lybajdmxb87dqr6cvv3fsvwfx0n629mjbih4z"; depends=[]; }; @@ -12365,37 +12503,38 @@ in with self; { rattle = derive2 { name="rattle"; version="5.3.0"; sha256="1siwnmh5yna63354jd8aypffk1naicvvnjykv5cssqyjdldcwp37"; 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.15.0"; sha256="047vs3wvakwkh7c98rgswhj73m43d6ryax2jblbdp5199knn5cm5"; depends=[dplyr httr jsonlite lubridate readxl rvest tidyr xml2]; }; + ravelRy = derive2 { name="ravelRy"; version="0.1.0"; sha256="07mywv57rw2b309i2qisbpx1x3sb3z6n2b5gia9bdmb2m4hhpdai"; depends=[dplyr httr jsonlite purrr tibble tidyr]; }; raw = derive2 { name="raw"; version="0.1.6"; sha256="0hnqwa9pwj3k2y0bs6hxrvbwksjyq0q6m73c9hhlafg8g3lkyxnf"; depends=[]; }; + rawKS = derive2 { name="rawKS"; version="0.1.0"; sha256="1yiw9imhgij49qbm9hk6psb73zngqmxxwnaxq144ydwb7fbk6j0z"; depends=[dplyr ggplot2 magrittr ROCR tidyr]; }; rawr = derive2 { name="rawr"; version="0.1.0"; sha256="1a8r1vyvki3z2ms4miqv6wq9pzympgifsjx0pzzs6f4b40m083lq"; depends=[dplyr jsonlite rvest xml2]; }; raws_profile = derive2 { name="raws.profile"; version="0.1.0"; sha256="04f7wk7x9j3rb6nn3zqss9vw0h9a4vpcjyilc2vqy0fm2by41xkg"; depends=[stringr tibble withr]; }; - rayrender = derive2 { name="rayrender"; version="0.4.2"; sha256="070h6p7dmai0rrdiyghr97i3jn9yj86ak74zvw019b6g50rid6h6"; depends=[assertthat magrittr png progress purrr raster Rcpp RcppThread tibble]; }; + rayimage = derive2 { name="rayimage"; version="0.2.5"; sha256="0ihi0i93ypk75h567ay3g46n8x4ni09r4r6p6spm16hji0ri5dp1"; depends=[jpeg magrittr png progress raster Rcpp RcppArmadillo]; }; + rayrender = derive2 { name="rayrender"; version="0.6.0"; sha256="19al04afiibd0hbvlps4zwmm085x0vnfkbn5lpd3mzyilccyjhcb"; depends=[assertthat magrittr png progress purrr raster Rcpp RcppThread tibble]; }; rayshader = derive2 { name="rayshader"; version="0.13.7"; sha256="0mlygrsbg0nzz8hhz0q28hizqh3ck4vdi67i9cvgpkrrnm13jyqx"; depends=[doParallel foreach ggplot2 magrittr png progress raster rayrender Rcpp RcppArmadillo rgl scales]; }; - rbacon = derive2 { name="rbacon"; version="2.3.9.1"; sha256="0gnvi0aaw4yyg1cvrdyps2590gx1lwcjl21y4q9zn3k00mnwmc12"; depends=[coda Rcpp]; }; + rbacon = derive2 { name="rbacon"; version="2.4.1"; sha256="0xxgdh3zr2k0asxklbpyn1d0q67hdmd5r81s9y8x4anjjvz5zx0g"; depends=[coda Rcpp]; }; rbart = derive2 { name="rbart"; version="1.0"; sha256="1byfm1ycw9nfhdblqklyn8pxn6b9q5fa3inbgfpynqpsid97ig35"; depends=[Rcpp]; }; rbefdata = derive2 { name="rbefdata"; version="0.3.5"; sha256="12mcqz0pqgwfw5fmma0gwddj4zk0hpwmrsb74dvzqvgcvpfjnv98"; depends=[RColorBrewer RCurl rjson rtematres wordcloud XML]; }; rbenchmark = derive2 { name="rbenchmark"; version="1.0.0"; sha256="010fn3qwnk2k411cbqyvra1d12c3bhhl3spzm8kxffmirj4p2al9"; depends=[]; }; rbgm = derive2 { name="rbgm"; version="0.0.5"; sha256="1gz9hxlwmj2ch1ds6mx1nlkwy4fm811jkz5fz3cl6675n11bjdpg"; depends=[dplyr geosphere raster readr rlang sp stringr tibble]; }; - rbhl = derive2 { name="rbhl"; version="0.8.0"; sha256="1avx36as99za19acjh7adb72ckdn69rmiwzcrrqxskzny56vxf0d"; depends=[crul jsonlite plyr tibble xml2]; }; - rbi = derive2 { name="rbi"; version="0.10.2"; sha256="158yi9d8pxgb5b1x1qpjzrfnq673vmsbmgm00w0dbk03akcvlfzc"; depends=[data_table ncdf4 processx reshape2]; }; - rbi_helpers = derive2 { name="rbi.helpers"; version="0.3.1"; sha256="0hngqbdydvvp4zmicvnnmwz3fw6pjvgdxp7h80zk1qczid2yg4x5"; depends=[data_table lubridate Matrix rbi reshape2]; }; - rbin = derive2 { name="rbin"; version="0.1.1"; sha256="1rbwm5xc61sva1m3n5hd9vsh7gm4hamswny35zm7j0fyc4v4bzxz"; depends=[DescTools dplyr forcats ggplot2 glue magrittr miniUI purrr recipes rlang rstudioapi shiny tibble]; }; + rbhl = derive2 { name="rbhl"; version="0.9.0"; sha256="0n9jxyrpq1s0yq13ylkhm0qcjlm8b25p19vpxv2s4wxan758zypd"; depends=[crul jsonlite plyr tibble xml2]; }; + rbin = derive2 { name="rbin"; version="0.1.2"; sha256="0kiad4l0qplzxqx6zx5fp48lq5g6l80qgydfri0vh3giadzcmsp7"; depends=[DescTools dplyr forcats ggplot2 magrittr miniUI recipes rlang rstudioapi shiny tibble]; }; rbiouml = derive2 { name="rbiouml"; version="1.9"; sha256="01ysjq49nhawp0r2by7b15s4b7bzsbn2xhdcyyrh38vrl04rpf57"; depends=[RCurl RJSONIO]; }; rbison = derive2 { name="rbison"; version="0.8.0"; sha256="0x2yiq1wvm6mzmhfa3ds8mmhidv91hxi14nhz4nib6nmna3c9al2"; depends=[crul data_table dplyr ggplot2 jsonlite mapproj plyr sp]; }; rbit = derive2 { name="rbit"; version="1.0.0"; sha256="09ywr711gv0vgfims2vfcxk3rnd0iadzlksil0q9159yarapfc59"; depends=[R6]; }; rbitcoinchartsapi = derive2 { name="rbitcoinchartsapi"; version="1.0.4"; sha256="0r272jvjh3rzch8dmn4s0a5n5k6dsir7pr4qswzfvafqjdiwjajz"; depends=[RCurl RJSONIO]; }; rblt = derive2 { name="rblt"; version="0.2.4.5"; sha256="1pfg8sgm532czz3lhpx7dmg5zik3bc0p4vdq9s0qk5zgq7nnm9sj"; depends=[data_table dygraphs hdf5r shiny xts]; }; - rbmn = derive2 { name="rbmn"; version="0.9-2"; sha256="1zy832y399cmfmhpyfh7vfd293fylf1ylmp8w8krkmzkmyfa80f2"; depends=[MASS]; }; + rbmn = derive2 { name="rbmn"; version="0.9-3"; sha256="08rcxvxi1wav2ysnp5ydkyinykcjw3vwb56g8zdx9ziqbd7cwkgv"; depends=[MASS]; }; 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]; }; - rbridge = derive2 { name="rbridge"; version="1.0"; sha256="1ggak2rp20vs3zzpl86yaa9dkxxwmnznbzxcy4wzdgsllmfij628"; depends=[dplyr Matrix Rcpp RcppArmadillo]; }; + rbraries = derive2 { name="rbraries"; version="0.2.0"; sha256="00fl1vr8m1lalib1j35d7g0ybm4wv6qvy0gzl37ij2cc844ij6jd"; depends=[crul data_table fauxpas jsonlite tibble]; }; + rbridge = derive2 { name="rbridge"; version="1.0.2"; sha256="0m4c61rdrhq1jw3rwq2ld29g5dchbk4sfpnq0wmwbvzhdjq76plc"; depends=[dplyr Matrix Rcpp RcppArmadillo]; }; 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=[]; }; rcane = derive2 { name="rcane"; version="1.0"; sha256="0p2mgkq6fh0n289n2h19c52lnqxl05wvpmd6nwvgnjqwa4wwpa7r"; depends=[]; }; rcanvec = derive2 { name="rcanvec"; version="0.2.1"; sha256="0gsk2cfiysxjw2lrnpl2l524lvhh9nhnyyh79n8p7vykyqj711yn"; depends=[rgdal sp]; }; - rcarbon = derive2 { name="rcarbon"; version="1.3.0"; sha256="1g17hdqs64hpnq77hxy0krpl1nl89g8433dn67bycfzbpih8xnr6"; depends=[doParallel foreach knitr sp spatstat]; }; + rcarbon = derive2 { name="rcarbon"; version="1.3.1"; sha256="1qdmbvp758758ny2d4y0xi5gdhzvjmwvxh6yjhmavhb454fys0yi"; depends=[doParallel foreach knitr sp spatstat]; }; rcartocolor = derive2 { name="rcartocolor"; version="2.0.0"; sha256="08ljaag2mnhz2671zvwji1sp003z94lz30vjidmybm9fp8piqw5g"; depends=[ggplot2 scales]; }; rcbalance = derive2 { name="rcbalance"; version="1.8.5"; sha256="15qlk3cqwsvixl17l1fxcajrabmz4y7q5gz0a1pd66f6i1xskcqq"; depends=[MASS plyr]; }; rcbsubset = derive2 { name="rcbsubset"; version="1.1.4"; sha256="0sfsmnxs4c8blzg0bb2ffb2xcsjv7pp39arnda988f7b2aas59wj"; depends=[MASS plyr]; }; @@ -12403,10 +12542,10 @@ in with self; { rccdates = derive2 { name="rccdates"; version="1.0.0"; sha256="1f87qlw62am2qy1zzrz91vmsn8axhld44gak61xa7046675hm98s"; depends=[rccmisc]; }; rccmisc = derive2 { name="rccmisc"; version="0.3.7"; sha256="171s2ll759xjdnx0z24ih5ix2vcp4qnmf1nf107gij6wv8k450ab"; depends=[dplyr]; }; rcdd = derive2 { name="rcdd"; version="1.2-2"; sha256="0pzpbqnlgzr240iici70278py5wnbbxkzlgn112f9wv5ga3riric"; depends=[]; }; - rcdk = derive2 { name="rcdk"; version="3.4.7.2"; sha256="0fnbv8gjzl77c5s1byw8xn16dxxpd7phcyqzd284x7n010fmdyq6"; depends=[fingerprint iterators itertools png rcdklibs rJava]; }; - rcdklibs = derive2 { name="rcdklibs"; version="2.0"; sha256="05g0y00bw1bqykfbwn4q42krwcfl50jcavaw7yyw9a5m34hvw0l8"; depends=[rJava]; }; + rcdk = derive2 { name="rcdk"; version="3.5.0"; sha256="05bz2pnvfci8sd9l4i0jay8rwvfnw87r9xqzvq5306mfbhik20fy"; depends=[fingerprint iterators itertools png rcdklibs rJava]; }; + rcdklibs = derive2 { name="rcdklibs"; version="2.3"; sha256="16ijvzsc1irpz1z2xd82i2saafsvpn0x5lr54c5gx9bfb35gacyp"; depends=[rJava]; }; rchallenge = derive2 { name="rchallenge"; version="1.3.2"; sha256="1qib09vlajw62zdhx8gkmmhlgc8k0dqdxx8ai8zdwxhfff253glc"; depends=[knitr rmarkdown]; }; - rcheology = derive2 { name="rcheology"; version="3.6.2.0"; sha256="19llfyvaqiv5dzmw4lkfaia28hi4n1s66iazh8yw7nqql16s4nj8"; depends=[]; }; + rcheology = derive2 { name="rcheology"; version="3.6.3.0"; sha256="16ci41541by8plw87wl754clqn241fhpzc6658jsvz2yvnhkx0wf"; depends=[]; }; rchess = derive2 { name="rchess"; version="0.1"; sha256="0qnvvvwcl02rmqra9m7qnhy40cbavswbq6i0jm47x6njmr1gpfhy"; depends=[assertthat dplyr ggplot2 htmlwidgets plyr R6 V8]; }; rchie = derive2 { name="rchie"; version="1.0.2"; sha256="1m89mwq5f81yr2vc3wvnxkpm04bad11sx5fllcd3yy8ilghmbfp6"; depends=[jsonlite V8]; }; rcicr = derive2 { name="rcicr"; version="0.3.4.1"; sha256="1sa13sbhx64cf8szr2811iq4a1asb8d3k0igxw6fbssij2lwbxzp"; depends=[aspace dplyr jpeg matlab scales]; }; @@ -12414,34 +12553,33 @@ in with self; { rcitoid = derive2 { name="rcitoid"; version="0.1.0"; sha256="11iqdj1q983w28fh17rqvmhs41ks09b24p408nl7hz4iqg9c7lpi"; depends=[crul curl fauxpas jsonlite]; }; rclipboard = derive2 { name="rclipboard"; version="0.1.2"; sha256="04vkxz2wqb3q3igjqgaaim3sb71h046c2b8rhvg51hkp1win8s5w"; depends=[shiny]; }; rcmdcheck = derive2 { name="rcmdcheck"; version="1.3.3"; sha256="1d4kzgfqy72r6b7bn1j4znyksrycgypx1jjvpv9lrmvn37mpkdhs"; depends=[callr cli crayon desc digest pkgbuild prettyunits R6 rprojroot sessioninfo withr xopen]; }; - rcompanion = derive2 { name="rcompanion"; version="2.3.21"; sha256="01mvgs3q43mx630c54pc7i1kxljaliyxyv38pa6hgp4arh75aj7f"; depends=[boot coin DescTools EMT lmtest multcompView nortest plyr]; }; + rco = derive2 { name="rco"; version="1.0.1"; sha256="0sjfgblvrnd1jmvqgxc9xm94c46kmr9syxynx9zdd9gsqcwc6hza"; depends=[]; }; + rcompanion = derive2 { name="rcompanion"; version="2.3.25"; sha256="10x2ps110a849qgr7pggdz5436a2bzzfv774xic34fnpki32zvzs"; depends=[boot coin DescTools EMT lmtest multcompView nortest plyr]; }; rcoreoa = derive2 { name="rcoreoa"; version="0.3.0"; sha256="0z9kllhk1j7c4sgnd88ngxv7xvr396azg9vr9p6i72ficr7flr64"; depends=[crul hoardr jsonlite pdftools]; }; rcorpora = derive2 { name="rcorpora"; version="2.0.0"; sha256="1b8xa81mn3afadz77576vda9b0d99f1k096drxrpqd989g993aqy"; depends=[jsonlite]; }; - rcosmo = derive2 { name="rcosmo"; version="1.1.1"; sha256="195cxjgkcgz9qx51hsg9bd2y7c96dk69c8yvy9s2w59jy9iy5i7y"; depends=[cli entropy FITSio geoR mmap nnls Rcpp rgl tibble]; }; + rcosmo = derive2 { name="rcosmo"; version="1.1.2"; sha256="01a8g81ld0dy2bn0mqmpdz2bpd7g52jn67136hhvpxndnnlh384k"; depends=[cli entropy FITSio geoR mmap nnls Rcpp rgl tibble]; }; rcreds = derive2 { name="rcreds"; version="0.6.6"; sha256="1sdrdgn53kgcdnxfjs8jh0h538vb3b9ixz74lbnp54yp09jpqsri"; depends=[collectArgs digest jsonlite magrittr]; }; - rcrimeanalysis = derive2 { name="rcrimeanalysis"; version="0.1.0"; sha256="17s5k0p24vgy34gp213sxy7d7fd3fl8zyhiibszm2z81aknpszz8"; depends=[dplyr forecast ggmap htmltools igraph KernSmooth leaflet lubridate raster rgdal sp]; }; - rcrossref = derive2 { name="rcrossref"; version="0.9.2"; sha256="1383xlwy3vj08hhghx5zsy0890zsm402x9hdqzs5x5q7mxkqdwjq"; depends=[bibtex crul dplyr DT jsonlite miniUI plyr R6 shiny stringr xml2]; }; + rcrimeanalysis = derive2 { name="rcrimeanalysis"; version="0.4.1"; sha256="1nm6hsazjg9qg41067gn3qwlrbqf8awgwb2yczkzdm2106a0rm34"; depends=[dplyr forecast ggmap htmltools igraph KernSmooth leaflet leafsync lubridate pals raster Rcpp rgdal sp]; }; + rcrossref = derive2 { name="rcrossref"; version="1.0.0"; sha256="1743qy5q0n2ij7x88nkk99w59vnl7g9fwpkwgb3a3s235f6lb4df"; depends=[bibtex crul dplyr DT jsonlite miniUI plyr R6 shiny stringr xml2]; }; rcrtan = derive2 { name="rcrtan"; version="0.1.1"; sha256="0kcp3gnjmp00i1hsjagpp0dlr6zgpc4y5ihpx93hm4m3fnzcmn7x"; depends=[dplyr magrittr purrrlyr tibble tidyr]; }; rcrypt = derive2 { name="rcrypt"; version="0.1.1"; sha256="002r5wr0bmqbj014iz8wacj883j6gqcxc786m6p9a7zdrjpx2pqi"; depends=[]; }; rcss = derive2 { name="rcss"; version="1.8"; sha256="0c2i1zqjgl81i91b3bv70v54iib1d7hbsd1h63nip1al6lwnya4c"; depends=[nabor Rcpp RcppArmadillo]; }; rcube = derive2 { name="rcube"; version="0.5"; sha256="1162y7fs3fsbb5jj66g9kvxxhggprlifrabqbb9lqm8rrdwhz3r9"; 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]; }; - rdatacite = derive2 { name="rdatacite"; version="0.5.0"; sha256="15db4p8scx0b3br0vrxyxc0k8pfiki057vkfka3qjv1gbj1ab2d8"; depends=[crul jsonlite tibble]; }; + rdatacite = derive2 { name="rdatacite"; version="0.5.2"; sha256="07zbxr89fxx9nlp5w7n60rjm3prck08h0fjrq0pnpkbnnkx9cv9a"; depends=[crul jsonlite tibble]; }; rdataretriever = derive2 { name="rdataretriever"; version="2.0.0"; sha256="0gnvvxvlfh6j887y5w83q5kg6lqqcb0c54lfcx9qp3r28hpdlxkz"; depends=[reticulate]; }; - rdbnomics = derive2 { name="rdbnomics"; version="0.5.1"; sha256="0m55k92a74lnwfsxz6z102mvqvz6lkhwq38m000hbs5z2k27h620"; depends=[curl data_table jsonlite]; }; + rdbnomics = derive2 { name="rdbnomics"; version="0.5.2"; sha256="149ma5rvrfd1hcjm47g7yqwiildqcf0q3n70jfhd48fqgs0x30l9"; 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="1.0"; sha256="0v94izsghy35b33dq5b28p2lqs1fw1snyipdf9vgjz5s3qkzjkd8"; 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.8"; sha256="00wgcc0mzjvinvj767mzrx8idq8w7b7bi4d82hvldbki9hadjh7d"; depends=[dplyr httr lubridate rgdal sp tibble xml2]; }; rdetools = derive2 { name="rdetools"; version="1.0"; sha256="0pkl990viv7ifr7ihgdcsww93sk2wlzp2cg931wywagfp8dijd02"; depends=[]; }; rdflib = derive2 { name="rdflib"; version="0.2.3"; sha256="1hc6a0spmbd42lf7zjkwjv4glagfzsdilv5hm8c76cj36incg6qg"; depends=[dplyr jsonld readr redland stringi tidyr]; }; rdfp = derive2 { name="rdfp"; version="0.1.4"; sha256="1490227hhfjjscfmd8p897v1ijs61pk5sc0a2vr9yjnfmsnxpqrl"; depends=[curl data_table dplyr httr lubridate plyr purrr readr XML xml2]; }; rdhs = derive2 { name="rdhs"; version="0.6.3"; sha256="01pjb9wjad22rv85z0rxrh06wyzksy0xgd656xd3lck0ixpr88hx"; depends=[digest foreign getPass haven httr iotools jsonlite magrittr qdapRegex R6 rappdirs rgdal storr xml2]; }; 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]; }; + rdist = derive2 { name="rdist"; version="0.0.4"; sha256="058i2cxav96ipb1a1q3ffak0mjgyrvvcz8ivlap4qbrnn3x13jzl"; 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.5"; sha256="1dadb3yazk9kn051rswq3568m77x44485l2268ahm0im6bj2i7al"; depends=[AER sandwich]; }; rdmulti = derive2 { name="rdmulti"; version="0.4"; sha256="11qh5sdnxmpk1bhkcb4bq7qmj0hvvc9p4hq0pwnkgq4vfj6gsi2d"; depends=[rdrobust]; }; @@ -12449,17 +12587,16 @@ in with self; { rdoc = derive2 { name="rdoc"; version="0.1.0"; sha256="0ac6413jyrr7m25z30n3bpiafsvjx38ik6rrjzsiqxrfp41j6l9x"; depends=[cli crayon prettycode R6]; }; rdoxygen = derive2 { name="rdoxygen"; version="1.0.0"; sha256="16907969w66xvy62k45rw10qfv4x8z6jkkc6i97vppkgnlvf4d4b"; depends=[devtools]; }; rdpla = derive2 { name="rdpla"; version="0.2.0"; sha256="0d32bp68z1agymcmjwnds4fkblhjrcx8i2q6f5b7sl4kdfdbjchf"; depends=[crul data_table hoardr jsonlite tibble]; }; - rdpower = derive2 { name="rdpower"; version="0.4"; sha256="050yy1zwkxniqails24nmmaglcmlx50niqqqw5sgqfyn64yxndk1"; depends=[rdrobust]; }; - rdrobust = derive2 { name="rdrobust"; version="0.99.5"; sha256="139c6z2n7s8j1pmc6afad7f1lgxgi09wj4wgi5j49w7xhyd8yc7r"; depends=[ggplot2]; }; + rdpower = derive2 { name="rdpower"; version="0.5"; sha256="1kqfxh2g9dar130d0wld64iyd6iq51s2zrsjrprg1s3ssgi9xmb6"; depends=[rdrobust]; }; + rdrobust = derive2 { name="rdrobust"; version="0.99.6"; sha256="0dzg7yksa0cjj5gc77qq6isc97w00chjmf0ak3dbm6gjy68kv8nx"; depends=[ggplot2]; }; 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.2.1"; sha256="0mm2psp8j1dfvah5d68a721kl3klins038nwgbv4s6x38a9amvq6"; depends=[curl digest ggplot2 gtools jsonlite knitr provSummarizeR provViz rmarkdown sessioninfo stringi XML]; }; - rdwd = derive2 { name="rdwd"; version="1.2.0"; sha256="1vcw5pcvcw1rx6dwwwh9j9g2pb1m81g812abd5h8zq5n7plkd2jk"; depends=[berryFunctions pbapply]; }; + rdwd = derive2 { name="rdwd"; version="1.3.1"; sha256="0pz2574rbsvg79n98ndvmhxxpk76qlq9qyv052y74871mj6dkzff"; depends=[berryFunctions pbapply]; }; rdwplus = derive2 { name="rdwplus"; version="0.1.0"; sha256="1y4dnm2bb0w6pim4h79mv2km88s78vhsn5fhs7z45m0564hgk0x2"; depends=[raster rgrass7]; }; - re2r = derive2 { name="re2r"; version="0.2.0"; sha256="0xv355h4bps4a0picxmi6i15niq4knlail80fp9xvszyn72pm8gq"; depends=[htmlwidgets Rcpp RcppParallel stringi]; }; reReg = derive2 { name="reReg"; version="1.2.1"; sha256="0nfi02wlmb1n8j134qgv3p03z2j200kkrwhvd5i17ybhzpwfndri"; depends=[BB ggplot2 MASS nleqslv reda scam SQUAREM survival]; }; reactR = derive2 { name="reactR"; version="0.4.2"; sha256="11rahxskch0r5hlqs7iy285dlhrmzm4vl18kbakx4jggwjqh61f5"; depends=[htmltools]; }; - reactable = derive2 { name="reactable"; version="0.1.0"; sha256="00ydsx8g27a40qwnkp593dd9pn62r32riry9ayhv3nzqa6mwzb4d"; depends=[digest htmltools htmlwidgets jsonlite reactR]; }; + reactable = derive2 { name="reactable"; version="0.1.0.1"; sha256="0pd9l1dnkglbncr2blbrrz6np69y75rj8fsb6zcw7qm95h579nm3"; depends=[digest htmltools htmlwidgets jsonlite reactR]; }; 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=[]; }; @@ -12482,9 +12619,10 @@ in with self; { readroper = derive2 { name="readroper"; version="0.9.1"; sha256="153iy144c4yxcs2cwr73czy69b4fj4q1g77rb8qmvp6blfwdcd71"; depends=[readr]; }; readsdmx = derive2 { name="readsdmx"; version="0.3.0"; sha256="188yzkjblbjly032312w0fazj7k7j4ynqfc69xpblnw4gs708sx0"; depends=[Rcpp]; }; readstata13 = derive2 { name="readstata13"; version="0.9.2"; sha256="02mqwpzn7n3pqjxivnd1vlfc47xkyiywfz594x0f6vd2dym8rdwd"; depends=[Rcpp]; }; - readtext = derive2 { name="readtext"; version="0.75"; sha256="0xbl4q3y4kzigr6rgqb04sq1xqddfzqivkjmbd0v5sfammrhla8n"; depends=[antiword data_table digest httr jsonlite pdftools readODS readxl streamR stringi striprtf tibble xml2]; }; + readtext = derive2 { name="readtext"; version="0.76"; sha256="1k79db2aay15gdb52cqd87wnwk0pn27y45c65741rk8rgddk7lwj"; depends=[antiword data_table digest httr jsonlite pdftools readODS readxl streamR stringi striprtf tibble xml2]; }; + readtextgrid = derive2 { name="readtextgrid"; version="0.1.1"; sha256="03qrbmlpbjwx4ia0ydv6m9lwzalsas9pdhds82mg5f8ir0cd0qi6"; depends=[magrittr plyr purrr readr stringr tibble]; }; readthat = derive2 { name="readthat"; version="0.0.1"; sha256="04vnpvfa8in3gxi6nv3si59hr8hj17wq3a5n8rnpiaczg46qr1dr"; depends=[curl Rcpp]; }; - readwritesqlite = derive2 { name="readwritesqlite"; version="0.0.2"; sha256="064imgjl197avdsjhqvlg9yzgsp4p4yisvk62l6arcnkixwlz086"; depends=[checkr DBI dttr2 err hms RSQLite sf tibble units]; }; + readwritesqlite = derive2 { name="readwritesqlite"; version="0.1.0"; sha256="15ahhdmrcas199ki3fl8mbdailgp0w18ki64nkq2f6sz9yyxngq1"; depends=[chk DBI hms lifecycle RSQLite tibble]; }; readxl = derive2 { name="readxl"; version="1.3.1"; sha256="15mambxr8c7k2ikdfsl1w3vxvm54dsnk0cl1qvks6iig7rql3d14"; depends=[cellranger progress Rcpp tibble]; }; readxlsb = derive2 { name="readxlsb"; version="0.1.2"; sha256="0vm1hl8rjmcly6wkq06x9q5yswcdxasdc66xgpvhvw8mf0q6rlkd"; depends=[cellranger Rcpp xml2]; }; reams = derive2 { name="reams"; version="0.1"; sha256="07hqi0y59kv5lg0nl75xy8n48zw03y5m71zx58aiig94bf3yl95c"; depends=[leaps mgcv]; }; @@ -12497,10 +12635,10 @@ 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.9"; sha256="1fmnka583sqm6v5bhxbllb4cd5xfqbf268aij2xgxiwckv3c0ynm"; depends=[dplyr generics glue gower ipred lubridate magrittr Matrix purrr rlang tibble tidyr tidyselect timeDate withr]; }; + recipes = derive2 { name="recipes"; version="0.1.10"; sha256="11f96aanrzi2v6cn49fhvf9y4cmhra63wcy6nvpv6hcfaqqmwd2g"; depends=[dplyr generics glue gower ipred lubridate magrittr Matrix purrr rlang tibble tidyr tidyselect timeDate withr]; }; reclin = derive2 { name="reclin"; version="0.1.1"; sha256="15qrdgjmclffivnljgmmipws9ks41fj4q40wnq0fk14mbv2045g2"; depends=[dplyr ldat lpSolve lvec Rcpp stringdist]; }; recluster = derive2 { name="recluster"; version="2.8"; sha256="05g8k10813zbkgja6gvgscdsjd99q124jx31whncc4awdsgk69s4"; depends=[ape cluster phangorn phytools picante vegan]; }; - recmap = derive2 { name="recmap"; version="1.0.5"; sha256="1xl2j6zjk1vyf2zz8zcl4532k0c1jkrjqhp3vndnl5ynqr5nqlph"; depends=[GA Rcpp sp]; }; + recmap = derive2 { name="recmap"; version="1.0.7"; sha256="14mqc6kzwhcsbnkpl4hy2592rxgwpcpxwawq4x0kakbdjcskbfv8"; 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-5"; sha256="1mhs7yniabpbjpq7w04jfrzng3apz2lcg5izjk8hjnl5pww684hk"; depends=[arules irlba Matrix proxy recosystem registry]; }; @@ -12513,12 +12651,11 @@ in with self; { red = derive2 { name="red"; version="1.4.0"; sha256="1z8ja8qbwgpbmy4ira9q6x482nw5rm4bksm82y0vc4gwpdxls5z3"; depends=[BAT dismo geosphere jsonlite maptools raster rgdal rgeos sp]; }; redR = derive2 { name="redR"; version="1.0.1"; sha256="0bd1jzjip6p449m9ysi4kybxqljh2wj8z9mrgyk1cy08bjivd1cd"; depends=[imager]; }; reda = derive2 { name="reda"; version="0.5.0"; sha256="05lbhamd8z0bhc7cvpd24nmgsc5lfzidjynbi0dzbvkn2gphpdzs"; depends=[ggplot2 Rcpp RcppArmadillo splines2]; }; - redcapAPI = derive2 { name="redcapAPI"; version="2.2"; sha256="0bszw9px7ddcwnc1p3zpd8426mwym5369hglz3qm5x92va1j4036"; depends=[checkmate chron DBI httr labelVector lubridate readr stringr tidyr]; }; + redcapAPI = derive2 { name="redcapAPI"; version="2.3"; sha256="1myycwdrlw1405fxc82zd8ps8bhdvf2ffsb91pia5ijf6952v8pf"; depends=[checkmate chron DBI httr labelVector lubridate readr stringr tidyr]; }; reddPrec = derive2 { name="reddPrec"; version="0.4.0"; sha256="0zmkaiivvjq8mcaz310zgjjc7y0wgsqv29bf8nhli5qawaczvb9a"; depends=[fields snowfall]; }; redist = derive2 { name="redist"; version="1.3-3"; sha256="18asjam8hvayvnfysyjzbazjn27ds7163qhdq0p9aqlx03v89aa9"; depends=[coda doParallel foreach Rcpp RcppArmadillo sp spdep]; }; redland = derive2 { name="redland"; version="1.0.17-11"; sha256="1xbzz6iv4yal1gwplnb9d4z0xzrv25hnqmr6ima2aq9mirwr1l5b"; depends=[roxygen2]; }; redlistr = derive2 { name="redlistr"; version="1.0.3"; sha256="003jxfmj1gryw77vnrvaxmpvjbshlq53wgcrj02mcywfcqzg4jcr"; depends=[plyr raster rgeos sp]; }; - redshiftTools = derive2 { name="redshiftTools"; version="1.0.1"; sha256="0rg9s9i7cdy2qm45bpm50d7859pqx1kmk4m8gpazkp0kgr7alb7l"; depends=[aws_s3 DBI progress purrr]; }; redux = derive2 { name="redux"; version="1.1.0"; sha256="0a551w7fph338mqzxda6y21lsad19dway7w18jw9cv1rgvcp9nvc"; depends=[R6 storr]; }; ref_ICAR = derive2 { name="ref.ICAR"; version="1.0"; sha256="0k6czsbjclgmi7vp5hl50jghkzm573s50993iz3dcv55mv662251"; depends=[coda MCMCglmm mvtnorm Rdpack rgdal spdep]; }; referenceIntervals = derive2 { name="referenceIntervals"; version="1.1.1"; sha256="04199nxh216msaghkp66zsi96h76a7c42ldml0fm66v2vamcslg8"; depends=[boot car extremevalues outliers]; }; @@ -12529,31 +12666,31 @@ in with self; { refund = derive2 { name="refund"; version="0.1-21"; sha256="09lbiyr642c3mgdgcy0j5j64s8k7nai4x7grzlh93apkaj8yrm44"; depends=[boot fda gamm4 ggplot2 grpreg lattice lme4 magic MASS Matrix mgcv nlme pbs RLRsim]; }; refund_shiny = derive2 { name="refund.shiny"; version="0.3.0"; sha256="0r2xrm4wz35wn9zg4vvw2ysl7zzbz9i080vnbrlp4yrhhlkhpkm1"; depends=[dplyr ggplot2 gridExtra lme4 plotly refund reshape2 shiny tidyr]; }; regRSM = derive2 { name="regRSM"; version="0.5"; sha256="0nbp3yjk9r7qvwm7wla39155rmqnvpdb720iq3b0hcy1bbsxbk9s"; depends=[doParallel foreach Rmpi]; }; - regclass = derive2 { name="regclass"; version="1.5"; sha256="0kha9b5ki55ggwh8cmlphg1alf1dq8if5dknisfbvd3f2x4dqf02"; depends=[bestglm leaps randomForest rpart rpart_plot VGAM]; }; + regclass = derive2 { name="regclass"; version="1.6"; sha256="0m974k3yhf0dgv5f1qjs8c53mam0cll3cjn35ywfrmlfla0wlhf5"; depends=[bestglm leaps randomForest rpart rpart_plot VGAM]; }; regexPipes = derive2 { name="regexPipes"; version="0.0.1"; sha256="1hk0rhvmgzcyf5cyl8hjznl3ll25kpasqikfr6nxd6ian2slvmmb"; depends=[]; }; regexSelect = derive2 { name="regexSelect"; version="1.0.0"; sha256="0xnb9qa8l63ang4r40ky4qhlrs5mbzvmj98dgij26j3mq1ys1pa7"; depends=[shiny shinyjs]; }; - reghelper = derive2 { name="reghelper"; version="0.3.4"; sha256="03ddpa8dhvdsqv0fnbaai4rvblqcr8x6r9z42ljm166pnx5h0spk"; depends=[ggplot2 lme4 nlme]; }; + reghelper = derive2 { name="reghelper"; version="0.3.5"; sha256="1max91968w5ijnvi4pqhnvzcqj1dxw41cifzgf5mjg63ylpxsarx"; depends=[ggplot2 lme4 nlme]; }; + registr = derive2 { name="registr"; version="1.0.0"; sha256="1ysj2ab69w6g71d1kpcwyq0py71w6h7lfhk4nzgn2dhh6k8whwbn"; depends=[dplyr ggplot2 gridExtra magrittr Rcpp RcppArmadillo tidyr]; }; registry = derive2 { name="registry"; version="0.5-1"; sha256="1k3j6dx350awamr0dwwgkhfs46vsnj4nf08iw5byq0x7n3nkdsnz"; depends=[]; }; reglogit = derive2 { name="reglogit"; version="1.2-6"; sha256="1nnn8n5sqhbd3nzmwnpmcsmaxxxaqwbna7xm7q9vk4cqz9cm9b9s"; depends=[boot Matrix mvtnorm]; }; regnet = derive2 { name="regnet"; version="0.4.0"; sha256="0qb7sp464fyxn0bslkapjni3pzk7l6fdgabfbzja08flsr63r4mh"; depends=[glmnet Rcpp RcppArmadillo]; }; - regplot = derive2 { name="regplot"; version="0.2"; sha256="0j2mra5fqcixyl4wqwpzfng98rdh4xnl79ka7ilfi0jvz2jix84x"; depends=[beanplot sm survival vioplot]; }; + regplot = derive2 { name="regplot"; version="1.0"; sha256="0v24qg6nhzxxsdgrj0s14djmmhjdbl0bd0aqb5vklvmvf3r76li4"; depends=[beanplot lme4 sm survival vioplot]; }; regpro = derive2 { name="regpro"; version="0.1.1"; sha256="02axbq63hsqwg3q2ixr0lpsdai9q6wj57s5k1343q9m0pw90vr73"; depends=[denpro]; }; - regress = derive2 { name="regress"; version="1.3-15"; sha256="1cgr0r49cmr8nzs2lr2cm8lli1i8azyas0lbnf1681kyab15c0r7"; depends=[]; }; regressoR = derive2 { name="regressoR"; version="1.1.8"; sha256="1a8whcr32sjv6lncch8y1n7xs44djm3nx90lpvh8z8r5ggc8bw21"; depends=[colourpicker corrplot dplyr DT e1071 flexdashboard gbm ggplot2 glmnet htmltools kknn neuralnet pls randomForest rattle ROCR rpart shiny shinyAce shinydashboardPlus shinyjs shinyWidgets xgboost zip]; }; - regrrr = derive2 { name="regrrr"; version="0.1.0"; sha256="0h9vag1ypf5ycvz5fbfvw4nh4l8dgn2kmsgzq9kmn7hw2qsjwbbl"; depends=[dplyr ggplot2 magrittr MuMIn purrr rlang robustbase scales spatstat stringr tidyr usdm]; }; - regsem = derive2 { name="regsem"; version="1.3.9"; sha256="1klml4bp76mplipxaca7fk653cjxgdmmiciksxgiglxkzmf2bdps"; depends=[lavaan Rcpp RcppArmadillo Rsolnp]; }; + regrrr = derive2 { name="regrrr"; version="0.1.1"; sha256="1ibmfxw0akkrz4r0fipfqbbw4153cghj8k2xsy73lgw799ybylfk"; depends=[dplyr ggplot2 lspline magrittr MuMIn purrr robustbase scales stringr tidyr usdm]; }; + regsem = derive2 { name="regsem"; version="1.5.2"; sha256="0ch057010xfsw0nqcsarzakdbiplvxaldyqlbbacspqs65ax1yk7"; depends=[lavaan Rcpp RcppArmadillo Rsolnp]; }; regspec = derive2 { name="regspec"; version="2.4"; sha256="18i6k2wqaddrc0dz7v8x3s9205dcfwanqhpnxa9hkpyqzbb17pd3"; depends=[]; }; regsubseq = derive2 { name="regsubseq"; version="0.12"; sha256="0879r4r8kpr8jd6a3fa9cifm7cv0sqzz8z1alkm1b2fr1625md3g"; depends=[]; }; regtest = derive2 { name="regtest"; version="0.05"; sha256="1wrrpp2hvkas0yc512gya3pvd0v97pn4v51k5jxkwyd1pp68zd1q"; depends=[]; }; regtools = derive2 { name="regtools"; version="1.1.0"; sha256="1kia4h4bwjjfq7jm57ihdgspbqfn683ssbzngp5r069ki931h3nb"; depends=[dummies FNN mvtnorm sandwich]; }; - rehh = derive2 { name="rehh"; version="3.0.1"; sha256="061nk9xmlbllisszpscfpa95653745v645jm3qls1cp42d73rz6k"; depends=[rehh_data]; }; + rehh = derive2 { name="rehh"; version="3.1.0"; sha256="0lxy45cwq98kijzvp8dwf8khwcpqjvp6mjbim9hjzhwvm5jklji4"; depends=[rehh_data]; }; rehh_data = derive2 { name="rehh.data"; version="1.0.0"; sha256="1jkvwmnnmfa7iyvrabgcfzw3vfzx0dlgq47s6yf4zayi437v4di0"; depends=[]; }; rehydratoR = derive2 { name="rehydratoR"; version="0.5.2"; sha256="1d94m9hv1l72l9lph2vzbq4qqbfcgyhv2qk82p9vb8l2ckavjzvv"; depends=[dplyr jsonlite rtweet tibble]; }; reinforcedPred = derive2 { name="reinforcedPred"; version="0.1.1"; sha256="0lf3lznzvckqg04446pvq35p31fv9ix93rxwv51zq9azk0sx42vs"; depends=[glmnet MASS refund]; }; reinforcelearn = derive2 { name="reinforcelearn"; version="0.2.1"; sha256="176z2q69p24i29a8sh19xxn2zl3h1z2ixdssr5i6m4yvkvdrvv3b"; depends=[checkmate nnet purrr R6]; }; reinstallr = derive2 { name="reinstallr"; version="0.1.4"; sha256="1fcmy2cyqy4zwh815j2jbmziaiq6kypwsnj5bx0f10dlq3522m5q"; depends=[]; }; reinsureR = derive2 { name="reinsureR"; version="0.1.0"; sha256="19ayikzcq6z4i7xrlby76yy2nwvrsv6xdfrmvzyr7rz934flh8kd"; depends=[data_table dplyr ggplot2 viridis viridisLite]; }; - rel = derive2 { name="rel"; version="1.4.0"; sha256="1aswhbb5rfda1bfrasxjj5z6f9fxl7x9m9xcg0x3nvnj4qbfamfp"; depends=[]; }; + rel = derive2 { name="rel"; version="1.4.2"; sha256="0h0146b8pnd7ai17y58agsk9kaym7fhiagl34gggaak0j1qa32wh"; depends=[]; }; relMix = derive2 { name="relMix"; version="1.3"; sha256="0saa4gz4mghg15cbbx5y933vp41j94cdzvgkc112632dbp20bqd9"; depends=[Familias gWidgets gWidgetstcltk tkrplot]; }; relSim = derive2 { name="relSim"; version="0.3-1"; sha256="1d6yihapfyjlfw87l370wyfyby7ivvykx04qljffdv3hi801gn7f"; depends=[multicool Rcpp rvest stringr xml2 xtable]; }; rela = derive2 { name="rela"; version="4.1"; sha256="00ksm7zh1mpd2d5c5d823id3sxj0h3x0ccg6a40fadibvr1ay3ny"; depends=[]; }; @@ -12572,16 +12709,16 @@ in with self; { rem = derive2 { name="rem"; version="1.3.1"; sha256="1q4p26irhhl1lvc0ydv9wmng1y635zm16szpl7gwq1kyn2p90rai"; depends=[doParallel foreach Rcpp]; }; remMap = derive2 { name="remMap"; version="0.2-0"; sha256="1k2niiaq2lr4inrx443clff9cqqvyiiwd45k7yqjd8ixnbaa3mrk"; depends=[]; }; rematch = derive2 { name="rematch"; version="1.0.1"; sha256="0y3mshvpvz9csmq8hk8jbabx4nxlv5sckvfzvm6920ndg34xw2d4"; depends=[]; }; - rematch2 = derive2 { name="rematch2"; version="2.1.0"; sha256="00cznm6rk33b53w7zybkz7549bnydc66znpi5mb0xd24pmqp0rvq"; depends=[tibble]; }; + rematch2 = derive2 { name="rematch2"; version="2.1.1"; sha256="13siaa8s2ji9q6hykhb2r34ag76335ypmbqr90xaqilbir0klhnh"; depends=[tibble]; }; remedy = derive2 { name="remedy"; version="0.1.0"; sha256="1lsa5az9jwy4ngjmfzcb7qj4wm8phsgajlnp5kwa4nav0g1dhb4s"; depends=[knitr rematch2 rstudioapi]; }; remindR = derive2 { name="remindR"; version="0.0.1"; sha256="0b27v2qm3z8l9vcng8f0rkphjidxkw5n017ysflx180qjizqq632"; depends=[assertthat]; }; remote = derive2 { name="remote"; version="1.2.1"; sha256="1ihzjxbvas7396cwsi9am4pl94naxa9dnhbnh8k0l5p4a50mk33w"; depends=[gridExtra latticeExtra mapdata raster Rcpp scales]; }; remoter = derive2 { name="remoter"; version="0.4-0"; sha256="1a7m63l8phv5jnazvdqdrqkaqjwqzaac5y4jm2jn0ypy4n8jvkfl"; depends=[argon2 getPass pbdZMQ png]; }; - remotes = derive2 { name="remotes"; version="2.1.0"; sha256="19v8dmnk9l4i9m64p7zgmj7y1vhnnwhi5kyn0k5d034zzkvchi49"; depends=[]; }; + remotes = derive2 { name="remotes"; version="2.1.1"; sha256="12qinl7jv54f2524ri13gcrv6d523rg1harpi500j676zi30fnaf"; depends=[]; }; remss = derive2 { name="remss"; version="1.0.0"; sha256="0dl7iqg65qgafq7s1srcymqzvplkpzplpn6g68lb1mqirqzvgpqw"; depends=[survival]; }; renpow = derive2 { name="renpow"; version="0.1-1"; sha256="0kbfpzr17fvf5zzxpzdhvfmrqmlkba2w3rzxl5q5ac1w3h75gfhc"; depends=[]; }; rentrez = derive2 { name="rentrez"; version="1.2.2"; sha256="0ghrvh1czf2kbz7p5fh5c20wiwppg6x6fdns247fvlh6zmjl5jz5"; depends=[httr jsonlite XML]; }; - renv = derive2 { name="renv"; version="0.9.2"; sha256="1jwnabryn77s29ybwdfzlnd7c8m05xmi69kp5qbvdxy2gjwjzcdr"; depends=[]; }; + renv = derive2 { name="renv"; version="0.9.3"; sha256="02ayfgbpw4b58148dcxz31anaxncwczmxs1zzkskwj0rzhb2x60r"; depends=[]; }; repeated = derive2 { name="repeated"; version="1.1.2"; sha256="19kcsj96i1zpnwfan3gz5vrzc2gqlah0wrdr9vb4vvacz45wcdfq"; depends=[rmutil]; }; repec = derive2 { name="repec"; version="0.1.0"; sha256="0alr9fbmfxmnnnn1qymy65crcycynwz435jj0vangbb4p0qhv8pm"; depends=[jsonlite]; }; repfdr = derive2 { name="repfdr"; version="1.2.3"; sha256="0jpk44arg1jib0h2w90h851bs5cd1ss32fab9bfvf9iir2jk8985"; depends=[Rcpp]; }; @@ -12589,27 +12726,26 @@ in with self; { 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]; }; repmis = derive2 { name="repmis"; version="0.5"; sha256="0z5mjbsl24yjbl0aawr35grcal44rf2xbwv1hy7bdkms94ix79b5"; depends=[data_table digest httr plyr R_cache]; }; - repo = derive2 { name="repo"; version="2.1.4"; sha256="0492jh20aknabjlw6k32bq11vc6gvypahplxmg6slpgfi15zkqg5"; depends=[digest]; }; + repo = derive2 { name="repo"; version="2.1.5"; sha256="13gdka37kbs4mp16pf65bh28f0dkyalrcrdik6lc67jw8r9h94f9"; depends=[digest]; }; repolr = derive2 { name="repolr"; version="3.4"; sha256="13kmy09c7lk8p1mkdss0krcsfb6d7zcnqpwnl38zkanvh8q3fqhm"; depends=[Matrix Rcpp RcppArmadillo]; }; reportROC = derive2 { name="reportROC"; version="3.4"; sha256="1gcck5ids0prrrbv4hqi76swxjhbx796p4qlxbf63ys3gvdzanxr"; depends=[pROC]; }; reportReg = derive2 { name="reportReg"; version="0.3.0"; sha256="0qwrpn61x69hmgln5fpc58dqfa3pba0lgjjyj0f3fh96wc9jyhq1"; depends=[nlme]; }; - reportRx = derive2 { name="reportRx"; version="1.0"; sha256="0npiflql0lq8sqp6xgydxbw7xdr0zdxj1s2h4bnpmn4clc05r7m4"; depends=[aod cmprsk geoR reshape stringr survival xtable]; }; reportr = derive2 { name="reportr"; version="1.3.0"; sha256="0zynplxqvbmf23cm2rsz3wz2jx6mv55z94mn1k44ny3lx625cnpw"; depends=[ore]; }; reports = derive2 { name="reports"; version="0.1.4"; sha256="0r74fjmdqax2x5fhbkdxb8gsvzi6v794fh81x4la9davz6w1fnxh"; depends=[]; }; reporttools = derive2 { name="reporttools"; version="1.1.2"; sha256="1i87xmp7zchcb8w8g7nypid06l2439qyrvpwsjz6qny954w6fa2b"; depends=[xtable]; }; - repr = derive2 { name="repr"; version="1.0.2"; sha256="0wn9fdddqjgn0bdfl75x89rcxahbgqs324bhg0pfq6va5q2mlbbw"; depends=[base64enc htmltools jsonlite pillar]; }; + repr = derive2 { name="repr"; version="1.1.0"; sha256="15jz780w4nd9qjd1g3gq8f5lkh60p2v3ig3hm5kl1rg3z4cf0gvl"; depends=[base64enc htmltools jsonlite pillar]; }; represent = derive2 { name="represent"; version="1.0"; sha256="0jvb40i6r1bh9ysfqwsj7s1g933d7z5fq9d618yjrqr6hbbqsvac"; depends=[]; }; represtools = derive2 { name="represtools"; version="0.1.3"; sha256="00hnvzkkcl9d3k115i5l9gs0wah5d11amn7q62m1j158lkqlcfza"; depends=[whisker]; }; reprex = derive2 { name="reprex"; version="0.3.0"; sha256="0v7vxzs8alwz8y1cjicpimp5yimf1g9gb8x5wy3zhvrz6kk2lg10"; depends=[callr clipr fs rlang rmarkdown whisker withr]; }; reproducer = derive2 { name="reproducer"; version="0.3.1"; sha256="0clgbwfv24fjx6hj0km1nwy508dqbga8q8lyzqg801yrr8gidizd"; depends=[dplyr GetoptLong ggplot2 gridExtra httr jsonlite lme4 MASS metafor openxlsx readr reshape stringr tibble tidyr xtable]; }; - reproducible = derive2 { name="reproducible"; version="0.2.11"; sha256="08pjmhhcgcrnrr8w6sdc3phz2ymp2b7gml0848f384blqkg9wavj"; depends=[archivist backports crayon data_table digest dplyr fastdigest fasterize fpCompare gdalUtils git2r googledrive httr magrittr memoise quickPlot R_utils raster RCurl remotes rgdal rgeos rlang sf sp testthat versions]; }; + reproducible = derive2 { name="reproducible"; version="1.0.0"; sha256="1zcxdvh3x1h0jcxcv62syl0midj2kk264vkanjj2bfhn4jbbbymi"; depends=[backports crayon data_table DBI digest fastdigest fpCompare gdalUtils glue googledrive httr magrittr memoise qs quickPlot R_utils raster remotes rgdal rlang RSQLite sf sp testthat versions]; }; reproj = derive2 { name="reproj"; version="0.4.0"; sha256="0liwv4sgxdm42vyykjyc3jihcxk3b5q0d7cwgai8349nn1ah0wdh"; depends=[proj4 tibble]; }; repurrrsive = derive2 { name="repurrrsive"; version="1.0.0"; sha256="1nmy88h2bfv2bad282kbrmnkjx9d8klgzv4mm8nspm049s09ydmz"; depends=[tibble]; }; reqres = derive2 { name="reqres"; version="0.2.3"; sha256="0dly09h8dpjlmvrd1wfg1gqcqhm03ax97qr0nd1p0fg9y0pdapya"; depends=[assertthat brotli jsonlite R6 stringi urltools webutils xml2]; }; request = derive2 { name="request"; version="0.1.0"; sha256="1q7zd6q00gdqmgq7s7nq1ixmns8zn2amr5zah9rwnsn8dkllj9yh"; depends=[curl httr jsonlite lazyeval magrittr R6 whisker]; }; requireR = derive2 { name="requireR"; version="1.0.0.1"; sha256="192l7i3q7s2a6n737an3fn258agjsdzh0q2w0vc8jbz7v4f3i92d"; depends=[]; }; rerddap = derive2 { name="rerddap"; version="0.6.5"; sha256="1pmpf9jdgp71ganzslwlp5qhkxhy7snaxgbrrym7swx6v2jnwhmv"; depends=[crul data_table digest dplyr hoardr jsonlite ncdf4 tibble xml2]; }; - rerddapXtracto = derive2 { name="rerddapXtracto"; version="0.4.6"; sha256="0akqprias7lxkg927yjdwcs7311rqjgnn5286g9r9rw813slc7vk"; depends=[abind dplyr ggplot2 httr maps ncdf4 parsedate plotdap readr rerddap sf sp]; }; + rerddapXtracto = derive2 { name="rerddapXtracto"; version="0.4.7"; sha256="0k4yfiyn16cf7msiy6lhfbf4s5fkfl8ddxgpi72w2kj61p6phcfv"; depends=[abind dplyr ggplot2 httr maps ncdf4 parsedate plotdap readr rerddap sf sp]; }; rerf = derive2 { name="rerf"; version="2.0.4"; sha256="0ykgxdmkqapdpk5zwi8h1cbsvjv6jpscqpr5cjmdzdan22m09l6k"; depends=[dummies mclust Rcpp RcppArmadillo RcppZiggurat]; }; resample = derive2 { name="resample"; version="0.4"; sha256="1rckzm2p0rkf42isc47x72j17xqrg8b7jpc440kn24mqw4szgmgh"; depends=[]; }; resampledata = derive2 { name="resampledata"; version="0.3.1"; sha256="1nxjqvxxvycccmh1n7lpc4k8zmwnciicfr5rzfid1icij5fzw3ak"; depends=[]; }; @@ -12619,22 +12755,23 @@ in with self; { reshape = derive2 { name="reshape"; version="0.8.8"; sha256="0s6i0sqxg1vldxs6miv8mi0zydxbqzgpmzfiwkj8y7jix3yrfmad"; depends=[plyr]; }; reshape2 = derive2 { name="reshape2"; version="1.4.3"; sha256="03ki5ka1dj208fc0dclbm0b4xp9d769pah2j9cs34l776p4r9zwa"; depends=[plyr Rcpp stringr]; }; reshapeGUI = derive2 { name="reshapeGUI"; version="0.1.0"; sha256="0kb57isws8gw0nlr6v9lg06c8000hqw0fvhfjsjyf8w6zwbbq3zs"; depends=[gWidgets gWidgetsRGtk2 plyr reshape2]; }; + resourcer = derive2 { name="resourcer"; version="1.0.0"; sha256="11abgyk0xs0sb3cw0fn6nh9wzbqnijja1mhj3hsdvz9n8k196b08"; depends=[httr R6]; }; respirometry = derive2 { name="respirometry"; version="1.0.2"; sha256="10dfy1xx2214x4lk0nxxi8c2h8j47gd8w004ic016j3m7a1vp3jd"; depends=[birk lubridate marelac measurements minpack_lm PKNCA seacarb segmented]; }; - restatapi = derive2 { name="restatapi"; version="0.6.2"; sha256="0mp5bd867w669w6219296ymzqn35nd306yfjb5pbi03sirqmk4lr"; depends=[data_table rjson xml2]; }; + restatapi = derive2 { name="restatapi"; version="0.7.5"; sha256="0a55k96qf807z9l8zgbpb849nm8c5iv42q7a6xm8sf2495p2jlr5"; depends=[data_table rjson xml2]; }; restfulr = derive2 { name="restfulr"; version="0.0.13"; sha256="1dk45mzrr6ka92yjz7hfhkj12kpx1wg4szv1h1mg80mgga4ganbv"; depends=[RCurl rjson S4Vectors XML yaml]; }; restimizeapi = derive2 { name="restimizeapi"; version="1.0.0"; sha256="1ss6fng5pmqg6cafc256g9ddz8f660c68ysxfan6mn4gdaigz7lb"; depends=[RCurl RJSONIO]; }; restlos = derive2 { name="restlos"; version="0.2-2"; sha256="083w1ldax8bnf3w4119damma2nz75c3ki187b0275i1mqxqrixp7"; depends=[geometry igraph limSolve rgl som]; }; restorepoint = derive2 { name="restorepoint"; version="0.2"; sha256="0pjp5dvycvfg75hhj8lrr2lrjn6n6bqj0ziwyd87lyi15b9j8w4s"; depends=[]; }; restrictedMVN = derive2 { name="restrictedMVN"; version="1.0"; sha256="0qynkg244gzq0yjb0716w7g1sxdq66i11ss8jij86h2mz3ykj137"; depends=[MASS]; }; - restriktor = derive2 { name="restriktor"; version="0.2-500"; sha256="14p66ckr8lyjl905y0wkqz6s8a0gsy7z6ndkpigwbzssq27jn0am"; depends=[boot ic_infer lavaan MASS mvtnorm quadprog]; }; + restriktor = derive2 { name="restriktor"; version="0.2-800"; sha256="0v7304912xhjz5bsngndvwi0y1qnk55xk9ariw2wi9msah1nm4d9"; depends=[boot ic_infer lavaan MASS mvtnorm quadprog]; }; resumer = derive2 { name="resumer"; version="0.0.3"; sha256="0ilya3v75989zqm16x69w4599ax2s5j2n6f16bmhwydrmzxs1g48"; depends=[dplyr rmarkdown useful]; }; rethinker = derive2 { name="rethinker"; version="1.1.0"; sha256="02zfx08s5xisv1v4y16iqbddi9kb3fcr249b3414fzvs4nm5as94"; depends=[rjson]; }; - reticulate = derive2 { name="reticulate"; version="1.14"; sha256="0icb9zl9zlx75njv7y1dr450k0yw2n3q2jkr4nicnphdyfn69gkn"; depends=[jsonlite Matrix rappdirs Rcpp]; }; + reticulate = derive2 { name="reticulate"; version="1.15"; sha256="03dmnx9jhxx6vfbv2i5n6sln38kb9zkshz982pg3l9i4jjf3xns7"; depends=[jsonlite Matrix rappdirs Rcpp]; }; retimes = derive2 { name="retimes"; version="0.1-2"; sha256="019sllyfahlqnqry2gqw4w5cy4cavrqnwpwrbb25cgjpdb19raja"; depends=[]; }; - retistruct = derive2 { name="retistruct"; version="0.6.2"; sha256="191kpd3fwgv48i4a048lgrir3lcvyjvaj41hxifxgkkg1g0gv3f0"; depends=[foreign geometry png R_matlab R6 rgl RImageJROI RTriangle sp ttutils]; }; + retistruct = derive2 { name="retistruct"; version="0.6.3"; sha256="1zij37n2ja3yx6n1agdkb3lj42p01parcg6djv60bng9c2qq0wsl"; depends=[foreign geometry png R_matlab R6 rgl RImageJROI RTriangle sp ttutils]; }; retractcheck = derive2 { name="retractcheck"; version="1.0.0"; sha256="1c4p8afh9g359s560sswcys3manc0lqvk0aqgvd09p4rpzls2dm7"; depends=[httr plyr textreadr]; }; retrodesign = derive2 { name="retrodesign"; version="0.1.0"; sha256="173jrpzasimplv8vbm8gzpl8aibnsjkgvhz1hd75is0b2l8gnbxy"; depends=[]; }; - retrosheet = derive2 { name="retrosheet"; version="1.1.0"; sha256="1k0qnq9a3ixk91qmmp5wxwv8l0878yx5h32a458w5a4h4ip434jx"; depends=[data_table httr rvest stringi stringr xml2]; }; + retrosheet = derive2 { name="retrosheet"; version="1.1.1"; sha256="1x9gh9zjb4r1nyfbcb79c656a8hzrfasdir8p968inqmr08b57v0"; depends=[data_table httr lubridate purrr readr rvest stringi stringr tibble xml2]; }; reutils = derive2 { name="reutils"; version="0.2.3"; sha256="09dhf4s7wz3anrkzqi16abx64gk8ck2142kfd8pv71mjy3x548l7"; depends=[assertthat jsonlite RCurl tibble XML]; }; reval = derive2 { name="reval"; version="2.0.0"; sha256="1yxkyc6wdp5h3cp8i42a9cf0b1cwr4nmpd7svlp7bpfxlcnqqa0d"; depends=[doParallel foreach]; }; revdbayes = derive2 { name="revdbayes"; version="1.3.6"; sha256="15nrmnl3g4l8yn6x1xvbfjn4fznryvgkvaqyxjr929v05rrf3fl0"; depends=[bayesplot Rcpp RcppArmadillo rust]; }; @@ -12647,10 +12784,10 @@ in with self; { reweight = derive2 { name="reweight"; version="1.2.1"; sha256="0fv7q1zb3f4vplg3b5ykb1ydwbzmiajgd1ihrxl732ll8rkkfa4v"; depends=[]; }; rex = derive2 { name="rex"; version="1.1.2"; sha256="0alsadgjgass3wr8y5d247j12qqzg454sc84vpskclrkmz778g5x"; depends=[lazyeval magrittr]; }; rexpokit = derive2 { name="rexpokit"; version="0.26.6.6"; sha256="13dxra3s68i499g21z9i93mbn6n8s4xay5zmvslafaccbq3q1ray"; depends=[Rcpp]; }; - rfPermute = derive2 { name="rfPermute"; version="2.1.7"; sha256="0dhgxm9b2djgadr1wnwgd0gbqv7751y0ln4jis32p0qmwi30v76d"; depends=[abind dplyr ggplot2 gridExtra magrittr plyr randomForest reshape2 rlang scales swfscMisc tibble tidyr]; }; + rfPermute = derive2 { name="rfPermute"; version="2.1.81"; sha256="0mak4r3j5vbjjkcsbxj0yg2xrbipq4rz873b02drkb769nh3d16a"; depends=[abind dplyr ggplot2 gridExtra magrittr randomForest rlang scales swfscMisc tibble tidyr]; }; rfUtilities = derive2 { name="rfUtilities"; version="2.1-5"; sha256="1anwvmxn3xrc1aqxl75rzlk4wby8l54rmkp0bgi8dgbz2l223xr0"; depends=[cluster randomForest]; }; rfVarImpOOB = derive2 { name="rfVarImpOOB"; version="1.0"; sha256="1341bicd65qw3pz1j8d6c9baj9d6s70ljdaaf87xvx8pjnajrfsw"; depends=[binaryLogic dplyr ggplot2 ggpubr magrittr prob randomForest titanic]; }; - rfacebookstat = derive2 { name="rfacebookstat"; version="2.0.0"; sha256="07mchcma7ab3wvz6rp1zmcfqn7bnd6w1w3jrsq22v851nzvw39jk"; depends=[dplyr httr jsonlite purrr stringr tidyr tidyselect]; }; + rfacebookstat = derive2 { name="rfacebookstat"; version="2.0.2"; sha256="0szzrlszjxapn86mk29f1nn39fmkfwjslbbcmqqj2harlnccafr7"; depends=[dplyr httr jsonlite purrr stringr tidyr tidyselect]; }; 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]; }; rfinterval = derive2 { name="rfinterval"; version="1.0.0"; sha256="1z7v0sbql6g2h3fr1268nj79rbx1d33hjfaraxhbikrjgb8mbp0w"; depends=[MASS ranger]; }; @@ -12666,20 +12803,21 @@ in with self; { rforensicbatwing = derive2 { name="rforensicbatwing"; version="1.3.1"; sha256="1i521h2nmlkhcxfxqir8jfjv0llwr6cz0ck5w6hzplk48044bn16"; depends=[Rcpp]; }; rfviz = derive2 { name="rfviz"; version="1.0.0"; sha256="0rzyy7r2ybqjnp1g5bbkxydpa93h8q4r71kdaj77r475m2i4kb6b"; depends=[loon randomForest]; }; rgabriel = derive2 { name="rgabriel"; version="0.7"; sha256="1c6awfppm1gqg7rm3551k6wyhqvjpyidqikjisg2p2kkhmyfkyzx"; depends=[]; }; - rgbif = derive2 { name="rgbif"; version="1.4.0"; sha256="00ik9aab13zq6n5r7sa8199nczrxb77xcf9j5bn2v8x0b7kyj4l9"; depends=[crul data_table geoaxe ggplot2 jsonlite lazyeval magrittr oai tibble whisker wicket xml2]; }; + rgbif = derive2 { name="rgbif"; version="2.2.0"; sha256="143ais0zviz015yzqax3jx47g277h9kfybwsaapgzadhap7paaja"; depends=[crul data_table geoaxe ggplot2 jsonlite lazyeval magrittr oai tibble whisker wicket xml2]; }; rgdal = derive2 { name="rgdal"; version="1.4-8"; sha256="1jd691amf3ghznq5im15gvhl6v6k25klpl75m4ngrqf9xlxaa3as"; 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=[]; }; rgeolocate = derive2 { name="rgeolocate"; version="1.0.1"; sha256="1v9kd71wpxna1war0rbp91pc5wdqlganmj2c2fc5m5176dnxd2v3"; depends=[httr Rcpp]; }; - rgeopat2 = derive2 { name="rgeopat2"; version="0.2.6"; sha256="04r8q3mig7sp38f3m9g20xlb0h046c04hhrzg4n06b5wkn7298s5"; depends=[readr sf stringr]; }; + rgeopat2 = derive2 { name="rgeopat2"; version="0.3.9"; sha256="0l0sqkvjkzp4lmyk55l7zc02y04sa43cps47005gq8c38kyks45k"; depends=[readr sf stringr]; }; rgeoprofile = derive2 { name="rgeoprofile"; version="0.1.1"; sha256="0frpipmmhywbahcyj5rhypp9qxqkp6xkdj6sn8w1ipw6gv02zp7b"; depends=[aspace geosphere leaflet pals RANN raster sp splancs]; }; rgeos = derive2 { name="rgeos"; version="0.5-2"; sha256="0ajrrxfwfp184c6rnby3dq54hzp3rrx3px72dn7gbdn6c4li2bqz"; depends=[sp]; }; + rgexf = derive2 { name="rgexf"; version="0.16.0"; sha256="1vj5ha1qx0xzflchxf25ycys6clfn9y32m1717afzkvhmkwisrra"; depends=[igraph servr XML]; }; rggobi = derive2 { name="rggobi"; version="2.1.22"; sha256="1g7k4xais9xkjlbvrkadr5d6c5rw4jp9c0gljhm71pa1fc9fcqff"; depends=[RGtk2]; }; - rgl = derive2 { name="rgl"; version="0.100.30"; sha256="0rzqzskcwf2ah4yr62x5rjwf7yh90d43h39gk7jmfc5lc08zaxc5"; depends=[crosstalk htmltools htmlwidgets jsonlite knitr magrittr manipulateWidget shiny]; }; + rgl = derive2 { name="rgl"; version="0.100.50"; sha256="165p932ml7dpjkm41zc47p5cdxar69il0m5yvg0avi8q01vr17ay"; depends=[crosstalk htmltools htmlwidgets jsonlite knitr magrittr manipulateWidget shiny]; }; rglobi = derive2 { name="rglobi"; version="0.2.21"; sha256="12v6g1ja4rrw0vcrrzgd1llxfk64g9z4f0c90rkbd9cknvnn0id9"; depends=[curl RCurl readr rjson]; }; rglwidget = derive2 { name="rglwidget"; version="0.2.1"; sha256="0siqxn3gyl98i84p0yha821b4rdrp2i0942mkx819wnf7qwrpqcv"; depends=[rgl]; }; - rgoogleslides = derive2 { name="rgoogleslides"; version="0.3.1"; sha256="06i1ljrib0ap87bxlbpnvx5fr05pwzcmza48gbicvg7fwhz9hs05"; depends=[assertthat httr jsonlite R6]; }; + rgoogleslides = derive2 { name="rgoogleslides"; version="0.3.2"; sha256="0h9gws1vcf0zdd21d8b65c2yz9kxppp3218h5lhd5iz879ajwa2i"; depends=[assertthat httr jsonlite R6]; }; rgr = derive2 { name="rgr"; version="1.1.15"; sha256="1mrnmbh2crhkwdi37q59hx76afvkhgzgaacg3688q7jp23d58z6x"; depends=[fastICA MASS]; }; rgrass7 = derive2 { name="rgrass7"; version="0.2-1"; sha256="0rhizda58hmglgr4aq6sr5y11y615w0pwpgdk3mylm9pjgj5i5vn"; depends=[XML]; }; rgsp = derive2 { name="rgsp"; version="0.2.0"; sha256="1fk0k479srfr0f4a5abyzcrzwy9hr1v5xf0jgs36fbim9bh7njlc"; depends=[dplyr magrittr tibble]; }; @@ -12696,11 +12834,13 @@ in with self; { 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]; }; - ribd = derive2 { name="ribd"; version="1.0.0"; sha256="1r3w8zfihs5i1al0g136319zaj2dr0x52s3spxrcvd0irq9r4v8b"; depends=[glue kinship2 pedtools slam]; }; - riceidconverter = derive2 { name="riceidconverter"; version="1.0.6"; sha256="1p3dzlvsbf51igmq3m3m9vy023l9ybi81zdqbcqmbpa581zlg52x"; depends=[dplyr]; }; + ribd = derive2 { name="ribd"; version="1.0.1"; sha256="0q1i2bs219iwqg2hlabbwmpcnsjfx1i0y31dy7pgirl5264w24xz"; depends=[glue kinship2 pedtools slam]; }; + ribiosUtils = derive2 { name="ribiosUtils"; version="1.5-6"; sha256="1cfkzqbscj01pjqw7yjqf8gnvjacb13y8fc7nax4cb7gnk4fadc2"; depends=[]; }; + ricegeneann = derive2 { name="ricegeneann"; version="1.0.2"; sha256="0wxqp4pfdhvq4mwzjrqi3m9jiayk5bp1ha222mpm4qz1pl41cy9w"; depends=[riceidconverter]; }; + riceidconverter = derive2 { name="riceidconverter"; version="1.1.1"; sha256="143f76v3k2q9ddcxf2nzvd04pjgy7p120ln0zkmxpal20c81dwq6"; depends=[dplyr]; }; riceware = derive2 { name="riceware"; version="0.4"; sha256="0pky0bwf10qcdgg9fgysafr35xbmnr9q0jbh56fawj99nbyj3m70"; depends=[random]; }; rich = derive2 { name="rich"; version="1.0.1"; sha256="0kasr9gb85qhngfayqy3fvrsr0a066krwxsx21nsxcnss0mrqygr"; depends=[boot vegan]; }; - ridge = derive2 { name="ridge"; version="2.4"; sha256="18a16653k850sfxw9rmk4spy44hn93i97b2a0jfx41qh43hmkgqy"; depends=[]; }; + ridge = derive2 { name="ridge"; version="2.5"; sha256="0v84glz2436a1n6wqrc46x2lya2f3vn94b83cv0rqlvqygqhyz8r"; 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]; }; @@ -12717,7 +12857,7 @@ in with self; { riskParityPortfolio = derive2 { name="riskParityPortfolio"; version="0.2.1"; sha256="0l51spflm7wwwz5yrkw1i5534d1840wyyh2w3mz8apaxac76l0xz"; depends=[alabama Matrix nloptr quadprog Rcpp RcppEigen]; }; riskPredictClustData = derive2 { name="riskPredictClustData"; version="0.2.6"; sha256="0mvy9299pg374gvvqs9lmj2j0f3bzyy279kjpz7jq35hkgz5wif3"; depends=[gee Hmisc MASS mvtnorm]; }; riskR = derive2 { name="riskR"; version="1.1"; sha256="1qadfyb07idfw0bs006kb3917rzda83di6jmsr22941gv78z1wyv"; depends=[]; }; - riskRegression = derive2 { name="riskRegression"; version="2019.11.03"; sha256="15mz89cdzd6pjrlf61qs6vlcwx10rqxmz8ggpynyclhm9327skbb"; depends=[cmprsk data_table doParallel foreach ggplot2 lattice lava plotrix prodlim ranger Rcpp RcppArmadillo rms survival timereg]; }; + riskRegression = derive2 { name="riskRegression"; version="2020.02.05"; sha256="1m02aap91hn1gaaadc9qk3ij33l613b03biw52l79dp32yfwzdmm"; depends=[cmprsk data_table doParallel foreach ggplot2 lattice lava plotrix prodlim Publish ranger Rcpp RcppArmadillo rms survival timereg]; }; riskSimul = derive2 { name="riskSimul"; version="0.1"; sha256="0s2a1mn6g11m96gqscb916caj2aykcs3rkacpqcdnlyzryk1gsnb"; depends=[Runuran]; }; riskclustr = derive2 { name="riskclustr"; version="0.2"; sha256="0j5gcm9a57yrg5ppqmacdjr16b9d8rwqkhq1mawy1fjpf18d2max"; depends=[aod gtools Matrix mlogit stringr]; }; risksetROC = derive2 { name="risksetROC"; version="1.0.4"; sha256="1fh0jf8v536qzf1v3awx3f73wykzicli4r54yg1z926ccqb4h80l"; depends=[MASS survival]; }; @@ -12725,27 +12865,28 @@ in with self; { ritis = derive2 { name="ritis"; version="0.8.0"; sha256="1ggcchavhxcd3pawcf631ca8w1y4v0ygm1hflvkmzhk4k9ci3g13"; depends=[crul data_table jsonlite solrium tibble]; }; riv = derive2 { name="riv"; version="2.0-5"; sha256="0n19jlrs12iysq45xyi3zvghkircg0ww5vbsfpnqkw5b22zsv30s"; depends=[MASS quantreg rrcov]; }; riverdist = derive2 { name="riverdist"; version="0.15.0"; sha256="145mvqnhv12dcvss54wdycgb3wwk95phl4kx5z0jnh3kmm1zsdl4"; depends=[rgdal sp]; }; - rivernet = derive2 { name="rivernet"; version="1.2"; sha256="0lvl7m1y779g7jsbbc2gh1h6giy1m293j0ky9759c0w17fm454fd"; depends=[]; }; + rivernet = derive2 { name="rivernet"; version="1.2.1"; sha256="0p8jyigbxipwds9pdw2gzv3ql5yikg1ik4vbk4drylbp5xhmvyja"; 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-1"; sha256="17kh5kin2id8imarvwkjikrmz266x2ldja6b7xpj34s35dzap682"; depends=[Rcpp]; }; + rivr = derive2 { name="rivr"; version="1.2-2"; sha256="0xnkhglj5ky3ly73xif9kf400av2hwys8iq8yqhxwfdgy0jx7g6y"; depends=[Rcpp]; }; rjade = derive2 { name="rjade"; version="0.1"; sha256="0f1jljj6m1almz0na984n0g314y0rl6a0mx04rbrpipgfgz1h37c"; depends=[V8]; }; rjags = derive2 { name="rjags"; version="4-10"; sha256="1nhaim84ww8fd6m8xlpmngqcnp2qpql29ahc38366fxja3ghngmx"; depends=[coda]; }; rjazz = derive2 { name="rjazz"; version="0.1.7"; sha256="0wmqlpgcr98dvapfmdcph5mdv202rzzsvb06iy5sqvpizpg7pbsz"; depends=[RCurl]; }; rjdqa = derive2 { name="rjdqa"; version="0.1.0"; sha256="07qvvy3i0ak7p717wf68gx8d1m9l4lhibf0ynmc0jny58i56fiw8"; depends=[plotrix RJDemetra]; }; - rje = derive2 { name="rje"; version="1.10.13"; sha256="08s8pw0v49z504y529yhyhp3gj1836fpxmbfhb01ka7kbj8v6swk"; depends=[knitr]; }; + rje = derive2 { name="rje"; version="1.10.15"; sha256="0z6df1sc33nz7rhgrr13q03ymraz5wfjbwqqdq6pmyff8mxkzqvj"; depends=[knitr]; }; rjmcmc = derive2 { name="rjmcmc"; version="0.4.5"; sha256="14rzvp6z5avlcnmlmvb6w4gvlh6v4ncbcai3v4c4svnjv555vz45"; depends=[coda madness mvtnorm]; }; rjson = derive2 { name="rjson"; version="0.2.20"; sha256="0v1zvdd3svnavklh7y5xbwrrkbvx6053r4c5hgnk7hz7bqg7qa1s"; depends=[]; }; rjsonapi = derive2 { name="rjsonapi"; version="0.1.0"; sha256="0qshll0y8b6lbfrqmp69w9kc9hgfrz94dk68nddshk9ilg14lx4d"; depends=[crul jsonlite plumber R6]; }; - rjstat = derive2 { name="rjstat"; version="0.3.0"; sha256="0r772p0a0x6g96k6r26vb6vjxa68mzjslwg71r0wysa9kqhvypm4"; depends=[checkmate jsonlite]; }; + rjstat = derive2 { name="rjstat"; version="0.4.1"; sha256="0kqnl4wizmain70ady982aldhscf24870shvf3sviknplshhgk8j"; depends=[checkmate jsonlite]; }; rjwsacruncher = derive2 { name="rjwsacruncher"; version="0.1.0"; sha256="0pbf3yl7cnx8vv07x9nwgrglv5h8r135fc840pxvapi099nr7ijl"; depends=[XML]; }; rkafka = derive2 { name="rkafka"; version="1.1"; sha256="0c0hszsmmd876jcfamjcfb7bxw7869zgy99j4i6ksb8za232nmmw"; depends=[rJava rkafkajars RUnit]; }; rkafkajars = derive2 { name="rkafkajars"; version="1.1"; sha256="121qnzxhipgv145lhmr6h356jpdd6knsx7f21cv9a8r5r009d42z"; depends=[rJava RUnit]; }; + rkeops = derive2 { name="rkeops"; version="1.4"; sha256="1wwca6ym32a7l0w85sgysyvyjqy43hly76gm28s4bklx58ap7l1y"; depends=[openssl Rcpp RcppEigen stringr]; }; rknn = derive2 { name="rknn"; version="1.2-1"; sha256="1x9r01314q0wgqwqzd7d13ycjzb4jzghzd3whgjvm2rsmnabai95"; depends=[gmp]; }; rkt = derive2 { name="rkt"; version="1.5"; sha256="1rgf7dnk4d1b46rns2mb2s1ilxq7hqrh057vrrl00324r4h8bs1k"; depends=[]; }; rkvo = derive2 { name="rkvo"; version="0.1"; sha256="0ci8jqf9nc8hb063nckxdnp0nlyr4ghby356lxm00anw44jlmw8v"; depends=[Rcpp]; }; - rlang = derive2 { name="rlang"; version="0.4.3"; sha256="0qsqfikbsj55x5brghnkzzp7pz0japr4xnzm993f668mlls3f6i4"; depends=[]; }; - rlas = derive2 { name="rlas"; version="1.3.4"; sha256="0ccdbg634ibdjh1c7bri4l6achfrb4agy4iilr4z1pc1yzgsnk6r"; depends=[BH data_table Rcpp]; }; + rlang = derive2 { name="rlang"; version="0.4.5"; sha256="1a0h3dr519p3jj6aygbhwi9f2zwlan6d07f1gkh2db56y5vaq7yd"; depends=[]; }; + rlas = derive2 { name="rlas"; version="1.3.5"; sha256="01ncx3rckr7fwl6fqlj1rn0k6563kp4dfn3yhxqzd49rwhvclkcf"; depends=[BH data_table Rcpp]; }; rlc = derive2 { name="rlc"; version="0.2.0"; sha256="083pkajxshckk3hqg7q87jdmiqg9a1jp5lwar6f5r4nqna4kf3xa"; depends=[hwriter jrc jsonlite plyr R6 stringr]; }; 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]; }; @@ -12763,34 +12904,34 @@ in with self; { rmaf = derive2 { name="rmaf"; version="3.0.1"; sha256="0w247mamwgibr5576p5c2lzaiz2lv2c25n7gw9q99s7rc4bps7j7"; depends=[]; }; rmake = derive2 { name="rmake"; version="1.1.0"; sha256="00qlki2vps505nxzmfykf1iyq4b0y20nb75hbfcj63ap46z7zk3c"; depends=[assertthat pryr rmarkdown visNetwork]; }; rmangal = derive2 { name="rmangal"; version="2.0.0"; sha256="0vn5i6hwi64kzi481m3y696cqdxz6frv1n7xxm72a3vbz1jsqcrf"; depends=[httr igraph jsonlite memoise purrr]; }; - rmapshaper = derive2 { name="rmapshaper"; version="0.4.2"; sha256="1m0zb5vh4mph5lz5c5rdjl3clk7rih0ipf31a91cv308fvxhlrvi"; depends=[geojsonio geojsonlint jsonlite readr sf sp V8]; }; + rmapshaper = derive2 { name="rmapshaper"; version="0.4.4"; sha256="11diajgz8jkfa2d725n0iy0psiw3x4d7kbdvdrd1prwdjsyh7i5d"; depends=[geojsonio geojsonlint jsonlite readr sf sp V8]; }; rmapzen = derive2 { name="rmapzen"; version="0.4.2"; sha256="1vybg3lmrqghvd23jwpfmypvqz2b65bc0m2pwbpizwkkg35iza70"; depends=[assertthat digest dplyr geojsonio httr jsonlite maps maptools purrr rgdal sf sp tibble tidyr]; }; rmargint = derive2 { name="rmargint"; version="1.0.2"; sha256="1hl2nxmgknw74jvmc05wz6zkf7i151xl7h7hdpcivvm60yizlx8i"; depends=[]; }; rmarkdown = derive2 { name="rmarkdown"; version="2.1"; sha256="0pa5xs0vzwn9vsgysjqbks9v5lbqphxh5agciskllibc40hhwigg"; depends=[base64enc evaluate htmltools jsonlite knitr mime stringr tinytex xfun yaml]; }; rmatio = derive2 { name="rmatio"; version="0.14.0"; sha256="072fxg81r4rsc71qrf5p6lr5s3gchbgvxhyzwlx3wxw7y2px6w7y"; depends=[Matrix]; }; rmcfs = derive2 { name="rmcfs"; version="1.3.1"; sha256="1y59r4n2ywinfpkb7zn7gygl97w6p0rvr90sjqy4vdhi60ka16kf"; depends=[data_table dplyr ggplot2 gridExtra igraph reshape2 rJava stringi yaml]; }; rmcorr = derive2 { name="rmcorr"; version="0.3.0"; sha256="1p05ln653yrd02wmn8wfzawiw6a924d8an0568fcbgl1pdna43b1"; depends=[psych RColorBrewer]; }; + rmd = derive2 { name="rmd"; version="0.1.5"; sha256="00fsssd4hnk00wsrials4lwxrjnr84ppnk7094bfswpfc0iawc3z"; depends=[blogdown bookdown bookdownplus citr cli crayon curl devtools dplyr DT magrittr mindr miniUI pagedown purrr rappdirs rmarkdown rstudioapi rticles rvest shiny shinyjs tibble tinytex xaringan xml2]; }; rmdHelpers = derive2 { name="rmdHelpers"; version="1.2"; sha256="1ahzbs8z7wvh1dwbq1kq8wrjrknxi2gck63k70gj0swjvgk0ih5r"; depends=[dplyr knitr]; }; rmda = derive2 { name="rmda"; version="1.6"; sha256="1m7j79jwii9la47w34ka3yl1n7nql8pfn32if0aycn4yw5sy8dmc"; depends=[caret MASS pander reshape]; }; rmdcev = derive2 { name="rmdcev"; version="1.1.1"; sha256="0pz60hzd3gvmrzcb29h0h4zb4lr5sdyw3nsa84hixsph00cf4lm0"; depends=[BH dplyr Formula purrr Rcpp RcppEigen rlang rstan rstantools StanHeaders stringr tibble tidyr tidyselect tmvtnorm]; }; rmdfiltr = derive2 { name="rmdfiltr"; version="0.1.2"; sha256="1hj4lhwyz47hznyqjgghp852fkzhk5k7dfp7cxabg8h49qzswcgx"; depends=[assertthat rmarkdown]; }; - rmdformats = derive2 { name="rmdformats"; version="0.3.6"; sha256="157811frmm1f7d7r27wr7f71frggm664w1diymw1kd88wgw3z89r"; depends=[bookdown htmltools knitr rmarkdown]; }; + rmdformats = derive2 { name="rmdformats"; version="0.3.7"; sha256="1pwd4z175dmz4fpg094rba48gq6sir8ys7ln7pfdsnwmgf79sj9k"; depends=[bookdown htmltools knitr rmarkdown]; }; rmdplugr = derive2 { name="rmdplugr"; version="0.4.1"; sha256="16wmrya8wdipqcrh34k4v4iq05aqd0jwf7rg6w1wsvx2i9211xg6"; depends=[bookdown rmarkdown]; }; rmdshower = derive2 { name="rmdshower"; version="2.1.1"; sha256="1sjpi5ils31adii51gaa8ly7x93l9ganp6in8rsln6si4jc2ppg9"; depends=[rmarkdown]; }; rmeta = derive2 { name="rmeta"; version="3.0"; sha256="0vkbnxp579v8zmcv1isdbzj5swpr6fq17zwparxcvzswjc2x9ydr"; depends=[]; }; - rmetalog = derive2 { name="rmetalog"; version="1.0.0"; sha256="1ndw8drzhf74sjx31zfhhx9q1l6pdn4yx2i8l7klp38d5bsc27xm"; depends=[ggplot2 lpSolve]; }; - rmetasim = derive2 { name="rmetasim"; version="3.1.7"; sha256="0sz4mdprdi6sgkfwfdvh2hr9nxiwq17sw0vggq3cvs7lzb0i6m9r"; depends=[ade4 adegenet gtools pegas]; }; + rmetalog = derive2 { name="rmetalog"; version="1.0.2"; sha256="00ln3wl23ybjgs44h9x388p56x8jymd54vbcfpzidbhz2im1ilbf"; depends=[ggplot2 lpSolve]; }; + rmetasim = derive2 { name="rmetasim"; version="3.1.14"; sha256="0rdkhfgyr97r2d1kd9g8ipb2pn563qxm1y4m9z678q0kqan2ddl0"; depends=[ade4 adegenet gtools pegas]; }; rmgarch = derive2 { name="rmgarch"; version="1.3-7"; sha256="108wrbqj4c02c9cyv5m5xlswb1mlfdrhggb005sixr2dcqghb163"; depends=[Bessel corpcor ff MASS Matrix pcaPP Rcpp RcppArmadillo Rsolnp rugarch shape spd xts zoo]; }; rmi = derive2 { name="rmi"; version="0.1.1"; sha256="1y0395l9lhskdrk3x9ps2dmv0sznsba0n6a9fmma33dc9dhywgf9"; depends=[BH Rcpp RcppArmadillo]; }; rminer = derive2 { name="rminer"; version="1.4.3"; sha256="0x9lzzhhy5zld8fajf4aq1msvck2kg3hvkpaiw4lx7w14znda7kd"; depends=[adabag Cubist e1071 glmnet kernlab kknn lattice MASS mda nnet party plotrix pls randomForest rpart xgboost]; }; rmio = derive2 { name="rmio"; version="0.1.3"; sha256="0zd8kki9wmh4xnabf7nwjw66wb4x5wngn0073pzqcj84ggxgnwqc"; depends=[]; }; - rmonad = derive2 { name="rmonad"; version="0.5.0"; sha256="0m7hhmn87rfh49hxrjlcxcq6q36niyxlh3w2frld68jkbks71jn5"; depends=[digest glue igraph magrittr pryr]; }; + rmonad = derive2 { name="rmonad"; version="0.7.0"; sha256="1vjx8kk57xk7c2a05c6kn75n17842ya7j41hqj3wmgq8yvaxrngx"; depends=[digest glue igraph magrittr pryr]; }; rmpw = derive2 { name="rmpw"; version="0.0.4"; sha256="1a49rvdwvmccv4gfir48fw0b9jyrpc2q9zfyk5j9b7nxsx6x7abl"; depends=[gtools MASS]; }; rms = derive2 { name="rms"; version="5.1-4"; sha256="19knh1sw0icw6jh9wfb2hq5jf49i2qfvp9myvqm5paa495689x9q"; depends=[ggplot2 Hmisc htmlTable htmltools lattice multcomp nlme polspline quantreg rpart SparseM survival]; }; rms_gof = derive2 { name="rms.gof"; version="1.0"; sha256="1n0h3nrp11f2x70mfjxpk2f3g4vwjaf4476pjjwy49smxxlxwz82"; depends=[]; }; rmsfact = derive2 { name="rmsfact"; version="0.0.3"; sha256="05s23rfs9prr2ia3h4h9y614xhv91lbgppgf3mrrssxkwz220kd5"; depends=[]; }; - rmsfuns = derive2 { name="rmsfuns"; version="0.0.0.3"; sha256="0dn39d8kjkk808zjhb6npl7igmbp3j5q15z70f59g9j6xwm9dvnz"; depends=[dplyr magrittr PerformanceAnalytics purrr readr tbl2xts xts zoo]; }; - rmumps = derive2 { name="rmumps"; version="5.2.1-7"; sha256="0gnsynhlxh6pbhi1gr3zdi5y1gbbhbcp50z7y9b97px4j3hwignf"; depends=[Rcpp]; }; + rmumps = derive2 { name="rmumps"; version="5.2.1-12"; sha256="142f8kf6qydh7qrdhs12836zri137f0b3vaq8kqmcvya07pviyr9"; 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.8"; sha256="1sn1pncxnv2jgxhmbm4zlq6zyi8nsz90x8b7697qlqf2la837v96"; depends=[dplyr httr lubridate purrr stringr]; }; @@ -12799,7 +12940,7 @@ in with self; { 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]; }; rnbp = derive2 { name="rnbp"; version="0.1.0"; sha256="01hx9r7ai42kcj8l7bmqrma8w3l1f9bmg2ingpqxirimxkfwv2k8"; depends=[curl httr jsonlite]; }; - rncl = derive2 { name="rncl"; version="0.8.3"; sha256="03c8sizm32rdilbvf67gsw81w7i623pajn9blrrkq8rq8j3zdbns"; depends=[progress Rcpp]; }; + rncl = derive2 { name="rncl"; version="0.8.4"; sha256="0ss9jqrvv7bhvl5j74cjrp8r866d9dlavrbbfscwz3mhkgfx06bb"; depends=[progress Rcpp]; }; rneos = derive2 { name="rneos"; version="0.3-2"; sha256="0m5mmhwnrk9ifv91s5ngmlvqqd7bw1n7glzkgk5i72cw0siiwmh0"; depends=[RCurl XML]; }; rnetcarto = derive2 { name="rnetcarto"; version="0.2.4"; sha256="0fk5rym6zp049bl1f7bkl2231mjh3pgnxn0nhvmzpsah08rh4rr6"; depends=[]; }; rngSetSeed = derive2 { name="rngSetSeed"; version="0.3-2"; sha256="00mqjjkhbnvxqkf1kz16gipsf98q62vmhx9v8140qs7c4ljbhc3a"; depends=[]; }; @@ -12810,27 +12951,26 @@ in with self; { rnoaa = derive2 { name="rnoaa"; version="0.9.5"; sha256="123gzgycv8lnx9dikkqjn2fhnpzlwgxdmzkvdvf3kgwl1gw9170b"; depends=[crul dplyr geonames ggplot2 gridExtra hoardr isdparser jsonlite lubridate rappdirs scales tibble tidyr tidyselect XML xml2]; }; rnpn = derive2 { name="rnpn"; version="0.1.0"; sha256="10xx8fxgdknv71ks42xxvf38xsmjy6s87y67wi21673v0n07fxb5"; depends=[data_table httr jsonlite plyr]; }; rnr = derive2 { name="rnr"; version="0.2.1"; sha256="1z9bab3qmq8d79bcvjzldbxlah2w8mqp2ifd0cn1348dafwa0dhi"; depends=[assertthat purrr]; }; - rnrfa = derive2 { name="rnrfa"; version="2.0.1"; sha256="1p7wc3czp0i6il16nc1syp51i5gnb1hjx32j35ms8v20ficyb1zp"; depends=[curl dplyr ggmap ggplot2 httr jsonlite lubridate rgdal sp tibble xts]; }; + rnrfa = derive2 { name="rnrfa"; version="2.0.2"; sha256="0sjg04y1s7wfvimwv19ay5qhldsvncy34j0r79ddys7pmzql1aic"; depends=[curl dplyr ggmap ggplot2 httr jsonlite lubridate rgdal sp tibble zoo]; }; roadoi = derive2 { name="roadoi"; version="0.6"; sha256="1mlf63018qpgyqma51fas1nvags7qcrsw11hm6c1idnxjh0sz82z"; depends=[dplyr httr jsonlite miniUI plyr purrr shiny tibble tidyr]; }; - roahd = derive2 { name="roahd"; version="1.4.1"; sha256="0d89d21s32bsjkm8bdiqrbccd3m9badh87vrsb1laawhl4hr3dn9"; depends=[dplyr magrittr robustbase scales]; }; - robCompositions = derive2 { name="robCompositions"; version="2.2.0"; sha256="093lg17i8f94prai6mzwl70w3iy40hda6311mq9sirspr77nz3ni"; depends=[car cluster cvTools data_table e1071 fpc GGally ggplot2 kernlab MASS mclust pls Rcpp RcppEigen reshape2 robustbase rrcov sROC tidyr VIM zCompositions]; }; + robCompositions = derive2 { name="robCompositions"; version="2.2.1"; sha256="18p0rb04fzmwqsxcap5mxhhmhav6qs05icdaq3msmbp0n9iwrpz6"; depends=[car cluster cvTools data_table e1071 fpc GGally ggplot2 kernlab MASS mclust pls Rcpp RcppEigen reshape2 robustbase rrcov sROC tidyr VIM zCompositions]; }; robFitConGraph = derive2 { name="robFitConGraph"; version="0.1.0"; sha256="092nc0xnjs2zxd9ij0dl1xggb8mwl8nly284yjhhygmwlwsvhzxm"; depends=[MASS mvtnorm Rcpp]; }; robcbi = derive2 { name="robcbi"; version="1.1-3"; sha256="0rj732qdd0wd9d9pxldnsw5rif5d7wz327iydvxcf5x8lgvk42jd"; depends=[robeth]; }; robcor = derive2 { name="robcor"; version="0.1-6"; sha256="1hw8simv93jq8a5y79hblhqz157wr8q9dzgm0xhvvv5nkzyqkpzf"; depends=[]; }; robcp = derive2 { name="robcp"; version="0.2.5"; sha256="023g9w26bxia873qblscdcf50r7qv5hknwdx45dqbr3r778ls8bn"; depends=[]; }; - robeth = derive2 { name="robeth"; version="2.7-5"; sha256="0jz3ivck9ma8x03sz41zkln3qh70ckfm5c2l57nlxi0ci5h0dfh2"; depends=[]; }; + robeth = derive2 { name="robeth"; version="2.7-6"; sha256="1x0hzgq7jwl83wwmy581ia8009v0j95aksnr5ywpflnqm76rj6v2"; depends=[]; }; robets = derive2 { name="robets"; version="1.4"; sha256="0lvzfpv6569pjysblhadd05sglx0qvyr9wipb9cpiya4a1992n61"; depends=[forecast Rcpp]; }; robfilter = derive2 { name="robfilter"; version="4.1.2"; sha256="0mvpaf6g694b7175bl3yr6lxbwla4pwp7g4y34qb4klgl5n3nw03"; depends=[lattice MASS robustbase]; }; - robin = derive2 { name="robin"; version="0.99.1"; sha256="0ghlfkpcfnywfb8psszbkzrljlissw11y4n52hhgm9ivk2ds4lk5"; depends=[DescTools fdatest ggplot2 gprege igraph networkD3]; }; + robin = derive2 { name="robin"; version="1.0.0"; sha256="0g0dzk20z98ygbxs3f8ylfjryxpdz5112jvdiax4iyj890yjp93c"; depends=[DescTools fdatest ggplot2 gprege igraph networkD3]; }; robis = derive2 { name="robis"; version="2.1.8"; sha256="1qi6ay0v3vc2gz5xalgj8vfx7zaiz5726mkkgwawxfj35gmdq0mk"; depends=[dplyr ggplot2 httr jsonlite leaflet]; }; - robmed = derive2 { name="robmed"; version="0.5.0"; sha256="02kavd5vllp3mf2gir66kf00n1ppc19k47zg4agfm2rhcn8whz9s"; depends=[boot ggplot2 quantreg robustbase shiny]; }; - robmixglm = derive2 { name="robmixglm"; version="1.0-2"; sha256="0z23frjv9yscw0q33s5vlrmisg9an5hksyhcrgcnlan6x63r91kq"; depends=[actuar bbmle boot fastGHQuad MASS numDeriv Rcpp VGAM]; }; + robmed = derive2 { name="robmed"; version="0.6.0"; sha256="1rlfn85nq6dpwwlp3z567vq23i233iwsjb0jss4ahfbnayydq2ir"; depends=[boot ggplot2 quantreg robustbase shiny]; }; + robmixglm = derive2 { name="robmixglm"; version="1.0-3"; sha256="0y8djq3r6c620azja7s0xjphhfdq2sl6zhj711lmb7lm7mpidqnz"; depends=[actuar bbmle boot fastGHQuad MASS numDeriv Rcpp VGAM]; }; robotstxt = derive2 { name="robotstxt"; version="0.6.2"; sha256="1c1rhiwkdzvbspwa5km6gp3sjhzmb60ljibb2pf26s931lkr5b6l"; depends=[future future_apply httr magrittr spiderbar stringr]; }; robreg3S = derive2 { name="robreg3S"; version="0.3"; sha256="0rv8qh98wws1f40d1kmysyy9qin0ngsvwq63cnxbwi290wsnrvls"; depends=[GSE MASS robustbase]; }; robregcc = derive2 { name="robregcc"; version="1.0"; sha256="159ms69jqjkf8bhi4hkm929hpwqi8qbcfyaahcjlkyximv7qnqaz"; depends=[magrittr MASS Rcpp RcppArmadillo]; }; robsurvey = derive2 { name="robsurvey"; version="0.1.1"; sha256="0rf2sd7maz565hlgpyhvkswqyck01hif4mg5isbnnky9n3nc98pi"; depends=[survey]; }; robumeta = derive2 { name="robumeta"; version="2.0"; sha256="1ynlfxlzh442jd1cf02j0f948m16d536a30gb4bf7208baqri1vg"; depends=[]; }; - robust = derive2 { name="robust"; version="0.4-18.2"; sha256="02x7d6dgx3skiadvx5m3c44b4bhz37ycpfhc25dhhv50y1db6l3k"; depends=[fit_models lattice MASS robustbase rrcov]; }; + robust = derive2 { name="robust"; version="0.5-0.0"; sha256="1ks5scp8bnicl9j1r8yrmz668fjs6ifdmi540zw6d2ck500bbw42"; depends=[fit_models lattice MASS robustbase rrcov]; }; robustBLME = derive2 { name="robustBLME"; version="0.1.3"; sha256="18wx116l1riy4wn4083kxl637mkyyi9wbwnmvhkgqw3vb36s4vxd"; depends=[doParallel foreach iterators lme4 mvtnorm numDeriv Rcpp RcppArmadillo]; }; robustDA = derive2 { name="robustDA"; version="1.1"; sha256="1yys6adkyms5r4sw887y78gnh97qqr7sbi5lxv5l9bnc4ggcfiz6"; depends=[MASS mclust Rsolnp]; }; robustETM = derive2 { name="robustETM"; version="1.0"; sha256="1dlj79v08bls500lb81rya6vwx58h97rpq1sy9zwd3mfl9b6awp9"; depends=[]; }; @@ -12838,7 +12978,7 @@ in with self; { robustSingleCell = derive2 { name="robustSingleCell"; version="0.1.1"; sha256="1rxjw5rwp20ssjgq26ajrbipqfjblmsgf87jgx7xa41mgmhwaq51"; depends=[biomaRt cccd dplyr GGally ggplot2 ggpubr ggrepel gplots igraph limma Matrix RANN RColorBrewer Rcpp reshape2 rslurm Rtsne scales]; }; 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-5"; sha256="0mkzbsjl5nihyj7mzks14p6kr3spp44xvygjz4ran11gspdn9rdx"; depends=[DEoptimR]; }; + robustbase = derive2 { name="robustbase"; version="0.93-6"; sha256="1cr478xi4n9jwsdpbq182a7ig47rpb413q28dz6d1am08sk6657a"; 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]; }; @@ -12871,38 +13011,38 @@ in with self; { rootWishart = derive2 { name="rootWishart"; version="0.4.1"; sha256="1l9pr3i20hi5k02qnlb3blxhlvp2j0njn74xslw3gcjvyzjlr12j"; depends=[BH Rcpp RcppEigen]; }; roots = derive2 { name="roots"; version="1.0"; sha256="1ssmmmrg18xmqxs6f7dqv07357iwcvk21j1gxsl8s9njbj2plxai"; depends=[animation igraph rARPACK]; }; rope = derive2 { name="rope"; version="1.0"; sha256="06qp6h8cjnz0yacm4r39k99hrw74iyq16h5mqfcki7sf3zqbfm7r"; depends=[]; }; - ropenaq = derive2 { name="ropenaq"; version="0.2.7"; sha256="161yc2d82iivxaqpl5kzvxcmcqjpv6s5jj9pa304vj8cz0rnxgfr"; depends=[crul dplyr jsonlite lazyeval lubridate tidyr]; }; - ropenblas = derive2 { name="ropenblas"; version="0.2.0"; sha256="0bz0q4qw1ivr7l37vsrcimrndgww3ay9dbk2ga3fxhnz50yq6kxr"; depends=[cli fs getPass git2r glue magrittr RCurl rstudioapi stringr XML]; }; + ropenaq = derive2 { name="ropenaq"; version="0.2.9"; sha256="0lrm5nncybvcl0k4k8pwrdg3115wsi0zcspqscfyw1rd3w2h2yjg"; depends=[crul dplyr jsonlite lubridate magrittr rlang tidyr]; }; + ropenblas = derive2 { name="ropenblas"; version="0.2.2"; sha256="1sbk41nd2hjv93a7xd1jlpcxs7gdrkp6j27x8312zarwla2ra0qd"; depends=[cli fs getPass git2r glue magrittr RCurl rstudioapi stringr XML]; }; ropendata = derive2 { name="ropendata"; version="0.1.0"; sha256="1bv6y241abs6pb4wq5ybx9x4zh72kf8ffs3vlcgdsmhw4jwrsxdl"; depends=[httr jsonlite]; }; ropensecretsapi = derive2 { name="ropensecretsapi"; version="1.0.1"; sha256="0d4yl0h4am3blskdnzk119hk374c3vx0cg99r20w07yh8jfafrw7"; depends=[RCurl RJSONIO]; }; roperators = derive2 { name="roperators"; version="1.1.0"; sha256="0klmk1jmh1iysgf345qa6qyjmn1pkz072ha254k90flprgicg7c6"; depends=[]; }; ropercenter = derive2 { name="ropercenter"; version="0.2.0"; sha256="1ghn666jhwmkxwrr8pc398nhzvg4y4097pa19m4b08d9mkg9iqlj"; depends=[dplyr foreign haven httr readr rvest stringr tibble tidyr xml2]; }; roprov = derive2 { name="roprov"; version="0.1.2"; sha256="16w9i7svlkn2wbv35890f1zpcxilj0ar28d2xrdvmx7ni9vrz61q"; depends=[CodeDepends fastdigest igraph]; }; - roptim = derive2 { name="roptim"; version="0.1.2"; sha256="0kamdhyc7s1i7mbgzf6zbdbcs2qjjq4wgl1v181xzhq6gpv7fhy6"; depends=[Rcpp RcppArmadillo]; }; - rorcid = derive2 { name="rorcid"; version="0.5.0"; sha256="0508dc3av593bqylrq5zysav56p9243hg35gs8vhnbqjngfm1pib"; depends=[crul data_table fauxpas httr jsonlite tibble xml2]; }; + roptim = derive2 { name="roptim"; version="0.1.4"; sha256="18iwmfij9whg5rvdza607hf41acahmi35c6yj9hj6p2jkcr0xdpm"; depends=[Rcpp RcppArmadillo]; }; + rorcid = derive2 { name="rorcid"; version="0.6.4"; sha256="0v8h1d5dwx5aafw1dq64b8clhzc0ksnqpy5pfbid9c1f290xk907"; depends=[crul data_table fauxpas httr jsonlite tibble xml2]; }; + rorqual_morpho = derive2 { name="rorqual.morpho"; version="0.1.1"; sha256="1475yhb5qwj4zpsc4gqqpzs7qvyddxwc63i1f4rhnv6id2hi4msp"; depends=[dplyr magrittr]; }; rorutadis = derive2 { name="rorutadis"; version="0.4.2"; sha256="13a7xj4qw1nd8xgrqhrki3php960lgy9gy38sg4kpvs4j2rwijzc"; depends=[ggplot2 gridExtra hitandrun Rglpk]; }; rosetta = derive2 { name="rosetta"; version="0.2.0"; sha256="0b5xcy9gzw8d71m2pyx1m71mnbdggckhd42c7pzhkivkl79n5wdz"; depends=[car ggplot2 ggrepel gridExtra lavaan lme4 multcompView pander plyr psych pwr rio ufs]; }; rosetteApi = derive2 { name="rosetteApi"; version="1.14.3"; sha256="1fq5wg2rgcqv4x5045zgccpawgi6ac47hykfam9waqjnqy7r4y1a"; depends=[httr jsonlite]; }; rosm = derive2 { name="rosm"; version="0.2.5"; sha256="10n3yzhk29i3mzbcg6nkjqgvwc9n53ax0d7imn9l4a9msa06as07"; depends=[abind curl jpeg plyr png prettymapr rgdal rjson sp]; }; rospca = derive2 { name="rospca"; version="1.0.4"; sha256="1pxm34xsc2610n0i6dwcm4rhn016yqb03f8vrm93r7285c04n4q7"; depends=[elasticnet mrfDepth mvtnorm pcaPP pracma robustbase rrcov rrcovHD]; }; rosqp = derive2 { name="rosqp"; version="0.1.0"; sha256="0975g7p75bq238g7lr200svsqm9i11z7l331r0igm5ycahljrlsm"; depends=[Matrix R6 Rcpp]; }; - rotasym = derive2 { name="rotasym"; version="1.0-6"; sha256="134gpkcryqy4kwnm89d0ihzx4s7m7bs1wypq6mp2ajdnn8qh6zv1"; depends=[Rcpp RcppArmadillo]; }; + rotasym = derive2 { name="rotasym"; version="1.0.7"; sha256="19m47cs96frqavgx8rhr4xjdf1yzd6fm3a7dpskicxgmdis1yxii"; depends=[Rcpp RcppArmadillo]; }; 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]; }; + rotations = derive2 { name="rotations"; version="1.6.1"; sha256="175bbwj1bf58gwsw3721dsh8lsika5aqv787kfyjx041m4lar4zv"; depends=[ggplot2 gridExtra Rcpp RcppArmadillo rgl sphereplot]; }; rotl = derive2 { name="rotl"; version="3.0.10"; sha256="0fh7fmaylv9490yhw6sknv03xmx5isp29mlr0xypyh6mwagngd1q"; depends=[ape assertthat httr jsonlite rentrez rncl]; }; rotor = derive2 { name="rotor"; version="0.2.4"; sha256="0m947mihnxjzsb64p5dgi4v1y1g3c172xlhdg08nzb2z21qg4r73"; depends=[dint R6]; }; roughrf = derive2 { name="roughrf"; version="1.0"; sha256="0nwdynqfb9yzjvi1lykgdkch3b4g09aj8vbd6sf5pyx473s066y4"; depends=[mice nnet randomForest]; }; round = derive2 { name="round"; version="0.12-1"; sha256="0smvyszxvq5c5p1mhkpcjphnmijjxn05n70xvg5syij200gn60fm"; depends=[]; }; roundhouse = derive2 { name="roundhouse"; version="0.0.1"; sha256="142dw9ky6fyp5n8zf5lymx083gi56q6wxj4jm0m8cjb0khiqw2lq"; depends=[httr jsonlite]; }; routr = derive2 { name="routr"; version="0.4.0"; sha256="1vswq7vm80nwb50grr4cs290kbq5lx9b19dq0c2wlp9d2dxk50si"; depends=[assertthat digest httpuv R6 reqres stringi uuid]; }; - rowr = derive2 { name="rowr"; version="1.1.3"; sha256="1f93c2yni956flwnxgphn340pc7p6yagr5xnmhinjgk9kvsd07yh"; depends=[]; }; - roxygen2 = derive2 { name="roxygen2"; version="7.0.2"; sha256="162xag27hwwyadfwm5zpyy15nxwhw2vbhwapx3jmi9cfyryr68sq"; depends=[brew commonmark desc digest pkgload purrr R6 Rcpp rlang stringi stringr xml2]; }; + roxygen2 = derive2 { name="roxygen2"; version="7.1.0"; sha256="00s1wzx5960k8pzgpz4kikjf4k061hyhnd278y65q6n0wzv3d6vy"; depends=[brew commonmark desc digest knitr pkgload purrr R6 Rcpp rlang stringi stringr xml2]; }; roxygen2md = derive2 { name="roxygen2md"; version="1.0.0"; sha256="1gvrfy0sk5qi8d93zxj5f7xgnnw0w38zyxdik4ckf0pkk0zdm27a"; depends=[desc devtools enc rex rlang tibble usethis withr]; }; royston = derive2 { name="royston"; version="1.2"; sha256="1rywc89qzx0hldbq10201bjdhz60pq2gmgd9b9j52mza3w4canjz"; depends=[moments nortest]; }; rpact = derive2 { name="rpact"; version="2.0.6"; sha256="09ikjcvz6jisbl387j5idypwxqn2ir55cq8f19klwc0p0d113wg4"; depends=[Rcpp]; }; rpanel = derive2 { name="rpanel"; version="1.1-4"; sha256="0yzasb4k5jcx3wfsll9k9alyrwc0l1x6pk91nj7cqrdiapw8j519"; depends=[]; }; rpart = derive2 { name="rpart"; version="4.1-15"; sha256="0p5frya963ppn476p5dxs2mnarsalksr6gw9zzmjsn8ikq7bx3ib"; depends=[]; }; - rpart_LAD = derive2 { name="rpart.LAD"; version="0.1.0"; sha256="07mp3gi15h3d5vs27nx2d5nawms3fly2mcqvkr2vb8aq6m377p3b"; depends=[Rcpp rpart]; }; + rpart_LAD = derive2 { name="rpart.LAD"; version="0.1.1"; sha256="08gmfpp7dllqyhxbls7bahrsz0jw4dnqd02j9l23lfs4fvwgb3w8"; depends=[Rcpp rpart]; }; rpart_plot = derive2 { name="rpart.plot"; version="3.0.8"; sha256="0y8054jw44jkjg8ijp3p2grsqwrmsdfzk8vps9ksgm7mgfq5732d"; depends=[rpart]; }; rpart_utils = derive2 { name="rpart.utils"; version="0.5"; sha256="00ahvmly6cdf7qhhcic0dbjlljqq8kbhx15rc7vrkd3hzd55c0im"; depends=[rpart]; }; rpartScore = derive2 { name="rpartScore"; version="1.0-1"; sha256="15zamlzbf6avir8zfw88531zg5c0a6sc5r9v5cy9h08ypf34xf4y"; depends=[rpart]; }; @@ -12910,16 +13050,16 @@ in with self; { rpatrec = derive2 { name="rpatrec"; version="1.0.1"; sha256="0zj461frf6n5s97zq7r52q0blsn2xq2759impgz6v4pr87gmq0si"; depends=[np]; }; rpca = derive2 { name="rpca"; version="0.2.3"; sha256="135q3g8jmn9rwamrc9ss45cnbfyw8kxcbrf0kinw8asz70fihj9z"; depends=[]; }; rpcdsearch = derive2 { name="rpcdsearch"; version="1.0"; sha256="17g3x15qgv2hamlj451sb88i83n8svw5vnmjpijp5cnn5d1jx0d6"; depends=[assertthat combinat dplyr stringr xlsx]; }; - rpdo = derive2 { name="rpdo"; version="0.2.5"; sha256="1504f1i4aldnasnkc596pfpyqcmpvk6p20k46s27j8ld5470w3hn"; depends=[checkr err]; }; - rpf = derive2 { name="rpf"; version="0.62"; sha256="1vgqhwi676bi9jjxljnxblw65b5szjwbp87wnsabc11vfjzc9wki"; depends=[mvtnorm RcppEigen]; }; + rpdo = derive2 { name="rpdo"; version="0.3.0"; sha256="1l3rrkcpfgs6wgir6ls34385ihb179xbpxrbpkf7cnpwy8hc7amk"; depends=[chk]; }; + rpf = derive2 { name="rpf"; version="1.0.3"; sha256="1i2kqd7nx55nn35qnw89xmnqk23x9c8xhkh736c2xg7k2ai84ybl"; depends=[lifecycle mvtnorm Rcpp RcppEigen]; }; rpg = derive2 { name="rpg"; version="1.6"; sha256="1vn5cswrkmw98z1dr0f0yjkz3n8kwvjb4zknqg81fzqsagfc89yx"; depends=[getPass RApiSerialize Rcpp uuid]; }; - rphast = derive2 { name="rphast"; version="1.6.9"; sha256="111m824z7z0lqdj4kk4cp1yfjhx7d5d9463k892dyvgjvkagvi9g"; depends=[]; }; rphylopic = derive2 { name="rphylopic"; version="0.2.0"; sha256="0wmdvdz75bbwhn3qk8ic5lj256ik27d7vxrq9hg8c9rqzygj8wh3"; depends=[crul ggplot2 gridBase jsonlite png]; }; rpicosat = derive2 { name="rpicosat"; version="1.0.1"; sha256="1zj2d6jairmvya91vhv9kpkf34zmzl9vlha5yvfjj0j0apmqc0li"; depends=[]; }; rpinterest = derive2 { name="rpinterest"; version="0.3.1"; sha256="0kkf73byhgzqxw85wda3nh7qsq81pc035vi6z3fhnvb9ssszwakc"; depends=[httr magrittr rjson]; }; rpivotTable = derive2 { name="rpivotTable"; version="0.3.0"; sha256="0ndhsw4nnz6wf0v8dh4sz8867m01jjkzw6aq7f490z1ypa3d9fv5"; depends=[htmlwidgets]; }; rplos = derive2 { name="rplos"; version="0.8.6"; sha256="1i5dzlv57bpddf9qsnq0azc0fsbmzqz9bkrijabp2qwxg0w76mcx"; depends=[crul dplyr ggplot2 jsonlite lubridate plyr reshape2 solrium whisker]; }; rplotengine = derive2 { name="rplotengine"; version="1.0-7"; sha256="1bbciq84l0h6g4qajlcqg3v66g2rspflv6k7x5h5qzwlcb4p4dps"; depends=[xtable]; }; + rpls = derive2 { name="rpls"; version="0.4.0"; sha256="1dhnm8z6cn316p7mnnpc7l3acs2rq0bwc29amqg0fy4wyy54nrgc"; depends=[pcaPP robustbase]; }; rpmodel = derive2 { name="rpmodel"; version="1.0.4"; sha256="1rbygxk6dbi3pqxri5myc7f3y04haa0slpiaa330malg3dw5a9gc"; depends=[rlang]; }; rpms = derive2 { name="rpms"; version="0.4.0"; sha256="10zw0xln0vjrzrilyn67nnw13aadnskzca1930fvb483c691bm36"; depends=[Rcpp RcppArmadillo]; }; rpnf = derive2 { name="rpnf"; version="1.0.5"; sha256="07byg0ym4d2cr6fp74z379jhsaw4c0xrwf622dvhwa4frn4anl60"; depends=[]; }; @@ -12927,7 +13067,8 @@ in with self; { rpostgis = derive2 { name="rpostgis"; version="1.4.3"; sha256="04x5qdz0kznxnp9kygp0m2rjxyhqfz3mc81mcr4aw6cy5p4zp9aq"; depends=[DBI raster rgeos RPostgreSQL sp]; }; rpostgisLT = derive2 { name="rpostgisLT"; version="0.6.0"; sha256="1adwpkfndm6n3s9xcx8zrwnj6bmgvq4nzs072fnl5i6kjy6ngjm6"; depends=[adehabitatLT DBI htmltools leaflet lubridate magrittr mapview rpostgis RPostgreSQL sf shiny shinyWidgets sp]; }; 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.3"; sha256="14jc0bszb3cqfqqx5sdvfb3bddrxsifmf97x7cj1lg6pm85wdpvi"; depends=[data_table dplyr ggplot2 lazyeval lubridate magrittr survival tidyr]; }; + rpredictit = derive2 { name="rpredictit"; version="0.0.2"; sha256="1gsfcs5l83p4x0glhnq5hidh5rxwipklsj0nzkxaim65w9kqgx30"; depends=[dplyr DT dygraphs httr jsonlite magrittr quantmod shiny stringr xts]; }; + rprev = derive2 { name="rprev"; version="1.0.4"; sha256="1dzqbvfx3fcgfz3b18wwaaprvp0szjfshm8dgmj3r4vyzx71v9lv"; depends=[data_table dplyr ggplot2 lazyeval lubridate magrittr survival tidyr]; }; rprime = derive2 { name="rprime"; version="0.1.0"; sha256="1v6n1qi0i7x8xgizbyvp1mnwc316lsan4rvam44fgjj45fcd79gd"; depends=[assertthat plyr stringi stringr]; }; rprintf = derive2 { name="rprintf"; version="0.2.1"; sha256="0rwqpln0igxb4m6d6jyp7h3shfb8sbp0kj7cgkffjp88hn9qm4h3"; depends=[stringi]; }; rprojroot = derive2 { name="rprojroot"; version="1.3-2"; sha256="12r3fdxmi2pmwn6ic3rhg0b20ll5z420m0d8fziv1n21961namnz"; depends=[backports]; }; @@ -12936,14 +13077,14 @@ in with self; { 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.2"; sha256="0zfsrxavyd65x35vg8vwv0fy07b1byf189avxidwfypxm0vr1x8y"; depends=[quantreg regpro]; }; - rqdatatable = derive2 { name="rqdatatable"; version="1.2.5"; sha256="1w4ljwz5lzgry1sn2wgbzccm0d5v49dwdljqw4kamynw1nqi7pby"; depends=[data_table rquery wrapr]; }; - rquery = derive2 { name="rquery"; version="1.4.2"; sha256="0l4747d2kcalq9c5ks18np0qsg7qbvqz0x7nrgh2mi2m9k0jb2rb"; depends=[wrapr]; }; + rpubs = derive2 { name="rpubs"; version="0.2.2"; sha256="18cnzhcvm7gx4k01ysqay53smrf8xqlbaszq41mny5c7qqh1fvpz"; depends=[rvest xml2]; }; + rqPen = derive2 { name="rqPen"; version="2.2.1"; sha256="0k6vk4gvhqjg8am6i48zbhbb6fzlhwy5xi0dmnszm6dhbfv7jvmx"; depends=[quantreg regpro]; }; + rqdatatable = derive2 { name="rqdatatable"; version="1.2.7"; sha256="1p41nc54h4fq57ps1ilm3sq3qr3xhi0bxxhl80ylai0qmb445jd4"; depends=[data_table rquery wrapr]; }; + rquery = derive2 { name="rquery"; version="1.4.4"; sha256="1ccy9pmgbm4q3kljgx1pjhg2059pnb6jbnxq63z1fhnb59rm4nya"; depends=[wrapr]; }; rr = derive2 { name="rr"; version="1.4"; sha256="1c2h6ibjfwrjfqh1if3c90pdh0g2rf3p71j4p9w23xbbrx2l80pl"; depends=[arm coda magic MASS]; }; rr2 = derive2 { name="rr2"; version="1.0.2"; sha256="099vjg91ni2bnxlra18pvgsvzrl28zrj639cdjrh3wkpqv99d04q"; depends=[ape lme4 Matrix nlme phylolm]; }; rrBLUP = derive2 { name="rrBLUP"; version="4.6.1"; sha256="1ny48ra25rzx3k69pmzpd31ka2zhqyqiq1v7ann862j3ris0w8z9"; depends=[]; }; rrat = derive2 { name="rrat"; version="1.0.0"; sha256="1j1jd32pgggn5cqv66l63sw5p4hblgpznf33wd0zdbfapwy8rx4r"; depends=[quantreg]; }; - rray = derive2 { name="rray"; version="0.1.0"; sha256="0x4wavvjsiy8b9bhgxddisx82k6q52qhngr2am50bf38d3x2n58h"; depends=[glue Rcpp rlang vctrs xtensor]; }; rrcov = derive2 { name="rrcov"; version="1.5-2"; sha256="0m62k58nabw7hjz1qyyf9a0d6lvcz5vcvpksjnq93zcfra9inr57"; depends=[lattice mvtnorm pcaPP robustbase]; }; rrcov3way = derive2 { name="rrcov3way"; version="0.1-18"; sha256="1gpjmmdca2waqks0qykj59p50v6pf1zgl81m5lhbrhpcr4rdr63l"; depends=[nnls robustbase rrcov]; }; rrcovHD = derive2 { name="rrcovHD"; version="0.2-6"; sha256="03dr42np7a0yl3hi2iz4xp5b6yrazx6vlsjrby6fcn9r8y1fmac9"; depends=[pcaPP pls Rcpp robustbase robustHD rrcov spls]; }; @@ -12951,38 +13092,36 @@ in with self; { rrd = derive2 { name="rrd"; version="0.2.2"; sha256="104iz2y49vzm92a8nrvgzrjyljxl467mp1hjnjmzl4rhf9kl809y"; depends=[assertthat tibble]; }; rrecsys = derive2 { name="rrecsys"; version="0.9.7.3.1"; sha256="1qnjriv1xq4gjjhzz8jxrbk88mw5xddl2l2i4bmfhnxhi51d2rk3"; depends=[ggplot2 knitr MASS Rcpp registry]; }; rredis = derive2 { name="rredis"; version="1.7.0"; sha256="0wzamwpmx20did8xj8x9dllri2ps83viyqjic18ari7i4h1bpixv"; depends=[]; }; - rredlist = derive2 { name="rredlist"; version="0.5.0"; sha256="12dqilcwyxad5yjz8gh29ycwj2rbm1g0hxfsqkl7zsjaz5lbcka0"; depends=[crul jsonlite]; }; + rredlist = derive2 { name="rredlist"; version="0.6.0"; sha256="0cl3wbhx96a118f7yld7jf2jq8wimqqvd1apglshyvz3yj03dlxy"; depends=[crul jsonlite]; }; rrefine = derive2 { name="rrefine"; version="1.0"; sha256="1lh3vddrp5k9bhz5spv93w0qm9z5lskpdgxfksys0l3275hzx1lm"; depends=[httr readr rlist]; }; rreg = derive2 { name="rreg"; version="0.2.1"; sha256="05c2yj58zn43zkmqp4iyblsixsq76hsjkchffl5rkqynvgxi0qzi"; depends=[directlabels ggplot2]; }; - rrepast = derive2 { name="rrepast"; version="0.7.0"; sha256="1s596sk993aam5rsb4as2y3n5wcgjlnb25b29l59z0xks1v04mnc"; depends=[digest doParallel foreach ggplot2 gridExtra lhs rJava sensitivity xlsx]; }; + rrepast = derive2 { name="rrepast"; version="0.8.0"; sha256="1x8xda9cndxri2hhd2ihxmjjy0x74r0dh3953dfh7gvj4slaf0rl"; depends=[digest doSNOW foreach ggplot2 gridExtra lhs rJava sensitivity xlsx]; }; rres = derive2 { name="rres"; version="1.1"; sha256="138m26ya119805b1akwski0hf1ypiqsqjlkrm9p0l2x22zrv1n60"; depends=[kernlab Rcpp]; }; rriskDistributions = derive2 { name="rriskDistributions"; version="2.1.2"; sha256="1d9dwgw8la8wwq9cdnl7qibkzbdl4cj0qvf05x7w13ip973dwpaq"; depends=[eha mc2d msm tkrplot]; }; rrlda = derive2 { name="rrlda"; version="1.1"; sha256="06n9jah190cz25n93jlb5zb0xrx91bjvxgswwdx9hdf0fmwrpkvz"; depends=[glasso matrixcalc mvoutlier pcaPP]; }; rroad = derive2 { name="rroad"; version="0.0.5"; sha256="09q5r9wq3vm5wy5aigx9wffv7m0njlp3sma1djm6cp7hhwgss0nj"; depends=[]; }; - rromeo = derive2 { name="rromeo"; version="0.1.0"; sha256="0dab3gcdpc5w9nxjw02348vj8cbrr8324aw982kjlrwkpjnvmfv5"; depends=[httr xml2]; }; + rromeo = derive2 { name="rromeo"; version="0.1.1"; sha256="1jjk5b41qg22a0zpjha2p2mfcb5q00gicqlxhkahjbj49q0c3mn9"; depends=[httr xml2]; }; rrpack = derive2 { name="rrpack"; version="0.1-11"; sha256="1bchha6dbkgc1raiks22cjmqzsias0c0frz8il67napkgmwlqk6d"; 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]; }; + rrtable = derive2 { name="rrtable"; version="0.2.1"; sha256="1hblrxn7vixcp32j3cij0xrkzvk31agi9dqgxrimcrzs7gjcd1j5"; depends=[devEMF editData flextable ggplot2 ggpubr magrittr moonBook officer purrr readr rlang rmarkdown rvg shiny shinyWidgets stringr ztable]; }; rrum = derive2 { name="rrum"; version="0.2.0"; sha256="0w0f2n14if2b8x7n6v8y8q2vghd8j7xm1xhpxnvy3z50flinwgm7"; depends=[Rcpp RcppArmadillo rgen simcdm]; }; rsMove = derive2 { name="rsMove"; version="0.2.7"; sha256="0an5kknfap7hrg62gvdvrylx79p6fjdmbryhzlrj60i8n7cnc1c1"; depends=[caret ggplot2 lubridate plyr pryr raster Rcpp RCurl sp]; }; rsae = derive2 { name="rsae"; version="0.1-5"; sha256="1f3ry3jwa6vg2vq2npx2pzzvfwadz8m48hjrqjk860nfjrymwgx5"; depends=[]; }; - rsample = derive2 { name="rsample"; version="0.0.5"; sha256="0lkwhydb8csg24zkpsblyykzfsjqr930h46kbpm2wk9kgygkfspd"; depends=[dplyr furrr generics purrr rlang tibble tidyr tidyselect]; }; + rsample = derive2 { name="rsample"; version="0.0.6"; sha256="1va9zr2bbx7yld7am141d3xjhzcndlgng9pyq6i2bc8kqbxvw6kj"; depends=[dplyr furrr generics purrr rlang tibble tidyr tidyselect]; }; rsatscan = derive2 { name="rsatscan"; version="0.3.9200"; sha256="00vgby24jknq8nl7rnqcwg7gawcxhwq8b7m98vjx2hkqx39n4g21"; depends=[foreign]; }; - rscala = derive2 { name="rscala"; version="3.2.16"; sha256="0c07lq3qhg4h5n0g0s1i11q5jrlijvidrdy3h1ln262mn2wqn8az"; depends=[]; }; - rscielo = derive2 { name="rscielo"; version="1.0.0"; sha256="005nmi18831a2krl2xhj74ya9mfjq8zzccjafnfxha89x8ygxsa3"; depends=[dplyr httr magrittr purrr rvest stringr tibble xml2]; }; + rscala = derive2 { name="rscala"; version="3.2.19"; sha256="1wq0wrdbh0gi0bx4m9526qlbjm7nxxqgc17ikdx5mrhcy2f61hjk"; depends=[]; }; rscimark = derive2 { name="rscimark"; version="1.0"; sha256="1jsjz4d5bnxb90qqzz42m4nyvm8d8w8bs0m1r5g2n78zmckqb8vy"; depends=[checkmate]; }; rsconnect = derive2 { name="rsconnect"; version="0.8.16"; sha256="05ii0p0p7xpf8z0c1594s5q7wpwcs7lmlddrd67s5p2ka5m8qwiz"; depends=[curl digest jsonlite openssl packrat rstudioapi yaml]; }; - rscontract = derive2 { name="rscontract"; version="0.1.0"; sha256="0hhhndvrk9z6izdq4vh95bi9879k0svgpmhajrnm20xc5sb136jf"; depends=[]; }; + rscontract = derive2 { name="rscontract"; version="0.1.1"; sha256="1s19p9cga0qm1diblqf3rmcbm3agiimq4lhfgk004cg7rhaa1lyh"; depends=[]; }; rscopus = derive2 { name="rscopus"; version="0.6.6"; sha256="0kl6rv0j2396b8izvy0lp1f588il6w3yhq6d4swv8x8z14rsgcpw"; depends=[dplyr glue httr jsonlite plyr tidyr]; }; rscorecard = derive2 { name="rscorecard"; version="0.14.0"; sha256="0r951j0n841ihlig2aw76vxdd31zbx98k4sz92nmi8zb69669d5w"; depends=[dplyr httr jsonlite lazyeval magrittr purrr tidyr tidyselect]; }; rsdepth = derive2 { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; }; rsdmx = derive2 { name="rsdmx"; version="0.5-13"; sha256="1lgy5nbrl4frfn805lghyx1gl2h8lkvgk07365jyvb8rzfcl43av"; depends=[plyr RCurl XML]; }; rseedcalc = derive2 { name="rseedcalc"; version="1.3"; sha256="18zmpjv6g8f7pmvqlp6khxyys9kdnq5x4zxwb6gwybsh4jxrymkp"; depends=[]; }; rsem = derive2 { name="rsem"; version="0.4.6"; sha256="16nsbp4s20396h2in0zymbpmsn24gqlbik0vgv86zhy1yg1rz9ia"; depends=[lavaan MASS]; }; - rsf = derive2 { name="rsf"; version="0.2.0"; sha256="0p9h61nvr5p42c7cjqgsvv45ycircw8jd4h3075rly08jbp02nim"; depends=[bookdown knitr magrittr rlang usethis yaml ymlthis]; }; - rsgcc = derive2 { name="rsgcc"; version="1.0.6"; sha256="12f8xsg6abmhdgkrrc8sfzmv4i1pycq1g0jfad664d17yciw7rhh"; depends=[biwt cairoDevice fBasics gplots gWidgets gWidgetsRGtk2 minerva parmigene snowfall stringr]; }; - rsimsum = derive2 { name="rsimsum"; version="0.7.0"; sha256="1c63nzvyrnjva99hh3ikijpgsmnks8y8qsqxshxn9s1gjix7il5p"; depends=[checkmate ggplot2 ggridges rlang scales]; }; + rsf = derive2 { name="rsf"; version="0.2.1"; sha256="0bmx9c8cxnn46bwr2za74kn6z2hyjdhj0i3c58c25pqhggyymxkb"; depends=[bookdown knitr magrittr rlang usethis yaml ymlthis]; }; + rsimsum = derive2 { name="rsimsum"; version="0.8.0"; sha256="0nszqffzh9lnds6grjpjyvv78ykvk4aj3s1dwabxi43qqk1p02f1"; depends=[checkmate ggplot2 ggridges rlang scales]; }; rsinaica = derive2 { name="rsinaica"; version="0.6.1"; sha256="1ba19b2fgnnl50qp6hgjppgxbadghq68qap9f0m51k2k3ijgfiwn"; depends=[dplyr httr jsonlite lubridate stringr]; }; rskey = derive2 { name="rskey"; version="0.4.1"; sha256="0l9z5zbii4wi7da6cl9mr62zn72pc3dgfhk6dp8sjx4jbzpa94s3"; depends=[berryFunctions miniUI rstudioapi shiny]; }; rsleep = derive2 { name="rsleep"; version="1.0.1"; sha256="0kjb5sgv1y50cqg54dy5cx9ngr64hx2bhfav314vm2alnxsk19jh"; depends=[edfReader ggplot2 jsonlite phonTools signal]; }; @@ -12990,49 +13129,50 @@ in with self; { rslurm = derive2 { name="rslurm"; version="0.5.0"; sha256="0dpxglcsqa2k0nak10515ga13c46rb4mrbpbr3gv7xckg6347zqg"; depends=[whisker]; }; rsm = derive2 { name="rsm"; version="2.10"; sha256="0a6bxrb0qad40lnigqjv2pnwwzcwi1rcmh9gb1a1b00k1n3mnmlc"; depends=[estimability]; }; rsnps = derive2 { name="rsnps"; version="0.3.0"; sha256="1ym58gqpvn708228pbkq1klvl60a60bwxwm0arzzad3wh1wansxj"; depends=[crul data_table jsonlite plyr stringr XML xml2]; }; - rsoi = derive2 { name="rsoi"; version="0.5.1"; sha256="17b78m3m0n191xbds70zvpwk27xw70phm66p6i26smc1zwg94y89"; depends=[curl memoise]; }; + rsoi = derive2 { name="rsoi"; version="0.5.2"; sha256="1dzmxsabldak6qmivxmfq98vcd7720xagnqrnxdksavgixp6w54h"; depends=[curl memoise]; }; rsolr = derive2 { name="rsolr"; version="0.0.9"; sha256="1mxvzb7wvm1agv35r82pr1hxa3fimixcwf36j98qjlxj9p7valrw"; depends=[BiocGenerics graph RCurl restfulr rjson S4Vectors XML]; }; rspa = derive2 { name="rspa"; version="0.2.5"; sha256="0jvrr3jaw66zqi5pal9dycpac24dn9v7lf2m63q01wmd8m3mlnv9"; depends=[lintools validate]; }; - rsparkling = derive2 { name="rsparkling"; version="0.2.18"; sha256="0lhq9jxxib2krl298hy3sglh5lm5lyibknigpbxx68pn71jwp1hm"; depends=[h2o sparklyr]; }; - rsparse = derive2 { name="rsparse"; version="0.3.3.4"; sha256="1n4h33vrbgia9pm04clji3qgvnamn53v334mj7z1ksx121avli38"; depends=[data_table float lgr Matrix mlapi Rcpp RcppArmadillo RhpcBLASctl]; }; + rsparkling = derive2 { name="rsparkling"; version="0.2.19"; sha256="1rb43lslhlg8jpniirzch8gnl86x6d3shcfp9fpxm0qd3fqrlm6z"; depends=[h2o sparklyr]; }; + rsparse = derive2 { name="rsparse"; version="0.4.0"; sha256="1blg59gsidh0sn6yy761pisz2phml0hzgqc24s5s8q9q903rddr9"; depends=[data_table float lgr Matrix Rcpp RcppArmadillo RhpcBLASctl]; }; + rspiro = derive2 { name="rspiro"; version="0.2"; sha256="1gjil39ib9p86a7r3i03h01x2dsc9y283rnp65xvavrzmmgz87b4"; depends=[]; }; rsppfp = derive2 { name="rsppfp"; version="1.0.4"; sha256="123yv54i58xj4wx9n08qp50mm4l271fm1zhzimrxx22wn2bg8zy5"; depends=[doParallel dplyr foreach igraph stringr tidyr]; }; rsq = derive2 { name="rsq"; version="1.1"; sha256="0pvnyf875jybid16mg1y3dmnlrk1vahckhr5zaai1a0k4i6mh4jf"; depends=[MASS]; }; rstack = derive2 { name="rstack"; version="1.0.0"; sha256="19vbfmkd6ymadah1y1w5rn52f4hviddccyc6qj2cv5viqwbwws2z"; depends=[R6]; }; rstackdeque = derive2 { name="rstackdeque"; version="1.1.1"; sha256="0i1qqbfj0yrqbkad8bqc1qlxmyxpn7zycbnq83cdmfbilcmi87ql"; depends=[]; }; - rstan = derive2 { name="rstan"; version="2.19.2"; sha256="1nh8sm97ck1fwmqj5ia70p5w8alcagx7y2956a3n5k97qfwwxr1i"; depends=[BH ggplot2 gridExtra inline loo pkgbuild Rcpp RcppEigen StanHeaders]; }; - rstanarm = derive2 { name="rstanarm"; version="2.19.2"; sha256="1k4sal4pmyyfb0n9k0x6n7kd04xq75scr6j357vpryaz8dfn46iz"; depends=[bayesplot BH ggplot2 lme4 loo Matrix nlme Rcpp RcppEigen rstan rstantools shinystan StanHeaders survival]; }; + rstan = derive2 { name="rstan"; version="2.19.3"; sha256="128ndwjrhf8b1qvvqz4bl13qlm8718z9qs5ryc6gsdr3vk65s0np"; depends=[BH ggplot2 gridExtra inline loo pkgbuild Rcpp RcppEigen StanHeaders]; }; + rstanarm = derive2 { name="rstanarm"; version="2.19.3"; sha256="0gxjq8bdlvdd8kn3dhp12xlymdab036r7n12lzmd3xlkl4cnxq3s"; depends=[bayesplot BH ggplot2 lme4 loo Matrix nlme Rcpp RcppEigen RcppParallel rstan rstantools shinystan StanHeaders survival]; }; rstanemax = derive2 { name="rstanemax"; version="0.1.1"; sha256="0yvinnz0ybrarl1p36ibaiflava1hhdnh4avjgc5iq0b3nr6x42g"; depends=[BH dplyr ggplot2 magrittr purrr Rcpp RcppEigen rstan rstantools StanHeaders tidyr]; }; rstantools = derive2 { name="rstantools"; version="2.0.0"; sha256="1il0pn4ksbdkska5fmhvgaicvwnnc6cs08g6ags9fj1xkjiqmrsa"; depends=[desc Rcpp]; }; rstap = derive2 { name="rstap"; version="1.0.3"; sha256="176z39k54l5r60md6wziz828c46alv2pmqivvmhvb358crrb8x7n"; depends=[abind bayesplot BH dplyr ggplot2 lme4 loo Matrix nlme pracma Rcpp RcppEigen rstan rstantools StanHeaders]; }; - rstatix = derive2 { name="rstatix"; version="0.3.1"; sha256="0iiv0l3rm5b2y018hm65n4385iq9ixwj4qgf1n4f71y0hl36bg91"; depends=[broom car corrplot dplyr magrittr purrr rlang tibble tidyr tidyselect]; }; + rstatix = derive2 { name="rstatix"; version="0.4.0"; sha256="099kaldzlkyxg7af4wrhpqp07d3ha1bm9zk4fcdkgqw9nknbp00z"; depends=[broom car corrplot dplyr magrittr purrr rlang tibble tidyr tidyselect]; }; rstatscn = derive2 { name="rstatscn"; version="1.1.3"; sha256="07w7ixq1faq7mif2ksxcgl8n6ali9h0wx0nb2yz4kbdgvz68r7b9"; depends=[httr jsonlite]; }; rstiefel = derive2 { name="rstiefel"; version="1.0.0"; sha256="0g09fpp3432v78gqgn0hiva6zqr8yqn379wz4428wanmiskqr3f0"; depends=[]; }; rstpm2 = derive2 { name="rstpm2"; version="1.5.1"; sha256="0p1zqqjss8i5wca4qvr56d6p9ak20ki4cfbxja1wrhkp4kii29r6"; depends=[bbmle deSolve fastGHQuad mgcv Rcpp RcppArmadillo survival]; }; - rstream = derive2 { name="rstream"; version="1.3.5"; sha256="1wprsnwl63cc4a6j5h18r09wlh32bq5z6hj6r5klp7rkpjchsplp"; depends=[]; }; - rstudioapi = derive2 { name="rstudioapi"; version="0.10"; sha256="15mbw607ncdf53mgga76n3va5zzdcjqz14nb0jcn9axwccqamic0"; depends=[]; }; - rsubgroup = derive2 { name="rsubgroup"; version="0.6"; sha256="1hz8rnbsl97ch6sjwxdicn2sjyn6cajg2zwmfp03idzpb3ixlk7l"; depends=[foreign rJava]; }; + rstream = derive2 { name="rstream"; version="1.3.6"; sha256="1mr869hff5wdpw6a7x71366y8dxf9vljbb11fssfkhcf7hm2ipnj"; depends=[]; }; + rstudioapi = derive2 { name="rstudioapi"; version="0.11"; sha256="0srh0m4mw4k6s7spwb84l4cx4xnn04cp5cjxi0fwza7bwavpzq0k"; depends=[]; }; rsurface = derive2 { name="rsurface"; version="1.1.0"; sha256="1pymbgvr72nqd66wap5wrcizzx2k9bfr6vkxv6dkvjmi8q7jl2gv"; depends=[plotly rsm]; }; rsurfer = derive2 { name="rsurfer"; version="0.2"; sha256="14zd8fhak12yha6miwb84085722v5ipk8lagijhc6af291kp70i9"; depends=[gdata stringr]; }; - rsvd = derive2 { name="rsvd"; version="1.0.2"; sha256="0fia77y5fxnhwkcxlgp98ygb8fdfraky75x80hkf7kvvpwc5rzn8"; depends=[Matrix]; }; + rsvd = derive2 { name="rsvd"; version="1.0.3"; sha256="1fvrw46fl5xb2akaa4mp8nja4h7nn4bdhnjdrk22fsdfqc7hwmhk"; depends=[Matrix]; }; rsvg = derive2 { name="rsvg"; version="1.3"; sha256="11mccgf6hfskg45wqc114sx3qy2r494y6axdf73z6xwhs1wpm97g"; depends=[]; }; rsyslog = derive2 { name="rsyslog"; version="1.0.1"; sha256="1i33bpv894jk7cixsvn85h1g532zj39f8dfqq8cyzgsav9wba2y4"; depends=[]; }; rt_test = derive2 { name="rt.test"; version="1.18.7.9"; sha256="0ywkdjvfzmrmmsfkz4jbhwzbzv7wivx80xy8wr92dch1862h6ias"; depends=[]; }; rt3 = derive2 { name="rt3"; version="0.1.2"; sha256="1fqbymkz4csavkxrs26glzrh0kw3qy9x5smgddgda9a1dxh9ljkm"; depends=[]; }; rtape = derive2 { name="rtape"; version="2.2"; sha256="0q7rs7pc1k1kayr734lvh367j5qig2nnq5mgak1wbpimhl7z3wm7"; depends=[]; }; - rtdists = derive2 { name="rtdists"; version="0.10-0"; sha256="0dm4nx94xfg6bs7v2m4makk4qx4zw1xh49nihpsaj8vx1ng4lp89"; depends=[evd gsl msm Rcpp]; }; + rtdists = derive2 { name="rtdists"; version="0.11-2"; sha256="0fap15bkxn2azd5a4j3q9mxpif5ff3y2vb8rm4xnh8l0sl1lw7cs"; depends=[evd gsl msm Rcpp]; }; rtematres = derive2 { name="rtematres"; version="0.2"; sha256="1d0vrprvnlk4hl2dbc6px9xn9kx9d1qvlqxd798hzda6qg5wwvf2"; depends=[gdata plyr RCurl XML]; }; + rtemps = derive2 { name="rtemps"; version="0.4.0"; sha256="04ipklqsx4c7h95zj76g55h5kq33mabkydzr9lcvsfrc7ms7jjmi"; depends=[bookdown DT ggplot2 knitr rmarkdown xfun]; }; rtext = derive2 { name="rtext"; version="0.1.21"; sha256="0j2jfz0mz9552dwa78d527lxipmj5ql8q8np8qq5jw4ka6wj5lbs"; depends=[digest hellno magrittr R6 Rcpp RSQLite stringb]; }; - rtf = derive2 { name="rtf"; version="0.4-14"; sha256="1v4vb2ijqlbqcjqdhf85kfzs67whkhm6ygp5cw8xa6qw179vkgd5"; depends=[R_methodsS3 R_oo]; }; - rtfbs = derive2 { name="rtfbs"; version="0.3.15"; sha256="1447wjdjcc18sj6ngh22zfc50jk8zshdgkwp1d7ba4n5qsj7b2fl"; depends=[rphast]; }; - rticles = derive2 { name="rticles"; version="0.13"; sha256="0di9vdvz4kcdzahghbc77wpgb00c8lb3fjdsn1jrnr4whznl5fiq"; depends=[knitr rmarkdown tinytex xfun yaml]; }; - rtide = derive2 { name="rtide"; version="0.0.5"; sha256="0ns79xkkl141bbns8zlvx3gf48k4a03qa21pjyhnhgkm9lsihwfc"; depends=[abind checkr lubridate]; }; + rtf = derive2 { name="rtf"; version="0.4-14.1"; sha256="032ff0yavqmd2d9svgwkmvxwh0cxjbac6pj48v4cshi898f02rhh"; depends=[R_methodsS3 R_oo]; }; + rticles = derive2 { name="rticles"; version="0.14"; sha256="1377fib4asazhhki4aajvld0wa35vd3zjvyl3lf2hjm2qk3vyak7"; depends=[knitr rmarkdown tinytex xfun yaml]; }; + rtide = derive2 { name="rtide"; version="0.0.7"; sha256="1l2fradbknlbgsm6nj89k9bhg7fxdrh0wcnar0mdgqqcr8qzs8hk"; depends=[abind chk dttr2 tibble]; }; rtiff = derive2 { name="rtiff"; version="1.4.7"; sha256="0l0chjbn8kipnhi37zshphxmxga6id39rm5gzz5gjrv8bnaaxxqb"; depends=[pixmap]; }; rtika = derive2 { name="rtika"; version="1.23"; sha256="0m27vv4jb39lqnv0cnx6wznn3h8ia2if0np670wf1345v9i4ygyh"; depends=[curl digest rappdirs sys]; }; rtimicropem = derive2 { name="rtimicropem"; version="1.4.0"; sha256="0z6bnzks8mcb871m3z5b3cd883hj1i17swjgly005hvwbvi9h61f"; depends=[changepoint dplyr fs ggplot2 knitr lazyeval lubridate R6 rbokeh readr stringr tibble tidyr]; }; rtip = derive2 { name="rtip"; version="1.1.1"; sha256="0lfny8nvgnf90xsmgmr32nzjbw8117m4vw7d0bc3xm4pzpnymjdq"; depends=[boot ggplot2 mvtnorm plyr rootSolve]; }; + rtist = derive2 { name="rtist"; version="1.0.0"; sha256="0p4jlz0z0nbvmixdrym6nqagz2i28zbsijcj785rd6wiy72d2hg5"; depends=[]; }; rtk = derive2 { name="rtk"; version="0.2.5.8"; sha256="1ybppi5h86gb324hlkx91m2kk2dw7hi5k5l2fh5h1xnlqjv55n0b"; depends=[Rcpp]; }; rtkore = derive2 { name="rtkore"; version="1.5.5"; sha256="0srk0ih4gbmhb1pl6zf8sjwrkdmgws9cl1397fcqv6l3bc376622"; depends=[inline Rcpp]; }; - rtmpt = derive2 { name="rtmpt"; version="0.1-17"; sha256="0hp4hia8fp9kbs25hgbjv2nr3h0lkn4v4b0j0c4a9bfm2mrvy0l9"; depends=[coda data_table LaplacesDemon loo stringr truncnorm]; }; + rtmpt = derive2 { name="rtmpt"; version="0.1-19"; sha256="1cpakgy0rmy27b14krmgdrf1fi0mar4k5rklnvmphivid8150gzn"; depends=[coda data_table loo matrixcalc stringr truncnorm]; }; rtop = derive2 { name="rtop"; version="0.5-14"; sha256="1wwllckginnzisapbklpsizy47db24r83xahq4qsd8zhqvv9yj33"; depends=[gstat sp]; }; rtrek = derive2 { name="rtrek"; version="0.3.0"; sha256="0nfkmcyrb1gbgjjy62ffjlg6x93zy4s4qg6ii98gjbn0jp6pcj1j"; depends=[downloader dplyr ggplot2 jpeg jsonlite magrittr memoise purrr rvest tibble tidyr xml2]; }; rtrends = derive2 { name="rtrends"; version="0.1.0"; sha256="04xdggf36m294drb9z8khdjr6fgsg4bwkb4mmbbvqfzjpq4mq4y1"; depends=[dplyr lubridate tidyr]; }; @@ -13040,46 +13180,48 @@ in with self; { rts = derive2 { name="rts"; version="1.0-49"; sha256="086zlmcjsv7a38k1jfzq2vhlmx7nivhffcz83i57hl6wbkjl7gv2"; depends=[raster RCurl sp xts zoo]; }; rtsdata = derive2 { name="rtsdata"; version="0.1.2"; sha256="0h0zk8vy21xh0n6pcipgml0b0f4pfi94q6hjdqkxd3xsa6a5scra"; depends=[alfred anytime brotli curl data_table mongolite Quandl quantmod xts zoo]; }; rtson = derive2 { name="rtson"; version="1.3"; sha256="1gwvk7nmq9bz90jy1zh7lhr735iw804pmwxykdpaigcsnxk7zx03"; depends=[R6]; }; - rtsplot = derive2 { name="rtsplot"; version="0.1.2"; sha256="1y2is2n2r0xz71ajvxqc22qg8dzidrzq475a7nc7xjgfriayx535"; depends=[quantmod RColorBrewer xts zoo]; }; + rtsplot = derive2 { name="rtsplot"; version="0.1.3"; sha256="0va6ir0bmpnw4ibvfh2j4z01flg72dpxn7q10sdsdj304hb0g4in"; depends=[quantmod RColorBrewer xts zoo]; }; rtweet = derive2 { name="rtweet"; version="0.7.0"; sha256="05pbvxm2vmf6935b9s6663k3aifnkr3m52wh2jvnplmrwyrfpn9n"; depends=[httpuv httr jsonlite magrittr progress Rcpp tibble]; }; rtype = derive2 { name="rtype"; version="0.1-1"; sha256="0wjf359w7gb1nrhbxknzg7qdys0hdn6alv07rd9wm6zynnn1vwxy"; depends=[]; }; - rtypeform = derive2 { name="rtypeform"; version="2.0.0"; sha256="00as49l9plncc25bn93x36hpxnxachsh382ivhq6k9d9gi8424c0"; depends=[dplyr glue httr jsonlite lubridate purrr tibble tidyr]; }; - rubias = derive2 { name="rubias"; version="0.3.0"; sha256="18sivq5ilq14mqs62vh6l24fcayvd7ffdbva94ir6n0gx9axmm22"; depends=[dplyr gtools magrittr Rcpp RcppParallel readr rlang stringr tibble tidyr]; }; + rtypeform = derive2 { name="rtypeform"; version="2.0.1"; sha256="09lcfdkwk274zxkbvg4l1v62xcb9p98qix6rg8ksniz35230f6f0"; depends=[assertthat dplyr glue httr jsonlite lubridate purrr tibble tidyr]; }; + rubias = derive2 { name="rubias"; version="0.3.1"; sha256="1x7h38lsdq03cd72ffawr8mpnf1c1a16sxgmz3c52fn3b9n28jxm"; depends=[dplyr gtools magrittr Rcpp RcppParallel readr rlang stringr tibble tidyr]; }; rucm = derive2 { name="rucm"; version="0.6"; sha256="1n6axmxss08f2jf5impvyamyhpbha13lvrk7pplxl0mrrrl5g0n8"; depends=[KFAS]; }; - rucrdtw = derive2 { name="rucrdtw"; version="0.1.3"; sha256="0wbh9zbgqf5bk1ix5qry18lhgdqk90pn5xnv401268gldjy4z777"; depends=[Rcpp]; }; - rugarch = derive2 { name="rugarch"; version="1.4-1"; sha256="05dlzrv9ahfwqq5bmd9vk13zvzwgf1zyq65kp3qf94v9sp5xr5kx"; depends=[chron expm ks nloptr numDeriv Rcpp RcppArmadillo Rsolnp SkewHyperbolic spd xts zoo]; }; + rucrdtw = derive2 { name="rucrdtw"; version="0.1.4"; sha256="0865x8i2n63xjbq0pzalm4gd6rpg72yrcsm4rw40a3kzy2svvnlm"; depends=[Rcpp]; }; + rugarch = derive2 { name="rugarch"; version="1.4-2"; sha256="12rrxdj5am3qjg1iya6g8a3ak167dd4sqgfmpa4ims588gj5szkm"; depends=[chron expm ks nloptr numDeriv Rcpp RcppArmadillo Rsolnp SkewHyperbolic spd xts zoo]; }; ruimtehol = derive2 { name="ruimtehol"; version="0.2.3"; sha256="073qb7g9j6zkk6hxf78y7ymnmc1s4hbjxxlymjhxpvjfbg4xpslw"; depends=[BH Rcpp]; }; ruin = derive2 { name="ruin"; version="0.1.1"; sha256="124xs1c2mjfy6z0bp83rwkqw2y73g77xwn3q4yd2xw0v2frnpvpz"; depends=[ggplot2]; }; - ruler = derive2 { name="ruler"; version="0.2.1"; sha256="01b5qn6b69hhl9df6sr187w16z5hj6vxb8yi77y2rghkcrnm12i9"; depends=[dplyr keyholder rlang tibble tidyr]; }; + ruler = derive2 { name="ruler"; version="0.2.2"; sha256="190yvz6hpqmcjydcjy69fr6jya3la325fpz1a5g38xhrj6a9v4kn"; depends=[dplyr keyholder rlang tibble tidyr]; }; + runes = derive2 { name="runes"; version="0.0.1"; sha256="0aq4wlxwc00a39lgfvr2pyhh7hcrb3n19mm83qvr8kyz30dhghx9"; depends=[]; }; runittotestthat = derive2 { name="runittotestthat"; version="0.0-2"; sha256="15zdcvqkr5ivq6wk6dw8k6diginc6z7mdc18pswim90d99j2g9sm"; depends=[assertive RUnit]; }; runjags = derive2 { name="runjags"; version="2.0.4-6"; sha256="0w97s1j5v05fn4nclqwg56hl9vz6vi2l6sp042r6iyh024fsyg22"; depends=[coda lattice]; }; - runner = derive2 { name="runner"; version="0.3.1"; sha256="0dxg4s5cldh112bk65ymj2ir2zi7n47rs72zcwr9abp65hlg32gf"; depends=[Rcpp]; }; + runner = derive2 { name="runner"; version="0.3.2"; sha256="0m2xaj2w0186frzg29jwivf7gxfikvy14w53qpcybgnd1ng54l3a"; depends=[Rcpp]; }; runstats = derive2 { name="runstats"; version="1.1.0"; sha256="0n9348af60j8a2mwgbafabspb4nm45ry92zlzmynja06zyx8lb2d"; depends=[fftwtools]; }; rusda = derive2 { name="rusda"; version="1.0.8"; sha256="0xx72jjf1pyixwpnvvgx5n2vc5gl46bam1caav043iqki68wb338"; depends=[foreach httr plyr RCurl stringr taxize testthat XML]; }; rusk = derive2 { name="rusk"; version="0.1.1"; sha256="0a6vbcnfzlfq9fmibiy0cwcfix65qhxq4f7wc7d53riga82s00lk"; depends=[dplyr ggforce ggplot2 reshape2 shiny tidyr]; }; rust = derive2 { name="rust"; version="1.3.8"; sha256="05xqvbkjckwxmhgcl9dqb7y20jq8b6f2fad5dikvbq5l8pwfygxj"; depends=[Rcpp RcppArmadillo]; }; ruta = derive2 { name="ruta"; version="1.1.0"; sha256="1qr2ryz55h2j3wlwg0535lhmk2ydm0idfxl07rlfxq1pi32cjms1"; depends=[keras purrr R_utils]; }; + rutifier = derive2 { name="rutifier"; version="1.0.4"; sha256="045pr8apd105azs1glpwqrbamglqddxfpml9yrfrlaivz3fjd9l8"; depends=[R_utils]; }; ruv = derive2 { name="ruv"; version="0.9.7.1"; sha256="1n4q9mrp9f644spbns6bbnzmlabrg90hwkdfg3hnm3rxp9b4xid0"; depends=[ggplot2 gridExtra scales]; }; - rv = derive2 { name="rv"; version="2.3.3"; sha256="1h5lhy87v88b70a7pbq5xirskm6ih9fk90n6mzp1nmkr7w1d3zai"; depends=[]; }; + rv = derive2 { name="rv"; version="2.3.4"; sha256="0kn56agxv6p861r247yhwfkp8pj33bghy5444a6f3y22yyzc8ngz"; depends=[]; }; rvHPDT = derive2 { name="rvHPDT"; version="3.0"; sha256="05nrfnyvb8ar7k2bmn227rn20w1yzkp1smwi4sysc00hyjrlyg8s"; depends=[gtools]; }; rvTDT = derive2 { name="rvTDT"; version="1.0"; sha256="09c2fbqnlwkhaxfmgpsdprl0bb447ajk9xl7qdlda201fvxkdc8v"; depends=[CompQuadForm]; }; rvalues = derive2 { name="rvalues"; version="0.6.3"; sha256="1bsdvwcijb75f27c8padjx8663as667axc4skwa6xgv5y423kbd0"; depends=[]; }; - rvcheck = derive2 { name="rvcheck"; version="0.1.7"; sha256="1a3xlzi4n1rqiapfa180aif7n7nws8pbg8k3nk7ccaczvmni38aw"; depends=[BiocManager rlang]; }; + rvcheck = derive2 { name="rvcheck"; version="0.1.8"; sha256="0627bc8qmhxmd63yh6f90qni3qw1zwdpxjln2qbychzmzd4am9ac"; depends=[BiocManager rlang]; }; rversions = derive2 { name="rversions"; version="2.0.1"; sha256="1ic6sxnyya24d5xsxjg3fba73fhya9fhs0kaf66yha6nwxj1zv2i"; depends=[curl xml2]; }; - rvertnet = derive2 { name="rvertnet"; version="0.7.0"; sha256="01z3ij5z21v901hz4l9173r4pa9jz2nl7bx086ka1bxvcy0dgqgj"; depends=[crul dplyr ggplot2 jsonlite maps]; }; + rvertnet = derive2 { name="rvertnet"; version="0.8.0"; sha256="1j8kgyzcn14yl44lnxc8f83wpmgpdzx5aiw91zjbjkajj6bgzrpn"; depends=[crul dplyr ggplot2 jsonlite maps]; }; rvest = derive2 { name="rvest"; version="0.3.5"; sha256="0r0a5jic09xw5pk0x42pr99r3zab5m9s4x85ymx1sl769jz42zqf"; depends=[httr magrittr selectr xml2]; }; - rvg = derive2 { name="rvg"; version="0.2.3"; sha256="1psqjwn80vqfvfl9hyx0rabqrrlqp34hrwrbg8ghsd65f0f1ncgm"; depends=[gdtools officer Rcpp rlang xml2]; }; + rvg = derive2 { name="rvg"; version="0.2.4"; sha256="12ghjppq5igic2mw8k3p5cnywm26c615ll3j3a9fasyyzkxx6i05"; depends=[gdtools officer Rcpp rlang 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.5.1.1.0"; sha256="1616xqchjyqqf2nmgx5rlpnw8g4696lvlpmrx7jav2cnvkff7s2i"; depends=[assertthat BH kde1d lattice Rcpp RcppEigen RcppThread wdm]; }; rvkstat = derive2 { name="rvkstat"; version="2.6.3"; sha256="0vh5gsvfs01f7mw0cl1wap1w1nsgr4fyv9fdays8b8ad3gc17a2r"; depends=[httr jsonlite RCurl tidyr]; }; - rwalkr = derive2 { name="rwalkr"; version="0.5.1"; sha256="1436qdwx1i8868wj45xdrr79bvsf9qaf5msjc778qlmvyyyswxh7"; depends=[dplyr hms httr tidyr]; }; + rwalkr = derive2 { name="rwalkr"; version="0.5.2"; sha256="1661vg5mdizgynlniq6pibmhn0spnh3d4w6bh08nyjwwchkagrxi"; depends=[dplyr hms httr tidyr]; }; rwars = derive2 { name="rwars"; version="1.0.0"; sha256="0kmwpr6gn3xsf0pqx153vblpjbhc34mzlgyv8xb2nw78nf8znfij"; depends=[httr]; }; 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]; }; rwebstat = derive2 { name="rwebstat"; version="1.0.2"; sha256="14mzqs4qjb3qgpci1a1c4sj803mjnzv9j910zmhkg5l8bx9nj5xw"; depends=[dplyr getPass httr readr]; }; rwfec = derive2 { name="rwfec"; version="0.2"; sha256="0wmalfms59zi8jdn2s2qbcdckfkifl9vg19hzx4389mm5gk6qsbh"; depends=[Rcpp]; }; - rwhatsapp = derive2 { name="rwhatsapp"; version="0.2.1"; sha256="1lwa8x2a2k7vspll4k8g7l09cvpxxnpv2476x50fzvn126881g5i"; depends=[stringi tibble]; }; + rwhatsapp = derive2 { name="rwhatsapp"; version="0.2.2"; sha256="00cgczgim3ls5jjaklpwfyf24794zhpdjj9pl9fkw20fxhz91bpd"; depends=[stringi tibble]; }; rworldmap = derive2 { name="rworldmap"; version="1.3-6"; sha256="1q1h0n9qr0m5pdx10swrh9ddsvdj8kv5nqngrf3lnx9rg9iwivjk"; depends=[fields maptools sp]; }; rworldxtra = derive2 { name="rworldxtra"; version="1.01"; sha256="183z01h316wf1r4vjvjhbj7cg4xarn4b8qbmnn5y7nrrdndzi163"; depends=[sp]; }; rwstats = derive2 { name="rwstats"; version="0.1"; sha256="10jj2lkilysz7mmysblj6l4jjc560rqsps0ivkvyr7caj8gfhdlb"; depends=[]; }; @@ -13093,16 +13235,16 @@ in with self; { ryouready = derive2 { name="ryouready"; version="0.4"; sha256="1d9z3paxcrkwsgn5g83x57jwz2iqarks30x0bwg48i5ispw6xbr3"; depends=[car ggplot2 stringr]; }; rysgran = derive2 { name="rysgran"; version="2.1.0"; sha256="1l2mx297iyipap8cw2wcw5gm7jq4076bf4gvgvij4q35vp62m85z"; depends=[lattice soiltexture]; }; rzeit2 = derive2 { name="rzeit2"; version="0.2.3"; sha256="0fvkpc6l57s64m0zx8fzazvyhpn5wxa1cb185h20x8hjf069i5lf"; depends=[anytime httr jsonlite openssl rvest stringr xml2]; }; - rzmq = derive2 { name="rzmq"; version="0.9.6"; sha256="05j34fwwqlzq9nfkaafl39aqc0nvljf22pndqhj151gpnrpgr8w0"; depends=[]; }; + rzmq = derive2 { name="rzmq"; version="0.9.7"; sha256="0iasjaka3gx616l5bxyg2k0fi33hldaplvs0h03j6jpxfmxvcisz"; depends=[]; }; s2 = derive2 { name="s2"; version="0.4-2"; sha256="17r3xn2ldlz7qpdwrp0mdm7pfrdfwibyv8biaxq4b6qx0p7wvw6n"; depends=[Rcpp]; }; s20x = derive2 { name="s20x"; version="3.1-28"; sha256="1fx5206gy7cq4n0xrdxcvnd913i08yjjz39ldjm3a98sfz6xj636"; depends=[]; }; + s2dv = derive2 { name="s2dv"; version="0.0.1"; sha256="06jn9f8fpkpi1qz0g7pjyszdwckg6llb2lnf0micj8v1js7phym8"; depends=[abind bigmemory ClimProjDiags GEOmap geomapdata mapproj maps multiApply ncdf4 plyr]; }; s2dverification = derive2 { name="s2dverification"; version="2.8.6"; sha256="1nvmc3mpdqrcnv17vk8rjd7mh55pj68y2ffiia09lc8h84r3zxil"; depends=[abind bigmemory GEOmap geomapdata mapproj maps NbClust ncdf4 plyr SpecsVerification]; }; s2net = derive2 { name="s2net"; version="1.0.1"; sha256="1f6lc8azx8lax7jc5ggzirwnp5d9ka2plimfkg70vx783xf56zaw"; depends=[MASS Rcpp RcppArmadillo]; }; s4vd = derive2 { name="s4vd"; version="1.1-1"; sha256="1rp3z42nxmrvb942h3c5cl544lngzx7nrnnr4zjw7dq495bym7yp"; depends=[biclust foreach irlba]; }; sAIC = derive2 { name="sAIC"; version="1.0"; sha256="1ih63cfs98kb61gwbmrx2yq7iacb5qa1qrh1a264041qd27r5pj5"; depends=[]; }; sBF = derive2 { name="sBF"; version="1.1.1"; sha256="0dankakl4rwl9apl46hk57ps4mvn2l1crw4gdqds26fc8w6f6rab"; depends=[]; }; sBIC = derive2 { name="sBIC"; version="0.2.0"; sha256="1fx17c9w7v6wi02i293vjdahwxx4b5a118r655cl12gsd5qwqj11"; depends=[combinat flexmix hash igraph mclust poLCA R_methodsS3 R_oo Rcpp]; }; - sEparaTe = derive2 { name="sEparaTe"; version="0.2.1"; sha256="0k1c0wa052f1fprc9jn0i3g2cawxfhkan998jlhkr4iy986jynw9"; depends=[]; }; sFFLHD = derive2 { name="sFFLHD"; version="0.1.2"; sha256="014gy3nj6gr740z4apw82jh4n7s57zmnr95bm3g9xxnwnb224npq"; depends=[conf_design DoE_base R6]; }; sGMRFmix = derive2 { name="sGMRFmix"; version="0.3.0"; sha256="183i3159k2cxpanm09zcy2y1vvjd6185gjjf81c3284prw3aky2c"; depends=[ggplot2 glasso mvtnorm tidyr zoo]; }; sNPLS = derive2 { name="sNPLS"; version="0.3.31"; sha256="0ja2f4n000r7cvf0jj2qypa5mfkikig47hfpqwh4611sl70qgx2y"; depends=[car ggplot2 ks MASS Matrix pbapply plotrix rgl]; }; @@ -13117,8 +13259,8 @@ in with self; { saccades = derive2 { name="saccades"; version="0.1-1"; sha256="138a6g3hjmcyvflpxx1lhgxnb8svrynplrjnvzij7c4bzkp8zip6"; depends=[zoom]; }; sadists = derive2 { name="sadists"; version="0.2.3"; sha256="17jlzx5h5l1w7riz0rs99w31n6lxnnxwzbzqn2z5r292j2nxvmkw"; depends=[hypergeo orthopolynom PDQutils]; }; sads = derive2 { name="sads"; version="0.4.2"; sha256="1j6vdjvpnbqp4kwbvhcl8p51ln29mmk9n150718wsqlifb8d1lw9"; depends=[bbmle GUILDS MASS poilog VGAM]; }; - sae = derive2 { name="sae"; version="1.2"; sha256="1fai9lkyyssnkkdrjrrx7vzj88nglmd4bkzan3hdhrc49abclp59"; depends=[lme4 MASS]; }; - sae2 = derive2 { name="sae2"; version="1.0-1"; sha256="0cnqlacglwyx4cdm3wl3j3g2xv2sx3921mnzk2v0bk704i9y7qq3"; depends=[MASS survey]; }; + sae = derive2 { name="sae"; version="1.3"; sha256="1ncrlzgnga9pfa2j8x1y6axl2665rp08aff98zrim6gq6n6yap8z"; depends=[lme4 MASS]; }; + saeME = derive2 { name="saeME"; version="1.0.1"; sha256="1w77ncha9xs5p3pzfd3y38q8kz2wjzh35zyn4cby0yp2cyw4xxd9"; depends=[expm MASS]; }; saeRobust = derive2 { name="saeRobust"; version="0.2.0"; sha256="1bdfrsm59xwkga0kxl3r5n83mhhkyzj7gplrgx26gyflashyd1zc"; depends=[aoos assertthat ggplot2 magrittr MASS Matrix memoise modules pbapply Rcpp RcppArmadillo spdep]; }; saeSim = derive2 { name="saeSim"; version="0.10.0"; sha256="0nh8x2v0g8i0rjq4s5q0ayhyxhl5p0126plmd4vnnhaifm6pn0q3"; depends=[dplyr functional ggplot2 MASS parallelMap spdep]; }; saemix = derive2 { name="saemix"; version="2.3"; sha256="08n1syv8wkf1nqz8i1n3ippyp63g56xf8xqgczxm630r6802yqab"; depends=[]; }; @@ -13128,11 +13270,11 @@ in with self; { safetyGraphics = derive2 { name="safetyGraphics"; version="1.1.0"; sha256="1s8xwx014nihn13v6rpwy11sb3yzfyj3alb88y47wp1kh39d7f0q"; depends=[dplyr DT haven htmlwidgets jsonlite magrittr purrr rlang rmarkdown shiny shinybusy shinyjs shinyWidgets stringr tibble tidyr]; }; sail = derive2 { name="sail"; version="0.1.0"; sha256="1wrh2dam5lblascqd8gl76jks72ys1amz84c6p08y8ykdmn2saq1"; depends=[gglasso glmnet]; }; salesforcer = derive2 { name="salesforcer"; version="0.1.3"; sha256="1nhw7l6bg375dqqcaxjfvhjm9sb1jsil5wayhffdxc9lqdxrd5a2"; depends=[data_table dplyr httr jsonlite lubridate purrr readr XML xml2]; }; - salso = derive2 { name="salso"; version="0.1.11"; sha256="1rxfnh575hl3zpsm3r0mscfr0hy9v2kss142ggzrz49a4kskpa1x"; depends=[]; }; + salso = derive2 { name="salso"; version="0.1.16"; sha256="1xvzvy0s1718n9p71a6gb4dzg281drzzmpyda5j3b729aijni6bh"; depends=[]; }; salty = derive2 { name="salty"; version="0.1.0"; sha256="1dxq62yrkv416fy09l03slc7ci6mnwiyvjlsxhbqnj8yjy3kbhr6"; depends=[assertthat purrr stringr]; }; sambia = derive2 { name="sambia"; version="0.1.0"; sha256="15yz5lrjav5bs8m52crg3l43xmi4gf7wydji76p181ssyg43z2ln"; depends=[dplyr e1071 FNN mvtnorm pROC ranger smotefamily]; }; samc = derive2 { name="samc"; version="1.0.4"; sha256="03n49p2cjs1r3grmg4cw4pxn4lddx5084j4j8dj0g6l9sjzj64hz"; depends=[gdistance Matrix raster Rcpp RcppEigen]; }; - sampSurf = derive2 { name="sampSurf"; version="0.7-4"; sha256="0azs8d1d4cp5vzrlzpn2lbqmbha6rxq109apg6hr2hf7i81g19d7"; depends=[boot lattice latticeExtra raster rasterVis sp]; }; + sampSurf = derive2 { name="sampSurf"; version="0.7-5"; sha256="0ks95d1w5dvxz4vb850hb5v0w8xg6sil0gvddmd1mrrjkjqkk96f"; depends=[boot lattice latticeExtra raster rasterVis sp]; }; sampleSelection = derive2 { name="sampleSelection"; version="1.2-6"; sha256="1ph26v78sy8341d9iir6243vmvnrnan7gj5mr31913kpgkblcwfj"; depends=[Formula maxLik miscTools mvtnorm systemfit VGAM]; }; sampler = derive2 { name="sampler"; version="0.2.4"; sha256="12jjx3ci1yss8dj64bjdmz73cyjfkwb7b9zk4zm48lqv78k6wlv7"; depends=[dplyr purrr reshape tidyr]; }; samplesize = derive2 { name="samplesize"; version="0.2-4"; sha256="0n6z7jmf665lbj3g1mjy87a9fh53z85546bhrkmkgsysb0r9q6iq"; depends=[]; }; @@ -13158,11 +13300,13 @@ in with self; { sapa = derive2 { name="sapa"; version="2.0-2"; sha256="056xlh14dnzq4x7sbp7ff2k61jxy7110a742b502vz549qfrr5ds"; depends=[ifultools splus2R]; }; sapfluxnetr = derive2 { name="sapfluxnetr"; version="0.0.7"; sha256="0lnhg4apsvvyzyz89x778nhxjp4y0mycgajxjyb57wcwgn16gygm"; depends=[assertthat dplyr furrr ggplot2 glue lubridate magrittr purrr rlang stringr tibble tidyr]; }; saqgetr = derive2 { name="saqgetr"; version="0.1.19"; sha256="0sl0kngcsadgnx1lwhgbn9w4885dv0ih3c5vkvmz0bkvhdcjih9j"; depends=[curl dplyr fs lubridate magrittr purrr readr stringr tidyr]; }; - sarima = derive2 { name="sarima"; version="0.8.1"; sha256="03261mqv4l8wkan0phg7085qsy9q1vhhyx6bfnygjva7vvxafvpc"; depends=[dplyr FitAR FitARMA Formula KFAS lagged ltsa numDeriv PolynomF Rcpp RcppArmadillo Rdpack]; }; + sara4r = derive2 { name="sara4r"; version="0.0.7"; sha256="1la02rq16c3hvfg4dygz6himvs88nmry8616fzgnsbxzpddl5aw3"; depends=[raster rgdal RGtk2 sp]; }; + sarima = derive2 { name="sarima"; version="0.8.2"; sha256="0fyfba017p35g16b8xp9zvqp9dalhlgr7x5hpk10y29qh7k12z69"; depends=[dplyr FitAR FitARMA FKF Formula KFAS lagged ltsa numDeriv PolynomF Rcpp RcppArmadillo Rdpack]; }; sars = derive2 { name="sars"; version="1.2.1"; sha256="10j2cz66qpdicarxy2mx2hlmkvby3j83qrjm2irmfnwmscafg5f4"; depends=[cli crayon dplyr nortest numDeriv]; }; sas7bdat = derive2 { name="sas7bdat"; version="0.5"; sha256="0qxlapb6wdhzpwlmzlhscy3av7va3h6gkzsppn4sx5q960310an3"; depends=[]; }; sasMap = derive2 { name="sasMap"; version="1.0.0"; sha256="11vhhxhakqm1gsb3p4s4966sapmrqfyw79zfppbx5lnqi3xr0ngn"; depends=[readr stringi stringr]; }; - sass = derive2 { name="sass"; version="0.1.2.1"; sha256="02a5n0l8wya5v1iq2rb4hvc0gm23790jnjl7i3pzw2b5vkqd3l7s"; depends=[digest]; }; + sass = derive2 { name="sass"; version="0.2.0"; sha256="0qzrncsnp0zd8jyp4whss92m7llqsfccmp9p9r3gdc7hlq1amp3z"; depends=[digest fs htmltools rlang]; }; + sate = derive2 { name="sate"; version="1.1.0"; sha256="0d1b0gp5abh5g7a25ff40xdnncrl2afjnlcc56dbhqkk43gjah17"; depends=[MASS]; }; satellite = derive2 { name="satellite"; version="1.0.2"; sha256="1ib9g4cplksf9ymp8hcv843lv5bpar31w8h4wnmya5hjsdmlfiv4"; depends=[plyr raster Rcpp]; }; satscanMapper = derive2 { name="satscanMapper"; version="1.0.1"; sha256="1qr7xz7qp39nylkrx3smzga7rvi2z9yws8kbpmfk13avixr4asvy"; depends=[foreign RColorBrewer SeerMapper sp stringr]; }; saturnin = derive2 { name="saturnin"; version="1.1.1"; sha256="0cjp4h1s9ivn17v8ar48mxflaj9vgv92c8p9l2k5bc9yqx9mcs36"; depends=[Rcpp RcppEigen]; }; @@ -13177,18 +13321,20 @@ in with self; { sboost = derive2 { name="sboost"; version="0.1.1"; sha256="126rqvpqwvwjxvsg1v04nkmd6af55j7sgx43jg2vnggyrlli9j9q"; depends=[dplyr Rcpp rlang]; }; sbpiper = derive2 { name="sbpiper"; version="1.9.0"; sha256="0pjq88ixk494wlz4nh5anbsn59mmh9wg564qh3vzwwqgxf1k61cg"; depends=[colorRamps data_table factoextra FactoMineR ggplot2 Hmisc reshape2 scales stringr]; }; sbrl = derive2 { name="sbrl"; version="1.2"; sha256="1d0f2mlzzcghhvqagrr954qa69b5v47milw3iazxihh8q1qlird2"; depends=[arules Rcpp]; }; - sbtools = derive2 { name="sbtools"; version="1.1.9"; sha256="0azk4sa2h60yyfnskcicpiaqb3wrw0x64drb2z38y5k4jrrjbmlq"; depends=[curl httr jsonlite stringr]; }; + sbtools = derive2 { name="sbtools"; version="1.1.10"; sha256="0pn4rp8cfvdjbfn4xgzhm5x5r73v11djksh6jdw7mv7nrci9rqpb"; depends=[curl httr jsonlite stringr]; }; sbw = derive2 { name="sbw"; version="1.0"; sha256="07lr2sh681q0wvyaf7ixif5riw9kfxv4hraxj8hzqaxcsip743vq"; depends=[MASS Matrix quadprog slam spatstat]; }; scBio = derive2 { name="scBio"; version="0.1.5"; sha256="12wch9dp7n9vigv7rp7i5b5sckn9vvckpclylinnbi1mhawxprv9"; depends=[doSNOW fields foreach LiblineaR limma raster sp]; }; + scMappR = derive2 { name="scMappR"; version="0.1.1"; sha256="1mfbjv7gpj63q5gwqcajjrnbhr918nvl41hk8ggk1l30wqg4k4r1"; depends=[downloader ggplot2 gProfileR gprofiler2 GSVA limSolve pcaMethods pheatmap Seurat]; }; scModels = derive2 { name="scModels"; version="1.0.1"; sha256="0n2sc2l3wy08i0xq7jwigkr42wz9gyhlirmjmma9plnmkbrx0rp4"; depends=[Rcpp]; }; scPDSI = derive2 { name="scPDSI"; version="0.1.3"; sha256="00z5qk14c1ndrd63rhvknkp3dn3ad8z8mf00p9sb8wbsi908md44"; depends=[Rcpp]; }; scRNAtools = derive2 { name="scRNAtools"; version="1.0"; sha256="0x0lniqhq6q87y08kkkyvmk1g5b8i73hm3h86ba8rcv0v0n7ap9a"; depends=[ALL ConsensusClusterPlus corrplot edgeR foreach ggplot2 ggthemes Hmisc igraph lattice limma PerformanceAnalytics plyr reshape2 Rmisc Rtsne scatterplot3d survival TPEA]; }; - scTenifoldNet = derive2 { name="scTenifoldNet"; version="1.1.0"; sha256="1qfmrrpvrxpj9mmhyhr8f99iiz3y1l8iz2hff3wgl9jx80nnhr67"; depends=[MASS Matrix pbapply reticulate RSpectra rTensor]; }; + scTenifoldNet = derive2 { name="scTenifoldNet"; version="1.2.0"; sha256="1n86fcvx0a34xd2h9d9kmyn991lqh6573rrkicql946pm697g4vz"; depends=[MASS Matrix pbapply reticulate RSpectra]; }; scaRabee = derive2 { name="scaRabee"; version="1.1-3"; sha256="1yap3hi36f8hk93jn59nxrbgq8iw0xwkkm3pc2gb50cpcpaq41pd"; depends=[deSolve lattice neldermead]; }; + scaffolder = derive2 { name="scaffolder"; version="0.0.1"; sha256="1va1mlhqv5qn0hm81ypdir9llr68222qxjp3jink69zpaskfbdib"; depends=[reticulate]; }; scagnostics = derive2 { name="scagnostics"; version="0.2-4.1"; sha256="1azg1xlid63l9mcyns9yyl3a3hykbl0sl0h5jhyvzjzahfyanq53"; depends=[rJava]; }; scaleboot = derive2 { name="scaleboot"; version="1.0-1"; sha256="1q0bs5f1vgja5gj3id1ny6raja8ljgd8dk50fs1wn90f6080afy7"; depends=[mvtnorm pvclust]; }; scales = derive2 { name="scales"; version="1.1.0"; sha256="00rdbfj5mwc3kr8pskidn3n2zkp4ms6cx36xazz54pxw3pysdr0y"; depends=[farver labeling lifecycle munsell R6 RColorBrewer viridisLite]; }; - scalpel = derive2 { name="scalpel"; version="1.0.1"; sha256="18mapg96xl9a1g85h5xhqsz1333hkc28z0ivfjaff933p1kc6sng"; depends=[gam igraph Matrix protoclust R_matlab SDMTools]; }; + scalpel = derive2 { name="scalpel"; version="1.0.2"; sha256="1rwa1h24b0bzsiasjgj84rd5k5wpw6pnp463qaj624sra9wp9pw9"; depends=[gam igraph Matrix protoclust R_matlab]; }; scalreg = derive2 { name="scalreg"; version="1.0.1"; sha256="0kfcgl9cpp6g1qx23s1yrjzn0hi74vmrw567vy9wpsmhk04a5bkx"; depends=[lars]; }; scam = derive2 { name="scam"; version="1.2-5"; sha256="0c8pp2cr3khaibpv3m8kkw73q2pdx6931kh8w64s38wgvjv293fp"; depends=[Matrix mgcv]; }; scan = derive2 { name="scan"; version="0.40"; sha256="1khmg05dzs1va66bm26wxx440nlkl0r70wbh814fdlmij3py7m54"; depends=[car kableExtra knitr MASS mblm nlme readxl]; }; @@ -13196,7 +13342,8 @@ in with self; { scape = derive2 { name="scape"; version="2.3-2"; sha256="1i3k37r7lisrj1pblni5xn76kf6py52s4yd51fm78c3286yfaasf"; depends=[coda Hmisc lattice]; }; scar = derive2 { name="scar"; version="0.2-1"; sha256="04x42414qxrz8c7xrnmpr00r46png2jy5giwicdx6gx8jwrkzhzs"; depends=[]; }; scatr = derive2 { name="scatr"; version="1.0.1"; sha256="1c2z722i7d7qflh4mzb8kkix5i22wph98kwz2p98x2mhaml8802d"; depends=[cowplot ggplot2 ggridges ggstance jmvcore R6]; }; - scatterD3 = derive2 { name="scatterD3"; version="0.9"; sha256="0miadn406viqzw1sc27fl3xb1l0vvachrfiv72jl9r7qgk2ga5jv"; depends=[digest ellipse htmlwidgets]; }; + scatterD3 = derive2 { name="scatterD3"; version="0.9.1"; sha256="0nlsy4z9m4kzm5m577nhysc17z9f3hc5anmig992x7mq4vnjnwxh"; depends=[digest ellipse htmlwidgets]; }; + scattermore = derive2 { name="scattermore"; version="0.6"; sha256="0wa7vnw935320333ivr1k5kr1qxbxppy9ncsf2hp2a2gw885scn8"; depends=[ggplot2]; }; scatterpie = derive2 { name="scatterpie"; version="0.1.4"; sha256="0g5sn0iv6c1q7y51j4gbbbnil5089dgk1w4q94c7h5y3x7wfrzqb"; depends=[ggforce ggplot2 rlang rvcheck tidyr]; }; scatterplot3d = derive2 { name="scatterplot3d"; version="0.3-41"; sha256="152xqz9c70qab86mpgng049gxsg5f4fpf1m8dh93fb9v1avjd0sc"; depends=[]; }; scbursts = derive2 { name="scbursts"; version="1.6"; sha256="09yxnq6m35xmp0priavjnh0bdcwkr5hhy7j33cz13xwkrd1cgw5j"; depends=[readxl tibble]; }; @@ -13210,28 +13357,28 @@ in with self; { schoenberg = derive2 { name="schoenberg"; version="2.0.2"; sha256="17pbw9266r9lv9blygmvq9285kcrcy07jaqrj3zfa2pg0zyvhjvm"; depends=[crayon]; }; scholar = derive2 { name="scholar"; version="0.1.7"; sha256="142iwrips1589fa0g1178a6s1cz4dfcv9b0qs570q6b6ccfjxi6r"; depends=[dplyr ggplot2 ggraph httr R_cache rvest stringr tidygraph xml2]; }; schoolmath = derive2 { name="schoolmath"; version="0.4"; sha256="06gcmm294d0bs5whvknrq48sk7li961lzy4bcncjg052zbbpn67x"; depends=[]; }; - schrute = derive2 { name="schrute"; version="0.1.1"; sha256="1mwlxmwc8bnjihz4l30vkzx1lm36x0dfgzx0j64kfdp1xdbbq3ma"; depends=[dplyr ggplot2 magrittr stringi stringr tibble tidyr tidytext]; }; + schrute = derive2 { name="schrute"; version="0.2.1"; sha256="0dyn4lwbx5mhhl1kk3iashz81n4mgwmdd0cnzf219s8rjq5jwxbk"; depends=[dplyr ggplot2 magrittr stringi stringr tibble tidyr tidytext]; }; schumaker = derive2 { name="schumaker"; version="1.2"; sha256="1whfmnjmib7lh72src7cnbw3mswzaxq8vd50x5x9cv0031n0y6l7"; depends=[]; }; scico = derive2 { name="scico"; version="1.1.0"; sha256="0c52a4mhsd9y5vhz3h6f7j2fa5cq0lkks5qa449w6kra5cqpbx34"; depends=[]; }; scidb = derive2 { name="scidb"; version="2.0.0"; sha256="079akdsxxjnca5jsv0grw1c2nd3dl368xhy4mzm94mh5j6ghi57l"; depends=[bit64 curl data_table digest openssl]; }; scientoText = derive2 { name="scientoText"; version="0.1"; sha256="0f18hg9s50lbbgl0fqjv45yhynpnsxj8wwm07g126snzr68gbd21"; depends=[stringr tm]; }; scifigure = derive2 { name="scifigure"; version="0.2"; sha256="1zc88r1lnb0cws130hq4rjc34rrp6zkmi8yhkwsm3vkznbhi4iba"; depends=[]; }; - scio = derive2 { name="scio"; version="0.6.1"; sha256="0h15sscv7k3j7qyr70h00n58i5f44k96qg263mxcdjk9mwqr0y65"; depends=[]; }; - sciplot = derive2 { name="sciplot"; version="1.1-1"; sha256="1ydwx9kh778z3x7s3i6gqinqi6bmsf6bslaf0mgszj0nrgcmj6y3"; depends=[]; }; + scio = derive2 { name="scio"; version="0.9.0"; sha256="0xj9iiqjz2k1llq09k2l3g7zn5zw2ayifhqsdm8fc2j9r4m1nrn2"; depends=[glasso QUIC]; }; + sciplot = derive2 { name="sciplot"; version="1.2-0"; sha256="097zcgjsv54f6wd8fjwh2xb406j6yrw94v9pcxa0zln1q7fs93vk"; depends=[]; }; sclero = derive2 { name="sclero"; version="0.2"; sha256="1vqysby822s958msnwcqmz78193vrgmpf6si1jnfb9cj90hh7wgg"; depends=[plyr RImageJROI spatstat]; }; - sclr = derive2 { name="sclr"; version="0.3.0"; sha256="1qm9jds7kxaz1g6v71z2vfmih2sr4c2n26xxjs6ic9hr9dd15y9y"; depends=[broom dplyr rlang tibble]; }; + sclr = derive2 { name="sclr"; version="0.3.1"; sha256="10pihx35889w509ijbyq5hzslk9n7kakjnfscg7p0dq198nbpyca"; depends=[broom dplyr purrr rlang tibble]; }; scmamp = derive2 { name="scmamp"; version="0.2.55"; sha256="17qhj9l1akxachaimy9d5rls8adph8aalj3qr6ckip29a8ma9gf7"; depends=[ggplot2 graph reshape2 Rgraphviz]; }; scoper = derive2 { name="scoper"; version="0.2.0"; sha256="1b4kyrml5yk46fw9hrp21i6w6ylck5qs64y0mzkbqr2wf1x4ncvs"; depends=[alakazam data_table doParallel dplyr foreach ggplot2 Rcpp rlang seqinr shazam stringi stringr]; }; 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.8.1"; sha256="0h10glghqlk4nihpy41h89rm9db3lwq1pwdyg8vrx508n9k1bv7r"; depends=[data_table doParallel foreach ggplot2 gridExtra openxlsx]; }; + scorecard = derive2 { name="scorecard"; version="0.2.9"; sha256="0zafis8f4v9mw9l52v0d286fms5q3rgl7dvlz60f3sz41sl1y1gz"; depends=[data_table doParallel foreach ggplot2 gridExtra openxlsx stringi]; }; scorecardModelUtils = derive2 { name="scorecardModelUtils"; version="0.0.1.0"; sha256="09znaxrv14m58hsk5pac458xbpcsidc6ygcsw4q9j0p4yd80qbvl"; depends=[car e1071 gbm ggplot2 partykit randomForest reshape2 sqldf stringr]; }; scorepeak = derive2 { name="scorepeak"; version="0.1.2"; sha256="1g9n7kjqb9qk5b7hw8ysrc069w9dzc4z29ay6z1kbm0v4kkzp7bi"; depends=[checkmate Rcpp]; }; scorer = derive2 { name="scorer"; version="0.2.0"; sha256="1mc4hxcrqzh4dmz5fy40740bnrp4fxia81fj3cdw9382p67ivhim"; depends=[Rcpp]; }; scoring = derive2 { name="scoring"; version="0.6"; sha256="114jlpbnm15fdan5lr40adxdzwajy3yhdw6dm4kvkvky6qhcx7q5"; depends=[]; }; scoringRules = derive2 { name="scoringRules"; version="1.0.0"; sha256="1jksv22hy8kazqwy6yjdjl32k7i558vcn7i13wc7fmary7v500km"; depends=[knitr MASS Rcpp RcppArmadillo]; }; scout = derive2 { name="scout"; version="1.0.4"; sha256="0vr497g7g1xhf75cwjbjsns2fvdzy86iibbf5w0g2xylw82s4lh2"; depends=[glasso]; }; - scpm = derive2 { name="scpm"; version="1.0-2"; sha256="0jrr90lcalchfqmq5c8ja7ws88rpri3gjdc5z4jfpazn2vznx26n"; depends=[geoR interp lattice MASS Matrix mvtnorm RandomFields rgl]; }; + scpm = derive2 { name="scpm"; version="2.0.0"; sha256="1ib46m3i50annp90n2ih4qdxabxik4ngg9j0a5hgspsvk1i4hrvp"; depends=[interp lattice MASS Matrix mvtnorm RandomFields rgl]; }; scraEP = derive2 { name="scraEP"; version="1.1"; sha256="0dimvdjlgaymjmd3gf60hxcavpr58bpffrfhlksnrfzbb7an65dd"; depends=[data_table RCurl XML]; }; scrapeR = derive2 { name="scrapeR"; version="0.1.6"; sha256="1rqgqpn9rc43rh356z9gb51pjhdczr9a9mgv0i078nniq156rmlb"; depends=[RCurl XML]; }; scrime = derive2 { name="scrime"; version="1.3.5"; sha256="0y2mh9fsffjf3i15bafpasa17z99c1s75r8g6h4hgcwfgpjx75sx"; depends=[]; }; @@ -13240,8 +13387,8 @@ in with self; { scriptexec = derive2 { name="scriptexec"; version="0.3.1"; sha256="0k10x0npdga1nmchzz9xxv0qijnq2n9pb49z1g06bmva1z8wb4wg"; depends=[]; }; scriptuRs = derive2 { name="scriptuRs"; version="0.1.0"; sha256="1wbvfqcc0raazhdc6pyp93q859ilxfz9rz338p3sb7fjyxvparbl"; depends=[]; }; scrm = derive2 { name="scrm"; version="1.7.3-1"; sha256="090gsa23l9s4x92q4n7ggp491fc8ghgnjw5p7j67gd1i1iwr55n8"; depends=[Rcpp]; }; - scrobbler = derive2 { name="scrobbler"; version="0.2.12"; sha256="0zqz5hpq9kabcz2q0zdmbygwj9xgdvs9mmv5k6h4gdbfjbzl4fiy"; depends=[anytime httr jsonlite]; }; - scrubr = derive2 { name="scrubr"; version="0.1.1"; sha256="0dqsk6vvc79qmjcr1gdksqzbd064nkyqfj2mxg6z7aifqgxs8zzz"; depends=[lazyeval magrittr Matrix qlcMatrix]; }; + scrobbler = derive2 { name="scrobbler"; version="0.2.15"; sha256="079ms94q2h8ciqi9b4w9i1md57x844jz464hk7rr564n9wcfp4gj"; depends=[httr jsonlite]; }; + scrubr = derive2 { name="scrubr"; version="0.3.0"; sha256="0kc8m7b18l4nd84kqf0ibv2mchpm9w1bjwwpyjzg0zkkl7k3grs9"; depends=[crul curl data_table fastmatch hoardr jsonlite lazyeval magrittr Matrix qlcMatrix tibble]; }; scrypt = derive2 { name="scrypt"; version="0.1.3"; sha256="14iblgbp9v2by8fjbrpsd59iknp5babcz7j3yv1yxxzcwyb6wrrm"; depends=[Rcpp]; }; scs = derive2 { name="scs"; version="1.3-2"; sha256="10z5619gbnnygk8pkdx2qji56jlv1q6c1z4581pdkd9sfnhg1yp3"; depends=[]; }; sctransform = derive2 { name="sctransform"; version="0.2.1"; sha256="07v3lzccsrkh1glfxd1q20r8f8gl9ls5az0s1dvxm4vcls0hlhyn"; depends=[future_apply ggplot2 gridExtra MASS Matrix Rcpp RcppEigen reshape2]; }; @@ -13249,48 +13396,50 @@ in with self; { sdPrior = derive2 { name="sdPrior"; version="1.0-0"; sha256="0g4crlasnvxz752n3az5jc681jvvj2g87c3a8s2h1i2vh64p5h37"; depends=[doParallel GB2 MASS mgcv mvtnorm pscl]; }; sdStaf = derive2 { name="sdStaf"; version="1.0.2"; sha256="0r7lqj30r3f0b18kpahi63zsdizcw2zjf1vvvs04s4cg1djjbcp3"; depends=[dismo dplyr ggplot2 raster rasterVis rgdal rgeos sp tidyr]; }; sda = derive2 { name="sda"; version="1.3.7"; sha256="1v0kp6pnjhazr8brz1k9lypchz8k8gdaby8sqpqzjsj8klghlcjp"; depends=[corpcor entropy fdrtool]; }; + sdafilter = derive2 { name="sdafilter"; version="1.0.0"; sha256="0y692j25pln46dp6xvaq17fkym0461yqfa6rv5avfw2b240k8jiq"; depends=[glasso glmnet huge POET]; }; sdat = derive2 { name="sdat"; version="1.1"; sha256="1mxijw2yfblqjvqqb2xrzhfn9c872i1q9ggw24xicvr2fk4lvjw6"; depends=[]; }; sdcHierarchies = derive2 { name="sdcHierarchies"; version="0.18.2"; sha256="09f9b6padx6jsjhh0d7qa7qs99rar4j9fbmyp9569ywc9ld7z7mm"; depends=[cli data_table jsonlite rlang shiny shinyjs shinythemes shinyTree]; }; - sdcMicro = derive2 { name="sdcMicro"; version="5.5.0"; sha256="0qskj65994kmv1s0rpz1a4dvlji1s4sn3y6lfqsh1zdf6lfdvhpn"; depends=[car carData cluster data_table DT e1071 ggplot2 haven knitr MASS prettydoc Rcpp rhandsontable rmarkdown robustbase shiny shinyBS VIM xtable]; }; + sdcMicro = derive2 { name="sdcMicro"; version="5.5.1"; sha256="1jabihj878w9wk7lmbnjh9v14jdb14w6ir10ram2bprlxah0bn07"; depends=[car carData cluster data_table DT e1071 ggplot2 haven knitr MASS prettydoc Rcpp rhandsontable rmarkdown robustbase shiny shinyBS VIM xtable]; }; sdcSpatial = derive2 { name="sdcSpatial"; version="0.1.1"; sha256="1szv2nb758k3x5scxml2ns11fi99rlmd11r3fhzy3dgylf0m0xnm"; depends=[raster]; }; - sdcTable = derive2 { name="sdcTable"; version="0.30"; sha256="1sbdnm2na36jx76hcpfks3kr5milid5sn0cpzjky90ldfii2pqf9"; depends=[data_table knitr lpSolveAPI Rcpp Rglpk rlang sdcHierarchies slam stringr]; }; + sdcTable = derive2 { name="sdcTable"; version="0.31"; sha256="064aippj8p4mc1zazvkzcjz59hlfybsz6wz1ppwj6d9638ha1a96"; depends=[data_table knitr lpSolveAPI Rcpp Rglpk rlang sdcHierarchies slam stringr]; }; sdcTarget = derive2 { name="sdcTarget"; version="0.9-11"; sha256="18cf276mh1sv16xn0dn8par4zg8k7y8710byxiih6db4i616fjpi"; depends=[doParallel foreach magic tuple]; }; sddpack = derive2 { name="sddpack"; version="0.9"; sha256="1963l8jbfwrqhqcpif73di9i5mb996r4f8smjyil6l7sdir7cg9l"; depends=[]; }; sde = derive2 { name="sde"; version="2.0.15"; sha256="0gxyhq9lafd62y68h7fd746a3jz3jdsm0shgwm2ylmp4a2f5cdmm"; depends=[fda MASS zoo]; }; sdef = derive2 { name="sdef"; version="1.7"; sha256="0x2b8shp02ik0dd11wi3jcrl9h9m963fnkfy47fwwhav9x6jg0jf"; depends=[]; }; - sdm = derive2 { name="sdm"; version="1.0-81"; sha256="1fig0vsz4l7kgrdil9jzln1vaff18xx08i5069j40ra04rzadfdi"; depends=[raster sp]; }; + sdm = derive2 { name="sdm"; version="1.0-82"; sha256="0ipzpn5npdb8jdpmih7n5z07q9wpcaxrmggbxm1hhj57m3sp7xc0"; depends=[raster sp]; }; sdmpredictors = derive2 { name="sdmpredictors"; version="0.2.8"; sha256="18374f2bnhh3nb62xf1h6fbqgpimlnkc2vbx5xkg5gyfylydz0v9"; depends=[R_utils raster rgdal]; }; sdmvspecies = derive2 { name="sdmvspecies"; version="0.3.2"; sha256="19avkag13ij1k65vqhmvcy8j50j8vrgw4mjc49x8i63w3d4z1wxh"; depends=[psych raster]; }; - sdnet = derive2 { name="sdnet"; version="2.4.1"; sha256="0z0wqc4hcmxqbavj9zma9j3dkg978l8dxcbyh9mlsbpfi4d1zph8"; depends=[]; }; sdols = derive2 { name="sdols"; version="2.0.0"; sha256="0rwdfb34g1l58ad02jf7wxidgqlccqvijdsvdxqdq8f5p15cl30m"; depends=[salso]; }; sdprisk = derive2 { name="sdprisk"; version="1.1-6"; sha256="061x78irryc5phd8bv9cs2mfgiajgwmr85ryp1r47anadydb2haa"; depends=[numDeriv PolynomF rootSolve]; }; sdpt3r = derive2 { name="sdpt3r"; version="0.3"; sha256="02qv889mkzcilxzszzqcqgn9z5zmki0093mdriradbl1y8a27bp5"; depends=[Matrix]; }; sdtoolkit = derive2 { name="sdtoolkit"; version="2.33-1"; sha256="0pirgzcn8b87hjb35bmg082qp14idc5pfvm6dikpgkswag23hwh8"; depends=[]; }; - 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.12"; sha256="1gb7ma2qpw8vnwfblwhalagar1cjqfd4la61bw652kk28v98y9bs"; depends=[gsw oce]; }; - seagull = derive2 { name="seagull"; version="1.0.3"; sha256="1hvww1x8pyfg7raylh7qgqzhm5jzn3lzjm89af2kzdiaynyw2703"; depends=[Rcpp RcppArmadillo]; }; + sdwd = derive2 { name="sdwd"; version="1.0.3"; sha256="0bwjpwmhg2d78pchcka6bypiypd9x07cpbaz68ww5z1f7lhxzd2m"; depends=[Matrix]; }; + seacarb = derive2 { name="seacarb"; version="3.2.13"; sha256="0ahnjz02px41q2xz3azqfs17wj5dx7ncnzsrlc89wvqngmyn2k1n"; depends=[gsw oce]; }; + seagull = derive2 { name="seagull"; version="1.0.6"; sha256="0bmmlxk2v82zhlxm8hj6p67capj4f4v6pdwlh09j75ca63jx36ry"; depends=[Rcpp RcppArmadillo]; }; sealasso = derive2 { name="sealasso"; version="0.1-2"; sha256="0cjy3fj170p5wa41c2hwscmhqxwkjq22vhg9kbajnq7df2s20jcp"; depends=[lars]; }; searchConsoleR = derive2 { name="searchConsoleR"; version="0.4.0"; sha256="1ffg5359pbwylw265wbahwl3hy1b0qqv4al71v5r8lgfircibn0j"; depends=[googleAuthR stringr]; }; searchable = derive2 { name="searchable"; version="0.3.3.1"; sha256="0xc87i2q42j7dviv9nj4hkgjvpfiprkkjpgzwsy47vp7q8024dv0"; depends=[magrittr stringi]; }; - searcher = derive2 { name="searcher"; version="0.0.4"; sha256="0xxawwa95vfcbq8gg61ylnsg1qg6q1ng9iq4r1a1ai9440p5mvh3"; depends=[]; }; + searcher = derive2 { name="searcher"; version="0.0.5"; sha256="1q12il35pfy34n669jzkjciln1ca8by7l1d8zkzv4297547i1qln"; depends=[]; }; seas = derive2 { name="seas"; version="0.5-2"; sha256="0hn4d5dc01zyycd7l3vj1sx6bq668n7fzffw9ypaa5l20fizs0ay"; depends=[MASS]; }; - season = derive2 { name="season"; version="0.3.8"; sha256="0kw3gvy7rv0rms0zj1rvqlfdn3yxr9r9ldm21zl2xrpx9cy04d2d"; depends=[ggplot2 MASS survival]; }; + season = derive2 { name="season"; version="0.3.10"; sha256="1gkn333k2ga545gkm6k9nky2n22yh1jgm58g7w693rsq3h3m0j5w"; depends=[ggplot2 MASS survival]; }; seasonal = derive2 { name="seasonal"; version="1.7.0"; sha256="1mna8w1haj5h2rhiw7jkhprr6cc9qr0n8x73d10v0l732kx41n31"; depends=[x13binary]; }; seasonalview = derive2 { name="seasonalview"; version="0.3"; sha256="1l705yc7ssldsfckbgnvd95sh3zzhpkmf1rr6ar2s60s3wsyly4n"; depends=[dygraphs htmlwidgets openxlsx seasonal shiny shinydashboard xtable xts zoo]; }; seastests = derive2 { name="seastests"; version="0.14.2"; sha256="04kx4sijnpsarq4iaclxvckgr5y0gmz5a0fmkkqjmfi3hm1kvw3d"; depends=[forecast xts zoo]; }; seawaveQ = derive2 { name="seawaveQ"; version="1.0.0"; sha256="19vm1f0qkmkkbnfy1hkqnfz6x2a7g9902ka76bhpcscynl69iy56"; depends=[lubridate NADA survival]; }; - secr = derive2 { name="secr"; version="4.1.0"; sha256="1ylwiw33siaqs8yd3pbpxx6lpipsf1rj474bs8yqiv5ihpxqfyga"; depends=[abind MASS mgcv nlme raster Rcpp RcppEigen RcppNumerical RcppParallel sp stringr]; }; - secrdesign = derive2 { name="secrdesign"; version="2.5.7"; sha256="064c9vwcn0pn0hd461j60fzzc21k22gqlm5zcsz2qqvv5c64ynic"; depends=[abind openCR secr]; }; + secr = derive2 { name="secr"; version="4.2.0"; sha256="008yiv1dq5i1wnjpfb288v60yn58bn54n06rksvmbhppvpg9p4pd"; depends=[abind MASS mgcv nlme raster Rcpp RcppEigen RcppNumerical RcppParallel sp stringr]; }; + secrdesign = derive2 { name="secrdesign"; version="2.5.10"; sha256="14pi5k3iz8xzm832ms82hgzdg8sh9nfsns3dw7mm81n7p03014dd"; depends=[abind openCR secr]; }; secret = derive2 { name="secret"; version="1.0.0"; sha256="09b28f7ndc167bbanbdydralykq718fixnrgs5xr9d3fbdhz1vdl"; depends=[assertthat curl jsonlite openssl rprojroot]; }; + secrettext = derive2 { name="secrettext"; version="0.1.0"; sha256="129v524yyb464mcij7hvzv05cxliaz5nm7v30g9g9ppskcdqhsx2"; depends=[dplyr magrittr rlang stringr testthat tidyr]; }; secrlinear = derive2 { name="secrlinear"; version="1.1.1"; sha256="0jcvraypkss1gphh4cjb0b4v9460fj4dw80yd057ah11p9942ggs"; depends=[igraph maptools MASS rgdal secr sp]; }; secsse = derive2 { name="secsse"; version="2.0.0"; sha256="0qsbn56vc6y19hmc94bimv1mf86ayxa8rj38qvvsxjfm9czmw2ac"; depends=[ape apTreeshape DDD deSolve doParallel foreach geiger phylobase]; }; secure = derive2 { name="secure"; version="0.5"; sha256="16pv5m7rrcs8hcjj3kylq7smyzf2qk8rkg9m1b421w0ac7lg04x1"; depends=[MASS Rcpp RcppArmadillo]; }; securitytxt = derive2 { name="securitytxt"; version="0.1.1"; sha256="0yrydcc68qcsq5wrdfgwfi347pdd0zc8hp2ikmw3iz31anm3b4yw"; depends=[Rcpp]; }; - see = derive2 { name="see"; version="0.4.0"; sha256="1qnmd43ljrdfwf8ks7a89j7wrhpmibs7r0yyidgchmja4scqyp61"; depends=[bayestestR dplyr effectsize ggplot2 ggridges gridExtra insight magrittr parameters rlang scales]; }; + see = derive2 { name="see"; version="0.4.1"; sha256="0w32jqs9b7bqm27ld21pmlwxsbhwpwwa5bv6w15p1lx56gzi5smi"; depends=[bayestestR dplyr effectsize ggplot2 ggridges insight magrittr parameters rlang]; }; seeclickfixr = derive2 { name="seeclickfixr"; version="1.1.0"; sha256="1agsqq2msrqrssffc6liyjjs6nqm90xy2inlcjbkdac5dhinjc4n"; depends=[jsonlite RCurl]; }; - seedCCA = derive2 { name="seedCCA"; version="1.0"; sha256="1grs6ykiyp8p5gh93hgb4niggppbh2wzwl6yx0l1qs9fkcz5zvy7"; depends=[CCA corpcor]; }; + seedCCA = derive2 { name="seedCCA"; version="3.0"; sha256="076pkv083dp71m6ifjzx9spfwmc1625r9d72spf0vhf8pwwsha4v"; depends=[CCA corpcor]; }; + seeds = derive2 { name="seeds"; version="0.9.0"; sha256="18yyiwv00vxfxdrw88hqilcv2307h93wlq1wkg4kqf6s3jsf40l0"; depends=[callr coda Deriv deSolve dplyr ggplot2 Hmisc MASS matrixStats mvtnorm pracma R_utils Ryacas statmod tidyr]; }; seedwater = derive2 { name="seedwater"; version="1.0"; sha256="0qqhjax16lnyriv6q9n89g93bs1zy8xwx9jp0xbilba7djzjh33g"; depends=[rpanel tkrplot]; }; + seer = derive2 { name="seer"; version="1.1.4"; sha256="02vv9vrnp8rj44qpn9yiigg95n7bg5v89pjdmrl5y8y1n8ax86xn"; depends=[dplyr ForeCA forecast forecTheta furrr future magrittr Mcomp purrr randomForest repmis stringr tibble tsfeatures urca]; }; seewave = derive2 { name="seewave"; version="2.1.5"; sha256="1qg8f5gik9pw6f9mcxqmrc9x3003s8vdm6g01pjjpyc9qaqiz2vi"; depends=[tuneR]; }; seg = derive2 { name="seg"; version="0.5-7"; sha256="165hl55vzyf3jqlykqji37p2syzhc8dxdjxd4wwr562qnlymzszx"; depends=[sp splancs]; }; segMGarch = derive2 { name="segMGarch"; version="1.2"; sha256="0chw41h25jka9wa3rf3d8dq2ym47379jflv33q6qxaak8xy1kmd9"; depends=[corpcor doParallel fGarch foreach iterators mvtnorm Rcpp RcppArmadillo]; }; @@ -13306,7 +13455,7 @@ in with self; { sejmRP = derive2 { name="sejmRP"; version="1.3.4"; sha256="1j3sadbp12fip3n96s0hx1sg4kzwx8z01p1c905kv8gffhkz9bh0"; depends=[cluster DBI dplyr factoextra RPostgreSQL rvest stringi tidyr XML xml2]; }; selac = derive2 { name="selac"; version="1.7.0"; sha256="0zj5l3q0apn8z0bxna7z7rraq89dq9qfqfclx9ybazr4saq8zk5w"; depends=[ape data_table deSolve expm MASS Matrix nloptr nnet phangorn RColorBrewer seqinr statmod zoo]; }; selectMeta = derive2 { name="selectMeta"; version="1.0.8"; sha256="0i0wzx5ggd60y26lnn4qk4n8h27ahll9732026ppks1djx14cdy0"; depends=[DEoptim]; }; - selectapref = derive2 { name="selectapref"; version="0.1.1"; sha256="0pn0s8dxbshwmv0qdrf670cjk3inf5w7jgac3fq29gmcx4f3fhl2"; depends=[]; }; + selectapref = derive2 { name="selectapref"; version="0.1.2"; sha256="0njibljh3hiqdn4wdb031bdg1bh3xpixgczbi5i01gaavybsq4cc"; depends=[]; }; selectiongain = derive2 { name="selectiongain"; version="2.0.591"; sha256="11gd9xdn3jl3mg3c9ykw8bqvcxhihn19iqsy8dl8bacijjv84bva"; depends=[mvtnorm]; }; selectiveInference = derive2 { name="selectiveInference"; version="1.2.5"; sha256="07kzpvdmflca1sriqfzn20f84fx2b9kwwiqm91lqjpx854bsx5kh"; depends=[adaptMCMC glmnet intervals MASS Rcpp survival]; }; selectr = derive2 { name="selectr"; version="0.4-2"; sha256="09y1n3iy297g49xlpl7xrjpwgnm57pskx5991lyfcpizbz8ax22m"; depends=[R6 stringr]; }; @@ -13315,7 +13464,7 @@ in with self; { selfea = derive2 { name="selfea"; version="1.0.1"; sha256="0zyxbd5vg8nhigill3ndcvavzbb9sbh5bz6yrdsvzy8i5gzpspvx"; depends=[ggplot2 MASS plyr pwr]; }; selfingTree = derive2 { name="selfingTree"; version="0.2"; sha256="18ylxmg2ms4ccgm4ahzfl65x614wiq5id7zazjjz5y75h8gs7gzj"; depends=[foreach]; }; sem = derive2 { name="sem"; version="3.1-9"; sha256="1f9c6g6pfx66gd2pappcsqh484ah6a0x4z47hpd46rah0817hcsa"; depends=[boot MASS matrixcalc mi]; }; - semEff = derive2 { name="semEff"; version="0.2.1"; sha256="0437pgr6hidscgvfhb9xaryanb1mrbcgb5x1afprc4amw0pjzjrs"; depends=[boot lme4]; }; + semEff = derive2 { name="semEff"; version="0.3.0"; sha256="18wmxkk0wmk7y3g1r7fwif7f6mhcgrsb60iv20d8f7bkhwkvfnx4"; depends=[boot lme4]; }; semPLS = derive2 { name="semPLS"; version="1.0-10"; sha256="0q5linjyv5npkw4grx3vq58iq2q1grf06ikivhkg8w7rvb7pqn6b"; depends=[lattice]; }; semPlot = derive2 { name="semPlot"; version="1.1.2"; sha256="0l1v9yi1pv59iwfknw4dh9qskk5y8r347jq1vq13gnfd3bmd71xr"; depends=[colorspace corpcor igraph lavaan lisrelToR OpenMx plyr qgraph regsem rockchalk sem XML]; }; semPower = derive2 { name="semPower"; version="1.0.0"; sha256="0wciz5qrd40q4mxq96pibnya11ac42n37c9xhjd4zfhznhjz06bb"; depends=[]; }; @@ -13331,14 +13480,15 @@ in with self; { semsfa = derive2 { name="semsfa"; version="1.1"; sha256="1k6i1m4r9y7j85rlrsgfjm8w15ax4xgf70xyvqwsszmf9950ldxx"; depends=[doParallel foreach gamlss iterators mgcv moments np]; }; semtree = derive2 { name="semtree"; version="0.9.14"; sha256="1gyjrvqvqmm0dcbddjq90v3gsniiz9rl66nxiayvfbkhs4pih39z"; depends=[bitops cluster digest expm ggplot2 MASS matrixcalc matrixStats mvtnorm OpenMx plotrix rpart rpart_plot sets stringr tidyr]; }; semver = derive2 { name="semver"; version="0.2.0"; sha256="10wpkyms2cix3bsin2q0qhkbl445pwwpa5gm2s4jjw1989namkxy"; depends=[assertthat Rcpp]; }; - sen2r = derive2 { name="sen2r"; version="1.2.1"; sha256="19rzh7xxq6b9rbiqmmk4rwh5x0w3h8p8yk7c3111fggm67jy62dv"; depends=[data_table doParallel foreach geojsonio httr jsonlite leaflet leaflet_extras magrittr mapedit raster reticulate sf shiny shinydashboard shinyFiles shinyjs shinyWidgets stars units XML]; }; + semverutils = derive2 { name="semverutils"; version="0.1.0"; sha256="0y3zh8n8bgs3ag8yy9cnp0i0xrn0iqflcbrya70glyb40148w9sw"; depends=[foreach R6]; }; + sen2r = derive2 { name="sen2r"; version="1.3.3"; sha256="1wm6n1mqbrp7h25j0vjjdr2k8qc44hnkrwnnp7zlqmwwdn5iwnkd"; depends=[data_table doParallel foreach geojsonio httr jsonlite leaflet leaflet_extras mapedit raster RcppTOML sf shiny shinydashboard shinyFiles shinyjs shinyWidgets stars XML]; }; sendmailR = derive2 { name="sendmailR"; version="1.2-1"; sha256="0z7ipywnzgkhfvl4zb2fjwl1xq7b5wib296vn9c9qgbndj6b1zh4"; depends=[base64enc]; }; sendplot = derive2 { name="sendplot"; version="4.0.0"; sha256="0ia2xck94nwirwxi38nv0viz5wb8291yiak6f0wgwh84irsrfp1h"; depends=[rtiff]; }; - sensR = derive2 { name="sensR"; version="1.5-1"; sha256="0hqnk6gvlkl9harz7rh5ikbp0s0vjwi63gxixqjfhkyk02ilaa3z"; depends=[MASS multcomp numDeriv]; }; + sensR = derive2 { name="sensR"; version="1.5-2"; sha256="073za0z6dawba2nd45hs20m0143kckxn3iglkyqz9vdfqwyv7wlq"; depends=[MASS multcomp numDeriv]; }; sensemakr = derive2 { name="sensemakr"; version="0.1.2"; sha256="0p5rh511fymbh8vkfwdv62xxwflkmrqwas1b16m0hlzjwyzdn03m"; depends=[]; }; - sensiPhy = derive2 { name="sensiPhy"; version="0.8.4"; sha256="1h225gdnvf3bdw7491h3dcpmdwm8bkqgkqmw9584rmjj8dj24xz1"; depends=[ape caper geiger ggplot2 phylolm phytools]; }; + sensiPhy = derive2 { name="sensiPhy"; version="0.8.5"; sha256="1kjkdklva5wzmw071gbn1v9g5cf0wzmvwgy5y0dgi530v6byaw8j"; depends=[ape caper geiger ggplot2 phylolm phytools]; }; sensibo_sky = derive2 { name="sensibo.sky"; version="1.0.0"; sha256="0s8gbj7qrcbcnflp7v0s93ykh2xgk7jwpyvzndj1f90hjy20x3bc"; depends=[glue httr jsonlite]; }; - sensitivity = derive2 { name="sensitivity"; version="1.17.0"; sha256="149hl1li8gqhlwc99z7q01vgdncyd54bf490pjmdj6gznkk35i02"; depends=[boot ggplot2]; }; + sensitivity = derive2 { name="sensitivity"; version="1.18.0"; sha256="100hrr5yd5fg13gbg7mv5amny3igw8zra8pcl97vwfdxykqqjk5c"; depends=[boot ggplot2]; }; sensitivity2x2xk = derive2 { name="sensitivity2x2xk"; version="1.01"; sha256="1r829k939zzmi0j4chdaniajchcflmmjrl3a9hwnkg0wkfnjbvdl"; depends=[BiasedUrn mvtnorm]; }; sensitivityCalibration = derive2 { name="sensitivityCalibration"; version="0.0.1"; sha256="1fn07dra7dhpsg6f1yn1ayfpmvwaxma8cps94070nrpfwmdvi04g"; depends=[ggplot2 ggrepel plotly relaimpo splitstackshape stringi]; }; sensitivityPStrat = derive2 { name="sensitivityPStrat"; version="1.0-6"; sha256="0rfzvkpz7dll3173gll6np65dyb40zms63fkvaiwn0lk4aryinlh"; depends=[survival]; }; @@ -13347,12 +13497,12 @@ 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.3.0"; sha256="0pmhlc5aqz1vwl4fpn38nkqy63pbq6q62fk9xjja4khrq35zh9yb"; depends=[maxLik mvtnorm]; }; - sensobol = derive2 { name="sensobol"; version="0.2.1"; sha256="0m6iqr4wylqgg2r3nqylbzblg2sxa3j4b1rakk99l1giqxlql8nc"; depends=[boot data_table ggplot2 magrittr matrixStats 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]; }; + sensobol = derive2 { name="sensobol"; version="0.2.2"; sha256="0j5nn5zmz7xfiv2zkik6k12w962p7m60czni9hsfndvvpvwiy2i5"; depends=[boot data_table ggplot2 magrittr matrixStats randtoolbox Rdpack rlang scales stringr]; }; 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.7.1"; sha256="13myh7w9pynmgvqspsxpnj8mz8jz8nwkwjyax4hahvwb9707hf2s"; depends=[data_table ggplot2 lexicon stringi syuzhet textclean textshape]; }; - sentometrics = derive2 { name="sentometrics"; version="0.8.0"; sha256="1aaam2hc25332clicnw00nw5mbflq37myjm0sfr5gn9qjq43qafd"; depends=[caret data_table foreach ggplot2 glmnet ISOweek quanteda Rcpp RcppArmadillo RcppParallel RcppRoll stringi]; }; + sentometrics = derive2 { name="sentometrics"; version="0.8.1"; sha256="1kfip67fiplkwcsj35vhkihgnaczx2fj6cvv0mha2pm5c2n5j8l0"; depends=[caret data_table foreach ggplot2 glmnet ISOweek quanteda Rcpp RcppArmadillo RcppParallel RcppRoll stringi]; }; + sentryR = derive2 { name="sentryR"; version="1.1.0"; sha256="0kz81dbxg4zyns829cjhjm2g88pxzaaxdk7c8qabvl0zgqys2chy"; depends=[httr jsonlite stringr tibble uuid]; }; separationplot = derive2 { name="separationplot"; version="1.3"; sha256="0ggyr4asp86hvdp4bwdkljz9b2gzdxm2y9nbz2srlgh3m4hlz2cs"; depends=[foreign Hmisc MASS RColorBrewer]; }; seplyr = derive2 { name="seplyr"; version="0.8.5"; sha256="0cccnggnix5w2a31prvnsp2hl6x8k4rm4nchik9aiqwj2x5kz3hq"; depends=[dplyr rlang tidyr wrapr]; }; seqCBS = derive2 { name="seqCBS"; version="1.2.1"; sha256="176ggpdcgmpsjixmz0ldknyd0vw120kjyrid3bq2bn4cgkwzb74z"; depends=[clue]; }; @@ -13361,12 +13511,13 @@ in with self; { seqICP = derive2 { name="seqICP"; version="1.1"; sha256="1dfhl7g47icjw38p9c0hyvnn3pwzw7pndywk22vgcyfhiz23xjcp"; depends=[dHSIC mgcv]; }; seqMeta = derive2 { name="seqMeta"; version="1.6.7"; sha256="11dscdrlnk5jzg0q2g59qis4xjr4xs86bi463jmhq53n9gsb4i1l"; depends=[CompQuadForm coxme Matrix survival]; }; seqRFLP = derive2 { name="seqRFLP"; version="1.0.1"; sha256="1i98hm8wgwr8b6hd237y2i9i0xgn35w4n2rxy4lqc5zq71gkwkvk"; depends=[]; }; - seqgendiff = derive2 { name="seqgendiff"; version="1.1.1"; sha256="0kj36zbrc96zjha57qx2f2n7wq6fay7c8x49n0jpnmjs66daaxlh"; depends=[assertthat cate clue irlba matchingR pdist sva]; }; + seqgendiff = derive2 { name="seqgendiff"; version="1.2.1"; sha256="1xidf5dqd7vbs6vl73q5ja1hfhlqsc3d212c0si2wm8f8fsb1bw3"; depends=[assertthat cate clue irlba matchingR pdist sva]; }; seqinr = derive2 { name="seqinr"; version="3.6-1"; sha256="0j30za6kji6y3v09cvcydiacnp65pv6ig8aw7cydl47l5s9chky4"; depends=[ade4 segmented]; }; seqmagick = derive2 { name="seqmagick"; version="0.1.3"; sha256="0983k7fbcv4ai42cxxi4f854b9mqx68rgyvy0mjhpb6md7ba59jy"; depends=[Biostrings magrittr]; }; - seqminer = derive2 { name="seqminer"; version="7.1"; sha256="1jydcpkw4rwfp983j83kipvsvr10as9pb49zzn3c2v09k1gh3ymy"; depends=[]; }; + seqminer = derive2 { name="seqminer"; version="8.0"; sha256="00jzj8mwb0zaiwlifd41b26mrq9mzigj18nc29dydi0r42hxg16i"; depends=[]; }; seqmon = derive2 { name="seqmon"; version="2.3"; sha256="0lvjb3mx1h5nbbn3kmjwviy9gzsv9k1bs57jdfc09kid7kisaqmn"; depends=[]; }; seqtest = derive2 { name="seqtest"; version="0.1-0"; sha256="1bdfww9szh7h278id5xpfc39mxkcix3yvsdwc68wx3q3x0wxhqhq"; depends=[]; }; + sequence = derive2 { name="sequence"; version="2.0"; sha256="0r5h96gcp18lwgrl2pjlr71xqspkf6qmm1m0xjq5vadalfa7y294"; depends=[]; }; sequences = derive2 { name="sequences"; version="0.5.9"; sha256="17571m525b6a3k4f0m936wfq401181gx1fpb7x4v0fhaldzdmk3a"; depends=[Rcpp]; }; sequenza = derive2 { name="sequenza"; version="3.0.0"; sha256="13l16lacdcf7fn96yj3xqxap0l19ma9ppkxxx5qk9f5abbvdk303"; depends=[copynumber iotools pbapply readr seqminer squash]; }; sequoia = derive2 { name="sequoia"; version="1.3.3"; sha256="0k0vl7rz9jylry80w8lbqyg3ws3bhkg8axpzy0rrd8xw1lxbpf93"; depends=[plyr]; }; @@ -13376,27 +13527,27 @@ in with self; { serieslcb = derive2 { name="serieslcb"; version="0.4.0"; sha256="1ip4k2xzg06hwsni62ai1whs1zzhwlf94507inpfpqz3jmmafrhq"; depends=[gplots shiny]; }; seroincidence = derive2 { name="seroincidence"; version="2.0.0"; sha256="0sam4y7w6prswz0izkm1a9v2k5rv7z22g1ajy15n9xix9aml5ms4"; depends=[]; }; serpstatr = derive2 { name="serpstatr"; version="0.0.1"; sha256="05nl61i1ida6pj6nqx7yvn6wz4ww43ix63pvqa7539r8lr6n3mpf"; depends=[httr]; }; - serrsBayes = derive2 { name="serrsBayes"; version="0.4-0"; sha256="060zs1n5h9ns9dd004f69qmbwbbqla97bhbldm8narhm84f8pf6i"; depends=[Matrix Rcpp RcppEigen truncnorm]; }; + serrsBayes = derive2 { name="serrsBayes"; version="0.4-1"; sha256="0618415n2izdgv85cnmlnpwy0lz7rnimspq8986w5w1ywhw2xpbm"; depends=[Matrix Rcpp RcppEigen truncnorm]; }; servosphereR = derive2 { name="servosphereR"; version="0.1.1"; sha256="0m1fjd3f1s2ss54xmcrm3p0c33hhi2dj0vim790g4y0mw2aicc8l"; depends=[data_table dplyr magrittr purrr rlang]; }; - servr = derive2 { name="servr"; version="0.15"; sha256="199k9aghwk9rf1rm8pjg60xacqww25cza259h5dfj1ixil0m6dxi"; depends=[httpuv jsonlite mime xfun]; }; + servr = derive2 { name="servr"; version="0.16"; sha256="106skz04iq4dkblr17idxsxfcfqic6rcaz8mahydkwjjppnhp5fc"; depends=[httpuv jsonlite mime xfun]; }; sesem = derive2 { name="sesem"; version="1.0.2"; sha256="0b1xzv38wpkhhlq87xrvlh45b8ksbi8bg4ar5hrf8gxa19r9rmi5"; depends=[gplots lavaan mgcv]; }; session = derive2 { name="session"; version="1.0.3"; sha256="04mcy1ac75fd33bg70c47nxqxrmqh665m9r8b1zsz5jij1sbl8q5"; depends=[]; }; sessioninfo = derive2 { name="sessioninfo"; version="1.1.1"; sha256="0j5f3l58fynxx3v0w62vqpii7miabszgljpja36xx9s8hikh8sqn"; depends=[cli withr]; }; - set = derive2 { name="set"; version="1.0"; sha256="0v17pfrrlncb55n1ag8q9qg9q4c9bq535ax0m0m7jdlpaprnwnf5"; depends=[do]; }; - set6 = derive2 { name="set6"; version="0.1.0"; sha256="1vvafhnl3dvl2iw3lnx0lsjb9vwkad017fri63yslikdhgrfjbqa"; depends=[checkmate R6]; }; + set = derive2 { name="set"; version="1.1"; sha256="0b6qzy3mqf2gfc5gjrn1k6k7ymprjzs2i948zsgcqdkgr8acasbm"; depends=[do]; }; + set6 = derive2 { name="set6"; version="0.1.3"; sha256="0l39zf3mkw810pzgd9s3vwqp4bajls86prnfmwfcknna0wfxk8ka"; depends=[checkmate R6]; }; setRNG = derive2 { name="setRNG"; version="2013.9-1"; sha256="02198cikj769yc32v8m2qrv5c01l2fxmx61l77m5ysm0hab3j6hs"; depends=[]; }; sets = derive2 { name="sets"; version="1.0-18"; sha256="16v7650p47khqrbbw0z98llmwmmhswqmhri0n7nrfhdqwmby1lbl"; depends=[]; }; setter = derive2 { name="setter"; version="0.0-1"; sha256="10fwrx8yysp99rrkbnn3rbz79vyzr2h3p7zxxlqapw1k2lllp0r5"; depends=[assertive_base]; }; settings = derive2 { name="settings"; version="0.2.4"; sha256="092sv6nccm6p2d695l9w0zfi2xgymk12c8p8lhl9nb86mxrb3nry"; depends=[]; }; severity = derive2 { name="severity"; version="2.0"; sha256="1mp19y2pn7nl9m8xfljc515kk5dirv0r2kypazpmd956lcivziqq"; depends=[]; }; - sf = derive2 { name="sf"; version="0.8-0"; sha256="05dyq0vcz2f1fl03hk3v1a4nz4s84yyqw4rc9w9cwfq71gvm9qwf"; depends=[classInt DBI magrittr Rcpp units]; }; + sf = derive2 { name="sf"; version="0.9-1"; sha256="1qghrskqwwlwxmmvkv7knhlr1a32ngyimycasy5gfazgviljsfn4"; depends=[classInt DBI magrittr Rcpp units]; }; sfa = derive2 { name="sfa"; version="1.0-1"; sha256="1acqxgydf8j5csdkx0yf169x3yaa31r0ccdrqarh6vj1hacm89ad"; depends=[]; }; sfadv = derive2 { name="sfadv"; version="1.0.1"; sha256="1rfpm6km5pckwhqgpvidm6qsj5sjdaqqj5b0sgvpslivfa4c80cr"; depends=[gmm minpack_lm]; }; sfc = derive2 { name="sfc"; version="0.1.0"; sha256="0cm4mfcfd9bhf2j5fppsihzrfipnldb6q3xradd88z9pwgrkfx2a"; depends=[dplyr sna tidyr triangle zoo]; }; sfdct = derive2 { name="sfdct"; version="0.0.6"; sha256="0ilh89mfwp1yqn44yn80vz1a6g65hryk6w87ngzvak3pd6jxq6aa"; depends=[dplyr RTriangle sf sp tibble]; }; - sfheaders = derive2 { name="sfheaders"; version="0.1.0"; sha256="1bbiqym7kvhyq7d39gmqyvivh5pa7q4d75vya2wrg6m930ihmvqw"; depends=[Rcpp]; }; + sfheaders = derive2 { name="sfheaders"; version="0.2.1"; sha256="0rkx7z10mrkqglxpyjz20y32hbidwpaws2k4hbx2g6a3by1qwddf"; depends=[Rcpp]; }; sfinx = derive2 { name="sfinx"; version="1.7.99"; sha256="14v47y00qwvc2s0vzjw19hwn85nzj8lna539c75qq6zkn6kir6va"; depends=[]; }; - sfsmisc = derive2 { name="sfsmisc"; version="1.1-4"; sha256="0zaw617zarmwir8l60riky0z6r1j3mwfnm1f32vqcbljb74akdj4"; depends=[]; }; + sfsmisc = derive2 { name="sfsmisc"; version="1.1-6"; sha256="04fvjdab6vyyghyqy0abxvfbyr1myz6yib7ibwiyjw9yf7fjrcjp"; depends=[]; }; sft = derive2 { name="sft"; version="2.2-1"; sha256="0fxz64ba58n6ghfqsgq64n1c7qkvi8c3lsa86732mil9w71yxw33"; depends=[fda SuppDists]; }; sgPLS = derive2 { name="sgPLS"; version="1.7"; sha256="1jk2j1zn5vq82rcjflnk7g6y2q0v5jl14k804dmigqg013gbykql"; depends=[mixOmics mvtnorm]; }; sgRSEA = derive2 { name="sgRSEA"; version="0.1"; sha256="0vyypnq81l36x0j44q2l9wbf3x4krz4fzypi7vyqhaq97mkzaw5j"; depends=[]; }; @@ -13408,14 +13559,14 @@ in with self; { sglg = derive2 { name="sglg"; version="0.1.5"; sha256="0b2lksn887h92y8l1gjmhm2pxzfn6kk0rjvyh9k2b1j4plkvp73b"; depends=[AdequacyModel Formula ggplot2 gridExtra moments robustloggamma ssym survival]; }; sglr = derive2 { name="sglr"; version="0.7"; sha256="11gjbvq51xq7xbmpziyzwqfzf4avyxj2wpiz0kp4vfdj3v7p4fp9"; depends=[ggplot2 shiny]; }; sgmcmc = derive2 { name="sgmcmc"; version="0.2.5"; sha256="0lq79c7i6bklh8c63wx3k6h9mk8s1abbr0hc41drcm96bbbg0aal"; depends=[reticulate tensorflow]; }; - sgmodel = derive2 { name="sgmodel"; version="0.1.0"; sha256="03s9z7n7w3pys5dp1z5x91bszgv3q1sax5z591dz9rvmn5glp2lj"; depends=[ggplot2 ramify Rtauchen tidyverse]; }; + sgmodel = derive2 { name="sgmodel"; version="0.1.1"; sha256="1i13vp91i8s61ylsyg0iij1sfclwif7v91slr2srl8ddz6lm23nx"; depends=[ggplot2 ramify Rtauchen]; }; sgof = derive2 { name="sgof"; version="2.3.2"; sha256="020kc6h9iw4qhb9pdi7wk8vcy54dp10x0z3nlq3gwwbj1l9izc44"; depends=[poibin]; }; sgr = derive2 { name="sgr"; version="1.3"; sha256="0zxmrbv3fyb686hcgfy2w1w2jffxf41ab8yc90dsgf931s9c55wn"; depends=[MASS]; }; sgt = derive2 { name="sgt"; version="2.0"; sha256="0qb3maj5idwafs40fpdfrwzkadnh5yg8fvfzfs51p9yy69kbmlkx"; depends=[numDeriv optimx]; }; shades = derive2 { name="shades"; version="1.4.0"; sha256="1zg95sjhrfvbdlfc387g9p0vnb8nb6agdk1mb3wq3kwkm2da0bqj"; depends=[]; }; - shadow = derive2 { name="shadow"; version="0.6.3"; sha256="0xm3d3x02z2lk1n9z5ny7cdybyvxxznwrfn76nk1jx5dshqhrwpr"; depends=[plyr raster rgeos sp]; }; + shadow = derive2 { name="shadow"; version="0.6.4.1"; sha256="1v04v9g6slcr6iagqy6xk061dilxcvmrxv9n7r8z5ag3cbivl9ab"; depends=[plyr raster rgeos sp]; }; shadowtext = derive2 { name="shadowtext"; version="0.0.7"; sha256="1s1ip8zfr684a3ld7hvf524bhn2j31k6d1wbhh1ni0flsggv2ckf"; depends=[ggplot2 scales]; }; - shallot = derive2 { name="shallot"; version="0.4.7"; sha256="0lvvnia3yngywp7gm68kdwgfmvag4llhzim8nqcbl6iq52lvlj2g"; depends=[commonsMath rscala salso]; }; + shallot = derive2 { name="shallot"; version="0.4.9"; sha256="0zmai0h3xgdi1fmmfh7jcvzl5ibmj5c86p9rzfh3wdlyqrc3hz1a"; depends=[commonsMath rscala salso]; }; shape = derive2 { name="shape"; version="1.4.4"; sha256="0hadk3mapkhbh8xjkiz52vxdagmmgvm15xwpzb90ikw4giyipjzl"; depends=[]; }; shapeR = derive2 { name="shapeR"; version="0.1-5"; sha256="17fq4gsdvyniq7n4x1xdvb5kk50184i7why3pdf1djjhknym087j"; depends=[gplots jpeg MASS pixmap vegan wavethresh]; }; shapefiles = derive2 { name="shapefiles"; version="0.7"; sha256="08ghndihs45kylbzd9wnxffn8ixvxjhjnjldjyd526ai2sj8xcgf"; depends=[foreign]; }; @@ -13423,40 +13574,46 @@ in with self; { shapper = derive2 { name="shapper"; version="0.1.2"; sha256="0z2ad0hk1gwxbr4kqbk26lzl25hrcifcp92i3am5j6y0ys71dwsx"; depends=[ggplot2 reticulate]; }; shar = derive2 { name="shar"; version="1.1"; sha256="157b1pia21qygb7pqb97v8b3bklnfq40xf8y7wg6p2ixkab0ws6c"; depends=[classInt raster Rcpp spatstat]; }; sharpData = derive2 { name="sharpData"; version="1.2"; sha256="0pvaq8i1vrra3d0wf6yyqkbin0zgsd1kvdzh4bfnyps6pzn5k789"; depends=[KernSmooth quadprog]; }; - sharpeRratio = derive2 { name="sharpeRratio"; version="1.2"; sha256="0jn8i8vvqahraw78cw6w05v03x49m62l7m1iz81c6hwg05ld36jy"; depends=[ghyp Rcpp]; }; + sharpeRratio = derive2 { name="sharpeRratio"; version="1.3"; sha256="1x8vskx0hgdkxwdsfpc82amhj2089g1wj0qsj6nkd0n4k78wv21x"; depends=[ghyp Rcpp]; }; sharpr2 = derive2 { name="sharpr2"; version="1.1.1.0"; sha256="1r7anfr296l5sbhgry6rb15hlca6mpcm24qssdzz9bckavyfvqgi"; depends=[Matrix mvtnorm]; }; + sharpshootR = derive2 { name="sharpshootR"; version="1.6"; sha256="1kzgxg1w5ajirsif6pgdqyal4aidj6y0q29zhikds4pr9x5sqcs4"; depends=[ape aqp circular cluster curl digest e1071 Hmisc igraph lattice plyr RColorBrewer reshape2 scales soilDB sp stringi vegan]; }; sharx = derive2 { name="sharx"; version="1.0-5"; sha256="10sfjg6946jfk4051da0w1v89503av40wckqaabr12syf8kn0aw8"; depends=[dclone dcmle Formula]; }; - shazam = derive2 { name="shazam"; version="0.2.2"; sha256="1qa9jfbiv40x2dnvfkgcmp0vikv8k1migffqqn8v96zyisndvj8k"; depends=[alakazam ape diptest doParallel dplyr foreach ggplot2 igraph iterators kedd KernSmooth lazyeval MASS progress rlang scales SDMTools seqinr stringi tidyr]; }; + shazam = derive2 { name="shazam"; version="0.2.3"; sha256="1c466yl596vra4bg03spkhz7ybsymaz2yg04amqnal06cwnp32hz"; depends=[alakazam ape diptest doParallel dplyr foreach ggplot2 igraph iterators kedd KernSmooth lazyeval MASS progress rlang scales seqinr stringi tidyr]; }; shelltrace = derive2 { name="shelltrace"; version="3.5.1"; sha256="1xgbavaa26185i6q3907ds3bzq4xrw027x1sw5vsybqrxdz04jiz"; depends=[bmp tiff xlsx]; }; shiftR = derive2 { name="shiftR"; version="1.5"; sha256="18y2qzqx8hd6yph1wnsq4ygm16pcdszynh174xsrxrhvx2h9mi4x"; depends=[]; }; - shiny = derive2 { name="shiny"; version="1.4.0"; sha256="0jvcxs0vdxdlbriahxjzzcmg8v8if21k3xvdgk59iskw71ch81qc"; depends=[crayon digest fastmap htmltools httpuv jsonlite later mime promises R6 rlang sourcetools xtable]; }; + shiny = derive2 { name="shiny"; version="1.4.0.2"; sha256="0r70ynic4wi9cxizk2gg097mfjps3a17ngi763cs6rijs21sr9nw"; depends=[crayon digest fastmap 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_info = derive2 { name="shiny.info"; version="0.2.0"; sha256="162wvb02z5h1y7xgsyl6wv88zlfmbm1jlnz48f56fyybs54baw41"; depends=[git2r glue shiny]; }; shiny_router = derive2 { name="shiny.router"; version="0.1.1"; sha256="0biwni6bk39qafvsh8w32crlgm4hf8r9kwkmnlc3w5za2x2fja4c"; depends=[magrittr shiny]; }; - shiny_semantic = derive2 { name="shiny.semantic"; version="0.2.1"; sha256="0m0f22qlmf7f2cf33myn72dm48yslqyx4kwzb96i78a3yz6a2awp"; depends=[htmltools htmlwidgets jsonlite magrittr purrr shiny]; }; + shiny_semantic = derive2 { name="shiny.semantic"; version="0.3.0"; sha256="0kcwkl0rjll8b73g43hk2fclwchr6pl71p632b302zz44vbnvg15"; depends=[htmltools htmlwidgets jsonlite magrittr purrr shiny]; }; shinyAce = derive2 { name="shinyAce"; version="0.4.1"; sha256="1m33dfm2kjirvgix7ybv1kbzgjkicdpv411g9c0q3fw6rnyhfxxn"; depends=[jsonlite shiny]; }; shinyBS = derive2 { name="shinyBS"; version="0.61"; sha256="0rhim4mbp4x9vvm7xkmpl7mhb9qd1gr96cr4dv330v863ra2kgji"; depends=[htmltools shiny]; }; + shinyCyJS = derive2 { name="shinyCyJS"; version="0.0.11"; sha256="1wvrv5hdr74d2a68iwy76ffawmy4mpw0swrngw41zqpjd6hjiyxd"; depends=[htmlwidgets]; }; shinyDND = derive2 { name="shinyDND"; version="0.1.0"; sha256="0nkvz4hmjzmxlzj4vkjrdy8xlbxapg1amk180irgvwicqldi4jpm"; depends=[htmltools shiny]; }; shinyEffects = derive2 { name="shinyEffects"; version="0.1.0"; sha256="03fm2i1ydlp90w299nvz7dqs9724g0m2f0bc44ni8m2gz9cfpccs"; depends=[htmltools shiny shinydashboard]; }; shinyEventLogger = derive2 { name="shinyEventLogger"; version="0.1.1"; sha256="1piycfg9j0dg3fgq9f88gs7zvhldmrzn7ggy2ijbh6r7iwipwgdm"; depends=[bupaR jsonlite mongolite purrr R_utils shiny stringr]; }; shinyFeedback = derive2 { name="shinyFeedback"; version="0.1.0"; sha256="01qp75c5dsvc4xs1id1yhn81gmjl0hnjz8msf8mkvf4ifqal563f"; depends=[digest shiny]; }; shinyFiles = derive2 { name="shinyFiles"; version="0.7.5"; sha256="1143m941hma9hc77c3xcw26c0ygfhn9ii2sbp9wrydxv4gc7mr8a"; depends=[fs htmltools jsonlite shiny tibble]; }; - shinyHeatmaply = derive2 { name="shinyHeatmaply"; version="0.1.0"; sha256="1vl80vp7yslnh0dvcrpysfn5rndjavphy31y15546q7ax7d0fn6v"; depends=[dplyr DT heatmaply htmltools htmlwidgets jsonlite plotly RColorBrewer readxl shiny viridis xtable]; }; + shinyHeatmaply = derive2 { name="shinyHeatmaply"; version="0.2.0"; sha256="1n7c7dvvb9kqay2phcf0bkwi990x1cjl7js6pq05xx7rli5bc5h4"; depends=[dplyr heatmaply htmltools plotly readxl rmarkdown shiny xtable]; }; shinyKGode = derive2 { name="shinyKGode"; version="1.0.5"; sha256="004zwz4kqfijzvvwkq8v1gi25w1wrdlg8230g93w36gbi6cl2vk1"; depends=[ggplot2 gridExtra KGode mvtnorm pracma pspline reshape2 shiny shinyjs XML]; }; + shinyKnobs = derive2 { name="shinyKnobs"; version="0.1.3"; sha256="1rxlvq4vr87krf7d6mpx0y53hyz8q1jnx6nv7mlhc1ck13q6fgac"; depends=[htmltools shiny]; }; shinyLP = derive2 { name="shinyLP"; version="1.1.2"; sha256="1sjcll10ciq6pj9h8c6ybjqp8763wc423hddlalcblxxpajf6avz"; depends=[shiny]; }; shinyML = derive2 { name="shinyML"; version="0.2.0"; sha256="1x7fshfq85cbaydhhqx1lcfybv6qlrc6rmajsbcvvnbnbp1m5ysb"; depends=[data_table dplyr DT dygraphs ggplot2 h2o plotly shiny shinycssloaders shinydashboard shinyWidgets sparklyr tidyr]; }; shinyMatrix = derive2 { name="shinyMatrix"; version="0.3.0"; sha256="0gakbwfrqyxbm946rgxk3xc4qh4i3631hg8q37058ji63bxqzadc"; depends=[jsonlite shiny]; }; shinyMobile = derive2 { name="shinyMobile"; version="0.1.0"; sha256="1jk4dpg78qxpsqnj44ia3z668bhf8mfziiz8v4zp7mmpp7x5447b"; depends=[htmltools jsonlite magrittr shiny]; }; shinyMolBio = derive2 { name="shinyMolBio"; version="0.2"; sha256="09lq5pvis450il1agcq5n9cilnq84rfv08w2dz1d0bbq1qgrgnvg"; depends=[checkmate dplyr plotly purrr RColorBrewer RDML shiny stringr whisker]; }; + shinyNotes = derive2 { name="shinyNotes"; version="0.0.1"; sha256="1l0nw6xac410109jrr88a62a5fhv6h6xaql19bp0h8qxyc2fppjh"; depends=[DBI dbplyr dplyr magrittr RSQLite shiny shinyjs shinyWidgets stringr]; }; shinyRGL = derive2 { name="shinyRGL"; version="0.1.0"; sha256="07llg1yg5vmsp89jk60ly695zvxky6n06ar77mjxzlyc294akwmy"; depends=[rgl shiny]; }; - shinySIR = derive2 { name="shinySIR"; version="0.1.0"; sha256="1khl6p7256cy6iqg8wyracdyz08iysak91r79hf0xhh2gbb8fs49"; depends=[deSolve dplyr ggplot2 shiny tidyr]; }; + shinySIR = derive2 { name="shinySIR"; version="0.1.1"; sha256="0m8ff5535hy5b363l4xkrdsm3m7mnfdb23h2wgqmysdv4af1gm2i"; depends=[deSolve dplyr ggplot2 shiny tidyr]; }; shinyShortcut = derive2 { name="shinyShortcut"; version="0.1.0"; sha256="101wz9s4rk7fbaqgm0r2v3v8za20vdxwq4vhkz8xr7y5pr65sxiq"; depends=[]; }; shinyTime = derive2 { name="shinyTime"; version="1.0.1"; sha256="1d830wf7d5ki7frbr1vgy9d0vllyfcylq7pfkspjkz64b2xfhah3"; depends=[htmltools shiny]; }; shinyTree = derive2 { name="shinyTree"; version="0.2.7"; sha256="0jfx2capckv7hf2yx3fn8i4rcmhi222ah91jnmhg497x8wgz31s3"; depends=[htmlwidgets jsonlite promises shiny stringr]; }; - shinyWidgets = derive2 { name="shinyWidgets"; version="0.5.0"; sha256="111w6f23m16w6zb5bg85brg90gsyw50rad6c4qqm1y5k3ny1gzgb"; depends=[htmltools jsonlite scales shiny]; }; + shinyWidgets = derive2 { name="shinyWidgets"; version="0.5.1"; sha256="1p56qfgj5y0rzyqj889hmbl7k6gwyxc58rzss9y2vav9d3jgsrr8"; 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]; }; shinybootstrap2 = derive2 { name="shinybootstrap2"; version="0.2.1"; sha256="17634l3swlvgj1sv56nvrpgd6rqv7y7qjq0gygljbrgpwmfj198c"; depends=[htmltools jsonlite shiny]; }; + shinybrms = derive2 { name="shinybrms"; version="1.0.1"; sha256="1ngm8ryfppmdk7l46iv4a6gvz35l5z1rrv89dlg1cknam4zgyvc1"; depends=[brms shiny]; }; shinybusy = derive2 { name="shinybusy"; version="0.2.0"; sha256="1zhi4nfnwwxn25r47fa8c5dq0wfvxmmdzrr8vfiq3qjj46bi1alf"; depends=[htmltools htmlwidgets jsonlite shiny]; }; shinycssloaders = derive2 { name="shinycssloaders"; version="0.3"; sha256="1gzq1lhcnhqd145ys3ixf0l13l560fiqr2sc3m2nrijwxlgcw54d"; depends=[digest glue shiny]; }; shinycustomloader = derive2 { name="shinycustomloader"; version="0.9.0"; sha256="1klx71vr26g0gjf6hbiia1qidqii5d467i1sdjvlrg1hxdcggqff"; depends=[glue shiny]; }; @@ -13465,25 +13622,27 @@ in with self; { shinyglide = derive2 { name="shinyglide"; version="0.1.2"; sha256="0i98k3gl83kfzp3vs1his05idhwj1n0bw98ik7d62cgn4rqi6ar4"; depends=[htmltools shiny]; }; shinyhelper = derive2 { name="shinyhelper"; version="0.3.2"; sha256="1c4hvf19j3yyh8r12nx85ldkxs89g98q74csnqs5ml5l79a65vgp"; depends=[markdown shiny]; }; shinyhttr = derive2 { name="shinyhttr"; version="1.0.0"; sha256="1l02g0qgvycwpfr6wl7svnms128fhlzbn9p7i4mr7ghgsd5qr58a"; depends=[shinyWidgets]; }; - shinyjqui = derive2 { name="shinyjqui"; version="0.3.2"; sha256="1a73vsq1wc3xf14y64hkgnk5jgxj98b8aj3g0fs7mgayar3an5g0"; depends=[htmltools htmlwidgets jsonlite shiny]; }; + shinyjqui = derive2 { name="shinyjqui"; version="0.3.3"; sha256="0n4ijxmkp8x6dwrsxwvx0zgd8b5129cmn6q6rrav38v1q5k8889x"; depends=[htmltools htmlwidgets jsonlite shiny]; }; shinyjs = derive2 { name="shinyjs"; version="1.1"; sha256="14k8y313ppj23m9rhlk8jc94x6sbn3qrsnx6xrijiyv8m8dii1l9"; depends=[digest htmltools jsonlite shiny]; }; shinyloadtest = derive2 { name="shinyloadtest"; version="1.0.1"; sha256="0k9b57wm2cv78qf9qryqr1s0p7gsncn8axd285f6rrayg4czb40l"; depends=[curl dplyr getPass ggplot2 glue gtable htmltools httpuv jsonlite lubridate magrittr progress R6 readr rlang rmarkdown scales stringr svglite tibble websocket xml2]; }; shinylogs = derive2 { name="shinylogs"; version="0.1.7"; sha256="1b4p0g1vf9wn643rybf382mw6mrrl49qsykh7npa3agcarwznmgr"; depends=[anytime bit64 data_table DBI digest htmltools jsonlite nanotime RSQLite shiny]; }; - shinymanager = derive2 { name="shinymanager"; version="1.0.100"; sha256="1ls5qg4zmqvapxcbkp4jk8r8rqmd223mb9s2hqq022hbyglclhxk"; depends=[billboarder DBI DT htmltools openssl R_utils R6 RSQLite shiny]; }; - shinymaterial = derive2 { name="shinymaterial"; version="1.0.0"; sha256="1mgvxhk2ky3612ci9f1zz8x7z37r176kw1j0b4bs2843gmnxjfga"; depends=[jsonlite shiny]; }; + shinymanager = derive2 { name="shinymanager"; version="1.0.200"; sha256="00dvzcpba4awmdgy8wcn8h7qdc8mdrfaq3kp28h509xn3gax02wn"; depends=[billboarder DBI DT htmltools openssl R_utils R6 RSQLite shiny]; }; + shinymaterial = derive2 { name="shinymaterial"; version="1.0.1"; sha256="1vmbc5g55d3nsz18r2s2z5wgm2yrxygnyarsfhkqf3vyj8vndglw"; depends=[jsonlite shiny]; }; shinypanels = derive2 { name="shinypanels"; version="0.5.0"; sha256="1rslz9wl3gx11dm6il77j4k5swxvcfy5mf0zffbs4zk8xjgpzzj6"; depends=[glue htmltools shiny shinyjs]; }; + shinyr = derive2 { name="shinyr"; version="0.2.6"; sha256="16bknhab23by0h1b6c9q6rzyzyqnrcjhpsgw0gv427jycap9b0vv"; depends=[caret corrplot DMwR dplyr e1071 knitr nnet plotly randomForest RColorBrewer shiny shinydashboard tm wordcloud]; }; shinyrecap = derive2 { name="shinyrecap"; version="0.1.0"; sha256="1mic7azxz2in67g3a2ir550w8psh6kc75p6hja6m62a0yy7j2n92"; depends=[CARE1 coda conting dga future ggplot2 ipc LCMCR promises Rcapture reshape shiny shinycssloaders testthat]; }; shinystan = derive2 { name="shinystan"; version="2.5.0"; sha256="18alf5kiqw7y2l6m5nxxizwc2znsf9frxfsqhvgcad8hld9cbya5"; depends=[bayesplot colourpicker DT dygraphs ggplot2 gridExtra gtools markdown reshape2 rsconnect rstan shiny shinyjs shinythemes threejs xtable xts]; }; shinytest = derive2 { name="shinytest"; version="1.3.1"; sha256="1qn46kgqxfbfimghy5d200rmxpmbp7ckl7dm82m4bnrsf9ivzlgg"; depends=[assertthat callr crayon debugme digest htmlwidgets httpuv httr jsonlite parsedate pingr R6 rematch rstudioapi shiny testthat webdriver withr]; }; shinythemes = derive2 { name="shinythemes"; version="1.1.2"; sha256="12miz44n2zxfswnia7p8dirxj3miw0aqn4pkx2111ikz67ax84rf"; depends=[shiny]; }; shinytoastr = derive2 { name="shinytoastr"; version="2.1.1"; sha256="01j2z4gf1wxblrjayykwxdr2s8394i7k930x8g4hmrj7c9pv264n"; depends=[shiny]; }; - shipunov = derive2 { name="shipunov"; version="1.4"; sha256="0a2rd8qr9493gq74rqjaxjn9cxygikhy87jf1yqaxa6b9djwdqzc"; depends=[]; }; + shinyypr = derive2 { name="shinyypr"; version="0.0.2"; sha256="1k6jsw6gnpwk90hkpa9grki0b68cab57vbd0h6ldjqr11giwcz8z"; depends=[bsplus chk dplyr DT ggplot2 lifecycle magrittr purrr readr shiny shinyjs waiter ypr]; }; + shipunov = derive2 { name="shipunov"; version="1.7"; sha256="0sq2xk1dsw0jca9lg0j8qypfzxzzw8lfn3ldgcpyn3wmhyg2w1xc"; depends=[]; }; shock = derive2 { name="shock"; version="1.0"; sha256="11m52al591xjznl62q1waxsg5m1a1afmd0yqcc5zsjlrplykg4lp"; depends=[capushe GGMselect glasso igraph mvtnorm]; }; shopifyr = derive2 { name="shopifyr"; version="1.0.0"; sha256="05hih1v5vvr7vmwarizsdx8517g74s96fdsz3klcz3g12idx1nqn"; depends=[curl jsonlite R6]; }; shortcuts = derive2 { name="shortcuts"; version="1.4.0"; sha256="0y77napfz1v3s667cmyn8357xg5lncbw1hc3hm5kra6nalhq1jps"; depends=[rstudioapi]; }; shotGroups = derive2 { name="shotGroups"; version="0.7.5.1"; sha256="0il6hlv2hnfx5rmj3vk3q9p24xqii77z6hdz5fsgyh4i3kgcyrjy"; depends=[boot coin CompQuadForm KernSmooth robustbase]; }; showimage = derive2 { name="showimage"; version="1.0.0"; sha256="1c0x3iqjdjsz3cdhc02b3qm2pwxjr1q2k87jwvxj9lnzzw81f1pl"; depends=[png]; }; - showtext = derive2 { name="showtext"; version="0.7"; sha256="1ihgqzfia36b0n9aa41p1w98wxxvs1lxh1zz0570hbfqmph1sk73"; depends=[showtextdb sysfonts]; }; + showtext = derive2 { name="showtext"; version="0.7-1"; sha256="0a5gg72bfrc7wm0phj1aflj1wc08kfi81ac32na6ya9s2ivyimw5"; depends=[showtextdb sysfonts]; }; showtextdb = derive2 { name="showtextdb"; version="2.0"; sha256="1qwwj9x2jvadvwn60h75k99c9xi7yhqjsgaakahz5paxgj583bsh"; depends=[sysfonts]; }; shp2graph = derive2 { name="shp2graph"; version="0-5"; sha256="1l9mg98hkb0bvr5dzd2p26g8mw5hqjxrym2gmbm10kyapvccfk56"; depends=[igraph maptools sp]; }; shrink = derive2 { name="shrink"; version="1.2.1"; sha256="0pd967wsys8fd7gyvr9y08km118yamfk5c1a1i2k8nr2ifpqmy0w"; depends=[MASS mfp rms survival]; }; @@ -13495,7 +13654,7 @@ in with self; { sicegar = derive2 { name="sicegar"; version="0.2.3"; sha256="0q0sp3aqvd4jh8ncfnls194iqikyxyk28zsyq65jkqd8z26s2dq4"; depends=[dplyr fBasics ggplot2 minpack_lm]; }; sideChannelAttack = derive2 { name="sideChannelAttack"; version="1.0-6"; sha256="1xcsy1h8gc8a4f9nzs7zv8x6v55g1pg8vy1kg64iqxm0gnz2f20l"; depends=[ade4 corpcor infotheo MASS mmap]; }; sidier = derive2 { name="sidier"; version="4.0.3"; sha256="0pfzx0a5f597iqigq9xidm9b9xv18zaiqa35yp4xlk1y7gv0nj6c"; depends=[ape ggmap ggplot2 gridBase igraph network]; }; - sidrar = derive2 { name="sidrar"; version="0.2.4"; sha256="1zwxafc4xaa4386a9jdg3gwflpdxql3f33bkqx1l2yl30x3517rw"; depends=[dplyr magrittr RCurl rjson rvest stringr tidyr xml2]; }; + sidrar = derive2 { name="sidrar"; version="0.2.5"; sha256="04i061kfzk2qpdz8z7igj0i53387rj3xv6q7xzdyginkn67mrj5m"; depends=[magrittr RCurl rjson rvest stringr xml2]; }; siebanxicor = derive2 { name="siebanxicor"; version="1.0.0"; sha256="0bnpqqhqvqq9kxvzljzp4d5aw9drh78cwyxyqzdvshijl7mmqjwc"; depends=[httr jsonlite]; }; sievePH = derive2 { name="sievePH"; version="1.0.1"; sha256="1hdccfq39sw3jsakv8lrnjp8mmc431l6ka1g9r53ihrz18s6c39v"; depends=[survival]; }; sievetest = derive2 { name="sievetest"; version="1.2.3"; sha256="17qrm7axvlr2yzp8brbibp26f8qdpqm85hc2kjzxm5zqwfvd6dfs"; depends=[]; }; @@ -13505,18 +13664,18 @@ in with self; { sigclust = derive2 { name="sigclust"; version="1.1.0"; sha256="0151v7lr4n4yyn93j0s06gzc9jh9xhdgvfw6kvpfy24jl6wdii7g"; depends=[]; }; sigmaNet = derive2 { name="sigmaNet"; version="1.1.0"; sha256="1i0xikwad9kiyrqxi1klkc4h4hyqfkxr388sw4mrx9pswfpbv3xr"; depends=[htmlwidgets igraph jsonlite RColorBrewer]; }; sigmajs = derive2 { name="sigmajs"; version="0.1.3"; sha256="017cpdxymh4n8is10akkbpdhakc1jdc1j5lw0pgg2jj5s3bl1rav"; depends=[crosstalk dplyr htmltools htmlwidgets igraph jsonlite magrittr purrr scales shiny]; }; - sigminer = derive2 { name="sigminer"; version="0.1.11"; sha256="0lp53bllr8lm337azc3gr5f8s6s9bnm5yyq98lymg9pn2j3imd51"; depends=[cluster corrplot cowplot data_table doParallel dplyr flexmix foreach ggplot2 maftools magrittr NMF purrr RColorBrewer tidyr]; }; + sigminer = derive2 { name="sigminer"; version="1.0.0"; sha256="1c2cckb7l87jp30c3j4c23yifaly9fqb58d00v9myjcbsrc9xhrx"; depends=[circlize cluster cowplot data_table doFuture dplyr flexmix foreach furrr future GenomicRanges ggalluvial ggplot2 ggplotify ggpubr IRanges lsei maftools magrittr NMF patchwork purrr RColorBrewer rlang tibble tidyr]; }; sigmoid = derive2 { name="sigmoid"; version="0.3.0"; sha256="1sa6nmip3fizdk3r47pvx0h3qldn267arpmid0wa1pb7k5j2g682"; depends=[]; }; signal = derive2 { name="signal"; version="0.7-6"; sha256="1vsxramz5qd9q9s3vlqzmfdpmwl2rhlb2n904zw6f0fg0xxjfq3b"; depends=[MASS]; }; signalHsmm = derive2 { name="signalHsmm"; version="1.5"; sha256="1d4v6cbvcbi8pb5zmn58s01h3jb0kv7yr7qvcnx4p2v82knvhik7"; depends=[Rcpp seqinr shiny]; }; signmedian_test = derive2 { name="signmedian.test"; version="1.5.1"; sha256="05n7a4h2bibv2r64cqschzhjnm204m2lm1yrwxvx17cwdp847hkm"; depends=[]; }; - signnet = derive2 { name="signnet"; version="0.5.0"; sha256="0m3bb1m1zqvfn1ym4nfp9364bfgryz2clqi7ls5bnwpkn2vznyqq"; depends=[igraph Matrix Rcpp RcppArmadillo]; }; + signnet = derive2 { name="signnet"; version="0.5.2"; sha256="0lhxp87m7c898xvdhzca6lm625cnh3rvbqbbz42f1lv388ik4sw2"; depends=[igraph Matrix Rcpp RcppArmadillo]; }; signs = derive2 { name="signs"; version="0.1.2"; sha256="0dzf5pydvs93rvj6idw9l2asv1bxwz20df7qis2db84hfww2kc6m"; depends=[rlang scales]; }; sigora = derive2 { name="sigora"; version="3.0.5"; sha256="1240q42kpb4l1idanywzal7c85kp3ncdl5m2irh8qs5xrs02gdc7"; depends=[]; }; sigr = derive2 { name="sigr"; version="1.0.6"; sha256="01crx8r9bcq1kwlq66vypnv1r48fp3hbl06ykd8g2k5zm06w0yyi"; depends=[wrapr]; }; - siland = derive2 { name="siland"; version="1.4.6"; sha256="0alnyd3phjv9kg21px96daw21613wjgp1ypqh8b4h0djcjd9xn17"; depends=[fasterize ggforce ggplot2 lme4 raster reshape2 sf sp]; }; - silicate = derive2 { name="silicate"; version="0.2.0"; sha256="19386cd46jil4fhs6340wbk96igi9jlfgghbm88c0j5ff4ah1bsj"; depends=[decido dplyr geometry gibble gridBase magrittr purrr rlang tibble tidyr unjoin]; }; + silicate = derive2 { name="silicate"; version="0.3.0"; sha256="08d731pprz3y6r0pdww2vn02q506kjzkgg5y2kbjb11d276ffwzf"; depends=[crsmeta decido dplyr gibble gridBase magrittr purrr rlang tibble tidyr unjoin]; }; sim1000G = derive2 { name="sim1000G"; version="1.40"; sha256="1avq6xfc34izavvp9vb5ccc2b9nc4m7cwr06ygnsmpgwi5nswbb8"; depends=[hapsim MASS readr stringr]; }; + sim2Dpredictr = derive2 { name="sim2Dpredictr"; version="0.1.0"; sha256="0q1l75h1dcxnd60lcmf4sny1ywidfmm0yv9ylkb3yc13v469167i"; depends=[car dplyr ggplot2 magrittr MASS matrixcalc Rdpack spam tibble tidyverse]; }; simEd = derive2 { name="simEd"; version="1.0.3"; sha256="1yq0qblrz0zddx682rzwdaa0k0r223i123la7wbp73spnn38g4br"; depends=[rstream]; }; simExam = derive2 { name="simExam"; version="1.0.0"; sha256="10p3y67cli5is2gj23cjy8y7zpbnn2jbxmfiq01ls0hc1jind82w"; depends=[Matrix msm]; }; simFrame = derive2 { name="simFrame"; version="0.5.3"; sha256="154d4k6x074ib813dp42l5l8v81x9bq2c8q0p5mwm63pj0rgf5f3"; depends=[lattice Rcpp]; }; @@ -13525,14 +13684,13 @@ in with self; { simMP = derive2 { name="simMP"; version="0.17.3"; sha256="1pzg79dd08ds3pfzxnk9h95gaibicv00mnm0jb4i8v5is4gzrdhr"; depends=[Biostrings BSgenome doParallel foreach GenomeInfoDb GenomicRanges IRanges XVector]; }; simMSM = derive2 { name="simMSM"; version="1.1.41"; sha256="04icijrdc269b4hwbdl3qz2lyxcxx6z63y2wbak1884spn6bzbs8"; depends=[mvna survival]; }; simPATHy = derive2 { name="simPATHy"; version="0.4"; sha256="1blvgaadp7iz0mcgax2xc8wa7aa9f82q09qym1wl8xdv01m29b80"; depends=[ggm graph gRbase htmlwidgets igraph mvtnorm qpgraph R_utils shiny shinydashboard]; }; - simPH = derive2 { name="simPH"; version="1.3.10"; sha256="0br32m28ynmhr4xal69bsv925rlmih898rk5bskn1s6bhsshalqq"; depends=[data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv quadprog stringr survival]; }; + simPH = derive2 { name="simPH"; version="1.3.11"; sha256="0dlig46jggw39siigblvm2qn9gds5yzm2rv8sdcga75157d7wh1r"; depends=[data_table dplyr ggplot2 gridExtra lazyeval MASS mgcv quadprog stringr survival]; }; simPop = derive2 { name="simPop"; version="1.2.0"; sha256="05f1azdz202bap4pkqxiacj7wqkbmw3naw6p7xgmvx8nlh5xl40h"; depends=[colorspace data_table doParallel e1071 EnvStats fitdistrplus foreach laeken lattice MASS nnet party plyr ranger Rcpp RcppArmadillo vcd VIM wrswoR]; }; simSummary = derive2 { name="simSummary"; version="0.1.0"; sha256="1ay2aq6ajf1rf6d0ag3qghxpwj0f8b3fhpr2k0imzmpbyag1i3gj"; depends=[abind gdata svUnit]; }; - simTargetCov = derive2 { name="simTargetCov"; version="1.0"; sha256="0r34jkrkq382a7afy4nqrw1ci9yh8aq3mfixw11asxjb7m16c1j2"; depends=[MASS]; }; - simTool = derive2 { name="simTool"; version="1.1.4"; sha256="1jb5r32kwyfv38vij236f3mb2ijqm48iz427zya27dyhps8i305s"; depends=[dplyr plyr purrr reshape tibble tidyr]; }; + simTargetCov = derive2 { name="simTargetCov"; version="1.0.1"; sha256="0gdqqwg9i2hga6l4s5x7wbbsm20b3sgwrci1g6hc04x1h9aawiw2"; depends=[MASS]; }; + simTool = derive2 { name="simTool"; version="1.1.5"; sha256="09pvrcjqkgrrvr1qdkc9s1s880x5zmmcfj7wrl22lanpfkng5x6f"; depends=[dplyr purrr 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.1"; sha256="1qzxxpz3nvqf9801k6zgphv6vd8alf2sf6cvzggk7cz6x5jc3w1r"; depends=[Rcpp RcppArmadillo]; }; simctest = derive2 { name="simctest"; version="2.6"; sha256="0igwn82zfx6ajv42gpyx6969aldygldkpdc9ik6601511sscvf2a"; depends=[]; }; simdistr = derive2 { name="simdistr"; version="1.0.1"; sha256="16fsj42zr627i57q1q72l1nhin7g6rxq9hfy487hf1ywd6rvns18"; depends=[]; }; @@ -13540,31 +13698,34 @@ in with self; { simest = derive2 { name="simest"; version="0.4"; sha256="1wp08dkbshn5parq69d7iizp4g16qzpdim37kcg09pgsc3aghwaj"; depends=[cobs nnls]; }; simex = derive2 { name="simex"; version="1.8"; sha256="1849wayygyqv0fh1i2qva7ggh2yah2nn0sgbcy9pldxrjq8q9iw0"; depends=[]; }; simexaft = derive2 { name="simexaft"; version="1.0.7.1"; sha256="0n3n2g07pnpcqhbrjf78lbvqvc136g7jxlx6q27vnk96kwizh3f1"; depends=[mvtnorm survival]; }; - simfinR = derive2 { name="simfinR"; version="0.1.0"; sha256="0g86mci5fjdxj46i1lff51fdzbwzwr3f4vsq74s4mlwl6g093bqy"; depends=[dplyr jsonlite lubridate magrittr memoise purrr]; }; + simfinR = derive2 { name="simfinR"; version="0.2.1"; sha256="1png4cz92vnql2j2b5dlji8b6662ildj05lj1y1bw8xawv9i1i9b"; depends=[crayon dplyr jsonlite lubridate magrittr memoise purrr]; }; simglm = derive2 { name="simglm"; version="0.7.4"; sha256="0lgzbcfqqw94jib6vxl2cv8xcnjjikvdy8qlhq874g0h8spg0l5i"; depends=[broom dplyr future_apply Matrix purrr rlang]; }; + simhelpers = derive2 { name="simhelpers"; version="0.1.0"; sha256="0imrp8zqdpyl466fywkjr4g3h9jzxfk96xrw8prlsvw1xlg6qrmm"; depends=[dplyr furrr future magrittr purrr Rdpack rlang rstudioapi tibble tidyr]; }; simmer = derive2 { name="simmer"; version="4.4.0"; sha256="0kq13ly33hgnwcd53mm372cqcd8glpgdb1jn4q22gd6pbk6j7cjg"; depends=[BH codetools magrittr Rcpp]; }; simmer_bricks = derive2 { name="simmer.bricks"; version="0.2.1"; sha256="1s73mfmpjz91n932kjk50aai5j3p1sjibq73yxrjdhlyhiy4d8lp"; depends=[simmer]; }; simmer_plot = derive2 { name="simmer.plot"; version="0.1.15"; sha256="0g13d6qw6cl7bzmpkckiswvg9n4mrrdbs195r3pyljaw5c5bmvhp"; depends=[DiagrammeR dplyr ggplot2 scales simmer tidyr]; }; simml = derive2 { name="simml"; version="0.1.0"; sha256="0j3vv3kp8rl4an6r0vzzn6syzi9h058v9040pshz0hldkhi21pby"; depends=[mgcv plyr]; }; simmr = derive2 { name="simmr"; version="0.4.1"; sha256="0903fh8vhl7r9cspanzkrn23kq68dkxhn01bjhyhf3c8wc9zfdy5"; depends=[bayesplot boot compositions ggplot2 MASS R2jags reshape2 viridis]; }; - simode = derive2 { name="simode"; version="1.1.8"; sha256="19l4xwbc7n53sgjbirpssppz5ps6alghxia4asv239fm2251r2jx"; depends=[deSolve pracma quadprog]; }; simone = derive2 { name="simone"; version="1.0-4"; sha256="09d8kdg2wxpmjgcn4dk6yqr6nmf7mzqqi6x1rz3fv7qknja6l1xi"; depends=[blockmodels]; }; simpleCache = derive2 { name="simpleCache"; version="0.4.1"; sha256="1prhahphyb4dg9qv813ahpwfngmr9blirb97pvypc5npzvahj5lv"; depends=[]; }; - simpleNeural = derive2 { name="simpleNeural"; version="0.1.1"; sha256="0rm6kvz1mppvgcvwsgg3nz6ci37l95ins64g0jh4rw6lfmy0grjc"; depends=[]; }; + simpleNeural = derive2 { name="simpleNeural"; version="0.1.3"; sha256="01q04807qws870x1qhvlr3bp0dawy8q4bh00psakhln9j9dl1ljm"; depends=[]; }; simplePHENOTYPES = derive2 { name="simplePHENOTYPES"; version="1.0.5"; sha256="02cr7yk379yilf53rv9s36g2gg1z5cq2qigy7lq31wcpb7vhjig3"; depends=[data_table gdsfmt lqmm mvtnorm SNPRelate]; }; simpleRCache = derive2 { name="simpleRCache"; version="0.3.2"; sha256="0ldmxa5rw1kcb24swnk8s471ww11jfbscynaahnnsi0zzqmhwirk"; depends=[digest]; }; simpleSetup = derive2 { name="simpleSetup"; version="0.1.0"; sha256="0rbzmixk76b3lgi9m7ijhcl6dha7wbbxfgwdhnp2y338zny6c6rm"; depends=[]; }; simpleboot = derive2 { name="simpleboot"; version="1.1-7"; sha256="0769dmrk8rw5v9598p7xlpawybwsdxnrqkxhavqpzy1vwg885575"; depends=[boot]; }; + simplecolors = derive2 { name="simplecolors"; version="0.1.0"; sha256="08xsha7v9k55fqi9f49j2sh2yz8dm5g99rqcjfd1yrlw2mkcrq6a"; depends=[colorspace dplyr forcats ggplot2 magrittr stringr]; }; simplegraph = derive2 { name="simplegraph"; version="1.0.0"; sha256="1gcpbljp1fgaprxnmq23izf1h2x3p5dnxlylwqsnlcj50bvm46gq"; depends=[]; }; + simplevis = derive2 { name="simplevis"; version="1.0.0"; sha256="1vkf2cmfhsci5z0njyy1xrilycjjr2j9k1vqmw5am5dvqaj7nwda"; depends=[dplyr DT forcats ggplot2 janitor leaflet leaflet_extras leafpop lubridate magrittr plotly readr rgdal rlang rmarkdown scales sf shiny shinycssloaders stars stringr tibble tidyr viridis]; }; + simplexdesign = derive2 { name="simplexdesign"; version="0.1.0"; sha256="139c1c2vpn2rf0q7ldciii3x18f5r62x0l7i6hdk25qwr9sp08k8"; depends=[DiceDesign GGally ggplot2 progress Rfast]; }; simplexreg = derive2 { name="simplexreg"; version="1.3"; sha256="1zkh00xbddhgz0qn0a5pj12n0hpx4f5kihpfj71x92pmxpzglcxh"; depends=[Formula plotrix]; }; - simputation = derive2 { name="simputation"; version="0.2.3"; sha256="1s34b3bm21z2b024cvjy013lzwppp48jn9isq1786d3176r1jk5p"; depends=[gower MASS rpart]; }; + simputation = derive2 { name="simputation"; version="0.2.4"; sha256="16adh97hfszvf934lf8mvwxvx71s7gwhzzhsbqz24zqik20pd6fq"; depends=[gower MASS rpart]; }; simr = derive2 { name="simr"; version="1.0.5"; sha256="1j5w93iliykfnpxl9kzh1rp6d3iy26ksj3j7yjl348yvplh0iyjl"; depends=[binom car iterators lme4 pbkrtest plotrix plyr RLRsim stringr]; }; 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]; }; + simsem = derive2 { name="simsem"; version="0.5-15"; sha256="183l6pysssxyhgw3s5gd0319snmvh439cy4xwfdjdwpavb8rrj06"; depends=[lavaan]; }; simsl = derive2 { name="simsl"; version="0.1.0"; sha256="09d6k61c2m0n03xpqvig7310bpgddxl8vzfjgn6wbr21s73b9xis"; depends=[mgcv]; }; simstandard = derive2 { name="simstandard"; version="0.3.0"; sha256="0fg5y6n5ydn6qxbd5sdbxh3aqj4i7qk7h9c28i3s5z4s9rxgycdj"; depends=[lavaan magrittr mvtnorm purrr rlang tibble]; }; - simstudy = derive2 { name="simstudy"; version="0.1.15"; sha256="14jynqvxfp8lc7vxa3lc5cfwmvxkg9ssrh78nq0x80rj7lwx8916"; depends=[data_table mvnfast mvtnorm Rcpp]; }; + simstudy = derive2 { name="simstudy"; version="0.1.16"; sha256="0ykwkkhnywqhpnsw4vggxcaqmg2zk8m521p00az7vyavwjgw9289"; depends=[data_table mvnfast mvtnorm Rcpp]; }; simsurv = derive2 { name="simsurv"; version="0.2.3"; sha256="0jlacjgrnnlmcl6k83clfkdfb1kr2xbyz2zcmq1f3xg2z0zwypjq"; depends=[]; }; simtimer = derive2 { name="simtimer"; version="4.0.0"; sha256="1c5017xmh4767d75k4rs1pssyn7p5w41bcsjjmwk4c9g6w1jgx1w"; depends=[]; }; simts = derive2 { name="simts"; version="0.1.1"; sha256="1b76grf7c14pgyhphplnil4lkzbwn3dih4pv4xdy721ih9n9llby"; depends=[broom dplyr magrittr purrr Rcpp RcppArmadillo robcor scales tidyr]; }; @@ -13577,58 +13738,56 @@ in with self; { sinib = derive2 { name="sinib"; version="1.0.0"; sha256="08x2a5hn41vcsai3r36w1kgzka4ks53pkp6dxn90bsqh40ydb0db"; depends=[]; }; 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.7-40"; sha256="18adv3gnk1cg9i3jrv6mxfdn68gpdak8451jpwkagz7n9hr0x6dj"; depends=[CDM pbv Rcpp RcppArmadillo TAM]; }; + sirt = derive2 { name="sirt"; version="3.9-4"; sha256="1myj1dpmqzcyxhkyyvva3xwy1aq5d6l37zg9vhfnc3q4h1psc5hm"; depends=[CDM pbv Rcpp RcppArmadillo TAM]; }; sirus = derive2 { name="sirus"; version="0.2.1"; sha256="04ln1i017qb94gz22in9w36b808a0gxbdildwyfzchf2c92wp5cp"; depends=[ggplot2 glmnet Matrix Rcpp ROCR]; }; 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]; }; - sismonr = derive2 { name="sismonr"; version="2.0.0"; sha256="1irsnsmph8hpmglx7y7293z38yfa9vzq1823pcp393iiyip1n8d0"; depends=[dplyr ggplot2 ggpubr igraph jsonlite magrittr rlang scales stringr tictoc tidyr truncnorm XR XRJulia]; }; - sitar = derive2 { name="sitar"; version="1.1.1"; sha256="1klnfp54sq0jgsyaha6k4i5fv313icjmri5khfsdg1q1zzqxw1f8"; depends=[dplyr glue nlme purrr quantreg rlang rsample tibble tidyr]; }; + sisal = derive2 { name="sisal"; version="0.48"; sha256="1fh35ndra58dryw222ng7ys3gx1izyk5789k30lyd4n8wqy6sjjd"; depends=[boot digest lattice mgcv R_matlab R_methodsS3]; }; + sismonr = derive2 { name="sismonr"; version="2.1.0"; sha256="1v4vfz6zc4f70fay8r9vaxj62pcp8gqnh4aczbqpym9874330vi9"; depends=[dplyr ggplot2 ggpubr igraph jsonlite magrittr rlang scales stringr tictoc tidyr truncnorm XR XRJulia]; }; + sitar = derive2 { name="sitar"; version="1.1.2"; sha256="0njnsamb9mrds3rjlwwv6sn980jl744mdp0b9d36sqws7wgnxrfq"; depends=[dplyr glue nlme purrr 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-7"; sha256="08yamivn2vxgrizh5gvvr9cn3cn1657r0p2nrkwbqljqrhmzi7qd"; depends=[data_table lattice latticeExtra]; }; sitreeE = derive2 { name="sitreeE"; version="0.0-5"; sha256="16m8w0rxb40pimzd06znqskz74jk4rrki4gjy8nk24r1zih2cjq1"; depends=[data_table sitree]; }; sizeMat = derive2 { name="sizeMat"; version="1.1.0"; sha256="1pxb99gd0zfrpbq2ndmhciv2bc8xdfgm0q1y771f6ji5665qxgfw"; depends=[MASS matrixStats MCMCpack]; }; - sjPlot = derive2 { name="sjPlot"; version="2.8.2"; sha256="16721a5006q0gv45zjcwnkykxhjkzpq5n35vhik0g0ixgm3a2vci"; depends=[bayestestR dplyr effectsize forcats ggeffects ggplot2 insight knitr MASS parameters performance purrr rlang scales sjlabelled sjmisc sjstats tidyr]; }; + sjPlot = derive2 { name="sjPlot"; version="2.8.3"; sha256="0ip1rkjlhyf3axlc8qqss1qq1f0xrda890c1jmcbhm98wwjw264f"; depends=[bayestestR dplyr effectsize ggeffects ggplot2 insight knitr MASS parameters performance purrr rlang scales sjlabelled sjmisc sjstats tidyr]; }; sjdbc = derive2 { name="sjdbc"; version="1.6.0"; sha256="17ncgj2s2pjn3w3c1dgxv8g7y17h4p78iic86gsj2ahn0xpsmkcc"; depends=[rJava]; }; - sjlabelled = derive2 { name="sjlabelled"; version="1.1.2"; sha256="1vnx067mxnvz4jzhmpiarda8ln6habzj02qikvkix5piiy85sqcw"; depends=[haven insight]; }; - sjmisc = derive2 { name="sjmisc"; version="2.8.3"; sha256="0w8l9grmp4q775jrf4q6rxx36ld5daz9b0gdxyyh42xfihk6m62h"; depends=[dplyr insight magrittr purrr rlang sjlabelled tidyselect]; }; - sjstats = derive2 { name="sjstats"; version="0.17.8"; sha256="0gagqbcmimlvxhpjkmd3s17mbrz5n937qksca1hvm6kj4rk37hzb"; depends=[bayestestR broom dplyr effectsize emmeans insight lme4 magrittr MASS modelr parameters performance purrr rlang sjlabelled sjmisc tidyr]; }; + sjlabelled = derive2 { name="sjlabelled"; version="1.1.3"; sha256="1amq7i9sxf0pkxhskqc53xq5wvc9rdxm7cxyb4b6xh6qsskjnlsj"; depends=[haven insight]; }; + sjmisc = derive2 { name="sjmisc"; version="2.8.4"; sha256="1ad7ca71w0v9ja4wb47aygczc987zz1lnjljhh2n497nzrpzzv64"; depends=[dplyr insight magrittr purrr rlang sjlabelled tidyselect]; }; + sjstats = derive2 { name="sjstats"; version="0.17.9"; sha256="0938ac6ixvkif07azd2msa8g3qnn9rabj6jg17almbysl83kg4nm"; depends=[bayestestR broom dplyr effectsize emmeans insight lme4 magrittr MASS modelr parameters performance purrr rlang sjlabelled sjmisc tidyr]; }; skda = derive2 { name="skda"; version="0.1"; sha256="0a6mksr1d0j3pd0kz4jb6yh466gvl4fkrvgvnlmvivpv6b2gqs3q"; depends=[]; }; skedastic = derive2 { name="skedastic"; version="0.1.0"; sha256="19jfsir1z7lv7h3085by9b638jzqgc9753aya21x3rvzq7hb3pr3"; depends=[broom car gmp het_test lmtest lubridate magrittr matrixcalc pracma Rdpack Rmpfr tibble tseries]; }; - 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=[]; }; skellam = derive2 { name="skellam"; version="0.2.0"; sha256="0r5wbs5h7xc3k2vjxd4axwnxr9cmwm008fcyj1vyixkg8fa680gx"; depends=[]; }; + skewlmm = derive2 { name="skewlmm"; version="0.1.0"; sha256="158nxycjg8bmx653nc57gdw02hf5szqbl2hgcb10yrmpssk15qbs"; depends=[dplyr ggplot2 moments mvtnorm nlme numDeriv purrr]; }; skewt = derive2 { name="skewt"; version="0.1"; sha256="1xm00zfzjv53cq9drfcx7w2ri5dwsq7kajrk2hc1mvw0b6s4x2ix"; depends=[]; }; - skimr = derive2 { name="skimr"; version="2.0.2"; sha256="1310fgmg1mzgy1xw6rbnr0v5habzi0v18383cpwkgir38ild9llk"; depends=[cli crayon dplyr knitr magrittr purrr repr rlang stringr tibble tidyr tidyselect]; }; - sklarsomega = derive2 { name="sklarsomega"; version="2.0"; sha256="05ar391bsaixv83dah3qzfi50avsjhn85niyq5n05sb8d5943z9h"; depends=[extraDistr hash LaplacesDemon Matrix mcmcse numDeriv spam]; }; + skimr = derive2 { name="skimr"; version="2.1"; sha256="18c86bzw8y08yg7gz4c5drxb33jd31iywbwzna2y246qijlsyvi5"; depends=[cli crayon dplyr knitr magrittr purrr repr rlang stringr tibble tidyr tidyselect withr]; }; skm = derive2 { name="skm"; version="0.1.5.4"; sha256="06g3bdncq2r56d8k3dr87gqnibypbsps0gj4jxkw9q1sq1yaff3v"; depends=[data_table magrittr plyr Rcpp RcppArmadillo RcppParallel]; }; skmeans = derive2 { name="skmeans"; version="0.2-11"; sha256="1a8nwlym6pf0z13nnw1id2wls9lq788860yhjaqd56c3slzfsymn"; depends=[clue cluster slam]; }; - skpr = derive2 { name="skpr"; version="0.62.0"; sha256="07i6k3dzhwy7yblja3dpds0mihnzy9m9hip00p9n5plw65hywi2n"; depends=[car doParallel doRNG foreach future iterators kableExtra knitr lazyeval lme4 lmerTest magrittr nlme promises Rcpp RcppEigen rintrojs shiny shinyjs shinythemes survival viridis]; }; + skpr = derive2 { name="skpr"; version="0.64.2"; sha256="07fchgv0aqgw0hvcav08zzfzqg8nbw8ibbpd3bd11jx1fikx4vyr"; depends=[base64enc car crayon doParallel doRNG foreach future iterators kableExtra knitr lazyeval lme4 lmerTest magrittr nlme promises Rcpp RcppEigen rintrojs shiny shinyjs shinythemes survival viridis]; }; skynet = derive2 { name="skynet"; version="1.3.0"; sha256="02kkgrqcrg1x61fip47w6vzi8nya12rxg47qjhn4lw4czaympqpx"; depends=[data_table dplyr ggplot2 ggrepel httr igraph maps stringr]; }; - skyscapeR = derive2 { name="skyscapeR"; version="0.2.2"; sha256="08h3vvn9zglw3xrl0xpyj95r1n3v6lk835a4nbanxdvi21mgpi77"; depends=[astrolibR doParallel foreach MESS numDeriv oce plotrix png pracma RColorBrewer rootSolve]; }; slackr = derive2 { name="slackr"; version="1.4.2"; sha256="1vm2h5fzcss3xx1annx68wrvv6c0s6h2ci0bipxmdl9amdaqw85w"; depends=[dplyr ggplot2 httr jsonlite]; }; slam = derive2 { name="slam"; version="0.1-47"; sha256="12fggw2c7hz3bpvsaqm24g3r6lbpq6jgli24g7x5j859iak5cqv9"; depends=[]; }; 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.2.1"; sha256="0ddjkqfh9jlafmbif1yr5gfnv1g8fq459rkmxf0v6p8w01a3d867"; depends=[cowplot ggplot2 httpuv jrc jsonlite scales]; }; - slfm = derive2 { name="slfm"; version="1.0.0"; sha256="1q4hm1lp498fqcnwr59agg08l1rh5gd8jqrjgkk4mh89zp3x5vaw"; depends=[coda lattice Rcpp RcppArmadillo]; }; - slga = derive2 { name="slga"; version="1.1.0"; sha256="09jrwwms9x9pqbpf9g2gm09nla31m5n1x23czhghj6ih0vp7804r"; depends=[httr raster sf xml2]; }; - slickR = derive2 { name="slickR"; version="0.4.4"; sha256="0b2d68kmjcrjv0ivp73abrfnvlfg178zx0xdbqb0ilb35ja92ai7"; depends=[base64enc htmltools htmlwidgets lifecycle magick xml2]; }; + sleepwalk = derive2 { name="sleepwalk"; version="0.3.0"; sha256="00w5c7a1nzy6v0irpskkqyldknq9vdq97r9im1h042zm6lnxxrr6"; depends=[cowplot ggplot2 httpuv jrc jsonlite scales]; }; + slfm = derive2 { name="slfm"; version="1.0.1"; sha256="0s7fdvr4fvsb4789f9ly2x820g4xvabl04wk7k6i8pd5ckj2xjhy"; depends=[coda lattice Rcpp RcppArmadillo]; }; + slga = derive2 { name="slga"; version="1.1.1"; sha256="0l8jfqmpc51fq4xil03lvgxxyqv08a5m4drfvrihfd6f1jkv6xkf"; depends=[httr raster sf xml2]; }; + slickR = derive2 { name="slickR"; version="0.4.9"; sha256="1smlzl0gq01vhv4qqwgikzdwg0z9k5mjf956sf64ps8py1b8d5ry"; depends=[base64enc htmltools htmlwidgets lifecycle xml2]; }; + slider = derive2 { name="slider"; version="0.1.2"; sha256="0h3hvqhdgpsp2n03dmrvqf5zpmpd1f16rscnsmbhpjhn1s09c2zq"; depends=[glue rlang vctrs warp]; }; slideview = derive2 { name="slideview"; version="0.1.0"; sha256="0zq5s6qdxn6ri88pp0wf2kg2k4byrrsfvwh0ai892p4szqbc3w4v"; depends=[htmltools htmlwidgets lattice raster viridisLite]; }; slim = derive2 { name="slim"; version="0.1.1"; sha256="0x9bk6w6lmw15s85gw9g8d1wlb57kkvnmx1wsyasn93x9llkjva1"; depends=[data_table MASS]; }; slimrec = derive2 { name="slimrec"; version="0.1.0"; sha256="1qzcvk7z8y11hwmybvppk1gf8di596zxy7qs22fclp6h6y18s377"; depends=[assertthat bigmemory glmnet Matrix pbapply]; }; slippymath = derive2 { name="slippymath"; version="0.3.1"; sha256="0dqnv089mcfxvpsc1px7mblim6m77n59xpcysz75jrvpc5q4lsrg"; depends=[png purrr raster]; }; slm = derive2 { name="slm"; version="1.1.0"; sha256="1y9pw9lgxp2xz6smbhg0rayjszm83kxf2an9rk9pdhlmx6670bbf"; depends=[capushe expm ltsa sandwich]; }; sloop = derive2 { name="sloop"; version="1.0.1"; sha256="00fk5fr5zsk2qxc1kfhmshhjxgnamm3401089sx8m2l529zd6r8j"; depends=[codetools crayon purrr rlang tibble]; }; - slouch = derive2 { name="slouch"; version="2.1.2"; sha256="0xf2saf4q0ywmng3avl6hjd2wjjzfpbwlnagggvs8ri41jyk7gma"; depends=[ape memoise]; }; + slouch = derive2 { name="slouch"; version="2.1.4"; sha256="09ffx657hs913prv0rifhsz60h39lk0h4z28myx6yzxcfdk4f48d"; depends=[ape crayon memoise]; }; slowraker = derive2 { name="slowraker"; version="0.1.1"; sha256="0glc3ldvbqkvzfvhs4s5mzx1kfz05px4k7rx5jfp9dm9d0gfpvsx"; depends=[NLP openNLP SnowballC]; }; slp = derive2 { name="slp"; version="1.0-5"; sha256="0i9iv0s1wdp9cyzr8qixh6c7qvrj025vll13gyf8dfbidrp6hryl"; depends=[mgcv]; }; slurmR = derive2 { name="slurmR"; version="0.3-0"; sha256="0301h8fzkghk41afkfprkbf3nia07apgjly0njan07vhk144k0qr"; depends=[]; }; sm = derive2 { name="sm"; version="2.2-5.6"; sha256="0c4whcx879gb4lwvqnzxl5n9xgpcqh2c54ip9ami3mwfprzcv45q"; depends=[]; }; smaa = derive2 { name="smaa"; version="0.3-0"; sha256="0y7j4q147fdk7fffyinc803mfzzsmcdfx8bp695w3wkq1wwy9kyl"; depends=[]; }; - smac = derive2 { name="smac"; version="1.0"; sha256="1inn7i5k0q5vln24kazh3gl3szf6lxwnjr2rw70jcyn9dr9iy952"; depends=[]; }; - smacof = derive2 { name="smacof"; version="2.0-0"; sha256="06gx24arv1md32vsj17lbq42vxpvds7qxwap4x12hj5nyxv4n7yy"; depends=[candisc colorspace doParallel ellipse foreach Hmisc MASS nnls plotrix polynom weights wordcloud]; }; + smacof = derive2 { name="smacof"; version="2.1-0"; sha256="0bylwa9dwr0q8saifh4fag0srs84g6chvfmslhs8vx42alkq94pz"; depends=[candisc colorspace doParallel e1071 ellipse foreach Hmisc MASS nnls plotrix polynom weights wordcloud]; }; smacpod = derive2 { name="smacpod"; version="2.0.4"; sha256="0dh8n3rxrffr09a8q7vdlin9hq5f2v0hjjjqsmzgwf7ln1b9wcr1"; depends=[abind pbapply plotrix sp spatstat]; }; smallarea = derive2 { name="smallarea"; version="0.1"; sha256="0jcv0xbh8v4g6zxxs4yyd0divwzk9d2w7g01r4s65khxvy3av7yx"; depends=[MASS]; }; smam = derive2 { name="smam"; version="0.5.3"; sha256="0hns3w6sm06fwxy3aybaz21j8bii5m5ps932ldilh0dj7rsqii6a"; depends=[doParallel doSNOW EnvStats foreach Matrix nloptr numDeriv Rcpp RcppGSL RcppParallel]; }; @@ -13638,11 +13797,10 @@ in with self; { smartsizer = derive2 { name="smartsizer"; version="1.0.2"; sha256="1w2vf6q3f7bywkvazgxn9gh7f2bqy4rg74mm4r6izw4gx7r81ls6"; depends=[MASS]; }; smatr = derive2 { name="smatr"; version="3.4-8"; sha256="0qqqbg65flxh48sw7x90zvgzbpcfzb1811h0pz3zlhdw9a7khs9n"; depends=[]; }; smbinning = derive2 { name="smbinning"; version="0.9"; sha256="1sr0nsqqzxdf402g9qx1ycigbh330idl9n2cyli4x4zxj1nqm3yv"; depends=[Formula gsubfn partykit sqldf]; }; - smcfcs = derive2 { name="smcfcs"; version="1.4.0"; sha256="0dlk2i2g8scbqy573drpf5252g0aa2i1v63172jswjmy5hl28byf"; depends=[MASS survival VGAM]; }; + smcfcs = derive2 { name="smcfcs"; version="1.4.1"; sha256="0q5kg0yrmbw80097j66mp08pmqrw1s0wf8g377379s62p1f6sjwv"; 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=[]; }; - smdc = derive2 { name="smdc"; version="0.0.2"; sha256="1j6xnzjbmmakbmk3lyjck3bsy8w8hyd9d8h04s4gbddhci283mqm"; depends=[proxy tm]; }; smds = derive2 { name="smds"; version="1.0"; sha256="0aqf3wfn6mlsl8a32gaf9qdpyxwsx19g6mma8qzgaysdmk6vhbpd"; depends=[MASS]; }; smerc = derive2 { name="smerc"; version="1.1"; sha256="0kbjb1335wcljwj2nyxipxndzrsrrrims90zbplpdlz3h6afshii"; depends=[maps matrixStats pbapply randtoolbox smacpod sp]; }; smfsb = derive2 { name="smfsb"; version="1.3"; sha256="1328w7zpwd3nam6ha4bh14g919jjl87v323ijmbp1j71gc64nn2i"; depends=[abind]; }; @@ -13651,12 +13809,13 @@ in with self; { smnet = derive2 { name="smnet"; version="2.1.1"; sha256="0fa47zgm7jxvs3jfai54wsc6qa9ycqw4f3yr941fvkczwzh4ch02"; depends=[DBI RSQLite spam SSN]; }; smog = derive2 { name="smog"; version="2.0"; sha256="1nrvh51kvh290w9wdyil5isx5xfz2yw8nmhm6f32hajipgn9j5fl"; depends=[doParallel foreach Rcpp RcppArmadillo Rdpack tidyr]; }; smoke = derive2 { name="smoke"; version="2.0.0"; sha256="1jdl5swg66vqryd40rrqpsnkczmsiaf5x6vlfv774vbnrc6q2v2g"; depends=[Rdpack]; }; - smoof = derive2 { name="smoof"; version="1.6.0"; sha256="0xkwj01pgzvxr6cxxmml0f4375s2s8kni69immcpw66avs2ljw5m"; depends=[BBmisc checkmate ggplot2 mco ParamHelpers plot3D plotly RColorBrewer Rcpp RcppArmadillo RJSONIO]; }; - smooth = derive2 { name="smooth"; version="2.5.4"; sha256="0apjjqzb36z71500lyccm9jdss7h7736g8lrs3rfz5f6d2k5yqf6"; depends=[forecast greybox nloptr Rcpp RcppArmadillo zoo]; }; + smoof = derive2 { name="smoof"; version="1.6.0.2"; sha256="14zwrsyhbrwggwiaq8vxps8cgkp6glb14b2cp2ph1ppa0abvlbfq"; depends=[BBmisc checkmate ggplot2 mco ParamHelpers plot3D plotly RColorBrewer Rcpp RcppArmadillo RJSONIO]; }; + smooth = derive2 { name="smooth"; version="2.5.6"; sha256="0wnb6d1h0l4frri6k5hpshb1bqqq7x2hqz591qbzj47h1fxrnpwq"; depends=[forecast greybox nloptr Rcpp RcppArmadillo zoo]; }; smoothAPC = derive2 { name="smoothAPC"; version="0.3"; sha256="11f34qqdm8m0hmy9jf29q439slchvmqgdfrmak7vcdhfnjcylr5r"; depends=[colorspace lmtest quantreg rgl SparseM]; }; smoothHR = derive2 { name="smoothHR"; version="1.0.2"; sha256="0l33xg3p9pyfrp4rhavz8m1jakk4wr8i14g6jjiizb03rpxdpzqy"; depends=[survival]; }; smoothROCtime = derive2 { name="smoothROCtime"; version="0.1.0"; sha256="03iihjxb5xdaf74cm9cajqqjli754mdmv5v1y4hla9vv23017ca1"; depends=[ks]; }; - smoothSurv = derive2 { name="smoothSurv"; version="2.0.1"; sha256="0srb6ms1ag3mllkf2rh0pnji9zp8c11mh8i5zgb6zh1nx2s86x93"; depends=[survival]; }; + smoothSurv = derive2 { name="smoothSurv"; version="2.1"; sha256="1y6mjkvy6fi2j2gy7n8lslpxj2mqzs2wsi10cvlmgkx33mvhvkff"; depends=[survival]; }; + smoothedLasso = derive2 { name="smoothedLasso"; version="1.0"; sha256="1lhwhglhcsj3ilsa5vyizfw82sngg1yngrbh0xicfq72wqmmkwfa"; depends=[Rdpack]; }; smoother = derive2 { name="smoother"; version="1.1"; sha256="0nqr1bvlr5bnasqg74zmknjjl4x28kla9h5cxpga3kq5z215pdci"; depends=[TTR]; }; smoothie = derive2 { name="smoothie"; version="1.0-1"; sha256="12p4ig8fbmlsby5jjd3d27njv8j7aiwx0m2n1nmgvjj0n330s1kj"; depends=[]; }; smoothmest = derive2 { name="smoothmest"; version="0.1-2"; sha256="14cri1b6ha8w4h8m26b3d7qip211wfv1sywgdxw3a6vqgc65hmk5"; depends=[MASS]; }; @@ -13668,19 +13827,19 @@ in with self; { smpic = derive2 { name="smpic"; version="0.1.0"; sha256="0ff2146gjcrc6nvrbf4779jh076abhb843zzlk2zvqir13qfap61"; depends=[ggplot2 imager stringr]; }; sms = derive2 { name="sms"; version="2.3.1"; sha256="0vr5jy8bxbczaqr9kg0fnanxhv9nj51yzgacrb63k33cs85p981m"; depends=[doParallel foreach iterators]; }; smss = derive2 { name="smss"; version="1.0-2"; sha256="04lgfdcvnzpnpplyl62fy7slyiy8wkqpjjrzmclgqis3c9zkkncp"; depends=[]; }; - smurf = derive2 { name="smurf"; version="1.0.2"; sha256="08k64y0wb9da7ji94zra411zwcvssi0lb1drh98p6w9pwvn552rf"; depends=[catdata glmnet MASS Matrix mgcv RColorBrewer Rcpp RcppArmadillo speedglm]; }; - sn = derive2 { name="sn"; version="1.5-4"; sha256="0x46gxkplxbnhaqbpiav1r4xlv4ib7n57kxmca7scqwj22y7wrs6"; depends=[mnormt numDeriv]; }; + smurf = derive2 { name="smurf"; version="1.0.5"; sha256="1ay19ggrhm7jzazcky9r9g0qq3p8jhqr209iqsc22qqwzx6bl1l6"; depends=[catdata glmnet MASS Matrix mgcv RColorBrewer Rcpp RcppArmadillo speedglm]; }; + sn = derive2 { name="sn"; version="1.6-1"; sha256="0snri2k8qslb7478c5jz4a5xxmmb1ipmp8x1jizi8mhj2cjic1w0"; depends=[mnormt numDeriv quantreg]; }; sna = derive2 { name="sna"; version="2.5"; sha256="1j3i6300m686qqfmyvadim377cd3mplzgj6mandygw8brg50id8k"; depends=[network statnet_common]; }; - snahelper = derive2 { name="snahelper"; version="1.0.0"; sha256="15x7qp36lzs61ll3gqyjmxix0pqnyf2rz799mxzkzxzwqsp0srwi"; depends=[colourpicker formatR ggplot2 ggraph graphlayouts igraph miniUI rstudioapi shiny]; }; + snahelper = derive2 { name="snahelper"; version="1.1.0"; sha256="0fc1xilbc7dr5gsrhlp8zgbjppxi44lifsj79kh79783w8nyfqm1"; depends=[colourpicker DT formatR ggplot2 ggraph graphlayouts igraph miniUI rstudioapi shiny]; }; snakecase = derive2 { name="snakecase"; version="0.11.0"; sha256="1ky1x2cp5rd0ffd9m1fji9sq4z4jsrpxzg30brw8bb4ihfjj114r"; depends=[stringi stringr]; }; snappier = derive2 { name="snappier"; version="0.1.0"; sha256="0334zwhqdl3lfw7rg8ql7z10qj8jjrm17yi9mgdcxnzaf3f1p859"; depends=[]; }; snapshot = derive2 { name="snapshot"; version="0.1.2"; sha256="0cif1ybxxjpyp3spnh98qpyw1i5sgi1jlafcbcldbqhsdzfz4q10"; depends=[]; }; + snem = derive2 { name="snem"; version="0.1.1"; sha256="1r8l7cs1y82fh7bdfl18ilw4fria1cabghqddnfr34vfp85cndk9"; 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.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]; }; snow = derive2 { name="snow"; version="0.4-3"; sha256="1n3n8pva9s34fvlw32yng0x416lmbv7q1fsd0ywa4kikmxym64l5"; depends=[]; }; snowFT = derive2 { name="snowFT"; version="1.6-0"; sha256="00rq2xibzhx7441v9jg138a4fkmx28hifs4yyj3pwi8najf0df4n"; depends=[rlecuyer snow]; }; snowboot = derive2 { name="snowboot"; version="1.0.1"; sha256="0mkmmycfkl100fnmj2hs246bra4fvdr2sas1axw8z1w0ajdab1vy"; depends=[igraph Rcpp Rdpack VGAM]; }; @@ -13699,14 +13858,15 @@ in with self; { socceR = derive2 { name="socceR"; version="0.1.1"; sha256="1vd0r3vixavg1br2q3kfn3nvl7dw854vkcfwcvyw411k84ivb13y"; depends=[Rcpp]; }; social = derive2 { name="social"; version="1.0"; sha256="0ny81bhj80rlwwa6cgbkdz2rxz6bp0f3nvjr1sqxr4s8l8rnf4ic"; depends=[Rcpp]; }; socialmixr = derive2 { name="socialmixr"; version="0.1.6"; sha256="0hrkylasyaalsh4gsazgfz5vyqvwnq5n4lzqmzjs2njlrkgwwf5y"; depends=[countrycode curl data_table httr jsonlite lubridate oai stringr wpp2015 XML]; }; - sociome = derive2 { name="sociome"; version="1.3.0"; sha256="0anynmpb6i8hwp5b0axkmfwsdyfzwd28g26ril2i3mlcivkgjyg4"; depends=[censusapi dplyr magrittr mice psych purrr rlang stringr tidycensus tidyr]; }; - socviz = derive2 { name="socviz"; version="1.0.0"; sha256="14713g5saa167c5wk06i9v5708cj60znc8a7c3a2wpk0h2idfjlb"; depends=[dplyr fs magrittr rlang tibble]; }; + sociome = derive2 { name="sociome"; version="1.4.0"; sha256="0700xpslbi5f3b32pfqmxrwzymhxmpzl8jzxhvgpbm885f07n41j"; depends=[censusapi dplyr magrittr mice psych purrr rlang stringr tidycensus tidyr]; }; + socviz = derive2 { name="socviz"; version="1.1"; sha256="19naaiqxbqh8vmjx2ijd012lbxam3750zni491vp6aidwaqjznfw"; depends=[dplyr fs magrittr rlang tibble]; }; sodavis = derive2 { name="sodavis"; version="1.2"; sha256="1jf5sml51qxlpgv5b1rvyig4dm4ijw2hpnk85zf790jp22xm64jw"; depends=[MASS mvtnorm nnet]; }; sodium = derive2 { name="sodium"; version="1.1"; sha256="1zxzi8xvxnhgcd5qrylf08nz1cdq3aslrswjas440qg63ypmbf6w"; depends=[]; }; sofa = derive2 { name="sofa"; version="0.3.0"; sha256="10f01a23bq6a30f95cilfan588dg0bg36y7g14q46rmcz15cqbrx"; depends=[crul jsonlite mime R6]; }; softImpute = derive2 { name="softImpute"; version="1.4"; sha256="07cxbzkl08q58m1455i139952rmryjlic4s2f2hscl5zxxmfdxcq"; depends=[Matrix]; }; softclassval = derive2 { name="softclassval"; version="1.0-20160527"; sha256="1f5qj5sajy3dg0mgss6f9w6v5a2prcypld9jcv457bd4n4a409kr"; depends=[arrayhelpers svUnit]; }; softmaxreg = derive2 { name="softmaxreg"; version="1.2"; sha256="0y1r4n83sv2744lpli65aip0c0cq823asb8gw9yy9yjjc9sbyr9s"; depends=[]; }; + soilDB = derive2 { name="soilDB"; version="2.5"; sha256="10jb49yiqvvcvl84r7xys5gyr710ypvai7fn5sp6nvcm1bqgrwkq"; depends=[aqp curl lattice plyr raster reshape2 sp xml2]; }; soilassessment = derive2 { name="soilassessment"; version="0.1.1"; sha256="0vxw0wzc2fw1asasnkfc7mzz616l243dh27vn2fqm8sw7d3509ji"; depends=[arm caret Cubist e1071 FuzzyAHP Hmisc kernlab maptools nnet randomForest raster rgdal rpart soiltexture sp]; }; soilcarbon = derive2 { name="soilcarbon"; version="1.2.0"; sha256="1gxq7np5xh3jcqbsf8xva4b82rv6rab2j23mbkc4pjs6nbnzvzba"; depends=[devtools ggplot2 openxlsx shiny]; }; soilphysics = derive2 { name="soilphysics"; version="3.1"; sha256="11c094bqbwhggh0n3hdva1321gqzz2k1b7v3767wyyk1xpgzg98r"; depends=[boot MASS rpanel tkrplot]; }; @@ -13715,7 +13875,6 @@ in with self; { sokoban = derive2 { name="sokoban"; version="0.1.0"; sha256="07r2zv9rynvw06fpncrz3rsmkdy6z2pcvmm559bhs428kmnq2xib"; depends=[]; }; solaR = derive2 { name="solaR"; version="0.45"; sha256="1vxpwaizjxy27r54anhf48pf97lm4ck750m0p4kmh716irmhp319"; depends=[lattice latticeExtra RColorBrewer zoo]; }; solarPos = derive2 { name="solarPos"; version="1.0"; sha256="0004da7vqpq14q5lhs8vyvjl99j8gzxd5wrlw5d1vwfns3ica0q5"; depends=[]; }; - solarius = derive2 { name="solarius"; version="0.3.0.2"; sha256="17c765nxq81xshyyl4lfhqjmgvmhn9xyzc6x4qd33wvhh4148f38"; depends=[data_table ggplot2 plyr]; }; solartime = derive2 { name="solartime"; version="0.0.1"; sha256="0q6la6d281zgf1kxhrdvi3b91na60szknq0fvldvlnszlqb5vkgs"; depends=[lubridate]; }; solitude = derive2 { name="solitude"; version="0.2.1"; sha256="0n4f59bjdcqfclagpjric965zsl1jfl8p194p64viainb9w11xz4"; depends=[data_table future_apply igraph R6 ranger]; }; solrad = derive2 { name="solrad"; version="1.0.0"; sha256="13ybllvmig1yqsy4md4kazs83hxb9lrlwy64yw1wwr1w6sxpbnp6"; depends=[]; }; @@ -13727,15 +13886,17 @@ 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="4.0.8"; sha256="0czizds24y2dj2w3611kydcs40lcg71pa9v2v7j4z73vks2p17mc"; depends=[crayon lattice MASS Matrix Rcpp RcppArmadillo]; }; + sommer = derive2 { name="sommer"; version="4.0.9"; sha256="0nrfra6n2rmgh1kxvsyxxxdy4fy6b2092lfmy5551l3l3hq5q3a2"; depends=[crayon lattice MASS Matrix Rcpp RcppArmadillo]; }; somplot = derive2 { name="somplot"; version="1.6.4"; sha256="06c8p2lqz3yxmxdl7ji8a3czvxnsbl7bwyiig76pkwc3a5qqfbb9"; depends=[hexbin]; }; somspace = derive2 { name="somspace"; version="1.0.0"; sha256="1cp7mprapidzfphis697r3jipm1ig5198580mmdygvbajxcjib75"; depends=[data_table ggplot2 kohonen maps]; }; sonar = derive2 { name="sonar"; version="1.0.2"; sha256="1f0f5iqi3y9vnxyym14nm8dqxw0vcpnxmvvkx4sm612i4fclg1f9"; depends=[]; }; sonicLength = derive2 { name="sonicLength"; version="1.4.6"; sha256="0jh9zk908afqxacccsph6477cc8sbcc1vxbv7jz8ppgc20imw932"; depends=[]; }; sonicscrewdriver = derive2 { name="sonicscrewdriver"; version="0.0.1"; sha256="03v53blb8f67ybhqys4n0zxf7pk9g024ncq0g9rnj9qpr740zclb"; depends=[ggplot2 seewave tuneR]; }; sonify = derive2 { name="sonify"; version="0.0-1"; sha256="1wkqqgf8fhhaz1dmri2zzr8cdwmx3cgrxbprrz3yily5r1m17d15"; depends=[tuneR]; }; + soobench = derive2 { name="soobench"; version="1.9.18"; sha256="06wzlxdw0l6jc1zqsgkn120ibprfalwqd38xh7dpi30vdqiqskcc"; depends=[]; }; soptdmaeA = derive2 { name="soptdmaeA"; version="1.0.0"; sha256="03n1y82myq0rz14awjnx9nx1dz3dxqq58m13cw7a7ncap7fmw9r5"; depends=[igraph MASS Matrix]; }; soql = derive2 { name="soql"; version="0.1.1"; sha256="12wvbxy9xx140b7mga4ma7hkg4q6kv549gkq15fnf4dn8q43x8nf"; depends=[]; }; + sorocs = derive2 { name="sorocs"; version="0.1.0"; sha256="0gy23rldhnlz6jmf9rdzl4mmfkn5gjcavq2jfcz6dgjafl3v9vgl"; depends=[MASS MCMCpack mvtnorm]; }; sortable = derive2 { name="sortable"; version="0.4.2"; sha256="08v78r0vibr0lk09lxm0s0vfkzpp03asqnqpl8jqa6rxcb484fri"; depends=[assertthat ellipsis htmltools htmlwidgets jsonlite learnr shiny]; }; sorvi = derive2 { name="sorvi"; version="0.7.26"; sha256="19lfrc4bdiljs437w3a2bpf7abnkv0934dh929bbj2w1w8rzghjn"; depends=[dplyr ggplot2 RColorBrewer reshape2]; }; sos = derive2 { name="sos"; version="2.0-0"; sha256="0fwv76m0iihzy60kglsdjnlp6800qsll6h0v2435a50lcr53jj8g"; depends=[brew]; }; @@ -13744,48 +13905,44 @@ in with self; { sound = derive2 { name="sound"; version="1.4.5"; sha256="1kbbb614d0fmj9l0yjiwf5yqnl7sby4xklp7qwp6rwjvq9bnm0ab"; depends=[]; }; soundcorrs = derive2 { name="soundcorrs"; version="0.1.0"; sha256="1q02ll4yw7dlz3cmxb7i1svhpjmhxqglsswv1drlkzm8i3gfp9dk"; depends=[]; }; soundecology = derive2 { name="soundecology"; version="1.3.3"; sha256="16h6gbdlyav7wbfisdv1f2zsqhr45liidgj7qqk8giwjxgan8q97"; depends=[ineq oce pracma seewave tuneR vegan]; }; - soundgen = derive2 { name="soundgen"; version="1.6.1"; sha256="1mbxgl7mf4gyr13xf8i5hachlmv1l3khyjwzawb3rm5wl5k7pr81"; depends=[dtw mvtnorm phonTools reshape2 seewave shiny shinyBS shinyjs tuneR zoo]; }; + soundgen = derive2 { name="soundgen"; version="1.6.2"; sha256="093i8v2i3np1gny0dsnw3i20n5x67w312sslgabgmibak66cdb37"; depends=[dtw mvtnorm phonTools reshape2 seewave shiny shinyBS shinyjs tuneR zoo]; }; source_gist = derive2 { name="source.gist"; version="1.0.0"; sha256="03bv0l4ccz9p41cjw18wlz081vbjxzfgq3imlhq3pgy9jdwcd8fp"; depends=[RCurl rjson]; }; - sourceR = derive2 { name="sourceR"; version="1.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=[]; }; - sp = derive2 { name="sp"; version="1.3-2"; sha256="0kpjsqh3lzqp1m0avsvm54lazlgwfx3hyf0av3mvbyslsanj42ll"; depends=[lattice]; }; + sp = derive2 { name="sp"; version="1.4-1"; sha256="0fbh865r4py89g6ln8bslig2vbxxwa642p5k5g02rskyhajg35lg"; depends=[lattice]; }; sp23design = derive2 { name="sp23design"; version="0.9"; sha256="1ihvcld19cxflq2h93m9k9yaidhwixvbn46fqqc1p3wxzplmh8bs"; depends=[mvtnorm survival]; }; - spANOVA = derive2 { name="spANOVA"; version="0.99.1"; sha256="0dsi1cj0i5gm3b1wlrb2r5nbw1zmnqiwvgz41s0wmm7wwjsbva3x"; depends=[ape car DT geoR gtools knitr MASS Matrix multcomp multcompView mvtnorm rmarkdown ScottKnott shiny shinyBS shinycssloaders shinythemes spatialreg spdep xtable]; }; + spANOVA = derive2 { name="spANOVA"; version="0.99.2"; sha256="0dlx9wwccq67g4yni3gbrv43f5pgm3mg715q2v8f09r1akhfg5by"; depends=[ape car DT geoR gtools knitr MASS Matrix multcomp multcompView mvtnorm rmarkdown ScottKnott shiny shinyBS shinycssloaders shinythemes spatialreg spdep xtable]; }; spAddins = derive2 { name="spAddins"; version="0.2.0"; sha256="19wbcghcf0f9qvqy92jhsdcpmd9b4lkhxndvr71cyhzga539lh1n"; depends=[magrittr purrr rstudioapi stringr]; }; spBFA = derive2 { name="spBFA"; version="1.0"; sha256="0w50zzizh8ki0ngwjaj92g0lcj79ssllv75a1b4i37hiy4qh4z1m"; depends=[msm mvtnorm pgdraw Rcpp RcppArmadillo]; }; - spBayes = derive2 { name="spBayes"; version="0.4-2"; sha256="0qmh8sdawhssr1jmx9dc56mxxwsgya8spsss88jgg0npvmpl5khb"; depends=[abind coda Formula magic Matrix]; }; - spBayesSurv = derive2 { name="spBayesSurv"; version="1.1.3"; sha256="0syb4x05j878jhcql8prfw1aqxmpi1idxk1d4xl52j32wngkpn8b"; depends=[coda fields MASS Rcpp RcppArmadillo survival]; }; + spBayes = derive2 { name="spBayes"; version="0.4-3"; sha256="0hllm70dly1niigp9r5645as97phlkba46dp9brcr34080m6w1w9"; depends=[coda Formula magic Matrix sp]; }; + spBayesSurv = derive2 { name="spBayesSurv"; version="1.1.4"; sha256="0mf5ql9a45dkq0dw1l0h03gcnhm6if10faj72jrhgrlcrgzzdfyn"; depends=[coda fields MASS Rcpp RcppArmadillo survival]; }; spCP = derive2 { name="spCP"; version="1.2"; sha256="0y00k96p96jgp84wbdhqfwsq2fg8c68gc5310rnzpiv3clws27fb"; depends=[msm mvtnorm Rcpp RcppArmadillo]; }; - spData = derive2 { name="spData"; version="0.3.2"; sha256="190msrrpn226x27pcnck4ac34f9k4xcn26cyz2apdri2nzkr6zbw"; depends=[]; }; + spData = derive2 { name="spData"; version="0.3.5"; sha256="09l9j1vjbfyc8mikb8kliqmdjkg4xigq3zhdx98mv51flh5q87lh"; depends=[raster sp]; }; spFSR = derive2 { name="spFSR"; version="1.0.0"; sha256="0094plnjlyhnnjqw3i4an5q95bw6hjy1gzc7zr6wy77faivqsbms"; depends=[class ggplot2 mlbench mlr parallelMap tictoc]; }; - spGARCH = derive2 { name="spGARCH"; version="0.2.0"; sha256="03jn5v5szq2nfihwvv3v966bv48wng2bahyaxlkvik2firdl8j9y"; depends=[Matrix nleqslv Rcpp RcppEigen Rsolnp spdep truncnorm]; }; + spGARCH = derive2 { name="spGARCH"; version="0.2.1"; sha256="0bncjav7ph178phrcpx05lrb0c5fhn0xbhs9bbmrw856ngx4j0s2"; depends=[Matrix nleqslv Rcpp RcppEigen Rsolnp spdep truncnorm]; }; spMC = derive2 { name="spMC"; version="0.3.10"; sha256="0p0s6w7sif02b91b73a0zb2i4i95a8m86dkqmgx6w1jk9h2mgqaz"; depends=[]; }; spMaps = derive2 { name="spMaps"; version="0.4.0"; sha256="0n9693aam7gsclfhijq7cy61l0w4mm5vf3rjaz5w0jrz77lrkprh"; depends=[raster rgeos sp]; }; - spNNGP = derive2 { name="spNNGP"; version="0.1.2"; sha256="0zr2lfvrjlpi6j3xswi974spvhmkbf1ddfb6d8f2zddkfhppfg00"; depends=[coda Formula RANN]; }; + spNNGP = derive2 { name="spNNGP"; version="0.1.4"; sha256="14mz5cgxm9ka7q7f7qs80hqrgbk2mjphyc28ih73lkhcknl2v1lp"; depends=[coda Formula RANN]; }; spTDyn = derive2 { name="spTDyn"; version="2.0"; sha256="0wandd5iqyqb474096lky04rrgj31gnyqnlmgw8ypxsypd0gqdy0"; depends=[coda sp spacetime spTimer]; }; spThin = derive2 { name="spThin"; version="0.2.0"; sha256="0j10j1cbbwp3baqm3b59rxlnd643mkx1mirlxpnr1ad2g7xpm69f"; depends=[fields knitr spam]; }; spTimer = derive2 { name="spTimer"; version="3.3"; sha256="0vzqig9dq4k6p5s2gbm5arqiih28ghzjx0fs7ml70vx2f181jrxi"; depends=[coda extraDistr sp spacetime]; }; - spaMM = derive2 { name="spaMM"; version="3.0.0"; sha256="1rwgwh4lvpgbplbzrxi08cdmay9q44dv0szcdfnz74wdsgmpxjjs"; depends=[MASS Matrix nlme nloptr pbapply proxy Rcpp RcppEigen]; }; + spaMM = derive2 { name="spaMM"; version="3.1.27"; sha256="1a84nklxipaacndsyd87b8hb5908006416rkcpv60bzinnh1vnrn"; depends=[crayon gmp MASS Matrix minqa nlme nloptr pbapply proxy Rcpp RcppEigen]; }; spaa = derive2 { name="spaa"; version="0.2.2"; sha256="163iipz1knxx1lzby9a3n1f014yqkf25z1wpwwy4gbx7sia499d5"; depends=[]; }; space = derive2 { name="space"; version="0.1-1.1"; sha256="09dpksbda4lg5hax47a9h9shjmggza6583slvdj0fldblykpyxck"; depends=[]; }; spaceNet = derive2 { name="spaceNet"; version="1.2"; sha256="1s2672icxs0qvdhl52xhllgvh1i9mjfrn5j3icyw6h61ljbnhy11"; depends=[MASS mclust permute RcppTN Rfast sna vegan]; }; - spacejam = derive2 { name="spacejam"; version="1.1"; sha256="1mdxmfa1aifh3h279cklm4inin0cx3h0z2lm738bai34j6hpvar7"; depends=[igraph Matrix]; }; spacesRGB = derive2 { name="spacesRGB"; version="1.3-0"; sha256="1flnvrmq0hdrhxmn5djbhc6fanqhmr1i3q5ik7qcxsb0jvnyincd"; depends=[]; }; - spacesXYZ = derive2 { name="spacesXYZ"; version="1.0-4"; sha256="04387yrz9kmr4y10d6dg2z0nn56qafgi1v08jfw5wcwq12cm7052"; depends=[]; }; + spacesXYZ = derive2 { name="spacesXYZ"; version="1.1-1"; sha256="1jxwhpnfbqa2nz86l8sdxxj3qmasw1wmbii7wr8sqp2819jr5lnd"; depends=[]; }; spacetime = derive2 { name="spacetime"; version="1.2-3"; sha256="0nxjp78vdnr8m2nn9czf1rp7b61md4fjfnyqdlgp982x5nb0nz6a"; depends=[intervals lattice sp xts zoo]; }; - spacodiR = derive2 { name="spacodiR"; version="0.13.0115"; sha256="0c0grrvillpwjzv6fixviizq9l33y7486ypxniwg7i5j6k36nkpl"; depends=[colorspace picante Rcpp]; }; - spacom = derive2 { name="spacom"; version="1.0-5"; sha256="0b6yh4q9f0ibwlwyckwaya9m645j22x6bdz9mz3chass8qza6bls"; depends=[foreach iterators lme4 Matrix nlme spdep]; }; - spacyr = derive2 { name="spacyr"; version="1.2"; sha256="1xsiz6zx89vs6ykrkkp011d8fz4ksdgnf5nyaq5ynjr6zv865vks"; depends=[data_table reticulate]; }; + spacey = derive2 { name="spacey"; version="0.1.1"; sha256="1p8kx3d08q9kz1wb286m3d8ckwkhfm5n42m65m4w5gz5kpfx0xfz"; depends=[httr jsonlite magrittr png raster rayshader rgdal]; }; + spacyr = derive2 { name="spacyr"; version="1.2.1"; sha256="1b2ccgwsiqkvp7w37x8k7699c676q16vfrybkrfvyczyhki4s6nw"; depends=[data_table reticulate]; }; spaero = derive2 { name="spaero"; version="0.5.0"; sha256="1r3rgvmkcrkzm6ikbbmnm4rfdrnwgmn4wq21mxgjs2bzg2r72mw6"; depends=[]; }; spagmix = derive2 { name="spagmix"; version="0.3-1"; sha256="0xfrm4i28sy490g5324bc43dxlrgcnzxg27gsd5b81mqi03sry9j"; depends=[abind mvtnorm RandomFields sparr spatstat]; }; spam = derive2 { name="spam"; version="2.5-1"; sha256="0ry0a76cljlmilrzcriiizcidxyhq1i7i9bqhvl1qda81ld8hifi"; depends=[dotCall64]; }; spam64 = derive2 { name="spam64"; version="2.5-1"; sha256="0fni9lwn51n0ax4qk1l1wslhbkfl44ryp5hgjprkql5a26nmv0nq"; depends=[]; }; spanel = derive2 { name="spanel"; version="0.1"; sha256="1riyvvfij277mclgik41gyi01qv0k466wyk2wbqqhlvrlj79yzsc"; depends=[]; }; spanish = derive2 { name="spanish"; version="0.4.2"; sha256="15drc11lh0qxpww50p0smi8qxfbln82bx0yd74jqf71irhk5jxyp"; depends=[magrittr xml2]; }; - spant = derive2 { name="spant"; version="0.19.0"; sha256="1am4xvvrg71w2151gsidcbhfbchgb6q76zghn7qgv3xlihfvxgzc"; depends=[abind complexplus fields foreach magrittr MASS matrixcalc miniUI minpack_lm mmand nnls oro_dicom plyr pracma ptw readr RNifti RNiftyReg shiny signal smoother stringr svd tibble viridisLite]; }; + spant = derive2 { name="spant"; version="1.3.0"; sha256="0bcd733llz81vb4f5bjhf0230qjh9ix0y5bbg3dar48kr380fsba"; depends=[abind complexplus fields foreach irlba lsei magrittr MASS matrixcalc miniUI minpack_lm mmand nloptr nnls numDeriv oro_dicom plyr pracma ptw readr RNifti RNiftyReg shiny signal smoother stringr tibble viridisLite]; }; sparcl = derive2 { name="sparcl"; version="1.0.4"; sha256="138krflvfdlx4hlh90mswds51i8aw2vv00gm5lgkfsvxj4w324jg"; depends=[]; }; spark_sas7bdat = derive2 { name="spark.sas7bdat"; version="1.2"; sha256="1kvzfjhf1q5jzlq5d04s7d96j63vnvqqrh8s03rwkl79h1dhqhhp"; depends=[sparklyr]; }; - sparkTable = derive2 { name="sparkTable"; version="1.3.0"; sha256="1fc2nihxfrjpmxm9g9296mz5czd3ydvi1v37g8qgb20j7b73c64h"; depends=[boot Cairo ggplot2 gridExtra pixmap Rglpk RGraphics shiny StatMatch xtable]; }; sparkavro = derive2 { name="sparkavro"; version="0.3.0"; sha256="0g6ac9msfbx8f8j8rj0hvlxjsn317zyam207q7i8kf0hshs1r58f"; depends=[DBI dplyr sparklyr]; }; sparkbq = derive2 { name="sparkbq"; version="0.1.1"; sha256="0gccm8q5a45k9zm8f90r7fhcmriq8d038p022k7cikbr6rqsrmyh"; depends=[sparklyr]; }; sparkhail = derive2 { name="sparkhail"; version="0.1.1"; sha256="1a9p9i7fs6l9rx5ha6akjjl7qhfak01xsjg28ysv0imikmwp6hy7"; depends=[dplyr sparklyr sparklyr_nested]; }; @@ -13821,28 +13978,28 @@ in with self; { sparsio = derive2 { name="sparsio"; version="1.0.1"; sha256="181kzs9x3h497c7shfalbzrjz05bkj7mmjh9nyphxyi2jjrr6y1q"; depends=[Matrix Rcpp]; }; spate = derive2 { name="spate"; version="1.7"; sha256="1cr5jjrycfj9larsqgzfakk4qgfz8m5djg4ddzk6s3lg2iw06y43"; depends=[mvtnorm truncnorm]; }; spatgraphs = derive2 { name="spatgraphs"; version="3.2-1"; sha256="0n7f3r4ahv1w5mwx5mnib3g4263kz73rh1fcfk5wb12y52x8n1iz"; depends=[Matrix Rcpp]; }; + spathial = derive2 { name="spathial"; version="0.1.1"; sha256="1ki56j5hgf2yc80gw1a71xapkqksfmza6mnfwphkcljh973vqyxr"; depends=[class igraph knitr MASS matrixStats pracma rmarkdown Rtsne]; }; spatial = derive2 { name="spatial"; version="7.3-11"; sha256="04aw8j533sn63ybyrf4hyhrqm4058vfcb7yhjy07kq92mk94hi32"; depends=[]; }; - spatial_tools = derive2 { name="spatial.tools"; version="1.6.0"; sha256="1jh9psc2im0mp52mmz596x5h64m6w1d8hibnm7x52di5j2jp29vz"; depends=[abind doParallel foreach iterators mmap raster rgdal sp]; }; + spatial_tools = derive2 { name="spatial.tools"; version="1.6.2"; sha256="18x935ly2jpnah2dik44nsbin1wyy9v27galyf176bzmjhm029bb"; depends=[abind doParallel foreach iterators mmap raster rgdal sp]; }; spatialClust = derive2 { name="spatialClust"; version="1.1.1"; sha256="042yrmh1rb0hxynxlbdpcissgy9zazs5aqx7vj388ibynzijck3r"; depends=[ggplot2 maptools rgeos sp]; }; spatialCovariance = derive2 { name="spatialCovariance"; version="0.6-9"; sha256="1m86s9a059spp97y37dcirrgjshcqzpdj11cq92vji624w4nrhlb"; depends=[]; }; - spatialEco = derive2 { name="spatialEco"; version="1.3-0"; sha256="1l6ig6cw5hlm5g9ihah7ky5z82dcccnzr0ih4h5x7givrdrrd86g"; depends=[cluster dplyr EnvStats fasterize maptools MASS RANN raster RCurl readr rgeos rms sf sp SpatialPack spatstat spdep velox yaImpute]; }; + spatialEco = derive2 { name="spatialEco"; version="1.3-1"; sha256="075z9ggbm7kdl8aslpq5x0bniklnbmv9jb3ipx7r7xxvq5nf44pz"; depends=[cluster dplyr EnvStats exactextractr maptools MASS mgcv RANN raster RCurl readr rgeos rms sf sp SpatialPack spatstat spdep yaImpute]; }; spatialfil = derive2 { name="spatialfil"; version="0.15"; sha256="01fbn9zblz7rjsgqy3ikdqpf0p0idvb6m96mf7m7qi2ps5f48vzj"; depends=[abind fields]; }; - spatialfusion = derive2 { name="spatialfusion"; version="0.6"; sha256="13bpiw1f847nlrsvg6bpgb62pfgm5j47v7cy7x4bqxh497ci263b"; depends=[fields geoR Rcpp rstan SDraw sp]; }; - 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-5"; sha256="0zdj67rvfvssjch5hwyi4gvyr7pjgfjrkbhnc4q9psfjp9rhggyx"; depends=[boot coda expm gmodels LearnBayes MASS Matrix nlme spData spdep]; }; - spatialrisk = derive2 { name="spatialrisk"; version="0.6.5"; sha256="0qgy4imk1p35vglj8ahfaf8gy7ixqzdwp75nf1q2y22gjq45d1xa"; depends=[automap classInt dplyr fs ggplot2 gstat lubridate mgcv Rcpp RcppProgress sf sp tmap viridis vroom]; }; + spatialrisk = derive2 { name="spatialrisk"; version="0.6.6"; sha256="0sdabbjd6d3r2qicq7brbfhayr0dqcfv3wpvw2kgm9zl7xymwaar"; depends=[automap classInt dplyr fs ggplot2 gstat lubridate mgcv Rcpp RcppProgress sf sp tmap viridis vroom]; }; spatialsegregation = derive2 { name="spatialsegregation"; version="2.45"; sha256="04ibvk6shs15b8piln2lcnlj8s5gy6r7wraz6591dbc31grzaa36"; depends=[spatstat]; }; spatialwarnings = derive2 { name="spatialwarnings"; version="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.9"; sha256="1s7vhn3ywsdp91z4psx7nairxcfhblzyvx44v4an4rwhvvhvys3c"; depends=[adehabitatHR data_table igraph rgeos sp]; }; - spatstat = derive2 { name="spatstat"; version="1.63-0"; sha256="0sda6gj4w06fcsamvxwvvwnxhj90ridj16v7mp8diiv463v8rca3"; depends=[abind deldir goftest Matrix mgcv nlme polyclip rpart spatstat_data spatstat_utils tensor]; }; + spatialwidget = derive2 { name="spatialwidget"; version="0.2.2"; sha256="082w44i9is0cn4kgbqlnzclyp4fj2is0r5kla29nvm4m2y83bdjj"; depends=[BH colourvalues geojsonsf jsonify rapidjsonr Rcpp sfheaders]; }; + spatsoc = derive2 { name="spatsoc"; version="0.1.13"; sha256="1b5wvkm39ij08fjd2fsnnvaz5l43izpmqxsngzs1kvb8gl45v0bp"; depends=[adehabitatHR data_table igraph rgeos sp]; }; + spatstat = derive2 { name="spatstat"; version="1.63-3"; sha256="0a2mavlvk6faqag3xpm38z85ljlgb64xg7bp657r94bwnfhs3d07"; depends=[abind deldir goftest Matrix mgcv nlme polyclip rpart spatstat_data spatstat_utils tensor]; }; spatstat_Knet = derive2 { name="spatstat.Knet"; version="1.11-2"; sha256="0jkpj4m44cqid5jdn7fwg3cl15lsmc0dp3bzp6759spivsx1yzq1"; depends=[Matrix spatstat spatstat_utils]; }; spatstat_data = derive2 { name="spatstat.data"; version="1.4-3"; sha256="18lfj5vkwxgf5w9qz0g5al3zy8y2yi3bnd13w24hszfc82nbcmc9"; depends=[Matrix spatstat_utils]; }; + spatstat_gui = derive2 { name="spatstat.gui"; version="1.0-2"; sha256="07lk3xrg5cyvgvw2xwvi77s4ma8qbnmy4whsvm1wdfvw40c0mfrz"; depends=[rpanel spatstat spatstat_utils]; }; spatstat_local = derive2 { name="spatstat.local"; version="3.6-0"; sha256="19kv85smy8jp2bx1mgppav50k07xm8zvmf7snzj29rrspiws7sig"; depends=[spatstat spatstat_utils tensor]; }; - spatstat_utils = derive2 { name="spatstat.utils"; version="1.15-0"; sha256="031ar9yycg8kwknn0aa0pn12qjw722payff9jdzz8fb91drpvq4h"; depends=[]; }; - spatsurv = derive2 { name="spatsurv"; version="1.2"; sha256="0acg6n5qs3z9c7y2n3amla61dm3z1p16njkx0h52dlgdbj5v1nhn"; depends=[fields geostatsp iterators lubridate Matrix OpenStreetMap RandomFields raster RColorBrewer rgeos rgl sp spatstat stringr survival]; }; + spatstat_utils = derive2 { name="spatstat.utils"; version="1.17-0"; sha256="08h9kzkkxvlnngxnv5mdylfali5jj4yhgbr8kvf8l7glswz6ik9r"; depends=[]; }; + spatsurv = derive2 { name="spatsurv"; version="1.4"; sha256="0sw5a532p3bbbh3pxvscmmmg6jw126ncpihxiv01bpwmf85ld4z2"; depends=[fields geostatsp iterators lubridate Matrix RandomFields raster RColorBrewer rgeos sp spatstat stringr survival]; }; spbabel = derive2 { name="spbabel"; version="0.5.0"; sha256="0jwv3mirm5wkfqja0nwy25nfndis8px4awpjh4hk9bi77dfy14bf"; depends=[dplyr sp tibble]; }; spc = derive2 { name="spc"; version="0.6.3"; sha256="0ik5qmf0f0l77rbg78rp8v606h0d1qp4kccl6j3vqfb2hjsqb7r0"; depends=[]; }; spc4sts = derive2 { name="spc4sts"; version="0.5.2"; sha256="039z6dnry5c2brmh7jsnb6cvb7a8nig1rrf4d4i5bpifi2x1hf06"; depends=[gridExtra LS2Wstat rpart]; }; @@ -13862,13 +14019,14 @@ in with self; { spec = derive2 { name="spec"; version="0.1.7"; sha256="0zgs9yki11wysvjnx88gl8iv0mcsbrasg29sbasp0855x5l8cg8k"; depends=[csv encode magrittr]; }; speccalt = derive2 { name="speccalt"; version="0.1.1"; sha256="0j7rbidmmx78vgwsqvqjbjjh92fnkf2sdx0q79xlpjl2dph7d6l6"; depends=[]; }; specklestar = derive2 { name="specklestar"; version="0.0.1.7"; sha256="04vm989yi31vqnf5rs6cdyikm4jzfd9njxh0ls3dvjrg19ipsnmn"; depends=[Rcpp]; }; - spectacles = derive2 { name="spectacles"; version="0.5-0"; sha256="0i1kzp0fpljcvkws15w3iwgpjig2llhlrfs5blk562kgb7vwshqm"; depends=[baseline epiR ggplot2 plyr reshape2 signal stringr]; }; + specr = derive2 { name="specr"; version="0.2.1"; sha256="17bc7f644g40zsfxv3sw542piqgg09w3m3q14jgrifc8sw0ljvdf"; depends=[broom cowplot dplyr ggplot2 ggraph glue igraph lme4 magrittr purrr rlang tibble tidyr]; }; + spectacles = derive2 { name="spectacles"; version="0.5-2-2"; sha256="0nr2s6mnnir7jwrv80s2vk8wffqd7dl7xj82ss1idshqxk0dliz3"; depends=[baseline epiR ggplot2 plyr reshape2 signal stringr]; }; spectral = derive2 { name="spectral"; version="1.3"; sha256="1x5fskivs08wh1ka63i40m1mzsgq1vl25dglzbk9qywxxphvfdmn"; depends=[lattice rasterImage]; }; spectral_methods = derive2 { name="spectral.methods"; version="0.7.2.133"; sha256="0k8kpk94d2qzqdk3fnf6h9jmwdyp8h3klr0ilm5siwq5wkcz339l"; depends=[abind DistributionUtils foreach JBTools ncdf_tools nnet raster RColorBrewer RNetCDF Rssa]; }; spectralAnalysis = derive2 { name="spectralAnalysis"; version="3.12.0"; sha256="0mz01hx86qi65k6vzz9k1j9q7gi10dh14cqvrlfy93f3kmi52q0x"; depends=[baseline BiocGenerics data_table ggplot2 hNMF jsonlite magrittr NMF nnls plotly plyr RColorBrewer signal viridis]; }; spectralGP = derive2 { name="spectralGP"; version="1.3.3"; sha256="1jf09nsil4r90vdj7n1k6ma9dzzx3bwv0fa7svil9pxrd2zlbkbs"; depends=[]; }; spectralGraphTopology = derive2 { name="spectralGraphTopology"; version="0.2.0"; sha256="02j374zsz4ba8ldy52x43rih1p77b56cv5xlbycj5wmkzny2gzx1"; depends=[MASS Matrix progress Rcpp RcppArmadillo RcppEigen rlist]; }; - spectrolab = derive2 { name="spectrolab"; version="0.0.8"; sha256="1hjvi9na94f7n7yr64p0bvh0mzckwmfh36d6zxisrxr08zxwyxzz"; depends=[devtools prospectr RColorBrewer shiny shinyjs usethis]; }; + sped = derive2 { name="sped"; version="0.2-1"; sha256="05igpk8szdcs6kjhpmd9dmjvqdg199pz3hi0rwkhdjglxivvjzjn"; depends=[pooh]; }; speech = derive2 { name="speech"; version="0.1.0"; sha256="007s32w8qr45x1n40xdh85a329cgmm3809bi62ghnxzfny9vjb07"; depends=[dplyr lubridate magrittr pdftools purrr stringr tabulizer tibble tidyr tm]; }; speedglm = derive2 { name="speedglm"; version="0.3-2"; sha256="1b25zimk0z7ad62yacqdg0zk0qs0jja4i918ym942xfw4j1z3jjz"; depends=[MASS Matrix]; }; spef = derive2 { name="spef"; version="1.0.8"; sha256="1c4hpm19zqh869z8qbixkfbidnygc3fy91d0m2l4bp2s6bq1wdnz"; depends=[BB ggplot2 nleqslv plyr sm SQUAREM survival]; }; @@ -13876,14 +14034,15 @@ in with self; { spellcheckr = derive2 { name="spellcheckr"; version="0.1.2"; sha256="09snc1ymzr4njnr3w502b84dqwjjd414higjxqi48jvh27br5k1l"; depends=[data_table dplyr stringr]; }; spelling = derive2 { name="spelling"; version="2.1"; sha256="1j92brq29za3di1723xhmx240ya2v351dvcg0r1xr5yclw1kh3jp"; depends=[commonmark hunspell knitr xml2]; }; 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]; }; + sperich = derive2 { name="sperich"; version="1.5-8"; sha256="0v4mnv9nl0dvmmfx10w03k02pwjjnip9526m3j1kpgn6c4wk1h93"; depends=[foreach rgdal 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]; }; spex = derive2 { name="spex"; version="0.6.0"; sha256="1m56vmp1zacipr8kw4pwh0rpc0jhi8a59351g9c6gpx48ysj9sbk"; depends=[quadmesh raster reproj sp]; }; spfrontier = derive2 { name="spfrontier"; version="0.2.5"; sha256="1vnvwcjbhvbmyn5rp4760amzy8k3y156q629fjymw9rw6zy45pbf"; depends=[ezsim moments mvtnorm numDeriv optimx spdep tmvtnorm]; }; spftir = derive2 { name="spftir"; version="0.1.0"; sha256="07vw8igy698jx671cj6hmf6ll9xvaq81fb6la7j95pqbd6jl284z"; depends=[pracma]; }; spgrass6 = derive2 { name="spgrass6"; version="0.8-9"; sha256="05xvdhisad0d7c69mvahzg6pvgvmb6dph50r34981palykic7qhn"; depends=[sp XML]; }; spgs = derive2 { name="spgs"; version="1.0-3"; sha256="0a7zqih8q4imi49in8d2j9wa82savp7d2g4xy4wlwblwf6f2ggsh"; depends=[]; }; - spgwr = derive2 { name="spgwr"; version="0.6-32"; sha256="0xdv0yy6md9kv1aay6xxj1k3x59apflip0qpfvyk2aa2wbn1sx2v"; depends=[sp spData]; }; + spgwr = derive2 { name="spgwr"; version="0.6-33"; sha256="1nbg4jacc4iimn79b60c6q9qf09j35yxa2nmlwwijmixa15gmqyd"; depends=[sp spData]; }; + spherepc = derive2 { name="spherepc"; version="0.1.4"; sha256="0jyaanwb78gv3cb1ig86h8cjaw35pxwx7hq53kc9iwjfhkrmc2j3"; depends=[geosphere rgl sphereplot]; }; sphereplot = derive2 { name="sphereplot"; version="1.5"; sha256="1i1p20h95cgw5wqp9bwfs9nygm4dxzsggz08ncjs1xrsvhhq9air"; depends=[rgl]; }; sphet = derive2 { name="sphet"; version="1.7"; sha256="0savvqz3v5awsr7kcghg6yzkqdpm01kwp7jrg9ajfb3146gg8mlq"; depends=[Matrix nlme sp spdep]; }; spi = derive2 { name="spi"; version="1.1"; sha256="0gc504f7sji5x0kmsidnwfm7l5g4b1asl3jkn2jzsf2nvjnplx1z"; depends=[]; }; @@ -13891,7 +14050,7 @@ in with self; { spider = derive2 { name="spider"; version="1.5.0"; sha256="1y034v42jxjl3vj87iz5kaizq7fwppmn56z7yyvrrmk5ps4nqr1j"; depends=[ape pegas]; }; spiderbar = derive2 { name="spiderbar"; version="0.2.2"; sha256="1ardf7i0s17k8psch7vv29xnvrhw427id5hx3b8jca5cbz1l2ylb"; depends=[Rcpp]; }; spiders = derive2 { name="spiders"; version="1.2"; sha256="1qklm178bgkgpvrjf024jphsdh9can8300sf0702l4h0rk2daqbq"; depends=[plyr]; }; - spikeSlabGAM = derive2 { name="spikeSlabGAM"; version="1.1-14"; sha256="1ha2ngs5jkrcd3ay26vynrd31fqf9pva5r0p954dyfbpbinizxgf"; depends=[akima cluster coda ggplot2 gridExtra MASS MCMCpack mvtnorm R2WinBUGS reshape scales]; }; + spikeSlabGAM = derive2 { name="spikeSlabGAM"; version="1.1-15"; sha256="1kg1vqx9zvn8jqh8ygjifpyd00npqz3ljbs7r3zgh28bclhfywai"; depends=[akima cluster coda ggplot2 gridExtra MASS MCMCpack mvtnorm R2WinBUGS reshape scales]; }; spikes = derive2 { name="spikes"; version="1.1"; sha256="080sna0sgii61kai5sirs6cijnvk1012djwfw705di9y2lvk1hqk"; depends=[emdbook]; }; spikeslab = derive2 { name="spikeslab"; version="1.1.5"; sha256="0dzkipbrpwki6fyk4hqlql3yhadwmclgbrx00bxahrmlaz1vjzh2"; depends=[lars randomForest]; }; spinBayes = derive2 { name="spinBayes"; version="0.1.0"; sha256="1qgqxxk4n17wj3q07irm2qj6lwc5188iwwbdkf588hvfy86lwpj8"; depends=[glmnet MASS Rcpp RcppArmadillo]; }; @@ -13905,9 +14064,10 @@ in with self; { splines2 = derive2 { name="splines2"; version="0.2.8"; sha256="0ygzqq0swhcss5v8bn7qg98fpvp3wibbnbzkbpw4nvfd8bg51m1v"; depends=[]; }; splinetree = derive2 { name="splinetree"; version="0.2.0"; sha256="0gqb3kwca42crrx6fj42ryl5pkxvankhp1chdlvi5lgg8mzmqsnl"; depends=[ggplot2 mclust mosaic nlme rpart treeClust]; }; splitFeas = derive2 { name="splitFeas"; version="0.1.0"; sha256="1cfiis32h5kkp8r1mndmj4xss9gw96vdzk7q68q3jhbwqiaxp9rp"; depends=[corpcor matrixStats]; }; - splitTools = derive2 { name="splitTools"; version="0.1.0"; sha256="0xb9hxqm9s9f2pqfz4rs4agmrmyc77ci2agyzvpm2x05vxy39yxi"; depends=[]; }; + splitSelect = derive2 { name="splitSelect"; version="1.0.0"; sha256="044pmsdq1kvs3qjglrdpwq5kxvxfybpaqmqhnmwpw4xlql4afvyc"; depends=[caret doParallel foreach glmnet multicool mvnfast]; }; + splitTools = derive2 { name="splitTools"; version="0.2.0"; sha256="1wbssmlm0k261bk8a1x4zqfprsl0gp38a9asfa8iidsgw3yd9lf5"; depends=[]; }; splitfngr = derive2 { name="splitfngr"; version="0.1.2"; sha256="0cf9y68m72j890a732m0n784nr12ydljr6s8i80f0in6q8lmw8ls"; depends=[lbfgs]; }; - splithalf = derive2 { name="splithalf"; version="0.5.2"; sha256="16ydqj1mjsii18zllm5v24qw8na88sa3ml2s1b0xlc72fvy76646"; depends=[dplyr Rcpp robustbase tidyr]; }; + splithalf = derive2 { name="splithalf"; version="0.7.1"; sha256="0mpg6i6zh4s9sz10gs0h3y1cc1zva7vs805sb3qkghx857psgyw3"; depends=[dplyr ggplot2 patchwork plyr Rcpp robustbase tidyr]; }; splithalfr = derive2 { name="splithalfr"; version="1.0.10"; sha256="08gl60dbjb4nq6ab0w7yj7ac0gnj0zxbvzlg3rkqczvx4r3gwkip"; depends=[dplyr rlang]; }; splitstackshape = derive2 { name="splitstackshape"; version="1.4.8"; sha256="0mpyf2kkfdl69pdc6brl1r6101vyc6pgr7z17s55ppg3y71k4q35"; depends=[data_table]; }; splm = derive2 { name="splm"; version="1.4-11"; sha256="15app94mxs6xlmqqhpa0q041skc4n4l2wfi6pmmhwinrgcqgncln"; depends=[bdsmatrix ibdreg MASS Matrix maxLik nlme plm spam spdep]; }; @@ -13921,9 +14081,10 @@ in with self; { spmoran = derive2 { name="spmoran"; version="0.1.7.2"; sha256="0gqpnam9z6rni7sswdy3il3z5sdal8dlwm1lpzascdg709qgvdd8"; depends=[doParallel fields foreach ggplot2 Matrix rARPACK spdep vegan]; }; spnet = derive2 { name="spnet"; version="0.9.1-0"; sha256="1fy0fpgz2k985brfqyza1l49y0w2j9z308n542pgmkzqsnsdscpw"; depends=[shape sp]; }; spnn = derive2 { name="spnn"; version="1.2.1"; sha256="1yj89j7nynfyw1ikm6q5kdwdgiiwxx0aa6kgnri5wfnb4l0356l7"; depends=[MASS Rcpp RcppArmadillo]; }; - spocc = derive2 { name="spocc"; version="1.0.2"; sha256="1mglkbbr2zhy884ilhxy2dkcjlr4aq16z08vs9gc44258i59kzy0"; depends=[crul data_table jsonlite lubridate rbison rebird rgbif ridigbio rvertnet tibble whisker wicket]; }; + spocc = derive2 { name="spocc"; version="1.0.8"; sha256="05x9gax8zwpcp4014ffcml8whclkz0yydhb6jgw4wlljnrz8s92r"; depends=[crul data_table jsonlite lubridate rbison rebird rgbif ridigbio rvertnet tibble whisker wicket]; }; spongebob = derive2 { name="spongebob"; version="0.4.0"; sha256="1ar5173fwx1am5rgjlnczfla6b49g0azl0h9vn89ipw7f71rr5j7"; depends=[]; }; spongecake = derive2 { name="spongecake"; version="0.1.2"; sha256="13fxizbfjvqkhkmxk5bwv2fj2xyjkbxrxicpdgwpg0wsk4dhj3s8"; depends=[ggplot2 jpeg magrittr plyr]; }; + spork = derive2 { name="spork"; version="0.1.6"; sha256="0yih4cl118fkx19l4nbc6bicnpk9nkyfjnmq4ynda5bh8mbybdwm"; depends=[ggplot2 latexpdf png]; }; sporm = derive2 { name="sporm"; version="1.1"; sha256="07sxz62h4jb7xlqg08sj4wpx121n9jfk65196mnxdvb36lqmb4hp"; depends=[]; }; sport = derive2 { name="sport"; version="0.2.0"; sha256="1wb28iaa35naf5aczijb5g0l41yf098f7c20mjmkcd5w04l1mmks"; depends=[data_table ggplot2 Rcpp]; }; spotGUI = derive2 { name="spotGUI"; version="0.2.1"; sha256="1z664ricdsn8c29ks6hslm89f0qq6ls94pz4k256427cs95pk3ay"; depends=[gridExtra httpuv plotly rclipboard rhandsontable shiny shinyBS shinydashboard shinyjs smoof SPOT XML]; }; @@ -13939,12 +14100,12 @@ in with self; { sprsmdl = derive2 { name="sprsmdl"; version="0.1-0"; sha256="09klwsjp5w6p7dkn5ddmqp7m9a3zcmpr9vhcf00ynwyp1w7d26gi"; depends=[]; }; spsann = derive2 { name="spsann"; version="2.2.0"; sha256="00nlrwk50ch128brzvfxld0pcpq1syks9rvwdrcf1i2pcxnva7d0"; 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]; }; + spsh = derive2 { name="spsh"; version="1.1.0"; sha256="1rmsgp0mrb4153v5f5xby7r3izvgz1a0vi63g5p9q5jd6z0gd2i1"; depends=[DEoptim FME hypergeo lhs pracma Rdpack]; }; spsi = derive2 { name="spsi"; version="0.1"; sha256="0q995hdp7knic6nca0kf5yzkvv8rsskisbzpkh9pijxjmp1wnjrx"; depends=[plot3D]; }; spsur = derive2 { name="spsur"; version="1.0.0.4"; sha256="0av0bay2dyfavsckqzjqr490k05fwfncr0yk1wxv741w35ww9mpx"; depends=[Formula MASS Matrix minqa numDeriv sparseMVN spdep]; }; - spsurvey = derive2 { name="spsurvey"; version="4.1.1"; sha256="0ckr2lciqax391g6q6zqsq1bmjbcpp1k8ndzr754vslqn5cibffj"; depends=[crossdes deldir foreign Hmisc MASS rgeos sf sp]; }; + spsurv = derive2 { name="spsurv"; version="1.0.0"; sha256="11jlbzvzxv3d1d0nwpbii46ddvphglrxv25rw7pvxbybcx2i7k6x"; depends=[BH coda loo MASS Rcpp RcppEigen rstan rstantools StanHeaders survival]; }; + spsurvey = derive2 { name="spsurvey"; version="4.1.2"; sha256="1lijys90x2s7xxx16bm6h9320kbldgpb1hnyij6s4fkrmqksk8mh"; depends=[crossdes deldir foreign Hmisc MASS rgeos sf sp]; }; spt = derive2 { name="spt"; version="2.5.1"; sha256="04j38d2b35p4798znnc49vqrg8r8bygwi07vybfj3nzimlp2mkrn"; depends=[]; }; - sptemExp = derive2 { name="sptemExp"; version="0.1.4"; sha256="16rp20l65id6jiqify7hii0xpgkiyhgp9xg89b002n0jsy10pgph"; depends=[automap BayesX BayesXsrc bcv deldir doParallel foreach limSolve ncdf4 plyr R2BayesX raster Rcpp RcppEigen rgdal rgeos sp SpatioTemporal]; }; sptm = derive2 { name="sptm"; version="2019.11-25"; sha256="1hdymzngdppmh56dqh0k88n9hg68pbx9rgmimbz4ihnfx2plvadh"; depends=[kyotil survey survival]; }; spuRs = derive2 { name="spuRs"; version="2.0.2"; sha256="00c0hnyrcbkbj269czxbfgmgi88y0vxzm79sxclllkzr9rdd1p53"; depends=[lattice MASS]; }; sqldf = derive2 { name="sqldf"; version="0.4-11"; sha256="0q12vsb53p2wchgp8wfz5bk08wfnm0jxjrakclj4jyy6x3a7ksff"; depends=[chron DBI gsubfn proto RSQLite]; }; @@ -13952,21 +14113,21 @@ in with self; { sqlparseR = derive2 { name="sqlparseR"; version="0.1.0"; sha256="0zcna9y61v1qklpnhrwgv1djg4hyx3k5an32caapszi8qm9nq3x8"; depends=[reticulate]; }; 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=[]; }; + sqp = derive2 { name="sqp"; version="0.5"; sha256="0l01zwcryv5bmzmd98gj0m5ip8nvr8lziq1awvfif1bzwvvd2kzx"; depends=[Matrix Rcpp RcppArmadillo RcppEigen Rdpack]; }; + squash = derive2 { name="squash"; version="1.0.9"; sha256="1x66iamj5pir6l9aqx4x7xylxxjpjrw8vcix9rbhfd0y0y2iqf7z"; depends=[]; }; squid = derive2 { name="squid"; version="0.1.2"; sha256="1sf7q9pp68inr4ikaxm51f31gwxq9ixrsismrnnsby3agq6nsmkb"; depends=[arm data_table ggplot2 lme4 MASS shiny]; }; - sra = derive2 { name="sra"; version="0.1.1"; sha256="03nqjcydl58ld0wq1f9f5p666qnvdfxb5vhd584sdilw1b730ykd"; depends=[]; }; + sra = derive2 { name="sra"; version="0.1.3"; sha256="0bdxgsz177szfqmvffidgkhl0lrdd7c1nzdvh7ijx99zmi5ww71n"; depends=[]; }; srm = derive2 { name="srm"; version="0.3-6"; sha256="0mc97pv1hsmia4v2wyb8yi37i3v1xypfv9xmhjb989xnnysf1lm3"; depends=[Rcpp RcppArmadillo]; }; srp = derive2 { name="srp"; version="1.2.0"; sha256="0xdzfvi7z78xmyxwd8fha3lr86jwmgjba1w8hhn4sv3v5gc9vlkh"; depends=[fda mgcv]; }; - srvyr = derive2 { name="srvyr"; version="0.3.7"; sha256="0mj2s98qlvy9jqsnfhv4l9d35wvk89wi5iygc7s7i8m50ph22glv"; depends=[dplyr magrittr rlang survey tibble tidyselect]; }; + srvyr = derive2 { name="srvyr"; version="0.3.8"; sha256="06fj9z7l7jl75sr2nqj1kp5wks5d7a8ca2d2b6vd3i0y9c4ljkxc"; depends=[dplyr magrittr rlang survey tibble tidyselect]; }; ss3sim = derive2 { name="ss3sim"; version="1.0.3"; sha256="0s2yajlhi07fvqc0rr4msd9g2jrswb83dx55wsxnw925vikqa5kz"; depends=[bbmle foreach ggplot2 gtools r4ss]; }; ssMousetrack = derive2 { name="ssMousetrack"; version="1.1.5"; sha256="069jsp2l63jp4fv2hwadqxpkp89aqmbh439zy66rx55kws75b556"; depends=[BH CircStats cowplot dtw ggplot2 Rcpp RcppEigen rstan rstantools StanHeaders]; }; - ssa = derive2 { name="ssa"; version="1.3.0"; sha256="0lbwvw8f88wvlhzd469fww0av0nbi6l76vmmxbps0ifw2q87l00d"; depends=[iterators]; }; ssanv = derive2 { name="ssanv"; version="1.1"; sha256="17a4a5azxm5h2vxia16frcwdyd36phpfm7fi40q6mnnrwbpkzsjd"; depends=[]; }; ssc = derive2 { name="ssc"; version="2.1-0"; sha256="1lq71p8hbjfg4a52009810k5dmhak9ddk1dywvhy7v2gjmxqnadw"; depends=[proxy]; }; sscor = derive2 { name="sscor"; version="0.2"; sha256="1kcrr90cxg6k4qkc3pidhkwf4dsnlgbxczxigr2afwpd9cpf104c"; depends=[mvtnorm pcaPP robustbase]; }; ssd = derive2 { name="ssd"; version="0.3"; sha256="1z61n9m6vn0ijawyz924ak0zfl9z13jsb4k4575b7c424ci2p6gy"; depends=[]; }; ssdtools = derive2 { name="ssdtools"; version="0.1.1"; sha256="1vamc0b325i1jmzkqyjp7hym3x66pj9yflvplqa64m5nxr3q1anz"; depends=[abind actuar chk fitdistrplus ggplot2 lifecycle scales VGAM]; }; - sse = derive2 { name="sse"; version="0.7-15"; sha256="1g1hxw1k8wnlzy7qif6334ncp4dxznkf2anhvzcha9iwy56byn1n"; depends=[lattice]; }; + sse = derive2 { name="sse"; version="0.7-16"; sha256="1kxdgbskw7v48jnif4dpmwxpsdznfx8d9q5nkf3ynw9xl38rzv23"; depends=[lattice]; }; ssev = derive2 { name="ssev"; version="0.1.0"; sha256="1iw07gw9vhg073s5kkxh5f1si6p998rc1i2zglnpk5c3pi3l55wp"; depends=[MESS pwr]; }; ssfa = derive2 { name="ssfa"; version="1.1"; sha256="0fkyalhsjmx2sf8xxkppf4vd272n99nbkxh1scidrsgp4jk6z7fx"; depends=[Matrix maxLik sp spdep]; }; ssfit = derive2 { name="ssfit"; version="1.1"; sha256="1fais0msi2ppgfp0vbx3qri7s9zs51i7n90w36xkwwac4f46bq5y"; depends=[survey]; }; @@ -13976,7 +14137,7 @@ in with self; { ssize_fdr = derive2 { name="ssize.fdr"; version="1.2"; sha256="0y723lwsnmk3rxbhlsrny9hiy07a5p255ygy9qkj6mri64gk1hby"; depends=[]; }; ssizeRNA = derive2 { name="ssizeRNA"; version="1.3.2"; sha256="1qw10yswzpg28fhvr6rsq0gh7xivfapw64gxc0hakb1nc31jf8ky"; depends=[Biobase edgeR limma MASS qvalue ssize_fdr]; }; ssmn = derive2 { name="ssmn"; version="1.1"; sha256="1rab9yjb05g5rphqlhwvdwmsyqlv1f4m0rqxfv8c5pbh170nbwbc"; depends=[mnormt moments sn truncdist]; }; - ssmrob = derive2 { name="ssmrob"; version="0.7"; sha256="0asf0r83rzar96lcjm38i85qscbs9gbsrwbd1nfwzz9yl08mh07k"; depends=[MASS robustbase sampleSelection]; }; + ssmrob = derive2 { name="ssmrob"; version="0.8"; sha256="1y5a02xqj931gyfxqp7i87nkinbm4wan0pq08f111q05zg1j8wmj"; depends=[MASS robustbase sampleSelection]; }; ssmsn = derive2 { name="ssmsn"; version="0.2.0"; sha256="0fzqdkqhj5hh8pzcwh7i0rglgdq22a5mriyis8r1vhlkdc7n5m39"; depends=[MCMCpack]; }; sspline = derive2 { name="sspline"; version="0.1-6"; sha256="0d6ms8szyn39c7v0397d5ar2hrl8v1l2b7m8hlj37hgp70b9s55h"; depends=[]; }; sspse = derive2 { name="sspse"; version="0.6"; sha256="1296893wgg0s6z5bv9a3k39gbxazvljl4dxiv4ma1s73nhz0xan9"; depends=[coda RDS scam]; }; @@ -13990,21 +14151,22 @@ in with self; { 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.4"; sha256="0a6b38lhi1p0n2hjq2j8aw2vkasdv50cpgllxfxla7ddwbhbk3nk"; depends=[data_table doParallel EmiStatR foreach ggplot2 hydroGOF lattice lmom mAr moments msm xts zoo]; }; - staRdom = derive2 { name="staRdom"; version="1.1.1"; sha256="089fks6qik8wplsfibdvj7r6m89329n3grlm7sdhg4m0m7x2z8yc"; depends=[cdom data_table doParallel dplyr drc eemR foreach GGally ggplot2 gtools matrixStats MBA multiway pracma R_matlab readr stringr tibble tidyr zoo]; }; + staRdom = derive2 { name="staRdom"; version="1.1.10"; sha256="17827w3kmj0ggap465q4chlh045ggvarik795c74sl5ldwc74ad8"; depends=[cdom data_table doParallel dplyr drc eemR foreach GGally ggplot2 gtools matrixStats MBA multiway pracma R_matlab readr stringr tibble tidyr zoo]; }; staTools = derive2 { name="staTools"; version="0.1.0"; sha256="1ksr0sjkhlwh0fkwcxjcxzbyxs1g78m4spkhrmgdpfzmk5zskqf9"; depends=[magicaxis Rcpp VGAM]; }; stability = derive2 { name="stability"; version="0.5.0"; sha256="0mz7ikfhpfbdcp72klq7fi4zfmx2w18gz46yhwywcc4dyi277m11"; depends=[dplyr ggfortify ggplot2 lme4 magrittr matrixStats reshape2 rlang scales tibble tidyr]; }; stable = derive2 { name="stable"; version="1.1.4"; sha256="01azqg4yi5wl6wfdpjq57w41x5z2b4dsp5n3vpkz24b9avk6rm8s"; depends=[rmutil stabledist]; }; + stableGR = derive2 { name="stableGR"; version="1.0"; sha256="1glxrxqd3gr7npwlzcr2nmsmakydyxg7hswvb85gz1jvc6c6254f"; depends=[mcmcse mvtnorm]; }; stabledist = derive2 { name="stabledist"; version="0.7-1"; sha256="0scar396wiq6wkbkvwp4qrxqc1m075y56p37i6iry5rw796p1i86"; depends=[]; }; stablelearner = derive2 { name="stablelearner"; version="0.1-1"; sha256="19mvk6dzg8zg0nj1q4sraqg6h3zj8xvnfc0jql1xiqas9wcypx7d"; depends=[e1071 MASS partykit]; }; stablespec = derive2 { name="stablespec"; version="0.3.0"; sha256="0m143cq0baj2lyakhr31mqk2lg78jzpdlpv2bhwz6bzzip7mqi22"; depends=[foreach ggm graph matrixcalc nsga2R polycor Rgraphviz sem]; }; - stabm = derive2 { name="stabm"; version="1.1.0"; sha256="17vd3dgfxd1y5f797l8in2sj4hd9fg3s1xdvqjw2x4pgjz0i9w61"; depends=[BBmisc checkmate Matrix]; }; + stabm = derive2 { name="stabm"; version="1.1.2"; sha256="01fg6zn6i710xfa9g15q4ca7vfgkfrk0iz6fvn8qp6y3dfrpm1sj"; depends=[BBmisc checkmate Matrix]; }; stabreg = derive2 { name="stabreg"; version="0.1.2"; sha256="1jrxyv0d33vd9vdlj1cv1a2qdz8iqgr726f54dgazwsz3cpyy2ia"; depends=[numDeriv]; }; stabs = derive2 { name="stabs"; version="0.6-3"; sha256="17sa0sjxf6h7gx1ga1pxhv17yrz3qisaivbf5cbc3asvshhswqg9"; depends=[]; }; stackoverflow = derive2 { name="stackoverflow"; version="0.7.0"; sha256="0zv8bxzw4pgaa5ra8wsb9p7g8bwffdhc6gqsfrcs61zva7v9izc2"; depends=[]; }; - stacomiR = derive2 { name="stacomiR"; version="0.5.4.2"; sha256="0dhf91wmv3mz120g9bwspgq9qs6d8sk1a2vxd7xl0jibgx6fk22x"; depends=[dplyr ggplot2 gWidgets gWidgetsRGtk2 Hmisc intervals lattice lubridate magrittr mgcv RColorBrewer reshape2 RGtk2 RODBC RPostgreSQL sqldf stacomirtools stringr xtable]; }; + stacomiR = derive2 { name="stacomiR"; version="0.5.4.3"; sha256="0x3b8hp789ahxvd28jk01iyf2fn0mlfj16sx2w2x99jbqpfxqxkd"; depends=[dplyr ggplot2 gWidgets gWidgetsRGtk2 Hmisc intervals lattice lubridate magrittr mgcv RColorBrewer reshape2 RGtk2 rlang RODBC RPostgreSQL sqldf stacomirtools stringr xtable]; }; stacomirtools = derive2 { name="stacomirtools"; version="0.5.3"; sha256="00zpsfrw0gcjbjr3xdxf2wacrr1zfw6wq7a2ycq32pbh2smbkz4k"; depends=[RODBC xtable]; }; stagePop = derive2 { name="stagePop"; version="1.1-1"; sha256="0949r5ibl3sb10sr5xsswxap3wd824riglrylk7fx43ynsv5hzpy"; depends=[deSolve PBSddesolve]; }; - stagedtrees = derive2 { name="stagedtrees"; version="1.0.1"; sha256="0ycv4gban5nb1c26riwamvbz5jk740ixhm4f6cmqa0qyyd6nvm9k"; depends=[]; }; + stagedtrees = derive2 { name="stagedtrees"; version="1.0.2"; sha256="11s09r4bp3fd9nbfqmwbdkvlgkryf3n9awbffyk2rsd9cdva2lch"; depends=[]; }; stam = derive2 { name="stam"; version="0.0-1"; sha256="1x1j45fir64kffny0nssb2hwn4rcp8gd2cjv6fw4yy0l4d0xi5iv"; depends=[np sp]; }; stampr = derive2 { name="stampr"; version="0.2"; sha256="10mc71kgnw5712q2gvzd4bmjaw1879r7s599hfsjap21idqb2k2m"; depends=[deldir maptools raster rgdal rgeos sp spdep]; }; standardize = derive2 { name="standardize"; version="0.2.1"; sha256="0ijyqy09fl478cvqnqwv7fpdmf2yvihw18abkkmgwdnm2v3xqphp"; depends=[lme4 MASS stringr]; }; @@ -14012,38 +14174,37 @@ in with self; { staplr = derive2 { name="staplr"; version="2.9.0"; sha256="1m1rikd1ijw9svdfm7nn9fnc9pycymbnnv2dq7ygs40jkq2mr4zp"; depends=[assertthat glue stringr]; }; stargazer = derive2 { name="stargazer"; version="5.2.2"; sha256="1pij76r60hkjlvxw6zw1v7gkib81smiqmjq7mwszn6xclq9lmsvh"; depends=[]; }; starma = derive2 { name="starma"; version="1.3"; sha256="07r0kyabhgbm2v39fcrw0qhxcxj9a9cb45g9chzcnn9qmvramcwx"; depends=[ggplot2 Rcpp RcppArmadillo scales]; }; - starmie = derive2 { name="starmie"; version="0.1.2"; sha256="06cvl8gk78c55kcf4rd27d4gfzh2lcg7ldynvx4hclvbw7ak9zdq"; depends=[combinat data_table ggdendro ggplot2 ggrepel gridExtra iterpc label_switching MCL MCMCpack proxy purrr readr stringr tidyr]; }; stars = derive2 { name="stars"; version="0.4-0"; sha256="1wby9mkqybq17aakplhz22xp3xkpih9y5b2kc5mhgsl7s07glh42"; depends=[abind classInt lwgeom rlang sf units]; }; startR = derive2 { name="startR"; version="0.0.1"; sha256="12y57n3yip5rz4rln41896a15zv5b4c67k164282fh1p6ww9gr3r"; depends=[abind bigmemory future]; }; - startup = derive2 { name="startup"; version="0.14.0"; sha256="1s1h0mvb7wxp6scl2l8lrdlgfw85g67xsrihgad4c89ndis9px6l"; depends=[]; }; + startup = derive2 { name="startup"; version="0.14.1"; sha256="0nvmhfar53yi3wsvhv4idx849psdj46qhkvkxjn52fa7yflkrwz8"; depends=[]; }; startupmsg = derive2 { name="startupmsg"; version="0.9.6"; sha256="0vkqxir4ady4dn9s70dfg1fxck2xg8vnmrmxjzvk01i6pc9zyq0x"; depends=[]; }; statGraph = derive2 { name="statGraph"; version="0.3.0"; sha256="1xc10pkv3dq7x98xjqkg7ily89qj2r637y5qlnfvk08n6mzhn8w0"; depends=[igraph MASS]; }; - statVisual = derive2 { name="statVisual"; version="1.1.9"; sha256="1wf0hgvfynw85zqh4wcmjnysmj8701lxm31bnqyf1kawxjqdxyn4"; depends=[Biobase dplyr factoextra forestplot gbm GGally ggdendro ggfortify ggplot2 ggrepel glmnet gplots gridExtra knitr limma magrittr multigroup pheatmap pROC pvca randomForest RColorBrewer reshape2 rmarkdown rpart_plot tibble tidyverse]; }; + statVisual = derive2 { name="statVisual"; version="1.2.1"; sha256="1cc9p9g8lzn0lgh793r977yhqbk89l74m443gnznjlfml69bfb21"; depends=[Biobase dplyr factoextra forestplot gbm GGally ggdendro ggfortify ggplot2 ggrepel glmnet gridExtra knitr limma magrittr pheatmap pROC pvca randomForest RColorBrewer reshape2 rmarkdown rpart_plot tibble tidyverse]; }; statar = derive2 { name="statar"; version="0.7.1"; sha256="0gxchf3mnjvxcp7dg8f1dxbm16hx4ks92z0h0ig7m9l6k6f8adkv"; depends=[data_table dplyr ggplot2 lazyeval matrixStats rlang stringr tidyr tidyselect]; }; - statarepl = derive2 { name="statarepl"; version="0.1.0"; sha256="0byx14mvvigmshd53cxk5wzmfjcky39ywx2km21d2b74s86cb4g5"; depends=[attempt cli crayon jsonlite knitr R6 rlang rstudioapi subprocess]; }; statcanR = derive2 { name="statcanR"; version="0.1.0"; sha256="1pyax5lixbpdg99n525w9z44s0zp5xda6ad605c3id0arki9c8xq"; depends=[curl data_table]; }; statcheck = derive2 { name="statcheck"; version="1.3.0"; sha256="0ivybdcrymlsfv6pg6p5bv70qdvgxf2vgp0kf4r0pf2fcvav1mcp"; depends=[ggplot2 plyr rmarkdown]; }; statcomp = derive2 { name="statcomp"; version="0.1.0"; sha256="0793k14rxiwq98zlrbsmbbkjn5z2ny5c90pia7cx3s77a3wdc96l"; depends=[Matrix zoo]; }; statebins = derive2 { name="statebins"; version="1.2.2"; sha256="0qfs796dk5x983qah32w3npv9mxzljp3g7kffdd0ansn3z7i1zbb"; depends=[ggplot2 gridExtra RColorBrewer scales]; }; states = derive2 { name="states"; version="0.2.2"; sha256="1lw1gljmkn8i8fd4ng5c3jpqrwr0gkiyazppy19dp8xl94m1xa4b"; depends=[dplyr]; }; - statgenGWAS = derive2 { name="statgenGWAS"; version="1.0.2"; sha256="04j3f6604psxr7b5fsb8hq6rzqxqydpizhhz2g014apwjzjfd1vc"; depends=[data_table ggplot2 Rcpp RcppArmadillo sommer]; }; - statgenSTA = derive2 { name="statgenSTA"; version="1.0.2"; sha256="0dm80xx7rqnxnql5x76601i0yy57flfp7ayzm3ia2mwl8h00x02m"; depends=[emmeans ggplot2 ggrepel gridExtra knitr lme4 mapproj maps qtl reshape2 scales SpATS xtable]; }; + statgenGWAS = derive2 { name="statgenGWAS"; version="1.0.4"; sha256="0hmxjm6phgysdkv467nbdmkxfnz55ilaii4hmslsn5p6dl37mqp3"; depends=[data_table ggplot2 Rcpp RcppArmadillo sommer]; }; + statgenSTA = derive2 { name="statgenSTA"; version="1.0.4"; sha256="0iry8gad5kvayvrrnfnhz5gz941wf4v23psqdaxy4ciha468nhlx"; depends=[emmeans ggplot2 ggrepel gridExtra knitr lme4 mapproj maps qtl scales SpATS xtable]; }; stationaRy = derive2 { name="stationaRy"; version="0.5.1"; sha256="1620fdlybn3hr96yngnp802imr9b7n90835lyyd86r2wn6psdzvl"; depends=[downloader dplyr lubridate lutz magrittr progress readr stringr tidyr]; }; stationery = derive2 { name="stationery"; version="0.98.24"; sha256="06qn3ck2cgcyrx8l27ka1y5dq8hyf01wq3hky6876a5g65b1wax2"; depends=[knitr kutils rmarkdown]; }; statip = derive2 { name="statip"; version="0.2.3"; sha256="0kymc3ds1nx0h11ffmm3vmqr1w34gd0k788vf72x2v45h8c1ma2n"; depends=[clue rpart]; }; - statmod = derive2 { name="statmod"; version="1.4.33"; sha256="1fbi5m4c0lingm2vvi0g6jf8f2mg1h01xwyz5rnymrq7gs0ibiks"; depends=[]; }; + statmod = derive2 { name="statmod"; version="1.4.34"; sha256="0yklg64aw5y8kfq5piafnrj1v3jv563iwzzl75g3kllrw23c508s"; depends=[]; }; statnet = derive2 { name="statnet"; version="2019.6"; sha256="17dj6vjnjyqrfhzjq1lys5b29j942kd15zffb69jidni3slf20q9"; depends=[ergm ergm_count network networkDynamic sna statnet_common tergm tsna]; }; statnet_common = derive2 { name="statnet.common"; version="4.3.0"; sha256="0ng90i0wm9wlyhjbnmnylc1bbqw396p1dr7f402dyry9x9ck6jl3"; depends=[coda]; }; statnetWeb = derive2 { name="statnetWeb"; version="0.5.5"; sha256="1v2zgbfl975gqhkhxvgdfhgbw7yf9y3p6kqqxldr9zskhmrn7p1x"; depends=[ergm lattice latticeExtra network RColorBrewer shiny sna]; }; + statnipokladna = derive2 { name="statnipokladna"; version="0.5.6"; sha256="1i5n0am5571b3q1x9rnf87shj9zjc829707wf7gxihfnlmzvrssd"; depends=[curl dplyr httr jsonlite lifecycle lubridate magrittr purrr readr rlang stringi stringr tibble tidyr usethis xml2]; }; statprograms = derive2 { name="statprograms"; version="0.2.0"; sha256="0m7px7fmpz2zzlfdi7rbllcjvcjp8iy94f6fa1w4xinh7vz3y6vq"; depends=[]; }; statquotes = derive2 { name="statquotes"; version="0.2.2"; sha256="1xzc3ndddjrlyld0p4zcwwxkj7i3m3adj7c78x9l4lhlw9mxbbqg"; depends=[stringr tidytext wordcloud]; }; - stats19 = derive2 { name="stats19"; version="1.1.0"; sha256="163v39dvy0gahw2ra0pvri21k02iv9waqb8pv6j55nicvpvha7jm"; depends=[readr sf]; }; - statsExpressions = derive2 { name="statsExpressions"; version="0.2.1"; sha256="009hal1944mnpcc4k1p36p66v04dfzxk75ap119mpp1akdf2s14g"; depends=[BayesFactor boot broomExtra crayon dplyr ez groupedstats metaBMA metafor metaplus psych purrr rcompanion rlang tibble tidyr WRS2 zeallot]; }; + stats19 = derive2 { name="stats19"; version="1.2.0"; sha256="0956s8z8qrkij52fq15ydl15zi3kg5czcx7kjcg20nmby5dqmd34"; depends=[readr sf]; }; + statsExpressions = derive2 { name="statsExpressions"; version="0.3.1"; sha256="0wjqz9ybg95i95hxvasq8igdw8faqlj3pgcvg8n368v165x529kl"; depends=[BayesFactor boot broomExtra dplyr ez ipmisc metaBMA metafor metaplus psych purrr rcompanion rlang sjstats tibble tidyr WRS2]; }; statsguRu = derive2 { name="statsguRu"; version="0.1.0"; sha256="0pqz0la86mk6zp65zzbfwhxyrqqx040p8mrm2j9wqb53r8fbnmqc"; depends=[devtools htmltab plotrix]; }; statsr = derive2 { name="statsr"; version="0.1-0"; sha256="1z0wfj1jxz02x7vl6sr651v85k88wg8rx0k2kkrwzc4ynim8shms"; depends=[BayesFactor broom cubature dplyr ggplot2 gridExtra knitr rmarkdown shiny tidyr]; }; stcos = derive2 { name="stcos"; version="0.2.1"; sha256="1vjz7x9jign82h5kwqcy4jxqjdnhrsgf00dj5m51f6hvvzh3wv5s"; depends=[dplyr Matrix R6 Rcpp RcppArmadillo sf]; }; stcov = derive2 { name="stcov"; version="0.1.0"; sha256="166w929sgd7nanw1zjhzwv50hd5vqhgsrgxnsga4dzrcvndalw70"; depends=[]; }; - stdReg = derive2 { name="stdReg"; version="3.3.0"; sha256="0m907dcgqprnasq17z3wyx7fampsqhwjvg2r0nji5bg9gzag4253"; depends=[data_table drgee numDeriv survival]; }; + stdReg = derive2 { name="stdReg"; version="3.4.0"; sha256="003lp8yshjdql475hdpickwr0fngzn9qps1dzvx8zfy4x51xy8xl"; depends=[data_table drgee numDeriv survival]; }; stddiff = derive2 { name="stddiff"; version="3.0"; sha256="1z6rdchf46aaq0z9bp4dlc4h3swrgyjfdvg40f4lkyg5sgs4sliy"; 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]; }; @@ -14055,15 +14216,14 @@ in with self; { stepPlr = derive2 { name="stepPlr"; version="0.93"; sha256="1i54nyz8z5vq3mzfh6h2vd1q0hsdazc4mhrj9ad0zdvn0qnz61lv"; depends=[]; }; stepR = derive2 { name="stepR"; version="2.0-4"; sha256="1jv2mv1glzap7nsyxwzil9wif3q3p4y9q0c3kphz49hwwrg20k79"; depends=[digest R_cache Rcpp]; }; stepp = derive2 { name="stepp"; version="3.2.0.0"; sha256="0fnjqbncadscv6ryvqyqf8qqgpfzh2hka5ld2zvw39mjqzy5gadi"; depends=[car survival]; }; - steps = derive2 { name="steps"; version="1.0.0"; sha256="03f43fbm7k1i3cgyxzfscjxykjnbyy3d9zyc6kqisghlxgkshnkk"; depends=[future future_apply memuse raster rasterVis Rcpp viridisLite]; }; - stepwise = derive2 { name="stepwise"; version="0.3"; sha256="1lbx1bxwkf9dw6q46w40pp7h5nkxgghmx8rkpaymm6iybc7gyir2"; depends=[]; }; + steps = derive2 { name="steps"; version="1.1.0"; sha256="1p01cmvh5rbgwaz0r73iry60jq0f8rp3z8ql57vhmnd9kyrzf53m"; depends=[future future_apply memuse raster rasterVis Rcpp viridisLite]; }; stevedore = derive2 { name="stevedore"; version="0.9.3"; sha256="00zs2bl5h40rwbhnynjw2jbxlixjnk14rxn9chypqg5zgx9pqg2s"; depends=[crayon curl jsonlite yaml]; }; - stheoreme = derive2 { name="stheoreme"; version="1.2"; sha256="14w3jcbs8y8cz44xlq8yybr2jwgk3w7s2msgjhlp1vazy8959s65"; depends=[]; }; - sticky = derive2 { name="sticky"; version="0.5.2"; sha256="0yib9llvlxyzcwam3qd3wxz91mdacvh4v888ifxwjhhjihffqvbj"; depends=[]; }; + sticky = derive2 { name="sticky"; version="0.5.6.1"; sha256="1szfpay9cpdwq6v5fmnjyr00r4zhz6zd2rrl3h88v9l5xpfafi4w"; depends=[]; }; stilt = derive2 { name="stilt"; version="1.3.0"; sha256="0b1bs849hw2wcvaldybxk8h8wgwl6p7x4i7winncvngmhplgrvx4"; depends=[fields]; }; stima = derive2 { name="stima"; version="1.2.1"; sha256="091pjjr2pvd93l01szyj5gr9ixv1h90yd18h678nhpn0fncimszv"; depends=[rpart]; }; stinepack = derive2 { name="stinepack"; version="1.4"; sha256="0crl77gr4x2bz2zp0a0lqiw5iqlrcx7vj67igkbzg64d1fxai85d"; depends=[]; }; stlcsb = derive2 { name="stlcsb"; version="0.1.2"; sha256="08pnj1yb4xcbhnrp2wny8lq9rvcvmsgaza07k4358csfksvmcira"; depends=[dplyr lubridate purrr readr readxl rlang rvest sf stringr tibble xml2]; }; + stlnpp = derive2 { name="stlnpp"; version="0.3.5"; sha256="0n2qbqlh81ql0pqglalvkf9hl8jdz3nkkh7362w9b4qizk9azkzi"; depends=[spatstat]; }; stlplus = derive2 { name="stlplus"; version="0.5.1"; sha256="14728xsm982z9sg4rbqg307pbwqlsiyzj8z3sr9wr6fi0dayf6z5"; depends=[lattice Rcpp yaImpute]; }; stm = derive2 { name="stm"; version="1.3.5"; sha256="1yyfxaxqc6yq0yq68zhdnhpwpvsyp71dlmivn7zxixfmp932s6cn"; depends=[data_table glmnet lda Matrix matrixStats quadprog quanteda Rcpp RcppArmadillo slam stringr]; }; stmCorrViz = derive2 { name="stmCorrViz"; version="1.3"; sha256="1a4pckrbzsihyf1bqvw3cl0hxrc4yq1pnkgxgf4b8jday6zkxwcv"; depends=[jsonlite SnowballC stm tm]; }; @@ -14073,25 +14233,25 @@ in with self; { stoRy = derive2 { name="stoRy"; version="0.1.3"; sha256="146xs8as5f8ig2xpj9k2san4bllqxddsnlflnhl0sy6132vshyr1"; depends=[data_tree R6]; }; stocc = derive2 { name="stocc"; version="1.30"; sha256="0xpf9101094l5l75p9lr64gwh2b8jh4saw6z6m2nbn197la3acpw"; depends=[coda fields Matrix rARPACK truncnorm]; }; stochQN = derive2 { name="stochQN"; version="0.1.2"; sha256="1zwxw95jrpkqgbgwhwdy907v9gqmvn5as4v35a75wvy3nhawka9a"; depends=[]; }; - stochprofML = derive2 { name="stochprofML"; version="2.0.0"; sha256="1101jshd1k3b1gy6fqdirnc17qa2fgjg48rlf8kc3jklmx4n1hfs"; depends=[MASS numDeriv]; }; + stochprofML = derive2 { name="stochprofML"; version="2.0.1"; sha256="0dcg3akrqxs49jr40kzv1lh598l1hgzrvmsi0zsfjm9466rlp1b0"; depends=[MASS numDeriv]; }; stochvol = derive2 { name="stochvol"; version="2.0.4"; sha256="1hb2fgnyn8zxq1j74x00msq3j807y70yxx2s3fq4csrb1935vr85"; depends=[coda Rcpp RcppArmadillo]; }; - stockR = derive2 { name="stockR"; version="1.0.68"; sha256="0pgyxh19csv21vgji1sjpqaaqb1wwz62mnsf85a97ba9aph9lxwb"; depends=[gtools]; }; + stockR = derive2 { name="stockR"; version="1.0.74"; sha256="002i0bhyskwyjjczfa752ghn19hvqhdyzdfkpvci3hb66rh94x65"; depends=[gtools RColorBrewer]; }; stocks = derive2 { name="stocks"; version="1.1.4"; sha256="0b6rl7pfkgzbpwnv7zzkr36hs5f1zb60d16ijslf7g9m25vvcyg6"; depends=[dvmisc Hmisc lubridate quantmod rbenchmark RColorBrewer Rcpp TTR zoo]; }; stoichcalc = derive2 { name="stoichcalc"; version="1.1-3"; sha256="0z9fnapibfp070jxg27k74fdxpgszl07xiqfj448dkydpg8ydkrb"; depends=[]; }; + stokes = derive2 { name="stokes"; version="1.0-5"; sha256="0xbjkrm9g7r2xnj629i5cfmmqkw60iq4k6lk3skmkj3xh20lcd5x"; depends=[magrittr partitions permutations spray]; }; stopwords = derive2 { name="stopwords"; version="1.0"; sha256="1nmi0bpd0c238g5b8ch1v034m5ng9llhs519cgxdrj3sh9fplwlv"; depends=[ISOcodes]; }; - stormwindmodel = derive2 { name="stormwindmodel"; version="0.1.2"; sha256="08f16a68kmw0r1acs82sha83m04d81b7zdpxjw5g424zbvagwdj4"; depends=[dplyr ggplot2 lubridate maps plyr rlang stringr tidyr weathermetrics]; }; + stormwindmodel = derive2 { name="stormwindmodel"; version="0.1.3"; sha256="0bh2avblcai49kz8v2i1awqvmzd8gpmla342xdb0siwfpd0caid3"; depends=[dplyr ggplot2 lubridate maps plyr rlang 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.5.0"; sha256="16jyk9n9gvhrqrm6s1m4m3m5jpkdy0wxamfqcbjw91gkjg07caxd"; depends=[curl dplyr geosphere httr igraph jsonlite lwgeom magrittr maptools nabor raster Rcpp RcppArmadillo rgeos rlang sf sp stringr]; }; + stplanr = derive2 { name="stplanr"; version="0.5.2"; sha256="10cwfkln0xzwxllry9kmsmiq92agdkh7cfvpzbs3zgkm5ilvr1az"; depends=[curl dplyr geosphere httr igraph jsonlite lwgeom magrittr maptools nabor raster Rcpp RcppArmadillo rgeos rlang sf sp stringr]; }; stpm = derive2 { name="stpm"; version="1.7.7"; sha256="1l40zb9qwshg7saqmgi7c49a3jd93ycrbvmysgzs0q8pl94vgcfs"; depends=[knitcitations MASS nloptr Rcpp RcppArmadillo sas7bdat survival]; }; - 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]; }; + stpp = derive2 { name="stpp"; version="2.0-4"; sha256="0y6k33qaqycw01288w36q82iq73nlsc2vkkaiamr3v312ja6gbxg"; depends=[ggplot2 gridExtra KernSmooth plot3D rgl rpanel spatstat splancs]; }; strap = derive2 { name="strap"; version="1.4"; sha256="0gdvx02w0dv1cq9bb2yvap00lsssklfnqw0mwsgblcy2j6fln7b0"; depends=[ape geoscale]; }; strapgod = derive2 { name="strapgod"; version="0.0.4"; sha256="19v4g2wny21lb76crais5wxqkgq4hjh7gn961pr2w10kf4ll1vvx"; depends=[dplyr lifecycle 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]; }; - stratamatch = derive2 { name="stratamatch"; version="0.1.3"; sha256="0mhdxaf2r5aziv9ws01qc15wwwwjjcq7zmlswar9h809vzgpavyi"; depends=[dplyr Hmisc magrittr rlang survival]; }; + strataG = derive2 { name="strataG"; version="2.4.905"; sha256="0mxhrnqqdgwmv2lqs2sgwa95lq5v4dl6vdqyasknbbfd8vddf393"; depends=[adegenet ape apex copula data_table dplyr DT genepop ggplot2 gridExtra Hmisc magrittr pegas phangorn purrr RColorBrewer Rcpp readr rlang rmetasim stringi swfscMisc tibble tidyr]; }; + stratamatch = derive2 { name="stratamatch"; version="0.1.4"; sha256="0dnwlxz3cw66ww4j7fws6qx1na3ngvkw76bv5igra3lxnzkg217q"; depends=[dplyr Hmisc magrittr rlang survival]; }; stratbr = derive2 { name="stratbr"; version="1.2"; sha256="15vkymmc61yz9szhfhc5663hfyqvh499ahwhr9mv1lhv5bikk0kb"; depends=[Rglpk snowfall stratification]; }; strategicplayers = derive2 { name="strategicplayers"; version="1.0"; sha256="19vijrlzawd701vvk9ig7yhzbirh39dxxcwfz8ywwvxxiaky5x55"; depends=[sna]; }; stratification = derive2 { name="stratification"; version="2.2-6"; sha256="1jlks3g8wpqlpci6v0ryyv93agiabdiklmk6ij0pc5icrfiynbhw"; depends=[]; }; @@ -14100,32 +14260,31 @@ in with self; { straweib = derive2 { name="straweib"; version="1.1"; sha256="0hi59p580yg6rj72grq4jx6grv7lmpi2cimp0rbxhkjpj6i1hav9"; depends=[]; }; stray = derive2 { name="stray"; version="0.1.0"; sha256="1pqixk21z1h76672vx5yx9xs6bfacm51fcsgw3911al09zsid6aw"; depends=[colorspace FNN ggplot2 ks pcaPP]; }; stream = derive2 { name="stream"; version="1.3-1"; sha256="09f26m0fajaw77mb6pk9qkinzkhxpghagd1qhc3nkvcki3vwlcxa"; depends=[BH clue cluster clusterGeneration dbscan fpc MASS mlbench proxy Rcpp]; }; - streamDepletr = derive2 { name="streamDepletr"; version="0.1.0"; sha256="0a8cihwjr5bzw5dw07x2kisi4qycwmxpj5hhv9b4pjvfghdwq4b8"; depends=[dplyr magrittr Rmpfr]; }; + streamDepletr = derive2 { name="streamDepletr"; version="0.1.1"; sha256="0x7663xz9az8lq852923hr7chaif1iml8drb6ljg83rg55plmwir"; depends=[dplyr magrittr Rmpfr sp]; }; streamMOA = derive2 { name="streamMOA"; version="1.2-2"; sha256="1zm7bcdsyazqksizir5rqibgw6w1bz85gdga0ncirh2s1z0dhi79"; depends=[rJava stream]; }; streamR = derive2 { name="streamR"; version="0.4.5"; sha256="1clx3b0j2515r1nmnl6ki7qw5n54q3x2jvqv3zrc00kq71mlj7ix"; depends=[ndjson RCurl rjson]; }; streambugs = derive2 { name="streambugs"; version="1.1"; sha256="1r0fnvpmj2z34j3w2nbdvxlw9jnz8y3x1xx9ih3vxna50ldrg2z2"; depends=[deSolve]; }; stressr = derive2 { name="stressr"; version="1.0.0"; sha256="00b93gfh1jd5r7i3dhsfqjidrczf693kyqlsa1krdndg8f0jkyj7"; depends=[lattice latticeExtra XML xts]; }; strex = derive2 { name="strex"; version="1.2.0"; sha256="1vshbq83szgig93ljhnwqwdsdskayszdzwk85n1n650clriv0b85"; depends=[checkmate glue magrittr matrixStats ore processx Rcpp rlang stringi stringr tibble]; }; strider = derive2 { name="strider"; version="1.2"; sha256="0kfwanz80ki41yr5m0xw4nbbqgzl6zfvwqx906bxywlqiqi47cb6"; depends=[BH Rcpp]; }; - stringb = derive2 { name="stringb"; version="0.1.13"; sha256="004bp75yhrgr480v9774kfq7z5l9z0761cnrwj4yk7fxygk89a1x"; depends=[backports]; }; + stringb = derive2 { name="stringb"; version="0.1.14"; sha256="0hhqqsc3fif14dy623h6y3gxjg8lhff9wlglkygccs5iyhdjyl12"; depends=[backports]; }; stringdist = derive2 { name="stringdist"; version="0.9.5.5"; sha256="1dqfakclzaf878x7mhwmqrcpcql2h9cv19fz5f3ygpajf3si5kqi"; depends=[]; }; stringformattr = derive2 { name="stringformattr"; version="0.1.2"; sha256="0x56k30clj5ajk0qg5sr8b9l0asz6ldivwr1ddy1vp1djliih1fx"; depends=[stringr]; }; - stringi = derive2 { name="stringi"; version="1.4.5"; sha256="0gdmdf4i3ik8rcs7af1vlsfnilcmw3z28jx4278rpq2asigps89k"; depends=[]; }; + stringi = derive2 { name="stringi"; version="1.4.6"; sha256="1mkgxzf000zdgbbbvg2vf4md4l501n5lfksffq8vdg6pbgd6fgv3"; depends=[]; }; stringr = derive2 { name="stringr"; version="1.4.0"; sha256="1p9ip7p87gbbg4s6d3d392svvzz2b5dqdq2c8ilgvn4s78nlsq47"; depends=[glue magrittr stringi]; }; strip = derive2 { name="strip"; version="1.0.0"; sha256="1j3kq6w8k66z45rpd1cgxplpnldzbyqklgs4bnbv906pyd8wk9ak"; depends=[rlist]; }; stripless = derive2 { name="stripless"; version="1.0-3"; sha256="08mdp7kq6r5bk77j09477d1dnn7iwa346pr24b5bqsxwnbknyrsr"; depends=[lattice]; }; striprtf = derive2 { name="striprtf"; version="0.5.2"; sha256="1ra6aalalig6drsj26z9s24lmb10zssagqrvgqqi4358zbm8gwcd"; depends=[magrittr Rcpp stringr]; }; strucchange = derive2 { name="strucchange"; version="1.5-2"; sha256="1y022363a4pp0mnji91sjh1qiyspkh09sybqwj03r9pmwrd7q93x"; depends=[sandwich zoo]; }; - structSSI = derive2 { name="structSSI"; version="1.1.1"; sha256="06rwmrgqc4qy4x0bhlshjdsjxfmp5fr9d1wjglhlb1gbp72fmkdv"; depends=[ggplot2 igraph multtest reshape2 rjson]; }; structree = derive2 { name="structree"; version="1.1.6"; sha256="0d3ww07grprp908i3h1xaz3jw92g0g0s3gjdnb63wl10yqqsq2vj"; 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.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.8.0"; sha256="1hcb1jybra0cpibxc1k31nr6xciwd2chxjfdnir4kfzxn2bd2cxd"; depends=[]; }; stubthat = derive2 { name="stubthat"; version="1.2.1"; sha256="130naxzvswcyadwcgldvwnxxdxbfwx5vljac7901vn3ahjp75d8z"; depends=[testthat]; }; studentlife = derive2 { name="studentlife"; version="1.0.0"; sha256="1snrsaapjwvcifa91hg5xcbg7n70aqcdyyq69gg20168qg8abkws"; depends=[crayon dplyr ggplot2 jsonlite purrr R_utils readr skimr tibble tidyr visdat]; }; - styler = derive2 { name="styler"; version="1.2.0"; sha256="0rdbz60x8bymis6r6188ia1y0ip3nhf5y363i4cmakr618irjab9"; depends=[backports cli magrittr purrr rematch2 rlang rprojroot tibble withr xfun]; }; + studyStrap = derive2 { name="studyStrap"; version="1.0.0"; sha256="0lvzqnq40j0xn74qrj0pqhr8zz34mbhfd7dg8bnadscsvj5ffm4c"; depends=[caret CCA dplyr MatrixCorrelation nnls pls tibble tidyverse]; }; + styler = derive2 { name="styler"; version="1.3.2"; sha256="1waglhsy2c53qjgd2qhlzda3z0lbzbwx9fkrfhac41y6h91mgkrz"; depends=[backports cli magrittr purrr R_cache rematch2 rlang rprojroot tibble withr xfun]; }; stylest = derive2 { name="stylest"; version="0.1.0"; sha256="0dr7j9fh8kp6wsqql38s3rk596xl6m9nx0w1l5v25hv2bphidxzr"; depends=[corpus Matrix]; }; stylo = derive2 { name="stylo"; version="0.7.1"; sha256="0l7z4d8q4kp9m0di0hch2zpbxmf7im4h0n95mrylqw93w768z76s"; depends=[ape class e1071 lattice pamr tcltk2 tsne]; }; suRtex = derive2 { name="suRtex"; version="0.9"; sha256="0xcy3x1079v10bn3n3y6lxignb9n3h57w4hhrvzi5y14x05jjyda"; depends=[]; }; @@ -14133,29 +14292,27 @@ in with self; { subdetect = derive2 { name="subdetect"; version="1.1"; sha256="1bcc13avs5w9vmwyf71cnjd2kwmcavmzpwyv8gvsn61n7b4j8wlk"; depends=[]; }; subformula = derive2 { name="subformula"; version="0.1.0"; sha256="0nsl0nzj79z6aib12b5qijyab0yxlljfssiq9p8xgcgbxy4a7syy"; depends=[]; }; subgroup = derive2 { name="subgroup"; version="1.1"; sha256="1n3qw7vih1rngmp4fwjbs050ngby840frj28i8x7d7aa52ha2syf"; depends=[]; }; - subgroup_discovery = derive2 { name="subgroup.discovery"; version="0.2.1"; sha256="15yvkymcig19y9h8362izap0qbv1igmd0s0yxdgv0n0l1xgfsywj"; depends=[]; }; subgxe = derive2 { name="subgxe"; version="0.9.0"; sha256="0faww87ncylqixb640hc2axvn4i50d2r2ggngmd7s9wazbb6sd55"; depends=[]; }; sublime = derive2 { name="sublime"; version="1.3"; sha256="0455fppc68azxknxjvxci4kjpcj6c1jkp9adbxqrn3qnnywaj5v2"; depends=[AnalyzeFMRI downloader oro_nifti]; }; submax = derive2 { name="submax"; version="1.1.1"; sha256="0b9x55gqzw20smr3hx9izvyr0i8zv0h03hadn4c7ks7w8ga5i0kj"; depends=[mvtnorm sensitivityfull]; }; - subniche = derive2 { name="subniche"; version="0.9.7"; sha256="1jsdcaf6d38j7c0ppjyilj0jd2dbpdldw6w4prmsbmx8mh7lplww"; depends=[ade4]; }; - subplex = derive2 { name="subplex"; version="1.5-4"; sha256="10cbgbx1bgsax5z7gz6716g360xpq4mvq19cf4qqrxv02mmwz57z"; depends=[]; }; - subprocess = derive2 { name="subprocess"; version="0.8.3"; sha256="00720hj685449vhjqm9q6rrsn5jyxnxwq3pgxpbsnrhmwa697w89"; depends=[]; }; + subniche = derive2 { name="subniche"; version="1.2"; sha256="1qmryjgwgz43zym7f7p1bw0l8sxqivhksiv8a03r3y51d766gmkn"; depends=[ade4 polyclip siar wordcloud]; }; + subplex = derive2 { name="subplex"; version="1.6"; sha256="1yfbfjvpbhgky7vihw3f4jl41pxpqb39z4nc045d5z7z48bdl18d"; depends=[]; }; subrank = derive2 { name="subrank"; version="0.9.9.1"; sha256="19lgw7248jq6b34i17c7vw208wsvmppni7njswd02i9xdgyjn95z"; depends=[]; }; subsamp = derive2 { name="subsamp"; version="0.1.0"; sha256="1bfz2z2qy1war3id8qr1asygwvwxgf2hhlh075hr6bjdkxz0j0nd"; depends=[]; }; subscore = derive2 { name="subscore"; version="3.1"; sha256="1hb4ci62hxffz09sz0i27jfw7xn0pca87kiq6damz5zi418csa4v"; depends=[boot cocor CTT irtoys ltm sirt]; }; subscreen = derive2 { name="subscreen"; version="2.0.1"; sha256="0w1y60fzwf59ykcmk6yvdi4awqm8azpm0b288rjx1p0vzwl3i8hj"; depends=[bsplus colourpicker data_table dplyr DT jsonlite plyr randomForestSRC shiny shinyjs V8]; }; - subselect = derive2 { name="subselect"; version="0.14"; sha256="03sfnpj219a0ma92c2z953bh2y6s7w2c84lf2shnghmmxmg7jq9l"; depends=[corpcor ISwR MASS]; }; + subselect = derive2 { name="subselect"; version="0.15.2"; sha256="0ggpm5bq4ncx4302855s8x1nj0afjizmi81cg6b7xc7rvpirw0fq"; depends=[corpcor ISwR MASS]; }; subspace = derive2 { name="subspace"; version="1.0.4"; sha256="0p2j0lnwj3ym1v4xla6r97zjikb8alnibdc690xn9c0z21hmv43v"; depends=[colorspace ggvis rJava stringr]; }; subtee = derive2 { name="subtee"; version="0.3-5"; sha256="14pvfghsd17n9qkznik4vdalqfv5ykgqrhk2g33idl8chi9q7jjn"; depends=[ggplot2 MASS matrixStats survival]; }; subtype = derive2 { name="subtype"; version="1.0"; sha256="1094q46j0njkkqv09slliclp3jf8hkg4147hmisggy433xwd19xh"; depends=[penalized ROCR]; }; - suddengains = derive2 { name="suddengains"; version="0.4.0"; sha256="1606lj9x4qlkg5sm7i7xgp8bd2ivzngz0phc7bs06akwd7xbbnra"; depends=[dplyr ggplot2 ggrepel magrittr psych readr rlang stringr tibble tidyr]; }; + suddengains = derive2 { name="suddengains"; version="0.4.3"; sha256="1y6lan63q8jyyy37s4nq5kzrah63ycbwd1id7f6rb4rizb1sg0vn"; depends=[dplyr ggplot2 ggrepel magrittr psych readr rlang stringr tibble tidyr]; }; sudoku = derive2 { name="sudoku"; version="2.6"; sha256="13j7m06m38s654wn75kbbrin5nqda4faiawlsharxgrljcibcbrk"; depends=[]; }; sudokuAlt = derive2 { name="sudokuAlt"; version="0.2-1"; sha256="1y3li64xqag2ia8dg7q49jmlb1awl92rz6xa9zsbf0s9jman9wj9"; depends=[magrittr]; }; sugarbag = derive2 { name="sugarbag"; version="0.1.2"; sha256="0aikbcdnwvrwvhcchjic9x1r4xh00z8hzq7dc93ykg4wlggs5rx7"; depends=[dplyr geosphere lwgeom purrr rlang rmapshaper sf tibble tidyr]; }; - sugrrants = derive2 { name="sugrrants"; version="0.2.4"; sha256="04qfa3falpkbdnjks5vd0izjpp5pmc3wf4bkv0ha89ya556306jv"; depends=[dplyr ggplot2 gtable lubridate rlang]; }; + sugrrants = derive2 { name="sugrrants"; version="0.2.6"; sha256="125v8g36215hyil7vavdz27ng6709nh45m3zp9wwdqb6m4g36smy"; 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.4"; sha256="1n695baz56mg4f13xjjadfq0xalw5xsn6xicil0yap5hgi8fsr3a"; depends=[checkmate dplyr htmltools lubridate magick matrixStats pander pryr rapportools RCurl tibble tidyr]; }; + summariser = derive2 { name="summariser"; version="2.3.0"; sha256="0zliqy8dlcr2yy4ky8k68qn256xvpla8fcv7via19y40bmla37ic"; depends=[dplyr]; }; + summarytools = derive2 { name="summarytools"; version="0.9.6"; sha256="03pcb2ild1rb9f15yq8b68p9bg10z5wk2x7ahgyzkwdh5f81vbq2"; depends=[base64enc checkmate dplyr htmltools lubridate magick matrixStats pander pryr rapportools tibble tidyr]; }; sunburstR = derive2 { name="sunburstR"; version="2.1.3"; sha256="1zxy1zyi8sp26vicxjh7jx167qwnmvj1h6hpyj6398cbzcx7dvy7"; depends=[d3r dplyr htmltools htmlwidgets]; }; suncalc = derive2 { name="suncalc"; version="0.5.0"; sha256="1chkl297km313m89h9mbp7vnpz188fhzz5dn8x5cjkqy0mm6c0qc"; depends=[data_table lubridate magrittr]; }; sundialr = derive2 { name="sundialr"; version="0.1.3"; sha256="1bpqfxbg187g113nzsgk5pnfw9ldg9v7x52frrw8wjjs8b3c0v8z"; depends=[Rcpp]; }; @@ -14166,21 +14323,18 @@ 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.5.0"; sha256="1h5jpafriw5drkmwyyk42fn33qq9qvc19wmi13mfnpkhc67xmlyp"; depends=[assertthat data_table doParallel Metrics R6]; }; + superml = derive2 { name="superml"; version="0.5.2"; sha256="1852s89yy4nv4aq1wi2ccj1yyvc0xq43ggxgjrr0ynjbvl209b7x"; depends=[assertthat BH data_table doParallel Metrics R6 Rcpp]; }; supernova = derive2 { name="supernova"; version="2.1.1"; sha256="1vjx0mfnqksgvcgn8hfvpx8j3q8791yifdsaqjqkhc7h56r9gcc5"; depends=[magrittr stringr]; }; superpc = derive2 { name="superpc"; version="1.09"; sha256="1p3xlg2n7p57n54g2w4frfrng5vjh97kp6ax4mrgvj3pqmd1m69z"; depends=[survival]; }; supervisedPRIM = derive2 { name="supervisedPRIM"; version="2.0.0"; sha256="1j5gsy119pvrhkkg048lyk6hjvn9x1bhmfy5g824gj3k1w5slrib"; depends=[prim]; }; suppdata = derive2 { name="suppdata"; version="1.1-1"; sha256="1sysd5w59y9hkm1ab8m9i1d976dv6cxchssc86s27bsibhsj2blc"; depends=[httr jsonlite rcrossref xml2]; }; - support = derive2 { name="support"; version="0.1.4"; sha256="1yahhb9l2f3129av4cj4q77q1s0nfszzd6z7dqkfpnjvvk8gzdq7"; depends=[BH MHadaptive randtoolbox Rcpp RcppArmadillo]; }; - support_BWS = derive2 { name="support.BWS"; version="0.3-0"; sha256="1mylc1jys8j56qciscy8ra4dv0ig0swh2gyf3wv5q00v85n1wf92"; depends=[]; }; + support_BWS = derive2 { name="support.BWS"; version="0.4-0"; sha256="09dd8nxfb0snsvq30z494i9pdkfl2vbhajlsxiib57h5jr0rc0ng"; depends=[]; }; support_BWS2 = derive2 { name="support.BWS2"; version="0.3-0"; sha256="0k9yvg0n4lzsq43r53r9f70hq1q3zfljjafj9ds2p3c6qzgs9chi"; depends=[]; }; support_BWS3 = derive2 { name="support.BWS3"; version="0.2-0"; sha256="012kcvscz7m2is92r71731zc7xnp7pwyx30vivwjazrigp9bq1kl"; depends=[]; }; support_CEs = derive2 { name="support.CEs"; version="0.4-1"; sha256="1rbyl7v6m07dsp08kkk9020bh39rhx89q7d05rc5kxb6f7y66jyz"; depends=[DoE_base MASS RCurl simex XML]; }; supportInt = derive2 { name="supportInt"; version="1.1"; sha256="14fh75sds05c06xkcfbijd8my3sa9kpnczzh96xx0gwj1193yya9"; depends=[ProfileLikelihood]; }; sur = derive2 { name="sur"; version="1.0.2"; sha256="13mkn153x9sgkmj2vchma5qz1zggxw5vf28v8sfbg0n77f4wjc1p"; depends=[learnr]; }; sure = derive2 { name="sure"; version="0.2.0"; sha256="0gwr2j321i2vq98rin5b1m4sl123dm1nih1ghcmj0zd1wd6x5x54"; depends=[ggplot2 goftest gridExtra]; }; - surface = derive2 { name="surface"; version="0.4-1"; sha256="0z7fh09hjmxfmqzi588gjwqqlpj1a475aixrnvy911lkx3zfk146"; depends=[ape geiger MASS ouch]; }; - suropt = derive2 { name="suropt"; version="0.1.1"; sha256="0fm3vq3d0r4ahjgdmxm06yyakngssryzvdd1w0my34m0nvk6cbq4"; depends=[DiceKriging DiceOptim dplyr emoa GenSA ggplot2 GPareto lhs mco pso purrr rgenoud tibble tidyr]; }; surrosurv = derive2 { name="surrosurv"; version="1.1.25"; sha256="05s1skjp1vzwai2nfw65ff4q2qhbj596lhfvzd1gdrbs39r90hxh"; depends=[copula eha lme4 MASS Matrix msm mvmeta optextras optimx parfm SurvCorr survival]; }; surrosurvROC = derive2 { name="surrosurvROC"; version="0.1.0"; sha256="1dpqr9dqzckgvdfrb2ndxazra0lbp6db9wbjch4vig3kyz6nyw4y"; depends=[survival]; }; surv2sampleComp = derive2 { name="surv2sampleComp"; version="1.0-5"; sha256="0pk70q33il9clz0ikzx1cypg5ygnsqp5hgk67xczzbidksjzs4dn"; depends=[flexsurv plotrix survival]; }; @@ -14188,6 +14342,7 @@ in with self; { survAWKMT2 = derive2 { name="survAWKMT2"; version="1.0.0"; sha256="1cv39rf1ia4nwrri9d9izy6lxndnfwqy2vzrb9rrxga2qplxl79k"; depends=[survival]; }; survBootOutliers = derive2 { name="survBootOutliers"; version="1.0"; sha256="1gfh2n1kd1m4bpd1j7islm5ar1qmzycnmfpb8zl8ghv0z5rf5f09"; depends=[survival]; }; survC1 = derive2 { name="survC1"; version="1.0-2"; sha256="1bidjhq3k5ab7gqj1b2afngip7pp6c9c7q0m6ww7h7i2vg505l7v"; depends=[survival]; }; + survCurve = derive2 { name="survCurve"; version="1.0"; sha256="0zspyxzn99ljiqp1111202714rqs4vg6j2rv66qv8ilxajvdxxas"; depends=[survival]; }; survELtest = derive2 { name="survELtest"; version="2.0.1"; sha256="03jnj88z45iw9v1628bz99608q2jwbqw6cfsvqal2jj4392fz428"; depends=[Iso nloptr plyr survival]; }; survHE = derive2 { name="survHE"; version="1.0.65"; sha256="0phhcn3gm5l2q8q4j7v8x7bsbk5a8ivqjvyxh45vgh5lrg6zpqg1"; depends=[BH flexsurv Rcpp RcppEigen rms rstan StanHeaders xlsx]; }; survIDINRI = derive2 { name="survIDINRI"; version="1.1-1"; sha256="03lsypx189zm28gv764gdq24a18jj3kpdk91ssa501qxj5jv7v29"; depends=[survC1 survival]; }; @@ -14195,23 +14350,22 @@ in with self; { survJamda_data = derive2 { name="survJamda.data"; version="1.0.2"; sha256="0a010v2ar48i5m0jiqjvdyqm93ckfgfmcmym9a02h0rclnizd75r"; depends=[]; }; survMisc = derive2 { name="survMisc"; version="0.5.5"; sha256="00nvvl8gz4477ab24rd0xvfksm8msv8h021b9ld5c9cizc41n2bm"; depends=[data_table ggplot2 gridExtra km_ci KMsurv knitr survival xtable zoo]; }; survParamSim = derive2 { name="survParamSim"; version="0.1.0"; sha256="11rp49wrqw9z4cy2iwm0gn92hi88a0n3jy34b29yj5f9waz0andf"; depends=[dplyr forcats ggplot2 magrittr mvtnorm purrr rlang survival tibble tidyr]; }; - survPen = derive2 { name="survPen"; version="1.2.0"; sha256="0x030p6ihw769mjwjxzprmv3nbza0564mh1zfymwn8s94v86ybkl"; depends=[statmod]; }; + survPen = derive2 { name="survPen"; version="1.3.0"; sha256="1yvsns9md9g94932q79y0icwd5xvnjx4a5fs01vxi5mfqm1drsmm"; depends=[Rcpp RcppEigen statmod]; }; survPresmooth = derive2 { name="survPresmooth"; version="1.1-10"; sha256="0m1037v857g140lypck5zq2zf52rkdxzaqlj9kjn7h7lp6gif6ia"; depends=[]; }; survRM2 = derive2 { name="survRM2"; version="1.0-2"; sha256="0pvp65c1kkbkcci4l3cvq4a5krmv58jwb9abz5225ql6jyawzlsw"; depends=[survival]; }; survRM2adapt = derive2 { name="survRM2adapt"; version="1.0-1"; sha256="1r3jvjbc2sb7b00s95b3sdx4d99rmrnd573fx1n4914ydiggi9nn"; depends=[survival]; }; survSNP = derive2 { name="survSNP"; version="0.24"; sha256="0mzwcp8zfqvsiapa446si9qb6wyymnw5zj6acj6f2cfjpyi76k4w"; depends=[foreach lattice Rcpp survival xtable]; }; - surveillance = derive2 { name="surveillance"; version="1.17.3"; sha256="11hzjr85vpmrv11n3prhj9jgjfwvz1fg8xbfz9ql0rrrmycq4jii"; depends=[MASS Matrix nlme polyCub Rcpp sp spatstat xtable]; }; + surveillance = derive2 { name="surveillance"; version="1.18.0"; sha256="01iy6dlkd5w9191vr3agm3fgl3vbh2yaan5rsgn0ki741gf2zdag"; depends=[MASS Matrix nlme polyCub Rcpp sp spatstat xtable]; }; survexp_fr = derive2 { name="survexp.fr"; version="1.0"; sha256="12rjpnih0xld4dg5gl7gwxdxmrdmyzsymm7j05v98ynldd1jkjl8"; depends=[survival]; }; - survey = derive2 { name="survey"; version="3.37"; sha256="1f31dvh48gzzan13pdrwh84ls35x9116095i7mdrcbrhz809r8dy"; depends=[lattice Matrix minqa mitools numDeriv survival]; }; + survey = derive2 { name="survey"; version="4.0"; sha256="1q9x0s86s72gl43zj49gypg6jj2b78xjvxr4lmy5147s9h7z8lxh"; depends=[lattice Matrix minqa mitools numDeriv survival]; }; surveybootstrap = derive2 { name="surveybootstrap"; version="0.0.1"; sha256="13rp6gj1dgdzcjbi2403pldygp1dyqx8zj0r1nvyghpi06x5gpb7"; depends=[dplyr functional plyr Rcpp RcppArmadillo stringr]; }; - surveydata = derive2 { name="surveydata"; version="0.2.3"; sha256="0krwzfhjkkjxrpj1xzyaj400xdgbvczi86vjwx4r9g8ys90nvm09"; depends=[assertthat dplyr DT ggplot2 magrittr plyr purrr rlang scales stringr tidyr]; }; + surveydata = derive2 { name="surveydata"; version="0.2.4"; sha256="1nhpy40ibl1iirbc6np94mddsws2hn77zfqcaydfzd12i0jqg3gy"; depends=[assertthat dplyr DT ggplot2 magrittr purrr rlang scales tidyr]; }; surveyeditor = derive2 { name="surveyeditor"; version="1.0"; sha256="073219bcn1hlxl9ql6gncfvgn0m37pz5sb7h94nq6lf35dymq5zq"; depends=[]; }; surveyoutliers = derive2 { name="surveyoutliers"; version="0.1"; sha256="03nqw0zir3x57gg23hgsr2s99pv958kfsygqfwly96rvfdhr5p3v"; depends=[]; }; surveyplanning = derive2 { name="surveyplanning"; version="3.0"; sha256="1wnjizd5n5lyp8nw6srplrw7swrrivmbcphdvgaa9q1y8lkpq5w0"; depends=[data_table laeken]; }; - surveysd = derive2 { name="surveysd"; version="1.1.0"; sha256="0ab1f3z86idv3cy9nycqh4nnkcwachlm27pynlrn6g4jmcvcbj9b"; depends=[data_table dplyr ggplot2 laeken matrixStats Rcpp]; }; + surveysd = derive2 { name="surveysd"; version="1.2.0"; sha256="1w4cd52gdl65p16rza50n7pk2xfx3kxd1k16pr67j0pnyl7h2fqk"; 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="3.1-8"; sha256="15fj4y8c107bwq22amx88r5hw7qndlcbr9sapzrpkpr7iqz3kkyf"; depends=[Matrix]; }; + survival = derive2 { name="survival"; version="3.1-11"; sha256="1fbhbm3bnpg1nmj37h1d76x813ggvwk0cp51ixmmgb3pz47i5xj4"; 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=[]; }; @@ -14241,14 +14395,13 @@ in with self; { svd = derive2 { name="svd"; version="0.5"; sha256="18bi42pgml9i8jflfk29ws0bfblkj3f69z9p9mkd0m8kcx4d8hnh"; depends=[]; }; svdvisual = derive2 { name="svdvisual"; version="1.1"; sha256="02mzh2cy4jzb62fd4m1iyq499fzwar99p12pyanbdnmqlx206mc2"; depends=[lattice]; }; svenssonm = derive2 { name="svenssonm"; version="0.1.0"; sha256="0pvay9vfrcafaq270pq6glp2b74zdfgldksl13cwdb0wk7qx7731"; depends=[]; }; - svgPanZoom = derive2 { name="svgPanZoom"; version="0.3.3"; sha256="09gfa2943bvmjpnhnc2nr85wddkv662k30pxsqvvvq1va64rzpkc"; depends=[htmlwidgets]; }; + svgPanZoom = derive2 { name="svgPanZoom"; version="0.3.4"; sha256="1iglgwbyxf5q4716h9ba2cfmxh1qq16zwy54krnawg4580v8ydh2"; depends=[htmlwidgets]; }; svgViewR = derive2 { name="svgViewR"; version="1.4"; sha256="00nm2sdgil2kw6f19sy03m8452zia47bv1bkynxw3q7vck3vb3vx"; depends=[Rcpp rjson Rook]; }; - svglite = derive2 { name="svglite"; version="1.2.2"; sha256="1gwv51wqp6pgm2f9gavsiq65njs77fr49n8y6y9ax60k3a4vvg14"; depends=[BH gdtools Rcpp]; }; - svmadmm = derive2 { name="svmadmm"; version="0.3"; sha256="15ccda1r9cc6v30j37i052rdwxgw0wg37hwyn2vp8c7bkr0ybgkm"; depends=[kernlab]; }; + svglite = derive2 { name="svglite"; version="1.2.3"; sha256="1zivykbi1pxdxhrkc1if1ihdn5p27j0nai2q0abca1dwry3wg2yl"; depends=[BH gdtools Rcpp]; }; svmpath = derive2 { name="svmpath"; version="0.955"; sha256="02j5xs4gg8k16imnwk6aram168cv1dqdrky3bszyc98l7xd0nlrj"; depends=[]; }; svmplus = derive2 { name="svmplus"; version="1.0.1"; sha256="08cfywrbaxyacqd3l75lysb23ahqbs80959iqkjbb125aafmhvni"; depends=[MASS Matrix quadprog]; }; svrpath = derive2 { name="svrpath"; version="0.1.2"; sha256="18h40555jmqpbsnhlwkvc5fl7d0r2bgscdv8amjvhjxmx9y952a2"; depends=[quadprog svmpath]; }; - svs = derive2 { name="svs"; version="1.1.0"; sha256="0575msaxg04ck76mbr815m29y895qvg8b9qg4y0ggv6b1lvwp5p6"; depends=[gtools]; }; + svs = derive2 { name="svs"; version="2.0.0"; sha256="1kcrdgg0pw5ypjgl59wn66c3ipinamcnd4752hjnfrf62pkc6fgw"; depends=[gtools Matrix]; }; svyPVpack = derive2 { name="svyPVpack"; version="0.1-1"; sha256="15k5ziy2ng853jxl66wjr27lzc90l6i5qr08q8xgcs359vn02pmp"; depends=[survey]; }; svydiags = derive2 { name="svydiags"; version="0.3"; sha256="0xgizswdqs8cjac200sqv3ygvrnbcy74h92kgx4r6nv1fhlcljl3"; depends=[MASS Matrix survey]; }; swCRTdesign = derive2 { name="swCRTdesign"; version="3.1"; sha256="18ln02fnxkpjqi8a36wr2qr427hxrghkhfjx0384grmdg1mmkbf5"; depends=[]; }; @@ -14259,23 +14412,22 @@ in with self; { swatches = derive2 { name="swatches"; version="0.5.0"; sha256="1kivscgka8gn44rjj0s5sjan1s04znnyn0nd37a74zaik0hm8zs0"; depends=[colorspace httr pack stringr xml2]; }; swdft = derive2 { name="swdft"; version="1.0.0"; sha256="0529rw8nsl48hwiy741alvrzg5d5q1nhnjshrsfwchm5kdv0igva"; depends=[]; }; sweep = derive2 { name="sweep"; version="0.2.2"; sha256="12mbkkinvv11s96bn61vww79xjivjshhg9m3lmza5y0512zm89k5"; depends=[broom dplyr forecast lazyeval lubridate tibble tidyr timetk]; }; - sweidnumbr = derive2 { name="sweidnumbr"; version="1.4.1"; sha256="014zbp6a66gv7b0f2gmzvifllz266zrc14ihawksvyp1mcxz2ipg"; depends=[lubridate stringr]; }; + sweidnumbr = derive2 { name="sweidnumbr"; version="1.4.2"; sha256="0zzjvwd60w9b5ybsb72aqa42sx6al4ymr591j3zryxgpl6rms5rh"; depends=[checkmate lubridate stringr]; }; swephR = derive2 { name="swephR"; version="0.3.0"; sha256="0fk5wih3i5vpkcc9y1n30xwc1hyqgfgnad9jkdgdx0m31pn1y9j5"; depends=[Rcpp]; }; - swfscMisc = derive2 { name="swfscMisc"; version="1.2"; sha256="08p2crsx8zi6qprs14mhdyq9x5sjlp3a46c1zzvp6741an4fy640"; depends=[ggplot2 mapdata maps reshape2 spatstat]; }; + swfscMisc = derive2 { name="swfscMisc"; version="1.3"; sha256="03wzjricpgf55yfwmj4vjcvz59yxcipfp4bsjddzw65glasa9d1s"; depends=[dplyr ggplot2 ggrepel magrittr mapdata maps reshape2 rlang spatstat tibble tidyr]; }; swgee = derive2 { name="swgee"; version="1.4"; sha256="1a6zr4nkpj52b0rk01qbwzi8y0c798wlxzw69wyyv576k148rgfq"; depends=[gee geepack mvtnorm]; }; swirl = derive2 { name="swirl"; version="2.4.5"; sha256="0cqyn2rnqfkb2wza4zdr1kcms5l0igbq79xh5i7765agdday2z9w"; depends=[digest httr RCurl stringr testthat yaml]; }; swirlify = derive2 { name="swirlify"; version="0.5.3"; sha256="1bpg6yz2adgspjlwsf2q83j1bq0iyvp9938smgc41861nsclngwr"; depends=[base64enc readr rmarkdown shiny shinyAce stringr swirl whisker yaml]; }; swissMrP = derive2 { name="swissMrP"; version="0.62"; sha256="1vy6h6c4v49zlsli77ilj4df8cfh67rqmki71v6j1aqw6kf3b649"; depends=[arm blme lme4 maptools sp]; }; - swissdd = derive2 { name="swissdd"; version="1.0.2"; sha256="13qzkp73djvdd672na1bjj23yldslyg9z840dblsz0qdkp53d4qz"; depends=[curl dplyr jsonlite magrittr purrr tibble tidyr]; }; - swissparl = derive2 { name="swissparl"; version="0.2.0"; sha256="1blpaj8mbhnyb4bajh9h91h7pc2zz8gmzdag5faqfqr4rfnk0582"; depends=[crayon dplyr ggplot2 httr jsonlite lubridate magrittr purrr stringr tibble tidyr]; }; switchnpreg = derive2 { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[expm fda HiddenMarkov MASS]; }; switchr = derive2 { name="switchr"; version="0.14.2"; sha256="1a1yq12h5km42gp7gki7p215rnbwrs87xa2p0qndwqpvnaxgv6a4"; depends=[RCurl RJSONIO]; }; - swmmr = derive2 { name="swmmr"; version="0.9.0"; sha256="1iv9dmgpjfl7yzjlph42bamnwchjdic6n0lgs33z0incvgsv3m3g"; depends=[dplyr purrr Rcpp readr tibble tidyr xts zoo]; }; + swmmr = derive2 { name="swmmr"; version="0.9.1"; sha256="140sx0y00ngxsyn7n1l0aay7vk2jk8hf81aiwh46k761cpc5y28d"; 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]; }; + sybilSBML = derive2 { name="sybilSBML"; version="3.1.2"; sha256="1qvv6fr0zslfwlzx1zbd7rszh5x7zv3svvqrr8896inxh122mhzs"; depends=[Matrix sybil]; }; sybilccFBA = derive2 { name="sybilccFBA"; version="3.0.1"; sha256="1y94d6ajf0l492nrd8wsz3b6x724zcyhipasgyx65nx3sgha6yp8"; depends=[Matrix sybil]; }; sybilcycleFreeFlux = derive2 { name="sybilcycleFreeFlux"; version="2.0.1"; sha256="0j1qmf5apb6k0ga5ki7wxbbq1k8x7kv8wcnf85zcx0117fjkxfng"; depends=[MASS Matrix sybil]; }; - sylcount = derive2 { name="sylcount"; version="0.2-1"; sha256="0a5762cy2h4vhy35z88l9i4ny30zpj5bvmmw3n5xzz275hsd3piw"; depends=[]; }; + sylcount = derive2 { name="sylcount"; version="0.2-2"; sha256="0cncj0nszfw98i94sb3sqdzdxdqjs523kmbqxz6cvvph1s77aama"; depends=[]; }; syllabifyr = derive2 { name="syllabifyr"; version="0.1.0"; sha256="1pd5zjgcmpxg7xqhcljxck80pjs84ihhkr5bl4i8h2mc6xqmy1kf"; depends=[dplyr purrr stringr tibble tidyr]; }; sylly = derive2 { name="sylly"; version="0.1-5"; sha256="01c7mpsk32kcsjyzzv52bn8bj28lqbmyhhfa1cwhphva5c5nkqwx"; depends=[]; }; sylly_en = derive2 { name="sylly.en"; version="0.1-3"; sha256="0jw48qin172vv7skcpvcpi9wzgav5l9afzb09hhgcxvivbz6dl93"; depends=[sylly]; }; @@ -14283,18 +14435,16 @@ in with self; { symDMatrix = derive2 { name="symDMatrix"; version="2.0.2"; sha256="1lf0yhid47107c2vnr4g7xz4hrjb2cgr5zpgik4xf5gypli6xh6x"; depends=[bit ff LinkedMatrix]; }; symbolicDA = derive2 { name="symbolicDA"; version="0.6-2"; sha256="0fd36dndzs0n0xwz38px5182gc6ng174n433rgch1s1g6bh8dn4s"; depends=[ade4 cluster clusterSim e1071 rgl RSDA shapes XML]; }; symbols = derive2 { name="symbols"; version="1.1"; sha256="1234rx3divhg60p0h0zn11viqn51fm6b8876m6rip2i6z8vrg319"; depends=[shape]; }; - symmetry = derive2 { name="symmetry"; version="0.1.1"; sha256="1f4l058sdrdg7jl1rklyd0a3ik9lnnsf2imgaymr56iaxn7y0m79"; depends=[Rcpp RcppArmadillo Rdpack]; }; - symmoments = derive2 { name="symmoments"; version="1.2"; sha256="074k0285c0yri39zags420kjls6kjlvlhymg3r7y24h42zdy82d4"; depends=[combinat cubature multipol mvtnorm]; }; + symmetry = derive2 { name="symmetry"; version="0.2.1"; sha256="041vxbva5kaywpn4y7kjwlc2cj56iyvd51iv5198dv280jfcnjv9"; depends=[Rcpp RcppArmadillo Rdpack]; }; + symmoments = derive2 { name="symmoments"; version="1.2.1"; sha256="0wl68nsvydfhlbyaj54alj31dphqigyp1s4h2xdapxj4zvwf2sws"; depends=[combinat cubature multipol mvtnorm]; }; syn = derive2 { name="syn"; version="0.1.0"; sha256="12apdjbsazwfxizsw4dj0y3vkdjmki8dzpyv3bi9gnhpysdd1jzx"; depends=[]; }; synRNASeqNet = derive2 { name="synRNASeqNet"; version="1.0"; sha256="05ncwbv8kvvhqqrxa8qq7s0jc6krs5a56ph04z50iwgd91rzyi7x"; depends=[GenKern igraph KernSmooth parmigene]; }; - synbreed = derive2 { name="synbreed"; version="0.12-9"; sha256="0h85z9bhzgsr783qx3zjqyi461a0q52wbqifwm3gc1kapl5irxhd"; depends=[abind BGLR doBy doParallel foreach igraph lattice LDheatmap MASS qtl regress]; }; - synbreedData = derive2 { name="synbreedData"; version="1.5"; sha256="16wv9r7p0n8726qv0jlizmkvnrqwjj1q4xaxvfmj9611rm47vckx"; depends=[]; }; synchronicity = derive2 { name="synchronicity"; version="1.3.5"; sha256="1kgsk64aifjm3mfj102y3va7x1abypq2zi0cqbnjhl8fqyzp69hx"; depends=[BH bigmemory_sri Rcpp uuid]; }; synchrony = derive2 { name="synchrony"; version="0.3.8"; sha256="1zpxg4dkxnvafiyp0j00wig5ymj10bzfg2376x56rzpnabhg57hi"; depends=[]; }; synlik = derive2 { name="synlik"; version="0.1.2"; sha256="1pscfqg5x7wpq3vp1i7fy29dwa7cw5g3kzxinanwrwbcznv9nyms"; depends=[Matrix Rcpp RcppArmadillo]; }; - synoptReg = derive2 { name="synoptReg"; version="0.2.2"; sha256="0s3m7basw71gliy22c599ysj5s068ki20i8031yrrbdhif8zhbqg"; depends=[ncdf4 raster zoo]; }; + synoptReg = derive2 { name="synoptReg"; version="1.0.1"; sha256="16ncbxdyqyd0jrsshllv14pgdlkli1ymwjkh4sijnhzk9yhrbb28"; depends=[dplyr ggplot2 lubridate magrittr metR raster RNCEP stringr tibble tidyr]; }; syntaxr = derive2 { name="syntaxr"; version="0.8.0"; sha256="1iik9b3x9jx7w31j7hyi3sixg30l5a6w40svhqj1xlchsk60yykn"; depends=[magrittr]; }; - synthACS = derive2 { name="synthACS"; version="1.5.3"; sha256="1fpaqjxyrgmzsxpd2wqpabpzj6fsp88wac0kaf21nc9k5b8lf0gk"; depends=[acs data_table Rcpp]; }; + synthACS = derive2 { name="synthACS"; version="1.5.6"; sha256="02pxvsrg15xsys7iwp1np93yzxr6b00i8y7z0cxq29605n3p6sba"; depends=[acs data_table Rcpp]; }; 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.3"; sha256="14wvy46i2iz9jn7lj3cvifmps932s3395wq681hniva0f8m7q8d6"; depends=[]; }; sysfonts = derive2 { name="sysfonts"; version="0.8"; sha256="0wng902plryf2d8fc7k7m3jx11acz51kb2d91cqbyhq7xpk06z43"; depends=[]; }; @@ -14306,25 +14456,24 @@ in with self; { 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]; }; + taRifx = derive2 { name="taRifx"; version="1.0.6.2"; sha256="05cvjsi65fvy9hg2v3fldzwn1yd2kfirl3ffg9yfajm903dk3l49"; depends=[plyr reshape2]; }; tab = derive2 { name="tab"; version="4.1.1"; sha256="0ds8n6gncidb66in7hlqkcmil5yfsf7ihqvmls789hrm2iz9xlfm"; depends=[dplyr gee knitr MASS survey survival xtable]; }; taber = derive2 { name="taber"; version="0.1.0"; sha256="07a18kn65b4cxxf1z568n7adp6y3qx96nrff3a3714x241sd5p6i"; depends=[dplyr magrittr]; }; - tabit = derive2 { name="tabit"; version="0.1.1"; sha256="0fk670ws7df77sxf89kp8h608z5400gaia79zj3w9jv3jmfyj1i0"; depends=[]; }; + tabit = derive2 { name="tabit"; version="0.2.1"; sha256="0jy95jpbzj4rgaxmm6ki9wr0cl1w13pygq3yavdccjr82mayfpvc"; depends=[]; }; tablaxlsx = derive2 { name="tablaxlsx"; version="1.2.2"; sha256="1q7ap1dmymf3aj5g860794jfn9zrn3qiwwcdzl95lsbpkhgyspmz"; depends=[openxlsx]; }; table_express = derive2 { name="table.express"; version="0.3.1"; sha256="00f5xi2dkx1h0mv8ld3ds15w30d9vgvmjrldg43z7zskprshqsxx"; depends=[data_table dplyr magrittr R6 rlang tidyselect]; }; - table1 = derive2 { name="table1"; version="1.1"; sha256="01r6zlhv3d0ggniv6aaszmzqbappy9zycayiwwlknbwrgiwkp58z"; depends=[Formula htmltools knitr]; }; + table1 = derive2 { name="table1"; version="1.2"; sha256="1ggf3qkm7zwfdn1y1mhf8ydbg41aiy26p6g9iskryrxg7hgs3ynb"; depends=[Formula htmltools knitr yaml]; }; table1xls = derive2 { name="table1xls"; version="0.4.0"; sha256="0ixbshbp9hkcg12hj32vgb5bp0pj4rbc3i6g1xdg2zhqp7zanics"; depends=[XLConnect]; }; tableHTML = derive2 { name="tableHTML"; version="2.0.0"; sha256="19sa5sda4v5dr449ip9z9ah5hdph9q6vb6zbs93jn4rpkvyijny3"; depends=[htmltools jpeg magrittr png shiny webshot]; }; tableMatrix = derive2 { name="tableMatrix"; version="0.82.0"; sha256="1sskijhbqakamrk2rv7v5zpjsdi8jw0jl2z96l0vhsvsiq0cz1c8"; depends=[data_table]; }; - tableone = derive2 { name="tableone"; version="0.10.0"; sha256="166amb76acrw3dgvllc46kgblp82f46zvlgig2prg92xnid1zaws"; depends=[e1071 gmodels labelled lmerTest MASS nlme survey zoo]; }; + tableone = derive2 { name="tableone"; version="0.11.1"; sha256="15cpi3255234hc51jcvjijx3yiq086ggbj087bh5hw227gzc3sw9"; depends=[e1071 gmodels labelled lmerTest MASS nlme survey zoo]; }; tableplot = derive2 { name="tableplot"; version="0.3-5"; sha256="1jkkl2jw7lwm5zkx2yaiwnq1s3li81vidjkyl393g1aqm9jf129l"; depends=[]; }; tablerDash = derive2 { name="tablerDash"; version="0.1.0"; sha256="1mnp6lxa7d669r325aynq1n3f35r9sy4v1fvdh4cymbf33s8mkmm"; depends=[htmltools knitr shiny]; }; tables = derive2 { name="tables"; version="0.8.8"; sha256="1cgfwrnmgi1jhv9kj918mv0ib75hvprqjg0nb7ppih73kqpaw5m2"; depends=[Hmisc knitr]; }; - 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]; }; - tabplot = derive2 { name="tabplot"; version="1.3-3"; sha256="0gv27igixcy5vqrk71ckyhlk4yhcprm8r2a2l0lgmn4rbsm20c6h"; depends=[bit ff ffbase]; }; - tabr = derive2 { name="tabr"; version="0.4.0"; sha256="08f9v7mk9b9x2nk8n3nqgwikkay6ip14awljvgjl30nifbbswxsv"; depends=[crayon dplyr ggplot2 magrittr purrr tibble tidyr]; }; + tableschema_r = derive2 { name="tableschema.r"; version="1.1.1"; sha256="14cnbijxdhf7qbsiqbk8p516mfh9bgdbcg32vn5pycsp30k78b2h"; depends=[config future httr iterators jsonlite jsonvalidate lubridate purrr R6 RCurl rlist stringr urltools]; }; + tabr = derive2 { name="tabr"; version="0.4.2"; sha256="0c3814dnz1vzgbmm3vp0icnzyaqs1kimqnsp4n8id7zn8vlmp21p"; depends=[crayon dplyr ggplot2 magrittr purrr tibble tidyr]; }; tabuSearch = derive2 { name="tabuSearch"; version="1.1.1"; sha256="0396a8hla508na1hmyyhfbl8w10dbg810cln2xyhhvxi7rr223dj"; depends=[]; }; - tabula = derive2 { name="tabula"; version="1.5.0"; sha256="0ijamh5lhgaa202ka1kp78i583616rc9w4zay8gx7c3gkjppfpdx"; depends=[arkhe ca ggplot2 rlang]; }; + tabula = derive2 { name="tabula"; version="1.5.1"; sha256="0mm08rgqdhc3b68xh9hk4rw4i69gb2c45679zni9kkv48pbxvrh7"; depends=[arkhe ca ggplot2 rlang]; }; 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]; }; @@ -14337,7 +14486,7 @@ in with self; { tailr = derive2 { name="tailr"; version="0.1.3"; sha256="0agm83zwj6f3bpicbn2pcwira05v2pbv0g7myc1x06jxbw1qbfwp"; depends=[foolbox glue rlang]; }; taipan = derive2 { name="taipan"; version="0.1.2"; sha256="192sy5pgq74vs31p7jfn6svdzf9mk9ybppzhp1rlki1bagmm5f1r"; depends=[shiny]; }; takos = derive2 { name="takos"; version="0.1.0"; sha256="0a26jmxccpyk36sah9nz7pqpkc1rd9kbwrvwh0r0zp7lwvxbjb8w"; depends=[baseline broom colorRamps data_table devEMF MASS minpack_lm pracma segmented sfsmisc smoother]; }; - tanaka = derive2 { name="tanaka"; version="0.1.1"; sha256="0d7kqgl4kdmgvc8an0h1jqh8h4qw7mgdqmghxs49ssw3db6ir6lh"; depends=[isoband lwgeom raster sf]; }; + tanaka = derive2 { name="tanaka"; version="0.1.2"; sha256="17847xijmb6rv2vzvzx7piga1ihzsmdq4harjccm6qx0nfwij4vs"; depends=[isoband lwgeom raster sf]; }; tangles = derive2 { name="tangles"; version="0.8.1"; sha256="06a5hn5hkvgr6pcjz3n0vi1zwmv00wypi5f62agqh8mas80v44vh"; depends=[digest raster sp]; }; tangram = derive2 { name="tangram"; version="0.4"; sha256="1yj5vwc8jkiic4zjag9k7w3j6dibqw5zsi78q6gssshsi9z0zbgy"; depends=[base64enc digest htmltools magrittr R6 stringi stringr]; }; tapkee = derive2 { name="tapkee"; version="1.1"; sha256="1s8710m4drhnycfv27bv1w7vqc99dvbcn8zxkahq0lrsx7q8i5mz"; depends=[]; }; @@ -14348,20 +14497,22 @@ in with self; { 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]; }; tawny_types = derive2 { name="tawny.types"; version="1.1.5"; sha256="1vg0hv91dif6cfqfzrf7m1qbk57fp8v97fp88whwmvs83yd521hq"; depends=[futile_logger futile_options lambda_r lambda_tools quantmod xts zoo]; }; - taxa = derive2 { name="taxa"; version="0.3.2"; sha256="1kiffyfpgapap6m2k3wx7p89kzpdyk48nwbmqvfa883kvg0ddzcy"; depends=[crayon dplyr jsonlite knitr lazyeval magrittr R6 rlang stringr taxize tibble tidyr]; }; - taxize = derive2 { name="taxize"; version="0.9.91"; sha256="0ncglmj0nzk60dvmngzskr2psn0bi2wj8jr628kczln2qz2hagff"; depends=[ape bold cli crayon crul data_table foreach jsonlite natserv phangorn plyr R6 reshape2 ritis rotl rredlist stringr tibble wikitaxa worrms xml2 zoo]; }; + taxa = derive2 { name="taxa"; version="0.3.3"; sha256="11x28mxpza0cckj9cf4zizrsz87h48vlxxan8kn8lwzdpy1xn8j8"; depends=[crayon dplyr jsonlite knitr lazyeval magrittr R6 rlang stringr taxize tibble tidyr]; }; + taxadb = derive2 { name="taxadb"; version="0.1.0"; sha256="0nns9jpjawla90f12gi90562llb2j0pdhwlvy62mgcg0ghr39fgr"; depends=[arkdb curl DBI dbplyr dplyr jsonlite magrittr memoise progress rappdirs readr rlang RSQLite stringi tibble]; }; + taxize = derive2 { name="taxize"; version="0.9.94"; sha256="0ig8x3pkfawjk7x3hkrm4n94askhqk71sa5bbbp2l6dirqbfmism"; depends=[ape bold cli crayon crul data_table foreach jsonlite natserv phangorn R6 ritis rotl rredlist tibble wikitaxa worrms xml2 zoo]; }; taxizedb = derive2 { name="taxizedb"; version="0.1.4"; sha256="15gj9i18ysd83v9fidrrvw938dah04i10ahi3wh5dgjs5fd5ch2s"; depends=[curl DBI dbplyr dplyr hoardr magrittr RMySQL RPostgreSQL RSQLite]; }; taxlist = derive2 { name="taxlist"; version="0.1.7"; sha256="0a91hdw3n46p851662lx82znbw9hf9akg8mm4yslllwffrkhdn8g"; depends=[foreign stringdist taxa taxize vegdata]; }; taxonomizr = derive2 { name="taxonomizr"; version="0.5.3"; sha256="0hxvcbyr5b3sxqy5kw1q17qx7c2q90a6x79r9bmjn6c2lnrqn83i"; depends=[data_table R_utils RSQLite]; }; - taxotools = derive2 { name="taxotools"; version="0.0.35"; sha256="10rf071sarr94q5g174y97sl9qjlla7jgn4hplllv6s1wh10ag7c"; depends=[plyr sqldf taxize wikitaxa]; }; + taxotools = derive2 { name="taxotools"; version="0.0.43"; sha256="0msaqkvyhb292bsv84bw55xxmxhs5nyk31ikjz229q3xhv0zmnzw"; depends=[plyr sqldf taxize wikitaxa]; }; tbart = derive2 { name="tbart"; version="1.0"; sha256="0m8l9ic7na70il6r9ha0pyrjwznbgjq7gk5xwa5k9px4ysws29k5"; depends=[Rcpp sp]; }; tbd = derive2 { name="tbd"; version="0.1.0"; sha256="1wmfy3p82gckhfsslxzapryfygmircii7x24j6ysfyx52gy8iwf5"; depends=[numDeriv]; }; tbdiag = derive2 { name="tbdiag"; version="0.1"; sha256="1wr2whgdk84426hb2pf8iiyradh9c61gyazvcrnbkgx2injkz65q"; depends=[]; }; tbl2xts = derive2 { name="tbl2xts"; version="0.1.3"; sha256="0yy0cpsflwx7fbql3vh0l87cvqgn0ghdqal4m7l9aplqhzdwxs3r"; depends=[dplyr lazyeval PerformanceAnalytics xts zoo]; }; - tbm = derive2 { name="tbm"; version="0.3-2"; sha256="0kaqbyrazkl8gv0jl5n14zdlc4csmj1llmwgp068k79m2bacjmkq"; depends=[basefun coneproj mboost mlt sandwich variables]; }; - tbrf = derive2 { name="tbrf"; version="0.1.3"; sha256="1g6ll9vqhszas3czpnvvxhrih4b1h10dhn40ljh4206m27mzl8v9"; depends=[boot dplyr lubridate purrr rlang tibble tidyr]; }; - tcR = derive2 { name="tcR"; version="2.2.4"; sha256="17g26cq6zpcmg9kv32v0rvyqmml5wkbwra7p8f1cdzyc0zajbvn2"; depends=[data_table dplyr ggplot2 gridExtra gtable igraph Rcpp reshape2 scales stringdist]; }; - tcensReg = derive2 { name="tcensReg"; version="0.1.5"; sha256="0sk884pxgr7m46c1lbpji4hr6ch3ia6vygg1z988c21q219is76j"; depends=[maxLik]; }; + tbm = derive2 { name="tbm"; version="0.3-2.1"; sha256="0srdcla6m5vlid27i793yynm3r2fg3nzr7zn6j923fcmnpdg2jcg"; depends=[basefun coneproj mboost mlt sandwich variables]; }; + tbma = derive2 { name="tbma"; version="0.1.0"; sha256="066p3szfayyimwblghm1lipjf21xgscq1fzbzpqz16lqjpb99ni1"; depends=[data_table ranger RcppRoll zoo]; }; + tbrf = derive2 { name="tbrf"; version="0.1.4"; sha256="11b61h8ivjcmnx6jqm6a6b3hs7pwg5plfj4rnd3s6aibjwsa6l1w"; depends=[boot dplyr lubridate purrr rlang tibble tidyr]; }; + tcR = derive2 { name="tcR"; version="2.2.4.1"; sha256="1m68wxbxwhiadav4mfcidsa1hgwy7k9x60gfbs4zn6az9ix827m6"; depends=[data_table dplyr ggplot2 gridExtra gtable igraph Rcpp reshape2 scales stringdist]; }; + tcensReg = derive2 { name="tcensReg"; version="0.1.6"; sha256="052mlmkxxyqg2xm484srx2dx02bl69s6fqffwyn7758s34jwbcxl"; depends=[maxLik Rdpack]; }; tcgsaseq = derive2 { name="tcgsaseq"; version="1.8.1"; sha256="1v5b3qghygb81lqc2h1fijgw856b1778xndppq7r4b0zhhvb81ac"; depends=[CompQuadForm ggplot2 GSA KernSmooth statmod]; }; tcl = derive2 { name="tcl"; version="0.1.0"; sha256="1ssqx50ii6j2y5n2nxn5ndp20nrjss0xf0fqp8aiwlgnm3d1zggn"; depends=[eRm lattice MASS Matrix numDeriv]; }; tcltk2 = derive2 { name="tcltk2"; version="1.2-11"; sha256="1ibxld379600xx7kiqq3fck083s8psry12859980218rnzikl65d"; depends=[]; }; @@ -14372,19 +14523,18 @@ in with self; { tdr = derive2 { name="tdr"; version="0.13"; sha256="0i0hnb3fc4d1mbbxcpzmyfh1w2rahfjabg5iyxym3yjd6377al15"; depends=[ggplot2 lattice RColorBrewer]; }; tdsc = derive2 { name="tdsc"; version="1.0.3"; sha256="1h46cflxj27i9bkl7iqxn7kzccl9b8r3fa9f5ska3a9p57algfyv"; depends=[data_table moments]; }; tdthap = derive2 { name="tdthap"; version="1.1-11"; sha256="15qlj2bivvz3pizd8dq34wczbkbxhzqh3cqp1ixkdkprlyvcxj5k"; depends=[]; }; - tea = derive2 { name="tea"; version="1.0"; sha256="03wxhbgx17hl9bbzbfjmfa30q4fqszhs5y9imbp768fmzwbppn24"; depends=[eva]; }; teachingApps = derive2 { name="teachingApps"; version="1.0.4"; sha256="0wi25wdpkz7kh8r1s42wa9kiky8ilmcg8kgw0j1caygwg0bml2fa"; depends=[actuar BH d3heatmap data_table devtools diagram DiagrammeR dplyr DT dygraphs ggplot2 knitr leaflet magrittr markdown metricsgraphics miniUI networkD3 pacman plotly radarchart Rcpp RcppEigen RcppNumerical rprojroot scales shiny shinyAce shinydashboard shinythemes threejs tidyr visNetwork yaml]; }; tealeaves = derive2 { name="tealeaves"; version="1.0.0"; sha256="0hzih93h8c9gqvsmfaldq9jaw8hgvd4kmrlqlaqr6xhi6zhjqhf1"; depends=[crayon dplyr furrr future ggplot2 glue magrittr purrr rlang stringr tidyr units]; }; teamcolors = derive2 { name="teamcolors"; version="0.0.4"; sha256="0mqrjnkpxzv7armgbl9nwz42pjb9l94yml5lp41rhjj9414b2729"; depends=[dplyr ggplot2 tibble tidyr]; }; teamr = derive2 { name="teamr"; version="0.0.1"; sha256="01gngws8lf093598wlzrv4ls74avsli6ij33v1plqgc0znyaw4s2"; depends=[httr jsonlite R6]; }; teda = derive2 { name="teda"; version="0.1.1"; sha256="0yx469jbkw9cgx73zi5mkykrdn16kn01zh524x9411314aa32avx"; depends=[]; }; teigen = derive2 { name="teigen"; version="2.2.2"; sha256="1k5k3lj6av5pyx130w1j7avd0jdmm12ryc71mi5mq49sp95ndl4v"; depends=[]; }; - telefit = derive2 { name="telefit"; version="1.0.2"; sha256="0z4dg0am0b6h20vbjzggw2jyzmi0mf9hvj48f883wkg2p7m6d67m"; depends=[abind coda cowplot doRNG dplyr fields foreach ggplot2 gtable itertools mvtnorm raster Rcpp RcppArmadillo RcppEigen reshape2 scales scoringRules SDMTools sp stringr]; }; + telefit = derive2 { name="telefit"; version="1.0.3"; sha256="0z6dr4ni00dyagbkzr3c7l4h2g23w3bfj99a9755vmrzyy6r45iq"; depends=[abind coda cowplot dplyr fields foreach ggplot2 gtable itertools mvtnorm raster Rcpp RcppArmadillo RcppEigen reshape2 scales scoringRules sp stringr]; }; telegram = derive2 { name="telegram"; version="0.6.0"; sha256="02wwa115f0vz2d9y4nf01397hjkpc3cv2gdl47snrajrm41gji7y"; depends=[curl httr jsonlite R6]; }; telegram_bot = derive2 { name="telegram.bot"; version="2.4.0"; sha256="1bvfnr6k0zxdawrf63yh8wj9hcgq1xvy791xbqhiy0isaa86yfw9"; depends=[curl httr jsonlite R6]; }; tempR = derive2 { name="tempR"; version="0.9.9.16"; sha256="0kwrjpfij36dl98j5x09hp7bzf5v17zxdjzqhjd2sn3xsdf0z5a1"; depends=[]; }; tempcyclesdata = derive2 { name="tempcyclesdata"; version="1.0.1"; sha256="0hciachv59kjpjs119r4z24jskzgnassi1yjg3cgl2r0hyglxxc3"; depends=[]; }; - tempdisagg = derive2 { name="tempdisagg"; version="0.25.0"; sha256="0zi11jqb3i5kd2z1bbkz8y7g16kmkcn3xpkwj2brv0s86wxwsny7"; depends=[]; }; + tempdisagg = derive2 { name="tempdisagg"; version="1.0"; sha256="1n1ng7xki4syy305gsclz7wrqb48vkjw3la0vxs975apv1mc4pzr"; depends=[]; }; temperatureresponse = derive2 { name="temperatureresponse"; version="0.2"; sha256="1id3wjzfs132hj8cm7gpf105qaay9dff07ixah9rmn5sk6si0zmq"; depends=[AICcmodavg broom dplyr minpack_lm numDeriv rootSolve]; }; templates = derive2 { name="templates"; version="0.3.0"; sha256="0xnzj3cvhw1r7zfqaijbfdyclka61jwixcdh05a5z9qwgv0076sh"; depends=[dat magrittr stringr]; }; tempoR = derive2 { name="tempoR"; version="1.0.4.4"; sha256="0gn16j496833pvbjaf6wx26z9ilwssjp947mcyk6n2jb33x93rr2"; depends=[doParallel foreach pls]; }; @@ -14392,36 +14542,41 @@ 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.5"; sha256="1m4g9jr2s37xys2q4gv6rqknrznd4nrppa7qrgygqywwlmnyid44"; depends=[ggplot2 ICtest JADE Rcpp RcppArmadillo tensor tsBSS]; }; + tensorBSS = derive2 { name="tensorBSS"; version="0.3.6"; sha256="1ja4h5x1i4rqgq9k15zjy524ki2z2636fg0jcp352jzj87wl3443"; depends=[ggplot2 ICtest JADE Rcpp RcppArmadillo tensor tsBSS]; }; tensorflow = derive2 { name="tensorflow"; version="2.0.0"; sha256="1cz0l6blr8wan47lslq4lx0aafk61gjxwm6b3nn8zwgx849nqyr4"; depends=[config jsonlite processx reticulate rstudioapi tfruns yaml]; }; + tensorordinal = derive2 { name="tensorordinal"; version="0.1.0"; sha256="0c54ppnxgmr7m9a3dr1a9i3z2vh5nnqp361lhaf081iib8shrxxv"; depends=[MASS pracma rTensor]; }; tensorr = derive2 { name="tensorr"; version="0.1.1"; sha256="18xdvp328h96jn8y1iayxh7cyz2s8j5nn43nq18pyaxq271hkfyh"; depends=[assertive_base assertive_properties assertive_types Matrix purrr]; }; - tensorregress = derive2 { name="tensorregress"; version="1.0"; sha256="0gx2skh175gs2cmihqaklwadnp777xcfimd66w3wh18qiz66ggaz"; depends=[MASS pracma rTensor speedglm]; }; - tensorsparse = derive2 { name="tensorsparse"; version="1.0"; sha256="1qy6s58nkqq4spg7sapq3jafmxda0mx0j0cqjaj9pd34qqxifglf"; depends=[clues fields glasso glmnet HDCI mvtnorm RColorBrewer reshape rgl rTensor viridis]; }; + tensorregress = derive2 { name="tensorregress"; version="2.0"; sha256="0whw57rj2jfh4wh30lv7n05ddymzsnxv6137f03s8aa9dh89fiqy"; depends=[MASS pracma speedglm]; }; + tensorsparse = derive2 { name="tensorsparse"; version="2.0"; sha256="0midaw95q2gmk7hdlh6zdbm8nx0lm9m3y5liq6xrb3ajlq76ncqw"; depends=[fields glmnet HDCI mvtnorm RColorBrewer reshape rgl viridis]; }; tensr = derive2 { name="tensr"; version="1.0.1"; sha256="1z6b3ra7fgn88mxbhsq65x3frj5j7p17n119s9kbw7sg9y633vfx"; depends=[assertthat]; }; tergm = derive2 { name="tergm"; version="3.6.1"; sha256="03yd4l317airz84jfjyczjx43wi6sraid58lmxivm29xjk52xpi1"; depends=[coda ergm MASS network networkDynamic nlme robustbase statnet_common]; }; + tergmLite = derive2 { name="tergmLite"; version="2.1.7"; sha256="0djf7k0svdq4bnc84zxmxjns2fqggf0bs4h59jcl0yc36ka9k94n"; depends=[ergm network Rcpp statnet_common tergm]; }; term = derive2 { name="term"; version="0.1.0"; sha256="16nphv6kysjjd523ypwdsw6f7l4zvqa6z62012lv71wdkhkfvgnr"; depends=[chk lifecycle]; }; ternvis = derive2 { name="ternvis"; version="1.2"; sha256="057i6i3ygxrin0npc18gsg3dpdldzafyb5sr6lix5mhy6b09lkxf"; depends=[dichromat maps quadprog]; }; + terra = derive2 { name="terra"; version="0.5-2"; sha256="1zc2j5a3jgv8ld1wrqq03yllddyq1ljvnyq71ivcj8y6bc4alqma"; depends=[raster Rcpp]; }; tesseract = derive2 { name="tesseract"; version="4.1"; sha256="1a7cf48n7hdd6inqz23ifqhq6kx6wxri34a79ns2vxaj6f4llxf0"; depends=[curl digest pdftools rappdirs Rcpp]; }; test2norm = derive2 { name="test2norm"; version="0.1.1"; sha256="11by5a1j6613akxj1nc16r07jfwxr1izkpvymr9yycnddiqyp42c"; depends=[mfp]; }; testDriveR = derive2 { name="testDriveR"; version="0.5.1"; sha256="0wjdqvsyv33fsg1lljp9m0bhz38mpfgpgickgj4zdspc9x6lbnv6"; depends=[]; }; testassay = derive2 { name="testassay"; version="0.1.0"; sha256="06gks3k04m45kn946i525261v33ymwxpvgdy84kc7sp01xxx4rfv"; depends=[]; }; + testcorr = derive2 { name="testcorr"; version="0.1.2"; sha256="0vwbmvhdmimwhn9gyki5khsvk2yw9ik9kjgxhbr4vy3mm3ly4zqb"; depends=[assertthat forcats ggplot2 knitr reshape2 scales]; }; testequavar = derive2 { name="testequavar"; version="0.1.2"; sha256="12qfy53rkrasxphcfmch5bmdlvlybd27jfg3azsi3fg4zk4qgdw2"; depends=[]; }; tester = derive2 { name="tester"; version="0.1.7"; sha256="1x5m43abk3x3fvb2yrb1xwa7rb4jxl8wjrnkyd899ii1kh8lbimr"; depends=[]; }; testextra = derive2 { name="testextra"; version="0.1.0.1"; sha256="166lg012hgk5n4zp92dagx01bjhpkjgc5i40x9fc9nfjby0wrc0s"; depends=[assertthat parsetools pkgcond postlogic purrr rlang stringi testthat]; }; testforDEP = derive2 { name="testforDEP"; version="0.2.0"; sha256="1mgzhj8b35r5cm4bl0nnyxj0h7rwd28d17qvgvaky2kvm2r83cf9"; depends=[Hmisc minerva Rcpp]; }; testit = derive2 { name="testit"; version="0.11"; sha256="13iq4p8xzng88miizf04yv6z8vk7zhg1c8kd2h6swcmhqzq29yqj"; depends=[]; }; - testthat = derive2 { name="testthat"; version="2.3.1"; sha256="0m8xchdpgn9iwj6gb2qw46zr85v9zf1gkbr9nnahmy5sp1s9bbky"; depends=[cli crayon digest ellipsis evaluate magrittr pkgload praise R6 rlang withr]; }; + testthat = derive2 { name="testthat"; version="2.3.2"; sha256="0v70v2fs0f2ir962z9csbjlj8snrq9mbjfyhhb9dhz3zy26qs9hs"; depends=[cli crayon digest ellipsis evaluate magrittr pkgload praise R6 rlang withr]; }; testthis = derive2 { name="testthis"; version="1.1.0"; sha256="1ci7q25f8lq7mvigdj48gvpi75j08s0kll72kwa88xyfx9q8m3yl"; depends=[assertthat devtools fs magrittr pkgload rprojroot stringi testthat usethis]; }; tetraclasse = derive2 { name="tetraclasse"; version="0.1.21"; sha256="1cl2cah0xi6x3rvvdy56iszai6rkbxc1w3x13v0l1z1nryff7c6a"; depends=[dplyr FactoMineR ggplot2 ggrepel magrittr reshape2 tibble tidyr]; }; - texPreview = derive2 { name="texPreview"; version="1.4.3"; sha256="19qnfjdbm6iakbls4hyrjscl7m7dc7z0fhimf71gwdbq3nqx2zl1"; depends=[base64enc fs htmltools knitr lifecycle magick magrittr rematch2 rstudioapi svgPanZoom whisker xml2]; }; - texmex = derive2 { name="texmex"; version="2.4.2"; sha256="01qx4f5f0gf0xz85lzxxv79fp7syd7x484iw711rbnv0nw3aqwa2"; depends=[ggplot2 mvtnorm Rcpp]; }; + texPreview = derive2 { name="texPreview"; version="1.4.4"; sha256="1a80ld5j7419nqxvg1nq0kiv7ls262n6bk6pkj3cyqjq6z2y01j0"; depends=[base64enc details fs htmltools knitr lifecycle magick magrittr rematch2 rstudioapi svgPanZoom whisker xml2]; }; + texmex = derive2 { name="texmex"; version="2.4.5"; sha256="13wsrp418cgvma7a7hfhbs6ywp3j1j2sig7x60zh8v29pjcxic2n"; depends=[ggplot2 mvtnorm Rcpp]; }; texreg = derive2 { name="texreg"; version="1.36.23"; sha256="0yxaqimd7cyfrfpia6fnqm15lgs0bf5zyjzmnfm1v4qmf8kj8x6v"; depends=[]; }; - text2speech = derive2 { name="text2speech"; version="0.2.9"; sha256="1gcyrq3faq3zsfr7bvwhqk1l93289gzx70bg6xdyagw99jz5k5wn"; depends=[aws_signature dplyr googleAuthR googleLanguageR httr knitr magrittr mscstts tuneR]; }; - text2vec = derive2 { name="text2vec"; version="0.5.1"; sha256="0vcp50mgpgxbf534vd8l56m8006i3sh8a4v9nrf9vxkq2pv7xygc"; depends=[data_table digest foreach futile_logger irlba Matrix mlapi R6 Rcpp RcppParallel sparsepp stringi]; }; + text_alignment = derive2 { name="text.alignment"; version="0.1.0"; sha256="0gss64x3z7n5jpqp4ypsrmkamcd1c7jknysmndsxqs35p2ansppn"; depends=[Rcpp]; }; + text2speech = derive2 { name="text2speech"; version="0.2.10"; sha256="08sg17avqdb7wl68hc6caljwsv4wziw7w0csc8ga4k7bh7r53h8l"; depends=[aws_signature dplyr googleAuthR googleLanguageR httr knitr magrittr mscstts tuneR]; }; + text2vec = derive2 { name="text2vec"; version="0.6"; sha256="0r75cv77x2zm1z66s95hic71dpbqmybz39n48q6mz7gfd3m7312y"; depends=[data_table digest lgr Matrix mlapi R6 Rcpp rsparse stringi]; }; textTinyR = derive2 { name="textTinyR"; version="1.1.3"; sha256="0z9k978yk54zxrrjajcb0nanfhfpxm2bq2vbmk6w5s194da6y3xl"; depends=[BH data_table Matrix R6 Rcpp RcppArmadillo]; }; textcat = derive2 { name="textcat"; version="1.0-6"; sha256="0639b1qbi8779lskk5ms0sbbnmy2s73b3w96abbr70mrh0s2f9rw"; depends=[slam tau]; }; textclean = derive2 { name="textclean"; version="0.9.3"; sha256="0kgjh6c4f14qkjc4fds7q7rpf4nkma3p0igm54fplmm3p853nvrz"; depends=[data_table english glue lexicon mgsub qdapRegex stringi textshape]; }; - textdata = derive2 { name="textdata"; version="0.3.0"; sha256="0khf3j9hwl5jz3mzwzsmisrqchlf19phl4r3x8sk2cdhkb1qf3ix"; depends=[fs rappdirs readr tibble]; }; + textdata = derive2 { name="textdata"; version="0.4.0"; sha256="0admyznyy02rxn3r0n1icyslfv4qky2b7mwzmc0g0251awnnx55a"; depends=[fs rappdirs readr tibble]; }; texteffect = derive2 { name="texteffect"; version="0.3"; sha256="1qcbr18h3vakh6ymw4axzqcqrpss6z68a592xl879b82l2nlq8a7"; depends=[boot ggplot2 MASS]; }; textfeatures = derive2 { name="textfeatures"; version="0.3.3"; sha256="0x67kms7ipsadymc9jwja7wymav8y9kc5sbmp2vw4n4l89n32raa"; depends=[dplyr purrr rlang text2vec tfse tibble tokenizers]; }; textgRid = derive2 { name="textgRid"; version="1.0.1"; sha256="1wi5vq5f7ixhz39l5hqi2jlmjjacx4lyrs4h8xfbd47pj6g16lc6"; depends=[]; }; @@ -14432,7 +14587,7 @@ in with self; { 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]; }; textreadr = derive2 { name="textreadr"; version="0.9.0"; sha256="04nyjrfxgwq8g3bdj12nnkia2xn2zngk1rprlkpyicrisgq36agk"; depends=[antiword curl data_table pdftools readxl rvest striprtf textshape xml2]; }; - textrecipes = derive2 { name="textrecipes"; version="0.0.2"; sha256="1wks8z8wggx318haplyw4km2nh1vrl805gvyckb79n569f8ks9ah"; depends=[dplyr generics lifecycle magrittr purrr recipes rlang SnowballC stopwords stringr text2vec textfeatures tibble tokenizers]; }; + textrecipes = derive2 { name="textrecipes"; version="0.1.0"; sha256="05ib5j1bphninc2v0bpaxdn2bnkj5ak6ldm6z3dvj7gmxk7p5cjc"; depends=[dplyr generics magrittr Matrix purrr recipes rlang SnowballC stopwords stringr tibble tidyr tokenizers]; }; textreg = derive2 { name="textreg"; version="0.1.5"; sha256="0h44z5hyndnvzd9axix7gpmhbdx347dfgxw9r8w38kyw6dklbjy6"; depends=[NLP Rcpp tm]; }; textreuse = derive2 { name="textreuse"; version="0.1.4"; sha256="0qfp7ffzb5p3k3wiw8i1zjskni8f38rzkjnss97j9f3vhhb8j4r7"; depends=[assertthat BH digest dplyr NLP Rcpp RcppProgress stringr tidyr]; }; textshape = derive2 { name="textshape"; version="1.6.0"; sha256="1pl85wjq5rl25gdlh4cp0l14hn76rrmpl7l1fn7kq9lwj9yfpcs8"; depends=[data_table slam stringi]; }; @@ -14447,7 +14602,7 @@ in with self; { tfhub = derive2 { name="tfhub"; version="0.7.0"; sha256="1a4iasasfbd44hljxkf2a76j1nb6l6jmijw8f52h5m00m8arfh2i"; depends=[magrittr reticulate rstudioapi tensorflow]; }; tfio = derive2 { name="tfio"; version="0.4.1"; sha256="089vh0k12z0ymk4v585hfnl5yqp28rgzqgy633m874h6fqzhhxvp"; depends=[forge magrittr reticulate tensorflow tfdatasets]; }; tfplot = derive2 { name="tfplot"; version="2015.12-1"; sha256="1x007j6ibbzfr0kncvsr4c7295jv3c4amg2dpyjvdir9h665nc23"; depends=[tframe]; }; - tfprobability = derive2 { name="tfprobability"; version="0.8.0.0"; sha256="1h32r15yxxzmvqp0gs2k5m2c6z1jkgfwj757sl6pfhwpr7av9zqp"; depends=[keras magrittr reticulate tensorflow]; }; + tfprobability = derive2 { name="tfprobability"; version="0.9.0.0"; sha256="1idvz3ph0fjaa1bd4zgwsvqhdf604sl76r4g4askmww42hycvpqp"; depends=[keras magrittr reticulate tensorflow]; }; tframe = derive2 { name="tframe"; version="2015.12-1.1"; sha256="1yff22jzh1mp73zbz2mav6z8m42lylfjhb8dgxj4337fv3if3i13"; depends=[]; }; 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]; }; @@ -14459,6 +14614,7 @@ in with self; { thankr = derive2 { name="thankr"; version="1.0.0"; sha256="089ikp85d5ia6a1qzmw8dkgcmz628cibmwfzcpk7m3ii8acxq91w"; depends=[]; }; thectar = derive2 { name="thectar"; version="1.0.0"; sha256="1qh0qzg0ybb38kzm56xxlvhm201pdjm16aky5f1fdflcsszgy8mx"; depends=[proxy smacof]; }; theiaR = derive2 { name="theiaR"; version="0.3.0"; sha256="0z3i6dgf2mv954llb6vk6g09gdk1hi0fjygk09jp8p9cygn7r941"; depends=[askpass httr R6 raster XML]; }; + themetagenomics = derive2 { name="themetagenomics"; version="1.0.0"; sha256="1wchvbqlp6kkpahqdrc52pjn79c9xkr6qzfm6vpzc07lp6l05iji"; depends=[ggplot2 lda lme4 Matrix plotly Rcpp rstan scales shiny stm]; }; themis = derive2 { name="themis"; version="0.1.0"; sha256="1hsrm8z9fh8smzw9yda8j32zq9warnpy6rihyni0zwchgp3iyawq"; depends=[dials dplyr generics purrr RANN recipes rlang ROSE tibble tidyselect unbalanced withr]; }; 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]; }; @@ -14477,53 +14633,58 @@ in with self; { thriftr = derive2 { name="thriftr"; version="1.1.5"; sha256="1s8fn0imja6gh5bb0h2g1pmvkwk5v0dmpml9yvcd5dhz9lxy6vdj"; depends=[R6 rly stringi]; }; thsls = derive2 { name="thsls"; version="0.1"; sha256="18z7apskydkg7iqrs2hgnzby578qsvyd73wx8v4z3aa338lssdi7"; depends=[Formula]; }; thurstonianIRT = derive2 { name="thurstonianIRT"; version="0.9.0"; sha256="0jjrdx5f581h8vh0fw4p85mlqfym467azp7cln48wzi1s28m9mn2"; depends=[BH dplyr lavaan magrittr MplusAutomation mvtnorm Rcpp RcppEigen rlang rstan rstantools StanHeaders tibble tidyr]; }; - tibble = derive2 { name="tibble"; version="2.1.3"; sha256="06jfayiip8j8ibdhw3fvxn4n8aqbqhwanrszpzlsf92xdfgfm34s"; depends=[cli crayon fansi pillar pkgconfig rlang]; }; - tibbleOne = derive2 { name="tibbleOne"; version="0.1.0"; sha256="01v3jqxps0d27hg50d38zzh8lypr5735xsdggpc6zmqd39cbnjsp"; depends=[dplyr flextable forcats glue kableExtra knitr labelled lifecycle magrittr officer purrr rlang stringr tibble tidyr tidyselect vctrs]; }; + tibble = derive2 { name="tibble"; version="3.0.0"; sha256="0s84h8ls5qwixbs1n5safr3xqmg3p0llzdrd9sp4vs2572mwzqzi"; depends=[cli crayon ellipsis fansi lifecycle magrittr pillar pkgconfig rlang vctrs]; }; + tibbleOne = derive2 { name="tibbleOne"; version="0.1.1"; sha256="1cdk0m6g187kj836jh1n0picpaaybr5dxwiks5ppj5bpybw7x3xc"; depends=[dplyr flextable forcats glue kableExtra knitr labelled lifecycle magrittr officer purrr rlang stringr tibble tidyr tidyselect vctrs]; }; tibbletime = derive2 { name="tibbletime"; version="0.1.3"; sha256="0p42g73cmw460v372317as50ijvsg49avg9cf222ypf1v0ls3ig1"; depends=[assertthat dplyr glue hms lifecycle lubridate purrr Rcpp rlang tibble tidyselect vctrs 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="1.0.4"; sha256="154jikhm1dnriwdib5ncmkjixlihs3b74ilpi225h8ijq84n31ai"; depends=[dplyr ggplot2 mclust mix MplusAutomation tibble]; }; - tidyREDCap = derive2 { name="tidyREDCap"; version="0.1.0"; sha256="177jrkd415rl7cz0vyank2bxiqkywcrva8xi8j2hyi6j6hkf0m6a"; depends=[magrittr purrr stringr tibble]; }; - tidyRSS = derive2 { name="tidyRSS"; version="1.2.11"; sha256="0ikizs24frvv888zxris6j41lfcvy7hrp5z3h3mk5vxdlqi3rag7"; depends=[dplyr httr jsonlite lubridate magrittr purrr sf stringr testthat tibble xml2]; }; - tidyUSDA = derive2 { name="tidyUSDA"; version="0.2.6"; sha256="02vrjpg0b651w5mvwhj60isy79q0nid6vyn2bhkddfaffs823lq0"; depends=[crayon curl dplyr fuzzyjoin ggplot2 jsonlite keyring magrittr nlme rgdal sf stringi tigris usethis]; }; - tidybayes = derive2 { name="tidybayes"; version="1.1.0"; sha256="1mq6gqr66pqrwdmnk3fmfi508ds086k7jnlazi5mczn4r6pdyzd7"; depends=[arrayhelpers coda dplyr forcats ggplot2 ggstance HDInterval magrittr plyr purrr rlang tibble tidyr tidyselect]; }; + tidyBF = derive2 { name="tidyBF"; version="0.1.0"; sha256="1yxm0qrc0mbpidz5gdyann5xsc7arz21cfvfx29xgpgpidlgr3y8"; depends=[BayesFactor broomExtra dplyr ipmisc metaBMA rlang tibble tidyr]; }; + tidyHeatmap = derive2 { name="tidyHeatmap"; version="0.99.9"; sha256="04vx1ck1s6v4fzxxd4cpm5z3f0dzx3b9262xabnq75swng90w03r"; depends=[circlize ComplexHeatmap dplyr magrittr purrr RColorBrewer rlang tidyr viridis]; }; + tidyLPA = derive2 { name="tidyLPA"; version="1.0.6"; sha256="1c3v7zljs6isbxzmyqx065pb31hl15sma00wh7pv3wgzacibbgmx"; depends=[dplyr ggplot2 gtable mclust mix MplusAutomation tibble]; }; + tidyMicro = derive2 { name="tidyMicro"; version="1.43"; sha256="1y399khg85979lh9s528y5qab711qybd1vfw5kvyy7253ikmcb3p"; depends=[ade4 broom car cowplot dplyr Evomorph factoextra ggplot2 ggrepel gridExtra latex2exp lme4 lsr magrittr MASS Matrix plotly plyr png purrr rlang scales scatterplot3d shapes stringr ThreeWay tibble tidyr tidyverse vegan VGAM]; }; + tidyREDCap = derive2 { name="tidyREDCap"; version="0.2.0"; sha256="03kx91avw6zbmrcxvhkb7i3syw3ajkv9ypvgn2iq3ki887vbiwzw"; depends=[dplyr janitor magrittr purrr rlang stringr tibble tidyr]; }; + tidyRSS = derive2 { name="tidyRSS"; version="2.0.1"; sha256="06pqhvgiibf1s72abd0rq3fv55plkd4481b3jhvxm3cd2isa3gbw"; depends=[anytime dplyr httr jsonlite magrittr purrr rlang tibble xml2]; }; + tidyUSDA = derive2 { name="tidyUSDA"; version="0.2.7"; sha256="1qyy0908ll4xr7496wsxg2vqhrlqrs1wh3nypw96djldk61bdziq"; depends=[crayon curl dplyr fuzzyjoin ggplot2 jsonlite keyring magrittr nlme rgdal sf stringi tigris usethis]; }; + tidybayes = derive2 { name="tidybayes"; version="2.0.3"; sha256="0grg53m0b0nhpadl5c7qcshqinzwx5whinvdgycpl9g7582512hr"; depends=[arrayhelpers coda dplyr forcats ggplot2 HDInterval magrittr plyr purrr rlang scales tibble tidyr tidyselect]; }; tidyboot = derive2 { name="tidyboot"; version="0.1.1"; sha256="0nss1ci763g9p5f33g163ppamx72axc8xhrils0cql3ka8439pmn"; depends=[dplyr modelr purrr rlang tidyr]; }; tidycells = derive2 { name="tidycells"; version="0.2.2"; sha256="1h1g2kw4q0qgakj716gzd8jcn0hgsy5l1cypk35s6arz73xrxf0r"; depends=[dplyr ggplot2 magrittr purrr rlang stringr tibble tidyr unpivotr]; }; - tidycensus = derive2 { name="tidycensus"; version="0.9.6"; sha256="16lcldbs1h8y1ajsj7lv04h0gq93hfcd0mbws2wb5pgx0jr187yk"; depends=[dplyr httr jsonlite purrr rappdirs readr rvest sf stringr tidyr tigris units xml2]; }; + tidycensus = derive2 { name="tidycensus"; version="0.9.9.2"; sha256="1m9i19b3z8nzbcly9a8nk75msy6d8bkchvyv6izdiy1mlqxrc6fh"; depends=[dplyr httr jsonlite purrr rappdirs readr rvest sf stringr tidyr tigris units xml2]; }; tidycode = derive2 { name="tidycode"; version="0.1.1"; sha256="0ahjhn1ar93xnd1snxnivdl43d1b6ica0pc30rgh8jpha87zbsay"; depends=[glue matahari pryr purrr rlang tibble]; }; tidycomm = derive2 { name="tidycomm"; version="0.1.0"; sha256="0xas6nr7fy612r0b5h8ncvirxhzy099zvhdzxbnskm3sa21046ni"; depends=[broom dplyr forcats glue magrittr MBESS purrr rlang stringr tibble tidyr]; }; tidycwl = derive2 { name="tidycwl"; version="1.0.4"; sha256="1f3lrdl73lx0a0y6kz33i6s8nkcwdjdmc6mvnkqp3n8r851q46lg"; depends=[dplyr htmlwidgets jsonlite magrittr visNetwork webshot yaml]; }; tidydice = derive2 { name="tidydice"; version="0.0.6"; sha256="1g0x426gri1s0fyn2srl7ni0zvrnx1wvg5zcr19fxgdw9m8rxxp2"; depends=[assertthat dplyr ggplot2 magrittr purrr tibble]; }; - tidygapminder = derive2 { name="tidygapminder"; version="0.1.0"; sha256="1fr4yrq7hzzllkclf7cwicfjwg5gcf5la0chc8mah7690lkdi39b"; depends=[data_table dplyr readxl tidyr]; }; + tidyfast = derive2 { name="tidyfast"; version="0.2.1"; sha256="1bfs2wma705nx1lpndq75ama5dr9kkg8hwpklb20csnccnfrlvf6"; depends=[data_table Rcpp]; }; + tidyfst = derive2 { name="tidyfst"; version="0.9.4"; sha256="1nq37pa1hn2m9ijfd8c3h3h2d4vhcjhzyhspvm5xkm9r0cbgxwl3"; depends=[data_table fst stringr]; }; + tidygapminder = derive2 { name="tidygapminder"; version="0.1.1"; sha256="1m6bynwnw1msrzvdmy12w3ympinqpd8j3may3rwmg9941nndjv2d"; depends=[data_table dplyr readxl tidyr]; }; tidygenomics = derive2 { name="tidygenomics"; version="0.1.2"; sha256="1cnwmmmzp9kg4k7iy2kgb22bdllpnz257pv1ahy3l11zy6bl48fc"; depends=[dplyr fuzzyjoin IRanges purrr Rcpp rlang tidyr]; }; - tidygeocoder = derive2 { name="tidygeocoder"; version="0.2.4"; sha256="0r37s3hfyqz4zqs7cwp72dhc6f1y7zfc22v9b0705bdbqnfllahn"; depends=[dplyr httr jsonlite purrr rlang stringr tibble tidyr tmaptools]; }; + tidygeocoder = derive2 { name="tidygeocoder"; version="0.2.5"; sha256="03zrl7zvwpcir44a5f2mixyd35rcyx8fpq7fjybb5z0bky068ir4"; depends=[dplyr httr jsonlite purrr rlang stringr tibble tidyr tmaptools]; }; 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.5.0"; sha256="0bf8rnk0yhdjjs79d4s833z9j165cwvg3xdmqg3kc5yzc31m4hsg"; 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]; }; tidyjson = derive2 { name="tidyjson"; version="0.2.4"; sha256="1nbg7wg8r38ydvcp3kbxmmnayxrdkl3p7x0fjxny3bj9a0fp99y7"; depends=[assertthat dplyr jsonlite magrittr purrr tibble tidyr]; }; tidylog = derive2 { name="tidylog"; version="1.0.0"; sha256="12civvsgj9d7ligc84sqii6a8q3ll12b8xs99f6rqp4nhzhpavv3"; depends=[clisymbols dplyr glue tidyr]; }; - tidymodels = derive2 { name="tidymodels"; version="0.0.3"; sha256="07l33slvh38lpycz2v4slwz06v33ni9jqr5wv672gzcgirw5xy7p"; depends=[broom cli crayon dials dplyr ggplot2 infer magrittr parsnip pillar purrr recipes rlang rsample rstudioapi tibble tidyposterior tidypredict tidytext yardstick]; }; + tidymodels = derive2 { name="tidymodels"; version="0.1.0"; sha256="1bi5vh80f6f2ibhyaapgnl7q1mkkx8425vj6ci0ml5rb7l8jhjm8"; depends=[broom cli crayon dials dplyr ggplot2 infer magrittr parsnip pillar purrr recipes rlang rsample rstudioapi tibble tidyposterior tidypredict tidytext tune workflows yardstick]; }; tidymv = derive2 { name="tidymv"; version="2.2.0"; sha256="0g550b0frgk4wy3sicsqqinffrlbqzghhcnvh3snci6xd7j37hmm"; depends=[dplyr ggplot2 itsadug magrittr mgcv rlang tibble tidyr]; }; tidync = derive2 { name="tidync"; version="0.2.3"; sha256="1wjw3fmyj8f95f94zai58h8b6h0vqqlrw4c629jjgg8ayy7aay9p"; depends=[dplyr forcats magrittr ncdf4 ncmeta purrr rlang RNetCDF tibble tidyr]; }; tidypmc = derive2 { name="tidypmc"; version="1.7"; sha256="1fijlvdiw4vwm34wizm4xlm0x10vvpkldzk7rrla44apq7y2w3yq"; depends=[dplyr readr stringr tibble tokenizers xml2]; }; tidyposterior = derive2 { name="tidyposterior"; version="0.0.2"; sha256="1sdbar3ycnjqyjy664zyhr9xks48l6g6mw8p5scp31x3gdh352rs"; depends=[dplyr generics ggplot2 purrr rlang rsample rstanarm tibble tidyr]; }; - tidypredict = derive2 { name="tidypredict"; version="0.4.3"; sha256="1mn14rd33irgcfrhm9d3zd71jdwdjay5z5xsmas8d9zmf05g0bcr"; depends=[dplyr generics knitr purrr rlang tibble]; }; - tidyquant = derive2 { name="tidyquant"; version="0.5.9"; sha256="013yxg3wqvrl7ybda8lxil7cvzzlllb9f2l107867c7af9fbf7vy"; depends=[cli crayon dplyr ggplot2 httr lazyeval lubridate magrittr PerformanceAnalytics purrr Quandl quantmod rlang rstudioapi stringr tibble tidyr timetk TTR xml2 xts]; }; + tidypredict = derive2 { name="tidypredict"; version="0.4.5"; sha256="1i6zl6wjz6wbpkmkc9z9ikp8zgck3qh38lar0r6q2jzl8fxpimg4"; depends=[dplyr generics knitr purrr rlang tibble]; }; + tidyquant = derive2 { name="tidyquant"; version="1.0.0"; sha256="0d84wln98afa23z4sfxpr1xp7p3kjqvnidl69v3l65wi2lkxc87b"; depends=[alphavantager cli crayon dplyr ggplot2 httr lazyeval lubridate magrittr PerformanceAnalytics purrr Quandl quantmod riingo rlang rstudioapi stringr tibble tidyr tidyselect timeDate timetk TTR xml2 xts]; }; tidyquery = derive2 { name="tidyquery"; version="0.2.0"; sha256="1qhiqaijw71lqv2lffsisk53mvxckr7jj6qxvg9l3wygmhskzkvw"; depends=[dplyr lubridate queryparser rlang stringr]; }; tidyqwi = derive2 { name="tidyqwi"; version="0.1.1"; sha256="0qrwclaz6cf2wg3rkg2nqjygflj0a1mx4cfbv5lx4r194km2dmr9"; depends=[dplyr furrr future httr jsonlite labelled magrittr purrr stringr tidyr xml2]; }; tidyr = derive2 { name="tidyr"; version="1.0.2"; sha256="0safj8bcf8libwr0jx4059bmarngvhfddrcv8k5iw39m9lpxs0r4"; depends=[dplyr ellipsis glue lifecycle magrittr purrr Rcpp rlang stringi tibble tidyselect vctrs]; }; - tidyrules = derive2 { name="tidyrules"; version="0.1.0"; sha256="1pwbgk48rrxcxwjnqfjg4718fw059h4qh3vfni8psgd5snfbsjql"; depends=[assertthat magrittr partykit purrr stringr tibble]; }; - tidyselect = derive2 { name="tidyselect"; version="0.2.5"; sha256="0x3cp36byhfjajikr1lwffjm85ayw3bcs7d7kb0cydgs61ifiqjw"; depends=[glue purrr Rcpp rlang]; }; + tidyrules = derive2 { name="tidyrules"; version="0.1.3"; sha256="09alqz7rsd98qach8hi28143xgbjapk4m9l47dvk0vpx3mfnkzq3"; depends=[assertthat magrittr partykit purrr stringr tibble]; }; + tidyselect = derive2 { name="tidyselect"; version="1.0.0"; sha256="1bwwsljkg1bxh7xnqxv7n0n1s9y8x407i6lsv826vy1ss1k1fxpy"; depends=[ellipsis glue purrr rlang vctrs]; }; tidystats = derive2 { name="tidystats"; version="0.4"; sha256="1jxn8la5s3mdh9kbkbvlc5icwa7ymingaxrl0q49ykifrsnbpd4a"; depends=[dplyr jsonlite purrr readr 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.2"; sha256="1h1fpy86fha3jidb1xz0n3mfn7110mmf3dz9hpyfczqpyd62k3qq"; depends=[dplyr generics hunspell janeaustenr Matrix purrr rlang stopwords stringr tokenizers]; }; + tidytable = derive2 { name="tidytable"; version="0.4.0"; sha256="16svngicns9xwkp1i16c1sd34p1w4np3nfd71pbz1b9w69pzc077"; depends=[data_table magrittr rlang]; }; + tidytext = derive2 { name="tidytext"; version="0.2.3"; sha256="12q6f7z3lzjgzmz5scp5jx89r2xkbvm20dc99kma9ddvbj7zj0y1"; depends=[dplyr generics hunspell janeaustenr Matrix purrr rlang stopwords stringr tokenizers]; }; tidytidbits = derive2 { name="tidytidbits"; version="0.2.1"; sha256="1hyqk8p4w1mjk9f497f2lh8hlic6fs37jnawqpfmrl39ylx4z6r7"; depends=[dplyr extrafont forcats magrittr purrr rlang stringr tibble tidyr tidyselect]; }; - tidytransit = derive2 { name="tidytransit"; version="0.6.1"; sha256="0gm33d73k5rygdk6waaqlknkm65gg5xc6w85m3qhllch2akphh1j"; depends=[assertthat data_table digest dplyr hms httr lubridate magrittr readr rlang sf tibble tidyr zip]; }; - tidytree = derive2 { name="tidytree"; version="0.3.1"; sha256="1bnzs62z2l8ck2h9gabmxvayizv4nfn8dmyzry83fv0cspjbyiv7"; depends=[ape dplyr lazyeval magrittr rlang tibble]; }; + tidytree = derive2 { name="tidytree"; version="0.3.3"; sha256="05b53dap0f784kl6s1wgck6m7brwmy6ifqp7v5l06s1spfspagl6"; depends=[ape dplyr lazyeval magrittr rlang tibble]; }; tidyverse = derive2 { name="tidyverse"; version="1.3.0"; sha256="02gyys08qv2v4cl2d66gml4d31ipxay0iyfwwksvxyclx60wp2kd"; depends=[broom cli crayon dbplyr dplyr forcats ggplot2 haven hms httr jsonlite lubridate magrittr modelr pillar purrr readr readxl reprex rlang rstudioapi rvest stringr tibble tidyr xml2]; }; - tidyxl = derive2 { name="tidyxl"; version="1.0.4"; sha256="19kcm9lfbkf61z0whfkn69b8m36qd1rvyhyk5y0cqbzkxvq8f70i"; depends=[piton Rcpp]; }; + tidyvpc = derive2 { name="tidyvpc"; version="1.0.0"; sha256="1f5ca0cbb3fwsdmb4zvgf8aglajmvks9jqidnx28ppy5w9qv1skc"; depends=[data_table magrittr quantreg rlang]; }; + tidyxl = derive2 { name="tidyxl"; version="1.0.5"; sha256="1ndhlch34aav2ji1adcvljcsy8l388h5vyjby9fvipq7ysa0yxzh"; depends=[piton Rcpp]; }; tiff = derive2 { name="tiff"; version="0.1-5"; sha256="0asf2bws3x3yd3g3ixvk0f86b0mdf882pl8xrqlxrkbgjalyc54m"; depends=[]; }; tiger = derive2 { name="tiger"; version="0.2.3.1"; sha256="0xr56c46b956yiwkili6vp8rhk885pcmfyd3j0rr4h8sz085md6n"; depends=[e1071 hexbin klaR lattice qualV som]; }; tigerhitteR = derive2 { name="tigerhitteR"; version="1.1.0"; sha256="0inyi12lf8bn7nbklf2rjixk6wrgrjcp8njv7knai4dgvv7v0rfa"; depends=[Hmisc magrittr openxlsx zoo]; }; @@ -14531,7 +14692,7 @@ in with self; { tigger = derive2 { name="tigger"; version="0.4.0"; sha256="1ns4shv4aaxlgahy9vy3wxxrnrz4zb0w40fcsldmh5jrvbxhhsb6"; depends=[alakazam doParallel dplyr foreach ggplot2 gridExtra gtools iterators lazyeval rlang shazam stringi tidyr]; }; tightClust = derive2 { name="tightClust"; version="1.1"; sha256="0vqkp2g6z8y3b6dhzglmacjhf2qi1sg80kb941mwfafin2k40zbm"; depends=[]; }; tigreBrowserWriter = derive2 { name="tigreBrowserWriter"; version="0.1.5"; sha256="0izgx1khci6qc6pz85dxj75kzxvpr30l0vhcv9476jrcbwqs4k8m"; depends=[DBI RSQLite]; }; - tigris = derive2 { name="tigris"; version="0.9.1"; sha256="1vwnxw4pg15pn87cz6f3ncfn1f145svikn8y2sphyvp0x7cid53x"; depends=[dplyr httr magrittr maptools rappdirs rgdal sf sp stringr uuid]; }; + tigris = derive2 { name="tigris"; version="0.9.4"; sha256="1q98zh9zndimpl8zv35r40c8mhr8ncp3bmyxlvhnwvkpc073z90p"; depends=[dplyr httr magrittr maptools rappdirs rgdal sf sp stringr uuid]; }; tikzDevice = derive2 { name="tikzDevice"; version="0.12.3"; sha256="1d8cxb3srmfv54c61c25myiknkm43ysl69lqjknhaj682x0nyz2r"; depends=[filehash png]; }; tilegramsR = derive2 { name="tilegramsR"; version="0.2.0"; sha256="11cnyvlghg8z7lr9ahzsjpyjrqnxqs77wdcydqvavrsqj745xvi2"; depends=[sf sp]; }; tiler = derive2 { name="tiler"; version="0.2.4"; sha256="1j1952vp0gnx0pnhqydipj4qw3cm05im502jc77wb2r1vklwimgb"; depends=[png raster rgdal sp]; }; @@ -14548,11 +14709,11 @@ in with self; { timelineR = derive2 { name="timelineR"; version="1.0.0"; sha256="01bb4201p18l1l5yp622ml9zd8spc978hvhw1s7j57qki5rw4kdf"; depends=[dplyr futile_logger ggplot2 gtable lubridate mtconnectR rlang stringr]; }; timelineS = derive2 { name="timelineS"; version="0.1.1"; sha256="076w8ckzzl59bc1gnwjgdwynnz86320hyfmzb0k26hl3k13jlmxs"; depends=[dplyr ggplot2 lubridate magrittr]; }; timeordered = derive2 { name="timeordered"; version="0.9.9"; sha256="0rfga5i6kckmlz2dzqb1pp634dl93wxp7v3kisxlbjl7mgnbck3k"; depends=[igraph plyr]; }; - timeperiodsR = derive2 { name="timeperiodsR"; version="0.6.1"; sha256="11dm8qp0887p8fnr12qvmidhk6wibqg2gszn73j9825d3csh2x9g"; depends=[lubridate]; }; + timeperiodsR = derive2 { name="timeperiodsR"; version="0.6.2"; sha256="09vwp04j7n176xs1lbdmbyi557byx6fdvqyjay1785hkb9ivws5q"; depends=[lubridate]; }; timereg = derive2 { name="timereg"; version="1.9.4"; sha256="0jxm3h2sjc83klxdry5r1wgliadk6967cmiifycfpz282vpfxx7v"; depends=[lava numDeriv survival]; }; timesboot = derive2 { name="timesboot"; version="1.0"; sha256="1ixmcigi1bf42np93md8d3w464papg9hp85v0c3hg3vl4nsm2bji"; depends=[boot]; }; timeseriesdb = derive2 { name="timeseriesdb"; version="0.4.1"; sha256="1ghb3lg63fs9zx34l5qczv39mdccnmqzlc74l1zhb8qmsg8sm1g2"; depends=[data_table DBI jsonlite openxlsx RPostgreSQL shiny xtable xts zoo]; }; - timetk = derive2 { name="timetk"; version="0.1.2"; sha256="0dp7pjydqcdi2nn4q73nqr4i4d9n4md9vb5y3znrlf1m8m9m4k4a"; depends=[dplyr lazyeval lubridate padr purrr readr stringi tibble tidyr xts zoo]; }; + timetk = derive2 { name="timetk"; version="0.1.3"; sha256="0p9vprknxwh5w3119dwvzl3hvckf4s3kag7gf3cyj685yv0m355c"; depends=[dplyr lazyeval lubridate padr purrr readr recipes rlang stringi tibble tidyr xts zoo]; }; timetools = derive2 { name="timetools"; version="1.14"; sha256="13jchgd9fc8hxj74wm1kg4rwcng4yxblkq04i33djsqghgb5f9mj"; depends=[]; }; timetree = derive2 { name="timetree"; version="1.0"; sha256="1fpdp6mkwm67svqvkfflvqxn52y2041zl09rxrms28ybbd5f84c0"; depends=[phangorn XML]; }; timevis = derive2 { name="timevis"; version="0.5"; sha256="1psmnl6pkbizi2kjpaz9w32z2dkxlh4r229mfxsfqnjvf9sc34kj"; depends=[htmltools htmlwidgets jsonlite lubridate magrittr rmarkdown shiny]; }; @@ -14560,15 +14721,14 @@ in with self; { 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.2"; sha256="0afqlyi6d72x30pzzvmznz1l5pq4n30qiqa9ncbf0wjvqji7a182"; depends=[htmltools knitr rmarkdown]; }; - tinter = derive2 { name="tinter"; version="0.0.1"; sha256="1zw5a79mryqighf8b6gidsi30001749sllpwqwbck26cyal6m8y6"; depends=[checkr]; }; tinyProject = derive2 { name="tinyProject"; version="0.6.1"; sha256="0cflnfp5mib3j1y3n5yvi867h5a7z6xr6163gq9y9b6nrl2skxfk"; depends=[brew R_utils]; }; tinytest = derive2 { name="tinytest"; version="1.1.0"; sha256="1y3f0x56xagf9m5wr2b26qahww13p8i2s66yr51xy9pqxdyjh2yl"; depends=[]; }; - tinytex = derive2 { name="tinytex"; version="0.19"; sha256="0jlcrvcqcbkimg7w40z5vhlnakb829vfgqpspm3pfl8karwzgqp6"; depends=[xfun]; }; + tinytex = derive2 { name="tinytex"; version="0.21"; sha256="088zzc2v0izbcs45p19v547pi78vkr08ibpvvi1g9bkbya4x3mq9"; 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]; }; tipr = derive2 { name="tipr"; version="0.1.1"; sha256="138xmkfad0xjrmr9v3ladbwsyknyad27wxcav03n6f72plhxmxb6"; depends=[broom purrr tibble]; }; - tis = derive2 { name="tis"; version="1.37.1"; sha256="0xg0fcavvny4h8c3ivhccvlb81l1pkgfvfj09658l2qvgi1iyxln"; depends=[]; }; + tis = derive2 { name="tis"; version="1.38"; sha256="0mqnvjfncfr8zc5rz1qq8jr1kv63p7sva7fvr3adbs7lgjza0yvm"; depends=[]; }; titan = derive2 { name="titan"; version="1.0-16"; sha256="0x30a877vj99z3fh3cw9762j5ci56964j2466xfbwcywhn9njz5r"; depends=[boot lattice MASS]; }; titanic = derive2 { name="titanic"; version="0.1.0"; sha256="0mdmh0ciwfig00847bmvp50cyvj8pra6q4i4vdg7md19z5rjlx3j"; depends=[]; }; titeIR = derive2 { name="titeIR"; version="0.1.0"; sha256="047vidn3zydbjijwgz6qm2d9j2ny8ng2sv5jzm8zb300y7k2426c"; depends=[Iso]; }; @@ -14579,7 +14739,7 @@ in with self; { tlemix = derive2 { name="tlemix"; version="0.1.3"; sha256="0c4mvdxlhbmyxj070xyipx4c27hwxlb3c5ps65ipm6gi8v8r6spj"; depends=[]; }; tlm = derive2 { name="tlm"; version="0.1.5"; sha256="1iw08pa70nb25fnv64834s5c8vl456a2rcng7x6v9vs5q37610g6"; depends=[boot]; }; tlmec = derive2 { name="tlmec"; version="0.0-2"; sha256="1gak8vxmfjf05bhaj6lych7bm8hgav1x3h14k2ra7236v82rqbw7"; depends=[mvtnorm]; }; - tlrmvnmvt = derive2 { name="tlrmvnmvt"; version="1.0.1"; sha256="18xjzqh9zr5lfmwmcqiq4zn9k7b8q75z76im5qy6av7r2qz1n75m"; depends=[BH Rcpp RcppEigen]; }; + tlrmvnmvt = derive2 { name="tlrmvnmvt"; version="1.1.0"; sha256="0mi1261659qg0ym4nqk0w6gw68wx37fq43s899szyyx08dj46mbb"; depends=[BH Rcpp RcppEigen]; }; tls = derive2 { name="tls"; version="0.1.0"; sha256="183b5m70s2whlgp9s1gb4xnylhlp4hnh3lw6b8f2vx4kahaid763"; depends=[]; }; tm = derive2 { name="tm"; version="0.7-7"; sha256="0pyics8j7a4wkh5gzin46l0qars5vgbb1886xqpdqjs1z0gy9nyh"; depends=[BH NLP Rcpp slam xml2]; }; tm_plugin_alceste = derive2 { name="tm.plugin.alceste"; version="1.1"; sha256="0wid51bbbx01mjfhnaiv50vfyxxmjxw8alb73c1hq9wlsh3x3vjf"; depends=[NLP tm]; }; @@ -14589,9 +14749,9 @@ in with self; { tm_plugin_lexisnexis = derive2 { name="tm.plugin.lexisnexis"; version="1.4.1"; sha256="0c094z83mcq8blc8w7kvy91d28qqcx6f6193p3frpviznlaq21xk"; depends=[ISOcodes NLP tm xml2]; }; tm_plugin_mail = derive2 { name="tm.plugin.mail"; version="0.2-1"; sha256="0rn8jqv622qmc0zkz534ka5qnbca2rlabxm3vjbqplr6fh1ahwb1"; depends=[NLP tm]; }; tm_plugin_webmining = derive2 { name="tm.plugin.webmining"; version="1.3"; sha256="1694jidf01ilyk286q43bjchh1gg2fk33a2cwsf5jxv7jky3gl7h"; depends=[boilerpipeR NLP RCurl RJSONIO tm XML]; }; - tm1r = derive2 { name="tm1r"; version="1.1.3"; sha256="1r1va052aaya70pvvn950833w0q0sbd67yyg3m2qdikgniq3dn6z"; depends=[httr jsonlite]; }; + tm1r = derive2 { name="tm1r"; version="1.1.4"; sha256="165yn07nxywyxdd52g917rmzqyjpv6ai11fhl9g6dj163l4vcn5a"; depends=[httr jsonlite]; }; tmap = derive2 { name="tmap"; version="2.3-2"; sha256="01v4z73xpxpg87daka2vcy1gj170qjg7qdl44vrfjrxib46cn2fa"; depends=[classInt htmltools htmlwidgets leaflet leafsync lwgeom raster RColorBrewer sf tmaptools units viridisLite]; }; - tmaptools = derive2 { name="tmaptools"; version="2.0-2"; sha256="1n8m4c3q7i60p8r2xfhw8rfqmflyaicf8y1bkfkmx74afz6hv184"; depends=[classInt dichromat KernSmooth lwgeom magrittr raster RColorBrewer rgdal rgeos sf sp units viridisLite XML]; }; + tmaptools = derive2 { name="tmaptools"; version="3.0"; sha256="0d36rv9275m32rqx259azqg55f1vpjihydhhic2bh4sjwxrbp58i"; depends=[classInt dichromat KernSmooth lwgeom magrittr raster RColorBrewer sf stars units viridisLite XML]; }; tmbstan = derive2 { name="tmbstan"; version="1.0.2"; sha256="1g4b415k36wij028xz15kwpv8hmx92kznsp231bnrprzw2vrninr"; depends=[BH Rcpp RcppEigen rstan StanHeaders TMB]; }; tmcn = derive2 { name="tmcn"; version="0.2-13"; sha256="0rf8mz6kdm83pm85kzfyzb8kd3iwaxv5bgphjpxlnq6z32m9yds7"; depends=[]; }; tmg = derive2 { name="tmg"; version="0.3"; sha256="0yqavibinzsdh85izzsx8b3bb9l36vzkp5a3bdwdbh410s62j68a"; depends=[Rcpp RcppEigen]; }; @@ -14603,16 +14763,15 @@ in with self; { 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]; }; - tnam = derive2 { name="tnam"; version="1.6.5"; sha256="0jbwnsnn6875yprmh6y2i0bvr875hfsg7wfsj6ydmjpr5cpqqk56"; depends=[igraph lme4 network Rcpp sna vegan xergm_common]; }; - tnet = derive2 { name="tnet"; version="3.0.14.1"; sha256="1fvczx1lc8a7w4mbg1yzsiayfg5qwyjvg02s4r631vcml6vkznsf"; depends=[igraph survival]; }; + tnet = derive2 { name="tnet"; version="3.0.16"; sha256="0922y9zb64zazl2irwfxxbghkgcwi2q57gylpiaxgmj4q6lc62l9"; depends=[igraph survival]; }; toOrdinal = derive2 { name="toOrdinal"; version="1.1-0.0"; sha256="0zg4zk7jx8s57g8nb0jw7r7gss00349jmkglf6sz26p7jldpgmff"; depends=[crayon testthat]; }; - todor = derive2 { name="todor"; version="0.0.5"; sha256="1zv6bky5v14csq3pmyy7qzmy680pg3qrj1zghqixsf54aqm7h96q"; depends=[rex rstudioapi stringr]; }; + todor = derive2 { name="todor"; version="0.1.0"; sha256="0xgw2mz0b96adycwfyga17r5s9k47q5bgvnsxmqm4h6mx7d1fzzx"; depends=[rex rstudioapi stringr]; }; togglr = derive2 { name="togglr"; version="0.1.33"; sha256="105c9vxa67bqccj31ksk5myfd0v7v0wbz6qqjhxqndlg7v6ggfzc"; depends=[assertthat dplyr getPass glue httr jsonlite keyring lubridate magrittr parsedate prettyunits purrr rstudioapi]; }; - tokenbrowser = derive2 { name="tokenbrowser"; version="0.1.1"; sha256="0sslli1m4lrg8bf5rzjndvf9hsw3c6mqwj8cp27mgn8ibxckrjd2"; depends=[Rcpp stringi]; }; + tokenbrowser = derive2 { name="tokenbrowser"; version="0.1.4"; sha256="09bhwqqw2nr5c985ml8d6ik19r8jvxcj1l7v4xhb3y6n9k6dqxwr"; depends=[Rcpp stringi]; }; tokenizers = derive2 { name="tokenizers"; version="0.2.1"; sha256="006xf1vdrmp9skhpss9ldhmk4cwqk512cjp1pxm2gxfybpf7qq98"; depends=[Rcpp SnowballC stringi]; }; tokenizers_bpe = derive2 { name="tokenizers.bpe"; version="0.1.0"; sha256="1pwgjrzdcsafpv9rlyly6fckcjiymz0xcjm9byavj069kc4c69mi"; depends=[Rcpp]; }; tolBasis = derive2 { name="tolBasis"; version="1.0"; sha256="0g4jdwklx92dffrz38kpm1sjzmvhdqzv6mj6hslsjii6sawiyibh"; depends=[lubridate polynom]; }; - tolerance = derive2 { name="tolerance"; version="1.3.0"; sha256="17qh4ad1f3fbcpwlxxqh8qr9bnwjcl4yxk0l3fkbr6b2l4rc5p86"; depends=[rgl]; }; + tolerance = derive2 { name="tolerance"; version="2.0.0"; sha256="001snzr2ipag3zprynydlbi9prkjzrllc054qh7m0qwkb3r19jjd"; depends=[MASS rgl]; }; toolmaRk = derive2 { name="toolmaRk"; version="0.0.1"; sha256="0pdr8lq4c11ia03v68lbfq38p3qp770mbj0nsbjsgbqi0pv9i1vx"; depends=[dplyr ggplot2 plyr reshape2]; }; tools4uplift = derive2 { name="tools4uplift"; version="0.1-1"; sha256="0difrjqgj8amc49mwh059ca9mr0z1fzy0g43vk43alsyl8lvajc4"; depends=[dplyr glmnet]; }; topicdoc = derive2 { name="topicdoc"; version="0.1.0"; sha256="0qliy6y8l09nblch1swlywam2awzwjl5xx0w8c3kiz48jxfysw0j"; depends=[slam topicmodels]; }; @@ -14621,8 +14780,8 @@ in with self; { topoDistance = derive2 { name="topoDistance"; version="1.0.1"; sha256="055z3gvqlb8nyy58ix89w7miav9gj3h43a4wcfc3kagd97xc3222"; depends=[gdistance igraph plotly raster RColorBrewer scales sp]; }; topologyGSA = derive2 { name="topologyGSA"; version="1.4.6"; sha256="0vas7qab5a86jb277ql63qjvfvx7iqqbcrwky7iyr0s8p8p794ia"; depends=[fields graph gRbase qpgraph]; }; 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-4"; sha256="1c7x89b2vh2xl5bc1xgclmnk2gajqalxmz4ipqlwp9axz91w85gs"; depends=[data_table htmltools lda lubridate quanteda RColorBrewer stringr tm WikipediR]; }; + tor = derive2 { name="tor"; version="1.1.2"; sha256="1s34hzw3a4cm9gk85fcxgxwmn2xc7njs1iw1snd91id3gdl6vppx"; depends=[fs readr rlang tibble]; }; + tosca = derive2 { name="tosca"; version="0.2-0"; sha256="0sq6libv2vi5q3738fksjxabfhv63zc7nldgb4nh6k57yxqzwf3z"; depends=[data_table htmltools lda lubridate quanteda RColorBrewer stringr tm WikipediR]; }; tosls = derive2 { name="tosls"; version="1.0"; sha256="03nqwahap504yvcksvxdhykplbzmf5wdwgpzm7svn8bymdc472v2"; depends=[Formula]; }; totalcensus = derive2 { name="totalcensus"; version="0.6.3"; sha256="0489bzc8y4zgs4rpd52xbc2hm7g0y46j40f5bmqp5h56aq259jsa"; depends=[data_table magrittr purrr stringr]; }; touch = derive2 { name="touch"; version="0.1-5"; sha256="0dan4mlvc5lg9v4zj9w6gk3c4cy64kaa984y495xpc1bzmv5c6jd"; depends=[Rcpp]; }; @@ -14637,37 +14796,38 @@ in with self; { tracerer = derive2 { name="tracerer"; version="2.0.2"; sha256="0xh95qrd63s04zs69fcrmvwscn153qlpw2xlkzn8h6jwsd92amv9"; 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.5.1"; sha256="06vhgm5sqafx90isfxq71gz82zznyjvl63rqyg5rx22syqsh4mbi"; depends=[MASS neuralnet png raster Rcpp RcppArmadillo shiny]; }; + trackdem = derive2 { name="trackdem"; version="0.5.2"; sha256="1kax2fr252rd0pqdf7ndgl8pb492fs1scn8xyasxxjdnlghdkk0d"; depends=[MASS neuralnet png raster Rcpp RcppArmadillo shiny]; }; trackdf = derive2 { name="trackdf"; version="0.2.1"; sha256="18kiwbrfalj19gjp2v3yhxlmc6liw5scfnwx2svq5f5h3h54a7iz"; depends=[data_table lubridate rgdal sp tibble]; }; trackeR = derive2 { name="trackeR"; version="1.5.2"; sha256="1f3giz6naxxyicgy9v0391ang43srwhy9zbiv4zmlc8i9v05b57i"; depends=[fda foreach ggmap ggplot2 ggridges gridExtra gtable jsonlite leaflet raster RSQLite scam sp xml2 zoo]; }; trackeRapp = derive2 { name="trackeRapp"; version="1.0"; sha256="05r012kcf86j45q00y6ynz9srd0by45w41bpx9mf7q4h8m5nm0jn"; depends=[changepoint colorspace DT foreach mapdeck mgcv plotly sf shiny shinydashboard shinyjs shinyWidgets trackeR V8 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]; }; + trackr = derive2 { name="trackr"; version="0.10.6"; sha256="0p7i4cj5z1qis2a1mqqz3wrgwhhbcggyyfwj3zycm3xcig9f6d9b"; depends=[CodeDepends fastdigest ggplot2 gridGraphics histry htmltools lattice miniUI RJSONIO rlang rmarkdown roprov rsolr shiny]; }; tractor_base = derive2 { name="tractor.base"; version="3.3.2"; sha256="0y5gm0y4chl30f5qqq8qiiw4j8g32s4i9xrvyp3cwg902kf2p86i"; depends=[ore reportr RNifti shades]; }; - trade = derive2 { name="trade"; version="0.5.4"; sha256="05skmm2j826wjhmxdvkln50y0mjy74qcl2hay2l1322qqs7phin6"; depends=[antitrust]; }; - tradestatistics = derive2 { name="tradestatistics"; version="0.2.7"; sha256="1pl8qrzf4dx1pcyrhf2rzp5wrfdgv6azlpi83wy5w078ckm2hly3"; depends=[crul dplyr jsonlite magrittr purrr rlang stringr]; }; + tradestatistics = derive2 { name="tradestatistics"; version="1.0"; sha256="09zbgf971gb1m5d1jfwkdrj78ckj3gq5i03p9wfxbljb7rqby6la"; depends=[crul data_table digest jsonlite memoise]; }; trafo = derive2 { name="trafo"; version="1.0.1"; sha256="0gq3snjpkw0ncny7pkfi686qkgdhd8id73jxjk3chhqf5mzrrsbc"; depends=[FNN lmtest moments pryr]; }; traineR = derive2 { name="traineR"; version="1.0.0"; sha256="0m0k9hxdpx8dzxdy8i0k2rqmibm78fkw8fykkm5r56g7zjh3b7g0"; depends=[ada dplyr dummies e1071 kknn neuralnet nnet randomForest rpart stringr xgboost]; }; traipse = derive2 { name="traipse"; version="0.1.0"; sha256="0174rxc3p3s848s9ynkkw32f33dq9gnq7zd14i3b9xnp8zr9jnph"; depends=[geodist geosphere magrittr]; }; - traitdataform = derive2 { name="traitdataform"; version="0.5.6"; sha256="0wp3z9l9vpniaa2b53qq6a77ya0my9cvkqd8i831zsxyj63vaabl"; depends=[data_table getPass plyr RCurl reshape2 taxize units XML]; }; + traitdataform = derive2 { name="traitdataform"; version="0.5.7"; sha256="1h01hkxx3xz1kaliq3arx8hb82k9jx19s755y6xbyji6jp6hwy3h"; depends=[data_table getPass plyr RCurl reshape2 taxize units XML]; }; traitr = derive2 { name="traitr"; version="0.14"; sha256="1pkc8wcq55229wkwb54hg9ndbhlxziv51n8880z6yq73zac1hbmf"; depends=[digest gWidgets proto]; }; traits = derive2 { name="traits"; version="0.4.2"; sha256="1aiy7mdwji72rrmf8gwmnpkhfbqbqbblffxghniw5pfpv55j6mib"; depends=[crul data_table hoardr httr jsonlite readr rvest taxize tibble xml2]; }; traj = derive2 { name="traj"; version="1.2"; sha256="0mq6xdbxjqjivxyy7cwaghwmnmb5pccrah44nmalssc6qfrgys4n"; depends=[cluster GPArotation NbClust pastecs psych]; }; trajectories = derive2 { name="trajectories"; version="0.2-1"; sha256="0sw1gcwmz2d27ck8gm5xa9bmmpgpy483brdyi74wccchwb3nfw2m"; depends=[lattice sp spacetime zoo]; }; trajr = derive2 { name="trajr"; version="1.3.0"; sha256="1p092kqvwg3ncbk9hh8dij2grl1hfs3j5j64cqn227nr5b3xn1rc"; depends=[plotrix signal]; }; tram = derive2 { name="tram"; version="0.3-2"; sha256="043j8f2vhbm4alr47bv0ghv4358ckvd74hnlq8516b6is3ll1h72"; depends=[basefun Formula Matrix mlt multcomp sandwich survival variables]; }; + tramME = derive2 { name="tramME"; version="0.0.1"; sha256="1xsh6cm79bzxi2pw3ba5iwdr9077nssz485rpi5x451855pvbjll"; depends=[alabama basefun lme4 Matrix mlt nlme RcppEigen TMB tram variables]; }; + tramnet = derive2 { name="tramnet"; version="0.0-2"; sha256="0q57cs9y0ssks7c9bbnhkvndl1yz6bsrpmcmml1nlvq2gs9rv9wg"; depends=[basefun CVXR lhs mlr mlrMBO mlt ParamHelpers sandwich smoof tram]; }; tranSurv = derive2 { name="tranSurv"; version="1.2.0"; sha256="0r698s2yg7ypyzid52a46p0bhl3xi4rh50bfnx0pacc65rigjr6f"; depends=[SQUAREM survival]; }; transcribeR = derive2 { name="transcribeR"; version="0.0.0"; sha256="0y2kxg2da71i962fhsjxsr2ic3b31fmffhj3gg97b0nykfpcviib"; depends=[httr]; }; transformr = derive2 { name="transformr"; version="0.1.1"; sha256="186n789zzf2p9ggw9j7gmd4knfq051jhl35x1585jgll2karyn2c"; depends=[lpSolve Rcpp rlang sf tweenr]; }; translate = derive2 { name="translate"; version="0.1.2"; sha256="1w0xrg1xxwfdanlammmixf06hwq700ssbjlc3cfigl50p87dbc5x"; depends=[functional lisp RCurl RJSONIO]; }; translateR = derive2 { name="translateR"; version="1.0"; sha256="11kh9hjpsj5rfmzybnh345n1gzb0pdksrjp04nzlv948yc0mg5gm"; depends=[httr RCurl RJSONIO textcat]; }; translation_ko = derive2 { name="translation.ko"; version="0.0.1.5.2"; sha256="1w5xibg4znhd39f3i0vsqckp6iia43nblqxnzgj0ny6s7zmdq1wd"; depends=[]; }; - transplantr = derive2 { name="transplantr"; version="0.1.0"; sha256="0gzx4xmps1n8363q1y34gjgh48rnzh2ww19d6qg7q12mli2biz92"; depends=[]; }; - transport = derive2 { name="transport"; version="0.12-1"; sha256="04ds3i372ri0w3qy1nn6gjrhip89978zbpvi9c5dlsbh8wwk583l"; depends=[data_table Rcpp RcppEigen]; }; + transplantr = derive2 { name="transplantr"; version="0.2.0"; sha256="1kzi8rvswsmibxqnhqd1j42y848si6cxd8hpvwi55y8s4hcylw0y"; depends=[]; }; + transport = derive2 { name="transport"; version="0.12-2"; sha256="1d49gm5lwih7b7rav3c42brcp6xi3y55xw11r9n8illjwjayfcxd"; depends=[data_table Rcpp RcppEigen]; }; trapezoid = derive2 { name="trapezoid"; version="2.0-0"; sha256="0f6rwmnn61bj97xxdgbydi94jizv1dbq0qycl60jb4dsxvif8l3n"; depends=[]; }; trawl = derive2 { name="trawl"; version="0.2.1"; sha256="1ns4nk8zdnl2z9clc2q38sbb1ijkj86lcifxq7d111mcwsmpb6fi"; depends=[DEoptim MASS rootSolve Runuran squash TSA]; }; tree = derive2 { name="tree"; version="1.0-40"; sha256="1rr6ws62j9h36f3nl713f8h3ndkh95mv46l055jvgmby5lw1dazz"; depends=[]; }; tree_bins = derive2 { name="tree.bins"; version="0.1.1"; sha256="1flrkhdqimsn8dxn97xzl1fykx916i1dis1bfany44yk0cjmd85g"; depends=[data_table dplyr rpart rpart_utils]; }; - tree_interpreter = derive2 { name="tree.interpreter"; version="0.1.0"; sha256="17yci49zsz05ydjzs0zbz8xg2vdjmh8xq6cfxchrq488kvjyjzsz"; depends=[Rcpp RcppArmadillo]; }; + tree_interpreter = derive2 { name="tree.interpreter"; version="0.1.1"; sha256="18p1x53q1hhhagglgsq2axnr9l5rpa08vxjayqqmb6rsjrkygn78"; depends=[Rcpp RcppArmadillo]; }; treeClust = derive2 { name="treeClust"; version="1.1-7"; sha256="1s7kh6q0bkixsygrip95zf1bi10ihddsa5lq9dfxd68yh8rsby6z"; depends=[cluster rpart]; }; treeDA = derive2 { name="treeDA"; version="0.0.4"; sha256="0zhzb21lvxk278ysl275g39y2r8dlgqdix5rfg2pwv3nzj2531rc"; depends=[ggplot2 gtable Matrix mvtnorm phyloseq reshape2 sparseLDA]; }; treeHMM = derive2 { name="treeHMM"; version="0.1.1"; sha256="1chg1y26x4nm2wm2nsqw51lx2w8b89wdq8ywh1l03xhw8lgdsv47"; depends=[future gtools Matrix matrixStats PRROC]; }; @@ -14675,25 +14835,25 @@ in with self; { 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.5.0"; sha256="007rdrbv3v1z3qbyasla22rck105sqlqh93yfmxklihdydl7smfd"; depends=[ape limSolve]; }; + treefit = derive2 { name="treefit"; version="1.0.0"; sha256="10yf4bm26vgiy3ra0c5lpflp0xdijw9zwl4aq9bz89qhszzji1fa"; depends=[ggplot2 igraph patchwork pracma]; }; treelet = derive2 { name="treelet"; version="1.1"; sha256="0k3qhxjg7ws6jfhcvvv9jmy26v2wzi4ghnxnwpjm8nh7b90lbysd"; depends=[]; }; - treeman = derive2 { name="treeman"; version="1.1.3"; sha256="0xvazizpi3dbdgjd48ff4kg4dhsi2yzbnkk43pgyi21zii673yyn"; depends=[ape bigmemory plyr RJSONIO stringr]; }; treemap = derive2 { name="treemap"; version="2.4-2"; sha256="15bdgkdwryb55v82b3hpcx4ykfg5z7zf10h0wwknf6kl1kn34v90"; depends=[colorspace data_table ggplot2 gridBase igraph RColorBrewer shiny]; }; treemapify = derive2 { name="treemapify"; version="2.5.3"; sha256="1y6fyzxk542fp4h975xfgajz7cjym3rjs6asal9arv94a9cqra33"; depends=[ggfittext ggplot2]; }; - treenomial = derive2 { name="treenomial"; version="1.1.1"; sha256="13dsls2x3nlsdqs8whr7yq8gkacw3rzrvcbj47vkwqcpbgk2xwi8"; depends=[ape Rcpp RcppArmadillo RcppThread]; }; + treenomial = derive2 { name="treenomial"; version="1.1.2"; sha256="0nn5vd23nxfpk8wm68m6sxnx495nb6bkgx2w9lgjy4s66sbnddp0"; depends=[ape Rcpp RcppArmadillo RcppThread]; }; treeperm = derive2 { name="treeperm"; version="1.6"; sha256="0mz7p9khrsq4dbkijymfvlwr01y4fvs0x6si4x5xid16s2zsnmm4"; depends=[]; }; treeplyr = derive2 { name="treeplyr"; version="0.1.7"; sha256="11y15dslalwifarz79zyc5vxszyajkjyzm98p0w1n8gfr6lrq9yy"; depends=[ape dplyr geiger lazyeval phytools Rcpp]; }; treespace = derive2 { name="treespace"; version="1.1.3.2"; sha256="18xqvqpcknvwdvl84jskcwmsw3alcwns0d35a8paalwjkix03175"; depends=[ade4 adegenet adegraphics adephylo ape combinat distory fields htmlwidgets MASS phangorn phytools Rcpp rgl RLumShiny scatterD3 shiny shinyBS]; }; treestartr = derive2 { name="treestartr"; version="0.1.0"; sha256="05rxy9lmb77ng4266871sd881mlp4rd5qalvsd7ps2x2j4plaqf4"; depends=[ape phytools]; }; - treethresh = derive2 { name="treethresh"; version="0.1-11"; sha256="1fksyn9mycr6dpw1yh5b3fa7fk7ndz7q39174daplm55jbrz1dr5"; depends=[EbayesThresh wavethresh]; }; + treestructure = derive2 { name="treestructure"; version="0.1.0"; sha256="0514q53bdwv9fwd58srhr6lzw1j56fcd64hml8w4rv4wzcd6c01m"; depends=[ape Rcpp]; }; trekcolors = derive2 { name="trekcolors"; version="0.1.1"; sha256="1fw2wgkkky79vy9sc3cn42vmfcdnsjsnhb81wvalwi6ww64fzrkh"; depends=[ggplot2]; }; trekfont = derive2 { name="trekfont"; version="0.9.3"; sha256="15p1r5q36fbajhwidjhhvvldckvz5js08w4cnj47gqr4lpmmpbx7"; depends=[]; }; - trelliscopejs = derive2 { name="trelliscopejs"; version="0.1.18"; sha256="1i13l3a74cxppkffzbpnyh2faqdwj3gy55s4s0fck1fwpvlkn5zr"; depends=[autocogs base64enc digest DistributionUtils dplyr ggplot2 gtable htmltools htmlwidgets jsonlite knitr progress purrr rlang tidyr webshot]; }; + trelliscopejs = derive2 { name="trelliscopejs"; version="0.2.4"; sha256="0dx4r31v1611yimqx9jh5ikrrk6ipz6dpqci7wxy3lbrcdsz0acq"; depends=[autocogs base64enc digest DistributionUtils dplyr ggplot2 gtable htmltools htmlwidgets jsonlite knitr progress purrr rlang tidyr webshot]; }; trelloR = derive2 { name="trelloR"; version="0.1.0"; sha256="0d549yw9pfxs8a3q716z08fzg68bkm5l09cv5iqqkm4gyasrxsf4"; depends=[dplyr httr jsonlite]; }; trend = derive2 { name="trend"; version="1.1.2"; sha256="09b6ycyfgs4xlhx6kn6qm5rl2acp58hzhv8qclzn3kb1wjjyvxy5"; depends=[extraDistr]; }; trendchange = derive2 { name="trendchange"; version="1.1"; sha256="19r0kmwsim78ynssyh6j0zd99cz96cacy3hmyrjabwwvz0f8sk3h"; depends=[]; }; trendsegmentR = derive2 { name="trendsegmentR"; version="1.0.0"; sha256="0zgm5nbm5azmz6x0xg4aphc80q6x1cvijry9pznyi0mg14743g86"; depends=[]; }; trendyy = derive2 { name="trendyy"; version="0.1.1"; sha256="03n7qdfc197hds8bdwl20b0nn62nqnz9r35v1q315nm3ccdifl1p"; depends=[crayon dplyr gtrendsR magrittr purrr stringr tibble]; }; - trialr = derive2 { name="trialr"; version="0.1.3"; sha256="15330qsihq71x78pxv2k6pb1xfhp5qgdq0p4jibcjn1q114rp2ph"; depends=[BH binom coda dplyr ggplot2 gtools magrittr MASS purrr Rcpp RcppEigen rlang rstan rstantools StanHeaders stringr tibble tidybayes tidyr]; }; + trialr = derive2 { name="trialr"; version="0.1.4"; sha256="1gd438j0r2x15xl8nbszz7kms20zw9s8j9nl1xf0vgkqwfcblkvg"; depends=[BH binom coda dplyr ggplot2 gtools magrittr MASS purrr Rcpp RcppEigen rlang rstan rstantools StanHeaders stringr tibble tidybayes tidyr]; }; triangle = derive2 { name="triangle"; version="0.12"; sha256="1cv3l97myhkyl0c4xjympqghlk0av8xfk00av8kj93ndgkv5bfj7"; depends=[]; }; triangulation = derive2 { name="triangulation"; version="0.5.0"; sha256="1zp09g0s0qpqgz2k6jx32pswh2zqyyd0b62lf1dx1p46m28dafkn"; depends=[]; }; tribe = derive2 { name="tribe"; version="0.1.8"; sha256="01z1b9k3j4xi5fp9pkpr991yr7x8vk8vysipy7iwdmdr7xg4w4p0"; depends=[dplyr lazyeval magrittr rlang rstudioapi]; }; @@ -14701,14 +14861,14 @@ in with self; { triebeard = derive2 { name="triebeard"; version="0.3.0"; sha256="1hqyz57gph02c9fdc07lxz113bbklif3g18sw8jan6pakhhdc7dz"; depends=[Rcpp]; }; trigpoints = derive2 { name="trigpoints"; version="1.0.0"; sha256="1hckjh2gb0fvd2c8x6mj0idpk3im7b831y7mbli1hqhry6qqdw15"; depends=[sf tibble]; }; trimTrees = derive2 { name="trimTrees"; version="1.2"; sha256="0v75xf5186dy76332x4w7vdwcz7zpqga8mxrb5all2miq2v45fi8"; depends=[mlbench randomForest]; }; - trimcluster = derive2 { name="trimcluster"; version="0.1-2.1"; sha256="0013bpyq6mkvjn38qsmwnsxfiwxgwngnqxycxvgpgmiadhm8fjmn"; depends=[]; }; + trimcluster = derive2 { name="trimcluster"; version="0.1-5"; sha256="12siv8yx8dcavsz8jk96lwscbj257ar8jpaxksl2zb06987g4fcj"; depends=[]; }; trimmer = derive2 { name="trimmer"; version="0.8.1"; sha256="0hn5pignj5clg7wb3xd0mh9jqc480wqxxymzaas68lxzi6p5mng9"; depends=[cli crayon data_table pryr]; }; trimr = derive2 { name="trimr"; version="1.0.1"; sha256="0gcn18nwxmax9c35is0nldyh74cw8rg3gj60cixzs9qjnpb9xx3d"; depends=[]; }; trinROC = derive2 { name="trinROC"; version="0.4"; sha256="02civ3r14hr6gbw6bdh77y00kiki6cdcv85hxk5g6n2nfspdr67r"; depends=[ggplot2 gridExtra rgl]; }; trioGxE = derive2 { name="trioGxE"; version="0.1-1"; sha256="1ra86l3i7fhb6nsy8izixyvm6z23shv7fcjmnnpil54995j15ax4"; depends=[gtools mgcv msm]; }; trip = derive2 { name="trip"; version="1.6.0"; sha256="089wwdbf3mqz2gxskr9pwi124qbmjf6s9gq7vfrjyhcbp4xx8hwp"; depends=[geodist glue maptools MASS raster sp spatstat viridis]; }; tripEstimation = derive2 { name="tripEstimation"; version="0.0-44"; sha256="1ylpyzlqr6l5haxq4icnlxw6vgvc2lsfz5sm2wqqm4m6h3p0i6s6"; depends=[lattice mgcv rgdal sp zoo]; }; - tripack = derive2 { name="tripack"; version="1.3-8"; sha256="0pf707z6xysxvcs508nadga3mglpvmfk6r061qda8acn58ll1cvb"; depends=[]; }; + tripack = derive2 { name="tripack"; version="1.3-9"; sha256="044cda8vg1mz9zlkhlxxz258qwmlr912zyrndbl14jw94c66fh1b"; depends=[]; }; tripsAndDipR = derive2 { name="tripsAndDipR"; version="0.1.0"; sha256="1gm96fxgql9y08w177nyxw0bahyafcs75maz743a9hfb0gjixvy2"; depends=[]; }; triversity = derive2 { name="triversity"; version="1.0"; sha256="1bar2bpy8jvj91jmzzdwy6rlvirsbxrzqnx4r825irqhc69gc53r"; depends=[data_tree Matrix]; }; tropAlgebra = derive2 { name="tropAlgebra"; version="0.1.1"; sha256="1idvhxhw2f6z8iq0nfdj6jmzy8913vid84rvln6rx2dkzw3s9wnl"; depends=[]; }; @@ -14728,17 +14888,17 @@ in with self; { trustedtimestamping = derive2 { name="trustedtimestamping"; version="0.2.6"; sha256="1rx7ypy331mq5ni5hxhqcfnicvwdgg9j2pm3aj097a5hhigibdrq"; depends=[digest httr jsonlite]; }; tryCatchLog = derive2 { name="tryCatchLog"; version="1.1.6"; sha256="0ik2y2ac771z9r0wb4av2xhr3xv36n4wcv8cqx0vid3wcmbl6prc"; depends=[]; }; tsBSS = derive2 { name="tsBSS"; version="0.5.5"; sha256="19i9raw3wiig66a84msqqwwxd9br4ayk108v7d9j78d0ynm6ki84"; depends=[boot forecast ICtest JADE Rcpp RcppArmadillo xts zoo]; }; - tsDyn = derive2 { name="tsDyn"; version="10-1.1"; sha256="1d79kjb63z63yddjmb2gs8ngjr3pdvrgla8pzdq9p06q041yvkhj"; depends=[foreach forecast MASS Matrix mgcv mnormt nnet tseries tseriesChaos urca vars]; }; + tsDyn = derive2 { name="tsDyn"; version="10-1.2"; sha256="0wwp18qaxljdy1zqww1qw9fa9ycvgwcf6j52cpx3v2f2177x7snc"; depends=[foreach forecast MASS Matrix mgcv mnormt nnet tseries tseriesChaos urca vars]; }; tsModel = derive2 { name="tsModel"; version="0.6"; sha256="0mkmhzj4g38ngzfcfx0zsiqpxs2qpw82kgmm1b8gl671s4rz00zs"; depends=[]; }; tsPI = derive2 { name="tsPI"; version="1.0.3"; sha256="00p7275iq8qn6c6dpqjr5s9fzc0a6njqqi9gvqnh5s9lfx9mbk1v"; depends=[KFAS]; }; tsSelect = derive2 { name="tsSelect"; version="0.1.8"; sha256="0ysijzhhwaj5n7h50jacshnla6d0h61q0f6lj19ic0lwvlz4yazy"; depends=[forecast]; }; tsallisqexp = derive2 { name="tsallisqexp"; version="0.9-3"; sha256="0mzqplsj2w4a7jnav43afyk8ymy6p444j7km6kc8c2g4aifpgxcb"; depends=[]; }; + tsapp = derive2 { name="tsapp"; version="1.0.0"; sha256="0dakmzm65y6w3idfynnigcmyw0n28scfgklmmg7lg8ycsxh0x76l"; depends=[fftwtools Matrix vars]; }; tsbox = derive2 { name="tsbox"; version="0.2.0"; sha256="0kyw276qi20801ps3kd61k1s4vs0znsyzzy8mwjq312cbjisg6mc"; 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]; }; + tscount = derive2 { name="tscount"; version="1.4.2"; sha256="15lvrglv4lq17g425s9lkcb3f04bk0322yl32648ysf7gp7lmdx5"; depends=[ltsa]; }; tsdb = derive2 { name="tsdb"; version="0.7-1"; sha256="0ngy897fmf48c7k54zq8lx2fyv45c0kzn3bxm5054ay2lkv02idz"; depends=[datetimeutils fastmatch zoo]; }; tsdecomp = derive2 { name="tsdecomp"; version="0.2"; sha256="1wy37gjp49dr60s4zhwv19iv3mzr1fjz5yilqmqgy78j5d45ns15"; depends=[]; }; - tsdf = derive2 { name="tsdf"; version="1.1-7"; sha256="1c6fmvbpwvzy654c7hs56nxdp27wy9vyb521rdw33mgxvnyjbjqn"; depends=[]; }; tsdisagg2 = derive2 { name="tsdisagg2"; version="0.1.0"; sha256="1vjypf9d4rdprpgxfsgpccn412kvar59v341ridq2hcdp7hfb70s"; depends=[]; }; tseries = derive2 { name="tseries"; version="0.10-47"; sha256="0yzvc9djp3angvxdxqi60wi726y76ablsb71q88ycvw0avgpf8r0"; depends=[quadprog quantmod zoo]; }; tseriesChaos = derive2 { name="tseriesChaos"; version="0.1-13.1"; sha256="0qfrrzd0h8n9zp7wj5fl88wkiv22fs5zy8x509g316j0avm5zjr3"; depends=[deSolve]; }; @@ -14749,17 +14909,18 @@ in with self; { tsfknn = derive2 { name="tsfknn"; version="0.3.0"; sha256="0h44s8bvnd68nhl0rbwvs0sycsjlmpnni0nr2169429a9y3f91f1"; depends=[ggplot2]; }; tsgui = derive2 { name="tsgui"; version="0.0.3"; sha256="16cx68gq2f63wx7mhbv0aq6pr71wfbc035kjbjjsfrbagaq4ib13"; depends=[RandomFieldsUtils tcltk2 tkrplot]; }; tsiR = derive2 { name="tsiR"; version="0.4.2"; sha256="1yc9kcyj8yg7zsdkqsxkr7czv3i5gf2146z5h89qfqifrrzmjifa"; depends=[ggplot2 kernlab reshape2]; }; - tsibble = derive2 { name="tsibble"; version="0.8.5"; sha256="1xm5zwx0p101gr4qf4yc1p33fhck44ppdk104pcwbhxwbza6mh3y"; depends=[anytime dplyr lifecycle lubridate purrr rlang tibble tidyselect vctrs]; }; + tsibble = derive2 { name="tsibble"; version="0.8.6"; sha256="1vm4rwfflrc87xj6sn8xa0lqdvs1k4hviar0glm9v0dhbk81bbbj"; depends=[anytime dplyr lifecycle lubridate purrr rlang tibble tidyselect vctrs]; }; tsibbledata = derive2 { name="tsibbledata"; version="0.1.0"; sha256="17qvjfkppg1z4pxgax37ikx2x28ib39syps5vhppc1y3yn8441vq"; depends=[tsibble]; }; tsintermittent = derive2 { name="tsintermittent"; version="1.9"; sha256="1mrb6yrsjwj6j40n97sgg42ddvwhjnaiq9k7ka249bbq01gf2975"; depends=[MAPA]; }; - tsmp = derive2 { name="tsmp"; version="0.3.5"; sha256="1gilzxxgaa1qqsk56s7ynlqhz6bssxrpc1h7fxkjp0z9amajvb5h"; depends=[audio doSNOW foreach magrittr progress]; }; + tsmp = derive2 { name="tsmp"; version="0.4.14"; sha256="1ahqdizygbs49xbgn35fdb5drxwyx2z9ima4fm83aqwaan7wrrja"; depends=[audio checkmate doSNOW foreach magrittr progress Rcpp RcppParallel RJSONIO]; }; tsna = derive2 { name="tsna"; version="0.3.1"; sha256="15dx5inmlk05asakjv3jzlycid307xjpy4x2h52phix69ghbb95v"; depends=[network networkDynamic statnet_common]; }; tsne = derive2 { name="tsne"; version="0.1-3"; sha256="0s8cv2pndkddq62rzlgzgfdjp1vjv5hz5i5957sllnb97vbzbzb6"; depends=[]; }; + tsnetwork = derive2 { name="tsnetwork"; version="1.2"; sha256="14rx2idlmsdik17fbzmdkgpj5jyrirga6cklhxflrbk9zjmlii00"; depends=[igraph longitudinal QUIC]; }; tsoutliers = derive2 { name="tsoutliers"; version="0.6-8"; sha256="02qd7ky416yp2l4cfl2yl7ckr2aidkps9cxkk03r9r7c5247c6zh"; depends=[forecast]; }; tspmeta = derive2 { name="tspmeta"; version="1.2"; sha256="028jbbd0pwpbjq4r6jcc1h0p7c4djcb9d2mvgzw1rmpphaxjvrkd"; depends=[BBmisc checkmate fpc ggplot2 MASS splancs stringr TSP vegan]; }; tsqn = derive2 { name="tsqn"; version="1.0.0"; sha256="1iv1wwa6a9824dbgfk5a609szppc3a8j250z74hb8csjvwwx9qq9"; depends=[fracdiff MASS robustbase]; }; tstools = derive2 { name="tstools"; version="0.3.8"; sha256="0daxrp91hxc367hlzla0s7x5dddnx462239jcq0ickx6awkk753g"; depends=[data_table jsonlite xts zoo]; }; - tsutils = derive2 { name="tsutils"; version="0.9.0"; sha256="09xv5iv6icjbj5rhcsspbs8n2rl9k9gml0iizq8rd5a01153zlsm"; depends=[forecast MAPA RColorBrewer]; }; + tsutils = derive2 { name="tsutils"; version="0.9.2"; sha256="0gp8f0a9dn3h4lv38xiw04j832igwhfralzc5vd74r952x7b6hbx"; depends=[forecast MAPA plotrix RColorBrewer]; }; tsviz = derive2 { name="tsviz"; version="0.1.0"; sha256="099ga750kr9hrkd8vaxhz6h4gha6zfr9jzqwrmgms2h2h1a7jxr7"; depends=[dplyr forecast ggplot2 lubridate magrittr miniUI plotly shiny shinyhelper]; }; tsvr = derive2 { name="tsvr"; version="1.0.1"; sha256="1lkb6lj3lsx25d671gb804brbv74isrjbj9pd09q84qp7jgrpgyd"; depends=[]; }; tswge = derive2 { name="tswge"; version="1.0.0"; sha256="0wj0kyb1dcwfn8wjp7skgcflc48cr4va0i0jg8x970658if7z6fz"; depends=[astsa MASS PolynomF signal waveslim]; }; @@ -14770,7 +14931,7 @@ in with self; { ttbbeer = derive2 { name="ttbbeer"; version="1.1.0"; sha256="1azffcizm3460kxvrxxkilc6qxspyi247x8drrw5ywfichwhmdhc"; depends=[]; }; ttdo = derive2 { name="ttdo"; version="0.0.4"; sha256="1hq1s2rsngx496mhrf9pnpvp25805f17pfj7l0dm5g7lmiq24rr8"; depends=[diffobj tinytest]; }; ttestshiny = derive2 { name="ttestshiny"; version="0.1.0"; sha256="186569p9h3597z9lxyzm7fj8k6bzgm2kw757dcv2qhhf2k7nfch9"; depends=[dplyr shiny shinyAce shinyjs]; }; - tth = derive2 { name="tth"; version="4.3-2-1"; sha256="19rvmyprl1nk9mmngk6dax8rnli10msfvm3vzp86pbdjxnsh3hjc"; depends=[]; }; + tth = derive2 { name="tth"; version="4.12-0"; sha256="0bwn8xxswkilv0gagh54fiw90pvjzpz6w6ky4prc3mm070plqf4b"; depends=[]; }; tttplot = derive2 { name="tttplot"; version="1.1.1"; sha256="0rmgp1888y07w0h8kwq1azpr6bysjq4pyjf6ygpra75jj4563wx9"; depends=[]; }; ttutils = derive2 { name="ttutils"; version="1.0-1"; sha256="18mk30070mcplybg320vjbk9v5flxnbqi5gx0yyr1z6ymjmnrxbc"; depends=[]; }; ttwa = derive2 { name="ttwa"; version="0.8.5.1"; sha256="1lhypcwssq0dspizvln3w4dg16ad6mz8cj4w34c5vsrayqid7fyn"; depends=[data_table]; }; @@ -14779,9 +14940,10 @@ in with self; { tuckerR_mmgg = derive2 { name="tuckerR.mmgg"; version="1.5.1"; sha256="0lrylh0np0kbl4xx3gmlvid0g11fh0ad39wdwbz6hrmf5pzsjdjq"; depends=[]; }; tufte = derive2 { name="tufte"; version="0.5"; sha256="0d3imnnrk4yq8la9n8sy2rlq30na8nbhfq2n5cc2k0pc2dg97jvj"; depends=[htmltools knitr rmarkdown xfun]; }; tufterhandout = derive2 { name="tufterhandout"; version="1.2.1"; sha256="04fvvbx69a28nk7i4wz5ynamz1yvsa2ibz542r1xaq1ikk0ywqbw"; depends=[knitr rmarkdown]; }; - tukeytrend = derive2 { name="tukeytrend"; version="0.6"; sha256="0lsxfpkim4fkrm2lrjhn3w55c0p694vbkal3mjqk6vnmnycg9d71"; depends=[lme4 Matrix mgcv multcomp nlme pbkrtest]; }; - tumblR = derive2 { name="tumblR"; version="1.1"; sha256="0gl6q6rff9bp21gvi3bz8kmwbhimxqrv1mmzwshl1ys9r7d4dvps"; depends=[httr RCurl RJSONIO stringr]; }; + tukeytrend = derive2 { name="tukeytrend"; version="0.7"; sha256="15j7g0drb92rpxq7d0jl9h0hxpi9pbgpvfcxaicrcgypxap3721q"; depends=[lme4 Matrix mgcv multcomp nlme pbkrtest]; }; + tumblR = derive2 { name="tumblR"; version="1.2"; sha256="1qili2c9wb6hpjjf7m0gyvdymzls5w4pghjkyi3sbp0q7ayhbh12"; depends=[httr RCurl RJSONIO stringr]; }; tumgr = derive2 { name="tumgr"; version="0.0.4"; sha256="1ylfmrsg177g75l2scjpgw6v4dpz62r7cy89pql9zd5zqy167xqj"; depends=[minpack_lm]; }; + tune = derive2 { name="tune"; version="0.1.0"; sha256="0xiidzkl0hbd0f7jh1v2kkg26wdgy33w74c9bmpjgy317ckhsz8h"; depends=[cli crayon dials dplyr foreach ggplot2 glue GPfit hardhat lifecycle parsnip purrr recipes rlang rsample tibble tidyr workflows yardstick]; }; tuneR = derive2 { name="tuneR"; version="1.3.3"; sha256="0av978m4h2iqazyfq6n2cgkh4wpllihh7s29lah2nb8ngc0w5hxx"; depends=[signal]; }; tuneRanger = derive2 { name="tuneRanger"; version="0.5"; sha256="1xf78q8f7sq6w2jjwcw8vz88bmbp8yivydmqygjag58abnhd0356"; depends=[BBmisc DiceKriging lhs lubridate mlr mlrMBO ParamHelpers ranger smoof]; }; tuple = derive2 { name="tuple"; version="0.4-02"; sha256="0fm8fsdfiwknjpc20ivi5m5b19r9scdxhzij70l8qi3ixw1f0rnk"; depends=[]; }; @@ -14791,12 +14953,12 @@ 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.1"; sha256="056a241m3c1jhf8idly1bm4xja349cg5yzz19l45zyggml82snin"; depends=[Matrix Rcpp RcppArmadillo Rdpack]; }; - tvReg = derive2 { name="tvReg"; version="0.4.2"; sha256="1ma6jiqlj5jlsyk37vcddyv427xi8980cbplb40ppync18f7psmp"; depends=[bvarsv MASS Matrix systemfit vars]; }; + tvReg = derive2 { name="tvReg"; version="0.5.0"; sha256="17vbhny5dr62nwv30s15frdcdhcwk0hq7lwi3prpzyhl02bjhdyg"; depends=[bvarsv MASS Matrix plm systemfit vars]; }; tvd = derive2 { name="tvd"; version="0.1.0"; sha256="07al7gpm81a16q5nppsyc5rhv6zzkcvw72isx955b1q189v073aw"; depends=[Rcpp]; }; tvgeom = derive2 { name="tvgeom"; version="1.0.1"; sha256="1lr2vqgj5jfhzavwd43wcchhbicmf4dqjvyf66rvnjkw3jaig8dm"; depends=[]; }; tvm = derive2 { name="tvm"; version="0.4.0"; sha256="0v5b9s35q08a4z2ccph7g9q211w04x99sh72lrfby43fgl2jwyd1"; depends=[ggplot2 reshape2]; }; tvthemes = derive2 { name="tvthemes"; version="1.1.0"; sha256="0bc9li8vgmm4r6dshm52ll2d69gcynv1xrv8n7jhbyn7xmx3q3kz"; depends=[extrafont ggplot2 glue magick scales]; }; - twang = derive2 { name="twang"; version="1.5"; sha256="1sp1vb6l0mwpy9b9my5d3spc0q0zs7xg4dkmi4cl7hy7m9xy1dbk"; depends=[gbm lattice latticeExtra survey xtable]; }; + twang = derive2 { name="twang"; version="1.6"; sha256="0d190420igm1ai3gv9fjqxw6z1g7zrc4q3yidkn083mj42asxn4v"; depends=[gbm lattice latticeExtra survey xtable]; }; tweedie = derive2 { name="tweedie"; version="2.3.2"; sha256="10fv998qjxsyx0h94fi0xbh6xbf24nwgh254n9zfnmix9vk2cqls"; depends=[]; }; tweenr = derive2 { name="tweenr"; version="1.0.1"; sha256="0sq90pbln6lkc2q3zflhkxxwpqdw5dd7igrxhdnlynkdrmi83mpg"; depends=[farver magrittr Rcpp rlang]; }; tweet2r = derive2 { name="tweet2r"; version="1.1"; sha256="1ivzc05af3fbdxn99lcphm74qs64lz8577zzi6r52r9xjpsqpqzi"; depends=[ggmap ggplot2 maptools plyr rgdal ROAuth RPostgreSQL RSQLite sp spacetime spatstat splancs streamR]; }; @@ -14809,18 +14971,17 @@ in with self; { twosamples = derive2 { name="twosamples"; version="1.0.0"; sha256="0i8k157ph2whll72a590rnafgjx767k8vxy5d8x9dq7s4baiw1cx"; depends=[Rcpp]; }; twostageTE = derive2 { name="twostageTE"; version="1.3"; sha256="0mkxs3lmzja51zdrf5himhwcdygpj6czhdd2bydakm26kvw7znwr"; depends=[isotone]; }; twoway = derive2 { name="twoway"; version="0.6.2"; sha256="0q053jvb2sa762bjnpzkxzdcq1wk82ynp4rjl4j6qncqccvqq0c3"; depends=[]; }; - txtplot = derive2 { name="txtplot"; version="1.0-3"; sha256="1949ab1bzvysdb79g8x1gaknj0ih3d6g63pv9512h5m5l3a6c31h"; depends=[]; }; + txtplot = derive2 { name="txtplot"; version="1.0-4"; sha256="00sriml48y70j18jz235dsfm5x3a81bnzskfp3hnv6cbjwwsmca4"; depends=[]; }; txtq = derive2 { name="txtq"; version="0.2.0"; sha256="1w4dmws2l0r5bbx2n2g79dfrpa8dz4hlg8raphgh8mimf1skfb3h"; depends=[base64url filelock R6]; }; types = derive2 { name="types"; version="1.0.0"; sha256="01shcin8wjbhbmzl979fj3008xqxssw90g3bjg42cnjxkmnaql59"; depends=[]; }; uCAREChemSuiteCLI = derive2 { name="uCAREChemSuiteCLI"; version="0.2.0"; sha256="1nccgkxv57inhgvgmhwm4fr8cp28sj8n83za5gam9xx1f42mzsqk"; depends=[ChemmineR usethis]; }; - uGMAR = derive2 { name="uGMAR"; version="3.2.2"; sha256="0p8n4wpqc7xqlsmr3gxspshfpfzh7zjrshqlnflszhrnngffgkif"; depends=[Brobdingnag pbapply]; }; + uFTIR = derive2 { name="uFTIR"; version="0.1.1"; sha256="0lpp768x87czdcb6gdgsp454faakx0gdmk9mh1zzh5ljzkxdvbxv"; depends=[raster Rcpp RcppArmadillo rgdal sp]; }; + uGMAR = derive2 { name="uGMAR"; version="3.2.5"; sha256="0dxi261qbnaqryqmbmja56wkj2h9nn5yk5pmz8axdyakbqgasfwp"; depends=[Brobdingnag pbapply]; }; uHMM = derive2 { name="uHMM"; version="1.0"; sha256="1516ipadxi7rc1dbinr5rva2fbcr5i2zg3rlli5wy7r6naf8fzzl"; depends=[chron class cluster clValid corrplot FactoMineR HMM tcltk2 tkrplot]; }; - uaparserjs = derive2 { name="uaparserjs"; version="0.1.0"; sha256="1zhz39jrvi64sj0wvwkm4y8gakfp6kz1knw4wn08kk4fa9ymyjvq"; depends=[dplyr purrr V8]; }; + uaparserjs = derive2 { name="uaparserjs"; version="0.3.1"; sha256="0pmdkc108rvk1bsq0b7pmvvhp2ghm728d34rmz20abpmcy5hiwlw"; depends=[progress 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-4"; sha256="0dd83xbzssvmqy0g053lzlkjpa7cpqiijsyi06qsk2krq4wp94ml"; depends=[foreach raster Rcpp]; }; ubiquity = derive2 { name="ubiquity"; version="1.0.1"; sha256="1aachql6k1fldfliv8gkny91rxca5h60is4cj98mizipc9cal7jz"; depends=[deSolve digest doParallel flextable foreach gdata ggplot2 gridExtra knitr MASS officer optimx PKNCA pso rhandsontable rmarkdown rstudioapi shiny stringr]; }; ucbthesis = derive2 { name="ucbthesis"; version="1.0"; sha256="0l855if3a7862lxlnkbx52qa617mby634sbb2gkprj21rwd7lcbp"; depends=[knitr stringr]; }; - uchardet = derive2 { name="uchardet"; version="1.0.2"; sha256="1cyywm42ic2laal9clc0w6z2a8k4j21iz1vj903bxhxs940dv9n4"; depends=[Rcpp]; }; uclust = derive2 { name="uclust"; version="0.2.0"; sha256="1hvyrkah0yfia5wwr42q6axja56qwnils84pg25znq39fjly6hjf"; depends=[dendextend robcor]; }; ucminf = derive2 { name="ucminf"; version="1.1-4"; sha256="01vggwg1w71k98qs6fhb0x1843vi322mf4g3hbclks94kcpkisx2"; depends=[]; }; udapi = derive2 { name="udapi"; version="0.1.3"; sha256="0qyn6fdh8ia913hn2dl0x99xsm20ps8zm52snswlyb00prinm668"; depends=[curl httr]; }; @@ -14835,9 +14996,9 @@ in with self; { uklr = derive2 { name="uklr"; version="1.0.0"; sha256="1c1r7d76rjh9ki2fwhv8chmhc2j5kzv3d9lv7qvr1cxyfsbxrsfb"; depends=[httr jsonlite tibble]; }; ukpolice = derive2 { name="ukpolice"; version="0.1.2"; sha256="0jwc57360cr9fkqzs5j2jmnfagci86jzi6p5d5mpm35drsrzm1ca"; depends=[jsonlite purrr tibble]; }; ulid = derive2 { name="ulid"; version="0.3.0"; sha256="0xxkqrnlz3pkb3s1gacfzqav54w97gc0w8rh0fn1qy5rkmg2bplv"; depends=[Rcpp]; }; - umap = derive2 { name="umap"; version="0.2.4.1"; sha256="1pnh3hv8ihiz2nszqp797lkrdhhna2a6mzpizbsk0s9m8cj4wxva"; depends=[openssl Rcpp reticulate RSpectra]; }; + umap = derive2 { name="umap"; version="0.2.5.0"; sha256="0qp8zbh6fn8kn6q2h2lyjgmq3pr6gqwsd8ymqx25px13zjhxch9d"; depends=[openssl Rcpp reticulate RSpectra]; }; ump = derive2 { name="ump"; version="0.5-8"; sha256="1sg226caq9y41cwl7wr5s9z3bpq2j5p6rj6fy2pasbzimgzw0byx"; depends=[]; }; - umx = derive2 { name="umx"; version="3.0.5"; sha256="1xyv9xfqa5q5bzrrnqc07xi3y0kdlw9c1dy6dciqdcmynwkvidh2"; depends=[cowplot DiagrammeR ggplot2 knitr lavaan MASS Matrix MuMIn mvtnorm nlme numDeriv OpenMx polycor R2HTML RCurl sfsmisc xtable]; }; + umx = derive2 { name="umx"; version="3.0.6"; sha256="0jbwmn8mj4ff2wzv3pwqf6ddhvbrm21n20ilj5h9fyjafcspfq9w"; depends=[cowplot DiagrammeR ggplot2 knitr lavaan MASS Matrix MuMIn mvtnorm nlme OpenMx polycor R2HTML RCurl xtable]; }; unbalanced = derive2 { name="unbalanced"; version="2.0"; sha256="18hy9nnq42s1viij0a5i9wzrrfmmbf7y3yzjzymz2wnrx4f2pqwv"; depends=[doParallel FNN foreach mlr RANN]; }; unbalhaar = derive2 { name="unbalhaar"; version="2.0"; sha256="0v6bkin1cakwl9lmv49s0jnccl9d6vdslbi1a7kfvmr5dgy760hs"; depends=[]; }; uncertainty = derive2 { name="uncertainty"; version="0.2.0"; sha256="1mq14ny7l3gy3wjsqijnm37azavyapxszjnckd861h4hgcpdcdjz"; depends=[mvtnorm triangle]; }; @@ -14846,6 +15007,7 @@ in with self; { unfoldr = derive2 { name="unfoldr"; version="0.7"; sha256="18qjsmlbqy9nhwyv288r9n3plv22fgb4g73jpyjyzy3hzfamcb17"; depends=[]; }; unglue = derive2 { name="unglue"; version="0.0.1"; sha256="0avk5d4dgbmqvmqlr5kbhg3qsyg5rxmw9icadivaahzf4znav5x4"; depends=[]; }; ungroup = derive2 { name="ungroup"; version="1.1.5"; sha256="0247mzicghdy2s41dsf1f2yx9j0j4qnahmh1bjaiwl4q1541k3l0"; depends=[MortalitySmooth pbapply Rcpp RcppEigen Rdpack rgl]; }; + unheadr = derive2 { name="unheadr"; version="0.2.1"; sha256="0pglf4sxq7f5rf1a87zz0nzjd4npdymazg4zpmmfiwc07lh8g7pr"; depends=[dplyr forcats magrittr readxl rlang stringr tibble tidyr tidyxl]; }; uniReg = derive2 { name="uniReg"; version="1.1"; sha256="0wjc7pgaisvk26j7grxp2ypsabb5my9wg6c9i5w9zhh5jdx1fdab"; depends=[DoseFinding MASS mvtnorm quadprog SEL]; }; uniah = derive2 { name="uniah"; version="1.0"; sha256="19zwy33gwa749i81mi9h05k8k3l4xbbln3k6q70fa7ic5lqbbdzj"; depends=[ahaz Iso survival]; }; unifDAG = derive2 { name="unifDAG"; version="1.0.3"; sha256="052qjrnj04imhj6i62k8jdx9rs8r70n0qrmd2z45x4fimn5py6j5"; depends=[gmp graph]; }; @@ -14855,60 +15017,60 @@ in with self; { unikn = derive2 { name="unikn"; version="0.2.0"; sha256="1lw3wn93bb8y76phnqwhvgn14zrs68rq8xx9hl2wbngispvwpwn1"; depends=[ggplot2]; }; unine = derive2 { name="unine"; version="0.2.0"; sha256="051dk8fss19h4d9815a7994krr1s3n5q0pxq9gir6zns0vvn05pw"; depends=[Rcpp]; }; uniqtag = derive2 { name="uniqtag"; version="1.0"; sha256="025q71mzdv3n1jw1fa37bbw8116msnfzcia01p1864si04ch5358"; depends=[]; }; + unisensR = derive2 { name="unisensR"; version="0.3.2"; sha256="0scqkbjlnln6vc9i0i3hpsx5mw6c8w22pc3dhy8bwyrjndcd54yy"; depends=[XML]; }; unitedR = derive2 { name="unitedR"; version="0.3.1"; sha256="06plbhjbn1gflpxarn21knhiwfr02vxprak9qcghl30fkkymd02r"; depends=[plyr]; }; - unitizer = derive2 { name="unitizer"; version="1.4.8"; sha256="1q2l32lkxv87vaih5wqfn6n2a2q6mlaw83mgrn4g5ircp5z3r98j"; depends=[crayon diffobj]; }; - units = derive2 { name="units"; version="0.6-5"; sha256="02nls8m0r1r7kljs4x35naz3szq62hyqyd5vracf1xwi1kz5kdsh"; depends=[Rcpp]; }; + unitizer = derive2 { name="unitizer"; version="1.4.9"; sha256="1p5isrc9vszfkx9z4fg02ag9cgw0qa8zwh20h7kwn0j1i40gdzzp"; depends=[crayon diffobj]; }; + units = derive2 { name="units"; version="0.6-6"; sha256="11x6xz1fbml28xmrhgn4sii9vfyj3gyfc1dfxahdg9cszdmcgdnh"; depends=[Rcpp]; }; unittest = derive2 { name="unittest"; version="1.4-0"; sha256="1wyiikccnkw8fzrjrb2a80lw2xyiii4zb0hrbzfszy2bd6prqxx4"; depends=[]; }; univOutl = derive2 { name="univOutl"; version="0.1-5"; sha256="193wrpkvgmlrx43nag8w3ivrlqm37nm6g86wcvd3bgw3hchs70gi"; depends=[Hmisc robustbase]; }; unival = derive2 { name="unival"; version="1.0.2"; sha256="1sw0z7dmicmka3znrc1c5v0s9g8cpqapacdjzl5i4k5ak2qq35qp"; depends=[optimbase psych]; }; univariateML = derive2 { name="univariateML"; version="1.0.0"; sha256="1l8b9fll93nhspbhrap94sdgdmligb49qlzvlm0x4msqmh085ib4"; depends=[actuar assertthat extraDistr logitnorm nakagami tibble]; }; - 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.13-1"; sha256="1qg71jgdg9psbca8ki933x8g7r48rbbybq2ys8nj8pyhz89hgbkr"; depends=[lattice MASS Matrix plyr raster Rcpp RcppArmadillo reshape2]; }; + unix = derive2 { name="unix"; version="1.5.1"; sha256="0kb54lgzqnp1nwl8lw2531qj3858szsv7wz17g6lqxkfxsww5vv8"; depends=[]; }; + unjoin = derive2 { name="unjoin"; version="0.0.4"; sha256="094hpb0w6j4l0kmqh9wgfpsya5ldjxm3fms7px4pvj8nqx29ga80"; depends=[dplyr rlang tibble]; }; + unmarked = derive2 { name="unmarked"; version="0.13-2"; sha256="07i0fiz155vs6cbhpg5gx77syf9phswhpz7vg3xxr16i0qdnh3h2"; depends=[lattice MASS Matrix plyr raster Rcpp RcppArmadillo]; }; 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.4"; sha256="0ri68vfhc0acizjsk62v4l1g6l773y955yhcbqgks0vbrk01yfxg"; depends=[sys]; }; unsystation = derive2 { name="unsystation"; version="0.2.0"; sha256="02da7wzzk5bwd475i67v5x04ay2bn5yd5xffl1asqcqxcc5sy0m8"; depends=[doParallel foreach iterators Rcpp RcppArmadillo]; }; untb = derive2 { name="untb"; version="1.7-4"; sha256="1i7m4vfslsix98dwx4jlrsldm7fhhfp25gr7aapcxqxms7ryaby6"; depends=[Brobdingnag partitions polynom]; }; unvotes = derive2 { name="unvotes"; version="0.2.0"; sha256="0wanvivwm1nmqadq2vapg27kasnjnr0a4np2kw54wj9pg21izqic"; depends=[]; }; - updog = derive2 { name="updog"; version="1.1.3"; sha256="0dnvf205x39sb236652rsa2c9wlb8a6c93i8ldr2f9mhrhwndzbp"; depends=[assertthat doParallel foreach ggplot2 ggthemes Rcpp RcppArmadillo stringr]; }; + updog = derive2 { name="updog"; version="1.2.0"; sha256="0q55h4rgr0hqn2fkcnd0pwmrawzcjmffvysps1cr061jd5yrzla4"; depends=[assertthat doParallel foreach ggplot2 ggthemes Rcpp RcppArmadillo reshape2 stringr]; }; uplift = derive2 { name="uplift"; version="0.3.5"; sha256="11xikfmg6dg8mhwqq6wq9j9aw4ljh84vywpm9v0fk8r5a1wyy2f6"; depends=[coin MASS penalized RItools tables]; }; uplifteval = derive2 { name="uplifteval"; version="0.1.0"; sha256="1gnn40c47rpx40j210bz6fb48d70p6spv3drr8hd5b3vzfz6686c"; depends=[dplyr ggplot2 gridExtra whisker]; }; upmfit = derive2 { name="upmfit"; version="0.1.0"; sha256="0f0rk606v17abgw3mwlwihl6fsxprp44h2xbhv1675i18i36vbgx"; depends=[mcmcplots R2jags]; }; uptasticsearch = derive2 { name="uptasticsearch"; version="0.4.0"; sha256="19sf3zdj424pz4ms0xg4asplf2bczvhl8p22y13jna1g51xyv92a"; depends=[assertthat data_table futile_logger httr jsonlite purrr stringr uuid]; }; uptimeRobot = derive2 { name="uptimeRobot"; version="1.0.0"; sha256="1sbr0vs6jqcyxjbs7q45bsfdnp3bc59phw0h3fwajqq1cxjgzdww"; depends=[plyr RCurl rjson]; }; - upwaver = derive2 { name="upwaver"; version="1.2.1"; sha256="02yx4ijww084cxsjbf68l5zv0pf1hsqwqq8rgbc6rm3qp00v18a5"; depends=[assertthat httr rjson XLConnect xlsx]; }; uqr = derive2 { name="uqr"; version="1.0.0"; sha256="0f7isjfb5almp1zypxzw3lfkygkcixmg0xdsw0zznf61r6qhbqyr"; depends=[gtools Hmisc]; }; - urbin = derive2 { name="urbin"; version="0.1-8"; sha256="0nbcs4rjqdqmyq046kx3nnvaxxzi0rxcxjma11lpn4ws1wdm6bng"; depends=[]; }; urca = derive2 { name="urca"; version="1.3-0"; sha256="1akaqwf3fvvvx4sgfn641fd4sj51s0701pvfl6s5hnz2k0iwh732"; depends=[nlme]; }; urlshorteneR = derive2 { name="urlshorteneR"; version="1.1.2"; sha256="1gxyc9a81lsn72x7c29lz6k9k5ylqd0j65yhy2qj8lslnmg869vz"; depends=[assertthat httr jsonlite lubridate stringr]; }; urltools = derive2 { name="urltools"; version="1.7.3"; sha256="04x3my655dd287cbsszbnf75q0swmjlxxrblcsay7a8n3df3a830"; depends=[Rcpp triebeard]; }; uroot = derive2 { name="uroot"; version="2.1-0"; sha256="1hhq7ns2pyiziwx6sx7sb6445p3nynv7l04rksjngai2vpdaj0iw"; depends=[]; }; + ursa = derive2 { name="ursa"; version="3.8.19"; sha256="1q2y834nkh7mjq03xp8v3kxlwgk9gn558dk9lz78213qjx2762h8"; depends=[jpeg png rgdal]; }; + usa = derive2 { name="usa"; version="0.1.0"; sha256="0scdrd6b48n019f7qp77rrkqgmapnrknalq0hml1cy7m43llqf6d"; depends=[tibble]; }; usdarnass = derive2 { name="usdarnass"; version="0.1.0"; sha256="10fh9anpmbb7i70q3hjxbplrkqa1q86zgh8nldsf2i526p62hpm1"; depends=[httr jsonlite readr]; }; usdm = derive2 { name="usdm"; version="1.1-18"; sha256="1sis47fri2lrbx2ll5ps7bvycjqhncnia800izf11szgayim5lrv"; depends=[raster sp]; }; - usedist = derive2 { name="usedist"; version="0.3.0"; sha256="11bklq2fzmk49rnmlrpjlf9qn4lzdzx52722wy0mfd3qsg9mpcbm"; depends=[]; }; + usedist = derive2 { name="usedist"; version="0.4.0"; sha256="0ddf1zcalbrn293qmr9kdzz3x16fzc4k1bwb1pjmwnspisqfi8kj"; depends=[]; }; useful = derive2 { name="useful"; version="1.2.6"; sha256="0n50v1q75k518sq23id14jphwla35q4sasahrnrnllwrachl67v1"; depends=[assertthat dplyr ggplot2 magrittr Matrix plyr purrr scales]; }; - usefun = derive2 { name="usefun"; version="0.4.1"; sha256="1fv10s73hk0xnwrigri9713bxa03jhrf8lafc110syihdj7d5kvx"; depends=[]; }; + usefun = derive2 { name="usefun"; version="0.4.3"; sha256="0vsz7kmkqfffw2jh33ag6h22qclxblf04aw82ss66j8xpxmkqhs6"; depends=[]; }; userfriendlyscience = derive2 { name="userfriendlyscience"; version="0.7.2"; sha256="17arxxha8qr876nrf9szpymgamxlvacj3lfbmpiv973kyi3hr7m4"; depends=[BiasedUrn car data_tree DiagrammeR digest diptest GGally ggplot2 ggrepel ggridges GPArotation gridExtra gtable knitr lavaan lme4 MASS MBESS minpack_lm pander plyr psych pwr RColorBrewer rio scales SCRT SuppDists ufs viridis XML xtable]; }; usethis = derive2 { name="usethis"; version="1.5.1"; sha256="07an5wbikilg7cb3q6x5aykw8dfqnjrc3wpfb7gjmy0d9fh20fcy"; depends=[clipr clisymbols crayon curl desc fs gh git2r glue purrr rlang rprojroot rstudioapi whisker withr yaml]; }; usfertilizer = derive2 { name="usfertilizer"; version="0.1.5"; sha256="05zjn39hqjjzzp4v4b1zbqq59205s7k0kikms951h57kbyvjz6vk"; depends=[tidyverse]; }; - ushr = derive2 { name="ushr"; version="0.2.0"; sha256="1jgkq87a90xg6dwrgv78flcprxw7na847ig8m4rkcnc084pyxv8w"; depends=[dplyr ggplot2 tidyr]; }; + ushr = derive2 { name="ushr"; version="0.2.2"; sha256="04j4hfwsk8idrl7c3lfcd1v7s8xxf2l0rlf2aixszsdbcfr9173n"; depends=[dplyr ggplot2 tidyr]; }; uskewFactors = derive2 { name="uskewFactors"; version="2.0"; sha256="0ndi5987ak8sa7krgiglsibfg0k7z9j8fg47hg1m8ar0sq4r1yj6"; depends=[MASS MCMCpack mvtnorm tmvtnorm]; }; - usl = derive2 { name="usl"; version="2.0.0"; sha256="1bdbscz4mbmrdnfvvgncjsshmry9hab2jz09gqc2hdzcxnfvmsp0"; depends=[nlsr]; }; + usl = derive2 { name="usl"; version="3.0.0"; sha256="1ahry485kpzfc0pzi4zm039d5mpv1jycmhdpn0n0zn0drcrlhw0g"; depends=[nlsr]; }; usmap = derive2 { name="usmap"; version="0.5.0"; sha256="0fjmmw8xhba31gv8mx9k55881yb94z518csbqas3bvssq5s7048f"; depends=[]; }; ustyc = derive2 { name="ustyc"; version="1.0.0"; sha256="1267bng2dz3229cbbq47w22i2yq2ydpw26ngqa1nbi3ma6hwqsv4"; depends=[plyr XML]; }; utc = derive2 { name="utc"; version="0.1.5"; sha256="1lhm5rhr78cxp3cz5n6j2zkhjphj7csk026xvvhkjqdi39rrq6i4"; depends=[]; }; utf8 = derive2 { name="utf8"; version="1.1.4"; sha256="0m0ywg8k3blfiahxvh1i4zn9dksrlc937d2lbza5fc38zjnrrnpn"; depends=[]; }; utile_tables = derive2 { name="utile.tables"; version="0.1.8"; sha256="0zxy5y8d34lssg5jr7hzqkwf92k3yy52p1qjd505zrp90sgz9cjj"; depends=[dplyr purrr rlang survival tibble utile_tools]; }; - utile_tools = derive2 { name="utile.tools"; version="0.2.3"; sha256="0jlyrd7a96gpvs6i62smg4mcds9660y65lykqjs0dvm42c1j0823"; depends=[dplyr lubridate purrr rlang stringr tibble]; }; + utile_tools = derive2 { name="utile.tools"; version="0.2.4"; sha256="1k82wra9c6f8m58sk1m33fv0gqjnxnv5wal8rjx6knnvfl36kjvn"; depends=[dplyr lubridate purrr rlang stringr tibble]; }; utile_visuals = derive2 { name="utile.visuals"; version="0.2.3"; sha256="1748nbj2vzigw0q97z9c6pgxa9x8h9rllh8asaahdybachwal7kh"; depends=[dplyr ggplot2 gridExtra purrr utile_tools]; }; - utility = derive2 { name="utility"; version="1.4.4"; sha256="18ariimhlmh4gi01jdywidk3gwfcm2yhl4d0dbr8ymdxlg1f1w8g"; depends=[]; }; + utility = derive2 { name="utility"; version="1.4.5"; sha256="0a11bxyg8la6yvxr04qbhay05jb2ihd7calc1zcisgj43kq6k7xd"; 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.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.5"; sha256="0pz9wa89xq4d119q86lskrznf979m0r1db8iaprcz7kxbi6b8lrj"; depends=[dqrng FNN irlba Matrix Rcpp RcppAnnoy RcppParallel RcppProgress RSpectra]; }; - vMask = derive2 { name="vMask"; version="1.0"; sha256="14zfmgidlvlmm9anjcz3wvz4crc24ysq7jj1j1078fp7px5vvr8z"; depends=[]; }; + utiml = derive2 { name="utiml"; version="0.1.6"; sha256="1djagxmsni685ps0nhbvwgncxj883qck0wfcwhrl5h714zq39a0j"; depends=[mldr ROCR]; }; + uuid = derive2 { name="uuid"; version="0.1-4"; sha256="0gm9ii7ncvllxbvyk6srsiinjmqyj7lmh84w43x4nhqpvafj9q4q"; depends=[]; }; + uwot = derive2 { name="uwot"; version="0.1.8"; sha256="1jzh8r1h6f7pw7pb1fr32vn6ai9g10s56ahkq0vi77iznihy1rpd"; depends=[dqrng FNN irlba Matrix Rcpp RcppAnnoy RcppProgress RSpectra]; }; + vader = derive2 { name="vader"; version="0.0.1"; sha256="0zcggr7hpkx43bjrhyq6b3rgd6nmyljd5i8vky2jz6xn44gykhmw"; depends=[tm]; }; vaersNDvax = derive2 { name="vaersNDvax"; version="1.0.4"; sha256="0hvw7vbxs87c9xkdv3617fkjwz2dbawscbd7dgaixhdhcr3k823a"; depends=[]; }; vaersvax = derive2 { name="vaersvax"; version="1.0.5"; sha256="0bfbpdjnykvb9r0p28bz8lrqxksy4jvwnd28y6gdlprpisiipiic"; depends=[]; }; vagalumeR = derive2 { name="vagalumeR"; version="0.1.6"; sha256="0zakpg5p9kif61d35as08f2dac3wncyvhpc83rqjp96g99wjf701"; depends=[dplyr httr jsonlite magrittr purrr stringr]; }; @@ -14919,18 +15081,17 @@ in with self; { validann = derive2 { name="validann"; version="1.2.1"; sha256="00c0hkjiv8n7mksx6sknb4xkkivxr1ml31k697csv4imwrk09dy5"; depends=[moments]; }; validate = derive2 { name="validate"; version="0.9.3"; sha256="0ckr4i75w503jxwghkmc7mi9b9z54gjipxl6limz4sry0py3lyl4"; depends=[settings yaml]; }; validateRS = derive2 { name="validateRS"; version="1.0.0"; sha256="1ivw9ddr6z2wrsqvhbn87p5pikhkxlz8p45pb5nq13dvs359vkww"; depends=[data_table reshape2 triangle truncnorm]; }; - validatejsonr = derive2 { name="validatejsonr"; version="1.0.4"; sha256="1n8jf7j3hvz47z1x3gqz5yj5wxfjzz0zgzkgckdvy1nbsqf7w3cr"; depends=[Rcpp]; }; - validatetools = derive2 { name="validatetools"; version="0.4.7"; sha256="0pqy76gpn0z20f6bpbnv0ryjb8p4x5j821a46ld19r9lvp7a9rrr"; depends=[lpSolveAPI validate]; }; + validatetools = derive2 { name="validatetools"; version="0.5.0"; sha256="10wardp2c70zx5ii940sjql3xh5p3vqxv4ayyifhhlr8vzvr5cj0"; depends=[lpSolveAPI validate]; }; valorate = derive2 { name="valorate"; version="1.0-1"; sha256="06vczszpkipsxfs7h6ld33vvxb5ci62rwg3cglwy3lcfifhbnsfi"; depends=[survival]; }; valottery = derive2 { name="valottery"; version="0.0.1"; sha256="0rlv8agm9ng4jcb9ixqifh7kjczvkx7047brq8yf9kg7rb8mzgpz"; depends=[]; }; valr = derive2 { name="valr"; version="0.5.0"; sha256="14jhrwkiwmha3vlmm7b50n2xxyizj6ddmy89gb20mpzq7qhz1ika"; depends=[broom dplyr ggplot2 Rcpp readr rlang stringr tibble]; }; valueEQ5D = derive2 { name="valueEQ5D"; version="0.5.1"; sha256="0njarifqj7mfnc5bqaq7zpx0z7sx9rmz88755s7426dyypx8v0lv"; depends=[rstudioapi testthat]; }; valuer = derive2 { name="valuer"; version="1.1.2"; sha256="0mbwzsvy34ppngyxdzpd9w1r4f00cik4maqab9kpiflrrv9xdp78"; depends=[ggplot2 orthopolynom R6 Rcpp RcppEigen timeDate yuima]; }; - vamc = derive2 { name="vamc"; version="0.1.1"; sha256="0mpn7vp7kc19zbnviah18r972vpw2q5l884xvjkyn23gsib1scvg"; depends=[Rdpack]; }; - vampyr = derive2 { name="vampyr"; version="1.0.5"; sha256="0hnxgl2cp3scnazr7fnjgzfz5ihfzs5gwbsb6jlq569d6il9jjl7"; depends=[corpcor EFA_MRFA fungible GPArotation lavaan moments optimbase PCovR psych]; }; + vamc = derive2 { name="vamc"; version="0.2.1"; sha256="04kkli4xzf3gzvs215lzch8bl877cdq3awh3mz1k321zhsa1d0jn"; depends=[Rdpack]; }; + vampyr = derive2 { name="vampyr"; version="1.0.6"; sha256="1iqlb948wvwxf69588qz0hmc1fsmbqp058qbvrzx817w3mhjcs63"; depends=[corpcor EFA_MRFA fungible GPArotation lavaan moments optimbase PCovR psych semPlot]; }; vanddraabe = derive2 { name="vanddraabe"; version="1.1.1"; sha256="094kd72slq0n3pk0p6zps241aszb9yql49h4mr007zf0kn8wlf8v"; depends=[bio3d cowplot fastcluster ggplot2 openxlsx reshape2 scales]; }; vanquish = derive2 { name="vanquish"; version="1.0.0"; sha256="01di1j36npl7vnyhgsagvyf6j8bxcw867dwf9dgi7l1328s7lf0l"; depends=[changepoint e1071 ggplot2 VGAM]; }; - vapour = derive2 { name="vapour"; version="0.4.0"; sha256="0vv8vd5gkhf7vjicm1r3c6liibgvdfnm030b1p7fm71jb7ycg49p"; depends=[Rcpp]; }; + vapour = derive2 { name="vapour"; version="0.5.0"; sha256="06rjqvriz64f7w5b5xwn3n5xk27l3p2l1sgipzjkk04gs24m6nfh"; depends=[Rcpp]; }; varEst = derive2 { name="varEst"; version="0.1.0"; sha256="0i6nsxl5w4zipzrmdvx8plmxr33n405w2qhks3s7zzs3kcys32v6"; depends=[caret glmnet lm_beta SAM]; }; varImp = derive2 { name="varImp"; version="0.3"; sha256="08kqnqv29bmw2lqnsyffnbwr3a0f97mf593pkwzak6wy0mkqrm5z"; depends=[measures party]; }; varSel = derive2 { name="varSel"; version="0.1"; sha256="0ddj3swfxzchs75kfi6h25h3c33hpapnd5kcwcijnqhlh902b1r0"; depends=[]; }; @@ -14942,27 +15103,29 @@ in with self; { varclust = derive2 { name="varclust"; version="0.9.4"; sha256="0knmfq3pn38j8p29j6sqapdv3g5335si3gwiw932ml5z49a8ga5m"; depends=[doParallel doRNG foreach pesel RcppEigen]; }; vardiag = derive2 { name="vardiag"; version="0.2-1"; sha256="07i0wv84sw035bpjil3cfw69fdgbcf2j8wq4k22narkrz83iyi2z"; depends=[]; }; vardpoor = derive2 { name="vardpoor"; version="0.16.0"; sha256="09dy1q1lx3b53an7qdszqzl5r4aswddy3046cvz997k1f692mwda"; depends=[data_table foreach ggplot2 laeken MASS plyr pracma stringr surveyplanning]; }; - varhandle = derive2 { name="varhandle"; version="2.0.4"; sha256="17hvn991268xdfmxx9a03k04zy9gbd4jihyl0750pm3flsldarrl"; depends=[]; }; - variables = derive2 { name="variables"; version="1.0-2"; sha256="02q1fyd7r0xclvwbiqz07dr6y5g2sqfjj1qv5hvvhs0vmx93w7f9"; depends=[]; }; + varhandle = derive2 { name="varhandle"; version="2.0.5"; sha256="1l42d0s6fbjjc9l28a2m3myxkrx2c0p0b9yj8wjjjgilw19yc3lv"; depends=[]; }; + variables = derive2 { name="variables"; version="1.0-3"; sha256="1x4w6pqrl6lw5dalii7kiq5f7jbfj1mlwdq2f6bvyfpx8byrvkqc"; depends=[]; }; varian = derive2 { name="varian"; version="0.2.2"; sha256="0jyw46qx2w19h02mrwv3w3n8qc1n4b3ckm38qly1y4a4w9ib6c2i"; depends=[Formula ggplot2 gridExtra MASS rstan]; }; variantspark = derive2 { name="variantspark"; version="0.1.1"; sha256="13hkp6l64hi7xlll09gin7kdlkqrkn0lggrw8147zy9ivhknhk59"; depends=[sparklyr]; }; - variosig = derive2 { name="variosig"; version="0.3"; sha256="0pffkhxkxp1bmyqdvwixfw8kqdvf0p4c9ff44cbhnc8lcyv5qpj2"; depends=[geoR gstat sp testthat]; }; - varjmcm = derive2 { name="varjmcm"; version="0.1.0"; sha256="02l0d896faakh9pdq2rzl2psmrj7l2pvacz7nk3r6552glsk7h18"; depends=[expm jmcm MASS Matrix]; }; - varrank = derive2 { name="varrank"; version="0.2"; sha256="19c40wwiadyqwn4z7nd22ynpa4wxr2anr2487mllmpg1d7wz3y38"; depends=[FNN]; }; + variosig = derive2 { name="variosig"; version="0.3-1"; sha256="09cxigii0sj78yqd18p4mm9jjqvd1k2cgjy43pxpmqdhia0q2pmv"; depends=[gstat sp testthat]; }; + varitas = derive2 { name="varitas"; version="0.0.1"; sha256="1xndg2hj4g3c7r4pzvjg7phrr1absa4xkpjc7gqfq45ymb3kadxz"; depends=[assertthat doParallel dplyr foreach magrittr openxlsx stringr tidyr VennDiagram yaml]; }; + varjmcm = derive2 { name="varjmcm"; version="0.1.1"; sha256="1xgy3n57pxhv6wrsw9h4dranxbw6hdpm1f9ra3kwlzrpz5c3289x"; depends=[expm jmcm MASS Matrix]; }; + varrank = derive2 { name="varrank"; version="0.3"; sha256="0k7hz61ymxf7w2hh1v2yfb6qdjn68a8ckjfiw0jqqhjx4wh5crn7"; depends=[FNN]; }; vars = derive2 { name="vars"; version="1.5-3"; sha256="0zc6v827ll19n088n31afgjf65zqwvyzmmj4q3ab1xhqzxfsgbw6"; depends=[lmtest MASS sandwich strucchange urca]; }; varsExplore = derive2 { name="varsExplore"; version="0.1.0"; sha256="1sscz565i288nmk7sv03kj2xysfppvil4nl2lxxbvp3y4mrkz09b"; depends=[dplyr DT glue magrittr purrr rio rstudioapi stringr tidyr]; }; - varycoef = derive2 { name="varycoef"; version="0.2.9"; sha256="1hc6w5bmmp98bnly7wyb10ljdsfl40xy2i60lmrask93zk80br7f"; depends=[fields RandomFields sp spam]; }; + varycoef = derive2 { name="varycoef"; version="0.2.10"; sha256="1gdny45zn1s492sx85aa8z86yfh2fwl9krq5kmmgxgmwy5gz0rjz"; depends=[fields optimParallel RandomFields sp spam]; }; vaultr = derive2 { name="vaultr"; version="1.0.2"; sha256="1b7g0jplp5dw1img7d6wm75gaycb3z8a8mzc6s0iwvhbfl8vf574"; depends=[getPass httr jsonlite R6]; }; vbdm = derive2 { name="vbdm"; version="0.0.4"; sha256="1rbff0whhbfcf6q5wpr3ws1n4n2kcr79yifcni12vxg69a3v6dd3"; depends=[]; }; vbsr = derive2 { name="vbsr"; version="0.0.5"; sha256="1avskbxxyinjjdga4rnghcfvd4sypv4m39ysfaij5avvmi89bx3b"; depends=[]; }; - vcd = derive2 { name="vcd"; version="1.4-5"; sha256="0pqf1sdp0d60aqc7721hy2zfcp57902by0i28jqbn683dd50c21a"; depends=[colorspace lmtest MASS]; }; + vcd = derive2 { name="vcd"; version="1.4-7"; sha256="16aj688nhlcvdxzfsqh4s375v8f8vl8997dl8h1xg29b42nv52gc"; depends=[colorspace lmtest MASS]; }; vcdExtra = derive2 { name="vcdExtra"; version="0.7-1"; sha256="163x9hhvhgdmrqbcig7b120lk63svy0y652scbrcb11f85zrgb0c"; depends=[ca gnm MASS vcd]; }; - vcfR = derive2 { name="vcfR"; version="1.9.0"; sha256="0rz25ldy475m43mc5rmvy8yvgspf3pwb154h4jbk2nlk12473d0x"; depends=[ape dplyr magrittr memuse pinfsc50 Rcpp stringr tibble vegan viridisLite]; }; + vcfR = derive2 { name="vcfR"; version="1.10.0"; sha256="13dfg42c7z0129difxd7phw8gbnck8gq4xd218r626wq7jrch6cy"; depends=[ape dplyr magrittr memuse pinfsc50 Rcpp stringr tibble vegan viridisLite]; }; vcov = derive2 { name="vcov"; version="0.0.1"; sha256="1w89mr8dk6436bxap28rszajgm9k7sjfqsr1i4p68dlhw8zk4yq1"; depends=[]; }; - vcr = derive2 { name="vcr"; version="0.4.0"; sha256="1fy48j5ky271x5a41xrba290nqbzhpqizbl8lg8sxhlr8l30pi62"; depends=[base64enc crul httr lazyeval R6 urltools webmockr yaml]; }; - vcrpart = derive2 { name="vcrpart"; version="1.0-2"; sha256="1xfvsxgyf39d2qxnm40nzkqp7q12y8nbpn9h154n876zxxfs7gh1"; depends=[formula_tools nlme numDeriv partykit rpart sandwich strucchange ucminf zoo]; }; - vctrs = derive2 { name="vctrs"; version="0.2.2"; sha256="008xjmlj5a5vm303wxac7bliamqwaj7mcj0jv6n9ibc8p8h93aqd"; depends=[digest ellipsis glue rlang]; }; + vcr = derive2 { name="vcr"; version="0.5.4"; sha256="1wilihibpvy9pvf50wi9r5sh1lfdz9ddfxxslcl3lz7g2b0hyxkv"; depends=[base64enc crul httr lazyeval R6 urltools webmockr yaml]; }; + vcrpart = derive2 { name="vcrpart"; version="1.0-3"; sha256="10898qp3sh2cjcfz4ac2q98f3z2wmwd3zvhhcdlxw7xy5a1x8gib"; depends=[formula_tools nlme numDeriv partykit rpart sandwich strucchange ucminf zoo]; }; + vctrs = derive2 { name="vctrs"; version="0.2.4"; sha256="15sgzs6afvmhssk6jcg41rn3bvmzmbm4sgca6f6x8lfrsazvdj6w"; depends=[digest ellipsis glue rlang]; }; vcvComp = derive2 { name="vcvComp"; version="1.0.1"; sha256="1103hjzd29f8gpsfbagdryq52m6fkhhh9dbqhbmhixxlimc7sd03"; depends=[]; }; + vdar = derive2 { name="vdar"; version="0.1.2-1"; sha256="1ia3211ah4m2dapdldgpvphk6zjfmx550dn9zz7im5v46b9dk9a0"; depends=[compositions]; }; vdg = derive2 { name="vdg"; version="1.2.0"; sha256="1hi5d14nh9q784sbdk018awrawh9f1aix0wl26x7n0xb4707rcmy"; depends=[ggplot2 gridExtra proxy quantreg]; }; vdiffr = derive2 { name="vdiffr"; version="0.3.1"; sha256="1l0vzh7nnwr64cq0nixnr4m0iya4mdpqvh45g2wf1hja51mcvw0a"; depends=[BH devtools diffobj fontquiver freetypeharfbuzz gdtools glue htmltools htmlwidgets purrr R6 Rcpp rlang shiny testthat usethis xml2]; }; vec2dtransf = derive2 { name="vec2dtransf"; version="1.1"; sha256="029xynay9f9rn0syphh2rhd3szv50ib4r0h0xfhhvbbb37h5dc9s"; depends=[sp]; }; @@ -14978,9 +15141,8 @@ in with self; { vegetarian = derive2 { name="vegetarian"; version="1.2"; sha256="15ys1m8p3067dfsjwz6ds837n6rqd19my23yj8vw78xli3qmn445"; depends=[]; }; vegperiod = derive2 { name="vegperiod"; version="0.2.6"; sha256="0v8bpxaa0xp8ywnycxs3613scncrhv8g7p99j6n5hs26m4h1km49"; depends=[]; }; vegtable = derive2 { name="vegtable"; version="0.1.5"; sha256="04q1dl4p12r4a05nhrlpzy4f5jw6i49ydaq5xrd84x1n6cc5qar9"; depends=[foreign plotKML qdapRegex sp stringi taxlist vegdata]; }; - vein = derive2 { name="vein"; version="0.8.5"; sha256="17a81x2c9mv9df1l4znw5rmjlb17qaicprkirfpgr5n1m6mnlx6s"; depends=[data_table eixport sf sp units]; }; + vein = derive2 { name="vein"; version="0.8.8"; sha256="1d1aszmfz0g6vd80v1rf0lh7v84g0kh9g86jns7ryjjfqn13yl9y"; depends=[data_table sf units]; }; velociraptr = derive2 { name="velociraptr"; version="1.1.0"; sha256="0a67vmv05cxc9f27aqzr6nkgy2mj3fhykwj5nb23qwfqa669a5hi"; depends=[sf]; }; - 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]; }; venn = derive2 { name="venn"; version="1.9"; sha256="0d2vwjc932q8n9hww8krj7nixg1dfkmcw1k1cry2d0xdvbbnrj8r"; depends=[admisc]; }; venneuler = derive2 { name="venneuler"; version="1.1-0"; sha256="10fviqv9vr7zkmqm6iy2l9bjxglf2ljb7sx423vi4s9vffcxjp17"; depends=[rJava]; }; @@ -14990,11 +15152,11 @@ 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.8"; sha256="069vq4ysywakbnpa0cx711a7w6bhc4k3hr7rnsx8y4ji552ysji1"; depends=[]; }; + vetr = derive2 { name="vetr"; version="0.2.9"; sha256="1dqlv1ks3bfqz6hrl3q913i7sbf9430ix5pjjyl7db0452lhny3a"; depends=[]; }; vfcp = derive2 { name="vfcp"; version="1.4.0"; sha256="0zj1ihqdx5x1695al1xyi8k001yw8x7gdss72myxlnh7b4flnp9m"; depends=[copula extraDistr stringr]; }; vfprogression = derive2 { name="vfprogression"; version="0.7.1"; sha256="0kgw1jx0rl9v8qy8qg7zjzdgvwqdi7k1lsvsx3lnpw4sfpkzsq23"; depends=[]; }; vhcub = derive2 { name="vhcub"; version="1.0.0"; sha256="04a8hdm4pxl8fzwy9q2wqc9q0dl5r49xwbid70yj9qlflh683id0"; depends=[Biostrings coRdon ggplot2 seqinr stringr]; }; - vhica = derive2 { name="vhica"; version="0.2.4"; sha256="0km49lrzn9rm3wxadwxc290dvx3bsblbmna7f9lnkq6g1z5jdqwg"; depends=[]; }; + vhica = derive2 { name="vhica"; version="0.2.7"; sha256="0zz4sffhrvh9raxygxma5a2jijq8nw8wqg8bc486sd2ahlv8g3s8"; depends=[]; }; viafr = derive2 { name="viafr"; version="0.1.0"; sha256="14y5k1vskfzxfpzjkk9602p8mvvyfrf3qpr517zdb714wv3gwk3h"; depends=[assertthat crul dplyr jsonlite magrittr purrr rlang stringr tibble tidyr utf8]; }; vici = derive2 { name="vici"; version="0.5.2"; sha256="0qad8ab04ndd29kcmd388piiymablfc7xlv6iml4sxkid7z5kgby"; depends=[cowplot DT ggplot2 ggpubr nlme shiny tidyr]; }; vietnamcode = derive2 { name="vietnamcode"; version="0.1.1"; sha256="0vc0c1fg30afar2dkch5h27b8jbglcd9ja6d5hcypnibqz4c68vz"; depends=[]; }; @@ -15003,13 +15165,15 @@ in with self; { vinereg = derive2 { name="vinereg"; version="0.7.0"; sha256="1fviqzs879n7rin3b0jks8dfvcxiay8jssqy7salslghpj7rkm84"; depends=[assertthat BH kde1d Rcpp RcppEigen RcppThread rvinecopulib wdm]; }; vines = derive2 { name="vines"; version="1.1.5"; sha256="057d2fdh03cq9kh4vz94arqscahmz14xbr2g59l0vn205lnyilf1"; depends=[ADGofTest copula cubature TSP]; }; violinmplot = derive2 { name="violinmplot"; version="0.2.1"; sha256="1j3hb03y988xa704kp25v1z1pmpxw5k1502zfqjaf8cy4lr3kzsc"; depends=[lattice]; }; + violinplotter = derive2 { name="violinplotter"; version="1.0.1"; sha256="16kcz99w9avx99y5cnc5rn3dx367v1fmc8mlavjvfp8sy7m9x3lp"; depends=[]; }; vioplot = derive2 { name="vioplot"; version="0.3.4"; sha256="1fsklymilspzz5fzlj7666x09aglaw0v4x0yfjjzy4vr5qpjc529"; depends=[sm zoo]; }; viopoints = derive2 { name="viopoints"; version="0.2-1"; sha256="0cpbkkzm1rxch8gnvlmmzy8g521f5ang3nhlcnin419gha0w6avf"; depends=[]; }; - vip = derive2 { name="vip"; version="0.2.1"; sha256="1z3h4rjy15zvf0510ic1p1zxamhc4da74py6zy56c44y9yy1nvp5"; depends=[ggplot2 gridExtra magrittr plyr tibble]; }; + vip = derive2 { name="vip"; version="0.2.2"; sha256="14wvadkpzismszqc4qi15jaky1qlf1l4g33cbvpnzdqxmhi61x4g"; depends=[ggplot2 gridExtra magrittr plyr tibble]; }; vipor = derive2 { name="vipor"; version="0.4.5"; sha256="112gc0d7f8iavgf56pnzfxb7hy75yhd0zlyjzshdcfbnqcd2a6bx"; depends=[]; }; viridis = derive2 { name="viridis"; version="0.5.1"; sha256="060rf1jn29dq53y3nhb0hykvcap6rqsk04rq544ypiiqb18ngwnx"; depends=[ggplot2 gridExtra viridisLite]; }; viridisLite = derive2 { name="viridisLite"; version="0.3.0"; sha256="1by2l05f0yabwvv64lhnv7bbhx0w683s3wr9j2xda920ghpa23kq"; depends=[]; }; viromeBrowser = derive2 { name="viromeBrowser"; version="1.0.0"; sha256="0adyf6ssi0ph7x880inj1vfmpjfbsaavjavjnrpr9cb6p0qdmvyc"; depends=[Biostrings data_table DT ggplot2 markdown plyr rbokeh reshape Rsamtools shiny shinycssloaders shinydashboard shinyWidgets stringr]; }; + virtualNicheR = derive2 { name="virtualNicheR"; version="1.0"; sha256="1ya1nd30vm7kjc4468ra8fjyxdwq2i1l1lmajhqjvw0nsj0mh1bl"; depends=[devtools diptest]; }; virtualPollen = derive2 { name="virtualPollen"; version="1.0.0"; sha256="16q1smwh3ryids3pa7lb4i4pxmjjyl449w6fikkrm9ybj1k8gfcf"; depends=[cowplot ggplot2 mgcv plyr tidyr viridis]; }; virtualspecies = derive2 { name="virtualspecies"; version="1.5.1"; sha256="0l86awcjq6i1lqax596xy5qfmzwiz3cwp2rczvgg37fdrym97cm3"; depends=[ade4 raster rworldmap sp]; }; virustotal = derive2 { name="virustotal"; version="0.2.1"; sha256="0lky75al8zcvmfgx7a2s3bij8ya4avdsnv046lk7564zfd8rbymw"; depends=[httr plyr]; }; @@ -15017,7 +15181,7 @@ in with self; { 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]; }; visit = derive2 { name="visit"; version="2.1"; sha256="0kkspih7m18g5pqlwrxpgjdwqxpp23c3xyvcnvv247abl9aq81rd"; depends=[BH Rcpp RcppEigen rstan sqldf StanHeaders]; }; - visreg = derive2 { name="visreg"; version="2.6-0"; sha256="0an58wrgn8qxmigc3nvykvglh41asdz8bn4zrzpg34dxiqykqb4b"; depends=[lattice]; }; + visreg = derive2 { name="visreg"; version="2.6.1"; sha256="01k44nxxilz7yrw5rihsg4r49yqjmz4zxmafcq89zbygap1d68ay"; depends=[lattice]; }; vistime = derive2 { name="vistime"; version="0.9.0"; sha256="1apyjapxqm05mlr4bx7s2x5v9ji8z8jb3spkrwcs0fibd6bq1dbb"; depends=[assertive 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]; }; @@ -15026,7 +15190,7 @@ in with self; { vita = derive2 { name="vita"; version="1.0.0"; sha256="114p2lzcr8rn68f0z4kmjdnragqlmi18axda9ma4sbqh8mrmjs9v"; depends=[randomForest Rcpp]; }; vitae = derive2 { name="vitae"; version="0.2.1"; sha256="053dy7c5zlrdb3hcbbdndx61ahkd2xwgl0i3ivcxwladyrkksyz3"; depends=[bookdown dplyr glue knitr RefManageR rlang rmarkdown xfun]; }; vitality = derive2 { name="vitality"; version="1.3"; sha256="17micfmlksnw167vavvhlk431fm20k74y5ggs47pgz5fwpm854zp"; depends=[]; }; - vivo = derive2 { name="vivo"; version="0.1.1"; sha256="0qqzlf1hhalbblx6qsl1i9s4l7hybdpd5xpwjwcv4zgjizvzgbpx"; depends=[DALEX dplyr ggplot2 ingredients]; }; + vivo = derive2 { name="vivo"; version="0.1.2"; sha256="1wd38vkb0qw8hcv9x4vsb0dg0dbqcnzfgpdzzanfbsn9hg1gswd7"; depends=[DALEX dplyr ggplot2 ingredients]; }; vkR = derive2 { name="vkR"; version="0.1"; sha256="0rb66am3y009wli8ykl58i02kzm6cdqz5v5d4vvzlbngz8crdkyy"; depends=[httr jsonlite XML]; }; vlad = derive2 { name="vlad"; version="0.2.0"; sha256="0bq91n51f9cnvbqskk0vg6xn559z3a33csbvyhvcvhyjcws2yahp"; depends=[Rcpp RcppArmadillo]; }; vmd = derive2 { name="vmd"; version="0.1.0"; sha256="17c06a9l6i90ivpvf3rgv6yrsqv36qmywmmy92y5b81zqhgmh907"; depends=[ggplot2 magrittr R6 Rcpp reshape2 scales]; }; @@ -15038,7 +15202,7 @@ in with self; { vortexR = derive2 { name="vortexR"; version="1.1.6"; sha256="113ndhf2f3hlhmgbg6gh5fq1az6d314fwl872dwypj2zsvfm7x03"; depends=[betareg data_table GGally ggplot2 glmulti gtools irr plyr R_utils stringr vortexRdata]; }; vortexRdata = derive2 { name="vortexRdata"; version="1.0.5"; sha256="0b47q3aslz4110a1bfaa103i098y2ngzrjh01rwasq3gd6xbif9n"; depends=[]; }; vosonSML = derive2 { name="vosonSML"; version="0.29.4"; sha256="0ngipwg83xw832ikaaqbyh2zxkwwwxalp6xrb60dk96z2r7qgj2r"; depends=[data_table dplyr Hmisc httpuv httr igraph magrittr purrr RCurl RedditExtractoR rlang rtweet stringr textutils tibble tictoc tm]; }; - vote = derive2 { name="vote"; version="1.1-0"; sha256="1kxbv4062g4x9vn4gh74c6zwdshysw5n7vx9qljhq2wrdnqzjpyg"; depends=[formattable knitr]; }; + vote = derive2 { name="vote"; version="1.2-1"; sha256="14bqmamndq5l7mfij8kfzk2lyrn0b52jgafgy9qb93qvk1fr5raz"; depends=[formattable knitr]; }; voteogram = derive2 { name="voteogram"; version="0.3.1"; sha256="12xv0c3g4vr23c8adkk8z7m7sx31w5mjvdg9h4qbvaimb99p2r7z"; depends=[dplyr ggplot2 jsonlite scales]; }; votesys = derive2 { name="votesys"; version="0.1.1"; sha256="1z7cx3rj3bfrkb6jkmf1m1wad5ff46zrab5vhk69wf3jbwd9h920"; depends=[data_table gtools Matrix]; }; vottrans = derive2 { name="vottrans"; version="1.0"; sha256="1fp7jrw072ws39bqsg88bm2qndcv68aa2vdqwgnza58p1dfq3x9f"; depends=[quadprog]; }; @@ -15055,8 +15219,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]; }; - vtable = derive2 { name="vtable"; version="0.6.0"; sha256="13kj9fanrj1xk3n1fc55lv48l2hrysp9b4fmkws7l8qfai4y53gl"; depends=[rstudioapi sjlabelled]; }; - vtreat = derive2 { name="vtreat"; version="1.5.1"; sha256="0d755r84cpw5fglj8afrazhqvswa6xkp4xwa1jdcmpiaw4f0mhdx"; depends=[digest wrapr]; }; + vtable = derive2 { name="vtable"; version="1.0.1"; sha256="0zj7xx4qk6gdia8q4jjsa3wcpcszn3lxv9afy892n9w6nigpfrmq"; depends=[haven rstudioapi sjlabelled]; }; + vtreat = derive2 { name="vtreat"; version="1.6.0"; sha256="1qldqdc0k5ifzqy53fmh24cdxl4xxil9s3l8kff23fdvm3fmvk3n"; depends=[digest wrapr]; }; vtree = derive2 { name="vtree"; version="4.0.0"; sha256="0i88ab7pjbj5s5xvykx47xxhqlk1vw3anra30wvhy6cr9774x8bg"; depends=[DiagrammeR DiagrammeRsvg htmlwidgets rsvg shiny]; }; vudc = derive2 { name="vudc"; version="1.1"; sha256="0zxz6n3ixa3xjzcinky8ymqjx9w8y8z65mz8d84dl00mxzkmkz4h"; depends=[]; }; vwline = derive2 { name="vwline"; version="0.2-2"; sha256="1hilr996xn5wh8kfyab55w2i1c02a8x909h4ahag5q6s7603qng5"; depends=[gridBezier polyclip]; }; @@ -15075,15 +15239,14 @@ in with self; { wahc = derive2 { name="wahc"; version="1.0"; sha256="1324xhajgmxq6dxzpnkcvxdpm2m3g47drhyb2b3h227cn3aakxyg"; depends=[]; }; waiter = derive2 { name="waiter"; version="0.1.0"; sha256="13csg6iy6fzr5fkz3wvmj1fvi0csijbgmvz262jnrq1c75srirmb"; depends=[magrittr R6 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.3.1-1"; sha256="135x32ar8m4m4zxdz94c7wrddsb0ps58nywh2k2gh3kqjbbzxx7a"; depends=[bayesplot BH dplyr ggplot2 KFAS Rcpp RcppArmadillo RcppEigen rstan StanHeaders]; }; walkscoreAPI = derive2 { name="walkscoreAPI"; version="1.2"; sha256="1c2gfkl5yl3mkviah8s8zjnqk6lnzma1yilxgfxckdh5wywi39fx"; depends=[]; }; - wallace = derive2 { name="wallace"; version="1.0.6"; sha256="0pnkwdfmimnvyygbz1iz1b9fhcdi7k53wjw44kmnr2b7ln9pbcl2"; depends=[dismo dplyr DT ENMeval leaflet leaflet_extras magrittr maptools raster RColorBrewer rgdal rgeos rmarkdown shiny shinyjs shinythemes spocc spThin XML zip]; }; + wallace = derive2 { name="wallace"; version="1.0.6.2"; sha256="0qhy1m9imwqmb6lzgx25xqqyrlja13g4l96c6q9mn008kmljpn0n"; depends=[dismo dplyr DT ENMeval leaflet leaflet_extras magrittr maptools raster RColorBrewer rgdal rgeos rmarkdown shiny shinyjs shinythemes spocc spThin testthat XML zip]; }; wally = derive2 { name="wally"; version="1.0.10"; sha256="1d03vxn6q7v0nsrkd7dxkkv3siysgicv6c13fkvwmypln9vsl6sl"; depends=[data_table prodlim riskRegression]; }; walmartAPI = derive2 { name="walmartAPI"; version="0.1.5"; sha256="1nng8izncj2nmmpywn1ggpzvjh8q7y3q6260qhy9kbmvrrl26spf"; depends=[dplyr glue httr magrittr purrr stringr tibble]; }; walrus = derive2 { name="walrus"; version="1.0.3"; sha256="1nk2glcvy4hyksl5ipq2mz8jy4fss90hx6cq98m3w96kzjni6jjj"; depends=[ggplot2 jmvcore R6 WRS2]; }; wand = derive2 { name="wand"; version="0.5.0"; sha256="0y9xmh9a93lnadg83i223j2nf77jazz8m1ck1bmdf5jwj4vyzaqa"; depends=[]; }; - warbleR = derive2 { name="warbleR"; version="1.1.20"; sha256="0xk7n98h80larhh1mvs8d9ji17hvq699gcy22m5xaqqh8xi4y1h0"; depends=[dtw fftw maps monitoR NatureSounds pbapply pracma RCurl rjson seewave Sim_DiffProc tuneR]; }; + warbleR = derive2 { name="warbleR"; version="1.1.23"; sha256="0qvi2kfp6fvi45kh21fcrj9b0wdk67mm67v16fvgbjk9dvwi67kv"; depends=[dtw fftw maps monitoR NatureSounds pbapply pracma RCurl rjson seewave Sim_DiffProc tuneR]; }; warp = derive2 { name="warp"; version="0.1.0"; sha256="16bmym91h0sbbh4iqasqs0f4kp3jqlm3sqgc356mznhxwnsm8dm2"; depends=[]; }; warpMix = derive2 { name="warpMix"; version="0.1.0"; sha256="13zbl4aifhg7j5b3vpwgzgs09hr7yblz0rckmj5qh40s78j8cpfn"; depends=[fda fields lme4 MASS nlme reshape2]; }; washdata = derive2 { name="washdata"; version="0.1.2"; sha256="01cnlhymh3qg9c7fda8s6lvm4j2vklmb72dfk17sn4p0kkikf9m8"; depends=[]; }; @@ -15098,28 +15261,27 @@ in with self; { wavScalogram = derive2 { name="wavScalogram"; version="1.0.0"; sha256="0j3dj32rxqsrc4gwssj7n224j7q4c4pahixw8b0p9xakx93q54id"; depends=[abind colorRamps fields Matrix zoo]; }; waveband = derive2 { name="waveband"; version="4.7"; sha256="0b57g7jwvqgqjzd7x1pd4nqpx22rmiskvf8wjwrgplqzx4daxny2"; depends=[wavethresh]; }; waved = derive2 { name="waved"; version="1.2"; sha256="0zv4rgazk9s295pggzfa7sc062zv68dgds1ngxcz7vg1fx0qkgxg"; depends=[]; }; - waveformlidar = derive2 { name="waveformlidar"; version="1.1.0"; sha256="01ynxgk0cf7w1h5j5dic4yayvnilgdx4ih0icwnldyhpik1wc2wx"; depends=[caTools data_table flux minpack_lm raster reshape2 rgdal rgeos sp splitstackshape sqldf]; }; wavefunction = derive2 { name="wavefunction"; version="1.0.0"; sha256="1g0g9i0s93lcpcx7icqn15bvkmd79slkgimspvvwp2bxdsc5nnf2"; depends=[]; }; - wavelets = derive2 { name="wavelets"; version="0.3-0.1"; sha256="13gaqhc2aqp5vcqa9gb4zilggnhszkz0zyk0whfj0s72yjvxxl27"; depends=[]; }; + wavelets = derive2 { name="wavelets"; version="0.3-0.2"; sha256="07706rsjdmzj46ib2kfm5lfk4bnm2wfw7rby0ixs6x0myyzxdl92"; depends=[]; }; wavemulcor = derive2 { name="wavemulcor"; version="2.2.1"; sha256="0150ybf8lwxc93zhcrsmh4gp6wbib3s14j95jlg6dlsckixyi3iw"; depends=[waveslim]; }; waver = derive2 { name="waver"; version="0.2.1"; sha256="1kl14cd96fwrqvk35sqbgi8bf31gc2ccxxy5d1v46scwyqkb0g5l"; depends=[geosphere rgdal rgeos sp]; }; - waveslim = derive2 { name="waveslim"; version="1.7.5.1"; sha256="0mky0nb4xxp8rybp87mxw2f1q6k400wpxv01zr4injv7ja6028xk"; depends=[]; }; + waveslim = derive2 { name="waveslim"; version="1.8.2"; sha256="0ibivnhz0l06sss5rrrcvyiwg3qpbyk3qn4vx4pp90kj09x4yg0k"; depends=[]; }; wavethresh = derive2 { name="wavethresh"; version="4.6.8"; sha256="1nz74bm7pgck1i9c28svxnic8wkwkm5dhc8bhrxiih5wxb36kcwk"; depends=[MASS]; }; wbs = derive2 { name="wbs"; version="1.4"; sha256="0ibrf30riavy6shaxgiznwh4gmnkx92260gsl0d74jkys98mlxdj"; depends=[]; }; wbstats = derive2 { name="wbstats"; version="0.2"; sha256="0rfc9c6892jq7y17dwp6vsn62ggnac964xndmxq3mip6k2pk8yi0"; depends=[httr jsonlite tidyr]; }; wbsts = derive2 { name="wbsts"; version="2.0"; sha256="12k68nsrrxglrm9ik53rm8160xvjlsgzi7v4wp78jhmh2slmyxw3"; depends=[mvtnorm Rcpp wmtsa]; }; wdm = derive2 { name="wdm"; version="0.2.1"; sha256="05yc366g2lii305ljrhh9939gf8sf517alw5xcr2sdclr00qxal4"; depends=[Rcpp]; }; - wdman = derive2 { name="wdman"; version="0.2.4"; sha256="00q9qk8qgz7fjbd9j8pxknrw8lk1ardifg8w4agyrk8r4q56b1a0"; depends=[assertthat binman semver subprocess yaml]; }; - wdpar = derive2 { name="wdpar"; version="1.0.0"; sha256="1039pf3hz5nym2y00wqwj027dc8m5ny2a1pqavbybn6cxbq0m2r1"; depends=[assertthat cli countrycode curl httr lwgeom progress rappdirs RSelenium sf sp wdman xml2]; }; + wdman = derive2 { name="wdman"; version="0.2.5"; sha256="1yf41lsrr9dbf5n4f5hv9mlmzl736fhnp9gxkm2g9apws6gsig02"; depends=[assertthat binman processx semver yaml]; }; + wdpar = derive2 { name="wdpar"; version="1.0.1"; sha256="0kqzizbs4bcph4vkv2v3wn6vcmdkpf9idl3wqadw805z2967ipv6"; depends=[assertthat cli countrycode curl httr lwgeom progress rappdirs RSelenium sf sp wdman xml2]; }; + weathercan = derive2 { name="weathercan"; version="0.3.3"; sha256="01hvrg2xx5nj7wspjhkwqs8lchya1ki16wj7flx1s1xzyd9n7x19"; depends=[dplyr httr lubridate purrr rlang rvest stringi stringr tidyr xml2]; }; weathermetrics = derive2 { name="weathermetrics"; version="1.2.2"; sha256="1hjhgsy3v8328hv4czxxz7kp68sxc10sy10f3dv5j8f6pka6qlsp"; depends=[]; }; weatherr = derive2 { name="weatherr"; version="0.1.2"; sha256="11sb5bmqccqkvlabsw4siy9n6ivsrvxavywvaffgrs3blmnygql9"; depends=[ggmap lubridate RJSONIO XML]; }; webTRISr = derive2 { name="webTRISr"; version="0.2.0"; sha256="10xj8qvibhnywsxd1yb4laz6b38qwn483a7bflizsndsgrbzdi5n"; depends=[dplyr httr jsonlite lubridate magrittr purrr readr sf stringr]; }; - webchem = derive2 { name="webchem"; version="0.4.0"; sha256="032bsfnkn7s33y42fyf8yradsh8jhms4ryjkh0r76hqnx3j00ph0"; depends=[httr jsonlite RCurl rvest stringr xml2]; }; - webddx = derive2 { name="webddx"; version="0.1.0"; sha256="0w72pp0f77glq460mjagm30y3nd9dmhjkbb0w06ycsjdqvr8qji7"; depends=[jsonlite]; }; + webchem = derive2 { name="webchem"; version="0.5.0"; sha256="06vnwvh054cj1hflip108h99ps0cb57cq4f8ydrjcxgpplbx0v4w"; depends=[dplyr httr jsonlite purrr RCurl rvest stringr xml2]; }; webdriver = derive2 { name="webdriver"; version="1.0.5"; sha256="0l3nz7gf62jlkvkn5sfxfvn0prxz3ds7nlpfb1yhnmdljhbzrgzf"; depends=[base64enc callr curl debugme httr jsonlite R6 showimage withr]; }; webex = derive2 { name="webex"; version="0.9.1"; sha256="0z85cfnjicy3q1n77ilrh43h6xh6bpr1f1iinzfk1r64031h90yl"; depends=[jsonlite knitr rmarkdown]; }; webglobe = derive2 { name="webglobe"; version="1.0.2"; sha256="1277d6fkgrgixlhikfwf0r6z8g5b7mah905xi219qsfycxmifgn9"; depends=[geojsonio httpuv jsonlite]; }; - webmockr = derive2 { name="webmockr"; version="0.5.0"; sha256="0x4hrhmxqm4291babkkdpv25f36kvz879q3ff2j4n6hk4maqvkki"; depends=[crul curl fauxpas jsonlite magrittr R6 urltools]; }; + webmockr = derive2 { name="webmockr"; version="0.6.2"; sha256="1mf0f1pb5dkk63m7a63k7pscax6dywz97d2ihsg10qkv0svn2sm6"; depends=[crul curl fauxpas jsonlite magrittr R6 urltools]; }; webp = derive2 { name="webp"; version="1.0"; sha256="1h17g2zaq6ipsb1w6ix9m68ddmp7dspmaqflqkskylh2n8jhk8cd"; depends=[]; }; webr = derive2 { name="webr"; version="0.1.5"; sha256="03yhlla74i71nphrfhr5sd57ykj7rjanh2a8nw3cq22rg9g668jk"; depends=[dplyr flextable ggforce ggplot2 magrittr moonBook psych purrr rlang rrtable scales shiny sjlabelled stringr tibble tidyr tidyselect vcd ztable]; }; webreadr = derive2 { name="webreadr"; version="0.4.0"; sha256="0l3l5g4zj5faxqi1kqwx9lq91gbj40z2q3csrsmpal08qnwkxs90"; depends=[Rcpp readr]; }; @@ -15134,9 +15296,9 @@ in with self; { weibullness = derive2 { name="weibullness"; version="1.19.8"; sha256="19s44mxxcnhngifxshsyjr3a9zvbwywmqgby5dxd73yid1p2k9mr"; depends=[]; }; weibulltools = derive2 { name="weibulltools"; version="1.0.1"; sha256="06blip2dqaz2f3wnghp8yj0qj23s242k3r7bfcka1n52msc58xjz"; depends=[dplyr LearnBayes magrittr plotly Rcpp RcppArmadillo sandwich segmented SPREDA survival]; }; weightQuant = derive2 { name="weightQuant"; version="1.0"; sha256="1ngz51wr5qpnb98lfbddwvipcra86dq5whm6z8c4xd921anb15bx"; depends=[doParallel foreach quantreg]; }; - weightTAPSPACK = derive2 { name="weightTAPSPACK"; version="0.1"; sha256="0kpfw477qka5qrc6sh73had38xbrwrqp1yv0dj2qiihkiyrp67ks"; depends=[HotDeckImputation mice plyr survey]; }; + weightedScores = derive2 { name="weightedScores"; version="0.9.5.3"; sha256="1wf01z94snwbqp22waz7qays3ymg5lsxpfpafdarad2b6mg5j2g8"; depends=[mvtnorm rootSolve]; }; weightr = derive2 { name="weightr"; version="2.0.2"; sha256="1qsyak91kdgv48wf6qhpfbiirlg4ba9w6rw8ynjcsnqqdvmly1lb"; depends=[ggplot2 scales]; }; - weights = derive2 { name="weights"; version="1.0"; sha256="0186bfpkhxngrshac6bpg37alp6slwhwd43inrm8hqg0vhpfgc4c"; depends=[gdata Hmisc mice]; }; + weights = derive2 { name="weights"; version="1.0.1"; sha256="1ka2kvzg464vn80qziqy4mrciy9wwd3jfasgq0d33wbiblhmxkj5"; depends=[gdata Hmisc mice]; }; weirs = derive2 { name="weirs"; version="0.25"; sha256="17a0ppi7ghikrwn39zvhg2cvhmnr3w0qi7r9lj22x65ii9nzadd7"; depends=[]; }; welchADF = derive2 { name="welchADF"; version="0.3.2"; sha256="02a8w1dhc2nd74hml4z3cdlx0d2a9rcx47v341kgav620i8bn88g"; depends=[lme4]; }; wellknown = derive2 { name="wellknown"; version="0.6.0"; sha256="156kffa421d6k9wnab4pr22h4c9gnkw3i2fbk5jg03jl2rff090w"; depends=[jsonlite V8]; }; @@ -15145,8 +15307,10 @@ in with self; { wfe = derive2 { name="wfe"; version="1.9.1"; sha256="0lcg7hzdll1wqdwydkk96m4n715h8sjn3qwhabm245m0hqhdf7is"; depends=[arm MASS Matrix]; }; wfg = derive2 { name="wfg"; version="0.1"; sha256="1r6wb8v42mpapjfhmkmghm9fq21c3s4zmdxy8nlh31nsja71c37d"; depends=[igraph]; }; wfindr = derive2 { name="wfindr"; version="0.1.0"; sha256="0m5xj50hqdjj4lpbgx1kp3my4njr0nz09hd63rf4qf1ls8r7zil9"; depends=[dplyr magrittr]; }; + wflo = derive2 { name="wflo"; version="1.2"; sha256="17g60f4rs4lplawass2x6m8qj86hv5l13x94da9ff0w54dkh4qwq"; depends=[]; }; wgaim = derive2 { name="wgaim"; version="2.0-1"; sha256="1qiyfkpsbzjr9xsq5kqq6rlqpndngkn2irdfh3gyi45h6hn118j4"; depends=[ggplot2 qtl]; }; wgeesel = derive2 { name="wgeesel"; version="1.5"; sha256="0lybvsq5168cjybzv2dbyx2z8aakcx7i7ivm8zc90haiispm9n5x"; depends=[bindata CRTgeeDR geepack MASS PoisNor]; }; + whatr = derive2 { name="whatr"; version="1.0.0"; sha256="0l9yvbqib2pf93dlslj5268c8l9zzywmy4kwijlvink6fasllrcn"; depends=[dplyr ggplot2 httr magrittr purrr rlang rvest scales stringr tibble tidyr xml2]; }; wheatmap = derive2 { name="wheatmap"; version="0.1.0"; sha256="1c1xvzy194vw3idkwkqp9kyrfldzczj30cl15jw1bbnw87zcwdzy"; depends=[colorspace RColorBrewer]; }; whereami = derive2 { name="whereami"; version="0.1.9"; sha256="0mjq9haacsf0zkgh7xxx8dr67hnw5ijjdhaz8c69mfjmd2zfzfwq"; depends=[cli jsonlite rstudioapi]; }; whereport = derive2 { name="whereport"; version="0.1"; sha256="1gdqzr2hrnpxbwl7cfps4m3xja8wkgwfs50i2nailybympvdnxm4"; depends=[dplyr]; }; @@ -15160,7 +15324,7 @@ in with self; { widals = derive2 { name="widals"; version="0.6.1"; sha256="1094yaaq2xb0ykvc1j3hs87j1p4h7zgf8mkn4han8iw5fmr9zncy"; depends=[snowfall]; }; widgetframe = derive2 { name="widgetframe"; version="0.3.1"; sha256="0j0d73m72nzfc1wyrgsqr99ldx72adis6pd57mpim55hz0n9l224"; depends=[htmltools htmlwidgets magrittr purrr]; }; widyr = derive2 { name="widyr"; version="0.1.2"; sha256="0mqj9w5sy8m2vqhjxmjrf68bfixbvmkigrsdzfnwvxp18hhfw5mj"; depends=[broom dplyr Matrix purrr reshape2 tidyr tidytext]; }; - wiesbaden = derive2 { name="wiesbaden"; version="1.2.1"; sha256="0ilqqv4xp4ngjq3snhzwdc8qzp3zr31kq2r4lqiv2arj5ggb1350"; depends=[httr jsonlite keyring readr stringi stringr xml2]; }; + wiesbaden = derive2 { name="wiesbaden"; version="1.2.2"; sha256="0zxz2cnxgx0p66ls1x2pz5i9iiv67ajm30a2n8m1alljnza6qigf"; depends=[httr jsonlite keyring readr stringi stringr xml2]; }; wikibooks = derive2 { name="wikibooks"; version="0.2"; sha256="178lhri1b8if2j7y7l9kqgyvmkn4z0bxp5l4dmm97x3pav98c7ks"; depends=[]; }; wikifacts = derive2 { name="wikifacts"; version="0.1.0"; sha256="01mwzqign59lh7wvf8q8kwkgnfxi9nkk6n0qwfh27q64fajw8clg"; depends=[magrittr rvest xml2]; }; wikilake = derive2 { name="wikilake"; version="0.4"; sha256="0pm0brzkf2k6aknwl4b3fba5ly7mhah8qfb0h94fckiaqbnpyx9v"; depends=[maps rvest selectr sp stringi stringr units WikipediR xml2]; }; @@ -15172,7 +15336,7 @@ in with self; { wildpoker = derive2 { name="wildpoker"; version="1.1"; sha256="1302ain55spz34irmq49sp9b1pvrn2nxmzmqs8m9wdk6g82h3s27"; depends=[]; }; wilson = derive2 { name="wilson"; version="2.3.1"; sha256="040hq68l2ja37gx8g6q1nrr9b15v4gmc2l23c772vr4gq9k97977"; depends=[circlize colourpicker ComplexHeatmap data_table DESeq2 DT factoextra FactoMineR ggplot2 ggrepel gplots heatmaply log4r magrittr openssl plotly plyr R6 RColorBrewer reshape rintrojs rje rjson RJSONIO scales shiny shinycssloaders shinydashboard shinyjs viridis zip]; }; winRatioAnalysis = derive2 { name="winRatioAnalysis"; version="0.1.0"; sha256="1msvc06bfzw9clinxbvr5fdw38dff0c0xii46182nwnk5kj0libr"; depends=[data_table JM Matrix MLEcens mvtnorm nlme plyr pssm survival]; }; - windAC = derive2 { name="windAC"; version="1.2.0"; sha256="1dwnj0spxq9n73vg938j5jn0vvzvlqnfb4j0slzxp6lvkkyd2sc4"; depends=[mvtnorm sf]; }; + windAC = derive2 { name="windAC"; version="1.2.1"; sha256="0irm0bh9j0x72nq37lwycv6f30bb5xqm736rj6z0g6bnfd16rrmk"; depends=[mvtnorm sf]; }; windex = derive2 { name="windex"; version="1.0"; sha256="0ci10x6mm5i03j05fyadxa0ic0ngpyp5nsn05p9m7v1is5jhxci0"; depends=[ape geiger scatterplot3d]; }; windfarmGA = derive2 { name="windfarmGA"; version="2.2.3"; sha256="13jdh0c8lkc3043mnqx23s06xxkf6dvk7w9kfvwhib58rlgy0p2n"; depends=[calibrate doParallel foreach ggplot2 gstat leaflet magrittr raster RColorBrewer Rcpp rgdal rworldmap sf sp spatstat]; }; wingui = derive2 { name="wingui"; version="0.2"; sha256="0yf6k33qpcjzyb7ckwsxpdw3pcsja2wsf08vaca7qw27yxrbmaa3"; depends=[Rcpp]; }; @@ -15180,6 +15344,7 @@ in with self; { wiqid = derive2 { name="wiqid"; version="0.2.3"; sha256="166d9cdrj8vz2m5n1yxhckhs9nmd3sv13c3jcifzjixl45f8f2aa"; depends=[coda HDInterval MASS truncnorm]; }; wiseR = derive2 { name="wiseR"; version="1.0.1"; sha256="187ylwhk06957x9zm5r0m6w9wg08im83myz3s4gr927ig8yv3b5f"; depends=[arules bnlearn DescTools dplyr DT graph HydeNet igraph linkcomm missRanger psych RBGL Rgraphviz rhandsontable rintrojs shiny shinyalert shinyBS shinycssloaders shinydashboard shinyWidgets visNetwork]; }; withr = derive2 { name="withr"; version="2.1.2"; sha256="11j6zykklxnvp4xqsr6a2xib665i38m3khdspp887nwagmvnydj1"; depends=[]; }; + wkNNMI = derive2 { name="wkNNMI"; version="1.0.0"; sha256="0qpl1b2134kz9mjl38w93lp3g6kpv9ygv9hygpssm845k02hkw7c"; depends=[foreach infotheo]; }; wkb = derive2 { name="wkb"; version="0.4-0"; sha256="0mah538345npkb06bcj18mb6qnnx8nn7bdqmvqqpbawallh546a9"; depends=[sp]; }; wktmo = derive2 { name="wktmo"; version="1.0.5"; sha256="05pjyk0xsdazbi1x7xfmg097ybybd60zmzzm7sch1ikp05hzn0wb"; depends=[]; }; wmlf = derive2 { name="wmlf"; version="0.1.2"; sha256="0zxw84l5v12r15hpyd1kbajjz3cbkn5g884kmj72y7yi0yi1b6d6"; depends=[waveslim]; }; @@ -15200,9 +15365,9 @@ in with self; { wordmatch = derive2 { name="wordmatch"; version="1.0"; sha256="0zscp361qf79y1zsliga18hc7wj36cnydshrqb9pv67b65njrznz"; depends=[plyr reshape2]; }; wordnet = derive2 { name="wordnet"; version="0.1-14"; sha256="12a21zlc7h973gi1632gngbk8b09vhp3sldh1mh9b5n6h18ga25p"; depends=[rJava]; }; wordspace = derive2 { name="wordspace"; version="0.2-6"; sha256="11y57mzd12klwd2xzr38nvlrxg9jsi33mxd8nnvc96hgrjsgwakl"; depends=[cluster iotools MASS Matrix Rcpp sparsesvd]; }; - workflowr = derive2 { name="workflowr"; version="1.6.0"; sha256="0q1rmaqf6v7zv8jfj7mzmdl4s87841lb3x0q34al9sgz8shwp36p"; depends=[callr fs getPass git2r glue httpuv httr knitr rmarkdown rprojroot rstudioapi stringr whisker yaml]; }; - workflows = derive2 { name="workflows"; version="0.1.0"; sha256="1vmjlfyjavvz0677832cvn296xwk5rkv0jr4cncganadh2yjqa1d"; depends=[cli ellipsis generics glue hardhat parsnip rlang]; }; - worldmet = derive2 { name="worldmet"; version="0.8.7"; sha256="1hhh3a28xxi5265053gclsbihv41372f64isz9xc5sjdjnpcv6g4"; depends=[doParallel dplyr foreach leaflet openair readr zoo]; }; + workflowr = derive2 { name="workflowr"; version="1.6.1"; sha256="15am5qcscwfcg2b80ky3c72mkqmlibp49b76468q4x8pmkr3prwi"; depends=[callr fs getPass git2r glue httpuv httr knitr rmarkdown rprojroot rstudioapi stringr whisker yaml]; }; + workflows = derive2 { name="workflows"; version="0.1.1"; sha256="14lzbszz7ybfzqa5zw1hfh81b8rbwwyza6x8nhpnknl6x4adqfql"; depends=[cli ellipsis generics glue hardhat parsnip rlang]; }; + worldmet = derive2 { name="worldmet"; version="0.8.8"; sha256="0zanjlb2h10v4hss8w0p234k5yy3rnd1plzr9smiwn06fbmvy5zy"; depends=[doParallel dplyr foreach leaflet openair readr zoo]; }; worms = derive2 { name="worms"; version="0.2.2"; sha256="183chjdi5qvsmdznvc9igcxaz769a37rwh5nzgvf5zf012a85wir"; depends=[httr plyr]; }; worrms = derive2 { name="worrms"; version="0.4.0"; sha256="0nb02k0aimf6z1fw4y5qzja4xwgwff7gdzh364w2lrhj8imcb044"; depends=[crul data_table jsonlite tibble]; }; wosr = derive2 { name="wosr"; version="0.3.0"; sha256="0fl9mizrjg3r7n7gslsxgaw3k2v63scqmvnv6341q8sq7018hzln"; depends=[httr jsonlite pbapply xml2]; }; @@ -15210,22 +15375,23 @@ in with self; { wpp2010 = derive2 { name="wpp2010"; version="1.2-0"; sha256="1h87r1cn4lnx80dprvawsyzfkriscqjgr27gvv7n19wvsx8qd57k"; depends=[]; }; wpp2012 = derive2 { name="wpp2012"; version="2.2-1"; sha256="00283s4r36zzwn67fydrl7ldg6jhn14qkf47h0ifmsky95bd1n5k"; depends=[]; }; wpp2015 = derive2 { name="wpp2015"; version="1.1-2"; sha256="07bnbmrshlqnlpca5djpq5crnpsmz228wmbpv1ah7ywnjvks6fyx"; depends=[plyr]; }; - wpp2017 = derive2 { name="wpp2017"; version="1.2-1"; sha256="1hg3fj92ja93kw226crfxjvnjb7p0svdbi6pr3sqkg9w5zpwfwp1"; depends=[]; }; - wpp2019 = derive2 { name="wpp2019"; version="1.1-0"; sha256="0gx8rgz9lg6crn6ss76sg4xj8dsiwj08fkq5f67slvx4c0cjfhc5"; depends=[]; }; + wpp2017 = derive2 { name="wpp2017"; version="1.2-3"; sha256="1w7cg31larvgaah16ch6z11jjq02i5f20hfwg63wvw5p6fyafivz"; depends=[data_table]; }; + wpp2019 = derive2 { name="wpp2019"; version="1.1-1"; sha256="03c0ybk1m8lr6dxckm1950h617yhphgxsg01qj5ywbcm7rpvw1a0"; depends=[data_table]; }; wppExplorer = derive2 { name="wppExplorer"; version="2.3-3"; sha256="0sz31xsdlk9p52sl5dik7g0qmkrjb7ydkknd154c988kqb5gbp0w"; depends=[DT ggplot2 googleVis Hmisc plyr reshape2 shiny shinyjs shinythemes wpp2019]; }; wql = derive2 { name="wql"; version="0.4.9"; sha256="0m16l807mhcjkbqhlzhc24pw4hl78fjyykiszlg337x3qs803fg2"; depends=[ggplot2 reshape2 zoo]; }; wqs = derive2 { name="wqs"; version="0.0.1"; sha256="14qaa9g9v4nqrv897laflib3wwhflyfaf9wpllmbi5xfv9223rcg"; depends=[glm2 Rsolnp]; }; wrMisc = derive2 { name="wrMisc"; version="1.1.0"; sha256="10cg4l963aabynic25m6k3sp69d6amhkpqv5x5m38nidy4855jzb"; depends=[MASS]; }; wrProteo = derive2 { name="wrProteo"; version="1.0.0"; sha256="110rpwac6hccv8i55fdw3mzd500jip1ldzmqw4196igq61cd9m20"; depends=[limma wrMisc]; }; wrangle = derive2 { name="wrangle"; version="0.5.2"; sha256="1b6qgwdjvwbrarp9ylgkb5ia1p5a5g7ws0jyqrwc6hii8z5yj2qb"; depends=[dplyr lazyeval magrittr rlang tidyr]; }; - wrapr = derive2 { name="wrapr"; version="1.9.6"; sha256="0kpwjasnsskk6l2najydcxqwa0ms2mf7v0y286hv8gipqfq48z03"; depends=[]; }; - wrassp = derive2 { name="wrassp"; version="0.1.8"; sha256="052x0lxpchr6f97yfj3vmhh8gc8qg5pp1m91h5akrav4yfawbs7k"; depends=[]; }; + wrapr = derive2 { name="wrapr"; version="2.0.0"; sha256="15171m6bljlmbzds24sy5z8spx8la5ahg1i49i8yghymkp6vvslw"; depends=[]; }; + wrassp = derive2 { name="wrassp"; version="0.1.9"; sha256="09z8s0g6l9z4rwnf36w4bd734agd471swz3f24178b4j6m05kqhm"; depends=[tibble]; }; write_snns = derive2 { name="write.snns"; version="0.0-4.2"; sha256="0sxg7z8rnh4lssbivkrfxldv4ivy37wkndzzndpbvq2gbvbjnp4l"; depends=[]; }; writexl = derive2 { name="writexl"; version="1.2"; sha256="09fhdip6igcg97fjx4c7727cx2lb49l4d74l4i8rg2bag2s5lrj3"; depends=[]; }; wrswoR = derive2 { name="wrswoR"; version="1.1"; sha256="0jnb818xz841bx2i03k3hhy4hxcwpxblskg9nrc8kgbc22rxx4lz"; depends=[logging Rcpp]; }; wrswoR_benchmark = derive2 { name="wrswoR.benchmark"; version="0.2"; sha256="0vzs2lqq48kzk63xz2k9b7qcy0ph5yyvih6z98jfz36kpdfhdps9"; depends=[curl lazyeval]; }; 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]; }; + wsbackfit = derive2 { name="wsbackfit"; version="1.0-2"; sha256="0whid2c5lzq4ahciky35mdbgkbp75gsdbf5fps954h5am3dlglhz"; depends=[]; }; + wskm = derive2 { name="wskm"; version="1.4.40"; sha256="0x5nc3bwqawx0k95v088dsx83dm7lw5lkryjvq6bl57bgrcn7n0l"; depends=[fpc lattice latticeExtra]; }; wsrf = derive2 { name="wsrf"; version="1.7.17"; sha256="0gmlvfcy2iqa5sqhwps3hx0hl9fir8nf5xq62f25sn8i3llw752z"; depends=[Rcpp]; }; wsyn = derive2 { name="wsyn"; version="1.0.2"; sha256="0jl0wnw11yrbiygcpcnl1yi8xf5dd3sbh0c2yic8dc0p64k6iass"; depends=[fields MASS]; }; wtest = derive2 { name="wtest"; version="3.2"; sha256="063ax9mbb2dy33l1cl533mjzpvhf2akw3613pklfjg6bhprlniz7"; depends=[]; }; @@ -15233,10 +15399,10 @@ in with self; { wv = derive2 { name="wv"; version="0.1.1"; sha256="06xf3c97pjhln1v31waj8rmp4r0y2kp6v2x10pbpvi8m0nf5zfs1"; depends=[coda Rcpp RcppArmadillo simts]; }; wvtool = derive2 { name="wvtool"; version="1.0"; sha256="0x9awj6g5lzqp2lhwgh9ib7jmfdzyhwazrjvw1vwacqqfhbz8qxv"; depends=[]; }; wwntests = derive2 { name="wwntests"; version="1.0.0"; sha256="1wsqbhsnzkishqwxz5kjcb5xawafizi3ip4yzxj05p9rx9wja1yc"; depends=[ftsa MASS rainbow sde]; }; - wyz_code_metaTesting = derive2 { name="wyz.code.metaTesting"; version="1.1.4"; sha256="0npk9axsg6x8pgf3f19y2544jlrzf88269604cfdynp724l2dwb9"; depends=[crayon data_table lubridate tidyr wyz_code_offensiveProgramming]; }; - wyz_code_offensiveProgramming = derive2 { name="wyz.code.offensiveProgramming"; version="1.1.16"; sha256="1hsm6mb6cz58f0xgl8330gd40kbqplg3d4r133ncg0r43qb528xj"; depends=[crayon data_table lubridate R6 stringr tidyr]; }; - wyz_code_rdoc = derive2 { name="wyz.code.rdoc"; version="1.1.7"; sha256="0rravk8hl2pbr3blsx96xas2zi7c9d83mpzhrqqqna66hg88zq5q"; depends=[data_table lubridate R6 tidyr wyz_code_offensiveProgramming]; }; - wyz_code_testthat = derive2 { name="wyz.code.testthat"; version="1.1.9"; sha256="0i4jmww0sg5w8ffvk4302jdi3m5bfrbywbx5756r4dijfhv9n2kq"; depends=[data_table lubridate R6 tidyr wyz_code_offensiveProgramming]; }; + wyz_code_metaTesting = derive2 { name="wyz.code.metaTesting"; version="1.1.11"; sha256="1misp5yc015himyd0qniwz1b7fh6x74pw7si5c4gh18brwszycpw"; depends=[crayon data_table lubridate tidyr wyz_code_offensiveProgramming]; }; + wyz_code_offensiveProgramming = derive2 { name="wyz.code.offensiveProgramming"; version="1.1.17"; sha256="00s8dzk86r3iaxvihzpgi550ljqy38sdlma7gvvb2mma6xa114i5"; depends=[crayon data_table lubridate R6 stringr tidyr]; }; + wyz_code_rdoc = derive2 { name="wyz.code.rdoc"; version="1.1.15"; sha256="08f3c9wnlwwv6lhzhl9aljwnqmz0hrf7j2hrd90wa6m31aaks7dj"; depends=[crayon data_table digest lubridate R6 stringr tidyr wyz_code_offensiveProgramming]; }; + wyz_code_testthat = derive2 { name="wyz.code.testthat"; version="1.1.16"; sha256="06xbhk5b0r8y98xl0lab5cndlhv3a9dvbhrnld39mhq1wwryx2sh"; depends=[data_table lubridate R6 tidyr wyz_code_offensiveProgramming]; }; x_ent = derive2 { name="x.ent"; version="1.1.7"; sha256="15qra77dqhj27g3qx92gram4mq4n9fdidygdpvxfmcx7ww3vc6yh"; depends=[ggplot2 jsonlite statmod stringr xtable]; }; x12 = derive2 { name="x12"; version="1.9.0"; sha256="0hrcw1d52yp5rr4r120lcnfxw2rgs95njg37m28blcnfbq2flfc2"; depends=[stringr x13binary]; }; x12GUI = derive2 { name="x12GUI"; version="0.13.0"; sha256="1mga7g9gwb3nv2qs27lz4n9rp6j3svads28hql88sxaif6is3nk1"; depends=[cairoDevice Hmisc lattice RGtk2 stringr x12]; }; @@ -15247,43 +15413,44 @@ in with self; { xRing = derive2 { name="xRing"; version="0.1.0"; sha256="17f1jif8yw2508k86p8mjgw1h20ml5wzaff04ix9xq96plqzi8ma"; depends=[dplR imager tcltk2 tkRplotR]; }; xSub = derive2 { name="xSub"; version="2.0.2"; sha256="00mahp8fi6iskjaf5nwka67a7hqb3i08j8yrd4d2av39zfs268h2"; depends=[countrycode haven RCurl]; }; xVA = derive2 { name="xVA"; version="0.8.1"; sha256="0wr4i37sya5gg6v63ka16g9077gxbhvjqyqfaahhban8skzl2adf"; depends=[SACCR Trading]; }; - xaringan = derive2 { name="xaringan"; version="0.14"; sha256="16c20bkhizw65nnp2lyc6kjd461abj794qh4d00y8fglyj6wjjky"; depends=[htmltools knitr rmarkdown servr xfun]; }; + xaringan = derive2 { name="xaringan"; version="0.16"; sha256="1jdj8qkadb09x7kvf93h4mp8gxk6lda8aspldhdki9qqpdc78gc8"; depends=[htmltools knitr rmarkdown servr xfun]; }; xbreed = derive2 { name="xbreed"; version="1.0.1.1"; sha256="032i04ginyf9dyabfkygnhrkq7lqdvvyw7s41vjimy2kvjrnkkkx"; depends=[BGLR]; }; xdcclarge = derive2 { name="xdcclarge"; version="0.1.0"; sha256="1j8wsidwmfjygqlwavxinv4bqc6rddy42jdmlknsjfrrs49yj8kn"; depends=[nlshrink Rcpp RcppArmadillo]; }; - xergm = 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.3"; sha256="1pvdx0mxg2f885bhy4hb3kqzcgva4q7hzzaipkfzyi5lnjdsbc81"; depends=[bupaR data_table dplyr lubridate purrr stringr tidyr XML xml2]; }; xfun = derive2 { name="xfun"; version="0.12"; sha256="0sgh8kafi9x1glmmcp1ly827pm8q7fsfngbplr41fbb4nc9363df"; depends=[]; }; xgb2sql = derive2 { name="xgb2sql"; version="0.1.2"; sha256="1gw5dw0ck5hip8mv347zaswrggk395bg2hgn02bvqs0d31jhmgvi"; depends=[data_table xgboost]; }; - xgboost = derive2 { name="xgboost"; version="0.90.0.2"; sha256="1gy9rzg43mjpfis893vf15drmbigfn0481zrzss9ajnmnk0q8194"; depends=[data_table magrittr Matrix stringi]; }; + xgboost = derive2 { name="xgboost"; version="1.0.0.2"; sha256="1ld2w51c5fy3bl0kvjn1iplffc4lmin9s9zz5xx7xsm44d6j6kzd"; depends=[data_table magrittr Matrix stringi]; }; xgobi = derive2 { name="xgobi"; version="1.2-15"; sha256="03ym5mm16rb1bdwrymr393r3xgprp0ign45ryym3g0x2zi8dy557"; depends=[]; }; xgxr = derive2 { name="xgxr"; version="1.0.7"; sha256="1hl2xblq06mgy0a1apfvdinyr8sqqmvqqi42xmcyl9di5x9kb0qx"; depends=[assertthat binom dplyr ggplot2 labeling magrittr pander png scales tibble]; }; 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]; }; xkcdcolors = derive2 { name="xkcdcolors"; version="1.0"; sha256="07fnjv01r3b951dqca2zs9b9f6hsgbpbpsrggvb8rps53kpid0i7"; depends=[FNN]; }; xlink = derive2 { name="xlink"; version="1.0.1"; sha256="02ahgjampy92gcwhv269px5w8651a7j50dn1295zwqxj44lk4g9q"; depends=[survival]; }; - xlsx = derive2 { name="xlsx"; version="0.6.1"; sha256="1d58qlzdj4vrk4vnlyzri600ix7z3wnc30gnbcc1qz27nlbbv055"; depends=[rJava xlsxjars]; }; + xlsx = derive2 { name="xlsx"; version="0.6.3"; sha256="0ph3bqngczm2h46s159s6cpxjkcrsi1di8a325x2wl5ls7mbiag5"; depends=[rJava xlsxjars]; }; xlsx2dfs = derive2 { name="xlsx2dfs"; version="0.1.0"; sha256="0bdawr80grks91sy221d33fsk75g20zh3wjg6gvd0zj0m1zvvwvd"; depends=[openxlsx]; }; xlsxjars = derive2 { name="xlsxjars"; version="0.6.1"; sha256="1rka5smm7yqnhhlblpihhciydfap4i6kjaa4a7isdg7qjmzm3h9p"; depends=[rJava]; }; xltabr = derive2 { name="xltabr"; version="0.1.2"; sha256="0pwbpcdiqkhvzxsi6yxly4zza12bw7zc7ji8cvhldw4yl5sxkz1l"; depends=[magrittr openxlsx]; }; xlutils3 = derive2 { name="xlutils3"; version="0.1.0"; sha256="1cxishi62bd36zlsy5qhzix1p68akdf9kpjg9gfm9aqpcijzccb9"; depends=[magrittr readxl]; }; xmeta = derive2 { name="xmeta"; version="1.1-5"; sha256="1r2mqrrcl7vmbyydw3kzpskinkiqr919bxgq69i1y6pbfim7jzag"; depends=[aod glmmML metafor mvmeta numDeriv]; }; - xml2 = derive2 { name="xml2"; version="1.2.2"; sha256="1x3q3a0xv8j0nx3hs4d3pfjm5g9nvaxmfrapba9f4nrkqi3z2l1h"; depends=[Rcpp]; }; + xml2 = derive2 { name="xml2"; version="1.3.0"; sha256="138v9374xwc7flw8fz8qp8q3w4fch2jviij0g10dg92xn9dsyani"; depends=[]; }; xmlparsedata = derive2 { name="xmlparsedata"; version="1.0.3"; sha256="0gjr3l5z5dp276lchr2649as1rkj56d2mlvbr66yg393zzw50lsh"; depends=[]; }; xmlrpc2 = derive2 { name="xmlrpc2"; version="1.1"; sha256="13rfw0civp3hzi4hn31x1idliid1qb73495x4c31z5msd35lzxrs"; depends=[base64enc curl xml2]; }; xmrr = derive2 { name="xmrr"; version="1.0.36"; sha256="0xxi8z9sp156508y5a7f4ax8yry7lg4qmn0hyk04dn1xr7syd4gs"; depends=[dplyr ggplot2 tidyr]; }; - xnet = derive2 { name="xnet"; version="0.1.10"; sha256="1jjnj35j8wwnlc1w31m3l95kmgxm58rfbfkidrjhq6l96npprgn4"; depends=[]; }; - xoi = derive2 { name="xoi"; version="0.68-3"; sha256="0swi9zilghkfm17b39sdn7im4pcxcw7fk77jqxwib29q7x6574bk"; depends=[qtl]; }; + xnet = derive2 { name="xnet"; version="0.1.11"; sha256="18lda1gv53awsbkk5p4bzrbilndgybdz8xc6lhl6wy647fw9q9hv"; depends=[]; }; + xoi = derive2 { name="xoi"; version="0.69-2"; sha256="1582flnh76fmqx5v1rzf021hlrcg53f2fdax1a8ad1nrcjpbj18r"; depends=[qtl]; }; xopen = derive2 { name="xopen"; version="1.0.0"; sha256="1vrvgdika1d63dwygynbv2wmd87ll8dji5dy89hj576n8hw601z2"; depends=[processx]; }; + xpectr = derive2 { name="xpectr"; version="0.3.0"; sha256="1v3hhih99f0bckjr0jv6pwp0iil4996981ix7nr1b5p4j7pf69ac"; depends=[checkmate clipr dplyr lifecycle plyr rlang rstudioapi testthat tibble withr]; }; 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.6"; sha256="0y3fcy2g8qnb5nzfwimrx87c2h3k26im9h64fmv834zba7chkc47"; 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.2"; sha256="19zmzawp4mprwbcq2ajwwmmnf8vgnrkn86m246gz5f7rxzqz0vk3"; depends=[]; }; + xpose = derive2 { name="xpose"; version="0.4.8"; sha256="0dc9ywkkb98fyp4j1gak4jrnmgcvx9hpf5ixspxaqb4aqqgqnjcs"; depends=[dplyr ggforce ggplot2 purrr readr rlang stringr tibble tidyr vpc]; }; + xpose_nlmixr = derive2 { name="xpose.nlmixr"; version="0.1.5"; sha256="05fb453ayzrscha0153gx8axdqgml3zq5cacp440f9a66nv2dwfi"; depends=[crayon dplyr ggplot2 magrittr nlme nlmixr stringr tibble tidyr vpc xpose]; }; + xpose4 = derive2 { name="xpose4"; version="4.7.0"; sha256="0lpbk85d17spg6vwf7acqaz7fv2l0rv6qkczbgm4fw28qiaykci6"; depends=[dplyr gam Hmisc lattice lazyeval readr survival]; }; + xptr = derive2 { name="xptr"; version="1.1.3"; sha256="0352vs8dz61hgpwnf3r9r9haz3adg2wk9qxzrv313p1fcyfjz91v"; depends=[]; }; xray = derive2 { name="xray"; version="0.2"; sha256="1ibj92ljlj8a5rmbrci691yhpd4kwrfyl944nzl2dcbf58l01dzq"; depends=[dplyr foreach ggplot2 lubridate scales]; }; xrf = derive2 { name="xrf"; version="0.1.2"; sha256="0mcyjw75f2w3hvx1r6lhc4yidmih2z6dfmkxvywm499whk2pcqhv"; depends=[dplyr fuzzyjoin glmnet Matrix rlang xgboost]; }; + xrnet = derive2 { name="xrnet"; version="0.1.7"; sha256="136aadrvsdg9hizjg4q12h56ih0s3w88j3jpfb54ajgdmqw3pldi"; depends=[BH bigmemory foreach Rcpp RcppEigen]; }; xseq = derive2 { name="xseq"; version="0.2.1"; sha256="0bsakbfvkfv39q2ch2g21b17g84470sq4v73355cljlshsi6404i"; depends=[e1071 gptk impute preprocessCore RColorBrewer sfsmisc]; }; - xslt = derive2 { name="xslt"; version="1.3"; sha256="0giqzmdby9ax8gwx9b7xqka28k3hgymv4289k8p8dvg26d683p3l"; depends=[Rcpp xml2]; }; + xslt = derive2 { name="xslt"; version="1.4"; sha256="0qdrw6f0m5y4y9ky7r766jy4wqi6hw892xcfw4byfby9a4cfj7m6"; depends=[Rcpp xml2]; }; xsp = derive2 { name="xsp"; version="0.1.2"; sha256="1jbmxa234v52qji8sz4bkg24c2n65b0zh9py1wyyfzw9n1wx5w0r"; depends=[ggplot2 reshape2]; }; xspliner = derive2 { name="xspliner"; version="0.0.4"; sha256="1j3wlw39r3ahhdfq3rks1zhnlmz14f4wk7bl7gf94yffasqg6k2r"; depends=[dplyr ggplot2 magrittr mgcv pdp pROC purrr tidyr]; }; xtable = derive2 { name="xtable"; version="1.8-4"; sha256="077xfm0gphvhsay75amd9v90zk57kjgrrlgih04fyrbqqblc1gjs"; depends=[]; }; @@ -15292,48 +15459,48 @@ in with self; { xtermStyle = derive2 { name="xtermStyle"; version="3.0.5"; sha256="1q4qq8w4sgxbbb1x0i4k5xndvwisvjszg830wspwb37wigxz8xvz"; depends=[]; }; xts = derive2 { name="xts"; version="0.12-0"; sha256="0q4cc8ynp7ndmgll1jj3lxyl6wmgg89ad3wq09kjc2ngszdfc4fz"; depends=[zoo]; }; xtune = derive2 { name="xtune"; version="0.1.0"; sha256="0bpf1cx7v7q0a1jip04xd0bjg9ilagrf7wg7a9y0m6wgw7s2b9jn"; depends=[glmnet selectiveInference]; }; - xwf = derive2 { name="xwf"; version="0.2-2"; sha256="1psryam65pg7flfa20smm6lx184f76dhjv1lig8sy7y9hphfv3s1"; depends=[mgcv]; }; + xwf = derive2 { name="xwf"; version="0.2-3"; sha256="1byj6vjk2abm9j919107xsa3nd40zbsvxaldvv4ml3c47k1fg3kc"; depends=[mgcv]; }; xxIRT = derive2 { name="xxIRT"; version="2.1.2"; sha256="0b8yv8ixmcjiv9hlvpfdknx815smy7df7f2ixifnvhxxafgf1fwq"; depends=[ggplot2 glpkAPI lpSolveAPI reshape2]; }; - xyloplot = derive2 { name="xyloplot"; version="1.6"; sha256="0d1dv3syfjwcp9fil9bl1my19d0kdyz1qrp1yf7ykrk8aq91762v"; depends=[]; }; + xyloplot = derive2 { name="xyloplot"; version="2.0"; sha256="0d400wfcqb68nihrf84s6rr3ibnb50py93hmb50zhmbs307lh31x"; depends=[]; }; xyz = derive2 { name="xyz"; version="0.2"; sha256="13w4sb4pvgciwr8wsz785dafj2k2kpx7znz46r5d32wx88vkycp4"; depends=[Rcpp]; }; - yaImpute = derive2 { name="yaImpute"; version="1.0-31"; sha256="0088i9rlpkxb42xp11cr0h2ql9k581qvnz4ppldrnqci8c1qdpff"; depends=[]; }; + yaImpute = derive2 { name="yaImpute"; version="1.0-32"; sha256="1zvkrmlj48ahg9jq0fkbn7j603fmmld57yc0gjfas2mqa7cfbvh8"; depends=[]; }; yacca = derive2 { name="yacca"; version="1.1.1"; sha256="1hxgkyxipk27p74vdkiy8a3wjymhcsc6ad3y9mf15qsl2xim6wwl"; depends=[]; }; yager = derive2 { name="yager"; version="0.1.0"; sha256="01gxpaf4wvii056xn84m9gkq46m7hxqgg5f2frakhgnlpm3afgfb"; depends=[lhs MLmetrics randtoolbox]; }; yakmoR = derive2 { name="yakmoR"; version="0.1.1"; sha256="09aklz79s0911p2wnpd7gc6vrbr9lmiskhkahsc63pdigggmq9f7"; depends=[BBmisc checkmate Rcpp]; }; - yaml = derive2 { name="yaml"; version="2.2.0"; sha256="0in562nd0i23cg91a8kdbqgim656fgscykwi0icsnq53xj3srg2m"; depends=[]; }; - yamlet = derive2 { name="yamlet"; version="0.3.3"; sha256="181kz8xnkgm7k9ff6iw7jydfl69717b19bwwwxpyy8p9pxzmr94q"; depends=[csv dplyr encode ggplot2 knitr rlang yaml]; }; + yaml = derive2 { name="yaml"; version="2.2.1"; sha256="10r7g26x73am45niigm3k466030nymnr3v3fjljafzrr5aybf58i"; depends=[]; }; + yamlet = derive2 { name="yamlet"; version="0.4.6"; sha256="1113iid1iiz7rnsz7v5r95rdwnq9zdiwa8q4805vb3sjjk531kqq"; depends=[csv dplyr encode ggplot2 rlang spork units xtable yaml]; }; yap = derive2 { name="yap"; version="0.1.0"; sha256="12cagxisky7aq04ab9ycd4mp7xfs7z0v3rc2sczcngn2pc8pdjm7"; depends=[lhs randtoolbox]; }; - yardstick = derive2 { name="yardstick"; version="0.0.5"; sha256="0gmfq1jx8lp6b24clxyj5r1976q3znlchbqa6jk87lyd5fn43f7b"; depends=[dplyr generics pROC Rcpp rlang tidyselect]; }; + yardstick = derive2 { name="yardstick"; version="0.0.6"; sha256="1qkvbvc0cnwl5mkk47swnd8by84zz0qpy1996fziapn35qxvx9qa"; depends=[dplyr generics pROC Rcpp rlang tidyselect]; }; yarr = derive2 { name="yarr"; version="0.1.2"; sha256="16q109jrydckz7s1rkmr2sh8q92cgr1c534fvpbh3h0bc3fvvf8g"; depends=[]; }; yarrr = derive2 { name="yarrr"; version="0.1.5"; sha256="1258bj7x4icaxfabnnd3fgwydnqbzxkih7zw0sdlwdax3q8fw5c5"; depends=[BayesFactor circlize jpeg]; }; yasp = derive2 { name="yasp"; version="0.2.0"; sha256="0fza8h9y1wmarsmjcvw4r970d6j4ii795pd2h4xh9nlsirv50adi"; depends=[]; }; - yatah = derive2 { name="yatah"; version="0.0.1"; sha256="1w76a34k3jyiv1ql2bkyh1d77p1lqsyvy2p0ip3sdrsi043a5s4y"; depends=[ape purrr stringr]; }; + yatah = derive2 { name="yatah"; version="0.1.0"; sha256="0ayy0h399g3csn106vvq6j4h6w0sgzw33b7gj1hk05nc8hdzrmna"; depends=[ape purrr stringr]; }; ycinterextra = derive2 { name="ycinterextra"; version="0.1"; sha256="0hr37izbbmxqkjy6a7q8vcn0vs8an1ck9y8xfjpl5z0rygi8xc1v"; depends=[mcGlobaloptim]; }; - yesno = derive2 { name="yesno"; version="0.1.0"; sha256="0l3v51kghbq9s00s736s4jvl8a0yhbgb908mjvhw6k5nqb2cgh8a"; depends=[]; }; + yesno = derive2 { name="yesno"; version="0.1.1"; sha256="10saf2s3argpxgny2av5mm021nx09302rvr29887a7mvm5662kl2"; depends=[]; }; yhat = derive2 { name="yhat"; version="2.0-0"; sha256="0vdhkknmms7zy7iha894jn1hr1h5w67pr53r0q67m7p404w21iza"; depends=[boot miscTools plotrix yacca]; }; yhatr = derive2 { name="yhatr"; version="0.15.1"; sha256="18g2cr1kjxnfw6cwzl62ynppfv1zz732kbx18zq8918l85kx6wbw"; depends=[httr jsonlite stringr]; }; ykmeans = derive2 { name="ykmeans"; version="1.0"; sha256="0xfji2fmslvc059kk3rwkv575ffzl787sa9d4vw5hxnsmkn8lq50"; depends=[foreach plyr]; }; yll = derive2 { name="yll"; version="1.0.0"; sha256="0lf3cd6pfzki29nk2iy0vd6v4dw6zlsbrjh2839zq5vlpiimsvck"; depends=[]; }; - ymlthis = derive2 { name="ymlthis"; version="0.1.1"; sha256="04vf722n0yk50bclv25m11rfvqjja5kjzkn9bbdf8pw3kw83brqa"; depends=[crayon fs glue magrittr miniUI purrr rlang rmarkdown rstudioapi shiny shinyBS stringr usethis whoami withr yaml]; }; + ymlthis = derive2 { name="ymlthis"; version="0.1.2"; sha256="01jfkf9ymj8p0gvcd491i7rfaw3mj101jqbkbxmwhv7rl4r2vmql"; depends=[crayon fs glue magrittr miniUI purrr rlang rmarkdown rstudioapi shiny shinyBS stringr usethis whoami withr yaml]; }; yonder = derive2 { name="yonder"; version="0.2.0"; sha256="1ilzn17w6skd0dhwxyrgnfzyazafp8hsi8q6pfxz6k16cd668mc0"; depends=[htmltools magrittr shiny]; }; yorkr = derive2 { name="yorkr"; version="0.0.7"; sha256="035pmvignq4lip3y5670kxj1n70ff04yy2jwi4837pimr9d0qjhv"; depends=[dplyr ggplot2 gridExtra reshape2 rpart_plot yaml]; }; youtubecaption = derive2 { name="youtubecaption"; version="0.1.3"; sha256="03xndrs28qlbr9bywbxxx110gsp0n36wqvf98ys7ypmlj6vki4ya"; depends=[dplyr magrittr purrr reticulate stringr tibble writexl]; }; - ypr = derive2 { name="ypr"; version="0.4.0"; sha256="15cjfghpamyfa9zkjrpvxbh487acg8yd21dn6z3r73nc9zmlnb2a"; depends=[chk ggplot2 lifecycle purrr scales yesno]; }; - yuima = derive2 { name="yuima"; version="1.8.1"; sha256="1jzk3623c1cpw9j8d9b96x6n0jwz8h2izzhrdp01cwwskbnv3hq2"; depends=[boot cubature expm mvtnorm Rcpp RcppArmadillo zoo]; }; + ypr = derive2 { name="ypr"; version="0.5.0"; sha256="1as8i61sc6xasjb36kcfhpac4180558qqyg862qxh5f1i4b77jm7"; depends=[chk ggplot2 lifecycle purrr scales yesno]; }; + yuima = derive2 { name="yuima"; version="1.9.6"; sha256="1iqcv6m2lbdnpkcmgbmjhdn233pq3b2g6s9naiq3ks0fyv04zpar"; depends=[boot cubature expm glassoFast mvtnorm Rcpp RcppArmadillo zoo]; }; 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.3.3-1"; sha256="0cad8dwl9by3f696rxqp2liqy00nczx9z21s1vbn2hq6xngd3i5p"; depends=[MASS NADA truncnorm]; }; + zCompositions = derive2 { name="zCompositions"; version="1.3.4"; sha256="15cfqk1vzamz66y9idnrwxlrp2sirkp44gwkcmia4s13x5pwh8mf"; depends=[MASS NADA truncnorm]; }; zFactor = derive2 { name="zFactor"; version="0.1.9"; sha256="1x0cfcmnmpb8dq6wn6538ghlz9cm00grv54dj91hvb09i96cp95x"; depends=[covr data_table dplyr ggplot2 knitcitations logging rootSolve tibble tidyr]; }; zTree = derive2 { name="zTree"; version="1.0.6"; sha256="1mywxrx6bw7dzhrdwyxbjzc8ikgvw423zycyji0jjr69cfhpmywv"; depends=[plyr]; }; + zalpha = derive2 { name="zalpha"; version="0.1.0"; sha256="12bzdsgjcpg2fqgygx0y6hyygd4yww2c7vpnxksgkgr0gscilksg"; depends=[]; }; zbank = derive2 { name="zbank"; version="0.1.0"; sha256="0vzvlri3sncvbz2cdg8wzlpskm1lq9ji0jrfy5cx4ib19m6gxhpc"; depends=[crul jsonlite tibble]; }; + zcurve = derive2 { name="zcurve"; version="1.0.0"; sha256="14a07yn4wjj29kx33g7mnlsky0jg8zj1hs9r9hn0i0yv4jfdl5jl"; depends=[evmix nleqslv Rcpp Rdpack]; }; zeallot = derive2 { name="zeallot"; version="0.1.0"; sha256="1sd1igcfnv27pa3bqxlbyxchi562h7grnjg1l7wxx3bwr49i57s3"; depends=[]; }; zebu = derive2 { name="zebu"; version="0.1.2"; sha256="0f9fsb4z8s7k5jnz2ayd52dzri0z46kjbm0gi5rfqjlmk13bhgk4"; depends=[foreach ggplot2 iterators plyr reshape2]; }; 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]; }; zen4R = derive2 { name="zen4R"; version="0.3"; sha256="029wjw0bay9p4fgd4rnmqzhrpn5q2azx0w9fvlr4mcsnwzjk9kib"; depends=[httr jsonlite R6 rvest xml2]; }; zendeskR = derive2 { name="zendeskR"; version="0.4"; sha256="06cjwk08w3x6dx717123psinid5bx6c563jnfn890373jw6xnfrk"; depends=[RCurl rjson]; }; - zenplots = derive2 { name="zenplots"; version="1.0.0"; sha256="0jz7b52caymsw010dbls5rbakkilmkl6jnnhwbizybllnf2dg578"; depends=[graph loon 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]; }; @@ -15354,9 +15521,10 @@ in with self; { zooimage = derive2 { name="zooimage"; version="5.5.2"; sha256="0ck8w0zb9l1n9xvjwqshq9q9l8pigy3yslq2hnfbgcwk17kk9mp8"; depends=[digest DT filehash jpeg MASS mda mlearning png shiny svDialogs svMisc tiff]; }; zoom = derive2 { name="zoom"; version="2.0.4"; sha256="03f5rxfr6ncf1j6vpn7pip21q7ylj4bx0a5xphqb6x6i33lxf1g5"; depends=[]; }; zoomgrid = derive2 { name="zoomgrid"; version="1.0.0"; sha256="1bjm2b1ll5ikym21ia7k6gfiw1bcplcn4p6fls2298nf20q63kaa"; depends=[]; }; - zoon = derive2 { name="zoon"; version="0.6.4"; sha256="1pdhsglp5w2y2pm4irnp849389iakvp03942hhgl9dzc93ad2k14"; depends=[dismo plyr randomForest raster RCurl rfigshare rgdal roxygen2 rworldmap SDMTools sp testthat]; }; + zoon = derive2 { name="zoon"; version="0.6.5"; sha256="02y29vr2yn8al69km8faiqrwjrc1r3hsvw3dg8lwjr65cxw1krip"; depends=[dismo plyr randomForest raster RCurl rfigshare rgdal roxygen2 rworldmap sp testthat]; }; zscorer = derive2 { name="zscorer"; version="0.3.1"; sha256="0aijhs0fyird5gq68x4dxchb02mxa7ijk10k9zjhngghxbjj7iqn"; depends=[shiny]; }; ztable = derive2 { name="ztable"; version="0.2.0"; sha256="0g7khk5ifsdh9p31wlwh2l5mn1hzxzpv6qcn1wh34vsfjdmijjwy"; depends=[flextable magrittr moonBook officer RColorBrewer scales stringr]; }; ztype = derive2 { name="ztype"; version="0.1.0"; sha256="0brbq2rgkl4mhjbb70kkfv47lzs66k9ppfs2klavcbripirxn5fx"; depends=[assertthat dplyr ggplot2 lubridate magrittr rvest stringr]; }; zyp = derive2 { name="zyp"; version="0.10-1.1"; sha256="03cxpkfbhrx1fy8l0dl9a13ghz93cqq6877wa8rig09ksdiivaw9"; depends=[Kendall]; }; + zzlite = derive2 { name="zzlite"; version="0.1.2"; sha256="0vi1slx2s4r5zf82lazqv0c3m12xq73wlgsbz6af4y00h0bkr3ps"; depends=[httr jsonlite]; }; } diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index d340f3c4636..5ee2423c983 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -256,7 +256,6 @@ let fftw = [ pkgs.fftw.dev ]; fftwtools = [ pkgs.fftw.dev ]; Formula = [ pkgs.gmp ]; - geoCount = [ pkgs.gsl_1 ]; gdtools = [ pkgs.cairo.dev pkgs.fontconfig.lib pkgs.freetype.dev ]; git2r = [ pkgs.zlib.dev pkgs.openssl.dev pkgs.libssh2.dev pkgs.libgit2 pkgs.pkgconfig ]; GLAD = [ pkgs.gsl_1 ]; @@ -323,11 +322,9 @@ let Rmpi = [ pkgs.openmpi ]; RMySQL = [ pkgs.zlib pkgs.libmysqlclient pkgs.openssl.dev ]; RNetCDF = [ pkgs.netcdf pkgs.udunits ]; - RODBCext = [ pkgs.libiodbc ]; RODBC = [ pkgs.libiodbc ]; rpanel = [ pkgs.bwidget ]; rpg = [ pkgs.postgresql ]; - rphast = [ pkgs.pcre.dev pkgs.zlib pkgs.bzip2 pkgs.gzip pkgs.readline ]; Rpoppler = [ pkgs.poppler ]; RPostgreSQL = [ pkgs.postgresql pkgs.postgresql ]; RProtoBuf = [ pkgs.protobuf ]; @@ -335,7 +332,6 @@ let RSclient = [ pkgs.openssl.dev ]; Rserve = [ pkgs.openssl ]; Rssa = [ pkgs.fftw.dev ]; - rtfbs = [ pkgs.zlib pkgs.pcre.dev pkgs.bzip2 pkgs.gzip pkgs.readline ]; rtiff = [ pkgs.libtiff.dev ]; runjags = [ pkgs.jags ]; RVowpalWabbit = [ pkgs.zlib.dev pkgs.boost ]; @@ -364,7 +360,6 @@ let udunits2 = [ pkgs.udunits pkgs.expat ]; units = [ pkgs.udunits ]; V8 = [ pkgs.v8 ]; - WhopGenome = [ pkgs.zlib.dev ]; XBRL = [ pkgs.zlib pkgs.libxml2.dev ]; xml2 = [ pkgs.libxml2.dev ] ++ lib.optionals stdenv.isDarwin [ pkgs.perl ]; XML = [ pkgs.libtool pkgs.libxml2.dev pkgs.xmlsec pkgs.libxslt ]; @@ -411,7 +406,6 @@ let cairoDevice = [ pkgs.pkgconfig ]; chebpol = [ pkgs.pkgconfig ]; fftw = [ pkgs.pkgconfig ]; - geoCount = [ pkgs.pkgconfig ]; gdtools = [ pkgs.pkgconfig ]; jqr = [ pkgs.jq.lib ]; kza = [ pkgs.pkgconfig ]; @@ -463,14 +457,11 @@ let "AnnotLists" "AnthropMMD" "aplpack" - "aqfig" - "arf3DS4" "asbio" "AtelieR" "BAT" "bayesDem" "BCA" - "BEQI2" "betapart" "BiodiversityR" "bio_infer" @@ -523,7 +514,6 @@ let "gcmr" "geomorph" "geoR" - "geoRglm" "georob" "GGEBiplotGUI" "gnm" @@ -561,7 +551,6 @@ let "miniGUI" "MissingDataGUI" "mixsep" - "mlDNA" "MplusAutomation" "mpmcorrelogram" "mritc" @@ -628,7 +617,6 @@ let "recluster" "relimp" "RenextGUI" - "reportRx" "reshapeGUI" "rgl" "RHRV" @@ -636,7 +624,6 @@ let "RNCEP" "RQDA" "RSDA" - "rsgcc" "RSurvey" "RunuranGUI" "simba" @@ -644,7 +631,6 @@ let "SimpleTable" "SOLOMON" "soundecology" - "spacodiR" "spatsurv" "sqldf" "SRRS" @@ -676,10 +662,8 @@ let "vegan" "vegan3d" "vegclust" - "VIMGUI" "WMCapacity" "x12GUI" - "xergm" ]; packagesToSkipCheck = [ -- cgit v1.2.3 From 37be0ab53bc10c78b657826a0f93c11e70f183e4 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 7 Apr 2020 18:29:56 -0700 Subject: Revert "perlPackages.XMLParser: 2.46 -> 2.44" This reverts commit ca04f87ff5c139452fc0981fad861c1f0b6db99d. --- pkgs/top-level/perl-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2b277d332e1..1de5915a24f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -21047,10 +21047,10 @@ let XMLParser = buildPerlPackage { pname = "XML-Parser"; - version = "2.44"; + version = "2.46"; src = fetchurl { - url = mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.44.tar.gz; - sha256 = "05ij0g6bfn27iaggxf8nl5rhlwx6f6p6xmdav6rjcly3x5zd1s8s"; + url = mirror://cpan/authors/id/T/TO/TODDR/XML-Parser-2.46.tar.gz; + sha256 = "0pai3ik47q7rgnix9644c673fwydz52gqkxr9kxwq765j4j36cfk"; }; patches = [ ../development/perl-modules/xml-parser-0001-HACK-Assumes-Expat-paths-are-good.patch ]; postPatch = stdenv.lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' -- cgit v1.2.3 From b3ef0f3ce7cdbd228401f4f8afc2c01e26171282 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 7 Apr 2020 12:36:45 -0700 Subject: python2Packages.cryptography: add missing ipaddress dependency --- pkgs/development/python-modules/cryptography/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 8d655de97b8..22f647b216d 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -2,6 +2,8 @@ , buildPythonPackage , fetchPypi , fetchpatch +, isPy27 +, ipaddress , openssl , cryptography_vectors , darwin @@ -33,7 +35,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ packaging six - ] ++ stdenv.lib.optional (!isPyPy) cffi; + ] ++ stdenv.lib.optional (!isPyPy) cffi + ++ stdenv.lib.optionals isPy27 [ ipaddress ]; checkInputs = [ cryptography_vectors -- cgit v1.2.3 From 076f221a0bce289985f8b8b08f85932aff7c44b5 Mon Sep 17 00:00:00 2001 From: Mike Sperber Date: Thu, 9 Apr 2020 10:17:38 +0200 Subject: emacs: Unbreak on macOS Backport an unexec fix. --- pkgs/applications/editors/emacs/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 2b40eb77e2c..ecf1e8d1648 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm +{ stdenv, lib, fetchurl, fetchpatch, ncurses, xlibsWrapper, libXaw, libXpm , Xaw3d, libXcursor, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux , alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf @@ -44,6 +44,11 @@ stdenv.mkDerivation rec { patches = [ ./clean-env.patch ./tramp-detect-wrapped-gvfsd.patch + # unbreak macOS unexec + (fetchpatch { + url = https://github.com/emacs-mirror/emacs/commit/888ffd960c06d56a409a7ff15b1d930d25c56089.patch; + sha256 = "08q3ygdigqwky70r47rcgzlkc5jy82xiq8am5kwwy891wlpl7frw"; + }) ]; postPatch = lib.optionalString srcRepo '' -- cgit v1.2.3 From 0dbcdd857b7b4df087aaf11eaada07c9849c34b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Mon, 6 Apr 2020 04:26:19 +0200 Subject: gtk3: various upstreaom fixes for wayland - fix invisible dialogs - fix resizing custom surfaces (eg. panels like gtk-layer-shell) --- pkgs/development/libraries/gtk/3.x.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index 48b89c51772..892e97f4069 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -73,6 +73,21 @@ stdenv.mkDerivation rec { # https://gitlab.gnome.org/GNOME/gtk/merge_requests/1002 ./patches/01-build-Fix-path-handling-in-pkgconfig.patch + + # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/1634 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/79732da1ed8cb167440fb047c72cfc0d888a187b.patch"; + sha256 = "1ynrx81dkwjfqhvg80q28qbb6jabg4x73fkbrnligzgkzimfjpx3"; + }) + # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/1633 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/12fc9a45efcbb546eb7de13c5c4d3183f2f5a3b8.patch"; + sha256 = "00zrm77qk39p1hgn207az82cgvqiyp6is7dk0ssjxkc34403r78v"; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/5a52af20cba76474e631b2a7548963bcad22d66d.patch"; + sha256 = "0sbzzwa0si1w83m5abyf312f4w445wwlms53m5hb7kdgkjbhaa3f"; + }) ] ++ optionals stdenv.isDarwin [ # X11 module requires which is not installed on Darwin # let’s drop that dependency in similar way to how other parts of the library do it -- cgit v1.2.3 From 3028846cda54f3410f244d87f0e18f6e17b97a96 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 9 Apr 2020 10:57:13 +0000 Subject: btrfs-progs: 5.4.1 -> 5.6 --- pkgs/tools/filesystems/btrfs-progs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index e3545315d6f..5c73ee945c7 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "5.4.1"; + version = "5.6"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "0scxg9p6z0wss92gmv5a8yxdmr8x449kb5v3bfnvs26n92r7zq7k"; + sha256 = "0srg276yccfmqz0skmmga3vbqx4wiqsk1l6h86n6ryhxa9viqcm1"; }; nativeBuildInputs = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Utilities for the btrfs filesystem"; - homepage = https://btrfs.wiki.kernel.org/; + homepage = "https://btrfs.wiki.kernel.org/"; license = licenses.gpl2; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; -- cgit v1.2.3 From 8eefb7ce147bccc9ef4a17175455fe0bc9bcaab1 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 9 Apr 2020 11:14:07 -0400 Subject: redmine: 4.1.0 -> 4.1.1 --- .../version-management/redmine/Gemfile | 4 +- .../version-management/redmine/Gemfile.lock | 121 ++++---- .../version-management/redmine/default.nix | 6 +- .../version-management/redmine/gemset.nix | 308 ++++++++++++++++----- 4 files changed, 312 insertions(+), 127 deletions(-) diff --git a/pkgs/applications/version-management/redmine/Gemfile b/pkgs/applications/version-management/redmine/Gemfile index b1c651695c7..beff147c374 100644 --- a/pkgs/applications/version-management/redmine/Gemfile +++ b/pkgs/applications/version-management/redmine/Gemfile @@ -1,8 +1,10 @@ source 'https://rubygems.org' +ruby '>= 2.3.0', '< 2.7.0' if Bundler::VERSION >= '1.12.0' gem "bundler", ">= 1.5.0" -gem "rails", "5.2.4.1" +gem 'rails', '5.2.4.2' +gem 'sprockets', '~> 3.7.2' if RUBY_VERSION < '2.5' gem "rouge", "~> 3.12.0" gem "request_store", "~> 1.4.1" gem "mini_mime", "~> 1.0.1" diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/applications/version-management/redmine/Gemfile.lock index 66326b28235..60aed5e1792 100644 --- a/pkgs/applications/version-management/redmine/Gemfile.lock +++ b/pkgs/applications/version-management/redmine/Gemfile.lock @@ -1,19 +1,19 @@ GEM remote: https://rubygems.org/ specs: - actioncable (5.2.4.1) - actionpack (= 5.2.4.1) + actioncable (5.2.4.2) + actionpack (= 5.2.4.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.4.1) - actionpack (= 5.2.4.1) - actionview (= 5.2.4.1) - activejob (= 5.2.4.1) + actionmailer (5.2.4.2) + actionpack (= 5.2.4.2) + actionview (= 5.2.4.2) + activejob (= 5.2.4.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.4.1) - actionview (= 5.2.4.1) - activesupport (= 5.2.4.1) + actionpack (5.2.4.2) + actionview (= 5.2.4.2) + activesupport (= 5.2.4.2) rack (~> 2.0, >= 2.0.8) 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.4.1) - activesupport (= 5.2.4.1) + actionview (5.2.4.2) + activesupport (= 5.2.4.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.4.1) - activesupport (= 5.2.4.1) + activejob (5.2.4.2) + activesupport (= 5.2.4.2) globalid (>= 0.3.6) - activemodel (5.2.4.1) - activesupport (= 5.2.4.1) - activerecord (5.2.4.1) - activemodel (= 5.2.4.1) - activesupport (= 5.2.4.1) + activemodel (5.2.4.2) + activesupport (= 5.2.4.2) + activerecord (5.2.4.2) + activemodel (= 5.2.4.2) + activesupport (= 5.2.4.2) arel (>= 9.0) - activestorage (5.2.4.1) - actionpack (= 5.2.4.1) - activerecord (= 5.2.4.1) + activestorage (5.2.4.2) + actionpack (= 5.2.4.2) + activerecord (= 5.2.4.2) marcel (~> 0.3.1) - activesupport (5.2.4.1) + activesupport (5.2.4.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -59,8 +59,8 @@ GEM regexp_parser (~> 1.5) xpath (~> 3.2) childprocess (3.0.0) - concurrent-ruby (1.1.5) - crass (1.0.5) + concurrent-ruby (1.1.6) + crass (1.0.6) css_parser (1.7.1) addressable csv (3.1.2) @@ -73,58 +73,58 @@ GEM concurrent-ruby (~> 1.0) jaro_winkler (1.5.4) json (2.3.0) - loofah (2.4.0) + loofah (2.5.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) marcel (0.3.3) mimemagic (~> 0.3.2) - method_source (0.9.2) - mimemagic (0.3.3) + method_source (1.0.0) + mimemagic (0.3.4) mini_magick (4.9.5) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.13.0) - mocha (1.11.1) + minitest (5.14.0) + mocha (1.11.2) mysql2 (0.5.3) net-ldap (0.16.2) nio4r (2.5.2) - nokogiri (1.10.7) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) parallel (1.19.1) - parser (2.6.5.0) + parser (2.7.1.0) ast (~> 2.4.0) pg (1.1.4) - public_suffix (4.0.1) - puma (3.12.2) - rack (2.0.8) + public_suffix (4.0.4) + puma (3.12.4) + rack (2.2.2) 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.4.1) - actioncable (= 5.2.4.1) - actionmailer (= 5.2.4.1) - actionpack (= 5.2.4.1) - actionview (= 5.2.4.1) - activejob (= 5.2.4.1) - activemodel (= 5.2.4.1) - activerecord (= 5.2.4.1) - activestorage (= 5.2.4.1) - activesupport (= 5.2.4.1) + rails (5.2.4.2) + actioncable (= 5.2.4.2) + actionmailer (= 5.2.4.2) + actionpack (= 5.2.4.2) + actionview (= 5.2.4.2) + activejob (= 5.2.4.2) + activemodel (= 5.2.4.2) + activerecord (= 5.2.4.2) + activestorage (= 5.2.4.2) + activesupport (= 5.2.4.2) bundler (>= 1.3.0) - railties (= 5.2.4.1) + railties (= 5.2.4.2) sprockets-rails (>= 2.0.0) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) rails-html-sanitizer (1.3.0) loofah (~> 2.3) - railties (5.2.4.1) - actionpack (= 5.2.4.1) - activesupport (= 5.2.4.1) + railties (5.2.4.2) + actionpack (= 5.2.4.2) + activesupport (= 5.2.4.2) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) @@ -135,15 +135,15 @@ GEM rbpdf-font (~> 1.19.0) rbpdf-font (1.19.1) redcarpet (3.5.0) - regexp_parser (1.6.0) + regexp_parser (1.7.0) request_store (1.4.1) rack (>= 1.4) - roadie (3.5.1) + roadie (4.0.0) css_parser (~> 1.4) nokogiri (~> 1.8) - roadie-rails (2.1.0) + roadie-rails (2.1.1) railties (>= 5.1, < 6.1) - roadie (~> 3.1) + roadie (>= 3.1, < 5.0) rouge (3.12.0) rubocop (0.76.0) jaro_winkler (~> 1.5.1) @@ -152,15 +152,15 @@ GEM rainbow (>= 2.2.2, < 4.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) - rubocop-performance (1.5.1) + rubocop-performance (1.5.2) rubocop (>= 0.71.0) rubocop-rails (2.3.2) rack (>= 1.1) rubocop (>= 0.72.0) ruby-openid (2.9.2) ruby-progressbar (1.10.1) - rubyzip (2.0.0) - selenium-webdriver (3.142.6) + rubyzip (2.3.0) + selenium-webdriver (3.142.7) childprocess (>= 0.5, < 4.0) rubyzip (>= 1.2.2) simplecov (0.17.1) @@ -177,15 +177,15 @@ GEM sprockets (>= 3.0.0) thor (1.0.1) thread_safe (0.3.6) - tzinfo (1.2.5) + tzinfo (1.2.7) thread_safe (~> 0.1) - unicode-display_width (1.6.0) + unicode-display_width (1.6.1) websocket-driver (0.7.1) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.4) xpath (3.2.0) nokogiri (~> 1.8) - yard (0.9.20) + yard (0.9.24) PLATFORMS ruby @@ -208,7 +208,7 @@ DEPENDENCIES pg (~> 1.1.4) puma (~> 3.7) rack-openid - rails (= 5.2.4.1) + rails (= 5.2.4.2) rails-dom-testing rbpdf (~> 1.20.0) redcarpet (~> 3.5.0) @@ -224,5 +224,8 @@ DEPENDENCIES tzinfo-data yard +RUBY VERSION + ruby 2.6.6p146 + BUNDLED WITH 2.1.4 diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index a133a9a6a2a..200b594e2e3 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, bundlerEnv, ruby }: let - version = "4.1.0"; + version = "4.1.1"; rubyEnv = bundlerEnv { name = "redmine-env-${version}"; inherit ruby; gemdir = ./.; - groups = [ "ldap" "openid" ]; + groups = [ "development" "ldap" "markdown" "minimagick" "openid" "test" ]; }; in stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ in src = fetchurl { url = "https://www.redmine.org/releases/${pname}-${version}.tar.gz"; - sha256 = "1fxc0xql54cfvj4g8v31vsv19jbij326qkgdz2h5xlp09r821wli"; + sha256 = "1nndy5hz8zvfglxf1f3bsb1pkrfwinfxzkdan1vjs3rkckkszyh5"; }; buildInputs = [ rubyEnv rubyEnv.wrappedRuby rubyEnv.bundler ]; diff --git a/pkgs/applications/version-management/redmine/gemset.nix b/pkgs/applications/version-management/redmine/gemset.nix index e69cbb0e1c2..9a4deb7e155 100644 --- a/pkgs/applications/version-management/redmine/gemset.nix +++ b/pkgs/applications/version-management/redmine/gemset.nix @@ -1,33 +1,41 @@ { actioncable = { dependencies = ["actionpack" "nio4r" "websocket-driver"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yz5mcjl4is99650vq6rkv539xccq8mp5zsbvzh43wqzfga1llwm"; + sha256 = "0q4by8d41n972j8cdcddrwsh7qphcki50xvgm1syrawyck6w1f5v"; type = "gem"; }; - version = "5.2.4.1"; + version = "5.2.4.2"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dbw3q3yyh7m7wgc4196hc3v86v123z0xz40llmic8iwx3d9vnda"; + sha256 = "0kg2nayy8wmxhfp52217h80yqr0mcg793xw3cjlfg9lkvdh0nb5z"; type = "gem"; }; - version = "5.2.4.1"; + version = "5.2.4.2"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0f5pm62y08j679k3vhcml8436f92kripd6j3v5dyvn760kwzz72z"; + sha256 = "1w1l9i6q9xns4yl41l582pyc5i1xi40yyyq802drm58gwylv3wax"; type = "gem"; }; - version = "5.2.4.1"; + version = "5.2.4.2"; }; actionpack-xml_parser = { dependencies = ["actionpack" "railties"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1rnm6jrw3mzcf2g3q498igmhsn0kfkxq79w0nm532iclx4g4djs0"; @@ -37,60 +45,74 @@ }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hnkyx268czfb6ljv6ipcnz9dbgsb1z9n1gcr6279z9wx9550zij"; + sha256 = "0fp3my6216lb9gp800s46y0404jwfl6xb3j9rvx4zf087497q8lp"; type = "gem"; }; - version = "5.2.4.1"; + version = "5.2.4.2"; }; activejob = { dependencies = ["activesupport" "globalid"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k4j3fcfc8m4hxwhs8xnbxazra760j3amn5r2zm2d5r1a1nqfh91"; + sha256 = "1qsvb89rwqrp779mvpn67qbzidg2q6d1fa8kwybvpc93nzb9zpvi"; type = "gem"; }; - version = "5.2.4.1"; + version = "5.2.4.2"; }; activemodel = { dependencies = ["activesupport"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sg1yyz710pxhq9z0jsbpbgn666y8iv4aj7pywglydipp4i0bpx1"; + sha256 = "0jcfdv00kmifj86d0z347nw55q1f8vwzr1aa9jrfnwz47ndi22di"; type = "gem"; }; - version = "5.2.4.1"; + version = "5.2.4.2"; }; activerecord = { dependencies = ["activemodel" "activesupport" "arel"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p35d6pj1370mnlppqq9lhr7m1ck82xvv621wq6hy12v41qfdnrg"; + sha256 = "1yaqrh23c8krrjw6rvxv7pvnkpp46nk5aq9z2daby640si4xpmp5"; type = "gem"; }; - version = "5.2.4.1"; + version = "5.2.4.2"; }; activestorage = { dependencies = ["actionpack" "activerecord" "marcel"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dd8k91b88b875mypwqific2jilgzj5bx1637cwmzi4c0cy1v17f"; + sha256 = "1d51zp17c9k4brivm8y46rszcz07s5rb75gmkm0dpzg3rz3v38s9"; type = "gem"; }; - version = "5.2.4.1"; + version = "5.2.4.2"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0lmlnx79sv18xv1ddm4vq7z3mwdfa4468mq5186av0k8n1k471sp"; + sha256 = "0y1397g5xxinjyxjsdmp8c92yn0y3bd2hl4wbmmrpd08bggy6flc"; type = "gem"; }; - version = "5.2.4.1"; + version = "5.2.4.2"; }; addressable = { dependencies = ["public_suffix"]; + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; @@ -99,6 +121,8 @@ version = "2.7.0"; }; arel = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1jk7wlmkr61f6g36w9s2sn46nmdg6wn2jfssrhbhirv5x9n95nk0"; @@ -107,6 +131,8 @@ version = "9.0.0"; }; ast = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "184ssy3w93nkajlz2c70ifm79jp3j737294kbc5fjw69v1w0n9x7"; @@ -115,6 +141,8 @@ version = "2.4.0"; }; builder = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; @@ -124,6 +152,8 @@ }; capybara = { dependencies = ["addressable" "mini_mime" "nokogiri" "rack" "rack-test" "regexp_parser" "xpath"]; + groups = ["test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1bq1y3gy98rqgw8z69b42isc2klb75fvlwvpi36vycf1yk0sfmmx"; @@ -132,6 +162,8 @@ version = "3.25.0"; }; childprocess = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1ic028k8xgm2dds9mqnvwwx3ibaz32j8455zxr9f4bcnviyahya5"; @@ -140,23 +172,29 @@ version = "3.0.0"; }; concurrent-ruby = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; + sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl"; type = "gem"; }; - version = "1.1.5"; + version = "1.1.6"; }; crass = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "030sc98kjrb36rh7g21qsbdfxrj6knsjkx0mn3b7gig8zknwhp2f"; + sha256 = "0pfl5c0pyqaparxaqxi6s4gfl21bdldwiawrc0aknyvflli60lfw"; type = "gem"; }; - version = "1.0.5"; + version = "1.0.6"; }; css_parser = { dependencies = ["addressable"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "04c4dl8cm5rjr50k9qa6yl9r05fk9zcb1zxh0y0cdahxlsgcydfw"; @@ -165,6 +203,8 @@ version = "1.7.1"; }; csv = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "00szzw96bqz59r0kaab4p75qb0wq54iahmq37wpdg96bxc8y80f5"; @@ -173,6 +213,8 @@ version = "3.1.2"; }; docile = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0qrwiyagxzl8zlx3dafb0ay8l14ib7imb2rsmx70i5cp420v8gif"; @@ -181,6 +223,8 @@ version = "1.3.2"; }; erubi = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1nwzxnqhr31fn7nbqmffcysvxjdfl3bhxi0bld5qqhcnfc1xd13x"; @@ -190,6 +234,8 @@ }; globalid = { dependencies = ["activesupport"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1zkxndvck72bfw235bd9nl2ii0lvs5z88q14706cmn702ww2mxv1"; @@ -198,6 +244,8 @@ version = "0.4.2"; }; htmlentities = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; @@ -207,6 +255,8 @@ }; i18n = { dependencies = ["concurrent-ruby"]; + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1hfxnlyr618s25xpafw9mypa82qppjccbh292c4l3bj36az7f6wl"; @@ -215,6 +265,8 @@ version = "1.6.0"; }; jaro_winkler = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1y8l6k34svmdyqxya3iahpwbpvmn3fswhwsvrz0nk1wyb8yfihsh"; @@ -223,6 +275,8 @@ version = "1.5.4"; }; json = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn"; @@ -232,15 +286,19 @@ }; loofah = { dependencies = ["crass" "nokogiri"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g7ps9m3s14cajhxrfgbzahv9i3gy47s4hqrv3mpybpj5cyr0srn"; + sha256 = "0jk9fgn5ayzbqvzqm11gbkqvas77zdbpkvynlylyiwynclgrn040"; type = "gem"; }; - version = "2.4.0"; + version = "2.5.0"; }; mail = { dependencies = ["mini_mime"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "00wwz6ys0502dpk8xprwcqfwyf3hmnx6lgxaiq6vj43mkx43sapc"; @@ -250,6 +308,8 @@ }; marcel = { dependencies = ["mimemagic"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1nxbjmcyg8vlw6zwagf17l9y2mwkagmmkg95xybpn4bmf3rfnksx"; @@ -258,22 +318,28 @@ version = "0.3.3"; }; method_source = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pviwzvdqd90gn6y7illcdd9adapw8fczml933p5vl739dkvl3lq"; + sha256 = "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp"; type = "gem"; }; - version = "0.9.2"; + version = "1.0.0"; }; mimemagic = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04cp5sfbh1qx82yqxn0q75c7hlcx8y1dr5g3kyzwm4mx6wi2gifw"; + sha256 = "0frrfvz52fh4v1sb2xr9pyxhrxm5f7jppqxagpmd7c5ific66l9p"; type = "gem"; }; - version = "0.3.3"; + version = "0.3.4"; }; mini_magick = { + groups = ["minimagick"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0qy09qrd5bwh8mkbj514n5vcw9ni73218h9s3zmvbpmdwrnzi8j4"; @@ -282,6 +348,8 @@ version = "4.9.5"; }; mini_mime = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1axm0rxyx3ss93wbmfkm78a6x03l8y4qy60rhkkiq0aza0vwq3ha"; @@ -290,6 +358,8 @@ version = "1.0.2"; }; mini_portile2 = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; @@ -298,22 +368,36 @@ version = "2.4.0"; }; minitest = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w16p7cvslh3hxd3cia8jg4pd85z7rz7xqb16vh42gj4rijn8rmi"; + sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz"; type = "gem"; }; - version = "5.13.0"; + version = "5.14.0"; }; mocha = { + groups = ["test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06i2q5qjr9mvjgjc8w41pdf3qalw340y33wjvzc0rp4a1cbbb7pp"; + sha256 = "0hxmkm8qxd04vwj8mqnpyrf2dwy7g1k9zipdfhl4y71cw7ijm9n4"; type = "gem"; }; - version = "1.11.1"; + version = "1.11.2"; }; mysql2 = { + groups = ["default"]; + platforms = [{ + engine = "maglev"; + } { + engine = "mingw"; + } { + engine = "mingw"; + } { + engine = "ruby"; + }]; source = { remotes = ["https://rubygems.org"]; sha256 = "0d14pcy5m4hjig0zdxnl9in5f4izszc7v9zcczf2gyi5kiyxk8jw"; @@ -322,6 +406,8 @@ version = "0.5.3"; }; net-ldap = { + groups = ["ldap"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1vzfhivjfr9q65hkln7xig3qcba6fw9y4kb4384fpm7d7ww0b7xg"; @@ -330,6 +416,8 @@ version = "0.16.2"; }; nio4r = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0gnmvbryr521r135yz5bv8354m7xn6miiapfgpg1bnwsvxz8xj6c"; @@ -339,14 +427,18 @@ }; nokogiri = { dependencies = ["mini_portile2"]; + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r0qpgf80h764k176yr63gqbs2z0xbsp8vlvs2a79d5r9vs83kln"; + sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm"; type = "gem"; }; - version = "1.10.7"; + version = "1.10.9"; }; parallel = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "12jijkap4akzdv11lm08dglsc8jmc87xcgq6947i1s3qb69f4zn2"; @@ -356,14 +448,26 @@ }; parser = { dependencies = ["ast"]; + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09davv4ld6caqlczw64vhwf8hr41apys3cj8v2h96yxs4qg1m2iw"; + sha256 = "07awrcwm2xibglrh7qwpj24vwzn9p64m7bmfr9xbrlffaznr0ii7"; type = "gem"; }; - version = "2.6.5.0"; + version = "2.7.1.0"; }; pg = { + groups = ["default"]; + platforms = [{ + engine = "maglev"; + } { + engine = "mingw"; + } { + engine = "mingw"; + } { + engine = "ruby"; + }]; source = { remotes = ["https://rubygems.org"]; sha256 = "0fmnyxcyrvgdbgq7m09whgn9i8rwfybk0w8aii1nc4g5kqw0k2jy"; @@ -372,31 +476,39 @@ version = "1.1.4"; }; public_suffix = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xnfv2j2bqgdpg2yq9i2rxby0w2sc9h5iyjkpaas2xknwrgmhdb0"; + sha256 = "1l1kqw75asziwmzrig8rywxswxz8l91sc3pvns02ffsqac1a3wiz"; type = "gem"; }; - version = "4.0.1"; + version = "4.0.4"; }; puma = { + groups = ["test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "07sb9xqc9bn5lvl9ia25w8x1fwzk52p5vgysnvjlc3hvn0r00ysj"; + sha256 = "0mg8yh478mh55pg7pv8z7xyvk35ra98hy61z9lwkfr8fzyyz57zs"; type = "gem"; }; - version = "3.12.2"; + version = "3.12.4"; }; rack = { + groups = ["default" "openid" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1id0jsslx1ipv0pbqjfn7mjbb2vx2xybk7qypq59a17163xp30gr"; + sha256 = "10mp9s48ssnw004aksq90gvhdvwczh8j6q82q2kqiqq92jd1zxbp"; type = "gem"; }; - version = "2.0.8"; + version = "2.2.2"; }; rack-openid = { dependencies = ["rack" "ruby-openid"]; + groups = ["openid"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0sg85yn981j3a0iri3ch4znzdwscvz29l7vrk3dafqw4fdg31llc"; @@ -406,6 +518,8 @@ }; rack-test = { dependencies = ["rack"]; + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0rh8h376mx71ci5yklnpqqn118z3bl67nnv5k801qaqn1zs62h8m"; @@ -415,15 +529,19 @@ }; rails = { dependencies = ["actioncable" "actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activestorage" "activesupport" "railties" "sprockets-rails"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1198azwbhlhq2n9xmpb19709d6smkanimip9cagvnlihagw80b20"; + sha256 = "1x8k6n4yziwf386prhvr9d9plc9fwv0j8spw2bnmkwhf54v2ias4"; type = "gem"; }; - version = "5.2.4.1"; + version = "5.2.4.2"; }; rails-dom-testing = { dependencies = ["activesupport" "nokogiri"]; + groups = ["test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1lfq2a7kp2x64dzzi5p4cjcbiv62vxh9lyqk2f0rqq3fkzrw8h5i"; @@ -433,6 +551,8 @@ }; rails-html-sanitizer = { dependencies = ["loofah"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1icpqmxbppl4ynzmn6dx7wdil5hhq6fz707m9ya6d86c7ys8sd4f"; @@ -442,14 +562,18 @@ }; railties = { dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1iqsqyyjscwnj2d3i0zl2k9apgsm7bb92l5h4wv1zbpdbb30wsqb"; + sha256 = "1p2rnd1xdqlk19k3m5gd058yzvwjj25k5hwn4km683b5dhylpd16"; type = "gem"; }; - version = "5.2.4.1"; + version = "5.2.4.2"; }; rainbow = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk"; @@ -458,6 +582,8 @@ version = "3.0.0"; }; rake = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0w6qza25bq1s825faaglkx1k6d59aiyjjk3yw3ip5sb463mhhai9"; @@ -467,6 +593,8 @@ }; rbpdf = { dependencies = ["htmlentities" "rbpdf-font"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0sdj8frakpdms820rwlil38h9bh3p24xmwnjrxsjc1p9irc3za71"; @@ -475,6 +603,8 @@ version = "1.20.1"; }; rbpdf-font = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0pxlr0l4vf785qpy55m439dyii63a26l0sd0yyhbwwcy9zm9hd1v"; @@ -483,6 +613,8 @@ version = "1.19.1"; }; redcarpet = { + groups = ["markdown"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0skcyx1h8b5ms0rp2zm3ql6g322b8c1adnkwkqyv7z3kypb4bm7k"; @@ -491,15 +623,19 @@ version = "3.5.0"; }; regexp_parser = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1l44ml30jvqpdi3707x1n1dinq7fx9887pv3q2ywyfmi4kja7yf2"; + sha256 = "0l2vcj9qffj5b3v9jsyi4k994bdj3rjz7l9ql8x04lndqxfrrrv2"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.0"; }; request_store = { dependencies = ["rack"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1963330z03fk382fi8y231ygcbnh86m91dqlp5rh1mwy9ihzzl6d"; @@ -509,23 +645,29 @@ }; roadie = { dependencies = ["css_parser" "nokogiri"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zihd316bkbnrinz5s1s7pg7s0cadhhj6qs7wmc713j0g6ai1k9r"; + sha256 = "01kld3drqfiih5x8c13cvr6dpvdl7jml0v9bcw4fsy322lax3kn0"; type = "gem"; }; - version = "3.5.1"; + version = "4.0.0"; }; roadie-rails = { dependencies = ["railties" "roadie"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hdkmnxrmw31dn9jq43xiypz2v6rbvg4x2yd2hgl2xbl3lm1ln7i"; + sha256 = "1fmn7kkbpgipjsx65rw7hqa3bwinlqykx5qf1x28ya9ag8v2q0ph"; type = "gem"; }; - version = "2.1.0"; + version = "2.1.1"; }; rouge = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "08fpnxbhqv5sqpnfjasl1ysxafssyq4q1yhcqamqqzmb9czj1czw"; @@ -535,6 +677,8 @@ }; rubocop = { dependencies = ["jaro_winkler" "parallel" "parser" "rainbow" "ruby-progressbar" "unicode-display_width"]; + groups = ["test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "07x51ixlx76y194xsszh5lbkaqakz44ykbrjxg3qaggbs18790q0"; @@ -544,15 +688,19 @@ }; rubocop-performance = { dependencies = ["rubocop"]; + groups = ["test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kn6rb0ma32gjp5qdvrbbb9ckh66rm6xpfrw8h3kr7svirsww2h8"; + sha256 = "1fk9nd3b24avgsqp726hy2pl1iyfjrh6jni97wkky6kqy0lq6zq2"; type = "gem"; }; - version = "1.5.1"; + version = "1.5.2"; }; rubocop-rails = { dependencies = ["rack" "rubocop"]; + groups = ["test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1q7ffsq1cjm4m949nh935kjzv4zf1pacnrl00siwh8flhcn3mmjf"; @@ -561,6 +709,8 @@ version = "2.3.2"; }; ruby-openid = { + groups = ["openid"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "190p1m0bxd9xkfk1j6cpcv3x5c367g36nsglg4m1fcwqdd13k3kz"; @@ -569,6 +719,8 @@ version = "2.9.2"; }; ruby-progressbar = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf"; @@ -577,24 +729,30 @@ version = "1.10.1"; }; rubyzip = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gz0ri0pa2xr7b6bf66yjc2wfvk51f4gi6yk7bklwl1nr65zc4gz"; + sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji"; type = "gem"; }; - version = "2.0.0"; + version = "2.3.0"; }; selenium-webdriver = { dependencies = ["childprocess" "rubyzip"]; + groups = ["test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "11abil34dr8p1kw7hlaqd6kr430v4srmhzf72zzqvhcimlfvm4yb"; + sha256 = "0adcvp86dinaqq3nhf8p3m0rl2g6q0a4h52k0i7kdnsg1qz9k86y"; type = "gem"; }; - version = "3.142.6"; + version = "3.142.7"; }; simplecov = { dependencies = ["docile" "json" "simplecov-html"]; + groups = ["test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1135k46nik05sdab30yxb8264lqiz01c8v000g16cl9pjc4mxrdw"; @@ -603,6 +761,8 @@ version = "0.17.1"; }; simplecov-html = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1lihraa4rgxk8wbfl77fy9sf0ypk31iivly8vl3w04srd7i0clzn"; @@ -612,6 +772,8 @@ }; sprockets = { dependencies = ["concurrent-ruby" "rack"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0jm37zpvvm1arxjwrd6am0wrdbfhrhc5y0l4p2i3p11z04bsvgap"; @@ -621,6 +783,8 @@ }; sprockets-rails = { dependencies = ["actionpack" "activesupport" "sprockets"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0ab42pm8p5zxpv3sfraq45b9lj39cz9mrpdirm30vywzrwwkm5p1"; @@ -629,6 +793,8 @@ version = "3.2.1"; }; thor = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm"; @@ -637,6 +803,8 @@ version = "1.0.1"; }; thread_safe = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; @@ -646,23 +814,29 @@ }; tzinfo = { dependencies = ["thread_safe"]; + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fjx9j327xpkkdlxwmkl3a8wqj7i4l4jwlrv3z13mg95z9wl253z"; + sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; type = "gem"; }; - version = "1.2.5"; + version = "1.2.7"; }; unicode-display_width = { + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08kfiniak1pvg3gn5k6snpigzvhvhyg7slmm0s2qx5zkj62c1z2w"; + sha256 = "1pppclzq4qb26g321553nm9xqca3zgllvpwb2kqxsdadwj51s09x"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.1"; }; websocket-driver = { dependencies = ["websocket-extensions"]; + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "1bxamwqldmy98hxs5pqby3andws14hl36ch78g0s81gaz9b91nj2"; @@ -671,6 +845,8 @@ version = "0.7.1"; }; websocket-extensions = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "00i624ng1nvkz1yckj3f8yxxp6hi7xaqf40qh9q3hj2n1l9i8g6m"; @@ -680,6 +856,8 @@ }; xpath = { dependencies = ["nokogiri"]; + groups = ["default" "test"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; sha256 = "0bh8lk9hvlpn7vmi6h4hkcwjzvs2y0cmkk3yjjdr8fxvj6fsgzbd"; @@ -688,11 +866,13 @@ version = "3.2.0"; }; yard = { + groups = ["development"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0rxqwry3h2hjz069f0kfr140wgx1khgljnqf112dk5x9rm4l0xny"; + sha256 = "1g0bw2qcl48fxawrdf68l229508z53mrqisavji2lkxzv4w4j2pp"; type = "gem"; }; - version = "0.9.20"; + version = "0.9.24"; }; } \ No newline at end of file -- cgit v1.2.3 From 7b0a055beb59e6e96c1596a4ec3afac69b931634 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 9 Apr 2020 21:42:09 +0000 Subject: libinput: 1.15.3 -> 1.15.4 --- pkgs/development/libraries/libinput/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 446c33e61e6..f2b4b802d8b 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -27,11 +27,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { pname = "libinput"; - version = "1.15.3"; + version = "1.15.4"; src = fetchurl { url = "https://www.freedesktop.org/software/libinput/${pname}-${version}.tar.xz"; - sha256 = "0kb9i1xav8hmrl6g0qdq7jii589i9sjjrbh43fsc5284smyl44jv"; + sha256 = "1ha5qyak1ka5npy5i6hzqfpii8samkj389mkppj4wdsfv536i2ww"; }; outputs = [ "bin" "out" "dev" ]; -- cgit v1.2.3 From e24e8da3363c0824eeb74cbf64263b4b6ae6ef67 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Sat, 4 Apr 2020 19:32:30 +0000 Subject: libjpeg_turbo: 2.0.3 -> 2.0.4 --- pkgs/development/libraries/libjpeg-turbo/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index f05ac6d521b..e90516e8694 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "libjpeg-turbo"; - version = "2.0.3"; + version = "2.0.4"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1ds16bnj17v6hzd43w8pzijz3imd9am4hw75ir0fxm240m8dwij2"; + sha256 = "01ill8bgjyk582wipx7sh7gj2nidylpbzvwhx0wkcm6mxx3qbp9k"; }; patches = @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { homepage = http://libjpeg-turbo.virtualgl.org/; description = "A faster (using SIMD) libjpeg implementation"; license = licenses.ijg; # and some parts under other BSD-style licenses - maintainers = [ maintainers.vcunat ]; + maintainers = with maintainers; [ vcunat colemickens ]; platforms = platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5bcf1a2ddf4..2e9c72d6b64 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13006,6 +13006,7 @@ in libiptcdata = callPackage ../development/libraries/libiptcdata { }; libjpeg_original = callPackage ../development/libraries/libjpeg { }; + # also known as libturbojpeg libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { }; libjpeg_drop = callPackage ../development/libraries/libjpeg-drop { }; libjpeg = libjpeg_turbo; -- cgit v1.2.3 From e0fb0df64f2f8f1e123ec1a7d2cfe53cece4aeb1 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 9 Apr 2020 19:18:33 -0400 Subject: generic/setup.sh: allow clobbering env-vars file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If the option ‘noclobber’ is set in Bash, we get an error when we clobber an already existing env-vars. This is an okay error to ignore, so just >| instead. Note that >| is NOT a Bashism[[1]]. Fixes #79651 [1]: https://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_07_02 --- pkgs/stdenv/generic/setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 5b8fdde5796..ad52c8e5a7c 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -779,7 +779,7 @@ substituteAllInPlace() { # the environment used for building. dumpVars() { if [ "${noDumpEnvVars:-0}" != 1 ]; then - export > "$NIX_BUILD_TOP/env-vars" || true + export >| "$NIX_BUILD_TOP/env-vars" || true fi } -- cgit v1.2.3 From 2e6fb229923cc2fd7275d26ea87f22898bdc24fa Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 7 Apr 2020 12:36:45 -0700 Subject: python2Packages.cryptography: add missing ipaddress dependency --- pkgs/development/python-modules/cryptography/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 8d655de97b8..22f647b216d 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -2,6 +2,8 @@ , buildPythonPackage , fetchPypi , fetchpatch +, isPy27 +, ipaddress , openssl , cryptography_vectors , darwin @@ -33,7 +35,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ packaging six - ] ++ stdenv.lib.optional (!isPyPy) cffi; + ] ++ stdenv.lib.optional (!isPyPy) cffi + ++ stdenv.lib.optionals isPy27 [ ipaddress ]; checkInputs = [ cryptography_vectors -- cgit v1.2.3 From a83bafb27e9ca095fb9c1aa70e8bbd00d4aada2c Mon Sep 17 00:00:00 2001 From: Jason Felice Date: Fri, 10 Apr 2020 11:46:48 -0400 Subject: plan9port: 2019-02-25 -> 2020-01-08 --- pkgs/tools/system/plan9port/default.nix | 7 +++--- pkgs/tools/system/plan9port/tmpdir.patch | 41 -------------------------------- 2 files changed, 3 insertions(+), 45 deletions(-) delete mode 100644 pkgs/tools/system/plan9port/tmpdir.patch diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index 9a4a2238558..1541e988c1e 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -11,17 +11,16 @@ stdenv.mkDerivation { pname = "plan9port"; - version = "2019-02-25"; + version = "2020-01-08"; src = fetchFromGitHub { owner = "9fans"; repo = "plan9port"; - rev = "047fd921744f39a82a86d9370e03f7af511e6e84"; - sha256 = "1lp17948q7vpl8rc2bf5a45bc8jqyj0s3zffmks9r25ai42vgb43"; + rev = "cc3d97d52a72d7eaceb5b636bcdf81c3e19f7a2e"; + sha256 = "0gb55kj0gzx1kdhiwcrbr7xcgz1im21dyxgxhfhh6d0q9rw0c17g"; }; patches = [ - ./tmpdir.patch ./darwin-sw_vers.patch ./darwin-cfframework.patch ]; diff --git a/pkgs/tools/system/plan9port/tmpdir.patch b/pkgs/tools/system/plan9port/tmpdir.patch deleted file mode 100644 index e8200a177a2..00000000000 --- a/pkgs/tools/system/plan9port/tmpdir.patch +++ /dev/null @@ -1,41 +0,0 @@ -From c762625549ff367b54bcd8281d1ce248a69b4401 Mon Sep 17 00:00:00 2001 -From: Jason Felice -Date: Mon, 1 Jul 2019 15:01:21 -0400 -Subject: [PATCH] Use $TMPDIR if available - -NixOS sandboxed builds (at least on Mac) don't have access to /tmp, -and this should be better POSIX. ---- - bin/9c | 2 +- - bin/9l | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/bin/9c b/bin/9c -index 3ffb716c..88c47887 100755 ---- a/bin/9c -+++ b/bin/9c -@@ -133,7 +133,7 @@ case "$tag" in - esac - - # N.B. Must use temp file to avoid pipe; pipe loses status. --xtmp=/tmp/9c.$$.$USER.out -+xtmp=${TMPDIR-/tmp}/9c.$$.$USER.out - $cc -DPLAN9PORT -I$PLAN9/include $cflags "$@" 2>$xtmp - status=$? - quiet $xtmp -diff --git a/bin/9l b/bin/9l -index 6195815f..717a540a 100755 ---- a/bin/9l -+++ b/bin/9l -@@ -346,7 +346,7 @@ then - echo $ld -L$PLAN9/lib "$@" $libsl $extralibs $frameworks - fi - --xtmp=/tmp/9l.$$.$USER.out -+xtmp="${TMPDIR-/tmp}/9l.$$.$USER.out" - xxout() { - sed 's/.*: In function `[^:]*: *//' $xtmp | egrep . | - egrep -v 'is (often|almost always) misused|is dangerous, better use|text-based stub' --- -2.21.0 - -- cgit v1.2.3 From 94c416ccf428fb90be6539aa99d93f7776376e51 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 10 Apr 2020 23:47:13 +0300 Subject: gjo: init at 1.0.2 --- pkgs/tools/text/gjo/default.nix | 28 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/text/gjo/default.nix diff --git a/pkgs/tools/text/gjo/default.nix b/pkgs/tools/text/gjo/default.nix new file mode 100644 index 00000000000..fd9a150feee --- /dev/null +++ b/pkgs/tools/text/gjo/default.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "gjo"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "skanehira"; + repo = "gjo"; + rev = version; + sha256 = "1m5nkv42ri150fgj590nrl24wp90p7ygg9xdh9zblibmnqrvbz4z"; + }; + + doCheck = true; + + modSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + + meta = with stdenv.lib; { + description = "Small utility to create JSON objects"; + homepage = "https://github.com/skanehira/gjo"; + license = licenses.mit; + maintainers = with maintainers; [ doronbehar ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 836e668e9ec..6127824e64c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -940,6 +940,8 @@ in gjs = callPackage ../development/libraries/gjs { }; + gjo = callPackage ../tools/text/gjo { }; + glances = python3Packages.callPackage ../applications/system/glances { }; glasgow = with python3Packages; toPythonApplication glasgow; -- cgit v1.2.3 From ec88246d1aaed7f8614d8236ee2efd3ced92a56d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20Andr=C3=A9-Chang?= Date: Fri, 10 Apr 2020 19:14:45 +0100 Subject: ghidra: 9.1 -> 9.1.2 Move icoutils from buildInputs to nativeBuildInputs because it is a compile time dependency. --- pkgs/tools/security/ghidra/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/security/ghidra/default.nix b/pkgs/tools/security/ghidra/default.nix index 63fbca8f446..d31e1f2c275 100644 --- a/pkgs/tools/security/ghidra/default.nix +++ b/pkgs/tools/security/ghidra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, lib, makeWrapper, autoPatchelfHook +{ stdenv, fetchzip, lib, makeWrapper, autoPatchelfHook , openjdk11, pam, makeDesktopItem, icoutils }: let @@ -16,23 +16,22 @@ in stdenv.mkDerivation { - name = "ghidra-9.1"; + name = "ghidra-9.1.2"; - src = fetchurl { - url = "https://ghidra-sre.org/ghidra_9.1_PUBLIC_20191023.zip"; - sha256 = "0pl7s59008gvgwz4mxp7rz3xr3vaa12a6s5zvx2yr9jxx3gk1l99"; + src = fetchzip { + url = "https://ghidra-sre.org/ghidra_9.1.2_PUBLIC_20200212.zip"; + sha256 = "0j48pijypg44bw06azbrgfqjkigb13ljfdxib70sxwyqia3vkbbm"; }; nativeBuildInputs = [ makeWrapper autoPatchelfHook - unzip + icoutils ]; buildInputs = [ stdenv.cc.cc.lib pam - icoutils ]; dontStrip = true; @@ -42,7 +41,7 @@ in stdenv.mkDerivation { mkdir -p "${pkg_path}" "$out/share/applications" cp -a * "${pkg_path}" ln -s ${desktopItem}/share/applications/* $out/share/applications - + icotool -x "${pkg_path}/support/ghidra.ico" rm ghidra_4_40x40x32.png for f in ghidra_*.png; do -- cgit v1.2.3 From 2cb59320256afdb32562bcd6b0dff1f0ca8b6945 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 11 Apr 2020 12:06:30 +0000 Subject: samba: 4.12.0 -> 4.12.1 --- pkgs/servers/samba/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 1d6951bb8c1..44c9676fc77 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -42,11 +42,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "samba"; - version = "4.12.0"; + version = "4.12.1"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${pname}-${version}.tar.gz"; - sha256 = "1zk5jqnkifkfi6ssn02bh2ih7vyw2nsr0angsd6kyg3xaq5bgh3f"; + sha256 = "0xbdf9651lm4b5g60ly40nc7r8gssvnvq7m3pdma99mdcs5vcz01"; }; outputs = [ "out" "dev" "man" ]; -- cgit v1.2.3 From 8a37c3dd1a83da3138da455560fd25c102d2a2bd Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 11 Apr 2020 16:19:48 +0100 Subject: nixos/initrd-ssh: fix typo in docs --- nixos/modules/system/boot/initrd-ssh.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix index 5a334e69056..60760487a1d 100644 --- a/nixos/modules/system/boot/initrd-ssh.nix +++ b/nixos/modules/system/boot/initrd-ssh.nix @@ -55,7 +55,7 @@ in # ssh-keygen -t rsa -N "" -f /etc/secrets/initrd/ssh_host_rsa_key - # ssh-keygen -t ed25519 -N "" -f /etc/secrets/initrd/ssh_host_ed_25519_key + # ssh-keygen -t ed25519 -N "" -f /etc/secrets/initrd/ssh_host_ed25519_key -- cgit v1.2.3 From 91c6809946438a935714e85e510399b494994c6b Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 11 Apr 2020 16:24:55 +0100 Subject: nixos/stage-1: check secret paths before copying Fixes #84976. --- nixos/modules/system/boot/stage-1.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 9e3ee5cf0a3..dfd158e2d75 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -137,6 +137,8 @@ let ''} # Copy secrets if needed. + # + # TODO: move out to a separate script; see #85000. ${optionalString (!config.boot.loader.supportsInitrdSecrets) (concatStringsSep "\n" (mapAttrsToList (dest: source: let source' = if source == null then dest else source; in @@ -579,6 +581,25 @@ in message = "boot.resumeDevice has to be an absolute path." + " Old \"x:y\" style is no longer supported."; } + # TODO: remove when #85000 is fixed + { assertion = !config.boot.loader.supportsInitrdSecrets -> + all (source: + builtins.isPath source || + (builtins.isString source && hasPrefix source builtins.storeDir)) + (attrValues config.boot.initrd.secrets); + message = '' + boot.loader.initrd.secrets values must be unquoted paths when + using a bootloader that doesn't natively support initrd + secrets, e.g.: + + boot.initrd.secrets = { + "/etc/secret" = /path/to/secret; + }; + + Note that this will result in all secrets being stored + world-readable in the Nix store! + ''; + } ]; system.build = -- cgit v1.2.3 From 3fcbc7545c5f73c1c2bd58e6fd52604e4e78af04 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 11 Apr 2020 15:46:52 +0000 Subject: verilator: 4.030 -> 4.032 --- pkgs/applications/science/electronics/verilator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 85f6ac42126..dd6c5a09851 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "verilator"; - version = "4.030"; + version = "4.032"; src = fetchurl { url = "https://www.veripool.org/ftp/${pname}-${version}.tgz"; - sha256 = "07ldkf7xkr31n1dmx82bmzam8bvc1vsp32k76vd7yzn7r853qyky"; + sha256 = "1l3rhgw7pk59dz7dyhcl0iygn6c9rv9bv131rfzg66asxfwbfq1s"; }; enableParallelBuilding = true; -- cgit v1.2.3 From 2df7f920d689efa38db41c97e1df6584049fbaf7 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 11 Apr 2020 01:58:35 +0200 Subject: gst_all_1.gst-plugins-bad: disable zbar by default gst-plugins-bad by default used to pull in gtk3 and qtbase and qtx11extras because of the default dependency on zbar. As zbar is a rarely needed gstreamer plugin, this unnecessarily increased the closure size. I am only aware of gnome-keysign actually using the zbar plugin, so that uses a zbar-enabled gst-plugins-bad. closes #84845 --- pkgs/development/libraries/gstreamer/bad/default.nix | 2 +- pkgs/tools/security/gnome-keysign/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index ae5fd753132..d9bf86e0cf3 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -10,7 +10,7 @@ , gst-plugins-base , orc , gobject-introspection -, enableZbar ? true +, enableZbar ? false , faacSupport ? false , faac ? null , faad2 diff --git a/pkgs/tools/security/gnome-keysign/default.nix b/pkgs/tools/security/gnome-keysign/default.nix index 685971382dc..f7ff9e85d0c 100644 --- a/pkgs/tools/security/gnome-keysign/default.nix +++ b/pkgs/tools/security/gnome-keysign/default.nix @@ -53,7 +53,7 @@ python3.pkgs.buildPythonApplication rec { gst_all_1.gstreamer gst_all_1.gst-plugins-base (gst_all_1.gst-plugins-good.override { gtkSupport = true; }) - gst_all_1.gst-plugins-bad # for zbar plug-in + (gst_all_1.gst-plugins-bad.override { enableZbar = true; }) # for zbar plug-in ]; propagatedBuildInputs = with python3.pkgs; [ -- cgit v1.2.3 From a4b7440f414b24f37b37c65b99485e7106655fe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 10 Apr 2020 16:55:23 -0300 Subject: qtemu: init at 2.1 --- pkgs/applications/virtualization/qtemu/default.nix | 45 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/applications/virtualization/qtemu/default.nix diff --git a/pkgs/applications/virtualization/qtemu/default.nix b/pkgs/applications/virtualization/qtemu/default.nix new file mode 100644 index 00000000000..29f0004be83 --- /dev/null +++ b/pkgs/applications/virtualization/qtemu/default.nix @@ -0,0 +1,45 @@ +{ stdenv, mkDerivation, fetchFromGitLab, pkgconfig, qmake, qtbase, qemu, makeWrapper }: + +mkDerivation rec { + pname = "qtemu"; + version = "2.1"; + + src = fetchFromGitLab { + owner = "qtemu"; + repo = "gui"; + rev = version; + sha256 = "1555178mkfw0gwmw8bsxmg4339j2ifp0yb4b2f39nxh9hwshg07j"; + }; + + nativeBuildInputs = [ + qmake + pkgconfig + ]; + + buildInputs = [ + qtbase + qemu + ]; + + installPhase = '' + runHook preInstall + + # upstream lacks an install method + install -D -t $out/share/applications qtemu.desktop + install -D -t $out/share/pixmaps qtemu.png + install -D -t $out/bin qtemu + + # make sure that the qemu-* executables are found + wrapProgram $out/bin/qtemu --prefix PATH : ${stdenv.lib.makeBinPath [ qemu ]} + + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Qt-based front-end for QEMU emulator"; + homepage = "https://qtemu.org"; + license = licenses.gpl2; + platforms = with platforms; linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c277e9ae98d..958e902cabd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21421,6 +21421,8 @@ in qtchan = libsForQt5.callPackage ../applications/networking/browsers/qtchan { }; + qtemu = libsForQt5.callPackage ../applications/virtualization/qtemu { }; + qtox = libsForQt5.callPackage ../applications/networking/instant-messengers/qtox { }; qtpass = libsForQt5.callPackage ../applications/misc/qtpass { }; -- cgit v1.2.3 From 5384d7288522cd44ba5e766a29576426a219b400 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 12 Apr 2020 07:03:27 -0400 Subject: setup.sh: add dontPatch Fixes #85038 --- doc/stdenv/stdenv.xml | 10 ++++++++++ pkgs/stdenv/generic/setup.sh | 1 + 2 files changed, 11 insertions(+) diff --git a/doc/stdenv/stdenv.xml b/doc/stdenv/stdenv.xml index 1e97bf6157b..78e71b032d7 100644 --- a/doc/stdenv/stdenv.xml +++ b/doc/stdenv/stdenv.xml @@ -727,6 +727,16 @@ passthru.updateScript = [ ../../update.sh pname "--requested-release=unstable" ] Variables controlling the patch phase + + + dontPatch + + + + Set to true to skip the patch phase. + + + patches diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index ad52c8e5a7c..839757945a2 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -1266,6 +1266,7 @@ genericBuild() { for curPhase in $phases; do if [[ "$curPhase" = unpackPhase && -n "${dontUnpack:-}" ]]; then continue; fi + if [[ "$curPhase" = patchPhase && -n "${dontPatch:-}" ]]; then continue; fi if [[ "$curPhase" = configurePhase && -n "${dontConfigure:-}" ]]; then continue; fi if [[ "$curPhase" = buildPhase && -n "${dontBuild:-}" ]]; then continue; fi if [[ "$curPhase" = checkPhase && -z "${doCheck:-}" ]]; then continue; fi -- cgit v1.2.3 From 3794b600252c6a4763a931632f739d0c4d94a0a0 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sun, 12 Apr 2020 12:00:00 +0000 Subject: agedu: 20180918 -> 20200206 --- pkgs/tools/misc/agedu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/agedu/default.nix b/pkgs/tools/misc/agedu/default.nix index d0254e9ce9f..b3664a4c928 100644 --- a/pkgs/tools/misc/agedu/default.nix +++ b/pkgs/tools/misc/agedu/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchgit, autoreconfHook, halibut}: let - date = "20180918"; - rev = "80c7beb"; + date = "20200206"; + rev = "963bc9d"; in stdenv.mkDerivation { name = "agedu-${date}.${rev}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchgit { url = https://git.tartarus.org/simon/agedu.git; inherit rev; - sha256 = "0i930izna3s73p2q52qa377ixd14zij5q1n7w3irl7csyy78g0cd"; + sha256 = "1jmvgg2v6aqgbgpxbndrdhgfhlglrq4yv4sdbjaj6bsz9fb8lqhc"; }; nativeBuildInputs = [autoreconfHook halibut]; -- cgit v1.2.3 From e1053cb07119f6fcfd742914276421dffb35e06d Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 19 Mar 2020 09:39:14 +0100 Subject: librustzcash: improve robustness of installPhase --- pkgs/applications/blockchains/zcash/librustzcash/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/blockchains/zcash/librustzcash/default.nix b/pkgs/applications/blockchains/zcash/librustzcash/default.nix index 6cd2ae018fb..526adc715d4 100644 --- a/pkgs/applications/blockchains/zcash/librustzcash/default.nix +++ b/pkgs/applications/blockchains/zcash/librustzcash/default.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec { installPhase = '' mkdir -p $out/lib - cp target/release/librustzcash.a $out/lib/ + cp $releaseDir/librustzcash.a $out/lib/ mkdir -p $out/include cp librustzcash/include/librustzcash.h $out/include/ ''; -- cgit v1.2.3 From 8b2abebb236437262155d3eb0c0a80dbc8c6bf21 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Thu, 19 Mar 2020 23:44:58 -0700 Subject: alacritty: improve robustness of installPhase --- pkgs/applications/misc/alacritty/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index b6248b8f6f1..a4b35573fc7 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -95,7 +95,7 @@ rustPlatform.buildRustPackage rec { installPhase = '' runHook preInstall - install -D target/release/alacritty $out/bin/alacritty + install -D $releaseDir/alacritty $out/bin/alacritty '' + ( if stdenv.isDarwin then '' -- cgit v1.2.3 From 59ef82a28a76505bda4ef53a866b10205f5c24ce Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Thu, 19 Mar 2020 23:45:29 -0700 Subject: cfdyndns: improve robustness of installPhase --- pkgs/applications/networking/dyndns/cfdyndns/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix index e72f50cd29b..60a7e5b2fb2 100644 --- a/pkgs/applications/networking/dyndns/cfdyndns/default.nix +++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix @@ -19,7 +19,7 @@ buildRustPackage rec { installPhase = '' mkdir -p $out/bin - cp -p target/release/cfdyndns $out/bin/ + cp -p $releaseDir/cfdyndns $out/bin/ ''; meta = with stdenv.lib; { -- cgit v1.2.3 From 3d1824896fc2c25863a23b0da2f63aa07b129257 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Thu, 19 Mar 2020 23:45:53 -0700 Subject: gitAndTools.git-ignore: improve robustness --- .../version-management/git-and-tools/git-ignore/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix index 5c3b27ad614..93d152baa00 100644 --- a/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-ignore/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, openssl, darwin }: +{ stdenv, fetchFromGitHub, installShellFiles, rustPlatform, pkgconfig, openssl, darwin }: with rustPlatform; @@ -15,7 +15,7 @@ buildRustPackage rec { cargoSha256 = "0vcg2pl0s329fr8p23pwdx2jy7qahbr7n337ib61f69aaxi1xmq0"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig installShellFiles ]; buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security @@ -23,8 +23,7 @@ buildRustPackage rec { outputs = [ "out" "man" ]; preFixup = '' - mkdir -p "$man/man/man1" - cp target/release/build/git-ignore-*/out/git-ignore.1 "$man/man/man1/" + installManPage $releaseDir/build/git-ignore-*/out/git-ignore.1 ''; meta = with stdenv.lib; { -- cgit v1.2.3 From 0cc340e1328115d5991a04fbe34cf16f0e784844 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Thu, 19 Mar 2020 23:46:15 -0700 Subject: rustracerd: improve robustness of installPhase --- pkgs/development/tools/rust/racerd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/rust/racerd/default.nix b/pkgs/development/tools/rust/racerd/default.nix index 02b32c6485e..72588b37415 100644 --- a/pkgs/development/tools/rust/racerd/default.nix +++ b/pkgs/development/tools/rust/racerd/default.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { installPhase = '' mkdir -p $out/bin - cp -p target/release/racerd $out/bin/ + cp -p $releaseDir/racerd $out/bin/ wrapProgram $out/bin/racerd --set-default RUST_SRC_PATH "$RUST_SRC_PATH" ''; -- cgit v1.2.3 From 120b5a2c319e33edbe0e94d4f64dfe8355a6092a Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Thu, 19 Mar 2020 23:46:39 -0700 Subject: broot: improve robustness of installPhase --- pkgs/tools/misc/broot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 5d31570aacd..7ec0d533c0d 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' # install shell completion files - OUT_DIR=target/release/build/broot-*/out + OUT_DIR=$releaseDir/build/broot-*/out installShellCompletion --bash $OUT_DIR/{br,broot}.bash installShellCompletion --fish $OUT_DIR/{br,broot}.fish -- cgit v1.2.3 From e4383ce1fb9ca24b432df0b4c3069debf0758013 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Thu, 19 Mar 2020 23:46:50 -0700 Subject: fd: improve robustness of build --- pkgs/tools/misc/fd/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 060e1c3fcdf..20a2de74d27 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -18,9 +18,8 @@ rustPlatform.buildRustPackage rec { preFixup = '' installManPage "$src/doc/fd.1" - (cd target/release/build/fd-find-*/out - installShellCompletion fd.{bash,fish} - installShellCompletion --zsh _fd) + installShellCompletion $releaseDir/build/fd-find-*/out/fd.{bash,fish} + installShellCompletion --zsh $releaseDir/build/fd-find-*/out/_fd ''; meta = with lib; { -- cgit v1.2.3 From 699103e2dabb6993615381f8f626619ec0a3d6d5 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Thu, 19 Mar 2020 23:46:58 -0700 Subject: lsd: improve robustness of build --- pkgs/tools/misc/lsd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/lsd/default.nix b/pkgs/tools/misc/lsd/default.nix index 6291ad013ea..73dcbd3bc3c 100644 --- a/pkgs/tools/misc/lsd/default.nix +++ b/pkgs/tools/misc/lsd/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ installShellFiles ]; postInstall = '' - installShellCompletion target/release/build/lsd-*/out/{_lsd,lsd.{bash,fish}} + installShellCompletion $releaseDir/build/lsd-*/out/{_lsd,lsd.{bash,fish}} ''; meta = with stdenv.lib; { -- cgit v1.2.3 From 857bf884f4dfc4d34dba01200159b502ec03e8dc Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Thu, 19 Mar 2020 23:47:12 -0700 Subject: tox-node: improve robustness of installPhase --- pkgs/tools/networking/tox-node/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/tox-node/default.nix b/pkgs/tools/networking/tox-node/default.nix index 1124c2ab557..feeceef81f4 100644 --- a/pkgs/tools/networking/tox-node/default.nix +++ b/pkgs/tools/networking/tox-node/default.nix @@ -24,7 +24,7 @@ buildRustPackage rec { installPhase = '' runHook preInstall - install -D target/release/tox-node $out/bin/tox-node + install -D $releaseDir/tox-node $out/bin/tox-node runHook postInstall ''; -- cgit v1.2.3 From 21b5e7d6f65dfbcd60570f5b7ee3624fa6f97e0a Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Thu, 19 Mar 2020 23:47:20 -0700 Subject: ripgrep: improve robustness of build --- pkgs/tools/text/ripgrep/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index c794b4ba33c..9eba451c54a 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -30,9 +30,9 @@ rustPlatform.buildRustPackage rec { ++ (stdenv.lib.optional stdenv.isDarwin Security); preFixup = '' - (cd target/release/build/ripgrep-*/out - installManPage rg.1 - installShellCompletion rg.{bash,fish}) + installManPage $releaseDir/build/ripgrep-*/out/rg.1 + + installShellCompletion $releaseDir/build/ripgrep-*/out/rg.{bash,fish} installShellCompletion --zsh "$src/complete/_rg" ''; -- cgit v1.2.3 From 21f191cddb25206937a0a6d323f70c477f18ba70 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 13 Apr 2020 12:32:37 -0400 Subject: python3Packages.apptools: fix build --- pkgs/development/python-modules/apptools/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/apptools/default.nix b/pkgs/development/python-modules/apptools/default.nix index 9e06abd9a71..47144fc07aa 100644 --- a/pkgs/development/python-modules/apptools/default.nix +++ b/pkgs/development/python-modules/apptools/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage, fetchpatch , configobj, six, traitsui , nose, tables, pandas }: @@ -12,6 +12,13 @@ buildPythonPackage rec { sha256 = "10h52ibhr2aw076pivqxiajr9rpcr1mancg6xlpxzckcm3if02i6"; }; + # PyTables issue; should be merged in next post-4.5.0 release (#117) + patches = [ (fetchpatch { + url = "https://github.com/enthought/apptools/commit/3734289d1a0ebd8513fa67f75288add31ed0113c.patch"; + sha256 = "001012q1ib5cbib3nq1alh9ckzj588bfrywr8brkd1f6y1pgvngk"; + }) + ]; + propagatedBuildInputs = [ configobj six traitsui ]; checkInputs = [ -- cgit v1.2.3 From 5ac182265e8dac3490b397a485f5b4deaeb69e16 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 13 Apr 2020 12:33:51 -0400 Subject: python3Packages.pyface: remove optional wxPython dep --- pkgs/development/python-modules/pyface/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyface/default.nix b/pkgs/development/python-modules/pyface/default.nix index db8b05e8d68..db0ee541e09 100644 --- a/pkgs/development/python-modules/pyface/default.nix +++ b/pkgs/development/python-modules/pyface/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchPypi, buildPythonPackage -, setuptools, six, traits, wxPython +, setuptools, six, traits }: buildPythonPackage rec { @@ -11,7 +11,7 @@ buildPythonPackage rec { sha256 = "1g2g3za64rfffbivlihbf5njrqbv63ln62rv9d8fi1gcrgaw6akw"; }; - propagatedBuildInputs = [ setuptools six traits wxPython ]; + propagatedBuildInputs = [ setuptools six traits ]; doCheck = false; # Needs X server -- cgit v1.2.3 From 0d120b1f2514c8f9698edc0a7680a2d4fd77b37c Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Mon, 6 Apr 2020 17:01:06 +0200 Subject: bash-completion: 2.9 -> 2.10 --- ...d-Do-cmake-pc-and-profile-variable-replac.patch | 86 ---------------------- pkgs/shells/bash/bash-completion/default.nix | 47 +++++++----- 2 files changed, 28 insertions(+), 105 deletions(-) delete mode 100644 pkgs/shells/bash/bash-completion/0001-Revert-build-Do-cmake-pc-and-profile-variable-replac.patch diff --git a/pkgs/shells/bash/bash-completion/0001-Revert-build-Do-cmake-pc-and-profile-variable-replac.patch b/pkgs/shells/bash/bash-completion/0001-Revert-build-Do-cmake-pc-and-profile-variable-replac.patch deleted file mode 100644 index c0d94a1a76d..00000000000 --- a/pkgs/shells/bash/bash-completion/0001-Revert-build-Do-cmake-pc-and-profile-variable-replac.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 398f44b4ed545fc1b6c13a057bf0900001f7958b Mon Sep 17 00:00:00 2001 -From: Frederik Rietdijk -Date: Tue, 22 Oct 2019 15:07:05 +0200 -Subject: [PATCH] Revert "build: Do cmake, pc, and profile variable - replacements in Makefile" - -This reverts commit 81ba2c7e7dfbaefbafa1e8615727c9612e5fb314. ---- - Makefile.am | 12 ++++++++---- - bash-completion-config.cmake.in | 4 ++-- - bash-completion.pc.in | 4 ++-- - configure.ac | 3 +++ - 4 files changed, 15 insertions(+), 8 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 8f441185..53979529 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -23,8 +23,7 @@ cmakeconfig_DATA = bash-completion-config.cmake \ - -e 's|@VERSION[@]|$(VERSION)|' \ - <$(srcdir)/$@.in >$@ - --CLEANFILES = bash_completion.sh bash-completion.pc \ -- bash-completion-config.cmake bash-completion-config-version.cmake -+CLEANFILES = bash_completion.sh bash-completion.pc - - EXTRA_DIST = CHANGES $(pkgdata_DATA) bash_completion.sh.in .dir-locals.el \ - .editorconfig README.md CONTRIBUTING.md pyproject.toml .perltidyrc \ -@@ -34,6 +33,11 @@ EXTRA_DIST = CHANGES $(pkgdata_DATA) bash_completion.sh.in .dir-locals.el \ - install-data-hook: - tmpfile=`mktemp $${TMPDIR:-/tmp}/bash_completion.XXXXXX` && \ - $(SED) -e 's|-/etc/bash_completion\.d|-$(compatdir)|' \ -- $(DESTDIR)$(pkgdatadir)/bash_completion >$$tmpfile && \ -- cat $$tmpfile >$(DESTDIR)$(pkgdatadir)/bash_completion && \ -+ $(DESTDIR)$(pkgdatadir)/bash_completion > $$tmpfile && \ -+ cat $$tmpfile > $(DESTDIR)$(pkgdatadir)/bash_completion && \ -+ $(SED) -e 's|\$${prefix}|$(prefix)|' \ -+ $(DESTDIR)$(datadir)/cmake/$(PACKAGE)/bash-completion-config.cmake \ -+ > $$tmpfile && \ -+ cat $$tmpfile > \ -+ $(DESTDIR)$(datadir)/cmake/$(PACKAGE)/bash-completion-config.cmake && \ - rm $$tmpfile -diff --git a/bash-completion-config.cmake.in b/bash-completion-config.cmake.in -index d907b76c..ccc6e052 100644 ---- a/bash-completion-config.cmake.in -+++ b/bash-completion-config.cmake.in -@@ -5,7 +5,7 @@ set (BASH_COMPLETION_VERSION "@VERSION@") - - set (BASH_COMPLETION_PREFIX "@prefix@") - set (BASH_COMPLETION_COMPATDIR "@compatdir@") --set (BASH_COMPLETION_COMPLETIONSDIR "@pkgdatadir@/completions") --set (BASH_COMPLETION_HELPERSDIR "@pkgdatadir@/helpers") -+set (BASH_COMPLETION_COMPLETIONSDIR "@datarootdir@/@PACKAGE@/completions") -+set (BASH_COMPLETION_HELPERSDIR "@datarootdir@/@PACKAGE@/helpers") - - set (BASH_COMPLETION_FOUND "TRUE") -diff --git a/bash-completion.pc.in b/bash-completion.pc.in -index ea03fd75..bde217db 100644 ---- a/bash-completion.pc.in -+++ b/bash-completion.pc.in -@@ -1,7 +1,7 @@ - prefix=@prefix@ - compatdir=@compatdir@ --completionsdir=@pkgdatadir@/completions --helpersdir=@pkgdatadir@/helpers -+completionsdir=@datarootdir@/@PACKAGE@/completions -+helpersdir=@datarootdir@/@PACKAGE@/helpers - - Name: bash-completion - Description: programmable completion for the bash shell -diff --git a/configure.ac b/configure.ac -index 1f3b37e8..a216d9b7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -13,5 +13,8 @@ helpers/Makefile - test/Makefile - test/t/Makefile - test/t/unit/Makefile -+bash-completion.pc -+bash-completion-config.cmake -+bash-completion-config-version.cmake - ]) - AC_OUTPUT --- -2.21.0 - diff --git a/pkgs/shells/bash/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix index 8efada3413a..c223985c2fb 100644 --- a/pkgs/shells/bash/bash-completion/default.nix +++ b/pkgs/shells/bash/bash-completion/default.nix @@ -1,49 +1,58 @@ { stdenv, fetchFromGitHub , fetchpatch , autoreconfHook +, perl +, ps , python3Packages , bashInteractive }: stdenv.mkDerivation rec { pname = "bash-completion"; - # TODO: Remove musl patch below upon next release! - version = "2.9"; + version = "2.10"; src = fetchFromGitHub { owner = "scop"; repo = "bash-completion"; rev = version; - sha256 = "1813r4jxfa2zgzm2ppjhrq62flfmxai8433pklxcrl4fp5wwx9yv"; + sha256 = "047yjryy9d6hp18wkigbfrw9r0sm31inlsp8l28fhxg8ii032sgq"; }; nativeBuildInputs = [ autoreconfHook ]; doCheck = !stdenv.isDarwin; checkInputs = [ + # perl is assumed by perldoc completion + perl + # ps assumed to exist by gdb, killall, pgrep, pidof, + # pkill, pwdx, renice, and reptyr completions + ps python3Packages.pexpect python3Packages.pytest bashInteractive ]; - patches = [ - ./0001-Revert-build-Do-cmake-pc-and-profile-variable-replac.patch - # TODO: Remove when https://github.com/scop/bash-completion/commit/2cdac1b9f24df62a1fa80c1824ee8524c9b02393 - # is availabe in a release in nixpkgs. see https://github.com/scop/bash-completion/issues/312. - # Fixes a test failure with musl. - (fetchpatch { - url = "https://github.com/scop/bash-completion/commit/2cdac1b9f24df62a1fa80c1824ee8524c9b02393.patch"; - name = "bash-completion-musl-test_iconv-skip-option-completion-if-help-fails"; - sha256 = "1l53d62zf01k625nzw3vcrxky93h7bzdpchgk4argxalrn17ckvb"; - }) - ]; - - # ignore ip_addresses because it tries to touch network - # ignore test_ls because impure logic + # - ignore test_gcc on ARM because it assumes -march=native + # - ignore test_chsh because it assumes /etc/shells exists + # - ignore test_ether_wake, test_ifdown, test_ifstat, test_ifup, + # test_iperf, test_iperf3, test_nethogs and ip_addresses + # because they try to touch network + # - ignore test_ls because impure logic + # - ignore test_screen because it assumes vt terminals exist checkPhase = '' pytest . \ + ${stdenv.lib.optionalString (stdenv.hostPlatform.isAarch64) "--ignore=test/t/test_gcc.py"} \ + --ignore=test/t/test_chsh.py \ + --ignore=test/t/test_ether_wake.py \ + --ignore=test/t/test_ifdown.py \ + --ignore=test/t/test_ifstat.py \ + --ignore=test/t/test_ifup.py \ + --ignore=test/t/test_iperf.py \ + --ignore=test/t/test_iperf3.py \ + --ignore=test/t/test_nethogs.py \ --ignore=test/t/unit/test_unit_ip_addresses.py \ - --ignore=test/t/test_ls.py + --ignore=test/t/test_ls.py \ + --ignore=test/t/test_screen.py ''; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' @@ -55,6 +64,6 @@ stdenv.mkDerivation rec { description = "Programmable completion for the bash shell"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = [ maintainers.peti ]; + maintainers = [ maintainers.peti maintainers.xfix ]; }; } -- cgit v1.2.3 From bdb2bed66e5fe3015a0927514b2af593210e08a1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 13 Apr 2020 17:37:45 +0200 Subject: gnome3.gnome-shell: fix build with bash-completion 2.10 --- pkgs/desktops/gnome-3/core/gnome-shell/default.nix | 5 ++++- .../gnome-3/core/gnome-shell/fix-bash-completion.patch | 10 ---------- 2 files changed, 4 insertions(+), 11 deletions(-) delete mode 100644 pkgs/desktops/gnome-3/core/gnome-shell/fix-bash-completion.patch diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index bcb72cb95b6..d75df9a55cf 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -65,7 +65,10 @@ in stdenv.mkDerivation rec { # Install bash-completions to correct prefix. # https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/1194 - ./fix-bash-completion.patch + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-shell/commit/9f1ad5d86ddbabaa840eb2860279d53f4e635453.patch"; + sha256 = "f8MDFbfg9D7ORF84Ld9GIvf0xRCYuSszo3QLMji2VaE="; + }) # Use absolute path for libshew installation to make our patched gobject-introspection # aware of the location to hardcode in the generated GIR file. diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/fix-bash-completion.patch b/pkgs/desktops/gnome-3/core/gnome-shell/fix-bash-completion.patch deleted file mode 100644 index 08f674c2377..00000000000 --- a/pkgs/desktops/gnome-3/core/gnome-shell/fix-bash-completion.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/subprojects/extensions-tool/meson.build -+++ a/subprojects/extensions-tool/meson.build -@@ -39,6 +39,6 @@ subdir('src') - - if bash_completion.found() - install_data('completion/bash/gnome-extensions', -- install_dir: bash_completion.get_pkgconfig_variable('completionsdir') -+ install_dir: bash_completion.get_pkgconfig_variable('completionsdir', define_variable: ['prefix', prefix]) - ) - endif -- cgit v1.2.3 From 2d8f346c7c4fc7ab55b209743517d24e814e3997 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 13 Apr 2020 13:48:53 -0400 Subject: python3Packages.envisage: update and disable for Python 2 - next release will drop support for Python 2 --- .../python-modules/envisage/default.nix | 29 ++++++++++++++++------ 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/envisage/default.nix b/pkgs/development/python-modules/envisage/default.nix index ba3e6a0c636..397e573a252 100644 --- a/pkgs/development/python-modules/envisage/default.nix +++ b/pkgs/development/python-modules/envisage/default.nix @@ -1,15 +1,18 @@ -{ stdenv, fetchPypi, buildPythonPackage +{ lib, fetchPypi, fetchpatch, isPy27 +, buildPythonPackage , traits, apptools -, ipykernel +, python, ipykernel, ipython }: buildPythonPackage rec { pname = "envisage"; - version = "4.7.2"; + version = "4.9.2"; + + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0jb5nw0w9x97jij0hd3d7kfzcj58r1cqmplmdy56bj11dyc4wyc9"; + sha256 = "1srjmkhnz84nz5jd72vdsnc4fn7dd9jr8nyf3hzk6yx1dsn815gd"; }; propagatedBuildInputs = [ traits apptools ]; @@ -18,16 +21,26 @@ buildPythonPackage rec { export HOME=$PWD/HOME ''; + # fix a test failure; should be merged in next release + patches = [ (fetchpatch { + url = "https://github.com/enthought/envisage/pull/248/commits/7b6d2dd615d5cb7455b200eb8f37e030bbf4df9e.patch"; + sha256 = "0a3dmbpxwsn1bkjcjv9v7b751rcmppj6hc9wcgiayg4l9r2nrvyh"; + }) ]; + checkInputs = [ - ipykernel + ipykernel ipython ]; - doCheck = true; + checkPhase = '' + runHook preCheck + ${python.interpreter} -m unittest + runHook postCheck + ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Framework for building applications whose functionalities can be extended by adding 'plug-ins'"; homepage = "https://github.com/enthought/envisage"; - maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; + maintainers = with lib.maintainers; [ knedlsepp ]; license = licenses.bsdOriginal; }; } -- cgit v1.2.3 From c26ee28613da6c03c6ce1f966ca1579e59cf3a63 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Mon, 13 Apr 2020 21:25:39 +0200 Subject: python.pkgs.zimports: init at 0.2.0 The author gives a pretty good overview of why one would want to use zimports over other import organizers: https://github.com/sqlalchemyorg/zimports/tree/0.2.0#zzzeek-why-are-you-writing-one-of-these-there-are-a-dozen-pep8-import-fixers --- .../python-modules/zimports/default.nix | 38 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/zimports/default.nix diff --git a/pkgs/development/python-modules/zimports/default.nix b/pkgs/development/python-modules/zimports/default.nix new file mode 100644 index 00000000000..43588361ca7 --- /dev/null +++ b/pkgs/development/python-modules/zimports/default.nix @@ -0,0 +1,38 @@ +{ lib +, isPy3k +, fetchFromGitHub +, buildPythonPackage +, flake8-import-order +, pyflakes +, mock +}: + +buildPythonPackage rec { + pname = "zimports"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "sqlalchemyorg"; + repo = "zimports"; + rev = version; + sha256 = "0a5axflkk0wv0rdnrh8l2rgj8gh2pfkg5lrvr8x4yxxiifawrafc"; + }; + + disabled = !isPy3k; + + propagatedBuildInputs = [ + pyflakes + flake8-import-order + ]; + + checkInputs = [ + mock + ]; + + meta = with lib; { + description = "Python import rewriter"; + homepage = "https://github.com/sqlalchemyorg/zimports"; + license = licenses.mit; + maintainers = with maintainers; [ timokau ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a706d420e7b..e32fb1995e6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6010,6 +6010,8 @@ in { zerorpc = callPackage ../development/python-modules/zerorpc { }; + zimports = callPackage ../development/python-modules/zimports { }; + zipstream = callPackage ../development/python-modules/zipstream { }; zodb = callPackage ../development/python-modules/zodb {}; -- cgit v1.2.3 From 7205bd64a38d73ff8c46a5bb9d4732da1a26ac02 Mon Sep 17 00:00:00 2001 From: squalus Date: Mon, 13 Apr 2020 13:17:05 -0700 Subject: ungoogled-chromium: init at 81.0.4044.92-2 --- maintainers/maintainer-list.nix | 6 + .../browsers/ungoogled-chromium/browser.nix | 94 ++++++ .../browsers/ungoogled-chromium/common.nix | 361 +++++++++++++++++++++ .../browsers/ungoogled-chromium/default.nix | 205 ++++++++++++ .../patches/dont-use-ANGLE-by-default.patch | 26 ++ .../patches/nix_plugin_paths_68.patch | 61 ++++ .../patches/no-build-timestamps.patch | 17 + .../patches/remove-webp-include-69.patch | 11 + .../ungoogled-chromium/patches/vaapi-fix.patch | 74 +++++ .../ungoogled-chromium/patches/widevine-79.patch | 13 + .../browsers/ungoogled-chromium/plugins.nix | 93 ++++++ .../browsers/ungoogled-chromium/ungoogled-src.nix | 6 + .../browsers/ungoogled-chromium/ungoogled.nix | 42 +++ .../browsers/ungoogled-chromium/update.nix | 271 ++++++++++++++++ .../browsers/ungoogled-chromium/update.sh | 4 + .../browsers/ungoogled-chromium/upstream-info.nix | 18 + pkgs/top-level/all-packages.nix | 2 + 17 files changed, 1304 insertions(+) create mode 100644 pkgs/applications/networking/browsers/ungoogled-chromium/browser.nix create mode 100644 pkgs/applications/networking/browsers/ungoogled-chromium/common.nix create mode 100644 pkgs/applications/networking/browsers/ungoogled-chromium/default.nix create mode 100644 pkgs/applications/networking/browsers/ungoogled-chromium/patches/dont-use-ANGLE-by-default.patch create mode 100644 pkgs/applications/networking/browsers/ungoogled-chromium/patches/nix_plugin_paths_68.patch create mode 100644 pkgs/applications/networking/browsers/ungoogled-chromium/patches/no-build-timestamps.patch create mode 100644 pkgs/applications/networking/browsers/ungoogled-chromium/patches/remove-webp-include-69.patch create mode 100644 pkgs/applications/networking/browsers/ungoogled-chromium/patches/vaapi-fix.patch create mode 100644 pkgs/applications/networking/browsers/ungoogled-chromium/patches/widevine-79.patch create mode 100644 pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix create mode 100644 pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix create mode 100644 pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled.nix create mode 100644 pkgs/applications/networking/browsers/ungoogled-chromium/update.nix create mode 100755 pkgs/applications/networking/browsers/ungoogled-chromium/update.sh create mode 100644 pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index a09fa258fde..fb67439ca43 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7150,6 +7150,12 @@ githubId = 1414088; name = "Spencer Whitt"; }; + squalus = { + email = "squalus@tuta.io"; + github = "squalus"; + githubId = 36899624; + name = "squalus"; + }; srghma = { email = "srghma@gmail.com"; github = "srghma"; diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/browser.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/browser.nix new file mode 100644 index 00000000000..87248013a9a --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/browser.nix @@ -0,0 +1,94 @@ +{ stdenv, mkChromiumDerivation, channel, enableWideVine }: + +with stdenv.lib; + +mkChromiumDerivation (base: rec { + name = "chromium-browser"; + packageName = "chromium"; + buildTargets = [ "mksnapshot" "chrome_sandbox" "chrome" ]; + + outputs = ["out" "sandbox"]; + + sandboxExecutableName = "__chromium-suid-sandbox"; + + installPhase = '' + mkdir -p "$libExecPath" + cp -v "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/" + cp -v "$buildPath/icudtl.dat" "$libExecPath/" + cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" + cp -v "$buildPath/chrome" "$libExecPath/$packageName" + + # Swiftshader + # See https://stackoverflow.com/a/4264351/263061 for the find invocation. + if [ -n "$(find "$buildPath/swiftshader/" -maxdepth 1 -name '*.so' -print -quit)" ]; then + echo "Swiftshader files found; installing" + mkdir -p "$libExecPath/swiftshader" + cp -v "$buildPath/swiftshader/"*.so "$libExecPath/swiftshader/" + else + echo "Swiftshader files not found" + fi + + mkdir -p "$sandbox/bin" + cp -v "$buildPath/chrome_sandbox" "$sandbox/bin/${sandboxExecutableName}" + + mkdir -vp "$out/share/man/man1" + cp -v "$buildPath/chrome.1" "$out/share/man/man1/$packageName.1" + + for icon_file in chrome/app/theme/chromium/product_logo_*[0-9].png; do + num_and_suffix="''${icon_file##*logo_}" + icon_size="''${num_and_suffix%.*}" + expr "$icon_size" : "^[0-9][0-9]*$" || continue + logo_output_prefix="$out/share/icons/hicolor" + logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps" + mkdir -vp "$logo_output_path" + cp -v "$icon_file" "$logo_output_path/$packageName.png" + done + + # Install Desktop Entry + install -D chrome/installer/linux/common/desktop.template \ + $out/share/applications/chromium-browser.desktop + + substituteInPlace $out/share/applications/chromium-browser.desktop \ + --replace "@@MENUNAME@@" "Chromium" \ + --replace "@@PACKAGE@@" "chromium" \ + --replace "Exec=/usr/bin/@@USR_BIN_SYMLINK_NAME@@" "Exec=chromium" + + # Append more mime types to the end + sed -i '/^MimeType=/ s,$,x-scheme-handler/webcal;x-scheme-handler/mailto;x-scheme-handler/about;x-scheme-handler/unknown,' \ + $out/share/applications/chromium-browser.desktop + + # See https://github.com/NixOS/nixpkgs/issues/12433 + sed -i \ + -e '/\[Desktop Entry\]/a\' \ + -e 'StartupWMClass=chromium-browser' \ + $out/share/applications/chromium-browser.desktop + ''; + + passthru = { inherit sandboxExecutableName; }; + + requiredSystemFeatures = [ "big-parallel" ]; + + meta = { + description = "An open source web browser from Google, with dependencies on Google web services removed"; + longDescription = '' + Chromium is an open source web browser from Google that aims to build a + safer, faster, and more stable way for all Internet users to experience + the web. It has a minimalist user interface and provides the vast majority + of source code for Google Chrome (which has some additional features). + ''; + homepage = https://github.com/Eloston/ungoogled-chromium; + maintainers = with maintainers; [ squalus ]; + # Overview of the maintainer roles: + # nixos-unstable: + # - TODO: Need a new maintainer for x86_64 [0] + # - @thefloweringash: aarch64 + # - @primeos: Provisional maintainer (x86_64) + # Stable channel: + # - TODO (need someone to test backports [0]) + # [0]: https://github.com/NixOS/nixpkgs/issues/78450 + license = if enableWideVine then licenses.unfree else licenses.bsd3; + platforms = platforms.linux; + hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else []; + timeout = 172800; # 48 hours + }; +}) diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix new file mode 100644 index 00000000000..d07da2b3b07 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix @@ -0,0 +1,361 @@ +{ stdenv, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, gnutar + +# default dependencies +, bzip2, flac, speex, libopus +, libevent, expat, libjpeg, snappy +, libpng, libcap +, xdg_utils, yasm, minizip, libwebp +, libusb1, pciutils, nss, re2, zlib + +, python2Packages, perl, pkgconfig +, nspr, systemd, kerberos +, utillinux, alsaLib +, bison, gperf +, glib, gtk3, dbus-glib +, glibc +, libXScrnSaver, libXcursor, libXtst, libGLU, libGL +, protobuf, speechd, libXdamage, cups +, ffmpeg, libxslt, libxml2, at-spi2-core +, jre + +# optional dependencies +, libgcrypt ? null # gnomeSupport || cupsSupport +, libva ? null # useVaapi +, libdrm ? null, wayland ? null, mesa_drivers ? null, libxkbcommon ? null # useOzone + +# package customization +, useVaapi ? false +, useOzone ? false +, gnomeSupport ? false, gnome ? null +, gnomeKeyringSupport ? false, libgnome-keyring3 ? null +, proprietaryCodecs ? true +, cupsSupport ? true +, pulseSupport ? false, libpulseaudio ? null +, ungoogled-chromium +, ungoogled ? false + +, upstream-info +}: + +buildFun: + +with stdenv.lib; + +# see http://www.linuxfromscratch.org/blfs/view/cvs/xsoft/chromium.html + +let + # The additional attributes for creating derivations based on the chromium + # source tree. + extraAttrs = buildFun base; + + githubPatch = commit: sha256: fetchpatch { + url = "https://github.com/chromium/chromium/commit/${commit}.patch"; + inherit sha256; + }; + + mkGnFlags = + let + # Serialize Nix types into GN types according to this document: + # https://chromium.googlesource.com/chromium/src/+/master/tools/gn/docs/language.md + mkGnString = value: "\"${escape ["\"" "$" "\\"] value}\""; + sanitize = value: + if value == true then "true" + else if value == false then "false" + else if isList value then "[${concatMapStringsSep ", " sanitize value}]" + else if isInt value then toString value + else if isString value then mkGnString value + else throw "Unsupported type for GN value `${value}'."; + toFlag = key: value: "${key}=${sanitize value}"; + in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); + + gnSystemLibraries = [ + "flac" "libwebp" "libxslt" "yasm" "opus" "snappy" "libpng" + # "zlib" # version 77 reports unresolved dependency on //third_party/zlib:zlib_config + # "libjpeg" # fails with multiple undefined references to chromium_jpeg_* + # "re2" # fails with linker errors + # "ffmpeg" # https://crbug.com/731766 + # "harfbuzz-ng" # in versions over 63 harfbuzz and freetype are being built together + # so we can't build with one from system and other from source + ]; + + opusWithCustomModes = libopus.override { + withCustomModes = true; + }; + + defaultDependencies = [ + bzip2 flac speex opusWithCustomModes + libevent expat libjpeg snappy + libpng libcap + xdg_utils yasm minizip libwebp + libusb1 re2 zlib + ffmpeg libxslt libxml2 + # harfbuzz # in versions over 63 harfbuzz and freetype are being built together + # so we can't build with one from system and other from source + ]; + + # build paths and release info + packageName = extraAttrs.packageName or extraAttrs.name; + buildType = "Release"; + buildPath = "out/${buildType}"; + libExecPath = "$out/libexec/${packageName}"; + + versionRange = min-version: upto-version: + let inherit (upstream-info) version; + result = versionAtLeast version min-version && versionOlder version upto-version; + stable-version = (import ./upstream-info.nix).stable.version; + in if versionAtLeast stable-version upto-version + then warn "chromium: stable version ${stable-version} is newer than a patchset bounded at ${upto-version}. You can safely delete it." + result + else result; + + ungoogler = + let versionEntry = (import ./ungoogled-src.nix)."${upstream-info.version}"; + in ungoogled-chromium { + inherit (versionEntry) rev sha256; + }; + base = rec { + name = "${packageName}-unwrapped-${version}"; + inherit (upstream-info) channel version; + inherit packageName buildType buildPath; + + src = upstream-info.main; + + nativeBuildInputs = [ + ninja which python2Packages.python perl pkgconfig + python2Packages.ply python2Packages.jinja2 nodejs + gnutar + ] ++ optional (versionAtLeast version "83") python2Packages.setuptools; + + buildInputs = defaultDependencies ++ [ + nspr nss systemd + utillinux alsaLib + bison gperf kerberos + glib gtk3 dbus-glib + libXScrnSaver libXcursor libXtst libGLU libGL + pciutils protobuf speechd libXdamage at-spi2-core + jre + ] ++ optional gnomeKeyringSupport libgnome-keyring3 + ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] + ++ optionals cupsSupport [ libgcrypt cups ] + ++ optional useVaapi libva + ++ optional pulseSupport libpulseaudio + ++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ]; + + patches = [ + ./patches/nix_plugin_paths_68.patch + ./patches/remove-webp-include-69.patch + ./patches/no-build-timestamps.patch + ./patches/widevine-79.patch + ./patches/dont-use-ANGLE-by-default.patch + # Unfortunately, chromium regularly breaks on major updates and + # then needs various patches backported in order to be compiled with GCC. + # Good sources for such patches and other hints: + # - https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/ + # - https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium + # - https://github.com/chromium/chromium/search?q=GCC&s=committer-date&type=Commits + # + # ++ optionals (channel == "dev") [ ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" ) ] + # ++ optional (versionRange "68" "72") ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" ) + ] ++ optionals (useVaapi) ([ + # source: https://aur.archlinux.org/cgit/aur.git/tree/vaapi-fix.patch?h=chromium-vaapi + ./patches/vaapi-fix.patch + ] ++ optionals (versionRange "81" "82") [ + (githubPatch "5b2ff215473e0526b5b24aeff4ad90d369b21c75" "0n00vh8wfpn2ay5fqsxcsx0zadnv7mihm72bcvnrfzh75nzbg902") + (githubPatch "98e343ab369e4262511b5fce547728e3e5eefba8" "00wwp653jk0k0yvix00vr7ymgck9dj7fxjwx4nc67ynn84dh6064") + ]); + + postPatch = '' + # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX + substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ + --replace \ + 'return sandbox_binary;' \ + 'return base::FilePath(GetDevelSandboxPath());' + + substituteInPlace services/audio/audio_sandbox_hook_linux.cc \ + --replace \ + '/usr/share/alsa/' \ + '${alsaLib}/share/alsa/' \ + --replace \ + '/usr/lib/x86_64-linux-gnu/gconv/' \ + '${glibc}/lib/gconv/' \ + --replace \ + '/usr/share/locale/' \ + '${glibc}/share/locale/' + + sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \ + chrome/browser/shell_integration_linux.cc + + sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \ + device/udev_linux/udev?_loader.cc + + sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ + gpu/config/gpu_info_collector_linux.cc + + sed -i -re 's/([^:])\<(isnan *\()/\1std::\2/g' \ + chrome/browser/ui/webui/engagement/site_engagement_ui.cc + + sed -i -e '/#include/ { + i #include + :l; n; bl + }' gpu/config/gpu_control_list.cc + + # Allow to put extensions into the system-path. + sed -i -e 's,/usr,/run/current-system/sw,' chrome/common/chrome_paths.cc + + patchShebangs . + # use our own nodejs + mkdir -p third_party/node/linux/node-linux-x64/bin + ln -s $(which node) third_party/node/linux/node-linux-x64/bin/node + + # remove unused third-party + # in third_party/crashpad third_party/zlib contains just a header-adapter + for lib in ${toString gnSystemLibraries}; do + find -type f -path "*third_party/$lib/*" \ + \! -path "*third_party/crashpad/crashpad/third_party/zlib/*" \ + \! -path "*third_party/$lib/chromium/*" \ + \! -path "*third_party/$lib/google/*" \ + \! -path "*base/third_party/icu/*" \ + \! -path "*base/third_party/libevent/*" \ + \! -regex '.*\.\(gn\|gni\|isolate\|py\)' \ + -delete + done + '' + optionalString stdenv.isAarch64 '' + substituteInPlace build/toolchain/linux/BUILD.gn \ + --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""' + '' + optionalString stdenv.cc.isClang '' + mkdir -p third_party/llvm-build/Release+Asserts/bin + ln -s ${stdenv.cc}/bin/clang third_party/llvm-build/Release+Asserts/bin/clang + ln -s ${stdenv.cc}/bin/clang++ third_party/llvm-build/Release+Asserts/bin/clang++ + ln -s ${llvmPackages.llvm}/bin/llvm-ar third_party/llvm-build/Release+Asserts/bin/llvm-ar + '' + optionalString ungoogled '' + ${ungoogler}/utils/prune_binaries.py . ${ungoogler}/pruning.list || echo "some errors" + ${ungoogler}/utils/patches.py . ${ungoogler}/patches + ${ungoogler}/utils/domain_substitution.py apply -r ${ungoogler}/domain_regex.list -f ${ungoogler}/domain_substitution.list -c ./ungoogled-domsubcache.tar.gz . + ''; + + gnFlags = mkGnFlags ({ + linux_use_bundled_binutils = false; + use_lld = false; + use_gold = true; + gold_path = "${stdenv.cc}/bin"; + is_debug = false; + + proprietary_codecs = false; + use_sysroot = false; + use_gnome_keyring = gnomeKeyringSupport; + use_gio = gnomeSupport; + # ninja: error: '../../native_client/toolchain/linux_x86/pnacl_newlib/bin/x86_64-nacl-objcopy', + # needed by 'nacl_irt_x86_64.nexe', missing and no known rule to make it + enable_nacl = false; + # Enabling the Widevine component here doesn't affect whether we can + # redistribute the chromium package; the Widevine component is either + # added later in the wrapped -wv build or downloaded from Google. + enable_widevine = true; + use_cups = cupsSupport; + + treat_warnings_as_errors = false; + is_clang = stdenv.cc.isClang; + clang_use_chrome_plugins = false; + blink_symbol_level = 0; + fieldtrial_testing_like_official_build = true; + + # Google API keys, see: + # http://www.chromium.org/developers/how-tos/api-keys + # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution, + # please get your own set of keys. + google_api_key = "AIzaSyDGi15Zwl11UNe6Y-5XW_upsfyw31qwZPI"; + google_default_client_id = "404761575300.apps.googleusercontent.com"; + google_default_client_secret = "9rIFQjfnkykEmqb6FfjJQD1D"; + } // optionalAttrs proprietaryCodecs { + # enable support for the H.264 codec + proprietary_codecs = true; + enable_hangout_services_extension = true; + ffmpeg_branding = "Chrome"; + } // optionalAttrs useVaapi { + use_vaapi = true; + } // optionalAttrs pulseSupport { + use_pulseaudio = true; + link_pulseaudio = true; + } // optionalAttrs useOzone { + use_ozone = true; + ozone_platform_gbm = false; + use_xkbcommon = true; + use_glib = true; + use_gtk = true; + use_system_libwayland = true; + use_system_minigbm = true; + use_system_libdrm = true; + system_wayland_scanner_path = "${wayland}/bin/wayland-scanner"; + } // optionalAttrs ungoogled { + closure_compile = false; + enable_hangout_services_extension = false; + enable_mdns = false; + enable_nacl_nonsfi = false; + enable_one_click_signin = false; + enable_reading_list = false; + enable_remoting = false; + enable_reporting = false; + enable_service_discovery = false; + exclude_unwind_tables = true; + google_api_key = ""; + google_default_client_id = ""; + google_default_client_secret = ""; + optimize_webui = false; + safe_browsing_mode = 0; + use_official_google_api_keys = false; + use_unofficial_version_number = false; + } // (extraAttrs.gnFlags or {})); + + configurePhase = '' + runHook preConfigure + + # This is to ensure expansion of $out. + libExecPath="${libExecPath}" + python build/linux/unbundle/replace_gn_files.py \ + --system-libraries ${toString gnSystemLibraries} + ${gnChromium}/bin/gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt + + # Fail if `gn gen` contains a WARNING. + grep -o WARNING gn-gen-outputs.txt && echo "Found gn WARNING, exiting nix build" && exit 1 + + runHook postConfigure + ''; + + # Don't spam warnings about unknown warning options. This is useful because + # our Clang is always older than Chromium's and the build logs have a size + # of approx. 25 MB without this option (and this saves e.g. 66 %). + NIX_CFLAGS_COMPILE = "-Wno-unknown-warning-option"; + + buildPhase = let + # Build paralelism: on Hydra the build was frequently running into memory + # exhaustion, and even other users might be running into similar issues. + # -j is halved to avoid memory problems, and -l is slightly increased + # so that the build gets slight preference before others + # (it will often be on "critical path" and at risk of timing out) + buildCommand = target: '' + ninja -C "${buildPath}" \ + -j$(( ($NIX_BUILD_CORES+1) / 2 )) -l$(( $NIX_BUILD_CORES+1 )) \ + "${target}" + ( + source chrome/installer/linux/common/installer.include + PACKAGE=$packageName + MENUNAME="Chromium" + process_template chrome/app/resources/manpage.1.in "${buildPath}/chrome.1" + ) + ''; + targets = extraAttrs.buildTargets or []; + commands = map buildCommand targets; + in concatStringsSep "\n" commands; + + postFixup = '' + # Make sure that libGLESv2 is found by dlopen (if using EGL). + chromiumBinary="$libExecPath/$packageName" + origRpath="$(patchelf --print-rpath "$chromiumBinary")" + patchelf --set-rpath "${libGL}/lib:$origRpath" "$chromiumBinary" + ''; + }; + +# Remove some extraAttrs we supplied to the base attributes already. +in stdenv.mkDerivation (base // removeAttrs extraAttrs [ + "name" "gnFlags" "buildTargets" +]) diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix new file mode 100644 index 00000000000..f172e7c09ce --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix @@ -0,0 +1,205 @@ +{ newScope, config, stdenv, llvmPackages_9, llvmPackages_10 +, makeWrapper, ed +, glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit +, libva ? null +, gcc, nspr, nss, patchelfUnstable, runCommand +, lib + +# package customization +, channel ? "stable" +, gnomeSupport ? false, gnome ? null +, gnomeKeyringSupport ? false +, proprietaryCodecs ? true +, enablePepperFlash ? false +, enableWideVine ? false +, ungoogled ? true +, useVaapi ? false # test video on radeon, before enabling this +, useOzone ? false +, cupsSupport ? true +, pulseSupport ? config.pulseaudio or stdenv.isLinux +, commandLineArgs ? "" +}: + +let + llvmPackages = if channel == "dev" + then llvmPackages_10 + else llvmPackages_9; + stdenv = llvmPackages.stdenv; + + callPackage = newScope chromium; + + chromium = { + inherit stdenv llvmPackages; + + upstream-info = (callPackage ./update.nix {}).getChannel channel; + + mkChromiumDerivation = callPackage ./common.nix ({ + inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useVaapi useOzone ungoogled; + gnChromium = gn; + } // lib.optionalAttrs (channel == "dev") { + # TODO: Remove after we can update gn for the stable channel (backward incompatible changes): + gnChromium = gn.overrideAttrs (oldAttrs: { + version = "2020-03-23"; + src = fetchgit { + url = "https://gn.googlesource.com/gn"; + rev = "5ed3c9cc67b090d5e311e4bd2aba072173e82db9"; + sha256 = "00y2d35wvqmx9glaqhfb62wdgbfpwr77v0934nnvh9ks71vnsjqy"; + }; + }); + }); + + browser = callPackage ./browser.nix { inherit channel enableWideVine; }; + + plugins = callPackage ./plugins.nix { + inherit enablePepperFlash; + }; + + ungoogled-chromium = callPackage ./ungoogled.nix {}; + }; + + mkrpath = p: "${lib.makeSearchPathOutput "lib" "lib64" p}:${lib.makeLibraryPath p}"; + widevineCdm = let upstream-info = chromium.upstream-info; in stdenv.mkDerivation { + name = "chrome-widevine-cdm"; + + # The .deb file for Google Chrome + src = upstream-info.binary; + + nativeBuildInputs = [ patchelfUnstable ]; + + phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ]; + + unpackCmd = let + widevineCdmPath = + if upstream-info.channel == "stable" then + "./opt/google/chrome/WidevineCdm" + else if upstream-info.channel == "beta" then + "./opt/google/chrome-beta/WidevineCdm" + else if upstream-info.channel == "dev" then + "./opt/google/chrome-unstable/WidevineCdm" + else + throw "Unknown chromium channel."; + in '' + # Extract just WidevineCdm from upstream's .deb file + ar p "$src" data.tar.xz | tar xJ "${widevineCdmPath}" + + # Move things around so that we don't have to reference a particular + # chrome-* directory later. + mv "${widevineCdmPath}" ./ + + # unpackCmd wants a single output directory; let it take WidevineCdm/ + rm -rf opt + ''; + + doCheck = true; + checkPhase = '' + ! find -iname '*.so' -exec ldd {} + | grep 'not found' + ''; + + PATCH_RPATH = mkrpath [ gcc.cc glib nspr nss ]; + + patchPhase = '' + patchelf --set-rpath "$PATCH_RPATH" _platform_specific/linux_x64/libwidevinecdm.so + ''; + + installPhase = '' + mkdir -p $out/WidevineCdm + cp -a * $out/WidevineCdm/ + ''; + + meta = { + platforms = [ "x86_64-linux" ]; + license = lib.licenses.unfree; + }; + }; + + suffix = if channel != "stable" then "-" + channel else ""; + + sandboxExecutableName = chromium.browser.passthru.sandboxExecutableName; + + version = chromium.browser.version; + + # We want users to be able to enableWideVine without rebuilding all of + # chromium, so we have a separate derivation here that copies chromium + # and adds the unfree WidevineCdm. + chromiumWV = let browser = chromium.browser; in if enableWideVine then + runCommand (browser.name + "-wv") { version = browser.version; } + '' + mkdir -p $out + cp -a ${browser}/* $out/ + chmod u+w $out/libexec/chromium + cp -a ${widevineCdm}/WidevineCdm $out/libexec/chromium/ + '' + else browser; +in stdenv.mkDerivation { + name = "chromium${suffix}-${version}"; + inherit version; + + buildInputs = [ + makeWrapper ed + + # needed for GSETTINGS_SCHEMAS_PATH + gsettings-desktop-schemas glib gtk3 + + # needed for XDG_ICON_DIRS + gnome3.adwaita-icon-theme + ]; + + outputs = ["out" "sandbox"]; + + buildCommand = let + browserBinary = "${chromiumWV}/libexec/chromium/chromium"; + getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")"; + libPath = stdenv.lib.makeLibraryPath ([] + ++ stdenv.lib.optional useVaapi libva + ); + + in with stdenv.lib; '' + mkdir -p "$out/bin" + + eval makeWrapper "${browserBinary}" "$out/bin/chromium" \ + --add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} \ + ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled} + + ed -v -s "$out/bin/chromium" << EOF + 2i + + if [ -x "/run/wrappers/bin/${sandboxExecutableName}" ] + then + export CHROME_DEVEL_SANDBOX="/run/wrappers/bin/${sandboxExecutableName}" + else + export CHROME_DEVEL_SANDBOX="$sandbox/bin/${sandboxExecutableName}" + fi + + '' + lib.optionalString (libPath != "") '' + # To avoid loading .so files from cwd, LD_LIBRARY_PATH here must not + # contain an empty section before or after a colon. + export LD_LIBRARY_PATH="\$LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}${libPath}" + '' + '' + + # libredirect causes chromium to deadlock on startup + export LD_PRELOAD="\$(echo -n "\$LD_PRELOAD" | tr ':' '\n' | grep -v /lib/libredirect\\\\.so$ | tr '\n' ':')" + + export XDG_DATA_DIRS=$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH\''${XDG_DATA_DIRS:+:}\$XDG_DATA_DIRS + + . + w + EOF + + ln -sv "${chromium.browser.sandbox}" "$sandbox" + + ln -s "$out/bin/chromium" "$out/bin/chromium-browser" + + mkdir -p "$out/share" + for f in '${chromium.browser}'/share/*; do # hello emacs */ + ln -s -t "$out/share/" "$f" + done + ''; + + inherit (chromium.browser) packageName; + meta = chromium.browser.meta; + passthru = { + inherit (chromium) upstream-info browser; + mkDerivation = chromium.mkChromiumDerivation; + inherit sandboxExecutableName; + }; +} diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/dont-use-ANGLE-by-default.patch b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/dont-use-ANGLE-by-default.patch new file mode 100644 index 00000000000..9f14a304eb3 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/dont-use-ANGLE-by-default.patch @@ -0,0 +1,26 @@ +A field trial currently enables the passthrough command decoder, which causes +gl_factory.cc to try kGLImplementationEGLANGLE first, which causes Chromium to fail +to load libGLESv2.so on NixOS. It somehow does not try kGLImplementationDesktopGL, +and so there is no GL support at all. + +Revert to using the validating command decoder, which prevents gl_factory.cc +from touching allowed_impls, allowing it to successfully use kGLImplementationDesktopGL. + +diff --git a/ui/gl/gl_utils.cc b/ui/gl/gl_utils.cc +index 697cbed5fe2d..8419bdb21a2f 100644 +--- a/ui/gl/gl_utils.cc ++++ b/ui/gl/gl_utils.cc +@@ -71,9 +71,10 @@ bool UsePassthroughCommandDecoder(const base::CommandLine* command_line) { + } else if (switch_value == kCmdDecoderValidatingName) { + return false; + } else { +- // Unrecognized or missing switch, use the default. +- return base::FeatureList::IsEnabled( +- features::kDefaultPassthroughCommandDecoder); ++ // Ignore the field trial that enables it; disable it until ++ // gl_factory.cc kGLImplementationEGLANGLE issues are sorted ++ // out on NixOS. ++ return false; + } + } + } diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/nix_plugin_paths_68.patch b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/nix_plugin_paths_68.patch new file mode 100644 index 00000000000..da6a4c92b46 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/nix_plugin_paths_68.patch @@ -0,0 +1,61 @@ +diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc +index f4e119d..d9775bd 100644 +--- a/chrome/common/chrome_paths.cc ++++ b/chrome/common/chrome_paths.cc +@@ -68,21 +68,14 @@ static base::LazyInstance + g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER; + + // Gets the path for internal plugins. +-bool GetInternalPluginsDirectory(base::FilePath* result) { +-#if defined(OS_MACOSX) +- // If called from Chrome, get internal plugins from a subdirectory of the +- // framework. +- if (base::mac::AmIBundled()) { +- *result = chrome::GetFrameworkBundlePath(); +- DCHECK(!result->empty()); +- *result = result->Append("Internet Plug-Ins"); +- return true; +- } +- // In tests, just look in the module directory (below). +-#endif +- +- // The rest of the world expects plugins in the module directory. +- return base::PathService::Get(base::DIR_MODULE, result); ++bool GetInternalPluginsDirectory(base::FilePath* result, ++ const std::string& ident) { ++ std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident; ++ const char* value = getenv(full_env.c_str()); ++ if (value == NULL) ++ return base::PathService::Get(base::DIR_MODULE, result); ++ else ++ *result = base::FilePath(value); + } + + // Gets the path for bundled implementations of components. Note that these +@@ -272,7 +265,7 @@ bool PathProvider(int key, base::FilePath* result) { + create_dir = true; + break; + case chrome::DIR_INTERNAL_PLUGINS: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "ALL")) + return false; + break; + case chrome::DIR_COMPONENTS: +@@ -280,7 +273,7 @@ bool PathProvider(int key, base::FilePath* result) { + return false; + break; + case chrome::DIR_PEPPER_FLASH_PLUGIN: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH")) + return false; + cur = cur.Append(kPepperFlashBaseDirectory); + break; +@@ -358,7 +351,7 @@ bool PathProvider(int key, base::FilePath* result) { + cur = cur.DirName(); + } + #else +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "PNACL")) + return false; + #endif + cur = cur.Append(FILE_PATH_LITERAL("pnacl")); diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/no-build-timestamps.patch b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/no-build-timestamps.patch new file mode 100644 index 00000000000..6b788f43d29 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/no-build-timestamps.patch @@ -0,0 +1,17 @@ +--- chromium-70.0.3538.67/build/compute_build_timestamp.py.orig 2018-11-02 16:00:34.368933077 +0200 ++++ chromium-70.0.3538.67/build/compute_build_timestamp.py 2018-11-08 04:06:21.658105129 +0200 +@@ -94,6 +94,14 @@ + 'build_type', help='The type of build', choices=('official', 'default')) + args = argument_parser.parse_args() + ++ # I don't trust LASTCHANGE magic, and I definelly want something deterministic here ++ SOURCE_DATE_EPOCH = os.getenv("SOURCE_DATE_EPOCH", None) ++ if SOURCE_DATE_EPOCH is not None: ++ print(SOURCE_DATE_EPOCH) ++ return 0 ++ else: ++ raise RuntimeError("SOURCE_DATE_EPOCH not set") ++ + # The mtime of the revision in build/util/LASTCHANGE is stored in a file + # next to it. Read it, to get a deterministic time close to "now". + # That date is then modified as described at the top of the file so that diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/remove-webp-include-69.patch b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/remove-webp-include-69.patch new file mode 100644 index 00000000000..07572cf7ee9 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/remove-webp-include-69.patch @@ -0,0 +1,11 @@ +--- a/third_party/blink/renderer/platform/image-encoders/image_encoder.cc ++++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.cc +@@ -13,7 +13,7 @@ + + #include "jpeglib.h" // for JPEG_MAX_DIMENSION + +-#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION ++#define WEBP_MAX_DIMENSION 16383 + + namespace blink { + diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/vaapi-fix.patch b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/vaapi-fix.patch new file mode 100644 index 00000000000..b5372d1a255 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/vaapi-fix.patch @@ -0,0 +1,74 @@ +--- a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc ++++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc +@@ -641,6 +641,7 @@ void VaapiVideoDecodeAccelerator::AssignPictureBuffers( + // |vpp_vaapi_wrapper_| for VaapiPicture to DownloadFromSurface() the VA's + // internal decoded frame. + if (buffer_allocation_mode_ != BufferAllocationMode::kNone && ++ buffer_allocation_mode_ != BufferAllocationMode::kWrapVdpau && + !vpp_vaapi_wrapper_) { + vpp_vaapi_wrapper_ = VaapiWrapper::Create( + VaapiWrapper::kVideoProcess, VAProfileNone, +@@ -665,7 +666,8 @@ void VaapiVideoDecodeAccelerator::AssignPictureBuffers( + PictureBuffer buffer = buffers[i]; + buffer.set_size(requested_pic_size_); + std::unique_ptr picture = vaapi_picture_factory_->Create( +- (buffer_allocation_mode_ == BufferAllocationMode::kNone) ++ ((buffer_allocation_mode_ == BufferAllocationMode::kNone) || ++ (buffer_allocation_mode_ == BufferAllocationMode::kWrapVdpau)) + ? vaapi_wrapper_ + : vpp_vaapi_wrapper_, + make_context_current_cb_, bind_image_cb_, buffer); +@@ -1093,6 +1095,12 @@ VaapiVideoDecodeAccelerator::GetSupportedProfiles() { + + VaapiVideoDecodeAccelerator::BufferAllocationMode + VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() { ++ // NVIDIA blobs use VDPAU ++ if (VaapiWrapper::GetImplementationType() == VAImplementation::kNVIDIAVDPAU) { ++ LOG(INFO) << "VA-API driver on VDPAU backend"; ++ return BufferAllocationMode::kWrapVdpau; ++ } ++ + // TODO(crbug.com/912295): Enable a better BufferAllocationMode for IMPORT + // |output_mode_| as well. + if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT) +@@ -1105,7 +1113,7 @@ VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() { + // depends on the bitstream and sometimes it's not enough to cover the amount + // of frames needed by the client pipeline (see b/133733739). + // TODO(crbug.com/911754): Enable for VP9 Profile 2. +- if (IsGeminiLakeOrLater() && ++ if (false && IsGeminiLakeOrLater() && + (profile_ == VP9PROFILE_PROFILE0 || profile_ == VP8PROFILE_ANY)) { + // Add one to the reference frames for the one being currently egressed, and + // an extra allocation for both |client_| and |decoder_|, see +--- a/media/gpu/vaapi/vaapi_video_decode_accelerator.h ++++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.h +@@ -204,6 +204,7 @@ class MEDIA_GPU_EXPORT VaapiVideoDecodeAccelerator + // Using |client_|s provided PictureBuffers and as many internally + // allocated. + kNormal, ++ kWrapVdpau, + }; + + // Decides the concrete buffer allocation mode, depending on the hardware +--- a/media/gpu/vaapi/vaapi_wrapper.cc ++++ b/media/gpu/vaapi/vaapi_wrapper.cc +@@ -131,6 +131,9 @@ media::VAImplementation VendorStringToImplementationType( + } else if (base::StartsWith(va_vendor_string, "Intel iHD driver", + base::CompareCase::SENSITIVE)) { + return media::VAImplementation::kIntelIHD; ++ } else if (base::StartsWith(va_vendor_string, "Splitted-Desktop Systems VDPAU", ++ base::CompareCase::SENSITIVE)) { ++ return media::VAImplementation::kNVIDIAVDPAU; + } + return media::VAImplementation::kOther; + } +--- a/media/gpu/vaapi/vaapi_wrapper.h ++++ b/media/gpu/vaapi/vaapi_wrapper.h +@@ -79,6 +79,7 @@ enum class VAImplementation { + kIntelIHD, + kOther, + kInvalid, ++ kNVIDIAVDPAU, + }; + + // This class handles VA-API calls and ensures proper locking of VA-API calls diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/widevine-79.patch b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/widevine-79.patch new file mode 100644 index 00000000000..32f0ae2fb5e --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/widevine-79.patch @@ -0,0 +1,13 @@ +diff --git a/third_party/widevine/cdm/BUILD.gn b/third_party/widevine/cdm/BUILD.gn +index ed0e2f5208b..5b431a030d5 100644 +--- a/third_party/widevine/cdm/BUILD.gn ++++ b/third_party/widevine/cdm/BUILD.gn +@@ -14,7 +14,7 @@ buildflag_header("buildflags") { + + flags = [ + "ENABLE_WIDEVINE=$enable_widevine", +- "BUNDLE_WIDEVINE_CDM=$bundle_widevine_cdm", ++ "BUNDLE_WIDEVINE_CDM=true", + "ENABLE_WIDEVINE_CDM_COMPONENT=$enable_widevine_cdm_component", + ] + } diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix new file mode 100644 index 00000000000..434bd77b6d1 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix @@ -0,0 +1,93 @@ +{ stdenv, gcc +, jshon +, glib +, nspr +, nss +, fetchzip +, patchelfUnstable +, enablePepperFlash ? false + +, upstream-info +}: + +with stdenv.lib; + +let + mkrpath = p: "${makeSearchPathOutput "lib" "lib64" p}:${makeLibraryPath p}"; + + # Generate a shell fragment that emits flags appended to the + # final makeWrapper call for wrapping the browser's main binary. + # + # Note that this is shell-escaped so that only the variable specified + # by the "output" attribute is substituted. + mkPluginInfo = { output ? "out", allowedVars ? [ output ] + , flags ? [], envVars ? {} + }: let + shSearch = ["'"] ++ map (var: "@${var}@") allowedVars; + shReplace = ["'\\''"] ++ map (var: "'\"\${${var}}\"'") allowedVars; + # We need to triple-escape "val": + # * First because makeWrapper doesn't do any quoting of its arguments by + # itself. + # * Second because it's passed to the makeWrapper call separated by IFS but + # not by the _real_ arguments, for example the Widevine plugin flags + # contain spaces, so they would end up as separate arguments. + # * Third in order to be correctly quoted for the "echo" call below. + shEsc = val: "'${replaceStrings ["'"] ["'\\''"] val}'"; + mkSh = val: "'${replaceStrings shSearch shReplace (shEsc val)}'"; + mkFlag = flag: ["--add-flags" (shEsc flag)]; + mkEnvVar = key: val: ["--set" (shEsc key) (shEsc val)]; + envList = mapAttrsToList mkEnvVar envVars; + quoted = map mkSh (flatten ((map mkFlag flags) ++ envList)); + in '' + mkdir -p "''$${output}/nix-support" + echo ${toString quoted} > "''$${output}/nix-support/wrapper-flags" + ''; + + flash = stdenv.mkDerivation rec { + pname = "flashplayer-ppapi"; + version = "32.0.0.344"; + + src = fetchzip { + url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; + sha256 = "05ijlgsby9zxx0qs6f3vav1z0p6xr1cg6idl4akxvfmsl6hn6hkq"; + stripRoot = false; + }; + + patchPhase = '' + chmod +x libpepflashplayer.so + patchelf --set-rpath "${mkrpath [ gcc.cc ]}" libpepflashplayer.so + ''; + + doCheck = true; + checkPhase = '' + ! find -iname '*.so' -exec ldd {} + | grep 'not found' + ''; + + installPhase = '' + flashVersion="$( + "${jshon}/bin/jshon" -F manifest.json -e version -u + )" + + install -vD libpepflashplayer.so "$out/lib/libpepflashplayer.so" + + ${mkPluginInfo { + allowedVars = [ "out" "flashVersion" ]; + flags = [ + "--ppapi-flash-path=@out@/lib/libpepflashplayer.so" + "--ppapi-flash-version=@flashVersion@" + ]; + }} + ''; + + dontStrip = true; + + meta = { + license = stdenv.lib.licenses.unfree; + maintainers = with stdenv.lib.maintainers; [ taku0 ]; + platforms = platforms.x86_64; + }; + }; + +in { + enabled = optional enablePepperFlash flash; +} diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix new file mode 100644 index 00000000000..9b5c76f5342 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix @@ -0,0 +1,6 @@ +{ + "81.0.4044.92" = { + rev = "81.0.4044.92-2"; + sha256 = "071a33idn2zcix6z8skn7y85mhb9w5s0bh0fvrjm269y7cmjrh3l"; + }; +} diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled.nix new file mode 100644 index 00000000000..17418c90af4 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled.nix @@ -0,0 +1,42 @@ +{ stdenv +, fetchFromGitHub +, python3Packages +, makeWrapper +, patch +}: +{ rev +, sha256 +}: + +stdenv.mkDerivation rec { + name = "ungoogled-chromium-${version}"; + + version = rev; + + src = fetchFromGitHub { + owner = "Eloston"; + repo = "ungoogled-chromium"; + inherit rev sha256; + }; + + dontBuild = true; + + buildInputs = [ + python3Packages.python + patch + ]; + + nativeBuildInputs = [ + makeWrapper + ]; + + patchPhase = '' + sed -i '/chromium-widevine/d' patches/series + ''; + + installPhase = '' + mkdir $out + cp -R * $out/ + wrapProgram $out/utils/patches.py --add-flags "apply" --prefix PATH : "${patch}/bin" + ''; +} diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/update.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/update.nix new file mode 100644 index 00000000000..6dff17c69dd --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/update.nix @@ -0,0 +1,271 @@ +let maybePkgs = import ../../../../../. {}; in + +{ stdenv ? maybePkgs.stdenv +, runCommand ? maybePkgs.runCommand +, fetchurl ? maybePkgs.fetchurl +, writeText ? maybePkgs.writeText +, curl ? maybePkgs.curl +, cacert ? maybePkgs.cacert +, nix ? maybePkgs.nix +}: + +let + inherit (stdenv) lib; + + sources = if builtins.pathExists ./upstream-info.nix + then import ./upstream-info.nix + else {}; + + bucketURL = "https://commondatastorage.googleapis.com/" + + "chromium-browser-official"; + + mkVerURL = version: "${bucketURL}/chromium-${version}.tar.xz"; + + debURL = "https://dl.google.com/linux/chrome/deb/pool/main/g"; + + getDebURL = channelName: version: arch: mirror: let + packageSuffix = if channelName == "dev" then "unstable" else channelName; + packageName = "google-chrome-${packageSuffix}"; + in "${mirror}/${packageName}/${packageName}_${version}-1_${arch}.deb"; + + # Untrusted mirrors, don't try to update from them! + debMirrors = [ + "http://95.31.35.30/chrome/pool/main/g" + "http://mirror.pcbeta.com/google/chrome/deb/pool/main/g" + "http://repo.fdzh.org/chrome/deb/pool/main/g" + ]; + +in { + getChannel = channel: let + chanAttrs = builtins.getAttr channel sources; + in { + inherit channel; + inherit (chanAttrs) version; + + main = fetchurl { + url = mkVerURL chanAttrs.version; + inherit (chanAttrs) sha256; + }; + + binary = fetchurl (let + mkUrls = arch: let + mkURLForMirror = getDebURL channel chanAttrs.version arch; + in map mkURLForMirror ([ debURL ] ++ debMirrors); + in if stdenv.is64bit && chanAttrs ? sha256bin64 then { + urls = mkUrls "amd64"; + sha256 = chanAttrs.sha256bin64; + } else if !stdenv.is64bit && chanAttrs ? sha256bin32 then { + urls = mkUrls "i386"; + sha256 = chanAttrs.sha256bin32; + } else throw "No Chrome plugins are available for your architecture."); + }; + + update = let + csv2nix = name: src: import (runCommand "${name}.nix" { + src = builtins.fetchurl src; + } '' + esc() { echo "\"$(echo "$1" | sed -e 's/"\\$/\\&/')\""; } # ohai emacs " + IFS=, read -r -a headings <<< "$(head -n1 "$src")" + echo "[" > "$out" + tail -n +2 "$src" | while IFS=, read -r -a line; do + echo " {" + for idx in "''${!headings[@]}"; do + echo " $(esc "''${headings[idx]}") = $(esc ''${line[$idx]});" + done + echo " }" + done >> "$out" + echo "]" >> "$out" + ''); + + channels = lib.fold lib.recursiveUpdate {} (map (attrs: { + ${attrs.os}.${attrs.channel} = attrs // { + history = let + drvName = "omahaproxy-${attrs.os}.${attrs.channel}-info"; + history = csv2nix drvName "http://omahaproxy.appspot.com/history"; + cond = h: attrs.os == h.os && attrs.channel == h.channel + && lib.versionOlder h.version attrs.current_version; + # Note that this is a *reverse* sort! + sorter = a: b: lib.versionOlder b.version a.version; + sorted = builtins.sort sorter (lib.filter cond history); + in map (lib.flip removeAttrs ["os" "channel"]) sorted; + version = attrs.current_version; + }; + }) (csv2nix "omahaproxy-info" "http://omahaproxy.appspot.com/all?csv=1")); + + /* + XXX: This is essentially the same as: + + builtins.tryEval (builtins.fetchurl url) + + ... except that tryEval on fetchurl isn't working and doesn't catch + errors for fetchurl, so we go for a different approach. + + We only have fixed-output derivations that can have networking access, so + we abuse SHA1 and its weaknesses to forge a fixed-output derivation which + is not so fixed, because it emits different contents that have the same + SHA1 hash. + + Using this method, we can distinguish whether the URL is available or + whether it's not based on the actual content. + + So let's use tryEval as soon as it's working with fetchurl in Nix. + */ + tryFetch = url: let + # SHA1 hash collisions from https://shattered.io/static/shattered.pdf: + collisions = runCommand "sha1-collisions" { + outputs = [ "out" "good" "bad" ]; + base64 = '' + QlpoOTFBWSZTWbL5V5MABl///////9Pv///v////+/////HDdK739/677r+W3/75rUNr4 + Aa/AAAAAAACgEVTRtQDQAaA0AAyGmjTQGmgAAANGgAaMIAYgGgAABo0AAAAAADQAIAGQ0 + MgDIGmjQA0DRk0AaMQ0DQAGIANGgAAGRoNGQMRpo0GIGgBoGQAAIAGQ0MgDIGmjQA0DRk + 0AaMQ0DQAGIANGgAAGRoNGQMRpo0GIGgBoGQAAIAGQ0MgDIGmjQA0DRk0AaMQ0DQAGIAN + GgAAGRoNGQMRpo0GIGgBoGQAAIAGQ0MgDIGmjQA0DRk0AaMQ0DQAGIANGgAAGRoNGQMRp + o0GIGgBoGQAABVTUExEZATTICnkxNR+p6E09JppoyamjGhkm0ammIyaekbUejU9JiGnqZ + qaaDxJ6m0JkZMQ2oaYmJ6gxqMyE2TUzJqfItligtJQJfYbl9Zy9QjQuB5mHQRdSSXCCTH + MgmSDYmdOoOmLTBJWiCpOhMQYpQlOYpJjn+wQUJSTCEpOMekaFaaNB6glCC0hKEJdHr6B + mUIHeph7YxS8WJYyGwgWnMTFJBDFSxSCCYljiEk7HZgJzJVDHJxMgY6tCEIIWgsKSlSZ0 + S8GckoIIF+551Ro4RCw260VCEpWJSlpWx/PMrLyVoyhWMAneDilBcUIeZ1j6NCkus0qUC + Wnahhk5KT4GpWMh3vm2nJWjTL9Qg+84iExBJhNKpbV9tvEN265t3fu/TKkt4rXFTsV+Nc + upJXhOhOhJMQQktrqt4K8mSh9M2DAO2X7uXGVL9YQxUtzQmS7uBndL7M6R7vX869VxqPu + renSuHYNq1yTXOfNWLwgvKlRlFYqLCs6OChDp0HuTzCWscmGudLyqUuwVGG75nmyZhKpJ + yOE/pOZyHyrZxGM51DYIN+Jc8yVJgAykxKCEtW55MlfudLg3KG6TtozalunXrroSxUpVL + StWrWLFihMnVpkyZOrQnUrE6xq1CGtJlbAb5ShMbV1CZgqlKC0wCFCpMmUKSEkvFLaZC8 + wHOCVAlvzaJQ/T+XLb5Dh5TNM67p6KZ4e4ZSGyVENx2O27LzrTIteAreTkMZpW95GS0CE + JYhMc4nToTJ0wQhKEyddaLb/rTqmgJSlkpnALxMhlNmuKEpkEkqhKUoEq3SoKUpIQcDgW + lC0rYahMmLuPQ0fHqZaF4v2W8IoJ2EhMhYmSw7qql27WJS+G4rUplToFi2rSv0NSrVvDU + pltQ8Lv6F8pXyxmFBSxiLSxglNC4uvXVKmAtusXy4YXGX1ixedEvXF1aX6t8adYnYCpC6 + rW1ZzdZYlCCxKEv8vpbqdSsXl8v1jCQv0KEPxPTa/5rtWSF1dSgg4z4KjfIMNtgwWoWLE + sRhKxsSA9ji7V5LRPwtumeQ8V57UtFSPIUmtQdOQfseI2Ly1DMtk4Jl8n927w34zrWG6P + i4jzC82js/46Rt2IZoadWxOtMInS2xYmcu8mOw9PLYxQ4bdfFw3ZPf/g2pzSwZDhGrZAl + 9lqky0W+yeanadC037xk496t0Dq3ctfmqmjgie8ln9k6Q0K1krb3dK9el4Xsu44LpGcen + r2eQZ1s1IhOhnE56WnXf0BLWn9Xz15fMkzi4kpVxiTKGEpffErEEMvEeMZhUl6yD1SdeJ + YbxzGNM3ak2TAaglLZlDCVnoM6wV5DRrycwF8Zh/fRsdmhkMfAO1duwknrsFwrzePWeMw + l107DWzymxdQwiSXx/lncnn75jL9mUzw2bUDqj20LTgtawxK2SlQg1CCZDQMgSpEqLjRM + sykM9zbSIUqil0zNk7Nu+b5J0DKZlhl9CtpGKgX5uyp0idoJ3we9bSrY7PupnUL5eWiDp + V5mmnNUhOnYi8xyClkLbNmAXyoWk7GaVrM2umkbpqHDzDymiKjetgzTocWNsJ2E0zPcfh + t46J4ipaXGCfF7fuO0a70c82bvqo3HceIcRlshgu73seO8BqlLIap2z5jTOY+T2ucCnBt + Atva3aHdchJg9AJ5YdKHz7LoA3VKmeqxAlFyEnQLBxB2PAhAZ8KvmuR6ELXws1Qr13Nd1 + i4nsp189jqvaNzt+0nEnIaniuP1+/UOZdyfoZh57ku8sYHKdvfW/jYSUks+0rK+qtte+p + y8jWL9cOJ0fV8rrH/t+85/p1z2N67p/ZsZ3JmdyliL7lrNxZUlx0MVIl6PxXOUuGOeArW + 3vuEvJ2beoh7SGyZKHKbR2bBWO1d49JDIcVM6lQtu9UO8ec8pOnXmkcponBPLNM2CwZ9k + NC/4ct6rQkPkQHMcV/8XckU4UJCy+VeTA== + ''; + } '' + echo "$base64" | base64 -d | tar xj + mv good.pdf "$good" + mv bad.pdf "$bad" + touch "$out" + ''; + + cacheVal = let + urlHash = builtins.hashString "sha256" url; + timeSlice = builtins.currentTime / 600; + in "${urlHash}-${toString timeSlice}"; + + in { + success = import (runCommand "check-success" { + result = stdenv.mkDerivation { + name = "tryfetch-${cacheVal}"; + inherit url; + + outputHash = "d00bbe65d80f6d53d5c15da7c6b4f0a655c5a86a"; + outputHashMode = "flat"; + outputHashAlgo = "sha1"; + + nativeBuildInputs = [ curl ]; + preferLocalBuild = true; + + inherit (collisions) good bad; + + buildCommand = '' + if SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt" \ + curl -s -L -f -I "$url" > /dev/null; then + cp "$good" "$out" + else + cp "$bad" "$out" + fi + ''; + + impureEnvVars = lib.fetchers.proxyImpureEnvVars; + }; + inherit (collisions) good; + } '' + if cmp -s "$result" "$good"; then + echo true > "$out" + else + echo false > "$out" + fi + ''); + value = builtins.fetchurl url; + }; + + fetchLatest = channel: let + result = tryFetch (mkVerURL channel.version); + in if result.success then result.value else fetchLatest (channel // { + version = if channel.history != [] + then (lib.head channel.history).version + else throw "Unfortunately there's no older version than " + + "${channel.version} available for channel " + + "${channel.channel} on ${channel.os}."; + history = lib.tail channel.history; + }); + + getHash = path: import (runCommand "gethash.nix" { + inherit path; + nativeBuildInputs = [ nix ]; + } '' + sha256="$(nix-hash --flat --base32 --type sha256 "$path")" + echo "\"$sha256\"" > "$out" + ''); + + isLatest = channel: version: let + ourVersion = sources.${channel}.version or null; + in if ourVersion == null then false + else lib.versionOlder version sources.${channel}.version + || version == sources.${channel}.version; + + # We only support GNU/Linux right now. + linuxChannels = let + genLatest = channelName: channel: let + newUpstream = { + inherit (channel) version; + sha256 = getHash (fetchLatest channel); + }; + keepOld = let + oldChannel = sources.${channelName}; + in { + inherit (oldChannel) version sha256; + } // lib.optionalAttrs (oldChannel ? sha256bin32) { + inherit (oldChannel) sha256bin32; + } // lib.optionalAttrs (oldChannel ? sha256bin64) { + inherit (oldChannel) sha256bin64; + }; + in if isLatest channelName channel.version then keepOld else newUpstream; + in lib.mapAttrs genLatest channels.linux; + + getLinuxFlash = channelName: channel: let + inherit (channel) version; + fetchArch = arch: tryFetch (getDebURL channelName version arch debURL); + packages = lib.genAttrs ["i386" "amd64"] fetchArch; + isNew = arch: attr: !(builtins.hasAttr attr channel) + && packages.${arch}.success; + in channel // lib.optionalAttrs (isNew "i386" "sha256bin32") { + sha256bin32 = getHash (packages.i386.value); + } // lib.optionalAttrs (isNew "amd64" "sha256bin64") { + sha256bin64 = getHash (packages.amd64.value); + }; + + newChannels = lib.mapAttrs getLinuxFlash linuxChannels; + + dumpAttrs = indent: attrs: let + mkVal = val: if lib.isAttrs val then dumpAttrs (indent + 1) val + else "\"${lib.escape ["$" "\\" "\""] (toString val)}\""; + mkIndent = level: lib.concatStrings (builtins.genList (_: " ") level); + mkAttr = key: val: "${mkIndent (indent + 1)}${key} = ${mkVal val};\n"; + attrLines = lib.mapAttrsToList mkAttr attrs; + in "{\n" + (lib.concatStrings attrLines) + (mkIndent indent) + "}"; + in writeText "chromium-new-upstream-info.nix" '' + # This file is autogenerated from update.sh in the same directory. + ${dumpAttrs 0 newChannels} + ''; +} diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/update.sh b/pkgs/applications/networking/browsers/ungoogled-chromium/update.sh new file mode 100755 index 00000000000..ea67a62c107 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/update.sh @@ -0,0 +1,4 @@ +#!/bin/sh -e +cd "$(dirname "$0")" +sp="$(nix-build --builders "" -Q --no-out-link update.nix -A update)" +cat "$sp" > upstream-info.nix diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.nix new file mode 100644 index 00000000000..c5f9d60122d --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.nix @@ -0,0 +1,18 @@ +# This file is autogenerated from update.sh in the same directory. +{ + beta = { + sha256 = "0i0szd749ihb08rxnsmsbxq75b6x952wpk94jwc0ncv6gb83zkx2"; + sha256bin64 = "1y70kmfz9nv507b0zdda7zfk2ac9qh9m2gq00aphdmzd0al7skj8"; + version = "81.0.4044.92"; + }; + dev = { + sha256 = "1rydvjmv62zj95sf0fgsyipqz2hphbxm60y8q0813wq9ym35d4yy"; + sha256bin64 = "1m6740lw7xjjp1lplwp9ii4d3l7dfa9jrv5bysm4ar5pb9kywrai"; + version = "83.0.4100.3"; + }; + stable = { + sha256 = "0i0szd749ihb08rxnsmsbxq75b6x952wpk94jwc0ncv6gb83zkx2"; + sha256bin64 = "1ig899cpahw1xfhdff5xj6w4k8jja5smxvrcbw6b0jcjmawdrf72"; + version = "81.0.4044.92"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7346c8ae1c..9b936fdb7a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22206,6 +22206,8 @@ in uefitoolPackages = recurseIntoAttrs (callPackage ../tools/system/uefitool/variants.nix {}); uefitool = uefitoolPackages.new-engine; + ungoogled-chromium = callPackage ../applications/networking/browsers/ungoogled-chromium (config.chromium or {}); + unigine-valley = callPackage ../applications/graphics/unigine-valley { }; unison = callPackage ../applications/networking/sync/unison { -- cgit v1.2.3 From d196b90e446b1b6268e2d8297d81814827b16d8a Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Mon, 13 Apr 2020 13:49:57 +0300 Subject: _3mux: init at 0.1.0 --- pkgs/tools/misc/3mux/default.nix | 22 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/tools/misc/3mux/default.nix diff --git a/pkgs/tools/misc/3mux/default.nix b/pkgs/tools/misc/3mux/default.nix new file mode 100644 index 00000000000..f2f0b3c6fcf --- /dev/null +++ b/pkgs/tools/misc/3mux/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "3mux"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "aaronjanse"; + repo = pname; + rev = "v${version}"; + sha256 = "1iz839w636vv7208wyrmb9r77wv9m0q1j8km06kmi87m0hcbh807"; + }; + + modSha256 = "10lnzh22qzls1b4i9dbknbxw5v92bcs7sarqipvvk5fymadr3k2p"; + + meta = with lib; { + description = "Terminal multiplexer inspired by i3"; + homepage = "https://github.com/aaronjanse/3mux"; + license = licenses.mit; + maintainers = with maintainers; [ aaronjanse filalex77 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e7d644b052..b0ee936b2dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -504,6 +504,8 @@ in _3llo = callPackage ../tools/misc/3llo { }; + _3mux = callPackage ../tools/misc/3mux { }; + _1password = callPackage ../applications/misc/1password { }; _6tunnel = callPackage ../tools/networking/6tunnel { }; -- cgit v1.2.3 From 841089817d6da5a512bc36bf9b09cae4ff0d0026 Mon Sep 17 00:00:00 2001 From: Christine Dodrill Date: Mon, 13 Apr 2020 18:37:09 -0400 Subject: development/compilers/zig: upgrade to 0.6.0 --- pkgs/development/compilers/zig/default.nix | 32 +++++++++++++++++++---- pkgs/development/compilers/zig/llvm10_polly.patch | 10 +++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 38 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/compilers/zig/llvm10_polly.patch diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix index d547535c54b..cfcb8be2d1a 100644 --- a/pkgs/development/compilers/zig/default.nix +++ b/pkgs/development/compilers/zig/default.nix @@ -1,25 +1,47 @@ { stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2, zlib }: -stdenv.mkDerivation rec { - version = "0.5.0"; +llvmPackages.stdenv.mkDerivation rec { + version = "0.6.0"; pname = "zig"; src = fetchFromGitHub { owner = "ziglang"; repo = pname; rev = version; - sha256 = "0xyl0riakh6kwb3yvxihb451kqs4ai4q0aygqygnlb2rlr1dn1zb"; + sha256 = "13dwm2zpscn4n0p5x8ggs9n7mwmq9cgip383i3qqphg7m3pkls8z"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ llvmPackages.clang-unwrapped llvmPackages.llvm libxml2 zlib ]; + buildInputs = [ + llvmPackages.clang-unwrapped + llvmPackages.llvm + llvmPackages.lld + libxml2 + zlib + ]; + + patches = [ ./llvm10_polly.patch ]; + + postPatch = '' + export llvm_extras=-Wl,${llvmPackages.llvm}/lib/LLVMPolly.so + substituteAllInPlace CMakeLists.txt + ''; preBuild = '' export HOME=$TMPDIR; ''; + checkPhase = '' + runHook preCheck + ./zig test $src/test/stage1/behavior.zig + runHook postCheck + ''; + + doCheck = true; + meta = with stdenv.lib; { - description = "Programming languaged designed for robustness, optimality, and clarity"; + description = + "Programming languaged designed for robustness, optimality, and clarity"; homepage = "https://ziglang.org/"; license = licenses.mit; platforms = platforms.unix; diff --git a/pkgs/development/compilers/zig/llvm10_polly.patch b/pkgs/development/compilers/zig/llvm10_polly.patch new file mode 100644 index 00000000000..72449c35d91 --- /dev/null +++ b/pkgs/development/compilers/zig/llvm10_polly.patch @@ -0,0 +1,10 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 97608cddf..e451c0711 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -369,4 +369,5 @@ target_link_libraries(zig_cpp LINK_PUBLIC + ${CLANG_LIBRARIES} + ${LLD_LIBRARIES} + ${LLVM_LIBRARIES} ++ @llvm_extras@ + ) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7346c8ae1c..e6ff46a2f1c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15012,7 +15012,7 @@ in zmqpp = callPackage ../development/libraries/zmqpp { }; zig = callPackage ../development/compilers/zig { - llvmPackages = llvmPackages_9; + llvmPackages = llvmPackages_10; }; zimlib = callPackage ../development/libraries/zimlib { }; -- cgit v1.2.3 From f94bd953685a4a4e9cbf87306dd171b3a5ed01bf Mon Sep 17 00:00:00 2001 From: Christine Dodrill Date: Mon, 13 Apr 2020 18:44:34 -0400 Subject: Update pkgs/development/compilers/zig/default.nix Co-Authored-By: Andrew Kelley --- pkgs/development/compilers/zig/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix index cfcb8be2d1a..d88314e2180 100644 --- a/pkgs/development/compilers/zig/default.nix +++ b/pkgs/development/compilers/zig/default.nix @@ -41,7 +41,7 @@ llvmPackages.stdenv.mkDerivation rec { meta = with stdenv.lib; { description = - "Programming languaged designed for robustness, optimality, and clarity"; + "General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software"; homepage = "https://ziglang.org/"; license = licenses.mit; platforms = platforms.unix; -- cgit v1.2.3 From 24b3158efca85b551cf86b48320d231466c4f594 Mon Sep 17 00:00:00 2001 From: Christine Dodrill Date: Mon, 13 Apr 2020 18:55:57 -0400 Subject: zig: apply suggestion from @cole-h --- pkgs/development/compilers/zig/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/zig/default.nix b/pkgs/development/compilers/zig/default.nix index d88314e2180..20ce0b5ff5e 100644 --- a/pkgs/development/compilers/zig/default.nix +++ b/pkgs/development/compilers/zig/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2, zlib }: +{ stdenv, fetchFromGitHub, cmake, llvmPackages, libxml2, zlib, substituteAll }: llvmPackages.stdenv.mkDerivation rec { version = "0.6.0"; @@ -20,12 +20,12 @@ llvmPackages.stdenv.mkDerivation rec { zlib ]; - patches = [ ./llvm10_polly.patch ]; - - postPatch = '' - export llvm_extras=-Wl,${llvmPackages.llvm}/lib/LLVMPolly.so - substituteAllInPlace CMakeLists.txt - ''; + patches = [ + (substituteAll { + src = ./llvm10_polly.patch; + llvm_extras = "-Wl,${llvmPackages.llvm}/lib/LLVMPolly.so"; + }) + ]; preBuild = '' export HOME=$TMPDIR; -- cgit v1.2.3 From 51fcafe7797c9140da3c66ed8f7e76661ea60303 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 13 Apr 2020 19:20:08 -0400 Subject: README.md: 20.03 release --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index edcd8dc0a00..da38b227b56 100644 --- a/README.md +++ b/README.md @@ -45,9 +45,9 @@ Nixpkgs and NixOS are built and tested by our continuous integration system, [Hydra](https://hydra.nixos.org/). * [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined) -* [Continuous package builds for the NixOS 19.09 release](https://hydra.nixos.org/jobset/nixos/release-19.09) +* [Continuous package builds for the NixOS 20.03 release](https://hydra.nixos.org/jobset/nixos/release-20.03) * [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents) -* [Tests for the NixOS 19.09 release](https://hydra.nixos.org/job/nixos/release-19.09/tested#tabs-constituents) +* [Tests for the NixOS 20.03 release](https://hydra.nixos.org/job/nixos/release-20.03/tested#tabs-constituents) Artifacts successfully built with Hydra are published to cache at https://cache.nixos.org/. When successful build and test criteria are -- cgit v1.2.3 From 17f2cf93dc3dfd49c7be85eee960994640b6f957 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 13 Apr 2020 19:19:38 -0400 Subject: fwupdate: Clean up -I flags --- pkgs/os-specific/linux/firmware/fwupdate/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/fwupdate/default.nix b/pkgs/os-specific/linux/firmware/fwupdate/default.nix index c14e04dc344..bcafa7f3376 100644 --- a/pkgs/os-specific/linux/firmware/fwupdate/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupdate/default.nix @@ -1,6 +1,13 @@ { efivar, fetchurl, gettext, gnu-efi, libsmbios, pkgconfig, popt, stdenv }: + let version = "12"; + + arch = + if stdenv.hostPlatform.isx86_32 + then "ia32" + else stdenv.hostPlatform.parsed.cpu.name; + in stdenv.mkDerivation { pname = "fwupdate"; inherit version; @@ -13,7 +20,11 @@ in stdenv.mkDerivation { ./do-not-create-sharedstatedir.patch ]; - NIX_CFLAGS_COMPILE = "-I${gnu-efi}/include/efi -Wno-error=address-of-packed-member"; + NIX_CFLAGS_COMPILE = builtins.toString [ + "-I${gnu-efi}/include/efi" + "-I${gnu-efi}/include/efi/${arch}" + "-Wno-error=address-of-packed-member" + ]; # TODO: Just apply the disable to the efi subdir hardeningDisable = [ "stackprotector" ]; @@ -41,12 +52,6 @@ in stdenv.mkDerivation { efivar ]; - # TODO: fix wrt cross-compilation - preConfigure = '' - arch=$(cc -dumpmachine | cut -f1 -d- | sed 's,i[3456789]86,ia32,' ) - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gnu-efi}/include/efi/$arch" - ''; - postInstall = '' rm -rf $out/src rm -rf $out/lib/debug -- cgit v1.2.3 From 204d7104053d5d97c0036e20a912814d63f71e6f Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 13 Apr 2020 19:19:05 -0400 Subject: treewide: Get rid of -dumpmachine in favor of static info --- pkgs/applications/networking/browsers/firefox/common.nix | 2 +- pkgs/applications/networking/mailreaders/thunderbird/default.nix | 2 +- pkgs/build-support/cc-wrapper/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 4dc2df91f8a..5dc791631d8 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -180,7 +180,7 @@ stdenv.mkDerivation ({ $(< ${stdenv.cc}/nix-support/cc-cflags) \ ${stdenv.cc.default_cxx_stdlib_compile} \ ${lib.optionalString stdenv.cc.isClang "-idirafter ${stdenv.cc.cc}/lib/clang/${lib.getVersion stdenv.cc.cc}/include"} \ - ${lib.optionalString stdenv.cc.isGNU "-isystem ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc} -isystem ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc}/$(cc -dumpmachine)"} \ + ${lib.optionalString stdenv.cc.isGNU "-isystem ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc} -isystem ${stdenv.cc.cc}/include/c++/${lib.getVersion stdenv.cc.cc}/${stdenv.hostPlatform.config}"} \ $NIX_CFLAGS_COMPILE" echo "ac_add_options BINDGEN_CFLAGS='$BINDGEN_CFLAGS'" >> $MOZCONFIG diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 797d7b17ec2..19c572af279 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -191,7 +191,7 @@ stdenv.mkDerivation rec { lib.getVersion stdenv.cc.cc } -isystem ${stdenv.cc.cc}/include/c++/${ lib.getVersion stdenv.cc.cc - }/$(cc -dumpmachine)" + }/${stdenv.hostPlatform.config}" } \ $NIX_CFLAGS_COMPILE" diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 96d48ecbc79..f6248335052 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -48,7 +48,7 @@ let coreutils_bin = if nativeTools then "" else getBin coreutils; 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)" + "-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/${targetPlatform.config}" else if targetPlatform.isDarwin && (libcxx != null) && (cc.isClang or false) && !(targetPlatform.useLLVM or false) then "-isystem ${libcxx}/include/c++/v1" else ""; -- cgit v1.2.3 From cf3b322a64367803a9d4adb385e5d2165bd1084a Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 12 Apr 2020 13:18:00 +0700 Subject: pasystray: add patch to fix crash when running under wayland --- pkgs/tools/audio/pasystray/default.nix | 5 ++++ pkgs/tools/audio/pasystray/fix-wayland.patch | 34 ++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/tools/audio/pasystray/fix-wayland.patch diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index 648dcad42ba..8b0580ba98c 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -14,6 +14,11 @@ stdenv.mkDerivation rec { sha256 = "0xx1bm9kimgq11a359ikabdndqg5q54pn1d1dyyjnrj0s41168fk"; }; + patches = [ + # https://github.com/christophgysin/pasystray/issues/90#issuecomment-306190701 + ./fix-wayland.patch + ]; + nativeBuildInputs = [ pkgconfig autoreconfHook wrapGAppsHook ]; buildInputs = [ gnome3.adwaita-icon-theme diff --git a/pkgs/tools/audio/pasystray/fix-wayland.patch b/pkgs/tools/audio/pasystray/fix-wayland.patch new file mode 100644 index 00000000000..17c4e2e6d65 --- /dev/null +++ b/pkgs/tools/audio/pasystray/fix-wayland.patch @@ -0,0 +1,34 @@ +--- a/src/x11-property.c ++++ b/src/x11-property.c +@@ -43,11 +43,15 @@ static Window window; + void x11_property_init() + { + display = gdk_x11_get_default_xdisplay(); ++ if (!GDK_IS_X11_DISPLAY(display)) return; ++ Screen* scr = ScreenOfDisplay(display, 0); ++ + window = RootWindow(display, 0); + } + + void x11_property_set(const char* key, const char* value) + { ++ if (!GDK_IS_X11_DISPLAY(display)) return; + g_debug("[x11-property] setting '%s' to '%s'", key, value); + + Atom atom = XInternAtom(display, key, False); +@@ -57,6 +61,7 @@ void x11_property_set(const char* key, c + + void x11_property_del(const char* key) + { ++ if (!GDK_IS_X11_DISPLAY(display)) return; + g_debug("[x11-property] deleting '%s'", key); + + Atom atom = XInternAtom(display, key, False); +@@ -65,6 +70,7 @@ void x11_property_del(const char* key) + + char* x11_property_get(const char* key) + { ++ if (!GDK_IS_X11_DISPLAY(display)) return NULL; + Atom property = XInternAtom(display, key, False); + Atom actual_type; + int actual_format; -- cgit v1.2.3 From c1daf6eab8bdceb6eaeae843acc5c31cb71cdc75 Mon Sep 17 00:00:00 2001 From: Thibaut Marty Date: Thu, 9 Apr 2020 23:18:58 +0200 Subject: herbstluftwm: 0.7.2 -> 0.8.0 Build now relies on cmake. Added outputs "doc" and "man". Setting CMAKE_INSTALL_SYSCONF_PREFIX is needed for bash completion directory, otherwise it tries to put files in /etc/bash_completion.d --- .../window-managers/herbstluftwm/default.nix | 42 ++++++++++++++-------- pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index 8c4f6e452f4..47f91c52540 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -1,27 +1,41 @@ -{ stdenv, fetchurl, pkgconfig, glib, libX11, libXext, libXinerama }: +{ stdenv, fetchurl, cmake, pkgconfig, glib, libX11, libXext, libXinerama, libXrandr, asciidoc }: stdenv.mkDerivation rec { - name = "herbstluftwm-0.7.2"; + pname = "herbstluftwm"; + version = "0.8.0"; src = fetchurl { - url = "https://herbstluftwm.org/tarballs/${name}.tar.gz"; - sha256 = "1kc18aj9j3nfz6fj4qxg9s3gg4jvn6kzi3ii24hfm0vqdpy17xnz"; + url = "https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"; + sha256 = "04n8cmrgb490kfn70x9kgxp286mrrn7nb4irhi7nvbm6lv0z28sq"; }; - patchPhase = '' - substituteInPlace config.mk \ - --replace "/usr/local" "$out" \ - --replace "/etc" "$out/etc" \ - --replace "/zsh/functions/Completion/X" "/zsh/site-functions" \ - --replace "/usr/share" "\$(PREFIX)/share" - ''; + outputs = [ + "out" + "doc" + "man" + ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glib libX11 libXext libXinerama ]; + cmakeFlags = [ + "-DCMAKE_INSTALL_SYSCONF_PREFIX=${placeholder "out"}/etc" + ]; + + nativeBuildInputs = [ + cmake + pkgconfig + asciidoc + ]; + + buildInputs = [ + glib + libX11 + libXext + libXinerama + libXrandr + ]; meta = { description = "A manual tiling window manager for X"; - homepage = "http://herbstluftwm.org/"; + homepage = "https://herbstluftwm.org/"; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f89c825d63..96ad8eb5bed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19786,7 +19786,9 @@ in heme = callPackage ../applications/editors/heme { }; - herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { }; + herbstluftwm = callPackage ../applications/window-managers/herbstluftwm { + asciidoc = asciidoc-full; + }; hercules = callPackage ../applications/virtualization/hercules { }; -- cgit v1.2.3 From 74274b4d7c99a15859c0f89651d8d5cf4783de14 Mon Sep 17 00:00:00 2001 From: Thibaut Marty Date: Fri, 10 Apr 2020 11:56:37 +0200 Subject: herbstluftwm: fix cross compilation Doc generation is disabled by default when cross compiling because asciidoc does not cross compile for now --- pkgs/applications/window-managers/herbstluftwm/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index 47f91c52540..0c23db00777 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -1,4 +1,10 @@ -{ stdenv, fetchurl, cmake, pkgconfig, glib, libX11, libXext, libXinerama, libXrandr, asciidoc }: +{ stdenv, fetchurl, cmake, pkgconfig, glib, libX11, libXext, libXinerama, libXrandr +, withDoc ? stdenv.buildPlatform == stdenv.targetPlatform, asciidoc ? null }: + +# Doc generation is disabled by default when cross compiling because asciidoc +# does not cross compile for now + +assert withDoc -> asciidoc != null; stdenv.mkDerivation rec { pname = "herbstluftwm"; @@ -11,19 +17,19 @@ stdenv.mkDerivation rec { outputs = [ "out" + ] ++ stdenv.lib.optionals withDoc [ "doc" "man" ]; cmakeFlags = [ "-DCMAKE_INSTALL_SYSCONF_PREFIX=${placeholder "out"}/etc" - ]; + ] ++ stdenv.lib.optional (!withDoc) "-DWITH_DOCUMENTATION=OFF"; nativeBuildInputs = [ cmake pkgconfig - asciidoc - ]; + ] ++ stdenv.lib.optional withDoc asciidoc; buildInputs = [ glib -- cgit v1.2.3 From 8fb54e7168d30c69406425aa4e30beb7f4495616 Mon Sep 17 00:00:00 2001 From: Thibaut Marty Date: Fri, 10 Apr 2020 12:54:45 +0200 Subject: herbstluftwm: add option to the X Window System manual chapter --- nixos/doc/manual/configuration/x-windows.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml index 06dd7c8bfb9..110712baf5f 100644 --- a/nixos/doc/manual/configuration/x-windows.xml +++ b/nixos/doc/manual/configuration/x-windows.xml @@ -31,6 +31,7 @@ = true; = true; = true; + = true; -- cgit v1.2.3 From 3b3e5bc7ea92fa2205db5dba79f41c9fee751e65 Mon Sep 17 00:00:00 2001 From: Constantine Glen Evans Date: Sat, 11 Apr 2020 21:50:36 -0700 Subject: libwacom: 1.1 -> 1.3 --- pkgs/development/libraries/libwacom/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index 0b350c15026..8a196e9d189 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, meson, ninja, glib, pkgconfig, udev, libgudev }: +{ stdenv, fetchFromGitHub, meson, ninja, glib, pkgconfig, udev, libgudev, doxygen }: stdenv.mkDerivation rec { pname = "libwacom"; - version = "1.1"; + version = "1.3"; outputs = [ "out" "dev" ]; @@ -10,12 +10,12 @@ stdenv.mkDerivation rec { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${version}"; - sha256 = "037vnyfg7nim6h3f4m04w6a9pr6hi04df14qpys580kf5xnf87nz"; + sha256 = "12g8jb67wj6sgg9ar2w8kkw1m1431rn9nd0j64qkrd3vy9g4l0hk"; }; - nativeBuildInputs = [ pkgconfig meson ninja ]; + nativeBuildInputs = [ pkgconfig meson ninja doxygen ]; - mesonFlags = [ "-Dtests=false" ]; + mesonFlags = [ "-Dtests=disabled" ]; buildInputs = [ glib udev libgudev ]; -- cgit v1.2.3 From 4dc2c5b1d279c4f11d5e0fe018d33f91b81872a4 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 14 Apr 2020 08:55:10 -0400 Subject: libwacom: add maintainers --- pkgs/development/libraries/libwacom/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libwacom/default.nix b/pkgs/development/libraries/libwacom/default.nix index 8a196e9d189..c33317550b5 100644 --- a/pkgs/development/libraries/libwacom/default.nix +++ b/pkgs/development/libraries/libwacom/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { platforms = platforms.linux; homepage = "https://linuxwacom.github.io/"; description = "Libraries, configuration, and diagnostic tools for Wacom tablets running under Linux"; + maintainers = teams.freedesktop.members; license = licenses.mit; }; } -- cgit v1.2.3 From a045b050dcc321bc21b0475b9dfc44cea1a1a350 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 14 Apr 2020 09:55:55 -0400 Subject: CONTRIBUTING.md: 20.03 --- .github/CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index a50a8a507de..ae4f68dddc1 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -53,9 +53,9 @@ For package version upgrades and such a one-line commit message is usually suffi To [backport a change into a release branch](https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches): 1. Take note of the commit in which the change was introduced into `master`. -2. Check out the target _release branch_, e.g. `release-19.09`. Do not use a _channel branch_ like `nixos-19.09` or `nixpkgs-19.09`. +2. Check out the target _release branch_, e.g. `release-20.03`. Do not use a _channel branch_ like `nixos-20.03` or `nixpkgs-20.03`. 3. Use `git cherry-pick -x `. -4. Open your backport PR. Make sure to select the release branch (e.g. `release-19.09`) as the target branch of the PR, and link to the PR in which the original change was made to `master`. +4. Open your backport PR. Make sure to select the release branch (e.g. `release-20.03`) as the target branch of the PR, and link to the PR in which the original change was made to `master`. ## Reviewing contributions -- cgit v1.2.3 From 9b83c440f67d1e77387a99577a845318756a23ff Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 13 Apr 2020 13:50:19 -0400 Subject: python3Packages.mayavi: build for Python 3 instead of Python 2 - switch from wxPython to Qt5 --- pkgs/development/python-modules/mayavi/default.nix | 32 ++++++++++++++-------- pkgs/top-level/python-packages.nix | 5 +++- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/mayavi/default.nix b/pkgs/development/python-modules/mayavi/default.nix index ffdf9747583..2fd53660907 100644 --- a/pkgs/development/python-modules/mayavi/default.nix +++ b/pkgs/development/python-modules/mayavi/default.nix @@ -1,37 +1,45 @@ -{ stdenv, fetchPypi, buildPythonPackage -, wxPython, pygments, numpy, vtk, traitsui, envisage, apptools -, nose, mock -, isPy3k +{ lib, buildPythonPackage, isPy27, fetchPypi, wrapQtAppsHook +, pyface, pygments, numpy, vtk, traitsui, envisage, apptools, pyqt5 }: buildPythonPackage rec { pname = "mayavi"; version = "4.7.1"; + disabled = isPy27; + src = fetchPypi { inherit pname version; extension = "tar.bz2"; sha256 = "095p7mds6kqqrp7xqv24iygr3mw85rm7x41wb5y4yc3gi1pznldy"; }; - # Discovery of 'vtk' in setuptools is not working properly, due to a missing - # .egg-info in the vtk package. It does however import and run just fine. postPatch = '' + # Discovery of 'vtk' in setuptools is not working properly, due to a missing + # .egg-info in the vtk package. It does however import and run just fine. substituteInPlace mayavi/__init__.py --replace "'vtk'" "" - ''; - propagatedBuildInputs = [ wxPython pygments numpy vtk traitsui envisage apptools ]; + # building the docs fails with the usual Qt xcb error, so skip: + substituteInPlace setup.py \ + --replace "build.build.run(self)" "build.build.run(self); return" + ''; - checkInputs = [ nose mock ]; + nativeBuildInputs = [ wrapQtAppsHook ]; - disabled = isPy3k; # TODO: This would need pyqt5 instead of wxPython + propagatedBuildInputs = [ + pyface pygments numpy vtk traitsui envisage apptools pyqt5 + ]; doCheck = false; # Needs X server - meta = with stdenv.lib; { + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + ''; + + meta = with lib; { description = "3D visualization of scientific data in Python"; homepage = "https://github.com/enthought/mayavi"; - maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; + maintainers = with maintainers; [ knedlsepp ]; license = licenses.bsdOriginal; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0f16f8c3afd..cb147217fab 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4370,7 +4370,10 @@ in { maya = callPackage ../development/python-modules/maya { }; - mayavi = callPackage ../development/python-modules/mayavi { }; + mayavi = pkgs.libsForQt5.callPackage ../development/python-modules/mayavi { + inherit buildPythonPackage isPy27 fetchPypi; + inherit (self) pyface pygments numpy vtk traitsui envisage apptools pyqt5; + }; mccabe = callPackage ../development/python-modules/mccabe { }; -- cgit v1.2.3 From f16ae2da3ee4463150adec4b072ac7ca352f17ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Mon, 13 Apr 2020 03:36:15 +0200 Subject: linux: Enable `CONFIG_NET_DROP_MONITOR` by default. Needed for subscribing to dropped packets (e.g. via `dropwatch`). --- pkgs/os-specific/linux/kernel/common-config.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 3f8628b276f..dffdd6571f3 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -178,6 +178,10 @@ let NF_TABLES_BRIDGE = mkMerge [ (whenBetween "4.19" "5.3" yes) (whenAtLeast "5.3" module) ]; + # needed for `dropwatch` + # Builtin-only since https://github.com/torvalds/linux/commit/f4b6bcc7002f0e3a3428bac33cf1945abff95450 + NET_DROP_MONITOR = yes; + # needed for ss INET_DIAG = yes; INET_TCP_DIAG = module; -- cgit v1.2.3 From 849f26d61cb4fcacb74de3c4d907688b85624f4f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 14 Apr 2020 11:50:45 -0400 Subject: python.pkgs.grpcio: use system openssl, zlib, and c-ares --- pkgs/development/python-modules/grpcio/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index cdb252f7434..ecb15cc024d 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, darwin, grpc , six, protobuf, enum34, futures, isPy27, pkgconfig -, cython}: +, cython, c-ares, openssl, zlib }: buildPythonPackage rec { inherit (grpc) src version; @@ -9,11 +9,16 @@ buildPythonPackage rec { nativeBuildInputs = [ cython pkgconfig ] ++ stdenv.lib.optional stdenv.isDarwin darwin.cctools; + buildInputs = [ c-ares openssl zlib ]; propagatedBuildInputs = [ six protobuf ] ++ stdenv.lib.optionals (isPy27) [ enum34 futures ]; preBuild = stdenv.lib.optionalString stdenv.isDarwin "unset AR"; + GRPC_PYTHON_BUILD_SYSTEM_OPENSSL = 1; + GRPC_PYTHON_BUILD_SYSTEM_ZLIB = 1; + GRPC_PYTHON_BUILD_SYSTEM_CARES = 1; + meta = with stdenv.lib; { description = "HTTP/2-based RPC framework"; license = licenses.asl20; -- cgit v1.2.3 From b70a3dc5151c2c1be25f77be20f66c086491367a Mon Sep 17 00:00:00 2001 From: Hugo Reeves Date: Wed, 15 Apr 2020 08:33:29 +1200 Subject: joplin-desktop: 1.0.179 -> 1.0.200 Builds successfully on NixOS --- pkgs/applications/misc/joplin-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 8c066ddf0b8..11dd176b7c1 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,7 +2,7 @@ let pname = "joplin-desktop"; - version = "1.0.179"; + version = "1.0.200"; desktopItem = makeDesktopItem { name = "Joplin"; exec = "joplin-desktop"; @@ -13,7 +13,7 @@ in appimageTools.wrapType2 rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.AppImage"; - sha256 = "0v7d5wzwiznl755pl6jfg33g6jxr1cbm9j13jpbmfi497hj8w82k"; + sha256 = "14gwv8i6dprvl96mifadq0zj77a82rww8xd5bmzm8ql6sidi2216"; }; -- cgit v1.2.3 From 4a129e6a3205e9fd7ea9a2cd7c65a90d2b4f0f71 Mon Sep 17 00:00:00 2001 From: Roman Kuznetsov Date: Tue, 14 Apr 2020 22:36:06 +0200 Subject: vscode: 1.44.0 -> 1.44.1 --- pkgs/applications/editors/vscode/vscode.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 0f36bf164f0..d9a942328a3 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0q1fk5a4ymndnyxzps8960y1rl657q95i2rydbqyjl37y79wmllx"; - x86_64-darwin = "02ybgp6v1ray4a867hihp2fvc872ilqla6z52qv90dfjx69g77ib"; + x86_64-linux = "15jg39hmlnicq0zrz77yar1bmn5y6gp2670dya2qm5klhva9hd0f"; + x86_64-darwin = "1ghqhn46jpbj3is8q5zcj0biyc7gwinhiz3qdpcnf88ga2blcsz8"; }.${system}; in callPackage ./generic.nix rec { @@ -21,7 +21,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.44.0"; + version = "1.44.1"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; -- cgit v1.2.3 From 9d7885276a5dfe15fd3e1fd9b59bb597781b4518 Mon Sep 17 00:00:00 2001 From: TQ Hirsch Date: Tue, 14 Apr 2020 22:52:58 +0200 Subject: aws-sdk-cpp: Fix library and include paths in generated cmake files AWS's SDK by default tries to prepend its install root to each of the library paths; this obviously fails with the absolute paths that Nix gives it. Worse, it computes the installation root by walking up the filesystem from its cmake file, so even if the AWSSDK_ROOT_DIR is explicitly set to the root directory, it gets replaced with the path to the derivation's dev output. This is all fixed with a patch to the cmake files that generate the installed configuration. Once this is fixed, it *still* doesn't work because the export generator built into cmake insists on adding `$out/include` to the header search path; when importing this configuration in another package, cmake will fail because `$out/include` doesn't exist (After all, it was relocated by a fixup hook). A small postFixupHook will recreate the directory and make cmake happy. --- .../libraries/aws-sdk-cpp/cmake-dirs.patch | 75 ++++++++++++++++++++++ pkgs/development/libraries/aws-sdk-cpp/default.nix | 7 ++ 2 files changed, 82 insertions(+) create mode 100644 pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch diff --git a/pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch b/pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch new file mode 100644 index 00000000000..6e4cad9e73c --- /dev/null +++ b/pkgs/development/libraries/aws-sdk-cpp/cmake-dirs.patch @@ -0,0 +1,75 @@ +diff --git a/cmake/AWSSDKConfig.cmake b/cmake/AWSSDKConfig.cmake +index e87252123e..5457bd5910 100644 +--- a/cmake/AWSSDKConfig.cmake ++++ b/cmake/AWSSDKConfig.cmake +@@ -82,6 +82,7 @@ if (AWSSDK_ROOT_DIR) + ) + else() + find_file(AWSSDK_CORE_HEADER_FILE Aws.h ++ "/${AWSSDK_INSTALL_INCLUDEDIR}/aws/core" + "/usr/${AWSSDK_INSTALL_INCLUDEDIR}/aws/core" + "/usr/local/${AWSSDK_INSTALL_INCLUDEDIR}/aws/core" + "C:/Progra~1/AWSSDK/${AWSSDK_INSTALL_INCLUDEDIR}/aws/core" +@@ -97,14 +98,18 @@ if (NOT AWSSDK_CORE_HEADER_FILE) + message(FATAL_ERROR "AWS SDK for C++ is missing, please install it first") + endif() + +-# based on core header file path, inspects the actual AWSSDK_ROOT_DIR +-get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_CORE_HEADER_FILE}" PATH) +-get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH) +-get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH) +-get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH) +- +-if (NOT AWSSDK_ROOT_DIR) +- message(FATAL_ERROR "AWSSDK_ROOT_DIR is not set or can't be calculated from the path of core header file") ++if (IS_ABSOLUTE ${AWSSDK_INSTALL_LIBDIR}) ++ set(AWSSDK_ROOT_DIR "") ++else() ++ # based on core header file path, inspects the actual AWSSDK_ROOT_DIR ++ get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_CORE_HEADER_FILE}" PATH) ++ get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH) ++ get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH) ++ get_filename_component(AWSSDK_ROOT_DIR "${AWSSDK_ROOT_DIR}" PATH) ++ ++ if (NOT AWSSDK_ROOT_DIR) ++ message(FATAL_ERROR "AWSSDK_ROOT_DIR is not set or can't be calculated from the path of core header file") ++ endif() + endif() + + +diff --git a/cmake/utilities.cmake b/cmake/utilities.cmake +index 283a14a138..646aea1da3 100644 +--- a/cmake/utilities.cmake ++++ b/cmake/utilities.cmake +@@ -43,7 +43,8 @@ macro(setup_install) + EXPORT "${PROJECT_NAME}-targets" + ARCHIVE DESTINATION ${ARCHIVE_DIRECTORY} + LIBRARY DESTINATION ${LIBRARY_DIRECTORY} +- RUNTIME DESTINATION ${BINARY_DIRECTORY} ) ++ RUNTIME DESTINATION ${BINARY_DIRECTORY} ++ INCLUDES DESTINATION ${INCLUDE_DIRECTORY} ) + + if (BUILD_SHARED_LIBS) + install( +@@ -57,7 +58,8 @@ macro(setup_install) + install (TARGETS ${PROJECT_NAME} + ARCHIVE DESTINATION ${ARCHIVE_DIRECTORY}/${SDK_INSTALL_BINARY_PREFIX}/${PLATFORM_INSTALL_QUALIFIER}/\${CMAKE_INSTALL_CONFIG_NAME} + LIBRARY DESTINATION ${LIBRARY_DIRECTORY}/${SDK_INSTALL_BINARY_PREFIX}/${PLATFORM_INSTALL_QUALIFIER}/\${CMAKE_INSTALL_CONFIG_NAME} +- RUNTIME DESTINATION ${BINARY_DIRECTORY}/${SDK_INSTALL_BINARY_PREFIX}/${PLATFORM_INSTALL_QUALIFIER}/\${CMAKE_INSTALL_CONFIG_NAME}) ++ RUNTIME DESTINATION ${BINARY_DIRECTORY}/${SDK_INSTALL_BINARY_PREFIX}/${PLATFORM_INSTALL_QUALIFIER}/\${CMAKE_INSTALL_CONFIG_NAME} ++ INCLUDES DESTINATION ${INCLUDE_DIRECTORY}/${SDK_INSTALL_BINARY_PREFIX}/${PLATFORM_INSTALL_QUALIFIER}/\${CMAKE_INSTALL_CONFIG_NAME}) + endif() + endif() + endmacro() +diff --git a/toolchains/pkg-config.pc.in b/toolchains/pkg-config.pc.in +index 9b519d2772..a61069225c 100644 +--- a/toolchains/pkg-config.pc.in ++++ b/toolchains/pkg-config.pc.in +@@ -1,5 +1,5 @@ +-includedir=@CMAKE_INSTALL_PREFIX@/@INCLUDE_DIRECTORY@ +-libdir=@CMAKE_INSTALL_PREFIX@/@LIBRARY_DIRECTORY@ ++includedir=@INCLUDE_DIRECTORY@ ++libdir=@LIBRARY_DIRECTORY@ + + Name: @PROJECT_NAME@ + Description: @PROJECT_DESCRIPTION@ diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix index f6878cd9396..94827743bf3 100644 --- a/pkgs/development/libraries/aws-sdk-cpp/default.nix +++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix @@ -50,6 +50,12 @@ stdenv.mkDerivation rec { rm aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp ''; + postFixupHooks = [ + # This bodge is necessary so that the file that the generated -config.cmake file + # points to an existing directory. + ''mkdir -p $out/include'' + ]; + __darwinAllowLocalNetworking = true; patches = [ @@ -57,6 +63,7 @@ stdenv.mkDerivation rec { url = "https://github.com/aws/aws-sdk-cpp/commit/42991ab549087c81cb630e5d3d2413e8a9cf8a97.patch"; sha256 = "0myq5cm3lvl5r56hg0sc0zyn1clbkd9ys0wr95ghw6bhwpvfv8gr"; }) + ./cmake-dirs.patch ]; meta = with lib; { -- cgit v1.2.3 From 777df0b4a548720e862b498d53bd1827b5743469 Mon Sep 17 00:00:00 2001 From: TQ Hirsch Date: Tue, 14 Apr 2020 22:53:32 +0200 Subject: boost: Fix library and include paths in generated cmake files Boost generates its installed cmake configuration using custom logic in its own build system; while this logic *knows* where it should be installed, the generated config overrides the correct information with new paths based on the location of the cmake configuration file in an attempt to let the package be relocated after installation. This patch simply undoes that. --- pkgs/development/libraries/boost/cmake-paths.patch | 21 +++++++++++++++++++++ pkgs/development/libraries/boost/generic.nix | 3 ++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/boost/cmake-paths.patch diff --git a/pkgs/development/libraries/boost/cmake-paths.patch b/pkgs/development/libraries/boost/cmake-paths.patch new file mode 100644 index 00000000000..b7f90148f9d --- /dev/null +++ b/pkgs/development/libraries/boost/cmake-paths.patch @@ -0,0 +1,21 @@ +diff --git a/tools/boost_install/boost-install.jam b/tools/boost_install/boost-install.jam +index ad19f7b55..ec6bf57ff 100644 +--- a/tools/boost_install/boost-install.jam ++++ b/tools/boost_install/boost-install.jam +@@ -587,6 +587,7 @@ rule generate-cmake-config- ( target : sources * : properties * ) + "# Compute the include and library directories relative to this file." + "" + "get_filename_component(_BOOST_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" ABSOLUTE)" ++ "get_filename_component(_BOOST_REAL_CMAKEDIR \"${CMAKE_CURRENT_LIST_DIR}/../\" ABSOLUTE)" + : true ; + + if [ path.is-rooted $(cmakedir) ] +@@ -607,6 +608,8 @@ rule generate-cmake-config- ( target : sources * : properties * ) + " unset(_BOOST_CMAKEDIR_ORIGINAL)" + "endif()" + "" ++ "# Assume that the installer actually did know where the libs were to be installed" ++ "get_filename_component(_BOOST_CMAKEDIR \"$(cmakedir-native)\" REALPATH)" + : true ; + } + diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index 7fe3c185c04..6d1c20f323d 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -112,7 +112,8 @@ stdenv.mkDerivation { ++ optional stdenv.isDarwin ( if version == "1.55.0" then ./darwin-1.55-no-system-python.patch - else ./darwin-no-system-python.patch); + else ./darwin-no-system-python.patch) + ++ optional (versionAtLeast version "1.70") ./cmake-paths.patch; meta = { homepage = "http://boost.org/"; -- cgit v1.2.3 From c60e559e130bc8b0b32471cf31f51237138c10c2 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Wed, 15 Apr 2020 00:30:15 +0200 Subject: trivial-builders: Sanitize derivation name This then supports using functions like writeShellScriptBin with script names that would be invalid as derivation names --- pkgs/build-support/trivial-builders.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix index c67f5845135..3c81a4ece65 100644 --- a/pkgs/build-support/trivial-builders.nix +++ b/pkgs/build-support/trivial-builders.nix @@ -4,7 +4,8 @@ let runCommand' = runLocal: stdenv: name: env: buildCommand: stdenv.mkDerivation ({ - inherit name buildCommand; + name = lib.strings.sanitizeDerivationName name; + inherit buildCommand; passAsFile = [ "buildCommand" ]; } // (lib.optionalAttrs runLocal { -- cgit v1.2.3 From fbd29dcbe7ec7dc0e77082fc1c649189c1f3b2e6 Mon Sep 17 00:00:00 2001 From: James Ottaway Date: Wed, 15 Apr 2020 14:09:12 +1000 Subject: git: 2.25.1 -> 2.26.1 This version addresses CVE-2020-5260. See https://lore.kernel.org/lkml/xmqqy2qy7xn8.fsf@gitster.c.googlers.com/ --- pkgs/applications/version-management/git-and-tools/git/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 6169c2d0296..ef6ebbe6813 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -21,7 +21,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.25.1"; + version = "2.26.1"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2"; + sha256 = "0s03ix9j1h0yychkh1l1cgpr1l9lwzn3rprl08rk8ii5ix02i0l8"; }; outputs = [ "out" ]; @@ -189,7 +189,7 @@ stdenv.mkDerivation { ln -s $out/libexec/git-core/git-http-backend $out/bin/git-http-backend '' + stdenv.lib.optionalString perlSupport '' # wrap perl commands - makeWrapper "$out/share/git/contrib/credential/netrc/git-credential-netrc" $out/bin/git-credential-netrc \ + makeWrapper "$out/share/git/contrib/credential/netrc/git-credential-netrc.perl" $out/bin/git-credential-netrc \ --set PERL5LIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}" wrapProgram $out/libexec/git-core/git-cvsimport \ --set GITPERLLIB "$out/${perlPackages.perl.libPrefix}:${perlPackages.makePerlPath perlLibs}" -- cgit v1.2.3 From 6d3eaa0527fc02c486889364afe148809834f40f Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Tue, 14 Apr 2020 22:31:57 -0700 Subject: containerd: fix --version output Before this change, 'containerd --version' with the nix package wouldn't print useful version information. In addition, the build output a bunch of (harmless) errors about 'git: command not found'. This fixes both of those problems. --- pkgs/applications/virtualization/containerd/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 7ce4390ba30..15e5c05c1dd 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -5,6 +5,8 @@ with lib; buildGoPackage rec { pname = "containerd"; version = "1.2.13"; + # git commit for the above version's tag + commit = "7ad184331fa3e55e52b890ea95e65ba581ae3429"; src = fetchFromGitHub { owner = "containerd"; @@ -20,7 +22,7 @@ buildGoPackage rec { buildInputs = [ btrfs-progs ]; - buildFlags = [ "VERSION=v${version}" ]; + buildFlags = [ "VERSION=v${version}" "REVISION=${commit}" ]; BUILDTAGS = [] ++ optional (btrfs-progs == null) "no_btrfs"; @@ -28,7 +30,7 @@ buildGoPackage rec { buildPhase = '' cd go/src/${goPackagePath} patchShebangs . - make binaries + make binaries $buildFlags ''; installPhase = '' -- cgit v1.2.3 From 29fad51864fd70bf8776826e4b999c9fa6523411 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Apr 2020 06:32:34 +0000 Subject: pidgin-carbons: 0.1.3 -> 0.2.2 --- .../networking/instant-messengers/pidgin-plugins/carbons/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix index 18511630c93..705b2caeb7d 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pidgin-carbons"; - version = "0.1.3"; + version = "0.2.2"; src = fetchFromGitHub { owner = "gkdr"; repo = "carbons"; rev = "v${version}"; - sha256 = "05hcqvsirb7gnpfcszsrgal5q7dajl2wdi2dy7c41zgl377syavw"; + sha256 = "1aq9bwgpmbwrigq6ywf0pjkngqcm0qxncygaj1fi57npjhcjs6ln"; }; makeFlags = [ "PURPLE_PLUGIN_DIR=$(out)/lib/pidgin" ]; -- cgit v1.2.3 From df495e3a9f93df2f71e0e8842cf565d94b170434 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Apr 2020 07:06:30 +0000 Subject: pwsafe: 1.09.0 -> 3.52.0 --- pkgs/applications/misc/pwsafe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix index 91845abc8b2..6abfdc3c21d 100644 --- a/pkgs/applications/misc/pwsafe/default.nix +++ b/pkgs/applications/misc/pwsafe/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "pwsafe"; - version = "1.09.0"; + version = "3.52.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "${version}"; - sha256 = "0dmazm95d53wq74qvsjvhl7r6fr4dv11nzf8sgdy47nyxv06xs1b"; + sha256 = "1ka7xsl63v0559fzf3pwc1iqr37gwr4vq5iaxa2hzar2g28hsxvh"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 34f242c13d6aa02e21caeeb74d2c6016c53ca863 Mon Sep 17 00:00:00 2001 From: jakobrs Date: Mon, 6 Apr 2020 15:49:54 +0200 Subject: nixos/installer: Add terminus_font to installation_iso_base --- nixos/doc/manual/installation/installing.xml | 5 +++++ nixos/modules/installer/cd-dvd/installation-cd-base.nix | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index 0dbfb39c32b..673df8f2e4c 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -41,6 +41,11 @@ neo!) + + If the text is too small to be legible, try setfont ter-132n + to increase the font size. + +
Networking in the installer diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index 24070a78694..cfd06a2b3b1 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -1,7 +1,7 @@ # This module contains the basic configuration for building a NixOS # installation CD. -{ config, lib, pkgs, ... }: +{ config, lib, options, pkgs, ... }: with lib; @@ -15,6 +15,9 @@ with lib; ../../profiles/installation-device.nix ]; + # Adds terminus_font for people with HiDPI displays + console.packages = options.console.packages.default ++ [ pkgs.terminus_font ]; + # ISO naming. isoImage.isoName = "${config.isoImage.isoBaseName}-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}.iso"; -- cgit v1.2.3 From 385289b9bd46347d4f8347d3297049c687d6d274 Mon Sep 17 00:00:00 2001 From: Marc 'risson' Schmitt Date: Wed, 15 Apr 2020 16:13:43 +0200 Subject: yubioath-desktop: 5.0.2 -> 5.0.3 --- pkgs/applications/misc/yubioath-desktop/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/yubioath-desktop/default.nix b/pkgs/applications/misc/yubioath-desktop/default.nix index eb39a702f93..2fffee0f0bb 100644 --- a/pkgs/applications/misc/yubioath-desktop/default.nix +++ b/pkgs/applications/misc/yubioath-desktop/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "yubioath-desktop"; - version = "5.0.2"; + version = "5.0.3"; src = fetchurl { url = "https://developers.yubico.com/yubioath-desktop/Releases/yubioath-desktop-${version}.tar.gz"; - sha256 = "19ingk0ab88a22s04apcw8kx9xygxlbk8kp4xnb8pmf8z3k6l2gf"; + sha256 = "1g0jd7mmch6a6n8k5pp3w27qd5cijnvzk05lwraf0i96m68h7x1k"; }; doCheck = false; @@ -38,13 +38,13 @@ mkDerivation rec { --prefix LD_LIBRARY_PATH : "${stdenv.lib.getLib pcsclite}/lib:${yubikey-personalization}/lib" mkdir -p $out/share/applications - cp resources/yubioath-desktop.desktop \ - $out/share/applications/yubioath-desktop.desktop + cp resources/com.yubico.yubioath.desktop \ + $out/share/applications/com.yubico.yubioath.desktop mkdir -p $out/share/yubioath/icons - cp resources/icons/*.{icns,ico,png,xpm} $out/share/yubioath/icons - substituteInPlace $out/share/applications/yubioath-desktop.desktop \ + cp resources/icons/*.{icns,ico,png,svg} $out/share/yubioath/icons + substituteInPlace $out/share/applications/com.yubico.yubioath.desktop \ --replace 'Exec=yubioath-desktop' "Exec=$out/bin/yubioath-desktop" \ - --replace 'Icon=yubioath' "Icon=$out/share/yubioath/icons/yubioath.png" + --replace 'Icon=yubioath' "Icon=$out/share/yubioath/icons/com.yubico.yubioath.png" ''; meta = with stdenv.lib; { -- cgit v1.2.3 From 9c51dba6d9020ad15e338868fd510f709b8a5aac Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Wed, 15 Apr 2020 21:08:20 +0300 Subject: drill: init at 0.5.0 --- pkgs/tools/networking/drill/default.nix | 30 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/networking/drill/default.nix diff --git a/pkgs/tools/networking/drill/default.nix b/pkgs/tools/networking/drill/default.nix new file mode 100644 index 00000000000..7636bd44d2d --- /dev/null +++ b/pkgs/tools/networking/drill/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +}: + +rustPlatform.buildRustPackage rec { + pname = "drill"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "fcsonline"; + repo = pname; + rev = version; + sha256 = "0aqd709fg0ha0lzri2p4pgraxvif7z8zcm8rx7sk6s2n605sc4gn"; + }; + + cargoSha256 = "1c8vmyf388kbbs56h8b62nxgxvgy9yj9cnmvax6ycnslkcwmvld0"; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; + + meta = with stdenv.lib; { + description = "HTTP load testing application inspired by Ansible syntax"; + homepage = "https://github.com/fcsonline/drill"; + license = licenses.gpl3; + maintainers = with maintainers; [ filalex77 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7346c8ae1c..0f03abdc45e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2958,6 +2958,8 @@ in driftnet = callPackage ../tools/networking/driftnet {}; + drill = callPackage ../tools/networking/drill { }; + drone = callPackage ../development/tools/continuous-integration/drone { }; drone-cli = callPackage ../development/tools/continuous-integration/drone-cli { }; -- cgit v1.2.3 From f3ccd5d6ba32890d69d2a533c21f4be92c4d05bf Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Wed, 15 Apr 2020 11:11:15 -0700 Subject: macvim: Fix compatibility with Xcode 11.4 Xcode 11.4 has an updated sys/_types/_fd_def.h header that references a new symbol from libSystem. This is a problem because we're using `/usr/bin/clang` to compile the non-Xcode portion, and this pulls in headers from Xcode's SDK. Somehow it's still linking to the Nix libraries (I can't figure out where configure finds these to put into `LDFLAGS` as we're not using the cc-wrapper). The end result is we get a linker error where this new symbol can't be found at link time, even though it's a weak import and isn't required at runtime. Ideally we'd provide a full 10.12 SDK to `/usr/bin/clang`, but we can't do that because even the DevSDK package we use for our 10.12 SDK doesn't contain everything (in particular it's missing nearly all dylibs) so we just get linker errors if we do that. Instead we'll just do a horrible hack and provide an `-isystem` path to a folder structure that contains only the 10.12 `sys/_types/_fd_def.h` header. This avoids the new symbol without causing all the errors that happen if we pull in the entire `${darwin.Libsystem}/include`. --- pkgs/applications/editors/vim/macvim.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 9eabadae3b0..238f93d3d36 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -22,6 +22,14 @@ let mkdir -p $out/bin ln -s /usr/bin/xcrun /usr/bin/xcodebuild /usr/bin/tiffutil /usr/bin/qlmanage $out/bin ''; + # I'm not really sure how configure finds Nix Libsystem, but we get link errors when using + # Xcode 11.4 if we're compiling against Xcode's SDK but using Nix Libsystem. We can't just pass + # Libsystem's includes though as that causes other issues, particularly with availability macros. + # This is a horrible hack but let's just pass the header that's causing problems. + fakeLibsystemInclude = runCommand "macvim-libsystem-include-shim" {} '' + mkdir -p $out/include/sys/_types + ln -s ${darwin.Libsystem}/include/sys/_types/_fd_def.h $out/include/sys/_types + ''; in stdenv.mkDerivation { @@ -92,6 +100,8 @@ stdenv.mkDerivation { DEV_DIR=$(/usr/bin/xcode-select -print-path)/Platforms/MacOSX.platform/Developer configureFlagsArray+=( "--with-developer-dir=$DEV_DIR" + # Also pass `-g -O` because configure would add those if we weren't setting CFLAGS. + "CFLAGS=-g -O -isystem ${fakeLibsystemInclude}/include" ) '' # For some reason having LD defined causes PSMTabBarControl to fail at link-time as it -- cgit v1.2.3 From e4311a77b467f8e8e93f869d497b774cb64f6a37 Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Tue, 14 Apr 2020 13:49:27 -0700 Subject: macvim: 8.2.319 -> 8.2.539 --- pkgs/applications/editors/vim/macvim.nix | 6 ++--- pkgs/applications/editors/vim/macvim.patch | 36 +++++++++++++++--------------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 238f93d3d36..2a13c0ea700 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -35,13 +35,13 @@ in stdenv.mkDerivation { pname = "macvim"; - version = "8.2.319"; + version = "8.2.539"; src = fetchFromGitHub { owner = "macvim-dev"; repo = "macvim"; - rev = "snapshot-162"; - sha256 = "1mg55jlrz533wlqrx028fyv86rfhdzvm5kdi8xlf67flc5hh9vrp"; + rev = "snapshot-163"; + sha256 = "0ibc6h7zmk81dygkxd8a2rcq72zbqmr9kh64xhsm9h0p70505cdk"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/macvim.patch b/pkgs/applications/editors/vim/macvim.patch index 9d5dbded26a..e44edd74047 100644 --- a/pkgs/applications/editors/vim/macvim.patch +++ b/pkgs/applications/editors/vim/macvim.patch @@ -1,8 +1,8 @@ diff --git a/src/MacVim/MacVim.xcodeproj/project.pbxproj b/src/MacVim/MacVim.xcodeproj/project.pbxproj -index e519018de..556a4127d 100644 +index 2bf5687..103b6e4 100644 --- a/src/MacVim/MacVim.xcodeproj/project.pbxproj +++ b/src/MacVim/MacVim.xcodeproj/project.pbxproj -@@ -1007,6 +1007,7 @@ +@@ -1087,6 +1081,7 @@ LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = ""; ONLY_ACTIVE_ARCH = YES; @@ -10,7 +10,7 @@ index e519018de..556a4127d 100644 PRODUCT_BUNDLE_IDENTIFIER = org.vim.MacVim; PRODUCT_NAME = MacVim; VERSIONING_SYSTEM = "apple-generic"; -@@ -1039,6 +1040,7 @@ +@@ -1119,6 +1114,7 @@ LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = ""; ONLY_ACTIVE_ARCH = YES; @@ -19,7 +19,7 @@ index e519018de..556a4127d 100644 PRODUCT_NAME = MacVim; VERSIONING_SYSTEM = "apple-generic"; diff --git a/src/MacVim/vimrc b/src/MacVim/vimrc -index 23a06bf37..dfb10fe94 100644 +index 23a06bf..dfb10fe 100644 --- a/src/MacVim/vimrc +++ b/src/MacVim/vimrc @@ -14,35 +14,5 @@ set backspace+=indent,eol,start @@ -61,10 +61,10 @@ index 23a06bf37..dfb10fe94 100644 +" Default cscopeprg to the Nix-installed path +set cscopeprg=@CSCOPE@ diff --git a/src/Makefile b/src/Makefile -index 32810d0a7..13a05f349 100644 +index 24c6934..d0f094e 100644 --- a/src/Makefile +++ b/src/Makefile -@@ -1385,7 +1385,7 @@ MACVIMGUI_SRC = gui.c gui_beval.c MacVim/gui_macvim.m MacVim/MMBackend.m \ +@@ -1407,7 +1407,7 @@ MACVIMGUI_SRC = gui.c gui_beval.c MacVim/gui_macvim.m MacVim/MMBackend.m \ MacVim/MacVim.m MACVIMGUI_OBJ = objects/gui.o objects/gui_beval.o \ objects/gui_macvim.o objects/MMBackend.o objects/MacVim.o @@ -74,10 +74,10 @@ index 32810d0a7..13a05f349 100644 MACVIMGUI_LIBS_DIR = MACVIMGUI_LIBS1 = -framework Cocoa -framework Carbon diff --git a/src/auto/configure b/src/auto/configure -index 9e6a82f4a..3c6d1a89b 100755 +index 730d6d5..0259112 100755 --- a/src/auto/configure +++ b/src/auto/configure -@@ -5829,10 +5829,7 @@ $as_echo "not found" >&6; } +@@ -5859,10 +5859,7 @@ $as_echo "not found" >&6; } for path in "${vi_cv_path_mzscheme_pfx}/lib" "${SCHEME_LIB}"; do if test "X$path" != "X"; then @@ -89,7 +89,7 @@ index 9e6a82f4a..3c6d1a89b 100755 MZSCHEME_LIBS="${path}/libmzscheme3m.a" MZSCHEME_CFLAGS="-DMZ_PRECISE_GC" elif test -f "${path}/libracket3m.a"; then -@@ -6217,23 +6214,6 @@ $as_echo ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } +@@ -6247,23 +6244,6 @@ $as_echo ">>> too old; need Perl version 5.003_01 or later <<<" >&6; } fi if test "x$MACOS_X" = "xyes"; then @@ -113,7 +113,7 @@ index 9e6a82f4a..3c6d1a89b 100755 PERL_LIBS=`echo "$PERL_LIBS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` PERL_CFLAGS=`echo "$PERL_CFLAGS" | sed -e 's/-arch\ ppc//' -e 's/-arch\ i386//' -e 's/-arch\ x86_64//'` fi -@@ -6456,13 +6436,7 @@ __: +@@ -6486,13 +6466,7 @@ __: eof eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" rm -f -- "${tmp_mkf}" @@ -128,7 +128,7 @@ index 9e6a82f4a..3c6d1a89b 100755 vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}" if test -n "${python_LINKFORSHARED}" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then python_link_symbol=`echo ${python_LINKFORSHARED} | sed 's/\([^ \t][^ \t]*[ \t][ \t]*[^ \t][^ \t]*\)[ \t].*/\1/'` -@@ -6477,7 +6451,6 @@ eof +@@ -6507,7 +6481,6 @@ eof fi vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}" vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//` @@ -136,7 +136,7 @@ index 9e6a82f4a..3c6d1a89b 100755 fi -@@ -6556,13 +6529,6 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -6586,13 +6559,6 @@ rm -f core conftest.err conftest.$ac_objext \ $as_echo "no" >&6; } fi @@ -150,7 +150,7 @@ index 9e6a82f4a..3c6d1a89b 100755 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compile and link flags for Python are sane" >&5 $as_echo_n "checking if compile and link flags for Python are sane... " >&6; } cflags_save=$CFLAGS -@@ -7456,11 +7422,7 @@ $as_echo "$tclver - OK" >&6; }; +@@ -7486,11 +7452,7 @@ $as_echo "$tclver - OK" >&6; }; { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of Tcl include" >&5 $as_echo_n "checking for location of Tcl include... " >&6; } @@ -162,7 +162,7 @@ index 9e6a82f4a..3c6d1a89b 100755 TCL_INC= for try in $tclinc; do if test -f "$try/tcl.h"; then -@@ -7478,12 +7440,8 @@ $as_echo "" >&6; } +@@ -7508,12 +7470,8 @@ $as_echo "" >&6; } if test -z "$SKIP_TCL"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for location of tclConfig.sh script" >&5 $as_echo_n "checking for location of tclConfig.sh script... " >&6; } @@ -175,7 +175,7 @@ index 9e6a82f4a..3c6d1a89b 100755 for try in $tclcnf; do if test -f "$try/tclConfig.sh"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: $try/tclConfig.sh" >&5 -@@ -7673,10 +7631,6 @@ $as_echo "$rubyhdrdir" >&6; } +@@ -7703,10 +7661,6 @@ $as_echo "$rubyhdrdir" >&6; } if test -f "$rubylibdir/$librubya"; then librubyarg="$librubyarg" RUBY_LIBS="$RUBY_LIBS -L$rubylibdir" @@ -187,10 +187,10 @@ index 9e6a82f4a..3c6d1a89b 100755 if test "X$librubyarg" != "X"; then diff --git a/src/vim.h b/src/vim.h -index f158aab..a714da9 100644 +index 87d1c92..8a7d5a5 100644 --- a/src/vim.h +++ b/src/vim.h -@@ -243,17 +243,6 @@ +@@ -250,17 +250,6 @@ # define SUN_SYSTEM #endif @@ -209,7 +209,7 @@ index f158aab..a714da9 100644 # include "os_amiga.h" #endif diff --git a/src/vimtutor b/src/vimtutor -index 1e8769b25..47078b0e7 100755 +index 1e8769b..47078b0 100755 --- a/src/vimtutor +++ b/src/vimtutor @@ -16,7 +16,7 @@ seq="vim vim81 vim80 vim8 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi" -- cgit v1.2.3 From 1fade973fcc00881b3ab0b6e2d4080c1d437a991 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 30 Mar 2020 07:37:07 +0200 Subject: libjcat: init at 0.1.1 --- nixos/tests/installed-tests/default.nix | 1 + nixos/tests/installed-tests/libjcat.nix | 5 ++ pkgs/development/libraries/libjcat/default.nix | 91 ++++++++++++++++++++++ .../libraries/libjcat/installed-tests-path.patch | 24 ++++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 123 insertions(+) create mode 100644 nixos/tests/installed-tests/libjcat.nix create mode 100644 pkgs/development/libraries/libjcat/default.nix create mode 100644 pkgs/development/libraries/libjcat/installed-tests-path.patch diff --git a/nixos/tests/installed-tests/default.nix b/nixos/tests/installed-tests/default.nix index a189ef63f22..b6bdfea2277 100644 --- a/nixos/tests/installed-tests/default.nix +++ b/nixos/tests/installed-tests/default.nix @@ -91,6 +91,7 @@ in ibus = callInstalledTest ./ibus.nix {}; libgdata = callInstalledTest ./libgdata.nix {}; glib-testing = callInstalledTest ./glib-testing.nix {}; + libjcat = callInstalledTest ./libjcat.nix {}; libxmlb = callInstalledTest ./libxmlb.nix {}; malcontent = callInstalledTest ./malcontent.nix {}; ostree = callInstalledTest ./ostree.nix {}; diff --git a/nixos/tests/installed-tests/libjcat.nix b/nixos/tests/installed-tests/libjcat.nix new file mode 100644 index 00000000000..41493a73089 --- /dev/null +++ b/nixos/tests/installed-tests/libjcat.nix @@ -0,0 +1,5 @@ +{ pkgs, makeInstalledTest, ... }: + +makeInstalledTest { + tested = pkgs.libjcat; +} diff --git a/pkgs/development/libraries/libjcat/default.nix b/pkgs/development/libraries/libjcat/default.nix new file mode 100644 index 00000000000..dc95f919932 --- /dev/null +++ b/pkgs/development/libraries/libjcat/default.nix @@ -0,0 +1,91 @@ +{ stdenv +, fetchFromGitHub +, fetchpatch +, docbook_xml_dtd_43 +, docbook-xsl-nons +, glib +, json-glib +, gnutls +, gpgme +, gobject-introspection +, vala +, help2man +, gtk-doc +, meson +, ninja +, pkg-config +, python3 +, nixosTests +}: + +stdenv.mkDerivation rec { + pname = "libjcat"; + version = "0.1.1"; + + outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ]; + + src = fetchFromGitHub { + owner = "hughsie"; + repo = "libjcat"; + rev = version; + sha256 = "hWJUzpQvy2V4pS8C/nW7Xrs9U9LQWMsGuTVOnm5UJc0="; + }; + + patches = [ + # Installed tests are installed to different output + ./installed-tests-path.patch + + # Fix version file generation + (fetchpatch { + url = "https://github.com/hughsie/libjcat/commit/cf2d9298a5fab7278ee040bc0b4be384a7b5538e.patch"; + sha256 = "3749qih+wfhU8ECklh5BvReJ7pS+Ao1Q7YueZ1tT0Is="; + }) + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + docbook_xml_dtd_43 + docbook-xsl-nons + gobject-introspection + vala + help2man + gtk-doc + (python3.withPackages (pkgs: with pkgs; [ + setuptools + ])) + ]; + + buildInputs = [ + glib + json-glib + gnutls + gpgme + ]; + + mesonFlags = [ + "-Dgtkdoc=true" + "-Dinstalled_test_prefix=${placeholder "installedTests"}" + ]; + + postPatch = '' + patchShebangs contrib/generate-version-script.py + ''; + + doCheck = true; + + passthru = { + tests = { + installed-tests = nixosTests.installed-tests.libjcat; + }; + }; + + meta = with stdenv.lib; { + description = "Library for reading and writing Jcat files"; + homepage = "https://github.com/hughsie/libjcat"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ jtojnar ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/libjcat/installed-tests-path.patch b/pkgs/development/libraries/libjcat/installed-tests-path.patch new file mode 100644 index 00000000000..d199f91385f --- /dev/null +++ b/pkgs/development/libraries/libjcat/installed-tests-path.patch @@ -0,0 +1,24 @@ +diff --git a/meson.build b/meson.build +index f69968d..d1d6c6e 100644 +--- a/meson.build ++++ b/meson.build +@@ -114,8 +114,8 @@ else + datadir = join_paths(prefix, get_option('datadir')) + localstatedir = join_paths(prefix, get_option('localstatedir')) + libexecdir = join_paths(prefix, get_option('libexecdir')) +- installed_test_bindir = join_paths(libexecdir, 'installed-tests', meson.project_name()) +- installed_test_datadir = join_paths(datadir, 'installed-tests', meson.project_name()) ++ installed_test_bindir = join_paths(get_option('installed_test_prefix'), 'libexec', 'installed-tests', meson.project_name()) ++ installed_test_datadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', meson.project_name()) + endif + mandir = join_paths(prefix, get_option('mandir')) + localedir = join_paths(prefix, get_option('localedir')) +diff --git a/meson_options.txt b/meson_options.txt +index 4784300..d382fc1 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,3 +1,4 @@ ++option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests') + option('gtkdoc', type : 'boolean', value : false, description : 'enable developer documentation') + option('introspection', type : 'boolean', value : true, description : 'generate GObject Introspection data') + option('tests', type : 'boolean', value : true, description : 'enable tests') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fec1b542cb4..b704d570be5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12981,6 +12981,8 @@ in libiptcdata = callPackage ../development/libraries/libiptcdata { }; + libjcat = callPackage ../development/libraries/libjcat { }; + libjpeg_original = callPackage ../development/libraries/libjpeg { }; libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { }; libjpeg_drop = callPackage ../development/libraries/libjpeg-drop { }; -- cgit v1.2.3 From d811d6a0dcca49d24c12befc70b2e86e848b9106 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 5 Apr 2020 14:20:42 -0300 Subject: [WIP] {help wanted} calibre: 4.12.0 -> 4.13.0 --- pkgs/applications/misc/calibre/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index afd602f6088..81fcc64de72 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -16,7 +16,7 @@ , hyphen , unrarSupport ? false , chmlib -, python2Packages +, python3Packages , libusb1 , libmtp , xdg_utils @@ -25,16 +25,15 @@ }: let - pypkgs = python2Packages; - + pypkgs = python3Packages; in mkDerivation rec { pname = "calibre"; - version = "4.12.0"; + version = "4.13.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - sha256 = "144vl5p0adcywcqaarrriq5zd8q5i934yfjg9himiq1vdp9vy4fi"; + sha256 = "1xp1fvpdizk6g74diam4nd59s6fhcvp086y1brm6r9wy9zm7sn7r"; }; patches = [ @@ -171,8 +170,7 @@ mkDerivation rec { description = "Comprehensive e-book software"; homepage = "https://calibre-ebook.com"; license = with licenses; if unrarSupport then unfreeRedistributable else gpl3; - maintainers = with maintainers; [ domenkozar pSub AndersonTorres ]; + maintainers = with maintainers; [ domenkozar pSub ]; platforms = platforms.linux; - inherit version; }; } -- cgit v1.2.3 From 6f6c08af30ceafe36580205e829321b763e04af3 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 16 Apr 2020 01:01:08 +0200 Subject: hydra-unstable: 2020-04-07 -> 2020-04-16 --- pkgs/development/tools/misc/hydra/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 9e14e16dbaa..12b70c8a5ae 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -19,20 +19,13 @@ # so when having an older version, `pkgs.hydra-migration` should be deployed first. hydra-unstable = callPackage ./common.nix { - version = "2020-04-07"; + version = "2020-04-16"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "4cabb37ebdeade1435ad8ebf1913cdd603b9c452"; - sha256 = "1ccy639x6yyrqqqqli7vlqm6pcvcq5dx1w3ckba77rl8pd5h31f7"; + rev = "87837f1d82904bf48e11b5641258b6be2f663c3b"; + sha256 = "1vs3lyfyafsl7wbpmycv7c3n9n2rkrswp65msb6q1iskgpvr96d5"; }; - patches = [ - # https://github.com/NixOS/hydra/pull/732 - (fetchpatch { - url = "https://github.com/NixOS/hydra/commit/2f9d422172235297759f2b224fe0636cad07b6fb.patch"; - sha256 = "0152nsqqc5d85qdygmwrsk88i9y6nk1b639fj2n042pjvr0kpz6k"; - }) - ]; nix = nixFlakes; }; } -- cgit v1.2.3 From ef80b6324b9c387256027159796f4f5adbfffe6a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 15 Apr 2020 22:14:20 +0200 Subject: hydra*: add `passthru.tests` to reference VM-tests --- pkgs/development/tools/misc/hydra/common.nix | 3 ++- pkgs/development/tools/misc/hydra/default.nix | 11 ++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/hydra/common.nix b/pkgs/development/tools/misc/hydra/common.nix index 52a91db6758..75a9689267a 100644 --- a/pkgs/development/tools/misc/hydra/common.nix +++ b/pkgs/development/tools/misc/hydra/common.nix @@ -5,6 +5,7 @@ , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar , rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null , migration ? false, patches ? [] +, tests ? {} }: with stdenv; @@ -124,7 +125,7 @@ in stdenv.mkDerivation rec { dontStrip = true; - passthru = { inherit perlDeps migration; }; + passthru = { inherit perlDeps migration tests; }; meta = with stdenv.lib; { description = "Nix-based continuous build system"; diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 12b70c8a5ae..f9a50dd0ea0 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, nixStable, callPackage, nixFlakes, fetchpatch }: +{ fetchFromGitHub, nixStable, callPackage, nixFlakes, fetchpatch, nixosTests }: { # Package for phase-1 of the db migration for Hydra. @@ -13,6 +13,11 @@ }; nix = nixStable; migration = true; + + tests = { + db-migration = nixosTests.hydra-db-migration.mig; + basic = nixosTests.hydra.hydra-migration; + }; }; # Hydra from latest master branch. Contains breaking changes, @@ -27,5 +32,9 @@ sha256 = "1vs3lyfyafsl7wbpmycv7c3n9n2rkrswp65msb6q1iskgpvr96d5"; }; nix = nixFlakes; + tests = { + db-migration = nixosTests.hydra-db-migration.mig; + basic = nixosTests.hydra.hydra-unstable; + }; }; } -- cgit v1.2.3 From 5e124e5abd53108b3f21f9f7a1ec56db002fee4f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 16 Apr 2020 02:03:53 +0200 Subject: nixos/tests: fix inclusion of hydra test --- nixos/tests/hydra/db-migration.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/nixos/tests/hydra/db-migration.nix b/nixos/tests/hydra/db-migration.nix index aa1c81c9e77..cf74acfd67a 100644 --- a/nixos/tests/hydra/db-migration.nix +++ b/nixos/tests/hydra/db-migration.nix @@ -1,8 +1,14 @@ -{ system ? builtins.currentSystem, ... }: +{ system ? builtins.currentSystem +, pkgs ? import ../../.. { inherit system; } +, ... +}: let inherit (import ./common.nix { inherit system; }) baseConfig; in -{ mig = import ../make-test-python.nix ({ pkgs, lib, ... }: { +with import ../../lib/testing-python.nix { inherit system pkgs; }; +with pkgs.lib; + +{ mig = makeTest { name = "hydra-db-migration"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ ma27 ]; @@ -82,5 +88,5 @@ let inherit (import ./common.nix { inherit system; }) baseConfig; in original.shutdown() ''; - }); + }; } -- cgit v1.2.3 From b74be134dbdb8baa63051e1d9e75723b8a289ac2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Thu, 16 Apr 2020 01:21:56 +0200 Subject: common-updater-scripts: add mark-broken script --- pkgs/common-updater/scripts.nix | 4 +- pkgs/common-updater/scripts/mark-broken | 86 +++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 2 deletions(-) create mode 100755 pkgs/common-updater/scripts/mark-broken diff --git a/pkgs/common-updater/scripts.nix b/pkgs/common-updater/scripts.nix index 655924e5f28..739f44387b3 100644 --- a/pkgs/common-updater/scripts.nix +++ b/pkgs/common-updater/scripts.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, coreutils, gnused, gnugrep, diffutils, nix, git }: +{ stdenv, makeWrapper, coreutils, gnused, gnugrep, diffutils, nix, git, jq }: stdenv.mkDerivation { name = "common-updater-scripts"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { cp ${./scripts}/* $out/bin for f in $out/bin/*; do - wrapProgram $f --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gnused gnugrep nix diffutils git ]} + wrapProgram $f --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gnused gnugrep nix diffutils git jq ]} done ''; } diff --git a/pkgs/common-updater/scripts/mark-broken b/pkgs/common-updater/scripts/mark-broken new file mode 100755 index 00000000000..d128d0d458b --- /dev/null +++ b/pkgs/common-updater/scripts/mark-broken @@ -0,0 +1,86 @@ +#!/usr/bin/env bash +set -e + +scriptName=mark-broken # do not use the .wrapped name + +die() { + echo "$scriptName: error: $1" >&2 + exit 1 +} + +usage() { + echo "Usage: $scriptName [--new-value=]" +} + +args=() + +for arg in "$@"; do + case $arg in + --new-value=*) + newValue="${arg#*=}" + ;; + --help) + usage + exit 0 + ;; + --*) + echo "$scriptName: Unknown argument: $arg" + usage + exit 1 + ;; + *) + args["${#args[*]}"]=$arg + ;; + esac +done + +attr=${args[0]} + +if (( "${#args[*]}" < 1 )); then + echo "$scriptName: Too few arguments" + usage + exit 1 +fi + +if (( "${#args[*]}" > 1 )); then + echo "$scriptName: Too many arguments" + usage + exit 1 +fi + +if [ -z $newValue ]; then + newValue="true" +fi + +nixFile=$(nix-instantiate --eval --json -E "with import ./. {}; (builtins.unsafeGetAttrPos \"description\" $attr.meta).file" | jq -r .) +if [[ ! -f "$nixFile" ]]; then + die "Couldn't evaluate 'builtins.unsafeGetAttrPos \"description\" $attr.meta' to locate the .nix file!" +fi + +# Insert broken attribute +sed -i.bak "$nixFile" -r \ + -e "/^\s*broken\s*=.*$/d" \ + -e "s/(\s*)meta\s*=.*\{/&\n\1 broken = $newValue;/" + +if cmp -s "$nixFile" "$nixFile.bak"; then + mv "$nixFile.bak" "$nixFile" + die "Failed to mark the package as broken! Does it have a meta attribute?" +fi + +if [[ "$newValue" == "true" ]]; then + # broken should evaluate to true in any case now + markedSuccessfully=$(nix-instantiate --eval -E "with import ./. {}; $attr.meta.broken" || true) + if [[ ! "$markedSuccessfully" == "true" ]]; then + mv "$nixFile.bak" "$nixFile" + die "Couldn't verify the broken attribute to be set correctly, restoring backup!" + fi +else + # we can not check if broken evaluates to the correct value, but we can check that it does evaluate + if ! nix-instantiate --eval -E "with import ./. {}; $attr.meta.broken" >/dev/null; then + mv "$nixFile.bak" "$nixFile" + die "Couldn't verify the broken attribute to be set correctly, restoring backup!" + fi +fi + +rm -f "$nixFile.bak" +rm -f "$attr.fetchlog" -- cgit v1.2.3 From 6187d5babc1e8c0b2df2bd16a1d8cf4cb9aed9c8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 7 Mar 2020 04:50:40 +0000 Subject: poppler: 0.85.0 -> 0.86.1 --- pkgs/development/libraries/poppler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 20e49296945..bd842e7ecfb 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "poppler-${suffix}-${version}"; - version = "0.85.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! + version = "0.86.1"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! src = fetchurl { url = "${meta.homepage}/poppler-${version}.tar.xz"; - sha256 = "0jyr036scdly13hx5dxmsqp2p3jifc29h2by51msw0ih6bmpbj1b"; + sha256 = "0v3z4mk1rr8i0c4cfkab7pnxdbil30j4cm4w6cqlq6cfghkhlqxg"; }; outputs = [ "out" "dev" ]; -- cgit v1.2.3 From af72bf0ae26190dacc21e7ceb3bc7cd985b170ba Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 14 Mar 2020 16:46:55 -0400 Subject: texlive.bin: fix for poppler 0.84 --- pkgs/tools/typesetting/tex/texlive/bin.nix | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index fc3c5b32480..5800cedf7f1 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -26,10 +26,7 @@ let sha256 = "1dfps39q6bdr1zsbp9p74mvalmy3bycihv19sb9c6kg30kprz8nj"; }; - patches = [ - ]; - - postPatch = let + prePatch = let # The source compatible with Poppler ${popplerVersion} not yet available in TeXLive ${year} # so we need to use files introduced in https://www.tug.org/svn/texlive?view=revision&revision=52959 popplerVersion = "0.83.0"; @@ -68,10 +65,18 @@ let done cp -pv ${pdftoepdf} texk/web2c/pdftexdir/pdftoepdf.cc cp -pv ${pdftosrc} texk/web2c/pdftexdir/pdftosrc.cc + ''; + patches = [ # poppler 0.84 compat fixups, use 0.83 files otherwise - patch -p1 -i ${./poppler84.patch} - ''; + ./poppler84.patch + + (fetchpatch { + name = "texlive-poppler-0.86.patch"; + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/texlive-poppler-0.86.patch?h=packages/texlive-bin&id=60244e41bb6f1501e8ed1fc9e6b7ba8d3f283398"; + sha256 = "0pdvhaqc3zgz7hp0x3a4qs0nh26fkvgmr6w1cjljqhp1nyiw2f1l"; + }) + ]; # remove when removing synctex-missing-header.patch preAutoreconf = "pushd texk/web2c"; @@ -108,7 +113,7 @@ core = stdenv.mkDerivation rec { pname = "texlive-bin"; inherit version; - inherit (common) src patches postPatch preAutoreconf postAutoreconf; + inherit (common) src patches prePatch preAutoreconf postAutoreconf; outputs = [ "out" "doc" ]; @@ -201,7 +206,7 @@ core-big = stdenv.mkDerivation { #TODO: upmendex pname = "texlive-core-big.bin"; inherit version; - inherit (common) src patches postPatch preAutoreconf postAutoreconf; + inherit (common) src patches prePatch preAutoreconf postAutoreconf; hardeningDisable = [ "format" ]; -- cgit v1.2.3 From 796f9696f1339acc164ae3d14689c83bce2c10cf Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 16 Apr 2020 04:18:09 +0200 Subject: =?UTF-8?q?poppler:=200.86.1=20=E2=86=92=200.87.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/poppler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index bd842e7ecfb..c3e9f4d3611 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "poppler-${suffix}-${version}"; - version = "0.86.1"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! + version = "0.87.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! src = fetchurl { url = "${meta.homepage}/poppler-${version}.tar.xz"; - sha256 = "0v3z4mk1rr8i0c4cfkab7pnxdbil30j4cm4w6cqlq6cfghkhlqxg"; + sha256 = "b2ArnCTC0FeAvpPnMGIBAS5BRZ8om4J5onp5QxrUFQ4="; }; outputs = [ "out" "dev" ]; -- cgit v1.2.3 From 9ce430fc38870bffba700799d29a3dabab2e1de3 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Thu, 16 Apr 2020 10:20:02 +0800 Subject: tinygo: 0.12.0 -> 0.13.0 --- pkgs/development/compilers/tinygo/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/tinygo/default.nix b/pkgs/development/compilers/tinygo/default.nix index 412dfa53feb..069ef69dc7e 100644 --- a/pkgs/development/compilers/tinygo/default.nix +++ b/pkgs/development/compilers/tinygo/default.nix @@ -3,16 +3,16 @@ buildGoModule rec { pname = "tinygo"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "tinygo-org"; repo = "tinygo"; rev = "v${version}"; - sha256 = "0dw3kxf55p617pb0bj3knsqcfvap5scxlvhh3a9g9ia92kann4v1"; + sha256 = "0x59j56y704m2hfkg78illgw9f6czrx265x887jfd989lnxphyqa"; }; - modSha256 = "1bjq4vaf38hi204lr9w3r3wcy1rzj06ygi5gzfa7dl3kx10hw6p0"; + modSha256 = "0y8n4mcr4jhas29ahvk8k4zbj1iz65fdpsgq61qa8kcsm8m5kqa6"; enableParallelBuilding = true; subPackages = [ "." ]; buildInputs = [ llvm clang-unwrapped makeWrapper ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0771c887105..157be7fdffb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9128,7 +9128,7 @@ in tinycc = callPackage ../development/compilers/tinycc { }; tinygo = callPackage ../development/compilers/tinygo { - inherit (llvmPackages_9) llvm clang-unwrapped lld; + inherit (llvmPackages_10) llvm clang-unwrapped lld; avrgcc = pkgsCross.avr.buildPackages.gcc; }; -- cgit v1.2.3 From 03bfda019602b633f1b640ed8ed2933bca4a1922 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 16 Apr 2020 04:54:58 +0200 Subject: poppler: add freedesktop team to maintainers --- pkgs/development/libraries/poppler/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index c3e9f4d3611..7f7a115f877 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -59,6 +59,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.all; - maintainers = with maintainers; [ ttuegel ]; + maintainers = with maintainers; [ ttuegel ] ++ teams.freedesktop.members; }; } -- cgit v1.2.3 From b57b6cdf02ab19564aebe6d28917bf455ed29c18 Mon Sep 17 00:00:00 2001 From: Sarah Brofeldt Date: Thu, 16 Apr 2020 07:54:53 +0200 Subject: kubernetes: 1.18.0 -> 1.18.1 --- pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 39cfd7f7145..3a91efd064c 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -15,13 +15,13 @@ with lib; stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.18.0"; + version = "1.18.1"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "1jp54aahwpx9w73byfyadgffrig9fy6x8xzw27xv0anj2v9bm1fw"; + sha256 = "1z109h0jqqfxvgyhmxsiggf6fb9kdrwvmv9wdi1n58n4yk65hvl6"; }; nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync go-bindata ]; -- cgit v1.2.3 From 896680cd15cb5549c1985eb96d428828f6eaf2f1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Apr 2020 17:10:43 +0000 Subject: chromaprint: 1.4.3 -> 1.5.0 --- pkgs/development/libraries/chromaprint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix index 475108de596..4702d67a01f 100644 --- a/pkgs/development/libraries/chromaprint/default.nix +++ b/pkgs/development/libraries/chromaprint/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "chromaprint"; - version = "1.4.3"; + version = "1.5.0"; src = fetchurl { url = "https://github.com/acoustid/chromaprint/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "10kz8lncal4s2rp2rqpgc6xyjp0jzcrihgkx7chf127vfs5n067a"; + sha256 = "0sknmyl5254rc55bvkhfwpl4dfvz45xglk1rq8zq5crmwq058fjp"; }; nativeBuildInputs = [ cmake ]; -- cgit v1.2.3 From c51b0afd54339049db05d7854a188c1754bd9de5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Wed, 15 Apr 2020 17:32:01 +0200 Subject: firefox-wrapper: remove dead npapi plugin code --- .../networking/browsers/firefox/wrapper.nix | 48 +++++++++------------- 1 file changed, 19 insertions(+), 29 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 8256487b751..73d2303bfc1 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,10 +2,8 @@ ## various stuff that can be plugged in , flashplayer, hal-flash -, MPlayerPlugin, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2, libglvnd -, jrePlugin, adoptopenjdk-icedtea-web -, bluejeans, djview4, adobe-reader -, google_talk_plugin, fribid, gnome3/*.gnome-shell*/ +, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2, libglvnd +, gnome3/*.gnome-shell*/ , browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow , tridactyl-native , fx_cast_bridge @@ -26,7 +24,6 @@ let (lib.toUpper (lib.substring 0 1 browserName) + lib.substring 1 (-1) browserName) , nameSuffix ? "" , icon ? browserName - , extraPlugins ? [] , extraNativeMessagingHosts ? [] , gdkWayland ? false , cfg ? config.${browserName} or {} @@ -38,32 +35,25 @@ let enableAdobeFlash = cfg.enableAdobeFlash or false; ffmpegSupport = browser.ffmpegSupport or false; gssSupport = browser.gssSupport or false; - jre = cfg.jre or false; - icedtea = cfg.icedtea or false; - supportsJDK = - stdenv.hostPlatform.system == "i686-linux" || - stdenv.hostPlatform.system == "x86_64-linux" || - stdenv.hostPlatform.system == "armv7l-linux" || - stdenv.hostPlatform.system == "aarch64-linux"; plugins = - assert !(jre && icedtea); - if builtins.hasAttr "enableVLC" cfg - then throw "The option \"${browserName}.enableVLC\" has been removed since Firefox no longer supports npapi plugins" - else - ([ ] - ++ lib.optional enableAdobeFlash flashplayer - ++ lib.optional (cfg.enableDjvu or false) (djview4) - ++ lib.optional (cfg.enableMPlayer or false) (MPlayerPlugin browser) - ++ lib.optional (supportsJDK && jre && jrePlugin ? mozillaPlugin) jrePlugin - ++ lib.optional icedtea adoptopenjdk-icedtea-web - ++ lib.optional (cfg.enableGoogleTalkPlugin or false) google_talk_plugin - ++ lib.optional (cfg.enableFriBIDPlugin or false) fribid - ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome-shell - ++ lib.optional (cfg.enableBluejeans or false) bluejeans - ++ lib.optional (cfg.enableAdobeReader or false) adobe-reader - ++ extraPlugins - ); + let + removed = lib.filter (a: builtins.hasAttr a cfg) [ + "enableVLC" + "enableDjvu" + "enableMPlayer" + "jre" + "icedtea" + "enableGoogleTalkPlugin" + "enableFriBIDPlugin" + "enableGnomeExtensions" + "enableBluejeans" + "enableAdobeReader" + ]; + in if removed != [] + then throw "Your configuration mentions ${lib.concatMapStringsSep ", " (p: browserName + "." + p) removed}. All plugin related options, except for the adobe flash player, have been removed, since Firefox from version 52 onwards no longer supports npapi plugins (see https://support.mozilla.org/en-US/kb/npapi-plugins)." + else lib.optional enableAdobeFlash flashplayer; + nativeMessagingHosts = ([ ] ++ lib.optional (cfg.enableBrowserpass or false) (lib.getBin browserpass) -- cgit v1.2.3 From ef2c3ab20e315aeb05a9811ae395f5a04be714c2 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 16 Apr 2020 10:48:23 +0200 Subject: chromium: 81.0.4044.92 -> 81.0.4044.113 https://chromereleases.googleblog.com/2020/04/stable-channel-update-for-desktop_15.html This update includes 1 security fix. CVEs: CVE-2020-6457 --- .../networking/browsers/chromium/upstream-info.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index c5f9d60122d..50e3abb5ec3 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "0i0szd749ihb08rxnsmsbxq75b6x952wpk94jwc0ncv6gb83zkx2"; - sha256bin64 = "1y70kmfz9nv507b0zdda7zfk2ac9qh9m2gq00aphdmzd0al7skj8"; - version = "81.0.4044.92"; + sha256 = "0hsxxw7fm1p8g53msqb644v8vr4cpvjmpln444c2268rm43yik17"; + sha256bin64 = "1iwn0yyhk0jn47pn7rx9kadli47xyvz3xilfl4faifmasin2fq8v"; + version = "81.0.4044.113"; }; dev = { - sha256 = "1rydvjmv62zj95sf0fgsyipqz2hphbxm60y8q0813wq9ym35d4yy"; - sha256bin64 = "1m6740lw7xjjp1lplwp9ii4d3l7dfa9jrv5bysm4ar5pb9kywrai"; - version = "83.0.4100.3"; + sha256 = "1s16wl101yabq0l7w0q50lxkr2gn090pcaj6l5sj6g5xvi9lhgbf"; + sha256bin64 = "1hn2hjni5k370jhc0nikmx5ypwzcqnmr02h185a5ry697643abdd"; + version = "83.0.4103.14"; }; stable = { - sha256 = "0i0szd749ihb08rxnsmsbxq75b6x952wpk94jwc0ncv6gb83zkx2"; - sha256bin64 = "1ig899cpahw1xfhdff5xj6w4k8jja5smxvrcbw6b0jcjmawdrf72"; - version = "81.0.4044.92"; + sha256 = "0hsxxw7fm1p8g53msqb644v8vr4cpvjmpln444c2268rm43yik17"; + sha256bin64 = "0ap7flrw3h885454fa2r7psa4sh8567ql7v7x96q11gh9gjrdvp3"; + version = "81.0.4044.113"; }; } -- cgit v1.2.3 From fc7efb2d494c1161f0e5070daac1d8c3c6dfc800 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 16 Apr 2020 04:20:00 -0500 Subject: lxc: 4.0.1 -> 4.0.2 --- pkgs/os-specific/linux/lxc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index d8aff40eefd..cc25f90f248 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -9,11 +9,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "lxc"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz"; - sha256 = "178kqjz0n5nnjw0z8ac5lbfpqprna9xfd9ckakp34zq9vz0smfvh"; + sha256 = "1c2wbbcvs58slyq0skxizx61q1lb4yvak28x4gzsbzh3yg6nscya"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 35eac7e51e1f2cff4ed30b478d09d5e136339c24 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 16 Apr 2020 04:20:00 -0500 Subject: postgresqlPackages.timescaledb: 1.6.1 -> 1.7.0 Changelog: https://github.com/timescale/timescaledb/releases/tag/1.7.0 --- pkgs/servers/sql/postgresql/ext/timescaledb.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 606eaeb65ac..cda9244e192 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "timescaledb"; - version = "1.6.1"; + version = "1.7.0"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "0k03aqpc1faqlpw46wazv0dy0xja57cv1sr1zwmizw3j3p3s0zdq"; + sha256 = "0n234ard9sldpbdqvbq2i48xyiyj8ljirsbspsax11f8yzy9ziac"; }; cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" ]; -- cgit v1.2.3 From a3b69ac6419ad2402138244856f50741a2c8444b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 16 Apr 2020 11:17:10 +0200 Subject: dconf: format with nixpkgs-fmt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also: * use pname + version instead of name * reorder attributes * change platforms linux + darwin → unix --- pkgs/development/libraries/dconf/default.nix | 63 ++++++++++++++++++++-------- 1 file changed, 46 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/dconf/default.nix b/pkgs/development/libraries/dconf/default.nix index d4e303b67af..7ba2146a7d1 100644 --- a/pkgs/development/libraries/dconf/default.nix +++ b/pkgs/development/libraries/dconf/default.nix @@ -1,28 +1,51 @@ -{ stdenv, fetchurl, meson, ninja, python3, vala, libxslt, pkgconfig, glib, bash-completion, dbus, gnome3 -, libxml2, gtk-doc, docbook_xsl, docbook_xml_dtd_42 }: +{ stdenv +, fetchurl +, meson +, ninja +, python3 +, vala +, libxslt +, pkg-config +, glib +, bash-completion +, dbus +, gnome3 +, libxml2 +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_42 +}: -let - pname = "dconf"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; + pname = "dconf"; version = "0.36.0"; + outputs = [ "out" "lib" "dev" "devdoc" ]; + 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 = "0bfs069pjv6lhp7xrzmrhz3876ay2ryqxzc6mlva1hhz34ibprlz"; }; - postPatch = '' - 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" ]; + nativeBuildInputs = [ + meson + ninja + vala + pkg-config + python3 + libxslt + libxml2 + glib + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_42 + ]; - nativeBuildInputs = [ meson ninja vala pkgconfig python3 libxslt libxml2 glib gtk-doc docbook_xsl docbook_xml_dtd_42 ]; - buildInputs = [ glib bash-completion dbus ]; + buildInputs = [ + glib + bash-completion + dbus + ]; mesonFlags = [ "--sysconfdir=/etc" @@ -31,6 +54,12 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isAarch32 && !stdenv.isAarch64 && !stdenv.isDarwin; + postPatch = '' + chmod +x meson_post_install.py tests/test-dconf.py + patchShebangs meson_post_install.py + patchShebangs tests/test-dconf.py + ''; + passthru = { updateScript = gnome3.updateScript { packageName = pname; @@ -40,7 +69,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Projects/dconf"; license = licenses.lgpl21Plus; - platforms = platforms.linux ++ platforms.darwin; + platforms = platforms.unix; maintainers = teams.gnome.members; }; } -- cgit v1.2.3 From cae8d97c232fc12698445b8432673f9e51e21e91 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 16 Apr 2020 11:29:27 +0200 Subject: dconf: fix build --- pkgs/development/libraries/dconf/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/libraries/dconf/default.nix b/pkgs/development/libraries/dconf/default.nix index 7ba2146a7d1..1612b098600 100644 --- a/pkgs/development/libraries/dconf/default.nix +++ b/pkgs/development/libraries/dconf/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchurl +, fetchpatch , meson , ninja , python3 @@ -27,6 +28,15 @@ stdenv.mkDerivation rec { sha256 = "0bfs069pjv6lhp7xrzmrhz3876ay2ryqxzc6mlva1hhz34ibprlz"; }; + patches = [ + # Fix bash-completion installation + # https://gitlab.gnome.org/GNOME/dconf/merge_requests/58 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/dconf/commit/b3c9423c6151f3c28e526083ea2f04987a780fdf.patch"; + sha256 = "zrIPKmgEpa1iIGUKv03+z+GNwJwgdf2hDATgP3i8qk0="; + }) + ]; + nativeBuildInputs = [ meson ninja -- cgit v1.2.3 From ffbf9af258f437327d02a51a0105a3d757a70683 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 14 Apr 2020 18:31:25 +0200 Subject: jitsi-meet-electron: 2.0.0 -> 2.0.2 --- .../networking/instant-messengers/jitsi-meet-electron/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix index 94dfe3cba52..7afe273599f 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "jitsi-meet-electron"; - version = "2.0.0"; + version = "2.0.2"; src = fetchurl { url = "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage"; - sha256 = "11ci9dqhy8hkb4fwykjvcvai20ahqhjil825n1y1xf663ch8by93"; + sha256 = "04y3qn2clvsfiyp9s6ib09mfxspv3kpr9248sda8s09n1cm0jpps"; name="${pname}-${version}.AppImage"; }; -- cgit v1.2.3 From 7d84c7cd36f31c8548144ee613515b087da9ad4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 15 Apr 2020 12:07:01 -0300 Subject: common-updater: change default development version check to false --- pkgs/common-updater/generic-updater.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/common-updater/generic-updater.nix b/pkgs/common-updater/generic-updater.nix index 8e8153d9a33..e54363a1dda 100644 --- a/pkgs/common-updater/generic-updater.nix +++ b/pkgs/common-updater/generic-updater.nix @@ -5,8 +5,8 @@ , attrPath ? pname , versionLister , rev-prefix ? "" -, odd-unstable ? true -, patchlevel-unstable ? true +, odd-unstable ? false +, patchlevel-unstable ? false }: let -- cgit v1.2.3 From cef0895d24ac8e2c44706342293e076bb0bad750 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 15 Apr 2020 12:58:47 -0300 Subject: xfce.xfce4-netload-plugin: odd minor version number is not unstable --- pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix index 09e686a9536..9a9f0214372 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix @@ -5,6 +5,7 @@ mkXfceDerivation { pname = "xfce4-netload-plugin"; version = "1.3.1"; rev-prefix = "version-"; + odd-unstable = false; sha256 = "0nm8advafw4jpc9p1qszyfqa56194sz51z216rdh4c6ilcrrpy1h"; buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ]; -- cgit v1.2.3 From 4cc7c2e55a231145201edc6473f7919e85473bf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 16 Apr 2020 12:55:43 +0100 Subject: tmpfiles: load user-defined entries first systemd-tmpfiles will load all files in lexicographic order and ignores rules for the same path in later files with a warning Since we apply the default rules provided by systemd, we should load user-defines rules first so users have a chance to override defaults. --- nixos/modules/system/boot/systemd.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 7f207e6c7ef..518d875841b 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -894,6 +894,13 @@ in "sysctl.d/50-coredump.conf".source = "${systemd}/example/sysctl.d/50-coredump.conf"; "sysctl.d/50-default.conf".source = "${systemd}/example/sysctl.d/50-default.conf"; + "tmpfiles.d/00-nixos.conf".text = '' + # This file is created automatically and should not be modified. + # Please change the option ‘systemd.tmpfiles.rules’ instead. + + ${concatStringsSep "\n" cfg.tmpfiles.rules} + ''; + "tmpfiles.d/home.conf".source = "${systemd}/example/tmpfiles.d/home.conf"; "tmpfiles.d/journal-nocow.conf".source = "${systemd}/example/tmpfiles.d/journal-nocow.conf"; "tmpfiles.d/portables.conf".source = "${systemd}/example/tmpfiles.d/portables.conf"; @@ -906,13 +913,6 @@ in "tmpfiles.d/var.conf".source = "${systemd}/example/tmpfiles.d/var.conf"; "tmpfiles.d/x11.conf".source = "${systemd}/example/tmpfiles.d/x11.conf"; - "tmpfiles.d/nixos.conf".text = '' - # This file is created automatically and should not be modified. - # Please change the option ‘systemd.tmpfiles.rules’ instead. - - ${concatStringsSep "\n" cfg.tmpfiles.rules} - ''; - "systemd/system-generators" = { source = hooks "generators" cfg.generators; }; "systemd/system-shutdown" = { source = hooks "shutdown" cfg.shutdown; }; }); -- cgit v1.2.3 From 4e0a6294a3046fcd160cff17f1ef35a98ac70646 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 14 Apr 2020 11:50:46 +0200 Subject: ocamlPackages.erm_xmpp: 0.3+20180112 -> 0.3+20200317 --- pkgs/development/ocaml-modules/erm_xmpp/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/erm_xmpp/default.nix b/pkgs/development/ocaml-modules/erm_xmpp/default.nix index e9381a3bce1..c3534d146f8 100644 --- a/pkgs/development/ocaml-modules/erm_xmpp/default.nix +++ b/pkgs/development/ocaml-modules/erm_xmpp/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchFromGitHub, ocaml, findlib, camlp4, ocamlbuild -, erm_xml, nocrypto +, erm_xml, mirage-crypto, mirage-crypto-rng, base64 }: stdenv.mkDerivation rec { - version = "0.3+20180112"; + version = "0.3+20200317"; name = "ocaml${ocaml.version}-erm_xmpp-${version}"; src = fetchFromGitHub { owner = "hannesm"; repo = "xmpp"; - rev = "184dc70fab7d46d09b9148ca4448f07f1e0a2df2"; - sha256 = "1dsqsfacvd9xqsqjzh6xwbnf2mv1dvhy210riyvjd260q085ch6n"; + rev = "7fa5bea252671fd88625c6af109998b879ca564f"; + sha256 = "0spzyd9kbyizzwl8y3mq8z19zlkzxnkh2fppry4lyc7vaw7bqrwq"; }; buildInputs = [ ocaml findlib ocamlbuild camlp4 ]; - propagatedBuildInputs = [ erm_xml nocrypto ]; + propagatedBuildInputs = [ erm_xml mirage-crypto mirage-crypto-rng base64 ]; configurePhase = "ocaml setup.ml -configure --prefix $out"; buildPhase = "ocaml setup.ml -build"; -- cgit v1.2.3 From d1009f4d99dbb6600f08ab0ef214806acc675670 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 16 Apr 2020 16:46:13 +0200 Subject: gst_all_1.gstreamer: fix build --- pkgs/development/libraries/gstreamer/core/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 67a0aa9f3f8..88bf77a638c 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -37,6 +37,13 @@ stdenv.mkDerivation rec { patches = [ ./fix_pkgconfig_includedir.patch + + # Fix build with bash-completion 2.10 + # https://gitlab.freedesktop.org/gstreamer/gstreamer/merge_requests/436 + (fetchpatch { + url = "https://gitlab.freedesktop.org/gstreamer/gstreamer/commit/dd2ec3681e2d38e13e01477efa36e851650690fb.patch"; + sha256 = "CMYQF2MTsC5A0btMpLVLemkwsMtEbzhDXVE3u49xHB4="; + }) ]; nativeBuildInputs = [ -- cgit v1.2.3 From 90cd0a633460710647ee78f4855ac09d559b5220 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Thu, 16 Apr 2020 18:20:40 +0300 Subject: packet-cli: init at 0.0.6 --- pkgs/development/tools/packet-cli/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/tools/packet-cli/default.nix diff --git a/pkgs/development/tools/packet-cli/default.nix b/pkgs/development/tools/packet-cli/default.nix new file mode 100644 index 00000000000..52bb0f15844 --- /dev/null +++ b/pkgs/development/tools/packet-cli/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "packet-cli"; + version = "0.0.6"; + + src = fetchFromGitHub { + owner = "packethost"; + repo = pname; + rev = version; + sha256 = "17f3ax7pjm5k93cxj7fd8hwr4id1lbzz9pkl2xflpxydi89bwdfz"; + }; + + modSha256 = "1hyv1vxk1rsr3jq3b08q0487sqf3y0km3mlwvqivib1y6hrknnnr"; + + meta = with stdenv.lib; { + description = "Official Packet CLI"; + homepage = "https://github.com/packethost/packet-cli"; + license = licenses.mit; + maintainers = with maintainers; [ filalex77 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31ca58f34ac..dd708f90c3e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21167,6 +21167,8 @@ in packet = callPackage ../development/tools/packet { }; + packet-cli = callPackage ../development/tools/packet-cli { }; + pb_cli = callPackage ../tools/misc/pb_cli {}; capture = callPackage ../tools/misc/capture {}; -- cgit v1.2.3 From a084a2c868006f669d38238953abd6ffe26ce303 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 16 Apr 2020 16:18:51 +0000 Subject: ephemeralpg: 2.9 -> 3.0 --- pkgs/development/tools/database/ephemeralpg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/ephemeralpg/default.nix b/pkgs/development/tools/database/ephemeralpg/default.nix index 87b23d10f49..53f3c1df628 100644 --- a/pkgs/development/tools/database/ephemeralpg/default.nix +++ b/pkgs/development/tools/database/ephemeralpg/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, postgresql, getopt, makeWrapper }: stdenv.mkDerivation rec { pname = "ephemeralpg"; - version = "2.9"; + version = "3.0"; src = fetchurl { url = "http://ephemeralpg.org/code/${pname}-${version}.tar.gz"; - sha256 = "1ghp3kya4lxvfwz3c022cx9vqf55jbf9sjw60bxjcb5sszklyc89"; + sha256 = "1j0g7g114ma7y7sadbng5p1ss1zsm9zpicm77qspym6565733vvh"; }; buildInputs = [ makeWrapper ]; installPhase = '' -- cgit v1.2.3 From b271255ede83b767a4773c10730607662e698d32 Mon Sep 17 00:00:00 2001 From: Asumu Takikawa Date: Wed, 15 Apr 2020 15:34:58 -0700 Subject: racket: use --enable-useprefix configure flag. This is to fix a regression in upstream Racket packaging, the upstream bug tracking this is here: https://github.com/racket/racket/issues/3046 When the bug is fixed this workaround will be unnecessary. --- pkgs/development/interpreters/racket/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 27447319a36..725b1d5106d 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -82,7 +82,10 @@ stdenv.mkDerivation rec { ''; shared = if stdenv.isDarwin then "dylib" else "shared"; - configureFlags = [ "--enable-${shared}" "--enable-lt=${libtool}/bin/libtool" ] + configureFlags = [ "--enable-${shared}" "--enable-lt=${libtool}/bin/libtool" + # The following flag is a temporary workaround for an upstream bug: + # https://github.com/racket/racket/issues/3046 + "--enable-useprefix" ] ++ stdenv.lib.optional disableDocs [ "--disable-docs" ] ++ stdenv.lib.optional stdenv.isDarwin [ "--enable-xonx" ]; -- cgit v1.2.3 From ff4419ac4a82a5472c3f0bf700111c39f2109f0d Mon Sep 17 00:00:00 2001 From: Jason Felice Date: Thu, 16 Apr 2020 13:08:50 -0400 Subject: plan9port: Do not attempt to build on aarch64-linux --- pkgs/tools/system/plan9port/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index 1541e988c1e..e5e1d41ab56 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -89,7 +89,7 @@ stdenv.mkDerivation { license = licenses.lpl-102; maintainers = with maintainers; [ AndersonTorres bbarker ftrvxmtrx kovirobi ]; - platforms = platforms.unix; + platforms = remove "aarch64-linux" platforms.unix; }; } # TODO: investigate the mouse chording support patch -- cgit v1.2.3 From fa5ee6e5015891e13d0d44fe1ca86ba2b7d96cd4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 16 Apr 2020 17:21:49 +0000 Subject: gifski: 0.10.2 -> 0.10.4 --- pkgs/tools/graphics/gifski/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix index 3d1e2114196..8c808657f4c 100644 --- a/pkgs/tools/graphics/gifski/default.nix +++ b/pkgs/tools/graphics/gifski/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "gifski"; - version = "0.10.2"; + version = "0.10.4"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "gifski"; rev = version; - sha256 = "0gsk1pagg89q1mi3d28q6dsnanncwphw9lrb7qybppw0vyvqlqbx"; + sha256 = "1ly465y435cha22rmnq632hgq2s7y0akrcna6m30f6l078br8mhn"; }; - cargoSha256 = "0k7pzcll7hn2a354vviyj8dr0kq63cwsldgv303kwklmxji02d0v"; + cargoSha256 = "0khfkh1ylqv4v5dsb4hsha5fh3b62hcvkp3swplv64h626p3q54s"; nativeBuildInputs = [ pkgconfig ]; -- cgit v1.2.3 From f7500ace8d78c3a1a5d83c0b267b782a976873fb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 16 Apr 2020 16:35:31 +0000 Subject: dkimpy: 1.0.2 -> 1.0.4 --- pkgs/development/python-modules/dkimpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/pkgs/development/python-modules/dkimpy/default.nix index de64f249cde..5d045e5108a 100644 --- a/pkgs/development/python-modules/dkimpy/default.nix +++ b/pkgs/development/python-modules/dkimpy/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "dkimpy"; - version = "1.0.2"; + version = "1.0.4"; src = fetchPypi { inherit pname version; - sha256 = "19rz48pzz1i5cc896khaqx2hkhcj5hwsklnyynrdgdr5818qjyff"; + sha256 = "14idcs0wiyc0iyi5bz3xqimxf3x6dizcjfn92s2ka5zxp95xdyvd"; }; checkInputs = [ pytest ]; -- cgit v1.2.3 From 824d041cf5fa08dca6dad854473e6515d50f3422 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 13 Apr 2020 16:43:34 +0200 Subject: ocamlPackages.ppx_cstruct: propagate dependencies Without propagation some builds of packages requiring ppx_cstruct would fail. --- pkgs/development/ocaml-modules/cstruct/ppx.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/cstruct/ppx.nix b/pkgs/development/ocaml-modules/cstruct/ppx.nix index b5c39533e73..22fe4ac47cf 100644 --- a/pkgs/development/ocaml-modules/cstruct/ppx.nix +++ b/pkgs/development/ocaml-modules/cstruct/ppx.nix @@ -10,6 +10,5 @@ buildDunePackage { minimumOCamlVersion = "4.03"; - buildInputs = [ sexplib ppx_tools_versioned ]; - propagatedBuildInputs = [ cstruct ]; + propagatedBuildInputs = [ cstruct ppx_tools_versioned sexplib ]; } -- cgit v1.2.3 From 4bf689b3e082aca5e17d6bc71a7c3b9430bc41e7 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 13 Apr 2020 16:44:58 +0200 Subject: ocamlPackages.x509: 0.7.1 -> 0.11.0 This update contains the switch from nocrypto to mirage-crypto --- pkgs/development/ocaml-modules/x509/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix index 22006d0693a..d30b23aa3ee 100644 --- a/pkgs/development/ocaml-modules/x509/default.nix +++ b/pkgs/development/ocaml-modules/x509/default.nix @@ -1,21 +1,26 @@ -{ lib, fetchurl, buildDunePackage, ocaml +{ lib, fetchurl, buildDunePackage , alcotest, cstruct-unix -, asn1-combinators, domain-name, fmt, gmap, nocrypto, rresult +, asn1-combinators, domain-name, fmt, gmap, rresult, mirage-crypto, mirage-crypto-pk +, logs, base64 }: buildDunePackage rec { + minimumOCamlVersion = "4.07"; + pname = "x509"; - version = "0.7.1"; + version = "0.11.0"; src = fetchurl { url = "https://github.com/mirleft/ocaml-x509/releases/download/v${version}/x509-v${version}.tbz"; - sha256 = "0hnklgdm1fwwqi0nfvpdbp7ddqvrh9h8697mr99bxqdfhg6sxh1w"; + sha256 = "0gcs3vpmixxxx2q4b2iphb1xw1jffya1wkp0p1xbmsfcghzrj20m"; }; - buildInputs = lib.optionals doCheck [ alcotest cstruct-unix ]; - propagatedBuildInputs = [ asn1-combinators domain-name fmt gmap nocrypto rresult ]; + useDune2 = true; + + buildInputs = [ alcotest cstruct-unix ]; + propagatedBuildInputs = [ asn1-combinators domain-name fmt gmap mirage-crypto mirage-crypto-pk rresult logs base64 ]; - doCheck = lib.versionAtLeast ocaml.version "4.06"; + doCheck = true; meta = with lib; { homepage = "https://github.com/mirleft/ocaml-x509"; -- cgit v1.2.3 From 99ac3ce2bf071a21ed883e13c9fe7dd9c324e9e8 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 13 Apr 2020 16:45:56 +0200 Subject: ocamlPackages.tls: 0.10.4 -> 0.11.1 This update contains a switch to the dune build system as well as a switch from nocrypto to mirage-crypto. --- pkgs/development/ocaml-modules/tls/default.nix | 44 ++++++++++---------------- pkgs/top-level/ocaml-packages.nix | 4 +-- 2 files changed, 17 insertions(+), 31 deletions(-) diff --git a/pkgs/development/ocaml-modules/tls/default.nix b/pkgs/development/ocaml-modules/tls/default.nix index 9343ae5b1ec..e425e2a3b7e 100644 --- a/pkgs/development/ocaml-modules/tls/default.nix +++ b/pkgs/development/ocaml-modules/tls/default.nix @@ -1,38 +1,26 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, ocamlbuild, topkg -, ppx_sexp_conv, result, x509, nocrypto, cstruct-sexp, ppx_cstruct, cstruct-unix, ounit -, lwt ? null}: +{ stdenv, fetchurl, buildDunePackage, ppx_sexp_conv, ppx_cstruct, cstruct +, cstruct-sexp, sexplib, mirage-crypto, mirage-crypto-pk, mirage-crypto-rng +, x509, domain-name, fmt, cstruct-unix, ounit2, ocaml_lwt, ptime }: -with stdenv.lib; +buildDunePackage rec { + minimumOCamlVersion = "4.07"; -let withLwt = lwt != null; in + version = "0.11.1"; + pname = "tls"; -if !versionAtLeast ocaml.version "4.04" -then throw "tls is not available for OCaml ${ocaml.version}" -else - -stdenv.mkDerivation rec { - version = "0.10.4"; - name = "ocaml${ocaml.version}-tls-${version}"; - - src = fetchFromGitHub { - owner = "mirleft"; - repo = "ocaml-tls"; - rev = version; - sha256 = "02wv4lia583imn3sfci4nqv6ac5nzig5j3yfdnlqa0q8bp9rfc6g"; + src = fetchurl { + url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-v${version}.tbz"; + sha256 = "0ms13fbaxgmpbviazlfa4hb7nmi7s22nklc7ns926b0rr1aq1069"; }; - nativeBuildInputs = [ ocaml ocamlbuild findlib ]; - buildInputs = [ findlib topkg ppx_sexp_conv ppx_cstruct ] - ++ optionals doCheck [ ounit cstruct-unix ]; - propagatedBuildInputs = [ cstruct-sexp nocrypto result x509 ] ++ - optional withLwt lwt; - - buildPhase = "${topkg.run} build --tests ${boolToString doCheck} --with-mirage false --with-lwt ${boolToString withLwt}"; + useDune2 = true; - doCheck = versionAtLeast ocaml.version "4.06"; - checkPhase = "${topkg.run} test"; + doCheck = true; + buildInputs = [ cstruct-unix ounit2 ]; - inherit (topkg) installPhase; + propagatedBuildInputs = [ ppx_sexp_conv ppx_cstruct cstruct cstruct-sexp + sexplib mirage-crypto mirage-crypto-pk mirage-crypto-rng + x509 domain-name fmt ocaml_lwt ptime ]; meta = with stdenv.lib; { homepage = "https://github.com/mirleft/ocaml-tls"; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index b976d36c730..56ba2ff800e 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -765,9 +765,7 @@ let textutils_p4 = callPackage ../development/ocaml-modules/textutils { }; - tls = callPackage ../development/ocaml-modules/tls { - lwt = ocaml_lwt; - }; + tls = callPackage ../development/ocaml-modules/tls { }; type_conv_108_08_00 = callPackage ../development/ocaml-modules/type_conv/108.08.00.nix { }; type_conv_109_60_01 = callPackage ../development/ocaml-modules/type_conv/109.60.01.nix { }; -- cgit v1.2.3 From b5770e34ffb9a8b0b0b03b8658cf45192be78fc7 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 13 Apr 2020 16:56:06 +0200 Subject: ocamlPackages.otr: 0.3.6 -> 0.3.8 Contains switch from nocrypto to mirage-crypto --- pkgs/development/ocaml-modules/otr/default.nix | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/otr/default.nix b/pkgs/development/ocaml-modules/otr/default.nix index 866360856d8..cec5d2ee0d0 100644 --- a/pkgs/development/ocaml-modules/otr/default.nix +++ b/pkgs/development/ocaml-modules/otr/default.nix @@ -1,21 +1,25 @@ -{ lib, fetchFromGitHub, buildDunePackage -, cstruct, sexplib0, rresult, nocrypto, astring +{ lib, fetchurl, buildDunePackage +, cstruct, sexplib0, rresult, mirage-crypto, mirage-crypto-pk, astring, base64 +, mirage-crypto-rng }: buildDunePackage rec { pname = "otr"; - version = "0.3.6"; + version = "0.3.8"; - src = fetchFromGitHub { - owner = "hannesm"; - repo = "ocaml-otr"; - rev = version; - sha256 = "0iz6p85a0jxng9aq9blqsky173zaqfr6wlc5j48ad55lgwzlbih5"; + src = fetchurl { + url = "https://github.com/hannesm/ocaml-otr/releases/download/v${version}/otr-v${version}.tbz"; + sha256 = "18hn9l8wznqnlh2jf1hpnp36f1cx80ncwiiivsbj34llhgp3893d"; }; - propagatedBuildInputs = [ cstruct sexplib0 rresult nocrypto astring ]; + useDune2 = true; + + propagatedBuildInputs = [ cstruct sexplib0 mirage-crypto mirage-crypto-pk + astring rresult base64 ]; doCheck = true; + checkInputs = [ mirage-crypto-rng ]; + meta = with lib; { homepage = "https://github.com/hannesm/ocaml-otr"; description = "Off-the-record messaging protocol, purely in OCaml"; -- cgit v1.2.3 From 081441122a351ce7b9a33b9a9908d9e9ba3d020c Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 13 Apr 2020 16:56:29 +0200 Subject: jackline: 2019-08-08 -> 2020-03-22 --- .../networking/instant-messengers/jackline/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix index b3fc9d10515..92857aa1a66 100644 --- a/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -1,22 +1,23 @@ { stdenv, fetchFromGitHub, ocamlPackages }: -assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.02.2"; +assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.07"; stdenv.mkDerivation { pname = "jackline"; - version = "2019-08-08"; + version = "unstable-2020-03-22"; src = fetchFromGitHub { owner = "hannesm"; repo = "jackline"; - rev = "b934594010a563ded9c0f436e3fab8f1cae29856"; - sha256 = "076h03jd970xlii90ax6kvgyq67g81gs30yvdzps366n7zzy3yfc"; + rev = "52f84525c74c43e8d03fb1e6ff025ccb2699e4aa"; + sha256 = "0wir573ah1w16xzdn9rfwk3569zq4ff5frp0ywq70va4gdlb679c"; }; buildInputs = with ocamlPackages; [ - ocaml ocamlbuild findlib topkg ppx_sexp_conv - erm_xmpp tls nocrypto x509 ocaml_lwt otr astring - ptime notty sexplib hex uutf + ocaml ocamlbuild findlib topkg ppx_sexp_conv ppx_deriving + erm_xmpp tls mirage-crypto mirage-crypto-pk x509 domain-name + ocaml_lwt otr astring ptime mtime notty sexplib hex uutf + dns-client base64 ]; buildPhase = "${ocamlPackages.topkg.run} build --pinned true"; @@ -25,7 +26,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = "https://github.com/hannesm/jackline"; - description = "Terminal-based XMPP client in OCaml"; + description = "minimalistic secure XMPP client in OCaml"; license = licenses.bsd2; maintainers = with maintainers; [ sternenseemann ]; }; -- cgit v1.2.3 From efa52177ff87946152ffc4852dd92892b441260c Mon Sep 17 00:00:00 2001 From: Constantine Glen Evans Date: Thu, 16 Apr 2020 12:22:10 -0700 Subject: tensorflow-bin_2: change tensorflow-tensorboard to _2 --- pkgs/development/python-modules/tensorflow/2/bin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow/2/bin.nix b/pkgs/development/python-modules/tensorflow/2/bin.nix index d32305ff513..f17a797b6c2 100644 --- a/pkgs/development/python-modules/tensorflow/2/bin.nix +++ b/pkgs/development/python-modules/tensorflow/2/bin.nix @@ -19,7 +19,7 @@ , opt-einsum , backports_weakref , tensorflow-estimator_2 -, tensorflow-tensorboard +, tensorflow-tensorboard_2 , cudaSupport ? false , cudatoolkit ? null , cudnn ? null @@ -77,7 +77,7 @@ in buildPythonPackage { google-pasta wrapt tensorflow-estimator_2 - tensorflow-tensorboard + tensorflow-tensorboard_2 keras-applications keras-preprocessing ] ++ lib.optional (!isPy3k) mock -- cgit v1.2.3 From dfbee5e5568960f3c416367ee865e9b2f9621a58 Mon Sep 17 00:00:00 2001 From: Constantine Glen Evans Date: Thu, 16 Apr 2020 12:44:06 -0700 Subject: tensorflow-bin_2: fix tensorboard pip-hack collision --- pkgs/development/python-modules/tensorflow/2/bin.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/python-modules/tensorflow/2/bin.nix b/pkgs/development/python-modules/tensorflow/2/bin.nix index f17a797b6c2..acb5f473ec9 100644 --- a/pkgs/development/python-modules/tensorflow/2/bin.nix +++ b/pkgs/development/python-modules/tensorflow/2/bin.nix @@ -159,6 +159,14 @@ in buildPythonPackage { done ''; + # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow + # and the propagated input tensorflow-tensorboard, which causes environment collisions. + # Another possibility would be to have tensorboard only in the buildInputs + # See https://github.com/NixOS/nixpkgs/pull/44381 for more information. + postInstall = '' + rm $out/bin/tensorboard + ''; + pythonImportsCheck = [ "tensorflow" "tensorflow.keras" -- cgit v1.2.3 From 88be9a1b2f6e68d635adde5c2d2015012fbe2ea8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 16 Apr 2020 17:34:03 +0000 Subject: python27Packages.foxdot: 0.8.5 -> 0.8.7 --- pkgs/development/python-modules/foxdot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/foxdot/default.nix b/pkgs/development/python-modules/foxdot/default.nix index 8f0a6f788b0..dc59fb6db3e 100644 --- a/pkgs/development/python-modules/foxdot/default.nix +++ b/pkgs/development/python-modules/foxdot/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "FoxDot"; - version = "0.8.5"; + version = "0.8.7"; src = fetchPypi { inherit pname version; - sha256 = "1k32fjlmzhhh6hvda71xqis13c3bdn7y3f5z9qqd1q410nfpzf59"; + sha256 = "0c5iqdn17ip6lkf26xb1cwjvcly0448gvqmkbkvhnqy4birc8cf5"; }; propagatedBuildInputs = [ tkinter supercollider ]; -- cgit v1.2.3 From d4659dece27b9aa5096091b46a11b3280689c897 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 16 Apr 2020 19:24:51 +0200 Subject: grocy: 2.6.2 -> 2.7.0 --- .../grocy/0001-Define-configs-with-env-vars.patch | 2 +- ...k-for-config-file-as-it-s-stored-in-etc-g.patch | 24 ++++++++++++++++++++++ pkgs/servers/grocy/default.nix | 9 +++++--- 3 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 pkgs/servers/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch diff --git a/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch b/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch index 654d96ae4e1..ed315c854c8 100644 --- a/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch +++ b/pkgs/servers/grocy/0001-Define-configs-with-env-vars.patch @@ -1,7 +1,7 @@ From 931958d8f11cb55f2e88a178a3b828f3c537eba8 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 6 Mar 2020 23:43:58 +0100 -Subject: [PATCH] Define configs with env vars +Subject: [PATCH 1/2] Define configs with env vars --- app.php | 4 ++-- diff --git a/pkgs/servers/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch b/pkgs/servers/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch new file mode 100644 index 00000000000..e7f84a146fb --- /dev/null +++ b/pkgs/servers/grocy/0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch @@ -0,0 +1,24 @@ +From 1556489f0b475ae56e5ed3afba19cc2abb696a76 Mon Sep 17 00:00:00 2001 +From: Maximilian Bosch +Date: Thu, 16 Apr 2020 19:37:32 +0200 +Subject: [PATCH 2/2] Remove check for config-file as it's stored in /etc/grocy + +--- + helpers/PrerequisiteChecker.php | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/helpers/PrerequisiteChecker.php b/helpers/PrerequisiteChecker.php +index d4bf74c6..ca7686c9 100644 +--- a/helpers/PrerequisiteChecker.php ++++ b/helpers/PrerequisiteChecker.php +@@ -8,7 +8,6 @@ class PrerequisiteChecker + { + public function checkRequirements() + { +- self::checkForConfigFile(); + self::checkForConfigDistFile(); + self::checkForComposer(); + self::checkForYarn(); +-- +2.25.0 + diff --git a/pkgs/servers/grocy/default.nix b/pkgs/servers/grocy/default.nix index a4c1722d38b..95b51f34c0d 100644 --- a/pkgs/servers/grocy/default.nix +++ b/pkgs/servers/grocy/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "grocy"; - version = "2.6.2"; + version = "2.7.0"; src = fetchurl { url = "https://github.com/grocy/grocy/releases/download/v${version}/grocy_${version}.zip"; - sha256 = "1cjkyv50vwx24xb1mxgy51mr4qqsqgixjww06rql77d9czmmd94k"; + sha256 = "10da7s8yc3adqzd8446ksgq61zyzxb4qbnwkzj11qh64y5hyj50q"; }; nativeBuildInputs = [ unzip ]; @@ -14,7 +14,10 @@ stdenv.mkDerivation rec { unzip ${src} -d . ''; - patches = [ ./0001-Define-configs-with-env-vars.patch ]; + patches = [ + ./0001-Define-configs-with-env-vars.patch + ./0002-Remove-check-for-config-file-as-it-s-stored-in-etc-g.patch + ]; patchFlags = [ "--binary" "-p1" ]; dontBuild = true; -- cgit v1.2.3 From 15e790cec84683056d5c0c7edb3484a078139e6b Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 15 Apr 2020 19:09:00 +0200 Subject: pythonPackages.configshell: 1.1.27 -> 1.1.28 --- pkgs/development/python-modules/configshell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/configshell/default.nix b/pkgs/development/python-modules/configshell/default.nix index 3add4b7f4e4..6a21c1074ea 100644 --- a/pkgs/development/python-modules/configshell/default.nix +++ b/pkgs/development/python-modules/configshell/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "configshell"; - version = "1.1.27"; + version = "1.1.28"; src = fetchFromGitHub { owner = "open-iscsi"; - repo ="${pname}-fb"; + repo = "${pname}-fb"; rev = "v${version}"; - sha256 = "1nldzq3097xqgzd8qxv36ydvx6vj2crwanihz53k46is0myrwcnn"; + sha256 = "1ym2hkvmmacgy21wnjwzyrcxyl3sx4bcx4hc51vf4lzcnj589l68"; }; propagatedBuildInputs = [ pyparsing six urwid ]; -- cgit v1.2.3 From 9e34eccb0f622fb2fe3d68c55197af80f1099b34 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 15 Apr 2020 19:12:16 +0200 Subject: pythonPackages.rtslib: 2.1.71 -> 2.1.72 --- pkgs/development/python-modules/rtslib/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rtslib/default.nix b/pkgs/development/python-modules/rtslib/default.nix index 2dd724a9f54..28b66ec5a52 100644 --- a/pkgs/development/python-modules/rtslib/default.nix +++ b/pkgs/development/python-modules/rtslib/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "rtslib"; - version = "2.1.71"; + version = "2.1.72"; src = fetchFromGitHub { owner = "open-iscsi"; - repo ="${pname}-fb"; + repo = "${pname}-fb"; rev = "v${version}"; - sha256 = "0cn9azi44hf59mp47207igv72kjbkyz4rsvgzmwbpz0s57b0hnab"; + sha256 = "13kycf9xkyxm1ik8yh3qpd96vird8y65daigyiyb4jvx0lmrd0kv"; }; propagatedBuildInputs = [ six pyudev pygobject3 ]; -- cgit v1.2.3 From 2355d9d545fe2b6ee8a603913d7ec3f6bafe9bef Mon Sep 17 00:00:00 2001 From: Daniel Albert Date: Thu, 16 Apr 2020 21:24:50 +0200 Subject: eclipse-scala-sdk: 4.4.1 -> 4.7.0 Unfortunately scala-ide is based on eclipse 4.7 (oxygen). Thus is requires a java SDK 8 and GTK2. --- .../applications/editors/eclipse/build-eclipse.nix | 6 ++--- pkgs/applications/editors/eclipse/default.nix | 28 ++++++++++------------ 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix index f8cbac06b0d..8b6a0c164e9 100644 --- a/pkgs/applications/editors/eclipse/build-eclipse.nix +++ b/pkgs/applications/editors/eclipse/build-eclipse.nix @@ -1,5 +1,5 @@ { stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender -, zlib, jdk, glib, gtk3, libXtst, gsettings-desktop-schemas, webkitgtk +, zlib, jdk, glib, gtk, libXtst, gsettings-desktop-schemas, webkitgtk , makeWrapper, ... }: { name, src ? builtins.getAttr stdenv.hostPlatform.system sources, sources ? null, description }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - fontconfig freetype glib gsettings-desktop-schemas gtk3 jdk libX11 + fontconfig freetype glib gsettings-desktop-schemas gtk jdk libX11 libXrender libXtst makeWrapper zlib ] ++ stdenv.lib.optional (webkitgtk != null) webkitgtk; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { makeWrapper $out/eclipse/eclipse $out/bin/eclipse \ --prefix PATH : ${jdk}/bin \ - --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk3 libXtst ] ++ stdenv.lib.optional (webkitgtk != null) webkitgtk)} \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath ([ glib gtk libXtst ] ++ stdenv.lib.optional (webkitgtk != null) webkitgtk)} \ --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration" diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix index d3113b819f7..66bdfb15c69 100644 --- a/pkgs/applications/editors/eclipse/default.nix +++ b/pkgs/applications/editors/eclipse/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeDesktopItem, makeWrapper , freetype, fontconfig, libX11, libXrender, zlib -, glib, gtk3, libXtst, jdk, gsettings-desktop-schemas +, glib, gtk3, gtk2, libXtst, jdk, jdk8, gsettings-desktop-schemas , webkitgtk ? null # for internal web browser , buildEnv, runCommand , callPackage @@ -17,11 +17,12 @@ let year = "2020"; month = "03"; timestamp = "${year}${month}050155"; + gtk = gtk3; in rec { - buildEclipse = import ./build-eclipse.nix { + buildEclipse = callPackage ./build-eclipse.nix { inherit stdenv makeDesktopItem freetype fontconfig libX11 libXrender zlib - jdk glib gtk3 libXtst gsettings-desktop-schemas webkitgtk + jdk glib gtk libXtst gsettings-desktop-schemas webkitgtk makeWrapper; }; @@ -63,19 +64,14 @@ in rec { ### Eclipse Scala SDK - eclipse-scala-sdk = buildEclipse { - name = "eclipse-scala-sdk-4.4.1"; - description = "Eclipse IDE for Scala Developers"; - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { # tested - url = "https://downloads.typesafe.com/scalaide-pack/4.4.1-vfinal-luna-211-20160504/scala-SDK-4.4.1-vfinal-2.11-linux.gtk.x86_64.tar.gz"; - sha256 = "4c2d1ac68384e12a11a851cf0fc7757aea087eba69329b21d539382a65340d27"; - } - else - fetchurl { # untested - url = "https://downloads.typesafe.com/scalaide-pack/4.4.1-vfinal-luna-211-20160504/scala-SDK-4.4.1-vfinal-2.11-linux.gtk.x86.tar.gz"; - sha256 = "35383cb09567187e14a30c15de9fd9aa0eef99e4bbb342396ce3acd11fb5cbac"; + eclipse-scala-sdk = + buildEclipse.override { jdk = jdk8; gtk = gtk2; } { + name = "eclipse-scala-sdk-4.7.0"; + description = "Eclipse IDE for Scala Developers"; + src = + fetchurl { + url = "https://downloads.typesafe.com/scalaide-pack/4.7.0-vfinal-oxygen-212-20170929/scala-SDK-4.7.0-vfinal-2.12-linux.gtk.x86_64.tar.gz"; + sha256 = "1n5w2a7mh9ajv6fxcas1gpgwb04pdxbr9v5dzr67gsz5bhahq4ya"; }; }; -- cgit v1.2.3 From 4fd1f49ea47148bb423c4de13f21e5b7ead9ecb4 Mon Sep 17 00:00:00 2001 From: Roman Kuznetsov Date: Thu, 16 Apr 2020 22:31:00 +0200 Subject: vscodium: 1.44.0 -> 1.44.1 --- pkgs/applications/editors/vscode/vscodium.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 8c884f77faa..edc63b1c2f8 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1prv4rzr5z905s6jnmkmd97zr5kz8nn4m9bil483bnx4wqr2k10g"; - x86_64-darwin = "1p0a94i80s7fq6ars01bvr41qxiq35s0r6crfv857ma01g9ia7k3"; + x86_64-linux = "16qwhnxpwarnwvlxwvy13g687g1cnfzysq16qkykkhqig0cnalmb"; + x86_64-darwin = "1p9qkbj59bfc0kn9fzg99gqxbzwxq297qxivxcjflsapd712s4vm"; }.${system}; sourceRoot = { @@ -27,7 +27,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.44.0"; + version = "1.44.1"; pname = "vscodium"; executableName = "codium"; -- cgit v1.2.3 From bc3020fbc72035b759a71df7ab790fbf3ddb85e1 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Thu, 16 Apr 2020 16:24:34 -0400 Subject: srht: 0.57.2 -> 0.59.13 --- pkgs/applications/version-management/sourcehut/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index abc2955e271..40e460ccfc0 100644 --- a/pkgs/applications/version-management/sourcehut/core.nix +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "srht"; - version = "0.57.2"; + version = "0.59.13"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/core.sr.ht"; rev = version; - sha256 = "11rfpb0wf1xzrhcnpahaghmi5626snzph0vsbxlmmqx75wf0p6mf"; + sha256 = "5jc6MtG/cBry05Sq51UAFzSBvKKkdNTA67UIDvJt9uU="; }; node_modules = fetchNodeModules { -- cgit v1.2.3 From 924cd84a2083265c0bcd3073ff41d819f9b6f724 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Thu, 16 Apr 2020 16:24:42 -0400 Subject: buildsrht: 0.52.5 -> 0.56.13 --- pkgs/applications/version-management/sourcehut/builds.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index 79aa586007d..389160fb064 100644 --- a/pkgs/applications/version-management/sourcehut/builds.nix +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -4,7 +4,7 @@ , srht, redis, celery, pyyaml, markdown }: let - version = "0.52.5"; + version = "0.56.13"; buildWorker = src: buildGoModule { inherit src version; @@ -20,7 +20,7 @@ in buildPythonPackage rec { src = fetchgit { url = "https://git.sr.ht/~sircmpwn/builds.sr.ht"; rev = version; - sha256 = "142aycnary6yfi0y1i3zgpyndi0756fingavcz2dnqi36pkajaaj"; + sha256 = "uFoS9xaVXsZZf4neZQcUyTqKo2RshOQeifD27kaKSVE="; }; patches = [ -- cgit v1.2.3 From 0809ed89ea037f3f5f05acc3ef28a12cbc595f44 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Thu, 16 Apr 2020 16:24:48 -0400 Subject: dispatchsrht: 0.13.3 -> 0.14.1 --- pkgs/applications/version-management/sourcehut/dispatch.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/sourcehut/dispatch.nix b/pkgs/applications/version-management/sourcehut/dispatch.nix index 2ca40c31408..52a49d4a084 100644 --- a/pkgs/applications/version-management/sourcehut/dispatch.nix +++ b/pkgs/applications/version-management/sourcehut/dispatch.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "dispatchsrht"; - version = "0.13.3"; + version = "0.14.1"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/dispatch.sr.ht"; rev = version; - sha256 = "08asayfwpzafscpli5grx1p0y1ryz7pqkznf5bd9j8ir2iyhbc10"; + sha256 = "eJ+oHs9m74Q8V6fUBLOA1ksUiwdaR1/Bxlf3jcexdkA="; }; patches = [ -- cgit v1.2.3 From 20466af0684a68b1c186018da5a3425d32f64c10 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Thu, 16 Apr 2020 16:24:55 -0400 Subject: gitsrht: 0.43.3 -> 0.50.3 --- pkgs/applications/version-management/sourcehut/git.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix index 09cdd061b38..b4d6ddcac37 100644 --- a/pkgs/applications/version-management/sourcehut/git.nix +++ b/pkgs/applications/version-management/sourcehut/git.nix @@ -4,7 +4,7 @@ , srht, pygit2, scmsrht }: let - version = "0.43.3"; + version = "0.50.3"; buildShell = src: buildGoModule { inherit src version; @@ -44,7 +44,7 @@ in buildPythonPackage rec { src = fetchgit { url = "https://git.sr.ht/~sircmpwn/git.sr.ht"; rev = version; - sha256 = "1f9wfyri85bq4zi9xkbfcfb69q4abh0hz7p3lghj460hh9zxc57w"; + sha256 = "dmcTee3hp6ZkwwunG4ouEVmCxQ1a9LfQ7oWpHxnKumc="; }; patches = [ -- cgit v1.2.3 From f493868f9edfbd512df2b78d1083ce0f256d3ccc Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Thu, 16 Apr 2020 16:25:02 -0400 Subject: hgsrht: 0.21.1 -> 0.26.0 --- pkgs/applications/version-management/sourcehut/hg.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/sourcehut/hg.nix b/pkgs/applications/version-management/sourcehut/hg.nix index 040d7783d47..ee6dd270759 100644 --- a/pkgs/applications/version-management/sourcehut/hg.nix +++ b/pkgs/applications/version-management/sourcehut/hg.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "hgsrht"; - version = "0.21.1"; + version = "0.26.0"; src = fetchhg { url = "https://hg.sr.ht/~sircmpwn/hg.sr.ht"; rev = version; - sha256 = "19r8zcy4xf9imqifqw3b7ylxd46i025ncns69kn5xp11damilz66"; + sha256 = "kX0KZSEzYQ/hxL2vKh+mpaRuG16qbBKN2Xwp+e9pTxs="; }; patches = [ -- cgit v1.2.3 From 188d031824e9c343e7aef0d3260b6b82c53f176c Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Thu, 16 Apr 2020 16:25:08 -0400 Subject: listssrht: 0.40.3 -> 0.41.8 --- pkgs/applications/version-management/sourcehut/lists.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/sourcehut/lists.nix b/pkgs/applications/version-management/sourcehut/lists.nix index dc2573bd245..1d915e915b1 100644 --- a/pkgs/applications/version-management/sourcehut/lists.nix +++ b/pkgs/applications/version-management/sourcehut/lists.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "listssrht"; - version = "0.40.3"; + version = "0.41.8"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/lists.sr.ht"; rev = version; - sha256 = "1s736i5wm04pqa5k7455bdjdi7vjgvq32q1v6mdsp1w7jhgy1ags"; + sha256 = "Gmt6ttupyhZhpyH/IASEt8SZGrlQmEEtV5bE11yIiXQ="; }; patches = [ -- cgit v1.2.3 From e264904e4c70664b7b21e2b5dc3d42ac8f58c06d Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Thu, 16 Apr 2020 16:25:12 -0400 Subject: mansrht: 0.14.1 -> 0.14.7 --- pkgs/applications/version-management/sourcehut/man.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/sourcehut/man.nix b/pkgs/applications/version-management/sourcehut/man.nix index 753ba46d6c3..a150b774f61 100644 --- a/pkgs/applications/version-management/sourcehut/man.nix +++ b/pkgs/applications/version-management/sourcehut/man.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "mansrht"; - version = "0.14.1"; + version = "0.14.7"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/man.sr.ht"; rev = version; - sha256 = "13yar0sa24jyiq0l4p4bgq6p5crj148f26sxwyi37g76jqba4rfi"; + sha256 = "CKXWVXr2P1D6Nz9/S5rOkuOi9piy66RreQv2RQ0KSfs="; }; patches = [ -- cgit v1.2.3 From 1f6d95badfa535abc94dcce693b9819be529d9fc Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Thu, 16 Apr 2020 16:25:18 -0400 Subject: metasrht: 0.41.10 -> 0.42.13 --- pkgs/applications/version-management/sourcehut/meta.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/sourcehut/meta.nix b/pkgs/applications/version-management/sourcehut/meta.nix index a2a23367a33..5a9a5acb066 100644 --- a/pkgs/applications/version-management/sourcehut/meta.nix +++ b/pkgs/applications/version-management/sourcehut/meta.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "metasrht"; - version = "0.41.10"; + version = "0.42.13"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/meta.sr.ht"; rev = version; - sha256 = "1srzrajgwq85kjryxykj708m2c98r6a84x4k4a5grwznqw3mwm6p"; + sha256 = "p7WgnfOsX09YxJJclHwdIky/jYkTOxibbYmXwcmE2S4="; }; nativeBuildInputs = srht.nativeBuildInputs; -- cgit v1.2.3 From 2667f93c3448c121d46911b7563d2112e48a14a7 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Thu, 16 Apr 2020 16:25:24 -0400 Subject: pastesrht: 0.9.2 -> 0.10.3 --- pkgs/applications/version-management/sourcehut/paste.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/sourcehut/paste.nix b/pkgs/applications/version-management/sourcehut/paste.nix index bd5a9ef5fc6..e05dec5d6aa 100644 --- a/pkgs/applications/version-management/sourcehut/paste.nix +++ b/pkgs/applications/version-management/sourcehut/paste.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "pastesrht"; - version = "0.9.2"; + version = "0.10.3"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/paste.sr.ht"; rev = version; - sha256 = "0hiv607a7446dba524kblmpswlcz0z4i1jr49ng7g90nhpsk8dy4"; + sha256 = "i1M4L5NG152zkIEFj2vDHa9lr5aE1ioToDVPpkIqemk="; }; patches = [ -- cgit v1.2.3 From 2e171ac8440bb3d6c4dd63ebd7f53c7b938e1b20 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Thu, 16 Apr 2020 16:25:31 -0400 Subject: todosrht: 0.55.3 -> 0.57.14 --- pkgs/applications/version-management/sourcehut/todo.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/sourcehut/todo.nix b/pkgs/applications/version-management/sourcehut/todo.nix index 506b287bc92..3a5bc2c105e 100644 --- a/pkgs/applications/version-management/sourcehut/todo.nix +++ b/pkgs/applications/version-management/sourcehut/todo.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "todosrht"; - version = "0.55.3"; + version = "0.57.14"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/todo.sr.ht"; rev = version; - sha256 = "1j82yxdnag0q6rp0rpiq3ccn5maa1k58j2f1ilcsxf1gr13pycf5"; + sha256 = "nlTf7KV6vjqqVEXZ6OOZ5dAj1iHTDPYj4DnAD2hGp5c="; }; patches = [ -- cgit v1.2.3 From 5b6e08060393617ca339a293ddad1d65f80bff77 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Thu, 16 Apr 2020 16:25:36 -0400 Subject: scmsrht: 0.18.1 -> 0.19.11 --- pkgs/applications/version-management/sourcehut/scm.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/sourcehut/scm.nix b/pkgs/applications/version-management/sourcehut/scm.nix index f2ba55951e5..e3210673cb7 100644 --- a/pkgs/applications/version-management/sourcehut/scm.nix +++ b/pkgs/applications/version-management/sourcehut/scm.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "scmsrht"; - version = "0.18.1"; + version = "0.19.11"; src = fetchgit { url = "https://git.sr.ht/~sircmpwn/scm.sr.ht"; rev = version; - sha256 = "1f0h8vbbqx34v1rgzqjkgbf0z7jhnp8hdlzmrxwhs74kj6zjb134"; + sha256 = "a0JIZcO/3op409t+jq4/fImuppuGqfGxBPgBh67DGHM="; }; nativeBuildInputs = srht.nativeBuildInputs; -- cgit v1.2.3 From 578ebda358f92ae163c2407f85edc493f3ae10bd Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Thu, 16 Apr 2020 16:39:55 -0400 Subject: srht: include prometheus_client https://git.sr.ht/~sircmpwn/core.sr.ht/commit/61c730191c5387d42e2f9910ec5422a236d81121 --- pkgs/applications/version-management/sourcehut/core.nix | 5 +++-- pkgs/applications/version-management/sourcehut/meta.nix | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index 40e460ccfc0..585144f23f3 100644 --- a/pkgs/applications/version-management/sourcehut/core.nix +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, fetchNodeModules, buildPythonPackage , pgpy, flask, bleach, misaka, humanize, markdown, psycopg2, pygments, requests -, sqlalchemy, cryptography, beautifulsoup4, sqlalchemy-utils, celery, alembic -, importlib-metadata +, sqlalchemy, cryptography, beautifulsoup4, sqlalchemy-utils, prometheus_client +, celery, alembic, importlib-metadata , sassc, nodejs , writeText }: @@ -44,6 +44,7 @@ buildPythonPackage rec { cryptography beautifulsoup4 sqlalchemy-utils + prometheus_client # Unofficial runtime dependencies? celery diff --git a/pkgs/applications/version-management/sourcehut/meta.nix b/pkgs/applications/version-management/sourcehut/meta.nix index 5a9a5acb066..5b75b5818d7 100644 --- a/pkgs/applications/version-management/sourcehut/meta.nix +++ b/pkgs/applications/version-management/sourcehut/meta.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, buildPythonPackage , python , pgpy, srht, redis, bcrypt, qrcode, stripe, zxcvbn, alembic, pystache -, sshpubkeys, weasyprint, prometheus_client }: +, sshpubkeys, weasyprint }: buildPythonPackage rec { pname = "metasrht"; @@ -27,7 +27,6 @@ buildPythonPackage rec { pystache sshpubkeys weasyprint - prometheus_client ]; patches = [ -- cgit v1.2.3 From 85b64d3006f59bd3638308c9af87187f5c8356ff Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Thu, 16 Apr 2020 16:40:47 -0400 Subject: buildsrht: fix build --- pkgs/applications/version-management/sourcehut/builds.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/sourcehut/builds.nix b/pkgs/applications/version-management/sourcehut/builds.nix index 389160fb064..99907993104 100644 --- a/pkgs/applications/version-management/sourcehut/builds.nix +++ b/pkgs/applications/version-management/sourcehut/builds.nix @@ -11,7 +11,7 @@ let pname = "builds-sr-ht-worker"; goPackagePath = "git.sr.ht/~sircmpwn/builds.sr.ht/worker"; - modSha256 = "1dwp87zsbh4a48q0pacssy329kchrd4sa47c5a1k8smbqn078424"; + modSha256 = "10is7siscids9qz6jh9m1i17749dafqqkg4b3sslmxaxyn16yj97"; }; in buildPythonPackage rec { inherit version; -- cgit v1.2.3 From ae6a55cd441b6574e2b96c02f0982249bb1b3b20 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Thu, 16 Apr 2020 16:48:32 -0400 Subject: srht: include html5lib https://git.sr.ht/~sircmpwn/sr.ht-pkgbuilds/commit/73600466cc9c3911643961c559d1047d137602b2 --- pkgs/applications/version-management/sourcehut/core.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/sourcehut/core.nix b/pkgs/applications/version-management/sourcehut/core.nix index 585144f23f3..76a81ce8968 100644 --- a/pkgs/applications/version-management/sourcehut/core.nix +++ b/pkgs/applications/version-management/sourcehut/core.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, fetchNodeModules, buildPythonPackage -, pgpy, flask, bleach, misaka, humanize, markdown, psycopg2, pygments, requests -, sqlalchemy, cryptography, beautifulsoup4, sqlalchemy-utils, prometheus_client +, pgpy, flask, bleach, misaka, humanize, html5lib, markdown, psycopg2, pygments +, requests, sqlalchemy, cryptography, beautifulsoup4, sqlalchemy-utils, prometheus_client , celery, alembic, importlib-metadata , sassc, nodejs , writeText }: @@ -36,6 +36,7 @@ buildPythonPackage rec { bleach misaka humanize + html5lib markdown psycopg2 pygments -- cgit v1.2.3 From b4f8ce9e924353f34d00a238f12c914c43121e9c Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Thu, 16 Apr 2020 16:49:37 -0400 Subject: gitsrht: include minio --- pkgs/applications/version-management/sourcehut/git.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/sourcehut/git.nix b/pkgs/applications/version-management/sourcehut/git.nix index b4d6ddcac37..de4656e5881 100644 --- a/pkgs/applications/version-management/sourcehut/git.nix +++ b/pkgs/applications/version-management/sourcehut/git.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, buildPythonPackage , python , buildGoModule -, srht, pygit2, scmsrht }: +, srht, minio, pygit2, scmsrht }: let version = "0.50.3"; @@ -55,6 +55,7 @@ in buildPythonPackage rec { propagatedBuildInputs = [ srht + minio pygit2 scmsrht ]; -- cgit v1.2.3 From c415d67284ad3b621a42c88e0a9bb5838708b14e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Thu, 16 Apr 2020 22:44:12 +0200 Subject: mozilla-plugins: remove all npapi plugins except for flash player Firefox from version 52 onwards no longer supports npapi plugins (see https://support.mozilla.org/en-US/kb/npapi-plugins). --- .../browsers/mozilla-plugins/bluejeans/default.nix | 55 ---------- .../browsers/mozilla-plugins/fribid/builder.sh | 4 - .../browsers/mozilla-plugins/fribid/default.nix | 38 ------- .../mozilla-plugins/fribid/ipc-lazytrace.patch | 10 -- .../mozilla-plugins/fribid/plugin-linkfix.patch | 11 -- .../fribid/translation-xgettext-to-intltool.patch | 16 --- .../mozilla-plugins/google-talk-plugin/default.nix | 117 --------------------- .../mozilla-plugins/google-talk-plugin/preload.c | 60 ----------- .../mozilla-plugins/mozplugger/default.nix | 31 ------ .../mozilla-plugins/mplayerplug-in/default.nix | 37 ------- .../mozilla-plugins/nspluginwrapper/default.nix | 40 ------- .../nspluginwrapper/default.upstream | 4 - pkgs/top-level/all-packages.nix | 20 ---- 13 files changed, 443 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix delete mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/fribid/builder.sh delete mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix delete mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/fribid/ipc-lazytrace.patch delete mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/fribid/plugin-linkfix.patch delete mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/fribid/translation-xgettext-to-intltool.patch delete mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix delete mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c delete mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix delete mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix delete mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix delete mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.upstream diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix deleted file mode 100644 index b5407063287..00000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv, fetchurl, xorg, gtk2, glib, gdk-pixbuf, dpkg, libXext, libXfixes -, libXrender, libuuid, libXrandr, libXcomposite, libpulseaudio -}: - -with stdenv.lib; - -let - - rpathInstaller = makeLibraryPath - [gtk2 glib stdenv.cc.cc]; - - rpathPlugin = makeLibraryPath - ([ stdenv.cc.cc gtk2 glib xorg.libX11 gdk-pixbuf libXext libXfixes libXrender libXrandr libXcomposite libpulseaudio ] ++ optional (libuuid != null) libuuid); - -in - -stdenv.mkDerivation rec { - pname = "bluejeans"; - - version = "2.180.71.8"; - - src = fetchurl { - url = "https://swdl.bluejeans.com/skinny/bjnplugin_${version}-1_amd64.deb"; - sha256 = "1fgjgzss0ghk734xpfidazyknfdn11pmyw77pc3wigl83dvx4nb2"; - }; - - unpackPhase = "${dpkg}/bin/dpkg-deb -x $src ."; - - installPhase = - '' - mkdir -p $out - cp -R usr/lib $out/ - - plugins=$out/lib/mozilla/plugins - patchelf \ - --set-rpath "${rpathPlugin}" \ - $plugins/npbjnplugin_${version}.so - - patchelf \ - --set-rpath "${rpathInstaller}" \ - $plugins/npbjninstallplugin_${version}.so - ''; - - dontStrip = true; - dontPatchELF = true; - - passthru.mozillaPlugin = "/lib/mozilla/plugins"; - - meta = { - homepage = "http://bluejeans.com"; - license = stdenv.lib.licenses.unfree; - maintainers = with maintainers; [ ocharles kamilchm ]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/builder.sh b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/builder.sh deleted file mode 100644 index fb36125b3a1..00000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/builder.sh +++ /dev/null @@ -1,4 +0,0 @@ -source $stdenv/setup -export PREFIX=$out -configureFlags="--plugin-path=$out/lib/mozilla/plugins" -genericBuild diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix deleted file mode 100644 index b59c30002d3..00000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, openssl, glib, libX11, gtk2, gettext, intltool }: - -stdenv.mkDerivation rec { - pname = "fribid"; - version = "1.0.4"; - builder = ./builder.sh; - - src = fetchurl { - url = "https://fribid.se/releases/source/${pname}-${version}.tar.bz2"; - sha256 = "a679f3a0534d5f05fac10b16b49630a898c0b721cfa24d2c827fa45485476649"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl libX11 gtk2 glib gettext intltool ]; - patches = [ - ./translation-xgettext-to-intltool.patch - ./plugin-linkfix.patch - ./ipc-lazytrace.patch - ]; - - postPatch = "substituteInPlace plugin/pluginutil.c --replace strndup strndup_"; - - passthru.mozillaPlugin = "/lib/mozilla/plugins"; - - meta = with stdenv.lib; { - description = "A browser plugin to manage Swedish BankID:s"; - longDescription = '' - FriBID is an open source software for the Swedish e-id system - called BankID. FriBID also supports processor architectures and - Linux/BSD distributions that the official software doesn't - support. - ''; - homepage = "http://fribid.se"; - license = with licenses; [ gpl2 mpl10 ]; - maintainers = [ maintainers.edwtjo ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/ipc-lazytrace.patch b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/ipc-lazytrace.patch deleted file mode 100644 index b7d05ddd0ef..00000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/ipc-lazytrace.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/plugin/ipc.c 2012-11-14 18:02:43.000000000 +0100 -+++ b/plugin/ipc.c 2013-09-21 08:55:39.960265058 +0200 -@@ -74,6 +74,7 @@ - //close(pipeOut[PIPE_READ_END]); - - execvp(mainBinary, (char *const *)argv); -+ fprintf(stderr, "Wanted signing executable\t<%s>\n", mainBinary); - perror(BINNAME ": Failed to execute main binary"); - exit(1); - } else { diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/plugin-linkfix.patch b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/plugin-linkfix.patch deleted file mode 100644 index 1128381238b..00000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/plugin-linkfix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/plugin/Makefile 2013-09-18 13:55:11.091652553 +0200 -+++ b/plugin/Makefile 2013-09-18 13:58:27.513618750 +0200 -@@ -60,7 +60,7 @@ - for path in $(NPAPI_PLUGIN_PATHS); do \ - (../configure --internal--remove-link $(DESTDIR)$$path/libfribidplugin.so $(NPAPI_PLUGIN_LIB) || exit 1) && \ - install -d $(DESTDIR)$$path && \ -- ln -sf $(NPAPI_PLUGIN_LIB) $(DESTDIR)$$path/libfribidplugin.so; \ -+ ln -sf $(DESTDIR)$(NPAPI_PLUGIN_LIB) $(DESTDIR)$$path/libfribidplugin.so; \ - done - - uninstall: diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/translation-xgettext-to-intltool.patch b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/translation-xgettext-to-intltool.patch deleted file mode 100644 index dcac4f17928..00000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/translation-xgettext-to-intltool.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- a/translations/Makefile 2013-09-18 07:25:16.503800613 +0200 -+++ b/translations/Makefile 2013-09-18 07:25:29.495869405 +0200 -@@ -38,7 +38,7 @@ - all: template.pot $(MOFILES) - - template.pot: $(POTFILES) $(DEFINES) -- xgettext -k_ -ktranslatable -d $(DOMAIN) --package-name=$(PACKAGENAME) --package-version=$(PACKAGEVERSION) --copyright-holder='YOUR NAME' -o $@ $(POTFILES) -+ intltool-update --gettext-package=$(PACKAGENAME) -o $@ sv - - .po.mo: - msgfmt $< -o $@ ---- a/translations/POTFILES.in 2013-09-16 20:28:56.766106014 +0200 -+++ b/translations/POTFILES.in 2013-09-18 13:15:05.252689648 +0200 -@@ -0,0 +1,2 @@ -+client/gtk.c -+client/gtk/sign.glade diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix deleted file mode 100644 index 9923b100afa..00000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ /dev/null @@ -1,117 +0,0 @@ -{ stdenv, fetchurl, libGL, xorg, cairo -, libpng, gtk2, glib, gdk-pixbuf, fontconfig, freetype, curl -, dbus-glib, alsaLib, libpulseaudio, systemd, pango -}: - -with stdenv.lib; - -let - - baseURL = "http://dl.google.com/linux/talkplugin/deb/pool/main/g/google-talkplugin"; - - rpathPlugin = makeLibraryPath - [ libGL - xorg.libXt - xorg.libX11 - xorg.libXrender - cairo - libpng - gtk2 - glib - fontconfig - freetype - curl - ]; - - rpathProgram = makeLibraryPath - [ gdk-pixbuf - glib - gtk2 - xorg.libX11 - xorg.libXcomposite - xorg.libXfixes - xorg.libXrender - xorg.libXrandr - xorg.libXext - stdenv.cc.cc - alsaLib - libpulseaudio - dbus-glib - systemd - curl - pango - cairo - ]; - -in - -stdenv.mkDerivation rec { - pname = "google-talk-plugin"; - - # You can get the upstream version and SHA-256 hash from the following URLs: - # curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-amd64/Packages | grep -E 'Version|SHA256' - # curl -s http://dl.google.com/linux/talkplugin/deb/dists/stable/main/binary-i386/Packages | grep -E 'Version|SHA256' - version = "5.41.3.0"; - - src = - if stdenv.hostPlatform.system == "x86_64-linux" then - fetchurl { - url = "${baseURL}/google-talkplugin_${version}-1_amd64.deb"; - sha256 = "af7e23d2b6215afc547f96615b99f04e0561557cc58c0c9302364b5a3840d97d"; - } - else if stdenv.hostPlatform.system == "i686-linux" then - fetchurl { - url = "${baseURL}/google-talkplugin_${version}-1_i386.deb"; - sha256 = "4c46d2b7f2018640288cd7ac49adc47e309d0beadfd979eb03030e672016b4a7"; - } - else throw "Google Talk does not support your platform."; - - unpackPhase = '' - ar p "$src" data.tar.gz | tar xz - ''; - - installPhase = - '' - plugins=$out/lib/mozilla/plugins - mkdir -p $plugins - cp opt/google/talkplugin/*.so $plugins - - for i in libnpgoogletalk.so libppgoogletalk.so libppo1d.so; do - patchelf --set-rpath "${makeLibraryPath [ stdenv.cc.cc xorg.libX11 ]}:${stdenv.cc.cc.lib}/lib64" $plugins/$i - done - - for i in libgoogletalkremoting.so libnpo1d.so; do - patchelf --set-rpath "$out/libexec/google/talkplugin/lib:${rpathPlugin}:${stdenv.cc.cc.lib}/lib64" $plugins/$i - done - - mkdir -p $out/libexec/google/talkplugin - cp -prd opt/google/talkplugin/{data,GoogleTalkPlugin,locale,remoting24x24.png,windowpicker.glade} $out/libexec/google/talkplugin/ - - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${rpathProgram}:${stdenv.cc.cc.lib}/lib64" \ - $out/libexec/google/talkplugin/GoogleTalkPlugin - - # Generate an LD_PRELOAD wrapper to redirect execvp() calls to - # /opt/../GoogleTalkPlugin. - preload=$out/libexec/google/talkplugin/libpreload.so - mkdir -p $(dirname $preload) - gcc -shared ${./preload.c} -o $preload -ldl -DOUT=\"$out\" -fPIC - echo $preload > $plugins/extra-ld-preload - - # Prevent a dependency on gcc. - strip -S $preload - patchELF $preload - ''; - - dontStrip = true; - dontPatchELF = true; - - passthru.mozillaPlugin = "/lib/mozilla/plugins"; - - meta = { - homepage = "http://www.google.com/chat/video/"; - license = stdenv.lib.licenses.unfree; - maintainers = [ stdenv.lib.maintainers.eelco ]; - }; -} diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c deleted file mode 100644 index 1e2c31d9527..00000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/preload.c +++ /dev/null @@ -1,60 +0,0 @@ -/* Google Talk Plugin executes a helper program in /opt. This - LD_PRELOAD library intercepts execvp() calls to redirect them to - the corresponding location in $out. */ - -#define _GNU_SOURCE -#include -#include -#include -#include -#include -#include -#include -#include -#include - -char origDir [] = "/opt/google/talkplugin"; -char realDir [] = OUT "/libexec/google/talkplugin"; - -const char * rewrite(const char * path, char * buf) -{ - if (strncmp(path, origDir, sizeof(origDir) - 1) != 0) return path; - if (snprintf(buf, PATH_MAX, "%s%s", realDir, path + sizeof(origDir) - 1) >= PATH_MAX) - abort(); - return buf; -} - -int execvp(const char * path, char * const argv[]) -{ - int (*_execvp) (const char *, char * const argv[]) = dlsym(RTLD_NEXT, "execvp"); - char buf[PATH_MAX]; - return _execvp(rewrite(path, buf), argv); -} - -int open(const char *path, int flags, ...) -{ - char buf[PATH_MAX]; - int (*_open) (const char *, int, mode_t) = dlsym(RTLD_NEXT, "open"); - mode_t mode = 0; - if (flags & O_CREAT) { - va_list ap; - va_start(ap, flags); - mode = va_arg(ap, mode_t); - va_end(ap); - } - return _open(rewrite(path, buf), flags, mode); -} - -int open64(const char *path, int flags, ...) -{ - char buf[PATH_MAX]; - int (*_open64) (const char *, int, mode_t) = dlsym(RTLD_NEXT, "open64"); - mode_t mode = 0; - if (flags & O_CREAT) { - va_list ap; - va_start(ap, flags); - mode = va_arg(ap, mode_t); - va_end(ap); - } - return _open64(rewrite(path, buf), flags, mode); -} diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix deleted file mode 100644 index a7f2815b411..00000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/mozplugger/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, firefox, libX11, xorgproto }: - -stdenv.mkDerivation rec { - pname = "mozplugger"; - version = "2.1.6"; - - src = fetchurl { - url = "http://mozplugger.mozdev.org/files/mozplugger-${version}.tar.gz"; - sha256 = "1vszkq4kdbaxsrqr2xn9rq6ipza9fngdri79gvjqk3bvsdmg0k19"; - }; - - buildInputs = [ firefox libX11 xorgproto ]; - - installPhase = '' - mkdir -p "$out/etc" "$out/bin" "$out/lib/mozilla/plugins" "$out/share/man/man7" - cp mozpluggerrc "$out/etc" - cp mozplugger-{helper,controller,linker,update} "$out/bin" - cp mozplugger.so "$out/lib/mozilla/plugins" - cp mozplugger.7 "$out/share/man/man7" - - mkdir -p "$out/share/${pname}-${version}/plugin" - ln -s "$out/lib/mozilla/plugins/mozplugger.so" "$out/share/${pname}-${version}/plugin" - ''; - - meta = { - description = "Mozilla plugin for launching external program for handling in-page objects"; - homepage = "http://mozplugger.mozdev.org/"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix deleted file mode 100644 index d4561772dc5..00000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{stdenv, fetchurl, pkgconfig, browser, libXpm, gettext}: - -stdenv.mkDerivation rec { - name = "mplayerplug-in-3.55"; - - src = fetchurl { - url = "mirror://sourceforge/mplayerplug-in/${name}.tar.gz"; - sha256 = "0zkvqrzibrbljiccvz3rhbmgifxadlrfjylqpz48jnjx9kggynms"; - }; - - postConfigure = - (if browser ? isFirefox3Like then '' - # Cause a rebuild of these file from the IDL file, needed for GNU IceCat 3 - # and Mozilla Firefox 3. - # See, e.g., http://article.gmane.org/gmane.comp.mozilla.mplayerplug-in/2104 . - rm -f Source/nsIScriptableMplayerPlugin.h - '' - else ""); - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ browser (browser.gtk) libXpm gettext ]; - - installPhase = '' - mkdir -p $out/lib/mozilla/plugins - cp -p mplayerplug-in*.so mplayerplug-in*.xpt $out/lib/mozilla/plugins - ''; - - passthru = { - mozillaPlugin = "/lib/mozilla/plugins"; - }; - - meta = with stdenv.lib; { - description = "A browser plugin that uses mplayer to play digital media from websites"; - homepage = "http://mplayerplug-in.sourceforge.net/"; - license = with licenses; [ gpl2Plus lgpl2Plus "MPLv1+" ]; - }; -} diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix deleted file mode 100644 index 59eef8c8f3a..00000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{stdenv, fetchurl, which, pkgconfig, file, glib, gtk2, gtk3, curl, libXt}: -let - srcData = # Generated upstream information - rec { - baseName="nspluginwrapper"; - version="1.4.4"; - name="${baseName}-${version}"; - hash="1fxjz9ifhw0drm12havlsl4jpsq1nv930gqa005kgddv5pa99vgj"; - url="http://nspluginwrapper.org/download/nspluginwrapper-1.4.4.tar.gz"; - }; -in -stdenv.mkDerivation { - inherit (srcData) name version; - - src = fetchurl{ - inherit (srcData) url; - sha256 = srcData.hash; - }; - - preConfigure = '' - sed -e 's@/usr/bin/@@g' -i configure - sed -e '/gthread[.]h/d' -i src/npw-player.c - export NIX_LDFLAGS="$NIX_LDFLAGS -lgthread-2.0" - export configureFlags="$configureFlags --target-cpu=$(uname -m)" - ''; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [which file glib gtk2 gtk3 curl libXt]; - - preferLocalBuild = true; - - meta = { - description = ''A wrapper to run browser plugins out-of-process''; - homepage = "http://nspluginwrapper.org/"; - license = stdenv.lib.licenses.gpl2; - platforms = [ "x64_64-linux" "i686-linux" ]; - maintainers = [ stdenv.lib.maintainers.raskin ]; - inherit (srcData) version; - }; -} diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.upstream b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.upstream deleted file mode 100644 index 62831613a2e..00000000000 --- a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.upstream +++ /dev/null @@ -1,4 +0,0 @@ -name nspluginwrapper -target default.nix -url http://nspluginwrapper.org/download/ -version_link /nspluginwrapper-[0-9]+ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7341c0e8f8d..3f41933ec5f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18622,8 +18622,6 @@ in gtk = gtk3; }; - bluejeans = callPackage ../applications/networking/browsers/mozilla-plugins/bluejeans { }; - bluejeans-gui = callPackage ../applications/networking/instant-messengers/bluejeans { }; blugon = callPackage ../applications/misc/blugon { }; @@ -19276,10 +19274,6 @@ in freewheeling = callPackage ../applications/audio/freewheeling { }; - fribid = callPackage ../applications/networking/browsers/mozilla-plugins/fribid { - openssl = openssl_1_0_2; - }; - fritzing = libsForQt5.callPackage ../applications/science/electronics/fritzing { }; fsv = callPackage ../applications/misc/fsv { }; @@ -19734,10 +19728,6 @@ in inherit (gnome2) GConf; }; - google_talk_plugin = callPackage ../applications/networking/browsers/mozilla-plugins/google-talk-plugin { - libpng = libpng12; - }; - gosmore = callPackage ../applications/misc/gosmore { }; gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { @@ -20672,8 +20662,6 @@ in motif = callPackage ../development/libraries/motif { }; - mozplugger = callPackage ../applications/networking/browsers/mozilla-plugins/mozplugger {}; - mozjpeg = callPackage ../applications/graphics/mozjpeg { }; easytag = callPackage ../applications/audio/easytag { }; @@ -20728,12 +20716,6 @@ in libdvdnav = libdvdnav_4_2_1; } // (config.mplayer or {})); - MPlayerPlugin = browser: - callPackage ../applications/networking/browsers/mozilla-plugins/mplayerplug-in { - inherit browser; - # !!! should depend on MPlayer - }; - mpv = callPackage ../applications/video/mpv { inherit lua; inherit (darwin.apple_sdk.frameworks) CoreFoundation Cocoa CoreAudio MediaPlayer; @@ -21043,8 +21025,6 @@ in nova-filters = callPackage ../applications/audio/nova-filters { }; - nspluginwrapper = callPackage ../applications/networking/browsers/mozilla-plugins/nspluginwrapper {}; - nvi = callPackage ../applications/editors/nvi { }; nvpy = callPackage ../applications/editors/nvpy { }; -- cgit v1.2.3 From 6367a55312f42e3d321bab1fb2c69342b36eedee Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 16 Apr 2020 16:32:35 -0500 Subject: =?UTF-8?q?fetchurl:=20don=E2=80=99t=20run=20=E2=80=98postFetch?= =?UTF-8?q?=E2=80=99=20on=20hashed-mirrors?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit hashed-mirrors are content addressed. So if $outputHash is in the hashed-mirror, changes from ‘postFetch’ would already be made. So, running postFetch will end up applying the change /again/, which we don’t want. --- pkgs/build-support/fetchurl/builder.sh | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh index 74fdc320835..e93c98419a6 100644 --- a/pkgs/build-support/fetchurl/builder.sh +++ b/pkgs/build-support/fetchurl/builder.sh @@ -47,13 +47,18 @@ tryDownload() { finish() { + local skipPostFetch="$1" + set +o noglob if [[ $executable == "1" ]]; then chmod +x $downloadedFile fi - runHook postFetch + if [ -z "$skipPostFetch" ]; then + runHook postFetch + fi + exit 0 } @@ -69,7 +74,13 @@ tryHashedMirrors() { --fail --silent --show-error --head "$url" \ --write-out "%{http_code}" --output /dev/null > code 2> log; then tryDownload "$url" - if test -n "$success"; then finish; fi + + # We skip postFetch here, because hashed-mirrors are + # already content addressed. So if $outputHash is in the + # hashed-mirror, changes from ‘postFetch’ would already be + # made. So, running postFetch will end up applying the + # change /again/, which we don’t want. + if test -n "$success"; then finish skipPostFetch; fi else # Be quiet about 404 errors, which we interpret as the file # not being present on this particular mirror. -- cgit v1.2.3 From 13c58fbbf482cf74f30d98c999325af0847dcb69 Mon Sep 17 00:00:00 2001 From: Zakkor Date: Fri, 17 Apr 2020 00:34:00 +0300 Subject: upwork: init at 5.3.3-883 --- pkgs/applications/misc/upwork/default.nix | 55 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 57 insertions(+) create mode 100644 pkgs/applications/misc/upwork/default.nix diff --git a/pkgs/applications/misc/upwork/default.nix b/pkgs/applications/misc/upwork/default.nix new file mode 100644 index 00000000000..3757c8ce3bb --- /dev/null +++ b/pkgs/applications/misc/upwork/default.nix @@ -0,0 +1,55 @@ +{ stdenv, fetchurl, dpkg, wrapGAppsHook, autoPatchelfHook, writeShellScript +, alsaLib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype +, gdk-pixbuf, glib, gtk3, libnotify, libX11, libXcomposite, libXcursor, libXdamage, libuuid +, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, libxcb +, pango, systemd, libXScrnSaver, libcxx, libpulseaudio }: + +stdenv.mkDerivation rec { + pname = "upwork"; + version = "5.3.3-883"; + + src = fetchurl { + url = "https://updates-desktopapp.upwork.com/binaries/v5_3_3_883_1f817bc1fefd44e7/upwork_5.3.3.883_amd64.deb"; + sha256 = "072zns79w4h46bvbj23rvr8i12sf2l378ry0z3hchwcimkrph9wx"; + }; + + dontWrapGApps = true; + + nativeBuildInputs = [ + dpkg + wrapGAppsHook + autoPatchelfHook + ]; + + buildInputs = [ + libcxx systemd libpulseaudio + stdenv.cc.cc alsaLib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype + gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid + libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender + libXtst nspr nss libxcb pango systemd libXScrnSaver + ]; + + libPath = stdenv.lib.makeLibraryPath buildInputs; + + unpackPhase = '' + dpkg-deb -x ${src} ./ + ''; + + installPhase = '' + mv usr $out + mv opt $out + sed -e "s|/opt/Upwork|$out/bin|g" -i $out/share/applications/upwork.desktop + + makeWrapper $out/opt/Upwork/upwork \ + $out/bin/upwork \ + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ + --prefix LD_LIBRARY_PATH : ${libPath} + ''; + + meta = with stdenv.lib; { + description = "Online freelancing platform desktop application for time tracking"; + homepage = "https://www.upwork.com/ab/downloads/"; + license = licenses.unfree; + maintainers = with maintainers; [ zakkor ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b20daa29db0..870b812e5d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7498,6 +7498,8 @@ in uptimed = callPackage ../tools/system/uptimed { }; + upwork = callPackage ../applications/misc/upwork { }; + urjtag = callPackage ../tools/misc/urjtag { }; urlwatch = callPackage ../tools/networking/urlwatch { }; -- cgit v1.2.3 From e14c4ba9705a67c1e1503f9e959c2377498dbb88 Mon Sep 17 00:00:00 2001 From: Zakkor Date: Fri, 17 Apr 2020 00:34:18 +0300 Subject: maintainers: add zakkor --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ba0994974c7..373aa45d858 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8431,6 +8431,12 @@ githubId = 250877; name = "Elmar Athmer"; }; + zakkor = { + email = "edward.dalbon@gmail.com"; + github = "zakkor"; + githubId = 6191421; + name = "Edward d'Albon"; + }; zef = { email = "zef@zef.me"; name = "Zef Hemel"; -- cgit v1.2.3 From dc85a2e5842c496656382d9be4e68a68fc791657 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 16 Apr 2020 12:16:17 +1000 Subject: megatools: 1.10.2 -> 1.10.3 --- pkgs/tools/networking/megatools/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix index 76ce71ac9c8..b729e996185 100644 --- a/pkgs/tools/networking/megatools/default.nix +++ b/pkgs/tools/networking/megatools/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchgit, autoreconfHook, pkgconfig, glib, fuse, curl, glib-networking +{ stdenv, fetchgit, autoreconfHook, pkg-config, glib, fuse, curl, glib-networking , asciidoc, libxml2, docbook_xsl, docbook_xml_dtd_45, libxslt, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "megatools"; - version = "1.10.2"; + version = "1.10.3"; src = fetchgit { url = "https://megous.com/git/megatools"; - rev = version; - sha256 = "001hw8j36ld03wwaphq3xdaazf2dpl36h84k8xmk524x8vlia8lk"; + rev = "5581d06e447b84d0101d36dc96ab72920eec1017"; + sha256 = "1fh456kjsmdvpmvklkpi06h720yvhahd4rxa6cm5x818pl44p1r4"; }; nativeBuildInputs = [ - autoreconfHook pkgconfig wrapGAppsHook asciidoc libxml2 + autoreconfHook pkg-config wrapGAppsHook asciidoc libxml2 docbook_xsl docbook_xml_dtd_45 libxslt ]; buildInputs = [ glib glib-networking curl ] -- cgit v1.2.3 From ba770e599c3489856054e23f1b8d09684195f619 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 26 Jan 2020 14:56:41 +0100 Subject: systemd: switch from our own fork to upstream repo + local patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit After patching, this produces exactly the same source code as in our custom fork, but having the actual patches inlined inside nixpkgs makes it easier to get rid of them. In case more complicated rebasing is necessary, maintainers can - Clone the upstream systemd/systemd[-stable] repo - Checkout the current rev mentioned in src - Apply the patches from this folder via `git am 00*.patch` - Rebase the repo on top of a new version - Export the patch series via `git format-patch $newVersion` - Update the patches = [ … ] attribute (if necessary) --- ...e-units-for-uninitialised-encrypted-devic.patch | 32 +++ ...get-Drop-the-dependency-on-local-fs.targe.patch | 32 +++ ...003-Don-t-try-to-unmount-nix-or-nix-store.patch | 28 ++ .../linux/systemd/0004-Fix-NixOS-containers.patch | 34 +++ ...c-nodes.service-Don-t-require-lib-modules.patch | 24 ++ .../0006-Look-for-fsck-in-the-right-place.patch | 25 ++ ...-Add-some-NixOS-specific-unit-directories.patch | 107 +++++++ ...008-Don-t-try-to-unmount-nix-or-nix-store.patch | 53 ++++ ...rid-of-a-useless-message-in-user-sessions.patch | 31 ++ ...ocaled-timedated-disable-methods-that-cha.patch | 118 ++++++++ .../linux/systemd/0011-Fix-hwdb-paths.patch | 32 +++ ...Change-usr-share-zoneinfo-to-etc-zoneinfo.patch | 116 ++++++++ ...13-localectl-use-etc-X11-xkb-for-list-x11.patch | 27 ++ .../0014-catalog-don-t-update-on-install.patch | 24 ++ .../0015-hwdb-don-t-run-update-on-install.patch | 27 ++ ...-create-statedir-and-don-t-touch-prefixdi.patch | 26 ++ ...t-option-x-initrd.mount-handling-35268-16.patch | 42 +++ ...ault-configuration-into-out-share-factory.patch | 313 +++++++++++++++++++++ ...stemd-environment-when-calling-generators.patch | 42 +++ ...-the-no-such-path-PATH-that-was-dropped-s.patch | 41 +++ .../0021-add-rootprefix-to-lookup-dir-paths.patch | 38 +++ ...tdown-execute-scripts-in-etc-systemd-syst.patch | 27 ++ ...ep-execute-scripts-in-etc-systemd-system-.patch | 26 ++ ...nit.target-Drop-the-dependency-on-local-f.patch | 27 ++ .../linux/systemd/0027-Start-getty-on-lxc.patch | 27 ++ pkgs/os-specific/linux/systemd/default.nix | 36 ++- 26 files changed, 1351 insertions(+), 4 deletions(-) create mode 100644 pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch create mode 100644 pkgs/os-specific/linux/systemd/0002-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch create mode 100644 pkgs/os-specific/linux/systemd/0003-Don-t-try-to-unmount-nix-or-nix-store.patch create mode 100644 pkgs/os-specific/linux/systemd/0004-Fix-NixOS-containers.patch create mode 100644 pkgs/os-specific/linux/systemd/0005-kmod-static-nodes.service-Don-t-require-lib-modules.patch create mode 100644 pkgs/os-specific/linux/systemd/0006-Look-for-fsck-in-the-right-place.patch create mode 100644 pkgs/os-specific/linux/systemd/0007-Add-some-NixOS-specific-unit-directories.patch create mode 100644 pkgs/os-specific/linux/systemd/0008-Don-t-try-to-unmount-nix-or-nix-store.patch create mode 100644 pkgs/os-specific/linux/systemd/0009-Get-rid-of-a-useless-message-in-user-sessions.patch create mode 100644 pkgs/os-specific/linux/systemd/0010-hostnamed-localed-timedated-disable-methods-that-cha.patch create mode 100644 pkgs/os-specific/linux/systemd/0011-Fix-hwdb-paths.patch create mode 100644 pkgs/os-specific/linux/systemd/0012-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch create mode 100644 pkgs/os-specific/linux/systemd/0013-localectl-use-etc-X11-xkb-for-list-x11.patch create mode 100644 pkgs/os-specific/linux/systemd/0014-catalog-don-t-update-on-install.patch create mode 100644 pkgs/os-specific/linux/systemd/0015-hwdb-don-t-run-update-on-install.patch create mode 100644 pkgs/os-specific/linux/systemd/0016-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch create mode 100644 pkgs/os-specific/linux/systemd/0017-Fix-mount-option-x-initrd.mount-handling-35268-16.patch create mode 100644 pkgs/os-specific/linux/systemd/0018-Install-default-configuration-into-out-share-factory.patch create mode 100644 pkgs/os-specific/linux/systemd/0019-inherit-systemd-environment-when-calling-generators.patch create mode 100644 pkgs/os-specific/linux/systemd/0020-reintroduce-the-no-such-path-PATH-that-was-dropped-s.patch create mode 100644 pkgs/os-specific/linux/systemd/0021-add-rootprefix-to-lookup-dir-paths.patch create mode 100644 pkgs/os-specific/linux/systemd/0022-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch create mode 100644 pkgs/os-specific/linux/systemd/0023-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch create mode 100644 pkgs/os-specific/linux/systemd/0024-Revert-sysinit.target-Drop-the-dependency-on-local-f.patch create mode 100644 pkgs/os-specific/linux/systemd/0027-Start-getty-on-lxc.patch diff --git a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch new file mode 100644 index 00000000000..173f41a44c9 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch @@ -0,0 +1,32 @@ +From a6c9317a905ef478b8e0d3dad263990feb5d11cb Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra +Date: Tue, 8 Jan 2013 15:46:30 +0100 +Subject: [PATCH 01/27] Start device units for uninitialised encrypted devices + +This is necessary because the NixOS service that initialises the +filesystem depends on the appearance of the device unit. Also, this +makes more sense to me: the device is ready; it's the filesystem +that's not, but taking care of that is the responsibility of the mount +unit. (However, this ignores the fsck unit, so it's not perfect...) +--- + rules/99-systemd.rules.in | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in +index c34b606216..3ab8c1c3fe 100644 +--- a/rules/99-systemd.rules.in ++++ b/rules/99-systemd.rules.in +@@ -17,10 +17,6 @@ SUBSYSTEM=="ubi", TAG+="systemd" + SUBSYSTEM=="block", TAG+="systemd" + SUBSYSTEM=="block", ACTION=="add", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", ENV{SYSTEMD_READY}="0" + +-# Ignore encrypted devices with no identified superblock on it, since +-# we are probably still calling mke2fs or mkswap on it. +-SUBSYSTEM=="block", ENV{DM_UUID}=="CRYPT-*", ENV{ID_PART_TABLE_TYPE}=="", ENV{ID_FS_USAGE}=="", ENV{SYSTEMD_READY}="0" +- + # add symlink to GPT root disk + SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}!="crypto_LUKS", SYMLINK+="gpt-auto-root" + SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}=="crypto_LUKS", SYMLINK+="gpt-auto-root-luks" +-- +2.24.1 + diff --git a/pkgs/os-specific/linux/systemd/0002-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch b/pkgs/os-specific/linux/systemd/0002-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch new file mode 100644 index 00000000000..6dfd150d325 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0002-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch @@ -0,0 +1,32 @@ +From 4e0c6f33ebf49a78abec28d2f4044afb5b8719af Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra +Date: Tue, 8 Jan 2013 15:56:03 +0100 +Subject: [PATCH 02/27] sysinit.target: Drop the dependency on local-fs.target + and swap.target + +Having all services with DefaultDependencies=yes depend on +local-fs.target is annoying, because some of those services might be +necessary to mount local filesystems. For instance, Charon's +send-keys feature requires sshd to be running in order to receive LUKS +encryption keys, which in turn requires dhcpcd, and so on. So we drop +this dependency (and swap.target as well for consistency). If +services require a specific mount, they should use RequiresMountsFor +in any case. +--- + units/sysinit.target | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/units/sysinit.target b/units/sysinit.target +index b6c16a1412..5fe9ad0ec9 100644 +--- a/units/sysinit.target ++++ b/units/sysinit.target +@@ -11,5 +11,4 @@ + Description=System Initialization + Documentation=man:systemd.special(7) + Conflicts=emergency.service emergency.target +-Wants=local-fs.target swap.target +-After=local-fs.target swap.target emergency.service emergency.target ++After=emergency.service emergency.target +-- +2.24.1 + diff --git a/pkgs/os-specific/linux/systemd/0003-Don-t-try-to-unmount-nix-or-nix-store.patch b/pkgs/os-specific/linux/systemd/0003-Don-t-try-to-unmount-nix-or-nix-store.patch new file mode 100644 index 00000000000..a1380a33f45 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0003-Don-t-try-to-unmount-nix-or-nix-store.patch @@ -0,0 +1,28 @@ +From 620047803b70b941606398e77f253645058007dd Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra +Date: Fri, 12 Apr 2013 13:16:57 +0200 +Subject: [PATCH 03/27] Don't try to unmount /nix or /nix/store + +They'll still be remounted read-only. + +https://github.com/NixOS/nixos/issues/126 +--- + src/shutdown/umount.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c +index 00e268855d..08f3590f2a 100644 +--- a/src/shutdown/umount.c ++++ b/src/shutdown/umount.c +@@ -373,6 +373,8 @@ static int delete_dm(dev_t devnum) { + + static bool nonunmountable_path(const char *path) { + return path_equal(path, "/") ++ || path_equal(path, "/nix") ++ || path_equal(path, "/nix/store") + #if ! HAVE_SPLIT_USR + || path_equal(path, "/usr") + #endif +-- +2.24.1 + diff --git a/pkgs/os-specific/linux/systemd/0004-Fix-NixOS-containers.patch b/pkgs/os-specific/linux/systemd/0004-Fix-NixOS-containers.patch new file mode 100644 index 00000000000..ffb139b71e1 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0004-Fix-NixOS-containers.patch @@ -0,0 +1,34 @@ +From 58c4a7b4e9d9c34b92deded6aea814738821059d Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra +Date: Wed, 16 Apr 2014 10:59:28 +0200 +Subject: [PATCH 04/27] Fix NixOS containers + +In NixOS containers, the init script is bind-mounted into the +container, so checking early whether it exists will fail. +--- + src/nspawn/nspawn.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c +index 5d9290b1cf..26615901c3 100644 +--- a/src/nspawn/nspawn.c ++++ b/src/nspawn/nspawn.c +@@ -4924,6 +4924,7 @@ static int run(int argc, char *argv[]) { + goto finish; + } + } else { ++#if 0 + const char *p, *q; + + if (arg_pivot_root_new) +@@ -4938,6 +4939,7 @@ static int run(int argc, char *argv[]) { + r = -EINVAL; + goto finish; + } ++#endif + } + + } else { +-- +2.24.1 + diff --git a/pkgs/os-specific/linux/systemd/0005-kmod-static-nodes.service-Don-t-require-lib-modules.patch b/pkgs/os-specific/linux/systemd/0005-kmod-static-nodes.service-Don-t-require-lib-modules.patch new file mode 100644 index 00000000000..6d4f39ea4a3 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0005-kmod-static-nodes.service-Don-t-require-lib-modules.patch @@ -0,0 +1,24 @@ +From 18863cea3bdfad5f8b0581478ce4a39ede53b9d4 Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra +Date: Thu, 17 Apr 2014 13:54:29 +0200 +Subject: [PATCH 05/27] kmod-static-nodes.service: Don't require /lib/modules + +--- + units/kmod-static-nodes.service.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/units/kmod-static-nodes.service.in b/units/kmod-static-nodes.service.in +index 0971edf9ec..7d150bf3d7 100644 +--- a/units/kmod-static-nodes.service.in ++++ b/units/kmod-static-nodes.service.in +@@ -12,7 +12,6 @@ Description=Create list of static device nodes for the current kernel + DefaultDependencies=no + Before=sysinit.target systemd-tmpfiles-setup-dev.service + ConditionCapability=CAP_SYS_MODULE +-ConditionFileNotEmpty=/lib/modules/%v/modules.devname + + [Service] + Type=oneshot +-- +2.24.1 + diff --git a/pkgs/os-specific/linux/systemd/0006-Look-for-fsck-in-the-right-place.patch b/pkgs/os-specific/linux/systemd/0006-Look-for-fsck-in-the-right-place.patch new file mode 100644 index 00000000000..5972b646867 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0006-Look-for-fsck-in-the-right-place.patch @@ -0,0 +1,25 @@ +From c841ffab8fb6174b51382b9d4334f78c74018730 Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra +Date: Thu, 1 May 2014 14:10:10 +0200 +Subject: [PATCH 06/27] Look for fsck in the right place + +--- + src/fsck/fsck.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c +index 55e6544d31..3626aadda7 100644 +--- a/src/fsck/fsck.c ++++ b/src/fsck/fsck.c +@@ -371,7 +371,7 @@ static int run(int argc, char *argv[]) { + } else + dash_c[0] = 0; + +- cmdline[i++] = "/sbin/fsck"; ++ cmdline[i++] = "/run/current-system/sw/bin/fsck"; + cmdline[i++] = arg_repair; + cmdline[i++] = "-T"; + +-- +2.24.1 + diff --git a/pkgs/os-specific/linux/systemd/0007-Add-some-NixOS-specific-unit-directories.patch b/pkgs/os-specific/linux/systemd/0007-Add-some-NixOS-specific-unit-directories.patch new file mode 100644 index 00000000000..7d537197fae --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0007-Add-some-NixOS-specific-unit-directories.patch @@ -0,0 +1,107 @@ +From 8c0be07ccbad35d0c1106015057996aa55b9a1f9 Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra +Date: Fri, 19 Dec 2014 14:46:17 +0100 +Subject: [PATCH 07/27] Add some NixOS-specific unit directories + +Look in /nix/var/nix/profiles/default/lib/systemd for units provided +by packages in the default (system-wide) profile, and in +/etc/systemd-mutable/system for persistent, mutable units (not +recommended). + +Also, remove /usr and /lib as these don't exist on NixOS. +--- + src/core/systemd.pc.in | 4 ++-- + src/shared/path-lookup.c | 18 +++++------------- + 2 files changed, 7 insertions(+), 15 deletions(-) + +diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in +index 5d1ddd7620..21b977d6fc 100644 +--- a/src/core/systemd.pc.in ++++ b/src/core/systemd.pc.in +@@ -17,8 +17,8 @@ systemduserunitdir=${prefix}/lib/systemd/user + systemduserpresetdir=${prefix}/lib/systemd/user-preset + systemdsystemconfdir=${sysconfdir}/systemd/system + systemduserconfdir=${sysconfdir}/systemd/user +-systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/run/systemd/system:/usr/local/lib/systemd/system:${systemdsystemunitdir}:/usr/lib/systemd/system:/lib/systemd/system +-systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/run/systemd/user:/usr/local/lib/systemd/user:/usr/local/share/systemd/user:${systemduserunitdir}:/usr/lib/systemd/user:/usr/share/systemd/user ++systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/etc/systemd-mutable/system:/nix/var/nix/profiles/default/lib/systemd/user:/run/systemd/system:${systemdsystemunitdir} ++systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/etc/systemd-mutable/user:/nix/var/nix/profiles/default/lib/systemd/system:/run/systemd/user:${systemduserunitdir} + systemdsystemgeneratordir=${rootprefix}/lib/systemd/system-generators + systemdusergeneratordir=${prefix}/lib/systemd/user-generators + systemdsleepdir=${rootprefix}/lib/systemd/system-sleep +diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c +index 6bf0ff0316..2b6324ad8c 100644 +--- a/src/shared/path-lookup.c ++++ b/src/shared/path-lookup.c +@@ -99,17 +99,14 @@ int xdg_user_data_dir(char **ret, const char *suffix) { + } + + static const char* const user_data_unit_paths[] = { +- "/usr/local/lib/systemd/user", +- "/usr/local/share/systemd/user", + USER_DATA_UNIT_PATH, +- "/usr/lib/systemd/user", +- "/usr/share/systemd/user", + NULL + }; + + static const char* const user_config_unit_paths[] = { + USER_CONFIG_UNIT_PATH, + "/etc/systemd/user", ++ "/etc/systemd-mutable/user", + NULL + }; + +@@ -604,15 +601,14 @@ int lookup_paths_init( + persistent_config, + SYSTEM_CONFIG_UNIT_PATH, + "/etc/systemd/system", ++ "/etc/systemd-mutable/system", ++ "/nix/var/nix/profiles/default/lib/systemd/system", + STRV_IFNOTNULL(persistent_attached), + runtime_config, + "/run/systemd/system", + STRV_IFNOTNULL(runtime_attached), + STRV_IFNOTNULL(generator), +- "/usr/local/lib/systemd/system", + SYSTEM_DATA_UNIT_PATH, +- "/usr/lib/systemd/system", +- STRV_IFNOTNULL(flags & LOOKUP_PATHS_SPLIT_USR ? "/lib/systemd/system" : NULL), + STRV_IFNOTNULL(generator_late)); + break; + +@@ -628,14 +624,12 @@ int lookup_paths_init( + persistent_config, + USER_CONFIG_UNIT_PATH, + "/etc/systemd/user", ++ "/etc/systemd-mutable/user", ++ "/nix/var/nix/profiles/default/lib/systemd/user", + runtime_config, + "/run/systemd/user", + STRV_IFNOTNULL(generator), +- "/usr/local/share/systemd/user", +- "/usr/share/systemd/user", +- "/usr/local/lib/systemd/user", + USER_DATA_UNIT_PATH, +- "/usr/lib/systemd/user", + STRV_IFNOTNULL(generator_late)); + break; + +@@ -824,14 +818,12 @@ char **generator_binary_paths(UnitFileScope scope) { + case UNIT_FILE_SYSTEM: + return strv_new("/run/systemd/system-generators", + "/etc/systemd/system-generators", +- "/usr/local/lib/systemd/system-generators", + SYSTEM_GENERATOR_PATH); + + case UNIT_FILE_GLOBAL: + case UNIT_FILE_USER: + return strv_new("/run/systemd/user-generators", + "/etc/systemd/user-generators", +- "/usr/local/lib/systemd/user-generators", + USER_GENERATOR_PATH); + + default: +-- +2.24.1 + diff --git a/pkgs/os-specific/linux/systemd/0008-Don-t-try-to-unmount-nix-or-nix-store.patch b/pkgs/os-specific/linux/systemd/0008-Don-t-try-to-unmount-nix-or-nix-store.patch new file mode 100644 index 00000000000..b858f3f7a45 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0008-Don-t-try-to-unmount-nix-or-nix-store.patch @@ -0,0 +1,53 @@ +From 5b2eafc51fa2d98f03fd341176d9a7accc0259ae Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra +Date: Mon, 11 May 2015 15:30:46 +0200 +Subject: [PATCH 08/27] Don't try to unmount /nix or /nix/store + +33f458625f2a9d201263bd1b81b1c56f4a077e80 wasn't enough. +--- + src/core/mount.c | 22 +++++++++++++++++----- + 1 file changed, 17 insertions(+), 5 deletions(-) + +diff --git a/src/core/mount.c b/src/core/mount.c +index 959b8fbed2..5e4c4a9767 100644 +--- a/src/core/mount.c ++++ b/src/core/mount.c +@@ -409,7 +409,9 @@ static bool mount_is_extrinsic(Mount *m) { + + if (PATH_IN_SET(m->where, /* Don't bother with the OS data itself */ + "/", +- "/usr")) ++ "/usr", ++ "/nix/", ++ "/nix/store")) + return true; + + if (PATH_STARTSWITH_SET(m->where, +@@ -439,10 +441,20 @@ static int mount_add_default_dependencies(Mount *m) { + if (!UNIT(m)->default_dependencies) + return 0; + +- /* We do not add any default dependencies to /, /usr or /run/initramfs/, since they are guaranteed to stay +- * mounted the whole time, since our system is on it. Also, don't bother with anything mounted below virtual +- * file systems, it's also going to be virtual, and hence not worth the effort. */ +- if (mount_is_extrinsic(m)) ++ if (!MANAGER_IS_SYSTEM(UNIT(m)->manager)) ++ return 0; ++ ++ /* We do not add any default dependencies to /, /usr or ++ * /run/initramfs/, since they are guaranteed to stay ++ * mounted the whole time, since our system is on it. ++ * Also, don't bother with anything mounted below virtual ++ * file systems, it's also going to be virtual, and hence ++ * not worth the effort. */ ++ if (PATH_IN_SET(m->where, "/", "/usr", "/nix", "/nix/store") || ++ path_startswith(m->where, "/run/initramfs") || ++ path_startswith(m->where, "/proc") || ++ path_startswith(m->where, "/sys") || ++ path_startswith(m->where, "/dev")) + return 0; + + p = get_mount_parameters(m); +-- +2.24.1 + diff --git a/pkgs/os-specific/linux/systemd/0009-Get-rid-of-a-useless-message-in-user-sessions.patch b/pkgs/os-specific/linux/systemd/0009-Get-rid-of-a-useless-message-in-user-sessions.patch new file mode 100644 index 00000000000..c15b8a2a9e1 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0009-Get-rid-of-a-useless-message-in-user-sessions.patch @@ -0,0 +1,31 @@ +From 99c86daa5244d45a19f75f6ce92bd4255edef420 Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra +Date: Mon, 11 May 2015 15:39:38 +0200 +Subject: [PATCH 09/27] Get rid of a useless message in user sessions + +Namely lots of variants of + + Unit nix-var-nix-db.mount is bound to inactive unit dev-disk-by\x2dlabel-nixos.device. Stopping, too. + +in containers. +--- + src/core/unit.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/core/unit.c b/src/core/unit.c +index a1dc76aa6a..07670af8e2 100644 +--- a/src/core/unit.c ++++ b/src/core/unit.c +@@ -2045,7 +2045,8 @@ static void unit_check_binds_to(Unit *u) { + } + + assert(other); +- log_unit_info(u, "Unit is bound to inactive unit %s. Stopping, too.", other->id); ++ if (u->type != UNIT_MOUNT || detect_container() <= 0) ++ log_unit_info(u, "Unit is bound to inactive unit %s. Stopping, too.", other->id); + + /* A unit we need to run is gone. Sniff. Let's stop this. */ + r = manager_add_job(u->manager, JOB_STOP, u, JOB_FAIL, NULL, &error, NULL); +-- +2.24.1 + diff --git a/pkgs/os-specific/linux/systemd/0010-hostnamed-localed-timedated-disable-methods-that-cha.patch b/pkgs/os-specific/linux/systemd/0010-hostnamed-localed-timedated-disable-methods-that-cha.patch new file mode 100644 index 00000000000..635da4634a8 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0010-hostnamed-localed-timedated-disable-methods-that-cha.patch @@ -0,0 +1,118 @@ +From cec1430f72edfedb951fe34e87765ef422ea9843 Mon Sep 17 00:00:00 2001 +From: Gabriel Ebner +Date: Sun, 6 Dec 2015 14:26:36 +0100 +Subject: [PATCH 10/27] hostnamed, localed, timedated: disable methods that + change system settings. + +--- + src/hostname/hostnamed.c | 9 +++++++++ + src/locale/localed.c | 9 +++++++++ + src/timedate/timedated.c | 10 ++++++++++ + 3 files changed, 28 insertions(+) + +diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c +index 9e4f4fb59e..141b8acc08 100644 +--- a/src/hostname/hostnamed.c ++++ b/src/hostname/hostnamed.c +@@ -423,6 +423,9 @@ static int method_set_hostname(sd_bus_message *m, void *userdata, sd_bus_error * + if (r < 0) + return r; + ++ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, ++ "Changing system settings via systemd is not supported on NixOS."); ++ + if (isempty(name)) + name = c->data[PROP_STATIC_HOSTNAME]; + +@@ -479,6 +482,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_ + if (r < 0) + return r; + ++ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, ++ "Changing system settings via systemd is not supported on NixOS."); ++ + name = empty_to_null(name); + + if (streq_ptr(name, c->data[PROP_STATIC_HOSTNAME])) +@@ -536,6 +542,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess + if (r < 0) + return r; + ++ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, ++ "Changing system settings via systemd is not supported on NixOS."); ++ + name = empty_to_null(name); + + if (streq_ptr(name, c->data[prop])) +diff --git a/src/locale/localed.c b/src/locale/localed.c +index 8d0eec96a5..0b1c1d664e 100644 +--- a/src/locale/localed.c ++++ b/src/locale/localed.c +@@ -276,6 +276,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er + if (r < 0) + return r; + ++ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, ++ "Changing system settings via systemd is not supported on NixOS."); ++ + /* If single locale without variable name is provided, then we assume it is LANG=. */ + if (strv_length(l) == 1 && !strchr(*l, '=')) { + if (!locale_is_valid(*l)) +@@ -411,6 +414,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro + if (r < 0) + return r; + ++ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, ++ "Changing system settings via systemd is not supported on NixOS."); ++ + keymap = empty_to_null(keymap); + keymap_toggle = empty_to_null(keymap_toggle); + +@@ -587,6 +593,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err + if (r < 0) + return r; + ++ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, ++ "Changing system settings via systemd is not supported on NixOS."); ++ + layout = empty_to_null(layout); + model = empty_to_null(model); + variant = empty_to_null(variant); +diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c +index 6c94b23de4..fa20d22cde 100644 +--- a/src/timedate/timedated.c ++++ b/src/timedate/timedated.c +@@ -653,6 +653,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error * + if (r < 0) + return r; + ++ if (getenv("NIXOS_STATIC_TIMEZONE")) ++ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, ++ "Changing timezone via systemd is not supported when it is set in NixOS configuration."); ++ + if (!timezone_is_valid(z, LOG_DEBUG)) + return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid or not installed time zone '%s'", z); + +@@ -732,6 +736,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error + if (r < 0) + return r; + ++ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, ++ "Changing system settings via systemd is not supported on NixOS."); ++ + if (lrtc == c->local_rtc) + return sd_bus_reply_method_return(m, NULL); + +@@ -924,6 +931,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error + if (r < 0) + return r; + ++ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, ++ "Changing system settings via systemd is not supported on NixOS."); ++ + r = context_update_ntp_status(c, bus, m); + if (r < 0) + return r; +-- +2.24.1 + diff --git a/pkgs/os-specific/linux/systemd/0011-Fix-hwdb-paths.patch b/pkgs/os-specific/linux/systemd/0011-Fix-hwdb-paths.patch new file mode 100644 index 00000000000..624811f5ea3 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0011-Fix-hwdb-paths.patch @@ -0,0 +1,32 @@ +From 0f434c6baee63eff913f36aee839df3718a75d4a Mon Sep 17 00:00:00 2001 +From: Nikolay Amiantov +Date: Thu, 7 Jul 2016 02:47:13 +0300 +Subject: [PATCH 11/27] Fix hwdb paths + +Patch by vcunat. +--- + src/libsystemd/sd-hwdb/sd-hwdb.c | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/src/libsystemd/sd-hwdb/sd-hwdb.c b/src/libsystemd/sd-hwdb/sd-hwdb.c +index 58124abd21..d80e408b8c 100644 +--- a/src/libsystemd/sd-hwdb/sd-hwdb.c ++++ b/src/libsystemd/sd-hwdb/sd-hwdb.c +@@ -298,13 +298,8 @@ static int trie_search_f(sd_hwdb *hwdb, const char *search) { + } + + static const char hwdb_bin_paths[] = +- "/etc/systemd/hwdb/hwdb.bin\0" + "/etc/udev/hwdb.bin\0" +- "/usr/lib/systemd/hwdb/hwdb.bin\0" +-#if HAVE_SPLIT_USR +- "/lib/systemd/hwdb/hwdb.bin\0" +-#endif +- UDEVLIBEXECDIR "/hwdb.bin\0"; ++ ; + + _public_ int sd_hwdb_new(sd_hwdb **ret) { + _cleanup_(sd_hwdb_unrefp) sd_hwdb *hwdb = NULL; +-- +2.24.1 + diff --git a/pkgs/os-specific/linux/systemd/0012-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch b/pkgs/os-specific/linux/systemd/0012-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch new file mode 100644 index 00000000000..0b14eb7a58b --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0012-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch @@ -0,0 +1,116 @@ +From 76f3fba3031d74647855ce0da2d4e317016cb7d6 Mon Sep 17 00:00:00 2001 +From: Nikolay Amiantov +Date: Tue, 11 Oct 2016 13:12:08 +0300 +Subject: [PATCH 12/27] Change /usr/share/zoneinfo to /etc/zoneinfo + +NixOS uses this path. +--- + man/localtime.xml | 4 ++-- + src/basic/time-util.c | 6 +++--- + src/firstboot/firstboot.c | 2 +- + src/timedate/timedated.c | 8 ++++---- + 4 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/man/localtime.xml b/man/localtime.xml +index 0f1652ee2e..71c4f95c2e 100644 +--- a/man/localtime.xml ++++ b/man/localtime.xml +@@ -20,7 +20,7 @@ + + + +- /etc/localtime -> ../usr/share/zoneinfo/… ++ /etc/localtime -> zoneinfo/… + + + +@@ -30,7 +30,7 @@ + system-wide timezone of the local system that is used by + applications for presentation to the user. It should be an + absolute or relative symbolic link pointing to +- /usr/share/zoneinfo/, followed by a timezone ++ /etc/zoneinfo/, followed by a timezone + identifier such as Europe/Berlin or + Etc/UTC. The resulting link should lead to the + corresponding binary +diff --git a/src/basic/time-util.c b/src/basic/time-util.c +index e14ae8f2f7..a8a3488be1 100644 +--- a/src/basic/time-util.c ++++ b/src/basic/time-util.c +@@ -1215,7 +1215,7 @@ int get_timezones(char ***ret) { + n_allocated = 2; + n_zones = 1; + +- f = fopen("/usr/share/zoneinfo/zone1970.tab", "re"); ++ f = fopen("/etc/zoneinfo/zone1970.tab", "re"); + if (f) { + for (;;) { + _cleanup_free_ char *line = NULL; +@@ -1310,7 +1310,7 @@ bool timezone_is_valid(const char *name, int log_level) { + if (p - name >= PATH_MAX) + return false; + +- t = strjoina("/usr/share/zoneinfo/", name); ++ t = strjoina("/etc/zoneinfo/", name); + + fd = open(t, O_RDONLY|O_CLOEXEC); + if (fd < 0) { +@@ -1408,7 +1408,7 @@ int get_timezone(char **ret) { + if (r < 0) + return r; /* returns EINVAL if not a symlink */ + +- e = PATH_STARTSWITH_SET(t, "/usr/share/zoneinfo/", "../usr/share/zoneinfo/"); ++ e = PATH_STARTSWITH_SET(t, "/etc/zoneinfo/", "../etc/zoneinfo/"); + if (!e) + return -EINVAL; + +diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c +index 528e6452cf..c712ca9072 100644 +--- a/src/firstboot/firstboot.c ++++ b/src/firstboot/firstboot.c +@@ -443,7 +443,7 @@ static int process_timezone(void) { + if (isempty(arg_timezone)) + return 0; + +- e = strjoina("../usr/share/zoneinfo/", arg_timezone); ++ e = strjoina("zoneinfo/", arg_timezone); + + (void) mkdir_parents(etc_localtime, 0755); + if (symlink(e, etc_localtime) < 0) +diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c +index fa20d22cde..8e6dbe1efb 100644 +--- a/src/timedate/timedated.c ++++ b/src/timedate/timedated.c +@@ -265,7 +265,7 @@ static int context_read_data(Context *c) { + + r = get_timezone(&t); + if (r == -EINVAL) +- log_warning_errno(r, "/etc/localtime should be a symbolic link to a time zone data file in /usr/share/zoneinfo/."); ++ log_warning_errno(r, "/etc/localtime should be a symbolic link to a time zone data file in /etc/zoneinfo/."); + else if (r < 0) + log_warning_errno(r, "Failed to get target of /etc/localtime: %m"); + +@@ -289,7 +289,7 @@ static int context_write_data_timezone(Context *c) { + + if (isempty(c->zone) || streq(c->zone, "UTC")) { + +- if (access("/usr/share/zoneinfo/UTC", F_OK) < 0) { ++ if (access("/etc/zoneinfo/UTC", F_OK) < 0) { + + if (unlink("/etc/localtime") < 0 && errno != ENOENT) + return -errno; +@@ -297,9 +297,9 @@ static int context_write_data_timezone(Context *c) { + return 0; + } + +- source = "../usr/share/zoneinfo/UTC"; ++ source = "zoneinfo/UTC"; + } else { +- p = path_join("../usr/share/zoneinfo", c->zone); ++ p = path_join("zoneinfo", c->zone); + if (!p) + return -ENOMEM; + +-- +2.24.1 + diff --git a/pkgs/os-specific/linux/systemd/0013-localectl-use-etc-X11-xkb-for-list-x11.patch b/pkgs/os-specific/linux/systemd/0013-localectl-use-etc-X11-xkb-for-list-x11.patch new file mode 100644 index 00000000000..309ae70881a --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0013-localectl-use-etc-X11-xkb-for-list-x11.patch @@ -0,0 +1,27 @@ +From 5365ffbfba2de03628e8bbb6cc0bc022272436a1 Mon Sep 17 00:00:00 2001 +From: Imuli +Date: Wed, 19 Oct 2016 08:46:47 -0400 +Subject: [PATCH 13/27] localectl: use /etc/X11/xkb for list-x11-* + +NixOS has an option to link the xkb data files to /etc/X11, but not to +/usr/share/X11. +--- + src/locale/localectl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/locale/localectl.c b/src/locale/localectl.c +index 9fb5152110..9554c2cf76 100644 +--- a/src/locale/localectl.c ++++ b/src/locale/localectl.c +@@ -287,7 +287,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) { + } state = NONE, look_for; + int r; + +- f = fopen("/usr/share/X11/xkb/rules/base.lst", "re"); ++ f = fopen("/etc/X11/xkb/rules/base.lst", "re"); + if (!f) + return log_error_errno(errno, "Failed to open keyboard mapping list. %m"); + +-- +2.24.1 + diff --git a/pkgs/os-specific/linux/systemd/0014-catalog-don-t-update-on-install.patch b/pkgs/os-specific/linux/systemd/0014-catalog-don-t-update-on-install.patch new file mode 100644 index 00000000000..4f9f08413e2 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0014-catalog-don-t-update-on-install.patch @@ -0,0 +1,24 @@ +From 8e7aec49a387d8229b85cfc3ea2f2c1c9a45f6d0 Mon Sep 17 00:00:00 2001 +From: Franz Pletz +Date: Wed, 17 Jan 2018 05:10:36 +0100 +Subject: [PATCH 14/27] catalog: don't update on install + +--- + catalog/meson.build | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/catalog/meson.build b/catalog/meson.build +index 3db8e390f2..7004618750 100644 +--- a/catalog/meson.build ++++ b/catalog/meson.build +@@ -28,7 +28,3 @@ foreach file : in_files + install : true, + install_dir : catalogdir) + endforeach +- +-meson.add_install_script('sh', '-c', +- 'test -n "$DESTDIR" || @0@/journalctl --update-catalog' +- .format(rootbindir)) +-- +2.24.1 + diff --git a/pkgs/os-specific/linux/systemd/0015-hwdb-don-t-run-update-on-install.patch b/pkgs/os-specific/linux/systemd/0015-hwdb-don-t-run-update-on-install.patch new file mode 100644 index 00000000000..bf416d90d86 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0015-hwdb-don-t-run-update-on-install.patch @@ -0,0 +1,27 @@ +From 8a383521425d7a59e9b1850d1547d47fa5e8a952 Mon Sep 17 00:00:00 2001 +From: Franz Pletz +Date: Sun, 11 Feb 2018 04:01:35 +0100 +Subject: [PATCH 15/27] hwdb: don't run update on install + +--- + hwdb/meson.build | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/hwdb/meson.build b/hwdb/meson.build +index 31ee3e7409..badf39f555 100644 +--- a/hwdb/meson.build ++++ b/hwdb/meson.build +@@ -27,10 +27,6 @@ if conf.get('ENABLE_HWDB') == 1 + + meson.add_install_script('sh', '-c', + mkdir_p.format(join_paths(sysconfdir, 'udev/hwdb.d'))) +- +- meson.add_install_script('sh', '-c', +- 'test -n "$DESTDIR" || @0@/systemd-hwdb update' +- .format(rootbindir)) + endif + + ############################################################ +-- +2.24.1 + diff --git a/pkgs/os-specific/linux/systemd/0016-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch b/pkgs/os-specific/linux/systemd/0016-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch new file mode 100644 index 00000000000..ed1187473be --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0016-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch @@ -0,0 +1,26 @@ +From 1408762890aba25e58598d1e4dfa17ed2b75de26 Mon Sep 17 00:00:00 2001 +From: Franz Pletz +Date: Sun, 11 Feb 2018 04:37:44 +0100 +Subject: [PATCH 16/27] build: don't create statedir and don't touch prefixdir + +--- + meson.build | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/meson.build b/meson.build +index 8ccc947e37..263cc7189a 100644 +--- a/meson.build ++++ b/meson.build +@@ -2944,9 +2944,6 @@ install_data('LICENSE.GPL2', + 'src/libsystemd/sd-bus/GVARIANT-SERIALIZATION', + install_dir : docdir) + +-meson.add_install_script('sh', '-c', mkdir_p.format(systemdstatedir)) +-meson.add_install_script('sh', '-c', 'touch $DESTDIR@0@'.format(prefixdir)) +- + ############################################################ + + meson_check_help = find_program('tools/meson-check-help.sh') +-- +2.24.1 + diff --git a/pkgs/os-specific/linux/systemd/0017-Fix-mount-option-x-initrd.mount-handling-35268-16.patch b/pkgs/os-specific/linux/systemd/0017-Fix-mount-option-x-initrd.mount-handling-35268-16.patch new file mode 100644 index 00000000000..f4508baae31 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0017-Fix-mount-option-x-initrd.mount-handling-35268-16.patch @@ -0,0 +1,42 @@ +From 39ba82b29fff844f82e745ed7785cbfb397c2908 Mon Sep 17 00:00:00 2001 +From: Timofei Kushnir +Date: Fri, 2 Mar 2018 13:02:53 +0300 +Subject: [PATCH 17/27] Fix mount option `x-initrd.mount` handling (#35268) + (#16) + +--- + src/core/mount.c | 18 ++++-------------- + 1 file changed, 4 insertions(+), 14 deletions(-) + +diff --git a/src/core/mount.c b/src/core/mount.c +index 5e4c4a9767..6bc3569550 100644 +--- a/src/core/mount.c ++++ b/src/core/mount.c +@@ -441,20 +441,10 @@ static int mount_add_default_dependencies(Mount *m) { + if (!UNIT(m)->default_dependencies) + return 0; + +- if (!MANAGER_IS_SYSTEM(UNIT(m)->manager)) +- return 0; +- +- /* We do not add any default dependencies to /, /usr or +- * /run/initramfs/, since they are guaranteed to stay +- * mounted the whole time, since our system is on it. +- * Also, don't bother with anything mounted below virtual +- * file systems, it's also going to be virtual, and hence +- * not worth the effort. */ +- if (PATH_IN_SET(m->where, "/", "/usr", "/nix", "/nix/store") || +- path_startswith(m->where, "/run/initramfs") || +- path_startswith(m->where, "/proc") || +- path_startswith(m->where, "/sys") || +- path_startswith(m->where, "/dev")) ++ /* We do not add any default dependencies to /, /usr or /run/initramfs/, since they are guaranteed to stay ++ * mounted the whole time, since our system is on it. Also, don't bother with anything mounted below virtual ++ * file systems, it's also going to be virtual, and hence not worth the effort. */ ++ if (mount_is_extrinsic(m)) + return 0; + + p = get_mount_parameters(m); +-- +2.24.1 + diff --git a/pkgs/os-specific/linux/systemd/0018-Install-default-configuration-into-out-share-factory.patch b/pkgs/os-specific/linux/systemd/0018-Install-default-configuration-into-out-share-factory.patch new file mode 100644 index 00000000000..980d9f35461 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0018-Install-default-configuration-into-out-share-factory.patch @@ -0,0 +1,313 @@ +From a087cb535b2d3c7a5d989b5aabc0a257369e9f9d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= +Date: Mon, 26 Feb 2018 14:25:57 +0000 +Subject: [PATCH 18/27] Install default configuration into $out/share/factory + +By default systemd should read all its configuration from /etc. Therefor +we rely on -Dsysconfdir=/etc in meson as default value. Unfortunately +this would also lead to installation of systemd's own configuration +files to `/etc` whereas we are limited to /nix/store. To counter that +this commit introduces two new configuration variables `factoryconfdir` +and `factorypkgconfdir` to install systemd's own configuration into nix +store again, while having executables looking up files in /etc. +--- + hwdb/meson.build | 2 +- + meson.build | 11 +++++++---- + network/meson.build | 2 +- + src/core/meson.build | 10 +++++----- + src/coredump/meson.build | 2 +- + src/journal-remote/meson.build | 4 ++-- + src/journal/meson.build | 2 +- + src/kernel-install/meson.build | 2 +- + src/login/meson.build | 2 +- + src/network/meson.build | 2 +- + src/pstore/meson.build | 2 +- + src/resolve/meson.build | 2 +- + src/timesync/meson.build | 2 +- + src/udev/meson.build | 4 ++-- + sysctl.d/meson.build | 2 +- + tmpfiles.d/meson.build | 2 +- + units/meson.build | 3 ++- + 17 files changed, 30 insertions(+), 26 deletions(-) + +diff --git a/hwdb/meson.build b/hwdb/meson.build +index badf39f555..8fd9c7639f 100644 +--- a/hwdb/meson.build ++++ b/hwdb/meson.build +@@ -26,7 +26,7 @@ if conf.get('ENABLE_HWDB') == 1 + install_dir : udevhwdbdir) + + meson.add_install_script('sh', '-c', +- mkdir_p.format(join_paths(sysconfdir, 'udev/hwdb.d'))) ++ mkdir_p.format(join_paths(factoryconfdir, 'udev/hwdb.d'))) + endif + + ############################################################ +diff --git a/meson.build b/meson.build +index 263cc7189a..7a67078208 100644 +--- a/meson.build ++++ b/meson.build +@@ -151,6 +151,9 @@ udevhwdbdir = join_paths(udevlibexecdir, 'hwdb.d') + catalogdir = join_paths(prefixdir, 'lib/systemd/catalog') + kernelinstalldir = join_paths(prefixdir, 'lib/kernel/install.d') + factorydir = join_paths(datadir, 'factory') ++factoryconfdir = join_paths(datadir, 'factory/etc') ++factorypkgconfdir = join_paths(datadir, 'factory/etc/systemd') ++factoryxinitrcdir = join_paths(datadir, 'factory/etc/X11/xinit/xinitrc.d') + bootlibdir = join_paths(prefixdir, 'lib/systemd/boot/efi') + testsdir = join_paths(prefixdir, 'lib/systemd/tests') + systemdstatedir = join_paths(localstatedir, 'lib/systemd') +@@ -2287,7 +2290,7 @@ if conf.get('ENABLE_BINFMT') == 1 + meson.add_install_script('sh', '-c', + mkdir_p.format(binfmtdir)) + meson.add_install_script('sh', '-c', +- mkdir_p.format(join_paths(sysconfdir, 'binfmt.d'))) ++ mkdir_p.format(join_paths(factoryconfdir, 'binfmt.d'))) + endif + + if conf.get('ENABLE_VCONSOLE') == 1 +@@ -2373,7 +2376,7 @@ executable('systemd-sleep', + install_dir : rootlibexecdir) + + install_data('src/sleep/sleep.conf', +- install_dir : pkgsysconfdir) ++ install_dir : factorypkgconfdir) + + exe = executable('systemd-sysctl', + 'src/sysctl/sysctl.c', +@@ -2685,7 +2688,7 @@ if conf.get('HAVE_KMOD') == 1 + meson.add_install_script('sh', '-c', + mkdir_p.format(modulesloaddir)) + meson.add_install_script('sh', '-c', +- mkdir_p.format(join_paths(sysconfdir, 'modules-load.d'))) ++ mkdir_p.format(join_paths(factoryconfdir, 'modules-load.d'))) + endif + + exe = executable('systemd-nspawn', +@@ -2927,7 +2930,7 @@ install_subdir('factory/etc', + install_dir : factorydir) + + install_data('xorg/50-systemd-user.sh', +- install_dir : xinitrcdir) ++ install_dir : factoryxinitrcdir) + install_data('modprobe.d/systemd.conf', + install_dir : modprobedir) + install_data('LICENSE.GPL2', +diff --git a/network/meson.build b/network/meson.build +index 59d4be1a17..72da2c16a2 100644 +--- a/network/meson.build ++++ b/network/meson.build +@@ -7,7 +7,7 @@ if conf.get('ENABLE_NETWORKD') == 1 + install_dir : networkdir) + + meson.add_install_script('sh', '-c', +- mkdir_p.format(join_paths(sysconfdir, 'systemd/network'))) ++ mkdir_p.format(join_paths(factoryconfdir, 'systemd/network'))) + endif + + install_data('99-default.link', +diff --git a/src/core/meson.build b/src/core/meson.build +index df3aa5c6c1..305f67a80a 100644 +--- a/src/core/meson.build ++++ b/src/core/meson.build +@@ -179,8 +179,8 @@ libcore = static_library( + systemd_sources = files('main.c') + + in_files = [['macros.systemd', rpmmacrosdir], +- ['system.conf', pkgsysconfdir], +- ['user.conf', pkgsysconfdir], ++ ['system.conf', factorypkgconfdir], ++ ['user.conf', factorypkgconfdir], + ['systemd.pc', pkgconfigdatadir], + ['triggers.systemd', '']] + +@@ -210,6 +210,6 @@ meson.add_install_script('sh', '-c', mkdir_p.format(systemsleepdir)) + meson.add_install_script('sh', '-c', mkdir_p.format(systemgeneratordir)) + meson.add_install_script('sh', '-c', mkdir_p.format(usergeneratordir)) + +-meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(pkgsysconfdir, 'system'))) +-meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(pkgsysconfdir, 'user'))) +-meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(sysconfdir, 'xdg/systemd'))) ++meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(factorypkgconfdir, 'system'))) ++meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(factorypkgconfdir, 'user'))) ++meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(factorypkgconfdir, 'xdg/systemd'))) +diff --git a/src/coredump/meson.build b/src/coredump/meson.build +index 7fa5942697..34c865dfa0 100644 +--- a/src/coredump/meson.build ++++ b/src/coredump/meson.build +@@ -15,7 +15,7 @@ coredumpctl_sources = files('coredumpctl.c') + + if conf.get('ENABLE_COREDUMP') == 1 + install_data('coredump.conf', +- install_dir : pkgsysconfdir) ++ install_dir : factorypkgconfdir) + endif + + tests += [ +diff --git a/src/journal-remote/meson.build b/src/journal-remote/meson.build +index 87b8ba6495..daff8ec967 100644 +--- a/src/journal-remote/meson.build ++++ b/src/journal-remote/meson.build +@@ -49,7 +49,7 @@ if conf.get('ENABLE_REMOTE') ==1 and conf.get('HAVE_LIBCURL') == 1 + output : 'journal-upload.conf', + configuration : substs) + install_data(journal_upload_conf, +- install_dir : pkgsysconfdir) ++ install_dir : factorypkgconfdir) + endif + + if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1 +@@ -58,7 +58,7 @@ if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1 + output : 'journal-remote.conf', + configuration : substs) + install_data(journal_remote_conf, +- install_dir : pkgsysconfdir) ++ install_dir : factorypkgconfdir) + + install_data('browse.html', + install_dir : join_paths(pkgdatadir, 'gatewayd')) +diff --git a/src/journal/meson.build b/src/journal/meson.build +index 5796f77cac..75d975c260 100644 +--- a/src/journal/meson.build ++++ b/src/journal/meson.build +@@ -109,7 +109,7 @@ if conf.get('HAVE_QRENCODE') == 1 + endif + + install_data('journald.conf', +- install_dir : pkgsysconfdir) ++ install_dir : factorypkgconfdir) + + if get_option('create-log-dirs') + meson.add_install_script( +diff --git a/src/kernel-install/meson.build b/src/kernel-install/meson.build +index 261c3aaae4..dbc5e23513 100644 +--- a/src/kernel-install/meson.build ++++ b/src/kernel-install/meson.build +@@ -11,4 +11,4 @@ install_data('00-entry-directory.install', + install_dir : kernelinstalldir) + + meson.add_install_script('sh', '-c', +- mkdir_p.format(join_paths(sysconfdir, 'kernel/install.d'))) ++ mkdir_p.format(join_paths(factoryconfdir, 'kernel/install.d'))) +diff --git a/src/login/meson.build b/src/login/meson.build +index 0a7d3d5440..ff90149c1c 100644 +--- a/src/login/meson.build ++++ b/src/login/meson.build +@@ -75,7 +75,7 @@ if conf.get('ENABLE_LOGIND') == 1 + output : 'logind.conf', + configuration : substs) + install_data(logind_conf, +- install_dir : pkgsysconfdir) ++ install_dir : factorypkgconfdir) + + install_data('org.freedesktop.login1.conf', + install_dir : dbuspolicydir) +diff --git a/src/network/meson.build b/src/network/meson.build +index 6bed37a170..35f15bcaf1 100644 +--- a/src/network/meson.build ++++ b/src/network/meson.build +@@ -168,7 +168,7 @@ if conf.get('ENABLE_NETWORKD') == 1 + endif + + install_data('networkd.conf', +- install_dir : pkgsysconfdir) ++ install_dir : factorypkgconfdir) + + fuzzers += [ + [['src/network/fuzz-netdev-parser.c', +diff --git a/src/pstore/meson.build b/src/pstore/meson.build +index adbac24b54..e9dc88dfa2 100644 +--- a/src/pstore/meson.build ++++ b/src/pstore/meson.build +@@ -6,5 +6,5 @@ systemd_pstore_sources = files(''' + + if conf.get('ENABLE_PSTORE') == 1 + install_data('pstore.conf', +- install_dir : pkgsysconfdir) ++ install_dir : factorypkgconfdir) + endif +diff --git a/src/resolve/meson.build b/src/resolve/meson.build +index 92b67b6333..ac5b9a0b0a 100644 +--- a/src/resolve/meson.build ++++ b/src/resolve/meson.build +@@ -168,7 +168,7 @@ if conf.get('ENABLE_RESOLVE') == 1 + output : 'resolved.conf', + configuration : substs) + install_data(resolved_conf, +- install_dir : pkgsysconfdir) ++ install_dir : factorypkgconfdir) + + install_data('resolv.conf', + install_dir : rootlibexecdir) +diff --git a/src/timesync/meson.build b/src/timesync/meson.build +index e5c118c8db..19235df9ca 100644 +--- a/src/timesync/meson.build ++++ b/src/timesync/meson.build +@@ -27,7 +27,7 @@ if conf.get('ENABLE_TIMESYNCD') == 1 + output : 'timesyncd.conf', + configuration : substs) + install_data(timesyncd_conf, +- install_dir : pkgsysconfdir) ++ install_dir : factorypkgconfdir) + install_data('org.freedesktop.timesync1.conf', + install_dir : dbuspolicydir) + install_data('org.freedesktop.timesync1.service', +diff --git a/src/udev/meson.build b/src/udev/meson.build +index 511fe428b9..32333efea6 100644 +--- a/src/udev/meson.build ++++ b/src/udev/meson.build +@@ -186,7 +186,7 @@ foreach prog : [['ata_id/ata_id.c'], + endforeach + + install_data('udev.conf', +- install_dir : join_paths(sysconfdir, 'udev')) ++ install_dir : join_paths(factoryconfdir, 'udev')) + + configure_file( + input : 'udev.pc.in', +@@ -195,7 +195,7 @@ configure_file( + install_dir : pkgconfigdatadir == 'no' ? '' : pkgconfigdatadir) + + meson.add_install_script('sh', '-c', +- mkdir_p.format(join_paths(sysconfdir, 'udev/rules.d'))) ++ mkdir_p.format(join_paths(factoryconfdir, 'udev/rules.d'))) + + fuzzers += [ + [['src/udev/net/fuzz-link-parser.c', +diff --git a/sysctl.d/meson.build b/sysctl.d/meson.build +index 3f072e3db7..bd9f843eba 100644 +--- a/sysctl.d/meson.build ++++ b/sysctl.d/meson.build +@@ -27,4 +27,4 @@ foreach file : in_files + endforeach + + meson.add_install_script('sh', '-c', +- mkdir_p.format(join_paths(sysconfdir, 'sysctl.d'))) ++ mkdir_p.format(join_paths(factoryconfdir, 'sysctl.d'))) +diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build +index e77f46d06b..04d2ef621d 100644 +--- a/tmpfiles.d/meson.build ++++ b/tmpfiles.d/meson.build +@@ -57,5 +57,5 @@ endforeach + if enable_tmpfiles + meson.add_install_script( + 'sh', '-c', +- mkdir_p.format(join_paths(sysconfdir, 'tmpfiles.d'))) ++ mkdir_p.format(join_paths(factoryconfdir, 'tmpfiles.d'))) + endif +diff --git a/units/meson.build b/units/meson.build +index 476991edba..3d9dc6e1c8 100644 +--- a/units/meson.build ++++ b/units/meson.build +@@ -308,7 +308,7 @@ install_data('user-.slice.d/10-defaults.conf', + + meson.add_install_script(meson_make_symlink, + join_paths(pkgsysconfdir, 'user'), +- join_paths(sysconfdir, 'xdg/systemd/user')) ++ join_paths(factorypkgconfdir, 'xdg/systemd/user')) + meson.add_install_script(meson_make_symlink, + join_paths(dbussystemservicedir, 'org.freedesktop.systemd1.service'), + join_paths(dbussessionservicedir, 'org.freedesktop.systemd1.service')) +-- +2.24.1 + diff --git a/pkgs/os-specific/linux/systemd/0019-inherit-systemd-environment-when-calling-generators.patch b/pkgs/os-specific/linux/systemd/0019-inherit-systemd-environment-when-calling-generators.patch new file mode 100644 index 00000000000..f4f1e6d37b5 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0019-inherit-systemd-environment-when-calling-generators.patch @@ -0,0 +1,42 @@ +From 3eb1716dd80c245a2883da04156af79fb9097519 Mon Sep 17 00:00:00 2001 +From: Andreas Rammhold +Date: Fri, 2 Nov 2018 21:15:42 +0100 +Subject: [PATCH 19/27] inherit systemd environment when calling generators. + +Systemd generators need access to the environment configured in +stage-2-init.sh since it schedules fsck and mkfs executions based on +being able to find an appropriate binary for the target filesystem. + +With this commit I am altering the systemd behaviour since upstream +tries to gather environments with that they call +"environment-generators" and then seems to pass that on to all the other +executables that are being called from managers. +--- + src/core/manager.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/src/core/manager.c b/src/core/manager.c +index d9114bb0c5..22c3b6ff76 100644 +--- a/src/core/manager.c ++++ b/src/core/manager.c +@@ -3868,9 +3868,14 @@ static int manager_run_generators(Manager *m) { + argv[4] = NULL; + + RUN_WITH_UMASK(0022) +- (void) execute_directories((const char* const*) paths, DEFAULT_TIMEOUT_USEC, NULL, NULL, +- (char**) argv, m->transient_environment, EXEC_DIR_PARALLEL | EXEC_DIR_IGNORE_ERRORS); +- ++ (void) execute_directories((const char* const*) paths, DEFAULT_TIMEOUT_USEC, ++ // On NixOS we must propagate PATH to generators so they are ++ // able to find binaries such as `fsck.${fstype}` and ++ // `mkfs.${fstype}`. That is why the last argument of the ++ // function (envp) is set to NULL. This propagates systemd's ++ // environment (e.g. PATH) that was setup ++ // before calling systemd from stage-2-init.sh. ++ NULL, NULL, (char**) argv, /* NixOS: use inherited env */ NULL, EXEC_DIR_PARALLEL | EXEC_DIR_IGNORE_ERRORS); + r = 0; + + finish: +-- +2.24.1 + diff --git a/pkgs/os-specific/linux/systemd/0020-reintroduce-the-no-such-path-PATH-that-was-dropped-s.patch b/pkgs/os-specific/linux/systemd/0020-reintroduce-the-no-such-path-PATH-that-was-dropped-s.patch new file mode 100644 index 00000000000..63d694c2daa --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0020-reintroduce-the-no-such-path-PATH-that-was-dropped-s.patch @@ -0,0 +1,41 @@ +From 95c4e1ffd2249a52ca02e4fbe46aa4e51c5abd17 Mon Sep 17 00:00:00 2001 +From: Andreas Rammhold +Date: Fri, 2 Nov 2018 20:56:49 +0100 +Subject: [PATCH 20/27] reintroduce the /no-such-path PATH that was dropped + some versions ago + +Originally eelco set the DEFAULT_PATH_NORMAL to "/no-such-path" since we +do not need that in NixOS and usually refer to all our executables with +an absolute path. This commit reintroduces this change. +--- + src/basic/path-util.h | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/src/basic/path-util.h b/src/basic/path-util.h +index 71fb7041a3..b856e782a8 100644 +--- a/src/basic/path-util.h ++++ b/src/basic/path-util.h +@@ -28,13 +28,13 @@ + # define PATH_SBIN_BIN_NULSTR(x) PATH_NORMAL_SBIN_BIN_NULSTR(x) + #endif + +-#define DEFAULT_PATH_NORMAL PATH_SBIN_BIN("/usr/local/") ":" PATH_SBIN_BIN("/usr/") +-#define DEFAULT_USER_PATH_NORMAL PATH_BIN_SBIN("/usr/local/") ":" PATH_BIN_SBIN("/usr/") +-#define DEFAULT_PATH_NORMAL_NULSTR PATH_SBIN_BIN_NULSTR("/usr/local/") PATH_SBIN_BIN_NULSTR("/usr/") +-#define DEFAULT_PATH_SPLIT_USR DEFAULT_PATH_NORMAL ":" PATH_SBIN_BIN("/") +-#define DEFAULT_USER_PATH_SPLIT_USR DEFAULT_PATH_NORMAL ":" PATH_BIN_SBIN("/") +-#define DEFAULT_PATH_SPLIT_USR_NULSTR DEFAULT_PATH_NORMAL_NULSTR PATH_SBIN_BIN_NULSTR("/") +-#define DEFAULT_PATH_COMPAT PATH_SPLIT_SBIN_BIN("/usr/local/") ":" PATH_SPLIT_SBIN_BIN("/usr/") ":" PATH_SPLIT_SBIN_BIN("/") ++#define DEFAULT_PATH_NORMAL "/no-such-path" ++#define DEFAULT_USER_PATH_NORMAL "/no-such-path" ++#define DEFAULT_PATH_NORMAL_NULSTR "/no-such-path\0" ++#define DEFAULT_PATH_SPLIT_USR DEFAULT_PATH_NORMAL ++#define DEFAULT_USER_PATH_SPLIT_USR DEFAULT_PATH_NORMAL DEFAULT_PATH_NORMAL ++#define DEFAULT_PATH_SPLIT_USR_NULSTR DEFAULT_PATH_NORMAL_NULSTR ++#define DEFAULT_PATH_COMPAT DEFAULT_PATH_NORMAL + + #if HAVE_SPLIT_USR + # define DEFAULT_PATH DEFAULT_PATH_SPLIT_USR +-- +2.24.1 + diff --git a/pkgs/os-specific/linux/systemd/0021-add-rootprefix-to-lookup-dir-paths.patch b/pkgs/os-specific/linux/systemd/0021-add-rootprefix-to-lookup-dir-paths.patch new file mode 100644 index 00000000000..39bbe7e9dac --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0021-add-rootprefix-to-lookup-dir-paths.patch @@ -0,0 +1,38 @@ +From 8d1618a97ad08078815f409f03b45aff3ae6bd0a Mon Sep 17 00:00:00 2001 +From: Andreas Rammhold +Date: Thu, 9 May 2019 11:15:22 +0200 +Subject: [PATCH 21/27] add rootprefix to lookup dir paths + +systemd does not longer use the UDEVLIBEXEC directory as root for +discovery default udev rules. By adding `$out/lib` to the lookup paths +we should again be able to discover the udev rules amongst other default +files that I might have missed. +--- + src/basic/def.h | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/basic/def.h b/src/basic/def.h +index 2af0b763f0..17959b07e8 100644 +--- a/src/basic/def.h ++++ b/src/basic/def.h +@@ -39,13 +39,15 @@ + "/run/" n "\0" \ + "/usr/local/lib/" n "\0" \ + "/usr/lib/" n "\0" \ +- _CONF_PATHS_SPLIT_USR_NULSTR(n) ++ _CONF_PATHS_SPLIT_USR_NULSTR(n) \ ++ ROOTPREFIX "/lib/" n "\0" + + #define CONF_PATHS_USR(n) \ + "/etc/" n, \ + "/run/" n, \ + "/usr/local/lib/" n, \ +- "/usr/lib/" n ++ "/usr/lib/" n, \ ++ ROOTPREFIX "/lib/" n + + #define CONF_PATHS(n) \ + CONF_PATHS_USR(n) \ +-- +2.24.1 + diff --git a/pkgs/os-specific/linux/systemd/0022-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch b/pkgs/os-specific/linux/systemd/0022-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch new file mode 100644 index 00000000000..9f0ea254890 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0022-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch @@ -0,0 +1,27 @@ +From 859c16c52cdd61ec99d256bf5b35637d59e5dac9 Mon Sep 17 00:00:00 2001 +From: Nikolay Amiantov +Date: Thu, 25 Jul 2019 20:45:55 +0300 +Subject: [PATCH 22/27] systemd-shutdown: execute scripts in + /etc/systemd/system-shutdown + +This is needed for NixOS to use such scripts as systemd directory is immutable. +--- + src/shutdown/shutdown.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c +index 0eb17989d0..93e619c58a 100644 +--- a/src/shutdown/shutdown.c ++++ b/src/shutdown/shutdown.c +@@ -299,7 +299,7 @@ int main(int argc, char *argv[]) { + _cleanup_free_ char *cgroup = NULL; + char *arguments[3], *watchdog_device; + int cmd, r, umount_log_level = LOG_INFO; +- static const char* const dirs[] = {SYSTEM_SHUTDOWN_PATH, NULL}; ++ static const char* const dirs[] = {SYSTEM_SHUTDOWN_PATH, "/etc/systemd/system-shutdown", NULL}; + + /* The log target defaults to console, but the original systemd process will pass its log target in through a + * command line argument, which will override this default. Also, ensure we'll never log to the journal or +-- +2.24.1 + diff --git a/pkgs/os-specific/linux/systemd/0023-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch b/pkgs/os-specific/linux/systemd/0023-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch new file mode 100644 index 00000000000..e8aa5cf2271 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0023-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch @@ -0,0 +1,26 @@ +From 9be689d5243d0c78bec7b285774c58749da08c9c Mon Sep 17 00:00:00 2001 +From: Nikolay Amiantov +Date: Thu, 25 Jul 2019 20:46:58 +0300 +Subject: [PATCH 23/27] systemd-sleep: execute scripts in + /etc/systemd/system-sleep + +This is needed for NixOS to use such scripts as systemd directory is immutable. +--- + src/sleep/sleep.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c +index b9fe96635d..f1c3ca06a3 100644 +--- a/src/sleep/sleep.c ++++ b/src/sleep/sleep.c +@@ -191,6 +191,7 @@ static int execute(char **modes, char **states) { + }; + static const char* const dirs[] = { + SYSTEM_SLEEP_PATH, ++ "/etc/systemd/system-sleep", + NULL + }; + +-- +2.24.1 + diff --git a/pkgs/os-specific/linux/systemd/0024-Revert-sysinit.target-Drop-the-dependency-on-local-f.patch b/pkgs/os-specific/linux/systemd/0024-Revert-sysinit.target-Drop-the-dependency-on-local-f.patch new file mode 100644 index 00000000000..e24c362ffbd --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0024-Revert-sysinit.target-Drop-the-dependency-on-local-f.patch @@ -0,0 +1,27 @@ +From d8566028d5e71612d011ff06bb9f4d03d1391e8e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= +Date: Sun, 22 Sep 2019 21:06:54 +0100 +Subject: [PATCH 24/27] Revert "sysinit.target: Drop the dependency on + local-fs.target and swap.target" + +This reverts commit 5b0b3d004beb45687347ad01fa3b99635d1bdd92. + +We removed that patch in our 242 branch, but somehow it landed in 243 back again. +--- + units/sysinit.target | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/units/sysinit.target b/units/sysinit.target +index 5fe9ad0ec9..b6c16a1412 100644 +--- a/units/sysinit.target ++++ b/units/sysinit.target +@@ -11,4 +11,5 @@ + Description=System Initialization + Documentation=man:systemd.special(7) + Conflicts=emergency.service emergency.target +-After=emergency.service emergency.target ++Wants=local-fs.target swap.target ++After=local-fs.target swap.target emergency.service emergency.target +-- +2.24.1 + diff --git a/pkgs/os-specific/linux/systemd/0027-Start-getty-on-lxc.patch b/pkgs/os-specific/linux/systemd/0027-Start-getty-on-lxc.patch new file mode 100644 index 00000000000..4c2777d3f03 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0027-Start-getty-on-lxc.patch @@ -0,0 +1,27 @@ +From f3a6f3056e69808ebbc7e72b1d03b85c750a3cae Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra +Date: Wed, 16 Apr 2014 00:35:14 +0200 +Subject: [PATCH 27/27] Start getty on lxc + +--- + units/getty@.service.m4 | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/units/getty@.service.m4 b/units/getty@.service.m4 +index 80e793bb73..0daba10f2a 100644 +--- a/units/getty@.service.m4 ++++ b/units/getty@.service.m4 +@@ -31,7 +31,9 @@ Before=rescue.service + # On systems without virtual consoles, don't start any getty. Note + # that serial gettys are covered by serial-getty@.service, not this + # unit. +-ConditionPathExists=/dev/tty0 ++ConditionPathExists=|/dev/tty0 ++ConditionVirtualization=|lxc ++ConditionVirtualization=|lxc-libvirt + + [Service] + # the VT is cleared by TTYVTDisallocate +-- +2.24.1 + diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 1dd2f30b9bf..13752f3bbe2 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -36,12 +36,40 @@ in stdenv.mkDerivation { # When updating, use https://github.com/systemd/systemd-stable tree, not the development one! # Also fresh patches should be cherry-picked from that tree to our current one. src = fetchFromGitHub { - owner = "nixos"; - repo = "systemd"; - rev = "e7d881488292fc8bdf96acd12767eca1bd65adae"; - sha256 = "0haj3iff3y13pm4w5dbqj1drp5wryqfad58jbbmnb6zdgis56h8f"; + owner = "systemd"; + repo = "systemd-stable"; + rev = "f8dd0f2f15a566ede668c59e3c810c61f9d62c51"; + sha256 = "1alvvciddg36by1bgzi8aarnms4crzqqyizj3nhlddh35pgpwvdk"; }; + patches = [ + ./0001-Start-device-units-for-uninitialised-encrypted-devic.patch + ./0002-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch + ./0003-Don-t-try-to-unmount-nix-or-nix-store.patch + ./0004-Fix-NixOS-containers.patch + ./0005-kmod-static-nodes.service-Don-t-require-lib-modules.patch + ./0006-Look-for-fsck-in-the-right-place.patch + ./0007-Add-some-NixOS-specific-unit-directories.patch + ./0008-Don-t-try-to-unmount-nix-or-nix-store.patch + ./0009-Get-rid-of-a-useless-message-in-user-sessions.patch + ./0010-hostnamed-localed-timedated-disable-methods-that-cha.patch + ./0011-Fix-hwdb-paths.patch + ./0012-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch + ./0013-localectl-use-etc-X11-xkb-for-list-x11.patch + ./0014-catalog-don-t-update-on-install.patch + ./0015-hwdb-don-t-run-update-on-install.patch + ./0016-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch + ./0017-Fix-mount-option-x-initrd.mount-handling-35268-16.patch + ./0018-Install-default-configuration-into-out-share-factory.patch + ./0019-inherit-systemd-environment-when-calling-generators.patch + ./0020-reintroduce-the-no-such-path-PATH-that-was-dropped-s.patch + ./0021-add-rootprefix-to-lookup-dir-paths.patch + ./0022-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch + ./0023-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch + ./0024-Revert-sysinit.target-Drop-the-dependency-on-local-f.patch + ./0027-Start-getty-on-lxc.patch + ]; + outputs = [ "out" "lib" "man" "dev" ]; nativeBuildInputs = -- cgit v1.2.3 From 22bb3a6771cffbc9c8b2044cb01fe9f654c82bb5 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 26 Jan 2020 15:00:22 +0100 Subject: systemd: remove local-fs patch and revert of it --- ...get-Drop-the-dependency-on-local-fs.targe.patch | 32 ---------------------- ...nit.target-Drop-the-dependency-on-local-f.patch | 27 ------------------ pkgs/os-specific/linux/systemd/default.nix | 2 -- 3 files changed, 61 deletions(-) delete mode 100644 pkgs/os-specific/linux/systemd/0002-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch delete mode 100644 pkgs/os-specific/linux/systemd/0024-Revert-sysinit.target-Drop-the-dependency-on-local-f.patch diff --git a/pkgs/os-specific/linux/systemd/0002-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch b/pkgs/os-specific/linux/systemd/0002-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch deleted file mode 100644 index 6dfd150d325..00000000000 --- a/pkgs/os-specific/linux/systemd/0002-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4e0c6f33ebf49a78abec28d2f4044afb5b8719af Mon Sep 17 00:00:00 2001 -From: Eelco Dolstra -Date: Tue, 8 Jan 2013 15:56:03 +0100 -Subject: [PATCH 02/27] sysinit.target: Drop the dependency on local-fs.target - and swap.target - -Having all services with DefaultDependencies=yes depend on -local-fs.target is annoying, because some of those services might be -necessary to mount local filesystems. For instance, Charon's -send-keys feature requires sshd to be running in order to receive LUKS -encryption keys, which in turn requires dhcpcd, and so on. So we drop -this dependency (and swap.target as well for consistency). If -services require a specific mount, they should use RequiresMountsFor -in any case. ---- - units/sysinit.target | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/units/sysinit.target b/units/sysinit.target -index b6c16a1412..5fe9ad0ec9 100644 ---- a/units/sysinit.target -+++ b/units/sysinit.target -@@ -11,5 +11,4 @@ - Description=System Initialization - Documentation=man:systemd.special(7) - Conflicts=emergency.service emergency.target --Wants=local-fs.target swap.target --After=local-fs.target swap.target emergency.service emergency.target -+After=emergency.service emergency.target --- -2.24.1 - diff --git a/pkgs/os-specific/linux/systemd/0024-Revert-sysinit.target-Drop-the-dependency-on-local-f.patch b/pkgs/os-specific/linux/systemd/0024-Revert-sysinit.target-Drop-the-dependency-on-local-f.patch deleted file mode 100644 index e24c362ffbd..00000000000 --- a/pkgs/os-specific/linux/systemd/0024-Revert-sysinit.target-Drop-the-dependency-on-local-f.patch +++ /dev/null @@ -1,27 +0,0 @@ -From d8566028d5e71612d011ff06bb9f4d03d1391e8e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= -Date: Sun, 22 Sep 2019 21:06:54 +0100 -Subject: [PATCH 24/27] Revert "sysinit.target: Drop the dependency on - local-fs.target and swap.target" - -This reverts commit 5b0b3d004beb45687347ad01fa3b99635d1bdd92. - -We removed that patch in our 242 branch, but somehow it landed in 243 back again. ---- - units/sysinit.target | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/units/sysinit.target b/units/sysinit.target -index 5fe9ad0ec9..b6c16a1412 100644 ---- a/units/sysinit.target -+++ b/units/sysinit.target -@@ -11,4 +11,5 @@ - Description=System Initialization - Documentation=man:systemd.special(7) - Conflicts=emergency.service emergency.target --After=emergency.service emergency.target -+Wants=local-fs.target swap.target -+After=local-fs.target swap.target emergency.service emergency.target --- -2.24.1 - diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 13752f3bbe2..7f43fa37b54 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -44,7 +44,6 @@ in stdenv.mkDerivation { patches = [ ./0001-Start-device-units-for-uninitialised-encrypted-devic.patch - ./0002-sysinit.target-Drop-the-dependency-on-local-fs.targe.patch ./0003-Don-t-try-to-unmount-nix-or-nix-store.patch ./0004-Fix-NixOS-containers.patch ./0005-kmod-static-nodes.service-Don-t-require-lib-modules.patch @@ -66,7 +65,6 @@ in stdenv.mkDerivation { ./0021-add-rootprefix-to-lookup-dir-paths.patch ./0022-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch ./0023-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch - ./0024-Revert-sysinit.target-Drop-the-dependency-on-local-f.patch ./0027-Start-getty-on-lxc.patch ]; -- cgit v1.2.3 From 1ad4accdafd29bd998f121dbda8f9c4e3df090b0 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 26 Jan 2020 15:10:34 +0100 Subject: systemd: drop 0027-Start-getty-on-lxc.patch Since quite some time, systemd starts getty on these consoles automatically. --- .../linux/systemd/0027-Start-getty-on-lxc.patch | 27 ---------------------- pkgs/os-specific/linux/systemd/default.nix | 1 - 2 files changed, 28 deletions(-) delete mode 100644 pkgs/os-specific/linux/systemd/0027-Start-getty-on-lxc.patch diff --git a/pkgs/os-specific/linux/systemd/0027-Start-getty-on-lxc.patch b/pkgs/os-specific/linux/systemd/0027-Start-getty-on-lxc.patch deleted file mode 100644 index 4c2777d3f03..00000000000 --- a/pkgs/os-specific/linux/systemd/0027-Start-getty-on-lxc.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f3a6f3056e69808ebbc7e72b1d03b85c750a3cae Mon Sep 17 00:00:00 2001 -From: Eelco Dolstra -Date: Wed, 16 Apr 2014 00:35:14 +0200 -Subject: [PATCH 27/27] Start getty on lxc - ---- - units/getty@.service.m4 | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/units/getty@.service.m4 b/units/getty@.service.m4 -index 80e793bb73..0daba10f2a 100644 ---- a/units/getty@.service.m4 -+++ b/units/getty@.service.m4 -@@ -31,7 +31,9 @@ Before=rescue.service - # On systems without virtual consoles, don't start any getty. Note - # that serial gettys are covered by serial-getty@.service, not this - # unit. --ConditionPathExists=/dev/tty0 -+ConditionPathExists=|/dev/tty0 -+ConditionVirtualization=|lxc -+ConditionVirtualization=|lxc-libvirt - - [Service] - # the VT is cleared by TTYVTDisallocate --- -2.24.1 - diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 7f43fa37b54..b8693678566 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -65,7 +65,6 @@ in stdenv.mkDerivation { ./0021-add-rootprefix-to-lookup-dir-paths.patch ./0022-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch ./0023-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch - ./0027-Start-getty-on-lxc.patch ]; outputs = [ "out" "lib" "man" "dev" ]; -- cgit v1.2.3 From a16ebf856126bb93bc0a2aa091eb4403e781cd33 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 26 Jan 2020 16:15:19 +0100 Subject: systemd: drop 001{4,5}-{catalog,hwdb}-don-t-update-on-install.patch These patches removed logic in the meson install phase invoking `journalctl --update-catalog` and `systemd-hwdb update`, which would mutate the running system, and obviously fails in the sandbox. Upstream also knows this is a bad thing if you're not on the machine you want to deploy to, so there's logic in there to not execute it when DESTDIR isn't empty. In our case, it is - as we set --prefix instead for other reasons, but by just setting DESTIDIR to "/", we can still trigger these things to be skipped. The patches removed some context from 0018-Install-default-configuration-into-out-share-factory.patch, which we need to introduce there to make that patch still apply. --- .../0014-catalog-don-t-update-on-install.patch | 24 ------------------- .../0015-hwdb-don-t-run-update-on-install.patch | 27 ---------------------- ...ault-configuration-into-out-share-factory.patch | 4 ++++ pkgs/os-specific/linux/systemd/default.nix | 7 ++++-- 4 files changed, 9 insertions(+), 53 deletions(-) delete mode 100644 pkgs/os-specific/linux/systemd/0014-catalog-don-t-update-on-install.patch delete mode 100644 pkgs/os-specific/linux/systemd/0015-hwdb-don-t-run-update-on-install.patch diff --git a/pkgs/os-specific/linux/systemd/0014-catalog-don-t-update-on-install.patch b/pkgs/os-specific/linux/systemd/0014-catalog-don-t-update-on-install.patch deleted file mode 100644 index 4f9f08413e2..00000000000 --- a/pkgs/os-specific/linux/systemd/0014-catalog-don-t-update-on-install.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 8e7aec49a387d8229b85cfc3ea2f2c1c9a45f6d0 Mon Sep 17 00:00:00 2001 -From: Franz Pletz -Date: Wed, 17 Jan 2018 05:10:36 +0100 -Subject: [PATCH 14/27] catalog: don't update on install - ---- - catalog/meson.build | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/catalog/meson.build b/catalog/meson.build -index 3db8e390f2..7004618750 100644 ---- a/catalog/meson.build -+++ b/catalog/meson.build -@@ -28,7 +28,3 @@ foreach file : in_files - install : true, - install_dir : catalogdir) - endforeach -- --meson.add_install_script('sh', '-c', -- 'test -n "$DESTDIR" || @0@/journalctl --update-catalog' -- .format(rootbindir)) --- -2.24.1 - diff --git a/pkgs/os-specific/linux/systemd/0015-hwdb-don-t-run-update-on-install.patch b/pkgs/os-specific/linux/systemd/0015-hwdb-don-t-run-update-on-install.patch deleted file mode 100644 index bf416d90d86..00000000000 --- a/pkgs/os-specific/linux/systemd/0015-hwdb-don-t-run-update-on-install.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 8a383521425d7a59e9b1850d1547d47fa5e8a952 Mon Sep 17 00:00:00 2001 -From: Franz Pletz -Date: Sun, 11 Feb 2018 04:01:35 +0100 -Subject: [PATCH 15/27] hwdb: don't run update on install - ---- - hwdb/meson.build | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/hwdb/meson.build b/hwdb/meson.build -index 31ee3e7409..badf39f555 100644 ---- a/hwdb/meson.build -+++ b/hwdb/meson.build -@@ -27,10 +27,6 @@ if conf.get('ENABLE_HWDB') == 1 - - meson.add_install_script('sh', '-c', - mkdir_p.format(join_paths(sysconfdir, 'udev/hwdb.d'))) -- -- meson.add_install_script('sh', '-c', -- 'test -n "$DESTDIR" || @0@/systemd-hwdb update' -- .format(rootbindir)) - endif - - ############################################################ --- -2.24.1 - diff --git a/pkgs/os-specific/linux/systemd/0018-Install-default-configuration-into-out-share-factory.patch b/pkgs/os-specific/linux/systemd/0018-Install-default-configuration-into-out-share-factory.patch index 980d9f35461..1793f5d1818 100644 --- a/pkgs/os-specific/linux/systemd/0018-Install-default-configuration-into-out-share-factory.patch +++ b/pkgs/os-specific/linux/systemd/0018-Install-default-configuration-into-out-share-factory.patch @@ -40,6 +40,10 @@ index badf39f555..8fd9c7639f 100644 meson.add_install_script('sh', '-c', - mkdir_p.format(join_paths(sysconfdir, 'udev/hwdb.d'))) + mkdir_p.format(join_paths(factoryconfdir, 'udev/hwdb.d'))) + + meson.add_install_script('sh', '-c', + 'test -n "$DESTDIR" || @0@/systemd-hwdb update' + .format(rootbindir)) endif ############################################################ diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index b8693678566..82c8af30359 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -55,8 +55,6 @@ in stdenv.mkDerivation { ./0011-Fix-hwdb-paths.patch ./0012-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch ./0013-localectl-use-etc-X11-xkb-for-list-x11.patch - ./0014-catalog-don-t-update-on-install.patch - ./0015-hwdb-don-t-run-update-on-install.patch ./0016-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch ./0017-Fix-mount-option-x-initrd.mount-handling-35268-16.patch ./0018-Install-default-configuration-into-out-share-factory.patch @@ -220,6 +218,11 @@ in stdenv.mkDerivation { doCheck = false; # fails a bunch of tests + # trigger the test -n "$DESTDIR" || mutate in upstreams build system + preInstall = '' + export DESTDIR=/ + ''; + postInstall = '' # sysinit.target: Don't depend on # systemd-tmpfiles-setup.service. This interferes with NixOps's -- cgit v1.2.3 From 4f346cd84929d583d278bfa289b57da594ca09ed Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 7 Mar 2020 22:16:21 +0100 Subject: systemd: drop 0017-Fix-mount-option-x-initrd.mount-handling-35268-16.patch This was simply undoing a hunk from 0008-Don-t-try-to-unmount-nix-or-nix-store.patch, so drop that one from there and omit 0017-Fix-mount-option-x-initrd.mount-handling-35268-16.patch entirely. --- ...008-Don-t-try-to-unmount-nix-or-nix-store.patch | 25 ------------- ...t-option-x-initrd.mount-handling-35268-16.patch | 42 ---------------------- pkgs/os-specific/linux/systemd/default.nix | 1 - 3 files changed, 68 deletions(-) delete mode 100644 pkgs/os-specific/linux/systemd/0017-Fix-mount-option-x-initrd.mount-handling-35268-16.patch diff --git a/pkgs/os-specific/linux/systemd/0008-Don-t-try-to-unmount-nix-or-nix-store.patch b/pkgs/os-specific/linux/systemd/0008-Don-t-try-to-unmount-nix-or-nix-store.patch index b858f3f7a45..fedaeb79671 100644 --- a/pkgs/os-specific/linux/systemd/0008-Don-t-try-to-unmount-nix-or-nix-store.patch +++ b/pkgs/os-specific/linux/systemd/0008-Don-t-try-to-unmount-nix-or-nix-store.patch @@ -23,31 +23,6 @@ index 959b8fbed2..5e4c4a9767 100644 return true; if (PATH_STARTSWITH_SET(m->where, -@@ -439,10 +441,20 @@ static int mount_add_default_dependencies(Mount *m) { - if (!UNIT(m)->default_dependencies) - return 0; - -- /* We do not add any default dependencies to /, /usr or /run/initramfs/, since they are guaranteed to stay -- * mounted the whole time, since our system is on it. Also, don't bother with anything mounted below virtual -- * file systems, it's also going to be virtual, and hence not worth the effort. */ -- if (mount_is_extrinsic(m)) -+ if (!MANAGER_IS_SYSTEM(UNIT(m)->manager)) -+ return 0; -+ -+ /* We do not add any default dependencies to /, /usr or -+ * /run/initramfs/, since they are guaranteed to stay -+ * mounted the whole time, since our system is on it. -+ * Also, don't bother with anything mounted below virtual -+ * file systems, it's also going to be virtual, and hence -+ * not worth the effort. */ -+ if (PATH_IN_SET(m->where, "/", "/usr", "/nix", "/nix/store") || -+ path_startswith(m->where, "/run/initramfs") || -+ path_startswith(m->where, "/proc") || -+ path_startswith(m->where, "/sys") || -+ path_startswith(m->where, "/dev")) - return 0; - - p = get_mount_parameters(m); -- 2.24.1 diff --git a/pkgs/os-specific/linux/systemd/0017-Fix-mount-option-x-initrd.mount-handling-35268-16.patch b/pkgs/os-specific/linux/systemd/0017-Fix-mount-option-x-initrd.mount-handling-35268-16.patch deleted file mode 100644 index f4508baae31..00000000000 --- a/pkgs/os-specific/linux/systemd/0017-Fix-mount-option-x-initrd.mount-handling-35268-16.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 39ba82b29fff844f82e745ed7785cbfb397c2908 Mon Sep 17 00:00:00 2001 -From: Timofei Kushnir -Date: Fri, 2 Mar 2018 13:02:53 +0300 -Subject: [PATCH 17/27] Fix mount option `x-initrd.mount` handling (#35268) - (#16) - ---- - src/core/mount.c | 18 ++++-------------- - 1 file changed, 4 insertions(+), 14 deletions(-) - -diff --git a/src/core/mount.c b/src/core/mount.c -index 5e4c4a9767..6bc3569550 100644 ---- a/src/core/mount.c -+++ b/src/core/mount.c -@@ -441,20 +441,10 @@ static int mount_add_default_dependencies(Mount *m) { - if (!UNIT(m)->default_dependencies) - return 0; - -- if (!MANAGER_IS_SYSTEM(UNIT(m)->manager)) -- return 0; -- -- /* We do not add any default dependencies to /, /usr or -- * /run/initramfs/, since they are guaranteed to stay -- * mounted the whole time, since our system is on it. -- * Also, don't bother with anything mounted below virtual -- * file systems, it's also going to be virtual, and hence -- * not worth the effort. */ -- if (PATH_IN_SET(m->where, "/", "/usr", "/nix", "/nix/store") || -- path_startswith(m->where, "/run/initramfs") || -- path_startswith(m->where, "/proc") || -- path_startswith(m->where, "/sys") || -- path_startswith(m->where, "/dev")) -+ /* We do not add any default dependencies to /, /usr or /run/initramfs/, since they are guaranteed to stay -+ * mounted the whole time, since our system is on it. Also, don't bother with anything mounted below virtual -+ * file systems, it's also going to be virtual, and hence not worth the effort. */ -+ if (mount_is_extrinsic(m)) - return 0; - - p = get_mount_parameters(m); --- -2.24.1 - diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 82c8af30359..7079e21f309 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -56,7 +56,6 @@ in stdenv.mkDerivation { ./0012-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch ./0013-localectl-use-etc-X11-xkb-for-list-x11.patch ./0016-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch - ./0017-Fix-mount-option-x-initrd.mount-handling-35268-16.patch ./0018-Install-default-configuration-into-out-share-factory.patch ./0019-inherit-systemd-environment-when-calling-generators.patch ./0020-reintroduce-the-no-such-path-PATH-that-was-dropped-s.patch -- cgit v1.2.3 From a6710adab21b5fe55d28ba587c3076bcf5a19e2d Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 7 Mar 2020 22:31:45 +0100 Subject: systemd: join 000{3,8}-Don-t-try-to-unmount-nix-or-nix-store.patch --- ...003-Don-t-try-to-unmount-nix-or-nix-store.patch | 24 +++++++++++++++---- ...008-Don-t-try-to-unmount-nix-or-nix-store.patch | 28 ---------------------- pkgs/os-specific/linux/systemd/default.nix | 1 - 3 files changed, 20 insertions(+), 33 deletions(-) delete mode 100644 pkgs/os-specific/linux/systemd/0008-Don-t-try-to-unmount-nix-or-nix-store.patch diff --git a/pkgs/os-specific/linux/systemd/0003-Don-t-try-to-unmount-nix-or-nix-store.patch b/pkgs/os-specific/linux/systemd/0003-Don-t-try-to-unmount-nix-or-nix-store.patch index a1380a33f45..80b6721cb71 100644 --- a/pkgs/os-specific/linux/systemd/0003-Don-t-try-to-unmount-nix-or-nix-store.patch +++ b/pkgs/os-specific/linux/systemd/0003-Don-t-try-to-unmount-nix-or-nix-store.patch @@ -1,4 +1,4 @@ -From 620047803b70b941606398e77f253645058007dd Mon Sep 17 00:00:00 2001 +From fd9c882581877eef8ba1b34a9502a1ff546b3833 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 12 Apr 2013 13:16:57 +0200 Subject: [PATCH 03/27] Don't try to unmount /nix or /nix/store @@ -7,11 +7,27 @@ They'll still be remounted read-only. https://github.com/NixOS/nixos/issues/126 --- + src/core/mount.c | 4 +++- src/shutdown/umount.c | 2 ++ - 1 file changed, 2 insertions(+) + 2 files changed, 5 insertions(+), 1 deletion(-) +diff --git a/src/core/mount.c b/src/core/mount.c +index eef362f0c8..600393ffc1 100644 +--- a/src/core/mount.c ++++ b/src/core/mount.c +@@ -409,7 +409,9 @@ static bool mount_is_extrinsic(Mount *m) { + + if (PATH_IN_SET(m->where, /* Don't bother with the OS data itself */ + "/", +- "/usr")) ++ "/usr", ++ "/nix/", ++ "/nix/store")) + return true; + + if (PATH_STARTSWITH_SET(m->where, diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c -index 00e268855d..08f3590f2a 100644 +index 2d07d3d6c1..8b112f464e 100644 --- a/src/shutdown/umount.c +++ b/src/shutdown/umount.c @@ -373,6 +373,8 @@ static int delete_dm(dev_t devnum) { @@ -24,5 +40,5 @@ index 00e268855d..08f3590f2a 100644 || path_equal(path, "/usr") #endif -- -2.24.1 +2.25.1 diff --git a/pkgs/os-specific/linux/systemd/0008-Don-t-try-to-unmount-nix-or-nix-store.patch b/pkgs/os-specific/linux/systemd/0008-Don-t-try-to-unmount-nix-or-nix-store.patch deleted file mode 100644 index fedaeb79671..00000000000 --- a/pkgs/os-specific/linux/systemd/0008-Don-t-try-to-unmount-nix-or-nix-store.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 5b2eafc51fa2d98f03fd341176d9a7accc0259ae Mon Sep 17 00:00:00 2001 -From: Eelco Dolstra -Date: Mon, 11 May 2015 15:30:46 +0200 -Subject: [PATCH 08/27] Don't try to unmount /nix or /nix/store - -33f458625f2a9d201263bd1b81b1c56f4a077e80 wasn't enough. ---- - src/core/mount.c | 22 +++++++++++++++++----- - 1 file changed, 17 insertions(+), 5 deletions(-) - -diff --git a/src/core/mount.c b/src/core/mount.c -index 959b8fbed2..5e4c4a9767 100644 ---- a/src/core/mount.c -+++ b/src/core/mount.c -@@ -409,7 +409,9 @@ static bool mount_is_extrinsic(Mount *m) { - - if (PATH_IN_SET(m->where, /* Don't bother with the OS data itself */ - "/", -- "/usr")) -+ "/usr", -+ "/nix/", -+ "/nix/store")) - return true; - - if (PATH_STARTSWITH_SET(m->where, --- -2.24.1 - diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 7079e21f309..427c48a32e3 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -49,7 +49,6 @@ in stdenv.mkDerivation { ./0005-kmod-static-nodes.service-Don-t-require-lib-modules.patch ./0006-Look-for-fsck-in-the-right-place.patch ./0007-Add-some-NixOS-specific-unit-directories.patch - ./0008-Don-t-try-to-unmount-nix-or-nix-store.patch ./0009-Get-rid-of-a-useless-message-in-user-sessions.patch ./0010-hostnamed-localed-timedated-disable-methods-that-cha.patch ./0011-Fix-hwdb-paths.patch -- cgit v1.2.3 From cd5bc89cca1b5fc0cc6064454b455af9518f549e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 17 Apr 2020 00:27:07 +0200 Subject: evcxr: 0.5.0 -> 0.5.1 https://github.com/google/evcxr/blob/582ce09f216d4812f7d152f6eedf0b034fc4dbbd/RELEASE_NOTES.md#version-051 --- pkgs/development/interpreters/evcxr/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/evcxr/default.nix b/pkgs/development/interpreters/evcxr/default.nix index fa8050a21ff..4430298beb5 100644 --- a/pkgs/development/interpreters/evcxr/default.nix +++ b/pkgs/development/interpreters/evcxr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "evcxr"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "google"; repo = "evcxr"; - rev = "239e431c58d04c641da22af791e4d3e1b894365e"; - sha256 = "0vkcis06gwsqfwvrl8xcf74mfcs6j77b9fhcz5rrh77mwl7ixsdc"; + rev = "582ce09f216d4812f7d152f6eedf0b034fc4dbbd"; + sha256 = "12hlqgh74z8vmd7fkxh4vk3dqp8hlhzkxnbyywk6nphi562n6w5w"; }; - cargoSha256 = "0pamwqhw3sj4anqc1112l5cayhqzibdhqjc28apfrkf2m63cclzi"; + cargoSha256 = "0yr8vwlpfsg47sg0032yrsdcgxyky0hy4963zkh0pmjykbyqkb3h"; nativeBuildInputs = [ pkgconfig makeWrapper cmake ]; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; -- cgit v1.2.3 From 20252ee64761300bc4882de3ed512ad8434e71a4 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 17 Apr 2020 00:27:24 +0200 Subject: findomain: 1.4.5 -> 1.5.0 https://github.com/Edu4rdSHL/findomain/releases/tag/1.5.0 --- pkgs/tools/networking/findomain/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix index d5e801a6f92..e1944257698 100644 --- a/pkgs/tools/networking/findomain/default.nix +++ b/pkgs/tools/networking/findomain/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "1.4.5"; + version = "1.5.0"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "1p4ddyqg1v27hf19n1ksmfvj5s6z2c8i13syb0anhlyzqy576hwb"; + sha256 = "1w3parmk3836v5ghn3cgcxyk0alk05r5ljl3j1fpnly5xvl131rd"; }; - cargoSha256 = "0mdcj4almwziq1ph3imfdx41a96xq19sbjm7wsm9lxlzhvv256br"; + cargoSha256 = "1cs076cgkzjan6y78a3bhriv2q2s83hp5vzhkjwz4dqn83r6b8hx"; nativeBuildInputs = [ installShellFiles perl ]; buildInputs = lib.optional stdenv.isDarwin Security; -- cgit v1.2.3 From e61c924adba64110802dc22f2f4d8617aa98b1b3 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 17 Apr 2020 00:27:45 +0200 Subject: mautrix-whatsapp: 2020-04-02 -> 2020-04-12 --- pkgs/servers/mautrix-whatsapp/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index b0178a18213..924209174e7 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,16 +2,16 @@ buildGoModule { pname = "mautrix-whatsapp-unstable"; - version = "2020-04-02"; + version = "2020-04-12"; src = fetchFromGitHub { owner = "tulir"; repo = "mautrix-whatsapp"; - rev = "064b5b8fedb6896d04509aa0e094a8d9f83426c2"; - sha256 = "1xky31x5jk7yxh875nk20vvsn9givy6vxdqhqg5qwf4xjj2zqh2p"; + rev = "44bb623e7a7486a0cdd13fd67b2aaca2ddba20ce"; + sha256 = "1fwxn6511pq9fdc8d2jp4vgkm1zag55pig75qdxfn63hl3i2607k"; }; - modSha256 = "0qcxxhfp3fkx90r3lwhi0lkzg3digwrnxk8cack11k717szg7zrd"; + modSha256 = "04pdap1q7zsa1wv2h0j9104fawn95g37yqslmp2mq7722hiqhp9x"; meta = with stdenv.lib; { homepage = "https://github.com/tulir/mautrix-whatsapp"; -- cgit v1.2.3 From b4cbcba5b11bc102761e790e988f820fcc885578 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 7 Mar 2020 22:46:14 +0100 Subject: systemd: update paths kmod-static-nodes.service MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The previous patch just removed a `ConditionFileNotEmpty=…` line from `kmod-static-nodes.service` referring to a location not existing on NixOS. We know better, and can actually replace this Condition to point to `run/booted-system/kernel-modules/lib/modules/%v/`, instead of just patching it out. --- ...c-nodes.service-Don-t-require-lib-modules.patch | 24 ------------------- ...odes.service-Update-ConditionFileNotEmpty.patch | 27 ++++++++++++++++++++++ pkgs/os-specific/linux/systemd/default.nix | 2 +- 3 files changed, 28 insertions(+), 25 deletions(-) delete mode 100644 pkgs/os-specific/linux/systemd/0005-kmod-static-nodes.service-Don-t-require-lib-modules.patch create mode 100644 pkgs/os-specific/linux/systemd/0024-kmod-static-nodes.service-Update-ConditionFileNotEmpty.patch diff --git a/pkgs/os-specific/linux/systemd/0005-kmod-static-nodes.service-Don-t-require-lib-modules.patch b/pkgs/os-specific/linux/systemd/0005-kmod-static-nodes.service-Don-t-require-lib-modules.patch deleted file mode 100644 index 6d4f39ea4a3..00000000000 --- a/pkgs/os-specific/linux/systemd/0005-kmod-static-nodes.service-Don-t-require-lib-modules.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 18863cea3bdfad5f8b0581478ce4a39ede53b9d4 Mon Sep 17 00:00:00 2001 -From: Eelco Dolstra -Date: Thu, 17 Apr 2014 13:54:29 +0200 -Subject: [PATCH 05/27] kmod-static-nodes.service: Don't require /lib/modules - ---- - units/kmod-static-nodes.service.in | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/units/kmod-static-nodes.service.in b/units/kmod-static-nodes.service.in -index 0971edf9ec..7d150bf3d7 100644 ---- a/units/kmod-static-nodes.service.in -+++ b/units/kmod-static-nodes.service.in -@@ -12,7 +12,6 @@ Description=Create list of static device nodes for the current kernel - DefaultDependencies=no - Before=sysinit.target systemd-tmpfiles-setup-dev.service - ConditionCapability=CAP_SYS_MODULE --ConditionFileNotEmpty=/lib/modules/%v/modules.devname - - [Service] - Type=oneshot --- -2.24.1 - diff --git a/pkgs/os-specific/linux/systemd/0024-kmod-static-nodes.service-Update-ConditionFileNotEmpty.patch b/pkgs/os-specific/linux/systemd/0024-kmod-static-nodes.service-Update-ConditionFileNotEmpty.patch new file mode 100644 index 00000000000..df16b52660b --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0024-kmod-static-nodes.service-Update-ConditionFileNotEmpty.patch @@ -0,0 +1,27 @@ +From 7db89c2236158461c99fe5c5da7ddb7feab825cf Mon Sep 17 00:00:00 2001 +From: Florian Klink +Date: Sat, 7 Mar 2020 22:40:27 +0100 +Subject: [PATCH] kmod-static-nodes.service: Update ConditionFileNotEmpty + +On NixOS, kernel modules of the currently booted systems are located at +/run/booted-system/kernel-modules/lib/modules/%v/, not /lib/modules/%v/. +--- + units/kmod-static-nodes.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/units/kmod-static-nodes.service.in b/units/kmod-static-nodes.service.in +index 0971edf9ec..87105a87b9 100644 +--- a/units/kmod-static-nodes.service.in ++++ b/units/kmod-static-nodes.service.in +@@ -12,7 +12,7 @@ Description=Create list of static device nodes for the current kernel + DefaultDependencies=no + Before=sysinit.target systemd-tmpfiles-setup-dev.service + ConditionCapability=CAP_SYS_MODULE +-ConditionFileNotEmpty=/lib/modules/%v/modules.devname ++ConditionFileNotEmpty=/run/booted-system/kernel-modules/lib/modules/%v/modules.devname + + [Service] + Type=oneshot +-- +2.25.1 + diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 427c48a32e3..c09db7e8ab0 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -46,7 +46,6 @@ in stdenv.mkDerivation { ./0001-Start-device-units-for-uninitialised-encrypted-devic.patch ./0003-Don-t-try-to-unmount-nix-or-nix-store.patch ./0004-Fix-NixOS-containers.patch - ./0005-kmod-static-nodes.service-Don-t-require-lib-modules.patch ./0006-Look-for-fsck-in-the-right-place.patch ./0007-Add-some-NixOS-specific-unit-directories.patch ./0009-Get-rid-of-a-useless-message-in-user-sessions.patch @@ -61,6 +60,7 @@ in stdenv.mkDerivation { ./0021-add-rootprefix-to-lookup-dir-paths.patch ./0022-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch ./0023-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch + ./0024-kmod-static-nodes.service-Update-ConditionFileNotEmpty.patch ]; outputs = [ "out" "lib" "man" "dev" ]; -- cgit v1.2.3 From 9de0ac3770c10221b0c6ad33576f2c525544581b Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 7 Mar 2020 23:47:22 +0100 Subject: systemd: 243.7 -> 244.3 This required some changes in how we treat DEFAULT_PATH_NORMAL. --- ...e-units-for-uninitialised-encrypted-devic.patch | 8 ++-- ...003-Don-t-try-to-unmount-nix-or-nix-store.patch | 16 ++++---- ...Change-usr-share-zoneinfo-to-etc-zoneinfo.patch | 44 +++++++++++++++------- ...ault-configuration-into-out-share-factory.patch | 8 ++-- ...-the-no-such-path-PATH-that-was-dropped-s.patch | 41 -------------------- ...h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch | 33 ++++++++++++++++ pkgs/os-specific/linux/systemd/default.nix | 13 +++++-- 7 files changed, 87 insertions(+), 76 deletions(-) delete mode 100644 pkgs/os-specific/linux/systemd/0020-reintroduce-the-no-such-path-PATH-that-was-dropped-s.patch create mode 100644 pkgs/os-specific/linux/systemd/0025-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch diff --git a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch index 173f41a44c9..5418a6d9d91 100644 --- a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch +++ b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch @@ -9,13 +9,13 @@ makes more sense to me: the device is ready; it's the filesystem that's not, but taking care of that is the responsibility of the mount unit. (However, this ignores the fsck unit, so it's not perfect...) --- - rules/99-systemd.rules.in | 4 ---- + rules.d/99-systemd.rules.in | 4 ---- 1 file changed, 4 deletions(-) -diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in +diff --git a/rules.d/99-systemd.rules.in b/rules.d/99-systemd.rules.in index c34b606216..3ab8c1c3fe 100644 ---- a/rules/99-systemd.rules.in -+++ b/rules/99-systemd.rules.in +--- a/rules.d/99-systemd.rules.in ++++ b/rules.d/99-systemd.rules.in @@ -17,10 +17,6 @@ SUBSYSTEM=="ubi", TAG+="systemd" SUBSYSTEM=="block", TAG+="systemd" SUBSYSTEM=="block", ACTION=="add", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", ENV{SYSTEMD_READY}="0" diff --git a/pkgs/os-specific/linux/systemd/0003-Don-t-try-to-unmount-nix-or-nix-store.patch b/pkgs/os-specific/linux/systemd/0003-Don-t-try-to-unmount-nix-or-nix-store.patch index 80b6721cb71..75110faf923 100644 --- a/pkgs/os-specific/linux/systemd/0003-Don-t-try-to-unmount-nix-or-nix-store.patch +++ b/pkgs/os-specific/linux/systemd/0003-Don-t-try-to-unmount-nix-or-nix-store.patch @@ -12,20 +12,18 @@ https://github.com/NixOS/nixos/issues/126 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/core/mount.c b/src/core/mount.c -index eef362f0c8..600393ffc1 100644 +index a0dfa6a1a7..4ca6adcdc6 100644 --- a/src/core/mount.c +++ b/src/core/mount.c -@@ -409,7 +409,9 @@ static bool mount_is_extrinsic(Mount *m) { +@@ -414,6 +414,8 @@ static bool mount_is_extrinsic(Mount *m) { if (PATH_IN_SET(m->where, /* Don't bother with the OS data itself */ - "/", -- "/usr")) -+ "/usr", -+ "/nix/", -+ "/nix/store")) + "/", /* (strictly speaking redundant: should already be covered by the perpetual flag check above) */ ++ "/nix", ++ "/nix/store", + "/usr", + "/etc")) return true; - - if (PATH_STARTSWITH_SET(m->where, diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c index 2d07d3d6c1..8b112f464e 100644 --- a/src/shutdown/umount.c diff --git a/pkgs/os-specific/linux/systemd/0012-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch b/pkgs/os-specific/linux/systemd/0012-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch index 0b14eb7a58b..ad76fda7d95 100644 --- a/pkgs/os-specific/linux/systemd/0012-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch +++ b/pkgs/os-specific/linux/systemd/0012-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch @@ -1,15 +1,16 @@ -From 76f3fba3031d74647855ce0da2d4e317016cb7d6 Mon Sep 17 00:00:00 2001 +From 78479b75c9f9342646223b3db6b4b0744817dc24 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 11 Oct 2016 13:12:08 +0300 -Subject: [PATCH 12/27] Change /usr/share/zoneinfo to /etc/zoneinfo +Subject: [PATCH] Change /usr/share/zoneinfo to /etc/zoneinfo NixOS uses this path. --- man/localtime.xml | 4 ++-- src/basic/time-util.c | 6 +++--- src/firstboot/firstboot.c | 2 +- + src/nspawn/nspawn.c | 4 ++-- src/timedate/timedated.c | 8 ++++---- - 4 files changed, 10 insertions(+), 10 deletions(-) + 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/man/localtime.xml b/man/localtime.xml index 0f1652ee2e..71c4f95c2e 100644 @@ -34,10 +35,10 @@ index 0f1652ee2e..71c4f95c2e 100644 Etc/UTC. The resulting link should lead to the corresponding binary diff --git a/src/basic/time-util.c b/src/basic/time-util.c -index e14ae8f2f7..a8a3488be1 100644 +index 105584e2e7..5238f69931 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c -@@ -1215,7 +1215,7 @@ int get_timezones(char ***ret) { +@@ -1217,7 +1217,7 @@ int get_timezones(char ***ret) { n_allocated = 2; n_zones = 1; @@ -46,7 +47,7 @@ index e14ae8f2f7..a8a3488be1 100644 if (f) { for (;;) { _cleanup_free_ char *line = NULL; -@@ -1310,7 +1310,7 @@ bool timezone_is_valid(const char *name, int log_level) { +@@ -1312,7 +1312,7 @@ bool timezone_is_valid(const char *name, int log_level) { if (p - name >= PATH_MAX) return false; @@ -55,7 +56,7 @@ index e14ae8f2f7..a8a3488be1 100644 fd = open(t, O_RDONLY|O_CLOEXEC); if (fd < 0) { -@@ -1408,7 +1408,7 @@ int get_timezone(char **ret) { +@@ -1410,7 +1410,7 @@ int get_timezone(char **ret) { if (r < 0) return r; /* returns EINVAL if not a symlink */ @@ -77,11 +78,26 @@ index 528e6452cf..c712ca9072 100644 (void) mkdir_parents(etc_localtime, 0755); if (symlink(e, etc_localtime) < 0) +diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c +index 873a76596f..a024b10f32 100644 +--- a/src/nspawn/nspawn.c ++++ b/src/nspawn/nspawn.c +@@ -1642,8 +1642,8 @@ static int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t u + static const char *timezone_from_path(const char *path) { + return PATH_STARTSWITH_SET( + path, +- "../usr/share/zoneinfo/", +- "/usr/share/zoneinfo/"); ++ "../etc/zoneinfo/", ++ "/etc/zoneinfo/"); + } + + static bool etc_writable(void) { diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c -index fa20d22cde..8e6dbe1efb 100644 +index 5e2fb50d83..02eb2ca11d 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c -@@ -265,7 +265,7 @@ static int context_read_data(Context *c) { +@@ -264,7 +264,7 @@ static int context_read_data(Context *c) { r = get_timezone(&t); if (r == -EINVAL) @@ -90,7 +106,7 @@ index fa20d22cde..8e6dbe1efb 100644 else if (r < 0) log_warning_errno(r, "Failed to get target of /etc/localtime: %m"); -@@ -289,7 +289,7 @@ static int context_write_data_timezone(Context *c) { +@@ -288,7 +288,7 @@ static int context_write_data_timezone(Context *c) { if (isempty(c->zone) || streq(c->zone, "UTC")) { @@ -99,18 +115,18 @@ index fa20d22cde..8e6dbe1efb 100644 if (unlink("/etc/localtime") < 0 && errno != ENOENT) return -errno; -@@ -297,9 +297,9 @@ static int context_write_data_timezone(Context *c) { +@@ -296,9 +296,9 @@ static int context_write_data_timezone(Context *c) { return 0; } - source = "../usr/share/zoneinfo/UTC"; -+ source = "zoneinfo/UTC"; ++ source = "../etc/zoneinfo/UTC"; } else { - p = path_join("../usr/share/zoneinfo", c->zone); -+ p = path_join("zoneinfo", c->zone); ++ p = path_join("../etc/zoneinfo", c->zone); if (!p) return -ENOMEM; -- -2.24.1 +2.25.1 diff --git a/pkgs/os-specific/linux/systemd/0018-Install-default-configuration-into-out-share-factory.patch b/pkgs/os-specific/linux/systemd/0018-Install-default-configuration-into-out-share-factory.patch index 1793f5d1818..3911d1b0181 100644 --- a/pkgs/os-specific/linux/systemd/0018-Install-default-configuration-into-out-share-factory.patch +++ b/pkgs/os-specific/linux/systemd/0018-Install-default-configuration-into-out-share-factory.patch @@ -11,7 +11,7 @@ this commit introduces two new configuration variables `factoryconfdir` and `factorypkgconfdir` to install systemd's own configuration into nix store again, while having executables looking up files in /etc. --- - hwdb/meson.build | 2 +- + hwdb.d/meson.build | 2 +- meson.build | 11 +++++++---- network/meson.build | 2 +- src/core/meson.build | 10 +++++----- @@ -30,10 +30,10 @@ store again, while having executables looking up files in /etc. units/meson.build | 3 ++- 17 files changed, 30 insertions(+), 26 deletions(-) -diff --git a/hwdb/meson.build b/hwdb/meson.build +diff --git a/hwdb.d/meson.build b/hwdb.d/meson.build index badf39f555..8fd9c7639f 100644 ---- a/hwdb/meson.build -+++ b/hwdb/meson.build +--- a/hwdb.d/meson.build ++++ b/hwdb.d/meson.build @@ -26,7 +26,7 @@ if conf.get('ENABLE_HWDB') == 1 install_dir : udevhwdbdir) diff --git a/pkgs/os-specific/linux/systemd/0020-reintroduce-the-no-such-path-PATH-that-was-dropped-s.patch b/pkgs/os-specific/linux/systemd/0020-reintroduce-the-no-such-path-PATH-that-was-dropped-s.patch deleted file mode 100644 index 63d694c2daa..00000000000 --- a/pkgs/os-specific/linux/systemd/0020-reintroduce-the-no-such-path-PATH-that-was-dropped-s.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 95c4e1ffd2249a52ca02e4fbe46aa4e51c5abd17 Mon Sep 17 00:00:00 2001 -From: Andreas Rammhold -Date: Fri, 2 Nov 2018 20:56:49 +0100 -Subject: [PATCH 20/27] reintroduce the /no-such-path PATH that was dropped - some versions ago - -Originally eelco set the DEFAULT_PATH_NORMAL to "/no-such-path" since we -do not need that in NixOS and usually refer to all our executables with -an absolute path. This commit reintroduces this change. ---- - src/basic/path-util.h | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/src/basic/path-util.h b/src/basic/path-util.h -index 71fb7041a3..b856e782a8 100644 ---- a/src/basic/path-util.h -+++ b/src/basic/path-util.h -@@ -28,13 +28,13 @@ - # define PATH_SBIN_BIN_NULSTR(x) PATH_NORMAL_SBIN_BIN_NULSTR(x) - #endif - --#define DEFAULT_PATH_NORMAL PATH_SBIN_BIN("/usr/local/") ":" PATH_SBIN_BIN("/usr/") --#define DEFAULT_USER_PATH_NORMAL PATH_BIN_SBIN("/usr/local/") ":" PATH_BIN_SBIN("/usr/") --#define DEFAULT_PATH_NORMAL_NULSTR PATH_SBIN_BIN_NULSTR("/usr/local/") PATH_SBIN_BIN_NULSTR("/usr/") --#define DEFAULT_PATH_SPLIT_USR DEFAULT_PATH_NORMAL ":" PATH_SBIN_BIN("/") --#define DEFAULT_USER_PATH_SPLIT_USR DEFAULT_PATH_NORMAL ":" PATH_BIN_SBIN("/") --#define DEFAULT_PATH_SPLIT_USR_NULSTR DEFAULT_PATH_NORMAL_NULSTR PATH_SBIN_BIN_NULSTR("/") --#define DEFAULT_PATH_COMPAT PATH_SPLIT_SBIN_BIN("/usr/local/") ":" PATH_SPLIT_SBIN_BIN("/usr/") ":" PATH_SPLIT_SBIN_BIN("/") -+#define DEFAULT_PATH_NORMAL "/no-such-path" -+#define DEFAULT_USER_PATH_NORMAL "/no-such-path" -+#define DEFAULT_PATH_NORMAL_NULSTR "/no-such-path\0" -+#define DEFAULT_PATH_SPLIT_USR DEFAULT_PATH_NORMAL -+#define DEFAULT_USER_PATH_SPLIT_USR DEFAULT_PATH_NORMAL DEFAULT_PATH_NORMAL -+#define DEFAULT_PATH_SPLIT_USR_NULSTR DEFAULT_PATH_NORMAL_NULSTR -+#define DEFAULT_PATH_COMPAT DEFAULT_PATH_NORMAL - - #if HAVE_SPLIT_USR - # define DEFAULT_PATH DEFAULT_PATH_SPLIT_USR --- -2.24.1 - diff --git a/pkgs/os-specific/linux/systemd/0025-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch b/pkgs/os-specific/linux/systemd/0025-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch new file mode 100644 index 00000000000..10bf54708f0 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0025-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch @@ -0,0 +1,33 @@ +From 0939ac4be7ced099670979f26adf8a579173ce4b Mon Sep 17 00:00:00 2001 +From: Florian Klink +Date: Sun, 8 Mar 2020 01:05:54 +0100 +Subject: [PATCH] path-util.h: add placeholder for DEFAULT_PATH_NORMAL + +This will be the $PATH used to lookup ExecStart= etc. options, which +systemd itself uses extensively. +--- + src/basic/path-util.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/basic/path-util.h b/src/basic/path-util.h +index 111d85d445..cfd92aeb73 100644 +--- a/src/basic/path-util.h ++++ b/src/basic/path-util.h +@@ -24,11 +24,11 @@ + # define PATH_SBIN_BIN_NULSTR(x) PATH_NORMAL_SBIN_BIN_NULSTR(x) + #endif + +-#define DEFAULT_PATH_NORMAL PATH_SBIN_BIN("/usr/local/") ":" PATH_SBIN_BIN("/usr/") +-#define DEFAULT_PATH_NORMAL_NULSTR PATH_SBIN_BIN_NULSTR("/usr/local/") PATH_SBIN_BIN_NULSTR("/usr/") ++#define DEFAULT_PATH_NORMAL "@defaultPathNormal@" ++#define DEFAULT_PATH_NORMAL_NULSTR "@defaultPathNormal@\0" + #define DEFAULT_PATH_SPLIT_USR DEFAULT_PATH_NORMAL ":" PATH_SBIN_BIN("/") + #define DEFAULT_PATH_SPLIT_USR_NULSTR DEFAULT_PATH_NORMAL_NULSTR PATH_SBIN_BIN_NULSTR("/") +-#define DEFAULT_PATH_COMPAT PATH_SPLIT_SBIN_BIN("/usr/local/") ":" PATH_SPLIT_SBIN_BIN("/usr/") ":" PATH_SPLIT_SBIN_BIN("/") ++#define DEFAULT_PATH_COMPAT DEFAULT_PATH_NORMAL + + #if HAVE_SPLIT_USR + # define DEFAULT_PATH DEFAULT_PATH_SPLIT_USR +-- +2.25.1 + diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index c09db7e8ab0..045497b4b2b 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -7,6 +7,7 @@ , gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45 , ninja, meson, python3Packages, glibcLocales , patchelf +, substituteAll , getent , buildPackages , perl @@ -30,7 +31,7 @@ let gnupg-minimal = gnupg.override { bzip2 = null; }; in stdenv.mkDerivation { - version = "243.7"; + version = "244.3"; pname = "systemd"; # When updating, use https://github.com/systemd/systemd-stable tree, not the development one! @@ -38,8 +39,8 @@ in stdenv.mkDerivation { src = fetchFromGitHub { owner = "systemd"; repo = "systemd-stable"; - rev = "f8dd0f2f15a566ede668c59e3c810c61f9d62c51"; - sha256 = "1alvvciddg36by1bgzi8aarnms4crzqqyizj3nhlddh35pgpwvdk"; + rev = "c4280c342bbf4fa8da833103482362236c18f835"; + sha256 = "0y83nsrbdn0y3wfyfx53ac8c3wy9jrra86aaxix568vigi48g9zi"; }; patches = [ @@ -56,13 +57,17 @@ in stdenv.mkDerivation { ./0016-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch ./0018-Install-default-configuration-into-out-share-factory.patch ./0019-inherit-systemd-environment-when-calling-generators.patch - ./0020-reintroduce-the-no-such-path-PATH-that-was-dropped-s.patch ./0021-add-rootprefix-to-lookup-dir-paths.patch ./0022-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch ./0023-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch ./0024-kmod-static-nodes.service-Update-ConditionFileNotEmpty.patch + ./0025-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch ]; + postPatch = '' + substituteInPlace src/basic/path-util.h --replace "@defaultPathNormal@" "${placeholder "out"}/bin/" + ''; + outputs = [ "out" "lib" "man" "dev" ]; nativeBuildInputs = -- cgit v1.2.3 From d2871a723a1c78910f78a888e7591a8e2688c087 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 7 Mar 2020 23:50:26 +0100 Subject: systemd: 244.3 -> 245 --- pkgs/os-specific/linux/systemd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 045497b4b2b..6e427cfc6a0 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -31,7 +31,7 @@ let gnupg-minimal = gnupg.override { bzip2 = null; }; in stdenv.mkDerivation { - version = "244.3"; + version = "245"; pname = "systemd"; # When updating, use https://github.com/systemd/systemd-stable tree, not the development one! @@ -39,8 +39,8 @@ in stdenv.mkDerivation { src = fetchFromGitHub { owner = "systemd"; repo = "systemd-stable"; - rev = "c4280c342bbf4fa8da833103482362236c18f835"; - sha256 = "0y83nsrbdn0y3wfyfx53ac8c3wy9jrra86aaxix568vigi48g9zi"; + rev = "ea500ac513cf51bcb79a5666f1519499d029428f"; + sha256 = "10jjj3maqhi6qschw9c45phjg9azpp84wlfackcqc20vj5dqm5sq"; }; patches = [ -- cgit v1.2.3 From b0b7f673dcf2098779ca4369496add67626a5ecc Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 16 Apr 2020 20:21:35 +0200 Subject: systemd: 245 -> 245.3 --- pkgs/os-specific/linux/systemd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 6e427cfc6a0..72c27a1f9f6 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -31,7 +31,7 @@ let gnupg-minimal = gnupg.override { bzip2 = null; }; in stdenv.mkDerivation { - version = "245"; + version = "245.3"; pname = "systemd"; # When updating, use https://github.com/systemd/systemd-stable tree, not the development one! @@ -39,8 +39,8 @@ in stdenv.mkDerivation { src = fetchFromGitHub { owner = "systemd"; repo = "systemd-stable"; - rev = "ea500ac513cf51bcb79a5666f1519499d029428f"; - sha256 = "10jjj3maqhi6qschw9c45phjg9azpp84wlfackcqc20vj5dqm5sq"; + rev = "0f5047b7d393cfba37f91e25cae559a0bc910582"; + sha256 = "0wyh14gbvvpgdmk1mjgpxr9i4pv1i9n7pnwpa0gvjh6hq948fyn2"; }; patches = [ -- cgit v1.2.3 From c18ceab1068e4ecaa986f6a9ad89b8c3560a58c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 16 Apr 2020 05:03:47 +0100 Subject: systemd: remove myself as maintainer --- pkgs/os-specific/linux/systemd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 72c27a1f9f6..1f69757b828 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -294,6 +294,6 @@ in stdenv.mkDerivation { license = licenses.lgpl21Plus; platforms = platforms.linux; priority = 10; - maintainers = with maintainers; [ andir eelco flokli mic92 ]; + maintainers = with maintainers; [ andir eelco flokli ]; }; } -- cgit v1.2.3 From ce7c1230ea54a4ecf983466fe8a8e28bb09264cc Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 16 Apr 2020 20:23:46 +0200 Subject: systemd: explicitly disable homed for now We don't currently have tests to ensure it works and keeps working. So instead of having it accidentially working, and possibly breaking it in the future, disable it for now. --- pkgs/os-specific/linux/systemd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 1f69757b828..0f49a195534 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -109,6 +109,7 @@ in stdenv.mkDerivation { "-Dtests=false" "-Dimportd=true" "-Dlz4=true" + "-Dhomed=false" "-Dhostnamed=true" "-Dnetworkd=true" "-Dsysusers=false" -- cgit v1.2.3 From b3f14109a8fab586d657d0f04ad700b008258e29 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 16 Apr 2020 20:28:26 +0200 Subject: systemd: explicitly disable portabled for now This hasn't worked with 243, let's disable it for now, until we have tests and can ensure it works and keeps working. --- pkgs/os-specific/linux/systemd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 0f49a195534..3a83ee63172 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -112,6 +112,7 @@ in stdenv.mkDerivation { "-Dhomed=false" "-Dhostnamed=true" "-Dnetworkd=true" + "-Dportabled=false" "-Dsysusers=false" "-Dtimedated=true" "-Dtimesyncd=true" -- cgit v1.2.3 From a6f776bba5cae2ba7f357f689223f27b0a820450 Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Thu, 16 Apr 2020 15:44:39 -0700 Subject: bs-platform: 7.2.0 -> 7.3.1 --- pkgs/development/compilers/bs-platform/build-bs-platform.nix | 2 +- pkgs/development/compilers/bs-platform/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/bs-platform/build-bs-platform.nix b/pkgs/development/compilers/bs-platform/build-bs-platform.nix index d7d0fe0b12b..71ba415d620 100644 --- a/pkgs/development/compilers/bs-platform/build-bs-platform.nix +++ b/pkgs/development/compilers/bs-platform/build-bs-platform.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp -rf jscomp lib ${bin_folder} vendor odoc_gen native bsb bsc bsrefmt $out - mkdir $out/lib/ocaml + mkdir -p $out/lib/ocaml cp jscomp/runtime/js.* jscomp/runtime/*.cm* $out/lib/ocaml cp jscomp/others/*.ml jscomp/others/*.mli jscomp/others/*.cm* $out/lib/ocaml cp jscomp/stdlib-406/*.ml jscomp/stdlib-406/*.mli jscomp/stdlib-406/*.cm* $out/lib/ocaml diff --git a/pkgs/development/compilers/bs-platform/default.nix b/pkgs/development/compilers/bs-platform/default.nix index 14347da98b8..ee4123a23c1 100644 --- a/pkgs/development/compilers/bs-platform/default.nix +++ b/pkgs/development/compilers/bs-platform/default.nix @@ -4,14 +4,14 @@ let in (build-bs-platform rec { inherit stdenv runCommand fetchFromGitHub ninja nodejs python3; - version = "7.2.0"; + version = "7.3.1"; ocaml-version = "4.06.1"; src = fetchFromGitHub { owner = "BuckleScript"; repo = "bucklescript"; rev = version; - sha256 = "1fsx7gvcp6rbqd0qf5fix02mbbmk9rgm09zbwjrx0lp5cjv3n2s4"; + sha256 = "14vp6cl5ml7xb3pd0paqajb50qv62l8j5m8hi3b6fh0pm68j1yxd"; fetchSubmodules = true; }; }).overrideAttrs (attrs: { -- cgit v1.2.3 From 9301b2c95d34aca5d355494ca1d0ce3085663bf5 Mon Sep 17 00:00:00 2001 From: Hugo Reeves Date: Fri, 17 Apr 2020 10:52:22 +1200 Subject: joplin-desktop: add maintainer hugoreeves, change homepage --- pkgs/applications/misc/joplin-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 11dd176b7c1..5787836487b 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -40,9 +40,9 @@ in appimageTools.wrapType2 rec { applications directly or from your own text editor. The notes are in Markdown format. ''; - homepage = "https://joplin.cozic.net/"; + homepage = "https://joplinapp.org"; license = licenses.mit; - maintainers = with maintainers; [ rafaelgg raquelgb ]; + maintainers = with maintainers; [ hugoreeves rafaelgg raquelgb ]; platforms = [ "x86_64-linux" ]; }; } -- cgit v1.2.3 From 9a4ee0c6331cc7d865bfc598f8bcf1eb31899ab1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 17 Apr 2020 01:22:16 +0200 Subject: scribusUnstable: Fix build with Poppler 0.86 --- pkgs/applications/office/scribus/unstable.nix | 48 +++++++++++++++++---------- 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix index faff45c8884..d6084c0f37e 100644 --- a/pkgs/applications/office/scribus/unstable.nix +++ b/pkgs/applications/office/scribus/unstable.nix @@ -44,28 +44,40 @@ mkDerivation rec { }; patches = [ + # Poppler patches from + # https://github.com/scribusproject/scribus/commits/master/scribus/plugins/import/pdf + # fix build with Poppler 0.82 - ( - fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/6db15ec1af791377b28981601f8c296006de3c6f.patch"; - sha256 = "1y6g3avmsmiyaj8xry1syaz8sfznsavh6l2rp13pj2bwsxfcf939"; - } - ) + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/6db15ec1af791377b28981601f8c296006de3c6f.patch"; + sha256 = "1y6g3avmsmiyaj8xry1syaz8sfznsavh6l2rp13pj2bwsxfcf939"; + }) # fix build with Poppler 0.83 - ( - fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/b51c2bab4d57d685f96d427d6816bdd4ecfb4674.patch"; - sha256 = "031yy9ylzksczfnpcc4glfccz025sn47zg6fqqzjnqqrc16bgdlx"; - } - ) + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/b51c2bab4d57d685f96d427d6816bdd4ecfb4674.patch"; + sha256 = "031yy9ylzksczfnpcc4glfccz025sn47zg6fqqzjnqqrc16bgdlx"; + }) # fix build with Poppler 0.84 # TODO: Remove patches with scribus version > 1.5.5 as it should be fixed upstream in next version - ( - fetchpatch { - url = "https://github.com/scribusproject/scribus/commit/3742559924136c2471ab15081c5b600dd5feaeb0.patch"; - sha256 = "1d72h7jbajy9w83bnxmhn1ca947hpfxnfbmq30g5ljlj824c7y9y"; - } - ) + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/3742559924136c2471ab15081c5b600dd5feaeb0.patch"; + sha256 = "1d72h7jbajy9w83bnxmhn1ca947hpfxnfbmq30g5ljlj824c7y9y"; + }) + # Formating changes needed for the Poppler 0.86 patch to apply + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/58613b5ce44335f202a55ab15ed303d97fe274cb.patch"; + sha256 = "qwmVAZVYCijLNMVGwnOLJE8223vcRwPWfEvNKiDjw5o="; + }) + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/24aba508aac3f672f5f8cd629744a3b71e58ec37.patch"; + sha256 = "sha256-OY+EIiGBTg2aIAmZOnkI8DPZVZYqFZAKnD7ychge1Dw="; + includes = [ "scribus/plugins/import/pdf/*" ]; + }) + # fix build with Poppler 0.86 + (fetchpatch { + url = "https://github.com/scribusproject/scribus/commit/67f8771aaff2f55d61b8246f420e762f4b526944.patch"; + sha256 = "51z+BYKhbH8a9dFph8X60NGpiogSb+5tOhW2d+m/X9M="; + }) ]; enableParallelBuilding = true; -- cgit v1.2.3 From 93c19ecc88dfb8450763dcdcb669d6313da35170 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Fri, 17 Apr 2020 08:14:02 +0800 Subject: go-ethereum: 1.9.12 -> 1.9.13 --- pkgs/applications/blockchains/go-ethereum.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index 980b485b956..6a443571d0f 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -2,18 +2,19 @@ buildGoModule rec { pname = "go-ethereum"; - version = "1.9.12"; + version = "1.9.13"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "143imiphyzk3009cfnqj7q013pb1wva13zq63byfj3d204b58cg6"; + sha256 = "1yqqflp73yvjy6bp05xd1nv5fc6p1nx7g4spbssxf3ws96pdh425"; }; - modSha256 = "15a8if5gx361nrqgv201jy8saq1ir1g18rpqzdmavg4ic75si5x1"; + modSha256 = "07xrw3fivfpbkg4mp8ghrj1bishfas82dbd780fymgs2h74iigf3"; subPackages = [ + "cmd/abidump" "cmd/abigen" "cmd/bootnode" "cmd/checkpoint-admin" -- cgit v1.2.3 From 81c9968569ba0f6b3593dcf38ac5fe8f69053a8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Fri, 17 Apr 2020 02:22:51 +0200 Subject: pidgin-carbons: Remove no-longer-maintainer. See https://github.com/NixOS/nixpkgs/pull/85276#issuecomment-614832814. --- .../networking/instant-messengers/pidgin-plugins/carbons/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix index 705b2caeb7d..7c2150a584f 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/carbons/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { description = "XEP-0280: Message Carbons plugin for libpurple"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = with maintainers; [ jb55 ]; + maintainers = with maintainers; [ ]; }; } -- cgit v1.2.3 From 0b6602c9a27bb637415c034124f12c2c048888d4 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Thu, 16 Apr 2020 19:18:12 -0400 Subject: python3Packages.cirq: fix test failures (ZHF) Also build on aarch64 by disabling a few failing tests. --- pkgs/development/python-modules/cirq/default.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cirq/default.nix b/pkgs/development/python-modules/cirq/default.nix index a671f0e68e8..18c1e7f8c0d 100644 --- a/pkgs/development/python-modules/cirq/default.nix +++ b/pkgs/development/python-modules/cirq/default.nix @@ -1,4 +1,5 @@ -{ lib +{ stdenv +, lib , buildPythonPackage , pythonOlder , fetchFromGitHub @@ -37,13 +38,16 @@ buildPythonPackage rec { # Cirq 0.6 requires networkx==2.3 only for optional qiskit dependency/test, disable this to avoid networkx version conflicts. https://github.com/quantumlib/Cirq/issues/2368 # Cirq locks protobuf==3.8.0, but tested working with default pythonPackages.protobuf (3.7). This avoids overrides/pythonPackages.protobuf conflicts - prePatch = '' + postPatch = '' substituteInPlace requirements.txt --replace "networkx==2.3" "networkx" \ --replace "protobuf==3.8.0" "protobuf" # Fix sympy 1.5 test failures. Should be fixed in v0.7 substituteInPlace cirq/optimizers/eject_phased_paulis_test.py --replace "phase_exponent=0.125 + x / 8" "phase_exponent=0.125 + x * 0.125" substituteInPlace cirq/contrib/quirk/cells/parse_test.py --replace "parse_formula('5t') == 5 * t" "parse_formula('5t') == 5.0 * t" + + # Fix pandas >= 1.0 error, #2886 + substituteInPlace cirq/experiments/t1_decay_experiment.py --replace "del tab.columns.name" 'tab.rename_axis(None, axis="columns", inplace=True)' ''; propagatedBuildInputs = [ @@ -76,6 +80,13 @@ buildPythonPackage rec { "--ignore=dev_tools" # Only needed when developing new code, which is out-of-scope "--ignore=cirq/google/op_serializer_test.py" # investigating in https://github.com/quantumlib/Cirq/issues/2727 ]; + disabledTests = [ + "test_convert_to_ion_gates" # fails due to rounding error, 0.75 != 0.750...2 + ] ++ lib.optionals stdenv.isAarch64 [ + # Seem to fail due to math issues on aarch64? + "expectation_from_wavefunction" + "test_single_qubit_op_to_framed_phase_form_output_on_example_case" + ]; meta = with lib; { description = "A framework for creating, editing, and invoking Noisy Intermediate Scale Quantum (NISQ) circuits."; -- cgit v1.2.3 From 3b8a98d6393d778bd3b36b65b81ed1fb5c9abe42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 16 Apr 2020 14:55:41 -0300 Subject: mpc-qt: 18.08 -> 2019-06-09 - update to the latest commit in git repository - use mkDerivation for qt applications - original repo disappeared from github; use the one from gitlab --- pkgs/applications/video/mpc-qt/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/applications/video/mpc-qt/default.nix index ff7df19bec1..07b4c79a5b3 100644 --- a/pkgs/applications/video/mpc-qt/default.nix +++ b/pkgs/applications/video/mpc-qt/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, qttools, mpv }: +{ stdenv, mkDerivation, fetchFromGitLab, pkgconfig, qmake, qtx11extras, qttools, mpv }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "mpc-qt"; - version = "18.08"; + version = "2019-06-09"; - src = fetchFromGitHub { - owner = "cmdrkotori"; + src = fetchFromGitLab { + owner = "mpc-qt"; repo = "mpc-qt"; - rev = "v${version}"; - sha256 = "1rxlkg3vsrapazdlb1i6c5a1vvf2114bsqwzcm3n2wc5c93yqsna"; + rev = "2abe6e7fc643068d50522468fe75d614861555ad"; + sha256 = "1cis8dl9pm91mpnp696zvwsfp96gkwr8jgs45anbwd7ldw78w4x5"; }; nativeBuildInputs = [ pkgconfig qmake qttools ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Media Player Classic Qute Theater"; - homepage = "https://github.com/cmdrkotori/mpc-qt"; + homepage = "https://gitlab.com/mpc-qt/mpc-qt"; license = licenses.gpl2; platforms = platforms.unix; maintainers = with maintainers; [ romildo ]; -- cgit v1.2.3 From 919293492b7162227804b0a95030860af7afbc68 Mon Sep 17 00:00:00 2001 From: Constantine Glen Evans Date: Thu, 16 Apr 2020 11:21:46 -0700 Subject: ipe: fix Qt wrapping Uses mkDerivation instead of stdenv.mkDerivation, to fix Qt wrapping problem. --- pkgs/applications/graphics/ipe/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index c6cf71cc67b..6a2a8dbc18f 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, makeWrapper, pkgconfig, zlib, freetype, cairo, lua5, texlive, ghostscript -, libjpeg, libpng, qtbase +, libjpeg, libpng, qtbase, mkDerivation }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "ipe-7.2.13"; src = fetchurl { @@ -20,13 +20,9 @@ stdenv.mkDerivation rec { libjpeg libpng zlib qtbase freetype cairo lua5 texlive ghostscript ]; - nativeBuildInputs = [ makeWrapper pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; - postFixup = '' - for prog in $out/bin/*; do - wrapProgram "$prog" --prefix PATH : "${texlive}/bin" - done - ''; + qtWrapperArgs = [ ''--prefix PATH : ${texlive}/bin'' ]; enableParallelBuilding = true; -- cgit v1.2.3 From 523152f8c7b7942fc7c907daf2356f5191e3f9c8 Mon Sep 17 00:00:00 2001 From: Riley Inman Date: Fri, 17 Apr 2020 01:17:07 -0400 Subject: postcss-cli: init at 7.1.0 --- .../node-packages/node-packages-v10.json | 1 + .../node-packages/node-packages-v10.nix | 1234 ++++++++++++-------- .../node-packages/node-packages-v12.nix | 20 +- .../node-packages/node-packages-v13.nix | 14 +- pkgs/top-level/all-packages.nix | 2 + 5 files changed, 742 insertions(+), 529 deletions(-) diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json index 5045fc86669..177b7fdf12d 100644 --- a/pkgs/development/node-packages/node-packages-v10.json +++ b/pkgs/development/node-packages/node-packages-v10.json @@ -135,6 +135,7 @@ , "peerflix" , "peerflix-server" , "pnpm" +, "postcss-cli" , "prettier" , "pscid" , "pulp" diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index d2e024af909..9fd4e96ad72 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -2443,13 +2443,13 @@ let sha512 = "EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ=="; }; }; - "@octokit/request-5.3.4" = { + "@octokit/request-5.4.0" = { name = "_at_octokit_slash_request"; packageName = "@octokit/request"; - version = "5.3.4"; + version = "5.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request/-/request-5.3.4.tgz"; - sha512 = "qyj8G8BxQyXjt9Xu6NvfvOr1E0l35lsXtwm3SopsYg/JWXjlsnwqLc8rsD2OLguEL/JjLfBvrXr4az7z8Lch2A=="; + url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.0.tgz"; + sha512 = "uAJO6GI8z8VHBqtY7VTL9iFy1Y+UTp5ShpI97tY5z0qBfYKE9rZCRsCm23VmF00x+IoNJ7a0nuVITs/+wS9/mg=="; }; }; "@octokit/request-error-1.2.1" = { @@ -2479,13 +2479,13 @@ let sha512 = "gfFKwRT/wFxq5qlNjnW2dh+qh74XgTQ2B179UX5K1HYCluioWj8Ndbgqw2PVqa1NnVJkGHp2ovMpVn/DImlmkw=="; }; }; - "@octokit/types-2.8.1" = { + "@octokit/types-2.10.0" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "2.8.1"; + version = "2.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-2.8.1.tgz"; - sha512 = "1fzZcYTvPkrJsS9MX7oTMun447Q/tJo5XOtXQsKqmbTbwQV1f+R58pDmjDbzeFbQ7KzMJaDN7Sq4bCh/WHmgLg=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-2.10.0.tgz"; + sha512 = "0/NN22MgQvNNgMjTwzWUzcIfFfks3faqiP1D1oQQz49KYeOWc+KkRG9ASbAPurrAnOaDiqnnuDYzhNT9cq4e8Q=="; }; }; "@parcel/fs-1.11.0" = { @@ -2632,31 +2632,31 @@ let sha1 = "a777360b5b39a1a2e5106f8e858f2fd2d060c570"; }; }; - "@rollup/plugin-commonjs-11.0.2" = { + "@rollup/plugin-commonjs-11.1.0" = { name = "_at_rollup_slash_plugin-commonjs"; packageName = "@rollup/plugin-commonjs"; - version = "11.0.2"; + version = "11.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-11.0.2.tgz"; - sha512 = "MPYGZr0qdbV5zZj8/2AuomVpnRVXRU5XKXb3HVniwRoRCreGlf5kOE081isNWeiLIi6IYkwTX9zE0/c7V8g81g=="; + url = "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-11.1.0.tgz"; + sha512 = "Ycr12N3ZPN96Fw2STurD21jMqzKwL9QuFhms3SD7KKRK7oaXUsBU9Zt0jL/rOPHiPYisI21/rXGO3jr9BnLHUA=="; }; }; - "@rollup/plugin-node-resolve-7.1.1" = { + "@rollup/plugin-node-resolve-7.1.3" = { name = "_at_rollup_slash_plugin-node-resolve"; packageName = "@rollup/plugin-node-resolve"; - version = "7.1.1"; + version = "7.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-7.1.1.tgz"; - sha512 = "14ddhD7TnemeHE97a4rLOhobfYvUVcaYuqTnL8Ti7Jxi9V9Jr5LY7Gko4HZ5k4h4vqQM0gBQt6tsp9xXW94WPA=="; + url = "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-7.1.3.tgz"; + sha512 = "RxtSL3XmdTAE2byxekYLnx+98kEUOrPHF/KRVjLH+DEIHy6kjIw7YINQzn+NXiH/NTrQLAwYs0GWB+csWygA9Q=="; }; }; - "@rollup/pluginutils-3.0.8" = { + "@rollup/pluginutils-3.0.9" = { name = "_at_rollup_slash_pluginutils"; packageName = "@rollup/pluginutils"; - version = "3.0.8"; + version = "3.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.0.8.tgz"; - sha512 = "rYGeAc4sxcZ+kPG/Tw4/fwJODC3IXHYDH4qusdN/b6aLw5LPUbzpecYbEJh4sVQGPFJxd2dBU4kc1H3oy9/bnw=="; + url = "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.0.9.tgz"; + sha512 = "TLZavlfPAZYI7v33wQh4mTP6zojne14yok3DNSLcjoG/Hirxfkonn6icP5rrNWRn8nZsirJBFFpijVOJzkUHDg=="; }; }; "@sailshq/lodash-3.10.4" = { @@ -2713,13 +2713,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-2.29.1" = { + "@serverless/components-2.29.3" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "2.29.1"; + version = "2.29.3"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-2.29.1.tgz"; - sha512 = "TnsE3LlfmkDRHs4cJWgNWkeNWlFznw5IWnhNzg9e0sobPR39GOMXPHM2OhIT5Z54ALX+qoSWG9ZFkoFnywX3fg=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-2.29.3.tgz"; + sha512 = "Qrucf/k4QStcVLIvumGvf3oJlotxrcIswO0LnTu6WosPQHrVXy6uMTd2QF5raNMi4UTnOA86ZM//XXYkgGbDnw=="; }; }; "@serverless/core-1.1.2" = { @@ -2776,13 +2776,13 @@ let sha512 = "29JV8XpJPTUSWgDwxhvZZ9fi9/5jCn1x5IeT+xEiEkpuXZU79wXlSfMfc8XtptOsDouZnOhBpKEZrItGp67CFw=="; }; }; - "@serverless/platform-client-china-1.0.3" = { + "@serverless/platform-client-china-1.0.5" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; - version = "1.0.3"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-1.0.3.tgz"; - sha512 = "+MqqHJ7OEQzHGmZy56sBxSwgqY77PDAjOh7HFi4bddlEa47+DzpTuKS/9fgJ92YF27hnb5cf754eeeyE4ljWmA=="; + url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-1.0.5.tgz"; + sha512 = "EhiVkC3qh8uZQjcIXbN7n1eVCKiyvriJjghbOe4cigkNhT/dHPTFM23aK3h/rJowfP9P5+R4xfKsaCWRjA8Y3Q=="; }; }; "@serverless/platform-sdk-2.3.0" = { @@ -2803,13 +2803,13 @@ let sha512 = "hcMiX523rkp6kHeKnM1x6/dXEY+d1UFSr901yVKeeCgpFy4u33UI9vlKaPweAZCF6Ahzqywf01IsFTuBVadCrQ=="; }; }; - "@serverless/utils-china-0.1.1" = { + "@serverless/utils-china-0.1.3" = { name = "_at_serverless_slash_utils-china"; packageName = "@serverless/utils-china"; - version = "0.1.1"; + version = "0.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-0.1.1.tgz"; - sha512 = "B4/PC2iVEn0xbPu/dWE/hAWsgwfUKpekf03KTk6CXkWMkfq3EoewqAOIgceWTCVzKLrAhQ+zTsAzdLD9FpxjQA=="; + url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-0.1.3.tgz"; + sha512 = "2KtmNFNGvWC/TAOkcnp8oDchAlLh/anpnxLifBb2xjbP50m3tOnoea5eU1QRENPOtCrg0iqCpfmfJ3eiCkaf0A=="; }; }; "@sindresorhus/is-0.14.0" = { @@ -3442,13 +3442,13 @@ let sha512 = "I8cGRJj3pyOLs/HndoP+25vOqhqWkAZsWMEmq1qXy/b/M3ppufecUwaK2/TVDVxcV61/iSdhykUjQQ2DLSrTdg=="; }; }; - "@types/express-serve-static-core-4.17.4" = { + "@types/express-serve-static-core-4.17.5" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.4"; + version = "4.17.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.4.tgz"; - sha512 = "dPs6CaRWxsfHbYDVU51VjEJaUJEcli4UI0fFMT4oWmgCvHj+j7oIxz5MLHVL0Rv++N004c21ylJNdWQvPkkb5w=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.5.tgz"; + sha512 = "578YH5Lt88AKoADy0b2jQGwJtrBxezXtVe/MBqWXKZpqx91SnC0pVkVCcxcytz3lWW+cHBYDi3Ysh0WXc+rAYw=="; }; }; "@types/fs-capacitor-2.0.0" = { @@ -3523,13 +3523,13 @@ let sha512 = "UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA=="; }; }; - "@types/jquery-3.3.34" = { + "@types/jquery-3.3.35" = { name = "_at_types_slash_jquery"; packageName = "@types/jquery"; - version = "3.3.34"; + version = "3.3.35"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.34.tgz"; - sha512 = "lW9vsVL53Xu/Nj4gi2hNmHGc4u3KKghjqTkAlO0kF5GIOPxbqqnQpgqJBzmn3yXLrPqHb6cmNJ6URnS23Vtvbg=="; + url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.35.tgz"; + sha512 = "pnIELWhHXJ7RgoFylhiTxD+96QlKBJfEx8JCLj963/dh7zBOKFkZ6rlNqbaCcn2JZrsAxCI8WhgRXznBx2iDsA=="; }; }; "@types/js-yaml-3.12.3" = { @@ -3658,13 +3658,13 @@ let sha512 = "eWQGP3qtxwL8FGneRrC5DwrJLGN4/dH1clNTuLfN81HCrxVtxRjygDTUoZJ5ASlDEeo0ppYFQjQIlXhtXpOn6g=="; }; }; - "@types/node-6.14.9" = { + "@types/node-6.14.10" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "6.14.9"; + version = "6.14.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-6.14.9.tgz"; - sha512 = "leP/gxHunuazPdZaCvsCefPQxinqUDsCxCR5xaDUrY2MkYxQRFZZwU5e7GojyYsGB7QVtCi7iVEl/hoFXQYc+w=="; + url = "https://registry.npmjs.org/@types/node/-/node-6.14.10.tgz"; + sha512 = "pF4HjZGSog75kGq7B1InK/wt/N08BuPATo+7HRfv7gZUzccebwv/fmWVGs/j6LvSiLWpCuGGhql51M/wcQsNzA=="; }; }; "@types/node-fetch-2.5.5" = { @@ -3865,13 +3865,13 @@ let sha512 = "te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="; }; }; - "@typescript-eslint/eslint-plugin-2.27.0" = { + "@typescript-eslint/eslint-plugin-2.28.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "2.27.0"; + version = "2.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.27.0.tgz"; - sha512 = "/my+vVHRN7zYgcp0n4z5A6HAK7bvKGBiswaM5zIlOQczsxj/aiD7RcgD+dvVFuwFaGh5+kM7XA6Q6PN0bvb1tw=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.28.0.tgz"; + sha512 = "w0Ugcq2iatloEabQP56BRWJowliXUP5Wv6f9fKzjJmDW81hOTBxRoJ4LoEOxRpz9gcY51Libytd2ba3yLmSOfg=="; }; }; "@typescript-eslint/experimental-utils-1.13.0" = { @@ -3883,13 +3883,13 @@ let sha512 = "zmpS6SyqG4ZF64ffaJ6uah6tWWWgZ8m+c54XXgwFtUv0jNz8aJAVx8chMCvnk7yl6xwn8d+d96+tWp7fXzTuDg=="; }; }; - "@typescript-eslint/experimental-utils-2.27.0" = { + "@typescript-eslint/experimental-utils-2.28.0" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "2.27.0"; + version = "2.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.27.0.tgz"; - sha512 = "vOsYzjwJlY6E0NJRXPTeCGqjv5OHgRU1kzxHKWJVPjDYGbPgLudBXjIlc+OD1hDBZ4l1DLbOc5VjofKahsu9Jw=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.28.0.tgz"; + sha512 = "4SL9OWjvFbHumM/Zh/ZeEjUFxrYKtdCi7At4GyKTbQlrj1HcphIDXlje4Uu4cY+qzszR5NdVin4CCm6AXCjd6w=="; }; }; "@typescript-eslint/parser-1.13.0" = { @@ -3901,13 +3901,13 @@ let sha512 = "ITMBs52PCPgLb2nGPoeT4iU3HdQZHcPaZVw+7CsFagRJHUhyeTgorEwHXhFf3e7Evzi8oujKNpHc8TONth8AdQ=="; }; }; - "@typescript-eslint/parser-2.27.0" = { + "@typescript-eslint/parser-2.28.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "2.27.0"; + version = "2.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.27.0.tgz"; - sha512 = "HFUXZY+EdwrJXZo31DW4IS1ujQW3krzlRjBrFRrJcMDh0zCu107/nRfhk/uBasO8m0NVDbBF5WZKcIUMRO7vPg=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.28.0.tgz"; + sha512 = "RqPybRDquui9d+K86lL7iPqH6Dfp9461oyqvlXMNtap+PyqYbkY5dB7LawQjDzot99fqzvS0ZLZdfe+1Bt3Jgw=="; }; }; "@typescript-eslint/typescript-estree-1.13.0" = { @@ -3919,13 +3919,13 @@ let sha512 = "b5rCmd2e6DCC6tCTN9GSUAuxdYwCM/k/2wdjHGrIRGPSJotWMCe/dGpi66u42bhuh8q3QBzqM4TMA1GUUCJvdw=="; }; }; - "@typescript-eslint/typescript-estree-2.27.0" = { + "@typescript-eslint/typescript-estree-2.28.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "2.27.0"; + version = "2.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.27.0.tgz"; - sha512 = "t2miCCJIb/FU8yArjAvxllxbTiyNqaXJag7UOpB5DVoM3+xnjeOngtqlJkLRnMtzaRcJhe3CIR9RmL40omubhg=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.28.0.tgz"; + sha512 = "HDr8MP9wfwkiuqzRVkuM3BeDrOC4cKbO5a6BymZBHUt5y/2pL0BXD6I/C/ceq2IZoHWhcASk+5/zo+dwgu9V8Q=="; }; }; "@vue/cli-shared-utils-4.3.1" = { @@ -4495,6 +4495,15 @@ let sha512 = "BsLm5vFMRUrrLeCcRc+G0t2qOaTzpoJQLOubq2XM72eNpjF5UdU5o/5NvlNhx95XHcAvcl8OMXr4mlg/fRgUXQ=="; }; }; + "abstract-leveldown-6.3.0" = { + name = "abstract-leveldown"; + packageName = "abstract-leveldown"; + version = "6.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.3.0.tgz"; + sha512 = "TU5nlYgta8YrBMNpc9FwQzRbiXsj49gsALsXadbGHt9CROPzX5fB0rWDR5mtdpOOKa5XqRFpbj1QroPAoPzVjQ=="; + }; + }; "abstract-logging-1.0.0" = { name = "abstract-logging"; packageName = "abstract-logging"; @@ -6988,13 +6997,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.656.0" = { + "aws-sdk-2.657.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.656.0"; + version = "2.657.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.656.0.tgz"; - sha512 = "UzqDvvt6i7gpuzEdK0GT/JOfBJcsCPranzZWdQ9HR4+5E0m5kf5gybZ6OX+UseIAE2/WND6Dv0aHgiI21AKenw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.657.0.tgz"; + sha512 = "CGxnYEFkZwIflH0cnylMtyNNmjkQIK5gG9L0MRGha4ANSogBrCXfWcjSWP1ziDK0FhRBAyJVdMX0il/kW4ya+A=="; }; }; "aws-sign2-0.6.0" = { @@ -8743,13 +8752,13 @@ let sha512 = "c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg=="; }; }; - "buffer-5.5.0" = { + "buffer-5.6.0" = { name = "buffer"; packageName = "buffer"; - version = "5.5.0"; + version = "5.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.5.0.tgz"; - sha512 = "9FTEDjLjwoAkEwyMGDjYJQN2gfRgOKBKRfiglhvibGbpeeU/pQn1bJxQqm32OD/AIeEuHxU9roxXxg34Byp/Ww=="; + url = "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz"; + sha512 = "/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw=="; }; }; "buffer-alloc-1.2.0" = { @@ -9436,13 +9445,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001040" = { + "caniuse-lite-1.0.30001042" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001040"; + version = "1.0.30001042"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001040.tgz"; - sha512 = "Ep0tEPeI5wCvmJNrXjE3etgfI+lkl1fTDU6Y3ZH1mhrjkPlVI9W4pcKbMo+BQLpEWKVYYp2EmYaRsqpPC3k7lQ=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001042.tgz"; + sha512 = "igMQ4dlqnf4tWv0xjaaE02op9AJ2oQzXKjWf4EuAHFN694Uo9/EfPVIPJcmn2WkU9RqozCxx5e2KPcVClHDbDw=="; }; }; "capture-exit-2.0.0" = { @@ -10363,13 +10372,13 @@ let sha1 = "a4d293ef67ebb7b88d4a4d42c0ccf00c4d1e366d"; }; }; - "cli-width-2.2.0" = { + "cli-width-2.2.1" = { name = "cli-width"; packageName = "cli-width"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz"; - sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639"; + url = "https://registry.npmjs.org/cli-width/-/cli-width-2.2.1.tgz"; + sha512 = "GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw=="; }; }; "cliclopts-1.1.1" = { @@ -11029,13 +11038,13 @@ let sha512 = "Qst/zUUNmS/z3WziPxyqjrcz09pm+2Knbs5mAZL4VAE0sSrNY1/w8+/YxeHcoBTsO6iojA6BW7eFf27Eg2MRuw=="; }; }; - "command-exists-1.2.8" = { + "command-exists-1.2.9" = { name = "command-exists"; packageName = "command-exists"; - version = "1.2.8"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/command-exists/-/command-exists-1.2.8.tgz"; - sha512 = "PM54PkseWbiiD/mMsbvW351/u+dafwTJ0ye2qB60G1aGQP9j3xK2gmMDc+R34L3nDtx4qMCitXT75mkbkGJDLw=="; + url = "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz"; + sha512 = "LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w=="; }; }; "command-line-usage-4.1.0" = { @@ -11407,13 +11416,13 @@ let sha512 = "bzlVWS2THbMetHqXKB8ypsXN4DQ/1qopGwNJi1eYbpwesJcd86FBjFciCQX/YwAhp9bM7NVnPFqZ5LpV7gP0Dg=="; }; }; - "conf-6.2.3" = { + "conf-6.2.4" = { name = "conf"; packageName = "conf"; - version = "6.2.3"; + version = "6.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/conf/-/conf-6.2.3.tgz"; - sha512 = "xwce2fuN77kiXiUq0tQImwJM0SXkGKt1/uZYyiQ9OWUKUQmF6gzIMyCL0idlpgQelKomSFMkAGn2QK7JJ2c1Cg=="; + url = "https://registry.npmjs.org/conf/-/conf-6.2.4.tgz"; + sha512 = "GjgyPRLo1qK1LR9RWAdUagqo+DP18f5HWCFk4va7GS+wpxQTOzfuKTwKOvGW2c01/YXNicAyyoyuSddmdkBzZQ=="; }; }; "config-1.31.0" = { @@ -13883,6 +13892,15 @@ let sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="; }; }; + "dependency-graph-0.8.1" = { + name = "dependency-graph"; + packageName = "dependency-graph"; + version = "0.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.8.1.tgz"; + sha512 = "g213uqF8fyk40W8SBjm079n3CZB4qSpCrA2ye1fLGzH/4HEgB6tzuW2CbLE7leb4t45/6h44Ud59Su1/ROTfqw=="; + }; + }; "dependency-tree-7.2.1" = { name = "dependency-tree"; packageName = "dependency-tree"; @@ -15215,13 +15233,13 @@ let sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="; }; }; - "electron-to-chromium-1.3.403" = { + "electron-to-chromium-1.3.411" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.403"; + version = "1.3.411"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.403.tgz"; - sha512 = "JaoxV4RzdBAZOnsF4dAlZ2ijJW72MbqO5lNfOBHUWiBQl3Rwe+mk2RCUMrRI3rSClLJ8HSNQNqcry12H+0ZjFw=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.411.tgz"; + sha512 = "TDDfkuSYEbknN0kRPSAD8WzB452pJ6EmIxGbI9yQHkDxUNbD6Educ10DxyA9r/DuLL4z255IO1OZIw+eFK6XUw=="; }; }; "elegant-spinner-1.0.1" = { @@ -15275,7 +15293,7 @@ let version = "1.0.1"; src = fetchurl { name = "emitter-1.0.1.tar.gz"; - url = "https://codeload.github.com/component/emitter/tar.gz/1.0.1"; + url = https://codeload.github.com/component/emitter/tar.gz/1.0.1; sha256 = "0eae744826723877457f7a7ac7f31d68a5a060673b3a883f6a8e325bf48f313d"; }; }; @@ -16278,13 +16296,13 @@ let sha1 = "633acdb40d9bd4db8a1c1d68c06a942959fad2b0"; }; }; - "esquery-1.2.0" = { + "esquery-1.3.1" = { name = "esquery"; packageName = "esquery"; - version = "1.2.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/esquery/-/esquery-1.2.0.tgz"; - sha512 = "weltsSqdeWIX9G2qQZz7KlTRJdkkOCTPgLYJUz1Hacf48R4YOwGPHO3+ORfWedqJKbq5WQmsgK90n+pFLIKt/Q=="; + url = "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz"; + sha512 = "olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ=="; }; }; "esrecurse-4.2.1" = { @@ -16350,13 +16368,13 @@ let sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; }; }; - "estraverse-5.0.0" = { + "estraverse-5.1.0" = { name = "estraverse"; packageName = "estraverse"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-5.0.0.tgz"; - sha512 = "j3acdrMzqrxmJTNj5dbr1YbjacrYgAxVMeF0gK16E3j494mOe7xygM/ZLIguEQ0ETwAg2hlJCtHRGav+y0Ny5A=="; + url = "https://registry.npmjs.org/estraverse/-/estraverse-5.1.0.tgz"; + sha512 = "FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw=="; }; }; "estree-walker-0.6.1" = { @@ -18060,13 +18078,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.122.0" = { + "flow-parser-0.123.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.122.0"; + version = "0.123.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.122.0.tgz"; - sha512 = "rb4pLIb7JAWn4dnO+fB9YLTUOM0SvY1ZN2yeu2NOyL7f2JeXBp9Nevqf+h4OluQcdI+9CnGa/if/HUy1YOX0dA=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.123.0.tgz"; + sha512 = "scMjcsICxtHm141rFTfWgKnNbz9MUubgc9kNSh+0xvTYIA/L+9AzlPRK0FMcfNiqQTWjn0IMGqiwySLzMZVvtw=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -19614,7 +19632,7 @@ let version = "2.0.1"; src = fetchurl { name = "global-2.0.1.tar.gz"; - url = "https://codeload.github.com/component/global/tar.gz/v2.0.1"; + url = https://codeload.github.com/component/global/tar.gz/v2.0.1; sha256 = "42be02b7148745447f6ba21137c972ca82d2cad92d30d63bd4fc310623901785"; }; }; @@ -20194,13 +20212,13 @@ let sha512 = "4FOv3ZKfA4WdOKJeHdz6B3F/vxBLSgmBcGeAFPf4n1F64ltJUvOOerNj0rsJxONQGdhUMynQIvd6LzB+1J5oKA=="; }; }; - "graphql-tools-4.0.7" = { + "graphql-tools-4.0.8" = { name = "graphql-tools"; packageName = "graphql-tools"; - version = "4.0.7"; + version = "4.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-tools/-/graphql-tools-4.0.7.tgz"; - sha512 = "rApl8sT8t/W1uQRcwzxMYyUBiCl/XicluApiDkNze5TX/GR0BSTQMjM2UcRGdTmkbsb1Eqq6afkyyeG/zMxZYQ=="; + url = "https://registry.npmjs.org/graphql-tools/-/graphql-tools-4.0.8.tgz"; + sha512 = "MW+ioleBrwhRjalKjYaLQbr+920pHBgy9vM/n47sswtns8+96sRn5M/G+J1eu7IMeKWiN/9p6tmwCHU7552VJg=="; }; }; "graphql-type-json-0.3.1" = { @@ -20239,13 +20257,13 @@ let sha512 = "CgXlq3PGpBRj8RMnLSYs46Hvl5q9Up9kwuMAcYlvS4sNgH5j4Ao7hbY+HI62PaYTeIdffiJidLEIeZVCmZCrFA=="; }; }; - "grouped-queue-1.0.0" = { + "grouped-queue-1.1.0" = { name = "grouped-queue"; packageName = "grouped-queue"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/grouped-queue/-/grouped-queue-1.0.0.tgz"; - sha512 = "XslfWrAGCYovQjveHODR0hllUrsn3UtvPFTkamHbgVHmkUA6eCIDmw3JDWVLJvuntTvYjwaPGamlyzK4/HAEOA=="; + url = "https://registry.npmjs.org/grouped-queue/-/grouped-queue-1.1.0.tgz"; + sha512 = "rZOFKfCqLhsu5VqjBjEWiwrYqJR07KxIkH4mLZlNlGDfntbb4FbMyGFP14TlvRPrU9S3Hnn/sgxbC5ZeN0no3Q=="; }; }; "growl-1.10.5" = { @@ -21094,13 +21112,13 @@ let sha512 = "71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw=="; }; }; - "html-entities-1.2.1" = { + "html-entities-1.3.1" = { name = "html-entities"; packageName = "html-entities"; - version = "1.2.1"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz"; - sha1 = "0df29351f0721163515dfb9e5543e5f6eed5162f"; + url = "https://registry.npmjs.org/html-entities/-/html-entities-1.3.1.tgz"; + sha512 = "rhE/4Z3hIhzHAUKbW8jVcCyuT5oJCXXqhN/6mXXVCpzTmvJnoH2HL/bt3EZ6p55jbFJBeAe1ZNpL5BugLujxNA=="; }; }; "html-minifier-3.5.21" = { @@ -21788,6 +21806,15 @@ let sha512 = "QshP0SFpsy/bHQBjYMgzCcnLoqTj6PHFg8ZkPi2WbTw1qddNy0puuPDaFlXyrsZAdWMT3QziPDMzfj+mzCVMYg=="; }; }; + "import-cwd-2.1.0" = { + name = "import-cwd"; + packageName = "import-cwd"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz"; + sha1 = "aa6cf36e722761285cb371ec6519f53e2435b0a9"; + }; + }; "import-fresh-2.0.0" = { name = "import-fresh"; packageName = "import-fresh"; @@ -21806,6 +21833,15 @@ let sha512 = "6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ=="; }; }; + "import-from-2.1.0" = { + name = "import-from"; + packageName = "import-from"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz"; + sha1 = "335db7f2a7affd53aaa471d4b8021dee36b7f3b1"; + }; + }; "import-global-0.1.0" = { name = "import-global"; packageName = "import-global"; @@ -25651,13 +25687,13 @@ let sha1 = "f3a6a7205272c4b5f35e412ff004a03a0aedf50b"; }; }; - "levelup-4.3.2" = { + "levelup-4.4.0" = { name = "levelup"; packageName = "levelup"; - version = "4.3.2"; + version = "4.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/levelup/-/levelup-4.3.2.tgz"; - sha512 = "cRTjU4ktWo59wf13PHEiOayHC3n0dOh4i5+FHr4tv4MX9+l7mqETicNq3Aj07HKlLdk0z5muVoDL2RD+ovgiyA=="; + url = "https://registry.npmjs.org/levelup/-/levelup-4.4.0.tgz"; + sha512 = "94++VFO3qN95cM/d6eBXvd894oJE0w3cInq9USsyQzzoJxmiYzPAocNcuGCPGGjoXqDVJcr3C1jzt1TSjyaiLQ=="; }; }; "leven-2.1.0" = { @@ -27199,13 +27235,13 @@ let sha512 = "+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ=="; }; }; - "loglevel-1.6.7" = { + "loglevel-1.6.8" = { name = "loglevel"; packageName = "loglevel"; - version = "1.6.7"; + version = "1.6.8"; src = fetchurl { - url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.7.tgz"; - sha512 = "cY2eLFrQSAfVPhCgH1s7JI73tMbg9YC3v3+ZHVW67sBS7UxWzNEk/ZBbSfLykBWHp33dqqtOv82gjhKEi81T/A=="; + url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.8.tgz"; + sha512 = "bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA=="; }; }; "loglevel-colored-level-prefix-1.0.0" = { @@ -28369,13 +28405,13 @@ let sha512 = "qvwipnozMohxLXG1pOqoLiZKNkC4r4qqRucSoDwXowsNGDSULiqFTRUF05vcZWnwJSG22qTsynQhxbaMtnX9gw=="; }; }; - "mem-6.0.1" = { + "mem-6.1.0" = { name = "mem"; packageName = "mem"; - version = "6.0.1"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/mem/-/mem-6.0.1.tgz"; - sha512 = "uIRYASflIsXqvKe+7aXbLrydaRzz4qiK6amqZDQI++eRtW3UoKtnDcGeCAOREgll7YMxO5E4VB9+3B0LFmy96g=="; + url = "https://registry.npmjs.org/mem/-/mem-6.1.0.tgz"; + sha512 = "RlbnLQgRHk5lwqTtpEkBTQ2ll/CG/iB+J4Hy2Wh97PjgZgXgWJWrFF+XXujh3UUVLvR4OOTgZzcWMMwnehlEUg=="; }; }; "mem-fs-1.1.3" = { @@ -30209,13 +30245,13 @@ let sha1 = "ae603b36b134bcec347b452422b0bf98d5832ec8"; }; }; - "nearley-2.19.1" = { + "nearley-2.19.2" = { name = "nearley"; packageName = "nearley"; - version = "2.19.1"; + version = "2.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/nearley/-/nearley-2.19.1.tgz"; - sha512 = "xq47GIUGXxU9vQg7g/y1o1xuKnkO7ev4nRWqftmQrLkfnE/FjRqDaGOUakM8XHPn/6pW3bGjU2wgoJyId90rqg=="; + url = "https://registry.npmjs.org/nearley/-/nearley-2.19.2.tgz"; + sha512 = "h6lygT0BWAGErDvoE2LfI+tDeY2+UUrqG5dcBPdCmjnjud9z1wE0P7ljb85iNbE93YA+xJLpoSYGMuUqhnSSSA=="; }; }; "neat-csv-2.1.0" = { @@ -31621,7 +31657,7 @@ let version = "0.9.15"; src = fetchurl { name = "oauth-0.9.15.tar.gz"; - url = "https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master"; + url = https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master; sha256 = "9341c28772841acde618c778e85e381976f425824b816100792f697e68aec947"; }; }; @@ -31742,13 +31778,13 @@ let sha512 = "a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw=="; }; }; - "object-is-1.0.2" = { + "object-is-1.1.2" = { name = "object-is"; packageName = "object-is"; - version = "1.0.2"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/object-is/-/object-is-1.0.2.tgz"; - sha512 = "Epah+btZd5wrrfjkJZq1AOB9O6OxUQto45hzFd7lXGrpHPGE0W1k+426yrZV+k6NJOzLNNW/nVsmZdIWsAqoOQ=="; + url = "https://registry.npmjs.org/object-is/-/object-is-1.1.2.tgz"; + sha512 = "5lHCz+0uufF6wZ7CRFWJN3hp8Jqblpgve06U5CMQ3f//6iDjPr2PEo9MWCjEssDsa+UZEL4PkFpr+BMop6aKzQ=="; }; }; "object-keys-0.4.0" = { @@ -34416,6 +34452,15 @@ let sha512 = "7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA=="; }; }; + "postcss-load-config-2.1.0" = { + name = "postcss-load-config"; + packageName = "postcss-load-config"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.0.tgz"; + sha512 = "4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q=="; + }; + }; "postcss-markdown-0.36.0" = { name = "postcss-markdown"; packageName = "postcss-markdown"; @@ -34794,13 +34839,13 @@ let sha512 = "C2hrAPzmRdpuL3iH0TDdQ6XCc9M7Dcc3zEW5BLerY65G4tWWszwv6nG/ksi6ul5i2mx22ubdljgktXCtNkydkw=="; }; }; - "posthtml-0.12.0" = { + "posthtml-0.12.2" = { name = "posthtml"; packageName = "posthtml"; - version = "0.12.0"; + version = "0.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/posthtml/-/posthtml-0.12.0.tgz"; - sha512 = "aNUEP/SfKUXAt+ghG51LC5MmafChBZeslVe/SSdfKIgLGUVRE68mrMF4V8XbH07ZifM91tCSuxY3eHIFLlecQw=="; + url = "https://registry.npmjs.org/posthtml/-/posthtml-0.12.2.tgz"; + sha512 = "vDMikGrmr2Ce4ralyBwfoTymA9Ycv2QSeaV+U9CdF/kHstsGSBVsTZ3Jt/BdACFuqCNyaICMdJI/rvGEreL7pA=="; }; }; "posthtml-parser-0.4.2" = { @@ -34812,13 +34857,13 @@ let sha512 = "BUIorsYJTvS9UhXxPTzupIztOMVNPa/HtAm9KHni9z6qEfiJ1bpOBL5DfUOL9XAc3XkLIEzBzpph+Zbm4AdRAg=="; }; }; - "posthtml-render-1.2.0" = { + "posthtml-render-1.2.2" = { name = "posthtml-render"; packageName = "posthtml-render"; - version = "1.2.0"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/posthtml-render/-/posthtml-render-1.2.0.tgz"; - sha512 = "dQB+hoAKDtnI94RZm/wxBUH9My8OJcXd0uhWmGh2c7tVtQ85A+OS3yCN3LNbFtPz3bViwBJXAeoi+CBGMXM0DA=="; + url = "https://registry.npmjs.org/posthtml-render/-/posthtml-render-1.2.2.tgz"; + sha512 = "MbIXTWwAfJ9qET6Zl29UNwJcDJEEz9Zkr5oDhiujitJa7YBJwEpbkX2cmuklCDxubTMoRWpid3q8DrSyGnUUzQ=="; }; }; "prebuild-install-5.3.3" = { @@ -36882,6 +36927,15 @@ let sha1 = "b3da19bd052431a97671d44a42634adf710b40c4"; }; }; + "read-cache-1.0.0" = { + name = "read-cache"; + packageName = "read-cache"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz"; + sha1 = "e664ef31161166c9751cdbe8dbcf86b5fb58f774"; + }; + }; "read-chunk-2.1.0" = { name = "read-chunk"; packageName = "read-chunk"; @@ -37053,6 +37107,15 @@ let sha512 = "TzPdVpK3xEnvsS1yCy94CiOmfzG2/MNuZjpZi64+HJxb9fVZD4nIfFFGZ9T2N/dgwOFumfacw3xCD6rXtgwn2g=="; }; }; + "readable-stream-1.0.2" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.2.tgz"; + sha1 = "213ce36864fc1f0d4e98e03b9eb92c64042299d4"; + }; + }; "readable-stream-1.0.27-1" = { name = "readable-stream"; packageName = "readable-stream"; @@ -38025,6 +38088,15 @@ let sha512 = "84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w=="; }; }; + "resolve-1.16.0" = { + name = "resolve"; + packageName = "resolve"; + version = "1.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.16.0.tgz"; + sha512 = "LarL/PIKJvc09k1jaeT4kQb/8/7P+qV4qSnN2K80AES+OHdfZELAKVOBjxsvtToT/uLOfFbvYvKfZmV8cee7nA=="; + }; + }; "resolve-1.7.1" = { name = "resolve"; packageName = "resolve"; @@ -38511,13 +38583,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.6.0" = { + "rollup-2.6.1" = { name = "rollup"; packageName = "rollup"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.6.0.tgz"; - sha512 = "qbvQ9ZbvbhBdtRBZ/A4g+9z3iJQ1rHAtjinn3FiN+j5tfz8xiNyTE1JEEMcFWqlH7+NHadI9ieeqKdp8HwYLnQ=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.6.1.tgz"; + sha512 = "1RhFDRJeg027YjBO6+JxmVWkEZY0ASztHhoEUEWxOwkh4mjO58TFD6Uo7T7Y3FbmDpRTfKhM5NVxJyimCn0Elg=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -39276,13 +39348,13 @@ let sha512 = "ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA=="; }; }; - "semver-7.2.2" = { + "semver-7.3.2" = { name = "semver"; packageName = "semver"; - version = "7.2.2"; + version = "7.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.2.2.tgz"; - sha512 = "Zo84u6o2PebMSK3zjJ6Zp5wi8VnQZnEaCP13Ul/lt1ANsLACxnJxq4EEm1PY94/por1Hm9+7xpIswdS5AkieMA=="; + url = "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz"; + sha512 = "OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ=="; }; }; "semver-compare-1.0.0" = { @@ -40833,15 +40905,6 @@ let sha512 = "Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw=="; }; }; - "source-map-support-0.4.18" = { - name = "source-map-support"; - packageName = "source-map-support"; - version = "0.4.18"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz"; - sha512 = "try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA=="; - }; - }; "source-map-support-0.5.16" = { name = "source-map-support"; packageName = "source-map-support"; @@ -44902,13 +44965,13 @@ let sha1 = "b75bc2df15649bb84e8b9aa3c0669c6c4bce0d25"; }; }; - "twig-1.15.0" = { + "twig-1.15.1" = { name = "twig"; packageName = "twig"; - version = "1.15.0"; + version = "1.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/twig/-/twig-1.15.0.tgz"; - sha512 = "kJkEbF4sTyZcaMAXffCjaUt6ZSD3v6qZQZd9b6mySvfuUIseTCJCvikphAJvrNJTDw7nZDfGorvTtUkzge1HPg=="; + url = "https://registry.npmjs.org/twig/-/twig-1.15.1.tgz"; + sha512 = "SPGkUM0p7hjgo+y5Dlm/XCSuZe0G3kfcgRPrxkMFln5e8bvQbxDOsia8QEo8xqXfjLR1Emp9FGkVYHya2b8qdA=="; }; }; "txt-to-ast-3.0.3" = { @@ -45199,6 +45262,15 @@ let sha512 = "W7KxyzeaQmZvUFbGj4+YFshhVrMBGSg2IbcYAjGWGvx8DHvJMclbTDMpffdxFUGPBHjIytk7KJUR/KUXstUGDw=="; }; }; + "uglify-js-3.9.1" = { + name = "uglify-js"; + packageName = "uglify-js"; + version = "3.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.1.tgz"; + sha512 = "JUPoL1jHsc9fOjVFHdQIhqEEJsQvfKDjlubcCilu8U26uZ73qOg8VsN8O1jbuei44ZPlwL7kmbAdM4tzaUvqnA=="; + }; + }; "uglify-to-browserify-1.0.2" = { name = "uglify-to-browserify"; packageName = "uglify-to-browserify"; @@ -47647,6 +47719,15 @@ let sha512 = "+IF9hfUFOrYOOaKyfaI7h7dquUIOgyEMoQMLA7OP5FxegKA2+XdXThAZ9TU2kucfhDH7rfMHs1oPYziVGWRnZA=="; }; }; + "watershed-0.3.4" = { + name = "watershed"; + packageName = "watershed"; + version = "0.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/watershed/-/watershed-0.3.4.tgz"; + sha1 = "79331f666366b3b1c6ab02ceb04bad8dd2eebb0c"; + }; + }; "wbuf-1.7.3" = { name = "wbuf"; packageName = "wbuf"; @@ -48787,7 +48868,7 @@ let version = "1.5.0"; src = fetchurl { name = "xmlhttprequest-1.5.0.tar.gz"; - url = "https://codeload.github.com/LearnBoost/node-XMLHttpRequest/tar.gz/0f36d0b5ebc03d85f860d42a64ae9791e1daa433"; + url = https://codeload.github.com/LearnBoost/node-XMLHttpRequest/tar.gz/0f36d0b5ebc03d85f860d42a64ae9791e1daa433; sha256 = "28dd0394d85befe8be4e9cd9f6803102780c62cbb09298cb174b52ff9777624f"; }; }; @@ -49205,13 +49286,13 @@ let sha512 = "H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg=="; }; }; - "yargs-parser-18.1.2" = { + "yargs-parser-18.1.3" = { name = "yargs-parser"; packageName = "yargs-parser"; - version = "18.1.2"; + version = "18.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.2.tgz"; - sha512 = "hlIPNR3IzC1YuL1c2UwwDKpXlNFBqD1Fswwh1khz5+d8Cq/8yc/Mn0i+rQXduu8hcrFKvO7Eryk+09NecTQAAQ=="; + url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz"; + sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ=="; }; }; "yargs-parser-2.4.1" = { @@ -49340,22 +49421,22 @@ let sha512 = "CP0fwGk5Y+jel+A0AQbyqnIFZRRpkKOeYUibiTSmlgV9PcgNFFVwn86VcUIpDLOqVjF+9v+O9FWQMo+IUcV2mA=="; }; }; - "yeoman-environment-2.9.0" = { + "yeoman-environment-2.9.1" = { name = "yeoman-environment"; packageName = "yeoman-environment"; - version = "2.9.0"; + version = "2.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.9.0.tgz"; - sha512 = "wPbGhMyO1iVCis5+vSteQObRMpQ8O2eoINUEvCivDqjm29X2bTyLYyg1EIkysJsYysFskFuszOfXDwDe/Q3MTA=="; + url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.9.1.tgz"; + sha512 = "m9sotsBPqOrV2aqaCM68pbY0HfLzeYuWnEAsJblfGSuMiIy+xie1S1j9qboOlHyGe9Wyvg8AQx3xSwrQvIvb0A=="; }; }; - "yeoman-generator-4.8.0" = { + "yeoman-generator-4.8.2" = { name = "yeoman-generator"; packageName = "yeoman-generator"; - version = "4.8.0"; + version = "4.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-4.8.0.tgz"; - sha512 = "3olXkJbFbTJGvq63Cv1ZEhiYv5avQYCqqlLvI1vLqHOgKjtyLW/R4LgmIPjI2oaYhJ2+HM08e+iq6KTwnl9j+w=="; + url = "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-4.8.2.tgz"; + sha512 = "4kJAf2u5mee8yO7Ph6e64KLHeC7sCSYPCP7YcCUjussBFzoMEqJ2+Dn2Yj41rBLArSBBmZOQ/e2bMYlh6qQ9ag=="; }; }; "yn-3.1.1" = { @@ -49526,7 +49607,7 @@ in sources."chownr-1.1.4" sources."cli-cursor-3.1.0" sources."cli-spinners-2.3.0" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" sources."clone-1.0.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -49729,7 +49810,7 @@ in sources."uuid-3.4.0" ]; }) - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."restore-cursor-3.1.0" sources."retry-0.10.1" sources."rimraf-3.0.2" @@ -49810,7 +49891,7 @@ in buildInputs = globalBuildInputs; meta = { description = "CLI tool for Angular"; - homepage = "https://github.com/angular/angular-cli"; + homepage = https://github.com/angular/angular-cli; license = "MIT"; }; production = true; @@ -49854,7 +49935,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The command line interface for Antora."; - homepage = "https://antora.org/"; + homepage = https://antora.org/; license = "MPL-2.0"; }; production = true; @@ -49894,7 +49975,7 @@ in sources."bl-4.0.2" sources."bops-0.0.7" sources."brace-expansion-1.1.11" - (sources."buffer-5.5.0" // { + (sources."buffer-5.6.0" // { dependencies = [ sources."base64-js-1.3.1" ]; @@ -50152,7 +50233,7 @@ in ]; }) sources."to-utf8-0.0.1" - sources."uglify-js-3.8.1" + sources."uglify-js-3.9.1" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" @@ -50183,7 +50264,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The default site generator pipeline for producing and publishing static documentation sites with Antora."; - homepage = "https://antora.org/"; + homepage = https://antora.org/; license = "MPL-2.0"; }; production = true; @@ -50222,7 +50303,7 @@ in sources."chalk-2.4.1" sources."chardet-0.7.0" sources."cli-cursor-2.1.0" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."combined-stream-1.0.6" @@ -50346,7 +50427,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A secure and free password manager for all of your devices."; - homepage = "https://bitwarden.com/"; + homepage = https://bitwarden.com/; license = "GPL-3.0"; }; production = true; @@ -50590,7 +50671,7 @@ in sources."@types/cors-2.8.6" sources."@types/events-3.0.0" sources."@types/express-4.17.3" - sources."@types/express-serve-static-core-4.17.4" + sources."@types/express-serve-static-core-4.17.5" sources."@types/fs-capacitor-2.0.0" sources."@types/glob-7.1.1" sources."@types/graphql-upload-8.0.3" @@ -50772,7 +50853,7 @@ in sources."brace-expansion-1.1.11" sources."braces-2.3.2" sources."browserslist-4.11.1" - sources."buffer-5.5.0" + sources."buffer-5.6.0" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -50795,7 +50876,7 @@ in sources."callsites-2.0.0" sources."camel-case-3.0.0" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001040" + sources."caniuse-lite-1.0.30001042" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" sources."caseless-0.12.0" @@ -50849,7 +50930,7 @@ in sources."strip-ansi-5.2.0" ]; }) - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" sources."clipboard-2.0.6" sources."clone-1.0.4" sources."clone-response-1.0.2" @@ -50978,7 +51059,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.403" + sources."electron-to-chromium-1.3.411" sources."elegant-spinner-1.0.1" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" @@ -51064,7 +51145,7 @@ in }) sources."find-up-2.1.0" sources."fkill-6.2.0" - sources."flow-parser-0.122.0" + sources."flow-parser-0.123.0" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -51133,7 +51214,7 @@ in sources."graphql-extensions-0.11.1" sources."graphql-subscriptions-1.1.0" sources."graphql-tag-2.10.3" - sources."graphql-tools-4.0.7" + sources."graphql-tools-4.0.8" sources."graphql-type-json-0.3.1" sources."graphql-upload-8.1.0" sources."growly-1.3.0" @@ -51330,7 +51411,7 @@ in sources."wrap-ansi-3.0.1" ]; }) - sources."loglevel-1.6.7" + sources."loglevel-1.6.8" sources."long-4.0.0" sources."loose-envify-1.4.0" sources."lowdb-1.0.0" @@ -51586,7 +51667,7 @@ in sources."request-2.88.2" sources."request-promise-core-1.1.3" sources."request-promise-native-1.0.8" - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."resolve-from-3.0.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" @@ -51935,7 +52016,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Command line interface for rapid Vue.js development"; - homepage = "https://cli.vuejs.org/"; + homepage = https://cli.vuejs.org/; license = "MIT"; }; production = true; @@ -52241,7 +52322,7 @@ in sources."parse-passwd-1.0.0" sources."path-parse-1.0.6" sources."pkginfo-0.4.1" - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."safe-buffer-5.1.2" sources."sax-0.5.8" sources."semver-5.7.1" @@ -52297,7 +52378,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Creating Electron app packages"; - homepage = "https://github.com/electron/asar"; + homepage = https://github.com/electron/asar; license = "MIT"; }; production = true; @@ -52307,10 +52388,10 @@ in bash-language-server = nodeEnv.buildNodePackage { name = "bash-language-server"; packageName = "bash-language-server"; - version = "1.11.1"; + version = "1.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-1.11.1.tgz"; - sha512 = "1fF8RVa/y3yKvMAeorLbapFtRQx85c51V2P+P25U6Cl6HyDzh1IezgmdW6Rau4jg2hDWVN1hCpce36UGjCGE2g=="; + url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-1.13.0.tgz"; + sha512 = "A9+8217g+/5lNYm/ajk8klm8FkT3iJYNBooifk0V9ieLZ/dItt29xP/iQWIDAwQxqFzZpsTc+5Py3RcjFzSH6A=="; }; dependencies = [ sources."abab-2.0.3" @@ -52418,11 +52499,11 @@ in sources."urijs-1.19.2" sources."uuid-3.4.0" sources."verror-1.10.0" - sources."vscode-jsonrpc-4.0.0" - sources."vscode-languageserver-5.2.1" - sources."vscode-languageserver-protocol-3.14.1" - sources."vscode-languageserver-types-3.14.0" - sources."vscode-uri-1.0.8" + sources."vscode-jsonrpc-5.0.1" + sources."vscode-languageserver-6.1.1" + sources."vscode-languageserver-protocol-3.15.3" + sources."vscode-languageserver-textdocument-1.0.1" + sources."vscode-languageserver-types-3.15.1" sources."w3c-hr-time-1.0.2" sources."web-tree-sitter-0.16.2" sources."webidl-conversions-4.0.2" @@ -52455,7 +52536,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The browser package manager"; - homepage = "http://bower.io/"; + homepage = http://bower.io/; license = "MIT"; }; production = true; @@ -52556,7 +52637,7 @@ in sources."read-pkg-up-1.0.1" sources."redent-1.0.0" sources."repeating-2.0.1" - sources."resolve-1.15.1" + sources."resolve-1.16.0" (sources."rimraf-2.7.1" // { dependencies = [ sources."glob-7.1.6" @@ -52585,7 +52666,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Generate nix expressions to fetch bower dependencies"; - homepage = "https://github.com/rvl/bower2nix"; + homepage = https://github.com/rvl/bower2nix; license = "GPL-3.0"; }; production = true; @@ -52714,7 +52795,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.0" sources."sha.js-2.4.11" @@ -53067,7 +53148,7 @@ in sources."redent-1.0.0" sources."repeating-2.0.1" sources."request-2.88.2" - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."rimraf-2.7.1" sources."router-0.6.2" sources."run-parallel-1.1.9" @@ -53194,7 +53275,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A well-tested CSS minifier"; - homepage = "https://github.com/jakubpawlowicz/clean-css"; + homepage = https://github.com/jakubpawlowicz/clean-css; license = "MIT"; }; production = true; @@ -53204,10 +53285,10 @@ in coc-css = nodeEnv.buildNodePackage { name = "coc-css"; packageName = "coc-css"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-css/-/coc-css-1.2.2.tgz"; - sha512 = "JvZnKZZJZemS70o972OEjfnMGGO2sLpJA3iX1OT3CXmaymPb8CmufboyCVnzGMDMbFL/qHgfjbdw9kOg5ZtzzQ=="; + url = "https://registry.npmjs.org/coc-css/-/coc-css-1.2.3.tgz"; + sha512 = "6/JhWv31agvUvcUVKewpJ0z+A8ZMrRXPNNy+YohNausiw7nqKnBSnLIO0II0hXgjdAryoSGnBC/NjH7Q5P0IDw=="; }; buildInputs = globalBuildInputs; meta = { @@ -53482,7 +53563,7 @@ in (sources."metals-languageclient-0.1.23" // { dependencies = [ sources."mkdirp-1.0.4" - sources."semver-7.2.2" + sources."semver-7.3.2" ]; }) sources."minimatch-3.0.4" @@ -53624,7 +53705,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001040" + sources."caniuse-lite-1.0.30001042" sources."capture-stack-trace-1.0.1" sources."ccount-1.0.5" sources."chalk-2.4.2" @@ -53655,7 +53736,7 @@ in }) sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" sources."cliui-4.1.0" sources."clone-regexp-1.0.1" sources."code-point-at-1.1.0" @@ -53710,7 +53791,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.2.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.403" + sources."electron-to-chromium-1.3.411" sources."emoji-regex-7.0.3" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -53726,9 +53807,9 @@ in sources."eslint-visitor-keys-1.1.0" sources."espree-5.0.1" sources."esprima-4.0.1" - (sources."esquery-1.2.0" // { + (sources."esquery-1.3.1" // { dependencies = [ - sources."estraverse-5.0.0" + sources."estraverse-5.1.0" ]; }) sources."esrecurse-4.2.1" @@ -53964,7 +54045,7 @@ in sources."lodash.merge-4.6.2" sources."lodash.unescape-4.0.1" sources."log-symbols-2.2.0" - sources."loglevel-1.6.7" + sources."loglevel-1.6.8" (sources."loglevel-colored-level-prefix-1.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -54183,7 +54264,7 @@ in sources."require-from-string-2.0.2" sources."require-main-filename-1.0.1" sources."require-relative-0.8.7" - sources."resolve-1.15.1" + sources."resolve-1.16.0" (sources."resolve-cwd-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" @@ -54501,10 +54582,10 @@ in coc-snippets = nodeEnv.buildNodePackage { name = "coc-snippets"; packageName = "coc-snippets"; - version = "2.1.24"; + version = "2.1.25"; src = fetchurl { - url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.1.24.tgz"; - sha512 = "CFz5ow9QLVRlbcT5zMrO/HBzNZ91qgQ8GVzUZHEZugL5kWiQKZ+vWq6s7dEY9m4DtOCZQ6Y0PAG0dDKxkJvgFA=="; + url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.1.25.tgz"; + sha512 = "td3vAVOoFgswef3iCO3rDQrmoizKiKw/+5cLIYYiahnxx7SwmKcNZ1AV6OSdks/l/hOJEhtLZw3BqhxaI3+Z4w=="; }; buildInputs = globalBuildInputs; meta = { @@ -54616,7 +54697,7 @@ in sources."callsites-2.0.0" sources."camelcase-4.1.0" sources."camelcase-keys-4.2.0" - sources."caniuse-lite-1.0.30001040" + sources."caniuse-lite-1.0.30001042" sources."ccount-1.0.5" sources."chalk-2.4.2" sources."character-entities-1.2.4" @@ -54675,7 +54756,7 @@ in sources."domhandler-2.4.2" sources."domutils-1.7.0" sources."dot-prop-5.2.0" - sources."electron-to-chromium-1.3.403" + sources."electron-to-chromium-1.3.411" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -54932,7 +55013,7 @@ in sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" sources."replace-ext-1.0.0" - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."resolve-from-5.0.0" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -55164,7 +55245,7 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."semver-5.7.1" sources."sprintf-js-1.0.3" sources."supports-color-5.5.0" @@ -55220,10 +55301,10 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "1.4.13"; + version = "1.4.15"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.4.13.tgz"; - sha512 = "/aaZO76VB3kYjJq7YQO97MFSE3GSEMETZtyTGKaIKcCtvzN9Bsq1PVUg3aARoDnUL+gnO+5CTy4cBUBv7LGgdQ=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.4.15.tgz"; + sha512 = "E7GGyo/DGcLnm/KhpHUMoo4yKsvqWYi054k1qWok1l5HUyCz5JwlN3MDUOj7SePm8PXCGS7ldFmRWyKiyU1jyw=="; }; dependencies = [ sources."typescript-3.8.3" @@ -55420,7 +55501,7 @@ in sources."clean-stack-2.2.0" sources."cli-boxes-2.2.0" sources."cli-cursor-3.1.0" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" sources."cliui-4.1.0" sources."clone-1.0.4" sources."clone-response-1.0.2" @@ -55522,9 +55603,9 @@ in sources."eslint-visitor-keys-1.1.0" sources."espree-6.2.1" sources."esprima-4.0.1" - (sources."esquery-1.2.0" // { + (sources."esquery-1.3.1" // { dependencies = [ - sources."estraverse-5.0.0" + sources."estraverse-5.1.0" ]; }) sources."esrecurse-4.2.1" @@ -55764,7 +55845,7 @@ in sources."lodash.merge-4.6.2" sources."lodash.rest-4.0.5" sources."lodash.unescape-4.0.1" - sources."loglevel-1.6.7" + sources."loglevel-1.6.8" (sources."loglevel-colored-level-prefix-1.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -55998,7 +56079,7 @@ in sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."require-relative-0.8.7" - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."resolve-from-5.0.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" @@ -56417,7 +56498,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Unfancy JavaScript"; - homepage = "http://coffeescript.org/"; + homepage = http://coffeescript.org/; license = "MIT"; }; production = true; @@ -56632,7 +56713,7 @@ in }) sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -56973,7 +57054,7 @@ in sources."tough-cookie-2.5.0" ]; }) - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."resolve-from-4.0.0" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" @@ -57405,7 +57486,7 @@ in sources."regex-not-1.0.2" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."resolve-url-0.2.1" sources."ret-0.1.15" sources."safe-regex-1.1.0" @@ -57540,7 +57621,7 @@ in }) sources."chardet-0.4.2" sources."cli-cursor-2.1.0" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."combine-errors-3.0.3" @@ -57686,7 +57767,7 @@ in sources."chalk-3.0.0" sources."chardet-0.7.0" sources."cli-cursor-3.1.0" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."commander-4.1.0" @@ -57804,44 +57885,15 @@ in create-react-native-app = nodeEnv.buildNodePackage { name = "create-react-native-app"; packageName = "create-react-native-app"; - version = "2.0.2"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-react-native-app/-/create-react-native-app-2.0.2.tgz"; - sha512 = "xsPgOifP3TJtd+UvqhB4X9amYJq548m8vupcqBukWll2gi3UBu2KigWNtASwVUd6UTYlrJHw3g5Bow9c+/UBmQ=="; + url = "https://registry.npmjs.org/create-react-native-app/-/create-react-native-app-3.1.0.tgz"; + sha512 = "GqjMxZ/LNUXFxXKQP4u+uJlbsQhsgk7Mm0q2djYvI3sS/vPA+I1oqrEmsIrj5T3oCtWh3L+N9vd/8OQ5sLxOhw=="; }; - dependencies = [ - sources."ansi-styles-3.2.1" - sources."babel-runtime-6.26.0" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."core-js-2.6.11" - sources."cross-spawn-5.1.0" - sources."escape-string-regexp-1.0.5" - sources."fs-extra-4.0.3" - sources."graceful-fs-4.2.3" - sources."has-flag-3.0.0" - sources."isexe-2.0.0" - sources."jsonfile-4.0.0" - sources."lru-cache-4.1.5" - sources."minimist-1.2.5" - sources."path-exists-3.0.0" - sources."pseudomap-1.0.2" - sources."regenerator-runtime-0.11.1" - sources."semver-5.7.1" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."source-map-0.5.7" - sources."source-map-support-0.4.18" - sources."supports-color-5.5.0" - sources."universalify-0.1.2" - sources."which-1.3.1" - sources."yallist-2.1.2" - ]; buildInputs = globalBuildInputs; meta = { description = "Create React Native apps with no build configuration."; - homepage = "https://github.com/react-community/create-react-native-app"; + homepage = https://github.com/expo/create-react-native-app; license = "BSD-3-Clause"; }; production = true; @@ -57863,7 +57915,7 @@ in buildInputs = globalBuildInputs; meta = { description = "CSSLint"; - homepage = "http://csslint.net/"; + homepage = http://csslint.net/; license = "MIT"; }; production = true; @@ -58518,7 +58570,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Dat is the package manager for data. Easily share and version control data."; - homepage = "https://datproject.org/"; + homepage = https://datproject.org/; license = "BSD-3-Clause"; }; production = true; @@ -58539,7 +58591,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A DHCP server written in JavaScript"; - homepage = "https://github.com/infusion/node-dhcp"; + homepage = https://github.com/infusion/node-dhcp; license = "MIT OR GPL-2.0"; }; production = true; @@ -58684,7 +58736,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A blockchain-based DNS + HTTPS server that fixes HTTPS security, and more!"; - homepage = "https://github.com/okTurtles/dnschain"; + homepage = https://github.com/okTurtles/dnschain; license = "MPL-2.0"; }; production = true; @@ -58734,10 +58786,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.27.1"; + version = "6.27.3"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.27.1.tgz"; - sha512 = "7z1N1VvHU6SQGJEqEnIV9YVEepctUku0HO8YWIMigf7lu5OCsiDpUPlhbS7/ZCCui2uYvZp03m6AqJaxq3xfzw=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.27.3.tgz"; + sha512 = "nzkJS9Z/bEXk+AOouAU2SGuhU1OSXjuhvn+48/l97YbREWk2nY1bmguTe/dHW7w8vBxg1cQW/yqTZ8o+rxTAmw=="; }; dependencies = [ sources."JSONStream-1.3.5" @@ -58746,7 +58798,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.656.0" + sources."aws-sdk-2.657.0" sources."aws-sign2-0.7.0" sources."aws4-1.9.1" sources."base64-js-1.3.1" @@ -58967,7 +59019,7 @@ in }) sources."color-convert-1.9.3" sources."color-name-1.1.3" - (sources."conf-6.2.3" // { + (sources."conf-6.2.4" // { dependencies = [ sources."semver-6.3.0" ]; @@ -59077,7 +59129,7 @@ in }) sources."map-age-cleaner-0.1.3" sources."map-obj-4.1.0" - (sources."mem-6.0.1" // { + (sources."mem-6.1.0" // { dependencies = [ sources."mimic-fn-3.0.0" ]; @@ -59139,7 +59191,7 @@ in ]; }) sources."redent-3.0.0" - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."resolve-from-3.0.0" sources."responselike-2.0.0" sources."restore-cursor-3.1.0" @@ -59193,7 +59245,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."yargs-parser-18.1.2" + sources."yargs-parser-18.1.3" sources."yoga-layout-prebuilt-1.9.5" ]; buildInputs = globalBuildInputs; @@ -59217,7 +59269,7 @@ in buildInputs = globalBuildInputs; meta = { description = "EmojiOne is a complete set of emojis designed for the web. It includes libraries to easily convert unicode characters to shortnames (:smile:) and shortnames to our custom emoji images. PNG formats provided for the emoji images."; - homepage = "https://www.emojione.com/"; + homepage = https://www.emojione.com/; }; production = true; bypassCache = true; @@ -59254,7 +59306,7 @@ in sources."chalk-2.4.2" sources."chardet-0.7.0" sources."cli-cursor-3.1.0" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."concat-map-0.0.1" @@ -59273,9 +59325,9 @@ in sources."eslint-visitor-keys-1.1.0" sources."espree-6.2.1" sources."esprima-4.0.1" - (sources."esquery-1.2.0" // { + (sources."esquery-1.3.1" // { dependencies = [ - sources."estraverse-5.0.0" + sources."estraverse-5.1.0" ]; }) sources."esrecurse-4.2.1" @@ -59393,7 +59445,7 @@ in buildInputs = globalBuildInputs; meta = { description = "An AST-based pattern checker for JavaScript."; - homepage = "https://eslint.org/"; + homepage = https://eslint.org/; license = "MIT"; }; production = true; @@ -59431,7 +59483,7 @@ in sources."chalk-2.4.2" sources."chardet-0.7.0" sources."cli-cursor-3.1.0" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."concat-map-0.0.1" @@ -59452,9 +59504,9 @@ in sources."eslint-visitor-keys-1.1.0" sources."espree-6.2.1" sources."esprima-4.0.1" - (sources."esquery-1.2.0" // { + (sources."esquery-1.3.1" // { dependencies = [ - sources."estraverse-5.0.0" + sources."estraverse-5.1.0" ]; }) sources."esrecurse-4.2.1" @@ -59523,7 +59575,7 @@ in sources."progress-2.0.3" sources."punycode-2.1.1" sources."regexpp-2.0.1" - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."resolve-from-4.0.0" sources."restore-cursor-3.1.0" sources."rimraf-2.6.3" @@ -59575,7 +59627,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Makes eslint the fastest linter on the planet"; - homepage = "https://github.com/mantoni/eslint_d.js"; + homepage = https://github.com/mantoni/eslint_d.js; license = "MIT"; }; production = true; @@ -59722,7 +59774,7 @@ in sources."repeating-2.0.1" sources."request-2.88.2" sources."request-progress-2.0.1" - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."restore-cursor-1.0.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -59801,7 +59853,7 @@ in sources."clean-stack-2.2.0" sources."cli-cursor-3.1.0" sources."cli-truncate-2.1.0" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."cross-spawn-7.0.2" @@ -59916,7 +59968,7 @@ in ]; }) sources."redent-3.0.0" - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."restore-cursor-3.1.0" sources."run-async-2.4.0" sources."rxjs-6.5.5" @@ -59950,7 +60002,7 @@ in sources."which-2.0.2" sources."wrappy-1.0.2" sources."yallist-2.1.2" - sources."yargs-parser-18.1.2" + sources."yargs-parser-18.1.3" ]; buildInputs = globalBuildInputs; meta = { @@ -60213,7 +60265,7 @@ in ]; }) sources."object-inspect-1.7.0" - sources."object-is-1.0.2" + sources."object-is-1.1.2" sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.0" @@ -60480,7 +60532,7 @@ in sources."multiserver-scopes-1.0.0" sources."muxrpc-6.5.0" sources."nan-2.14.0" - sources."nearley-2.19.1" + sources."nearley-2.19.2" sources."node-gyp-build-4.2.1" sources."node-polyglot-1.0.0" sources."non-private-ip-1.4.4" @@ -60600,7 +60652,7 @@ in buildInputs = globalBuildInputs; meta = { description = "git hosting on secure-scuttlebutt (ssb)"; - homepage = "https://git-ssb.celehner.com/%25n92DiQh7ietE%2BR%2BX%2FI403LQoyf2DtR3WQfCkDKlheQU%3D.sha256"; + homepage = https://git-ssb.celehner.com/%25n92DiQh7ietE%2BR%2BX%2FI403LQoyf2DtR3WQfCkDKlheQU%3D.sha256; license = "Fair"; }; production = true; @@ -60683,12 +60735,12 @@ in sources."cli-boxes-2.2.0" sources."cli-cursor-3.1.0" sources."cli-spinners-2.3.0" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" sources."clone-1.0.4" sources."clone-response-1.0.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."conf-6.2.3" + sources."conf-6.2.4" sources."configstore-5.0.1" sources."cross-spawn-7.0.2" sources."crypto-random-string-2.0.0" @@ -60844,7 +60896,7 @@ in sources."redent-3.0.0" sources."registry-auth-token-4.1.1" sources."registry-url-5.1.0" - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."run-async-2.4.0" @@ -60884,7 +60936,7 @@ in sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" - sources."yargs-parser-18.1.2" + sources."yargs-parser-18.1.3" ]; buildInputs = globalBuildInputs; meta = { @@ -61003,7 +61055,7 @@ in sources."cli-boxes-2.2.0" sources."cli-cursor-3.1.0" sources."cli-spinners-2.3.0" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" sources."cliui-4.1.0" sources."clone-1.0.4" sources."clone-response-1.0.2" @@ -61018,7 +61070,7 @@ in ]; }) sources."combined-stream-1.0.8" - sources."command-exists-1.2.8" + sources."command-exists-1.2.9" sources."commander-2.20.3" sources."common-tags-1.8.0" sources."concat-map-0.0.1" @@ -61469,7 +61521,7 @@ in sources."request-promise-core-1.1.3" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."resolve-dir-1.0.1" sources."resolve-from-4.0.0" sources."responselike-1.0.2" @@ -61815,7 +61867,7 @@ in sources."regex-not-1.0.2" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -62324,7 +62376,7 @@ in sources."replace-homedir-1.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."resolve-dir-1.0.1" sources."resolve-options-1.1.0" sources."resolve-url-0.2.1" @@ -62452,7 +62504,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The streaming build system."; - homepage = "https://gulpjs.com/"; + homepage = https://gulpjs.com/; license = "MIT"; }; production = true; @@ -62702,7 +62754,7 @@ in sources."replace-homedir-1.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -62797,7 +62849,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Command line interface for gulp"; - homepage = "http://gulpjs.com/"; + homepage = http://gulpjs.com/; license = "MIT"; }; production = true; @@ -62822,13 +62874,13 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.8.1" + sources."uglify-js-3.9.1" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; meta = { description = "Highly configurable, well-tested, JavaScript-based HTML minifier."; - homepage = "https://kangax.github.io/html-minifier/"; + homepage = https://kangax.github.io/html-minifier/; license = "MIT"; }; production = true; @@ -63160,7 +63212,7 @@ in sha512 = "l4g7U75E+WgrgNGH774djfTyp5Aw+2jJokYe9iCunSAbi/w+nRGHqTJfwbODLwiJQTnbXkM42FxgPRA29Ce7Bg=="; }; dependencies = [ - sources."@types/jquery-3.3.34" + sources."@types/jquery-3.3.35" sources."@types/sizzle-2.3.2" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" @@ -63198,7 +63250,7 @@ in buildInputs = globalBuildInputs; meta = { description = "High precision scientific calculator with support for physical units"; - homepage = "https://github.com/sharkdp/insect"; + homepage = https://github.com/sharkdp/insect; license = "MIT"; }; production = true; @@ -63246,7 +63298,7 @@ in sources."chardet-0.7.0" sources."chownr-1.1.4" sources."cli-cursor-2.1.0" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" sources."co-4.6.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -63519,7 +63571,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A tool for creating and developing Ionic Framework mobile apps."; - homepage = "https://ionicframework.com/"; + homepage = https://ionicframework.com/; license = "MIT"; }; production = true; @@ -63796,7 +63848,7 @@ in sources."request-2.88.2" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."resolve-url-0.2.1" sources."restore-cursor-3.1.0" sources."resumer-0.0.0" @@ -63889,7 +63941,7 @@ in sources."wrap-ansi-6.2.0" sources."y18n-4.0.0" sources."yargs-15.3.1" - sources."yargs-parser-18.1.2" + sources."yargs-parser-18.1.3" ]; }) sources."verror-1.10.0" @@ -64060,7 +64112,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Implementation of the Language Server Protocol for JavaScript and TypeScript"; - homepage = "https://github.com/sourcegraph/javascript-typescript-langserver"; + homepage = https://github.com/sourcegraph/javascript-typescript-langserver; license = "Apache-2.0"; }; production = true; @@ -64142,7 +64194,7 @@ in ]; }) sources."browser-process-hrtime-1.0.0" - sources."buffer-5.5.0" + sources."buffer-5.6.0" sources."cache-base-1.0.1" sources."camel-case-3.0.0" sources."camelcase-4.1.0" @@ -64345,7 +64397,7 @@ in sources."he-1.2.0" sources."highlight.js-9.18.1" sources."html-encoding-sniffer-1.0.2" - sources."html-entities-1.2.1" + sources."html-entities-1.3.1" sources."html-minifier-3.5.21" (sources."htmlparser2-4.1.0" // { dependencies = [ @@ -64910,7 +64962,7 @@ in buildInputs = globalBuildInputs; meta = { description = "beautifier.io for node"; - homepage = "https://beautifier.io/"; + homepage = https://beautifier.io/; license = "MIT"; }; production = true; @@ -64933,7 +64985,7 @@ in buildInputs = globalBuildInputs; meta = { description = "YAML 1.2 parser and serializer"; - homepage = "https://github.com/nodeca/js-yaml"; + homepage = https://github.com/nodeca/js-yaml; license = "MIT"; }; production = true; @@ -65029,7 +65081,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Static analysis tool for JavaScript"; - homepage = "http://jshint.com/"; + homepage = http://jshint.com/; license = "(MIT AND JSON)"; }; production = true; @@ -65072,7 +65124,7 @@ in buildInputs = globalBuildInputs; meta = { description = "JSON diff"; - homepage = "https://github.com/andreyvit/json-diff"; + homepage = https://github.com/andreyvit/json-diff; }; production = true; bypassCache = true; @@ -65127,7 +65179,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Various utilities for JSON References (http://tools.ietf.org/html/draft-pbryan-zyp-json-ref-03)."; - homepage = "https://github.com/whitlockjc/json-refs"; + homepage = https://github.com/whitlockjc/json-refs; license = "MIT"; }; production = true; @@ -65403,12 +65455,12 @@ in sources."xdg-basedir-4.0.0" sources."y18n-4.0.0" sources."yargs-15.3.1" - sources."yargs-parser-18.1.2" + sources."yargs-parser-18.1.3" ]; buildInputs = globalBuildInputs; meta = { description = "Get a full fake REST API with zero coding in less than 30 seconds"; - homepage = "https://github.com/typicode/json-server"; + homepage = https://github.com/typicode/json-server; license = "MIT"; }; production = true; @@ -65435,7 +65487,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Validate JSON"; - homepage = "http://zaach.github.com/jsonlint/"; + homepage = http://zaach.github.com/jsonlint/; }; production = true; bypassCache = true; @@ -65444,10 +65496,10 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "5.0.1"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-5.0.1.tgz"; - sha512 = "xrDGtZ0mykEQjx1BUHOP1ITi39MDsCGocmSvLJWHxUQpxuKwxk3ZUrC6HI2VWh1plLC6+7cA3B19m12yzO/FRw=="; + url = "https://registry.npmjs.org/karma/-/karma-5.0.2.tgz"; + sha512 = "RpUuCuGJfN3WnjYPGIH+VBF8023Lfm3TQH6D1kcNL+FxtEPc2UUz/nVjbVAGXH4Pm+Q7FVOAQjdAeFUpXpQ3IA=="; }; dependencies = [ sources."@types/color-name-1.1.1" @@ -65629,13 +65681,13 @@ in sources."xmlhttprequest-ssl-1.5.5" sources."y18n-4.0.0" sources."yargs-15.3.1" - sources."yargs-parser-18.1.2" + sources."yargs-parser-18.1.3" sources."yeast-0.1.2" ]; buildInputs = globalBuildInputs; meta = { description = "Spectacular Test Runner for JavaScript."; - homepage = "http://karma-runner.github.io/"; + homepage = http://karma-runner.github.io/; license = "MIT"; }; production = true; @@ -65729,7 +65781,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Merges multiple lcov results into one"; - homepage = "https://github.com/mweibel/lcov-result-merger"; + homepage = https://github.com/mweibel/lcov-result-merger; license = "MIT"; }; production = true; @@ -66108,7 +66160,7 @@ in sources."@octokit/plugin-paginate-rest-1.1.2" sources."@octokit/plugin-request-log-1.0.0" sources."@octokit/plugin-rest-endpoint-methods-2.4.0" - (sources."@octokit/request-5.3.4" // { + (sources."@octokit/request-5.4.0" // { dependencies = [ sources."@octokit/request-error-2.0.0" sources."is-plain-object-3.0.0" @@ -66118,7 +66170,7 @@ in }) sources."@octokit/request-error-1.2.1" sources."@octokit/rest-16.43.1" - sources."@octokit/types-2.8.1" + sources."@octokit/types-2.10.0" sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" @@ -66210,7 +66262,7 @@ in ]; }) sources."cli-cursor-2.1.0" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" (sources."cliui-5.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -66733,7 +66785,7 @@ in sources."request-2.88.2" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.15.1" + sources."resolve-1.16.0" (sources."resolve-cwd-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" @@ -66880,11 +66932,7 @@ in sources."tweetnacl-0.14.5" sources."type-fest-0.3.1" sources."typedarray-0.0.6" - (sources."uglify-js-3.8.1" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) + sources."uglify-js-3.9.1" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."union-value-1.0.1" @@ -67035,7 +67083,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Leaner CSS"; - homepage = "http://lesscss.org/"; + homepage = http://lesscss.org/; license = "Apache-2.0"; }; production = true; @@ -67060,7 +67108,7 @@ in buildInputs = globalBuildInputs; meta = { description = "clean-css plugin for less.js"; - homepage = "http://lesscss.org/"; + homepage = http://lesscss.org/; }; production = true; bypassCache = true; @@ -67568,7 +67616,7 @@ in sources."kind-of-4.0.0" ]; }) - sources."html-entities-1.2.1" + sources."html-entities-1.3.1" sources."http-errors-1.7.2" sources."http-signature-1.2.0" sources."iconv-lite-0.4.24" @@ -67901,7 +67949,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Live Markdown previews for your favourite editor."; - homepage = "https://github.com/shime/livedown"; + homepage = https://github.com/shime/livedown; license = "MIT"; }; production = true; @@ -68160,7 +68208,7 @@ in sources."bindings-1.5.0" (sources."bl-4.0.2" // { dependencies = [ - sources."buffer-5.5.0" + sources."buffer-5.6.0" sources."readable-stream-3.6.0" ]; }) @@ -68205,7 +68253,7 @@ in sources."cache-base-1.0.1" sources."cached-path-relative-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001040" + sources."caniuse-lite-1.0.30001042" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -68322,7 +68370,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.403" + sources."electron-to-chromium-1.3.411" sources."elliptic-6.5.2" sources."emoji-regex-7.0.3" sources."emojis-list-3.0.0" @@ -68743,7 +68791,7 @@ in sources."request-2.88.2" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.15.1" + sources."resolve-1.16.0" (sources."resolve-cwd-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" @@ -69059,7 +69107,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Madoko is a fast scholarly Markdown processor written in Koka"; - homepage = "http://madoko.codeplex.com/"; + homepage = http://madoko.codeplex.com/; }; production = true; bypassCache = true; @@ -69199,7 +69247,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Meeting room kiosk app for displaying meeting room schedules and booking rooms in your organization. Built against Google Apps, but other sources can be defined."; - homepage = "https://bitbucket.org/aahmed/meat"; + homepage = https://bitbucket.org/aahmed/meat; }; production = true; bypassCache = true; @@ -69752,7 +69800,7 @@ in sources."repeat-string-1.6.1" sources."replace-ext-1.0.0" sources."request-2.81.0" - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."resolve-dir-1.0.1" sources."resolve-options-1.1.0" sources."resolve-url-0.2.1" @@ -69864,11 +69912,7 @@ in sources."tweetnacl-0.14.5" sources."type-1.2.0" sources."typescript-3.8.3" - (sources."uglify-js-3.8.1" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) + sources."uglify-js-3.9.1" sources."uglify-to-browserify-1.0.2" sources."unc-path-regex-0.1.2" sources."union-value-1.0.1" @@ -70061,7 +70105,7 @@ in buildInputs = globalBuildInputs; meta = { description = "simple, flexible, fun test framework"; - homepage = "https://mochajs.org/"; + homepage = https://mochajs.org/; license = "MIT"; }; production = true; @@ -70166,7 +70210,7 @@ in sources."process-nextick-args-2.0.1" sources."readable-stream-3.6.0" sources."safe-buffer-5.2.0" - sources."semver-7.2.2" + sources."semver-7.3.2" sources."simple-swizzle-0.2.2" sources."stack-trace-0.0.10" sources."string_decoder-1.3.0" @@ -70185,7 +70229,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Neovim client API and neovim remote plugin provider"; - homepage = "https://github.com/neovim/node-client"; + homepage = https://github.com/neovim/node-client; license = "MIT"; }; production = true; @@ -70344,7 +70388,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Build tool and bindings loader for node-gyp that supports prebuilds"; - homepage = "https://github.com/prebuild/node-gyp-build"; + homepage = https://github.com/prebuild/node-gyp-build; license = "MIT"; }; production = true; @@ -70545,7 +70589,7 @@ in sources."qs-6.4.0" ]; }) - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."rimraf-2.2.8" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -70640,7 +70684,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Web Inspector based nodeJS debugger"; - homepage = "http://github.com/node-inspector/node-inspector"; + homepage = http://github.com/node-inspector/node-inspector; }; production = true; bypassCache = true; @@ -71207,7 +71251,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Low-code programming for event-driven applications"; - homepage = "http://nodered.org/"; + homepage = http://nodered.org/; license = "Apache-2.0"; }; production = true; @@ -71349,7 +71393,7 @@ in ]; }) sources."request-2.88.2" - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."retry-0.10.1" sources."rimraf-2.6.3" sources."safe-buffer-5.2.0" @@ -71397,7 +71441,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Generate Nix expressions to build NPM packages"; - homepage = "https://github.com/svanderburg/node2nix"; + homepage = https://github.com/svanderburg/node2nix; license = "MIT"; }; production = true; @@ -71561,7 +71605,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Simple monitor script for use during development of a node.js app."; - homepage = "http://nodemon.io/"; + homepage = http://nodemon.io/; license = "MIT"; }; production = true; @@ -71579,7 +71623,7 @@ in buildInputs = globalBuildInputs; meta = { description = "a package manager for JavaScript"; - homepage = "https://docs.npmjs.com/"; + homepage = https://docs.npmjs.com/; license = "Artistic-2.0"; }; production = true; @@ -71822,7 +71866,7 @@ in sources."run-queue-1.0.3" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."semver-7.2.2" + sources."semver-7.3.2" (sources."semver-diff-3.1.1" // { dependencies = [ sources."semver-6.3.0" @@ -71875,7 +71919,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Find newer versions of dependencies than what your package.json or bower.json allows"; - homepage = "https://github.com/tjunnone/npm-check-updates"; + homepage = https://github.com/tjunnone/npm-check-updates; license = "Apache-2.0"; }; production = true; @@ -72049,7 +72093,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Generate nix expressions to build npm packages"; - homepage = "https://github.com/NixOS/npm2nix"; + homepage = https://github.com/NixOS/npm2nix; }; production = true; bypassCache = true; @@ -72090,7 +72134,7 @@ in buildInputs = globalBuildInputs; meta = { description = "OCaml language server"; - homepage = "https://github.com/freebroccolo/ocaml-language-server"; + homepage = https://github.com/freebroccolo/ocaml-language-server; license = "Apache-2.0"; }; production = true; @@ -72309,7 +72353,7 @@ in sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001040" + sources."caniuse-lite-1.0.30001042" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -72331,7 +72375,7 @@ in sources."color-name-1.1.3" sources."color-string-1.5.3" sources."combined-stream-1.0.8" - sources."command-exists-1.2.8" + sources."command-exists-1.2.9" sources."commander-2.20.3" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" @@ -72442,7 +72486,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.403" + sources."electron-to-chromium-1.3.411" sources."elliptic-6.5.2" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" @@ -72539,7 +72583,7 @@ in sources."html-tags-1.2.0" (sources."htmlnano-0.2.5" // { dependencies = [ - sources."posthtml-0.12.0" + sources."posthtml-0.12.2" sources."terser-4.6.11" ]; }) @@ -72800,7 +72844,7 @@ in sources."postcss-value-parser-3.3.1" sources."posthtml-0.11.6" sources."posthtml-parser-0.4.2" - sources."posthtml-render-1.2.0" + sources."posthtml-render-1.2.2" sources."prelude-ls-1.1.2" sources."private-0.1.8" sources."process-0.11.10" @@ -72848,7 +72892,7 @@ in sources."request-promise-native-1.0.8" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."resolve-from-3.0.0" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" @@ -73285,7 +73329,7 @@ in sources."serve-static-1.14.1" (sources."service-runner-2.7.7" // { dependencies = [ - sources."semver-7.2.2" + sources."semver-7.3.2" sources."yargs-14.2.3" ]; }) @@ -73305,7 +73349,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.8.1" + sources."uglify-js-3.9.1" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" sources."uri-js-4.2.2" @@ -73398,7 +73442,7 @@ in sources."chrome-dns-1.0.1" sources."chrome-net-3.3.3" sources."cli-cursor-2.1.0" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" sources."clivas-0.2.0" sources."code-point-at-1.1.0" sources."color-convert-1.9.3" @@ -73514,7 +73558,7 @@ in sources."numeral-2.0.6" sources."object-assign-4.1.1" sources."object-inspect-1.7.0" - sources."object-is-1.0.2" + sources."object-is-1.1.2" sources."object-keys-1.1.1" sources."object.assign-4.1.0" sources."once-1.4.0" @@ -73570,7 +73614,7 @@ in sources."redent-1.0.0" sources."regexp.prototype.flags-1.3.0" sources."repeating-2.0.1" - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."restore-cursor-2.0.0" sources."reverse-http-1.3.0" sources."rimraf-2.7.1" @@ -73651,7 +73695,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Streaming torrent client for Node.js"; - homepage = "https://github.com/mafintosh/peerflix"; + homepage = https://github.com/mafintosh/peerflix; license = "MIT"; }; production = true; @@ -73710,7 +73754,7 @@ in sources."bncode-0.5.3" sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" - sources."buffer-5.5.0" + sources."buffer-5.6.0" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -74040,7 +74084,166 @@ in buildInputs = globalBuildInputs; meta = { description = "Fast, disk space efficient package manager"; - homepage = "https://pnpm.js.org/"; + homepage = https://pnpm.js.org/; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + postcss-cli = nodeEnv.buildNodePackage { + name = "postcss-cli"; + packageName = "postcss-cli"; + version = "7.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-cli/-/postcss-cli-7.1.0.tgz"; + sha512 = "tCGK0GO2reu644dUHxks8U2SAtKnzftQTAXN1dwzFPoKXZr0b7VX4vTkQ2Pl2Lunas6+o8uHR56hlcYBm1srZg=="; + }; + dependencies = [ + sources."@nodelib/fs.scandir-2.1.3" + sources."@nodelib/fs.stat-2.0.3" + sources."@nodelib/fs.walk-1.2.4" + sources."@types/color-name-1.1.1" + sources."@types/events-3.0.0" + sources."@types/glob-7.1.1" + sources."@types/minimatch-3.0.3" + sources."@types/node-13.11.1" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.2.1" + sources."anymatch-3.1.1" + sources."argparse-1.0.10" + sources."array-union-2.1.0" + sources."balanced-match-1.0.0" + sources."binary-extensions-2.0.0" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."caller-callsite-2.0.0" + sources."caller-path-2.0.0" + sources."callsites-2.0.0" + sources."camelcase-5.3.1" + sources."chalk-3.0.0" + sources."chokidar-3.3.1" + sources."cliui-6.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."concat-map-0.0.1" + sources."cosmiconfig-5.2.1" + sources."decamelize-1.2.0" + sources."dependency-graph-0.8.1" + sources."dir-glob-3.0.1" + sources."emoji-regex-8.0.0" + sources."error-ex-1.3.2" + sources."escape-string-regexp-1.0.5" + sources."esprima-4.0.1" + sources."fast-glob-3.2.2" + sources."fastq-1.7.0" + sources."fill-range-7.0.1" + sources."find-up-4.1.0" + sources."fs-extra-8.1.0" + sources."fs.realpath-1.0.0" + sources."fsevents-2.1.2" + sources."get-caller-file-2.0.5" + sources."get-stdin-7.0.0" + sources."glob-7.1.6" + sources."glob-parent-5.1.1" + sources."globby-10.0.2" + sources."graceful-fs-4.2.3" + sources."has-flag-4.0.0" + sources."ignore-5.1.4" + sources."import-cwd-2.1.0" + sources."import-fresh-2.0.0" + sources."import-from-2.1.0" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."is-arrayish-0.2.1" + sources."is-binary-path-2.1.0" + sources."is-directory-0.3.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-3.0.0" + sources."is-glob-4.0.1" + sources."is-number-7.0.0" + sources."js-yaml-3.13.1" + sources."json-parse-better-errors-1.0.2" + sources."jsonfile-4.0.0" + sources."locate-path-5.0.0" + sources."lodash-4.17.15" + (sources."log-symbols-2.2.0" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" + ]; + }) + sources."merge2-1.3.0" + sources."micromatch-4.0.2" + sources."minimatch-3.0.4" + sources."normalize-path-3.0.0" + sources."once-1.4.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" + sources."parse-json-4.0.0" + sources."path-exists-4.0.0" + sources."path-is-absolute-1.0.1" + sources."path-type-4.0.0" + sources."picomatch-2.2.2" + sources."pify-2.3.0" + (sources."postcss-7.0.27" // { + dependencies = [ + sources."ansi-styles-3.2.1" + (sources."chalk-2.4.2" // { + dependencies = [ + sources."supports-color-5.5.0" + ]; + }) + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" + sources."supports-color-6.1.0" + ]; + }) + sources."postcss-load-config-2.1.0" + (sources."postcss-reporter-6.0.1" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" + ]; + }) + sources."pretty-hrtime-1.0.3" + sources."read-cache-1.0.0" + sources."readdirp-3.3.0" + sources."require-directory-2.1.1" + sources."require-main-filename-2.0.0" + sources."resolve-from-3.0.0" + sources."reusify-1.0.4" + sources."run-parallel-1.1.9" + sources."set-blocking-2.0.0" + sources."slash-3.0.0" + sources."source-map-0.6.1" + sources."sprintf-js-1.0.3" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + sources."supports-color-7.1.0" + sources."to-regex-range-5.0.1" + sources."universalify-0.1.2" + sources."which-module-2.0.0" + sources."wrap-ansi-6.2.0" + sources."wrappy-1.0.2" + sources."y18n-4.0.0" + sources."yargs-15.3.1" + sources."yargs-parser-18.1.3" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "CLI for PostCSS"; + homepage = "https://github.com/postcss/postcss-cli#readme"; license = "MIT"; }; production = true; @@ -74058,7 +74261,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Prettier is an opinionated code formatter"; - homepage = "https://prettier.io/"; + homepage = https://prettier.io/; license = "MIT"; }; production = true; @@ -74344,7 +74547,7 @@ in ]; }) sources."reject-unsatisfied-npm-version-1.0.0" - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."resolve-from-npm-3.1.0" sources."restore-cursor-2.0.0" sources."rimraf-2.7.1" @@ -74445,7 +74648,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A build system for PureScript projects"; - homepage = "https://github.com/purescript-contrib/pulp"; + homepage = https://github.com/purescript-contrib/pulp; license = "LGPL-3.0+"; }; production = true; @@ -74529,7 +74732,7 @@ in sources."mute-stream-0.0.8" sources."ncp-0.4.2" sources."object-inspect-1.7.0" - sources."object-is-1.0.2" + sources."object-is-1.1.2" sources."object-keys-1.1.1" sources."object.assign-4.1.0" sources."once-1.4.0" @@ -74617,7 +74820,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A set of complementary tools to React, including the JSX transformer."; - homepage = "https://facebook.github.io/react"; + homepage = https://facebook.github.io/react; license = "BSD-3-Clause"; }; production = true; @@ -74635,7 +74838,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The HTML Presentation Framework"; - homepage = "http://revealjs.com/"; + homepage = http://revealjs.com/; license = "MIT"; }; production = true; @@ -74651,9 +74854,9 @@ in sources."@babel/code-frame-7.8.3" sources."@babel/helper-validator-identifier-7.9.5" sources."@babel/highlight-7.9.0" - sources."@rollup/plugin-commonjs-11.0.2" - sources."@rollup/plugin-node-resolve-7.1.1" - sources."@rollup/pluginutils-3.0.8" + sources."@rollup/plugin-commonjs-11.1.0" + sources."@rollup/plugin-node-resolve-7.1.3" + sources."@rollup/pluginutils-3.0.9" sources."@types/color-name-1.1.1" sources."@types/eslint-visitor-keys-1.0.0" sources."@types/estree-0.0.39" @@ -74662,10 +74865,10 @@ in sources."@types/node-fetch-2.5.6" sources."@types/resolve-0.0.8" sources."@types/vscode-1.43.0" - sources."@typescript-eslint/eslint-plugin-2.27.0" - sources."@typescript-eslint/experimental-utils-2.27.0" - sources."@typescript-eslint/parser-2.27.0" - sources."@typescript-eslint/typescript-estree-2.27.0" + sources."@typescript-eslint/eslint-plugin-2.28.0" + sources."@typescript-eslint/experimental-utils-2.28.0" + sources."@typescript-eslint/parser-2.28.0" + sources."@typescript-eslint/typescript-estree-2.28.0" sources."acorn-7.1.1" sources."acorn-jsx-5.2.0" sources."ajv-6.12.0" @@ -74683,6 +74886,7 @@ in sources."balanced-match-1.0.0" sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" + sources."braces-3.0.2" sources."buffer-crc32-0.2.13" sources."builtin-modules-3.1.0" sources."callsites-3.1.0" @@ -74690,12 +74894,13 @@ in sources."chardet-0.7.0" sources."cheerio-1.0.0-rc.3" sources."cli-cursor-3.1.0" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."combined-stream-1.0.8" sources."commander-2.20.3" sources."commandpost-1.4.0" + sources."commondir-1.0.1" sources."concat-map-0.0.1" (sources."cross-spawn-6.0.5" // { dependencies = [ @@ -74732,9 +74937,9 @@ in sources."eslint-visitor-keys-1.1.0" sources."espree-6.2.1" sources."esprima-4.0.1" - (sources."esquery-1.2.0" // { + (sources."esquery-1.3.1" // { dependencies = [ - sources."estraverse-5.0.0" + sources."estraverse-5.1.0" ]; }) sources."esrecurse-4.2.1" @@ -74748,6 +74953,7 @@ in sources."fd-slicer-1.1.0" sources."figures-3.2.0" sources."file-entry-cache-5.0.1" + sources."fill-range-7.0.1" sources."flat-cache-2.0.1" sources."flatted-2.0.2" sources."form-data-3.0.0" @@ -74780,6 +74986,7 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" sources."is-module-1.0.0" + sources."is-number-7.0.0" sources."is-promise-2.1.0" sources."is-reference-1.1.4" sources."isexe-2.0.0" @@ -74800,6 +75007,7 @@ in ]; }) sources."mdurl-1.0.1" + sources."micromatch-4.0.2" sources."mime-1.6.0" sources."mime-db-1.43.0" sources."mime-types-2.1.26" @@ -74831,6 +75039,7 @@ in sources."path-key-2.0.1" sources."path-parse-1.0.6" sources."pend-1.2.0" + sources."picomatch-2.2.2" sources."prelude-ls-1.1.2" sources."progress-2.0.3" sources."pseudomap-1.0.2" @@ -74838,11 +75047,11 @@ in sources."read-1.0.7" sources."readable-stream-3.6.0" sources."regexpp-3.1.0" - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."resolve-from-4.0.0" sources."restore-cursor-3.1.0" sources."rimraf-2.6.3" - sources."rollup-2.6.0" + sources."rollup-2.6.1" sources."run-async-2.4.0" sources."rxjs-6.5.5" sources."safe-buffer-5.2.0" @@ -74882,6 +75091,7 @@ in sources."text-table-0.2.0" sources."through-2.3.8" sources."tmp-0.0.33" + sources."to-regex-range-5.0.1" sources."tslib-1.11.1" sources."tsutils-3.17.1" sources."tunnel-0.0.4" @@ -75056,10 +75266,10 @@ in semver = nodeEnv.buildNodePackage { name = "semver"; packageName = "semver"; - version = "7.2.2"; + version = "7.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.2.2.tgz"; - sha512 = "Zo84u6o2PebMSK3zjJ6Zp5wi8VnQZnEaCP13Ul/lt1ANsLACxnJxq4EEm1PY94/por1Hm9+7xpIswdS5AkieMA=="; + url = "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz"; + sha512 = "OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -75197,7 +75407,7 @@ in sources."node-fetch-2.6.0" ]; }) - (sources."@serverless/components-2.29.1" // { + (sources."@serverless/components-2.29.3" // { dependencies = [ sources."fs-extra-8.1.0" sources."globby-10.0.2" @@ -75234,7 +75444,7 @@ in sources."https-proxy-agent-5.0.0" ]; }) - (sources."@serverless/platform-client-china-1.0.3" // { + (sources."@serverless/platform-client-china-1.0.5" // { dependencies = [ sources."https-proxy-agent-5.0.0" ]; @@ -75247,7 +75457,7 @@ in ]; }) sources."@serverless/template-1.1.3" - (sources."@serverless/utils-china-0.1.1" // { + (sources."@serverless/utils-china-0.1.3" // { dependencies = [ sources."https-proxy-agent-5.0.0" ]; @@ -75261,7 +75471,7 @@ in sources."@types/lodash-4.14.149" sources."@types/minimatch-3.0.3" sources."@types/node-13.11.1" - (sources."@typescript-eslint/typescript-estree-2.27.0" // { + (sources."@typescript-eslint/typescript-estree-2.28.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -75320,7 +75530,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.656.0" // { + (sources."aws-sdk-2.657.0" // { dependencies = [ sources."buffer-4.9.1" sources."isarray-1.0.0" @@ -75369,7 +75579,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."buffer-5.5.0" + sources."buffer-5.6.0" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -75431,7 +75641,7 @@ in ]; }) sources."cli-cursor-3.1.0" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" sources."clone-response-1.0.2" sources."collection-visit-1.0.0" (sources."color-3.0.0" // { @@ -76005,7 +76215,7 @@ in sources."request-promise-native-1.0.8" sources."requirejs-2.3.6" sources."requirejs-config-file-3.1.2" - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."resolve-dependency-path-2.0.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" @@ -76276,7 +76486,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more"; - homepage = "https://serverless.com/framework/docs/"; + homepage = https://serverless.com/framework/docs/; license = "MIT"; }; production = true; @@ -76961,7 +77171,7 @@ in }) sources."boxen-1.3.0" sources."brace-expansion-1.1.11" - sources."buffer-5.5.0" + sources."buffer-5.6.0" sources."buffer-from-1.1.1" sources."bytes-3.1.0" sources."camelcase-4.1.0" @@ -76972,7 +77182,7 @@ in sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" sources."cli-spinner-0.2.10" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" (sources."cliui-3.2.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -77231,7 +77441,7 @@ in sources."snyk-resolve-1.0.1" (sources."snyk-resolve-deps-4.4.0" // { dependencies = [ - sources."@types/node-6.14.9" + sources."@types/node-6.14.10" sources."semver-5.7.1" ]; }) @@ -77532,7 +77742,7 @@ in sources."redent-2.0.0" sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."restore-cursor-2.0.0" sources."round-to-3.0.0" sources."safe-buffer-5.2.0" @@ -77638,7 +77848,7 @@ in sources."brace-expansion-1.1.11" sources."braces-1.8.5" sources."broadcast-stream-0.2.2" - sources."buffer-5.5.0" + sources."buffer-5.6.0" sources."buffer-from-1.1.1" sources."bytewise-1.1.0" sources."bytewise-core-1.2.3" @@ -77729,7 +77939,7 @@ in sources."emoji-server-1.0.0" (sources."encoding-down-6.3.0" // { dependencies = [ - sources."abstract-leveldown-6.2.3" + sources."abstract-leveldown-6.3.0" ]; }) sources."epidemic-broadcast-trees-7.0.0" @@ -77914,7 +78124,7 @@ in sources."node-gyp-build-4.1.1" ]; }) - sources."levelup-4.3.2" + sources."levelup-4.4.0" sources."libnested-1.5.0" sources."libsodium-0.7.6" sources."libsodium-wrappers-0.7.6" @@ -77969,7 +78179,7 @@ in }) sources."napi-macros-2.0.0" sources."ncp-2.0.0" - sources."nearley-2.19.1" + sources."nearley-2.19.2" sources."nice-try-1.0.5" sources."node-gyp-build-4.2.1" sources."non-private-ip-1.4.4" @@ -77991,7 +78201,7 @@ in ]; }) sources."object-inspect-1.7.0" - sources."object-is-1.0.2" + sources."object-is-1.1.2" sources."object-keys-1.1.1" (sources."object-visit-1.0.1" // { dependencies = [ @@ -78378,7 +78588,7 @@ in buildInputs = globalBuildInputs; meta = { description = "network protocol layer for secure-scuttlebutt"; - homepage = "https://github.com/ssbc/ssb-server"; + homepage = https://github.com/ssbc/ssb-server; license = "MIT"; }; production = true; @@ -78396,7 +78606,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Send metric data from statsd to Stackdriver"; - homepage = "https://www.stackdriver.com/"; + homepage = https://www.stackdriver.com/; license = "MIT"; }; production = true; @@ -78471,7 +78681,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.656.0" // { + (sources."aws-sdk-2.657.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -78965,7 +79175,7 @@ in sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."requires-port-1.0.0" - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."ret-0.2.2" sources."rethinkdb-2.4.2" sources."retry-0.9.0" @@ -79315,7 +79525,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Nodejs-based tool for optimizing SVG vector graphics files"; - homepage = "https://github.com/svg/svgo"; + homepage = https://github.com/svg/svgo; license = "MIT"; }; production = true; @@ -79894,11 +80104,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - (sources."uglify-js-3.8.1" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) + sources."uglify-js-3.9.1" sources."undefsafe-2.0.3" (sources."union-value-1.0.1" // { dependencies = [ @@ -80245,7 +80451,7 @@ in sources."normalize-package-data-2.5.0" sources."number-is-nan-1.0.1" sources."object-inspect-1.7.0" - sources."object-is-1.0.2" + sources."object-is-1.1.2" sources."object-keys-1.1.1" sources."object.assign-4.1.0" sources."once-1.4.0" @@ -80285,7 +80491,7 @@ in sources."repeat-string-1.6.1" sources."replace-ext-1.0.0" sources."require-from-string-2.0.2" - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."rimraf-2.6.3" sources."safe-buffer-5.1.2" sources."semver-5.7.1" @@ -80354,7 +80560,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The pluggable linting tool for text and markdown."; - homepage = "https://github.com/textlint/textlint/"; + homepage = https://github.com/textlint/textlint/; license = "MIT"; }; production = true; @@ -80376,7 +80582,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Latex plugin for [textlint](https://github.com/textlint/textlint "textlint")."; - homepage = "https://github.com/elzup/textlint-plugin-latex"; + homepage = https://github.com/elzup/textlint-plugin-latex; license = "MIT"; }; production = true; @@ -80415,7 +80621,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule check that abbreviations within parentheses."; - homepage = "https://github.com/azu/textlint-rule-abbr-within-parentheses"; + homepage = https://github.com/azu/textlint-rule-abbr-within-parentheses; license = "MIT"; }; production = true; @@ -80614,7 +80820,7 @@ in sources."repeat-string-1.6.1" sources."repeating-2.0.1" sources."replace-ext-1.0.0" - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."resolve-from-5.0.0" sources."retext-english-3.0.4" sources."retext-equality-3.2.0" @@ -80729,7 +80935,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule for alex"; - homepage = "https://github.com/textlint-rule/textlint-rule-alex"; + homepage = https://github.com/textlint-rule/textlint-rule-alex; license = "MIT"; }; production = true; @@ -80754,7 +80960,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule to check common misspellings"; - homepage = "https://github.com/io-monad/textlint-rule-common-misspellings"; + homepage = https://github.com/io-monad/textlint-rule-common-misspellings; license = "GPL-3.0"; }; production = true; @@ -80776,7 +80982,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Textlint rule to check correct usage of diacritics"; - homepage = "https://github.com/sapegin/textlint-rule-diacritics"; + homepage = https://github.com/sapegin/textlint-rule-diacritics; license = "MIT"; }; production = true; @@ -80813,7 +81019,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule that specify the maximum word count of a sentence."; - homepage = "https://github.com/azu/textlint-rule-en-max-word-count"; + homepage = https://github.com/azu/textlint-rule-en-max-word-count; license = "MIT"; }; production = true; @@ -80906,7 +81112,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule that check no start with duplicated conjunction."; - homepage = "https://github.com/textlint-rule/textlint-rule-no-start-duplicated-conjunction"; + homepage = https://github.com/textlint-rule/textlint-rule-no-start-duplicated-conjunction; license = "MIT"; }; production = true; @@ -80947,7 +81153,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule that check with or without period in list item."; - homepage = "https://github.com/textlint-rule/textlint-rule-period-in-list-item"; + homepage = https://github.com/textlint-rule/textlint-rule-period-in-list-item; license = "MIT"; }; production = true; @@ -80977,7 +81183,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Textlint rule to find filler words, buzzwords and chiches"; - homepage = "https://github.com/sapegin/textlint-rule-stop-words"; + homepage = https://github.com/sapegin/textlint-rule-stop-words; license = "MIT"; }; production = true; @@ -81007,7 +81213,7 @@ in buildInputs = globalBuildInputs; meta = { description = "TextLint rule to check correct terms spelling"; - homepage = "https://github.com/sapegin/textlint-rule-terminology"; + homepage = https://github.com/sapegin/textlint-rule-terminology; license = "MIT"; }; production = true; @@ -81047,7 +81253,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule that check unexpanded acronym word."; - homepage = "https://github.com/textlint-rule/textlint-rule-unexpanded-acronym"; + homepage = https://github.com/textlint-rule/textlint-rule-unexpanded-acronym; license = "MIT"; }; production = true; @@ -81087,7 +81293,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule to check your English style with write good"; - homepage = "https://github.com/textlint-rule/textlint-rule-write-good"; + homepage = https://github.com/textlint-rule/textlint-rule-write-good; license = "MIT"; }; production = true; @@ -81522,7 +81728,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The self-hosted Web IRC client"; - homepage = "https://thelounge.chat/"; + homepage = https://thelounge.chat/; license = "MIT"; }; production = true; @@ -81540,7 +81746,7 @@ in buildInputs = globalBuildInputs; meta = { description = "JavaScript 3D library"; - homepage = "https://threejs.org/"; + homepage = https://threejs.org/; license = "MIT"; }; production = true; @@ -81550,10 +81756,10 @@ in tiddlywiki = nodeEnv.buildNodePackage { name = "tiddlywiki"; packageName = "tiddlywiki"; - version = "5.1.21"; + version = "5.1.22"; src = fetchurl { - url = "https://registry.npmjs.org/tiddlywiki/-/tiddlywiki-5.1.21.tgz"; - sha512 = "VuBK9N2u9ttPcaHCh4NmRX3YYB2tMPoIKCHhfNaJ62VGQj8ozmVD+PkvP/w7R50g6HaZtaSsqUJj26gRTIBa6w=="; + url = "https://registry.npmjs.org/tiddlywiki/-/tiddlywiki-5.1.22.tgz"; + sha512 = "Iav0iC9SnwN6HTYGRfEI7kYDoq+hlKr9fw9o8aTs0wxMp0UzqlvthGwlK1JwrdVIRL92no1lpVGhQQj16ncSQQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -81693,10 +81899,10 @@ in triton = nodeEnv.buildNodePackage { name = "triton"; packageName = "triton"; - version = "7.7.1"; + version = "7.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/triton/-/triton-7.7.1.tgz"; - sha512 = "ex2eL9Mw6XInMlG4CJAFUyxyQ/+8Qa6CzdFuGg5t3tlL5YauP3riInRf7NIOxcHJq02f41iBzRqwhXGvIhl6Fg=="; + url = "https://registry.npmjs.org/triton/-/triton-7.8.0.tgz"; + sha512 = "/f9E08NvOvOyudT1ar0ENjtJqcFuEnVMBhEpgQda8dQibxgOEbK7dOkc6T0OZ3ve1E3wXn8JVnY+l1EBZ/8/5w=="; }; dependencies = [ sources."asn1-0.2.4" @@ -81868,6 +82074,11 @@ in sources."extsprintf-1.2.0" ]; }) + (sources."watershed-0.3.4" // { + dependencies = [ + sources."readable-stream-1.0.2" + ]; + }) sources."which-1.2.4" sources."wordwrap-1.0.0" sources."wrappy-1.0.2" @@ -81876,7 +82087,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Joyent Triton CLI and client (https://www.joyent.com/triton)"; - homepage = "https://github.com/joyent/node-triton"; + homepage = https://github.com/joyent/node-triton; license = "MPL-2.0"; }; production = true; @@ -81892,7 +82103,7 @@ in sha512 = "N8E1X543CWEjg0/A70ZnA/kfAfAY/uogILsIuWBhHGxzv9kaJaj7/JCSwDiBH86CPEy37chSgW86KxVeYKsswQ=="; }; dependencies = [ - sources."@types/node-6.14.9" + sources."@types/node-6.14.10" sources."ansi-0.3.1" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -81925,7 +82136,7 @@ in buildInputs = globalBuildInputs; meta = { description = "TSUN: a repl for TypeScript Upgraded Node"; - homepage = "https://github.com/HerringtonDarkholme/typescript-repl"; + homepage = https://github.com/HerringtonDarkholme/typescript-repl; license = "MIT"; }; production = true; @@ -81966,7 +82177,7 @@ in buildInputs = globalBuildInputs; meta = { description = "TypeScript is a language for application scale JavaScript development"; - homepage = "https://www.typescriptlang.org/"; + homepage = https://www.typescriptlang.org/; license = "Apache-2.0"; }; production = true; @@ -82012,14 +82223,13 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.8.1"; + version = "3.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.8.1.tgz"; - sha512 = "W7KxyzeaQmZvUFbGj4+YFshhVrMBGSg2IbcYAjGWGvx8DHvJMclbTDMpffdxFUGPBHjIytk7KJUR/KUXstUGDw=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.1.tgz"; + sha512 = "JUPoL1jHsc9fOjVFHdQIhqEEJsQvfKDjlubcCilu8U26uZ73qOg8VsN8O1jbuei44ZPlwL7kmbAdM4tzaUvqnA=="; }; dependencies = [ sources."commander-2.20.3" - sources."source-map-0.6.1" ]; buildInputs = globalBuildInputs; meta = { @@ -82364,7 +82574,7 @@ in sources."y18n-4.0.0" sources."yallist-2.1.2" sources."yargs-15.3.1" - sources."yargs-parser-18.1.2" + sources."yargs-parser-18.1.3" sources."yeast-0.1.2" ]; buildInputs = globalBuildInputs; @@ -82476,7 +82686,7 @@ in sources."bl-1.2.2" sources."bluebird-3.7.2" sources."brace-expansion-1.1.11" - sources."buffer-5.5.0" + sources."buffer-5.6.0" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -82489,7 +82699,7 @@ in sources."chardet-0.7.0" sources."cli-cursor-2.1.0" sources."cli-spinners-1.3.1" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" sources."clone-1.0.4" sources."co-3.1.0" sources."co-from-stream-0.0.0" @@ -82702,7 +82912,7 @@ in sources."tslib-1.11.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.8.1" + sources."uglify-js-3.9.1" sources."uid-0.0.2" sources."unbzip2-stream-1.4.1" sources."unyield-0.0.1" @@ -82899,7 +83109,7 @@ in }) sources."cli-boxes-2.2.0" sources."cli-cursor-2.1.0" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" sources."cliui-4.1.0" sources."clone-1.0.4" sources."clone-response-1.0.2" @@ -82982,9 +83192,9 @@ in sources."eslint-visitor-keys-1.1.0" sources."espree-5.0.1" sources."esprima-4.0.1" - (sources."esquery-1.2.0" // { + (sources."esquery-1.3.1" // { dependencies = [ - sources."estraverse-5.0.0" + sources."estraverse-5.1.0" ]; }) sources."esrecurse-4.2.1" @@ -83205,7 +83415,7 @@ in sources."lodash.merge-4.6.2" sources."lodash.rest-4.0.5" sources."lodash.unescape-4.0.1" - sources."loglevel-1.6.7" + sources."loglevel-1.6.8" (sources."loglevel-colored-level-prefix-1.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -83432,7 +83642,7 @@ in sources."resolve-from-1.0.1" ]; }) - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."resolve-from-5.0.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" @@ -83731,7 +83941,7 @@ in buildInputs = globalBuildInputs; meta = { description = "vue-language-server"; - homepage = "https://github.com/vuejs/vetur/tree/master/server"; + homepage = https://github.com/vuejs/vetur/tree/master/server; license = "MIT"; }; production = true; @@ -83883,7 +84093,7 @@ in sources."is-extendable-0.1.1" ]; }) - sources."buffer-5.5.0" + sources."buffer-5.6.0" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -83933,7 +84143,7 @@ in }) sources."cli-boxes-2.2.0" sources."cli-cursor-2.1.0" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" (sources."cliui-6.0.0" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -84114,9 +84324,9 @@ in ]; }) sources."esprima-4.0.1" - (sources."esquery-1.2.0" // { + (sources."esquery-1.3.1" // { dependencies = [ - sources."estraverse-5.0.0" + sources."estraverse-5.1.0" ]; }) sources."esrecurse-4.2.1" @@ -84446,7 +84656,7 @@ in ]; }) sources."object-inspect-1.7.0" - sources."object-is-1.0.2" + sources."object-is-1.1.2" sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.0" @@ -84559,7 +84769,7 @@ in sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."require-uncached-1.0.3" - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."resolve-from-1.0.1" sources."resolve-url-0.2.1" sources."responselike-1.0.2" @@ -84830,7 +85040,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A command line tool to help build, run, and test web extensions"; - homepage = "https://github.com/mozilla/web-ext"; + homepage = https://github.com/mozilla/web-ext; license = "MPL-2.0"; }; production = true; @@ -85306,7 +85516,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff."; - homepage = "https://github.com/webpack/webpack"; + homepage = https://github.com/webpack/webpack; license = "MIT"; }; production = true; @@ -85876,7 +86086,7 @@ in ]; }) sources."hpack.js-2.1.6" - sources."html-entities-1.2.1" + sources."html-entities-1.3.1" sources."http-deceiver-1.2.7" (sources."http-errors-1.7.2" // { dependencies = [ @@ -85932,7 +86142,7 @@ in sources."lcid-2.0.0" sources."locate-path-3.0.0" sources."lodash-4.17.15" - sources."loglevel-1.6.7" + sources."loglevel-1.6.8" sources."map-age-cleaner-0.1.3" sources."map-cache-0.2.2" sources."map-visit-1.0.0" @@ -85977,7 +86187,7 @@ in ]; }) sources."object-inspect-1.7.0" - sources."object-is-1.0.2" + sources."object-is-1.1.2" sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.assign-4.1.0" @@ -86371,7 +86581,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Copy files && directories with webpack"; - homepage = "https://github.com/webpack-contrib/copy-webpack-plugin"; + homepage = https://github.com/webpack-contrib/copy-webpack-plugin; license = "MIT"; }; production = true; @@ -86668,7 +86878,7 @@ in buildInputs = globalBuildInputs; meta = { description = "WebTorrent, the streaming torrent client. For the command line."; - homepage = "https://webtorrent.io/"; + homepage = https://webtorrent.io/; license = "MIT"; }; production = true; @@ -86901,7 +87111,7 @@ in sources."cli-cursor-2.1.0" sources."cli-list-0.2.0" sources."cli-table-0.3.1" - sources."cli-width-2.2.0" + sources."cli-width-2.2.1" sources."clone-1.0.4" sources."clone-buffer-1.0.0" sources."clone-regexp-1.0.1" @@ -87048,7 +87258,7 @@ in sources."glob-to-regexp-0.3.0" (sources."global-agent-2.1.8" // { dependencies = [ - sources."semver-7.2.2" + sources."semver-7.3.2" ]; }) sources."global-dirs-0.1.1" @@ -87062,7 +87272,7 @@ in ]; }) sources."graceful-fs-4.2.3" - sources."grouped-queue-1.0.0" + sources."grouped-queue-1.1.0" sources."har-schema-2.0.0" sources."har-validator-5.1.3" (sources."has-ansi-2.0.0" // { @@ -87379,7 +87589,7 @@ in sources."tough-cookie-2.5.0" ]; }) - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" sources."restore-cursor-2.0.0" @@ -87558,7 +87768,7 @@ in sources."tunnel-0.0.6" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."twig-1.15.0" + sources."twig-1.15.1" sources."type-fest-0.3.1" sources."typedarray-0.0.6" sources."union-value-1.0.1" @@ -87622,7 +87832,7 @@ in ]; }) sources."yeoman-doctor-4.0.0" - (sources."yeoman-environment-2.9.0" // { + (sources."yeoman-environment-2.9.1" // { dependencies = [ sources."ansi-escapes-4.3.1" sources."ansi-regex-5.0.0" @@ -87650,7 +87860,7 @@ in sources."onetime-5.1.0" sources."path-key-3.1.1" sources."restore-cursor-3.1.0" - sources."semver-7.2.2" + sources."semver-7.3.2" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" (sources."string-width-4.2.0" // { @@ -87668,7 +87878,7 @@ in sources."which-2.0.2" ]; }) - (sources."yeoman-generator-4.8.0" // { + (sources."yeoman-generator-4.8.2" // { dependencies = [ sources."debug-4.1.1" sources."diff-4.0.2" @@ -87686,7 +87896,7 @@ in sources."parse-json-5.0.0" sources."read-pkg-5.2.0" sources."read-pkg-up-5.0.0" - sources."semver-7.2.2" + sources."semver-7.3.2" sources."through2-3.0.1" sources."type-fest-0.6.0" ]; @@ -87707,11 +87917,11 @@ in buildInputs = globalBuildInputs; meta = { description = "CLI tool for running Yeoman generators"; - homepage = "http://yeoman.io/"; + homepage = http://yeoman.io/; license = "BSD-2-Clause"; }; production = true; bypassCache = true; reconstructLock = true; }; -} +} \ No newline at end of file diff --git a/pkgs/development/node-packages/node-packages-v12.nix b/pkgs/development/node-packages/node-packages-v12.nix index 6e33f6f0f62..701c5d84a25 100644 --- a/pkgs/development/node-packages/node-packages-v12.nix +++ b/pkgs/development/node-packages/node-packages-v12.nix @@ -1849,13 +1849,13 @@ let sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; }; }; - "resolve-1.15.1" = { + "resolve-1.16.0" = { name = "resolve"; packageName = "resolve"; - version = "1.15.1"; + version = "1.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz"; - sha512 = "84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.16.0.tgz"; + sha512 = "LarL/PIKJvc09k1jaeT4kQb/8/7P+qV4qSnN2K80AES+OHdfZELAKVOBjxsvtToT/uLOfFbvYvKfZmV8cee7nA=="; }; }; "resolve-dir-1.0.1" = { @@ -2475,7 +2475,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Unfancy JavaScript"; - homepage = "http://coffeescript.org/"; + homepage = http://coffeescript.org/; license = "MIT"; }; production = true; @@ -2655,7 +2655,7 @@ in sources."regex-not-1.0.2" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -2905,7 +2905,7 @@ in ]; }) sources."request-2.88.2" - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."retry-0.10.1" sources."rimraf-2.6.3" sources."safe-buffer-5.2.0" @@ -2953,7 +2953,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Generate Nix expressions to build NPM packages"; - homepage = "https://github.com/svanderburg/node2nix"; + homepage = https://github.com/svanderburg/node2nix; license = "MIT"; }; production = true; @@ -3090,7 +3090,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Build tool and bindings loader for node-gyp that supports prebuilds"; - homepage = "https://github.com/prebuild/node-gyp-build"; + homepage = https://github.com/prebuild/node-gyp-build; license = "MIT"; }; production = true; @@ -3182,4 +3182,4 @@ in bypassCache = true; reconstructLock = true; }; -} +} \ No newline at end of file diff --git a/pkgs/development/node-packages/node-packages-v13.nix b/pkgs/development/node-packages/node-packages-v13.nix index 107d0ed9ad7..d70195210c7 100644 --- a/pkgs/development/node-packages/node-packages-v13.nix +++ b/pkgs/development/node-packages/node-packages-v13.nix @@ -895,13 +895,13 @@ let sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw=="; }; }; - "resolve-1.15.1" = { + "resolve-1.16.0" = { name = "resolve"; packageName = "resolve"; - version = "1.15.1"; + version = "1.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz"; - sha512 = "84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.16.0.tgz"; + sha512 = "LarL/PIKJvc09k1jaeT4kQb/8/7P+qV4qSnN2K80AES+OHdfZELAKVOBjxsvtToT/uLOfFbvYvKfZmV8cee7nA=="; }; }; "retry-0.10.1" = { @@ -1393,7 +1393,7 @@ in ]; }) sources."request-2.88.2" - sources."resolve-1.15.1" + sources."resolve-1.16.0" sources."retry-0.10.1" sources."rimraf-2.6.3" sources."safe-buffer-5.2.0" @@ -1441,11 +1441,11 @@ in buildInputs = globalBuildInputs; meta = { description = "Generate Nix expressions to build NPM packages"; - homepage = "https://github.com/svanderburg/node2nix"; + homepage = https://github.com/svanderburg/node2nix; license = "MIT"; }; production = true; bypassCache = true; reconstructLock = true; }; -} +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 870b812e5d4..85e628a51d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10624,6 +10624,8 @@ in pkg-configUpstream = lowPrio (pkg-config.override { vanilla = true; }); pkgconfigUpstream = pkg-configUpstream; # added 2018-02-02 + inherit (nodePackages) postcss-cli; + postiats-utilities = callPackage ../development/tools/postiats-utilities {}; postman = callPackage ../development/web/postman {}; -- cgit v1.2.3 From c339130b803f4cf22f08ff411dbd9875a95fd28a Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Thu, 16 Apr 2020 19:32:35 +0200 Subject: vapoursynth: R48 -> R49 --- pkgs/development/libraries/vapoursynth/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/vapoursynth/default.nix b/pkgs/development/libraries/vapoursynth/default.nix index 46c97e0dae9..043bfb007a3 100644 --- a/pkgs/development/libraries/vapoursynth/default.nix +++ b/pkgs/development/libraries/vapoursynth/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, makeWrapper , zimg, libass, python3, libiconv -, ApplicationServices, nasm +, ApplicationServices , ocrSupport ? false, tesseract ? null , imwriSupport? true, imagemagick7 ? null }: @@ -12,16 +12,16 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "vapoursynth"; - version = "R48"; + version = "R49"; src = fetchFromGitHub { owner = "vapoursynth"; repo = "vapoursynth"; rev = version; - sha256 = "1i6163bidlp0p9zcnxpsphr44ayfzd51fig4ri7vbrbl9lw9jaih"; + sha256 = "1d298mlb24nlc2x7pixfbkd0qbpv4c706c32idsgpi96z1spkhvl"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook nasm makeWrapper ]; + nativeBuildInputs = [ pkgconfig autoreconfHook makeWrapper ]; buildInputs = [ zimg libass (python3.withPackages (ps: with ps; [ sphinx cython ])) -- cgit v1.2.3 From 5822d03851cfd9e8e7449c05c2cea2232e52cc42 Mon Sep 17 00:00:00 2001 From: Kirill Elagin Date: Fri, 17 Apr 2020 10:12:34 +0300 Subject: systemd: Simplify unit script names Current journal output from services started by `script` rather than `ExexStart` is unreadable because the name of the file (which journalctl records and outputs) quite literally takes 1/3 of the screen (on smaller screens). Make it shorter. In particular: * Drop the `unit-script` prefix as it is not very useful. * Use `writeShellScriptBin` to write them because: * It has a `checkPhase` which is better than no checkPhase. * The script itself ends up having a short name. --- nixos/modules/system/boot/systemd.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 7f207e6c7ef..7682b26e5b7 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -201,8 +201,13 @@ let ]; makeJobScript = name: text: - let mkScriptName = s: "unit-script-" + (replaceChars [ "\\" "@" ] [ "-" "_" ] (shellEscape s) ); - in pkgs.writeTextFile { name = mkScriptName name; executable = true; inherit text; }; + let + scriptName = replaceChars [ "\\" "@" ] [ "-" "_" ] (shellEscape name); + out = pkgs.writeShellScriptBin scriptName '' + set -e + ${text} + ''; + in "${out}/bin/${scriptName}"; unitConfig = { config, options, ... }: { config = { -- cgit v1.2.3 From 6dc7443d1b41df8365174ffeff3bf94a44f683ca Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 17 Apr 2020 10:04:38 +1000 Subject: skopeo: cleanup --- pkgs/development/tools/skopeo/default.nix | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 4425640828c..c18a767928e 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -1,5 +1,4 @@ { stdenv -, lib , buildGoPackage , fetchFromGitHub , runCommand @@ -12,8 +11,6 @@ , go-md2man }: -with stdenv.lib; - let version = "0.2.0"; @@ -28,6 +25,8 @@ let goPackagePath = "github.com/containers/skopeo"; + vendorPath = "${goPackagePath}/vendor/github.com/containers/image/v5"; + in buildGoPackage { pname = "skopeo"; @@ -36,20 +35,16 @@ buildGoPackage { outputs = [ "bin" "man" "out" ]; - excludedPackages = "integration"; + excludedPackages = [ "integration" ]; - nativeBuildInputs = [ pkg-config (lib.getBin go-md2man) ]; - buildInputs = [ gpgme ] ++ lib.optionals stdenv.isLinux [ libgpgerror lvm2 btrfs-progs libselinux ]; + nativeBuildInputs = [ pkg-config go-md2man ]; + buildInputs = [ gpgme ] + ++ stdenv.lib.optionals stdenv.isLinux [ libgpgerror lvm2 btrfs-progs libselinux ]; buildFlagsArray = '' -ldflags= - -X github.com/containers/skopeo/vendor/github.com/containers/image/v5/signature.systemDefaultPolicyPath=${defaultPolicyFile} - -X github.com/containers/skopeo/vendor/github.com/containers/image/v5/internal/tmpdir.unixTempDirForBigFiles=/tmp - ''; - - preBuild = '' - export CGO_CFLAGS="$CFLAGS" - export CGO_LDFLAGS="$LDFLAGS" + -X ${vendorPath}/signature.systemDefaultPolicyPath=${defaultPolicyFile} + -X ${vendorPath}/internal/tmpdir.unixTempDirForBigFiles=/tmp ''; postBuild = '' -- cgit v1.2.3 From fa4907859a845e001c4bd19181761647a4a59afc Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 17 Apr 2020 04:20:00 -0500 Subject: bazelisk: 1.3.0 -> 1.4.0 Changelog; https://github.com/bazelbuild/bazelisk/releases/tag/v1.4.0 --- pkgs/development/tools/bazelisk/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/bazelisk/default.nix b/pkgs/development/tools/bazelisk/default.nix index 5780cf4382a..80ec4c4f448 100644 --- a/pkgs/development/tools/bazelisk/default.nix +++ b/pkgs/development/tools/bazelisk/default.nix @@ -2,17 +2,19 @@ buildGoModule rec { pname = "bazelisk"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "15h4mbsfjwby4wq57rdj4dzsf595qjfgi3v5zw62yycn3m2w922p"; + sha256 = "14zp0bi0p1rfbx1pxi5y28ndxwbqbvfx0pvy3jh1mnx5qsii1gcq"; }; modSha256 = "1w8k659ifapcxbbim0nf7wd7w10bhlagc33q08izh84gcgsh0yyz"; + buildFlagsArray = [ "-ldflags=-s -w -X main.BazeliskVersion=${version}" ]; + meta = with stdenv.lib; { description = "A user-friendly launcher for Bazel"; longDescription = '' -- cgit v1.2.3 From ee6f5a32bb090ddacee9f40056a5598b2f10480a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 17 Apr 2020 11:22:35 +0100 Subject: python38.pkgs.python-jsonrpc-server: disable for python38 --- pkgs/development/python-modules/python-jsonrpc-server/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-jsonrpc-server/default.nix b/pkgs/development/python-modules/python-jsonrpc-server/default.nix index f6e95f409b8..16c53cd7cab 100644 --- a/pkgs/development/python-modules/python-jsonrpc-server/default.nix +++ b/pkgs/development/python-modules/python-jsonrpc-server/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder , pytest, mock, pytestcov, coverage -, future, futures, ujson +, future, futures, ujson, isPy38 }: buildPythonPackage rec { @@ -26,6 +26,8 @@ buildPythonPackage rec { pytest ''; + disabled = isPy38; + propagatedBuildInputs = [ future ujson ] ++ stdenv.lib.optional (pythonOlder "3.2") futures; -- cgit v1.2.3 From 3679c8d2d100280faddf26316e7630e12c19d92d Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 8 Apr 2020 21:31:16 +0200 Subject: pcsc-cyberjack: 3.99.5_SP12 -> 3.99.5_SP13 Unfortunately, the upstream changelog consists of just the following: * Update to the Reiner-SCT repository rev cyberJack@1374 This is not very helpful since I haven't found a public SVN (I assume, since it's using integer revisions) repository, so I decided to diff the tarball against the old one, here's what I've found: * No longer ship generated files from autotools * Add support for REINER SCT cyberJack comfort PL * Add support for tanJack USB * Allow to override secoder information * Lots of whitespace and coding style changes As mentioned above, the autotools-generated files are no longer shipped, so I've added autoreconfHook to nativeBuildInputs. I also verified the source tarball using the upstream hashes found here: http://downloads.reiner-sct.de/LINUX/Hashwerte/Hashwerte.txt Signed-off-by: aszlig Merges: https://github.com/NixOS/nixpkgs/pull/84749 --- pkgs/tools/security/pcsc-cyberjack/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/pcsc-cyberjack/default.nix b/pkgs/tools/security/pcsc-cyberjack/default.nix index 6683caecbe9..cb651ff7ce1 100644 --- a/pkgs/tools/security/pcsc-cyberjack/default.nix +++ b/pkgs/tools/security/pcsc-cyberjack/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, pkgconfig, libusb1, pcsclite }: +{ stdenv, fetchurl, autoreconfHook, pkgconfig, libusb1, pcsclite }: stdenv.mkDerivation rec { pname = "pcsc-cyberjack"; - version = "3.99.5_SP12"; + version = "3.99.5_SP13"; src = with stdenv.lib; let splittedVer = splitString "_" version; @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { tarballVersion = "${mainVer}final${spVer}"; in fetchurl { url = "http://support.reiner-sct.de/downloads/LINUX/V${version}" - + "/pcsc-cyberjack-${tarballVersion}.tar.bz2"; - sha256 = "04pkmybal56s5xnjld09vl1s1h6qf8mvhm41b758d6hi240kgp1j"; + + "/pcsc-cyberjack_${tarballVersion}.tar.gz"; + sha256 = "1lx4bfz4riz7j77sl65akyxzww0ygm63w0c1b75knr1pijlv8d3b"; }; outputs = [ "out" "tools" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libusb1 pcsclite ]; configureFlags = [ -- cgit v1.2.3 From f1a78e1b5ea83d4875490d823e2ea5903edd282b Mon Sep 17 00:00:00 2001 From: Kirill Elagin Date: Fri, 17 Apr 2020 13:35:29 +0300 Subject: fixup! systemd: Simplify unit script names --- nixos/modules/system/boot/systemd.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 7682b26e5b7..caa3435cfcd 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -256,37 +256,31 @@ let } (mkIf (config.preStart != "") { serviceConfig.ExecStartPre = makeJobScript "${name}-pre-start" '' - #! ${pkgs.runtimeShell} -e ${config.preStart} ''; }) (mkIf (config.script != "") { serviceConfig.ExecStart = makeJobScript "${name}-start" '' - #! ${pkgs.runtimeShell} -e ${config.script} '' + " " + config.scriptArgs; }) (mkIf (config.postStart != "") { serviceConfig.ExecStartPost = makeJobScript "${name}-post-start" '' - #! ${pkgs.runtimeShell} -e ${config.postStart} ''; }) (mkIf (config.reload != "") { serviceConfig.ExecReload = makeJobScript "${name}-reload" '' - #! ${pkgs.runtimeShell} -e ${config.reload} ''; }) (mkIf (config.preStop != "") { serviceConfig.ExecStop = makeJobScript "${name}-pre-stop" '' - #! ${pkgs.runtimeShell} -e ${config.preStop} ''; }) (mkIf (config.postStop != "") { serviceConfig.ExecStopPost = makeJobScript "${name}-post-stop" '' - #! ${pkgs.runtimeShell} -e ${config.postStop} ''; }) -- cgit v1.2.3 From a9e9d37fc8b7df73d68f9ed78f25da15a40a1c83 Mon Sep 17 00:00:00 2001 From: Kirill Elagin Date: Fri, 17 Apr 2020 13:55:48 +0300 Subject: systemd: Add prefix to unit script derivations Add a distinctive `unit-script` prefix to systemd unit scripts to make them easier to find in the store directory. Do not add this prefix to actual script file name as it clutters logs. --- nixos/modules/system/boot/systemd.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index caa3435cfcd..516f8ed7541 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -203,10 +203,20 @@ let makeJobScript = name: text: let scriptName = replaceChars [ "\\" "@" ] [ "-" "_" ] (shellEscape name); - out = pkgs.writeShellScriptBin scriptName '' - set -e - ${text} - ''; + out = pkgs.writeTextFile { + # The derivation name is different from the script file name + # to keep the script file name short to avoid cluttering logs. + name = "unit-script-${scriptName}"; + executable = true; + destination = "/bin/${scriptName}"; + text = '' + #!${pkgs.runtimeShell} -e + ${text} + ''; + checkPhase = '' + ${pkgs.stdenv.shell} -n "$out/bin/${scriptName}" + ''; + }; in "${out}/bin/${scriptName}"; unitConfig = { config, options, ... }: { -- cgit v1.2.3 From 83cb22963b86c47b66cf8d187cd8055f50b974e0 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 15 Mar 2020 12:32:04 +0000 Subject: mopidy: Move mopidy default.nix to mopidy.nix This is in anticipation of a mopidyPackages set --- pkgs/applications/audio/mopidy/default.nix | 44 ------------------------------ pkgs/applications/audio/mopidy/mopidy.nix | 44 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 45 insertions(+), 45 deletions(-) delete mode 100644 pkgs/applications/audio/mopidy/default.nix create mode 100644 pkgs/applications/audio/mopidy/mopidy.nix diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix deleted file mode 100644 index 66be35bfcc8..00000000000 --- a/pkgs/applications/audio/mopidy/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ stdenv, fetchFromGitHub, python3Packages, wrapGAppsHook -, gst_all_1, glib-networking, gobject-introspection -}: - -python3Packages.buildPythonApplication rec { - pname = "mopidy"; - version = "3.0.2"; - - src = fetchFromGitHub { - owner = "mopidy"; - repo = "mopidy"; - rev = "v${version}"; - sha256 = "1n9lpgq0p112cjgsrc1cd6mnffk56y36g2c5skk9cqzw27qrkd15"; - }; - - nativeBuildInputs = [ wrapGAppsHook ]; - - buildInputs = with gst_all_1; [ - gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad - glib-networking gobject-introspection - ]; - - propagatedBuildInputs = with python3Packages; [ - gst-python pygobject3 pykka tornado_4 requests setuptools - ] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python; - - # There are no tests - doCheck = false; - - preFixup = '' - gappsWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH") - ''; - - meta = with stdenv.lib; { - homepage = "https://www.mopidy.com/"; - description = '' - An extensible music server that plays music from local disk, Spotify, - SoundCloud, Google Play Music, and more - ''; - license = licenses.asl20; - maintainers = [ maintainers.fpletz ]; - hydraPlatforms = []; - }; -} diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix new file mode 100644 index 00000000000..66be35bfcc8 --- /dev/null +++ b/pkgs/applications/audio/mopidy/mopidy.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchFromGitHub, python3Packages, wrapGAppsHook +, gst_all_1, glib-networking, gobject-introspection +}: + +python3Packages.buildPythonApplication rec { + pname = "mopidy"; + version = "3.0.2"; + + src = fetchFromGitHub { + owner = "mopidy"; + repo = "mopidy"; + rev = "v${version}"; + sha256 = "1n9lpgq0p112cjgsrc1cd6mnffk56y36g2c5skk9cqzw27qrkd15"; + }; + + nativeBuildInputs = [ wrapGAppsHook ]; + + buildInputs = with gst_all_1; [ + gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad + glib-networking gobject-introspection + ]; + + propagatedBuildInputs = with python3Packages; [ + gst-python pygobject3 pykka tornado_4 requests setuptools + ] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python; + + # There are no tests + doCheck = false; + + preFixup = '' + gappsWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH") + ''; + + meta = with stdenv.lib; { + homepage = "https://www.mopidy.com/"; + description = '' + An extensible music server that plays music from local disk, Spotify, + SoundCloud, Google Play Music, and more + ''; + license = licenses.asl20; + maintainers = [ maintainers.fpletz ]; + hydraPlatforms = []; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed35c8d7b96..dd6de8b6562 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20640,7 +20640,7 @@ in mop = callPackage ../applications/misc/mop { }; - mopidy = callPackage ../applications/audio/mopidy { }; + mopidy = callPackage ../applications/audio/mopidy/mopidy.nix { }; mopidy-gmusic = callPackage ../applications/audio/mopidy/gmusic.nix { }; -- cgit v1.2.3 From 5340ebe0852736337a17f0d5d6b3f7fc9132f397 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 15 Mar 2020 12:48:08 +0000 Subject: mopidy: Create a mopidyPackages set This is to avoid mixing python versions in the same plugin closure. --- nixos/modules/services/audio/mopidy.nix | 4 +-- pkgs/applications/audio/mopidy/default.nix | 41 ++++++++++++++++++++++++++++++ pkgs/applications/audio/mopidy/mopidy.nix | 6 ++--- pkgs/applications/audio/mopidy/spotify.nix | 6 ++--- pkgs/top-level/all-packages.nix | 28 +++----------------- 5 files changed, 53 insertions(+), 32 deletions(-) create mode 100644 pkgs/applications/audio/mopidy/default.nix diff --git a/nixos/modules/services/audio/mopidy.nix b/nixos/modules/services/audio/mopidy.nix index d30c227db42..6fd7eae5b89 100644 --- a/nixos/modules/services/audio/mopidy.nix +++ b/nixos/modules/services/audio/mopidy.nix @@ -13,11 +13,11 @@ let mopidyEnv = buildEnv { name = "mopidy-with-extensions-${mopidy.version}"; paths = closePropagation cfg.extensionPackages; - pathsToLink = [ "/${python3.sitePackages}" ]; + pathsToLink = [ "/${mopidyPackages.python.sitePackages}" ]; buildInputs = [ makeWrapper ]; postBuild = '' makeWrapper ${mopidy}/bin/mopidy $out/bin/mopidy \ - --prefix PYTHONPATH : $out/${python3.sitePackages} + --prefix PYTHONPATH : $out/${mopidyPackages.python.sitePackages} ''; }; in { diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix new file mode 100644 index 00000000000..0b9f8153302 --- /dev/null +++ b/pkgs/applications/audio/mopidy/default.nix @@ -0,0 +1,41 @@ +{ newScope, python }: + +# Create a custom scope so we are consistent in which python version is used + +let + callPackage = newScope self; + + self = { + + inherit python; + pythonPackages = python.pkgs; + + mopidy = callPackage ./mopidy.nix { }; + + mopidy-gmusic = callPackage ./gmusic.nix { }; + + mopidy-local-images = callPackage ./local-images.nix { }; + + mopidy-local-sqlite = callPackage ./local-sqlite.nix { }; + + mopidy-spotify = callPackage ./spotify.nix { }; + + mopidy-moped = callPackage ./moped.nix { }; + + mopidy-mopify = callPackage ./mopify.nix { }; + + mopidy-mpd = callPackage ./mpd.nix { }; + + mopidy-spotify-tunigo = callPackage ./spotify-tunigo.nix { }; + + mopidy-youtube = callPackage ./youtube.nix { }; + + mopidy-soundcloud = callPackage ./soundcloud.nix { }; + + mopidy-musicbox-webclient = callPackage ./musicbox-webclient.nix { }; + + mopidy-iris = callPackage ./iris.nix { }; + + }; + +in self diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix index 66be35bfcc8..ae65d9b2f6e 100644 --- a/pkgs/applications/audio/mopidy/mopidy.nix +++ b/pkgs/applications/audio/mopidy/mopidy.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchFromGitHub, python3Packages, wrapGAppsHook +{ stdenv, fetchFromGitHub, pythonPackages, wrapGAppsHook , gst_all_1, glib-networking, gobject-introspection }: -python3Packages.buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { pname = "mopidy"; version = "3.0.2"; @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { glib-networking gobject-introspection ]; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with pythonPackages; [ gst-python pygobject3 pykka tornado_4 requests setuptools ] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python; diff --git a/pkgs/applications/audio/mopidy/spotify.nix b/pkgs/applications/audio/mopidy/spotify.nix index 0793ae01c29..32019c74f86 100644 --- a/pkgs/applications/audio/mopidy/spotify.nix +++ b/pkgs/applications/audio/mopidy/spotify.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, python3Packages, mopidy }: +{ stdenv, fetchurl, pythonPackages, mopidy }: -python3Packages.buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { pname = "mopidy-spotify"; version = "4.0.1"; @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { sha256 = "1ac8r8050i5r3ag1hlblbcyskqjqz7wgamndbzsmw52qi6hxk44f"; }; - propagatedBuildInputs = [ mopidy python3Packages.pyspotify ]; + propagatedBuildInputs = [ mopidy pythonPackages.pyspotify ]; doCheck = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd6de8b6562..47b04e5ebc3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20640,31 +20640,11 @@ in mop = callPackage ../applications/misc/mop { }; - mopidy = callPackage ../applications/audio/mopidy/mopidy.nix { }; - - mopidy-gmusic = callPackage ../applications/audio/mopidy/gmusic.nix { }; - - mopidy-local-images = callPackage ../applications/audio/mopidy/local-images.nix { }; - - mopidy-local-sqlite = callPackage ../applications/audio/mopidy/local-sqlite.nix { }; - - mopidy-spotify = callPackage ../applications/audio/mopidy/spotify.nix { }; - - mopidy-moped = callPackage ../applications/audio/mopidy/moped.nix { }; - - mopidy-mopify = callPackage ../applications/audio/mopidy/mopify.nix { }; - - mopidy-spotify-tunigo = callPackage ../applications/audio/mopidy/spotify-tunigo.nix { }; - - mopidy-youtube = callPackage ../applications/audio/mopidy/youtube.nix { }; - - mopidy-soundcloud = callPackage ../applications/audio/mopidy/soundcloud.nix { }; - - mopidy-musicbox-webclient = callPackage ../applications/audio/mopidy/musicbox-webclient.nix { }; - - mopidy-iris = callPackage ../applications/audio/mopidy/iris.nix { }; + mopidyPackages = callPackages ../applications/audio/mopidy/default.nix { + python = python3; + }; - mopidy-mpd = callPackage ../applications/audio/mopidy/mpd.nix { }; + inherit (mopidyPackages) mopidy mopidy-gmusic mopidy-local-images mopidy-local-sqlite mopidy-spotify mopidy-moped mopidy-mopify mopidy-spotify-tunigo mopidy-youtube mopidy-soundcloud mopidy-musicbox-webclient mopidy-iris mopidy-mpd; motif = callPackage ../development/libraries/motif { }; -- cgit v1.2.3 From cb5c0a4bbcdb4f3eb23e0d9dc81fa9c7b8f761d8 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 16 Apr 2020 22:46:54 +0200 Subject: chromium{Beta,Dev}: M81 -> M83 -> M84 --- pkgs/applications/networking/browsers/chromium/default.nix | 4 ++-- .../networking/browsers/chromium/upstream-info.nix | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 564e50b8670..c66acac12c3 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -20,7 +20,7 @@ }: let - llvmPackages = if channel == "dev" + llvmPackages = if channel != "stable" then llvmPackages_10 else llvmPackages_9; stdenv = llvmPackages.stdenv; @@ -35,7 +35,7 @@ let mkChromiumDerivation = callPackage ./common.nix ({ inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useVaapi useOzone; gnChromium = gn; - } // lib.optionalAttrs (channel == "dev") { + } // lib.optionalAttrs (channel != "stable") { # TODO: Remove after we can update gn for the stable channel (backward incompatible changes): gnChromium = gn.overrideAttrs (oldAttrs: { version = "2020-03-23"; diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 50e3abb5ec3..cf542faa8a1 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,15 +1,15 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "0hsxxw7fm1p8g53msqb644v8vr4cpvjmpln444c2268rm43yik17"; - sha256bin64 = "1iwn0yyhk0jn47pn7rx9kadli47xyvz3xilfl4faifmasin2fq8v"; - version = "81.0.4044.113"; - }; - dev = { sha256 = "1s16wl101yabq0l7w0q50lxkr2gn090pcaj6l5sj6g5xvi9lhgbf"; - sha256bin64 = "1hn2hjni5k370jhc0nikmx5ypwzcqnmr02h185a5ry697643abdd"; + sha256bin64 = "0k6fsqlpiwp9vds83hb3cg9xf74hqgbfdm3ijyad2rmwc5rqk0ax"; version = "83.0.4103.14"; }; + dev = { + sha256 = "0djppzwzpfyyfjb1mhy5wws2379m3wpzyk2x3kw5nd0mdz35hbny"; + sha256bin64 = "1wg55qhfvd5zvigjl6496za81mh9b2c5da53zy07bk8wj91ly8pf"; + version = "84.0.4115.5"; + }; stable = { sha256 = "0hsxxw7fm1p8g53msqb644v8vr4cpvjmpln444c2268rm43yik17"; sha256bin64 = "0ap7flrw3h885454fa2r7psa4sh8567ql7v7x96q11gh9gjrdvp3"; -- cgit v1.2.3 From acb4710214f075fc5277443d9cf982fed213629b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 17 Apr 2020 13:48:09 +0200 Subject: alsaTools: 1.1.7 -> 1.2.2 Fixes build regression (after alsa update, I assume). Despite the version number change, the diff is trivial: https://git.alsa-project.org/?p=alsa-tools.git;a=log;h=refs/tags/v1.2.2 --- pkgs/os-specific/linux/alsa-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-tools/default.nix index 151549aa67b..2fef5e07c63 100644 --- a/pkgs/os-specific/linux/alsa-tools/default.nix +++ b/pkgs/os-specific/linux/alsa-tools/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "alsa-tools"; - version = "1.1.7"; + version = "1.2.2"; src = fetchurl { url = "mirror://alsa/tools/${pname}-${version}.tar.bz2"; - sha256 = "1xjfghr9s0j6n91kgs95cc4r6qrjsgc4yj2w0nir3xpnm0l36950"; + sha256 = "0jbkjmq038zapj66a7nkppdf644v2mwj581xbmh6k4i8w6mcglxz"; }; nativeBuildInputs = [ pkgconfig ]; -- cgit v1.2.3 From d9258d33be5b46ff2661580707f8e46195b61bcc Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 17 Apr 2020 08:29:21 -0400 Subject: linux: 4.19.115 -> 4.19.116 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 142cf0aaf92..cdb19fd54ab 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.115"; + version = "4.19.116"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1hh170z3mv181l6cc6qqc12wif5jsmxbh2qxbq6b9km5irydkchi"; + sha256 = "0r3vdc3npl1bn06w9v6wsq7d5mm7bnhm9wsz36pb9ar3xhimvrlf"; }; } // (args.argsOverride or {})) -- cgit v1.2.3 From e341107367f77c6b961afd1e6b6de274d1b89dd5 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 17 Apr 2020 08:29:34 -0400 Subject: linux: 5.4.32 -> 5.4.33 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index f4293b5bffc..b2de6ea8689 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.32"; + version = "5.4.33"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1czjjnln1cqrnjxw0md6mpw9haw9abdyvmxnjds56ym4nzx9jb8r"; + sha256 = "0q9q48ij6vppfcrdf7fr24pvpwsd13pxjkdni6rnjq9a60hrcmxm"; }; } // (args.argsOverride or {})) -- cgit v1.2.3 From c214e63f2e0dd81a9c03bdcbb83dbe8ddfd7d980 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 16 Apr 2020 22:52:52 +0200 Subject: nixos/httpd: Use extensions from php package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit After the recent rewrite, enabled extensions are passed to php programs through an extra ini file by a wrapper. Since httpd uses shared module instead of program, the wrapper did not affect it and no extensions other than built-ins were loaded. To fix this, we are passing the extension config another way – by adding it to the service's generated config. For now we are hardcoding the path to the ini file. It would be nice to add the path to the passthru and use that once the PHP expression settles down. --- nixos/modules/services/web-servers/apache-httpd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 832c8b30ee9..faefd1bfd09 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -338,6 +338,7 @@ let } '' cat ${php}/etc/php.ini > $out + cat ${php}/lib/custom-php.ini > $out echo "$options" >> $out ''; -- cgit v1.2.3 From aac9832b96cb9e79348b6fc48da7b308ad9b8838 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 16 Apr 2020 21:48:40 +0200 Subject: nixosTests.php.httpd: init --- nixos/release-combined.nix | 1 + nixos/tests/php/default.nix | 1 + nixos/tests/php/httpd.nix | 31 +++++++++++++++++++++++++++++++ 3 files changed, 33 insertions(+) create mode 100644 nixos/tests/php/httpd.nix diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 02f19610f8a..2a0a9113a86 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -117,6 +117,7 @@ in rec { (onFullSupported "nixos.tests.openssh") (onFullSupported "nixos.tests.pantheon") (onFullSupported "nixos.tests.php.fpm") + (onFullSupported "nixos.tests.php.httpd") (onFullSupported "nixos.tests.php.pcre") (onFullSupported "nixos.tests.plasma5") (onFullSupported "nixos.tests.predictable-interface-names.predictableNetworkd") diff --git a/nixos/tests/php/default.nix b/nixos/tests/php/default.nix index 9ab14f722d0..ee7a3b56a3e 100644 --- a/nixos/tests/php/default.nix +++ b/nixos/tests/php/default.nix @@ -3,5 +3,6 @@ pkgs ? import ../../.. { inherit system config; } }: { fpm = import ./fpm.nix { inherit system pkgs; }; + httpd = import ./httpd.nix { inherit system pkgs; }; pcre = import ./pcre.nix { inherit system pkgs; }; } diff --git a/nixos/tests/php/httpd.nix b/nixos/tests/php/httpd.nix new file mode 100644 index 00000000000..fc3ff986734 --- /dev/null +++ b/nixos/tests/php/httpd.nix @@ -0,0 +1,31 @@ +import ../make-test-python.nix ({pkgs, ...}: { + name = "php-httpd-test"; + meta.maintainers = with pkgs.stdenv.lib.maintainers; [ etu ]; + + machine = { config, lib, pkgs, ... }: { + services.httpd = { + enable = true; + adminAddr = "admin@phpfpm"; + virtualHosts."phpfpm" = let + testdir = pkgs.writeTextDir "web/index.php" " Date: Thu, 16 Apr 2020 23:19:45 +0200 Subject: nixosTests.php.pcre: Clean up And add assertion messages --- nixos/tests/php/pcre.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/tests/php/pcre.nix b/nixos/tests/php/pcre.nix index 56a87778579..016dca81d52 100644 --- a/nixos/tests/php/pcre.nix +++ b/nixos/tests/php/pcre.nix @@ -30,8 +30,8 @@ in import ../make-test-python.nix ({ ...}: { '' machine.wait_for_unit("httpd.service") # Ensure php evaluation by matching on the var_dump syntax - assert 'string(${toString (builtins.stringLength testString)}) "${testString}"' in machine.succeed( - "curl -vvv -s http://127.0.0.1:80/index.php" - ) + response = machine.succeed("curl -vvv -s http://127.0.0.1:80/index.php") + expected = 'string(${toString (builtins.stringLength testString)}) "${testString}"' + assert expected in response, "Does not appear to be able to use subgroups." ''; }) -- cgit v1.2.3 From 23a6903bb7f32068587a66af00404a5e81881215 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 16 Apr 2020 23:21:26 +0200 Subject: nixosTests.php.fpm: Clean up to match httpd test --- nixos/tests/php/fpm.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/nixos/tests/php/fpm.nix b/nixos/tests/php/fpm.nix index e93a3183418..1e4ced24b6c 100644 --- a/nixos/tests/php/fpm.nix +++ b/nixos/tests/php/fpm.nix @@ -43,13 +43,11 @@ import ../make-test-python.nix ({pkgs, ...}: { machine.wait_for_unit("phpfpm-foobar.service") # Check so we get an evaluated PHP back - assert "PHP Version ${pkgs.php.version}" in machine.succeed("curl -vvv -s http://127.0.0.1:80/") + response = machine.succeed("curl -vvv -s http://127.0.0.1:80/") + assert "PHP Version ${pkgs.php.version}" in response, "PHP version not detected" # Check so we have database and some other extensions loaded - assert "json" in machine.succeed("curl -vvv -s http://127.0.0.1:80/") - assert "opcache" in machine.succeed("curl -vvv -s http://127.0.0.1:80/") - assert "pdo_mysql" in machine.succeed("curl -vvv -s http://127.0.0.1:80/") - assert "pdo_pgsql" in machine.succeed("curl -vvv -s http://127.0.0.1:80/") - assert "pdo_sqlite" in machine.succeed("curl -vvv -s http://127.0.0.1:80/") + for ext in ["json", "opcache", "pdo_mysql", "pdo_pgsql", "pdo_sqlite"]: + assert ext in response, f"Missing {ext} extension" ''; }) -- cgit v1.2.3 From 4816b426a057df94f0533d783d3cf6a4c5607aa3 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 16 Apr 2020 23:14:28 +0200 Subject: nixos/httpd: remove unnecessary override This was introduced in https://github.com/NixOS/nixpkgs/commit/c801cd1a047efa51055fd04698e316ddd503fd1b but it no longer seems necessary. --- nixos/modules/services/web-servers/apache-httpd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index faefd1bfd09..5e55baa203a 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -12,7 +12,7 @@ let httpdConf = cfg.configFile; - php = cfg.phpPackage.override { apacheHttpd = pkg.dev; /* otherwise it only gets .out */ }; + php = cfg.phpPackage.override { apacheHttpd = pkg; }; phpMajorVersion = lib.versions.major (lib.getVersion php); -- cgit v1.2.3 From 056778b3151a591572bbaabd8ce1152aad14e09f Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Fri, 17 Apr 2020 15:04:33 +0200 Subject: crystal: 0.31 -> 0.34 (#85432) * crystal: 0.31 -> 0.34 * crystal: use latest llvm * crystal: skip tests for 0.33 --- pkgs/development/compilers/crystal/default.nix | 66 ++++++---------------- .../tools/build-managers/shards/default.nix | 19 ++----- .../tools/build-managers/shards/shards.nix | 8 +++ pkgs/top-level/all-packages.nix | 9 ++- 4 files changed, 33 insertions(+), 69 deletions(-) create mode 100644 pkgs/development/tools/build-managers/shards/shards.nix diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 9491a545a78..db22b668cf5 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -178,33 +178,6 @@ let })); in rec { - binaryCrystal_0_27 = genericBinary { - version = "0.27.2"; - sha256s = { - x86_64-linux = "05l5x7kx2acgnv42fj3rr17z73ix06zvi05h7d7vf3kw0izxrasm"; - i686-linux = "1iwizkvn6pglc0azkyfhlmk9ap793krdgcnbihd1kvrvs4cz0mm9"; - x86_64-darwin = "14c69ac2dmfwmb5q56ps3xyxxb0mrbc91ahk9h07c8fiqfii3k9g"; - }; - }; - - binaryCrystal_0_29 = genericBinary { - version = "0.29.0"; - sha256s = { - x86_64-linux = "1wrk29sfx35akg7hxwpdiikvl18wd40gq1kwirw7x522hnq7vlna"; - i686-linux = "1nx0piis2k3nn7kqiijqazzbvlaavhgvsln0l3dxmpfa4i4dz5h2"; - x86_64-darwin = "1fd0fbyf05abivnp3igjlrm2axf65n2wdmg4aq6nqj60ipc01rvd"; - }; - }; - - binaryCrystal_0_30 = genericBinary { - version = "0.30.1"; - sha256s = { - x86_64-linux = "1k2mb74jh3ns3m7y73j4wpf571sayn73zbn6d7q81d09r280zrma"; - i686-linux = "0vsq1ayf922spydp2g2mmimc797jmm7nl5nljhfppcclrwygdyk2"; - x86_64-darwin = "1p3s4lwdgykb7h7aysjhrs7vm0zhinzw5d7rfv6jsyin4j8yxhzz"; - }; - }; - binaryCrystal_0_31 = genericBinary { version = "0.31.1"; sha256s = { @@ -214,32 +187,11 @@ in rec { }; }; - crystal_0_27 = generic { - version = "0.27.2"; - sha256 = "0vxqnpqi85yh0167nrkbksxsni476iwbh6y3znbvbjbbfhsi3nsj"; - doCheck = false; # about 20 tests out of more than 15000 are failing - binary = binaryCrystal_0_27; - }; - - crystal_0_29 = generic { - version = "0.29.0"; - sha256 = "0v9l253b2x8yw6a43vvalywpwciwr094l3g5wakmndfrzak2s3zr"; - doCheck = false; # 6 checks are failing now - binary = binaryCrystal_0_29; - }; - - crystal_0_30 = generic { - version = "0.30.1"; - sha256 = "0fbk784zjflsl3hys5a1xmn8mda8kb2z7ql58wpyfavivswxanbs"; - doCheck = false; # 6 checks are failing now - binary = binaryCrystal_0_29; - }; - crystal_0_31 = generic { version = "0.31.1"; sha256 = "1dswxa32w16gnc6yjym12xj7ibg0g6zk3ngvl76lwdjqb1h6lwz8"; doCheck = false; # 5 checks are failing now - binary = binaryCrystal_0_30; + binary = binaryCrystal_0_31; }; crystal_0_32 = generic { @@ -248,7 +200,21 @@ in rec { binary = binaryCrystal_0_31; }; - crystal = crystal_0_32; + crystal_0_33 = generic { + version = "0.33.0"; + sha256 = "1zg0qixcws81s083wrh54hp83ng2pa8iyyafaha55mzrh8293jbi"; + binary = binaryCrystal_0_31; + doCheck = false; # 4 checks are failing now + }; + + crystal_0_34 = generic { + version = "0.34.0"; + sha256 = "110lfpxk9jnqyznbfnilys65ixj5sdmy8pvvnlhqhc3ccvrlnmq4"; + binary = crystal_0_33; + doCheck = false; # 4 checks are failing now + }; + + crystal = crystal_0_34; crystal2nix = callPackage ./crystal2nix.nix {}; } diff --git a/pkgs/development/tools/build-managers/shards/default.nix b/pkgs/development/tools/build-managers/shards/default.nix index 7f0cc8100ac..4ad78778a91 100644 --- a/pkgs/development/tools/build-managers/shards/default.nix +++ b/pkgs/development/tools/build-managers/shards/default.nix @@ -1,27 +1,18 @@ { stdenv, fetchFromGitHub, crystal, pcre, libyaml, which }: -stdenv.mkDerivation rec { +crystal.buildCrystalPackage rec { pname = "shards"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "crystal-lang"; repo = "shards"; rev = "v${version}"; - sha256 = "19q0xww4v0h5ln9gz8d8zv0c9ig761ik7gw8y31yxynzgzihwpf4"; + sha256 = "1bjy3hcdqq8769bx73f3pwn26rnkj23dngyfbw4iv32bw23x1d49"; }; - buildInputs = [ crystal libyaml pcre which ]; - - buildFlags = [ "CRFLAGS=--release" ]; - - installPhase = '' - runHook preInstall - - install -Dm755 bin/shards $out/bin/shards - - runHook postInstall - ''; + shardsFile = ./shards.nix; + crystalBinaries.shards.src = "./src/shards.cr"; meta = with stdenv.lib; { description = "Dependency manager for the Crystal language"; diff --git a/pkgs/development/tools/build-managers/shards/shards.nix b/pkgs/development/tools/build-managers/shards/shards.nix new file mode 100644 index 00000000000..901b7f6e47d --- /dev/null +++ b/pkgs/development/tools/build-managers/shards/shards.nix @@ -0,0 +1,8 @@ +{ + molinillo = { + owner = "crystal-lang"; + repo = "crystal-molinillo"; + rev = "v0.1.0"; + sha256 = "0rs0w59m6ccsgkdxfy3xv6alxsziy9sy9smz71cz0dnyvlzlnaxj"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4788e1c2f5b..9a9f0841aa6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8077,14 +8077,13 @@ in cryptol = haskell.lib.justStaticExecutables haskellPackages.cryptol; inherit (callPackages ../development/compilers/crystal { - stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; - inherit (llvmPackages_6) clang llvm; + stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; + inherit (llvmPackages) clang llvm; }) - crystal_0_27 - crystal_0_29 - crystal_0_30 crystal_0_31 crystal_0_32 + crystal_0_33 + crystal_0_34 crystal crystal2nix; -- cgit v1.2.3 From 52c06182eb21c293e7fd3498799da9f7d20b3341 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 17 Apr 2020 21:10:24 +0800 Subject: nix-prefetch: 0.3.0 -> 0.3.1 (#85367) * nix-prefetch: 0.3.0 -> 0.3.1 * nix-prefetch: date in man page * nix-prefetch: use UTC --- .../package-management/nix-prefetch/default.nix | 79 ++++++++++++---------- 1 file changed, 43 insertions(+), 36 deletions(-) diff --git a/pkgs/tools/package-management/nix-prefetch/default.nix b/pkgs/tools/package-management/nix-prefetch/default.nix index 19a40b7395f..1a750da6930 100644 --- a/pkgs/tools/package-management/nix-prefetch/default.nix +++ b/pkgs/tools/package-management/nix-prefetch/default.nix @@ -1,67 +1,74 @@ -{ stdenv, fetchFromGitHub, makeWrapper -, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, libxslt -, coreutils, gawk, gnugrep, gnused, jq, nix }: +{ stdenv, fetchFromGitHub, installShellFiles, makeWrapper, asciidoc +, docbook_xml_dtd_45, git, docbook_xsl, libxml2, libxslt, coreutils, gawk +, gnugrep, gnused, jq, nix }: -stdenv.mkDerivation rec { +let + binPath = stdenv.lib.makeBinPath [ coreutils gawk git gnugrep gnused jq nix ]; + +in stdenv.mkDerivation rec { pname = "nix-prefetch"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "msteen"; repo = "nix-prefetch"; rev = version; - sha256 = "0b9gdi7xzmfq0j258x724xsll8gi31m0m4pzfjkqinlm6zwr3sgm"; + sha256 = "15h6f743nn6sdq8l771sjxh92cyzqznkcs7szrc7nm066xvx8rd4"; + # the stat call has to be in a subshell or we get the current date + extraPostFetch = '' + echo $(stat -c %Y $out) > $out/.timestamp + ''; }; + postPatch = '' + lib=$out/lib/${pname} + + substituteInPlace doc/nix-prefetch.1.asciidoc \ + --subst-var-by version $version + + substituteInPlace src/main.sh \ + --subst-var-by lib $lib \ + --subst-var-by version $version + + substituteInPlace src/tests.sh \ + --subst-var-by bin $out/bin + ''; + nativeBuildInputs = [ + asciidoc + docbook_xml_dtd_45 + docbook_xsl + installShellFiles + libxml2 + libxslt makeWrapper - asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt ]; - configurePhase = '' - . configure.sh - ''; + dontConfigure = true; buildPhase = '' - a2x -f manpage doc/nix-prefetch.1.asciidoc + a2x -a revdate=$(date --utc --date=@$(cat $src/.timestamp) +%d/%m/%Y) \ + -f manpage doc/nix-prefetch.1.asciidoc ''; installPhase = '' - lib=$out/lib/${pname} - mkdir -p $lib - substitute src/main.sh $lib/main.sh \ - --subst-var-by lib $lib \ - --subst-var-by version '${version}' - chmod +x $lib/main.sh - patchShebangs $lib/main.sh - cp lib/*.nix $lib/ - - mkdir -p $out/bin + install -Dm555 -t $lib src/*.sh + install -Dm444 -t $lib lib/* makeWrapper $lib/main.sh $out/bin/${pname} \ - --prefix PATH : '${stdenv.lib.makeBinPath [ coreutils gawk gnugrep gnused jq nix ]}' - - substitute src/tests.sh $lib/tests.sh \ - --subst-var-by bin $out/bin - chmod +x $lib/tests.sh - patchShebangs $lib/tests.sh + --prefix PATH : ${binPath} - mkdir -p $out/share/man/man1 - substitute doc/nix-prefetch.1 $out/share/man/man1/nix-prefetch.1 \ - --subst-var-by version '${version}' \ - --replace '01/01/1970' "$date" + installManPage doc/nix-prefetch.? - install -D contrib/nix-prefetch-completion.bash $out/share/bash-completion/completions/nix-prefetch - install -D contrib/nix-prefetch-completion.zsh $out/share/zsh/site-functions/_nix_prefetch + installShellCompletion --name ${pname} contrib/nix-prefetch-completion.{bash,zsh} mkdir -p $out/share/doc/${pname}/contrib - cp -r contrib/hello_rs $out/share/doc/${pname}/contrib/ + cp -r contrib/hello_rs $out/share/doc/${pname}/contrib ''; meta = with stdenv.lib; { description = "Prefetch any fetcher function call, e.g. package sources"; - homepage = "https://github.com/msteen/nix-prefetch"; license = licenses.mit; maintainers = with maintainers; [ msteen ]; - platforms = platforms.all; + inherit (src.meta) homepage; }; } -- cgit v1.2.3 From b584941ab9b5df164adc4584c3ab21da681a01db Mon Sep 17 00:00:00 2001 From: nschoe Date: Fri, 17 Apr 2020 14:50:08 +0100 Subject: st: copy config file in 'prePatch' instead of 'preBuild' The patch phase runs after the build phase. Which means than when using an override to override both 'conf' and 'patches' to provide a custom config file and apply some patches, it doesn't work: - first the patches applied (optionally changing config.def.h) - then preBuild is run which overrides config.def.h with the user supplied one (effectively cancelling previously applied patches) By copying the config file in the prePatch phase instead, changes are kept and applied in order. --- pkgs/applications/misc/st/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index bc70aad8da9..33924bdb7be 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -13,8 +13,9 @@ stdenv.mkDerivation rec { inherit patches; - configFile = optionalString (conf!=null) (writeText "config.def.h" conf); - preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; + prePatch = optionalString (conf != null) '' + cp ${writeText "config.def.h" conf} config.def.h + ''; nativeBuildInputs = [ pkgconfig ncurses ]; buildInputs = [ libX11 libXft ] ++ extraLibs; -- cgit v1.2.3 From bc138f407f9cc1206dd13aa233f2d870936e10bd Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Fri, 17 Apr 2020 07:39:54 -0700 Subject: nixos/k3s: add initial k3s service * nixos/k3s: simplify config expression * nixos/k3s: add config assertions and trim unneeded bits * nixos/k3s: add a test that k3s works; minor module improvements This is a single-node test. Eventually we should also have a multi-node test to verify the agent bit works, but that one's more involved. * nixos/k3s: add option description * nixos/k3s: add defaults for token/serveraddr Now that the assertion enforces their presence, we dont' need to use the typesystem for it. * nixos/k3s: remove unneeded sudo in test * nixos/k3s: add to test list --- nixos/modules/module-list.nix | 1 + nixos/modules/services/cluster/k3s/default.nix | 101 +++++++++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/k3s.nix | 78 +++++++++++++++++++ 4 files changed, 181 insertions(+) create mode 100644 nixos/modules/services/cluster/k3s/default.nix create mode 100644 nixos/tests/k3s.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c3d2bb85809..41304988a59 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -238,6 +238,7 @@ ./services/backup/zfs-replication.nix ./services/backup/znapzend.nix ./services/cluster/hadoop/default.nix + ./services/cluster/k3s/default.nix ./services/cluster/kubernetes/addons/dns.nix ./services/cluster/kubernetes/addons/dashboard.nix ./services/cluster/kubernetes/addon-manager.nix diff --git a/nixos/modules/services/cluster/k3s/default.nix b/nixos/modules/services/cluster/k3s/default.nix new file mode 100644 index 00000000000..ccdf54d128e --- /dev/null +++ b/nixos/modules/services/cluster/k3s/default.nix @@ -0,0 +1,101 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.services.k3s; +in +{ + # interface + options.services.k3s = { + enable = mkEnableOption "k3s"; + + package = mkOption { + type = types.package; + default = pkgs.k3s; + defaultText = "pkgs.k3s"; + example = literalExample "pkgs.k3s"; + description = "Package that should be used for k3s"; + }; + + role = mkOption { + description = '' + Whether k3s should run as a server or agent. + Note that the server, by default, also runs as an agent. + ''; + default = "server"; + type = types.enum [ "server" "agent" ]; + }; + + serverAddr = mkOption { + type = types.str; + description = "The k3s server to connect to. This option only makes sense for an agent."; + example = "https://10.0.0.10:6443"; + default = ""; + }; + + token = mkOption { + type = types.str; + description = "The k3s token to use when connecting to the server. This option only makes sense for an agent."; + default = ""; + }; + + docker = mkOption { + type = types.bool; + default = false; + description = "Use docker to run containers rather than the built-in containerd."; + }; + + extraFlags = mkOption { + description = "Extra flags to pass to the k3s command."; + default = ""; + example = "--no-deploy traefik --cluster-cidr 10.24.0.0/16"; + }; + + disableAgent = mkOption { + type = types.bool; + default = false; + description = "Only run the server. This option only makes sense for a server."; + }; + }; + + # implementation + + config = mkIf cfg.enable { + assertions = [ + { + assertion = cfg.role == "agent" -> cfg.serverAddr != ""; + message = "serverAddr should be set if role is 'agent'"; + } + { + assertion = cfg.role == "agent" -> cfg.token != ""; + message = "token should be set if role is 'agent'"; + } + ]; + + virtualisation.docker = mkIf cfg.docker { + enable = mkDefault true; + }; + + systemd.services.k3s = { + description = "k3s service"; + after = mkIf cfg.docker [ "docker.service" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + # Taken from https://github.com/rancher/k3s/blob/v1.17.4+k3s1/contrib/ansible/roles/k3s/node/templates/k3s.service.j2 + Type = "notify"; + KillMode = "process"; + Delegate = "yes"; + Restart = "always"; + RestartSec = "5s"; + ExecStart = concatStringsSep " \\\n " ( + [ + "${cfg.package}/bin/k3s ${cfg.role}" + ] ++ (optional cfg.docker "--docker") + ++ (optional cfg.disableAgent "--disable-agent") + ++ (optional (cfg.role == "agent") "--server ${cfg.serverAddr} --token ${cfg.token}") + ++ [ cfg.extraFlags ] + ); + }; + }; + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 4f60892488a..5adfd6afd6a 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -146,6 +146,7 @@ in jellyfin = handleTest ./jellyfin.nix {}; jenkins = handleTest ./jenkins.nix {}; jirafeau = handleTest ./jirafeau.nix {}; + k3s = handleTest ./k3s.nix {}; kafka = handleTest ./kafka.nix {}; keepalived = handleTest ./keepalived.nix {}; kerberos = handleTest ./kerberos/default.nix {}; diff --git a/nixos/tests/k3s.nix b/nixos/tests/k3s.nix new file mode 100644 index 00000000000..5bda6f493f0 --- /dev/null +++ b/nixos/tests/k3s.nix @@ -0,0 +1,78 @@ +import ./make-test-python.nix ({ pkgs, ... }: + +let + # A suitable k3s pause image, also used for the test pod + pauseImage = pkgs.dockerTools.buildImage { + name = "test.local/pause"; + tag = "local"; + contents = with pkgs; [ tini coreutils busybox ]; + config.Entrypoint = [ "/bin/tini" "--" "/bin/sleep" "inf" ]; + }; + testPodYaml = pkgs.writeText "test.yml" '' + # Don't use the default service account because there's a race where it may + # not be created yet; make our own instead. + apiVersion: v1 + kind: ServiceAccount + metadata: + name: test + --- + apiVersion: v1 + kind: Pod + metadata: + name: test + spec: + serviceAccountName: test + containers: + - name: test + image: test.local/pause:local + imagePullPolicy: Never + command: ["sh", "-c", "sleep inf"] + ''; +in +{ + name = "k3s"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ euank ]; + }; + + nodes = { + k3s = + { pkgs, ... }: { + environment.systemPackages = [ pkgs.k3s pkgs.gzip ]; + + # k3s uses enough resources the default vm fails. + virtualisation.memorySize = pkgs.lib.mkDefault 1536; + virtualisation.diskSize = pkgs.lib.mkDefault 4096; + + services.k3s.enable = true; + services.k3s.role = "server"; + services.k3s.package = pkgs.k3s; + # Slightly reduce resource usage + services.k3s.extraFlags = "--no-deploy coredns,servicelb,traefik,local-storage,metrics-server --pause-image test.local/pause:local"; + + users.users = { + noprivs = { + isNormalUser = true; + description = "Can't access k3s by default"; + password = "*"; + }; + }; + }; + }; + + testScript = '' + start_all() + + k3s.wait_for_unit("k3s") + k3s.succeed("k3s kubectl cluster-info") + k3s.fail("sudo -u noprivs k3s kubectl cluster-info") + # k3s.succeed("k3s check-config") # fails with the current nixos kernel config, uncomment once this passes + + k3s.succeed( + "zcat ${pauseImage} | k3s ctr image import -" + ) + + k3s.succeed("k3s kubectl apply -f ${testPodYaml}") + k3s.succeed("k3s kubectl wait --for 'condition=Ready' pod/test") + ''; +}) -- cgit v1.2.3 From 606370d8539613b6698b47b39f828b886ddf82c2 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Fri, 17 Apr 2020 16:51:01 +0200 Subject: crystal: use llvm 10 exclusively --- pkgs/top-level/all-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3cb27cf590e..4b6a2b77427 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8077,8 +8077,7 @@ in cryptol = haskell.lib.justStaticExecutables haskellPackages.cryptol; inherit (callPackages ../development/compilers/crystal { - stdenv = if stdenv.cc.isClang then llvmPackages.stdenv else stdenv; - inherit (llvmPackages) clang llvm; + inherit (llvmPackages_10) stdenv clang llvm; }) crystal_0_31 crystal_0_32 -- cgit v1.2.3 From 6f8c2afadfa891f8bde7c615f327a5ed8bef7528 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Fri, 10 Apr 2020 08:15:09 +0800 Subject: pcsc-cyberjack: minor cleanups --- pkgs/tools/security/pcsc-cyberjack/default.nix | 27 ++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/security/pcsc-cyberjack/default.nix b/pkgs/tools/security/pcsc-cyberjack/default.nix index cb651ff7ce1..7ae062547aa 100644 --- a/pkgs/tools/security/pcsc-cyberjack/default.nix +++ b/pkgs/tools/security/pcsc-cyberjack/default.nix @@ -1,25 +1,28 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, libusb1, pcsclite }: -stdenv.mkDerivation rec { +let + version = "3.99.5"; + suffix = "SP13"; + tarBall = "${version}final.${suffix}"; + +in stdenv.mkDerivation rec { pname = "pcsc-cyberjack"; - version = "3.99.5_SP13"; - - src = with stdenv.lib; let - splittedVer = splitString "_" version; - mainVer = if length splittedVer >= 1 then head splittedVer else version; - spVer = optionalString (length splittedVer >= 1) ("." + last splittedVer); - tarballVersion = "${mainVer}final${spVer}"; - in fetchurl { - url = "http://support.reiner-sct.de/downloads/LINUX/V${version}" - + "/pcsc-cyberjack_${tarballVersion}.tar.gz"; + inherit version; + + src = fetchurl { + url = + "http://support.reiner-sct.de/downloads/LINUX/V${version}_${suffix}/${pname}_${tarBall}.tar.gz"; sha256 = "1lx4bfz4riz7j77sl65akyxzww0ygm63w0c1b75knr1pijlv8d3b"; }; outputs = [ "out" "tools" ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ libusb1 pcsclite ]; + enableParallelBuilding = true; + configureFlags = [ "--with-usbdropdir=${placeholder "out"}/pcsc/drivers" "--bindir=${placeholder "tools"}/bin" @@ -31,7 +34,7 @@ stdenv.mkDerivation rec { description = "REINER SCT cyberJack USB chipcard reader user space driver"; homepage = "https://www.reiner-sct.com/"; license = licenses.gpl2Plus; - platforms = platforms.linux; maintainers = with maintainers; [ aszlig ]; + platforms = platforms.linux; }; } -- cgit v1.2.3 From fd1047a798d3e413472030a84afdba644dab4923 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Fri, 17 Apr 2020 17:05:01 +0200 Subject: crystal: add LLVM_CONFIG --- pkgs/development/compilers/crystal/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index db22b668cf5..8f75692d883 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -108,6 +108,8 @@ let "all" "docs" ]; + LLVM_CONFIG = "${llvm}/bin/llvm-config"; + FLAGS = [ "--release" "--single-module" # needed for deterministic builds -- cgit v1.2.3 From 10dd3f3de0b3868853e7077ff5ef6c13efc0fcc1 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 8 Apr 2020 21:02:25 +0100 Subject: graphene-hardened-malloc: enable on aarch64-linux --- pkgs/development/libraries/graphene-hardened-malloc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/graphene-hardened-malloc/default.nix b/pkgs/development/libraries/graphene-hardened-malloc/default.nix index 0d2b02489ef..c60b0914492 100644 --- a/pkgs/development/libraries/graphene-hardened-malloc/default.nix +++ b/pkgs/development/libraries/graphene-hardened-malloc/default.nix @@ -52,6 +52,6 @@ stdenv.mkDerivation rec { ''; license = licenses.mit; maintainers = with maintainers; [ ris ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } -- cgit v1.2.3 From 3d01e802bd56c78965b784a3fbb4db0d424e2c64 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 5 Apr 2020 04:18:36 +0100 Subject: linux: explicitly enable SYSVIPC The linux-hardened patch set removes this default, probably because of its original focus on Android kernel hardening. --- pkgs/os-specific/linux/kernel/common-config.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 2c8b8de65b3..1ed48baa924 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -607,6 +607,8 @@ let MODULE_COMPRESS_XZ = yes; KERNEL_XZ = yes; + SYSVIPC = yes; # System-V IPC + UNIX = yes; # Unix domain sockets. MD = yes; # Device mapper (RAID, LVM, etc.) -- cgit v1.2.3 From 0d4f35efd4f905b322cd232e9740ce18f04270a0 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 4 Apr 2020 22:47:13 +0100 Subject: linux_*_hardened: use linux-hardened patch set This is an updated version of the former upstream, https://github.com/AndroidHardeningArchive/linux-hardened, and provides a minimal set of additional hardening patches on top of upstream. The patch already incorporates many of our hardened profile defaults, and releases are timely (Linux 5.5.15 and 5.6.2 were released on 2020-04-02; linux-hardened patches for them came out on 2020-04-03 and 2020-04-04 respectively). --- pkgs/os-specific/linux/kernel/anthraxx.asc | 325 +++++++++++++++++++++ .../os-specific/linux/kernel/hardened-patches.json | 27 ++ pkgs/os-specific/linux/kernel/patches.nix | 17 +- pkgs/os-specific/linux/kernel/update-hardened.py | 200 +++++++++++++ pkgs/os-specific/linux/kernel/update.sh | 3 + pkgs/top-level/aliases.nix | 5 + pkgs/top-level/all-packages.nix | 8 +- 7 files changed, 580 insertions(+), 5 deletions(-) create mode 100644 pkgs/os-specific/linux/kernel/anthraxx.asc create mode 100644 pkgs/os-specific/linux/kernel/hardened-patches.json create mode 100755 pkgs/os-specific/linux/kernel/update-hardened.py diff --git a/pkgs/os-specific/linux/kernel/anthraxx.asc b/pkgs/os-specific/linux/kernel/anthraxx.asc new file mode 100644 index 00000000000..101ccfbf0f2 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/anthraxx.asc @@ -0,0 +1,325 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2 + +mQINBE64OEUBEADPS1v+zoCdKA6zyfUtVIaBoIwMhCibqurXi30tVoC9LgM6W1ve +HwPFukWq7DAS0mZUPE3mSV63JFLaTy0bY/6GO1D4wLdWZx4ppH7XKNCvKCbsi70k +UozFykNVf+83WEskuF1oYzXlF3aB5suz2IWJl7ey1EXgIpehwQaTJUA5JIWYFp9A +566LRNJefYMzUR33xc4dRKj6Etg0xdLVq7/vZoo8HpLCBGNWiP0AKqFWEwTg0xQL +7nsJA5tfJJdwAJvrzjpFsvb63PKG6waAtdHhON4q7E2Udak9fz2tRjxA5l9l2zXk +aqsysUzkxPhNjwMENoQ04KZg4aT+ZhhBzTowSWLp3KV2uaZ66kdPUO3s+/1bPp5/ +N/IlykaUwyL773iYOZ5dOY/9hIuX/zssihcrGEMW6yIyZR5uKhzYdaM9ExTXP637 +UccgNS9/pskPGPx/xK23NDCfeHzL9YHS5KokA2wb/b9hqpwvLaeblbMl2pt79F1R +ac+rZlrRyX3NvlTQP4hqM9Ei2YBAU7QFDJEjH8pVIceL7grxi1Ju1iD5QiSK+je5 +Jj5EAikfwSeAttSzsqNvaXJHfABrv5mkkVt1z3icP3HIHTYnG+uj+t8kvW+o9/1i +pD6e6LUh4w5v1aY9kaK/M3+eBH59yNYI99crPUKUBVfW4gv4DBUJAQTWRQARAQAB +tDVMZXZlbnRlIFBvbHlhayAoYW50aHJheHgpIDxsZXZlbnRlQGxldmVudGVwb2x5 +YWsubmV0PokCQQQTAQIAKwIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4ACGQEF +AlSXU9QFCQfATw8ACgkQ/BtUfI2BcsjPbxAAs+UR/bJz/HeYTpPy+HnKwDJgI9GP +AZlNvp+QSIhOTtKCYkQ/Iu+5scY5J0Qyv0pcJW5Rxjx+l7KGovw84jzVznnYsJoy +UQ5H3Ev9T2xW1nrZT3abJ7j6ZIck+Q+WFHu5Plsq6doSXOXmJNoehvT3BVolvc6w +S1+CAoyA5Wm1yfocZgVOvWPWQaa1T4XA7OwxFWrvNWEZwAzTSjkGHkwmji+DxdBd +RPam9+qm/rcN1IJTu6xJPr38a9LydWonsUpTR2Qn7Bo4EJp8yHJLaiLEMV/Nmgrr +1orBYw/OzDzhbdMl+2zzwEBLUMPABdgnPM6ZCZ5PWyWnCU4jsBGyVd0IC5xEu3Eg +a0EtIdvx2lXiLfh2dulpMn52uJY5iNwaTleO+z9CENQVhh5R4FuN9H0BLiyAxf1+ +MkD3jLT+DGl02hQghtxz18iTkRk7KOw/NFn4z0is+TRl4/ocNt1LiWQXt8dr7qdx +zvUpDnxCSYZkeutzopo1TA4lKpnsS2mHabx6CbrUmF+wOIr8gHUfpBFeEQ8BHebU +5X0JrFF5mjeNl4uK9l9lD9ng74rsSpKPr15DU41jIuQDHJYd6H3TXQ4K1z7Ciivy +r4vgsruAFX/GduKseOx1obWW3GfIQzLAIuVdjldgREl61GWoLiGFqlcveiAIkN5p +Bxc20hSrHgZP9ZyIRgQQEQIABgUCTrg/KAAKCRC+dA9BPyK7GTK7AKC8Sd1ndNvc +1ispBaECbHT/JPfGrQCgvkfGBsFn/KBrgC5hTm0mSxdy942JAkEEEwECACsCGwMF +CQIchwAGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheABQJOuD2qAhkBAAoJEPwbVHyN +gXLIXL4QAJtbs62EpOIFld0N+tTEFn1qQPPaExAXmH/RF5Epf+0rSS6B0OXEZBXz +cWtMPbHxoLjN1iY8o0QC1ex7/KDfYq8Ho18M9P+Lf6XfW0sJ9d021U5MJWGPs4zA +lNFXJqeMgfJZAno2N6dO/azcYHq1wmSgUbTb9Oyi1PHfn3g0UAW59dfkB8d2jEvY +Yed1X0mBPPXcbgnYNZ514JQtm9wuDdVWrh/Si9EhKg6+MPcbv18G4lpPGR+yNq9y +3Jze4vmmWen0ceDJEp06IAeTfJzzD80Oui2WXtLfaQxgf9uuZtGjrMX5l+mq7rBS +VH/dsHP1VYI0efKIs7qbmiLcMRVWYIGix9I1C3UYr3ImYiCGlBG/uQ929xbjWAHa +hy4W6rzruUWjyi/Kz7QRnyBgtHfhDO7hYziTr5hoGhd4VeUpcbxL+MegXFZsWJlE +kz8TOOsZ/4XxXHVoalg8fYOcA7j/aoszsPMQUOL/5jsVRhyP3evtVxb3m1EwvYDK +Lii4IkVxGztlBOIgeT4kwXgoJEASSZHgcd6tDv9q7o33n2I1DGL8X3axcHES2/C7 +cP+li3KL3Hc9vjgaJ9HfcQLuMcHqfoHn+YzVfbG5XeFcxhgQpwpYsZv3MTbXAQwI +fRHXRuIfOiFwqUXahi5N1WSIXNBGSyI7pu9ht5I7gIIOINE+VS7FiQJBBBMBAgAr +AhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAIZAQUCUNol8QUJA/yTqwAKCRD8 +G1R8jYFyyIqUD/9yWw7WBQiWyIMpVuX9c2Ov1fAkDya43fDm0gqIgNsdaxCt5ATh +XaXZ/p2jglWwon5jDLDNsVR0/Q/t8ugdcP3bcwRtW2YYQ2F1PaNjfr5WsuPEadyc +J62DIobY4IzqBpDuqGLYdbzZeKr49VwbRRvIJpphrk3+CekFvdIs1ofEpA2Kn2oA +DXfYuaWoVBF7fTwAZmc3hYPOI1jK7nrFZbCnAT4WZPzZ4IY9lsaNTF/4mQ8vV1xF +De6HjfslHURlZWsWtQIKhIPBKoZC1nP5VRK3IHYgKw8toq780kalLH8ofv9BkSrs +t98JOoJX4etdmE8Ta/+Wg5C9EzR+909tQfdWdkaRbhvbtl/x7X76HU4ItefLR5pW +d0OSo488QZMQjCUWlzgPMsmnYMQm6ckNOp0B/RtMfbJV7t5H+JE3PLfFG55jcz3w +uNGhfZyl/ZhV9fvGLU/sPyhIW7ewuIwd+7i12fH9r4NAGB/mkSKK+tHGcTZvXxux +5QMKE+a9u6NMJRrbsIiTFwhrCLMgzLYL0mtX8FZXNFFZzGFYkiXymBR0ze4LKzRo +dMFpyP/w/IIjYBhVpgboT2EMMIgJHSsMJDCdDjI+9cAykVF6ccSiUQ11devHL6Pv +WwlT2Ub4TP4yCScHDPyfWq+tfdQlWFVRZMRJ7kmq0VagqomdRHgLPyPgDYkCHAQQ +AQIABgUCUtgrXgAKCRBH1QFsQv98LACcEACFq3Oz8nHAa6KsyspIWo0+HjzCtTv0 +G6TB+svf3fl24C93IfFhpSyxNf8XVa9h9kCU5ZImYN+LaoUGiz3lcYxjdOeFYDc4 +GU5TFrJwY9eOYYCsr+z+NLn7wlLZEO772lGUDPJMWxSGqR9yOGhQCTIADLLcp6mt +07zdejESYxMT6IjYR+rX6miWG5Hr9/lBdh/X4XhGpHEY64IL8vVB3C+FQfG3hiMB +bHbvJ4/S/cjfNM1T9oKiA0H6jklRHIdstj+2eeWA7lS+GE3Mpkra+8KmkEjV4O03 +izcRpMm1yTGoTjp9UddTNYErb/sha5YigYAqK8bj3gh6tTFNJHbN4RWgtPDyc5Va +1u+sH2ob6JS5tez8/Z6pMarGpTQujIGAlntP4igi0Q4hxyLof6Vtc6XF80uSwTvN +RRmQrcq+kLPwX0NbyZCBCI+kjBPu2b932JDTfVBKwJCLF3e1zvQqN0C7EZnIzveX +r7VtJ4WHIfSyi/HQP7xm5L0uQj+KRr+/LMaxkCDgrlqoWTgAoxCAPYH1XCvBoJRc +DHjNikyEAS8WUGl9ZHQyAoFngi/jqH6WoDAmfBUKRoBMR2hXLOKUBmObw0DHgauM +kk4kD6CW4UEy0SM/i9JD7sk9KiKoHMip1jguKRJkHJ1WSkNl7nZpeo+KG0WbGHXN +b7hnrQsNyqJkUokCQQQTAQIAKwIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AC +GQEFAlLV0QIFCQXdHmsACgkQ/BtUfI2Bcsj8DA//b8wZrFY/Fj/iR5ZaO0AjmMV1 +hM7lAFWLfDiLyYofuiGLUg9rqFWj+Ks2kedVN7+22Bjgi5fvpXv3Uy4trZKKw8Xs +FJ/s8HQ6jzIv6pFdIYPLFQBqS2tEgfsanPZWIqJI9fbhOrRGN7WV5tXiksCaRO+u +rLjIhAYmsDb//BD2xqsY54ouRdrz5nRG3qG2odq2Lw8XquW6srouGaSm+BI3sow6 +l2eAW8UjbxwICQg2ZPZYCBc9ArbgLS1ha+yPhp65nGpVbqDA8rUKC11op1ArAbY3 +Yt6xzLg+RCuCHBa1gNPpDoYV9V8Zve03mEIcsK10X0RhJQ+z4INvrjtelPRCOLpN +179JmsyxwOzwAPg773SK1Z31jSirsiEke/q8j13PGNDBCb4ZKpm/KOht+4d0jJLK +GLqD85cv3/uAeSh2zWkoKcVW6uVZpiz3KA3i4YMWnteOlrlZH28nIrDXevPzkOxo +pZlhuLboCD6g6yuZI4Wm9fEiga8xmRDw4RrOIuDXWjNW6IVaeFGvnYaNf0wnmBD+ +FE1SMWwcmqgB1yIylmKqH0lYce8SVAMLkkOlaijhWrfCO5iS7zjWaVz98HCqFfwR +gHuJTxOwwlf9Qb6cyC3bGsfILBUuE0L5vUAZUAc61H+6Sv88CDDUO1EOKaqAAYhR +plvoyYZ3xiSMgzYKGZ+0OkxldmVudGUgUG9seWFrIChKYWJiZXIvWE1QUCBvbmx5 +KSA8YW50aHJheHhAamFiYmVyLmNjYy5kZT6JAj4EEwECACgCGwMGCwkIBwMCBhUI +AgkKCwQWAgMBAh4BAheABQJUl1PaBQkHwE8PAAoJEPwbVHyNgXLIQokQAKxJB9/F +TfBae6eqcT+izxGSnsvbc2bcrtsmKkhu9HwpsJ4IDutphXFB0wFalI40BL0o1k54 +Wlfv5GHbq7Ju3kW2dmTMP0WpfFytV7rr2yqSmik+skJw27BDk74rP0v4TNOHaTrP +nokfTnlaKuv1bqlwbIwV7rJ5jbAtw5hueeN4jghGU8SGlCOEZ/xGxYYsvtyPhZhn +kmsAzcPr/BpW4NkSb2SnRIO8KzcPnzxz7JDdeIusq/YW7P5OlhDx4ejdh0Wg6ISl +zxB5VoqFqNuKTBQNz4HHpqDVQqEDE4JngMerDr+4qAiDYI4w6kN3Ce2LqciRyMVh +YYnTqyyjXYY3C1WwXIa1tZb2Cw2DorshNFdACr7wKQMOoJtAFpdd3d/DRKQWCc3x +jkBERqZ+55unTY0/0uyNPoK0noAcGydiU8WGh6wyi+Do+Zxq4QJEcqL/FHrhlaiw +LTmgDS+XDl7zRtQia7ykpi/xqe74ujOHcJO8tpY0ZCdR2A13xiOi+11wndbOkBFv +dQ0vgih9ROzwe3hBbBQQOdF4hkA9vEd2Ks4gF8IR+5ixWAIyZAVbnDiLelWgQgnE +aeEwTtfcXRNAxuj+MgMPQhXQ2/cK0dPD4z51DchVRIf9G3hAuBT/CEhTqNkkm5F0 +og7azwd75+vh5RxwVld3ES6CMXKaiV4csQkdiEYEEBECAAYFAk64PygACgkQvnQP +QT8iuxlligCeNgfNE4w1AQuOC4ef3HNNY0GXgVMAnjmtCVIUJv/w6PDimvf20rgF +GVHxiQI+BBMBAgAoBQJOuD0KAhsDBQkCHIcABgsJCAcDAgYVCAIJCgsEFgIDAQIe +AQIXgAAKCRD8G1R8jYFyyPv3D/wJ+sYXqSxoo8OriGMUzG5LXs2Hf1YULdlysGa8 +mxWTwCIEMSSx8AoOKf/FyXglDVl9msfOgv6jRiN+UyNCQEv+6a5ZCL7BlAVU0Q4W +w2/UUlOUlLMC1QAodGcC3kiPSy41jnDVswKYRrICuiW1Pqgad3h7u7caqvqG1D/A +YOR2Q8JjY15j6Qf62Xx+YANx2tPWKeDyPUAN/x1W6RrEDbN5F+1qOpPFuTnpPmqH +q4zxm4Dz4szypmAKsN+5/q8T6DJtSnP7COtsY467oX2XtNTTuCIsU79lBVo/yan9 +ofB6hu12KyXwJIl1OK34g9VEP5suU3hcEw7uVAvxyMYJQlxORUCG0DAFc/oPm3d0 +ypRdbxXJMjoS3pmCf7kwnEA9PIAjZDYuVHGZkAdmYYInTIH6ipjkVxDHEF1en0h2 +zHJEZC7NIYgPyzHXmH7Xy3VZVhhKKKM12VDOuIOOecQPuFIw3hG7dymjn5e9dMzv ++DMkbEZzoFahLYkbVGG1FGzhE6Uvb/IG0UJCC4nDz0pzZpV++QHvgEvbY/HLbHJ4 +o3CT5aVE0YIhTP+zqXNFMOao8yZy+AzdMzdX+Y3ADZfY0oiZ+JH1Zo++rdrgXUhg +Y98QgMwVwESbwaBKjsC0JnlmWyNivhIOS6NRyqR75E7j7JSvgJdxhvpQXXkQ/BzL +FM1Ej4kCPgQTAQIAKAIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AFAlDaJfoF +CQP8k6sACgkQ/BtUfI2BcsiEahAArZfD1yJK385eqgCZ5LryVLRXrocuF1zlHl/6 +ugRy2TEe43ex4eTOY+mv4ZJVSxbDzUqMbBv0m3IETbM0CSESjGD+i5I7K3IToZO9 +ZgIXDbpoy9x2KWjU+R5oaxCTmZ9jk1p+f4zHxc8lJdgOXPwcIIT5Euwk4LAFN+wn +CUHkO/D0xzP2ivTrM+VHNWqSUcNInAGRx+R0NvdSryIAsdA/5E3ql786WQhPy6L6 +1d7cmxaLsfAKIOf8ydNyoiqmJkT62omLLnqyERfLZRa9RKt5EgnxX6kR2BA+h/Gn +KVV18bCIJjF3Gjnh3qjJehKRaw9nmzrB9KtGQAHdIp8ivNvjMitc1ijRIECfidWd +lGxgmuI/gX58eaV3scjbs5YUFmGhcZIgjCxWWxFSwmzJTUVT5XqBpXFQB4dokj9m +NNMpM3YH8T9QaaS/m9j7cmCJ4gxp7i1bJsqsVG5BjRLiZv701eVKVmU6vqhubR0R +eSZghqho9e44ZMbn4rJ5kTQhGc7ZGNsIyChMSaYVreB8IBLDC7rg8dB/umg1OYOp +8EqRLJyXdtpa4DN3X0e4WcWb0Toj4QuyCh/es1CtBldhdqHr0aLZYCX4i/KuGTXI +kA8LTOJmZsE+K+/NCux1VHK9DADKcNjhSV0QTf+8ntGlNW6i2Mlt34thZK5eeB6W +Bbo1zl6JAhwEEAECAAYFAlLYK14ACgkQR9UBbEL/fCyyQBAA0931q8dBD/6COmat +8S+JSgcuIpylukFxU2vySBWSGRHFmFzwbokUE4bbNyutwNO2cNBa9zcxRPrkIg+7 +d65QjdZNDV2zWTjv5GwzEMjWxhP7VpTwTouYgx9j2d2KpFo2jfhTtZ7OU7DDF9YT +FsaRiZHHZT+W/JHuB9Lxc55HkSagu00yTaZURc0olBui5c/hqBte1b3OWTjCmysG +mwDL2FwdmFi9mbEm77sdD8PSVfkZaBv5rIaet+Xe/JMZoz0WUkZRCFXMr6B7aOdS +WeB7kUsPh2J5dhf4x4YaxKLOHod9JQF/DGJsdexKqMTqM/xOMSQ1FTUMCQ5SBWJc +3PywqMB/0eqlteHydlk7bb9HLCT3M6vVxTkpj834wGRsoVXPqWKzAHPpO2kjxXtc +4DBh7T88YGE2k5rxdJHb3MjWVJQzHGhrO5Ji8CQaHjUJ4BTyim++RDisDi4C/QJ4 +qPOrafw/+KyJoWyfmAUpxplPvY/LKJlvKaKxmpwlildYjH7HjoYvCjagbSCUOnzo +uM//YIJ8/o8QdxEDdYiTd7cwskYWphrAlV8+vCl/Y0lepRf+hsUS+uZi/NX4qYMx +CTsewnnqJQduuehQl9/RnoBX9T04kS64cWNaPZ4dxZUYJm3us5QFcQJMysZ4tT1Y +A0oEUX1KUTDzTQXT/kFi8MtmXauJAj4EEwECACgCGwMGCwkIBwMCBhUIAgkKCwQW +AgMBAh4BAheABQJS1dELBQkF3R5rAAoJEPwbVHyNgXLIV98P/jcu/DiP/muH2Qsy +FtjscyLu1NzBbSFB9q1jMVfx3VbaIT22Ly6BIQNHF7L2fpjf36EWpdJzpfR+Glp5 +1+KqZgIMAW5CGguSy8v7iHs6Rh5hzChiF48wCqxUmMdQ0ITTrnAXIYq6H6s8ytKF +Y31znXmne1XYBg8e4yb3pcBhkzIPeVU7rMz9PjPB0+Q2jWCpqPA4eUSV8rL2TxFR +KbEt8XlkZ6yuCLnkN84aLZFxfZA1tIGifi0PpeaO2z/IwOmftbQRiljMdnsPye49 +j4wlJS7yRIpnH3nH9Zku/MrDV/M0z7BVwKfF2F95/2QX4Tdyd/UESTdLqGtXpX4c +axahZKrOhNr+k60qSBxoBqKauZkSbZunRnbYmVa3nA2kQuIPF9/QmoZgDUfdkKZJ +u1RjwcRUGKd1XV19QjUvBMD3oHA4G6Jbi5vWKQZ40KVcL78YIL7C8dUOiPIasA45 +olaGpCSsGsfrMp5ngegxM+uh9Tc2kTFC9bTqp17VYI96cAqGrEBUQrmLmZLk0HUm +a6MNZO/+vKN4UTlgjpjxZon+/yK8bsmT/VNie5hzqZim6tfztl3rpJ9jPUeLgr5x +oGePYV02inapzNHdWFHk0L9zR/3KKfJ3IRJwUXp00Eya28hEepIvdxgLYcN1UqVn +VuFuMY8zYSl/VXtPxySCLENJHxvdtClMZXZlbnRlIFBvbHlhayA8bGV2ZW50ZUBs +ZXZlbnRlcG9seWFrLmRlPokCPgQTAQIAKAIbAwYLCQgHAwIGFQgCCQoLBBYCAwEC +HgECF4AFAlSXU9oFCQfATw8ACgkQ/BtUfI2BcsiPxw//X2xUctIrd1O7UOk7LHBX +/xI7xXoWQcA7l/1XMuZhM8yC8yIoAgvFrWBP1a29I0P3/yigkQXs+eTDTdvb0QP2 +q72q7Azt852v5u8+dHzoOXDpbo+4lfX+0OBDWimwJuChD8LQH7b7jO0oqWIV0AzM +vegFJVp3cDbyqw08lBz3xZ79A9JtBeewf6PLpXKjEVS8bEAZjZKjsjAY+5ShtJAf +PsD8r353dmkaHgC5Aji74ijZeY3PUCvGVVCGeN9isLnRpTEn7qUvN2DfHJU4w6aw +sXu7m7zidISo6dQLUzo54dHKWPGFy6INNkzXPOgrlbYnjt7v0Ou21/R6HrhdmsSw +lt7GALJcgAUxrcT/ljB3SZhSB0BdH0DXPcUziEdfhgMhhrXYpMjwH2XFBD1MLusW +GaVDbpPrSoEnmPVePcDUonDHePcuLjfOl13mOER1Kf6WFapOCa+4HCLakfKcPnGY +eyfD7Dbz3/046MmfQ8/Iyf8ipFXN6tI2WkRKj8uq9IFYrX3yoCBxZJN837DM3Grq +h48/T3pYU1f9LiekxbsgXmcHoGNdXX5+EsuO+QILZPttlG5QLuqFdJHei77uvW+B +4u8mgzi1Zhh0hRLm4K6UaJ/fBJ87BZSHShPKI9PI073U1O/CcYXnb8cdPLu3UgSQ +FM/bxT70TSYKI01Dt4KXRfWIRgQQEQIABgUCTrg/KAAKCRC+dA9BPyK7GT9FAJ47 +X5+0dQaOFkfy3WnMgX3AmIXJYQCfR4XL47rZ9a66jWaD0IbcXMK4oE2JAj4EEwEC +ACgFAk64PJ4CGwMFCQIchwAGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEPwb +VHyNgXLI2U8QAJGKPv1gWLn7P1KeHVsKkfRf+zgdsoY4mF3bUjX/03z1h1OKp+S7 +gZD/ZI80ckw/ElgFt9sr8J+pOgHk+aGHW+V0cZNgDHXCINb17s+Ra7SA/SWeJOrr +d4IpvTnjGc88C/j+bzRFagfnGXU601PeJdXIe6H75xVGIb0DgQBfPB9m+7p3sq/R +6UigzLwwhIQRW/l77hq79v5Rm77e0GTfcYHSuKu2Itim8p5OYCNchr4ZpBzrv5cF +/nH+HyD0AnM1q4a3mT9y4abNgtxJMGJBoIUEDT5vaTRpPowVHIGg9QroHkrYkMWA +ffIBzoq38WLnPjvjNtTncyP7sjbP8KS7NfjxZ6RAcNO6m6BTDYG/lM9jwCcOma90 +RZDVYD8hy+z1hXWFfB7zB+5TYuuKV5SXZpS9/JUR1BuI44WkY0hLHUa7inpqLlqc +b9O7KYikgyaeUKAN5LkF8A7rMVzuhrSItNzJVOs7WLnNAe9+Frzqx/jZ9aU04avS +r5OlWLdL7k9JNDnsLFqNtG/XQ7Hc8CPl0HvY3YXYGD3xwW6Ua6+ykxZGmQGPB68W +6a7G5EX+MEWKZgMQYsl1HgU49/sOD6QnCG3m2IB7bRAf5Kd527BnSgAaYHjVug8G ++X9opDwUW1b73Ut5tWfZJqQ4XBjl0Hc7Zi7OtlqdBeKGu/65QU+N9x33iQI+BBMB +AgAoAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAUCUNol+gUJA/yTqwAKCRD8 +G1R8jYFyyPv+D/9lA9yMXPBROLaCRab8Ca2QJBEtpT6lGVlkQ5Am2C8xdoLGiuJF +E7Cn/lS1j4RSVDK6DELeaBMXaY2g1eun8g2ERJIUGC98zrPjZXs/ZtCZtX8vYr1X +Bf9U8Ty6N3rKgt1XHc1oMgzkKLUc72RC+P/fkDsiAg62nVcmOFFykyTXnpM/5Ux/ +9kaahjf4LwGeRqkDIoLrXdZ7FHPjei8VlKSiHTkl4F+UCzEySxiInV+BWAhL5Lvb +zHxHaNDCquOb2zbgafVKON3oa8nCZoUw3iwpjrEy/JT+1BG6vxyT/LX7wPG3SKEw +8QTl8YBF8wvHS0JHW4KTc4grCMNWDwfkrlXnp6ZzTpy4JXZfYs/ltR4FH3atDG2C +xRCSAWXkGyTPMZkougdDbJ3jjViYcWO6B//LE1qDjeC05O9G3MXVxu16M5U8nVA2 +B3bo5cVv7+ECBTKaAvG3ZV6eOaeJ63gHRY8qI7y5OgzuNfxUXMTIAjHfO2mvSy5M +qFgDI10F8rYevGOKxvPVE1F8aiD1uRAOMCcLTy3oUKHIdaskSytL1D/bT9WqWzii +OXhLhSjMzkdPSUWVABeC6KM+Jcll0A0sHTkKWS3mavx3dUacB+O4efuTKNhSvo7n +XhUvSOOikRityipE5Ma5WlXBiu54DdIMGFzANHFdb5GmC7da9F1aALkshokCHAQQ +AQIABgUCUtgrXgAKCRBH1QFsQv98LMmaD/9W2qJyFlZAsjOWgNQPwUU4vV9/Ursj +kt4RI/oS0Gzovw2bmL0a+Q/dp6wM4PBMuYQXCepF8V+o4uKzL2OjVZDVtU/KqGCY +rEigiAhG0gHxgF1ukc9JQzhShFeq7/wkY+FQ4MOhuhuUsSMlvFzAd1hY+xlvckol +DEeS54loDspUh4EwxsWlopaA1rs5dzVXrYcinz9iDzLj6ujb6uJzCQVogk9w3dv8 +smKn81TVhtR4RFecqL9mURZcGnj7NV3n2Lrl2Pe0u/DiTtpavCkzVx7v9qiB/2Di +dqWR7OtYcywUr6lZeZsNabNwntPxSP7V6EcNXF3Qpi2IkAcwdJKb+aIG1v7/Wx77 +GhpBhbtdgKEebttzO4EVVeE8a2kmgqc8VXeAeqI89egU53dUdAinejFVDyemxHnJ +L4L6uVnSxbk/vRzu+fr6EaPyBsqORGXj2OuwxlWcnWs/N9XzNaiq6funedUSYtbP +trdpt7ogvzrQew7wetcwfxSB3IWcVwA9QvGDIBHTWPrb87jKV153w9I+cSfz9jg8 +qTIOw4qad7VOC4L1oaoRsLq6VFgnoW5DLsuhaVd6fgdY/byL6H5q2FPYJ+F8ovhR +2yPlQm8UYIFwmnwzpnuGBaPtU0bP7C+SNMK+G/9+b5q4psh1MnK8sg1RfSr1w7sw +b+Tur045QrUDu4kCPgQTAQIAKAIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AF +AlLV0QsFCQXdHmsACgkQ/BtUfI2BcsitRA/7BbFuuAXPJMA4XtPhlYbfhNkYQ7+v +vx9HIZ1SgJfhpYwt/vbNTVclO79XD65v5JSWx+0gVJfHNolP5umB0++giIw9NCIx +uVa5eh3kS5NFfJ0YHrYgpFDdZPHRA9wI+oZgJBC/Cm40kafgTUoPFqXb0Sdlcz3R +hciLZBgYXV/uYubczfmAaJpmrVI1UuUWYrdPnmUkgitp9e6IePYiKVDeIGhBW8Bc +7Nbs2hc9yH1zwv3Affs8m+4tQQiwQHsB29WEZcmBuFllTbA5g5bvTvhfCRmYVgWC +Ti4SW+uA0B05a/aVP8fDXk82qCQ4cRB1BOwVNn+1/Aqcw+Zh8KKzH8gpPcsKGGP6 +uNg9uinuxYDneEY8cG7FSpm3XsXu4q4N6j5R63U6hz39pY/5Ib8mzYMEoLEZOLPu +CkVH9OOQc8zuiRL/wGc0pbMiGPEp13rAI0WbIFahrWS60bwtM1YEM5Ep8vD3TLl1 +pTWlF/zWpM/uJ6n/4nDXGQsGzKQn5D5Nsu7+55C0du0d1VRvYd8oG3AaNqhtM46V +C4eOqxH8XZtkJ3WMxhsHnV9acuDTpn5E5JKL7vEq0btN2UQ69lpKv7PmV/TgOJhf +KKvHZ0dh6KYY7iKW7NUCouLGibBoxDa+K4reh0i0M5UcsNiPkCqDIHUAIxW6FrvQ +xBr7NgCls+B9Kwu0JExldmVudGUgUG9seWFrIDxaM3IwLjB4MDBAZ21haWwuY29t +PokCPgQTAQIAKAIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AFAlSXU9oFCQfA +Tw8ACgkQ/BtUfI2Bcsg4cw/5Af5/cxr5s8qiPvcGDglJyzFj8VBk0d7hpgdxcOi3 +VCOJY4YRoliu8WKThwxt7sD03fSZurFDDx+X27y3zPtgH/qBohmcr51jbSNom4mH +Gf8gpViFqbQlFh7tYz4kSQExgmpFx/FIaxmwFoEqiVrp6VpM2DZ6kg//4M+Ka2Mt +nuzV3C631A0eoMCJhPWPTgkGGknURvzhw6m2aGFWC/HE1yzf7Ej7fQeaqIxIG4Wy +Fk3lMV9rxMxGuUZTqIhvcU85JSriHowfX1VsAI2LXJYQ9c0jI737FcLwHv8VCa5s +NKDkLkb5S83/4Ep8e9M+a7u4WvkAqzmPfSna7bLxdsTS5gKGqEtMvMP2YGWWQxSR +GRSttiMmIC8Cnd45S8cASA2mR/ebNcrYOpa48cjYpBKDG2BIYU7oSLNulsM1qbxL +WJ0QM/g7iKHcrXhyIBaI22GS9hvmYcS960cox9oPCvNZcOKA6FBklnUg/ReJ3JTj +6D6v9SUxOOfXPQIon8EzB7BNKGedHxCFgniZnl10k+pP34YGyphMZTYGdhtAm6zq +T7PlraHQaFgQ3ba78lJcn3cWVZYpbCNJiH+Nna/Akm3/qQKTst3eW1lqopffCs1m +F6G6wjiHCw2bio5uX1c/gDr4Peh0E28heAqKopjultPXPZbSZL4D3fJIGP2j6e1B +wvmIRgQQEQIABgUCTrg/KAAKCRC+dA9BPyK7GcYrAKCgKW+qFwbMNeh4ikFg9fJx +4/lH9wCdGevT7dwBzPe6L+aWZxipEXYmjx6JAj4EEwECACgFAk64PN0CGwMFCQIc +hwAGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEPwbVHyNgXLIThYP/AnoLpQl +whEEKaIhOSOKXegfdUHK6cL4cHRACzRIbBk/S4G2Vg/bnUW8tvWZDQLZ3CGL8Z0F +tNQ6GusUxt7mcYdSj7xynbi7bZiurgYp7B7hh1hVG3pAXEwlDnJgfoc0YZHrHZwt +HnNVYOfGEQF4zyplmUUxDyp/ZMYcXMr3PVJkYBJhYKCHOkMUtzzNjSSginaqZY1p +fgbP+Gou/9qgotkYiH84oUG9yTSKLIO5x0WzQYuoPNJyOdSHaLPfEqCC435vCYT5 +YLZB1YI5xzQiGsAL//cUCe267oiFmO9Ioky/azeX1Ouy2DH8uEDQPQFTJYXt3CbL +i10HkoBWdmncPC6+b0IJjDUo8Iv4yk0xFt2/DGkGK3h6jJxJ9pzx5KBT46iLfU50 +iTWMTguXn9ud/UJV0MpKgKjvO9hB4fae60n2UootknzEw6Y5W55PfGkT14WcrGGo +WHLSbpR6+gA9apU1cdoOC8nXlf3Eb2No6LP3X7RJXqiRsdP0s6QXkZGfR/qyNXI9 +S5j6wIyqNFU0cX21UgI9oJSKEKIKEFacgyD9za0gswEI+DZr8/p3cJE89ZX8ySgO +FG148wgaakTNGyGwR6aogGZ8IAHc83bnwGCgTeK6ZPSKNLSE/sImcTOrxIN1/x39 +r8o0TxuZjqFH+zKWfpdHX+sJLyi8Gs29CsUhiQI+BBMBAgAoAhsDBgsJCAcDAgYV +CAIJCgsEFgIDAQIeAQIXgAUCUNol+gUJA/yTqwAKCRD8G1R8jYFyyLl/EACG6QRV +kKVBoI2Ycr4UISk2+gCD2r4xSK/QLEhDFcZRgMctvPVnhod3uJOsMGJCk3aPGu91 +Jtwuj0CkeURa/cVzOjC+f7baveTuWQaAqW+r70m6F4gYHU0aDD/uQ75rTCcrsmt2 +pnZCyA9jLJxQGG11AvbOcV+7K7BuIvXs4iAactZ0hRvDVuGXuup2LnUbxyBU2oj7 +OWCXKTpZcJ0KGTWapMf8ClYYsEgS0wvMWotJzAov7ijkoP2DyEQVOPTnGWcfjsTk +QgbyqiFeBl+3IT4+xSzkPsd75dCYhsHBvCoT8cfUH4wvDXzU2CwpC1CDfHit6Hw5 +UigvZ8HXyn00Bm0UjLHGW+haS3kyOoz+z09gVFYd33cpjSnFr5is8ZMBPW31PE15 +q9/l6G/o6OGJCtOax3Yi6ttqn+KbDXIooZoRPZlayOSghyjoD40+ErevmqZPfJ3E +o1kHz62B1YpoXmhUm2Ihf2SbjWJRaW9Hp2nd81kAAXjr+8k4yvOuHxwYPFnpBjfV +cfYNQ3Zf5xF4nfszFuZMc5JYrIR3EYVgEk+n8VpulAqd0rXUEODwGy7rPjdxLY7w +DhUEZMQN3xweIb4vjPDBb0Ax3ACyfWKIdT0kC3rGOy9xyCzxWO2CjHMjrbxy4jL7 +B0WIQ5fpRcV2+wozs2WYgJKVKJgJZGYsW8dDLYkCHAQQAQIABgUCUtgrXgAKCRBH +1QFsQv98LIX0EADVefJUEMGKiTFLwUmWNF2X4oCzEZEMsQ6NliiQFvtNkKrT+OzZ +zggxfINUr0XEKgjjoGZ03Hmm7xAFc1Y51QZEr25H18PuSixz2YSHPqYwwVgLUh0v +u2AqaP0mQckssK+ZAQVvoZ7ZOI22ZXIZ6CPEPY6aJawHov8Strlm8oTbFgLfZ5Wo +3NCxMkkq3NFNHuwesccelNPefgnFZWhwr1mkUeX+rCAbQF/QHYEAi7KjfKyY+XKs +ccjYS+RWxpte21ejngp7pRYli3M8cZoaWKCzLTrD8gKztlo3op9Zc2+hjOY9gZtG +CaXkN8lchJ1yMyWju61ZO++AJq6S2OdBVxgsj9xPm+x91RbZRHQmUuq8mefUzaEm +NHE29udVFfuV//Fpabi04IrOuabkrSvP27eX9FT1y25tKFHuJdL5fDUFGnNnTvcR +X51lJmvnuIKJQ+Lthup7npS0L06+dPIDoqyxF8hmdu3RtwEsvkboPaxx5XTB5d8y +3wzBFWd4ePwBIumrY1YHSzdJCvyyLRXZbSOsHXgZfhfQ1LVgxxebP7E+stWqGLLC +Fry0WGG8f/UUgVr1QpluT6NjioUnuI/ZmKR/aKewqVYWAnr54fF+np4VdxPfYwci +lpbXpkamORZqPfq/nyoWgnp+y4AptDdDkSWnFxfcJ1wnFFcrHVUSFQ1wBYkCPgQT +AQIAKAIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AFAlLV0QsFCQXdHmsACgkQ +/BtUfI2BcsjV6w/9Fe1+3Mc6wG3R9VbxiYo13/JV4t+tA9/tcJ1R/Y96eAqVajoK +c2ZQ7FrimmlzvLIvxpH4Z76h3NmPWfOQ6qEumZQ5BM3QwBfQQ3Tmj10gfiL5vOZJ +6dUaJjwXgjz0Qyk1G3gw7K1xmtnXgBPyGT9T9q3OAhHHdV2b6xS9dWoNKhUV8GUn +HfIKwq+87aZqexjFE7ubZdOAe+5nrqnlMEfJKgDjXbazES9IYvPQiSjwR3xaIPOa +ma5WfQV0SHg3Vkhtv2PjuoYWNfNy17N7u+dfg7nAtKLIQCPht45uKk66BYWYBoDI +VQfg6zcFLpdNcFzzwmgrYRZvEvBf5aSG3KFD7UReT0695/lHheRxEAA3thsx8gaM +CCavtVxbVUluEfYZ7TgXLMuIO9OBKhi7MwB3iL5qacrNShMB+1J5FxieJBmWXdla ++kCdCdS+9kIZH+mnQ8daGEJ5R9mNcVwcWasI0o9NObqIZwhKw4obrC5Q7m2NfXL6 +FUScfA7yn7+/icdQB9fH2ZXGJVuNm1b8OBN6Nbz0QauaCystWzKXKwpVb/5M623v +Vw75RfnqCFiAf4tX58nL/QalJc4C0E+TvQ2pXC47VQvHmiAB31vKvU0nbo+lzi64 +hAPWJnhr2pmTvglquTFzLwEsWfO4zDtUwFo8KM1XFsonaoX5UzGTXPmIN5+0J0xl +dmVudGUgUG9seWFrIDxhbnRocmF4eEBhcmNobGludXgub3JnPokCPwQTAQIAKQIb +AwcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheABQJUl1PbBQkHwE8PAAoJEPwbVHyN +gXLIdGAP/0ch1NeFyXWszqA5ow+itBn6iyUaplXB5I56Q77cTIFB6LqJ5+2kdUuO +UqPvOilGS3dxbyDsSdWDLs+bHRFG4uqZyGUDhmu2mvS+uDqPFwcKJUNDlgdccxph +sA5HJFGg1ca0TWWg8vjwANdU4sL9Ujbaw93v0Mx/1+aSIxyEJBNxc6DJWEfCjpSy +R9JB8WTHgvxEAImVNsT1OGNTvd2DN+17WBhxBktLHDocIGJ/fttzFgKkv6NTPwt+ +y4QyP3UgeYRZR21B6MVckk2/UuCuCY7gAGruTFVoINa/Wqn2YPPZhJYrTX7ysDaV +QLObxlepeo0UWC7wFEiuqu5OM75MWLUX8j/1OAIE6my85vrlcWSf0Z3jOAgPTjJw +VT5h7T/7NPP2azoIlOE2bh5UcKXFkT0xDYPcMr2hV2Ih+jU+Ygiyg/1yIIxearmm +PFjfIHMLepa+7RPtTlHwu4fpNPXzL13W6PXSoCTTi/suGlYmSyLtOwxq15GGT3vg +1Xh8wfkuWwbWJnBKXtt8HkteQRgDngDnRSJwsO2nnQ7+sr+F8J3rQDdlVdVcolic +ekup8ZgSjJYinfcpF+H+qy2kK2jOYyyHI/+zHQtwy1R7MbLwPJe7WNWrBmEvmazB +2//Iu5EVIfFX3flPjeRQbKX4B/SuXF48uo0/8WfdgaMW8glRWJnbiQI/BBMBAgAp +BQJUSwOnAhsDBQkF3R5rBwsJCAcDAgEGFQgCCQoLBBYCAwECHgECF4AACgkQ/BtU +fI2Bcsj5ihAAg0d0A8OUsNWG7TiPQTuC/D4e/5JTkJARmQ5xO6gMPxTpjSZCyWEl +7gQOg/liU8nz5HZGaJgg4HuBwTs6euqdnVi6zhW1c1wye2thGTQ7DeSPJnhju3Qe +mPS1jEdC34lXCo6eGjdKnGb7TV7hkptHKHh7XCU9n6qcXQ2cNQQbdqSCRsfVm1XD ++p+mM/FGOz8uFOrhERAUl99WkVZ4NKTdws8U6FXulbdWrWwI4eRggIdwI/Tl7zuy +ja7KxBCCeJ/gFY6g+iOYmIo6//bJITgmAG60hFHJ9JigcN6xglYFI28TCdNqM0+C +hgbZUner0vLmaxRNoXqV9Xw8ihNMQa7fUFYkX8VrXOdLdVvee7OaeLuWWE8x6usQ +NzgLDQQx9fmxtrQY+dC6Y25IPMm094z0nrbM1wtfG2+8Vw4mQ2U099fT5t3Yl7fE +PlanhgQxRZE78PxezyYxms4HV+wqvrhlBzFnWAd6H27uDPfUfO9cLgbmFTUlwFhg +gsDeIFRFx8+h4/0xAIPqUODmTiN0mj5sLRW7zvqZW6zhsGIMdPd+IkhHiGjeJqme +Ai0iOjpV3tRteoW51/+/ajPmyUBbvOxiFJNADHH2NvqoBMU1pkTvpc7Wy+2J9VcF +4TFdWBbwjU8BoC3ZgixTrT0zCSwabnKriglOhA5Ik/n5HsR7S76V13y0KExldmVu +dGUgUG9seWFrIDxhbnRocmF4eEBoYW1idXJnLmNjYy5kZT6JAj0EEwEIACcFAlSX +VHICGwMFCQfATw8FCwkIBwIGFQgJCgsCBBYCAwECHgECF4AACgkQ/BtUfI2Bcsia +Wg//SKLFNUTEBQG11cV/AljxmI2s8y+cPKs3VqlwEjiuRMu4DRkFVaZNEuPq0b8q +8pwcHIJ5/nZvOticm9M/g7TrTp3pOxmSYf7WG31vVrprig22dz8WxQAy76srNn1z +stg0TFO7nKNVjZOFz5D0RpWazwnXyDed3l2/7RZ1CMv7ue/rZez8FnDHN7Di3daX +AJ5XkvDAsD6AITYQd+4XEbh2rt9p8G6qUUjwzoVU/aGVgo1CGZydYMJQVccNL7kv +fumnwkAED8u9j0ZI+xfaD3c1rP98bnqk9u8rJPCAeIkA4ppisDb7noz0NaO7dDyM +ywBK4OR478fw5h7GfiIwZdVAHkCoEHNvF1ON8JnYgyplLvZvxZ0dtYGDYDiFdORN +gVgGMU12kemPws4hEx3WMgUu/BBkF58XyQyqcwt7q+WGI2lQ88UzZ/FAsu8i8r/J +jkV8FsiCJ2rSHEMddmOHoaTM+6oB2i9kZo7KmToSZu7DxuemlHpuOO3kG/iRga2y +NeancRJwbxgZhNGBbhrA/7k5UOcXkmfW74oBkbCci0ncVhHu12dsJXhk+eprkOXv +nD1vEIeuzL4V/SMDar3SxFlfLFwQk4cn9+pdeP3LxwHKBn74pABsbEBhEY4IjUEL +YOTEVoP6s+Ou1NcLxFl3elmniwL2+GV5rDM8pctkKNemtZa5Ag0ETrg4RQEQALfu +qEihKS+DTVlWUujzSq5zK/5oQ1ZL8AiTUTZuVtrRWCq0HE8tWaVxEP3Vt9FCo7yF +afXigokChzHOgzczg80tctrlv+vbFyaZnjGQH20Nlz8EnZP102zudx/RdFXG/up8 +PX50Eck2lH+IvvosMLdvrZTkFJ4SgqMGSoAgMhJHZdZB5N0y8yPPAjcEnSXp8L2A +mo9e0egCrEuqBrCZld00nIoipyDlYNZkLjPf0JRgFPO/AWWgBZLvLlteLu0emq8N +96bT3QTdXpRVPM0qeX94+2gIj+0V1uQ9+k5Xkslbbii9TnOzMnLRO6dBAONVTTb3 +ajzdXK71iv2a8Y9lKShxhYWP9JNOFlXkAp+ZoD7EZex4dgu6giV3PrTDJLyWSu41 +WfqOz6cJGpJSTacrenC542ynAaSVKXH+1plqB9kq/M7HtE/P4GveQXIVT9Sho394 +4hwkuETo20KwCgFPMmiNaBysnOykIcDsDutBOyygdovzdGEyHVsM8/kz007QFgJf +hKy91H6O/Cg7VH+yaUKllRZ+kFsoSy8/E0IqLzqBHG3sUGM6lJ0Q9fgSnpzIZsdE +jRhczNCvlovGLa/kBHcEUWQ2zrjnfjsLkxvamKJ8N6LLIXIDRv5dE2smpdi3oiVg +XdOKshyXB+obhRFlWtirK4udX5yYzUpcB0zBoo1hABEBAAGJAiUEGAECAA8CGwwF +AlSXVAEFCQfATzwACgkQ/BtUfI2Bcsj0Tw//dyDYwcnh0BIb+nDCXFC91KiPUILa +f+wI5w6c9YYEo6TR89q6Wsq8EDiqcqSJcztuNvw3MZGHWA25nNB/0046CGM/tUBd +Jyudd3TxQBi6XMMSTbG1EMtSN1UMV4guuUfYcAGW38oZ+YJACCBFFz/Kt0aa/hhi +/hBNyvI73vZfQ/fsScFDewkxikUEspRsLVmX6gaEmumOxOhJP3HBoxeBCM4Z3IXo +dON2SiiMxt9BPIPJOyKNkFQGQ3dqJIag3GnsZ1s0CEoi8iqF7uS4RjC7uOJtvn74 +CODxg1Ibl1IweyAuBEA80wUh9DGLAdRJpxWy1B2fDhIROvpcg0R5p6j9UX0b0esc +jKLQEiE1wRswjXhWpZhe7Pjl38KhwqMyaeR3OnDtP7JXazIG6HiBIp4cx4k5A2TT +X+LhvG3NHCeuxIyjLTRTWgv241kf7uAu+qgjHDSKXQqpjvo+cUYQgSxQZZXnmlz0 +sz/tEeiWl+i8kW/RNKQvNNR8ghWDW3YRak/zS+WFNoLZchecIzMj+je1vSg411o4 +Xd3LHDur6boCetaq7ZkqoS+NcX9n8MnKhHKYJblvXyc1h67s90+wSwhlumA8WqlM +yqn99m13aF8GuGZbw5B2/x/Cd7WW5wZV6ioola/yqDXB1XtDFBy2Hxr/VMRlE3Cu +kekzzVjVTZxOgZE= +=yRuG +-----END PGP PUBLIC KEY BLOCK----- diff --git a/pkgs/os-specific/linux/kernel/hardened-patches.json b/pkgs/os-specific/linux/kernel/hardened-patches.json new file mode 100644 index 00000000000..24c44dd1ed1 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/hardened-patches.json @@ -0,0 +1,27 @@ +{ + "4.14.176": { + "sha256": "0pr3m2j63mc746fcbzg1hlwv85im9f87qkl6r4033gwnpa9brcgk", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.176.a/linux-hardened-4.14.176.a.patch", + "version_suffix": "a" + }, + "4.19.116": { + "sha256": "1f54g0xw708kxha07nsb979h5vwxjrkbwa5h04zny2kq702x1h13", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.115.a/linux-hardened-4.19.115.a.patch", + "version_suffix": "NixOS-a" + }, + "5.4.33": { + "sha256": "154iz7i9l0hihjrmfk6rjh7hhqwyhsdjr2c74m3dhadrlm5hwy89", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.32.a/linux-hardened-5.4.32.a.patch", + "version_suffix": "NixOS-a" + }, + "5.5.17": { + "sha256": "1lms090kkk4vlvfssqsm7r3j88hlf8smrnpcgq24v9rq9pbr0fyw", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.5.17.a/linux-hardened-5.5.17.a.patch", + "version_suffix": "a" + }, + "5.6.4": { + "sha256": "05wkzh7927n71x4cl69mclc44grqpnx6i65hli470q1rg1qrk26n", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.4.a/linux-hardened-5.6.4.a.patch", + "version_suffix": "a" + } +} diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 2b718551cc7..69b0197d4e6 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -1,4 +1,4 @@ -{ fetchpatch }: +{ lib, fetchpatch, fetchurl }: { bridge_stp_helper = @@ -38,6 +38,21 @@ patch = ./tag-hardened.patch; }; + hardened = let + mkPatch = kernelVersion: patch: let + fullVersion = "${kernelVersion}.${patch.version_suffix}"; + name = "linux-hardened-${fullVersion}"; + in { + inherit name; + patch = fetchurl { + name = "${name}.patch"; + inherit (patch) url sha256; + meta.maintainers = with lib.maintainers; [ emily ]; + }; + }; + patches = builtins.fromJSON (builtins.readFile ./hardened-patches.json); + in lib.mapAttrs mkPatch patches; + # https://bugzilla.kernel.org/show_bug.cgi?id=197591#c6 iwlwifi_mvm_support_version_7_scan_req_umac_fw_command = rec { name = "iwlwifi_mvm_support_version_7_scan_req_umac_fw_command"; diff --git a/pkgs/os-specific/linux/kernel/update-hardened.py b/pkgs/os-specific/linux/kernel/update-hardened.py new file mode 100755 index 00000000000..089e991d06b --- /dev/null +++ b/pkgs/os-specific/linux/kernel/update-hardened.py @@ -0,0 +1,200 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i python -p "python3.withPackages (ps: [ps.PyGithub])" git gnupg + +# This is automatically called by ./update.sh. + +import re +import json +import sys +import os.path +from glob import glob +import subprocess +from tempfile import TemporaryDirectory + +from github import Github + +HERE = os.path.dirname(os.path.realpath(__file__)) +HARDENED_GITHUB_REPO = 'anthraxx/linux-hardened' +HARDENED_TRUSTED_KEY = os.path.join(HERE, 'anthraxx.asc') +HARDENED_PATCHES_PATH = os.path.join(HERE, 'hardened-patches.json') +MIN_KERNEL = (4, 14) + +HARDENED_VERSION_RE = re.compile(r''' + (?P [\d.]+) \. + (?P [a-z]+) +''', re.VERBOSE) + +def parse_version(version): + match = HARDENED_VERSION_RE.fullmatch(version) + if match: + return match.groups() + +def run(*args, **kwargs): + try: + return subprocess.run( + args, **kwargs, + check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, + ) + except subprocess.CalledProcessError as err: + print( + f'error: `{err.cmd}` failed unexpectedly\n' + f'status code: {err.returncode}\n' + f'stdout:\n{err.stdout.decode("utf-8").strip()}\n' + f'stderr:\n{err.stderr.decode("utf-8").strip()}', + file=sys.stderr, + ) + sys.exit(1) + +def nix_prefetch_url(url): + output = run('nix-prefetch-url', '--print-path', url).stdout + return output.decode('utf-8').strip().split('\n') + +def verify_openpgp_signature(*, name, trusted_key, sig_path, data_path): + with TemporaryDirectory(suffix='.nixpkgs-gnupg-home') as gnupg_home: + run('gpg', '--homedir', gnupg_home, '--import', trusted_key) + keyring = os.path.join(gnupg_home, 'pubring.kbx') + try: + subprocess.run( + ('gpgv', '--keyring', keyring, sig_path, data_path), + check=True, stderr=subprocess.PIPE, + ) + return True + except subprocess.CalledProcessError as err: + print( + f'error: signature for {name} failed to verify!', + file=sys.stderr, + ) + print(err.stderr.decode('utf-8'), file=sys.stderr, end='') + return False + +def fetch_patch(*, name, release): + def find_asset(filename): + try: + return next( + asset.browser_download_url + for asset in release.get_assets() + if asset.name == filename + ) + except StopIteration: + raise KeyError(filename) + + try: + patch_url = find_asset(f'{name}.patch') + sig_url = find_asset(f'{name}.patch.sig') + except KeyError: + print(f'error: {name}.patch{{,sig}} not present', file=sys.stderr) + return None + + sha256, patch_path = nix_prefetch_url(patch_url) + _, sig_path = nix_prefetch_url(sig_url) + sig_ok = verify_openpgp_signature( + name=name, + trusted_key=HARDENED_TRUSTED_KEY, + sig_path=sig_path, + data_path=patch_path, + ) + if not sig_ok: + return None + + return { + 'url': patch_url, + 'sha256': sha256, + } + +def commit_patches(*, kernel_version, message): + with open(HARDENED_PATCHES_PATH + '.new', 'w') as new_patches_file: + json.dump(patches, new_patches_file, indent=4, sort_keys=True) + new_patches_file.write('\n') + os.rename(HARDENED_PATCHES_PATH + '.new', HARDENED_PATCHES_PATH) + message = f'linux/hardened-patches/{kernel_version}: {message}' + print(message) + if os.environ.get('COMMIT'): + run( + 'git', '-C', HERE, 'commit', f'--message={message}', + 'hardened-patches.json', + ) + +# Load the existing patches. +with open(HARDENED_PATCHES_PATH) as patches_file: + patches = json.load(patches_file) + +NIX_VERSION_RE = re.compile(r''' + \s* version \s* = + \s* " (?P [^"]*) " + \s* ; \s* \n +''', re.VERBOSE) + +# Get the set of currently packaged kernel versions. +kernel_versions = set() +for filename in os.listdir(HERE): + filename_match = re.fullmatch(r'linux-(\d+)\.(\d+)\.nix', filename) + if filename_match: + if tuple(int(v) for v in filename_match.groups()) < MIN_KERNEL: + continue + with open(os.path.join(HERE, filename)) as nix_file: + for nix_line in nix_file: + match = NIX_VERSION_RE.fullmatch(nix_line) + if match: + kernel_versions.add(match.group('version')) + +# Remove patches for old kernel versions. +for kernel_version in patches.keys() - kernel_versions: + del patches[kernel_version] + commit_patches(kernel_version=kernel_version, message='remove') + +g = Github(os.environ.get('GITHUB_TOKEN')) +repo = g.get_repo(HARDENED_GITHUB_REPO) +releases = repo.get_releases() + +found_kernel_versions = set() +failures = False + +for release in releases: + remaining_kernel_versions = kernel_versions - found_kernel_versions + + if not remaining_kernel_versions: + break + + version = release.tag_name + name = f'linux-hardened-{version}' + version_info = parse_version(version) + if not version_info: + continue + kernel_version, version_suffix = version_info + + if kernel_version in remaining_kernel_versions: + found_kernel_versions.add(kernel_version) + try: + old_version_suffix = patches[kernel_version]['version_suffix'] + old_version = f'{kernel_version}.{old_version_suffix}' + update = old_version_suffix < version_suffix + except KeyError: + update = True + old_version = None + + if update: + patch = fetch_patch(name=name, release=release) + if patch is None: + failures = True + else: + patch['version_suffix'] = version_suffix + patches[kernel_version] = patch + if old_version: + message = f'{old_version} -> {version}' + else: + message = f'init at {version}' + commit_patches(kernel_version=kernel_version, message=message) + +missing_kernel_versions = kernel_versions - patches.keys() + +if missing_kernel_versions: + print( + f'warning: no patches for kernel versions ' + + ', '.join(missing_kernel_versions) + + '\nwarning: consider manually backporting older patches (bump ' + 'JSON key, set version_suffix to "NixOS-a")', + file=sys.stderr, + ) + +if failures: + sys.exit(1) diff --git a/pkgs/os-specific/linux/kernel/update.sh b/pkgs/os-specific/linux/kernel/update.sh index c7fcc07ea0a..c483661b6f5 100755 --- a/pkgs/os-specific/linux/kernel/update.sh +++ b/pkgs/os-specific/linux/kernel/update.sh @@ -60,3 +60,6 @@ done # Update linux-libre COMMIT=1 $NIXPKGS/pkgs/os-specific/linux/kernel/update-libre.sh + +# Update linux-hardened +COMMIT=1 $NIXPKGS/pkgs/os-specific/linux/kernel/update-hardened.py diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5ba9b723edd..b3158b1e9c6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -249,6 +249,11 @@ mapAliases ({ links = links2; # added 2016-01-31 linux_rpi0 = linux_rpi1; linuxPackages_rpi0 = linuxPackages_rpi1; + + # added 2020-04-04 + linuxPackages_testing_hardened = throw "linuxPackages_testing_hardened has been removed, please use linuxPackages_latest_hardened"; + linux_testing_hardened = throw "linux_testing_hardened has been removed, please use linux_latest_hardened"; + loadcaffe = throw "loadcaffe has been removed, as the upstream project has been abandoned"; # added 2020-03-28 lttngTools = lttng-tools; # added 2014-07-31 lttngUst = lttng-ust; # added 2014-07-31 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3cb27cf590e..63eb7e00d60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16978,7 +16978,10 @@ in inherit stdenv; inherit (kernel) version; }; - kernelPatches = kernel.kernelPatches ++ [ kernelPatches.tag_hardened ]; + kernelPatches = kernel.kernelPatches ++ [ + kernelPatches.tag_hardened + kernelPatches.hardened.${kernel.version} + ]; modDirVersionArg = kernel.modDirVersion + "-hardened"; }); @@ -16988,9 +16991,6 @@ in linuxPackages_latest_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_latest); linux_latest_hardened = linuxPackages_latest_hardened.kernel; - linuxPackages_testing_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor pkgs.linux_testing); - linux_testing_hardened = linuxPackages_testing_hardened.kernel; - linuxPackages_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor (pkgs.linux.override { features.xen_dom0=true; })); linuxPackages_latest_xen_dom0_hardened = recurseIntoAttrs (hardenedLinuxPackagesFor (pkgs.linux_latest.override { features.xen_dom0=true; })); -- cgit v1.2.3 From 7d5352df311dec624fed63d6988f9ac999547769 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 5 Apr 2020 05:24:02 +0100 Subject: linux_*_hardened: don't set X86_X32 As far as I can tell, this has never defaulted to on upstream, and our common kernel configuration doesn't turn it on, so the attack surface reduction here is somewhat homeopathic. --- pkgs/os-specific/linux/kernel/hardened-config.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index 3010d87a178..7e6f514e19f 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -19,8 +19,6 @@ assert (versionAtLeast version "4.9"); optionalAttrs (stdenv.hostPlatform.platform.kernelArch == "x86_64") { DEFAULT_MMAP_MIN_ADDR = freeform "65536"; # Prevent allocation of first 64K of memory - # Reduce attack surface by disabling X32 - X86_X32 = no; # Note: this config depends on EXPERT y and so will not take effect, hence # it is left "optional" for now. MODIFY_LDT_SYSCALL = option no; -- cgit v1.2.3 From 3d4c8ae901585b3ad9de8a68df6c3ebaa4bde4df Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 5 Apr 2020 05:28:38 +0100 Subject: linux_*_hardened: don't set VMAP_STACK This has been on by default upstream for as long as it's been an option. --- pkgs/os-specific/linux/kernel/hardened-config.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index 7e6f514e19f..302170f2f5c 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -22,7 +22,6 @@ optionalAttrs (stdenv.hostPlatform.platform.kernelArch == "x86_64") { # Note: this config depends on EXPERT y and so will not take effect, hence # it is left "optional" for now. MODIFY_LDT_SYSCALL = option no; - VMAP_STACK = yes; # Catch kernel stack overflows # Randomize position of kernel and memory. RANDOMIZE_BASE = yes; -- cgit v1.2.3 From 8efe83c22e8c7a33847255bec30c4a9d5be8abe9 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 4 Apr 2020 22:52:42 +0100 Subject: linux_*_hardened: don't set DEFAULT_MMAP_MIN_ADDR Upstreamed in anthraxx/linux-hardened@f1fe0a64dd532551b048d97b35473c25809f7a0f. --- pkgs/os-specific/linux/kernel/hardened-config.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index 302170f2f5c..154365a5be5 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -17,8 +17,6 @@ with (stdenv.lib.kernel.whenHelpers version); assert (versionAtLeast version "4.9"); optionalAttrs (stdenv.hostPlatform.platform.kernelArch == "x86_64") { - DEFAULT_MMAP_MIN_ADDR = freeform "65536"; # Prevent allocation of first 64K of memory - # Note: this config depends on EXPERT y and so will not take effect, hence # it is left "optional" for now. MODIFY_LDT_SYSCALL = option no; -- cgit v1.2.3 From 8c68055432d501d604e906dfca242eed60c48e35 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 4 Apr 2020 22:55:15 +0100 Subject: linux_*_hardened: don't set MODIFY_LDT_SYSCALL Upstreamed in anthraxx/linux-hardened@05644876fa5dc3a67a8ea4b396e2214a2f8e8411. --- pkgs/os-specific/linux/kernel/hardened-config.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index 154365a5be5..75cfd68ef0d 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -17,10 +17,6 @@ with (stdenv.lib.kernel.whenHelpers version); assert (versionAtLeast version "4.9"); optionalAttrs (stdenv.hostPlatform.platform.kernelArch == "x86_64") { - # Note: this config depends on EXPERT y and so will not take effect, hence - # it is left "optional" for now. - MODIFY_LDT_SYSCALL = option no; - # Randomize position of kernel and memory. RANDOMIZE_BASE = yes; RANDOMIZE_MEMORY = yes; -- cgit v1.2.3 From 130f6812be4a3ea5ea7ed5403f1741bf8ffe1e19 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 4 Apr 2020 22:57:15 +0100 Subject: linux_*_hardened: don't set RANDOMIZE_{BASE,MEMORY} These are on by default for x86 in upstream linux-5.6.2, and turned on for arm64 by anthraxx/linux-hardened@90f9670bc3696f564ac2e874a2b80046b90ea49f. --- pkgs/os-specific/linux/kernel/hardened-config.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index 75cfd68ef0d..50bc120ff0f 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -17,10 +17,6 @@ with (stdenv.lib.kernel.whenHelpers version); assert (versionAtLeast version "4.9"); optionalAttrs (stdenv.hostPlatform.platform.kernelArch == "x86_64") { - # Randomize position of kernel and memory. - RANDOMIZE_BASE = yes; - RANDOMIZE_MEMORY = yes; - # Disable legacy virtual syscalls by default (modern glibc use vDSO instead). # # Note that the vanilla default is to *emulate* the legacy vsyscall mechanism, -- cgit v1.2.3 From db6b3275086f2d27d5d419af7f6025cf1fc70d65 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 4 Apr 2020 22:58:45 +0100 Subject: linux_*_hardened: don't set LEGACY_VSYSCALL_NONE Upstreamed in anthraxx/linux-hardened@d300b0fdad706daab3a36a8d23b35ebe03c3fc87. --- pkgs/os-specific/linux/kernel/hardened-config.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index 50bc120ff0f..589dc50892a 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -16,14 +16,7 @@ with (stdenv.lib.kernel.whenHelpers version); assert (versionAtLeast version "4.9"); -optionalAttrs (stdenv.hostPlatform.platform.kernelArch == "x86_64") { - # Disable legacy virtual syscalls by default (modern glibc use vDSO instead). - # - # Note that the vanilla default is to *emulate* the legacy vsyscall mechanism, - # which is supposed to be safer than the native variant (wrt. ret2libc), so - # disabling it mainly helps reduce surface. - LEGACY_VSYSCALL_NONE = yes; -} // { +{ # Report BUG() conditions and kill the offending process. BUG = yes; -- cgit v1.2.3 From 33b94e5a44cbd80af7438353b7cfd9935830a519 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 4 Apr 2020 23:00:52 +0100 Subject: linux_*_hardened: don't set BUG_ON_DATA_CORRUPTION Upstreamed in anthraxx/linux-hardened@3fcd15014c8e99828de0f946611d715411dc611d. --- pkgs/os-specific/linux/kernel/hardened-config.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index 589dc50892a..68a15291747 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -20,8 +20,6 @@ assert (versionAtLeast version "4.9"); # Report BUG() conditions and kill the offending process. BUG = yes; - BUG_ON_DATA_CORRUPTION = whenAtLeast "4.10" yes; - # Safer page access permissions (wrt. code injection). Default on >=4.11. DEBUG_RODATA = whenOlder "4.11" yes; DEBUG_SET_MODULE_RONX = whenOlder "4.11" yes; -- cgit v1.2.3 From 303bb60fb1c5332e478d684cdf382245e57db8a5 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 4 Apr 2020 23:01:32 +0100 Subject: linux_*_hardened: don't set DEBUG_WX Upstreamed in anthraxx/linux-hardened@55ee7417f305835e6e0880ecf0b1aa334f7aabf4. --- pkgs/os-specific/linux/kernel/hardened-config.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index 68a15291747..4e1c79b477e 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -35,7 +35,6 @@ assert (versionAtLeast version "4.9"); SECURITY_SELINUX_DISABLE = whenAtLeast "4.12" no; SECURITY_WRITABLE_HOOKS = whenAtLeast "4.12" (option no); - DEBUG_WX = yes; # boot-time warning on RWX mappings STRICT_KERNEL_RWX = whenAtLeast "4.11" yes; # Stricter /dev/mem -- cgit v1.2.3 From 0611462e3350df51a1eeab9fa72d181730105cb9 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 4 Apr 2020 23:02:31 +0100 Subject: linux_*_hardened: don't set {,IO_}STRICT_DEVMEM STRICT_DEVMEM is on by default in upstream 5.6.2; IO_STRICT_DEVMEM is turned on by anthraxx/linux-hardened@103d23cb6645c1110fa33f2ce1ed1bba2b094081. Note that anthraxx/linux-hardened@db1d27e10e0e624632ecda9e72abb9ab126da4ce disables DEVMEM by default, so this is only relevant if that default is overridden to turn it back on. --- pkgs/os-specific/linux/kernel/hardened-config.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index 4e1c79b477e..14503854d3e 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -37,10 +37,6 @@ assert (versionAtLeast version "4.9"); STRICT_KERNEL_RWX = whenAtLeast "4.11" yes; - # Stricter /dev/mem - STRICT_DEVMEM = option yes; - IO_STRICT_DEVMEM = option yes; - # Perform additional validation of commonly targeted structures. DEBUG_CREDENTIALS = yes; DEBUG_NOTIFIERS = yes; -- cgit v1.2.3 From 3eeb5240ac1f01f2adf8f0947bbb73cf36af8dc4 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 4 Apr 2020 23:04:48 +0100 Subject: linux_*_hardened: don't set DEBUG_LIST Upstreamed in anthraxx/linux-hardened@6b20124185e0548c1791bc8b7fde053de4fda269. --- pkgs/os-specific/linux/kernel/hardened-config.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index 14503854d3e..d322f239c32 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -40,7 +40,6 @@ assert (versionAtLeast version "4.9"); # Perform additional validation of commonly targeted structures. DEBUG_CREDENTIALS = yes; DEBUG_NOTIFIERS = yes; - DEBUG_LIST = yes; DEBUG_PI_LIST = yes; # doesn't BUG() DEBUG_SG = yes; SCHED_STACK_END_CHECK = yes; -- cgit v1.2.3 From 4fb796e34129934ed9c26c64beb1a0f93639957e Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 4 Apr 2020 23:05:28 +0100 Subject: linux_*_hardened: don't set HARDENED_USERCOPY_FALLBACK Upstreamed in anthraxx/linux-hardened@c1fe7a68e368d05e109e69ee3491da69093883a3, anthraxx/linux-hardened@2c553a2bb115211c8e1c97eb8c949320aeb29a1d. --- pkgs/os-specific/linux/kernel/hardened-config.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index d322f239c32..f718235c625 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -46,10 +46,6 @@ assert (versionAtLeast version "4.9"); REFCOUNT_FULL = whenAtLeast "4.13" yes; - # Perform usercopy bounds checking. - HARDENED_USERCOPY = yes; - HARDENED_USERCOPY_FALLBACK = whenAtLeast "4.16" no; # for full whitelist enforcement - # Randomize allocator freelists. SLAB_FREELIST_RANDOM = yes; -- cgit v1.2.3 From 0d5f1697b78a5d8dc7d0f2a25e71ecca4021b257 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 4 Apr 2020 23:06:05 +0100 Subject: linux_*_hardened: don't set SLAB_FREELIST_{RANDOM,HARDENED} Upstreamed in anthraxx/linux-hardened@786126f177aba14110394be49b404beba061292f, anthraxx/linux-hardened@44822ebeb7c3ede030c58cc64fc1c8e8489c9063. --- pkgs/os-specific/linux/kernel/hardened-config.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index f718235c625..20911714b90 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -46,11 +46,6 @@ assert (versionAtLeast version "4.9"); REFCOUNT_FULL = whenAtLeast "4.13" yes; - # Randomize allocator freelists. - SLAB_FREELIST_RANDOM = yes; - - SLAB_FREELIST_HARDENED = whenAtLeast "4.14" yes; - # Randomize page allocator when page_alloc.shuffle=1 SHUFFLE_PAGE_ALLOCATOR = whenAtLeast "5.2" yes; -- cgit v1.2.3 From ed89b5b3f121920b811cfe1e705947fcd7cdb110 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 4 Apr 2020 23:06:40 +0100 Subject: linux_*_hardened: don't set PANIC_ON_OOPS Upstreamed in anthraxx/linux-hardened@366e0216f15b7007c1f8b7ca86df681cbc22b50a. --- pkgs/os-specific/linux/kernel/hardened-config.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index 20911714b90..63ed2219f48 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -61,7 +61,6 @@ assert (versionAtLeast version "4.9"); SECURITY_SAFESETID = whenAtLeast "5.1" yes; # Reboot devices immediately if kernel experiences an Oops. - PANIC_ON_OOPS = yes; PANIC_TIMEOUT = freeform "-1"; GCC_PLUGINS = yes; # Enable gcc plugin options -- cgit v1.2.3 From 7fdfe5381d338c6f8fae6752b69055401e170627 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 4 Apr 2020 23:08:09 +0100 Subject: linux_*_hardened: don't set FORTIFY_SOURCE Upstreamed in anthraxx/linux-hardened@d12c0d5f0c43f299634af7268f63929c1aaa10ee. --- pkgs/os-specific/linux/kernel/hardened-config.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix index 63ed2219f48..95510fe218e 100644 --- a/pkgs/os-specific/linux/kernel/hardened-config.nix +++ b/pkgs/os-specific/linux/kernel/hardened-config.nix @@ -82,7 +82,4 @@ assert (versionAtLeast version "4.9"); CC_STACKPROTECTOR_REGULAR = whenOlder "4.18" no; CC_STACKPROTECTOR_STRONG = whenOlder "4.18" yes; - # Enable compile/run-time buffer overflow detection ala glibc's _FORTIFY_SOURCE - FORTIFY_SOURCE = whenAtLeast "4.13" yes; - } -- cgit v1.2.3 From 3b32cd2a5b951a82e37c2d8f9069ac3f12d62868 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 5 Apr 2020 05:55:58 +0100 Subject: nixos/hardened: don't set slab_nomerge Upstreamed in anthraxx/linux-hardened@df29f9248c6b2459dcaae216dc6f4751fab4ff3b. --- nixos/modules/profiles/hardened.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix index 35743d83134..49cd3504aa0 100644 --- a/nixos/modules/profiles/hardened.nix +++ b/nixos/modules/profiles/hardened.nix @@ -37,9 +37,6 @@ with lib; # Slab/slub sanity checks, redzoning, and poisoning "slub_debug=FZP" - # Disable slab merging to make certain heap overflow attacks harder - "slab_nomerge" - # Overwrite free'd memory "page_poison=1" -- cgit v1.2.3 From cf1bce6a7ada476671277ac5bffe132891ece0d8 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 5 Apr 2020 05:56:58 +0100 Subject: nixos/hardened: don't set vsyscall=none Upstreamed in anthraxx/linux-hardened@d300b0fdad706daab3a36a8d23b35ebe03c3fc87. --- nixos/modules/profiles/hardened.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix index 49cd3504aa0..8a2763faec0 100644 --- a/nixos/modules/profiles/hardened.nix +++ b/nixos/modules/profiles/hardened.nix @@ -40,9 +40,6 @@ with lib; # Overwrite free'd memory "page_poison=1" - # Disable legacy virtual syscalls - "vsyscall=none" - # Enable page allocator randomization "page_alloc.shuffle=1" ]; -- cgit v1.2.3 From 9da578a78f6f442a193bd15af3c1c4544b1ff156 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 5 Apr 2020 04:57:03 +0100 Subject: nixos/hardened: don't set kernel.dmesg_restrict Upstreamed in anthraxx/linux-hardened@e3d3f13ffb1a5ff507a8ecae52e3d1fa05d30a07. --- nixos/modules/profiles/hardened.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix index 8a2763faec0..052909d63f5 100644 --- a/nixos/modules/profiles/hardened.nix +++ b/nixos/modules/profiles/hardened.nix @@ -76,9 +76,6 @@ with lib; # (e.g., parent/child) boot.kernel.sysctl."kernel.yama.ptrace_scope" = mkOverride 500 1; - # Restrict access to kernel ring buffer (information leaks) - boot.kernel.sysctl."kernel.dmesg_restrict" = mkDefault true; - # Hide kptrs even for processes with CAP_SYSLOG boot.kernel.sysctl."kernel.kptr_restrict" = mkOverride 500 2; -- cgit v1.2.3 From 71bbd876b743a98affd89dfe097c15a1048a63bf Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 4 Apr 2020 23:12:06 +0100 Subject: nixos/hardened: don't set kernel.unprivileged_bpf_disabled Upstreamed in anthraxx/linux-hardened@1a3e0c283028533527595a91d9504d2b7eabc977. --- nixos/modules/profiles/hardened.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix index 052909d63f5..8889c6440f4 100644 --- a/nixos/modules/profiles/hardened.nix +++ b/nixos/modules/profiles/hardened.nix @@ -79,10 +79,6 @@ with lib; # Hide kptrs even for processes with CAP_SYSLOG boot.kernel.sysctl."kernel.kptr_restrict" = mkOverride 500 2; - # Unprivileged access to bpf() has been used for privilege escalation in - # the past - boot.kernel.sysctl."kernel.unprivileged_bpf_disabled" = mkDefault true; - # Disable bpf() JIT (to eliminate spray attacks) boot.kernel.sysctl."net.core.bpf_jit_enable" = mkDefault false; -- cgit v1.2.3 From af4f57b2c4b969c9bc72527dbbd970564ee8d90b Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 4 Apr 2020 23:12:44 +0100 Subject: nixos/hardened: don't set net.core.bpf_jit_harden Upstreamed in anthraxx/linux-hardened@82e384401d441d42efad9830ab31650a7ea571db. --- nixos/modules/profiles/hardened.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix index 8889c6440f4..692afbff660 100644 --- a/nixos/modules/profiles/hardened.nix +++ b/nixos/modules/profiles/hardened.nix @@ -82,9 +82,6 @@ with lib; # Disable bpf() JIT (to eliminate spray attacks) boot.kernel.sysctl."net.core.bpf_jit_enable" = mkDefault false; - # ... or at least apply some hardening to it - boot.kernel.sysctl."net.core.bpf_jit_harden" = mkDefault true; - # Raise ASLR entropy for 64bit & 32bit, respectively. # # Note: mmap_rnd_compat_bits may not exist on 64bit. -- cgit v1.2.3 From 46d12cca561165142580ccdc39eb97d0ee5b240d Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 5 Apr 2020 04:07:51 +0100 Subject: nixos/hardened: don't set vm.mmap_rnd{,_compat}_bits Upstreamed in anthraxx/linux-hardened@ae6d85f437dddf8f5a9076019cdfbb7788a9c154. --- nixos/modules/profiles/hardened.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix index 692afbff660..33b62589b99 100644 --- a/nixos/modules/profiles/hardened.nix +++ b/nixos/modules/profiles/hardened.nix @@ -82,12 +82,6 @@ with lib; # Disable bpf() JIT (to eliminate spray attacks) boot.kernel.sysctl."net.core.bpf_jit_enable" = mkDefault false; - # Raise ASLR entropy for 64bit & 32bit, respectively. - # - # Note: mmap_rnd_compat_bits may not exist on 64bit. - boot.kernel.sysctl."vm.mmap_rnd_bits" = mkDefault 32; - boot.kernel.sysctl."vm.mmap_rnd_compat_bits" = mkDefault 16; - # Allowing users to mmap() memory starting at virtual address 0 can turn a # NULL dereference bug in the kernel into code execution with elevated # privilege. Mitigate by enforcing a minimum base addr beyond the NULL memory -- cgit v1.2.3 From cc28d51237d39fa5f7de57f836fe2a0cf46e6182 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 4 Apr 2020 22:52:42 +0100 Subject: nixos/hardened: don't set vm.mmap_min_addr Upstreamed in anthraxx/linux-hardened@f1fe0a64dd532551b048d97b35473c25809f7a0f. --- nixos/modules/profiles/hardened.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix index 33b62589b99..1747e962f02 100644 --- a/nixos/modules/profiles/hardened.nix +++ b/nixos/modules/profiles/hardened.nix @@ -82,16 +82,6 @@ with lib; # Disable bpf() JIT (to eliminate spray attacks) boot.kernel.sysctl."net.core.bpf_jit_enable" = mkDefault false; - # Allowing users to mmap() memory starting at virtual address 0 can turn a - # NULL dereference bug in the kernel into code execution with elevated - # privilege. Mitigate by enforcing a minimum base addr beyond the NULL memory - # space. This breaks applications that require mapping the 0 page, such as - # dosemu or running 16bit applications under wine. It also breaks older - # versions of qemu. - # - # The value is taken from the KSPP recommendations (Debian uses 4096). - boot.kernel.sysctl."vm.mmap_min_addr" = mkDefault 65536; - # Disable ftrace debugging boot.kernel.sysctl."kernel.ftrace_enabled" = mkDefault false; -- cgit v1.2.3 From 84f258bf096275fffbc95328e33ed981a677db68 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 5 Apr 2020 05:04:43 +0100 Subject: nixos/hardened: don't set vm.unprivileged_userfaultfd Upstreamed in anthraxx/linux-hardened@a712392b88b3cbc8385fd97be87a43db2ad7ecf0. --- nixos/modules/profiles/hardened.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix index 1747e962f02..09a1dd54333 100644 --- a/nixos/modules/profiles/hardened.nix +++ b/nixos/modules/profiles/hardened.nix @@ -108,7 +108,4 @@ with lib; # Ignore outgoing ICMP redirects (this is ipv4 only) boot.kernel.sysctl."net.ipv4.conf.all.send_redirects" = mkDefault false; boot.kernel.sysctl."net.ipv4.conf.default.send_redirects" = mkDefault false; - - # Restrict userfaultfd syscalls to processes with the SYS_PTRACE capability - boot.kernel.sysctl."vm.unprivileged_userfaultfd" = mkDefault false; } -- cgit v1.2.3 From ad9bfe2254e6205f94baa9c988063b0737911a23 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 4 Apr 2020 23:13:27 +0100 Subject: nixos/hardened: enable user namespaces for root linux-hardened sets kernel.unprivileged_userns_clone=0 by default; see anthraxx/linux-hardened@104f44058f058a395502192c4939645df6f52ecb. This allows the Nix sandbox to function while reducing the attack surface posed by user namespaces, which allow unprivileged code to exercise lots of root-only code paths and have lead to privilege escalation vulnerabilities in the past. We can safely leave user namespaces on for privileged users, as root already has root privileges, but if you're not running builds on your machine and really want to minimize the kernel attack surface then you can set security.allowUserNamespaces to false. Note that Chrome's sandbox requires either unprivileged CLONE_NEWUSER or setuid, and Firefox's silently reduces the security level if it isn't allowed (see about:support), so desktop users may want to set: boot.kernel.sysctl."kernel.unprivileged_userns_clone" = true; --- nixos/modules/profiles/hardened.nix | 2 -- nixos/tests/hardened.nix | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix index 09a1dd54333..c771a4ed328 100644 --- a/nixos/modules/profiles/hardened.nix +++ b/nixos/modules/profiles/hardened.nix @@ -21,8 +21,6 @@ with lib; security.lockKernelModules = mkDefault true; - security.allowUserNamespaces = mkDefault false; - security.protectKernelImage = mkDefault true; security.allowSimultaneousMultithreading = mkDefault false; diff --git a/nixos/tests/hardened.nix b/nixos/tests/hardened.nix index cbf76f9e558..21bc9308aaa 100644 --- a/nixos/tests/hardened.nix +++ b/nixos/tests/hardened.nix @@ -76,7 +76,8 @@ import ./make-test.nix ({ pkgs, ...} : { # Test userns subtest "userns", sub { - $machine->fail("unshare --user"); + $machine->succeed("unshare --user true"); + $machine->fail("su -l alice -c 'unshare --user true'"); }; # Test dmesg restriction -- cgit v1.2.3 From b0d5032ee4a1cee1fb9e521326114350ad414573 Mon Sep 17 00:00:00 2001 From: Emily Date: Sat, 4 Apr 2020 23:58:54 +0100 Subject: nixos/hardened: add emily to maintainers --- nixos/modules/profiles/hardened.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix index c771a4ed328..ef8c0d74f06 100644 --- a/nixos/modules/profiles/hardened.nix +++ b/nixos/modules/profiles/hardened.nix @@ -7,7 +7,7 @@ with lib; { meta = { - maintainers = [ maintainers.joachifm ]; + maintainers = [ maintainers.joachifm maintainers.emily ]; }; boot.kernelPackages = mkDefault pkgs.linuxPackages_hardened; -- cgit v1.2.3 From fe031d07f82fe87c3f258daf9085040d9ff9e49f Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 5 Apr 2020 00:29:24 +0100 Subject: nixos/tests/hardened: add latestKernel argument --- nixos/tests/all-tests.nix | 1 + nixos/tests/hardened.nix | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 5adfd6afd6a..e52eb0d5482 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -160,6 +160,7 @@ in # kubernetes.e2e should eventually replace kubernetes.rbac when it works #kubernetes.e2e = handleTestOn ["x86_64-linux"] ./kubernetes/e2e.nix {}; kubernetes.rbac = handleTestOn ["x86_64-linux"] ./kubernetes/rbac.nix {}; + latestKernel.hardened = handleTest ./hardened.nix { latestKernel = true; }; latestKernel.login = handleTest ./login.nix { latestKernel = true; }; ldap = handleTest ./ldap.nix {}; leaps = handleTest ./leaps.nix {}; diff --git a/nixos/tests/hardened.nix b/nixos/tests/hardened.nix index 21bc9308aaa..5ed0dfcf9ab 100644 --- a/nixos/tests/hardened.nix +++ b/nixos/tests/hardened.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ pkgs, ...} : { +import ./make-test.nix ({ pkgs, latestKernel ? false, ... } : { name = "hardened"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ joachifm ]; @@ -10,6 +10,8 @@ import ./make-test.nix ({ pkgs, ...} : { { users.users.alice = { isNormalUser = true; extraGroups = [ "proc" ]; }; users.users.sybil = { isNormalUser = true; group = "wheel"; }; imports = [ ../modules/profiles/hardened.nix ]; + boot.kernelPackages = + lib.mkIf latestKernel pkgs.linuxPackages_latest_hardened; environment.memoryAllocator.provider = "graphene-hardened"; nix.useSandbox = false; virtualisation.emptyDiskImages = [ 4096 ]; @@ -23,7 +25,9 @@ import ./make-test.nix ({ pkgs, ...} : { options = [ "noauto" ]; }; }; - boot.extraModulePackages = [ config.boot.kernelPackages.wireguard ]; + boot.extraModulePackages = + optional (versionOlder config.boot.kernelPackages.kernel.version "5.6") + config.boot.kernelPackages.wireguard; boot.kernelModules = [ "wireguard" ]; }; -- cgit v1.2.3 From e133e396df9f5a466f2de592dd0b429dee62c959 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 5 Apr 2020 00:30:30 +0100 Subject: nixos/release-{small,combined}: add latestKernel.login Seems like a good idea to ensure that you can always use the latest stable upstream kernel. --- nixos/release-combined.nix | 1 + nixos/release-small.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 02f19610f8a..9d16c013f46 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -96,6 +96,7 @@ in rec { (onFullSupported "nixos.tests.keymap.dvp") (onFullSupported "nixos.tests.keymap.neo") (onFullSupported "nixos.tests.keymap.qwertz") + (onFullSupported "nixos.tests.latestKernel.login") (onFullSupported "nixos.tests.lightdm") (onFullSupported "nixos.tests.login") (onFullSupported "nixos.tests.misc") diff --git a/nixos/release-small.nix b/nixos/release-small.nix index 6da2c59cedd..ed7bbd81138 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -101,6 +101,7 @@ in rec { "nixos.tests.installer.separateBoot.x86_64-linux" "nixos.tests.installer.simple.x86_64-linux" "nixos.tests.ipv6.x86_64-linux" + "nixos.tests.latestKernel.login.x86_64-linux" "nixos.tests.login.x86_64-linux" "nixos.tests.misc.x86_64-linux" "nixos.tests.nat.firewall-conntrack.x86_64-linux" -- cgit v1.2.3 From 2e31fb407eeea4ffb8428634f3c5695b747b7ec5 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 5 Apr 2020 00:32:38 +0100 Subject: nixos/release-combined: add {,latestKernel.}hardened These now depend on an external patch set; add them to the release tests to ensure that the build doesn't break silently as new kernel updates are merged. --- nixos/release-combined.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 9d16c013f46..87783c66095 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -75,6 +75,7 @@ in rec { (onFullSupported "nixos.tests.fontconfig-default-fonts") (onFullSupported "nixos.tests.gnome3") (onFullSupported "nixos.tests.gnome3-xorg") + (onFullSupported "nixos.tests.hardened") (onSystems ["x86_64-linux"] "nixos.tests.hibernate") (onFullSupported "nixos.tests.i3wm") (onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSimple") @@ -96,6 +97,7 @@ in rec { (onFullSupported "nixos.tests.keymap.dvp") (onFullSupported "nixos.tests.keymap.neo") (onFullSupported "nixos.tests.keymap.qwertz") + (onFullSupported "nixos.tests.latestKernel.hardened") (onFullSupported "nixos.tests.latestKernel.login") (onFullSupported "nixos.tests.lightdm") (onFullSupported "nixos.tests.login") -- cgit v1.2.3 From ba8c11651963c0182658d5ad9cfd70b24c4f64d2 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Fri, 17 Apr 2020 11:35:16 -0400 Subject: mesa-glu: use HTTPS instead of FTP FTP is often blocked by firewalls and is generally slower and less secure than HTTPS. No change to `src` hash. --- pkgs/development/libraries/mesa-glu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mesa-glu/default.nix b/pkgs/development/libraries/mesa-glu/default.nix index adcfeead487..9679ddb94e8 100644 --- a/pkgs/development/libraries/mesa-glu/default.nix +++ b/pkgs/development/libraries/mesa-glu/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "9.0.1"; src = fetchurl { - url = "ftp://ftp.freedesktop.org/pub/mesa/${pname}/${pname}-${version}.tar.xz"; + url = "https://mesa.freedesktop.org/archive/${pname}/${pname}-${version}.tar.xz"; sha256 = "1g2m634p73mixkzv1qz1d0flwm390ydi41bwmchiqvdssqnlqnpv"; }; -- cgit v1.2.3 From 85897a44234a07941df7e402b800ba9e3cad0642 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 18 Mar 2020 10:47:24 +0800 Subject: crystal: build using Makefile or shards if available --- .../compilers/crystal/build-package.nix | 150 ++++++++++++++------- 1 file changed, 105 insertions(+), 45 deletions(-) diff --git a/pkgs/development/compilers/crystal/build-package.nix b/pkgs/development/compilers/crystal/build-package.nix index 8ffa89a11b4..9cf5701d12f 100644 --- a/pkgs/development/compilers/crystal/build-package.nix +++ b/pkgs/development/compilers/crystal/build-package.nix @@ -1,6 +1,9 @@ -{ stdenv, lib, crystal, linkFarm, fetchFromGitHub }: -{ # Generate shards.nix with `nix-shell -p crystal2nix --run crystal2nix` in the projects root - shardsFile ? null +{ stdenv, lib, crystal, shards, git, pkgconfig, which, linkFarm, fetchFromGitHub }: +{ + # Some projects do not include a lock file, so you can pass one + lockFile ? null + # Generate shards.nix with `nix-shell -p crystal2nix --run crystal2nix` in the projects root +, shardsFile ? null # Specify binaries to build in the form { foo.src = "src/foo.cr"; } # The default `crystal build` options can be overridden with { foo.options = [ "--no-debug" ]; } , crystalBinaries ? {} @@ -9,45 +12,102 @@ let mkDerivationArgs = builtins.removeAttrs args [ "shardsFile" "crystalBinaries" ]; - crystalLib = linkFarm "crystal-lib" (lib.mapAttrsToList (name: value: { - inherit name; - path = fetchFromGitHub value; - }) (import shardsFile)); - - defaultOptions = [ "--release" "--progress" "--no-debug" "--verbose" ]; - -in stdenv.mkDerivation (mkDerivationArgs // { - - configurePhase = args.configurePhase or '' - runHook preConfigure - ${lib.optionalString (shardsFile != null) "ln -s ${crystalLib} lib"} - runHook postConfigure - ''; - - buildInputs = args.buildInputs or [] ++ [ crystal ]; - - buildPhase = args.buildPhase or '' - runHook preBuild - ${lib.concatStringsSep "\n" (lib.mapAttrsToList (bin: attrs: '' - crystal ${lib.escapeShellArgs ([ - "build" - "-o" bin - (attrs.src or (throw "No source file for crystal binary ${bin} provided")) - ] ++ attrs.options or defaultOptions)} - '') crystalBinaries)} - runHook postBuild - ''; - - installPhase = args.installPhase or '' - runHook preInstall - mkdir -p "$out/bin" - ${lib.concatMapStringsSep "\n" (bin: '' - mv ${lib.escapeShellArgs [ bin "${placeholder "out"}/bin/${bin}" ]} - '') (lib.attrNames crystalBinaries)} - runHook postInstall - ''; - - meta = args.meta or {} // { - platforms = args.meta.platforms or crystal.meta.platforms; - }; -}) + crystalLib = linkFarm "crystal-lib" ( + lib.mapAttrsToList ( + name: value: { + inherit name; + path = fetchFromGitHub value; + } + ) (import shardsFile) + ); + + # we previously had --no-debug here but that is not recommended by upstream + defaultOptions = [ "--release" "--progress" "--verbose" ]; + + buildDirectly = shardsFile == null || crystalBinaries != {}; +in +stdenv.mkDerivation ( + mkDerivationArgs // { + + configurePhase = args.configurePhase or '' + runHook preConfigure + + ${lib.optionalString (lockFile != null) "ln -s ${lockFile} ./shard.lock"} + ${lib.optionalString (shardsFile != null) "ln -s ${crystalLib} lib"} + + runHook postConfigure + ''; + + CRFLAGS = lib.concatStringsSep " " defaultOptions; + + buildInputs = args.buildInputs or [] ++ [ crystal shards ]; + + nativeBuildInputs = args.nativeBuildInputs or [] ++ [ git pkgconfig which ]; + + buildPhase = args.buildPhase or ( + '' + runHook preBuild + + if [ -e Makefile ]; then + echo " ** building with make" + + make ''${buildTargets:-build} $buildFlags + else + '' + ( + if buildDirectly then '' + echo " ** building with crystal" + + ${lib.concatStringsSep "\n" ( + lib.mapAttrsToList ( + bin: attrs: '' + crystal ${lib.escapeShellArgs ( + [ + "build" + "-o" + bin + (attrs.src or (throw "No source file for crystal binary ${bin} provided")) + ] ++ attrs.options or defaultOptions + )} + '' + ) crystalBinaries + )} + '' else '' + echo " ** building with shards" + shards build --local --production ${lib.concatStringsSep " " defaultOptions} + '' + ) + '' + fi + + runHook postBuild + '' + ); + + installPhase = args.installPhase or ( + '' + runHook preInstall + + if [ -e Makefile ]; then + make ''${installTargets:-install} $installFlags + else + '' + ( + if buildDirectly then + lib.concatMapStringsSep "\n" ( + bin: '' + install -Dm555 ${lib.escapeShellArgs [ bin "${placeholder "out"}/bin/${bin}" ]} + '' + ) (lib.attrNames crystalBinaries) + else '' + shards install + '' + ) + '' + fi + + runHook postInstall + '' + ); + + meta = args.meta or {} // { + platforms = args.meta.platforms or crystal.meta.platforms; + }; + } +) -- cgit v1.2.3 From dce6dd3345d700748de9bce948615985fd57575b Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Fri, 17 Apr 2020 18:18:36 +0200 Subject: Revert "crystal: build using Makefile or shards if available" This reverts commit 2ec0ad59849ee1a652a6534a2d2672fdb7b5fed5. --- .../compilers/crystal/build-package.nix | 150 +++++++-------------- 1 file changed, 45 insertions(+), 105 deletions(-) diff --git a/pkgs/development/compilers/crystal/build-package.nix b/pkgs/development/compilers/crystal/build-package.nix index 9cf5701d12f..8ffa89a11b4 100644 --- a/pkgs/development/compilers/crystal/build-package.nix +++ b/pkgs/development/compilers/crystal/build-package.nix @@ -1,9 +1,6 @@ -{ stdenv, lib, crystal, shards, git, pkgconfig, which, linkFarm, fetchFromGitHub }: -{ - # Some projects do not include a lock file, so you can pass one - lockFile ? null - # Generate shards.nix with `nix-shell -p crystal2nix --run crystal2nix` in the projects root -, shardsFile ? null +{ stdenv, lib, crystal, linkFarm, fetchFromGitHub }: +{ # Generate shards.nix with `nix-shell -p crystal2nix --run crystal2nix` in the projects root + shardsFile ? null # Specify binaries to build in the form { foo.src = "src/foo.cr"; } # The default `crystal build` options can be overridden with { foo.options = [ "--no-debug" ]; } , crystalBinaries ? {} @@ -12,102 +9,45 @@ let mkDerivationArgs = builtins.removeAttrs args [ "shardsFile" "crystalBinaries" ]; - crystalLib = linkFarm "crystal-lib" ( - lib.mapAttrsToList ( - name: value: { - inherit name; - path = fetchFromGitHub value; - } - ) (import shardsFile) - ); - - # we previously had --no-debug here but that is not recommended by upstream - defaultOptions = [ "--release" "--progress" "--verbose" ]; - - buildDirectly = shardsFile == null || crystalBinaries != {}; -in -stdenv.mkDerivation ( - mkDerivationArgs // { - - configurePhase = args.configurePhase or '' - runHook preConfigure - - ${lib.optionalString (lockFile != null) "ln -s ${lockFile} ./shard.lock"} - ${lib.optionalString (shardsFile != null) "ln -s ${crystalLib} lib"} - - runHook postConfigure - ''; - - CRFLAGS = lib.concatStringsSep " " defaultOptions; - - buildInputs = args.buildInputs or [] ++ [ crystal shards ]; - - nativeBuildInputs = args.nativeBuildInputs or [] ++ [ git pkgconfig which ]; - - buildPhase = args.buildPhase or ( - '' - runHook preBuild - - if [ -e Makefile ]; then - echo " ** building with make" - - make ''${buildTargets:-build} $buildFlags - else - '' + ( - if buildDirectly then '' - echo " ** building with crystal" - - ${lib.concatStringsSep "\n" ( - lib.mapAttrsToList ( - bin: attrs: '' - crystal ${lib.escapeShellArgs ( - [ - "build" - "-o" - bin - (attrs.src or (throw "No source file for crystal binary ${bin} provided")) - ] ++ attrs.options or defaultOptions - )} - '' - ) crystalBinaries - )} - '' else '' - echo " ** building with shards" - shards build --local --production ${lib.concatStringsSep " " defaultOptions} - '' - ) + '' - fi - - runHook postBuild - '' - ); - - installPhase = args.installPhase or ( - '' - runHook preInstall - - if [ -e Makefile ]; then - make ''${installTargets:-install} $installFlags - else - '' + ( - if buildDirectly then - lib.concatMapStringsSep "\n" ( - bin: '' - install -Dm555 ${lib.escapeShellArgs [ bin "${placeholder "out"}/bin/${bin}" ]} - '' - ) (lib.attrNames crystalBinaries) - else '' - shards install - '' - ) + '' - fi - - runHook postInstall - '' - ); - - meta = args.meta or {} // { - platforms = args.meta.platforms or crystal.meta.platforms; - }; - } -) + crystalLib = linkFarm "crystal-lib" (lib.mapAttrsToList (name: value: { + inherit name; + path = fetchFromGitHub value; + }) (import shardsFile)); + + defaultOptions = [ "--release" "--progress" "--no-debug" "--verbose" ]; + +in stdenv.mkDerivation (mkDerivationArgs // { + + configurePhase = args.configurePhase or '' + runHook preConfigure + ${lib.optionalString (shardsFile != null) "ln -s ${crystalLib} lib"} + runHook postConfigure + ''; + + buildInputs = args.buildInputs or [] ++ [ crystal ]; + + buildPhase = args.buildPhase or '' + runHook preBuild + ${lib.concatStringsSep "\n" (lib.mapAttrsToList (bin: attrs: '' + crystal ${lib.escapeShellArgs ([ + "build" + "-o" bin + (attrs.src or (throw "No source file for crystal binary ${bin} provided")) + ] ++ attrs.options or defaultOptions)} + '') crystalBinaries)} + runHook postBuild + ''; + + installPhase = args.installPhase or '' + runHook preInstall + mkdir -p "$out/bin" + ${lib.concatMapStringsSep "\n" (bin: '' + mv ${lib.escapeShellArgs [ bin "${placeholder "out"}/bin/${bin}" ]} + '') (lib.attrNames crystalBinaries)} + runHook postInstall + ''; + + meta = args.meta or {} // { + platforms = args.meta.platforms or crystal.meta.platforms; + }; +}) -- cgit v1.2.3 From 40f3faedbdeecc21ddc784019433e20e0dd82453 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 17 Apr 2020 12:41:24 -0400 Subject: nixos/manual: 19.09 -> 20.03 --- nixos/doc/manual/installation/upgrading.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml index 92864cf2557..e5e02aa0752 100644 --- a/nixos/doc/manual/installation/upgrading.xml +++ b/nixos/doc/manual/installation/upgrading.xml @@ -14,7 +14,7 @@ Stable channels, such as nixos-19.09. + xlink:href="https://nixos.org/channels/nixos-20.03">nixos-20.03. These only get conservative bug fixes and package upgrades. For instance, a channel update may cause the Linux kernel on your system to be upgraded from 4.19.34 to 4.19.38 (a minor bug fix), but not from @@ -38,7 +38,7 @@ Small channels, such as nixos-19.09-small + xlink:href="https://nixos.org/channels/nixos-20.03-small">nixos-20.03-small or nixos-unstable-small. @@ -63,8 +63,8 @@ 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 19.09 ISO, you will be subscribed to the - nixos-19.09 channel. To see which NixOS channel you’re + installed from a 20.03 ISO, you will be subscribed to the + nixos-20.03 channel. To see which NixOS channel you’re subscribed to, run the following as root: # nix-channel --list | grep nixos @@ -75,13 +75,13 @@ nixos https://nixos.org/channels/nixos-unstable # nix-channel --add https://nixos.org/channels/channel-name nixos (Be sure to include the nixos parameter at the end.) For - instance, to use the NixOS 19.09 stable channel: + instance, to use the NixOS 20.03 stable channel: -# nix-channel --add https://nixos.org/channels/nixos-19.09 nixos +# nix-channel --add https://nixos.org/channels/nixos-20.03 nixos If you have a server, you may want to use the “small” channel instead: -# nix-channel --add https://nixos.org/channels/nixos-19.09-small nixos +# nix-channel --add https://nixos.org/channels/nixos-20.03-small nixos And if you want to live on the bleeding edge: @@ -132,7 +132,7 @@ nixos https://nixos.org/channels/nixos-unstable kernel, initrd or kernel modules. You can also specify a channel explicitly, e.g. - = https://nixos.org/channels/nixos-19.09; + = https://nixos.org/channels/nixos-20.03;
-- cgit v1.2.3 From 192485f8fab8bd7dce972ff46aa5d8012d5adc09 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 17 Apr 2020 18:02:46 +0200 Subject: neomutt: 20200320 -> 20200417 https://github.com/neomutt/neomutt/releases/tag/20200417 To fix the tests, I had to copy the recently created `neomutt-test-files`[1] repository into the build-environment. Also applied a patch from master[2] which ensures that the `change-folder` macro actually switches to the specified folder. [1] https://github.com/neomutt/neomutt-test-files [2] https://github.com/neomutt/neomutt/commit/9e7537caddb9c6adc720bb3322a7512cf51ab025 --- .../networking/mailreaders/neomutt/default.nix | 27 ++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index e554e91a39b..612af14b87f 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,19 +1,29 @@ { stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, writeScript , ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl , lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mailcap, runtimeShell, sqlite, zlib +, fetchpatch }: stdenv.mkDerivation rec { - version = "20200320"; + version = "20200417"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "06xcl9pr8dna4kqjaqm7ss50gdy185425bwl31i0xs3l11cyjap4"; + sha256 = "0s7943r2s14kavyjf7i70vca252l626539i09a9vk0i9sfi35vx5"; }; + patches = [ + # Remove on next release. Fixes the `change-folder` + # macro (https://github.com/neomutt/neomutt/issues/2268) + (fetchpatch { + url = "https://github.com/neomutt/neomutt/commit/9e7537caddb9c6adc720bb3322a7512cf51ab025.patch"; + sha256 = "1vmlvgnhx1ra3rnyjkpkv6lrqw8xfh2kkmqp43fqn9lnk3pkjxvv"; + }) + ]; + buildInputs = [ cyrus_sasl gss gpgme kerberos libidn ncurses notmuch openssl perl lmdb @@ -75,7 +85,20 @@ stdenv.mkDerivation rec { doCheck = true; + preCheck = '' + cp -r ${fetchFromGitHub { + owner = "neomutt"; + repo = "neomutt-test-files"; + rev = "1ee274e9ae1330fb901eb7b8275b3079d7869222"; + sha256 = "0dhilz4rr7616jh8jcvh50a3rr09in43nsv72mm6f3vfklcqincp"; + }} $(pwd)/test-files + (cd test-files && ./setup.sh) + + export NEOMUTT_TEST_DIR=$(pwd)/test-files + ''; + checkTarget = "test"; + postCheck = "unset NEOMUTT_TEST_DIR"; meta = with stdenv.lib; { description = "A small but very powerful text-based mail client"; -- cgit v1.2.3 From 39b1de0fbfe1b6a642b2600799488223065dcfcc Mon Sep 17 00:00:00 2001 From: Tony O <822863+bqv@users.noreply.github.com> Date: Fri, 17 Apr 2020 19:03:26 +0100 Subject: sv-kalendar: fix meta --- pkgs/applications/editors/emacs-modes/sv-kalender/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix b/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix index bcd947983a3..211be0a9089 100644 --- a/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix +++ b/pkgs/applications/editors/emacs-modes/sv-kalender/default.nix @@ -17,6 +17,6 @@ trivialBuild { homepage = "http://bigwalter.net/daniel/elisp/sv-kalender.el"; platforms = platforms.all; license = licenses.gpl3Plus; - maintainers = [ maintainer.rycee ]; + maintainers = [ maintainers.rycee ]; }; } -- cgit v1.2.3 From 572e8f6008363239daf0755ef3dee353b7be272f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 13 Apr 2020 21:44:28 +0200 Subject: LTS Haskell 15.8 --- .../haskell-modules/configuration-hackage2nix.yaml | 41 ++++++++++++---------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 35624f989c6..1a45354cc63 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -72,7 +72,7 @@ default-package-overrides: # gi-gdkx11-4.x requires gtk-4.x, which is still under development and # not yet available in Nixpkgs - gi-gdkx11 < 4 - # LTS Haskell 15.7 + # LTS Haskell 15.8 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -346,7 +346,7 @@ default-package-overrides: - buffer-builder ==0.2.4.7 - buffer-pipe ==0.0 - bugsnag-hs ==0.1.0.0 - - butcher ==1.3.2.3 + - butcher ==1.3.3.0 - bv ==0.5 - bv-little ==1.1.1 - byteable ==0.1.1 @@ -556,10 +556,10 @@ default-package-overrides: - data-default-instances-dlist ==0.0.1 - data-default-instances-old-locale ==0.0.1 - data-diverse ==4.7.0.0 - - datadog ==0.2.4.0 - - data-dword ==0.3.1.3 + - datadog ==0.2.5.0 + - data-dword ==0.3.2 - data-endian ==0.1.1 - - data-fix ==0.2.0 + - data-fix ==0.2.1 - data-has ==0.3.0.0 - data-interval ==2.0.1 - data-inttrie ==0.1.4 @@ -613,7 +613,7 @@ default-package-overrides: - disk-free-space ==0.1.0.1 - distributed-closure ==0.4.2.0 - distribution-opensuse ==1.1.1 - - distributive ==0.6.1 + - distributive ==0.6.2 - dl-fedora ==0.7.4 - dlist ==0.8.0.8 - dlist-instances ==0.1.1.1 @@ -668,7 +668,7 @@ default-package-overrides: - emojis ==0.1 - enclosed-exceptions ==1.0.3 - ENIG ==0.0.1.0 - - entropy ==0.4.1.5 + - entropy ==0.4.1.6 - enummapset ==0.6.0.2 - enumset ==0.0.5 - enum-subset-generate ==0.1.0.0 @@ -706,7 +706,7 @@ default-package-overrides: - extensible-exceptions ==0.1.1.4 - extra ==1.6.21 - extractable-singleton ==0.0.1 - - extrapolate ==0.4.1 + - extrapolate ==0.4.2 - fail ==4.9.0.0 - failable ==1.2.4.0 - fakedata ==0.5.0 @@ -750,6 +750,7 @@ default-package-overrides: - flow ==1.0.20 - flush-queue ==1.0.0 - fmlist ==0.9.3 + - fmt ==0.6.1.2 - fn ==0.3.0.2 - focus ==1.0.1.3 - focuslist ==0.1.0.2 @@ -908,7 +909,7 @@ default-package-overrides: - hashmap ==1.3.3 - hashtables ==1.2.3.4 - haskeline ==0.7.5.0 - - haskell-gi ==0.23.0 + - haskell-gi ==0.23.1 - haskell-gi-base ==0.23.0 - haskell-gi-overloading ==1.0 - haskell-import-graph ==1.0.4 @@ -922,7 +923,7 @@ default-package-overrides: - haskell-src-meta ==0.8.5 - haskey-btree ==0.3.0.1 - haskoin-core ==0.10.1 - - haskoin-node ==0.9.16 + - haskoin-node ==0.9.21 - hasql ==1.4.2 - hasql-optparse-applicative ==0.3.0.5 - hasql-pool ==0.5.1 @@ -977,6 +978,7 @@ default-package-overrides: - hourglass ==0.2.12 - hourglass-orphans ==0.1.0.0 - hp2pretty ==0.9 + - hpack ==0.33.0 - hpc-codecov ==0.1.0.0 - hreader ==1.1.0 - hreader-lens ==0.1.3.0 @@ -1122,7 +1124,7 @@ default-package-overrides: - inline-c ==0.9.1.0 - inline-c-cpp ==0.4.0.2 - insert-ordered-containers ==0.2.3 - - inspection-testing ==0.4.2.2 + - inspection-testing ==0.4.2.4 - instance-control ==0.1.2.0 - int-cast ==0.2.0.0 - integer-logarithms ==1.0.3 @@ -1501,7 +1503,7 @@ default-package-overrides: - pandoc ==2.9.1.1 - pandoc-citeproc ==0.16.4.1 - pandoc-csv2table ==1.0.8 - - pandoc-plot ==0.2.1.0 + - pandoc-plot ==0.2.2.0 - pandoc-pyplot ==2.3.0.1 - pandoc-types ==1.20 - papillon ==0.1.1.1 @@ -1721,6 +1723,7 @@ default-package-overrides: - regex-posix ==0.96.0.0 - regex-tdfa ==1.3.1.0 - regex-with-pcre ==1.1.0.0 + - registry ==0.1.7.1 - reinterpret-cast ==0.1.0 - relapse ==1.0.0.0 - relational-query ==0.12.2.2 @@ -1738,7 +1741,7 @@ default-package-overrides: - resourcet ==1.2.3 - result ==0.2.6.0 - rethinkdb-client-driver ==0.0.25 - - retry ==0.8.1.0 + - retry ==0.8.1.1 - rev-state ==0.1.2 - rfc1751 ==0.1.2 - rfc5051 ==0.1.0.4 @@ -1875,7 +1878,7 @@ default-package-overrides: - simplistic-generics ==0.1.0.0 - since ==0.0.0 - singleton-bool ==0.1.5 - - singleton-nats ==0.4.4 + - singleton-nats ==0.4.5 - singletons ==2.6 - singletons-presburger ==0.3.0.0 - siphash ==1.0.3 @@ -1908,7 +1911,7 @@ default-package-overrides: - sparse-tensor ==0.2.1.3 - spatial-math ==0.5.0.1 - special-values ==0.1.0.0 - - speculate ==0.4.1 + - speculate ==0.4.2 - speedy-slice ==0.3.0 - Spintax ==0.3.4 - splice ==0.6.1.1 @@ -2060,7 +2063,7 @@ default-package-overrides: - th-expand-syns ==0.4.6.0 - th-extras ==0.0.0.4 - th-lift ==0.8.1 - - th-lift-instances ==0.1.14 + - th-lift-instances ==0.1.15 - th-orphans ==0.13.9 - th-printf ==0.7 - thread-hierarchy ==0.3.0.1 @@ -2102,7 +2105,7 @@ default-package-overrides: - topograph ==1.0.0.1 - torsor ==0.1 - tostring ==0.2.1.1 - - tracing ==0.0.4.0 + - tracing ==0.0.5.1 - transaction ==0.1.1.3 - transformers-base ==0.4.5.2 - transformers-bifunctors ==0.1 @@ -2208,7 +2211,7 @@ default-package-overrides: - validity-uuid ==0.1.0.3 - validity-vector ==0.2.0.3 - valor ==0.1.0.0 - - vault ==0.3.1.3 + - vault ==0.3.1.4 - vec ==0.3 - vector ==0.12.1.2 - vector-algorithms ==0.8.0.3 @@ -2245,7 +2248,7 @@ default-package-overrides: - wai-session ==0.3.3 - wai-slack-middleware ==0.2.0 - wai-websockets ==3.0.1.2 - - warp ==3.3.9 + - warp ==3.3.10 - warp-tls ==3.2.11 - warp-tls-uid ==0.2.0.6 - wave ==0.2.0 -- cgit v1.2.3 From 629af9f5189256436eba7c9dec176d5f8c2ecb9c Mon Sep 17 00:00:00 2001 From: Remo Date: Tue, 14 Apr 2020 11:28:31 +0200 Subject: hackage2nix: unbreak hasql-pool --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a11166c5ede..50148b835c0 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1501,4 +1501,7 @@ self: super: { # Fixed at head, but hasn't cut a release in awhile. darcs = doJailbreak super.darcs; + # Test suite requires running a database server. Testing is done upstream. + hasql-pool = dontCheck super.hasql-pool; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 1a45354cc63..49b6230a969 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5621,7 +5621,6 @@ broken-packages: - hasql-migration - hasql-notifications - hasql-optparse-applicative - - hasql-pool - hasql-postgres - hasql-postgres-options - hasql-simple -- cgit v1.2.3 From 83d84e6233c63610ce875d50ae6d19457ea9b81e Mon Sep 17 00:00:00 2001 From: Remo Date: Tue, 14 Apr 2020 16:52:58 +0200 Subject: hackage2nix: unbreak postgrest --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 49b6230a969..1bd8aa4af61 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -8286,7 +8286,6 @@ broken-packages: - postgresql-simple-typed - postgresql-typed - postgresql-typed-lifted - - postgrest - postgrest-ws - postie - postmark -- cgit v1.2.3 From fd63776ff4b46d5269bcf1734708f2b16a2a5ea7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 17 Apr 2020 20:22:52 +0200 Subject: hackage2nix: update list of broken builds to fix evaluation errors --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 1bd8aa4af61..1ecfe0196cc 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -7844,6 +7844,7 @@ broken-packages: - onama - ONC-RPC - oneormore + - online-csv - onpartitions - OnRmt - onu-course @@ -8906,6 +8907,7 @@ broken-packages: - saferoute - sai-shape-syb - sajson + - sak - salak-toml - Salsa - saltine-quickcheck -- cgit v1.2.3 From fd1103227dd7e386fd102a52dcc24a4511bcb750 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 11 Apr 2020 02:31:03 +0200 Subject: hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.1 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/fcda2563cdac2c1d7e017a90b4fdfa300eb72eb1. --- .../haskell-modules/hackage-packages.nix | 2897 +++++++++++++++----- 1 file changed, 2194 insertions(+), 703 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index b7ce5ef6377..a33839a6227 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -6752,8 +6752,8 @@ self: { }: mkDerivation { pname = "GPipe"; - version = "2.2.4"; - sha256 = "0l3s3j41fwwcjdc0nymzqmdsd7wlvaqyn1lg7n1wdx65wy4iz6j0"; + version = "2.2.5"; + sha256 = "1k4hxgd5vpdl9fqjk3i81rcyqn53giahcpygb9lm3nyfvxzzwg3z"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base Boolean containers exception-transformers gl hashtables linear @@ -7201,8 +7201,8 @@ self: { ({ mkDerivation, base, mtl, split, threepenny-gui }: mkDerivation { pname = "Gleam"; - version = "0.1.0.0"; - sha256 = "0j822hblrd0p343w9ds0fa75s3grgpiyv180hsw3ld3pj30fcc8b"; + version = "0.1.0.2"; + sha256 = "0n0svc0lq6lgas834y8jfsqygb6qwjwhsrgxz8b7hypiqg3xjbhv"; libraryHaskellDepends = [ base mtl split threepenny-gui ]; description = "HTML Canvas graphics, animations and simulations"; license = stdenv.lib.licenses.bsd3; @@ -8680,16 +8680,14 @@ self: { }) {}; "HListPP" = callPackage - ({ mkDerivation, applicative-quoters, base, regex-applicative }: + ({ mkDerivation, base, regex-applicative }: mkDerivation { pname = "HListPP"; - version = "0.2.1"; - sha256 = "0rqn8rybp0mi86yyqhclqqrblcn9l04wiq4yv8xy9x1852ff4588"; + version = "0.2.2"; + sha256 = "009i1i4daa6cb8pix0545gs5w5c7hsxwiqz98gdsc6awszxbhg7l"; isLibrary = false; isExecutable = true; - executableHaskellDepends = [ - applicative-quoters base regex-applicative - ]; + executableHaskellDepends = [ base regex-applicative ]; description = "A preprocessor for HList labelable labels"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -12591,6 +12589,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ListLike_4_7" = callPackage + ({ mkDerivation, array, base, bytestring, containers, deepseq + , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string + , vector + }: + mkDerivation { + pname = "ListLike"; + version = "4.7"; + sha256 = "1209xa73cxzajp8wx2bw2017vjb84yibm5q5sp0i0ifhi5syv4jl"; + libraryHaskellDepends = [ + array base bytestring containers deepseq dlist fmlist text + utf8-string vector + ]; + testHaskellDepends = [ + array base bytestring containers dlist fmlist HUnit QuickCheck + random text utf8-string vector + ]; + description = "Generalized support for list-like structures"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ListT" = callPackage ({ mkDerivation, base, smallcheck, tasty, tasty-smallcheck , transformers, util @@ -12647,6 +12667,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "LiterateMarkdown" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "LiterateMarkdown"; + version = "0.1.0.0"; + sha256 = "0v9j7kqjvkrafxl4ahfqj1xvigim9vnd3kflgqagzccrgx9kz5gv"; + isLibrary = false; + isExecutable = true; + libraryHaskellDepends = [ base ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + doHaddock = false; + description = "Converter to convert from .lhs to .md and vice versa."; + license = stdenv.lib.licenses.mit; + }) {}; + "Logic" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -13277,8 +13313,8 @@ self: { }: mkDerivation { pname = "MiniAgda"; - version = "0.2019.12.13"; - sha256 = "15v5yijhylrwy0lc4n9a8p75dadr9xc57xajgir3jg618l0wh5lc"; + version = "0.2020.4.14"; + sha256 = "0fj0fk2i47yrfqiapl3wkj8n74rjpndvwxg2dzx3185glb06cjxj"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -16269,6 +16305,8 @@ self: { pname = "QuickCheck-safe"; version = "0.1.0.6"; sha256 = "1f868s6iq66m4m305xrx3mfw46zvzaahkvz6xjlqzk0cragai1kp"; + revision = "1"; + editedCabalFile = "0my9s0kcxkizbfckb35l5hyr1pmhx32l2lviy7zqh93mlmv9ig4s"; libraryHaskellDepends = [ base containers QuickCheck ]; description = "Safe reimplementation of QuickCheck's core"; license = stdenv.lib.licenses.mit; @@ -20294,6 +20332,30 @@ self: { broken = true; }) {}; + "WEditor" = callPackage + ({ mkDerivation, base, directory, filepath }: + mkDerivation { + pname = "WEditor"; + version = "0.1.0.0"; + sha256 = "06kg6sfs7l2zbclw7vh3d82r6x8wdxvp58k24sjmfzm41nq3j739"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base directory filepath ]; + doHaddock = false; + description = "Generic text-editor logic for use with fixed-width fonts"; + license = stdenv.lib.licenses.asl20; + }) {}; + + "WEditorBrick" = callPackage + ({ mkDerivation, base, brick, microlens, vty, WEditor }: + mkDerivation { + pname = "WEditorBrick"; + version = "0.1.0.0"; + sha256 = "1im6wmpx3y6wbzg7fdyjw3zjg6c8nd1vkr49pp6m9jqr9wv8jmsg"; + libraryHaskellDepends = [ base brick microlens vty WEditor ]; + description = "Text-editor widget with dynamic line-wrapping for use with Brick"; + license = stdenv.lib.licenses.asl20; + }) {}; + "WL500gPControl" = callPackage ({ mkDerivation, base, directory, filepath, mtl, unix, WL500gPLib }: @@ -29776,12 +29838,12 @@ self: { }) {}; "aop-prelude" = callPackage - ({ mkDerivation, base, ghc-prim }: + ({ mkDerivation, base, ghc-prim, integer-gmp }: mkDerivation { pname = "aop-prelude"; - version = "0.2.0.0"; - sha256 = "0v972z1qxvv5nmfl7cdjqymzwjyl4cig8ilmp2lxrh9zw7k1lfsp"; - libraryHaskellDepends = [ base ghc-prim ]; + version = "0.3.0.2"; + sha256 = "0ix3jr27yasr6zkfdrwpy9nfdgz7x5rn004rq0vsarg6dssiq46k"; + libraryHaskellDepends = [ base ghc-prim integer-gmp ]; testHaskellDepends = [ base ghc-prim ]; description = "prelude for Algebra of Programming"; license = stdenv.lib.licenses.bsd3; @@ -30768,8 +30830,8 @@ self: { }: mkDerivation { pname = "apply-refact"; - version = "0.7.0.0"; - sha256 = "1facic5lbc9xih6w1kfr3inwvada6y98n9xgc6iv6r057zr8jfp0"; + version = "0.8.0.0"; + sha256 = "0hh7flildjfbigs0knhd3bfd4r3wnhg4ji4cpkx1qagnp5cs4pk0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -31214,8 +31276,8 @@ self: { }: mkDerivation { pname = "archive-sig"; - version = "1.0.1.0"; - sha256 = "0pfkd1whid992pnslh9mcaxm8fc3gjcmj91wmq3byxjpjybw1jy5"; + version = "1.0.2.0"; + sha256 = "0n9z13p76c9hxxy9ljjf3y1w9mh952rvihz4xgn0xpb03i1agj65"; libraryHaskellDepends = [ base bytestring composition-prelude dir-traverse ]; @@ -31682,6 +31744,8 @@ self: { pname = "arithmoi"; version = "0.10.0.0"; sha256 = "1qrrmwg40bw5j51w658ilm5wg6awfbsylpmzjw0r0rgh6ml8irk9"; + revision = "1"; + editedCabalFile = "0vl9ki92sfsgqmgfg4f69rqqkl0q4a4klffsskhns6bjbcnzdg8z"; configureFlags = [ "-f-llvm" ]; isLibrary = true; isExecutable = true; @@ -31702,6 +31766,37 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "arithmoi_0_11_0_0" = callPackage + ({ mkDerivation, array, base, chimera, constraints, containers + , deepseq, exact-pi, gauge, integer-gmp, integer-logarithms + , integer-roots, mod, QuickCheck, quickcheck-classes, random + , semirings, smallcheck, tasty, tasty-hunit, tasty-quickcheck + , tasty-rerun, tasty-smallcheck, transformers, vector + }: + mkDerivation { + pname = "arithmoi"; + version = "0.11.0.0"; + sha256 = "14zhrlml6029n21h0ihspydg2zr7f93k4lji0nyi23c5y67pi9sk"; + configureFlags = [ "-f-llvm" ]; + libraryHaskellDepends = [ + array base chimera constraints containers deepseq exact-pi + integer-gmp integer-logarithms integer-roots mod random semirings + transformers vector + ]; + testHaskellDepends = [ + base containers exact-pi integer-gmp integer-roots mod QuickCheck + quickcheck-classes semirings smallcheck tasty tasty-hunit + tasty-quickcheck tasty-rerun tasty-smallcheck transformers vector + ]; + benchmarkHaskellDepends = [ + array base constraints containers deepseq gauge integer-logarithms + mod random semirings vector + ]; + description = "Efficient basic number-theoretic functions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "arity-generic-liftA" = callPackage ({ mkDerivation, base, doctest }: mkDerivation { @@ -34705,7 +34800,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "avro_0_5_1_0" = callPackage + "avro_0_5_2_0" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors , binary, bytestring, containers, data-binary-ieee754, deepseq , directory, doctest, doctest-discover, extra, fail, gauge @@ -34717,8 +34812,8 @@ self: { }: mkDerivation { pname = "avro"; - version = "0.5.1.0"; - sha256 = "0yhv29ahwbj97l30knaid8l6v1n9k3ayv67qfkchd2m6qhzm7ns5"; + version = "0.5.2.0"; + sha256 = "1apvqny4dikx5b7yqxs8a4hsxipl5xvz2i3c5bna1faiagxav1i1"; libraryHaskellDepends = [ aeson array base base16-bytestring bifunctors binary bytestring containers data-binary-ieee754 deepseq fail HasBigDecimal hashable @@ -39167,8 +39262,8 @@ self: { ({ mkDerivation, array, base, bytestring, mtl }: mkDerivation { pname = "binary-strict"; - version = "0.4.8.5"; - sha256 = "1m1r6dnvnj5ghvhb2wsh5sczvqx500xyh2f8qs1j1ddzn70bb6wp"; + version = "0.4.8.6"; + sha256 = "11s4hgmxdqdwh5p73kq1a0gshx4fqmbnjwb6ig015832sk3xnsgq"; libraryHaskellDepends = [ array base bytestring mtl ]; testHaskellDepends = [ base bytestring ]; description = "Binary deserialisation using strict ByteStrings"; @@ -41098,6 +41193,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bits-extra_0_0_2_0" = callPackage + ({ mkDerivation, base, criterion, doctest, doctest-discover + , ghc-prim, hedgehog, hspec, hspec-discover, hw-hedgehog + , hw-hspec-hedgehog, vector + }: + mkDerivation { + pname = "bits-extra"; + version = "0.0.2.0"; + sha256 = "1c54008kinzcx93kc8vcp7wq7la662m8nk82ax76i9b0gvbkk21f"; + libraryHaskellDepends = [ base ghc-prim vector ]; + testHaskellDepends = [ + base doctest doctest-discover ghc-prim hedgehog hspec hw-hedgehog + hw-hspec-hedgehog + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + benchmarkHaskellDepends = [ base criterion ghc-prim vector ]; + description = "Useful bitwise operations"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bits-extras" = callPackage ({ mkDerivation, base, gcc_s }: mkDerivation { @@ -44857,13 +44973,13 @@ self: { }) {}; "burrito" = callPackage - ({ mkDerivation, base, HUnit, template-haskell, transformers }: + ({ mkDerivation, base, hspec, QuickCheck, template-haskell }: mkDerivation { pname = "burrito"; - version = "1.0.1.0"; - sha256 = "0fw13xfa7x7gywylgvhbjq9zrbjsix8jn11qvp2xavirmgz74mvw"; + version = "1.0.2.0"; + sha256 = "1zmwzdihys8kh9idcpzvg1p4hcpzbfji8pdzixpvz9hya8cc44vf"; libraryHaskellDepends = [ base template-haskell ]; - testHaskellDepends = [ base HUnit transformers ]; + testHaskellDepends = [ base hspec QuickCheck ]; description = "Parse and render URI templates"; license = stdenv.lib.licenses.isc; }) {}; @@ -44990,10 +45106,31 @@ self: { }: mkDerivation { pname = "butcher"; - version = "1.3.2.3"; - sha256 = "0lpicayq9k59m2ydz989xsypr653xwhp6mmhlp7nmjzk6jwpq5q5"; - revision = "2"; - editedCabalFile = "1751sllw8s81x3s1dhilbr5lqnv9cpdqiv17c8by466aa6304dxa"; + version = "1.3.3.0"; + sha256 = "1zp0j5ydbnk6x3yblhs9c6z2a3bmh9fvprqhx2wk3wyvrgkwsx8h"; + revision = "1"; + editedCabalFile = "1jw9dvkqdq24mgxvrrz4ymlqgrqkn4648dyy22wmx06lbqzcbqam"; + libraryHaskellDepends = [ + base bifunctors containers deque extra free microlens microlens-th + mtl multistate pretty transformers unsafe void + ]; + testHaskellDepends = [ + base containers deque extra free hspec microlens microlens-th mtl + multistate pretty transformers unsafe + ]; + description = "Chops a command or program invocation into digestable pieces"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "butcher_1_3_3_1" = callPackage + ({ mkDerivation, base, bifunctors, containers, deque, extra, free + , hspec, microlens, microlens-th, mtl, multistate, pretty + , transformers, unsafe, void + }: + mkDerivation { + pname = "butcher"; + version = "1.3.3.1"; + sha256 = "0nqn057b5g8p6nj9xpbg52swiwzncirgfmzp3l1z5d8yn641zp1n"; libraryHaskellDepends = [ base bifunctors containers deque extra free microlens microlens-th mtl multistate pretty transformers unsafe void @@ -45004,6 +45141,7 @@ self: { ]; description = "Chops a command or program invocation into digestable pieces"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "butter" = callPackage @@ -46780,22 +46918,25 @@ self: { "cabal-install-parsers" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring , binary, binary-instances, bytestring, Cabal, containers - , cryptohash-sha256, directory, filepath, lukko, network-uri - , parsec, pretty, tar, tasty, tasty-golden, tasty-hunit, text, time - , transformers, tree-diff + , criterion, cryptohash-sha256, deepseq, directory, filepath, lukko + , network-uri, parsec, pretty, tar, tasty, tasty-golden + , tasty-hunit, text, time, transformers, tree-diff }: mkDerivation { pname = "cabal-install-parsers"; - version = "0.2"; - sha256 = "14bfiw8ddfm323a8870wazdb6rlyq52ykrhhm24vd2lxg61sn4aa"; + version = "0.3.0.1"; + sha256 = "1skv3psqs26m68n5xqsw4jil2f3dz5yv8hmskl58sg0q22mjbspm"; libraryHaskellDepends = [ aeson base base16-bytestring binary binary-instances bytestring - Cabal containers cryptohash-sha256 directory filepath lukko + Cabal containers cryptohash-sha256 deepseq directory filepath lukko network-uri parsec pretty tar text time transformers ]; testHaskellDepends = [ ansi-terminal base bytestring Cabal containers directory filepath - tasty tasty-golden tasty-hunit tree-diff + pretty tasty tasty-golden tasty-hunit tree-diff + ]; + benchmarkHaskellDepends = [ + base bytestring Cabal containers criterion directory filepath ]; description = "Utilities to work with cabal-install files"; license = "GPL-2.0-or-later AND BSD-3-Clause"; @@ -48427,37 +48568,36 @@ self: { ({ mkDerivation, async, base, bytes, bytestring, containers, cpu , data-default, data-default-instances-vector, deepseq, directory , exceptions, filepath, focus, hashable, heredoc, hspec, list-t - , mtl, network, network-simple, pretty-show, primitive, process - , process-extras, QuickCheck, quickcheck-instances, quickcheck-io - , reinterpret-cast, resourcet, safe-exceptions, stm, stm-containers - , supervisors, text, transformers, vector, wl-pprint-text + , monad-stm, mtl, network, network-simple, pretty-show, primitive + , process, process-extras, QuickCheck, quickcheck-instances + , quickcheck-io, reinterpret-cast, resourcet, safe-exceptions, stm + , stm-containers, supervisors, text, transformers, vector + , wl-pprint-text }: mkDerivation { pname = "capnp"; - version = "0.4.0.0"; - sha256 = "1dzabszp3nn13rmvqmdl2gimwmkdpjzd303chbi0jw8248s14bfx"; - revision = "1"; - editedCabalFile = "16h6xvl3xr91rfn5l9lyg2jq14mffxjnkzhva4gn4bds01g2d2jl"; + version = "0.5.0.0"; + sha256 = "1yzg8p07wjb3zhx3amg2azh06c0rxx2za2pc2dklbvslshnrimm8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async base bytes bytestring containers cpu data-default - data-default-instances-vector exceptions focus hashable list-t mtl - network network-simple pretty-show primitive reinterpret-cast - safe-exceptions stm stm-containers supervisors text transformers - vector + data-default-instances-vector exceptions focus hashable list-t + monad-stm mtl network network-simple pretty-show primitive + reinterpret-cast safe-exceptions stm stm-containers supervisors + text transformers vector ]; executableHaskellDepends = [ base bytes bytestring containers data-default directory exceptions - filepath mtl primitive reinterpret-cast safe-exceptions text - transformers vector wl-pprint-text + filepath monad-stm mtl primitive reinterpret-cast safe-exceptions + text transformers vector wl-pprint-text ]; testHaskellDepends = [ async base bytes bytestring containers data-default deepseq - directory exceptions heredoc hspec mtl network network-simple - pretty-show primitive process process-extras QuickCheck - quickcheck-instances quickcheck-io reinterpret-cast resourcet - safe-exceptions stm supervisors text transformers vector + directory exceptions heredoc hspec monad-stm mtl network + network-simple pretty-show primitive process process-extras + QuickCheck quickcheck-instances quickcheck-io reinterpret-cast + resourcet safe-exceptions stm supervisors text transformers vector ]; description = "Cap'n Proto for Haskell"; license = stdenv.lib.licenses.mit; @@ -51716,6 +51856,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "chronos_1_1_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion + , deepseq, doctest, hashable, HUnit, old-locale, primitive + , QuickCheck, semigroups, test-framework, test-framework-hunit + , test-framework-quickcheck2, text, thyme, time, torsor, vector + }: + mkDerivation { + pname = "chronos"; + version = "1.1.1"; + sha256 = "10nxhnj5y984c3mf2wkc2zl6afbph0b0vj7f722g0yp7cq4908yj"; + libraryHaskellDepends = [ + aeson attoparsec base bytestring hashable primitive semigroups text + torsor vector + ]; + testHaskellDepends = [ + attoparsec base bytestring doctest HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 text torsor + ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring criterion deepseq old-locale QuickCheck + text thyme time vector + ]; + description = "A performant time library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "chronos-bench" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, chronos , containers, deepseq, optparse-applicative, process, terminal-size @@ -53015,8 +53182,8 @@ self: { "clckwrks" = callPackage ({ mkDerivation, acid-state, aeson, aeson-qq, attoparsec, base - , blaze-html, bytestring, Cabal, cereal, containers, directory - , filepath, happstack-authenticate, happstack-hsp, happstack-jmacro + , blaze-html, bytestring, cereal, containers, directory, filepath + , happstack-authenticate, happstack-hsp, happstack-jmacro , happstack-server, happstack-server-tls, hsp, hsx-jmacro, hsx2hs , ixset, jmacro, lens, mtl, network, network-uri, old-locale , openssl, process, random, reform, reform-happstack, reform-hsp @@ -53027,10 +53194,9 @@ self: { }: mkDerivation { pname = "clckwrks"; - version = "0.25.4"; - sha256 = "0mlrkyhs095b8bwsk4mjq4wys6ydn4m9nds37lxqnw6qzl6rk5hl"; + version = "0.25.5"; + sha256 = "1sis7xqvnbaqw513xibzrfyvhbcfsg7yz6syd3lx9rqz26b1byih"; enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal ]; libraryHaskellDepends = [ acid-state aeson aeson-qq attoparsec base blaze-html bytestring cereal containers directory filepath happstack-authenticate @@ -53056,8 +53222,8 @@ self: { }: mkDerivation { pname = "clckwrks-cli"; - version = "0.3.0.1"; - sha256 = "0f44ndvnkivwc72lxfr779kyn20g7f4wy3prqazdhk47xvl1fps6"; + version = "0.3.0.2"; + sha256 = "0gan0x38ymi9s0bxv34girdh6pz2dy797yrifnzkv9p8gnlh0648"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -53201,19 +53367,17 @@ self: { }) {}; "clckwrks-plugin-page" = callPackage - ({ mkDerivation, acid-state, aeson, attoparsec, base, Cabal - , clckwrks, containers, directory, filepath, happstack-hsp - , happstack-server, hsp, hsx2hs, ixset, mtl, old-locale, random - , reform, reform-happstack, reform-hsp, safecopy, tagsoup - , template-haskell, text, time, time-locale-compat, uuid - , uuid-orphans, web-plugins, web-routes, web-routes-happstack - , web-routes-th + ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks + , containers, directory, filepath, happstack-hsp, happstack-server + , hsp, hsx2hs, ixset, mtl, old-locale, random, reform + , reform-happstack, reform-hsp, safecopy, tagsoup, template-haskell + , text, time, time-locale-compat, uuid, uuid-orphans, web-plugins + , web-routes, web-routes-happstack, web-routes-th }: mkDerivation { pname = "clckwrks-plugin-page"; - version = "0.4.3.19"; - sha256 = "06lvr3sq5slcfc1r3vmip9flh5dn50mz6ar7x11zk4dm365g4vhk"; - setupHaskellDepends = [ base Cabal ]; + version = "0.4.3.20"; + sha256 = "0w1vyw5jvypbha4i5m7f7kpwmyqarm9wzdklldabx41cm3ab48li"; libraryHaskellDepends = [ acid-state aeson attoparsec base clckwrks containers directory filepath happstack-hsp happstack-server hsp hsx2hs ixset mtl @@ -54688,8 +54852,8 @@ self: { }: mkDerivation { pname = "cobot"; - version = "0.1.1.1"; - sha256 = "12bq23am5q0cb58sgifdihc53rwg91m1wvkyr06nkjddh8vgfc3g"; + version = "0.1.1.2"; + sha256 = "0454y6hlf32c8x6rjzjp0594ikgnvamngz7k6cgfsyssx1fkz2sk"; libraryHaskellDepends = [ array base bytestring containers deepseq lens linear megaparsec mtl split template-haskell text @@ -54714,8 +54878,8 @@ self: { }: mkDerivation { pname = "cobot-io"; - version = "0.1.3.1"; - sha256 = "1b64ixkcagcx8d7y5nym9njllndbbb108cp1k31qr4p6yijyw15m"; + version = "0.1.3.2"; + sha256 = "14yrymp96i0lljis3143vqk7bjy83xwdhk62vr8kv9lhv7z168s9"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-msgpack deepseq http-conduit hyraxAbif lens linear mtl split text vector @@ -56280,10 +56444,8 @@ self: { }: mkDerivation { pname = "compact"; - version = "0.1.0.1"; - sha256 = "0lynnbvsyr07driy7lm9llrhvmk9wprjdbfc34svzfwldghk71gf"; - revision = "2"; - editedCabalFile = "1sy8szbmbhn13s54bq04ni234kk05najm3xm0sh6r9qnvg7pcjd7"; + version = "0.2.0.0"; + sha256 = "0xv24vd2h76928355rr8gzdbkyn2j17yf6wjyghnzw7qyhsbb9h3"; libraryHaskellDepends = [ base binary bytestring ghc-compact ]; testHaskellDepends = [ base directory ]; description = "Non-GC'd, contiguous storage for immutable data structures"; @@ -65327,8 +65489,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "data-category"; - version = "0.7"; - sha256 = "000x29a8x2ca7m85z0h7snm0297jf9ndr46dh3arv43fjlvfy3ag"; + version = "0.7.1"; + sha256 = "0yvrqgid8b9awm1z31cpa465jfvjq8p23k23dxg567rm191n68kz"; description = "Category theory"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -65726,10 +65888,8 @@ self: { }: mkDerivation { pname = "data-dword"; - version = "0.3.1.3"; - sha256 = "1l4g8xbsix6xqljadfq49rs39m2lsbrfz4i7l80q0yhafbm4ax8b"; - revision = "1"; - editedCabalFile = "0gz9pqbi47f4dhn2c9v7y9nzgprbkbp9pd2vq5kpzj18hf53bvdm"; + version = "0.3.2"; + sha256 = "1avpf18pqpa9a53l1isk2par3jdk3yb84kfkrvl14ry57hikkjys"; libraryHaskellDepends = [ base data-bword ghc-prim hashable template-haskell ]; @@ -65928,17 +66088,6 @@ self: { }) {}; "data-fix" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "data-fix"; - version = "0.2.0"; - sha256 = "14hk6hq5hdb3l5bhmzhw086jpzlvp9qbw9dzw30wlz5jbh2ihmvy"; - libraryHaskellDepends = [ base ]; - description = "Fixpoint data types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "data-fix_0_2_1" = callPackage ({ mkDerivation, base }: mkDerivation { pname = "data-fix"; @@ -65947,7 +66096,6 @@ self: { libraryHaskellDepends = [ base ]; description = "Fixpoint data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "data-fix-cse" = callPackage @@ -66002,8 +66150,8 @@ self: { pname = "data-forest"; version = "0.1.0.7"; sha256 = "1q41cwinvv0ys260f1f7005403pvz1gbwn0d6cnwh8b7rlgp8f4j"; - revision = "1"; - editedCabalFile = "1kwvjmbchz6nv770x81q7f8i3blfzzifhjqww702c8zbnnafzgar"; + revision = "2"; + editedCabalFile = "15s9pv56mi2vqns70vcad1q841rp5yav2wh93qd1ialp109j54j4"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest ]; description = "A simple multi-way tree data structure"; @@ -66956,35 +67104,6 @@ self: { }) {}; "datadog" = callPackage - ({ mkDerivation, aeson, auto-update, base, buffer-builder - , bytestring, Cabal, containers, dlist, exceptions, hspec - , http-client, http-client-tls, http-types, lens, lifted-base - , monad-control, network, old-locale, random, text, time - , transformers-base, unliftio, unordered-containers, vector - }: - mkDerivation { - pname = "datadog"; - version = "0.2.4.0"; - sha256 = "063avwbrrv6g1icw6fl7yv04izlmh6wcpngxdzzjz1qqmirb8qn4"; - libraryHaskellDepends = [ - aeson auto-update base buffer-builder bytestring containers dlist - http-client http-client-tls http-types lens lifted-base - monad-control network old-locale text time transformers-base - unliftio unordered-containers vector - ]; - testHaskellDepends = [ - aeson auto-update base buffer-builder bytestring Cabal containers - dlist exceptions hspec http-client http-client-tls http-types lens - lifted-base monad-control network old-locale random text time - transformers-base unliftio unordered-containers vector - ]; - description = "Datadog client for Haskell. Supports both the HTTP API and StatsD."; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "datadog_0_2_5_0" = callPackage ({ mkDerivation, aeson, auto-update, base, buffer-builder , bytestring, Cabal, containers, dlist, exceptions, hspec , http-client, http-client-tls, http-types, lens, lifted-base @@ -68615,8 +68734,8 @@ self: { pname = "deepseq-generics"; version = "0.2.0.0"; sha256 = "17bwghc15mc9pchfd1w46jh2p3wzc86aj6a537wqwxn08rayzcxh"; - revision = "4"; - editedCabalFile = "0928s2qnbqsjzrm94x88rvmvbigfmhcyp4m73gw6asinp2qg1kii"; + revision = "5"; + editedCabalFile = "1iqgza1larap5n4f1z7d7ag1s3b0zzlvgb91lrwwa5khgw2m7mrg"; libraryHaskellDepends = [ base deepseq ghc-prim ]; testHaskellDepends = [ base deepseq ghc-prim HUnit test-framework test-framework-hunit @@ -73536,8 +73655,8 @@ self: { }: mkDerivation { pname = "distributive"; - version = "0.6.1"; - sha256 = "1wnayzzb4vk8rhh9gzhdpd9f64366k4vmbhximavmqqmp3cv2jbp"; + version = "0.6.2"; + sha256 = "1j93zkfffm6s16kgr0j0z87y5ds28rw0r2gyc5ncwcylvrqy4kl2"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base-orphans tagged transformers ]; testHaskellDepends = [ base doctest generic-deriving hspec ]; @@ -74027,22 +74146,22 @@ self: { }) {}; "dobutokO2" = callPackage - ({ mkDerivation, base, directory, mmsyn2, mmsyn3, mmsyn6ukr - , mmsyn7s, mmsyn7ukr, process, vector + ({ mkDerivation, base, bytestring, directory, mmsyn2, mmsyn3 + , mmsyn6ukr, mmsyn7s, mmsyn7ukr, process, vector }: mkDerivation { pname = "dobutokO2"; - version = "0.26.0.0"; - sha256 = "04nack12bj26z56jlwrms5idx3x4qp7kif1ff40vwwkq5qwxncbc"; + version = "0.31.0.0"; + sha256 = "16sk8igx7n07lkhvi5r78d15n4wmhbirall6s4zaqn8ab7sdga86"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base directory mmsyn2 mmsyn3 mmsyn6ukr mmsyn7s mmsyn7ukr process - vector + base bytestring directory mmsyn2 mmsyn3 mmsyn6ukr mmsyn7s mmsyn7ukr + process vector ]; executableHaskellDepends = [ - base directory mmsyn2 mmsyn3 mmsyn6ukr mmsyn7s mmsyn7ukr process - vector + base bytestring directory mmsyn2 mmsyn3 mmsyn6ukr mmsyn7s mmsyn7ukr + process vector ]; description = "A program and a library to create experimental music from a mono audio and a Ukrainian text"; license = stdenv.lib.licenses.mit; @@ -74128,8 +74247,8 @@ self: { }: mkDerivation { pname = "docker"; - version = "0.6.0.3"; - sha256 = "0vvvw7ijzsra1kknv196fla1vc9jigp4dafycvh2djaxmj73d1vi"; + version = "0.6.0.4"; + sha256 = "07j1c526gazy0kw98iklac767jhslhx9mcnzjazmwqsgyj8n217f"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit conduit-combinators conduit-extra containers data-default-class directory exceptions @@ -74337,7 +74456,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "doctemplates_0_8_1" = callPackage + "doctemplates_0_8_2" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , doclayout, filepath, Glob, HsYAML, mtl, parsec, safe, scientific , tasty, tasty-golden, tasty-hunit, temporary, text @@ -74345,8 +74464,8 @@ self: { }: mkDerivation { pname = "doctemplates"; - version = "0.8.1"; - sha256 = "02xysm510m3hbifwb7ngx39wj1ycxjrws4ngnm0d7ywqm9cv1hbb"; + version = "0.8.2"; + sha256 = "14xymm4lp0nfbm2y8jcyaisb52mrwjz40dz5n5c8m48rkqqb4qzl"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base containers doclayout filepath HsYAML mtl parsec safe @@ -75832,8 +75951,8 @@ self: { pname = "dual-game"; version = "0.1.0.1"; sha256 = "1w69d7d2xbpi82n41gq08qdmldh834ka7qwvy159vsac556wwcfg"; - revision = "5"; - editedCabalFile = "1i87w3frlicplbc3gkp0msz1ck1irfmy9ym2n2ffxglv18vaczb6"; + revision = "6"; + editedCabalFile = "10hj6snshirfx6apbrdb2jm45xsgvsis0c7i5a33wwl0lnklxwj2"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -75974,8 +76093,8 @@ self: { pname = "dumb-cas"; version = "0.2.0.0"; sha256 = "1zcq9r2p5gjpfivprjp9hspqpayrj9in2jck5vf5ibxpc671isb4"; - revision = "1"; - editedCabalFile = "1269wjyywvi86gmpqdpq2niv5ifns0bqr1i5229w69jdlzrc6dqg"; + revision = "2"; + editedCabalFile = "1a6xj7qszi815xr5nks13593kc90wqalq78kxsnmmhn2m2r1aq2q"; libraryHaskellDepends = [ base containers decimal-literals hashable template-haskell unordered-containers @@ -76039,8 +76158,6 @@ self: { ]; description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "dunai-core" = callPackage @@ -77678,6 +77795,44 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "egison_4_0_0" = callPackage + ({ mkDerivation, array, base, containers, criterion, deepseq + , directory, filepath, ghc, ghc-paths, Glob, hashable, haskeline + , HUnit, megaparsec, mini-egison, mtl, optparse-applicative, parsec + , parser-combinators, prettyprinter, process, random, regex-tdfa + , split, test-framework, test-framework-hunit, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "egison"; + version = "4.0.0"; + sha256 = "00dps0p1n3izfclvdykh6y10lnjis11352ndqbyv55wl6n3xjb2p"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + array base containers directory ghc ghc-paths hashable haskeline + megaparsec mini-egison mtl optparse-applicative parsec + parser-combinators prettyprinter process random regex-tdfa split + text transformers unordered-containers vector + ]; + executableHaskellDepends = [ + array base containers directory filepath ghc ghc-paths haskeline + mtl optparse-applicative parsec prettyprinter process regex-tdfa + split text transformers unordered-containers vector + ]; + testHaskellDepends = [ + base filepath Glob HUnit mtl test-framework test-framework-hunit + transformers + ]; + benchmarkHaskellDepends = [ + base criterion deepseq mtl transformers + ]; + description = "Programming language with non-linear pattern-matching against non-free data"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "egison-pattern-src" = callPackage ({ mkDerivation, base, containers, free, megaparsec, mtl , parser-combinators, prettyprinter, recursion-schemes, tasty @@ -77758,20 +77913,18 @@ self: { }) {}; "egison-tutorial" = callPackage - ({ mkDerivation, array, base, bytestring, containers, directory - , egison, filepath, ghc, ghc-paths, haskeline, mtl, parsec - , regex-posix, transformers, unordered-containers + ({ mkDerivation, base, directory, egison, filepath, haskeline, mtl + , regex-posix, transformers }: mkDerivation { pname = "egison-tutorial"; - version = "3.10.0"; - sha256 = "109j17iskxs7gwgvxyyvmipf3xsbnysjxj20z6hhjzz1sb3sw5x5"; + version = "4.0.0"; + sha256 = "0kma4i6qhjwcr9dhlgl63gd8f676agigbv1qii7p6fvq3hj38ddg"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - array base bytestring containers directory egison filepath ghc - ghc-paths haskeline mtl parsec regex-posix transformers - unordered-containers + base directory egison filepath haskeline mtl regex-posix + transformers ]; description = "A tutorial program for the Egison programming language"; license = stdenv.lib.licenses.mit; @@ -78432,6 +78585,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "elm-bridge_0_6_0" = callPackage + ({ mkDerivation, aeson, base, containers, hspec, QuickCheck + , template-haskell, text + }: + mkDerivation { + pname = "elm-bridge"; + version = "0.6.0"; + sha256 = "1sn4fdillziikydn832sknmn1wjb5idxfx8n2avahjwn5sdg7dwp"; + libraryHaskellDepends = [ aeson base template-haskell ]; + testHaskellDepends = [ + aeson base containers hspec QuickCheck text + ]; + description = "Derive Elm types and Json code from Haskell types, using aeson's options"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "elm-build-lib" = callPackage ({ mkDerivation, base, bytestring, containers, elm-compiler , elm-core-sources, file-embed, template-haskell @@ -79610,8 +79780,8 @@ self: { }: mkDerivation { pname = "entropy"; - version = "0.4.1.5"; - sha256 = "0szf8hi1pi8g0kxnkcymh65gk1b0niyl1nnkckzdqyar87qal0jm"; + version = "0.4.1.6"; + sha256 = "0qmzz0zgad13zl0kjrxz6cxg8ckn2w8saas2a2j72vbafpzmkixd"; setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ base bytestring unix ]; description = "A platform independent entropy source"; @@ -80923,8 +81093,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding"; - version = "0.1.0.2"; - sha256 = "1z65vm457af7ffiih8yzgds059kamaiskvjfl72qqb24fmgj9jxm"; + version = "0.1.0.3"; + sha256 = "1kycm3a2rbz8shcjz8j1yl2c5pvpkr9mp3g3pgmcnhdr7wq4smlk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -80946,8 +81116,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-gloss"; - version = "0.1.0.1"; - sha256 = "0716mwww68x8v2r6fz6ah8m26w5h98kgd662rirh56nmwr219zk5"; + version = "0.1.0.3"; + sha256 = "0ggwh1d57isda9k5l4g7g92l77m1b9hj2vva3r0fvmnidsny41n0"; libraryHaskellDepends = [ base essence-of-live-coding foreign-store gloss syb transformers ]; @@ -80963,8 +81133,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-pulse"; - version = "0.1.0.1"; - sha256 = "18f6wrq5ar14yb44yl6m8xfi9c721yywl4gzwcrx65n6wn3h16va"; + version = "0.1.0.3"; + sha256 = "044vjp637gaq2q2c8d83c9ixp6zg5x752ifw4nmnwigi1w53y1wq"; libraryHaskellDepends = [ base essence-of-live-coding foreign-store pulse-simple transformers ]; @@ -80980,8 +81150,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-quickcheck"; - version = "0.1.0.1"; - sha256 = "0wkffsy3jxz85lxlbppi477wkzlx2zvxmjc70rgf8bjw8s631a22"; + version = "0.1.0.3"; + sha256 = "1sp4s69jlc679yhix5smwx1n0gk8msrjmrsyca2lf59l71l3gadc"; libraryHaskellDepends = [ base boltzmann-samplers essence-of-live-coding QuickCheck syb transformers @@ -83409,22 +83579,6 @@ self: { }) {}; "extrapolate" = callPackage - ({ mkDerivation, base, express, leancheck, speculate - , template-haskell - }: - mkDerivation { - pname = "extrapolate"; - version = "0.4.1"; - sha256 = "1rhwgbx8skq8hl1h5hnv28qavy3v1p71vdlib1kwbdp1r7niwp8l"; - libraryHaskellDepends = [ - base express leancheck speculate template-haskell - ]; - testHaskellDepends = [ base express leancheck speculate ]; - description = "generalize counter-examples of test properties"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "extrapolate_0_4_2" = callPackage ({ mkDerivation, base, express, leancheck, speculate , template-haskell }: @@ -83438,7 +83592,6 @@ self: { testHaskellDepends = [ base express leancheck speculate ]; description = "generalize counter-examples of test properties"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ez-couch" = callPackage @@ -86137,8 +86290,8 @@ self: { pname = "filepath"; version = "1.4.2.1"; sha256 = "04jlcaaab4fvlkgpss2mfmr5ixnp1k8f8051nqf8avfg0qan6hqb"; - revision = "1"; - editedCabalFile = "1harx8x3g3badj3087c662sd15fk850jqzx0lz5h16zbsv438lqa"; + revision = "2"; + editedCabalFile = "0jpmcdm852wr18kliyp0a69iij3v9rp6wx92gkkk2nc9vns3mwdg"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base QuickCheck ]; description = "Library for manipulating FilePaths in a cross platform way"; @@ -92100,29 +92253,27 @@ self: { "futhark" = callPackage ({ mkDerivation, aeson, alex, ansi-terminal, array, base, binary - , blaze-html, bytestring, containers, data-binary-ieee754 - , directory, directory-tree, dlist, file-embed, filepath, free - , gitrev, happy, haskeline, http-client, http-client-tls - , http-conduit, language-c-quote, mainland-pretty, markdown - , megaparsec, mtl, neat-interpolation, parallel, parser-combinators - , process, process-extras, QuickCheck, random, regex-tdfa, srcloc - , tasty, tasty-hunit, tasty-quickcheck, template-haskell, temporary - , terminal-size, text, time, transformers, unordered-containers - , utf8-string, vector, vector-binary-instances, versions - , zip-archive, zlib + , blaze-html, bytestring, cmark-gfm, containers + , data-binary-ieee754, directory, directory-tree, dlist, file-embed + , filepath, free, gitrev, happy, haskeline, language-c-quote + , mainland-pretty, megaparsec, mtl, neat-interpolation, parallel + , parser-combinators, process, process-extras, QuickCheck, random + , regex-tdfa, srcloc, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, temporary, terminal-size, text, time + , transformers, unordered-containers, utf8-string, vector + , vector-binary-instances, versions, zip-archive, zlib }: mkDerivation { pname = "futhark"; - version = "0.15.3"; - sha256 = "067hzxvvkkz0d9sg67pswi6k061ri314vw4j979skhjibfb7g0hx"; + version = "0.15.4"; + sha256 = "03q3hd8m9m8xxpd0xbxqc0r2ycybznrxr4j1mr2qkzlf49qp1y2v"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson ansi-terminal array base binary blaze-html bytestring - containers data-binary-ieee754 directory directory-tree dlist - file-embed filepath free gitrev haskeline http-client - http-client-tls http-conduit language-c-quote mainland-pretty - markdown megaparsec mtl neat-interpolation parallel + cmark-gfm containers data-binary-ieee754 directory directory-tree + dlist file-embed filepath free gitrev haskeline language-c-quote + mainland-pretty megaparsec mtl neat-interpolation parallel parser-combinators process process-extras random regex-tdfa srcloc template-haskell temporary terminal-size text time transformers unordered-containers utf8-string vector vector-binary-instances @@ -92564,25 +92715,25 @@ self: { }) {}; "galois-field" = callPackage - ({ mkDerivation, base, bitvec, criterion, groups, integer-gmp - , MonadRandom, poly, protolude, semirings, tasty, tasty-quickcheck - , vector, wl-pprint-text + ({ mkDerivation, base, bitvec, criterion, groups, integer-gmp, mod + , MonadRandom, poly, protolude, QuickCheck, semirings, tasty + , tasty-quickcheck, vector, wl-pprint-text }: mkDerivation { pname = "galois-field"; - version = "1.0.1"; - sha256 = "04zy8fmsjaba37kcf2k3dchmwv59kqj3k61jc2bm2ji7vwprnvf7"; + version = "1.0.2"; + sha256 = "17khwhh0annwlbbsdj5abh3jv2csg84qvhgn1ircgc69fzb0r59d"; libraryHaskellDepends = [ - base bitvec groups integer-gmp MonadRandom poly protolude semirings - tasty-quickcheck vector wl-pprint-text + base bitvec groups integer-gmp mod MonadRandom poly protolude + QuickCheck semirings vector wl-pprint-text ]; testHaskellDepends = [ - base bitvec groups integer-gmp MonadRandom poly protolude semirings - tasty tasty-quickcheck vector wl-pprint-text + base bitvec groups integer-gmp mod MonadRandom poly protolude + QuickCheck semirings tasty tasty-quickcheck vector wl-pprint-text ]; benchmarkHaskellDepends = [ - base bitvec criterion groups integer-gmp MonadRandom poly protolude - semirings tasty-quickcheck vector wl-pprint-text + base bitvec criterion groups integer-gmp mod MonadRandom poly + protolude QuickCheck semirings vector wl-pprint-text ]; description = "Galois field library"; license = stdenv.lib.licenses.mit; @@ -94324,6 +94475,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity_0_11_0_0" = callPackage + ({ mkDerivation, base, hspec, hspec-core, QuickCheck, random + , validity + }: + mkDerivation { + pname = "genvalidity"; + version = "0.11.0.0"; + sha256 = "0kqhmgq7p94980br47jd6k9m2vjb62idx8x5hrcmybf0dakyscbl"; + libraryHaskellDepends = [ base QuickCheck random validity ]; + testHaskellDepends = [ base hspec hspec-core QuickCheck ]; + description = "Testing utilities for the validity library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-aeson" = callPackage ({ mkDerivation, aeson, base, genvalidity, genvalidity-hspec , genvalidity-scientific, genvalidity-text @@ -94366,6 +94532,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity-bytestring_0_6_0_0" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, genvalidity + , genvalidity-criterion, genvalidity-hspec, hspec, QuickCheck + , random, validity, validity-bytestring + }: + mkDerivation { + pname = "genvalidity-bytestring"; + version = "0.6.0.0"; + sha256 = "0d15cjp4pxi7hb9nilbf88mia8sv3wzwxgy3kn46bvhz4w726z5d"; + libraryHaskellDepends = [ + base bytestring genvalidity QuickCheck random validity + validity-bytestring + ]; + testHaskellDepends = [ + base bytestring deepseq genvalidity genvalidity-hspec hspec + QuickCheck validity + ]; + benchmarkHaskellDepends = [ + base bytestring criterion genvalidity genvalidity-criterion + QuickCheck + ]; + description = "GenValidity support for ByteString"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-containers" = callPackage ({ mkDerivation, base, containers, criterion, genvalidity , genvalidity-criterion, genvalidity-hspec, genvalidity-property @@ -94406,6 +94598,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity-criterion_0_1_0_0" = callPackage + ({ mkDerivation, base, criterion, deepseq, genvalidity, QuickCheck + }: + mkDerivation { + pname = "genvalidity-criterion"; + version = "0.1.0.0"; + sha256 = "1qh9why567h36149q2fci3hxc61d23j46xan4kcnhj9p1bv7v4kf"; + libraryHaskellDepends = [ + base criterion deepseq genvalidity QuickCheck + ]; + benchmarkHaskellDepends = [ + base criterion genvalidity QuickCheck + ]; + description = "Criterion benchmarks for generators"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-hspec" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-property, hspec , hspec-core, QuickCheck, transformers, validity @@ -94713,6 +94923,31 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity-typed-uuid_0_0_0_2" = callPackage + ({ mkDerivation, base, criterion, genvalidity + , genvalidity-criterion, genvalidity-hspec, genvalidity-hspec-aeson + , genvalidity-uuid, hspec, QuickCheck, typed-uuid + }: + mkDerivation { + pname = "genvalidity-typed-uuid"; + version = "0.0.0.2"; + sha256 = "16h2y11mn2p11pgqkabip0xgwfx1am8s9ja8qikz27jb87x1q410"; + libraryHaskellDepends = [ + base genvalidity genvalidity-uuid QuickCheck typed-uuid + ]; + testHaskellDepends = [ + base genvalidity genvalidity-hspec genvalidity-hspec-aeson + genvalidity-uuid hspec QuickCheck typed-uuid + ]; + benchmarkHaskellDepends = [ + base criterion genvalidity genvalidity-criterion genvalidity-uuid + QuickCheck typed-uuid + ]; + description = "Generators for Phantom-Typed version of UUID"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-unordered-containers" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hashable , hspec, QuickCheck, unordered-containers, validity @@ -94752,6 +94987,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "genvalidity-uuid_0_1_0_4" = callPackage + ({ mkDerivation, base, criterion, genvalidity + , genvalidity-criterion, genvalidity-hspec, hspec, QuickCheck, uuid + , validity, validity-uuid + }: + mkDerivation { + pname = "genvalidity-uuid"; + version = "0.1.0.4"; + sha256 = "02iln9qvcqmsjljflfrq8jckch8pvsarjb6lx0bkk7j3cw2cgn2r"; + libraryHaskellDepends = [ + base genvalidity QuickCheck uuid validity validity-uuid + ]; + testHaskellDepends = [ + base genvalidity genvalidity-hspec hspec QuickCheck uuid + ]; + benchmarkHaskellDepends = [ + base criterion genvalidity genvalidity-criterion QuickCheck uuid + ]; + description = "GenValidity support for UUID"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "genvalidity-vector" = callPackage ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec , QuickCheck, validity, validity-vector, vector @@ -95663,15 +95921,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-lib_8_10_1_20200324" = callPackage + "ghc-lib_8_10_1_20200412" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-lib-parser, ghc-prim, happy , hpc, pretty, process, time, transformers, unix }: mkDerivation { pname = "ghc-lib"; - version = "8.10.1.20200324"; - sha256 = "09d0254ic650n9h6j863xl3cvd506ww84369qdszxwkizlzk7gr3"; + version = "8.10.1.20200412"; + sha256 = "0y680izyflncjs9k1d0bjb2cym6vyp9nnahqhrrgfrhl4xlk0qmi"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -95702,15 +95960,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-lib-parser_8_10_1_20200324" = callPackage + "ghc-lib-parser_8_10_1_20200412" = callPackage ({ mkDerivation, alex, array, base, binary, bytestring, containers , deepseq, directory, filepath, ghc-prim, happy, hpc, pretty , process, time, transformers, unix }: mkDerivation { pname = "ghc-lib-parser"; - version = "8.10.1.20200324"; - sha256 = "0i3ab7a2xq8pjd94kfyrlnp9wnjfkl0qi74zb1m23l6k5zm4g9y8"; + version = "8.10.1.20200412"; + sha256 = "0cndflf4kfz5vf4q83716ambkkh53kw0j0ak5li2fd0kkwiz1q1z"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -96178,28 +96436,45 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghc-syntax-highlighter_0_0_6_0" = callPackage + ({ mkDerivation, base, ghc-lib-parser, hspec, hspec-discover, text + }: + mkDerivation { + pname = "ghc-syntax-highlighter"; + version = "0.0.6.0"; + sha256 = "1dxm4w44y339flwl4ivsmvml3nvzzlxq585by9mm7j56ljlb4aja"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base ghc-lib-parser text ]; + testHaskellDepends = [ base hspec text ]; + testToolDepends = [ hspec-discover ]; + description = "Syntax highlighter for Haskell using lexer of GHC itself"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ghc-tags-core" = callPackage ({ mkDerivation, attoparsec, base, bytestring, criterion, deepseq - , directory, filepath, ghc, lattices, mtl, pipes, pipes-attoparsec - , pipes-bytestring, pipes-text, QuickCheck, quickcheck-instances - , tasty, tasty-golden, tasty-quickcheck, text, transformers + , directory, filepath, filepath-bytestring, ghc, lattices, mtl + , pipes, pipes-attoparsec, pipes-bytestring, QuickCheck + , quickcheck-instances, tasty, tasty-golden, tasty-quickcheck, text + , transformers }: mkDerivation { pname = "ghc-tags-core"; - version = "0.1.0.0"; - sha256 = "0agn5601fwq4nr2k6xya0lmwm4hw63rvmpi4rk0jr362vn7d219n"; + version = "0.2.0.0"; + sha256 = "1i7jr8zzkybh1f0ljg3l4airfc4ayy4z7v16avj6j5h3k8dksd3f"; libraryHaskellDepends = [ - attoparsec base bytestring directory filepath ghc mtl pipes - pipes-attoparsec pipes-bytestring pipes-text text transformers + attoparsec base bytestring directory filepath-bytestring ghc mtl + pipes pipes-attoparsec pipes-bytestring text transformers ]; testHaskellDepends = [ - attoparsec base bytestring directory filepath lattices mtl pipes - QuickCheck quickcheck-instances tasty tasty-golden tasty-quickcheck - text + attoparsec base bytestring directory filepath filepath-bytestring + lattices mtl pipes QuickCheck quickcheck-instances tasty + tasty-golden tasty-quickcheck text ]; benchmarkHaskellDepends = [ - base bytestring criterion deepseq mtl pipes pipes-attoparsec - pipes-bytestring pipes-text text + base bytestring criterion deepseq filepath-bytestring mtl pipes + pipes-attoparsec pipes-bytestring text ]; description = "a library to work with tags created from Haskell parsed tree"; license = stdenv.lib.licenses.mpl20; @@ -96208,20 +96483,21 @@ self: { }) {}; "ghc-tags-plugin" = callPackage - ({ mkDerivation, base, bytestring, directory, filepath, ghc - , ghc-tags-core, mtl, optparse-applicative, pipes, pipes-attoparsec - , pipes-bytestring, pipes-safe, pipes-text, text + ({ mkDerivation, base, bytestring, directory, filepath + , filepath-bytestring, ghc, ghc-tags-core, mtl + , optparse-applicative, pipes, pipes-attoparsec, pipes-bytestring + , pipes-safe, text, unix }: mkDerivation { pname = "ghc-tags-plugin"; - version = "0.1.6.0"; - sha256 = "148whav3lpkglgfk51az3f3cfnp50psnznrw0a7mdbqxmkhfb41i"; + version = "0.2.0.0"; + sha256 = "0prl25wd8fcga2ndx78rvsyzk4ar9m7wrs10mbcmia9pi4kax7y9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring directory filepath ghc ghc-tags-core mtl - optparse-applicative pipes pipes-attoparsec pipes-bytestring - pipes-safe pipes-text text + base bytestring directory filepath filepath-bytestring ghc + ghc-tags-core mtl optparse-applicative pipes pipes-attoparsec + pipes-bytestring pipes-safe text unix ]; description = "A compiler plugin which generates tags file from GHC parsed syntax tree"; license = stdenv.lib.licenses.mpl20; @@ -96641,6 +96917,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ghcid_0_8_6" = callPackage + ({ mkDerivation, ansi-terminal, base, cmdargs, containers + , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit + , terminal-size, time, unix + }: + mkDerivation { + pname = "ghcid"; + version = "0.8.6"; + sha256 = "00zyf8m3jj72ax7sj0c4j0yivrvj72vqfwra7hzgywf8fc2qxfv1"; + 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; + }) {}; + "ghcide" = callPackage ({ mkDerivation, aeson, async, base, binary, bytestring, containers , data-default, deepseq, directory, extra, filepath, fuzzy, ghc @@ -104850,8 +105153,8 @@ self: { }: mkDerivation { pname = "greenclip"; - version = "3.2.0"; - sha256 = "09ygvyrczxqsp2plwmwx021wmbq2vln9i4b5iaj0j26j7prykikq"; + version = "3.3.0"; + sha256 = "02w84wmkih9j9iil9ilwb77qkbvfa6nhllavrcj6rgb7zp264w84"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -105677,8 +105980,8 @@ self: { }: mkDerivation { pname = "gscholar-rss"; - version = "0.2.5.0"; - sha256 = "0lm0wr2v5vwvd18z8q83nj9x5waxig5v43g0y8p37ls0cpy8m9ss"; + version = "0.3.0.0"; + sha256 = "1hvmnzfh4qqbx41kih1py9hn9kxkribk8vfj0wx9i8v0sac5g87s"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -108395,8 +108698,8 @@ self: { ({ mkDerivation, base, intervals, mtl, QuickCheck }: mkDerivation { pname = "hafar"; - version = "0.1.0.0"; - sha256 = "0qyly669y8nav9g3y8y74pxmvq47r1l541l5ncq7fn50kvhpmnrj"; + version = "0.1.1.0"; + sha256 = "1cr1qb2p55n3hazxd4c4ziwwwyl5y3acqp5hhhv9m68pn53nqpas"; libraryHaskellDepends = [ base intervals mtl ]; testHaskellDepends = [ base intervals mtl QuickCheck ]; description = "Affine arithmetic library for Haskell"; @@ -108495,8 +108798,8 @@ self: { }: mkDerivation { pname = "haiji"; - version = "0.3.2.0"; - sha256 = "1clxvpqwfsybfap746nq8g6gshdizjhbpafs09mnaxp7fi1196xz"; + version = "0.3.3.0"; + sha256 = "1fmdiimjk2cnafjb2v8xdbnlwp6m79khl920l8gv1jcvqjmv9vvs"; libraryHaskellDepends = [ aeson attoparsec base data-default mtl scientific tagged template-haskell text transformers unordered-containers vector @@ -108781,8 +109084,8 @@ self: { }: mkDerivation { pname = "hakyll"; - version = "4.13.2.0"; - sha256 = "0g52lip9i6zanjja0v86v5sypjvnfpfwzzddrpj04pml733nsnfj"; + version = "4.13.3.0"; + sha256 = "1wadcvxpr7w1gm1pmi9j8bm6x0i44ik806j73mzfb1d4wb1ck10p"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -109610,8 +109913,8 @@ self: { ({ mkDerivation, base, containers, random }: mkDerivation { pname = "hanabi-dealer"; - version = "0.7.2.0"; - sha256 = "0w54ybsd7hkykifw0nsgr3mdss7945y76rbjmlk7zl9lqi780ia7"; + version = "0.8.0.0"; + sha256 = "0rlp5s8pgn9m7yblqpnjh2z7sy88m5zh7makjfvnxlrcl0bx0c52"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers random ]; @@ -110095,8 +110398,8 @@ self: { }: mkDerivation { pname = "happstack-authenticate"; - version = "2.4.0.2"; - sha256 = "16f4rs4h3lznkci5axibliiwfr3vrm03arxcjfjiv6mypkcpnp2r"; + version = "2.4.0.3"; + sha256 = "1pz75kmvmbpki9k957ymwhj427ghpd9qqsjplgd5mz4v2ikpng50"; enableSeparateDataOutput = true; libraryHaskellDepends = [ acid-state aeson authenticate base base64-bytestring boomerang @@ -110423,8 +110726,8 @@ self: { ({ mkDerivation, base, bytestring, happstack-server, mtl, text }: mkDerivation { pname = "happstack-lite"; - version = "7.3.6"; - sha256 = "1mvzpbmjgf5gv9ls5kmg0s6cr765jl701vy2kmbynjkg6jimjmp8"; + version = "7.3.7"; + sha256 = "12vyyjl0n9dqp8mh5279930rnbwaxxlzw34651sa7h9gir9hv1zv"; libraryHaskellDepends = [ base bytestring happstack-server mtl text ]; @@ -112061,23 +112364,22 @@ self: { "haskell-ci" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base-compat , bytestring, Cabal, cabal-install-parsers, containers, deepseq - , Diff, directory, exceptions, filepath, generic-lens, HsYAML - , lattices, microlens, mtl, network-uri, optparse-applicative - , parsec, pretty, process, tasty, tasty-golden, temporary, text - , transformers, unordered-containers + , Diff, directory, exceptions, filepath, generic-lens-lite, HsYAML + , lattices, mtl, network-uri, optparse-applicative, parsec, pretty + , process, tasty, tasty-golden, temporary, text, transformers + , unordered-containers }: mkDerivation { pname = "haskell-ci"; - version = "0.8"; - sha256 = "1wm5fs8fdy85lvjyy9n0yh66ax6bs0ll4gq7d8ba0ibsp69g6pm3"; + version = "0.10"; + sha256 = "09v103azd8rd1ps1h14f6rv8s9nga9ja679ma4j44236yfgswxg5"; isLibrary = false; isExecutable = true; libraryHaskellDepends = [ aeson base base-compat bytestring Cabal cabal-install-parsers - containers deepseq directory exceptions filepath generic-lens - HsYAML lattices microlens mtl network-uri optparse-applicative - parsec pretty process temporary text transformers - unordered-containers + containers deepseq directory exceptions filepath generic-lens-lite + HsYAML lattices mtl network-uri optparse-applicative parsec pretty + process temporary text transformers unordered-containers ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -112404,27 +112706,6 @@ self: { }) {}; "haskell-gi" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers - , directory, doctest, filepath, glib, gobject-introspection - , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe - , text, transformers, xdg-basedir, xml-conduit - }: - mkDerivation { - pname = "haskell-gi"; - version = "0.23.0"; - sha256 = "04d2lxmbbq7g0yrc5rz9n7zscza9g63vvbz0qv3427y7hbq1xn4a"; - libraryHaskellDepends = [ - attoparsec base bytestring Cabal containers directory filepath - haskell-gi-base mtl pretty-show process regex-tdfa safe text - transformers xdg-basedir xml-conduit - ]; - libraryPkgconfigDepends = [ glib gobject-introspection ]; - testHaskellDepends = [ base doctest process ]; - description = "Generate Haskell bindings for GObject Introspection capable libraries"; - license = stdenv.lib.licenses.lgpl21; - }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; - - "haskell-gi_0_23_1" = callPackage ({ mkDerivation, ansi-terminal, attoparsec, base, bytestring, Cabal , containers, directory, doctest, filepath, glib , gobject-introspection, haskell-gi-base, mtl, pretty-show, process @@ -112443,7 +112724,6 @@ self: { testHaskellDepends = [ attoparsec base doctest process ]; description = "Generate Haskell bindings for GObject Introspection capable libraries"; license = stdenv.lib.licenses.lgpl21; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) glib; inherit (pkgs) gobject-introspection;}; "haskell-gi-base" = callPackage @@ -113905,8 +114185,8 @@ self: { }: mkDerivation { pname = "haskell-updater"; - version = "1.3.1"; - sha256 = "0q2aix579mm3ksi0hipcmw8g2p5xfbgk6ph7jnraq5i2rxjchg7v"; + version = "1.3.2"; + sha256 = "0z1f6qajg191fqfnkh3g2c1iq802yh1plxzvzwl822bzd49m32j9"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -114736,6 +115016,36 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "haskoin-core_0_12_0" = callPackage + ({ mkDerivation, aeson, array, base, base16-bytestring, bytestring + , cereal, conduit, containers, cryptonite, deepseq, 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.12.0"; + sha256 = "0fqwvs5wwqlq21sk1rw4dz5gnvfb9fkxhfbl3g5sd76c9r6fvrwc"; + libraryHaskellDepends = [ + aeson array base base16-bytestring bytestring cereal conduit + containers cryptonite deepseq entropy hashable hspec HUnit memory + mtl murmur3 network QuickCheck safe scientific secp256k1-haskell + split string-conversions text time transformers + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring cereal containers deepseq 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 @@ -114761,38 +115071,6 @@ self: { }) {}; "haskoin-node" = callPackage - ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra - , containers, data-default, hashable, haskoin-core, hspec - , hspec-discover, HUnit, monad-logger, mtl, network, nqe, random - , resourcet, rocksdb-haskell, rocksdb-query, safe - , string-conversions, text, time, transformers, unliftio - , unordered-containers - }: - mkDerivation { - pname = "haskoin-node"; - version = "0.9.16"; - sha256 = "0k84jxlahk5axixn2y4hg63qbj6383hmidrrx2nll86vjifanv4f"; - libraryHaskellDepends = [ - base bytestring cereal conduit conduit-extra containers - data-default hashable haskoin-core monad-logger mtl network nqe - random resourcet rocksdb-haskell rocksdb-query string-conversions - text time transformers unliftio unordered-containers - ]; - testHaskellDepends = [ - base bytestring cereal conduit conduit-extra containers - data-default hashable haskoin-core hspec HUnit monad-logger mtl - network nqe random resourcet rocksdb-haskell rocksdb-query safe - string-conversions text time transformers unliftio - unordered-containers - ]; - testToolDepends = [ hspec-discover ]; - description = "Haskoin Node P2P library for Bitcoin and Bitcoin Cash"; - license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "haskoin-node_0_9_21" = callPackage ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra , containers, data-default, hashable, haskoin-core, hspec , hspec-discover, HUnit, monad-logger, mtl, network, nqe, random @@ -114873,35 +115151,36 @@ self: { "haskoin-store" = callPackage ({ mkDerivation, aeson, base, bytestring, cereal, conduit , containers, data-default, deepseq, filepath, hashable - , haskoin-core, haskoin-node, hspec, hspec-discover, http-types - , monad-logger, mtl, network, nqe, optparse-applicative, QuickCheck - , random, resourcet, rocksdb-haskell, rocksdb-query, scotty - , string-conversions, text, time, transformers, unliftio + , haskoin-core, haskoin-node, hedis, hspec, hspec-discover + , http-types, monad-logger, mtl, network, nqe, optparse-applicative + , QuickCheck, random, resourcet, rocksdb-haskell, rocksdb-query + , scotty, string-conversions, text, time, transformers, unliftio , unordered-containers, wai, warp }: mkDerivation { pname = "haskoin-store"; - version = "0.20.2"; - sha256 = "02w6yj62rxrm20ynbn65f4wf05s21bcsif0ylp9fiydxyygilbvf"; + version = "0.21.2"; + sha256 = "0316bipi2y9ylac4yw1sm9xn8zid0cjr620qmhlk4cy4qhbgqfrz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring cereal conduit containers data-default - deepseq hashable haskoin-core haskoin-node http-types monad-logger - mtl network nqe QuickCheck random resourcet rocksdb-haskell - rocksdb-query scotty string-conversions text time transformers - unliftio unordered-containers wai warp + deepseq hashable haskoin-core haskoin-node hedis http-types + monad-logger mtl network nqe QuickCheck random resourcet + rocksdb-haskell rocksdb-query scotty string-conversions text time + transformers unliftio unordered-containers wai warp ]; executableHaskellDepends = [ aeson base bytestring cereal conduit containers data-default - deepseq filepath hashable haskoin-core haskoin-node http-types - monad-logger mtl network nqe optparse-applicative QuickCheck random - resourcet rocksdb-haskell rocksdb-query scotty string-conversions - text time transformers unliftio unordered-containers wai warp + deepseq filepath hashable haskoin-core haskoin-node hedis + http-types monad-logger mtl network nqe optparse-applicative + QuickCheck random resourcet rocksdb-haskell rocksdb-query scotty + string-conversions text time transformers unliftio + unordered-containers wai warp ]; testHaskellDepends = [ aeson base bytestring cereal conduit containers data-default - deepseq hashable haskoin-core haskoin-node hspec http-types + deepseq hashable haskoin-core haskoin-node hedis hspec http-types monad-logger mtl network nqe QuickCheck random resourcet rocksdb-haskell rocksdb-query scotty string-conversions text time transformers unliftio unordered-containers wai warp @@ -115997,8 +116276,6 @@ self: { testHaskellDepends = [ base-prelude hasql hspec ]; description = "A pool of connections for Hasql"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hasql-postgres" = callPackage @@ -123122,6 +123399,8 @@ self: { pname = "hlrdb"; version = "0.3.1.0"; sha256 = "19sxpyv331sjldanf40gw598gcj98n9xwc985cz9k2m38ck3vwhr"; + revision = "1"; + editedCabalFile = "0ikina8r7b3n7gywj0fclarj8g4m20wd23vxwlswikbx4f9mpwgf"; libraryHaskellDepends = [ base base64-bytestring bytestring cryptonite hashable hedis hlrdb-core memory random store time unordered-containers @@ -125729,6 +126008,18 @@ self: { broken = true; }) {}; + "hout" = callPackage + ({ mkDerivation, base, do-notation, indexed }: + mkDerivation { + pname = "hout"; + version = "0.1.0.0"; + sha256 = "14facdqcfwc8f61rmzgkfx05pzbw6can9hc8aihnxsih9dznx4l2"; + libraryHaskellDepends = [ base indexed ]; + testHaskellDepends = [ base do-notation indexed ]; + description = "Non-interactive proof assistant monad for first-order logic"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hp2any-core" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , directory, filepath, network, old-locale, process, time @@ -126077,10 +126368,8 @@ self: { }: mkDerivation { pname = "hpath-directory"; - version = "0.13.2"; - sha256 = "1nxn1wz63h4wgspwnd1y4krf5k6adjbp1c3y0wr5kjhcnj4z20kl"; - revision = "1"; - editedCabalFile = "1zhrq3qcp4cx0djpx5bcw2f71kn16czqnb38k3cw78048q6mn7fg"; + version = "0.13.3"; + sha256 = "1cvqag2gincqdc0zmfs227qh0cqc6hvg26aaznis6q57jiyk0ja2"; libraryHaskellDepends = [ base bytestring exceptions hpath-filepath hpath-posix IfElse safe-exceptions streamly streamly-bytestring time unix @@ -126126,8 +126415,8 @@ self: { ({ mkDerivation, base, bytestring, hpath-filepath, unix }: mkDerivation { pname = "hpath-posix"; - version = "0.13.1"; - sha256 = "0axpzi2vl8cs3y5xsp1pa1fsgq13ry77rw8h8z5aivrzfvrj26d0"; + version = "0.13.2"; + sha256 = "1gxqrlxcm01ysd3hs61rhzfa3inxsj1w0hncydf1q66skshabzmf"; libraryHaskellDepends = [ base bytestring hpath-filepath unix ]; description = "Some low-level POSIX glue code, that is not in 'unix'"; license = stdenv.lib.licenses.bsd3; @@ -126972,6 +127261,18 @@ self: { license = "GPL"; }) {}; + "hs-bibutils_6_10_0_0" = callPackage + ({ mkDerivation, base, syb }: + mkDerivation { + pname = "hs-bibutils"; + version = "6.10.0.0"; + sha256 = "1wnpy1v5rbii2iwlcc9psnww8pkirv9zl21s64cmbi6q7dv15g3n"; + libraryHaskellDepends = [ base syb ]; + description = "Haskell bindings to bibutils, the bibliography conversion utilities"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hs-blake2" = callPackage ({ mkDerivation, base, bytestring, bytestring-arbitrary, criterion , cryptohash, libb2, QuickCheck, tasty, tasty-quickcheck @@ -128959,6 +129260,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hsebaysdk_0_4_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-client + , http-client-tls, http-types, text, time, transformers + , unordered-containers + }: + mkDerivation { + pname = "hsebaysdk"; + version = "0.4.1.0"; + sha256 = "0y1q667j0caqqaf57yjvcyyifvzpm4iwxk3y7awnp4c3ihf0ayb3"; + libraryHaskellDepends = [ + aeson base bytestring http-client http-client-tls http-types text + time transformers unordered-containers + ]; + description = "Haskell eBay SDK"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hsemail" = callPackage ({ mkDerivation, base, hspec, parsec, time, time-compat }: mkDerivation { @@ -130238,8 +130557,8 @@ self: { }: mkDerivation { pname = "hspec-hedgehog"; - version = "0.0.1.1"; - sha256 = "1x61lslkpc67k7rbrggwabx6s60wv2v3iqarrb8746dgn0p225vj"; + version = "0.0.1.2"; + sha256 = "17gbr4ssnzjk7nvpsnh47av6vd9wz27ax92xvr4jwyw0z7h2wn13"; libraryHaskellDepends = [ base hedgehog hspec hspec-core HUnit QuickCheck splitmix ]; @@ -131140,18 +131459,19 @@ self: { }) {}; "hstar" = callPackage - ({ mkDerivation, archive-libarchive, archive-sig, base, bytestring - , bz2, cpphs, lz4-hs, lzlib, lzma, optparse-applicative, zlib, zstd + ({ mkDerivation, archive-libarchive, archive-sig, base, brotli + , bytestring, bz2, cpphs, lz4-hs, lzlib, lzma, optparse-applicative + , zlib, zstd }: mkDerivation { pname = "hstar"; - version = "0.1.0.1"; - sha256 = "0vv0lc06hzfamqjyq50li9wvb1vzpcnkrgiaap67nd649i3f0z5h"; + version = "0.1.0.2"; + sha256 = "0npc8ykz9d5j0ghxfpyjvgzsk4nsgrcgl0jqb437rp2641j119j1"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - archive-libarchive archive-sig base bytestring bz2 lz4-hs lzlib - lzma optparse-applicative zlib zstd + archive-libarchive archive-sig base brotli bytestring bz2 lz4-hs + lzlib lzma optparse-applicative zlib zstd ]; executableToolDepends = [ cpphs ]; description = "Haskell version of tar CLI utility"; @@ -132936,8 +133256,8 @@ self: { pname = "http-media"; version = "0.8.0.0"; sha256 = "0lww5cxrc9jlvzsysjv99lca33i4rb7cll66p3c0rdpmvz8pk0ir"; - revision = "2"; - editedCabalFile = "0qvkhbxdz33lis5vca3jm1b44fkm7aalf4iz1gblr8xivnpmq885"; + revision = "3"; + editedCabalFile = "1ndz5x6njl35h73il5c6qpaqd4ynvg21n6k7sb8aq09gfbg544d8"; libraryHaskellDepends = [ base bytestring case-insensitive containers utf8-string ]; @@ -134005,16 +134325,15 @@ self: { }) {hunt-client = null;}; "hup" = callPackage - ({ mkDerivation, base, bytestring, cmdargs, directory, doctest - , filepath, Glob, hspec, hspec-core, hspec-wai, http-client - , http-client-tls, http-types, mtl, QuickCheck, shelly, simple - , split, tagsoup, tar, temporary, text, transformers, wai - , wai-extra, zlib + ({ mkDerivation, base, bytestring, cmdargs, directory, filepath + , hspec, hspec-core, hspec-wai, http-client, http-client-tls + , http-types, mtl, QuickCheck, shelly, simple, split, tagsoup, tar + , temporary, text, transformers, wai, wai-extra, zlib }: mkDerivation { pname = "hup"; - version = "0.3.0.0"; - sha256 = "1aby486naf17d3sp0mmhhpm9rvy3x85574zap6fjnkjvrr07b9iz"; + version = "0.3.0.2"; + sha256 = "05xgbdzy3jg9qpxrxrfb6mjydw80wa65gkjcpqj2ckmk0vd6hmhr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134026,9 +134345,8 @@ self: { transformers ]; testHaskellDepends = [ - base bytestring doctest filepath Glob hspec hspec-core hspec-wai - http-client http-types QuickCheck simple temporary transformers wai - wai-extra + base bytestring filepath hspec hspec-core hspec-wai http-client + http-types QuickCheck simple temporary transformers wai wai-extra ]; description = "Upload packages or documentation to a hackage server"; license = stdenv.lib.licenses.bsd2; @@ -134260,8 +134578,8 @@ self: { ({ mkDerivation, base, hvega, text }: mkDerivation { pname = "hvega-theme"; - version = "0.1.0.0"; - sha256 = "03rm4fl8vgl3yv60wx6vrj1dfbwsxwksm1dbiz0wzz1scdax1gc4"; + version = "0.2.0.4"; + sha256 = "0g2h5is0gbr43fn8pbfj2nzh4wlgx6kjayq4lcnbr10z0j3vpqpv"; libraryHaskellDepends = [ base hvega text ]; description = "Theme for hvega"; license = stdenv.lib.licenses.gpl3; @@ -134270,13 +134588,18 @@ self: { }) {}; "hw-aeson" = callPackage - ({ mkDerivation, aeson, base, hedgehog, hspec, text }: + ({ mkDerivation, aeson, base, doctest, doctest-discover, hedgehog + , hspec, hspec-discover, text + }: mkDerivation { pname = "hw-aeson"; - version = "0.1.0.2"; - sha256 = "11i0w0w5mi9k94p14c4pi1lsgwbr2cnnyhl7fbmxc7lqwr2a7k3s"; + version = "0.1.1.0"; + sha256 = "0d50yghgnxhynbm6w5kgkhgr8xgnghr8g1xn7zf0p9ax8dxkdy00"; libraryHaskellDepends = [ aeson base text ]; - testHaskellDepends = [ aeson base hedgehog hspec ]; + testHaskellDepends = [ + aeson base doctest doctest-discover hedgehog hspec + ]; + testToolDepends = [ doctest-discover hspec-discover ]; description = "Convenience functions for Aeson"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -134335,6 +134658,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-balancedparens_0_3_1_0" = callPackage + ({ mkDerivation, base, criterion, deepseq, doctest + , doctest-discover, hedgehog, hspec, hspec-discover, hw-bits + , hw-excess, hw-fingertree, hw-hspec-hedgehog, hw-prim + , hw-rankselect-base, transformers, vector + }: + mkDerivation { + pname = "hw-balancedparens"; + version = "0.3.1.0"; + sha256 = "1nr3p3qcd72i4av71vf9kxv483mdg13c10dnpynabxfh7vx49vc9"; + libraryHaskellDepends = [ + base deepseq hedgehog hspec hw-bits hw-excess hw-fingertree hw-prim + hw-rankselect-base vector + ]; + testHaskellDepends = [ + base doctest doctest-discover hedgehog hspec hw-bits + hw-hspec-hedgehog hw-prim hw-rankselect-base transformers vector + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + benchmarkHaskellDepends = [ + base criterion hedgehog hw-bits hw-prim vector + ]; + doHaddock = false; + description = "Balanced parentheses"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-bits" = callPackage ({ mkDerivation, base, bitvec, bytestring, criterion, deepseq , doctest, doctest-discover, hedgehog, hspec, hspec-discover @@ -134358,6 +134709,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-bits_0_7_2_0" = callPackage + ({ mkDerivation, base, bitvec, bytestring, criterion, deepseq + , doctest, doctest-discover, hedgehog, hspec, hspec-discover + , hw-hspec-hedgehog, hw-int, hw-prim, hw-string-parse, vector + }: + mkDerivation { + pname = "hw-bits"; + version = "0.7.2.0"; + sha256 = "1i985qgcvwphawh91qh2r1wvh8y4kfa7s7wwwr92pgw4qsrvfkzi"; + libraryHaskellDepends = [ + base bitvec bytestring deepseq hw-int hw-prim hw-string-parse + vector + ]; + testHaskellDepends = [ + base bitvec bytestring doctest doctest-discover hedgehog hspec + hw-hspec-hedgehog hw-prim vector + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + benchmarkHaskellDepends = [ base criterion vector ]; + description = "Bit manipulation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-ci-assist" = callPackage ({ mkDerivation, base, hedgehog, hspec, hspec-discover, hw-hedgehog , hw-hspec-hedgehog, optparse-applicative @@ -134403,6 +134778,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hw-conduit_0_2_1_0" = callPackage + ({ mkDerivation, array, base, bytestring, conduit + , conduit-combinators, criterion, doctest, doctest-discover, hspec + , hspec-discover, mmap, time, transformers, unliftio-core, vector + , word8 + }: + mkDerivation { + pname = "hw-conduit"; + version = "0.2.1.0"; + sha256 = "1xnkkpqcgyii7f16jjh2k2qh4ydpsff5q2xnggyg4jf7m69yrih2"; + libraryHaskellDepends = [ + array base bytestring conduit conduit-combinators time transformers + unliftio-core word8 + ]; + testHaskellDepends = [ + base bytestring conduit doctest doctest-discover hspec + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring conduit criterion mmap vector + ]; + description = "Conduits for tokenizing streams"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-conduit-merges" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec , mtl, QuickCheck @@ -134421,6 +134822,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-conduit-merges_0_2_1_0" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec + , hspec-discover, mtl, QuickCheck + }: + mkDerivation { + pname = "hw-conduit-merges"; + version = "0.2.1.0"; + sha256 = "042i1cs7qpjs8q8birr6xjzyxp28y7l6isv2fwkisv4agx8kfgm0"; + libraryHaskellDepends = [ base conduit conduit-extra mtl ]; + testHaskellDepends = [ + base bytestring conduit conduit-extra hspec mtl QuickCheck + ]; + testToolDepends = [ hspec-discover ]; + description = "Additional merges and joins for Conduit"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-diagnostics" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -134432,6 +134851,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-diagnostics_0_0_1_0" = callPackage + ({ mkDerivation, base, doctest, doctest-discover }: + mkDerivation { + pname = "hw-diagnostics"; + version = "0.0.1.0"; + sha256 = "111g54c5bhgjii6vbyb116bg3dxywa9l693r8xjjrxpamzvi0avj"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest doctest-discover ]; + testToolDepends = [ doctest-discover ]; + description = "Diagnostics library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-dsv" = callPackage ({ mkDerivation, appar, base, bits-extra, bytestring, cassava , criterion, deepseq, directory, doctest, doctest-discover @@ -134472,16 +134905,56 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-dsv_0_4_1_0" = callPackage + ({ mkDerivation, appar, base, bits-extra, bytestring, cassava + , criterion, deepseq, directory, doctest, doctest-discover + , generic-lens, ghc-prim, hedgehog, hspec, hspec-discover, hw-bits + , hw-hspec-hedgehog, hw-ip, hw-prim, hw-rankselect + , hw-rankselect-base, hw-simd, lens, mmap, optparse-applicative + , resourcet, text, transformers, vector, weigh + }: + mkDerivation { + pname = "hw-dsv"; + version = "0.4.1.0"; + sha256 = "1wv0yg662c3bq4kpgfqfjks59v17i5h3v3mils1qpxn4c57jr3s8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bits-extra bytestring deepseq ghc-prim hw-bits hw-prim + hw-rankselect hw-rankselect-base hw-simd transformers vector + ]; + executableHaskellDepends = [ + appar base bits-extra bytestring deepseq generic-lens ghc-prim + hedgehog hw-bits hw-ip hw-prim hw-rankselect hw-rankselect-base + hw-simd lens optparse-applicative resourcet text transformers + vector + ]; + testHaskellDepends = [ + base bits-extra bytestring cassava deepseq directory doctest + doctest-discover ghc-prim hedgehog hspec hw-bits hw-hspec-hedgehog + hw-prim hw-rankselect hw-rankselect-base hw-simd text vector weigh + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + benchmarkHaskellDepends = [ + base bits-extra bytestring cassava criterion deepseq directory + ghc-prim hw-bits hw-prim hw-rankselect hw-rankselect-base hw-simd + mmap vector + ]; + description = "Unbelievably fast streaming DSV file parser"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-dump" = callPackage - ({ mkDerivation, base, bits-extra, bytestring, criterion - , generic-lens, hedgehog, hspec, hspec-discover, hw-bits - , hw-hspec-hedgehog, hw-prim, lens, optparse-applicative + ({ mkDerivation, base, bits-extra, bytestring, criterion, doctest + , doctest-discover, generic-lens, hedgehog, hspec, hspec-discover + , hw-bits, hw-hspec-hedgehog, hw-prim, lens, optparse-applicative , QuickCheck, safe, vector }: mkDerivation { pname = "hw-dump"; - version = "0.1.0.1"; - sha256 = "0iswbvvviaj1j34zvm04nzpjicwyzs5imc4rc8vkwmx41nlypxdv"; + version = "0.1.1.0"; + sha256 = "14ya18i3xvay5xn8j20b06msqyd49h34w526k1x1fxdp0i2l3rwr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134492,10 +134965,10 @@ self: { optparse-applicative vector ]; testHaskellDepends = [ - base bits-extra bytestring hedgehog hspec hw-bits hw-hspec-hedgehog - hw-prim QuickCheck vector + base bits-extra bytestring doctest doctest-discover hedgehog hspec + hw-bits hw-hspec-hedgehog hw-prim QuickCheck vector ]; - testToolDepends = [ hspec-discover ]; + testToolDepends = [ doctest-discover hspec-discover ]; benchmarkHaskellDepends = [ base bits-extra bytestring criterion hw-bits hw-prim vector ]; @@ -134540,6 +135013,44 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-eliasfano_0_1_2_0" = callPackage + ({ mkDerivation, base, binary, bytestring, criterion, deepseq + , doctest, doctest-discover, generic-lens, hedgehog, hspec + , hspec-discover, hw-bits, hw-hedgehog, hw-hspec-hedgehog, hw-int + , hw-packed-vector, hw-prim, hw-rankselect, hw-rankselect-base + , lens, mmap, optparse-applicative, resourcet, temporary-resourcet + , vector + }: + mkDerivation { + pname = "hw-eliasfano"; + version = "0.1.2.0"; + sha256 = "1wqpzznmz6bl88wzhrfcbgi49dw7w7i0p92hyc0m58nanqm1zgnj"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base deepseq hw-bits hw-int hw-packed-vector hw-prim hw-rankselect + hw-rankselect-base temporary-resourcet vector + ]; + executableHaskellDepends = [ + base binary bytestring generic-lens hw-bits hw-packed-vector + hw-prim hw-rankselect hw-rankselect-base lens optparse-applicative + resourcet temporary-resourcet vector + ]; + testHaskellDepends = [ + base doctest doctest-discover hedgehog hspec hw-bits hw-hedgehog + hw-hspec-hedgehog hw-int hw-packed-vector hw-prim hw-rankselect + hw-rankselect-base vector + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring criterion hedgehog hspec hw-bits hw-hedgehog + hw-hspec-hedgehog hw-int hw-packed-vector hw-prim mmap vector + ]; + description = "Elias-Fano"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-excess" = callPackage ({ mkDerivation, base, bytestring, criterion, doctest , doctest-discover, hedgehog, hspec, hspec-discover, hw-bits @@ -134567,6 +135078,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-excess_0_2_3_0" = callPackage + ({ mkDerivation, base, bytestring, criterion, doctest + , doctest-discover, hedgehog, hspec, hspec-discover, hw-bits + , hw-hspec-hedgehog, hw-prim, hw-rankselect-base, QuickCheck, safe + , vector + }: + mkDerivation { + pname = "hw-excess"; + version = "0.2.3.0"; + sha256 = "0xiyf3xyg6f4kgkils9ycx6q0qcsbd6rw4m9lizw9295mnp05s3g"; + libraryHaskellDepends = [ + base hw-bits hw-prim hw-rankselect-base safe vector + ]; + testHaskellDepends = [ + base doctest doctest-discover hedgehog hspec hw-bits + hw-hspec-hedgehog hw-prim QuickCheck vector + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring criterion hw-prim vector + ]; + description = "Excess"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-fingertree" = callPackage ({ mkDerivation, base, deepseq, hedgehog, hspec, hspec-discover , hw-hspec-hedgehog, hw-prim @@ -134584,6 +135121,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-fingertree_0_1_2_0" = callPackage + ({ mkDerivation, base, deepseq, doctest, doctest-discover, hedgehog + , hspec, hspec-discover, hw-hspec-hedgehog, hw-prim + }: + mkDerivation { + pname = "hw-fingertree"; + version = "0.1.2.0"; + sha256 = "0b1aff5aa9ifapyf2qvqggxfm36x5w7l7c37bfy9qdll264pdh0i"; + libraryHaskellDepends = [ base deepseq hw-prim ]; + testHaskellDepends = [ + base deepseq doctest doctest-discover hedgehog hspec + hw-hspec-hedgehog + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + description = "Generic finger-tree structure, with example instances"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-fingertree-strict" = callPackage ({ mkDerivation, base, deepseq, hedgehog, hspec, hspec-discover , HUnit, hw-hspec-hedgehog, QuickCheck, test-framework @@ -134605,6 +135161,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-fingertree-strict_0_1_2_0" = callPackage + ({ mkDerivation, base, deepseq, doctest, doctest-discover, hedgehog + , hspec, hspec-discover, HUnit, hw-hspec-hedgehog, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + }: + mkDerivation { + pname = "hw-fingertree-strict"; + version = "0.1.2.0"; + sha256 = "1zhh694m8hbin7059ys8c6sqjvyfsazcsp0jxqg59w5ypqjznzca"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ + base doctest doctest-discover hedgehog hspec HUnit + hw-hspec-hedgehog QuickCheck test-framework test-framework-hunit + test-framework-quickcheck2 + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + description = "Generic strict finger-tree structure"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-hedgehog" = callPackage ({ mkDerivation, base, hedgehog, vector }: mkDerivation { @@ -134617,6 +135194,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-hedgehog_0_1_1_0" = callPackage + ({ mkDerivation, base, doctest, doctest-discover, hedgehog, vector + }: + mkDerivation { + pname = "hw-hedgehog"; + version = "0.1.1.0"; + sha256 = "0a2pic2h983kdkai68wabclzwjbk5i9vz229jlwvs0hyw6b0mzz9"; + libraryHaskellDepends = [ base hedgehog vector ]; + testHaskellDepends = [ base doctest doctest-discover ]; + testToolDepends = [ doctest-discover ]; + description = "Extra hedgehog functionality"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-hspec-hedgehog" = callPackage ({ mkDerivation, base, call-stack, hedgehog, hspec, hspec-discover , HUnit, transformers @@ -134634,6 +135226,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-hspec-hedgehog_0_1_1_0" = callPackage + ({ mkDerivation, base, call-stack, doctest, doctest-discover + , hedgehog, hspec, hspec-discover, HUnit, transformers + }: + mkDerivation { + pname = "hw-hspec-hedgehog"; + version = "0.1.1.0"; + sha256 = "04r30hb4664yciwfl3kyx0xn6sqc6abwhavb4wxiaas8b4px9kyn"; + libraryHaskellDepends = [ + base call-stack hedgehog hspec HUnit transformers + ]; + testHaskellDepends = [ + base call-stack doctest doctest-discover hedgehog hspec HUnit + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + description = "Interoperability between hspec and hedgehog"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-int" = callPackage ({ mkDerivation, base, hedgehog, hspec, hspec-discover, hw-hedgehog , hw-hspec-hedgehog @@ -134651,6 +135263,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-int_0_0_1_0" = callPackage + ({ mkDerivation, base, doctest, doctest-discover, hedgehog, hspec + , hspec-discover, hw-hedgehog, hw-hspec-hedgehog + }: + mkDerivation { + pname = "hw-int"; + version = "0.0.1.0"; + sha256 = "1ishvxf2n0j3m5ly2drpddbjw41zf4gpncizi4anw5f85k3ygyys"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base doctest doctest-discover hedgehog hspec hw-hedgehog + hw-hspec-hedgehog + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + description = "Additional facilities for Integers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-ip" = callPackage ({ mkDerivation, appar, base, binary, bytestring, containers , doctest, doctest-discover, generic-lens, hedgehog, hspec @@ -134682,6 +135313,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-ip_2_4_2_0" = callPackage + ({ mkDerivation, appar, base, binary, bytestring, containers + , doctest, doctest-discover, generic-lens, hedgehog, hspec + , hspec-discover, hw-bits, hw-hspec-hedgehog, iproute, lens + , optparse-applicative, text + }: + mkDerivation { + pname = "hw-ip"; + version = "2.4.2.0"; + sha256 = "1bvh4fkg1ffr3y8wink62rgkynlcgjhmra7a4w01h1dmw1vb2vfx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + appar base containers generic-lens hedgehog hw-bits iproute text + ]; + executableHaskellDepends = [ + appar base binary bytestring generic-lens lens optparse-applicative + text + ]; + testHaskellDepends = [ + appar base doctest doctest-discover generic-lens hedgehog hspec + hw-bits hw-hspec-hedgehog text + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + doHaddock = false; + description = "Library for manipulating IP addresses and CIDR blocks"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-json" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base , bits-extra, bytestring, criterion, directory, dlist, generic-lens @@ -134724,30 +135385,74 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-json_1_3_2_0" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base + , bits-extra, bytestring, criterion, directory, dlist, doctest + , doctest-discover, generic-lens, hedgehog, hspec, hspec-discover + , hw-balancedparens, hw-bits, hw-hspec-hedgehog, hw-json-simd + , hw-json-simple-cursor, hw-json-standard-cursor, hw-mquery + , hw-parser, hw-prim, hw-rankselect, hw-rankselect-base, hw-simd + , lens, mmap, optparse-applicative, scientific, text, transformers + , unordered-containers, vector, word8 + }: + mkDerivation { + pname = "hw-json"; + version = "1.3.2.0"; + sha256 = "00pdd813phgfi9g9xs6r7iw03iifwmlzfb0b424q1cq6d9z37v2f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint attoparsec base bits-extra bytestring dlist + hw-balancedparens hw-bits hw-json-simple-cursor + hw-json-standard-cursor hw-mquery hw-parser hw-prim hw-rankselect + hw-rankselect-base hw-simd mmap text vector word8 + ]; + executableHaskellDepends = [ + aeson base bytestring dlist generic-lens hw-balancedparens + hw-json-simd hw-json-simple-cursor hw-json-standard-cursor + hw-mquery hw-prim hw-rankselect hw-rankselect-base lens mmap + optparse-applicative text unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec base bytestring doctest doctest-discover hedgehog + hspec hw-balancedparens hw-bits hw-hspec-hedgehog + hw-json-simple-cursor hw-json-standard-cursor hw-prim hw-rankselect + hw-rankselect-base scientific text transformers vector + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring criterion directory hw-json-standard-cursor mmap + ]; + description = "Memory efficient JSON parser"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-json-lens" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion, hedgehog - , hspec, hspec-discover, hw-balancedparens, hw-bits - , hw-hspec-hedgehog, hw-json, hw-json-standard-cursor, hw-prim - , lens, scientific, text, vector, word8 + ({ mkDerivation, aeson, base, bytestring, containers, criterion + , doctest, doctest-discover, hedgehog, hspec, hspec-discover + , hw-balancedparens, hw-bits, hw-hspec-hedgehog, hw-json + , hw-json-standard-cursor, hw-prim, lens, scientific, text, vector + , word8 }: mkDerivation { pname = "hw-json-lens"; - version = "0.2.0.0"; - sha256 = "0byl0hqizqgpbajcgid0xca6jiqzm6syiz48jlywzg27niv3xdpd"; + version = "0.2.1.0"; + sha256 = "1v3ws69pyrw5ja00r326kqlq6hd7r5np119fk2la7f74aqhajjf6"; libraryHaskellDepends = [ - base bytestring containers hw-json lens scientific text word8 + aeson base bytestring containers hw-json lens scientific text word8 ]; testHaskellDepends = [ - base bytestring hedgehog hspec hw-balancedparens hw-bits - hw-hspec-hedgehog hw-json hw-json-standard-cursor hw-prim lens - vector + base bytestring doctest doctest-discover hedgehog hspec + hw-balancedparens hw-bits hw-hspec-hedgehog hw-json + hw-json-standard-cursor hw-prim lens vector ]; - testToolDepends = [ hspec-discover ]; + testToolDepends = [ doctest-discover hspec-discover ]; benchmarkHaskellDepends = [ base bytestring criterion hw-json lens ]; description = "Lens for hw-json"; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.bsd3; }) {}; "hw-json-simd" = callPackage @@ -134770,6 +135475,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-json-simd_0_1_1_0" = callPackage + ({ mkDerivation, base, bytestring, c2hs, doctest, doctest-discover + , hw-prim, lens, optparse-applicative, transformers, vector + }: + mkDerivation { + pname = "hw-json-simd"; + version = "0.1.1.0"; + sha256 = "0bpfyx2bd7pcr8y8bfahcdm30bznqixfawraq3xzy476vy9ppa9n"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base bytestring hw-prim lens vector ]; + libraryToolDepends = [ c2hs ]; + executableHaskellDepends = [ + base bytestring hw-prim lens optparse-applicative vector + ]; + testHaskellDepends = [ + base bytestring doctest doctest-discover hw-prim lens transformers + vector + ]; + testToolDepends = [ doctest-discover ]; + description = "SIMD-based JSON semi-indexer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-json-simple-cursor" = callPackage ({ mkDerivation, base, bytestring, criterion, directory , generic-lens, hedgehog, hspec, hspec-discover, hw-balancedparens @@ -134804,6 +135534,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-json-simple-cursor_0_1_1_0" = callPackage + ({ mkDerivation, base, bytestring, criterion, directory, doctest + , doctest-discover, generic-lens, hedgehog, hspec, hspec-discover + , hw-balancedparens, hw-bits, hw-hspec-hedgehog, hw-json-simd + , hw-prim, hw-rankselect, hw-rankselect-base, lens, mmap + , optparse-applicative, text, vector, word8 + }: + mkDerivation { + pname = "hw-json-simple-cursor"; + version = "0.1.1.0"; + sha256 = "1kwxnqsa2mkw5sa8rc9rixjm6f75lyjdaz7f67yyhwls5v4315bl"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring hw-balancedparens hw-bits hw-prim hw-rankselect + hw-rankselect-base vector word8 + ]; + executableHaskellDepends = [ + base bytestring generic-lens hw-balancedparens hw-json-simd hw-prim + hw-rankselect hw-rankselect-base lens mmap optparse-applicative + text vector + ]; + testHaskellDepends = [ + base bytestring doctest doctest-discover hedgehog hspec + hw-balancedparens hw-bits hw-hspec-hedgehog hw-prim hw-rankselect + hw-rankselect-base vector + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring criterion directory mmap + ]; + description = "Memory efficient JSON parser"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-json-standard-cursor" = callPackage ({ mkDerivation, array, base, bits-extra, bytestring, criterion , directory, doctest, doctest-discover, generic-lens, hedgehog @@ -134841,6 +135607,44 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-json-standard-cursor_0_2_2_0" = callPackage + ({ mkDerivation, array, base, bits-extra, bytestring, criterion + , directory, doctest, doctest-discover, generic-lens, hedgehog + , hspec, hspec-discover, hw-balancedparens, hw-bits + , hw-hspec-hedgehog, hw-json-simd, hw-prim, hw-rankselect + , hw-rankselect-base, lens, mmap, optparse-applicative, text + , vector, word8 + }: + mkDerivation { + pname = "hw-json-standard-cursor"; + version = "0.2.2.0"; + sha256 = "0rj0p3p2b5ghyyfkzvaivzcdsmnjxvqm16n94qpwacaszyca8hny"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bits-extra bytestring hw-balancedparens hw-bits + hw-json-simd hw-prim hw-rankselect hw-rankselect-base mmap vector + word8 + ]; + executableHaskellDepends = [ + base bytestring generic-lens hw-balancedparens hw-json-simd hw-prim + hw-rankselect hw-rankselect-base lens mmap optparse-applicative + text vector + ]; + testHaskellDepends = [ + base bits-extra bytestring doctest doctest-discover hedgehog hspec + hw-balancedparens hw-bits hw-hspec-hedgehog hw-prim hw-rankselect + hw-rankselect-base vector + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring criterion directory mmap + ]; + description = "Memory efficient JSON parser"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-kafka-avro" = callPackage ({ mkDerivation, aeson, avro, base, binary, bytestring, cache , containers, errors, hashable, hspec, http-client, http-types @@ -134849,8 +135653,8 @@ self: { }: mkDerivation { pname = "hw-kafka-avro"; - version = "5.0.0"; - sha256 = "1j2al3xmymjzqc6009wm83b3bpddgshsmrlgp5129801bssc8s5w"; + version = "5.1.0"; + sha256 = "11j1c881g08vgyaf26rfylydii0zk824i210pxb393616npyg9h5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134869,13 +135673,13 @@ self: { "hw-kafka-client" = callPackage ({ mkDerivation, base, bifunctors, bytestring, c2hs, containers - , either, hspec, monad-loops, random, rdkafka, text, transformers - , unix + , either, hspec, hspec-discover, monad-loops, random, rdkafka, text + , transformers, unix }: mkDerivation { pname = "hw-kafka-client"; - version = "3.0.0"; - sha256 = "1b2f9mxlnvd1jmnhpvsliy8b1xcygmgqdanggmdi44iikchmv62y"; + version = "3.1.0"; + sha256 = "0dnqswvkxqwvhcxkr2vh5qskbj4dmqm52n17y57n4nk5wkr30knz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134887,6 +135691,7 @@ self: { base bifunctors bytestring containers either hspec monad-loops random text transformers ]; + testToolDepends = [ hspec-discover ]; description = "Kafka bindings for Haskell"; license = stdenv.lib.licenses.mit; }) {inherit (pkgs) rdkafka;}; @@ -134894,12 +135699,13 @@ self: { "hw-kafka-conduit" = callPackage ({ mkDerivation, base, bifunctors, bytestring, conduit , conduit-extra, containers, exceptions, extra, hspec - , hw-kafka-client, mtl, QuickCheck, resourcet, transformers + , hspec-discover, hw-kafka-client, mtl, QuickCheck, resourcet + , transformers }: mkDerivation { pname = "hw-kafka-conduit"; - version = "2.6.0"; - sha256 = "0z3rhxzj8zni2z0mb7aka21dblyniqby0qf2y6cnnjw6gmvrkc1b"; + version = "2.7.0"; + sha256 = "1ld0kmfk0i87rqyk4hxnrchl4asjy6bf6qvp5f1dcrp69r02mqy0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134910,6 +135716,7 @@ self: { base bifunctors bytestring conduit conduit-extra containers extra hspec hw-kafka-client mtl QuickCheck resourcet transformers ]; + testToolDepends = [ hspec-discover ]; description = "Conduit bindings for hw-kafka-client"; license = stdenv.lib.licenses.mit; }) {}; @@ -134936,6 +135743,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-mquery_0_2_1_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, dlist, doctest + , doctest-discover, hedgehog, hspec, hspec-discover + , hw-hspec-hedgehog, lens + }: + mkDerivation { + pname = "hw-mquery"; + version = "0.2.1.0"; + sha256 = "1qhd8jcwffr57mjraw0g3xj9kb0jd75ybqaj1sbxw31lc2hr9w9j"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ ansi-wl-pprint base dlist lens ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base dlist doctest doctest-discover hedgehog hspec + hw-hspec-hedgehog lens + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + description = "Monadic query DSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-packed-vector" = callPackage ({ mkDerivation, base, binary, bytestring, criterion, deepseq , directory, generic-lens, hedgehog, hspec, hspec-discover, hw-bits @@ -134967,6 +135797,38 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-packed-vector_0_2_1_0" = callPackage + ({ mkDerivation, base, binary, bytestring, criterion, deepseq + , directory, doctest, doctest-discover, generic-lens, hedgehog + , hspec, hspec-discover, hw-bits, hw-hedgehog, hw-hspec-hedgehog + , hw-prim, lens, optparse-applicative, vector + }: + mkDerivation { + pname = "hw-packed-vector"; + version = "0.2.1.0"; + sha256 = "13hly2yzx6kx4j56iksgj4i3wmvg7rmxq57d0g87lmybzhha9q38"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring deepseq hw-bits hw-prim vector + ]; + executableHaskellDepends = [ + base binary bytestring generic-lens hw-bits hw-prim lens + optparse-applicative vector + ]; + testHaskellDepends = [ + base bytestring doctest doctest-discover hedgehog hspec hw-bits + hw-hedgehog hw-hspec-hedgehog hw-prim vector + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + benchmarkHaskellDepends = [ + base criterion directory hedgehog hspec hw-prim vector + ]; + description = "Packed Vector"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-parser" = callPackage ({ mkDerivation, attoparsec, base, bytestring, hedgehog, hspec , hspec-discover, hw-hspec-hedgehog, hw-prim, text @@ -134984,6 +135846,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-parser_0_1_1_0" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, doctest + , doctest-discover, hedgehog, hspec, hspec-discover + , hw-hspec-hedgehog, hw-prim, text + }: + mkDerivation { + pname = "hw-parser"; + version = "0.1.1.0"; + sha256 = "1zsbw725mw3fn4814qricqanbvx1kgbnqvgwijqgfv8jz7yf5gxa"; + libraryHaskellDepends = [ + attoparsec base bytestring hw-prim text + ]; + testHaskellDepends = [ + base doctest doctest-discover hedgehog hspec hw-hspec-hedgehog + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + description = "Simple parser support"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-prim" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, directory , doctest, doctest-discover, exceptions, ghc-prim, hedgehog, hspec @@ -135013,6 +135896,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-prim_0_6_3_0" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, directory + , doctest, doctest-discover, exceptions, ghc-prim, hedgehog, hspec + , hspec-discover, hw-hspec-hedgehog, mmap, QuickCheck, transformers + , unliftio-core, vector + }: + mkDerivation { + pname = "hw-prim"; + version = "0.6.3.0"; + sha256 = "0gqn7s0ki9x951n5whyh0pkcbbqz4kpcn80xxpsv1c0v34946xv7"; + libraryHaskellDepends = [ + base bytestring deepseq ghc-prim mmap transformers unliftio-core + vector + ]; + testHaskellDepends = [ + base bytestring directory doctest doctest-discover exceptions + hedgehog hspec hw-hspec-hedgehog mmap QuickCheck transformers + vector + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring criterion mmap transformers vector + ]; + description = "Primitive functions and data types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-prim-bits" = callPackage ({ mkDerivation, base, criterion, hedgehog, hspec, hw-hedgehog , hw-hspec-hedgehog, QuickCheck, vector @@ -135072,6 +135983,44 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-rankselect_0_13_4_0" = callPackage + ({ mkDerivation, base, bytestring, conduit, criterion, deepseq + , directory, doctest, doctest-discover, generic-lens, hedgehog + , hspec, hspec-discover, hw-balancedparens, hw-bits, hw-fingertree + , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, lens + , mmap, mtl, optparse-applicative, QuickCheck, resourcet + , transformers, vector + }: + mkDerivation { + pname = "hw-rankselect"; + version = "0.13.4.0"; + sha256 = "0chk3n4vb55px943w0l3q7pxhgbvqm64vn7lkhi7k0l2dpybycp7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base deepseq hedgehog hspec hw-balancedparens hw-bits hw-fingertree + hw-prim hw-rankselect-base vector + ]; + executableHaskellDepends = [ + base directory generic-lens hw-bits hw-prim hw-rankselect-base lens + mmap mtl optparse-applicative vector + ]; + testHaskellDepends = [ + base directory doctest doctest-discover hedgehog hspec hw-bits + hw-hedgehog hw-hspec-hedgehog hw-prim hw-rankselect-base mmap + QuickCheck transformers vector + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring conduit criterion directory hw-bits hw-prim + hw-rankselect-base mmap resourcet vector + ]; + doHaddock = false; + description = "Rank-select"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-rankselect-base" = callPackage ({ mkDerivation, base, bits-extra, bitvec, criterion, hedgehog , hspec, hspec-discover, hw-bits, hw-hedgehog, hw-hspec-hedgehog @@ -135099,6 +136048,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-rankselect-base_0_3_4_0" = callPackage + ({ mkDerivation, base, bits-extra, bitvec, criterion, doctest + , doctest-discover, hedgehog, hspec, hspec-discover, hw-bits + , hw-hedgehog, hw-hspec-hedgehog, hw-int, hw-prim, hw-string-parse + , QuickCheck, vector + }: + mkDerivation { + pname = "hw-rankselect-base"; + version = "0.3.4.0"; + sha256 = "0rfk06fwmvpw2s7m397xm2s0831ad743325pv6yrd7019jcbiayl"; + libraryHaskellDepends = [ + base bits-extra bitvec hw-bits hw-int hw-prim hw-string-parse + vector + ]; + testHaskellDepends = [ + base bits-extra bitvec doctest doctest-discover hedgehog hspec + hw-bits hw-hedgehog hw-hspec-hedgehog hw-prim QuickCheck vector + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + benchmarkHaskellDepends = [ + base bits-extra criterion hw-bits hw-prim vector + ]; + description = "Rank-select base"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-simd" = callPackage ({ mkDerivation, base, bits-extra, bytestring, c2hs, cassava , containers, criterion, deepseq, directory, hedgehog, hspec @@ -135129,6 +136105,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-simd_0_1_2_0" = callPackage + ({ mkDerivation, base, bits-extra, bytestring, c2hs, cassava + , containers, criterion, deepseq, directory, doctest + , doctest-discover, hedgehog, hspec, hspec-discover, hw-bits + , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect + , hw-rankselect-base, lens, mmap, text, transformers, vector + }: + mkDerivation { + pname = "hw-simd"; + version = "0.1.2.0"; + sha256 = "1r202xzqprb1v8ajd9n6ixckjfdy17mn8jibx4j2xgknx595v24f"; + libraryHaskellDepends = [ + base bits-extra bytestring deepseq hw-bits hw-prim hw-rankselect + hw-rankselect-base transformers vector + ]; + libraryToolDepends = [ c2hs ]; + testHaskellDepends = [ + base bits-extra bytestring deepseq directory doctest + doctest-discover hedgehog hspec hw-bits hw-hedgehog + hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base lens + text vector + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + benchmarkHaskellDepends = [ + base bits-extra bytestring cassava containers criterion deepseq + directory hw-bits hw-prim hw-rankselect hw-rankselect-base mmap + transformers vector + ]; + description = "SIMD library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-streams" = callPackage ({ mkDerivation, base, bytestring, criterion, directory, exceptions , ghc-prim, hedgehog, hspec, hspec-discover, hw-bits @@ -135159,6 +136168,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-streams_0_0_1_0" = callPackage + ({ mkDerivation, base, bytestring, criterion, directory, doctest + , doctest-discover, exceptions, ghc-prim, hedgehog, hspec + , hspec-discover, hw-bits, hw-hspec-hedgehog, hw-prim, mmap + , primitive, QuickCheck, transformers, vector + }: + mkDerivation { + pname = "hw-streams"; + version = "0.0.1.0"; + sha256 = "0hzpx1j06h98y0zcmysklzn3s3mvpbb1nkwg4zkbdxvzzqs5hnm5"; + libraryHaskellDepends = [ + base bytestring ghc-prim hw-bits hw-prim mmap primitive + transformers vector + ]; + testHaskellDepends = [ + base bytestring directory doctest doctest-discover exceptions + ghc-prim hedgehog hspec hw-bits hw-hspec-hedgehog hw-prim mmap + primitive QuickCheck transformers vector + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring criterion ghc-prim hw-bits hw-prim mmap primitive + transformers vector + ]; + description = "Primitive functions and data types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-string-parse" = callPackage ({ mkDerivation, base, bytestring, hspec, QuickCheck, vector }: mkDerivation { @@ -135276,6 +136314,48 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-xml_0_5_1_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base + , bytestring, cereal, containers, criterion, deepseq, doctest + , doctest-discover, generic-lens, ghc-prim, hedgehog, hspec + , hspec-discover, hw-balancedparens, hw-bits, hw-hspec-hedgehog + , hw-parser, hw-prim, hw-rankselect, hw-rankselect-base, lens, mmap + , mtl, optparse-applicative, resourcet, text, transformers, vector + , word8 + }: + mkDerivation { + pname = "hw-xml"; + version = "0.5.1.0"; + sha256 = "0g81kknllbc6v5wx7kgzhh78409njfzr3h7lfdx7ip0nkhhnpmw4"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + ansi-wl-pprint array attoparsec base bytestring cereal containers + deepseq ghc-prim hw-balancedparens hw-bits hw-parser hw-prim + hw-rankselect hw-rankselect-base lens mmap mtl resourcet text + transformers vector word8 + ]; + executableHaskellDepends = [ + attoparsec base bytestring deepseq generic-lens hw-balancedparens + hw-bits hw-prim hw-rankselect lens mmap mtl optparse-applicative + resourcet text vector + ]; + testHaskellDepends = [ + attoparsec base bytestring doctest doctest-discover hedgehog hspec + hw-balancedparens hw-bits hw-hspec-hedgehog hw-prim hw-rankselect + hw-rankselect-base text vector + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + benchmarkHaskellDepends = [ + base bytestring criterion hw-balancedparens hw-bits hw-prim mmap + resourcet vector + ]; + description = "XML parser based on succinct data structures"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hwall-auth-iitk" = callPackage ({ mkDerivation, base, bytestring, haskeline, http-conduit , http-types, mtl, regex-compat, unix @@ -136622,8 +137702,8 @@ self: { }: mkDerivation { pname = "i3blocks-hs-contrib"; - version = "2.0.0"; - sha256 = "1vdhjl5qyiisjpp770b4pn4w4yzg546cwrw9vh195nyicniz571v"; + version = "2.0.1"; + sha256 = "0dl50c3c9483p6345a8918gika3flrph97xwplrr9i4a55dprcxg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base text turtle ]; @@ -136790,8 +137870,8 @@ self: { }: mkDerivation { pname = "icepeak"; - version = "0.7.2.0"; - sha256 = "0vs2lfwqxss2f4ajzj4pqzr5mxk69hs0jl4kz7y2qn7161x4vcd2"; + version = "0.7.3.0"; + sha256 = "0in02r708s5j8n22900jvnf4iiw87bvs1q5mjmr1yc4vn8vrf4vv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -139485,8 +140565,8 @@ self: { }: mkDerivation { pname = "inline-r"; - version = "0.10.2"; - sha256 = "1lwdmdd4mx800zmiyg5z8nkpg2x31lqw74pgb515kyb9v97jykr4"; + version = "0.10.3"; + sha256 = "15wkf1lxc7syp6kcf7d10lxn013q5mnvdl113sbhnchq92q7npgj"; libraryHaskellDepends = [ aeson base bytestring containers data-default-class deepseq exceptions inline-c mtl pretty primitive process reflection setenv @@ -139567,6 +140647,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "insert-ordered-containers_0_2_3_1" = callPackage + ({ mkDerivation, aeson, base, base-compat, hashable, lens + , optics-core, optics-extra, QuickCheck, semigroupoids, semigroups + , tasty, tasty-quickcheck, text, transformers, unordered-containers + }: + mkDerivation { + pname = "insert-ordered-containers"; + version = "0.2.3.1"; + sha256 = "020a56280mxjk9k97q2m1424m73m1sf1ccl0wm0ci9msyw2g51za"; + libraryHaskellDepends = [ + aeson base base-compat hashable lens optics-core optics-extra + semigroupoids semigroups text transformers unordered-containers + ]; + testHaskellDepends = [ + aeson base base-compat hashable lens QuickCheck semigroupoids + semigroups tasty tasty-quickcheck text transformers + unordered-containers + ]; + description = "Associative containers retaining insertion order for traversals"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "inserts" = callPackage ({ mkDerivation, attoparsec, base, bytestring, dlist }: mkDerivation { @@ -139598,22 +140701,6 @@ self: { }) {}; "inspection-testing" = callPackage - ({ mkDerivation, base, containers, ghc, mtl, template-haskell - , transformers - }: - mkDerivation { - pname = "inspection-testing"; - version = "0.4.2.2"; - sha256 = "1bppz99p6ix6hah8lbr9mapl2zxgmkg9i7h6hk8wq6zf54hwz3yp"; - libraryHaskellDepends = [ - base containers ghc mtl template-haskell transformers - ]; - testHaskellDepends = [ base ]; - description = "GHC plugin to do inspection testing"; - license = stdenv.lib.licenses.mit; - }) {}; - - "inspection-testing_0_4_2_4" = callPackage ({ mkDerivation, base, containers, ghc, mtl, template-haskell , transformers }: @@ -139627,7 +140714,6 @@ self: { testHaskellDepends = [ base ]; description = "GHC plugin to do inspection testing"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "inspector-wrecker" = callPackage @@ -141273,6 +142359,8 @@ self: { pname = "iproute"; version = "1.7.9"; sha256 = "1m306fi39ifqq53sklwn81q96wam8nvx7mr5hv4m9f26kiczlism"; + revision = "1"; + editedCabalFile = "1vbzch9lainl05ydym5z8x0kz0a0ywwba45d7xgg5fb8cp2n5zxh"; libraryHaskellDepends = [ appar base byteorder bytestring containers network ]; @@ -141837,6 +142925,18 @@ self: { broken = true; }) {}; + "iso-deriving" = callPackage + ({ mkDerivation, base, mtl, profunctors }: + mkDerivation { + pname = "iso-deriving"; + version = "0.0.6"; + sha256 = "1kcbz4dndrxhkyx67l1z4363rizbqnwnrgcw3kbm5p5zmr914v3h"; + libraryHaskellDepends = [ base profunctors ]; + testHaskellDepends = [ base mtl ]; + description = "Deriving via arbitrary isomorphisms"; + license = stdenv.lib.licenses.mit; + }) {}; + "iso3166-country-codes" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -145230,8 +146330,8 @@ self: { }: mkDerivation { pname = "juicy-gcode"; - version = "0.1.0.5.1"; - sha256 = "1xdmlgickzg94asqy48ms895prjzyzcn767276f99f7mx9pqb5jr"; + version = "0.1.0.5.2"; + sha256 = "14pd0gl2an4mkxkhcx2ybvzdfx2izcnm05p7p7kncf5wdgmkn0px"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -146458,8 +147558,8 @@ self: { }: mkDerivation { pname = "keera-hails-i18n"; - version = "0.0.3.3"; - sha256 = "0aih2mxgyfnrfnvqqsdv5g7r4jgjg5cfqykgalcsb9wqv0gq6d4i"; + version = "0.5.0"; + sha256 = "1kjm9gf857f29a8zd18l4f1zvvdgz4k21rhlh7j14nwffx4i2wf7"; libraryHaskellDepends = [ base directory filepath glib hgettext MissingK setlocale utf8-string @@ -146487,8 +147587,8 @@ self: { }: mkDerivation { pname = "keera-hails-mvc-environment-gtk"; - version = "0.0.3.3"; - sha256 = "0bk3191x8bsvmmnqyf7jzmrlg71q26z2kn4xfahdnpgxw3qskwmr"; + version = "0.5.0"; + sha256 = "0011q0pphzrsrp14nh6nw5szvmvm2gqq7m8vi9w0yi39s10azn97"; libraryHaskellDepends = [ base keera-hails-mvc-model-protectedmodel keera-hails-mvc-view keera-hails-mvc-view-gtk @@ -146523,8 +147623,8 @@ self: { }: mkDerivation { pname = "keera-hails-mvc-model-protectedmodel"; - version = "0.0.3.5"; - sha256 = "14jm1116j3plzglxygjdymfy8z3p5k8zinnh8wazkxgc5y9kkcsx"; + version = "0.5.0"; + sha256 = "0snlswhdxgliaf8pn3h4x99b8zvbvwlrhd896f89cp0am7084ily"; libraryHaskellDepends = [ base containers keera-hails-reactivevalues MissingK stm template-haskell @@ -146634,8 +147734,8 @@ self: { }: mkDerivation { pname = "keera-hails-reactive-network"; - version = "0.1"; - sha256 = "1d1r9p5ray60yfrxs89byc7rmdsm340k2b8klv25k0wh2fvrx2yw"; + version = "0.5.0"; + sha256 = "0s6zmqqidvd2ibs0hy6hrlflhsg7nlp8yjradpc7xzsr2g9gs8an"; libraryHaskellDepends = [ base bytestring keera-hails-reactivevalues network network-bsd ]; @@ -146665,8 +147765,8 @@ self: { ({ mkDerivation, base, keera-hails-reactivevalues, wx, wxcore }: mkDerivation { pname = "keera-hails-reactive-wx"; - version = "0.0.3.3"; - sha256 = "02ikqqfgwr3nrr18qdd1jshqm0dlnwbybqpzpj2ba7zbwpabd5bw"; + version = "0.5.0"; + sha256 = "110363gzkawik4hhcbpd0ljqzzqvlzylp3n52j1sbnxj5p01ym7k"; libraryHaskellDepends = [ base keera-hails-reactivevalues wx wxcore ]; @@ -146707,19 +147807,20 @@ self: { }) {}; "keera-hails-reactivevalues" = callPackage - ({ mkDerivation, base, contravariant, directory, filepath, hlint - , HUnit, mtl, process, QuickCheck, regex-posix, tasty, tasty-hunit - , tasty-quickcheck + ({ mkDerivation, base, cabal-install, contravariant, directory + , filepath, hlint, HUnit, mtl, process, QuickCheck, regex-posix + , tasty, tasty-hunit, tasty-quickcheck }: mkDerivation { pname = "keera-hails-reactivevalues"; - version = "0.2.2.2"; - sha256 = "0iwx40gmcmj9pz0qi6058pbn665q0ca6qc7jnk88k42nqvjm1i8h"; + version = "0.5.0"; + sha256 = "163jm6iz6j67qmz4r9rsb24xqb2s9b97assl3la3is3bkvj397z9"; libraryHaskellDepends = [ base contravariant ]; testHaskellDepends = [ base directory filepath hlint HUnit mtl process QuickCheck regex-posix tasty tasty-hunit tasty-quickcheck ]; + testToolDepends = [ cabal-install ]; description = "Haskell on Rails - Reactive Values"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -151721,7 +152822,7 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; - "lens_4_19_1" = callPackage + "lens_4_19_2" = callPackage ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors , bytestring, Cabal, cabal-doctest, call-stack, comonad, containers , contravariant, criterion, deepseq, directory, distributive @@ -151729,14 +152830,13 @@ self: { , hashable, HUnit, kan-extensions, mtl, nats, parallel, profunctors , QuickCheck, reflection, semigroupoids, semigroups, simple-reflect , tagged, template-haskell, test-framework, test-framework-hunit - , test-framework-quickcheck2, test-framework-th, text - , th-abstraction, transformers, transformers-compat - , unordered-containers, vector + , test-framework-quickcheck2, text, th-abstraction, transformers + , transformers-compat, unordered-containers, vector }: mkDerivation { pname = "lens"; - version = "4.19.1"; - sha256 = "0qbcwn7ll374630ijnw5jhwkqcaisvfwnh7cvz1957ayh84ipkq3"; + version = "4.19.2"; + sha256 = "0fy2vr5r11cc6ana8m2swqgs3zals4kims55vd6119bi76p5iy2j"; setupHaskellDepends = [ base Cabal cabal-doctest filepath ]; libraryHaskellDepends = [ array base base-orphans bifunctors bytestring call-stack comonad @@ -151750,8 +152850,8 @@ self: { base bytestring containers deepseq directory doctest filepath generic-deriving HUnit mtl nats parallel QuickCheck semigroups simple-reflect test-framework test-framework-hunit - test-framework-quickcheck2 test-framework-th text transformers - unordered-containers vector + test-framework-quickcheck2 text transformers unordered-containers + vector ]; benchmarkHaskellDepends = [ base base-compat bytestring comonad containers criterion deepseq @@ -153642,8 +154742,8 @@ self: { }: mkDerivation { pname = "licensor"; - version = "0.4.0"; - sha256 = "17pflw248h54xcsskki8wy9lxkcl1dh3cc5s87f0z49i6h6w8fjg"; + version = "0.4.1"; + sha256 = "0p1wnyff2v23405v42ks5m3lyxhcahmcs3vh2qc5kz4q7ybnks7b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -155979,8 +157079,8 @@ self: { }: mkDerivation { pname = "llvm-extra"; - version = "0.10"; - sha256 = "0g2872wl1gmdlw3gdimcb1wcdsckjwjlk1ciwz8sy0rx9v3kif1m"; + version = "0.10.1"; + sha256 = "0m8fxip4345k92nq5n0dqdbjyahah0nind6lrwa5r7f9ff9j8gc9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -158292,6 +159392,8 @@ self: { pname = "lucid"; version = "2.9.12"; sha256 = "156wniydd1hlb7rygbm95zln8ky8lai8rn2apkkv0rax9cdw6jrh"; + revision = "1"; + editedCabalFile = "1f0whk5ncanxfjjanrf6rqyncig2xgc5mh2j0sqy3nrlyjr9aqq9"; libraryHaskellDepends = [ base blaze-builder bytestring containers hashable mmorph mtl text transformers unordered-containers @@ -158794,8 +159896,8 @@ self: { }: mkDerivation { pname = "lzlib"; - version = "1.0.6.0"; - sha256 = "1qirn7kbcnxx6ihhk0r6p2jyfbs8cqsinfnmn774i3vkj1fahpn1"; + version = "1.0.7.0"; + sha256 = "0dwwnpfzy5sg4cylpcz3d1aq26grdq0jvidw97x2fkcq2j4d9bak"; libraryHaskellDepends = [ base bytestring ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ @@ -163932,6 +165034,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "microlens-th_0_4_3_5" = callPackage + ({ mkDerivation, base, containers, microlens, template-haskell + , th-abstraction, transformers + }: + mkDerivation { + pname = "microlens-th"; + version = "0.4.3.5"; + sha256 = "0zk5wi8wrhhs7chdsxc9sm57w3zrjr7c9v80qh53ac4p3varjgfh"; + libraryHaskellDepends = [ + base containers microlens template-haskell th-abstraction + transformers + ]; + testHaskellDepends = [ base microlens ]; + description = "Automatic generation of record lenses for microlens"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "micrologger" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hspec, lens , text, text-format, time, transformers @@ -165908,6 +167028,8 @@ self: { pname = "modern-uri"; version = "0.3.2.0"; sha256 = "162s88yayalh4vlngman5gz3k0gnszxrksh1wk5227qihbpsiwhb"; + revision = "1"; + editedCabalFile = "13a9wh31pm151d1xz00wp2nfs73s2ysr1g97vx91rl2caak14ab0"; libraryHaskellDepends = [ base bytestring containers contravariant deepseq exceptions megaparsec mtl profunctors QuickCheck reflection tagged @@ -169148,8 +170270,8 @@ self: { ({ mkDerivation, base, hspec }: mkDerivation { pname = "mr-env"; - version = "0.1.0.2"; - sha256 = "1bw0ga59lf1crhjx4hlmsnzllsf3nfwzzsfcll0xf04fkj0jgxlg"; + version = "0.1.0.3"; + sha256 = "01dq9wac3jvbhll3kqjid5xy66hf11r382w8c1hhvmfd5j9bp0n4"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; description = "A simple way to read environment variables in Haskell"; @@ -171291,6 +172413,23 @@ self: { broken = true; }) {}; + "mutable-lens" = callPackage + ({ mkDerivation, base, checkers, doctest, lens, primitive, stm + , tasty, tasty-hunit, tasty-quickcheck + }: + mkDerivation { + pname = "mutable-lens"; + version = "0.1.0.0"; + sha256 = "12biaarl37n953bzq7rndfy49s70jmxhvraf4pm1zxgyz2skwgdc"; + libraryHaskellDepends = [ base lens primitive stm ]; + testHaskellDepends = [ + base checkers doctest lens primitive stm tasty tasty-hunit + tasty-quickcheck + ]; + description = "Interoperate mutable references with regular lens"; + license = stdenv.lib.licenses.asl20; + }) {}; + "mute-unmute" = callPackage ({ mkDerivation, base, directory, filepath, hslogger , hslogger-template, mtl, network-dbus, process @@ -174097,8 +175236,8 @@ self: { }: mkDerivation { pname = "network-arbitrary"; - version = "0.5.0.0"; - sha256 = "1d3m0ycibbvnjbns4havp25x9i5ri6kirv579k1xnb82by4nkqap"; + version = "0.6.0.0"; + sha256 = "0yj93r7p4nbfwhklxb7wgkaq1bfl7qjqmn3q0qlxlghbb2xhmmh1"; libraryHaskellDepends = [ base bytestring http-media http-types network-uri QuickCheck ]; @@ -178412,6 +179551,24 @@ self: { broken = true; }) {}; + "ochan" = callPackage + ({ mkDerivation, async, base, bytestring, mtl, oref, text + , transformers + }: + mkDerivation { + pname = "ochan"; + version = "0.1.0"; + sha256 = "0hzk5y7qnx3mv6x913k98qgnnq7niq6gvic2qjz3vdxpi2rx303d"; + libraryHaskellDepends = [ + async base bytestring mtl oref text transformers + ]; + testHaskellDepends = [ + async base bytestring mtl oref text transformers + ]; + description = "Owned channels in the Ownership Monad"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ochintin-daicho" = callPackage ({ mkDerivation, base, bookkeeping, doctest, Glob, mono-traversable , text, transaction @@ -179158,6 +180315,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "online-csv" = callPackage + ({ mkDerivation, attoparsec, base, box, doctest, foldl + , generic-lens, lens, numhask-prelude, scientific, text + , text-format + }: + mkDerivation { + pname = "online-csv"; + version = "0.0.1"; + sha256 = "0fibv9k9py6mszjnj501cak4jhdz6iyy6qp56cp1vvsbkv44m8ll"; + libraryHaskellDepends = [ + attoparsec base box foldl generic-lens lens numhask-prelude + scientific text text-format + ]; + testHaskellDepends = [ base doctest numhask-prelude ]; + description = "See readme.md"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "only" = callPackage ({ mkDerivation, base, parsec, regex-compat }: mkDerivation { @@ -180495,6 +181672,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "optics_0_3" = callPackage + ({ mkDerivation, array, base, bytestring, containers, criterion + , indexed-profunctors, inspection-testing, lens, mtl, optics-core + , optics-extra, optics-th, QuickCheck, random, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "optics"; + version = "0.3"; + sha256 = "0v0kgj9ihb655a6n9j5w55s2lrkfd31pf9z17ida4xcrimzv6q02"; + libraryHaskellDepends = [ + array base containers mtl optics-core optics-extra optics-th + transformers + ]; + testHaskellDepends = [ + base containers indexed-profunctors inspection-testing mtl + optics-core QuickCheck random tasty tasty-hunit tasty-quickcheck + template-haskell + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion lens transformers + unordered-containers vector + ]; + description = "Optics as an abstract interface"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "optics-core" = callPackage ({ mkDerivation, array, base, containers, indexed-profunctors , transformers @@ -180512,6 +181718,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "optics-core_0_3" = callPackage + ({ mkDerivation, array, base, containers, indexed-profunctors + , transformers + }: + mkDerivation { + pname = "optics-core"; + version = "0.3"; + sha256 = "0gjxbrgp7c9k40782i2hm0pmb4fdrzcwbkq1xsj1835xszzxlp8n"; + libraryHaskellDepends = [ + array base containers indexed-profunctors transformers + ]; + description = "Optics as an abstract interface: core definitions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "optics-extra" = callPackage ({ mkDerivation, array, base, bytestring, containers, hashable , indexed-profunctors, mtl, optics-core, text, transformers @@ -180529,6 +181751,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "optics-extra_0_3" = callPackage + ({ mkDerivation, array, base, bytestring, containers, hashable + , indexed-profunctors, mtl, optics-core, text, transformers + , unordered-containers, vector + }: + mkDerivation { + pname = "optics-extra"; + version = "0.3"; + sha256 = "15vnznmi4h9xrrp7dk6fqgz9cwlqlmdr2h4nx1n5q6hi2ic1bmm4"; + libraryHaskellDepends = [ + array base bytestring containers hashable indexed-profunctors mtl + optics-core text transformers unordered-containers vector + ]; + description = "Extra utilities and instances for optics-core"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "optics-th" = callPackage ({ mkDerivation, base, containers, mtl, optics-core , template-haskell, th-abstraction, transformers @@ -180546,6 +181786,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "optics-th_0_3" = callPackage + ({ mkDerivation, base, containers, mtl, optics-core, tagged + , template-haskell, th-abstraction, transformers + }: + mkDerivation { + pname = "optics-th"; + version = "0.3"; + sha256 = "1k8kwii9jn1gjswkf7p5j5yvq7p9z8rs09ak78s5lmvxkh4c7035"; + libraryHaskellDepends = [ + base containers mtl optics-core template-haskell th-abstraction + transformers + ]; + testHaskellDepends = [ base optics-core tagged ]; + description = "Optics construction using TemplateHaskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "optics-vl" = callPackage ({ mkDerivation, base, indexed-profunctors, optics-core , profunctors @@ -180561,6 +181819,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "optics-vl_0_2_1" = callPackage + ({ mkDerivation, base, indexed-profunctors, optics-core + , profunctors + }: + mkDerivation { + pname = "optics-vl"; + version = "0.2.1"; + sha256 = "1xrkak0cn2imgqr641wzysgynykyj438m3ywgdm9h14k17inv55v"; + libraryHaskellDepends = [ + base indexed-profunctors optics-core profunctors + ]; + description = "Utilities for compatibility with van Laarhoven optics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "optima" = callPackage ({ mkDerivation, attoparsec, attoparsec-data, base , optparse-applicative, rerebase, text, text-builder @@ -181077,6 +182351,20 @@ self: { broken = true; }) {}; + "oref" = callPackage + ({ mkDerivation, base, containers, either, mtl, transformers }: + mkDerivation { + pname = "oref"; + version = "0.0.3"; + sha256 = "0cfs0nhxbi580gffba9lz0j36cggwqafxkz821xrd4j4i36a7k5v"; + libraryHaskellDepends = [ + base containers either mtl transformers + ]; + testHaskellDepends = [ base containers either mtl transformers ]; + description = "Owned references in the Ownership Monad"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "org-mode" = callPackage ({ mkDerivation, base, containers, filepath, hashable, megaparsec , parser-combinators, tasty, tasty-hunit, text @@ -181303,6 +182591,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ormolu_0_0_4_0" = callPackage + ({ mkDerivation, base, bytestring, containers, dlist, exceptions + , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover, mtl + , optparse-applicative, path, path-io, syb, text + }: + mkDerivation { + pname = "ormolu"; + version = "0.0.4.0"; + sha256 = "1x3fdhnpbf7xd0h85909smr5nv2qz4fbljvvzmsk8ph653j5js1k"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers dlist exceptions ghc-lib-parser mtl syb + text + ]; + executableHaskellDepends = [ + base ghc-lib-parser gitrev optparse-applicative text + ]; + testHaskellDepends = [ + base containers filepath hspec path path-io text + ]; + testToolDepends = [ hspec-discover ]; + description = "A formatter for Haskell source code"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "os-release" = callPackage ({ mkDerivation, base, containers, hlint, hspec, parsec, process , regex-compat, temporary, transformers @@ -182695,8 +184011,8 @@ self: { }: mkDerivation { pname = "pandoc-plot"; - version = "0.2.1.0"; - sha256 = "1q5ai86bmxdx1vw0wmp1gbg3sd4ys4gq58hivri5nz3ggfjdvy3b"; + version = "0.2.2.0"; + sha256 = "15xs3rrqc7hygmmiylfykdqhqsr7giqdhw3hmmnff8s8k708qv33"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -182719,7 +184035,7 @@ self: { broken = true; }) {}; - "pandoc-plot_0_2_2_0" = callPackage + "pandoc-plot_0_3_0_0" = callPackage ({ mkDerivation, base, containers, data-default-class, deepseq , directory, filepath, hashable, hspec, hspec-expectations, mtl , open-browser, optparse-applicative, pandoc, pandoc-types @@ -182728,8 +184044,8 @@ self: { }: mkDerivation { pname = "pandoc-plot"; - version = "0.2.2.0"; - sha256 = "15xs3rrqc7hygmmiylfykdqhqsr7giqdhw3hmmnff8s8k708qv33"; + version = "0.3.0.0"; + sha256 = "143kr0s4p155apnspjjkv3xc7ffm6vl4bvifyr8rl72yk0lx81ac"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -193295,8 +194611,6 @@ self: { ]; description = "REST API for any Postgres database"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "postgrest-ws" = callPackage @@ -194954,8 +196268,8 @@ self: { ({ mkDerivation, base, dependent-sum, primitive }: mkDerivation { pname = "prim-uniq"; - version = "0.1.0.1"; - sha256 = "1zssi4zaihjaf3an10ar39d4qb155wcl1j66aymfrr9z2f2rf1gv"; + version = "0.2"; + sha256 = "1l7jlv3pfasn89n2wpgff972npy423vqsidkkn5crxfyqjyzxbdv"; libraryHaskellDepends = [ base dependent-sum primitive ]; description = "Opaque unique identifiers in primitive state monads"; license = stdenv.lib.licenses.publicDomain; @@ -196749,15 +198063,16 @@ self: { }) {}; "prosidyc" = callPackage - ({ mkDerivation, base, free, hashable, microlens, mtl, prosidy - , text, unordered-containers + ({ mkDerivation, base, containers, free, hashable, microlens + , prettyprinter, profunctors, prosidy, text, unordered-containers }: mkDerivation { pname = "prosidyc"; - version = "0.2.0.0"; - sha256 = "19nq969mjnpc51nwa6giv93hz7pyn590yhfbsspr5wp5i9xim39i"; + version = "0.3.0.0"; + sha256 = "18i9d955md2pan18541x2z2aj1hvl34g9zm2vvf3nwpf5m9s5ggl"; libraryHaskellDepends = [ - base free hashable microlens mtl prosidy text unordered-containers + base containers free hashable microlens prettyprinter profunctors + prosidy text unordered-containers ]; description = "A DSL for processing Prosidy documents"; license = stdenv.lib.licenses.mpl20; @@ -198216,14 +199531,15 @@ self: { "purebred-email" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring - , case-insensitive, concise, deepseq, lens, QuickCheck + , case-insensitive, concise, deepseq, hedgehog, lens, QuickCheck , quickcheck-instances, semigroupoids, semigroups, stringsearch - , tasty, tasty-golden, tasty-hunit, tasty-quickcheck, text, time + , tasty, tasty-golden, tasty-hedgehog, tasty-hunit + , tasty-quickcheck, text, time }: mkDerivation { pname = "purebred-email"; - version = "0.3.1"; - sha256 = "0jndwj0ca5v0q6c25qrajfppgbxq7i83mh1fii18vs52ccavn8wr"; + version = "0.4"; + sha256 = "14spyllq10hkscbrhdsqr7k4rl8q17kvh2n9nmhjiikgjlp066cz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -198232,9 +199548,9 @@ self: { time ]; testHaskellDepends = [ - attoparsec base bytestring case-insensitive lens QuickCheck - quickcheck-instances semigroups tasty tasty-golden tasty-hunit - tasty-quickcheck text time + attoparsec base bytestring case-insensitive hedgehog lens + QuickCheck quickcheck-instances semigroups tasty tasty-golden + tasty-hedgehog tasty-hunit tasty-quickcheck text time ]; description = "types and parser for email messages (including MIME)"; license = stdenv.lib.licenses.agpl3; @@ -199292,8 +200608,8 @@ self: { }: mkDerivation { pname = "qtah-cpp-qt5"; - version = "0.6.0"; - sha256 = "1v355mfs67rh2rcn71rkai0c16y3aqcb7q33ykhrghcl7238ym9h"; + version = "0.7.0"; + sha256 = "1i5h5j7cy94ab41x9aqkiv7vyx5h7cda8v1jccpna8lr7ccicczp"; setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ base process qtah-generator ]; librarySystemDepends = [ qtbase ]; @@ -199309,8 +200625,8 @@ self: { }: mkDerivation { pname = "qtah-examples"; - version = "0.6.0"; - sha256 = "0zak709bgc9r8bydj834hkzix9zripnhi5z792ryr3k7anmyy6fv"; + version = "0.7.0"; + sha256 = "09svfzi73gjy4bsz4snp1mciqin25xqr6n3kya8367q4j01mdrrv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -199329,8 +200645,8 @@ self: { }: mkDerivation { pname = "qtah-generator"; - version = "0.6.0"; - sha256 = "0w7fsn2j5g5miv12gm3d0x52xypbshdmxza6imjnpz01kljhqhpm"; + version = "0.7.0"; + sha256 = "1zh4ih8kfp82gs5rhns6pw1bljv3v0g3kk9lyvz9rkp4j4wh6dl7"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -199353,8 +200669,8 @@ self: { }: mkDerivation { pname = "qtah-qt5"; - version = "0.6.0"; - sha256 = "1irinnq1iryphnnqg05l3icirvzkh5xm4cdwhqvshbin7i6gv0bs"; + version = "0.7.0"; + sha256 = "0wndmrrz4c3gfx9wjj9v13zjjpjandg2qkq7fkxp5z3rgw4hmm8f"; setupHaskellDepends = [ base Cabal directory filepath ]; libraryHaskellDepends = [ base binary bytestring hoppy-runtime qtah-cpp-qt5 qtah-generator @@ -199389,6 +200705,8 @@ self: { pname = "quadratic-irrational"; version = "0.1.0"; sha256 = "0kfgvixvcawfhw4vv0zg2r0d6hrlak01q9isqc3n3lc63qaifxgy"; + revision = "1"; + editedCabalFile = "11snayb371lpsz7p74sbbl3kq0i3i2vnp852x8vw482v48kld5vl"; libraryHaskellDepends = [ arithmoi base containers transformers ]; testHaskellDepends = [ arithmoi base directory doctest filepath mtl numbers QuickCheck @@ -199398,6 +200716,27 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "quadratic-irrational_0_1_1" = callPackage + ({ mkDerivation, arithmoi, base, containers, directory, doctest + , filepath, integer-roots, mtl, numbers, QuickCheck, tasty + , tasty-quickcheck, transformers + }: + mkDerivation { + pname = "quadratic-irrational"; + version = "0.1.1"; + sha256 = "11nksvr6wnbrphq3ymg93w2xpqw6in3j1qpgbl2f3x9bgiss2l7s"; + libraryHaskellDepends = [ + arithmoi base containers integer-roots transformers + ]; + testHaskellDepends = [ + arithmoi base directory doctest filepath mtl numbers QuickCheck + tasty tasty-quickcheck + ]; + description = "An implementation of quadratic irrationals"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "quandl-api" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring , http-conduit, http-types, syb, text, time, time-locale-compat @@ -201367,6 +202706,8 @@ self: { pname = "ral-optics"; version = "0.1"; sha256 = "0sky2zbh6wn4xlfc6sbrx7lvvy01qv69j80k0n4w9fyrq9ammb3r"; + revision = "1"; + editedCabalFile = "0b2j3iqzbaly8niw3snsmn1z5a34kv4jw8sh3fscsja6zfx0ffgv"; libraryHaskellDepends = [ base bin fin optics-core ral ]; description = "Length-indexed random access lists: optics utilities"; license = stdenv.lib.licenses.gpl2Plus; @@ -203854,6 +205195,8 @@ self: { pname = "records-sop"; version = "0.1.0.3"; sha256 = "120kb6z4si5wqkahbqxqhm3qb8xpc9ivwg293ymz8a4ri1hdr0a5"; + revision = "1"; + editedCabalFile = "0492a3cabdl5ccncc7lk7bvh55in4hzm345fl3xpidp9jx6mv1x4"; libraryHaskellDepends = [ base deepseq generics-sop ghc-prim ]; testHaskellDepends = [ base deepseq generics-sop hspec should-not-typecheck @@ -203966,8 +205309,8 @@ self: { }: mkDerivation { pname = "red-black-record"; - version = "2.1.0.3"; - sha256 = "0g1av0w52m0admcqif5imkla43yk6id4y8jmiy843xbdqs3qzcx4"; + version = "2.1.3.0"; + sha256 = "0qaa7y4n4hv6mlipnmfkvfbsi9gd1zg9npaf14l9y6v9g39wx27x"; libraryHaskellDepends = [ base sop-core ]; testHaskellDepends = [ aeson base bytestring doctest profunctors sop-core tasty @@ -205495,6 +206838,8 @@ self: { pname = "regex-pcre"; version = "0.95.0.0"; sha256 = "0nn76q4bsjnxim0j0d01jifmh36as9jdpcvm001a851vvq86zb8n"; + revision = "1"; + editedCabalFile = "1s5jdwvymc9hxdfa23x5amnv2kkcsm2p119f38df2vjdxfvjfiq4"; libraryHaskellDepends = [ array base bytestring containers regex-base ]; @@ -205518,6 +206863,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "regex-pcre-builtin_0_95_1_2_8_43" = callPackage + ({ mkDerivation, array, base, bytestring, containers, regex-base + , text + }: + mkDerivation { + pname = "regex-pcre-builtin"; + version = "0.95.1.2.8.43"; + sha256 = "1bxn8d3g9w1a5q5vcz744yx019d2rd79i07qcjq4jqkjafni1bml"; + libraryHaskellDepends = [ + array base bytestring containers regex-base text + ]; + description = "PCRE Backend for \"Text.Regex\" (regex-base)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "regex-pcre-text" = callPackage ({ mkDerivation, array, base, bytestring, regex-base , regex-pcre-builtin, regex-tdfa-text, text @@ -206264,8 +207625,8 @@ self: { }: mkDerivation { pname = "relation"; - version = "0.5.1.0"; - sha256 = "0hsixpln8wf47cqan8yhx86n1k1vww35l4zzf0bjarqazd060pyv"; + version = "0.5.2.0"; + sha256 = "1sinb0rw2jq1xjy80rsxnjf5va33n2i67km55hxfls9w15wsg2yw"; libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base containers doctest doctest-discover hedgehog hspec @@ -207544,30 +208905,31 @@ self: { }) {}; "require" = callPackage - ({ mkDerivation, base, bytestring, criterion, directory, inliterate - , megaparsec, optparse-generic, relude, tasty, tasty-hspec, text + ({ mkDerivation, ansi-terminal, base, bytestring, criterion + , directory, dlist, megaparsec, mtl, optparse-generic, relude + , tasty, tasty-hspec, text }: mkDerivation { pname = "require"; - version = "0.4.7"; - sha256 = "1h5y3rbvisvx2qdnwpcygd56x56fzddk8jy58y8xhyq7s0x4q2v0"; + version = "0.4.9"; + sha256 = "0f04cpgcgl5d0zj8j5d2wfg8m1g2zw5lw39qj8797y3shxh8jdih"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring directory inliterate megaparsec optparse-generic - relude text + ansi-terminal base bytestring directory dlist megaparsec mtl + optparse-generic relude text ]; executableHaskellDepends = [ - base bytestring directory inliterate megaparsec optparse-generic - relude text + ansi-terminal base bytestring directory dlist megaparsec mtl + optparse-generic relude text ]; testHaskellDepends = [ - base bytestring directory inliterate megaparsec optparse-generic - relude tasty tasty-hspec text + ansi-terminal base bytestring directory dlist megaparsec mtl + optparse-generic relude tasty tasty-hspec text ]; benchmarkHaskellDepends = [ - base bytestring criterion directory inliterate megaparsec - optparse-generic relude text + ansi-terminal base bytestring criterion directory dlist megaparsec + mtl optparse-generic relude text ]; description = "Scrap your qualified import clutter"; license = stdenv.lib.licenses.asl20; @@ -208388,26 +209750,6 @@ self: { }) {}; "retry" = callPackage - ({ mkDerivation, base, exceptions, ghc-prim, hedgehog, HUnit, mtl - , random, stm, tasty, tasty-hedgehog, tasty-hunit, time - , transformers - }: - mkDerivation { - pname = "retry"; - version = "0.8.1.0"; - sha256 = "02k03r86amg1vbrsvb644342ym13d9jwkzki9sk93pdg5l8j35dj"; - libraryHaskellDepends = [ - base exceptions ghc-prim random transformers - ]; - testHaskellDepends = [ - base exceptions ghc-prim hedgehog HUnit mtl random stm tasty - tasty-hedgehog tasty-hunit time transformers - ]; - description = "Retry combinators for monadic actions that may fail"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "retry_0_8_1_1" = callPackage ({ mkDerivation, base, exceptions, ghc-prim, hedgehog, HUnit, mtl , random, stm, tasty, tasty-hedgehog, tasty-hunit, time , transformers @@ -208425,7 +209767,6 @@ self: { ]; description = "Retry combinators for monadic actions that may fail"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "retryer" = callPackage @@ -208581,8 +209922,8 @@ self: { }: mkDerivation { pname = "rex"; - version = "0.6"; - sha256 = "024qxr75269l8j8bklxg7a98xvrymmnczcpflgqjiqn5kvdrn5yz"; + version = "0.6.1"; + sha256 = "1zdsdwagrcjlfy2qfvn1gr8z9xz41s2vwf2y4dwrlvh11xswxvhb"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers haskell-src-exts haskell-src-meta @@ -208855,15 +210196,16 @@ self: { "rhine" = callPackage ({ mkDerivation, base, containers, deepseq, dunai, free - , MonadRandom, random, time, transformers, vector-sized + , MonadRandom, random, simple-affine-space, time, transformers + , vector-sized }: mkDerivation { pname = "rhine"; - version = "0.5.1.1"; - sha256 = "1f7sgdlnjf25znhnjdcq7yibxcfnjq7cldl6z9ydmg62az839ms2"; + version = "0.6.0"; + sha256 = "0dmdf1i1z5xj5l9p6vlln8yyy3pa1nd6m1b7spwm8kpfzzw3545f"; libraryHaskellDepends = [ - base containers deepseq dunai free MonadRandom random time - transformers vector-sized + base containers deepseq dunai free MonadRandom random + simple-affine-space time transformers vector-sized ]; description = "Functional Reactive Programming with type-level clocks"; license = stdenv.lib.licenses.bsd3; @@ -208875,8 +210217,8 @@ self: { ({ mkDerivation, base, dunai, gloss, rhine }: mkDerivation { pname = "rhine-gloss"; - version = "0.5.1.0"; - sha256 = "0nq5m74ivkdk15qcqpqs8bp816454k3k2big0av6lq2dzk8cjrll"; + version = "0.6.0"; + sha256 = "1kfy993872iq93fc5bn6bz0xx13afbb5piwxyw8jdjp146jp2380"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base dunai gloss rhine ]; @@ -211527,8 +212869,8 @@ self: { pname = "safe-exceptions"; version = "0.1.7.0"; sha256 = "0sd0zfsm9pcll5bzzj523rbn45adjrnavdkz52hgmdjjgdcdrk8q"; - revision = "5"; - editedCabalFile = "0yghh99yg24pzhzrflvgi4ip56ln7a56871pl3q70sm8rszy8vbr"; + revision = "6"; + editedCabalFile = "0x82m44qwf3fls3ypbdca958l9hhfqyfip6rzzxi7648f0sasv21"; libraryHaskellDepends = [ base deepseq exceptions transformers ]; testHaskellDepends = [ base hspec void ]; description = "Safe, consistent, and easy exception handling"; @@ -211842,6 +213184,30 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "safecopy_0_10_3" = callPackage + ({ mkDerivation, array, base, bytestring, cereal, containers + , generic-data, HUnit, lens, lens-action, old-time, QuickCheck + , quickcheck-instances, tasty, tasty-quickcheck, template-haskell + , text, time, transformers, vector + }: + mkDerivation { + pname = "safecopy"; + version = "0.10.3"; + sha256 = "142ghv6pa3y0s7x141x9f9r5sn0315vvkfw6f7lgnndlncs5y354"; + libraryHaskellDepends = [ + array base bytestring cereal containers generic-data old-time + template-haskell text time transformers vector + ]; + testHaskellDepends = [ + array base bytestring cereal containers HUnit lens lens-action + QuickCheck quickcheck-instances tasty tasty-quickcheck + template-haskell time vector + ]; + description = "Binary serialization with version control"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "safecopy-migrate" = callPackage ({ mkDerivation, base, base-prelude, cereal, containers, extra , haskell-src-meta, microlens, safecopy, template-haskell @@ -212049,24 +213415,28 @@ self: { }) {}; "sak" = callPackage - ({ mkDerivation, base, bytestring, bz2, cpphs, directory, filepath - , lz4-hs, lzlib, lzma, optparse-applicative, parallel-io, zlib - , zstd + ({ mkDerivation, base, brotli, bytestring, bz2, cpphs, directory + , filepath, lz4-hs, lzlib, lzma, optparse-applicative, parallel-io + , zlib, zstd }: mkDerivation { pname = "sak"; - version = "0.1.2.0"; - sha256 = "0a2qjiazk1wdq5yg535iyarw847v9n9j3v59qyg8px05kdrcxap1"; + version = "0.1.2.3"; + sha256 = "0ydc5ykkhxxvzcwncf0rvn3zk2gid7r0dwai63r3vsvp7mn2jg8g"; + revision = "1"; + editedCabalFile = "01xf0f5q458wgg8jndcimgpqmwvgvxlpf5cf7gb14v2y3vw2hzfj"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - base bytestring bz2 directory filepath lz4-hs lzlib lzma + base brotli bytestring bz2 directory filepath lz4-hs lzlib lzma optparse-applicative parallel-io zlib zstd ]; executableToolDepends = [ cpphs ]; description = "Compression command-line tool"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "sakuraio-platform" = callPackage @@ -214442,6 +215812,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) SDL2;}; + "sdl2_2_5_2_0" = callPackage + ({ mkDerivation, base, bytestring, deepseq, exceptions, linear + , SDL2, StateVar, text, transformers, vector, weigh + }: + mkDerivation { + pname = "sdl2"; + version = "2.5.2.0"; + sha256 = "18cgckkq4yj0xwj3pmsfsqxazl7rcmb3f7b45kv9nwvjwyqi0hcw"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring exceptions linear StateVar text transformers vector + ]; + librarySystemDepends = [ SDL2 ]; + libraryPkgconfigDepends = [ SDL2 ]; + testHaskellDepends = [ base deepseq linear vector weigh ]; + description = "Both high- and low-level bindings to the SDL library (version 2.0.6+)."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) SDL2;}; + "sdl2-cairo" = callPackage ({ mkDerivation, base, cairo, linear, sdl2 }: mkDerivation { @@ -214908,15 +216300,15 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {libsecp256k1 = null;}; - "secp256k1-haskell_0_2_0" = callPackage + "secp256k1-haskell_0_2_2" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, cereal , deepseq, entropy, hashable, hspec, hspec-discover, HUnit , libsecp256k1, mtl, QuickCheck, string-conversions }: mkDerivation { pname = "secp256k1-haskell"; - version = "0.2.0"; - sha256 = "0875vc62r9y5lddnxq5s50xlagz464bnr4j89nz376jyrlg5db7v"; + version = "0.2.2"; + sha256 = "10yz62z5s23b0q4pla8047cv5ksrd78j9l8y156b0yjjnmlxd013"; libraryHaskellDepends = [ base base16-bytestring bytestring cereal deepseq entropy hashable QuickCheck string-conversions @@ -215438,6 +216830,8 @@ self: { pname = "semialign-optics"; version = "1.1"; sha256 = "1ffibnk1hsdnny5jm85j07f05k81pzzai4jljlj12nn687rbb59y"; + revision = "1"; + editedCabalFile = "0l7wkq1s51k04dy815mqvwcf94r1l4a40ngzz958gi3vc07xyppx"; libraryHaskellDepends = [ base containers hashable optics-extra semialign these unordered-containers vector @@ -217278,6 +218672,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-elm_0_7_2" = callPackage + ({ mkDerivation, aeson, base, Diff, directory, elm-bridge, hspec + , HUnit, lens, servant, servant-client, servant-foreign, text + , wl-pprint-text + }: + mkDerivation { + pname = "servant-elm"; + version = "0.7.2"; + sha256 = "1hn7qkz4aw5snc4lbprbshzr3dagfry1bms0fx9bfif61312swqy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base directory elm-bridge lens servant servant-foreign text + wl-pprint-text + ]; + testHaskellDepends = [ + aeson base Diff elm-bridge hspec HUnit servant servant-client text + ]; + description = "Automatically derive Elm functions to query servant webservices"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-errors" = callPackage ({ mkDerivation, aeson, base, bytestring, http-api-data, http-media , http-types, markdown-unlit, scientific, servant, servant-server @@ -217285,8 +218702,8 @@ self: { }: mkDerivation { pname = "servant-errors"; - version = "0.1.3.1"; - sha256 = "120rl4adz54c3psb6qv8l6im4xv2649kwazvfr7h0l11jjfb6hni"; + version = "0.1.4.0"; + sha256 = "1qg8p69yhkkdqa51n4pp59y254a5q6rl255fh380z4kzh4vsdjcn"; libraryHaskellDepends = [ aeson base bytestring http-api-data http-media http-types scientific servant string-conversions text unordered-containers wai @@ -220149,15 +221566,15 @@ self: { }) {}; "shake-bindist" = callPackage - ({ mkDerivation, archive-sig, base, bytestring, bz2, lzlib, lzma - , shake, zlib, zstd + ({ mkDerivation, archive-sig, base, bytestring, bz2, lzlib, shake + , zlib, zstd }: mkDerivation { pname = "shake-bindist"; - version = "1.0.1.0"; - sha256 = "0rlbn367czab885l44k698wiyavs0jf1rbzn4hk48mfhqxpcihky"; + version = "1.0.0.0"; + sha256 = "0fzq62a8rjh9jc9dc7rfi6ypp0fax7fhlf632a30mrbpk1hqyfz8"; libraryHaskellDepends = [ - archive-sig base bytestring bz2 lzlib lzma shake zlib zstd + archive-sig base bytestring bz2 lzlib shake zlib zstd ]; description = "Rules for binary distributions"; license = stdenv.lib.licenses.bsd3; @@ -221337,6 +222754,8 @@ self: { pname = "show-combinators"; version = "0.2.0.0"; sha256 = "07ds87ldl9165hj3k5h84iawc6vqlbggni3dg1nhbxww1spxn0n9"; + revision = "1"; + editedCabalFile = "1pczjf7z43nzfgza9fa29flbmvkj07p4dw16v9bjv36i8dv6cjc7"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; description = "Combinators to write Show instances"; @@ -221367,6 +222786,8 @@ self: { pname = "show-prettyprint"; version = "0.3.0.1"; sha256 = "030dzprz07ib41f8pg2409zdxymvkk8jq4m0vczvgaajq3gghkdk"; + revision = "1"; + editedCabalFile = "1sfspc1a5nhwap6mwx1wn75ar8csb2kx8r0rpampdrpk427idvzs"; libraryHaskellDepends = [ ansi-wl-pprint base prettyprinter trifecta ]; @@ -221817,8 +223238,8 @@ self: { }: mkDerivation { pname = "simple"; - version = "0.11.3"; - sha256 = "0qifp6wacsmykb09ddx03yv4pbk7c1rhs16jjlfafm2wc2025rac"; + version = "1.0.0"; + sha256 = "18kzgs897xpvhxl68z49l850j3p4559r27i3sdp5nffyir32lwa5"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -221874,8 +223295,6 @@ self: { ]; description = "A simple library for affine and vector spaces"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "simple-atom" = callPackage @@ -222390,8 +223809,8 @@ self: { }: mkDerivation { pname = "simple-postgresql-orm"; - version = "0.9.0.1"; - sha256 = "0j1v64ywfchxjdidy5pb1dzab0qhn516vcy580incw1bminyh3rz"; + version = "1.0.0"; + sha256 = "0dl62x99j331371m8ailvk1pajnb43nsygl33j9vnq5alz7kpifp"; libraryHaskellDepends = [ base bytestring directory filepath postgresql-orm postgresql-simple resource-pool simple transformers @@ -222468,8 +223887,8 @@ self: { }: mkDerivation { pname = "simple-session"; - version = "0.10.1.1"; - sha256 = "1hg7925p14hk1p8v65n5ysd41qyfsccrjm40192bd000m2vrr74a"; + version = "1.0.0"; + sha256 = "0lgs260wcqa796mw9vsg9dfgx0d8kd5m067cr4s7cp4fbssja0kp"; libraryHaskellDepends = [ base base64-bytestring blaze-builder byteable bytestring containers cookie cryptohash http-types simple transformers wai wai-extra @@ -222600,6 +224019,25 @@ self: { license = stdenv.lib.licenses.lgpl3; }) {}; + "simple-templates_1_0_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, hspec, HUnit, scientific + , text, unordered-containers, vector + }: + mkDerivation { + pname = "simple-templates"; + version = "1.0.0"; + sha256 = "0vm30fdjm5fydv4ns3z2cvmqadyxb47kvj8nzwkk5jff35jaglrf"; + libraryHaskellDepends = [ + aeson attoparsec base scientific text unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec base hspec HUnit scientific vector + ]; + description = "A basic template language for the Simple web framework"; + license = stdenv.lib.licenses.lgpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "simple-text-format" = callPackage ({ mkDerivation, attoparsec, base, hspec, microlens-platform, text , unordered-containers @@ -223010,8 +224448,8 @@ self: { ({ mkDerivation, base, singletons }: mkDerivation { pname = "singleton-nats"; - version = "0.4.4"; - sha256 = "14am0aggfrnd2w5g8cjljx0vmmrhy6r36xpkfrxpralhkr7h52m8"; + version = "0.4.5"; + sha256 = "0qmkqfj8rch9qcczs05lm5l3sx29slmqw156g4hhr3d735xg4nk1"; libraryHaskellDepends = [ base singletons ]; description = "Unary natural numbers relying on the singletons infrastructure"; license = stdenv.lib.licenses.bsd3; @@ -227943,21 +229381,6 @@ self: { }) {}; "speculate" = callPackage - ({ mkDerivation, base, cmdargs, containers, express, leancheck }: - mkDerivation { - pname = "speculate"; - version = "0.4.1"; - sha256 = "1fyj6kizwwb2vpvn17s7gx4swmzsziwmf6mmxaldbrzkha46y9hn"; - libraryHaskellDepends = [ - base cmdargs containers express leancheck - ]; - testHaskellDepends = [ base express leancheck ]; - benchmarkHaskellDepends = [ base express leancheck ]; - description = "discovery of properties about Haskell functions"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "speculate_0_4_2" = callPackage ({ mkDerivation, base, cmdargs, containers, express, leancheck }: mkDerivation { pname = "speculate"; @@ -227970,7 +229393,6 @@ self: { benchmarkHaskellDepends = [ base express leancheck ]; description = "discovery of properties about Haskell functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "speculation" = callPackage @@ -228854,11 +230276,11 @@ self: { ({ mkDerivation, base, logging, text, transformers, unixODBC }: mkDerivation { pname = "sqlcli"; - version = "0.2.0.1"; - sha256 = "09x9g3rjz1idyr0rh885y4pdddn08g7hwcspa47n6yf5wlx33gln"; + version = "0.2.1.0"; + sha256 = "1wqad2chgkpim467affs9bd6ipmkfv36kv8bdpd5mv8qkszryzwp"; libraryHaskellDepends = [ base logging text transformers ]; librarySystemDepends = [ unixODBC ]; - description = "Sql Call-Level Interface bindings for Haskell"; + description = "High quality SQL/CLI and ODBC C function bindings"; license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) unixODBC;}; @@ -228982,30 +230404,38 @@ self: { }) {}; "squeal-postgresql" = callPackage - ({ mkDerivation, aeson, async, base, binary-parser, bytestring - , bytestring-strict-builder, deepseq, doctest, generics-sop, hspec - , mmorph, mtl, network-ip, postgresql-binary, postgresql-libpq + ({ mkDerivation, aeson, async, base, binary, binary-parser + , bytestring, bytestring-strict-builder, deepseq, doctest + , free-categories, gauge, generic-random, generics-sop, hedgehog + , hspec, mmorph, monad-loops, mtl, network-ip, postgresql-binary + , postgresql-libpq, profunctors, QuickCheck, quickcheck-instances , records-sop, resource-pool, scientific, text, time, transformers - , unliftio, unliftio-pool, uuid-types, vector + , unliftio, unliftio-pool, uuid-types, vector, with-utf8 }: mkDerivation { pname = "squeal-postgresql"; - version = "0.5.2.0"; - sha256 = "09mmpk42lllrx69mkfnbj7pgy5iclrv22dy3cndfv8y0vk70nhr1"; + version = "0.6.0.1"; + sha256 = "1c8lsi3qjl1zp0hfhmrv5r6pqsvcilx3g1aw49rrvjrj9xlbbvws"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base binary-parser bytestring bytestring-strict-builder - deepseq generics-sop mmorph mtl network-ip postgresql-binary - postgresql-libpq records-sop resource-pool scientific text time + aeson base binary binary-parser bytestring + bytestring-strict-builder deepseq free-categories generics-sop + mmorph mtl network-ip postgresql-binary postgresql-libpq + profunctors records-sop resource-pool scientific text time transformers unliftio unliftio-pool uuid-types vector ]; executableHaskellDepends = [ base bytestring generics-sop mtl text transformers vector ]; testHaskellDepends = [ - async base bytestring doctest generics-sop hspec text transformers - vector + async base bytestring doctest generics-sop hedgehog hspec mtl + scientific text time vector with-utf8 + ]; + benchmarkHaskellDepends = [ + base bytestring deepseq gauge generic-random generics-sop + monad-loops mtl QuickCheck quickcheck-instances scientific text + with-utf8 ]; description = "Squeal PostgreSQL Library"; license = stdenv.lib.licenses.bsd3; @@ -229452,6 +230882,8 @@ self: { pname = "stache"; version = "2.1.1"; sha256 = "06pn7pm5vgk9f4bsh3m29cik514nv5w655ip04k7p5jv9xgmn4ld"; + revision = "1"; + editedCabalFile = "1cs3pnbxmjpzizydncai7wr5aj454374wr1sc0h705c4cbxqlfs0"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson base bytestring containers deepseq directory filepath @@ -233334,6 +234766,17 @@ self: { broken = true; }) {}; + "string-like" = callPackage + ({ mkDerivation, base, bytestring, text }: + mkDerivation { + pname = "string-like"; + version = "0.1.0.0"; + sha256 = "1b87532fhv2wn6pnzsaw20lzj5j399smlfn7lai0h0ph2axb2dbi"; + libraryHaskellDepends = [ base bytestring text ]; + description = "A package that aims to provide a uniform interface to string-like types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "string-qq" = callPackage ({ mkDerivation, base, HUnit, template-haskell, text }: mkDerivation { @@ -238319,10 +239762,8 @@ self: { }: mkDerivation { pname = "taskwarrior"; - version = "0.1.2.2"; - sha256 = "0iy2fxgxhjdhi62zbd7iwbvblgr9shlqwg4a92k7b3cd9mqwskv6"; - revision = "1"; - editedCabalFile = "0fyidh845imi20r9h5sh4nvhnzylj5wg1rkfp9zpml7ifvpv609v"; + version = "0.1.2.3"; + sha256 = "02vavv0ddx82h7xa3nky3s54fz8pnar8kgzssz83f08brw35qdjb"; libraryHaskellDepends = [ aeson base bytestring process random text time unordered-containers uuid @@ -238482,6 +239923,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-golden_2_3_3_1" = callPackage + ({ mkDerivation, async, base, bytestring, containers, deepseq + , directory, filepath, mtl, optparse-applicative, process, tagged + , tasty, tasty-hunit, temporary, text + }: + mkDerivation { + pname = "tasty-golden"; + version = "2.3.3.1"; + sha256 = "1gvi35kjpj7636hi8mx05gp3qip7g94la3063d7nwr0jn9g6zb5s"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring containers deepseq directory filepath mtl + optparse-applicative process tagged tasty temporary text + ]; + testHaskellDepends = [ + base directory filepath process tasty tasty-hunit temporary + ]; + description = "Golden tests support for tasty"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-groundhog-converters" = callPackage ({ mkDerivation, aeson, base, bimap, bytestring, containers , groundhog, groundhog-converters, groundhog-sqlite, groundhog-th @@ -239210,8 +240674,8 @@ self: { pname = "tdigest"; version = "0.2.1"; sha256 = "0kmqmzjcs406hv2fv9bkfayxpsd41dbry8bpkhy4y1jdgh33hvnl"; - revision = "4"; - editedCabalFile = "0830zzgbf5xffa1yqwcvy4xm1wzzydvy5wmy3sqk3a5n85v295by"; + revision = "5"; + editedCabalFile = "1crjfhxhs8ihbl2xn1dqr5w19g7w74mcf2w889my6zb935l7lyjs"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base-compat binary deepseq reducers semigroupoids transformers @@ -239233,8 +240697,8 @@ self: { pname = "tdigest-Chart"; version = "0.2"; sha256 = "1ciq7d187as9sk1dpccm2s02b6jdhij1l477wff0a7labgw21l0l"; - revision = "2"; - editedCabalFile = "07fg2pnj06vz2cwyxqyx40ghd0d7p9byazds7lhim4z397gngk0f"; + revision = "3"; + editedCabalFile = "0y7248myrk6zn4bbbi1v6vv4hmrbqr3wb47xl7q1akrcfi687033"; libraryHaskellDepends = [ base base-compat Chart colour lens semigroupoids tdigest ]; @@ -239432,6 +240896,51 @@ self: { broken = true; }) {}; + "telegram-raw-api" = callPackage + ({ mkDerivation, aeson, base, bytestring, connection + , deriving-aeson, generic-lens, http-client, http-client-tls + , http-media, lens, servant, servant-client, servant-client-core + , servant-multipart, telegram-types, text + }: + mkDerivation { + pname = "telegram-raw-api"; + version = "0.1.0"; + sha256 = "0afj22mwxsqdb95m1lb03h4fssyfwsrvi2qdm2bajkvlgaz3h8zh"; + libraryHaskellDepends = [ + aeson base bytestring connection deriving-aeson generic-lens + http-media lens servant servant-client servant-multipart + telegram-types text + ]; + testHaskellDepends = [ + aeson base bytestring connection deriving-aeson generic-lens + http-client http-client-tls http-media lens servant servant-client + servant-client-core servant-multipart telegram-types text + ]; + description = "Servant bindings to the Telegram bot API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "telegram-types" = callPackage + ({ mkDerivation, aeson, base, bytestring, deriving-aeson, filepath + , generic-lens, lens, mime-types, open-union, servant + , servant-multipart, text + }: + mkDerivation { + pname = "telegram-types"; + version = "0.1.0"; + sha256 = "19xrmqcgv5dih9vfxp5dvzzxsfs3x3rsz0ncw9x6xxzbmiirbc0k"; + libraryHaskellDepends = [ + aeson base bytestring deriving-aeson filepath generic-lens lens + mime-types open-union servant servant-multipart text + ]; + testHaskellDepends = [ + aeson base bytestring deriving-aeson filepath generic-lens lens + mime-types open-union servant servant-multipart text + ]; + description = "Types used in Telegram bot API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "teleport" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring , configurator, optparse-applicative, system-filepath, text, turtle @@ -242689,10 +244198,8 @@ self: { }: mkDerivation { pname = "th-lift-instances"; - version = "0.1.14"; - sha256 = "0r1b4jnvcj64wp4hfccwkl4a70n1p1q7qzyx6ax7cmd8k961jz78"; - revision = "1"; - editedCabalFile = "1jsh3vz8kkzwhfm3m9ji5am8lmv2x7l8g0kkyh3ffngpr4xpswwc"; + version = "0.1.15"; + sha256 = "07x8rclsn355zsacgh9xk97j6n13d3457rwcpbwrw5lmq8qz3c13"; libraryHaskellDepends = [ base bytestring containers template-haskell text th-lift transformers vector @@ -242704,14 +244211,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "th-lift-instances_0_1_15" = callPackage + "th-lift-instances_0_1_16" = callPackage ({ mkDerivation, base, bytestring, containers, QuickCheck , template-haskell, text, th-lift, transformers, vector }: mkDerivation { pname = "th-lift-instances"; - version = "0.1.15"; - sha256 = "07x8rclsn355zsacgh9xk97j6n13d3457rwcpbwrw5lmq8qz3c13"; + version = "0.1.16"; + sha256 = "08ivlz37ir2xyl8ch5x4n2gb34rgk5ryaybfr2xbfc4ah4zfjfav"; libraryHaskellDepends = [ base bytestring containers template-haskell text th-lift transformers vector @@ -242758,6 +244265,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "th-orphans_0_13_10" = callPackage + ({ mkDerivation, base, bytestring, ghc-prim, hspec, hspec-discover + , mtl, template-haskell, th-lift, th-lift-instances, th-reify-many + }: + mkDerivation { + pname = "th-orphans"; + version = "0.13.10"; + sha256 = "0a69jrvialwg9g1h3j729jahl47h9ar5xxjqbi3pxyfc94v5fcs4"; + libraryHaskellDepends = [ + base mtl template-haskell th-lift th-lift-instances th-reify-many + ]; + testHaskellDepends = [ + base bytestring ghc-prim hspec template-haskell th-lift + ]; + testToolDepends = [ hspec-discover ]; + description = "Orphan instances for TH datatypes"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "th-pprint" = callPackage ({ mkDerivation, base, lens, pretty, template-haskell }: mkDerivation { @@ -243157,8 +244684,8 @@ self: { pname = "these-optics"; version = "1"; sha256 = "0gmsykzcjx5h6dbfny4dw3jrm33ykcw6rpngf5awwdpg3a4cfgi7"; - revision = "2"; - editedCabalFile = "04iahn4y52qj3q99r20zp0cgj764m7k073jmkf66qf819133afl8"; + revision = "3"; + editedCabalFile = "0nmn7gkq9gx1zfs6sbib3m7zrrjhndfhx2m6sw68nkmc1baipg33"; libraryHaskellDepends = [ base optics-core these ]; description = "Optics for These"; license = stdenv.lib.licenses.bsd3; @@ -243869,6 +245396,28 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "tidal_1_4_9" = callPackage + ({ mkDerivation, base, bifunctors, bytestring, clock, colour + , containers, criterion, deepseq, hosc, microspec, mwc-random + , network, parsec, primitive, random, text, transformers, vector + , weigh + }: + mkDerivation { + pname = "tidal"; + version = "1.4.9"; + sha256 = "0np32jnvqmnnqy166a17i367c5j5xc9mniqzr0x76wk7mb5zlwzj"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bifunctors bytestring clock colour containers deepseq hosc + mwc-random network parsec primitive random text transformers vector + ]; + testHaskellDepends = [ base containers microspec parsec ]; + benchmarkHaskellDepends = [ base criterion weigh ]; + description = "Pattern language for improvised music"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tidal-midi" = callPackage ({ mkDerivation, base, containers, PortMidi, tidal, time , transformers @@ -246738,29 +248287,6 @@ self: { }) {}; "tracing" = callPackage - ({ mkDerivation, aeson, base, base16-bytestring, bytestring - , case-insensitive, containers, hspec, http-client, ip, mtl - , network, random, stm, text, time, transformers, unliftio - }: - mkDerivation { - pname = "tracing"; - version = "0.0.4.0"; - sha256 = "1l0sh9rmbysjysh169902hzx86dahiffgss8wnac8vcz95kc5qjb"; - libraryHaskellDepends = [ - aeson base base16-bytestring bytestring case-insensitive containers - http-client ip mtl network random stm text time transformers - unliftio - ]; - testHaskellDepends = [ - base containers hspec mtl stm text unliftio - ]; - description = "Distributed tracing"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "tracing_0_0_5_1" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , case-insensitive, containers, hspec, http-client, mtl, network , random, stm, text, time, transformers, unliftio @@ -251972,10 +253498,10 @@ self: { }: mkDerivation { pname = "unfoldable"; - version = "0.9.6"; - sha256 = "18gaay37mjgyd5rfpfs84p4q7vqdnv4lcjabaprgm315pblym46d"; - revision = "2"; - editedCabalFile = "08rx8ci2jpa77q1dl4lghlyhd27if990ic9kaz30hczsazlzi44b"; + version = "1.0"; + sha256 = "0ilzv4ks76f9fx12ilsam0v232fm2mvvsz6s50p0nllldwgkgm6a"; + revision = "1"; + editedCabalFile = "167jqv6cw9d1c9n0j2sxp5asaaqbh6ay3g8nyg8ndy96jnjb34zb"; libraryHaskellDepends = [ base containers ghc-prim one-liner QuickCheck random transformers ]; @@ -252246,12 +253772,12 @@ self: { }) {}; "unicode-tricks" = callPackage - ({ mkDerivation, base, QuickCheck, text }: + ({ mkDerivation, base, data-default, QuickCheck, text }: mkDerivation { pname = "unicode-tricks"; - version = "0.4.0.0"; - sha256 = "1gjhdai87prws1dg6hl23r3p6xrisn7jranf50kmfwir4zmxqdl4"; - libraryHaskellDepends = [ base QuickCheck text ]; + version = "0.5.0.0"; + sha256 = "0zbsph58w6lfc2357zkl46nm0y08bh3d29ihz6jgpvzi6cxgf5fl"; + libraryHaskellDepends = [ base data-default QuickCheck text ]; description = "Functions to work with unicode blocks more convenient"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -253992,8 +255518,8 @@ self: { pname = "uri-templater"; version = "0.3.1.0"; sha256 = "1hj93jgn8xch9bw9fs76qsfqarb15csfy0ddnr1dxcq04vznbri1"; - revision = "1"; - editedCabalFile = "0vl1nv40yzns9fnaz6h34x72vpfaaws8f0zm8qlr82333pxg2scw"; + revision = "2"; + editedCabalFile = "1fc0agzm3qasslhns64qbyhml31s1akib0mfaj2298iqm8075jyg"; libraryHaskellDepends = [ ansi-wl-pprint base bytestring charset containers dlist HTTP mtl parsers template-haskell text time trifecta unordered-containers @@ -254951,8 +256477,8 @@ self: { }: mkDerivation { pname = "uuid-orphans"; - version = "1.4.4"; - sha256 = "1qmlnzqdm9wrczlknw53y91yvdzfjbxs10szxvg9xaa4bj7gs5rw"; + version = "1.4.5"; + sha256 = "14d7gyf3sa2874r0dhj3ydvmb1iz174kp4pxz7aq984zb4m6d87z"; libraryHaskellDepends = [ base safecopy text th-lift uuid-types web-routes ]; @@ -255423,6 +256949,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity_0_11_0_0" = callPackage + ({ mkDerivation, base, hspec }: + mkDerivation { + pname = "validity"; + version = "0.11.0.0"; + sha256 = "1jawa7d37al29zp2b5hba9w348g926ckbxp51l9bprii5v47lyln"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base hspec ]; + description = "Validity typeclass"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-aeson" = callPackage ({ mkDerivation, aeson, base, validity, validity-scientific , validity-text, validity-unordered-containers, validity-vector @@ -255728,21 +257267,6 @@ self: { }) {}; "vault" = callPackage - ({ mkDerivation, base, containers, hashable, semigroups - , unordered-containers - }: - mkDerivation { - pname = "vault"; - version = "0.3.1.3"; - sha256 = "0vdm472vn734xa27jjm2mjacl37mxiqaaahvm4hzqjgyh4cqq377"; - libraryHaskellDepends = [ - base containers hashable semigroups unordered-containers - ]; - description = "a persistent store for values of arbitrary types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vault_0_3_1_4" = callPackage ({ mkDerivation, base, containers, hashable, semigroups , unordered-containers }: @@ -255755,7 +257279,6 @@ self: { ]; description = "a persistent store for values of arbitrary types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vault-tool" = callPackage @@ -256047,6 +257570,8 @@ self: { pname = "vec-optics"; version = "0.3"; sha256 = "13g0j9hn27jfjlrm7c6bdsb2lhwrg016cal7hdic8azdxgdp8n0a"; + revision = "1"; + editedCabalFile = "10abn334qhbik8s8lx1r54vcbj3d2s091j2w98mq3cllksa8dmv0"; libraryHaskellDepends = [ base fin optics-core vec ]; description = "Vec: length-indexed (sized) list: optics support"; license = stdenv.lib.licenses.bsd3; @@ -258669,8 +260194,8 @@ self: { }: mkDerivation { pname = "wai-log"; - version = "0.1.0.0"; - sha256 = "1a0fs008nj47pbr8cjf8wh5j4dqqpgrp0dg75k2x5gx8v28d6q3n"; + version = "0.2.0.0"; + sha256 = "02lsvkh7mkqd6p69qffrl62pdxzn5h1a4wnqflb3sycifi8dmj9b"; libraryHaskellDepends = [ aeson base http-types log-base string-conversions text time wai ]; @@ -260004,39 +261529,6 @@ self: { }) {}; "warp" = callPackage - ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked - , bytestring, case-insensitive, containers, directory, gauge - , ghc-prim, hashable, hspec, http-client, http-date, http-types - , http2, HUnit, iproute, lifted-base, network, process, QuickCheck - , simple-sendfile, stm, streaming-commons, text, time, time-manager - , unix, unix-compat, vault, wai, word8, x509 - }: - mkDerivation { - pname = "warp"; - version = "3.3.9"; - sha256 = "1hb8984sp0dri2a65sql0j310x47063dn4mbpmax0bkn13l4b6j3"; - libraryHaskellDepends = [ - array async auto-update base bsb-http-chunked bytestring - case-insensitive containers ghc-prim hashable http-date http-types - http2 iproute network simple-sendfile stm streaming-commons text - time-manager unix unix-compat vault wai word8 x509 - ]; - testHaskellDepends = [ - array async auto-update base bsb-http-chunked bytestring - case-insensitive containers directory ghc-prim hashable hspec - http-client http-date http-types http2 HUnit iproute lifted-base - network process QuickCheck simple-sendfile stm streaming-commons - text time time-manager unix unix-compat vault wai word8 x509 - ]; - benchmarkHaskellDepends = [ - auto-update base bytestring containers gauge hashable http-date - http-types network time-manager unix unix-compat x509 - ]; - description = "A fast, light-weight web server for WAI applications"; - license = stdenv.lib.licenses.mit; - }) {}; - - "warp_3_3_10" = callPackage ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked , bytestring, case-insensitive, containers, directory, gauge , ghc-prim, hashable, hspec, http-client, http-date, http-types @@ -260067,7 +261559,6 @@ self: { ]; description = "A fast, light-weight web server for WAI applications"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "warp-dynamic" = callPackage @@ -271520,7 +273011,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "zip_1_4_1" = callPackage + "zip_1_5_0" = callPackage ({ mkDerivation, base, bytestring, bzlib-conduit, case-insensitive , cereal, conduit, conduit-extra, containers, digest, directory , dlist, exceptions, filepath, hspec, monad-control, mtl @@ -271529,8 +273020,8 @@ self: { }: mkDerivation { pname = "zip"; - version = "1.4.1"; - sha256 = "0jnvqss17zjfs91flsammlx4flw527iddlav37jzqihi6j65aqp2"; + version = "1.5.0"; + sha256 = "00lqf0bw6abxdj9rs658blbhabzr1fd1w9dh0qflyxqkd8fqj7h5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ -- cgit v1.2.3 From 7932fb22cbf4df9d1b630e130160b3081bd5de10 Mon Sep 17 00:00:00 2001 From: Gabor Greif Date: Sat, 11 Apr 2020 09:41:22 +0200 Subject: ghcHEAD: bump to 8.11.20200403 (#84217) * ghcHEAD: bump to 8.11.20200403 * ghcHead: reduce diff vs. 8.10.1 dontAddExtraLibs was removed by accident (IMO) in ea19a8ed1e3 * ghcHEAD: add ability to use system libffi - enable nixpkgs' libffi - minimise diffs against 8.10.1 - remove patching * remove configure warning about --with-curses-includes configure: WARNING: unrecognized options: --with-curses-includes --- doc/languages-frameworks/haskell.section.md | 8 ++--- pkgs/development/compilers/ghc/head.nix | 48 ++++++++++++++++++----------- pkgs/top-level/haskell-packages.nix | 7 +++-- 3 files changed, 38 insertions(+), 25 deletions(-) diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index 54ba8e4786d..733e75c16a7 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -101,10 +101,10 @@ to compile your Haskell packages with any GHC version you please. The following command displays the complete list of available compilers: ``` $ nix-env -f "" -qaP -A haskell.compiler -haskell.compiler.ghc8101 ghc-8.10.0.20191210 -haskell.compiler.integer-simple.ghc8101 ghc-8.10.0.20191210 -haskell.compiler.ghcHEAD ghc-8.10.20191119 -haskell.compiler.integer-simple.ghcHEAD ghc-8.10.20191119 +haskell.compiler.ghc8101 ghc-8.10.1 +haskell.compiler.integer-simple.ghc8101 ghc-8.10.1 +haskell.compiler.ghcHEAD ghc-8.11.20200403 +haskell.compiler.integer-simple.ghcHEAD ghc-8.11.20200403 haskell.compiler.ghc822Binary ghc-8.2.2-binary haskell.compiler.ghc844 ghc-8.4.4 haskell.compiler.ghc863Binary ghc-8.6.3-binary diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index be8fd73a6be..d7fe37d1103 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -2,13 +2,17 @@ # build-tools , bootPkgs -, autoconf, autoreconfHook, automake, coreutils, fetchgit, fetchpatch, perl, python3, m4, sphinx +, autoconf, autoreconfHook, automake, coreutils, fetchgit, perl, python3, m4, sphinx , bash , libiconv ? null, ncurses +, # GHC can be built with system libffi or a bundled one. + libffi ? null + , enableDwarf ? !stdenv.targetPlatform.isDarwin && - !stdenv.targetPlatform.isWindows, elfutils # for DWARF support + !stdenv.targetPlatform.isWindows +, elfutils # for DWARF support , useLLVM ? !stdenv.targetPlatform.isx86 || stdenv.targetPlatform.isiOS , # LLVM is conceptually a run-time-only depedendency, but for @@ -18,7 +22,8 @@ , # 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 + 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 @@ -30,7 +35,7 @@ , # Whetherto build terminfo. enableTerminfo ? !stdenv.targetPlatform.isWindows -, version ? "8.10.20191119" +, version ? "8.11.20200403" , # 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) @@ -75,6 +80,7 @@ let # 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 ++ stdenv.lib.optional enableDwarf elfutils; @@ -97,17 +103,14 @@ stdenv.mkDerivation (rec { src = fetchgit { url = "https://gitlab.haskell.org/ghc/ghc.git/"; - rev = "0418c38d55c7a47967187dce2db5ea2ab1021b1e"; - sha256 = "1d8g30ii0w4xh6fh61bxbalsqqyanny99nn3p727fx7favnhgvxi"; + rev = "4291bddaea3148908c55f235ee8978e1d9aa6f20"; + sha256 = "1gs3mxmsdpsgsp7vnawx8mys0qwg4x2zhfrbciy3wv8nv13ar1af"; }; enableParallelBuilding = true; outputs = [ "out" "doc" ]; - patches = [ - ]; - postPatch = "patchShebangs ."; # GHC is a bit confused on its cross terminology. @@ -130,8 +133,8 @@ stdenv.mkDerivation (rec { export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" echo -n "${buildMK}" > mk/build.mk - echo ${version} >VERSION - echo ${src.rev} >GIT_COMMIT_ID + echo ${version} > VERSION + echo ${src.rev} > GIT_COMMIT_ID ./boot sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' @@ -161,31 +164,40 @@ stdenv.mkDerivation (rec { # 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" + "--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.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ - "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" + "--with-gmp-includes=${targetPackages.gmp.dev}/include" + "--with-gmp-libraries=${targetPackages.gmp.out}/lib" ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ - "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" + "--with-iconv-includes=${libiconv}/include" + "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ "--enable-bootstrap-with-devel-snapshot" ] ++ stdenv.lib.optionals useLdGold [ "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" - ] ++ stdenv.lib.optionals enableDwarf [ + ] ++ stdenv.lib.optional disableLargeAddressSpace "--disable-large-address-space" + ++ stdenv.lib.optionals enableDwarf [ "--enable-dwarf-unwind" "--with-libdw-includes=${stdenv.lib.getDev elfutils}/include" "--with-libdw-libraries=${stdenv.lib.getLib elfutils}/lib" ]; - # Make sure we never relax`$PATH` and hooks support for compatability. + # Make sure we never relax`$PATH` and hooks support for compatibility. strictDeps = true; + # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. + dontAddExtraLibs = true; + nativeBuildInputs = [ perl autoconf autoreconfHook automake m4 python3 sphinx ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 052b84f269e..aa7ef02a388 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -81,10 +81,11 @@ in { llvmPackages = pkgs.llvmPackages_9; }; ghcHEAD = callPackage ../development/compilers/ghc/head.nix { - bootPkgs = packages.ghc865Binary; + bootPkgs = packages.ghc883; # no binary yet inherit (buildPackages.python3Packages) sphinx; - buildLlvmPackages = buildPackages.llvmPackages_6; - llvmPackages = pkgs.llvmPackages_6; + buildLlvmPackages = buildPackages.llvmPackages_9; + llvmPackages = pkgs.llvmPackages_9; + libffi = pkgs.libffi; }; ghcjs = compiler.ghcjs86; ghcjs86 = callPackage ../development/compilers/ghcjs-ng { -- cgit v1.2.3 From a0612c2a068d2fb783443a9776f476d729b89288 Mon Sep 17 00:00:00 2001 From: "(cdep)illabout" Date: Wed, 15 Apr 2020 22:41:09 +0900 Subject: spago: 0.14.0 -> 0.15.1 --- .../haskell-modules/configuration-nix.nix | 15 ++++++--------- pkgs/development/tools/purescript/spago/spago.nix | 22 +++++++++------------- 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index fb8412a6a9b..9c85c2b0f73 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -655,22 +655,19 @@ self: super: builtins.intersectAttrs super { spago = let - # Spago needs a patch for MonadFail changes. - # https://github.com/purescript/spago/pull/584 - # This can probably be removed when a version after spago-0.14.0 is released. + # Spago needs a small patch to work with the latest versions of rio. + # https://github.com/purescript/spago/pull/616 + # This can probably be removed when a version after spago-0.15.1 is released. spagoWithPatches = appendPatch super.spago (pkgs.fetchpatch { - url = "https://github.com/purescript/spago/pull/584/commits/898a8e48665e5a73ea03525ce2c973455ab9ac52.patch"; - sha256 = "05gs1hjlcf60cr6728rhgwwgxp3ildly14v4l2lrh6ma2fljhyjy"; + url = "https://github.com/purescript/spago/pull/616/commits/95b5fa0f1d3bfb07972d1ef5004b8bee8a070667.patch"; + sha256 = "0v3890lwhddfrq9mhbq92962pkxra8kwbin97wg3s0b02dk65ysc"; }); # Spago basically compiles with LTS-14, but it requires a newer version # of directory. This is to work around a bug only present on windows, so # we can safely jailbreak spago and use the older directory package from # LTS-14. - spagoWithOverrides = doJailbreak (spagoWithPatches.override { - # spago requires dhall-1.29.0. - dhall = self.dhall_1_29_0; - }); + spagoWithOverrides = doJailbreak spagoWithPatches; # This defines the version of the purescript-docs-search release we are using. # This is defined in the src/Spago/Prelude.hs file in the spago source. diff --git a/pkgs/development/tools/purescript/spago/spago.nix b/pkgs/development/tools/purescript/spago/spago.nix index adf019eef57..254a7bc97e4 100644 --- a/pkgs/development/tools/purescript/spago/spago.nix +++ b/pkgs/development/tools/purescript/spago/spago.nix @@ -7,15 +7,15 @@ , prettyprinter, process, QuickCheck, retry, rio, rio-orphans, safe , semver-range, stdenv, stm, tar, template-haskell, temporary, text , time, transformers, turtle, unliftio, unordered-containers -, vector, versions, zlib +, vector, versions, with-utf8, zlib }: mkDerivation { pname = "spago"; - version = "0.14.0"; + version = "0.15.1"; src = fetchgit { url = "https://github.com/purescript/spago.git"; - sha256 = "12i1430prqspy73nwfxc17zf51yprhrxxcnhw4rks6jhkgwxf4a4"; - rev = "7a99343e4876a465600eaa64b0697a9f0b2a49a9"; + sha256 = "09ypbm03ap8xfhq803ra3cc01dxcavckn7nis6hi80dk2xxlhc3d"; + rev = "d5d206ff0f5c686f8b609fb4bc2e866959cc0144"; fetchSubmodules = true; }; isLibrary = true; @@ -25,17 +25,13 @@ mkDerivation { bytestring Cabal containers dhall directory either exceptions file-embed filepath foldl fsnotify github Glob http-client http-conduit lens-family-core megaparsec mtl network-uri - open-browser prettyprinter process retry rio rio-orphans safe - semver-range stm tar template-haskell temporary text time - transformers turtle unliftio unordered-containers vector versions - zlib + open-browser optparse-applicative prettyprinter process retry rio + rio-orphans safe semver-range stm tar template-haskell temporary + text time transformers turtle unliftio unordered-containers vector + versions with-utf8 zlib ]; libraryToolDepends = [ hpack ]; - executableHaskellDepends = [ - aeson-pretty async-pool base bytestring containers dhall filepath - github lens-family-core megaparsec optparse-applicative process - retry stm temporary text time turtle vector - ]; + executableHaskellDepends = [ base text turtle with-utf8 ]; testHaskellDepends = [ base containers directory extra hspec hspec-megaparsec megaparsec process QuickCheck temporary text turtle versions -- cgit v1.2.3 From 802dfc8bd7dd4d955fa52abc4a9dbce602215c19 Mon Sep 17 00:00:00 2001 From: Troels Henriksen Date: Wed, 15 Apr 2020 18:02:43 +0200 Subject: futhark: stop wrapping the executable --- .../haskell-modules/configuration-nix.nix | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 9c85c2b0f73..a8aec8e018e 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -572,23 +572,9 @@ self: super: builtins.intersectAttrs super { # The test-suite requires a running PostgreSQL server. Frames-beam = dontCheck super.Frames-beam; - # * Compile manpages (which are in RST and are compiled with Sphinx). - # - # * Wrap so that binary can find GCC and OpenCL headers (dubious if - # a good idea). + # Compile manpages (which are in RST and are compiled with Sphinx). futhark = with pkgs; - let maybeWrap = - if pkgs.stdenv.isDarwin then "" - else - let path = stdenv.lib.makeBinPath [ gcc ]; - in '' - wrapProgram $out/bin/futhark \ - --prefix PATH : "${path}" \ - --set NIX_CC_WRAPPER_x86_64_unknown_linux_gnu_TARGET_HOST 1 \ - --set NIX_CFLAGS_COMPILE "-I${opencl-headers}/include" \ - --set NIX_CFLAGS_LINK "-L${ocl-icd}/lib" - ''; - in overrideCabal (addBuildTools super.futhark [makeWrapper python37Packages.sphinx]) + overrideCabal (addBuildTools super.futhark [makeWrapper python37Packages.sphinx]) (_drv: { postBuild = (_drv.postBuild or "") + '' make -C docs man @@ -597,8 +583,7 @@ self: super: builtins.intersectAttrs super { postInstall = (_drv.postInstall or "") + '' mkdir -p $out/share/man/man1 mv docs/_build/man/*.1 $out/share/man/man1/ - '' - + maybeWrap; + ''; }); git-annex = with pkgs; -- cgit v1.2.3 From a762316e72de3667fa90b45a2eef9c7ef295f9f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Thu, 16 Apr 2020 21:51:46 +0200 Subject: haskell simple-affine-space: Disable test suite --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 50148b835c0..866b856864b 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -177,6 +177,9 @@ self: super: { # Test suite build depends on ancient tasty 0.11.x. cryptohash-sha512 = dontCheck super.cryptohash-sha512; + # Test suite depends on source code being available + simple-affine-space = dontCheck super.simple-affine-space; + # https://github.com/kazu-yamamoto/simple-sendfile/issues/17 simple-sendfile = dontCheck super.simple-sendfile; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 1ecfe0196cc..ad59a764ebd 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -4332,7 +4332,6 @@ broken-packages: - duet - dumb-cas - dump-core - - dunai - dunai-core - dunai-test - Dung @@ -9190,7 +9189,6 @@ broken-packages: - simgi - simple - simple-actors - - simple-affine-space - simple-atom - simple-bluetooth - simple-c-value -- cgit v1.2.3 From b95534aaea9bef9257e4725ebf2abe59e3611539 Mon Sep 17 00:00:00 2001 From: Jappie Klooster Date: Thu, 16 Apr 2020 14:27:36 +0200 Subject: cut-the-crap: init at 1.0.0 --- pkgs/development/haskell-modules/configuration-nix.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index a8aec8e018e..ba885c0ecd5 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -724,4 +724,13 @@ self: super: builtins.intersectAttrs super { # dhall_1_29_0 is no longer used, since more recent versions of dhall don't # access the network in checks. dhall_1_29_0 = dontCheck super.dhall_1_29_0; + + cut-the-crap = + let path = pkgs.stdenv.lib.makeBinPath [ pkgs.ffmpeg ]; + in overrideCabal (addBuildTool super.cut-the-crap pkgs.makeWrapper) (_drv: { + postInstall = '' + wrapProgram $out/bin/cut-the-crap \ + --prefix PATH : "${path}" + ''; + }); } -- cgit v1.2.3 From d59d157ad93aa7cddd4751e7807dc73ee9b39962 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Fri, 17 Apr 2020 08:29:46 -0400 Subject: cabal-install-parsers: update Cabal dependency This also unbreaks `haskell-ci`. --- pkgs/development/haskell-modules/configuration-common.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 866b856864b..29fcd5c7167 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1453,9 +1453,12 @@ self: super: { # details. cryptonite = dontCheck super.cryptonite; - # The test suite depends on an impure cabal-install installation - # in $HOME, which we don't have in our build sandbox. - cabal-install-parsers = dontCheck super.cabal-install-parsers; + # The test suite depends on an impure cabal-install installation in + # $HOME, which we don't have in our build sandbox, and it is keeping + # up with the most recent Cabal version. + cabal-install-parsers = dontCheck (super.cabal-install-parsers.overrideScope (self: super: { + Cabal = self.Cabal_3_2_0_0; + })); # haskell-ci-0.8 needs cabal-install-parsers ==0.1, but we have 0.2. haskell-ci = doJailbreak super.haskell-ci; -- cgit v1.2.3 From 53cfd1d132d95aad49097e08a2630b44dc2cdd7c Mon Sep 17 00:00:00 2001 From: Mike Sperber Date: Wed, 15 Apr 2020 13:00:12 +0200 Subject: haskell-tensorflow: unbreak - get the current Git head of haskell-tensorflow - adjust dependencies --- .../haskell-modules/configuration-tensorflow.nix | 110 +++++++++------ .../patches/proto-lens-0.2.2.0.patch | 23 --- .../patches/proto-lens-0.5.1.0.patch | 23 +++ .../patches/proto-lens-protoc-0.2.2.3.patch | 51 ------- .../patches/proto-lens-setup-0.4.0.2.patch | 154 +++++++++++++++++++++ 5 files changed, 247 insertions(+), 114 deletions(-) delete mode 100644 pkgs/development/haskell-modules/patches/proto-lens-0.2.2.0.patch create mode 100644 pkgs/development/haskell-modules/patches/proto-lens-0.5.1.0.patch delete mode 100644 pkgs/development/haskell-modules/patches/proto-lens-protoc-0.2.2.3.patch create mode 100644 pkgs/development/haskell-modules/patches/proto-lens-setup-0.4.0.2.patch diff --git a/pkgs/development/haskell-modules/configuration-tensorflow.nix b/pkgs/development/haskell-modules/configuration-tensorflow.nix index 7aba8e3a574..ba0acd6b6d6 100644 --- a/pkgs/development/haskell-modules/configuration-tensorflow.nix +++ b/pkgs/development/haskell-modules/configuration-tensorflow.nix @@ -4,62 +4,91 @@ with haskellLib; self: super: let + # This contains updates to the dependencies, without which it would + # be even more work to get it to build. + # As of 2020-04, there's no new release in sight, which is why we're + # pulling from Github. tensorflow-haskell = pkgs.fetchFromGitHub { owner = "tensorflow"; repo = "haskell"; - rev = "85bf0bb12cecfcdfcf31dea43b67cbe44576f685"; - sha256 = "1xbwc8y4a7n2163g746dpyh1q86rbxaw3d41kcy1mbhvmfqq56x7"; + rev = "0f322b2e0611cbe7011c84ba8b6cb822e4725ebc"; + sha256 = "15gn66i547q20sd50ixwm6yk1g00syfgxp8xa6xjd0i3kcsl3gs1"; fetchSubmodules = true; }; - setSourceRoot = dir: drv: drv.overrideAttrs (_oldAttrs: {sourceRoot = "source/${dir}";}); + setTensorflowSourceRoot = dir: drv: + (overrideCabal drv (drv: { src = tensorflow-haskell; })) + .overrideAttrs (_oldAttrs: {sourceRoot = "source/${dir}";}); - proto-lens = self.proto-lens; - proto-lens-protoc = self.proto-lens-protoc; - proto-lens-protobuf-types = self.proto-lens-protobuf-types; - mainland-pretty = self.mainland-pretty_0_6_2; + proto-lens = self.proto-lens_0_5_1_0; + proto-lens-protoc = self.proto-lens-protoc_0_5_0_0; + proto-lens-runtime = self.proto-lens-runtime_0_5_0_0; + proto-lens-protobuf-types = self.proto-lens-protobuf-types_0_5_0_0; + proto-lens-setup = self.proto-lens-setup_0_4_0_2; + lens-family = self.lens-family_1_2_3; in { - proto-lens = appendPatch super.proto-lens ./patches/proto-lens-0.2.2.0.patch; - proto-lens-descriptors = doJailbreak (super.proto-lens-descriptors.override { - inherit proto-lens; - lens-labels = self.lens-labels_0_1_0_2; + lens-family_1_2_3 = super.lens-family_1_2_3.override { + lens-family-core = self.lens-family-core_1_2_3; + }; + + proto-lens_0_5_1_0 = (appendPatch (doJailbreak super.proto-lens_0_5_1_0) ./patches/proto-lens-0.5.1.0.patch).override { + inherit lens-family; + }; + + proto-lens-runtime_0_5_0_0 = doJailbreak (super.proto-lens-runtime_0_5_0_0.override { + inherit lens-family proto-lens; }); - proto-lens-protoc = appendPatch (addBuildDepend (super.proto-lens-protoc.override { - inherit proto-lens; - }) self.semigroups) ./patches/proto-lens-protoc-0.2.2.3.patch; - proto-lens-protobuf-types = doJailbreak (super.proto-lens-protobuf-types.override { - inherit proto-lens proto-lens-protoc; + + proto-lens-protoc_0_5_0_0 = doJailbreak (super.proto-lens-protoc_0_5_0_0.override { + inherit lens-family proto-lens; + haskell-src-exts = self.haskell-src-exts_1_19_1; }); + proto-lens-setup_0_4_0_2 = appendPatch (doJailbreak (super.proto-lens-setup_0_4_0_2.override { + inherit proto-lens-protoc; + })) ./patches/proto-lens-setup-0.4.0.2.patch; - lens-labels_0_1_0_2 = doJailbreak super.lens-labels_0_1_0_2; + proto-lens-protobuf-types_0_5_0_0 = doJailbreak (super.proto-lens-protobuf-types_0_5_0_0.override { + inherit lens-family proto-lens proto-lens-runtime proto-lens-setup; + }); - haskell-src-exts_1_19_1 = appendPatch (doJailbreak super.haskell-src-exts_1_19_1) ( + haskell-src-exts_1_19_1 = appendPatches (doJailbreak super.haskell-src-exts_1_19_1) [ # Adapt to the Semigroup–Monoid Proposal (enables building on GHC >= 8.4) - pkgs.fetchpatch { - url = "https://github.com/haskell-suite/haskell-src-exts/commit/258e072fe9e37f94360b7488b58ea2832843bbb8.patch"; - sha256 = "0ja6ai41v9plinlhjwja282m6ahn6mw4xi79np0jxqk83cg0z1ff"; - } - ); + (pkgs.fetchpatch { + url = https://github.com/haskell-suite/haskell-src-exts/commit/258e072fe9e37f94360b7488b58ea2832843bbb8.patch; + sha256 = "0ja6ai41v9plinlhjwja282m6ahn6mw4xi79np0jxqk83cg0z1ff"; + }) + # Adapt to MonadFail proposal (enables building on GHC >= 8.8) + (pkgs.fetchpatch { + url = https://gist.githubusercontent.com/mikesperber/0f2addaf3fbe97ffb4a5234d8711ba41/raw/e09e20998283c7195e82d546ba9266d290eb000d/gistfile1.txt; + sha256 = "18clvli7vpqsqlf2f3qidn71738j9zdlpana6wha3x0dxwan5ly0"; + }) ]; - tensorflow-proto = super.tensorflow-proto.override { - inherit proto-lens proto-lens-protobuf-types; + tensorflow-proto = (setTensorflowSourceRoot "tensorflow-proto" super.tensorflow-proto).override { + inherit proto-lens proto-lens-runtime proto-lens-setup proto-lens-protobuf-types; }; - tensorflow = super.tensorflow.override { - inherit mainland-pretty proto-lens; + + tensorflow = (setTensorflowSourceRoot "tensorflow" super.tensorflow).override { + inherit lens-family proto-lens; + # the "regular" Python package does not seem to include the binary library + libtensorflow = pkgs.libtensorflow-bin; }; - tensorflow-core-ops = super.tensorflow-core-ops.override { - inherit mainland-pretty proto-lens; + + tensorflow-core-ops = (setTensorflowSourceRoot "tensorflow-core-ops" super.tensorflow-core-ops).override { + inherit lens-family proto-lens; }; - tensorflow-logging = super.tensorflow-logging.override { - inherit proto-lens; + + tensorflow-logging = (setTensorflowSourceRoot "tensorflow-logging" super.tensorflow-logging).override { + inherit lens-family proto-lens; }; - tensorflow-mnist = overrideCabal (super.tensorflow-mnist.override { - inherit proto-lens; + + tensorflow-mnist = (setTensorflowSourceRoot "tensorflow-mnist" super.tensorflow-mnist).override { + inherit lens-family proto-lens; # https://github.com/tensorflow/haskell/issues/215 tensorflow-mnist-input-data = self.tensorflow-mnist-input-data; - }) (_drv: { broken = false; }); - tensorflow-mnist-input-data = setSourceRoot "tensorflow-mnist-input-data" (super.callPackage ( + }; + + tensorflow-mnist-input-data = setTensorflowSourceRoot "tensorflow-mnist-input-data" (super.callPackage ( { mkDerivation, base, bytestring, Cabal, cryptonite, directory , filepath, HTTP, network-uri, stdenv }: @@ -80,7 +109,6 @@ in mkDerivation { pname = "tensorflow-mnist-input-data"; version = "0.1.0.0"; - src = tensorflow-haskell; enableSeparateDataOutput = true; setupHaskellDepends = [ base bytestring Cabal cryptonite directory filepath HTTP @@ -95,10 +123,12 @@ in license = stdenv.lib.licenses.asl20; } ) {}); - tensorflow-opgen = super.tensorflow-opgen.override { - inherit mainland-pretty proto-lens; + + tensorflow-opgen = (setTensorflowSourceRoot "tensorflow-opgen" super.tensorflow-opgen).override { + inherit lens-family proto-lens; }; - tensorflow-ops = super.tensorflow-ops.override { - inherit proto-lens; + + tensorflow-ops = (setTensorflowSourceRoot "tensorflow-ops" super.tensorflow-ops).override { + inherit lens-family proto-lens; }; } diff --git a/pkgs/development/haskell-modules/patches/proto-lens-0.2.2.0.patch b/pkgs/development/haskell-modules/patches/proto-lens-0.2.2.0.patch deleted file mode 100644 index 100a828a501..00000000000 --- a/pkgs/development/haskell-modules/patches/proto-lens-0.2.2.0.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur proto-lens-0.2.2.0/proto-lens.cabal proto-lens-0.2.2.0-patched/proto-lens.cabal ---- proto-lens-0.2.2.0/proto-lens.cabal 2018-08-13 18:05:41.704823370 +0200 -+++ proto-lens-0.2.2.0-patched/proto-lens.cabal 2018-08-13 18:07:42.352372300 +0200 -@@ -33,7 +33,7 @@ - Data.ProtoLens.Encoding.Wire - Data.ProtoLens.TextFormat.Parser - build-depends: attoparsec == 0.13.* -- , base >= 4.8 && < 4.11 -+ , base >= 4.8 - , bytestring == 0.10.* - , containers == 0.5.* - , data-default-class >= 0.0 && < 0.2 -diff -Naur proto-lens-0.2.2.0/src/Data/ProtoLens/TextFormat.hs proto-lens-0.2.2.0-patched/src/Data/ProtoLens/TextFormat.hs ---- proto-lens-0.2.2.0/src/Data/ProtoLens/TextFormat.hs 2017-04-28 02:16:46.000000000 +0200 -+++ proto-lens-0.2.2.0-patched/src/Data/ProtoLens/TextFormat.hs 2018-08-13 18:08:06.371486594 +0200 -@@ -17,6 +17,7 @@ - readMessageOrDie, - ) where - -+import Prelude hiding ((<>)) - import Lens.Family2 ((&),(^.),(.~), set, over) - import Control.Arrow (left) - import qualified Data.ByteString diff --git a/pkgs/development/haskell-modules/patches/proto-lens-0.5.1.0.patch b/pkgs/development/haskell-modules/patches/proto-lens-0.5.1.0.patch new file mode 100644 index 00000000000..b50d3f1cdbf --- /dev/null +++ b/pkgs/development/haskell-modules/patches/proto-lens-0.5.1.0.patch @@ -0,0 +1,23 @@ +diff --git a/src/Data/ProtoLens/Encoding/Parser/Internal.hs b/src/Data/ProtoLens/Encoding/Parser/Internal.hs +index 30eeaad..f2703e7 100644 +--- a/src/Data/ProtoLens/Encoding/Parser/Internal.hs ++++ b/src/Data/ProtoLens/Encoding/Parser/Internal.hs +@@ -1,4 +1,5 @@ + {-# LANGUAGE LambdaCase #-} ++{-# LANGUAGE CPP #-} + -- | Definition of the parsing monad, plus internal + -- unsafe functions. + module Data.ProtoLens.Encoding.Parser.Internal +@@ -36,8 +37,11 @@ instance Applicative Parser where + (<*>) = ap + + instance Monad Parser where +- fail s = Parser $ \_ _ -> return $ ParseFailure s + return = pure + Parser f >>= g = Parser $ \end pos -> f end pos >>= \case + ParseSuccess pos' x -> unParser (g x) end pos' + ParseFailure s -> return $ ParseFailure s ++#if MIN_VERSION_base(4,13,0) ++instance MonadFail Parser where ++#endif ++ fail s = Parser $ \_ _ -> return $ ParseFailure s diff --git a/pkgs/development/haskell-modules/patches/proto-lens-protoc-0.2.2.3.patch b/pkgs/development/haskell-modules/patches/proto-lens-protoc-0.2.2.3.patch deleted file mode 100644 index 87fd2aeab21..00000000000 --- a/pkgs/development/haskell-modules/patches/proto-lens-protoc-0.2.2.3.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -Naur proto-lens-protoc-0.2.2.3/proto-lens-protoc.cabal proto-lens-protoc-0.2.2.3-patched/proto-lens-protoc.cabal ---- proto-lens-protoc-0.2.2.3/proto-lens-protoc.cabal 2018-07-21 22:55:12.041698876 +0200 -+++ proto-lens-protoc-0.2.2.3-patched/proto-lens-protoc.cabal 2018-08-13 19:44:44.993147985 +0200 -@@ -37,8 +37,8 @@ - default-language: Haskell2010 - hs-source-dirs: src - build-depends: -- Cabal >= 1.22 && < 2.1 -- , base >= 4.8 && < 4.11 -+ Cabal >= 1.22 -+ , base >= 4.8 - , bytestring == 0.10.* - , containers == 0.5.* - , data-default-class >= 0.0 && < 0.2 -@@ -53,6 +53,7 @@ - , proto-lens == 0.2.2.* - , proto-lens-descriptors == 0.2.2.* - , text == 1.2.* -+ , semigroups - reexported-modules: - -- Modules that are needed by the generated Haskell files. - -- For forwards compatibility, reexport them as new module names so that -@@ -76,7 +77,7 @@ - main-is: protoc-gen-haskell.hs - - build-depends: -- base >= 4.8 && < 4.11 -+ base >= 4.8 - , bytestring == 0.10.* - , containers == 0.5.* - , data-default-class >= 0.0 && < 0.2 -diff -Naur proto-lens-protoc-0.2.2.3/src/Data/ProtoLens/Compiler/Definitions.hs proto-lens-protoc-0.2.2.3-patched/src/Data/ProtoLens/Compiler/Definitions.hs ---- proto-lens-protoc-0.2.2.3/src/Data/ProtoLens/Compiler/Definitions.hs 2017-08-07 06:52:21.000000000 +0200 -+++ proto-lens-protoc-0.2.2.3-patched/src/Data/ProtoLens/Compiler/Definitions.hs 2018-08-13 19:14:07.240505220 +0200 -@@ -35,6 +35,7 @@ - import qualified Data.Map as Map - import Data.Maybe (fromMaybe) - import Data.Monoid -+import qualified Data.Semigroup as Semigroup - import qualified Data.Set as Set - import Data.String (IsString(..)) - import Data.Text (Text, cons, splitOn, toLower, uncons, unpack) -@@ -139,7 +140,7 @@ - -- a 'Symbol' is used to construct both the type-level argument to - -- @HasLens@ and the name of the function @foo@. - newtype Symbol = Symbol String -- deriving (Eq, Ord, IsString, Monoid) -+ deriving (Eq, Ord, IsString, Semigroup.Semigroup, Monoid) - - nameFromSymbol :: Symbol -> Name - nameFromSymbol (Symbol s) = fromString s diff --git a/pkgs/development/haskell-modules/patches/proto-lens-setup-0.4.0.2.patch b/pkgs/development/haskell-modules/patches/proto-lens-setup-0.4.0.2.patch new file mode 100644 index 00000000000..a95df00e5db --- /dev/null +++ b/pkgs/development/haskell-modules/patches/proto-lens-setup-0.4.0.2.patch @@ -0,0 +1,154 @@ +diff --git a/src/Data/ProtoLens/Setup.hs b/src/Data/ProtoLens/Setup.hs +index e68f32b..f381199 100644 +--- a/src/Data/ProtoLens/Setup.hs ++++ b/src/Data/ProtoLens/Setup.hs +@@ -41,9 +41,6 @@ import Distribution.PackageDescription + , exeName + , exposedModules + , extraSrcFiles +-#if !MIN_VERSION_Cabal(2,0,0) +- , hsSourceDirs +-#endif + #if MIN_VERSION_Cabal(2,4,0) + , specVersion + #endif +@@ -53,7 +50,7 @@ import Distribution.PackageDescription + , testBuildInfo + , testName + ) +-import qualified Distribution.Simple.BuildPaths as BuildPaths ++import Distribution.Simple.BuildPaths (autogenComponentModulesDir) + import Distribution.Simple.InstallDirs (datadir) + import Distribution.Simple.LocalBuildInfo + ( LocalBuildInfo(..) +@@ -61,9 +58,10 @@ import Distribution.Simple.LocalBuildInfo + , ComponentName(..) + , ComponentLocalBuildInfo + , componentPackageDeps +-#if MIN_VERSION_Cabal(2,0,0) + , allComponentsInBuildOrder + , componentNameMap ++#if MIN_VERSION_Cabal(3,0,0) ++ , LibraryName(..) + #endif + ) + import qualified Distribution.Simple.PackageIndex as PackageIndex +@@ -205,16 +203,6 @@ generatingSpecificProtos root getProtos hooks = hooks + { buildHook = \p l h f -> generate l >> buildHook hooks p l h f + , haddockHook = \p l h f -> generate l >> haddockHook hooks p l h f + , replHook = \p l h f args -> generate l >> replHook hooks p l h f args +-#if !MIN_VERSION_Cabal(2,0,0) +- -- Older versions of Cabal don't support the autogen-modules field. +- -- Work around it by manually generating the modules and putting them +- -- in a place where `cabal sdist` will pick them up. +- , sDistHook = \p maybe_l h f -> case maybe_l of +- Nothing -> error "Can't run protoc; run 'cabal configure' first." +- Just l -> do +- generate l +- sDistHook hooks (fudgePackageDesc l p) maybe_l h f +-#endif + , postCopy = \a flags pkg lbi -> do + let verb = fromFlag $ copyVerbosity flags + let destDir = datadir (absoluteInstallDirs pkg lbi +@@ -316,39 +304,6 @@ copyProtosToDataDir verb root destDir files = do + protoLensImportsPrefix :: FilePath + protoLensImportsPrefix = "proto-lens-imports" + +-#if !MIN_VERSION_Cabal(2,0,0) +--- | Add the autogen directory to the hs-source-dirs of all the targets in the +--- .cabal file. Used to fool 'sdist' by pointing it to the generated source +--- files. +-fudgePackageDesc :: LocalBuildInfo -> PackageDescription -> PackageDescription +-fudgePackageDesc lbi p = p +- { library = +- (\lib -> lib { libBuildInfo = fudgeBuildInfo CLibName $ libBuildInfo lib }) +- <$> library p +- , executables = +- (\exe -> exe { buildInfo = fudgeBuildInfo (CExeName $ exeName exe) +- $ buildInfo exe }) +- <$> executables p +- , testSuites = +- (\test -> test { testBuildInfo = fudgeBuildInfo (CTestName $ testName test) +- $ testBuildInfo test }) +- <$> testSuites p +- , benchmarks = +- (\bench -> bench { benchmarkBuildInfo = +- fudgeBuildInfo (CBenchName $ benchmarkName bench) +- $ benchmarkBuildInfo bench }) +- <$> benchmarks p +- } +- where +- comps = allComponents lbi +- fudgeBuildInfo n bi +- | Just compLBI <- Map.lookup n comps +- = bi { hsSourceDirs = autogenComponentModulesDir lbi compLBI +- : hsSourceDirs bi } +- | otherwise = bi -- Could happen if a component isn't active; try +- -- anyway and see whether Cabal complains later on. +-#endif +- + -- | Returns whether the @root@ is a parent folder of @f@. + isSubdirectoryOf :: FilePath -> FilePath -> Bool + isSubdirectoryOf root f +@@ -423,15 +378,18 @@ collectActiveModules + collectActiveModules l = map (\(n, c) -> (c, f n)) $ Map.toList $ allComponents l + where + p = localPkgDescr l +- f CLibName = maybeToList (library p) >>= ++#if MIN_VERSION_Cabal(3,0,0) ++ f (CLibName LMainLibName) ++#else ++ f CLibName ++#endif ++ = maybeToList (library p) >>= + \lib -> exposedModules lib + ++ otherModules (libBuildInfo lib) + f (CExeName n) = otherModules . buildInfo $ exes Map.! n + f (CTestName n) = otherModules . testBuildInfo $ tests Map.! n + f (CBenchName n) = otherModules . benchmarkBuildInfo $ benchs Map.! n +-#if MIN_VERSION_Cabal(2,0,0) + f _ = [] -- TODO: other lib kinds; for now just suppress the warning +-#endif + exes = Map.fromList [(exeName e, e) | e <- executables p] + tests = Map.fromList [(testName e, e) | e <- testSuites p] + benchs = Map.fromList [(benchmarkName e, e) | e <- benchmarks p] +@@ -441,22 +399,14 @@ collectActiveModules l = map (\(n, c) -> (c, f n)) $ Map.toList $ allComponents + + -- | List all the packages that this one depends on. + collectDeps :: LocalBuildInfo -> [InstalledPackageInfo.InstalledPackageInfo] +-#if MIN_VERSION_Cabal(2,0,0) + collectDeps l = do + c <- allComponentsInBuildOrder l + (i,_) <- componentPackageDeps c + Just p <- [PackageIndex.lookupUnitId (installedPkgs l) i] + return p +-#else +-collectDeps l = do +- (_, c ,_) <- componentsConfigs l +- (_, i) <- componentPackageDeps c +- PackageIndex.lookupSourcePackageId (installedPkgs l) i +-#endif + + -- | All the components that will be built by this Cabal command. + allComponents :: LocalBuildInfo -> Map.Map ComponentName ComponentLocalBuildInfo +-#if MIN_VERSION_Cabal(2,0,0) + allComponents l = fmap requireOne $ componentNameMap l + where + -- TODO: this doesn't support Backpack, which can have more than one +@@ -464,16 +414,3 @@ allComponents l = fmap requireOne $ componentNameMap l + requireOne [x] = x + requireOne xs = error $ "Data.ProtoLens.Setup.allComponents: expected one " + ++ "component per name, got " ++ show xs +- +-#else +-allComponents l = Map.fromList [(c, b) | (c, b, _) <- componentsConfigs l] +-#endif +- +--- | Get the component-level "autogen" directory where we're putting the +--- generated .hs files. (For Cabal-1.0, use the shared 'BuildPaths.autogenModulesDir'.) +-autogenComponentModulesDir :: LocalBuildInfo -> ComponentLocalBuildInfo -> FilePath +-#if MIN_VERSION_Cabal(2,0,0) +-autogenComponentModulesDir = BuildPaths.autogenComponentModulesDir +-#else +-autogenComponentModulesDir lbi _ = BuildPaths.autogenModulesDir lbi +-#endif -- cgit v1.2.3 From abc4f961b4fc36715c73a984b3948657952c16dd Mon Sep 17 00:00:00 2001 From: Guillaume Bouchard Date: Fri, 17 Apr 2020 17:17:06 +0200 Subject: haskellPackages.ghcWithPackages: fix for GHC 8.10 This closes #79441. ghcWithPackages is using `ghc-pkg recache` to build its package database. By doing so, it overrides the `package.cache[.lock]` files. Details are unclear, but GHC 8.10 changed a bit the behavior. Previously, it was unconditionally replacing the files by new ones. Now it tries to open (for modification) the files. These files are symlinks to another nix derivation, which is hence read-only. This commit removes the files before running `ghc-pkg recache`, hence it will just write the new files. Tested with `haskellPackages.ghcWithPackages` (i.e. GHC 8.8) and `haskell.packages.ghc8101.ghcWithPackages` (i.e GHC 8.10) with the following nix file, at the root of the nixpkgs repository: ``` with import ./. { overlays = [ ( self: super: { haskellPackages = super.haskell.packages.ghc8101.override { overrides = selfh: superh: { th-lift-instances = super.haskell.lib.doJailbreak superh.th-lift-instances; th-expand-syns = super.haskell.lib.doJailbreak superh.th-expand-syns; th-reify-many = super.haskell.lib.doJailbreak superh.th-reify-many; th-orphans = super.haskell.lib.doJailbreak superh.th-orphans; haskell-src-meta = super.haskell.lib.doJailbreak superh.haskell-src-meta; }; }; } ) ]; }; haskellPackages.ghcWithPackages(p:[p.PyF]) ``` This will test with GHC 8.10. Comment out the `overlays` to test with GHC 8.8. --- pkgs/development/haskell-modules/with-packages-wrapper.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix index 49beed8549d..08119018874 100644 --- a/pkgs/development/haskell-modules/with-packages-wrapper.nix +++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix @@ -127,7 +127,18 @@ symlinkJoin { rm $f-tmp done '') + '' - ${lib.optionalString hasLibraries "$out/bin/${ghcCommand}-pkg recache"} + ${lib.optionalString hasLibraries '' + # GHC 8.10 changes. + # Instead of replacing package.cache[.lock] with the new file, + # ghc-pkg is now trying to open the file. These file are symlink + # to another nix derivation, so they are not writable. Removing + # them allow the correct behavior of ghc-pkg recache + # See: https://github.com/NixOS/nixpkgs/issues/79441 + rm $out/lib/${ghc.name}/package.conf.d/package.cache.lock + rm $out/lib/${ghc.name}/package.conf.d/package.cache + + $out/bin/${ghcCommand}-pkg recache + ''} ${# ghcjs will read the ghc_libdir file when resolving plugins. lib.optionalString (isGhcjs && ghcLibdir != null) '' mkdir -p "${libDir}" -- cgit v1.2.3 From d6aedf7bcd2713f538096d124879861d54705243 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 17 Apr 2020 20:41:50 +0200 Subject: haskell-ghc-lib-parser-ex: fix build with GHC versions prior to 8.8.x --- pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix | 3 +++ pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 3 +++ pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 3 +++ 3 files changed, 9 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix index a607bc0b53b..f1260735479 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.2.x.nix @@ -91,4 +91,7 @@ self: super: { ListLike = addBuildDepend super.ListLike self.semigroups; base-compat-batteries = addBuildDepend super.base-compat-batteries self.contravariant; + # ghc versions prior to 8.8.x needs additional dependency to compile successfully. + ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex self.ghc-lib-parser; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 72c06d6d8ab..d5ae77e8246 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -86,4 +86,7 @@ self: super: { # The old Haddock cannot process the newer documentation syntax. fast-logger = dontHaddock super.fast-logger; + # ghc versions prior to 8.8.x needs additional dependency to compile successfully. + ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex self.ghc-lib-parser; + } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index ff69c809288..d2eb43c7ca5 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -88,4 +88,7 @@ self: super: { stylish-cabal = doDistribute (markUnbroken (super.stylish-cabal.override { haddock-library = self.haddock-library_1_7_0; })); haddock-library_1_7_0 = dontCheck super.haddock-library_1_7_0; + # ghc versions prior to 8.8.x needs additional dependency to compile successfully. + ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex self.ghc-lib-parser; + } -- cgit v1.2.3 From 783af05bbb8bb8b940d79ede0e6cd5c729a88880 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 17 Apr 2020 20:56:38 +0200 Subject: all-cabal-hashes: update to Hackage at 2020-04-17T17:47:53Z --- pkgs/data/misc/hackage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 960d1aef121..ca54d972ea1 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/90b24a91103dca4f0df6cb28cecb205a7d7ab650.tar.gz"; - sha256 = "1zfj8c6s9icqg83ycfvd150s4jd07ccbjg2w2mn10rx5ng76mn53"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/3e87a900a11faa97a8a068874c932f3172d0aa76.tar.gz"; + sha256 = "0cf35vics1211pr1g8a804zm3w4lsdacqkgw3hqk7wdrrbasb8ip"; } -- cgit v1.2.3 From 4fdc45554381748e364d891bc6bca6217be6d152 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Fri, 17 Apr 2020 12:00:48 -0700 Subject: mesa-demos: init at 8.4.0 (#74310) * mesa-demos: init at 8.4.0 Signed-off-by: Anders Kaseorg * Update pkgs/tools/graphics/mesa-demos/default.nix Co-Authored-By: Doron Behar --- pkgs/tools/graphics/mesa-demos/default.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/tools/graphics/mesa-demos/default.nix diff --git a/pkgs/tools/graphics/mesa-demos/default.nix b/pkgs/tools/graphics/mesa-demos/default.nix new file mode 100644 index 00000000000..12e751e0f08 --- /dev/null +++ b/pkgs/tools/graphics/mesa-demos/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchurl, freeglut, glew, libGL, libGLU, libX11, libXext, mesa, pkg-config, wayland }: + +stdenv.mkDerivation rec { + pname = "mesa-demos"; + version = "8.4.0"; + + src = fetchurl { + url = "ftp://ftp.freedesktop.org/pub/mesa/demos/${pname}-${version}.tar.bz2"; + sha256 = "0zgzbz55a14hz83gbmm0n9gpjnf5zadzi2kjjvkn6khql2a9rs81"; + }; + + buildInputs = [ freeglut glew libX11 libXext libGL libGLU mesa mesa.osmesa wayland ]; + nativeBuildInputs = [ pkg-config ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Collection of demos and test programs for OpenGL and Mesa"; + homepage = "https://www.mesa3d.org/"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ andersk ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3cb27cf590e..6907e5fb7d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4666,6 +4666,8 @@ in memtester = callPackage ../tools/system/memtester { }; + mesa-demos = callPackage ../tools/graphics/mesa-demos { }; + mhonarc = perlPackages.MHonArc; minergate = callPackage ../applications/misc/minergate { }; -- cgit v1.2.3 From c0a498b5d59f68f22677edf405247c883e5723d3 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Thu, 26 Sep 2019 15:57:08 +0900 Subject: pythonPackages.pdfrw: init at 0.4.0 --- pkgs/development/python-modules/pdfrw/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/pdfrw/default.nix diff --git a/pkgs/development/python-modules/pdfrw/default.nix b/pkgs/development/python-modules/pdfrw/default.nix new file mode 100644 index 00000000000..15b8a8dc8d6 --- /dev/null +++ b/pkgs/development/python-modules/pdfrw/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "pdfrw"; + version = "0.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1x1yp63lg3jxpg9igw8lh5rc51q353ifsa1bailb4qb51r54kh0d"; + }; + + # tests require the extra download of github.com/pmaupin/static_pdfs + doCheck = false; + + meta = with stdenv.lib; { + description = "pdfrw is a pure Python library that reads and writes PDFs."; + homepage = "https://github.com/pmaupin/pdfrw"; + maintainers = with maintainers; [ teto ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1d9a2c88b15..6f05a46a99c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4896,6 +4896,8 @@ in { pdfkit = callPackage ../development/python-modules/pdfkit { }; + pdfrw = callPackage ../development/python-modules/pdfrw { }; + periodictable = callPackage ../development/python-modules/periodictable { }; pgcli = callPackage ../development/tools/database/pgcli {}; -- cgit v1.2.3 From c881dd5e68731d3adb32e72614fa65082f59c743 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Thu, 26 Sep 2019 15:56:32 +0900 Subject: pythonPackages.pagelabels: init at 1.2.0 Used in termpdf I want to package. --- .../python-modules/pagelabels/default.nix | 23 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/pagelabels/default.nix diff --git a/pkgs/development/python-modules/pagelabels/default.nix b/pkgs/development/python-modules/pagelabels/default.nix new file mode 100644 index 00000000000..d7adc9b17c0 --- /dev/null +++ b/pkgs/development/python-modules/pagelabels/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchPypi, pdfrw }: + +buildPythonPackage rec { + pname = "pagelabels"; + version = "1.2.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "07as5kzyvj66bfgvx8bph8gkyj6cgm4lhgxwb78bpdl4m8y8kpma"; + }; + + buildInputs = [ pdfrw ]; + + # upstream doesn't contain tests + doCheck = false; + + meta = with stdenv.lib; { + description = "Python library to manipulate PDF page labels."; + homepage = "https://github.com/lovasoa/pagelabels-py"; + maintainers = with maintainers; [ teto ]; + license = licenses.gpl3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6f05a46a99c..81e75d808ff 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4825,6 +4825,8 @@ in { paho-mqtt = callPackage ../development/python-modules/paho-mqtt { }; + pagelabels = callPackage ../development/python-modules/pagelabels { }; + pamqp = callPackage ../development/python-modules/pamqp { }; parsedatetime = callPackage ../development/python-modules/parsedatetime { }; -- cgit v1.2.3 From 839263d558903046bf4c030982359cd4f6f3776e Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Mon, 30 Sep 2019 12:22:25 +0900 Subject: termpdf.py: init at 2019-09-30 This is a pdf reader for the terminal kitty. --- pkgs/applications/misc/termpdf.py/default.nix | 51 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 53 insertions(+) create mode 100644 pkgs/applications/misc/termpdf.py/default.nix diff --git a/pkgs/applications/misc/termpdf.py/default.nix b/pkgs/applications/misc/termpdf.py/default.nix new file mode 100644 index 00000000000..83eef6f24e4 --- /dev/null +++ b/pkgs/applications/misc/termpdf.py/default.nix @@ -0,0 +1,51 @@ +{ stdenv +, buildPythonApplication +, fetchFromGitHub +, fetchPypi +, bibtool +, pybtex +, pymupdf +, pynvim +, pyperclip +, roman +, pdfrw +, pagelabels +, setuptools +}: + +buildPythonApplication { + pname = "termpdf.py"; + version = "2019-10-03"; + + src = fetchFromGitHub { + owner = "dsanson"; + repo = "termpdf.py"; + rev = "4f3bdf4b5a00801631f2498f2c38c81e0a588ae2"; + sha256 = "05gbj2fqzqndq1mx6g9asa7i6z8a9jdjrvilfwx8lg23cs356m6m"; + }; + + propagatedBuildInputs = [ + bibtool + pybtex + pymupdf + pyperclip + roman + pagelabels + pdfrw + pynvim + setuptools + ]; + + # upstream doesn't contain tests + doCheck = false; + + meta = with stdenv.lib; { + description = '' + A graphical pdf (and epub, cbz, ...) reader that works + inside the kitty terminal. + ''; + homepage = https://github.com/dsanson/termpdf.py; + maintainers = with maintainers; [ teto ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6907e5fb7d3..0fd80170bbe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25873,6 +25873,8 @@ in prow = callPackage ../applications/networking/cluster/prow { }; + termpdfpy = python3Packages.callPackage ../applications/misc/termpdf.py {}; + inherit (callPackage ../applications/networking/cluster/terraform { # terraform 0.12 crashes with go1.14 on darwin https://github.com/hashicorp/terraform/issues/24287 buildGoPackage = if stdenv.isDarwin then buildGo113Package else buildGoPackage; -- cgit v1.2.3 From 2f33062f5375299fecfc06d3849811b2e0b45d0e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 16 Apr 2020 04:20:00 -0500 Subject: flow: 0.122.0 -> 0.123.0 Changelog: https://github.com/facebook/flow/releases/tag/v0.123.0 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 014c7dea11b..29ea3993b1c 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.122.0"; + version = "0.123.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "0a1pcrp0r7l0c8cyrg1qc1qz5dnj0mzd60v9nixgm419a7rrmp93"; + sha256 = "0dsp8q3v9smjli2bkldkhzh2z032zjmqbzzchb5j18r4vz4hif16"; }; installPhase = '' -- cgit v1.2.3 From 135ae45d24e4dfe177c8511ce76815e21c6108cd Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 17 Apr 2020 22:01:55 +0200 Subject: grocy: 2.7.0 -> 2.7.1 https://github.com/grocy/grocy/releases/tag/v2.7.1 --- pkgs/servers/grocy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/grocy/default.nix b/pkgs/servers/grocy/default.nix index 95b51f34c0d..193f3929809 100644 --- a/pkgs/servers/grocy/default.nix +++ b/pkgs/servers/grocy/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "grocy"; - version = "2.7.0"; + version = "2.7.1"; src = fetchurl { url = "https://github.com/grocy/grocy/releases/download/v${version}/grocy_${version}.zip"; - sha256 = "10da7s8yc3adqzd8446ksgq61zyzxb4qbnwkzj11qh64y5hyj50q"; + sha256 = "0ab1yxj499vadakq2c1lils3ir6fm02wrdgrirrlar4s4z6c4p7r"; }; nativeBuildInputs = [ unzip ]; -- cgit v1.2.3 From 8e88b8dce2826d4b3a55c9ac182574a69caf26a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Thu, 16 Apr 2020 12:32:47 +0200 Subject: nixos/acme: Fix postRun in acme certificate being ran at every run --- nixos/modules/security/acme.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 4af373ef7df..94739bf670b 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -349,7 +349,9 @@ in # Test that existing cert is older than new cert KEY=${spath}/certificates/${keyName}.key + KEY_CHANGED=no if [ -e $KEY -a $KEY -nt key.pem ]; then + KEY_CHANGED=yes cp -p ${spath}/certificates/${keyName}.key key.pem cp -p ${spath}/certificates/${keyName}.crt fullchain.pem cp -p ${spath}/certificates/${keyName}.issuer.crt chain.pem @@ -360,7 +362,10 @@ in chmod ${fileMode} *.pem chown '${data.user}:${data.group}' *.pem - ${data.postRun} + if [ "$KEY_CHANGED" = "yes" ]; then + : # noop in case postRun is empty + ${data.postRun} + fi ''; in "+${script}"; -- cgit v1.2.3 From 10100a97c8964e82b30f180fda41ade8e6f69e41 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 17 Apr 2020 22:50:00 +0200 Subject: ghc-8.10.x: add plenty of overrides to fix builds --- .../haskell-modules/configuration-ghc-8.10.x.nix | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index f9e9e189a9a..74ca5c9342f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -60,5 +60,38 @@ self: super: { zlib = doJailbreak super.zlib; # Use the latest version to fix the build. + microlens-th = self.microlens-th_0_4_3_5; + optics-core = self.optics-core_0_3; + repline = self.repline_0_3_0_0; + ghc-lib-parser-ex = self.ghc-lib-parser-ex_8_10_0_4; + th-desugar = self.th-desugar_1_11; + + # `ghc-lib-parser-ex` (see conditionals in its `.cabal` file) does not need + # the `ghc-lib-parser` dependency on GHC >= 8.8. However, because we have + # multiple verions of `ghc-lib-parser(-ex)` available, and the default ones + # are older ones, those older ones will complain. Because we have a newer + # GHC, we can just set the dependency to `null` as it is not used. + ghc-lib-parser-ex_8_10_0_4 = super.ghc-lib-parser-ex_8_10_0_4.override { ghc-lib-parser = null; }; + + # Jailbreak to fix the build. + aeson-diff = doJailbreak super.aeson-diff; + cborg = doJailbreak super.cborg; + cborg-json = doJailbreak super.cborg-json; + exact-pi = doJailbreak super.exact-pi; + relude = dontCheck (doJailbreak super.relude); + serialise = doJailbreak super.serialise; + setlocale = doJailbreak super.setlocale; + shellmet = doJailbreak super.shellmet; + brick = doJailbreak super.brick; + + # The shipped Setup.hs file is broken. + csv = overrideCabal super.csv (drv: { preCompileBuildDriver = "rm Setup.hs"; }); + + # Apply patch from https://github.com/finnsson/template-helper/issues/12#issuecomment-611795375 to fix the build. + language-haskell-extract = appendPatch (doJailbreak super.language-haskell-extract) (pkgs.fetchpatch { + name = "language-haskell-extract-0.2.4.patch"; + url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/e48738ee1be774507887a90a0d67ad1319456afc/patches/language-haskell-extract-0.2.4.patch?inline=false"; + sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f"; + }); } -- cgit v1.2.3 From 4328c3271341b7f19a5046cfbe4758fc7ce31fe6 Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Fri, 17 Apr 2020 13:59:06 -0700 Subject: k3d: Fix build: Use the same GCC version for boost dependency --- pkgs/top-level/all-packages.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7b711d5277..7be441c48fc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20136,7 +20136,13 @@ in k3d = callPackage ../applications/graphics/k3d { inherit (pkgs.gnome2) gtkglext; stdenv = gcc6Stdenv; - boost = boost155.override { enablePython = true; }; + boost = boost155.override { + enablePython = true; + stdenv = gcc6Stdenv; + buildPackages = buildPackages // { + stdenv = gcc6Stdenv; + }; + }; }; k3s = callPackage ../applications/networking/cluster/k3s {}; -- cgit v1.2.3 From 04afb68ad7e15926faa4f2d0f6851f1df75023ea Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 17 Apr 2020 22:09:47 +0100 Subject: systemfd: init at 0.3.0 --- pkgs/development/tools/systemfd/Cargo.nix | 215 +++ pkgs/development/tools/systemfd/crates-io.list | 62 + pkgs/development/tools/systemfd/crates-io.nix | 1890 ++++++++++++++++++++++++ pkgs/development/tools/systemfd/default.nix | 18 + pkgs/top-level/all-packages.nix | 2 + 5 files changed, 2187 insertions(+) create mode 100644 pkgs/development/tools/systemfd/Cargo.nix create mode 100644 pkgs/development/tools/systemfd/crates-io.list create mode 100644 pkgs/development/tools/systemfd/crates-io.nix create mode 100644 pkgs/development/tools/systemfd/default.nix diff --git a/pkgs/development/tools/systemfd/Cargo.nix b/pkgs/development/tools/systemfd/Cargo.nix new file mode 100644 index 00000000000..b6687f1e929 --- /dev/null +++ b/pkgs/development/tools/systemfd/Cargo.nix @@ -0,0 +1,215 @@ +# Generated by carnix 0.10.0: carnix generate-nix +{ lib, buildPlatform, buildRustCrate, buildRustCrateHelpers, cratesIO, fetchgit }: +with buildRustCrateHelpers; +let inherit (lib.lists) fold; + inherit (lib.attrsets) recursiveUpdate; +in +rec { + crates = cratesIO; + systemfd = crates.crates.systemfd."0.3.0" deps; + __all = [ (systemfd {}) ]; + deps.aho_corasick."0.6.4" = { + memchr = "2.0.1"; + }; + deps.ansi_term."0.11.0" = { + winapi = "0.3.4"; + }; + deps.atty."0.2.10" = { + termion = "1.5.1"; + libc = "0.2.40"; + winapi = "0.3.4"; + }; + deps.backtrace."0.3.7" = { + cfg_if = "0.1.3"; + rustc_demangle = "0.1.8"; + backtrace_sys = "0.1.16"; + libc = "0.2.40"; + winapi = "0.3.4"; + }; + deps.backtrace_sys."0.1.16" = { + libc = "0.2.40"; + cc = "1.0.15"; + }; + deps.bitflags."1.0.3" = {}; + deps.byteorder."1.2.3" = {}; + deps.bytes."0.4.7" = { + byteorder = "1.2.3"; + iovec = "0.1.2"; + }; + deps.cc."1.0.15" = {}; + deps.cfg_if."0.1.3" = {}; + deps.clap."2.31.2" = { + atty = "0.2.10"; + bitflags = "1.0.3"; + strsim = "0.7.0"; + textwrap = "0.9.0"; + unicode_width = "0.1.4"; + vec_map = "0.8.1"; + ansi_term = "0.11.0"; + }; + deps.clicolors_control."0.2.0" = { + lazy_static = "0.2.11"; + libc = "0.2.40"; + kernel32_sys = "0.2.2"; + winapi = "0.3.4"; + }; + deps.console."0.6.1" = { + clicolors_control = "0.2.0"; + lazy_static = "0.2.11"; + libc = "0.2.40"; + parking_lot = "0.5.5"; + regex = "0.2.11"; + unicode_width = "0.1.4"; + termios = "0.2.2"; + winapi = "0.3.4"; + }; + deps.failure."0.1.1" = { + backtrace = "0.3.7"; + failure_derive = "0.1.1"; + }; + deps.failure_derive."0.1.1" = { + quote = "0.3.15"; + syn = "0.11.11"; + synstructure = "0.6.1"; + }; + deps.fuchsia_zircon."0.3.3" = { + bitflags = "1.0.3"; + fuchsia_zircon_sys = "0.3.3"; + }; + deps.fuchsia_zircon_sys."0.3.3" = {}; + deps.gcc."0.3.54" = {}; + deps.iovec."0.1.2" = { + libc = "0.2.40"; + winapi = "0.2.8"; + }; + deps.kernel32_sys."0.2.2" = { + winapi = "0.2.8"; + winapi_build = "0.1.1"; + }; + deps.lazy_static."0.2.11" = {}; + deps.lazy_static."1.0.0" = {}; + deps.libc."0.2.40" = {}; + deps.memchr."2.0.1" = { + libc = "0.2.40"; + }; + deps.nix."0.10.0" = { + bitflags = "1.0.3"; + bytes = "0.4.7"; + cfg_if = "0.1.3"; + libc = "0.2.40"; + void = "1.0.2"; + }; + deps.owning_ref."0.3.3" = { + stable_deref_trait = "1.0.0"; + }; + deps.parking_lot."0.5.5" = { + owning_ref = "0.3.3"; + parking_lot_core = "0.2.14"; + }; + deps.parking_lot_core."0.2.14" = { + rand = "0.4.2"; + smallvec = "0.6.1"; + libc = "0.2.40"; + winapi = "0.3.4"; + }; + deps.quote."0.3.15" = {}; + deps.rand."0.4.2" = { + fuchsia_zircon = "0.3.3"; + libc = "0.2.40"; + winapi = "0.3.4"; + }; + deps.redox_syscall."0.1.37" = {}; + deps.redox_termios."0.1.1" = { + redox_syscall = "0.1.37"; + }; + deps.regex."0.2.11" = { + aho_corasick = "0.6.4"; + memchr = "2.0.1"; + regex_syntax = "0.5.6"; + thread_local = "0.3.5"; + utf8_ranges = "1.0.0"; + }; + deps.regex."1.0.0" = { + aho_corasick = "0.6.4"; + memchr = "2.0.1"; + regex_syntax = "0.6.0"; + thread_local = "0.3.5"; + utf8_ranges = "1.0.0"; + }; + deps.regex_syntax."0.5.6" = { + ucd_util = "0.1.1"; + }; + deps.regex_syntax."0.6.0" = { + ucd_util = "0.1.1"; + }; + deps.rustc_demangle."0.1.8" = {}; + deps.smallvec."0.6.1" = {}; + deps.socket2."0.3.5" = { + cfg_if = "0.1.3"; + libc = "0.2.40"; + winapi = "0.3.4"; + }; + deps.stable_deref_trait."1.0.0" = {}; + deps.strsim."0.7.0" = {}; + deps.syn."0.11.11" = { + quote = "0.3.15"; + synom = "0.11.3"; + unicode_xid = "0.0.4"; + }; + deps.synom."0.11.3" = { + unicode_xid = "0.0.4"; + }; + deps.synstructure."0.6.1" = { + quote = "0.3.15"; + syn = "0.11.11"; + }; + deps.systemfd."0.3.0" = { + clap = "2.31.2"; + console = "0.6.1"; + failure = "0.1.1"; + failure_derive = "0.1.1"; + lazy_static = "1.0.0"; + libc = "0.2.40"; + regex = "1.0.0"; + nix = "0.10.0"; + socket2 = "0.3.5"; + uuid = "0.6.3"; + winapi = "0.3.4"; + }; + deps.termion."1.5.1" = { + libc = "0.2.40"; + redox_syscall = "0.1.37"; + redox_termios = "0.1.1"; + }; + deps.termios."0.2.2" = { + libc = "0.2.40"; + }; + deps.textwrap."0.9.0" = { + unicode_width = "0.1.4"; + }; + deps.thread_local."0.3.5" = { + lazy_static = "1.0.0"; + unreachable = "1.0.0"; + }; + deps.ucd_util."0.1.1" = {}; + deps.unicode_width."0.1.4" = {}; + deps.unicode_xid."0.0.4" = {}; + deps.unreachable."1.0.0" = { + void = "1.0.2"; + }; + deps.utf8_ranges."1.0.0" = {}; + deps.uuid."0.6.3" = { + cfg_if = "0.1.3"; + rand = "0.4.2"; + }; + deps.vec_map."0.8.1" = {}; + deps.void."1.0.2" = {}; + deps.winapi."0.2.8" = {}; + deps.winapi."0.3.4" = { + winapi_i686_pc_windows_gnu = "0.4.0"; + winapi_x86_64_pc_windows_gnu = "0.4.0"; + }; + deps.winapi_build."0.1.1" = {}; + deps.winapi_i686_pc_windows_gnu."0.4.0" = {}; + deps.winapi_x86_64_pc_windows_gnu."0.4.0" = {}; +} diff --git a/pkgs/development/tools/systemfd/crates-io.list b/pkgs/development/tools/systemfd/crates-io.list new file mode 100644 index 00000000000..0b8371f68a1 --- /dev/null +++ b/pkgs/development/tools/systemfd/crates-io.list @@ -0,0 +1,62 @@ +aho-corasick-0.6.4 +ansi_term-0.11.0 +atty-0.2.10 +backtrace-0.3.7 +backtrace-sys-0.1.16 +bitflags-1.0.3 +byteorder-1.2.3 +bytes-0.4.7 +cc-1.0.15 +cfg-if-0.1.3 +clap-2.31.2 +clicolors-control-0.2.0 +console-0.6.1 +failure-0.1.1 +failure_derive-0.1.1 +fuchsia-zircon-0.3.3 +fuchsia-zircon-sys-0.3.3 +gcc-0.3.54 +iovec-0.1.2 +kernel32-sys-0.2.2 +lazy_static-0.2.11 +lazy_static-1.0.0 +libc-0.2.40 +memchr-2.0.1 +nix-0.10.0 +owning_ref-0.3.3 +parking_lot-0.5.5 +parking_lot_core-0.2.14 +quote-0.3.15 +rand-0.4.2 +redox_syscall-0.1.37 +redox_termios-0.1.1 +regex-0.2.11 +regex-1.0.0 +regex-syntax-0.5.6 +regex-syntax-0.6.0 +rustc-demangle-0.1.8 +smallvec-0.6.1 +socket2-0.3.5 +stable_deref_trait-1.0.0 +strsim-0.7.0 +syn-0.11.11 +synom-0.11.3 +synstructure-0.6.1 +systemfd-0.3.0 +termion-1.5.1 +termios-0.2.2 +textwrap-0.9.0 +thread_local-0.3.5 +ucd-util-0.1.1 +unicode-width-0.1.4 +unicode-xid-0.0.4 +unreachable-1.0.0 +utf8-ranges-1.0.0 +uuid-0.6.3 +vec_map-0.8.1 +void-1.0.2 +winapi-0.2.8 +winapi-0.3.4 +winapi-build-0.1.1 +winapi-i686-pc-windows-gnu-0.4.0 +winapi-x86_64-pc-windows-gnu-0.4.0 diff --git a/pkgs/development/tools/systemfd/crates-io.nix b/pkgs/development/tools/systemfd/crates-io.nix new file mode 100644 index 00000000000..7e7b737b8c8 --- /dev/null +++ b/pkgs/development/tools/systemfd/crates-io.nix @@ -0,0 +1,1890 @@ +{ lib, buildRustCrate, buildRustCrateHelpers }: +with buildRustCrateHelpers; +let inherit (lib.lists) fold; + inherit (lib.attrsets) recursiveUpdate; +in +rec { + +# aho-corasick-0.6.4 + + crates.aho_corasick."0.6.4" = deps: { features?(features_.aho_corasick."0.6.4" deps {}) }: buildRustCrate { + crateName = "aho-corasick"; + version = "0.6.4"; + description = "Fast multiple substring searching with finite state machines."; + authors = [ "Andrew Gallant " ]; + sha256 = "189v919mp6rzzgjp1khpn4zlq8ls81gh43x1lmc8kbkagdlpq888"; + libName = "aho_corasick"; + crateBin = + [{ name = "aho-corasick-dot"; }]; + dependencies = mapFeatures features ([ + (crates."memchr"."${deps."aho_corasick"."0.6.4"."memchr"}" deps) + ]); + }; + features_.aho_corasick."0.6.4" = deps: f: updateFeatures f (rec { + aho_corasick."0.6.4".default = (f.aho_corasick."0.6.4".default or true); + memchr."${deps.aho_corasick."0.6.4".memchr}".default = true; + }) [ + (features_.memchr."${deps."aho_corasick"."0.6.4"."memchr"}" deps) + ]; + + +# end +# ansi_term-0.11.0 + + crates.ansi_term."0.11.0" = deps: { features?(features_.ansi_term."0.11.0" deps {}) }: buildRustCrate { + crateName = "ansi_term"; + version = "0.11.0"; + description = "Library for ANSI terminal colours and styles (bold, underline)"; + authors = [ "ogham@bsago.me" "Ryan Scheel (Havvy) " "Josh Triplett " ]; + sha256 = "08fk0p2xvkqpmz3zlrwnf6l8sj2vngw464rvzspzp31sbgxbwm4v"; + dependencies = (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."ansi_term"."0.11.0"."winapi"}" deps) + ]) else []); + }; + features_.ansi_term."0.11.0" = deps: f: updateFeatures f (rec { + ansi_term."0.11.0".default = (f.ansi_term."0.11.0".default or true); + winapi = fold recursiveUpdate {} [ + { "${deps.ansi_term."0.11.0".winapi}"."consoleapi" = true; } + { "${deps.ansi_term."0.11.0".winapi}"."errhandlingapi" = true; } + { "${deps.ansi_term."0.11.0".winapi}"."processenv" = true; } + { "${deps.ansi_term."0.11.0".winapi}".default = true; } + ]; + }) [ + (features_.winapi."${deps."ansi_term"."0.11.0"."winapi"}" deps) + ]; + + +# end +# atty-0.2.10 + + crates.atty."0.2.10" = deps: { features?(features_.atty."0.2.10" deps {}) }: buildRustCrate { + crateName = "atty"; + version = "0.2.10"; + description = "A simple interface for querying atty"; + authors = [ "softprops " ]; + sha256 = "1h26lssj8rwaz0xhwwm5a645r49yly211amfmd243m3m0jl49i2c"; + dependencies = (if kernel == "redox" then mapFeatures features ([ + (crates."termion"."${deps."atty"."0.2.10"."termion"}" deps) + ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + (crates."libc"."${deps."atty"."0.2.10"."libc"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."atty"."0.2.10"."winapi"}" deps) + ]) else []); + }; + features_.atty."0.2.10" = deps: f: updateFeatures f (rec { + atty."0.2.10".default = (f.atty."0.2.10".default or true); + libc."${deps.atty."0.2.10".libc}".default = (f.libc."${deps.atty."0.2.10".libc}".default or false); + termion."${deps.atty."0.2.10".termion}".default = true; + winapi = fold recursiveUpdate {} [ + { "${deps.atty."0.2.10".winapi}"."consoleapi" = true; } + { "${deps.atty."0.2.10".winapi}"."minwinbase" = true; } + { "${deps.atty."0.2.10".winapi}"."minwindef" = true; } + { "${deps.atty."0.2.10".winapi}"."processenv" = true; } + { "${deps.atty."0.2.10".winapi}"."winbase" = true; } + { "${deps.atty."0.2.10".winapi}".default = true; } + ]; + }) [ + (features_.termion."${deps."atty"."0.2.10"."termion"}" deps) + (features_.libc."${deps."atty"."0.2.10"."libc"}" deps) + (features_.winapi."${deps."atty"."0.2.10"."winapi"}" deps) + ]; + + +# end +# backtrace-0.3.7 + + crates.backtrace."0.3.7" = deps: { features?(features_.backtrace."0.3.7" deps {}) }: buildRustCrate { + crateName = "backtrace"; + version = "0.3.7"; + description = "A library to acquire a stack trace (backtrace) at runtime in a Rust program.\n"; + authors = [ "Alex Crichton " "The Rust Project Developers" ]; + sha256 = "00zzcgacv516dlhxkrdw4c8vsx3bwkkdrrzi5pnxrhpd87ambjwn"; + dependencies = mapFeatures features ([ + (crates."cfg_if"."${deps."backtrace"."0.3.7"."cfg_if"}" deps) + (crates."rustc_demangle"."${deps."backtrace"."0.3.7"."rustc_demangle"}" deps) + ]) + ++ (if (kernel == "linux" || kernel == "darwin") && !(kernel == "fuchsia") && !(kernel == "emscripten") && !(kernel == "darwin") && !(kernel == "ios") then mapFeatures features ([ + ] + ++ (if features.backtrace."0.3.7".backtrace-sys or false then [ (crates.backtrace_sys."${deps."backtrace"."0.3.7".backtrace_sys}" deps) ] else [])) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + (crates."libc"."${deps."backtrace"."0.3.7"."libc"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + ] + ++ (if features.backtrace."0.3.7".winapi or false then [ (crates.winapi."${deps."backtrace"."0.3.7".winapi}" deps) ] else [])) else []); + features = mkFeatures (features."backtrace"."0.3.7" or {}); + }; + features_.backtrace."0.3.7" = deps: f: updateFeatures f (rec { + backtrace = fold recursiveUpdate {} [ + { "0.3.7"."addr2line" = + (f.backtrace."0.3.7"."addr2line" or false) || + (f.backtrace."0.3.7".gimli-symbolize or false) || + (backtrace."0.3.7"."gimli-symbolize" or false); } + { "0.3.7"."backtrace-sys" = + (f.backtrace."0.3.7"."backtrace-sys" or false) || + (f.backtrace."0.3.7".libbacktrace or false) || + (backtrace."0.3.7"."libbacktrace" or false); } + { "0.3.7"."coresymbolication" = + (f.backtrace."0.3.7"."coresymbolication" or false) || + (f.backtrace."0.3.7".default or false) || + (backtrace."0.3.7"."default" or false); } + { "0.3.7"."dbghelp" = + (f.backtrace."0.3.7"."dbghelp" or false) || + (f.backtrace."0.3.7".default or false) || + (backtrace."0.3.7"."default" or false); } + { "0.3.7"."dladdr" = + (f.backtrace."0.3.7"."dladdr" or false) || + (f.backtrace."0.3.7".default or false) || + (backtrace."0.3.7"."default" or false); } + { "0.3.7"."findshlibs" = + (f.backtrace."0.3.7"."findshlibs" or false) || + (f.backtrace."0.3.7".gimli-symbolize or false) || + (backtrace."0.3.7"."gimli-symbolize" or false); } + { "0.3.7"."gimli" = + (f.backtrace."0.3.7"."gimli" or false) || + (f.backtrace."0.3.7".gimli-symbolize or false) || + (backtrace."0.3.7"."gimli-symbolize" or false); } + { "0.3.7"."libbacktrace" = + (f.backtrace."0.3.7"."libbacktrace" or false) || + (f.backtrace."0.3.7".default or false) || + (backtrace."0.3.7"."default" or false); } + { "0.3.7"."libunwind" = + (f.backtrace."0.3.7"."libunwind" or false) || + (f.backtrace."0.3.7".default or false) || + (backtrace."0.3.7"."default" or false); } + { "0.3.7"."memmap" = + (f.backtrace."0.3.7"."memmap" or false) || + (f.backtrace."0.3.7".gimli-symbolize or false) || + (backtrace."0.3.7"."gimli-symbolize" or false); } + { "0.3.7"."object" = + (f.backtrace."0.3.7"."object" or false) || + (f.backtrace."0.3.7".gimli-symbolize or false) || + (backtrace."0.3.7"."gimli-symbolize" or false); } + { "0.3.7"."rustc-serialize" = + (f.backtrace."0.3.7"."rustc-serialize" or false) || + (f.backtrace."0.3.7".serialize-rustc or false) || + (backtrace."0.3.7"."serialize-rustc" or false); } + { "0.3.7"."serde" = + (f.backtrace."0.3.7"."serde" or false) || + (f.backtrace."0.3.7".serialize-serde or false) || + (backtrace."0.3.7"."serialize-serde" or false); } + { "0.3.7"."serde_derive" = + (f.backtrace."0.3.7"."serde_derive" or false) || + (f.backtrace."0.3.7".serialize-serde or false) || + (backtrace."0.3.7"."serialize-serde" or false); } + { "0.3.7"."winapi" = + (f.backtrace."0.3.7"."winapi" or false) || + (f.backtrace."0.3.7".dbghelp or false) || + (backtrace."0.3.7"."dbghelp" or false); } + { "0.3.7".default = (f.backtrace."0.3.7".default or true); } + ]; + backtrace_sys."${deps.backtrace."0.3.7".backtrace_sys}".default = true; + cfg_if."${deps.backtrace."0.3.7".cfg_if}".default = true; + libc."${deps.backtrace."0.3.7".libc}".default = true; + rustc_demangle."${deps.backtrace."0.3.7".rustc_demangle}".default = true; + winapi = fold recursiveUpdate {} [ + { "${deps.backtrace."0.3.7".winapi}"."dbghelp" = true; } + { "${deps.backtrace."0.3.7".winapi}"."minwindef" = true; } + { "${deps.backtrace."0.3.7".winapi}"."processthreadsapi" = true; } + { "${deps.backtrace."0.3.7".winapi}"."std" = true; } + { "${deps.backtrace."0.3.7".winapi}"."winnt" = true; } + { "${deps.backtrace."0.3.7".winapi}".default = true; } + ]; + }) [ + (features_.cfg_if."${deps."backtrace"."0.3.7"."cfg_if"}" deps) + (features_.rustc_demangle."${deps."backtrace"."0.3.7"."rustc_demangle"}" deps) + (features_.backtrace_sys."${deps."backtrace"."0.3.7"."backtrace_sys"}" deps) + (features_.libc."${deps."backtrace"."0.3.7"."libc"}" deps) + (features_.winapi."${deps."backtrace"."0.3.7"."winapi"}" deps) + ]; + + +# end +# backtrace-sys-0.1.16 + + crates.backtrace_sys."0.1.16" = deps: { features?(features_.backtrace_sys."0.1.16" deps {}) }: buildRustCrate { + crateName = "backtrace-sys"; + version = "0.1.16"; + description = "Bindings to the libbacktrace gcc library\n"; + authors = [ "Alex Crichton " ]; + sha256 = "1cn2c8q3dn06crmnk0p62czkngam4l8nf57wy33nz1y5g25pszwy"; + build = "build.rs"; + dependencies = mapFeatures features ([ + (crates."libc"."${deps."backtrace_sys"."0.1.16"."libc"}" deps) + ]); + + buildDependencies = mapFeatures features ([ + (crates."cc"."${deps."backtrace_sys"."0.1.16"."cc"}" deps) + ]); + }; + features_.backtrace_sys."0.1.16" = deps: f: updateFeatures f (rec { + backtrace_sys."0.1.16".default = (f.backtrace_sys."0.1.16".default or true); + cc."${deps.backtrace_sys."0.1.16".cc}".default = true; + libc."${deps.backtrace_sys."0.1.16".libc}".default = true; + }) [ + (features_.libc."${deps."backtrace_sys"."0.1.16"."libc"}" deps) + (features_.cc."${deps."backtrace_sys"."0.1.16"."cc"}" deps) + ]; + + +# end +# bitflags-1.0.3 + + crates.bitflags."1.0.3" = deps: { features?(features_.bitflags."1.0.3" deps {}) }: buildRustCrate { + crateName = "bitflags"; + version = "1.0.3"; + description = "A macro to generate structures which behave like bitflags.\n"; + authors = [ "The Rust Project Developers" ]; + sha256 = "162p4w4h1ad76awq6b5yivmls3d50m9cl27d8g588lsps6g8s5rw"; + features = mkFeatures (features."bitflags"."1.0.3" or {}); + }; + features_.bitflags."1.0.3" = deps: f: updateFeatures f (rec { + bitflags."1.0.3".default = (f.bitflags."1.0.3".default or true); + }) []; + + +# end +# byteorder-1.2.3 + + crates.byteorder."1.2.3" = deps: { features?(features_.byteorder."1.2.3" deps {}) }: buildRustCrate { + crateName = "byteorder"; + version = "1.2.3"; + description = "Library for reading/writing numbers in big-endian and little-endian."; + authors = [ "Andrew Gallant " ]; + sha256 = "1xghv5f5rydzsam8lnfqhfk090i8a1knb77ikbs0ik44bvrw2ij3"; + features = mkFeatures (features."byteorder"."1.2.3" or {}); + }; + features_.byteorder."1.2.3" = deps: f: updateFeatures f (rec { + byteorder = fold recursiveUpdate {} [ + { "1.2.3"."std" = + (f.byteorder."1.2.3"."std" or false) || + (f.byteorder."1.2.3".default or false) || + (byteorder."1.2.3"."default" or false); } + { "1.2.3".default = (f.byteorder."1.2.3".default or true); } + ]; + }) []; + + +# end +# bytes-0.4.7 + + crates.bytes."0.4.7" = deps: { features?(features_.bytes."0.4.7" deps {}) }: buildRustCrate { + crateName = "bytes"; + version = "0.4.7"; + description = "Types and traits for working with bytes"; + authors = [ "Carl Lerche " ]; + sha256 = "1icr74r099d0c0a2q1pz51182z7911g92h2j60al351kz78dzv3f"; + dependencies = mapFeatures features ([ + (crates."byteorder"."${deps."bytes"."0.4.7"."byteorder"}" deps) + (crates."iovec"."${deps."bytes"."0.4.7"."iovec"}" deps) + ]); + }; + features_.bytes."0.4.7" = deps: f: updateFeatures f (rec { + byteorder."${deps.bytes."0.4.7".byteorder}".default = true; + bytes."0.4.7".default = (f.bytes."0.4.7".default or true); + iovec."${deps.bytes."0.4.7".iovec}".default = true; + }) [ + (features_.byteorder."${deps."bytes"."0.4.7"."byteorder"}" deps) + (features_.iovec."${deps."bytes"."0.4.7"."iovec"}" deps) + ]; + + +# end +# cc-1.0.15 + + crates.cc."1.0.15" = deps: { features?(features_.cc."1.0.15" deps {}) }: buildRustCrate { + crateName = "cc"; + version = "1.0.15"; + 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 " ]; + sha256 = "1zmcv4zf888byhay2qakqlc9b8snhy5ccfs35zb6flywmlj8f2c0"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."cc"."1.0.15" or {}); + }; + features_.cc."1.0.15" = deps: f: updateFeatures f (rec { + cc = fold recursiveUpdate {} [ + { "1.0.15"."rayon" = + (f.cc."1.0.15"."rayon" or false) || + (f.cc."1.0.15".parallel or false) || + (cc."1.0.15"."parallel" or false); } + { "1.0.15".default = (f.cc."1.0.15".default or true); } + ]; + }) []; + + +# end +# cfg-if-0.1.3 + + crates.cfg_if."0.1.3" = deps: { features?(features_.cfg_if."0.1.3" deps {}) }: buildRustCrate { + crateName = "cfg-if"; + version = "0.1.3"; + 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 " ]; + sha256 = "0hphfz5qg40gr5p18gmgy2rzkqj019lii3n0dy3s0a6lnl9106k6"; + }; + features_.cfg_if."0.1.3" = deps: f: updateFeatures f (rec { + cfg_if."0.1.3".default = (f.cfg_if."0.1.3".default or true); + }) []; + + +# end +# clap-2.31.2 + + crates.clap."2.31.2" = deps: { features?(features_.clap."2.31.2" deps {}) }: buildRustCrate { + crateName = "clap"; + version = "2.31.2"; + description = "A simple to use, efficient, and full featured Command Line Argument Parser\n"; + authors = [ "Kevin K. " ]; + sha256 = "0r24ziw85a8y1sf2l21y4mvv5qan3rjafcshpyfsjfadqfxsij72"; + dependencies = mapFeatures features ([ + (crates."bitflags"."${deps."clap"."2.31.2"."bitflags"}" deps) + (crates."textwrap"."${deps."clap"."2.31.2"."textwrap"}" deps) + (crates."unicode_width"."${deps."clap"."2.31.2"."unicode_width"}" deps) + ] + ++ (if features.clap."2.31.2".atty or false then [ (crates.atty."${deps."clap"."2.31.2".atty}" deps) ] else []) + ++ (if features.clap."2.31.2".strsim or false then [ (crates.strsim."${deps."clap"."2.31.2".strsim}" deps) ] else []) + ++ (if features.clap."2.31.2".vec_map or false then [ (crates.vec_map."${deps."clap"."2.31.2".vec_map}" deps) ] else [])) + ++ (if !(kernel == "windows") then mapFeatures features ([ + ] + ++ (if features.clap."2.31.2".ansi_term or false then [ (crates.ansi_term."${deps."clap"."2.31.2".ansi_term}" deps) ] else [])) else []); + features = mkFeatures (features."clap"."2.31.2" or {}); + }; + features_.clap."2.31.2" = deps: f: updateFeatures f (rec { + ansi_term."${deps.clap."2.31.2".ansi_term}".default = true; + atty."${deps.clap."2.31.2".atty}".default = true; + bitflags."${deps.clap."2.31.2".bitflags}".default = true; + clap = fold recursiveUpdate {} [ + { "2.31.2"."ansi_term" = + (f.clap."2.31.2"."ansi_term" or false) || + (f.clap."2.31.2".color or false) || + (clap."2.31.2"."color" or false); } + { "2.31.2"."atty" = + (f.clap."2.31.2"."atty" or false) || + (f.clap."2.31.2".color or false) || + (clap."2.31.2"."color" or false); } + { "2.31.2"."clippy" = + (f.clap."2.31.2"."clippy" or false) || + (f.clap."2.31.2".lints or false) || + (clap."2.31.2"."lints" or false); } + { "2.31.2"."color" = + (f.clap."2.31.2"."color" or false) || + (f.clap."2.31.2".default or false) || + (clap."2.31.2"."default" or false); } + { "2.31.2"."strsim" = + (f.clap."2.31.2"."strsim" or false) || + (f.clap."2.31.2".suggestions or false) || + (clap."2.31.2"."suggestions" or false); } + { "2.31.2"."suggestions" = + (f.clap."2.31.2"."suggestions" or false) || + (f.clap."2.31.2".default or false) || + (clap."2.31.2"."default" or false); } + { "2.31.2"."term_size" = + (f.clap."2.31.2"."term_size" or false) || + (f.clap."2.31.2".wrap_help or false) || + (clap."2.31.2"."wrap_help" or false); } + { "2.31.2"."vec_map" = + (f.clap."2.31.2"."vec_map" or false) || + (f.clap."2.31.2".default or false) || + (clap."2.31.2"."default" or false); } + { "2.31.2"."yaml" = + (f.clap."2.31.2"."yaml" or false) || + (f.clap."2.31.2".doc or false) || + (clap."2.31.2"."doc" or false); } + { "2.31.2"."yaml-rust" = + (f.clap."2.31.2"."yaml-rust" or false) || + (f.clap."2.31.2".yaml or false) || + (clap."2.31.2"."yaml" or false); } + { "2.31.2".default = (f.clap."2.31.2".default or true); } + ]; + strsim."${deps.clap."2.31.2".strsim}".default = true; + textwrap = fold recursiveUpdate {} [ + { "${deps.clap."2.31.2".textwrap}"."term_size" = + (f.textwrap."${deps.clap."2.31.2".textwrap}"."term_size" or false) || + (clap."2.31.2"."wrap_help" or false) || + (f."clap"."2.31.2"."wrap_help" or false); } + { "${deps.clap."2.31.2".textwrap}".default = true; } + ]; + unicode_width."${deps.clap."2.31.2".unicode_width}".default = true; + vec_map."${deps.clap."2.31.2".vec_map}".default = true; + }) [ + (features_.atty."${deps."clap"."2.31.2"."atty"}" deps) + (features_.bitflags."${deps."clap"."2.31.2"."bitflags"}" deps) + (features_.strsim."${deps."clap"."2.31.2"."strsim"}" deps) + (features_.textwrap."${deps."clap"."2.31.2"."textwrap"}" deps) + (features_.unicode_width."${deps."clap"."2.31.2"."unicode_width"}" deps) + (features_.vec_map."${deps."clap"."2.31.2"."vec_map"}" deps) + (features_.ansi_term."${deps."clap"."2.31.2"."ansi_term"}" deps) + ]; + + +# end +# clicolors-control-0.2.0 + + crates.clicolors_control."0.2.0" = deps: { features?(features_.clicolors_control."0.2.0" deps {}) }: buildRustCrate { + crateName = "clicolors-control"; + version = "0.2.0"; + description = "A common utility library to control CLI colorization"; + authors = [ "Armin Ronacher " ]; + sha256 = "0p1fbs7k70h58ycahmin7b87c0xn6lc94xmh9jw4gxi40mnrvdkp"; + dependencies = mapFeatures features ([ + (crates."lazy_static"."${deps."clicolors_control"."0.2.0"."lazy_static"}" deps) + ]) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + (crates."libc"."${deps."clicolors_control"."0.2.0"."libc"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."kernel32_sys"."${deps."clicolors_control"."0.2.0"."kernel32_sys"}" deps) + (crates."winapi"."${deps."clicolors_control"."0.2.0"."winapi"}" deps) + ]) else []); + features = mkFeatures (features."clicolors_control"."0.2.0" or {}); + }; + features_.clicolors_control."0.2.0" = deps: f: updateFeatures f (rec { + clicolors_control = fold recursiveUpdate {} [ + { "0.2.0"."terminal_autoconfig" = + (f.clicolors_control."0.2.0"."terminal_autoconfig" or false) || + (f.clicolors_control."0.2.0".default or false) || + (clicolors_control."0.2.0"."default" or false); } + { "0.2.0".default = (f.clicolors_control."0.2.0".default or true); } + ]; + kernel32_sys."${deps.clicolors_control."0.2.0".kernel32_sys}".default = true; + lazy_static."${deps.clicolors_control."0.2.0".lazy_static}".default = true; + libc."${deps.clicolors_control."0.2.0".libc}".default = true; + winapi = fold recursiveUpdate {} [ + { "${deps.clicolors_control."0.2.0".winapi}"."consoleapi" = true; } + { "${deps.clicolors_control."0.2.0".winapi}"."handleapi" = true; } + { "${deps.clicolors_control."0.2.0".winapi}"."processenv" = true; } + { "${deps.clicolors_control."0.2.0".winapi}"."winbase" = true; } + { "${deps.clicolors_control."0.2.0".winapi}".default = true; } + ]; + }) [ + (features_.lazy_static."${deps."clicolors_control"."0.2.0"."lazy_static"}" deps) + (features_.libc."${deps."clicolors_control"."0.2.0"."libc"}" deps) + (features_.kernel32_sys."${deps."clicolors_control"."0.2.0"."kernel32_sys"}" deps) + (features_.winapi."${deps."clicolors_control"."0.2.0"."winapi"}" deps) + ]; + + +# end +# console-0.6.1 + + crates.console."0.6.1" = deps: { features?(features_.console."0.6.1" deps {}) }: buildRustCrate { + crateName = "console"; + version = "0.6.1"; + description = "A terminal and console abstraction for Rust"; + authors = [ "Armin Ronacher " ]; + sha256 = "0h46m3nlx7m2pmc1ia2nlbl8d1vp46kqh2c82hx9ckjag68g4zdl"; + dependencies = mapFeatures features ([ + (crates."clicolors_control"."${deps."console"."0.6.1"."clicolors_control"}" deps) + (crates."lazy_static"."${deps."console"."0.6.1"."lazy_static"}" deps) + (crates."libc"."${deps."console"."0.6.1"."libc"}" deps) + (crates."parking_lot"."${deps."console"."0.6.1"."parking_lot"}" deps) + (crates."regex"."${deps."console"."0.6.1"."regex"}" deps) + (crates."unicode_width"."${deps."console"."0.6.1"."unicode_width"}" deps) + ]) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + (crates."termios"."${deps."console"."0.6.1"."termios"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."console"."0.6.1"."winapi"}" deps) + ]) else []); + }; + features_.console."0.6.1" = deps: f: updateFeatures f (rec { + clicolors_control."${deps.console."0.6.1".clicolors_control}".default = true; + console."0.6.1".default = (f.console."0.6.1".default or true); + lazy_static."${deps.console."0.6.1".lazy_static}".default = true; + libc."${deps.console."0.6.1".libc}".default = true; + parking_lot."${deps.console."0.6.1".parking_lot}".default = true; + regex."${deps.console."0.6.1".regex}".default = true; + termios."${deps.console."0.6.1".termios}".default = true; + unicode_width."${deps.console."0.6.1".unicode_width}".default = true; + winapi = fold recursiveUpdate {} [ + { "${deps.console."0.6.1".winapi}"."consoleapi" = true; } + { "${deps.console."0.6.1".winapi}"."processenv" = true; } + { "${deps.console."0.6.1".winapi}"."winbase" = true; } + { "${deps.console."0.6.1".winapi}"."wincon" = true; } + { "${deps.console."0.6.1".winapi}"."winuser" = true; } + { "${deps.console."0.6.1".winapi}".default = true; } + ]; + }) [ + (features_.clicolors_control."${deps."console"."0.6.1"."clicolors_control"}" deps) + (features_.lazy_static."${deps."console"."0.6.1"."lazy_static"}" deps) + (features_.libc."${deps."console"."0.6.1"."libc"}" deps) + (features_.parking_lot."${deps."console"."0.6.1"."parking_lot"}" deps) + (features_.regex."${deps."console"."0.6.1"."regex"}" deps) + (features_.unicode_width."${deps."console"."0.6.1"."unicode_width"}" deps) + (features_.termios."${deps."console"."0.6.1"."termios"}" deps) + (features_.winapi."${deps."console"."0.6.1"."winapi"}" deps) + ]; + + +# end +# failure-0.1.1 + + crates.failure."0.1.1" = deps: { features?(features_.failure."0.1.1" deps {}) }: buildRustCrate { + crateName = "failure"; + version = "0.1.1"; + description = "Experimental error handling abstraction."; + authors = [ "Without Boats " ]; + sha256 = "0gf9cmkm9kc163sszgjksqp5pcgj689lnf2104nn4h4is18nhigk"; + dependencies = mapFeatures features ([ + ] + ++ (if features.failure."0.1.1".backtrace or false then [ (crates.backtrace."${deps."failure"."0.1.1".backtrace}" deps) ] else []) + ++ (if features.failure."0.1.1".failure_derive or false then [ (crates.failure_derive."${deps."failure"."0.1.1".failure_derive}" deps) ] else [])); + features = mkFeatures (features."failure"."0.1.1" or {}); + }; + features_.failure."0.1.1" = deps: f: updateFeatures f (rec { + backtrace."${deps.failure."0.1.1".backtrace}".default = true; + failure = fold recursiveUpdate {} [ + { "0.1.1"."backtrace" = + (f.failure."0.1.1"."backtrace" or false) || + (f.failure."0.1.1".std or false) || + (failure."0.1.1"."std" or false); } + { "0.1.1"."derive" = + (f.failure."0.1.1"."derive" or false) || + (f.failure."0.1.1".default or false) || + (failure."0.1.1"."default" or false); } + { "0.1.1"."failure_derive" = + (f.failure."0.1.1"."failure_derive" or false) || + (f.failure."0.1.1".derive or false) || + (failure."0.1.1"."derive" or false); } + { "0.1.1"."std" = + (f.failure."0.1.1"."std" or false) || + (f.failure."0.1.1".default or false) || + (failure."0.1.1"."default" or false); } + { "0.1.1".default = (f.failure."0.1.1".default or true); } + ]; + failure_derive."${deps.failure."0.1.1".failure_derive}".default = true; + }) [ + (features_.backtrace."${deps."failure"."0.1.1"."backtrace"}" deps) + (features_.failure_derive."${deps."failure"."0.1.1"."failure_derive"}" deps) + ]; + + +# end +# failure_derive-0.1.1 + + crates.failure_derive."0.1.1" = deps: { features?(features_.failure_derive."0.1.1" deps {}) }: buildRustCrate { + crateName = "failure_derive"; + version = "0.1.1"; + description = "derives for the failure crate"; + authors = [ "Without Boats " ]; + sha256 = "1w895q4pbyx3rwnhgjwfcayk9ghbi166wc1c3553qh8zkbz52k8i"; + procMacro = true; + dependencies = mapFeatures features ([ + (crates."quote"."${deps."failure_derive"."0.1.1"."quote"}" deps) + (crates."syn"."${deps."failure_derive"."0.1.1"."syn"}" deps) + (crates."synstructure"."${deps."failure_derive"."0.1.1"."synstructure"}" deps) + ]); + features = mkFeatures (features."failure_derive"."0.1.1" or {}); + }; + features_.failure_derive."0.1.1" = deps: f: updateFeatures f (rec { + failure_derive = fold recursiveUpdate {} [ + { "0.1.1"."std" = + (f.failure_derive."0.1.1"."std" or false) || + (f.failure_derive."0.1.1".default or false) || + (failure_derive."0.1.1"."default" or false); } + { "0.1.1".default = (f.failure_derive."0.1.1".default or true); } + ]; + quote."${deps.failure_derive."0.1.1".quote}".default = true; + syn."${deps.failure_derive."0.1.1".syn}".default = true; + synstructure."${deps.failure_derive."0.1.1".synstructure}".default = true; + }) [ + (features_.quote."${deps."failure_derive"."0.1.1"."quote"}" deps) + (features_.syn."${deps."failure_derive"."0.1.1"."syn"}" deps) + (features_.synstructure."${deps."failure_derive"."0.1.1"."synstructure"}" deps) + ]; + + +# end +# fuchsia-zircon-0.3.3 + + crates.fuchsia_zircon."0.3.3" = deps: { features?(features_.fuchsia_zircon."0.3.3" deps {}) }: buildRustCrate { + crateName = "fuchsia-zircon"; + version = "0.3.3"; + description = "Rust bindings for the Zircon kernel"; + authors = [ "Raph Levien " ]; + sha256 = "0jrf4shb1699r4la8z358vri8318w4mdi6qzfqy30p2ymjlca4gk"; + dependencies = mapFeatures features ([ + (crates."bitflags"."${deps."fuchsia_zircon"."0.3.3"."bitflags"}" deps) + (crates."fuchsia_zircon_sys"."${deps."fuchsia_zircon"."0.3.3"."fuchsia_zircon_sys"}" deps) + ]); + }; + features_.fuchsia_zircon."0.3.3" = deps: f: updateFeatures f (rec { + bitflags."${deps.fuchsia_zircon."0.3.3".bitflags}".default = true; + fuchsia_zircon."0.3.3".default = (f.fuchsia_zircon."0.3.3".default or true); + fuchsia_zircon_sys."${deps.fuchsia_zircon."0.3.3".fuchsia_zircon_sys}".default = true; + }) [ + (features_.bitflags."${deps."fuchsia_zircon"."0.3.3"."bitflags"}" deps) + (features_.fuchsia_zircon_sys."${deps."fuchsia_zircon"."0.3.3"."fuchsia_zircon_sys"}" deps) + ]; + + +# end +# fuchsia-zircon-sys-0.3.3 + + crates.fuchsia_zircon_sys."0.3.3" = deps: { features?(features_.fuchsia_zircon_sys."0.3.3" deps {}) }: buildRustCrate { + crateName = "fuchsia-zircon-sys"; + version = "0.3.3"; + description = "Low-level Rust bindings for the Zircon kernel"; + authors = [ "Raph Levien " ]; + sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5"; + }; + features_.fuchsia_zircon_sys."0.3.3" = deps: f: updateFeatures f (rec { + fuchsia_zircon_sys."0.3.3".default = (f.fuchsia_zircon_sys."0.3.3".default or true); + }) []; + + +# end +# gcc-0.3.54 + + crates.gcc."0.3.54" = deps: { features?(features_.gcc."0.3.54" deps {}) }: buildRustCrate { + crateName = "gcc"; + version = "0.3.54"; + 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 " ]; + sha256 = "07a5i47r8achc6gxsba3ga17h9gnh4b9a2cak8vjg4hx62aajkr4"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."gcc"."0.3.54" or {}); + }; + features_.gcc."0.3.54" = deps: f: updateFeatures f (rec { + gcc = fold recursiveUpdate {} [ + { "0.3.54"."rayon" = + (f.gcc."0.3.54"."rayon" or false) || + (f.gcc."0.3.54".parallel or false) || + (gcc."0.3.54"."parallel" or false); } + { "0.3.54".default = (f.gcc."0.3.54".default or true); } + ]; + }) []; + + +# end +# iovec-0.1.2 + + crates.iovec."0.1.2" = deps: { features?(features_.iovec."0.1.2" deps {}) }: buildRustCrate { + crateName = "iovec"; + version = "0.1.2"; + description = "Portable buffer type for scatter/gather I/O operations\n"; + authors = [ "Carl Lerche " ]; + sha256 = "0vjymmb7wj4v4kza5jjn48fcdb85j3k37y7msjl3ifz0p9yiyp2r"; + dependencies = (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + (crates."libc"."${deps."iovec"."0.1.2"."libc"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."iovec"."0.1.2"."winapi"}" deps) + ]) else []); + }; + features_.iovec."0.1.2" = deps: f: updateFeatures f (rec { + iovec."0.1.2".default = (f.iovec."0.1.2".default or true); + libc."${deps.iovec."0.1.2".libc}".default = true; + winapi."${deps.iovec."0.1.2".winapi}".default = true; + }) [ + (features_.libc."${deps."iovec"."0.1.2"."libc"}" deps) + (features_.winapi."${deps."iovec"."0.1.2"."winapi"}" deps) + ]; + + +# end +# kernel32-sys-0.2.2 + + crates.kernel32_sys."0.2.2" = deps: { features?(features_.kernel32_sys."0.2.2" deps {}) }: buildRustCrate { + crateName = "kernel32-sys"; + version = "0.2.2"; + description = "Contains function definitions for the Windows API library kernel32. See winapi for types and constants."; + authors = [ "Peter Atashian " ]; + sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj"; + libName = "kernel32"; + build = "build.rs"; + dependencies = mapFeatures features ([ + (crates."winapi"."${deps."kernel32_sys"."0.2.2"."winapi"}" deps) + ]); + + buildDependencies = mapFeatures features ([ + (crates."winapi_build"."${deps."kernel32_sys"."0.2.2"."winapi_build"}" deps) + ]); + }; + features_.kernel32_sys."0.2.2" = deps: f: updateFeatures f (rec { + kernel32_sys."0.2.2".default = (f.kernel32_sys."0.2.2".default or true); + winapi."${deps.kernel32_sys."0.2.2".winapi}".default = true; + winapi_build."${deps.kernel32_sys."0.2.2".winapi_build}".default = true; + }) [ + (features_.winapi."${deps."kernel32_sys"."0.2.2"."winapi"}" deps) + (features_.winapi_build."${deps."kernel32_sys"."0.2.2"."winapi_build"}" deps) + ]; + + +# end +# lazy_static-0.2.11 + + crates.lazy_static."0.2.11" = deps: { features?(features_.lazy_static."0.2.11" deps {}) }: buildRustCrate { + crateName = "lazy_static"; + version = "0.2.11"; + description = "A macro for declaring lazily evaluated statics in Rust."; + authors = [ "Marvin Löbel " ]; + sha256 = "1x6871cvpy5b96yv4c7jvpq316fp5d4609s9py7qk6cd6x9k34vm"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."lazy_static"."0.2.11" or {}); + }; + features_.lazy_static."0.2.11" = deps: f: updateFeatures f (rec { + lazy_static = fold recursiveUpdate {} [ + { "0.2.11"."compiletest_rs" = + (f.lazy_static."0.2.11"."compiletest_rs" or false) || + (f.lazy_static."0.2.11".compiletest or false) || + (lazy_static."0.2.11"."compiletest" or false); } + { "0.2.11"."nightly" = + (f.lazy_static."0.2.11"."nightly" or false) || + (f.lazy_static."0.2.11".spin_no_std or false) || + (lazy_static."0.2.11"."spin_no_std" or false); } + { "0.2.11"."spin" = + (f.lazy_static."0.2.11"."spin" or false) || + (f.lazy_static."0.2.11".spin_no_std or false) || + (lazy_static."0.2.11"."spin_no_std" or false); } + { "0.2.11".default = (f.lazy_static."0.2.11".default or true); } + ]; + }) []; + + +# end +# lazy_static-1.0.0 + + crates.lazy_static."1.0.0" = deps: { features?(features_.lazy_static."1.0.0" deps {}) }: buildRustCrate { + crateName = "lazy_static"; + version = "1.0.0"; + description = "A macro for declaring lazily evaluated statics in Rust."; + authors = [ "Marvin Löbel " ]; + sha256 = "0wfvqyr2nvx2mbsrscg5y7gfa9skhb8p72ayanl8vl49pw24v4fh"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."lazy_static"."1.0.0" or {}); + }; + features_.lazy_static."1.0.0" = deps: f: updateFeatures f (rec { + lazy_static = fold recursiveUpdate {} [ + { "1.0.0"."compiletest_rs" = + (f.lazy_static."1.0.0"."compiletest_rs" or false) || + (f.lazy_static."1.0.0".compiletest or false) || + (lazy_static."1.0.0"."compiletest" or false); } + { "1.0.0"."nightly" = + (f.lazy_static."1.0.0"."nightly" or false) || + (f.lazy_static."1.0.0".spin_no_std or false) || + (lazy_static."1.0.0"."spin_no_std" or false); } + { "1.0.0"."spin" = + (f.lazy_static."1.0.0"."spin" or false) || + (f.lazy_static."1.0.0".spin_no_std or false) || + (lazy_static."1.0.0"."spin_no_std" or false); } + { "1.0.0".default = (f.lazy_static."1.0.0".default or true); } + ]; + }) []; + + +# end +# libc-0.2.40 + + crates.libc."0.2.40" = deps: { features?(features_.libc."0.2.40" deps {}) }: buildRustCrate { + crateName = "libc"; + version = "0.2.40"; + description = "A library for types and bindings to native C functions often found in libc or\nother common platform libraries.\n"; + authors = [ "The Rust Project Developers" ]; + sha256 = "1xfc39237ldzgr8x8wcflgdr8zssi3wif7g2zxc02d94gzkjsw83"; + features = mkFeatures (features."libc"."0.2.40" or {}); + }; + features_.libc."0.2.40" = deps: f: updateFeatures f (rec { + libc = fold recursiveUpdate {} [ + { "0.2.40"."use_std" = + (f.libc."0.2.40"."use_std" or false) || + (f.libc."0.2.40".default or false) || + (libc."0.2.40"."default" or false); } + { "0.2.40".default = (f.libc."0.2.40".default or true); } + ]; + }) []; + + +# end +# memchr-2.0.1 + + crates.memchr."2.0.1" = deps: { features?(features_.memchr."2.0.1" deps {}) }: buildRustCrate { + crateName = "memchr"; + version = "2.0.1"; + description = "Safe interface to memchr."; + authors = [ "Andrew Gallant " "bluss" ]; + sha256 = "0ls2y47rjwapjdax6bp974gdp06ggm1v8d1h69wyydmh1nhgm5gr"; + dependencies = mapFeatures features ([ + ] + ++ (if features.memchr."2.0.1".libc or false then [ (crates.libc."${deps."memchr"."2.0.1".libc}" deps) ] else [])); + features = mkFeatures (features."memchr"."2.0.1" or {}); + }; + features_.memchr."2.0.1" = deps: f: updateFeatures f (rec { + libc = fold recursiveUpdate {} [ + { "${deps.memchr."2.0.1".libc}"."use_std" = + (f.libc."${deps.memchr."2.0.1".libc}"."use_std" or false) || + (memchr."2.0.1"."use_std" or false) || + (f."memchr"."2.0.1"."use_std" or false); } + { "${deps.memchr."2.0.1".libc}".default = (f.libc."${deps.memchr."2.0.1".libc}".default or false); } + ]; + memchr = fold recursiveUpdate {} [ + { "2.0.1"."libc" = + (f.memchr."2.0.1"."libc" or false) || + (f.memchr."2.0.1".default or false) || + (memchr."2.0.1"."default" or false) || + (f.memchr."2.0.1".use_std or false) || + (memchr."2.0.1"."use_std" or false); } + { "2.0.1"."use_std" = + (f.memchr."2.0.1"."use_std" or false) || + (f.memchr."2.0.1".default or false) || + (memchr."2.0.1"."default" or false); } + { "2.0.1".default = (f.memchr."2.0.1".default or true); } + ]; + }) [ + (features_.libc."${deps."memchr"."2.0.1"."libc"}" deps) + ]; + + +# end +# nix-0.10.0 + + crates.nix."0.10.0" = deps: { features?(features_.nix."0.10.0" deps {}) }: buildRustCrate { + crateName = "nix"; + version = "0.10.0"; + description = "Rust friendly bindings to *nix APIs"; + authors = [ "The nix-rust Project Developers" ]; + sha256 = "0ghrbjlc1l21pmldwaz5b5m72xs0m05y1zq5ljlnymn61vbzxsny"; + dependencies = mapFeatures features ([ + (crates."bitflags"."${deps."nix"."0.10.0"."bitflags"}" deps) + (crates."bytes"."${deps."nix"."0.10.0"."bytes"}" deps) + (crates."cfg_if"."${deps."nix"."0.10.0"."cfg_if"}" deps) + (crates."libc"."${deps."nix"."0.10.0"."libc"}" deps) + (crates."void"."${deps."nix"."0.10.0"."void"}" deps) + ]) + ++ (if kernel == "dragonfly" then mapFeatures features ([ +]) else []); + }; + features_.nix."0.10.0" = deps: f: updateFeatures f (rec { + bitflags."${deps.nix."0.10.0".bitflags}".default = true; + bytes."${deps.nix."0.10.0".bytes}".default = (f.bytes."${deps.nix."0.10.0".bytes}".default or false); + cfg_if."${deps.nix."0.10.0".cfg_if}".default = true; + libc."${deps.nix."0.10.0".libc}".default = true; + nix."0.10.0".default = (f.nix."0.10.0".default or true); + void."${deps.nix."0.10.0".void}".default = true; + }) [ + (features_.bitflags."${deps."nix"."0.10.0"."bitflags"}" deps) + (features_.bytes."${deps."nix"."0.10.0"."bytes"}" deps) + (features_.cfg_if."${deps."nix"."0.10.0"."cfg_if"}" deps) + (features_.libc."${deps."nix"."0.10.0"."libc"}" deps) + (features_.void."${deps."nix"."0.10.0"."void"}" deps) + ]; + + +# end +# owning_ref-0.3.3 + + crates.owning_ref."0.3.3" = deps: { features?(features_.owning_ref."0.3.3" deps {}) }: buildRustCrate { + crateName = "owning_ref"; + version = "0.3.3"; + description = "A library for creating references that carry their owner with them."; + authors = [ "Marvin Löbel " ]; + sha256 = "13ivn0ydc0hf957ix0f5si9nnplzzykbr70hni1qz9m19i9kvmrh"; + dependencies = mapFeatures features ([ + (crates."stable_deref_trait"."${deps."owning_ref"."0.3.3"."stable_deref_trait"}" deps) + ]); + }; + features_.owning_ref."0.3.3" = deps: f: updateFeatures f (rec { + owning_ref."0.3.3".default = (f.owning_ref."0.3.3".default or true); + stable_deref_trait."${deps.owning_ref."0.3.3".stable_deref_trait}".default = true; + }) [ + (features_.stable_deref_trait."${deps."owning_ref"."0.3.3"."stable_deref_trait"}" deps) + ]; + + +# end +# parking_lot-0.5.5 + + crates.parking_lot."0.5.5" = deps: { features?(features_.parking_lot."0.5.5" deps {}) }: buildRustCrate { + crateName = "parking_lot"; + version = "0.5.5"; + description = "More compact and efficient implementations of the standard synchronization primitives."; + authors = [ "Amanieu d'Antras " ]; + sha256 = "0balxl593apy0l70z6dzk6c0r9707hgw2c9yav5asjc87dj6fx7l"; + dependencies = mapFeatures features ([ + (crates."parking_lot_core"."${deps."parking_lot"."0.5.5"."parking_lot_core"}" deps) + ] + ++ (if features.parking_lot."0.5.5".owning_ref or false then [ (crates.owning_ref."${deps."parking_lot"."0.5.5".owning_ref}" deps) ] else [])); + features = mkFeatures (features."parking_lot"."0.5.5" or {}); + }; + features_.parking_lot."0.5.5" = deps: f: updateFeatures f (rec { + owning_ref."${deps.parking_lot."0.5.5".owning_ref}".default = true; + parking_lot = fold recursiveUpdate {} [ + { "0.5.5"."owning_ref" = + (f.parking_lot."0.5.5"."owning_ref" or false) || + (f.parking_lot."0.5.5".default or false) || + (parking_lot."0.5.5"."default" or false); } + { "0.5.5".default = (f.parking_lot."0.5.5".default or true); } + ]; + parking_lot_core = fold recursiveUpdate {} [ + { "${deps.parking_lot."0.5.5".parking_lot_core}"."deadlock_detection" = + (f.parking_lot_core."${deps.parking_lot."0.5.5".parking_lot_core}"."deadlock_detection" or false) || + (parking_lot."0.5.5"."deadlock_detection" or false) || + (f."parking_lot"."0.5.5"."deadlock_detection" or false); } + { "${deps.parking_lot."0.5.5".parking_lot_core}"."nightly" = + (f.parking_lot_core."${deps.parking_lot."0.5.5".parking_lot_core}"."nightly" or false) || + (parking_lot."0.5.5"."nightly" or false) || + (f."parking_lot"."0.5.5"."nightly" or false); } + { "${deps.parking_lot."0.5.5".parking_lot_core}".default = true; } + ]; + }) [ + (features_.owning_ref."${deps."parking_lot"."0.5.5"."owning_ref"}" deps) + (features_.parking_lot_core."${deps."parking_lot"."0.5.5"."parking_lot_core"}" deps) + ]; + + +# end +# parking_lot_core-0.2.14 + + crates.parking_lot_core."0.2.14" = deps: { features?(features_.parking_lot_core."0.2.14" deps {}) }: buildRustCrate { + crateName = "parking_lot_core"; + version = "0.2.14"; + description = "An advanced API for creating custom synchronization primitives."; + authors = [ "Amanieu d'Antras " ]; + sha256 = "0giypb8ckkpi34p14nfk4b19c7przj4jxs95gs7x2v5ncmi0y286"; + dependencies = mapFeatures features ([ + (crates."rand"."${deps."parking_lot_core"."0.2.14"."rand"}" deps) + (crates."smallvec"."${deps."parking_lot_core"."0.2.14"."smallvec"}" deps) + ]) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + (crates."libc"."${deps."parking_lot_core"."0.2.14"."libc"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."parking_lot_core"."0.2.14"."winapi"}" deps) + ]) else []); + features = mkFeatures (features."parking_lot_core"."0.2.14" or {}); + }; + features_.parking_lot_core."0.2.14" = deps: f: updateFeatures f (rec { + libc."${deps.parking_lot_core."0.2.14".libc}".default = true; + parking_lot_core = fold recursiveUpdate {} [ + { "0.2.14"."backtrace" = + (f.parking_lot_core."0.2.14"."backtrace" or false) || + (f.parking_lot_core."0.2.14".deadlock_detection or false) || + (parking_lot_core."0.2.14"."deadlock_detection" or false); } + { "0.2.14"."petgraph" = + (f.parking_lot_core."0.2.14"."petgraph" or false) || + (f.parking_lot_core."0.2.14".deadlock_detection or false) || + (parking_lot_core."0.2.14"."deadlock_detection" or false); } + { "0.2.14"."thread-id" = + (f.parking_lot_core."0.2.14"."thread-id" or false) || + (f.parking_lot_core."0.2.14".deadlock_detection or false) || + (parking_lot_core."0.2.14"."deadlock_detection" or false); } + { "0.2.14".default = (f.parking_lot_core."0.2.14".default or true); } + ]; + rand."${deps.parking_lot_core."0.2.14".rand}".default = true; + smallvec."${deps.parking_lot_core."0.2.14".smallvec}".default = true; + winapi = fold recursiveUpdate {} [ + { "${deps.parking_lot_core."0.2.14".winapi}"."errhandlingapi" = true; } + { "${deps.parking_lot_core."0.2.14".winapi}"."handleapi" = true; } + { "${deps.parking_lot_core."0.2.14".winapi}"."minwindef" = true; } + { "${deps.parking_lot_core."0.2.14".winapi}"."ntstatus" = true; } + { "${deps.parking_lot_core."0.2.14".winapi}"."winbase" = true; } + { "${deps.parking_lot_core."0.2.14".winapi}"."winerror" = true; } + { "${deps.parking_lot_core."0.2.14".winapi}"."winnt" = true; } + { "${deps.parking_lot_core."0.2.14".winapi}".default = true; } + ]; + }) [ + (features_.rand."${deps."parking_lot_core"."0.2.14"."rand"}" deps) + (features_.smallvec."${deps."parking_lot_core"."0.2.14"."smallvec"}" deps) + (features_.libc."${deps."parking_lot_core"."0.2.14"."libc"}" deps) + (features_.winapi."${deps."parking_lot_core"."0.2.14"."winapi"}" deps) + ]; + + +# end +# quote-0.3.15 + + crates.quote."0.3.15" = deps: { features?(features_.quote."0.3.15" deps {}) }: buildRustCrate { + crateName = "quote"; + version = "0.3.15"; + description = "Quasi-quoting macro quote!(...)"; + authors = [ "David Tolnay " ]; + sha256 = "09il61jv4kd1360spaj46qwyl21fv1qz18fsv2jra8wdnlgl5jsg"; + }; + features_.quote."0.3.15" = deps: f: updateFeatures f (rec { + quote."0.3.15".default = (f.quote."0.3.15".default or true); + }) []; + + +# end +# rand-0.4.2 + + crates.rand."0.4.2" = deps: { features?(features_.rand."0.4.2" deps {}) }: buildRustCrate { + crateName = "rand"; + version = "0.4.2"; + description = "Random number generators and other randomness functionality.\n"; + authors = [ "The Rust Project Developers" ]; + sha256 = "0h8pkg23wb67i8904sm76iyr1jlmhklb85vbpz9c9191a24xzkfm"; + dependencies = (if kernel == "fuchsia" then mapFeatures features ([ + (crates."fuchsia_zircon"."${deps."rand"."0.4.2"."fuchsia_zircon"}" deps) + ]) else []) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + ] + ++ (if features.rand."0.4.2".libc or false then [ (crates.libc."${deps."rand"."0.4.2".libc}" deps) ] else [])) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."rand"."0.4.2"."winapi"}" deps) + ]) else []); + features = mkFeatures (features."rand"."0.4.2" or {}); + }; + features_.rand."0.4.2" = deps: f: updateFeatures f (rec { + fuchsia_zircon."${deps.rand."0.4.2".fuchsia_zircon}".default = true; + libc."${deps.rand."0.4.2".libc}".default = true; + rand = fold recursiveUpdate {} [ + { "0.4.2"."i128_support" = + (f.rand."0.4.2"."i128_support" or false) || + (f.rand."0.4.2".nightly or false) || + (rand."0.4.2"."nightly" or false); } + { "0.4.2"."libc" = + (f.rand."0.4.2"."libc" or false) || + (f.rand."0.4.2".std or false) || + (rand."0.4.2"."std" or false); } + { "0.4.2"."std" = + (f.rand."0.4.2"."std" or false) || + (f.rand."0.4.2".default or false) || + (rand."0.4.2"."default" or false); } + { "0.4.2".default = (f.rand."0.4.2".default or true); } + ]; + winapi = fold recursiveUpdate {} [ + { "${deps.rand."0.4.2".winapi}"."minwindef" = true; } + { "${deps.rand."0.4.2".winapi}"."ntsecapi" = true; } + { "${deps.rand."0.4.2".winapi}"."profileapi" = true; } + { "${deps.rand."0.4.2".winapi}"."winnt" = true; } + { "${deps.rand."0.4.2".winapi}".default = true; } + ]; + }) [ + (features_.fuchsia_zircon."${deps."rand"."0.4.2"."fuchsia_zircon"}" deps) + (features_.libc."${deps."rand"."0.4.2"."libc"}" deps) + (features_.winapi."${deps."rand"."0.4.2"."winapi"}" deps) + ]; + + +# end +# redox_syscall-0.1.37 + + crates.redox_syscall."0.1.37" = deps: { features?(features_.redox_syscall."0.1.37" deps {}) }: buildRustCrate { + crateName = "redox_syscall"; + version = "0.1.37"; + description = "A Rust library to access raw Redox system calls"; + authors = [ "Jeremy Soller " ]; + sha256 = "0qa0jl9cr3qp80an8vshp2mcn8rzvwiavs1398hq1vsjw7pc3h2v"; + libName = "syscall"; + }; + features_.redox_syscall."0.1.37" = deps: f: updateFeatures f (rec { + redox_syscall."0.1.37".default = (f.redox_syscall."0.1.37".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 { + crateName = "redox_termios"; + version = "0.1.1"; + description = "A Rust library to access Redox termios functions"; + authors = [ "Jeremy Soller " ]; + sha256 = "04s6yyzjca552hdaqlvqhp3vw0zqbc304md5czyd3axh56iry8wh"; + libPath = "src/lib.rs"; + dependencies = mapFeatures features ([ + (crates."redox_syscall"."${deps."redox_termios"."0.1.1"."redox_syscall"}" deps) + ]); + }; + features_.redox_termios."0.1.1" = deps: f: updateFeatures f (rec { + redox_syscall."${deps.redox_termios."0.1.1".redox_syscall}".default = true; + redox_termios."0.1.1".default = (f.redox_termios."0.1.1".default or true); + }) [ + (features_.redox_syscall."${deps."redox_termios"."0.1.1"."redox_syscall"}" deps) + ]; + + +# end +# regex-0.2.11 + + crates.regex."0.2.11" = deps: { features?(features_.regex."0.2.11" deps {}) }: buildRustCrate { + crateName = "regex"; + version = "0.2.11"; + 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 = "0r50cymxdqp0fv1dxd22mjr6y32q450nwacd279p9s7lh0cafijj"; + dependencies = mapFeatures features ([ + (crates."aho_corasick"."${deps."regex"."0.2.11"."aho_corasick"}" deps) + (crates."memchr"."${deps."regex"."0.2.11"."memchr"}" deps) + (crates."regex_syntax"."${deps."regex"."0.2.11"."regex_syntax"}" deps) + (crates."thread_local"."${deps."regex"."0.2.11"."thread_local"}" deps) + (crates."utf8_ranges"."${deps."regex"."0.2.11"."utf8_ranges"}" deps) + ]); + features = mkFeatures (features."regex"."0.2.11" or {}); + }; + features_.regex."0.2.11" = deps: f: updateFeatures f (rec { + aho_corasick."${deps.regex."0.2.11".aho_corasick}".default = true; + memchr."${deps.regex."0.2.11".memchr}".default = true; + regex = fold recursiveUpdate {} [ + { "0.2.11"."pattern" = + (f.regex."0.2.11"."pattern" or false) || + (f.regex."0.2.11".unstable or false) || + (regex."0.2.11"."unstable" or false); } + { "0.2.11".default = (f.regex."0.2.11".default or true); } + ]; + regex_syntax."${deps.regex."0.2.11".regex_syntax}".default = true; + thread_local."${deps.regex."0.2.11".thread_local}".default = true; + utf8_ranges."${deps.regex."0.2.11".utf8_ranges}".default = true; + }) [ + (features_.aho_corasick."${deps."regex"."0.2.11"."aho_corasick"}" deps) + (features_.memchr."${deps."regex"."0.2.11"."memchr"}" deps) + (features_.regex_syntax."${deps."regex"."0.2.11"."regex_syntax"}" deps) + (features_.thread_local."${deps."regex"."0.2.11"."thread_local"}" deps) + (features_.utf8_ranges."${deps."regex"."0.2.11"."utf8_ranges"}" deps) + ]; + + +# end +# regex-1.0.0 + + crates.regex."1.0.0" = deps: { features?(features_.regex."1.0.0" deps {}) }: buildRustCrate { + crateName = "regex"; + version = "1.0.0"; + 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 = "1wynl7jmf6l2fnsayw1bzfh7km4wwqnqfpi8anj7wbhdk17i6j6b"; + dependencies = mapFeatures features ([ + (crates."aho_corasick"."${deps."regex"."1.0.0"."aho_corasick"}" deps) + (crates."memchr"."${deps."regex"."1.0.0"."memchr"}" deps) + (crates."regex_syntax"."${deps."regex"."1.0.0"."regex_syntax"}" deps) + (crates."thread_local"."${deps."regex"."1.0.0"."thread_local"}" deps) + (crates."utf8_ranges"."${deps."regex"."1.0.0"."utf8_ranges"}" deps) + ]); + features = mkFeatures (features."regex"."1.0.0" or {}); + }; + features_.regex."1.0.0" = deps: f: updateFeatures f (rec { + aho_corasick."${deps.regex."1.0.0".aho_corasick}".default = true; + memchr."${deps.regex."1.0.0".memchr}".default = true; + regex = fold recursiveUpdate {} [ + { "1.0.0"."pattern" = + (f.regex."1.0.0"."pattern" or false) || + (f.regex."1.0.0".unstable or false) || + (regex."1.0.0"."unstable" or false); } + { "1.0.0"."use_std" = + (f.regex."1.0.0"."use_std" or false) || + (f.regex."1.0.0".default or false) || + (regex."1.0.0"."default" or false); } + { "1.0.0".default = (f.regex."1.0.0".default or true); } + ]; + regex_syntax."${deps.regex."1.0.0".regex_syntax}".default = true; + thread_local."${deps.regex."1.0.0".thread_local}".default = true; + utf8_ranges."${deps.regex."1.0.0".utf8_ranges}".default = true; + }) [ + (features_.aho_corasick."${deps."regex"."1.0.0"."aho_corasick"}" deps) + (features_.memchr."${deps."regex"."1.0.0"."memchr"}" deps) + (features_.regex_syntax."${deps."regex"."1.0.0"."regex_syntax"}" deps) + (features_.thread_local."${deps."regex"."1.0.0"."thread_local"}" deps) + (features_.utf8_ranges."${deps."regex"."1.0.0"."utf8_ranges"}" deps) + ]; + + +# end +# regex-syntax-0.5.6 + + crates.regex_syntax."0.5.6" = deps: { features?(features_.regex_syntax."0.5.6" deps {}) }: buildRustCrate { + crateName = "regex-syntax"; + version = "0.5.6"; + description = "A regular expression parser."; + authors = [ "The Rust Project Developers" ]; + sha256 = "10vf3r34bgjnbrnqd5aszn35bjvm8insw498l1vjy8zx5yms3427"; + dependencies = mapFeatures features ([ + (crates."ucd_util"."${deps."regex_syntax"."0.5.6"."ucd_util"}" deps) + ]); + }; + features_.regex_syntax."0.5.6" = deps: f: updateFeatures f (rec { + regex_syntax."0.5.6".default = (f.regex_syntax."0.5.6".default or true); + ucd_util."${deps.regex_syntax."0.5.6".ucd_util}".default = true; + }) [ + (features_.ucd_util."${deps."regex_syntax"."0.5.6"."ucd_util"}" deps) + ]; + + +# end +# regex-syntax-0.6.0 + + crates.regex_syntax."0.6.0" = deps: { features?(features_.regex_syntax."0.6.0" deps {}) }: buildRustCrate { + crateName = "regex-syntax"; + version = "0.6.0"; + description = "A regular expression parser."; + authors = [ "The Rust Project Developers" ]; + sha256 = "1zlaq3y1zbiqilxbh0471bizcs4p14b58nqr815w3ssyam169cy6"; + dependencies = mapFeatures features ([ + (crates."ucd_util"."${deps."regex_syntax"."0.6.0"."ucd_util"}" deps) + ]); + }; + features_.regex_syntax."0.6.0" = deps: f: updateFeatures f (rec { + regex_syntax."0.6.0".default = (f.regex_syntax."0.6.0".default or true); + ucd_util."${deps.regex_syntax."0.6.0".ucd_util}".default = true; + }) [ + (features_.ucd_util."${deps."regex_syntax"."0.6.0"."ucd_util"}" deps) + ]; + + +# end +# rustc-demangle-0.1.8 + + crates.rustc_demangle."0.1.8" = deps: { features?(features_.rustc_demangle."0.1.8" deps {}) }: buildRustCrate { + crateName = "rustc-demangle"; + version = "0.1.8"; + description = "Rust compiler symbol demangling.\n"; + authors = [ "Alex Crichton " ]; + sha256 = "0xn5l86qfwngmdsjbglj30wh37zplvch96jl9raysl3k06gkkv3c"; + }; + features_.rustc_demangle."0.1.8" = deps: f: updateFeatures f (rec { + rustc_demangle."0.1.8".default = (f.rustc_demangle."0.1.8".default or true); + }) []; + + +# end +# smallvec-0.6.1 + + crates.smallvec."0.6.1" = deps: { features?(features_.smallvec."0.6.1" deps {}) }: buildRustCrate { + crateName = "smallvec"; + version = "0.6.1"; + description = "'Small vector' optimization: store up to a small number of items on the stack"; + authors = [ "Simon Sapin " ]; + sha256 = "16m07xh67xcdpwjkbzbv9d7visxmz4fb4a8jfcrsrf333w7vkl1g"; + libPath = "lib.rs"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."smallvec"."0.6.1" or {}); + }; + features_.smallvec."0.6.1" = deps: f: updateFeatures f (rec { + smallvec = fold recursiveUpdate {} [ + { "0.6.1"."std" = + (f.smallvec."0.6.1"."std" or false) || + (f.smallvec."0.6.1".default or false) || + (smallvec."0.6.1"."default" or false); } + { "0.6.1".default = (f.smallvec."0.6.1".default or true); } + ]; + }) []; + + +# end +# socket2-0.3.5 + + crates.socket2."0.3.5" = deps: { features?(features_.socket2."0.3.5" deps {}) }: buildRustCrate { + crateName = "socket2"; + version = "0.3.5"; + description = "Utilities for handling networking sockets with a maximal amount of configuration\npossible intended.\n"; + authors = [ "Alex Crichton " ]; + sha256 = "0bi6z6qvra16rwm3lk7xz4aakvcmmak6fpdmra1v7ccp40bss0kf"; + dependencies = (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + (crates."cfg_if"."${deps."socket2"."0.3.5"."cfg_if"}" deps) + (crates."libc"."${deps."socket2"."0.3.5"."libc"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."winapi"."${deps."socket2"."0.3.5"."winapi"}" deps) + ]) else []); + features = mkFeatures (features."socket2"."0.3.5" or {}); + }; + features_.socket2."0.3.5" = deps: f: updateFeatures f (rec { + cfg_if."${deps.socket2."0.3.5".cfg_if}".default = true; + libc."${deps.socket2."0.3.5".libc}".default = true; + socket2."0.3.5".default = (f.socket2."0.3.5".default or true); + winapi = fold recursiveUpdate {} [ + { "${deps.socket2."0.3.5".winapi}"."handleapi" = true; } + { "${deps.socket2."0.3.5".winapi}"."minwindef" = true; } + { "${deps.socket2."0.3.5".winapi}"."ws2def" = true; } + { "${deps.socket2."0.3.5".winapi}"."ws2ipdef" = true; } + { "${deps.socket2."0.3.5".winapi}"."ws2tcpip" = true; } + { "${deps.socket2."0.3.5".winapi}".default = true; } + ]; + }) [ + (features_.cfg_if."${deps."socket2"."0.3.5"."cfg_if"}" deps) + (features_.libc."${deps."socket2"."0.3.5"."libc"}" deps) + (features_.winapi."${deps."socket2"."0.3.5"."winapi"}" deps) + ]; + + +# end +# stable_deref_trait-1.0.0 + + crates.stable_deref_trait."1.0.0" = deps: { features?(features_.stable_deref_trait."1.0.0" deps {}) }: buildRustCrate { + crateName = "stable_deref_trait"; + version = "1.0.0"; + description = "An unsafe marker trait for types like Box and Rc that dereference to a stable address even when moved, and hence can be used with libraries such as owning_ref and rental.\n"; + authors = [ "Robert Grosse " ]; + sha256 = "0ya5fms9qdwkd52d3a111w4vcz18j4rbfx4p88z44116cqd6cczr"; + features = mkFeatures (features."stable_deref_trait"."1.0.0" or {}); + }; + features_.stable_deref_trait."1.0.0" = deps: f: updateFeatures f (rec { + stable_deref_trait = fold recursiveUpdate {} [ + { "1.0.0"."std" = + (f.stable_deref_trait."1.0.0"."std" or false) || + (f.stable_deref_trait."1.0.0".default or false) || + (stable_deref_trait."1.0.0"."default" or false); } + { "1.0.0".default = (f.stable_deref_trait."1.0.0".default or true); } + ]; + }) []; + + +# end +# strsim-0.7.0 + + crates.strsim."0.7.0" = deps: { features?(features_.strsim."0.7.0" deps {}) }: buildRustCrate { + crateName = "strsim"; + version = "0.7.0"; + description = "Implementations of string similarity metrics.\nIncludes Hamming, Levenshtein, OSA, Damerau-Levenshtein, Jaro, and Jaro-Winkler.\n"; + authors = [ "Danny Guo " ]; + sha256 = "0fy0k5f2705z73mb3x9459bpcvrx4ky8jpr4zikcbiwan4bnm0iv"; + }; + features_.strsim."0.7.0" = deps: f: updateFeatures f (rec { + strsim."0.7.0".default = (f.strsim."0.7.0".default or true); + }) []; + + +# end +# syn-0.11.11 + + crates.syn."0.11.11" = deps: { features?(features_.syn."0.11.11" deps {}) }: buildRustCrate { + crateName = "syn"; + version = "0.11.11"; + description = "Nom parser for Rust source code"; + authors = [ "David Tolnay " ]; + sha256 = "0yw8ng7x1dn5a6ykg0ib49y7r9nhzgpiq2989rqdp7rdz3n85502"; + dependencies = mapFeatures features ([ + ] + ++ (if features.syn."0.11.11".quote or false then [ (crates.quote."${deps."syn"."0.11.11".quote}" deps) ] else []) + ++ (if features.syn."0.11.11".synom or false then [ (crates.synom."${deps."syn"."0.11.11".synom}" deps) ] else []) + ++ (if features.syn."0.11.11".unicode-xid or false then [ (crates.unicode_xid."${deps."syn"."0.11.11".unicode_xid}" deps) ] else [])); + features = mkFeatures (features."syn"."0.11.11" or {}); + }; + features_.syn."0.11.11" = deps: f: updateFeatures f (rec { + quote."${deps.syn."0.11.11".quote}".default = true; + syn = fold recursiveUpdate {} [ + { "0.11.11"."parsing" = + (f.syn."0.11.11"."parsing" or false) || + (f.syn."0.11.11".default or false) || + (syn."0.11.11"."default" or false); } + { "0.11.11"."printing" = + (f.syn."0.11.11"."printing" or false) || + (f.syn."0.11.11".default or false) || + (syn."0.11.11"."default" or false); } + { "0.11.11"."quote" = + (f.syn."0.11.11"."quote" or false) || + (f.syn."0.11.11".printing or false) || + (syn."0.11.11"."printing" or false); } + { "0.11.11"."synom" = + (f.syn."0.11.11"."synom" or false) || + (f.syn."0.11.11".parsing or false) || + (syn."0.11.11"."parsing" or false); } + { "0.11.11"."unicode-xid" = + (f.syn."0.11.11"."unicode-xid" or false) || + (f.syn."0.11.11".parsing or false) || + (syn."0.11.11"."parsing" or false); } + { "0.11.11".default = (f.syn."0.11.11".default or true); } + ]; + synom."${deps.syn."0.11.11".synom}".default = true; + unicode_xid."${deps.syn."0.11.11".unicode_xid}".default = true; + }) [ + (features_.quote."${deps."syn"."0.11.11"."quote"}" deps) + (features_.synom."${deps."syn"."0.11.11"."synom"}" deps) + (features_.unicode_xid."${deps."syn"."0.11.11"."unicode_xid"}" deps) + ]; + + +# end +# synom-0.11.3 + + crates.synom."0.11.3" = deps: { features?(features_.synom."0.11.3" deps {}) }: buildRustCrate { + crateName = "synom"; + version = "0.11.3"; + description = "Stripped-down Nom parser used by Syn"; + authors = [ "David Tolnay " ]; + sha256 = "1l6d1s9qjfp6ng2s2z8219igvlv7gyk8gby97sdykqc1r93d8rhc"; + dependencies = mapFeatures features ([ + (crates."unicode_xid"."${deps."synom"."0.11.3"."unicode_xid"}" deps) + ]); + }; + features_.synom."0.11.3" = deps: f: updateFeatures f (rec { + synom."0.11.3".default = (f.synom."0.11.3".default or true); + unicode_xid."${deps.synom."0.11.3".unicode_xid}".default = true; + }) [ + (features_.unicode_xid."${deps."synom"."0.11.3"."unicode_xid"}" deps) + ]; + + +# end +# synstructure-0.6.1 + + crates.synstructure."0.6.1" = deps: { features?(features_.synstructure."0.6.1" deps {}) }: buildRustCrate { + crateName = "synstructure"; + version = "0.6.1"; + description = "expand_substructure-like helpers for syn macros 1.1 derive macros"; + authors = [ "Michael Layzell " ]; + sha256 = "1xnyw58va9zcqi4vvpnmpllacdj2a0mvy0cbd698izmr4qs92xlk"; + dependencies = mapFeatures features ([ + (crates."quote"."${deps."synstructure"."0.6.1"."quote"}" deps) + (crates."syn"."${deps."synstructure"."0.6.1"."syn"}" deps) + ]); + features = mkFeatures (features."synstructure"."0.6.1" or {}); + }; + features_.synstructure."0.6.1" = deps: f: updateFeatures f (rec { + quote."${deps.synstructure."0.6.1".quote}".default = true; + syn = fold recursiveUpdate {} [ + { "${deps.synstructure."0.6.1".syn}"."visit" = true; } + { "${deps.synstructure."0.6.1".syn}".default = true; } + ]; + synstructure."0.6.1".default = (f.synstructure."0.6.1".default or true); + }) [ + (features_.quote."${deps."synstructure"."0.6.1"."quote"}" deps) + (features_.syn."${deps."synstructure"."0.6.1"."syn"}" deps) + ]; + + +# end +# systemfd-0.3.0 + + crates.systemfd."0.3.0" = deps: { features?(features_.systemfd."0.3.0" deps {}) }: buildRustCrate { + crateName = "systemfd"; + version = "0.3.0"; + description = "A convenient helper for passing sockets into another process. Best to be combined with listenfd and cargo-watch."; + authors = [ "Armin Ronacher " ]; + sha256 = "0dpckgb0afyzhbv8lccgzmw5yczpfcdsdlqsfncn1vcxvcf0yb5i"; + dependencies = mapFeatures features ([ + (crates."clap"."${deps."systemfd"."0.3.0"."clap"}" deps) + (crates."console"."${deps."systemfd"."0.3.0"."console"}" deps) + (crates."failure"."${deps."systemfd"."0.3.0"."failure"}" deps) + (crates."failure_derive"."${deps."systemfd"."0.3.0"."failure_derive"}" deps) + (crates."lazy_static"."${deps."systemfd"."0.3.0"."lazy_static"}" deps) + (crates."libc"."${deps."systemfd"."0.3.0"."libc"}" deps) + (crates."regex"."${deps."systemfd"."0.3.0"."regex"}" deps) + ]) + ++ (if (kernel == "linux" || kernel == "darwin") then mapFeatures features ([ + (crates."nix"."${deps."systemfd"."0.3.0"."nix"}" deps) + ]) else []) + ++ (if kernel == "windows" then mapFeatures features ([ + (crates."socket2"."${deps."systemfd"."0.3.0"."socket2"}" deps) + (crates."uuid"."${deps."systemfd"."0.3.0"."uuid"}" deps) + (crates."winapi"."${deps."systemfd"."0.3.0"."winapi"}" deps) + ]) else []); + }; + features_.systemfd."0.3.0" = deps: f: updateFeatures f (rec { + clap."${deps.systemfd."0.3.0".clap}".default = true; + console."${deps.systemfd."0.3.0".console}".default = true; + failure."${deps.systemfd."0.3.0".failure}".default = true; + failure_derive."${deps.systemfd."0.3.0".failure_derive}".default = true; + lazy_static."${deps.systemfd."0.3.0".lazy_static}".default = true; + libc."${deps.systemfd."0.3.0".libc}".default = true; + nix."${deps.systemfd."0.3.0".nix}".default = true; + regex."${deps.systemfd."0.3.0".regex}".default = true; + socket2."${deps.systemfd."0.3.0".socket2}".default = true; + systemfd."0.3.0".default = (f.systemfd."0.3.0".default or true); + uuid = fold recursiveUpdate {} [ + { "${deps.systemfd."0.3.0".uuid}"."v4" = true; } + { "${deps.systemfd."0.3.0".uuid}".default = true; } + ]; + winapi = fold recursiveUpdate {} [ + { "${deps.systemfd."0.3.0".winapi}"."winsock2" = true; } + { "${deps.systemfd."0.3.0".winapi}".default = true; } + ]; + }) [ + (features_.clap."${deps."systemfd"."0.3.0"."clap"}" deps) + (features_.console."${deps."systemfd"."0.3.0"."console"}" deps) + (features_.failure."${deps."systemfd"."0.3.0"."failure"}" deps) + (features_.failure_derive."${deps."systemfd"."0.3.0"."failure_derive"}" deps) + (features_.lazy_static."${deps."systemfd"."0.3.0"."lazy_static"}" deps) + (features_.libc."${deps."systemfd"."0.3.0"."libc"}" deps) + (features_.regex."${deps."systemfd"."0.3.0"."regex"}" deps) + (features_.nix."${deps."systemfd"."0.3.0"."nix"}" deps) + (features_.socket2."${deps."systemfd"."0.3.0"."socket2"}" deps) + (features_.uuid."${deps."systemfd"."0.3.0"."uuid"}" deps) + (features_.winapi."${deps."systemfd"."0.3.0"."winapi"}" deps) + ]; + + +# end +# termion-1.5.1 + + crates.termion."1.5.1" = deps: { features?(features_.termion."1.5.1" deps {}) }: buildRustCrate { + crateName = "termion"; + version = "1.5.1"; + description = "A bindless library for manipulating terminals."; + authors = [ "ticki " "gycos " "IGI-111 " ]; + sha256 = "02gq4vd8iws1f3gjrgrgpajsk2bk43nds5acbbb4s8dvrdvr8nf1"; + dependencies = (if !(kernel == "redox") then mapFeatures features ([ + (crates."libc"."${deps."termion"."1.5.1"."libc"}" deps) + ]) else []) + ++ (if kernel == "redox" then mapFeatures features ([ + (crates."redox_syscall"."${deps."termion"."1.5.1"."redox_syscall"}" deps) + (crates."redox_termios"."${deps."termion"."1.5.1"."redox_termios"}" deps) + ]) else []); + }; + features_.termion."1.5.1" = deps: f: updateFeatures f (rec { + libc."${deps.termion."1.5.1".libc}".default = true; + redox_syscall."${deps.termion."1.5.1".redox_syscall}".default = true; + redox_termios."${deps.termion."1.5.1".redox_termios}".default = true; + termion."1.5.1".default = (f.termion."1.5.1".default or true); + }) [ + (features_.libc."${deps."termion"."1.5.1"."libc"}" deps) + (features_.redox_syscall."${deps."termion"."1.5.1"."redox_syscall"}" deps) + (features_.redox_termios."${deps."termion"."1.5.1"."redox_termios"}" deps) + ]; + + +# end +# termios-0.2.2 + + crates.termios."0.2.2" = deps: { features?(features_.termios."0.2.2" deps {}) }: buildRustCrate { + crateName = "termios"; + version = "0.2.2"; + description = "Safe bindings for the termios library."; + authors = [ "David Cuddeback " ]; + sha256 = "0hjy4idvcapx9i6qbhf5536aqnf6rqk2aaj424sfwy7qhv6xmcx3"; + dependencies = mapFeatures features ([ + (crates."libc"."${deps."termios"."0.2.2"."libc"}" deps) + ]); + }; + features_.termios."0.2.2" = deps: f: updateFeatures f (rec { + libc."${deps.termios."0.2.2".libc}".default = true; + termios."0.2.2".default = (f.termios."0.2.2".default or true); + }) [ + (features_.libc."${deps."termios"."0.2.2"."libc"}" deps) + ]; + + +# end +# textwrap-0.9.0 + + crates.textwrap."0.9.0" = deps: { features?(features_.textwrap."0.9.0" deps {}) }: buildRustCrate { + crateName = "textwrap"; + version = "0.9.0"; + description = "Textwrap is a small library for word wrapping, indenting, and\ndedenting strings.\n\nYou can use it to format strings (such as help and error messages) for\ndisplay in commandline applications. It is designed to be efficient\nand handle Unicode characters correctly.\n"; + authors = [ "Martin Geisler " ]; + sha256 = "18jg79ndjlwndz01mlbh82kkr2arqm658yn5kwp65l5n1hz8w4yb"; + dependencies = mapFeatures features ([ + (crates."unicode_width"."${deps."textwrap"."0.9.0"."unicode_width"}" deps) + ]); + }; + features_.textwrap."0.9.0" = deps: f: updateFeatures f (rec { + textwrap."0.9.0".default = (f.textwrap."0.9.0".default or true); + unicode_width."${deps.textwrap."0.9.0".unicode_width}".default = true; + }) [ + (features_.unicode_width."${deps."textwrap"."0.9.0"."unicode_width"}" deps) + ]; + + +# end +# thread_local-0.3.5 + + crates.thread_local."0.3.5" = deps: { features?(features_.thread_local."0.3.5" deps {}) }: buildRustCrate { + crateName = "thread_local"; + version = "0.3.5"; + description = "Per-object thread-local storage"; + authors = [ "Amanieu d'Antras " ]; + sha256 = "0mkp0sp91aqsk7brgygai4igv751r1754rsxn37mig3ag5rx8np6"; + dependencies = mapFeatures features ([ + (crates."lazy_static"."${deps."thread_local"."0.3.5"."lazy_static"}" deps) + (crates."unreachable"."${deps."thread_local"."0.3.5"."unreachable"}" deps) + ]); + }; + features_.thread_local."0.3.5" = deps: f: updateFeatures f (rec { + lazy_static."${deps.thread_local."0.3.5".lazy_static}".default = true; + thread_local."0.3.5".default = (f.thread_local."0.3.5".default or true); + unreachable."${deps.thread_local."0.3.5".unreachable}".default = true; + }) [ + (features_.lazy_static."${deps."thread_local"."0.3.5"."lazy_static"}" deps) + (features_.unreachable."${deps."thread_local"."0.3.5"."unreachable"}" deps) + ]; + + +# end +# ucd-util-0.1.1 + + crates.ucd_util."0.1.1" = deps: { features?(features_.ucd_util."0.1.1" deps {}) }: buildRustCrate { + crateName = "ucd-util"; + version = "0.1.1"; + description = "A small utility library for working with the Unicode character database.\n"; + authors = [ "Andrew Gallant " ]; + sha256 = "02a8h3siipx52b832xc8m8rwasj6nx9jpiwfldw8hp6k205hgkn0"; + }; + features_.ucd_util."0.1.1" = deps: f: updateFeatures f (rec { + ucd_util."0.1.1".default = (f.ucd_util."0.1.1".default or true); + }) []; + + +# end +# unicode-width-0.1.4 + + crates.unicode_width."0.1.4" = deps: { features?(features_.unicode_width."0.1.4" deps {}) }: buildRustCrate { + crateName = "unicode-width"; + version = "0.1.4"; + description = "Determine displayed width of `char` and `str` types\naccording to Unicode Standard Annex #11 rules.\n"; + authors = [ "kwantam " ]; + sha256 = "1rp7a04icn9y5c0lm74nrd4py0rdl0af8bhdwq7g478n1xifpifl"; + features = mkFeatures (features."unicode_width"."0.1.4" or {}); + }; + features_.unicode_width."0.1.4" = deps: f: updateFeatures f (rec { + unicode_width."0.1.4".default = (f.unicode_width."0.1.4".default or true); + }) []; + + +# end +# unicode-xid-0.0.4 + + crates.unicode_xid."0.0.4" = deps: { features?(features_.unicode_xid."0.0.4" deps {}) }: buildRustCrate { + crateName = "unicode-xid"; + version = "0.0.4"; + description = "Determine whether characters have the XID_Start\nor XID_Continue properties according to\nUnicode Standard Annex #31.\n"; + authors = [ "erick.tryzelaar " "kwantam " ]; + sha256 = "1dc8wkkcd3s6534s5aw4lbjn8m67flkkbnajp5bl8408wdg8rh9v"; + features = mkFeatures (features."unicode_xid"."0.0.4" or {}); + }; + features_.unicode_xid."0.0.4" = deps: f: updateFeatures f (rec { + unicode_xid."0.0.4".default = (f.unicode_xid."0.0.4".default or true); + }) []; + + +# end +# unreachable-1.0.0 + + crates.unreachable."1.0.0" = deps: { features?(features_.unreachable."1.0.0" deps {}) }: buildRustCrate { + crateName = "unreachable"; + version = "1.0.0"; + description = "An unreachable code optimization hint in stable rust."; + authors = [ "Jonathan Reem " ]; + sha256 = "1am8czbk5wwr25gbp2zr007744fxjshhdqjz9liz7wl4pnv3whcf"; + dependencies = mapFeatures features ([ + (crates."void"."${deps."unreachable"."1.0.0"."void"}" deps) + ]); + }; + features_.unreachable."1.0.0" = deps: f: updateFeatures f (rec { + unreachable."1.0.0".default = (f.unreachable."1.0.0".default or true); + void."${deps.unreachable."1.0.0".void}".default = (f.void."${deps.unreachable."1.0.0".void}".default or false); + }) [ + (features_.void."${deps."unreachable"."1.0.0"."void"}" deps) + ]; + + +# end +# utf8-ranges-1.0.0 + + crates.utf8_ranges."1.0.0" = deps: { features?(features_.utf8_ranges."1.0.0" deps {}) }: buildRustCrate { + crateName = "utf8-ranges"; + version = "1.0.0"; + description = "Convert ranges of Unicode codepoints to UTF-8 byte ranges."; + authors = [ "Andrew Gallant " ]; + sha256 = "0rzmqprwjv9yp1n0qqgahgm24872x6c0xddfym5pfndy7a36vkn0"; + }; + features_.utf8_ranges."1.0.0" = deps: f: updateFeatures f (rec { + utf8_ranges."1.0.0".default = (f.utf8_ranges."1.0.0".default or true); + }) []; + + +# end +# uuid-0.6.3 + + crates.uuid."0.6.3" = deps: { features?(features_.uuid."0.6.3" deps {}) }: buildRustCrate { + crateName = "uuid"; + version = "0.6.3"; + description = "A library to generate and parse UUIDs.\n"; + authors = [ "Ashley Mannix" "Christopher Armstrong" "Dylan DPC" "Hunar Roop Kahlon" ]; + sha256 = "1kjp5xglhab4saaikn95zn3mr4zja7484pv307cb5bxm2sawb8p6"; + dependencies = mapFeatures features ([ + (crates."cfg_if"."${deps."uuid"."0.6.3"."cfg_if"}" deps) + ] + ++ (if features.uuid."0.6.3".rand or false then [ (crates.rand."${deps."uuid"."0.6.3".rand}" deps) ] else [])); + features = mkFeatures (features."uuid"."0.6.3" or {}); + }; + features_.uuid."0.6.3" = deps: f: updateFeatures f (rec { + cfg_if."${deps.uuid."0.6.3".cfg_if}".default = true; + rand."${deps.uuid."0.6.3".rand}".default = true; + uuid = fold recursiveUpdate {} [ + { "0.6.3"."md5" = + (f.uuid."0.6.3"."md5" or false) || + (f.uuid."0.6.3".v3 or false) || + (uuid."0.6.3"."v3" or false); } + { "0.6.3"."rand" = + (f.uuid."0.6.3"."rand" or false) || + (f.uuid."0.6.3".v3 or false) || + (uuid."0.6.3"."v3" or false) || + (f.uuid."0.6.3".v4 or false) || + (uuid."0.6.3"."v4" or false) || + (f.uuid."0.6.3".v5 or false) || + (uuid."0.6.3"."v5" or false); } + { "0.6.3"."serde" = + (f.uuid."0.6.3"."serde" or false) || + (f.uuid."0.6.3".playground or false) || + (uuid."0.6.3"."playground" or false); } + { "0.6.3"."sha1" = + (f.uuid."0.6.3"."sha1" or false) || + (f.uuid."0.6.3".v5 or false) || + (uuid."0.6.3"."v5" or false); } + { "0.6.3"."std" = + (f.uuid."0.6.3"."std" or false) || + (f.uuid."0.6.3".default or false) || + (uuid."0.6.3"."default" or false) || + (f.uuid."0.6.3".use_std or false) || + (uuid."0.6.3"."use_std" or false); } + { "0.6.3"."v1" = + (f.uuid."0.6.3"."v1" or false) || + (f.uuid."0.6.3".playground or false) || + (uuid."0.6.3"."playground" or false); } + { "0.6.3"."v3" = + (f.uuid."0.6.3"."v3" or false) || + (f.uuid."0.6.3".playground or false) || + (uuid."0.6.3"."playground" or false); } + { "0.6.3"."v4" = + (f.uuid."0.6.3"."v4" or false) || + (f.uuid."0.6.3".playground or false) || + (uuid."0.6.3"."playground" or false); } + { "0.6.3"."v5" = + (f.uuid."0.6.3"."v5" or false) || + (f.uuid."0.6.3".playground or false) || + (uuid."0.6.3"."playground" or false); } + { "0.6.3".default = (f.uuid."0.6.3".default or true); } + ]; + }) [ + (features_.cfg_if."${deps."uuid"."0.6.3"."cfg_if"}" deps) + (features_.rand."${deps."uuid"."0.6.3"."rand"}" deps) + ]; + + +# end +# vec_map-0.8.1 + + crates.vec_map."0.8.1" = deps: { features?(features_.vec_map."0.8.1" deps {}) }: buildRustCrate { + crateName = "vec_map"; + version = "0.8.1"; + description = "A simple map based on a vector for small integer keys"; + authors = [ "Alex Crichton " "Jorge Aparicio " "Alexis Beingessner " "Brian Anderson <>" "tbu- <>" "Manish Goregaokar <>" "Aaron Turon " "Adolfo Ochagavía <>" "Niko Matsakis <>" "Steven Fackler <>" "Chase Southwood " "Eduard Burtescu <>" "Florian Wilkens <>" "Félix Raimundo <>" "Tibor Benke <>" "Markus Siemens " "Josh Branchaud " "Huon Wilson " "Corey Farwell " "Aaron Liblong <>" "Nick Cameron " "Patrick Walton " "Felix S Klock II <>" "Andrew Paseltiner " "Sean McArthur " "Vadim Petrochenkov <>" ]; + sha256 = "1jj2nrg8h3l53d43rwkpkikq5a5x15ms4rf1rw92hp5lrqhi8mpi"; + dependencies = mapFeatures features ([ +]); + features = mkFeatures (features."vec_map"."0.8.1" or {}); + }; + features_.vec_map."0.8.1" = deps: f: updateFeatures f (rec { + vec_map = fold recursiveUpdate {} [ + { "0.8.1"."serde" = + (f.vec_map."0.8.1"."serde" or false) || + (f.vec_map."0.8.1".eders or false) || + (vec_map."0.8.1"."eders" or false); } + { "0.8.1".default = (f.vec_map."0.8.1".default or true); } + ]; + }) []; + + +# end +# void-1.0.2 + + crates.void."1.0.2" = deps: { features?(features_.void."1.0.2" deps {}) }: buildRustCrate { + crateName = "void"; + version = "1.0.2"; + description = "The uninhabited void type for use in statically impossible cases."; + authors = [ "Jonathan Reem " ]; + sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3"; + features = mkFeatures (features."void"."1.0.2" or {}); + }; + features_.void."1.0.2" = deps: f: updateFeatures f (rec { + void = fold recursiveUpdate {} [ + { "1.0.2"."std" = + (f.void."1.0.2"."std" or false) || + (f.void."1.0.2".default or false) || + (void."1.0.2"."default" or false); } + { "1.0.2".default = (f.void."1.0.2".default or true); } + ]; + }) []; + + +# end +# winapi-0.2.8 + + crates.winapi."0.2.8" = deps: { features?(features_.winapi."0.2.8" deps {}) }: buildRustCrate { + crateName = "winapi"; + version = "0.2.8"; + description = "Types and constants for WinAPI bindings. See README for list of crates providing function bindings."; + authors = [ "Peter Atashian " ]; + sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as"; + }; + features_.winapi."0.2.8" = deps: f: updateFeatures f (rec { + winapi."0.2.8".default = (f.winapi."0.2.8".default or true); + }) []; + + +# end +# winapi-0.3.4 + + crates.winapi."0.3.4" = deps: { features?(features_.winapi."0.3.4" deps {}) }: buildRustCrate { + crateName = "winapi"; + version = "0.3.4"; + description = "Raw FFI bindings for all of Windows API."; + authors = [ "Peter Atashian " ]; + sha256 = "1qbrf5dcnd8j36cawby5d9r5vx07r0l4ryf672pfncnp8895k9lx"; + build = "build.rs"; + dependencies = (if kernel == "i686-pc-windows-gnu" then mapFeatures features ([ + (crates."winapi_i686_pc_windows_gnu"."${deps."winapi"."0.3.4"."winapi_i686_pc_windows_gnu"}" deps) + ]) else []) + ++ (if kernel == "x86_64-pc-windows-gnu" then mapFeatures features ([ + (crates."winapi_x86_64_pc_windows_gnu"."${deps."winapi"."0.3.4"."winapi_x86_64_pc_windows_gnu"}" deps) + ]) else []); + features = mkFeatures (features."winapi"."0.3.4" or {}); + }; + features_.winapi."0.3.4" = deps: f: updateFeatures f (rec { + winapi."0.3.4".default = (f.winapi."0.3.4".default or true); + winapi_i686_pc_windows_gnu."${deps.winapi."0.3.4".winapi_i686_pc_windows_gnu}".default = true; + winapi_x86_64_pc_windows_gnu."${deps.winapi."0.3.4".winapi_x86_64_pc_windows_gnu}".default = true; + }) [ + (features_.winapi_i686_pc_windows_gnu."${deps."winapi"."0.3.4"."winapi_i686_pc_windows_gnu"}" deps) + (features_.winapi_x86_64_pc_windows_gnu."${deps."winapi"."0.3.4"."winapi_x86_64_pc_windows_gnu"}" deps) + ]; + + +# end +# winapi-build-0.1.1 + + crates.winapi_build."0.1.1" = deps: { features?(features_.winapi_build."0.1.1" deps {}) }: buildRustCrate { + crateName = "winapi-build"; + version = "0.1.1"; + description = "Common code for build.rs in WinAPI -sys crates."; + authors = [ "Peter Atashian " ]; + sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga"; + libName = "build"; + }; + features_.winapi_build."0.1.1" = deps: f: updateFeatures f (rec { + winapi_build."0.1.1".default = (f.winapi_build."0.1.1".default or true); + }) []; + + +# end +# winapi-i686-pc-windows-gnu-0.4.0 + + crates.winapi_i686_pc_windows_gnu."0.4.0" = deps: { features?(features_.winapi_i686_pc_windows_gnu."0.4.0" deps {}) }: buildRustCrate { + crateName = "winapi-i686-pc-windows-gnu"; + version = "0.4.0"; + description = "Import libraries for the i686-pc-windows-gnu target. Please don't use this crate directly, depend on winapi instead."; + authors = [ "Peter Atashian " ]; + sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp"; + build = "build.rs"; + }; + features_.winapi_i686_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec { + winapi_i686_pc_windows_gnu."0.4.0".default = (f.winapi_i686_pc_windows_gnu."0.4.0".default or true); + }) []; + + +# 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 { + crateName = "winapi-x86_64-pc-windows-gnu"; + version = "0.4.0"; + description = "Import libraries for the x86_64-pc-windows-gnu target. Please don't use this crate directly, depend on winapi instead."; + authors = [ "Peter Atashian " ]; + sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj"; + build = "build.rs"; + }; + features_.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: f: updateFeatures f (rec { + winapi_x86_64_pc_windows_gnu."0.4.0".default = (f.winapi_x86_64_pc_windows_gnu."0.4.0".default or true); + }) []; + + +# end +} diff --git a/pkgs/development/tools/systemfd/default.nix b/pkgs/development/tools/systemfd/default.nix new file mode 100644 index 00000000000..a0037050b65 --- /dev/null +++ b/pkgs/development/tools/systemfd/default.nix @@ -0,0 +1,18 @@ +{ stdenv, lib, fetchgit, darwin, buildPlatform +, buildRustCrate, buildRustCrateHelpers, defaultCrateOverrides }: + +((import ./Cargo.nix { + inherit lib buildPlatform buildRustCrate buildRustCrateHelpers fetchgit; + cratesIO = import ./crates-io.nix { inherit lib buildRustCrate buildRustCrateHelpers; }; +}).systemfd {}).override { + crateOverrides = defaultCrateOverrides // { + systemfd = attrs: { + meta = { + description = "A convenient helper for passing sockets into another process."; + homepage = "https://github.com/mitsuhiko/systemfd"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.adisbladis ]; + }; + }; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7b711d5277..19dab687d04 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10826,6 +10826,8 @@ in swiftformat = callPackage ../development/tools/swiftformat { }; + systemfd = callPackage ../development/tools/systemfd { }; + swig1 = callPackage ../development/tools/misc/swig { }; swig2 = callPackage ../development/tools/misc/swig/2.x.nix { }; swig3 = callPackage ../development/tools/misc/swig/3.x.nix { }; -- cgit v1.2.3 From 90326ba624ddfbd3b7f9eb3995994644cee804fb Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 26 Mar 2020 20:03:02 -0400 Subject: lapack: enable shared libraries, cblas, and tests --- .../libraries/science/math/liblapack/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index 53389935dda..d26bfbb3e6e 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -4,7 +4,7 @@ gfortran, cmake, python2, - shared ? false + shared ? true }: let inherit (stdenv.lib) optional; @@ -22,16 +22,16 @@ stdenv.mkDerivation { sha256 = "0sxnc97z67i7phdmcnq8f8lmxgw10wdwvr8ami0w3pb179cgrbpb"; }; - buildInputs = [ gfortran ]; - nativeBuildInputs = [ python2 cmake ]; + nativeBuildInputs = [ gfortran python2 cmake ]; cmakeFlags = [ "-DCMAKE_Fortran_FLAGS=-fPIC" "-DLAPACKE=ON" + "-DCBLAS=ON" ] - ++ (optional shared "-DBUILD_SHARED_LIBS=ON"); + ++ optional shared "-DBUILD_SHARED_LIBS=ON"; - doCheck = ! shared; + doCheck = true; enableParallelBuilding = true; @@ -42,4 +42,7 @@ stdenv.mkDerivation { license = licenses.bsd3; platforms = platforms.all; }; + + passthru.libblasName = "libblas"; + passthru.libcblasName = "libcblas"; } -- cgit v1.2.3 From 43873351ffed36b52170571839e26b57c9f15920 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 27 Mar 2020 14:50:45 -0400 Subject: =?UTF-8?q?blas/lapack:=20add=20wrapper=20for=20=E2=80=9Calternati?= =?UTF-8?q?ve=E2=80=9Ds=20of=20BLAS/LAPACK=20provider?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is based on previous work for switching between BLAS and LAPACK implementation in Debian[1] and Gentoo[2]. The goal is to have one way to depend on the BLAS/LAPACK libraries that all packages must use. The attrs “blas” and “lapack” are used to represent a wrapped BLAS/LAPACK provider. Derivations that don’t care how BLAS and LAPACK are implemented can just use blas and lapack directly. If you do care what you get (perhaps for some CPP), you should verify that blas and lapack match what you expect with an assertion. The “blas” package collides with the old “blas” reference implementation. This has been renamed to “blas-reference”. In addition, “lapack-reference” is also included, corresponding to “liblapack” from Netlib.org. Currently, there are 3 providers of the BLAS and LAPACK interfaces: - lapack-reference: the BLAS/LAPACK implementation maintained by netlib.org - OpenBLAS: an optimized version of BLAS and LAPACK - MKL: Intel’s unfree but highly optimized BLAS/LAPACK implementation By default, the above implementations all use the “LP64” BLAS and LAPACK ABI. This corresponds to “openblasCompat” and is the safest way to use BLAS/LAPACK. You may received some benefits from “ILP64” or 8-byte integer BLAS at the expense of breaking compatibility with some packages. This can be switched at build time with an override like: import { config.allowUnfree = true; overlays = [(self: super: { lapack = super.lapack.override { lapackProvider = super.lapack-reference; }; blas = super.blas.override { blasProvider = super.lapack-reference; }; })]; } or, switched at runtime via LD_LIBRARY_PATH like: $ LD_LIBRARY_PATH=$(nix-build -E '(with import {}).lapack.override { lapackProvider = pkgs.mkl; is64bit = true; })')/lib:$(nix-build -E '(with import {}).blas.override { blasProvider = pkgs.mkl; is64bit = true; })')/lib ./your-blas-linked-binary By default, we use OpenBLAS LP64 also known in Nixpkgs as openblasCompat. [1]: https://wiki.debian.org/DebianScience/LinearAlgebraLibraries [2]: https://wiki.gentoo.org/wiki/Blas-lapack-switch --- pkgs/build-support/alternatives/blas/default.nix | 137 +++++++++++++++++++++ pkgs/build-support/alternatives/lapack/default.nix | 111 +++++++++++++++++ .../development/libraries/fflas-ffpack/default.nix | 11 +- pkgs/development/libraries/linbox/default.nix | 6 +- .../libraries/science/math/blas/default.nix | 6 - .../libraries/science/math/liblapack/default.nix | 3 - .../libraries/science/math/mkl/default.nix | 9 +- .../libraries/science/math/openblas/default.nix | 12 +- pkgs/top-level/aliases.nix | 2 +- pkgs/top-level/all-packages.nix | 24 ++-- pkgs/top-level/release-small.nix | 2 +- 11 files changed, 286 insertions(+), 37 deletions(-) create mode 100644 pkgs/build-support/alternatives/blas/default.nix create mode 100644 pkgs/build-support/alternatives/lapack/default.nix diff --git a/pkgs/build-support/alternatives/blas/default.nix b/pkgs/build-support/alternatives/blas/default.nix new file mode 100644 index 00000000000..1b878343866 --- /dev/null +++ b/pkgs/build-support/alternatives/blas/default.nix @@ -0,0 +1,137 @@ +{ lib, stdenv +, lapack-reference, openblasCompat, openblas +, is64bit ? false +, blasProvider ? if is64bit then openblas else openblasCompat }: + +let + blasFortranSymbols = [ + "caxpy" "ccopy" "cdotc" "cdotu" "cgbmv" "cgemm" "cgemv" "cgerc" "cgeru" + "chbmv" "chemm" "chemv" "cher" "cher2" "cher2k" "cherk" "chpmv" "chpr" + "chpr2" "crotg" "cscal" "csrot" "csscal" "cswap" "csymm" "csyr2k" "csyrk" + "ctbmv" "ctbsv" "ctpmv" "ctpsv" "ctrmm" "ctrmv" "ctrsm" "ctrsv" "dasum" + "daxpy" "dcabs1" "dcopy" "ddot" "dgbmv" "dgemm" "dgemv" "dger" "dnrm2" + "drot" "drotg" "drotm" "drotmg" "dsbmv" "dscal" "dsdot" "dspmv" "dspr" + "dspr2" "dswap" "dsymm" "dsymv" "dsyr" "dsyr2" "dsyr2k" "dsyrk" "dtbmv" + "dtbsv" "dtpmv" "dtpsv" "dtrmm" "dtrmv" "dtrsm" "dtrsv" "dzasum" "dznrm2" + "icamax" "idamax" "isamax" "izamax" "lsame" "sasum" "saxpy" "scabs1" + "scasum" "scnrm2" "scopy" "sdot" "sdsdot" "sgbmv" "sgemm" "sgemv" + "sger" "snrm2" "srot" "srotg" "srotm" "srotmg" "ssbmv" "sscal" "sspmv" + "sspr" "sspr2" "sswap" "ssymm" "ssymv" "ssyr" "ssyr2" "ssyr2k" "ssyrk" + "stbmv" "stbsv" "stpmv" "stpsv" "strmm" "strmv" "strsm" "strsv" "xerbla" + "xerbla_array" "zaxpy" "zcopy" "zdotc" "zdotu" "zdrot" "zdscal" "zgbmv" + "zgemm" "zgemv" "zgerc" "zgeru" "zhbmv" "zhemm" "zhemv" "zher" "zher2" + "zher2k" "zherk" "zhpmv" "zhpr" "zhpr2" "zrotg" "zscal" "zswap" "zsymm" + "zsyr2k" "zsyrk" "ztbmv" "ztbsv" "ztpmv" "ztpsv" "ztrmm" "ztrmv" "ztrsm" + "ztrsv" + ]; + + version = "3"; + canonicalExtension = if stdenv.hostPlatform.isLinux + then "${stdenv.hostPlatform.extensions.sharedLibrary}.${version}" + else stdenv.hostPlatform.extensions.sharedLibrary; + + + is64bit = blasProvider.blas64 or false; + blasImplementation = lib.getName blasProvider; + +in + +assert is64bit -> (blasImplementation == "openblas" && blasProvider.blas64) || blasImplementation == "mkl"; + +stdenv.mkDerivation { + pname = "blas"; + inherit version; + + outputs = [ "out" "dev" ]; + + meta = (blasProvider.meta or {}) // { + description = "${lib.getName blasProvider} with just the BLAS C and FORTRAN ABI"; + }; + + passthru = { + inherit is64bit; + provider = blasProvider; + implementation = blasImplementation; + }; + + dontBuild = true; + dontConfigure = true; + unpackPhase = "src=$PWD"; + + installPhase = ('' + mkdir -p $out/lib $dev/include $dev/include/pkgconfig + + libblas="${lib.getLib blasProvider}/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}" + + if ! [ -e "$libblas" ]; then + echo "$libblas does not exist, ${blasProvider.name} does not provide libblas." + exit 1 + fi + + nm -an "$libblas" | cut -f3 -d' ' > symbols + for symbol in ${toString blasFortranSymbols}; do + grep "^$symbol_$" symbols || { echo "$symbol" was not found in "$libblas"; exit 1; } + done + + cp -L "$libblas" $out/lib/libblas${canonicalExtension} + chmod +w $out/lib/libblas${canonicalExtension} + +'' + (if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then '' + patchelf --set-soname libblas${canonicalExtension} $out/lib/libblas${canonicalExtension} + patchelf --set-rpath "$(patchelf --print-rpath $out/lib/libblas${canonicalExtension}):${lib.getLib blasProvider}/lib" $out/lib/libblas${canonicalExtension} +'' else if stdenv.hostPlatform.isDarwin then '' + install_name_tool \ + -id libblas${canonicalExtension} + -add_rpath ${lib.getLib blasProvider}/lib \ + $out/lib/libblas${canonicalExtension} +'' else "") + '' + + if [ "$out/lib/libblas${canonicalExtension}" != "$out/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}" ]; then + ln -s $out/lib/libblas${canonicalExtension} "$out/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}" + fi + + cat < $dev/lib/pkgconfig/blas.pc +Name: blas +Version: ${version} +Description: BLAS FORTRAN implementation +Libs: -L$out/lib -lblas +Cflags: -I$dev/include +EOF + + libcblas="${lib.getLib blasProvider}/lib/libcblas${stdenv.hostPlatform.extensions.sharedLibrary}" + + if ! [ -e "$libcblas" ]; then + echo "$libcblas does not exist, ${blasProvider.name} does not provide libcblas." + exit 1 + fi + + cp -L "$libcblas" $out/lib/libcblas${canonicalExtension} + chmod +w $out/lib/libcblas${canonicalExtension} + +'' + (if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then '' + patchelf --set-soname libcblas${canonicalExtension} $out/lib/libcblas${canonicalExtension} + patchelf --set-rpath "$(patchelf --print-rpath $out/lib/libcblas${canonicalExtension}):${lib.getLib blasProvider}/lib" $out/lib/libcblas${canonicalExtension} +'' else if stdenv.hostPlatform.isDarwin then '' + install_name_tool \ + -id libcblas${canonicalExtension} \ + -add_rpath ${lib.getLib blasProvider}/lib \ + $out/lib/libcblas${canonicalExtension} +'' else "") + '' + if [ "$out/lib/libcblas${canonicalExtension}" != "$out/lib/libcblas${stdenv.hostPlatform.extensions.sharedLibrary}" ]; then + ln -s $out/lib/libcblas${canonicalExtension} "$out/lib/libcblas${stdenv.hostPlatform.extensions.sharedLibrary}" + fi + + cp ${lib.getDev lapack-reference}/include/cblas{,_mangling}.h $dev/include + + cat < $dev/lib/pkgconfig/cblas.pc +Name: cblas +Version: ${version} +Description: BLAS C implementation +Cflags: -I$dev/include +Libs: -L$out/lib -lcblas +EOF +'' + stdenv.lib.optionalString (blasImplementation == "mkl") '' + mkdir -p $out/nix-support + echo 'export MKL_INTERFACE_LAYER=${lib.optionalString is64bit "I"}LP64,GNU' > $out/nix-support/setup-hook +''); +} diff --git a/pkgs/build-support/alternatives/lapack/default.nix b/pkgs/build-support/alternatives/lapack/default.nix new file mode 100644 index 00000000000..24c339042a2 --- /dev/null +++ b/pkgs/build-support/alternatives/lapack/default.nix @@ -0,0 +1,111 @@ +{ lib, stdenv +, lapack-reference, openblasCompat, openblas +, is64bit ? false +, lapackProvider ? if is64bit then openblas else openblasCompat }: + +let + + version = "3"; + canonicalExtension = if stdenv.hostPlatform.isLinux + then "${stdenv.hostPlatform.extensions.sharedLibrary}.${version}" + else stdenv.hostPlatform.extensions.sharedLibrary; + + lapackImplementation = lib.getName lapackProvider; + +in + +assert is64bit -> (lapackImplementation == "openblas" && lapackProvider.blas64) || lapackImplementation == "mkl"; + +stdenv.mkDerivation { + pname = "lapack"; + inherit version; + + outputs = [ "out" "dev" ]; + + meta = (lapackProvider.meta or {}) // { + description = "${lib.getName lapackProvider} with just the LAPACK C and FORTRAN ABI"; + }; + + passthru = { + inherit is64bit; + provider = lapackProvider; + implementation = lapackImplementation; + }; + + dontBuild = true; + dontConfigure = true; + unpackPhase = "src=$PWD"; + + installPhase = ('' + mkdir -p $out/lib $dev/include $dev/lib/pkgconfig + + liblapack="${lib.getLib lapackProvider}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}" + + if ! [ -e "$liblapack" ]; then + echo "$liblapack does not exist, ${lapackProvider.name} does not provide liblapack." + exit 1 + fi + + cp -L "$liblapack" $out/lib/liblapack${canonicalExtension} + chmod +w $out/lib/liblapack${canonicalExtension} + +'' + (if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then '' + patchelf --set-soname liblapack${canonicalExtension} $out/lib/liblapack${canonicalExtension} + patchelf --set-rpath "$(patchelf --print-rpath $out/lib/liblapack${canonicalExtension}):${lapackProvider}/lib" $out/lib/liblapack${canonicalExtension} +'' else if stdenv.hostPlatform.isDarwin then '' + install_name_tool -id liblapack${canonicalExtension} \ + -add_rpath ${lib.getLib lapackProvider}/lib \ + $out/lib/liblapack${canonicalExtension} +'' else "") + '' + + if [ "$out/lib/liblapack${canonicalExtension}" != "$out/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}" ]; then + ln -s $out/lib/liblapack${canonicalExtension} "$out/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}" + fi + + install -D ${lib.getDev lapack-reference}/include/lapack.h $dev/include/lapack.h + + cat < $dev/lib/pkgconfig/lapack.pc +Name: lapack +Version: ${version} +Description: LAPACK FORTRAN implementation +Cflags: -I$dev/include +Libs: -L$out/lib -llapack +EOF + + liblapacke="${lib.getLib lapackProvider}/lib/liblapacke${stdenv.hostPlatform.extensions.sharedLibrary}" + + if ! [ -e "$liblapacke" ]; then + echo "$liblapacke does not exist, ${lapackProvider.name} does not provide liblapacke." + exit 1 + fi + + cp -L "$liblapacke" $out/lib/liblapacke${canonicalExtension} + chmod +w $out/lib/liblapacke${canonicalExtension} + +'' + (if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then '' + patchelf --set-soname liblapacke${canonicalExtension} $out/lib/liblapacke${canonicalExtension} + patchelf --set-rpath "$(patchelf --print-rpath $out/lib/liblapacke${canonicalExtension}):${lib.getLib lapackProvider}/lib" $out/lib/liblapacke${canonicalExtension} +'' else if stdenv.hostPlatform.isDarwin then '' + install_name_tool -id liblapacke${canonicalExtension} \ + -add_rpath ${lib.getLib lapackProvider}/lib \ + $out/lib/liblapacke${canonicalExtension} +'' else "") + '' + + if [ -f "$out/lib/liblapacke.so.3" ]; then + ln -s $out/lib/liblapacke.so.3 $out/lib/liblapacke.so + fi + + cp ${lib.getDev lapack-reference}/include/lapacke{,_mangling,_config}.h $dev/include + + cat < $dev/lib/pkgconfig/lapacke.pc +Name: lapacke +Version: ${version} +Description: LAPACK C implementation +Cflags: -I$dev/include +Libs: -L$out/lib -llapacke +EOF +'' + stdenv.lib.optionalString (lapackImplementation == "mkl") '' + mkdir -p $out/nix-support + echo 'export MKL_INTERFACE_LAYER=${lib.optionalString is64bit "I"}LP64,GNU' > $out/nix-support/setup-hook +''); +} diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index 44267dfeceb..16a9e3e79d4 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -1,6 +1,9 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, blas +{ stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, blas, lapack , gmpxx }: + +assert (!blas.is64bit) && (!lapack.is64bit); + stdenv.mkDerivation rec { pname = "fflas-ffpack"; version = "2.4.3"; @@ -23,11 +26,11 @@ stdenv.mkDerivation rec { pkgconfig ] ++ stdenv.lib.optionals doCheck checkInputs; - buildInputs = [ givaro blas ]; + buildInputs = [ givaro blas lapack ]; configureFlags = [ - "--with-blas-libs=-l${blas.linkName}" - "--with-lapack-libs=-l${blas.linkName}" + "--with-blas-libs=-lcblas" + "--with-lapack-libs=-llapacke" ] ++ stdenv.lib.optionals stdenv.isx86_64 { # disable SIMD instructions (which are enabled *when available* by default) # for now we need to be careful to disable *all* relevant versions of an instruction set explicitly (https://github.com/linbox-team/fflas-ffpack/issues/284) diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index 006c774e9a1..6d25cb45987 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -4,10 +4,14 @@ , givaro , pkgconfig , blas +, lapack , fflas-ffpack , gmpxx , withSage ? false # sage support }: + +assert (!blas.is64bit) && (!lapack.is64bit); + stdenv.mkDerivation rec { pname = "linbox"; version = "1.6.3"; @@ -33,7 +37,7 @@ stdenv.mkDerivation rec { ]; configureFlags = [ - "--with-blas-libs=-l${blas.linkName}" + "--with-blas-libs=-lblas" "--disable-optimization" ] ++ stdenv.lib.optionals stdenv.isx86_64 { # disable SIMD instructions (which are enabled *when available* by default) diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix index c58ac6be23d..c240a19cca6 100644 --- a/pkgs/development/libraries/science/math/blas/default.nix +++ b/pkgs/development/libraries/science/math/blas/default.nix @@ -68,10 +68,4 @@ EOF homepage = "http://www.netlib.org/blas/"; platforms = stdenv.lib.platforms.unix; }; - - # We use linkName to pass a different name to --with-blas-libs for - # fflas-ffpack and linbox, because we use blas on darwin but openblas - # elsewhere. - # See see https://github.com/NixOS/nixpkgs/pull/45013. - passthru.linkName = "blas"; } diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index d26bfbb3e6e..045cccbd2eb 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -42,7 +42,4 @@ stdenv.mkDerivation { license = licenses.bsd3; platforms = platforms.all; }; - - passthru.libblasName = "libblas"; - passthru.libcblasName = "libcblas"; } diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index 3def5e5b403..f9026ec7b99 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -111,7 +111,14 @@ in stdenvNoCC.mkDerivation { cp -r opt/intel/compilers_and_libraries_${version}/linux/compiler/lib/intel64_lin/*.so* $out/lib/ cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/lib/intel64_lin/*.so* $out/lib/ cp -r opt/intel/compilers_and_libraries_${version}/linux/mkl/bin/pkgconfig/*dynamic*.pc $out/lib/pkgconfig - ''); + '') + '' + + # Setup symlinks for blas / lapack + ln -s $out/lib/libmkl_rt${stdenvNoCC.hostPlatform.extensions.sharedLibrary} $out/lib/libblas${stdenvNoCC.hostPlatform.extensions.sharedLibrary} + ln -s $out/lib/libmkl_rt${stdenvNoCC.hostPlatform.extensions.sharedLibrary} $out/lib/libcblas${stdenvNoCC.hostPlatform.extensions.sharedLibrary} + ln -s $out/lib/libmkl_rt${stdenvNoCC.hostPlatform.extensions.sharedLibrary} $out/lib/liblapack${stdenvNoCC.hostPlatform.extensions.sharedLibrary} + ln -s $out/lib/libmkl_rt${stdenvNoCC.hostPlatform.extensions.sharedLibrary} $out/lib/liblapacke${stdenvNoCC.hostPlatform.extensions.sharedLibrary} + ''; # fixDarwinDylibName fails for libmkl_cdft_core.dylib because the # larger updated load commands do not fit. Use install_name_tool diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 23168d741ba..c55a5cb7878 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -176,6 +176,12 @@ Cflags: -I$out/include Libs: -L$out/lib -lopenblas EOF done + + # Setup symlinks for blas / lapack + ln -s $out/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary} + ln -s $out/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libcblas${stdenv.hostPlatform.extensions.sharedLibrary} + ln -s $out/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary} + ln -s $out/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/liblapacke${stdenv.hostPlatform.extensions.sharedLibrary} ''; meta = with stdenv.lib; { @@ -185,10 +191,4 @@ EOF platforms = platforms.unix; maintainers = with maintainers; [ ttuegel ]; }; - - # We use linkName to pass a different name to --with-blas-libs for - # fflas-ffpack and linbox, because we use blas on darwin but openblas - # elsewhere. - # See see https://github.com/NixOS/nixpkgs/pull/45013. - passthru.linkName = "openblas"; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5ba9b723edd..6ebf2bcf8df 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -237,7 +237,7 @@ mapAliases ({ libGL_driver = mesa.drivers; libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux || stdenv.hostPlatform.libc != "glibc") gettext; # added 2018-03-14 libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28 - liblapackWithoutAtlas = liblapack; # added 2018-11-05 + liblapackWithoutAtlas = lapack-reference; # added 2018-11-05 liblrdf = lrdf; # added 2018-04-25 libqrencode = qrencode; # added 2019-01-01 librdf = lrdf; # added 2020-03-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a7b711d5277..1f11beb8ee3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11479,20 +11479,11 @@ in ffcast = callPackage ../tools/X11/ffcast { }; - fflas-ffpack = callPackage ../development/libraries/fflas-ffpack { - # We need to use blas instead of openblas on darwin, - # see https://github.com/NixOS/nixpkgs/pull/45013. - blas = if stdenv.isDarwin then blas else openblas; - }; + fflas-ffpack = callPackage ../development/libraries/fflas-ffpack { }; forge = callPackage ../development/libraries/forge { }; - linbox = callPackage ../development/libraries/linbox { - # We need to use blas instead of openblas on darwin, see - # https://github.com/NixOS/nixpkgs/pull/45013 and - # https://github.com/NixOS/nixpkgs/pull/45015. - blas = if stdenv.isDarwin then blas else openblas; - }; + linbox = callPackage ../development/libraries/linbox { }; ffmpeg_2_8 = callPackage ../development/libraries/ffmpeg/2.8.nix { inherit (darwin.apple_sdk.frameworks) Cocoa; @@ -24428,7 +24419,9 @@ in arpack = callPackage ../development/libraries/science/math/arpack { }; - blas = callPackage ../development/libraries/science/math/blas { }; + blas = callPackage ../build-support/alternatives/blas { }; + + blas-reference = callPackage ../development/libraries/science/math/blas { }; brial = callPackage ../development/libraries/science/math/brial { }; @@ -24448,12 +24441,15 @@ in jags = callPackage ../applications/science/math/jags { }; + lapack = callPackage ../build-support/alternatives/lapack { }; + + lapack-reference = callPackage ../development/libraries/science/math/liblapack { }; + liblapack = lapack-reference; + libbraiding = callPackage ../development/libraries/science/math/libbraiding { }; libhomfly = callPackage ../development/libraries/science/math/libhomfly { }; - liblapack = callPackage ../development/libraries/science/math/liblapack {}; - liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; lrs = callPackage ../development/libraries/science/math/lrs { }; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index ab7e4ce00d7..1c7f758ccff 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -78,9 +78,9 @@ with import ./release-lib.nix { inherit supportedSystems; }; kvm = linux; qemu = linux; qemu_kvm = linux; + lapack-reference = linux; less = all; lftp = all; - liblapack = linux; libtool = all; libtool_2 = all; libxml2 = all; -- cgit v1.2.3 From 1c8aba83340be3713f68410d1d273a8b15e7e007 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 31 Mar 2020 10:47:18 -0400 Subject: treewide: use blas and lapack MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes packages use lapack and blas, which can wrap different BLAS/LAPACK implementations. treewide: cleanup from blas/lapack changes A few issues in the original treewide: - can’t assume blas64 is a bool - unused commented code --- pkgs/applications/radio/gnss-sdr/default.nix | 8 +++---- .../science/biology/plink-ng/default.nix | 15 ++++++++----- .../science/chemistry/octopus/default.nix | 10 +++++---- .../science/chemistry/openmolcas/default.nix | 4 +++- .../science/chemistry/quantum-espresso/default.nix | 4 ++-- .../science/chemistry/siesta/default.nix | 8 +++---- .../science/machine-learning/shogun/default.nix | 8 ++++--- pkgs/applications/science/math/R/default.nix | 10 +++++---- pkgs/applications/science/math/caffe/default.nix | 4 ++-- .../science/math/calculix/calculix.patch | 2 +- .../applications/science/math/calculix/default.nix | 4 ++-- pkgs/applications/science/math/cntk/default.nix | 3 ++- pkgs/applications/science/math/csdp/default.nix | 4 ++-- pkgs/applications/science/math/getdp/default.nix | 4 ++-- pkgs/applications/science/math/giac/default.nix | 6 +++--- pkgs/applications/science/math/gmsh/default.nix | 6 ++++-- pkgs/applications/science/math/jags/default.nix | 6 +++--- pkgs/applications/science/math/mxnet/default.nix | 6 +++--- pkgs/applications/science/math/sage/sage-env.nix | 7 ++++-- .../science/math/sage/sage-with-env.nix | 8 +++++-- pkgs/applications/science/math/sage/sagelib.nix | 8 +++++-- .../science/misc/openmodelica/default.nix | 8 +++---- .../science/molecular-dynamics/lammps/default.nix | 4 ++-- .../science/physics/xfitter/default.nix | 4 ++-- pkgs/development/compilers/halide/default.nix | 5 ++++- pkgs/development/compilers/julia/1.3.nix | 24 ++++++--------------- pkgs/development/compilers/julia/shared.nix | 20 +++++------------ .../haskell-modules/configuration-common.nix | 7 +----- pkgs/development/interpreters/octave/default.nix | 25 +++++++--------------- pkgs/development/libraries/armadillo/default.nix | 6 +++--- pkgs/development/libraries/arrayfire/default.nix | 22 +++++++++---------- pkgs/development/libraries/flint/default.nix | 4 ++-- pkgs/development/libraries/givaro/default.nix | 3 ++- .../development/libraries/globalarrays/default.nix | 8 +++---- pkgs/development/libraries/iml/default.nix | 6 +++--- pkgs/development/libraries/libcint/default.nix | 4 ++-- pkgs/development/libraries/opencv/3.x.nix | 4 +++- pkgs/development/libraries/opencv/4.x.nix | 4 +++- pkgs/development/libraries/qrupdate/default.nix | 11 +++++----- .../libraries/science/math/arpack/default.nix | 9 ++++---- .../science/math/cholmod-extra/default.nix | 15 +++++-------- .../libraries/science/math/fenics/default.nix | 7 ++++-- .../libraries/science/math/ipopt/default.nix | 10 +++++---- .../libraries/science/math/magma/default.nix | 4 ++-- .../libraries/science/math/petsc/default.nix | 8 +++---- .../libraries/science/math/scalapack/default.nix | 9 ++++---- .../libraries/science/math/scs/default.nix | 4 ++-- .../libraries/science/math/suitesparse/4.2.nix | 10 ++++----- .../libraries/science/math/suitesparse/4.4.nix | 14 ++++++------ .../libraries/science/math/suitesparse/default.nix | 10 ++++----- .../libraries/science/math/superlu/default.nix | 7 +++--- .../math/superlu/find-openblas-library.patch | 11 ---------- pkgs/development/libraries/sundials/2.x.nix | 10 ++++----- pkgs/development/libraries/sundials/default.nix | 11 +++++----- pkgs/development/ocaml-modules/lacaml/default.nix | 5 +++-- pkgs/development/ocaml-modules/owl/default.nix | 7 ++++-- pkgs/development/python-modules/cvxopt/default.nix | 11 ++++++---- pkgs/development/python-modules/numpy/default.nix | 20 ++++++++++------- .../development/python-modules/prox-tv/default.nix | 13 ++--------- .../python-modules/prox-tv/use-openblas.patch | 11 ---------- .../python-modules/pysparse/default.nix | 7 +++--- pkgs/development/python-modules/scs/default.nix | 4 ++-- pkgs/development/r-modules/default.nix | 6 +++--- .../tools/poetry2nix/poetry2nix/overrides.nix | 23 ++++++++------------ pkgs/servers/mail/rspamd/default.nix | 4 ++-- pkgs/tools/misc/hpl/default.nix | 7 +++--- pkgs/top-level/all-packages.nix | 12 ++--------- pkgs/top-level/python-packages.nix | 10 ++------- 68 files changed, 272 insertions(+), 311 deletions(-) delete mode 100644 pkgs/development/libraries/science/math/superlu/find-openblas-library.patch delete mode 100644 pkgs/development/python-modules/prox-tv/use-openblas.patch diff --git a/pkgs/applications/radio/gnss-sdr/default.nix b/pkgs/applications/radio/gnss-sdr/default.nix index 005f83e0f54..4e423094e90 100644 --- a/pkgs/applications/radio/gnss-sdr/default.nix +++ b/pkgs/applications/radio/gnss-sdr/default.nix @@ -12,7 +12,7 @@ , pythonPackages , uhd , log4cpp -, openblas +, blas, lapack , matio , pugixml , protobuf @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { # nothing to be gained by leaving it out. uhd log4cpp - openblas + blas lapack matio pugixml protobuf @@ -63,8 +63,8 @@ stdenv.mkDerivation rec { # armadillo is built using both, so skip checking for them. "-DBLAS=YES" "-DLAPACK=YES" - "-DBLAS_LIBRARIES=-lopenblas" - "-DLAPACK_LIBRARIES=-lopenblas" + "-DBLAS_LIBRARIES=-lblas" + "-DLAPACK_LIBRARIES=-llapack" # Similarly, it doesn't actually use gfortran despite checking for # its presence. diff --git a/pkgs/applications/science/biology/plink-ng/default.nix b/pkgs/applications/science/biology/plink-ng/default.nix index 13f00c53fe6..0a31ff6ba4f 100644 --- a/pkgs/applications/science/biology/plink-ng/default.nix +++ b/pkgs/applications/science/biology/plink-ng/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, zlib, openblas, darwin}: +{ stdenv, fetchFromGitHub, zlib, blas, lapack, darwin}: stdenv.mkDerivation rec { pname = "plink-ng"; @@ -11,14 +11,20 @@ stdenv.mkDerivation rec { sha256 = "1zhffjbwpd50dxywccbnv1rxy9njwz73l4awc5j7i28rgj3davcq"; }; - buildInputs = [ zlib ] ++ (if stdenv.isDarwin then [ darwin.apple_sdk.frameworks.Accelerate ] else [ openblas ]) ; + buildInputs = [ zlib ] ++ (if stdenv.isDarwin then [ darwin.apple_sdk.frameworks.Accelerate ] else [ blas lapack ]) ; - buildPhase = '' + preBuild = '' sed -i 's|zlib-1.2.8/zlib.h|zlib.h|g' *.c *.h ${if stdenv.cc.isClang then "sed -i 's|g++|clang++|g' Makefile.std" else ""} - make ZLIB=-lz ${if stdenv.isDarwin then "" else "BLASFLAGS=-lopenblas"} -f Makefile.std + + makeFlagsArray+=( + ZLIB=-lz + BLASFLAGS="-lblas -lcblas -llapack" + ); ''; + makefile = "Makefile.std"; + installPhase = '' mkdir -p $out/bin cp plink $out/bin @@ -31,4 +37,3 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.linux; }; } - diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index f8ce3e925fd..f30954367cf 100644 --- a/pkgs/applications/science/chemistry/octopus/default.nix +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -1,7 +1,9 @@ { stdenv, fetchFromGitLab, symlinkJoin, gfortran, perl, procps -, libyaml, libxc, fftw, openblas, gsl, netcdf, arpack, autoreconfHook +, libyaml, libxc, fftw, blas, lapack, gsl, netcdf, arpack, autoreconfHook }: +assert (!blas.is64bit) && (!lapack.is64bit); + stdenv.mkDerivation rec { pname = "octopus"; version = "9.2"; @@ -14,12 +16,12 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ perl procps autoreconfHook ]; - buildInputs = [ libyaml gfortran libxc openblas gsl fftw netcdf arpack ]; + buildInputs = [ libyaml gfortran libxc blas lapack gsl fftw netcdf arpack ]; configureFlags = [ "--with-yaml-prefix=${libyaml}" - "--with-blas=-lopenblas" - "--with-lapack=-lopenblas" + "--with-blas=-lblas" + "--with-lapack=-llapack" "--with-fftw-prefix=${fftw.dev}" "--with-gsl-prefix=${gsl}" "--with-libxc-prefix=${libxc}" diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix index b1720e105fd..0d74e784d77 100644 --- a/pkgs/applications/science/chemistry/openmolcas/default.nix +++ b/pkgs/applications/science/chemistry/openmolcas/default.nix @@ -1,9 +1,11 @@ { stdenv, fetchFromGitLab, cmake, gfortran, perl -, openblas, hdf5-cpp, python3, texlive +, openblas, blas, lapack, hdf5-cpp, python3, texlive , armadillo, openmpi, globalarrays, openssh , makeWrapper, fetchpatch } : +assert blas.implementation == "openblas" && lapack.implementation == "openblas"; + let version = "19.11"; gitLabRev = "v${version}"; diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix index bd420519ce0..2443e6b23ab 100644 --- a/pkgs/applications/science/chemistry/quantum-espresso/default.nix +++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, gfortran, fftw, openblas +, gfortran, fftw, blas, lapack , mpi ? null }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patchShebangs configure ''; - buildInputs = [ fftw openblas gfortran ] + buildInputs = [ fftw blas lapack gfortran ] ++ (stdenv.lib.optionals (mpi != null) [ mpi ]); configureFlags = if (mpi != null) then [ "LD=${mpi}/bin/mpif90" ] else [ "LD=${gfortran}/bin/gfortran" ]; diff --git a/pkgs/applications/science/chemistry/siesta/default.nix b/pkgs/applications/science/chemistry/siesta/default.nix index 11f3e551431..c053c0a09cd 100644 --- a/pkgs/applications/science/chemistry/siesta/default.nix +++ b/pkgs/applications/science/chemistry/siesta/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, gfortran, openblas +, gfortran, blas, lapack , mpi ? null, scalapack }: @@ -16,7 +16,7 @@ stdenv.mkDerivation { inherit mpi; }; - buildInputs = [ openblas gfortran ] + buildInputs = [ blas lapack gfortran ] ++ (stdenv.lib.optionals (mpi != null) [ mpi scalapack ]); enableParallelBuilding = true; @@ -33,11 +33,11 @@ stdenv.mkDerivation { makeFlagsArray=( CC="mpicc" FC="mpifort" FPPFLAGS="-DMPI" MPI_INTERFACE="libmpi_f90.a" MPI_INCLUDE="." - COMP_LIBS="" LIBS="-lopenblas -lscalapack" + COMP_LIBS="" LIBS="-lblas -llapack -lscalapack" ); '' else '' makeFlagsArray=( - COMP_LIBS="" LIBS="-lopenblas" + COMP_LIBS="" LIBS="-lblas -llapack" ); ''; diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix index 988ea8c855c..33871df87f3 100644 --- a/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -2,7 +2,7 @@ # data, compression , bzip2, curl, hdf5, json_c, lzma, lzo, protobuf, snappy # maths -, openblasCompat, eigen, nlopt, lp_solve, colpack, liblapack, glpk +, blas, lapack, eigen, nlopt, lp_solve, colpack, glpk # libraries , libarchive, libxml2 # extra support @@ -13,6 +13,8 @@ assert pythonSupport -> pythonPackages != null; assert opencvSupport -> opencv != null; +assert (!blas.is64bit) && (!lapack.is64bit); + let pname = "shogun"; version = "6.1.4"; @@ -64,8 +66,8 @@ stdenv.mkDerivation rec { CCACHE_DIR=".ccache"; buildInputs = with lib; [ - openblasCompat bzip2 cmake colpack curl ctags eigen hdf5 json_c lp_solve lzma lzo - protobuf nlopt snappy swig (libarchive.dev) libxml2 liblapack glpk + blas lapack bzip2 cmake colpack curl ctags eigen hdf5 json_c lp_solve lzma lzo + protobuf nlopt snappy swig (libarchive.dev) libxml2 lapack glpk ] ++ optionals (pythonSupport) (with pythonPackages; [ python ply numpy ]) ++ optional (opencvSupport) opencv; diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 3ee62fad44d..836ce004fff 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng , libtiff, ncurses, pango, pcre, perl, readline, tcl, texLive, tk, xz, zlib -, less, texinfo, graphviz, icu, pkgconfig, bison, imake, which, jdk, openblas +, less, texinfo, graphviz, icu, pkgconfig, bison, imake, which, jdk, blas, lapack , curl, Cocoa, Foundation, libobjc, libcxx, tzdata, fetchpatch , withRecommendedPackages ? true , enableStrictBarrier ? false @@ -9,6 +9,8 @@ , static ? false }: +assert (!blas.is64bit) && (!lapack.is64bit); + stdenv.mkDerivation rec { name = "R-3.6.3"; @@ -22,7 +24,7 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses pango pcre perl readline texLive xz zlib less texinfo graphviz icu - pkgconfig bison imake which openblas curl tcl tk jdk + pkgconfig bison imake which blas lapack curl tcl tk jdk ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ]; patches = [ @@ -43,8 +45,8 @@ stdenv.mkDerivation rec { configureFlagsArray=( --disable-lto --with${stdenv.lib.optionalString (!withRecommendedPackages) "out"}-recommended-packages - --with-blas="-L${openblas}/lib -lopenblas" - --with-lapack="-L${openblas}/lib -lopenblas" + --with-blas="-L${blas}/lib -lblas" + --with-lapack="-L${lapack}/lib -llapack" --with-readline --with-tcltk --with-tcl-config="${tcl}/lib/tclConfig.sh" --with-tk-config="${tk}/lib/tkConfig.sh" --with-cairo diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index ea87c4953ee..4a6a2dc6c7e 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -9,7 +9,7 @@ , opencv3 , protobuf , doxygen -, openblas +, blas , Accelerate, CoreGraphics, CoreVideo , lmdbSupport ? true, lmdb , leveldbSupport ? true, leveldb, snappy @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { ++ ["-DUSE_LEVELDB=${toggle leveldbSupport}"] ++ ["-DUSE_LMDB=${toggle lmdbSupport}"]; - buildInputs = [ boost gflags glog protobuf hdf5-cpp opencv3 openblas ] + buildInputs = [ boost gflags glog protobuf hdf5-cpp opencv3 blas ] ++ lib.optional cudaSupport cudatoolkit ++ lib.optional cudnnSupport cudnn ++ lib.optional lmdbSupport lmdb diff --git a/pkgs/applications/science/math/calculix/calculix.patch b/pkgs/applications/science/math/calculix/calculix.patch index 311421f2ef5..5b8f492a8e7 100644 --- a/pkgs/applications/science/math/calculix/calculix.patch +++ b/pkgs/applications/science/math/calculix/calculix.patch @@ -15,7 +15,7 @@ index 9cab2fc..6e977b8 100755 OCCXMAIN = $(SCCXMAIN:.c=.o) -DIR=../../../SPOOLES.2.2 -+LIBS = -lpthread -lm -lc -lspooles -larpack -lopenblas ++LIBS = -lpthread -lm -lc -lspooles -larpack -lblas -llapack -LIBS = \ - $(DIR)/spooles.a \ diff --git a/pkgs/applications/science/math/calculix/default.nix b/pkgs/applications/science/math/calculix/default.nix index 6f2d61cd80f..44882594550 100644 --- a/pkgs/applications/science/math/calculix/default.nix +++ b/pkgs/applications/science/math/calculix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gfortran, arpack, spooles, openblas }: +{ stdenv, fetchurl, gfortran, arpack, spooles, blas, lapack }: stdenv.mkDerivation rec { pname = "calculix"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gfortran ]; - buildInputs = [ arpack spooles openblas ]; + buildInputs = [ arpack spooles blas lapack ]; NIX_CFLAGS_COMPILE = "-I${spooles}/include/spooles"; diff --git a/pkgs/applications/science/math/cntk/default.nix b/pkgs/applications/science/math/cntk/default.nix index e2db40a402e..401454a6b69 100644 --- a/pkgs/applications/science/math/cntk/default.nix +++ b/pkgs/applications/science/math/cntk/default.nix @@ -1,11 +1,12 @@ { lib, stdenv, fetchgit, fetchFromGitHub, cmake -, openblas, opencv3, libzip, boost, protobuf, openmpi +, openblas, blas, lapack, opencv3, libzip, boost, protobuf, openmpi , onebitSGDSupport ? false , cudaSupport ? false, addOpenGLRunpath, cudatoolkit, nvidia_x11 , cudnnSupport ? cudaSupport, cudnn }: assert cudnnSupport -> cudaSupport; +assert blas.implementation == "openblas" && lapack.implementation == "openblas"; let # Old specific version required for CNTK. diff --git a/pkgs/applications/science/math/csdp/default.nix b/pkgs/applications/science/math/csdp/default.nix index eef60829f8e..ef9d5e733ca 100644 --- a/pkgs/applications/science/math/csdp/default.nix +++ b/pkgs/applications/science/math/csdp/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, blas, gfortran, liblapack }: +{ lib, stdenv, fetchurl, blas, gfortran, lapack }: stdenv.mkDerivation { name = "csdp-6.1.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "1f9ql6cjy2gwiyc51ylfan24v1ca9sjajxkbhszlds1lqmma8n05"; }; - buildInputs = [ blas gfortran.cc.lib liblapack ]; + buildInputs = [ blas gfortran.cc.lib lapack ]; postPatch = '' substituteInPlace Makefile --replace /usr/local/bin $out/bin diff --git a/pkgs/applications/science/math/getdp/default.nix b/pkgs/applications/science/math/getdp/default.nix index 0ac2ea7d1b3..ae93e89f141 100644 --- a/pkgs/applications/science/math/getdp/default.nix +++ b/pkgs/applications/science/math/getdp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, gfortran, openblas, openmpi, petsc, python3 }: +{ stdenv, fetchurl, cmake, gfortran, blas, lapack, openmpi, petsc, python3 }: stdenv.mkDerivation rec { name = "getdp-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake gfortran ]; - buildInputs = [ openblas openmpi petsc python3 ]; + buildInputs = [ blas lapack openmpi petsc python3 ]; meta = with stdenv.lib; { description = "A General Environment for the Treatment of Discrete Problems"; diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index b3777528ecd..feb30b990ab 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchurl, fetchpatch, texlive, bison, flex, liblapack -, gmp, mpfr, pari, ntl, gsl, blas, mpfi, ecm, glpk, nauty +{ stdenv, lib, fetchurl, fetchpatch, texlive, bison, flex, lapack, blas +, gmp, mpfr, pari, ntl, gsl, mpfi, ecm, glpk, nauty , readline, gettext, libpng, libao, gfortran, perl , enableGUI ? false, libGL ? null, libGLU ? null, xorg ? null, fltk ? null }: @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # gfortran.cc default output contains static libraries compiled without -fPIC # we want libgfortran.so.3 instead (stdenv.lib.getLib gfortran.cc) - liblapack + lapack blas ] ++ stdenv.lib.optionals enableGUI [ libGL libGLU fltk xorg.libX11 ]; diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 2c4d5f254da..8ece2e7819c 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchurl, cmake, openblasCompat, gfortran, gmm, fltk, libjpeg +{ stdenv, fetchurl, cmake, blas, lapack, gfortran, gmm, fltk, libjpeg , zlib, libGL, libGLU, xorg, opencascade-occt }: +assert (!blas.is64bit) && (!lapack.is64bit); + stdenv.mkDerivation rec { pname = "gmsh"; version = "4.5.6"; @@ -10,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "0gs65bgr1ph5lz7r6manqj8cra30s7c94pxilkd2z0p5vq6fpsj6"; }; - buildInputs = [ openblasCompat gmm fltk libjpeg zlib libGLU libGL + buildInputs = [ blas lapack gmm fltk libjpeg zlib libGLU libGL libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE opencascade-occt diff --git a/pkgs/applications/science/math/jags/default.nix b/pkgs/applications/science/math/jags/default.nix index 5ac1594e19a..122c6288847 100644 --- a/pkgs/applications/science/math/jags/default.nix +++ b/pkgs/applications/science/math/jags/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, gfortran, openblas}: +{stdenv, fetchurl, gfortran, blas, lapack}: stdenv.mkDerivation rec { name = "JAGS-4.3.0"; @@ -6,8 +6,8 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/mcmc-jags/${name}.tar.gz"; sha256 = "1z3icccg2ic56vmhyrpinlsvpq7kcaflk1731rgpvz9bk1bxvica"; }; - buildInputs = [gfortran openblas]; - configureFlags = [ "--with-blas=-lopenblas" "--with-lapack=-lopenblas" ]; + buildInputs = [gfortran blas lapack]; + configureFlags = [ "--with-blas=-lblas" "--with-lapack=-llapack" ]; meta = with stdenv.lib; { description = "Just Another Gibbs Sampler"; diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index 5b7688f6051..87d46850f14 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -1,5 +1,5 @@ { config, stdenv, lib, fetchurl, bash, cmake -, opencv3, gtest, openblas, liblapack, perl +, opencv3, gtest, blas, perl , cudaSupport ? config.cudaSupport or false, cudatoolkit, nvidia_x11 , cudnnSupport ? cudaSupport, cudnn }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake perl ]; - buildInputs = [ opencv3 gtest openblas liblapack ] + buildInputs = [ opencv3 gtest blas ] ++ lib.optionals cudaSupport [ cudatoolkit nvidia_x11 ] ++ lib.optional cudnnSupport cudnn; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { substituteInPlace 3rdparty/mkldnn/tests/CMakeLists.txt \ --replace "/bin/bash" "${bash}/bin/bash" - # Build against the system version of OpenMP. + # Build against the system version of OpenMP. # https://github.com/apache/incubator-mxnet/pull/12160 rm -rf 3rdparty/openmp ''; diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix index 68e0d134ace..c0dfeef1119 100644 --- a/pkgs/applications/science/math/sage/sage-env.nix +++ b/pkgs/applications/science/math/sage/sage-env.nix @@ -41,7 +41,8 @@ , lcalc , rubiks , flintqs -, openblasCompat +, blas +, lapack , flint , gmp , mpfr @@ -53,6 +54,8 @@ , less }: +assert (!blas.is64bit) && (!lapack.is64bit); + # This generates a `sage-env` shell file that will be sourced by sage on startup. # It sets up various environment variables, telling sage where to find its # dependencies. @@ -114,7 +117,7 @@ writeTextFile rec { # testsuite instead, but since all the packages are also runtime # dependencies it doesn't really hurt to include them here. singular - openblasCompat + blas lapack fflas-ffpack givaro gd libpng zlib diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix index 524085e8c01..77bc65c2be1 100644 --- a/pkgs/applications/science/math/sage/sage-with-env.nix +++ b/pkgs/applications/science/math/sage/sage-with-env.nix @@ -2,7 +2,8 @@ , lib , makeWrapper , sage-env -, openblasCompat +, blas +, lapack , pkg-config , three , singular @@ -21,6 +22,9 @@ , pythonEnv }: +# lots of segfaults with (64 bit) blas +assert (!blas.is64bit) && (!lapack.is64bit); + # Wrapper that combined `sagelib` with `sage-env` to produce an actually # executable sage. No tests are run yet and no documentation is built. @@ -29,7 +33,7 @@ let pythonEnv # for patchShebangs makeWrapper pkg-config - openblasCompat # lots of segfaults with regular (64 bit) openblas + blas lapack singular three pynac diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix index 69f7624078e..92b4e8efa2e 100644 --- a/pkgs/applications/science/math/sage/sagelib.nix +++ b/pkgs/applications/science/math/sage/sagelib.nix @@ -3,7 +3,8 @@ , perl , buildPythonPackage , arb -, openblasCompat +, blas +, lapack , brial , cliquer , cypari2 @@ -52,6 +53,8 @@ , pplpy }: +assert (!blas.is64bit) && (!lapack.is64bit); + # This is the core sage python package. Everything else is just wrappers gluing # stuff together. It is not very useful on its own though, since it will not # find many of its dependencies without `sage-env`, will not be tested without @@ -103,7 +106,8 @@ buildPythonPackage rec { m4rie mpfi ntl - openblasCompat + blas + lapack pari planarity ppl diff --git a/pkgs/applications/science/misc/openmodelica/default.nix b/pkgs/applications/science/misc/openmodelica/default.nix index ed4101bdb47..50d4dcc1a9f 100644 --- a/pkgs/applications/science/misc/openmodelica/default.nix +++ b/pkgs/applications/science/misc/openmodelica/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchgit, fetchsvn, autoconf, automake, libtool, gfortran, clang, cmake, gnumake, -hwloc, jre, liblapack, blas, hdf5, expat, ncurses, readline, qt4, webkitgtk, which, +hwloc, jre, lapack, blas, hdf5, expat, ncurses, readline, qt4, webkitgtk, which, lp_solve, omniorb, sqlite, libatomic_ops, pkgconfig, file, gettext, flex, bison, doxygen, boost, openscenegraph, gnome2, xorg, git, bash, gtk2, makeWrapper }: @@ -15,7 +15,7 @@ stdenv.mkDerivation { src = fetchgit (import ./src-main.nix); buildInputs = [autoconf cmake automake libtool gfortran clang gnumake - hwloc jre liblapack blas hdf5 expat ncurses readline qt4 webkitgtk which + hwloc jre lapack blas hdf5 expat ncurses readline qt4 webkitgtk which lp_solve omniorb sqlite libatomic_ops pkgconfig file gettext flex bison doxygen boost openscenegraph gnome2.gtkglext xorg.libXmu git gtk2 makeWrapper]; @@ -40,7 +40,7 @@ stdenv.mkDerivation { for e in $(cd $out/bin && ls); do wrapProgram $out/bin/$e \ --prefix PATH : "${gnumake}/bin" \ - --prefix LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ liblapack blas ]}" + --prefix LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ lapack blas ]}" done ''; @@ -53,5 +53,3 @@ stdenv.mkDerivation { broken = true; }; } - - diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix index ab706a88931..5dc31695c60 100644 --- a/pkgs/applications/science/molecular-dynamics/lammps/default.nix +++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub -, libpng, gzip, fftw, openblas +, libpng, gzip, fftw, blas, lapack , mpi ? null }: let packages = [ @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { inherit packages; }; - buildInputs = [ fftw libpng openblas gzip ] + buildInputs = [ fftw libpng blas lapack gzip ] ++ (stdenv.lib.optionals withMPI [ mpi ]); configurePhase = '' diff --git a/pkgs/applications/science/physics/xfitter/default.nix b/pkgs/applications/science/physics/xfitter/default.nix index f4d70e79079..b992851e40a 100644 --- a/pkgs/applications/science/physics/xfitter/default.nix +++ b/pkgs/applications/science/physics/xfitter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, apfel, apfelgrid, applgrid, blas, gfortran, lhapdf, liblapack, libyaml, lynx, mela, root5, qcdnum, which }: +{ stdenv, fetchurl, apfel, apfelgrid, applgrid, blas, gfortran, lhapdf, lapack, libyaml, lynx, mela, root5, qcdnum, which }: stdenv.mkDerivation rec { pname = "xfitter"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gfortran which ]; buildInputs = - [ apfel apfelgrid applgrid blas lhapdf liblapack mela root5 qcdnum ] + [ apfel apfelgrid applgrid blas lhapdf lapack mela root5 qcdnum ] # pdf2yaml requires fmemopen and open_memstream which are not readily available on Darwin ++ stdenv.lib.optional (!stdenv.isDarwin) libyaml ; diff --git a/pkgs/development/compilers/halide/default.nix b/pkgs/development/compilers/halide/default.nix index 44c079af926..356ebe23172 100644 --- a/pkgs/development/compilers/halide/default.nix +++ b/pkgs/development/compilers/halide/default.nix @@ -1,7 +1,10 @@ { llvmPackages, lib, fetchFromGitHub, cmake -, libpng, libjpeg, mesa, eigen, openblas +, libpng, libjpeg, mesa, eigen +, openblas, blas, lapack }: +assert blas.implementation == "openblas" && lapack.implementation == "openblas"; + let version = "2019_08_27"; diff --git a/pkgs/development/compilers/julia/1.3.nix b/pkgs/development/compilers/julia/1.3.nix index 48034920e28..49dc17a27f4 100644 --- a/pkgs/development/compilers/julia/1.3.nix +++ b/pkgs/development/compilers/julia/1.3.nix @@ -7,28 +7,22 @@ # standard library dependencies , curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2 # linear algebra -, openblas, arpack +, blas, lapack, arpack # Darwin frameworks , CoreServices, ApplicationServices }: +assert (!blas.is64bit) && (!lapack.is64bit); + with stdenv.lib; -# All dependencies must use the same OpenBLAS. -let - arpack_ = arpack; -in let - arpack = arpack_.override { inherit openblas; }; -in - -let majorVersion = "1"; minorVersion = "3"; maintenanceVersion = "1"; src_sha256 = "0q9a7yc3b235psrwl5ghyxgwly25lf8n818l8h6bkf2ymdbsv5p6"; version = "${majorVersion}.${minorVersion}.${maintenanceVersion}"; -in +in stdenv.mkDerivation rec { pname = "julia"; @@ -67,7 +61,7 @@ stdenv.mkDerivation rec { buildInputs = [ arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr - pcre2.dev openblas openlibm openspecfun readline utf8proc + pcre2.dev blas lapack openlibm openspecfun readline utf8proc zlib ] ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] @@ -94,13 +88,9 @@ stdenv.mkDerivation rec { "SHELL=${stdenv.shell}" "USE_SYSTEM_BLAS=1" - "USE_BLAS64=${if openblas.blas64 then "1" else "0"}" - "LIBBLAS=-lopenblas" - "LIBBLASNAME=libopenblas" + "USE_BLAS64=${if blas.is64bit then "1" else "0"}" "USE_SYSTEM_LAPACK=1" - "LIBLAPACK=-lopenblas" - "LIBLAPACKNAME=libopenblas" "USE_SYSTEM_ARPACK=1" "USE_SYSTEM_FFTW=1" @@ -123,7 +113,7 @@ stdenv.mkDerivation rec { ]; LD_LIBRARY_PATH = makeLibraryPath [ - arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm + arpack fftw fftwSinglePrec gmp libgit2 mpfr blas openlibm openspecfun pcre2 ]; diff --git a/pkgs/development/compilers/julia/shared.nix b/pkgs/development/compilers/julia/shared.nix index ec1818f9989..92e3d4a5c14 100644 --- a/pkgs/development/compilers/julia/shared.nix +++ b/pkgs/development/compilers/julia/shared.nix @@ -15,20 +15,14 @@ # standard library dependencies , curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2 # linear algebra -, openblas, arpack +, blas, lapack, arpack # Darwin frameworks , CoreServices, ApplicationServices }: with stdenv.lib; -# All dependencies must use the same OpenBLAS. -let - arpack_ = arpack; -in -let - arpack = arpack_.override { inherit openblas; }; -in +assert (!blas.is64bit) && (!lapack.is64bit); let dsfmtVersion = "2.2.3"; @@ -118,7 +112,7 @@ stdenv.mkDerivation rec { buildInputs = [ arpack fftw fftwSinglePrec gmp libgit2 libunwind mpfr - pcre2.dev openblas openlibm openspecfun readline utf8proc + pcre2.dev blas lapack openlibm openspecfun readline utf8proc zlib ] ++ stdenv.lib.optionals stdenv.isDarwin [CoreServices ApplicationServices] @@ -143,13 +137,9 @@ stdenv.mkDerivation rec { "SHELL=${stdenv.shell}" "USE_SYSTEM_BLAS=1" - "USE_BLAS64=${if openblas.blas64 then "1" else "0"}" - "LIBBLAS=-lopenblas" - "LIBBLASNAME=libopenblas" + "USE_BLAS64=${if blas.is64bit then "1" else "0"}" "USE_SYSTEM_LAPACK=1" - "LIBLAPACK=-lopenblas" - "LIBLAPACKNAME=libopenblas" "USE_SYSTEM_ARPACK=1" "USE_SYSTEM_FFTW=1" @@ -173,7 +163,7 @@ stdenv.mkDerivation rec { ]; LD_LIBRARY_PATH = makeLibraryPath [ - arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm + arpack fftw fftwSinglePrec gmp libgit2 mpfr blas lapack openlibm openspecfun pcre2 ]; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 29fcd5c7167..4cf9770c7a2 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -114,13 +114,8 @@ self: super: { # Depends on broken "hails" package. hails-bin = dontDistribute super.hails-bin; - # Switch levmar build to openblas. bindings-levmar = overrideCabal super.bindings-levmar (drv: { - preConfigure = '' - sed -i bindings-levmar.cabal \ - -e 's,extra-libraries: lapack blas,extra-libraries: openblas,' - ''; - extraLibraries = [ pkgs.openblasCompat ]; + extraLibraries = [ pkgs.blas ]; }); # The Haddock phase fails for one reason or another. diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 4a63d186201..4d2bf40b329 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -21,7 +21,7 @@ , zlib , curl , qrupdate -, openblas +, blas, lapack , arpack , libwebp , gl2ps @@ -53,17 +53,7 @@ , darwin }: -let - suitesparseOrig = suitesparse; - qrupdateOrig = qrupdate; -in -# integer width is determined by openblas, so all dependencies must be built -# with exactly the same openblas -let - suitesparse = - if suitesparseOrig != null then suitesparseOrig.override { inherit openblas; } else null; - qrupdate = if qrupdateOrig != null then qrupdateOrig.override { inherit openblas; } else null; -in +assert (!blas.is64bit) && (!lapack.is64bit); stdenv.mkDerivation rec { version = "5.2.0"; @@ -85,7 +75,8 @@ stdenv.mkDerivation rec { fltk zlib curl - openblas + blas + lapack libsndfile fftw fftwSinglePrec @@ -134,15 +125,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # See https://savannah.gnu.org/bugs/?50339 - F77_INTEGER_8_FLAG = if openblas.blas64 then "-fdefault-integer-8" else ""; + F77_INTEGER_8_FLAG = if blas.is64bit then "-fdefault-integer-8" else ""; configureFlags = [ - "--with-blas=openblas" - "--with-lapack=openblas" + "--with-blas=blas" + "--with-lapack=lapack" + (if blas.is64bit then "--enable-64" else "--disable-64") ] ++ (if stdenv.isDarwin then [ "--enable-link-all-dependencies" ] else [ ]) ++ stdenv.lib.optionals enableReadline [ "--enable-readline" ] - ++ stdenv.lib.optionals openblas.blas64 [ "--enable-64" ] ++ stdenv.lib.optionals stdenv.isDarwin [ "--with-x=no" ] ++ stdenv.lib.optionals enableQt [ "--with-qt=5" ] ++ stdenv.lib.optionals enableJIT [ "--enable-jit" ] diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index f6710d4fc57..3251b1c9e0d 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, openblasCompat, superlu, hdf5 }: +{ stdenv, fetchurl, cmake, blas, lapack, superlu, hdf5 }: stdenv.mkDerivation rec { pname = "armadillo"; @@ -10,10 +10,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ openblasCompat superlu hdf5 ]; + buildInputs = [ blas lapack superlu hdf5 ]; cmakeFlags = [ - "-DLAPACK_LIBRARY=${openblasCompat}/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary}" + "-DLAPACK_LIBRARY=${lapack}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}" "-DDETECT_HDF5=ON" ]; diff --git a/pkgs/development/libraries/arrayfire/default.nix b/pkgs/development/libraries/arrayfire/default.nix index 21e93a8cd49..e637aab48b2 100644 --- a/pkgs/development/libraries/arrayfire/default.nix +++ b/pkgs/development/libraries/arrayfire/default.nix @@ -1,14 +1,12 @@ { stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig -, cudatoolkit, opencl-clhpp, ocl-icd, fftw, fftwFloat, mkl -, blas, openblas, boost, mesa, libGLU, libGL +, opencl-clhpp, ocl-icd, fftw, fftwFloat, mkl +, blas, lapack, boost, mesa, libGLU, libGL , freeimage, python, clfft, clblas , doxygen, buildDocs ? false +, cudaSupport ? false, cudatoolkit }: -let - strOnLinux = stdenv.lib.optionalString stdenv.isLinux; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "arrayfire"; version = "3.6.4"; @@ -21,8 +19,7 @@ in stdenv.mkDerivation rec { "-DAF_BUILD_OPENCL=OFF" "-DAF_BUILD_EXAMPLES=OFF" "-DBUILD_TESTING=OFF" - (strOnLinux "-DCMAKE_LIBRARY_PATH=${cudatoolkit}/lib/stubs") - ]; + ] ++ stdenv.lib.optional cudaSupport "-DCMAKE_LIBRARY_PATH=${cudatoolkit}/lib/stubs"; patches = [ ./no-download.patch ]; @@ -35,7 +32,7 @@ in stdenv.mkDerivation rec { cp -R --no-preserve=mode,ownership ${opencl-clhpp}/include/CL/cl2.hpp ./build/include/CL/cl2.hpp ''; - preBuild = strOnLinux '' + preBuild = stdenv.lib.optionalString cudaSupport '' export CUDA_PATH="${cudatoolkit}" ''; @@ -50,12 +47,13 @@ in stdenv.mkDerivation rec { buildInputs = [ opencl-clhpp fftw fftwFloat mkl - openblas + blas lapack libGLU libGL mesa freeimage boost.out boost.dev - ] ++ (stdenv.lib.optional stdenv.isLinux [ cudatoolkit ocl-icd ]) - ++ (stdenv.lib.optional buildDocs [ doxygen ]); + ] ++ (stdenv.lib.optional stdenv.isLinux ocl-icd) + ++ (stdenv.lib.optional cudaSupport cudatoolkit) + ++ (stdenv.lib.optional buildDocs doxygen); meta = with stdenv.lib; { description = "A general-purpose library for parallel and massively-parallel computations"; diff --git a/pkgs/development/libraries/flint/default.nix b/pkgs/development/libraries/flint/default.nix index 48d7735498c..3c768fc472c 100644 --- a/pkgs/development/libraries/flint/default.nix +++ b/pkgs/development/libraries/flint/default.nix @@ -5,11 +5,11 @@ , mpir , mpfr , ntl -, openblas ? null +, openblas ? null, blas, lapack , withBlas ? true }: -assert withBlas -> openblas != null; +assert withBlas -> openblas != null && blas.implementation == "openblas" && lapack.implementation == "openblas"; stdenv.mkDerivation rec { pname = "flint"; diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix index 6011dd03a46..fdaf518c611 100644 --- a/pkgs/development/libraries/givaro/default.nix +++ b/pkgs/development/libraries/givaro/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [autoconf automake libtool gmpxx]; + buildInputs = [autoconf automake libtool]; + propagatedBuildInputs = [ gmpxx ]; configureFlags = [ "--disable-optimization" diff --git a/pkgs/development/libraries/globalarrays/default.nix b/pkgs/development/libraries/globalarrays/default.nix index 654fcc31eb7..423272fcd45 100644 --- a/pkgs/development/libraries/globalarrays/default.nix +++ b/pkgs/development/libraries/globalarrays/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchpatch, fetchFromGitHub, autoreconfHook -, openblas, gfortran, openssh, openmpi +, blas, gfortran, openssh, openmpi } : let @@ -17,7 +17,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ openmpi openblas gfortran openssh ]; + buildInputs = [ openmpi blas gfortran openssh ]; preConfigure = '' configureFlagsArray+=( "--enable-i8" \ @@ -25,7 +25,7 @@ in stdenv.mkDerivation { "--with-mpi3" \ "--enable-eispack" \ "--enable-underscoring" \ - "--with-blas8=${openblas}/lib -lopenblas" ) + "--with-blas8=${blas}/lib -lblas" ) ''; enableParallelBuilding = true; @@ -38,5 +38,3 @@ in stdenv.mkDerivation { platforms = platforms.linux; }; } - - diff --git a/pkgs/development/libraries/iml/default.nix b/pkgs/development/libraries/iml/default.nix index 598d7a58ef9..cf1d9018fd5 100644 --- a/pkgs/development/libraries/iml/default.nix +++ b/pkgs/development/libraries/iml/default.nix @@ -1,4 +1,4 @@ -{stdenv, autoreconfHook, fetchurl, gmp, openblas}: +{stdenv, autoreconfHook, fetchurl, gmp, blas}: stdenv.mkDerivation rec { pname = "iml"; version = "1.0.5"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ gmp - openblas + blas ]; nativeBuildInputs = [ autoreconfHook @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-gmp-include=${gmp.dev}/include" "--with-gmp-lib=${gmp}/lib" - "--with-cblas=-lopenblas" + "--with-cblas=-lblas" ]; meta = { inherit version; diff --git a/pkgs/development/libraries/libcint/default.nix b/pkgs/development/libraries/libcint/default.nix index e56583e45ba..3191dc44467 100644 --- a/pkgs/development/libraries/libcint/default.nix +++ b/pkgs/development/libraries/libcint/default.nix @@ -2,7 +2,7 @@ , lib , fetchFromGitHub , cmake -, openblas +, blas # Check Inputs , python2 }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ openblas ]; + buildInputs = [ blas ]; cmakeFlags = [ "-DENABLE_TEST=1" "-DQUICK_TEST=1" diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index ed337c7ebfe..6f327ca396a 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -11,7 +11,7 @@ , enableEXR ? !stdenv.isDarwin, openexr, ilmbase , enableJPEG2K ? false, jasper # disable jasper by default (many CVE) , enableEigen ? true, eigen -, enableOpenblas ? true, openblas +, enableOpenblas ? true, openblas, blas, lapack , enableContrib ? true , enableCuda ? (config.cudaSupport or false) && @@ -35,6 +35,8 @@ , AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2 }: +assert blas.implementation == "openblas" && lapack.implementation == "openblas"; + let version = "3.4.8"; diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index cec8a9aa363..abec6e1ace5 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -11,7 +11,7 @@ , enableEXR ? !stdenv.isDarwin, openexr, ilmbase , enableJPEG2K ? false, jasper # disable jasper by default (many CVE) , enableEigen ? true, eigen -, enableOpenblas ? true, openblas +, enableOpenblas ? true, openblas, blas, lapack , enableContrib ? true , enableCuda ? (config.cudaSupport or false) && @@ -35,6 +35,8 @@ , AVFoundation, Cocoa, VideoDecodeAcceleration, bzip2 }: +assert blas.implementation == "openblas" && lapack.implementation == "openblas"; + let version = "4.1.2"; diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix index a31cc4e8ed4..f6c16583ad7 100644 --- a/pkgs/development/libraries/qrupdate/default.nix +++ b/pkgs/development/libraries/qrupdate/default.nix @@ -1,7 +1,8 @@ { stdenv , fetchurl , gfortran -, openblas +, blas +, lapack }: stdenv.mkDerivation { name = "qrupdate-1.1.2"; @@ -13,11 +14,11 @@ stdenv.mkDerivation { configurePhase = '' export PREFIX=$out - sed -i -e 's,^BLAS=.*,BLAS=-L${openblas}/lib -lopenblas,' \ - -e 's,^LAPACK=.*,LAPACK=-L${openblas}/lib -lopenblas,' \ + sed -i -e 's,^BLAS=.*,BLAS=-L${blas}/lib -lblas,' \ + -e 's,^LAPACK=.*,LAPACK=-L${lapack}/lib -llapack,' \ Makeconf '' - + stdenv.lib.optionalString openblas.blas64 + + stdenv.lib.optionalString blas.is64bit '' sed -i Makeconf -e '/^FFLAGS=.*/ s/$/-fdefault-integer-8/' ''; @@ -30,7 +31,7 @@ stdenv.mkDerivation { installTargets = stdenv.lib.optionals stdenv.isDarwin [ "install-staticlib" "install-shlib" ]; - buildInputs = [ gfortran openblas ]; + buildInputs = [ gfortran blas lapack ]; meta = with stdenv.lib; { description = "Library for fast updating of qr and cholesky decompositions"; diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index 961a1c544e6..a5fbb679df5 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake -, gfortran, openblas, eigen }: +, gfortran, blas, lapack, eigen }: with stdenv.lib; @@ -18,15 +18,16 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ gfortran openblas eigen ]; + buildInputs = [ gfortran blas lapack eigen ]; doCheck = true; - BLAS_LIBS = "-L${openblas}/lib -lopenblas"; + BLAS_LIBS = "-L${blas}/lib -lblas"; + LAPACK_LIBS = "-L${lapack}/lib -llapack"; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - "-DINTERFACE64=${optionalString openblas.blas64 "1"}" + "-DINTERFACE64=${optionalString blas.is64bit "1"}" ]; preCheck = if stdenv.isDarwin then '' diff --git a/pkgs/development/libraries/science/math/cholmod-extra/default.nix b/pkgs/development/libraries/science/math/cholmod-extra/default.nix index 0f2d35329c4..c381f56277e 100644 --- a/pkgs/development/libraries/science/math/cholmod-extra/default.nix +++ b/pkgs/development/libraries/science/math/cholmod-extra/default.nix @@ -1,10 +1,5 @@ -{ stdenv, fetchFromGitHub, gfortran, suitesparse, openblas }: -let - suitesparse_ = suitesparse; -in let - # SuiteSparse must use the same openblas - suitesparse = suitesparse_.override { inherit openblas; }; -in stdenv.mkDerivation rec { +{ stdenv, fetchFromGitHub, gfortran, suitesparse, blas, lapack }: +stdenv.mkDerivation rec { pname = "cholmod-extra"; version = "1.2.0"; @@ -15,10 +10,10 @@ in stdenv.mkDerivation rec { sha256 = "0hz1lfp0zaarvl0dv0zgp337hyd8np41kmdpz5rr3fc6yzw7vmkg"; }; - buildInputs = [ suitesparse gfortran openblas ]; + buildInputs = [ suitesparse gfortran blas lapack ]; - buildFlags = [ - "BLAS=-lopenblas" + makeFlags = [ + "BLAS=-lcblas" ]; installFlags = [ diff --git a/pkgs/development/libraries/science/math/fenics/default.nix b/pkgs/development/libraries/science/math/fenics/default.nix index 2abf8e980b8..4e89aeebe2b 100644 --- a/pkgs/development/libraries/science/math/fenics/default.nix +++ b/pkgs/development/libraries/science/math/fenics/default.nix @@ -24,6 +24,8 @@ , suitesparse , swig , zlib +, blas +, lapack }: let version = "2019.1.0"; @@ -176,13 +178,14 @@ let hdf5 mpi numpy - (numpy.blas) + blas + lapack ply python scotch six sphinx - (suitesparse.override { openblas = numpy.blas; }) + suitesparse swig sympy ufl diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index a3bc1c380cf..647fd82ec0e 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, unzip, openblas, gfortran }: +{ stdenv, fetchurl, unzip, blas, lapack, gfortran }: + +assert (!blas.is64bit) && (!lapack.is64bit); stdenv.mkDerivation rec { pname = "ipopt"; @@ -12,13 +14,13 @@ stdenv.mkDerivation rec { CXXDEFS = [ "-DHAVE_RAND" "-DHAVE_CSTRING" "-DHAVE_CSTDIO" ]; configureFlags = [ - "--with-blas-lib=-lopenblas" - "--with-lapack-lib=-lopenblas" + "--with-blas-lib=-lblas" + "--with-lapack-lib=-llapack" ]; nativeBuildInputs = [ unzip ]; - buildInputs = [ gfortran openblas ]; + buildInputs = [ gfortran blas lapack ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/science/math/magma/default.nix b/pkgs/development/libraries/science/math/magma/default.nix index 5e62ce75aa6..b34139e7f48 100644 --- a/pkgs/development/libraries/science/math/magma/default.nix +++ b/pkgs/development/libraries/science/math/magma/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, gfortran, cudatoolkit, libpthreadstubs, liblapack +{ stdenv, fetchurl, cmake, gfortran, cudatoolkit, libpthreadstubs, lapack, blas , mklSupport ? false, mkl ? null }: @@ -18,7 +18,7 @@ in stdenv.mkDerivation { }; buildInputs = [ gfortran cudatoolkit libpthreadstubs cmake ] - ++ (if mklSupport then [ mkl ] else [ liblapack ]); + ++ (if mklSupport then [ mkl ] else [ lapack blas ]); doCheck = false; diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix index 911f0a1cf89..200dd58a435 100644 --- a/pkgs/development/libraries/science/math/petsc/default.nix +++ b/pkgs/development/libraries/science/math/petsc/default.nix @@ -1,4 +1,4 @@ -{ stdenv , fetchurl , blas , gfortran , liblapack , python }: +{ stdenv , fetchurl , blas , gfortran , lapack , python }: stdenv.mkDerivation rec { pname = "petsc"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0943bydmsq3sjwj3rxhb8hx58b1fm8vymny731557fs10g5zfbyz"; }; - nativeBuildInputs = [ blas gfortran.cc.lib liblapack python ]; + nativeBuildInputs = [ blas gfortran.cc.lib lapack python ]; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace config/install.py \ @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { "--with-cxx=$CXX" "--with-fc=0" "--with-mpi=0" - "--with-blas-lib=[${blas}/lib/libblas.a,${gfortran.cc.lib}/lib/libgfortran.a]" - "--with-lapack-lib=[${liblapack}/lib/liblapack.a,${gfortran.cc.lib}/lib/libgfortran.a]" + "--with-blas-lib=[${blas}/lib/libblas.so,${gfortran.cc.lib}/lib/libgfortran.a]" + "--with-lapack-lib=[${lapack}/lib/liblapack.so,${gfortran.cc.lib}/lib/libgfortran.a]" ) ''; diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index f0a93c7be64..d2021986029 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchFromGitHub, cmake, openssh -, gfortran, mpi, openblasCompat +, gfortran, mpi, blas, lapack } : +assert (!blas.is64bit) && (!lapack.is64bit); stdenv.mkDerivation rec { pname = "scalapack"; @@ -15,7 +16,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake openssh ]; - buildInputs = [ mpi gfortran openblasCompat ]; + buildInputs = [ mpi gfortran blas lapack ]; enableParallelBuilding = true; @@ -24,8 +25,8 @@ stdenv.mkDerivation rec { preConfigure = '' cmakeFlagsArray+=( -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF - -DLAPACK_LIBRARIES="-lopenblas" - -DBLAS_LIBRARIES="-lopenblas" + -DLAPACK_LIBRARIES="-llapack" + -DBLAS_LIBRARIES="-lblas" ) ''; diff --git a/pkgs/development/libraries/science/math/scs/default.nix b/pkgs/development/libraries/science/math/scs/default.nix index db808b093fe..7f7171f67e5 100644 --- a/pkgs/development/libraries/science/math/scs/default.nix +++ b/pkgs/development/libraries/science/math/scs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, blas, liblapack, gfortran, fixDarwinDylibNames }: +{ stdenv, fetchFromGitHub, blas, lapack, gfortran, fixDarwinDylibNames }: stdenv.mkDerivation rec { pname = "scs"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; - buildInputs = [ blas liblapack gfortran.cc.lib ]; + buildInputs = [ blas lapack gfortran.cc.lib ]; doCheck = true; diff --git a/pkgs/development/libraries/science/math/suitesparse/4.2.nix b/pkgs/development/libraries/science/math/suitesparse/4.2.nix index 755a9f5118b..34a1fb7ad9e 100644 --- a/pkgs/development/libraries/science/math/suitesparse/4.2.nix +++ b/pkgs/development/libraries/science/math/suitesparse/4.2.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, gfortran, openblas }: +{ stdenv, fetchurl, gfortran, blas, lapack }: let - int_t = if openblas.blas64 then "int64_t" else "int32_t"; + int_t = if blas.is64bit then "int64_t" else "int32_t"; in stdenv.mkDerivation rec { version = "4.2.1"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ gfortran ]; - buildInputs = [ openblas ]; + buildInputs = [ blas lapack ]; preConfigure = '' mkdir -p $out/lib @@ -29,8 +29,8 @@ stdenv.mkDerivation rec { "PREFIX=\"$(out)\"" "INSTALL_LIB=$(out)/lib" "INSTALL_INCLUDE=$(out)/include" - "BLAS=-lopenblas" - "LAPACK=" + "BLAS=-lblas" + "LAPACK=-llapack" ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/science/math/suitesparse/4.4.nix b/pkgs/development/libraries/science/math/suitesparse/4.4.nix index 7f85f8e329e..b2b7e666b7e 100644 --- a/pkgs/development/libraries/science/math/suitesparse/4.4.nix +++ b/pkgs/development/libraries/science/math/suitesparse/4.4.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, gfortran, openblas -, enableCuda ? false, cudatoolkit +{ stdenv, fetchurl, gfortran, blas, lapack +, enableCuda ? false, cudatoolkit }: let version = "4.4.4"; name = "suitesparse-${version}"; - int_t = if openblas.blas64 then "int64_t" else "int32_t"; + int_t = if blas.is64bit then "int64_t" else "int32_t"; SHLIB_EXT = stdenv.hostPlatform.extensions.sharedLibrary; in stdenv.mkDerivation { @@ -51,8 +51,8 @@ stdenv.mkDerivation { "PREFIX=\"$(out)\"" "INSTALL_LIB=$(out)/lib" "INSTALL_INCLUDE=$(out)/include" - "BLAS=-lopenblas" - "LAPACK=" + "BLAS=-lblas" + "LAPACK=-llapack" ]; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin " -DNTIMER"; @@ -64,7 +64,7 @@ stdenv.mkDerivation { for i in "$out"/lib/lib*.a; do ar -x $i done - ${if enableCuda then cudatoolkit else stdenv.cc.outPath}/bin/${if enableCuda then "nvcc" else "cc"} *.o ${if stdenv.isDarwin then "-dynamiclib" else "--shared"} -o "$out/lib/libsuitesparse${SHLIB_EXT}" -lopenblas ${stdenv.lib.optionalString enableCuda "-lcublas"} + ${if enableCuda then cudatoolkit else stdenv.cc.outPath}/bin/${if enableCuda then "nvcc" else "cc"} *.o ${if stdenv.isDarwin then "-dynamiclib" else "--shared"} -o "$out/lib/libsuitesparse${SHLIB_EXT}" -lblas ${stdenv.lib.optionalString enableCuda "-lcublas"} ) for i in umfpack cholmod amd camd colamd spqr; do ln -s libsuitesparse${SHLIB_EXT} "$out"/lib/lib$i${SHLIB_EXT} @@ -88,7 +88,7 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ gfortran ]; - buildInputs = [ openblas ]; + buildInputs = [ blas lapack ]; meta = with stdenv.lib; { homepage = "http://faculty.cse.tamu.edu/davis/suitesparse.html"; diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index 938ffb59996..48177987a7a 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , gfortran -, openblas +, blas, lapack , metis , fixDarwinDylibNames , gnum4 @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; buildInputs = [ - openblas + blas lapack metis gfortran.cc.lib ] ++ stdenv.lib.optional enableCuda cudatoolkit; @@ -41,10 +41,10 @@ stdenv.mkDerivation rec { "INSTALL=${placeholder "out"}" "INSTALL_INCLUDE=${placeholder "dev"}/include" "JOBS=$(NIX_BUILD_CORES)" - "BLAS=-lopenblas" + "BLAS=-lblas" + "LAPACK=-llapack" "MY_METIS_LIB=-lmetis" - "LAPACK=" - ] ++ stdenv.lib.optionals openblas.blas64 [ + ] ++ stdenv.lib.optionals blas.is64bit [ "CFLAGS=-DBLAS64" ] ++ stdenv.lib.optionals enableCuda [ "CUDA_PATH=${cudatoolkit}" diff --git a/pkgs/development/libraries/science/math/superlu/default.nix b/pkgs/development/libraries/science/math/superlu/default.nix index dc43dc21ea4..05ceb21387d 100644 --- a/pkgs/development/libraries/science/math/superlu/default.nix +++ b/pkgs/development/libraries/science/math/superlu/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, cmake, - gfortran, openblasCompat}: + gfortran, blas, lapack}: + +assert (!blas.is64bit) && (!lapack.is64bit); stdenv.mkDerivation rec { version = "5.2.1"; @@ -12,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake gfortran ]; - propagatedBuildInputs = [ openblasCompat ]; + propagatedBuildInputs = [ blas ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=true" @@ -20,7 +22,6 @@ stdenv.mkDerivation rec { ]; patches = [ - ./find-openblas-library.patch ./add-superlu-lib-as-dependency-for-the-unit-tests.patch ]; diff --git a/pkgs/development/libraries/science/math/superlu/find-openblas-library.patch b/pkgs/development/libraries/science/math/superlu/find-openblas-library.patch deleted file mode 100644 index ce7bc6974c9..00000000000 --- a/pkgs/development/libraries/science/math/superlu/find-openblas-library.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -75,6 +75,8 @@ set(CMAKE_C_FLAGS_RELEASE "-O3" CACHE STRING "") - ###################################################################### - # - #--------------------- BLAS --------------------- -+find_package(OpenBLAS) -+set(TPL_BLAS_LIBRARIES ${OpenBLAS_LIBRARIES}) - if(NOT enable_blaslib) - if (TPL_BLAS_LIBRARIES) - set(BLAS_FOUND TRUE) diff --git a/pkgs/development/libraries/sundials/2.x.nix b/pkgs/development/libraries/sundials/2.x.nix index 2d8a8f55c67..08cbd52ba39 100644 --- a/pkgs/development/libraries/sundials/2.x.nix +++ b/pkgs/development/libraries/sundials/2.x.nix @@ -4,15 +4,13 @@ , python # GNU Octave needs KLU for ODE solvers , suitesparse -, liblapack +, blas, lapack , gfortran , lapackSupport ? true }: -let liblapackShared = liblapack.override { - shared = true; -}; +assert (!blas.is64bit) && (!lapack.is64bit); -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "sundials"; version = "2.7.0"; @@ -44,7 +42,7 @@ in stdenv.mkDerivation rec { "-DKLU_INCLUDE_DIR=${suitesparse}/include" "-DKLU_LIBRARY_DIR=${suitesparse}/lib" "-DLAPACK_ENABLE=ON" - "-DLAPACK_LIBRARIES=${liblapackShared}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary};${liblapackShared}/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}" + "-DLAPACK_LIBRARIES=${lapack}/lib/lapack${stdenv.hostPlatform.extensions.sharedLibrary};${blas}/lib/blas${stdenv.hostPlatform.extensions.sharedLibrary}" ]; # flaky tests, and patch in https://github.com/LLNL/sundials/pull/21 doesn't apply cleanly for sundials_3 diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index 2405b1b6fdc..8ed8d6cfcb5 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -2,17 +2,18 @@ , cmake , fetchurl , python -, openblas +, blas +, lapack , gfortran , lapackSupport ? true }: -let openblas32 = openblas.override { blas64 = false; }; +assert (!blas.is64bit) && (!lapack.is64bit); -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "sundials"; version = "5.1.0"; - buildInputs = [ python ] ++ stdenv.lib.optionals (lapackSupport) [ gfortran openblas32 ]; + buildInputs = [ python ] ++ stdenv.lib.optionals (lapackSupport) [ gfortran blas lapack ]; nativeBuildInputs = [ cmake ]; src = fetchurl { @@ -33,7 +34,7 @@ in stdenv.mkDerivation rec { ] ++ stdenv.lib.optionals (lapackSupport) [ "-DSUNDIALS_INDEX_TYPE=int32_t" "-DLAPACK_ENABLE=ON" - "-DLAPACK_LIBRARIES=${openblas32}/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary}" + "-DLAPACK_LIBRARIES=${lapack}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}" ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/lacaml/default.nix b/pkgs/development/ocaml-modules/lacaml/default.nix index 41bfb3125e3..e4da2216a83 100644 --- a/pkgs/development/ocaml-modules/lacaml/default.nix +++ b/pkgs/development/ocaml-modules/lacaml/default.nix @@ -1,6 +1,7 @@ -{ stdenv, fetchFromGitHub, darwin, ocaml, findlib, dune, base, stdio, liblapack, blas }: +{ stdenv, fetchFromGitHub, darwin, ocaml, findlib, dune, base, stdio, lapack, blas }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.05.0"; +assert (!blas.is64bit) && (!lapack.is64bit); stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-lacaml"; @@ -14,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ ocaml findlib dune base stdio ]; - propagatedBuildInputs = [ liblapack blas ] ++ + propagatedBuildInputs = [ lapack blas ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ]; diff --git a/pkgs/development/ocaml-modules/owl/default.nix b/pkgs/development/ocaml-modules/owl/default.nix index 7fa912d808d..c84743a8da5 100644 --- a/pkgs/development/ocaml-modules/owl/default.nix +++ b/pkgs/development/ocaml-modules/owl/default.nix @@ -6,11 +6,14 @@ , eigen , stdio , stdlib-shims -, openblasCompat +, openblas, blas, lapack , owl-base , npy }: +assert (!blas.is64bit) && (!lapack.is64bit); +assert blas.implementation == "openblas" && lapack.implementation == "openblas"; + buildDunePackage rec { pname = "owl"; @@ -19,7 +22,7 @@ buildDunePackage rec { checkInputs = [ alcotest ]; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ - eigen stdio stdlib-shims openblasCompat owl-base npy + eigen stdio stdlib-shims openblas owl-base npy ]; doCheck = !stdenv.isDarwin; # https://github.com/owlbarn/owl/issues/462 diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index b48f6b99136..9266f406b15 100644 --- a/pkgs/development/python-modules/cvxopt/default.nix +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -4,7 +4,7 @@ , fetchPypi , isPyPy , python -, openblasCompat # build segfaults with regular openblas +, blas, lapack # build segfaults with 64-bit blas , suitesparse , glpk ? null , gsl ? null @@ -14,6 +14,8 @@ , withFftw ? true }: +assert (!blas.is64bit) && (!lapack.is64bit); + buildPythonPackage rec { pname = "cvxopt"; version = "1.2.4"; @@ -25,12 +27,13 @@ buildPythonPackage rec { sha256 = "1h9g79gxpgpy6xciqyypihw5q4ngp322lpkka1nkwk0ysybfsp7s"; }; + buildInputs = [ blas lapack ]; + # similar to Gsl, glpk, fftw there is also a dsdp interface # but dsdp is not yet packaged in nixpkgs preConfigure = '' - export CVXOPT_BLAS_LIB_DIR=${openblasCompat}/lib - export CVXOPT_BLAS_LIB=openblas - export CVXOPT_LAPACK_LIB=openblas + export CVXOPT_BLAS_LIB=blas + export CVXOPT_LAPACK_LIB=lapack export CVXOPT_SUITESPARSE_LIB_DIR=${lib.getLib suitesparse}/lib export CVXOPT_SUITESPARSE_INC_DIR=${lib.getDev suitesparse}/include '' + lib.optionalString withGsl '' diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index a863ef60d4a..949d5e5898b 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -5,21 +5,23 @@ , gfortran , pytest , blas +, lapack , writeTextFile , isPyPy , cython , setuptoolsBuildHook }: +assert (!blas.is64bit) && (!lapack.is64bit); + let - blasImplementation = lib.nameFromURL blas.name "-"; cfg = writeTextFile { name = "site.cfg"; text = (lib.generators.toINI {} { - ${blasImplementation} = { - include_dirs = "${blas}/include"; - library_dirs = "${blas}/lib"; - } // lib.optionalAttrs (blasImplementation == "mkl") { + ${blas.implementation} = { + include_dirs = "${blas}/include:${lapack}/include"; + library_dirs = "${blas}/lib:${lapack}/lib"; + } // lib.optionalAttrs (blas.implementation == "mkl") { mkl_libs = "mkl_rt"; lapack_libs = ""; }; @@ -37,7 +39,7 @@ in buildPythonPackage rec { }; nativeBuildInputs = [ gfortran pytest cython setuptoolsBuildHook ]; - buildInputs = [ blas ]; + buildInputs = [ blas lapack ]; patches = lib.optionals python.hasDistutilsCxxPatch [ # We patch cpython/distutils to fix https://bugs.python.org/issue1222585 @@ -68,8 +70,10 @@ in buildPythonPackage rec { ''; passthru = { - blas = blas; - inherit blasImplementation cfg; + # just for backwards compatibility + blas = blas.provider; + blasImplementation = blas.implementation; + inherit cfg; }; # Disable test diff --git a/pkgs/development/python-modules/prox-tv/default.nix b/pkgs/development/python-modules/prox-tv/default.nix index 60482d45551..1cc2ab89360 100644 --- a/pkgs/development/python-modules/prox-tv/default.nix +++ b/pkgs/development/python-modules/prox-tv/default.nix @@ -1,13 +1,11 @@ { lib , blas +, lapack , buildPythonPackage , cffi , fetchFromGitHub -, liblapack , nose , numpy -, openblas -, useOpenblas ? true }: buildPythonPackage { @@ -21,8 +19,6 @@ buildPythonPackage { sha256 = "0mlrjbb5rw78dgijkr3bspmsskk6jqs9y7xpsgs35i46dvb327q5"; }; - patches = lib.optional useOpenblas ./use-openblas.patch; - checkInputs = [ nose ]; @@ -32,12 +28,7 @@ buildPythonPackage { cffi ]; - buildInputs = ( - if useOpenblas then - [ openblas ] - else - [ blas liblapack ] - ); + buildInputs = [ blas lapack ]; enableParallelBuilding = true; diff --git a/pkgs/development/python-modules/prox-tv/use-openblas.patch b/pkgs/development/python-modules/prox-tv/use-openblas.patch deleted file mode 100644 index e96faa4d600..00000000000 --- a/pkgs/development/python-modules/prox-tv/use-openblas.patch +++ /dev/null @@ -1,11 +0,0 @@ -index f100b35..448bbaf 100644 ---- a/prox_tv/prox_tv_build.py -+++ b/prox_tv/prox_tv_build.py -@@ -109,6 +109,6 @@ ffi.set_source( - define_macros=[('NOMATLAB', 1)], - extra_compile_args=extra_compile_args, - extra_link_args=extra_link_args, -- libraries=['blas', 'lapack'], -+ libraries=['openblas'], - include_dirs=['/usr/include'] - ) diff --git a/pkgs/development/python-modules/pysparse/default.nix b/pkgs/development/python-modules/pysparse/default.nix index 41f67a4140d..fda5ad59608 100644 --- a/pkgs/development/python-modules/pysparse/default.nix +++ b/pkgs/development/python-modules/pysparse/default.nix @@ -3,7 +3,8 @@ , fetchFromGitHub , numpy , setuptools -, liblapack +, blas +, lapack , isPy27 , python }: @@ -24,8 +25,8 @@ buildPythonPackage { propagatedBuildInputs = [ numpy - numpy.blas - liblapack + blas + lapack ]; # Include patches from working version of PySparse 1.3-dev in diff --git a/pkgs/development/python-modules/scs/default.nix b/pkgs/development/python-modules/scs/default.nix index 4e500d68535..128e9276608 100644 --- a/pkgs/development/python-modules/scs/default.nix +++ b/pkgs/development/python-modules/scs/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , blas -, liblapack +, lapack , numpy , scipy , scs @@ -26,7 +26,7 @@ buildPythonPackage rec { ''; buildInputs = [ - liblapack + lapack blas ]; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 5ee2423c983..44ff794654d 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -252,7 +252,7 @@ let data_table = [pkgs.zlib.dev] ++ lib.optional stdenv.isDarwin pkgs.llvmPackages.openmp; devEMF = [ pkgs.xorg.libXft.dev pkgs.x11 ]; diversitree = [ pkgs.gsl_1 pkgs.fftw ]; - EMCluster = [ pkgs.liblapack ]; + EMCluster = [ pkgs.lapack ]; fftw = [ pkgs.fftw.dev ]; fftwtools = [ pkgs.fftw.dev ]; Formula = [ pkgs.gmp ]; @@ -808,11 +808,11 @@ let }); slfm = old.slfm.overrideDerivation (attrs: { - PKG_LIBS = "-L${pkgs.openblasCompat}/lib -lopenblas"; + PKG_LIBS = "-L${pkgs.blas}/lib -lblas -L${pkgs.lapack}/lib -llapack"; }); SamplerCompare = old.SamplerCompare.overrideDerivation (attrs: { - PKG_LIBS = "-L${pkgs.openblasCompat}/lib -lopenblas"; + PKG_LIBS = "-L${pkgs.blas}/lib -lblas -L${pkgs.lapack}/lib -llapack"; }); EMCluster = old.EMCluster.overrideDerivation (attrs: { diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index 8301dcd49b8..04340ac4e89 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -275,20 +275,15 @@ self: super: old: let blas = old.passthru.args.blas or pkgs.openblasCompat; - blasImplementation = lib.nameFromURL blas.name "-"; + lapack = old.passthru.args.lapack or pkgs.openblasCompat; cfg = pkgs.writeTextFile { name = "site.cfg"; - text = ( - lib.generators.toINI {} { - ${blasImplementation} = { - include_dirs = "${blas}/include"; - library_dirs = "${blas}/lib"; - } // lib.optionalAttrs (blasImplementation == "mkl") { - mkl_libs = "mkl_rt"; - lapack_libs = ""; - }; - } - ); + text = (lib.generators.toINI {} { + ${blas.implementation} = { + include_dirs = "${blas}/include:${lapack}/include"; + library_dirs = "${blas}/lib:${lapack}/lib"; + }; + }); }; in { @@ -299,8 +294,8 @@ self: super: ln -s ${cfg} site.cfg ''; passthru = old.passthru // { - blas = blas; - inherit blasImplementation cfg; + blsaImplementation = blas.implementation; + inherit blas cfg; }; } ); diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index 7b9e766f246..7f54b97a8e8 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, cmake, perl , glib, luajit, openssl, pcre, pkgconfig, sqlite, ragel, icu -, hyperscan, jemalloc, openblas, lua, libsodium +, hyperscan, jemalloc, blas, lapack, lua, libsodium , withBlas ? true , withHyperscan ? stdenv.isx86_64 , withLuaJIT ? stdenv.isx86_64 @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig perl ]; buildInputs = [ glib openssl pcre sqlite ragel icu jemalloc libsodium ] ++ lib.optional withHyperscan hyperscan - ++ lib.optional withBlas openblas + ++ lib.optionals withBlas [ blas lapack ] ++ lib.optional withLuaJIT luajit ++ lib.optional (!withLuaJIT) lua; cmakeFlags = [ diff --git a/pkgs/tools/misc/hpl/default.nix b/pkgs/tools/misc/hpl/default.nix index 6cacbaf0b84..c131de02180 100644 --- a/pkgs/tools/misc/hpl/default.nix +++ b/pkgs/tools/misc/hpl/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, openblasCompat, mpi } : +{ stdenv, fetchurl, blas, lapack, mpi } : + +assert (!blas.is64bit) && (!lapack.is64bit); stdenv.mkDerivation rec { pname = "hpl"; @@ -18,7 +20,7 @@ stdenv.mkDerivation rec { install -D testing/ptest/HPL.dat $out/share/hpl/HPL.dat ''; - buildInputs = [ openblasCompat mpi ]; + buildInputs = [ blas lapack mpi ]; meta = with stdenv.lib; { description = "Portable Implementation of the Linpack Benchmark for Distributed-Memory Computers"; @@ -28,4 +30,3 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.markuskowa ]; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1f11beb8ee3..3c9d5274abd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8702,25 +8702,21 @@ in julia_07 = callPackage ../development/compilers/julia/0.7.nix { gmp = gmp6; - openblas = openblasCompat; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; }; julia_10 = callPackage ../development/compilers/julia/1.0.nix { gmp = gmp6; - openblas = openblasCompat; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; }; julia_11 = callPackage ../development/compilers/julia/1.1.nix { gmp = gmp6; - openblas = openblasCompat; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; }; julia_13 = callPackage ../development/compilers/julia/1.3.nix { gmp = gmp6; - openblas = openblasCompat; inherit (darwin.apple_sdk.frameworks) CoreServices ApplicationServices; }; @@ -9404,16 +9400,13 @@ in octave = callPackage ../development/interpreters/octave { python = python3; - openblas = if stdenv.isDarwin then openblasCompat else openblas; }; octave-jit = callPackage ../development/interpreters/octave { python = python3; - openblas = if stdenv.isDarwin then openblasCompat else openblas; enableJIT = true; }; octaveFull = (lowPrio (libsForQt512.callPackage ../development/interpreters/octave { python = python3; - openblas = if stdenv.isDarwin then openblasCompat else openblas; enableQt = true; overridePlatforms = ["x86_64-linux" "x86_64-darwin"]; })); @@ -15252,7 +15245,6 @@ in texLive = texlive.combine { inherit (texlive) scheme-small inconsolata helvetic texinfo fancyvrb cm-super; }; - openblas = openblasCompat; withRecommendedPackages = false; inherit (darwin.apple_sdk.frameworks) Cocoa Foundation; inherit (darwin) libobjc; @@ -24191,7 +24183,7 @@ in molden = callPackage ../applications/science/chemistry/molden { }; - octopus = callPackage ../applications/science/chemistry/octopus { openblas=openblasCompat; }; + octopus = callPackage ../applications/science/chemistry/octopus { }; openmolcas = callPackage ../applications/science/chemistry/openmolcas { }; @@ -24532,7 +24524,7 @@ in sympow = callPackage ../development/libraries/science/math/sympow { }; - ipopt = callPackage ../development/libraries/science/math/ipopt { openblas = openblasCompat; }; + ipopt = callPackage ../development/libraries/science/math/ipopt { }; gmsh = callPackage ../applications/science/math/gmsh { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 81e75d808ff..ac6b5f59220 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4667,9 +4667,7 @@ in { Nuitka = callPackage ../development/python-modules/nuitka { }; numpy = let - numpy_ = callPackage ../development/python-modules/numpy { - blas = pkgs.openblasCompat; - }; + numpy_ = callPackage ../development/python-modules/numpy { }; numpy_2 = numpy_.overridePythonAttrs(oldAttrs: rec { version = "1.16.5"; src = oldAttrs.src.override { @@ -4952,11 +4950,7 @@ in { promise = callPackage ../development/python-modules/promise { }; - prox-tv = callPackage ../development/python-modules/prox-tv { - # We need to use blas instead of openblas on darwin, - # see https://github.com/NixOS/nixpkgs/pull/45013. - useOpenblas = ! stdenv.isDarwin; - }; + prox-tv = callPackage ../development/python-modules/prox-tv { }; pvlib = callPackage ../development/python-modules/pvlib { }; -- cgit v1.2.3 From 7841b4290f72af6041163cc1bdcab6a710b0d4a5 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 31 Mar 2020 02:39:39 -0400 Subject: pkgs/release-alternatives.nix: create Add some ability to test the different BLAS/LAPACK implementations together. --- pkgs/top-level/release-alternatives.nix | 91 +++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 pkgs/top-level/release-alternatives.nix diff --git a/pkgs/top-level/release-alternatives.nix b/pkgs/top-level/release-alternatives.nix new file mode 100644 index 00000000000..230e20417bc --- /dev/null +++ b/pkgs/top-level/release-alternatives.nix @@ -0,0 +1,91 @@ +{ pkgsFun ? import ../.. +, lib ? import ../../lib +, supportedSystems ? ["x86_64-linux"] +, allowUnfree ? false }: + +let + + # called BLAS here, but also tests LAPACK + blasUsers = [ + # "julia_07" "julia_10" "julia_11" "julia_13" "octave" "octaveFull" + "fflas-ffpack" "linbox" "R" "ipopt" "hpl" "rspamd" "octopus" + "sundials" "sundials_2" "superlu" "suitesparse_5_3" "suitesparse_4_4" + "suitesparse_4_2" "scs" "scalapack" "petsc" "cholmod-extra" + "arpack" "qrupdate" "libcint" "iml" "globalarrays" "arrayfire" "armadillo" + "xfitter" "lammps" "plink-ng" "quantum-espresso" "siesta" + "siesta-mpi" "shogun" "calculix" "csdp" "getdp" "giac" "gmsh" "jags" + "lammps" "lammps-mpi" + + # requires openblas + # "caffe" "mxnet" "flint" "sage" "sageWithDoc" + + # broken + # "gnss-sdr" "octave-jit" "openmodelica" "torch" + + # subpackages + ["pythonPackages" "numpy"] ["pythonPackages" "prox-tv"] ["pythonPackages" "scs"] + ["pythonPackages" "pysparse"] ["pythonPackages" "cvxopt"] + # ["pythonPackages" "fenics"] + ["rPackages" "slfm"] ["rPackages" "SamplerCompare"] + # ["rPackages" "EMCluster"] + # ["ocamlPackages" "lacaml"] + # ["ocamlPackages" "owl"] + ["haskellPackages" "bindings-levmar"] + ] ++ lib.optionals allowUnfree [ "magma" ]; + blas64Users = [ + "rspamd" "suitesparse_5_3" "suitesparse_4_4" + "suitesparse_4_2" "scs" "petsc" "magma" "cholmod-extra" + "arpack" "qrupdate" "iml" "globalarrays" "arrayfire" + "xfitter" "lammps" "plink-ng" "quantum-espresso" + "calculix" "csdp" "getdp" "giac" "jags" + "lammps" "lammps-mpi" + # ["ocamlPackages" "lacaml"] + ["haskellPackages" "bindings-levmar"] + ] ++ lib.optionals allowUnfree [ "magma" ]; + blasProviders = system: [ "openblasCompat" "lapack-reference" "openblas" ] + ++ lib.optionals (allowUnfree && system.isx86) ["mkl" "mkl64"]; + + blas64Providers = [ "mkl64" "openblas"]; + + mapListToAttrs = xs: f: builtins.listToAttrs (map (name: { + name = if builtins.isList name + then builtins.elemAt name (builtins.length name - 1) + else name; + value = f name; + }) xs); + +in + +{ + blas = mapListToAttrs supportedSystems (system': let system = lib.systems.elaborate { system = system'; }; + in mapListToAttrs (blasProviders system) (provider: let + is64bit = builtins.elem provider (["mkl64"] ++ lib.optional system.is64bit "openblas"); + pkgs = pkgsFun { + config = { inherit allowUnfree; }; + system = system'; + overlays = [(self: super: { + lapack = super.lapack.override { + lapackProvider = if provider == "mkl64" + then super.mkl + else builtins.getAttr provider super; + inherit is64bit; + }; + blas = super.blas.override { + blasProvider = if provider == "mkl64" + then super.mkl + else builtins.getAttr provider super; + inherit is64bit; + }; + })]; + }; + in mapListToAttrs (if builtins.elem provider blas64Providers + then blas64Users else blasUsers) + (attr: if builtins.isList attr + then lib.getAttrFromPath attr pkgs + else builtins.getAttr attr pkgs) + + // { recurseForDerivations = true; }) + // { recurseForDerivations = true; }) + // { recurseForDerivations = true; }; + recurseForDerivations = true; +} -- cgit v1.2.3 From d83e9c95738df2e9f912c239201f50e53e40810b Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 31 Mar 2020 14:53:02 -0400 Subject: setup-hooks/audit-blas.sh: init Add a simple hook that makes sure blas and lapack are linked to the right place. --- pkgs/build-support/setup-hooks/audit-blas.sh | 37 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/build-support/setup-hooks/audit-blas.sh diff --git a/pkgs/build-support/setup-hooks/audit-blas.sh b/pkgs/build-support/setup-hooks/audit-blas.sh new file mode 100644 index 00000000000..6a40073fb23 --- /dev/null +++ b/pkgs/build-support/setup-hooks/audit-blas.sh @@ -0,0 +1,37 @@ +# Ensure that we are always linking against “libblas.so.3” and +# “liblapack.so.3”. + +auditBlas() { + local dir="$prefix" + [ -e "$dir" ] || return 0 + + local i + while IFS= read -r -d $'\0' i; do + if ! isELF "$i"; then continue; fi + + if $OBJDUMP -p "$i" | grep 'NEEDED' | awk '{ print $2; }' | grep -q '\(libmkl_rt.so\|libopenblas.so.0\)'; then + echo "$i refers to a specific implementation of BLAS or LAPACK." + echo "This prevents users from switching BLAS/LAPACK implementations." + echo "Add \`blas' or \`lapack' to buildInputs instead of \`mkl' or \`openblas'." + exit 1 + fi + + (IFS=: + for dir in "$(patchelf --print-rpath "$i")"; do + if [ -f "$dir/libblas.so.3" ] || [ -f "$dir/libblas.so" ]; then + if [ "$dir" != "@blas@/lib" ]; then + echo "$dir is not allowed to contain a library named libblas.so.3" + exit 1 + fi + fi + if [ -f "$dir/liblapack.so.3" ] || [ -f "$dir/liblapack.so" ]; then + if [ "$dir" != "@lapack@/lib" ]; then + echo "$dir is not allowed to contain a library named liblapack.so.3" + exit 1 + fi + fi + done) + done < <(find "$dir" -type f -print0) +} + +fixupOutputHooks+=(auditBlas) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3c9d5274abd..37e000a25d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -104,6 +104,10 @@ in ### BUILD SUPPORT + auditBlasHook = makeSetupHook + { name = "auto-blas-hook"; deps = [ blas lapack ]; } + ../build-support/setup-hooks/audit-blas.sh; + autoreconfHook = makeSetupHook { deps = [ autoconf automake gettext libtool ]; } ../build-support/setup-hooks/autoreconf.sh; -- cgit v1.2.3 From 98fb0ede70388016a664e4d9b6543a95a79dd221 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Thu, 16 Apr 2020 18:06:49 -0500 Subject: arrayfire: remove mkl This is unfree. --- pkgs/development/libraries/arrayfire/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/arrayfire/default.nix b/pkgs/development/libraries/arrayfire/default.nix index e637aab48b2..9dd4b1b93a9 100644 --- a/pkgs/development/libraries/arrayfire/default.nix +++ b/pkgs/development/libraries/arrayfire/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig -, opencl-clhpp, ocl-icd, fftw, fftwFloat, mkl +, opencl-clhpp, ocl-icd, fftw, fftwFloat , blas, lapack, boost, mesa, libGLU, libGL , freeimage, python, clfft, clblas , doxygen, buildDocs ? false @@ -46,7 +46,6 @@ stdenv.mkDerivation rec { buildInputs = [ opencl-clhpp fftw fftwFloat - mkl blas lapack libGLU libGL mesa freeimage -- cgit v1.2.3 From fcf33e24996b4cd92a817057b36aeaf86fdb3c7d Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 17 Apr 2020 14:00:19 -0500 Subject: scs: breaks on 64bit blas --- pkgs/development/libraries/science/math/scs/default.nix | 2 ++ pkgs/top-level/release-alternatives.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/scs/default.nix b/pkgs/development/libraries/science/math/scs/default.nix index 7f7171f67e5..2dcb47f11ba 100644 --- a/pkgs/development/libraries/science/math/scs/default.nix +++ b/pkgs/development/libraries/science/math/scs/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchFromGitHub, blas, lapack, gfortran, fixDarwinDylibNames }: +assert (!blas.is64bit) && (!lapack.is64bit); + stdenv.mkDerivation rec { pname = "scs"; version = "2.1.1"; diff --git a/pkgs/top-level/release-alternatives.nix b/pkgs/top-level/release-alternatives.nix index 230e20417bc..c31a03c8093 100644 --- a/pkgs/top-level/release-alternatives.nix +++ b/pkgs/top-level/release-alternatives.nix @@ -34,7 +34,7 @@ let ] ++ lib.optionals allowUnfree [ "magma" ]; blas64Users = [ "rspamd" "suitesparse_5_3" "suitesparse_4_4" - "suitesparse_4_2" "scs" "petsc" "magma" "cholmod-extra" + "suitesparse_4_2" "petsc" "cholmod-extra" "arpack" "qrupdate" "iml" "globalarrays" "arrayfire" "xfitter" "lammps" "plink-ng" "quantum-espresso" "calculix" "csdp" "getdp" "giac" "jags" -- cgit v1.2.3 From 97fc083fd4b88b4aa96a930c4b61c14120ddc7e5 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 17 Apr 2020 14:18:47 -0500 Subject: giac: broken on 64-bit blas --- pkgs/applications/science/math/giac/default.nix | 1 + pkgs/top-level/release-alternatives.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index feb30b990ab..be3c1e6dcc8 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -5,6 +5,7 @@ }: assert enableGUI -> libGLU != null && libGL != null && xorg != null && fltk != null; +assert (!blas.is64bit) && (!lapack.is64bit); stdenv.mkDerivation rec { pname = "giac${lib.optionalString enableGUI "-with-xcas"}"; diff --git a/pkgs/top-level/release-alternatives.nix b/pkgs/top-level/release-alternatives.nix index c31a03c8093..eef239d4e0a 100644 --- a/pkgs/top-level/release-alternatives.nix +++ b/pkgs/top-level/release-alternatives.nix @@ -37,7 +37,7 @@ let "suitesparse_4_2" "petsc" "cholmod-extra" "arpack" "qrupdate" "iml" "globalarrays" "arrayfire" "xfitter" "lammps" "plink-ng" "quantum-espresso" - "calculix" "csdp" "getdp" "giac" "jags" + "calculix" "csdp" "getdp" "jags" "lammps" "lammps-mpi" # ["ocamlPackages" "lacaml"] ["haskellPackages" "bindings-levmar"] -- cgit v1.2.3 From 3fe18a5b4ec0d56bed8ceab1daa32e54ba5484dd Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 17 Apr 2020 23:27:06 +0100 Subject: emacsPackages.pod-mode: Fix platforms meta --- pkgs/applications/editors/emacs-modes/pod-mode/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs-modes/pod-mode/default.nix b/pkgs/applications/editors/emacs-modes/pod-mode/default.nix index 198adefc016..549633b7dfb 100644 --- a/pkgs/applications/editors/emacs-modes/pod-mode/default.nix +++ b/pkgs/applications/editors/emacs-modes/pod-mode/default.nix @@ -13,6 +13,6 @@ trivialBuild rec { description = "Major mode for editing .pod-files"; license = licenses.gpl2Plus; maintainers = with maintainers; [ qyliss ]; - platform = platforms.all; + platforms = platforms.all; }; } -- cgit v1.2.3 From 95847e6405cec2f26631f524721bf306636d4823 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 18 Apr 2020 08:49:49 +1000 Subject: yq-go: 3.2.1 -> 3.3.0 https://github.com/mikefarah/yq/releases/tag/3.3.0 --- pkgs/development/tools/yq-go/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/yq-go/default.nix b/pkgs/development/tools/yq-go/default.nix index 9041667a0fc..8bcfaa2e46a 100644 --- a/pkgs/development/tools/yq-go/default.nix +++ b/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "3.2.1"; + version = "3.3.0"; src = fetchFromGitHub { owner = "mikefarah"; rev = version; repo = "yq"; - sha256 = "1n20m1zizbkgzag4676fvf16h6f8vll6pniblj7haqdwvnza8zwd"; + sha256 = "1jll5nmskvs61031h3sizhv3scv8znrr9apyc4qlxcp4jiv7xpmp"; }; - modSha256 = "0hbazc6hf3zrni25lpbyi36sbxyabbrpi591gkqwxgr9hdbdpcg9"; + modSha256 = "1m7sha6kwis1a00il1iigb9lxxh5m2myj9ps20s816m0b9bhd43v"; meta = with lib; { description = "Portable command-line YAML processor"; -- cgit v1.2.3 From 094c35b9204869cf65b12617eda40f3a1ced81ee Mon Sep 17 00:00:00 2001 From: Jeff Labonte Date: Fri, 17 Apr 2020 19:50:17 -0400 Subject: brave: 1.5.123 -> 1.7.92 --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index bab24d01456..151ce5edc35 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -82,11 +82,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.5.123"; + version = "1.7.92"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "1yv6hfjqzcd60b0bjpfbj8d4s2yf10swanxhbmnslcqp6ajb2nqr"; + sha256 = "1f262xh88c83m6ixqxc69z8kvkl3qbjc6jnv2g8n0flw8s70hs7z"; }; dontConfigure = true; -- cgit v1.2.3 From 69e73264a92f9873a3c2c92b688fa5c26768f4d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Wed, 8 Apr 2020 18:38:38 +0200 Subject: Partially revert "libtorrent-raster: 1.1.11 -> 1.2.5; qbittorrent: 4.2.1 -> 4.2.2" This partially reverts commit cc03fb4210c472e7ed172079af0a4016228bbee1. The libtorrentRasterbar update broke deluge 1.x, the hash was not updated and obsolete dependencies and flags were not removed. --- pkgs/development/libraries/libtorrent-rasterbar/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix index f910964a2ca..26605eb41db 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/default.nix @@ -3,7 +3,7 @@ }: let - version = "1.2.5"; + version = "1.1.11"; formattedVersion = lib.replaceChars ["."] ["_"] version; # Make sure we override python, so the correct version is chosen @@ -17,14 +17,13 @@ in stdenv.mkDerivation { src = fetchFromGitHub { owner = "arvidn"; repo = "libtorrent"; - rev = "libtorrent-${formattedVersion}"; + rev = "libtorrent_${formattedVersion}"; sha256 = "0nwdsv6d2gkdsh7l5a46g6cqx27xwh3msify5paf02l1qzjy4s5l"; }; enableParallelBuilding = true; nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; buildInputs = [ boostPython openssl zlib python libiconv geoip ncurses ]; - preConfigure = "./autotool.sh"; postInstall = '' -- cgit v1.2.3 From ca722c5e2bd661a0175296249ddad9e29acc7618 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 5 Jul 2019 21:29:09 -0500 Subject: libtorrent-rasterbar: 1.1.11 -> 1.2.5 https://raw.githubusercontent.com/arvidn/libtorrent/libtorrent-1_2_5/ChangeLog The old release is kept available as libtorrentRasterbar-1_1_x for deluge 1.x. --- .../libraries/libtorrent-rasterbar/1.1/default.nix | 50 +++++++++++++++++++++ .../libraries/libtorrent-rasterbar/1.2/default.nix | 50 +++++++++++++++++++++ .../libraries/libtorrent-rasterbar/default.nix | 52 ---------------------- pkgs/top-level/all-packages.nix | 7 ++- 4 files changed, 106 insertions(+), 53 deletions(-) create mode 100644 pkgs/development/libraries/libtorrent-rasterbar/1.1/default.nix create mode 100644 pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix delete mode 100644 pkgs/development/libraries/libtorrent-rasterbar/default.nix diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.1/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.1/default.nix new file mode 100644 index 00000000000..b2c958795f3 --- /dev/null +++ b/pkgs/development/libraries/libtorrent-rasterbar/1.1/default.nix @@ -0,0 +1,50 @@ +{ stdenv, lib, fetchFromGitHub, pkgconfig, automake, autoconf +, zlib, boost, openssl, libtool, python, libiconv, ncurses +}: + +let + version = "1.1.11"; + formattedVersion = lib.replaceChars ["."] ["_"] version; + + # Make sure we override python, so the correct version is chosen + # for the bindings, if overridden + boostPython = boost.override { enablePython = true; inherit python; }; + +in stdenv.mkDerivation { + pname = "libtorrent-rasterbar"; + inherit version; + + src = fetchFromGitHub { + owner = "arvidn"; + repo = "libtorrent"; + rev = "libtorrent_${formattedVersion}"; + sha256 = "0nwdsv6d2gkdsh7l5a46g6cqx27xwh3msify5paf02l1qzjy4s5l"; + }; + + enableParallelBuilding = true; + nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; + buildInputs = [ boostPython openssl zlib python libiconv ncurses ]; + preConfigure = "./autotool.sh"; + + postInstall = '' + moveToOutput "include" "$dev" + moveToOutput "lib/${python.libPrefix}" "$python" + ''; + + outputs = [ "out" "dev" "python" ]; + + configureFlags = [ + "--enable-python-binding" + "--with-libiconv=yes" + "--with-boost=${boostPython.dev}" + "--with-boost-libdir=${boostPython.out}/lib" + ]; + + meta = with stdenv.lib; { + homepage = "https://libtorrent.org/"; + description = "A C++ BitTorrent implementation focusing on efficiency and scalability"; + license = licenses.bsd3; + maintainers = [ maintainers.phreedom ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix new file mode 100644 index 00000000000..8b9992ec66d --- /dev/null +++ b/pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix @@ -0,0 +1,50 @@ +{ stdenv, lib, fetchFromGitHub, pkgconfig, automake, autoconf +, zlib, boost, openssl, libtool, python, libiconv, ncurses +}: + +let + version = "1.2.5"; + formattedVersion = lib.replaceChars ["."] ["_"] version; + + # Make sure we override python, so the correct version is chosen + # for the bindings, if overridden + boostPython = boost.override { enablePython = true; inherit python; }; + +in stdenv.mkDerivation { + pname = "libtorrent-rasterbar"; + inherit version; + + src = fetchFromGitHub { + owner = "arvidn"; + repo = "libtorrent"; + rev = "libtorrent-${formattedVersion}"; + sha256 = "0y2fzqbvb1bxvf93d7sphwzxih6j40p5p3fay943k26w0nrq802w"; + }; + + enableParallelBuilding = true; + nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; + buildInputs = [ boostPython openssl zlib python libiconv ncurses ]; + preConfigure = "./autotool.sh"; + + postInstall = '' + moveToOutput "include" "$dev" + moveToOutput "lib/${python.libPrefix}" "$python" + ''; + + outputs = [ "out" "dev" "python" ]; + + configureFlags = [ + "--enable-python-binding" + "--with-libiconv=yes" + "--with-boost=${boostPython.dev}" + "--with-boost-libdir=${boostPython.out}/lib" + ]; + + meta = with stdenv.lib; { + homepage = "https://libtorrent.org/"; + description = "A C++ BitTorrent implementation focusing on efficiency and scalability"; + license = licenses.bsd3; + maintainers = [ maintainers.phreedom ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix deleted file mode 100644 index 26605eb41db..00000000000 --- a/pkgs/development/libraries/libtorrent-rasterbar/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, automake, autoconf -, zlib, boost, openssl, libtool, python, libiconv, geoip, ncurses -}: - -let - version = "1.1.11"; - formattedVersion = lib.replaceChars ["."] ["_"] version; - - # Make sure we override python, so the correct version is chosen - # for the bindings, if overridden - boostPython = boost.override { enablePython = true; inherit python; }; - -in stdenv.mkDerivation { - pname = "libtorrent-rasterbar"; - inherit version; - - src = fetchFromGitHub { - owner = "arvidn"; - repo = "libtorrent"; - rev = "libtorrent_${formattedVersion}"; - sha256 = "0nwdsv6d2gkdsh7l5a46g6cqx27xwh3msify5paf02l1qzjy4s5l"; - }; - - enableParallelBuilding = true; - nativeBuildInputs = [ automake autoconf libtool pkgconfig ]; - buildInputs = [ boostPython openssl zlib python libiconv geoip ncurses ]; - preConfigure = "./autotool.sh"; - - postInstall = '' - moveToOutput "include" "$dev" - moveToOutput "lib/${python.libPrefix}" "$python" - ''; - - outputs = [ "out" "dev" "python" ]; - - configureFlags = [ - "--enable-python-binding" - "--with-libgeoip=system" - "--with-libiconv=yes" - "--with-boost=${boostPython.dev}" - "--with-boost-libdir=${boostPython.out}/lib" - "--with-libiconv=yes" - ]; - - meta = with stdenv.lib; { - homepage = "https://libtorrent.org/"; - description = "A C++ BitTorrent implementation focusing on efficiency and scalability"; - license = licenses.bsd3; - maintainers = [ maintainers.phreedom ]; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b4c06da57b8..1c34cc9ac16 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2840,6 +2840,7 @@ in ddrutility = callPackage ../tools/system/ddrutility { }; deluge = callPackage ../applications/networking/p2p/deluge { + libtorrentRasterbar = libtorrentRasterbar-1_1_x; pythonPackages = python2Packages; }; @@ -13241,7 +13242,11 @@ in libtomcrypt = callPackage ../development/libraries/libtomcrypt { }; - libtorrentRasterbar = callPackage ../development/libraries/libtorrent-rasterbar { }; + libtorrentRasterbar-1_2_x = callPackage ../development/libraries/libtorrent-rasterbar/1.2 { }; + + libtorrentRasterbar-1_1_x = callPackage ../development/libraries/libtorrent-rasterbar/1.1 { }; + + libtorrentRasterbar = libtorrentRasterbar-1_2_x; # this is still the new version of the old API libtoxcore-new = callPackage ../development/libraries/libtoxcore/new-api.nix { }; -- cgit v1.2.3 From 9ae8499342e57f840ff3803194d8bd76f34abf21 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 5 Jul 2019 19:43:54 -0500 Subject: deluge: 1.3.15 -> 2.0.3 * let's try 2.0 version now, no time better than the present! Maybe! * bz2 -> xz * maybe python3 * disable pyGtkGlade for deps, maybe not needed? * fix gtk/etc deps, deluge-gtk works! \o/ * restore installation of images and such The old version is kept available as some torrent trackers have not updated their whitelists yet. --- .../networking/p2p/deluge/1/default.nix | 41 ++++++++++++++++++++ .../networking/p2p/deluge/2/default.nix | 44 ++++++++++++++++++++++ .../applications/networking/p2p/deluge/default.nix | 41 -------------------- pkgs/top-level/all-packages.nix | 9 ++++- 4 files changed, 92 insertions(+), 43 deletions(-) create mode 100644 pkgs/applications/networking/p2p/deluge/1/default.nix create mode 100644 pkgs/applications/networking/p2p/deluge/2/default.nix delete mode 100644 pkgs/applications/networking/p2p/deluge/default.nix diff --git a/pkgs/applications/networking/p2p/deluge/1/default.nix b/pkgs/applications/networking/p2p/deluge/1/default.nix new file mode 100644 index 00000000000..cafba65c788 --- /dev/null +++ b/pkgs/applications/networking/p2p/deluge/1/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, fetchpatch, intltool, libtorrentRasterbar, pythonPackages }: + +pythonPackages.buildPythonPackage rec { + pname = "deluge"; + version = "1.3.15"; + + src = fetchurl { + url = "http://download.deluge-torrent.org/source/${pname}-${version}.tar.bz2"; + sha256 = "1467b9hmgw59gf398mhbf40ggaka948yz3afh6022v753c9j7y6w"; + }; + + patches = [ + # Fix preferences when built against libtorrent >=0.16 + (fetchpatch { + url = "https://git.deluge-torrent.org/deluge/patch/?id=38d7b7cdfde3c50d6263602ffb03af92fcbfa52e"; + sha256 = "0la3i0lkj6yv4725h4kbd07mhfwcb34w7prjl9gxg12q7px6c31d"; + }) + ]; + + propagatedBuildInputs = with pythonPackages; [ + pyGtkGlade twisted Mako chardet pyxdg pyopenssl service-identity + libtorrentRasterbar.dev libtorrentRasterbar.python setuptools + ]; + + nativeBuildInputs = [ intltool ]; + + postInstall = '' + mkdir -p $out/share/applications + cp -R deluge/data/pixmaps $out/share/ + cp -R deluge/data/icons $out/share/ + cp deluge/data/share/applications/deluge.desktop $out/share/applications + ''; + + meta = with stdenv.lib; { + homepage = "https://deluge-torrent.org"; + description = "Torrent client"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ domenkozar ebzzry ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/networking/p2p/deluge/2/default.nix b/pkgs/applications/networking/p2p/deluge/2/default.nix new file mode 100644 index 00000000000..4603f0bd715 --- /dev/null +++ b/pkgs/applications/networking/p2p/deluge/2/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, intltool, libtorrentRasterbar, pythonPackages +, gtk3, gobjectIntrospection, librsvg, wrapGAppsHook }: + +pythonPackages.buildPythonPackage rec { + pname = "deluge"; + version = "2.0.3"; + + src = fetchurl { + url = "http://download.deluge-torrent.org/source/2.0/${pname}-${version}.tar.xz"; + sha256 = "14d8kn2pvr1qv8mwqrxmj85jycr73vwfqz12hzag0ararbkfhyky"; + }; + + propagatedBuildInputs = with pythonPackages; [ + twisted Mako chardet pyxdg pyopenssl service-identity + libtorrentRasterbar.dev libtorrentRasterbar.python setuptools + setproctitle pillow rencode six zope_interface + dbus-python pygobject3 pycairo + gtk3 gobjectIntrospection librsvg + ]; + + nativeBuildInputs = [ intltool wrapGAppsHook ]; + + checkInputs = with pythonPackages; [ + pytest /* pytest-twisted */ pytestcov mock + mccabe pylint + ]; + + doCheck = false; # until pytest-twisted is packaged + + postInstall = '' + mkdir -p $out/share/applications + cp -R deluge/ui/data/pixmaps $out/share/ + cp -R deluge/ui/data/icons $out/share/ + cp deluge/ui/data/share/applications/deluge.desktop $out/share/applications + ''; + + meta = with stdenv.lib; { + homepage = "https://deluge-torrent.org"; + description = "Torrent client"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ domenkozar ebzzry ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix deleted file mode 100644 index cafba65c788..00000000000 --- a/pkgs/applications/networking/p2p/deluge/default.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, fetchpatch, intltool, libtorrentRasterbar, pythonPackages }: - -pythonPackages.buildPythonPackage rec { - pname = "deluge"; - version = "1.3.15"; - - src = fetchurl { - url = "http://download.deluge-torrent.org/source/${pname}-${version}.tar.bz2"; - sha256 = "1467b9hmgw59gf398mhbf40ggaka948yz3afh6022v753c9j7y6w"; - }; - - patches = [ - # Fix preferences when built against libtorrent >=0.16 - (fetchpatch { - url = "https://git.deluge-torrent.org/deluge/patch/?id=38d7b7cdfde3c50d6263602ffb03af92fcbfa52e"; - sha256 = "0la3i0lkj6yv4725h4kbd07mhfwcb34w7prjl9gxg12q7px6c31d"; - }) - ]; - - propagatedBuildInputs = with pythonPackages; [ - pyGtkGlade twisted Mako chardet pyxdg pyopenssl service-identity - libtorrentRasterbar.dev libtorrentRasterbar.python setuptools - ]; - - nativeBuildInputs = [ intltool ]; - - postInstall = '' - mkdir -p $out/share/applications - cp -R deluge/data/pixmaps $out/share/ - cp -R deluge/data/icons $out/share/ - cp deluge/data/share/applications/deluge.desktop $out/share/applications - ''; - - meta = with stdenv.lib; { - homepage = "https://deluge-torrent.org"; - description = "Torrent client"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ domenkozar ebzzry ]; - platforms = platforms.all; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c34cc9ac16..8b55ad38a59 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2839,10 +2839,15 @@ in ddrutility = callPackage ../tools/system/ddrutility { }; - deluge = callPackage ../applications/networking/p2p/deluge { - libtorrentRasterbar = libtorrentRasterbar-1_1_x; + deluge-2_x = callPackage ../applications/networking/p2p/deluge/2 { + pythonPackages = python3Packages; + libtorrentRasterbar = libtorrentRasterbar.override { python = python3; }; + }; + deluge-1_x = callPackage ../applications/networking/p2p/deluge/1 { pythonPackages = python2Packages; + libtorrentRasterbar = libtorrentRasterbar-1_1_x; }; + deluge = deluge-2_x; desktop-file-utils = callPackage ../tools/misc/desktop-file-utils { }; -- cgit v1.2.3 From fee776aae47b4a99748ed984334555bfb379832c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 9 Jul 2019 17:46:27 -0500 Subject: deluge: remove use of deprecated alias --- pkgs/applications/networking/p2p/deluge/2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/deluge/2/default.nix b/pkgs/applications/networking/p2p/deluge/2/default.nix index 4603f0bd715..755ef4cc33b 100644 --- a/pkgs/applications/networking/p2p/deluge/2/default.nix +++ b/pkgs/applications/networking/p2p/deluge/2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, libtorrentRasterbar, pythonPackages -, gtk3, gobjectIntrospection, librsvg, wrapGAppsHook }: +, gtk3, gobject-introspection, librsvg, wrapGAppsHook }: pythonPackages.buildPythonPackage rec { pname = "deluge"; @@ -15,7 +15,7 @@ pythonPackages.buildPythonPackage rec { libtorrentRasterbar.dev libtorrentRasterbar.python setuptools setproctitle pillow rencode six zope_interface dbus-python pygobject3 pycairo - gtk3 gobjectIntrospection librsvg + gtk3 gobject-introspection librsvg ]; nativeBuildInputs = [ intltool wrapGAppsHook ]; -- cgit v1.2.3 From 16a4332d60c55ab6ce78f0ce56643b83fc3e7fed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Thu, 19 Mar 2020 03:19:26 +0100 Subject: nixos/deluge: support 2.x --- nixos/doc/manual/release-notes/rl-2009.xml | 10 ++- nixos/modules/services/torrent/deluge.nix | 31 ++++++-- nixos/tests/deluge.nix | 109 ++++++++++++++++++++--------- 3 files changed, 109 insertions(+), 41 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 4965f9c3629..f34bfc9411e 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -203,6 +203,15 @@ environment.systemPackages = [ here. + + + Deluge 2.x was added and is used as default for new NixOS + installations where stateVersion is >= 20.09. If you are upgrading from a previous + NixOS version, you can set service.deluge.package = pkgs.deluge-2_x + to upgrade to Deluge 2.x and migrate the state to the new format. + Be aware that backwards state migrations are not supported by Deluge. + + @@ -246,7 +255,6 @@ environment.systemPackages = [ # sudo /run/current-system/fine-tune/child-1/bin/switch-to-configuration test - diff --git a/nixos/modules/services/torrent/deluge.nix b/nixos/modules/services/torrent/deluge.nix index 0c72505395d..2f1e7300ca3 100644 --- a/nixos/modules/services/torrent/deluge.nix +++ b/nixos/modules/services/torrent/deluge.nix @@ -5,6 +5,7 @@ with lib; let cfg = config.services.deluge; cfg_web = config.services.deluge.web; + isDeluge1 = versionOlder cfg.package.version "2.0.0"; openFilesLimit = 4096; listenPortsDefault = [ 6881 6889 ]; @@ -18,11 +19,11 @@ let preStart = if cfg.declarative then '' if [ -e ${declarativeLockFile} ]; then # Was declarative before, no need to back up anything - ln -sf ${configFile} ${configDir}/core.conf + ${if isDeluge1 then "ln -sf" else "cp"} ${configFile} ${configDir}/core.conf ln -sf ${cfg.authFile} ${configDir}/auth else # Declarative for the first time, backup stateful files - ln -sb --suffix=.stateful ${configFile} ${configDir}/core.conf + ${if isDeluge1 then "ln -s" else "cp"} -b --suffix=.stateful ${configFile} ${configDir}/core.conf ln -sb --suffix=.stateful ${cfg.authFile} ${configDir}/auth echo "Autogenerated file that signifies that this server configuration is managed declaratively by NixOS" \ > ${declarativeLockFile} @@ -144,6 +145,14 @@ in { This always contains unzip, gnutar, xz, p7zip and bzip2. ''; }; + + package = mkOption { + type = types.package; + example = literalExample "pkgs.deluge-1_x"; + description = '' + Deluge package to use. + ''; + }; }; deluge.web = { @@ -170,6 +179,13 @@ in { config = mkIf cfg.enable { + services.deluge.package = mkDefault ( + if versionAtLeast config.system.stateVersion "20.09" then + pkgs.deluge-2_x + else + pkgs.deluge-1_x + ); + # Provide a default set of `extraPackages`. services.deluge.extraPackages = with pkgs; [ unzip gnutar xz p7zip bzip2 ]; @@ -189,10 +205,10 @@ in { after = [ "network.target" ]; description = "Deluge BitTorrent Daemon"; wantedBy = [ "multi-user.target" ]; - path = [ pkgs.deluge ] ++ cfg.extraPackages; + path = [ cfg.package ] ++ cfg.extraPackages; serviceConfig = { ExecStart = '' - ${pkgs.deluge}/bin/deluged \ + ${cfg.package}/bin/deluged \ --do-not-daemonize \ --config ${configDir} ''; @@ -212,10 +228,11 @@ in { requires = [ "deluged.service" ]; description = "Deluge BitTorrent WebUI"; wantedBy = [ "multi-user.target" ]; - path = [ pkgs.deluge ]; + path = [ cfg.package ]; serviceConfig = { ExecStart = '' - ${pkgs.deluge}/bin/deluge-web \ + ${cfg.package}/bin/deluge-web \ + ${optionalString (!isDeluge1) "--do-not-daemonize"} \ --config ${configDir} \ --port ${toString cfg.web.port} ''; @@ -234,7 +251,7 @@ in { }) ]; - environment.systemPackages = [ pkgs.deluge ]; + environment.systemPackages = [ cfg.package ]; users.users = mkIf (cfg.user == "deluge") { deluge = { diff --git a/nixos/tests/deluge.nix b/nixos/tests/deluge.nix index 37689c3d913..3cf179a3821 100644 --- a/nixos/tests/deluge.nix +++ b/nixos/tests/deluge.nix @@ -5,9 +5,10 @@ import ./make-test-python.nix ({ pkgs, ...} : { }; nodes = { - simple = { + simple1 = { services.deluge = { enable = true; + package = pkgs.deluge-1_x; web = { enable = true; openFirewall = true; @@ -15,50 +16,92 @@ import ./make-test-python.nix ({ pkgs, ...} : { }; }; - declarative = - { ... }: + declarative1 = { + services.deluge = { + enable = true; + package = pkgs.deluge-1_x; + openFirewall = true; + declarative = true; + config = { + allow_remote = true; + download_location = "/var/lib/deluge/my-download"; + daemon_port = 58846; + listen_ports = [ 6881 6889 ]; + }; + web = { + enable = true; + port = 3142; + }; + authFile = pkgs.writeText "deluge-auth" '' + localclient:a7bef72a890:10 + andrew:password:10 + user3:anotherpass:5 + ''; + }; + }; - { - services.deluge = { + simple2 = { + services.deluge = { + enable = true; + package = pkgs.deluge-2_x; + web = { enable = true; openFirewall = true; - declarative = true; - config = { - allow_remote = true; - download_location = "/var/lib/deluge/my-download"; - daemon_port = 58846; - listen_ports = [ 6881 6889 ]; - }; - web = { - enable = true; - port = 3142; - }; - authFile = pkgs.writeText "deluge-auth" '' - localclient:a7bef72a890:10 - andrew:password:10 - user3:anotherpass:5 - ''; }; - environment.systemPackages = [ pkgs.deluge ]; }; + }; + + declarative2 = { + services.deluge = { + enable = true; + package = pkgs.deluge-2_x; + openFirewall = true; + declarative = true; + config = { + allow_remote = true; + download_location = "/var/lib/deluge/my-download"; + daemon_port = 58846; + listen_ports = [ 6881 6889 ]; + }; + web = { + enable = true; + port = 3142; + }; + authFile = pkgs.writeText "deluge-auth" '' + localclient:a7bef72a890:10 + andrew:password:10 + user3:anotherpass:5 + ''; + }; + }; }; testScript = '' start_all() - simple.wait_for_unit("deluged") - simple.wait_for_unit("delugeweb") - simple.wait_for_open_port("8112") - declarative.wait_for_unit("network.target") - declarative.wait_until_succeeds("curl --fail http://simple:8112") + simple1.wait_for_unit("deluged") + simple2.wait_for_unit("deluged") + simple1.wait_for_unit("delugeweb") + simple2.wait_for_unit("delugeweb") + simple1.wait_for_open_port("8112") + simple2.wait_for_open_port("8112") + declarative1.wait_for_unit("network.target") + declarative2.wait_for_unit("network.target") + declarative1.wait_until_succeeds("curl --fail http://simple1:8112") + declarative2.wait_until_succeeds("curl --fail http://simple2:8112") - declarative.wait_for_unit("deluged") - declarative.wait_for_unit("delugeweb") - declarative.wait_until_succeeds("curl --fail http://declarative:3142") - declarative.succeed("deluge-console 'help' | grep -q 'rm - Remove a torrent'") - declarative.succeed( - "deluge-console 'connect 127.0.0.1:58846 andrew password; help' | grep -q 'rm - Remove a torrent'" + declarative1.wait_for_unit("deluged") + declarative2.wait_for_unit("deluged") + declarative1.wait_for_unit("delugeweb") + declarative2.wait_for_unit("delugeweb") + declarative1.wait_until_succeeds("curl --fail http://declarative1:3142") + declarative2.wait_until_succeeds("curl --fail http://declarative2:3142") + declarative1.succeed( + "deluge-console 'connect 127.0.0.1:58846 andrew password; help' | grep -q 'rm.*Remove a torrent'" + ) + declarative2.succeed( + "deluge-console 'connect 127.0.0.1:58846 andrew password; help' | grep -q 'rm.*Remove a torrent'" ) ''; }) -- cgit v1.2.3 From 11be0cd7453ac41faf5b451ec36fe27ab20f1fa7 Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Fri, 17 Apr 2020 20:29:56 -0400 Subject: spotifyd: add withMpris and withKeyring optionals --- pkgs/applications/audio/spotifyd/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/spotifyd/default.nix b/pkgs/applications/audio/spotifyd/default.nix index 263fe986df3..121f9cbc960 100644 --- a/pkgs/applications/audio/spotifyd/default.nix +++ b/pkgs/applications/audio/spotifyd/default.nix @@ -2,6 +2,9 @@ , withALSA ? true, alsaLib ? null , withPulseAudio ? false, libpulseaudio ? null , withPortAudio ? false, portaudio ? null +, withMpris ? false +, withKeyring ? false +, dbus ? null }: rustPlatform.buildRustPackage rec { @@ -20,7 +23,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--no-default-features" "--features" - "${stdenv.lib.optionalString withALSA "alsa_backend,"}${stdenv.lib.optionalString withPulseAudio "pulseaudio_backend,"}${stdenv.lib.optionalString withPortAudio "portaudio_backend,"}" + "${stdenv.lib.optionalString withALSA "alsa_backend,"}${stdenv.lib.optionalString withPulseAudio "pulseaudio_backend,"}${stdenv.lib.optionalString withPortAudio "portaudio_backend,"}${stdenv.lib.optionalString withMpris "dbus_mpris,"}${stdenv.lib.optionalString withKeyring "dbus_keyring,"}" ]; nativeBuildInputs = [ pkgconfig ]; @@ -28,7 +31,8 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optional withALSA alsaLib ++ stdenv.lib.optional withPulseAudio libpulseaudio - ++ stdenv.lib.optional withPortAudio portaudio; + ++ stdenv.lib.optional withPortAudio portaudio + ++ stdenv.lib.optional (withMpris || withKeyring) dbus; doCheck = false; -- cgit v1.2.3 From fc5090b3158df0f10586b5c2fbdaed4cc5f488ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sat, 18 Apr 2020 03:06:47 +0200 Subject: blas: fix build --- pkgs/build-support/alternatives/blas/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/alternatives/blas/default.nix b/pkgs/build-support/alternatives/blas/default.nix index 1b878343866..b1dadf23c07 100644 --- a/pkgs/build-support/alternatives/blas/default.nix +++ b/pkgs/build-support/alternatives/blas/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation { unpackPhase = "src=$PWD"; installPhase = ('' - mkdir -p $out/lib $dev/include $dev/include/pkgconfig + mkdir -p $out/lib $dev/include $dev/lib/pkgconfig libblas="${lib.getLib blasProvider}/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}" -- cgit v1.2.3 From 7bac5db6f7c56eec663b74c590544268c8cb563c Mon Sep 17 00:00:00 2001 From: Markus Wamser Date: Sat, 18 Apr 2020 03:14:15 +0200 Subject: maintainers: add wamserma Signed-off-by: Markus S. Wamser --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 373aa45d858..4dd1b222d55 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8121,6 +8121,12 @@ githubId = 3889405; name = "vyp"; }; + wamserma = { + name = "Markus S. Wamser"; + email = "github-dev@mail2013.wamser.eu"; + github = "wamserma"; + githubId = 60148; + }; waynr = { name = "Wayne Warren"; email = "wayne.warren.s@gmail.com"; -- cgit v1.2.3 From 6285d5eabda26d0e696a328bcc9b8bf33dea1b3a Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 24 Mar 2020 05:21:39 +0000 Subject: pebble: v2.2.2 -> v2.3.0 Also add myself to maintainers and correct meta.homepage. --- pkgs/tools/admin/pebble/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/admin/pebble/default.nix b/pkgs/tools/admin/pebble/default.nix index 5aa220fd89e..efd9bfe0596 100644 --- a/pkgs/tools/admin/pebble/default.nix +++ b/pkgs/tools/admin/pebble/default.nix @@ -4,7 +4,7 @@ }: let - version = "v2.2.2"; + version = "v2.3.0"; pname = "pebble"; in buildGoPackage { inherit pname version; @@ -14,13 +14,13 @@ in buildGoPackage { owner = "letsencrypt"; repo = pname; rev = version; - sha256 = "10g6ivdxxp3632wk0gvmp75v9x668kchhmlczbsq8qnsc8sb8pwf"; + sha256 = "1piwzzfqsdx6s2niczzp4mf4r3qn9nfdgpn7882g52cmmm0vzks2"; }; meta = { - homepage = "https://github.com/letsencrypt/boulder"; + homepage = "https://github.com/letsencrypt/pebble"; description = "A miniature version of Boulder, Pebble is a small RFC 8555 ACME test server not suited for a production CA"; license = [ lib.licenses.mpl20 ]; - maintainers = [ ]; + maintainers = with lib.maintainers; [ emily ]; }; } -- cgit v1.2.3 From 352e30df8a38b1b673c19de817fedca7d3d95d71 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 23 Mar 2020 22:12:15 +0000 Subject: nixos/tests/acme: don't restrict to x86_64 This was added in aade4e577bbb27f044217c51a006ab6ba544ebb5, but the implementation of the ACME module has been entirely rewritten since then, and the test seems to run fine on AArch64. --- nixos/tests/all-tests.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 4f60892488a..5ff1c9586f8 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -22,7 +22,7 @@ let in { _3proxy = handleTest ./3proxy.nix {}; - acme = handleTestOn ["x86_64-linux"] ./acme.nix {}; + acme = handleTest ./acme.nix {}; atd = handleTest ./atd.nix {}; automysqlbackup = handleTest ./automysqlbackup.nix {}; avahi = handleTest ./avahi.nix {}; -- cgit v1.2.3 From d0f04c1623ae74f256ff5ced77ac78c7fe3b6abc Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 23 Mar 2020 20:35:16 +0000 Subject: nixos/tests/acme: use *.test domains Shimming out the Let's Encrypt domain name to reuse client configuration doesn't work properly (Pebble uses different endpoint URL formats), is recommended against by upstream,[1] and is unnecessary now that the ACME module supports specifying an ACME server. This commit changes the tests to use the domain name acme.test instead, and renames the letsencrypt node to acme to reflect that it has nothing to do with the ACME server that Let's Encrypt runs. The imports are renamed for clarity: * nixos/tests/common/{letsencrypt => acme}/{common.nix => client} * nixos/tests/common/{letsencrypt => acme}/{default.nix => server} The test's other domain names are also adjusted to use *.test for consistency (and to avoid misuse of non-reserved domain names such as standalone.com). [1] https://github.com/letsencrypt/pebble/issues/283#issuecomment-545123242 Co-authored-by: Yegor Timoshenko --- nixos/tests/acme.nix | 99 ++++----- nixos/tests/common/acme/client/default.nix | 19 ++ nixos/tests/common/acme/server/default.nix | 135 ++++++++++++ nixos/tests/common/acme/server/mkcerts.nix | 68 ++++++ nixos/tests/common/acme/server/mkcerts.sh | 6 + nixos/tests/common/acme/server/snakeoil-certs.nix | 171 +++++++++++++++ nixos/tests/common/letsencrypt/common.nix | 12 - nixos/tests/common/letsencrypt/default.nix | 135 ------------ nixos/tests/common/letsencrypt/mkcerts.nix | 69 ------ nixos/tests/common/letsencrypt/mkcerts.sh | 6 - nixos/tests/common/letsencrypt/snakeoil-certs.nix | 254 ---------------------- nixos/tests/common/resolver.nix | 2 +- 12 files changed, 447 insertions(+), 529 deletions(-) create mode 100644 nixos/tests/common/acme/client/default.nix create mode 100644 nixos/tests/common/acme/server/default.nix create mode 100644 nixos/tests/common/acme/server/mkcerts.nix create mode 100755 nixos/tests/common/acme/server/mkcerts.sh create mode 100644 nixos/tests/common/acme/server/snakeoil-certs.nix delete mode 100644 nixos/tests/common/letsencrypt/common.nix delete mode 100644 nixos/tests/common/letsencrypt/default.nix delete mode 100644 nixos/tests/common/letsencrypt/mkcerts.nix delete mode 100755 nixos/tests/common/letsencrypt/mkcerts.sh delete mode 100644 nixos/tests/common/letsencrypt/snakeoil-certs.nix diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix index 638601cd75f..032432287bd 100644 --- a/nixos/tests/acme.nix +++ b/nixos/tests/acme.nix @@ -1,5 +1,5 @@ let - commonConfig = ./common/letsencrypt/common.nix; + commonConfig = ./common/acme/client; dnsScript = {writeScript, dnsAddress, bash, curl}: writeScript "dns-hook.sh" '' #!${bash}/bin/bash @@ -16,8 +16,8 @@ in import ./make-test-python.nix { name = "acme"; nodes = rec { - letsencrypt = { nodes, lib, ... }: { - imports = [ ./common/letsencrypt ]; + acme = { nodes, lib, ... }: { + imports = [ ./common/acme/server ]; networking.nameservers = lib.mkForce [ nodes.dnsserver.config.networking.primaryIPAddress ]; @@ -45,19 +45,16 @@ in import ./make-test-python.nix { nodes.dnsserver.config.networking.primaryIPAddress ]; networking.firewall.allowedTCPPorts = [ 80 ]; - security.acme = { - server = "https://acme-v02.api.letsencrypt.org/dir"; - certs."standalone.com" = { - webroot = "/var/lib/acme/acme-challenges"; - }; + security.acme.certs."standalone.test" = { + webroot = "/var/lib/acme/acme-challenges"; }; - systemd.targets."acme-finished-standalone.com" = {}; - systemd.services."acme-standalone.com" = { - wants = [ "acme-finished-standalone.com.target" ]; - before = [ "acme-finished-standalone.com.target" ]; + systemd.targets."acme-finished-standalone.test" = {}; + systemd.services."acme-standalone.test" = { + wants = [ "acme-finished-standalone.test.target" ]; + before = [ "acme-finished-standalone.test.target" ]; }; services.nginx.enable = true; - services.nginx.virtualHosts."standalone.com" = { + services.nginx.virtualHosts."standalone.test" = { locations."/.well-known/acme-challenge".root = "/var/lib/acme/acme-challenges"; }; }; @@ -71,16 +68,16 @@ in import ./make-test-python.nix { # A target remains active. Use this to probe the fact that # a service fired eventhough it is not RemainAfterExit - systemd.targets."acme-finished-a.example.com" = {}; - systemd.services."acme-a.example.com" = { - wants = [ "acme-finished-a.example.com.target" ]; - before = [ "acme-finished-a.example.com.target" ]; + systemd.targets."acme-finished-a.example.test" = {}; + systemd.services."acme-a.example.test" = { + wants = [ "acme-finished-a.example.test.target" ]; + before = [ "acme-finished-a.example.test.target" ]; after = [ "nginx.service" ]; }; services.nginx.enable = true; - services.nginx.virtualHosts."a.example.com" = { + services.nginx.virtualHosts."a.example.test" = { enableACME = true; forceSSL = true; locations."/".root = pkgs.runCommand "docroot" {} '' @@ -89,16 +86,16 @@ in import ./make-test-python.nix { ''; }; - security.acme.server = "https://acme-v02.api.letsencrypt.org/dir"; + security.acme.server = "https://acme.test/dir"; specialisation.second-cert.configuration = {pkgs, ...}: { - systemd.targets."acme-finished-b.example.com" = {}; - systemd.services."acme-b.example.com" = { - wants = [ "acme-finished-b.example.com.target" ]; - before = [ "acme-finished-b.example.com.target" ]; + systemd.targets."acme-finished-b.example.test" = {}; + systemd.services."acme-b.example.test" = { + wants = [ "acme-finished-b.example.test.target" ]; + before = [ "acme-finished-b.example.test.target" ]; after = [ "nginx.service" ]; }; - services.nginx.virtualHosts."b.example.com" = { + services.nginx.virtualHosts."b.example.test" = { enableACME = true; forceSSL = true; locations."/".root = pkgs.runCommand "docroot" {} '' @@ -108,8 +105,8 @@ in import ./make-test-python.nix { }; }; specialisation.dns-01.configuration = {pkgs, config, nodes, lib, ...}: { - security.acme.certs."example.com" = { - domain = "*.example.com"; + security.acme.certs."example.test" = { + domain = "*.example.test"; dnsProvider = "exec"; dnsPropagationCheck = false; credentialsFile = with pkgs; writeText "wildcard.env" '' @@ -118,17 +115,17 @@ in import ./make-test-python.nix { user = config.services.nginx.user; group = config.services.nginx.group; }; - systemd.targets."acme-finished-example.com" = {}; - systemd.services."acme-example.com" = { - wants = [ "acme-finished-example.com.target" ]; - before = [ "acme-finished-example.com.target" "nginx.service" ]; + systemd.targets."acme-finished-example.test" = {}; + systemd.services."acme-example.test" = { + wants = [ "acme-finished-example.test.target" ]; + before = [ "acme-finished-example.test.target" "nginx.service" ]; wantedBy = [ "nginx.service" ]; }; - services.nginx.virtualHosts."c.example.com" = { + services.nginx.virtualHosts."c.example.test" = { forceSSL = true; - sslCertificate = config.security.acme.certs."example.com".directory + "/cert.pem"; - sslTrustedCertificate = config.security.acme.certs."example.com".directory + "/full.pem"; - sslCertificateKey = config.security.acme.certs."example.com".directory + "/key.pem"; + sslCertificate = config.security.acme.certs."example.test".directory + "/cert.pem"; + sslTrustedCertificate = config.security.acme.certs."example.test".directory + "/full.pem"; + sslCertificateKey = config.security.acme.certs."example.test".directory + "/key.pem"; locations."/".root = pkgs.runCommand "docroot" {} '' mkdir -p "$out" echo hello world > "$out/index.html" @@ -159,46 +156,44 @@ in import ./make-test-python.nix { client.start() dnsserver.start() - letsencrypt.wait_for_unit("default.target") + acme.wait_for_unit("default.target") dnsserver.wait_for_unit("pebble-challtestsrv.service") client.succeed( - 'curl --data \'{"host": "acme-v02.api.letsencrypt.org", "addresses": ["${nodes.letsencrypt.config.networking.primaryIPAddress}"]}\' http://${nodes.dnsserver.config.networking.primaryIPAddress}:8055/add-a' + 'curl --data \'{"host": "acme.test", "addresses": ["${nodes.acme.config.networking.primaryIPAddress}"]}\' http://${nodes.dnsserver.config.networking.primaryIPAddress}:8055/add-a' ) client.succeed( - 'curl --data \'{"host": "standalone.com", "addresses": ["${nodes.acmeStandalone.config.networking.primaryIPAddress}"]}\' http://${nodes.dnsserver.config.networking.primaryIPAddress}:8055/add-a' + 'curl --data \'{"host": "standalone.test", "addresses": ["${nodes.acmeStandalone.config.networking.primaryIPAddress}"]}\' http://${nodes.dnsserver.config.networking.primaryIPAddress}:8055/add-a' ) - letsencrypt.start() + acme.start() acmeStandalone.start() - letsencrypt.wait_for_unit("default.target") - letsencrypt.wait_for_unit("pebble.service") + acme.wait_for_unit("default.target") + acme.wait_for_unit("pebble.service") with subtest("can request certificate with HTTPS-01 challenge"): acmeStandalone.wait_for_unit("default.target") - acmeStandalone.succeed("systemctl start acme-standalone.com.service") - acmeStandalone.wait_for_unit("acme-finished-standalone.com.target") + acmeStandalone.succeed("systemctl start acme-standalone.test.service") + acmeStandalone.wait_for_unit("acme-finished-standalone.test.target") client.wait_for_unit("default.target") - client.succeed("curl https://acme-v02.api.letsencrypt.org:15000/roots/0 > /tmp/ca.crt") - client.succeed( - "curl https://acme-v02.api.letsencrypt.org:15000/intermediate-keys/0 >> /tmp/ca.crt" - ) + client.succeed("curl https://acme.test:15000/roots/0 > /tmp/ca.crt") + client.succeed("curl https://acme.test:15000/intermediate-keys/0 >> /tmp/ca.crt") with subtest("Can request certificate for nginx service"): - webserver.wait_for_unit("acme-finished-a.example.com.target") + webserver.wait_for_unit("acme-finished-a.example.test.target") client.succeed( - "curl --cacert /tmp/ca.crt https://a.example.com/ | grep -qF 'hello world'" + "curl --cacert /tmp/ca.crt https://a.example.test/ | grep -qF 'hello world'" ) with subtest("Can add another certificate for nginx service"): webserver.succeed( "/run/current-system/specialisation/second-cert/bin/switch-to-configuration test" ) - webserver.wait_for_unit("acme-finished-b.example.com.target") + webserver.wait_for_unit("acme-finished-b.example.test.target") client.succeed( - "curl --cacert /tmp/ca.crt https://b.example.com/ | grep -qF 'hello world'" + "curl --cacert /tmp/ca.crt https://b.example.test/ | grep -qF 'hello world'" ) with subtest("Can request wildcard certificates using DNS-01 challenge"): @@ -208,9 +203,9 @@ in import ./make-test-python.nix { webserver.succeed( "/run/current-system/specialisation/dns-01/bin/switch-to-configuration test" ) - webserver.wait_for_unit("acme-finished-example.com.target") + webserver.wait_for_unit("acme-finished-example.test.target") client.succeed( - "curl --cacert /tmp/ca.crt https://c.example.com/ | grep -qF 'hello world'" + "curl --cacert /tmp/ca.crt https://c.example.test/ | grep -qF 'hello world'" ) ''; } diff --git a/nixos/tests/common/acme/client/default.nix b/nixos/tests/common/acme/client/default.nix new file mode 100644 index 00000000000..22ba6f4df19 --- /dev/null +++ b/nixos/tests/common/acme/client/default.nix @@ -0,0 +1,19 @@ +{ lib, nodes, pkgs, ... }: + +let + acme-ca = nodes.acme.config.test-support.acme.caCert; +in + +{ + networking.nameservers = [ + nodes.acme.config.networking.primaryIPAddress + ]; + + security.acme = { + server = "https://acme.test/dir"; + email = "hostmaster@example.test"; + acceptTerms = true; + }; + + security.pki.certificateFiles = [ acme-ca ]; +} diff --git a/nixos/tests/common/acme/server/default.nix b/nixos/tests/common/acme/server/default.nix new file mode 100644 index 00000000000..fdc053a2d82 --- /dev/null +++ b/nixos/tests/common/acme/server/default.nix @@ -0,0 +1,135 @@ +# The certificate for the ACME service is exported as: +# +# config.test-support.acme.caCert +# +# This value can be used inside the configuration of other test nodes to inject +# the snakeoil certificate into security.pki.certificateFiles or into package +# overlays. +# +# Another value that's needed if you don't use a custom resolver (see below for +# notes on that) is to add the acme node as a nameserver to every node +# that needs to acquire certificates using ACME, because otherwise the API host +# for acme.test can't be resolved. +# +# A configuration example of a full node setup using this would be this: +# +# { +# acme = import ./common/acme/server; +# +# example = { nodes, ... }: { +# networking.nameservers = [ +# nodes.acme.config.networking.primaryIPAddress +# ]; +# security.pki.certificateFiles = [ +# nodes.acme.config.test-support.acme.caCert +# ]; +# }; +# } +# +# By default, this module runs a local resolver, generated using resolver.nix +# from the parent directory to automatically discover all zones in the network. +# +# If you do not want this and want to use your own resolver, you can just +# override networking.nameservers like this: +# +# { +# acme = { nodes, ... }: { +# imports = [ ./common/acme/server ]; +# networking.nameservers = [ +# nodes.myresolver.config.networking.primaryIPAddress +# ]; +# }; +# +# myresolver = ...; +# } +# +# Keep in mind, that currently only _one_ resolver is supported, if you have +# more than one resolver in networking.nameservers only the first one will be +# used. +# +# Also make sure that whenever you use a resolver from a different test node +# that it has to be started _before_ the ACME service. +{ config, pkgs, lib, ... }: + + +let + snakeOilCerts = import ./snakeoil-certs.nix; + + wfeDomain = "acme.test"; + wfeCertFile = snakeOilCerts.${wfeDomain}.cert; + wfeKeyFile = snakeOilCerts.${wfeDomain}.key; + + siteDomain = "acme.test"; + siteCertFile = snakeOilCerts.${siteDomain}.cert; + siteKeyFile = snakeOilCerts.${siteDomain}.key; + pebble = pkgs.pebble; + resolver = let + message = "You need to define a resolver for the acme test module."; + firstNS = lib.head config.networking.nameservers; + in if config.networking.nameservers == [] then throw message else firstNS; + + pebbleConf.pebble = { + listenAddress = "0.0.0.0:443"; + managementListenAddress = "0.0.0.0:15000"; + certificate = snakeOilCerts.${wfeDomain}.cert; + privateKey = snakeOilCerts.${wfeDomain}.key; + httpPort = 80; + tlsPort = 443; + ocspResponderURL = "http://0.0.0.0:4002"; + }; + + pebbleConfFile = pkgs.writeText "pebble.conf" (builtins.toJSON pebbleConf); + pebbleDataDir = "/root/pebble"; + +in { + imports = [ ../../resolver.nix ]; + + options.test-support.acme.caCert = lib.mkOption { + type = lib.types.path; + description = '' + A certificate file to use with the nodes attribute to + inject the snakeoil CA certificate used in the ACME server into + . + ''; + }; + + config = { + test-support = { + resolver.enable = let + isLocalResolver = config.networking.nameservers == [ "127.0.0.1" ]; + in lib.mkOverride 900 isLocalResolver; + acme.caCert = snakeOilCerts.ca.cert; + }; + + # This has priority 140, because modules/testing/test-instrumentation.nix + # already overrides this with priority 150. + networking.nameservers = lib.mkOverride 140 [ "127.0.0.1" ]; + networking.firewall.enable = false; + + networking.extraHosts = '' + 127.0.0.1 ${wfeDomain} + ${config.networking.primaryIPAddress} ${wfeDomain} ${siteDomain} + ''; + + systemd.services = { + pebble = { + enable = true; + description = "Pebble ACME server"; + requires = [ ]; + wantedBy = [ "network.target" ]; + preStart = '' + mkdir ${pebbleDataDir} + ''; + script = '' + cd ${pebbleDataDir} + ${pebble}/bin/pebble -config ${pebbleConfFile} + ''; + serviceConfig = { + # Required to bind on privileged ports. + User = "root"; + Group = "root"; + }; + }; + }; + }; +} diff --git a/nixos/tests/common/acme/server/mkcerts.nix b/nixos/tests/common/acme/server/mkcerts.nix new file mode 100644 index 00000000000..2474019cbac --- /dev/null +++ b/nixos/tests/common/acme/server/mkcerts.nix @@ -0,0 +1,68 @@ +{ pkgs ? import {} +, lib ? pkgs.lib +, domains ? [ "acme.test" ] +}: + +pkgs.runCommand "acme-snakeoil-ca" { + nativeBuildInputs = [ pkgs.openssl ]; +} '' + addpem() { + local file="$1"; shift + local storeFileName="$(IFS=.; echo "$*")" + + echo -n " " >> "$out" + + # Every following argument is an attribute, so let's recurse and check + # every attribute whether it must be quoted and write it into $out. + while [ -n "$1" ]; do + if expr match "$1" '^[a-zA-Z][a-zA-Z0-9]*$' > /dev/null; then + echo -n "$1" >> "$out" + else + echo -n '"' >> "$out" + echo -n "$1" | sed -e 's/["$]/\\&/g' >> "$out" + echo -n '"' >> "$out" + fi + shift + [ -z "$1" ] || echo -n . >> "$out" + done + + echo " = builtins.toFile \"$storeFileName\" '''" >> "$out" + sed -e 's/^/ /' "$file" >> "$out" + + echo " ''';" >> "$out" + } + + echo '# Generated via mkcert.sh in the same directory.' > "$out" + echo '{' >> "$out" + + openssl req -newkey rsa:4096 -x509 -sha256 -days 36500 \ + -subj '/CN=Snakeoil CA' -nodes -out ca.pem -keyout ca.key + + addpem ca.key ca key + addpem ca.pem ca cert + + ${lib.concatMapStrings (fqdn: let + opensslConfig = pkgs.writeText "snakeoil.cnf" '' + [req] + default_bits = 4096 + prompt = no + default_md = sha256 + req_extensions = req_ext + distinguished_name = dn + [dn] + CN = ${fqdn} + [req_ext] + subjectAltName = DNS:${fqdn} + ''; + in '' + export OPENSSL_CONF=${lib.escapeShellArg opensslConfig} + openssl genrsa -out snakeoil.key 4096 + openssl req -new -key snakeoil.key -out snakeoil.csr + openssl x509 -req -in snakeoil.csr -sha256 -set_serial 666 \ + -CA ca.pem -CAkey ca.key -out snakeoil.pem -days 36500 + addpem snakeoil.key ${lib.escapeShellArg fqdn} key + addpem snakeoil.pem ${lib.escapeShellArg fqdn} cert + '') domains} + + echo '}' >> "$out" +'' diff --git a/nixos/tests/common/acme/server/mkcerts.sh b/nixos/tests/common/acme/server/mkcerts.sh new file mode 100755 index 00000000000..cc7f8ca650d --- /dev/null +++ b/nixos/tests/common/acme/server/mkcerts.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env nix-shell +#!nix-shell -p nix bash -i bash +set -e +cd "$(dirname "$0")" +storepath="$(nix-build --no-out-link mkcerts.nix)" +cat "$storepath" > snakeoil-certs.nix diff --git a/nixos/tests/common/acme/server/snakeoil-certs.nix b/nixos/tests/common/acme/server/snakeoil-certs.nix new file mode 100644 index 00000000000..fd537c3260f --- /dev/null +++ b/nixos/tests/common/acme/server/snakeoil-certs.nix @@ -0,0 +1,171 @@ +# Generated via mkcert.sh in the same directory. +{ + ca.key = builtins.toFile "ca.key" '' + -----BEGIN PRIVATE KEY----- + MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQDCnVZGEn68ezXl + DWE5gjsCPqutR4nxw/wvIbAxB2Vk2WeQ6HGvt2Jdrz5qer2IXd76YtpQeqd+ffet + aLtMeFTr+Xy9yqEpx2AfvmEEcLnuiWbsUGZzsHwW7/4kPgAFBy9TwJn/k892lR6u + QYa0QS39CX85kLMZ/LZXUyClIBa+IxT1OovmGqMOr4nGASRQP6d/nnyn41Knat/d + tpyaa5zgfYwA6YW6UxcywvBSpMOXM0/82BFZGyALt3nQ+ffmrtKcvMjsNLBFaslV + +zYO1PMbLbTCW8SmJTjhzuapXtBHruvoe24133XWlvcP1ylaTx0alwiQWJr1XEOU + WLEFTgOTeRyiVDxDunpz+7oGcwzcdOG8nCgd6w0aYaECz1zvS3FYTQz+MiqmEkx6 + s4bj1U90I0kwUJbeWjjrGO7Y9Qq4i19GafDg7cAMn9eHCiNbNrPj6t/gfaVbCrbk + m3ZVjkvLTQ2mb2lv7+tVii45227iNPuNS6lx2FVlr/DXiRrOVfghPvoOxUfXzogJ + hZLV4Zki+ycbGQa5w8YMDYCv4c08dKA7AatVhNS60c1zgQNjuWF3BvocSySyGUon + VT6h1DYlJ9YAqgqNpedgNR9kpp034SMhB7dj9leB6LRMA+c1fG/T+1lDbkA+vope + pt4+30oDcCTYfEifl1HwqNw/bXDm1wIDAQABAoICABPbd/UYaAQVUk93yQbUKe81 + s9CvbvzTMYUhm9e02Hyszitz/D2gqZHDksvMkFA8u8aylXIGwdZfRglUmV/ZG1kk + kLzQ0xbvN/ilNUL9uYsETBMqtPly9YZloHnUNa5NqF+UVGJGk7GWz5WaLANybx3V + fTzDbfLl3TkVy0vt9UQbUkUfXyzwZNjXwmgIr8rcY9vasP90a3eXqRX3Tw1Wk6A4 + TzO8oB994O0WBO150Fc6Lhwvc72yzddENlLDXq8UAXtqq9mmGqJKnhZ+1mo3AkMw + q7P1JyCIxcAMm26GtRvLVljXV0x5640kxDrCin6jeeW/qWkJEW6dpmuZjR5scmLI + /9n8H+fGzdZH8bOPPotMy12doj3vJqvew3p0eIkmVctYMJKD0j/CWjvKJNE3Yx4O + Ls47X/dEypX6anR1HQUXcpd6JfRWdIJANo2Duaz+HYbyA88bHcJL9shFYcjLs3sX + R/TvnnKHvw/ud7XBgvLGwGAf/cDEuLI2tv+V7tkMGrMUv+gUJNZaJaCpdt+1iUwO + QFq8APyBNn6FFw54TwXWfSjfSNh3geIMLHuErYVu9MIXvB7Yhh+ZvLcfLbmckhAX + wb39RRHnCWvnw5Bm9hnsDhqfDsIoP+2wvUkViyHOmrKi8nSJhSk19C8AuQtSVcJg + 5op+epEmjt70GHt52nuBAoIBAQD2a4Ftp4QxWE2d6oAFI6WPrX7nAwI5/ezCbO/h + yoYAn6ucTVnn5/5ITJ8V4WTWZ4lkoZP3YSJiCyBhs8fN63J+RaJ/bFRblHDns1HA + 2nlMVdNLg6uOfjgUJ8Y6xVM0J2dcFtwIFyK5pfZ7loxMZfvuovg74vDOi2vnO3dO + 16DP3zUx6B/yIt57CYn8NWTq+MO2bzKUnczUQRx0yEzPOfOmVbcqGP8f7WEdDWXm + 7scjjN53OPyKzLOVEhOMsUhIMBMO25I9ZpcVkyj3/nj+fFLf/XjOTM00M/S/KnOj + RwaWffx6mSYS66qNc5JSsojhIiYyiGVEWIznBpNWDU35y/uXAoIBAQDKLj0dyig2 + kj1r3HvdgK4sRULqBQFMqE9ylxDmpJxAj6/A8hJ0RCBR57vnIIZMzK4+6K0l3VBJ + ukzXJHJLPkZ0Uuo2zLuRLkyjBECH6KYznyTkUVRn50Oq6IoP6WTCfd3Eg+7AKYY1 + VFo2iR8sxeSQQ+AylFy6QcQ1xPIW30Jj1/LFjrRdRggapPEekpJec0pEqhasT8rR + UFhRL2NdZnL5b7ZlsJc7gZKEJgNfxgzaCzloqLcjCgGpOhLKx0fFsNOqHcbIGMwG + 6wQCOyNghQJ6AZtRD5TYCJow92FchWjoTIaMJ8RjMKQmxpiwM6wQG4J78Hd3mbhf + q0hiQhPHaNbBAoIBAFeIeMFq8BpXM7sUwcURlI4lIx8Mgo33FVM7PzsFpfQyw9MR + 5w3p6vnjvd8X4aoHvVZxzw3hA0WwjiAmrKMJL/KK6d45rP2bDUBBAplvAgeLtTLt + 4tMLIwCF4HSgA55TIPQlaqO1FDC+M4BTSiMZVxS970/WnZPBEuNgzFDFZ+pvb4X6 + 3t40ZLNwAAQHM4IEPAFiHqWMKGZ9eo5BWIeEHnjHmfjqSDYfLJAVYk1WJIcMUzom + lA76CBC8CxW/I94AtcRhWuFUv/Z5/+OYEYLUxtuqPm+J+JrCmf4OJmWppT1wI2+p + V00BSeRVWXTm1piieM8ahF5y1hp6y3uV3k0NmKECggEBAMC42Ms3s6NpPSE+99eJ + 3P0YPJOkl7uByNGbTKH+kW89SDRsy8iGVCSe9892gm5cwU/4LWyljO3qp2qBNG2i + /DfP/bCk8bqPXsAZwoWK8DrO3bTCDepJWYhlx40pVkHLBwVXGdOVAXh+YswPY2cj + cB9QhDrSj52AKU9z36yLvtY7uBA3Wph6tCjpx2n0H4/m6AmR9LDmEpf5tWYV/OrA + SKKaqUw/y7kOZyKOtbKqr/98qYmpIYFF/ZVZZSZkVXcNeoZzgdOlR37ksVqLEsrj + nxu7wli/uItBj/FTLjyqcvjUUYDyO1KtwBuyPUPgzYhBIN2Rt9+K6WRQelwnToFL + 30ECggEBALzozykZj2sr3z8tQQRZuXLGotUFGsQCB8ikeqoeB8FbNNkC+qgflQGv + zLRB2KWOvnboc94wVgBJH43xG0HBibZnBhUO8/HBI/WlmyEj9KQ/ZskUK4GVZkB6 + r/81ASLwH+P/rqrLEjcp1SIPPevjzCWD9VYR5m/qPHLNxStwGSrPjtPzgaFxhq84 + Jl+YVmNqVlrOKYYfIPh8exPLiTti3wfM61pVYFv56PI2gd5ysMWYnuN+vK0sbmZh + cIWwykcKlODIngI7IzYqt8NuIJI0jrYyHgtUw4jaJzdF4mEOplGONxdz15jAGHtg + JUsBXFNz132nP4iIr3UKrPedQZijSi4= + -----END PRIVATE KEY----- + ''; + ca.cert = builtins.toFile "ca.cert" '' + -----BEGIN CERTIFICATE----- + MIIFDzCCAvegAwIBAgIUTRDYSWJvmlhwIR3pzVrIQfnboLEwDQYJKoZIhvcNAQEL + BQAwFjEUMBIGA1UEAwwLU25ha2VvaWwgQ0EwIBcNMjAwMzIyMjI1NjE3WhgPMjEy + MDAyMjcyMjU2MTdaMBYxFDASBgNVBAMMC1NuYWtlb2lsIENBMIICIjANBgkqhkiG + 9w0BAQEFAAOCAg8AMIICCgKCAgEAwp1WRhJ+vHs15Q1hOYI7Aj6rrUeJ8cP8LyGw + MQdlZNlnkOhxr7diXa8+anq9iF3e+mLaUHqnfn33rWi7THhU6/l8vcqhKcdgH75h + BHC57olm7FBmc7B8Fu/+JD4ABQcvU8CZ/5PPdpUerkGGtEEt/Ql/OZCzGfy2V1Mg + pSAWviMU9TqL5hqjDq+JxgEkUD+nf558p+NSp2rf3bacmmuc4H2MAOmFulMXMsLw + UqTDlzNP/NgRWRsgC7d50Pn35q7SnLzI7DSwRWrJVfs2DtTzGy20wlvEpiU44c7m + qV7QR67r6HtuNd911pb3D9cpWk8dGpcIkFia9VxDlFixBU4Dk3kcolQ8Q7p6c/u6 + BnMM3HThvJwoHesNGmGhAs9c70txWE0M/jIqphJMerOG49VPdCNJMFCW3lo46xju + 2PUKuItfRmnw4O3ADJ/XhwojWzaz4+rf4H2lWwq25Jt2VY5Ly00Npm9pb+/rVYou + Odtu4jT7jUupcdhVZa/w14kazlX4IT76DsVH186ICYWS1eGZIvsnGxkGucPGDA2A + r+HNPHSgOwGrVYTUutHNc4EDY7lhdwb6HEskshlKJ1U+odQ2JSfWAKoKjaXnYDUf + ZKadN+EjIQe3Y/ZXgei0TAPnNXxv0/tZQ25APr6KXqbePt9KA3Ak2HxIn5dR8Kjc + P21w5tcCAwEAAaNTMFEwHQYDVR0OBBYEFCIoeYSYjtMiPrmxfHmcrsZkyTpvMB8G + A1UdIwQYMBaAFCIoeYSYjtMiPrmxfHmcrsZkyTpvMA8GA1UdEwEB/wQFMAMBAf8w + DQYJKoZIhvcNAQELBQADggIBAHPdwOgAxyhIhbqFObNftW8K3sptorB/Fj6jwYCm + mHleFueqQnjTHMWsflOjREvQp1M307FWooGj+KQkjwvAyDc/Hmy7WgJxBg9p3vc+ + /Xf/e7ZfBl8rv7vH8VXW/BC1vVsILdFncrgTrP8/4psV50/cl1F4+nPBiekvvxwZ + k+R7SgeSvcWT7YlOG8tm1M3al4F4mWzSRkYjkrXmwRCKAiya9xcGSt0Bob+LoM/O + mpDGV/PMC1WAoDc1mMuXN2hSc0n68xMcuFs+dj/nQYn8uL5pzOxpX9560ynKyLDv + yOzQlM2VuZ7H2hSIeYOFgrtHJJwhDtzjmUNDQpQdp9Fx+LONQTS1VLCTXND2i/3F + 10X6PkdnLEn09RiPt5qy20pQkICxoEydmlwpFs32musYfJPdBPkZqZWrwINBv2Wb + HfOmEB4xUvXufZ5Ju5icgggBkyNA3PCLo0GZFRrMtvA7i9IXOcXNR+njhKa9246V + QQfeWiz05RmIvgShJYVsnZWtael8ni366d+UXypBYncohimyNlAD1n+Bh3z0PvBB + +FK4JgOSeouM4SuBHdwmlZ/H0mvfUG81Y8Jbrw0yuRHtuCtX5HpN5GKpZPHDE7aQ + fEShVB/GElC3n3DvgK9OJBeVVhYQgUEfJi4rsSxt3cdEI0NrdckUoZbApWVJ3CBc + F8Y7 + -----END CERTIFICATE----- + ''; + "acme.test".key = builtins.toFile "acme.test.key" '' + -----BEGIN RSA PRIVATE KEY----- + MIIJKAIBAAKCAgEAlgQTZjKfs3aHw0J993k7jFAs+hVRPf//zHMAiUkPKUYPTSl1 + TxS/bPbhWzSoom00j4SLhGGGhbd+lnvTg0uvKbxskgATfw5clbm1ZN+gx4DuxwjL + V3xIxpeSY+PKzs5z8w/k+AJh+zOPyXwH3ut3C+ogp1S/5IhmzV3a/yU/6k0zpGxj + N6ZPRTXFrz93I1pPeCkJz90l7tj+2uFc9xtM20NQX52f0Y2oShcG8fKdNZVzuHHk + ZXkrZIhou55/nRy2jKgFeD3GQQfa9rwPWrVybQ6tKMMkoazB/Unky9xcTI2LJarf + xgHDO9v9yFBvmR4UM8B3kM82NHoENtHaZ2mmiMGZzTEQlf8xwYyHFrqBFIVRWEUr + 7rr/O5Qr9gIN0T4u367HCexVYAKzbO2P9h75czzjMMoGkbXze9SMQ/ikrxEmwAHg + r1Xxh6iQYmgPNk8AR3d9+o2I7WJZMUYZARLnuhVr9BNXv510iqZTqX8lcyL5fEj3 + ST4Ab+H7rfevZt6NU26iJLBYAjrA2mSvH+wvkboxrgSS8xYPkOW8NLNEbbodzofI + pB+SaK53OIk0bj9c1YAgrSNER/TDTgDXrWUNrlfVZ/M7+AEdeU06wi7sVhVif6OB + D3OpgKSNjeE6TuJH80Pi5MWugSFBr792Xb6uhVoPiVOFN+qiGB6UkwBgSKkCAwEA + AQKCAgAmN7OZfZwh5DiCDhZ5TXFWNba/n16rJOTN+R5R20L5iNetGLrCAs8hu2N+ + ENRFTPzu8x14BEB5IF4niDRCZq2hPFeMemh9HfOIUV9c63vSV459NkhXaVpA/axV + tlqchQwVCB+U70Z28JPZCLgYmnQhnOvktTqNxhIqj5aTGbJGxpQ5d0Nvkfbv8tsB + 4nE/mGpWel39jqFzT+Tdbjx414Ok+GkpcsacZDJTbbpfOSfD1uc8PgepskzTt8y2 + v5JTPFVlUAjUsSgouQ+XfCGNQlx8XBjRIaXbal+hX4niRald91FTr0yC7UAHp+vn + dFZ586fB526OfbuZctxP+vZhEhFSseQKxHQ0tB8me81xH44daVNr9PPUM69FDT3j + ygJaUJjNEG3vVzePCDzhmxTmz2/rAClp77WTWziBWDoA6YWDDzhgNPrXWzLIbZIx + ue9ZbGEOh/u5ZzrEXxKCz9FjDe9wQu3TeYUe0M+ejzwWgn7zdWDvjjmtLUUuun2Y + wW7WANpu32qvB/V+qssw4O63tbRiwneRCnb8AF2ixgyWr6xyZwch4kacv1KMiixf + gO/5GTj7ba5GcdGoktJb29cUEgz13yPd106RsHK4vcggFxfMbOVauNRIo6ddLwyS + 8UMxLf2i2cToOLkHZrIb8FgimmzRoBd3yYzwVJBydiVcsrHQAQKCAQEAxlzFYCiQ + hjEtblGnrkOC7Hx6HvqMelViOkGN8Y9VczG4GhwntmSE2nbpaAKhFBGdLfuSI3tJ + Lf24f0IGgAhzPmpo2TjbxPO3YSKFTH71fznVBhtQ1iSxwZ1InXktnuhot6VSDx6A + sbHSy1hMFy3nj+Zj5+fQ89tclzBzG9bCShaauO39KrPMwKi6CYoYdGhXBC3+OpHY + zBNvmDTxG2kW8L42rlf14EH4pAlgKs4eeZbpcbZ6fXURP2hToHJ8swyKw/1p12WA + cc19BKFJXL8nNP4uCf/fI0mVYpytz5KwUzG+z+umDqk+RRCH4mNB28xvEEuEyp/e + /C5Is+WrlDAA6QKCAQEAwZsK4AJ/w4Xf4Q/SsnZJO9bfP1ejJjzKElt8rG28JXeb + +FjykZZ6vw2gt2Boest2n9N4fBwaRkaHVtVS4iAmaDXozTlcvCLs2rVjPSguuQtW + 80CKg6+dux+6gFN8IGzDCiX3pWUnhhiXvCcRYEcvgpH6GA5vuCNrXrjH0JFC0kef + aaDMGMTbzhc2IIRztmWU4v8YJSSy5KOkIQLWO+7u9aGx9IqT5/z3gx3XrItyl0Bk + aQmZEh7JOSyhmGhhf5LdeTLu2YgRw3/tzS+lPMX3+UPw99k9MdTOFn2pww5AdRmg + aBIzV+/LBYG0pPRl0D8/6yzGVBPuUDQpmK9Z3gsxwQKCAQEAnNkMZN2Ocd1+6+V7 + LmtJog9HTSmWXMEZG7FsOJ661Yxx44txx2IyPsCaDNlPXxwSaiKrSo0Yr1oZQd8G + XsTPw4HGiETSWijQTulJ99PH8SLck6iTwdBgEhV5LrN75FQnQVdizHu1DUzrvkiC + Wi29FWb6howiCEDjNNVln5SwKn83NpVQgyyK8ag4+oQMlDdQ3wgzJ0Ld53hS3Eq4 + f5EYR6JQgIki7YGcxrB3L0GujTxMONMuhfdEfRvUTGFawwVe0FyYDW7AIrx2Z2vV + I5YuvVNjOhrt6OwtSD1VnnWCITaLh8LwmlUu3NOWbudHUzKSe5MLXGEPo95BNKad + hl5yyQKCAQBNo0gMJtRnawMpdLfwewDJL1SdSR6S0ePS0r8/Qk4l1D5GrByyB183 + yFY/0zhyra7nTt1NH9PlhJj3WFqBdZURSzUNP0iR5YuH9R9Twg5ihEqdB6/EOSOO + i521okTvl83q/ui9ecAMxUXr3NrZ+hHyUWmyRe/FLub6uCzg1a+vNauWpzXRZPgk + QCijh5oDdd7r3JIpKvtWNs01s7aHmDxZYjtDrmK7sDTtboUzm0QbpWXevUuV+aSF + +gDfZlRa3WFVHfisYSWGeYG6O7YOlfDoE7fJHGOu3QC8Ai6Wmtt8Wgd6VHokdHO8 + xJPVZnCBvyt5up3Zz5hMr25S3VazdVfBAoIBAHVteqTGqWpKFxekGwR0RqE30wmN + iIEwFhgOZ8sQ+6ViZJZUR4Nn2fchn2jVwF8V8J1GrJbTknqzAwdXtO3FbgfmmyF2 + 9VbS/GgomXhA9vJkM4KK3Iwo/y/nE9hRhtzuVE0QPudz2fyfaDgnWjcNM59064tH + 88361LVJm3ixyWSBD41UZ7NgWWJX1y2f073vErsfcPpavF5lhn1oSkQnOlgMJsnl + 24qeuzAgTWu/2rFpIA2EK30Bgvsl3pjJxHwyNDAgklV7C783LIoAHi7VO7tzZ6iF + dmD5XLfcUZc3eaB7XehNQKBXDGLJeI5AFmjsHka5GUoitkU2PFrg/3+nJmg= + -----END RSA PRIVATE KEY----- + ''; + "acme.test".cert = builtins.toFile "acme.test.cert" '' + -----BEGIN CERTIFICATE----- + MIIEoTCCAokCAgKaMA0GCSqGSIb3DQEBCwUAMBYxFDASBgNVBAMMC1NuYWtlb2ls + IENBMCAXDTIwMDMyMjIyNTYxOFoYDzIxMjAwMjI3MjI1NjE4WjAUMRIwEAYDVQQD + DAlhY21lLnRlc3QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCWBBNm + Mp+zdofDQn33eTuMUCz6FVE9///McwCJSQ8pRg9NKXVPFL9s9uFbNKiibTSPhIuE + YYaFt36We9ODS68pvGySABN/DlyVubVk36DHgO7HCMtXfEjGl5Jj48rOznPzD+T4 + AmH7M4/JfAfe63cL6iCnVL/kiGbNXdr/JT/qTTOkbGM3pk9FNcWvP3cjWk94KQnP + 3SXu2P7a4Vz3G0zbQ1BfnZ/RjahKFwbx8p01lXO4ceRleStkiGi7nn+dHLaMqAV4 + PcZBB9r2vA9atXJtDq0owyShrMH9SeTL3FxMjYslqt/GAcM72/3IUG+ZHhQzwHeQ + zzY0egQ20dpnaaaIwZnNMRCV/zHBjIcWuoEUhVFYRSvuuv87lCv2Ag3RPi7frscJ + 7FVgArNs7Y/2HvlzPOMwygaRtfN71IxD+KSvESbAAeCvVfGHqJBiaA82TwBHd336 + jYjtYlkxRhkBEue6FWv0E1e/nXSKplOpfyVzIvl8SPdJPgBv4fut969m3o1TbqIk + sFgCOsDaZK8f7C+RujGuBJLzFg+Q5bw0s0Rtuh3Oh8ikH5Jornc4iTRuP1zVgCCt + I0RH9MNOANetZQ2uV9Vn8zv4AR15TTrCLuxWFWJ/o4EPc6mApI2N4TpO4kfzQ+Lk + xa6BIUGvv3Zdvq6FWg+JU4U36qIYHpSTAGBIqQIDAQABMA0GCSqGSIb3DQEBCwUA + A4ICAQBCDs0V4z00Ze6Ask3qDOLAPo4k85QCfItlRZmwl2XbPZq7kbe13MqF2wxx + yiLalm6veK+ehU9MYN104hJZnuce5iEcZurk+8A+Pwn1Ifz+oWKVbUtUP3uV8Sm3 + chktJ2H1bebXtNJE5TwvdHiUkXU9ywQt2FkxiTSl6+eac7JKEQ8lVN/o6uYxF5ds + +oIZplb7bv2XxsRCzq55F2tJX7fIzqXrSa+lQTnfLGmDVMAQX4TRB/lx0Gqd1a9y + qGfFnZ7xVyW97f6PiL8MoxPfd2I2JzrzGyP/igNbFOW0ho1OwfxVmvZeS7fQSc5e + +qu+nwnFfl0S4cHRif3G3zmz8Ryx9LM5TYkH41qePIHxoEO2sV0DgWJvbSjysV2S + EU2a31dJ0aZ+z6YtZVpHlujKMVzxVTrqj74trS4LvU5h/9hv7e1gjYdox1TO0HMK + mtDfgBevB21Tvxpz67Ijf31HvfTmCerKJEOjGnbYmyYpMeMNSONRDcToWk8sUwvi + OWa5jlUFRAxgXNM09vCTPi9aRUhcFqACqfAd6I1NqGVlfplLWrc7SWaSa+PsLfBf + 4EOZfk8iEKBVeYXNjg+CcD8j8yk/oEs816/jpihIk8haCDRWYWGKyyGnwn6OQb8d + MdRO2b7Oi/AAmEF3jMlICqv286GIYK5qTKk2/CKHlOLPnsWEuA== + -----END CERTIFICATE----- + ''; +} diff --git a/nixos/tests/common/letsencrypt/common.nix b/nixos/tests/common/letsencrypt/common.nix deleted file mode 100644 index bd559c8dacc..00000000000 --- a/nixos/tests/common/letsencrypt/common.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ lib, nodes, pkgs, ... }: let - letsencrypt-ca = nodes.letsencrypt.config.test-support.letsencrypt.caCert; -in { - networking.nameservers = [ - nodes.letsencrypt.config.networking.primaryIPAddress - ]; - - security.acme.acceptTerms = true; - security.acme.email = "webmaster@example.com"; - - security.pki.certificateFiles = [ letsencrypt-ca ]; -} diff --git a/nixos/tests/common/letsencrypt/default.nix b/nixos/tests/common/letsencrypt/default.nix deleted file mode 100644 index 110a2520971..00000000000 --- a/nixos/tests/common/letsencrypt/default.nix +++ /dev/null @@ -1,135 +0,0 @@ -# The certificate for the ACME service is exported as: -# -# config.test-support.letsencrypt.caCert -# -# This value can be used inside the configuration of other test nodes to inject -# the snakeoil certificate into security.pki.certificateFiles or into package -# overlays. -# -# Another value that's needed if you don't use a custom resolver (see below for -# notes on that) is to add the letsencrypt node as a nameserver to every node -# that needs to acquire certificates using ACME, because otherwise the API host -# for letsencrypt.org can't be resolved. -# -# A configuration example of a full node setup using this would be this: -# -# { -# letsencrypt = import ./common/letsencrypt; -# -# example = { nodes, ... }: { -# networking.nameservers = [ -# nodes.letsencrypt.config.networking.primaryIPAddress -# ]; -# security.pki.certificateFiles = [ -# nodes.letsencrypt.config.test-support.letsencrypt.caCert -# ]; -# }; -# } -# -# By default, this module runs a local resolver, generated using resolver.nix -# from the parent directory to automatically discover all zones in the network. -# -# If you do not want this and want to use your own resolver, you can just -# override networking.nameservers like this: -# -# { -# letsencrypt = { nodes, ... }: { -# imports = [ ./common/letsencrypt ]; -# networking.nameservers = [ -# nodes.myresolver.config.networking.primaryIPAddress -# ]; -# }; -# -# myresolver = ...; -# } -# -# Keep in mind, that currently only _one_ resolver is supported, if you have -# more than one resolver in networking.nameservers only the first one will be -# used. -# -# Also make sure that whenever you use a resolver from a different test node -# that it has to be started _before_ the ACME service. -{ config, pkgs, lib, ... }: - - -let - snakeOilCerts = import ./snakeoil-certs.nix; - - wfeDomain = "acme-v02.api.letsencrypt.org"; - wfeCertFile = snakeOilCerts.${wfeDomain}.cert; - wfeKeyFile = snakeOilCerts.${wfeDomain}.key; - - siteDomain = "letsencrypt.org"; - siteCertFile = snakeOilCerts.${siteDomain}.cert; - siteKeyFile = snakeOilCerts.${siteDomain}.key; - pebble = pkgs.pebble; - resolver = let - message = "You need to define a resolver for the letsencrypt test module."; - firstNS = lib.head config.networking.nameservers; - in if config.networking.nameservers == [] then throw message else firstNS; - - pebbleConf.pebble = { - listenAddress = "0.0.0.0:443"; - managementListenAddress = "0.0.0.0:15000"; - certificate = snakeOilCerts.${wfeDomain}.cert; - privateKey = snakeOilCerts.${wfeDomain}.key; - httpPort = 80; - tlsPort = 443; - ocspResponderURL = "http://0.0.0.0:4002"; - }; - - pebbleConfFile = pkgs.writeText "pebble.conf" (builtins.toJSON pebbleConf); - pebbleDataDir = "/root/pebble"; - -in { - imports = [ ../resolver.nix ]; - - options.test-support.letsencrypt.caCert = lib.mkOption { - type = lib.types.path; - description = '' - A certificate file to use with the nodes attribute to - inject the snakeoil CA certificate used in the ACME server into - . - ''; - }; - - config = { - test-support = { - resolver.enable = let - isLocalResolver = config.networking.nameservers == [ "127.0.0.1" ]; - in lib.mkOverride 900 isLocalResolver; - letsencrypt.caCert = snakeOilCerts.ca.cert; - }; - - # This has priority 140, because modules/testing/test-instrumentation.nix - # already overrides this with priority 150. - networking.nameservers = lib.mkOverride 140 [ "127.0.0.1" ]; - networking.firewall.enable = false; - - networking.extraHosts = '' - 127.0.0.1 ${wfeDomain} - ${config.networking.primaryIPAddress} ${wfeDomain} ${siteDomain} - ''; - - systemd.services = { - pebble = { - enable = true; - description = "Pebble ACME server"; - requires = [ ]; - wantedBy = [ "network.target" ]; - preStart = '' - mkdir ${pebbleDataDir} - ''; - script = '' - cd ${pebbleDataDir} - ${pebble}/bin/pebble -config ${pebbleConfFile} - ''; - serviceConfig = { - # Required to bind on privileged ports. - User = "root"; - Group = "root"; - }; - }; - }; - }; -} diff --git a/nixos/tests/common/letsencrypt/mkcerts.nix b/nixos/tests/common/letsencrypt/mkcerts.nix deleted file mode 100644 index e7ac2bae46b..00000000000 --- a/nixos/tests/common/letsencrypt/mkcerts.nix +++ /dev/null @@ -1,69 +0,0 @@ -{ pkgs ? import {} -, lib ? pkgs.lib - -, domains ? [ "acme-v02.api.letsencrypt.org" "letsencrypt.org" ] -}: - -pkgs.runCommand "letsencrypt-snakeoil-ca" { - nativeBuildInputs = [ pkgs.openssl ]; -} '' - addpem() { - local file="$1"; shift - local storeFileName="$(IFS=.; echo "$*")" - - echo -n " " >> "$out" - - # Every following argument is an attribute, so let's recurse and check - # every attribute whether it must be quoted and write it into $out. - while [ -n "$1" ]; do - if expr match "$1" '^[a-zA-Z][a-zA-Z0-9]*$' > /dev/null; then - echo -n "$1" >> "$out" - else - echo -n '"' >> "$out" - echo -n "$1" | sed -e 's/["$]/\\&/g' >> "$out" - echo -n '"' >> "$out" - fi - shift - [ -z "$1" ] || echo -n . >> "$out" - done - - echo " = builtins.toFile \"$storeFileName\" '''" >> "$out" - sed -e 's/^/ /' "$file" >> "$out" - - echo " ''';" >> "$out" - } - - echo '# Generated via mkcert.sh in the same directory.' > "$out" - echo '{' >> "$out" - - openssl req -newkey rsa:4096 -x509 -sha256 -days 36500 \ - -subj '/CN=Snakeoil CA' -nodes -out ca.pem -keyout ca.key - - addpem ca.key ca key - addpem ca.pem ca cert - - ${lib.concatMapStrings (fqdn: let - opensslConfig = pkgs.writeText "snakeoil.cnf" '' - [req] - default_bits = 4096 - prompt = no - default_md = sha256 - req_extensions = req_ext - distinguished_name = dn - [dn] - CN = ${fqdn} - [req_ext] - subjectAltName = DNS:${fqdn} - ''; - in '' - export OPENSSL_CONF=${lib.escapeShellArg opensslConfig} - openssl genrsa -out snakeoil.key 4096 - openssl req -new -key snakeoil.key -out snakeoil.csr - openssl x509 -req -in snakeoil.csr -sha256 -set_serial 666 \ - -CA ca.pem -CAkey ca.key -out snakeoil.pem -days 36500 - addpem snakeoil.key ${lib.escapeShellArg fqdn} key - addpem snakeoil.pem ${lib.escapeShellArg fqdn} cert - '') domains} - - echo '}' >> "$out" -'' diff --git a/nixos/tests/common/letsencrypt/mkcerts.sh b/nixos/tests/common/letsencrypt/mkcerts.sh deleted file mode 100755 index cc7f8ca650d..00000000000 --- a/nixos/tests/common/letsencrypt/mkcerts.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -p nix bash -i bash -set -e -cd "$(dirname "$0")" -storepath="$(nix-build --no-out-link mkcerts.nix)" -cat "$storepath" > snakeoil-certs.nix diff --git a/nixos/tests/common/letsencrypt/snakeoil-certs.nix b/nixos/tests/common/letsencrypt/snakeoil-certs.nix deleted file mode 100644 index ca4f71ae688..00000000000 --- a/nixos/tests/common/letsencrypt/snakeoil-certs.nix +++ /dev/null @@ -1,254 +0,0 @@ -# Generated via mkcert.sh in the same directory. -{ - ca.key = builtins.toFile "ca.key" '' - -----BEGIN PRIVATE KEY----- - MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQDQ0b23I1srJZwR - 2MMdvSJK5pcwLfrXU+4gEZEnWNyT8yeVweya+8vmNNOlvK3zxf+ZiY/7aQ0RZJMO - h2+VdlgHmr2QKhQTf1HwfZA/06FolD3/DcS+DMJMSTVr179/XLndeVVZUqU7tjvB - AWKSIS8H2hSF1UOPi9gBDR8MwCP6Qgj8WYhbkt9q47/lO96qAmm6U1F+Q7RYM9ZQ - IWI81N0Ms5wJocg7n6S19iV66ePh7APapZFYup61gFGWfahmA217ELIZd56n8yjO - F0epb9sC0XpYCDRrYKBWLqPiv+6wvdZtZvALItyIv08ZwXlBkFg3LbAAhPnf0Vxz - pYysQmyyyzkgy252n+Sie0kx+B4qm6fOkpfgYlPSVTb2dXx/be/SE08u0a9FO0fZ - pkByWEZJUUwngsJgLUa7MorQf3avxozfC25XqvzbieZfSXlA7mOUclZbC/WUFpyj - MlyJU2eCQ8wSwsPXl91oxcYlOkuVLgd41gr9pGXQSuKIkrgbfkftjg2tDC+7g7O8 - qrdF42FjbZjIx/74AasmsGh4GTQtiSkvEnTstioC6aCV44DlJWbBIMvkyawubjUl - Ppij0H66Y9Q4tEc/ktc7oGQfqqluyLb43TeobTPHALsNeAYb39rMtBo5DDCUc81s - fuDMhMr/oYXKrFstUsg5AY6mJaRG0QIDAQABAoICAF5ZVfmoPOoKzTB3GvmV2iez - dj4rmDmwT1gn98iqasdiRtFwVGJWQHNcDQDGdmY9YNZThD2Y4nGoWpVm9jC2zuFo - thusF3QTw8cARKvCCBzDVhumce1YwHVNYpi+W2TFValOyBRathN7rBXxdUMHQUOv - 8jPh/uudyNP4xL2zFs5dBchW/7g4bT/TdYGyglGYU4L/YEPHfXWYvk1oOAW6O8Ig - aPElKt5drEMW2yplATSzua4RvtEzSMBDIRn43pxxEgdXrNC67nF9+ULc2+Efi/oD - Ad9CncSiXO9zlVK/W655p6e4qd6uOqyCm8/MTegkuub7eplRe8D3zGjoNN4kCQ4S - rckVvIDDb6vZk7PKx9F7GWIqaG/YvFFFKO1MrAZg7SguFA6PtGOYAFocT03P6KXT - l2SnZQWKyxUAlh4tOBGlRFgGCx/krRIKbgNYn/qk/ezcRl8c7GpOPh+b7Icoq7u3 - l4tIVBBHqS8uGgtyi+YwuJeht2MV1aEcSkykKLh2ipp8tb6spORJUkhjawDjvxeQ - GztN30Xh2riTXYZ0HExVTtJa8jyvFyp/97ptPIJXaVt2A2KIS3sBFHKnpY+/OrQg - uUauYgi13WFHsKOxZL9GYGk7Ujd8bw4CEcJFxKY7bhpGVI6Du7NRkUDWN0+0yusI - 2szCJ7+ZqJkrc1+GrI/RAoIBAQDseAEggOLYZkpU2Pht15ZbxjM9ayT2ANq1+RTu - LjJx4gv2/o/XJCfMZCL0b9TJqtYeH+N6G9oDRJ99VIhUPedhWSYdj9Qj+rPd++TS - bp+MoSjmfUfxLTDrmFHL7ppquAE65aDy3B5c+OCb0I4X6CILUf0LynBzgl4kdrzN - U6BG3Mt0RiGPojlPV82B9ZUF/09YAz7BIz9X3KMhze1Gps5OeGuUnc9O2IAJYkrj - ur9H2YlNS4w+IjRLAXSXUqC8bqPZp6WTo1G/rlyAkIRXCGN90uk5JQvXoj9immFO - WaylbdcNG3YcGutreYeZL/UIWF6zCdc6pYG0cCBJS6S/RN7FAoIBAQDiERrLuUbV - 3fx/a8uMeZop6hXtQpF7jlFxqUmza7QSvBuwks4QVJF+qMSiSvKDkCKqZD4qVf4N - TMxEj5vNR0PbnmDshyKJNGVjEauKJSb65CFDUcL1eR/A/oJvxiIdN1Z4cPrpnRux - /zIfPuYfYHpdz52buxxmlD7bfwYmVKVpnzjB9z0I1CasZ5uqB0Z8H0OLyUu8S4ju - RfkKBDMgVl2q96i8ZvX4C1b7XuimIUqv4WHq5+ejcYirgrYtUbBIaDU3/LORcJdy - /K76L1/up70RTDUYYm/HKaRy+vMTpUsZJ7Qbh0hrvQkUvNQ1HXjprW2AePIYi33N - h3mb1ulqw4idAoIBAQCsn0YjVjNDShkFK4bfmLv4rw2Ezoyi0SjYIsb2wN6uaBfX - 7SlQIuKywH8L9f9eYMoCH8FNyLs0G4paUbVb2fzpAc1jUzXINiHL8TCvtXXfkV5s - NBSqqRTHR+CegMZVFZJATpVZ9PptYHmHBY5VQW5o2SdizhudFxRmhg95zIx6boBP - l0q0sfYoR66MKpzpTeG8HFJZZ8O7/iNQcCXAp9B/VEUkrrdBlaaSMyD8cb1lVBZ5 - SKdOTGXkQ2G7feQ86n/OSiYDSvxIc56vc9BIQKVwmuEKiFLGzXh8ILrcGXaBJVgS - B3QHPFeTk5o7Z9j2iJxJEuv9sginkhrfpsrTnhEJAoIBACkrUkTtjd/e2F/gIqaH - crLVZX7a06G7rktTuA9LuvR6e1Rxt8Mzk3eMhprDqVyaQCXlsYiGNoj3hm+p84az - xsDVG/OXPIveFeSv0ByNXYbtSr12w1lu4ICGGP0ACTBm5oFymc83hFarEdas3r2y - FTbGW36D2c04jCXvARCz85fDnlN8kgnskMpu5+NUBdsO2n83fmphGyPBbHQNhb4K - 3G4JQhplab/tWL7YbufqQi67jdh4uS+Duo75c/HW4ZKeH6r9gzomVf5j0/3N6NuO - gpkG1tiE/LQ5ejBSUTgvrvh6yYsF3QN53pB/PuoZXu63Xay62ePsa1GlrVjbD5EY - 4OUCggEAJFr7F7AQLMJTAxHFLCsZZ0ZZ+tXYclBC4eHPkZ6sD5jvL3KIpW3Q7jXk - oIoD/XEX4B+Qe5M3jQJ/Y5ZJETHcgfcHZbDpCKN2WHQgldQbAJiFd4GY1OegdVsr - 7TC8jh3Q2eYjzL8u4z7LSNI6aQSv1eWE7S1Q5j/sX/YYDR4W3CBMeIUpqoDWpn87 - czbIRyA/4L0Y/HLpg/ZCbvtJZbsQwYXhyqfbjlm4BRQ6JiC5uEBKvuDRUXToBJta - JU8XMm+Ae5Ogrw7P6hg68dWpagfjb7UZ7Zxv+VDsbrU6KsDcyGCAwrrRZou/6KUG - Eq4OVTSu/s8gmY94tgbjeOaLUPEPmg== - -----END PRIVATE KEY----- - ''; - ca.cert = builtins.toFile "ca.cert" '' - -----BEGIN CERTIFICATE----- - MIIFDzCCAvegAwIBAgIUU9rbCLTuvaI6gjSsFsJJjfLWIX8wDQYJKoZIhvcNAQEL - BQAwFjEUMBIGA1UEAwwLU25ha2VvaWwgQ0EwIBcNMTkxMDE4MDc1NDEyWhgPMjEx - OTA5MjQwNzU0MTJaMBYxFDASBgNVBAMMC1NuYWtlb2lsIENBMIICIjANBgkqhkiG - 9w0BAQEFAAOCAg8AMIICCgKCAgEA0NG9tyNbKyWcEdjDHb0iSuaXMC3611PuIBGR - J1jck/MnlcHsmvvL5jTTpbyt88X/mYmP+2kNEWSTDodvlXZYB5q9kCoUE39R8H2Q - P9OhaJQ9/w3EvgzCTEk1a9e/f1y53XlVWVKlO7Y7wQFikiEvB9oUhdVDj4vYAQ0f - DMAj+kII/FmIW5LfauO/5TveqgJpulNRfkO0WDPWUCFiPNTdDLOcCaHIO5+ktfYl - eunj4ewD2qWRWLqetYBRln2oZgNtexCyGXeep/MozhdHqW/bAtF6WAg0a2CgVi6j - 4r/usL3WbWbwCyLciL9PGcF5QZBYNy2wAIT539Fcc6WMrEJssss5IMtudp/kontJ - MfgeKpunzpKX4GJT0lU29nV8f23v0hNPLtGvRTtH2aZAclhGSVFMJ4LCYC1GuzKK - 0H92r8aM3wtuV6r824nmX0l5QO5jlHJWWwv1lBacozJciVNngkPMEsLD15fdaMXG - JTpLlS4HeNYK/aRl0EriiJK4G35H7Y4NrQwvu4OzvKq3ReNhY22YyMf++AGrJrBo - eBk0LYkpLxJ07LYqAumgleOA5SVmwSDL5MmsLm41JT6Yo9B+umPUOLRHP5LXO6Bk - H6qpbsi2+N03qG0zxwC7DXgGG9/azLQaOQwwlHPNbH7gzITK/6GFyqxbLVLIOQGO - piWkRtECAwEAAaNTMFEwHQYDVR0OBBYEFAZcEiVphGxBT4OWXbM6lKu96dvbMB8G - A1UdIwQYMBaAFAZcEiVphGxBT4OWXbM6lKu96dvbMA8GA1UdEwEB/wQFMAMBAf8w - DQYJKoZIhvcNAQELBQADggIBAGJ5Jnxq1IQ++IRYxCE7r7BqzzF+HTx0EWKkSOmt - eSPqeOdhC26hJlclgGZXAF/Xosmn8vkSQMHhj/jr4HI0VF9IyvDUJm8AKsnOgu/7 - DUey3lEUdOtJpTG9NyTOcrzxToMJ+hWlFLZKxx2dk4FLIvTLjmo1VHM97Bat7XYW - IrL9RRIZ25V+eCYtlR7XYjceGFQ0rCdp8SFIQwC6C/AH2tV3b1AJFsND9PcoLu7c - //fH+WUQCcD/N0grdC/QCX7AFWzd4rKQ8gjfND4TSYFTSDwW10Mud4kAVhY2P1sY - Y3ZpnxWrCHbIZMbszlbMyD+cjsCBnNvOtYGm7pDut/371rllVcB/uOWYWMCtKPoj - 0elPrwNMrK+P+wceNBCRQO+9gwzB589F2morFTtsob/qtpAygW8Sfl8M+iLWXeYS - c3LBLnj0TpgXKRWg7wgIWKSZx9v6pgy70U0qvkjNS1XseUCPf7hfAbxT3xF+37Dw - zZRwF4WAWqdnJoOey21mgc+a2DQzqtykA6KfHgCqNFfDbQXPXvNy25DDThbk+paX - G2M2EWtr+Nv9s/zm7Xv/pOXlgMFavaj+ikqZ4wfJf6c/sMOdZJtMA4TsYtAJgbc8 - ts+0eymTq4v5S8/fW51Lbjw6hc1Kcm8k7NbHSi9sEjBfxFLTZNQ5eb4NGr9Od3sU - kgwJ - -----END CERTIFICATE----- - ''; - "acme-v02.api.letsencrypt.org".key = builtins.toFile "acme-v02.api.letsencrypt.org.key" '' - -----BEGIN RSA PRIVATE KEY----- - MIIJKQIBAAKCAgEApny0WhfDwEXe6WDTCw8qBuMAPDr88pj6kbhQWfzAW2c0TggJ - Etjs9dktENeTpSl14nnLVMiSYIJPYY3KbOIFQH1qDaOuQ7NaOhj9CdMTm5r9bl+C - YAyqLIMQ9AAZDhUcQjOy3moiL7ClFHlkFYuEzZBO9DF7hJpfUFIs0Idg50mNoZh/ - K/fb4P2skNjfCjjomTRUmZHxT6G00ImSTtSaYbN/WHut1xXwJvOoT1nlEA/PghKm - JJ9ZuRMSddUJmjL+sT09L8LVkK8CKeHi4r58DHM0D0u8owIFV9qsXd5UvZHaNgvQ - 4OAWGukMX+TxRuqkUZkaj84vnNL+ttEMl4jedw0ImzNtCOYehDyTPRkfng5PLWMS - vWbwyP8jDd2578mSbx5BF7ypYX366+vknjIFyZ5WezcC1pscIHxLoEwuhuf+knN+ - kFkLOHeYbqQrU6mxSnu9q0hnNvGUkTP0a/1aLOGRfQ5C/pxpE/Rebi8qfM/OJFd4 - mSxGL93JUTXWAItiIeBnQpIne65/Ska9dWynOEfIb0okdet3kfmNHz3zc17dZ5g4 - AdOSCgHAlQgFt/Qd8W6xXUe4C5Mfv2ctxRrfQhDwtB6rMByPwzImnciC2h3vCwD3 - vS/vjUyWICyhZyi2LZDUQz+sCKBXCYYcYh8ThFO40j5x1OnYMq7XQvyl8QkCAwEA - AQKCAgBSAfdssWwRF9m3p6QNPIj9H3AMOxpB/azffqTFzsSJwYp4LWkayZPfffy+ - 4RGvN38D8e6ActP3ifjEGu3tOGBR5fUJhujeHEiDea+a2Ug9S9kuNwmnelWQ23bM - Wgf9cdSbn4+qEymHyEFolmsAWdsuzri1fHJVXR06GWBNz4GiLA8B3HY4GD1M1Gfe - aZVkGagpXyeVBdiR2xuP5VQWVI8/NQWzdiipW/sRlNABVkyI3uDeN4VzYLL3gTeE - p021kQz4DSxIjHZacHpmWwhBnIbKMy0fo7TlrqcnIWXqTwv63Q9Zs/RN8NOyqb0Y - t1NKFWafcwUsdOnrG9uv/cVwF1FNE8puydaOi8rL1zAeK89JH8NRQ02wohR9w8qy - b2tB6DyGMtuqBt8Il6GA16ZoEuaXeayvlsvDEmG1cS9ZwBvfgrVPAmlm2AYdIf5B - RHIJu4BJC6Nn2ehVLqxx1QDhog3SOnAsCmcfg5g/fCwxcVMLIhODFoiKYGeMitDG - Q4e5JKcOg+RR8PT/n4eY4rUDBGtsR+Nw8S2DWgXmSufyfDtKCjZB4IuLWPS29tNh - zF6iYfoiTWzrSs/yqPSKIFpv+PWZwkKSvjdxia6lSBYYEON4W2QICEtiEs+SvcG4 - 0eIqWM+rRmPnJyMfGqX6GCs3rHDQB2VNJPBCYPQalJ/KwZumAQKCAQEA0ezM6qPJ - 1JM/fddgeQ50h0T9TRXVUTCISxXza+l4NuFt1NdqUOdHsGtbL1JR4GaQUG8qD1/P - R39YgnQEQimxpmYLCZkobkwPxTZm9oiMXpcJrlN4PB5evaWShRSv3mgigpt3Wzml - Td+2R9RoA/hvF/wEyIvaWznYOyugBC7GXs20dNnZDULhUapeQu7r6JvgmxBOby7S - 0FbhGplBiSDETzZURqzH/GMJKaJtNgyyVf3Hbg4mZAQDWoBRr+8HxsNbDkxP6e91 - QrPHy2VZFiaTmJfoxRhyMTn7/JZaLJaUHDOniOsdMj/V7vMCgpfBqh5vR8bKzuPy - ZINggpcFPp1IYQKCAQEAywc7AQoktMBCru/3vzBqUveXbR3RKzNyZCTH5CMm3UNH - zmblFgqF2nxzNil21GqAXzSwZk5FyHbkeD3yvEZm+bXzsZTDNokAwoiTgyrr2tf8 - GLMlCHHl5euIh1xHuyg/oKajVGOoXUXK8piqiDpQKd3Zwc6u2oyQlh+gYTPKh+7i - ilipkYawoE6teb6JUGpvU+d27INgNhB2oDEXY3pG2PbV+wv229ykSZxh1sJUdDwT - a8eTg+3pCGXtOZiJoQTFwKUlD2WYTGqS4Gx6dIJco5k+ZikGNST1JGE64Jl4MZdI - rtyvpcYblh5Q14sJGvp4kWYS9tjEM8pA+4Z9th3JqQKCAQEAkidH0+UM1A9gmQCm - jiHeR39ky5Jz3f7oJT63J15479yrVxBTWNhtNQrJhXzOvGkr+JQsuF+ANMsYmFql - zFqy8KMC9D/JwmD6adeif+o5sHF/r/s1LsYGOAtao4TvnOzrefs7ciwERt+GTSQ4 - 9uq0jgJMYkPcVr9DKI8K7V6ThdW52dECKRVzQiRXVEp7vIsqKUuFECuNYrfaKWai - FhLWGkA9FKee5L0e1/naB1N3ph72Bk2btO6GVzAXr2HADEZe0umWiczJ2xLH+3go - Oh/JiufYi8ClYFh6dDVJutlrbOcZsV3gCegfzikqijmWABcIavSgpsJVNF2zh7gV - Uq62gQKCAQAdO2FHeQpn6/at8WceY/4rC/MFhvGC4tlpidIuCtGhsfo4wZ/iWImF - N73u4nF1jBAHpTJwyHxLrLKgjWrRqOFSutvniZ/BzmAJolh63kcvL0Hg3IpMePm8 - 7PivZJ3/WIAwxU1m7SJkq5PY8ho7mwnHvWWI/hU26l42/z68QBS9FawQd0uS5G2x - 5yIbEU/8ABcfYYhB7XiA0EYEMo1HiWeB/ag5iTN13ILbBmUf4sL+KVgygH3A1RRk - XSiWzluij2lZn22ClgIjnoSfQ38uH0bvVzUgyG9YX4XcQxOTGwWvPjT82FGB8NAw - ARVqs14QQFfzt1qrp/I38rsAfBDFk+xhAoIBAQCEKNk/oJcy9t/jMIbLcn6z3aCc - Fn8GBPSXtFj0t6weN5lHof+cggw4owMFWQQyAXxo/K6NnKNydMPZ5qjtLsHNpbpQ - aT1Or0/1YR1bJ8Lo82B4QM++7F761GWQPvE/tyrfPkfkWl92ITIpmnlw4wycRlkq - 9anI2fnj1nIZwixzE2peb6PcsZU2HOs9uZ5RRd9wia696I7IpNibs4O4J2WTm4va - +NeYif3V2g9qwgT0Va0c9/Jlg3b58R0vA8j/VCU5I0TyXpkB3Xapx+pvEdZ3viUL - mXZaVotmWjgBXGDtd2VQg2ZiAMXHn3RzXSgV4Z+A/XacRs75h9bNw0ZJYrz1 - -----END RSA PRIVATE KEY----- - ''; - "acme-v02.api.letsencrypt.org".cert = builtins.toFile "acme-v02.api.letsencrypt.org.cert" '' - -----BEGIN CERTIFICATE----- - MIIEtDCCApwCAgKaMA0GCSqGSIb3DQEBCwUAMBYxFDASBgNVBAMMC1NuYWtlb2ls - IENBMCAXDTE5MTAxODA3NTQxM1oYDzIxMTkwOTI0MDc1NDEzWjAnMSUwIwYDVQQD - DBxhY21lLXYwMi5hcGkubGV0c2VuY3J5cHQub3JnMIICIjANBgkqhkiG9w0BAQEF - AAOCAg8AMIICCgKCAgEApny0WhfDwEXe6WDTCw8qBuMAPDr88pj6kbhQWfzAW2c0 - TggJEtjs9dktENeTpSl14nnLVMiSYIJPYY3KbOIFQH1qDaOuQ7NaOhj9CdMTm5r9 - bl+CYAyqLIMQ9AAZDhUcQjOy3moiL7ClFHlkFYuEzZBO9DF7hJpfUFIs0Idg50mN - oZh/K/fb4P2skNjfCjjomTRUmZHxT6G00ImSTtSaYbN/WHut1xXwJvOoT1nlEA/P - ghKmJJ9ZuRMSddUJmjL+sT09L8LVkK8CKeHi4r58DHM0D0u8owIFV9qsXd5UvZHa - NgvQ4OAWGukMX+TxRuqkUZkaj84vnNL+ttEMl4jedw0ImzNtCOYehDyTPRkfng5P - LWMSvWbwyP8jDd2578mSbx5BF7ypYX366+vknjIFyZ5WezcC1pscIHxLoEwuhuf+ - knN+kFkLOHeYbqQrU6mxSnu9q0hnNvGUkTP0a/1aLOGRfQ5C/pxpE/Rebi8qfM/O - JFd4mSxGL93JUTXWAItiIeBnQpIne65/Ska9dWynOEfIb0okdet3kfmNHz3zc17d - Z5g4AdOSCgHAlQgFt/Qd8W6xXUe4C5Mfv2ctxRrfQhDwtB6rMByPwzImnciC2h3v - CwD3vS/vjUyWICyhZyi2LZDUQz+sCKBXCYYcYh8ThFO40j5x1OnYMq7XQvyl8QkC - AwEAATANBgkqhkiG9w0BAQsFAAOCAgEAkx0GLPuCvKSLTHxVLh5tP4jxSGG/zN37 - PeZLu3QJTdRdRc8bgeOGXAVEVFbqOLTNTsuY1mvpiv2V6wxR6nns+PIHeLY/UOdc - mOreKPtMU2dWPp3ybec2Jwii6PhAXZJ26AKintmug1psMw7662crR3SCnn85/CvW - 192vhr5gM1PqLBIlbsX0tAqxAwBe1YkxBb9vCq8NVghJlKme49xnwGULMTGs15MW - hIPx6sW93zwrGiTsDImH49ILGF+NcX1AgAq90nG0j/l5zhDgXGJglX+K1xP99X1R - de3I4uoufPa5q+Pjmhy7muL+o4Qt0D0Vm86RqqjTkNPsr7gAJtt66A7TJrYiIoKn - GTIBsgM6egeFLLYQsT0ap/59HJismO2Pjx4Jk/jHOkC8TJsXQNRq1Km76VMBnuc0 - 2CMoD9pb38GjUUH94D4hJK4Ls/gJMF3ftKUyR8Sr/LjE6qU6Yj+ZpeEQP4kW9ANq - Lv9KSNDQQpRTL4LwGLTGomksLTQEekge7/q4J2TQRZNYJ/mxnrBKRcv9EAMgBMXq - Q+7GHtKDv9tJVlMfG/MRD3CMuuSRiT3OVbvMMkFzsPkqxYAP1CqE/JGvh67TzKI+ - MUfXKehA6TKuxrTVqCtoFIfGaqA9IWyoRTtugYq/xssB9ESeEYGeaM1A9Yueqz+h - KkBZO00jHSE= - -----END CERTIFICATE----- - ''; - "letsencrypt.org".key = builtins.toFile "letsencrypt.org.key" '' - -----BEGIN RSA PRIVATE KEY----- - MIIJKgIBAAKCAgEA9dpdPEyzD3/BBds7tA/51s+WmLFyWuFrq4yMd2R+vi5gvK7n - lLNVKhYgiTmK2Um+UEpGucJqZHcTSZA1Bz4S/8ND/AI9I6EmwvBinY5/PubxEALk - 9YiDA+IzH8ZGFM8wXg7fMbbJAsyv+SHAtr2jmCsggrpuD5fgzs2p+F2q0+oVoeFw - MAOUdAf2jNtNLEj2Q6MiR5Xq+wFOcRtXlNlXWIX3NrmubO/xOpDNpsyjyYC5Ld+W - 06MS5bTHSdv56AkUg2PugMChj15TOddEJIK8zPXFTlMYye9SKwjhNUZovfe4xXCa - Tj2nmzrcuMKLz+S3sKQeTWjiRcY3w4zTlAbhtGXDjXjhMObrHoWM8e3cTL4NJMvt - tNStXficxbeTbIiYu+7dtF0q+iWaZqexc6PdAaIpFZ0XSw+i5iLdQZmBwzY7NLlH - pQupfh6ze0qDUVZAMDubo4JKUTBzH6QTuhHx+uUm7Lc8YdNArn7o/vMZDQym1Eia - xKxZuCGaqFvq8ZK4nBVsHfcXbhF/XD2HMid3t7ImbREVu9qnc+En+acU/SJaaL3r - jMW6HLVMr6+vQrCzYkvLzKYpoUm9D1Kcn6d8Ofxl2iCaY9CkMr5/6J1p1wcTdcN7 - IVQ/DFBeTDauyWbyZkO/lPoZoakWyXOx9S9tgClzhFmNgRkZv9wN+QguNDcCAwEA - AQKCAgEA0ndlacGfaJ1NeN39dmBW2XZMzdrassJXkjx34528gsLhPaXdyobbWXQn - 1lHUc7+VlNaBRXUR73+gm1FAlDqnuRxIjuy7ukyzCh8PzSG3/PlnVPWlXCzJPAHh - EkqCpD3agirpF34LBsKDwxsKB2bBLft9kWxX3DGA2olmAKDvJQs4CaUcjX4DEHHg - tyTmJAsyByUYq3/D8a1koZ9ukpadF8NXpxm+ILQoJqLf6vM1I8N2w7atP/BStSLV - mH0gq2tajEB4ZPCDXmC5jsKiKz9gsXWUu0CX8AdYqE6pvRnRgQ8Ytq1265QMb+8s - FV82oXqDZkyZRFuNmX3fLyDX39kkTcVS37S56Gzk4EzDWE/u2RXCAPeWla2zUFYI - hg8X4ZAwbZRODtK2cZTuCZEILM/iKmtSgHC+aQhp18EUAefa7WGrRD4AvbTxH4VF - ek60bwISBk5Mhf39MwqIiQxGOFmfLsQReZvzH4jI5zfDXf/0yZ/1SdGeu6+Walt0 - V81Ua/DB6zshHpeSP74HMuJHZ4DOQfcV/ndyzvoP84pAjenSx6O034OwQTkpoMI/ - f/2rK8kdzYSL4f//kFMuRLqmAwOmAFYB2oMo0/YaIoQ4vgTHDKTSxj5mbno56GdT - huMAVMKskaCSVbyMB/xyQG7senLItVv+HafVk6ChMUbkIjv9zgECggEBAP+ux1RG - cETGjK2U3CRoHGxR7FwaX6hkSokG+aFdVLer+WUrZmR8Ccvh2ALpm8K1G6TTk/5X - ZeVX4+1VFYDeTHMN8g20usS5mw3v2GF3fGxGLe4q56l4/4kKMZOrSBuWH4niiIKD - 0QogdzWkpQJ93nMbZxZ5lk+lRZVf3qSm6nzyP468ndrfI57Ov5OUIWZ7KhTUH9IK - 8/urUk+lEvyzQmNTlt5ZZXRz7cR01K8chx1zevVAyynzSuGjTysaBN7LTT0v3yVu - 96yKNsxJvuIz2+4qSjhbnN4jH+feN0VsdF3+Qkru0lBmLVgJl4X67XFaAKMDU9yv - 3alS53Pkol+Dy1cCggEBAPYodofHC1ydoOmCvUAq4oJNtyI4iIOY/ch3sxVhkNyi - KBscQqbay/DiXFiNl+NsemzB1PrHzvCaqKcBKw537XzeKqUgYuVLkFGubf9bDhXi - wSRcYbU/oNTgiTgXPW8wH60uIoLaiNi1/YjO2zh4GEY/kFqSuD54Y91iFmcC75bv - OjCNugnRdpRjOFhaeNx75tdverR37w3APVZuBSv3bJlMPCtaf+fEAKxJxeqCs3Oq - rtsw2TQ4TqfE8/w9qPCVv3bQbMbO48SwjxAz47qH2h3qGu3Ov8badeARe+Ou7nuI - U13gPuPOhPXIQP/MYOyamPJdFyng1b8vyNsfjOcWMiECggEAEkMgl6NkV3U7DRbp - 1mvdQ9tiH33+wR9Qt5LY966b43aUHKbJ7Hlzla1u6V5YMsMO02oNUwhZDdWGQShn - ncnC+iDP3iy/flenfIpaETQgnfcxRqan31H2Joqk2eBNCTNi001r5K6XmrqQ6TL2 - WkQ1RFF7vn42vz+VxcKQO4B0lTIUWhSczcpMWAZ6ZocZD6HScqRoFW+U16/39Bpd - TdFb944742vNNFEndXXGzy8hc3gRGz1ihX+MJKuuduyn1mX9AVbPAHR5mkhQ+6x0 - xuFfXxaEMJxSiwdFOyGDHyFM+n2zrHh8ayOxL22X9gjjNspv6zTMo6GoGnUCdSOq - eVoHhwKCAQEAot5O3rOB/vuEljwcv7IgQJrvCsNg/8FgWR1p7kGpuXHJG3btWrz1 - pyH+e9DjqGQD9KWjJ3LAp02NPUJ2nJIZHj9Y8/yjspb2nDTPLt+uSCjKJibBt0ys - O219HRGzYjfzHYCi8PVrCggQAk7rmUdMuF4iQutE4ICDgtz9eZbls3YBiFKdvxVK - Yg/sHflucmPAbtah13prPyvs6ZzN6zNANYXNYdn1OwHieBwvyWRFG8jY/MorTHPd - BwA3drPNbbGHBzQMZNZKub8gSVYr3SU52gUlYCclmIq+50xqLlF2FWIz1q8irVPd - gUnIR/eQQbxgaivRwbGze1ZAjUsozVVQQQKCAQEA9uAKU3O06bEUGj+L0G+7R7r/ - bi2DNi2kLJ7jyq+n0OqcHEQ1zFK4LAPaXY0yMYXieUzhivMGLSNDiubGO2/KxkFF - REXUFgYWZYMwrKsUuscybB64cQDwzD0oXrhvEa2PHecdG6AZ63iLcHaaDzyCPID/ - wtljekLO2jbJ5esXZd016lykFfUd/K4KP1DGyI2Dkq6q0gTc/Y36gDAcPhIWtzna - UujYCe3a8DWCElH4geKXaB5ABbV1eJ8Lch599lXJ9Hszem6QNosFsPaHDCcqLS9H - yy2WA6CY2LVU7kONN+O0kxs2fVbxIkI+d/LZyX/yIGlkXcAzL07llIlrTAYebQ== - -----END RSA PRIVATE KEY----- - ''; - "letsencrypt.org".cert = builtins.toFile "letsencrypt.org.cert" '' - -----BEGIN CERTIFICATE----- - MIIEpzCCAo8CAgKaMA0GCSqGSIb3DQEBCwUAMBYxFDASBgNVBAMMC1NuYWtlb2ls - IENBMCAXDTE5MTAxODA3NTQxNVoYDzIxMTkwOTI0MDc1NDE1WjAaMRgwFgYDVQQD - DA9sZXRzZW5jcnlwdC5vcmcwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC - AQD12l08TLMPf8EF2zu0D/nWz5aYsXJa4WurjIx3ZH6+LmC8rueUs1UqFiCJOYrZ - Sb5QSka5wmpkdxNJkDUHPhL/w0P8Aj0joSbC8GKdjn8+5vEQAuT1iIMD4jMfxkYU - zzBeDt8xtskCzK/5IcC2vaOYKyCCum4Pl+DOzan4XarT6hWh4XAwA5R0B/aM200s - SPZDoyJHler7AU5xG1eU2VdYhfc2ua5s7/E6kM2mzKPJgLkt35bToxLltMdJ2/no - CRSDY+6AwKGPXlM510QkgrzM9cVOUxjJ71IrCOE1Rmi997jFcJpOPaebOty4wovP - 5LewpB5NaOJFxjfDjNOUBuG0ZcONeOEw5usehYzx7dxMvg0ky+201K1d+JzFt5Ns - iJi77t20XSr6JZpmp7Fzo90BoikVnRdLD6LmIt1BmYHDNjs0uUelC6l+HrN7SoNR - VkAwO5ujgkpRMHMfpBO6EfH65Sbstzxh00Cufuj+8xkNDKbUSJrErFm4IZqoW+rx - kricFWwd9xduEX9cPYcyJ3e3siZtERW72qdz4Sf5pxT9IlpoveuMxboctUyvr69C - sLNiS8vMpimhSb0PUpyfp3w5/GXaIJpj0KQyvn/onWnXBxN1w3shVD8MUF5MNq7J - ZvJmQ7+U+hmhqRbJc7H1L22AKXOEWY2BGRm/3A35CC40NwIDAQABMA0GCSqGSIb3 - DQEBCwUAA4ICAQBbJwE+qc0j6JGHWe0TGjv1viJU3WuyJkMRi+ejx0p/k7Ntp5An - 2wLC7b/lVP/Nh+PKY/iXWn/BErv2MUo4POc1g8svgxsmMMh5KGGieIfGs7xT+JMH - dzZZM+pUpIB5fEO5JfjiOEOKDdAvRSs0mTAVYZEokGkXSNWyylvEaA16mHtMgPjo - Lm75d0O66RfJDdd/hTl8umGpF7kEGW1qYk2QmuPr7AqOa8na7olL5fMPh6Q7yRqx - GIS9JKQ0fWl8Ngk09WfwUN/kEMcp9Jl5iunNRkbpUJIM/lHFkSA7yOFFL+dVWzd4 - 2r+ddJXTFzW8Rwt65l8SV2MEhijEamKva3mqKLIRWxDsfFVT1T04LWFtnzMW4Z29 - UHF9Pi7XSyKz0Y/Lz31mNTkjJYbOvbnwok8lc3wFWHc+lummZk8IkCq8xfqzwmwX - Ow6EV+Q6VaQpOHumQZ12pBBLtL8DyDhWaRUgVy2vYpwYsMYa5BFMcKCynjlSewo9 - G2hNoW45cQZP1qHltRR9Xad7SaP7iTETDCiR7AWOqSpDipSh9eMfVW97ZbSfz+vl - xl8PZEZMTRIIRVXsPP+E8gtDUhUQp2+Vcz8r6q71qslXM09xl/501uaNjCc3hH2R - iw2N77Lho1F3FrBbHdML3RYHZI55eC9iQw6R4S+R4b+iWLJoHzHrW61itg== - -----END CERTIFICATE----- - ''; -} diff --git a/nixos/tests/common/resolver.nix b/nixos/tests/common/resolver.nix index 6be8d1d18e6..09a74de20fa 100644 --- a/nixos/tests/common/resolver.nix +++ b/nixos/tests/common/resolver.nix @@ -18,7 +18,7 @@ defining this option needs to be explicitly imported. The reason this option exists is for the - nixos/tests/common/letsencrypt module, which + nixos/tests/common/acme/server module, which needs that option to disable the resolver once the user has set its own resolver. ''; -- cgit v1.2.3 From 695fd78ac45763b02ae4c68abda28974bb72c96b Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 23 Mar 2020 17:58:36 +0000 Subject: nixos/tests/acme: use CAP_NET_BIND_SERVICE --- nixos/tests/acme.nix | 3 +-- nixos/tests/common/acme/server/default.nix | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix index 032432287bd..693f02962f4 100644 --- a/nixos/tests/acme.nix +++ b/nixos/tests/acme.nix @@ -33,8 +33,7 @@ in import ./make-test-python.nix { serviceConfig = { ExecStart = "${pkgs.pebble}/bin/pebble-challtestsrv -dns01 ':53' -defaultIPv6 '' -defaultIPv4 '${nodes.webserver.config.networking.primaryIPAddress}'"; # Required to bind on privileged ports. - User = "root"; - Group = "root"; + AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; }; }; }; diff --git a/nixos/tests/common/acme/server/default.nix b/nixos/tests/common/acme/server/default.nix index fdc053a2d82..1d6c2cc9d30 100644 --- a/nixos/tests/common/acme/server/default.nix +++ b/nixos/tests/common/acme/server/default.nix @@ -126,8 +126,7 @@ in { ''; serviceConfig = { # Required to bind on privileged ports. - User = "root"; - Group = "root"; + AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; }; }; }; -- cgit v1.2.3 From e6d5e83cf10f8d6d900c53f8b29399e3619434c7 Mon Sep 17 00:00:00 2001 From: Emily Date: Tue, 24 Mar 2020 05:13:24 +0000 Subject: nixos/tests/common/acme: enable Pebble strict mode This lets us get early warning about any bugs or backwards-compatibility hazards in lego. Pebble will default to this in the future, but doesn't currently; see https://github.com/letsencrypt/pebble/blob/v2.3.0/README.md#strict-mode. --- nixos/tests/common/acme/server/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/common/acme/server/default.nix b/nixos/tests/common/acme/server/default.nix index 1d6c2cc9d30..36c1a477392 100644 --- a/nixos/tests/common/acme/server/default.nix +++ b/nixos/tests/common/acme/server/default.nix @@ -76,6 +76,7 @@ let httpPort = 80; tlsPort = 443; ocspResponderURL = "http://0.0.0.0:4002"; + strict = true; }; pebbleConfFile = pkgs.writeText "pebble.conf" (builtins.toJSON pebbleConf); -- cgit v1.2.3 From 21f183a3fe4eddbbb418cc1ee37a9f86526f675a Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 23 Mar 2020 16:23:53 +0000 Subject: nixos/tests/common/acme: don't set nameservers for client The resolver is mainly useful for the ACME server, and acme.nix uses its own DNS server to test DNS-01 challenges. --- nixos/tests/common/acme/client/default.nix | 4 ---- nixos/tests/common/acme/server/default.nix | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/nixos/tests/common/acme/client/default.nix b/nixos/tests/common/acme/client/default.nix index 22ba6f4df19..80893da0252 100644 --- a/nixos/tests/common/acme/client/default.nix +++ b/nixos/tests/common/acme/client/default.nix @@ -5,10 +5,6 @@ let in { - networking.nameservers = [ - nodes.acme.config.networking.primaryIPAddress - ]; - security.acme = { server = "https://acme.test/dir"; email = "hostmaster@example.test"; diff --git a/nixos/tests/common/acme/server/default.nix b/nixos/tests/common/acme/server/default.nix index 36c1a477392..1a0ee882572 100644 --- a/nixos/tests/common/acme/server/default.nix +++ b/nixos/tests/common/acme/server/default.nix @@ -33,9 +33,9 @@ # override networking.nameservers like this: # # { -# acme = { nodes, ... }: { +# acme = { nodes, lib, ... }: { # imports = [ ./common/acme/server ]; -# networking.nameservers = [ +# networking.nameservers = lib.mkForce [ # nodes.myresolver.config.networking.primaryIPAddress # ]; # }; -- cgit v1.2.3 From 312e9037f49bf0b163d071dc68fe76c2b5d77319 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 18 Apr 2020 07:25:52 +0200 Subject: python2.pkgs.cryptography: fixup build of dependants ... most notably fix pyopenssl. I can't say I really understand this, but the commit seems safe enough. --- pkgs/development/python-modules/cryptography/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 22f647b216d..9b14f4a6fc7 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -17,6 +17,7 @@ , iso8601 , pytz , hypothesis +, enum34 }: buildPythonPackage rec { @@ -36,7 +37,7 @@ buildPythonPackage rec { packaging six ] ++ stdenv.lib.optional (!isPyPy) cffi - ++ stdenv.lib.optionals isPy27 [ ipaddress ]; + ++ stdenv.lib.optionals isPy27 [ ipaddress enum34 ]; checkInputs = [ cryptography_vectors -- cgit v1.2.3 From 4727e95eb62de3722ddc31c947cafa2b95d199ca Mon Sep 17 00:00:00 2001 From: Edmund Wu <22758444+eadwu@users.noreply.github.com> Date: Sat, 18 Apr 2020 01:51:06 -0400 Subject: manual/rl-2009.xml: fix build (#85478) https://github.com/NixOS/nixpkgs/commit/16a4332d60c55ab6ce78f0ce56643b83fc3e7fed#diff-43de86228df91216c5cfc9446cb041feL249 --- nixos/doc/manual/release-notes/rl-2009.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index f34bfc9411e..0f22f4331f4 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -255,6 +255,7 @@ environment.systemPackages = [ # sudo /run/current-system/fine-tune/child-1/bin/switch-to-configuration test + -- cgit v1.2.3 From 730ecad048156741ca9e5db80c7640615c4e95da Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 18 Apr 2020 10:31:45 +0200 Subject: msmtp: 1.8.7 -> 1.8.8 --- pkgs/applications/networking/msmtp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index cd394d1ac53..f78b085b6c6 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "msmtp"; - version = "1.8.7"; + version = "1.8.8"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "1waiiksa57byb7gvx1zmh6srvl6r8rvwqklk0slb3iaf4kfbqlws"; + sha256 = "1rarck61mz3mwg0l30vjj6j9fq6gc7gic0r1c1ppwpq2izj57jzc"; }; patches = [ -- cgit v1.2.3 From f37c9226fc41d204bf4cf5fe3787ef6d18b00213 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 18 Apr 2020 04:20:00 -0500 Subject: lean: 3.8.0 -> 3.9.0 --- pkgs/applications/science/logic/lean/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 594f596b5ef..36df6ae0658 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.8.0"; + version = "3.9.0"; src = fetchFromGitHub { owner = "leanprover-community"; repo = "lean"; rev = "v${version}"; - sha256 = "0frs2vhxlzdliyydb462c1886dn585zd7yp7hdxzsri2v6gdh89g"; + sha256 = "0sklw211cmqp4y0c6nycfavpdxdpfwhq9a4sbwdlqd5agyf85h1j"; }; nativeBuildInputs = [ cmake ]; -- cgit v1.2.3 From 6d02fcb2c2fe6e1198dabba2566a859568e4b8d3 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 18 Apr 2020 04:20:00 -0500 Subject: zeek: 3.1.1 -> 3.1.2 --- pkgs/applications/networking/ids/zeek/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/ids/zeek/default.nix b/pkgs/applications/networking/ids/zeek/default.nix index 6faacf2e67e..8fe856f9773 100644 --- a/pkgs/applications/networking/ids/zeek/default.nix +++ b/pkgs/applications/networking/ids/zeek/default.nix @@ -5,11 +5,11 @@ let in stdenv.mkDerivation rec { pname = "zeek"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://old.zeek.org/downloads/zeek-${version}.tar.gz"; - sha256 = "0siybzdp8w62jqk5vdi5fxwvj6cn4r6c2d4z2axd4rj5vhv5zvx2"; + url = "https://download.zeek.org/zeek-${version}.tar.gz"; + sha256 = "18aa4pfwav8m6vq7cr4bhfg243da54ak933rqbriljnhsrgp4n0q"; }; nativeBuildInputs = [ cmake flex bison file ]; -- cgit v1.2.3 From b7b1022fb27ecfa98cab43ac659ed652e707a480 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 18 Apr 2020 12:22:02 +0200 Subject: android-studio: 3.6.2 -> 3.6.3 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index fd15876f511..b137c5d6b4a 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -8,9 +8,9 @@ let inherit (gnome2) GConf gnome_vfs; }; stableVersion = { - version = "3.6.2.0"; # "Android Studio 3.6.2" - build = "192.6308749"; - sha256Hash = "04r4iwlmns1lf3wfd32cqmndbdz9rf7hfbi5r6qmvpi8j83fghvr"; + version = "3.6.3.0"; # "Android Studio 3.6.3" + build = "192.6392135"; + sha256Hash = "0apxmp341m7mbpm2df3qvsbaifwy6yqq746kbhbwlw8bn9hrzv1k"; }; betaVersion = { version = "4.0.0.13"; # "Android Studio 4.0 Beta 4" -- cgit v1.2.3 From e5450d9d004141fa9052d72bbb5238e50922b39f Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 18 Apr 2020 12:27:50 +0200 Subject: androidStudioPackages.{dev,canary}: 4.1.0.5 -> 4.1.0.6 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index b137c5d6b4a..a6b99e58351 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -18,9 +18,9 @@ let sha256Hash = "0lchi3l50826n1af1z24yclpf27v2q5p1zjbvcmn37wz46d4s4g2"; }; latestVersion = { # canary & dev - version = "4.1.0.5"; # "Android Studio 4.1 Canary 5" - build = "193.6362631"; - sha256Hash = "1q9wbqnwpq0mz8rz4c0v7mfaazymq6xv20dv4fll6p2q63qk71qp"; + version = "4.1.0.6"; # "Android Studio 4.1 Canary 6" + build = "193.6381907"; + sha256Hash = "0sa5plr96m90wv5hi9bqwa11j6k8k9wa0ji8qmlimdhnpyzhsdrx"; }; in { # Attributes are named by their corresponding release channels -- cgit v1.2.3 From 3037b6d1ef71cf899b2835519a8583c0b4926cee Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 18 Apr 2020 21:25:51 +1000 Subject: fuse-overlayfs: 0.7.8 -> 1.0.0 https://github.com/containers/fuse-overlayfs/releases/tag/v1.0.0 --- pkgs/tools/filesystems/fuse-overlayfs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/tools/filesystems/fuse-overlayfs/default.nix index 02347944788..4c8012de4f1 100644 --- a/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -1,21 +1,21 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config, fuse3 }: +{ stdenv, fetchFromGitHub, autoreconfHook, pkg-config, fuse3 }: stdenv.mkDerivation rec { pname = "fuse-overlayfs"; - version = "0.7.8"; + version = "1.0.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = "v${version}"; - sha256 = "10wsssf9mxgkgcqks3z02y9ya8xh4wd45lsb1jrvw31wmz9zpalc"; + sha256 = "0h1ay2l7zyiqplh8whanw68mcfri79lc03wjjrhqji5ddwznv6fa"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; buildInputs = [ fuse3 ]; - meta = with lib; { + meta = with stdenv.lib; { description = "FUSE implementation for overlayfs"; longDescription = "An implementation of overlay+shiftfs in FUSE for rootless containers."; license = licenses.gpl3; -- cgit v1.2.3 From 267eefcdb7e1ee2b0c8e1714b29125517474f54f Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Mon, 13 Apr 2020 15:26:09 +0200 Subject: chromium: Build with VA-API but disable it by default This makes it possible to enable VA-API without having to rebuild Chromium: `chromium.override { enableVaapi = true; }` --- .../networking/browsers/chromium/common.nix | 17 +++-- .../networking/browsers/chromium/default.nix | 19 ++++-- .../patches/enable-vdpau-support-for-nvidia.patch | 74 ++++++++++++++++++++++ .../enable-video-acceleration-on-linux.patch | 48 ++++++++++++++ .../browsers/chromium/patches/vaapi-fix.patch | 74 ---------------------- 5 files changed, 147 insertions(+), 85 deletions(-) create mode 100644 pkgs/applications/networking/browsers/chromium/patches/enable-vdpau-support-for-nvidia.patch create mode 100644 pkgs/applications/networking/browsers/chromium/patches/enable-video-acceleration-on-linux.patch delete mode 100644 pkgs/applications/networking/browsers/chromium/patches/vaapi-fix.patch diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 585a5f49df3..fdb8584f08e 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -24,8 +24,13 @@ , libdrm ? null, wayland ? null, mesa_drivers ? null, libxkbcommon ? null # useOzone # package customization -, useVaapi ? false , useOzone ? false +, useVaapi ? !(useOzone || stdenv.isAarch64) # Built if supported, but disabled in the wrapper +# VA-API TODOs: +# - Ozone: M81 fails to build due to "ozone_platform_gbm = false" +# - Possible solutions: Write a patch to fix the build (wrong gn dependencies) +# or build with minigbm +# - AArch64: Causes serious regressions (https://github.com/NixOS/nixpkgs/pull/85253#issuecomment-614405879) , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false, libgnome-keyring3 ? null , proprietaryCodecs ? true @@ -127,10 +132,10 @@ let libXScrnSaver libXcursor libXtst libGLU libGL pciutils protobuf speechd libXdamage at-spi2-core jre - ] ++ optional gnomeKeyringSupport libgnome-keyring3 + ] ++ optional useVaapi libva + ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] - ++ optional useVaapi libva ++ optional pulseSupport libpulseaudio ++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ]; @@ -149,9 +154,9 @@ let # # ++ optionals (channel == "dev") [ ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" ) ] # ++ optional (versionRange "68" "72") ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" ) - ] ++ optionals (useVaapi) ([ - # source: https://aur.archlinux.org/cgit/aur.git/tree/vaapi-fix.patch?h=chromium-vaapi - ./patches/vaapi-fix.patch + ] ++ optionals (useVaapi) ([ # Fixes for the VA-API build: + ./patches/enable-vdpau-support-for-nvidia.patch # https://aur.archlinux.org/cgit/aur.git/tree/vdpau-support.patch?h=chromium-vaapi + ./patches/enable-video-acceleration-on-linux.patch # Can be controlled at runtime (i.e. without rebuilding Chromium) ] ++ optionals (versionRange "81" "82") [ (githubPatch "5b2ff215473e0526b5b24aeff4ad90d369b21c75" "0n00vh8wfpn2ay5fqsxcsx0zadnv7mihm72bcvnrfzh75nzbg902") (githubPatch "98e343ab369e4262511b5fce547728e3e5eefba8" "00wwp653jk0k0yvix00vr7ymgck9dj7fxjwx4nc67ynn84dh6064") diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index c66acac12c3..25ef76f331b 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -6,13 +6,15 @@ , lib # package customization +# Note: enable* flags should not require full rebuilds (i.e. only affect the wrapper) , channel ? "stable" , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false , proprietaryCodecs ? true , enablePepperFlash ? false , enableWideVine ? false -, useVaapi ? false # test video on radeon, before enabling this +, useVaapi ? false # Deprecated, use enableVaapi instead! +, enableVaapi ? false # Disabled by default due to unofficial support and issues on radeon , useOzone ? false , cupsSupport ? true , pulseSupport ? config.pulseaudio or stdenv.isLinux @@ -33,7 +35,7 @@ let upstream-info = (callPackage ./update.nix {}).getChannel channel; mkChromiumDerivation = callPackage ./common.nix ({ - inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useVaapi useOzone; + inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useOzone; gnChromium = gn; } // lib.optionalAttrs (channel != "stable") { # TODO: Remove after we can update gn for the stable channel (backward incompatible changes): @@ -127,6 +129,14 @@ let cp -a ${widevineCdm}/WidevineCdm $out/libexec/chromium/ '' else browser; + + optionalVaapiFlags = if useVaapi # TODO: Remove after 20.09: + then throw '' + Chromium's useVaapi was replaced by enableVaapi and you don't need to pass + "--ignore-gpu-blacklist" anymore (also no rebuilds are required anymore). + '' else lib.optionalString + (!enableVaapi) + "--add-flags --disable-accelerated-video-decode --add-flags --disable-accelerated-video-encode"; in stdenv.mkDerivation { name = "chromium${suffix}-${version}"; inherit version; @@ -146,15 +156,14 @@ in stdenv.mkDerivation { buildCommand = let browserBinary = "${chromiumWV}/libexec/chromium/chromium"; getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")"; - libPath = stdenv.lib.makeLibraryPath ([] - ++ stdenv.lib.optional useVaapi libva - ); + libPath = stdenv.lib.makeLibraryPath [ libva ]; in with stdenv.lib; '' mkdir -p "$out/bin" eval makeWrapper "${browserBinary}" "$out/bin/chromium" \ --add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} \ + ${optionalVaapiFlags} \ ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled} ed -v -s "$out/bin/chromium" << EOF diff --git a/pkgs/applications/networking/browsers/chromium/patches/enable-vdpau-support-for-nvidia.patch b/pkgs/applications/networking/browsers/chromium/patches/enable-vdpau-support-for-nvidia.patch new file mode 100644 index 00000000000..b5372d1a255 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/enable-vdpau-support-for-nvidia.patch @@ -0,0 +1,74 @@ +--- a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc ++++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc +@@ -641,6 +641,7 @@ void VaapiVideoDecodeAccelerator::AssignPictureBuffers( + // |vpp_vaapi_wrapper_| for VaapiPicture to DownloadFromSurface() the VA's + // internal decoded frame. + if (buffer_allocation_mode_ != BufferAllocationMode::kNone && ++ buffer_allocation_mode_ != BufferAllocationMode::kWrapVdpau && + !vpp_vaapi_wrapper_) { + vpp_vaapi_wrapper_ = VaapiWrapper::Create( + VaapiWrapper::kVideoProcess, VAProfileNone, +@@ -665,7 +666,8 @@ void VaapiVideoDecodeAccelerator::AssignPictureBuffers( + PictureBuffer buffer = buffers[i]; + buffer.set_size(requested_pic_size_); + std::unique_ptr picture = vaapi_picture_factory_->Create( +- (buffer_allocation_mode_ == BufferAllocationMode::kNone) ++ ((buffer_allocation_mode_ == BufferAllocationMode::kNone) || ++ (buffer_allocation_mode_ == BufferAllocationMode::kWrapVdpau)) + ? vaapi_wrapper_ + : vpp_vaapi_wrapper_, + make_context_current_cb_, bind_image_cb_, buffer); +@@ -1093,6 +1095,12 @@ VaapiVideoDecodeAccelerator::GetSupportedProfiles() { + + VaapiVideoDecodeAccelerator::BufferAllocationMode + VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() { ++ // NVIDIA blobs use VDPAU ++ if (VaapiWrapper::GetImplementationType() == VAImplementation::kNVIDIAVDPAU) { ++ LOG(INFO) << "VA-API driver on VDPAU backend"; ++ return BufferAllocationMode::kWrapVdpau; ++ } ++ + // TODO(crbug.com/912295): Enable a better BufferAllocationMode for IMPORT + // |output_mode_| as well. + if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT) +@@ -1105,7 +1113,7 @@ VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() { + // depends on the bitstream and sometimes it's not enough to cover the amount + // of frames needed by the client pipeline (see b/133733739). + // TODO(crbug.com/911754): Enable for VP9 Profile 2. +- if (IsGeminiLakeOrLater() && ++ if (false && IsGeminiLakeOrLater() && + (profile_ == VP9PROFILE_PROFILE0 || profile_ == VP8PROFILE_ANY)) { + // Add one to the reference frames for the one being currently egressed, and + // an extra allocation for both |client_| and |decoder_|, see +--- a/media/gpu/vaapi/vaapi_video_decode_accelerator.h ++++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.h +@@ -204,6 +204,7 @@ class MEDIA_GPU_EXPORT VaapiVideoDecodeAccelerator + // Using |client_|s provided PictureBuffers and as many internally + // allocated. + kNormal, ++ kWrapVdpau, + }; + + // Decides the concrete buffer allocation mode, depending on the hardware +--- a/media/gpu/vaapi/vaapi_wrapper.cc ++++ b/media/gpu/vaapi/vaapi_wrapper.cc +@@ -131,6 +131,9 @@ media::VAImplementation VendorStringToImplementationType( + } else if (base::StartsWith(va_vendor_string, "Intel iHD driver", + base::CompareCase::SENSITIVE)) { + return media::VAImplementation::kIntelIHD; ++ } else if (base::StartsWith(va_vendor_string, "Splitted-Desktop Systems VDPAU", ++ base::CompareCase::SENSITIVE)) { ++ return media::VAImplementation::kNVIDIAVDPAU; + } + return media::VAImplementation::kOther; + } +--- a/media/gpu/vaapi/vaapi_wrapper.h ++++ b/media/gpu/vaapi/vaapi_wrapper.h +@@ -79,6 +79,7 @@ enum class VAImplementation { + kIntelIHD, + kOther, + kInvalid, ++ kNVIDIAVDPAU, + }; + + // This class handles VA-API calls and ensures proper locking of VA-API calls diff --git a/pkgs/applications/networking/browsers/chromium/patches/enable-video-acceleration-on-linux.patch b/pkgs/applications/networking/browsers/chromium/patches/enable-video-acceleration-on-linux.patch new file mode 100644 index 00000000000..bd278633f67 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/enable-video-acceleration-on-linux.patch @@ -0,0 +1,48 @@ +From b2144fd28e09cd52e7a88a62a9d9b54cf9922f9f Mon Sep 17 00:00:00 2001 +From: Michael Weiss +Date: Tue, 14 Apr 2020 14:16:10 +0200 +Subject: [PATCH] Enable accelerated video decode on Linux + +This will enable accelerated video decode on Linux by default (i.e. +without "--ignore-gpu-blacklist"), but on NixOS we'll provide +"--disable-accelerated-video-decode" and +"--disable-accelerated-video-encode" by default to avoid regressions +(e.g. VA-API doesn't work properly for some radeon drivers). + +Video acceleration can then be enabled via: +chromium.override { enableVaapi = true; } +without rebuilding Chromium. +--- + gpu/config/software_rendering_list.json | 16 ---------------- + 1 file changed, 16 deletions(-) + +diff --git a/gpu/config/software_rendering_list.json b/gpu/config/software_rendering_list.json +index 22712bdbf38f..a06dd19a50e4 100644 +--- a/gpu/config/software_rendering_list.json ++++ b/gpu/config/software_rendering_list.json +@@ -336,22 +336,6 @@ + ] + }, + { +- "id": 48, +- "description": "Accelerated video decode is unavailable on Linux", +- "cr_bugs": [137247, 1032907], +- "os": { +- "type": "linux" +- }, +- "exceptions": [ +- { +- "machine_model_name": ["Chromecast"] +- } +- ], +- "features": [ +- "accelerated_video_decode" +- ] +- }, +- { + "id": 50, + "description": "Disable VMware software renderer on older Mesa", + "cr_bugs": [145531, 332596, 571899, 629434], +-- +2.11.0 + diff --git a/pkgs/applications/networking/browsers/chromium/patches/vaapi-fix.patch b/pkgs/applications/networking/browsers/chromium/patches/vaapi-fix.patch deleted file mode 100644 index b5372d1a255..00000000000 --- a/pkgs/applications/networking/browsers/chromium/patches/vaapi-fix.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc -+++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc -@@ -641,6 +641,7 @@ void VaapiVideoDecodeAccelerator::AssignPictureBuffers( - // |vpp_vaapi_wrapper_| for VaapiPicture to DownloadFromSurface() the VA's - // internal decoded frame. - if (buffer_allocation_mode_ != BufferAllocationMode::kNone && -+ buffer_allocation_mode_ != BufferAllocationMode::kWrapVdpau && - !vpp_vaapi_wrapper_) { - vpp_vaapi_wrapper_ = VaapiWrapper::Create( - VaapiWrapper::kVideoProcess, VAProfileNone, -@@ -665,7 +666,8 @@ void VaapiVideoDecodeAccelerator::AssignPictureBuffers( - PictureBuffer buffer = buffers[i]; - buffer.set_size(requested_pic_size_); - std::unique_ptr picture = vaapi_picture_factory_->Create( -- (buffer_allocation_mode_ == BufferAllocationMode::kNone) -+ ((buffer_allocation_mode_ == BufferAllocationMode::kNone) || -+ (buffer_allocation_mode_ == BufferAllocationMode::kWrapVdpau)) - ? vaapi_wrapper_ - : vpp_vaapi_wrapper_, - make_context_current_cb_, bind_image_cb_, buffer); -@@ -1093,6 +1095,12 @@ VaapiVideoDecodeAccelerator::GetSupportedProfiles() { - - VaapiVideoDecodeAccelerator::BufferAllocationMode - VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() { -+ // NVIDIA blobs use VDPAU -+ if (VaapiWrapper::GetImplementationType() == VAImplementation::kNVIDIAVDPAU) { -+ LOG(INFO) << "VA-API driver on VDPAU backend"; -+ return BufferAllocationMode::kWrapVdpau; -+ } -+ - // TODO(crbug.com/912295): Enable a better BufferAllocationMode for IMPORT - // |output_mode_| as well. - if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT) -@@ -1105,7 +1113,7 @@ VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() { - // depends on the bitstream and sometimes it's not enough to cover the amount - // of frames needed by the client pipeline (see b/133733739). - // TODO(crbug.com/911754): Enable for VP9 Profile 2. -- if (IsGeminiLakeOrLater() && -+ if (false && IsGeminiLakeOrLater() && - (profile_ == VP9PROFILE_PROFILE0 || profile_ == VP8PROFILE_ANY)) { - // Add one to the reference frames for the one being currently egressed, and - // an extra allocation for both |client_| and |decoder_|, see ---- a/media/gpu/vaapi/vaapi_video_decode_accelerator.h -+++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.h -@@ -204,6 +204,7 @@ class MEDIA_GPU_EXPORT VaapiVideoDecodeAccelerator - // Using |client_|s provided PictureBuffers and as many internally - // allocated. - kNormal, -+ kWrapVdpau, - }; - - // Decides the concrete buffer allocation mode, depending on the hardware ---- a/media/gpu/vaapi/vaapi_wrapper.cc -+++ b/media/gpu/vaapi/vaapi_wrapper.cc -@@ -131,6 +131,9 @@ media::VAImplementation VendorStringToImplementationType( - } else if (base::StartsWith(va_vendor_string, "Intel iHD driver", - base::CompareCase::SENSITIVE)) { - return media::VAImplementation::kIntelIHD; -+ } else if (base::StartsWith(va_vendor_string, "Splitted-Desktop Systems VDPAU", -+ base::CompareCase::SENSITIVE)) { -+ return media::VAImplementation::kNVIDIAVDPAU; - } - return media::VAImplementation::kOther; - } ---- a/media/gpu/vaapi/vaapi_wrapper.h -+++ b/media/gpu/vaapi/vaapi_wrapper.h -@@ -79,6 +79,7 @@ enum class VAImplementation { - kIntelIHD, - kOther, - kInvalid, -+ kNVIDIAVDPAU, - }; - - // This class handles VA-API calls and ensures proper locking of VA-API calls -- cgit v1.2.3 From fadcfc3ea4252e2b9ad98e865d41038319ece14a Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 18 Apr 2020 13:43:47 +0200 Subject: treewide: per RFC45, remove more unquoted URLs --- doc/builders/images/appimagetools.xml | 2 +- doc/languages-frameworks/python.section.md | 2 +- doc/languages-frameworks/ruby.xml | 4 +- doc/old/cross.txt | 4 +- doc/release-notes.xml | 2 +- doc/stdenv/stdenv.xml | 2 +- lib/licenses.nix | 2 +- nixos/modules/services/misc/redmine.nix | 4 +- .../services/security/bitwarden_rs/default.nix | 2 +- nixos/modules/services/web-apps/wordpress.nix | 4 +- pkgs/applications/audio/polyphone/default.nix | 2 +- pkgs/applications/misc/termpdf.py/default.nix | 2 +- pkgs/development/compilers/graalvm/default.nix | 2 +- .../haskell-modules/configuration-tensorflow.nix | 4 +- pkgs/development/libraries/biblesync/default.nix | 2 +- .../node-packages/node-packages-v10.nix | 178 ++++++++++----------- .../node-packages/node-packages-v12.nix | 8 +- .../node-packages/node-packages-v13.nix | 4 +- .../python-modules/requests_download/default.nix | 2 +- pkgs/os-specific/linux/gogoclient/default.nix | 2 +- pkgs/servers/asterisk/default.nix | 4 +- pkgs/top-level/perl-packages.nix | 2 +- 22 files changed, 120 insertions(+), 120 deletions(-) diff --git a/doc/builders/images/appimagetools.xml b/doc/builders/images/appimagetools.xml index 0767a509a43..45c5619abd9 100644 --- a/doc/builders/images/appimagetools.xml +++ b/doc/builders/images/appimagetools.xml @@ -63,7 +63,7 @@ type2.AppImage: ELF 64-bit LSB executable, x86-64, version 1 (SYSV) (Lepton 3.x) appimageTools.wrapType2 { # or wrapType1 name = "patchwork"; src = fetchurl { - url = https://github.com/ssbc/patchwork/releases/download/v3.11.4/Patchwork-3.11.4-linux-x86_64.AppImage; + url = "https://github.com/ssbc/patchwork/releases/download/v3.11.4/Patchwork-3.11.4-linux-x86_64.AppImage"; sha256 = "1blsprpkvm0ws9b96gb36f0rbf8f5jgmw4x6dsb1kswr4ysf591s"; }; extraPkgs = pkgs: with pkgs; [ ]; diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 650ed342858..f8884785e90 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -412,7 +412,7 @@ buildPythonPackage rec { 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; + homepage = "http://hgomersall.github.com/pyFFTW"; license = with licenses; [ bsd2 bsd3 ]; maintainers = with maintainers; [ fridh ]; }; diff --git a/doc/languages-frameworks/ruby.xml b/doc/languages-frameworks/ruby.xml index b28745fd6e2..9b36801fb96 100644 --- a/doc/languages-frameworks/ruby.xml +++ b/doc/languages-frameworks/ruby.xml @@ -32,7 +32,7 @@ bundlerEnv rec { meta = with lib; { description = "A monitoring framework that aims to be simple, malleable, and scalable"; - homepage = http://sensuapp.org/; + homepage = "http://sensuapp.org/"; license = with licenses; mit; maintainers = with maintainers; [ theuni ]; platforms = platforms.unix; @@ -69,7 +69,7 @@ bundlerApp { meta = with lib; { description = "Tool and libraries for maintaining Ruby gems."; - homepage = https://github.com/nyarly/corundum; + homepage = "https://github.com/nyarly/corundum"; license = licenses.mit; maintainers = [ maintainers.nyarly ]; platforms = platforms.unix; diff --git a/doc/old/cross.txt b/doc/old/cross.txt index ff9fefb04a8..9dd5b4c9993 100644 --- a/doc/old/cross.txt +++ b/doc/old/cross.txt @@ -60,7 +60,7 @@ stdenv.mkDerivation { name = "binutils-2.16.1-arm"; builder = ./builder.sh; src = fetchurl { - url = http://ftp.nluug.nl/gnu/binutils/binutils-2.16.1.tar.bz2; + url = "http://ftp.nluug.nl/gnu/binutils/binutils-2.16.1.tar.bz2"; sha256 = "1ian3kwh2vg6hr3ymrv48s04gijs539vzrq62xr76bxbhbwnz2np"; }; inherit noSysDirs; @@ -84,7 +84,7 @@ stdenv.mkDerivation { name = "linux-headers-2.6.13.1-arm"; builder = ./builder.sh; src = fetchurl { - url = http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.1.tar.bz2; + url = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.1.tar.bz2"; sha256 = "12qxmc827fjhaz53kjy7vyrzsaqcg78amiqsb3qm20z26w705lma"; }; } diff --git a/doc/release-notes.xml b/doc/release-notes.xml index b85f61da079..7575289e755 100644 --- a/doc/release-notes.xml +++ b/doc/release-notes.xml @@ -190,7 +190,7 @@ preConfigure = "configureFlagsArray=(\"CFLAGS=-O0 -g\")"; The function fetchurl now has support for two different kinds of mirroring of files. First, it has support for content-addressable mirrors. For example, given the fetchurl call fetchurl { - url = http://releases.mozilla.org/.../firefox-2.0.0.6-source.tar.bz2; + url = "http://releases.mozilla.org/.../firefox-2.0.0.6-source.tar.bz2"; sha1 = "eb72f55e4a8bf08e8c6ef227c0ade3d068ba1082"; } fetchurl will first try to download this file from diff --git a/lib/licenses.nix b/lib/licenses.nix index 81976a769c0..1f78d67a1b2 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -596,7 +596,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { psfl = spdx { spdxId = "Python-2.0"; fullName = "Python Software Foundation License version 2"; - #url = http://docs.python.org/license.html; + #url = "http://docs.python.org/license.html"; }; publicDomain = { diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index 3b8c14d196f..1febdba0c8f 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -132,7 +132,7 @@ in example = literalExample '' { dkuk-redmine_alex_skin = builtins.fetchurl { - url = https://bitbucket.org/dkuk/redmine_alex_skin/get/1842ef675ef3.zip; + url = "https://bitbucket.org/dkuk/redmine_alex_skin/get/1842ef675ef3.zip"; sha256 = "0hrin9lzyi50k4w2bd2b30vrf1i4fi1c0gyas5801wn8i7kpm9yl"; }; } @@ -146,7 +146,7 @@ in example = literalExample '' { redmine_env_auth = builtins.fetchurl { - url = https://github.com/Intera/redmine_env_auth/archive/0.6.zip; + url = "https://github.com/Intera/redmine_env_auth/archive/0.6.zip"; sha256 = "0yyr1yjd8gvvh832wdc8m3xfnhhxzk2pk3gm2psg5w9jdvd6skak"; }; } diff --git a/nixos/modules/services/security/bitwarden_rs/default.nix b/nixos/modules/services/security/bitwarden_rs/default.nix index a63be0ee766..903a5327037 100644 --- a/nixos/modules/services/security/bitwarden_rs/default.nix +++ b/nixos/modules/services/security/bitwarden_rs/default.nix @@ -58,7 +58,7 @@ in { default = {}; example = literalExample '' { - domain = https://bw.domain.tld:8443; + domain = "https://bw.domain.tld:8443"; signupsAllowed = true; rocketPort = 8222; rocketLog = "critical"; diff --git a/nixos/modules/services/web-apps/wordpress.nix b/nixos/modules/services/web-apps/wordpress.nix index c48a4409737..5fbe53221ae 100644 --- a/nixos/modules/services/web-apps/wordpress.nix +++ b/nixos/modules/services/web-apps/wordpress.nix @@ -105,7 +105,7 @@ let name = "embed-pdf-viewer-plugin"; # Download the theme from the wordpress site src = pkgs.fetchurl { - url = https://downloads.wordpress.org/plugin/embed-pdf-viewer.2.0.3.zip; + url = "https://downloads.wordpress.org/plugin/embed-pdf-viewer.2.0.3.zip"; sha256 = "1rhba5h5fjlhy8p05zf0p14c9iagfh96y91r36ni0rmk6y891lyd"; }; # We need unzip to build this package @@ -132,7 +132,7 @@ let name = "responsive-theme"; # Download the theme from the wordpress site src = pkgs.fetchurl { - url = https://downloads.wordpress.org/theme/responsive.3.14.zip; + url = "https://downloads.wordpress.org/theme/responsive.3.14.zip"; sha256 = "0rjwm811f4aa4q43r77zxlpklyb85q08f9c8ns2akcarrvj5ydx3"; }; # We need unzip to build this package diff --git a/pkgs/applications/audio/polyphone/default.nix b/pkgs/applications/audio/polyphone/default.nix index 404ed9fb776..270d51840d7 100644 --- a/pkgs/applications/audio/polyphone/default.nix +++ b/pkgs/applications/audio/polyphone/default.nix @@ -41,7 +41,7 @@ mkDerivation rec { meta = with stdenv.lib; { description = "A soundfont editor for creating musical instruments"; - homepage = https://www.polyphone-soundfonts.com/; + homepage = "https://www.polyphone-soundfonts.com/"; license = licenses.gpl3; maintainers = [ maintainers.maxdamantus ]; platforms = platforms.linux; diff --git a/pkgs/applications/misc/termpdf.py/default.nix b/pkgs/applications/misc/termpdf.py/default.nix index 83eef6f24e4..5988f569109 100644 --- a/pkgs/applications/misc/termpdf.py/default.nix +++ b/pkgs/applications/misc/termpdf.py/default.nix @@ -44,7 +44,7 @@ buildPythonApplication { A graphical pdf (and epub, cbz, ...) reader that works inside the kitty terminal. ''; - homepage = https://github.com/dsanson/termpdf.py; + homepage = "https://github.com/dsanson/termpdf.py"; maintainers = with maintainers; [ teto ]; license = licenses.mit; }; diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix index 960f2926467..244ee4c010e 100644 --- a/pkgs/development/compilers/graalvm/default.nix +++ b/pkgs/development/compilers/graalvm/default.nix @@ -150,7 +150,7 @@ let ]; graal-mxcache = jvmci8-mxcache ++ [ - # rec { sha1 = "5001adab652fc4eb35e30cdefbb0765442f8b7db"; name = "LLVM_ORG_LIBCXX_SRC_${sha1}/llvm-org-libcxx-src.tar.gz"; url = https://lafo.ssw.uni-linz.ac.at/pub/llvm-org/compiler-rt-llvmorg-8.0.0-4-gd563e33a79-bgae3b177eaa-linux-amd64.tar.gz; } + # rec { sha1 = "5001adab652fc4eb35e30cdefbb0765442f8b7db"; name = "LLVM_ORG_LIBCXX_SRC_${sha1}/llvm-org-libcxx-src.tar.gz"; url = "https://lafo.ssw.uni-linz.ac.at/pub/llvm-org/compiler-rt-llvmorg-8.0.0-4-gd563e33a79-bgae3b177eaa-linux-amd64.tar.gz"; } rec { sha1 = "5001adab652fc4eb35e30cdefbb0765442f8b7db"; name = "LLVM_ORG_COMPILER_RT_LINUX_${sha1}/llvm-org-compiler-rt-linux.tar.gz"; url = "https://lafo.ssw.uni-linz.ac.at/pub/llvm-org/compiler-rt-llvmorg-8.0.0-4-gd563e33a79-bgae3b177eaa-linux-amd64.tar.gz"; } rec { sha1 = "a990b2dba1c706f5c43c56fedfe70bad9a695852"; name = "LLVM_WRAPPER_${sha1}/llvm-wrapper.jar"; url = "mirror://maven/org/bytedeco/javacpp-presets/llvm/6.0.1-1.4.2/llvm-6.0.1-1.4.2.jar"; } rec { sha1 = "decbd95d46092fa9afaf2523b5b23d07ad7ad6bc"; name = "LLVM_WRAPPER_${sha1}/llvm-wrapper.sources.jar"; url = "mirror://maven/org/bytedeco/javacpp-presets/llvm/6.0.1-1.4.2/llvm-6.0.1-1.4.2-sources.jar"; } diff --git a/pkgs/development/haskell-modules/configuration-tensorflow.nix b/pkgs/development/haskell-modules/configuration-tensorflow.nix index ba0acd6b6d6..aab416b9a87 100644 --- a/pkgs/development/haskell-modules/configuration-tensorflow.nix +++ b/pkgs/development/haskell-modules/configuration-tensorflow.nix @@ -55,12 +55,12 @@ in haskell-src-exts_1_19_1 = appendPatches (doJailbreak super.haskell-src-exts_1_19_1) [ # Adapt to the Semigroup–Monoid Proposal (enables building on GHC >= 8.4) (pkgs.fetchpatch { - url = https://github.com/haskell-suite/haskell-src-exts/commit/258e072fe9e37f94360b7488b58ea2832843bbb8.patch; + url = "https://github.com/haskell-suite/haskell-src-exts/commit/258e072fe9e37f94360b7488b58ea2832843bbb8.patch"; sha256 = "0ja6ai41v9plinlhjwja282m6ahn6mw4xi79np0jxqk83cg0z1ff"; }) # Adapt to MonadFail proposal (enables building on GHC >= 8.8) (pkgs.fetchpatch { - url = https://gist.githubusercontent.com/mikesperber/0f2addaf3fbe97ffb4a5234d8711ba41/raw/e09e20998283c7195e82d546ba9266d290eb000d/gistfile1.txt; + url = "https://gist.githubusercontent.com/mikesperber/0f2addaf3fbe97ffb4a5234d8711ba41/raw/e09e20998283c7195e82d546ba9266d290eb000d/gistfile1.txt"; sha256 = "18clvli7vpqsqlf2f3qidn71738j9zdlpana6wha3x0dxwan5ly0"; }) ]; diff --git a/pkgs/development/libraries/biblesync/default.nix b/pkgs/development/libraries/biblesync/default.nix index 54a4fa7a686..814ecf986e9 100644 --- a/pkgs/development/libraries/biblesync/default.nix +++ b/pkgs/development/libraries/biblesync/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ libuuid ]; meta = with stdenv.lib; { - homepage = http://www.crosswire.org/wiki/BibleSync; + homepage = "http://www.crosswire.org/wiki/BibleSync"; description = "A multicast protocol to Bible software shared conavigation"; longDescription = '' BibleSync is a multicast protocol to support Bible software shared diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index 9fd4e96ad72..9740c66c974 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -15293,7 +15293,7 @@ let version = "1.0.1"; src = fetchurl { name = "emitter-1.0.1.tar.gz"; - url = https://codeload.github.com/component/emitter/tar.gz/1.0.1; + url = "https://codeload.github.com/component/emitter/tar.gz/1.0.1"; sha256 = "0eae744826723877457f7a7ac7f31d68a5a060673b3a883f6a8e325bf48f313d"; }; }; @@ -19632,7 +19632,7 @@ let version = "2.0.1"; src = fetchurl { name = "global-2.0.1.tar.gz"; - url = https://codeload.github.com/component/global/tar.gz/v2.0.1; + url = "https://codeload.github.com/component/global/tar.gz/v2.0.1"; sha256 = "42be02b7148745447f6ba21137c972ca82d2cad92d30d63bd4fc310623901785"; }; }; @@ -31657,7 +31657,7 @@ let version = "0.9.15"; src = fetchurl { name = "oauth-0.9.15.tar.gz"; - url = https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master; + url = "https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master"; sha256 = "9341c28772841acde618c778e85e381976f425824b816100792f697e68aec947"; }; }; @@ -48868,7 +48868,7 @@ let version = "1.5.0"; src = fetchurl { name = "xmlhttprequest-1.5.0.tar.gz"; - url = https://codeload.github.com/LearnBoost/node-XMLHttpRequest/tar.gz/0f36d0b5ebc03d85f860d42a64ae9791e1daa433; + url = "https://codeload.github.com/LearnBoost/node-XMLHttpRequest/tar.gz/0f36d0b5ebc03d85f860d42a64ae9791e1daa433"; sha256 = "28dd0394d85befe8be4e9cd9f6803102780c62cbb09298cb174b52ff9777624f"; }; }; @@ -49891,7 +49891,7 @@ in buildInputs = globalBuildInputs; meta = { description = "CLI tool for Angular"; - homepage = https://github.com/angular/angular-cli; + homepage = "https://github.com/angular/angular-cli"; license = "MIT"; }; production = true; @@ -49935,7 +49935,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The command line interface for Antora."; - homepage = https://antora.org/; + homepage = "https://antora.org/"; license = "MPL-2.0"; }; production = true; @@ -50264,7 +50264,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The default site generator pipeline for producing and publishing static documentation sites with Antora."; - homepage = https://antora.org/; + homepage = "https://antora.org/"; license = "MPL-2.0"; }; production = true; @@ -50427,7 +50427,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A secure and free password manager for all of your devices."; - homepage = https://bitwarden.com/; + homepage = "https://bitwarden.com/"; license = "GPL-3.0"; }; production = true; @@ -52016,7 +52016,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Command line interface for rapid Vue.js development"; - homepage = https://cli.vuejs.org/; + homepage = "https://cli.vuejs.org/"; license = "MIT"; }; production = true; @@ -52378,7 +52378,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Creating Electron app packages"; - homepage = https://github.com/electron/asar; + homepage = "https://github.com/electron/asar"; license = "MIT"; }; production = true; @@ -52536,7 +52536,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The browser package manager"; - homepage = http://bower.io/; + homepage = "http://bower.io/"; license = "MIT"; }; production = true; @@ -52666,7 +52666,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Generate nix expressions to fetch bower dependencies"; - homepage = https://github.com/rvl/bower2nix; + homepage = "https://github.com/rvl/bower2nix"; license = "GPL-3.0"; }; production = true; @@ -53275,7 +53275,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A well-tested CSS minifier"; - homepage = https://github.com/jakubpawlowicz/clean-css; + homepage = "https://github.com/jakubpawlowicz/clean-css"; license = "MIT"; }; production = true; @@ -56498,7 +56498,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Unfancy JavaScript"; - homepage = http://coffeescript.org/; + homepage = "http://coffeescript.org/"; license = "MIT"; }; production = true; @@ -57893,7 +57893,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Create React Native apps with no build configuration."; - homepage = https://github.com/expo/create-react-native-app; + homepage = "https://github.com/expo/create-react-native-app"; license = "BSD-3-Clause"; }; production = true; @@ -57915,7 +57915,7 @@ in buildInputs = globalBuildInputs; meta = { description = "CSSLint"; - homepage = http://csslint.net/; + homepage = "http://csslint.net/"; license = "MIT"; }; production = true; @@ -58570,7 +58570,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Dat is the package manager for data. Easily share and version control data."; - homepage = https://datproject.org/; + homepage = "https://datproject.org/"; license = "BSD-3-Clause"; }; production = true; @@ -58591,7 +58591,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A DHCP server written in JavaScript"; - homepage = https://github.com/infusion/node-dhcp; + homepage = "https://github.com/infusion/node-dhcp"; license = "MIT OR GPL-2.0"; }; production = true; @@ -58736,7 +58736,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A blockchain-based DNS + HTTPS server that fixes HTTPS security, and more!"; - homepage = https://github.com/okTurtles/dnschain; + homepage = "https://github.com/okTurtles/dnschain"; license = "MPL-2.0"; }; production = true; @@ -59269,7 +59269,7 @@ in buildInputs = globalBuildInputs; meta = { description = "EmojiOne is a complete set of emojis designed for the web. It includes libraries to easily convert unicode characters to shortnames (:smile:) and shortnames to our custom emoji images. PNG formats provided for the emoji images."; - homepage = https://www.emojione.com/; + homepage = "https://www.emojione.com/"; }; production = true; bypassCache = true; @@ -59445,7 +59445,7 @@ in buildInputs = globalBuildInputs; meta = { description = "An AST-based pattern checker for JavaScript."; - homepage = https://eslint.org/; + homepage = "https://eslint.org/"; license = "MIT"; }; production = true; @@ -59627,7 +59627,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Makes eslint the fastest linter on the planet"; - homepage = https://github.com/mantoni/eslint_d.js; + homepage = "https://github.com/mantoni/eslint_d.js"; license = "MIT"; }; production = true; @@ -60652,7 +60652,7 @@ in buildInputs = globalBuildInputs; meta = { description = "git hosting on secure-scuttlebutt (ssb)"; - homepage = https://git-ssb.celehner.com/%25n92DiQh7ietE%2BR%2BX%2FI403LQoyf2DtR3WQfCkDKlheQU%3D.sha256; + homepage = "https://git-ssb.celehner.com/%25n92DiQh7ietE%2BR%2BX%2FI403LQoyf2DtR3WQfCkDKlheQU%3D.sha256"; license = "Fair"; }; production = true; @@ -62504,7 +62504,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The streaming build system."; - homepage = https://gulpjs.com/; + homepage = "https://gulpjs.com/"; license = "MIT"; }; production = true; @@ -62849,7 +62849,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Command line interface for gulp"; - homepage = http://gulpjs.com/; + homepage = "http://gulpjs.com/"; license = "MIT"; }; production = true; @@ -62880,7 +62880,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Highly configurable, well-tested, JavaScript-based HTML minifier."; - homepage = https://kangax.github.io/html-minifier/; + homepage = "https://kangax.github.io/html-minifier/"; license = "MIT"; }; production = true; @@ -63250,7 +63250,7 @@ in buildInputs = globalBuildInputs; meta = { description = "High precision scientific calculator with support for physical units"; - homepage = https://github.com/sharkdp/insect; + homepage = "https://github.com/sharkdp/insect"; license = "MIT"; }; production = true; @@ -63571,7 +63571,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A tool for creating and developing Ionic Framework mobile apps."; - homepage = https://ionicframework.com/; + homepage = "https://ionicframework.com/"; license = "MIT"; }; production = true; @@ -64112,7 +64112,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Implementation of the Language Server Protocol for JavaScript and TypeScript"; - homepage = https://github.com/sourcegraph/javascript-typescript-langserver; + homepage = "https://github.com/sourcegraph/javascript-typescript-langserver"; license = "Apache-2.0"; }; production = true; @@ -64962,7 +64962,7 @@ in buildInputs = globalBuildInputs; meta = { description = "beautifier.io for node"; - homepage = https://beautifier.io/; + homepage = "https://beautifier.io/"; license = "MIT"; }; production = true; @@ -64985,7 +64985,7 @@ in buildInputs = globalBuildInputs; meta = { description = "YAML 1.2 parser and serializer"; - homepage = https://github.com/nodeca/js-yaml; + homepage = "https://github.com/nodeca/js-yaml"; license = "MIT"; }; production = true; @@ -65081,7 +65081,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Static analysis tool for JavaScript"; - homepage = http://jshint.com/; + homepage = "http://jshint.com/"; license = "(MIT AND JSON)"; }; production = true; @@ -65124,7 +65124,7 @@ in buildInputs = globalBuildInputs; meta = { description = "JSON diff"; - homepage = https://github.com/andreyvit/json-diff; + homepage = "https://github.com/andreyvit/json-diff"; }; production = true; bypassCache = true; @@ -65179,7 +65179,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Various utilities for JSON References (http://tools.ietf.org/html/draft-pbryan-zyp-json-ref-03)."; - homepage = https://github.com/whitlockjc/json-refs; + homepage = "https://github.com/whitlockjc/json-refs"; license = "MIT"; }; production = true; @@ -65460,7 +65460,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Get a full fake REST API with zero coding in less than 30 seconds"; - homepage = https://github.com/typicode/json-server; + homepage = "https://github.com/typicode/json-server"; license = "MIT"; }; production = true; @@ -65487,7 +65487,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Validate JSON"; - homepage = http://zaach.github.com/jsonlint/; + homepage = "http://zaach.github.com/jsonlint/"; }; production = true; bypassCache = true; @@ -65687,7 +65687,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Spectacular Test Runner for JavaScript."; - homepage = http://karma-runner.github.io/; + homepage = "http://karma-runner.github.io/"; license = "MIT"; }; production = true; @@ -65781,7 +65781,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Merges multiple lcov results into one"; - homepage = https://github.com/mweibel/lcov-result-merger; + homepage = "https://github.com/mweibel/lcov-result-merger"; license = "MIT"; }; production = true; @@ -67083,7 +67083,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Leaner CSS"; - homepage = http://lesscss.org/; + homepage = "http://lesscss.org/"; license = "Apache-2.0"; }; production = true; @@ -67108,7 +67108,7 @@ in buildInputs = globalBuildInputs; meta = { description = "clean-css plugin for less.js"; - homepage = http://lesscss.org/; + homepage = "http://lesscss.org/"; }; production = true; bypassCache = true; @@ -67949,7 +67949,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Live Markdown previews for your favourite editor."; - homepage = https://github.com/shime/livedown; + homepage = "https://github.com/shime/livedown"; license = "MIT"; }; production = true; @@ -69107,7 +69107,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Madoko is a fast scholarly Markdown processor written in Koka"; - homepage = http://madoko.codeplex.com/; + homepage = "http://madoko.codeplex.com/"; }; production = true; bypassCache = true; @@ -69247,7 +69247,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Meeting room kiosk app for displaying meeting room schedules and booking rooms in your organization. Built against Google Apps, but other sources can be defined."; - homepage = https://bitbucket.org/aahmed/meat; + homepage = "https://bitbucket.org/aahmed/meat"; }; production = true; bypassCache = true; @@ -70105,7 +70105,7 @@ in buildInputs = globalBuildInputs; meta = { description = "simple, flexible, fun test framework"; - homepage = https://mochajs.org/; + homepage = "https://mochajs.org/"; license = "MIT"; }; production = true; @@ -70229,7 +70229,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Neovim client API and neovim remote plugin provider"; - homepage = https://github.com/neovim/node-client; + homepage = "https://github.com/neovim/node-client"; license = "MIT"; }; production = true; @@ -70388,7 +70388,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Build tool and bindings loader for node-gyp that supports prebuilds"; - homepage = https://github.com/prebuild/node-gyp-build; + homepage = "https://github.com/prebuild/node-gyp-build"; license = "MIT"; }; production = true; @@ -70684,7 +70684,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Web Inspector based nodeJS debugger"; - homepage = http://github.com/node-inspector/node-inspector; + homepage = "http://github.com/node-inspector/node-inspector"; }; production = true; bypassCache = true; @@ -71251,7 +71251,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Low-code programming for event-driven applications"; - homepage = http://nodered.org/; + homepage = "http://nodered.org/"; license = "Apache-2.0"; }; production = true; @@ -71441,7 +71441,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Generate Nix expressions to build NPM packages"; - homepage = https://github.com/svanderburg/node2nix; + homepage = "https://github.com/svanderburg/node2nix"; license = "MIT"; }; production = true; @@ -71605,7 +71605,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Simple monitor script for use during development of a node.js app."; - homepage = http://nodemon.io/; + homepage = "http://nodemon.io/"; license = "MIT"; }; production = true; @@ -71623,7 +71623,7 @@ in buildInputs = globalBuildInputs; meta = { description = "a package manager for JavaScript"; - homepage = https://docs.npmjs.com/; + homepage = "https://docs.npmjs.com/"; license = "Artistic-2.0"; }; production = true; @@ -71919,7 +71919,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Find newer versions of dependencies than what your package.json or bower.json allows"; - homepage = https://github.com/tjunnone/npm-check-updates; + homepage = "https://github.com/tjunnone/npm-check-updates"; license = "Apache-2.0"; }; production = true; @@ -72093,7 +72093,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Generate nix expressions to build npm packages"; - homepage = https://github.com/NixOS/npm2nix; + homepage = "https://github.com/NixOS/npm2nix"; }; production = true; bypassCache = true; @@ -72134,7 +72134,7 @@ in buildInputs = globalBuildInputs; meta = { description = "OCaml language server"; - homepage = https://github.com/freebroccolo/ocaml-language-server; + homepage = "https://github.com/freebroccolo/ocaml-language-server"; license = "Apache-2.0"; }; production = true; @@ -73695,7 +73695,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Streaming torrent client for Node.js"; - homepage = https://github.com/mafintosh/peerflix; + homepage = "https://github.com/mafintosh/peerflix"; license = "MIT"; }; production = true; @@ -74084,7 +74084,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Fast, disk space efficient package manager"; - homepage = https://pnpm.js.org/; + homepage = "https://pnpm.js.org/"; license = "MIT"; }; production = true; @@ -74261,7 +74261,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Prettier is an opinionated code formatter"; - homepage = https://prettier.io/; + homepage = "https://prettier.io/"; license = "MIT"; }; production = true; @@ -74648,7 +74648,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A build system for PureScript projects"; - homepage = https://github.com/purescript-contrib/pulp; + homepage = "https://github.com/purescript-contrib/pulp"; license = "LGPL-3.0+"; }; production = true; @@ -74820,7 +74820,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A set of complementary tools to React, including the JSX transformer."; - homepage = https://facebook.github.io/react; + homepage = "https://facebook.github.io/react"; license = "BSD-3-Clause"; }; production = true; @@ -74838,7 +74838,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The HTML Presentation Framework"; - homepage = http://revealjs.com/; + homepage = "http://revealjs.com/"; license = "MIT"; }; production = true; @@ -76486,7 +76486,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more"; - homepage = https://serverless.com/framework/docs/; + homepage = "https://serverless.com/framework/docs/"; license = "MIT"; }; production = true; @@ -78588,7 +78588,7 @@ in buildInputs = globalBuildInputs; meta = { description = "network protocol layer for secure-scuttlebutt"; - homepage = https://github.com/ssbc/ssb-server; + homepage = "https://github.com/ssbc/ssb-server"; license = "MIT"; }; production = true; @@ -78606,7 +78606,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Send metric data from statsd to Stackdriver"; - homepage = https://www.stackdriver.com/; + homepage = "https://www.stackdriver.com/"; license = "MIT"; }; production = true; @@ -79525,7 +79525,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Nodejs-based tool for optimizing SVG vector graphics files"; - homepage = https://github.com/svg/svgo; + homepage = "https://github.com/svg/svgo"; license = "MIT"; }; production = true; @@ -80560,7 +80560,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The pluggable linting tool for text and markdown."; - homepage = https://github.com/textlint/textlint/; + homepage = "https://github.com/textlint/textlint/"; license = "MIT"; }; production = true; @@ -80582,7 +80582,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Latex plugin for [textlint](https://github.com/textlint/textlint "textlint")."; - homepage = https://github.com/elzup/textlint-plugin-latex; + homepage = "https://github.com/elzup/textlint-plugin-latex"; license = "MIT"; }; production = true; @@ -80621,7 +80621,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule check that abbreviations within parentheses."; - homepage = https://github.com/azu/textlint-rule-abbr-within-parentheses; + homepage = "https://github.com/azu/textlint-rule-abbr-within-parentheses"; license = "MIT"; }; production = true; @@ -80935,7 +80935,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule for alex"; - homepage = https://github.com/textlint-rule/textlint-rule-alex; + homepage = "https://github.com/textlint-rule/textlint-rule-alex"; license = "MIT"; }; production = true; @@ -80960,7 +80960,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule to check common misspellings"; - homepage = https://github.com/io-monad/textlint-rule-common-misspellings; + homepage = "https://github.com/io-monad/textlint-rule-common-misspellings"; license = "GPL-3.0"; }; production = true; @@ -80982,7 +80982,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Textlint rule to check correct usage of diacritics"; - homepage = https://github.com/sapegin/textlint-rule-diacritics; + homepage = "https://github.com/sapegin/textlint-rule-diacritics"; license = "MIT"; }; production = true; @@ -81019,7 +81019,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule that specify the maximum word count of a sentence."; - homepage = https://github.com/azu/textlint-rule-en-max-word-count; + homepage = "https://github.com/azu/textlint-rule-en-max-word-count"; license = "MIT"; }; production = true; @@ -81112,7 +81112,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule that check no start with duplicated conjunction."; - homepage = https://github.com/textlint-rule/textlint-rule-no-start-duplicated-conjunction; + homepage = "https://github.com/textlint-rule/textlint-rule-no-start-duplicated-conjunction"; license = "MIT"; }; production = true; @@ -81153,7 +81153,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule that check with or without period in list item."; - homepage = https://github.com/textlint-rule/textlint-rule-period-in-list-item; + homepage = "https://github.com/textlint-rule/textlint-rule-period-in-list-item"; license = "MIT"; }; production = true; @@ -81183,7 +81183,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Textlint rule to find filler words, buzzwords and chiches"; - homepage = https://github.com/sapegin/textlint-rule-stop-words; + homepage = "https://github.com/sapegin/textlint-rule-stop-words"; license = "MIT"; }; production = true; @@ -81213,7 +81213,7 @@ in buildInputs = globalBuildInputs; meta = { description = "TextLint rule to check correct terms spelling"; - homepage = https://github.com/sapegin/textlint-rule-terminology; + homepage = "https://github.com/sapegin/textlint-rule-terminology"; license = "MIT"; }; production = true; @@ -81253,7 +81253,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule that check unexpanded acronym word."; - homepage = https://github.com/textlint-rule/textlint-rule-unexpanded-acronym; + homepage = "https://github.com/textlint-rule/textlint-rule-unexpanded-acronym"; license = "MIT"; }; production = true; @@ -81293,7 +81293,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule to check your English style with write good"; - homepage = https://github.com/textlint-rule/textlint-rule-write-good; + homepage = "https://github.com/textlint-rule/textlint-rule-write-good"; license = "MIT"; }; production = true; @@ -81728,7 +81728,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The self-hosted Web IRC client"; - homepage = https://thelounge.chat/; + homepage = "https://thelounge.chat/"; license = "MIT"; }; production = true; @@ -81746,7 +81746,7 @@ in buildInputs = globalBuildInputs; meta = { description = "JavaScript 3D library"; - homepage = https://threejs.org/; + homepage = "https://threejs.org/"; license = "MIT"; }; production = true; @@ -82087,7 +82087,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Joyent Triton CLI and client (https://www.joyent.com/triton)"; - homepage = https://github.com/joyent/node-triton; + homepage = "https://github.com/joyent/node-triton"; license = "MPL-2.0"; }; production = true; @@ -82136,7 +82136,7 @@ in buildInputs = globalBuildInputs; meta = { description = "TSUN: a repl for TypeScript Upgraded Node"; - homepage = https://github.com/HerringtonDarkholme/typescript-repl; + homepage = "https://github.com/HerringtonDarkholme/typescript-repl"; license = "MIT"; }; production = true; @@ -82177,7 +82177,7 @@ in buildInputs = globalBuildInputs; meta = { description = "TypeScript is a language for application scale JavaScript development"; - homepage = https://www.typescriptlang.org/; + homepage = "https://www.typescriptlang.org/"; license = "Apache-2.0"; }; production = true; @@ -83941,7 +83941,7 @@ in buildInputs = globalBuildInputs; meta = { description = "vue-language-server"; - homepage = https://github.com/vuejs/vetur/tree/master/server; + homepage = "https://github.com/vuejs/vetur/tree/master/server"; license = "MIT"; }; production = true; @@ -85040,7 +85040,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A command line tool to help build, run, and test web extensions"; - homepage = https://github.com/mozilla/web-ext; + homepage = "https://github.com/mozilla/web-ext"; license = "MPL-2.0"; }; production = true; @@ -85516,7 +85516,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff."; - homepage = https://github.com/webpack/webpack; + homepage = "https://github.com/webpack/webpack"; license = "MIT"; }; production = true; @@ -86581,7 +86581,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Copy files && directories with webpack"; - homepage = https://github.com/webpack-contrib/copy-webpack-plugin; + homepage = "https://github.com/webpack-contrib/copy-webpack-plugin"; license = "MIT"; }; production = true; @@ -86878,7 +86878,7 @@ in buildInputs = globalBuildInputs; meta = { description = "WebTorrent, the streaming torrent client. For the command line."; - homepage = https://webtorrent.io/; + homepage = "https://webtorrent.io/"; license = "MIT"; }; production = true; @@ -87917,11 +87917,11 @@ in buildInputs = globalBuildInputs; meta = { description = "CLI tool for running Yeoman generators"; - homepage = http://yeoman.io/; + homepage = "http://yeoman.io/"; license = "BSD-2-Clause"; }; production = true; bypassCache = true; reconstructLock = true; }; -} \ No newline at end of file +} diff --git a/pkgs/development/node-packages/node-packages-v12.nix b/pkgs/development/node-packages/node-packages-v12.nix index 701c5d84a25..52465b099a5 100644 --- a/pkgs/development/node-packages/node-packages-v12.nix +++ b/pkgs/development/node-packages/node-packages-v12.nix @@ -2475,7 +2475,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Unfancy JavaScript"; - homepage = http://coffeescript.org/; + homepage = "http://coffeescript.org/"; license = "MIT"; }; production = true; @@ -2953,7 +2953,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Generate Nix expressions to build NPM packages"; - homepage = https://github.com/svanderburg/node2nix; + homepage = "https://github.com/svanderburg/node2nix"; license = "MIT"; }; production = true; @@ -3090,7 +3090,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Build tool and bindings loader for node-gyp that supports prebuilds"; - homepage = https://github.com/prebuild/node-gyp-build; + homepage = "https://github.com/prebuild/node-gyp-build"; license = "MIT"; }; production = true; @@ -3182,4 +3182,4 @@ in bypassCache = true; reconstructLock = true; }; -} \ No newline at end of file +} diff --git a/pkgs/development/node-packages/node-packages-v13.nix b/pkgs/development/node-packages/node-packages-v13.nix index d70195210c7..77517655c50 100644 --- a/pkgs/development/node-packages/node-packages-v13.nix +++ b/pkgs/development/node-packages/node-packages-v13.nix @@ -1441,11 +1441,11 @@ in buildInputs = globalBuildInputs; meta = { description = "Generate Nix expressions to build NPM packages"; - homepage = https://github.com/svanderburg/node2nix; + homepage = "https://github.com/svanderburg/node2nix"; license = "MIT"; }; production = true; bypassCache = true; reconstructLock = true; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/requests_download/default.nix b/pkgs/development/python-modules/requests_download/default.nix index 3c265a5955e..b31573a91ca 100644 --- a/pkgs/development/python-modules/requests_download/default.nix +++ b/pkgs/development/python-modules/requests_download/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { format = "wheel"; #src = pkgs.fetchurl { - # url = https://files.pythonhosted.org/packages/60/af/10f899f0574a81cbc511124c08d7c7dc46c20d4f956a6a3c793ad4330bb4/requests_download-0.1.2-py2.py3-none-any.whl; + # url = "https://files.pythonhosted.org/packages/60/af/10f899f0574a81cbc511124c08d7c7dc46c20d4f956a6a3c793ad4330bb4/requests_download-0.1.2-py2.py3-none-any.whl"; # sha256 = "1ballx1hljpdpyvqzqn79m0dc21z2smrnxk2ylb6dbpg5crrskcr"; #}; diff --git a/pkgs/os-specific/linux/gogoclient/default.nix b/pkgs/os-specific/linux/gogoclient/default.nix index a4584304f58..d107f18c8da 100644 --- a/pkgs/os-specific/linux/gogoclient/default.nix +++ b/pkgs/os-specific/linux/gogoclient/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { name = "${baseName}-${version}"; src = fetchurl { - #url = http://gogo6.com/downloads/gogoc-1_2-RELEASE.tar.gz; + #url = "http://gogo6.com/downloads/gogoc-1_2-RELEASE.tar.gz"; url = "https://src.fedoraproject.org/repo/pkgs/gogoc/gogoc-1_2-RELEASE.tar.gz/41177ed683cf511cc206c7782c37baa9/gogoc-1_2-RELEASE.tar.gz"; sha256 = "a0ef45c0bd1fc9964dc8ac059b7d78c12674bf67ef641740554e166fa99a2f49"; }; diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index a5934827a20..9683d2c44d0 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -141,11 +141,11 @@ in rec { # # provided here verbatim for the convenience of anyone wanting to build # # Asterisk from other sources. Include in externals. # "sounds/asterisk-core-sounds-en-gsm-1.5.tar.gz" = fetchurl { - # url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.5.tar.gz; + # url = "http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-1.5.tar.gz"; # sha256 = "01xzbg7xy0c5zg7sixjw5025pvr4z64kfzi9zvx19im0w331h4cd"; # }; # "sounds/asterisk-moh-opsound-wav-2.03.tar.gz" = fetchurl { - # url = http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz; + # url = "http://downloads.asterisk.org/pub/telephony/sounds/releases/asterisk-moh-opsound-wav-2.03.tar.gz"; # sha256 = "449fb810d16502c3052fedf02f7e77b36206ac5a145f3dacf4177843a2fcb538"; # }; # # TODO: Sounds for other languages could be added here diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 94c5387e0e7..d3e9ca144fc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -16811,7 +16811,7 @@ let sha256 = "f98a10c625640170cdda408cccc72bdd7f66f8ebe5f59dec1b96185171ef11d0"; }; meta = { - #homepage = http://web-cpan.berlios.de/modules/Statistics-Descriptive/; # berlios shut down; I found no replacement + #homepage = "http://web-cpan.berlios.de/modules/Statistics-Descriptive/"; # berlios shut down; I found no replacement description = "Module of basic descriptive statistical functions"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; }; -- cgit v1.2.3 From 4c538d022d7a573f9d155842327e5751109bec34 Mon Sep 17 00:00:00 2001 From: Lionello Lunesu Date: Sat, 18 Apr 2020 18:11:47 +0800 Subject: ldc: 1.17.0 -> 1.20.1 --- pkgs/development/compilers/ldc/binary.nix | 41 +++++++ pkgs/development/compilers/ldc/bootstrap.nix | 10 ++ pkgs/development/compilers/ldc/default.nix | 174 +-------------------------- pkgs/development/compilers/ldc/generic.nix | 164 +++++++++++++++++++++++++ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 + 6 files changed, 220 insertions(+), 171 deletions(-) create mode 100644 pkgs/development/compilers/ldc/binary.nix create mode 100644 pkgs/development/compilers/ldc/bootstrap.nix create mode 100644 pkgs/development/compilers/ldc/generic.nix diff --git a/pkgs/development/compilers/ldc/binary.nix b/pkgs/development/compilers/ldc/binary.nix new file mode 100644 index 00000000000..41a70662948 --- /dev/null +++ b/pkgs/development/compilers/ldc/binary.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames +, version, hashes }: +with stdenv; +let + OS = if hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name; + ARCH = toString hostPlatform.parsed.cpu.name; +in mkDerivation { + pname = "ldc-bootstrap"; + inherit version; + + src = fetchurl rec { + name = "ldc2-${version}-${OS}-${ARCH}.tar.xz"; + url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/${name}"; + sha256 = hashes."${OS}-${ARCH}" or (throw "missing bootstrap sha256 for ${OS}-${ARCH}"); + }; + + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ fixDarwinDylibNames autoPatchelfHook ]; + propagatedBuildInputs = [ curl tzdata ]; + + installPhase = '' + mkdir -p $out + + mv bin etc import lib LICENSE README $out/ + + # fix paths in ldc2.conf (one level less) + # substituteInPlace $out/bin/ldc2.conf --replace "/../../" "/../" + ''; + + meta = with lib; { + inherit version; + description = "The LLVM-based D Compiler"; + homepage = "https://github.com/ldc-developers/ldc"; + # from https://github.com/ldc-developers/ldc/blob/master/LICENSE + license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ]; + maintainers = with maintainers; [ ThomasMader lionello ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; + }; +} diff --git a/pkgs/development/compilers/ldc/bootstrap.nix b/pkgs/development/compilers/ldc/bootstrap.nix new file mode 100644 index 00000000000..fde4c842684 --- /dev/null +++ b/pkgs/development/compilers/ldc/bootstrap.nix @@ -0,0 +1,10 @@ +{ callPackage }: +callPackage ./binary.nix { + version = "1.19.0"; + hashes = { + # Get these from `nix-prefetch-url https://github.com/ldc-developers/ldc/releases/download/v1.19.0/ldc2-1.19.0-osx-x86_64.tar.xz` etc.. + osx-x86_64 = "1bp3xkh9zp64dzq8isanib1gacb3nfbl70qv15qygwk1zan6zgy7"; + linux-x86_64 = "146grr2lwarfk13wgkpyb77xb6b3as1is2rf4s2hipqjmc8biy1h"; + linux-aarch64 = "1fv6jshfvi15m7masgxq1hgp216qjd5amizrqdf26vhrq3a08li3"; + }; +} diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index 19fe2981c83..5a4baabcf8d 100644 --- a/pkgs/development/compilers/ldc/default.nix +++ b/pkgs/development/compilers/ldc/default.nix @@ -1,173 +1,5 @@ -{ stdenv, fetchurl, cmake, ninja, llvm_5, llvm_8, curl, tzdata -, libconfig, lit, gdb, unzip, darwin, bash -, callPackage, makeWrapper, runCommand, targetPackages -, bootstrapVersion ? false -, version ? "1.17.0" -, ldcSha256 ? "1aag5jfrng6p4ms0fs90hjbv9bcj3hj8h52r68c3cm6racdajbva" -}: - -let - bootstrapLdc = if !bootstrapVersion then - # LDC 0.17.x is the last version which doesn't need a working D compiler to - # build so we use that version to bootstrap the actual build. - callPackage ./default.nix { - bootstrapVersion = true; - version = "0.17.6"; - ldcSha256 = "0qf5kbxddgmg3kqzi0kf4bgv8vdrnv16y07hcpm0cwv9mc3qr2w6"; - } - else - ""; - - pathConfig = runCommand "ldc-lib-paths" {} '' - mkdir $out - echo ${tzdata}/share/zoneinfo/ > $out/TZDatabaseDirFile - echo ${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} > $out/LibcurlPathFile - ''; -in - -stdenv.mkDerivation rec { - pname = "ldc"; - inherit version; - - enableParallelBuilding = true; - - src = fetchurl { - url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz"; - sha256 = ldcSha256; - }; - - # https://issues.dlang.org/show_bug.cgi?id=19553 - hardeningDisable = [ "fortify" ]; - - postUnpack = '' - 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 - - # test depends on current year - rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/ddocYear.d - '' - - + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) '' - # https://github.com/NixOS/nixpkgs/issues/34817 - rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall - ''; - - postPatch = '' - # Setting SHELL=$SHELL when dmd testsuite is run doesn't work on Linux somehow - substituteInPlace tests/d2/dmd-testsuite/Makefile --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash" - '' - - + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isLinux) '' - substituteInPlace runtime/phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" "" - '' - - + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) '' - substituteInPlace runtime/phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)" - '' - - + stdenv.lib.optionalString (bootstrapVersion && stdenv.hostPlatform.isDarwin) '' - # Was not able to compile on darwin due to "__inline_isnanl" - # being undefined. - # TODO Remove with version > 0.17.6 - substituteInPlace dmd2/root/port.c --replace __inline_isnanl __inline_isnan - ''; - - nativeBuildInputs = [ cmake ninja makeWrapper unzip ] - ++ stdenv.lib.optionals (!bootstrapVersion) [ - bootstrapLdc lit lit.python - ] - ++ stdenv.lib.optional (!bootstrapVersion && stdenv.hostPlatform.isDarwin) - # https://github.com/NixOS/nixpkgs/issues/57120 - # https://github.com/NixOS/nixpkgs/pull/59197#issuecomment-481972515 - llvm_5 - ++ 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.optionals (bootstrapVersion) [ - libconfig llvm_5 - ] - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin - darwin.apple_sdk.frameworks.Foundation; - - - buildInputs = [ curl tzdata ]; - - cmakeFlags = stdenv.lib.optionals (!bootstrapVersion) [ - "-DD_FLAGS=-d-version=TZDatabaseDir;-d-version=LibcurlPath;-J${pathConfig}" - "-DCMAKE_BUILD_TYPE=Release" - ]; - - postConfigure = '' - export DMD=$PWD/bin/ldmd2 - ''; - - makeFlags = [ "DMD=$DMD" ]; - - fixNames = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' - fixDarwinDylibNames() { - local flags=() - - for fn in "$@"; do - flags+=(-change "$(basename "$fn")" "$fn") - done - - for fn in "$@"; do - if [ -L "$fn" ]; then continue; fi - echo "$fn: fixing dylib" - install_name_tool -id "$fn" "''${flags[@]}" "$fn" - done - } - - fixDarwinDylibNames $(find "$(pwd)/lib" -name "*.dylib") - export DYLD_LIBRARY_PATH=$(pwd)/lib - ''; - - # https://github.com/ldc-developers/ldc/issues/2497#issuecomment-459633746 - additionalExceptions = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin - "|druntime-test-shared"; - - doCheck = !bootstrapVersion; - - checkPhase = stdenv.lib.optionalString doCheck '' - # Build default lib test runners - ninja -j$NIX_BUILD_CORES all-test-runners - - ${fixNames} - - # Run dmd testsuite - export DMD_TESTSUITE_MAKE_ARGS="-j$NIX_BUILD_CORES DMD=$DMD CC=$CXX" - ctest -V -R "dmd-testsuite" - - # Build and run LDC D unittests. - ctest --output-on-failure -R "ldc2-unittest" - - # Run LIT testsuite. - ctest -V -R "lit-tests" - - # Run default lib unittests - ctest -j$NIX_BUILD_CORES --output-on-failure -E "ldc2-unittest|lit-tests|dmd-testsuite${additionalExceptions}" - ''; - - postInstall = '' - wrapProgram $out/bin/ldc2 \ - --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \ - --set-default CC "${targetPackages.stdenv.cc}/bin/cc" - ''; - - meta = with stdenv.lib; { - description = "The LLVM-based D compiler"; - homepage = "https://github.com/ldc-developers/ldc"; - # from https://github.com/ldc-developers/ldc/blob/master/LICENSE - license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ]; - maintainers = with maintainers; [ ThomasMader ]; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; - }; +import ./generic.nix { + version = "1.20.1"; + ldcSha256 = "1bqsgab22v02pc3c9gcyf15y7aimadv24d68icaw5lpgnvzxy89b"; } diff --git a/pkgs/development/compilers/ldc/generic.nix b/pkgs/development/compilers/ldc/generic.nix new file mode 100644 index 00000000000..93ffe37785d --- /dev/null +++ b/pkgs/development/compilers/ldc/generic.nix @@ -0,0 +1,164 @@ +{ bootstrapVersion ? false +, version +, ldcSha256 +}: +{ stdenv, fetchurl, cmake, ninja, llvm_5, llvm_8, curl, tzdata +, libconfig, lit, gdb, unzip, darwin, bash, ldcBootstrap +, callPackage, makeWrapper, runCommand, targetPackages +}: + +let + pathConfig = runCommand "ldc-lib-paths" {} '' + mkdir $out + echo ${tzdata}/share/zoneinfo/ > $out/TZDatabaseDirFile + echo ${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} > $out/LibcurlPathFile + ''; + + bootstrapLdc = if bootstrapVersion then null else ldcBootstrap; + +in + +stdenv.mkDerivation rec { + pname = "ldc"; + inherit version; + + enableParallelBuilding = true; + + src = fetchurl { + url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz"; + sha256 = ldcSha256; + }; + + # https://issues.dlang.org/show_bug.cgi?id=19553 + hardeningDisable = [ "fortify" ]; + + postUnpack = '' + 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 + + # test depends on current year + rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/ddocYear.d + '' + + + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) '' + # https://github.com/NixOS/nixpkgs/issues/34817 + rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall + ''; + + postPatch = '' + # Setting SHELL=$SHELL when dmd testsuite is run doesn't work on Linux somehow + substituteInPlace tests/d2/dmd-testsuite/Makefile --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash" + '' + + + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isLinux) '' + substituteInPlace runtime/phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" "" + '' + + + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) '' + substituteInPlace runtime/phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)" + '' + + + stdenv.lib.optionalString (bootstrapVersion && stdenv.hostPlatform.isDarwin) '' + # Was not able to compile on darwin due to "__inline_isnanl" + # being undefined. + # TODO Remove with version > 0.17.6 + substituteInPlace dmd2/root/port.c --replace __inline_isnanl __inline_isnan + ''; + + nativeBuildInputs = [ cmake ninja makeWrapper unzip ] + ++ stdenv.lib.optionals (!bootstrapVersion) [ + bootstrapLdc lit lit.python + ] + ++ stdenv.lib.optional (!bootstrapVersion && stdenv.hostPlatform.isDarwin) + # https://github.com/NixOS/nixpkgs/issues/57120 + # https://github.com/NixOS/nixpkgs/pull/59197#issuecomment-481972515 + llvm_5 + ++ 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.optionals (bootstrapVersion) [ + libconfig llvm_5 + ] + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin + darwin.apple_sdk.frameworks.Foundation; + + buildInputs = [ curl tzdata ]; + + cmakeFlags = stdenv.lib.optionals (!bootstrapVersion) [ + "-DD_FLAGS=-d-version=TZDatabaseDir;-d-version=LibcurlPath;-J${pathConfig}" + "-DCMAKE_BUILD_TYPE=Release" + ]; + + postConfigure = '' + export DMD=$PWD/bin/ldmd2 + ''; + + makeFlags = [ "DMD=$DMD" ]; + + fixNames = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + fixDarwinDylibNames() { + local flags=() + + for fn in "$@"; do + flags+=(-change "$(basename "$fn")" "$fn") + done + + for fn in "$@"; do + if [ -L "$fn" ]; then continue; fi + echo "$fn: fixing dylib" + install_name_tool -id "$fn" "''${flags[@]}" "$fn" + done + } + + fixDarwinDylibNames $(find "$(pwd)/lib" -name "*.dylib") + export DYLD_LIBRARY_PATH=$(pwd)/lib + ''; + + # https://github.com/ldc-developers/ldc/issues/2497#issuecomment-459633746 + additionalExceptions = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin + "|druntime-test-shared"; + + doCheck = !bootstrapVersion; + + checkPhase = stdenv.lib.optionalString doCheck '' + # Build default lib test runners + ninja -j$NIX_BUILD_CORES all-test-runners + + ${fixNames} + + # Run dmd testsuite + export DMD_TESTSUITE_MAKE_ARGS="-j$NIX_BUILD_CORES DMD=$DMD" + ctest -V -R "dmd-testsuite" + + # Build and run LDC D unittests. + ctest --output-on-failure -R "ldc2-unittest" + + # Run LIT testsuite. + ctest -V -R "lit-tests" + + # Run default lib unittests + ctest -j$NIX_BUILD_CORES --output-on-failure -E "ldc2-unittest|lit-tests|dmd-testsuite${additionalExceptions}" + ''; + + postInstall = '' + wrapProgram $out/bin/ldc2 \ + --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \ + --set-default CC "${targetPackages.stdenv.cc}/bin/cc" + ''; + + meta = with stdenv.lib; { + description = "The LLVM-based D compiler"; + homepage = "https://github.com/ldc-developers/ldc"; + # from https://github.com/ldc-developers/ldc/blob/master/LICENSE + license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ]; + maintainers = with maintainers; [ ThomasMader lionello ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6ebf2bcf8df..73e2ee3a207 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -215,6 +215,7 @@ mapAliases ({ keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # 2019-12-10 kvm = qemu_kvm; # added 2018-04-25 latinmodern-math = lmmath; + ldc2 = ldc; # added 2020-04-18 letsencrypt = certbot; # added 2016-05-16 libaudit = audit; # added 2018-04-25 libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef8ea2a268c..3654c4c45a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4554,6 +4554,7 @@ in lalezar-fonts = callPackage ../data/fonts/lalezar-fonts { }; + ldcBootstrap = callPackage ../development/compilers/ldc/bootstrap.nix { }; ldc = callPackage ../development/compilers/ldc { }; lbreakout2 = callPackage ../games/lbreakout2 { }; -- cgit v1.2.3 From 8a5fa6531f87c769651b679b75a9693d8fddf646 Mon Sep 17 00:00:00 2001 From: Las Date: Sat, 18 Apr 2020 15:57:32 +0900 Subject: age: 1.0.0-beta2 -> unstable-2020-03-25 There has been no new official release of age, but some important fixes and changes have been done since the last release in December: https://github.com/FiloSottile/age/compare/v1.0.0-beta2...f0f8092d60bb96737fa096c29ec6d8adb5810390 --- pkgs/tools/security/age/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/age/default.nix b/pkgs/tools/security/age/default.nix index bde597ba9f3..c8b4f069f79 100644 --- a/pkgs/tools/security/age/default.nix +++ b/pkgs/tools/security/age/default.nix @@ -2,9 +2,9 @@ buildGoModule rec { pname = "age"; - version = "1.0.0-beta2"; + version = "unstable-2020-03-25"; goPackagePath = "github.com/FiloSottile/age"; - modSha256 = "0kwdwhkxgqjd8h1p7pm4h4xidp2vk840h1j4qya4qz8bjf9vskl9"; + modSha256 = "00yhn1894ni8bvkqm1vr0rqkky52pkhvdzbi2sqx3czlgb5ibw3h"; subPackages = [ "cmd/age" @@ -14,8 +14,8 @@ buildGoModule rec { src = fetchFromGitHub { owner = "FiloSottile"; repo = "age"; - rev = "v${version}"; - sha256 = "1n1ww8yjw0mg00dvnfmggww9kwp1hls0a85iv6vx9k89mzv8mdrq"; + rev = "f0f8092d60bb96737fa096c29ec6d8adb5810390"; + sha256 = "079kfc8d1pr39hr4qnx48kviyzwg4p8m4pz0bdkypns4aq8ppbfk"; }; meta = with lib; { -- cgit v1.2.3 From 1b0d8015fe04be3d2c843381b35c9e902904d05c Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 15 Apr 2020 17:05:32 +0000 Subject: nixos/rss2email: globally install rss2email For man pages. --- nixos/modules/services/mail/rss2email.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/mail/rss2email.nix b/nixos/modules/services/mail/rss2email.nix index c1e5964c453..7f8d2adac64 100644 --- a/nixos/modules/services/mail/rss2email.nix +++ b/nixos/modules/services/mail/rss2email.nix @@ -91,6 +91,8 @@ in { }; }; + environment.systemPackages = with pkgs; [ rss2email ]; + services.rss2email.config.to = cfg.to; systemd.tmpfiles.rules = [ -- cgit v1.2.3 From 9524aafeb7b3e71660e85c24832ac43016f19b9e Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Sat, 18 Apr 2020 18:36:09 +0300 Subject: httpie: 2.0.0 -> 2.1.0 --- pkgs/tools/networking/httpie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix index f97d868d7bd..01986bf9321 100644 --- a/pkgs/tools/networking/httpie/default.nix +++ b/pkgs/tools/networking/httpie/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "httpie"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "jakubroztocil"; repo = "httpie"; rev = version; - sha256 = "0d0rsn5i973l9y0ws3xmnzaw4jwxdlryyjbasnlddph5mvkf7dq0"; + sha256 = "1vwjlzx830q4dcm3r7j9cl8yzka37dw42rl1r05m5ysb1081cbj2"; }; outputs = [ "out" "doc" "man" ]; -- cgit v1.2.3 From dfe70a2d6347aa9a2bf2fa34124cc835c0d51c4b Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sat, 18 Apr 2020 11:38:48 -0400 Subject: dnnl: 1.2.2 -> 1.4 The upstream readme has a note about renaming the git repo and libname: https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn Changelog: https://github.com/oneapi-src/oneDNN/releases/tag/v1.4 --- pkgs/development/libraries/dnnl/bash-to-sh.patch | 13 ------------- pkgs/development/libraries/dnnl/default.nix | 24 +++++++++++------------- 2 files changed, 11 insertions(+), 26 deletions(-) delete mode 100644 pkgs/development/libraries/dnnl/bash-to-sh.patch diff --git a/pkgs/development/libraries/dnnl/bash-to-sh.patch b/pkgs/development/libraries/dnnl/bash-to-sh.patch deleted file mode 100644 index 063d9ef952b..00000000000 --- a/pkgs/development/libraries/dnnl/bash-to-sh.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index f6810246..e1d2a1f1 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -72,7 +72,7 @@ if(UNIX OR MINGW) - set(test_c_symbols "${CMAKE_CURRENT_BINARY_DIR}/test_c_symbols.c") - add_custom_command( - OUTPUT ${test_c_symbols} -- COMMAND /bin/bash ${CMAKE_CURRENT_SOURCE_DIR}/generate_c_symbols_refs.sh -+ COMMAND @bash@/bin/bash ${CMAKE_CURRENT_SOURCE_DIR}/generate_c_symbols_refs.sh - ${CMAKE_CURRENT_SOURCE_DIR}/.. ${test_c_symbols} ${include_dirs} - ) - register_exe(test_c_symbols-c ${test_c_symbols} "test") diff --git a/pkgs/development/libraries/dnnl/default.nix b/pkgs/development/libraries/dnnl/default.nix index 40d9030b953..0d29c6eae8b 100644 --- a/pkgs/development/libraries/dnnl/default.nix +++ b/pkgs/development/libraries/dnnl/default.nix @@ -1,23 +1,20 @@ { stdenv, lib, fetchFromGitHub, substituteAll, cmake, bash }: +# This was originally called mkl-dnn, then it was renamed to dnnl, and it has +# just recently been renamed again to oneDNN. In a follow-up, let's move the +# attr and alias dnnl -> oneDNN. See here for details: +# https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation rec { pname = "dnnl"; - version = "1.2.2"; + version = "1.4"; src = fetchFromGitHub { - owner = "intel"; - repo = "mkl-dnn"; + owner = "oneapi-src"; + repo = "oneDNN"; rev = "v${version}"; - sha256 = "0ydy7ibm6sh1awrikyj938n26cpg5magnxraz2d0pj76irv4vj5m"; + sha256 = "162fb0c7klahz2irchhyxympi4fq4yp284apc53cadbss41mzld9"; }; - # Generic fix merged upstream in https://github.com/intel/mkl-dnn/pull/631 - # Delete after next release - patches = [ (substituteAll { - src = ./bash-to-sh.patch; - inherit bash; - }) ]; - outputs = [ "out" "dev" "doc" ]; nativeBuildInputs = [ cmake ]; @@ -36,8 +33,9 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Deep Neural Network Library (DNNL)"; - homepage = "https://intel.github.io/mkl-dnn/dev_guide_transition_to_dnnl.html"; + description = "oneAPI Deep Neural Network Library (oneDNN)"; + homepage = "https://01.org/dnnl"; + changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${version}"; license = licenses.asl20; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ alexarice bhipple ]; -- cgit v1.2.3 From a0cca88d16edc4339f26708931adbb523fe81194 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Sat, 18 Apr 2020 18:43:58 +0300 Subject: _3mux: 0.1.0 -> 0.2.0 --- pkgs/tools/misc/3mux/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/3mux/default.nix b/pkgs/tools/misc/3mux/default.nix index f2f0b3c6fcf..3371b795623 100644 --- a/pkgs/tools/misc/3mux/default.nix +++ b/pkgs/tools/misc/3mux/default.nix @@ -1,22 +1,24 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "3mux"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "aaronjanse"; repo = pname; rev = "v${version}"; - sha256 = "1iz839w636vv7208wyrmb9r77wv9m0q1j8km06kmi87m0hcbh807"; + sha256 = "02ry066psvlqdyhimci7nskw4sfb70dw5z7ag7s7rz36gmx1vnmr"; }; - modSha256 = "10lnzh22qzls1b4i9dbknbxw5v92bcs7sarqipvvk5fymadr3k2p"; + modSha256 = "1ag9lx8xcp2z9lrg404914zin45n8f4s08365yk71q5vyiwxjj3i"; - meta = with lib; { + meta = with stdenv.lib; { description = "Terminal multiplexer inspired by i3"; homepage = "https://github.com/aaronjanse/3mux"; license = licenses.mit; maintainers = with maintainers; [ aaronjanse filalex77 ]; + # TODO: fix modules build on darwin + broken = stdenv.isDarwin; }; } -- cgit v1.2.3 From 5fbab6dabbc8f5a74ea65ed87b9755c9598f9648 Mon Sep 17 00:00:00 2001 From: Markus Wamser Date: Sat, 18 Apr 2020 19:15:29 +0200 Subject: pythonPackages.pdfposter init at 0.7.post1 (#82926) Signed-off-by: Markus S. Wamser --- .../development/python-modules/pdfposter/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/python-modules/pdfposter/default.nix diff --git a/pkgs/development/python-modules/pdfposter/default.nix b/pkgs/development/python-modules/pdfposter/default.nix new file mode 100644 index 00000000000..43e2f1f57f7 --- /dev/null +++ b/pkgs/development/python-modules/pdfposter/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, fetchPypi, pypdf2 }: + +buildPythonPackage rec { + pname = "pdftools.pdfposter"; + version = "0.7.post1"; + + propagatedBuildInputs = [ pypdf2 ]; + + src = fetchPypi { + inherit pname version; + sha256 = "0c1avpbr9q53yzq5ar2x485rmp9d0l3z27aham32bg7gplzd7w0j"; + }; + + meta = with stdenv.lib; { + description = "Split large pages of a PDF into smaller ones for poster printing"; + homepage = "https://pdfposter.readthedocs.io"; + license = licenses.gpl3; + maintainers = with maintainers; [ wamserma ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ac6b5f59220..c6dfc9582c7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1025,6 +1025,8 @@ in { pdfminer = callPackage ../development/python-modules/pdfminer_six { }; + pdfposter = callPackage ../development/python-modules/pdfposter { }; + pdftotext = callPackage ../development/python-modules/pdftotext { }; pdfx = callPackage ../development/python-modules/pdfx { }; -- cgit v1.2.3 From 03c76d470a3ccbf05dcafaf1f91bba1974434529 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Sat, 18 Apr 2020 19:17:58 +0200 Subject: sweethome3d: 6.2 -> 6.3 unfortunately still needs me to manually roll back the mesa version from 20.0.2 (or 20.0.4) to 19.3.3 as discussed in https://discourse.nixos.org/t/glx-not-recognised-after-mesa-update/6753 using 'sweethome3.application' --- pkgs/applications/misc/sweethome3d/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 7f094607859..926db03652d 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -73,14 +73,14 @@ in { application = mkSweetHome3D rec { pname = stdenv.lib.toLower module + "-application"; - version = "6.2"; + version = "6.3"; module = "SweetHome3D"; description = "Design and visualize your future home"; license = stdenv.lib.licenses.gpl2Plus; src = fetchsvn { url = "https://svn.code.sf.net/p/sweethome3d/code/tags/V_" + d2u version + "/SweetHome3D/"; - sha256 = "0a514a1zmipykvawil46v826ivkw9c00vdkyggyl6m41giay15zf"; - rev = "6822"; + sha256 = "1c13g0f73jgbzmjhdm9knqq1kh3vdl04zl3xlp30g9a1n0jkr38i"; + rev = "6896"; }; desktopName = "Sweet Home 3D"; icons = { -- cgit v1.2.3 From 58d165420b9aba73db13e30e0211bb150d15eb9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sat, 18 Apr 2020 19:26:43 +0200 Subject: micro: 1.4.1 -> 2.0.3 --- pkgs/applications/editors/micro/default.nix | 8 +- pkgs/applications/editors/micro/deps.nix | 336 ++++++++++++++++++++++++++++ 2 files changed, 341 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/editors/micro/deps.nix diff --git a/pkgs/applications/editors/micro/default.nix b/pkgs/applications/editors/micro/default.nix index f9e7b38cbe0..6a1ee5d196e 100644 --- a/pkgs/applications/editors/micro/default.nix +++ b/pkgs/applications/editors/micro/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "micro"; - version = "1.4.1"; + version = "2.0.3"; goPackagePath = "github.com/zyedidia/micro"; @@ -10,13 +10,15 @@ buildGoPackage rec { owner = "zyedidia"; repo = "micro"; rev = "v${version}"; - sha256 = "0m9p6smb5grdazsgr3m1x4rry9ihhlgl9ildhvfp53czrifbx0m5"; + sha256 = "017m9kb3gfrgzd06f1nma1i3m5rb0hzpgdikb86lsyv8ik18y12z"; fetchSubmodules = true; }; subPackages = [ "cmd/micro" ]; - buildFlagsArray = [ "-ldflags=" "-X main.Version=${version}" ]; + buildFlagsArray = [ "-ldflags=" "-X ${goPackagePath}/internal/util.Version=${version}" ]; + + goDeps = ./deps.nix; meta = with stdenv.lib; { homepage = "https://micro-editor.github.io"; diff --git a/pkgs/applications/editors/micro/deps.nix b/pkgs/applications/editors/micro/deps.nix new file mode 100644 index 00000000000..e8ed69a9088 --- /dev/null +++ b/pkgs/applications/editors/micro/deps.nix @@ -0,0 +1,336 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/blang/semver"; + fetch = { + type = "git"; + url = "https://github.com/blang/semver"; + rev = "v3.5.1"; + sha256 = "13ws259bwcibkclbr82ilhk6zadm63kxklxhk12wayklj8ghhsmy"; + }; + } + { + goPackagePath = "github.com/chzyer/logex"; + fetch = { + type = "git"; + url = "https://github.com/chzyer/logex"; + rev = "v1.1.10"; + sha256 = "08pbjj3wx9acavlwyr055isa8a5hnmllgdv5k6ra60l5y1brmlq4"; + }; + } + { + goPackagePath = "github.com/chzyer/readline"; + fetch = { + type = "git"; + url = "https://github.com/chzyer/readline"; + rev = "2972be24d48e"; + sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r"; + }; + } + { + goPackagePath = "github.com/chzyer/test"; + fetch = { + type = "git"; + url = "https://github.com/chzyer/test"; + rev = "a1ea475d72b1"; + sha256 = "0rns2aqk22i9xsgyap0pq8wi4cfaxsri4d9q6xxhhyma8jjsnj2k"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "v1.0.0"; + sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; + }; + } + { + goPackagePath = "github.com/gdamore/encoding"; + fetch = { + type = "git"; + url = "https://github.com/gdamore/encoding"; + rev = "v1.0.0"; + sha256 = "1vmm5zll92i2fm4ajqx0gyx0p9j36496x5nabi3y0x7h0inv0pk9"; + }; + } + { + goPackagePath = "github.com/go-errors/errors"; + fetch = { + type = "git"; + url = "https://github.com/go-errors/errors"; + rev = "v1.0.1"; + sha256 = "0rznpknk19rxkr7li6dqs52c26pjazp69lh493l4ny4sxn5922lp"; + }; + } + { + goPackagePath = "github.com/kballard/go-shellquote"; + fetch = { + type = "git"; + url = "https://github.com/kballard/go-shellquote"; + rev = "95032a82bc51"; + sha256 = "1rspvmnsikdq95jmx3dykxd4k1rmgl98ryjrysvl0cf18hl1vq80"; + }; + } + { + goPackagePath = "github.com/kr/pretty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pretty"; + rev = "v0.1.0"; + sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; + }; + } + { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "v1.1.1"; + sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "v0.1.0"; + sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; + }; + } + { + goPackagePath = "github.com/lucasb-eyer/go-colorful"; + fetch = { + type = "git"; + url = "https://github.com/lucasb-eyer/go-colorful"; + rev = "v1.0.3"; + sha256 = "12bgz6dxbb2ki1g3x7fg9ipsjgfkd58fp7cdpv63h4kvlj2n7j69"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "v0.0.11"; + sha256 = "0h671sv7hfprja495kavazkalkx7xzaqksjh13brcnwq67ijrali"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "v0.0.7"; + sha256 = "1snr8mk63vz2h44knq26dm81p83887v7kb09iywqmx0nqzngih66"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "v1.1.0"; + sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/robertkrimen/otto"; + fetch = { + type = "git"; + url = "https://github.com/robertkrimen/otto"; + rev = "c382bd3c16ff"; + sha256 = "043y6l647snsz71mdy84s2d3kn22aj6rbqd6c1vd8absvamqhlxa"; + }; + } + { + goPackagePath = "github.com/sergi/go-diff"; + fetch = { + type = "git"; + url = "https://github.com/sergi/go-diff"; + rev = "v1.1.0"; + sha256 = "0ir8ali2vx0j7pipmlfd6k8c973akyy2nmbjrf008fm800zcp7z2"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.0"; + sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.4.0"; + sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb"; + }; + } + { + goPackagePath = "github.com/yuin/gopher-lua"; + fetch = { + type = "git"; + url = "https://github.com/yuin/gopher-lua"; + rev = "ab39c6098bdb"; + sha256 = "13b0rrpv3988qw8rq6z7npajn1my059ybhafi5mxff9jw09k9sja"; + }; + } + { + goPackagePath = "github.com/zyedidia/clipboard"; + fetch = { + type = "git"; + url = "https://github.com/zyedidia/clipboard"; + rev = "241f98e9b197"; + sha256 = "1glc8w30sijpbppcvaf3503rmx5nxqkcgw87dr2pr3q3vv1bg3zi"; + }; + } + { + goPackagePath = "github.com/zyedidia/glob"; + fetch = { + type = "git"; + url = "https://github.com/zyedidia/glob"; + rev = "dd4023a66dc3"; + sha256 = "1vqw4xbqq6j8p5m7mwxvb448w69vjvgzx0ndsfzdh2cxfirwp3y7"; + }; + } + { + goPackagePath = "github.com/zyedidia/highlight"; + fetch = { + type = "git"; + url = "https://github.com/zyedidia/highlight"; + rev = "201131ce5cf5"; + sha256 = "0blaynf32swmqddx2hcrifrfssj9c04kwnbdy42h3kzxihrwz4ps"; + }; + } + { + goPackagePath = "github.com/zyedidia/json5"; + fetch = { + type = "git"; + url = "https://github.com/zyedidia/json5"; + rev = "2da050b1a98d"; + sha256 = "1sgydazf3npr788b4w17ydmlh3fd1zmpriv9b69967ww90ckh2kz"; + }; + } + { + goPackagePath = "github.com/zyedidia/poller"; + fetch = { + type = "git"; + url = "https://github.com/zyedidia/poller"; + rev = "v1.0.1"; + sha256 = "10cjrqfk1j0l55bdbpm7kv4mqc665pngc8avai0p9chq03y2654g"; + }; + } + { + goPackagePath = "github.com/zyedidia/pty"; + fetch = { + type = "git"; + url = "https://github.com/zyedidia/pty"; + rev = "v2.0.0"; + sha256 = "1n946ld8y2v2wfbwsxv8rfaicxbw3w8pk11ryc8iybmw7hkmmf79"; + }; + } + { + goPackagePath = "github.com/zyedidia/tcell"; + fetch = { + type = "git"; + url = "https://github.com/zyedidia/tcell"; + rev = "v1.4.4"; + sha256 = "0d62a9csab15b64y09jcbvq71065wliw4bd5m7lfpl5k8rmrrdyi"; + }; + } + { + goPackagePath = "github.com/zyedidia/terminal"; + fetch = { + type = "git"; + url = "https://github.com/zyedidia/terminal"; + rev = "533c623e2415"; + sha256 = "16l628f3zgl5yp9z5zkfy2hyl2sckw4d6mg3iqv2jjvh4i8yhrsm"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "33540a1f6037"; + sha256 = "0fjcv0vzvi6za0b4xmnk3932pr9f9gczzf03y0kgq3ry9rqg169y"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.2"; + sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "90fa682c2a6e"; + sha256 = "03ic2xsy51jw9749wl7gszdbz99iijbd2bckgygl6cm9w5m364ak"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "41f04d3bba15"; + sha256 = "0vfk9czmlxmp6wndq8k17rhnjxal764mxfhrccza7nwlia760pjy"; + }; + } + { + goPackagePath = "gopkg.in/sourcemap.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/sourcemap.v1"; + rev = "v1.0.5"; + sha256 = "08rf2dl13hbnm3fq2cm0nnsspy9fhf922ln23cz5463cv7h62as4"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.7"; + sha256 = "0k5xcwkd3wmcx54isk7ck9cwp8fapfhyqdz3f13kxp77cxqizazj"; + }; + } + { + goPackagePath = "layeh.com/gopher-luar"; + fetch = { + type = "git"; + url = "https://github.com/layeh/gopher-luar"; + rev = "v1.0.7"; + sha256 = "1rdbni3q7zajmiy62ccvbfgqjzppk5212wpwks2ba726hvyf85mj"; + }; + } +] -- cgit v1.2.3 From 5291925fd2486175e781669412fa5a525da7602a Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Mon, 23 Mar 2020 01:47:12 +0200 Subject: nixos: Introduce nix.buildLocation option Allow to specify where package build will happens. It helps big packages (like browsers) not to overflow tmpfs. --- nixos/modules/services/misc/nix-daemon.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 0c2407e1dd2..022ddad8f36 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -430,6 +430,16 @@ in ''; }; + buildLocation = mkOption { + type = types.str; + default = "/tmp"; + example = "/var/buildroot"; + description = '' + Temporary directory, which used to unpack and build source packages. + (by default /tmp is used, which commonly reside on tmpfs, + and big packages (like browsers) can just not fit there) + ''; + }; }; }; @@ -476,7 +486,9 @@ in ++ optionals cfg.distributedBuilds [ pkgs.gzip ]; environment = cfg.envVars - // { CURL_CA_BUNDLE = "/etc/ssl/certs/ca-certificates.crt"; } + // { CURL_CA_BUNDLE = "/etc/ssl/certs/ca-certificates.crt"; + TMPDIR = cfg.buildLocation; + } // config.networking.proxy.envVars; unitConfig.RequiresMountsFor = "/nix/store"; @@ -490,6 +502,8 @@ in restartTriggers = [ nixConf ]; }; + systemd.tmpfiles.rules = [ "d ${cfg.buildLocation} 0775 root root -" ]; + # Set up the environment variables for running Nix. environment.sessionVariables = cfg.envVars // { NIX_PATH = cfg.nixPath; -- cgit v1.2.3 From 06e5800a73573573979a17b0d6dab3641265038b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 15 Apr 2020 21:22:43 +0200 Subject: =?UTF-8?q?fwupd:=201.3.9=20=E2=86=92=201.4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/fwupd/fwupd/releases/tag/1.4.0 --- .../add-option-for-installation-sysconfdir.patch | 86 ++++++++++++---------- pkgs/os-specific/linux/firmware/fwupd/default.nix | 75 +++++++++++-------- .../firmware/fwupd/installed-tests-path.patch | 27 ++++--- 3 files changed, 110 insertions(+), 78 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch index a13251476de..a727e5f4a85 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/add-option-for-installation-sysconfdir.patch @@ -1,5 +1,5 @@ diff --git a/data/meson.build b/data/meson.build -index 0667bd78..92d6c7b9 100644 +index bb749fd4..b611875b 100644 --- a/data/meson.build +++ b/data/meson.build @@ -17,7 +17,7 @@ endif @@ -12,41 +12,38 @@ index 0667bd78..92d6c7b9 100644 endif diff --git a/data/pki/meson.build b/data/pki/meson.build -index eefcc914..dc801fa1 100644 +index 94bb0b6f..1ea6a9ac 100644 --- a/data/pki/meson.build +++ b/data/pki/meson.build -@@ -4,14 +4,14 @@ if get_option('gpg') - 'GPG-KEY-Linux-Foundation-Firmware', - 'GPG-KEY-Linux-Vendor-Firmware-Service', - ], -- install_dir : join_paths(sysconfdir, 'pki', 'fwupd') -+ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd') - ) - - install_data([ - 'GPG-KEY-Linux-Foundation-Metadata', - 'GPG-KEY-Linux-Vendor-Firmware-Service', - ], -- install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata') -+ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd-metadata') - ) - endif +@@ -3,24 +3,23 @@ install_data([ + 'GPG-KEY-Linux-Foundation-Firmware', + 'GPG-KEY-Linux-Vendor-Firmware-Service', + ], +- install_dir : join_paths(sysconfdir, 'pki', 'fwupd') ++ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd') + ) -@@ -19,12 +19,12 @@ if get_option('pkcs7') - install_data([ - 'LVFS-CA.pem', - ], -- install_dir : join_paths(sysconfdir, 'pki', 'fwupd') -+ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd') - ) - install_data([ - 'LVFS-CA.pem', - ], -- install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata') -+ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd-metadata') - ) - endif + install_data([ + 'GPG-KEY-Linux-Foundation-Metadata', + 'GPG-KEY-Linux-Vendor-Firmware-Service', + ], +- install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata') ++ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd-metadata') + ) + install_data([ + 'LVFS-CA.pem', + ], +- install_dir : join_paths(sysconfdir, 'pki', 'fwupd') ++ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd') + ) + install_data([ + 'LVFS-CA.pem', + ], +- install_dir : join_paths(sysconfdir, 'pki', 'fwupd-metadata') ++ install_dir : join_paths(sysconfdir_install, 'pki', 'fwupd-metadata') + ) +- diff --git a/data/remotes.d/meson.build b/data/remotes.d/meson.build index 826a3c1d..b78db663 100644 --- a/data/remotes.d/meson.build @@ -76,10 +73,10 @@ index 826a3c1d..b78db663 100644 + install_dir: join_paths(sysconfdir_install, 'fwupd', 'remotes.d'), ) diff --git a/meson.build b/meson.build -index b1a523d2..aacb8e0a 100644 +index 87ea67e5..3a4374db 100644 --- a/meson.build +++ b/meson.build -@@ -169,6 +169,12 @@ endif +@@ -175,6 +175,12 @@ endif mandir = join_paths(prefix, get_option('mandir')) localedir = join_paths(prefix, get_option('localedir')) @@ -93,10 +90,10 @@ index b1a523d2..aacb8e0a 100644 gio = dependency('gio-2.0', version : '>= 2.45.8') giounix = dependency('gio-unix-2.0', version : '>= 2.45.8', required: false) diff --git a/meson_options.txt b/meson_options.txt -index be0adfef..73983333 100644 +index 3da9b6c4..6c80275b 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -26,6 +26,7 @@ option('plugin_coreboot', type : 'boolean', value : true, description : 'enable +@@ -24,6 +24,7 @@ option('plugin_coreboot', type : 'boolean', value : true, description : 'enable option('systemd', type : 'boolean', value : true, description : 'enable systemd support') option('systemdunitdir', type: 'string', value: '', description: 'Directory for systemd units') option('elogind', type : 'boolean', value : false, description : 'enable elogind support') @@ -104,6 +101,19 @@ index be0adfef..73983333 100644 option('tests', type : 'boolean', value : true, description : 'enable tests') option('udevdir', type: 'string', value: '', description: 'Directory for udev rules') option('efi-cc', type : 'string', value : 'gcc', description : 'the compiler to use for EFI modules') +diff --git a/plugins/ata/meson.build b/plugins/ata/meson.build +index 8444bb8a..fa4a8ad1 100644 +--- a/plugins/ata/meson.build ++++ b/plugins/ata/meson.build +@@ -7,7 +7,7 @@ install_data([ + ) + + install_data(['ata.conf'], +- install_dir: join_paths(sysconfdir, 'fwupd') ++ install_dir: join_paths(sysconfdir_install, 'fwupd') + ) + + shared_module('fu_plugin_ata', diff --git a/plugins/dell-esrt/meson.build b/plugins/dell-esrt/meson.build index ed4eee70..76dbdb1d 100644 --- a/plugins/dell-esrt/meson.build @@ -142,10 +152,10 @@ index 06ab34ee..297a9182 100644 # we use functions from 2.52 in the tests if get_option('tests') and umockdev.found() and gio.version().version_compare('>= 2.52') diff --git a/plugins/uefi/meson.build b/plugins/uefi/meson.build -index 7252580d..7188d1c5 100644 +index 5838cecc..9ba3d5cd 100644 --- a/plugins/uefi/meson.build +++ b/plugins/uefi/meson.build -@@ -104,7 +104,7 @@ if get_option('man') +@@ -101,7 +101,7 @@ if get_option('man') endif install_data(['uefi.conf'], diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 86a2bfbcc9e..13f4f71c3c1 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -2,6 +2,7 @@ { stdenv , fetchurl +, fetchpatch , substituteAll , gtk-doc , pkgconfig @@ -16,7 +17,7 @@ , glib-networking , libsoup , help2man -, gpgme +, libjcat , libxslt , elfutils , libsmbios @@ -31,7 +32,6 @@ , docbook_xsl , ninja , gcab -, gnutls , python3 , wrapGAppsHook , json-glib @@ -87,11 +87,11 @@ in stdenv.mkDerivation rec { pname = "fwupd"; - version = "1.3.9"; + version = "1.4.0"; src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "ZuRG+UN8ebXv5Z8fOYWT0eCtHykGXoB8Ysu3wAeqx0A="; + sha256 = "V131/l05FKYFavRMXRaiW1bQkTCEn7MTyyD+bqYClU4="; }; # libfwupd goes to lib @@ -130,9 +130,8 @@ stdenv.mkDerivation rec { libyaml libgudev colord - gpgme + libjcat libuuid - gnutls glib-networking json-glib umockdev @@ -151,15 +150,43 @@ stdenv.mkDerivation rec { ./fix-paths.patch ./add-option-for-installation-sysconfdir.patch - # install plug-ins and libfwupdplugin to out, - # they are not really part of the library + # Install plug-ins and libfwupdplugin to out, + # they are not really part of the library. ./install-fwupdplugin-to-out.patch - # installed tests are installed to different output - # we also cannot have fwupd-tests.conf in $out/etc since it would form a cycle + # Make it easier to patch installed-tests directory. + # https://github.com/fwupd/fwupd/pull/2002 + (fetchpatch { + url = "https://github.com/fwupd/fwupd/commit/2f12e38e61d982dea63778736e2b71d16f0e9925.patch"; + sha256 = "goTyDj0v50FOQYCS+LhPjo0AEugubr6aBIGfO9ztZOA="; + }) + + # Install systemd files to our prefix. + # https://github.com/fwupd/fwupd/pull/2006 + (fetchpatch { + url = "https://github.com/fwupd/fwupd/commit/463db5162fe4f6fea417973ff95a44ed51ec6402.patch"; + sha256 = "I0TIfnCca83QpINABUINtl8nIB78dG8OR9MC/hP2hg8="; + }) + + # Fix installed tests. + # https://github.com/fwupd/fwupd/issues/2007 + (fetchpatch { + url = "https://github.com/fwupd/fwupd/commit/c727742df3702fc934e2d9488c883dcbdfa59e9c.patch"; + sha256 = "b9D2Xblf1VbpS5XZpHtwEJhzuq7+840l7skW5w0NMBU="; + }) + + # Fix build with bash-completion 2.10 + # https://github.com/fwupd/fwupd/pull/2014 + (fetchpatch { + url = "https://github.com/fwupd/fwupd/commit/0f035013dfb150c2c3fc7f51090103ba84bd1c06.patch"; + sha256 = "VXRf5N3inaWThudk6pc4mtp6cMEIyybkdfqKin+9XSw="; + }) + + # Installed tests are installed to different output + # we also cannot have fwupd-tests.conf in $out/etc since it would form a cycle. (substituteAll { src = ./installed-tests-path.patch; - # needs a different set of modules than po/make-images + # Needs a different set of modules than po/make-images. inherit installedTestsPython; }) ]; @@ -172,14 +199,6 @@ stdenv.mkDerivation rec { po/make-images \ po/make-images.sh \ po/test-deps - - # we cannot use placeholder in substituteAll - # https://github.com/NixOS/nix/issues/1846 - substituteInPlace data/installed-tests/meson.build --subst-var installedTests - - substituteInPlace data/meson.build --replace \ - "install_dir: systemd.get_pkgconfig_variable('systemdshutdowndir')" \ - "install_dir: '${placeholder "out"}/lib/systemd/system-shutdown'" ''; # /etc/os-release not available in sandbox @@ -203,7 +222,8 @@ stdenv.mkDerivation rec { "-Dgtkdoc=true" "-Dplugin_dummy=true" "-Dudevdir=lib/udev" - "-Dsystemdunitdir=lib/systemd/system" + "-Dsystemd_root_prefix=${placeholder "out"}" + "-Dinstalled_test_prefix=${placeholder "installedTests"}" "-Defi-libdir=${gnu-efi}/lib" "-Defi-ldsdir=${gnu-efi}/lib" "-Defi-includedir=${gnu-efi}/include/efi" @@ -225,23 +245,19 @@ stdenv.mkDerivation rec { "-Dplugin_flashrom=true" ]; - postInstall = '' - moveToOutput share/installed-tests "$installedTests" - wrapProgram $installedTests/share/installed-tests/fwupd/hardware.py \ - --prefix GI_TYPELIB_PATH : "$out/lib/girepository-1.0:${libsoup}/lib/girepository-1.0" - ''; - FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file # error: “PolicyKit files are missing” # https://github.com/NixOS/nixpkgs/pull/67625#issuecomment-525788428 PKG_CONFIG_POLKIT_GOBJECT_1_ACTIONDIR = "/run/current-system/sw/share/polkit-1/actions"; - # cannot install to systemd prefix - PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMPRESETDIR = "${placeholder "out"}/lib/systemd/system-preset"; - # TODO: wrapGAppsHook wraps efi capsule even though it is not elf dontWrapGApps = true; + + preCheck = '' + addToSearchPath XDG_DATA_DIRS "${shared-mime-info}/share" + ''; + # so we need to wrap the executables manually postFixup = '' find -L "$out/bin" "$out/libexec" -type f -executable -print0 \ @@ -256,6 +272,7 @@ stdenv.mkDerivation rec { # /etc/fwupd/uefi.conf is created by the services.hardware.fwupd NixOS module passthru = { filesInstalledToEtc = [ + "fwupd/ata.conf" # "fwupd/daemon.conf" # already created by the module "fwupd/redfish.conf" "fwupd/remotes.d/dell-esrt.conf" diff --git a/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch b/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch index 6c4b6b62a0c..432056cbe7f 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch +++ b/pkgs/os-specific/linux/firmware/fwupd/installed-tests-path.patch @@ -1,5 +1,5 @@ ---- a/data/installed-tests/hardware.py -+++ b/data/installed-tests/hardware.py +--- a/data/device-tests/hardware.py ++++ b/data/device-tests/hardware.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3 +#!@installedTestsPython@/bin/python3 @@ -8,18 +8,23 @@ # Copyright (C) 2017 Richard Hughes --- a/data/installed-tests/meson.build +++ b/data/installed-tests/meson.build -@@ -1,6 +1,6 @@ - con2 = configuration_data() - con2.set('installedtestsdir', -- join_paths(datadir, 'installed-tests', 'fwupd')) -+ join_paths('@installedTests@', 'share', 'installed-tests', 'fwupd')) - con2.set('bindir', bindir) +@@ -1,4 +1,4 @@ +-installed_test_datadir = join_paths(datadir, 'installed-tests', 'fwupd') ++installed_test_datadir = join_paths(get_option('installed_test_prefix'), 'share', 'installed-tests', 'fwupd') - configure_file( -@@ -52,5 +52,5 @@ + con2 = configuration_data() + con2.set('installedtestsdir', installed_test_datadir) +@@ -52,5 +52,5 @@ configure_file( output : 'fwupd-tests.conf', configuration : con2, install: true, - install_dir: join_paths(sysconfdir, 'fwupd', 'remotes.d'), -+ install_dir: join_paths('@installedTests@', 'etc', 'fwupd', 'remotes.d'), ++ install_dir: join_paths(get_option('installed_test_prefix'), 'etc', 'fwupd', 'remotes.d'), ) +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,3 +1,4 @@ ++option('installed_test_prefix', type: 'string', value: '', description: 'Prefix for installed tests') + option('build', type : 'combo', choices : ['all', 'standalone', 'library'], value : 'all', description : 'build type') + option('agent', type : 'boolean', value : true, description : 'enable the fwupd agent') + option('consolekit', type : 'boolean', value : true, description : 'enable ConsoleKit support') -- cgit v1.2.3 From 2b87ca0f9ce70c0aac6181288036fabbad7e543c Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Wed, 15 Apr 2020 14:11:17 +0800 Subject: sniffglue: init at 0.10.1 --- pkgs/tools/networking/sniffglue/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/tools/networking/sniffglue/default.nix diff --git a/pkgs/tools/networking/sniffglue/default.nix b/pkgs/tools/networking/sniffglue/default.nix new file mode 100644 index 00000000000..83f1e372aa5 --- /dev/null +++ b/pkgs/tools/networking/sniffglue/default.nix @@ -0,0 +1,27 @@ +{ lib, fetchFromGitHub, rustPlatform, libpcap, libseccomp, pkgconfig }: + +rustPlatform.buildRustPackage rec { + pname = "sniffglue"; + version = "0.10.1"; + + src = fetchFromGitHub { + owner = "kpcyrd"; + repo = pname; + rev = "v${version}"; + sha256 = "0vyxlqwh90shihp80fk0plnkjix9i37n2dnypzyz6nx44xd5737s"; + }; + + cargoSha256 = "162p3a696k281cygqpl6gg4makwk2v0g2jnf1gd108dnz4jya11l"; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ libpcap libseccomp ]; + + meta = with lib; { + description = "Secure multithreaded packet sniffer"; + homepage = "https://github.com/kpcyrd/sniffglue"; + license = licenses.gpl3; + maintainers = with maintainers; [ xrelkd ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0771c887105..285ecd318f5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6619,6 +6619,8 @@ in libpng = libpng12; }; + sniffglue = callPackage ../tools/networking/sniffglue { }; + snort = callPackage ../applications/networking/ids/snort { }; soapui = callPackage ../applications/networking/soapui { }; -- cgit v1.2.3 From 07a85c01ac02d157dbad7ae59f1dc355a03d3913 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Wed, 15 Apr 2020 14:08:47 +0800 Subject: rshijack: init at 0.3.0 --- pkgs/tools/networking/rshijack/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/networking/rshijack/default.nix diff --git a/pkgs/tools/networking/rshijack/default.nix b/pkgs/tools/networking/rshijack/default.nix new file mode 100644 index 00000000000..59558028c01 --- /dev/null +++ b/pkgs/tools/networking/rshijack/default.nix @@ -0,0 +1,23 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "rshijack"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "kpcyrd"; + repo = pname; + rev = "v${version}"; + sha256 = "0y01hi3jpfawqlqs8ka0vwfhjw5j5gkhk2nz5m13ns2h27bw20v7"; + }; + + cargoSha256 = "0l1kavacnjvi22l6pawgkqqxnjaizi3pddqkhwjshw4pzzixzvli"; + + meta = with lib; { + description = "TCP connection hijacker"; + homepage = "https://github.com/kpcyrd/rshijack"; + license = licenses.gpl3; + maintainers = with maintainers; [ xrelkd ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26037d86c63..2cbfbd05d4e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6343,6 +6343,8 @@ in rrdtool = callPackage ../tools/misc/rrdtool { }; + rshijack = callPackage ../tools/networking/rshijack { }; + rsibreak = libsForQt5.callPackage ../applications/misc/rsibreak { }; rss2email = callPackage ../applications/networking/feedreaders/rss2email { -- cgit v1.2.3 From fbc11b4f025d95f1b3116ec4b594c0e558f46e90 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 29 Dec 2019 01:52:31 +0000 Subject: aflplusplus: init at 2.59c --- pkgs/tools/security/aflplusplus/default.nix | 138 +++++++++++++++++++++ pkgs/tools/security/aflplusplus/libdislocator.nix | 35 ++++++ pkgs/tools/security/aflplusplus/libtokencap.nix | 31 +++++ .../security/aflplusplus/qemu-no-etc-install.patch | 13 ++ pkgs/tools/security/aflplusplus/qemu.nix | 77 ++++++++++++ pkgs/top-level/all-packages.nix | 6 + 6 files changed, 300 insertions(+) create mode 100644 pkgs/tools/security/aflplusplus/default.nix create mode 100644 pkgs/tools/security/aflplusplus/libdislocator.nix create mode 100644 pkgs/tools/security/aflplusplus/libtokencap.nix create mode 100644 pkgs/tools/security/aflplusplus/qemu-no-etc-install.patch create mode 100644 pkgs/tools/security/aflplusplus/qemu.nix diff --git a/pkgs/tools/security/aflplusplus/default.nix b/pkgs/tools/security/aflplusplus/default.nix new file mode 100644 index 00000000000..a52ea88950c --- /dev/null +++ b/pkgs/tools/security/aflplusplus/default.nix @@ -0,0 +1,138 @@ +{ stdenv, fetchFromGitHub, callPackage, makeWrapper +, clang, llvm, gcc, which, libcgroup, python, perl, gmp +, wine ? null +}: + +# wine fuzzing is only known to work for win32 binaries, and using a mixture of +# 32 and 64-bit libraries ... complicates things, so it's recommended to build +# a full 32bit version of this package if you want to do wine fuzzing +assert (wine != null) -> (stdenv.targetPlatform.system == "i686-linux"); + +let + aflplusplus-qemu = callPackage ./qemu.nix { inherit aflplusplus; }; + qemu-exe-name = if stdenv.targetPlatform.system == "x86_64-linux" then "qemu-x86_64" + else if stdenv.targetPlatform.system == "i686-linux" then "qemu-i386" + else throw "aflplusplus: no support for ${stdenv.targetPlatform.system}!"; + libdislocator = callPackage ./libdislocator.nix { inherit aflplusplus; }; + libtokencap = callPackage ./libtokencap.nix { inherit aflplusplus; }; + aflplusplus = stdenv.mkDerivation rec { + pname = "aflplusplus"; + version = "2.59c"; + + src = fetchFromGitHub { + owner = "vanhauser-thc"; + repo = "AFLplusplus"; + rev = version; + sha256 = "1ik33ifk4n96762iv1h4kl4jf9yvsq2hgs097wkiy589siw44g5r"; + }; + enableParallelBuilding = true; + + # Note: libcgroup isn't needed for building, just for the afl-cgroup + # script. + nativeBuildInputs = [ makeWrapper which ]; + buildInputs = [ llvm python gmp ] + ++ stdenv.lib.optional (wine != null) python.pkgs.wrapPython; + + makeFlags = [ "PREFIX=$(out)" ]; + buildPhase = '' + common="$makeFlags -j$NIX_BUILD_CORES" + make all $common + make radamsa $common + make -C gcc_plugin CC=${gcc}/bin/gcc CXX=${gcc}/bin/g++ $common + make -C llvm_mode $common + make -C qemu_mode/libcompcov $common + make -C qemu_mode/unsigaction $common + ''; + + postInstall = '' + # the makefile neglects to install unsigaction + cp qemu_mode/unsigaction/unsigaction*.so $out/lib/afl/ + + # Install the custom QEMU emulator for binary blob fuzzing. + cp ${aflplusplus-qemu}/bin/${qemu-exe-name} $out/bin/afl-qemu-trace + + # give user a convenient way of accessing libcompconv.so, libdislocator.so, libtokencap.so + cat > $out/bin/get-afl-qemu-libcompcov-so < $out/bin/get-libdislocator-so < $out/bin/get-libtokencap-so < all.patch + ''; + + nativeBuildInputs = [ + python2 perl pkgconfig flex bison autoconf texinfo + ]; + + buildInputs = [ + zlib glib pixman libuuid + ]; + + enableParallelBuilding = true; + + patches = [ + # patches extracted from aflplusplus source + "../all.patch" + # nix-specific patches to make installation more well-behaved + ./qemu-no-etc-install.patch + ]; + + configureFlags = + [ "--disable-system" + "--enable-linux-user" + "--disable-gtk" + "--disable-sdl" + "--disable-vnc" + "--disable-kvm" + "--target-list=${cpuTarget}" + "--enable-pie" + "--sysconfdir=/etc" + "--localstatedir=/var" + ]; + + meta = with stdenv.lib; { + homepage = http://www.qemu.org/; + description = "Fork of QEMU with AFL++ instrumentation support"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ ris ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2be57aa3512..53933f7a0eb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -585,6 +585,12 @@ in stdenv = clangStdenv; }; + aflplusplus = callPackage ../tools/security/aflplusplus { + stdenv = clangStdenv; + python = python37; + wine = null; + }; + libdislocator = callPackage ../tools/security/afl/libdislocator.nix { }; afpfs-ng = callPackage ../tools/filesystems/afpfs-ng { }; -- cgit v1.2.3 From 94d88d3b70916f02ec86bf08945c20bdf5526cc2 Mon Sep 17 00:00:00 2001 From: Gabor Greif Date: Sat, 18 Apr 2020 19:26:40 +0200 Subject: wasmtime-0.12.0: fix cargoSha256 --- pkgs/development/interpreters/wasmtime/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 6bb17e70958..79222749dc4 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { fetchSubmodules = true; }; - cargoSha256 = "0wqd2yy6ih1rcz1fq7x3aiqq1ma2nmif1w8r8x0vpxjxk395zil9"; + cargoSha256 = "0vyxp74jlnrisk0kblsbj9d9a54wcgzbyjm7iqav1k4ns3syrnmh"; nativeBuildInputs = [ python cmake clang ]; buildInputs = [ llvmPackages.libclang ] ++ -- cgit v1.2.3 From 08d83c16416abecef6adcc051f3536076e133f64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sat, 18 Apr 2020 21:27:14 +0200 Subject: docker: add git to extraPath When building a docker container from git, docker was missing the git binary in $PATH. --- pkgs/applications/virtualization/docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 131d6d7675e..f1b3475d9bc 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, pkgconfig , go-md2man, go, containerd, runc, docker-proxy, tini, libtool , sqlite, iproute, lvm2, systemd -, btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs +, btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs, git , procps, libseccomp }: @@ -123,7 +123,7 @@ rec { outputs = ["out" "man"]; - extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux ]); + extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux git ]); installPhase = optionalString (stdenv.isLinux) '' install -Dm755 ./components/engine/bundles/dynbinary-daemon/dockerd $out/libexec/docker/dockerd -- cgit v1.2.3 From 16c6b2de8d004ef429c4634342b2e34eb8a3c870 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 18 Apr 2020 22:18:11 +0200 Subject: gitAndTools.delta: 0.0.17 -> 0.0.18 https://github.com/dandavison/delta/releases/tag/0.0.18 --- .../version-management/git-and-tools/delta/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index dff06d384dc..7bdeae65899 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -1,17 +1,20 @@ -{ lib, fetchFromGitHub, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform, llvmPackages }: rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.0.17"; + version = "0.0.18"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "1j01h60snciqp4psyxf67j3gbmi02c1baprsg9frzjacawbx8cz7"; + sha256 = "0cpd60861k9nd2gbzyb2hg5npnkgvsnyrvv7mlm30vb1833gz94z"; }; - cargoSha256 = "176bfd57gc9casvk0p10ilvzw3q3rkkv7qflja778vrwr9zrmkzq"; + LLVM_CONFIG_PATH = "${llvmPackages.llvm}/bin/llvm-config"; + LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; + + cargoSha256 = "12gl50q5hf6nq571fqxfv61z4mwfjyw4jb2yqyqbsinwj2frwaxn"; meta = with lib; { homepage = "https://github.com/dandavison/delta"; -- cgit v1.2.3 From f63bc540cbd559736f1671e4ee10e4560b3d5d2a Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 15 Apr 2020 03:12:54 +0900 Subject: flashplayer: 32.0.0.344 -> 32.0.0.363 --- pkgs/applications/networking/browsers/chromium/plugins.nix | 4 ++-- .../browsers/mozilla-plugins/flashplayer/default.nix | 10 +++++----- .../browsers/mozilla-plugins/flashplayer/standalone.nix | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 434bd77b6d1..1dd9baa628a 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -45,11 +45,11 @@ let flash = stdenv.mkDerivation rec { pname = "flashplayer-ppapi"; - version = "32.0.0.344"; + version = "32.0.0.363"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "05ijlgsby9zxx0qs6f3vav1z0p6xr1cg6idl4akxvfmsl6hn6hkq"; + sha256 = "0znk8an892mykgbz56hyv3gz65vc9mhb3vn96c6bsvicwl1fn460"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix index 0cf73512fcb..6672a75d574 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix @@ -74,7 +74,7 @@ let in stdenv.mkDerivation rec { pname = "flashplayer"; - version = "32.0.0.344"; + version = "32.0.0.363"; src = fetchurl { url = @@ -85,14 +85,14 @@ stdenv.mkDerivation rec { sha256 = if debug then if arch == "x86_64" then - "1kkwijxlcs1rlqxr1vj51h95fwwrp5m0c9lngqpncgmmhh8v9dyr" + "06711k4vbn6mqfd8gvx2snsxyalhw15hn5b64sja8726z5rxvzy7" else - "0r47s19fw7gsph73rd5jb2zfsjwz7mjawm6c49rir9rsa0zxrsks" + "0v584aqhy4xk08afi3ypkq4mqjq57y136z82i5ixyim88dqbaf4f" else if arch == "x86_64" then - "1ki3i7zw0q48xf01xjfm1mpizc5flk768p9hqxpg881r4h65dh6b" + "1g1ijxypm8a8mfc1x58gksmaakqpp7xmf277wiir8zqjn3vd6c64" else - "1v527i60sljwyvv4l1kg9ml05skjgm3naynlswd35hsz258jnxl4"; + "13nbxmqmbxqvdhdwdqimim2f9fz3y2vrsx6b3pck6352m4i4wzh8"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix index 64dd87c4ace..3661f6edb53 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation { pname = "flashplayer-standalone"; - version = "32.0.0.344"; + version = "32.0.0.363"; src = fetchurl { url = @@ -60,9 +60,9 @@ stdenv.mkDerivation { "https://fpdownload.macromedia.com/pub/flashplayer/updaters/32/flash_player_sa_linux.x86_64.tar.gz"; sha256 = if debug then - "1ymsk07xmnanyv86r58ar1l4wgjarlq0fc111ajc76pp8dsxnfx8" + "03zhza8lvc1nvz3racwfsajfd6rnbw3g56dp5wvr1qmaps8xaaqg" else - "0wiwpn4a0jxslw4ahalq74rksn82y0aqa3lrjr9qs7kdcak74vky"; + "0bhp7jv2l2agfzr8m564k749a5g75dw1390phlwvf49n1h8ldap2"; }; nativeBuildInputs = [ unzip ]; -- cgit v1.2.3 From 2c45fa52a42c50cf3cd2dcc6483d2ed19d733025 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 18 Apr 2020 23:13:20 +0200 Subject: lib/licenses: use https where possible --- lib/licenses.nix | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index 1f78d67a1b2..94bcd777f0d 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -2,7 +2,7 @@ let spdx = lic: lic // { - url = "http://spdx.org/licenses/${lic.spdxId}.html"; + url = "https://spdx.org/licenses/${lic.spdxId}.html"; }; in @@ -40,13 +40,13 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { amazonsl = { fullName = "Amazon Software License"; - url = "http://aws.amazon.com/asl/"; + url = "https://aws.amazon.com/asl/"; free = false; }; amd = { fullName = "AMD License Agreement"; - url = "http://developer.amd.com/amd-license-agreement/"; + url = "https://developer.amd.com/amd-license-agreement/"; free = false; }; @@ -230,7 +230,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { eapl = { fullName = "EPSON AVASYS PUBLIC LICENSE"; - url = "http://avasys.jp/hp/menu000000700/hpg000000603.htm"; + url = "https://avasys.jp/hp/menu000000700/hpg000000603.htm"; free = false; }; @@ -293,7 +293,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { ffsl = { fullName = "Floodgap Free Software License"; - url = "http://www.floodgap.com/software/ffsl/license.html"; + url = "https://www.floodgap.com/software/ffsl/license.html"; free = false; }; @@ -370,7 +370,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { # Intel's license, seems free iasl = { fullName = "iASL"; - url = "http://www.calculate-linux.org/packages/licenses/iASL"; + url = "https://old.calculate-linux.org/packages/licenses/iASL"; }; ijg = spdx { @@ -385,13 +385,13 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { inria-compcert = { fullName = "INRIA Non-Commercial License Agreement for the CompCert verified compiler"; - url = "http://compcert.inria.fr/doc/LICENSE"; + url = "http://compcert.inria.fr/doc/LICENSE"; # https is broken free = false; }; inria-icesl = { fullName = "INRIA Non-Commercial License Agreement for IceSL"; - url = "http://shapeforge.loria.fr/icesl/EULA_IceSL_binary.pdf"; + url = "http://shapeforge.loria.fr/icesl/EULA_IceSL_binary.pdf"; # https is broken free = false; }; @@ -469,7 +469,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { llgpl21 = { fullName = "Lisp LGPL; GNU Lesser General Public License version 2.1 with Franz Inc. preamble for clarification of LGPL terms in context of Lisp"; - url = "http://opensource.franz.com/preamble.html"; + url = "https://opensource.franz.com/preamble.html"; }; lppl12 = spdx { @@ -493,7 +493,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { }; # spdx.org does not (yet) differentiate between the X11 and Expat versions - # for details see http://en.wikipedia.org/wiki/MIT_License#Various_versions + # for details see https://en.wikipedia.org/wiki/MIT_License#Various_versions mit = spdx { spdxId = "MIT"; fullName = "MIT License"; @@ -596,7 +596,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { psfl = spdx { spdxId = "Python-2.0"; fullName = "Python Software Foundation License version 2"; - #url = "http://docs.python.org/license.html"; + url = "https://docs.python.org/license.html"; }; publicDomain = { @@ -620,7 +620,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { qwt = { fullName = "Qwt License, Version 1.0"; - url = "http://qwt.sourceforge.net/qwtlicense.html"; + url = "https://qwt.sourceforge.io/qwtlicense.html"; }; ruby = spdx { @@ -646,7 +646,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { smail = { shortName = "smail"; fullName = "SMAIL General Public License"; - url = "http://metadata.ftp-master.debian.org/changelogs/main/d/debianutils/debianutils_4.8.1_copyright"; + url = "https://sources.debian.org/copyright/license/debianutils/4.9.1/"; }; sspl = { @@ -663,7 +663,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { ufl = { fullName = "Ubuntu Font License 1.0"; - url = "http://font.ubuntu.com/ufl/ubuntu-font-licence-1.0.txt"; + url = "https://ubuntu.com/legal/font-licence"; }; unfree = { @@ -740,7 +740,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { xfig = { fullName = "xfig"; - url = "http://mcj.sourceforge.net/authors.html#xfig"; + url = "http://mcj.sourceforge.net/authors.html#xfig"; # https is broken }; zlib = spdx { -- cgit v1.2.3 From 592e433496b02acf119b1f8b2341c9ba5644d6de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Sat, 31 Aug 2019 01:21:13 +0200 Subject: licenses: add EUPL-1.2 --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 1f78d67a1b2..3d5238b64c1 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -271,6 +271,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { fullName = "European Union Public License 1.1"; }; + eupl12 = spdx { + spdxId = "EUPL-1.2"; + fullName = "European Union Public License 1.2"; + }; + fdl12 = spdx { spdxId = "GFDL-1.2-only"; fullName = "GNU Free Documentation License v1.2 only"; -- cgit v1.2.3 From 9c83defd29bbadc44beda0ae0e148bc915659396 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Thu, 27 Feb 2020 21:43:54 +0100 Subject: AusweisApp2: init at 1.20.0 --- pkgs/applications/misc/ausweisapp2/default.nix | 27 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/misc/ausweisapp2/default.nix diff --git a/pkgs/applications/misc/ausweisapp2/default.nix b/pkgs/applications/misc/ausweisapp2/default.nix new file mode 100644 index 00000000000..953e12a033d --- /dev/null +++ b/pkgs/applications/misc/ausweisapp2/default.nix @@ -0,0 +1,27 @@ +{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, pcsclite, qtsvg, qttools, qtwebsockets +, qtquickcontrols2, qtgraphicaleffects }: + +mkDerivation rec { + pname = "AusweisApp2"; + version = "1.20.0"; + + src = fetchFromGitHub { + owner = "Governikus"; + repo = "AusweisApp2"; + rev = "${version}"; + sha256 = "0qkwdaxhig4qjim7h20j6ln6w76ycppfc786nd8l69bd1qv46m40"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ qtsvg qttools qtwebsockets qtquickcontrols2 qtgraphicaleffects pcsclite ]; + + meta = with stdenv.lib; { + description = "Authentication software for the German ID card"; + downloadPage = "https://github.com/Governikus/AusweisApp2/releases"; + homepage = "https://www.ausweisapp.bund.de/ausweisapp2/"; + license = licenses.eupl12; + maintainers = with maintainers; [ b4dm4n ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad4bb9f8a97..9f3f8a61966 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18538,6 +18538,8 @@ in aesop = callPackage ../applications/office/aesop { }; + AusweisApp2 = libsForQt5.callPackage ../applications/misc/ausweisapp2 { }; + avidemux = libsForQt5.callPackage ../applications/video/avidemux { }; avrdudess = callPackage ../applications/misc/avrdudess { }; -- cgit v1.2.3 From dc7ed066152f88ca5f9928db6165f62bf4f957b5 Mon Sep 17 00:00:00 2001 From: dadada Date: Sun, 29 Mar 2020 22:39:14 +0200 Subject: nixos/dokuwiki: add option Enables multi-site configurations. This break compatibility with prior configurations that expect options for a single dokuwiki instance in `services.dokuwiki`. --- nixos/modules/services/web-apps/dokuwiki.nix | 158 ++++++++++++++++----------- nixos/tests/dokuwiki.nix | 51 +++++---- 2 files changed, 129 insertions(+), 80 deletions(-) diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index 07af7aa0dfe..df0a5787f15 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -3,13 +3,15 @@ let inherit (lib) mkEnableOption mkForce mkIf mkMerge mkOption optionalAttrs recursiveUpdate types; + inherit (lib) flatten mapAttrs mapAttrs' mapAttrsToList nameValuePair; - cfg = config.services.dokuwiki; + eachSite = config.services.dokuwiki; + stateDir = cfg: "/var/lib/dokuwiki/${cfg.hostName}"; user = config.services.nginx.user; group = config.services.nginx.group; - dokuwikiAclAuthConfig = pkgs.writeText "acl.auth.php" '' + dokuwikiAclAuthConfig = cfg: pkgs.writeText "acl.auth.php" '' # acl.auth.php # # @@ -18,24 +20,50 @@ let ${toString cfg.acl} ''; - dokuwikiLocalConfig = pkgs.writeText "local.php" '' + dokuwikiLocalConfig = cfg: pkgs.writeText "local.php" '' (cfg.acl != null || cfg.aclFile != null); - message = "Either services.dokuwiki.acl or services.dokuwiki.aclFile is mandatory when aclUse is true"; - } - { - assertion = cfg.usersFile != null -> cfg.aclUse != false; - message = "services.dokuwiki.aclUse must be true when usersFile is not null"; - } - ]; - - services.phpfpm.pools.dokuwiki = { - inherit user; - inherit group; - phpEnv = { - DOKUWIKI_LOCAL_CONFIG = "${dokuwikiLocalConfig}"; - DOKUWIKI_PLUGINS_LOCAL_CONFIG = "${dokuwikiPluginsLocalConfig}"; - } //optionalAttrs (cfg.usersFile != null) { - DOKUWIKI_USERS_AUTH_CONFIG = "${cfg.usersFile}"; - } //optionalAttrs (cfg.aclUse) { - DOKUWIKI_ACL_AUTH_CONFIG = if (cfg.acl != null) then "${dokuwikiAclAuthConfig}" else "${toString cfg.aclFile}"; - }; - - settings = { - "listen.mode" = "0660"; - "listen.owner" = user; - "listen.group" = group; - } // cfg.poolConfig; - }; + config = mkIf (eachSite != {}) { + + warnings = mapAttrsToList (hostName: cfg: mkIf (cfg.superUser == null) "Not setting services.dokuwiki.${hostName} superUser will impair your ability to administer DokuWiki") eachSite; + + assertions = flatten (mapAttrsToList (hostName: cfg: + [{ + assertion = cfg.aclUse -> (cfg.acl != null || cfg.aclFile != null); + message = "Either services.dokuwiki.${hostName}.acl or services.dokuwiki.${hostName}.aclFile is mandatory when aclUse is true"; + } + { + assertion = cfg.usersFile != null -> cfg.aclUse != false; + message = "services.dokuwiki.${hostName}.aclUse must be true when usersFile is not null"; + }]) eachSite); + + services.phpfpm.pools = mapAttrs' (hostName: cfg: ( + nameValuePair "dokuwiki-${hostName}" { + inherit user; + inherit group; + phpEnv = { + DOKUWIKI_LOCAL_CONFIG = "${dokuwikiLocalConfig cfg}"; + DOKUWIKI_PLUGINS_LOCAL_CONFIG = "${dokuwikiPluginsLocalConfig cfg}"; + } //optionalAttrs (cfg.usersFile != null) { + DOKUWIKI_USERS_AUTH_CONFIG = "${cfg.usersFile}"; + } //optionalAttrs (cfg.aclUse) { + DOKUWIKI_ACL_AUTH_CONFIG = if (cfg.acl != null) then "${dokuwikiAclAuthConfig cfg}" else "${toString cfg.aclFile}"; + }; + + settings = { + "listen.mode" = "0660"; + "listen.owner" = user; + "listen.group" = group; + } // cfg.poolConfig; + })) eachSite; services.nginx = { enable = true; - virtualHosts = { - ${cfg.hostName} = mkMerge [ cfg.nginx { - root = mkForce "${pkgs.dokuwiki}/share/dokuwiki/"; + virtualHosts = mapAttrs (hostName: cfg: mkMerge [ cfg.nginx { + root = mkForce "${pkg hostName cfg}/share/dokuwiki/"; extraConfig = "fastcgi_param HTTPS on;"; locations."~ /(conf/|bin/|inc/|install.php)" = { @@ -246,27 +284,25 @@ in include ${pkgs.nginx}/conf/fastcgi_params; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param REDIRECT_STATUS 200; - fastcgi_pass unix:${config.services.phpfpm.pools.dokuwiki.socket}; + fastcgi_pass unix:${config.services.phpfpm.pools."dokuwiki-${hostName}".socket}; fastcgi_param HTTPS on; ''; }; - }]; + }]) eachSite; }; - }; - - systemd.tmpfiles.rules = [ - "d ${cfg.stateDir}/attic 0750 ${user} ${group} - -" - "d ${cfg.stateDir}/cache 0750 ${user} ${group} - -" - "d ${cfg.stateDir}/index 0750 ${user} ${group} - -" - "d ${cfg.stateDir}/locks 0750 ${user} ${group} - -" - "d ${cfg.stateDir}/media 0750 ${user} ${group} - -" - "d ${cfg.stateDir}/media_attic 0750 ${user} ${group} - -" - "d ${cfg.stateDir}/media_meta 0750 ${user} ${group} - -" - "d ${cfg.stateDir}/meta 0750 ${user} ${group} - -" - "d ${cfg.stateDir}/pages 0750 ${user} ${group} - -" - "d ${cfg.stateDir}/tmp 0750 ${user} ${group} - -" - ]; + systemd.tmpfiles.rules = flatten (mapAttrsToList (hostName: cfg: [ + "d ${stateDir cfg}/attic 0750 ${user} ${group} - -" + "d ${stateDir cfg}/cache 0750 ${user} ${group} - -" + "d ${stateDir cfg}/index 0750 ${user} ${group} - -" + "d ${stateDir cfg}/locks 0750 ${user} ${group} - -" + "d ${stateDir cfg}/media 0750 ${user} ${group} - -" + "d ${stateDir cfg}/media_attic 0750 ${user} ${group} - -" + "d ${stateDir cfg}/media_meta 0750 ${user} ${group} - -" + "d ${stateDir cfg}/meta 0750 ${user} ${group} - -" + "d ${stateDir cfg}/pages 0750 ${user} ${group} - -" + "d ${stateDir cfg}/tmp 0750 ${user} ${group} - -" + ]) eachSite); }; } diff --git a/nixos/tests/dokuwiki.nix b/nixos/tests/dokuwiki.nix index 38bde10f47e..65d2677dd3a 100644 --- a/nixos/tests/dokuwiki.nix +++ b/nixos/tests/dokuwiki.nix @@ -1,29 +1,42 @@ -import ./make-test-python.nix ({ lib, ... }: - -with lib; +import ./make-test-python.nix ({ pkgs, ... }: { name = "dokuwiki"; - meta.maintainers = with maintainers; [ maintainers."1000101" ]; - - nodes.machine = - { pkgs, ... }: - { services.dokuwiki = { - enable = true; - acl = " "; - superUser = null; - nginx = { - forceSSL = false; - enableACME = false; - }; - }; + meta.maintainers = with pkgs.lib.maintainers; [ "1000101" ]; + + machine = { ... }: { + services.dokuwiki."site1.local" = { + acl = " "; + superUser = null; + nginx = { + forceSSL = false; + enableACME = false; + }; }; + services.dokuwiki."site2.local" = { + acl = " "; + superUser = null; + nginx = { + forceSSL = false; + enableACME = false; + }; + }; + networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ]; + }; testScript = '' - machine.start() - machine.wait_for_unit("phpfpm-dokuwiki.service") + site_names = ["site1.local", "site2.local"] + + start_all() + + machine.wait_for_unit("phpfpm-dokuwiki-site1.local.service") + machine.wait_for_unit("phpfpm-dokuwiki-site2.local.service") + machine.wait_for_unit("nginx.service") + machine.wait_for_open_port(80) - machine.succeed("curl -sSfL http://localhost/ | grep 'DokuWiki'") + + machine.succeed("curl -sSfL http://site1.local/ | grep 'DokuWiki'") + machine.succeed("curl -sSfL http://site2.local/ | grep 'DokuWiki'") ''; }) -- cgit v1.2.3 From 71baf4801c6918bcbac976bd68e502d89d90ddfc Mon Sep 17 00:00:00 2001 From: dadada Date: Mon, 30 Mar 2020 13:00:35 +0200 Subject: nixos/dokuwiki: refactor --- nixos/modules/services/web-apps/dokuwiki.nix | 319 +++++++++++++-------------- 1 file changed, 158 insertions(+), 161 deletions(-) diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index df0a5787f15..6378cf6507c 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -53,148 +53,147 @@ let ''; }; - siteOpts = {lib, name, ...}: - { - options = { - enable = mkEnableOption "DokuWiki web application."; + siteOpts = {lib, name, ...}: { + options = { + enable = mkEnableOption "DokuWiki web application."; + + package = mkOption { + type = types.package; + default = pkgs.dokuwiki; + description = "Which dokuwiki package to use."; + }; - package = mkOption { - type = types.package; - default = pkgs.dokuwiki; - description = "Which dokuwiki package to use."; - }; + hostName = mkOption { + type = types.str; + default = "localhost"; + description = "FQDN for the instance."; + }; - hostName = mkOption { - type = types.str; - default = "localhost"; - description = "FQDN for the instance."; - }; + stateDir = mkOption { + type = types.path; + default = "/var/lib/dokuwiki/${name}/data"; + description = "Location of the dokuwiki state directory."; + }; - stateDir = mkOption { - type = types.path; - default = "/var/lib/dokuwiki/${name}/data"; - description = "Location of the dokuwiki state directory."; - }; + acl = mkOption { + type = types.nullOr types.lines; + default = null; + example = "* @ALL 8"; + description = '' + Access Control Lists: see + Mutually exclusive with services.dokuwiki.aclFile + Set this to a value other than null to take precedence over aclFile option. + ''; + }; - acl = mkOption { - type = types.nullOr types.lines; - default = null; - example = "* @ALL 8"; - description = '' - Access Control Lists: see - Mutually exclusive with services.dokuwiki.aclFile - Set this to a value other than null to take precedence over aclFile option. - ''; - }; + aclFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Location of the dokuwiki acl rules. Mutually exclusive with services.dokuwiki.acl + Mutually exclusive with services.dokuwiki.acl which is preferred. + Consult documentation for further instructions. + Example: + ''; + }; - aclFile = mkOption { - type = types.nullOr types.path; - default = null; - description = '' - Location of the dokuwiki acl rules. Mutually exclusive with services.dokuwiki.acl - Mutually exclusive with services.dokuwiki.acl which is preferred. - Consult documentation for further instructions. - Example: - ''; - }; + aclUse = mkOption { + type = types.bool; + default = true; + description = '' + Necessary for users to log in into the system. + Also limits anonymous users. When disabled, + everyone is able to create and edit content. + ''; + }; - aclUse = mkOption { - type = types.bool; - default = true; - description = '' - Necessary for users to log in into the system. - Also limits anonymous users. When disabled, - everyone is able to create and edit content. - ''; - }; + pluginsConfig = mkOption { + type = types.lines; + default = '' + $plugins['authad'] = 0; + $plugins['authldap'] = 0; + $plugins['authmysql'] = 0; + $plugins['authpgsql'] = 0; + ''; + description = '' + List of the dokuwiki (un)loaded plugins. + ''; + }; - pluginsConfig = mkOption { - type = types.lines; - default = '' - $plugins['authad'] = 0; - $plugins['authldap'] = 0; - $plugins['authmysql'] = 0; - $plugins['authpgsql'] = 0; - ''; - description = '' - List of the dokuwiki (un)loaded plugins. - ''; - }; + superUser = mkOption { + type = types.nullOr types.str; + default = "@admin"; + description = '' + You can set either a username, a list of usernames (“admin1,admin2”), + or the name of a group by prepending an @ char to the groupname + Consult documentation for further instructions. + ''; + }; - superUser = mkOption { - type = types.nullOr types.str; - default = "@admin"; - description = '' - You can set either a username, a list of usernames (“admin1,admin2”), - or the name of a group by prepending an @ char to the groupname - Consult documentation for further instructions. - ''; - }; + usersFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Location of the dokuwiki users file. List of users. Format: + login:passwordhash:Real Name:email:groups,comma,separated + Create passwordHash easily by using:$ mkpasswd -5 password `pwgen 8 1` + Example: + ''; + }; - usersFile = mkOption { - type = types.nullOr types.path; - default = null; - description = '' - Location of the dokuwiki users file. List of users. Format: - login:passwordhash:Real Name:email:groups,comma,separated - Create passwordHash easily by using:$ mkpasswd -5 password `pwgen 8 1` - Example: + extraConfig = mkOption { + type = types.nullOr types.lines; + default = null; + example = '' + $conf['title'] = 'My Wiki'; + $conf['userewrite'] = 1; ''; - }; - - extraConfig = mkOption { - type = types.nullOr types.lines; - default = null; - example = '' - $conf['title'] = 'My Wiki'; - $conf['userewrite'] = 1; - ''; - description = '' - DokuWiki configuration. Refer to - - for details on supported values. - ''; - }; + description = '' + DokuWiki configuration. Refer to + + for details on supported values. + ''; + }; - poolConfig = mkOption { - type = with types; attrsOf (oneOf [ str int bool ]); - default = { - "pm" = "dynamic"; - "pm.max_children" = 32; - "pm.start_servers" = 2; - "pm.min_spare_servers" = 2; - "pm.max_spare_servers" = 4; - "pm.max_requests" = 500; + poolConfig = mkOption { + type = with types; attrsOf (oneOf [ str int bool ]); + default = { + "pm" = "dynamic"; + "pm.max_children" = 32; + "pm.start_servers" = 2; + "pm.min_spare_servers" = 2; + "pm.max_spare_servers" = 4; + "pm.max_requests" = 500; + }; + description = '' + Options for the dokuwiki PHP pool. See the documentation on php-fpm.conf + for details on configuration directives. + ''; }; - description = '' - Options for the dokuwiki PHP pool. See the documentation on php-fpm.conf - for details on configuration directives. - ''; - }; - nginx = mkOption { - type = types.submodule ( - recursiveUpdate - (import ../web-servers/nginx/vhost-options.nix { inherit config lib; }) - { - # Enable encryption by default, - options.forceSSL.default = true; - options.enableACME.default = true; - } - ); - default = {forceSSL = true; enableACME = true;}; - example = { - serverAliases = [ - "wiki.\${config.networking.domain}" - ]; - enableACME = false; + nginx = mkOption { + type = types.submodule ( + recursiveUpdate + (import ../web-servers/nginx/vhost-options.nix { inherit config lib; }) + { + # Enable encryption by default, + options.forceSSL.default = true; + options.enableACME.default = true; + } + ); + default = {forceSSL = true; enableACME = true;}; + example = { + serverAliases = [ + "wiki.\${config.networking.domain}" + ]; + enableACME = false; + }; + description = '' + With this option, you can customize the nginx virtualHost which already has sensible defaults for DokuWiki. + ''; }; - description = '' - With this option, you can customize the nginx virtualHost which already has sensible defaults for DokuWiki. - ''; }; }; - }; in { # interface @@ -244,52 +243,51 @@ in services.nginx = { enable = true; - - virtualHosts = mapAttrs (hostName: cfg: mkMerge [ cfg.nginx { - root = mkForce "${pkg hostName cfg}/share/dokuwiki/"; - extraConfig = "fastcgi_param HTTPS on;"; - - locations."~ /(conf/|bin/|inc/|install.php)" = { - extraConfig = "deny all;"; - }; - - locations."~ ^/data/" = { - root = "${cfg.stateDir}"; - extraConfig = "internal;"; - }; - - locations."~ ^/lib.*\.(js|css|gif|png|ico|jpg|jpeg)$" = { - extraConfig = "expires 365d;"; - }; - - locations."/" = { - priority = 1; - index = "doku.php"; - extraConfig = ''try_files $uri $uri/ @dokuwiki;''; - }; - - locations."@dokuwiki" = { - extraConfig = '' + virtualHosts = mapAttrs (hostName: cfg: mkMerge [ cfg.nginx { + root = mkForce "${pkg hostName cfg}/share/dokuwiki/"; + extraConfig = "fastcgi_param HTTPS on;"; + + locations."~ /(conf/|bin/|inc/|install.php)" = { + extraConfig = "deny all;"; + }; + + locations."~ ^/data/" = { + root = "${cfg.stateDir}"; + extraConfig = "internal;"; + }; + + locations."~ ^/lib.*\.(js|css|gif|png|ico|jpg|jpeg)$" = { + extraConfig = "expires 365d;"; + }; + + locations."/" = { + priority = 1; + index = "doku.php"; + extraConfig = ''try_files $uri $uri/ @dokuwiki;''; + }; + + locations."@dokuwiki" = { + extraConfig = '' # rewrites "doku.php/" out of the URLs if you set the userwrite setting to .htaccess in dokuwiki config page rewrite ^/_media/(.*) /lib/exe/fetch.php?media=$1 last; rewrite ^/_detail/(.*) /lib/exe/detail.php?media=$1 last; rewrite ^/_export/([^/]+)/(.*) /doku.php?do=export_$1&id=$2 last; rewrite ^/(.*) /doku.php?id=$1&$args last; - ''; - }; + ''; + }; - locations."~ \.php$" = { - extraConfig = '' + locations."~ \.php$" = { + extraConfig = '' try_files $uri $uri/ /doku.php; include ${pkgs.nginx}/conf/fastcgi_params; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param REDIRECT_STATUS 200; fastcgi_pass unix:${config.services.phpfpm.pools."dokuwiki-${hostName}".socket}; fastcgi_param HTTPS on; - ''; - }; - }]) eachSite; - }; + ''; + }; + }]) eachSite; + }; systemd.tmpfiles.rules = flatten (mapAttrsToList (hostName: cfg: [ "d ${stateDir cfg}/attic 0750 ${user} ${group} - -" @@ -303,6 +301,5 @@ in "d ${stateDir cfg}/pages 0750 ${user} ${group} - -" "d ${stateDir cfg}/tmp 0750 ${user} ${group} - -" ]) eachSite); - }; } -- cgit v1.2.3 From af6a7a04869889b470c4dad6e0adc57482818d3a Mon Sep 17 00:00:00 2001 From: dadada Date: Mon, 30 Mar 2020 13:08:16 +0200 Subject: nixos/dokuwiki: add plugins and templates options Adds support for additional plugins and templates similarly to how wordpress.nix does it. Plugins and templates need to be packaged as in the example. --- nixos/modules/services/web-apps/dokuwiki.nix | 61 +++++++++++++++++++++++++++- nixos/tests/dokuwiki.nix | 38 +++++++++++++++-- 2 files changed, 95 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index 6378cf6507c..7587c744ad5 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -3,7 +3,7 @@ let inherit (lib) mkEnableOption mkForce mkIf mkMerge mkOption optionalAttrs recursiveUpdate types; - inherit (lib) flatten mapAttrs mapAttrs' mapAttrsToList nameValuePair; + inherit (lib) concatMapStringsSep flatten mapAttrs mapAttrs' mapAttrsToList nameValuePair concatMapStringSep; eachSite = config.services.dokuwiki; stateDir = cfg: "/var/lib/dokuwiki/${cfg.hostName}"; @@ -50,6 +50,10 @@ let # symlink acl ln -s ${dokuwikiAclAuthConfig cfg} $out/share/dokuwiki/acl.auth.php + + # symlink additional plugin(s) and templates(s) + ${concatMapStringsSep "\n" (template: "ln -s ${template} $out/share/dokuwiki/lib/tpl/${template.name}") cfg.templates} + ${concatMapStringsSep "\n" (plugin: "ln -s ${plugin} $out/share/dokuwiki/lib/plugins/${plugin.name}") cfg.plugins} ''; }; @@ -155,6 +159,61 @@ let ''; }; + plugins = mkOption { + type = types.listOf types.path; + default = []; + description = '' + List of path(s) to respective plugin(s) which are copied from the 'plugin' directory. + These plugins need to be packaged before use, see example. + ''; + example = '' + # Let's package the icalevents plugin + plugin-icalevents = pkgs.stdenv.mkDerivation { + name = "icalevents"; + # Download the plugin from the dokuwiki site + src = pkgs.fetchurl { + url = https://github.com/real-or-random/dokuwiki-plugin-icalevents/releases/download/2017-06-16/dokuwiki-plugin-icalevents-2017-06-16.zip; + sha256 = "e40ed7dd6bbe7fe3363bbbecb4de481d5e42385b5a0f62f6a6ce6bf3a1f9dfa8"; + }; + sourceRoot = "."; + # We need unzip to build this package + buildInputs = [ pkgs.unzip ]; + # Installing simply means copying all files to the output directory + installPhase = "mkdir -p $out; cp -R * $out/"; + }; + + # And then pass this theme to the plugin list like this: + plugins = [ plugin-icalevents ]; + ''; + }; + + templates = mkOption { + type = types.listOf types.path; + default = []; + description = '' + List of path(s) to respective template(s) which are copied from the 'tpl' directory. + These templates need to be packaged before use, see example. + ''; + example = '' + # Let's package the bootstrap3 theme + template-bootstrap3 = pkgs.stdenv.mkDerivation { + name = "bootstrap3"; + # Download the theme from the dokuwiki site + src = pkgs.fetchurl { + url = https://github.com/giterlizzi/dokuwiki-template-bootstrap3/archive/v2019-05-22.zip; + sha256 = "4de5ff31d54dd61bbccaf092c9e74c1af3a4c53e07aa59f60457a8f00cfb23a6"; + }; + # We need unzip to build this package + buildInputs = [ pkgs.unzip ]; + # Installing simply means copying all files to the output directory + installPhase = "mkdir -p $out; cp -R * $out/"; + }; + + # And then pass this theme to the template list like this: + templates = [ template-bootstrap3 ]; + ''; + }; + poolConfig = mkOption { type = with types; attrsOf (oneOf [ str int bool ]); default = { diff --git a/nixos/tests/dokuwiki.nix b/nixos/tests/dokuwiki.nix index 65d2677dd3a..62d8ec9f0b1 100644 --- a/nixos/tests/dokuwiki.nix +++ b/nixos/tests/dokuwiki.nix @@ -1,13 +1,43 @@ import ./make-test-python.nix ({ pkgs, ... }: -{ +let + template-bootstrap3 = pkgs.stdenv.mkDerivation { + name = "bootstrap3"; + # Download the theme from the dokuwiki site + src = pkgs.fetchurl { + url = https://github.com/giterlizzi/dokuwiki-template-bootstrap3/archive/v2019-05-22.zip; + sha256 = "4de5ff31d54dd61bbccaf092c9e74c1af3a4c53e07aa59f60457a8f00cfb23a6"; + }; + # We need unzip to build this package + buildInputs = [ pkgs.unzip ]; + # Installing simply means copying all files to the output directory + installPhase = "mkdir -p $out; cp -R * $out/"; + }; + + + # Let's package the icalevents plugin + plugin-icalevents = pkgs.stdenv.mkDerivation { + name = "icalevents"; + # Download the plugin from the dokuwiki site + src = pkgs.fetchurl { + url = https://github.com/real-or-random/dokuwiki-plugin-icalevents/releases/download/2017-06-16/dokuwiki-plugin-icalevents-2017-06-16.zip; + sha256 = "e40ed7dd6bbe7fe3363bbbecb4de481d5e42385b5a0f62f6a6ce6bf3a1f9dfa8"; + }; + # We need unzip to build this package + buildInputs = [ pkgs.unzip ]; + sourceRoot = "."; + # Installing simply means copying all files to the output directory + installPhase = "mkdir -p $out; cp -R * $out/"; + }; + +in { name = "dokuwiki"; meta.maintainers = with pkgs.lib.maintainers; [ "1000101" ]; machine = { ... }: { services.dokuwiki."site1.local" = { acl = " "; - superUser = null; + superUser = "admin"; nginx = { forceSSL = false; enableACME = false; @@ -15,11 +45,13 @@ import ./make-test-python.nix ({ pkgs, ... }: }; services.dokuwiki."site2.local" = { acl = " "; - superUser = null; + superUser = "admin"; nginx = { forceSSL = false; enableACME = false; }; + templates = [ template-bootstrap3 ]; + plugins = [ plugin-icalevents ]; }; networking.hosts."127.0.0.1" = [ "site1.local" "site2.local" ]; }; -- cgit v1.2.3 From 0228046eec7ce930d6532e205ad92435a2983f98 Mon Sep 17 00:00:00 2001 From: dadada Date: Mon, 30 Mar 2020 20:50:32 +0200 Subject: nixos/dokuwiki: add assertion for usersFile --- nixos/modules/services/web-apps/dokuwiki.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index 7587c744ad5..fa7462a97bd 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -278,6 +278,10 @@ in { assertion = cfg.usersFile != null -> cfg.aclUse != false; message = "services.dokuwiki.${hostName}.aclUse must be true when usersFile is not null"; + } + { + assertion = cfg.aclUse -> cfg.usersFile != null; + message = "services.dokuwiki.${hostName}.usersFile must be set if aclUse is true"; }]) eachSite); services.phpfpm.pools = mapAttrs' (hostName: cfg: ( -- cgit v1.2.3 From a58dc30d34ebcb2a85e45a0d827497e85339970b Mon Sep 17 00:00:00 2001 From: dadada Date: Mon, 30 Mar 2020 22:04:52 +0200 Subject: nixos/dokuwiki: set default value for usersFile If usersFile is not set, a file is created along the stateDir that can hold the users and supports dynamically adding users using the web GUI. --- nixos/modules/services/web-apps/dokuwiki.nix | 32 ++++++++++++---------------- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index fa7462a97bd..6670f32c16a 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -6,7 +6,6 @@ let inherit (lib) concatMapStringsSep flatten mapAttrs mapAttrs' mapAttrsToList nameValuePair concatMapStringSep; eachSite = config.services.dokuwiki; - stateDir = cfg: "/var/lib/dokuwiki/${cfg.hostName}"; user = config.services.nginx.user; group = config.services.nginx.group; @@ -22,7 +21,7 @@ let dokuwikiLocalConfig = cfg: pkgs.writeText "local.php" '' cfg.aclUse != false; message = "services.dokuwiki.${hostName}.aclUse must be true when usersFile is not null"; } - { - assertion = cfg.aclUse -> cfg.usersFile != null; - message = "services.dokuwiki.${hostName}.usersFile must be set if aclUse is true"; - }]) eachSite); + ]) eachSite); services.phpfpm.pools = mapAttrs' (hostName: cfg: ( nameValuePair "dokuwiki-${hostName}" { @@ -291,7 +287,6 @@ in phpEnv = { DOKUWIKI_LOCAL_CONFIG = "${dokuwikiLocalConfig cfg}"; DOKUWIKI_PLUGINS_LOCAL_CONFIG = "${dokuwikiPluginsLocalConfig cfg}"; - } //optionalAttrs (cfg.usersFile != null) { DOKUWIKI_USERS_AUTH_CONFIG = "${cfg.usersFile}"; } //optionalAttrs (cfg.aclUse) { DOKUWIKI_ACL_AUTH_CONFIG = if (cfg.acl != null) then "${dokuwikiAclAuthConfig cfg}" else "${toString cfg.aclFile}"; @@ -353,16 +348,17 @@ in }; systemd.tmpfiles.rules = flatten (mapAttrsToList (hostName: cfg: [ - "d ${stateDir cfg}/attic 0750 ${user} ${group} - -" - "d ${stateDir cfg}/cache 0750 ${user} ${group} - -" - "d ${stateDir cfg}/index 0750 ${user} ${group} - -" - "d ${stateDir cfg}/locks 0750 ${user} ${group} - -" - "d ${stateDir cfg}/media 0750 ${user} ${group} - -" - "d ${stateDir cfg}/media_attic 0750 ${user} ${group} - -" - "d ${stateDir cfg}/media_meta 0750 ${user} ${group} - -" - "d ${stateDir cfg}/meta 0750 ${user} ${group} - -" - "d ${stateDir cfg}/pages 0750 ${user} ${group} - -" - "d ${stateDir cfg}/tmp 0750 ${user} ${group} - -" + "d ${cfg.stateDir}/attic 0750 ${user} ${group} - -" + "d ${cfg.stateDir}/cache 0750 ${user} ${group} - -" + "d ${cfg.stateDir}/index 0750 ${user} ${group} - -" + "d ${cfg.stateDir}/locks 0750 ${user} ${group} - -" + "d ${cfg.stateDir}/media 0750 ${user} ${group} - -" + "d ${cfg.stateDir}/media_attic 0750 ${user} ${group} - -" + "d ${cfg.stateDir}/media_meta 0750 ${user} ${group} - -" + "d ${cfg.stateDir}/meta 0750 ${user} ${group} - -" + "d ${cfg.stateDir}/pages 0750 ${user} ${group} - -" + "d ${cfg.stateDir}/tmp 0750 ${user} ${group} - -" + "f ${cfg.usersFile} 0640 ${user} ${group} - ${pkg hostName cfg}/conf/users.auth.php.dist" ]) eachSite); }; } -- cgit v1.2.3 From 2e699f1db11ff53ece663d0f7c28e37cfb894fff Mon Sep 17 00:00:00 2001 From: dadada Date: Mon, 30 Mar 2020 22:21:28 +0200 Subject: nixos/dokuwiki: add option disableActions --- nixos/modules/services/web-apps/dokuwiki.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index 6670f32c16a..d6bd2526509 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -24,6 +24,7 @@ let $conf['savedir'] = '${cfg.stateDir}'; $conf['superuser'] = '${toString cfg.superUser}'; $conf['useacl'] = '${toString cfg.aclUse}'; + $conf['disableactions'] = '${cfg.disableActions}'; ${toString cfg.extraConfig} ''; @@ -144,6 +145,17 @@ let ''; }; + disableActions = mkOption { + type = types.nullOr types.str; + default = ""; + example = "search,register"; + description = '' + Disable individual action modes. Refer to + + for details on supported values. + ''; + }; + extraConfig = mkOption { type = types.nullOr types.lines; default = null; @@ -358,7 +370,7 @@ in "d ${cfg.stateDir}/meta 0750 ${user} ${group} - -" "d ${cfg.stateDir}/pages 0750 ${user} ${group} - -" "d ${cfg.stateDir}/tmp 0750 ${user} ${group} - -" - "f ${cfg.usersFile} 0640 ${user} ${group} - ${pkg hostName cfg}/conf/users.auth.php.dist" + "C ${cfg.usersFile} 0640 ${user} ${group} - ${pkg hostName cfg}/share/dokuwiki/conf/users.auth.php.dist" ]) eachSite); }; } -- cgit v1.2.3 From 2b67a89f2900d5089e2992bce8be2e94c130b107 Mon Sep 17 00:00:00 2001 From: dadada Date: Sat, 4 Apr 2020 12:46:50 +0200 Subject: nixos/dokuwiki: dokuwiki user --- nixos/modules/services/web-apps/dokuwiki.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index d6bd2526509..c3402ee77fa 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -7,7 +7,7 @@ let eachSite = config.services.dokuwiki; - user = config.services.nginx.user; + user = "dokuwiki"; group = config.services.nginx.group; dokuwikiAclAuthConfig = cfg: pkgs.writeText "acl.auth.php" '' @@ -372,5 +372,10 @@ in "d ${cfg.stateDir}/tmp 0750 ${user} ${group} - -" "C ${cfg.usersFile} 0640 ${user} ${group} - ${pkg hostName cfg}/share/dokuwiki/conf/users.auth.php.dist" ]) eachSite); + + users.users.${user} = { + group = group; + isSystemUser = true; + }; }; } -- cgit v1.2.3 From 9460fb578880de9a10815001c7587bf211e95562 Mon Sep 17 00:00:00 2001 From: dadada Date: Sat, 4 Apr 2020 14:01:23 +0200 Subject: nixos/dokuwiki: modify usersFile and aclFile Use types.str instead of types.path to exclude private information from the derivation. Add a warinig about the contents of acl beeing included in the nix store. --- nixos/modules/services/web-apps/dokuwiki.nix | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index c3402ee77fa..e3597ef3c39 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -87,11 +87,14 @@ let Access Control Lists: see Mutually exclusive with services.dokuwiki.aclFile Set this to a value other than null to take precedence over aclFile option. + + Warning: Consider using aclFile instead if you do not + want to store the ACL in the world-readable Nix store. ''; }; aclFile = mkOption { - type = types.nullOr types.path; + type = with types; nullOr str; default = null; description = '' Location of the dokuwiki acl rules. Mutually exclusive with services.dokuwiki.acl @@ -99,6 +102,7 @@ let Consult documentation for further instructions. Example: ''; + example = "/var/lib/dokuwiki/${name}/acl.auth.php"; }; aclUse = mkOption { @@ -135,14 +139,15 @@ let }; usersFile = mkOption { - type = types.nullOr types.path; - default = "/var/lib/dokuwiki/${name}/users.php"; + type = with types; nullOr str; + default = null; description = '' Location of the dokuwiki users file. List of users. Format: login:passwordhash:Real Name:email:groups,comma,separated Create passwordHash easily by using:$ mkpasswd -5 password `pwgen 8 1` Example: ''; + example = "/var/lib/dokuwiki/${name}/users.auth.php"; }; disableActions = mkOption { @@ -284,11 +289,11 @@ in assertions = flatten (mapAttrsToList (hostName: cfg: [{ assertion = cfg.aclUse -> (cfg.acl != null || cfg.aclFile != null); - message = "Either services.dokuwiki.${hostName}.acl or services.dokuwiki.${hostName}.aclFile is mandatory when aclUse is true"; + message = "Either services.dokuwiki.${hostName}.acl or services.dokuwiki.${hostName}.aclFile is mandatory if aclUse true"; } { assertion = cfg.usersFile != null -> cfg.aclUse != false; - message = "services.dokuwiki.${hostName}.aclUse must be true when usersFile is not null"; + message = "services.dokuwiki.${hostName}.aclUse must must be true if usersFile is not null"; } ]) eachSite); @@ -299,6 +304,7 @@ in phpEnv = { DOKUWIKI_LOCAL_CONFIG = "${dokuwikiLocalConfig cfg}"; DOKUWIKI_PLUGINS_LOCAL_CONFIG = "${dokuwikiPluginsLocalConfig cfg}"; + } // optionalAttrs (cfg.usersFile != null) { DOKUWIKI_USERS_AUTH_CONFIG = "${cfg.usersFile}"; } //optionalAttrs (cfg.aclUse) { DOKUWIKI_ACL_AUTH_CONFIG = if (cfg.acl != null) then "${dokuwikiAclAuthConfig cfg}" else "${toString cfg.aclFile}"; @@ -314,7 +320,7 @@ in services.nginx = { enable = true; virtualHosts = mapAttrs (hostName: cfg: mkMerge [ cfg.nginx { - root = mkForce "${pkg hostName cfg}/share/dokuwiki/"; + root = mkForce "${pkg hostName cfg}/share/dokuwiki"; extraConfig = "fastcgi_param HTTPS on;"; locations."~ /(conf/|bin/|inc/|install.php)" = { @@ -370,8 +376,9 @@ in "d ${cfg.stateDir}/meta 0750 ${user} ${group} - -" "d ${cfg.stateDir}/pages 0750 ${user} ${group} - -" "d ${cfg.stateDir}/tmp 0750 ${user} ${group} - -" - "C ${cfg.usersFile} 0640 ${user} ${group} - ${pkg hostName cfg}/share/dokuwiki/conf/users.auth.php.dist" - ]) eachSite); + ] ++ lib.optional (cfg.aclFile != null) "C ${cfg.aclFile} 0640 ${user} ${group} - ${pkg hostName cfg}/share/dokuwiki/conf/acl.auth.php.dist" + ++ lib.optional (cfg.usersFile != null) "C ${cfg.usersFile} 0640 ${user} ${group} - ${pkg hostName cfg}/share/dokuwiki/conf/users.auth.php.dist" + ) eachSite); users.users.${user} = { group = group; -- cgit v1.2.3 From 2d86cca35edbac2cba329a59c27630a2131cda91 Mon Sep 17 00:00:00 2001 From: dadada Date: Sat, 18 Apr 2020 11:30:19 +0200 Subject: nixos/dokuwiki: change default of aclFile and usersFile `aclFile` and `usersFile` will be set to a default value if `aclUse` is specified and aclFile is not overriden by `acl`. --- nixos/modules/services/web-apps/dokuwiki.nix | 6 +++--- nixos/tests/dokuwiki.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/web-apps/dokuwiki.nix b/nixos/modules/services/web-apps/dokuwiki.nix index e3597ef3c39..76e18266a27 100644 --- a/nixos/modules/services/web-apps/dokuwiki.nix +++ b/nixos/modules/services/web-apps/dokuwiki.nix @@ -57,7 +57,7 @@ let ''; }; - siteOpts = {lib, name, ...}: { + siteOpts = { config, lib, name, ...}: { options = { enable = mkEnableOption "DokuWiki web application."; @@ -95,7 +95,7 @@ let aclFile = mkOption { type = with types; nullOr str; - default = null; + default = if (config.aclUse && config.acl == null) then "/var/lib/dokuwiki/${name}/users.auth.php" else null; description = '' Location of the dokuwiki acl rules. Mutually exclusive with services.dokuwiki.acl Mutually exclusive with services.dokuwiki.acl which is preferred. @@ -140,7 +140,7 @@ let usersFile = mkOption { type = with types; nullOr str; - default = null; + default = if config.aclUse then "/var/lib/dokuwiki/${name}/users.auth.php" else null; description = '' Location of the dokuwiki users file. List of users. Format: login:passwordhash:Real Name:email:groups,comma,separated diff --git a/nixos/tests/dokuwiki.nix b/nixos/tests/dokuwiki.nix index 62d8ec9f0b1..2b907133ed5 100644 --- a/nixos/tests/dokuwiki.nix +++ b/nixos/tests/dokuwiki.nix @@ -36,7 +36,7 @@ in { machine = { ... }: { services.dokuwiki."site1.local" = { - acl = " "; + aclUse = false; superUser = "admin"; nginx = { forceSSL = false; @@ -44,7 +44,7 @@ in { }; }; services.dokuwiki."site2.local" = { - acl = " "; + aclUse = true; superUser = "admin"; nginx = { forceSSL = false; -- cgit v1.2.3 From 6a634cf026a5023a92a8b357441019467b91a6a5 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Sun, 19 Apr 2020 01:44:39 +0200 Subject: fira: 4.106 -> 4.202 --- pkgs/data/fonts/fira/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/fira/default.nix b/pkgs/data/fonts/fira/default.nix index 23baee7cb9d..039c5099b56 100644 --- a/pkgs/data/fonts/fira/default.nix +++ b/pkgs/data/fonts/fira/default.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub }: let - version = "4.106"; + version = "4.202"; in fetchFromGitHub { name = "fira-${version}"; @@ -15,7 +15,7 @@ in fetchFromGitHub { cp otf/*.otf $out/share/fonts/opentype ''; - sha256 = "0c97nmihcq0ki7ywj8zn048a2bgrszc61lb9p0djfi65ar52jab4"; + sha256 = "1iwxbp7kw5kghh5nbycb05zby7p2ib61mywva3h6giv2wd4lpxnz"; meta = with lib; { homepage = "https://mozilla.github.io/Fira/"; -- cgit v1.2.3 From 7adb98309a77665987e2b964da1c3d9eb7a5a87d Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 19 Apr 2020 10:13:49 +1000 Subject: buildah: installShellCompletion --- pkgs/development/tools/buildah/default.nix | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 7fbb21ffb12..84b28631308 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -1,5 +1,14 @@ -{ stdenv, buildGoPackage, fetchFromGitHub -, gpgme, libgpgerror, lvm2, btrfs-progs, pkg-config, libselinux, libseccomp +{ stdenv +, buildGoPackage +, fetchFromGitHub +, installShellFiles +, pkg-config +, gpgme +, libgpgerror +, lvm2 +, btrfs-progs +, libselinux +, libseccomp }: buildGoPackage rec { @@ -7,9 +16,9 @@ buildGoPackage rec { version = "1.14.8"; src = fetchFromGitHub { - owner = "containers"; - repo = "buildah"; - rev = "v${version}"; + owner = "containers"; + repo = "buildah"; + rev = "v${version}"; sha256 = "187cvb3i5cwm7cwxmzpl2ca7900yb6v6b6cybyz5mnd5ccy5ff1q"; }; @@ -18,7 +27,7 @@ buildGoPackage rec { goPackagePath = "github.com/containers/buildah"; excludedPackages = [ "tests" ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs libselinux libseccomp ]; patches = [ ./disable-go-module-mode.patch ]; @@ -27,7 +36,7 @@ buildGoPackage rec { pushd go/src/${goPackagePath} make GIT_COMMIT="unknown" install -Dm755 buildah $bin/bin/buildah - install -Dm444 contrib/completions/bash/buildah $bin/share/bash-completion/completions/buildah + installShellCompletion --bash contrib/completions/bash/buildah ''; postBuild = '' -- cgit v1.2.3 From 9123c8c5de7fcfe0b245ed023e7f52883ae08762 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 19 Apr 2020 10:14:41 +1000 Subject: conmon: installFlags --- pkgs/applications/virtualization/conmon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index b09911cf6e5..bfe9f1d3486 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib systemd ] ++ - stdenv.lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ]; + buildInputs = [ glib systemd ] + ++ stdenv.lib.optionals (!stdenv.hostPlatform.isMusl) [ glibc glibc.static ]; - installPhase = "install -Dm755 bin/${pname} $out/bin/${pname}"; + installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { homepage = "https://github.com/containers/conmon"; -- cgit v1.2.3 From 443e544721cda7ff20aec064192147eeed376e22 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 18 Apr 2020 20:36:55 -0400 Subject: firefox-wrapper: don't throw on enableGnomeExtensions We use the config for the native messaging host below this statement. --- pkgs/applications/networking/browsers/firefox/wrapper.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 73d2303bfc1..0afa8ca7b83 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -46,7 +46,6 @@ let "icedtea" "enableGoogleTalkPlugin" "enableFriBIDPlugin" - "enableGnomeExtensions" "enableBluejeans" "enableAdobeReader" ]; -- cgit v1.2.3 From 0bab5253b179ebe324204d73c18db1e4c1a787f1 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 18 Apr 2020 20:43:37 -0400 Subject: Revert "[WIP] {help wanted} twolame: 2017-09-27 -> 0.4.0" --- pkgs/development/libraries/twolame/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/twolame/default.nix b/pkgs/development/libraries/twolame/default.nix index db1741196cc..7c44731ef13 100644 --- a/pkgs/development/libraries/twolame/default.nix +++ b/pkgs/development/libraries/twolame/default.nix @@ -1,27 +1,25 @@ { stdenv, fetchFromGitHub -, autoreconfHook -, pkgconfig -, libsndfile, xmlto, asciidoc }: +, autoreconfHook, pkgconfig +, libsndfile }: -with stdenv.lib; -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "twolame"; - version = "0.4.0"; + version = "2017-09-27"; src = fetchFromGitHub { owner = "njh"; repo = "twolame"; - rev = version; - sha256 = "0ckwdx5kmgmh1jq2wl6c9d57pf6z6p2wjdy6fw01a8f3clg21a8g"; + rev = "977c8ac55d8ca6d5f35d1d413a119dac2b3b0333"; + sha256 = "1rq3yc8ygzdqid9zk6pixmm4w9sk2vrlx217lhn5bjaglv7iyf7x"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig xmlto asciidoc ]; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libsndfile ]; doCheck = false; # fails with "../build-scripts/test-driver: line 107: -Mstrict: command not found" - meta = { + meta = with stdenv.lib;{ description = "A MP2 encoder"; longDescription = '' TwoLAME is an optimised MPEG Audio Layer 2 (MP2) encoder based on -- cgit v1.2.3 From ddbc83263785aabcbf15cb21257cc830e1e6f74a Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 18 Apr 2020 20:51:33 -0400 Subject: Revert "calibre: 4.12.0 -> 4.13.0" --- pkgs/applications/misc/calibre/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 81fcc64de72..afd602f6088 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -16,7 +16,7 @@ , hyphen , unrarSupport ? false , chmlib -, python3Packages +, python2Packages , libusb1 , libmtp , xdg_utils @@ -25,15 +25,16 @@ }: let - pypkgs = python3Packages; + pypkgs = python2Packages; + in mkDerivation rec { pname = "calibre"; - version = "4.13.0"; + version = "4.12.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - sha256 = "1xp1fvpdizk6g74diam4nd59s6fhcvp086y1brm6r9wy9zm7sn7r"; + sha256 = "144vl5p0adcywcqaarrriq5zd8q5i934yfjg9himiq1vdp9vy4fi"; }; patches = [ @@ -170,7 +171,8 @@ mkDerivation rec { description = "Comprehensive e-book software"; homepage = "https://calibre-ebook.com"; license = with licenses; if unrarSupport then unfreeRedistributable else gpl3; - maintainers = with maintainers; [ domenkozar pSub ]; + maintainers = with maintainers; [ domenkozar pSub AndersonTorres ]; platforms = platforms.linux; + inherit version; }; } -- cgit v1.2.3 From 7cbd8fb9945ddd404fb22ca53263fa8d927a3b47 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sun, 19 Apr 2020 11:06:28 +0300 Subject: openjk: use gcc9 --- pkgs/top-level/all-packages.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad4bb9f8a97..ce0db3b2d9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23609,10 +23609,7 @@ in openclonk = callPackage ../games/openclonk { }; - openjk = callPackage ../games/openjk { - # segfaults when built with gcc9 - stdenv = gcc8Stdenv; - }; + openjk = callPackage ../games/openjk { }; openmw = libsForQt5.callPackage ../games/openmw { }; -- cgit v1.2.3 From a3e64e81fcf4cc597138f4b89d81ffe84195c4f7 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Fri, 17 Apr 2020 22:16:41 +0200 Subject: pythonPackages.publicsuffix2: init at 2.2019-12-21 --- .../python-modules/publicsuffix2/default.nix | 26 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/python-modules/publicsuffix2/default.nix diff --git a/pkgs/development/python-modules/publicsuffix2/default.nix b/pkgs/development/python-modules/publicsuffix2/default.nix new file mode 100644 index 00000000000..fe360168aa5 --- /dev/null +++ b/pkgs/development/python-modules/publicsuffix2/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, requests }: + +buildPythonPackage rec { + pname = "publicsuffix2"; + version = "2.20191221"; + + # Tests are missing in the sdist + # See: https://github.com/nexB/python-publicsuffix2/issues/12 + src = fetchFromGitHub { + owner = "nexB"; + repo = "python-publicsuffix2"; + rev = "release-2.2019-12-21"; + sha256 = "1dkvfvl0izq9hqzilnw8ipkbgjs9xyad9p21i3864hzinbh0wp9r"; + }; + + nativeBuildInputs = [ requests ]; + + meta = with stdenv.lib; { + description = '' + Get a public suffix for a domain name using the Public Suffix + List. Forked from and using the same API as the publicsuffix package. + ''; + homepage = "https://pypi.python.org/pypi/publicsuffix2/"; + license = licenses.mpl20; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c6dfc9582c7..6a8c5a3d56a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5038,6 +5038,8 @@ in { publicsuffix = callPackage ../development/python-modules/publicsuffix {}; + publicsuffix2 = callPackage ../development/python-modules/publicsuffix2 {}; + py = callPackage ../development/python-modules/py { }; pyacoustid = callPackage ../development/python-modules/pyacoustid { }; -- cgit v1.2.3 From 55d52851a6c650b2ce45d0752ed93b1de57e253a Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Fri, 17 Apr 2020 22:18:59 +0200 Subject: mitmproxy: 4.0.4 -> 5.1.1 --- pkgs/tools/networking/mitmproxy/default.nix | 50 ++++++--------------------- pkgs/tools/networking/mitmproxy/pytest5.patch | 31 ----------------- 2 files changed, 11 insertions(+), 70 deletions(-) delete mode 100644 pkgs/tools/networking/mitmproxy/pytest5.patch diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix index 7a623ab69a6..b9d873fad6a 100644 --- a/pkgs/tools/networking/mitmproxy/default.nix +++ b/pkgs/tools/networking/mitmproxy/default.nix @@ -4,47 +4,15 @@ with python3Packages; buildPythonPackage rec { pname = "mitmproxy"; - version = "4.0.4"; + version = "5.1.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "14i9dkafvyl15rq2qa8xldscn5lmkk2g52kbi2hl63nzx9yibx6r"; + sha256 = "1lirlckpvd3c6s6q3p32w4k4yfna5mlgr1x9g39lhzzq0sdiz3lk"; }; - patches = [ - (fetchpatch { - # Tests failed due to expired test certificates, - # https://github.com/mitmproxy/mitmproxy/issues/3316 - # TODO: remove on next update - name = "test-certificates.patch"; - url = "https://github.com/mitmproxy/mitmproxy/commit/1b6a8d6acd3d70f9b9627ad4ae9def08103f8250.patch"; - sha256 = "03y79c25yir7d8xj79czdc81y3irqq1i3ks9ca0mv1az8b7xsvfv"; - }) - (fetchpatch { - # 0.13 <= wsproto < 0.14 patch - # https://github.com/mitmproxy/mitmproxy/issues/3459 - # TODO: remove on next update - name = "wsproto-0.13.patch"; - url = "https://github.com/mitmproxy/mitmproxy/commit/70777a1b6ed64af9cafcdef223a8a260ecc96864.patch"; - sha256 = "1ddxdr7js510kzyq3gyks4k5k1n8zb1i9amxw7wzmi1dcg8kqw9a"; - # We strip these bounds anyway - excludes = [ "setup.py" ]; - }) - (fetchpatch { - # Fix for newer pytest disallowing calling fixtures - # https://github.com/mitmproxy/mitmproxy/issues/3403 - # TODO: remove on next update - name = "dont-call-fixtures.patch"; - url = "https://github.com/mitmproxy/mitmproxy/commit/ce28721458c8cc71de86513a5110676e9763041b.patch"; - sha256 = "05pljr28lx7l1xgswqr9sz8dnhvc7npzh8xg2p9hignf159kd54d"; - # Irrelevant in nixpkgs - excludes = [ "setup.py" "setup.cfg" "release/docker/*" ]; - }) - ./pytest5.patch - ]; - postPatch = '' # remove dependency constraints sed 's/>=\([0-9]\.\?\)\+\( \?, \?<\([0-9]\.\?\)\+\)\?//' -i setup.py @@ -61,17 +29,21 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - blinker click certifi cryptography - h2 hyperframe kaitaistruct passlib - pyasn1 pyopenssl pyparsing pyperclip - ruamel_yaml tornado urwid brotlipy - sortedcontainers ldap3 wsproto setuptools + blinker brotli certifi cffi + click cryptography flask h11 + h2 hpack hyperframe itsdangerous + jinja2 kaitaistruct ldap3 markupsafe + passlib protobuf publicsuffix2 pyasn1 + pycparser pyopenssl pyparsing pyperclip + ruamel_yaml setuptools six sortedcontainers + tornado urwid werkzeug wsproto zstandard ]; checkInputs = [ beautifulsoup4 flask pytest requests glibcLocales asynctest parver pytest-asyncio + hypothesis ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/mitmproxy/pytest5.patch b/pkgs/tools/networking/mitmproxy/pytest5.patch deleted file mode 100644 index bfbf7253b9c..00000000000 --- a/pkgs/tools/networking/mitmproxy/pytest5.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/test/mitmproxy/net/test_tls.py b/test/mitmproxy/net/test_tls.py -index 489bf89f..c78472e3 100644 ---- a/test/mitmproxy/net/test_tls.py -+++ b/test/mitmproxy/net/test_tls.py -@@ -87,14 +87,16 @@ def test_get_client_hello(): - rfile = io.BufferedReader(io.BytesIO( - FULL_CLIENT_HELLO_NO_EXTENSIONS[:30] - )) -- with pytest.raises(exceptions.TlsProtocolException, message="Unexpected EOF"): -+ with pytest.raises(exceptions.TlsProtocolException): - tls.get_client_hello(rfile) -+ pytest.fail("Unexpected EOF") - - rfile = io.BufferedReader(io.BytesIO( - b"GET /" - )) -- with pytest.raises(exceptions.TlsProtocolException, message="Expected TLS record"): -+ with pytest.raises(exceptions.TlsProtocolException): - tls.get_client_hello(rfile) -+ pytest.fail("Expected TLS record") - - - class TestClientHello: -@@ -153,5 +155,6 @@ class TestClientHello: - b"\x01\x00\x00\x03" + # handshake header - b"foo" - )) -- with pytest.raises(exceptions.TlsProtocolException, message='Cannot parse Client Hello'): -+ with pytest.raises(exceptions.TlsProtocolException): - tls.ClientHello.from_file(rfile) -+ pytest.fail('Cannot parse Client Hello') -- cgit v1.2.3 From f253da42f8fe2bf2d955849d9b4fff54e1a0f0d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Sun, 19 Apr 2020 12:56:52 +0200 Subject: Add myself (turion) to the maintainers list for several packages Following nh2's advice, I want to be more involved in nixpkgs, and I'll start to review changes to programs that are important to me, and that didn't have a long list of maintainers yet. --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/applications/audio/musescore/default.nix | 2 +- pkgs/applications/editors/vscode/vscodium.nix | 2 +- pkgs/applications/kde/konsole.nix | 2 +- pkgs/applications/kde/okular.nix | 2 +- pkgs/applications/misc/keepassx/community.nix | 2 +- pkgs/applications/misc/krusader/default.nix | 2 +- 7 files changed, 12 insertions(+), 6 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1307b293fe9..dcf96307c3b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7816,6 +7816,12 @@ githubId = 563054; name = "Thomas Tuegel"; }; + turion = { + email = "programming@manuelbaerenz.de"; + github = "turion"; + githubId = 303489; + name = "Manuel Bärenz"; + }; tv = { email = "tv@krebsco.de"; github = "4z3"; diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index bd4b2db380a..063a05a72f3 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -33,7 +33,7 @@ mkDerivation rec { description = "Music notation and composition software"; homepage = "https://musescore.org/"; license = licenses.gpl2; - maintainers = with maintainers; [ vandenoever ]; + maintainers = with maintainers; [ vandenoever turion ]; platforms = platforms.linux; repositories.git = "https://github.com/musescore/MuseScore"; }; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index edc63b1c2f8..63e6cc920bf 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -54,7 +54,7 @@ in homepage = "https://github.com/VSCodium/vscodium"; downloadPage = "https://github.com/VSCodium/vscodium/releases"; license = licenses.mit; - maintainers = with maintainers; [ synthetica ]; + maintainers = with maintainers; [ synthetica turion ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; } diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix index 1be5b0b4a89..ed26dc08bb6 100644 --- a/pkgs/applications/kde/konsole.nix +++ b/pkgs/applications/kde/konsole.nix @@ -11,7 +11,7 @@ mkDerivation { name = "konsole"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; - maintainers = [ lib.maintainers.ttuegel ]; + maintainers = with lib.maintainers; [ ttuegel turion ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix index c399335c4a8..f07df73a255 100644 --- a/pkgs/applications/kde/okular.nix +++ b/pkgs/applications/kde/okular.nix @@ -21,7 +21,7 @@ mkDerivation { meta = with lib; { homepage = "http://www.kde.org"; license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ]; - maintainers = with maintainers; [ ttuegel ]; + maintainers = with maintainers; [ ttuegel turion ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 0ed1cd27be0..7909d86c18a 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { 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; [ jonafato ]; + maintainers = with maintainers; [ jonafato turion ]; platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix index 4ae8a99b35a..ab13c4989d9 100644 --- a/pkgs/applications/misc/krusader/default.nix +++ b/pkgs/applications/misc/krusader/default.nix @@ -20,7 +20,7 @@ in mkDerivation rec { description = "Norton/Total Commander clone for KDE"; license = licenses.gpl2; homepage = "http://www.krusader.org"; - maintainers = with maintainers; [ sander ]; + maintainers = with maintainers; [ sander turion ]; }; nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; -- cgit v1.2.3 From c34bc1d8240d38f54b34569f09bffc4f0f5e8662 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 19 Apr 2020 21:22:41 +1000 Subject: skopeo: install completion --- pkgs/development/tools/skopeo/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index c18a767928e..7d4e4e0c69e 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -9,6 +9,7 @@ , pkg-config , libselinux , go-md2man +, installShellFiles }: let @@ -37,7 +38,7 @@ buildGoPackage { excludedPackages = [ "integration" ]; - nativeBuildInputs = [ pkg-config go-md2man ]; + nativeBuildInputs = [ pkg-config go-md2man installShellFiles ]; buildInputs = [ gpgme ] ++ stdenv.lib.optionals stdenv.isLinux [ libgpgerror lvm2 btrfs-progs libselinux ]; @@ -51,6 +52,7 @@ buildGoPackage { # depends on buildGoPackage not changing … pushd ./go/src/${goPackagePath} make install-docs MANINSTALLDIR="$man/share/man" + installShellCompletion --bash completions/bash/skopeo popd ''; -- cgit v1.2.3 From 93e8f5d90f4f46db141b6b26926ea46b1dae4812 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Mon, 20 Jan 2020 14:48:43 +0100 Subject: virtualbox: add update script --- .../virtualization/virtualbox/default.nix | 8 +- .../virtualization/virtualbox/update.py | 85 ---------------------- .../virtualization/virtualbox/update.sh | 44 +++++++++++ 3 files changed, 48 insertions(+), 89 deletions(-) delete mode 100755 pkgs/applications/virtualization/virtualbox/update.py create mode 100755 pkgs/applications/virtualization/virtualbox/update.sh diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 9d784d88a4f..54e525e3cf2 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -19,9 +19,8 @@ with stdenv.lib; let python = python3; buildType = "release"; - # Remember to change the extpackRev and version in extpack.nix and - # guest-additions/default.nix as well. - main = "59f8f5774473f593e3eb5940e2a337e0674bcd9854164b2578fd43f896260c99"; + # Use maintainers/scripts/update.nix to update the version and all related hashes or + # change the hashes in extpack.nix and guest-additions/default.nix as well manually. version = "6.1.4"; iasl' = iasl.overrideAttrs (old: rec { @@ -39,7 +38,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = main; + sha256 = "59f8f5774473f593e3eb5940e2a337e0674bcd9854164b2578fd43f896260c99"; }; outputs = [ "out" "modsrc" ]; @@ -216,6 +215,7 @@ in stdenv.mkDerivation { passthru = { inherit version; # for guest additions inherit extensionPack; # for inclusion in profile to prevent gc + updateScript = ./update.sh; }; meta = { diff --git a/pkgs/applications/virtualization/virtualbox/update.py b/pkgs/applications/virtualization/virtualbox/update.py deleted file mode 100755 index 6e8bfd5c825..00000000000 --- a/pkgs/applications/virtualization/virtualbox/update.py +++ /dev/null @@ -1,85 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i python3 -p python3 - -import os -import re -import json -import urllib.request - -from distutils.version import LooseVersion - -UPSTREAM_INFO_FILE = os.path.join( - os.path.dirname(os.path.abspath(__file__)), - "upstream-info.json" -) - - -def fetch_latest_version(): - url = "http://download.virtualbox.org/virtualbox/LATEST.TXT" - return urllib.request.urlopen(url).read().strip().decode() - - -def load_upstream_info(): - try: - with open(UPSTREAM_INFO_FILE, 'r') as fp: - return json.load(fp) - except FileNotFoundError: - return {'version': "0"} - - -def save_upstream_info(contents): - remark = "Generated using update.py from the same directory." - contents['__NOTE'] = remark - data = json.dumps(contents, indent=2, sort_keys=True) - with open(UPSTREAM_INFO_FILE, 'w') as fp: - fp.write(data + "\n") - - -def fetch_file_table(version): - url = "http://download.virtualbox.org/virtualbox/{}/SHA256SUMS" - url = url.format(version) - result = {} - for line in urllib.request.urlopen(url): - sha, name = line.rstrip().split() - result[name.lstrip(b'*').decode()] = sha.decode() - return result - - -def update_to_version(version): - extpack_start = 'Oracle_VM_VirtualBox_Extension_Pack-' - version_re = version.replace('.', '\\.') - attribute_map = { - 'extpack': r'^' + extpack_start + r'[^-]+-[^.]+.vbox-extpack$', - 'extpackRev': r'^' + extpack_start + r'[^-]+-([^.]+).vbox-extpack$', - 'main': r'^VirtualBox-' + version_re + r'.tar.bz2$', - 'guest': r'^VBoxGuestAdditions_' + version_re + r'.iso$', - } - table = fetch_file_table(version) - new_attrs = {'version': version} - for attr, searchexpr in attribute_map.items(): - result = [re.search(searchexpr, key) for key in table.keys()] - filtered = filter(lambda m: m is not None, result) - found = [m.groups()[0] if len(m.groups()) > 0 else table[m.group(0)] - for m in filtered if m is not None] - - if len(found) == 0: - msg = "No package found for attribute {}".format(attr) - raise AssertionError(msg) - elif len(found) != 1: - msg = "More than one package found for attribute {}: ".format(attr) - msg += ', '.join(found) - raise AssertionError(msg) - else: - new_attrs[attr] = found[0] - return new_attrs - - -info = load_upstream_info() -latest = fetch_latest_version() -if LooseVersion(info['version']) < LooseVersion(latest): - print("Updating to version {}...".format(latest), end="", flush=True) - new_attrs = update_to_version(latest) - save_upstream_info(new_attrs) - print(" done.") -else: - print("Version {} is already the latest one.".format(info['version'])) diff --git a/pkgs/applications/virtualization/virtualbox/update.sh b/pkgs/applications/virtualization/virtualbox/update.sh new file mode 100755 index 00000000000..fcd02ae8a27 --- /dev/null +++ b/pkgs/applications/virtualization/virtualbox/update.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl common-updater-scripts nix-prefetch-scripts jq + +set -xeuo pipefail + +nixpkgs="$(git rev-parse --show-toplevel)" + +attr=virtualbox +oldVersion="$(nix-instantiate --eval -E "with import $nixpkgs {}; $attr.version or (builtins.parseDrvName $attr.name).version" | tr -d '"')" +latestVersion="$(curl -sS https://download.virtualbox.org/virtualbox/LATEST.TXT)" + +function fileShaSum() { + echo "$1" | grep -w $2 | cut -f1 -d' ' +} +function oldHash() { + nix-instantiate --eval --strict -A "$1.drvAttrs.outputHash" | tr -d '"' +} +function nixFile() { + nix-instantiate --eval --strict -A "${1}.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/' +} + +if [ ! "$oldVersion" = "$latestVersion" ]; then + shaSums=$(curl -sS https://download.virtualbox.org/virtualbox/$latestVersion/SHA256SUMS) + + virtualBoxShaSum=$(fileShaSum "$shaSums" "VirtualBox-$latestVersion.tar.bz2") + extpackShaSum=$(fileShaSum "$shaSums" "Oracle_VM_VirtualBox_Extension_Pack-$latestVersion.vbox-extpack") + guestAdditionsShaSum=$(fileShaSum "$shaSums" "*VBoxGuestAdditions_$latestVersion.iso") + + virtualboxNixFile=$(nixFile ${attr}) + extpackNixFile=$(nixFile ${attr}Extpack) + guestAdditionsNixFile=$(nixFile linuxPackages.${attr}GuestAdditions) + + extpackOldShaSum=$(oldHash ${attr}Extpack) + guestAdditionsOldShaSum=$(oldHash linuxPackages.${attr}GuestAdditions.src) + + update-source-version $attr $latestVersion $virtualBoxShaSum + sed -i -e 's|value = "'$extpackOldShaSum'"|value = "'$extpackShaSum'"|' $extpackNixFile + sed -i -e 's|sha256 = "'$guestAdditionsOldShaSum'"|sha256 = "'$guestAdditionsShaSum'"|' $guestAdditionsNixFile + + git add $virtualboxNixFile $extpackNixFile $guestAdditionsNixFile + git commit -m "$attr: ${oldVersion} -> ${latestVersion}" +else + echo "$attr is already up-to-date" +fi -- cgit v1.2.3 From 0481e09ad3bace6dc0c93791f031b62316041f4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Sun, 19 Apr 2020 13:39:31 +0200 Subject: virtualbox: 6.1.4 -> 6.1.6 --- pkgs/applications/virtualization/virtualbox/default.nix | 8 ++++++-- pkgs/applications/virtualization/virtualbox/extpack.nix | 2 +- .../virtualization/virtualbox/guest-additions/default.nix | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 54e525e3cf2..df7b81a43c8 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -21,7 +21,7 @@ let buildType = "release"; # Use maintainers/scripts/update.nix to update the version and all related hashes or # change the hashes in extpack.nix and guest-additions/default.nix as well manually. - version = "6.1.4"; + version = "6.1.6"; iasl' = iasl.overrideAttrs (old: rec { inherit (old) pname; @@ -38,7 +38,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "59f8f5774473f593e3eb5940e2a337e0674bcd9854164b2578fd43f896260c99"; + sha256 = "b031c30d770f28c5f884071ad933e8c1f83e65b93aaba03a4012077c1d90a54f"; }; outputs = [ "out" "modsrc" ]; @@ -107,6 +107,10 @@ in stdenv.mkDerivation { postPatch = '' sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \ src/VBox/HostDrivers/adpctl/VBoxNetAdpCtl.cpp + '' + optionalString headless '' + # Fix compile error in version 6.1.6 + substituteInPlace src/VBox/HostServices/SharedClipboard/VBoxSharedClipboardSvc-x11-stubs.cpp \ + --replace PSHCLFORMATDATA PSHCLFORMATS ''; # first line: ugly hack, and it isn't yet clear why it's a problem diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index d50d3b59e24..c9918b1cedf 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -12,7 +12,7 @@ fetchurl rec { # Manually sha256sum the extensionPack file, must be hex! # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. # Checksums can also be found at https://www.virtualbox.org/download/hashes/${version}/SHA256SUMS - let value = "3b73798d776ff223ea8025b1a45001762f8d4e5bcd1ea61449773c1249935800"; + let value = "80b96b4b51a502141f6a8981f1493ade08a00762622c39e48319e5b122119bf3"; in assert (builtins.stringLength value) == 64; value; meta = { diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index fdb393a94eb..4275bc0542e 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -26,7 +26,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso"; - sha256 = "e2846a7576cce1b92a7c0744f41eaac750248d6e31dfca5c45d5766648b394c7"; + sha256 = "bcde4691dea7de93b65a10a43dda2b8f52e570f820992ad281c9bb5c8dede181"; }; KERN_DIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; -- cgit v1.2.3 From 183e448a23f8adff7aef9d421715d0816cbe01c4 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sun, 19 Apr 2020 13:36:05 +0200 Subject: lsp-plugins: 1.1.15 -> 1.1.19 --- pkgs/applications/audio/lsp-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index a8aa101ab4d..d530aff9faa 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "lsp-plugins"; - version = "1.1.15"; + version = "1.1.19"; src = fetchFromGitHub { owner = "sadko4u"; repo = pname; rev = "${pname}-${version}"; - sha256 = "0lynyjs5zp27gnzcv8a23pvb7c1ghzc2dspypca3ciq40bfpfzik"; + sha256 = "1wiph3vxhydc6mr9hn2c6crd4cx592l2zv0wrzgmpnlm1lflzpbg"; }; nativeBuildInputs = [ pkgconfig php makeWrapper ]; -- cgit v1.2.3 From f2402e5047f6e5e44e594b8fff18f978757a0d2c Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sat, 4 Apr 2020 08:59:24 +0200 Subject: bjumblr: init at 0.2 --- pkgs/applications/audio/bjumblr/default.nix | 28 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/applications/audio/bjumblr/default.nix diff --git a/pkgs/applications/audio/bjumblr/default.nix b/pkgs/applications/audio/bjumblr/default.nix new file mode 100644 index 00000000000..de0cae7a21a --- /dev/null +++ b/pkgs/applications/audio/bjumblr/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, libX11, cairo, lv2, pkgconfig, libsndfile }: + +stdenv.mkDerivation rec { + pname = "BJumblr"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "sjaehn"; + repo = pname; + rev = "v${version}"; + sha256 = "14z8113zkwykbhm1a8h2xs972dgifvlfij92b08jckyc7cbz84ys"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + libX11 cairo lv2 libsndfile + ]; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/sjaehn/BJumblr"; + description = "Pattern-controlled audio stream / sample re-sequencer LV2 plugin"; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + license = licenses.gpl3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 17ece30157e..0becec94ba1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18666,6 +18666,8 @@ in bs1770gain = callPackage ../applications/audio/bs1770gain { }; + bjumblr = callPackage ../applications/audio/bjumblr { }; + bsequencer = callPackage ../applications/audio/bsequencer { }; bslizr = callPackage ../applications/audio/bslizr { }; -- cgit v1.2.3 From e353fe89dbe0edbe30b9b3691e3d5734dfb42640 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 19 Apr 2020 14:49:07 +0200 Subject: keepassxc: 2.5.2 -> 2.5.4 + disabled testcli flaky test --- pkgs/applications/misc/keepassx/community.nix | 20 ++++++++++++++++---- pkgs/applications/misc/keepassx/darwin.patch | 4 ++-- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/keepassx/community.nix b/pkgs/applications/misc/keepassx/community.nix index 0ed1cd27be0..27ffa7d17a3 100644 --- a/pkgs/applications/misc/keepassx/community.nix +++ b/pkgs/applications/misc/keepassx/community.nix @@ -1,4 +1,10 @@ -{ stdenv, fetchFromGitHub, cmake, makeWrapper, qttools, darwin +{ stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, makeWrapper +, qttools +, darwin , curl , glibcLocales @@ -33,13 +39,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "keepassxc"; - version = "2.5.2"; + version = "2.5.4"; src = fetchFromGitHub { owner = "keepassxreboot"; repo = "keepassxc"; rev = version; - sha256 = "0z5bd17qaq7zpv96gw6qwv6rb4xx7xjq86ss6wm5zskcrraf7r7n"; + sha256 = "1xih9q1pxszalc0l29fmjxwn1vrrrrbnhc8gmi8brw5sclhbs6bh"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang [ @@ -57,6 +63,11 @@ stdenv.mkDerivation rec { patches = [ ./darwin.patch + # use wl-copy on Wayland - can be dropped with the next version update + (fetchpatch { + url = "https://github.com/keepassxreboot/keepassxc/commit/6128e5d58294f26411160f44da91087ebe7f4b07.patch"; + sha256 = "16q0h7kijqjdbskmk4ar6p3g8vcxr0bq1zrlq2bk16pk10nv4bh1"; + }) ]; cmakeFlags = [ @@ -79,7 +90,8 @@ stdenv.mkDerivation rec { export LC_ALL="en_US.UTF-8" export QT_QPA_PLATFORM=offscreen export QT_PLUGIN_PATH="${qtbase.bin}/${qtbase.qtPluginPrefix}" - make test ARGS+="-E testgui --output-on-failure" + # testcli and testgui are flaky - skip them both + make test ARGS+="-E 'testcli|testgui' --output-on-failure" ''; nativeBuildInputs = [ cmake wrapQtAppsHook qttools ]; diff --git a/pkgs/applications/misc/keepassx/darwin.patch b/pkgs/applications/misc/keepassx/darwin.patch index 6232d1118a7..95ca5d4587f 100644 --- a/pkgs/applications/misc/keepassx/darwin.patch +++ b/pkgs/applications/misc/keepassx/darwin.patch @@ -6,10 +6,10 @@ index 74b1a7ff..0a713a32 100644 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_PREFIX "${CMAKE_INSTALL_PREFIX}/Applications") + set(BUNDLE_INSTALL_DIR "${PROGNAME}.app/Contents") 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") @@ -369,12 +370,6 @@ set(CMAKE_AUTORCC ON) if(APPLE) -- cgit v1.2.3 From 0b23e4e5b7a066e3a34775e2a22057c1d1ec461e Mon Sep 17 00:00:00 2001 From: Lionello Lunesu Date: Sun, 19 Apr 2020 20:52:41 +0800 Subject: Remove top-level ldcBootstrap --- pkgs/development/compilers/ldc/generic.nix | 73 +++++++++++------------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 26 insertions(+), 48 deletions(-) diff --git a/pkgs/development/compilers/ldc/generic.nix b/pkgs/development/compilers/ldc/generic.nix index 93ffe37785d..c93d423945c 100644 --- a/pkgs/development/compilers/ldc/generic.nix +++ b/pkgs/development/compilers/ldc/generic.nix @@ -1,10 +1,8 @@ -{ bootstrapVersion ? false -, version -, ldcSha256 -}: +{ version, ldcSha256 }: { stdenv, fetchurl, cmake, ninja, llvm_5, llvm_8, curl, tzdata -, libconfig, lit, gdb, unzip, darwin, bash, ldcBootstrap +, libconfig, lit, gdb, unzip, darwin, bash , callPackage, makeWrapper, runCommand, targetPackages +, ldcBootstrap ? callPackage ./bootstrap.nix { } }: let @@ -14,8 +12,6 @@ let echo ${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} > $out/LibcurlPathFile ''; - bootstrapLdc = if bootstrapVersion then null else ldcBootstrap; - in stdenv.mkDerivation rec { @@ -35,8 +31,7 @@ stdenv.mkDerivation rec { postUnpack = '' 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 @@ -44,54 +39,40 @@ stdenv.mkDerivation rec { # test depends on current year rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/ddocYear.d '' - - + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) '' + + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' # https://github.com/NixOS/nixpkgs/issues/34817 rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall ''; postPatch = '' - # Setting SHELL=$SHELL when dmd testsuite is run doesn't work on Linux somehow - substituteInPlace tests/d2/dmd-testsuite/Makefile --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash" - '' - - + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isLinux) '' + # Setting SHELL=$SHELL when dmd testsuite is run doesn't work on Linux somehow + substituteInPlace tests/d2/dmd-testsuite/Makefile --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash" + '' + + stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace runtime/phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" "" '' - - + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) '' + + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace runtime/phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)" - '' - - + stdenv.lib.optionalString (bootstrapVersion && stdenv.hostPlatform.isDarwin) '' - # Was not able to compile on darwin due to "__inline_isnanl" - # being undefined. - # TODO Remove with version > 0.17.6 - substituteInPlace dmd2/root/port.c --replace __inline_isnanl __inline_isnan ''; - nativeBuildInputs = [ cmake ninja makeWrapper unzip ] - ++ stdenv.lib.optionals (!bootstrapVersion) [ - bootstrapLdc lit lit.python - ] - ++ stdenv.lib.optional (!bootstrapVersion && stdenv.hostPlatform.isDarwin) - # https://github.com/NixOS/nixpkgs/issues/57120 - # https://github.com/NixOS/nixpkgs/pull/59197#issuecomment-481972515 - llvm_5 - ++ 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.optionals (bootstrapVersion) [ - libconfig llvm_5 - ] - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin - darwin.apple_sdk.frameworks.Foundation; + nativeBuildInputs = [ + cmake ninja makeWrapper unzip ldcBootstrap lit lit.python + ] + ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.Foundation + # https://github.com/NixOS/nixpkgs/issues/57120 + # https://github.com/NixOS/nixpkgs/pull/59197#issuecomment-481972515 + llvm_5 + ] + ++ stdenv.lib.optionals (!stdenv.hostPlatform.isDarwin) [ + llvm_8 + # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 + gdb + ]; buildInputs = [ curl tzdata ]; - cmakeFlags = stdenv.lib.optionals (!bootstrapVersion) [ + cmakeFlags = [ "-DD_FLAGS=-d-version=TZDatabaseDir;-d-version=LibcurlPath;-J${pathConfig}" "-DCMAKE_BUILD_TYPE=Release" ]; @@ -125,9 +106,7 @@ stdenv.mkDerivation rec { additionalExceptions = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin "|druntime-test-shared"; - doCheck = !bootstrapVersion; - - checkPhase = stdenv.lib.optionalString doCheck '' + checkPhase = '' # Build default lib test runners ninja -j$NIX_BUILD_CORES all-test-runners diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3654c4c45a1..ef8ea2a268c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4554,7 +4554,6 @@ in lalezar-fonts = callPackage ../data/fonts/lalezar-fonts { }; - ldcBootstrap = callPackage ../development/compilers/ldc/bootstrap.nix { }; ldc = callPackage ../development/compilers/ldc { }; lbreakout2 = callPackage ../games/lbreakout2 { }; -- cgit v1.2.3 From 0e4417f1185e2093eb4f084e144f49a66f701db9 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 19 Apr 2020 15:03:37 +0200 Subject: Revert "nixos: Introduce nix.buildLocation option" This reverts commit 5291925fd2486175e781669412fa5a525da7602a. Reason: This started to cause severe regressions, see: - https://github.com/NixOS/nixpkgs/issues/85552 - https://github.com/NixOS/nixpkgs/pull/83166#pullrequestreview-395960588 Fixes #85552. --- nixos/modules/services/misc/nix-daemon.nix | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 022ddad8f36..0c2407e1dd2 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -430,16 +430,6 @@ in ''; }; - buildLocation = mkOption { - type = types.str; - default = "/tmp"; - example = "/var/buildroot"; - description = '' - Temporary directory, which used to unpack and build source packages. - (by default /tmp is used, which commonly reside on tmpfs, - and big packages (like browsers) can just not fit there) - ''; - }; }; }; @@ -486,9 +476,7 @@ in ++ optionals cfg.distributedBuilds [ pkgs.gzip ]; environment = cfg.envVars - // { CURL_CA_BUNDLE = "/etc/ssl/certs/ca-certificates.crt"; - TMPDIR = cfg.buildLocation; - } + // { CURL_CA_BUNDLE = "/etc/ssl/certs/ca-certificates.crt"; } // config.networking.proxy.envVars; unitConfig.RequiresMountsFor = "/nix/store"; @@ -502,8 +490,6 @@ in restartTriggers = [ nixConf ]; }; - systemd.tmpfiles.rules = [ "d ${cfg.buildLocation} 0775 root root -" ]; - # Set up the environment variables for running Nix. environment.sessionVariables = cfg.envVars // { NIX_PATH = cfg.nixPath; -- cgit v1.2.3 From e727346ccc54c37b8d96fb1765d688e4e4d04189 Mon Sep 17 00:00:00 2001 From: Lionello Lunesu Date: Sun, 19 Apr 2020 21:44:06 +0800 Subject: Add missing deps for linux --- pkgs/development/compilers/ldc/binary.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/ldc/binary.nix b/pkgs/development/compilers/ldc/binary.nix index 41a70662948..56d40be8619 100644 --- a/pkgs/development/compilers/ldc/binary.nix +++ b/pkgs/development/compilers/ldc/binary.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames +{ stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames, libxml2 , version, hashes }: with stdenv; let @@ -18,15 +18,15 @@ in mkDerivation { dontBuild = true; nativeBuildInputs = [ fixDarwinDylibNames autoPatchelfHook ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxml2 stdenv.cc.cc ]; + propagatedBuildInputs = [ curl tzdata ]; installPhase = '' mkdir -p $out mv bin etc import lib LICENSE README $out/ - - # fix paths in ldc2.conf (one level less) - # substituteInPlace $out/bin/ldc2.conf --replace "/../../" "/../" ''; meta = with lib; { -- cgit v1.2.3 From 00222dbb0efd3234b471207aa329025cf38d7d8b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 19 Apr 2020 16:25:48 +0200 Subject: bbswitch: fix build with Linux kernel version >= 5.6.0 Fixes https://github.com/NixOS/nixpkgs/issues/85564. --- pkgs/os-specific/linux/bbswitch/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/bbswitch/default.nix b/pkgs/os-specific/linux/bbswitch/default.nix index eea8d31f24d..67cbc6e5c5e 100644 --- a/pkgs/os-specific/linux/bbswitch/default.nix +++ b/pkgs/os-specific/linux/bbswitch/default.nix @@ -15,10 +15,16 @@ stdenv.mkDerivation { sha256 = "0xql1nv8dafnrcg54f3jsi3ny3cd2ca9iv73pxpgxd2gfczvvjkn"; }; - patches = [ (fetchpatch { - url = "https://github.com/Bumblebee-Project/bbswitch/pull/102.patch"; - sha256 = "1lbr6pyyby4k9rn2ry5qc38kc738d0442jhhq57vmdjb6hxjya7m"; - }) ]; + patches = [ + (fetchpatch { + url = "https://github.com/Bumblebee-Project/bbswitch/pull/102.patch"; + sha256 = "1lbr6pyyby4k9rn2ry5qc38kc738d0442jhhq57vmdjb6hxjya7m"; + }) + (fetchpatch { + url = "https://github.com/Bumblebee-Project/bbswitch/pull/196.patch"; + sha256 = "02ihy3piws7783qbm9q0mb9s18ipn5ckdy1iar74xn31qjrsn99n"; + }) + ]; nativeBuildInputs = kernel.moduleBuildDependencies; -- cgit v1.2.3 From 6cbf2e186cd505457602c2ff0c6aa64053c40050 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 19 Apr 2020 16:54:16 +0200 Subject: =?UTF-8?q?webkitgtk:=202.28.0=20=E2=86=92=202.28.1=20(#85378)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes a CVE https://webkitgtk.org/security/WSA-2020-0004.html https://webkitgtk.org/2020/04/13/webkitgtk2.28.1-released.html --- pkgs/development/libraries/webkitgtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index b0e5fbc5618..f1a5ddfd4a0 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -61,13 +61,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.28.0"; + version = "2.28.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "12qfs9w93c5kiyi14ynm4rf4ad3c213dvzmdrc9c3ab2iwbks7rn"; + sha256 = "rLwmo+1cE/OeRodc9EepwFQbbPsX+eeIQyNDHLMn89g="; }; patches = optionals stdenv.isLinux [ -- cgit v1.2.3 From 8084edb11c53e3ae36e980e3dfe7ea96d642f6c2 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 19 Apr 2020 11:07:39 -0500 Subject: terraform: fix /bin/stty reference (#85560) --- pkgs/applications/networking/cluster/terraform/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index b9c82f97c4f..ee27422a139 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildEnv, buildGoPackage, fetchFromGitHub, makeWrapper +{ stdenv, lib, buildEnv, buildGoPackage, fetchFromGitHub, makeWrapper, coreutils , runCommand, writeText, terraform-providers }: let @@ -18,6 +18,12 @@ let inherit sha256; }; + postPatch = '' + # speakeasy hardcodes /bin/stty https://github.com/bgentry/speakeasy/issues/22 + substituteInPlace vendor/github.com/bgentry/speakeasy/speakeasy_unix.go \ + --replace "/bin/stty" "${coreutils}/bin/stty" + ''; + postInstall = '' # remove all plugins, they are part of the main binary now for i in $bin/bin/*; do -- cgit v1.2.3 From 1b9ff92adc00e587cd7ef1465a62af75134b960f Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 19 Apr 2020 18:12:00 +0200 Subject: uboot: 2020.01 -> 2020.04 --- pkgs/misc/uboot/default.nix | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 06da268ff53..321891892b7 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -1,15 +1,27 @@ -{ stdenv, lib, fetchurl, fetchpatch, fetchFromGitHub, bc, bison, dtc, flex -, openssl, swig, meson-tools, armTrustedFirmwareAllwinner -, armTrustedFirmwareRK3328, armTrustedFirmwareRK3399 +{ stdenv +, lib +, fetchurl +, fetchpatch +, fetchFromGitHub +, bc +, bison +, dtc +, flex +, openssl +, swig +, meson-tools +, armTrustedFirmwareAllwinner +, armTrustedFirmwareRK3328 +, armTrustedFirmwareRK3399 , armTrustedFirmwareS905 , buildPackages }: let - defaultVersion = "2020.01"; + defaultVersion = "2020.04"; defaultSrc = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2"; - sha256 = "1w9ml4jl15q6ixpdqzspxjnl7d3rgxd7f99ms1xv5c8869h3qida"; + sha256 = "0wjkasnz87q86hx93inspdjfjsinmxi87bcvj30c773x0fpjlwzy"; }; buildUBoot = { version ? null -- cgit v1.2.3 From 3eee9961cc953b3df108df8a4c6302197a0b98c7 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 18 Apr 2020 21:25:48 -0400 Subject: contrast: 0.0.2 -> 0.0.3 --- pkgs/applications/accessibility/contrast/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/accessibility/contrast/default.nix b/pkgs/applications/accessibility/contrast/default.nix index 673c8071d4b..192bf041c64 100644 --- a/pkgs/applications/accessibility/contrast/default.nix +++ b/pkgs/applications/accessibility/contrast/default.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { pname = "contrast"; - version = "0.0.2"; + version = "0.0.3"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; @@ -27,10 +27,10 @@ rustPlatform.buildRustPackage rec { owner = "design"; repo = "contrast"; rev = version; - sha256 = "0rm705zrk9rfv31pwbqxrswi5v6vhnghxa8dgxjmcrh00l8dm6j9"; + sha256 = "0kk3mv7a6y258109xvgicmsi0lw0rcs00gfyivl5hdz7qh47iccy"; }; - cargoSha256 = "0qj0vmxa1d6war1vb3zgkf1drvk7awm970fw6692hd9msa9c1kkf"; + cargoSha256 = "0vi8nv4hkhsgqgz36xacwkk5cxirg6li44nbmk3x7vx7c64hzybq"; nativeBuildInputs = [ desktop-file-utils -- cgit v1.2.3 From 2457037d2e16d357c0245345d73493ed6ea04dcc Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 18 Apr 2020 21:26:12 -0400 Subject: lollypop: 1.2.32 -> 1.2.35 --- pkgs/applications/audio/lollypop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix index a3580ce3b52..e4b8b906fa6 100644 --- a/pkgs/applications/audio/lollypop/default.nix +++ b/pkgs/applications/audio/lollypop/default.nix @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { pname = "lollypop"; - version = "1.2.32"; + version = "1.2.35"; format = "other"; doCheck = false; @@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication rec { url = "https://gitlab.gnome.org/World/lollypop"; rev = "refs/tags/${version}"; fetchSubmodules = true; - sha256 = "03x6qihd349pq5lmgahb77sys60g16v5v6qkdlzf8k88451k8p7n"; + sha256 = "19nw9qh17yyi9ih1nwngbbwjx1vr26haqhmzsdqf0yjgsgf9vldx"; }; nativeBuildInputs = [ -- cgit v1.2.3 From a09e4c818080ba40c3b4a115da684221f3da256b Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 19 Apr 2020 12:34:05 -0400 Subject: elementary-planner: 2.2.14 -> 2.3.2 --- pkgs/applications/office/elementary-planner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/elementary-planner/default.nix b/pkgs/applications/office/elementary-planner/default.nix index def44b40e80..0ed5da38246 100644 --- a/pkgs/applications/office/elementary-planner/default.nix +++ b/pkgs/applications/office/elementary-planner/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "elementary-planner"; - version = "2.2.14"; + version = "2.3.2"; src = fetchFromGitHub { owner = "alainm23"; repo = "planner"; rev = version; - sha256 = "14k5kiknr0d3my17p4v20iiqzifpz3y80gdzj8vdxic8yk2yr1ap"; + sha256 = "1kjk1zafx71zmax3whzpx6mzl037wlxri30bl2k9y9rg3fd09arr"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 2c74cdac47e17fff9c0b0e7554bbcbdf319cbcdd Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sun, 19 Apr 2020 13:08:38 -0400 Subject: elementary-planner: fix stylesheet issue Revert a patch the works around some stylesheet issues: https://github.com/alainm23/planner/issues/268 https://github.com/alainm23/planner/issues/303 The don't seem to be a problem with Pantheon on NixOS and for some reason produce the opposite effect with pantheon's stylesheet. --- .../elementary-planner/0001-Revert-Add-patch.patch | 84 ++++++++++++++++++++++ .../office/elementary-planner/default.nix | 10 +++ 2 files changed, 94 insertions(+) create mode 100644 pkgs/applications/office/elementary-planner/0001-Revert-Add-patch.patch diff --git a/pkgs/applications/office/elementary-planner/0001-Revert-Add-patch.patch b/pkgs/applications/office/elementary-planner/0001-Revert-Add-patch.patch new file mode 100644 index 00000000000..ede3bc7a6ad --- /dev/null +++ b/pkgs/applications/office/elementary-planner/0001-Revert-Add-patch.patch @@ -0,0 +1,84 @@ +From a6d8bd67416c848f9bf52f4746bda34216ae9993 Mon Sep 17 00:00:00 2001 +From: worldofpeace +Date: Sun, 19 Apr 2020 12:48:59 -0400 +Subject: [PATCH] Revert "Add patch" + +This reverts commit c44127936b785afda0e914da4c1dc1e66a0ac97b. +--- + src/Application.vala | 49 -------------------------------------------- + 1 file changed, 49 deletions(-) + +diff --git a/src/Application.vala b/src/Application.vala +index 43d52fbc..82a9ebe5 100644 +--- a/src/Application.vala ++++ b/src/Application.vala +@@ -127,66 +127,17 @@ public class Planner : Gtk.Application { + + utils.apply_theme_changed (); + +- // Set Theme and Icon + Gtk.Settings.get_default ().set_property ("gtk-icon-theme-name", "elementary"); + Gtk.Settings.get_default ().set_property ("gtk-theme-name", "elementary"); + +- // Path Theme +- var command = new Granite.Services.SimpleCommand (".", "echo $DESKTOP_SESSION"); +- command.run (); +- command.output_changed.connect ((text) => { +- print ("DESKTOP_SESSION: %s\n".printf (text)); +- }); +- +- if (get_os_info ("PRETTY_NAME") == null || get_os_info ("PRETTY_NAME").index_of ("elementary") == -1) { +- string CSS = """ +- window decoration { +- box-shadow: none; +- margin: 1px; +- } +- """; +- +- var _provider = new Gtk.CssProvider (); +- _provider.load_from_data (CSS, CSS.length); +- +- Gtk.StyleContext.add_provider_for_screen ( +- Gdk.Screen.get_default (), _provider, +- Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION +- ); +- } +- + // Set shortcut + string quick_add_shortcut = settings.get_string ("quick-add-shortcut"); + if (quick_add_shortcut == "") { + quick_add_shortcut = "Tab"; + settings.set_string ("quick-add-shortcut", quick_add_shortcut); + } +- + utils.set_quick_add_shortcut (quick_add_shortcut); + } +- +- public string get_os_info (string field) { +- string return_value = ""; +- var file = File.new_for_path ("/etc/os-release"); +- try { +- var osrel = new Gee.HashMap (); +- var dis = new DataInputStream (file.read ()); +- string line; +- // Read lines until end of file (null) is reached +- while ((line = dis.read_line (null)) != null) { +- var osrel_component = line.split ("=", 2); +- if (osrel_component.length == 2) { +- osrel[osrel_component[0]] = osrel_component[1].replace ("\"", ""); +- } +- } +- +- return_value = osrel[field]; +- } catch (Error e) { +- warning ("Couldn't read os-release file, assuming elementary OS"); +- } +- +- return return_value; +- } + + public override int command_line (ApplicationCommandLine command_line) { + bool silence_mode = false; +-- +2.25.1 + diff --git a/pkgs/applications/office/elementary-planner/default.nix b/pkgs/applications/office/elementary-planner/default.nix index 0ed5da38246..b01c34d5a0e 100644 --- a/pkgs/applications/office/elementary-planner/default.nix +++ b/pkgs/applications/office/elementary-planner/default.nix @@ -24,6 +24,16 @@ stdenv.mkDerivation rec { sha256 = "1kjk1zafx71zmax3whzpx6mzl037wlxri30bl2k9y9rg3fd09arr"; }; + patches = [ + # Revert a patch the works around some stylesheet issues: + # https://github.com/alainm23/planner/issues/268 + # https://github.com/alainm23/planner/issues/303 + # The don't seem to be a problem with Pantheon on NixOS + # and for some reason produce the opposite effect with + # pantheon's stylesheet. + ./0001-Revert-Add-patch.patch + ]; + nativeBuildInputs = [ desktop-file-utils meson -- cgit v1.2.3 From c9a77e4d6dd4f6b5d2603a009408be10e1b8ee65 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 19 Apr 2020 18:43:11 +0200 Subject: pythonPackages.secretstorage: drop old dependency pygobject was an optional dependency at some point but it has been removed and is no longer needed. --- pkgs/development/python-modules/secretstorage/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/secretstorage/default.nix b/pkgs/development/python-modules/secretstorage/default.nix index 9e2b5df845e..d10ea9c8be2 100644 --- a/pkgs/development/python-modules/secretstorage/default.nix +++ b/pkgs/development/python-modules/secretstorage/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, buildPythonPackage, pythonOlder, cryptography, jeepney, pygobject3 }: +{ lib, fetchPypi, buildPythonPackage, pythonOlder, cryptography, jeepney }: buildPythonPackage rec { pname = "secretstorage"; @@ -15,7 +15,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ cryptography jeepney - pygobject3 ]; # Needs a D-Bus Sesison -- cgit v1.2.3 From f7c774326985dd5a734a7a6889c2ec60d2ad8bfd Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sun, 19 Apr 2020 19:24:21 +0200 Subject: libreoffice: fix build with poppler 0.86 was broken with update in #81955 / 6187d5babc1e8c0b2df2bd16a1d8cf4cb9aed9c8 --- pkgs/applications/office/libreoffice/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 7625ba3bea8..976fc0fcd2d 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -62,6 +62,11 @@ in (stdenv.mkDerivation rec { patches = [ ./xdg-open-brief.patch + (fetchpatch { + url = "https://git.pld-linux.org/gitweb.cgi?p=packages/libreoffice.git;a=blob_plain;f=poppler-0.86.patch;h=76b8356d5f22ef537a83b0f9b0debab591f152fe;hb=a2737a61353e305a9ee69640fb20d4582c218008"; + name = "poppler-0.86.patch"; + sha256 = "0q6k4l8imgp8ailcv0qx5l83afyw44hah24fi7gjrm9xgv5sbb8j"; + }) ]; tarballPath = "external/tarballs"; -- cgit v1.2.3 From cf2ff92ae9330e2dc894f9edfb0afc7d433236c0 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sun, 19 Apr 2020 19:25:58 +0200 Subject: libreoffice-fresh: 6.4.1.1 -> 6.4.3.2 --- pkgs/applications/office/libreoffice/src-fresh/download.nix | 8 ++++---- pkgs/applications/office/libreoffice/src-fresh/primary.nix | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/office/libreoffice/src-fresh/download.nix b/pkgs/applications/office/libreoffice/src-fresh/download.nix index bc329e5a8f8..f4b14870eb7 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/download.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/download.nix @@ -728,11 +728,11 @@ md5name = "a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126-postgresql-9.2.24.tar.bz2"; } { - name = "Python-3.7.6.tar.xz"; - url = "http://dev-www.libreoffice.org/src/Python-3.7.6.tar.xz"; - sha256 = "55a2cce72049f0794e9a11a84862e9039af9183603b78bc60d89539f82cf533f"; + name = "Python-3.7.7.tar.xz"; + url = "http://dev-www.libreoffice.org/src/Python-3.7.7.tar.xz"; + sha256 = "06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136"; md5 = ""; - md5name = "55a2cce72049f0794e9a11a84862e9039af9183603b78bc60d89539f82cf533f-Python-3.7.6.tar.xz"; + md5name = "06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136-Python-3.7.7.tar.xz"; } { name = "QR-Code-generator-1.4.0.tar.gz"; diff --git a/pkgs/applications/office/libreoffice/src-fresh/primary.nix b/pkgs/applications/office/libreoffice/src-fresh/primary.nix index fb21d1292d6..5b62b0df954 100644 --- a/pkgs/applications/office/libreoffice/src-fresh/primary.nix +++ b/pkgs/applications/office/libreoffice/src-fresh/primary.nix @@ -8,8 +8,8 @@ rec { major = "6"; minor = "4"; - patch = "1"; - tweak = "1"; + patch = "3"; + tweak = "2"; subdir = "${major}.${minor}.${patch}"; @@ -17,13 +17,13 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "03fqpkilz4yi35l447hb9r8gjwj23l61bpdkwg21jm8blm8kkvyj"; + sha256 = "1cmbrhha7mlflnlbpla8fix07cxcgkdb7krnrgs1bylf31y5855w"; }; # FIXME rename translations = fetchSrc { name = "translations"; - sha256 = "0a7arjlxxy7hjm1brxwd124bf1gkbl92bgygi3sbbhbsv07pjdcr"; + sha256 = "06z9hz4m3kdcljjc6y5s18001axjibj9xiyakdndkl9pmnnhn9h3"; }; # the "dictionaries" archive is not used for LO build because we already build hunspellDicts packages from @@ -31,6 +31,6 @@ rec { help = fetchSrc { name = "help"; - sha256 = "1hfllrdyxrg5mgqry3dcrhjbdrd0d27k5mvv4sfj7nwjlmjh8rqq"; + sha256 = "0mpgrwg8z1q38j03l6m1sdpcplyjd5nz1nqaa13vfkryj2lflw45"; }; } -- cgit v1.2.3 From bff2c1258eb2cce8d78dbce343cb36232d2272e3 Mon Sep 17 00:00:00 2001 From: Kirill Elagin Date: Sun, 19 Apr 2020 17:15:17 +0300 Subject: gmailieer: 1.0 -> 1.1, rename to lieer --- pkgs/applications/networking/gmailieer/default.nix | 35 ---------------------- pkgs/applications/networking/lieer/default.nix | 35 ++++++++++++++++++++++ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 +-- 4 files changed, 38 insertions(+), 37 deletions(-) delete mode 100644 pkgs/applications/networking/gmailieer/default.nix create mode 100644 pkgs/applications/networking/lieer/default.nix diff --git a/pkgs/applications/networking/gmailieer/default.nix b/pkgs/applications/networking/gmailieer/default.nix deleted file mode 100644 index 2acc838e4a4..00000000000 --- a/pkgs/applications/networking/gmailieer/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv, fetchFromGitHub, python3Packages }: - -python3Packages.buildPythonApplication rec { - name = "gmailieer-${version}"; - version = "1.0"; - - src = fetchFromGitHub { - owner = "gauteh"; - repo = "gmailieer"; - rev = "v${version}"; - sha256 = "1zzylv8xbcrh34bz0s29dawzcyx39lai8y8wk0bl4x75v1jfynvf"; - }; - - propagatedBuildInputs = with python3Packages; [ - notmuch - oauth2client - google_api_python_client - tqdm - ]; - - meta = with stdenv.lib; { - description = "Fast email-fetching and two-way tag synchronization between notmuch and GMail"; - longDescription = '' - This program can pull email and labels (and changes to labels) - from your GMail account and store them locally in a maildir with - the labels synchronized with a notmuch database. The changes to - tags in the notmuch database may be pushed back remotely to your - GMail account. - ''; - homepage = "https://github.com/gauteh/gmailieer"; - repositories.git = "https://github.com/gauteh/gmailieer.git"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ kaiha ]; - }; -} diff --git a/pkgs/applications/networking/lieer/default.nix b/pkgs/applications/networking/lieer/default.nix new file mode 100644 index 00000000000..fc5214f0d01 --- /dev/null +++ b/pkgs/applications/networking/lieer/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonApplication rec { + pname = "lieer"; + version = "1.1"; + + src = fetchFromGitHub { + owner = "gauteh"; + repo = "lieer"; + rev = "v${version}"; + sha256 = "19jx3sm925nrzl26km1bxbp6y5gk1mzwadd79vip2jl70b3xk9f8"; + }; + + propagatedBuildInputs = with python3Packages; [ + notmuch + oauth2client + google_api_python_client + tqdm + ]; + + meta = with stdenv.lib; { + description = "Fast email-fetching and two-way tag synchronization between notmuch and GMail"; + longDescription = '' + This program can pull email and labels (and changes to labels) + from your GMail account and store them locally in a maildir with + the labels synchronized with a notmuch database. The changes to + tags in the notmuch database may be pushed back remotely to your + GMail account. + ''; + homepage = "https://lieer.gaute.vetsj.com/"; + repositories.git = "https://github.com/gauteh/lieer.git"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ kaiha ]; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5ba9b723edd..523a1930436 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -152,6 +152,7 @@ mapAliases ({ gettextWithExpat = gettext; # 2016-02-19 git-hub = gitAndTools.git-hub; # added 2016-04-29 glib_networking = glib-networking; # added 2018-02-25 + gmailieer = lieer; # added 2020-04-19 gnome-mpv = celluloid; # added 2019-08-22 gnome15 = throw "gnome15 has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # added 2019-12-10 gmic_krita_qt = gmic-qt-krita; # added 2019-09-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7346c8ae1c..7d82c25925d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16436,8 +16436,6 @@ in gfxtablet = callPackage ../os-specific/linux/gfxtablet {}; - gmailieer = callPackage ../applications/networking/gmailieer {}; - gmailctl = callPackage ../applications/networking/gmailctl {}; gpm = callPackage ../servers/gpm { @@ -16544,6 +16542,8 @@ in libnl = callPackage ../os-specific/linux/libnl { }; + lieer = callPackage ../applications/networking/lieer {}; + linuxConsoleTools = callPackage ../os-specific/linux/consoletools { }; openelec-dvb-firmware = callPackage ../os-specific/linux/firmware/openelec-dvb-firmware { }; -- cgit v1.2.3 From 4f7e4a6b59104e2621a3292d188b24215b2a21d7 Mon Sep 17 00:00:00 2001 From: Yegor Timoshenko Date: Sun, 19 Apr 2020 22:20:07 +0300 Subject: nixos/release-small: drop latestKernel.login This partially reverts e133e396df9f5a466f2de592dd0b429dee62c959. --- nixos/release-small.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/release-small.nix b/nixos/release-small.nix index ed7bbd81138..6da2c59cedd 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -101,7 +101,6 @@ in rec { "nixos.tests.installer.separateBoot.x86_64-linux" "nixos.tests.installer.simple.x86_64-linux" "nixos.tests.ipv6.x86_64-linux" - "nixos.tests.latestKernel.login.x86_64-linux" "nixos.tests.login.x86_64-linux" "nixos.tests.misc.x86_64-linux" "nixos.tests.nat.firewall-conntrack.x86_64-linux" -- cgit v1.2.3 From 0e48a68559dabdee75788323bd77ab8b579d6205 Mon Sep 17 00:00:00 2001 From: Sirio Balmelli Date: Sun, 19 Apr 2020 21:39:37 +0200 Subject: howdoi: fix Darwin build dependencies Signed-off-by: Sirio Balmelli --- pkgs/development/python-modules/howdoi/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/howdoi/default.nix b/pkgs/development/python-modules/howdoi/default.nix index 9b1fb75b461..970c2025879 100644 --- a/pkgs/development/python-modules/howdoi/default.nix +++ b/pkgs/development/python-modules/howdoi/default.nix @@ -1,10 +1,13 @@ { lib +, stdenv , buildPythonPackage , fetchPypi , six , requests-cache , pygments , pyquery +, cachelib +, appdirs }: buildPythonPackage rec { @@ -16,7 +19,8 @@ buildPythonPackage rec { sha256 = "3b322668606d29d8a841c3b28c0574851f512b55c33a7ceb982b6a98d82fa3e3"; }; - propagatedBuildInputs = [ six requests-cache pygments pyquery ]; + propagatedBuildInputs = [ six requests-cache pygments pyquery ] + ++ lib.optionals stdenv.isDarwin [ cachelib appdirs ]; preCheck = '' export HOME=$(mktemp -d) -- cgit v1.2.3 From 85501cae5e6a51b176d6af912fa8419bfa146b58 Mon Sep 17 00:00:00 2001 From: Sirio Balmelli Date: Sun, 19 Apr 2020 19:43:08 +0000 Subject: howdoi: cachelib and appdirs dependencies _also_ needed for Linux. Signed-off-by: Sirio Balmelli --- pkgs/development/python-modules/howdoi/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/howdoi/default.nix b/pkgs/development/python-modules/howdoi/default.nix index 970c2025879..c98192e9b0a 100644 --- a/pkgs/development/python-modules/howdoi/default.nix +++ b/pkgs/development/python-modules/howdoi/default.nix @@ -1,5 +1,4 @@ { lib -, stdenv , buildPythonPackage , fetchPypi , six @@ -19,8 +18,7 @@ buildPythonPackage rec { sha256 = "3b322668606d29d8a841c3b28c0574851f512b55c33a7ceb982b6a98d82fa3e3"; }; - propagatedBuildInputs = [ six requests-cache pygments pyquery ] - ++ lib.optionals stdenv.isDarwin [ cachelib appdirs ]; + propagatedBuildInputs = [ six requests-cache pygments pyquery cachelib appdirs ]; preCheck = '' export HOME=$(mktemp -d) -- cgit v1.2.3 From 0c454c46f4f04df4e05dc84e1e1384ed91ec37f1 Mon Sep 17 00:00:00 2001 From: Aaron Ash Date: Mon, 20 Apr 2020 06:27:20 +1000 Subject: j: 807 -> 901 Upgrade j to 901. Uses the newer build scripts in the make2 directory in the jsource repo. --- pkgs/development/interpreters/j/default.nix | 43 +++++++---------------------- 1 file changed, 10 insertions(+), 33 deletions(-) diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix index f7500c169e6..c3d5221d42a 100644 --- a/pkgs/development/interpreters/j/default.nix +++ b/pkgs/development/interpreters/j/default.nix @@ -2,13 +2,14 @@ stdenv.mkDerivation rec { pname = "j"; - version = "807"; - jtype = "release"; + version = "901"; + jtype = "release-e"; src = fetchFromGitHub { owner = "jsoftware"; repo = "jsource"; rev = "j${version}-${jtype}"; - sha256 = "1qciw2yg9x996zglvj2461qby038x89xcmfb3qyrh3myn8m1nq2n"; + sha256 = "13ky37rrl6mc66fckrdnrw64gmvq1qlv6skzd513lab4d0wigshw"; + name = "jsource"; }; buildInputs = [ readline libedit bc ]; @@ -26,57 +27,33 @@ stdenv.mkDerivation rec { export HOME=$TMPDIR export JLIB=$SOURCE_DIR/jlibrary - export jbld=$HOME/bld - export jplatform=${platform} - export jmake=$SOURCE_DIR/make - export jgit=$SOURCE_DIR - export JBIN=$jbld/j${bits}/bin - mkdir -p $JBIN - echo $OUT_DIR - cd make + cd make2 patchShebangs . - sed -i jvars.sh -e " - s@~/git/jsource@$SOURCE_DIR@; - s@~/jbld@$HOME@; - " - sed -i $JLIB/bin/profile.ijs -e "s@'/usr/share/j/.*'@'$out/share/j'@;" - # For future versions, watch - # https://github.com/jsoftware/jsource/pull/4 - cp ./jvars.sh $HOME + ./build_all.sh - echo ' - #define jversion "${version}" - #define jplatform "${platform}" - #define jtype "${jtype}" // release,beta,... - #define jlicense "GPL3" - #define jbuilder "nixpkgs" // website or email - ' > ../jsrc/jversion.h - - ./build_jconsole.sh j${bits} - ./build_libj.sh j${bits} + cp $SOURCE_DIR/bin/${platform}/j${bits}*/* "$JLIB/bin" ''; checkPhase = '' - echo 'i. 5' | $JBIN/jconsole | fgrep "0 1 2 3 4" + + echo 'i. 5' | $JLIB/bin/jconsole | fgrep "0 1 2 3 4" # Now run the real tests cd $SOURCE_DIR/test for f in *.ijs do echo $f - $JBIN/jconsole < $f > /dev/null || echo FAIL && echo PASS + $JLIB/bin/jconsole < $f > /dev/null || echo FAIL && echo PASS done ''; installPhase = '' mkdir -p "$out" - cp -r $JBIN "$out/bin" - rm $out/bin/*.txt # Remove logs from the bin folder mkdir -p "$out/share/j" cp -r $JLIB/{addons,system} "$out/share/j" -- cgit v1.2.3 From 45948bd56bdbbeb57dbfa76b8a25e5081c564736 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 19 Apr 2020 22:42:26 +0200 Subject: python3Packages.pytesseract: 0.3.3 -> 0.3.4 https://pypi.org/project/pytesseract/0.3.4/ --- pkgs/development/python-modules/pytesseract/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytesseract/default.nix b/pkgs/development/python-modules/pytesseract/default.nix index 496a163cb5f..0111695ca73 100644 --- a/pkgs/development/python-modules/pytesseract/default.nix +++ b/pkgs/development/python-modules/pytesseract/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pytesseract"; - version = "0.3.3"; + version = "0.3.4"; src = fetchPypi { inherit pname version; - sha256 = "0lml55jrvdzy9fm31zpw64fqc4d6p5djg1ax2kgnimzfscxghh8h"; + sha256 = "16l9b9f5v0a9j5jfgpd8irk9yhc9byzirrzv1rlkapdbz36sbn5g"; }; patches = [ -- cgit v1.2.3 From 712bf551d8a2180c5c4a42e317e562458a07e397 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Maret?= Date: Sun, 19 Apr 2020 23:07:10 +0200 Subject: blas: fix build on darwin --- pkgs/build-support/alternatives/blas/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/alternatives/blas/default.nix b/pkgs/build-support/alternatives/blas/default.nix index b1dadf23c07..36708ce8841 100644 --- a/pkgs/build-support/alternatives/blas/default.nix +++ b/pkgs/build-support/alternatives/blas/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation { patchelf --set-rpath "$(patchelf --print-rpath $out/lib/libblas${canonicalExtension}):${lib.getLib blasProvider}/lib" $out/lib/libblas${canonicalExtension} '' else if stdenv.hostPlatform.isDarwin then '' install_name_tool \ - -id libblas${canonicalExtension} + -id libblas${canonicalExtension} \ -add_rpath ${lib.getLib blasProvider}/lib \ $out/lib/libblas${canonicalExtension} '' else "") + '' -- cgit v1.2.3 From 410fc69c7c6954084f0d11c82fb2208d9fe33c78 Mon Sep 17 00:00:00 2001 From: Sirio Balmelli Date: Sun, 19 Apr 2020 22:21:08 +0200 Subject: mscgen: add pkg-config build-time dependency Signed-off-by: Sirio Balmelli --- pkgs/tools/graphics/mscgen/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix index 29f0f224735..a8aa9cffb98 100644 --- a/pkgs/tools/graphics/mscgen/default.nix +++ b/pkgs/tools/graphics/mscgen/default.nix @@ -1,4 +1,16 @@ -{ stdenv, fetchurl, flex, bison, gd, libpng, libjpeg, freetype, zlib, libwebp, runtimeShell }: +{ stdenv +, bison +, fetchurl +, flex +, freetype +, gd +, libjpeg +, libpng +, libwebp +, pkg-config +, runtimeShell +, zlib +}: let version = "0.20"; @@ -12,7 +24,7 @@ stdenv.mkDerivation { sha256 = "3c3481ae0599e1c2d30b7ed54ab45249127533ab2f20e768a0ae58d8551ddc23"; }; - buildInputs = [ flex bison gd libjpeg libpng freetype zlib libwebp ]; + buildInputs = [ bison flex freetype gd libjpeg libpng libwebp pkg-config zlib ]; doCheck = true; preCheck = '' -- cgit v1.2.3 From 8f6882bb4cf0ed8f97d966b13c498cbbf9bccc94 Mon Sep 17 00:00:00 2001 From: samlich <1349989+samlich@users.noreply.github.com> Date: Fri, 24 Jan 2020 20:08:08 +0000 Subject: lutris: fix gog integration --- pkgs/applications/misc/lutris/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index 297596b8e39..2ff2a82dd4f 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -1,5 +1,5 @@ { buildPythonApplication, lib, fetchFromGitHub, fetchpatch -, wrapGAppsHook, gobject-introspection, gnome-desktop, libnotify, libgnome-keyring, pango +, wrapGAppsHook, gobject-introspection, glib-networking, gnome-desktop, libnotify, libgnome-keyring, pango , gdk-pixbuf, atk, webkitgtk, gst_all_1 , dbus-python, evdev, pyyaml, pygobject3, requests, pillow , xrandr, pciutils, psmisc, glxinfo, vulkan-tools, xboxdrv, pulseaudio, p7zip, xgamma @@ -40,8 +40,9 @@ in buildPythonApplication rec { sha256 = "1g093g0difnkjmnm91p20issdsxn9ri4c56zzddj5wfrbmhwdfag"; }; + nativeBuildInputs = [ wrapGAppsHook ]; buildInputs = [ - wrapGAppsHook gobject-introspection gnome-desktop libnotify libgnome-keyring pango + gobject-introspection glib-networking gnome-desktop libnotify libgnome-keyring pango gdk-pixbuf atk webkitgtk ] ++ gstDeps; -- cgit v1.2.3 From a72c5b53880f931a176292f205a1c1db86156347 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 19 Apr 2020 11:41:32 +0000 Subject: modemmanager: enableParallelBuilding Seems to work fine for me at -j48. --- pkgs/tools/networking/modem-manager/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix index e9d925fb930..badfddd6d50 100644 --- a/pkgs/tools/networking/modem-manager/default.nix +++ b/pkgs/tools/networking/modem-manager/default.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { export G_TEST_DBUS_DAEMON="${dbus.daemon}/bin/dbus-daemon" ''; + enableParallelBuilding = true; + doCheck = true; meta = with stdenv.lib; { -- cgit v1.2.3 From ec2710b0d750069f594b89f47006c21c6e074dca Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 19 Apr 2020 11:46:05 +0000 Subject: libqmi: enableParallelBuilding Works fine for me with -j48. --- pkgs/development/libraries/libqmi/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index 396706b88e6..b1504fc9540 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -26,6 +26,8 @@ stdenv.mkDerivation rec { libmbim ]; + enableParallelBuilding = true; + doCheck = true; meta = with stdenv.lib; { -- cgit v1.2.3 From f578c517a3f6a2b8d1fda12f07a19fd349279874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 15 Apr 2020 13:35:35 -0300 Subject: xfce.xfce4-dict-plugin: remove - The xfce4-dict-plugin is now part of xfce4-dict - See https://goodies.xfce.org/projects/panel-plugins/xfce4-dict-plugin - Throws a message --- pkgs/desktops/xfce/default.nix | 4 +-- .../xfce/panel-plugins/xfce4-dict-plugin.nix | 32 ---------------------- 2 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 0eb66b170aa..579e863bf9c 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -117,8 +117,6 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4-datetime-plugin = callPackage ./panel-plugins/xfce4-datetime-plugin { }; - xfce4-dict-plugin = callPackage ./panel-plugins/xfce4-dict-plugin.nix { }; - xfce4-dockbarx-plugin = callPackage ./panel-plugins/xfce4-dockbarx-plugin.nix { }; xfce4-embed-plugin = callPackage ./panel-plugins/xfce4-embed-plugin.nix { }; @@ -187,7 +185,6 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4_cpufreq_plugin = xfce4-cpufreq-plugin; xfce4_cpugraph_plugin = xfce4-cpugraph-plugin; xfce4_datetime_plugin = xfce4-datetime-plugin; - xfce4_dict_plugin = xfce4-dict-plugin; xfce4_dockbarx_plugin = xfce4-dockbarx-plugin; xfce4_embed_plugin = xfce4-embed-plugin; xfce4_eyes_plugin = xfce4-eyes-plugin; @@ -211,6 +208,7 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4-mixer = throw "deprecated 2019-08-18: obsoleted by xfce4-pulseaudio-plugin"; # added 2019-08-18 gtk-xfce-engine = throw "deprecated 2019-09-17: Xfce 4.14 deprecated gtk-xfce-engine"; # added 2019-09-17 + xfce4-dict-plugin = throw "deprecated 2020-04-19: xfce4-dict-plugin is now part of xfce4-dict."; # added 2020-04-19 # added 2019-11-04 libxfce4ui_gtk3 = libxfce4ui; diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix deleted file mode 100644 index ae6141bd662..00000000000 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-dict-plugin.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, xfce }: - -let - category = "panel-plugins"; -in - -stdenv.mkDerivation rec { - pname = "xfce4-dict-plugin"; - version = "0.3.0"; - - src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "1x0imfnsdfq7fbhka8bc0yjjspkcljc1jafhrwzb08qi9bk2wbar"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ]; - - passthru.updateScript = xfce.updateScript { - inherit pname version; - attrPath = "xfce.${pname}"; - versionLister = xfce.archiveLister category pname; - }; - - meta =with stdenv.lib; { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${pname}"; - description = "Dictionary plugin for Xfce panel"; - platforms = platforms.linux; - maintainers = [ maintainers.AndersonTorres ]; - broken = true; # see https://goodies.xfce.org/projects/panel-plugins/xfce4-dict-plugin - }; -} -- cgit v1.2.3 From e18514f8470ee6ccd3437bcd743328b71def8385 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 15 Apr 2020 14:50:50 -0300 Subject: xfce.exo: 0.12.8 -> 0.12.11 --- pkgs/desktops/xfce/core/exo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/exo/default.nix b/pkgs/desktops/xfce/core/exo/default.nix index 59ab5823314..6566d77ebbe 100644 --- a/pkgs/desktops/xfce/core/exo/default.nix +++ b/pkgs/desktops/xfce/core/exo/default.nix @@ -4,9 +4,9 @@ mkXfceDerivation { category = "xfce"; pname = "exo"; - version = "0.12.8"; + version = "0.12.11"; - sha256 = "013am7q4pwfncf4hk2a3hv7yx2vxgzb5xm8qsi9mxkj29xdhrvs5"; + sha256 = "1db7w6jk3i501x4qw0hs0ydrm1fjdkxmahzbv5iag859wnnlg0pd"; nativeBuildInputs = [ libxslt perlPackages.URI docbook_xsl ]; buildInputs = [ gtk3 glib libxfce4ui libxfce4util ]; -- cgit v1.2.3 From 20b701df3830f3ae6086b6613489f4a3653a2e29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 15 Apr 2020 14:50:50 -0300 Subject: xfce.gigolo: 0.5.0 -> 0.5.1 --- pkgs/desktops/xfce/applications/gigolo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/gigolo/default.nix b/pkgs/desktops/xfce/applications/gigolo/default.nix index 7b643bd0dc8..251866528e6 100644 --- a/pkgs/desktops/xfce/applications/gigolo/default.nix +++ b/pkgs/desktops/xfce/applications/gigolo/default.nix @@ -3,10 +3,10 @@ mkXfceDerivation { category = "apps"; pname = "gigolo"; - version = "0.5.0"; + version = "0.5.1"; odd-unstable = false; - sha256 = "1lqsxb0d5i8p9vbzx8s4p3rga7va5h1q146xgmsa41j5v40wrlw6"; + sha256 = "11a35z5apr26nl6fpmbsvvv3xf5w61sgzcb505plavrchpfbdxjn"; nativeBuildInputs = [ exo ]; buildInputs = [ gtk3 glib gvfs ]; -- cgit v1.2.3 From 279bb5a0960bf05c290bbc7c740eb1c993c40d5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 15 Apr 2020 14:50:50 -0300 Subject: xfce.parole: 1.0.4 -> 1.0.5 --- pkgs/desktops/xfce/applications/parole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/parole/default.nix b/pkgs/desktops/xfce/applications/parole/default.nix index 20b899165f0..bfb86518448 100644 --- a/pkgs/desktops/xfce/applications/parole/default.nix +++ b/pkgs/desktops/xfce/applications/parole/default.nix @@ -7,9 +7,9 @@ mkXfceDerivation { category = "apps"; pname = "parole"; - version = "1.0.4"; + version = "1.0.5"; - sha256 = "18j4bmny37crryh4pvxcjjvj99mln6ljq2vy69awxhvrjx9ljv13"; + sha256 = "0qgis2gnkcvg7xwp76cbi0ihqdjprvvw2d66hk7klhrafp7c0v13"; postPatch = '' substituteInPlace src/plugins/mpris2/Makefile.am \ -- cgit v1.2.3 From c0c96e8b9497fb63ebdd8e7f7290ce4e80aa0125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 15 Apr 2020 14:50:50 -0300 Subject: xfce.xfce4-terminal: 0.8.8 -> 0.8.9.2 --- pkgs/desktops/xfce/applications/xfce4-terminal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix index 3b9cd268d55..56de8d3bfb8 100644 --- a/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-terminal/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-terminal"; - version = "0.8.8"; + version = "0.8.9.2"; - sha256 = "0sg9vwyvhh7pjp83biv7gvf42423a7ly4dc7q2gn28kp6bds2qcp"; + sha256 = "1vlpfsrdalqmsd86aj0kvvam5skzn6xngigjziwli6q6il6lb9fj"; buildInputs = [ gtk3 libxfce4ui vte xfconf pcre2 ]; -- cgit v1.2.3 From 5d7b798861c9b70c8b1e21d615a4f0ad31f058b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 15 Apr 2020 14:50:50 -0300 Subject: xfce.thunar: 1.8.9 -> 1.8.14 --- pkgs/desktops/xfce/core/thunar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix index 11220141d2a..24df606e246 100644 --- a/pkgs/desktops/xfce/core/thunar/default.nix +++ b/pkgs/desktops/xfce/core/thunar/default.nix @@ -21,9 +21,9 @@ let unwrapped = mkXfceDerivation { category = "xfce"; pname = "thunar"; - version = "1.8.9"; + version = "1.8.14"; - sha256 = "01w60csbs2nq1bhb8n1bnmjmx48fm0va3qbnq84z0h2dxpr80b1w"; + sha256 = "1ph9bcqfm2nccliagl8zdl1dizh62qnr8m5hacri3cs2jhc0jjpy"; nativeBuildInputs = [ docbook_xsl -- cgit v1.2.3 From c911a4cf0bff728f838c33d7c7a9f2a367254e48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 15 Apr 2020 14:50:50 -0300 Subject: xfce.tumbler: 0.2.7 -> 0.2.8 --- pkgs/desktops/xfce/core/tumbler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/tumbler/default.nix b/pkgs/desktops/xfce/core/tumbler/default.nix index b795007ca7c..1a615b8f66a 100644 --- a/pkgs/desktops/xfce/core/tumbler/default.nix +++ b/pkgs/desktops/xfce/core/tumbler/default.nix @@ -14,9 +14,9 @@ mkXfceDerivation { category = "xfce"; pname = "tumbler"; - version = "0.2.7"; + version = "0.2.8"; - sha256 = "14ql3fcxyz81qr9s0vcwh6j2ks5fl8jf9scwnkilv5jy0ii9l0ry"; + sha256 = "1y9sphaz3izal96v53lps692xxzp5pad1d09kxsmmpm7pic4n1r2"; buildInputs = [ ffmpegthumbnailer -- cgit v1.2.3 From 404d9c52fe9672748de3314a98c6323d6085d00e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 15 Apr 2020 14:50:50 -0300 Subject: xfce.xfburn: 0.6.1 -> 0.6.2 --- pkgs/desktops/xfce/applications/xfburn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfburn/default.nix b/pkgs/desktops/xfce/applications/xfburn/default.nix index 08f2bd511a8..8aff25df494 100644 --- a/pkgs/desktops/xfce/applications/xfburn/default.nix +++ b/pkgs/desktops/xfce/applications/xfburn/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "apps"; pname = "xfburn"; - version = "0.6.1"; + version = "0.6.2"; - sha256 = "0a1ly79x7j5pgr3vbsabb4i0jd5rryaigj9z8iqzr8p9miypx20v"; + sha256 = "02axhsbbsvd31jb0xs1d2qxr614qb29pajv0sm2p1n1c2cv2fjh1"; nativeBuildInputs = [ libxslt docbook_xsl ]; buildInputs = [ exo gtk3 libburn libisofs libxfce4ui ]; -- cgit v1.2.3 From d2d14fa1c621384dcd4d993603622810b68dee39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 15 Apr 2020 14:50:50 -0300 Subject: xfce.xfce4-battery-plugin: 1.1.2 -> 1.1.3 --- pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin/default.nix index 0120cea0886..0d047447e0c 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-battery-plugin/default.nix @@ -3,10 +3,10 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-battery-plugin"; - version = "1.1.2"; + version = "1.1.3"; rev-prefix = ""; odd-unstable = false; - sha256 = "0329miiclc8da6j0sz495p99hyrf9fjhvpmdl0556fphybz5agc0"; + sha256 = "0ligdiasrfc3170kd7sif2ml6lvlpp11lbxz3xdvklqkv7p3323y"; buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ]; -- cgit v1.2.3 From d233a80946323db33795e3b7b56004ee72f4aeec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 15 Apr 2020 14:50:50 -0300 Subject: xfce.xfce4-clipman-plugin: 1.4.3 -> 1.6.1 --- pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix index f814850561a..2349b4bf3e8 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix @@ -3,8 +3,8 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-clipman-plugin"; - version = "1.4.3"; - sha256 = "1xk79xh1zk0x4r1z9m1dakp79pip0zh3naviybvl1dnpwwfc03gq"; + version = "1.6.1"; + sha256 = "03akijvry1n1fkziyvxwcksl4vy4lmnpgd5izjs8jai5sndhsszl"; buildInputs = [ exo gtk3 libXtst libxfce4ui libxfce4util xfce4-panel xfconf ]; -- cgit v1.2.3 From 97b4f63ec76cb595c90d512f6e45138b8ccc10c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 15 Apr 2020 14:50:50 -0300 Subject: xfce.xfce4-dict: 0.8.2 -> 0.8.3 --- pkgs/desktops/xfce/applications/xfce4-dict/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfce4-dict/default.nix b/pkgs/desktops/xfce/applications/xfce4-dict/default.nix index b2682080216..7e582abc05f 100644 --- a/pkgs/desktops/xfce/applications/xfce4-dict/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-dict/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-dict"; - version = "0.8.2"; + version = "0.8.3"; - sha256 = "1zbb0k0984ny7wy4gbk6ymkh87rbfakpim54yq4r3h5ymslx7iv7"; + sha256 = "0p7k2ffknr23hh3j17dhh5q8adn736p2piwx0sg8f5dvvhhc5whz"; patches = [ ./configure-gio.patch ]; -- cgit v1.2.3 From 8fdb4832d7c39e080455fd5fbd4bd59252292738 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 15 Apr 2020 14:50:51 -0300 Subject: xfce.xfce4-cpugraph-plugin: 1.0.5 -> 1.1.0 --- .../xfce/panel-plugins/xfce4-cpugraph-plugin.nix | 30 +++++++++++++++++----- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix index 22a019e56bc..38ad759e700 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-cpugraph-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xorgproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, hicolor-icon-theme, xfce }: +{ stdenv, fetchurl, pkgconfig, intltool, glib, exo, libXtst, xorgproto, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, hicolor-icon-theme, xfce }: let category = "panel-plugins"; @@ -6,16 +6,31 @@ in stdenv.mkDerivation rec { pname = "xfce4-cpugraph-plugin"; - version = "1.0.5"; + version = "1.1.0"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "1izl53q95m5xm2fiq7385vb1i9nwgjizxkmgpgh33zdckb40xnl5"; + sha256 = "193bj1p54l4zrvgdjj0pvjn161d6dn82jh9invcy09sqwlj0mkiy"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool glib exo libXtst xorgproto libxfce4util libxfce4ui xfce4-panel xfconf gtk2 hicolor-icon-theme ]; - + nativeBuildInputs = [ + pkgconfig + intltool + ]; + + buildInputs = [ + glib + exo + libXtst + xorgproto + libxfce4util + libxfce4ui + xfce4-panel + xfconf + gtk3 + hicolor-icon-theme + ]; + passthru.updateScript = xfce.updateScript { inherit pname version; attrPath = "xfce.${pname}"; @@ -23,8 +38,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${pname}"; + homepage = "https://docs.xfce.org/panel-plugins/xfce4-cpugraph-plugin"; description = "CPU graph show for Xfce panel"; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; }; -- cgit v1.2.3 From 118415ac41e3f798b7519d228b8541267c726dca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 15 Apr 2020 14:50:51 -0300 Subject: xfce.xfce4-eyes-plugin: 4.4.4 -> 4.5.0 --- .../xfce/panel-plugins/xfce4-eyes-plugin.nix | 26 +++++++++++++++------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix index 687bcf59859..220e2506858 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-eyes-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, xfce }: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, xfce }: let category = "panel-plugins"; @@ -6,15 +6,25 @@ in stdenv.mkDerivation rec { pname = "xfce4-eyes-plugin"; - version = "4.4.4"; + version = "4.5.0"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "1jh02hylvsvfpxrx0bq6fzgy6vnxf9qakgpbfvr63lfkd1dyh314"; + sha256 = "17gj6fbvvrdzvz61czmia8hqynllsnmhk61fs4aml443cc1h1bpx"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ]; + nativeBuildInputs = [ + pkgconfig + intltool + ]; + + buildInputs = [ + libxfce4util + libxfce4ui + xfce4-panel + xfconf + gtk3 + ]; passthru.updateScript = xfce.updateScript { inherit pname version; @@ -23,10 +33,10 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${pname}"; - description = "Eyes following you!"; + homepage = "https://docs.xfce.org/panel-plugins/xfce4-eyes-plugin"; + description = "Rolling eyes (following mouse pointer) plugin for the Xfce panel"; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; - broken = true; }; } -- cgit v1.2.3 From 81cef8fc21b720c7374e4e4731e24d01d0bc4e77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 15 Apr 2020 14:50:51 -0300 Subject: xfce.xfce4-fsguard-plugin: 1.0.2 -> 1.1.1 --- .../xfce/panel-plugins/xfce4-fsguard-plugin.nix | 26 +++++++++++++++------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix index adab2f033ac..b67e63f5c64 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-fsguard-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, xfce }: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk3, xfce }: let category = "panel-plugins"; @@ -6,15 +6,25 @@ in stdenv.mkDerivation rec { pname = "xfce4-fsguard-plugin"; - version = "1.0.2"; + version = "1.1.1"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "1bj021h4q68bc03f32pkyqy4gfd1sz6s21nxdg7j6gdfhs9xbj52"; + sha256 = "05nmfkrmifm76bsywqmbjd1qdvzagv5cbvnwbkb57156j055vl6n"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ]; + nativeBuildInputs = [ + pkgconfig + intltool + ]; + + buildInputs = [ + libxfce4util + libxfce4ui + xfce4-panel + xfconf + gtk3 + ]; passthru.updateScript = xfce.updateScript { inherit pname version; @@ -23,10 +33,10 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${pname}"; - description = "Filesystem monitor"; + homepage = "https://docs.xfce.org/panel-plugins/xfce4-fsguard-plugin"; + description = "Filesystem usage monitor plugin for the Xfce panel"; + license = licenses.bsd2; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; - broken = true; }; } -- cgit v1.2.3 From 79dc51f3fdeebd0ca392c174eb09e140cc27b5b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 15 Apr 2020 14:50:51 -0300 Subject: xfce.xfce4-netload-plugin: 1.3.1 -> 1.3.2 --- pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix index 9a9f0214372..8d258220175 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-netload-plugin/default.nix @@ -3,10 +3,10 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-netload-plugin"; - version = "1.3.1"; + version = "1.3.2"; rev-prefix = "version-"; odd-unstable = false; - sha256 = "0nm8advafw4jpc9p1qszyfqa56194sz51z216rdh4c6ilcrrpy1h"; + sha256 = "1py1l4z5ah4nlq8l2912k47ffsa5z7p1gbvlk7nw6b9r1x4ykdfl"; buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ]; -- cgit v1.2.3 From 0c6b8040147806f33ff3855e1b6977e886b4688c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 15 Apr 2020 14:50:51 -0300 Subject: xfce.xfce4-genmon-plugin: 3.4.0 -> 4.0.2 --- .../xfce/panel-plugins/xfce4-genmon-plugin.nix | 25 +++++++++++++++------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix index 65dc61a4b39..417001fed53 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-genmon-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, xfce }: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, xfce }: let category = "panel-plugins"; @@ -6,15 +6,24 @@ in stdenv.mkDerivation rec { pname = "xfce4-genmon-plugin"; - version = "3.4.0"; + version = "4.0.2"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "11q3g6lmgz3d5lyh6614mxkd9cblfdyf9jgki7f26mn895xk79dh"; + sha256 = "1ai3pwgv61nv7i2dyrvncnc63r8kdjbkp40vp51vzak1dx924v15"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ]; + nativeBuildInputs = [ + pkgconfig + intltool + ]; + + buildInputs = [ + libxfce4util + libxfce4ui + xfce4-panel + gtk3 + ]; passthru.updateScript = xfce.updateScript { inherit pname version; @@ -23,10 +32,10 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${pname}"; - description = "Cyclically spawns a command and captures its output"; + homepage = "https://docs.xfce.org/panel-plugins/xfce4-genmon-plugin"; + description = "Generic monitor plugin for the Xfce panel"; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; - broken = true; }; } -- cgit v1.2.3 From 361b67effe539f26700cee221c5fc5156ff948a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 15 Apr 2020 14:50:51 -0300 Subject: xfce.xfce4-notifyd: 0.4.4 -> 0.6.0 --- pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix index a991e8c8180..40d9c188fa3 100644 --- a/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix @@ -4,9 +4,9 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-notifyd"; - version = "0.4.4"; + version = "0.6.0"; - sha256 = "1lmm9h3ych8dz9jpjkxg91f9ln14xs527nxjxsryks00kmqk4kai"; + sha256 = "03lw7zil6pwvx537ibqrynxjz7d6iq6in7vdskrnnn16kfg6hjg2"; buildInputs = [ exo gtk3 glib libnotify libxfce4ui libxfce4util xfce4-panel xfconf ]; -- cgit v1.2.3 From da4b533366c4328cebf443c55541588be472e5fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 15 Apr 2020 14:50:51 -0300 Subject: xfce.xfce4-mpc-plugin: 0.4.5 -> 0.5.2 --- .../xfce/panel-plugins/xfce4-mpc-plugin.nix | 29 ++++++++++++++-------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix index 7d7b1981c52..bb56e875c86 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mpc-plugin.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, - xfconf, gtk2, exo, xfce }: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, + libxfce4ui, gtk3, exo, xfce }: let category = "panel-plugins"; @@ -7,17 +7,26 @@ in stdenv.mkDerivation rec { pname = "xfce4-mpc-plugin"; - version = "0.4.5"; + version = "0.5.2"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "1kvgq1pq7cykqdc3227dq0izad093ppfw3nfsrcp9i8mi6i5f7z7"; + sha256 = "0q3pysdp85b3c7g3b59y3c69g4nw6bvbf518lnri4lxrnsvpizpf"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel - xfconf gtk2 exo ]; - + nativeBuildInputs = [ + pkgconfig + intltool + ]; + + buildInputs = [ + libxfce4util + libxfce4ui + xfce4-panel + gtk3 + exo + ]; + passthru.updateScript = xfce.updateScript { inherit pname version; attrPath = "xfce.${pname}"; @@ -25,10 +34,10 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${pname}"; + homepage = "https://docs.xfce.org/panel-plugins/xfce4-mpc-plugin"; description = "MPD plugin for Xfce panel"; platforms = platforms.linux; + license = licenses.bsd2; maintainers = [ ]; - broken = true; }; } -- cgit v1.2.3 From 7d840844189fdadaad2afc0eec99b49e0e04df17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 15 Apr 2020 14:50:52 -0300 Subject: xfce.xfce4-notes-plugin: 1.7.7 -> 1.8.1 --- .../xfce/panel-plugins/xfce4-notes-plugin.nix | 29 ++++++++++++++++------ 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix index 1b7e66936fa..d6910d367a6 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-notes-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, libunique, xfce }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, libunique, xfce }: let category = "panel-plugins"; @@ -6,16 +6,29 @@ in stdenv.mkDerivation rec { pname = "xfce4-notes-plugin"; - version = "1.7.7"; + version = "1.8.1"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "05sjbwgch1j93m3r23ksbjnpfk11sf7xjmbb9pm5vl3snc2s3fm7"; + sha256 = "1cjlvvcsigyh40xa26b2vc5zylgss0nlaw72sablzhii2kkw7907"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 libunique ]; - + nativeBuildInputs = [ + pkgconfig + intltool + ]; + + buildInputs = [ + libxfce4util + libxfce4ui + xfce4-panel + xfconf + gtk2 + libunique + ]; + + hardeningDisable = [ "format" ]; + passthru.updateScript = xfce.updateScript { inherit pname version; attrPath = "xfce.${pname}"; @@ -23,10 +36,10 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${pname}"; + homepage = "https://docs.xfce.org/panel-plugins/xfce4-notes-plugin"; description = "Sticky notes plugin for Xfce panel"; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; - broken = true; }; } -- cgit v1.2.3 From bed7bb913bb8458d7346e7f10bc5284622383ba7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 15 Apr 2020 14:50:52 -0300 Subject: xfce.xfce4-panel: 4.14.0 -> 4.14.3 --- pkgs/desktops/xfce/core/xfce4-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/pkgs/desktops/xfce/core/xfce4-panel/default.nix index f4d86247c6c..ffd42e4a2c5 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-panel"; - version = "4.14.0"; + version = "4.14.3"; - sha256 = "1v3f2xjz9gwa8maqqvv9w2dh1cgy03v89a9ny7nrv0cjsxwwrr15"; + sha256 = "0h8cqs2bghmyp0jihjm2wc7j14k271j178vllin271xrl7kzmvzv"; nativeBuildInputs = [ gobject-introspection ]; buildInputs = [ exo garcon gtk2 gtk3 glib glib-networking libxfce4ui libxfce4util libwnck3 xfconf ]; -- cgit v1.2.3 From f0a62cee130c29196d2f8356b658335245a98cbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 15 Apr 2020 14:50:52 -0300 Subject: xfce.xfce4-power-manager: 1.6.5 -> 1.6.6 --- pkgs/desktops/xfce/core/xfce4-power-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix b/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix index fb3f05b3664..9f9a552b8cc 100644 --- a/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-power-manager/default.nix @@ -4,9 +4,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-power-manager"; - version = "1.6.5"; + version = "1.6.6"; - sha256 = "0zazm2cgkz5xj7rvy9gbh4kaay2anfcmawg4gj38pnq3a8zcwwd5"; + sha256 = "0lyp3dp4ijbpf21vanrvgm6rmfp8v0zyqxibdj5gxnadmvcq38iy"; nativeBuildInputs = [ automakeAddFlags exo ]; buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util upower xfconf ]; -- cgit v1.2.3 From 869ad7c10027a7f3d9b49dfa5c563e31f75db88d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 15 Apr 2020 14:50:52 -0300 Subject: xfce.xfce4-pulseaudio-plugin: 0.4.2 -> 0.4.3 --- .../desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix index 64916f92a6f..10850974bb7 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix @@ -2,6 +2,7 @@ , automakeAddFlags , dbus-glib , dbus +, exo , gtk3 , libpulseaudio , libnotify @@ -16,8 +17,8 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-pulseaudio-plugin"; - version = "0.4.2"; - sha256 = "1s996mcniskq42vv7cb9i165pmrfp9c95p5f9rx14hqq8in9mvc5"; + version = "0.4.3"; + sha256 = "1rfw2w8gl95iawiy57qlvz958dqjc8bmxnc3dma4rqzm6g46jkgq"; nativeBuildInputs = [ automakeAddFlags @@ -30,6 +31,7 @@ mkXfceDerivation { ''; buildInputs = [ + exo glib gtk3 keybinder3 -- cgit v1.2.3 From 39343ed9bc9c8ee231975eb7417638ee832acdf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 15 Apr 2020 14:50:52 -0300 Subject: xfce.xfce4-screenshooter: 1.9.5 -> 1.9.7 --- pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix index 1db6fb016a1..8c0fa3e3edb 100644 --- a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix @@ -3,10 +3,10 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-screenshooter"; - version = "1.9.5"; + version = "1.9.7"; odd-unstable = false; - sha256 = "1h14sywvk9l06p3z1cpb79911j8w2wqbk03ldknjkia2rfymjk06"; + sha256 = "14vbd7iigaw57hl47rnixk873c20q5clqynzkm9zzpqc568dxixd"; buildInputs = [ exo gtk3 libsoup libxfce4ui libxfce4util xfce4-panel glib-networking ]; -- cgit v1.2.3 From cb847111a92136e3cca69eb06c0724ec5b810da6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 15 Apr 2020 14:50:52 -0300 Subject: xfce.xfce4-session: 4.14.0 -> 4.14.2 --- pkgs/desktops/xfce/core/xfce4-session/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/xfce4-session/default.nix b/pkgs/desktops/xfce/core/xfce4-session/default.nix index 0ab362aa21d..c7442a01957 100644 --- a/pkgs/desktops/xfce/core/xfce4-session/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-session/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-session"; - version = "4.14.0"; + version = "4.14.2"; - sha256 = "0v0xzkdr5rgv6219c1dy96cghgw8bqnb313jccxihfgddf363104"; + sha256 = "1gr6j96l792v33lbh7rqpbdjmy8m68hy14bsndx6bykv10zvmgx2"; buildInputs = [ exo gtk3 glib libxfce4ui libxfce4util libwnck3 xfconf polkit iceauth ]; -- cgit v1.2.3 From 80227a5ed204a4034bd9c0b92e834f38ecbbdadc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 15 Apr 2020 14:50:52 -0300 Subject: xfce.xfce4-settings: 4.14.0 -> 4.14.3 --- pkgs/desktops/xfce/core/xfce4-settings/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/xfce4-settings/default.nix b/pkgs/desktops/xfce/core/xfce4-settings/default.nix index 74ab96ed1bc..9b263e5ee73 100644 --- a/pkgs/desktops/xfce/core/xfce4-settings/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-settings/default.nix @@ -5,9 +5,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-settings"; - version = "4.14.0"; + version = "4.14.3"; - sha256 = "13gmxd4sfgd6wky7s03bar58w9vl4i6jv2wncd6iajww791y5akn"; + sha256 = "1zzngdj7mp2r6rcs8gvda1218zlz5gpnc6gsp20z32l69psp3yld"; postPatch = '' for f in $(find . -name \*.c); do -- cgit v1.2.3 From fec32ec28760456189ac8ebf461d038d1f414a26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 15 Apr 2020 14:50:53 -0300 Subject: xfce.xfce4-taskmanager: 1.2.2 -> 1.2.3 --- pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix b/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix index e3d8b4b87d9..9a923025c94 100644 --- a/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-taskmanager/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-taskmanager"; - version = "1.2.2"; + version = "1.2.3"; - sha256 = "03js0pmhrybxa7hrp3gx4rm7j061ansv0bp2dwhnbrdpmzjysysc"; + sha256 = "0818chns7vkvjqakgz8z790adkygcq4jlw59dv6kyzk17hxq6cxv"; nativeBuildInputs = [ exo ]; buildInputs = [ gtk3 libwnck3 libXmu ]; -- cgit v1.2.3 From 4bf4f84742143b32f6ced236ee4aefa22359e554 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 15 Apr 2020 14:50:53 -0300 Subject: xfce.xfce4-sensors-plugin: 1.2.6 -> 1.3.92 --- pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix index 14cab3d932e..8b8dbf3e022 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk2, libxfce4ui, +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxfce4ui, libxfce4util, xfce4-panel, libnotify, lm_sensors, hddtemp, netcat-gnu, xfce }: @@ -8,11 +8,11 @@ in stdenv.mkDerivation rec { pname = "xfce4-sensors-plugin"; - version = "1.2.6"; + version = "1.3.92"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "1h0vpqxcziml3gwrbvd8xvy1mwh9mf2a68dvxsy03rs5pm1ghpi3"; + sha256 = "04jibw23ibi61f19gc9xy400yhcdiya4px6zp8c7fjq65hyn9iix"; }; nativeBuildInputs = [ @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - gtk2 + gtk3 libxfce4ui libxfce4util xfce4-panel @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${pname}"; + homepage = "https://docs.xfce.org/panel-plugins/xfce4-sensors-plugin"; description = "A panel plug-in for different sensors using acpi, lm_sensors and hddtemp"; license = licenses.gpl2; platforms = platforms.unix; -- cgit v1.2.3 From 39621eb16f5d0de5be52bd32b5a7270ddd6e3272 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 15 Apr 2020 14:50:53 -0300 Subject: xfce.xfce4-systemload-plugin: 1.1.2 -> 1.2.3 --- .../xfce/panel-plugins/xfce4-systemload-plugin.nix | 24 +++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix index 1ff0bc2efba..52da6a29ea4 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-systemload-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk2, xfce }: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, xfce }: let category = "panel-plugins"; @@ -6,16 +6,25 @@ in stdenv.mkDerivation rec { pname = "xfce4-systemload-plugin"; - version = "1.1.2"; + version = "1.2.3"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "0z4as6sxdz93d4jpgv0665dg4sykfvc5068mc689phlfl2rvcsdl"; + sha256 = "0x87a8h5l3ashz1ksfaxcpn9a392jzlsbx5n5pga8g90fp2hf905"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel gtk2 ]; - + nativeBuildInputs = [ + pkgconfig + intltool + ]; + + buildInputs = [ + libxfce4util + libxfce4ui + xfce4-panel + gtk3 + ]; + passthru.updateScript = xfce.updateScript { inherit pname version; attrPath = "xfce.${pname}"; @@ -23,8 +32,9 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${pname}"; + homepage = "https://docs.xfce.org/panel-plugins/xfce4-systemload-plugin"; description = "System load plugin for Xfce panel"; + license = licenses.bsd2; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; }; -- cgit v1.2.3 From 6ce6bdf9b200727d7803930f15eaa824bd253425 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 15 Apr 2020 14:50:53 -0300 Subject: xfce.xfce4-vala-panel-appmenu-plugin: 0.6.94 -> 0.7.3 --- .../xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix index bd0db543cf6..525bd6e5fd7 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-vala-panel-appmenu-plugin/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "xfce4-vala-panel-appmenu-plugin"; - version = "0.6.94"; + version = "0.7.3"; src = fetchFromGitHub { owner = "rilian-la-te"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { rev = version; fetchSubmodules = true; - sha256 = "0xxn3zs60a9nfix8wrdp056wviq281cm1031hznzf1l38lp3wr5p"; + sha256 = "06rykdr2c9rnzxwinwdynd73v9wf0gjkx6qfva7sx2n94ajsdnaw"; }; nativeBuildInputs = [ pkgconfig cmake vala libxml2.bin ]; -- cgit v1.2.3 From 37be87b61ffe462d21d1b6f32e29bf5f079376b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 15 Apr 2020 14:50:53 -0300 Subject: xfce.xfce4-windowck-plugin: 0.4.4 -> 0.4.6 --- .../xfce/panel-plugins/xfce4-windowck-plugin.nix | 28 ++++++++++++++++------ 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix index ceeac724cf3..e629a08c553 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-windowck-plugin.nix @@ -3,18 +3,32 @@ stdenv.mkDerivation rec { pname = "xfce4-windowck-plugin"; - version = "0.4.4"; + version = "0.4.6"; src = fetchFromGitHub { owner = "cedl38"; repo = pname; rev = "v${version}"; - sha256 = "0c6a1ibh39dpq9x0dha5lsg0vzmgaf051fgwz0nlky0s94nwzvgv"; + sha256 = "1gwrbjfv4cnlsqh05h42w41z3xs15yjj6j8y9gxvvvvlgzzp4p3g"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool python3 imagemagick libwnck gtk2 - exo libxfce4ui libxfce4util xfce4-panel xfconf xfce4-dev-tools ]; + nativeBuildInputs = [ + pkgconfig + intltool + ]; + + buildInputs = [ + python3 + imagemagick + libwnck + gtk2 + exo + libxfce4ui + libxfce4util + xfce4-panel + xfconf + xfce4-dev-tools + ]; preConfigure = '' ./autogen.sh @@ -31,8 +45,8 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${pname}"; - description = "Set of two plugins which allows you to put the maximized window title and windows buttons on the panel"; + homepage = "https://goodies.xfce.org/projects/panel-plugins/xfce4-windowck-plugin"; + description = "Xfce plugins which allows to put the maximized window title and buttons on the panel"; license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = [ maintainers.volth ]; -- cgit v1.2.3 From 360be696ad17762c03457458c5ce86fec00efbf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 15 Apr 2020 14:50:53 -0300 Subject: xfce.xfce4-timer-plugin: 1.6.0 -> 1.7.0 --- .../xfce/panel-plugins/xfce4-timer-plugin.nix | 26 +++++++++++++--------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix index ae08fd3aeae..00b497c918d 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-timer-plugin.nix @@ -1,5 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel -, libxfce4ui, xfconf, gtk2, hicolor-icon-theme, xfce }: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk3, hicolor-icon-theme, xfce }: let category = "panel-plugins"; @@ -7,17 +6,25 @@ in stdenv.mkDerivation rec { pname = "xfce4-timer-plugin"; - version = "1.6.0"; + version = "1.7.0"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "0z46gyw3ihcd1jf0m5z1dsc790xv1cpi8mk1dagj3i4v14gx5mrr"; + sha256 = "16vypwwjwfk7nn4n16rfgn0z78jqrmbgxmc1r46269lrwd1m6kif"; }; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf - gtk2 hicolor-icon-theme ]; + nativeBuildInputs = [ + pkgconfig + intltool + ]; - nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + libxfce4util + libxfce4ui + xfce4-panel + gtk3 + hicolor-icon-theme + ]; hardeningDisable = [ "format" ]; @@ -28,11 +35,10 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${pname}"; - 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"; + homepage = "https://docs.xfce.org/panel-plugins/xfce4-timer-plugin"; + description = "Simple countdown and alarm plugin for the Xfce panel"; platforms = platforms.linux; license = licenses.gpl2; maintainers = [ ]; - broken = true; }; } -- cgit v1.2.3 From 68569ee02e9a849f3d1ae4c1212988a5de80ee74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 15 Apr 2020 14:50:54 -0300 Subject: xfce.xfdashboard: 0.7.5 -> 0.7.7 --- pkgs/desktops/xfce/applications/xfdashboard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfdashboard/default.nix b/pkgs/desktops/xfce/applications/xfdashboard/default.nix index f3db9c2446b..a9610125b5b 100644 --- a/pkgs/desktops/xfce/applications/xfdashboard/default.nix +++ b/pkgs/desktops/xfce/applications/xfdashboard/default.nix @@ -17,11 +17,11 @@ mkXfceDerivation { category = "apps"; pname = "xfdashboard"; - version = "0.7.5"; + version = "0.7.7"; rev-prefix = ""; odd-unstable = false; - sha256 = "0d0kg90h3li41bs75z3xldljsglkz220pba39c54qznnzb8v8a2i"; + sha256 = "0b9pl3k8wl7svwhb9knhvr86gjg2904n788l8cbczwy046ql7pyc"; buildInputs = [ clutter -- cgit v1.2.3 From ed93bfb64c5048b4d15692e0d6005d75daafd5b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 15 Apr 2020 14:50:54 -0300 Subject: xfce.xfce4-weather-plugin: 0.8.10 -> 0.10.1 --- .../xfce/panel-plugins/xfce4-weather-plugin.nix | 25 ++++++++++++++++------ 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix index f32efb01edd..cff2ef251ad 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-weather-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk2, libxml2, libsoup, upower, +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsoup, upower, libxfce4ui, libxfce4util, xfce4-panel, hicolor-icon-theme, xfce }: let @@ -7,17 +7,28 @@ in stdenv.mkDerivation rec { pname = "xfce4-weather-plugin"; - version = "0.8.10"; + version = "0.10.1"; src = fetchurl { url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "1f7ac2zr5s5w6krdpgsq252wxhhmcblia3j783132ilh8k246vgf"; + sha256 = "12bs2rfmmy021087i10vxibdbbvd5vld0vk3h5hymhpz7rgszcmg"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ + pkgconfig + intltool + ]; - buildInputs = [ gtk2 libxml2 libsoup upower libxfce4ui libxfce4util - xfce4-panel hicolor-icon-theme ]; + buildInputs = [ + gtk3 + libxml2 + libsoup + upower + libxfce4ui + libxfce4util + xfce4-panel + hicolor-icon-theme + ]; enableParallelBuilding = true; @@ -28,7 +39,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${pname}"; + homepage = "https://docs.xfce.org/panel-plugins/xfce4-weather-plugin"; description = "Weather plugin for the Xfce desktop environment"; license = licenses.gpl2Plus; platforms = platforms.unix; -- cgit v1.2.3 From a2c97366cdbdb6b2843be16a2b02141a5040eac1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 15 Apr 2020 14:50:54 -0300 Subject: xfce.xfdesktop: 4.14.1 -> 4.14.2 --- pkgs/desktops/xfce/core/xfdesktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/xfdesktop/default.nix b/pkgs/desktops/xfce/core/xfdesktop/default.nix index afcd0d19dc3..75e9fc8cb65 100644 --- a/pkgs/desktops/xfce/core/xfdesktop/default.nix +++ b/pkgs/desktops/xfce/core/xfdesktop/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfdesktop"; - version = "4.14.1"; + version = "4.14.2"; - sha256 = "006w4xwmpwp34q2qkkixr3xz0vb0kny79pw64yj4304wsb5jr14g"; + sha256 = "04fhm1pf9290sy3ymrmnfnm2x6fq5ldzvj5bjd9kz6zkx0nsq1za"; buildInputs = [ exo -- cgit v1.2.3 From 11188c1746f41efe06fee5bc53f656020345f6e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 16 Apr 2020 00:56:21 -0300 Subject: xfce.exo: add support for gtk2, besides gtk3 --- pkgs/desktops/xfce/core/exo/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/xfce/core/exo/default.nix b/pkgs/desktops/xfce/core/exo/default.nix index 6566d77ebbe..ee58c76ea02 100644 --- a/pkgs/desktops/xfce/core/exo/default.nix +++ b/pkgs/desktops/xfce/core/exo/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, docbook_xsl, glib, libxslt, perlPackages, gtk3 +{ mkXfceDerivation, docbook_xsl, glib, libxslt, perlPackages, gtk2, gtk3 , libxfce4ui, libxfce4util }: mkXfceDerivation { @@ -8,8 +8,19 @@ mkXfceDerivation { sha256 = "1db7w6jk3i501x4qw0hs0ydrm1fjdkxmahzbv5iag859wnnlg0pd"; - nativeBuildInputs = [ libxslt perlPackages.URI docbook_xsl ]; - buildInputs = [ gtk3 glib libxfce4ui libxfce4util ]; + nativeBuildInputs = [ + libxslt + perlPackages.URI + docbook_xsl + ]; + + buildInputs = [ + gtk2 # some xfce plugins still uses gtk2 + gtk3 + glib + libxfce4ui + libxfce4util + ]; # Workaround https://bugzilla.xfce.org/show_bug.cgi?id=15825 NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/gio-unix-2.0"; -- cgit v1.2.3 From 21fb9c538e1344f221fa2275280f456f83646811 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 16 Apr 2020 01:01:34 -0300 Subject: xfce.xfce4-mailwatch-plugin: remove broken status --- .../xfce/panel-plugins/xfce4-mailwatch-plugin.nix | 27 +++++++++++++++------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix index b63224f8708..3d60d8b18f9 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-mailwatch-plugin.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, - xfconf, gtk2, exo, gnutls, libgcrypt, xfce }: + gtk2, exo, gnutls, libgcrypt, xfce }: let category = "panel-plugins"; @@ -14,10 +14,21 @@ stdenv.mkDerivation rec { sha256 = "1bfw3smwivr9mzdyq768biqrl4aq94zqi3xjzq6kqnd8561cqjk2"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel - xfconf gtk2 exo gnutls libgcrypt ]; - + nativeBuildInputs = [ + intltool + pkgconfig + ]; + + buildInputs = [ + libxfce4util + libxfce4ui + xfce4-panel + gtk2 + exo # needs exo with gtk2 support + gnutls + libgcrypt + ]; + passthru.updateScript = xfce.updateScript { inherit pname version; attrPath = "xfce.${pname}"; @@ -25,10 +36,10 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${pname}"; - description = "Mailwatch plugin for Xfce panel"; + homepage = "https://docs.xfce.org/panel-plugins/xfce4-mailwatch-plugin"; + description = "Mail watcher plugin for Xfce panel"; + license = licenses.gpl2; platforms = platforms.linux; maintainers = [ ]; - broken = true; }; } -- cgit v1.2.3 From c7c0940bcbd6d4b06531b3642138be647c5e2bb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 16 Apr 2020 01:08:05 -0300 Subject: xfce.xfce4-embed-plugin: update meta and buildInputs --- .../xfce/panel-plugins/xfce4-embed-plugin.nix | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix index 3cd84714663..2b2027bcf4b 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-embed-plugin.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, xfconf, gtk2, xfce }: +{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4-panel, libxfce4ui, gtk2, xfce }: let category = "panel-plugins"; @@ -14,9 +14,18 @@ stdenv.mkDerivation rec { sha256 = "0a72kqsjjh45swimqlpyrahdnplp0383v0i4phr4n6g8c1ixyry7"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool libxfce4util libxfce4ui xfce4-panel xfconf gtk2 ]; - + nativeBuildInputs = [ + pkgconfig + intltool + ]; + + buildInputs = [ + libxfce4util + libxfce4ui + xfce4-panel + gtk2 + ]; + passthru.updateScript = xfce.updateScript { inherit pname version; attrPath = "xfce.${pname}"; @@ -24,8 +33,9 @@ stdenv.mkDerivation rec { }; meta = { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${pname}"; + homepage = "https://docs.xfce.org/panel-plugins/xfce4-embed-plugin"; description = "Embed arbitrary app windows on Xfce panel"; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.AndersonTorres ]; }; -- cgit v1.2.3 From fc4a10e11d4fa93c7ba5652377a7f32a41dd2b34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 16 Apr 2020 01:28:14 -0300 Subject: xfce.xfce4-hardware-monitor-plugin: update meta --- pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix index 83084b62661..d8775c4b704 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-hardware-monitor-plugin.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = "https://goodies.xfce.org/projects/panel-plugins/${pname}"; + homepage = "https://goodies.xfce.org/projects/panel-plugins/xfce4-hardware-monitor-plugin"; description = "Hardware monitor plugin for the XFCE4 panel"; license = licenses.gpl3; platforms = platforms.unix; -- cgit v1.2.3 From c5d8f23febe2578df9f43e29af3bb9a17b3fd414 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 16 Apr 2020 01:44:35 -0300 Subject: xfce.xfce4-icon-theme: update gtk dependency and add license --- pkgs/desktops/xfce/art/xfce4-icon-theme.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/xfce/art/xfce4-icon-theme.nix b/pkgs/desktops/xfce/art/xfce4-icon-theme.nix index 089b7cc27f8..e614bb1db92 100644 --- a/pkgs/desktops/xfce/art/xfce4-icon-theme.nix +++ b/pkgs/desktops/xfce/art/xfce4-icon-theme.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk2, xfce }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, xfce }: let category = "art"; @@ -13,9 +13,12 @@ stdenv.mkDerivation rec { sha256 = "1yk6rx3zr9grm4jwpjvqdkl13pisy7qn1wm5cqzmd2kbsn96cy6l"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ intltool gtk2 ]; - + nativeBuildInputs = [ + pkgconfig + intltool + gtk3 + ]; + passthru.updateScript = xfce.updateScript { inherit pname version; attrPath = "xfce.${pname}"; @@ -25,6 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://www.xfce.org/"; description = "Icons for Xfce"; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.eelco ]; }; -- cgit v1.2.3 From bbeb6ac387ad5aa933310a7572d8de4462bc356a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 17 Apr 2020 13:39:03 -0300 Subject: hicolor-icon-theme: add hook to symlink inherited icon themes --- pkgs/data/icons/hicolor-icon-theme/setup-hook.sh | 41 ++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh b/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh index f07bab4b269..9a6b5f405ca 100644 --- a/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh +++ b/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh @@ -11,3 +11,44 @@ hicolorIconThemeHook() { # I think this is meant to be a runtime dep addEnvHooks "${hostOffset:?}" hicolorIconThemeHook + + +# Make symbolic links of parent icon themes that are inherited in the +# icon themes installed by the package. +symlinkParentIconThemes() { + if [ -e $out/share/icons ]; then + echo Symlinking parent icon themes... + local theme + local theme_name + local inheritance + local parent + local parent_theme + local dir + local parent_path + for theme in $out/share/icons/*/index.theme; do + theme_name="${theme%/*}" + theme_name="${theme_name##*/}" + echo " theme: $theme_name" + inheritance=$(sed -rne 's,^Inherits=(.*)$,\1,p' $theme) + IFS=',' read -ra parent_themes <<< "$inheritance" + for parent_theme in "${parent_themes[@]}"; do + parent_path="" + if [ -e "$out/share/icons/$parent_theme" ]; then + parent_path="$(realpath $out/share/icons/$parent_theme)" + else + IFS=':' read -ra dirs <<< $XDG_ICON_DIRS + for parent_dir in "${dirs[@]}"; do + if [ -e "$parent_dir/icons/$parent_theme/index.theme" ]; then + parent_path=$(realpath "$parent_dir/icons/$parent_theme") + ln -s "$parent_path" "$out/share/icons/" + break + fi + done + fi + echo " parent: $parent_theme -> $parent_path" + done + done + fi +} + +preFixupHooks+=(symlinkParentIconThemes) -- cgit v1.2.3 From 368c4346428db3dd4b50384d591b3545cb55f65c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 17 Apr 2020 16:21:11 -0300 Subject: arc-icon-theme: add missing parent icon themes --- pkgs/data/icons/arc-icon-theme/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/data/icons/arc-icon-theme/default.nix b/pkgs/data/icons/arc-icon-theme/default.nix index a26064cdfa3..ab80305d528 100644 --- a/pkgs/data/icons/arc-icon-theme/default.nix +++ b/pkgs/data/icons/arc-icon-theme/default.nix @@ -1,20 +1,25 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, gnome3, moka-icon-theme, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { - name = "${package-name}-${version}"; - package-name = "arc-icon-theme"; + pname = "arc-icon-theme"; version = "2016-11-22"; src = fetchFromGitHub { owner = "horst3180"; - repo = package-name; + repo = pname; rev = "55a575386a412544c3ed2b5617a61f842ee4ec15"; sha256 = "1ch3hp08qri93510hypzz6m2x4xgg2h15wvnhjwh1x1s1b7jvxjd"; }; - nativeBuildInputs = [ autoreconfHook gtk3 moka-icon-theme ]; + nativeBuildInputs = [ + autoreconfHook + gtk3 + ]; propagatedBuildInputs = [ + moka-icon-theme + gnome3.adwaita-icon-theme + gnome-icon-theme hicolor-icon-theme ]; -- cgit v1.2.3 From b491caea5aed613dad661f09044e11f831dc3329 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 16 Apr 2020 11:10:48 -0300 Subject: cinnamon.mint-y-icons: add missing parent icon themes Also: - add runHook calls - move postFixup actions to installPhase - gtk-update-icon-cache does accepts only one icon path --- pkgs/desktops/cinnamon/mint-y-icons/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/cinnamon/mint-y-icons/default.nix b/pkgs/desktops/cinnamon/mint-y-icons/default.nix index d4415c4bf04..a7e22dc3d03 100644 --- a/pkgs/desktops/cinnamon/mint-y-icons/default.nix +++ b/pkgs/desktops/cinnamon/mint-y-icons/default.nix @@ -1,6 +1,7 @@ { fetchFromGitHub , stdenv , gnome3 +, gnome-icon-theme , hicolor-icon-theme , gtk3 }: @@ -16,8 +17,9 @@ stdenv.mkDerivation rec { sha256 = "1c2a79ylk363i982czwwqcwc7cw6dyzlqphcypqm6nll7xlafq8s"; }; - propagatedUserEnvPkgs = [ + propagatedBuildInputs = [ gnome3.adwaita-icon-theme + gnome-icon-theme hicolor-icon-theme ]; @@ -25,15 +27,19 @@ stdenv.mkDerivation rec { gtk3 ]; - postFixup = '' - gtk-update-icon-cache $out/share/icons/* - ''; - dontDropIconThemeCache = true; installPhase = '' + runHook preInstall + mkdir -p $out mv usr/share $out + + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + + runHook postInstall ''; meta = with stdenv.lib; { -- cgit v1.2.3 From b097c95dc7873178ac9725635e524c791f2bd1fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 17 Apr 2020 16:43:40 -0300 Subject: deepin.deepin-icon-theme: add missing parent icon themes --- pkgs/desktops/deepin/deepin-icon-theme/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/desktops/deepin/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/deepin-icon-theme/default.nix index 5845e77f57c..b6eb3cce26d 100644 --- a/pkgs/desktops/deepin/deepin-icon-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-icon-theme/default.nix @@ -13,9 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gtk3 xcursorgen ]; - buildInputs = [ papirus-icon-theme ]; - propagatedBuildInputs = [ + papirus-icon-theme hicolor-icon-theme ]; -- cgit v1.2.3 From 7be06c67f8c262a37cf6ae5deca426909c8737ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 17 Apr 2020 16:59:07 -0300 Subject: elementary-xfce-icon-theme: add missing parent icon themes --- pkgs/data/icons/elementary-xfce-icon-theme/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix index 3aebf09554c..3a82c313296 100644 --- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gdk-pixbuf, optipng, librsvg, gtk3, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, pkgconfig, gdk-pixbuf, optipng, librsvg, gtk3, pantheon, gnome3, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "elementary-xfce-icon-theme"; @@ -11,9 +11,18 @@ stdenv.mkDerivation rec { sha256 = "1f6qvpzxz759znishmr4b22n540y18glv41wmy91r78sa4g6x4sh"; }; - nativeBuildInputs = [ pkgconfig gdk-pixbuf librsvg optipng gtk3 ]; + nativeBuildInputs = [ + pkgconfig + gdk-pixbuf + librsvg + optipng + gtk3 + ]; propagatedBuildInputs = [ + pantheon.elementary-icon-theme + gnome3.adwaita-icon-theme + gnome-icon-theme hicolor-icon-theme ]; -- cgit v1.2.3 From 6660106c72d7ec95af80b4538adbddb3eccf626f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 16 Apr 2020 11:23:36 -0300 Subject: enlightenment.efl: add missing parent icon themes --- pkgs/desktops/enlightenment/efl.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index 7bf280cb99b..d3b0e43e476 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -1,12 +1,11 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, SDL, SDL2, alsaLib, avahi, bullet, check, curl, dbus, doxygen, expat, fontconfig, freetype, fribidi, ghostscript, giflib, glib, gst_all_1, gtk3, - harfbuzz, ibus, jbig2dec, libGL, libdrm, libinput, libjpeg, libpng, - libpulseaudio, libraw, librsvg, libsndfile, libspectre, libtiff, - libwebp, libxkbcommon, luajit, lz4, mesa, openjpeg, openssl, - poppler, python27Packages, systemd, udev, utillinux, writeText, - xorg, zlib -}: + harfbuzz, hicolor-icon-theme, ibus, jbig2dec, libGL, libdrm, + libinput, libjpeg, libpng, libpulseaudio, libraw, librsvg, + libsndfile, libspectre, libtiff, libwebp, libxkbcommon, luajit, lz4, + mesa, openjpeg, openssl, poppler, python27Packages, systemd, udev, + utillinux, writeText, xorg, zlib }: stdenv.mkDerivation rec { pname = "efl"; @@ -51,6 +50,7 @@ stdenv.mkDerivation rec { xorg.libXcursor xorg.xorgproto zlib + # still missing parent icon themes: Mint-X, RAVE-X, Faenza ]; propagatedBuildInputs = [ @@ -95,6 +95,8 @@ stdenv.mkDerivation rec { xorg.xcbutilkeysyms ]; + dontDropIconThemeCache = true; + mesonFlags = [ "--buildtype=release" "-D build-tests=false" # disable build tests, which are not working -- cgit v1.2.3 From e96ef4324856ec8db6959f9fba4341051c451cf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 17 Apr 2020 20:57:37 -0300 Subject: faba-icon-theme: add missing parent icon themes --- pkgs/data/icons/faba-icon-theme/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/faba-icon-theme/default.nix b/pkgs/data/icons/faba-icon-theme/default.nix index e1e070c58be..9df47f8faa7 100644 --- a/pkgs/data/icons/faba-icon-theme/default.nix +++ b/pkgs/data/icons/faba-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, python3, gtk3, pantheon, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, meson, ninja, python3, gtk3, pantheon, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "${package-name}-${version}"; @@ -12,9 +12,16 @@ stdenv.mkDerivation rec { sha256 = "0xh6ppr73p76z60ym49b4d0liwdc96w41cc5p07d48hxjsa6qd6n"; }; - nativeBuildInputs = [ meson ninja python3 gtk3 pantheon.elementary-icon-theme ]; + nativeBuildInputs = [ + meson + ninja + python3 + gtk3 + ]; propagatedBuildInputs = [ + pantheon.elementary-icon-theme + gnome-icon-theme hicolor-icon-theme ]; -- cgit v1.2.3 From 15a739dfa78dba895d364896649431b462c6b9bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 17 Apr 2020 20:56:56 -0300 Subject: faba-mono-icons: add missing parent icon themes --- pkgs/data/icons/faba-mono-icons/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/data/icons/faba-mono-icons/default.nix b/pkgs/data/icons/faba-mono-icons/default.nix index 19d58eeff6f..e403ba753ec 100644 --- a/pkgs/data/icons/faba-mono-icons/default.nix +++ b/pkgs/data/icons/faba-mono-icons/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme, faba-icon-theme, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "faba-mono-icons"; @@ -11,15 +11,21 @@ stdenv.mkDerivation rec { sha256 = "0nisfl92y6hrbakp9qxi0ygayl6avkzrhwirg6854bwqjy2dvjv9"; }; - nativeBuildInputs = [ autoreconfHook gtk3 moka-icon-theme ]; + nativeBuildInputs = [ + autoreconfHook + gtk3 + ]; propagatedBuildInputs = [ + moka-icon-theme + faba-icon-theme + gnome-icon-theme hicolor-icon-theme ]; dontDropIconThemeCache = true; - postFixup = '' + postInstall = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done -- cgit v1.2.3 From 58362a4b1bb5adf99383de7dc630e878e145e9a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 17 Apr 2020 20:56:28 -0300 Subject: flat-remix-icon-theme: add missing parent icon themes --- pkgs/data/icons/flat-remix-icon-theme/default.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/pkgs/data/icons/flat-remix-icon-theme/default.nix b/pkgs/data/icons/flat-remix-icon-theme/default.nix index 90c14ef7d05..b0b115f096f 100644 --- a/pkgs/data/icons/flat-remix-icon-theme/default.nix +++ b/pkgs/data/icons/flat-remix-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub , gtk3 }: +{ stdenv, fetchFromGitHub , gtk3, breeze-icons, pantheon, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "flat-remix-icon-theme"; @@ -11,14 +11,23 @@ stdenv.mkDerivation rec { sha256 = "14n5wydhd5ifmsbj770s2qg2ksd3xa3m61qxydid6jq39k0lxbd8"; }; - nativeBuildInputs = [ gtk3 ]; + nativeBuildInputs = [ + gtk3 + ]; + + propagatedBuildInputs = [ + breeze-icons + pantheon.elementary-icon-theme + gnome-icon-theme + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; installPhase = '' mkdir -p $out/share/icons mv Flat-Remix* $out/share/icons/ - ''; - postFixup = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done @@ -31,4 +40,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ mschneider ]; }; -} \ No newline at end of file +} -- cgit v1.2.3 From 50c048f9377ffa1629b01c79e22897892f6b3c49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 17 Apr 2020 17:12:18 -0300 Subject: gnome3.adwaita-icon-theme: do not drop icon theme cache --- pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix index 6eafa874b83..827fd1cd96a 100644 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk3 ]; + dontDropIconThemeCache = true; + # remove a tree of dirs with no files within postInstall = '' rm -rf "$out/locale" ''; -- cgit v1.2.3 From 580b886a069d5c938337f21ba655f62354992e70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 17 Apr 2020 20:50:39 -0300 Subject: gnome3.gnome-themes-extra: add missing parent icon themes --- pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix index 9cbac8c7427..fa2f4921fd9 100644 --- a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2 -, gdk-pixbuf }: +, gdk-pixbuf, hicolor-icon-theme }: let pname = "gnome-themes-extra"; @@ -19,9 +19,12 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ gtk3 librsvg pango atk gtk2 gdk-pixbuf gnome3.adwaita-icon-theme ]; + buildInputs = [ gtk3 librsvg pango atk gtk2 gdk-pixbuf ]; + propagatedBuildInputs = [ gnome3.adwaita-icon-theme hicolor-icon-theme ]; - postFixup = '' + dontDropIconThemeCache = true; + + postInstall = '' gtk-update-icon-cache "$out"/share/icons/HighContrast ''; -- cgit v1.2.3 From 4136a5f1374eccaa9244751eb3bef03f14198dc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 17 Apr 2020 20:55:31 -0300 Subject: iconpack-jade: add missing parent icon themes --- pkgs/data/icons/iconpack-jade/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/data/icons/iconpack-jade/default.nix b/pkgs/data/icons/iconpack-jade/default.nix index 1b42c1af612..1bfa8092a32 100644 --- a/pkgs/data/icons/iconpack-jade/default.nix +++ b/pkgs/data/icons/iconpack-jade/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "iconpack-jade"; @@ -13,16 +13,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gtk3 ]; - propagatedBuildInputs = [ hicolor-icon-theme ]; + propagatedBuildInputs = [ gnome-icon-theme hicolor-icon-theme ]; dontDropIconThemeCache = true; installPhase = '' - mkdir -p $out/share/icons - cp -a Jade* $out/share/icons - ''; + mkdir -p $out/share/icons + cp -a Jade* $out/share/icons - postFixup = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done -- cgit v1.2.3 From c280bf92fd7730d1e5c06697f153fae4f3f141a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 17 Apr 2020 20:55:03 -0300 Subject: iconpack-obsidian: add missing parent icon themes --- pkgs/data/icons/iconpack-obsidian/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/data/icons/iconpack-obsidian/default.nix b/pkgs/data/icons/iconpack-obsidian/default.nix index c954af9e83d..ae8c127381b 100644 --- a/pkgs/data/icons/iconpack-obsidian/default.nix +++ b/pkgs/data/icons/iconpack-obsidian/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "iconpack-obsidian"; @@ -13,16 +13,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gtk3 ]; - propagatedBuildInputs = [ hicolor-icon-theme ]; + propagatedBuildInputs = [ gnome-icon-theme hicolor-icon-theme ]; + # still missing parent themes: Ambiant-MATE, Mint-X, Faenza-Dark, KFaenza dontDropIconThemeCache = true; installPhase = '' - mkdir -p $out/share/icons - mv Obsidian* $out/share/icons - ''; + mkdir -p $out/share/icons + mv Obsidian* $out/share/icons - postFixup = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done -- cgit v1.2.3 From 9bcc3d83a9e1ea1964f9b7f60a6d97a94667e4bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 17 Apr 2020 20:54:27 -0300 Subject: maia-icon-theme: move postFixup actions to postInstall --- pkgs/data/icons/maia-icon-theme/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/icons/maia-icon-theme/default.nix b/pkgs/data/icons/maia-icon-theme/default.nix index fbde3a428c0..ee539981fbc 100644 --- a/pkgs/data/icons/maia-icon-theme/default.nix +++ b/pkgs/data/icons/maia-icon-theme/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { dontDropIconThemeCache = true; - postFixup = '' + postInstall = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done -- cgit v1.2.3 From b6f046f725877953934e66a9139a2e727e72f453 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 17 Apr 2020 20:48:46 -0300 Subject: mate.mate-icon-theme-faenza: add missing parent icon themes --- pkgs/desktops/mate/mate-icon-theme-faenza/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index 26d8f86985b..a429e1e66e3 100644 --- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -11,11 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook gtk3 ]; - buildInputs = [ mate.mate-icon-theme ]; - - propagatedBuildInputs = [ - hicolor-icon-theme - ]; + propagatedBuildInputs = [ mate.mate-icon-theme hicolor-icon-theme ]; dontDropIconThemeCache = true; -- cgit v1.2.3 From 15f823ebd6ff51fe2d91b2bb95ed3afc8442b718 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 17 Apr 2020 15:43:23 -0300 Subject: moka-icon-theme: add hook to symlink inherited icon themes --- pkgs/data/icons/moka-icon-theme/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/data/icons/moka-icon-theme/default.nix b/pkgs/data/icons/moka-icon-theme/default.nix index 33798f7b01d..d481f2df8d6 100644 --- a/pkgs/data/icons/moka-icon-theme/default.nix +++ b/pkgs/data/icons/moka-icon-theme/default.nix @@ -11,9 +11,15 @@ stdenv.mkDerivation rec { sha256 = "015l02im4mha5z91dbchxf6xkp66d346bg3xskwg0rh3lglhjsrd"; }; - nativeBuildInputs = [ meson ninja gtk3 python3 faba-icon-theme ]; + nativeBuildInputs = [ + meson + ninja + gtk3 + python3 + ]; propagatedBuildInputs = [ + faba-icon-theme hicolor-icon-theme ]; -- cgit v1.2.3 From bc895be32cdd0d21fc6de0fce51aa2c68bb55fc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 17 Apr 2020 20:53:38 -0300 Subject: numix-icon-theme: add missing parent icon themes --- pkgs/data/icons/numix-icon-theme/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix index 46c61d861a3..56bb2f3808f 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "numix-icon-theme"; @@ -13,18 +13,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gtk3 ]; - propagatedBuildInputs = [ - hicolor-icon-theme - ]; + propagatedBuildInputs = [ gnome-icon-theme hicolor-icon-theme ]; dontDropIconThemeCache = true; installPhase = '' mkdir -p $out/share/icons cp -a Numix{,-Light} $out/share/icons/ - ''; - postFixup = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done -- cgit v1.2.3 From 06f4e69de0a26143f3e4bf7f58815627a4e193e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 16 Apr 2020 09:29:46 -0300 Subject: numix-icon-theme-circle: add missing parent icon themes Also: - add runHook calls - move postFixup actions to installPhase --- pkgs/data/icons/numix-icon-theme-circle/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index a22b97ec1e7..3c991cf1fc8 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -13,18 +13,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gtk3 ]; - buildInputs = [ numix-icon-theme ]; - - propagatedBuildInputs = [ hicolor-icon-theme ]; + propagatedBuildInputs = [ numix-icon-theme hicolor-icon-theme ]; dontDropIconThemeCache = true; installPhase = '' - install -dm 755 $out/share/icons - cp -dr --no-preserve='ownership' Numix-Circle{,-Light} $out/share/icons/ - ''; + runHook preInstall + + mkdir -p $out/share/icons + cp -a Numix-Circle{,-Light} $out/share/icons - postFixup = '' for panel in $out/share/icons/*/*/panel; do ln -sf $(realpath ${numix-icon-theme}/share/icons/Numix/16/$(readlink $panel)) $panel done @@ -32,6 +30,8 @@ stdenv.mkDerivation rec { for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done + + runHook postInstall ''; meta = with stdenv.lib; { -- cgit v1.2.3 From 24f9d150bc75660f5bb215e09a588f6163f6f5d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 16 Apr 2020 09:47:57 -0300 Subject: numix-icon-theme-square: add missing parent icon themes Also: - add runHook calls - move postFixup actions to installPhase --- pkgs/data/icons/numix-icon-theme-square/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 92a3ce9091a..9cebdc33106 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -13,18 +13,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gtk3 ]; - buildInputs = [ numix-icon-theme ]; - - propagatedBuildInputs = [ hicolor-icon-theme ]; + propagatedBuildInputs = [ numix-icon-theme hicolor-icon-theme ]; dontDropIconThemeCache = true; installPhase = '' + runHook preInstall + mkdir -p $out/share/icons - cp -a Numix-Square{,-Light} $out/share/icons/ - ''; + cp -a Numix-Square{,-Light} $out/share/icons - postFixup = '' for panel in $out/share/icons/*/*/panel; do ln -sf $(realpath ${numix-icon-theme}/share/icons/Numix/16/$(readlink $panel)) $panel done @@ -32,6 +30,8 @@ stdenv.mkDerivation rec { for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done + + runHook postInstall ''; meta = with stdenv.lib; { -- cgit v1.2.3 From cfa675306b616edb75075c86c15ee260f9dadf2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 17 Apr 2020 20:53:19 -0300 Subject: paper-icon-theme: add missing parent icon themes --- pkgs/data/icons/paper-icon-theme/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix index 1531bdf2af8..585190a7b38 100644 --- a/pkgs/data/icons/paper-icon-theme/default.nix +++ b/pkgs/data/icons/paper-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, gnome3, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "paper-icon-theme"; @@ -11,9 +11,16 @@ stdenv.mkDerivation rec { sha256 = "0x45zkjnmbz904df63ph06npbm3phpgck4xwyymx8r8jgrfplk6v"; }; - nativeBuildInputs = [ meson ninja gtk3 python3 ]; + nativeBuildInputs = [ + meson + ninja + gtk3 + python3 + ]; propagatedBuildInputs = [ + gnome3.adwaita-icon-theme + gnome-icon-theme hicolor-icon-theme ]; -- cgit v1.2.3 From 1aac597a51fd21cb8e8639566753c73c0574a3c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 17 Apr 2020 20:52:55 -0300 Subject: papirus-icon-theme: add missing parent icon themes --- pkgs/data/icons/papirus-icon-theme/default.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index d01410f28da..b47c01d973e 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, gtk3, pantheon, breeze-icons, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "papirus-icon-theme"; @@ -11,18 +11,23 @@ stdenv.mkDerivation rec { sha256 = "0qv4340avm5s0640r8aznbfwjzvm6k64840qggyg9jfcy6223pdy"; }; - nativeBuildInputs = [ gtk3 ]; + nativeBuildInputs = [ + gtk3 + ]; - propagatedBuildInputs = [ hicolor-icon-theme ]; + propagatedBuildInputs = [ + pantheon.elementary-icon-theme + breeze-icons + gnome-icon-theme + hicolor-icon-theme + ]; dontDropIconThemeCache = true; installPhase = '' - mkdir -p $out/share/icons - mv {,e}Papirus* $out/share/icons - ''; + mkdir -p $out/share/icons + mv {,e}Papirus* $out/share/icons - postFixup = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done -- cgit v1.2.3 From 7cd86ce7a13ff22a9c3bcbfc78bcf64375fd748f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 16 Apr 2020 10:38:23 -0300 Subject: papirus-maia-icon-theme: add missing parent icon themes Also: - move postFixup actions to postInstallPhase --- pkgs/data/icons/papirus-maia-icon-theme/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/papirus-maia-icon-theme/default.nix b/pkgs/data/icons/papirus-maia-icon-theme/default.nix index a90182cc8d7..4cfe50d7836 100644 --- a/pkgs/data/icons/papirus-maia-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-maia-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, gtk3 }: +{ stdenv, fetchFromGitHub, cmake, gtk3, breeze-icons, gnome-icon-theme, papirus-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "papirus-maia-icon-theme"; @@ -16,11 +16,20 @@ stdenv.mkDerivation rec { gtk3 ]; + propagatedBuildInputs = [ + breeze-icons + gnome-icon-theme + papirus-icon-theme + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; + postPatch = '' substituteInPlace CMakeLists.txt --replace /usr "$out" ''; - postFixup = '' + postInstall = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done -- cgit v1.2.3 From 0c859757b22871304bc89ca12a91d9e90899c133 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 17 Apr 2020 20:52:26 -0300 Subject: qogir-icon-theme: add missing parent icon themes --- pkgs/data/icons/qogir-icon-theme/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/data/icons/qogir-icon-theme/default.nix b/pkgs/data/icons/qogir-icon-theme/default.nix index 641b3da883e..fa52ad176d9 100644 --- a/pkgs/data/icons/qogir-icon-theme/default.nix +++ b/pkgs/data/icons/qogir-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3 }: +{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "qogir-icon-theme"; @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gtk3 ]; + propagatedBuildInputs = [ hicolor-icon-theme ]; + dontDropIconThemeCache = true; installPhase = '' -- cgit v1.2.3 From cc4f55431dcfc3d013ea67293d42f024bfbdbc5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 17 Apr 2020 20:52:06 -0300 Subject: tango-icon-theme: add missing parent icon themes --- pkgs/data/icons/tango-icon-theme/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/data/icons/tango-icon-theme/default.nix b/pkgs/data/icons/tango-icon-theme/default.nix index fe749598495..f1b59c2f538 100644 --- a/pkgs/data/icons/tango-icon-theme/default.nix +++ b/pkgs/data/icons/tango-icon-theme/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, pkgconfig, iconnamingutils, imagemagick, librsvg -, gtk/*any version*/, hicolor-icon-theme +, gtk/*any version*/, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { @@ -14,10 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool iconnamingutils imagemagick librsvg ]; - - propagatedBuildInputs = [ - hicolor-icon-theme - ]; + propagatedBuildInputs = [ gnome-icon-theme hicolor-icon-theme ]; + # still missing parent icon themes: cristalsvg dontDropIconThemeCache = true; -- cgit v1.2.3 From 5dd4e8900d8e274d694fff6112477da12daac889 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 16 Apr 2020 09:05:03 -0300 Subject: xfce.xfce4-icon-theme: add missing parent icon themes Also: - replace gtk2 by gtk3 - intltool and gtk are native build dependences --- pkgs/desktops/xfce/art/xfce4-icon-theme.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/xfce/art/xfce4-icon-theme.nix b/pkgs/desktops/xfce/art/xfce4-icon-theme.nix index e614bb1db92..526b7030591 100644 --- a/pkgs/desktops/xfce/art/xfce4-icon-theme.nix +++ b/pkgs/desktops/xfce/art/xfce4-icon-theme.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, xfce }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gnome-icon-theme, tango-icon-theme, hicolor-icon-theme, xfce }: let category = "art"; @@ -19,6 +19,15 @@ stdenv.mkDerivation rec { gtk3 ]; + buildInputs = [ + gnome-icon-theme + tango-icon-theme + hicolor-icon-theme + # missing parent icon theme Industrial + ]; + + dontDropIconThemeCache = true; + passthru.updateScript = xfce.updateScript { inherit pname version; attrPath = "xfce.${pname}"; -- cgit v1.2.3 From b267955aa7456f2de4e02fbc7e34824444ab275d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 16 Apr 2020 10:50:49 -0300 Subject: yaru-theme: add missing parent icon themes --- pkgs/data/themes/yaru/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index 9e56326b2eb..bc9e4de5a67 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, meson, sassc, pkg-config, glib, ninja, - python3, gtk3, gnome3, gtk-engine-murrine }: + python3, gtk3, gnome3, gtk-engine-murrine, humanity-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "yaru"; @@ -14,9 +14,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; buildInputs = [ gtk3 gnome3.gnome-themes-extra ]; + propagatedBuildInputs = [ humanity-icon-theme hicolor-icon-theme ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + dontDropIconThemeCache = true; + postPatch = "patchShebangs ."; meta = with stdenv.lib; { -- cgit v1.2.3 From 4d92e1b32d6abf62b2eb97a8df2ad682daead525 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 17 Apr 2020 20:51:41 -0300 Subject: zafiro-icons: add missing parent icon themes --- pkgs/data/icons/zafiro-icons/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/zafiro-icons/default.nix b/pkgs/data/icons/zafiro-icons/default.nix index 5bd61b0866a..a8dc4539a7d 100644 --- a/pkgs/data/icons/zafiro-icons/default.nix +++ b/pkgs/data/icons/zafiro-icons/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, gtk3, breeze-icons, gnome-icon-theme, numix-icon-theme, numix-icon-theme-circle, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "zafiro-icons"; @@ -11,10 +11,17 @@ stdenv.mkDerivation rec { sha256 = "05h8qm9izjbp8pnl9jpbw3y9sddhp0zmg94fm1k4d4hhdqnakqhv"; }; - nativeBuildInputs = [ gtk3 ]; + nativeBuildInputs = [ + gtk3 + ]; propagatedBuildInputs = [ + breeze-icons + gnome-icon-theme + numix-icon-theme + numix-icon-theme-circle hicolor-icon-theme + # still missing parent icon themes: Surfn ]; dontDropIconThemeCache = true; -- cgit v1.2.3 From eb43e8dd1b045d5a524465007b3d2a52f2732fed Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 20 Apr 2020 01:17:48 +0100 Subject: maintainers/teams: add acme team --- maintainers/team-list.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 7efff7f45ec..16c902ab8c5 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -17,6 +17,18 @@ { lib }: with lib.maintainers; { + acme = { + members = [ + aanderse + andrew-d + arianvp + emily + flokli + m1cr0man + ]; + scope = "Maintain ACME-related packages and modules."; + }; + freedesktop = { members = [ jtojnar worldofpeace ]; scope = "Maintain Freedesktop.org packages for graphical desktop."; -- cgit v1.2.3 From ef7e6eeaf417858ff51aa66ced6b274450b68786 Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 20 Apr 2020 01:36:13 +0100 Subject: nixos/acme: set maintainers to acme team --- nixos/modules/security/acme.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 39976380e3b..36f91529265 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -458,7 +458,7 @@ in ]; meta = { - maintainers = with lib.maintainers; [ abbradar fpletz globin m1cr0man ]; + maintainers = lib.teams.acme.members; doc = ./acme.xml; }; } -- cgit v1.2.3 From bfffee9364cfa2abe67e0d863ac3974ad8834a6d Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 20 Apr 2020 01:36:29 +0100 Subject: nixos/tests/acme: set maintainers to acme team --- nixos/tests/acme.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix index 693f02962f4..fc41dc1eb5f 100644 --- a/nixos/tests/acme.nix +++ b/nixos/tests/acme.nix @@ -12,8 +12,9 @@ let fi ''; -in import ./make-test-python.nix { +in import ./make-test-python.nix ({ lib, ... }: { name = "acme"; + meta.maintainers = lib.teams.acme.members; nodes = rec { acme = { nodes, lib, ... }: { @@ -207,4 +208,4 @@ in import ./make-test-python.nix { "curl --cacert /tmp/ca.crt https://c.example.test/ | grep -qF 'hello world'" ) ''; -} +}) -- cgit v1.2.3 From f3c18b24203e9a4ee8937fc4497baf0c5ad9e32b Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 20 Apr 2020 01:36:40 +0100 Subject: lego: set maintainers to acme team --- pkgs/tools/admin/lego/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index 72c61ceecaf..ce250d33e94 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -22,6 +22,6 @@ buildGoModule rec { description = "Let's Encrypt client and ACME library written in Go"; license = licenses.mit; homepage = "https://go-acme.github.io/lego/"; - maintainers = with maintainers; [ andrew-d ]; + maintainers = teams.acme.members; }; } -- cgit v1.2.3 From 3112c0e7fa50b2615284866468792cda644e2f2d Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 20 Apr 2020 01:36:42 +0100 Subject: pebble: set maintainers to acme team --- pkgs/tools/admin/pebble/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/pebble/default.nix b/pkgs/tools/admin/pebble/default.nix index efd9bfe0596..4813f86ea64 100644 --- a/pkgs/tools/admin/pebble/default.nix +++ b/pkgs/tools/admin/pebble/default.nix @@ -21,6 +21,6 @@ in buildGoPackage { homepage = "https://github.com/letsencrypt/pebble"; description = "A miniature version of Boulder, Pebble is a small RFC 8555 ACME test server not suited for a production CA"; license = [ lib.licenses.mpl20 ]; - maintainers = with lib.maintainers; [ emily ]; + maintainers = lib.teams.acme.members; }; } -- cgit v1.2.3 From 3d7acfd078071bdf8c2bc603786596b28a41129f Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Mon, 30 Mar 2020 05:49:08 +0200 Subject: jadx: init at 1.1.0 --- pkgs/tools/security/jadx/default.nix | 103 +++++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 105 insertions(+) create mode 100644 pkgs/tools/security/jadx/default.nix diff --git a/pkgs/tools/security/jadx/default.nix b/pkgs/tools/security/jadx/default.nix new file mode 100644 index 00000000000..961f1e6954a --- /dev/null +++ b/pkgs/tools/security/jadx/default.nix @@ -0,0 +1,103 @@ +{ stdenv, fetchFromGitHub, gradle, jdk, makeWrapper, perl }: + +let + pname = "jadx"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "skylot"; + repo = pname; + rev = "v${version}"; + sha256 = "1dx3g0sm46qy57gggpg8bpmin5glzbxdbf0qzvha9r2dwh4mrwlg"; + }; + + deps = stdenv.mkDerivation { + name = "${pname}-deps"; + inherit src; + + nativeBuildInputs = [ gradle jdk perl ]; + + buildPhase = '' + export GRADLE_USER_HOME=$(mktemp -d) + export JADX_VERSION=${version} + gradle --no-daemon jar + ''; + + # Mavenize dependency paths + # e.g. org.codehaus.groovy/groovy/2.4.0/{hash}/groovy-2.4.0.jar -> org/codehaus/groovy/groovy/2.4.0/groovy-2.4.0.jar + installPhase = '' + find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/$5" #e' \ + | sh + ''; + + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + outputHash = "083r4hg6m9cxzm2m8nckf10awq8kh901v5i39r60x47xk5yw84ps"; + }; +in stdenv.mkDerivation { + inherit pname version src; + + nativeBuildInputs = [ gradle jdk makeWrapper ]; + + buildPhase = '' + # The installDist Gradle build phase tries to copy some dependency .jar + # files multiple times into the build directory. This ends up failing when + # the dependencies are read directly from the Nix store since they are not + # marked as chmod +w. To work around this, get a local copy of the + # dependency store, and give write permissions. + depsDir=$(mktemp -d) + cp -R ${deps}/* $depsDir + chmod -R u+w $depsDir + + gradleInit=$(mktemp) + cat >$gradleInit < + settings.pluginManagement { + repositories { + maven { url '$depsDir' } + } + } + } + EOF + + export GRADLE_USER_HOME=$(mktemp -d) + export JADX_VERSION=${version} + gradle --offline --no-daemon --info --init-script $gradleInit pack + ''; + + installPhase = '' + mkdir $out $out/bin + cp -R build/jadx/lib $out + for prog in jadx jadx-gui; do + cp build/jadx/bin/$prog $out/bin + wrapProgram $out/bin/$prog --set JAVA_HOME ${jdk.home} + done + ''; + + meta = with stdenv.lib; { + description = "Dex to Java decompiler"; + longDescription = '' + Command line and GUI tools for produce Java source code from Android Dex + and Apk files. + ''; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ delroth ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad4bb9f8a97..8bca4f6ab87 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4366,6 +4366,8 @@ in jade = callPackage ../tools/text/sgml/jade { }; + jadx = callPackage ../tools/security/jadx { }; + jazzy = callPackage ../development/tools/jazzy { }; jc = with python3Packages; toPythonApplication jc; -- cgit v1.2.3 From 1b89bffcf47dc1e271bea128635e33efd9481b93 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Mon, 16 Mar 2020 09:21:15 +0100 Subject: libtxc_dxtn{,_s2tc}: remove from nixpkgs + hardware.opengl options Context: discussion in https://github.com/NixOS/nixpkgs/pull/82630 Mesa has been supporting S3TC natively without requiring these libraries since the S3TC patent expired in December 2017. --- nixos/modules/hardware/opengl.nix | 26 +++++----------------- pkgs/applications/misc/lutris/chrootenv.nix | 2 +- pkgs/development/libraries/libtxc_dxtn/default.nix | 23 ------------------- .../libraries/libtxc_dxtn_s2tc/default.nix | 25 --------------------- pkgs/misc/emulators/wine/default.nix | 2 -- pkgs/misc/emulators/wine/staging.nix | 4 ++-- pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 4 ---- 8 files changed, 10 insertions(+), 78 deletions(-) delete mode 100644 pkgs/development/libraries/libtxc_dxtn/default.nix delete mode 100644 pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix index 28cddea8b79..061528f4b1b 100644 --- a/nixos/modules/hardware/opengl.nix +++ b/nixos/modules/hardware/opengl.nix @@ -10,14 +10,6 @@ let videoDrivers = config.services.xserver.videoDrivers; - makePackage = p: pkgs.buildEnv { - name = "mesa-drivers+txc-${p.mesa.version}"; - paths = - [ p.mesa.drivers - (if cfg.s3tcSupport then p.libtxc_dxtn else p.libtxc_dxtn_s2tc) - ]; - }; - package = pkgs.buildEnv { name = "opengl-drivers"; paths = [ cfg.package ] ++ cfg.extraPackages; @@ -34,6 +26,9 @@ in imports = [ (mkRenamedOptionModule [ "services" "xserver" "vaapiDrivers" ] [ "hardware" "opengl" "extraPackages" ]) + (mkRemovedOptionModule [ "hardware" "opengl" "s3tcSupport" ] '' + S3TC support is now always enabled in Mesa. + '') ]; options = { @@ -74,17 +69,6 @@ in ''; }; - s3tcSupport = mkOption { - type = types.bool; - default = false; - description = '' - Make S3TC(S3 Texture Compression) via libtxc_dxtn available - to OpenGL drivers instead of the patent-free S2TC replacement. - - Using this library may require a patent license depending on your location. - ''; - }; - package = mkOption { type = types.package; internal = true; @@ -166,8 +150,8 @@ in environment.sessionVariables.LD_LIBRARY_PATH = mkIf cfg.setLdLibraryPath ([ "/run/opengl-driver/lib" ] ++ optional cfg.driSupport32Bit "/run/opengl-driver-32/lib"); - hardware.opengl.package = mkDefault (makePackage pkgs); - hardware.opengl.package32 = mkDefault (makePackage pkgs.pkgsi686Linux); + hardware.opengl.package = mkDefault pkgs.mesa.drivers; + hardware.opengl.package32 = mkDefault pkgs.pkgsi686Linux.mesa.drivers; boot.extraModulePackages = optional (elem "virtualbox" videoDrivers) kernelPackages.virtualboxGuestAdditions; }; diff --git a/pkgs/applications/misc/lutris/chrootenv.nix b/pkgs/applications/misc/lutris/chrootenv.nix index 6f8d690779b..2861991cc41 100644 --- a/pkgs/applications/misc/lutris/chrootenv.nix +++ b/pkgs/applications/misc/lutris/chrootenv.nix @@ -94,7 +94,7 @@ in buildFHSUserEnv { libsndfile libtheora libogg libvorbis libopus libGLU libpcap libpulseaudio libao libusb libevdev udev libgcrypt libxml2 libusb libpng libmpeg2 libv4l libjpeg libxkbcommon libass libcdio libjack2 libsamplerate libzip libmad libaio - libcap libtiff libva libgphoto2 libxslt libtxc_dxtn libsndfile giflib zlib glib + libcap libtiff libva libgphoto2 libxslt libsndfile giflib zlib glib alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils readline gcc SDL SDL2 curl graphite2 gtk2 gtk3 udev ncurses wayland libglvnd vulkan-loader xdg_utils sqlite gnutls libbsd diff --git a/pkgs/development/libraries/libtxc_dxtn/default.nix b/pkgs/development/libraries/libtxc_dxtn/default.nix deleted file mode 100644 index 4e65e457110..00000000000 --- a/pkgs/development/libraries/libtxc_dxtn/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, autoreconfHook, libGL, libGLU }: - -let version = "1.0.1"; in - -stdenv.mkDerivation rec { - pname = "libtxc_dxtn"; - inherit version; - - src = fetchurl { - url = "https://people.freedesktop.org/~cbrill/libtxc_dxtn/${pname}-${version}.tar.bz2"; - sha256 = "0q5fjaknl7s0z206dd8nzk9bdh8g4p23bz7784zrllnarl90saa5"; - }; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libGL libGLU ]; - - meta = with stdenv.lib; { - homepage = "http://dri.freedesktop.org/wiki/S3TC"; - repositories.git = "git://people.freedesktop.org/~mareko/libtxc_dxtn"; - license = licenses.mit; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix deleted file mode 100644 index bb69c0dec0a..00000000000 --- a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, autoreconfHook, libGL, libGLU }: - -let version = "1.0"; in - -stdenv.mkDerivation { - pname = "libtxc_dxtn_s2tc"; - inherit version; - - src = fetchurl { - url = "https://github.com/divVerent/s2tc/archive/v${version}.tar.gz"; - sha256 = "0ibfdib277fhbqvxzan0bmglwnsl1y1rw2g8skvz82l1sfmmn752"; - }; - - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libGL libGLU ]; - - meta = { - description = "A patent-free S3TC compatible implementation"; - homepage = "https://github.com/divVerent/s2tc"; - repositories.git = "https://github.com/divVerent/s2tc.git"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.cpages ]; - }; -} diff --git a/pkgs/misc/emulators/wine/default.nix b/pkgs/misc/emulators/wine/default.nix index 727eb270067..368e2845ca4 100644 --- a/pkgs/misc/emulators/wine/default.nix +++ b/pkgs/misc/emulators/wine/default.nix @@ -9,7 +9,6 @@ { lib, stdenv, callPackage, wineRelease ? "stable", wineBuild ? if stdenv.hostPlatform.system == "x86_64-linux" then "wineWow" else "wine32", - libtxc_dxtn_Name ? "libtxc_dxtn_s2tc", pngSupport ? false, jpegSupport ? false, tiffSupport ? false, @@ -63,7 +62,6 @@ let wine-build = build: release: in if wineRelease == "staging" then callPackage ./staging.nix { - inherit libtxc_dxtn_Name; wineUnstable = wine-build wineBuild "unstable"; } else diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix index df979c68a47..5c2469f8f44 100644 --- a/pkgs/misc/emulators/wine/staging.nix +++ b/pkgs/misc/emulators/wine/staging.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, wineUnstable, libtxc_dxtn_Name }: +{ stdenv, callPackage, wineUnstable }: with callPackage ./util.nix {}; @@ -8,7 +8,7 @@ let patch = (callPackage ./sources.nix {}).staging; in assert stdenv.lib.getVersion wineUnstable == patch.version; stdenv.lib.overrideDerivation wineUnstable (self: { - buildInputs = build-inputs [ "perl" "utillinux" "autoconf" libtxc_dxtn_Name ] self.buildInputs; + buildInputs = build-inputs [ "perl" "utillinux" "autoconf" ] self.buildInputs; name = "${self.name}-staging"; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6ebf2bcf8df..d645edaff7c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -244,6 +244,8 @@ mapAliases ({ librecad2 = librecad; # backwards compatibility alias, added 2015-10 libsysfs = sysfsutils; # added 2018-04-25 libtidy = html-tidy; # added 2014-12-21 + libtxc_dxtn = throw "removed 2020-03-16, now integrated in Mesa"; + libtxc_dxtn_s2tc = throw "removed 2020-03-16, now integrated in Mesa"; libudev = udev; # added 2018-04-25 libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it."; # 2019-12-10 links = links2; # added 2016-01-31 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ad4bb9f8a97..c705c7ae3af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13272,10 +13272,6 @@ in libtsm = callPackage ../development/libraries/libtsm { }; - libtxc_dxtn = callPackage ../development/libraries/libtxc_dxtn { }; - - libtxc_dxtn_s2tc = callPackage ../development/libraries/libtxc_dxtn_s2tc { }; - libgeotiff = callPackage ../development/libraries/libgeotiff { }; libu2f-host = callPackage ../development/libraries/libu2f-host { }; -- cgit v1.2.3 From 261d7c2f665a079a53146cdc941d308ce90d961f Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 6 Apr 2020 10:43:10 -0400 Subject: ocamlPackages.dune-build-info: init at 2.4.0 --- .../ocaml-modules/dune-build-info/default.nix | 17 +++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/ocaml-modules/dune-build-info/default.nix diff --git a/pkgs/development/ocaml-modules/dune-build-info/default.nix b/pkgs/development/ocaml-modules/dune-build-info/default.nix new file mode 100644 index 00000000000..3c828ebdcdb --- /dev/null +++ b/pkgs/development/ocaml-modules/dune-build-info/default.nix @@ -0,0 +1,17 @@ +{ lib, buildDunePackage, dune_2 }: + +buildDunePackage rec { + pname = "dune-build-info"; + inherit (dune_2) src version; + + useDune2 = true; + + dontAddPrefix = true; + + meta = with lib; { + inherit (dune_2.meta) homepage; + description = "Embed build information inside executables"; + maintainers = [ maintainers.bcdarwin ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index fd863e428af..5983110ceae 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -230,6 +230,8 @@ let dune_2 = callPackage ../development/tools/ocaml/dune/2.nix { }; + dune-build-info = callPackage ../development/ocaml-modules/dune-build-info { }; + dune-configurator = callPackage ../development/ocaml-modules/dune-configurator { }; dune-private-libs = callPackage ../development/ocaml-modules/dune-private-libs { }; -- cgit v1.2.3 From 3a9f743605f8dc164eb7650d39a72cafebe28cbf Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 6 Apr 2020 19:23:35 -0400 Subject: ocamlPackages.linenoise: 1.1.0 -> 1.3.0 --- pkgs/development/ocaml-modules/linenoise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/linenoise/default.nix b/pkgs/development/ocaml-modules/linenoise/default.nix index b6b9b4163ff..0ad277f4a07 100644 --- a/pkgs/development/ocaml-modules/linenoise/default.nix +++ b/pkgs/development/ocaml-modules/linenoise/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "linenoise"; - version = "1.1.0"; + version = "1.3.0"; minimumOCamlVersion = "4.02"; @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "fxfactorial"; repo = "ocaml-${pname}"; rev = "v${version}"; - sha256 = "1h6rqfgmhmd7p5z8yhk6zkbrk4yzw1v2fgwas2b7g3hqs6y0xj0q"; + sha256 = "0m9mm1arsawi5w5aqm57z41sy1wfxvhfgbdiw7hzy631i391144g"; }; propagatedBuildInputs = [ result ]; -- cgit v1.2.3 From c62428963ada53aa861de73634db96b7ff735400 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Tue, 7 Apr 2020 12:56:32 -0400 Subject: ocamlPackages.sedlex_2: fix dependencies (as per 77901a9) --- pkgs/development/ocaml-modules/sedlex/2.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/sedlex/2.nix b/pkgs/development/ocaml-modules/sedlex/2.nix index 7b751ba0303..b1a892d5b80 100644 --- a/pkgs/development/ocaml-modules/sedlex/2.nix +++ b/pkgs/development/ocaml-modules/sedlex/2.nix @@ -38,9 +38,9 @@ buildDunePackage rec { sha256 = "05f6qa8x3vhpdz1fcnpqk37fpnyyq13icqsk2gww5idjnh6kng26"; }; - buildInputs = [ ppx_tools_versioned ocaml-migrate-parsetree ]; - - propagatedBuildInputs = [ gen uchar ]; + propagatedBuildInputs = [ + gen uchar ocaml-migrate-parsetree ppx_tools_versioned + ]; preBuild = '' ln -s ${DerivedCoreProperties} src/generator/data/DerivedCoreProperties.txt -- cgit v1.2.3 From ad7b7367b6191ccaca00928e0cc9633b98b27490 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 6 Apr 2020 20:44:48 -0400 Subject: beluga: 20180403 -> unstable-2020-03-11 --- pkgs/applications/science/logic/beluga/default.nix | 38 +++++++++++++--------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/science/logic/beluga/default.nix b/pkgs/applications/science/logic/beluga/default.nix index 55cee9b7e17..44478a032b3 100644 --- a/pkgs/applications/science/logic/beluga/default.nix +++ b/pkgs/applications/science/logic/beluga/default.nix @@ -1,34 +1,40 @@ -{ stdenv, fetchFromGitHub, ocamlPackages, omake }: +{ lib, fetchFromGitHub, ocamlPackages, rsync }: -stdenv.mkDerivation { - name = "beluga-20180403"; +ocamlPackages.buildDunePackage { + pname = "beluga"; + version = "unstable-2020-03-11"; src = fetchFromGitHub { owner = "Beluga-lang"; repo = "Beluga"; - rev = "046aa59f008be70a7c4700b723bed0214ea8b687"; - sha256 = "0m68y0r0wdw3mg2jks68bihaww7sg305zdfnic1rkndq2cxv0mld"; + rev = "6133b2f572219333f304bb4f77c177592324c55b"; + sha256 = "0sy6mi50z3mvs5z7dx38piydapk89all81rh038x3559b5fsk68q"; }; - nativeBuildInputs = with ocamlPackages; [ findlib ocamlbuild omake ]; - buildInputs = with ocamlPackages; [ ocaml ulex ocaml_extlib ]; + useDune2 = true; - installPhase = '' - mkdir -p $out - cp -r bin $out/ + buildInputs = with ocamlPackages; [ + gen sedlex_2 ocaml_extlib dune-build-info linenoise + ]; - mkdir -p $out/share/beluga - cp -r tools/ examples/ $out/share/beluga + postPatch = '' + patchShebangs ./TEST ./run_harpoon_test.sh + ''; + + checkPhase = "./TEST"; + checkInputs = [ rsync ]; + doCheck = true; + postInstall = '' mkdir -p $out/share/emacs/site-lisp/beluga/ cp -r tools/beluga-mode.el $out/share/emacs/site-lisp/beluga ''; - meta = { + meta = with lib; { description = "A functional language for reasoning about formal systems"; homepage = "http://complogic.cs.mcgill.ca/beluga/"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.bcdarwin ]; - platforms = stdenv.lib.platforms.unix; + license = licenses.gpl3Plus; + maintainers = [ maintainers.bcdarwin ]; + platforms = platforms.unix; }; } -- cgit v1.2.3 From e857e72b7adc067294b6215df87ad319c15861c7 Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Mon, 20 Apr 2020 05:48:04 +0200 Subject: alacritty: manually strip before running patchelf patchelf seems to generate an ELF that "strip" cannot process: strip: /tmp/stNGAZvd: not enough room for program headers, try linking with -N strip:/tmp/stNGAZvd[.interp]: bad value (This unfortunately does not cause any errors or even error output in the build log, since the default strip hook redirects them to /dev/null and ignores failures.) The lack of stripping ends up leaking paths to the compiler in the debug symbols. This more than doubles the transitive closure size of alacritty. Impact on closure size: 314.5M -> 131.8M. --- pkgs/applications/misc/alacritty/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index b6248b8f6f1..c5d7b19618f 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -104,6 +104,12 @@ rustPlatform.buildRustPackage rec { '' else '' 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 generates an ELF that binutils' "strip" doesn't like: + # strip: not enough room for program headers, try linking with -N + # As a workaround, strip manually before running patchelf. + strip -S $out/bin/alacritty + patchelf --set-rpath "${lib.makeLibraryPath rpathLibs}" $out/bin/alacritty '' ) + '' -- cgit v1.2.3 From d7df6591263a954fefe0e074c96e02ea3317f578 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Mon, 20 Apr 2020 07:10:49 +0200 Subject: jetbrains: 2019.3.5 -> 2020.1 --- pkgs/applications/editors/jetbrains/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index b98acae2a8f..282d950c85d 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -250,12 +250,12 @@ in clion = buildClion rec { name = "clion-${version}"; - version = "2019.3.5"; /* updated by script */ + version = "2020.1"; /* updated by script */ description = "C/C++ IDE. New. Intelligent. Cross-platform"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/cpp/CLion-${version}.tar.gz"; - sha256 = "0qmhp0sqcknwgsirnbi6461lzr7mxgrgjsd0q5cxnhscbbczl7pk"; /* updated by script */ + sha256 = "18mbw72vgrzkvjykc23h17qxrxfvhjzhy9rxpi2asw196qalavzp"; /* updated by script */ }; wmClass = "jetbrains-clion"; update-channel = "CLion RELEASE"; # channel's id as in http://www.jetbrains.com/updates/updates.xml @@ -276,12 +276,12 @@ in goland = buildGoland rec { name = "goland-${version}"; - version = "2019.3.4"; /* updated by script */ + version = "2020.1"; /* updated by script */ description = "Up and Coming Go IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/go/${name}.tar.gz"; - sha256 = "01dik4ppn4a6m1bmz6cmdnyrilh2v190lrys65n4nps03sjy2v0b"; /* updated by script */ + sha256 = "1qlpx3vfqwpyyxjsknhxvbdhyciwihhl0hkinrpdky6bza1yfgf6"; /* updated by script */ }; wmClass = "jetbrains-goland"; update-channel = "GoLand RELEASE"; @@ -315,12 +315,12 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "2019.3.4"; /* updated by script */ + version = "2020.1"; /* updated by script */ description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "1bxi2i6vxpw8x4mvb4d5plqy4r938xjf8nkimfg0sspramcc4r5m"; /* updated by script */ + sha256 = "1yvqljjv6004kw2nkpddrsgnigb56rapgs3f1pcvl20h6hj08qj8"; /* updated by script */ }; wmClass = "jetbrains-phpstorm"; update-channel = "PhpStorm RELEASE"; @@ -354,12 +354,12 @@ in rider = buildRider rec { name = "rider-${version}"; - version = "2019.3.4"; /* updated by script */ + version = "2020.1.0"; /* updated by script */ description = "A cross-platform .NET IDE based on the IntelliJ platform and ReSharper"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/rider/JetBrains.Rider-${version}.tar.gz"; - sha256 = "17axv0v31dpmjcaij5qpqqm071mwhmf1ahy0y0h96limq8cw9872"; /* updated by script */ + sha256 = "1allpdr7k48nvl8vbvzyn6h81jpklzaqdqivrqqyh8hy9l98w4ws"; /* updated by script */ }; wmClass = "jetbrains-rider"; update-channel = "Rider RELEASE"; @@ -367,12 +367,12 @@ in ruby-mine = buildRubyMine rec { name = "ruby-mine-${version}"; - version = "2019.3.4"; /* updated by script */ + version = "2020.1"; /* updated by script */ description = "The Most Intelligent Ruby and Rails IDE"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/ruby/RubyMine-${version}.tar.gz"; - sha256 = "13lwrqrkg5vk0azqfhr67psgv1idvkxwjxly2xawr6cy5vnrcd8s"; /* updated by script */ + sha256 = "1hk6k4f24infw9qj9mxp305nl0bxif6ymdsqg005pskvnyi8v5fi"; /* updated by script */ }; wmClass = "jetbrains-rubymine"; update-channel = "RubyMine RELEASE"; -- cgit v1.2.3 From 441f5d5d267a805c921fcb65c7a41ea4db4e9a51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Mon, 20 Apr 2020 07:16:14 +0200 Subject: jetbrains: remove deprecated value "Application" from desktop file --- pkgs/applications/editors/jetbrains/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix index bca85c01016..cb732d076f2 100644 --- a/pkgs/applications/editors/jetbrains/common.nix +++ b/pkgs/applications/editors/jetbrains/common.nix @@ -19,7 +19,7 @@ with stdenv; lib.makeOverridable mkDerivation rec { comment = lib.replaceChars ["\n"] [" "] meta.longDescription; desktopName = product; genericName = meta.description; - categories = "Application;Development;"; + categories = "Development;"; icon = execName; extraEntries = '' StartupWMClass=${wmClass} -- cgit v1.2.3 From 93df15d79ae293b19a3945af7302052205480804 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 27 Feb 2020 17:19:40 +0800 Subject: https-dns-proxy: init at unstable-20200419 --- pkgs/servers/dns/https-dns-proxy/default.nix | 34 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/servers/dns/https-dns-proxy/default.nix diff --git a/pkgs/servers/dns/https-dns-proxy/default.nix b/pkgs/servers/dns/https-dns-proxy/default.nix new file mode 100644 index 00000000000..6f2cb504803 --- /dev/null +++ b/pkgs/servers/dns/https-dns-proxy/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, cmake, gtest, c-ares, curl, libev }: + +stdenv.mkDerivation rec { + pname = "https-dns-proxy"; + # there are no stable releases (yet?) + version = "unstable-20200419"; + + src = fetchFromGitHub { + owner = "aarond10"; + repo = "https_dns_proxy"; + rev = "79fc7b085e3b1ad64c8332f7115dfe2bf5f1f3e4"; + sha256 = "1cdfswfjby4alp6gy7yyjm76kfyclh5ax0zadnqs2pyigg9plh0b"; + }; + + nativeBuildInputs = [ cmake gtest ]; + + buildInputs = [ c-ares curl libev ]; + + installPhase = '' + install -Dm555 -t $out/bin https_dns_proxy + install -Dm444 -t $out/share/doc/${pname} ../{LICENSE,README}.* + ''; + + # upstream wants to add tests and the gtest framework is in place, so be ready + # for when that happens despite there being none as of right now + doCheck = true; + + meta = with stdenv.lib; { + description = "DNS to DNS over HTTPS (DoH) proxy"; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 865b8543f46..7167eb8c5aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15356,6 +15356,8 @@ in home-assistant-cli = callPackage ../servers/home-assistant/cli.nix { }; + https-dns-proxy = callPackage ../servers/dns/https-dns-proxy { }; + hydron = callPackage ../servers/hydron { }; icingaweb2 = callPackage ../servers/icingaweb2 { }; -- cgit v1.2.3 From ab37d7e7ea6fa44bba109c30dd006037c93cbc52 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 19 Apr 2020 14:41:18 +0100 Subject: nixos-containers: Add support for custom nixpkgs argument --- nixos/modules/virtualisation/containers.nix | 18 +++++++++++-- nixos/tests/all-tests.nix | 1 + nixos/tests/containers-custom-pkgs.nix | 42 +++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 nixos/tests/containers-custom-pkgs.nix diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index dad211ef55b..2db5c117aa7 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -463,10 +463,15 @@ in A specification of the desired configuration of this container, as a NixOS module. ''; - type = lib.mkOptionType { + type = let + confPkgs = if config.pkgs == null then pkgs else config.pkgs; + in lib.mkOptionType { name = "Toplevel NixOS config"; - merge = loc: defs: (import ../../lib/eval-config.nix { + merge = loc: defs: (import (confPkgs.path + "/nixos/lib/eval-config.nix") { inherit system; + pkgs = confPkgs; + baseModules = import (confPkgs.path + "/nixos/modules/module-list.nix"); + inherit (confPkgs) lib; modules = let extraConfig = { @@ -515,6 +520,15 @@ in ''; }; + pkgs = mkOption { + type = types.nullOr types.attrs; + default = null; + example = literalExample "pkgs"; + description = '' + Customise which nixpkgs to use for this container. + ''; + }; + ephemeral = mkOption { type = types.bool; default = false; diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index b0c9c7bc225..30229a3a5b2 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -53,6 +53,7 @@ in consul = handleTest ./consul.nix {}; cockroachdb = handleTestOn ["x86_64-linux"] ./cockroachdb.nix {}; containers-bridge = handleTest ./containers-bridge.nix {}; + containers-custom-pkgs.nix = handleTest ./containers-custom-pkgs.nix {}; containers-ephemeral = handleTest ./containers-ephemeral.nix {}; containers-extra_veth = handleTest ./containers-extra_veth.nix {}; containers-hosts = handleTest ./containers-hosts.nix {}; diff --git a/nixos/tests/containers-custom-pkgs.nix b/nixos/tests/containers-custom-pkgs.nix new file mode 100644 index 00000000000..397a4a905e6 --- /dev/null +++ b/nixos/tests/containers-custom-pkgs.nix @@ -0,0 +1,42 @@ +# Test for NixOS' container support. + +import ./make-test-python.nix ({ pkgs, lib, ...} : let + + customPkgs = pkgs // { + hello = pkgs.hello.overrideAttrs(old: { + name = "custom-hello"; + }); + }; + +in { + name = "containers-hosts"; + meta = with lib.maintainers; { + maintainers = [ adisbladis ]; + }; + + machine = + { ... }: + { + virtualisation.memorySize = 256; + virtualisation.vlans = []; + + containers.simple = { + autoStart = true; + pkgs = customPkgs; + config = {pkgs, config, ... }: { + environment.systemPackages = [ + pkgs.hello + ]; + }; + }; + + }; + + testScript = '' + start_all() + machine.wait_for_unit("default.target") + machine.succeed( + "test $(nixos-container run simple -- readlink -f /run/current-system/sw/bin/hello) = ${customPkgs.hello}/bin/hello" + ) + ''; +}) -- cgit v1.2.3 From f39712960adf105ec17371031f669b65c217b1a6 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 13 Apr 2020 10:41:40 +0200 Subject: =?UTF-8?q?ocamlPackages.rpclib:=206.0.0=20=E2=86=92=207.0.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/rpclib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/rpclib/default.nix b/pkgs/development/ocaml-modules/rpclib/default.nix index a4134f592b3..9216a489248 100644 --- a/pkgs/development/ocaml-modules/rpclib/default.nix +++ b/pkgs/development/ocaml-modules/rpclib/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "rpclib"; - version = "6.0.0"; + version = "7.0.0"; minimumOCamlVersion = "4.04"; @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "mirage"; repo = "ocaml-rpc"; rev = "v${version}"; - sha256 = "0bmr20sj7kybjjlwd42irj0f5zlnxcw7mxa1mdgxkki9bmhsqr51"; + sha256 = "0d8nb272mjxkq5ddn65cy9gjpa8yvd0v3jv3wp5xfh9gj29wd2jj"; }; buildInputs = [ alcotest cmdliner yojson ]; -- cgit v1.2.3 From 75971d096a629e3d60faa5f4f15f0044c76bfdbb Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 13 Apr 2020 10:41:44 +0200 Subject: ocamlPackages.async_ssl: remove at 113.33.07 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is the legacy version for OCaml ≤ 4.02 --- pkgs/development/ocaml-modules/janestreet/async_ssl.nix | 17 ----------------- pkgs/top-level/ocaml-packages.nix | 5 ----- 2 files changed, 22 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/janestreet/async_ssl.nix diff --git a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix b/pkgs/development/ocaml-modules/janestreet/async_ssl.nix deleted file mode 100644 index c13f9a34fb7..00000000000 --- a/pkgs/development/ocaml-modules/janestreet/async_ssl.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ stdenv, buildOcamlJane, async, comparelib, core, ctypes -, openssl, fieldslib, herelib, pipebang, sexplib, ocaml_oasis -}: - -buildOcamlJane { - name = "async_ssl"; - version = "113.33.07"; - hash = "0bhzpnmlx6dy4fli3i7ipjwqbsdi7fq171jrila5dr3ciy3841xs"; - propagatedBuildInputs = [ ctypes async comparelib core fieldslib - herelib pipebang sexplib openssl ocaml_oasis ]; - meta = with stdenv.lib; { - homepage = "https://github.com/janestreet/async_ssl"; - description = "Async wrappers for ssl"; - license = licenses.asl20; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index e6ffa73f035..160adc015f8 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1234,11 +1234,6 @@ let then callPackage ../development/ocaml-modules/janestreet/async.nix {} else async_p4; - async_ssl = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.async_ssl - else callPackage ../development/ocaml-modules/janestreet/async_ssl.nix { }; - # Apps / from all-packages ocamlnat = callPackage ../development/ocaml-modules/ocamlnat { }; -- cgit v1.2.3 From 71c405ea2e086aabbac131962ef82bb68c440a94 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 13 Apr 2020 10:41:48 +0200 Subject: satysfi: use OCaml 4.07 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index daf7366cf1e..ffff1363a50 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25845,7 +25845,9 @@ in sanoid = callPackage ../tools/backup/sanoid { }; - satysfi = callPackage ../tools/typesetting/satysfi { }; + satysfi = callPackage ../tools/typesetting/satysfi { + ocamlPackages = ocaml-ng.ocamlPackages_4_07; + }; sc-controller = pythonPackages.callPackage ../misc/drivers/sc-controller { inherit libusb1; # Shadow python.pkgs.libusb1. -- cgit v1.2.3 From 3e7a2b9147fe78a229d5bd20849ce078e6b9ef71 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 13 Apr 2020 10:41:51 +0200 Subject: =?UTF-8?q?ocamlPackages.janeStreet:=200.12=20=E2=86=92=200.13?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ocamlPackages.bistro: fix for core-0.13 ocamlPackages.phylogenetics: 2020-01-05 → 2020-01-25 --- pkgs/development/ocaml-modules/bistro/default.nix | 8 +- pkgs/development/ocaml-modules/janestreet/0.13.nix | 503 +++++++++++++++++++++ .../ocaml-modules/janestreet/janePackage_0_13.nix | 19 + .../ocaml-modules/phylogenetics/default.nix | 6 +- pkgs/tools/misc/patdiff/default.nix | 2 +- pkgs/top-level/ocaml-packages.nix | 12 +- 6 files changed, 543 insertions(+), 7 deletions(-) create mode 100644 pkgs/development/ocaml-modules/janestreet/0.13.nix create mode 100644 pkgs/development/ocaml-modules/janestreet/janePackage_0_13.nix diff --git a/pkgs/development/ocaml-modules/bistro/default.nix b/pkgs/development/ocaml-modules/bistro/default.nix index b141244f8c5..9603f283ee4 100644 --- a/pkgs/development/ocaml-modules/bistro/default.nix +++ b/pkgs/development/ocaml-modules/bistro/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildDunePackage +{ lib, fetchFromGitHub, fetchpatch, buildDunePackage , base64, bos, core, lwt_react, ocamlgraph, rresult, tyxml }: @@ -12,6 +12,12 @@ buildDunePackage rec { sha256 = "114gq48cpj2mvycypa9lfyqqb26wa2gkdfwkcqhnx7m6sdwv9a38"; }; + # The following patch adds support for core.v0.13 + patches = [(fetchpatch { + url = "https://github.com/pveber/bistro/commit/0931db43a146ad7829dff5120161a775f732a878.patch"; + sha256 = "06y0sxbbab1mssc1xfjjv12lpv4rny5iqv9qkdqyzrvzpl1bdvnd"; + })]; + propagatedBuildInputs = [ base64 bos core lwt_react ocamlgraph rresult tyxml ]; minimumOCamlVersion = "4.07"; diff --git a/pkgs/development/ocaml-modules/janestreet/0.13.nix b/pkgs/development/ocaml-modules/janestreet/0.13.nix new file mode 100644 index 00000000000..4682a744d6f --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/0.13.nix @@ -0,0 +1,503 @@ +{ janePackage +, ctypes +, num +, octavius +, ppxlib +, re +, openssl +}: + +rec { + + ocaml-compiler-libs = janePackage { + pname = "ocaml-compiler-libs"; + version = "0.12.1"; + hash = "0hpk54fcsfcjp536fgwr80mjjf88hjk58q7jwnyrhk2ljd8xzgiv"; + meta.description = "OCaml compiler libraries repackaged"; + }; + + sexplib0 = janePackage { + pname = "sexplib0"; + hash = "1b1bk0xs1hqa12qs5y4h1yl3mq6xml4ya2570dyhdn1j0fbw4g3y"; + meta.description = "Library containing the definition of S-expressions and some base converters"; + }; + + base = janePackage { + pname = "base"; + version = "0.13.1"; + hash = "08a5aymcgr5svvm8v0v20msd5cad64m6maakfbhz4172g7kd9jzw"; + meta.description = "Full standard library replacement for OCaml"; + propagatedBuildInputs = [ sexplib0 ]; + }; + + stdio = janePackage { + pname = "stdio"; + hash = "1hkj9vh8n8p3n5pvx7053xis1pfmqd8p7shjyp1n555xzimfxzgh"; + meta.description = "Standard IO library for OCaml"; + propagatedBuildInputs = [ base ]; + }; + + ppx_sexp_conv = janePackage { + pname = "ppx_sexp_conv"; + hash = "0jkhwmkrfq3ss6bv6i3m871alcr4xpngs6ci6bmzv3yfl7s8bwdf"; + meta.description = "[@@deriving] plugin to generate S-expression conversion functions"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_here = janePackage { + pname = "ppx_here"; + hash = "1ahidrrjsyi0al06bhv5h6aqmdk7ryz8dybfhqjsn1zp9q056q35"; + meta.description = "Expands [%here] into its location"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_compare = janePackage { + pname = "ppx_compare"; + hash = "14pnqa47gsvq93z1b8wb5pyq8zw90aaw71j4pwlyid4s86px454j"; + meta.description = "Generation of comparison functions from types"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_cold = janePackage { + pname = "ppx_cold"; + hash = "0wnfwsgbzk4i5aqjlcaqp6lkvrq5345vazryvx2klbbrd4759h9f"; + meta.description = "Expands [@cold] into [@inline never][@specialise never][@local never]"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_assert = janePackage { + pname = "ppx_assert"; + hash = "08dada2xcp3w5mir90z56qrdyd317lygml4qlfssj897534bwiqr"; + meta.description = "Assert-like extension nodes that raise useful errors on failure"; + propagatedBuildInputs = [ ppx_cold ppx_compare ppx_here ppx_sexp_conv ]; + }; + + ppx_inline_test = janePackage { + pname = "ppx_inline_test"; + hash = "135qzbhqy33lmigbq1rakr9i3y59y3pczh4laanqjyss9b9kfs60"; + meta.description = "Syntax extension for writing in-line tests in ocaml code"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_custom_printf = janePackage { + pname = "ppx_custom_printf"; + hash = "0kvfkdk4wg2z8x705bajvl1f8wiyy3aya203wdzc9425h73nqm5p"; + meta.description = "Printf-style format-strings for user-defined string conversion"; + propagatedBuildInputs = [ ppx_sexp_conv ]; + }; + + fieldslib = janePackage { + pname = "fieldslib"; + hash = "0nsl0i9vjk73pr70ksxqa65rd5v84jzdaazryfdy6i4a5sfg7bxa"; + meta.description = "Syntax extension to define first class values representing record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values"; + propagatedBuildInputs = [ base ]; + }; + + ppx_fields_conv = janePackage { + pname = "ppx_fields_conv"; + hash = "0biw0fgphj522bj9wgjk263i2w92vnpaabzr5zn0grihp4yqy8w4"; + meta.description = "Generation of accessor and iteration functions for ocaml records"; + propagatedBuildInputs = [ fieldslib ppxlib ]; + }; + + variantslib = janePackage { + pname = "variantslib"; + hash = "04nps65v1n0nv9n1c1kj5k9jyqsfsxb6h2w3vf6cibhjr5m7z8xc"; + meta.description = "Part of Jane Street's Core library"; + propagatedBuildInputs = [ base ]; + }; + + ppx_variants_conv = janePackage { + pname = "ppx_variants_conv"; + hash = "1ssinizz11bws06qzjky486cj1zrflij1f7hi16d02j40qmyjz7b"; + meta.description = "Generation of accessor and iteration functions for ocaml variant types"; + propagatedBuildInputs = [ variantslib ppxlib ]; + }; + + ppx_expect = janePackage { + pname = "ppx_expect"; + hash = "1hhcga960wjvhcx5pk7rcywl1p9n2ycvqa294n24m8dhzqia6i47"; + meta.description = "Cram like framework for OCaml"; + propagatedBuildInputs = [ ppx_assert ppx_custom_printf ppx_fields_conv ppx_inline_test ppx_variants_conv re ]; + }; + + ppx_enumerate = janePackage { + pname = "ppx_enumerate"; + hash = "0hsg6f2nra1mb35jdgym5rf7spm642bs6qqifbikm9hg8f7z3ql4"; + meta.description = "Generate a list containing all values of a finite type"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_hash = janePackage { + pname = "ppx_hash"; + hash = "1f7mfyx4wgk67hchi57w3142m61ka3vgy1969cbkwr3akv6ifly2"; + meta.description = "A ppx rewriter that generates hash functions from type expressions and definitions"; + propagatedBuildInputs = [ ppx_compare ppx_sexp_conv ]; + }; + + ppx_js_style = janePackage { + pname = "ppx_js_style"; + hash = "1zlhcn0an5k9xjymk5z5m2vqi8zajy6nvcbl5sdn19pjl3zv645x"; + meta.description = "Code style checker for Jane Street Packages"; + propagatedBuildInputs = [ octavius ppxlib ]; + }; + + ppx_base = janePackage { + pname = "ppx_base"; + hash = "0dkqc85x7bgbb6lgx9rghvj1q4dpdgy9qgjl88ywi4c8l9rgnnkz"; + meta.description = "Base set of ppx rewriters"; + propagatedBuildInputs = [ ppx_cold ppx_enumerate ppx_hash ppx_js_style ]; + }; + + ppx_bench = janePackage { + pname = "ppx_bench"; + hash = "0snmy05d3jgihmppixx3dzamkykijqa2v43vpd7q4z8dpnip620g"; + meta.description = "Syntax extension for writing in-line benchmarks in ocaml code"; + propagatedBuildInputs = [ ppx_inline_test ]; + }; + + ppx_sexp_message = janePackage { + pname = "ppx_sexp_message"; + hash = "03jhx3ajcv22iwxkg1jf1jjvd14gyrwi1yc6c5ryqi5ha0fywfw6"; + meta.description = "A ppx rewriter for easy construction of s-expressions"; + propagatedBuildInputs = [ ppx_here ppx_sexp_conv ]; + }; + + splittable_random = janePackage { + pname = "splittable_random"; + hash = "1kgcd6k31vsd7638g8ip77bp1b7vzgkbvgvij4jm2igl09132r85"; + meta.description = "PRNG that can be split into independent streams"; + propagatedBuildInputs = [ base ppx_assert ppx_bench ppx_sexp_message ]; + }; + + ppx_let = janePackage { + pname = "ppx_let"; + hash = "0qplsvbv10h7kwf6dhhgvi001gfphv1v66s83zjr5zbypyaarg5y"; + meta.description = "Monadic let-bindings"; + propagatedBuildInputs = [ ppxlib ]; + }; + + base_quickcheck = janePackage { + pname = "base_quickcheck"; + hash = "0ik8llm01m2xap4gia0vpsh7yq311hph7a2kf5109ag4988s8p0w"; + meta.description = "Randomized testing framework, designed for compatibility with Base"; + propagatedBuildInputs = [ ppx_base ppx_fields_conv ppx_let splittable_random ]; + }; + + ppx_stable = janePackage { + pname = "ppx_stable"; + hash = "0h7ls1bs0bsd8c4na4aj0nawwhvfy50ybm7sza7yz3qli9jammjk"; + meta.description = "Stable types conversions generator"; + propagatedBuildInputs = [ ppxlib ]; + }; + + bin_prot = janePackage { + pname = "bin_prot"; + hash = "1nnr21rljlfglmhiji27d7c1d6gg5fk4cc5rl3750m98w28mfdjw"; + meta.description = "A binary protocol generator"; + propagatedBuildInputs = [ ppx_compare ppx_custom_printf ppx_fields_conv ppx_variants_conv ]; + }; + + ppx_bin_prot = janePackage { + pname = "ppx_bin_prot"; + hash = "14nfjgqisdqqg8wg4qzvc859zil82y0qpr8fm4nhq05mgxp37iyc"; + meta.description = "Generation of bin_prot readers and writers from types"; + propagatedBuildInputs = [ bin_prot ppx_here ]; + }; + + ppx_fail = janePackage { + pname = "ppx_fail"; + hash = "165mikjg4a1lahq3n9q9y2h36jbln5g3l2hapx17irvf0l0c3vn5"; + meta.description = "Add location to calls to failwiths"; + propagatedBuildInputs = [ ppx_here ]; + }; + + jst-config = janePackage { + pname = "jst-config"; + hash = "15lj6f83hz555xhjy9aayl3adqwgl1blcjnja693a1ybi3ca8w0y"; + meta.description = "Compile-time configuration for Jane Street libraries"; + buildInputs = [ ppx_assert ]; + }; + + ppx_optcomp = janePackage { + pname = "ppx_optcomp"; + hash = "13db395swqf7v87pgl9qiyj4igmvj57hpl8blx3kkrzj6ddh38a8"; + meta.description = "Optional compilation for OCaml"; + propagatedBuildInputs = [ ppxlib ]; + }; + + jane-street-headers = janePackage { + pname = "jane-street-headers"; + hash = "1qjg2ari0xn40dlbk0h9xkwr37k97ldkxpkv792fbl6wc2jlv3x5"; + meta.description = "Jane Street C header files"; + }; + + time_now = janePackage { + pname = "time_now"; + hash = "1if234kz1ssmv22c0vh1cwhbivab6yy3xvy37ny1q4k5ibjc3v0n"; + meta.description = "Reports the current time"; + buildInputs = [ jst-config ppx_optcomp ]; + propagatedBuildInputs = [ jane-street-headers base ppx_base ]; + }; + + ppx_module_timer = janePackage { + pname = "ppx_module_timer"; + hash = "13kv5fzwf41wsaksj41hnvcpx8pnbmzcainlq6f5shj9671hpnhb"; + meta.description = "Ppx rewriter that records top-level module startup times"; + propagatedBuildInputs = [ time_now ]; + }; + + ppx_optional = janePackage { + pname = "ppx_optional"; + hash = "1nwb9jvmszxddj9wxgv9g02qhr10yymm2q1w1gjfqd97m2m1mx4n"; + meta.description = "Pattern matching on flat options"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_pipebang = janePackage { + pname = "ppx_pipebang"; + hash = "0ybj0flsi95pf13ayzz1lcrqhqvkv1lm2dz6y8w49f12583496mc"; + meta.description = "A ppx rewriter that inlines reverse application operators `|>` and `|!`"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_sexp_value = janePackage { + pname = "ppx_sexp_value"; + hash = "18k5015awv9yjl44cvdmp3pn894cgsxmn5s7picxapm9675xqcg9"; + meta.description = "A ppx rewriter that simplifies building s-expressions from ocaml values"; + propagatedBuildInputs = [ ppx_here ppx_sexp_conv ]; + }; + + typerep = janePackage { + pname = "typerep"; + hash = "116hlifww2cqq1i9vwpl7ziwkc1na7p9icqi9srpdxnvn8ibcsas"; + meta.description = "Typerep is a library for runtime types"; + propagatedBuildInputs = [ base ]; + }; + + ppx_typerep_conv = janePackage { + pname = "ppx_typerep_conv"; + hash = "1jlmga9i79inr412l19n4vvmgafzp1bznqxwhy42x309wblbhxx9"; + meta.description = "Generation of runtime types from type declarations"; + propagatedBuildInputs = [ ppxlib typerep ]; + }; + + ppx_jane = janePackage { + pname = "ppx_jane"; + hash = "1a86rvnry8lvjhsg2k73f5bgz7l2962k5i49yzmzn8w66kj0yz60"; + meta.description = "Standard Jane Street ppx rewriters"; + propagatedBuildInputs = [ base_quickcheck ppx_bench ppx_bin_prot ppx_expect ppx_fail ppx_module_timer ppx_optcomp ppx_optional ppx_pipebang ppx_sexp_value ppx_stable ppx_typerep_conv ]; + }; + + base_bigstring = janePackage { + pname = "base_bigstring"; + hash = "1i3zr8bn71l442vl5rrvjpwphx20frp2vaw1qc05d348j76sxfp7"; + meta.description = "String type based on [Bigarray], for use in I/O and C-bindings"; + propagatedBuildInputs = [ ppx_jane ]; + }; + + parsexp = janePackage { + pname = "parsexp"; + hash = "0fsxy5lpsvfadj8m2337j8iprs294dfikqxjcas7si74nskx6l38"; + meta.description = "S-expression parsing library"; + propagatedBuildInputs = [ base sexplib0 ]; + }; + + sexplib = janePackage { + pname = "sexplib"; + hash = "059ypcyirw00x6dqa33x49930pwxcr3i72qz5pf220js2ai2nzhn"; + meta.description = "Library for serializing OCaml values to and from S-expressions"; + propagatedBuildInputs = [ num parsexp ]; + }; + + core_kernel = janePackage { + version = "0.13.1"; + pname = "core_kernel"; + hash = "1ynyz6jkf23q0cwbn6kv06mgyjd644qxb0qkrydq0cglcaa4kjhp"; + meta.description = "System-independent part of Core"; + buildInputs = [ jst-config ]; + propagatedBuildInputs = [ base_bigstring sexplib ]; + }; + + spawn = janePackage { + pname = "spawn"; + hash = "1w003k1kw1lmyiqlk58gkxx8rac7dchiqlz6ah7aj7bh49b36ppf"; + meta.description = "Spawning sub-processes"; + buildInputs = [ ppx_expect ]; + }; + + core = janePackage { + pname = "core"; + hash = "1i5z9myl6i7axd8dz4b71gdsz9la6k07ib9njr4bn12yn0y76b1m"; + meta.description = "System-independent part of Core"; + buildInputs = [ jst-config ]; + propagatedBuildInputs = [ core_kernel spawn ]; + }; + + async_kernel = janePackage { + pname = "async_kernel"; + hash = "1rrbyy3pyh31qwv0jiarhpgdyq2z2gx6axmaplgpxshk4qx6gsld"; + meta.description = "Monadic concurrency library"; + propagatedBuildInputs = [ core_kernel ]; + }; + + protocol_version_header = janePackage { + pname = "protocol_version_header"; + hash = "19wscd81jlj355f9din1sg21m3af456a0id2a37bx38r390wrghc"; + meta.description = "Protocol versioning"; + propagatedBuildInputs = [ core_kernel ]; + }; + + async_rpc_kernel = janePackage { + pname = "async_rpc_kernel"; + hash = "1k3f2psyd1xcf7nkk0q1fq57yyhfqbzyynsz821n7mrnm37simac"; + meta.description = "Platform-independent core of Async RPC library"; + propagatedBuildInputs = [ async_kernel protocol_version_header ]; + }; + + async_unix = janePackage { + pname = "async_unix"; + hash = "0n3jz3qjlphyhkqgnbjbwf2fqxaksws82dx1mk4m4wnw3275gdi5"; + meta.description = "Monadic concurrency library"; + propagatedBuildInputs = [ async_kernel core ]; + }; + + async_extra = janePackage { + pname = "async_extra"; + hash = "06q1farx7dwi4h490xi1azq7ym57ih2d23sq17g2jfvw889kf4n1"; + meta.description = "Monadic concurrency library"; + propagatedBuildInputs = [ async_rpc_kernel async_unix ]; + }; + + textutils = janePackage { + pname = "textutils"; + hash = "1wnyqj9dzfgl0kddmdl4n9rkl16hwy432dd2i4ksvk2z5g9kkb0d"; + meta.description = "Text output utilities"; + propagatedBuildInputs = [ core ]; + }; + + async = janePackage { + pname = "async"; + hash = "002j9yxpw0ghi12a84163vaqa3n9h8j35f4i72nbxnilxwvy95sr"; + meta.description = "Monadic concurrency library"; + propagatedBuildInputs = [ async_rpc_kernel async_unix textutils ]; + }; + + async_find = janePackage { + pname = "async_find"; + hash = "0l8cfhyrx2rb2avdcfx5m70aj6rx2d57qxqvfycad5afqz4xx2n9"; + meta.description = "Directory traversal with Async"; + propagatedBuildInputs = [ async ]; + }; + + re2 = janePackage { + pname = "re2"; + hash = "0hmizznlzilynn5kh6149bbpkfw2l0xi7zi1y1fxfww2ma3wpim0"; + meta.description = "OCaml bindings for RE2, Google's regular expression library"; + propagatedBuildInputs = [ core_kernel ]; + prePatch = '' + substituteInPlace src/re2_c/dune --replace 'CXX=g++' 'CXX=c++' + substituteInPlace src/dune --replace '(cxx_flags (:standard \ -pedantic) (-I re2_c/libre2))' '(cxx_flags (:standard \ -pedantic) (-I re2_c/libre2) (-x c++))' + ''; + }; + + shell = janePackage { + pname = "shell"; + hash = "190ymhm0z9b7hngbcpg88wwrfxwfcdh339d7rd2xhmrhi4z99r18"; + meta.description = "Yet another implementation of fork&exec and related functionality"; + buildInputs = [ jst-config ]; + propagatedBuildInputs = [ re2 textutils ]; + }; + + async_shell = janePackage { + pname = "async_shell"; + hash = "0bfxyvdmyv23zfr49pb4c3bgfkjr4s3nb3z07xrw6szia3j1kp4j"; + meta.description = "Shell helpers for Async"; + propagatedBuildInputs = [ async shell ]; + }; + + core_bench = janePackage { + pname = "core_bench"; + hash = "1nk0i3z8rqrljbf4bc7ljp71g0a4361nh85s2ang0lgxri74zacm"; + meta.description = "Benchmarking library"; + propagatedBuildInputs = [ textutils ]; + }; + + core_extended = janePackage { + pname = "core_extended"; + hash = "0zh1wwkg5cxkz633dl9zbbl65aksvzb5mss1q8f7w6i1sv3n0135"; + meta.description = "Extra components that are not as closely vetted or as stable as Core"; + propagatedBuildInputs = [ core ]; + }; + + sexp_pretty = janePackage { + pname = "sexp_pretty"; + hash = "1a59xc9frmvi7n0i32dzs8gpf5ral80xkwv97a13zv5cyg8l6216"; + meta.description = "S-expression pretty-printer"; + propagatedBuildInputs = [ ppx_base re sexplib ]; + }; + + expect_test_helpers_kernel = janePackage { + pname = "expect_test_helpers_kernel"; + hash = "11m0i7mj6b1cmqnwhmsrqdc814s0lk3sip8rh97k75grngazmjvn"; + meta.description = "Helpers for writing expectation tests"; + buildInputs = [ ppx_jane ]; + propagatedBuildInputs = [ core_kernel sexp_pretty ]; + }; + + expect_test_helpers = janePackage { + pname = "expect_test_helpers"; + hash = "0sw9yam8d9hdam8p194q0hgc4i26vvwj5qi2cba1jxfhdzhy8jdd"; + meta.description = "Async helpers for writing expectation tests"; + propagatedBuildInputs = [ async expect_test_helpers_kernel ]; + }; + + patience_diff = janePackage { + pname = "patience_diff"; + hash = "012rlbnw21yq2lsbfk3f7l4m4qq3jdx238146z36v54vnhhs6r2r"; + meta.description = "Diff library using Bram Cohen's patience diff algorithm"; + propagatedBuildInputs = [ core_kernel ]; + }; + + ecaml = janePackage { + pname = "ecaml"; + hash = "0jmmsi1m7d4cl5mnw6v9h4ng29anwxy73a6qfi28lgpzafn452bc"; + meta.description = "Library for writing Emacs plugin in OCaml"; + propagatedBuildInputs = [ async expect_test_helpers_kernel ]; + }; + + ### Packages at version 0.11, with dependencies at version 0.12 + + configurator = janePackage { + pname = "configurator"; + version = "0.11.0"; + hash = "0h686630cscav7pil8c3w0gbh6rj4b41dvbnwmicmlkc746q5bfk"; + propagatedBuildInputs = [ stdio ]; + meta.description = "Helper library for gathering system configuration"; + }; + + ppx_core = janePackage { + pname = "ppx_core"; + version = "0.11.0"; + hash = "11hgm9mxig4cm3c827f6dns9mjv3pf8g6skf10x0gw9xnp1dmzmx"; + propagatedBuildInputs = [ ppxlib ]; + meta.description = "Deprecated (see ppxlib)"; + }; + + ppx_driver = janePackage { + pname = "ppx_driver"; + version = "0.11.0"; + hash = "00kfx6js2kxk57k4v7hiqvwk7h35whgjihnxf75m82rnaf4yzvfi"; + propagatedBuildInputs = [ ppxlib ]; + meta.description = "Deprecated (see ppxlib)"; + }; + + ppx_type_conv = janePackage { + pname = "ppx_type_conv"; + version = "0.11.0"; + hash = "04dbrglqqhkas25cpjz8xhjcbpk141c35qggzw66bn69izczfmaf"; + propagatedBuildInputs = [ ppxlib ]; + meta.description = "Deprecated (see ppxlib)"; + }; + +} diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage_0_13.nix b/pkgs/development/ocaml-modules/janestreet/janePackage_0_13.nix new file mode 100644 index 00000000000..b92bcead95c --- /dev/null +++ b/pkgs/development/ocaml-modules/janestreet/janePackage_0_13.nix @@ -0,0 +1,19 @@ +{ lib, fetchFromGitHub, buildDunePackage, defaultVersion ? "0.13.0" }: + +{ pname, version ? defaultVersion, hash, ...}@args: + +buildDunePackage (args // { + inherit version; + + minimumOCamlVersion = "4.08"; + + src = fetchFromGitHub { + owner = "janestreet"; + repo = pname; + rev = "v${version}"; + sha256 = hash; + }; + + meta.license = lib.licenses.mit; + meta.homepage = "https://github.com/janestreet/${pname}"; +}) diff --git a/pkgs/development/ocaml-modules/phylogenetics/default.nix b/pkgs/development/ocaml-modules/phylogenetics/default.nix index 916be9b3d38..1873a4e0c58 100644 --- a/pkgs/development/ocaml-modules/phylogenetics/default.nix +++ b/pkgs/development/ocaml-modules/phylogenetics/default.nix @@ -3,15 +3,15 @@ buildDunePackage rec { pname = "phylogenetics"; - version = "unstable-2020-01-05"; + version = "unstable-2020-01-25"; useDune2 = true; src = fetchFromGitHub { owner = "biocaml"; repo = pname; - rev = "b55ef7d7322bd822be26d21339945d45487fb547"; - sha256 = "0hzfjhs5w3a7hlzxs739k5ik3k1xn3dzyzziid765s74f638n4hj"; + rev = "752a7d0324709ba919ef43630a270afd45d6b734"; + sha256 = "1zsxpl1yjbw6y6n1q7qk3h0l7c0lxhh8yp8bkxlwnpzlkqq28ycg"; }; minimumOCamlVersion = "4.08"; # e.g., uses Float.min diff --git a/pkgs/tools/misc/patdiff/default.nix b/pkgs/tools/misc/patdiff/default.nix index 1c5e5b04474..e0b54e56081 100644 --- a/pkgs/tools/misc/patdiff/default.nix +++ b/pkgs/tools/misc/patdiff/default.nix @@ -4,7 +4,7 @@ with ocamlPackages; janePackage { pname = "patdiff"; - hash = "04krzn6rj2r81z55pms5ayk6bxhlxrm006cbhy0m6rc69a0h00lh"; + hash = "1yqvxdmkgcwgx3npgncpdqwkpdxiqr1q41wci7589s8z7xi5nwyz"; buildInputs = [ core_extended expect_test_helpers patience_diff ocaml_pcre shell ]; meta = { description = "File Diff using the Patience Diff algorithm"; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 160adc015f8..b5d8abade09 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -980,12 +980,20 @@ let # Jane Street janePackage = - if lib.versionOlder "4.07" ocaml.version + if lib.versionOlder "4.08" ocaml.version + then callPackage ../development/ocaml-modules/janestreet/janePackage_0_13.nix {} + else if lib.versionOlder "4.07" ocaml.version then callPackage ../development/ocaml-modules/janestreet/janePackage_0_12.nix {} else callPackage ../development/ocaml-modules/janestreet/janePackage.nix {}; janeStreet = - if lib.versionOlder "4.07" ocaml.version + if lib.versionOlder "4.08" ocaml.version + then import ../development/ocaml-modules/janestreet/0.13.nix { + inherit ctypes janePackage num octavius re; + inherit (pkgs) openssl; + ppxlib = ppxlib.override { version = "0.12.0"; }; + } + else if lib.versionOlder "4.07" ocaml.version then import ../development/ocaml-modules/janestreet/0.12.nix { inherit ctypes janePackage num octavius ppxlib re; inherit (pkgs) openssl; -- cgit v1.2.3 From f52443efaef6b32500e75d9a275152a3797fb0eb Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Mon, 20 Apr 2020 04:23:29 +0200 Subject: pythonPackages.pyopengl: avoid dragging in 500M of -dev packages Only the actual shared libraries are required to be installed, and they are imported directly by path via ctypes. The package's patchPhase already takes care of embedding the Nix store paths of the required libraries into pyopengl. This reduces the transitive closure size of PyOpenGL: 622M -> 136M. --- pkgs/development/python-modules/pyopengl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyopengl/default.nix b/pkgs/development/python-modules/pyopengl/default.nix index fddc27ee191..2a3b90733c4 100644 --- a/pkgs/development/python-modules/pyopengl/default.nix +++ b/pkgs/development/python-modules/pyopengl/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "0bdf5ed600df30c8830455702338902528717c0af85ac5914f1dc5aa0bfa6eee"; }; - propagatedBuildInputs = [ pkgs.libGLU pkgs.libGL pkgs.freeglut pillow ]; + propagatedBuildInputs = [ pillow ]; patchPhase = let ext = stdenv.hostPlatform.extensions.sharedLibrary; in '' -- cgit v1.2.3 From b3c3a0bd1835a3907bf23f5f7bd7c9d18ef163ec Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 17 Apr 2020 15:59:00 -0500 Subject: dune_2: 2.5.0 -> 2.5.1 Changelog: https://github.com/ocaml/dune/releases/tag/2.5.1 --- pkgs/development/tools/ocaml/dune/2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix index 510dd183f00..37f27768670 100644 --- a/pkgs/development/tools/ocaml/dune/2.nix +++ b/pkgs/development/tools/ocaml/dune/2.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "2.5.0"; + version = "2.5.1"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "1nnpg0fvmp4vf5mk203xk83pkkm953pgip3yhs1x2g8pkcdndhcw"; + sha256 = "0az5ih18wadsp3ljagvws1i7vf0vpg24h75ariy0v3i0gyld6xwg"; }; buildInputs = [ ocaml findlib ]; -- cgit v1.2.3 From f32e75c728451d89cf67d2f692af9472456517d2 Mon Sep 17 00:00:00 2001 From: robert seaton Date: Mon, 20 Apr 2020 02:24:23 -0500 Subject: statserial: init at 1.1 (#75073) --- pkgs/tools/misc/statserial/default.nix | 44 ++++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/tools/misc/statserial/default.nix diff --git a/pkgs/tools/misc/statserial/default.nix b/pkgs/tools/misc/statserial/default.nix new file mode 100644 index 00000000000..66ae899b9c5 --- /dev/null +++ b/pkgs/tools/misc/statserial/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchurl, ncurses, glibc }: + +stdenv.mkDerivation rec { + pname = "statserial"; + version = "1.1"; + + src = fetchurl { + url = "http://www.ibiblio.org/pub/Linux/system/serial/${pname}-${version}.tar.gz"; + sha256 = "0rrrmxfba5yn836zlgmr8g9xnrpash7cjs7lk2m44ac50vakpks0"; + }; + + postPatch = '' + substituteInPlace Makefile \ + --replace '-lcurses' '-lncurses' + + substituteInPlace Makefile \ + --replace 'LDFLAGS = -s -N' '#LDFLAGS = -s -N' + ''; + + buildInputs = [ ncurses glibc stdenv ]; + + installPhase = '' + mkdir -p $out/bin + cp statserial $out/bin + + mkdir -p $out/share/man/man1 + cp statserial.1 $out/share/man/man1 + ''; + + meta = with stdenv.lib; { + homepage = "https://sites.google.com/site/tranter/software"; + description = "Display serial port modem status lines."; + license = licenses.gpl2; + + longDescription = + '' Statserial displays a table of the signals on a standard 9-pin or + 25-pin serial port, and indicates the status of the handshaking lines. It + can be useful for debugging problems with serial ports or modems. + ''; + + platforms = platforms.unix; + maintainers = with maintainers; [ rps ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ffff1363a50..8b70d77e16c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2143,6 +2143,8 @@ in stagit = callPackage ../development/tools/stagit { }; + statserial = callPackage ../tools/misc/statserial { }; + step-ca = callPackage ../tools/security/step-ca { }; step-cli = callPackage ../tools/security/step-cli { }; -- cgit v1.2.3 From 6256d88eedd7af0a03e711013d37fe3d97689537 Mon Sep 17 00:00:00 2001 From: Nikola Knezevic Date: Tue, 11 Feb 2020 15:13:34 +0100 Subject: oauth2_proxy: 3.2.0 -> 5.1.0 v3.2.0 is 11 months old. v5.1.0 brings new providers and fixes security vulnerabilities. In addition, the project switched to go 1.14 and uses go modules, which is now reflected in the build process. NOTE: There are many breaking changes, which are then reflected in the NixOS services configuration. --- pkgs/servers/oauth2_proxy/default.nix | 11 +- pkgs/servers/oauth2_proxy/deps.nix | 550 ++++++++++++++++++++++++++++++---- 2 files changed, 498 insertions(+), 63 deletions(-) diff --git a/pkgs/servers/oauth2_proxy/default.nix b/pkgs/servers/oauth2_proxy/default.nix index d0a57198820..339e8496624 100644 --- a/pkgs/servers/oauth2_proxy/default.nix +++ b/pkgs/servers/oauth2_proxy/default.nix @@ -2,21 +2,24 @@ buildGoPackage rec { pname = "oauth2_proxy"; - version = "3.2.0"; - + version = "5.1.0"; + goPackagePath = "github.com/pusher/${pname}"; src = fetchFromGitHub { repo = pname; owner = "pusher"; - sha256 = "0k73ggyh12g2vzjq91i9d3bxbqfvh5k6njzza1lvkzasgp07wisg"; + sha256 = "190k1v2c1f6vp9waqs01rlzm0jc3vrmsq1w1n0c2q2nfqx76y2wz"; rev = "v${version}"; }; goDeps = ./deps.nix; + # Taken from https://github.com/oauth2-proxy/oauth2-proxy/blob/master/Makefile + buildFlagsArray = ("-ldflags=-X main.VERSION=${version}"); + meta = with lib; { - description = "A reverse proxy that provides authentication with Google, Github or other provider"; + description = "A reverse proxy that provides authentication with Google, Github, or other providers"; homepage = "https://github.com/pusher/oauth2_proxy/"; license = licenses.mit; maintainers = [ maintainers.yorickvp ]; diff --git a/pkgs/servers/oauth2_proxy/deps.nix b/pkgs/servers/oauth2_proxy/deps.nix index dd10ab28668..611a07c2fda 100644 --- a/pkgs/servers/oauth2_proxy/deps.nix +++ b/pkgs/servers/oauth2_proxy/deps.nix @@ -1,183 +1,615 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) [ { - goPackagePath = "cloud.google.com/go"; + goPackagePath = "cloud.google.com/go"; fetch = { type = "git"; url = "https://code.googlesource.com/gocloud"; - rev = "2d3a6656c17a60b0815b7e06ab0be04eacb6e613"; - sha256 = "0fi3qj9fvc4bxbrwa1m5sxsb8yhvawiwigaddvmmizjykxbq5csq"; + rev = "v0.38.0"; + sha256 = "0n6n13b7lri2fmc4bn4ifszyawj31dpbzvyv0xafsf81440z8cyh"; }; } { - goPackagePath = "github.com/BurntSushi/toml"; + goPackagePath = "github.com/BurntSushi/toml"; fetch = { type = "git"; url = "https://github.com/BurntSushi/toml"; - rev = "b26d9c308763d68093482582cea63d69be07a0f0"; - sha256 = "0k7v2i1d2d6si8gswn83qb84czhhia53v2wdy33yz9ppdidxk0ry"; + rev = "v0.3.1"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; }; } { - goPackagePath = "github.com/bitly/go-simplejson"; + goPackagePath = "github.com/alicebob/gopher-json"; + fetch = { + type = "git"; + url = "https://github.com/alicebob/gopher-json"; + rev = "5a6b3ba71ee6"; + sha256 = "0hx6n722zq51p852lv56k39yjy09lw6mnr2c3x0p23rfyyrakj2p"; + }; + } + { + goPackagePath = "github.com/alicebob/miniredis"; + fetch = { + type = "git"; + url = "https://github.com/alicebob/miniredis"; + rev = "v2.11.2"; + sha256 = "1fc6w9n1jznwj8ks2svxmjrv87pk3spjf5z3kcxpgpynp13pd55n"; + }; + } + { + goPackagePath = "github.com/bitly/go-simplejson"; fetch = { type = "git"; url = "https://github.com/bitly/go-simplejson"; - rev = "aabad6e819789e569bd6aabf444c935aa9ba1e44"; + rev = "v0.5.0"; sha256 = "0n9f9dz1jn1jx86d48569nznpjn9fmq3knn7r65xpy7jhih284jj"; }; } { - goPackagePath = "github.com/coreos/go-oidc"; + goPackagePath = "github.com/bmizerany/assert"; + fetch = { + type = "git"; + url = "https://github.com/bmizerany/assert"; + rev = "b7ed37b82869"; + sha256 = "18hy1wyl9zdi7sgxafrn3m7fadh6in0rhhb8l0cvkxqzdl0jcw2s"; + }; + } + { + goPackagePath = "github.com/census-instrumentation/opencensus-proto"; + fetch = { + type = "git"; + url = "https://github.com/census-instrumentation/opencensus-proto"; + rev = "v0.2.1"; + sha256 = "19fcx3sc99i5dsklny6r073z5j20vlwn2xqm6di1q3b1xwchzqfj"; + }; + } + { + goPackagePath = "github.com/chzyer/logex"; + fetch = { + type = "git"; + url = "https://github.com/chzyer/logex"; + rev = "v1.1.10"; + sha256 = "08pbjj3wx9acavlwyr055isa8a5hnmllgdv5k6ra60l5y1brmlq4"; + }; + } + { + goPackagePath = "github.com/chzyer/readline"; + fetch = { + type = "git"; + url = "https://github.com/chzyer/readline"; + rev = "2972be24d48e"; + sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r"; + }; + } + { + goPackagePath = "github.com/chzyer/test"; + fetch = { + type = "git"; + url = "https://github.com/chzyer/test"; + rev = "a1ea475d72b1"; + sha256 = "0rns2aqk22i9xsgyap0pq8wi4cfaxsri4d9q6xxhhyma8jjsnj2k"; + }; + } + { + goPackagePath = "github.com/client9/misspell"; + fetch = { + type = "git"; + url = "https://github.com/client9/misspell"; + rev = "v0.3.4"; + sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"; + }; + } + { + goPackagePath = "github.com/coreos/go-oidc"; fetch = { type = "git"; url = "https://github.com/coreos/go-oidc"; - rev = "77e7f2010a464ade7338597afe650dfcffbe2ca8"; - sha256 = "0mh8fa7al9gfzx4k7rd623bpy14s06s96iz6lbf6psi5q2bnbs2r"; + rev = "v2.2.1"; + sha256 = "11m6slbpi33ynffml7812piq4anhjlf1qszjlsf26f5y7x3qh8n5"; }; } { - goPackagePath = "github.com/davecgh/go-spew"; + goPackagePath = "github.com/davecgh/go-spew"; fetch = { type = "git"; url = "https://github.com/davecgh/go-spew"; - rev = "346938d642f2ec3594ed81d874461961cd0faa76"; + rev = "v1.1.0"; sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; }; } { - goPackagePath = "github.com/dgrijalva/jwt-go"; + goPackagePath = "github.com/dgrijalva/jwt-go"; fetch = { type = "git"; url = "https://github.com/dgrijalva/jwt-go"; - rev = "06ea1031745cb8b3dab3f6a236daf2b0aa468b7e"; + rev = "v3.2.0"; sha256 = "08m27vlms74pfy5z79w67f9lk9zkx6a9jd68k3c4msxy75ry36mp"; }; } { - goPackagePath = "github.com/golang/protobuf"; + goPackagePath = "github.com/envoyproxy/go-control-plane"; + fetch = { + type = "git"; + url = "https://github.com/envoyproxy/go-control-plane"; + rev = "5f8ba28d4473"; + sha256 = "1f1s764rd41vd9vgk3r14h1m6fz6pdvxj6fd83q58gxifbc4q5w4"; + }; + } + { + goPackagePath = "github.com/envoyproxy/protoc-gen-validate"; + fetch = { + type = "git"; + url = "https://github.com/envoyproxy/protoc-gen-validate"; + rev = "v0.1.0"; + sha256 = "0kxd3wwh3xwqk0r684hsy281xq4y71cd11d4q2hspcjbnlbwh7cy"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "github.com/go-redis/redis"; + fetch = { + type = "git"; + url = "https://github.com/go-redis/redis"; + rev = "v6.15.7"; + sha256 = "0fc0sfispyzn652ny05wn6bz18a60n6ryk23ki8j97xx3l24nq2g"; + }; + } + { + goPackagePath = "github.com/golang/glog"; + fetch = { + type = "git"; + url = "https://github.com/golang/glog"; + rev = "23def4e6c14b"; + sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; + }; + } + { + goPackagePath = "github.com/golang/mock"; + fetch = { + type = "git"; + url = "https://github.com/golang/mock"; + rev = "v1.2.0"; + sha256 = "12ddj2g8ab87id6n2n67vnbhq6p8dvgsq1pzpqfriym4dk8w54fg"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; fetch = { type = "git"; url = "https://github.com/golang/protobuf"; - rev = "1e59b77b52bf8e4b449a57e6f79f21226d571845"; - sha256 = "19bkh81wnp6njg3931wky6hsnnl2d1ig20vfjxpv450sd3k6yys8"; + rev = "v1.3.2"; + sha256 = "1k1wb4zr0qbwgpvz9q5ws9zhlal8hq7dmq62pwxxriksayl6hzym"; + }; + } + { + goPackagePath = "github.com/gomodule/redigo"; + fetch = { + type = "git"; + url = "https://github.com/gomodule/redigo"; + rev = "v2.0.0"; + sha256 = "1kg7s8027b4g1sfw0v3nh30c15j407kv684s53gg281r807dnfpk"; + }; + } + { + goPackagePath = "github.com/google/btree"; + fetch = { + type = "git"; + url = "https://github.com/google/btree"; + rev = "4030bb1f1f0c"; + sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6"; + }; + } + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "v0.3.0"; + sha256 = "1hyxx3434zshl2m9ja78gwlkg1rx9yl6diqa7dnjb31xz5x4gbjj"; + }; + } + { + goPackagePath = "github.com/google/martian"; + fetch = { + type = "git"; + url = "https://github.com/google/martian"; + rev = "v2.1.0"; + sha256 = "197hil6vrjk50b9wvwyzf61csid83whsjj6ik8mc9r2lryxlyyrp"; + }; + } + { + goPackagePath = "github.com/google/pprof"; + fetch = { + type = "git"; + url = "https://github.com/google/pprof"; + rev = "3ea8567a2e57"; + sha256 = "09rhjn3ms0a72dw0yzbp237p7yhqma772zspddn6mgkh3gi3kn4c"; + }; + } + { + goPackagePath = "github.com/googleapis/gax-go"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/gax-go"; + rev = "v2.0.5"; + sha256 = "1lxawwngv6miaqd25s3ba0didfzylbwisd2nz7r4gmbmin6jsjrx"; + }; + } + { + goPackagePath = "github.com/hashicorp/golang-lru"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/golang-lru"; + rev = "v0.5.1"; + sha256 = "13f870cvk161bzjj6x41l45r5x9i1z9r2ymwmvm7768kg08zznpy"; + }; + } + { + goPackagePath = "github.com/hpcloud/tail"; + fetch = { + type = "git"; + url = "https://github.com/hpcloud/tail"; + rev = "v1.0.0"; + sha256 = "1njpzc0pi1acg5zx9y6vj9xi6ksbsc5d387rd6904hy6rh2m6kn0"; + }; + } + { + goPackagePath = "github.com/jstemmer/go-junit-report"; + fetch = { + type = "git"; + url = "https://github.com/jstemmer/go-junit-report"; + rev = "af01ea7f8024"; + sha256 = "1lp3n94ris12hac02wi31f3whs88lcrzwgdg43a5j6cafg9p1d0s"; + }; + } + { + goPackagePath = "github.com/kr/pretty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pretty"; + rev = "v0.2.0"; + sha256 = "1ywbfzz1h3a3qd8rpkiqwi1dm4w8ls9ijb4x1b7567grns9f0vnp"; }; } { - goPackagePath = "github.com/mbland/hmacauth"; + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "v1.1.1"; + sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "v0.1.0"; + sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; + }; + } + { + goPackagePath = "github.com/mbland/hmacauth"; fetch = { type = "git"; url = "https://github.com/mbland/hmacauth"; - rev = "107c17adcc5eccc9935cd67d9bc2feaf5255d2cb"; - sha256 = "1zd9r8znhkxyl997lhjk8nrlxlfv5s1hn7ql87wrcyvlsszx3mzh"; + rev = "44256dfd4bfa"; + sha256 = "1d5pbjgc5j8pi3frsjp5gqg7j12bxdbl55nhy01cv4c96hay2ij1"; }; } { - goPackagePath = "github.com/mreiferson/go-options"; + goPackagePath = "github.com/mreiferson/go-options"; fetch = { type = "git"; url = "https://github.com/mreiferson/go-options"; - rev = "20ba7d382d05facb01e02eb777af0c5f229c5c95"; - sha256 = "1vdz3wqkj885a0jkggaygl4k6k8b94fpspywr26snm4xnb8vgxsf"; + rev = "v1.0.0"; + sha256 = "1pxs9ybrh196qy14ijn4zn51h2z28lj31y6vxrz2xxhgvpmfmxyl"; + }; + } + { + goPackagePath = "github.com/onsi/ginkgo"; + fetch = { + type = "git"; + url = "https://github.com/onsi/ginkgo"; + rev = "v1.12.0"; + sha256 = "0ly246i0ax53l6dn9f1zlhkd9gs03hvbk7aazxay2dd5fxzh9n65"; }; } { - goPackagePath = "github.com/pmezard/go-difflib"; + goPackagePath = "github.com/onsi/gomega"; + fetch = { + type = "git"; + url = "https://github.com/onsi/gomega"; + rev = "v1.9.0"; + sha256 = "0l69r6nbnz6b3j9zrqn8aql88jjv1pqykzkvqdbhfprss9b2dy46"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; fetch = { type = "git"; url = "https://github.com/pmezard/go-difflib"; - rev = "792786c7400a136282c1664665ae0a8db921c6c2"; + rev = "v1.0.0"; sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; }; } { - goPackagePath = "github.com/pquerna/cachecontrol"; + goPackagePath = "github.com/pquerna/cachecontrol"; fetch = { type = "git"; url = "https://github.com/pquerna/cachecontrol"; - rev = "0dec1b30a0215bb68605dfc568e8855066c9202d"; - sha256 = "14yyfhrv60rvb983rqm7s916nwvn9kcmbvnrcna2md0s3mkzs3yh"; + rev = "1555304b9b35"; + sha256 = "0nr3p9pms6jmr2s44vy2s22q1d3v6xns2kzsvkq2gg1rkx6c1hc9"; }; } { - goPackagePath = "github.com/stretchr/testify"; + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "14fe0d1b01d4"; + sha256 = "0zdmk6rbbx39cvfz0r59v2jg5sg9yd02b4pds5n5llgvivi99550"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.0"; + sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "69483b4bd14f5845b5a1e55bca19e954e827f1d0"; - sha256 = "11lzrwkdzdd8yyag92akncc008h2f9d1bpc489mxiwp0jrmz4ivb"; + rev = "v1.5.1"; + sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl"; }; } { - goPackagePath = "github.com/yhat/wsutil"; + goPackagePath = "github.com/yhat/wsutil"; fetch = { type = "git"; url = "https://github.com/yhat/wsutil"; - rev = "1d66fa95c997864ba4d8479f56609620fe542928"; + rev = "1d66fa95c997"; sha256 = "1agh4ss6y1laps8pg4mdl844ivmw2wrb7rnpfyag4gai4693i7bv"; }; } { - goPackagePath = "golang.org/x/crypto"; + goPackagePath = "github.com/yuin/gopher-lua"; + fetch = { + type = "git"; + url = "https://github.com/yuin/gopher-lua"; + rev = "ab39c6098bdb"; + sha256 = "13b0rrpv3988qw8rq6z7npajn1my059ybhafi5mxff9jw09k9sja"; + }; + } + { + goPackagePath = "go.opencensus.io"; + fetch = { + type = "git"; + url = "https://github.com/census-instrumentation/opencensus-go"; + rev = "v0.21.0"; + sha256 = "14s0a12xdzjvad0dgksgv8m3hh7nc585abvjkvyk6r67a29lxj6x"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "9f005a07e0d31d45e6656d241bb5c0f2efd4bc94"; - sha256 = "1mhmr6ljzl3iafsz4qy8vval7rmr828wh59dlqqqjqx6sqmcs1dv"; + rev = "2aa609cf4a9d"; + sha256 = "1yvis6fqbsd7f356aqyi18f76vnwj3bry6mxqnkvshq4cwrf92il"; + }; + } + { + goPackagePath = "golang.org/x/exp"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/exp"; + rev = "509febef88a4"; + sha256 = "02isrh39z8znrp5znplzy0dip2gnrl3jm1355raliyvhnhg04j6q"; + }; + } + { + goPackagePath = "golang.org/x/lint"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/lint"; + rev = "959b441ac422"; + sha256 = "1mgcv5f00pkzsbwnq2y7vqvd1b4lr5a3s47cphh2qv4indfk7pck"; }; } { - goPackagePath = "golang.org/x/net"; + goPackagePath = "golang.org/x/net"; fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "9dfe39835686865bff950a07b394c12a98ddc811"; - sha256 = "0z8mnl4mi88syafrgqys2ak2gg3yrbna25hpz88y3anl8x4jhg1a"; + rev = "0de0cce0169b"; + sha256 = "1db7s5kbzyh2zd5lpv05n7hp8wbwdvgk0wpiwrlnig94mkr0y5aq"; }; } { - goPackagePath = "golang.org/x/oauth2"; + goPackagePath = "golang.org/x/oauth2"; fetch = { type = "git"; url = "https://go.googlesource.com/oauth2"; - rev = "9ff8ebcc8e241d46f52ecc5bff0e5a2f2dbef402"; - sha256 = "035v5w1nad6r1l22cj6f73zzr6qi4jgq71yjywf2c6rvsa5147r2"; + rev = "bf48bf16ab8d"; + sha256 = "1sirdib60zwmh93kf9qrx51r8544k1p9rs5mk0797wibz3m4mrdg"; }; } { - goPackagePath = "google.golang.org/api"; + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "112230192c58"; + sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "bd437916bb0e"; + sha256 = "1i8x26frmlin55k69k936zd1rp5sqnq14y5ms4rkxbfzhasdm2rx"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.2"; + sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; + }; + } + { + goPackagePath = "golang.org/x/time"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/time"; + rev = "85acf8d2951c"; + sha256 = "0yqnxsrarjk4qkda8kcxzmk7y90kkkxzx9iwryzrk7bzs87ky3xc"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "2c0ae7006135"; + sha256 = "1lsi2ssxajclj3bciz2a41v1vjv768ja3v6wnbyhxy8xphwkp4fk"; + }; + } + { + goPackagePath = "golang.org/x/xerrors"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/xerrors"; + rev = "a985d3407aa7"; + sha256 = "00wzr5w8aadipgc3rkk8f11i41znskfj9ix5nhhaxyg7isrslgcj"; + }; + } + { + goPackagePath = "google.golang.org/api"; fetch = { type = "git"; url = "https://code.googlesource.com/google-api-go-client"; - rev = "8791354e7ab150705ede13637a18c1fcc16b62e8"; - sha256 = "0ps7y4m9787wvkqwrwqyb4nmmibhrihmg7xqh7sba2cyj397wngm"; + rev = "v0.19.0"; + sha256 = "0rbwijzl91xmbr9kqhiwx4fydm7r6ci6rxsi9jsy8zap9zy120f6"; }; } { - goPackagePath = "google.golang.org/appengine"; + goPackagePath = "google.golang.org/appengine"; fetch = { type = "git"; url = "https://github.com/golang/appengine"; - rev = "150dc57a1b433e64154302bdc40b6bb8aefa313a"; - sha256 = "0w3knznv39k8bm85ri62f83czcrxknql7dv6p9hk1a5jx3xljgxq"; + rev = "v1.5.0"; + sha256 = "0l7mkdnwhidv8m686x432vmx8z5nqcrr9f46ddgvrxbh4wvyfcll"; }; } { - goPackagePath = "gopkg.in/fsnotify/fsnotify.v1"; + goPackagePath = "google.golang.org/genproto"; fetch = { type = "git"; - url = "https://github.com/fsnotify/fsnotify"; - rev = "836bfd95fecc0f1511dd66bdbf2b5b61ab8b00b6"; - sha256 = "0470dznkcbabncskgr8hfilpj5w24ygg455pyggbfbssmfv1m9gg"; + url = "https://github.com/google/go-genproto"; + rev = "24fa4b261c55"; + sha256 = "109zhaqlfd8zkbr1hk6zqbs6vcxfrk64scjwh2nswph05gr0m84d"; + }; + } + { + goPackagePath = "google.golang.org/grpc"; + fetch = { + type = "git"; + url = "https://github.com/grpc/grpc-go"; + rev = "v1.27.0"; + sha256 = "1ijrmgrxyabfn51nm3p9l81iaasq5fg237wnr6mdc4dzsfcg8kd7"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "20d25e280405"; + sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; + }; + } + { + goPackagePath = "gopkg.in/fsnotify.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/fsnotify.v1"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "gopkg.in/fsnotify/fsnotify.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/fsnotify/fsnotify.v1"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "gopkg.in/natefinch/lumberjack.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/natefinch/lumberjack.v2"; + rev = "v2.0.0"; + sha256 = "1m2sxypk7p805jvc68padvylyx5v7cwkh5klnnxxr0340kgspf08"; + }; + } + { + goPackagePath = "gopkg.in/square/go-jose.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/square/go-jose.v2"; + rev = "v2.4.1"; + sha256 = "1y0angxwryishwd1z0q7fp2xwjjhpw70kqh4ml4ly40akfhf1f5a"; + }; + } + { + goPackagePath = "gopkg.in/tomb.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/tomb.v1"; + rev = "dd632973f1e7"; + sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.4"; + sha256 = "11bwj757wi8kdrcnlgfqb8vv2d2xdhlghmyagd19i62khrkchsg2"; }; } { - goPackagePath = "gopkg.in/square/go-jose.v2"; + goPackagePath = "honnef.co/go/tools"; fetch = { type = "git"; - url = "https://github.com/square/go-jose"; - rev = "f8f38de21b4dcd69d0413faf231983f5fd6634b1"; - sha256 = "1bjrs3xq3m2ckfds0l4wqf81311ymm9agipmkllbvkadac156dsa"; + url = "https://github.com/dominikh/go-tools"; + rev = "ea95bdfd59fc"; + sha256 = "1763nw7pwpzkvzfnm63dgzcgbq9hwmq5l1nffchnhh77vgkaq4ic"; }; } -] \ No newline at end of file +] -- cgit v1.2.3 From f5f53288ccd32e7f37d2b27652399a93d940491c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Partheym=C3=BCller?= Date: Fri, 17 Apr 2020 15:15:57 +0200 Subject: edk2/OVMF: Support build on macOS In order to use OVMF firmware with e.g. qemu on macOS, these packages needed to be made macOS ready. This meant choosing the clang build in this case, because it is the only one working on macOS. Unfortunately, just using clang on all platforms doesn't work because there are hardcoded assumptions in the edk2 build system. --- pkgs/applications/virtualization/OVMF/default.nix | 8 +++-- pkgs/development/compilers/edk2/default.nix | 36 ++++++++++++++++++----- 2 files changed, 34 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index e475c4ed78a..e203106587b 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -17,9 +17,13 @@ let throw "Unsupported architecture"; version = lib.getVersion edk2; + buildType = if stdenv.isDarwin then + "CLANGPDB" + else + "GCC5"; in -edk2.mkDerivation projectDscPath { +edk2.mkDerivation projectDscPath buildType { name = "OVMF-${version}"; outputs = [ "out" "fd" ]; @@ -57,6 +61,6 @@ edk2.mkDerivation projectDscPath { description = "Sample UEFI firmware for QEMU and KVM"; homepage = https://github.com/tianocore/tianocore.github.io/wiki/OVMF; license = stdenv.lib.licenses.bsd2; - platforms = ["x86_64-linux" "i686-linux" "aarch64-linux"]; + platforms = ["x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin"]; }; } diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 47aa8e249f8..2ba02a29488 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -1,4 +1,17 @@ -{ stdenv, fetchgit, fetchpatch, libuuid, python3, iasl, bc }: +{ + stdenv, + clangStdenv, + fetchgit, + fetchpatch, + libuuid, + python3, + iasl, + bc, + clang_9, + llvmPackages_9, + overrideCC, + lib, +}: let pythonEnv = python3.withPackages (ps: [ps.tkinter]); @@ -12,7 +25,12 @@ else if stdenv.isAarch64 then else throw "Unsupported architecture"; -edk2 = stdenv.mkDerivation { +buildStdenv = if stdenv.isDarwin then + overrideCC clangStdenv [ clang_9 llvmPackages_9.llvm llvmPackages_9.lld ] +else + stdenv; + +edk2 = buildStdenv.mkDerivation { pname = "edk2"; version = "201911"; @@ -25,8 +43,10 @@ edk2 = stdenv.mkDerivation { buildInputs = [ libuuid pythonEnv ]; - makeFlags = [ "-C BaseTools" ]; - NIX_CFLAGS_COMPILE = "-Wno-return-type -Wno-error=stringop-truncation"; + makeFlags = [ "-C BaseTools" ] + ++ lib.optional (stdenv.isDarwin) [ "BUILD_CC=clang BUILD_CXX=clang++ BUILD_AS=clang" ]; + + NIX_CFLAGS_COMPILE = "-Wno-return-type" + lib.optionalString (!stdenv.isDarwin) " -Wno-error=stringop-truncation"; hardeningDisable = [ "format" "fortify" ]; @@ -38,15 +58,15 @@ edk2 = stdenv.mkDerivation { enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Intel EFI development kit"; homepage = https://sourceforge.net/projects/edk2/; license = licenses.bsd2; - platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; + platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" ]; }; passthru = { - mkDerivation = projectDscPath: attrs: stdenv.mkDerivation ({ + mkDerivation = projectDscPath: buildType: attrs: buildStdenv.mkDerivation ({ inherit (edk2) src; buildInputs = [ bc pythonEnv ] ++ attrs.buildInputs or []; @@ -65,7 +85,7 @@ edk2 = stdenv.mkDerivation { buildPhase = '' runHook preBuild - build -a ${targetArch} -b RELEASE -t GCC5 -p ${projectDscPath} -n $NIX_BUILD_CORES $buildFlags + build -a ${targetArch} -b RELEASE -t ${buildType} -p ${projectDscPath} -n $NIX_BUILD_CORES $buildFlags runHook postBuild ''; -- cgit v1.2.3 From 3c551848bed7c9fb811de3bcedb70b09241f52a5 Mon Sep 17 00:00:00 2001 From: Nikola Knezevic Date: Tue, 11 Feb 2020 16:34:21 +0100 Subject: oauth2_proxy: Update NixOS module Update to match the current flags and apply fixes to all breaking changes. --- nixos/modules/services/security/oauth2_proxy.nix | 29 ++++++++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix index 2abb9ec32ac..46caadee204 100644 --- a/nixos/modules/services/security/oauth2_proxy.nix +++ b/nixos/modules/services/security/oauth2_proxy.nix @@ -12,7 +12,7 @@ let # command-line to launch oauth2_proxy. providerSpecificOptions = { azure = cfg: { - azure.tenant = cfg.azure.tenant; + azure-tenant = cfg.azure.tenant; resource = cfg.azure.resource; }; @@ -44,6 +44,7 @@ let pass-access-token = passAccessToken; pass-basic-auth = passBasicAuth; pass-host-header = passHostHeader; + reverse-proxy = reverseProxy; proxy-prefix = proxyPrefix; profile-url = profileURL; redeem-url = redeemURL; @@ -65,8 +66,8 @@ let } // lib.optionalAttrs (cfg.htpasswd.file != null) { display-htpasswd-file = cfg.htpasswd.displayForm; } // lib.optionalAttrs tls.enable { - tls-cert = tls.certificate; - tls-key = tls.key; + tls-cert-file = tls.certificate; + tls-key-file = tls.key; https-address = tls.httpsAddress; } // (getProviderOptions cfg cfg.provider) // cfg.extraConfig; @@ -98,14 +99,21 @@ in ############################################## # PROVIDER configuration + # Taken from: https://github.com/pusher/oauth2_proxy/blob/master/providers/providers.go provider = mkOption { type = types.enum [ "google" - "github" "azure" + "facebook" + "github" + "keycloak" "gitlab" "linkedin" - "myusa" + "login.gov" + "bitbucket" + "nextcloud" + "digitalocean" + "oidc" ]; default = "google"; description = '' @@ -433,6 +441,17 @@ in ''; }; + reverseProxy = mkOption { + type = types.bool; + default = false; + description = '' + In case when running behind a reverse proxy, controls whether headers + like X-Real-Ip are accepted. Usage behind a reverse + proxy will require this flag to be set to avoid logging the reverse + proxy IP address. + ''; + }; + proxyPrefix = mkOption { type = types.str; default = "/oauth2"; -- cgit v1.2.3 From 3552e610c33e287ad49f12a7ef7a161e49ee7815 Mon Sep 17 00:00:00 2001 From: Nikola Knezevic Date: Thu, 9 Apr 2020 14:18:38 +0200 Subject: oauth2_proxy: Start running tests for oauth2_proxy No NixOS tests yet, but this is better than nothing. --- pkgs/servers/oauth2_proxy/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/oauth2_proxy/default.nix b/pkgs/servers/oauth2_proxy/default.nix index 339e8496624..9a2fe3ad5cb 100644 --- a/pkgs/servers/oauth2_proxy/default.nix +++ b/pkgs/servers/oauth2_proxy/default.nix @@ -15,6 +15,8 @@ buildGoPackage rec { goDeps = ./deps.nix; + doCheck = true; + # Taken from https://github.com/oauth2-proxy/oauth2-proxy/blob/master/Makefile buildFlagsArray = ("-ldflags=-X main.VERSION=${version}"); -- cgit v1.2.3 From d31bb1e350745ead3aa34f8a4161835609daae7b Mon Sep 17 00:00:00 2001 From: Nikola Knezevic Date: Mon, 13 Apr 2020 23:01:02 +0200 Subject: oauth2_proxy: Add knl as a maintainer Per request from the current maintainer. --- pkgs/servers/oauth2_proxy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/oauth2_proxy/default.nix b/pkgs/servers/oauth2_proxy/default.nix index 9a2fe3ad5cb..225c221b319 100644 --- a/pkgs/servers/oauth2_proxy/default.nix +++ b/pkgs/servers/oauth2_proxy/default.nix @@ -24,6 +24,6 @@ buildGoPackage rec { description = "A reverse proxy that provides authentication with Google, Github, or other providers"; homepage = "https://github.com/pusher/oauth2_proxy/"; license = licenses.mit; - maintainers = [ maintainers.yorickvp ]; + maintainers = with maintainers; [ yorickvp knl ]; }; } -- cgit v1.2.3 From 4ab8a6e622b7d50f284d7bd0fa96e165c1874c4b Mon Sep 17 00:00:00 2001 From: oxalica Date: Mon, 20 Apr 2020 16:56:02 +0800 Subject: birdtray: 1.7.0 -> 1.8.0 --- pkgs/applications/misc/birdtray/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/misc/birdtray/default.nix b/pkgs/applications/misc/birdtray/default.nix index 29522f75c25..00707fc7ec5 100644 --- a/pkgs/applications/misc/birdtray/default.nix +++ b/pkgs/applications/misc/birdtray/default.nix @@ -7,29 +7,24 @@ , qtbase , qttools , qtx11extras - , sqlite }: mkDerivation rec { pname = "birdtray"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "gyunaev"; repo = pname; - rev = "RELEASE_${version}"; - sha256 = "0wj2lq5bz1p0cf6yj43v3ifxschcrh5amwx30wqw2m4bb8syzjw1"; + rev = version; + sha256 = "15d0gz889vf9b2a046m93s5kdi6lw2sqjd5gaxgjkjrs20x5vr18"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - qtbase qtx11extras sqlite + qtbase qttools qtx11extras ]; - installPhase = '' - install -Dm755 birdtray $out/bin/birdtray - ''; - meta = with lib; { description = "Mail system tray notification icon for Thunderbird"; homepage = "https://github.com/gyunaev/birdtray"; -- cgit v1.2.3 From daac85d9916ea095eadf5c89d685dd9057c8d48f Mon Sep 17 00:00:00 2001 From: Kirill Elagin Date: Mon, 20 Apr 2020 11:42:47 +0300 Subject: fixup! systemd: Add prefix to unit script derivations * Avoid extra string interpolation. --- nixos/modules/system/boot/systemd.nix | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 516f8ed7541..e702fed8c3f 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -265,34 +265,28 @@ let environment.PATH = config.path; } (mkIf (config.preStart != "") - { serviceConfig.ExecStartPre = makeJobScript "${name}-pre-start" '' - ${config.preStart} - ''; + { serviceConfig.ExecStartPre = + makeJobScript "${name}-pre-start" config.preStart; }) (mkIf (config.script != "") - { serviceConfig.ExecStart = makeJobScript "${name}-start" '' - ${config.script} - '' + " " + config.scriptArgs; + { serviceConfig.ExecStart = + makeJobScript "${name}-start" config.script + " " + config.scriptArgs; }) (mkIf (config.postStart != "") - { serviceConfig.ExecStartPost = makeJobScript "${name}-post-start" '' - ${config.postStart} - ''; + { serviceConfig.ExecStartPost = + makeJobScript "${name}-post-start" config.postStart; }) (mkIf (config.reload != "") - { serviceConfig.ExecReload = makeJobScript "${name}-reload" '' - ${config.reload} - ''; + { serviceConfig.ExecReload = + makeJobScript "${name}-reload" config.reload; }) (mkIf (config.preStop != "") - { serviceConfig.ExecStop = makeJobScript "${name}-pre-stop" '' - ${config.preStop} - ''; + { serviceConfig.ExecStop = + makeJobScript "${name}-pre-stop" config.preStop; }) (mkIf (config.postStop != "") - { serviceConfig.ExecStopPost = makeJobScript "${name}-post-stop" '' - ${config.postStop} - ''; + { serviceConfig.ExecStopPost = + makeJobScript "${name}-post-stop" config.postStop; }) ]; }; -- cgit v1.2.3 From ed79cb56b708b75ee9215ea1e1bc531795e1c004 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Mon, 20 Apr 2020 10:57:40 +0200 Subject: mu: 1.2 -> 1.4.1 msg2pdf is disabled for now: https://github.com/djcb/mu/blob/1.4.1/NEWS.org --- pkgs/tools/networking/mu/default.nix | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index 2e6a401350c..ae1ca3f7761 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -5,20 +5,15 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.2"; + version = "1.4.1"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = version; - sha256 = "0yhjlj0z23jw3cf2wfnl98y8q6gikvmhkb8vdm87bd7jw0bdnrfz"; + sha256 = "0q2ik7fj5k9i76js4ijyxbgrwqff437lass0sd5if2r40rqh0as0"; }; - # test-utils coredumps so don't run those - postPatch = '' - sed -i -e '/test-utils/d' lib/parser/Makefile.am - ''; - buildInputs = [ sqlite xapian glib gmime3 texinfo emacs guile libsoup icu ] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk ]; @@ -27,19 +22,17 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + preConfigure = "./autogen.sh"; + preBuild = '' # Fix mu4e-builddir (set it to $out) substituteInPlace mu4e/mu4e-meta.el.in \ --replace "@abs_top_builddir@" "$out" - - # We install msg2pdf to bin/msg2pdf, fix its location in elisp - substituteInPlace mu4e/mu4e-actions.el \ - --replace "/toys/msg2pdf/" "/bin/" ''; - # Install mug and msg2pdf + # Install mug postInstall = stdenv.lib.optionalString withMug '' - for f in msg2pdf mug ; do + for f in mug ; do install -m755 toys/$f/$f $out/bin/$f done ''; -- cgit v1.2.3 From c5bcdbf2c0da07849f0e6b6c55bb8b8057766f03 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 20 Apr 2020 04:20:00 -0500 Subject: icu65: init at 65.1 --- pkgs/development/libraries/icu/65.nix | 4 ++++ pkgs/development/libraries/icu/base.nix | 3 +-- pkgs/top-level/all-packages.nix | 5 +++++ 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/icu/65.nix diff --git a/pkgs/development/libraries/icu/65.nix b/pkgs/development/libraries/icu/65.nix new file mode 100644 index 00000000000..c5074eea114 --- /dev/null +++ b/pkgs/development/libraries/icu/65.nix @@ -0,0 +1,4 @@ +import ./base.nix { + version = "65.1"; + sha256 = "0j6r6qqnhfr5iqkx53k63ifkm93kv1kkb7h2mlgd1mnnndk79qsk"; +} diff --git a/pkgs/development/libraries/icu/base.nix b/pkgs/development/libraries/icu/base.nix index 96b00027e20..81f75ad526a 100644 --- a/pkgs/development/libraries/icu/base.nix +++ b/pkgs/development/libraries/icu/base.nix @@ -9,8 +9,7 @@ let baseAttrs = { src = fetchurl { - url = "http://download.icu-project.org/files/${pname}/${version}/${pname}-" - + (stdenv.lib.replaceChars ["."] ["_"] version) + "-src.tgz"; + url = "https://github.com/unicode-org/icu/releases/download/release-${lib.replaceChars [ "." ] [ "-" ] version}/icu4c-${lib.replaceChars [ "." ] [ "_" ] version}-src.tgz"; inherit sha256; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index febca841867..b48acfbb43d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12190,6 +12190,11 @@ in } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); + icu65 = callPackage ../development/libraries/icu/65.nix ({ + nativeBuildRoot = buildPackages.icu65.override { buildRootOnly = true; }; + } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { + stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' + })); icu = icu64; -- cgit v1.2.3 From 72e932d443d9e9b2d77dc68ad08047d826a3d217 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 20 Apr 2020 04:20:00 -0500 Subject: chezmoi: 1.7.18 -> 1.8.0 --- pkgs/tools/misc/chezmoi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index beb7c41f906..c42e8cacc73 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "1.7.18"; + version = "1.8.0"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "12gx78cbs7abizlqhs7y2w6lwlk5d1hhvixj0ki8d1d5vdr747bc"; + sha256 = "1ww8xcf57csazj3q2569irxg5il29jrx43mq5cif8dvn8xjm00nn"; }; - modSha256 = "15b3hik3nzb7xnd6806dqdb36v7z2a0wmvxbrfwvnbigd8zd2y0j"; + modSha256 = "1zmvav19nyqv6yp71mk3lx6szc5vwyf81m8kvcjj9rlzlygmcl8g"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.builtBy=nixpkgs" -- cgit v1.2.3 From 4ef71611042daae504ee0a74fcd6321a36020cc5 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 20 Apr 2020 04:20:00 -0500 Subject: gitAndTools.git-gone: 0.3.0 -> 0.3.2 --- .../version-management/git-and-tools/git-gone/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix index aaf22c940cb..32350fa538d 100644 --- a/pkgs/applications/version-management/git-and-tools/git-gone/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-gone/default.nix @@ -1,23 +1,27 @@ -{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, makeWrapper, openssl, git, libiconv, Security }: +{ stdenv, fetchFromGitHub, rustPlatform, pkgconfig, makeWrapper, openssl, git, libiconv, Security, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "git-gone"; - version = "0.3.0"; + version = "0.3.2"; src = fetchFromGitHub { owner = "lunaryorn"; repo = pname; rev = "v${version}"; - sha256 = "05wlng563p9iy0ky3z23a4jakcix887fb45r7j2mk0fp5ykdjmzh"; + sha256 = "0zc4cb1dg30np5yc4ymkr894qs2bk0r123i302md00niayk4njyd"; }; - cargoSha256 = "1scp9rzn59akxsf9p48j1zq6clbwdyasnyi4j28nj03ghvdv2i33"; + cargoSha256 = "1d892889ml7sqyxzmjipq5fvizb4abqhmmn450qm7yam9fn5q5wf"; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ pkgconfig makeWrapper installShellFiles ]; buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + postInstall = '' + installManPage git-gone.1 + ''; + postFixup = '' wrapProgram $out/bin/git-gone --prefix PATH : "${stdenv.lib.makeBinPath [ git ]}" ''; -- cgit v1.2.3 From 172746d796aa8ca0fc57201aba9ec435204b2224 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 20 Apr 2020 04:21:00 -0500 Subject: icu66: init at 66.1 --- pkgs/development/libraries/icu/66.nix | 4 ++++ pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 9 insertions(+) create mode 100644 pkgs/development/libraries/icu/66.nix diff --git a/pkgs/development/libraries/icu/66.nix b/pkgs/development/libraries/icu/66.nix new file mode 100644 index 00000000000..5dfad945d29 --- /dev/null +++ b/pkgs/development/libraries/icu/66.nix @@ -0,0 +1,4 @@ +import ./base.nix { + version = "66.1"; + sha256 = "0bharwzc9nzkbrcf405z2nb3h7q0711z450arz0mjmdrk8hg58sj"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b48acfbb43d..229adc08151 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12195,6 +12195,11 @@ in } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); + icu66 = callPackage ../development/libraries/icu/66.nix ({ + nativeBuildRoot = buildPackages.icu66.override { buildRootOnly = true; }; + } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { + stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' + })); icu = icu64; -- cgit v1.2.3 From b06164281c9fba70163d55e2f931ed7851f3f552 Mon Sep 17 00:00:00 2001 From: obadz Date: Mon, 20 Apr 2020 10:36:37 +0100 Subject: citrix_workspace: add 2004 --- .../networking/remote/citrix-workspace/default.nix | 15 +++++++++++++-- pkgs/top-level/all-packages.nix | 1 + 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/citrix-workspace/default.nix b/pkgs/applications/networking/remote/citrix-workspace/default.nix index 0936f4e7552..a62b1bf5ee1 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/default.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/default.nix @@ -24,7 +24,7 @@ , gtk_engines , alsaLib , zlib -, version ? "19.12.0" +, version ? "20.04.0" }: let @@ -71,7 +71,18 @@ let x86hash = "07rfp90ksnvr8zv7ix7f0z6a59n48s7bd4kqbzilfwxgs4ddqmcy"; x64suffix = "19"; x86suffix = "19"; - homepage = "https://www.citrix.com/de-de/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; + homepage = "https://www.citrix.com/downloads/workspace-app/legacy-workspace-app-for-linux/workspace-app-for-linux-1912.html"; + }; + + "20.04.0" = { + major = "20"; + minor = "04"; + patch = "0"; + x64hash = "E923592216F9541173846F932784E6C062CB09C9E8858219C7489607BF82A0FB"; + x86hash = "A2E2E1882723DA6796E68916B3BB2B44DD575A83DEB03CA90A262F6C81B1A53F"; + x64suffix = "21"; + x86suffix = "21"; + homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 562d27462c0..ab65febc1bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2462,6 +2462,7 @@ in circus = callPackage ../tools/networking/circus { }; citrix_workspace_unwrapped = callPackage ../applications/networking/remote/citrix-workspace { }; + citrix_workspace_unwrapped_20_04_0 = citrix_workspace_unwrapped.override { version = "20.04.0"; }; citrix_workspace_unwrapped_19_12_0 = citrix_workspace_unwrapped.override { version = "19.12.0"; }; citrix_workspace_unwrapped_19_10_0 = citrix_workspace_unwrapped.override { version = "19.10.0"; }; citrix_workspace_unwrapped_19_8_0 = citrix_workspace_unwrapped.override { version = "19.8.0"; }; -- cgit v1.2.3 From 41582c7a023281b6024e55c8c2754b0ea848f4a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Mon, 20 Apr 2020 11:40:00 +0200 Subject: plex-media-player: 2.40.0.1007 -> 2.55.0.1069 + update script (#68938) --- .../video/plex-media-player/default.nix | 41 +++---------- pkgs/applications/video/plex-media-player/deps.nix | 28 +++++++++ .../applications/video/plex-media-player/update.sh | 71 ++++++++++++++++++++++ 3 files changed, 108 insertions(+), 32 deletions(-) create mode 100644 pkgs/applications/video/plex-media-player/deps.nix create mode 100755 pkgs/applications/video/plex-media-player/update.sh diff --git a/pkgs/applications/video/plex-media-player/default.nix b/pkgs/applications/video/plex-media-player/default.nix index 8b7aa3b551c..d08a4a85242 100644 --- a/pkgs/applications/video/plex-media-player/default.nix +++ b/pkgs/applications/video/plex-media-player/default.nix @@ -5,45 +5,20 @@ let # During compilation, a CMake bundle is downloaded from `artifacts.plex.tv`, # which then downloads a handful of web client-related files. To enable # sandboxed builds, we manually download them and save them so these files - # are fetched ahead-of-time instead of during the CMake build. Whenever - # plex-media-player is updated, the versions for these files are changed, - # so the build IDs (and SHAs) below will need to be updated! - depSrcs = rec { - webClientBuildId = "141-4af71961b12c68"; - webClientDesktopBuildId = "3.104.2-1b12c68"; - webClientTvBuildId = "4.3.0-4af7196"; - - webClient = fetchurl { - url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/buildid.cmake"; - sha256 = "0fpkd1s49dbiqqlijxbillqd71a78p8y2sc23mwp0lvcmxrg265p"; - }; - webClientDesktopHash = fetchurl { - url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz.sha1"; - sha256 = "0sb0j44lwqz9zbm98nba4x6c1jxdzvs36ynwfg527avkxxna0f8f"; - }; - webClientDesktop = fetchurl { - url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz"; - sha256 = "0dxa0ka0igfsryzda4r5clwdl47ah78nmlmgj9d5pgsvyvzjp87z"; - }; - webClientTvHash = fetchurl { - url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz.sha1"; - sha256 = "086w1bavk2aqsyhv9zi5fynk31zf61sl91r6gjrdrz656wfk5bxa"; - }; - webClientTv = fetchurl { - url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz"; - sha256 = "12vbgsfnj0j2y5jd73dpi08hqsr9888sma41nvd4ydsd7qblm455"; - }; - }; + # are fetched ahead-of-time instead of during the CMake build. To update + # plex-media-player use the update.sh script, so the versions and hashes + # for these files are are also updated! + depSrcs = import ./deps.nix { inherit fetchurl; }; in mkDerivation rec { pname = "plex-media-player"; - version = "2.40.0.1007"; - vsnHash = "5482132c"; + version = "2.55.0.1069"; + vsnHash = "2369bed9"; src = fetchFromGitHub { owner = "plexinc"; repo = "plex-media-player"; rev = "v${version}-${vsnHash}"; - sha256 = "0ibdh5g8x32iy74q97jfsmxd08wnyrzs3gfiwjfgc10vaa1qdhli"; + sha256 = "1jq4592sgaia0xy2h7n3vh5i7c84sdh4l64fdc774r4i0bmg66qi"; }; nativeBuildInputs = [ pkgconfig cmake python3 ]; @@ -61,6 +36,8 @@ in mkDerivation rec { cmakeFlags = [ "-DCMAKE_BUILD_TYPE=RelWithDebInfo" "-DQTROOT=${qtbase}" ]; + passthru.updateScript = ./update.sh; + meta = with stdenv.lib; { description = "Streaming media player for Plex"; license = licenses.gpl2; diff --git a/pkgs/applications/video/plex-media-player/deps.nix b/pkgs/applications/video/plex-media-player/deps.nix new file mode 100644 index 00000000000..26b57532615 --- /dev/null +++ b/pkgs/applications/video/plex-media-player/deps.nix @@ -0,0 +1,28 @@ +{ fetchurl }: + +rec { + webClientBuildId = "180-afec74de50e175"; + webClientDesktopBuildId = "4.29.2-e50e175"; + webClientTvBuildId = "4.29.3-afec74d"; + + webClient = fetchurl { + url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/buildid.cmake"; + sha256 = "0rabrg3lk9vgpswk8npa54hzqf2v8ghqqnysxpwn12wrp1pc2rr9"; + }; + webClientDesktopHash = fetchurl { + url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz.sha1"; + sha256 = "02b5yq4yc411qlg2dkw5j9lrr3cn2y4d27sin0skf6qza180473g"; + }; + webClientDesktop = fetchurl { + url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz"; + sha256 = "0l3xv48kr2rx878a40zrgwif2ga2ikv6fdcbq9pylycnmm41pxmh"; + }; + webClientTvHash = fetchurl { + url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz.sha1"; + sha256 = "0wq115y2xrgwqrzr43nhkq8ba237z20yfp426ki2kdypsq8fjqka"; + }; + webClientTv = fetchurl { + url = "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz"; + sha256 = "1wax1qslm226l2w53m2fnl849jw349qhg3rjghx7vip5pmb43vw9"; + }; +} diff --git a/pkgs/applications/video/plex-media-player/update.sh b/pkgs/applications/video/plex-media-player/update.sh new file mode 100755 index 00000000000..a8493a16c98 --- /dev/null +++ b/pkgs/applications/video/plex-media-player/update.sh @@ -0,0 +1,71 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl common-updater-scripts nix-prefetch-scripts jq + +set -xeuo pipefail + +nixpkgs="$(git rev-parse --show-toplevel)" + +oldVersion="$(nix-instantiate --eval -E "with import $nixpkgs {}; plex-media-player.version or (builtins.parseDrvName plex-media-player.name).version" | tr -d '"')" +latestTag="$(curl -s https://api.github.com/repos/plexinc/plex-media-player/tags | jq -r '.[] | .name' | sort --version-sort | tail -1)" +latestVersion="$(expr $latestTag : 'v\(.*\)-.*')" +latestHash="$(expr $latestTag : 'v.*-\(.*\)')" + +if [ ! "$oldVersion" = "$latestVersion" ]; then + # update default.nix with the new version and hash + expectedHash=$(nix-prefetch-git --url https://github.com/plexinc/plex-media-player.git --rev $latestTag --quiet | jq -r '.sha256') + update-source-version plex-media-player --version-key=vsnHash "${latestHash}" 0000 + update-source-version plex-media-player "${latestVersion}" $expectedHash + + # extract the webClientBuildId from the source folder + src="$(nix-build --no-out-link $nixpkgs -A plex-media-player.src)" + webClientBuildId="$(grep 'set(WEB_CLIENT_BUILD_ID' $src/CMakeModules/WebClient.cmake | cut -d' ' -f2 | tr -d ')')" + + # retreive the included cmake file and hash + { read -r webClientBuildIdHash; read -r webClientBuildIdPath; } < \ + <(nix-prefetch-url --print-path "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/buildid.cmake") + webClientDesktopBuildId="$(grep 'set(DESKTOP_VERSION' $webClientBuildIdPath | cut -d' ' -f2 | tr -d ')')" + webClientTvBuildId="$(grep 'set(TV_VERSION' $webClientBuildIdPath | cut -d' ' -f2 | tr -d ')')" + + # get the hashes for the other files + webClientDesktopHash="$(nix-prefetch-url "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz.sha1")" + webClientDesktop="$(nix-prefetch-url "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-desktop-${webClientDesktopBuildId}.tar.xz")" + webClientTvHash="$(nix-prefetch-url "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz.sha1")" + webClientTv="$(nix-prefetch-url "https://artifacts.plex.tv/web-client-pmp/${webClientBuildId}/web-client-tv-${webClientTvBuildId}.tar.xz")" + + # update deps.nix + cat > $nixpkgs/pkgs/applications/video/plex-media-player/deps.nix < ${latestVersion}" +else + echo "plex-media-player is already up-to-date" +fi -- cgit v1.2.3 From c28f6fce9948e8d6927fa274803e3887d77fbf46 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Thu, 5 Dec 2019 12:56:33 +0200 Subject: oq: init at 1.0.2 --- pkgs/development/tools/oq/default.nix | 31 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/tools/oq/default.nix diff --git a/pkgs/development/tools/oq/default.nix b/pkgs/development/tools/oq/default.nix new file mode 100644 index 00000000000..1fc839577c5 --- /dev/null +++ b/pkgs/development/tools/oq/default.nix @@ -0,0 +1,31 @@ +{ lib, fetchFromGitHub, crystal, jq, libxml2, makeWrapper }: + +crystal.buildCrystalPackage rec { + pname = "oq"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "Blacksmoke16"; + repo = pname; + rev = "v${version}"; + sha256 = "0sf6rb5b6g7gzyq11l5868p3a1s5z8432swlpv457bfbbnbg6j6q"; + }; + + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ jq libxml2 ]; + + crystalBinaries.oq.src = "src/oq_cli.cr"; + + postInstall = '' + wrapProgram "$out/bin/oq" \ + --prefix PATH : "${lib.makeBinPath [ jq ]}" + ''; + + meta = with lib; { + description = "A performant, and portable jq wrapper"; + homepage = "https://blacksmoke16.github.io/oq/"; + license = licenses.mit; + maintainers = with maintainers; [ filalex77 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71e114686aa..d432bfecb39 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5420,6 +5420,8 @@ in stdenv = clangStdenv; }; + oq = callPackage ../development/tools/oq { }; + out-of-tree = callPackage ../development/tools/out-of-tree { }; oppai-ng = callPackage ../tools/misc/oppai-ng { }; -- cgit v1.2.3 From fe8afcb993845505042b41f09a9c98f6748d7af2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Partheym=C3=BCller?= Date: Mon, 20 Apr 2020 13:19:38 +0200 Subject: edk2: Fix style --- pkgs/development/compilers/edk2/default.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 2ba02a29488..eb658431c92 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -1,16 +1,16 @@ { - stdenv, - clangStdenv, - fetchgit, - fetchpatch, - libuuid, - python3, - iasl, - bc, - clang_9, - llvmPackages_9, - overrideCC, - lib, + stdenv, + clangStdenv, + fetchgit, + fetchpatch, + libuuid, + python3, + iasl, + bc, + clang_9, + llvmPackages_9, + overrideCC, + lib, }: let -- cgit v1.2.3 From 94d114dc2a9619843af8ea6b322ef2b4f44b982f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Partheym=C3=BCller?= Date: Mon, 20 Apr 2020 13:30:35 +0200 Subject: edk2/OVMF: Determine build type from CC setting --- pkgs/applications/virtualization/OVMF/default.nix | 6 +----- pkgs/development/compilers/edk2/default.nix | 11 ++++++++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index e203106587b..cd30be88991 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -17,13 +17,9 @@ let throw "Unsupported architecture"; version = lib.getVersion edk2; - buildType = if stdenv.isDarwin then - "CLANGPDB" - else - "GCC5"; in -edk2.mkDerivation projectDscPath buildType { +edk2.mkDerivation projectDscPath { name = "OVMF-${version}"; outputs = [ "out" "fd" ]; diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index eb658431c92..1050119be53 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -30,6 +30,11 @@ buildStdenv = if stdenv.isDarwin then else stdenv; +buildType = if stdenv.isDarwin then + "CLANGPDB" + else + "GCC5"; + edk2 = buildStdenv.mkDerivation { pname = "edk2"; version = "201911"; @@ -44,9 +49,9 @@ edk2 = buildStdenv.mkDerivation { buildInputs = [ libuuid pythonEnv ]; makeFlags = [ "-C BaseTools" ] - ++ lib.optional (stdenv.isDarwin) [ "BUILD_CC=clang BUILD_CXX=clang++ BUILD_AS=clang" ]; + ++ lib.optional (stdenv.cc.isClang) [ "BUILD_CC=clang BUILD_CXX=clang++ BUILD_AS=clang" ]; - NIX_CFLAGS_COMPILE = "-Wno-return-type" + lib.optionalString (!stdenv.isDarwin) " -Wno-error=stringop-truncation"; + NIX_CFLAGS_COMPILE = "-Wno-return-type" + lib.optionalString (stdenv.cc.isGNU) " -Wno-error=stringop-truncation"; hardeningDisable = [ "format" "fortify" ]; @@ -66,7 +71,7 @@ edk2 = buildStdenv.mkDerivation { }; passthru = { - mkDerivation = projectDscPath: buildType: attrs: buildStdenv.mkDerivation ({ + mkDerivation = projectDscPath: attrs: buildStdenv.mkDerivation ({ inherit (edk2) src; buildInputs = [ bc pythonEnv ] ++ attrs.buildInputs or []; -- cgit v1.2.3 From 8e795835106519f48b106232978b2c46952d61d9 Mon Sep 17 00:00:00 2001 From: Lars Jellema Date: Sat, 11 May 2019 23:16:17 +0200 Subject: gnat: init at 9.3.0 --- pkgs/build-support/cc-wrapper/add-flags.sh | 5 + pkgs/build-support/cc-wrapper/default.nix | 15 ++ pkgs/build-support/cc-wrapper/gnat-wrapper.sh | 165 +++++++++++++++++++++ pkgs/development/compilers/gcc/6/default.nix | 11 +- pkgs/development/compilers/gcc/9/default.nix | 10 +- .../compilers/gcc/common/configure-flags.nix | 5 + .../compilers/gcc/common/pre-configure.nix | 9 +- pkgs/development/compilers/gcc/gnat-cflags.patch | 35 +++++ pkgs/development/compilers/gnatboot/default.nix | 51 +++++++ pkgs/top-level/all-packages.nix | 22 +++ 10 files changed, 323 insertions(+), 5 deletions(-) create mode 100644 pkgs/build-support/cc-wrapper/gnat-wrapper.sh create mode 100644 pkgs/development/compilers/gcc/gnat-cflags.patch create mode 100644 pkgs/development/compilers/gnatboot/default.nix diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh index 1358b167f6e..323ea5bfd77 100644 --- a/pkgs/build-support/cc-wrapper/add-flags.sh +++ b/pkgs/build-support/cc-wrapper/add-flags.sh @@ -10,6 +10,7 @@ var_templates_list=( NIX+CFLAGS_LINK NIX+CXXSTDLIB_COMPILE NIX+CXXSTDLIB_LINK + NIX+GNATFLAGS_COMPILE ) var_templates_bool=( NIX+ENFORCE_NO_NATIVE @@ -40,6 +41,10 @@ if [ -e @out@/nix-support/cc-cflags ]; then NIX_@infixSalt@_CFLAGS_COMPILE="$(< @out@/nix-support/cc-cflags) $NIX_@infixSalt@_CFLAGS_COMPILE" fi +if [ -e @out@/nix-support/gnat-cflags ]; then + NIX_@infixSalt@_GNATFLAGS_COMPILE="$(< @out@/nix-support/gnat-cflags) $NIX_@infixSalt@_GNATFLAGS_COMPILE" +fi + if [ -e @out@/nix-support/cc-ldflags ]; then NIX_@infixSalt@_LDFLAGS+=" $(< @out@/nix-support/cc-ldflags)" fi diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index f6248335052..1b7c5750727 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -199,6 +199,12 @@ stdenv.mkDerivation { fi '' + + optionalString cc.langAda or false '' + wrap ${targetPrefix}gnatmake ${./gnat-wrapper.sh} $ccPath/${targetPrefix}gnatmake + wrap ${targetPrefix}gnatbind ${./gnat-wrapper.sh} $ccPath/${targetPrefix}gnatbind + wrap ${targetPrefix}gnatlink ${./gnat-wrapper.sh} $ccPath/${targetPrefix}gnatlink + '' + + optionalString cc.langFortran or false '' wrap ${targetPrefix}gfortran $wrapper $ccPath/${targetPrefix}gfortran ln -sv ${targetPrefix}gfortran $out/bin/${targetPrefix}g77 @@ -283,6 +289,13 @@ stdenv.mkDerivation { ccLDFlags+=" -L${cc_solib}/lib" ccCFlags+=" -B${cc_solib}/lib" + '' + optionalString cc.langAda or false '' + basePath=$(echo $cc/lib/*/*/*) + ccCFlags+=" -B$basePath -I$basePath/adainclude" + gnatCFlags="-I$basePath/adainclude -I$basePath/adalib" + + echo "$gnatCFlags" > $out/nix-support/gnat-cflags + '' + '' echo "$ccLDFlags" > $out/nix-support/cc-ldflags echo "$ccCFlags" > $out/nix-support/cc-cflags '' + optionalString (targetPlatform.isDarwin && (libcxx != null) && (cc.isClang or false)) '' @@ -351,6 +364,8 @@ stdenv.mkDerivation { hardening_unsupported_flags+=" stackprotector fortify pie pic" '' + optionalString targetPlatform.isNetBSD '' hardening_unsupported_flags+=" stackprotector fortify" + '' + optionalString cc.langAda or false '' + hardening_unsupported_flags+=" stackprotector strictoverflow" '' + optionalString targetPlatform.isWasm '' diff --git a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh new file mode 100644 index 00000000000..15b53d76c63 --- /dev/null +++ b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh @@ -0,0 +1,165 @@ +#! @shell@ +set -eu -o pipefail +o posix +shopt -s nullglob + +if (( "${NIX_DEBUG:-0}" >= 7 )); then + set -x +fi + +path_backup="$PATH" + +# That @-vars are substituted separately from bash evaluation makes +# shellcheck think this, and others like it, are useless conditionals. +# shellcheck disable=SC2157 +if [[ -n "@coreutils_bin@" && -n "@gnugrep_bin@" ]]; then + PATH="@coreutils_bin@/bin:@gnugrep_bin@/bin" +fi + +source @out@/nix-support/utils.bash + +# Flirting with a layer violation here. +if [ -z "${NIX_BINTOOLS_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then + source @bintools@/nix-support/add-flags.sh +fi + +# Put this one second so libc ldflags take priority. +if [ -z "${NIX_CC_WRAPPER_@infixSalt@_FLAGS_SET:-}" ]; then + source @out@/nix-support/add-flags.sh +fi + + +# Parse command line options and set several variables. +# For instance, figure out if linker flags should be passed. +# GCC prints annoying warnings when they are not needed. +dontLink=0 +nonFlagArgs=0 +# shellcheck disable=SC2193 + +expandResponseParams "$@" +declare -i n=0 +nParams=${#params[@]} +while (( "$n" < "$nParams" )); do + p=${params[n]} + p2=${params[n+1]:-} # handle `p` being last one + if [ "$p" = -c ]; then + dontLink=1 + elif [ "$p" = -S ]; then + dontLink=1 + elif [ "$p" = -E ]; then + dontLink=1 + elif [ "$p" = -E ]; then + dontLink=1 + elif [ "$p" = -M ]; then + dontLink=1 + elif [ "$p" = -MM ]; then + dontLink=1 + elif [[ "$p" = -x && "$p2" = *-header ]]; then + dontLink=1 + elif [[ "$p" != -?* ]]; then + # A dash alone signifies standard input; it is not a flag + nonFlagArgs=1 + fi + n+=1 +done + +# If we pass a flag like -Wl, then gcc will call the linker unless it +# can figure out that it has to do something else (e.g., because of a +# "-c" flag). So if no non-flag arguments are given, don't pass any +# linker flags. This catches cases like "gcc" (should just print +# "gcc: no input files") and "gcc -v" (should print the version). +if [ "$nonFlagArgs" = 0 ]; then + dontLink=1 +fi + +# Optionally filter out paths not refering to the store. +if [[ "${NIX_ENFORCE_PURITY:-}" = 1 && -n "$NIX_STORE" ]]; then + rest=() + nParams=${#params[@]} + declare -i n=0 + while (( "$n" < "$nParams" )); do + p=${params[n]} + p2=${params[n+1]:-} # handle `p` being last one + if [ "${p:0:3}" = -L/ ] && badPath "${p:2}"; then + skip "${p:2}" + elif [ "$p" = -L ] && badPath "$p2"; then + n+=1; skip "$p2" + elif [ "${p:0:3}" = -I/ ] && badPath "${p:2}"; then + skip "${p:2}" + elif [ "$p" = -I ] && badPath "$p2"; then + n+=1; skip "$p2" + elif [ "${p:0:4}" = -aI/ ] && badPath "${p:3}"; then + skip "${p:3}" + elif [ "$p" = -aI ] && badPath "$p2"; then + n+=1; skip "$p2" + elif [ "${p:0:4}" = -aO/ ] && badPath "${p:3}"; then + skip "${p:3}" + elif [ "$p" = -aO ] && badPath "$p2"; then + n+=1; skip "$p2" + elif [ "$p" = -isystem ] && badPath "$p2"; then + n+=1; skip "$p2" + else + rest+=("$p") + fi + n+=1 + done + # Old bash empty array hack + params=(${rest+"${rest[@]}"}) +fi + + +# Clear march/mtune=native -- they bring impurity. +if [ "$NIX_@infixSalt@_ENFORCE_NO_NATIVE" = 1 ]; then + rest=() + # Old bash empty array hack + for p in ${params+"${params[@]}"}; do + if [[ "$p" = -m*=native ]]; then + skip "$p" + else + rest+=("$p") + fi + done + # Old bash empty array hack + params=(${rest+"${rest[@]}"}) +fi + +if [ "$(basename $0)x" = "gnatmakex" ]; then + extraBefore=("--GNATBIND=@out@/bin/gnatbind" "--GNATLINK=@out@/bin/gnatlink") + extraAfter=($NIX_@infixSalt@_GNATFLAGS_COMPILE) +fi + +if [ "$(basename $0)x" = "gnatbindx" ]; then + extraBefore=() + extraAfter=($NIX_@infixSalt@_GNATFLAGS_COMPILE) +fi + +if [ "$(basename $0)x" = "gnatlinkx" ]; then + extraBefore=() + extraAfter=("--GCC=@out@/bin/gcc") +fi + +# As a very special hack, if the arguments are just `-v', then don't +# add anything. This is to prevent `gcc -v' (which normally prints +# out the version number and returns exit code 0) from printing out +# `No input files specified' and returning exit code 1. +if [ "$*" = -v ]; then + extraAfter=() + extraBefore=() +fi + +# Optionally print debug info. +if (( "${NIX_DEBUG:-0}" >= 1 )); then + # Old bash workaround, see ld-wrapper for explanation. + echo "extra flags before to @prog@:" >&2 + printf " %q\n" ${extraBefore+"${extraBefore[@]}"} >&2 + echo "original flags to @prog@:" >&2 + printf " %q\n" ${params+"${params[@]}"} >&2 + echo "extra flags after to @prog@:" >&2 + printf " %q\n" ${extraAfter+"${extraAfter[@]}"} >&2 +fi + +PATH="$path_backup" +# Old bash workaround, see above. +exec @prog@ \ + ${extraBefore+"${extraBefore[@]}"} \ + ${params+"${params[@]}"} \ + ${extraAfter+"${extraAfter[@]}"} diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 1adffa8174e..c04e424b2fa 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -1,5 +1,6 @@ { stdenv, targetPackages, fetchurl, fetchpatch, fetchFromGitHub, noSysDirs , langC ? true, langCC ? true, langFortran ? false +, langAda ? false , langObjC ? stdenv.targetPlatform.isDarwin , langObjCpp ? stdenv.targetPlatform.isDarwin , langJava ? false @@ -15,6 +16,7 @@ , libelf # optional, for link-time optimizations (LTO) , isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null +, gnatboot ? null , zip ? null, unzip ? null, pkgconfig ? null , gtk2 ? null, libart_lgpl ? null , libX11 ? null, libXt ? null, libSM ? null, libICE ? null, libXtst ? null @@ -48,6 +50,8 @@ assert stdenv.hostPlatform.isDarwin -> gnused != null; # The go frontend is written in c++ assert langGo -> langCC; +assert langAda -> gnatboot != null; + # threadsCross is just for MinGW assert threadsCross != null -> stdenv.targetPlatform.isWindows; @@ -63,6 +67,7 @@ let majorVersion = "6"; [ ../use-source-date-epoch.patch ] ++ optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch + ++ optional langAda ../gnat-cflags.patch ++ optional langFortran ../gfortran-driving.patch ++ optional (targetPlatform.libc == "musl") ../libgomp-dont-force-initial-exec.patch ++ optional (!crossStageStatic && targetPlatform.isMinGW) (fetchpatch { @@ -200,6 +205,7 @@ stdenv.mkDerivation ({ # The builder relies on GNU sed (for instance, Darwin's `sed' fails with # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. ++ (optional hostPlatform.isDarwin gnused) + ++ (optional langAda gnatboot) ; depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; @@ -208,7 +214,7 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit (stdenv) lib; - inherit version hostPlatform langJava langGo; + inherit version hostPlatform gnatboot langJava langAda langGo; }; dontDisableStatic = true; @@ -234,6 +240,7 @@ stdenv.mkDerivation ({ langCC langFortran langJava javaAwtGtk javaAntlr javaEcj + langAda langGo langObjC langObjCpp @@ -292,7 +299,7 @@ stdenv.mkDerivation ({ ; passthru = { - inherit langC langCC langObjC langObjCpp langFortran langGo version; + inherit langC langCC langObjC langObjCpp langFortran langAda langGo version; isGNU = true; }; diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index a6ba8c9c0f6..5785782a671 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -1,5 +1,6 @@ { stdenv, targetPackages, fetchurl, fetchpatch, noSysDirs , langC ? true, langCC ? true, langFortran ? false +, langAda ? false , langObjC ? stdenv.targetPlatform.isDarwin , langObjCpp ? stdenv.targetPlatform.isDarwin , langGo ? false @@ -13,6 +14,7 @@ , libelf # optional, for link-time optimizations (LTO) , isl ? null # optional, for the Graphite optimization framework. , zlib ? null +, gnatboot ? null , enableMultilib ? false , enablePlugin ? stdenv.hostPlatform == stdenv.buildPlatform # Whether to support user-supplied plug-ins , name ? "gcc" @@ -35,6 +37,7 @@ assert stdenv.hostPlatform.isDarwin -> gnused != null; # The go frontend is written in c++ assert langGo -> langCC; +assert langAda -> gnatboot != null; # threadsCross is just for MinGW assert threadsCross != null -> stdenv.targetPlatform.isWindows; @@ -54,6 +57,7 @@ let majorVersion = "9"; url = "https://git.busybox.net/buildroot/plain/package/gcc/${version}/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02"; sha256 = ""; # TODO: uncomment and check hash when available. }) */ + ++ optional langAda ../gnat-cflags.patch ++ optional langFortran ../gfortran-driving.patch ++ optional (targetPlatform.libc == "musl" && targetPlatform.isPower) ../ppc-musl.patch ++ optional (!crossStageStatic && targetPlatform.isMinGW) (fetchpatch { @@ -160,6 +164,7 @@ stdenv.mkDerivation ({ # The builder relies on GNU sed (for instance, Darwin's `sed' fails with # "-i may not be used with stdin"), and `stdenvNative' doesn't provide it. ++ (optional hostPlatform.isDarwin gnused) + ++ (optional langAda gnatboot) ; depsTargetTarget = optional (!crossStageStatic && threadsCross != null) threadsCross; @@ -168,7 +173,7 @@ stdenv.mkDerivation ({ preConfigure = import ../common/pre-configure.nix { inherit (stdenv) lib; - inherit version hostPlatform langGo; + inherit version hostPlatform gnatboot langAda langGo; }; dontDisableStatic = true; @@ -193,6 +198,7 @@ stdenv.mkDerivation ({ langC langCC langFortran + langAda langGo langObjC langObjCpp @@ -236,7 +242,7 @@ stdenv.mkDerivation ({ ; passthru = { - inherit langC langCC langObjC langObjCpp langFortran langGo version; + inherit langC langCC langObjC langObjCpp langAda langFortran langGo version; isGNU = true; }; diff --git a/pkgs/development/compilers/gcc/common/configure-flags.nix b/pkgs/development/compilers/gcc/common/configure-flags.nix index aa0fcb50628..c78a2814895 100644 --- a/pkgs/development/compilers/gcc/common/configure-flags.nix +++ b/pkgs/development/compilers/gcc/common/configure-flags.nix @@ -16,6 +16,7 @@ , langCC , langFortran , langJava ? false, javaAwtGtk ? false, javaAntlr ? null, javaEcj ? null +, langAda ? false , langGo , langObjC , langObjCpp @@ -115,6 +116,7 @@ let ++ lib.optional langCC "c++" ++ lib.optional langFortran "fortran" ++ lib.optional langJava "java" + ++ lib.optional langAda "ada" ++ lib.optional langGo "go" ++ lib.optional langObjC "objc" ++ lib.optional langObjCpp "obj-c++" @@ -140,6 +142,9 @@ let "--enable-cloog-backend=isl" ] + # Ada options + ++ lib.optional langAda "--enable-libada" + # Java options ++ lib.optionals langJava [ "--with-ecj-jar=${javaEcj}" diff --git a/pkgs/development/compilers/gcc/common/pre-configure.nix b/pkgs/development/compilers/gcc/common/pre-configure.nix index 4c86d37e243..85b854e19b9 100644 --- a/pkgs/development/compilers/gcc/common/pre-configure.nix +++ b/pkgs/development/compilers/gcc/common/pre-configure.nix @@ -1,6 +1,11 @@ -{ lib, version, hostPlatform, langJava ? false, langGo }: +{ lib, version, hostPlatform +, gnatboot ? null +, langAda ? false +, langJava ? false +, langGo }: assert langJava -> lib.versionOlder version "7"; +assert langAda -> gnatboot != null; lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' export NIX_LDFLAGS=`echo $NIX_LDFLAGS | sed -e s~$prefix/lib~$prefix/lib/amd64~g` @@ -9,4 +14,6 @@ lib.optionalString (hostPlatform.isSunOS && hostPlatform.is64bit) '' export CFLAGS_FOR_TARGET="-Wl,-rpath,$prefix/lib/amd64 $CFLAGS_FOR_TARGET" '' + lib.optionalString (lib.versionOlder version "7" && (langJava || langGo)) '' export lib=$out; +'' + lib.optionalString langAda '' + export PATH=${gnatboot}/bin:$PATH '' diff --git a/pkgs/development/compilers/gcc/gnat-cflags.patch b/pkgs/development/compilers/gcc/gnat-cflags.patch new file mode 100644 index 00000000000..a16266bbf39 --- /dev/null +++ b/pkgs/development/compilers/gcc/gnat-cflags.patch @@ -0,0 +1,35 @@ +diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in +index 4e74252bd74..0d848b5b4e3 100644 +--- a/gcc/ada/gcc-interface/Makefile.in ++++ b/gcc/ada/gcc-interface/Makefile.in +@@ -111,7 +111,7 @@ NO_OMIT_ADAFLAGS = -fno-omit-frame-pointer + NO_SIBLING_ADAFLAGS = -fno-optimize-sibling-calls + NO_REORDER_ADAFLAGS = -fno-toplevel-reorder + GNATLIBFLAGS = -W -Wall -gnatpg -nostdinc +-GNATLIBCFLAGS = -g -O2 ++GNATLIBCFLAGS = -g -O2 $(CFLAGS_FOR_TARGET) + # Pretend that _Unwind_GetIPInfo is available for the target by default. This + # should be autodetected during the configuration of libada and passed down to + # here, but we need something for --disable-libada and hope for the best. +@@ -198,7 +198,7 @@ RTSDIR = rts$(subst /,_,$(MULTISUBDIR)) + # Link flags used to build gnat tools. By default we prefer to statically + # link with libgcc to avoid a dependency on shared libgcc (which is tricky + # to deal with as it may conflict with the libgcc provided by the system). +-GCC_LINK_FLAGS=-static-libstdc++ -static-libgcc ++GCC_LINK_FLAGS=-static-libstdc++ -static-libgcc $(CFLAGS_FOR_TARGET) + + # End of variables for you to override. + +diff --git a/libada/Makefile.in b/libada/Makefile.in +index 522b9207326..ca866c74471 100644 +--- a/libada/Makefile.in ++++ b/libada/Makefile.in +@@ -59,7 +59,7 @@ LDFLAGS= + CFLAGS=-g + PICFLAG = @PICFLAG@ + GNATLIBFLAGS= -W -Wall -gnatpg -nostdinc +-GNATLIBCFLAGS= -g -O2 ++GNATLIBCFLAGS= -g -O2 $(CFLAGS) + GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) $(CFLAGS_FOR_TARGET) \ + -fexceptions -DIN_RTS @have_getipinfo@ @have_capability@ + diff --git a/pkgs/development/compilers/gnatboot/default.nix b/pkgs/development/compilers/gnatboot/default.nix new file mode 100644 index 00000000000..cb643d6123a --- /dev/null +++ b/pkgs/development/compilers/gnatboot/default.nix @@ -0,0 +1,51 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + pname = "gentoo-gnatboot"; + version = "4.1"; + + src = if stdenv.system == "i686-linux" then + fetchurl { + url = mirror://gentoo/distfiles/gnatboot-4.1-i386.tar.bz2; + sha256 = "0665zk71598204bf521vw68i5y6ccqarq9fcxsqp7ccgycb4lysr"; + } + else if stdenv.system == "x86_64-linux" then + fetchurl { + url = mirror://gentoo/distfiles/gnatboot-4.1-amd64.tar.bz2; + sha256 = "1li4d52lmbnfs6llcshlbqyik2q2q4bvpir0f7n38nagp0h6j0d4"; + } + else + throw "Platform not supported"; + + dontStrip = 1; + + installPhase = '' + mkdir -p $out + cp -R * $out + + set +e + for a in $out/bin/* ; do + patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath $(cat $NIX_CC/nix-support/orig-libc)/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib64:$(cat $NIX_CC/nix-support/orig-cc)/lib $a + done + set -e + + mv $out/bin/gnatgcc_2wrap $out/bin/gnatgcc + ln -s $out/bin/gnatgcc $out/bin/gcc + ''; + + passthru = { + langC = true; # TRICK for gcc-wrapper to wrap it + langCC = false; + langFortran = false; + langAda = true; + }; + + meta = with stdenv.lib; { + homepage = "https://gentoo.org"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.lucus16 ]; + + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1fc209f44bb..a869ce066bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8396,6 +8396,28 @@ in inherit (gnome2) libart_lgpl; }); + gnat = gnat9; + + gnat6 = wrapCC (gcc6.cc.override { + name = "gnat"; + langC = true; + langCC = false; + langAda = true; + profiledCompiler = false; + inherit gnatboot; + }); + + gnat9 = wrapCC (gcc9.cc.override { + name = "gnat"; + langC = true; + langCC = false; + langAda = true; + profiledCompiler = false; + gnatboot = gnat6; + }); + + gnatboot = wrapCC (callPackage ../development/compilers/gnatboot { }); + gnu-smalltalk = callPackage ../development/compilers/gnu-smalltalk { }; gccgo = gccgo6; -- cgit v1.2.3 From b674acee6ef4e24dd14f7dc63b380b94c4ccd19d Mon Sep 17 00:00:00 2001 From: Lars Jellema Date: Sun, 2 Jun 2019 23:40:01 +0200 Subject: ghdl: init at 0.37 --- pkgs/development/compilers/ghdl/default.nix | 40 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 10 ++++++++ 2 files changed, 50 insertions(+) create mode 100644 pkgs/development/compilers/ghdl/default.nix diff --git a/pkgs/development/compilers/ghdl/default.nix b/pkgs/development/compilers/ghdl/default.nix new file mode 100644 index 00000000000..6d1fae33734 --- /dev/null +++ b/pkgs/development/compilers/ghdl/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, gnat, zlib, llvm, lib +, backend ? "mcode" }: + +assert backend == "mcode" || backend == "llvm"; + +stdenv.mkDerivation rec { + pname = "ghdl-${backend}"; + version = "0.37"; + + src = fetchFromGitHub { + owner = "ghdl"; + repo = "ghdl"; + rev = "v${version}"; + sha256 = "0b53yl4im33c1cd4mdyc4ks9cmrpixym17gzchfmplrl22w3l17y"; + }; + + LIBRARY_PATH = "${stdenv.cc.libc}/lib"; + + buildInputs = [ gnat zlib ]; + + preConfigure = '' + # If llvm 7.0 works, 7.x releases should work too. + sed -i 's/check_version 7.0/check_version 7/g' configure + ''; + + configureFlags = lib.optional (backend == "llvm") + "--with-llvm-config=${llvm}/bin/llvm-config"; + + hardeningDisable = [ "format" ]; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://github.com/ghdl/ghdl"; + description = "VHDL 2008/93/87 simulator"; + maintainers = with maintainers; [ lucus16 ]; + platforms = platforms.linux; + license = licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a869ce066bf..e2c0391d0a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8429,6 +8429,16 @@ in profiledCompiler = false; }); + ghdl = ghdl-mcode; + + ghdl-mcode = callPackage ../development/compilers/ghdl { + backend = "mcode"; + }; + + ghdl-llvm = callPackage ../development/compilers/ghdl { + backend = "llvm"; + }; + gcl = callPackage ../development/compilers/gcl { gmp = gmp4; }; -- cgit v1.2.3 From b4a2ec0dc67e4af8b489aaacb5d04884bb3fe4fa Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Wed, 15 Apr 2020 15:20:46 +0800 Subject: sn0int: init at 0.18.2 --- pkgs/tools/security/sn0int/default.nix | 32 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/security/sn0int/default.nix diff --git a/pkgs/tools/security/sn0int/default.nix b/pkgs/tools/security/sn0int/default.nix new file mode 100644 index 00000000000..9e9cbe2bb3a --- /dev/null +++ b/pkgs/tools/security/sn0int/default.nix @@ -0,0 +1,32 @@ +{ lib, fetchFromGitHub, rustPlatform, + libsodium, libseccomp, sqlite, pkgconfig }: + +rustPlatform.buildRustPackage rec { + pname = "sn0int"; + version = "0.18.2"; + + src = fetchFromGitHub { + owner = "kpcyrd"; + repo = pname; + rev = "v${version}"; + sha256 = "0b21b0ryq03zrhqailg2iajirn30l358aj3k44lfnravr4h9zwkj"; + }; + + cargoSha256 = "1pvn0sc325b5fh29m2l6cack4qfssa4lp3zhyb1qzkb3fmw3lgcy"; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ libsodium libseccomp sqlite ]; + + # One of the dependencies (chrootable-https) tries to read "/etc/resolv.conf" + # in "checkPhase", hence fails in sandbox of "nix". + doCheck = false; + + meta = with lib; { + description = "Semi-automatic OSINT framework and package manager"; + homepage = "https://github.com/kpcyrd/sn0int"; + license = licenses.gpl3; + maintainers = with maintainers; [ xrelkd ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 26037d86c63..62967cdb946 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6625,6 +6625,8 @@ in smugline = python3Packages.smugline; + sn0int = callPackage ../tools/security/sn0int { }; + snabb = callPackage ../tools/networking/snabb { } ; snapcast = callPackage ../applications/audio/snapcast { }; -- cgit v1.2.3 From 3a7dca9950e62aab97c3d9a56dbf1ac3eee7522c Mon Sep 17 00:00:00 2001 From: Sirio Balmelli Date: Mon, 20 Apr 2020 15:27:28 +0200 Subject: mscgen: clean up build 1. Remove freetype dependency: - was not being used by build - trying to enable freetype gives nontrivial error 'gdoTextWidth: Problem doing text layout (GDFONTPATH=)' 2. Correctly link manpages by specifying 'outputs'. 3. Separate nativeBuildInputs from buildInputs Signed-off-by: Sirio Balmelli --- pkgs/tools/graphics/mscgen/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix index a8aa9cffb98..f6bec5983c2 100644 --- a/pkgs/tools/graphics/mscgen/default.nix +++ b/pkgs/tools/graphics/mscgen/default.nix @@ -2,7 +2,6 @@ , bison , fetchurl , flex -, freetype , gd , libjpeg , libpng @@ -24,13 +23,16 @@ stdenv.mkDerivation { sha256 = "3c3481ae0599e1c2d30b7ed54ab45249127533ab2f20e768a0ae58d8551ddc23"; }; - buildInputs = [ bison flex freetype gd libjpeg libpng libwebp pkg-config zlib ]; + nativeBuildInputs = [ bison flex pkg-config ]; + buildInputs = [ gd libjpeg libpng libwebp zlib ]; doCheck = true; preCheck = '' sed -i -e "s|#!/bin/bash|#!${runtimeShell}|" test/renderercheck.sh ''; + outputs = [ "out" "man" ]; + meta = { homepage = "http://www.mcternan.me.uk/mscgen/"; description = "Convert Message Sequence Chart descriptions into PNG, SVG, or EPS images"; -- cgit v1.2.3 From 4307923b86cb7764a3a6709cebcfdf934e85d5ba Mon Sep 17 00:00:00 2001 From: kraem Date: Mon, 20 Apr 2020 00:23:41 +0200 Subject: linux: 5.6.4 -> 5.6.5 --- pkgs/os-specific/linux/kernel/linux-5.6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.6.nix b/pkgs/os-specific/linux/kernel/linux-5.6.nix index 950c60ac268..d3334293dc1 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.6.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.6.4"; + version = "5.6.5"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "14cxbc9xi4s3xwx4yb1yd4z0kidsk3d443skf5sgmdhcalg79wax"; + sha256 = "1rjjkcmzsj9azggh960qnk2x44ns475b8nbd4nxazrz1rgdx76zp"; }; } // (args.argsOverride or {})) -- cgit v1.2.3 From 8879086cfc78e192f4ca5f3f212dfda264c5381a Mon Sep 17 00:00:00 2001 From: kraem Date: Mon, 20 Apr 2020 01:01:11 +0200 Subject: linux: 5.5.17 -> 5.5.18 --- pkgs/os-specific/linux/kernel/linux-5.5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.5.nix b/pkgs/os-specific/linux/kernel/linux-5.5.nix index c4fbe1aea5e..ecb92b5bfe7 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.5.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.5.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.5.17"; + version = "5.5.18"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "06aqhlysa7zdj6c69hyii3hfqlfa9751ivga38rbqw1lr2gbbnj0"; + sha256 = "01iiiq4dsyyc5y6b52wax9as6dzhdi172vd1423sc1yp4rrk8178"; }; } // (args.argsOverride or {})) -- cgit v1.2.3 From eb41f8122e394d77993524f1fa485d1b09cbefaa Mon Sep 17 00:00:00 2001 From: kraem Date: Mon, 20 Apr 2020 01:01:32 +0200 Subject: linux/hardened-patches/5.6.4: remove --- pkgs/os-specific/linux/kernel/hardened-patches.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened-patches.json b/pkgs/os-specific/linux/kernel/hardened-patches.json index 24c44dd1ed1..f334e75d070 100644 --- a/pkgs/os-specific/linux/kernel/hardened-patches.json +++ b/pkgs/os-specific/linux/kernel/hardened-patches.json @@ -18,10 +18,5 @@ "sha256": "1lms090kkk4vlvfssqsm7r3j88hlf8smrnpcgq24v9rq9pbr0fyw", "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.5.17.a/linux-hardened-5.5.17.a.patch", "version_suffix": "a" - }, - "5.6.4": { - "sha256": "05wkzh7927n71x4cl69mclc44grqpnx6i65hli470q1rg1qrk26n", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.4.a/linux-hardened-5.6.4.a.patch", - "version_suffix": "a" } } -- cgit v1.2.3 From e7a65e6c411926700fad23c4f8ec2b087d9dc414 Mon Sep 17 00:00:00 2001 From: kraem Date: Mon, 20 Apr 2020 01:01:32 +0200 Subject: linux/hardened-patches/5.5.17: remove --- pkgs/os-specific/linux/kernel/hardened-patches.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened-patches.json b/pkgs/os-specific/linux/kernel/hardened-patches.json index f334e75d070..a0042ad7953 100644 --- a/pkgs/os-specific/linux/kernel/hardened-patches.json +++ b/pkgs/os-specific/linux/kernel/hardened-patches.json @@ -13,10 +13,5 @@ "sha256": "154iz7i9l0hihjrmfk6rjh7hhqwyhsdjr2c74m3dhadrlm5hwy89", "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.32.a/linux-hardened-5.4.32.a.patch", "version_suffix": "NixOS-a" - }, - "5.5.17": { - "sha256": "1lms090kkk4vlvfssqsm7r3j88hlf8smrnpcgq24v9rq9pbr0fyw", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.5.17.a/linux-hardened-5.5.17.a.patch", - "version_suffix": "a" } } -- cgit v1.2.3 From 0fd9293703654eb271ad7baf7c4fa7b7043af8dd Mon Sep 17 00:00:00 2001 From: kraem Date: Mon, 20 Apr 2020 01:01:39 +0200 Subject: linux/hardened-patches/5.6.5: init at 5.6.5.a --- pkgs/os-specific/linux/kernel/hardened-patches.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/hardened-patches.json b/pkgs/os-specific/linux/kernel/hardened-patches.json index a0042ad7953..45d95ba3ec4 100644 --- a/pkgs/os-specific/linux/kernel/hardened-patches.json +++ b/pkgs/os-specific/linux/kernel/hardened-patches.json @@ -13,5 +13,10 @@ "sha256": "154iz7i9l0hihjrmfk6rjh7hhqwyhsdjr2c74m3dhadrlm5hwy89", "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.32.a/linux-hardened-5.4.32.a.patch", "version_suffix": "NixOS-a" + }, + "5.6.5": { + "sha256": "19cdpygm5zx3szxl456lfjg5sffqcmn18470wv7prm8rf6liqdj3", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.5.a/linux-hardened-5.6.5.a.patch", + "version_suffix": "a" } } -- cgit v1.2.3 From 48d908b731c954bc6ad2c032dcd090d40b1d2121 Mon Sep 17 00:00:00 2001 From: kraem Date: Mon, 20 Apr 2020 01:01:45 +0200 Subject: linux/hardened-patches/5.5.18: init at 5.5.18.a --- pkgs/os-specific/linux/kernel/hardened-patches.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/hardened-patches.json b/pkgs/os-specific/linux/kernel/hardened-patches.json index 45d95ba3ec4..464e83c1dee 100644 --- a/pkgs/os-specific/linux/kernel/hardened-patches.json +++ b/pkgs/os-specific/linux/kernel/hardened-patches.json @@ -14,6 +14,11 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.32.a/linux-hardened-5.4.32.a.patch", "version_suffix": "NixOS-a" }, + "5.5.18": { + "sha256": "0v7vla784sf1fk6d8qa5x8hkyhjb1jkw4lxxcgvvlqbmxl8md8ld", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.5.18.a/linux-hardened-5.5.18.a.patch", + "version_suffix": "a" + }, "5.6.5": { "sha256": "19cdpygm5zx3szxl456lfjg5sffqcmn18470wv7prm8rf6liqdj3", "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.5.a/linux-hardened-5.6.5.a.patch", -- cgit v1.2.3 From 45343beffee8238973060aff1f5472b915a0288b Mon Sep 17 00:00:00 2001 From: kraem Date: Mon, 20 Apr 2020 01:01:50 +0200 Subject: linux/hardened-patches/5.4.33: 5.4.33.NixOS-a -> 5.4.33.a --- pkgs/os-specific/linux/kernel/hardened-patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened-patches.json b/pkgs/os-specific/linux/kernel/hardened-patches.json index 464e83c1dee..896f574a5b2 100644 --- a/pkgs/os-specific/linux/kernel/hardened-patches.json +++ b/pkgs/os-specific/linux/kernel/hardened-patches.json @@ -10,9 +10,9 @@ "version_suffix": "NixOS-a" }, "5.4.33": { - "sha256": "154iz7i9l0hihjrmfk6rjh7hhqwyhsdjr2c74m3dhadrlm5hwy89", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.32.a/linux-hardened-5.4.32.a.patch", - "version_suffix": "NixOS-a" + "sha256": "1hjfvhyvz5kyvx25809brhsvfv9mjv9q1mw6ydb71gfwhw6q8d8b", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.33.a/linux-hardened-5.4.33.a.patch", + "version_suffix": "a" }, "5.5.18": { "sha256": "0v7vla784sf1fk6d8qa5x8hkyhjb1jkw4lxxcgvvlqbmxl8md8ld", -- cgit v1.2.3 From 523fe988217eaa56952c2a87760fef612c857bee Mon Sep 17 00:00:00 2001 From: kraem Date: Mon, 20 Apr 2020 01:01:56 +0200 Subject: linux/hardened-patches/4.19.116: 4.19.116.NixOS-a -> 4.19.116.a --- pkgs/os-specific/linux/kernel/hardened-patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened-patches.json b/pkgs/os-specific/linux/kernel/hardened-patches.json index 896f574a5b2..97fbbb405e3 100644 --- a/pkgs/os-specific/linux/kernel/hardened-patches.json +++ b/pkgs/os-specific/linux/kernel/hardened-patches.json @@ -5,9 +5,9 @@ "version_suffix": "a" }, "4.19.116": { - "sha256": "1f54g0xw708kxha07nsb979h5vwxjrkbwa5h04zny2kq702x1h13", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.115.a/linux-hardened-4.19.115.a.patch", - "version_suffix": "NixOS-a" + "sha256": "00y4i905gzs9w9kckrn1frh2vw32fsndz03g2psl1gk17snc3q7c", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.116.a/linux-hardened-4.19.116.a.patch", + "version_suffix": "a" }, "5.4.33": { "sha256": "1hjfvhyvz5kyvx25809brhsvfv9mjv9q1mw6ydb71gfwhw6q8d8b", -- cgit v1.2.3 From ecfb4aefb5e51483dd1ad6a0e9f8043a5c90533c Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Mon, 20 Apr 2020 16:15:15 +0200 Subject: perlPackages.MojoliciousPluginTextExceptions: init at 0.01 --- pkgs/top-level/perl-packages.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d3e9ca144fc..82321f46559 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12251,6 +12251,22 @@ let }; }; + MojoliciousPluginTextExceptions = buildPerlPackage { + pname = "Mojolicious-Plugin-TextExceptions"; + version = "0.01"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MR/MRAMBERG/Mojolicious-Plugin-TextExceptions-0.01.tar.gz"; + sha256 = "070daf284c5d3832b7fde42120eaf747aea4cc75de8ff807f77accc84fe4f22e"; + }; + propagatedBuildInputs = [ Mojolicious ]; + meta = { + homepage = "https://github.com/marcusramberg/mojolicious-plugin-textexceptions"; + description = "Render exceptions as text in command line user agents"; + license = stdenv.lib.licenses.artistic2; + maintainers = [ maintainers.sgo ]; + }; + }; + MojoRedis = buildPerlPackage { pname = "Mojo-Redis"; version = "3.24"; -- cgit v1.2.3 From 164dfe4b44de535b6674647255de25bfc6a6e8d1 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Mon, 20 Apr 2020 16:08:26 +0200 Subject: crystal: fixes for darwin --- pkgs/development/compilers/crystal/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 8f75692d883..a04d48dd0e5 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, fetchurl, makeWrapper -, coreutils, git, gmp, nettools, openssl, readline, tzdata, libxml2, libyaml +, coreutils, git, gmp, hostname, openssl, readline, tzdata, libxml2, libyaml , boehmgc, libatomic_ops, pcre, libevent, libiconv, llvm, clang, which, zlib, pkgconfig , callPackage }: @@ -62,9 +62,12 @@ let substituteInPlace src/crystal/system/unix/time.cr \ --replace /usr/share/zoneinfo ${tzdata}/share/zoneinfo - ln -s spec/compiler spec/std + ln -sf spec/compiler spec/std + + # Dirty fix for when no sandboxing is enabled + rm -rf /tmp/crystal + mkdir -p /tmp/crystal - mkdir /tmp/crystal substituteInPlace spec/std/file_spec.cr \ --replace '/bin/ls' '${coreutils}/bin/ls' \ --replace '/usr/share' '/tmp/crystal' \ @@ -81,7 +84,7 @@ let --replace '{% if flag?(:gnu) %}"listen: "{% else %}"bind: "{% end %}' '"bind: "' substituteInPlace spec/std/system_spec.cr \ - --replace '`hostname`' '`${nettools}/bin/hostname`' + --replace '`hostname`' '`${hostname}/bin/hostname`' # See https://github.com/crystal-lang/crystal/pull/8640 substituteInPlace spec/std/http/cookie_spec.cr \ -- cgit v1.2.3 From c45295d47e91fef3fdb13ee11fc24ebff8ad7288 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 20 Apr 2020 09:57:17 -0500 Subject: nixos/nixos-generate-config.pl: use modulesPath instead of MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For imports, it is better to use ‘modulesPath’ than rely on being correctly set. Some users may not have set correctly. In addition, when ‘pure-eval=true’, is unset. --- nixos/modules/installer/tools/nixos-generate-config.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index a32c19a4eba..422c405054d 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -180,7 +180,7 @@ sub pciCheck { ) ) { # we need e.g. brcmfmac43602-pcie.bin - push @imports, ""; + push @imports, "(modulesPath + \"/hardware/network/broadcom-43xx.nix\")"; } # Can't rely on $module here, since the module may not be loaded @@ -279,7 +279,7 @@ if ($virt eq "oracle") { # Likewise for QEMU. if ($virt eq "qemu" || $virt eq "kvm" || $virt eq "bochs") { - push @imports, ""; + push @imports, "(modulesPath + \"/profiles/qemu-guest.nix\")"; } # Also for Hyper-V. @@ -296,7 +296,7 @@ if ($virt eq "systemd-nspawn") { # Provide firmware for devices that are not detected by this script, # unless we're in a VM/container. -push @imports, "" +push @imports, "(modulesPath + \"/installer/scan/not-detected.nix\")" if $virt eq "none"; @@ -549,7 +549,7 @@ my $hwConfig = < Date: Mon, 20 Apr 2020 16:59:16 +0200 Subject: vscode, vscodium: 1.44.1 -> 1.44.2 --- pkgs/applications/editors/vscode/vscode.nix | 6 +++--- pkgs/applications/editors/vscode/vscodium.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index d9a942328a3..371adc36789 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "15jg39hmlnicq0zrz77yar1bmn5y6gp2670dya2qm5klhva9hd0f"; - x86_64-darwin = "1ghqhn46jpbj3is8q5zcj0biyc7gwinhiz3qdpcnf88ga2blcsz8"; + x86_64-linux = "1n083pzp2dsz6z6rcl1ldcwhd4i03sjigdfslfardhc4v5lbvmv8"; + x86_64-darwin = "1qk3gscyskf4fwc8i09afr3wsyd1lwwycx6rf02wwh4n9py50b20"; }.${system}; in callPackage ./generic.nix rec { @@ -21,7 +21,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.44.1"; + version = "1.44.2"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 63e6cc920bf..fe96223b65f 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "16qwhnxpwarnwvlxwvy13g687g1cnfzysq16qkykkhqig0cnalmb"; - x86_64-darwin = "1p9qkbj59bfc0kn9fzg99gqxbzwxq297qxivxcjflsapd712s4vm"; + x86_64-linux = "141hwj1a2bsgzpfk354dnnmg4ak00fss3xsgqplyk949pbk6v1af"; + x86_64-darwin = "0fi8nz1gayzw5dp6d3m7jsmij3jj4yjg5rk1s9w6falpgka76dm1"; }.${system}; sourceRoot = { @@ -27,7 +27,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.44.1"; + version = "1.44.2"; pname = "vscodium"; executableName = "codium"; -- cgit v1.2.3 From f9fbc9b11887ff8a3e043fb200a5abff4b86d16c Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 20 Apr 2020 15:09:15 +0000 Subject: hydrogen-unstable: init at 1.0.0-beta2 (#85454) --- pkgs/applications/audio/hydrogen/unstable.nix | 34 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 35 insertions(+) create mode 100644 pkgs/applications/audio/hydrogen/unstable.nix diff --git a/pkgs/applications/audio/hydrogen/unstable.nix b/pkgs/applications/audio/hydrogen/unstable.nix new file mode 100644 index 00000000000..2f220f8d31a --- /dev/null +++ b/pkgs/applications/audio/hydrogen/unstable.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, wrapQtAppsHook +, alsaLib, ladspa-sdk, lash, libarchive, libjack2, liblo, libpulseaudio, libsndfile, lrdf +, qtbase, qttools, qtxmlpatterns +}: + +stdenv.mkDerivation rec { + pname = "hydrogen"; + version = "1.0.0-beta2"; + + src = fetchFromGitHub { + owner = "hydrogen-music"; + repo = pname; + rev = version; + sha256 = "1s3jrdyjpm92flw9mkkxchnj0wz8nn1y1kifii8ws252iiqjya4a"; + }; + + nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; + buildInputs = [ + alsaLib ladspa-sdk lash libarchive libjack2 liblo libpulseaudio libsndfile lrdf + qtbase qttools qtxmlpatterns + ]; + + cmakeFlags = [ + "-DWANT_DEBUG=OFF" + ]; + + meta = with stdenv.lib; { + description = "Advanced drum machine"; + homepage = "http://www.hydrogen-music.org"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ goibhniu orivej ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 289c50ccb37..c1ce5ffe4fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19858,6 +19858,7 @@ in hugo = callPackage ../applications/misc/hugo { }; hydrogen = callPackage ../applications/audio/hydrogen { }; + hydrogen-unstable = qt5.callPackage ../applications/audio/hydrogen/unstable.nix { }; hydroxide = callPackage ../applications/networking/hydroxide { }; -- cgit v1.2.3 From dc28779cee5b9ee8fda624632b0f9d5f4381930d Mon Sep 17 00:00:00 2001 From: misuzu Date: Mon, 20 Apr 2020 18:12:02 +0300 Subject: kmon: 1.0.1 -> 1.1.0 --- pkgs/tools/system/kmon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/kmon/default.nix b/pkgs/tools/system/kmon/default.nix index c1e511fa0c2..1a4cdb9acdf 100644 --- a/pkgs/tools/system/kmon/default.nix +++ b/pkgs/tools/system/kmon/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kmon"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "0kmkcs13cccmjjfbl25bs3m54zcjcs38fiv84q0vy09a4dnx3gn8"; + sha256 = "0lpwp5fzlf037bn03x1dldw8nfa5pyqi4qsqbscwn42idvs94mhx"; }; - cargoSha256 = "0l1yq9k6lyk0ww1nzk93axylgrwipkmmqh9r6fq4a31wjlblrkkb"; + cargoSha256 = "1g5k6dkv0zznh8q359n7sg9wf0gcix6m36pg9ql8wi5hnlsvg1s1"; nativeBuildInputs = [ python3 ]; -- cgit v1.2.3 From 6380be302a5da1f5200968cd358e93fa64cdc996 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 20 Apr 2020 11:52:57 -0400 Subject: rl-2003: release date --- nixos/doc/manual/release-notes/rl-2003.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index 0c12a797aa3..507f47aa3d1 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -3,7 +3,7 @@ xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="sec-release-20.03"> - Release 20.03 (“Markhor”, 2020.03/??) + Release 20.03 (“Markhor”, 2020.04/20)
Date: Mon, 20 Apr 2020 19:15:05 +0300 Subject: procs: 0.9.20 -> 0.10.0 --- pkgs/tools/admin/procs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index db6f27a3010..180764bd8c9 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.9.20"; + version = "0.10.0"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "00qqn8nwv791bs88n302hy67dpas5hcacnkakn7law567klnzxfz"; + sha256 = "1bgsxvb9wxi4sz8jfamhdwaq9f2q2k7c3cdkk60k86mkmas8ibxz"; }; - cargoSha256 = "09ib1nlqhzq3mc5wc16mgqbyr652asrwdpbwaax54fm1gd334prl"; + cargoSha256 = "0zf41clf3rqxmal894gqp9fn9bnas99wna13fc43fxdlvh92v4yh"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { description = "A modern replacement for ps written in Rust"; homepage = "https://github.com/dalance/procs"; license = licenses.mit; - maintainers = with maintainers; [ dalance filalex77 ]; + maintainers = with maintainers; [ dalance filalex77 ]; platforms = with platforms; linux ++ darwin; }; } -- cgit v1.2.3 From 015f46beba0d753572f617951a295fa134d7a6f5 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 20 Apr 2020 13:53:29 -0500 Subject: numpy: set lapack,blas library names correctly --- pkgs/development/python-modules/numpy/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 949d5e5898b..7009d1d1cd0 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -21,9 +21,7 @@ let ${blas.implementation} = { include_dirs = "${blas}/include:${lapack}/include"; library_dirs = "${blas}/lib:${lapack}/lib"; - } // lib.optionalAttrs (blas.implementation == "mkl") { - mkl_libs = "mkl_rt"; - lapack_libs = ""; + libraries = "lapack,lapacke,blas,cblas"; }; }); }; -- cgit v1.2.3 From 382247d133351767588bfda094c1d77cbe26ab04 Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Mon, 20 Apr 2020 20:54:49 +0200 Subject: dwm-status: 1.6.3 -> 1.6.4 --- pkgs/applications/window-managers/dwm/dwm-status.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix index 01887b3bcf1..568258ee2c4 100644 --- a/pkgs/applications/window-managers/dwm/dwm-status.nix +++ b/pkgs/applications/window-managers/dwm/dwm-status.nix @@ -9,19 +9,19 @@ in rustPlatform.buildRustPackage rec { pname = "dwm-status"; - version = "1.6.3"; + version = "1.6.4"; src = fetchFromGitHub { owner = "Gerschtli"; repo = "dwm-status"; rev = version; - sha256 = "02sprsr7822ynkwpf3xdgmkdrgkw3vgijhlh65bayiv3b5lwb54n"; + sha256 = "05dhd2gy7ysrnchdimrdd7jvzs1db9fyrk4ci7850jhrgavfd7c4"; }; nativeBuildInputs = [ makeWrapper pkgconfig ]; buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ]; - cargoSha256 = "0xybd6110b29ghl66kxfs64704qlhnn9jb5vl7lfk9sv62cs564i"; + cargoSha256 = "0zkbps8vsjcvy7x0sgb07kacszi57dlyq8j6ia6yy0jyqnvlaqa7"; postInstall = lib.optionalString (bins != []) '' wrapProgram $out/bin/dwm-status --prefix "PATH" : "${stdenv.lib.makeBinPath bins}" -- cgit v1.2.3 From cdc8f3f3575f39849b09c741f0f269f33c0e7088 Mon Sep 17 00:00:00 2001 From: "D. Guthrie" Date: Mon, 20 Apr 2020 21:34:39 +0100 Subject: Bump package version to 20200215 The actual most recent version is 20200215, so update the package version to this. Furthermore, update the patch accordingly so it still builds. This adds back the reallocarray.c file. --- .../applications/editors/mg/darwin_no_libbsd.patch | 2563 +++++++++++++++++++- pkgs/applications/editors/mg/default.nix | 12 +- 2 files changed, 2472 insertions(+), 103 deletions(-) diff --git a/pkgs/applications/editors/mg/darwin_no_libbsd.patch b/pkgs/applications/editors/mg/darwin_no_libbsd.patch index 9b6df622324..2484c03255b 100644 --- a/pkgs/applications/editors/mg/darwin_no_libbsd.patch +++ b/pkgs/applications/editors/mg/darwin_no_libbsd.patch @@ -1,6 +1,6 @@ diff -Naur a/GNUmakefile b/GNUmakefile ---- a/GNUmakefile 2020-02-01 21:23:32.000000000 +0000 -+++ b/GNUmakefile 2020-02-01 21:56:01.000000000 +0000 +--- a/GNUmakefile 2020-04-20 21:09:41.000000000 +0100 ++++ b/GNUmakefile 2020-04-20 21:31:19.000000000 +0100 @@ -18,7 +18,7 @@ STRIP= /usr/bin/strip @@ -10,20 +10,16 @@ diff -Naur a/GNUmakefile b/GNUmakefile BSD_CPPFLAGS:= BSD_LIBS:= -lutil else -@@ -35,11 +35,7 @@ +@@ -38,24 +38,21 @@ + $(error You probably need to install "libncurses5-dev" or "libncurses6-devel" or something like that.) + endif - CURSES_LIBS:= $(shell $(PKG_CONFIG) --libs ncurses) - ifeq ($(CURSES_LIBS),) -- $(error You probably need to install "libncurses5-dev" or "libncurses6-devel" or something like that.) --endif -- -ifdef STATIC - LDFLAGS=-static -static-libgcc -+ $(error You probably need to install "libncurses5-dev" or "libnnurses6-devel" or something like that.) - endif - +-endif +- CC?= gcc -@@ -47,14 +43,14 @@ + CFLAGS?= -O2 -pipe CFLAGS+= -g -Wall CPPFLAGS= -DREGEX CPPFLAGS+= -D_GNU_SOURCE @@ -33,25 +29,121 @@ diff -Naur a/GNUmakefile b/GNUmakefile OBJS= autoexec.o basic.o bell.o buffer.o cinfo.o dir.o display.o \ -- echo.o extend.o file.o fileio.o funmap.o help.o kbd.o keymap.o \ -+ echo.o extend.o file.o fileio.o funmap.o futimens.o help.o kbd.o keymap.o \ - line.o macro.o main.o match.o modes.o paragraph.o \ +- echo.o extend.o file.o fileio.o funmap.o interpreter.o help.o \ +- kbd.o keymap.o line.o macro.o main.o match.o modes.o paragraph.o \ - re_search.o region.o search.o spawn.o tty.o ttyio.o ttykbd.o \ -+ re_search.o reallocarray.o region.o search.o spawn.o strtonum.o tty.o ttyio.o ttykbd.o \ - undo.o util.o version.o window.o word.o yank.o +- undo.o util.o version.o window.o word.o yank.o ++ echo.o extend.o file.o fileio.o funmap.o futimens.o interpreter.o \ ++ help.o kbd.o keymap.o line.o macro.o main.o match.o modes.o \ ++ paragraph.o re_search.o reallocarray.o region.o search.o spawn.o \ ++ strtonum.o tty.o ttyio.o ttykbd.o undo.o util.o version.o window.o \ ++ word.o yank.o OBJS+= cmode.o cscope.o dired.o grep.o tags.o -@@ -68,6 +64,7 @@ - - all: $(name) - -+ - $(name): $(OBJS) - $(CC) $(LDFLAGS) $(OBJS) -o $(name) $(LIBS) +diff -Naur a/GNUmakefile~ b/GNUmakefile~ +--- a/GNUmakefile~ 1970-01-01 01:00:00.000000000 +0100 ++++ b/GNUmakefile~ 2020-04-20 21:27:39.000000000 +0100 +@@ -0,0 +1,96 @@ ++# Makefile for mg ++ ++# This Makefile has been written by Han Boetes ++# and is released in Public Domain. ++ ++# *sigh* Those debian folks are really tidy on their licenses. ++ ++name= mg ++ ++prefix= /usr/local ++bindir= $(prefix)/bin ++libdir= $(prefix)/lib ++includedir= $(prefix)/include ++mandir= $(prefix)/man ++ ++PKG_CONFIG= /usr/bin/pkg-config --silence-errors ++INSTALL= /usr/bin/install ++STRIP= /usr/bin/strip ++ ++UNAME:= $(shell uname) ++ifeq ($(UNAME),FreeBSD) ++ BSD_CPPFLAGS:= ++ BSD_LIBS:= -lutil ++else ++ BSD_CPPFLAGS:= $(shell $(PKG_CONFIG) --cflags libbsd-overlay) ++ BSD_LIBS:= $(shell $(PKG_CONFIG) --libs libbsd-overlay) ++endif ++ ++# Test is some required libraries are installed. Rather bummer that ++# they are also required to run make clean or uninstall. Oh well... Who ++# does that? ++ifeq ($(BSD_LIBS),) ++ $(error You probably need to install "libbsd-dev" or "libbsd-devel" or something like that.) ++endif ++ ++CURSES_LIBS:= $(shell $(PKG_CONFIG) --libs ncurses) ++ifeq ($(CURSES_LIBS),) ++ $(error You probably need to install "libncurses5-dev" or "libncurses6-devel" or something like that.) ++endif ++ ++ifdef STATIC ++ LDFLAGS=-static -static-libgcc ++endif ++ ++CC?= gcc ++CFLAGS?= -O2 -pipe ++CFLAGS+= -g -Wall ++CPPFLAGS= -DREGEX ++CPPFLAGS+= -D_GNU_SOURCE ++CPPFLAGS+= $(BSD_CPPFLAGS) ++LIBS= $(CURSES_LIBS) $(BSD_LIBS) ++ ++ ++OBJS= autoexec.o basic.o bell.o buffer.o cinfo.o dir.o display.o \ ++ echo.o extend.o file.o fileio.o funmap.o interpreter.o help.o \ ++ kbd.o keymap.o line.o macro.o main.o match.o modes.o paragraph.o \ ++ re_search.o region.o search.o spawn.o tty.o ttyio.o ttykbd.o \ ++ undo.o util.o version.o window.o word.o yank.o ++OBJS+= cmode.o cscope.o dired.o grep.o tags.o ++ ++ ++# Portability stuff. ++CFLAGS+= -Wno-strict-aliasing -Wno-deprecated-declarations ++EXE_EXT= ++ ++.c.o: ++ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< ++ ++all: $(name) ++ ++$(name): $(OBJS) ++ $(CC) $(LDFLAGS) $(OBJS) -o $(name) $(LIBS) ++ ++distclean: clean ++ -rm -f *.core core.* ++ ++clean: ++ -rm -f *.o $(name)$(EXE_EXT) ++ ++ ++install: $(name) $(name).1 ++ $(INSTALL) -d $(DESTDIR)$(bindir) ++ $(INSTALL) -d $(DESTDIR)$(mandir)/man1 ++ $(INSTALL) -m 755 $(name) $(DESTDIR)$(bindir)/$(name) ++ $(INSTALL) -m 444 $(name).1 $(DESTDIR)$(mandir)/man1/$(name).1 ++ ++install-strip: install ++ $(STRIP) $(DESTDIR)$(bindir)/$(name) ++ ++uninstall: ++ rm -f \ ++ $(DESTDIR)$(bindir)/$(name)$(EXE_EXT) \ ++ $(DESTDIR)$(mandir)/man1/$(name).1 ++ ++rebuild: ++ make clean all diff -Naur a/_null.h b/_null.h --- a/_null.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/_null.h 2020-02-01 21:24:22.000000000 +0000 ++++ b/_null.h 2020-04-20 21:26:10.000000000 +0100 @@ -0,0 +1,18 @@ +/* $OpenBSD: _null.h,v 1.2 2016/09/09 22:07:58 millert Exp $ */ + @@ -73,7 +165,7 @@ diff -Naur a/_null.h b/_null.h +#endif diff -Naur a/apple.h b/apple.h --- a/apple.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/apple.h 2020-02-01 21:41:50.000000000 +0000 ++++ b/apple.h 2020-04-20 21:26:10.000000000 +0100 @@ -0,0 +1,27 @@ +/* + * Mac OS X-specific support. @@ -103,8 +195,8 @@ diff -Naur a/apple.h b/apple.h +extern void *reallocarray(void *, size_t, size_t); +extern int futimens(int, const struct timespec[2]); diff -Naur a/autoexec.c b/autoexec.c ---- a/autoexec.c 2020-02-01 21:23:32.000000000 +0000 -+++ b/autoexec.c 2020-02-01 21:34:02.000000000 +0000 +--- a/autoexec.c 2020-04-20 21:09:41.000000000 +0100 ++++ b/autoexec.c 2020-04-20 21:26:10.000000000 +0100 @@ -9,6 +9,9 @@ #include #include @@ -116,8 +208,8 @@ diff -Naur a/autoexec.c b/autoexec.c #include "funmap.h" diff -Naur a/basic.c b/basic.c ---- a/basic.c 2020-02-01 21:23:32.000000000 +0000 -+++ b/basic.c 2020-02-01 21:34:26.000000000 +0000 +--- a/basic.c 2020-04-20 21:09:41.000000000 +0100 ++++ b/basic.c 2020-04-20 21:26:10.000000000 +0100 @@ -19,6 +19,9 @@ #include #include @@ -127,10 +219,615 @@ diff -Naur a/basic.c b/basic.c +#endif #include "def.h" - /* + #define percint(n1, n2) ((n1 * (int) n2) * 0.1) +diff -Naur a/basic.c.orig b/basic.c.orig +--- a/basic.c.orig 1970-01-01 01:00:00.000000000 +0100 ++++ b/basic.c.orig 2020-04-20 21:26:06.000000000 +0100 +@@ -0,0 +1,601 @@ ++/* $OpenBSD: basic.c,v 1.49 2019/06/17 11:39:26 lum Exp $ */ ++ ++/* This file is in the public domain */ ++ ++/* ++ * Basic cursor motion commands. ++ * ++ * The routines in this file are the basic ++ * command functions for moving the cursor around on ++ * the screen, setting mark, and swapping dot with ++ * mark. Only moves between lines, which might make the ++ * current buffer framing bad, are hard. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "def.h" ++ ++#define percint(n1, n2) ((n1 * (int) n2) * 0.1) ++ ++/* ++ * Go to beginning of line. ++ */ ++/* ARGSUSED */ ++int ++gotobol(int f, int n) ++{ ++ if (n == 0) ++ return (TRUE); ++ ++ curwp->w_doto = 0; ++ return (TRUE); ++} ++ ++/* ++ * Move cursor backwards. Do the ++ * right thing if the count is less than ++ * 0. Error if you try to move back from ++ * the beginning of the buffer. ++ */ ++/* ARGSUSED */ ++int ++backchar(int f, int n) ++{ ++ struct line *lp; ++ ++ if (n < 0) ++ return (forwchar(f, -n)); ++ while (n--) { ++ if (curwp->w_doto == 0) { ++ if ((lp = lback(curwp->w_dotp)) == curbp->b_headp) { ++ if (!(f & FFRAND)) { ++ dobeep(); ++ ewprintf("Beginning of buffer"); ++ } ++ return (FALSE); ++ } ++ curwp->w_dotp = lp; ++ curwp->w_doto = llength(lp); ++ curwp->w_rflag |= WFMOVE; ++ curwp->w_dotline--; ++ } else ++ curwp->w_doto--; ++ } ++ return (TRUE); ++} ++ ++/* ++ * Go to end of line. ++ */ ++/* ARGSUSED */ ++int ++gotoeol(int f, int n) ++{ ++ if (n == 0) ++ return (TRUE); ++ ++ curwp->w_doto = llength(curwp->w_dotp); ++ return (TRUE); ++} ++ ++/* ++ * Move cursor forwards. Do the ++ * right thing if the count is less than ++ * 0. Error if you try to move forward ++ * from the end of the buffer. ++ */ ++/* ARGSUSED */ ++int ++forwchar(int f, int n) ++{ ++ if (n < 0) ++ return (backchar(f, -n)); ++ while (n--) { ++ if (curwp->w_doto == llength(curwp->w_dotp)) { ++ curwp->w_dotp = lforw(curwp->w_dotp); ++ if (curwp->w_dotp == curbp->b_headp) { ++ curwp->w_dotp = lback(curwp->w_dotp); ++ if (!(f & FFRAND)) { ++ dobeep(); ++ ewprintf("End of buffer"); ++ } ++ return (FALSE); ++ } ++ curwp->w_doto = 0; ++ curwp->w_dotline++; ++ curwp->w_rflag |= WFMOVE; ++ } else ++ curwp->w_doto++; ++ } ++ return (TRUE); ++} ++ ++/* ++ * Go to the beginning of the buffer. Setting WFFULL is conservative, ++ * but almost always the case. A universal argument of higher than 9 ++ * puts the cursor back to the end of buffer. ++ */ ++int ++gotobob(int f, int n) ++{ ++ if (!curwp->w_markp) ++ (void) setmark(f, n); ++ curwp->w_dotp = bfirstlp(curbp); ++ curwp->w_doto = 0; ++ curwp->w_rflag |= WFFULL; ++ curwp->w_dotline = 1; ++ if (f & FFOTHARG && n > 0) { ++ if (n > 9) ++ gotoeob(0, 0); ++ else ++ forwline(f, percint(curwp->w_bufp->b_lines, n) - 1); ++ } ++ return (TRUE); ++} ++ ++/* ++ * Go to the end of the buffer. Leave dot 3 lines from the bottom of the ++ * window if buffer length is longer than window length; same as emacs. ++ * Setting WFFULL is conservative, but almost always the case. A universal ++ * argument of higher than 9 puts the cursor back to the start of buffer. ++ */ ++int ++gotoeob(int f, int n) ++{ ++ int ln; ++ struct line *lp; ++ ++ if (!curwp->w_markp) ++ (void) setmark(f, n); ++ curwp->w_dotp = blastlp(curbp); ++ curwp->w_doto = llength(curwp->w_dotp); ++ curwp->w_dotline = curwp->w_bufp->b_lines; ++ ++ lp = curwp->w_dotp; ++ ln = curwp->w_ntrows - 3; ++ ++ if (ln < curwp->w_bufp->b_lines && ln >= 3) { ++ while (ln--) ++ curwp->w_dotp = lback(curwp->w_dotp); ++ ++ curwp->w_linep = curwp->w_dotp; ++ curwp->w_dotp = lp; ++ } ++ if (f & FFOTHARG && n > 0) { ++ if (n > 9) ++ gotobob(0, 0); ++ else ++ backline(f, percint(curwp->w_bufp->b_lines, n)); ++ } ++ ++ curwp->w_rflag |= WFFULL; ++ return (TRUE); ++} ++ ++/* ++ * Move forward by full lines. ++ * If the number of lines to move is less ++ * than zero, call the backward line function to ++ * actually do it. The last command controls how ++ * the goal column is set. ++ */ ++/* ARGSUSED */ ++int ++forwline(int f, int n) ++{ ++ struct line *dlp; ++ ++ if (n < 0) ++ return (backline(f | FFRAND, -n)); ++ if ((dlp = curwp->w_dotp) == curbp->b_headp) { ++ if (!(f & FFRAND)) { ++ dobeep(); ++ ewprintf("End of buffer"); ++ } ++ return(TRUE); ++ } ++ if ((lastflag & CFCPCN) == 0) /* Fix goal. */ ++ setgoal(); ++ thisflag |= CFCPCN; ++ if (n == 0) ++ return (TRUE); ++ while (n--) { ++ dlp = lforw(dlp); ++ if (dlp == curbp->b_headp) { ++ curwp->w_dotp = lback(dlp); ++ curwp->w_doto = llength(curwp->w_dotp); ++ curwp->w_rflag |= WFMOVE; ++ if (!(f & FFRAND)) { ++ dobeep(); ++ ewprintf("End of buffer"); ++ } ++ return (TRUE); ++ } ++ curwp->w_dotline++; ++ } ++ curwp->w_rflag |= WFMOVE; ++ curwp->w_dotp = dlp; ++ curwp->w_doto = getgoal(dlp); ++ ++ return (TRUE); ++} ++ ++/* ++ * This function is like "forwline", but ++ * goes backwards. The scheme is exactly the same. ++ * Check for arguments that are less than zero and ++ * call your alternate. Figure out the new line and ++ * call "movedot" to perform the motion. ++ */ ++/* ARGSUSED */ ++int ++backline(int f, int n) ++{ ++ struct line *dlp; ++ ++ if (n < 0) ++ return (forwline(f | FFRAND, -n)); ++ if ((lastflag & CFCPCN) == 0) /* Fix goal. */ ++ setgoal(); ++ thisflag |= CFCPCN; ++ dlp = curwp->w_dotp; ++ if (lback(dlp) == curbp->b_headp) { ++ if (!(f & FFRAND)) { ++ dobeep(); ++ ewprintf("Beginning of buffer"); ++ } ++ return(TRUE); ++ } ++ while (n-- && lback(dlp) != curbp->b_headp) { ++ dlp = lback(dlp); ++ curwp->w_dotline--; ++ } ++ if (n > 0 && !(f & FFRAND)) { ++ dobeep(); ++ ewprintf("Beginning of buffer"); ++ } ++ curwp->w_dotp = dlp; ++ curwp->w_doto = getgoal(dlp); ++ curwp->w_rflag |= WFMOVE; ++ return (TRUE); ++} ++ ++/* ++ * Set the current goal column, which is saved in the external variable ++ * "curgoal", to the current cursor column. The column is never off ++ * the edge of the screen; it's more like display then show position. ++ */ ++void ++setgoal(void) ++{ ++ curgoal = getcolpos(curwp); /* Get the position. */ ++ /* we can now display past end of display, don't chop! */ ++} ++ ++/* ++ * This routine looks at a line (pointed ++ * to by the LINE pointer "dlp") and the current ++ * vertical motion goal column (set by the "setgoal" ++ * routine above) and returns the best offset to use ++ * when a vertical motion is made into the line. ++ */ ++int ++getgoal(struct line *dlp) ++{ ++ int c, i, col = 0; ++ char tmp[5]; ++ ++ ++ for (i = 0; i < llength(dlp); i++) { ++ c = lgetc(dlp, i); ++ if (c == '\t' ++#ifdef NOTAB ++ && !(curbp->b_flag & BFNOTAB) ++#endif ++ ) { ++ col |= 0x07; ++ col++; ++ } else if (ISCTRL(c) != FALSE) { ++ col += 2; ++ } else if (isprint(c)) ++ col++; ++ else { ++ col += snprintf(tmp, sizeof(tmp), "\\%o", c); ++ } ++ if (col > curgoal) ++ break; ++ } ++ return (i); ++} ++ ++/* ++ * Scroll forward by a specified number ++ * of lines, or by a full page if no argument. ++ * The "2" is the window overlap (this is the default ++ * value from ITS EMACS). Because the top line in ++ * the window is zapped, we have to do a hard ++ * update and get it back. ++ */ ++/* ARGSUSED */ ++int ++forwpage(int f, int n) ++{ ++ struct line *lp; ++ ++ if (!(f & FFARG)) { ++ n = curwp->w_ntrows - 2; /* Default scroll. */ ++ if (n <= 0) /* Forget the overlap */ ++ n = 1; /* if tiny window. */ ++ } else if (n < 0) ++ return (backpage(f | FFRAND, -n)); ++ ++ lp = curwp->w_linep; ++ while (n--) ++ if ((lp = lforw(lp)) == curbp->b_headp) { ++ dobeep(); ++ ewprintf("End of buffer"); ++ return(TRUE); ++ } ++ ++ curwp->w_linep = lp; ++ curwp->w_rflag |= WFFULL; ++ ++ /* if in current window, don't move dot */ ++ for (n = curwp->w_ntrows; n-- && lp != curbp->b_headp; lp = lforw(lp)) ++ if (lp == curwp->w_dotp) ++ return (TRUE); ++ ++ /* Advance the dot the slow way, for line nos */ ++ while (curwp->w_dotp != curwp->w_linep) { ++ curwp->w_dotp = lforw(curwp->w_dotp); ++ curwp->w_dotline++; ++ } ++ curwp->w_doto = 0; ++ return (TRUE); ++} ++ ++/* ++ * This command is like "forwpage", ++ * but it goes backwards. The "2", like above, ++ * is the overlap between the two windows. The ++ * value is from the ITS EMACS manual. The ++ * hard update is done because the top line in ++ * the window is zapped. ++ */ ++/* ARGSUSED */ ++int ++backpage(int f, int n) ++{ ++ struct line *lp, *lp2; ++ ++ if (!(f & FFARG)) { ++ n = curwp->w_ntrows - 2; /* Default scroll. */ ++ if (n <= 0) /* Don't blow up if the */ ++ return (backline(f, 1));/* window is tiny. */ ++ } else if (n < 0) ++ return (forwpage(f | FFRAND, -n)); ++ ++ lp = lp2 = curwp->w_linep; ++ ++ while (n-- && lback(lp) != curbp->b_headp) { ++ lp = lback(lp); ++ } ++ if (lp == curwp->w_linep) { ++ dobeep(); ++ ewprintf("Beginning of buffer"); ++ } ++ curwp->w_linep = lp; ++ curwp->w_rflag |= WFFULL; ++ ++ /* if in current window, don't move dot */ ++ for (n = curwp->w_ntrows; n-- && lp != curbp->b_headp; lp = lforw(lp)) ++ if (lp == curwp->w_dotp) ++ return (TRUE); ++ ++ lp2 = lforw(lp2); ++ ++ /* Move the dot the slow way, for line nos */ ++ while (curwp->w_dotp != lp2) { ++ if (curwp->w_dotline <= curwp->w_ntrows) ++ goto out; ++ curwp->w_dotp = lback(curwp->w_dotp); ++ curwp->w_dotline--; ++ } ++out: ++ curwp->w_doto = 0; ++ return (TRUE); ++} ++ ++/* ++ * These functions are provided for compatibility with Gosling's Emacs. They ++ * are used to scroll the display up (or down) one line at a time. ++ */ ++int ++forw1page(int f, int n) ++{ ++ if (!(f & FFARG)) { ++ n = 1; ++ f = FFUNIV; ++ } ++ forwpage(f | FFRAND, n); ++ return (TRUE); ++} ++ ++int ++back1page(int f, int n) ++{ ++ if (!(f & FFARG)) { ++ n = 1; ++ f = FFUNIV; ++ } ++ backpage(f | FFRAND, n); ++ return (TRUE); ++} ++ ++/* ++ * Page the other window. Check to make sure it exists, then ++ * nextwind, forwpage and restore window pointers. ++ */ ++int ++pagenext(int f, int n) ++{ ++ struct mgwin *wp; ++ ++ if (wheadp->w_wndp == NULL) { ++ dobeep(); ++ ewprintf("No other window"); ++ return (FALSE); ++ } ++ wp = curwp; ++ (void) nextwind(f, n); ++ (void) forwpage(f, n); ++ curwp = wp; ++ curbp = wp->w_bufp; ++ return (TRUE); ++} ++ ++/* ++ * Internal set mark routine, used by other functions (daveb). ++ */ ++void ++isetmark(void) ++{ ++ curwp->w_markp = curwp->w_dotp; ++ curwp->w_marko = curwp->w_doto; ++ curwp->w_markline = curwp->w_dotline; ++} ++ ++/* ++ * Set the mark in the current window ++ * to the value of dot. A message is written to ++ * the echo line. (ewprintf knows about macros) ++ */ ++/* ARGSUSED */ ++int ++setmark(int f, int n) ++{ ++ isetmark(); ++ ewprintf("Mark set"); ++ return (TRUE); ++} ++ ++/* Clear the mark, if set. */ ++/* ARGSUSED */ ++int ++clearmark(int f, int n) ++{ ++ if (!curwp->w_markp) ++ return (FALSE); ++ ++ curwp->w_markp = NULL; ++ curwp->w_marko = 0; ++ curwp->w_markline = 0; ++ ++ return (TRUE); ++} ++ ++/* ++ * Swap the values of "dot" and "mark" in ++ * the current window. This is pretty easy, because ++ * all of the hard work gets done by the standard routine ++ * that moves the mark about. The only possible ++ * error is "no mark". ++ */ ++/* ARGSUSED */ ++int ++swapmark(int f, int n) ++{ ++ struct line *odotp; ++ int odoto, odotline; ++ ++ if (curwp->w_markp == NULL) { ++ dobeep(); ++ ewprintf("No mark in this window"); ++ return (FALSE); ++ } ++ odotp = curwp->w_dotp; ++ odoto = curwp->w_doto; ++ odotline = curwp->w_dotline; ++ curwp->w_dotp = curwp->w_markp; ++ curwp->w_doto = curwp->w_marko; ++ curwp->w_dotline = curwp->w_markline; ++ curwp->w_markp = odotp; ++ curwp->w_marko = odoto; ++ curwp->w_markline = odotline; ++ curwp->w_rflag |= WFMOVE; ++ return (TRUE); ++} ++ ++/* ++ * Go to a specific line, mostly for ++ * looking up errors in C programs, which give the ++ * error a line number. If an argument is present, then ++ * it is the line number, else prompt for a line number ++ * to use. ++ */ ++/* ARGSUSED */ ++int ++gotoline(int f, int n) ++{ ++ char buf[32], *bufp; ++ const char *err; ++ ++ if (!(f & FFARG)) { ++ if ((bufp = eread("Goto line: ", buf, sizeof(buf), ++ EFNUL | EFNEW | EFCR)) == NULL) ++ return (ABORT); ++ if (bufp[0] == '\0') ++ return (ABORT); ++ n = (int)strtonum(buf, INT_MIN, INT_MAX, &err); ++ if (err) { ++ dobeep(); ++ ewprintf("Line number %s", err); ++ return (FALSE); ++ } ++ } ++ return(setlineno(n)); ++} ++ ++/* ++ * Set the line number and switch to it. ++ */ ++int ++setlineno(int n) ++{ ++ struct line *clp; ++ ++ if (n >= 0) { ++ if (n == 0) ++ n++; ++ curwp->w_dotline = n; ++ clp = lforw(curbp->b_headp); /* "clp" is first line */ ++ while (--n > 0) { ++ if (lforw(clp) == curbp->b_headp) { ++ curwp->w_dotline = curwp->w_bufp->b_lines; ++ break; ++ } ++ clp = lforw(clp); ++ } ++ } else { ++ curwp->w_dotline = curwp->w_bufp->b_lines + n; ++ clp = lback(curbp->b_headp); /* "clp" is last line */ ++ while (n < 0) { ++ if (lback(clp) == curbp->b_headp) { ++ curwp->w_dotline = 1; ++ break; ++ } ++ clp = lback(clp); ++ n++; ++ } ++ } ++ curwp->w_dotp = clp; ++ curwp->w_doto = 0; ++ curwp->w_rflag |= WFMOVE; ++ return (TRUE); ++} diff -Naur a/cscope.c b/cscope.c ---- a/cscope.c 2020-02-01 21:23:32.000000000 +0000 -+++ b/cscope.c 2020-02-01 21:34:59.000000000 +0000 +--- a/cscope.c 2020-04-20 21:09:41.000000000 +0100 ++++ b/cscope.c 2020-04-20 21:26:10.000000000 +0100 @@ -20,6 +20,9 @@ #include #include @@ -142,8 +839,8 @@ diff -Naur a/cscope.c b/cscope.c #define CSSYMBOL 0 diff -Naur a/display.c b/display.c ---- a/display.c 2020-02-01 21:23:32.000000000 +0000 -+++ b/display.c 2020-02-01 21:34:16.000000000 +0000 +--- a/display.c 2020-04-20 21:09:41.000000000 +0100 ++++ b/display.c 2020-04-20 21:26:10.000000000 +0100 @@ -19,6 +19,9 @@ #include #include @@ -155,14 +852,8 @@ diff -Naur a/display.c b/display.c #include "kbd.h" diff -Naur a/fileio.c b/fileio.c ---- a/fileio.c 2020-02-01 21:23:32.000000000 +0000 -+++ b/fileio.c 2020-02-01 21:42:18.000000000 +0000 -@@ -1,4 +1,4 @@ --/* $OpenBSD: fileio.c,v 1.105 2018/04/13 14:11:37 florian Exp $ */ -+/* $OpenBSD: fileio.c,v 1.104 2017/05/30 07:05:22 florian Exp $ */ - - /* This file is in the public domain. */ - +--- a/fileio.c 2020-04-20 21:09:41.000000000 +0100 ++++ b/fileio.c 2020-04-20 21:26:10.000000000 +0100 @@ -22,19 +22,13 @@ #include #include @@ -186,7 +877,7 @@ diff -Naur a/fileio.c b/fileio.c static char *bkuplocation(const char *); static int bkupleavetmp(const char *); -@@ -714,7 +708,7 @@ +@@ -710,7 +704,7 @@ struct stat statbuf; const char *cp; char user[LOGIN_NAME_MAX], path[NFILEN]; @@ -195,7 +886,7 @@ diff -Naur a/fileio.c b/fileio.c size_t ulen, plen; path[0] = '\0'; -@@ -733,18 +727,21 @@ +@@ -729,18 +723,21 @@ return (NULL); return(ret); } @@ -222,66 +913,1742 @@ diff -Naur a/fileio.c b/fileio.c ewprintf("Path too long"); return (NULL); } -diff -Naur a/futimens.c b/futimens.c ---- a/futimens.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/futimens.c 2020-02-01 21:55:02.000000000 +0000 -@@ -0,0 +1,14 @@ +diff -Naur a/fileio.c.orig b/fileio.c.orig +--- a/fileio.c.orig 1970-01-01 01:00:00.000000000 +0100 ++++ b/fileio.c.orig 2020-04-20 21:26:06.000000000 +0100 +@@ -0,0 +1,761 @@ ++/* $OpenBSD: fileio.c,v 1.106 2019/06/22 10:21:57 lum Exp $ */ ++ +/* This file is in the public domain. */ + -+#include ++/* ++ * POSIX fileio.c ++ */ + ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include +#include ++#include ++#include ++#include ++ ++#include "def.h" ++#include "kbd.h" ++#include "pathnames.h" ++ ++#ifndef MAXNAMLEN ++#define MAXNAMLEN 255 ++#endif + ++#ifndef DEFFILEMODE ++#define DEFFILEMODE 0666 ++#endif ++ ++static char *bkuplocation(const char *); ++static int bkupleavetmp(const char *); ++ ++static char *bkupdir; ++static int leavetmp = 0; /* 1 = leave any '~' files in tmp dir */ ++ ++/* ++ * Open a file for reading. ++ */ +int -+futimens(int fildes, const struct timespec times[2]) ++ffropen(FILE ** ffp, const char *fn, struct buffer *bp) +{ -+ struct timeval timevals[2]; -+ TIMESPEC_TO_TIMEVAL(&timevals[0], ×[0]); -+ TIMESPEC_TO_TIMEVAL(&timevals[1], ×[1]); -+ return futimes(fildes, timevals); ++ if ((*ffp = fopen(fn, "r")) == NULL) { ++ if (errno == ENOENT) ++ return (FIOFNF); ++ return (FIOERR); ++ } ++ ++ /* If 'fn' is a directory open it with dired. */ ++ if (fisdir(fn) == TRUE) ++ return (FIODIR); ++ ++ ffstat(*ffp, bp); ++ ++ return (FIOSUC); ++} ++ ++/* ++ * Update stat/dirty info ++ */ ++void ++ffstat(FILE *ffp, struct buffer *bp) ++{ ++ struct stat sb; ++ ++ if (bp && fstat(fileno(ffp), &sb) == 0) { ++ /* set highorder bit to make sure this isn't all zero */ ++ bp->b_fi.fi_mode = sb.st_mode | 0x8000; ++ bp->b_fi.fi_uid = sb.st_uid; ++ bp->b_fi.fi_gid = sb.st_gid; ++ /* bp->b_fi.fi_mtime = sb.st_mtimespec; */ ++ bp->b_fi.fi_mtime.tv_sec = sb.st_mtime; ++ bp->b_fi.fi_mtime.tv_nsec = 0; ++ /* Clear the ignore flag */ ++ bp->b_flag &= ~(BFIGNDIRTY | BFDIRTY); ++ } ++} ++ ++/* ++ * Update the status/dirty info. If there is an error, ++ * there's not a lot we can do. ++ */ ++int ++fupdstat(struct buffer *bp) ++{ ++ FILE *ffp; ++ ++ if ((ffp = fopen(bp->b_fname, "r")) == NULL) { ++ if (errno == ENOENT) ++ return (FIOFNF); ++ return (FIOERR); ++ } ++ ffstat(ffp, bp); ++ (void)ffclose(ffp, bp); ++ return (FIOSUC); ++} ++ ++/* ++ * Open a file for writing. ++ */ ++int ++ffwopen(FILE ** ffp, const char *fn, struct buffer *bp) ++{ ++ int fd; ++ mode_t fmode = DEFFILEMODE; ++ ++ if (bp && bp->b_fi.fi_mode) ++ fmode = bp->b_fi.fi_mode & 07777; ++ ++ fd = open(fn, O_RDWR | O_CREAT | O_TRUNC, fmode); ++ if (fd == -1) { ++ ffp = NULL; ++ dobeep(); ++ ewprintf("Cannot open file for writing : %s", strerror(errno)); ++ return (FIOERR); ++ } ++ ++ if ((*ffp = fdopen(fd, "w")) == NULL) { ++ dobeep(); ++ ewprintf("Cannot open file for writing : %s", strerror(errno)); ++ close(fd); ++ return (FIOERR); ++ } ++ ++ /* ++ * If we have file information, use it. We don't bother to check for ++ * errors, because there's no a lot we can do about it. Certainly ++ * trying to change ownership will fail if we aren't root. That's ++ * probably OK. If we don't have info, no need to get it, since any ++ * future writes will do the same thing. ++ */ ++ if (bp && bp->b_fi.fi_mode) { ++ fchmod(fd, bp->b_fi.fi_mode & 07777); ++ fchown(fd, bp->b_fi.fi_uid, bp->b_fi.fi_gid); ++ } ++ return (FIOSUC); ++} ++ ++/* ++ * Close a file. ++ */ ++/* ARGSUSED */ ++int ++ffclose(FILE *ffp, struct buffer *bp) ++{ ++ if (fclose(ffp) == 0) ++ return (FIOSUC); ++ return (FIOERR); ++} ++ ++/* ++ * Write a buffer to the already opened file. bp points to the ++ * buffer. Return the status. ++ */ ++int ++ffputbuf(FILE *ffp, struct buffer *bp, int eobnl) ++{ ++ struct line *lp, *lpend; ++ ++ lpend = bp->b_headp; ++ ++ for (lp = lforw(lpend); lp != lpend; lp = lforw(lp)) { ++ if (fwrite(ltext(lp), 1, llength(lp), ffp) != llength(lp)) { ++ dobeep(); ++ ewprintf("Write I/O error"); ++ return (FIOERR); ++ } ++ if (lforw(lp) != lpend) /* no implied \n on last line */ ++ putc('\n', ffp); ++ } ++ if (eobnl) { ++ lnewline_at(lback(lpend), llength(lback(lpend))); ++ putc('\n', ffp); ++ } ++ return (FIOSUC); ++} ++ ++/* ++ * Read a line from a file, and store the bytes ++ * in the supplied buffer. Stop on end of file or end of ++ * line. When FIOEOF is returned, there is a valid line ++ * of data without the normally implied \n. ++ * If the line length exceeds nbuf, FIOLONG is returned. ++ */ ++int ++ffgetline(FILE *ffp, char *buf, int nbuf, int *nbytes) ++{ ++ int c, i; ++ ++ i = 0; ++ while ((c = getc(ffp)) != EOF && c != '\n') { ++ buf[i++] = c; ++ if (i >= nbuf) ++ return (FIOLONG); ++ } ++ if (c == EOF && ferror(ffp) != FALSE) { ++ dobeep(); ++ ewprintf("File read error"); ++ return (FIOERR); ++ } ++ *nbytes = i; ++ return (c == EOF ? FIOEOF : FIOSUC); ++} ++ ++/* ++ * Make a backup copy of "fname". On Unix the backup has the same ++ * name as the original file, with a "~" on the end; this seems to ++ * be newest of the new-speak. The error handling is all in "file.c". ++ * We do a copy instead of a rename since otherwise another process ++ * with an open fd will get the backup, not the new file. This is ++ * a problem when using mg with things like crontab and vipw. ++ */ ++int ++fbackupfile(const char *fn) ++{ ++ struct stat sb; ++ struct timespec new_times[2]; ++ int from, to, serrno; ++ ssize_t nread; ++ char buf[BUFSIZ]; ++ char *nname, *tname, *bkpth; ++ ++ if (stat(fn, &sb) == -1) { ++ dobeep(); ++ ewprintf("Can't stat %s : %s", fn, strerror(errno)); ++ return (FALSE); ++ } ++ ++ if ((bkpth = bkuplocation(fn)) == NULL) ++ return (FALSE); ++ ++ if (asprintf(&nname, "%s~", bkpth) == -1) { ++ dobeep(); ++ ewprintf("Can't allocate backup file name : %s", strerror(errno)); ++ free(bkpth); ++ return (ABORT); ++ } ++ if (asprintf(&tname, "%s.XXXXXXXXXX", bkpth) == -1) { ++ dobeep(); ++ ewprintf("Can't allocate temp file name : %s", strerror(errno)); ++ free(bkpth); ++ free(nname); ++ return (ABORT); ++ } ++ free(bkpth); ++ ++ if ((from = open(fn, O_RDONLY)) == -1) { ++ free(nname); ++ free(tname); ++ return (FALSE); ++ } ++ to = mkstemp(tname); ++ if (to == -1) { ++ serrno = errno; ++ close(from); ++ free(nname); ++ free(tname); ++ errno = serrno; ++ return (FALSE); ++ } ++ while ((nread = read(from, buf, sizeof(buf))) > 0) { ++ if (write(to, buf, (size_t)nread) != nread) { ++ nread = -1; ++ break; ++ } ++ } ++ serrno = errno; ++ (void) fchmod(to, (sb.st_mode & 0777)); ++ ++ /* copy the mtime to the backupfile */ ++ new_times[0] = sb.st_atim; ++ new_times[1] = sb.st_mtim; ++ futimens(to, new_times); ++ ++ close(from); ++ close(to); ++ if (nread == -1) { ++ if (unlink(tname) == -1) ++ ewprintf("Can't unlink temp : %s", strerror(errno)); ++ } else { ++ if (rename(tname, nname) == -1) { ++ ewprintf("Can't rename temp : %s", strerror(errno)); ++ (void) unlink(tname); ++ nread = -1; ++ } ++ } ++ free(nname); ++ free(tname); ++ errno = serrno; ++ ++ return (nread == -1 ? FALSE : TRUE); ++} ++ ++/* ++ * Convert "fn" to a canonicalized absolute filename, replacing ++ * a leading ~/ with the user's home dir, following symlinks, and ++ * remove all occurrences of /./ and /../ ++ */ ++char * ++adjustname(const char *fn, int slashslash) ++{ ++ static char fnb[PATH_MAX]; ++ const char *cp, *ep = NULL; ++ char *path; ++ ++ if (slashslash == TRUE) { ++ cp = fn + strlen(fn) - 1; ++ for (; cp >= fn; cp--) { ++ if (ep && (*cp == '/')) { ++ fn = ep; ++ break; ++ } ++ if (*cp == '/' || *cp == '~') ++ ep = cp; ++ else ++ ep = NULL; ++ } ++ } ++ if ((path = expandtilde(fn)) == NULL) ++ return (NULL); ++ ++ if (realpath(path, fnb) == NULL) ++ (void)strlcpy(fnb, path, sizeof(fnb)); ++ ++ free(path); ++ return (fnb); ++} ++ ++/* ++ * Find a startup file for the user and return its name. As a service ++ * to other pieces of code that may want to find a startup file (like ++ * the terminal driver in particular), accepts a suffix to be appended ++ * to the startup file name. ++ */ ++char * ++startupfile(char *suffix) ++{ ++ static char file[NFILEN]; ++ char *home; ++ int ret; ++ ++ if ((home = getenv("HOME")) == NULL || *home == '\0') ++ goto nohome; ++ ++ if (suffix == NULL) { ++ ret = snprintf(file, sizeof(file), _PATH_MG_STARTUP, home); ++ if (ret < 0 || ret >= sizeof(file)) ++ return (NULL); ++ } else { ++ ret = snprintf(file, sizeof(file), _PATH_MG_TERM, home, suffix); ++ if (ret < 0 || ret >= sizeof(file)) ++ return (NULL); ++ } ++ ++ if (access(file, R_OK) == 0) ++ return (file); ++nohome: ++#ifdef STARTUPFILE ++ if (suffix == NULL) { ++ ret = snprintf(file, sizeof(file), "%s", STARTUPFILE); ++ if (ret < 0 || ret >= sizeof(file)) ++ return (NULL); ++ } else { ++ ret = snprintf(file, sizeof(file), "%s%s", STARTUPFILE, ++ suffix); ++ if (ret < 0 || ret >= sizeof(file)) ++ return (NULL); ++ } ++ ++ if (access(file, R_OK) == 0) ++ return (file); ++#endif /* STARTUPFILE */ ++ return (NULL); ++} ++ ++int ++copy(char *frname, char *toname) ++{ ++ int ifd, ofd; ++ char buf[BUFSIZ]; ++ mode_t fmode = DEFFILEMODE; /* XXX?? */ ++ struct stat orig; ++ ssize_t sr; ++ ++ if ((ifd = open(frname, O_RDONLY)) == -1) ++ return (FALSE); ++ if (fstat(ifd, &orig) == -1) { ++ dobeep(); ++ ewprintf("fstat: %s", strerror(errno)); ++ close(ifd); ++ return (FALSE); ++ } ++ ++ if ((ofd = open(toname, O_WRONLY|O_CREAT|O_TRUNC, fmode)) == -1) { ++ close(ifd); ++ return (FALSE); ++ } ++ while ((sr = read(ifd, buf, sizeof(buf))) > 0) { ++ if (write(ofd, buf, (size_t)sr) != sr) { ++ ewprintf("write error : %s", strerror(errno)); ++ break; ++ } ++ } ++ if (fchmod(ofd, orig.st_mode) == -1) ++ ewprintf("Cannot set original mode : %s", strerror(errno)); ++ ++ if (sr == -1) { ++ ewprintf("Read error : %s", strerror(errno)); ++ close(ifd); ++ close(ofd); ++ return (FALSE); ++ } ++ /* ++ * It is "normal" for this to fail since we can't guarantee that ++ * we will be running as root. ++ */ ++ if (fchown(ofd, orig.st_uid, orig.st_gid) && errno != EPERM) ++ ewprintf("Cannot set owner : %s", strerror(errno)); ++ ++ (void) close(ifd); ++ (void) close(ofd); ++ ++ return (TRUE); ++} ++ ++/* ++ * return list of file names that match the name in buf. ++ */ ++struct list * ++make_file_list(char *buf) ++{ ++ char *dir, *file, *cp; ++ size_t len, preflen; ++ int ret; ++ DIR *dirp; ++ struct dirent *dent; ++ struct list *last, *current; ++ char fl_name[NFILEN + 2]; ++ char prefixx[NFILEN + 1]; ++ ++ /* ++ * We need three different strings: ++ ++ * dir - the name of the directory containing what the user typed. ++ * Must be a real unix file name, e.g. no ~user, etc.. ++ * Must not end in /. ++ * prefix - the portion of what the user typed that is before the ++ * names we are going to find in the directory. Must have a ++ * trailing / if the user typed it. ++ * names from the directory - We open dir, and return prefix ++ * concatenated with names. ++ */ ++ ++ /* first we get a directory name we can look up */ ++ /* ++ * Names ending in . are potentially odd, because adjustname will ++ * treat foo/bar/.. as a foo/, whereas we are ++ * interested in names starting with .. ++ */ ++ len = strlen(buf); ++ if (len && buf[len - 1] == '.') { ++ buf[len - 1] = 'x'; ++ dir = adjustname(buf, TRUE); ++ buf[len - 1] = '.'; ++ } else ++ dir = adjustname(buf, TRUE); ++ if (dir == NULL) ++ return (NULL); ++ /* ++ * If the user typed a trailing / or the empty string ++ * he wants us to use his file spec as a directory name. ++ */ ++ if (len && buf[len - 1] != '/') { ++ file = strrchr(dir, '/'); ++ if (file) { ++ *file = '\0'; ++ if (*dir == '\0') ++ dir = "/"; ++ } else ++ return (NULL); ++ } ++ /* Now we get the prefix of the name the user typed. */ ++ if (strlcpy(prefixx, buf, sizeof(prefixx)) >= sizeof(prefixx)) ++ return (NULL); ++ cp = strrchr(prefixx, '/'); ++ if (cp == NULL) ++ prefixx[0] = '\0'; ++ else ++ cp[1] = '\0'; ++ ++ preflen = strlen(prefixx); ++ /* cp is the tail of buf that really needs to be compared. */ ++ cp = buf + preflen; ++ len = strlen(cp); ++ ++ /* ++ * Now make sure that file names will fit in the buffers allocated. ++ * SV files are fairly short. For BSD, something more general would ++ * be required. ++ */ ++ if (preflen > NFILEN - MAXNAMLEN) ++ return (NULL); ++ ++ /* loop over the specified directory, making up the list of files */ ++ ++ /* ++ * Note that it is worth our time to filter out names that don't ++ * match, even though our caller is going to do so again, and to ++ * avoid doing the stat if completion is being done, because stat'ing ++ * every file in the directory is relatively expensive. ++ */ ++ ++ dirp = opendir(dir); ++ if (dirp == NULL) ++ return (NULL); ++ last = NULL; ++ ++ while ((dent = readdir(dirp)) != NULL) { ++ int isdir; ++ if (strncmp(cp, dent->d_name, len) != 0) ++ continue; ++ isdir = 0; ++ if (dent->d_type == DT_DIR) { ++ isdir = 1; ++ } else if (dent->d_type == DT_LNK || ++ dent->d_type == DT_UNKNOWN) { ++ struct stat statbuf; ++ ++ if (fstatat(dirfd(dirp), dent->d_name, &statbuf, 0) < 0) ++ continue; ++ if (S_ISDIR(statbuf.st_mode)) ++ isdir = 1; ++ } ++ ++ if ((current = malloc(sizeof(struct list))) == NULL) { ++ free_file_list(last); ++ closedir(dirp); ++ return (NULL); ++ } ++ ret = snprintf(fl_name, sizeof(fl_name), ++ "%s%s%s", prefixx, dent->d_name, isdir ? "/" : ""); ++ if (ret < 0 || ret >= sizeof(fl_name)) { ++ free(current); ++ continue; ++ } ++ current->l_next = last; ++ current->l_name = strdup(fl_name); ++ last = current; ++ } ++ closedir(dirp); ++ ++ return (last); ++} ++ ++/* ++ * Test if a supplied filename refers to a directory ++ * Returns ABORT on error, TRUE if directory. FALSE otherwise ++ */ ++int ++fisdir(const char *fname) ++{ ++ struct stat statbuf; ++ ++ if (stat(fname, &statbuf) != 0) ++ return (ABORT); ++ ++ if (S_ISDIR(statbuf.st_mode)) ++ return (TRUE); ++ ++ return (FALSE); ++} ++ ++/* ++ * Check the mtime of the supplied filename. ++ * Return TRUE if last mtime matches, FALSE if not, ++ * If the stat fails, return TRUE and try the save anyway ++ */ ++int ++fchecktime(struct buffer *bp) ++{ ++ struct stat sb; ++ ++ if (stat(bp->b_fname, &sb) == -1) ++ return (TRUE); ++ ++ /* if (bp->b_fi.fi_mtime.tv_sec != sb.st_mtimespec.tv_sec || ++ bp->b_fi.fi_mtime.tv_nsec != sb.st_mtimespec.tv_nsec) */ ++ if (bp->b_fi.fi_mtime.tv_sec != sb.st_mtime) ++ return (FALSE); ++ ++ return (TRUE); ++ ++} ++ ++/* ++ * Location of backup file. This function creates the correct path. ++ */ ++static char * ++bkuplocation(const char *fn) ++{ ++ struct stat sb; ++ char *ret; ++ ++ if (bkupdir != NULL && (stat(bkupdir, &sb) == 0) && ++ S_ISDIR(sb.st_mode) && !bkupleavetmp(fn)) { ++ char fname[NFILEN]; ++ const char *c; ++ int i = 0, len; ++ ++ c = fn; ++ len = strlen(bkupdir); ++ ++ while (*c != '\0') { ++ /* Make sure we don't go over combined: ++ * strlen(bkupdir + '/' + fname + '\0') ++ */ ++ if (i >= NFILEN - len - 1) ++ return (NULL); ++ if (*c == '/') { ++ fname[i] = '!'; ++ } else if (*c == '!') { ++ if (i >= NFILEN - len - 2) ++ return (NULL); ++ fname[i++] = '!'; ++ fname[i] = '!'; ++ } else ++ fname[i] = *c; ++ i++; ++ c++; ++ } ++ fname[i] = '\0'; ++ if (asprintf(&ret, "%s/%s", bkupdir, fname) == -1) ++ return (NULL); ++ ++ } else if ((ret = strndup(fn, NFILEN)) == NULL) ++ return (NULL); ++ ++ return (ret); ++} ++ ++int ++backuptohomedir(int f, int n) ++{ ++ const char *c = _PATH_MG_DIR; ++ char *p; ++ ++ if (bkupdir == NULL) { ++ p = adjustname(c, TRUE); ++ bkupdir = strndup(p, NFILEN); ++ if (bkupdir == NULL) ++ return(FALSE); ++ ++ if (mkdir(bkupdir, 0700) == -1 && errno != EEXIST) { ++ free(bkupdir); ++ bkupdir = NULL; ++ } ++ } else { ++ free(bkupdir); ++ bkupdir = NULL; ++ } ++ ++ return (TRUE); ++} ++ ++/* ++ * For applications that use mg as the editor and have a desire to keep ++ * '~' files in /tmp, toggle the location: /tmp | ~/.mg.d ++ */ ++int ++toggleleavetmp(int f, int n) ++{ ++ leavetmp = !leavetmp; ++ ++ return (TRUE); ++} ++ ++/* ++ * Returns TRUE if fn is located in the temp directory and we want to save ++ * those backups there. ++ */ ++int ++bkupleavetmp(const char *fn) ++{ ++ if (!leavetmp) ++ return(FALSE); ++ ++ if (strncmp(fn, "/tmp", 4) == 0) ++ return (TRUE); ++ ++ return (FALSE); ++} ++ ++/* ++ * Expand file names beginning with '~' if appropriate: ++ * 1, if ./~fn exists, continue without expanding tilde. ++ * 2, else, if username 'fn' exists, expand tilde with home directory path. ++ * 3, otherwise, continue and create new buffer called ~fn. ++ */ ++char * ++expandtilde(const char *fn) ++{ ++ struct passwd *pw; ++ struct stat statbuf; ++ const char *cp; ++ char user[LOGIN_NAME_MAX], path[NFILEN]; ++ char *ret; ++ size_t ulen, plen; ++ ++ path[0] = '\0'; ++ ++ if (fn[0] != '~' || stat(fn, &statbuf) == 0) { ++ if ((ret = strndup(fn, NFILEN)) == NULL) ++ return (NULL); ++ return(ret); ++ } ++ cp = strchr(fn, '/'); ++ if (cp == NULL) ++ cp = fn + strlen(fn); /* point to the NUL byte */ ++ ulen = cp - &fn[1]; ++ if (ulen >= sizeof(user)) { ++ if ((ret = strndup(fn, NFILEN)) == NULL) ++ return (NULL); ++ return(ret); ++ } ++ if (ulen == 0) /* ~/ or ~ */ ++ pw = getpwuid(geteuid()); ++ else { /* ~user/ or ~user */ ++ memcpy(user, &fn[1], ulen); ++ user[ulen] = '\0'; ++ pw = getpwnam(user); ++ } ++ if (pw != NULL) { ++ plen = strlcpy(path, pw->pw_dir, sizeof(path)); ++ if (plen == 0 || path[plen - 1] != '/') { ++ if (strlcat(path, "/", sizeof(path)) >= sizeof(path)) { ++ dobeep(); ++ ewprintf("Path too long"); ++ return (NULL); ++ } ++ } ++ fn = cp; ++ if (*fn == '/') ++ fn++; ++ } ++ if (strlcat(path, fn, sizeof(path)) >= sizeof(path)) { ++ dobeep(); ++ ewprintf("Path too long"); ++ return (NULL); ++ } ++ if ((ret = strndup(path, NFILEN)) == NULL) ++ return (NULL); ++ ++ return (ret); ++} +diff -Naur a/futimens.c b/futimens.c +--- a/futimens.c 1970-01-01 01:00:00.000000000 +0100 ++++ b/futimens.c 2020-04-20 21:26:10.000000000 +0100 +@@ -0,0 +1,14 @@ ++/* This file is in the public domain. */ ++ ++#include ++ ++#include ++ ++int ++futimens(int fildes, const struct timespec times[2]) ++{ ++ struct timeval timevals[2]; ++ TIMESPEC_TO_TIMEVAL(&timevals[0], ×[0]); ++ TIMESPEC_TO_TIMEVAL(&timevals[1], ×[1]); ++ return futimes(fildes, timevals); ++} +diff -Naur a/grep.c b/grep.c +--- a/grep.c 2020-04-20 21:09:41.000000000 +0100 ++++ b/grep.c 2020-04-20 21:26:10.000000000 +0100 +@@ -15,6 +15,9 @@ + #include + #include + ++#if defined(__APPLE__) ++# include "apple.h" ++#endif + #include "def.h" + #include "kbd.h" + #include "funmap.h" +diff -Naur a/grep.c.orig b/grep.c.orig +--- a/grep.c.orig 1970-01-01 01:00:00.000000000 +0100 ++++ b/grep.c.orig 2020-04-20 21:26:06.000000000 +0100 +@@ -0,0 +1,362 @@ ++/* $OpenBSD: grep.c,v 1.48 2019/07/11 18:20:18 lum Exp $ */ ++ ++/* This file is in the public domain */ ++ ++#include ++#include ++#include ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "def.h" ++#include "kbd.h" ++#include "funmap.h" ++ ++int globalwd = FALSE; ++static int compile_goto_error(int, int); ++int next_error(int, int); ++static int grep(int, int); ++static int gid(int, int); ++static struct buffer *compile_mode(const char *, const char *); ++void grep_init(void); ++ ++static char compile_last_command[NFILEN] = "make "; ++ ++/* ++ * Hints for next-error ++ * ++ * XXX - need some kind of callback to find out when those get killed. ++ */ ++struct mgwin *compile_win; ++struct buffer *compile_buffer; ++ ++static PF compile_pf[] = { ++ compile_goto_error ++}; ++ ++static struct KEYMAPE (1) compilemap = { ++ 1, ++ 1, ++ rescan, ++ { ++ { CCHR('M'), CCHR('M'), compile_pf, NULL } ++ } ++}; ++ ++void ++grep_init(void) ++{ ++ funmap_add(compile_goto_error, "compile-goto-error", 0); ++ funmap_add(next_error, "next-error", 0); ++ funmap_add(grep, "grep", 1); ++ funmap_add(compile, "compile", 0); ++ funmap_add(gid, "gid", 1); ++ maps_add((KEYMAP *)&compilemap, "compile"); ++} ++ ++/* ARGSUSED */ ++static int ++grep(int f, int n) ++{ ++ char cprompt[NFILEN], *bufp; ++ struct buffer *bp; ++ struct mgwin *wp; ++ ++ (void)strlcpy(cprompt, "grep -n ", sizeof(cprompt)); ++ if ((bufp = eread("Run grep: ", cprompt, NFILEN, ++ EFDEF | EFNEW | EFCR)) == NULL) ++ return (ABORT); ++ else if (bufp[0] == '\0') ++ return (FALSE); ++ if (strlcat(cprompt, " /dev/null", sizeof(cprompt)) >= sizeof(cprompt)) ++ return (FALSE); ++ ++ if ((bp = compile_mode("*grep*", cprompt)) == NULL) ++ return (FALSE); ++ if ((wp = popbuf(bp, WNONE)) == NULL) ++ return (FALSE); ++ curbp = bp; ++ compile_win = curwp = wp; ++ return (TRUE); ++} ++ ++/* ARGSUSED */ ++int ++compile(int f, int n) ++{ ++ char cprompt[NFILEN], *bufp; ++ struct buffer *bp; ++ struct mgwin *wp; ++ ++ (void)strlcpy(cprompt, compile_last_command, sizeof(cprompt)); ++ if ((bufp = eread("Compile command: ", cprompt, NFILEN, ++ EFDEF | EFNEW | EFCR)) == NULL) ++ return (ABORT); ++ else if (bufp[0] == '\0') ++ return (FALSE); ++ if (savebuffers(f, n) == ABORT) ++ return (ABORT); ++ (void)strlcpy(compile_last_command, bufp, sizeof(compile_last_command)); ++ ++ if ((bp = compile_mode("*compile*", cprompt)) == NULL) ++ return (FALSE); ++ if ((wp = popbuf(bp, WNONE)) == NULL) ++ return (FALSE); ++ curbp = bp; ++ compile_win = curwp = wp; ++ gotoline(FFARG, 0); ++ return (TRUE); ++} ++ ++/* id-utils foo. */ ++/* ARGSUSED */ ++static int ++gid(int f, int n) ++{ ++ char command[NFILEN]; ++ char cprompt[NFILEN], *bufp; ++ int c; ++ struct buffer *bp; ++ struct mgwin *wp; ++ int i, j, len; ++ ++ /* catch ([^\s(){}]+)[\s(){}]* */ ++ ++ i = curwp->w_doto; ++ /* Skip backwards over delimiters we are currently on */ ++ while (i > 0) { ++ c = lgetc(curwp->w_dotp, i); ++ if (isalnum(c) || c == '_') ++ break; ++ ++ i--; ++ } ++ ++ /* Skip the symbol itself */ ++ for (; i > 0; i--) { ++ c = lgetc(curwp->w_dotp, i - 1); ++ if (!isalnum(c) && c != '_') ++ break; ++ } ++ /* Fill the symbol in cprompt[] */ ++ for (j = 0; j < sizeof(cprompt) - 1 && i < llength(curwp->w_dotp); ++ j++, i++) { ++ c = lgetc(curwp->w_dotp, i); ++ if (!isalnum(c) && c != '_') ++ break; ++ cprompt[j] = c; ++ } ++ cprompt[j] = '\0'; ++ ++ if ((bufp = eread("Run gid (with args): ", cprompt, NFILEN, ++ (j ? EFDEF : 0) | EFNEW | EFCR)) == NULL) ++ return (ABORT); ++ else if (bufp[0] == '\0') ++ return (FALSE); ++ len = snprintf(command, sizeof(command), "gid %s", cprompt); ++ if (len < 0 || len >= sizeof(command)) ++ return (FALSE); ++ ++ if ((bp = compile_mode("*gid*", command)) == NULL) ++ return (FALSE); ++ if ((wp = popbuf(bp, WNONE)) == NULL) ++ return (FALSE); ++ curbp = bp; ++ compile_win = curwp = wp; ++ return (TRUE); ++} ++ ++struct buffer * ++compile_mode(const char *name, const char *command) ++{ ++ struct buffer *bp; ++ FILE *fpipe; ++ char *buf; ++ size_t sz; ++ ssize_t len; ++ int ret, n, status; ++ char cwd[NFILEN], qcmd[NFILEN]; ++ char timestr[NTIME]; ++ time_t t; ++ ++ buf = NULL; ++ sz = 0; ++ ++ n = snprintf(qcmd, sizeof(qcmd), "%s 2>&1", command); ++ if (n < 0 || n >= sizeof(qcmd)) ++ return (NULL); ++ ++ bp = bfind(name, TRUE); ++ if (bclear(bp) != TRUE) ++ return (NULL); ++ ++ if (getbufcwd(bp->b_cwd, sizeof(bp->b_cwd)) != TRUE) ++ return (NULL); ++ addlinef(bp, "cd %s", bp->b_cwd); ++ addline(bp, qcmd); ++ addline(bp, ""); ++ ++ if (getcwd(cwd, sizeof(cwd)) == NULL) ++ panic("Can't get current directory!"); ++ if (chdir(bp->b_cwd) == -1) { ++ dobeep(); ++ ewprintf("Can't change dir to %s", bp->b_cwd); ++ return (NULL); ++ } ++ if ((fpipe = popen(qcmd, "r")) == NULL) { ++ dobeep(); ++ ewprintf("Problem opening pipe"); ++ return (NULL); ++ } ++ while ((len = getline(&buf, &sz, fpipe)) != -1) { ++ if (buf[len - 1] == '\n') ++ buf[len - 1] = '\0'; ++ addline(bp, buf); ++ } ++ free(buf); ++ if (ferror(fpipe)) ++ ewprintf("Problem reading pipe"); ++ ret = pclose(fpipe); ++ t = time(NULL); ++ strftime(timestr, sizeof(timestr), "%a %b %e %T %Y", localtime(&t)); ++ addline(bp, ""); ++ if (WIFEXITED(ret)) { ++ status = WEXITSTATUS(ret); ++ if (status == 0) ++ addlinef(bp, "Command finished at %s", timestr); ++ else ++ addlinef(bp, "Command exited abnormally with code %d " ++ "at %s", status, timestr); ++ } else ++ addlinef(bp, "Subshell killed by signal %d at %s", ++ WTERMSIG(ret), timestr); ++ ++ bp->b_dotp = bfirstlp(bp); ++ bp->b_modes[0] = name_mode("fundamental"); ++ bp->b_modes[1] = name_mode("compile"); ++ bp->b_nmodes = 1; ++ ++ compile_buffer = bp; ++ ++ if (chdir(cwd) == -1) { ++ dobeep(); ++ ewprintf("Can't change dir back to %s", cwd); ++ return (NULL); ++ } ++ return (bp); ++} ++ ++/* ARGSUSED */ ++static int ++compile_goto_error(int f, int n) ++{ ++ struct buffer *bp; ++ struct mgwin *wp; ++ char *fname, *line, *lp, *ln; ++ int lineno; ++ char *adjf, path[NFILEN]; ++ const char *errstr; ++ struct line *last; ++ ++ compile_win = curwp; ++ compile_buffer = curbp; ++ last = blastlp(compile_buffer); ++ ++ retry: ++ /* last line is compilation result */ ++ if (curwp->w_dotp == last) ++ return (FALSE); ++ ++ if ((line = linetostr(curwp->w_dotp)) == NULL) ++ return (FALSE); ++ lp = line; ++ if ((fname = strsep(&lp, ":")) == NULL || *fname == '\0') ++ goto fail; ++ if ((ln = strsep(&lp, ":")) == NULL || *ln == '\0') ++ goto fail; ++ lineno = (int)strtonum(ln, INT_MIN, INT_MAX, &errstr); ++ if (errstr) ++ goto fail; ++ ++ if (fname && fname[0] != '/') { ++ if (getbufcwd(path, sizeof(path)) == FALSE) ++ goto fail; ++ if (strlcat(path, fname, sizeof(path)) >= sizeof(path)) ++ goto fail; ++ adjf = path; ++ } else { ++ adjf = adjustname(fname, TRUE); ++ } ++ free(line); ++ ++ if (adjf == NULL) ++ return (FALSE); ++ ++ if ((bp = findbuffer(adjf)) == NULL) ++ return (FALSE); ++ if ((wp = popbuf(bp, WNONE)) == NULL) ++ return (FALSE); ++ curbp = bp; ++ curwp = wp; ++ if (bp->b_fname[0] == '\0') ++ readin(adjf); ++ gotoline(FFARG, lineno); ++ return (TRUE); ++fail: ++ free(line); ++ if (curwp->w_dotp != blastlp(curbp)) { ++ curwp->w_dotp = lforw(curwp->w_dotp); ++ curwp->w_rflag |= WFMOVE; ++ goto retry; ++ } ++ dobeep(); ++ ewprintf("No more hits"); ++ return (FALSE); ++} ++ ++/* ARGSUSED */ ++int ++next_error(int f, int n) ++{ ++ if (compile_win == NULL || compile_buffer == NULL) { ++ dobeep(); ++ ewprintf("No compilation active"); ++ return (FALSE); ++ } ++ curwp = compile_win; ++ curbp = compile_buffer; ++ if (curwp->w_dotp == blastlp(curbp)) { ++ dobeep(); ++ ewprintf("No more hits"); ++ return (FALSE); ++ } ++ curwp->w_dotp = lforw(curwp->w_dotp); ++ curwp->w_rflag |= WFMOVE; ++ ++ return (compile_goto_error(f, n)); ++} ++ ++/* ++ * Since we don't have variables (we probably should) these are command ++ * processors for changing the values of mode flags. ++ */ ++/* ARGSUSED */ ++int ++globalwdtoggle(int f, int n) ++{ ++ if (f & FFARG) ++ globalwd = n > 0; ++ else ++ globalwd = !globalwd; ++ ++ sgarbf = TRUE; ++ ++ return (TRUE); ++} +diff -Naur a/main.c b/main.c +--- a/main.c 2020-04-20 21:09:41.000000000 +0100 ++++ b/main.c 2020-04-20 21:26:10.000000000 +0100 +@@ -16,6 +16,9 @@ + #include + #include + ++#if defined(__APPLE__) ++# include "apple.h" ++#endif + #include "def.h" + #include "kbd.h" + #include "funmap.h" +diff -Naur a/paragraph.c b/paragraph.c +--- a/paragraph.c 2020-04-20 21:09:41.000000000 +0100 ++++ b/paragraph.c 2020-04-20 21:26:10.000000000 +0100 +@@ -14,6 +14,9 @@ + #include + #include + ++#if defined(__APPLE__) ++# include "apple.h" ++#endif + #include "def.h" + + static int fillcol = 70; +diff -Naur a/paragraph.c.orig b/paragraph.c.orig +--- a/paragraph.c.orig 1970-01-01 01:00:00.000000000 +0100 ++++ b/paragraph.c.orig 2020-04-20 21:26:06.000000000 +0100 +@@ -0,0 +1,499 @@ ++/* $OpenBSD: paragraph.c,v 1.46 2018/11/17 09:52:34 lum Exp $ */ ++ ++/* This file is in the public domain. */ ++ ++/* ++ * Code for dealing with paragraphs and filling. Adapted from MicroEMACS 3.6 ++ * and GNU-ified by mwm@ucbvax. Several bug fixes by blarson@usc-oberon. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "def.h" ++ ++static int fillcol = 70; ++ ++#define MAXWORD 256 ++ ++static int findpara(void); ++static int do_gotoeop(int, int, int *); ++ ++/* ++ * Move to start of paragraph. ++ * Move backwards by line, checking from the 1st character forwards for the ++ * existence a non-space. If a non-space character is found, move to the ++ * preceding line. Keep doing this until a line with only spaces is found or ++ * the start of buffer. ++ */ ++/* ARGSUSED */ ++int ++gotobop(int f, int n) ++{ ++ int col, nospace; ++ ++ /* the other way... */ ++ if (n < 0) ++ return (gotoeop(f, -n)); ++ ++ while (n-- > 0) { ++ nospace = 0; ++ while (lback(curwp->w_dotp) != curbp->b_headp) { ++ curwp->w_doto = 0; ++ col = 0; ++ ++ while (col < llength(curwp->w_dotp) && ++ (isspace(lgetc(curwp->w_dotp, col)))) ++ col++; ++ ++ if (col >= llength(curwp->w_dotp)) { ++ if (nospace) ++ break; ++ } else ++ nospace = 1; ++ ++ curwp->w_dotline--; ++ curwp->w_dotp = lback(curwp->w_dotp); ++ } ++ } ++ /* force screen update */ ++ curwp->w_rflag |= WFMOVE; ++ return (TRUE); ++} ++ ++/* ++ * Move to end of paragraph. ++ * See comments for gotobop(). Same, but moving forwards. ++ */ ++/* ARGSUSED */ ++int ++gotoeop(int f, int n) ++{ ++ int i; ++ ++ return(do_gotoeop(f, n, &i)); ++} ++ ++int ++do_gotoeop(int f, int n, int *i) ++{ ++ int col, nospace, j = 0; ++ ++ /* the other way... */ ++ if (n < 0) ++ return (gotobop(f, -n)); ++ ++ /* for each one asked for */ ++ while (n-- > 0) { ++ *i = ++j; ++ nospace = 0; ++ while (lforw(curwp->w_dotp) != curbp->b_headp) { ++ col = 0; ++ curwp->w_doto = 0; ++ ++ while (col < llength(curwp->w_dotp) && ++ (isspace(lgetc(curwp->w_dotp, col)))) ++ col++; ++ ++ if (col >= llength(curwp->w_dotp)) { ++ if (nospace) ++ break; ++ } else ++ nospace = 1; ++ ++ curwp->w_dotp = lforw(curwp->w_dotp); ++ curwp->w_dotline++; ++ ++ } ++ } ++ /* do not continue after end of buffer */ ++ if (lforw(curwp->w_dotp) == curbp->b_headp) { ++ gotoeol(FFRAND, 1); ++ curwp->w_rflag |= WFMOVE; ++ return (FALSE); ++ } ++ ++ /* force screen update */ ++ curwp->w_rflag |= WFMOVE; ++ return (TRUE); ++} ++ ++/* ++ * Justify a paragraph. Fill the current paragraph according to the current ++ * fill column. ++ */ ++/* ARGSUSED */ ++int ++fillpara(int f, int n) ++{ ++ int c; /* current char during scan */ ++ int wordlen; /* length of current word */ ++ int clength; /* position on line during fill */ ++ int i; /* index during word copy */ ++ int eopflag; /* Are we at the End-Of-Paragraph? */ ++ int firstflag; /* first word? (needs no space) */ ++ int newlength; /* tentative new line length */ ++ int eolflag; /* was at end of line */ ++ int retval; /* return value */ ++ struct line *eopline; /* pointer to line just past EOP */ ++ char wbuf[MAXWORD]; /* buffer for current word */ ++ ++ if (n == 0) ++ return (TRUE); ++ ++ undo_boundary_enable(FFRAND, 0); ++ ++ /* record the pointer to the line just past the EOP */ ++ (void)gotoeop(FFRAND, 1); ++ if (curwp->w_doto != 0) { ++ /* paragraph ends at end of buffer */ ++ (void)lnewline(); ++ eopline = lforw(curwp->w_dotp); ++ } else ++ eopline = curwp->w_dotp; ++ ++ /* and back top the beginning of the paragraph */ ++ (void)gotobop(FFRAND, 1); ++ ++ /* initialize various info */ ++ while (inword() == 0 && forwchar(FFRAND, 1)); ++ ++ clength = curwp->w_doto; ++ wordlen = 0; ++ ++ /* scan through lines, filling words */ ++ firstflag = TRUE; ++ eopflag = FALSE; ++ while (!eopflag) { ++ ++ /* get the next character in the paragraph */ ++ if ((eolflag = (curwp->w_doto == llength(curwp->w_dotp)))) { ++ c = ' '; ++ if (lforw(curwp->w_dotp) == eopline) ++ eopflag = TRUE; ++ } else ++ c = lgetc(curwp->w_dotp, curwp->w_doto); ++ ++ /* and then delete it */ ++ if (ldelete((RSIZE) 1, KNONE) == FALSE && !eopflag) { ++ retval = FALSE; ++ goto cleanup; ++ } ++ ++ /* if not a separator, just add it in */ ++ if (c != ' ' && c != '\t') { ++ if (wordlen < MAXWORD - 1) ++ wbuf[wordlen++] = c; ++ else { ++ /* ++ * You lose chars beyond MAXWORD if the word ++ * is too long. I'm too lazy to fix it now; it ++ * just silently truncated the word before, ++ * so I get to feel smug. ++ */ ++ ewprintf("Word too long!"); ++ } ++ } else if (wordlen) { ++ ++ /* calculate tentative new length with word added */ ++ newlength = clength + 1 + wordlen; ++ ++ /* ++ * if at end of line or at doublespace and previous ++ * character was one of '.','?','!' doublespace here. ++ * behave the same way if a ')' is preceded by a ++ * [.?!] and followed by a doublespace. ++ */ ++ if (dblspace && (!eopflag && ((eolflag || ++ curwp->w_doto == llength(curwp->w_dotp) || ++ (c = lgetc(curwp->w_dotp, curwp->w_doto)) == ' ' ++ || c == '\t') && (ISEOSP(wbuf[wordlen - 1]) || ++ (wbuf[wordlen - 1] == ')' && wordlen >= 2 && ++ ISEOSP(wbuf[wordlen - 2])))) && ++ wordlen < MAXWORD - 1)) ++ wbuf[wordlen++] = ' '; ++ ++ /* at a word break with a word waiting */ ++ if (newlength <= fillcol) { ++ /* add word to current line */ ++ if (!firstflag) { ++ (void)linsert(1, ' '); ++ ++clength; ++ } ++ firstflag = FALSE; ++ } else { ++ if (curwp->w_doto > 0 && ++ lgetc(curwp->w_dotp, curwp->w_doto - 1) == ' ') { ++ curwp->w_doto -= 1; ++ (void)ldelete((RSIZE) 1, KNONE); ++ } ++ /* start a new line */ ++ (void)lnewline(); ++ clength = 0; ++ } ++ ++ /* and add the word in in either case */ ++ for (i = 0; i < wordlen; i++) { ++ (void)linsert(1, wbuf[i]); ++ ++clength; ++ } ++ wordlen = 0; ++ } ++ } ++ /* and add a last newline for the end of our new paragraph */ ++ (void)lnewline(); ++ ++ /* ++ * We really should wind up where we started, (which is hard to keep ++ * track of) but I think the end of the last line is better than the ++ * beginning of the blank line. ++ */ ++ (void)backchar(FFRAND, 1); ++ retval = TRUE; ++cleanup: ++ undo_boundary_enable(FFRAND, 1); ++ return (retval); ++} ++ ++/* ++ * Delete n paragraphs. Move to the beginning of the current paragraph, or if ++ * the cursor is on an empty line, move down the buffer to the first line with ++ * non-space characters. Then mark n paragraphs and delete. ++ */ ++/* ARGSUSED */ ++int ++killpara(int f, int n) ++{ ++ int lineno, status; ++ ++ if (n == 0) ++ return (TRUE); ++ ++ if (findpara() == FALSE) ++ return (TRUE); ++ ++ /* go to the beginning of the paragraph */ ++ (void)gotobop(FFRAND, 1); ++ ++ /* take a note of the line number for after deletions and set mark */ ++ lineno = curwp->w_dotline; ++ curwp->w_markp = curwp->w_dotp; ++ curwp->w_marko = curwp->w_doto; ++ ++ (void)gotoeop(FFRAND, n); ++ ++ if ((status = killregion(FFRAND, 1)) != TRUE) ++ return (status); ++ ++ curwp->w_dotline = lineno; ++ return (TRUE); ++} ++ ++/* ++ * Mark n paragraphs starting with the n'th and working our way backwards. ++ * This leaves the cursor at the beginning of the paragraph where markpara() ++ * was invoked. ++ */ ++/* ARGSUSED */ ++int ++markpara(int f, int n) ++{ ++ int i = 0; ++ ++ if (n == 0) ++ return (TRUE); ++ ++ clearmark(FFARG, 0); ++ ++ if (findpara() == FALSE) ++ return (TRUE); ++ ++ (void)do_gotoeop(FFRAND, n, &i); ++ ++ /* set the mark here */ ++ curwp->w_markp = curwp->w_dotp; ++ curwp->w_marko = curwp->w_doto; ++ ++ (void)gotobop(FFRAND, i); ++ ++ return (TRUE); ++} ++ ++/* ++ * Transpose the current paragraph with the following paragraph. If invoked ++ * multiple times, transpose to the n'th paragraph. If invoked between ++ * paragraphs, move to the previous paragraph, then continue. ++ */ ++/* ARGSUSED */ ++int ++transposepara(int f, int n) ++{ ++ int i = 0, status; ++ char flg; ++ ++ if (n == 0) ++ return (TRUE); ++ ++ undo_boundary_enable(FFRAND, 0); ++ ++ /* find a paragraph, set mark, then goto the end */ ++ gotobop(FFRAND, 1); ++ curwp->w_markp = curwp->w_dotp; ++ curwp->w_marko = curwp->w_doto; ++ (void)gotoeop(FFRAND, 1); ++ ++ /* take a note of buffer flags - we may need them */ ++ flg = curbp->b_flag; ++ ++ /* clean out kill buffer then kill region */ ++ kdelete(); ++ if ((status = killregion(FFRAND, 1)) != TRUE) ++ return (status); ++ ++ /* ++ * Now step through n paragraphs. If we reach the end of buffer, ++ * stop and paste the killed region back, then display a message. ++ */ ++ if (do_gotoeop(FFRAND, n, &i) == FALSE) { ++ ewprintf("Cannot transpose paragraph, end of buffer reached."); ++ (void)gotobop(FFRAND, i); ++ (void)yank(FFRAND, 1); ++ curbp->b_flag = flg; ++ return (FALSE); ++ } ++ (void)yank(FFRAND, 1); ++ ++ undo_boundary_enable(FFRAND, 1); ++ ++ return (TRUE); ++} ++ ++/* ++ * Go down the buffer until we find a line with non-space characters. ++ */ ++int ++findpara(void) ++{ ++ int col, nospace = 0; ++ ++ /* we move forward to find a para to mark */ ++ do { ++ curwp->w_doto = 0; ++ col = 0; ++ ++ /* check if we are on a blank line */ ++ while (col < llength(curwp->w_dotp)) { ++ if (!isspace(lgetc(curwp->w_dotp, col))) ++ nospace = 1; ++ col++; ++ } ++ if (nospace) ++ break; ++ ++ if (lforw(curwp->w_dotp) == curbp->b_headp) ++ return (FALSE); ++ ++ curwp->w_dotp = lforw(curwp->w_dotp); ++ curwp->w_dotline++; ++ } while (1); ++ ++ return (TRUE); ++} ++ ++/* ++ * Insert char with work wrap. Check to see if we're past fillcol, and if so, ++ * justify this line. As a last step, justify the line. ++ */ ++/* ARGSUSED */ ++int ++fillword(int f, int n) ++{ ++ char c; ++ int col, i, nce; ++ ++ for (i = col = 0; col <= fillcol; ++i, ++col) { ++ if (i == curwp->w_doto) ++ return selfinsert(f, n); ++ c = lgetc(curwp->w_dotp, i); ++ if (c == '\t' ++#ifdef NOTAB ++ && !(curbp->b_flag & BFNOTAB) ++#endif ++ ) ++ col |= 0x07; ++ else if (ISCTRL(c) != FALSE) ++ ++col; ++ } ++ if (curwp->w_doto != llength(curwp->w_dotp)) { ++ (void)selfinsert(f, n); ++ nce = llength(curwp->w_dotp) - curwp->w_doto; ++ } else ++ nce = 0; ++ curwp->w_doto = i; ++ ++ if ((c = lgetc(curwp->w_dotp, curwp->w_doto)) != ' ' && c != '\t') ++ do { ++ (void)backchar(FFRAND, 1); ++ } while ((c = lgetc(curwp->w_dotp, curwp->w_doto)) != ' ' && ++ c != '\t' && curwp->w_doto > 0); ++ ++ if (curwp->w_doto == 0) ++ do { ++ (void)forwchar(FFRAND, 1); ++ } while ((c = lgetc(curwp->w_dotp, curwp->w_doto)) != ' ' && ++ c != '\t' && curwp->w_doto < llength(curwp->w_dotp)); ++ ++ (void)delwhite(FFRAND, 1); ++ (void)lnewline(); ++ i = llength(curwp->w_dotp) - nce; ++ curwp->w_doto = i > 0 ? i : 0; ++ curwp->w_rflag |= WFMOVE; ++ if (nce == 0 && curwp->w_doto != 0) ++ return (fillword(f, n)); ++ return (TRUE); ++} ++ ++/* ++ * Set fill column to n for justify. ++ */ ++int ++setfillcol(int f, int n) ++{ ++ char buf[32], *rep; ++ const char *es; ++ int nfill; ++ ++ if ((f & FFARG) != 0) { ++ fillcol = n; ++ } else { ++ if ((rep = eread("Set fill-column: ", buf, sizeof(buf), ++ EFNEW | EFCR)) == NULL) ++ return (ABORT); ++ else if (rep[0] == '\0') ++ return (FALSE); ++ nfill = strtonum(rep, 0, INT_MAX, &es); ++ if (es != NULL) { ++ dobeep(); ++ ewprintf("Invalid fill column: %s", rep); ++ return (FALSE); ++ } ++ fillcol = nfill; ++ ewprintf("Fill column set to %d", fillcol); ++ } ++ return (TRUE); ++} ++ ++int ++sentencespace(int f, int n) ++{ ++ if (f & FFARG) ++ dblspace = n > 1; ++ else ++ dblspace = !dblspace; ++ ++ return (TRUE); ++} +diff -Naur a/reallocarray.c b/reallocarray.c +--- a/reallocarray.c 1970-01-01 01:00:00.000000000 +0100 ++++ b/reallocarray.c 2020-04-20 21:26:10.000000000 +0100 +@@ -0,0 +1,38 @@ ++/* $OpenBSD: reallocarray.c,v 1.3 2015/09/13 08:31:47 guenther Exp $ */ ++/* ++ * Copyright (c) 2008 Otto Moerbeek ++ * ++ * Permission to use, copy, modify, and distribute this software for any ++ * purpose with or without fee is hereby granted, provided that the above ++ * copyright notice and this permission notice appear in all copies. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES ++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF ++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ */ ++ ++#include ++#include ++#include ++#include ++ ++/* ++ * This is sqrt(SIZE_MAX+1), as s1*s2 <= SIZE_MAX ++ * if both s1 < MUL_NO_OVERFLOW and s2 < MUL_NO_OVERFLOW ++ */ ++#define MUL_NO_OVERFLOW ((size_t)1 << (sizeof(size_t) * 4)) ++ ++void * ++reallocarray(void *optr, size_t nmemb, size_t size) ++{ ++ if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) && ++ nmemb > 0 && SIZE_MAX / nmemb < size) { ++ errno = ENOMEM; ++ return NULL; ++ } ++ return realloc(optr, size * nmemb); +} -diff -Naur a/grep.c b/grep.c ---- a/grep.c 2020-02-01 21:23:32.000000000 +0000 -+++ b/grep.c 2020-02-01 21:35:07.000000000 +0000 -@@ -16,6 +16,9 @@ - #include - #include - -+#if defined(__APPLE__) -+# include "apple.h" -+#endif - #include "def.h" - #include "kbd.h" - #include "funmap.h" -diff -Naur a/main.c b/main.c ---- a/main.c 2020-02-01 21:23:32.000000000 +0000 -+++ b/main.c 2020-02-01 21:34:42.000000000 +0000 -@@ -16,6 +16,9 @@ - #include - #include - -+#if defined(__APPLE__) -+# include "apple.h" -+#endif - #include "def.h" - #include "kbd.h" - #include "funmap.h" -diff -Naur a/paragraph.c b/paragraph.c ---- a/paragraph.c 2020-02-01 21:23:32.000000000 +0000 -+++ b/paragraph.c 2020-02-01 21:34:49.000000000 +0000 -@@ -14,6 +14,9 @@ - #include - #include - -+#if defined(__APPLE__) -+# include "apple.h" -+#endif - #include "def.h" - - static int fillcol = 70; diff -Naur a/strtonum.c b/strtonum.c --- a/strtonum.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/strtonum.c 2020-02-01 21:55:24.000000000 +0000 ++++ b/strtonum.c 2020-04-20 21:26:10.000000000 +0100 @@ -0,0 +1,65 @@ +/* $OpenBSD: strtonum.c,v 1.7 2013/04/17 18:40:58 tedu Exp $ */ + @@ -349,8 +2716,8 @@ diff -Naur a/strtonum.c b/strtonum.c + return (ll); +} diff -Naur a/tags.c b/tags.c ---- a/tags.c 2020-02-01 21:23:32.000000000 +0000 -+++ b/tags.c 2020-02-01 21:27:56.000000000 +0000 +--- a/tags.c 2020-04-20 21:09:41.000000000 +0100 ++++ b/tags.c 2020-04-20 21:26:10.000000000 +0100 @@ -8,7 +8,11 @@ #include @@ -392,7 +2759,7 @@ diff -Naur a/tags.c b/tags.c struct tagpos { diff -Naur a/tree.h b/tree.h --- a/tree.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/tree.h 2020-02-01 21:25:11.000000000 +0000 ++++ b/tree.h 2020-04-20 21:26:10.000000000 +0100 @@ -0,0 +1,1006 @@ +/* $OpenBSD: tree.h,v 1.29 2017/07/30 19:27:20 deraadt Exp $ */ +/* diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix index f97e34aff8d..e019baaf727 100644 --- a/pkgs/applications/editors/mg/default.nix +++ b/pkgs/applications/editors/mg/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, pkgconfig, ncurses, buildPackages, libbsd }: +{ stdenv, fetchFromGitHub, pkgconfig, ncurses, buildPackages, libbsd }: stdenv.mkDerivation rec { pname = "mg"; - version = "20180927"; + version = "20200215"; - src = fetchurl { - url = "https://github.com/hboetes/mg/archive/${version}.tar.gz"; - sha256 = "fbb09729ea00fe42dcdbc96ac7fc1d2b89eac651dec49e4e7af52fad4f5788f6"; + src = fetchFromGitHub { + owner = "hboetes"; + repo = "mg"; + rev = "20200215"; + sha256 = "1rss7d43hbq43n63gxfvx4b2vh2km58cchwzdf2ssqhaz3qj40m6"; }; enableParallelBuilding = true; -- cgit v1.2.3 From 3c9c894f836fffa07a8d269f6394bdf2cbfdc940 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 20 Apr 2020 15:46:45 -0500 Subject: =?UTF-8?q?blas,lapack:=20don=E2=80=99t=20patchelf?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We have some unused RPATHs we don’t want shrunk. These are used in MKL to dlopen based on architecture. --- pkgs/build-support/alternatives/blas/default.nix | 2 ++ pkgs/build-support/alternatives/lapack/default.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkgs/build-support/alternatives/blas/default.nix b/pkgs/build-support/alternatives/blas/default.nix index 36708ce8841..bce0c7af2bc 100644 --- a/pkgs/build-support/alternatives/blas/default.nix +++ b/pkgs/build-support/alternatives/blas/default.nix @@ -58,6 +58,8 @@ stdenv.mkDerivation { dontConfigure = true; unpackPhase = "src=$PWD"; + dontPatchELF = true; + installPhase = ('' mkdir -p $out/lib $dev/include $dev/lib/pkgconfig diff --git a/pkgs/build-support/alternatives/lapack/default.nix b/pkgs/build-support/alternatives/lapack/default.nix index 24c339042a2..75dc2ae3b34 100644 --- a/pkgs/build-support/alternatives/lapack/default.nix +++ b/pkgs/build-support/alternatives/lapack/default.nix @@ -36,6 +36,8 @@ stdenv.mkDerivation { dontConfigure = true; unpackPhase = "src=$PWD"; + dontPatchELF = true; + installPhase = ('' mkdir -p $out/lib $dev/include $dev/lib/pkgconfig -- cgit v1.2.3 From f86d582ea7cdf9c969f2294d9dc953f36f2a63e9 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 20 Apr 2020 15:49:56 -0500 Subject: doc/overlays.xml: add information on BLAS/LAPACK switching --- doc/using/overlays.xml | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) diff --git a/doc/using/overlays.xml b/doc/using/overlays.xml index 26a888368ab..7732e0ac217 100644 --- a/doc/using/overlays.xml +++ b/doc/using/overlays.xml @@ -137,4 +137,80 @@ self: super: Overlays are similar to other methods for customizing Nixpkgs, in particular the packageOverrides attribute described in . Indeed, packageOverrides acts as an overlay with only the super argument. It is therefore appropriate for basic use, but overlays are more powerful and easier to distribute.
+
+ Using overlays to configure alternatives + + Certain software has different implementations of the same + interface. Other distributions have functionality to switch + between these. For example, Debian provides DebianAlternatives. + Nixpkgs has what we call alternatives, which + are configured through overlays. + +
+ BLAS/LAPACK + + In Nixpkgs, we have multiple implementations of the BLAS/LAPACK + numerical linear algebra interfaces. They are: + + + + + OpenBLAS + + + The Nixpkgs attribute is openblas for + ILP64 and openblasCompat for LP64. This + is the default. + + + + + LAPACK + reference (also provides BLAS) + + + The Nixpkgs attribute is lapack-reference. + + + + + Intel + MKL (only works on x86 architecture) + + + The Nixpkgs attribute is mkl. + + + + + Introduced in PR + #83888, we are able to override the ‘blas’ and ‘lapack’ + packages to use different implementations, through the + ‘blasProvider’ and ‘lapackProvider’ argument. This can be used + to select a different provider. For example, an overlay can be + created that looks like: + + +self: super: + +{ + blas = super.blas.override { + blasProvider = self.mkl; + } + lapack = super.lapack.override { + lapackProvider = self.mkl; + } +} + + + This overlay uses Intel’s MKL library for both BLAS and LAPACK + interfaces. Note that the same can be accomplished at runtime + using LD_PRELOAD of libblas.so.3 and + liblapack.so.3. + +
+
-- cgit v1.2.3 From ff2f2644f8ea1b364dde5dfee2bc76027afccaf9 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 20 Apr 2020 15:50:55 -0500 Subject: blas,lapack: use isILP64 instead of is64bit This is a better name since we have multiple 64-bit things that could be referred to. LP64 : integer=32, long=64, pointer=64 ILP64 : integer=64, long=64, pointer=64 --- pkgs/applications/science/chemistry/octopus/default.nix | 2 +- .../applications/science/machine-learning/shogun/default.nix | 2 +- pkgs/applications/science/math/R/default.nix | 2 +- pkgs/applications/science/math/giac/default.nix | 2 +- pkgs/applications/science/math/gmsh/default.nix | 2 +- pkgs/applications/science/math/sage/sage-env.nix | 2 +- pkgs/applications/science/math/sage/sage-with-env.nix | 2 +- pkgs/applications/science/math/sage/sagelib.nix | 2 +- pkgs/build-support/alternatives/blas/default.nix | 12 ++++++------ pkgs/build-support/alternatives/lapack/default.nix | 10 +++++----- pkgs/development/compilers/julia/1.3.nix | 4 ++-- pkgs/development/compilers/julia/shared.nix | 4 ++-- pkgs/development/interpreters/octave/default.nix | 6 +++--- pkgs/development/libraries/fflas-ffpack/default.nix | 2 +- pkgs/development/libraries/linbox/default.nix | 2 +- pkgs/development/libraries/qrupdate/default.nix | 2 +- pkgs/development/libraries/science/math/arpack/default.nix | 2 +- pkgs/development/libraries/science/math/ipopt/default.nix | 2 +- .../development/libraries/science/math/scalapack/default.nix | 2 +- pkgs/development/libraries/science/math/scs/default.nix | 2 +- pkgs/development/libraries/science/math/suitesparse/4.2.nix | 2 +- pkgs/development/libraries/science/math/suitesparse/4.4.nix | 2 +- .../libraries/science/math/suitesparse/default.nix | 2 +- pkgs/development/libraries/science/math/superlu/default.nix | 2 +- pkgs/development/libraries/sundials/2.x.nix | 2 +- pkgs/development/libraries/sundials/default.nix | 2 +- pkgs/development/ocaml-modules/lacaml/default.nix | 2 +- pkgs/development/ocaml-modules/owl/default.nix | 2 +- pkgs/development/python-modules/cvxopt/default.nix | 2 +- pkgs/development/python-modules/numpy/default.nix | 2 +- pkgs/tools/misc/hpl/default.nix | 2 +- pkgs/top-level/release-alternatives.nix | 6 +++--- 32 files changed, 47 insertions(+), 47 deletions(-) diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index f30954367cf..adb31d32650 100644 --- a/pkgs/applications/science/chemistry/octopus/default.nix +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -2,7 +2,7 @@ , libyaml, libxc, fftw, blas, lapack, gsl, netcdf, arpack, autoreconfHook }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "octopus"; diff --git a/pkgs/applications/science/machine-learning/shogun/default.nix b/pkgs/applications/science/machine-learning/shogun/default.nix index 33871df87f3..031ca55a048 100644 --- a/pkgs/applications/science/machine-learning/shogun/default.nix +++ b/pkgs/applications/science/machine-learning/shogun/default.nix @@ -13,7 +13,7 @@ assert pythonSupport -> pythonPackages != null; assert opencvSupport -> opencv != null; -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); let pname = "shogun"; diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 836ce004fff..617a1826537 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -9,7 +9,7 @@ , static ? false }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { name = "R-3.6.3"; diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index be3c1e6dcc8..ea9c921f19e 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -5,7 +5,7 @@ }: assert enableGUI -> libGLU != null && libGL != null && xorg != null && fltk != null; -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "giac${lib.optionalString enableGUI "-with-xcas"}"; diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 8ece2e7819c..946beff8003 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, blas, lapack, gfortran, gmm, fltk, libjpeg , zlib, libGL, libGLU, xorg, opencascade-occt }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "gmsh"; diff --git a/pkgs/applications/science/math/sage/sage-env.nix b/pkgs/applications/science/math/sage/sage-env.nix index c0dfeef1119..626e1bf1ea9 100644 --- a/pkgs/applications/science/math/sage/sage-env.nix +++ b/pkgs/applications/science/math/sage/sage-env.nix @@ -54,7 +54,7 @@ , less }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); # This generates a `sage-env` shell file that will be sourced by sage on startup. # It sets up various environment variables, telling sage where to find its diff --git a/pkgs/applications/science/math/sage/sage-with-env.nix b/pkgs/applications/science/math/sage/sage-with-env.nix index 77bc65c2be1..87c1e07f530 100644 --- a/pkgs/applications/science/math/sage/sage-with-env.nix +++ b/pkgs/applications/science/math/sage/sage-with-env.nix @@ -23,7 +23,7 @@ }: # lots of segfaults with (64 bit) blas -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); # Wrapper that combined `sagelib` with `sage-env` to produce an actually # executable sage. No tests are run yet and no documentation is built. diff --git a/pkgs/applications/science/math/sage/sagelib.nix b/pkgs/applications/science/math/sage/sagelib.nix index 92b4e8efa2e..830d806a8bc 100644 --- a/pkgs/applications/science/math/sage/sagelib.nix +++ b/pkgs/applications/science/math/sage/sagelib.nix @@ -53,7 +53,7 @@ , pplpy }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); # This is the core sage python package. Everything else is just wrappers gluing # stuff together. It is not very useful on its own though, since it will not diff --git a/pkgs/build-support/alternatives/blas/default.nix b/pkgs/build-support/alternatives/blas/default.nix index bce0c7af2bc..45fb69eddb7 100644 --- a/pkgs/build-support/alternatives/blas/default.nix +++ b/pkgs/build-support/alternatives/blas/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , lapack-reference, openblasCompat, openblas -, is64bit ? false -, blasProvider ? if is64bit then openblas else openblasCompat }: +, isILP64 ? false +, blasProvider ? if isILP64 then openblas else openblasCompat }: let blasFortranSymbols = [ @@ -31,12 +31,12 @@ let else stdenv.hostPlatform.extensions.sharedLibrary; - is64bit = blasProvider.blas64 or false; + isILP64 = blasProvider.blas64 or false; blasImplementation = lib.getName blasProvider; in -assert is64bit -> (blasImplementation == "openblas" && blasProvider.blas64) || blasImplementation == "mkl"; +assert isILP64 -> (blasImplementation == "openblas" && blasProvider.blas64) || blasImplementation == "mkl"; stdenv.mkDerivation { pname = "blas"; @@ -49,7 +49,7 @@ stdenv.mkDerivation { }; passthru = { - inherit is64bit; + inherit isILP64; provider = blasProvider; implementation = blasImplementation; }; @@ -134,6 +134,6 @@ Libs: -L$out/lib -lcblas EOF '' + stdenv.lib.optionalString (blasImplementation == "mkl") '' mkdir -p $out/nix-support - echo 'export MKL_INTERFACE_LAYER=${lib.optionalString is64bit "I"}LP64,GNU' > $out/nix-support/setup-hook + echo 'export MKL_INTERFACE_LAYER=${lib.optionalString isILP64 "I"}LP64,GNU' > $out/nix-support/setup-hook ''); } diff --git a/pkgs/build-support/alternatives/lapack/default.nix b/pkgs/build-support/alternatives/lapack/default.nix index 75dc2ae3b34..c90eb43494d 100644 --- a/pkgs/build-support/alternatives/lapack/default.nix +++ b/pkgs/build-support/alternatives/lapack/default.nix @@ -1,7 +1,7 @@ { lib, stdenv , lapack-reference, openblasCompat, openblas -, is64bit ? false -, lapackProvider ? if is64bit then openblas else openblasCompat }: +, isILP64 ? false +, lapackProvider ? if isILP64 then openblas else openblasCompat }: let @@ -14,7 +14,7 @@ let in -assert is64bit -> (lapackImplementation == "openblas" && lapackProvider.blas64) || lapackImplementation == "mkl"; +assert isILP64 -> (lapackImplementation == "openblas" && lapackProvider.blas64) || lapackImplementation == "mkl"; stdenv.mkDerivation { pname = "lapack"; @@ -27,7 +27,7 @@ stdenv.mkDerivation { }; passthru = { - inherit is64bit; + inherit isILP64; provider = lapackProvider; implementation = lapackImplementation; }; @@ -108,6 +108,6 @@ Libs: -L$out/lib -llapacke EOF '' + stdenv.lib.optionalString (lapackImplementation == "mkl") '' mkdir -p $out/nix-support - echo 'export MKL_INTERFACE_LAYER=${lib.optionalString is64bit "I"}LP64,GNU' > $out/nix-support/setup-hook + echo 'export MKL_INTERFACE_LAYER=${lib.optionalString isILP64 "I"}LP64,GNU' > $out/nix-support/setup-hook ''); } diff --git a/pkgs/development/compilers/julia/1.3.nix b/pkgs/development/compilers/julia/1.3.nix index 49dc17a27f4..b67a78b4a5a 100644 --- a/pkgs/development/compilers/julia/1.3.nix +++ b/pkgs/development/compilers/julia/1.3.nix @@ -12,7 +12,7 @@ , CoreServices, ApplicationServices }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); with stdenv.lib; @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { "SHELL=${stdenv.shell}" "USE_SYSTEM_BLAS=1" - "USE_BLAS64=${if blas.is64bit then "1" else "0"}" + "USE_BLAS64=${if blas.isILP64 then "1" else "0"}" "USE_SYSTEM_LAPACK=1" diff --git a/pkgs/development/compilers/julia/shared.nix b/pkgs/development/compilers/julia/shared.nix index 92e3d4a5c14..29ac4115050 100644 --- a/pkgs/development/compilers/julia/shared.nix +++ b/pkgs/development/compilers/julia/shared.nix @@ -22,7 +22,7 @@ with stdenv.lib; -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); let dsfmtVersion = "2.2.3"; @@ -137,7 +137,7 @@ stdenv.mkDerivation rec { "SHELL=${stdenv.shell}" "USE_SYSTEM_BLAS=1" - "USE_BLAS64=${if blas.is64bit then "1" else "0"}" + "USE_BLAS64=${if blas.isILP64 then "1" else "0"}" "USE_SYSTEM_LAPACK=1" diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 4d2bf40b329..06d69ed8117 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -53,7 +53,7 @@ , darwin }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { version = "5.2.0"; @@ -125,12 +125,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # See https://savannah.gnu.org/bugs/?50339 - F77_INTEGER_8_FLAG = if blas.is64bit then "-fdefault-integer-8" else ""; + F77_INTEGER_8_FLAG = if blas.isILP64 then "-fdefault-integer-8" else ""; configureFlags = [ "--with-blas=blas" "--with-lapack=lapack" - (if blas.is64bit then "--enable-64" else "--disable-64") + (if blas.isILP64 then "--enable-64" else "--disable-64") ] ++ (if stdenv.isDarwin then [ "--enable-link-all-dependencies" ] else [ ]) ++ stdenv.lib.optionals enableReadline [ "--enable-readline" ] diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index 16a9e3e79d4..bc84039a9aa 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -2,7 +2,7 @@ , gmpxx }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "fflas-ffpack"; diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index 6d25cb45987..2217996acdb 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -10,7 +10,7 @@ , withSage ? false # sage support }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "linbox"; diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix index f6c16583ad7..424502dce0d 100644 --- a/pkgs/development/libraries/qrupdate/default.nix +++ b/pkgs/development/libraries/qrupdate/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { -e 's,^LAPACK=.*,LAPACK=-L${lapack}/lib -llapack,' \ Makeconf '' - + stdenv.lib.optionalString blas.is64bit + + stdenv.lib.optionalString blas.isILP64 '' sed -i Makeconf -e '/^FFLAGS=.*/ s/$/-fdefault-integer-8/' ''; diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index a5fbb679df5..0829557d0f3 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" - "-DINTERFACE64=${optionalString blas.is64bit "1"}" + "-DINTERFACE64=${optionalString blas.isILP64 "1"}" ]; preCheck = if stdenv.isDarwin then '' diff --git a/pkgs/development/libraries/science/math/ipopt/default.nix b/pkgs/development/libraries/science/math/ipopt/default.nix index 647fd82ec0e..97374fb0d47 100644 --- a/pkgs/development/libraries/science/math/ipopt/default.nix +++ b/pkgs/development/libraries/science/math/ipopt/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, unzip, blas, lapack, gfortran }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "ipopt"; diff --git a/pkgs/development/libraries/science/math/scalapack/default.nix b/pkgs/development/libraries/science/math/scalapack/default.nix index d2021986029..1cf9c2ed8d5 100644 --- a/pkgs/development/libraries/science/math/scalapack/default.nix +++ b/pkgs/development/libraries/science/math/scalapack/default.nix @@ -2,7 +2,7 @@ , gfortran, mpi, blas, lapack } : -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "scalapack"; diff --git a/pkgs/development/libraries/science/math/scs/default.nix b/pkgs/development/libraries/science/math/scs/default.nix index 2dcb47f11ba..3820f2b9527 100644 --- a/pkgs/development/libraries/science/math/scs/default.nix +++ b/pkgs/development/libraries/science/math/scs/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, blas, lapack, gfortran, fixDarwinDylibNames }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "scs"; diff --git a/pkgs/development/libraries/science/math/suitesparse/4.2.nix b/pkgs/development/libraries/science/math/suitesparse/4.2.nix index 34a1fb7ad9e..b1c1202c578 100644 --- a/pkgs/development/libraries/science/math/suitesparse/4.2.nix +++ b/pkgs/development/libraries/science/math/suitesparse/4.2.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, gfortran, blas, lapack }: let - int_t = if blas.is64bit then "int64_t" else "int32_t"; + int_t = if blas.isILP64 then "int64_t" else "int32_t"; in stdenv.mkDerivation rec { version = "4.2.1"; diff --git a/pkgs/development/libraries/science/math/suitesparse/4.4.nix b/pkgs/development/libraries/science/math/suitesparse/4.4.nix index b2b7e666b7e..81a80c920b5 100644 --- a/pkgs/development/libraries/science/math/suitesparse/4.4.nix +++ b/pkgs/development/libraries/science/math/suitesparse/4.4.nix @@ -6,7 +6,7 @@ let version = "4.4.4"; name = "suitesparse-${version}"; - int_t = if blas.is64bit then "int64_t" else "int32_t"; + int_t = if blas.isILP64 then "int64_t" else "int32_t"; SHLIB_EXT = stdenv.hostPlatform.extensions.sharedLibrary; in stdenv.mkDerivation { diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix index 48177987a7a..f0480e1e238 100644 --- a/pkgs/development/libraries/science/math/suitesparse/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { "BLAS=-lblas" "LAPACK=-llapack" "MY_METIS_LIB=-lmetis" - ] ++ stdenv.lib.optionals blas.is64bit [ + ] ++ stdenv.lib.optionals blas.isILP64 [ "CFLAGS=-DBLAS64" ] ++ stdenv.lib.optionals enableCuda [ "CUDA_PATH=${cudatoolkit}" diff --git a/pkgs/development/libraries/science/math/superlu/default.nix b/pkgs/development/libraries/science/math/superlu/default.nix index 05ceb21387d..ff59297bd83 100644 --- a/pkgs/development/libraries/science/math/superlu/default.nix +++ b/pkgs/development/libraries/science/math/superlu/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, gfortran, blas, lapack}: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { version = "5.2.1"; diff --git a/pkgs/development/libraries/sundials/2.x.nix b/pkgs/development/libraries/sundials/2.x.nix index 08cbd52ba39..b54e537fb82 100644 --- a/pkgs/development/libraries/sundials/2.x.nix +++ b/pkgs/development/libraries/sundials/2.x.nix @@ -8,7 +8,7 @@ , gfortran , lapackSupport ? true }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "sundials"; diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix index 8ed8d6cfcb5..46cf437d72c 100644 --- a/pkgs/development/libraries/sundials/default.nix +++ b/pkgs/development/libraries/sundials/default.nix @@ -7,7 +7,7 @@ , gfortran , lapackSupport ? true }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "sundials"; diff --git a/pkgs/development/ocaml-modules/lacaml/default.nix b/pkgs/development/ocaml-modules/lacaml/default.nix index e4da2216a83..23b38e469b4 100644 --- a/pkgs/development/ocaml-modules/lacaml/default.nix +++ b/pkgs/development/ocaml-modules/lacaml/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, darwin, ocaml, findlib, dune, base, stdio, lapack, blas }: assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.05.0"; -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-lacaml"; diff --git a/pkgs/development/ocaml-modules/owl/default.nix b/pkgs/development/ocaml-modules/owl/default.nix index c84743a8da5..b306ee9ce6d 100644 --- a/pkgs/development/ocaml-modules/owl/default.nix +++ b/pkgs/development/ocaml-modules/owl/default.nix @@ -11,7 +11,7 @@ , npy }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); assert blas.implementation == "openblas" && lapack.implementation == "openblas"; buildDunePackage rec { diff --git a/pkgs/development/python-modules/cvxopt/default.nix b/pkgs/development/python-modules/cvxopt/default.nix index 9266f406b15..2b6d1b4d248 100644 --- a/pkgs/development/python-modules/cvxopt/default.nix +++ b/pkgs/development/python-modules/cvxopt/default.nix @@ -14,7 +14,7 @@ , withFftw ? true }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); buildPythonPackage rec { pname = "cvxopt"; diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 7009d1d1cd0..f3d8dcba31d 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -12,7 +12,7 @@ , setuptoolsBuildHook }: -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); let cfg = writeTextFile { diff --git a/pkgs/tools/misc/hpl/default.nix b/pkgs/tools/misc/hpl/default.nix index c131de02180..d688f3adf30 100644 --- a/pkgs/tools/misc/hpl/default.nix +++ b/pkgs/tools/misc/hpl/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, blas, lapack, mpi } : -assert (!blas.is64bit) && (!lapack.is64bit); +assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "hpl"; diff --git a/pkgs/top-level/release-alternatives.nix b/pkgs/top-level/release-alternatives.nix index eef239d4e0a..7479377bd30 100644 --- a/pkgs/top-level/release-alternatives.nix +++ b/pkgs/top-level/release-alternatives.nix @@ -59,7 +59,7 @@ in { blas = mapListToAttrs supportedSystems (system': let system = lib.systems.elaborate { system = system'; }; in mapListToAttrs (blasProviders system) (provider: let - is64bit = builtins.elem provider (["mkl64"] ++ lib.optional system.is64bit "openblas"); + isILP64 = builtins.elem provider (["mkl64"] ++ lib.optional system.is64bit "openblas"); pkgs = pkgsFun { config = { inherit allowUnfree; }; system = system'; @@ -68,13 +68,13 @@ in lapackProvider = if provider == "mkl64" then super.mkl else builtins.getAttr provider super; - inherit is64bit; + inherit isILP64; }; blas = super.blas.override { blasProvider = if provider == "mkl64" then super.mkl else builtins.getAttr provider super; - inherit is64bit; + inherit isILP64; }; })]; }; -- cgit v1.2.3 From a6a502fca05a308a727450978417240e2f6ee0d7 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 20 Apr 2020 15:51:34 -0500 Subject: magma: remove mklSupport flag This now relies on the "blas" and "lapack" packages. --- pkgs/development/libraries/science/math/magma/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/science/math/magma/default.nix b/pkgs/development/libraries/science/math/magma/default.nix index b34139e7f48..dbe162c60b3 100644 --- a/pkgs/development/libraries/science/math/magma/default.nix +++ b/pkgs/development/libraries/science/math/magma/default.nix @@ -1,8 +1,4 @@ -{ stdenv, fetchurl, cmake, gfortran, cudatoolkit, libpthreadstubs, lapack, blas -, mklSupport ? false, mkl ? null -}: - -assert !mklSupport || mkl != null; +{ stdenv, fetchurl, cmake, gfortran, cudatoolkit, libpthreadstubs, lapack, blas }: with stdenv.lib; @@ -17,13 +13,10 @@ in stdenv.mkDerivation { name = "magma-${version}.tar.gz"; }; - buildInputs = [ gfortran cudatoolkit libpthreadstubs cmake ] - ++ (if mklSupport then [ mkl ] else [ lapack blas ]); + buildInputs = [ gfortran cudatoolkit libpthreadstubs cmake lapack blas ]; doCheck = false; - MKLROOT = optionalString mklSupport mkl; - preConfigure = '' export CC=${cudatoolkit.cc}/bin/gcc CXX=${cudatoolkit.cc}/bin/g++ ''; -- cgit v1.2.3 From 4b0b23db77d9a40f5e13a495819fc82182b9a460 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Mon, 20 Apr 2020 16:22:38 -0400 Subject: wifite2: 2.5.2 -> 2.5.3 --- pkgs/tools/networking/wifite2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/wifite2/default.nix b/pkgs/tools/networking/wifite2/default.nix index 8ff0c6d84ab..505e461e480 100644 --- a/pkgs/tools/networking/wifite2/default.nix +++ b/pkgs/tools/networking/wifite2/default.nix @@ -3,14 +3,14 @@ , hcxdumptool, pyrit, which }: python3.pkgs.buildPythonApplication rec { - version = "2.5.2"; + version = "2.5.3"; pname = "wifite2"; src = fetchFromGitHub { owner = "kimocoder"; repo = "wifite2"; rev = version; - sha256 = "0hsb59d86szn27s3hynpzkp49rmw4g692vrl67nal7rfcdvpp8hb"; + sha256 = "080hbjpbgdnzr6jkmg5cb8dvzxm57zpi4c9x0y92yy472vqll3ax"; }; patches = [ -- cgit v1.2.3 From cee5ddbb284692d98e35f97d2aba0ab9b422ff3a Mon Sep 17 00:00:00 2001 From: David Anderson Date: Sun, 19 Apr 2020 22:57:07 -0700 Subject: nixos/tailscale: set a CacheDir in the systemd unit. Fixes a bug where tailscaled drops some files into / when CacheDir is unset. Signed-off-by: David Anderson --- nixos/modules/services/networking/tailscale.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix index 513c42b4011..4d6aeb75ebd 100644 --- a/nixos/modules/services/networking/tailscale.nix +++ b/nixos/modules/services/networking/tailscale.nix @@ -37,7 +37,10 @@ in { RuntimeDirectoryMode = 755; StateDirectory = "tailscale"; - StateDirectoryMode = 700; + StateDirectoryMode = 750; + + CacheDirectory = "tailscale"; + CacheDirectoryMode = 750; Restart = "on-failure"; }; -- cgit v1.2.3 From d8b7b590c7b1166fad48935d757c3ff10375c89a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 21 Apr 2020 01:10:44 +0200 Subject: html-proofer: 3.15.2 -> 3.15.3 --- pkgs/tools/misc/html-proofer/Gemfile.lock | 4 ++-- pkgs/tools/misc/html-proofer/gemset.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/html-proofer/Gemfile.lock b/pkgs/tools/misc/html-proofer/Gemfile.lock index c3ff0fd210f..0ba32818d21 100644 --- a/pkgs/tools/misc/html-proofer/Gemfile.lock +++ b/pkgs/tools/misc/html-proofer/Gemfile.lock @@ -6,7 +6,7 @@ GEM ethon (0.12.0) ffi (>= 1.3.0) ffi (1.12.2) - html-proofer (3.15.2) + html-proofer (3.15.3) addressable (~> 2.3) mercenary (~> 0.3) nokogumbo (~> 2.0) @@ -21,7 +21,7 @@ GEM nokogumbo (2.0.2) nokogiri (~> 1.8, >= 1.8.4) parallel (1.19.1) - public_suffix (4.0.3) + public_suffix (4.0.4) rainbow (3.0.0) typhoeus (1.3.1) ethon (>= 0.9.0) diff --git a/pkgs/tools/misc/html-proofer/gemset.nix b/pkgs/tools/misc/html-proofer/gemset.nix index 2e3b3a10b3b..c5836bc74ba 100644 --- a/pkgs/tools/misc/html-proofer/gemset.nix +++ b/pkgs/tools/misc/html-proofer/gemset.nix @@ -37,10 +37,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1b7wx2hnwnml3y10x6yxybl3hy973n2ifq3hbqh0jd72bqs615wp"; + sha256 = "18afz6rz72j8hnfgzhyr21wh1rfy1x41iyhbcgaq0r1bd7ng1vni"; type = "gem"; }; - version = "3.15.2"; + version = "3.15.3"; }; mercenary = { groups = ["default"]; @@ -99,10 +99,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c6kq6s13idl2036b5lch8r7390f8w82cal8hcp4ml76fm2vdac7"; + sha256 = "1l1kqw75asziwmzrig8rywxswxz8l91sc3pvns02ffsqac1a3wiz"; type = "gem"; }; - version = "4.0.3"; + version = "4.0.4"; }; rainbow = { groups = ["default"]; -- cgit v1.2.3 From 7448089fd68d8e4a3b7d643551e1891675a65be2 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 21 Apr 2020 09:28:17 +1000 Subject: cni: 0.7.0 -> 0.7.1 https://github.com/containernetworking/cni/releases/tag/v0.7.1 --- pkgs/applications/networking/cluster/cni/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix index 8e74f834eaf..49d3aaa298d 100644 --- a/pkgs/applications/networking/cluster/cni/default.nix +++ b/pkgs/applications/networking/cluster/cni/default.nix @@ -1,18 +1,19 @@ -{ stdenv, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { pname = "cni"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "containernetworking"; repo = pname; rev = "v${version}"; - sha256 = "15ad323dw44k82bfx9r8w5q2kn7jix60p9v4ciyzx2p5pip36wp8"; + sha256 = "02qn1br8164d99978acalisy1sx294g1axnii4yh1wji0fc735xz"; }; goPackagePath = "github.com/containernetworking/cni"; - meta = with stdenv.lib; { + + meta = with lib; { description = "Container Network Interface - networking for Linux containers"; license = licenses.asl20; homepage = "https://github.com/containernetworking/cni"; -- cgit v1.2.3 From 202b87ca998f058b365dd1a5053ddfe97894e79f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 21 Apr 2020 09:29:29 +1000 Subject: cni-plugins: 0.8.4 -> 0.8.5 https://github.com/containernetworking/plugins/releases/tag/v0.8.5 --- .../networking/cluster/cni/plugins-deps.nix | 210 --------------------- .../networking/cluster/cni/plugins.nix | 28 +-- 2 files changed, 15 insertions(+), 223 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/cni/plugins-deps.nix diff --git a/pkgs/applications/networking/cluster/cni/plugins-deps.nix b/pkgs/applications/networking/cluster/cni/plugins-deps.nix deleted file mode 100644 index a6bbd333be4..00000000000 --- a/pkgs/applications/networking/cluster/cni/plugins-deps.nix +++ /dev/null @@ -1,210 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "github.com/Microsoft/go-winio"; - fetch = { - type = "git"; - url = "https://github.com/Microsoft/go-winio"; - rev = "v0.4.11"; - sha256 = "14y1gryr3pb3zy09v2g8dh89m363rfd9sch0wgbabh531hfx72vn"; - }; - } - { - goPackagePath = "github.com/Microsoft/hcsshim"; - fetch = { - type = "git"; - url = "https://github.com/Microsoft/hcsshim"; - rev = "v0.7.4"; - sha256 = "0hky9p6xvkkx2jfkd4fy2d6iaikvlzalyw67gypyqyxygf2hsshg"; - }; - } - { - goPackagePath = "github.com/alexflint/go-filemutex"; - fetch = { - type = "git"; - url = "https://github.com/alexflint/go-filemutex"; - rev = "72bdc8eae2ae"; - sha256 = "082y6y9zv40q3kaqvsv6fyaw2fc42j0sn9z0dl9rbiz4szixj3c4"; - }; - } - { - goPackagePath = "github.com/buger/jsonparser"; - fetch = { - type = "git"; - url = "https://github.com/buger/jsonparser"; - rev = "f4dd9f5a6b44"; - sha256 = "12qa2n33s7yz88ywpr3k9kg3b4gm6rqgnv28iyikyxw8h5jascz5"; - }; - } - { - goPackagePath = "github.com/containernetworking/cni"; - fetch = { - type = "git"; - url = "https://github.com/containernetworking/cni"; - rev = "v0.7.0"; - sha256 = "15ad323dw44k82bfx9r8w5q2kn7jix60p9v4ciyzx2p5pip36wp8"; - }; - } - { - goPackagePath = "github.com/coreos/go-iptables"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-iptables"; - rev = "v0.4.1"; - sha256 = "0id1npqw3rd5rrkslf6i9yy6lpmd7l5qcglln38g85ylq7inysyi"; - }; - } - { - goPackagePath = "github.com/coreos/go-systemd"; - fetch = { - type = "git"; - url = "https://github.com/coreos/go-systemd"; - rev = "39ca1b05acc7"; - sha256 = "1kzqrrzqspa5qm7kwslxl3m16lqzns23c24rv474ajzwmj3ixmx1"; - }; - } - { - goPackagePath = "github.com/d2g/dhcp4"; - fetch = { - type = "git"; - url = "https://github.com/d2g/dhcp4"; - rev = "f0e4d29ff023"; - sha256 = "07gn9bjvnlfz2jv9wdq3gxxxm9lpwgrwk8z65072jdrz9rs9izpr"; - }; - } - { - goPackagePath = "github.com/d2g/dhcp4client"; - fetch = { - type = "git"; - url = "https://github.com/d2g/dhcp4client"; - rev = "bed07e1bc5b8"; - sha256 = "0kyjalv1kah7sk3i96abg71cgy5s9kzpff2zc7mwj69vicbj7mi3"; - }; - } - { - goPackagePath = "github.com/d2g/dhcp4server"; - fetch = { - type = "git"; - url = "https://github.com/d2g/dhcp4server"; - rev = "477b11cea4dc"; - sha256 = "010dpw6cxrsm6dm49w1q6qpz5xz3lbi5viz6wywxk49fxvnzmx9l"; - }; - } - { - goPackagePath = "github.com/godbus/dbus"; - fetch = { - type = "git"; - url = "https://github.com/godbus/dbus"; - rev = "885f9cc04c9c"; - sha256 = "0wjpaj4vr5lvpnwc5faf3qizd7zd2v9yq0fm0558wap1hiyqb8x8"; - }; - } - { - goPackagePath = "github.com/j-keck/arping"; - fetch = { - type = "git"; - url = "https://github.com/j-keck/arping"; - rev = "2cf9dc699c56"; - sha256 = "1bid8mpx3j4546ni0a6q5xyz7hb854g95qnxqmg5jzs9vrcird3c"; - }; - } - { - goPackagePath = "github.com/juju/errors"; - fetch = { - type = "git"; - url = "https://github.com/juju/errors"; - rev = "22422dad46e1"; - sha256 = "1766ys24y9qgngaqbx0g84lmh54b3369v8hk5fa1k8si2d34fxas"; - }; - } - { - goPackagePath = "github.com/mattn/go-shellwords"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-shellwords"; - rev = "v1.0.3"; - sha256 = "1pg7pl25wvpl2dbpyrv9p1r7prnqimxlf6136vn0dfm54j2x4mnr"; - }; - } - { - goPackagePath = "github.com/onsi/ginkgo"; - fetch = { - type = "git"; - url = "https://github.com/onsi/ginkgo"; - rev = "7f8ab55aaf3b"; - sha256 = "0nas6wqdym4jx42kw9wj80b58r69k9qhnvglz009lj34g5gba7rw"; - }; - } - { - goPackagePath = "github.com/onsi/gomega"; - fetch = { - type = "git"; - url = "https://github.com/onsi/gomega"; - rev = "2152b45fa28a"; - sha256 = "0amjlkawp84mmdqjgdamf93p1546cla6h4wwrx7hf5r862r2qcw2"; - }; - } - { - goPackagePath = "github.com/safchain/ethtool"; - fetch = { - type = "git"; - url = "https://github.com/safchain/ethtool"; - rev = "42ed695e3de8"; - sha256 = "0n5hkrzc1bh46nidcssx4539kvcmgj501v3kzh2pljpg27509daj"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "v1.0.6"; - sha256 = "029irw2lsbqi944gdrbkwdw0m2794sqni4g21gsnmz142hbzds8c"; - }; - } - { - goPackagePath = "github.com/vishvananda/netlink"; - fetch = { - type = "git"; - url = "https://github.com/vishvananda/netlink"; - rev = "023a6dafdcdf"; - sha256 = "1i5q8r8rg7lxzvq2vhbf25lrkzdlgficfv0bxg9rf7cgg6z819sn"; - }; - } - { - goPackagePath = "github.com/vishvananda/netns"; - fetch = { - type = "git"; - url = "https://github.com/vishvananda/netns"; - rev = "13995c7128cc"; - sha256 = "1zk6w8158qi4niva5rijchbv9ixgmijsgqshh54wdaav4xrhjshn"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "7c1a557ab941"; - sha256 = "1f1q9mby8m7ws3gbj90v0prhnf4g2sgf74azmw31kzwd6azlar3m"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "49bb7cea24b1"; - sha256 = "111q4qm3hcjvzvyv9y5rz8ydnyg48rckcygxqy6gv63q618wz6gn"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "66b7b1311ac8"; - sha256 = "00ny4r2bbj6rz939iy9g699acqydq7rfi6r6awn25w9i2dld9m13"; - }; - } -] diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index 8988c7efc33..9c6eec1a336 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -1,24 +1,22 @@ -{ stdenv, lib, fetchFromGitHub, go, removeReferencesTo, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoPackage }: + buildGoPackage rec { pname = "cni-plugins"; - version = "0.8.4"; + version = "0.8.5"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - sha256 = "02kz6y3klhbriybsskn4hmldwli28cycnp2klsm2x0y9c73iczdp"; + sha256 = "17c8pvpn0dpda6ah7irr9hhd8sk7mnm32zv72nc5pxg1xvfpaipi"; }; - goDeps = ./plugins-deps.nix; goPackagePath = "github.com/containernetworking/plugins"; + subPackages = [ - "plugins/meta/bandwidth" - "plugins/meta/firewall" - "plugins/meta/flannel" - "plugins/meta/portmap" - "plugins/meta/sbr" - "plugins/meta/tuning" + "plugins/ipam/dhcp" + "plugins/ipam/host-local" + "plugins/ipam/static" "plugins/main/bridge" "plugins/main/host-device" "plugins/main/ipvlan" @@ -26,10 +24,14 @@ buildGoPackage rec { "plugins/main/macvlan" "plugins/main/ptp" "plugins/main/vlan" - "plugins/ipam/dhcp" - "plugins/ipam/host-local" - "plugins/ipam/static" + "plugins/meta/bandwidth" + "plugins/meta/firewall" + "plugins/meta/flannel" + "plugins/meta/portmap" + "plugins/meta/sbr" + "plugins/meta/tuning" ]; + meta = with lib; { description = "Some standard networking plugins, maintained by the CNI team"; homepage = "https://github.com/containernetworking/plugins"; -- cgit v1.2.3 From 3e880bad79d2cef9afc02db6d635e30479f18418 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 20 Apr 2020 19:51:49 -0400 Subject: darwin.cctools: split man output --- pkgs/os-specific/darwin/cctools/port.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index 368f2938064..e73d185fc41 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -28,7 +28,7 @@ let sha256 = "0h8b1my0wf1jyjq63wbiqkl2clgxsf87f6i4fjhqs431fzlq8sac"; }; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "man" ]; nativeBuildInputs = [ autoconf automake libtool autoreconfHook ]; buildInputs = [ libuuid ] -- cgit v1.2.3 From d19089e1e7ef569399cd010bffed739ba6ffb1fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Tue, 21 Apr 2020 02:07:53 +0200 Subject: nixos/tools: adapt for renamed console options --- nixos/modules/installer/tools/tools.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 655d77db157..11128621424 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -111,10 +111,10 @@ in # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; # Select internationalisation properties. - # i18n = { - # consoleFont = "Lat2-Terminus16"; - # consoleKeyMap = "us"; - # defaultLocale = "en_US.UTF-8"; + # i18n.defaultLocale = "en_US.UTF-8"; + # console = { + # font = "Lat2-Terminus16"; + # keyMap = "us"; # }; # Set your time zone. -- cgit v1.2.3 From d168227e2a3b8d3004267a9bab75fe5ae845037f Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Tue, 21 Apr 2020 02:30:12 +0200 Subject: ledger-live-desktop: 2.1.0 -> 2.2.4 --- pkgs/applications/blockchains/ledger-live-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index edc68f9d0c7..d3224f8a706 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.1.0"; + version = "2.2.4"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "1ywvdqmq8asczhmvc6ai2v6di1f5q19x3ygqlinwz8d1hrj3496r"; + sha256 = "0ymn7jp14jaj3v4yj32kyxic47qa87rbngkdld1p977g7zg2pc86"; }; appimageContents = appimageTools.extractType2 { -- cgit v1.2.3 From fd580728d9e1bb51a56b15f85423c9622d0b04e8 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Tue, 21 Apr 2020 09:23:53 +0800 Subject: cargo-expand: 0.4.19 -> 0.5.0 --- pkgs/development/tools/rust/cargo-expand/default.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index 73dcb96201e..8274c50f582 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -1,25 +1,21 @@ -{ stdenv, rustPlatform, fetchFromGitHub, llvmPackages, darwin }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "0.4.19"; + version = "0.5.0"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "15izqd6nbpxjjymdmcpzjmaiygs1vdrpg9cw1nzmrkb8fc4h5ch5"; + sha256 = "1zpnhigsa0cyr3lj0h7z2xhi01zjrnakvvrgmqz4lyf5gabh9vcg"; }; - cargoSha256 = "0sbpymxhhwxg13w9821b17nda6p3ycqr81i7bj4fxil0n3sb910h"; + cargoSha256 = "1rdh1b240gcjbk3wc384x459lbp8dy9a9mgrampqjk1n115zgbzp"; - buildInputs = [ llvmPackages.libclang ] - ++ stdenv.lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; - - LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; - - meta = with stdenv.lib; { - description = "A utility and Cargo subcommand designed to let people expand macros in their Rust source code"; + meta = with 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; -- cgit v1.2.3 From 607522c78db958555de68ef6342857398f2002f4 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Mon, 20 Apr 2020 16:31:59 -0400 Subject: numpy: Use blas and lapack dev outputs for include dirs --- pkgs/development/python-modules/numpy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index f3d8dcba31d..4a062ca7b97 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -19,7 +19,7 @@ let name = "site.cfg"; text = (lib.generators.toINI {} { ${blas.implementation} = { - include_dirs = "${blas}/include:${lapack}/include"; + include_dirs = "${lib.getDev blas}/include:${lib.getDev lapack}/include"; library_dirs = "${blas}/lib:${lapack}/lib"; libraries = "lapack,lapacke,blas,cblas"; }; -- cgit v1.2.3 From c450617f99ede98b7641eb77e60b17ca1812dbb8 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 20 Apr 2020 23:47:17 -0400 Subject: bintools-wrapper: only propagate .info output if it exists in the original --- pkgs/build-support/bintools-wrapper/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix index 84020505a63..5cc99c6412a 100644 --- a/pkgs/build-support/bintools-wrapper/default.nix +++ b/pkgs/build-support/bintools-wrapper/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation { inherit targetPrefix infixSalt; - outputs = [ "out" ] ++ optionals propagateDoc [ "man" "info" ]; + outputs = [ "out" ] ++ optionals propagateDoc ([ "man" ] ++ optional (bintools ? info) "info"); passthru = { inherit bintools libc nativeTools nativeLibc nativePrefix; @@ -259,14 +259,15 @@ stdenv.mkDerivation { printWords ${bintools_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages '' - + optionalString propagateDoc '' + + optionalString propagateDoc ('' ## ## Man page and info support ## ln -s ${bintools.man} $man + '' + optionalString (bintools ? info) '' ln -s ${bintools.info} $info - '' + '') + '' ## -- cgit v1.2.3 From 125c469d3ee8ee6d4aea285e0aff456031435572 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 20 Apr 2020 20:05:35 -0400 Subject: darwin.binutils.bintools: propagate man pages from cctools --- pkgs/os-specific/darwin/binutils/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix index e31f9b91f97..fad33b21d04 100644 --- a/pkgs/os-specific/darwin/binutils/default.nix +++ b/pkgs/os-specific/darwin/binutils/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation { pname = "${targetPrefix}cctools-binutils-darwin"; inherit (cctools) version; - outputs = [ "out" "info" "man" ]; + outputs = [ "out" "man" ]; buildCommand = '' mkdir -p $out/bin $out/include @@ -42,12 +42,13 @@ stdenv.mkDerivation { ln -s ${cctools}/libexec $out/libexec - mkdir -p "$info/nix-support" "$man/nix-support" - printWords ${binutils-unwrapped.info} \ - >> $info/nix-support/propagated-build-inputs - # FIXME: cctools missing man pages - printWords ${binutils-unwrapped.man} \ - >> $man/nix-support/propagated-build-inputs + mkdir -p "$man"/share/man/man{1,5} + for i in ${builtins.concatStringsSep " " cmds}; do + for path in "${cctools.man}"/share/man/man?/$i.*; do + dest_path="$man''${path#${cctools.man}}" + ln -sv "$path" "$dest_path" + done + done ''; passthru = { -- cgit v1.2.3 From c00ad799a084ec2896ebfefff3ae6b31eade49d5 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 20 Apr 2020 23:52:24 -0400 Subject: darwin.cctools: install ar man pages In the distribution they are located in a separate directory from the others and the standard installation doesn't process them. --- pkgs/os-specific/darwin/cctools/port.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix index e73d185fc41..0c25f225291 100644 --- a/pkgs/os-specific/darwin/cctools/port.nix +++ b/pkgs/os-specific/darwin/cctools/port.nix @@ -1,4 +1,5 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool, autoreconfHook +, installShellFiles , libcxxabi, libuuid , libobjc ? null, maloader ? null , enableTapiSupport ? true, libtapi @@ -30,7 +31,7 @@ let outputs = [ "out" "dev" "man" ]; - nativeBuildInputs = [ autoconf automake libtool autoreconfHook ]; + nativeBuildInputs = [ autoconf automake libtool autoreconfHook installShellFiles ]; buildInputs = [ libuuid ] ++ stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ] ++ stdenv.lib.optional enableTapiSupport libtapi; @@ -88,6 +89,8 @@ let pushd include make DSTROOT=$out/include RC_OS=common install popd + + installManPage ar/ar.{1,5} ''; passthru = { -- cgit v1.2.3 From 0caa375b4ceac2031b3b6d270019d476c9e61bd6 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 20 Apr 2020 23:32:03 -0500 Subject: blas,lapack: provide symlink for libmkl_rt.so This is needed for numpy to detect mkl correctly. --- pkgs/build-support/alternatives/blas/default.nix | 1 + pkgs/build-support/alternatives/lapack/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/build-support/alternatives/blas/default.nix b/pkgs/build-support/alternatives/blas/default.nix index 45fb69eddb7..90cafbf53ce 100644 --- a/pkgs/build-support/alternatives/blas/default.nix +++ b/pkgs/build-support/alternatives/blas/default.nix @@ -135,5 +135,6 @@ EOF '' + stdenv.lib.optionalString (blasImplementation == "mkl") '' mkdir -p $out/nix-support echo 'export MKL_INTERFACE_LAYER=${lib.optionalString isILP64 "I"}LP64,GNU' > $out/nix-support/setup-hook + ln -s $out/lib/libblas${canonicalExtension} $out/lib/libmkl_rt${stdenv.hostPlatform.extensions.sharedLibrary} ''); } diff --git a/pkgs/build-support/alternatives/lapack/default.nix b/pkgs/build-support/alternatives/lapack/default.nix index c90eb43494d..935150bdb7d 100644 --- a/pkgs/build-support/alternatives/lapack/default.nix +++ b/pkgs/build-support/alternatives/lapack/default.nix @@ -109,5 +109,6 @@ EOF '' + stdenv.lib.optionalString (lapackImplementation == "mkl") '' mkdir -p $out/nix-support echo 'export MKL_INTERFACE_LAYER=${lib.optionalString isILP64 "I"}LP64,GNU' > $out/nix-support/setup-hook + ln -s $out/lib/liblapack${canonicalExtension} $out/lib/libmkl_rt${stdenv.hostPlatform.extensions.sharedLibrary} ''); } -- cgit v1.2.3 From 8f58fa044dca8becdc865c2feb51e5048bf14fef Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 21 Apr 2020 00:29:52 -0500 Subject: blas,lapack: symlink headers when using mkl Some of these are necessary for things like python.pkgs.numexpr --- pkgs/build-support/alternatives/blas/default.nix | 1 + pkgs/build-support/alternatives/lapack/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/build-support/alternatives/blas/default.nix b/pkgs/build-support/alternatives/blas/default.nix index 90cafbf53ce..8bba49b4550 100644 --- a/pkgs/build-support/alternatives/blas/default.nix +++ b/pkgs/build-support/alternatives/blas/default.nix @@ -136,5 +136,6 @@ EOF mkdir -p $out/nix-support echo 'export MKL_INTERFACE_LAYER=${lib.optionalString isILP64 "I"}LP64,GNU' > $out/nix-support/setup-hook ln -s $out/lib/libblas${canonicalExtension} $out/lib/libmkl_rt${stdenv.hostPlatform.extensions.sharedLibrary} + ln -sf ${blasProvider}/include/* $dev/include ''); } diff --git a/pkgs/build-support/alternatives/lapack/default.nix b/pkgs/build-support/alternatives/lapack/default.nix index 935150bdb7d..e260ad1bd93 100644 --- a/pkgs/build-support/alternatives/lapack/default.nix +++ b/pkgs/build-support/alternatives/lapack/default.nix @@ -110,5 +110,6 @@ EOF mkdir -p $out/nix-support echo 'export MKL_INTERFACE_LAYER=${lib.optionalString isILP64 "I"}LP64,GNU' > $out/nix-support/setup-hook ln -s $out/lib/liblapack${canonicalExtension} $out/lib/libmkl_rt${stdenv.hostPlatform.extensions.sharedLibrary} + ln -sf ${lapackProvider}/include/* $dev/include ''); } -- cgit v1.2.3 From ae9529c27d5cbbea730d507ab4e69dcf9d6c2be7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 21 Apr 2020 07:37:15 +0200 Subject: arc-theme: mark as broken --- pkgs/data/themes/arc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix index c08d4c57786..53e81b323dc 100644 --- a/pkgs/data/themes/arc/default.nix +++ b/pkgs/data/themes/arc/default.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ simonvandel romildo ]; platforms = platforms.linux; + broken = true; # since libsass 3.6.3 }; } -- cgit v1.2.3 From 7856c8ba5dbc162ade78963b1c9101b5e3612ffa Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 21 Apr 2020 07:37:22 +0200 Subject: yaru-theme: mark as broken --- pkgs/data/themes/yaru/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index 9e56326b2eb..6033d64d79b 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { license = with licenses; [ cc-by-sa-40 gpl3 ]; platforms = platforms.linux; maintainers = [ maintainers.jD91mZM2 ]; + broken = true; # since libsass 3.6.3 }; } -- cgit v1.2.3 From 5dc6f02d77997bf8eaa3591cc59dbaae4c304577 Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Mon, 20 Apr 2020 23:59:58 +0200 Subject: lektor: fix "ImportError: No module named pkg_resources" --- pkgs/development/python-modules/lektor/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/lektor/default.nix b/pkgs/development/python-modules/lektor/default.nix index 0fe3a11ae26..844e28aa078 100644 --- a/pkgs/development/python-modules/lektor/default.nix +++ b/pkgs/development/python-modules/lektor/default.nix @@ -19,6 +19,7 @@ , pytest-click , isPy27 , functools32 +, setuptools }: buildPythonPackage rec { @@ -34,7 +35,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click watchdog exifread requests mistune inifile Babel jinja2 - flask pyopenssl ndg-httpsclient + flask pyopenssl ndg-httpsclient setuptools ] ++ lib.optionals isPy27 [ functools32 ]; checkInputs = [ -- cgit v1.2.3 From 45a04ed6d49a35f88fd34701ca06c8676d2cb148 Mon Sep 17 00:00:00 2001 From: Greg Price Date: Wed, 8 Apr 2020 23:41:41 -0700 Subject: gbsplay: fix configure flags This caused none of these flags to have any effect. That's because the configure command looked like this: ./configure --prefix=/nix/store/svhl0fjdj1jl2sqcppy5vnzpfi4gj3d3-gbsplay-2016-12-17 \ --without-test\ --without-contrib\ --disable-devdsp\ --enable-pulse\ --disable-alsa\ --disable-midi\ --disable-nas\ --disable-dsound\ --disable-i18n with one giant flag '--without-test --without-contrib...', containing internal spaces. This can be seen in `nix log nixpkgs.gbsplay`, in this line: configure flags: --prefix=/nix/store/svhl0fjdj1jl2sqcppy5vnzpfi4gj3d3-gbsplay-2016-12-17 --without-test\ --without-contrib\ --disable-devdsp\ --enable-pulse\ --disable-alsa\ --disable-midi\ --disable-nas\ --disable-dsound\ --disable-i18n and then in the fact that features like "devdsp" and "midi" are listed as enabled in later output, and source files like plugout_midi.c are included in the build. I don't have a real opinion on whether it's better to have these flags or not, but it's clear the author's intention was to pass them. So, fix the attr name so they get passed. --- pkgs/applications/audio/gbsplay/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/gbsplay/default.nix b/pkgs/applications/audio/gbsplay/default.nix index 9ff9b8dc114..f89b8ed399b 100644 --- a/pkgs/applications/audio/gbsplay/default.nix +++ b/pkgs/applications/audio/gbsplay/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation { }; buildInputs = [ libpulseaudio ]; - - configureFlagsArray = + + configureFlags = [ "--without-test" "--without-contrib" "--disable-devdsp" "--enable-pulse" "--disable-alsa" "--disable-midi" "--disable-nas" "--disable-dsound" "--disable-i18n" ]; - makeFlagsArray = [ "tests=" ]; + makeFlags = [ "tests=" ]; meta = with stdenv.lib; { description = "gameboy sound player"; -- cgit v1.2.3 From 30cafee8b65c4c65d6f0a989a8492f33e015bf82 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Fri, 13 Mar 2020 11:15:57 -0400 Subject: elastix: python -> python3 --- pkgs/development/libraries/science/biology/elastix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/biology/elastix/default.nix b/pkgs/development/libraries/science/biology/elastix/default.nix index e88e79cdcf4..66bde6c14e6 100644 --- a/pkgs/development/libraries/science/biology/elastix/default.nix +++ b/pkgs/development/libraries/science/biology/elastix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, itk, python }: +{ stdenv, fetchFromGitHub, cmake, itk, python3 }: stdenv.mkDerivation rec { pname = "elastix"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { rev = version; sha256 = "1zrl7rz4lwsx88b2shnl985f3a97lmp4ksbd437h9y0hfjq8l0lj"; }; - nativeBuildInputs = [ cmake python ]; + nativeBuildInputs = [ cmake python3 ]; buildInputs = [ itk ]; meta = with stdenv.lib; { -- cgit v1.2.3 From fe07e2b2ac54b352680658ae2ececbe721433e14 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Fri, 13 Mar 2020 11:16:34 -0400 Subject: elastix: enable tests --- pkgs/development/libraries/science/biology/elastix/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/science/biology/elastix/default.nix b/pkgs/development/libraries/science/biology/elastix/default.nix index 66bde6c14e6..e5565aae29b 100644 --- a/pkgs/development/libraries/science/biology/elastix/default.nix +++ b/pkgs/development/libraries/science/biology/elastix/default.nix @@ -10,9 +10,16 @@ stdenv.mkDerivation rec { rev = version; sha256 = "1zrl7rz4lwsx88b2shnl985f3a97lmp4ksbd437h9y0hfjq8l0lj"; }; + nativeBuildInputs = [ cmake python3 ]; buildInputs = [ itk ]; + doCheck = true; + + preCheck = " + export LD_LIBRARY_PATH=$(pwd)/bin + "; + meta = with stdenv.lib; { homepage = "http://elastix.isi.uu.nl/"; description = "Image registration toolkit based on ITK"; -- cgit v1.2.3 From c7d4882ab15f911258adf853785c904620159707 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 21 Apr 2020 01:56:13 -0400 Subject: python3Packages.matplotlib: 3.1.3 -> 3.2.1, and various cleanups (#84362) * pythonPackages.matplotlib: add veprbl to maintainers * pythonPackages.matplotlib: remove an old darwin hack * pythonPackages.matplotlib: remove python and stdenv from buildInputs * python3Packages.matplotlib: remove a hack for python33 * pythonPackages.matplotlib: remove outdated checkPhase Downloading the baseline_images is not a real issue, building against older freetype (local_freetype = True) is, perhaps, not what we want. The good news is that the tests would pass (tested on 3.2.1) if we were to enable them: ========== 6684 passed, 1332 skipped, 10 xfailed in 228.64s (0:03:48) ========== * pythonPackages.matplotlib: provide setup.cfg from a file instead of a patch * python3Packages.matplotlib: 3.1.3 -> 3.2.1 --- pkgs/development/python-modules/matplotlib/2.nix | 45 ++++++++-------------- .../python-modules/matplotlib/basedirlist.patch | 8 ---- .../python-modules/matplotlib/default.nix | 35 +++++------------ .../python-modules/matplotlib/setup.cfg | 2 + 4 files changed, 28 insertions(+), 62 deletions(-) delete mode 100644 pkgs/development/python-modules/matplotlib/basedirlist.patch create mode 100644 pkgs/development/python-modules/matplotlib/setup.cfg diff --git a/pkgs/development/python-modules/matplotlib/2.nix b/pkgs/development/python-modules/matplotlib/2.nix index 8ea530489e2..dd25860795b 100644 --- a/pkgs/development/python-modules/matplotlib/2.nix +++ b/pkgs/development/python-modules/matplotlib/2.nix @@ -7,7 +7,6 @@ # darwin has its own "MacOSX" backend , enableTk ? !stdenv.isDarwin, tcl ? null, tk ? null, tkinter ? null, libX11 ? null , enableQt ? false, pyqt4 -, libcxx , Cocoa , pythonOlder }: @@ -29,13 +28,20 @@ buildPythonPackage rec { sha256 = "7355bf757ecacd5f0ac9dd9523c8e1a1103faadf8d33c22664178e17533f8ce5"; }; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; + patches = [ + # https://github.com/matplotlib/matplotlib/pull/12478 + (fetchpatch { + name = "numpy-1.16-compat.patch"; + url = "https://github.com/matplotlib/matplotlib/commit/2980184d092382a40ab21f95b79582ffae6e19d6.patch"; + sha256 = "1c0wj28zy8s5h6qiavx9zzbhlmhjwpzbc3fyyw9039mbnqk0spg2"; + }) + ]; XDG_RUNTIME_DIR = "/tmp"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ python which sphinx stdenv ] + buildInputs = [ which sphinx ] ++ stdenv.lib.optional enableGhostscript ghostscript ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ]; @@ -48,16 +54,10 @@ buildPythonPackage rec { ++ stdenv.lib.optionals enableQt [ pyqt4 ] ++ stdenv.lib.optionals python.isPy2 [ functools32 subprocess32 ]; - patches = [ - ./basedirlist.patch - - # https://github.com/matplotlib/matplotlib/pull/12478 - (fetchpatch { - name = "numpy-1.16-compat.patch"; - url = "https://github.com/matplotlib/matplotlib/commit/2980184d092382a40ab21f95b79582ffae6e19d6.patch"; - sha256 = "1c0wj28zy8s5h6qiavx9zzbhlmhjwpzbc3fyyw9039mbnqk0spg2"; - }) - ]; + setup_cfg = ./setup.cfg; + preBuild = '' + cp "$setup_cfg" ./setup.cfg + ''; # Matplotlib tries to find Tcl/Tk by opening a Tk window and asking the # corresponding interpreter object for its library paths. This fails if @@ -73,27 +73,14 @@ buildPythonPackage rec { stdenv.lib.optionalString enableTk "sed -i '/self.tcl_tk_cache = None/s|None|${tcl_tk_cache}|' setupext.py"; - checkPhase = '' - ${python.interpreter} tests.py - ''; - - # Test data is not included in the distribution (the `tests` folder - # is missing) + # Matplotlib needs to be built against a specific version of freetype in + # order for all of the tests to pass. doCheck = false; - prePatch = '' - # Failing test: ERROR: matplotlib.tests.test_style.test_use_url - sed -i 's/test_use_url/fails/' lib/matplotlib/tests/test_style.py - # Failing test: ERROR: test suite for - sed -i 's/TestTinyPages/fails/' lib/matplotlib/sphinxext/tests/test_tinypages.py - # Transient errors - sed -i 's/test_invisible_Line_rendering/noop/' lib/matplotlib/tests/test_lines.py - ''; - meta = with stdenv.lib; { description = "Python plotting library, making publication quality plots"; homepage = "https://matplotlib.org/"; - maintainers = with maintainers; [ lovek323 ]; + maintainers = with maintainers; [ lovek323 veprbl ]; }; } diff --git a/pkgs/development/python-modules/matplotlib/basedirlist.patch b/pkgs/development/python-modules/matplotlib/basedirlist.patch deleted file mode 100644 index 0a84a05bbae..00000000000 --- a/pkgs/development/python-modules/matplotlib/basedirlist.patch +++ /dev/null @@ -1,8 +0,0 @@ -diff --git a/setup.cfg b/setup.cfg -new file mode 100644 -index 0000000..6f81985 ---- /dev/null -+++ b/setup.cfg -@@ -0,0 +1,2 @@ -+[directories] -+basedirlist = . diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 658388eabae..03afcfe75ae 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -6,7 +6,6 @@ # darwin has its own "MacOSX" backend , enableTk ? !stdenv.isDarwin, tcl ? null, tk ? null, tkinter ? null, libX11 ? null , enableQt ? false, pyqt5 ? null -, libcxx , Cocoa , pythonOlder }: @@ -20,36 +19,35 @@ assert enableTk -> (tcl != null) assert enableQt -> pyqt5 != null; buildPythonPackage rec { - version = "3.1.3"; + version = "3.2.1"; pname = "matplotlib"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "db3121f12fb9b99f105d1413aebaeb3d943f269f3d262b45586d12765866f0c6"; + sha256 = "ffe2f9cdcea1086fc414e82f42271ecf1976700b8edd16ca9d376189c6d93aee"; }; - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; - XDG_RUNTIME_DIR = "/tmp"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ python which sphinx stdenv ] + buildInputs = [ which sphinx ] ++ stdenv.lib.optional enableGhostscript ghostscript ++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ]; propagatedBuildInputs = [ cycler dateutil numpy pyparsing tornado freetype kiwisolver libpng mock pytz ] - ++ stdenv.lib.optional (pythonOlder "3.3") backports_functools_lru_cache ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ] ++ stdenv.lib.optionals enableQt [ pyqt5 ]; - patches = - [ ./basedirlist.patch ]; + setup_cfg = ./setup.cfg; + preBuild = '' + cp "$setup_cfg" ./setup.cfg + ''; # Matplotlib tries to find Tcl/Tk by opening a Tk window and asking the # corresponding interpreter object for its library paths. This fails if @@ -65,27 +63,14 @@ buildPythonPackage rec { stdenv.lib.optionalString enableTk "sed -i '/self.tcl_tk_cache = None/s|None|${tcl_tk_cache}|' setupext.py"; - checkPhase = '' - ${python.interpreter} tests.py - ''; - - # Test data is not included in the distribution (the `tests` folder - # is missing) + # Matplotlib needs to be built against a specific version of freetype in + # order for all of the tests to pass. doCheck = false; - prePatch = '' - # Failing test: ERROR: matplotlib.tests.test_style.test_use_url - sed -i 's/test_use_url/fails/' lib/matplotlib/tests/test_style.py - # Failing test: ERROR: test suite for - sed -i 's/TestTinyPages/fails/' lib/matplotlib/sphinxext/tests/test_tinypages.py - # Transient errors - sed -i 's/test_invisible_Line_rendering/noop/' lib/matplotlib/tests/test_lines.py - ''; - meta = with stdenv.lib; { description = "Python plotting library, making publication quality plots"; homepage = "https://matplotlib.org/"; - maintainers = with maintainers; [ lovek323 ]; + maintainers = with maintainers; [ lovek323 veprbl ]; }; } diff --git a/pkgs/development/python-modules/matplotlib/setup.cfg b/pkgs/development/python-modules/matplotlib/setup.cfg new file mode 100644 index 00000000000..6f81985efa4 --- /dev/null +++ b/pkgs/development/python-modules/matplotlib/setup.cfg @@ -0,0 +1,2 @@ +[directories] +basedirlist = . -- cgit v1.2.3 From 529165cfac6a17a32075006c8cd04a0b2129e412 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Mon, 20 Apr 2020 22:15:08 -0400 Subject: doc/texlive: remove known problems section Couple items are outdated. Also they don't belong to documentation - should go to the issue tracker instead. --- doc/languages-frameworks/texlive.xml | 27 --------------------------- 1 file changed, 27 deletions(-) diff --git a/doc/languages-frameworks/texlive.xml b/doc/languages-frameworks/texlive.xml index 8fa8f963b2f..a581ec5911c 100644 --- a/doc/languages-frameworks/texlive.xml +++ b/doc/languages-frameworks/texlive.xml @@ -149,31 +149,4 @@ EOF ]]> - -
- Known problems - - - - - Some tools are still missing, e.g. luajittex; - - - - - some apps aren't packaged/tested yet (asymptote, biber, etc.); - - - - - feature/bug: when a package is rejected by pkgFilter, its dependencies are still propagated; - - - - - in case of any bugs or feature requests, file a github issue or better a pull request and /cc @vcunat. - - - -
-- cgit v1.2.3 From 7760cff5d713ee004297ef3e590a4acb68665b83 Mon Sep 17 00:00:00 2001 From: oxalica Date: Mon, 9 Mar 2020 12:45:12 +0800 Subject: util-linux: 2.33.2 -> 2.35.1 --- pkgs/os-specific/linux/util-linux/default.nix | 4 +- .../rtcwake-search-PATH-for-shutdown.patch | 68 +++++++++++++++++----- 2 files changed, 57 insertions(+), 15 deletions(-) diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index f0cc6fd5a9b..aa23a162a92 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "util-linux"; - version = "2.33.2"; + version = "2.35.1"; src = fetchurl { url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "15yf2dh4jd1kg6066hydlgdhhs2j3na13qld8yx30qngqvmfh6v3"; + sha256 = "1yfpy6bkab4jw61mpx48gfy24yrqp4a7arvpis8csrkk53fkxpnr"; }; patches = [ diff --git a/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch b/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch index 5f38861bf68..52c970a18f3 100644 --- a/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch +++ b/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch @@ -2,26 +2,68 @@ Search $PATH for the shutdown binary instead of hard-coding /sbin/shutdown, which isn't valid on NixOS (and a compatibility link on most other modern distros anyway). - -- nckx --- a/include/pathnames.h +++ b/include/pathnames.h -@@ -53,7 +53,7 @@ +@@ -50,8 +50,8 @@ #ifndef _PATH_LOGIN - #define _PATH_LOGIN "/bin/login" + # define _PATH_LOGIN "/bin/login" #endif -#define _PATH_SHUTDOWN "/sbin/shutdown" -+#define _PATH_SHUTDOWN "shutdown" - +-#define _PATH_POWEROFF "/sbin/poweroff" ++#define _PATH_SHUTDOWN "shutdown" ++#define _PATH_POWEROFF "poweroff" + #define _PATH_TERMCOLORS_DIRNAME "terminal-colors.d" #define _PATH_TERMCOLORS_DIR "/etc/" _PATH_TERMCOLORS_DIRNAME --- a/sys-utils/rtcwake.c +++ b/sys-utils/rtcwake.c -@@ -575,7 +575,7 @@ int main(int argc, char **argv) - arg[i++] = "now"; - arg[i] = NULL; - if (!ctl.dryrun) { -- execv(arg[0], arg); +@@ -587,29 +587,29 @@ int main(int argc, char **argv) + char *arg[5]; + int i = 0; + +- if (!access(_PATH_SHUTDOWN, X_OK)) { +- arg[i++] = _PATH_SHUTDOWN; +- arg[i++] = "-h"; +- arg[i++] = "-P"; +- arg[i++] = "now"; +- arg[i] = NULL; +- } else if (!access(_PATH_POWEROFF, X_OK)) { +- arg[i++] = _PATH_POWEROFF; +- arg[i] = NULL; +- } else { +- arg[i] = NULL; +- } ++ arg[i++] = _PATH_SHUTDOWN; ++ arg[i++] = "-h"; ++ arg[i++] = "-P"; ++ arg[i++] = "now"; ++ arg[i] = NULL; + +- if (arg[0]) { +- if (ctl.verbose) +- printf(_("suspend mode: off; executing %s\n"), +- arg[0]); +- if (!ctl.dryrun) { +- execv(arg[0], arg); ++ if (ctl.verbose) ++ printf(_("suspend mode: off; executing %s\n"), ++ arg[0]); ++ ++ if (!ctl.dryrun) { ++ execvp(arg[0], arg); ++ if (ctl.verbose) { + warn(_("failed to execute %s"), arg[0]); +- rc = EX_EXEC_ENOENT; ++ // Reuse translations. ++ printf(_("suspend mode: off; executing %s\n"), ++ _PATH_POWEROFF); + } +- } else { ++ ++ i = 0; ++ arg[i++] = _PATH_POWEROFF; ++ arg[i] = NULL; + execvp(arg[0], arg); - warn(_("failed to execute %s"), _PATH_SHUTDOWN); - rc = EXIT_FAILURE; - } + /* Failed to find shutdown command */ + warn(_("failed to find shutdown command")); + rc = EX_EXEC_ENOENT; -- cgit v1.2.3 From 9fe2f2565e4acaabb9c4e0a0ab639a493faf8447 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 18 Mar 2020 19:49:19 +0000 Subject: gitAndTools.gitFull: 2.25.1 -> 2.25.2 --- pkgs/applications/version-management/git-and-tools/git/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index ca3bf667b4a..5a3c8219509 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -21,7 +21,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.25.1"; + version = "2.25.2"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "09lzwa183nblr6l8ib35g2xrjf9wm9yhk3szfvyzkwivdv69c9r2"; + sha256 = "08vivrv3my8nlp40pwsf7mcc5k7dwyh34hadjszx7qj8w01p34wv"; }; outputs = [ "out" ]; -- cgit v1.2.3 From d2d7fbc431a06ec58f537921dc1b898167a69adc Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Sun, 15 Dec 2019 13:30:40 -0800 Subject: gzip: Don't depend on gzip being in $PATH --- pkgs/tools/compression/gzip/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index 10cfa086860..65760a0b6cc 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -17,6 +17,15 @@ stdenv.mkDerivation rec { makeFlags = [ "SHELL=/bin/sh" "GREP=grep" ]; + # Many gzip executables are shell scripts that depend upon other gzip + # executables being in $PATH. Rather than try to re-write all the + # internal cross-references, just add $out/bin to PATH at the top of + # all the executables that are shell scripts. + preFixup = '' + sed -i '1{;/#!\/bin\/sh/aPATH="'$out'/bin:$PATH" + }' $out/bin/* + ''; + meta = { homepage = "https://www.gnu.org/software/gzip/"; description = "GNU zip compression program"; -- cgit v1.2.3 From 3c83abd60f6aa72b2d3f868ad9d0af15f4c9bcec Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 18 Apr 2020 19:32:05 +0200 Subject: libfido2: 1.3.1 -> 1.4.0 - drop upstreamed patches - use system hidapi --- pkgs/development/libraries/libfido2/default.nix | 31 +++++----------------- .../libraries/libfido2/detect_apple_ld.patch | 11 -------- pkgs/top-level/all-packages.nix | 4 +-- 3 files changed, 8 insertions(+), 38 deletions(-) delete mode 100644 pkgs/development/libraries/libfido2/detect_apple_ld.patch diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix index 94f0540ab05..30ecdda3da2 100644 --- a/pkgs/development/libraries/libfido2/default.nix +++ b/pkgs/development/libraries/libfido2/default.nix @@ -3,45 +3,28 @@ , fetchpatch , cmake , pkgconfig +, hidapi , libcbor , openssl , udev -, IOKit }: +}: stdenv.mkDerivation rec { pname = "libfido2"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - sha256 = "0hdgxbmjbnm9kjwc07nrl2zy87qclvb3rzvdwr5iw35n2qhf4dds"; + sha256 = "0v1a3n0qljmrp8y9pmnmbsdsy79l3z84qmhyjx50xdsbgnz1z4md"; }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ libcbor openssl ] - ++ stdenv.lib.optionals stdenv.isLinux [ udev ] - ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; - - patches = [ - # fix build on darwin - (fetchpatch { - url = "https://github.com/Yubico/libfido2/commit/916ebd18a89e4028de203d603726805339be7a5b.patch"; - sha256 = "07f0xpxnq02cccmqcric87b6pms7k7ssvdw722zr970a6qs8p6i7"; - }) - # allow attestation using any supported algorithm - (fetchpatch { - url = "https://github.com/Yubico/libfido2/commit/f7a9471fa0588cb91cbefffb13c1e4d06c2179b7.patch"; - sha256 = "02qbw9bqy3sixvwig6az7v3vimgznxnfikn9p1jczm3d7mn8asw2"; - }) - # fix EdDSA attestation signature verification bug - (fetchpatch { - url = "https://github.com/Yubico/libfido2/commit/95126eea52294419515e6540dfd7220f35664c48.patch"; - sha256 = "076mwpl9xndjhy359jdv2drrwyq7wd3pampkn28mn1rlwxfgf0d0"; - }) - ]; + buildInputs = [ hidapi libcbor openssl ] + ++ stdenv.lib.optionals stdenv.isLinux [ udev ]; cmakeFlags = [ "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d" + "-DUSE_HIDAPI=1" "-DCMAKE_INSTALL_LIBDIR=lib" ]; diff --git a/pkgs/development/libraries/libfido2/detect_apple_ld.patch b/pkgs/development/libraries/libfido2/detect_apple_ld.patch deleted file mode 100644 index de972e0f358..00000000000 --- a/pkgs/development/libraries/libfido2/detect_apple_ld.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt 2020-02-19 17:21:59.000000000 +0000 -+++ b/CMakeLists.txt 2020-02-23 15:57:34.241115306 +0000 -@@ -296,7 +296,7 @@ - endif() - - # export list --if(CMAKE_C_COMPILER_ID STREQUAL "AppleClang") -+if(APPLE AND CMAKE_C_COMPILER_ID STREQUAL "Clang" OR CMAKE_C_COMPILER_ID STREQUAL "AppleClang") - # clang + lld - string(CONCAT CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} - " -exported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/src/export.llvm") diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8cd2f521d77..34111cd69ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12684,9 +12684,7 @@ in libfakekey = callPackage ../development/libraries/libfakekey { }; - libfido2 = callPackage ../development/libraries/libfido2 { - inherit (darwin.apple_sdk.frameworks) IOKit; - }; + libfido2 = callPackage ../development/libraries/libfido2 { }; libfilezilla = callPackage ../development/libraries/libfilezilla { }; -- cgit v1.2.3 From 9073a0cb8b2f419785a60969e11e96733f29b200 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 16 Apr 2020 04:42:45 +0200 Subject: =?UTF-8?q?meson:=200.53.2=20=E2=86=92=200.54.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://mesonbuild.com/Release-notes-for-0-54-0.html --- .../meson/allow-dirs-outside-of-prefix.patch | 30 +++++++++------------- .../tools/build-managers/meson/default.nix | 4 +-- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch b/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch index 591927c1528..bd81efd5208 100644 --- a/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch +++ b/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch @@ -1,25 +1,19 @@ --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py -@@ -375,18 +375,13 @@ - ''' - if option.endswith('dir') and os.path.isabs(value) and \ +@@ -483,7 +483,6 @@ class CoreData: + return value + if option.endswith('dir') and value.is_absolute() and \ option not in builtin_dir_noprefix_options: - # Value must be a subdir of the prefix # commonpath will always return a path in the native format, so we # must use pathlib.PurePath to do the same conversion before # comparing. -- if os.path.commonpath([value, prefix]) != str(PurePath(prefix)): -- m = 'The value of the {!r} option is {!r} which must be a ' \ -- 'subdir of the prefix {!r}.\nNote that if you pass a ' \ -- 'relative path, it is assumed to be a subdir of prefix.' -- raise MesonException(m.format(option, value, prefix)) -- # Convert path to be relative to prefix -- skip = len(prefix) + 1 -- value = value[skip:] -+ if os.path.commonpath([value, prefix]) == str(PurePath(prefix)): -+ # Convert path to be relative to prefix -+ skip = len(prefix) + 1 -+ value = value[skip:] - return value - - def init_builtins(self): +@@ -495,7 +494,7 @@ class CoreData: + try: + value = value.relative_to(prefix) + except ValueError: +- raise MesonException(msg.format(option, value, prefix)) ++ pass + if '..' in str(value): + raise MesonException(msg.format(option, value, prefix)) + return value.as_posix() diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 3ac8e641eb6..15b0a5ffcd0 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -19,11 +19,11 @@ let in python3Packages.buildPythonApplication rec { pname = "meson"; - version = "0.53.2"; + version = "0.54.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "Po+DDzMYQ5fC6wtlHsUCrbY97LKJeL3ISzVY1xKEwh8="; + sha256 = "3eVybXeBEqy9Sme7NjOrLuddM9HoeaYoOntKRMM2PCc="; }; postFixup = '' -- cgit v1.2.3 From c9576a4b744e822568958875b3a3f7876dc50f46 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Apr 2020 19:21:19 +0000 Subject: doxygen: 1.8.17 -> 1.8.18 --- pkgs/development/tools/documentation/doxygen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index d7ad57d847c..a8e5f179916 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { - name = "doxygen-1.8.17"; + name = "doxygen-1.8.18"; src = fetchurl { urls = [ "mirror://sourceforge/doxygen/${name}.src.tar.gz" # faster, with https, etc. "http://doxygen.nl/files/${name}.src.tar.gz" ]; - sha256 = "16dmv0gm1x8rvbm82fmjvi213q8fxqxinm75pcf595flya59ific"; + sha256 = "0mh6s1ri1fs5yb27m0avnjsbcxpchgb9aaprq4bd3lj6vjg3s5qq"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 6673a4988e4a4ff25ca94a84d8e2acf92453dbf1 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 21 Apr 2020 08:35:40 +0200 Subject: gnupg: use libusb1 (#85374) * gnupg: use libusb1 This fixes scdaemon's direct ccid support. * systemd: fix gnupg-minimal --- pkgs/os-specific/linux/systemd/default.nix | 2 +- pkgs/tools/security/gnupg/22.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 3a83ee63172..5728431b059 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -24,7 +24,7 @@ let gnupg-minimal = gnupg.override { pinentry = null; adns = null; gnutls = null; - libusb = null; + libusb1 = null; openldap = null; readline = null; zlib = null; diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index f87e985c95a..7c095cffa31 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -4,7 +4,7 @@ # Each of the dependencies below are optional. # Gnupg can be built without them at the cost of reduced functionality. , guiSupport ? true, enableMinimal ? false -, adns ? null , bzip2 ? null , gnutls ? null , libusb ? null , openldap ? null +, adns ? null , bzip2 ? null , gnutls ? null , libusb1 ? null , openldap ? null , pcsclite ? null , pinentry ? null , readline ? null , sqlite ? null , zlib ? null }: @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig texinfo ]; buildInputs = [ libgcrypt libassuan libksba libiconv npth gettext - readline libusb gnutls adns openldap zlib bzip2 sqlite + readline libusb1 gnutls adns openldap zlib bzip2 sqlite ]; patches = [ -- cgit v1.2.3 From 5470d96645194dfb65a1acfce317703da6da8aad Mon Sep 17 00:00:00 2001 From: Kirill Elagin Date: Wed, 15 Apr 2020 13:13:27 +0300 Subject: pgpgme: Fix build with python on macOS * Replace LD_LIBRARY_PATH with OS-specific name (e.g. DYLD_LIBRARY_PATH on macOS). * Disable Python tests on macOS, because they use gpg, which fails due to a very long socket path (https://github.com/NixOS/nix/pull/1085). The former should be fixed upstream. The latter is a Nix-specific issue, but it can be worked-around upstream by making Python tests respect --disable-gpg-test. --- pkgs/development/libraries/gpgme/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index 6a31515be3f..a271b72c2e7 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -49,6 +49,15 @@ stdenv.mkDerivation rec { postPatch ='' substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file + '' + # Apply only on Darwin to save rebuilds on Linux + + lib.optionalString stdenv.isDarwin '' + sed -i "s/LD_LIBRARY_PATH/@shlibpath_var@/" lang/python/tests/Makefile.in + sed -i "s/ac_subst_vars='/ac_subst_vars='shlibpath_var\n/" configure + '' + # Disable python tests on Darwin as they use gpg (see configureFlags below) + + lib.optionalString stdenv.isDarwin '' + sed -i "s/SUBDIRS = \. tests/SUBDIRS = ./" lang/python/Makefile.in ''; configureFlags = [ -- cgit v1.2.3 From c88f04cb93259db57e116f1c79e7f67a32012683 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 15 Apr 2020 14:33:19 +0100 Subject: gpgme: convert macos sed patch scripts to patch files This is less brittle and breaks loud if the code changes. Also remove the /usr/bin/file patch. It is not really required for the build to work, the generated warning is harmless. --- pkgs/development/libraries/gpgme/default.nix | 27 +++++++++------------- .../libraries/gpgme/disable-python-tests.patch | 12 ++++++++++ 2 files changed, 23 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/libraries/gpgme/disable-python-tests.patch diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index a271b72c2e7..39bb8d7571a 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, fetchpatch, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan +{ stdenv, fetchurl, fetchpatch +, autoreconfHook, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan , file, which, ncurses , texinfo , buildPackages @@ -33,7 +34,14 @@ stdenv.mkDerivation rec { url = "http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=c4cf527ea227edb468a84bf9b8ce996807bd6992"; sha256 = "pKL1tvUw7PB2w4FHSt2up4SvpFiprBH6TLdgKxYFC3g="; }) - ]; + # https://lists.gnupg.org/pipermail/gnupg-devel/2020-April/034591.html + (fetchpatch { + name = "0001-Fix-python-tests-on-non-Linux.patch"; + url = "https://lists.gnupg.org/pipermail/gnupg-devel/attachments/20200415/f7be62d1/attachment.obj"; + sha256 = "00d4sxq63601lzdp2ha1i8fvybh7dzih4531jh8bx07fab3sw65g"; + }) + # Disable python tests on Darwin as they use gpg (see configureFlags below) + ] ++ lib.optional stdenv.isDarwin ./disable-python-tests.patch; outputs = [ "out" "dev" "info" ]; outputBin = "dev"; # gpgme-config; not so sure about gpgme-tool @@ -42,24 +50,11 @@ stdenv.mkDerivation rec { [ libgpgerror glib libassuan pth ] ++ lib.optional (qtbase != null) qtbase; - nativeBuildInputs = [ file pkgconfig gnupg texinfo ] + nativeBuildInputs = [ pkgconfig gnupg texinfo autoreconfHook ] ++ lib.optionals pythonSupport [ python swig2 which ncurses ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; - postPatch ='' - substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file - '' - # Apply only on Darwin to save rebuilds on Linux - + lib.optionalString stdenv.isDarwin '' - sed -i "s/LD_LIBRARY_PATH/@shlibpath_var@/" lang/python/tests/Makefile.in - sed -i "s/ac_subst_vars='/ac_subst_vars='shlibpath_var\n/" configure - '' - # Disable python tests on Darwin as they use gpg (see configureFlags below) - + lib.optionalString stdenv.isDarwin '' - sed -i "s/SUBDIRS = \. tests/SUBDIRS = ./" lang/python/Makefile.in - ''; - configureFlags = [ "--enable-fixed-path=${gnupg}/bin" "--with-libgpg-error-prefix=${libgpgerror.dev}" diff --git a/pkgs/development/libraries/gpgme/disable-python-tests.patch b/pkgs/development/libraries/gpgme/disable-python-tests.patch new file mode 100644 index 00000000000..285af14fcc3 --- /dev/null +++ b/pkgs/development/libraries/gpgme/disable-python-tests.patch @@ -0,0 +1,12 @@ +diff -Naur --strip-trailing-cr gpgme-1.13.1.org/lang/python/Makefile.am gpgme-1.13.1/lang/python/Makefile.am +--- gpgme-1.13.1.org/lang/python/Makefile.am 2019-06-04 07:27:49.000000000 +0100 ++++ gpgme-1.13.1/lang/python/Makefile.am 2020-04-15 14:27:34.810172944 +0100 +@@ -23,7 +23,7 @@ + gpgme.i \ + helpers.c helpers.h private.h + +-SUBDIRS = . tests examples doc src ++SUBDIRS = . examples doc src + + .PHONY: prepare + prepare: copystamp -- cgit v1.2.3 From 4613022b5d82f03b50fdfa2008a4113602953ce5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 Apr 2020 19:18:35 +0000 Subject: libyaml: 0.2.2 -> 0.2.3 --- pkgs/development/libraries/libyaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix index c555341f993..2f6c8909a59 100644 --- a/pkgs/development/libraries/libyaml/default.nix +++ b/pkgs/development/libraries/libyaml/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libyaml"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "yaml"; repo = "libyaml"; rev = version; - sha256 = "0839nqcmxjzfgjn39j7740pnlsgmvngpkamiw1lfy1qlcqyc3r4v"; + sha256 = "0a7n575rmm1xkz0sn455rzapm1w9mgqjk29hbmzp53zddqkphvsm"; }; nativeBuildInputs = [ autoreconfHook ]; -- cgit v1.2.3 From 640186a8668c413dc89d5fa82f271a82fb4c379a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 Apr 2020 19:13:03 +0000 Subject: libvdpau: 1.3 -> 1.4 --- pkgs/development/libraries/libvdpau/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index 7b1602523a0..cbb312e0f0d 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libvdpau"; - version = "1.3"; + version = "1.4"; src = fetchurl { url = "https://gitlab.freedesktop.org/vdpau/libvdpau/-/archive/${version}/${pname}-${version}.tar.bz2"; - sha256 = "b5a52eeac9417edbc396f26c40591ba5df0cd18285f68d84614ef8f06196e50e"; + sha256 = "0c1zsfr6ypzwv8g9z50kdahpb7pirarq4z8avqqyyma5b9684n22"; }; patches = [ ./installdir.patch ]; -- cgit v1.2.3 From 1c7bcaa6db01a7f82e3927d2df9e5a5ca0316f94 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 7 Apr 2020 23:13:49 +0000 Subject: vim: 8.2.0343 -> 8.2.0510 --- pkgs/applications/editors/vim/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 03b7d57b49d..8bdc0c0753c 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub }: rec { - version = "8.2.0343"; + version = "8.2.0510"; src = fetchFromGitHub { owner = "vim"; repo = "vim"; rev = "v${version}"; - sha256 = "063i52h8v7f87zamrw2ph057f0x2nzwf1s0izrm2psy41cyf4wa3"; + sha256 = "16ggwf238pzzkn3ng6n09qz9cgdzha9vc0ghlcxhwilnjh12l7p9"; }; enableParallelBuilding = true; -- cgit v1.2.3 From 0293a4b37fbad8ca3c0bc135ad7757690741e4cd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 7 Apr 2020 21:15:08 +0000 Subject: waf: 2.0.19 -> 2.0.20 --- pkgs/development/tools/build-managers/waf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix index f3e49e7bc86..49aae7c3014 100644 --- a/pkgs/development/tools/build-managers/waf/default.nix +++ b/pkgs/development/tools/build-managers/waf/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { pname = "waf"; - version = "2.0.19"; + version = "2.0.20"; src = fetchFromGitLab { owner = "ita1024"; repo = "waf"; rev = "${pname}-${version}"; - sha256 = "1ydmx20blr776qnmnqp0whyiy81a3glln49m9fva2cmampmandpb"; + sha256 = "1xbd1lmchq9pdrplkr2db28xqafyw753qbhnrfn8pxdg3inxxqvq"; }; buildInputs = [ python ensureNewerSourcesForZipFilesHook ]; -- cgit v1.2.3 From 6c162416ca4d95b54a9837293e7e0f1b01f4622c Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Mon, 6 Apr 2020 18:30:42 +0200 Subject: bison: 3.5.2 -> 3.5.4 --- pkgs/development/tools/parsing/bison/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/default.nix index 0fbf6a49b2f..c9758fe21e3 100644 --- a/pkgs/development/tools/parsing/bison/default.nix +++ b/pkgs/development/tools/parsing/bison/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bison"; - version = "3.5.2"; + version = "3.5.4"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1ylls1ba8y62q78vnzawy4ajpjkk5580crgi8krvfk8g13fvdnxl"; + sha256 = "0a2cbrqh7mgx2dwf5qm10v68iakv1i0dqh9di4x5aqxsz96ibpf0"; }; nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man; -- cgit v1.2.3 From 6a64dbefd01098572eb4e5234a2af6f3fca6ae4b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Apr 2020 04:27:51 +0000 Subject: libnetfilter_conntrack: 1.0.7 -> 1.0.8 --- pkgs/development/libraries/libnetfilter_conntrack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix index c93400e474a..851357f6404 100644 --- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix +++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libnetfilter_conntrack"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { url = "https://netfilter.org/projects/libnetfilter_conntrack/files/${pname}-${version}.tar.bz2"; - sha256 = "1dl9z50yny04xi5pymlykwmy6hcfc9p4nd7m47697zwxw98m6s1k"; + sha256 = "1ky1mqgnplw2h9jf0kn0a69d94jkydhbiipng9l2hdcj13h3pl8c"; }; buildInputs = [ libmnl ]; -- cgit v1.2.3 From aaddfc0c5b545950269935fbb5f2f49ef5623a9f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 6 Apr 2020 04:44:48 +0000 Subject: libunwind: 1.3.1 -> 1.4.0 --- pkgs/development/libraries/libunwind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix index d6367fbd198..0f0143b9c1f 100644 --- a/pkgs/development/libraries/libunwind/default.nix +++ b/pkgs/development/libraries/libunwind/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libunwind"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { url = "mirror://savannah/libunwind/${pname}-${version}.tar.gz"; - sha256 = "1y0l08k6ak1mqbfj6accf9s5686kljwgsl4vcqpxzk5n74wpm6a3"; + sha256 = "0dc46flppifrv2z0mrdqi60165ghxm1wk0g47vcbyzjdplqwjnfz"; }; patches = [ ./backtrace-only-with-glibc.patch ]; -- cgit v1.2.3 From 1bdf4d121b75cf47aa58ab9db92ba162cb1151e9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 16 Apr 2020 08:59:21 +0200 Subject: ocamlPackages.bigstringaf: disable tests for OCaml < 4.05 --- pkgs/development/ocaml-modules/bigstringaf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/bigstringaf/default.nix b/pkgs/development/ocaml-modules/bigstringaf/default.nix index 0544ebbe685..9f6810379ae 100644 --- a/pkgs/development/ocaml-modules/bigstringaf/default.nix +++ b/pkgs/development/ocaml-modules/bigstringaf/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildDunePackage, alcotest, bigarray-compat }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, alcotest, bigarray-compat }: buildDunePackage rec { pname = "bigstringaf"; @@ -13,9 +13,9 @@ buildDunePackage rec { sha256 = "04b088vrqzmxsyan9f9nr8721bxip4b930cgvb5zkbbmrw3ylmwc"; }; - buildInputs = [ alcotest ]; + checkInputs = [ alcotest ]; propagatedBuildInputs = [ bigarray-compat ]; - doCheck = true; + doCheck = lib.versionAtLeast ocaml.version "4.05"; meta = { description = "Bigstring intrinsics and fast blits based on memcpy/memmove"; -- cgit v1.2.3 From f2788cdf11ca733f0faf986137de90a66acd6aeb Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 16 Apr 2020 08:58:55 +0200 Subject: ocamlPackages.angstrom: disable tests for OCaml < 4.05 --- pkgs/development/ocaml-modules/angstrom/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/pkgs/development/ocaml-modules/angstrom/default.nix index 1d3157bdbf1..21482266c28 100644 --- a/pkgs/development/ocaml-modules/angstrom/default.nix +++ b/pkgs/development/ocaml-modules/angstrom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildDunePackage, alcotest, result, bigstringaf }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, alcotest, result, bigstringaf }: buildDunePackage rec { pname = "angstrom"; @@ -13,14 +13,14 @@ buildDunePackage rec { sha256 = "0w0wavqzdy2hrh7cjyl9w72ad4vndhwhknwvyacvkwkja5wys5b2"; }; - buildInputs = [ alcotest ]; + checkInputs = [ alcotest ]; propagatedBuildInputs = [ bigstringaf result ]; - doCheck = true; + doCheck = lib.versionAtLeast ocaml.version "4.05"; meta = { homepage = "https://github.com/inhabitedtype/angstrom"; description = "OCaml parser combinators built for speed and memory efficiency"; - license = stdenv.lib.licenses.bsd3; - maintainers = with stdenv.lib.maintainers; [ sternenseemann ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sternenseemann ]; }; } -- cgit v1.2.3 From 36632263e0a29e1df59187a72680622c4228e92c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 14 Apr 2020 06:56:28 +0200 Subject: =?UTF-8?q?ocamlPackages.base64:=20fix=20tests=20for=20alcotest=20?= =?UTF-8?q?=E2=89=A5=201.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/base64/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/base64/default.nix b/pkgs/development/ocaml-modules/base64/default.nix index 2f53d74c9eb..b2e3e0c5e74 100644 --- a/pkgs/development/ocaml-modules/base64/default.nix +++ b/pkgs/development/ocaml-modules/base64/default.nix @@ -1,8 +1,8 @@ -{ lib, fetchzip, buildDunePackage, alcotest, bos }: +{ lib, fetchpatch, fetchzip, buildDunePackage, alcotest, bos }: let version = "3.2.0"; in -buildDunePackage { +buildDunePackage rec { pname = "base64"; inherit version; @@ -13,9 +13,16 @@ buildDunePackage { minimumOCamlVersion = "4.03"; - buildInputs = [ alcotest bos ]; + buildInputs = [ bos ]; + + # Fix test-suite for alcotest ≥ 1.0 + patches = [(fetchpatch { + url = "https://github.com/mirage/ocaml-base64/commit/8d334d02aa52875158fae3e2fb8fe0a5596598d0.patch"; + sha256 = "0lvqdp98qavpzis1wgwh3ijajq79hq47898gsrk37fpyjbrdzf5q"; + })]; doCheck = true; + checkInputs = [ alcotest ]; meta = { homepage = "https://github.com/mirage/ocaml-base64"; -- cgit v1.2.3 From fc317e100af833c7f2411be39ababeb8c3565a91 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 14 Apr 2020 07:15:32 +0200 Subject: =?UTF-8?q?ocamlPackages.digestif:=20fix=20tests=20for=20alcotest?= =?UTF-8?q?=20=E2=89=A5=201.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/digestif/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/digestif/default.nix b/pkgs/development/ocaml-modules/digestif/default.nix index f0a98249d6d..d02104decba 100644 --- a/pkgs/development/ocaml-modules/digestif/default.nix +++ b/pkgs/development/ocaml-modules/digestif/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildDunePackage +{ lib, fetchurl, fetchpatch, buildDunePackage , bigarray-compat, eqaf, stdlib-shims , alcotest }: @@ -12,6 +12,12 @@ buildDunePackage rec { sha256 = "09g4zngqiw97cljv8ds4m063wcxz3y7c7vzaprsbpjzi0ja5jdcy"; }; + # Fix tests with alcotest ≥ 1 + patches = [ (fetchpatch { + url = "https://github.com/mirage/digestif/commit/b65d996c692d75da0a81323253429e07d14b72b6.patch"; + sha256 = "0sf7qglcp19dhs65pwrrc7d9v57icf18jsrhpmvwskx8b4dchfiv"; + })]; + buildInputs = lib.optional doCheck alcotest; propagatedBuildInputs = [ bigarray-compat eqaf stdlib-shims ]; -- cgit v1.2.3 From 974920ccd47fc4c1cc4a702b2d36f61d9392d53b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 14 Apr 2020 07:38:11 +0200 Subject: =?UTF-8?q?ocamlPackages.alcotest:=200.8.5=20=E2=86=92=201.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../development/ocaml-modules/alcotest/default.nix | 45 ++++++---------------- 1 file changed, 11 insertions(+), 34 deletions(-) diff --git a/pkgs/development/ocaml-modules/alcotest/default.nix b/pkgs/development/ocaml-modules/alcotest/default.nix index d485b997c28..3ebf0f3ed6b 100644 --- a/pkgs/development/ocaml-modules/alcotest/default.nix +++ b/pkgs/development/ocaml-modules/alcotest/default.nix @@ -1,45 +1,22 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, topkg, dune -, cmdliner, astring, fmt, result, uuidm +{ lib, buildDunePackage, fetchurl +, astring, cmdliner, fmt, uuidm, re, stdlib-shims }: -let param = - if stdenv.lib.versionAtLeast ocaml.version "4.02" then { - version = "0.8.5"; - sha256 = "1mhckvdcxkikbzgvy24kjz4265l15b86a6swz7m3ynbgvqdcfzqn"; - nativeBuildInputs = [ dune ]; - propagatedBuildInputs = [ uuidm ]; - buildPhase = "dune build -p alcotest"; - inherit (dune) installPhase; - } else { - version = "0.7.2"; - sha256 = "1qgsz2zz5ky6s5pf3j3shc4fjc36rqnjflk8x0wl1fcpvvkr52md"; - buildInputs = [ topkg ]; - nativeBuildInputs = [ ocamlbuild ]; - inherit (topkg) buildPhase installPhase; - }; -in - -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-alcotest-${version}"; - inherit (param) version buildPhase installPhase; +buildDunePackage rec { + pname = "alcotest"; + version = "1.0.1"; - src = fetchzip { - url = "https://github.com/mirage/alcotest/archive/${version}.tar.gz"; - inherit (param) sha256; + src = fetchurl { + url = "https://github.com/mirage/alcotest/releases/download/${version}/alcotest-${version}.tbz"; + sha256 = "1xlklxb83gamqbg8j5dzm5jk4mvcwkspxajh93p6vpw9ia1li1qc"; }; - nativeBuildInputs = [ ocaml findlib ] ++ (param.nativeBuildInputs or []); - buildInputs = [ findlib ] ++ (param.buildInputs or []); - - propagatedBuildInputs = [ cmdliner astring fmt result ] - ++ (param.propagatedBuildInputs or []); - - createFindlibDestdir = true; + propagatedBuildInputs = [ astring cmdliner fmt uuidm re stdlib-shims ]; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/mirage/alcotest"; description = "A lightweight and colourful test framework"; - license = stdenv.lib.licenses.isc; + license = licenses.isc; maintainers = [ maintainers.ericbmerritt ]; }; } -- cgit v1.2.3 From 0412bde9423cbc26d68d1d744b22ec4e45bcbac8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Mon, 20 Apr 2020 20:05:26 +0200 Subject: treewide: add bool type to enable options, or make use of mkEnableOption Add missing type information to manually specified enable options or replace them by mkEnableOption where appropriate. --- nixos/modules/programs/cdemu.nix | 1 + nixos/modules/programs/criu.nix | 1 + nixos/modules/programs/systemtap.nix | 1 + nixos/modules/programs/zsh/oh-my-zsh.nix | 1 + nixos/modules/services/amqp/rabbitmq.nix | 1 + nixos/modules/services/backup/mysql-backup.nix | 7 +------ nixos/modules/services/backup/postgresql-backup.nix | 7 +------ nixos/modules/services/databases/clickhouse.nix | 5 +---- nixos/modules/services/databases/firebird.nix | 7 +------ nixos/modules/services/databases/memcached.nix | 7 +------ nixos/modules/services/databases/mongodb.nix | 7 +------ nixos/modules/services/databases/virtuoso.nix | 5 +---- nixos/modules/services/hardware/ratbagd.nix | 7 +------ nixos/modules/services/hardware/thermald.nix | 7 +------ nixos/modules/services/mail/spamassassin.nix | 5 +---- nixos/modules/services/misc/autofs.nix | 1 + nixos/modules/services/misc/cgminer.nix | 8 +------- nixos/modules/services/misc/devmon.nix | 7 +------ nixos/modules/services/misc/disnix.nix | 5 +---- nixos/modules/services/misc/felix.nix | 5 +---- nixos/modules/services/misc/ihaskell.nix | 1 + nixos/modules/services/misc/safeeyes.nix | 5 +---- nixos/modules/services/misc/svnserve.nix | 1 + nixos/modules/services/misc/synergy.nix | 16 ++++------------ nixos/modules/services/network-filesystems/netatalk.nix | 6 ++---- nixos/modules/services/network-filesystems/rsyncd.nix | 5 +---- nixos/modules/services/network-filesystems/xtreemfs.nix | 6 ++++++ .../modules/services/network-filesystems/yandex-disk.nix | 1 + nixos/modules/services/networking/amuled.nix | 1 + nixos/modules/services/networking/babeld.nix | 7 +------ nixos/modules/services/networking/bind.nix | 7 +------ nixos/modules/services/networking/bitlbee.nix | 1 + nixos/modules/services/networking/cntlm.nix | 7 +------ nixos/modules/services/networking/flashpolicyd.nix | 1 + nixos/modules/services/networking/gvpe.nix | 8 ++------ nixos/modules/services/networking/hostapd.nix | 1 + .../modules/services/networking/ircd-hybrid/default.nix | 7 +------ nixos/modules/services/networking/mailpile.nix | 8 ++------ nixos/modules/services/networking/ntp/chrony.nix | 1 + nixos/modules/services/networking/ntp/ntpd.nix | 1 + nixos/modules/services/networking/openfire.nix | 7 +------ nixos/modules/services/networking/prayer.nix | 7 +------ nixos/modules/services/networking/quassel.nix | 7 +------ nixos/modules/services/networking/radvd.nix | 1 + nixos/modules/services/networking/rdnssd.nix | 1 + nixos/modules/services/networking/sabnzbd.nix | 6 ++---- nixos/modules/services/networking/shairport-sync.nix | 1 + nixos/modules/services/networking/ssh/lshd.nix | 1 + nixos/modules/services/networking/xinetd.nix | 7 +------ nixos/modules/services/security/fprot.nix | 7 +------ nixos/modules/services/system/kerberos/default.nix | 7 +------ nixos/modules/services/system/localtime.nix | 1 + nixos/modules/services/system/uptimed.nix | 1 + nixos/modules/services/web-servers/jboss/default.nix | 1 + .../services/x11/desktop-managers/enlightenment.nix | 1 + nixos/modules/services/x11/desktop-managers/gnome3.nix | 1 + nixos/modules/services/x11/desktop-managers/kodi.nix | 1 + nixos/modules/services/x11/display-managers/startx.nix | 1 + nixos/modules/services/x11/hardware/wacom.nix | 1 + 59 files changed, 71 insertions(+), 175 deletions(-) diff --git a/nixos/modules/programs/cdemu.nix b/nixos/modules/programs/cdemu.nix index 6a0185d362c..a59cd93cadf 100644 --- a/nixos/modules/programs/cdemu.nix +++ b/nixos/modules/programs/cdemu.nix @@ -8,6 +8,7 @@ in { options = { programs.cdemu = { enable = mkOption { + type = types.bool; default = false; description = '' cdemu for members of diff --git a/nixos/modules/programs/criu.nix b/nixos/modules/programs/criu.nix index 48cf5c88a9f..1714e1331a4 100644 --- a/nixos/modules/programs/criu.nix +++ b/nixos/modules/programs/criu.nix @@ -8,6 +8,7 @@ in { options = { programs.criu = { enable = mkOption { + type = types.bool; default = false; description = '' Install criu along with necessary kernel options. diff --git a/nixos/modules/programs/systemtap.nix b/nixos/modules/programs/systemtap.nix index ca81e018c9d..360e106678e 100644 --- a/nixos/modules/programs/systemtap.nix +++ b/nixos/modules/programs/systemtap.nix @@ -8,6 +8,7 @@ in { options = { programs.systemtap = { enable = mkOption { + type = types.bool; default = false; description = '' Install systemtap along with necessary kernel options. diff --git a/nixos/modules/programs/zsh/oh-my-zsh.nix b/nixos/modules/programs/zsh/oh-my-zsh.nix index 932a780a356..f24842a4791 100644 --- a/nixos/modules/programs/zsh/oh-my-zsh.nix +++ b/nixos/modules/programs/zsh/oh-my-zsh.nix @@ -39,6 +39,7 @@ in options = { programs.zsh.ohMyZsh = { enable = mkOption { + type = types.bool; default = false; description = '' Enable oh-my-zsh. diff --git a/nixos/modules/services/amqp/rabbitmq.nix b/nixos/modules/services/amqp/rabbitmq.nix index f80d6b3f1ba..646708e01c4 100644 --- a/nixos/modules/services/amqp/rabbitmq.nix +++ b/nixos/modules/services/amqp/rabbitmq.nix @@ -17,6 +17,7 @@ in { options = { services.rabbitmq = { enable = mkOption { + type = types.bool; default = false; description = '' Whether to enable the RabbitMQ server, an Advanced Message diff --git a/nixos/modules/services/backup/mysql-backup.nix b/nixos/modules/services/backup/mysql-backup.nix index f58af82773f..31d606b141a 100644 --- a/nixos/modules/services/backup/mysql-backup.nix +++ b/nixos/modules/services/backup/mysql-backup.nix @@ -37,12 +37,7 @@ in services.mysqlBackup = { - enable = mkOption { - default = false; - description = '' - Whether to enable MySQL backups. - ''; - }; + enable = mkEnableOption "MySQL backups"; calendar = mkOption { type = types.str; diff --git a/nixos/modules/services/backup/postgresql-backup.nix b/nixos/modules/services/backup/postgresql-backup.nix index 580c7ce68f1..428861a7598 100644 --- a/nixos/modules/services/backup/postgresql-backup.nix +++ b/nixos/modules/services/backup/postgresql-backup.nix @@ -44,12 +44,7 @@ in { options = { services.postgresqlBackup = { - enable = mkOption { - default = false; - description = '' - Whether to enable PostgreSQL dumps. - ''; - }; + enable = mkEnableOption "PostgreSQL dumps"; startAt = mkOption { default = "*-*-* 01:15:00"; diff --git a/nixos/modules/services/databases/clickhouse.nix b/nixos/modules/services/databases/clickhouse.nix index dbabcae43ee..27440fec4e1 100644 --- a/nixos/modules/services/databases/clickhouse.nix +++ b/nixos/modules/services/databases/clickhouse.nix @@ -11,10 +11,7 @@ with lib; services.clickhouse = { - enable = mkOption { - default = false; - description = "Whether to enable ClickHouse database server."; - }; + enable = mkEnableOption "ClickHouse database server"; }; diff --git a/nixos/modules/services/databases/firebird.nix b/nixos/modules/services/databases/firebird.nix index 042c9841df5..95837aa1cea 100644 --- a/nixos/modules/services/databases/firebird.nix +++ b/nixos/modules/services/databases/firebird.nix @@ -40,12 +40,7 @@ in services.firebird = { - enable = mkOption { - default = false; - description = '' - Whether to enable the Firebird super server. - ''; - }; + enable = mkEnableOption "the Firebird super server"; package = mkOption { default = pkgs.firebirdSuper; diff --git a/nixos/modules/services/databases/memcached.nix b/nixos/modules/services/databases/memcached.nix index 89ff957babf..f54bb6cc9b1 100644 --- a/nixos/modules/services/databases/memcached.nix +++ b/nixos/modules/services/databases/memcached.nix @@ -18,12 +18,7 @@ in services.memcached = { - enable = mkOption { - default = false; - description = " - Whether to enable Memcached. - "; - }; + enable = mkEnableOption "Memcached"; user = mkOption { default = "memcached"; diff --git a/nixos/modules/services/databases/mongodb.nix b/nixos/modules/services/databases/mongodb.nix index 12879afed47..4453a182990 100644 --- a/nixos/modules/services/databases/mongodb.nix +++ b/nixos/modules/services/databases/mongodb.nix @@ -29,12 +29,7 @@ in services.mongodb = { - enable = mkOption { - default = false; - description = " - Whether to enable the MongoDB server. - "; - }; + enable = mkEnableOption "the MongoDB server"; package = mkOption { default = pkgs.mongodb; diff --git a/nixos/modules/services/databases/virtuoso.nix b/nixos/modules/services/databases/virtuoso.nix index 0cc027cb1d7..6eb09e0a58f 100644 --- a/nixos/modules/services/databases/virtuoso.nix +++ b/nixos/modules/services/databases/virtuoso.nix @@ -13,10 +13,7 @@ with lib; services.virtuoso = { - enable = mkOption { - default = false; - description = "Whether to enable Virtuoso Opensource database server."; - }; + enable = mkEnableOption "Virtuoso Opensource database server"; config = mkOption { default = ""; diff --git a/nixos/modules/services/hardware/ratbagd.nix b/nixos/modules/services/hardware/ratbagd.nix index 103e1d2315a..01a8276750f 100644 --- a/nixos/modules/services/hardware/ratbagd.nix +++ b/nixos/modules/services/hardware/ratbagd.nix @@ -10,12 +10,7 @@ in options = { services.ratbagd = { - enable = mkOption { - default = false; - description = '' - Whether to enable ratbagd for configuring gaming mice. - ''; - }; + enable = mkEnableOption "ratbagd for configuring gaming mice"; }; }; diff --git a/nixos/modules/services/hardware/thermald.nix b/nixos/modules/services/hardware/thermald.nix index 69577bbe018..ecb529e9bf0 100644 --- a/nixos/modules/services/hardware/thermald.nix +++ b/nixos/modules/services/hardware/thermald.nix @@ -8,12 +8,7 @@ in { ###### interface options = { services.thermald = { - enable = mkOption { - default = false; - description = '' - Whether to enable thermald, the temperature management daemon. - ''; - }; + enable = mkEnableOption "thermald, the temperature management daemon"; debug = mkOption { type = types.bool; diff --git a/nixos/modules/services/mail/spamassassin.nix b/nixos/modules/services/mail/spamassassin.nix index 2d5fb40fad3..f6c0b9c794c 100644 --- a/nixos/modules/services/mail/spamassassin.nix +++ b/nixos/modules/services/mail/spamassassin.nix @@ -12,10 +12,7 @@ in options = { services.spamassassin = { - enable = mkOption { - default = false; - description = "Whether to run the SpamAssassin daemon"; - }; + enable = mkEnableOption "the SpamAssassin daemon"; debug = mkOption { default = false; diff --git a/nixos/modules/services/misc/autofs.nix b/nixos/modules/services/misc/autofs.nix index f1742177326..84f49f964b1 100644 --- a/nixos/modules/services/misc/autofs.nix +++ b/nixos/modules/services/misc/autofs.nix @@ -19,6 +19,7 @@ in services.autofs = { enable = mkOption { + type = types.bool; default = false; description = '' Mount filesystems on demand. Unmount them automatically. diff --git a/nixos/modules/services/misc/cgminer.nix b/nixos/modules/services/misc/cgminer.nix index 9fcae645269..7635c2a0f4e 100644 --- a/nixos/modules/services/misc/cgminer.nix +++ b/nixos/modules/services/misc/cgminer.nix @@ -31,13 +31,7 @@ in services.cgminer = { - enable = mkOption { - default = false; - description = '' - Whether to enable cgminer, an ASIC/FPGA/GPU miner for bitcoin and - litecoin. - ''; - }; + enable = mkEnableOption "cgminer, an ASIC/FPGA/GPU miner for bitcoin and litecoin"; package = mkOption { default = pkgs.cgminer; diff --git a/nixos/modules/services/misc/devmon.nix b/nixos/modules/services/misc/devmon.nix index 9dc8fee2964..e4a3348646b 100644 --- a/nixos/modules/services/misc/devmon.nix +++ b/nixos/modules/services/misc/devmon.nix @@ -8,12 +8,7 @@ let in { options = { services.devmon = { - enable = mkOption { - default = false; - description = '' - Whether to enable devmon, an automatic device mounting daemon. - ''; - }; + enable = mkEnableOption "devmon, an automatic device mounting daemon"; }; }; diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix index b7b6eb7cd66..0776ac67908 100644 --- a/nixos/modules/services/misc/disnix.nix +++ b/nixos/modules/services/misc/disnix.nix @@ -17,10 +17,7 @@ in services.disnix = { - enable = mkOption { - default = false; - description = "Whether to enable Disnix"; - }; + enable = mkEnableOption "Disnix"; enableMultiUser = mkOption { type = types.bool; diff --git a/nixos/modules/services/misc/felix.nix b/nixos/modules/services/misc/felix.nix index 188e45abc58..21740c8c0b7 100644 --- a/nixos/modules/services/misc/felix.nix +++ b/nixos/modules/services/misc/felix.nix @@ -17,10 +17,7 @@ in services.felix = { - enable = mkOption { - default = false; - description = "Whether to enable the Apache Felix OSGi service"; - }; + enable = mkEnableOption "the Apache Felix OSGi service"; bundles = mkOption { type = types.listOf types.package; diff --git a/nixos/modules/services/misc/ihaskell.nix b/nixos/modules/services/misc/ihaskell.nix index 11597706d0d..684a242d738 100644 --- a/nixos/modules/services/misc/ihaskell.nix +++ b/nixos/modules/services/misc/ihaskell.nix @@ -15,6 +15,7 @@ in options = { services.ihaskell = { enable = mkOption { + type = types.bool; default = false; description = "Autostart an IHaskell notebook service."; }; diff --git a/nixos/modules/services/misc/safeeyes.nix b/nixos/modules/services/misc/safeeyes.nix index 1a33971d922..6ecb0d13187 100644 --- a/nixos/modules/services/misc/safeeyes.nix +++ b/nixos/modules/services/misc/safeeyes.nix @@ -16,10 +16,7 @@ in services.safeeyes = { - enable = mkOption { - default = false; - description = "Whether to enable the safeeyes OSGi service"; - }; + enable = mkEnableOption "the safeeyes OSGi service"; }; diff --git a/nixos/modules/services/misc/svnserve.nix b/nixos/modules/services/misc/svnserve.nix index 6292bc52b1e..3335ed09d40 100644 --- a/nixos/modules/services/misc/svnserve.nix +++ b/nixos/modules/services/misc/svnserve.nix @@ -18,6 +18,7 @@ in services.svnserve = { enable = mkOption { + type = types.bool; default = false; description = "Whether to enable svnserve to serve Subversion repositories through the SVN protocol."; }; diff --git a/nixos/modules/services/misc/synergy.nix b/nixos/modules/services/misc/synergy.nix index bfab8c534d8..5b7cf3ac46c 100644 --- a/nixos/modules/services/misc/synergy.nix +++ b/nixos/modules/services/misc/synergy.nix @@ -19,12 +19,8 @@ in # !!! All these option descriptions needs to be cleaned up. client = { - enable = mkOption { - default = false; - description = " - Whether to enable the Synergy client (receive keyboard and mouse events from a Synergy server). - "; - }; + enable = mkEnableOption "the Synergy client (receive keyboard and mouse events from a Synergy server)"; + screenName = mkOption { default = ""; description = '' @@ -47,12 +43,8 @@ in }; server = { - enable = mkOption { - default = false; - description = '' - Whether to enable the Synergy server (send keyboard and mouse events). - ''; - }; + enable = mkEnableOption "the Synergy server (send keyboard and mouse events)"; + configFile = mkOption { default = "/etc/synergy-server.conf"; description = "The Synergy server configuration file."; diff --git a/nixos/modules/services/network-filesystems/netatalk.nix b/nixos/modules/services/network-filesystems/netatalk.nix index 5422d4dd4e2..7674c8f7fa8 100644 --- a/nixos/modules/services/network-filesystems/netatalk.nix +++ b/nixos/modules/services/network-filesystems/netatalk.nix @@ -43,10 +43,7 @@ in options = { services.netatalk = { - enable = mkOption { - default = false; - description = "Whether to enable the Netatalk AFP fileserver."; - }; + enable = mkEnableOption "the Netatalk AFP fileserver"; port = mkOption { default = 548; @@ -65,6 +62,7 @@ in homes = { enable = mkOption { + type = types.bool; default = false; description = "Enable sharing of the UNIX server user home directories."; }; diff --git a/nixos/modules/services/network-filesystems/rsyncd.nix b/nixos/modules/services/network-filesystems/rsyncd.nix index ccad64cfdb2..fa29e18a939 100644 --- a/nixos/modules/services/network-filesystems/rsyncd.nix +++ b/nixos/modules/services/network-filesystems/rsyncd.nix @@ -29,10 +29,7 @@ in options = { services.rsyncd = { - enable = mkOption { - default = false; - description = "Whether to enable the rsync daemon."; - }; + enable = mkEnableOption "the rsync daemon"; motd = mkOption { type = types.str; diff --git a/nixos/modules/services/network-filesystems/xtreemfs.nix b/nixos/modules/services/network-filesystems/xtreemfs.nix index c93e201da56..b8f8c1d7117 100644 --- a/nixos/modules/services/network-filesystems/xtreemfs.nix +++ b/nixos/modules/services/network-filesystems/xtreemfs.nix @@ -100,11 +100,13 @@ in dir = { enable = mkOption { + type = types.bool; default = true; description = '' Whether to enable XtreemFS DIR service. ''; }; + uuid = mkOption { example = "eacb6bab-f444-4ebf-a06a-3f72d7465e40"; description = '' @@ -218,11 +220,13 @@ in mrc = { enable = mkOption { + type = types.bool; default = true; description = '' Whether to enable XtreemFS MRC service. ''; }; + uuid = mkOption { example = "eacb6bab-f444-4ebf-a06a-3f72d7465e41"; description = '' @@ -354,11 +358,13 @@ in osd = { enable = mkOption { + type = types.bool; default = true; description = '' Whether to enable XtreemFS OSD service. ''; }; + uuid = mkOption { example = "eacb6bab-f444-4ebf-a06a-3f72d7465e42"; description = '' diff --git a/nixos/modules/services/network-filesystems/yandex-disk.nix b/nixos/modules/services/network-filesystems/yandex-disk.nix index 0aa01ef9e6d..cc73f13bf77 100644 --- a/nixos/modules/services/network-filesystems/yandex-disk.nix +++ b/nixos/modules/services/network-filesystems/yandex-disk.nix @@ -21,6 +21,7 @@ in services.yandex-disk = { enable = mkOption { + type = types.bool; default = false; description = " Whether to enable Yandex-disk client. See https://disk.yandex.ru/ diff --git a/nixos/modules/services/networking/amuled.nix b/nixos/modules/services/networking/amuled.nix index 57f02542eaf..1128ee2c3e6 100644 --- a/nixos/modules/services/networking/amuled.nix +++ b/nixos/modules/services/networking/amuled.nix @@ -16,6 +16,7 @@ in services.amule = { enable = mkOption { + type = types.bool; default = false; description = '' Whether to run the AMule daemon. You need to manually run "amuled --ec-config" to configure the service for the first time. diff --git a/nixos/modules/services/networking/babeld.nix b/nixos/modules/services/networking/babeld.nix index de863461eab..e62c74d0069 100644 --- a/nixos/modules/services/networking/babeld.nix +++ b/nixos/modules/services/networking/babeld.nix @@ -35,12 +35,7 @@ in services.babeld = { - enable = mkOption { - default = false; - description = '' - Whether to run the babeld network routing daemon. - ''; - }; + enable = mkEnableOption "the babeld network routing daemon"; interfaceDefaults = mkOption { default = null; diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix index e3b95afb3d8..faad8863575 100644 --- a/nixos/modules/services/networking/bind.nix +++ b/nixos/modules/services/networking/bind.nix @@ -68,12 +68,7 @@ in services.bind = { - enable = mkOption { - default = false; - description = " - Whether to enable BIND domain name server. - "; - }; + enable = mkEnableOption "BIND domain name server"; cacheNetworks = mkOption { default = ["127.0.0.0/24"]; diff --git a/nixos/modules/services/networking/bitlbee.nix b/nixos/modules/services/networking/bitlbee.nix index 01a16698384..9ebf382fce4 100644 --- a/nixos/modules/services/networking/bitlbee.nix +++ b/nixos/modules/services/networking/bitlbee.nix @@ -48,6 +48,7 @@ in services.bitlbee = { enable = mkOption { + type = types.bool; default = false; description = '' Whether to run the BitlBee IRC to other chat network gateway. diff --git a/nixos/modules/services/networking/cntlm.nix b/nixos/modules/services/networking/cntlm.nix index 4e4e3104c3a..5b5068e43d7 100644 --- a/nixos/modules/services/networking/cntlm.nix +++ b/nixos/modules/services/networking/cntlm.nix @@ -33,12 +33,7 @@ in options.services.cntlm = { - enable = mkOption { - default = false; - description = '' - Whether to enable the cntlm, which start a local proxy. - ''; - }; + enable = mkEnableOption "cntlm, which starts a local proxy"; username = mkOption { description = '' diff --git a/nixos/modules/services/networking/flashpolicyd.nix b/nixos/modules/services/networking/flashpolicyd.nix index 9c51b88ef67..7f25083307c 100644 --- a/nixos/modules/services/networking/flashpolicyd.nix +++ b/nixos/modules/services/networking/flashpolicyd.nix @@ -39,6 +39,7 @@ in services.flashpolicyd = { enable = mkOption { + type = types.bool; default = false; description = '' diff --git a/nixos/modules/services/networking/gvpe.nix b/nixos/modules/services/networking/gvpe.nix index 3ef3548e0a0..92e87cd4640 100644 --- a/nixos/modules/services/networking/gvpe.nix +++ b/nixos/modules/services/networking/gvpe.nix @@ -42,12 +42,8 @@ in { options = { services.gvpe = { - enable = mkOption { - default = false; - description = '' - Whether to run gvpe - ''; - }; + enable = lib.mkEnableOption "gvpe"; + nodename = mkOption { default = null; description ='' diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index 2915b54f05b..12c0626a941 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -49,6 +49,7 @@ in services.hostapd = { enable = mkOption { + type = types.bool; default = false; description = '' Enable putting a wireless interface into infrastructure mode, diff --git a/nixos/modules/services/networking/ircd-hybrid/default.nix b/nixos/modules/services/networking/ircd-hybrid/default.nix index b236552eb65..91d0bf437d6 100644 --- a/nixos/modules/services/networking/ircd-hybrid/default.nix +++ b/nixos/modules/services/networking/ircd-hybrid/default.nix @@ -36,12 +36,7 @@ in services.ircdHybrid = { - enable = mkOption { - default = false; - description = " - Enable IRCD. - "; - }; + enable = mkEnableOption "IRCD"; serverName = mkOption { default = "hades.arpa"; diff --git a/nixos/modules/services/networking/mailpile.nix b/nixos/modules/services/networking/mailpile.nix index c42d3d5a44c..b79ee11d17d 100644 --- a/nixos/modules/services/networking/mailpile.nix +++ b/nixos/modules/services/networking/mailpile.nix @@ -18,12 +18,8 @@ in options = { services.mailpile = { - enable = mkOption { - default = false; - description = " - Whether to enable Mailpile the mail client. - "; - }; + enable = mkEnableOption "Mailpile the mail client"; + hostname = mkOption { default = "localhost"; description = "Listen to this hostname or ip."; diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix index f1062edaa05..b7e4c89a155 100644 --- a/nixos/modules/services/networking/ntp/chrony.nix +++ b/nixos/modules/services/networking/ntp/chrony.nix @@ -30,6 +30,7 @@ in options = { services.chrony = { enable = mkOption { + type = types.bool; default = false; description = '' Whether to synchronise your machine's time using chrony. diff --git a/nixos/modules/services/networking/ntp/ntpd.nix b/nixos/modules/services/networking/ntp/ntpd.nix index 54ff054d84c..51398851adc 100644 --- a/nixos/modules/services/networking/ntp/ntpd.nix +++ b/nixos/modules/services/networking/ntp/ntpd.nix @@ -40,6 +40,7 @@ in services.ntp = { enable = mkOption { + type = types.bool; default = false; description = '' Whether to synchronise your machine's time using ntpd, as a peer in diff --git a/nixos/modules/services/networking/openfire.nix b/nixos/modules/services/networking/openfire.nix index 4059eb3db83..c74f3611f79 100644 --- a/nixos/modules/services/networking/openfire.nix +++ b/nixos/modules/services/networking/openfire.nix @@ -9,12 +9,7 @@ with lib; services.openfire = { - enable = mkOption { - default = false; - description = " - Whether to enable OpenFire XMPP server. - "; - }; + enable = mkEnableOption "OpenFire XMPP server"; usePostgreSQL = mkOption { default = true; diff --git a/nixos/modules/services/networking/prayer.nix b/nixos/modules/services/networking/prayer.nix index 9c9eeba23da..f04dac01d9b 100644 --- a/nixos/modules/services/networking/prayer.nix +++ b/nixos/modules/services/networking/prayer.nix @@ -41,12 +41,7 @@ in services.prayer = { - enable = mkOption { - default = false; - description = '' - Whether to run the prayer webmail http server. - ''; - }; + enable = mkEnableOption "the prayer webmail http server"; port = mkOption { default = "2080"; diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix index 52ecd90b7c6..da723ec86ad 100644 --- a/nixos/modules/services/networking/quassel.nix +++ b/nixos/modules/services/networking/quassel.nix @@ -16,12 +16,7 @@ in services.quassel = { - enable = mkOption { - default = false; - description = '' - Whether to run the Quassel IRC client daemon. - ''; - }; + enable = mkEnableOption "the Quassel IRC client daemon"; certificateFile = mkOption { type = types.nullOr types.str; diff --git a/nixos/modules/services/networking/radvd.nix b/nixos/modules/services/networking/radvd.nix index 020faa34922..f4b00c9b356 100644 --- a/nixos/modules/services/networking/radvd.nix +++ b/nixos/modules/services/networking/radvd.nix @@ -19,6 +19,7 @@ in options = { services.radvd.enable = mkOption { + type = types.bool; default = false; description = '' diff --git a/nixos/modules/services/networking/rdnssd.nix b/nixos/modules/services/networking/rdnssd.nix index bccab805bee..469504c4317 100644 --- a/nixos/modules/services/networking/rdnssd.nix +++ b/nixos/modules/services/networking/rdnssd.nix @@ -17,6 +17,7 @@ in options = { services.rdnssd.enable = mkOption { + type = types.bool; default = false; #default = config.networking.enableIPv6; description = diff --git a/nixos/modules/services/networking/sabnzbd.nix b/nixos/modules/services/networking/sabnzbd.nix index 62b24d4377f..ff5aef7d1cb 100644 --- a/nixos/modules/services/networking/sabnzbd.nix +++ b/nixos/modules/services/networking/sabnzbd.nix @@ -15,10 +15,8 @@ in options = { services.sabnzbd = { - enable = mkOption { - default = false; - description = "Whether to enable the sabnzbd server."; - }; + enable = mkEnableOption "the sabnzbd server"; + configFile = mkOption { default = "/var/lib/sabnzbd/sabnzbd.ini"; description = "Path to config file."; diff --git a/nixos/modules/services/networking/shairport-sync.nix b/nixos/modules/services/networking/shairport-sync.nix index 2e988e0ca2e..b4b86a2d55b 100644 --- a/nixos/modules/services/networking/shairport-sync.nix +++ b/nixos/modules/services/networking/shairport-sync.nix @@ -17,6 +17,7 @@ in services.shairport-sync = { enable = mkOption { + type = types.bool; default = false; description = '' Enable the shairport-sync daemon. diff --git a/nixos/modules/services/networking/ssh/lshd.nix b/nixos/modules/services/networking/ssh/lshd.nix index eca599afb33..892e59778c3 100644 --- a/nixos/modules/services/networking/ssh/lshd.nix +++ b/nixos/modules/services/networking/ssh/lshd.nix @@ -19,6 +19,7 @@ in services.lshd = { enable = mkOption { + type = types.bool; default = false; description = '' Whether to enable the GNU lshd SSH2 daemon, which allows diff --git a/nixos/modules/services/networking/xinetd.nix b/nixos/modules/services/networking/xinetd.nix index 8dc6f845ed8..2f527ab156a 100644 --- a/nixos/modules/services/networking/xinetd.nix +++ b/nixos/modules/services/networking/xinetd.nix @@ -44,12 +44,7 @@ in options = { - services.xinetd.enable = mkOption { - default = false; - description = '' - Whether to enable the xinetd super-server daemon. - ''; - }; + services.xinetd.enable = mkEnableOption "the xinetd super-server daemon"; services.xinetd.extraDefaults = mkOption { default = ""; diff --git a/nixos/modules/services/security/fprot.nix b/nixos/modules/services/security/fprot.nix index f203f2abc03..3a0b08b3c6d 100644 --- a/nixos/modules/services/security/fprot.nix +++ b/nixos/modules/services/security/fprot.nix @@ -10,12 +10,7 @@ in { services.fprot = { updater = { - enable = mkOption { - default = false; - description = '' - Whether to enable automatic F-Prot virus definitions database updates. - ''; - }; + enable = mkEnableOption "automatic F-Prot virus definitions database updates"; productData = mkOption { description = '' diff --git a/nixos/modules/services/system/kerberos/default.nix b/nixos/modules/services/system/kerberos/default.nix index c55241c4cff..9a1e6739901 100644 --- a/nixos/modules/services/system/kerberos/default.nix +++ b/nixos/modules/services/system/kerberos/default.nix @@ -51,12 +51,7 @@ in ###### interface options = { services.kerberos_server = { - enable = mkOption { - default = false; - description = '' - Enable the kerberos authentification server. - ''; - }; + enable = lib.mkEnableOption "the kerberos authentification server"; realms = mkOption { type = types.attrsOf (types.submodule realm); diff --git a/nixos/modules/services/system/localtime.nix b/nixos/modules/services/system/localtime.nix index 74925c5e2c4..8f8e2e2e933 100644 --- a/nixos/modules/services/system/localtime.nix +++ b/nixos/modules/services/system/localtime.nix @@ -8,6 +8,7 @@ in { options = { services.localtime = { enable = mkOption { + type = types.bool; default = false; description = '' Enable localtime, simple daemon for keeping the system diff --git a/nixos/modules/services/system/uptimed.nix b/nixos/modules/services/system/uptimed.nix index 3c9978ab226..1e256c51408 100644 --- a/nixos/modules/services/system/uptimed.nix +++ b/nixos/modules/services/system/uptimed.nix @@ -10,6 +10,7 @@ in options = { services.uptimed = { enable = mkOption { + type = types.bool; default = false; description = '' Enable uptimed, allowing you to track diff --git a/nixos/modules/services/web-servers/jboss/default.nix b/nixos/modules/services/web-servers/jboss/default.nix index d28724281a8..3a125982831 100644 --- a/nixos/modules/services/web-servers/jboss/default.nix +++ b/nixos/modules/services/web-servers/jboss/default.nix @@ -24,6 +24,7 @@ in services.jboss = { enable = mkOption { + type = types.bool; default = false; description = "Whether to enable JBoss. WARNING : this package is outdated and is known to have vulnerabilities."; }; diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index 32c9a40e535..1690a7d51a8 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -23,6 +23,7 @@ in options = { services.xserver.desktopManager.enlightenment.enable = mkOption { + type = types.bool; default = false; description = "Enable the Enlightenment desktop environment."; }; diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index ac8e70c52bc..bbc7feb2d04 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -72,6 +72,7 @@ in services.xserver.desktopManager.gnome3 = { enable = mkOption { + type = types.bool; default = false; description = "Enable Gnome 3 desktop manager."; }; diff --git a/nixos/modules/services/x11/desktop-managers/kodi.nix b/nixos/modules/services/x11/desktop-managers/kodi.nix index e997b9a1134..bdae9c3afdb 100644 --- a/nixos/modules/services/x11/desktop-managers/kodi.nix +++ b/nixos/modules/services/x11/desktop-managers/kodi.nix @@ -10,6 +10,7 @@ in options = { services.xserver.desktopManager.kodi = { enable = mkOption { + type = types.bool; default = false; description = "Enable the kodi multimedia center."; }; diff --git a/nixos/modules/services/x11/display-managers/startx.nix b/nixos/modules/services/x11/display-managers/startx.nix index 57046984358..3980203b945 100644 --- a/nixos/modules/services/x11/display-managers/startx.nix +++ b/nixos/modules/services/x11/display-managers/startx.nix @@ -15,6 +15,7 @@ in options = { services.xserver.displayManager.startx = { enable = mkOption { + type = types.bool; default = false; description = '' Whether to enable the dummy "startx" pseudo-display manager, diff --git a/nixos/modules/services/x11/hardware/wacom.nix b/nixos/modules/services/x11/hardware/wacom.nix index a27889c36a7..dad2b308d1b 100644 --- a/nixos/modules/services/x11/hardware/wacom.nix +++ b/nixos/modules/services/x11/hardware/wacom.nix @@ -15,6 +15,7 @@ in services.xserver.wacom = { enable = mkOption { + type = types.bool; default = false; description = '' Whether to enable the Wacom touchscreen/digitizer/tablet. -- cgit v1.2.3 From 1a36927174685b6c9d27691e45ae6af90a2f649f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Mon, 20 Apr 2020 04:20:00 -0500 Subject: ocamlformat: 0.14.0 -> 0.14.1 Changelog: https://github.com/ocaml-ppx/ocamlformat/releases/tag/0.14.1 --- pkgs/development/tools/ocaml/ocamlformat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocamlformat/default.nix b/pkgs/development/tools/ocaml/ocamlformat/default.nix index da134562e32..9a034a2b047 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/default.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/default.nix @@ -2,7 +2,7 @@ with ocamlPackages; buildDunePackage rec { pname = "ocamlformat"; - version = "0.14.0"; + version = "0.14.1"; minimumOCamlVersion = "4.06"; @@ -10,7 +10,7 @@ with ocamlPackages; buildDunePackage rec { src = fetchurl { url = "https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/ocamlformat-${version}.tbz"; - sha256 = "070c0x6z5y0lyls56zm34g8lyc093wkr0jfp50dvrkr9fk1sx2wi"; + sha256 = "03wn46xib63748157xchj7gflkw5000fcjw6n89h9g82q9slazaa"; }; buildInputs = [ -- cgit v1.2.3 From b512a788a4c135c42a5af75ece88d67efaddd4d9 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 20 Apr 2020 09:37:53 +0100 Subject: nixos/virtualisation.podman: Init module --- nixos/doc/manual/release-notes/rl-2009.xml | 5 + nixos/modules/module-list.nix | 1 + nixos/modules/virtualisation/podman.nix | 192 +++++++++++++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/podman.nix | 30 +++++ 5 files changed, 229 insertions(+) create mode 100644 nixos/modules/virtualisation/podman.nix create mode 100644 nixos/tests/podman.nix diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 0f22f4331f4..85071bf7846 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -40,6 +40,11 @@ make use of these new options instead. + + + There is a new module for Podman(virtualisation.podman), a drop-in replacement for the Docker command line. + + diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index df08ac2959e..38452fddf31 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -997,6 +997,7 @@ ./virtualisation/kvmgt.nix ./virtualisation/openvswitch.nix ./virtualisation/parallels-guest.nix + ./virtualisation/podman.nix ./virtualisation/qemu-guest-agent.nix ./virtualisation/railcar.nix ./virtualisation/rkt.nix diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix new file mode 100644 index 00000000000..c1777eb95d9 --- /dev/null +++ b/nixos/modules/virtualisation/podman.nix @@ -0,0 +1,192 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.virtualisation.podman; + + inherit (lib) mkOption types; + + + # Provides a fake "docker" binary mapping to podman + dockerCompat = pkgs.runCommandNoCC "${pkgs.podman.pname}-docker-compat-${pkgs.podman.version}" { + outputs = [ "out" "bin" "man" ]; + inherit (pkgs.podman) meta; + } '' + mkdir $out + + mkdir -p $bin/bin + ln -s ${pkgs.podman.bin}/bin/podman $bin/bin/docker + + mkdir -p $man/share/man/man1 + for f in ${pkgs.podman.man}/share/man/man1/*; do + basename=$(basename $f | sed s/podman/docker/g) + ln -s $f $man/share/man/man1/$basename + done + ''; + + # Once https://github.com/NixOS/nixpkgs/pull/75584 is merged we can use the TOML generator + toTOML = name: value: pkgs.runCommandNoCC name { + nativeBuildInputs = [ pkgs.remarshal ]; + value = builtins.toJSON value; + passAsFile = [ "value" ]; + } '' + json2toml "$valuePath" "$out" + ''; + + # Copy configuration files to avoid having the entire sources in the system closure + copyFile = filePath: pkgs.runCommandNoCC (builtins.unsafeDiscardStringContext (builtins.baseNameOf filePath)) {} '' + cp ${filePath} $out + ''; +in +{ + + options.virtualisation.podman = { + + enable = + mkOption { + type = types.bool; + default = false; + description = '' + This option enables Podman, a daemonless container engine for + developing, managing, and running OCI Containers on your Linux System. + + It is a drop-in replacement for the docker command. + ''; + }; + + dockerCompat = mkOption { + type = types.bool; + default = false; + description = '' + Create an alias mapping docker to podman. + ''; + }; + + registries = { + search = mkOption { + type = types.listOf types.str; + default = [ "docker.io" "quay.io" ]; + description = '' + List of repositories to search. + ''; + }; + + insecure = mkOption { + default = []; + type = types.listOf types.str; + description = '' + List of insecure repositories. + ''; + }; + + block = mkOption { + default = []; + type = types.listOf types.str; + description = '' + List of blocked repositories. + ''; + }; + }; + + policy = mkOption { + default = {}; + type = types.attrs; + example = lib.literalExample '' + { + default = [ { type = "insecureAcceptAnything"; } ]; + transports = { + docker-daemon = { + "" = [ { type = "insecureAcceptAnything"; } ]; + }; + }; + } + ''; + description = '' + Signature verification policy file. + If this option is empty the default policy file from + skopeo will be used. + ''; + }; + + users = mkOption { + default = []; + type = types.listOf types.str; + description = '' + List of users to set up subuid/subgid mappings for. + This is a requirement for running containers in rootless mode. + ''; + }; + + libpod = mkOption { + default = {}; + description = "Libpod configuration"; + type = types.submodule { + options = { + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Extra configuration that should be put in the libpod.conf + configuration file + ''; + + }; + }; + }; + }; + + }; + + config = lib.mkIf cfg.enable { + + environment.systemPackages = [ + pkgs.podman # Docker compat + pkgs.runc # Default container runtime + pkgs.crun # Default container runtime (cgroups v2) + pkgs.conmon # Container runtime monitor + pkgs.skopeo # Interact with container registry + pkgs.slirp4netns # User-mode networking for unprivileged namespaces + pkgs.fuse-overlayfs # CoW for images, much faster than default vfs + pkgs.utillinux # nsenter + pkgs.cni-plugins # Networking plugins + pkgs.iptables + ] + ++ lib.optional cfg.dockerCompat dockerCompat; + + environment.etc."containers/libpod.conf".text = '' + cni_plugin_dir = ["${pkgs.cni-plugins}/bin/"] + cni_config_dir = "/etc/cni/net.d/" + ${cfg.libpod.extraConfig} + ''; + + environment.etc."cni/net.d/87-podman-bridge.conflist".source = copyFile "${pkgs.podman.src}/cni/87-podman-bridge.conflist"; + + environment.etc."containers/registries.conf".source = toTOML "registries.conf" { + registries = lib.mapAttrs (n: v: { registries = v; }) cfg.registries; + }; + + users.extraUsers = builtins.listToAttrs ( + ( + builtins.foldl' ( + acc: user: { + values = acc.values ++ [ + { + name = user; + value = { + subUidRanges = [ { startUid = acc.offset; count = 65536; } ]; + subGidRanges = [ { startGid = acc.offset; count = 65536; } ]; + }; + } + ]; + offset = acc.offset + 65536; + } + ) + { values = []; offset = 100000; } cfg.users + ).values + ); + + environment.etc."containers/policy.json".source = + if cfg.policy != {} then pkgs.writeText "policy.json" (builtins.toJSON cfg.policy) + else copyFile "${pkgs.skopeo.src}/default-policy.json"; + }; + +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 30229a3a5b2..396d1401245 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -248,6 +248,7 @@ in php = handleTest ./php {}; plasma5 = handleTest ./plasma5.nix {}; plotinus = handleTest ./plotinus.nix {}; + podman = handleTest ./podman.nix {}; postgis = handleTest ./postgis.nix {}; postgresql = handleTest ./postgresql.nix {}; postgresql-wal-receiver = handleTest ./postgresql-wal-receiver.nix {}; diff --git a/nixos/tests/podman.nix b/nixos/tests/podman.nix new file mode 100644 index 00000000000..601a6791c2f --- /dev/null +++ b/nixos/tests/podman.nix @@ -0,0 +1,30 @@ +# This test runs podman and checks if simple container starts + +import ./make-test-python.nix ( + { pkgs, ... }: { + name = "podman"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ adisbladis ]; + }; + + nodes = { + podman = + { pkgs, ... }: + { + virtualisation.podman.enable = true; + }; + }; + + testScript = '' + start_all() + + podman.wait_for_unit("sockets.target") + podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg") + podman.succeed( + "podman run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" + ) + podman.succeed("podman ps | grep sleeping") + podman.succeed("podman stop sleeping") + ''; + } +) -- cgit v1.2.3 From f0a92ef1d98a7f26e4918351fa865a17883de41b Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 20 Apr 2020 12:35:36 +0100 Subject: nixos/podman: Add maintainer team & add myself to podman team --- maintainers/team-list.nix | 3 ++- nixos/modules/virtualisation/podman.nix | 6 ++++-- nixos/tests/podman.nix | 6 +++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 7efff7f45ec..caee548d719 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -33,10 +33,11 @@ with lib.maintainers; { podman = { members = [ + adisbladis saschagrunert vdemeester zowoq ]; - scope = "Maintain podman related packages."; + scope = "Maintain Podman related packages and modules."; }; } diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix index c1777eb95d9..aa4846837c4 100644 --- a/nixos/modules/virtualisation/podman.nix +++ b/nixos/modules/virtualisation/podman.nix @@ -37,6 +37,9 @@ let ''; in { + meta = { + maintainers = lib.teams.podman.members; + }; options.virtualisation.podman = { @@ -143,7 +146,6 @@ in pkgs.runc # Default container runtime pkgs.crun # Default container runtime (cgroups v2) pkgs.conmon # Container runtime monitor - pkgs.skopeo # Interact with container registry pkgs.slirp4netns # User-mode networking for unprivileged namespaces pkgs.fuse-overlayfs # CoW for images, much faster than default vfs pkgs.utillinux # nsenter @@ -180,7 +182,7 @@ in offset = acc.offset + 65536; } ) - { values = []; offset = 100000; } cfg.users + { values = []; offset = 100000; } (lib.unique cfg.users) ).values ); diff --git a/nixos/tests/podman.nix b/nixos/tests/podman.nix index 601a6791c2f..ccfe8334a16 100644 --- a/nixos/tests/podman.nix +++ b/nixos/tests/podman.nix @@ -1,10 +1,10 @@ # This test runs podman and checks if simple container starts import ./make-test-python.nix ( - { pkgs, ... }: { + { pkgs, lib, ... }: { name = "podman"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ adisbladis ]; + meta = { + maintainers = lib.teams.podman.members; }; nodes = { -- cgit v1.2.3 From cf1a68360e934565da1cd9e15a5d7bf7c7a246e7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 21 Apr 2020 08:30:23 +0200 Subject: python2: 2.7.17 -> 2.7.18 --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 099632b1e85..5dc3b224720 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -57,10 +57,10 @@ in { sourceVersion = { major = "2"; minor = "7"; - patch = "17"; + patch = "18"; suffix = ""; }; - sha256 = "0hds28cg226m8j8sr394nm9yc4gxhvlv109w0avsf2mxrlrz0hsd"; + sha256 = "0hzgxl94hnflis0d6m4szjx0b52gah7wpmcg5g00q7am6xwhwb5n"; inherit (darwin) configd; inherit passthruFun; }; -- cgit v1.2.3 From 650df709fb9312ec2128ba6a0600d6fb55af0084 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 21 Apr 2020 10:36:01 +0100 Subject: nixos.virtualisation: Move containers.nix to nixos-containers.nix In anticipation of the new containers module. --- nixos/modules/module-list.nix | 2 +- nixos/modules/virtualisation/containers.nix | 838 ---------------------- nixos/modules/virtualisation/nixos-containers.nix | 838 ++++++++++++++++++++++ 3 files changed, 839 insertions(+), 839 deletions(-) delete mode 100644 nixos/modules/virtualisation/containers.nix create mode 100644 nixos/modules/virtualisation/nixos-containers.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 38452fddf31..58f4b05c546 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -983,7 +983,7 @@ ./testing/service-runner.nix ./virtualisation/anbox.nix ./virtualisation/container-config.nix - ./virtualisation/containers.nix + ./virtualisation/nixos-containers.nix ./virtualisation/cri-o.nix ./virtualisation/docker.nix ./virtualisation/docker-containers.nix diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix deleted file mode 100644 index 2db5c117aa7..00000000000 --- a/nixos/modules/virtualisation/containers.nix +++ /dev/null @@ -1,838 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - # The container's init script, a small wrapper around the regular - # NixOS stage-2 init script. - containerInit = (cfg: - let - renderExtraVeth = (name: cfg: - '' - echo "Bringing ${name} up" - ip link set dev ${name} up - ${optionalString (cfg.localAddress != null) '' - echo "Setting ip for ${name}" - ip addr add ${cfg.localAddress} dev ${name} - ''} - ${optionalString (cfg.localAddress6 != null) '' - echo "Setting ip6 for ${name}" - ip -6 addr add ${cfg.localAddress6} dev ${name} - ''} - ${optionalString (cfg.hostAddress != null) '' - echo "Setting route to host for ${name}" - ip route add ${cfg.hostAddress} dev ${name} - ''} - ${optionalString (cfg.hostAddress6 != null) '' - echo "Setting route6 to host for ${name}" - ip -6 route add ${cfg.hostAddress6} dev ${name} - ''} - '' - ); - in - pkgs.writeScript "container-init" - '' - #! ${pkgs.runtimeShell} -e - - # Initialise the container side of the veth pair. - if [ -n "$HOST_ADDRESS" ] || [ -n "$HOST_ADDRESS6" ] || - [ -n "$LOCAL_ADDRESS" ] || [ -n "$LOCAL_ADDRESS6" ] || - [ -n "$HOST_BRIDGE" ]; then - ip link set host0 name eth0 - ip link set dev eth0 up - - if [ -n "$LOCAL_ADDRESS" ]; then - ip addr add $LOCAL_ADDRESS dev eth0 - fi - if [ -n "$LOCAL_ADDRESS6" ]; then - ip -6 addr add $LOCAL_ADDRESS6 dev eth0 - fi - if [ -n "$HOST_ADDRESS" ]; then - ip route add $HOST_ADDRESS dev eth0 - ip route add default via $HOST_ADDRESS - fi - if [ -n "$HOST_ADDRESS6" ]; then - ip -6 route add $HOST_ADDRESS6 dev eth0 - ip -6 route add default via $HOST_ADDRESS6 - fi - - ${concatStringsSep "\n" (mapAttrsToList renderExtraVeth cfg.extraVeths)} - fi - - # Start the regular stage 1 script. - exec "$1" - '' - ); - - nspawnExtraVethArgs = (name: cfg: "--network-veth-extra=${name}"); - - startScript = cfg: - '' - mkdir -p -m 0755 "$root/etc" "$root/var/lib" - mkdir -p -m 0700 "$root/var/lib/private" "$root/root" /run/containers - if ! [ -e "$root/etc/os-release" ]; then - touch "$root/etc/os-release" - fi - - if ! [ -e "$root/etc/machine-id" ]; then - touch "$root/etc/machine-id" - fi - - mkdir -p -m 0755 \ - "/nix/var/nix/profiles/per-container/$INSTANCE" \ - "/nix/var/nix/gcroots/per-container/$INSTANCE" - - cp --remove-destination /etc/resolv.conf "$root/etc/resolv.conf" - - if [ "$PRIVATE_NETWORK" = 1 ]; then - extraFlags+=" --private-network" - fi - - if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ] || - [ -n "$HOST_ADDRESS6" ] || [ -n "$LOCAL_ADDRESS6" ]; then - extraFlags+=" --network-veth" - fi - - if [ -n "$HOST_PORT" ]; then - OIFS=$IFS - IFS="," - for i in $HOST_PORT - do - extraFlags+=" --port=$i" - done - IFS=$OIFS - fi - - if [ -n "$HOST_BRIDGE" ]; then - extraFlags+=" --network-bridge=$HOST_BRIDGE" - fi - - extraFlags+=" ${concatStringsSep " " (mapAttrsToList nspawnExtraVethArgs cfg.extraVeths)}" - - for iface in $INTERFACES; do - extraFlags+=" --network-interface=$iface" - done - - for iface in $MACVLANS; do - extraFlags+=" --network-macvlan=$iface" - done - - # If the host is 64-bit and the container is 32-bit, add a - # --personality flag. - ${optionalString (config.nixpkgs.localSystem.system == "x86_64-linux") '' - if [ "$(< ''${SYSTEM_PATH:-/nix/var/nix/profiles/per-container/$INSTANCE/system}/system)" = i686-linux ]; then - extraFlags+=" --personality=x86" - fi - ''} - - # Run systemd-nspawn without startup notification (we'll - # wait for the container systemd to signal readiness). - exec ${config.systemd.package}/bin/systemd-nspawn \ - --keep-unit \ - -M "$INSTANCE" -D "$root" $extraFlags \ - $EXTRA_NSPAWN_FLAGS \ - --notify-ready=yes \ - --bind-ro=/nix/store \ - --bind-ro=/nix/var/nix/db \ - --bind-ro=/nix/var/nix/daemon-socket \ - --bind="/nix/var/nix/profiles/per-container/$INSTANCE:/nix/var/nix/profiles" \ - --bind="/nix/var/nix/gcroots/per-container/$INSTANCE:/nix/var/nix/gcroots" \ - ${optionalString (!cfg.ephemeral) "--link-journal=try-guest"} \ - --setenv PRIVATE_NETWORK="$PRIVATE_NETWORK" \ - --setenv HOST_BRIDGE="$HOST_BRIDGE" \ - --setenv HOST_ADDRESS="$HOST_ADDRESS" \ - --setenv LOCAL_ADDRESS="$LOCAL_ADDRESS" \ - --setenv HOST_ADDRESS6="$HOST_ADDRESS6" \ - --setenv LOCAL_ADDRESS6="$LOCAL_ADDRESS6" \ - --setenv HOST_PORT="$HOST_PORT" \ - --setenv PATH="$PATH" \ - ${optionalString cfg.ephemeral "--ephemeral"} \ - ${if cfg.additionalCapabilities != null && cfg.additionalCapabilities != [] then - ''--capability="${concatStringsSep "," cfg.additionalCapabilities}"'' else "" - } \ - ${if cfg.tmpfs != null && cfg.tmpfs != [] then - ''--tmpfs=${concatStringsSep " --tmpfs=" cfg.tmpfs}'' else "" - } \ - ${containerInit cfg} "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/init" - ''; - - preStartScript = cfg: - '' - # Clean up existing machined registration and interfaces. - machinectl terminate "$INSTANCE" 2> /dev/null || true - - if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ] || - [ -n "$HOST_ADDRESS6" ] || [ -n "$LOCAL_ADDRESS6" ]; then - ip link del dev "ve-$INSTANCE" 2> /dev/null || true - ip link del dev "vb-$INSTANCE" 2> /dev/null || true - fi - - ${concatStringsSep "\n" ( - mapAttrsToList (name: cfg: - ''ip link del dev ${name} 2> /dev/null || true '' - ) cfg.extraVeths - )} - ''; - - postStartScript = (cfg: - let - ipcall = cfg: ipcmd: variable: attribute: - if cfg.${attribute} == null then - '' - if [ -n "${variable}" ]; then - ${ipcmd} add ${variable} dev $ifaceHost - fi - '' - else - ''${ipcmd} add ${cfg.${attribute}} dev $ifaceHost''; - renderExtraVeth = name: cfg: - if cfg.hostBridge != null then - '' - # Add ${name} to bridge ${cfg.hostBridge} - ip link set dev ${name} master ${cfg.hostBridge} up - '' - else - '' - echo "Bring ${name} up" - ip link set dev ${name} up - # Set IPs and routes for ${name} - ${optionalString (cfg.hostAddress != null) '' - ip addr add ${cfg.hostAddress} dev ${name} - ''} - ${optionalString (cfg.hostAddress6 != null) '' - ip -6 addr add ${cfg.hostAddress6} dev ${name} - ''} - ${optionalString (cfg.localAddress != null) '' - ip route add ${cfg.localAddress} dev ${name} - ''} - ${optionalString (cfg.localAddress6 != null) '' - ip -6 route add ${cfg.localAddress6} dev ${name} - ''} - ''; - in - '' - if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ] || - [ -n "$HOST_ADDRESS6" ] || [ -n "$LOCAL_ADDRESS6" ]; then - if [ -z "$HOST_BRIDGE" ]; then - ifaceHost=ve-$INSTANCE - ip link set dev $ifaceHost up - - ${ipcall cfg "ip addr" "$HOST_ADDRESS" "hostAddress"} - ${ipcall cfg "ip -6 addr" "$HOST_ADDRESS6" "hostAddress6"} - ${ipcall cfg "ip route" "$LOCAL_ADDRESS" "localAddress"} - ${ipcall cfg "ip -6 route" "$LOCAL_ADDRESS6" "localAddress6"} - fi - ${concatStringsSep "\n" (mapAttrsToList renderExtraVeth cfg.extraVeths)} - fi - '' - ); - - serviceDirectives = cfg: { - ExecReload = pkgs.writeScript "reload-container" - '' - #! ${pkgs.runtimeShell} -e - ${pkgs.nixos-container}/bin/nixos-container run "$INSTANCE" -- \ - bash --login -c "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/bin/switch-to-configuration test" - ''; - - SyslogIdentifier = "container %i"; - - EnvironmentFile = "-/etc/containers/%i.conf"; - - Type = "notify"; - - RuntimeDirectory = lib.optional cfg.ephemeral "containers/%i"; - - # Note that on reboot, systemd-nspawn returns 133, so this - # unit will be restarted. On poweroff, it returns 0, so the - # unit won't be restarted. - RestartForceExitStatus = "133"; - SuccessExitStatus = "133"; - - # Some containers take long to start - # especially when you automatically start many at once - TimeoutStartSec = cfg.timeoutStartSec; - - Restart = "on-failure"; - - Slice = "machine.slice"; - Delegate = true; - - # Hack: we don't want to kill systemd-nspawn, since we call - # "machinectl poweroff" in preStop to shut down the - # container cleanly. But systemd requires sending a signal - # (at least if we want remaining processes to be killed - # after the timeout). So send an ignored signal. - KillMode = "mixed"; - KillSignal = "WINCH"; - - DevicePolicy = "closed"; - DeviceAllow = map (d: "${d.node} ${d.modifier}") cfg.allowedDevices; - }; - - - system = config.nixpkgs.localSystem.system; - - bindMountOpts = { name, ... }: { - - options = { - mountPoint = mkOption { - example = "/mnt/usb"; - type = types.str; - description = "Mount point on the container file system."; - }; - hostPath = mkOption { - default = null; - example = "/home/alice"; - type = types.nullOr types.str; - description = "Location of the host path to be mounted."; - }; - isReadOnly = mkOption { - default = true; - type = types.bool; - description = "Determine whether the mounted path will be accessed in read-only mode."; - }; - }; - - config = { - mountPoint = mkDefault name; - }; - - }; - - allowedDeviceOpts = { ... }: { - options = { - node = mkOption { - example = "/dev/net/tun"; - type = types.str; - description = "Path to device node"; - }; - modifier = mkOption { - example = "rw"; - type = types.str; - description = '' - Device node access modifier. Takes a combination - r (read), w (write), and - m (mknod). See the - systemd.resource-control(5) man page for more - information.''; - }; - }; - }; - - - mkBindFlag = d: - let flagPrefix = if d.isReadOnly then " --bind-ro=" else " --bind="; - mountstr = if d.hostPath != null then "${d.hostPath}:${d.mountPoint}" else "${d.mountPoint}"; - in flagPrefix + mountstr ; - - mkBindFlags = bs: concatMapStrings mkBindFlag (lib.attrValues bs); - - networkOptions = { - hostBridge = mkOption { - type = types.nullOr types.str; - default = null; - example = "br0"; - description = '' - Put the host-side of the veth-pair into the named bridge. - Only one of hostAddress* or hostBridge can be given. - ''; - }; - - forwardPorts = mkOption { - type = types.listOf (types.submodule { - options = { - protocol = mkOption { - type = types.str; - default = "tcp"; - description = "The protocol specifier for port forwarding between host and container"; - }; - hostPort = mkOption { - type = types.int; - description = "Source port of the external interface on host"; - }; - containerPort = mkOption { - type = types.nullOr types.int; - default = null; - description = "Target port of container"; - }; - }; - }); - default = []; - example = [ { protocol = "tcp"; hostPort = 8080; containerPort = 80; } ]; - description = '' - List of forwarded ports from host to container. Each forwarded port - is specified by protocol, hostPort and containerPort. By default, - protocol is tcp and hostPort and containerPort are assumed to be - the same if containerPort is not explicitly given. - ''; - }; - - - hostAddress = mkOption { - type = types.nullOr types.str; - default = null; - example = "10.231.136.1"; - description = '' - The IPv4 address assigned to the host interface. - (Not used when hostBridge is set.) - ''; - }; - - hostAddress6 = mkOption { - type = types.nullOr types.str; - default = null; - example = "fc00::1"; - description = '' - The IPv6 address assigned to the host interface. - (Not used when hostBridge is set.) - ''; - }; - - localAddress = mkOption { - type = types.nullOr types.str; - default = null; - example = "10.231.136.2"; - description = '' - The IPv4 address assigned to the interface in the container. - If a hostBridge is used, this should be given with netmask to access - the whole network. Otherwise the default netmask is /32 and routing is - set up from localAddress to hostAddress and back. - ''; - }; - - localAddress6 = mkOption { - type = types.nullOr types.str; - default = null; - example = "fc00::2"; - description = '' - The IPv6 address assigned to the interface in the container. - If a hostBridge is used, this should be given with netmask to access - the whole network. Otherwise the default netmask is /128 and routing is - set up from localAddress6 to hostAddress6 and back. - ''; - }; - - }; - - dummyConfig = - { - extraVeths = {}; - additionalCapabilities = []; - ephemeral = false; - timeoutStartSec = "15s"; - allowedDevices = []; - hostAddress = null; - hostAddress6 = null; - localAddress = null; - localAddress6 = null; - tmpfs = null; - }; - -in - -{ - options = { - - boot.isContainer = mkOption { - type = types.bool; - default = false; - description = '' - Whether this NixOS machine is a lightweight container running - in another NixOS system. - ''; - }; - - boot.enableContainers = mkOption { - type = types.bool; - default = !config.boot.isContainer; - description = '' - Whether to enable support for NixOS containers. - ''; - }; - - containers = mkOption { - type = types.attrsOf (types.submodule ( - { config, options, name, ... }: - { - options = { - - config = mkOption { - description = '' - A specification of the desired configuration of this - container, as a NixOS module. - ''; - type = let - confPkgs = if config.pkgs == null then pkgs else config.pkgs; - in lib.mkOptionType { - name = "Toplevel NixOS config"; - merge = loc: defs: (import (confPkgs.path + "/nixos/lib/eval-config.nix") { - inherit system; - pkgs = confPkgs; - baseModules = import (confPkgs.path + "/nixos/modules/module-list.nix"); - inherit (confPkgs) lib; - modules = - let - extraConfig = { - _file = "module at ${__curPos.file}:${toString __curPos.line}"; - config = { - boot.isContainer = true; - networking.hostName = mkDefault name; - networking.useDHCP = false; - assertions = [ - { - assertion = config.privateNetwork -> stringLength name < 12; - message = '' - Container name `${name}` is too long: When `privateNetwork` is enabled, container names can - not be longer than 11 characters, because the container's interface name is derived from it. - This might be fixed in the future. See https://github.com/NixOS/nixpkgs/issues/38509 - ''; - } - ]; - }; - }; - in [ extraConfig ] ++ (map (x: x.value) defs); - prefix = [ "containers" name ]; - }).config; - }; - }; - - path = mkOption { - type = types.path; - example = "/nix/var/nix/profiles/containers/webserver"; - description = '' - As an alternative to specifying - , you can specify the path to - the evaluated NixOS system configuration, typically a - symlink to a system profile. - ''; - }; - - additionalCapabilities = mkOption { - type = types.listOf types.str; - default = []; - example = [ "CAP_NET_ADMIN" "CAP_MKNOD" ]; - description = '' - Grant additional capabilities to the container. See the - capabilities(7) and systemd-nspawn(1) man pages for more - information. - ''; - }; - - pkgs = mkOption { - type = types.nullOr types.attrs; - default = null; - example = literalExample "pkgs"; - description = '' - Customise which nixpkgs to use for this container. - ''; - }; - - ephemeral = mkOption { - type = types.bool; - default = false; - description = '' - Runs container in ephemeral mode with the empty root filesystem at boot. - This way container will be bootstrapped from scratch on each boot - and will be cleaned up on shutdown leaving no traces behind. - Useful for completely stateless, reproducible containers. - - Note that this option might require to do some adjustments to the container configuration, - e.g. you might want to set - systemd.network.networks.$interface.dhcpConfig.ClientIdentifier to "mac" - if you use macvlans option. - This way dhcp client identifier will be stable between the container restarts. - - Note that the container journal will not be linked to the host if this option is enabled. - ''; - }; - - enableTun = mkOption { - type = types.bool; - default = false; - description = '' - Allows the container to create and setup tunnel interfaces - by granting the NET_ADMIN capability and - enabling access to /dev/net/tun. - ''; - }; - - privateNetwork = mkOption { - type = types.bool; - default = false; - description = '' - Whether to give the container its own private virtual - Ethernet interface. The interface is called - eth0, and is hooked up to the interface - ve-container-name - on the host. If this option is not set, then the - container shares the network interfaces of the host, - and can bind to any port on any interface. - ''; - }; - - interfaces = mkOption { - type = types.listOf types.str; - default = []; - example = [ "eth1" "eth2" ]; - description = '' - The list of interfaces to be moved into the container. - ''; - }; - - macvlans = mkOption { - type = types.listOf types.str; - default = []; - example = [ "eth1" "eth2" ]; - description = '' - The list of host interfaces from which macvlans will be - created. For each interface specified, a macvlan interface - will be created and moved to the container. - ''; - }; - - extraVeths = mkOption { - type = with types; attrsOf (submodule { options = networkOptions; }); - default = {}; - description = '' - Extra veth-pairs to be created for the container - ''; - }; - - autoStart = mkOption { - type = types.bool; - default = false; - description = '' - Whether the container is automatically started at boot-time. - ''; - }; - - timeoutStartSec = mkOption { - type = types.str; - default = "1min"; - description = '' - Time for the container to start. In case of a timeout, - the container processes get killed. - See systemd.time - 7 - for more information about the format. - ''; - }; - - bindMounts = mkOption { - type = with types; loaOf (submodule bindMountOpts); - default = {}; - example = literalExample '' - { "/home" = { hostPath = "/home/alice"; - isReadOnly = false; }; - } - ''; - - description = - '' - An extra list of directories that is bound to the container. - ''; - }; - - allowedDevices = mkOption { - type = with types; listOf (submodule allowedDeviceOpts); - default = []; - example = [ { node = "/dev/net/tun"; modifier = "rw"; } ]; - description = '' - A list of device nodes to which the containers has access to. - ''; - }; - - tmpfs = mkOption { - type = types.listOf types.str; - default = []; - example = [ "/var" ]; - description = '' - Mounts a set of tmpfs file systems into the container. - Multiple paths can be specified. - Valid items must conform to the --tmpfs argument - of systemd-nspawn. See systemd-nspawn(1) for details. - ''; - }; - - extraFlags = mkOption { - type = types.listOf types.str; - default = []; - example = [ "--drop-capability=CAP_SYS_CHROOT" ]; - description = '' - Extra flags passed to the systemd-nspawn command. - See systemd-nspawn(1) for details. - ''; - }; - - } // networkOptions; - - config = mkMerge - [ - (mkIf options.config.isDefined { - path = config.config.system.build.toplevel; - }) - ]; - })); - - default = {}; - example = literalExample - '' - { webserver = - { path = "/nix/var/nix/profiles/webserver"; - }; - database = - { config = - { config, pkgs, ... }: - { services.postgresql.enable = true; - services.postgresql.package = pkgs.postgresql_9_6; - - system.stateVersion = "17.03"; - }; - }; - } - ''; - description = '' - A set of NixOS system configurations to be run as lightweight - containers. Each container appears as a service - container-name - on the host system, allowing it to be started and stopped via - systemctl. - ''; - }; - - }; - - - config = mkIf (config.boot.enableContainers) (let - - unit = { - description = "Container '%i'"; - - unitConfig.RequiresMountsFor = "/var/lib/containers/%i"; - - path = [ pkgs.iproute ]; - - environment = { - root = "/var/lib/containers/%i"; - INSTANCE = "%i"; - }; - - preStart = preStartScript dummyConfig; - - script = startScript dummyConfig; - - postStart = postStartScript dummyConfig; - - preStop = "machinectl poweroff $INSTANCE"; - - restartIfChanged = false; - - serviceConfig = serviceDirectives dummyConfig; - }; - in { - systemd.targets.multi-user.wants = [ "machines.target" ]; - - systemd.services = listToAttrs (filter (x: x.value != null) ( - # The generic container template used by imperative containers - [{ name = "container@"; value = unit; }] - # declarative containers - ++ (mapAttrsToList (name: cfg: nameValuePair "container@${name}" (let - containerConfig = cfg // ( - if cfg.enableTun then - { - allowedDevices = cfg.allowedDevices - ++ [ { node = "/dev/net/tun"; modifier = "rw"; } ]; - additionalCapabilities = cfg.additionalCapabilities - ++ [ "CAP_NET_ADMIN" ]; - } - else {}); - in - recursiveUpdate unit { - preStart = preStartScript containerConfig; - script = startScript containerConfig; - postStart = postStartScript containerConfig; - serviceConfig = serviceDirectives containerConfig; - unitConfig.RequiresMountsFor = lib.optional (!containerConfig.ephemeral) "/var/lib/containers/%i"; - environment.root = if containerConfig.ephemeral then "/run/containers/%i" else "/var/lib/containers/%i"; - } // ( - if containerConfig.autoStart then - { - wantedBy = [ "machines.target" ]; - wants = [ "network.target" ]; - after = [ "network.target" ]; - restartTriggers = [ - containerConfig.path - config.environment.etc."containers/${name}.conf".source - ]; - restartIfChanged = true; - } - else {}) - )) config.containers) - )); - - # Generate a configuration file in /etc/containers for each - # container so that container@.target can get the container - # configuration. - environment.etc = - let mkPortStr = p: p.protocol + ":" + (toString p.hostPort) + ":" + (if p.containerPort == null then toString p.hostPort else toString p.containerPort); - in mapAttrs' (name: cfg: nameValuePair "containers/${name}.conf" - { text = - '' - SYSTEM_PATH=${cfg.path} - ${optionalString cfg.privateNetwork '' - PRIVATE_NETWORK=1 - ${optionalString (cfg.hostBridge != null) '' - HOST_BRIDGE=${cfg.hostBridge} - ''} - ${optionalString (length cfg.forwardPorts > 0) '' - HOST_PORT=${concatStringsSep "," (map mkPortStr cfg.forwardPorts)} - ''} - ${optionalString (cfg.hostAddress != null) '' - HOST_ADDRESS=${cfg.hostAddress} - ''} - ${optionalString (cfg.hostAddress6 != null) '' - HOST_ADDRESS6=${cfg.hostAddress6} - ''} - ${optionalString (cfg.localAddress != null) '' - LOCAL_ADDRESS=${cfg.localAddress} - ''} - ${optionalString (cfg.localAddress6 != null) '' - LOCAL_ADDRESS6=${cfg.localAddress6} - ''} - ''} - INTERFACES="${toString cfg.interfaces}" - MACVLANS="${toString cfg.macvlans}" - ${optionalString cfg.autoStart '' - AUTO_START=1 - ''} - EXTRA_NSPAWN_FLAGS="${mkBindFlags cfg.bindMounts + - optionalString (cfg.extraFlags != []) - (" " + concatStringsSep " " cfg.extraFlags)}" - ''; - }) config.containers; - - # Generate /etc/hosts entries for the containers. - networking.extraHosts = concatStrings (mapAttrsToList (name: cfg: optionalString (cfg.localAddress != null) - '' - ${head (splitString "/" cfg.localAddress)} ${name}.containers - '') config.containers); - - networking.dhcpcd.denyInterfaces = [ "ve-*" "vb-*" ]; - - services.udev.extraRules = optionalString config.networking.networkmanager.enable '' - # Don't manage interfaces created by nixos-container. - ENV{INTERFACE}=="v[eb]-*", ENV{NM_UNMANAGED}="1" - ''; - - environment.systemPackages = [ pkgs.nixos-container ]; - - boot.kernelModules = [ - "bridge" - "macvlan" - "tap" - "tun" - ]; - }); -} diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix new file mode 100644 index 00000000000..2db5c117aa7 --- /dev/null +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -0,0 +1,838 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + # The container's init script, a small wrapper around the regular + # NixOS stage-2 init script. + containerInit = (cfg: + let + renderExtraVeth = (name: cfg: + '' + echo "Bringing ${name} up" + ip link set dev ${name} up + ${optionalString (cfg.localAddress != null) '' + echo "Setting ip for ${name}" + ip addr add ${cfg.localAddress} dev ${name} + ''} + ${optionalString (cfg.localAddress6 != null) '' + echo "Setting ip6 for ${name}" + ip -6 addr add ${cfg.localAddress6} dev ${name} + ''} + ${optionalString (cfg.hostAddress != null) '' + echo "Setting route to host for ${name}" + ip route add ${cfg.hostAddress} dev ${name} + ''} + ${optionalString (cfg.hostAddress6 != null) '' + echo "Setting route6 to host for ${name}" + ip -6 route add ${cfg.hostAddress6} dev ${name} + ''} + '' + ); + in + pkgs.writeScript "container-init" + '' + #! ${pkgs.runtimeShell} -e + + # Initialise the container side of the veth pair. + if [ -n "$HOST_ADDRESS" ] || [ -n "$HOST_ADDRESS6" ] || + [ -n "$LOCAL_ADDRESS" ] || [ -n "$LOCAL_ADDRESS6" ] || + [ -n "$HOST_BRIDGE" ]; then + ip link set host0 name eth0 + ip link set dev eth0 up + + if [ -n "$LOCAL_ADDRESS" ]; then + ip addr add $LOCAL_ADDRESS dev eth0 + fi + if [ -n "$LOCAL_ADDRESS6" ]; then + ip -6 addr add $LOCAL_ADDRESS6 dev eth0 + fi + if [ -n "$HOST_ADDRESS" ]; then + ip route add $HOST_ADDRESS dev eth0 + ip route add default via $HOST_ADDRESS + fi + if [ -n "$HOST_ADDRESS6" ]; then + ip -6 route add $HOST_ADDRESS6 dev eth0 + ip -6 route add default via $HOST_ADDRESS6 + fi + + ${concatStringsSep "\n" (mapAttrsToList renderExtraVeth cfg.extraVeths)} + fi + + # Start the regular stage 1 script. + exec "$1" + '' + ); + + nspawnExtraVethArgs = (name: cfg: "--network-veth-extra=${name}"); + + startScript = cfg: + '' + mkdir -p -m 0755 "$root/etc" "$root/var/lib" + mkdir -p -m 0700 "$root/var/lib/private" "$root/root" /run/containers + if ! [ -e "$root/etc/os-release" ]; then + touch "$root/etc/os-release" + fi + + if ! [ -e "$root/etc/machine-id" ]; then + touch "$root/etc/machine-id" + fi + + mkdir -p -m 0755 \ + "/nix/var/nix/profiles/per-container/$INSTANCE" \ + "/nix/var/nix/gcroots/per-container/$INSTANCE" + + cp --remove-destination /etc/resolv.conf "$root/etc/resolv.conf" + + if [ "$PRIVATE_NETWORK" = 1 ]; then + extraFlags+=" --private-network" + fi + + if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ] || + [ -n "$HOST_ADDRESS6" ] || [ -n "$LOCAL_ADDRESS6" ]; then + extraFlags+=" --network-veth" + fi + + if [ -n "$HOST_PORT" ]; then + OIFS=$IFS + IFS="," + for i in $HOST_PORT + do + extraFlags+=" --port=$i" + done + IFS=$OIFS + fi + + if [ -n "$HOST_BRIDGE" ]; then + extraFlags+=" --network-bridge=$HOST_BRIDGE" + fi + + extraFlags+=" ${concatStringsSep " " (mapAttrsToList nspawnExtraVethArgs cfg.extraVeths)}" + + for iface in $INTERFACES; do + extraFlags+=" --network-interface=$iface" + done + + for iface in $MACVLANS; do + extraFlags+=" --network-macvlan=$iface" + done + + # If the host is 64-bit and the container is 32-bit, add a + # --personality flag. + ${optionalString (config.nixpkgs.localSystem.system == "x86_64-linux") '' + if [ "$(< ''${SYSTEM_PATH:-/nix/var/nix/profiles/per-container/$INSTANCE/system}/system)" = i686-linux ]; then + extraFlags+=" --personality=x86" + fi + ''} + + # Run systemd-nspawn without startup notification (we'll + # wait for the container systemd to signal readiness). + exec ${config.systemd.package}/bin/systemd-nspawn \ + --keep-unit \ + -M "$INSTANCE" -D "$root" $extraFlags \ + $EXTRA_NSPAWN_FLAGS \ + --notify-ready=yes \ + --bind-ro=/nix/store \ + --bind-ro=/nix/var/nix/db \ + --bind-ro=/nix/var/nix/daemon-socket \ + --bind="/nix/var/nix/profiles/per-container/$INSTANCE:/nix/var/nix/profiles" \ + --bind="/nix/var/nix/gcroots/per-container/$INSTANCE:/nix/var/nix/gcroots" \ + ${optionalString (!cfg.ephemeral) "--link-journal=try-guest"} \ + --setenv PRIVATE_NETWORK="$PRIVATE_NETWORK" \ + --setenv HOST_BRIDGE="$HOST_BRIDGE" \ + --setenv HOST_ADDRESS="$HOST_ADDRESS" \ + --setenv LOCAL_ADDRESS="$LOCAL_ADDRESS" \ + --setenv HOST_ADDRESS6="$HOST_ADDRESS6" \ + --setenv LOCAL_ADDRESS6="$LOCAL_ADDRESS6" \ + --setenv HOST_PORT="$HOST_PORT" \ + --setenv PATH="$PATH" \ + ${optionalString cfg.ephemeral "--ephemeral"} \ + ${if cfg.additionalCapabilities != null && cfg.additionalCapabilities != [] then + ''--capability="${concatStringsSep "," cfg.additionalCapabilities}"'' else "" + } \ + ${if cfg.tmpfs != null && cfg.tmpfs != [] then + ''--tmpfs=${concatStringsSep " --tmpfs=" cfg.tmpfs}'' else "" + } \ + ${containerInit cfg} "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/init" + ''; + + preStartScript = cfg: + '' + # Clean up existing machined registration and interfaces. + machinectl terminate "$INSTANCE" 2> /dev/null || true + + if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ] || + [ -n "$HOST_ADDRESS6" ] || [ -n "$LOCAL_ADDRESS6" ]; then + ip link del dev "ve-$INSTANCE" 2> /dev/null || true + ip link del dev "vb-$INSTANCE" 2> /dev/null || true + fi + + ${concatStringsSep "\n" ( + mapAttrsToList (name: cfg: + ''ip link del dev ${name} 2> /dev/null || true '' + ) cfg.extraVeths + )} + ''; + + postStartScript = (cfg: + let + ipcall = cfg: ipcmd: variable: attribute: + if cfg.${attribute} == null then + '' + if [ -n "${variable}" ]; then + ${ipcmd} add ${variable} dev $ifaceHost + fi + '' + else + ''${ipcmd} add ${cfg.${attribute}} dev $ifaceHost''; + renderExtraVeth = name: cfg: + if cfg.hostBridge != null then + '' + # Add ${name} to bridge ${cfg.hostBridge} + ip link set dev ${name} master ${cfg.hostBridge} up + '' + else + '' + echo "Bring ${name} up" + ip link set dev ${name} up + # Set IPs and routes for ${name} + ${optionalString (cfg.hostAddress != null) '' + ip addr add ${cfg.hostAddress} dev ${name} + ''} + ${optionalString (cfg.hostAddress6 != null) '' + ip -6 addr add ${cfg.hostAddress6} dev ${name} + ''} + ${optionalString (cfg.localAddress != null) '' + ip route add ${cfg.localAddress} dev ${name} + ''} + ${optionalString (cfg.localAddress6 != null) '' + ip -6 route add ${cfg.localAddress6} dev ${name} + ''} + ''; + in + '' + if [ -n "$HOST_ADDRESS" ] || [ -n "$LOCAL_ADDRESS" ] || + [ -n "$HOST_ADDRESS6" ] || [ -n "$LOCAL_ADDRESS6" ]; then + if [ -z "$HOST_BRIDGE" ]; then + ifaceHost=ve-$INSTANCE + ip link set dev $ifaceHost up + + ${ipcall cfg "ip addr" "$HOST_ADDRESS" "hostAddress"} + ${ipcall cfg "ip -6 addr" "$HOST_ADDRESS6" "hostAddress6"} + ${ipcall cfg "ip route" "$LOCAL_ADDRESS" "localAddress"} + ${ipcall cfg "ip -6 route" "$LOCAL_ADDRESS6" "localAddress6"} + fi + ${concatStringsSep "\n" (mapAttrsToList renderExtraVeth cfg.extraVeths)} + fi + '' + ); + + serviceDirectives = cfg: { + ExecReload = pkgs.writeScript "reload-container" + '' + #! ${pkgs.runtimeShell} -e + ${pkgs.nixos-container}/bin/nixos-container run "$INSTANCE" -- \ + bash --login -c "''${SYSTEM_PATH:-/nix/var/nix/profiles/system}/bin/switch-to-configuration test" + ''; + + SyslogIdentifier = "container %i"; + + EnvironmentFile = "-/etc/containers/%i.conf"; + + Type = "notify"; + + RuntimeDirectory = lib.optional cfg.ephemeral "containers/%i"; + + # Note that on reboot, systemd-nspawn returns 133, so this + # unit will be restarted. On poweroff, it returns 0, so the + # unit won't be restarted. + RestartForceExitStatus = "133"; + SuccessExitStatus = "133"; + + # Some containers take long to start + # especially when you automatically start many at once + TimeoutStartSec = cfg.timeoutStartSec; + + Restart = "on-failure"; + + Slice = "machine.slice"; + Delegate = true; + + # Hack: we don't want to kill systemd-nspawn, since we call + # "machinectl poweroff" in preStop to shut down the + # container cleanly. But systemd requires sending a signal + # (at least if we want remaining processes to be killed + # after the timeout). So send an ignored signal. + KillMode = "mixed"; + KillSignal = "WINCH"; + + DevicePolicy = "closed"; + DeviceAllow = map (d: "${d.node} ${d.modifier}") cfg.allowedDevices; + }; + + + system = config.nixpkgs.localSystem.system; + + bindMountOpts = { name, ... }: { + + options = { + mountPoint = mkOption { + example = "/mnt/usb"; + type = types.str; + description = "Mount point on the container file system."; + }; + hostPath = mkOption { + default = null; + example = "/home/alice"; + type = types.nullOr types.str; + description = "Location of the host path to be mounted."; + }; + isReadOnly = mkOption { + default = true; + type = types.bool; + description = "Determine whether the mounted path will be accessed in read-only mode."; + }; + }; + + config = { + mountPoint = mkDefault name; + }; + + }; + + allowedDeviceOpts = { ... }: { + options = { + node = mkOption { + example = "/dev/net/tun"; + type = types.str; + description = "Path to device node"; + }; + modifier = mkOption { + example = "rw"; + type = types.str; + description = '' + Device node access modifier. Takes a combination + r (read), w (write), and + m (mknod). See the + systemd.resource-control(5) man page for more + information.''; + }; + }; + }; + + + mkBindFlag = d: + let flagPrefix = if d.isReadOnly then " --bind-ro=" else " --bind="; + mountstr = if d.hostPath != null then "${d.hostPath}:${d.mountPoint}" else "${d.mountPoint}"; + in flagPrefix + mountstr ; + + mkBindFlags = bs: concatMapStrings mkBindFlag (lib.attrValues bs); + + networkOptions = { + hostBridge = mkOption { + type = types.nullOr types.str; + default = null; + example = "br0"; + description = '' + Put the host-side of the veth-pair into the named bridge. + Only one of hostAddress* or hostBridge can be given. + ''; + }; + + forwardPorts = mkOption { + type = types.listOf (types.submodule { + options = { + protocol = mkOption { + type = types.str; + default = "tcp"; + description = "The protocol specifier for port forwarding between host and container"; + }; + hostPort = mkOption { + type = types.int; + description = "Source port of the external interface on host"; + }; + containerPort = mkOption { + type = types.nullOr types.int; + default = null; + description = "Target port of container"; + }; + }; + }); + default = []; + example = [ { protocol = "tcp"; hostPort = 8080; containerPort = 80; } ]; + description = '' + List of forwarded ports from host to container. Each forwarded port + is specified by protocol, hostPort and containerPort. By default, + protocol is tcp and hostPort and containerPort are assumed to be + the same if containerPort is not explicitly given. + ''; + }; + + + hostAddress = mkOption { + type = types.nullOr types.str; + default = null; + example = "10.231.136.1"; + description = '' + The IPv4 address assigned to the host interface. + (Not used when hostBridge is set.) + ''; + }; + + hostAddress6 = mkOption { + type = types.nullOr types.str; + default = null; + example = "fc00::1"; + description = '' + The IPv6 address assigned to the host interface. + (Not used when hostBridge is set.) + ''; + }; + + localAddress = mkOption { + type = types.nullOr types.str; + default = null; + example = "10.231.136.2"; + description = '' + The IPv4 address assigned to the interface in the container. + If a hostBridge is used, this should be given with netmask to access + the whole network. Otherwise the default netmask is /32 and routing is + set up from localAddress to hostAddress and back. + ''; + }; + + localAddress6 = mkOption { + type = types.nullOr types.str; + default = null; + example = "fc00::2"; + description = '' + The IPv6 address assigned to the interface in the container. + If a hostBridge is used, this should be given with netmask to access + the whole network. Otherwise the default netmask is /128 and routing is + set up from localAddress6 to hostAddress6 and back. + ''; + }; + + }; + + dummyConfig = + { + extraVeths = {}; + additionalCapabilities = []; + ephemeral = false; + timeoutStartSec = "15s"; + allowedDevices = []; + hostAddress = null; + hostAddress6 = null; + localAddress = null; + localAddress6 = null; + tmpfs = null; + }; + +in + +{ + options = { + + boot.isContainer = mkOption { + type = types.bool; + default = false; + description = '' + Whether this NixOS machine is a lightweight container running + in another NixOS system. + ''; + }; + + boot.enableContainers = mkOption { + type = types.bool; + default = !config.boot.isContainer; + description = '' + Whether to enable support for NixOS containers. + ''; + }; + + containers = mkOption { + type = types.attrsOf (types.submodule ( + { config, options, name, ... }: + { + options = { + + config = mkOption { + description = '' + A specification of the desired configuration of this + container, as a NixOS module. + ''; + type = let + confPkgs = if config.pkgs == null then pkgs else config.pkgs; + in lib.mkOptionType { + name = "Toplevel NixOS config"; + merge = loc: defs: (import (confPkgs.path + "/nixos/lib/eval-config.nix") { + inherit system; + pkgs = confPkgs; + baseModules = import (confPkgs.path + "/nixos/modules/module-list.nix"); + inherit (confPkgs) lib; + modules = + let + extraConfig = { + _file = "module at ${__curPos.file}:${toString __curPos.line}"; + config = { + boot.isContainer = true; + networking.hostName = mkDefault name; + networking.useDHCP = false; + assertions = [ + { + assertion = config.privateNetwork -> stringLength name < 12; + message = '' + Container name `${name}` is too long: When `privateNetwork` is enabled, container names can + not be longer than 11 characters, because the container's interface name is derived from it. + This might be fixed in the future. See https://github.com/NixOS/nixpkgs/issues/38509 + ''; + } + ]; + }; + }; + in [ extraConfig ] ++ (map (x: x.value) defs); + prefix = [ "containers" name ]; + }).config; + }; + }; + + path = mkOption { + type = types.path; + example = "/nix/var/nix/profiles/containers/webserver"; + description = '' + As an alternative to specifying + , you can specify the path to + the evaluated NixOS system configuration, typically a + symlink to a system profile. + ''; + }; + + additionalCapabilities = mkOption { + type = types.listOf types.str; + default = []; + example = [ "CAP_NET_ADMIN" "CAP_MKNOD" ]; + description = '' + Grant additional capabilities to the container. See the + capabilities(7) and systemd-nspawn(1) man pages for more + information. + ''; + }; + + pkgs = mkOption { + type = types.nullOr types.attrs; + default = null; + example = literalExample "pkgs"; + description = '' + Customise which nixpkgs to use for this container. + ''; + }; + + ephemeral = mkOption { + type = types.bool; + default = false; + description = '' + Runs container in ephemeral mode with the empty root filesystem at boot. + This way container will be bootstrapped from scratch on each boot + and will be cleaned up on shutdown leaving no traces behind. + Useful for completely stateless, reproducible containers. + + Note that this option might require to do some adjustments to the container configuration, + e.g. you might want to set + systemd.network.networks.$interface.dhcpConfig.ClientIdentifier to "mac" + if you use macvlans option. + This way dhcp client identifier will be stable between the container restarts. + + Note that the container journal will not be linked to the host if this option is enabled. + ''; + }; + + enableTun = mkOption { + type = types.bool; + default = false; + description = '' + Allows the container to create and setup tunnel interfaces + by granting the NET_ADMIN capability and + enabling access to /dev/net/tun. + ''; + }; + + privateNetwork = mkOption { + type = types.bool; + default = false; + description = '' + Whether to give the container its own private virtual + Ethernet interface. The interface is called + eth0, and is hooked up to the interface + ve-container-name + on the host. If this option is not set, then the + container shares the network interfaces of the host, + and can bind to any port on any interface. + ''; + }; + + interfaces = mkOption { + type = types.listOf types.str; + default = []; + example = [ "eth1" "eth2" ]; + description = '' + The list of interfaces to be moved into the container. + ''; + }; + + macvlans = mkOption { + type = types.listOf types.str; + default = []; + example = [ "eth1" "eth2" ]; + description = '' + The list of host interfaces from which macvlans will be + created. For each interface specified, a macvlan interface + will be created and moved to the container. + ''; + }; + + extraVeths = mkOption { + type = with types; attrsOf (submodule { options = networkOptions; }); + default = {}; + description = '' + Extra veth-pairs to be created for the container + ''; + }; + + autoStart = mkOption { + type = types.bool; + default = false; + description = '' + Whether the container is automatically started at boot-time. + ''; + }; + + timeoutStartSec = mkOption { + type = types.str; + default = "1min"; + description = '' + Time for the container to start. In case of a timeout, + the container processes get killed. + See systemd.time + 7 + for more information about the format. + ''; + }; + + bindMounts = mkOption { + type = with types; loaOf (submodule bindMountOpts); + default = {}; + example = literalExample '' + { "/home" = { hostPath = "/home/alice"; + isReadOnly = false; }; + } + ''; + + description = + '' + An extra list of directories that is bound to the container. + ''; + }; + + allowedDevices = mkOption { + type = with types; listOf (submodule allowedDeviceOpts); + default = []; + example = [ { node = "/dev/net/tun"; modifier = "rw"; } ]; + description = '' + A list of device nodes to which the containers has access to. + ''; + }; + + tmpfs = mkOption { + type = types.listOf types.str; + default = []; + example = [ "/var" ]; + description = '' + Mounts a set of tmpfs file systems into the container. + Multiple paths can be specified. + Valid items must conform to the --tmpfs argument + of systemd-nspawn. See systemd-nspawn(1) for details. + ''; + }; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + example = [ "--drop-capability=CAP_SYS_CHROOT" ]; + description = '' + Extra flags passed to the systemd-nspawn command. + See systemd-nspawn(1) for details. + ''; + }; + + } // networkOptions; + + config = mkMerge + [ + (mkIf options.config.isDefined { + path = config.config.system.build.toplevel; + }) + ]; + })); + + default = {}; + example = literalExample + '' + { webserver = + { path = "/nix/var/nix/profiles/webserver"; + }; + database = + { config = + { config, pkgs, ... }: + { services.postgresql.enable = true; + services.postgresql.package = pkgs.postgresql_9_6; + + system.stateVersion = "17.03"; + }; + }; + } + ''; + description = '' + A set of NixOS system configurations to be run as lightweight + containers. Each container appears as a service + container-name + on the host system, allowing it to be started and stopped via + systemctl. + ''; + }; + + }; + + + config = mkIf (config.boot.enableContainers) (let + + unit = { + description = "Container '%i'"; + + unitConfig.RequiresMountsFor = "/var/lib/containers/%i"; + + path = [ pkgs.iproute ]; + + environment = { + root = "/var/lib/containers/%i"; + INSTANCE = "%i"; + }; + + preStart = preStartScript dummyConfig; + + script = startScript dummyConfig; + + postStart = postStartScript dummyConfig; + + preStop = "machinectl poweroff $INSTANCE"; + + restartIfChanged = false; + + serviceConfig = serviceDirectives dummyConfig; + }; + in { + systemd.targets.multi-user.wants = [ "machines.target" ]; + + systemd.services = listToAttrs (filter (x: x.value != null) ( + # The generic container template used by imperative containers + [{ name = "container@"; value = unit; }] + # declarative containers + ++ (mapAttrsToList (name: cfg: nameValuePair "container@${name}" (let + containerConfig = cfg // ( + if cfg.enableTun then + { + allowedDevices = cfg.allowedDevices + ++ [ { node = "/dev/net/tun"; modifier = "rw"; } ]; + additionalCapabilities = cfg.additionalCapabilities + ++ [ "CAP_NET_ADMIN" ]; + } + else {}); + in + recursiveUpdate unit { + preStart = preStartScript containerConfig; + script = startScript containerConfig; + postStart = postStartScript containerConfig; + serviceConfig = serviceDirectives containerConfig; + unitConfig.RequiresMountsFor = lib.optional (!containerConfig.ephemeral) "/var/lib/containers/%i"; + environment.root = if containerConfig.ephemeral then "/run/containers/%i" else "/var/lib/containers/%i"; + } // ( + if containerConfig.autoStart then + { + wantedBy = [ "machines.target" ]; + wants = [ "network.target" ]; + after = [ "network.target" ]; + restartTriggers = [ + containerConfig.path + config.environment.etc."containers/${name}.conf".source + ]; + restartIfChanged = true; + } + else {}) + )) config.containers) + )); + + # Generate a configuration file in /etc/containers for each + # container so that container@.target can get the container + # configuration. + environment.etc = + let mkPortStr = p: p.protocol + ":" + (toString p.hostPort) + ":" + (if p.containerPort == null then toString p.hostPort else toString p.containerPort); + in mapAttrs' (name: cfg: nameValuePair "containers/${name}.conf" + { text = + '' + SYSTEM_PATH=${cfg.path} + ${optionalString cfg.privateNetwork '' + PRIVATE_NETWORK=1 + ${optionalString (cfg.hostBridge != null) '' + HOST_BRIDGE=${cfg.hostBridge} + ''} + ${optionalString (length cfg.forwardPorts > 0) '' + HOST_PORT=${concatStringsSep "," (map mkPortStr cfg.forwardPorts)} + ''} + ${optionalString (cfg.hostAddress != null) '' + HOST_ADDRESS=${cfg.hostAddress} + ''} + ${optionalString (cfg.hostAddress6 != null) '' + HOST_ADDRESS6=${cfg.hostAddress6} + ''} + ${optionalString (cfg.localAddress != null) '' + LOCAL_ADDRESS=${cfg.localAddress} + ''} + ${optionalString (cfg.localAddress6 != null) '' + LOCAL_ADDRESS6=${cfg.localAddress6} + ''} + ''} + INTERFACES="${toString cfg.interfaces}" + MACVLANS="${toString cfg.macvlans}" + ${optionalString cfg.autoStart '' + AUTO_START=1 + ''} + EXTRA_NSPAWN_FLAGS="${mkBindFlags cfg.bindMounts + + optionalString (cfg.extraFlags != []) + (" " + concatStringsSep " " cfg.extraFlags)}" + ''; + }) config.containers; + + # Generate /etc/hosts entries for the containers. + networking.extraHosts = concatStrings (mapAttrsToList (name: cfg: optionalString (cfg.localAddress != null) + '' + ${head (splitString "/" cfg.localAddress)} ${name}.containers + '') config.containers); + + networking.dhcpcd.denyInterfaces = [ "ve-*" "vb-*" ]; + + services.udev.extraRules = optionalString config.networking.networkmanager.enable '' + # Don't manage interfaces created by nixos-container. + ENV{INTERFACE}=="v[eb]-*", ENV{NM_UNMANAGED}="1" + ''; + + environment.systemPackages = [ pkgs.nixos-container ]; + + boot.kernelModules = [ + "bridge" + "macvlan" + "tap" + "tun" + ]; + }); +} -- cgit v1.2.3 From 43f383c46472f3284d8ebe9b61f779270ffd1f78 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 21 Apr 2020 10:22:20 +0100 Subject: nixos.virtualisation.containers: Init common /etc/containers configuration module What's happening now is that both cri-o and podman are creating /etc/containers/policy.json. By splitting out the creation of configuration files we can make the podman module leaner & compose better with other container software. --- nixos/modules/module-list.nix | 1 + nixos/modules/virtualisation/containers.nix | 150 ++++++++++++++++++++++++++++ nixos/modules/virtualisation/cri-o.nix | 7 +- nixos/modules/virtualisation/podman.nix | 118 +--------------------- 4 files changed, 157 insertions(+), 119 deletions(-) create mode 100644 nixos/modules/virtualisation/containers.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 58f4b05c546..7244a7e0a89 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -983,6 +983,7 @@ ./testing/service-runner.nix ./virtualisation/anbox.nix ./virtualisation/container-config.nix + ./virtualisation/containers.nix ./virtualisation/nixos-containers.nix ./virtualisation/cri-o.nix ./virtualisation/docker.nix diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix new file mode 100644 index 00000000000..e6127e28486 --- /dev/null +++ b/nixos/modules/virtualisation/containers.nix @@ -0,0 +1,150 @@ +{ config, lib, pkgs, ... }: +let + cfg = config.virtualisation.containers; + + inherit (lib) mkOption types; + + # Once https://github.com/NixOS/nixpkgs/pull/75584 is merged we can use the TOML generator + toTOML = name: value: pkgs.runCommandNoCC name { + nativeBuildInputs = [ pkgs.remarshal ]; + value = builtins.toJSON value; + passAsFile = [ "value" ]; + } '' + json2toml "$valuePath" "$out" + ''; + + # Copy configuration files to avoid having the entire sources in the system closure + copyFile = filePath: pkgs.runCommandNoCC (builtins.unsafeDiscardStringContext (builtins.baseNameOf filePath)) {} '' + cp ${filePath} $out + ''; +in +{ + meta = { + maintainers = [] ++ lib.teams.podman.members; + }; + + options.virtualisation.containers = { + + enable = + mkOption { + type = types.bool; + default = false; + description = '' + This option enables the common libpod container configuration module. + ''; + }; + + registries = { + search = mkOption { + type = types.listOf types.str; + default = [ "docker.io" "quay.io" ]; + description = '' + List of repositories to search. + ''; + }; + + insecure = mkOption { + default = []; + type = types.listOf types.str; + description = '' + List of insecure repositories. + ''; + }; + + block = mkOption { + default = []; + type = types.listOf types.str; + description = '' + List of blocked repositories. + ''; + }; + }; + + policy = mkOption { + default = {}; + type = types.attrs; + example = lib.literalExample '' + { + default = [ { type = "insecureAcceptAnything"; } ]; + transports = { + docker-daemon = { + "" = [ { type = "insecureAcceptAnything"; } ]; + }; + }; + } + ''; + description = '' + Signature verification policy file. + If this option is empty the default policy file from + skopeo will be used. + ''; + }; + + users = mkOption { + default = []; + type = types.listOf types.str; + description = '' + List of users to set up subuid/subgid mappings for. + This is a requirement for running rootless containers. + ''; + }; + + libpod = mkOption { + default = {}; + description = "Libpod configuration"; + type = types.submodule { + options = { + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Extra configuration that should be put in the libpod.conf + configuration file + ''; + + }; + }; + }; + }; + + }; + + config = lib.mkIf cfg.enable { + + environment.etc."containers/libpod.conf".text = '' + cni_plugin_dir = ["${pkgs.cni-plugins}/bin/"] + cni_config_dir = "/etc/cni/net.d/" + + '' + cfg.libpod.extraConfig; + + environment.etc."containers/registries.conf".source = toTOML "registries.conf" { + registries = lib.mapAttrs (n: v: { registries = v; }) cfg.registries; + }; + + users.extraUsers = builtins.listToAttrs ( + ( + builtins.foldl' ( + acc: user: { + values = acc.values ++ [ + { + name = user; + value = { + subUidRanges = [ { startUid = acc.offset; count = 65536; } ]; + subGidRanges = [ { startGid = acc.offset; count = 65536; } ]; + }; + } + ]; + offset = acc.offset + 65536; + } + ) + { values = []; offset = 100000; } (lib.unique cfg.users) + ).values + ); + + environment.etc."containers/policy.json".source = + if cfg.policy != {} then pkgs.writeText "policy.json" (builtins.toJSON cfg.policy) + else copyFile "${pkgs.skopeo.src}/default-policy.json"; + }; + +} diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix index 14a435f6c8b..7882b7fc19d 100644 --- a/nixos/modules/virtualisation/cri-o.nix +++ b/nixos/modules/virtualisation/cri-o.nix @@ -62,9 +62,7 @@ in log_level = "${cfg.logLevel}" manage_network_ns_lifecycle = true ''; - environment.etc."containers/policy.json".text = '' - {"default": [{"type": "insecureAcceptAnything"}]} - ''; + environment.etc."cni/net.d/20-cri-o-bridge.conf".text = '' { "cniVersion": "0.3.1", @@ -83,6 +81,9 @@ in } ''; + # Enable common container configuration, this will create policy.json + virtualisation.containers.enable = true; + systemd.services.crio = { description = "Container Runtime Interface for OCI (CRI-O)"; documentation = [ "https://github.com/cri-o/cri-o" ]; diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix index aa4846837c4..2ec45fa18a4 100644 --- a/nixos/modules/virtualisation/podman.nix +++ b/nixos/modules/virtualisation/podman.nix @@ -4,7 +4,6 @@ let inherit (lib) mkOption types; - # Provides a fake "docker" binary mapping to podman dockerCompat = pkgs.runCommandNoCC "${pkgs.podman.pname}-docker-compat-${pkgs.podman.version}" { outputs = [ "out" "bin" "man" ]; @@ -22,19 +21,11 @@ let done ''; - # Once https://github.com/NixOS/nixpkgs/pull/75584 is merged we can use the TOML generator - toTOML = name: value: pkgs.runCommandNoCC name { - nativeBuildInputs = [ pkgs.remarshal ]; - value = builtins.toJSON value; - passAsFile = [ "value" ]; - } '' - json2toml "$valuePath" "$out" - ''; - # Copy configuration files to avoid having the entire sources in the system closure copyFile = filePath: pkgs.runCommandNoCC (builtins.unsafeDiscardStringContext (builtins.baseNameOf filePath)) {} '' cp ${filePath} $out ''; + in { meta = { @@ -63,80 +54,6 @@ in ''; }; - registries = { - search = mkOption { - type = types.listOf types.str; - default = [ "docker.io" "quay.io" ]; - description = '' - List of repositories to search. - ''; - }; - - insecure = mkOption { - default = []; - type = types.listOf types.str; - description = '' - List of insecure repositories. - ''; - }; - - block = mkOption { - default = []; - type = types.listOf types.str; - description = '' - List of blocked repositories. - ''; - }; - }; - - policy = mkOption { - default = {}; - type = types.attrs; - example = lib.literalExample '' - { - default = [ { type = "insecureAcceptAnything"; } ]; - transports = { - docker-daemon = { - "" = [ { type = "insecureAcceptAnything"; } ]; - }; - }; - } - ''; - description = '' - Signature verification policy file. - If this option is empty the default policy file from - skopeo will be used. - ''; - }; - - users = mkOption { - default = []; - type = types.listOf types.str; - description = '' - List of users to set up subuid/subgid mappings for. - This is a requirement for running containers in rootless mode. - ''; - }; - - libpod = mkOption { - default = {}; - description = "Libpod configuration"; - type = types.submodule { - options = { - - extraConfig = mkOption { - type = types.lines; - default = ""; - description = '' - Extra configuration that should be put in the libpod.conf - configuration file - ''; - - }; - }; - }; - }; - }; config = lib.mkIf cfg.enable { @@ -154,41 +71,10 @@ in ] ++ lib.optional cfg.dockerCompat dockerCompat; - environment.etc."containers/libpod.conf".text = '' - cni_plugin_dir = ["${pkgs.cni-plugins}/bin/"] - cni_config_dir = "/etc/cni/net.d/" - ${cfg.libpod.extraConfig} - ''; - environment.etc."cni/net.d/87-podman-bridge.conflist".source = copyFile "${pkgs.podman.src}/cni/87-podman-bridge.conflist"; - environment.etc."containers/registries.conf".source = toTOML "registries.conf" { - registries = lib.mapAttrs (n: v: { registries = v; }) cfg.registries; - }; + virtualisation.containers.enable = true; - users.extraUsers = builtins.listToAttrs ( - ( - builtins.foldl' ( - acc: user: { - values = acc.values ++ [ - { - name = user; - value = { - subUidRanges = [ { startUid = acc.offset; count = 65536; } ]; - subGidRanges = [ { startGid = acc.offset; count = 65536; } ]; - }; - } - ]; - offset = acc.offset + 65536; - } - ) - { values = []; offset = 100000; } (lib.unique cfg.users) - ).values - ); - - environment.etc."containers/policy.json".source = - if cfg.policy != {} then pkgs.writeText "policy.json" (builtins.toJSON cfg.policy) - else copyFile "${pkgs.skopeo.src}/default-policy.json"; }; } -- cgit v1.2.3 From a6b06e1431ee24bf823849fa3df0d9e8f79604e4 Mon Sep 17 00:00:00 2001 From: Thibaut Marty Date: Tue, 21 Apr 2020 12:11:09 +0200 Subject: herbstluftwm: 0.7.2 -> 0.8.1 Bash completions is now installed in $out/share/bash-completion. Setting CMAKE_INSTALL_SYSCONF_PREFIX is still needed for /etc/xdg/herbstluftwm installation. --- pkgs/applications/window-managers/herbstluftwm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index 0c23db00777..9ef7ab24e5e 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -8,11 +8,11 @@ assert withDoc -> asciidoc != null; stdenv.mkDerivation rec { pname = "herbstluftwm"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { url = "https://herbstluftwm.org/tarballs/herbstluftwm-${version}.tar.gz"; - sha256 = "04n8cmrgb490kfn70x9kgxp286mrrn7nb4irhi7nvbm6lv0z28sq"; + sha256 = "0c1lf82z6a56g8asin91cmqhzk3anw0xwc44b31bpjixadmns57y"; }; outputs = [ -- cgit v1.2.3 From dc80c4962d8e9b99ce1f0248f1d6dab71c73dd7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 21 Apr 2020 08:41:14 -0300 Subject: yaru-theme: 20.04.1 -> 20.04.6, unmark as broken --- pkgs/data/themes/yaru/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index 6033d64d79b..385f7afa3e4 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "yaru"; - version = "20.04.1"; + version = "20.04.6"; src = fetchFromGitHub { owner = "ubuntu"; repo = "yaru"; rev = version; - sha256 = "0c9az0bmnrnkgxfifp6nkan5bvjrkqrpg38zsp2vg493bm3bpbg1"; + sha256 = "04z16bcv1xdq4acnchd6cq9a8j46zl2bjp50cj90qmd6plpiiz50"; }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; @@ -25,6 +25,5 @@ stdenv.mkDerivation rec { license = with licenses; [ cc-by-sa-40 gpl3 ]; platforms = platforms.linux; maintainers = [ maintainers.jD91mZM2 ]; - broken = true; # since libsass 3.6.3 }; } -- cgit v1.2.3 From 666042141ed2039fdb136ccc89ca1aff6a495ec4 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 21 Apr 2020 14:02:17 +0200 Subject: git: Fix the update.sh script and use HTTPS The syntax is ${parameter:-word} (i.e. previously this used "latestTag" instead of the actual value). (Fixes a regression from #85278.) Also: Even though getting the latest tag isn't really security critical (as long as Git itself is secure against untrusted input), I'd prefer to switch from the Git to the HTTPS protocol (for authentication of the server and encryption + uses a standard port). --- pkgs/applications/version-management/git-and-tools/git/update.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/update.sh b/pkgs/applications/version-management/git-and-tools/git/update.sh index d0bc413fb89..54574722b02 100755 --- a/pkgs/applications/version-management/git-and-tools/git/update.sh +++ b/pkgs/applications/version-management/git-and-tools/git/update.sh @@ -4,8 +4,8 @@ set -eu -o pipefail oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion git" | 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|')" -targetVersion="${1:-latestTag}" +latestTag="$(git ls-remote --tags --sort="v:refname" https://github.com/git/git.git | grep -v '\{\}' | grep -v '\-rc' | tail -1 | sed 's|^.*/v\(.*\)|\1|')" +targetVersion="${1:-$latestTag}" if [ ! "${oldVersion}" = "${targetVersion}" ]; then update-source-version git "${targetVersion}" -- cgit v1.2.3 From 0226fe805966af5f4681083313f0b84cc047932c Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Tue, 21 Apr 2020 15:45:04 +0300 Subject: oil: 0.7.0 -> 0.8.pre4 --- pkgs/shells/oil/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/oil/default.nix b/pkgs/shells/oil/default.nix index 9e2aa3454d2..019a66c77eb 100644 --- a/pkgs/shells/oil/default.nix +++ b/pkgs/shells/oil/default.nix @@ -1,12 +1,12 @@ -{ stdenv, lib, fetchurl, fetchpatch, readline }: +{ stdenv, lib, fetchurl, readline }: stdenv.mkDerivation rec { pname = "oil"; - version = "0.7.0"; + version = "0.8.pre4"; src = fetchurl { url = "https://www.oilshell.org/download/oil-${version}.tar.xz"; - sha256 = "12c9s462879adb6mwd3fqafk0dnqsm16s18rhym6cmzfzy8v8zm3"; + sha256 = "07kj86hrvlz9f1gh3qv4hdaz3qnb4a2qf0dnxhd2r0qilrkjanxh"; }; postPatch = '' -- cgit v1.2.3 From 11e13acc4666ed581cb82378398f5aa38d81875f Mon Sep 17 00:00:00 2001 From: edef Date: Tue, 21 Apr 2020 13:17:01 +0000 Subject: srcOnly: ignore additional arguments This reverts commit b32a057425b337b37db41d3b4a67d39657477c05, which breaks even the most straightforward uses of srcOnly: nix-repl> srcOnly guile error: anonymous function at /home/src/nixpkgs/pkgs/build-support/src-only/default.nix:1:1 called with unexpected argument 'drvPath', at /home/src/nixpkgs/lib/customisation.nix:69:16 nix-repl> srcOnly hello error: anonymous function at /home/src/nixpkgs/pkgs/build-support/src-only/default.nix:1:1 called with unexpected argument 'drvPath', at /home/src/nixpkgs/lib/customisation.nix:69:16 Link: https://github.com/NixOS/nixpkgs/pull/80903#issuecomment-617172927 --- pkgs/build-support/src-only/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/src-only/default.nix b/pkgs/build-support/src-only/default.nix index c2f7cfb9399..a93b3648090 100644 --- a/pkgs/build-support/src-only/default.nix +++ b/pkgs/build-support/src-only/default.nix @@ -1,4 +1,4 @@ -{ stdenv, name, src, patches ? [], buildInputs ? [] }: +{stdenv, name, src, patches ? [], buildInputs ? [], ...}: stdenv.mkDerivation { inherit src buildInputs patches name; installPhase = "cp -r . $out"; -- cgit v1.2.3 From 05cfa5ff9973b362574d10880d1cdd47849ae4b4 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 21 Apr 2020 07:30:07 -0500 Subject: opam: 2.0.6 -> 2.0.7 --- pkgs/development/tools/ocaml/opam/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index f1028208dae..fdf25b930cb 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/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.6.zip"; - sha256 = "076070qwf7rqp5bh0mmgc5b3vyihgp4qpkd6fscxzya4in66bzf8"; + url = "https://github.com/ocaml/opam/archive/2.0.7.zip"; + sha256 = "03yxj4hw9p5dh34b1yzl3xd0l1v2l2az0n7ix453yjrkn0wn0xic"; }; }; in stdenv.mkDerivation { pname = "opam"; - version = "2.0.6"; + version = "2.0.7"; buildInputs = [ unzip curl ncurses ocaml makeWrapper getconf ] ++ lib.optional stdenv.isLinux bubblewrap; @@ -117,4 +117,4 @@ in stdenv.mkDerivation { platforms = platforms.all; }; } -# Generated by: ./opam.nix.pl -v 2.0.6 -p opam-shebangs.patch +# Generated by: ./opam.nix.pl -v 2.0.7 -p opam-shebangs.patch -- cgit v1.2.3 From 9d81c54b3187e4225713a32dcae82930138e62b7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 21 Apr 2020 07:26:00 -0500 Subject: opam: add marsam to maintainers --- pkgs/development/tools/ocaml/opam/default.nix | 2 +- pkgs/development/tools/ocaml/opam/opam.nix.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index fdf25b930cb..9e95db79dd0 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -113,7 +113,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A package manager for OCaml"; homepage = "https://opam.ocaml.org/"; - maintainers = [ maintainers.henrytill ]; + maintainers = [ maintainers.henrytill maintainers.marsam ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/ocaml/opam/opam.nix.pl b/pkgs/development/tools/ocaml/opam/opam.nix.pl index 605d0c41cae..828e209fac6 100755 --- a/pkgs/development/tools/ocaml/opam/opam.nix.pl +++ b/pkgs/development/tools/ocaml/opam/opam.nix.pl @@ -123,7 +123,7 @@ print <<'EOF'; meta = with stdenv.lib; { description = "A package manager for OCaml"; homepage = "https://opam.ocaml.org/"; - maintainers = [ maintainers.henrytill ]; + maintainers = [ maintainers.henrytill maintainers.marsam ]; platforms = platforms.all; }; } -- cgit v1.2.3 From 0a49d329cb34f08091c6343b54a0cbbc8bcfca06 Mon Sep 17 00:00:00 2001 From: Tom Fitzhenry Date: Sat, 16 Nov 2019 22:13:51 +1100 Subject: systemd-networkd: add DHCPServer test --- nixos/tests/all-tests.nix | 1 + nixos/tests/systemd-networkd-dhcpserver.nix | 58 +++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 nixos/tests/systemd-networkd-dhcpserver.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 30229a3a5b2..69333913bb9 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -299,6 +299,7 @@ in systemd-timesyncd = handleTest ./systemd-timesyncd.nix {}; systemd-networkd-vrf = handleTest ./systemd-networkd-vrf.nix {}; systemd-networkd = handleTest ./systemd-networkd.nix {}; + systemd-networkd-dhcpserver = handleTest ./systemd-networkd-dhcpserver.nix {}; systemd-nspawn = handleTest ./systemd-nspawn.nix {}; pdns-recursor = handleTest ./pdns-recursor.nix {}; taskserver = handleTest ./taskserver.nix {}; diff --git a/nixos/tests/systemd-networkd-dhcpserver.nix b/nixos/tests/systemd-networkd-dhcpserver.nix new file mode 100644 index 00000000000..f1a2662f8cb --- /dev/null +++ b/nixos/tests/systemd-networkd-dhcpserver.nix @@ -0,0 +1,58 @@ +# This test predominantly tests systemd-networkd DHCP server, by +# setting up a DHCP server and client, and ensuring they are mutually +# reachable via the DHCP allocated address. +import ./make-test-python.nix ({pkgs, ...}: { + name = "systemd-networkd-dhcpserver"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ tomfitzhenry ]; + }; + nodes = { + router = { config, pkgs, ... }: { + virtualisation.vlans = [ 1 ]; + systemd.services.systemd-networkd.environment.SYSTEMD_LOG_LEVEL = "debug"; + networking = { + useNetworkd = true; + useDHCP = false; + firewall.enable = false; + }; + systemd.network = { + networks = { + # systemd-networkd will load the first network unit file + # that matches, ordered lexiographically by filename. + # /etc/systemd/network/{40-eth1,99-main}.network already + # exists. This network unit must be loaded for the test, + # however, hence why this network is named such. + "01-eth1" = { + name = "eth1"; + networkConfig = { + DHCPServer = true; + Address = "10.0.0.1/24"; + }; + dhcpServerConfig = { + PoolOffset = 100; + PoolSize = 1; + }; + }; + }; + }; + }; + + client = { config, pkgs, ... }: { + virtualisation.vlans = [ 1 ]; + systemd.services.systemd-networkd.environment.SYSTEMD_LOG_LEVEL = "debug"; + networking = { + useNetworkd = true; + useDHCP = false; + firewall.enable = false; + interfaces.eth1.useDHCP = true; + }; + }; + }; + testScript = { ... }: '' + start_all() + router.wait_for_unit("systemd-networkd-wait-online.service") + client.wait_for_unit("systemd-networkd-wait-online.service") + client.wait_until_succeeds("ping -c 5 10.0.0.1") + router.wait_until_succeeds("ping -c 5 10.0.0.100") + ''; +}) -- cgit v1.2.3 From 1da6613de14e192d8c7f477779ec25e187ee5ec0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Tue, 21 Apr 2020 16:41:41 +0200 Subject: release-combined: Remove unused value `allSupportedNixpkgs`. It was made obsolete by commit 2de3caf0 - nixos/release-combined.nix: List constituents of the 'tested' job by name see also https://github.com/NixOS/nixpkgs/commit/f996744fd32f255b7fd33d9e83d9ef688097b367#r38642487. --- nixos/release-combined.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 87783c66095..f4f99e71a90 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -20,11 +20,6 @@ let else pkgs.lib.mapAttrs (n: v: removeMaintainers v) set else set; - allSupportedNixpkgs = builtins.removeAttrs (removeMaintainers (import ../pkgs/top-level/release.nix { - supportedSystems = supportedSystems ++ limitedSupportedSystems; - nixpkgs = nixpkgsSrc; - })) [ "unstable" ]; - in rec { nixos = removeMaintainers (import ./release.nix { -- cgit v1.2.3 From cb62bf497925f7edafe79467c96666c642c8255f Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 13 Apr 2020 23:40:39 +0200 Subject: python.pkgs.sqlsoup: init at 0.9.1 --- pkgs/development/python-modules/sqlsoup/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/sqlsoup/default.nix diff --git a/pkgs/development/python-modules/sqlsoup/default.nix b/pkgs/development/python-modules/sqlsoup/default.nix new file mode 100644 index 00000000000..a6ffd3227cd --- /dev/null +++ b/pkgs/development/python-modules/sqlsoup/default.nix @@ -0,0 +1,21 @@ +{ buildPythonPackage, fetchPypi, lib, sqlalchemy, nose }: + +buildPythonPackage rec { + pname = "sqlsoup"; + version = "0.9.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1mj00fhxj75ac3i8xk9jmm7hvcjz9p4x2r3yndcwsgb659rvgbrg"; + }; + + propagatedBuildInputs = [ sqlalchemy ]; + checkInputs = [ nose ]; + + meta = with lib; { + description = "A one step database access tool, built on the SQLAlchemy ORM"; + homepage = "https://bitbucket.org/zzzeek/sqlsoup"; + license = licenses.mit; + maintainers = [ maintainers.globin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cb5cbb5375a..cef7faa534e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5786,6 +5786,8 @@ in { sqlalchemy-utils = callPackage ../development/python-modules/sqlalchemy-utils { }; + sqlsoup = callPackage ../development/python-modules/sqlsoup { }; + staticjinja = callPackage ../development/python-modules/staticjinja { }; statsmodels = callPackage ../development/python-modules/statsmodels { }; -- cgit v1.2.3 From 7a68da69ba966093855c9286ad7ee00564ecf3ea Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 13 Apr 2020 23:59:37 +0200 Subject: python.pkgs.pyrad: init at 2.3 --- pkgs/development/python-modules/pyrad/default.nix | 27 +++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/pyrad/default.nix diff --git a/pkgs/development/python-modules/pyrad/default.nix b/pkgs/development/python-modules/pyrad/default.nix new file mode 100644 index 00000000000..31cbf77d94e --- /dev/null +++ b/pkgs/development/python-modules/pyrad/default.nix @@ -0,0 +1,27 @@ +{ buildPythonPackage, fetchFromGitHub, lib, netaddr, six, nose }: + +buildPythonPackage rec { + pname = "pyrad"; + version = "2.3"; + + src = fetchFromGitHub { + owner = "pyradius"; + repo = pname; + rev = version; + sha256 = "0hy7999av47s8100afbhxfjb8phbmrqcv530xlvskndby4a8w94k"; + }; + + propagatedBuildInputs = [ netaddr six ]; + checkInputs = [ nose ]; + + checkPhase = '' + nosetests -e testBind + ''; + + meta = with lib; { + description = "Python RADIUS Implementation"; + homepage = "https://bitbucket.org/zzzeek/sqlsoup"; + license = licenses.mit; + maintainers = [ maintainers.globin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cef7faa534e..ad05977984c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5180,6 +5180,8 @@ in { pyrabbit2 = callPackage ../development/python-modules/pyrabbit2 { }; + pyrad = callPackage ../development/python-modules/pyrad { }; + pyrr = callPackage ../development/python-modules/pyrr { }; pysha3 = callPackage ../development/python-modules/pysha3 { }; -- cgit v1.2.3 From 1a2852b447e97bae0967f00a4451ece6936762ac Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 14 Apr 2020 00:09:48 +0200 Subject: python.pkgs.flask-versioned: init at 0.9.4-20101221 --- .../python-modules/flask-versioned/default.nix | 23 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/python-modules/flask-versioned/default.nix diff --git a/pkgs/development/python-modules/flask-versioned/default.nix b/pkgs/development/python-modules/flask-versioned/default.nix new file mode 100644 index 00000000000..c4e9f16bceb --- /dev/null +++ b/pkgs/development/python-modules/flask-versioned/default.nix @@ -0,0 +1,23 @@ +{ stdenv, buildPythonPackage, fetchFromGitHub, flask }: + +buildPythonPackage rec { + pname = "Flask-Versioned"; + version = "0.9.4-20101221"; + + src = fetchFromGitHub { + owner = "pilt"; + repo = "flask-versioned"; + rev = "38046fb53a09060de437c90a5f7370a6b94ffc31"; # no tags + sha256 = "1wim9hvx7lxzfg35c0nc7p34j4vw9mzisgijlz4ibgykah4g1y37"; + }; + + propagatedBuildInputs = [ flask ]; + + meta = with stdenv.lib; { + description = "Flask plugin to rewrite file paths to add version info"; + homepage = https://github.com/pilt/flask-versioned; + license = licenses.bsd3; + maintainers = with maintainers; [ globin ]; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ad05977984c..55752407edb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3711,6 +3711,8 @@ in { flask_testing = callPackage ../development/python-modules/flask-testing { }; + flask-versioned = callPackage ../development/python-modules/flask-versioned { }; + flask_wtf = callPackage ../development/python-modules/flask-wtf { }; wtforms = callPackage ../development/python-modules/wtforms { }; -- cgit v1.2.3 From 38c5add29c0ab1b637ce060ba288f82d29a1501a Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 21 Apr 2020 13:34:05 +0200 Subject: python.pkgs.huey: init at 2.2.0 --- pkgs/development/python-modules/huey/default.nix | 25 ++++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/huey/default.nix diff --git a/pkgs/development/python-modules/huey/default.nix b/pkgs/development/python-modules/huey/default.nix new file mode 100644 index 00000000000..28a801de71a --- /dev/null +++ b/pkgs/development/python-modules/huey/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchFromGitHub, redis }: + +buildPythonPackage rec { + pname = "huey"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "coleifer"; + repo = pname; + rev = version; + sha256 = "1hgic7qrmb1kxvfgf2qqiw39nqyknf17pjvli8jfzvd9mv7cb7hh"; + }; + + propagatedBuildInputs = [ redis ]; + + # connects to redis + doCheck = false; + + meta = with lib; { + description = "A little task queue for python"; + homepage = "https://github.com/coleifer/huey"; + license = licenses.mit; + maintainers = [ maintainers.globin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 55752407edb..cdee7870eb4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2895,6 +2895,8 @@ in { hglib = callPackage ../development/python-modules/hglib {}; + huey = callPackage ../development/python-modules/huey { }; + humanize = callPackage ../development/python-modules/humanize { }; humanfriendly = callPackage ../development/python-modules/humanfriendly { }; -- cgit v1.2.3 From fb0c2616a79414d030185ed52e04ad1e567abc12 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 21 Apr 2020 13:34:59 +0200 Subject: python.pkgs.smpplib: init at 2.1.0 --- .../development/python-modules/smpplib/default.nix | 29 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/smpplib/default.nix diff --git a/pkgs/development/python-modules/smpplib/default.nix b/pkgs/development/python-modules/smpplib/default.nix new file mode 100644 index 00000000000..fe22f121efb --- /dev/null +++ b/pkgs/development/python-modules/smpplib/default.nix @@ -0,0 +1,29 @@ +{ buildPythonPackage, fetchPypi, lib, python, six, tox, mock, pytest }: + +buildPythonPackage rec { + pname = "smpplib"; + version = "2.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0jzxlfwf0861ilh4xyd70hmkdbvdki52aalglm1bnpxkg6i3jhfz"; + }; + + propagatedBuildInputs = [ six ]; + checkInputs = [ tox mock pytest ]; + + checkPhase = '' + pytest + ''; + + postInstall = '' + rm -rf $out/${python.sitePackages}/tests + ''; + + meta = with lib; { + description = "SMPP library for Python"; + homepage = "https://github.com/python-smpplib/python-smpplib"; + license = licenses.lgpl3Plus; + maintainers = [ maintainers.globin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cdee7870eb4..a0012372319 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6204,6 +6204,8 @@ in { smartdc = callPackage ../development/python-modules/smartdc { }; + smpplib = callPackage ../development/python-modules/smpplib { }; + socksipy-branch = callPackage ../development/python-modules/socksipy-branch { }; sockjs-tornado = callPackage ../development/python-modules/sockjs-tornado { }; -- cgit v1.2.3 From 546b31bf4cf96300dd46e2dd9b6db8246f9cfa8e Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 21 Apr 2020 13:35:41 +0200 Subject: python.pkgs.privacyidea: init at 3.3 --- pkgs/servers/privacyidea/default.nix | 49 ++++++++++++++++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 51 insertions(+) create mode 100644 pkgs/servers/privacyidea/default.nix diff --git a/pkgs/servers/privacyidea/default.nix b/pkgs/servers/privacyidea/default.nix new file mode 100644 index 00000000000..af5451a9378 --- /dev/null +++ b/pkgs/servers/privacyidea/default.nix @@ -0,0 +1,49 @@ +{ lib, buildPythonPackage, fetchFromGitHub, cacert, openssl, python + +, cryptography, pyrad, pymysql, python-dateutil, flask-versioned, flask_script +, defusedxml, croniter, flask_migrate, pyjwt, configobj, sqlsoup, pillow +, python-gnupg, passlib, pyopenssl, beautifulsoup4, smpplib, flask-babel +, ldap3, huey, pyyaml, qrcode, oauth2client, requests, lxml, cbor2, psycopg2 + +, mock, pytest, responses, testfixtures +}: + +buildPythonPackage rec { + pname = "privacyIDEA"; + version = "3.3"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "188ki924dig899wlih45xfsm0s7mjkya56vii26bg02h91izrb4b"; + }; + + propagatedBuildInputs = [ + cryptography pyrad pymysql python-dateutil flask-versioned flask_script + defusedxml croniter flask_migrate pyjwt configobj sqlsoup pillow + python-gnupg passlib pyopenssl beautifulsoup4 smpplib flask-babel + ldap3 huey pyyaml qrcode oauth2client requests lxml cbor2 psycopg2 + ]; + + checkInputs = [ openssl mock pytest responses testfixtures ]; + # issues with hardware token tests + doCheck = false; + + postPatch = '' + substituteInPlace privacyidea/lib/resolvers/LDAPIdResolver.py --replace \ + "/etc/privacyidea/ldap-ca.crt" \ + "${cacert}/etc/ssl/certs/ca-bundle.crt" + ''; + + postInstall = '' + rm -rf $out/${python.sitePackages}/tests + ''; + + meta = with lib; { + description = "Multi factor authentication system (2FA, MFA, OTP Server)"; + license = licenses.agpl3Plus; + homepage = "http://www.privacyidea.org"; + maintainers = [ maintainers.globin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a0012372319..bbb246a6082 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3197,6 +3197,8 @@ in { priority = callPackage ../development/python-modules/priority { }; + privacyidea = callPackage ../servers/privacyidea { }; + prov = callPackage ../development/python-modules/prov { }; pudb = callPackage ../development/python-modules/pudb { }; -- cgit v1.2.3 From 6cbdd8640a7cb1c64e1014ac9ad4816aecab6385 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 21 Apr 2020 13:36:07 +0200 Subject: python.pkgs.privacyidea-ldap-proxy: init at 0.6.1 --- pkgs/servers/privacyidea/ldap-proxy.nix | 23 +++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 1 + 2 files changed, 24 insertions(+) create mode 100644 pkgs/servers/privacyidea/ldap-proxy.nix diff --git a/pkgs/servers/privacyidea/ldap-proxy.nix b/pkgs/servers/privacyidea/ldap-proxy.nix new file mode 100644 index 00000000000..bf15acb294e --- /dev/null +++ b/pkgs/servers/privacyidea/ldap-proxy.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchFromGitHub, twisted, ldaptor, configobj }: + +buildPythonPackage rec { + pname = "privacyidea-ldap-proxy"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "privacyidea"; + repo = pname; + rev = "v${version}"; + sha256 = "1kc1n9wr1a66xd5zvl6dq78xnkqkn5574jpzashc99pvm62dr24j"; + }; + + propagatedBuildInputs = [ twisted ldaptor configobj ]; + doCheck = false; + + meta = with lib; { + description = "LDAP Proxy to intercept LDAP binds and authenticate against privacyIDEA"; + homepage = "https://github.com/privacyidea/privacyidea-ldap-proxy"; + license = licenses.agpl3; + maintainers = [ maintainers.globin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bbb246a6082..7b246c6ce0a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3198,6 +3198,7 @@ in { priority = callPackage ../development/python-modules/priority { }; privacyidea = callPackage ../servers/privacyidea { }; + privacyidea-ldap-proxy = callPackage ../servers/privacyidea/ldap-proxy.nix { }; prov = callPackage ../development/python-modules/prov { }; -- cgit v1.2.3 From 134c66b5842f13f4558151b2d79008597ccbd4dd Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Tue, 21 Apr 2020 13:37:00 +0200 Subject: privacyidea module: init --- nixos/modules/module-list.nix | 1 + nixos/modules/services/security/privacyidea.nix | 296 ++++++++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/privacyidea.nix | 36 +++ 4 files changed, 334 insertions(+) create mode 100644 nixos/modules/services/security/privacyidea.nix create mode 100644 nixos/tests/privacyidea.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index df08ac2959e..bc0686f578c 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -792,6 +792,7 @@ ./services/security/nginx-sso.nix ./services/security/oauth2_proxy.nix ./services/security/oauth2_proxy_nginx.nix + ./services/security/privacyidea.nix ./services/security/physlock.nix ./services/security/shibboleth-sp.nix ./services/security/sks.nix diff --git a/nixos/modules/services/security/privacyidea.nix b/nixos/modules/services/security/privacyidea.nix new file mode 100644 index 00000000000..49c03afdf8c --- /dev/null +++ b/nixos/modules/services/security/privacyidea.nix @@ -0,0 +1,296 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.privacyidea; + + uwsgi = pkgs.uwsgi.override { plugins = [ "python3" ]; }; + python = uwsgi.python3; + penv = python.withPackages (ps: [ ps.privacyidea ]); + logCfg = pkgs.writeText "privacyidea-log.cfg" '' + [formatters] + keys=detail + + [handlers] + keys=stream + + [formatter_detail] + class=privacyidea.lib.log.SecureFormatter + format=[%(asctime)s][%(process)d][%(thread)d][%(levelname)s][%(name)s:%(lineno)d] %(message)s + + [handler_stream] + class=StreamHandler + level=NOTSET + formatter=detail + args=(sys.stdout,) + + [loggers] + keys=root,privacyidea + + [logger_privacyidea] + handlers=stream + qualname=privacyidea + level=INFO + + [logger_root] + handlers=stream + level=ERROR + ''; + + piCfgFile = pkgs.writeText "privacyidea.cfg" '' + SUPERUSER_REALM = [ '${concatStringsSep "', '" cfg.superuserRealm}' ] + SQLALCHEMY_DATABASE_URI = '${cfg.databaseURI}' + SECRET_KEY = '${cfg.secretKey}' + PI_PEPPER = '${cfg.pepper}' + PI_ENCFILE = '${cfg.encFile}' + PI_AUDIT_KEY_PRIVATE = '${cfg.auditKeyPrivate}' + PI_AUDIT_KEY_PUBLIC = '${cfg.auditKeyPublic}' + PI_LOGCONFIG = '${logCfg}' + ${cfg.extraConfig} + ''; + +in + +{ + options = { + services.privacyidea = { + enable = mkEnableOption "PrivacyIDEA"; + + stateDir = mkOption { + type = types.str; + default = "/var/lib/privacyidea"; + description = '' + Directory where all PrivacyIDEA files will be placed by default. + ''; + }; + + runDir = mkOption { + type = types.str; + default = "/run/privacyidea"; + description = '' + Directory where all PrivacyIDEA files will be placed by default. + ''; + }; + + superuserRealm = mkOption { + type = types.listOf types.str; + default = [ "super" "administrators" ]; + description = '' + The realm where users are allowed to login as administrators. + ''; + }; + + databaseURI = mkOption { + type = types.str; + default = "postgresql:///privacyidea"; + description = '' + Database as SQLAlchemy URI to use for PrivacyIDEA. + ''; + }; + + secretKey = mkOption { + type = types.str; + example = "t0p s3cr3t"; + description = '' + This is used to encrypt the auth_token. + ''; + }; + + pepper = mkOption { + type = types.str; + example = "Never know..."; + description = '' + This is used to encrypt the admin passwords. + ''; + }; + + encFile = mkOption { + type = types.str; + default = "${cfg.stateDir}/enckey"; + description = '' + This is used to encrypt the token data and token passwords + ''; + }; + + auditKeyPrivate = mkOption { + type = types.str; + default = "${cfg.stateDir}/private.pem"; + description = '' + Private Key for signing the audit log. + ''; + }; + + auditKeyPublic = mkOption { + type = types.str; + default = "${cfg.stateDir}/public.pem"; + description = '' + Public key for checking signatures of the audit log. + ''; + }; + + adminPassword = mkOption { + type = types.str; + description = "Password for the admin user"; + }; + + adminEmail = mkOption { + type = types.str; + example = "admin@example.com"; + description = "Mail address for the admin user"; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Extra configuration options for pi.cfg. + ''; + }; + + user = mkOption { + type = types.str; + default = "privacyidea"; + description = "User account under which PrivacyIDEA runs."; + }; + + group = mkOption { + type = types.str; + default = "privacyidea"; + description = "Group account under which PrivacyIDEA runs."; + }; + + ldap-proxy = { + enable = mkEnableOption "PrivacyIDEA LDAP Proxy"; + + configFile = mkOption { + type = types.path; + default = ""; + description = '' + Path to PrivacyIDEA LDAP Proxy configuration (proxy.ini). + ''; + }; + + user = mkOption { + type = types.str; + default = "pi-ldap-proxy"; + description = "User account under which PrivacyIDEA LDAP proxy runs."; + }; + + group = mkOption { + type = types.str; + default = "pi-ldap-proxy"; + description = "Group account under which PrivacyIDEA LDAP proxy runs."; + }; + }; + }; + }; + + config = mkMerge [ + + (mkIf cfg.enable { + + environment.systemPackages = [ python.pkgs.privacyidea ]; + + services.postgresql.enable = mkDefault true; + + systemd.services.privacyidea = let + piuwsgi = pkgs.writeText "uwsgi.json" (builtins.toJSON { + uwsgi = { + plugins = [ "python3" ]; + pythonpath = "${penv}/${uwsgi.python3.sitePackages}"; + socket = "${cfg.runDir}/socket"; + uid = cfg.user; + gid = cfg.group; + chmod-socket = 770; + chown-socket = "${cfg.user}:nginx"; + chdir = cfg.stateDir; + wsgi-file = "${penv}/etc/privacyidea/privacyideaapp.wsgi"; + processes = 4; + harakiri = 60; + reload-mercy = 8; + stats = "${cfg.runDir}/stats.socket"; + max-requests = 2000; + limit-as = 1024; + reload-on-as = 512; + reload-on-rss = 256; + no-orphans = true; + vacuum = true; + }; + }); + in { + wantedBy = [ "multi-user.target" ]; + after = [ "postgresql.service" ]; + path = with pkgs; [ openssl ]; + environment.PRIVACYIDEA_CONFIGFILE = piCfgFile; + preStart = let + pi-manage = "${pkgs.sudo}/bin/sudo -u privacyidea -H PRIVACYIDEA_CONFIGFILE=${piCfgFile} ${penv}/bin/pi-manage"; + pgsu = config.services.postgresql.superUser; + psql = config.services.postgresql.package; + in '' + mkdir -p ${cfg.stateDir} ${cfg.runDir} + chown ${cfg.user}:${cfg.group} -R ${cfg.stateDir} ${cfg.runDir} + ln -sf ${piCfgFile} ${cfg.stateDir}/privacyidea.cfg + if ! test -e "${cfg.stateDir}/db-created"; then + ${pkgs.sudo}/bin/sudo -u ${pgsu} ${psql}/bin/createuser --no-superuser --no-createdb --no-createrole ${cfg.user} + ${pkgs.sudo}/bin/sudo -u ${pgsu} ${psql}/bin/createdb --owner ${cfg.user} privacyidea + ${pi-manage} create_enckey + ${pi-manage} create_audit_keys + ${pi-manage} createdb + ${pi-manage} admin add admin -e ${cfg.adminEmail} -p ${cfg.adminPassword} + ${pi-manage} db stamp head -d ${penv}/lib/privacyidea/migrations + touch "${cfg.stateDir}/db-created" + chmod g+r "${cfg.stateDir}/enckey" "${cfg.stateDir}/private.pem" + fi + ${pi-manage} db upgrade -d ${penv}/lib/privacyidea/migrations + ''; + serviceConfig = { + Type = "notify"; + ExecStart = "${uwsgi}/bin/uwsgi --json ${piuwsgi}"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + ExecStop = "${pkgs.coreutils}/bin/kill -INT $MAINPID"; + NotifyAccess = "main"; + KillSignal = "SIGQUIT"; + StandardError = "syslog"; + }; + }; + + users.extraUsers.privacyidea = mkIf (cfg.user == "privacyidea") { + group = cfg.group; + }; + + users.extraGroups.privacyidea = mkIf (cfg.group == "privacyidea") {}; + }) + + (mkIf cfg.ldap-proxy.enable { + + systemd.services.privacyidea-ldap-proxy = let + ldap-proxy-env = pkgs.python2.withPackages (ps: [ ps.privacyidea-ldap-proxy ]); + in { + description = "privacyIDEA LDAP proxy"; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = cfg.ldap-proxy.user; + Group = cfg.ldap-proxy.group; + ExecStart = '' + ${ldap-proxy-env}/bin/twistd \ + --nodaemon \ + --pidfile= \ + -u ${cfg.ldap-proxy.user} \ + -g ${cfg.ldap-proxy.group} \ + ldap-proxy \ + -c ${cfg.ldap-proxy.configFile} + ''; + Restart = "always"; + }; + }; + + users.extraUsers.pi-ldap-proxy = mkIf (cfg.ldap-proxy.user == "pi-ldap-proxy") { + group = cfg.ldap-proxy.group; + }; + + users.extraGroups.pi-ldap-proxy = mkIf (cfg.ldap-proxy.group == "pi-ldap-proxy") {}; + }) + ]; + +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 30229a3a5b2..245f8497d05 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -255,6 +255,7 @@ in pppd = handleTest ./pppd.nix {}; predictable-interface-names = handleTest ./predictable-interface-names.nix {}; printing = handleTest ./printing.nix {}; + privacyidea = handleTest ./privacyidea.nix {}; prometheus = handleTest ./prometheus.nix {}; prometheus-exporters = handleTest ./prometheus-exporters.nix {}; prosody = handleTest ./xmpp/prosody.nix {}; diff --git a/nixos/tests/privacyidea.nix b/nixos/tests/privacyidea.nix new file mode 100644 index 00000000000..fcca1937385 --- /dev/null +++ b/nixos/tests/privacyidea.nix @@ -0,0 +1,36 @@ +# Miscellaneous small tests that don't warrant their own VM run. + +import ./make-test-python.nix ({ pkgs, ...} : rec { + name = "privacyidea"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ fpletz ]; + }; + + machine = { ... }: { + virtualisation.cores = 2; + virtualisation.memorySize = 512; + + services.privacyidea = { + enable = true; + secretKey = "testing"; + pepper = "testing"; + adminPassword = "testing"; + adminEmail = "root@localhost"; + }; + services.nginx = { + enable = true; + virtualHosts."_".locations."/".extraConfig = '' + uwsgi_pass unix:/run/privacyidea/socket; + ''; + }; + }; + + testScript = '' + machine.start() + machine.wait_for_unit("multi-user.target") + machine.succeed("curl --fail http://localhost | grep privacyIDEA") + machine.succeed( + "curl --fail http://localhost/auth -F username=admin -F password=testing | grep token" + ) + ''; +}) -- cgit v1.2.3 From 3c41d61514029d5aa4ea748c1e46098767ae448b Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 21 Apr 2020 11:03:10 -0500 Subject: doc/overlays.xml: update documentation for BLAS/LAPACK This expands the documentation and explains how to assert LP64. --- doc/languages-frameworks/python.section.md | 29 +++------------------- doc/using/overlays.xml | 40 +++++++++++++++++++++++++++++- 2 files changed, 42 insertions(+), 27 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index f8884785e90..e6f0b64fa9c 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -1290,32 +1290,9 @@ self: super: { ### How to use Intel's MKL with numpy and scipy? -A `site.cfg` is created that configures BLAS based on the `blas` parameter of -the `numpy` derivation. By passing in `mkl`, `numpy` and packages depending on -`numpy` will be built with `mkl`. - -The following is an overlay that configures `numpy` to use `mkl`: - -```nix -self: super: { - python37 = super.python37.override { - packageOverrides = python-self: python-super: { - numpy = python-super.numpy.override { - blas = super.pkgs.mkl; - }; - }; - }; -} -``` - -`mkl` requires an `openmp` implementation when running with multiple processors. -By default, `mkl` will use Intel's `iomp` implementation if no other is -specified, but this is a runtime-only dependency and binary compatible with the -LLVM implementation. To use that one instead, Intel recommends users set it with -`LD_PRELOAD`. - -Note that `mkl` is only available on `x86_64-{linux,darwin}` platforms; -moreover, Hydra is not building and distributing pre-compiled binaries using it. +MKL can be configured using an overlay. See the section “[Using +overlays to configure +alternatives](#sec-overlays-alternatives-blas-lapack)”. ### What inputs do `setup_requires`, `install_requires` and `tests_require` map to? diff --git a/doc/using/overlays.xml b/doc/using/overlays.xml index 7732e0ac217..5f808839dd0 100644 --- a/doc/using/overlays.xml +++ b/doc/using/overlays.xml @@ -177,7 +177,7 @@ self: super: Intel - MKL (only works on x86 architecture) + MKL (only works on x86 architecture, unfree) The Nixpkgs attribute is mkl. @@ -211,6 +211,44 @@ self: super: using LD_PRELOAD of libblas.so.3 and liblapack.so.3. + + Intel MKL requires an openmp implementation + when running with multiple processors. By default, + mkl will use Intel’s iomp + implementation if no other is specified, but this is a + runtime-only dependency and binary compatible with the LLVM + implementation. To use that one instead, Intel recommends users + set it with LD_PRELOAD. Note that + mkl is only available on + x86_64-linux and + x86_64-darwin. Moreover, Hydra is not build + and distributing pre-compiled binaries using it. + + + For BLAS/LAPACK switching to work correctly, all packages must + depend on blas or lapack. + This ensures that only one BLAS/LAPACK library is used at one + time. There are two versions versions of BLAS/LAPACK currently + in the wild, LP64 (integer size = 32 bits) + and ILP64 (integer size = 64 bits). Some + software needs special flags or patches to work with + ILP64. You can check if + ILP64 is used in Nixpkgs with + blas.isILP64 and + lapack.isILP64. Some software does NOT work + with ILP64, and derivations need to specify + an assertion to prevent this. You can prevent + ILP64 from being used with the following: + + +{ stdenv, blas, lapack, ... }: + +assert (!blas.isILP64) && (!lapack.isILP64); + +stdenv.mkDerivation { + ... +} + -- cgit v1.2.3 From c844633cc70309d74dbf13850b8af56bbdbc694c Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 21 Apr 2020 17:31:27 +0200 Subject: mautrix-whatsapp: 2020-04-12 -> 2020-04-21 --- pkgs/servers/mautrix-whatsapp/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 924209174e7..5e011f17b70 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,16 +2,16 @@ buildGoModule { pname = "mautrix-whatsapp-unstable"; - version = "2020-04-12"; + version = "2020-04-21"; src = fetchFromGitHub { owner = "tulir"; repo = "mautrix-whatsapp"; - rev = "44bb623e7a7486a0cdd13fd67b2aaca2ddba20ce"; - sha256 = "1fwxn6511pq9fdc8d2jp4vgkm1zag55pig75qdxfn63hl3i2607k"; + rev = "53fe1b18184fc0967658805abc8560641f8d2cb0"; + sha256 = "0rahj9v7cgvk4w3m41jbs8vnya37dhq5wxyhyg74kwrv8a2nqxra"; }; - modSha256 = "04pdap1q7zsa1wv2h0j9104fawn95g37yqslmp2mq7722hiqhp9x"; + modSha256 = "0jn88a4hagwfkw9bv8cg12ywsg35znmfkmhi1v7k2qpj5qzi81w6"; meta = with stdenv.lib; { homepage = "https://github.com/tulir/mautrix-whatsapp"; -- cgit v1.2.3 From 68684b637631b25d96a8552fd3b8741a456f8a7f Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 21 Apr 2020 17:31:40 +0200 Subject: stellarium: 0.20.0 -> 0.20.1 https://github.com/Stellarium/stellarium/releases/tag/v0.20.1 --- pkgs/applications/science/astronomy/stellarium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index a0cd535f362..7ef7776c0fe 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -6,13 +6,13 @@ mkDerivation rec { pname = "stellarium"; - version = "0.20.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "Stellarium"; repo = "stellarium"; rev = "v${version}"; - sha256 = "1732dxkgyqd4xf0ry7v930vcbv60l8iry596869z1d47j2piibs4"; + sha256 = "1x8svan03k1x9jwqflimbpj7jpg6mjrbz26bg1sbhsqdlc8rbhky"; }; nativeBuildInputs = [ cmake perl wrapQtAppsHook ]; -- cgit v1.2.3 From 25b9bca759f3fa914c51bcf01de552446c507822 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 21 Apr 2020 17:34:13 +0200 Subject: mongodb_3_4: fix license As noted in #83433, the 3.4 branch of `mongodb` is still licensed under AGPL[1]. [1] https://github.com/mongodb/mongo/blob/r3.4.24/README --- pkgs/servers/nosql/mongodb/mongodb.nix | 6 ++++-- pkgs/servers/nosql/mongodb/v3_4.nix | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix index e3d277ba5af..8ffdbcd63c4 100644 --- a/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/pkgs/servers/nosql/mongodb/mongodb.nix @@ -6,7 +6,9 @@ with stdenv.lib; -{ version, sha256, patches ? [] }@args: +{ version, sha256, patches ? [] +, license ? stdenv.lib.licenses.sspl +}@args: let python = python27.withPackages (ps: with ps; [ pyyaml typing cheetah ]); @@ -109,7 +111,7 @@ in stdenv.mkDerivation rec { meta = { description = "A scalable, high-performance, open source NoSQL database"; homepage = "http://www.mongodb.org"; - license = licenses.sspl; + inherit license; maintainers = with maintainers; [ bluescreen303 offline cstrahan ]; platforms = subtractLists systems.doubles.i686 systems.doubles.unix; diff --git a/pkgs/servers/nosql/mongodb/v3_4.nix b/pkgs/servers/nosql/mongodb/v3_4.nix index 2f02ae7f72a..e1c71bc13f7 100644 --- a/pkgs/servers/nosql/mongodb/v3_4.nix +++ b/pkgs/servers/nosql/mongodb/v3_4.nix @@ -12,4 +12,5 @@ in buildMongoDB { version = "3.4.24"; sha256 = "0j6mvgv0jnsnvgkl8505bl88kbxkba66qijlpi1la0dd5pd1imfr"; patches = [ ./forget-build-dependencies-3-4.patch ]; + license = stdenv.lib.licenses.agpl3; } -- cgit v1.2.3 From d16d34732cf132c0ed53f604f323725b7f806bfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Tue, 21 Apr 2020 18:29:03 +0200 Subject: journald service: Increase default rate limit 1000 -> 10000. Follows the upstream change of this default: https://github.com/systemd/systemd/pull/8660 --- nixos/doc/manual/release-notes/rl-2009.xml | 6 ++++++ nixos/modules/system/boot/systemd.nix | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 0f22f4331f4..21da575cad3 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -267,6 +267,12 @@ environment.systemPackages = [ Other Notable Changes + + + was updated from + 1000 to 10000 to follow the new + upstream systemd default. + The notmuch package move its emacs-related binaries and diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 518d875841b..f955746f78a 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -597,7 +597,7 @@ in }; services.journald.rateLimitBurst = mkOption { - default = 1000; + default = 10000; type = types.int; description = '' Configures the rate limiting burst limit (number of messages per -- cgit v1.2.3 From 803ff6e8513b9c36c4836283991fb6e57a05afc7 Mon Sep 17 00:00:00 2001 From: 1000101 Date: Tue, 21 Apr 2020 16:30:07 +0200 Subject: shopify-themekit: init at 1.0.3 --- pkgs/development/web/shopify-themekit/default.nix | 25 ++ .../web/shopify-themekit/shopify-themekit_deps.nix | 300 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 327 insertions(+) create mode 100644 pkgs/development/web/shopify-themekit/default.nix create mode 100644 pkgs/development/web/shopify-themekit/shopify-themekit_deps.nix diff --git a/pkgs/development/web/shopify-themekit/default.nix b/pkgs/development/web/shopify-themekit/default.nix new file mode 100644 index 00000000000..b8bc3deaca1 --- /dev/null +++ b/pkgs/development/web/shopify-themekit/default.nix @@ -0,0 +1,25 @@ +{ stdenv, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "shopify-themekit"; + version = "1.0.3"; + + goPackagePath = "github.com/Shopify/themekit/"; + + goDeps = ./shopify-themekit_deps.nix; + + src = fetchFromGitHub { + owner = "Shopify"; + repo = "themekit"; + rev = "v${version}"; + sha256 = "1780h33mf2h2lv6mr4xx3shfvsabr7w138yb59vvdgvjng9wjkg0"; + }; + + meta = with stdenv.lib; { + description = "A command line tool for shopify themes"; + homepage = "https://shopify.github.io/themekit/"; + license = licenses.mit; + maintainers = with maintainers; [ maintainers."1000101" ]; + platforms = platforms.all; + }; +} \ No newline at end of file diff --git a/pkgs/development/web/shopify-themekit/shopify-themekit_deps.nix b/pkgs/development/web/shopify-themekit/shopify-themekit_deps.nix new file mode 100644 index 00000000000..8a70c7cecd9 --- /dev/null +++ b/pkgs/development/web/shopify-themekit/shopify-themekit_deps.nix @@ -0,0 +1,300 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "github.com/VividCortex/ewma"; + fetch = { + type = "git"; + url = "https://github.com/VividCortex/ewma"; + rev = "v1.1.1"; + sha256 = "14v2dy5gqchjn7k0sd6cx59ms42v681r6xz7cb1kspp4b28a74rw"; + }; + } + { + goPackagePath = "github.com/aws/aws-sdk-go"; + fetch = { + type = "git"; + url = "https://github.com/aws/aws-sdk-go"; + rev = "1c16cd01d785"; + sha256 = "129iizv2rny2frg36057hayynpsdav53nhj41dia3mi2r6zyalny"; + }; + } + { + goPackagePath = "github.com/caarlos0/env"; + fetch = { + type = "git"; + url = "https://github.com/caarlos0/env"; + rev = "d0de832ed2fb"; + sha256 = "013shh38rs2jv4a2hsbix0hlanjr2a539akmkqkwwg0il9h3qmq2"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "v1.7.0"; + sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + fetch = { + type = "git"; + url = "https://github.com/fsnotify/fsnotify"; + rev = "v1.4.7"; + sha256 = "07va9crci0ijlivbb7q57d2rz9h27zgn2fsm60spjsqpdbvyrx4g"; + }; + } + { + goPackagePath = "github.com/go-ini/ini"; + fetch = { + type = "git"; + url = "https://github.com/go-ini/ini"; + rev = "v1.25.4"; + sha256 = "0b6cql5ripbiyrm18d6bfd1rfjnwcbskppw3d0vb80l0wy72d0c6"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-version"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/go-version"; + rev = "270f2f71b1ee"; + sha256 = "1d43wlp932nqbwkca4bhw8l4x6cg25jyh8l1s3814vddscfpfz2v"; + }; + } + { + goPackagePath = "github.com/imdario/mergo"; + fetch = { + type = "git"; + url = "https://github.com/imdario/mergo"; + rev = "v0.3.6"; + sha256 = "1lbzy8p8wv439sqgf0n21q52flf2wbamp6qa1jkyv6an0nc952q7"; + }; + } + { + goPackagePath = "github.com/inconshreveable/go-update"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/go-update"; + rev = "8152e7eb6ccf"; + sha256 = "07czhspakpi7al004rm669cmf4h5l0vnygsm11280nkfn2zxqdi3"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + fetch = { + type = "git"; + url = "https://github.com/inconshreveable/mousetrap"; + rev = "v1.0.0"; + sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152"; + }; + } + { + goPackagePath = "github.com/jmespath/go-jmespath"; + fetch = { + type = "git"; + url = "https://github.com/jmespath/go-jmespath"; + rev = "0b12d6b521d8"; + sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld"; + }; + } + { + goPackagePath = "github.com/joho/godotenv"; + fetch = { + type = "git"; + url = "https://github.com/joho/godotenv"; + rev = "v1.3.0"; + sha256 = "0ri8if0pc3x6jg4c3i8wr58xyfpxkwmcjk3rp8gb398a1aa3gpjm"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "efa589957cd0"; + sha256 = "0kshi4hvm0ayrsxqxy0599iv81kryhd2fn9lwjyczpj593cq069r"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "v0.0.4"; + sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/radovskyb/watcher"; + fetch = { + type = "git"; + url = "https://github.com/radovskyb/watcher"; + rev = "v1.0.6"; + sha256 = "1xlbrfgm6ha161szdjq2rab53plkdhmh5h86lpbk5g7fmq881945"; + }; + } + { + goPackagePath = "github.com/ryanuber/go-glob"; + fetch = { + type = "git"; + url = "https://github.com/ryanuber/go-glob"; + rev = "572520ed46db"; + sha256 = "0dzbpqp1h7gjmlm4irnh6lpbfz5zjc721jidibyvmxj7xcx3wp5d"; + }; + } + { + goPackagePath = "github.com/shibukawa/configdir"; + fetch = { + type = "git"; + url = "https://github.com/shibukawa/configdir"; + rev = "e180dbdc8da0"; + sha256 = "0vbma9jkwh0ifz8dk2ssgmy7aiaify63lpa0lah7i4dkkxr94c9z"; + }; + } + { + goPackagePath = "github.com/skratchdot/open-golang"; + fetch = { + type = "git"; + url = "https://github.com/skratchdot/open-golang"; + rev = "75fb7ed4208c"; + sha256 = "1b67imqbsdvg19vif1q1dfmapxy3v2anagacbql95fwnnw0v8jga"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + fetch = { + type = "git"; + url = "https://github.com/spf13/cobra"; + rev = "7c4570c3ebeb"; + sha256 = "16amh0prlzqrrbg5j629sg0f688nfzfgn9sair8jyybqampr3wc7"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + fetch = { + type = "git"; + url = "https://github.com/spf13/pflag"; + rev = "v1.0.2"; + sha256 = "005598piihl3l83a71ahj10cpq9pbhjck4xishx1b4dzc02r9xr2"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.1"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.2.2"; + sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + }; + } + { + goPackagePath = "github.com/vbauerster/mpb"; + fetch = { + type = "git"; + url = "https://github.com/vbauerster/mpb"; + rev = "v3.3.2"; + sha256 = "18m66b80iv9z768c15dqsx5mnjq6iaa6b5lckpdqnynqzkkvw8kk"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "a1f597ede03a"; + sha256 = "0yiczljll72ip2vkxgd6052rhpaba37a68vf6si3v8s8s3g870lc"; + }; + } + { + goPackagePath = "golang.org/x/lint"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/lint"; + rev = "d0100b6bd8b3"; + sha256 = "0b0amr9x4ji66iv9ayfx7zrfx52k1m5g66qfcxkgj80qrb1y2yn7"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "1272bf9dcd53"; + sha256 = "1500gryd7jli7yjn4c927ppyllry8lxcmnsmpn7zxfd1k14q7nyv"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "1d60e4601c6f"; + sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "6c81ef8f67ca"; + sha256 = "1iqrral339vxb635ip5jjzn84aa86kb629kbp1w29qwyfzbs0yqi"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "3f1ed9edd1b4"; + sha256 = "00d2h0df03gv57valad4wr3g2rc8dcn8w3ci783x9wzzc86y4giw"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v1"; + rev = "9f9df34309c0"; + sha256 = "1r8d346szqa9x8q03wiycik5qy3d6w8qq4hs99z1p64q5lm0g7gm"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 434b6906ca5..9f08925d10c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6531,6 +6531,8 @@ in shocco = callPackage ../tools/text/shocco { }; + shopify-themekit = callPackage ../development/web/shopify-themekit { }; + shorewall = callPackage ../tools/networking/shorewall { }; shotwell = callPackage ../applications/graphics/shotwell { }; -- cgit v1.2.3 From bae8756c1a30e77bab3dee28b90b2b4e0c7de57c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 21 Apr 2020 18:43:47 +0200 Subject: libyaml: 0.2.3 -> 0.2.4 --- pkgs/development/libraries/libyaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix index 2f6c8909a59..7f723cf2ef8 100644 --- a/pkgs/development/libraries/libyaml/default.nix +++ b/pkgs/development/libraries/libyaml/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libyaml"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "yaml"; repo = "libyaml"; rev = version; - sha256 = "0a7n575rmm1xkz0sn455rzapm1w9mgqjk29hbmzp53zddqkphvsm"; + sha256 = "04z25mvw86jhzyrj0h8mlgisvj9glc5ww9g0cymzjfsd7z33gnmy"; }; nativeBuildInputs = [ autoreconfHook ]; -- cgit v1.2.3 From 4b0a0d96cd1fe4411c803b9ac74e760e5b89ba7e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 21 Apr 2020 18:43:47 +0200 Subject: libyaml: 0.2.3 -> 0.2.4 --- pkgs/development/libraries/libyaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix index 2f6c8909a59..7f723cf2ef8 100644 --- a/pkgs/development/libraries/libyaml/default.nix +++ b/pkgs/development/libraries/libyaml/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libyaml"; - version = "0.2.3"; + version = "0.2.4"; src = fetchFromGitHub { owner = "yaml"; repo = "libyaml"; rev = version; - sha256 = "0a7n575rmm1xkz0sn455rzapm1w9mgqjk29hbmzp53zddqkphvsm"; + sha256 = "04z25mvw86jhzyrj0h8mlgisvj9glc5ww9g0cymzjfsd7z33gnmy"; }; nativeBuildInputs = [ autoreconfHook ]; -- cgit v1.2.3 From 790748c249beccc60b0f28f4e81396591ff86830 Mon Sep 17 00:00:00 2001 From: geistesk Date: Tue, 21 Apr 2020 18:26:05 +0200 Subject: openrct2: 0.2.4 -> 0.2.6 --- pkgs/games/openrct2/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index 48114cb766c..b519e0c7e92 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -4,21 +4,20 @@ }: let - name = "openrct2-${version}"; - version = "0.2.4"; + version = "0.2.6"; openrct2-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "OpenRCT2"; rev = "v${version}"; - sha256 = "1rlw3w20llg36sj3bk50g661qw766ng8ma3p42sdkj8br9dw800h"; + sha256 = "1vikbkg3wh5ngzdfilb6irbh6nqinf138qpdz8wz9izlvl8s36k4"; }; objects-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "objects"; - rev = "v1.0.12"; - sha256 = "0vfhyldc8nfvkg4d9kry669haxz2165walbxzgza7pqpnd7aqgrf"; + rev = "v1.0.14"; + sha256 = "1bqbia5y73v4r0sv5cvi5729jh2ns7cxn557blh715yxswk91590"; }; title-sequences-src = fetchFromGitHub { @@ -29,7 +28,8 @@ let }; in stdenv.mkDerivation { - inherit name; + inherit version; + pname = "openrct2"; src = openrct2-src; @@ -61,12 +61,11 @@ stdenv.mkDerivation { ''; cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=RELWITHDEBINFO" "-DDOWNLOAD_OBJECTS=OFF" "-DDOWNLOAD_TITLE_SEQUENCES=OFF" ]; - makeFlags = ["all" "g2"]; + enableParallelBuilding = true; preFixup = "ln -s $out/share/openrct2 $out/bin/data"; -- cgit v1.2.3 From e43a6c946882ac8d1c8a63bd7925d242f2fda44d Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 21 Apr 2020 08:31:45 +0800 Subject: mu: minor cleanup --- pkgs/tools/networking/mu/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index ae1ca3f7761..aa1e004d1af 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -22,8 +22,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - preConfigure = "./autogen.sh"; - preBuild = '' # Fix mu4e-builddir (set it to $out) substituteInPlace mu4e/mu4e-meta.el.in \ @@ -43,7 +41,7 @@ stdenv.mkDerivation rec { description = "A collection of utilties for indexing and searching Maildirs"; license = licenses.gpl3Plus; homepage = "https://www.djcbsoftware.nl/code/mu/"; - platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ antono the-kenny peterhoeg ]; + platforms = platforms.mesaPlatforms; }; } -- cgit v1.2.3 From c93e4cba929acd07f94e51c21fa731746848882e Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 21 Apr 2020 12:18:59 +0200 Subject: apostrophe: unstable-2020-03-29 -> 2.2.0.2 --- pkgs/applications/editors/apostrophe/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/apostrophe/default.nix b/pkgs/applications/editors/apostrophe/default.nix index 623f86a61c2..391a8734563 100644 --- a/pkgs/applications/editors/apostrophe/default.nix +++ b/pkgs/applications/editors/apostrophe/default.nix @@ -11,14 +11,14 @@ let in stdenv.mkDerivation rec { pname = "apostrophe"; - version = "unstable-2020-03-29"; + version = "2.2.0.2"; src = fetchFromGitLab { owner = "somas"; repo = pname; domain = "gitlab.gnome.org"; - rev = "219fa8976e3b8a6f0cea15cfefe4e336423f2bdb"; - sha256 = "192n5qs3x6rx62mqxd6wajwm453pns8kjyz5v3xc891an6bm1kqx"; + rev = "v${version}"; + sha256 = "13wvfkg0jw9mayd9ifzkqnhf8fmfjgr1lsj4niqbyrw130y9r9f6"; }; nativeBuildInputs = [ meson ninja cmake pkgconfig desktop-file-utils -- cgit v1.2.3 From 6ca23cac61dc0b57098ce2f9e921d96a34ddc34b Mon Sep 17 00:00:00 2001 From: misuzu Date: Mon, 20 Apr 2020 18:18:52 +0300 Subject: psi-plus: 1.4.984 -> 1.4.1086 --- .../networking/instant-messengers/psi-plus/default.nix | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index 010c06e0c2a..bd9d706d4e3 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -6,26 +6,15 @@ stdenv.mkDerivation rec { pname = "psi-plus"; - version = "1.4.984"; + version = "1.4.1086"; src = fetchFromGitHub { owner = "psi-plus"; repo = "psi-plus-snapshots"; rev = version; - sha256 = "1nii2nfi37i6mn79xmygscmm8ax75ky244wxkzlga0ya8i8wfjh7"; + sha256 = "0war4hbjs1m7ll6rvpl3lj44lb0p5fi0g2siinnxpjffz2ydi97p"; }; - resources = fetchFromGitHub { - owner = "psi-plus"; - repo = "resources"; - rev = "2f1c12564f7506bf902a26040fdb47ead4df6b73"; - sha256 = "1dgm9k052fq7f2bpx13kchg7sxb227dkn115lyspzvhnhprnypz2"; - }; - - postUnpack = '' - cp -a "${resources}/iconsets" "$sourceRoot" - ''; - cmakeFlags = [ "-DENABLE_PLUGINS=ON" ]; @@ -38,8 +27,6 @@ stdenv.mkDerivation rec { libgcrypt libotr html-tidy libgpgerror libsignal-protocol-c ]; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "XMPP (Jabber) client"; maintainers = with maintainers; [ orivej misuzu ]; -- cgit v1.2.3 From d8d6ecc418a7caed9e598ea814f75e6aa2881313 Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Wed, 11 Mar 2020 09:08:10 +1100 Subject: mosdepth: 0.2.6 -> 0.2.9 --- pkgs/applications/science/biology/mosdepth/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/biology/mosdepth/default.nix b/pkgs/applications/science/biology/mosdepth/default.nix index 569c63afa7a..21af5b82207 100644 --- a/pkgs/applications/science/biology/mosdepth/default.nix +++ b/pkgs/applications/science/biology/mosdepth/default.nix @@ -4,8 +4,8 @@ let hts-nim = fetchFromGitHub { owner = "brentp"; repo = "hts-nim"; - rev = "v0.2.14"; - sha256 = "0d1z4b6mrppmz3hgkxd4wcy79w68icvhi7q7n3m2k17n8f3xbdx3"; + rev = "v0.3.4"; + sha256 = "0670phk1bq3l9j2zaa8i5wcpc5dyfrc0l2a6c21g0l2mmdczffa7"; }; docopt = fetchFromGitHub { @@ -17,13 +17,13 @@ let in stdenv.mkDerivation rec { pname = "mosdepth"; - version = "0.2.6"; + version = "0.2.9"; src = fetchFromGitHub { owner = "brentp"; repo = "mosdepth"; rev = "v${version}"; - sha256 = "0i9pl9lsli3y84ygxanrr525gfg8fs9h481944cbzsmqmbldwvgk"; + sha256 = "01gm9gj2x2zs4yx6wk761fi1papi7qr3gp4ln1kkn8n2f9y9h849"; }; buildInputs = [ nim ]; -- cgit v1.2.3 From 31edad38b15066c1897cff229ace0b4946e01915 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Mon, 20 Apr 2020 08:55:38 +0200 Subject: kanboard: 1.2.13 -> 1.2.14 --- pkgs/applications/misc/kanboard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix index 9e2857c960f..e6193d43563 100644 --- a/pkgs/applications/misc/kanboard/default.nix +++ b/pkgs/applications/misc/kanboard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "kanboard"; - version = "1.2.13"; + version = "1.2.14"; src = fetchFromGitHub { owner = "kanboard"; repo = "kanboard"; rev = "v${version}"; - sha256 = "0mm5sx323v1rwykd1dhvk4d3ipgvgvi3wvhrlavbja3lgay3mdwk"; + sha256 = "11bwajzidnyagdyip7i8rwni1f66acv0k4lybdm0mc4195anivjh"; }; dontBuild = true; -- cgit v1.2.3 From 0d0dd76a7a76bd66629d7c2cf3d4d1d45825762b Mon Sep 17 00:00:00 2001 From: David Anderson Date: Sun, 19 Apr 2020 22:51:08 -0700 Subject: tailscale: 0.97-0 -> 0.97-219. Signed-off-by: David Anderson --- pkgs/servers/tailscale/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index e4cc0889c31..24a8aa66151 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,13 +2,15 @@ buildGoModule rec { pname = "tailscale"; - version = "0.97"; + version = "0.97-219"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; - rev = "v${version}"; - sha256 = "0ckjqhj99c25h8xgyfkrd19nw5w4a7972nvba9r5faw5micjs02n"; + # Tailscale uses "git describe" as version numbers. v0.97-219 + # means "tag v0.97 plus 219 commits", which is what this rev is. + rev = "afbfe4f217a2a202f0eefe943c7c1ef648311339"; + sha256 = "1an897ys3gycdmclqd0yqs9f7q88zxqxyc6r0gcgs4678svxhb68"; }; nativeBuildInputs = [ makeWrapper ]; @@ -16,7 +18,7 @@ buildGoModule rec { CGO_ENABLED = 0; goPackagePath = "tailscale.com"; - modSha256 = "0anpakcqz4irwxnm0iwm7wqzh84kv3yxxdvyr38154pbd0ys5pa2"; + modSha256 = "1xgdhbck3pkix10lfshzdszrv6d3p0hbx8jdjvswz7jjd0vzm4x1"; subPackages = [ "cmd/tailscale" "cmd/tailscaled" ]; postInstall = '' -- cgit v1.2.3 From 080e82493b3cf03aace648698fe2493cc90347db Mon Sep 17 00:00:00 2001 From: Kevin Rauscher Date: Fri, 20 Mar 2020 13:31:34 +0100 Subject: metals: 0.8.3 -> 0.8.4 --- pkgs/development/tools/metals/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index 638fae592a5..4cd87480070 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ let baseName = "metals"; - version = "0.8.3"; + version = "0.8.4"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -15,7 +15,7 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1l196glr7rbsvrqmq6i7iw532jkz8d1w5m9nh0kh5z12visc7bkk"; + outputHash = "1r8aff082m3kh6wy5diyvq8bzg5x4dp1da9sfz223ii0kc1yp6w5"; }; in stdenv.mkDerivation rec { -- cgit v1.2.3 From 55061fcd0b67588e8bc3b0741a08f559c13b8a48 Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Thu, 16 Apr 2020 10:26:21 +0200 Subject: trilium: 0.40.5 -> 0.40.7 --- pkgs/applications/office/trilium/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 18c512874db..967f91d962e 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -19,7 +19,7 @@ let maintainers = with maintainers; [ emmanuelrosa dtzWill kampka ]; }; - version = "0.40.5"; + version = "0.40.7"; in { @@ -30,7 +30,7 @@ in { src = fetchurl { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "02hmfgv8viy1hn2ix4b0gdzbcj7piddsmjdnb0b5hpwahqrikiyi"; + sha256 = "0xi3bb0kbphbgpk2wlsad509g0hwwb259q2vkv0kgyr4i4wcyc1f"; }; # Fetch from source repo, no longer included in release. @@ -78,7 +78,7 @@ in { src = fetchurl { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - sha256 = "00b7qx2h26qrdhw2a7y0irhbr442yynnzpm1pz55hi33zpckbrc7"; + sha256 = "15bspngnnbq6mhp1f82j9hccg0ymhm6i4rddpgz3n7dw5wxdj0sm"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 42d290316ccf1d2b6d64e8feef148a4bcd2f994c Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 15 Apr 2020 23:09:56 +0300 Subject: xournalpp: 1.0.17 -> 1.0.18 --- pkgs/applications/graphics/xournalpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix index 65aa17e3b4e..ba396bfd92c 100644 --- a/pkgs/applications/graphics/xournalpp/default.nix +++ b/pkgs/applications/graphics/xournalpp/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "xournalpp"; - version = "1.0.17"; + version = "1.0.18"; src = fetchFromGitHub { owner = "xournalpp"; repo = pname; rev = version; - sha256 = "0xw2mcgnm4sa9hrhfgp669lfypw97drxjmz5w8i5whaprpvmkxzw"; + sha256 = "0a9ygbmd4dwgck3k8wsrm2grynqa0adb12wwspzmzvpisbadffjy"; }; nativeBuildInputs = [ cmake gettext pkgconfig wrapGAppsHook ]; -- cgit v1.2.3 From de14e60d020f38286514f7752e1589b241558414 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Sat, 18 Apr 2020 21:03:19 +0200 Subject: sidequest: 0.8.7-> 0.10.2 --- pkgs/applications/misc/sidequest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/sidequest/default.nix b/pkgs/applications/misc/sidequest/default.nix index 3638a1d1880..6c55c3157f5 100644 --- a/pkgs/applications/misc/sidequest/default.nix +++ b/pkgs/applications/misc/sidequest/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, buildFHSUserEnv, makeDesktopItem, makeWrapper, atomEnv, libuuid, at-spi2-atk, icu, openssl, zlib }: let pname = "sidequest"; - version = "0.8.7"; + version = "0.10.2"; desktopItem = makeDesktopItem rec { name = "SideQuest"; @@ -16,7 +16,7 @@ src = fetchurl { url = "https://github.com/the-expanse/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz"; - sha256 = "1hbr6ml689zq4k3mzmn2xcn4r4dy717rgq3lgm32pzwgy5w92i2j"; + sha256 = "1vfxn4gx5b138gj6nk4w3jlp2l56cqpb8hq2kn5mrf4dhjii8n88"; }; buildInputs = [ makeWrapper ]; -- cgit v1.2.3 From c970d3b10594df7efb882bf43c177115e3ca516c Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Thu, 16 Apr 2020 04:27:55 +0200 Subject: ili2c: 5.0.0 -> 5.0.8 --- pkgs/tools/misc/ili2c/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/ili2c/default.nix b/pkgs/tools/misc/ili2c/default.nix index 4d78f797f10..43eed8367c4 100644 --- a/pkgs/tools/misc/ili2c/default.nix +++ b/pkgs/tools/misc/ili2c/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "ili2c"; - version = "5.0.0"; + version = "5.0.8"; nativeBuildInputs = [ ant jdk makeWrapper ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "claeis"; repo = pname; rev = "${pname}-${version}"; - sha256 = "0xps2343d5gdr2aj8j3l4cjq4k9zbxxlhnp8sjlhxh1wdczxlwx6"; + sha256 = "1yhsyh940kb33y2n6xl7zhf0f6q0nrxbyg6c4g5n2imllpn54sgi"; }; buildPhase = "ant jar"; -- cgit v1.2.3 From 09d82f63a402120ffa2f9ce1fb55eb4fa42685d8 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 14 Apr 2020 15:53:52 +0200 Subject: transifex-client: 0.13.6 -> 0.13.9 --- pkgs/tools/text/transifex-client/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/transifex-client/default.nix b/pkgs/tools/text/transifex-client/default.nix index 403adaf71b6..ac10564c9f7 100644 --- a/pkgs/tools/text/transifex-client/default.nix +++ b/pkgs/tools/text/transifex-client/default.nix @@ -3,7 +3,7 @@ buildPythonApplication rec { pname = "transifex-client"; - version = "0.13.6"; + version = "0.13.9"; propagatedBuildInputs = [ urllib3 requests python-slugify six setuptools @@ -11,13 +11,13 @@ buildPythonApplication rec { src = fetchPypi { inherit pname version; - sha256 = "0y6pprlmkmi7wfqr3k70sb913qa70p3i90q5mravrai7cr32y1w8"; + sha256 = "0lgd77vrddvyn8afkxr7a7hblmp4k5sr0i9i1032xdih2bipdd9f"; }; prePatch = '' substituteInPlace requirements.txt --replace "urllib3<1.24" "urllib3>=1.24" \ --replace "six==1.11.0" "six>=1.11.0" \ - --replace "python-slugify==1.2.6" "python-slugify>=1.2.6" + --replace "python-slugify<2.0.0" "python-slugify>2.0.0" ''; # Requires external resources -- cgit v1.2.3 From b4a7b66d829afee50aef67fc641d79d6ed1001ab Mon Sep 17 00:00:00 2001 From: gnidorah Date: Tue, 14 Apr 2020 12:41:31 +0300 Subject: openmpt123: 0.4.11 -> 0.4.12 --- pkgs/applications/audio/openmpt123/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/openmpt123/default.nix b/pkgs/applications/audio/openmpt123/default.nix index aebc7dc7baa..de903bf3276 100644 --- a/pkgs/applications/audio/openmpt123/default.nix +++ b/pkgs/applications/audio/openmpt123/default.nix @@ -2,14 +2,14 @@ , usePulseAudio ? config.pulseaudio or false, libpulseaudio }: let - version = "0.4.11"; + version = "0.4.12"; in stdenv.mkDerivation { pname = "openmpt123"; inherit version; src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${version}+release.autotools.tar.gz"; - sha256 = "1g96bpwh419s429wb387lkmhjsn3ldsjrzrb8h9p3wva5z6943i6"; + sha256 = "0q2yf9g6hcwvr2nk3zggkscyf0np6i03q2g7fx10i2kcdr3n9k8c"; }; enableParallelBuilding = true; -- cgit v1.2.3 From b1e93ddf4dc49bdfb3e545f25f6896a44fe70063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 13 Apr 2020 17:37:57 +0100 Subject: ferm: 2.4.1 -> 2.5.1 --- pkgs/tools/networking/ferm/default.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/networking/ferm/default.nix b/pkgs/tools/networking/ferm/default.nix index 8fcdeb234ec..855a57b7720 100644 --- a/pkgs/tools/networking/ferm/default.nix +++ b/pkgs/tools/networking/ferm/default.nix @@ -3,23 +3,27 @@ let inherit (stdenv.lib.versions) majorMinor; in stdenv.mkDerivation rec { - version = "2.5"; + version = "2.5.1"; pname = "ferm"; src = fetchurl { url = "http://ferm.foo-projects.org/download/${majorMinor version}/ferm-${version}.tar.xz"; - sha256 = "0lxqcpirphihpvdqrh5kq0621aqq0h2vdy9q2v85gqdhd52js20p"; + sha256 = "0awl9s243sxgayr2fcmfks8xydhrmb9gy8bd9sfq738dgq7vybjb"; }; - buildInputs = [ perl ipset ebtables iptables makeWrapper ]; - preConfigure = '' - substituteInPlace config.mk --replace "PERL = /usr/bin/perl" "PERL = ${perl}/bin/perl" - substituteInPlace config.mk --replace "PREFIX = /usr" "PREFIX = $out" - ''; + # perl is used at build time to gather the ferm version. + nativeBuildInputs = [ makeWrapper perl ]; + buildInputs = [ perl ]; + + makeFlags = [ + "PERL=perl" + "PREFIX=${placeholder "out"}" + ]; + postInstall = '' rm -r $out/lib/systemd for i in "$out/sbin/"*; do - wrapProgram "$i" --prefix PATH : "${iptables}/bin:${ipset}/bin:${ebtables}/bin" + wrapProgram "$i" --prefix PATH : "${stdenv.lib.makeBinPath [ iptables ipset ebtables ]}" done ''; -- cgit v1.2.3 From fcedd9f78e8072b629a5ff1da4f538f7e655f091 Mon Sep 17 00:00:00 2001 From: "D. Guthrie" Date: Tue, 21 Apr 2020 19:04:51 +0100 Subject: Fix the patch: when converting it to the new version (20200215), forgot to remove temporary files --- .../applications/editors/mg/darwin_no_libbsd.patch | 2397 +------------------- 1 file changed, 27 insertions(+), 2370 deletions(-) diff --git a/pkgs/applications/editors/mg/darwin_no_libbsd.patch b/pkgs/applications/editors/mg/darwin_no_libbsd.patch index 2484c03255b..1863f2952b2 100644 --- a/pkgs/applications/editors/mg/darwin_no_libbsd.patch +++ b/pkgs/applications/editors/mg/darwin_no_libbsd.patch @@ -1,6 +1,6 @@ diff -Naur a/GNUmakefile b/GNUmakefile --- a/GNUmakefile 2020-04-20 21:09:41.000000000 +0100 -+++ b/GNUmakefile 2020-04-20 21:31:19.000000000 +0100 ++++ b/GNUmakefile 2020-04-21 19:01:59.000000000 +0100 @@ -18,7 +18,7 @@ STRIP= /usr/bin/strip @@ -10,7 +10,7 @@ diff -Naur a/GNUmakefile b/GNUmakefile BSD_CPPFLAGS:= BSD_LIBS:= -lutil else -@@ -38,24 +38,21 @@ +@@ -38,10 +38,6 @@ $(error You probably need to install "libncurses5-dev" or "libncurses6-devel" or something like that.) endif @@ -21,11 +21,7 @@ diff -Naur a/GNUmakefile b/GNUmakefile CC?= gcc CFLAGS?= -O2 -pipe CFLAGS+= -g -Wall - CPPFLAGS= -DREGEX - CPPFLAGS+= -D_GNU_SOURCE --CPPFLAGS+= $(BSD_CPPFLAGS) -+CPPFLAGS+= $(BSD_CPPFLAGS) -D__dead=__dead2 - LIBS= $(CURSES_LIBS) $(BSD_LIBS) +@@ -52,10 +48,11 @@ OBJS= autoexec.o basic.o bell.o buffer.o cinfo.o dir.o display.o \ @@ -41,109 +37,9 @@ diff -Naur a/GNUmakefile b/GNUmakefile OBJS+= cmode.o cscope.o dired.o grep.o tags.o -diff -Naur a/GNUmakefile~ b/GNUmakefile~ ---- a/GNUmakefile~ 1970-01-01 01:00:00.000000000 +0100 -+++ b/GNUmakefile~ 2020-04-20 21:27:39.000000000 +0100 -@@ -0,0 +1,96 @@ -+# Makefile for mg -+ -+# This Makefile has been written by Han Boetes -+# and is released in Public Domain. -+ -+# *sigh* Those debian folks are really tidy on their licenses. -+ -+name= mg -+ -+prefix= /usr/local -+bindir= $(prefix)/bin -+libdir= $(prefix)/lib -+includedir= $(prefix)/include -+mandir= $(prefix)/man -+ -+PKG_CONFIG= /usr/bin/pkg-config --silence-errors -+INSTALL= /usr/bin/install -+STRIP= /usr/bin/strip -+ -+UNAME:= $(shell uname) -+ifeq ($(UNAME),FreeBSD) -+ BSD_CPPFLAGS:= -+ BSD_LIBS:= -lutil -+else -+ BSD_CPPFLAGS:= $(shell $(PKG_CONFIG) --cflags libbsd-overlay) -+ BSD_LIBS:= $(shell $(PKG_CONFIG) --libs libbsd-overlay) -+endif -+ -+# Test is some required libraries are installed. Rather bummer that -+# they are also required to run make clean or uninstall. Oh well... Who -+# does that? -+ifeq ($(BSD_LIBS),) -+ $(error You probably need to install "libbsd-dev" or "libbsd-devel" or something like that.) -+endif -+ -+CURSES_LIBS:= $(shell $(PKG_CONFIG) --libs ncurses) -+ifeq ($(CURSES_LIBS),) -+ $(error You probably need to install "libncurses5-dev" or "libncurses6-devel" or something like that.) -+endif -+ -+ifdef STATIC -+ LDFLAGS=-static -static-libgcc -+endif -+ -+CC?= gcc -+CFLAGS?= -O2 -pipe -+CFLAGS+= -g -Wall -+CPPFLAGS= -DREGEX -+CPPFLAGS+= -D_GNU_SOURCE -+CPPFLAGS+= $(BSD_CPPFLAGS) -+LIBS= $(CURSES_LIBS) $(BSD_LIBS) -+ -+ -+OBJS= autoexec.o basic.o bell.o buffer.o cinfo.o dir.o display.o \ -+ echo.o extend.o file.o fileio.o funmap.o interpreter.o help.o \ -+ kbd.o keymap.o line.o macro.o main.o match.o modes.o paragraph.o \ -+ re_search.o region.o search.o spawn.o tty.o ttyio.o ttykbd.o \ -+ undo.o util.o version.o window.o word.o yank.o -+OBJS+= cmode.o cscope.o dired.o grep.o tags.o -+ -+ -+# Portability stuff. -+CFLAGS+= -Wno-strict-aliasing -Wno-deprecated-declarations -+EXE_EXT= -+ -+.c.o: -+ $(CC) $(CFLAGS) $(CPPFLAGS) -c $< -+ -+all: $(name) -+ -+$(name): $(OBJS) -+ $(CC) $(LDFLAGS) $(OBJS) -o $(name) $(LIBS) -+ -+distclean: clean -+ -rm -f *.core core.* -+ -+clean: -+ -rm -f *.o $(name)$(EXE_EXT) -+ -+ -+install: $(name) $(name).1 -+ $(INSTALL) -d $(DESTDIR)$(bindir) -+ $(INSTALL) -d $(DESTDIR)$(mandir)/man1 -+ $(INSTALL) -m 755 $(name) $(DESTDIR)$(bindir)/$(name) -+ $(INSTALL) -m 444 $(name).1 $(DESTDIR)$(mandir)/man1/$(name).1 -+ -+install-strip: install -+ $(STRIP) $(DESTDIR)$(bindir)/$(name) -+ -+uninstall: -+ rm -f \ -+ $(DESTDIR)$(bindir)/$(name)$(EXE_EXT) \ -+ $(DESTDIR)$(mandir)/man1/$(name).1 -+ -+rebuild: -+ make clean all diff -Naur a/_null.h b/_null.h --- a/_null.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/_null.h 2020-04-20 21:26:10.000000000 +0100 ++++ b/_null.h 2020-04-21 19:01:59.000000000 +0100 @@ -0,0 +1,18 @@ +/* $OpenBSD: _null.h,v 1.2 2016/09/09 22:07:58 millert Exp $ */ + @@ -165,7 +61,7 @@ diff -Naur a/_null.h b/_null.h +#endif diff -Naur a/apple.h b/apple.h --- a/apple.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/apple.h 2020-04-20 21:26:10.000000000 +0100 ++++ b/apple.h 2020-04-21 19:01:59.000000000 +0100 @@ -0,0 +1,27 @@ +/* + * Mac OS X-specific support. @@ -196,7 +92,7 @@ diff -Naur a/apple.h b/apple.h +extern int futimens(int, const struct timespec[2]); diff -Naur a/autoexec.c b/autoexec.c --- a/autoexec.c 2020-04-20 21:09:41.000000000 +0100 -+++ b/autoexec.c 2020-04-20 21:26:10.000000000 +0100 ++++ b/autoexec.c 2020-04-21 19:01:59.000000000 +0100 @@ -9,6 +9,9 @@ #include #include @@ -209,7 +105,7 @@ diff -Naur a/autoexec.c b/autoexec.c diff -Naur a/basic.c b/basic.c --- a/basic.c 2020-04-20 21:09:41.000000000 +0100 -+++ b/basic.c 2020-04-20 21:26:10.000000000 +0100 ++++ b/basic.c 2020-04-21 19:01:59.000000000 +0100 @@ -19,6 +19,9 @@ #include #include @@ -220,614 +116,9 @@ diff -Naur a/basic.c b/basic.c #include "def.h" #define percint(n1, n2) ((n1 * (int) n2) * 0.1) -diff -Naur a/basic.c.orig b/basic.c.orig ---- a/basic.c.orig 1970-01-01 01:00:00.000000000 +0100 -+++ b/basic.c.orig 2020-04-20 21:26:06.000000000 +0100 -@@ -0,0 +1,601 @@ -+/* $OpenBSD: basic.c,v 1.49 2019/06/17 11:39:26 lum Exp $ */ -+ -+/* This file is in the public domain */ -+ -+/* -+ * Basic cursor motion commands. -+ * -+ * The routines in this file are the basic -+ * command functions for moving the cursor around on -+ * the screen, setting mark, and swapping dot with -+ * mark. Only moves between lines, which might make the -+ * current buffer framing bad, are hard. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "def.h" -+ -+#define percint(n1, n2) ((n1 * (int) n2) * 0.1) -+ -+/* -+ * Go to beginning of line. -+ */ -+/* ARGSUSED */ -+int -+gotobol(int f, int n) -+{ -+ if (n == 0) -+ return (TRUE); -+ -+ curwp->w_doto = 0; -+ return (TRUE); -+} -+ -+/* -+ * Move cursor backwards. Do the -+ * right thing if the count is less than -+ * 0. Error if you try to move back from -+ * the beginning of the buffer. -+ */ -+/* ARGSUSED */ -+int -+backchar(int f, int n) -+{ -+ struct line *lp; -+ -+ if (n < 0) -+ return (forwchar(f, -n)); -+ while (n--) { -+ if (curwp->w_doto == 0) { -+ if ((lp = lback(curwp->w_dotp)) == curbp->b_headp) { -+ if (!(f & FFRAND)) { -+ dobeep(); -+ ewprintf("Beginning of buffer"); -+ } -+ return (FALSE); -+ } -+ curwp->w_dotp = lp; -+ curwp->w_doto = llength(lp); -+ curwp->w_rflag |= WFMOVE; -+ curwp->w_dotline--; -+ } else -+ curwp->w_doto--; -+ } -+ return (TRUE); -+} -+ -+/* -+ * Go to end of line. -+ */ -+/* ARGSUSED */ -+int -+gotoeol(int f, int n) -+{ -+ if (n == 0) -+ return (TRUE); -+ -+ curwp->w_doto = llength(curwp->w_dotp); -+ return (TRUE); -+} -+ -+/* -+ * Move cursor forwards. Do the -+ * right thing if the count is less than -+ * 0. Error if you try to move forward -+ * from the end of the buffer. -+ */ -+/* ARGSUSED */ -+int -+forwchar(int f, int n) -+{ -+ if (n < 0) -+ return (backchar(f, -n)); -+ while (n--) { -+ if (curwp->w_doto == llength(curwp->w_dotp)) { -+ curwp->w_dotp = lforw(curwp->w_dotp); -+ if (curwp->w_dotp == curbp->b_headp) { -+ curwp->w_dotp = lback(curwp->w_dotp); -+ if (!(f & FFRAND)) { -+ dobeep(); -+ ewprintf("End of buffer"); -+ } -+ return (FALSE); -+ } -+ curwp->w_doto = 0; -+ curwp->w_dotline++; -+ curwp->w_rflag |= WFMOVE; -+ } else -+ curwp->w_doto++; -+ } -+ return (TRUE); -+} -+ -+/* -+ * Go to the beginning of the buffer. Setting WFFULL is conservative, -+ * but almost always the case. A universal argument of higher than 9 -+ * puts the cursor back to the end of buffer. -+ */ -+int -+gotobob(int f, int n) -+{ -+ if (!curwp->w_markp) -+ (void) setmark(f, n); -+ curwp->w_dotp = bfirstlp(curbp); -+ curwp->w_doto = 0; -+ curwp->w_rflag |= WFFULL; -+ curwp->w_dotline = 1; -+ if (f & FFOTHARG && n > 0) { -+ if (n > 9) -+ gotoeob(0, 0); -+ else -+ forwline(f, percint(curwp->w_bufp->b_lines, n) - 1); -+ } -+ return (TRUE); -+} -+ -+/* -+ * Go to the end of the buffer. Leave dot 3 lines from the bottom of the -+ * window if buffer length is longer than window length; same as emacs. -+ * Setting WFFULL is conservative, but almost always the case. A universal -+ * argument of higher than 9 puts the cursor back to the start of buffer. -+ */ -+int -+gotoeob(int f, int n) -+{ -+ int ln; -+ struct line *lp; -+ -+ if (!curwp->w_markp) -+ (void) setmark(f, n); -+ curwp->w_dotp = blastlp(curbp); -+ curwp->w_doto = llength(curwp->w_dotp); -+ curwp->w_dotline = curwp->w_bufp->b_lines; -+ -+ lp = curwp->w_dotp; -+ ln = curwp->w_ntrows - 3; -+ -+ if (ln < curwp->w_bufp->b_lines && ln >= 3) { -+ while (ln--) -+ curwp->w_dotp = lback(curwp->w_dotp); -+ -+ curwp->w_linep = curwp->w_dotp; -+ curwp->w_dotp = lp; -+ } -+ if (f & FFOTHARG && n > 0) { -+ if (n > 9) -+ gotobob(0, 0); -+ else -+ backline(f, percint(curwp->w_bufp->b_lines, n)); -+ } -+ -+ curwp->w_rflag |= WFFULL; -+ return (TRUE); -+} -+ -+/* -+ * Move forward by full lines. -+ * If the number of lines to move is less -+ * than zero, call the backward line function to -+ * actually do it. The last command controls how -+ * the goal column is set. -+ */ -+/* ARGSUSED */ -+int -+forwline(int f, int n) -+{ -+ struct line *dlp; -+ -+ if (n < 0) -+ return (backline(f | FFRAND, -n)); -+ if ((dlp = curwp->w_dotp) == curbp->b_headp) { -+ if (!(f & FFRAND)) { -+ dobeep(); -+ ewprintf("End of buffer"); -+ } -+ return(TRUE); -+ } -+ if ((lastflag & CFCPCN) == 0) /* Fix goal. */ -+ setgoal(); -+ thisflag |= CFCPCN; -+ if (n == 0) -+ return (TRUE); -+ while (n--) { -+ dlp = lforw(dlp); -+ if (dlp == curbp->b_headp) { -+ curwp->w_dotp = lback(dlp); -+ curwp->w_doto = llength(curwp->w_dotp); -+ curwp->w_rflag |= WFMOVE; -+ if (!(f & FFRAND)) { -+ dobeep(); -+ ewprintf("End of buffer"); -+ } -+ return (TRUE); -+ } -+ curwp->w_dotline++; -+ } -+ curwp->w_rflag |= WFMOVE; -+ curwp->w_dotp = dlp; -+ curwp->w_doto = getgoal(dlp); -+ -+ return (TRUE); -+} -+ -+/* -+ * This function is like "forwline", but -+ * goes backwards. The scheme is exactly the same. -+ * Check for arguments that are less than zero and -+ * call your alternate. Figure out the new line and -+ * call "movedot" to perform the motion. -+ */ -+/* ARGSUSED */ -+int -+backline(int f, int n) -+{ -+ struct line *dlp; -+ -+ if (n < 0) -+ return (forwline(f | FFRAND, -n)); -+ if ((lastflag & CFCPCN) == 0) /* Fix goal. */ -+ setgoal(); -+ thisflag |= CFCPCN; -+ dlp = curwp->w_dotp; -+ if (lback(dlp) == curbp->b_headp) { -+ if (!(f & FFRAND)) { -+ dobeep(); -+ ewprintf("Beginning of buffer"); -+ } -+ return(TRUE); -+ } -+ while (n-- && lback(dlp) != curbp->b_headp) { -+ dlp = lback(dlp); -+ curwp->w_dotline--; -+ } -+ if (n > 0 && !(f & FFRAND)) { -+ dobeep(); -+ ewprintf("Beginning of buffer"); -+ } -+ curwp->w_dotp = dlp; -+ curwp->w_doto = getgoal(dlp); -+ curwp->w_rflag |= WFMOVE; -+ return (TRUE); -+} -+ -+/* -+ * Set the current goal column, which is saved in the external variable -+ * "curgoal", to the current cursor column. The column is never off -+ * the edge of the screen; it's more like display then show position. -+ */ -+void -+setgoal(void) -+{ -+ curgoal = getcolpos(curwp); /* Get the position. */ -+ /* we can now display past end of display, don't chop! */ -+} -+ -+/* -+ * This routine looks at a line (pointed -+ * to by the LINE pointer "dlp") and the current -+ * vertical motion goal column (set by the "setgoal" -+ * routine above) and returns the best offset to use -+ * when a vertical motion is made into the line. -+ */ -+int -+getgoal(struct line *dlp) -+{ -+ int c, i, col = 0; -+ char tmp[5]; -+ -+ -+ for (i = 0; i < llength(dlp); i++) { -+ c = lgetc(dlp, i); -+ if (c == '\t' -+#ifdef NOTAB -+ && !(curbp->b_flag & BFNOTAB) -+#endif -+ ) { -+ col |= 0x07; -+ col++; -+ } else if (ISCTRL(c) != FALSE) { -+ col += 2; -+ } else if (isprint(c)) -+ col++; -+ else { -+ col += snprintf(tmp, sizeof(tmp), "\\%o", c); -+ } -+ if (col > curgoal) -+ break; -+ } -+ return (i); -+} -+ -+/* -+ * Scroll forward by a specified number -+ * of lines, or by a full page if no argument. -+ * The "2" is the window overlap (this is the default -+ * value from ITS EMACS). Because the top line in -+ * the window is zapped, we have to do a hard -+ * update and get it back. -+ */ -+/* ARGSUSED */ -+int -+forwpage(int f, int n) -+{ -+ struct line *lp; -+ -+ if (!(f & FFARG)) { -+ n = curwp->w_ntrows - 2; /* Default scroll. */ -+ if (n <= 0) /* Forget the overlap */ -+ n = 1; /* if tiny window. */ -+ } else if (n < 0) -+ return (backpage(f | FFRAND, -n)); -+ -+ lp = curwp->w_linep; -+ while (n--) -+ if ((lp = lforw(lp)) == curbp->b_headp) { -+ dobeep(); -+ ewprintf("End of buffer"); -+ return(TRUE); -+ } -+ -+ curwp->w_linep = lp; -+ curwp->w_rflag |= WFFULL; -+ -+ /* if in current window, don't move dot */ -+ for (n = curwp->w_ntrows; n-- && lp != curbp->b_headp; lp = lforw(lp)) -+ if (lp == curwp->w_dotp) -+ return (TRUE); -+ -+ /* Advance the dot the slow way, for line nos */ -+ while (curwp->w_dotp != curwp->w_linep) { -+ curwp->w_dotp = lforw(curwp->w_dotp); -+ curwp->w_dotline++; -+ } -+ curwp->w_doto = 0; -+ return (TRUE); -+} -+ -+/* -+ * This command is like "forwpage", -+ * but it goes backwards. The "2", like above, -+ * is the overlap between the two windows. The -+ * value is from the ITS EMACS manual. The -+ * hard update is done because the top line in -+ * the window is zapped. -+ */ -+/* ARGSUSED */ -+int -+backpage(int f, int n) -+{ -+ struct line *lp, *lp2; -+ -+ if (!(f & FFARG)) { -+ n = curwp->w_ntrows - 2; /* Default scroll. */ -+ if (n <= 0) /* Don't blow up if the */ -+ return (backline(f, 1));/* window is tiny. */ -+ } else if (n < 0) -+ return (forwpage(f | FFRAND, -n)); -+ -+ lp = lp2 = curwp->w_linep; -+ -+ while (n-- && lback(lp) != curbp->b_headp) { -+ lp = lback(lp); -+ } -+ if (lp == curwp->w_linep) { -+ dobeep(); -+ ewprintf("Beginning of buffer"); -+ } -+ curwp->w_linep = lp; -+ curwp->w_rflag |= WFFULL; -+ -+ /* if in current window, don't move dot */ -+ for (n = curwp->w_ntrows; n-- && lp != curbp->b_headp; lp = lforw(lp)) -+ if (lp == curwp->w_dotp) -+ return (TRUE); -+ -+ lp2 = lforw(lp2); -+ -+ /* Move the dot the slow way, for line nos */ -+ while (curwp->w_dotp != lp2) { -+ if (curwp->w_dotline <= curwp->w_ntrows) -+ goto out; -+ curwp->w_dotp = lback(curwp->w_dotp); -+ curwp->w_dotline--; -+ } -+out: -+ curwp->w_doto = 0; -+ return (TRUE); -+} -+ -+/* -+ * These functions are provided for compatibility with Gosling's Emacs. They -+ * are used to scroll the display up (or down) one line at a time. -+ */ -+int -+forw1page(int f, int n) -+{ -+ if (!(f & FFARG)) { -+ n = 1; -+ f = FFUNIV; -+ } -+ forwpage(f | FFRAND, n); -+ return (TRUE); -+} -+ -+int -+back1page(int f, int n) -+{ -+ if (!(f & FFARG)) { -+ n = 1; -+ f = FFUNIV; -+ } -+ backpage(f | FFRAND, n); -+ return (TRUE); -+} -+ -+/* -+ * Page the other window. Check to make sure it exists, then -+ * nextwind, forwpage and restore window pointers. -+ */ -+int -+pagenext(int f, int n) -+{ -+ struct mgwin *wp; -+ -+ if (wheadp->w_wndp == NULL) { -+ dobeep(); -+ ewprintf("No other window"); -+ return (FALSE); -+ } -+ wp = curwp; -+ (void) nextwind(f, n); -+ (void) forwpage(f, n); -+ curwp = wp; -+ curbp = wp->w_bufp; -+ return (TRUE); -+} -+ -+/* -+ * Internal set mark routine, used by other functions (daveb). -+ */ -+void -+isetmark(void) -+{ -+ curwp->w_markp = curwp->w_dotp; -+ curwp->w_marko = curwp->w_doto; -+ curwp->w_markline = curwp->w_dotline; -+} -+ -+/* -+ * Set the mark in the current window -+ * to the value of dot. A message is written to -+ * the echo line. (ewprintf knows about macros) -+ */ -+/* ARGSUSED */ -+int -+setmark(int f, int n) -+{ -+ isetmark(); -+ ewprintf("Mark set"); -+ return (TRUE); -+} -+ -+/* Clear the mark, if set. */ -+/* ARGSUSED */ -+int -+clearmark(int f, int n) -+{ -+ if (!curwp->w_markp) -+ return (FALSE); -+ -+ curwp->w_markp = NULL; -+ curwp->w_marko = 0; -+ curwp->w_markline = 0; -+ -+ return (TRUE); -+} -+ -+/* -+ * Swap the values of "dot" and "mark" in -+ * the current window. This is pretty easy, because -+ * all of the hard work gets done by the standard routine -+ * that moves the mark about. The only possible -+ * error is "no mark". -+ */ -+/* ARGSUSED */ -+int -+swapmark(int f, int n) -+{ -+ struct line *odotp; -+ int odoto, odotline; -+ -+ if (curwp->w_markp == NULL) { -+ dobeep(); -+ ewprintf("No mark in this window"); -+ return (FALSE); -+ } -+ odotp = curwp->w_dotp; -+ odoto = curwp->w_doto; -+ odotline = curwp->w_dotline; -+ curwp->w_dotp = curwp->w_markp; -+ curwp->w_doto = curwp->w_marko; -+ curwp->w_dotline = curwp->w_markline; -+ curwp->w_markp = odotp; -+ curwp->w_marko = odoto; -+ curwp->w_markline = odotline; -+ curwp->w_rflag |= WFMOVE; -+ return (TRUE); -+} -+ -+/* -+ * Go to a specific line, mostly for -+ * looking up errors in C programs, which give the -+ * error a line number. If an argument is present, then -+ * it is the line number, else prompt for a line number -+ * to use. -+ */ -+/* ARGSUSED */ -+int -+gotoline(int f, int n) -+{ -+ char buf[32], *bufp; -+ const char *err; -+ -+ if (!(f & FFARG)) { -+ if ((bufp = eread("Goto line: ", buf, sizeof(buf), -+ EFNUL | EFNEW | EFCR)) == NULL) -+ return (ABORT); -+ if (bufp[0] == '\0') -+ return (ABORT); -+ n = (int)strtonum(buf, INT_MIN, INT_MAX, &err); -+ if (err) { -+ dobeep(); -+ ewprintf("Line number %s", err); -+ return (FALSE); -+ } -+ } -+ return(setlineno(n)); -+} -+ -+/* -+ * Set the line number and switch to it. -+ */ -+int -+setlineno(int n) -+{ -+ struct line *clp; -+ -+ if (n >= 0) { -+ if (n == 0) -+ n++; -+ curwp->w_dotline = n; -+ clp = lforw(curbp->b_headp); /* "clp" is first line */ -+ while (--n > 0) { -+ if (lforw(clp) == curbp->b_headp) { -+ curwp->w_dotline = curwp->w_bufp->b_lines; -+ break; -+ } -+ clp = lforw(clp); -+ } -+ } else { -+ curwp->w_dotline = curwp->w_bufp->b_lines + n; -+ clp = lback(curbp->b_headp); /* "clp" is last line */ -+ while (n < 0) { -+ if (lback(clp) == curbp->b_headp) { -+ curwp->w_dotline = 1; -+ break; -+ } -+ clp = lback(clp); -+ n++; -+ } -+ } -+ curwp->w_dotp = clp; -+ curwp->w_doto = 0; -+ curwp->w_rflag |= WFMOVE; -+ return (TRUE); -+} diff -Naur a/cscope.c b/cscope.c --- a/cscope.c 2020-04-20 21:09:41.000000000 +0100 -+++ b/cscope.c 2020-04-20 21:26:10.000000000 +0100 ++++ b/cscope.c 2020-04-21 19:01:59.000000000 +0100 @@ -20,6 +20,9 @@ #include #include @@ -840,7 +131,7 @@ diff -Naur a/cscope.c b/cscope.c #define CSSYMBOL 0 diff -Naur a/display.c b/display.c --- a/display.c 2020-04-20 21:09:41.000000000 +0100 -+++ b/display.c 2020-04-20 21:26:10.000000000 +0100 ++++ b/display.c 2020-04-21 19:01:59.000000000 +0100 @@ -19,6 +19,9 @@ #include #include @@ -853,7 +144,7 @@ diff -Naur a/display.c b/display.c diff -Naur a/fileio.c b/fileio.c --- a/fileio.c 2020-04-20 21:09:41.000000000 +0100 -+++ b/fileio.c 2020-04-20 21:26:10.000000000 +0100 ++++ b/fileio.c 2020-04-21 19:01:59.000000000 +0100 @@ -22,19 +22,13 @@ #include #include @@ -913,792 +204,27 @@ diff -Naur a/fileio.c b/fileio.c ewprintf("Path too long"); return (NULL); } -diff -Naur a/fileio.c.orig b/fileio.c.orig ---- a/fileio.c.orig 1970-01-01 01:00:00.000000000 +0100 -+++ b/fileio.c.orig 2020-04-20 21:26:06.000000000 +0100 -@@ -0,0 +1,761 @@ -+/* $OpenBSD: fileio.c,v 1.106 2019/06/22 10:21:57 lum Exp $ */ -+ +diff -Naur a/futimens.c b/futimens.c +--- a/futimens.c 1970-01-01 01:00:00.000000000 +0100 ++++ b/futimens.c 2020-04-21 19:01:59.000000000 +0100 +@@ -0,0 +1,14 @@ +/* This file is in the public domain. */ + -+/* -+ * POSIX fileio.c -+ */ -+ -+#include -+#include -+#include +#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "def.h" -+#include "kbd.h" -+#include "pathnames.h" -+ -+#ifndef MAXNAMLEN -+#define MAXNAMLEN 255 -+#endif -+ -+#ifndef DEFFILEMODE -+#define DEFFILEMODE 0666 -+#endif -+ -+static char *bkuplocation(const char *); -+static int bkupleavetmp(const char *); + -+static char *bkupdir; -+static int leavetmp = 0; /* 1 = leave any '~' files in tmp dir */ -+ -+/* -+ * Open a file for reading. -+ */ -+int -+ffropen(FILE ** ffp, const char *fn, struct buffer *bp) -+{ -+ if ((*ffp = fopen(fn, "r")) == NULL) { -+ if (errno == ENOENT) -+ return (FIOFNF); -+ return (FIOERR); -+ } -+ -+ /* If 'fn' is a directory open it with dired. */ -+ if (fisdir(fn) == TRUE) -+ return (FIODIR); -+ -+ ffstat(*ffp, bp); -+ -+ return (FIOSUC); -+} -+ -+/* -+ * Update stat/dirty info -+ */ -+void -+ffstat(FILE *ffp, struct buffer *bp) -+{ -+ struct stat sb; -+ -+ if (bp && fstat(fileno(ffp), &sb) == 0) { -+ /* set highorder bit to make sure this isn't all zero */ -+ bp->b_fi.fi_mode = sb.st_mode | 0x8000; -+ bp->b_fi.fi_uid = sb.st_uid; -+ bp->b_fi.fi_gid = sb.st_gid; -+ /* bp->b_fi.fi_mtime = sb.st_mtimespec; */ -+ bp->b_fi.fi_mtime.tv_sec = sb.st_mtime; -+ bp->b_fi.fi_mtime.tv_nsec = 0; -+ /* Clear the ignore flag */ -+ bp->b_flag &= ~(BFIGNDIRTY | BFDIRTY); -+ } -+} -+ -+/* -+ * Update the status/dirty info. If there is an error, -+ * there's not a lot we can do. -+ */ -+int -+fupdstat(struct buffer *bp) -+{ -+ FILE *ffp; -+ -+ if ((ffp = fopen(bp->b_fname, "r")) == NULL) { -+ if (errno == ENOENT) -+ return (FIOFNF); -+ return (FIOERR); -+ } -+ ffstat(ffp, bp); -+ (void)ffclose(ffp, bp); -+ return (FIOSUC); -+} -+ -+/* -+ * Open a file for writing. -+ */ -+int -+ffwopen(FILE ** ffp, const char *fn, struct buffer *bp) -+{ -+ int fd; -+ mode_t fmode = DEFFILEMODE; -+ -+ if (bp && bp->b_fi.fi_mode) -+ fmode = bp->b_fi.fi_mode & 07777; -+ -+ fd = open(fn, O_RDWR | O_CREAT | O_TRUNC, fmode); -+ if (fd == -1) { -+ ffp = NULL; -+ dobeep(); -+ ewprintf("Cannot open file for writing : %s", strerror(errno)); -+ return (FIOERR); -+ } -+ -+ if ((*ffp = fdopen(fd, "w")) == NULL) { -+ dobeep(); -+ ewprintf("Cannot open file for writing : %s", strerror(errno)); -+ close(fd); -+ return (FIOERR); -+ } -+ -+ /* -+ * If we have file information, use it. We don't bother to check for -+ * errors, because there's no a lot we can do about it. Certainly -+ * trying to change ownership will fail if we aren't root. That's -+ * probably OK. If we don't have info, no need to get it, since any -+ * future writes will do the same thing. -+ */ -+ if (bp && bp->b_fi.fi_mode) { -+ fchmod(fd, bp->b_fi.fi_mode & 07777); -+ fchown(fd, bp->b_fi.fi_uid, bp->b_fi.fi_gid); -+ } -+ return (FIOSUC); -+} -+ -+/* -+ * Close a file. -+ */ -+/* ARGSUSED */ -+int -+ffclose(FILE *ffp, struct buffer *bp) -+{ -+ if (fclose(ffp) == 0) -+ return (FIOSUC); -+ return (FIOERR); -+} -+ -+/* -+ * Write a buffer to the already opened file. bp points to the -+ * buffer. Return the status. -+ */ -+int -+ffputbuf(FILE *ffp, struct buffer *bp, int eobnl) -+{ -+ struct line *lp, *lpend; -+ -+ lpend = bp->b_headp; -+ -+ for (lp = lforw(lpend); lp != lpend; lp = lforw(lp)) { -+ if (fwrite(ltext(lp), 1, llength(lp), ffp) != llength(lp)) { -+ dobeep(); -+ ewprintf("Write I/O error"); -+ return (FIOERR); -+ } -+ if (lforw(lp) != lpend) /* no implied \n on last line */ -+ putc('\n', ffp); -+ } -+ if (eobnl) { -+ lnewline_at(lback(lpend), llength(lback(lpend))); -+ putc('\n', ffp); -+ } -+ return (FIOSUC); -+} ++#include + -+/* -+ * Read a line from a file, and store the bytes -+ * in the supplied buffer. Stop on end of file or end of -+ * line. When FIOEOF is returned, there is a valid line -+ * of data without the normally implied \n. -+ * If the line length exceeds nbuf, FIOLONG is returned. -+ */ +int -+ffgetline(FILE *ffp, char *buf, int nbuf, int *nbytes) ++futimens(int fildes, const struct timespec times[2]) +{ -+ int c, i; -+ -+ i = 0; -+ while ((c = getc(ffp)) != EOF && c != '\n') { -+ buf[i++] = c; -+ if (i >= nbuf) -+ return (FIOLONG); -+ } -+ if (c == EOF && ferror(ffp) != FALSE) { -+ dobeep(); -+ ewprintf("File read error"); -+ return (FIOERR); -+ } -+ *nbytes = i; -+ return (c == EOF ? FIOEOF : FIOSUC); -+} -+ -+/* -+ * Make a backup copy of "fname". On Unix the backup has the same -+ * name as the original file, with a "~" on the end; this seems to -+ * be newest of the new-speak. The error handling is all in "file.c". -+ * We do a copy instead of a rename since otherwise another process -+ * with an open fd will get the backup, not the new file. This is -+ * a problem when using mg with things like crontab and vipw. -+ */ -+int -+fbackupfile(const char *fn) -+{ -+ struct stat sb; -+ struct timespec new_times[2]; -+ int from, to, serrno; -+ ssize_t nread; -+ char buf[BUFSIZ]; -+ char *nname, *tname, *bkpth; -+ -+ if (stat(fn, &sb) == -1) { -+ dobeep(); -+ ewprintf("Can't stat %s : %s", fn, strerror(errno)); -+ return (FALSE); -+ } -+ -+ if ((bkpth = bkuplocation(fn)) == NULL) -+ return (FALSE); -+ -+ if (asprintf(&nname, "%s~", bkpth) == -1) { -+ dobeep(); -+ ewprintf("Can't allocate backup file name : %s", strerror(errno)); -+ free(bkpth); -+ return (ABORT); -+ } -+ if (asprintf(&tname, "%s.XXXXXXXXXX", bkpth) == -1) { -+ dobeep(); -+ ewprintf("Can't allocate temp file name : %s", strerror(errno)); -+ free(bkpth); -+ free(nname); -+ return (ABORT); -+ } -+ free(bkpth); -+ -+ if ((from = open(fn, O_RDONLY)) == -1) { -+ free(nname); -+ free(tname); -+ return (FALSE); -+ } -+ to = mkstemp(tname); -+ if (to == -1) { -+ serrno = errno; -+ close(from); -+ free(nname); -+ free(tname); -+ errno = serrno; -+ return (FALSE); -+ } -+ while ((nread = read(from, buf, sizeof(buf))) > 0) { -+ if (write(to, buf, (size_t)nread) != nread) { -+ nread = -1; -+ break; -+ } -+ } -+ serrno = errno; -+ (void) fchmod(to, (sb.st_mode & 0777)); -+ -+ /* copy the mtime to the backupfile */ -+ new_times[0] = sb.st_atim; -+ new_times[1] = sb.st_mtim; -+ futimens(to, new_times); -+ -+ close(from); -+ close(to); -+ if (nread == -1) { -+ if (unlink(tname) == -1) -+ ewprintf("Can't unlink temp : %s", strerror(errno)); -+ } else { -+ if (rename(tname, nname) == -1) { -+ ewprintf("Can't rename temp : %s", strerror(errno)); -+ (void) unlink(tname); -+ nread = -1; -+ } -+ } -+ free(nname); -+ free(tname); -+ errno = serrno; -+ -+ return (nread == -1 ? FALSE : TRUE); -+} -+ -+/* -+ * Convert "fn" to a canonicalized absolute filename, replacing -+ * a leading ~/ with the user's home dir, following symlinks, and -+ * remove all occurrences of /./ and /../ -+ */ -+char * -+adjustname(const char *fn, int slashslash) -+{ -+ static char fnb[PATH_MAX]; -+ const char *cp, *ep = NULL; -+ char *path; -+ -+ if (slashslash == TRUE) { -+ cp = fn + strlen(fn) - 1; -+ for (; cp >= fn; cp--) { -+ if (ep && (*cp == '/')) { -+ fn = ep; -+ break; -+ } -+ if (*cp == '/' || *cp == '~') -+ ep = cp; -+ else -+ ep = NULL; -+ } -+ } -+ if ((path = expandtilde(fn)) == NULL) -+ return (NULL); -+ -+ if (realpath(path, fnb) == NULL) -+ (void)strlcpy(fnb, path, sizeof(fnb)); -+ -+ free(path); -+ return (fnb); -+} -+ -+/* -+ * Find a startup file for the user and return its name. As a service -+ * to other pieces of code that may want to find a startup file (like -+ * the terminal driver in particular), accepts a suffix to be appended -+ * to the startup file name. -+ */ -+char * -+startupfile(char *suffix) -+{ -+ static char file[NFILEN]; -+ char *home; -+ int ret; -+ -+ if ((home = getenv("HOME")) == NULL || *home == '\0') -+ goto nohome; -+ -+ if (suffix == NULL) { -+ ret = snprintf(file, sizeof(file), _PATH_MG_STARTUP, home); -+ if (ret < 0 || ret >= sizeof(file)) -+ return (NULL); -+ } else { -+ ret = snprintf(file, sizeof(file), _PATH_MG_TERM, home, suffix); -+ if (ret < 0 || ret >= sizeof(file)) -+ return (NULL); -+ } -+ -+ if (access(file, R_OK) == 0) -+ return (file); -+nohome: -+#ifdef STARTUPFILE -+ if (suffix == NULL) { -+ ret = snprintf(file, sizeof(file), "%s", STARTUPFILE); -+ if (ret < 0 || ret >= sizeof(file)) -+ return (NULL); -+ } else { -+ ret = snprintf(file, sizeof(file), "%s%s", STARTUPFILE, -+ suffix); -+ if (ret < 0 || ret >= sizeof(file)) -+ return (NULL); -+ } -+ -+ if (access(file, R_OK) == 0) -+ return (file); -+#endif /* STARTUPFILE */ -+ return (NULL); -+} -+ -+int -+copy(char *frname, char *toname) -+{ -+ int ifd, ofd; -+ char buf[BUFSIZ]; -+ mode_t fmode = DEFFILEMODE; /* XXX?? */ -+ struct stat orig; -+ ssize_t sr; -+ -+ if ((ifd = open(frname, O_RDONLY)) == -1) -+ return (FALSE); -+ if (fstat(ifd, &orig) == -1) { -+ dobeep(); -+ ewprintf("fstat: %s", strerror(errno)); -+ close(ifd); -+ return (FALSE); -+ } -+ -+ if ((ofd = open(toname, O_WRONLY|O_CREAT|O_TRUNC, fmode)) == -1) { -+ close(ifd); -+ return (FALSE); -+ } -+ while ((sr = read(ifd, buf, sizeof(buf))) > 0) { -+ if (write(ofd, buf, (size_t)sr) != sr) { -+ ewprintf("write error : %s", strerror(errno)); -+ break; -+ } -+ } -+ if (fchmod(ofd, orig.st_mode) == -1) -+ ewprintf("Cannot set original mode : %s", strerror(errno)); -+ -+ if (sr == -1) { -+ ewprintf("Read error : %s", strerror(errno)); -+ close(ifd); -+ close(ofd); -+ return (FALSE); -+ } -+ /* -+ * It is "normal" for this to fail since we can't guarantee that -+ * we will be running as root. -+ */ -+ if (fchown(ofd, orig.st_uid, orig.st_gid) && errno != EPERM) -+ ewprintf("Cannot set owner : %s", strerror(errno)); -+ -+ (void) close(ifd); -+ (void) close(ofd); -+ -+ return (TRUE); -+} -+ -+/* -+ * return list of file names that match the name in buf. -+ */ -+struct list * -+make_file_list(char *buf) -+{ -+ char *dir, *file, *cp; -+ size_t len, preflen; -+ int ret; -+ DIR *dirp; -+ struct dirent *dent; -+ struct list *last, *current; -+ char fl_name[NFILEN + 2]; -+ char prefixx[NFILEN + 1]; -+ -+ /* -+ * We need three different strings: -+ -+ * dir - the name of the directory containing what the user typed. -+ * Must be a real unix file name, e.g. no ~user, etc.. -+ * Must not end in /. -+ * prefix - the portion of what the user typed that is before the -+ * names we are going to find in the directory. Must have a -+ * trailing / if the user typed it. -+ * names from the directory - We open dir, and return prefix -+ * concatenated with names. -+ */ -+ -+ /* first we get a directory name we can look up */ -+ /* -+ * Names ending in . are potentially odd, because adjustname will -+ * treat foo/bar/.. as a foo/, whereas we are -+ * interested in names starting with .. -+ */ -+ len = strlen(buf); -+ if (len && buf[len - 1] == '.') { -+ buf[len - 1] = 'x'; -+ dir = adjustname(buf, TRUE); -+ buf[len - 1] = '.'; -+ } else -+ dir = adjustname(buf, TRUE); -+ if (dir == NULL) -+ return (NULL); -+ /* -+ * If the user typed a trailing / or the empty string -+ * he wants us to use his file spec as a directory name. -+ */ -+ if (len && buf[len - 1] != '/') { -+ file = strrchr(dir, '/'); -+ if (file) { -+ *file = '\0'; -+ if (*dir == '\0') -+ dir = "/"; -+ } else -+ return (NULL); -+ } -+ /* Now we get the prefix of the name the user typed. */ -+ if (strlcpy(prefixx, buf, sizeof(prefixx)) >= sizeof(prefixx)) -+ return (NULL); -+ cp = strrchr(prefixx, '/'); -+ if (cp == NULL) -+ prefixx[0] = '\0'; -+ else -+ cp[1] = '\0'; -+ -+ preflen = strlen(prefixx); -+ /* cp is the tail of buf that really needs to be compared. */ -+ cp = buf + preflen; -+ len = strlen(cp); -+ -+ /* -+ * Now make sure that file names will fit in the buffers allocated. -+ * SV files are fairly short. For BSD, something more general would -+ * be required. -+ */ -+ if (preflen > NFILEN - MAXNAMLEN) -+ return (NULL); -+ -+ /* loop over the specified directory, making up the list of files */ -+ -+ /* -+ * Note that it is worth our time to filter out names that don't -+ * match, even though our caller is going to do so again, and to -+ * avoid doing the stat if completion is being done, because stat'ing -+ * every file in the directory is relatively expensive. -+ */ -+ -+ dirp = opendir(dir); -+ if (dirp == NULL) -+ return (NULL); -+ last = NULL; -+ -+ while ((dent = readdir(dirp)) != NULL) { -+ int isdir; -+ if (strncmp(cp, dent->d_name, len) != 0) -+ continue; -+ isdir = 0; -+ if (dent->d_type == DT_DIR) { -+ isdir = 1; -+ } else if (dent->d_type == DT_LNK || -+ dent->d_type == DT_UNKNOWN) { -+ struct stat statbuf; -+ -+ if (fstatat(dirfd(dirp), dent->d_name, &statbuf, 0) < 0) -+ continue; -+ if (S_ISDIR(statbuf.st_mode)) -+ isdir = 1; -+ } -+ -+ if ((current = malloc(sizeof(struct list))) == NULL) { -+ free_file_list(last); -+ closedir(dirp); -+ return (NULL); -+ } -+ ret = snprintf(fl_name, sizeof(fl_name), -+ "%s%s%s", prefixx, dent->d_name, isdir ? "/" : ""); -+ if (ret < 0 || ret >= sizeof(fl_name)) { -+ free(current); -+ continue; -+ } -+ current->l_next = last; -+ current->l_name = strdup(fl_name); -+ last = current; -+ } -+ closedir(dirp); -+ -+ return (last); -+} -+ -+/* -+ * Test if a supplied filename refers to a directory -+ * Returns ABORT on error, TRUE if directory. FALSE otherwise -+ */ -+int -+fisdir(const char *fname) -+{ -+ struct stat statbuf; -+ -+ if (stat(fname, &statbuf) != 0) -+ return (ABORT); -+ -+ if (S_ISDIR(statbuf.st_mode)) -+ return (TRUE); -+ -+ return (FALSE); -+} -+ -+/* -+ * Check the mtime of the supplied filename. -+ * Return TRUE if last mtime matches, FALSE if not, -+ * If the stat fails, return TRUE and try the save anyway -+ */ -+int -+fchecktime(struct buffer *bp) -+{ -+ struct stat sb; -+ -+ if (stat(bp->b_fname, &sb) == -1) -+ return (TRUE); -+ -+ /* if (bp->b_fi.fi_mtime.tv_sec != sb.st_mtimespec.tv_sec || -+ bp->b_fi.fi_mtime.tv_nsec != sb.st_mtimespec.tv_nsec) */ -+ if (bp->b_fi.fi_mtime.tv_sec != sb.st_mtime) -+ return (FALSE); -+ -+ return (TRUE); -+ -+} -+ -+/* -+ * Location of backup file. This function creates the correct path. -+ */ -+static char * -+bkuplocation(const char *fn) -+{ -+ struct stat sb; -+ char *ret; -+ -+ if (bkupdir != NULL && (stat(bkupdir, &sb) == 0) && -+ S_ISDIR(sb.st_mode) && !bkupleavetmp(fn)) { -+ char fname[NFILEN]; -+ const char *c; -+ int i = 0, len; -+ -+ c = fn; -+ len = strlen(bkupdir); -+ -+ while (*c != '\0') { -+ /* Make sure we don't go over combined: -+ * strlen(bkupdir + '/' + fname + '\0') -+ */ -+ if (i >= NFILEN - len - 1) -+ return (NULL); -+ if (*c == '/') { -+ fname[i] = '!'; -+ } else if (*c == '!') { -+ if (i >= NFILEN - len - 2) -+ return (NULL); -+ fname[i++] = '!'; -+ fname[i] = '!'; -+ } else -+ fname[i] = *c; -+ i++; -+ c++; -+ } -+ fname[i] = '\0'; -+ if (asprintf(&ret, "%s/%s", bkupdir, fname) == -1) -+ return (NULL); -+ -+ } else if ((ret = strndup(fn, NFILEN)) == NULL) -+ return (NULL); -+ -+ return (ret); -+} -+ -+int -+backuptohomedir(int f, int n) -+{ -+ const char *c = _PATH_MG_DIR; -+ char *p; -+ -+ if (bkupdir == NULL) { -+ p = adjustname(c, TRUE); -+ bkupdir = strndup(p, NFILEN); -+ if (bkupdir == NULL) -+ return(FALSE); -+ -+ if (mkdir(bkupdir, 0700) == -1 && errno != EEXIST) { -+ free(bkupdir); -+ bkupdir = NULL; -+ } -+ } else { -+ free(bkupdir); -+ bkupdir = NULL; -+ } -+ -+ return (TRUE); -+} -+ -+/* -+ * For applications that use mg as the editor and have a desire to keep -+ * '~' files in /tmp, toggle the location: /tmp | ~/.mg.d -+ */ -+int -+toggleleavetmp(int f, int n) -+{ -+ leavetmp = !leavetmp; -+ -+ return (TRUE); -+} -+ -+/* -+ * Returns TRUE if fn is located in the temp directory and we want to save -+ * those backups there. -+ */ -+int -+bkupleavetmp(const char *fn) -+{ -+ if (!leavetmp) -+ return(FALSE); -+ -+ if (strncmp(fn, "/tmp", 4) == 0) -+ return (TRUE); -+ -+ return (FALSE); -+} -+ -+/* -+ * Expand file names beginning with '~' if appropriate: -+ * 1, if ./~fn exists, continue without expanding tilde. -+ * 2, else, if username 'fn' exists, expand tilde with home directory path. -+ * 3, otherwise, continue and create new buffer called ~fn. -+ */ -+char * -+expandtilde(const char *fn) -+{ -+ struct passwd *pw; -+ struct stat statbuf; -+ const char *cp; -+ char user[LOGIN_NAME_MAX], path[NFILEN]; -+ char *ret; -+ size_t ulen, plen; -+ -+ path[0] = '\0'; -+ -+ if (fn[0] != '~' || stat(fn, &statbuf) == 0) { -+ if ((ret = strndup(fn, NFILEN)) == NULL) -+ return (NULL); -+ return(ret); -+ } -+ cp = strchr(fn, '/'); -+ if (cp == NULL) -+ cp = fn + strlen(fn); /* point to the NUL byte */ -+ ulen = cp - &fn[1]; -+ if (ulen >= sizeof(user)) { -+ if ((ret = strndup(fn, NFILEN)) == NULL) -+ return (NULL); -+ return(ret); -+ } -+ if (ulen == 0) /* ~/ or ~ */ -+ pw = getpwuid(geteuid()); -+ else { /* ~user/ or ~user */ -+ memcpy(user, &fn[1], ulen); -+ user[ulen] = '\0'; -+ pw = getpwnam(user); -+ } -+ if (pw != NULL) { -+ plen = strlcpy(path, pw->pw_dir, sizeof(path)); -+ if (plen == 0 || path[plen - 1] != '/') { -+ if (strlcat(path, "/", sizeof(path)) >= sizeof(path)) { -+ dobeep(); -+ ewprintf("Path too long"); -+ return (NULL); -+ } -+ } -+ fn = cp; -+ if (*fn == '/') -+ fn++; -+ } -+ if (strlcat(path, fn, sizeof(path)) >= sizeof(path)) { -+ dobeep(); -+ ewprintf("Path too long"); -+ return (NULL); -+ } -+ if ((ret = strndup(path, NFILEN)) == NULL) -+ return (NULL); -+ -+ return (ret); -+} -diff -Naur a/futimens.c b/futimens.c ---- a/futimens.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/futimens.c 2020-04-20 21:26:10.000000000 +0100 -@@ -0,0 +1,14 @@ -+/* This file is in the public domain. */ -+ -+#include -+ -+#include -+ -+int -+futimens(int fildes, const struct timespec times[2]) -+{ -+ struct timeval timevals[2]; -+ TIMESPEC_TO_TIMEVAL(&timevals[0], ×[0]); -+ TIMESPEC_TO_TIMEVAL(&timevals[1], ×[1]); -+ return futimes(fildes, timevals); ++ struct timeval timevals[2]; ++ TIMESPEC_TO_TIMEVAL(&timevals[0], ×[0]); ++ TIMESPEC_TO_TIMEVAL(&timevals[1], ×[1]); ++ return futimes(fildes, timevals); +} diff -Naur a/grep.c b/grep.c --- a/grep.c 2020-04-20 21:09:41.000000000 +0100 -+++ b/grep.c 2020-04-20 21:26:10.000000000 +0100 ++++ b/grep.c 2020-04-21 19:01:59.000000000 +0100 @@ -15,6 +15,9 @@ #include #include @@ -1709,375 +235,9 @@ diff -Naur a/grep.c b/grep.c #include "def.h" #include "kbd.h" #include "funmap.h" -diff -Naur a/grep.c.orig b/grep.c.orig ---- a/grep.c.orig 1970-01-01 01:00:00.000000000 +0100 -+++ b/grep.c.orig 2020-04-20 21:26:06.000000000 +0100 -@@ -0,0 +1,362 @@ -+/* $OpenBSD: grep.c,v 1.48 2019/07/11 18:20:18 lum Exp $ */ -+ -+/* This file is in the public domain */ -+ -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "def.h" -+#include "kbd.h" -+#include "funmap.h" -+ -+int globalwd = FALSE; -+static int compile_goto_error(int, int); -+int next_error(int, int); -+static int grep(int, int); -+static int gid(int, int); -+static struct buffer *compile_mode(const char *, const char *); -+void grep_init(void); -+ -+static char compile_last_command[NFILEN] = "make "; -+ -+/* -+ * Hints for next-error -+ * -+ * XXX - need some kind of callback to find out when those get killed. -+ */ -+struct mgwin *compile_win; -+struct buffer *compile_buffer; -+ -+static PF compile_pf[] = { -+ compile_goto_error -+}; -+ -+static struct KEYMAPE (1) compilemap = { -+ 1, -+ 1, -+ rescan, -+ { -+ { CCHR('M'), CCHR('M'), compile_pf, NULL } -+ } -+}; -+ -+void -+grep_init(void) -+{ -+ funmap_add(compile_goto_error, "compile-goto-error", 0); -+ funmap_add(next_error, "next-error", 0); -+ funmap_add(grep, "grep", 1); -+ funmap_add(compile, "compile", 0); -+ funmap_add(gid, "gid", 1); -+ maps_add((KEYMAP *)&compilemap, "compile"); -+} -+ -+/* ARGSUSED */ -+static int -+grep(int f, int n) -+{ -+ char cprompt[NFILEN], *bufp; -+ struct buffer *bp; -+ struct mgwin *wp; -+ -+ (void)strlcpy(cprompt, "grep -n ", sizeof(cprompt)); -+ if ((bufp = eread("Run grep: ", cprompt, NFILEN, -+ EFDEF | EFNEW | EFCR)) == NULL) -+ return (ABORT); -+ else if (bufp[0] == '\0') -+ return (FALSE); -+ if (strlcat(cprompt, " /dev/null", sizeof(cprompt)) >= sizeof(cprompt)) -+ return (FALSE); -+ -+ if ((bp = compile_mode("*grep*", cprompt)) == NULL) -+ return (FALSE); -+ if ((wp = popbuf(bp, WNONE)) == NULL) -+ return (FALSE); -+ curbp = bp; -+ compile_win = curwp = wp; -+ return (TRUE); -+} -+ -+/* ARGSUSED */ -+int -+compile(int f, int n) -+{ -+ char cprompt[NFILEN], *bufp; -+ struct buffer *bp; -+ struct mgwin *wp; -+ -+ (void)strlcpy(cprompt, compile_last_command, sizeof(cprompt)); -+ if ((bufp = eread("Compile command: ", cprompt, NFILEN, -+ EFDEF | EFNEW | EFCR)) == NULL) -+ return (ABORT); -+ else if (bufp[0] == '\0') -+ return (FALSE); -+ if (savebuffers(f, n) == ABORT) -+ return (ABORT); -+ (void)strlcpy(compile_last_command, bufp, sizeof(compile_last_command)); -+ -+ if ((bp = compile_mode("*compile*", cprompt)) == NULL) -+ return (FALSE); -+ if ((wp = popbuf(bp, WNONE)) == NULL) -+ return (FALSE); -+ curbp = bp; -+ compile_win = curwp = wp; -+ gotoline(FFARG, 0); -+ return (TRUE); -+} -+ -+/* id-utils foo. */ -+/* ARGSUSED */ -+static int -+gid(int f, int n) -+{ -+ char command[NFILEN]; -+ char cprompt[NFILEN], *bufp; -+ int c; -+ struct buffer *bp; -+ struct mgwin *wp; -+ int i, j, len; -+ -+ /* catch ([^\s(){}]+)[\s(){}]* */ -+ -+ i = curwp->w_doto; -+ /* Skip backwards over delimiters we are currently on */ -+ while (i > 0) { -+ c = lgetc(curwp->w_dotp, i); -+ if (isalnum(c) || c == '_') -+ break; -+ -+ i--; -+ } -+ -+ /* Skip the symbol itself */ -+ for (; i > 0; i--) { -+ c = lgetc(curwp->w_dotp, i - 1); -+ if (!isalnum(c) && c != '_') -+ break; -+ } -+ /* Fill the symbol in cprompt[] */ -+ for (j = 0; j < sizeof(cprompt) - 1 && i < llength(curwp->w_dotp); -+ j++, i++) { -+ c = lgetc(curwp->w_dotp, i); -+ if (!isalnum(c) && c != '_') -+ break; -+ cprompt[j] = c; -+ } -+ cprompt[j] = '\0'; -+ -+ if ((bufp = eread("Run gid (with args): ", cprompt, NFILEN, -+ (j ? EFDEF : 0) | EFNEW | EFCR)) == NULL) -+ return (ABORT); -+ else if (bufp[0] == '\0') -+ return (FALSE); -+ len = snprintf(command, sizeof(command), "gid %s", cprompt); -+ if (len < 0 || len >= sizeof(command)) -+ return (FALSE); -+ -+ if ((bp = compile_mode("*gid*", command)) == NULL) -+ return (FALSE); -+ if ((wp = popbuf(bp, WNONE)) == NULL) -+ return (FALSE); -+ curbp = bp; -+ compile_win = curwp = wp; -+ return (TRUE); -+} -+ -+struct buffer * -+compile_mode(const char *name, const char *command) -+{ -+ struct buffer *bp; -+ FILE *fpipe; -+ char *buf; -+ size_t sz; -+ ssize_t len; -+ int ret, n, status; -+ char cwd[NFILEN], qcmd[NFILEN]; -+ char timestr[NTIME]; -+ time_t t; -+ -+ buf = NULL; -+ sz = 0; -+ -+ n = snprintf(qcmd, sizeof(qcmd), "%s 2>&1", command); -+ if (n < 0 || n >= sizeof(qcmd)) -+ return (NULL); -+ -+ bp = bfind(name, TRUE); -+ if (bclear(bp) != TRUE) -+ return (NULL); -+ -+ if (getbufcwd(bp->b_cwd, sizeof(bp->b_cwd)) != TRUE) -+ return (NULL); -+ addlinef(bp, "cd %s", bp->b_cwd); -+ addline(bp, qcmd); -+ addline(bp, ""); -+ -+ if (getcwd(cwd, sizeof(cwd)) == NULL) -+ panic("Can't get current directory!"); -+ if (chdir(bp->b_cwd) == -1) { -+ dobeep(); -+ ewprintf("Can't change dir to %s", bp->b_cwd); -+ return (NULL); -+ } -+ if ((fpipe = popen(qcmd, "r")) == NULL) { -+ dobeep(); -+ ewprintf("Problem opening pipe"); -+ return (NULL); -+ } -+ while ((len = getline(&buf, &sz, fpipe)) != -1) { -+ if (buf[len - 1] == '\n') -+ buf[len - 1] = '\0'; -+ addline(bp, buf); -+ } -+ free(buf); -+ if (ferror(fpipe)) -+ ewprintf("Problem reading pipe"); -+ ret = pclose(fpipe); -+ t = time(NULL); -+ strftime(timestr, sizeof(timestr), "%a %b %e %T %Y", localtime(&t)); -+ addline(bp, ""); -+ if (WIFEXITED(ret)) { -+ status = WEXITSTATUS(ret); -+ if (status == 0) -+ addlinef(bp, "Command finished at %s", timestr); -+ else -+ addlinef(bp, "Command exited abnormally with code %d " -+ "at %s", status, timestr); -+ } else -+ addlinef(bp, "Subshell killed by signal %d at %s", -+ WTERMSIG(ret), timestr); -+ -+ bp->b_dotp = bfirstlp(bp); -+ bp->b_modes[0] = name_mode("fundamental"); -+ bp->b_modes[1] = name_mode("compile"); -+ bp->b_nmodes = 1; -+ -+ compile_buffer = bp; -+ -+ if (chdir(cwd) == -1) { -+ dobeep(); -+ ewprintf("Can't change dir back to %s", cwd); -+ return (NULL); -+ } -+ return (bp); -+} -+ -+/* ARGSUSED */ -+static int -+compile_goto_error(int f, int n) -+{ -+ struct buffer *bp; -+ struct mgwin *wp; -+ char *fname, *line, *lp, *ln; -+ int lineno; -+ char *adjf, path[NFILEN]; -+ const char *errstr; -+ struct line *last; -+ -+ compile_win = curwp; -+ compile_buffer = curbp; -+ last = blastlp(compile_buffer); -+ -+ retry: -+ /* last line is compilation result */ -+ if (curwp->w_dotp == last) -+ return (FALSE); -+ -+ if ((line = linetostr(curwp->w_dotp)) == NULL) -+ return (FALSE); -+ lp = line; -+ if ((fname = strsep(&lp, ":")) == NULL || *fname == '\0') -+ goto fail; -+ if ((ln = strsep(&lp, ":")) == NULL || *ln == '\0') -+ goto fail; -+ lineno = (int)strtonum(ln, INT_MIN, INT_MAX, &errstr); -+ if (errstr) -+ goto fail; -+ -+ if (fname && fname[0] != '/') { -+ if (getbufcwd(path, sizeof(path)) == FALSE) -+ goto fail; -+ if (strlcat(path, fname, sizeof(path)) >= sizeof(path)) -+ goto fail; -+ adjf = path; -+ } else { -+ adjf = adjustname(fname, TRUE); -+ } -+ free(line); -+ -+ if (adjf == NULL) -+ return (FALSE); -+ -+ if ((bp = findbuffer(adjf)) == NULL) -+ return (FALSE); -+ if ((wp = popbuf(bp, WNONE)) == NULL) -+ return (FALSE); -+ curbp = bp; -+ curwp = wp; -+ if (bp->b_fname[0] == '\0') -+ readin(adjf); -+ gotoline(FFARG, lineno); -+ return (TRUE); -+fail: -+ free(line); -+ if (curwp->w_dotp != blastlp(curbp)) { -+ curwp->w_dotp = lforw(curwp->w_dotp); -+ curwp->w_rflag |= WFMOVE; -+ goto retry; -+ } -+ dobeep(); -+ ewprintf("No more hits"); -+ return (FALSE); -+} -+ -+/* ARGSUSED */ -+int -+next_error(int f, int n) -+{ -+ if (compile_win == NULL || compile_buffer == NULL) { -+ dobeep(); -+ ewprintf("No compilation active"); -+ return (FALSE); -+ } -+ curwp = compile_win; -+ curbp = compile_buffer; -+ if (curwp->w_dotp == blastlp(curbp)) { -+ dobeep(); -+ ewprintf("No more hits"); -+ return (FALSE); -+ } -+ curwp->w_dotp = lforw(curwp->w_dotp); -+ curwp->w_rflag |= WFMOVE; -+ -+ return (compile_goto_error(f, n)); -+} -+ -+/* -+ * Since we don't have variables (we probably should) these are command -+ * processors for changing the values of mode flags. -+ */ -+/* ARGSUSED */ -+int -+globalwdtoggle(int f, int n) -+{ -+ if (f & FFARG) -+ globalwd = n > 0; -+ else -+ globalwd = !globalwd; -+ -+ sgarbf = TRUE; -+ -+ return (TRUE); -+} diff -Naur a/main.c b/main.c --- a/main.c 2020-04-20 21:09:41.000000000 +0100 -+++ b/main.c 2020-04-20 21:26:10.000000000 +0100 ++++ b/main.c 2020-04-21 19:01:59.000000000 +0100 @@ -16,6 +16,9 @@ #include #include @@ -2090,7 +250,7 @@ diff -Naur a/main.c b/main.c #include "funmap.h" diff -Naur a/paragraph.c b/paragraph.c --- a/paragraph.c 2020-04-20 21:09:41.000000000 +0100 -+++ b/paragraph.c 2020-04-20 21:26:10.000000000 +0100 ++++ b/paragraph.c 2020-04-21 19:01:59.000000000 +0100 @@ -14,6 +14,9 @@ #include #include @@ -2101,512 +261,9 @@ diff -Naur a/paragraph.c b/paragraph.c #include "def.h" static int fillcol = 70; -diff -Naur a/paragraph.c.orig b/paragraph.c.orig ---- a/paragraph.c.orig 1970-01-01 01:00:00.000000000 +0100 -+++ b/paragraph.c.orig 2020-04-20 21:26:06.000000000 +0100 -@@ -0,0 +1,499 @@ -+/* $OpenBSD: paragraph.c,v 1.46 2018/11/17 09:52:34 lum Exp $ */ -+ -+/* This file is in the public domain. */ -+ -+/* -+ * Code for dealing with paragraphs and filling. Adapted from MicroEMACS 3.6 -+ * and GNU-ified by mwm@ucbvax. Several bug fixes by blarson@usc-oberon. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#include "def.h" -+ -+static int fillcol = 70; -+ -+#define MAXWORD 256 -+ -+static int findpara(void); -+static int do_gotoeop(int, int, int *); -+ -+/* -+ * Move to start of paragraph. -+ * Move backwards by line, checking from the 1st character forwards for the -+ * existence a non-space. If a non-space character is found, move to the -+ * preceding line. Keep doing this until a line with only spaces is found or -+ * the start of buffer. -+ */ -+/* ARGSUSED */ -+int -+gotobop(int f, int n) -+{ -+ int col, nospace; -+ -+ /* the other way... */ -+ if (n < 0) -+ return (gotoeop(f, -n)); -+ -+ while (n-- > 0) { -+ nospace = 0; -+ while (lback(curwp->w_dotp) != curbp->b_headp) { -+ curwp->w_doto = 0; -+ col = 0; -+ -+ while (col < llength(curwp->w_dotp) && -+ (isspace(lgetc(curwp->w_dotp, col)))) -+ col++; -+ -+ if (col >= llength(curwp->w_dotp)) { -+ if (nospace) -+ break; -+ } else -+ nospace = 1; -+ -+ curwp->w_dotline--; -+ curwp->w_dotp = lback(curwp->w_dotp); -+ } -+ } -+ /* force screen update */ -+ curwp->w_rflag |= WFMOVE; -+ return (TRUE); -+} -+ -+/* -+ * Move to end of paragraph. -+ * See comments for gotobop(). Same, but moving forwards. -+ */ -+/* ARGSUSED */ -+int -+gotoeop(int f, int n) -+{ -+ int i; -+ -+ return(do_gotoeop(f, n, &i)); -+} -+ -+int -+do_gotoeop(int f, int n, int *i) -+{ -+ int col, nospace, j = 0; -+ -+ /* the other way... */ -+ if (n < 0) -+ return (gotobop(f, -n)); -+ -+ /* for each one asked for */ -+ while (n-- > 0) { -+ *i = ++j; -+ nospace = 0; -+ while (lforw(curwp->w_dotp) != curbp->b_headp) { -+ col = 0; -+ curwp->w_doto = 0; -+ -+ while (col < llength(curwp->w_dotp) && -+ (isspace(lgetc(curwp->w_dotp, col)))) -+ col++; -+ -+ if (col >= llength(curwp->w_dotp)) { -+ if (nospace) -+ break; -+ } else -+ nospace = 1; -+ -+ curwp->w_dotp = lforw(curwp->w_dotp); -+ curwp->w_dotline++; -+ -+ } -+ } -+ /* do not continue after end of buffer */ -+ if (lforw(curwp->w_dotp) == curbp->b_headp) { -+ gotoeol(FFRAND, 1); -+ curwp->w_rflag |= WFMOVE; -+ return (FALSE); -+ } -+ -+ /* force screen update */ -+ curwp->w_rflag |= WFMOVE; -+ return (TRUE); -+} -+ -+/* -+ * Justify a paragraph. Fill the current paragraph according to the current -+ * fill column. -+ */ -+/* ARGSUSED */ -+int -+fillpara(int f, int n) -+{ -+ int c; /* current char during scan */ -+ int wordlen; /* length of current word */ -+ int clength; /* position on line during fill */ -+ int i; /* index during word copy */ -+ int eopflag; /* Are we at the End-Of-Paragraph? */ -+ int firstflag; /* first word? (needs no space) */ -+ int newlength; /* tentative new line length */ -+ int eolflag; /* was at end of line */ -+ int retval; /* return value */ -+ struct line *eopline; /* pointer to line just past EOP */ -+ char wbuf[MAXWORD]; /* buffer for current word */ -+ -+ if (n == 0) -+ return (TRUE); -+ -+ undo_boundary_enable(FFRAND, 0); -+ -+ /* record the pointer to the line just past the EOP */ -+ (void)gotoeop(FFRAND, 1); -+ if (curwp->w_doto != 0) { -+ /* paragraph ends at end of buffer */ -+ (void)lnewline(); -+ eopline = lforw(curwp->w_dotp); -+ } else -+ eopline = curwp->w_dotp; -+ -+ /* and back top the beginning of the paragraph */ -+ (void)gotobop(FFRAND, 1); -+ -+ /* initialize various info */ -+ while (inword() == 0 && forwchar(FFRAND, 1)); -+ -+ clength = curwp->w_doto; -+ wordlen = 0; -+ -+ /* scan through lines, filling words */ -+ firstflag = TRUE; -+ eopflag = FALSE; -+ while (!eopflag) { -+ -+ /* get the next character in the paragraph */ -+ if ((eolflag = (curwp->w_doto == llength(curwp->w_dotp)))) { -+ c = ' '; -+ if (lforw(curwp->w_dotp) == eopline) -+ eopflag = TRUE; -+ } else -+ c = lgetc(curwp->w_dotp, curwp->w_doto); -+ -+ /* and then delete it */ -+ if (ldelete((RSIZE) 1, KNONE) == FALSE && !eopflag) { -+ retval = FALSE; -+ goto cleanup; -+ } -+ -+ /* if not a separator, just add it in */ -+ if (c != ' ' && c != '\t') { -+ if (wordlen < MAXWORD - 1) -+ wbuf[wordlen++] = c; -+ else { -+ /* -+ * You lose chars beyond MAXWORD if the word -+ * is too long. I'm too lazy to fix it now; it -+ * just silently truncated the word before, -+ * so I get to feel smug. -+ */ -+ ewprintf("Word too long!"); -+ } -+ } else if (wordlen) { -+ -+ /* calculate tentative new length with word added */ -+ newlength = clength + 1 + wordlen; -+ -+ /* -+ * if at end of line or at doublespace and previous -+ * character was one of '.','?','!' doublespace here. -+ * behave the same way if a ')' is preceded by a -+ * [.?!] and followed by a doublespace. -+ */ -+ if (dblspace && (!eopflag && ((eolflag || -+ curwp->w_doto == llength(curwp->w_dotp) || -+ (c = lgetc(curwp->w_dotp, curwp->w_doto)) == ' ' -+ || c == '\t') && (ISEOSP(wbuf[wordlen - 1]) || -+ (wbuf[wordlen - 1] == ')' && wordlen >= 2 && -+ ISEOSP(wbuf[wordlen - 2])))) && -+ wordlen < MAXWORD - 1)) -+ wbuf[wordlen++] = ' '; -+ -+ /* at a word break with a word waiting */ -+ if (newlength <= fillcol) { -+ /* add word to current line */ -+ if (!firstflag) { -+ (void)linsert(1, ' '); -+ ++clength; -+ } -+ firstflag = FALSE; -+ } else { -+ if (curwp->w_doto > 0 && -+ lgetc(curwp->w_dotp, curwp->w_doto - 1) == ' ') { -+ curwp->w_doto -= 1; -+ (void)ldelete((RSIZE) 1, KNONE); -+ } -+ /* start a new line */ -+ (void)lnewline(); -+ clength = 0; -+ } -+ -+ /* and add the word in in either case */ -+ for (i = 0; i < wordlen; i++) { -+ (void)linsert(1, wbuf[i]); -+ ++clength; -+ } -+ wordlen = 0; -+ } -+ } -+ /* and add a last newline for the end of our new paragraph */ -+ (void)lnewline(); -+ -+ /* -+ * We really should wind up where we started, (which is hard to keep -+ * track of) but I think the end of the last line is better than the -+ * beginning of the blank line. -+ */ -+ (void)backchar(FFRAND, 1); -+ retval = TRUE; -+cleanup: -+ undo_boundary_enable(FFRAND, 1); -+ return (retval); -+} -+ -+/* -+ * Delete n paragraphs. Move to the beginning of the current paragraph, or if -+ * the cursor is on an empty line, move down the buffer to the first line with -+ * non-space characters. Then mark n paragraphs and delete. -+ */ -+/* ARGSUSED */ -+int -+killpara(int f, int n) -+{ -+ int lineno, status; -+ -+ if (n == 0) -+ return (TRUE); -+ -+ if (findpara() == FALSE) -+ return (TRUE); -+ -+ /* go to the beginning of the paragraph */ -+ (void)gotobop(FFRAND, 1); -+ -+ /* take a note of the line number for after deletions and set mark */ -+ lineno = curwp->w_dotline; -+ curwp->w_markp = curwp->w_dotp; -+ curwp->w_marko = curwp->w_doto; -+ -+ (void)gotoeop(FFRAND, n); -+ -+ if ((status = killregion(FFRAND, 1)) != TRUE) -+ return (status); -+ -+ curwp->w_dotline = lineno; -+ return (TRUE); -+} -+ -+/* -+ * Mark n paragraphs starting with the n'th and working our way backwards. -+ * This leaves the cursor at the beginning of the paragraph where markpara() -+ * was invoked. -+ */ -+/* ARGSUSED */ -+int -+markpara(int f, int n) -+{ -+ int i = 0; -+ -+ if (n == 0) -+ return (TRUE); -+ -+ clearmark(FFARG, 0); -+ -+ if (findpara() == FALSE) -+ return (TRUE); -+ -+ (void)do_gotoeop(FFRAND, n, &i); -+ -+ /* set the mark here */ -+ curwp->w_markp = curwp->w_dotp; -+ curwp->w_marko = curwp->w_doto; -+ -+ (void)gotobop(FFRAND, i); -+ -+ return (TRUE); -+} -+ -+/* -+ * Transpose the current paragraph with the following paragraph. If invoked -+ * multiple times, transpose to the n'th paragraph. If invoked between -+ * paragraphs, move to the previous paragraph, then continue. -+ */ -+/* ARGSUSED */ -+int -+transposepara(int f, int n) -+{ -+ int i = 0, status; -+ char flg; -+ -+ if (n == 0) -+ return (TRUE); -+ -+ undo_boundary_enable(FFRAND, 0); -+ -+ /* find a paragraph, set mark, then goto the end */ -+ gotobop(FFRAND, 1); -+ curwp->w_markp = curwp->w_dotp; -+ curwp->w_marko = curwp->w_doto; -+ (void)gotoeop(FFRAND, 1); -+ -+ /* take a note of buffer flags - we may need them */ -+ flg = curbp->b_flag; -+ -+ /* clean out kill buffer then kill region */ -+ kdelete(); -+ if ((status = killregion(FFRAND, 1)) != TRUE) -+ return (status); -+ -+ /* -+ * Now step through n paragraphs. If we reach the end of buffer, -+ * stop and paste the killed region back, then display a message. -+ */ -+ if (do_gotoeop(FFRAND, n, &i) == FALSE) { -+ ewprintf("Cannot transpose paragraph, end of buffer reached."); -+ (void)gotobop(FFRAND, i); -+ (void)yank(FFRAND, 1); -+ curbp->b_flag = flg; -+ return (FALSE); -+ } -+ (void)yank(FFRAND, 1); -+ -+ undo_boundary_enable(FFRAND, 1); -+ -+ return (TRUE); -+} -+ -+/* -+ * Go down the buffer until we find a line with non-space characters. -+ */ -+int -+findpara(void) -+{ -+ int col, nospace = 0; -+ -+ /* we move forward to find a para to mark */ -+ do { -+ curwp->w_doto = 0; -+ col = 0; -+ -+ /* check if we are on a blank line */ -+ while (col < llength(curwp->w_dotp)) { -+ if (!isspace(lgetc(curwp->w_dotp, col))) -+ nospace = 1; -+ col++; -+ } -+ if (nospace) -+ break; -+ -+ if (lforw(curwp->w_dotp) == curbp->b_headp) -+ return (FALSE); -+ -+ curwp->w_dotp = lforw(curwp->w_dotp); -+ curwp->w_dotline++; -+ } while (1); -+ -+ return (TRUE); -+} -+ -+/* -+ * Insert char with work wrap. Check to see if we're past fillcol, and if so, -+ * justify this line. As a last step, justify the line. -+ */ -+/* ARGSUSED */ -+int -+fillword(int f, int n) -+{ -+ char c; -+ int col, i, nce; -+ -+ for (i = col = 0; col <= fillcol; ++i, ++col) { -+ if (i == curwp->w_doto) -+ return selfinsert(f, n); -+ c = lgetc(curwp->w_dotp, i); -+ if (c == '\t' -+#ifdef NOTAB -+ && !(curbp->b_flag & BFNOTAB) -+#endif -+ ) -+ col |= 0x07; -+ else if (ISCTRL(c) != FALSE) -+ ++col; -+ } -+ if (curwp->w_doto != llength(curwp->w_dotp)) { -+ (void)selfinsert(f, n); -+ nce = llength(curwp->w_dotp) - curwp->w_doto; -+ } else -+ nce = 0; -+ curwp->w_doto = i; -+ -+ if ((c = lgetc(curwp->w_dotp, curwp->w_doto)) != ' ' && c != '\t') -+ do { -+ (void)backchar(FFRAND, 1); -+ } while ((c = lgetc(curwp->w_dotp, curwp->w_doto)) != ' ' && -+ c != '\t' && curwp->w_doto > 0); -+ -+ if (curwp->w_doto == 0) -+ do { -+ (void)forwchar(FFRAND, 1); -+ } while ((c = lgetc(curwp->w_dotp, curwp->w_doto)) != ' ' && -+ c != '\t' && curwp->w_doto < llength(curwp->w_dotp)); -+ -+ (void)delwhite(FFRAND, 1); -+ (void)lnewline(); -+ i = llength(curwp->w_dotp) - nce; -+ curwp->w_doto = i > 0 ? i : 0; -+ curwp->w_rflag |= WFMOVE; -+ if (nce == 0 && curwp->w_doto != 0) -+ return (fillword(f, n)); -+ return (TRUE); -+} -+ -+/* -+ * Set fill column to n for justify. -+ */ -+int -+setfillcol(int f, int n) -+{ -+ char buf[32], *rep; -+ const char *es; -+ int nfill; -+ -+ if ((f & FFARG) != 0) { -+ fillcol = n; -+ } else { -+ if ((rep = eread("Set fill-column: ", buf, sizeof(buf), -+ EFNEW | EFCR)) == NULL) -+ return (ABORT); -+ else if (rep[0] == '\0') -+ return (FALSE); -+ nfill = strtonum(rep, 0, INT_MAX, &es); -+ if (es != NULL) { -+ dobeep(); -+ ewprintf("Invalid fill column: %s", rep); -+ return (FALSE); -+ } -+ fillcol = nfill; -+ ewprintf("Fill column set to %d", fillcol); -+ } -+ return (TRUE); -+} -+ -+int -+sentencespace(int f, int n) -+{ -+ if (f & FFARG) -+ dblspace = n > 1; -+ else -+ dblspace = !dblspace; -+ -+ return (TRUE); -+} diff -Naur a/reallocarray.c b/reallocarray.c --- a/reallocarray.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/reallocarray.c 2020-04-20 21:26:10.000000000 +0100 ++++ b/reallocarray.c 2020-04-21 19:01:59.000000000 +0100 @@ -0,0 +1,38 @@ +/* $OpenBSD: reallocarray.c,v 1.3 2015/09/13 08:31:47 guenther Exp $ */ +/* @@ -2648,7 +305,7 @@ diff -Naur a/reallocarray.c b/reallocarray.c +} diff -Naur a/strtonum.c b/strtonum.c --- a/strtonum.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/strtonum.c 2020-04-20 21:26:10.000000000 +0100 ++++ b/strtonum.c 2020-04-21 19:01:59.000000000 +0100 @@ -0,0 +1,65 @@ +/* $OpenBSD: strtonum.c,v 1.7 2013/04/17 18:40:58 tedu Exp $ */ + @@ -2717,7 +374,7 @@ diff -Naur a/strtonum.c b/strtonum.c +} diff -Naur a/tags.c b/tags.c --- a/tags.c 2020-04-20 21:09:41.000000000 +0100 -+++ b/tags.c 2020-04-20 21:26:10.000000000 +0100 ++++ b/tags.c 2020-04-21 19:01:59.000000000 +0100 @@ -8,7 +8,11 @@ #include @@ -2759,7 +416,7 @@ diff -Naur a/tags.c b/tags.c struct tagpos { diff -Naur a/tree.h b/tree.h --- a/tree.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/tree.h 2020-04-20 21:26:10.000000000 +0100 ++++ b/tree.h 2020-04-21 19:01:59.000000000 +0100 @@ -0,0 +1,1006 @@ +/* $OpenBSD: tree.h,v 1.29 2017/07/30 19:27:20 deraadt Exp $ */ +/* -- cgit v1.2.3 From 8880957042a6ce60184c7692b0e8384f7e44223d Mon Sep 17 00:00:00 2001 From: Thomas Churchman Date: Tue, 21 Apr 2020 20:59:52 +0200 Subject: nixos/phpfpm: fix erroneous pools example --- nixos/modules/services/web-servers/phpfpm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix index 3db19c781d0..d090885a8ca 100644 --- a/nixos/modules/services/web-servers/phpfpm/default.nix +++ b/nixos/modules/services/web-servers/phpfpm/default.nix @@ -209,14 +209,14 @@ in { user = "php"; group = "php"; phpPackage = pkgs.php; - settings = ''' + settings = { "pm" = "dynamic"; "pm.max_children" = 75; "pm.start_servers" = 10; "pm.min_spare_servers" = 5; "pm.max_spare_servers" = 20; "pm.max_requests" = 500; - '''; + }; } }''; description = '' -- cgit v1.2.3 From dd4b089b3a24c57e17022fcb90bfc6ade5e98915 Mon Sep 17 00:00:00 2001 From: Christoph Bauer Date: Tue, 21 Apr 2020 21:10:27 +0200 Subject: pwsafe 1.09.0 -> 3.52.0 --- pkgs/applications/misc/pwsafe/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix index 91845abc8b2..43197c6bf27 100644 --- a/pkgs/applications/misc/pwsafe/default.nix +++ b/pkgs/applications/misc/pwsafe/default.nix @@ -1,25 +1,25 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, zip, gettext, perl -, wxGTK30, libXext, libXi, libXt, libXtst, xercesc +, wxGTK31, libXext, libXi, libXt, libXtst, xercesc , qrencode, libuuid, libyubikey, yubikey-personalization , curl, openssl, file }: stdenv.mkDerivation rec { pname = "pwsafe"; - version = "1.09.0"; + version = "3.52.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "${version}"; - sha256 = "0dmazm95d53wq74qvsjvhl7r6fr4dv11nzf8sgdy47nyxv06xs1b"; + sha256 = "1ka7xsl63v0559fzf3pwc1iqr37gwr4vq5iaxa2hzar2g28hsxvh"; }; nativeBuildInputs = [ cmake gettext perl pkgconfig zip ]; buildInputs = [ - libXext libXi libXt libXtst wxGTK30 + libXext libXi libXt libXtst wxGTK31 curl qrencode libuuid openssl xercesc libyubikey yubikey-personalization file -- cgit v1.2.3 From 1f12a0717959a2ff5d049c38a24ea9907f42d16c Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 21 Apr 2020 15:26:25 -0400 Subject: installation-cd-graphical-gnome: don't run xorg default If for some reason the Wayland session fails to start it will just start the Xorg session. --- nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix index 84394a1ecae..3707c4b7ec6 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix @@ -11,9 +11,6 @@ with lib; services.xserver.desktopManager.gnome3.enable = true; - # Wayland can be problematic for some hardware like Nvidia graphics cards. - services.xserver.displayManager.defaultSession = "gnome-xorg"; - services.xserver.displayManager.gdm = { enable = true; # autoSuspend makes the machine automatically suspend after inactivity. -- cgit v1.2.3 From fe5117d05e5c3361c4902dd7050ced3bb6784601 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 21 Apr 2020 21:21:25 +0200 Subject: quiterss: 0.19.3 -> 0.19.4 --- pkgs/applications/networking/newsreaders/quiterss/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix index 6fa4dc19799..1cc4be8cb27 100644 --- a/pkgs/applications/networking/newsreaders/quiterss/default.nix +++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, qmake, pkgconfig, wrapQtAppsHook +{ stdenv, fetchFromGitHub, qmake, pkg-config, wrapQtAppsHook , qtbase, qttools, qtwebkit, sqlite }: stdenv.mkDerivation rec { pname = "quiterss"; - version = "0.19.3"; + version = "0.19.4"; src = fetchFromGitHub { owner = "QuiteRSS"; repo = "quiterss"; rev = version; - sha256 = "06m5mhzxvv8q2adaqcrar3sx2c1hc89h2i0qfjxmirfc5z67hdw2"; + sha256 = "1cgvl67vhn5y7bj5gbjbgk26bhb0196bgrgsp3r5fmrislarj8s6"; }; - nativeBuildInputs = [ qmake pkgconfig wrapQtAppsHook ]; + nativeBuildInputs = [ qmake pkg-config wrapQtAppsHook ]; buildInputs = [ qtbase qttools qtwebkit sqlite.dev ]; meta = with stdenv.lib; { @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { written on Qt/C++ ''; homepage = "https://quiterss.org"; + changelog = "https://github.com/QuiteRSS/quiterss/blob/${version}/CHANGELOG"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; -- cgit v1.2.3 From 37e146c2551d02c454c2b5bc607d59f59664c46c Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 21 Apr 2020 15:43:20 -0400 Subject: nixos/manual: fix build --- nixos/doc/manual/release-notes/rl-2009.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 21da575cad3..c800cbc75a5 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -273,6 +273,7 @@ environment.systemPackages = [ 1000 to 10000 to follow the new upstream systemd default. + The notmuch package move its emacs-related binaries and -- cgit v1.2.3 From 6464d8f4af68f51d42aeb70e43692ef3940345cd Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 21 Apr 2020 15:35:32 -0400 Subject: nixos/release: add GNOME ISO --- nixos/release-combined.nix | 1 + nixos/release.nix | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index f4f99e71a90..08059ba7595 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -50,6 +50,7 @@ in rec { (onFullSupported "nixos.dummy") (onAllSupported "nixos.iso_minimal") (onSystems ["x86_64-linux"] "nixos.iso_plasma5") + (onSystems ["x86_64-linux"] "nixos.iso_gnome") (onFullSupported "nixos.manual") (onSystems ["x86_64-linux"] "nixos.ova") (onSystems ["aarch64-linux"] "nixos.sd_image") diff --git a/nixos/release.nix b/nixos/release.nix index 6107f352971..d31fbd11e5c 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -155,6 +155,12 @@ in rec { inherit system; }); + iso_gnome = forMatchingSystems [ "x86_64-linux" ] (system: makeIso { + module = ./modules/installer/cd-dvd/installation-cd-graphical-gnome.nix; + type = "gnome"; + inherit system; + }); + # A variant with a more recent (but possibly less stable) kernel # that might support more hardware. iso_minimal_new_kernel = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: makeIso { -- cgit v1.2.3 From 873f20f63e4ae008aa27ad9068bbeab98617177d Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 21 Apr 2020 15:46:20 -0400 Subject: rl-2009: GNOME ISO --- nixos/doc/manual/release-notes/rl-2009.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index c800cbc75a5..e886091d53b 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -26,6 +26,11 @@ GNOME desktop environment was upgraded to 3.36, see its release notes. + + + We now distribute a GNOME ISO. + + PHP now defaults to PHP 7.4, updated from 7.3. -- cgit v1.2.3 From e074301be894c208f2c3eff7812dc89cb83dee61 Mon Sep 17 00:00:00 2001 From: kraem Date: Tue, 21 Apr 2020 21:58:03 +0200 Subject: linux: 4.19.116 -> 4.19.117 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index cdb19fd54ab..6ff9919e192 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.116"; + version = "4.19.117"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0r3vdc3npl1bn06w9v6wsq7d5mm7bnhm9wsz36pb9ar3xhimvrlf"; + sha256 = "12xc1pwhwq4vp67hmn7hdynl4ik76cni79356hpzf1lbiqlrya6n"; }; } // (args.argsOverride or {})) -- cgit v1.2.3 From 18c2b5a9aa262e65e0fecdb8c323a363a7787980 Mon Sep 17 00:00:00 2001 From: kraem Date: Tue, 21 Apr 2020 21:58:45 +0200 Subject: linux: 5.4.33 -> 5.4.34 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index b2de6ea8689..69519a156fe 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.33"; + version = "5.4.34"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0q9q48ij6vppfcrdf7fr24pvpwsd13pxjkdni6rnjq9a60hrcmxm"; + sha256 = "1ljcsrw9jknw2d9hb0yfr1pwy85l8z4rqycgd0kad9mb9lrw2glh"; }; } // (args.argsOverride or {})) -- cgit v1.2.3 From 1e23dcbf224d256c2455937c9e3a06df633ba798 Mon Sep 17 00:00:00 2001 From: kraem Date: Tue, 21 Apr 2020 21:59:22 +0200 Subject: linux: 5.5.18 -> 5.5.19 --- pkgs/os-specific/linux/kernel/linux-5.5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.5.nix b/pkgs/os-specific/linux/kernel/linux-5.5.nix index ecb92b5bfe7..96a349d985c 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.5.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.5.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.5.18"; + version = "5.5.19"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "01iiiq4dsyyc5y6b52wax9as6dzhdi172vd1423sc1yp4rrk8178"; + sha256 = "1sqiw9d25sqqzdh04dd722i7ff6kchj869jp4l8zalpvf51k6j0l"; }; } // (args.argsOverride or {})) -- cgit v1.2.3 From c9cf25bc617492b7b3907768d80bda32d7f5d917 Mon Sep 17 00:00:00 2001 From: kraem Date: Tue, 21 Apr 2020 21:59:59 +0200 Subject: linux: 5.6.5 -> 5.6.6 --- pkgs/os-specific/linux/kernel/linux-5.6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.6.nix b/pkgs/os-specific/linux/kernel/linux-5.6.nix index d3334293dc1..4ed77c98301 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.6.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.6.5"; + version = "5.6.6"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1rjjkcmzsj9azggh960qnk2x44ns475b8nbd4nxazrz1rgdx76zp"; + sha256 = "1m3blvkma08v5y11jh0vhf4sr7jbcylkh15bssb5dgp40p8cx134"; }; } // (args.argsOverride or {})) -- cgit v1.2.3 From 0d1194704badfe656de207cd287bb3b802593ef5 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 21 Apr 2020 19:23:08 +0200 Subject: python3Packages.google_api_python_client: 1.8.0 -> 1.8.1 This contains a fix for the goobook build which would break due to this update. --- .../development/python-modules/goobook/default.nix | 3 ++ .../python-modules/goobook/fix-build.patch | 32 ++++++++++++++++++++++ .../google-api-python-client/default.nix | 14 ++++++++-- 3 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/python-modules/goobook/fix-build.patch diff --git a/pkgs/development/python-modules/goobook/default.nix b/pkgs/development/python-modules/goobook/default.nix index f8daf66c156..ac658b1940f 100644 --- a/pkgs/development/python-modules/goobook/default.nix +++ b/pkgs/development/python-modules/goobook/default.nix @@ -12,6 +12,9 @@ buildPythonPackage rec { sha256 = "089a95s6g9izsy1fzpz48p6pz0wpngcbbrvsillm1n53492gfhjg"; }; + # Required for a breaking change in google-api-python-client 1.8.1: + patches = [ ./fix-build.patch ]; + propagatedBuildInputs = [ google_api_python_client simplejson oauth2client setuptools ]; diff --git a/pkgs/development/python-modules/goobook/fix-build.patch b/pkgs/development/python-modules/goobook/fix-build.patch new file mode 100644 index 00000000000..1121dbfdcb3 --- /dev/null +++ b/pkgs/development/python-modules/goobook/fix-build.patch @@ -0,0 +1,32 @@ +From 8de09b82c5ac900317043e1c1025f431516b6788 Mon Sep 17 00:00:00 2001 +From: Michael Weiss +Date: Tue, 21 Apr 2020 21:41:04 +0200 +Subject: [PATCH] Switch from the alias apiclient to googleapiclient + +This fixes the package after a breaking change / bug in +google-api-python-client 1.8.1 (see [0] and a lot of duplicate issues). + +The module apiclient is just an alias for googleapiclient [1]. + +[0]: https://github.com/googleapis/google-api-python-client/issues/870 +[1]: https://github.com/googleapis/google-api-python-client/blob/v1.8.1/apiclient/__init__.py +--- + goobook/goobook.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/goobook/goobook.py b/goobook/goobook.py +index 5bcb0b3..a2e25e9 100755 +--- a/goobook/goobook.py ++++ b/goobook/goobook.py +@@ -31,7 +31,7 @@ import sys + import time + + import httplib2 +-from apiclient.discovery import build ++from googleapiclient.discovery import build + + from goobook.storage import Storage, storageify, unstorageify + +-- +2.26.1 + diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 2d7ae43f7f1..5f7d7dd275b 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -1,16 +1,24 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi, fetchpatch , google_auth, google-auth-httplib2, google_api_core , httplib2, six, uritemplate, oauth2client }: buildPythonPackage rec { pname = "google-api-python-client"; - version = "1.8.0"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "003rgr15r9j080f3n5y2x6ymxsfv652m3r7j83p7sbrd9shl4nqg"; + sha256 = "14d7719sxl7bqpw3k4hhfwd0l0v98lnpi7qlhdaf8jxw21ivzmpz"; }; + patches = [ + # To fix a regression/bug in 1.8.1: + (fetchpatch { + url = "https://github.com/googleapis/google-api-python-client/commit/1d8ec6874e1c6081893de7cd7cbc86d1f6580320.patch"; + sha256 = "1nr24jzvbkzaigv9c935fkpzfa36hj6k7yx5bdwxqfhpa3p9i8n9"; + }) + ]; + # No tests included in archive doCheck = false; -- cgit v1.2.3 From 15807c58ad585202c028d791d8c4d166bbf79be7 Mon Sep 17 00:00:00 2001 From: kraem Date: Tue, 21 Apr 2020 22:18:02 +0200 Subject: linux/hardened-patches/5.4.33: remove --- pkgs/os-specific/linux/kernel/hardened-patches.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened-patches.json b/pkgs/os-specific/linux/kernel/hardened-patches.json index 97fbbb405e3..e630469c999 100644 --- a/pkgs/os-specific/linux/kernel/hardened-patches.json +++ b/pkgs/os-specific/linux/kernel/hardened-patches.json @@ -9,11 +9,6 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.116.a/linux-hardened-4.19.116.a.patch", "version_suffix": "a" }, - "5.4.33": { - "sha256": "1hjfvhyvz5kyvx25809brhsvfv9mjv9q1mw6ydb71gfwhw6q8d8b", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.33.a/linux-hardened-5.4.33.a.patch", - "version_suffix": "a" - }, "5.5.18": { "sha256": "0v7vla784sf1fk6d8qa5x8hkyhjb1jkw4lxxcgvvlqbmxl8md8ld", "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.5.18.a/linux-hardened-5.5.18.a.patch", -- cgit v1.2.3 From 9ed70f4e4616edb21db19a453c5e9a588d766ca4 Mon Sep 17 00:00:00 2001 From: kraem Date: Tue, 21 Apr 2020 22:18:03 +0200 Subject: linux/hardened-patches/5.6.5: remove --- pkgs/os-specific/linux/kernel/hardened-patches.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened-patches.json b/pkgs/os-specific/linux/kernel/hardened-patches.json index e630469c999..3b43398cda1 100644 --- a/pkgs/os-specific/linux/kernel/hardened-patches.json +++ b/pkgs/os-specific/linux/kernel/hardened-patches.json @@ -13,10 +13,5 @@ "sha256": "0v7vla784sf1fk6d8qa5x8hkyhjb1jkw4lxxcgvvlqbmxl8md8ld", "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.5.18.a/linux-hardened-5.5.18.a.patch", "version_suffix": "a" - }, - "5.6.5": { - "sha256": "19cdpygm5zx3szxl456lfjg5sffqcmn18470wv7prm8rf6liqdj3", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.5.a/linux-hardened-5.6.5.a.patch", - "version_suffix": "a" } } -- cgit v1.2.3 From 8f2e9fcaddd5ad0ce602b2e767f515623bf261ae Mon Sep 17 00:00:00 2001 From: kraem Date: Tue, 21 Apr 2020 22:18:03 +0200 Subject: linux/hardened-patches/5.5.18: remove --- pkgs/os-specific/linux/kernel/hardened-patches.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened-patches.json b/pkgs/os-specific/linux/kernel/hardened-patches.json index 3b43398cda1..b225924118f 100644 --- a/pkgs/os-specific/linux/kernel/hardened-patches.json +++ b/pkgs/os-specific/linux/kernel/hardened-patches.json @@ -8,10 +8,5 @@ "sha256": "00y4i905gzs9w9kckrn1frh2vw32fsndz03g2psl1gk17snc3q7c", "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.116.a/linux-hardened-4.19.116.a.patch", "version_suffix": "a" - }, - "5.5.18": { - "sha256": "0v7vla784sf1fk6d8qa5x8hkyhjb1jkw4lxxcgvvlqbmxl8md8ld", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.5.18.a/linux-hardened-5.5.18.a.patch", - "version_suffix": "a" } } -- cgit v1.2.3 From efafc50f5caa4c632015a9c9404b0cef7a470390 Mon Sep 17 00:00:00 2001 From: kraem Date: Tue, 21 Apr 2020 22:18:03 +0200 Subject: linux/hardened-patches/4.19.116: remove --- pkgs/os-specific/linux/kernel/hardened-patches.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened-patches.json b/pkgs/os-specific/linux/kernel/hardened-patches.json index b225924118f..47c55969b10 100644 --- a/pkgs/os-specific/linux/kernel/hardened-patches.json +++ b/pkgs/os-specific/linux/kernel/hardened-patches.json @@ -3,10 +3,5 @@ "sha256": "0pr3m2j63mc746fcbzg1hlwv85im9f87qkl6r4033gwnpa9brcgk", "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.176.a/linux-hardened-4.14.176.a.patch", "version_suffix": "a" - }, - "4.19.116": { - "sha256": "00y4i905gzs9w9kckrn1frh2vw32fsndz03g2psl1gk17snc3q7c", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.116.a/linux-hardened-4.19.116.a.patch", - "version_suffix": "a" } } -- cgit v1.2.3 From c296bf71693b37dec84dea947acd09a89cdd0fc7 Mon Sep 17 00:00:00 2001 From: Nicolas Schneider Date: Tue, 21 Apr 2020 22:48:47 +0200 Subject: android-studio: add ps to closure When killing processes, android-studio uses `ps` to figure out which subprocesses to kill. Without `ps` in the closure, this fails and the process is never killed. --- pkgs/applications/editors/android-studio/common.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index 0625431462c..1a6904b2176 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -39,6 +39,7 @@ , nss , pciutils , pkgsi686Linux +, ps , setxkbmap , stdenv , systemd @@ -89,6 +90,7 @@ let # Runtime stuff git + ps ]}" \ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ -- cgit v1.2.3 From 5d4162e9f99bda75a019df82158ef76b0f75faf3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 15 Apr 2020 14:00:51 -0700 Subject: python3Packages.dotnetcore2: 2.1.11 -> 2.1.13 instead of installing only what's needed, remove extraneous executable --- pkgs/development/python-modules/dotnetcore2/default.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/dotnetcore2/default.nix b/pkgs/development/python-modules/dotnetcore2/default.nix index 4d3edf0906a..eeb962a845f 100644 --- a/pkgs/development/python-modules/dotnetcore2/default.nix +++ b/pkgs/development/python-modules/dotnetcore2/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "dotnetcore2"; - version = "2.1.11"; + version = "2.1.13"; format = "wheel"; disabled = isPy27; @@ -15,7 +15,7 @@ buildPythonPackage rec { inherit pname version format; python = "py3"; platform = "manylinux1_x86_64"; - sha256 = "0qhp94bjz4icz2f0fnhgck875chiqzy4lvsp6lwhj5jd0zsv2bb3"; + sha256 = "1fbg3pn7g0a6pg0gb5vaapcc3cdp6wfnliim57fn3cnzmx5d8p6i"; }; nativeBuildInputs = [ unzip ]; @@ -35,13 +35,9 @@ buildPythonPackage rec { ) ]; - # unfortunately the noraml pip install fails because the manylinux1 format check fails with NixOS - installPhase = '' - mkdir -p $out/${python.sitePackages}/${pname} - # copy metadata - cp -r dotnetcore2-2* $out/${python.sitePackages} - # copy non-dotnetcore related files - cp -r dotnetcore2/{__init__.py,runtime.py} $out/${python.sitePackages}/${pname} + # prevent exposing a broken dotnet executable + postInstall = '' + rm -r $out/${python.sitePackages}/${pname}/bin ''; # no tests, ensure it's one useful function works -- cgit v1.2.3 From 347e2512613b08d68909226f2f23763e818857d0 Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Tue, 21 Apr 2020 23:43:37 +0200 Subject: nixos/xonsh: source NixOS environment Without doing that, xonsh is unusable as login shell --- nixos/modules/programs/xonsh.nix | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/nixos/modules/programs/xonsh.nix b/nixos/modules/programs/xonsh.nix index 1590020f7b6..c06fd1655c2 100644 --- a/nixos/modules/programs/xonsh.nix +++ b/nixos/modules/programs/xonsh.nix @@ -45,7 +45,32 @@ in config = mkIf cfg.enable { - environment.etc.xonshrc.text = cfg.config; + environment.etc.xonshrc.text = '' + # /etc/xonshrc: DO NOT EDIT -- this file has been generated automatically. + + + if not ''${...}.get('__NIXOS_SET_ENVIRONMENT_DONE'): + # The NixOS environment and thereby also $PATH + # haven't been fully set up at this point. But + # `source-bash` below requires `bash` to be on $PATH, + # so add an entry with bash's location: + $PATH.add('${pkgs.bash}/bin') + + # Stash xonsh's ls alias, so that we don't get a collision + # with Bash's ls alias from environment.shellAliases: + _ls_alias = aliases.pop('ls', None) + + # Source the NixOS environment config. + source-bash "${config.system.build.setEnvironment}" + + # Restore xonsh's ls alias, overriding that from Bash (if any). + if _ls_alias is not None: + aliases['ls'] = _ls_alias + del _ls_alias + + + ${cfg.config} + ''; environment.systemPackages = [ cfg.package ]; -- cgit v1.2.3 From 3dbd3f26517b4bc2e1bf908f2b6ffa479863fdcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Thu, 16 Apr 2020 13:38:15 +0200 Subject: rl-2003: Update the release documentation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It currently says that everything will be backward compatible between lego and simp-le certificates, but it’s not. (cherry picked from commit 21c4a33ceef77dec2b821f7164e13971862d5575) --- nixos/doc/manual/release-notes/rl-2003.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index b0940391b56..62251e0b25b 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -1145,9 +1145,11 @@ systemd.services.nginx.serviceConfig.User = lib.mkForce "root"; As well as this, the options security.acme.acceptTerms and either security.acme.email or security.acme.certs.<name>.email must be set in order to use the ACME module. - Certificates will be regenerated anew on the next renewal date. The credentials for simp-le are - preserved and thus it is possible to roll back to previous versions without breaking certificate - generation. + Certificates will be regenerated on activation, no account or certificate will be migrated from simp-le. + In particular private keys will not be preserved. However, the credentials for simp-le are preserved and + thus it is possible to roll back to previous versions without breaking certificate generation. + Note also that in contrary to simp-le a new private key is recreated at each renewal by default, which can + have consequences if you embed your public key in apps. -- cgit v1.2.3 From 6a7e0562de61e30c7f3e495fe9c9a7dd9d522e80 Mon Sep 17 00:00:00 2001 From: davidak Date: Wed, 22 Apr 2020 00:16:22 +0200 Subject: Update link in /etc/os-release (#85723) --- nixos/modules/misc/version.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index ae98fba1580..a6fffb76f6e 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -109,8 +109,8 @@ in PRETTY_NAME="NixOS ${cfg.release} (${cfg.codeName})" LOGO="nix-snowflake" HOME_URL="https://nixos.org/" - DOCUMENTATION_URL="https://nixos.org/nixos/manual/index.html" - SUPPORT_URL="https://nixos.org/nixos/support.html" + DOCUMENTATION_URL="https://nixos.org/learn.html" + SUPPORT_URL="https://nixos.org/community.html" BUG_REPORT_URL="https://github.com/NixOS/nixpkgs/issues" ''; -- cgit v1.2.3 From dc4547f498cf81d341b06d45bfb0436a523abe8d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 21 Apr 2020 18:00:00 -0500 Subject: lxd: 4.0.0 -> 4.0.1 --- pkgs/tools/admin/lxd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index f85a61be4a8..19fbff747fc 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -9,13 +9,13 @@ buildGoPackage rec { pname = "lxd"; - version = "4.0.0"; + version = "4.0.1"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "00kydp6aysggng9a7m0q3zj3591yk6jgcibbqxx4ki20pd4vmqnb"; + sha256 = "0sxkyjayn7yyiy9kvbdlpkl58lwsl2rhlxnncg628f2kad2zgkdx"; }; preBuild = '' -- cgit v1.2.3 From 4cc383dd9ad39559d7e015d7116944523906cfd2 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves <2335822+alexfmpe@users.noreply.github.com> Date: Wed, 22 Apr 2020 00:02:11 +0100 Subject: Fix typos (#85693) --- nixos/doc/manual/release-notes/rl-2003.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml index 62251e0b25b..393a9286ca4 100644 --- a/nixos/doc/manual/release-notes/rl-2003.xml +++ b/nixos/doc/manual/release-notes/rl-2003.xml @@ -935,8 +935,8 @@ services.dnsmasq.servers = [ "127.0.0.1#43" ]; - Haskell env and shellFor dev shell environments now organized dependencies the same way as regular builds. - In particular, rather than receiving all the different lists of dependencies master together as one big lists, and then partitioning into Haskell and non-Hakell dependencies, they work from the original many different dependency parameters and don't need to algorithmically partition anything. + Haskell env and shellFor dev shell environments now organize dependencies the same way as regular builds. + In particular, rather than receiving all the different lists of dependencies mashed together as one big list, and then partitioning into Haskell and non-Hakell dependencies, they work from the original many different dependency parameters and don't need to algorithmically partition anything. This means that if you incorrectly categorize a dependency, e.g. non-Haskell library dependency as a buildDepends or run-time Haskell dependency as a setupDepends, whereas things would have worked before they may not work now. -- cgit v1.2.3 From c0c8dcd828921ef71074dc553fb955bc291fdbed Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 19 Apr 2020 16:40:30 +0200 Subject: pythonPackages.pulsectl: init at 20.4.3 --- .../python-modules/pulsectl/default.nix | 31 ++++++++++++++++++++++ .../python-modules/pulsectl/library-paths.patch | 22 +++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 55 insertions(+) create mode 100644 pkgs/development/python-modules/pulsectl/default.nix create mode 100644 pkgs/development/python-modules/pulsectl/library-paths.patch diff --git a/pkgs/development/python-modules/pulsectl/default.nix b/pkgs/development/python-modules/pulsectl/default.nix new file mode 100644 index 00000000000..dec80abda15 --- /dev/null +++ b/pkgs/development/python-modules/pulsectl/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi, libpulseaudio, glibc, substituteAll, stdenv, pulseaudio, python }: + +buildPythonPackage rec { + pname = "pulsectl"; + version = "20.4.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "1m5fz740r4rk2i8qsnblsn16hai7givqxbx21swhpflan1yzvzzm"; + }; + + patches = [ + (substituteAll { + src = ./library-paths.patch; + libpulse = "${libpulseaudio.out}/lib/libpulse${stdenv.hostPlatform.extensions.sharedLibrary}"; + librt = "${glibc.out}/lib/librt${stdenv.hostPlatform.extensions.sharedLibrary}"; + }) + ]; + + checkInputs = [ pulseaudio ]; + checkPhase = '' + ${python.interpreter} -m unittest pulsectl.tests.all + ''; + + meta = with lib; { + description = "Python high-level interface and ctypes-based bindings for PulseAudio (libpulse)"; + homepage = "https://pypi.python.org/pypi/pulsectl/"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/pulsectl/library-paths.patch b/pkgs/development/python-modules/pulsectl/library-paths.patch new file mode 100644 index 00000000000..5840e515258 --- /dev/null +++ b/pkgs/development/python-modules/pulsectl/library-paths.patch @@ -0,0 +1,22 @@ +diff --git a/pulsectl/_pulsectl.py b/pulsectl/_pulsectl.py +index 4422ddf..3fb2f39 100644 +--- a/pulsectl/_pulsectl.py ++++ b/pulsectl/_pulsectl.py +@@ -31,7 +31,7 @@ else: + if not hasattr(mono_time, 'ts'): + class timespec(Structure): + _fields_ = [('tv_sec', c_long), ('tv_nsec', c_long)] +- librt = CDLL('librt.so.1', use_errno=True) ++ librt = CDLL('@librt@', use_errno=True) + mono_time.get = librt.clock_gettime + mono_time.get.argtypes = [c_int, POINTER(timespec)] + mono_time.ts = timespec +@@ -625,7 +625,7 @@ class LibPulse(object): + + + def __init__(self): +- p = CDLL(ctypes.util.find_library('libpulse') or 'libpulse.so.0') ++ p = CDLL('@libpulse@') + + self.funcs = dict() + for k, spec in self.func_defs.items(): diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cb5cbb5375a..0dc2f1ea1d9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1063,6 +1063,8 @@ in { proglog = callPackage ../development/python-modules/proglog { }; + pulsectl = callPackage ../development/python-modules/pulsectl { }; + pure-python-adb-homeassistant = callPackage ../development/python-modules/pure-python-adb-homeassistant { }; purl = callPackage ../development/python-modules/purl { }; -- cgit v1.2.3 From a2df9776f0eec102b67330047e4ed97ce806065d Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 22 Apr 2020 01:16:07 +0200 Subject: chromium: 81.0.4044.113 -> 81.0.4044.122 https://chromereleases.googleblog.com/2020/04/stable-channel-update-for-desktop_21.html This update includes 8 security fixes. CVEs: CVE-2020-6459 CVE-2020-6460 CVE-2020-645 --- pkgs/applications/networking/browsers/chromium/upstream-info.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index cf542faa8a1..77505b47d85 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -11,8 +11,8 @@ version = "84.0.4115.5"; }; stable = { - sha256 = "0hsxxw7fm1p8g53msqb644v8vr4cpvjmpln444c2268rm43yik17"; - sha256bin64 = "0ap7flrw3h885454fa2r7psa4sh8567ql7v7x96q11gh9gjrdvp3"; - version = "81.0.4044.113"; + sha256 = "0ahqh3vmzbpai4xwn7qybgw9phc8ssjdvfc7384mxqk9swqgv7qg"; + sha256bin64 = "0gpgim244594m35qwf625blwdqgjbp4qr846wq75a9a9zqwqs05w"; + version = "81.0.4044.122"; }; } -- cgit v1.2.3 From 1d0aae0bc9b206e5ce89587810d1e467cb1d7f2a Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Tue, 21 Apr 2020 12:00:00 +0000 Subject: python3Packages.matrix-nio: 0.9.0 -> 0.10.0 --- pkgs/development/python-modules/matrix-nio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index 9320efc91a2..be1cf218d71 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -20,13 +20,13 @@ buildPythonPackage rec { pname = "nio"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "poljar"; repo = "matrix-nio"; rev = version; - sha256 = "0gqhk9d06w1in6dj7aqy45skzyg8018nmclqd5r0m5nnw8yns6gz"; + sha256 = "04ryf9lrm0820hqij46hav6mgplabnyl9dfj46iwvxasn06fh2j8"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 5bc177339098ebbfd7b7bcf92787b81a965e350c Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Tue, 21 Apr 2020 12:00:00 +0000 Subject: python3Packages.matrix-nio: add symphorien as maintainer --- pkgs/development/python-modules/matrix-nio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/matrix-nio/default.nix b/pkgs/development/python-modules/matrix-nio/default.nix index be1cf218d71..ff4f6198aa5 100644 --- a/pkgs/development/python-modules/matrix-nio/default.nix +++ b/pkgs/development/python-modules/matrix-nio/default.nix @@ -56,6 +56,6 @@ buildPythonPackage rec { description = "A Python Matrix client library, designed according to sans I/O principles"; homepage = "https://github.com/poljar/matrix-nio"; license = licenses.isc; - maintainers = with maintainers; [ tilpner emily ]; + maintainers = with maintainers; [ tilpner emily symphorien ]; }; } -- cgit v1.2.3 From c8b5e3776436b3156415366522c2e3e1a38bf874 Mon Sep 17 00:00:00 2001 From: kraem Date: Wed, 22 Apr 2020 02:12:17 +0200 Subject: linux/hardened-patches/5.6.6: init at 5.6.6.a --- pkgs/os-specific/linux/kernel/hardened-patches.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/hardened-patches.json b/pkgs/os-specific/linux/kernel/hardened-patches.json index 47c55969b10..314ad1017ef 100644 --- a/pkgs/os-specific/linux/kernel/hardened-patches.json +++ b/pkgs/os-specific/linux/kernel/hardened-patches.json @@ -3,5 +3,10 @@ "sha256": "0pr3m2j63mc746fcbzg1hlwv85im9f87qkl6r4033gwnpa9brcgk", "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.176.a/linux-hardened-4.14.176.a.patch", "version_suffix": "a" + }, + "5.6.6": { + "sha256": "0jiqh0frxirjbccgfdk007fca6r6n36n0pkqq4jszkckn59ayl7r", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.6.a/linux-hardened-5.6.6.a.patch", + "version_suffix": "a" } } -- cgit v1.2.3 From 3c81b3df4e07a67cc6f2eb2677f507617a3f33a3 Mon Sep 17 00:00:00 2001 From: kraem Date: Wed, 22 Apr 2020 02:12:21 +0200 Subject: linux/hardened-patches/5.5.19: init at 5.5.19.a --- pkgs/os-specific/linux/kernel/hardened-patches.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/hardened-patches.json b/pkgs/os-specific/linux/kernel/hardened-patches.json index 314ad1017ef..f72421e310d 100644 --- a/pkgs/os-specific/linux/kernel/hardened-patches.json +++ b/pkgs/os-specific/linux/kernel/hardened-patches.json @@ -4,6 +4,11 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.176.a/linux-hardened-4.14.176.a.patch", "version_suffix": "a" }, + "5.5.19": { + "sha256": "1ya5nsfhr3nwz6qiz4pdhvm6k9mx1kr0prhdvhx3p40f1vk281sc", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.5.19.a/linux-hardened-5.5.19.a.patch", + "version_suffix": "a" + }, "5.6.6": { "sha256": "0jiqh0frxirjbccgfdk007fca6r6n36n0pkqq4jszkckn59ayl7r", "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.6.a/linux-hardened-5.6.6.a.patch", -- cgit v1.2.3 From 99f30a5635e0b76ce4faa92354ebb594368c09c0 Mon Sep 17 00:00:00 2001 From: kraem Date: Wed, 22 Apr 2020 02:12:25 +0200 Subject: linux/hardened-patches/5.4.34: init at 5.4.34.a --- pkgs/os-specific/linux/kernel/hardened-patches.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/hardened-patches.json b/pkgs/os-specific/linux/kernel/hardened-patches.json index f72421e310d..689f3d67260 100644 --- a/pkgs/os-specific/linux/kernel/hardened-patches.json +++ b/pkgs/os-specific/linux/kernel/hardened-patches.json @@ -4,6 +4,11 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.176.a/linux-hardened-4.14.176.a.patch", "version_suffix": "a" }, + "5.4.34": { + "sha256": "1xwpqr9nzpjg837b3wnzb8fmrl2g9rz8gz5yb55vnnllbzbz36v6", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.34.a/linux-hardened-5.4.34.a.patch", + "version_suffix": "a" + }, "5.5.19": { "sha256": "1ya5nsfhr3nwz6qiz4pdhvm6k9mx1kr0prhdvhx3p40f1vk281sc", "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.5.19.a/linux-hardened-5.5.19.a.patch", -- cgit v1.2.3 From fca903c7ddf3043d74ff54e398f029751732c9d5 Mon Sep 17 00:00:00 2001 From: kraem Date: Wed, 22 Apr 2020 02:12:28 +0200 Subject: linux/hardened-patches/4.19.117: init at 4.19.117.a --- pkgs/os-specific/linux/kernel/hardened-patches.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/hardened-patches.json b/pkgs/os-specific/linux/kernel/hardened-patches.json index 689f3d67260..6eb83ee8bb1 100644 --- a/pkgs/os-specific/linux/kernel/hardened-patches.json +++ b/pkgs/os-specific/linux/kernel/hardened-patches.json @@ -4,6 +4,11 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.176.a/linux-hardened-4.14.176.a.patch", "version_suffix": "a" }, + "4.19.117": { + "sha256": "0c8dvh49nzypxwvsls10i896smvpdrk40x8ybljb3qk3r8j7niaw", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.117.a/linux-hardened-4.19.117.a.patch", + "version_suffix": "a" + }, "5.4.34": { "sha256": "1xwpqr9nzpjg837b3wnzb8fmrl2g9rz8gz5yb55vnnllbzbz36v6", "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.34.a/linux-hardened-5.4.34.a.patch", -- cgit v1.2.3 From 800dd4b7da5cfaa538d6c849cd50d394d9697e0a Mon Sep 17 00:00:00 2001 From: Lars Jellema Date: Fri, 17 Apr 2020 10:42:08 +0200 Subject: python3Packages.simpleaudio: init at 1.0.4 --- .../python-modules/simpleaudio/default.nix | 24 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/python-modules/simpleaudio/default.nix diff --git a/pkgs/development/python-modules/simpleaudio/default.nix b/pkgs/development/python-modules/simpleaudio/default.nix new file mode 100644 index 00000000000..948716a9b7c --- /dev/null +++ b/pkgs/development/python-modules/simpleaudio/default.nix @@ -0,0 +1,24 @@ +{ alsaLib, buildPythonPackage, fetchFromGitHub, isPy27, lib }: + +buildPythonPackage rec { + pname = "simpleaudio"; + version = "1.0.4"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "hamiltron"; + repo = "py-simple-audio"; + rev = version; + sha256 = "12nypzb1m14yip4zrbzin5jc5awyp1d5md5y40g5anj4phb4hx1i"; + }; + + buildInputs = [ alsaLib ]; + + meta = with lib; { + homepage = "https://github.com/hamiltron/py-simple-audio"; + description = + "A simple audio playback Python extension - cross-platform, asynchronous, dependency-free"; + license = licenses.mit; + maintainers = with maintainers; [ lucus16 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0dc2f1ea1d9..078ec921504 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1465,6 +1465,8 @@ in { shellingham = callPackage ../development/python-modules/shellingham {}; + simpleaudio = callPackage ../development/python-modules/simpleaudio { }; + simpleeval = callPackage ../development/python-modules/simpleeval { }; simple-salesforce = callPackage ../development/python-modules/simple-salesforce { }; -- cgit v1.2.3 From bb4f46855f596f8ba5814459d5d36c9c94ecb259 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 22 Apr 2020 01:46:18 +0200 Subject: =?UTF-8?q?openssl:=201.1.1f=20=E2=86=92=201.1.1g?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: CVE-2020-1967 Segmentation fault in SSL_check_chain (CVE-2020-1967) ===================================================== Severity: High Server or client applications that call the SSL_check_chain() function during or after a TLS 1.3 handshake may crash due to a NULL pointer dereference as a result of incorrect handling of the "signature_algorithms_cert" TLS extension. The crash occurs if an invalid or unrecognised signature algorithm is received from the peer. This could be exploited by a malicious peer in a Denial of Service attack. OpenSSL version 1.1.1d, 1.1.1e, and 1.1.1f are affected by this issue. This issue did not affect OpenSSL versions prior to 1.1.1d. Affected OpenSSL 1.1.1 users should upgrade to 1.1.1g This issue was found by Bernd Edlinger and reported to OpenSSL on 7th April 2020. It was found using the new static analysis pass being implemented in GCC, - -fanalyzer. Additional analysis was performed by Matt Caswell and Benjamin Kaduk. --- pkgs/development/libraries/openssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix index d821a6c8f51..43170f25d38 100644 --- a/pkgs/development/libraries/openssl/default.nix +++ b/pkgs/development/libraries/openssl/default.nix @@ -155,8 +155,8 @@ in { }; openssl_1_1 = common { - version = "1.1.1f"; - sha256 = "186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b629975da3f35"; + version = "1.1.1g"; + sha256 = "0ikdcc038i7jk8h7asq5xcn8b1xc2rrbc88yfm4hqbz3y5s4gc6x"; patches = [ ./1.1/nix-ssl-cert-file.patch -- cgit v1.2.3 From d3a41f3c23b5f7b88613f57d6c7f6b86d662df55 Mon Sep 17 00:00:00 2001 From: Evan Stoll Date: Fri, 10 Apr 2020 15:40:18 -0400 Subject: pythonPackages.pyroma: init at 2.6 --- pkgs/development/python-modules/pyroma/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/python-modules/pyroma/default.nix diff --git a/pkgs/development/python-modules/pyroma/default.nix b/pkgs/development/python-modules/pyroma/default.nix new file mode 100644 index 00000000000..4ec06506b38 --- /dev/null +++ b/pkgs/development/python-modules/pyroma/default.nix @@ -0,0 +1,21 @@ +{ stdenv, buildPythonPackage, fetchPypi +, docutils, pygments, setuptools +}: + +buildPythonPackage rec { + pname = "pyroma"; + version = "2.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "00j1j81kiipi5yppmk385cbfccf2ih0xyapl7pw6nqhrf8vh1764"; + }; + + propagatedBuildInputs = [ docutils pygments setuptools ]; + + meta = with stdenv.lib; { + description = "Test your project's packaging friendliness"; + homepage = "https://github.com/regebro/pyroma"; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 078ec921504..a67d88d59f6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3270,6 +3270,8 @@ in { peewee = callPackage ../development/python-modules/peewee { }; + pyroma = callPackage ../development/python-modules/pyroma { }; + pyroute2 = callPackage ../development/python-modules/pyroute2 { }; pyspf = callPackage ../development/python-modules/pyspf { }; -- cgit v1.2.3 From 20f37a443089628fb7fd9d5f941bdabbdd4fecc2 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sat, 11 Apr 2020 19:58:24 -0400 Subject: nixos/httpd: run as non root user --- nixos/modules/services/web-servers/apache-httpd/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 832c8b30ee9..1094ed93e68 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -453,7 +453,13 @@ in type = types.str; default = "wwwrun"; description = '' - User account under which httpd runs. + User account under which httpd children processes run. + + If you require the main httpd process to run as + root add the following configuration: + + systemd.services.httpd.serviceConfig.User = lib.mkForce "root"; + ''; }; @@ -461,7 +467,7 @@ in type = types.str; default = "wwwrun"; description = '' - Group under which httpd runs. + Group under which httpd children processes run. ''; }; @@ -724,7 +730,7 @@ in ExecStart = "@${pkg}/bin/httpd httpd -f ${httpdConf}"; ExecStop = "${pkg}/bin/httpd -f ${httpdConf} -k graceful-stop"; ExecReload = "${pkg}/bin/httpd -f ${httpdConf} -k graceful"; - User = "root"; + User = cfg.user; Group = cfg.group; Type = "forking"; PIDFile = "${runtimeDir}/httpd.pid"; @@ -732,6 +738,7 @@ in RestartSec = "5s"; RuntimeDirectory = "httpd httpd/runtime"; RuntimeDirectoryMode = "0750"; + AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ]; }; }; -- cgit v1.2.3 From ee030b121b3e963c753968f34678a89c4f2f006c Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sat, 11 Apr 2020 20:03:33 -0400 Subject: nixos/httpd: set modern default values for mpm and http2 --- .../services/web-servers/apache-httpd/default.nix | 24 +++++++++++----------- .../web-servers/apache-httpd/vhost-options.nix | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 1094ed93e68..0ab7942e46b 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -41,9 +41,9 @@ let "mime" "autoindex" "negotiation" "dir" "alias" "rewrite" "unixd" "slotmem_shm" "socache_shmcb" - "mpm_${cfg.multiProcessingModule}" + "mpm_${cfg.mpm}" ] - ++ (if cfg.multiProcessingModule == "prefork" then [ "cgi" ] else [ "cgid" ]) + ++ (if cfg.mpm == "prefork" then [ "cgi" ] else [ "cgid" ]) ++ optional enableHttp2 "http2" ++ optional enableSSL "ssl" ++ optional enableUserDir "userdir" @@ -264,7 +264,7 @@ let PidFile ${runtimeDir}/httpd.pid - ${optionalString (cfg.multiProcessingModule != "prefork") '' + ${optionalString (cfg.mpm != "prefork") '' # mod_cgid requires this. ScriptSock ${runtimeDir}/cgisock ''} @@ -349,6 +349,7 @@ in imports = [ (mkRemovedOptionModule [ "services" "httpd" "extraSubservices" ] "Most existing subservices have been ported to the NixOS module system. Please update your configuration accordingly.") (mkRemovedOptionModule [ "services" "httpd" "stateDir" ] "The httpd module now uses /run/httpd as a runtime directory.") + (mkRenamedOptionModule [ "services" "httpd" "multiProcessingModule" ] [ "services" "httpd" "mpm" ]) # virtualHosts options (mkRemovedOptionModule [ "services" "httpd" "documentRoot" ] "Please define a virtual host using `services.httpd.virtualHosts`.") @@ -544,20 +545,19 @@ in ''; }; - multiProcessingModule = mkOption { + mpm = mkOption { type = types.enum [ "event" "prefork" "worker" ]; - default = "prefork"; + default = "event"; example = "worker"; description = '' Multi-processing module to be used by Apache. Available - modules are prefork (the default; - handles each request in a separate child process), - worker (hybrid approach that starts a - number of child processes each running a number of - threads) and event (a recent variant of - worker that handles persistent - connections more efficiently). + modules are prefork (handles each + request in a separate child process), worker + (hybrid approach that starts a number of child processes + each running a number of threads) and event + (the default; a recent variant of worker + that handles persistent connections more efficiently). ''; }; diff --git a/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix b/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix index 2e806afb42c..173c0f8561c 100644 --- a/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix +++ b/nixos/modules/services/web-servers/apache-httpd/vhost-options.nix @@ -137,7 +137,7 @@ in http2 = mkOption { type = types.bool; - default = false; + default = true; description = '' Whether to enable HTTP 2. HTTP/2 is supported in all multi-processing modules that come with httpd. However, if you use the prefork mpm, there will be severe restrictions. Refer to for details. -- cgit v1.2.3 From d0de9702795d33d6c3c72ea663256b9a743435e1 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sat, 11 Apr 2020 20:06:24 -0400 Subject: nixos/httpd: some mod_php cleanup --- nixos/modules/services/web-servers/apache-httpd/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 0ab7942e46b..6f37974fde1 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -657,7 +657,7 @@ in services.httpd.phpOptions = '' ; Needed for PHP's mail() function. - sendmail_path = sendmail -t -i + sendmail_path = ${pkgs.system-sendmail}/bin/sendmail -t -i ; Don't advertise PHP expose_php = off @@ -708,9 +708,7 @@ in wants = concatLists (map (hostOpts: [ "acme-${hostOpts.hostName}.service" "acme-selfsigned-${hostOpts.hostName}.service" ]) vhostsACME); after = [ "network.target" "fs.target" ] ++ map (hostOpts: "acme-selfsigned-${hostOpts.hostName}.service") vhostsACME; - path = - [ pkg pkgs.coreutils pkgs.gnugrep ] - ++ optional cfg.enablePHP pkgs.system-sendmail; # Needed for PHP's mail() function. + path = [ pkg pkgs.coreutils pkgs.gnugrep ]; environment = optionalAttrs cfg.enablePHP { PHPRC = phpIni; } -- cgit v1.2.3 From 7bc9f24fb646f7b538f84e829427c8d16272e9d8 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sat, 11 Apr 2020 20:47:24 -0400 Subject: nixos/httpd: update release notes --- nixos/doc/manual/release-notes/rl-2009.xml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 3e29c19af8f..40b5ca240aa 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -261,6 +261,25 @@ environment.systemPackages = [ + + + The httpd web server previously started its main process as root + privileged, then ran worker processes as a less privileged identity user. + This was changed to start all of httpd as a less privileged user (defined by + and + ). As a consequence, all files that + are needed for httpd to run (included configuration fragments, SSL + certificates and keys, etc.) must now be readable by this less privileged + user/group. + + + The default value for + has been changed from prefork to event. Along with + this change the default value for + services.httpd.virtualHosts.<name>.http2 + has been set to true. + + -- cgit v1.2.3 From 512a85d334ea20186a1f150df3b4447bd0c3e7fa Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Tue, 21 Apr 2020 08:35:35 -0400 Subject: pythonPackages.pylatexenc: 2.1 -> 2.2 --- pkgs/development/python-modules/pylatexenc/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/pylatexenc/default.nix b/pkgs/development/python-modules/pylatexenc/default.nix index 146aed9a3ec..d4f14f3be01 100644 --- a/pkgs/development/python-modules/pylatexenc/default.nix +++ b/pkgs/development/python-modules/pylatexenc/default.nix @@ -1,30 +1,28 @@ { lib , buildPythonPackage , fetchFromGitHub -, pytest +, pytestCheckHook }: buildPythonPackage rec { pname = "pylatexenc"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { owner = "phfaist"; - repo = pname; + repo = "pylatexenc"; rev = "v${version}"; - sha256 = "0wnl00y5dl56aw9j4y21kqapraaravbycwfxdmjsbgl11nk4llx9"; + sha256 = "0icwd7iipz3sv4jdh9iam7h4xslvdqg16rwsmczrna3mmjbwccdk"; }; pythonImportsCheck = [ "pylatexenc" ]; - checkInputs = [ pytest ]; - checkPhase = '' - pytest - ''; + dontUseSetuptoolsCheck = true; + checkInputs = [ pytestCheckHook ]; meta = with lib; { description = "Simple LaTeX parser providing latex-to-unicode and unicode-to-latex conversion"; homepage = "https://pylatexenc.readthedocs.io"; - downloadPage = "https;//www.github.com/phfaist/pylatexenc"; + downloadPage = "https://www.github.com/phfaist/pylatexenc/releases"; license = licenses.mit; maintainers = with maintainers; [ drewrisinger ]; }; -- cgit v1.2.3 From 2e2da182fefe41b0b1c962995450a83243fafb32 Mon Sep 17 00:00:00 2001 From: Ingo Blechschmidt Date: Wed, 22 Apr 2020 05:30:48 +0200 Subject: nixos-containers: add docs about nested containers --- nixos/modules/virtualisation/nixos-containers.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index 2db5c117aa7..4f5be91939d 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -440,7 +440,9 @@ in default = false; description = '' Whether this NixOS machine is a lightweight container running - in another NixOS system. + in another NixOS system. If set to true, support for nested + containers is disabled by default, but can be reenabled by + setting boot.enableContainers to true. ''; }; @@ -448,7 +450,11 @@ in type = types.bool; default = !config.boot.isContainer; description = '' - Whether to enable support for NixOS containers. + Whether to enable support for NixOS containers. Defaults to true + (at no cost if containers are not actually used), but only if the + system is not itself a lightweight container of a host. + To enable support for nested containers, this option has to be + explicitly set to true (in the outer container). ''; }; @@ -596,7 +602,7 @@ in type = with types; attrsOf (submodule { options = networkOptions; }); default = {}; description = '' - Extra veth-pairs to be created for the container + Extra veth-pairs to be created for the container. ''; }; -- cgit v1.2.3 From a222fac434f81639fa056b0eeec76066e0d88fc3 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 19 Apr 2020 20:47:42 +0200 Subject: maintainers/teams: Add php team --- maintainers/team-list.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index caee548d719..35f583b105b 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -31,6 +31,17 @@ with lib.maintainers; { scope = "Maintain GNOME desktop environment and platform."; }; + php = { + members = [ + aanderse + etu + globin + ma27 + talyz + ]; + scope = "Maintain PHP related packages and extensions."; + }; + podman = { members = [ adisbladis -- cgit v1.2.3 From d3605d66eda9cfcfd4b6c6181869eeffe60162ef Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 19 Apr 2020 20:48:06 +0200 Subject: php: Set maintainer team as maintainers Also passthrough the meta of the package to have description, homepage, license, maintainers and other metadata passed through to the commonly used attribute. --- pkgs/development/interpreters/php/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 1d6576b383c..2dada0082e2 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -138,9 +138,9 @@ let meta = with stdenv.lib; { description = "An HTML-embedded scripting language"; - homepage = "https://www.php.net/"; + homepage = "https://www.php.net"; license = licenses.php301; - maintainers = with maintainers; [ globin etu ma27 ]; + maintainers = teams.php.members; platforms = platforms.all; outputsToInstall = [ "out" "dev" ]; }; @@ -194,6 +194,7 @@ let passthru = { inherit buildEnv withExtensions enabledExtensions; inherit (php-packages) packages extensions; + inherit (php) meta; }; paths = [ php ]; postBuild = '' -- cgit v1.2.3 From 491241611e1b15ba5ab6131de1c4862013181c71 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 19 Apr 2020 20:51:34 +0200 Subject: php.extensions: Add php maintainer team to all extensions --- pkgs/top-level/php-packages.nix | 52 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 49 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 0cda058459d..af2ae4c387e 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -308,6 +308,8 @@ in checkFlagsArray = ["REPORT_EXIT_STATUS=1" "NO_INTERACTION=1"]; makeFlags = [ "phpincludedir=$(dev)/include" ]; outputs = [ "out" "dev" ]; + + meta.maintainers = lib.teams.php.members; }; apcu_bc = buildPecl { @@ -320,6 +322,8 @@ in php.extensions.apcu pcre' ]; + + meta.maintainers = lib.teams.php.members; }; ast = buildPecl { @@ -327,6 +331,8 @@ in pname = "ast"; sha256 = "16c5isldm4csjbcvz1qk2mmrhgvh24sxsp6w6f5a37xpa3vciawp"; + + meta.maintainers = lib.teams.php.members; }; couchbase = buildPecl rec { @@ -374,6 +380,7 @@ in '') ]; + meta.maintainers = lib.teams.php.members; meta.broken = isPhp74; # Build error }; @@ -406,6 +413,7 @@ in ''; license = licenses.php301; homepage = "https://bitbucket.org/osmanov/pecl-event/"; + maintainers = teams.php.members; }; }; @@ -418,6 +426,8 @@ in configureFlags = [ "--enable-igbinary" ]; makeFlags = [ "phpincludedir=$(dev)/include" ]; outputs = [ "out" "dev" ]; + + meta.maintainers = lib.teams.php.members; }; imagick = buildPecl { @@ -429,6 +439,8 @@ in configureFlags = [ "--with-imagick=${pkgs.imagemagick.dev}" ]; nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = [ pcre' ]; + + meta.maintainers = lib.teams.php.members; }; mailparse = buildPecl { @@ -440,6 +452,8 @@ in postConfigure = '' echo "#define HAVE_MBSTRING 1" >> config.h ''; + + meta.maintainers = lib.teams.php.members; }; maxminddb = buildPecl rec { @@ -459,7 +473,7 @@ in meta = with pkgs.lib; { description = "C extension that is a drop-in replacement for MaxMind\\Db\\Reader"; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ ajs124 das_j ]; + maintainers = with maintainers; [ ajs124 das_j ] ++ teams.php.members; }; }; @@ -486,6 +500,8 @@ in nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = with pkgs; [ cyrus_sasl zlib ]; + + meta.maintainers = lib.teams.php.members; }; mongodb = buildPecl { @@ -503,6 +519,8 @@ in zlib pcre' ] ++ lib.optional (pkgs.stdenv.isDarwin) pkgs.darwin.apple_sdk.frameworks.Security; + + meta.maintainers = lib.teams.php.members; }; oci8 = buildPecl { @@ -516,6 +534,8 @@ in postPatch = '' sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 ''; + + meta.maintainers = lib.teams.php.members; }; pcov = buildPecl { @@ -525,6 +545,8 @@ in sha256 = "1psfwscrc025z8mziq69pcx60k4fbkqa5g2ia8lplb94mmarj0v1"; buildInputs = [ pcre' ]; + + meta.maintainers = lib.teams.php.members; }; pcs = buildPecl { @@ -533,6 +555,7 @@ in sha256 = "0d4p1gpl8gkzdiv860qzxfz250ryf0wmjgyc8qcaaqgkdyh5jy5p"; + meta.maintainers = lib.teams.php.members; meta.broken = isPhp74; # Build error }; @@ -548,8 +571,10 @@ in internalDeps = [ php.extensions.pdo ]; postPatch = '' - sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 - ''; + sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 + ''; + + meta.maintainers = lib.teams.php.members; }; pdo_sqlsrv = buildPecl { @@ -561,6 +586,8 @@ in internalDeps = [ php.extensions.pdo ]; buildInputs = [ pkgs.unixODBC ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ]; + + meta.maintainers = lib.teams.php.members; }; php_excel = buildPecl rec { @@ -576,6 +603,8 @@ in }; configureFlags = [ "--with-excel" "--with-libxl-incdir=${pkgs.libxl}/include_c" "--with-libxl-libdir=${pkgs.libxl}/lib" ]; + + meta.maintainers = lib.teams.php.members; }; pinba = let @@ -601,6 +630,7 @@ in statistics server for PHP using MySQL as a read-only interface. ''; homepage = "http://pinba.org/"; + maintainers = teams.php.members; }; }; @@ -618,6 +648,7 @@ in ''; license = licenses.bsd3; homepage = "https://developers.google.com/protocol-buffers/"; + maintainers = teams.php.members; }; }; @@ -653,6 +684,8 @@ in session ] ++ lib.optionals (lib.versionOlder php.version "7.4") [ hash ]; + + meta.maintainers = lib.teams.php.members; }; sqlsrv = buildPecl { @@ -662,6 +695,8 @@ in sha256 = "1kv4krk1w4hri99b0sdgwgy9c4y0yh217wx2y3irhkfi46kdrjnw"; buildInputs = [ pkgs.unixODBC ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ]; + + meta.maintainers = lib.teams.php.members; }; v8 = buildPecl { @@ -672,6 +707,8 @@ in buildInputs = [ pkgs.v8_6_x ]; configureFlags = [ "--with-v8=${pkgs.v8_6_x}" ]; + + meta.maintainers = lib.teams.php.members; meta.broken = true; }; @@ -683,6 +720,8 @@ in buildInputs = [ pkgs.v8_6_x ]; configureFlags = [ "--with-v8js=${pkgs.v8_6_x}" ]; + + meta.maintainers = lib.teams.php.members; meta.broken = true; }; @@ -696,6 +735,8 @@ in checkTarget = "test"; zendExtension = true; + + meta.maintainers = lib.teams.php.members; }; yaml = buildPecl { @@ -709,6 +750,8 @@ in ]; nativeBuildInputs = [ pkgs.pkgconfig ]; + + meta.maintainers = lib.teams.php.members; }; zmq = buildPecl { @@ -723,6 +766,7 @@ in nativeBuildInputs = [ pkgs.pkgconfig ]; + meta.maintainers = lib.teams.php.members; meta.broken = isPhp73; }; } // (let @@ -782,6 +826,8 @@ in --prune-empty-dirs \ . $dev/include/ ''; + + meta.maintainers = lib.teams.php.members; }); # This list contains build instructions for different modules that one may -- cgit v1.2.3 From 4a2c4f9e03e153a55ba0667af1cebe1f9977ec57 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 19 Apr 2020 20:51:57 +0200 Subject: php.packages: Add php maintainer team to all packages --- pkgs/top-level/php-packages.nix | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index af2ae4c387e..35c0312e34d 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -51,7 +51,7 @@ in description = "An application for building and managing Phars"; license = licenses.mit; homepage = "https://box-project.github.io/box2/"; - maintainers = with maintainers; [ jtojnar ]; + maintainers = with maintainers; [ jtojnar ] ++ teams.php.members; }; }; @@ -80,7 +80,7 @@ in description = "Dependency Manager for PHP"; license = licenses.mit; homepage = "https://getcomposer.org/"; - maintainers = with maintainers; [ globin offline ]; + maintainers = with maintainers; [ offline ] ++ teams.php.members; }; }; @@ -107,7 +107,7 @@ in description = "A tool to automatically fix PHP coding standards issues"; license = licenses.mit; homepage = "http://cs.sensiolabs.org/"; - maintainers = with maintainers; [ jtojnar ]; + maintainers = with maintainers; [ jtojnar ] ++ teams.php.members; }; }; @@ -144,7 +144,7 @@ in description = "This tool check syntax of PHP files faster than serial check with fancier output"; license = licenses.bsd2; homepage = "https://github.com/JakubOnderka/PHP-Parallel-Lint"; - maintainers = with maintainers; [ jtojnar ]; + maintainers = with maintainers; [ jtojnar ] ++ teams.php.members; }; }; @@ -171,7 +171,7 @@ in description = "PHP coding standard beautifier and fixer"; license = licenses.bsd3; homepage = "https://squizlabs.github.io/PHP_CodeSniffer/"; - maintainers = with maintainers; [ cmcdragonkai etu ]; + maintainers = with maintainers; [ cmcdragonkai ] ++ teams.php.members; }; }; @@ -198,7 +198,7 @@ in description = "PHP coding standard tool"; license = licenses.bsd3; homepage = "https://squizlabs.github.io/PHP_CodeSniffer/"; - maintainers = with maintainers; [ javaguirre etu ]; + maintainers = with maintainers; [ javaguirre ] ++ teams.php.members; }; }; @@ -224,15 +224,15 @@ in meta = with pkgs.lib; { description = "PHP Static Analysis Tool"; longDescription = '' - PHPStan focuses on finding errors in your code without actually running - it. It catches whole classes of bugs even before you write tests for the - code. It moves PHP closer to compiled languages in the sense that the - correctness of each line of the code can be checked before you run the - actual line. - ''; + PHPStan focuses on finding errors in your code without actually + running it. It catches whole classes of bugs even before you write + tests for the code. It moves PHP closer to compiled languages in the + sense that the correctness of each line of the code can be checked + before you run the actual line. + ''; license = licenses.mit; homepage = "https://github.com/phpstan/phpstan"; - maintainers = with maintainers; [ etu ]; + maintainers = teams.php.members; }; }; @@ -259,6 +259,7 @@ in description = "A static analysis tool for finding errors in PHP applications"; license = licenses.mit; homepage = "https://github.com/vimeo/psalm"; + maintainers = teams.php.members; }; }; @@ -285,7 +286,7 @@ in description = "PsySH is a runtime developer console, interactive debugger and REPL for PHP."; license = licenses.mit; homepage = "https://psysh.org/"; - maintainers = with maintainers; [ caugner ]; + maintainers = with maintainers; [ caugner ] ++ teams.php.members; }; }; }; -- cgit v1.2.3 From 9be2cbf27b82c111032d086d1f46e468b1ab6589 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 19 Apr 2020 20:56:42 +0200 Subject: nixosTests.php: Add maintainer team as maintainers --- nixos/tests/php/fpm.nix | 4 ++-- nixos/tests/php/httpd.nix | 4 ++-- nixos/tests/php/pcre.nix | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/nixos/tests/php/fpm.nix b/nixos/tests/php/fpm.nix index 1e4ced24b6c..513abd94373 100644 --- a/nixos/tests/php/fpm.nix +++ b/nixos/tests/php/fpm.nix @@ -1,6 +1,6 @@ -import ../make-test-python.nix ({pkgs, ...}: { +import ../make-test-python.nix ({pkgs, lib, ...}: { name = "php-fpm-nginx-test"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ etu ]; + meta.maintainers = lib.teams.php.members; machine = { config, lib, pkgs, ... }: { services.nginx = { diff --git a/nixos/tests/php/httpd.nix b/nixos/tests/php/httpd.nix index fc3ff986734..1092e0ecadd 100644 --- a/nixos/tests/php/httpd.nix +++ b/nixos/tests/php/httpd.nix @@ -1,6 +1,6 @@ -import ../make-test-python.nix ({pkgs, ...}: { +import ../make-test-python.nix ({pkgs, lib, ...}: { name = "php-httpd-test"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ etu ]; + meta.maintainers = lib.teams.php.members; machine = { config, lib, pkgs, ... }: { services.httpd = { diff --git a/nixos/tests/php/pcre.nix b/nixos/tests/php/pcre.nix index 016dca81d52..3dd0964e60f 100644 --- a/nixos/tests/php/pcre.nix +++ b/nixos/tests/php/pcre.nix @@ -1,7 +1,9 @@ let testString = "can-use-subgroups"; -in import ../make-test-python.nix ({ ...}: { +in import ../make-test-python.nix ({lib, ...}: { name = "php-httpd-pcre-jit-test"; + meta.maintainers = lib.teams.php.members; + machine = { lib, pkgs, ... }: { time.timeZone = "UTC"; services.httpd = { -- cgit v1.2.3 From 4b436226cfeb728691bb8ea75a2d06fab4081e1a Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 19 Apr 2020 20:58:18 +0200 Subject: codeowners: Add etu as owner of php tests --- .github/CODEOWNERS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index c9abac5851b..25238ce9642 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -179,6 +179,7 @@ # PHP /doc/languages-frameworks/php.section.md @etu +/nixos/tests/php @etu +/pkgs/build-support/build-pecl.nix @etu /pkgs/development/interpreters/php @etu /pkgs/top-level/php-packages.nix @etu -/pkgs/build-support/build-pecl.nix @etu -- cgit v1.2.3 From 513e1339c0728df254b40efd49a67fb8653681e3 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 15 Apr 2020 08:23:39 +0200 Subject: =?UTF-8?q?ocamlPackages.merlin:=203.3.3=20=E2=86=92=203.3.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/ocaml/merlin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index ed3d5efc789..fa78e47951f 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "merlin"; - version = "3.3.3"; + version = "3.3.4"; minimumOCamlVersion = "4.02.1"; src = fetchurl { url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz"; - sha256 = "05dfkbpbb7nvs4g6y0iw7a9f73ygvhs9l45l2g56y7zagvs9x43j"; + sha256 = "12wxric6n3rmsn0w16xm8vjd8p5aw24cj76zw2x87qfwwgmy1kdd"; }; buildInputs = [ yojson ]; -- cgit v1.2.3 From a2e3fc32b3e9bda252a280d77e051b2142be576d Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Thu, 16 Apr 2020 12:32:32 +0530 Subject: cjdns: declare tests from nixosTests --- pkgs/tools/networking/cjdns/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index 452181754b1..9a74344d293 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, nodejs, which, python27, utillinux }: +{ stdenv, fetchFromGitHub, nodejs, which, python27, utillinux, nixosTests }: let version = "20.6"; in stdenv.mkDerivation { @@ -29,6 +29,8 @@ stdenv.mkDerivation { cp -R contrib tools node_build node_modules $out/share/cjdns/ ''; + passthru.tests.basic = nixosTests.cjdns; + meta = with stdenv.lib; { homepage = "https://github.com/cjdelisle/cjdns"; description = "Encrypted networking for regular people"; -- cgit v1.2.3 From 59219a1e552e51cdd290bcd2445cedede96db307 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Thu, 16 Apr 2020 12:33:01 +0530 Subject: yggdrasil: declare tests from nixosTests --- pkgs/tools/networking/yggdrasil/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/yggdrasil/default.nix b/pkgs/tools/networking/yggdrasil/default.nix index 91b08015327..d8c8c429ef9 100644 --- a/pkgs/tools/networking/yggdrasil/default.nix +++ b/pkgs/tools/networking/yggdrasil/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "yggdrasil"; @@ -27,6 +27,8 @@ buildGoModule rec { -s -w ''; + passthru.tests.basic = nixosTests.yggdrasil; + meta = with lib; { description = "An experiment in scalable routing as an encrypted IPv6 overlay network"; -- cgit v1.2.3 From 92bc6e30ec297aaf94200ed5a5fde4fdc40ed24e Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Thu, 16 Apr 2020 12:51:21 +0530 Subject: mumble: declare tests from nixosTests --- pkgs/applications/networking/mumble/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 4408994ba8f..633d6e63dce 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -6,6 +6,7 @@ , speechdSupport ? false, speechd ? null , pulseSupport ? false, libpulseaudio ? null , iceSupport ? false, zeroc-ice ? null +, nixosTests }: assert jackSupport -> libjack2 != null; @@ -63,6 +64,8 @@ let enableParallelBuilding = true; + passthru.tests.connectivity = nixosTests.mumble; + meta = { description = "Low-latency, high quality voice chat software"; homepage = "https://mumble.info"; -- cgit v1.2.3 From 480ed5f90968ee81b792ce24c9928230e5bc4573 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Thu, 16 Apr 2020 12:51:53 +0530 Subject: syncthing: declare tests from nixosTests --- pkgs/applications/networking/syncthing/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 31cf76be5ef..94fec82fdf7 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, stdenv, lib, procps, fetchFromGitHub }: +{ buildGoModule, stdenv, lib, procps, fetchFromGitHub, nixosTests }: let common = { stname, target, postInstall ? "" }: @@ -35,6 +35,11 @@ let inherit postInstall; + passthru.tests = with nixosTests; { + init = syncthing-init; + relay = syncthing-relay; + }; + meta = with lib; { homepage = "https://www.syncthing.net/"; description = "Open Source Continuous File Synchronization"; -- cgit v1.2.3 From 14c9451a83f3240f8b8c3b1ff446d9e838459426 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Thu, 16 Apr 2020 12:52:28 +0530 Subject: mpd: declare tests from nixosTests --- pkgs/servers/mpd/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 4f97e3fc783..d5a3b9de3c0 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -18,6 +18,7 @@ , mpd_clientlib # Tag support , libid3tag +, nixosTests }: let @@ -128,6 +129,8 @@ let ++ lib.optional (builtins.elem "systemd" features_) "-Dsystemd_system_unit_dir=etc/systemd/system"; + passthru.tests.nixos = nixosTests.mpd; + meta = with stdenv.lib; { description = "A flexible, powerful daemon for playing music"; homepage = "https://www.musicpd.org/"; -- cgit v1.2.3 From 2ad4e21249843e1729293eeb7ad8c21ce13729a9 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Thu, 16 Apr 2020 12:52:38 +0530 Subject: fish: declare tests from nixosTests --- pkgs/shells/fish/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 0ea8dce4405..bea56bd8c5a 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -6,7 +6,7 @@ , fetchpatch , writeText - + , nixosTests , useOperatingSystemEtc ? true }: @@ -179,6 +179,7 @@ let passthru = { shellPath = "/bin/fish"; + tests.nixos = nixosTests.fish; }; }; -- cgit v1.2.3 From 16041e6274213ff3f214c7df9ed18d2e310de792 Mon Sep 17 00:00:00 2001 From: Daniel Duan Date: Tue, 21 Apr 2020 15:06:00 -0700 Subject: tre-command: 0.2.2 -> 0.2.3 0.2.3 includes a [bugfix](https://github.com/dduan/tre/releases/tag/v0.2.3). --- pkgs/tools/system/tre-command/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/tre-command/default.nix b/pkgs/tools/system/tre-command/default.nix index 0cbe87ccd37..bc0fa7ea988 100644 --- a/pkgs/tools/system/tre-command/default.nix +++ b/pkgs/tools/system/tre-command/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "tre"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "dduan"; @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1fazw2wn738iknbv54gv7qll7d4q2gy9bq1s3f3cv21cdv6bqral"; }; - cargoSha256 = "1m3ccp5ncafkifg8sxyxczsg3ja1gvq8wmgni68bgzm2lwxh2qgw"; + cargoSha256 = "16bvnwgjf3kj99d77j1pkldbasxfwy55sj9sv9vf2z6llfmzfabd"; meta = with stdenv.lib; { description = "Tree command, improved"; -- cgit v1.2.3 From e7b9fc42c8bf284ba6886aacdb81c9af8495f0de Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 21 Apr 2020 18:00:00 -0500 Subject: sile: 0.10.3 -> 0.10.4 Changelog: https://github.com/sile-typesetter/sile/releases/tag/v0.10.4 --- pkgs/tools/typesetting/sile/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/sile/default.nix b/pkgs/tools/typesetting/sile/default.nix index 5bb4c5b7fb2..a8969fd4598 100644 --- a/pkgs/tools/typesetting/sile/default.nix +++ b/pkgs/tools/typesetting/sile/default.nix @@ -13,11 +13,11 @@ in stdenv.mkDerivation rec { pname = "sile"; - version = "0.10.3"; + version = "0.10.4"; src = fetchurl { url = "https://github.com/sile-typesetter/sile/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "d89d5ce7d2bf46fb062e5299ffd8b5d821dc3cb3462a0e7c1109edeee111d856"; + sha256 = "08j2vv6spnzz8bsh62wbdv1pjiziiba71cadscsy5hw6pklzndni"; }; configureFlags = [ "--with-system-luarocks" ]; -- cgit v1.2.3 From c1f5ac41a360812a7a14c717cd4e3a3b97d1e07e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 22 Apr 2020 07:24:35 +0100 Subject: python3.pkgs.snitun: fix port binding conflicts in test --- pkgs/development/python-modules/snitun/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/snitun/default.nix b/pkgs/development/python-modules/snitun/default.nix index 8212379e3d4..901987fbff6 100644 --- a/pkgs/development/python-modules/snitun/default.nix +++ b/pkgs/development/python-modules/snitun/default.nix @@ -1,4 +1,6 @@ -{ lib, stdenv, buildPythonPackage, python, fetchFromGitHub, attrs, cryptography, async-timeout, pytest-aiohttp, pytest }: +{ lib, stdenv, buildPythonPackage, python, fetchFromGitHub +, attrs, cryptography, async-timeout, pytest-aiohttp, pytestCheckHook +}: buildPythonPackage rec { pname = "snitun"; @@ -13,12 +15,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ attrs cryptography async-timeout ]; - checkInputs = [ pytest pytest-aiohttp ]; + checkInputs = [ pytestCheckHook pytest-aiohttp ]; - checkPhase = '' - # https://github.com/NabuCasa/snitun/issues/61 - pytest ${lib.optionalString stdenv.isDarwin "-k 'not test_multiplexer_data_channel_abort_full'"} tests/ - ''; + disabledTests = lib.optionals stdenv.isDarwin [ + "test_multiplexer_data_channel_abort_full" # https://github.com/NabuCasa/snitun/issues/61 + # port binding conflicts + "test_snitun_single_runner_timeout" + "test_snitun_single_runner_throttling" + ]; meta = with lib; { homepage = "https://github.com/nabucasa/snitun"; -- cgit v1.2.3 From 0b1bef70a90254d3be2cd9eb93373d6afcd85eef Mon Sep 17 00:00:00 2001 From: Jacek Galowicz Date: Wed, 22 Apr 2020 08:36:27 +0200 Subject: nixosTests.redmine: Port to python --- nixos/tests/redmine.nix | 70 ++++++++++++++----------------------------------- 1 file changed, 19 insertions(+), 51 deletions(-) diff --git a/nixos/tests/redmine.nix b/nixos/tests/redmine.nix index 73eb684f33a..3866a1f528c 100644 --- a/nixos/tests/redmine.nix +++ b/nixos/tests/redmine.nix @@ -3,74 +3,42 @@ pkgs ? import ../.. { inherit system config; } }: -with import ../lib/testing.nix { inherit system pkgs; }; +with import ../lib/testing-python.nix { inherit system pkgs; }; with pkgs.lib; let - mysqlTest = package: makeTest { - machine = - { config, pkgs, ... }: - { services.redmine.enable = true; - services.redmine.package = package; - services.redmine.database.type = "mysql2"; - services.redmine.plugins = { + redmineTest = { name, type }: makeTest { + name = "redmine-${name}"; + machine = { config, pkgs, ... }: { + services.redmine = { + enable = true; + package = pkgs.redmine; + database.type = type; + plugins = { redmine_env_auth = pkgs.fetchurl { url = "https://github.com/Intera/redmine_env_auth/archive/0.7.zip"; sha256 = "1xb8lyarc7mpi86yflnlgyllh9hfwb9z304f19dx409gqpia99sc"; }; }; - services.redmine.themes = { + themes = { dkuk-redmine_alex_skin = pkgs.fetchurl { url = "https://bitbucket.org/dkuk/redmine_alex_skin/get/1842ef675ef3.zip"; sha256 = "0hrin9lzyi50k4w2bd2b30vrf1i4fi1c0gyas5801wn8i7kpm9yl"; }; }; }; + }; testScript = '' - startAll; - $machine->waitForUnit('redmine.service'); - $machine->waitForOpenPort('3000'); - $machine->succeed("curl --fail http://localhost:3000/"); + start_all() + machine.wait_for_unit("redmine.service") + machine.wait_for_open_port(3000) + machine.succeed("curl --fail http://localhost:3000/") ''; - }; - - pgsqlTest = package: makeTest { - machine = - { config, pkgs, ... }: - { services.redmine.enable = true; - services.redmine.package = package; - services.redmine.database.type = "postgresql"; - services.redmine.plugins = { - redmine_env_auth = pkgs.fetchurl { - url = "https://github.com/Intera/redmine_env_auth/archive/0.7.zip"; - sha256 = "1xb8lyarc7mpi86yflnlgyllh9hfwb9z304f19dx409gqpia99sc"; - }; - }; - services.redmine.themes = { - dkuk-redmine_alex_skin = pkgs.fetchurl { - url = "https://bitbucket.org/dkuk/redmine_alex_skin/get/1842ef675ef3.zip"; - sha256 = "0hrin9lzyi50k4w2bd2b30vrf1i4fi1c0gyas5801wn8i7kpm9yl"; - }; - }; - }; - - testScript = '' - startAll; - $machine->waitForUnit('redmine.service'); - $machine->waitForOpenPort('3000'); - $machine->succeed("curl --fail http://localhost:3000/"); - ''; - }; -in -{ - mysql = mysqlTest pkgs.redmine // { - name = "mysql"; - meta.maintainers = [ maintainers.aanderse ]; - }; - - pgsql = pgsqlTest pkgs.redmine // { - name = "pgsql"; + } // { meta.maintainers = [ maintainers.aanderse ]; }; +in { + mysql = redmineTest { name = "mysql"; type = "mysql2"; }; + pgsql = redmineTest { name = "pgsql"; type = "postgresql"; }; } -- cgit v1.2.3 From 66a94696c599ec8aa02b65e01c4798c6b675ad00 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 22 Apr 2020 09:37:02 +0200 Subject: =?UTF-8?q?i3:=204.18=20=E2=86=92=204.18.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a bugfix release for v4.18. • Move parent nodes in scratchpad correctly • i3bar: Call cont_child() more liberally • Fix load_layout crash when floating node doesn't have CT_FLOATING_CON parent • Fix SEGFAULT when i3bar receives invalid input • Revert "floating_reposition: avoid extra tree_render" • Call tree_render if floating move changes workspace • Update EWMH properties on workspace move • cmd_focus_sibling: Fix crash on workspace level https://i3wm.org/downloads/RELEASE-NOTES-4.18.1.txt --- pkgs/applications/window-managers/i3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix index fd964215d45..eec7d88dbc7 100644 --- a/pkgs/applications/window-managers/i3/default.nix +++ b/pkgs/applications/window-managers/i3/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "i3"; - version = "4.18"; + version = "4.18.1"; src = fetchurl { url = "https://i3wm.org/downloads/${pname}-${version}.tar.bz2"; - sha256 = "0dv5g8ycfmijxfjyw8hzsxaf80v09lb73zh7x2vszy78h3amifqz"; + sha256 = "0z709cianlzw0x0qwq4361347354xd9ckj1v7vjvhb1zh3x91gws"; }; nativeBuildInputs = [ which pkgconfig makeWrapper ]; -- cgit v1.2.3 From 2e9cfaf3cf16c2669f5fe809e6305a419a2d68f0 Mon Sep 17 00:00:00 2001 From: geistesk Date: Sat, 7 Mar 2020 19:53:45 +0100 Subject: cbeams: init at 1.0.3 --- pkgs/misc/cbeams/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/misc/cbeams/default.nix diff --git a/pkgs/misc/cbeams/default.nix b/pkgs/misc/cbeams/default.nix new file mode 100644 index 00000000000..ec045ebf3ef --- /dev/null +++ b/pkgs/misc/cbeams/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonApplication, fetchPypi, isPy3k, blessings, docopt }: + +buildPythonApplication rec { + pname = "cbeams"; + version = "1.0.3"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1agcjg6kmcyvk834xd2j60mi349qi9iw3dc2vwpd7pqwq1daq3gi"; + }; + + propagatedBuildInputs = [ blessings docopt ]; + + meta = with lib; { + homepage = "https://github.com/tartley/cbeams"; + description = "Command-line program to draw animated colored circles in the terminal"; + license = licenses.bsd3; + maintainers = with maintainers; [ geistesk ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 29fbf3cd8a1..e41492117be 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -532,6 +532,8 @@ in { catalogue = callPackage ../development/python-modules/catalogue { }; + cbeams = callPackage ../misc/cbeams { }; + cdecimal = callPackage ../development/python-modules/cdecimal { }; cfn-flip = callPackage ../development/python-modules/cfn-flip { }; -- cgit v1.2.3 From 9bb6948317a895915f74bf9a31bc178862b6cfa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 14 Apr 2020 12:19:33 +0100 Subject: home-assistant: 0.108.2 -> 0.108.7 --- .../0001-setup.py-relax-dependencies.patch | 17 +++++++++++------ pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch b/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch index 52d2daf80b0..e18842f49aa 100644 --- a/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch +++ b/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch @@ -1,4 +1,4 @@ -From 80f39643bb4d25f8ffcbd92804844961b303f4d0 Mon Sep 17 00:00:00 2001 +From 679364e1cd95dc7179dbd3114ec35b282fbcb0af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 9 Apr 2020 07:20:46 +0100 Subject: [PATCH] setup.py: relax dependencies @@ -8,11 +8,11 @@ Content-Transfer-Encoding: 8bit Signed-off-by: Jörg Thalheim --- - setup.py | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) + setup.py | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/setup.py b/setup.py -index f53af0ee1..ff4227487 100755 +index e0daacd98b..7166f1f228 100755 --- a/setup.py +++ b/setup.py @@ -32,10 +32,10 @@ PROJECT_URLS = { @@ -28,7 +28,12 @@ index f53af0ee1..ff4227487 100755 "bcrypt==3.1.7", "certifi>=2019.11.28", "ciso8601==2.1.3", -@@ -47,9 +47,9 @@ REQUIRES = [ +@@ -43,13 +43,13 @@ REQUIRES = [ + "jinja2>=2.11.1", + "PyJWT==1.7.1", + # PyJWT has loose dependency. We want the latest one. +- "cryptography==2.8", ++ "cryptography>=2.8", "pip>=8.0.3", "python-slugify==4.0.0", "pytz>=2019.03", @@ -42,5 +47,5 @@ index f53af0ee1..ff4227487 100755 "voluptuous-serialize==2.3.0", ] -- -2.25.1 +2.26.1 diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index d19b70c426e..0ae33cd4895 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.108.2"; + version = "0.108.7"; components = { "abode" = ps: with ps; [ ]; # missing inputs: abodepy "acer_projector" = ps: with ps; [ pyserial]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 51b6d94860c..d04c2fa5c96 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -67,7 +67,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.108.2"; + hassVersion = "0.108.7"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -86,7 +86,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "0v4i1ak7pkpycas0mzdmxgc42xgfymwx2b0a2a4h13c4z46pbs2l"; + sha256 = "0nk1615ms6nlmhgmsgsknc6m7b19baan8m4kr4s97njngiardxm7"; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 9e12016320c..6ca763768ea 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20200407.2"; + version = "20200418.0"; src = fetchPypi { inherit pname version; - sha256 = "0krwn67bkybjb69daik6dki5hm36xs4nbfwqkh0q7ami1xr1f56d"; + sha256 = "12px8znc6nw5ndg4f28lvfpqsnzi00b5qgpdj9jwny0fss4aglnb"; }; # no Python tests implemented -- cgit v1.2.3 From 95903d864cea2765c9cfca5e761317aadb77e62e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 22 Apr 2020 04:20:00 -0500 Subject: ytop: 0.5.1 -> 0.6.0 --- pkgs/tools/system/ytop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/ytop/default.nix b/pkgs/tools/system/ytop/default.nix index de1678958db..562886ad57e 100644 --- a/pkgs/tools/system/ytop/default.nix +++ b/pkgs/tools/system/ytop/default.nix @@ -4,18 +4,18 @@ assert stdenv.isDarwin -> IOKit != null; rustPlatform.buildRustPackage rec { pname = "ytop"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "cjbassi"; repo = pname; rev = version; - sha256 = "1wpxn8i5112pzs8b03shl627r2yz70lvzjhd6f5crwhsnir06h5x"; + sha256 = "1zajgzhhxigga5wc94bmbk8iwx7yc2jq3f0hqadfsa4f0wmpi0nf"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; - cargoSha256 = "0wmlmkq4y2923i5kjhprw2hd2v5qls49ncs6h8g9rdlmwd7qdl86"; + cargoSha256 = "1ka9d81ddzz52w75xdiwd2xkv1rlamyvvdax09wanb61zxxwm0i7"; meta = with stdenv.lib; { description = "A TUI system monitor written in Rust"; -- cgit v1.2.3 From ebf8442ad346416bb703d33380ba22d8f872fe5a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 22 Apr 2020 04:20:00 -0500 Subject: spotify-tui: 0.17.1 -> 0.18.0 --- pkgs/applications/audio/spotify-tui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix index 5f9cf2720cd..d29e9e33568 100644 --- a/pkgs/applications/audio/spotify-tui/default.nix +++ b/pkgs/applications/audio/spotify-tui/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "spotify-tui"; - version = "0.17.1"; + version = "0.18.0"; src = fetchFromGitHub { owner = "Rigellute"; repo = "spotify-tui"; rev = "v${version}"; - sha256 = "1gsddjinxmglm05hhphclax08d9pig1f0wjjs3bbcq096fydxgfs"; + sha256 = "15icg332iyacdn4ydr4nivblayg4xkcnjh4f0sjnhj4q173v8fq2"; }; - cargoSha256 = "1y398ypckk3gw1sfzf97xzwf5d5z3kxlcpn3bccmsfr59kvkf661"; + cargoSha256 = "0rw8pj74k88rvcr18837g356lwsn2vdq384yma9df462xd2cw823"; nativeBuildInputs = [ pkgconfig ] ++ stdenv.lib.optionals stdenv.isLinux [ python3 ]; buildInputs = [ openssl ] -- cgit v1.2.3 From 573ce569cd7d8c0e064dc89d9d85525323dbabcc Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 22 Apr 2020 04:20:00 -0500 Subject: nodejs-14_x: init at 14.1.0 Changelog: - https://github.com/nodejs/node/releases/tag/v14.0.0 - https://github.com/nodejs/node/releases/tag/v14.1.0 --- pkgs/development/web/nodejs/v14.nix | 14 ++++++++++++++ pkgs/top-level/all-packages.nix | 8 ++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/web/nodejs/v14.nix diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix new file mode 100644 index 00000000000..e2f8dd7173c --- /dev/null +++ b/pkgs/development/web/nodejs/v14.nix @@ -0,0 +1,14 @@ +{ callPackage, openssl, icu66, python3, enableNpm ? true }: + +let + buildNodejs = callPackage ./nodejs.nix { + inherit openssl; + icu = icu66; + python = python3; + }; +in + buildNodejs { + inherit enableNpm; + version = "14.1.0"; + sha256 = "0pw39628y8qi2jagmmnfj0fkcbv00qcd1cqybiprf1v22hhij44n"; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 882bea9b826..7f3386883d1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4784,10 +4784,14 @@ in nodejs-slim-13_x = callPackage ../development/web/nodejs/v13.nix { enableNpm = false; }; + nodejs-14_x = callPackage ../development/web/nodejs/v14.nix { }; + nodejs-slim-14_x = callPackage ../development/web/nodejs/v14.nix { + enableNpm = false; + }; # Update this when adding the newest nodejs major version! - nodejs_latest = nodejs-13_x; - nodejs-slim_latest = nodejs-slim-13_x; + nodejs_latest = nodejs-14_x; + nodejs-slim_latest = nodejs-slim-14_x; nodePackages_13_x = dontRecurseIntoAttrs (callPackage ../development/node-packages/default-v13.nix { nodejs = pkgs.nodejs-13_x; -- cgit v1.2.3 From 912eb6b120eba15237ff053eafc4b5d90577685b Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 18 Mar 2020 10:47:24 +0800 Subject: crystal: build using Makefile or shards if available --- .../compilers/crystal/build-package.nix | 124 +++++++++++++++------ 1 file changed, 90 insertions(+), 34 deletions(-) diff --git a/pkgs/development/compilers/crystal/build-package.nix b/pkgs/development/compilers/crystal/build-package.nix index 8ffa89a11b4..856c6e58bc1 100644 --- a/pkgs/development/compilers/crystal/build-package.nix +++ b/pkgs/development/compilers/crystal/build-package.nix @@ -1,53 +1,109 @@ -{ stdenv, lib, crystal, linkFarm, fetchFromGitHub }: -{ # Generate shards.nix with `nix-shell -p crystal2nix --run crystal2nix` in the projects root - shardsFile ? null +{ stdenv, lib, crystal, shards, git, pkgconfig, which, linkFarm, fetchFromGitHub, installShellFiles }: + +{ # Some projects do not include a lock file, so you can pass one + lockFile ? null + # Generate shards.nix with `nix-shell -p crystal2nix --run crystal2nix` in the projects root +, shardsFile ? null + # We support different builders. To make things more straight forward, make it + # user selectable instead of trying to autodetect +, format ? "make" +, installManPages ? true # Specify binaries to build in the form { foo.src = "src/foo.cr"; } # The default `crystal build` options can be overridden with { foo.options = [ "--no-debug" ]; } -, crystalBinaries ? {} -, ... -}@args: +, crystalBinaries ? { }, ... }@args: + +assert (builtins.elem format [ "make" "crystal" "shards" ]); + let - mkDerivationArgs = builtins.removeAttrs args [ "shardsFile" "crystalBinaries" ]; + mkDerivationArgs = builtins.removeAttrs args [ + "format" + "installManPages" + "lockFile" + "shardsFile" + "crystalBinaries" + ]; crystalLib = linkFarm "crystal-lib" (lib.mapAttrsToList (name: value: { inherit name; path = fetchFromGitHub value; }) (import shardsFile)); - defaultOptions = [ "--release" "--progress" "--no-debug" "--verbose" ]; + # we previously had --no-debug here but that is not recommended by upstream + defaultOptions = [ "--release" "--progress" "--verbose" ]; + buildDirectly = shardsFile == null || crystalBinaries != { }; in stdenv.mkDerivation (mkDerivationArgs // { - configurePhase = args.configurePhase or '' - runHook preConfigure - ${lib.optionalString (shardsFile != null) "ln -s ${crystalLib} lib"} - runHook postConfigure - ''; + configurePhase = args.configurePhase or lib.concatStringsSep "\n" ([ + "runHook preConfigure" + ] ++ lib.optional (lockFile != null) "ln -s ${lockFile} ./shard.lock" + ++ lib.optional (shardsFile != null) "ln -s ${crystalLib} lib" + ++ [ "runHook postConfigure "]); - buildInputs = args.buildInputs or [] ++ [ crystal ]; - - buildPhase = args.buildPhase or '' - runHook preBuild - ${lib.concatStringsSep "\n" (lib.mapAttrsToList (bin: attrs: '' - crystal ${lib.escapeShellArgs ([ - "build" - "-o" bin - (attrs.src or (throw "No source file for crystal binary ${bin} provided")) - ] ++ attrs.options or defaultOptions)} - '') crystalBinaries)} - runHook postBuild - ''; + CRFLAGS = lib.concatStringsSep " " defaultOptions; + + PREFIX = placeholder "out"; + + buildInputs = args.buildInputs or [ ] ++ [ crystal ] + ++ lib.optional (format != "crystal") shards; + + nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [ git installShellFiles pkgconfig which ]; + + buildPhase = args.buildPhase or (lib.concatStringsSep "\n" ([ + "runHook preBuild" + ] ++ lib.optional (format == "make") + ''make ''${buildTargets:-build} $makeFlags'' + ++ lib.optionals (format == "crystal") (lib.mapAttrsToList (bin: attrs: '' + crystal ${lib.escapeShellArgs (["build" "-o" bin + (attrs.src or (throw "No source file for crystal binary ${bin} provided")) + ] ++ (attrs.options or defaultOptions))} + '') crystalBinaries) + ++ lib.optional (format == "shards") + "shards build --local --production ${lib.concatStringsSep " " defaultOptions}" + ++ [ "runHook postBuild" ])); + + installPhase = args.installPhase or (lib.concatStringsSep "\n" ([ + "runHook preInstall" + ] ++ lib.optional (format == "make") + ''make ''${installTargets:-install} $installFlags'' + ++ lib.optionals (format == "crystal") (map (bin: '' + install -Dm555 ${lib.escapeShellArgs [ bin "${placeholder "out"}/bin/${bin}" ]} + '') (lib.attrNames crystalBinaries)) + ++ lib.optional (format == "shards") + ''install -Dm555 bin/* -t $out/bin'' + ++ [ + '' + for f in README* *.md LICENSE; do + test -f $f && install -Dm444 $f -t $out/share/doc/${args.pname} + done + '' + ] ++ (lib.optional installManPages '' + if [ -d man ]; then + installManPage man/*.? + fi + '') ++ [ + "runHook postInstall" + ])); + + doCheck = args.doCheck or true; + + checkPhase = args.checkPhase or (lib.concatStringsSep "\n" ([ + "runHook preCheck" + ] ++ lib.optional (format == "make") + ''make ''${checkTarget:-test} $checkFlags'' + ++ lib.optional (format != "make") + ''crystal ''${checkTarget:-spec} $checkFlags'' + ++ [ "runHook postCheck" ])); + + doInstallCheck = args.doInstallCheck or true; - installPhase = args.installPhase or '' - runHook preInstall - mkdir -p "$out/bin" - ${lib.concatMapStringsSep "\n" (bin: '' - mv ${lib.escapeShellArgs [ bin "${placeholder "out"}/bin/${bin}" ]} - '') (lib.attrNames crystalBinaries)} - runHook postInstall + installCheckPhase = args.installCheckPhase or '' + for f in $out/bin/*; do + $f --help + done ''; - meta = args.meta or {} // { + meta = args.meta or { } // { platforms = args.meta.platforms or crystal.meta.platforms; }; }) -- cgit v1.2.3 From 760d56f6babd470c5ad9ca85e63cfbbda4dcee13 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 19 Apr 2020 15:52:58 +0800 Subject: shards: 0.9.0 -> 0.10.0 --- .../development/tools/build-managers/shards/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/build-managers/shards/default.nix b/pkgs/development/tools/build-managers/shards/default.nix index 4ad78778a91..53bc057fc13 100644 --- a/pkgs/development/tools/build-managers/shards/default.nix +++ b/pkgs/development/tools/build-managers/shards/default.nix @@ -1,22 +1,29 @@ -{ stdenv, fetchFromGitHub, crystal, pcre, libyaml, which }: +{ stdenv, fetchFromGitHub, crystal }: crystal.buildCrystalPackage rec { pname = "shards"; version = "0.10.0"; src = fetchFromGitHub { - owner = "crystal-lang"; - repo = "shards"; - rev = "v${version}"; + owner = "crystal-lang"; + repo = "shards"; + rev = "v${version}"; sha256 = "1bjy3hcdqq8769bx73f3pwn26rnkj23dngyfbw4iv32bw23x1d49"; }; + # we cannot use `make` here as it would introduce a dependency on itself + format = "crystal"; + shardsFile = ./shards.nix; + crystalBinaries.shards.src = "./src/shards.cr"; + # tries to execute git which fails spectacularly + doCheck = false; + meta = with stdenv.lib; { description = "Dependency manager for the Crystal language"; - license = licenses.asl20; + license = licenses.asl20; maintainers = with maintainers; [ peterhoeg ]; inherit (crystal.meta) homepage platforms; }; -- cgit v1.2.3 From 1e3bae6c4158579d94f75d14d4a007cae162116a Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 18 Mar 2020 10:16:02 +0800 Subject: icr: 0.6.0 -> 0.8.0 --- pkgs/development/tools/icr/default.nix | 34 ++++++++++++++++++---------------- pkgs/development/tools/icr/shards.nix | 8 ++++++++ pkgs/top-level/all-packages.nix | 4 +--- 3 files changed, 27 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/tools/icr/shards.nix diff --git a/pkgs/development/tools/icr/default.nix b/pkgs/development/tools/icr/default.nix index 3a39d0ddf6b..50a349d8ff7 100644 --- a/pkgs/development/tools/icr/default.nix +++ b/pkgs/development/tools/icr/default.nix @@ -1,28 +1,30 @@ -{ stdenv, fetchFromGitHub, crystal, shards, which -, openssl, readline, libyaml }: +{ stdenv, lib, fetchFromGitHub, crystal, shards, makeWrapper, pkgconfig, which +, openssl, readline, libyaml, zlib }: -stdenv.mkDerivation rec { +crystal.buildCrystalPackage rec { pname = "icr"; - version = "0.6.0"; + version = "0.8.0"; src = fetchFromGitHub { - owner = "crystal-community"; - repo = pname; - rev = "v${version}"; - sha256 = "0kkdqrxk4f4bqbb84mgjrk9r0fz1hsz95apvjsc49gav4c8xx3mb"; + owner = "crystal-community"; + repo = pname; + rev = "v${version}"; + sha256 = "1bz2bhs6csyg2rhrlknlvaiilq3vq8plxjh1hdxmbrfi3n6c7k5a"; }; - postPatch = '' - substituteInPlace Makefile \ - --replace /usr/local $out - ''; + shardsFile = ./shards.nix; + + buildInputs = [ libyaml openssl readline zlib ]; - buildInputs = [ crystal libyaml openssl readline ]; + nativeBuildInputs = [ makeWrapper pkgconfig which ]; - nativeBuildInputs = [ shards which ]; + # tests are failing due to our sandbox + doCheck = false; - doCheck = true; - checkTarget = "test"; + postFixup = '' + wrapProgram $out/bin/icr \ + --prefix PATH : ${lib.makeBinPath [ crystal shards makeWrapper which ]} + ''; meta = with stdenv.lib; { description = "Interactive console for the Crystal programming language"; diff --git a/pkgs/development/tools/icr/shards.nix b/pkgs/development/tools/icr/shards.nix new file mode 100644 index 00000000000..1dddd5a42c3 --- /dev/null +++ b/pkgs/development/tools/icr/shards.nix @@ -0,0 +1,8 @@ +{ + readline = { + owner = "crystal-lang"; + repo = "crystal-readline"; + rev = "0fb7d186da8e1b157998d98d1c96e99699b791eb"; + sha256 = "1rk27vw3ssldgnfgprwvz2gag02v4g6d6yg56b3sk9w3fn8jyyi8"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index febca841867..92c855e3788 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8114,9 +8114,7 @@ in crystal crystal2nix; - icr = callPackage ../development/tools/icr { - openssl = openssl_1_0_2; - }; + icr = callPackage ../development/tools/icr { }; scry = callPackage ../development/tools/scry {}; -- cgit v1.2.3 From fb8902ba0747fe3e90ed9facc5bdb2c801c12fff Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 12 Apr 2020 21:06:12 +0800 Subject: mint: 0.7.1 -> 0.9.0 --- pkgs/development/compilers/mint/default.nix | 27 ++++++++++++++++++--------- pkgs/development/compilers/mint/shards.nix | 26 +++++++++++++------------- 2 files changed, 31 insertions(+), 22 deletions(-) diff --git a/pkgs/development/compilers/mint/default.nix b/pkgs/development/compilers/mint/default.nix index 7f5af5e834b..d1d103c047f 100644 --- a/pkgs/development/compilers/mint/default.nix +++ b/pkgs/development/compilers/mint/default.nix @@ -1,27 +1,36 @@ -{ lib, fetchFromGitHub, crystal, zlib, openssl, duktape, which, libyaml }: -crystal.buildCrystalPackage rec { - version = "0.7.1"; +{ lib, fetchFromGitHub, crystal_0_33, openssl }: + +let crystal = crystal_0_33; +in crystal.buildCrystalPackage rec { + version = "0.9.0"; pname = "mint"; + src = fetchFromGitHub { owner = "mint-lang"; repo = "mint"; rev = version; - sha256 = "18cg96kl4dn89bj6fm3080zzyd1r7rsfi17agdjjayd2v9fgs95l"; + sha256 = "0y1qr616x7s0pjgih6s1n4wiwb8kn8l1knnzmib6j4jmqax0jhz0"; }; - buildInputs = [ openssl ]; + postPatch = '' + export HOME=$TMP + ''; + + format = "shards"; # Update with # nix-shell -p crystal2nix --run crystal2nix # with mint's shard.lock file in the current directory shardsFile = ./shards.nix; - crystalBinaries.mint.src = "src/mint.cr"; - meta = { + buildInputs = [ openssl ]; + + meta = with lib; { description = "A refreshing language for the front-end web"; homepage = "https://mint-lang.com/"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ manveru ]; + license = licenses.bsd3; + maintainers = with maintainers; [ manveru ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + broken = lib.versionOlder crystal.version "0.33"; }; } diff --git a/pkgs/development/compilers/mint/shards.nix b/pkgs/development/compilers/mint/shards.nix index b3583ac2cba..8e2b6b6ad4d 100644 --- a/pkgs/development/compilers/mint/shards.nix +++ b/pkgs/development/compilers/mint/shards.nix @@ -2,26 +2,26 @@ admiral = { owner = "jwaldrip"; repo = "admiral.cr"; - rev = "v1.7.3"; - sha256 = "0b98qjy43wsrc08am7lkhcdsxc7gplf9hcmbvd4p3dw4g107rk91"; + rev = "v1.9.0"; + sha256 = "0y8gsh1qz42bc9jawcrn0i49mzzfvf8znmivd8lybapf0f53fblz"; }; ameba = { - owner = "veelenga"; + owner = "crystal-ameba"; repo = "ameba"; - rev = "v0.10.1"; - sha256 = "0dcw7px7g0c5pxpdlirhirqzhcc7gdwdfiwb9kgm4x1k74ghjgxq"; + rev = "v0.12.0"; + sha256 = "0g68yijbm2j4ig536fwq49d1z7x2iv9kp4g3gjklf5zn1sbqhm12"; }; baked_file_system = { owner = "schovi"; repo = "baked_file_system"; - rev = "v0.9.7"; - sha256 = "1fi6zag1a6h4xwrfizy01dls3hhraqw0cmpwj7rjv1qcddjgig5z"; + rev = "v0.9.8"; + sha256 = "12l375jllg1lxvfh610dz0a39p803xw6q9fxlmnc6hy55i0gm0y3"; }; diff = { owner = "MakeNowJust"; repo = "crystal-diff"; - rev = "51962dc36f9bbb1b926d557f7cb8993a6c73cc63"; - sha256 = "1nwnsxm8srfw8jg0yfi2v19x6j3dadx62hq0xpxra40qcqz9dbnp"; + rev = "v1.1.0"; + sha256 = "1q5q2d5mp1r8c6k5v4755sb3b6awiz85d1j280djzhbd0pggk3z7"; }; dotenv = { owner = "gdotdesign"; @@ -32,14 +32,14 @@ exception_page = { owner = "crystal-loot"; repo = "exception_page"; - rev = "v0.1.2"; - sha256 = "0j5ishhyriq9p339yaawrmawl9wgmp1paniq30a8d6a0568h3avq"; + rev = "v0.1.4"; + sha256 = "0bsp2m89sl0bg9d5szbs1nxyk7yk58rkk24aibr39hhb5zi70pqi"; }; kemal = { owner = "kemalcr"; repo = "kemal"; - rev = "v0.25.1"; - sha256 = "1334i905xj6vlmp8acyybwwlaxsgmf90b59da7brzpnf28wci782"; + rev = "v0.26.1"; + sha256 = "169pwkjmk7x6j8i0rf5rpyk1y0hl7jaf9h6yrq4ha2ag9yq9i8fr"; }; kilt = { owner = "jeromegn"; -- cgit v1.2.3 From 4805be654d282bc3a120ddca076d0133b2e80480 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 19 Apr 2020 15:34:49 +0800 Subject: scry: build against crystal 0.31 --- pkgs/development/tools/scry/default.nix | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/scry/default.nix b/pkgs/development/tools/scry/default.nix index 7bd3fa38332..ed823896ad0 100644 --- a/pkgs/development/tools/scry/default.nix +++ b/pkgs/development/tools/scry/default.nix @@ -1,6 +1,8 @@ -{ lib, fetchFromGitHub, crystal }: +{ lib, fetchFromGitHub, crystal_0_31, coreutils, shards, makeWrapper, which }: -crystal.buildCrystalPackage rec { +let crystal = crystal_0_31; + +in crystal.buildCrystalPackage rec { pname = "scry"; version = "0.8.1"; @@ -11,9 +13,27 @@ crystal.buildCrystalPackage rec { sha256 = "0ii4k9l3dgm1c9lllc8ni9dar59lrxik0v9iz7gk3d6v62wwnq79"; }; + # we are already testing for this, so we can ignore the failures + postPatch = '' + rm spec/scry/executable_spec.cr + ''; + + format = "crystal"; + + nativeBuildInputs = [ makeWrapper ]; + shardsFile = ./shards.nix; + crystalBinaries.scry.src = "src/scry.cr"; + postFixup = '' + wrapProgram $out/bin/scry \ + --prefix PATH : ${lib.makeBinPath [ crystal coreutils ]} + ''; + + # the binary doesn't take any arguments, so this will hang + doInstallCheck = false; + meta = with lib; { description = "Code analysis server for the Crystal programming language"; homepage = "https://github.com/crystal-lang-tools/scry"; -- cgit v1.2.3 From 61660a7aeba2c7882539432a43e6880877090e93 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 19 Apr 2020 10:57:17 +0800 Subject: ameba: 0.12.0 -> 0.12.1 --- pkgs/development/tools/ameba/default.nix | 36 +++++++------------------------- 1 file changed, 7 insertions(+), 29 deletions(-) diff --git a/pkgs/development/tools/ameba/default.nix b/pkgs/development/tools/ameba/default.nix index 2f3ebcbed0a..a2d829f85c2 100644 --- a/pkgs/development/tools/ameba/default.nix +++ b/pkgs/development/tools/ameba/default.nix @@ -1,38 +1,16 @@ -{ stdenv, lib, fetchFromGitHub, crystal, shards }: +{ stdenv, lib, fetchFromGitHub, crystal }: -stdenv.mkDerivation rec { +crystal.buildCrystalPackage rec { pname = "ameba"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { - owner = "crystal-ameba"; - repo = "ameba"; - rev = "v${version}"; - sha256 = "0g68yijbm2j4ig536fwq49d1z7x2iv9kp4g3gjklf5zn1sbqhm12"; + owner = "crystal-ameba"; + repo = "ameba"; + rev = "v${version}"; + sha256 = "0c2j2qki0czkpsqxv75qg95pk9f0w4rqa5ln07rs4bj9dk2lrr3l"; }; - nativeBuildInputs = [ crystal shards ]; - - buildPhase = '' - runHook preBuild - shards build --release - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - install -Dm755 -t $out/bin bin/ameba - runHook postInstall - ''; - - doCheck = true; - - checkPhase = '' - runHook preCheck - crystal spec - runHook postCheck - ''; - meta = with stdenv.lib; { description = "A static code analysis tool for Crystal"; homepage = "https://crystal-ameba.github.io"; -- cgit v1.2.3 From 26a69b3d3e9d014fbdeb0a629974d4673a2e35f6 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 19 Mar 2020 16:02:23 +0800 Subject: lucky-cli: init at 0.20 --- pkgs/development/web/lucky-cli/default.nix | 42 ++++++++++++++++++++++++++++++ pkgs/development/web/lucky-cli/shard.lock | 5 ++++ pkgs/development/web/lucky-cli/shards.nix | 8 ++++++ pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 57 insertions(+) create mode 100644 pkgs/development/web/lucky-cli/default.nix create mode 100644 pkgs/development/web/lucky-cli/shard.lock create mode 100644 pkgs/development/web/lucky-cli/shards.nix diff --git a/pkgs/development/web/lucky-cli/default.nix b/pkgs/development/web/lucky-cli/default.nix new file mode 100644 index 00000000000..76f40de4ed1 --- /dev/null +++ b/pkgs/development/web/lucky-cli/default.nix @@ -0,0 +1,42 @@ +{ lib, fetchFromGitHub, crystal, makeWrapper, openssl }: + +crystal.buildCrystalPackage rec { + pname = "lucky-cli"; + version = "0.20.0"; + + src = fetchFromGitHub { + owner = "luckyframework"; + repo = "lucky_cli"; + rev = "v${version}"; + sha256 = "0n7fgnsivf39bkxpf7xgg9dqkam08axdn1j45wl1n0r4qmfkjs94"; + }; + + # the integration tests will try to clone a remote repos + postPatch = '' + rm -rf spec/integration + ''; + + format = "crystal"; + + lockFile = ./shard.lock; + shardsFile = ./shards.nix; + + crystalBinaries.lucky.src = "src/lucky.cr"; + + buildInputs = [ openssl ]; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/lucky \ + --prefix PATH : ${lib.makeBinPath [ crystal ]} + ''; + + meta = with lib; { + description = + "A Crystal library for creating and running tasks. Also generates Lucky projects"; + license = licenses.mit; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/web/lucky-cli/shard.lock b/pkgs/development/web/lucky-cli/shard.lock new file mode 100644 index 00000000000..6564e86624f --- /dev/null +++ b/pkgs/development/web/lucky-cli/shard.lock @@ -0,0 +1,5 @@ +version: 1.0 +shards: + teeplate: + github: luckyframework/teeplate + version: 0.8.1 diff --git a/pkgs/development/web/lucky-cli/shards.nix b/pkgs/development/web/lucky-cli/shards.nix new file mode 100644 index 00000000000..0fa5aec9e06 --- /dev/null +++ b/pkgs/development/web/lucky-cli/shards.nix @@ -0,0 +1,8 @@ +{ + teeplate = { + owner = "luckyframework"; + repo = "teeplate"; + rev = "v0.8.1"; + sha256 = "022jmmg3d2wq2xnhc63afldm9vrcr8xqn43s9i39d7qflrzrfc7v"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92c855e3788..5b86db013ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3991,6 +3991,8 @@ in httplab = callPackage ../tools/networking/httplab { }; + lucky-cli = callPackage ../development/web/lucky-cli { }; + partclone = callPackage ../tools/backup/partclone { }; partimage = callPackage ../tools/backup/partimage { }; -- cgit v1.2.3 From 819796060f022e12e7872514256439cf52547310 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 19 Apr 2020 23:43:22 +0800 Subject: crystal2nix: specify build type --- pkgs/development/compilers/crystal/crystal2nix.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/crystal/crystal2nix.nix b/pkgs/development/compilers/crystal/crystal2nix.nix index ac69b9b3d96..5fc40cd2374 100644 --- a/pkgs/development/compilers/crystal/crystal2nix.nix +++ b/pkgs/development/compilers/crystal/crystal2nix.nix @@ -1,4 +1,5 @@ { lib, crystal, nix-prefetch-git }: + crystal.buildCrystalPackage { pname = "crystal2nix"; version = "unstable-2018-07-31"; @@ -6,11 +7,16 @@ crystal.buildCrystalPackage { nixPrefetchGit = "${lib.getBin nix-prefetch-git}/bin/nix-prefetch-git"; unpackPhase = "substituteAll ${./crystal2nix.cr} crystal2nix.cr"; + format = "crystal"; + crystalBinaries.crystal2nix.src = "crystal2nix.cr"; + # it will blow up without a shard.yml file + doInstallCheck = false; + meta = with lib; { description = "Utility to convert Crystal's shard.lock files to a Nix file"; license = licenses.mit; - maintainers = [ maintainers.manveru ]; + maintainers = with maintainers; [ manveru ]; }; } -- cgit v1.2.3 From 0bfd4557db678c8323814a214e1ac554fb3a14ae Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 20 Apr 2020 00:08:50 +0800 Subject: thicket: specify the build type and pin to crystal 0.33 --- .../version-management/git-and-tools/thicket/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/thicket/default.nix b/pkgs/applications/version-management/git-and-tools/thicket/default.nix index 42819043d58..4a02baa465c 100644 --- a/pkgs/applications/version-management/git-and-tools/thicket/default.nix +++ b/pkgs/applications/version-management/git-and-tools/thicket/default.nix @@ -1,9 +1,12 @@ { lib , fetchFromGitHub -, crystal +, crystal_0_33 }: -crystal.buildCrystalPackage rec { +let + crystal = crystal_0_33; + +in crystal.buildCrystalPackage rec { pname = "thicket"; version = "0.1.3"; @@ -14,13 +17,18 @@ crystal.buildCrystalPackage rec { sha256 = "0hkmmssiwipx373d0zw9a2yn72gqzqzcvwkqbs522m5adz6qmkzw"; }; + format = "shards"; + shardsFile = ./shards.nix; crystalBinaries.thicket.src = "src/thicket.cr"; + # there is one test that tries to clone a repo + doCheck = false; + meta = with lib; { description = "A better one-line git log"; homepage = "https://github.com/taylorthurlow/thicket"; license = licenses.mit; maintainers = with maintainers; [ filalex77 ]; }; -} \ No newline at end of file +} -- cgit v1.2.3 From 138300330c967a5514b4b8e54f4619fb6902194b Mon Sep 17 00:00:00 2001 From: Scott Worley Date: Wed, 22 Apr 2020 02:40:36 -0700 Subject: allegro4: 4.4.2 -> 4.4.3.1 (fixes atanks & racer) --- .../libraries/allegro/allegro4-mesa-18.2.5.patch | 26 ---------------------- pkgs/development/libraries/allegro/default.nix | 5 ++--- 2 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 pkgs/development/libraries/allegro/allegro4-mesa-18.2.5.patch diff --git a/pkgs/development/libraries/allegro/allegro4-mesa-18.2.5.patch b/pkgs/development/libraries/allegro/allegro4-mesa-18.2.5.patch deleted file mode 100644 index c49ebb550f3..00000000000 --- a/pkgs/development/libraries/allegro/allegro4-mesa-18.2.5.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/addons/allegrogl/include/alleggl.h -+++ b/addons/allegrogl/include/alleggl.h -@@ -63,9 +63,11 @@ typedef __int64 INT64; - /* HACK: Prevent both Mesa and SGI's broken headers from screwing us */ - #define __glext_h_ - #define __glxext_h_ -+#define __glx_glxext_h_ - #include - #undef __glext_h_ - #undef __glxext_h_ -+#undef __glx_glxext_h_ - - #endif /* ALLEGRO_MACOSX */ - ---- a/addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h -+++ b/addons/allegrogl/include/allegrogl/GLext/glx_ext_defs.h -@@ -1,7 +1,9 @@ - /* HACK: Prevent both Mesa and SGI's broken headers from screwing us */ - #define __glxext_h_ -+#define __glx_glxext_h_ - #include - #undef __glxext_h_ -+#undef __glx_glxext_h_ - - #ifndef GLX_VERSION_1_3 - #define AGLX_VERSION_1_3 diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index 963590d4faf..6071f63255d 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -5,15 +5,14 @@ stdenv.mkDerivation rec { pname = "allegro"; - version="4.4.2"; + version="4.4.3.1"; src = fetchurl { url = "https://github.com/liballeg/allegro5/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "1p0ghkmpc4kwij1z9rzxfv7adnpy4ayi0ifahlns1bdzgmbyf88v"; + sha256 = "1m6lz35nk07dli26kkwz3wa50jsrxs1kb6w1nj14a911l34xn6gc"; }; patches = [ - ./allegro4-mesa-18.2.5.patch ./nix-unstable-sandbox-fix.patch ]; -- cgit v1.2.3 From 56ab879c3ff92a3358165d32b88576d90e3555c4 Mon Sep 17 00:00:00 2001 From: Omoroca13 <54456290+Omoroca13@users.noreply.github.com> Date: Wed, 22 Apr 2020 11:48:05 +0200 Subject: pcsx2 unstable-2020-01-05 -> 1.6.0-rc --- pkgs/misc/emulators/pcsx2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix index 6f28c5777ca..3faba2ee467 100644 --- a/pkgs/misc/emulators/pcsx2/default.nix +++ b/pkgs/misc/emulators/pcsx2/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "pcsx2"; - version = "unstable-2020-01-05"; + version = "1.6.0-rc"; src = fetchFromGitHub { owner = "PCSX2"; repo = "pcsx2"; - rev = "9c12937351c51b921e1f28d44b019bc52e747c51"; - sha256 = "0y1f5v99a6njmf6hyvl4z5xnrm7351rkyw2fn4f09hqn92r7zmi5"; + rev = "v${version}"; + sha256 = "1mdv1dgwawb4k6bs1jh6j2jaaxg168fbssm1lwnlk5di0gz31h23"; }; postPatch = "sed '1i#include \"x86intrin.h\"' -i common/src/x86emitter/cpudetect.cpp"; -- cgit v1.2.3 From 84ff95a95ac7992f4adef5af173d017bed8acfdc Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 22 Apr 2020 11:00:10 +0200 Subject: arm-trusted-firmware: 2.2 -> 2.3 --- pkgs/misc/arm-trusted-firmware/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix index 664fa8fcb88..596f5e90e34 100644 --- a/pkgs/misc/arm-trusted-firmware/default.nix +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -6,7 +6,7 @@ let , platform ? null , extraMakeFlags ? [] , extraMeta ? {} - , version ? "2.2" + , version ? "2.3" , ... } @ args: stdenv.mkDerivation ({ @@ -16,8 +16,8 @@ let src = fetchFromGitHub { owner = "ARM-software"; repo = "arm-trusted-firmware"; - rev = "refs/tags/v${version}"; - sha256 = "03fjl5hy1bqlya6fg553bqz7jrvilzrzpbs87cv6jd04v8qrvry8"; + rev = "v${version}"; + sha256 = "113mcf1hwwl0i90cqh08lywxs1bfbg0nwqibay9wlkmx1a5v0bnj"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -51,7 +51,7 @@ let homepage = "https://github.com/ARM-software/arm-trusted-firmware"; description = "A reference implementation of secure world software for ARMv8-A"; license = licenses.bsd3; - maintainers = [ maintainers.lopsided98 ]; + maintainers = with maintainers; [ lopsided98 ]; } // extraMeta; } // builtins.removeAttrs args [ "extraMeta" ]); -- cgit v1.2.3 From 7d2561cbddfb65335bb225343ed1f46df098c7b9 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 21 Apr 2020 12:03:48 +0200 Subject: git: 2.26.1 -> 2.26.2 (security, CVE-2020-11008) See: https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.17.5.txt --- pkgs/applications/version-management/git-and-tools/git/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 54f0f744c04..8b8dbef12ab 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -21,7 +21,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.26.1"; + version = "2.26.2"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0s03ix9j1h0yychkh1l1cgpr1l9lwzn3rprl08rk8ii5ix02i0l8"; + sha256 = "0j685w6pzkn926z5nf5r8fij4ziipvw4c9yb0wc577nzf4j16rbd"; }; outputs = [ "out" ]; @@ -335,6 +335,7 @@ stdenv.mkDerivation { homepage = "https://git-scm.com/"; description = "Distributed version control system"; license = stdenv.lib.licenses.gpl2; + changelog = "https://raw.githubusercontent.com/git/git/${version}/Documentation/RelNotes/${version}.txt"; longDescription = '' Git, a popular distributed version control system designed to -- cgit v1.2.3 From 43790ee675fd03d1ebc10f7f1c355ab108a515bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 22 Apr 2020 12:54:15 +0100 Subject: nixpkgs-review: 2.2.0 -> 2.3.0 --- pkgs/tools/package-management/nixpkgs-review/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nixpkgs-review/default.nix b/pkgs/tools/package-management/nixpkgs-review/default.nix index d8811b2a7e2..b6455cc1705 100644 --- a/pkgs/tools/package-management/nixpkgs-review/default.nix +++ b/pkgs/tools/package-management/nixpkgs-review/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "nixpkgs-review"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "Mic92"; repo = "nixpkgs-review"; rev = version; - sha256 = "0qsvrcxl97nih1yprydzlqc6n1ppg726664d6harx5kjzp5776mr"; + sha256 = "0qkvjl4f8a1905yj3ml32rfdr5q76igz21gn3dcya0pfqhrnb28i"; }; makeWrapperArgs = [ -- cgit v1.2.3 From 50ba3f7ad80e0742966f682ea73269cc502d2fda Mon Sep 17 00:00:00 2001 From: Max Wittig Date: Wed, 22 Apr 2020 14:04:50 +0200 Subject: gitlab-runner: 12.9.0 -> 12.10.0 (#85748) --- .../tools/continuous-integration/gitlab-runner/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 1d94408bd21..b18bea0c907 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "12.9.0"; + version = "12.10.0"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "0kd4zc9rgzsl6imk9vi2yqpaxrgy8ywcz2vvpsfzrhhmm2yx3qh0"; + sha256 = "1a2cfr72b15h3ymxf69a0inb4amfxivdhfaj711wgyvcf5ymnbsv"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "13xwcvw6m3p5ffas5mr55jkqks9s3f7qg1b928vcxkx57j06kb22"; + sha256 = "18if2xbkldpn0bwfyk6bgbdl9rdg4rjxc0im6lclwcgpbmslwx5r"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0p9i4z0xsq5rl6gkqjpwpz6hb57vi6wl969gncrsfskjjc1kcifq"; + sha256 = "0bsd3dk2fi21klqwzw8c181gv61qxbd32lj6mhkj9liz4flarhmv"; }; patches = [ ./fix-shell-path.patch ]; -- cgit v1.2.3 From bbbc41918634c2388f1fd39db1c8f162e3ab4b95 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Wed, 22 Apr 2020 09:48:05 +0200 Subject: srcOnly: fix invocation and document Previously, callPackage would try and fill the arguments such as `name` and `src` which would cause problems if those existed as top-level attributes. This also makes it clearer what part is the function signature. Then document the derivation inline in the code to explain the ellipsis and various use-cases. --- pkgs/build-support/src-only/default.nix | 17 ++++++++++++++++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/src-only/default.nix b/pkgs/build-support/src-only/default.nix index a93b3648090..8ca262a998b 100644 --- a/pkgs/build-support/src-only/default.nix +++ b/pkgs/build-support/src-only/default.nix @@ -1,4 +1,19 @@ -{stdenv, name, src, patches ? [], buildInputs ? [], ...}: +{ stdenv }@orig: +# srcOnly is a utility builder that only fetches and unpacks the given `src`, +# maybe pathings it in the process with the optional `patches` and +# `buildInputs` attributes. +# +# It can be invoked directly, or be used to wrap an existing derivation. Eg: +# +# > srcOnly pkgs.hello +# +{ name +, src +, stdenv ? orig.stdenv +, patches ? [] +, buildInputs ? [] +, ... # needed when passing an existing derivation +}: stdenv.mkDerivation { inherit src buildInputs patches name; installPhase = "cp -r . $out"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index febca841867..7e61b010316 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -450,7 +450,7 @@ in singularity-tools = callPackage ../build-support/singularity-tools { }; - srcOnly = args: callPackage ../build-support/src-only args; + srcOnly = callPackage ../build-support/src-only { }; substituteAll = callPackage ../build-support/substitute/substitute-all.nix { }; -- cgit v1.2.3 From 2319f0c168aa13a2be6f5b7876ed85b4f7d3792a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 22 Apr 2020 13:13:51 +0200 Subject: python3Packages.google_api_python_client: 1.8.1 -> 1.8.2 --- .../python-modules/google-api-python-client/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 5f7d7dd275b..ac7bcb5cd52 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -1,24 +1,16 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch +{ lib, buildPythonPackage, fetchPypi , google_auth, google-auth-httplib2, google_api_core , httplib2, six, uritemplate, oauth2client }: buildPythonPackage rec { pname = "google-api-python-client"; - version = "1.8.1"; + version = "1.8.2"; src = fetchPypi { inherit pname version; - sha256 = "14d7719sxl7bqpw3k4hhfwd0l0v98lnpi7qlhdaf8jxw21ivzmpz"; + sha256 = "09g7v6yrf8p0kgmjnzy9d0fx9p1zngk2pmprf0bx19j1zc9jqj5z"; }; - patches = [ - # To fix a regression/bug in 1.8.1: - (fetchpatch { - url = "https://github.com/googleapis/google-api-python-client/commit/1d8ec6874e1c6081893de7cd7cbc86d1f6580320.patch"; - sha256 = "1nr24jzvbkzaigv9c935fkpzfa36hj6k7yx5bdwxqfhpa3p9i8n9"; - }) - ]; - # No tests included in archive doCheck = false; -- cgit v1.2.3 From 31d630c3a4f0f5b417244e054b0a88ecf9ec1acf Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 22 Apr 2020 08:14:40 -0400 Subject: Revert "ldc: 1.17.0 -> 1.20.1" --- pkgs/development/compilers/ldc/binary.nix | 41 ------- pkgs/development/compilers/ldc/bootstrap.nix | 10 -- pkgs/development/compilers/ldc/default.nix | 174 ++++++++++++++++++++++++++- pkgs/development/compilers/ldc/generic.nix | 143 ---------------------- pkgs/top-level/aliases.nix | 1 - 5 files changed, 171 insertions(+), 198 deletions(-) delete mode 100644 pkgs/development/compilers/ldc/binary.nix delete mode 100644 pkgs/development/compilers/ldc/bootstrap.nix delete mode 100644 pkgs/development/compilers/ldc/generic.nix diff --git a/pkgs/development/compilers/ldc/binary.nix b/pkgs/development/compilers/ldc/binary.nix deleted file mode 100644 index 56d40be8619..00000000000 --- a/pkgs/development/compilers/ldc/binary.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames, libxml2 -, version, hashes }: -with stdenv; -let - OS = if hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name; - ARCH = toString hostPlatform.parsed.cpu.name; -in mkDerivation { - pname = "ldc-bootstrap"; - inherit version; - - src = fetchurl rec { - name = "ldc2-${version}-${OS}-${ARCH}.tar.xz"; - url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/${name}"; - sha256 = hashes."${OS}-${ARCH}" or (throw "missing bootstrap sha256 for ${OS}-${ARCH}"); - }; - - dontConfigure = true; - dontBuild = true; - - nativeBuildInputs = [ fixDarwinDylibNames autoPatchelfHook ]; - - buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxml2 stdenv.cc.cc ]; - - propagatedBuildInputs = [ curl tzdata ]; - - installPhase = '' - mkdir -p $out - - mv bin etc import lib LICENSE README $out/ - ''; - - meta = with lib; { - inherit version; - description = "The LLVM-based D Compiler"; - homepage = "https://github.com/ldc-developers/ldc"; - # from https://github.com/ldc-developers/ldc/blob/master/LICENSE - license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ]; - maintainers = with maintainers; [ ThomasMader lionello ]; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; - }; -} diff --git a/pkgs/development/compilers/ldc/bootstrap.nix b/pkgs/development/compilers/ldc/bootstrap.nix deleted file mode 100644 index fde4c842684..00000000000 --- a/pkgs/development/compilers/ldc/bootstrap.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ callPackage }: -callPackage ./binary.nix { - version = "1.19.0"; - hashes = { - # Get these from `nix-prefetch-url https://github.com/ldc-developers/ldc/releases/download/v1.19.0/ldc2-1.19.0-osx-x86_64.tar.xz` etc.. - osx-x86_64 = "1bp3xkh9zp64dzq8isanib1gacb3nfbl70qv15qygwk1zan6zgy7"; - linux-x86_64 = "146grr2lwarfk13wgkpyb77xb6b3as1is2rf4s2hipqjmc8biy1h"; - linux-aarch64 = "1fv6jshfvi15m7masgxq1hgp216qjd5amizrqdf26vhrq3a08li3"; - }; -} diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index 5a4baabcf8d..19fe2981c83 100644 --- a/pkgs/development/compilers/ldc/default.nix +++ b/pkgs/development/compilers/ldc/default.nix @@ -1,5 +1,173 @@ -import ./generic.nix { - version = "1.20.1"; - ldcSha256 = "1bqsgab22v02pc3c9gcyf15y7aimadv24d68icaw5lpgnvzxy89b"; +{ stdenv, fetchurl, cmake, ninja, llvm_5, llvm_8, curl, tzdata +, libconfig, lit, gdb, unzip, darwin, bash +, callPackage, makeWrapper, runCommand, targetPackages +, bootstrapVersion ? false +, version ? "1.17.0" +, ldcSha256 ? "1aag5jfrng6p4ms0fs90hjbv9bcj3hj8h52r68c3cm6racdajbva" +}: + +let + bootstrapLdc = if !bootstrapVersion then + # LDC 0.17.x is the last version which doesn't need a working D compiler to + # build so we use that version to bootstrap the actual build. + callPackage ./default.nix { + bootstrapVersion = true; + version = "0.17.6"; + ldcSha256 = "0qf5kbxddgmg3kqzi0kf4bgv8vdrnv16y07hcpm0cwv9mc3qr2w6"; + } + else + ""; + + pathConfig = runCommand "ldc-lib-paths" {} '' + mkdir $out + echo ${tzdata}/share/zoneinfo/ > $out/TZDatabaseDirFile + echo ${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} > $out/LibcurlPathFile + ''; +in + +stdenv.mkDerivation rec { + pname = "ldc"; + inherit version; + + enableParallelBuilding = true; + + src = fetchurl { + url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz"; + sha256 = ldcSha256; + }; + + # https://issues.dlang.org/show_bug.cgi?id=19553 + hardeningDisable = [ "fortify" ]; + + postUnpack = '' + 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 + + # test depends on current year + rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/ddocYear.d + '' + + + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) '' + # https://github.com/NixOS/nixpkgs/issues/34817 + rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall + ''; + + postPatch = '' + # Setting SHELL=$SHELL when dmd testsuite is run doesn't work on Linux somehow + substituteInPlace tests/d2/dmd-testsuite/Makefile --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash" + '' + + + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isLinux) '' + substituteInPlace runtime/phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" "" + '' + + + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) '' + substituteInPlace runtime/phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)" + '' + + + stdenv.lib.optionalString (bootstrapVersion && stdenv.hostPlatform.isDarwin) '' + # Was not able to compile on darwin due to "__inline_isnanl" + # being undefined. + # TODO Remove with version > 0.17.6 + substituteInPlace dmd2/root/port.c --replace __inline_isnanl __inline_isnan + ''; + + nativeBuildInputs = [ cmake ninja makeWrapper unzip ] + ++ stdenv.lib.optionals (!bootstrapVersion) [ + bootstrapLdc lit lit.python + ] + ++ stdenv.lib.optional (!bootstrapVersion && stdenv.hostPlatform.isDarwin) + # https://github.com/NixOS/nixpkgs/issues/57120 + # https://github.com/NixOS/nixpkgs/pull/59197#issuecomment-481972515 + llvm_5 + ++ 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.optionals (bootstrapVersion) [ + libconfig llvm_5 + ] + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin + darwin.apple_sdk.frameworks.Foundation; + + + buildInputs = [ curl tzdata ]; + + cmakeFlags = stdenv.lib.optionals (!bootstrapVersion) [ + "-DD_FLAGS=-d-version=TZDatabaseDir;-d-version=LibcurlPath;-J${pathConfig}" + "-DCMAKE_BUILD_TYPE=Release" + ]; + + postConfigure = '' + export DMD=$PWD/bin/ldmd2 + ''; + + makeFlags = [ "DMD=$DMD" ]; + + fixNames = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + fixDarwinDylibNames() { + local flags=() + + for fn in "$@"; do + flags+=(-change "$(basename "$fn")" "$fn") + done + + for fn in "$@"; do + if [ -L "$fn" ]; then continue; fi + echo "$fn: fixing dylib" + install_name_tool -id "$fn" "''${flags[@]}" "$fn" + done + } + + fixDarwinDylibNames $(find "$(pwd)/lib" -name "*.dylib") + export DYLD_LIBRARY_PATH=$(pwd)/lib + ''; + + # https://github.com/ldc-developers/ldc/issues/2497#issuecomment-459633746 + additionalExceptions = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin + "|druntime-test-shared"; + + doCheck = !bootstrapVersion; + + checkPhase = stdenv.lib.optionalString doCheck '' + # Build default lib test runners + ninja -j$NIX_BUILD_CORES all-test-runners + + ${fixNames} + + # Run dmd testsuite + export DMD_TESTSUITE_MAKE_ARGS="-j$NIX_BUILD_CORES DMD=$DMD CC=$CXX" + ctest -V -R "dmd-testsuite" + + # Build and run LDC D unittests. + ctest --output-on-failure -R "ldc2-unittest" + + # Run LIT testsuite. + ctest -V -R "lit-tests" + + # Run default lib unittests + ctest -j$NIX_BUILD_CORES --output-on-failure -E "ldc2-unittest|lit-tests|dmd-testsuite${additionalExceptions}" + ''; + + postInstall = '' + wrapProgram $out/bin/ldc2 \ + --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \ + --set-default CC "${targetPackages.stdenv.cc}/bin/cc" + ''; + + meta = with stdenv.lib; { + description = "The LLVM-based D compiler"; + homepage = "https://github.com/ldc-developers/ldc"; + # from https://github.com/ldc-developers/ldc/blob/master/LICENSE + license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ]; + maintainers = with maintainers; [ ThomasMader ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + }; } diff --git a/pkgs/development/compilers/ldc/generic.nix b/pkgs/development/compilers/ldc/generic.nix deleted file mode 100644 index c93d423945c..00000000000 --- a/pkgs/development/compilers/ldc/generic.nix +++ /dev/null @@ -1,143 +0,0 @@ -{ version, ldcSha256 }: -{ stdenv, fetchurl, cmake, ninja, llvm_5, llvm_8, curl, tzdata -, libconfig, lit, gdb, unzip, darwin, bash -, callPackage, makeWrapper, runCommand, targetPackages -, ldcBootstrap ? callPackage ./bootstrap.nix { } -}: - -let - pathConfig = runCommand "ldc-lib-paths" {} '' - mkdir $out - echo ${tzdata}/share/zoneinfo/ > $out/TZDatabaseDirFile - echo ${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} > $out/LibcurlPathFile - ''; - -in - -stdenv.mkDerivation rec { - pname = "ldc"; - inherit version; - - enableParallelBuilding = true; - - src = fetchurl { - url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz"; - sha256 = ldcSha256; - }; - - # https://issues.dlang.org/show_bug.cgi?id=19553 - hardeningDisable = [ "fortify" ]; - - postUnpack = '' - patchShebangs . - '' - + '' - 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 - - # test depends on current year - rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/ddocYear.d - '' - + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' - # https://github.com/NixOS/nixpkgs/issues/34817 - rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall - ''; - - postPatch = '' - # Setting SHELL=$SHELL when dmd testsuite is run doesn't work on Linux somehow - substituteInPlace tests/d2/dmd-testsuite/Makefile --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash" - '' - + stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' - substituteInPlace runtime/phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" "" - '' - + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' - substituteInPlace runtime/phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)" - ''; - - nativeBuildInputs = [ - cmake ninja makeWrapper unzip ldcBootstrap lit lit.python - ] - ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ - darwin.apple_sdk.frameworks.Foundation - # https://github.com/NixOS/nixpkgs/issues/57120 - # https://github.com/NixOS/nixpkgs/pull/59197#issuecomment-481972515 - llvm_5 - ] - ++ stdenv.lib.optionals (!stdenv.hostPlatform.isDarwin) [ - llvm_8 - # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 - gdb - ]; - - buildInputs = [ curl tzdata ]; - - cmakeFlags = [ - "-DD_FLAGS=-d-version=TZDatabaseDir;-d-version=LibcurlPath;-J${pathConfig}" - "-DCMAKE_BUILD_TYPE=Release" - ]; - - postConfigure = '' - export DMD=$PWD/bin/ldmd2 - ''; - - makeFlags = [ "DMD=$DMD" ]; - - fixNames = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' - fixDarwinDylibNames() { - local flags=() - - for fn in "$@"; do - flags+=(-change "$(basename "$fn")" "$fn") - done - - for fn in "$@"; do - if [ -L "$fn" ]; then continue; fi - echo "$fn: fixing dylib" - install_name_tool -id "$fn" "''${flags[@]}" "$fn" - done - } - - fixDarwinDylibNames $(find "$(pwd)/lib" -name "*.dylib") - export DYLD_LIBRARY_PATH=$(pwd)/lib - ''; - - # https://github.com/ldc-developers/ldc/issues/2497#issuecomment-459633746 - additionalExceptions = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin - "|druntime-test-shared"; - - checkPhase = '' - # Build default lib test runners - ninja -j$NIX_BUILD_CORES all-test-runners - - ${fixNames} - - # Run dmd testsuite - export DMD_TESTSUITE_MAKE_ARGS="-j$NIX_BUILD_CORES DMD=$DMD" - ctest -V -R "dmd-testsuite" - - # Build and run LDC D unittests. - ctest --output-on-failure -R "ldc2-unittest" - - # Run LIT testsuite. - ctest -V -R "lit-tests" - - # Run default lib unittests - ctest -j$NIX_BUILD_CORES --output-on-failure -E "ldc2-unittest|lit-tests|dmd-testsuite${additionalExceptions}" - ''; - - postInstall = '' - wrapProgram $out/bin/ldc2 \ - --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \ - --set-default CC "${targetPackages.stdenv.cc}/bin/cc" - ''; - - meta = with stdenv.lib; { - description = "The LLVM-based D compiler"; - homepage = "https://github.com/ldc-developers/ldc"; - # from https://github.com/ldc-developers/ldc/blob/master/LICENSE - license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ]; - maintainers = with maintainers; [ ThomasMader lionello ]; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4b2b36eb352..9ad282149aa 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -216,7 +216,6 @@ mapAliases ({ keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # 2019-12-10 kvm = qemu_kvm; # added 2018-04-25 latinmodern-math = lmmath; - ldc2 = ldc; # added 2020-04-18 letsencrypt = certbot; # added 2016-05-16 libaudit = audit; # added 2018-04-25 libcanberra_gtk2 = libcanberra-gtk2; # added 2018-02-25 -- cgit v1.2.3 From a33ce7e4fb6774dfc280b5ccd9451297804bc7c5 Mon Sep 17 00:00:00 2001 From: Julian Stecklina Date: Wed, 22 Apr 2020 14:40:38 +0200 Subject: spike: add test to nixosTests --- nixos/tests/all-tests.nix | 1 + pkgs/applications/virtualization/spike/default.nix | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index cbfdf3ad9c2..38e8980b748 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -287,6 +287,7 @@ in snapper = handleTest ./snapper.nix {}; solr = handleTest ./solr.nix {}; spacecookie = handleTest ./spacecookie.nix {}; + spike = handleTest ./spike.nix {}; sonarr = handleTest ./sonarr.nix {}; strongswan-swanctl = handleTest ./strongswan-swanctl.nix {}; sudo = handleTest ./sudo.nix {}; diff --git a/pkgs/applications/virtualization/spike/default.nix b/pkgs/applications/virtualization/spike/default.nix index 4dbb7fbe4a5..0f397bc272a 100644 --- a/pkgs/applications/virtualization/spike/default.nix +++ b/pkgs/applications/virtualization/spike/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, dtc }: +{ stdenv, fetchgit, dtc, nixosTests }: stdenv.mkDerivation rec { pname = "spike"; @@ -20,6 +20,10 @@ stdenv.mkDerivation rec { doCheck = true; + passthru.tests = { + can-run-hello-world = nixosTests.spike; + }; + meta = with stdenv.lib; { description = "A RISC-V ISA Simulator"; homepage = "https://github.com/riscv/riscv-isa-sim"; -- cgit v1.2.3 From 81902419ddb83f4d3cbe1750317ce1669e2ca73e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 15 Apr 2020 12:04:47 +0000 Subject: mblaze: install msuck and mblow There are lots of other scripts in contrib that we should probably also install, but I didn't feel like taking the time to review them all and figure out what dependencies they would need. It would have been a shame to add a mandatory dependency on Ruby (and all that entails) to a package that otherwise has basically no dependencies, so I've made the Ruby dependency optional. --- pkgs/applications/networking/mailreaders/mblaze/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix index 82550cf43cc..fc9001e59e3 100644 --- a/pkgs/applications/networking/mailreaders/mblaze/default.nix +++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchFromGitHub, fetchpatch, libiconv }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, libiconv, ruby ? null }: stdenv.mkDerivation rec { pname = "mblaze"; version = "0.5.1"; - buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; + buildInputs = [ ruby ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; src = fetchFromGitHub { owner = "chneukirchen"; @@ -24,9 +24,11 @@ stdenv.mkDerivation rec { postInstall = '' install -Dm644 -t $out/share/zsh/site-functions contrib/_mblaze + '' + lib.optionalString (ruby != null) '' + install -Dt $out/bin contrib/msuck contrib/mblow ''; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/chneukirchen/mblaze"; description = "Unix utilities to deal with Maildir"; license = licenses.cc0; -- cgit v1.2.3 From 83102fcbae121a5348dbc5c32bd64fb9a0e5d49c Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 7 Apr 2020 20:48:08 +0200 Subject: enyo-doom: use qt5's mkDerivation --- pkgs/games/enyo-doom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/enyo-doom/default.nix b/pkgs/games/enyo-doom/default.nix index af002a690e4..ba07b50a1e7 100644 --- a/pkgs/games/enyo-doom/default.nix +++ b/pkgs/games/enyo-doom/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitLab, cmake, qtbase }: +{ mkDerivation, stdenv, fetchFromGitLab, cmake, qtbase }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "enyo-doom"; version = "1.06.9"; -- cgit v1.2.3 From b98fa7cdb84fc43bb7bf042304d77913c38ce6e1 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 7 Apr 2020 22:23:53 +0200 Subject: httraqt: use qt5's mkDerivation --- pkgs/tools/backup/httrack/qt.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/httrack/qt.nix b/pkgs/tools/backup/httrack/qt.nix index fe5b965e570..6ee7f6e6a21 100644 --- a/pkgs/tools/backup/httrack/qt.nix +++ b/pkgs/tools/backup/httrack/qt.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, cmake, pkgconfig, makeWrapper +{ mkDerivation, stdenv, fetchurl, cmake, pkgconfig, makeWrapper , httrack, qtbase, qtmultimedia }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "httraqt"; version = "1.4.9"; -- cgit v1.2.3 From f9ef2c194a341603e2f0019222b131f2540d8da0 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 7 Apr 2020 22:24:12 +0200 Subject: yabause: use qt5's mkDerivation --- pkgs/misc/emulators/yabause/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/yabause/default.nix b/pkgs/misc/emulators/yabause/default.nix index d29d7b1e7b8..584a7b47dc7 100644 --- a/pkgs/misc/emulators/yabause/default.nix +++ b/pkgs/misc/emulators/yabause/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchurl, cmake, pkgconfig, qtbase, qt5, libGLU, libGL +{ mkDerivation, stdenv, fetchurl, cmake, pkgconfig, qtbase, qt5, libGLU, libGL , freeglut ? null, openal ? null, SDL2 ? null }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "yabause"; version = "0.9.15"; -- cgit v1.2.3 From 5858162f5e62c9a643e5d7c3f38365eb68b230ba Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 7 Apr 2020 22:24:28 +0200 Subject: calaos_installer: use qt5's mkDerivation --- pkgs/misc/calaos/installer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/calaos/installer/default.nix b/pkgs/misc/calaos/installer/default.nix index 81f00d59f69..6254c9c24f4 100644 --- a/pkgs/misc/calaos/installer/default.nix +++ b/pkgs/misc/calaos/installer/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, qmake, qttools, qtbase }: +{ mkDerivation, stdenv, fetchFromGitHub, qmake, qttools, qtbase }: -stdenv.mkDerivation rec { +mkDerivation rec { name = "calaos_installer-3.1"; version = "3.1"; -- cgit v1.2.3 From 7d1c2c05c52c6a717d19a6498c22beea1c15631b Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 7 Apr 2020 22:25:03 +0200 Subject: caneda: use qt5's mkDerivation --- pkgs/applications/science/electronics/caneda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix index 6f832013e8c..c90ceac6788 100644 --- a/pkgs/applications/science/electronics/caneda/default.nix +++ b/pkgs/applications/science/electronics/caneda/default.nix @@ -1,6 +1,6 @@ -{stdenv, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt }: +{ mkDerivation, stdenv, fetchFromGitHub, cmake, qtbase, qttools, qtsvg, qwt }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "caneda"; version = "0.3.1"; -- cgit v1.2.3 From 904fc69424493d8319ecac983dca3ecdf4c3dea6 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 7 Apr 2020 22:26:17 +0200 Subject: write_stylus: use qt5's mkDerivation --- pkgs/applications/graphics/write_stylus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/write_stylus/default.nix b/pkgs/applications/graphics/write_stylus/default.nix index b1bfbe3c4cf..31fc4045026 100644 --- a/pkgs/applications/graphics/write_stylus/default.nix +++ b/pkgs/applications/graphics/write_stylus/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, qtbase, qtsvg, libglvnd, fetchurl, makeDesktopItem }: +{ mkDerivation, stdenv, lib, qtbase, qtsvg, libglvnd, fetchurl, makeDesktopItem }: let # taken from: https://www.iconfinder.com/icons/50835/edit_pencil_write_icon # license: Free for commercial use @@ -7,7 +7,7 @@ let sha256 = "0abdya42yf9alxbsmc2nf8jwld50zfria6z3d4ncvp1zw2a9jhb8"; }; in -stdenv.mkDerivation rec { +mkDerivation rec { pname = "write_stylus"; version = "209"; -- cgit v1.2.3 From 01de13ad6fff959ace8d90505af06391367e5c6c Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 7 Apr 2020 22:26:30 +0200 Subject: valentina: use qt5's mkDerivation --- pkgs/applications/misc/valentina/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/valentina/default.nix b/pkgs/applications/misc/valentina/default.nix index 6a1dd06de32..e9e8cfed796 100644 --- a/pkgs/applications/misc/valentina/default.nix +++ b/pkgs/applications/misc/valentina/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchhg +{ mkDerivation, stdenv, fetchhg , qmake, qttools , qtbase, qtsvg, qtxmlpatterns , poppler_utils @@ -6,7 +6,7 @@ with stdenv.lib; -stdenv.mkDerivation rec { +mkDerivation rec { pname = "valentina"; version = "0.6.1"; -- cgit v1.2.3 From 461843af7184828d1e43194f5aea02e70e07d60a Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 7 Apr 2020 22:26:48 +0200 Subject: traverso: use qt5's mkDerivation --- pkgs/applications/audio/traverso/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/traverso/default.nix b/pkgs/applications/audio/traverso/default.nix index 504e6ae9644..63ba44bec35 100644 --- a/pkgs/applications/audio/traverso/default.nix +++ b/pkgs/applications/audio/traverso/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, cmake, pkgconfig +{ mkDerivation, stdenv, fetchurl, cmake, pkgconfig , alsaLib, fftw, flac, lame, libjack2, libmad, libpulseaudio , libsamplerate, libsndfile, libvorbis, portaudio, qtbase, wavpack }: -stdenv.mkDerivation { +mkDerivation { pname = "traverso"; version = "0.49.6"; -- cgit v1.2.3 From 86aab715909af417c66e1dabe283248b4907cbac Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 7 Apr 2020 22:27:05 +0200 Subject: swift-im: use qt5's mkDerivation --- pkgs/applications/networking/instant-messengers/swift-im/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/swift-im/default.nix b/pkgs/applications/networking/instant-messengers/swift-im/default.nix index ce59d574619..953ce2809c4 100644 --- a/pkgs/applications/networking/instant-messengers/swift-im/default.nix +++ b/pkgs/applications/networking/instant-messengers/swift-im/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, pkgconfig, qttools, scons +{ mkDerivation, stdenv, fetchurl, pkgconfig, qttools, scons , GConf, avahi, boost, hunspell, libXScrnSaver, libedit, libidn, libnatpmp, libxml2 , lua, miniupnpc, openssl, qtbase, qtmultimedia, qtsvg, qtwebkit, qtx11extras, zlib }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "swift-im"; version = "4.0.2"; -- cgit v1.2.3 From 4b7193b67a3269a6b2e051398fe7efd025867304 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 7 Apr 2020 22:27:18 +0200 Subject: ricochet: use qt5's mkDerivation --- pkgs/applications/networking/instant-messengers/ricochet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix index 01295697ad3..de46c891d1f 100644 --- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix +++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, pkgconfig, makeDesktopItem +{ mkDerivation, stdenv, fetchurl, pkgconfig, makeDesktopItem , qtbase, qttools, qtmultimedia, qtquick1, qtquickcontrols , openssl, protobuf, qmake }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "ricochet"; version = "1.1.4"; -- cgit v1.2.3 From e036261b1575740839aa1180a4d1aca4b1766b9c Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 7 Apr 2020 22:27:31 +0200 Subject: qstopmotion: use qt5's mkDerivation --- pkgs/applications/video/qstopmotion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix index e2243797a3b..4a6d2a05a67 100644 --- a/pkgs/applications/video/qstopmotion/default.nix +++ b/pkgs/applications/video/qstopmotion/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, qt5, ffmpeg, guvcview, cmake, ninja, libxml2 +{ mkDerivation, stdenv, fetchurl, qt5, ffmpeg, guvcview, cmake, ninja, libxml2 , gettext, pkgconfig, libgphoto2, gphoto2, v4l-utils, libv4l, pcre , qwt, extra-cmake-modules }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "qstopmotion"; version = "2.4.1"; -- cgit v1.2.3 From 5f70a209da8ee8732a622a87af428b6ae5b312fb Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 7 Apr 2020 22:28:34 +0200 Subject: qmediathekview: use qt5's mkDerivation --- pkgs/applications/video/qmediathekview/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/qmediathekview/default.nix b/pkgs/applications/video/qmediathekview/default.nix index 16006668846..7556727a80d 100644 --- a/pkgs/applications/video/qmediathekview/default.nix +++ b/pkgs/applications/video/qmediathekview/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, qtbase, qttools, xz, boost, qmake, pkgconfig }: +{ mkDerivation, stdenv, fetchFromGitHub, qtbase, qttools, xz, boost, qmake, pkgconfig }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "QMediathekView"; version = "2019-01-06"; -- cgit v1.2.3 From 2986699ab02685e97b7e2cb0a2e21453c587887f Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 7 Apr 2020 22:29:03 +0200 Subject: qcomicbook: use qt5's mkDerivation --- pkgs/applications/graphics/qcomicbook/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/qcomicbook/default.nix b/pkgs/applications/graphics/qcomicbook/default.nix index 4f7e5b931f4..f9dc494b4b3 100644 --- a/pkgs/applications/graphics/qcomicbook/default.nix +++ b/pkgs/applications/graphics/qcomicbook/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, qtx11extras, poppler }: +{ mkDerivation, stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, qtx11extras, poppler }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "qcomicbook"; version = "0.9.1"; -- cgit v1.2.3 From 606a15d9d8d3fb9239396f093ed1b2e196c92376 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 7 Apr 2020 22:29:20 +0200 Subject: phototonic: use qt5's mkDerivation --- pkgs/applications/graphics/phototonic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/phototonic/default.nix b/pkgs/applications/graphics/phototonic/default.nix index 1c6c1b43354..7020bf6c83e 100644 --- a/pkgs/applications/graphics/phototonic/default.nix +++ b/pkgs/applications/graphics/phototonic/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, qtbase, qmake, exiv2 }: +{ mkDerivation, stdenv, fetchFromGitHub, qtbase, qmake, exiv2 }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "phototonic"; version = "2.1"; -- cgit v1.2.3 From 9f0dba130281d5828991163b4b1c0e2123a81281 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 7 Apr 2020 22:29:34 +0200 Subject: openbrf: use qt5's mkDerivation --- pkgs/applications/misc/openbrf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix index 6140343fae7..8e990b6dffb 100644 --- a/pkgs/applications/misc/openbrf/default.nix +++ b/pkgs/applications/misc/openbrf/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, libGLU, libGL }: +{ mkDerivation, stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, libGLU, libGL }: -stdenv.mkDerivation { +mkDerivation { name = "openbrf-unstable-2016-01-09"; src = fetchFromGitHub { -- cgit v1.2.3 From affebc860096989b2835c753b51a9ad13f2baafc Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 7 Apr 2020 22:30:21 +0200 Subject: okteta: use qt5's mkDerivation --- pkgs/applications/editors/okteta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix index fa63ee90adc..b9d92409198 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, extra-cmake-modules, kdoctools, qtscript, kconfig +{ mkDerivation, stdenv, fetchurl, extra-cmake-modules, kdoctools, qtscript, kconfig , kinit, karchive, kcrash, kcmutils, kconfigwidgets, knewstuff, kparts , qca-qt5, shared-mime-info }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "okteta"; version = "0.26.3"; -- cgit v1.2.3 From 22af8e8ed7b54a343d4c52bd4e60bb6758a29b45 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 7 Apr 2020 22:30:49 +0200 Subject: mindforger: use qt5's mkDerivation --- pkgs/applications/editors/mindforger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/mindforger/default.nix b/pkgs/applications/editors/mindforger/default.nix index 1397ea2d586..82aa38c1449 100644 --- a/pkgs/applications/editors/mindforger/default.nix +++ b/pkgs/applications/editors/mindforger/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, qmake, qtbase, qtwebkit }: +{ mkDerivation, stdenv, fetchurl, qmake, qtbase, qtwebkit }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "mindforger"; version = "1.48.2"; -- cgit v1.2.3 From 21d3ce58879cbcdd7cd3392a43b665ba5101d734 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 7 Apr 2020 22:31:09 +0200 Subject: dfasma: use qt5's mkDerivation --- pkgs/applications/audio/dfasma/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix index 7965cbd83fd..6df4679d1d5 100644 --- a/pkgs/applications/audio/dfasma/default.nix +++ b/pkgs/applications/audio/dfasma/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, qmake }: +{ mkDerivation, stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, qmake }: let @@ -26,7 +26,7 @@ let }; }; -in stdenv.mkDerivation rec { +in mkDerivation rec { pname = "dfasma"; version = "1.4.5"; -- cgit v1.2.3 From 98f126615f64aa22eb0fd4886b377eff8d8cfbf8 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 7 Apr 2020 22:31:44 +0200 Subject: bomi: use qt5's mkDerivation Wrap Qt program manually, remove makeWrapper from nativeBuildInputs. --- pkgs/applications/video/bomi/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix index 7ba37936c68..d812ac48874 100644 --- a/pkgs/applications/video/bomi/default.nix +++ b/pkgs/applications/video/bomi/default.nix @@ -1,7 +1,7 @@ -{ config, stdenv, fetchFromGitHub +{ mkDerivation, config, stdenv, fetchFromGitHub , fetchpatch, pkgconfig, perl, python, which , libX11, libxcb, libGLU, libGL -, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake, makeWrapper +, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake , libchardet , ffmpeg @@ -29,7 +29,7 @@ assert pulseSupport -> libpulseaudio != null; assert cddaSupport -> libcdda != null; assert youtubeSupport -> youtube-dl != null; -stdenv.mkDerivation rec { +mkDerivation rec { pname = "bomi"; version = "0.9.11"; @@ -90,8 +90,9 @@ stdenv.mkDerivation rec { patchShebangs build-mpv ''; + dontWrapQtApps = true; postInstall = '' - wrapProgram $out/bin/bomi \ + wrapQtApp $out/bin/bomi \ ${optionalString youtubeSupport "--prefix PATH ':' '${youtube-dl}/bin'"} ''; @@ -105,7 +106,7 @@ stdenv.mkDerivation rec { ++ optional cddaSupport "--enable-cdda" ; - nativeBuildInputs = [ makeWrapper pkgconfig perl python which qttools qmake ]; + nativeBuildInputs = [ pkgconfig perl python which qttools qmake ]; meta = with stdenv.lib; { description = "Powerful and easy-to-use multimedia player"; -- cgit v1.2.3 From eae808331c0faca21f6c6ec51388d5c8538ea8bc Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 7 Apr 2020 22:31:58 +0200 Subject: bibletime: use qt5's mkDerivation --- pkgs/applications/misc/bibletime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/bibletime/default.nix b/pkgs/applications/misc/bibletime/default.nix index 9489bfa0016..cfac79bef4b 100644 --- a/pkgs/applications/misc/bibletime/default.nix +++ b/pkgs/applications/misc/bibletime/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchurl, cmake, pkgconfig, sword, boost, clucene_core +{ mkDerivation, stdenv, fetchurl, cmake, pkgconfig, sword, boost, clucene_core , qtbase, qttools, qtsvg, qtwebkit }: -stdenv.mkDerivation rec { +mkDerivation rec { version = "2.11.2"; -- cgit v1.2.3 From a0a076b8570ef51cd7b7269a68e29e452884f63b Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 7 Apr 2020 22:32:16 +0200 Subject: awesomebump: use qt5's mkDerivation Wrap Qt program manually, remove makeWrapper from nativeBuildInputs. --- pkgs/applications/graphics/awesomebump/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix index c02140e1905..4d79f10a9e1 100644 --- a/pkgs/applications/graphics/awesomebump/default.nix +++ b/pkgs/applications/graphics/awesomebump/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchgit, qtbase, qmake, makeWrapper, qtscript, flex, bison, qtdeclarative }: +{ mkDerivation, lib, fetchgit, qtbase, qmake, qtscript, flex, bison, qtdeclarative }: let @@ -11,7 +11,7 @@ let fetchSubmodules = true; }; - qtnproperty = stdenv.mkDerivation { + qtnproperty = mkDerivation { name = "qtnproperty"; inherit src; sourceRoot = "AwesomeBump/Sources/utils/QtnProperty"; @@ -22,7 +22,7 @@ let install -D bin-linux/QtnPEG $out/bin/QtnPEG ''; }; -in stdenv.mkDerivation { +in mkDerivation { pname = "awesomebump"; inherit version; @@ -30,12 +30,13 @@ in stdenv.mkDerivation { buildInputs = [ qtbase qtscript qtdeclarative ]; - nativeBuildInputs = [ qmake makeWrapper ]; + nativeBuildInputs = [ qmake ]; preBuild = '' ln -sf ${qtnproperty}/bin/QtnPEG Sources/utils/QtnProperty/bin-linux/QtnPEG ''; + dontWrapQtApps = true; postInstall = '' d=$out/libexec/AwesomeBump @@ -44,7 +45,7 @@ in stdenv.mkDerivation { cp -prd Bin/Configs Bin/Core $d/ # AwesomeBump expects to find Core and Configs in its current directory. - makeWrapper $d/AwesomeBump $out/bin/AwesomeBump \ + makeQtWrapper $d/AwesomeBump $out/bin/AwesomeBump \ --run "cd $d" ''; -- cgit v1.2.3 From 4ee9179a110ceb30cd946a6d0f4725fe7eb231cd Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 7 Apr 2020 22:32:37 +0200 Subject: aqemu: use qt5's mkDerivation --- pkgs/applications/virtualization/aqemu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/aqemu/default.nix b/pkgs/applications/virtualization/aqemu/default.nix index f98b8eefd78..9177f264502 100644 --- a/pkgs/applications/virtualization/aqemu/default.nix +++ b/pkgs/applications/virtualization/aqemu/default.nix @@ -1,7 +1,7 @@ -{ cmake, fetchFromGitHub, libvncserver, qemu, qtbase, stdenv +{ mkDerivation, cmake, fetchFromGitHub, libvncserver, qemu, qtbase, stdenv }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "aqemu"; version = "0.9.2"; -- cgit v1.2.3 From cc8d12118c00a251094cb9e1aa8c5a812a852634 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 7 Apr 2020 22:32:47 +0200 Subject: qt-box-editor: use qt5's mkDerivation --- pkgs/applications/misc/qt-box-editor/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/qt-box-editor/default.nix b/pkgs/applications/misc/qt-box-editor/default.nix index c65e5377eb3..852f0d30f9a 100644 --- a/pkgs/applications/misc/qt-box-editor/default.nix +++ b/pkgs/applications/misc/qt-box-editor/default.nix @@ -1,4 +1,5 @@ -{ stdenv +{ mkDerivation +, stdenv , fetchFromGitHub , qtbase , qtsvg @@ -7,7 +8,7 @@ , tesseract }: -stdenv.mkDerivation { +mkDerivation { pname = "qt-box-editor"; version = "unstable-2019-07-12"; -- cgit v1.2.3 From adae9f1260045963dc53a0e886c5c488299b940a Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 7 Apr 2020 22:32:55 +0200 Subject: rocket: use qt5's mkDerivation --- pkgs/tools/graphics/rocket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/rocket/default.nix b/pkgs/tools/graphics/rocket/default.nix index 97c400fbc9e..683a2c73f45 100644 --- a/pkgs/tools/graphics/rocket/default.nix +++ b/pkgs/tools/graphics/rocket/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase }: +{ mkDerivation, stdenv, fetchFromGitHub, qmake, qtbase }: -stdenv.mkDerivation { +mkDerivation { pname = "rocket"; version = "2018-06-09"; -- cgit v1.2.3 From ec922277e4865676297408f18b0ba836749f66e0 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 7 Apr 2020 22:33:07 +0200 Subject: pro-office-calculator: use qt5's mkDerivation --- pkgs/games/pro-office-calculator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/pro-office-calculator/default.nix b/pkgs/games/pro-office-calculator/default.nix index bbdcd3f5850..7a0e3bec78d 100644 --- a/pkgs/games/pro-office-calculator/default.nix +++ b/pkgs/games/pro-office-calculator/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, tinyxml-2, cmake, qtbase, qtmultimedia }: -stdenv.mkDerivation rec { +{ mkDerivation, stdenv, fetchFromGitHub, tinyxml-2, cmake, qtbase, qtmultimedia }: +mkDerivation rec { version = "1.0.13"; pname = "pro-office-calculator"; -- cgit v1.2.3 From 9384f488604e8686311810301bb0c28a3c65fdff Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 7 Apr 2020 22:33:20 +0200 Subject: iannix: use qt5's mkDerivation --- pkgs/applications/audio/iannix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix index 2d4a2e9265a..fa779a7f0f4 100644 --- a/pkgs/applications/audio/iannix/default.nix +++ b/pkgs/applications/audio/iannix/default.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmake +{ mkDerivation, stdenv, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmake }: -stdenv.mkDerivation { +mkDerivation { pname = "iannix"; version = "2016-01-31"; src = fetchFromGitHub { -- cgit v1.2.3 From 7dce1c520287dd9d6e4470a5def8e600f85356cf Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 7 Apr 2020 22:33:30 +0200 Subject: glogg: use qt5's mkDerivation --- pkgs/tools/text/glogg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/glogg/default.nix b/pkgs/tools/text/glogg/default.nix index 9dec057dfe9..90c1419ef30 100644 --- a/pkgs/tools/text/glogg/default.nix +++ b/pkgs/tools/text/glogg/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, qmake, boost }: +{ mkDerivation, stdenv, fetchurl, qmake, boost }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "glogg"; version = "1.1.4"; -- cgit v1.2.3 From 65050cd7e5b9cb680aaf71e5d4cd3bcd469632e8 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 7 Apr 2020 22:33:41 +0200 Subject: firebird-emu: use qt5's mkDerivation --- pkgs/misc/emulators/firebird-emu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/firebird-emu/default.nix b/pkgs/misc/emulators/firebird-emu/default.nix index 583e692e133..888cfea0204 100644 --- a/pkgs/misc/emulators/firebird-emu/default.nix +++ b/pkgs/misc/emulators/firebird-emu/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, qmake, qtbase, qtdeclarative }: +{ mkDerivation, stdenv, fetchFromGitHub, qmake, qtbase, qtdeclarative }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "firebird-emu"; version = "1.4"; -- cgit v1.2.3 From 8dd46d4ffe0131c94d968ae5a94c482ac1017dde Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 7 Apr 2020 22:33:53 +0200 Subject: luckybackup: use qt5's mkDerivation --- pkgs/tools/backup/luckybackup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/luckybackup/default.nix b/pkgs/tools/backup/luckybackup/default.nix index 3e89be15391..7203ba480e6 100644 --- a/pkgs/tools/backup/luckybackup/default.nix +++ b/pkgs/tools/backup/luckybackup/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl +{ mkDerivation, stdenv, fetchurl , pkgconfig, libtool, qmake , rsync, ssh }: with stdenv.lib; -stdenv.mkDerivation rec { +mkDerivation rec { pname = "luckybackup"; version = "0.5.0"; -- cgit v1.2.3 From 2e8962bb6e74bb8980a8b3637fe52f02b563bd5f Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 7 Apr 2020 22:34:04 +0200 Subject: colord-kde: use qt5's mkDerivation --- pkgs/tools/misc/colord-kde/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/colord-kde/default.nix b/pkgs/tools/misc/colord-kde/default.nix index 8897514783a..33686498112 100644 --- a/pkgs/tools/misc/colord-kde/default.nix +++ b/pkgs/tools/misc/colord-kde/default.nix @@ -1,11 +1,11 @@ -{ stdenv, lib, fetchurl +{ mkDerivation, lib, fetchurl , extra-cmake-modules, ki18n , kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kiconthemes, kcmutils , kio, knotifications, plasma-framework, kwidgetsaddons, kwindowsystem , kitemviews, lcms2, libXrandr, qtx11extras }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "colord-kde"; version = "0.5.0"; -- cgit v1.2.3 From 1d8ea8950463afc4fe782c5095e7e9a63896e585 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 7 Apr 2020 22:34:14 +0200 Subject: candle: use qt5's mkDerivation --- pkgs/applications/misc/candle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/candle/default.nix b/pkgs/applications/misc/candle/default.nix index a951046ce01..842ef2262d9 100644 --- a/pkgs/applications/misc/candle/default.nix +++ b/pkgs/applications/misc/candle/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, qtbase, qtserialport, qmake }: +{ mkDerivation, stdenv, fetchFromGitHub, qtbase, qtserialport, qmake }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "candle"; version = "1.1"; -- cgit v1.2.3 From d5b14e58c4c76ed4387a174b284f111c2260a01e Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Tue, 7 Apr 2020 22:34:28 +0200 Subject: tensor: use qt5's mkDerivation --- pkgs/applications/networking/instant-messengers/tensor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix index dcb2c720bc6..1ea249a8b51 100644 --- a/pkgs/applications/networking/instant-messengers/tensor/default.nix +++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchgit, qtbase, qtquickcontrols, qmake, makeDesktopItem }: +{ mkDerivation, stdenv, fetchgit, qtbase, qtquickcontrols, qmake, makeDesktopItem }: # we now have libqmatrixclient so a future version of tensor that supports it # should use that -stdenv.mkDerivation rec { +mkDerivation rec { pname = "tensor-git"; version = "2017-02-21"; -- cgit v1.2.3 From 95f82e2a45266cdca661389705da7c672c7a9cbc Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 22 Apr 2020 15:28:52 +0100 Subject: p7zip: remove non-free RAR support 7-Zip's RAR implementation is built on the non-free UnRAR source code; DOC/License.txt says: Licenses for files are: 1) CPP/7zip/Compress/Rar* files: GNU LGPL + unRAR restriction 2) All other files: GNU LGPL The GNU LGPL + unRAR restriction means that you must follow both GNU LGPL rules and unRAR restriction rules. ... unRAR restriction ----------------- The decompression engine for RAR archives was developed using source code of unRAR program. All copyrights to original unRAR code are owned by Alexander Roshal. The license for original unRAR code has the following restriction: The unRAR sources cannot be used to re-create the RAR compression algorithm, which is proprietary. Distribution of modified unRAR sources in separate form or as a part of other software is permitted, provided that it is clearly stated in the documentation and source comments that the code may not be used to develop a RAR (WinRAR) compatible archiver. The unrar licensing is [infamously restrictive and non-free][fedora]; it's inappropriate for us to keep the RAR support while labelling the package as free software (and indeed there's a commented-out line pointing out that the current `meta.license` is false). Unfortunately, the 7-Zip upstream seems uninterested in replacing the code with a freely-licensed alternative (see [7-Zip ticket #1229][7zip]). [fedora]: https://fedoraproject.org/wiki/Licensing:Unrar [7zip]: https://sourceforge.net/p/sevenzip/feature-requests/1229/ An alternative solution would be to mark the p7zip package as non-free instead; I decided not to because its other functionality (especially `.7z` support) is freely-licensed and useful, and there are free software alternatives for extracting RAR files (e.g. in nixpkgs there's `archiver`, which is written in a memory-safe language, and `unar`, which at least doesn't have two patches for CVEs that haven't been addressed upstream...). I checked that `7z(1)` fails gracefully on `.rar` files now: emily@renko ~/tmp> curl -L -O https://www.philippwinterberg.com/download/example.rar % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 100 5715k 100 5715k 0 0 6716k 0 --:--:-- --:--:-- --:--:-- 6716k emily@renko ~/tmp> 7z x example.rar 7-Zip [64] 16.02 : Copyright (c) 1999-2016 Igor Pavlov : 2016-05-21 p7zip Version 16.02 (locale=en_CA.UTF-8,Utf16=on,HugeFiles=on,64 bits,8 CPUs x64) Scanning the drive for archives: 1 file, 5853119 bytes (5716 KiB) Extracting archive: example.rar ERROR: example.rar Can not open the file as archive Can't open as archive: 1 Files: 0 Size: 0 Compressed: 0 --- pkgs/tools/archivers/p7zip/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index f44791ce021..e41d9a2eb2d 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -24,6 +24,11 @@ stdenv.mkDerivation rec { substituteInPlace makefile.machine \ --replace 'CC=gcc' 'CC=${stdenv.cc.targetPrefix}gcc' \ --replace 'CXX=g++' 'CXX=${stdenv.cc.targetPrefix}g++' + '' + '' + # Remove non-free RAR source code + # (see DOC/License.txt, https://fedoraproject.org/wiki/Licensing:Unrar) + rm -r CPP/7zip/Compress/Rar* + find . -name makefile'*' -exec sed -i '/Rar/d' {} + ''; preConfigure = '' @@ -42,9 +47,9 @@ stdenv.mkDerivation rec { meta = { homepage = "http://p7zip.sourceforge.net/"; description = "A port of the 7-zip archiver"; - # license = stdenv.lib.licenses.lgpl21Plus; + "unRAR restriction" platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.raskin ]; + # RAR code is under non-free UnRAR license, but we remove it license = stdenv.lib.licenses.lgpl2Plus; }; } -- cgit v1.2.3 From 955e235da3fb9f503c19effc4e44ff223d05e37f Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 22 Apr 2020 16:06:46 +0100 Subject: p7zip: Make unfree features (rar support) optional --- pkgs/tools/archivers/p7zip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index e41d9a2eb2d..3f0c2487c91 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, lib, enableUnfree ? false }: stdenv.mkDerivation rec { pname = "p7zip"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { substituteInPlace makefile.machine \ --replace 'CC=gcc' 'CC=${stdenv.cc.targetPrefix}gcc' \ --replace 'CXX=g++' 'CXX=${stdenv.cc.targetPrefix}g++' - '' + '' + '' + lib.optionalString (!enableUnfree) '' # Remove non-free RAR source code # (see DOC/License.txt, https://fedoraproject.org/wiki/Licensing:Unrar) rm -r CPP/7zip/Compress/Rar* @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.raskin ]; # RAR code is under non-free UnRAR license, but we remove it - license = stdenv.lib.licenses.lgpl2Plus; + license = if enableUnfree then lib.licenses.unfree else lib.licenses.lgpl2Plus; }; } -- cgit v1.2.3 From c6e3c006b14442c0b15b73710e65e20e4ed2b601 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 22 Apr 2020 14:43:23 +0200 Subject: python3Packages.cryptography: 2.9 -> 2.9.1 "Updated Windows, macOS, and ``manylinux`` wheels to be compiled with OpenSSL 1.1.1g." --- pkgs/development/python-modules/cryptography/default.nix | 4 ++-- pkgs/development/python-modules/cryptography/vectors.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix index 9b14f4a6fc7..ba807cc99fd 100644 --- a/pkgs/development/python-modules/cryptography/default.nix +++ b/pkgs/development/python-modules/cryptography/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { pname = "cryptography"; - version = "2.9"; # Also update the hash in vectors.nix + version = "2.9.1"; # Also update the hash in vectors.nix src = fetchPypi { inherit pname version; - sha256 = "0vlqy2pki0fh1h6l6cbb43z3g2n9fv0849dzb5gqwjv0bkpx7b0c"; + sha256 = "13inbbc3vqv0vpfww65f8pj3isghbcrd3m63xfyd8swl9f5xc2yf"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix index 6fd8259d78f..520e44cccc7 100644 --- a/pkgs/development/python-modules/cryptography/vectors.nix +++ b/pkgs/development/python-modules/cryptography/vectors.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1h7dcgwrjxqk1bzkangbvlhhlgyqd7cfi894dv1cd5m2sp7csblc"; + sha256 = "1ydkrj67jf26ys8v5qflqsnlj3hd4494ym44120dpvk7b7v037ci"; }; # No tests included -- cgit v1.2.3 From 1a047c4a8eb6e6a1903dfe8453d8df585e22ac9a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 31 Dec 2019 16:28:52 +0100 Subject: sway: Make it possible to use exec in extraSessionCommands This is useful for use-cases like this (logging to journald): ``` programs.sway.extraSessionCommands = '' if [ -z "$_SWAY_DID_SYSTEMD_CAT" ]; then export _SWAY_DID_SYSTEMD_CAT=1 exec ${config.systemd.package}/bin/systemd-cat -t sway "$0" "$@" fi # ... (potentially also another exec) ''; ``` Without this change the rest of the extraSessionCommands won't be executed after the exec since the whole extraSessionCommands block would be skipped during the re-execution (_SWAY_WRAPPER_ALREADY_EXECUTED is already set). --- pkgs/applications/window-managers/sway/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/sway/wrapper.nix b/pkgs/applications/window-managers/sway/wrapper.nix index 7c59b8b7cde..3e12e3fcc55 100644 --- a/pkgs/applications/window-managers/sway/wrapper.nix +++ b/pkgs/applications/window-managers/sway/wrapper.nix @@ -14,8 +14,8 @@ let baseWrapper = writeShellScriptBin "sway" '' set -o errexit if [ ! "$_SWAY_WRAPPER_ALREADY_EXECUTED" ]; then - export _SWAY_WRAPPER_ALREADY_EXECUTED=1 ${extraSessionCommands} + export _SWAY_WRAPPER_ALREADY_EXECUTED=1 fi if [ "$DBUS_SESSION_BUS_ADDRESS" ]; then export DBUS_SESSION_BUS_ADDRESS -- cgit v1.2.3 From 830733db24719e04f1cff9287d2065d573acd5d6 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Wed, 22 Apr 2020 16:56:44 +0100 Subject: nixos/manual: fix build --- nixos/modules/virtualisation/nixos-containers.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index 4f5be91939d..016d68ea301 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -442,7 +442,7 @@ in Whether this NixOS machine is a lightweight container running in another NixOS system. If set to true, support for nested containers is disabled by default, but can be reenabled by - setting boot.enableContainers to true. + setting to true. ''; }; -- cgit v1.2.3 From bb79233b94bd5d9dc3b44a90ee0dc78d78c77569 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Wed, 22 Apr 2020 02:03:08 +0200 Subject: texlive: Fix texlive pstricks The upgrade of ghostscript to 9.50 produced some issues with texlive 2019. This patch adds an additional fix necessary for the upgrade preventing pstricks from working correctly: https://tug.org/pipermail/dvipdfmx/2019-November/000036.html --- pkgs/tools/typesetting/tex/texlive/bin.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix index 5800cedf7f1..c0ae6b8e187 100644 --- a/pkgs/tools/typesetting/tex/texlive/bin.nix +++ b/pkgs/tools/typesetting/tex/texlive/bin.nix @@ -76,6 +76,14 @@ let url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/texlive-poppler-0.86.patch?h=packages/texlive-bin&id=60244e41bb6f1501e8ed1fc9e6b7ba8d3f283398"; sha256 = "0pdvhaqc3zgz7hp0x3a4qs0nh26fkvgmr6w1cjljqhp1nyiw2f1l"; }) + + # Needed for ghostscript>=9.50 + (fetchpatch { + name = "xdvipdfm-fix.patch"; + url = "https://www.tug.org/svn/texlive/trunk/Build/source/texk/dvipdfm-x/spc_dvips.c?view=patch&r1=52765&r2=52764&pathrev=52765"; + sha256 = "0qvrc7yxhbl5f4g340z8aql388bwib0m2gxd473skbmviy5bjr3f"; + stripLen = 2; + }) ]; # remove when removing synctex-missing-header.patch -- cgit v1.2.3 From 7a164bf678490da821f38f7329d4f0776645411c Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 22 Apr 2020 13:04:18 -0400 Subject: pantheon.wingpanel-indicator-datetime: patch in a lot of fixes These were rejected upstream, sadly https://github.com/elementary/wingpanel-indicator-datetime/pull/207. --- .../wingpanel-indicators/datetime/207.patch | 4726 ++++++++++++++++++++ .../wingpanel-indicators/datetime/default.nix | 11 +- 2 files changed, 4736 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/207.patch diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/207.patch b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/207.patch new file mode 100644 index 00000000000..c4d6d8574a5 --- /dev/null +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/207.patch @@ -0,0 +1,4726 @@ +From 20228e34bf97f67b1dd542a22e92cd90f0db5c72 Mon Sep 17 00:00:00 2001 +From: Dirli +Date: Thu, 9 Apr 2020 16:30:16 +0300 +Subject: [PATCH 1/8] added a single namespace + +--- + meson.build | 14 +- + src/DateIterator.vala | 82 ----- + src/DateRange.vala | 66 ---- + src/Indicator.vala | 341 +++++++++--------- + .../calendar => Models}/CalendarModel.vala | 4 +- + src/Services/TimeManager.vala | 230 ++++++------ + src/Util/DateIterator.vala | 84 +++++ + src/Util/DateRange.vala | 68 ++++ + src/{Widgets/calendar => Util}/Util.vala | 8 +- + src/Widgets/CalendarView.vala | 185 ++++++++++ + src/Widgets/EventRow.vala | 184 +++++----- + src/Widgets/{calendar => }/Grid.vala | 12 +- + src/Widgets/GridDay.vala | 180 +++++++++ + src/Widgets/PanelLabel.vala | 80 ++-- + src/Widgets/calendar/CalendarView.vala | 183 ---------- + src/Widgets/calendar/GridDay.vala | 178 --------- + 16 files changed, 957 insertions(+), 942 deletions(-) + delete mode 100644 src/DateIterator.vala + delete mode 100644 src/DateRange.vala + rename src/{Widgets/calendar => Models}/CalendarModel.vala (99%) + create mode 100644 src/Util/DateIterator.vala + create mode 100644 src/Util/DateRange.vala + rename src/{Widgets/calendar => Util}/Util.vala (96%) + create mode 100644 src/Widgets/CalendarView.vala + rename src/Widgets/{calendar => }/Grid.vala (95%) + create mode 100644 src/Widgets/GridDay.vala + delete mode 100644 src/Widgets/calendar/CalendarView.vala + delete mode 100644 src/Widgets/calendar/GridDay.vala + +diff --git a/meson.build b/meson.build +index 2555723..b44c5bd 100644 +--- a/meson.build ++++ b/meson.build +@@ -39,16 +39,16 @@ endif + shared_module( + meson.project_name(), + gresource, +- 'src/DateIterator.vala', +- 'src/DateRange.vala', + 'src/Indicator.vala', ++ 'src/Util/DateIterator.vala', ++ 'src/Util/DateRange.vala', ++ 'src/Util/Util.vala', ++ 'src/Models/CalendarModel.vala', ++ 'src/Widgets/CalendarView.vala', + 'src/Widgets/EventRow.vala', ++ 'src/Widgets/Grid.vala', ++ 'src/Widgets/GridDay.vala', + 'src/Widgets/PanelLabel.vala', +- 'src/Widgets/calendar/CalendarModel.vala', +- 'src/Widgets/calendar/CalendarView.vala', +- 'src/Widgets/calendar/Grid.vala', +- 'src/Widgets/calendar/GridDay.vala', +- 'src/Widgets/calendar/Util.vala', + 'src/Services/TimeManager.vala', + dependencies: [ + dependency('glib-2.0'), +diff --git a/src/DateIterator.vala b/src/DateIterator.vala +deleted file mode 100644 +index 961895b..0000000 +--- a/src/DateIterator.vala ++++ /dev/null +@@ -1,82 +0,0 @@ +-/* +- * Copyright 2011-2018 elementary, Inc. (https://elementary.io) +- * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public +- * License as published by the Free Software Foundation; either +- * version 2 of the License, or (at your option) any later version. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * General Public License for more details. +- * +- * You should have received a copy of the GNU General Public +- * License along with this program; if not, write to the +- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +- * Boston, MA 02110-1301 USA. +- * +- * Authored by: Corentin Noël +- */ +- +-public class Util.DateIterator : Object, Gee.Traversable, Gee.Iterator { +- public GLib.DateTime current { get; construct set; } +- public Util.DateRange range { get; construct; } +- +- // Required by Gee.Iterator +- public bool valid { +- get { +- return true; +- } +- } +- +- // Required by Gee.Iterator +- public bool read_only { +- get { +- return false; +- } +- } +- +- public DateIterator (Util.DateRange range) { +- Object ( +- range: range, +- current: range.first_dt.add_days (-1) +- ); +- } +- +- public bool @foreach (Gee.ForallFunc f) { +- var element = range.first_dt; +- +- while (element.compare (range.last_dt) < 0) { +- if (f (element) == false) { +- return false; +- } +- +- element = element.add_days (1); +- } +- +- return true; +- } +- +- public bool next () { +- if (!has_next ()) { +- return false; +- } +- +- current = this.current.add_days (1); +- +- return true; +- } +- +- public bool has_next () { +- return current.compare (range.last_dt) < 0; +- } +- +- public new GLib.DateTime get () { +- return current; +- } +- +- public void remove () { +- assert_not_reached (); +- } +-} +diff --git a/src/DateRange.vala b/src/DateRange.vala +deleted file mode 100644 +index 08e4c00..0000000 +--- a/src/DateRange.vala ++++ /dev/null +@@ -1,66 +0,0 @@ +-/* +- * Copyright 2011-2019 elementary, Inc. (https://elementary.io) +- * +- * This program is free software; you can redistribute it and/or +- * modify it under the terms of the GNU General Public +- * License as published by the Free Software Foundation; either +- * version 2 of the License, or (at your option) any later version. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * General Public License for more details. +- * +- * You should have received a copy of the GNU General Public +- * License along with this program; if not, write to the +- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +- * Boston, MA 02110-1301 USA. +- * +- * Authored by: Corentin Noël +- */ +- +-/* Represents date range from 'first' to 'last' inclusive */ +-public class Util.DateRange : Object, Gee.Traversable, Gee.Iterable { +- public GLib.DateTime first_dt { get; construct; } +- public GLib.DateTime last_dt { get; construct; } +- +- public bool @foreach (Gee.ForallFunc f) { +- foreach (var date in this) { +- if (f (date) == false) { +- return false; +- } +- } +- +- return true; +- } +- +- public DateRange (GLib.DateTime first, GLib.DateTime last) { +- Object ( +- first_dt: first, +- last_dt: last +- ); +- } +- +- public bool equals (DateRange other) { +- return (first_dt == other.first_dt && last_dt == other.last_dt); +- } +- +- public Gee.Iterator iterator () { +- return new DateIterator (this); +- } +- +- public Gee.List to_list () { +- var list = new Gee.ArrayList ((Gee.EqualDataFunc? )datetime_equal_func); +- +- foreach (var date in this) { +- list.add (date); +- } +- +- return list; +- } +- +- /* Returns true if 'a' and 'b' are the same GLib.DateTime */ +- private bool datetime_equal_func (GLib.DateTime a, GLib.DateTime b) { +- return a.equal (b); +- } +-} +diff --git a/src/Indicator.vala b/src/Indicator.vala +index 77aa35c..b712c12 100644 +--- a/src/Indicator.vala ++++ b/src/Indicator.vala +@@ -17,218 +17,219 @@ + * Boston, MA 02110-1301 USA. + */ + +-public class DateTime.Indicator : Wingpanel.Indicator { +- public static GLib.Settings settings; +- +- private Widgets.PanelLabel panel_label; +- private Gtk.Grid main_grid; +- private Widgets.CalendarView calendar; +- private Gtk.ListBox event_listbox; +- private uint update_events_idle_source = 0; +- +- public Indicator () { +- Object ( +- code_name: Wingpanel.Indicator.DATETIME, +- display_name: _("Date & Time"), +- description: _("The date and time indicator") +- ); +- } +- +- static construct { +- settings = new GLib.Settings ("io.elementary.desktop.wingpanel.datetime"); +- } ++namespace DateTimeIndicator { ++ public class Indicator : Wingpanel.Indicator { ++ public static GLib.Settings settings; ++ ++ private Widgets.PanelLabel panel_label; ++ private Gtk.Grid main_grid; ++ private Widgets.CalendarView calendar; ++ private Gtk.ListBox event_listbox; ++ private uint update_events_idle_source = 0; ++ ++ public Indicator () { ++ Object ( ++ code_name: Wingpanel.Indicator.DATETIME, ++ display_name: _("Date & Time"), ++ description: _("The date and time indicator") ++ ); ++ } + +- construct { +- visible = true; +- } ++ static construct { ++ settings = new GLib.Settings ("io.elementary.desktop.wingpanel.datetime"); ++ } + +- public override Gtk.Widget get_display_widget () { +- if (panel_label == null) { +- panel_label = new Widgets.PanelLabel (); ++ construct { ++ visible = true; + } + +- return panel_label; +- } ++ public override Gtk.Widget get_display_widget () { ++ if (panel_label == null) { ++ panel_label = new Widgets.PanelLabel (); ++ } + +- public override Gtk.Widget? get_widget () { +- if (main_grid == null) { +- calendar = new Widgets.CalendarView (); +- calendar.margin_bottom = 6; +- +- var placeholder_label = new Gtk.Label (_("No Events on This Day")); +- placeholder_label.wrap = true; +- placeholder_label.wrap_mode = Pango.WrapMode.WORD; +- placeholder_label.margin_start = 12; +- placeholder_label.margin_end = 12; +- placeholder_label.max_width_chars = 20; +- placeholder_label.justify = Gtk.Justification.CENTER; +- placeholder_label.show_all (); +- +- var placeholder_style_context = placeholder_label.get_style_context (); +- placeholder_style_context.add_class (Gtk.STYLE_CLASS_DIM_LABEL); +- placeholder_style_context.add_class (Granite.STYLE_CLASS_H3_LABEL); +- +- event_listbox = new Gtk.ListBox (); +- event_listbox.selection_mode = Gtk.SelectionMode.NONE; +- event_listbox.set_header_func (header_update_func); +- event_listbox.set_placeholder (placeholder_label); +- event_listbox.set_sort_func (sort_function); +- +- var scrolled_window = new Gtk.ScrolledWindow (null, null); +- scrolled_window.hscrollbar_policy = Gtk.PolicyType.NEVER; +- scrolled_window.add (event_listbox); +- +- var settings_button = new Gtk.ModelButton (); +- settings_button.text = _("Date & Time Settings…"); +- +- main_grid = new Gtk.Grid (); +- main_grid.margin_top = 12; +- main_grid.attach (calendar, 0, 0); +- main_grid.attach (new Gtk.Separator (Gtk.Orientation.VERTICAL), 1, 0); +- main_grid.attach (scrolled_window, 2, 0); +- main_grid.attach (new Wingpanel.Widgets.Separator (), 0, 2, 3); +- main_grid.attach (settings_button, 0, 3, 3); +- +- var size_group = new Gtk.SizeGroup (Gtk.SizeGroupMode.HORIZONTAL); +- size_group.add_widget (calendar); +- size_group.add_widget (event_listbox); +- +- calendar.day_double_click.connect (() => { +- close (); +- }); ++ return panel_label; ++ } + +- calendar.selection_changed.connect ((date) => { +- idle_update_events (); +- }); ++ public override Gtk.Widget? get_widget () { ++ if (main_grid == null) { ++ calendar = new Widgets.CalendarView (); ++ calendar.margin_bottom = 6; ++ ++ var placeholder_label = new Gtk.Label (_("No Events on This Day")); ++ placeholder_label.wrap = true; ++ placeholder_label.wrap_mode = Pango.WrapMode.WORD; ++ placeholder_label.margin_start = 12; ++ placeholder_label.margin_end = 12; ++ placeholder_label.max_width_chars = 20; ++ placeholder_label.justify = Gtk.Justification.CENTER; ++ placeholder_label.show_all (); ++ ++ var placeholder_style_context = placeholder_label.get_style_context (); ++ placeholder_style_context.add_class (Gtk.STYLE_CLASS_DIM_LABEL); ++ placeholder_style_context.add_class (Granite.STYLE_CLASS_H3_LABEL); ++ ++ event_listbox = new Gtk.ListBox (); ++ event_listbox.selection_mode = Gtk.SelectionMode.NONE; ++ event_listbox.set_header_func (header_update_func); ++ event_listbox.set_placeholder (placeholder_label); ++ event_listbox.set_sort_func (sort_function); ++ ++ var scrolled_window = new Gtk.ScrolledWindow (null, null); ++ scrolled_window.hscrollbar_policy = Gtk.PolicyType.NEVER; ++ scrolled_window.add (event_listbox); ++ ++ var settings_button = new Gtk.ModelButton (); ++ settings_button.text = _("Date & Time Settings…"); ++ ++ main_grid = new Gtk.Grid (); ++ main_grid.margin_top = 12; ++ main_grid.attach (calendar, 0, 0); ++ main_grid.attach (new Gtk.Separator (Gtk.Orientation.VERTICAL), 1, 0); ++ main_grid.attach (scrolled_window, 2, 0); ++ main_grid.attach (new Wingpanel.Widgets.Separator (), 0, 2, 3); ++ main_grid.attach (settings_button, 0, 3, 3); ++ ++ var size_group = new Gtk.SizeGroup (Gtk.SizeGroupMode.HORIZONTAL); ++ size_group.add_widget (calendar); ++ size_group.add_widget (event_listbox); ++ ++ calendar.day_double_click.connect (() => { ++ close (); ++ }); ++ ++ calendar.selection_changed.connect ((date) => { ++ idle_update_events (); ++ }); ++ ++ event_listbox.row_activated.connect ((row) => { ++ calendar.show_date_in_maya (((EventRow) row).date); ++ close (); ++ }); ++ ++ settings_button.clicked.connect (() => { ++ try { ++ AppInfo.launch_default_for_uri ("settings://time", null); ++ } catch (Error e) { ++ warning ("Failed to open time and date settings: %s", e.message); ++ } ++ }); ++ } + +- event_listbox.row_activated.connect ((row) => { +- calendar.show_date_in_maya (((DateTime.EventRow) row).date); +- close (); +- }); ++ return main_grid; ++ } + +- settings_button.clicked.connect (() => { +- try { +- AppInfo.launch_default_for_uri ("settings://time", null); +- } catch (Error e) { +- warning ("Failed to open time and date settings: %s", e.message); ++ private void header_update_func (Gtk.ListBoxRow lbrow, Gtk.ListBoxRow? lbbefore) { ++ var row = (EventRow) lbrow; ++ if (lbbefore != null) { ++ var before = (EventRow) lbbefore; ++ if (row.is_allday == before.is_allday) { ++ row.set_header (null); ++ return; + } +- }); +- } + +- return main_grid; +- } ++ if (row.is_allday != before.is_allday) { ++ var header_label = new Granite.HeaderLabel (_("During the Day")); ++ header_label.margin_start = header_label.margin_end = 6; + +- private void header_update_func (Gtk.ListBoxRow lbrow, Gtk.ListBoxRow? lbbefore) { +- var row = (DateTime.EventRow) lbrow; +- if (lbbefore != null) { +- var before = (DateTime.EventRow) lbbefore; +- if (row.is_allday == before.is_allday) { +- row.set_header (null); ++ row.set_header (header_label); ++ return; ++ } ++ } else { ++ if (row.is_allday) { ++ var allday_header = new Granite.HeaderLabel (_("All Day")); ++ allday_header.margin_start = allday_header.margin_end = 6; ++ ++ row.set_header (allday_header); ++ } + return; + } ++ } + +- if (row.is_allday != before.is_allday) { +- var header_label = new Granite.HeaderLabel (_("During the Day")); +- header_label.margin_start = header_label.margin_end = 6; ++ [CCode (instance_pos = -1)] ++ private int sort_function (Gtk.ListBoxRow child1, Gtk.ListBoxRow child2) { ++ var e1 = (EventRow) child1; ++ var e2 = (EventRow) child2; + +- row.set_header (header_label); +- return; ++ if (e1.start_time.compare (e2.start_time) != 0) { ++ return e1.start_time.compare (e2.start_time); + } +- } else { +- if (row.is_allday) { +- var allday_header = new Granite.HeaderLabel (_("All Day")); +- allday_header.margin_start = allday_header.margin_end = 6; + +- row.set_header (allday_header); ++ // If they have the same date, sort them wholeday first ++ if (e1.is_allday) { ++ return -1; ++ } else if (e2.is_allday) { ++ return 1; + } +- return; +- } +- } +- +- [CCode (instance_pos = -1)] +- private int sort_function (Gtk.ListBoxRow child1, Gtk.ListBoxRow child2) { +- var e1 = (EventRow) child1; +- var e2 = (EventRow) child2; + +- if (e1.start_time.compare (e2.start_time) != 0) { +- return e1.start_time.compare (e2.start_time); ++ return 0; + } + +- // If they have the same date, sort them wholeday first +- if (e1.is_allday) { +- return -1; +- } else if (e2.is_allday) { +- return 1; ++ private void update_events_model (E.Source source, Gee.Collection events) { ++ idle_update_events (); + } + +- return 0; +- } +- +- private void update_events_model (E.Source source, Gee.Collection events) { +- idle_update_events (); +- } ++ private void idle_update_events () { ++ if (update_events_idle_source > 0) { ++ GLib.Source.remove (update_events_idle_source); ++ } + +- private void idle_update_events () { +- if (update_events_idle_source > 0) { +- GLib.Source.remove (update_events_idle_source); ++ update_events_idle_source = GLib.Idle.add (update_events); + } + +- update_events_idle_source = GLib.Idle.add (update_events); +- } +- +- private bool update_events () { +- foreach (unowned Gtk.Widget widget in event_listbox.get_children ()) { +- widget.destroy (); +- } ++ private bool update_events () { ++ foreach (unowned Gtk.Widget widget in event_listbox.get_children ()) { ++ widget.destroy (); ++ } + +- if (calendar.selected_date == null) { +- update_events_idle_source = 0; +- return GLib.Source.REMOVE; +- } ++ if (calendar.selected_date == null) { ++ update_events_idle_source = 0; ++ return GLib.Source.REMOVE; ++ } + +- var date = calendar.selected_date; ++ var date = calendar.selected_date; + +- var model = Widgets.CalendarModel.get_default (); ++ var model = Models.CalendarModel.get_default (); + +- var events_on_day = new Gee.TreeMap (); ++ var events_on_day = new Gee.TreeMap (); + +- model.source_events.@foreach ((source, component_map) => { +- foreach (var comp in component_map.get_values ()) { +- if (Util.calcomp_is_on_day (comp, date)) { +- unowned ICal.Component ical = comp.get_icalcomponent (); +- var event_uid = ical.get_uid (); +- if (!events_on_day.has_key (event_uid)) { +- events_on_day[event_uid] = new DateTime.EventRow (date, ical, source); ++ model.source_events.@foreach ((source, component_map) => { ++ foreach (var comp in component_map.get_values ()) { ++ if (Util.calcomp_is_on_day (comp, date)) { ++ unowned ICal.Component ical = comp.get_icalcomponent (); ++ var event_uid = ical.get_uid (); ++ if (!events_on_day.has_key (event_uid)) { ++ events_on_day[event_uid] = new EventRow (date, ical, source); + +- event_listbox.add (events_on_day[event_uid]); ++ event_listbox.add (events_on_day[event_uid]); ++ } + } + } +- } +- }); ++ }); + +- event_listbox.show_all (); +- update_events_idle_source = 0; +- return GLib.Source.REMOVE; +- } ++ event_listbox.show_all (); ++ update_events_idle_source = 0; ++ return GLib.Source.REMOVE; ++ } + +- public override void opened () { +- calendar.show_today (); ++ public override void opened () { ++ calendar.show_today (); + +- Widgets.CalendarModel.get_default ().events_added.connect (update_events_model); +- Widgets.CalendarModel.get_default ().events_updated.connect (update_events_model); +- Widgets.CalendarModel.get_default ().events_removed.connect (update_events_model); +- } ++ Models.CalendarModel.get_default ().events_added.connect (update_events_model); ++ Models.CalendarModel.get_default ().events_updated.connect (update_events_model); ++ Models.CalendarModel.get_default ().events_removed.connect (update_events_model); ++ } + +- public override void closed () { +- Widgets.CalendarModel.get_default ().events_added.disconnect (update_events_model); +- Widgets.CalendarModel.get_default ().events_updated.disconnect (update_events_model); +- Widgets.CalendarModel.get_default ().events_removed.disconnect (update_events_model); ++ public override void closed () { ++ Models.CalendarModel.get_default ().events_added.disconnect (update_events_model); ++ Models.CalendarModel.get_default ().events_updated.disconnect (update_events_model); ++ Models.CalendarModel.get_default ().events_removed.disconnect (update_events_model); ++ } + } + } +- + public Wingpanel.Indicator get_indicator (Module module) { + debug ("Activating DateTime Indicator"); +- var indicator = new DateTime.Indicator (); ++ var indicator = new DateTimeIndicator.Indicator (); + + return indicator; + } +diff --git a/src/Widgets/calendar/CalendarModel.vala b/src/Models/CalendarModel.vala +similarity index 99% +rename from src/Widgets/calendar/CalendarModel.vala +rename to src/Models/CalendarModel.vala +index 7602303..965b93e 100644 +--- a/src/Widgets/calendar/CalendarModel.vala ++++ b/src/Models/CalendarModel.vala +@@ -15,8 +15,8 @@ + * along with this program. If not, see . + */ + +-namespace DateTime.Widgets { +- public class CalendarModel : Object { ++namespace DateTimeIndicator { ++ public class Models.CalendarModel : Object { + /* The data_range is the range of dates for which this model is storing + * data. + * +diff --git a/src/Services/TimeManager.vala b/src/Services/TimeManager.vala +index b68f158..5baa136 100644 +--- a/src/Services/TimeManager.vala ++++ b/src/Services/TimeManager.vala +@@ -32,153 +32,155 @@ interface FDO.Accounts : Object { + public abstract string find_user_by_name (string username) throws GLib.Error; + } + +-public class DateTime.Services.TimeManager : Gtk.Calendar { +- private static TimeManager? instance = null; ++namespace DateTimeIndicator { ++ public class Services.TimeManager : Gtk.Calendar { ++ private static TimeManager? instance = null; + +- public signal void minute_changed (); ++ public signal void minute_changed (); + +- private GLib.DateTime? current_time = null; +- private uint timeout_id = 0; +- private Manager? manager = null; ++ private GLib.DateTime? current_time = null; ++ private uint timeout_id = 0; ++ private Manager? manager = null; + +- public bool clock_show_seconds { get; set; } +- public bool is_12h { get; set; } ++ public bool clock_show_seconds { get; set; } ++ public bool is_12h { get; set; } + +- public TimeManager () { +- update_current_time (); +- +- if (current_time == null) { +- return; +- } ++ public TimeManager () { ++ update_current_time (); + +- add_timeout (); +- try { +- var clock_settings = new GLib.Settings ("io.elementary.desktop.wingpanel.datetime"); +- clock_settings.bind ("clock-show-seconds", this, "clock-show-seconds", SettingsBindFlags.DEFAULT); ++ if (current_time == null) { ++ return; ++ } + +- notify["clock-show-seconds"].connect (() => { +- add_timeout (); +- }); ++ add_timeout (); ++ try { ++ var clock_settings = new GLib.Settings ("io.elementary.desktop.wingpanel.datetime"); ++ clock_settings.bind ("clock-show-seconds", this, "clock-show-seconds", SettingsBindFlags.DEFAULT); + +- // Listen for the D-BUS server that controls time settings +- Bus.watch_name (BusType.SYSTEM, "org.freedesktop.timedate1", BusNameWatcherFlags.NONE, on_watch, on_unwatch); +- // Listen for the signal that is fired when waking up from sleep, then update time +- manager = Bus.get_proxy_sync (BusType.SYSTEM, "org.freedesktop.login1", "/org/freedesktop/login1"); +- manager.prepare_for_sleep.connect ((sleeping) => { +- if (!sleeping) { +- update_current_time (); +- minute_changed (); ++ notify["clock-show-seconds"].connect (() => { + add_timeout (); +- } +- }); +- } catch (Error e) { +- warning (e.message); ++ }); ++ ++ // Listen for the D-BUS server that controls time settings ++ Bus.watch_name (BusType.SYSTEM, "org.freedesktop.timedate1", BusNameWatcherFlags.NONE, on_watch, on_unwatch); ++ // Listen for the signal that is fired when waking up from sleep, then update time ++ manager = Bus.get_proxy_sync (BusType.SYSTEM, "org.freedesktop.login1", "/org/freedesktop/login1"); ++ manager.prepare_for_sleep.connect ((sleeping) => { ++ if (!sleeping) { ++ update_current_time (); ++ minute_changed (); ++ add_timeout (); ++ } ++ }); ++ } catch (Error e) { ++ warning (e.message); ++ } + } +- } +- +- construct { +- setup_time_format.begin (); +- } + +- private async void setup_time_format () { +- try { +- var accounts_service = yield GLib.Bus.get_proxy (GLib.BusType.SYSTEM, +- "org.freedesktop.Accounts", +- "/org/freedesktop/Accounts"); +- var user_path = accounts_service.find_user_by_name (GLib.Environment.get_user_name ()); +- +- var greeter_act = yield GLib.Bus.get_proxy (GLib.BusType.SYSTEM, +- "org.freedesktop.Accounts", +- user_path, +- GLib.DBusProxyFlags.GET_INVALIDATED_PROPERTIES); +- is_12h = ("12h" in greeter_act.time_format); +- ((GLib.DBusProxy) greeter_act).g_properties_changed.connect ((changed_properties, invalidated_properties) => { +- if (changed_properties.lookup_value ("TimeFormat", GLib.VariantType.STRING) != null) { +- is_12h = ("12h" in greeter_act.time_format); +- } +- }); +- } catch (Error e) { +- critical (e.message); +- // Connect to the GSettings instead +- var clock_settings = new GLib.Settings ("org.gnome.desktop.interface"); +- clock_settings.changed["clock-format"].connect (() => { +- is_12h = ("12h" in clock_settings.get_string ("clock-format")); +- }); +- +- is_12h = ("12h" in clock_settings.get_string ("clock-format")); ++ construct { ++ setup_time_format.begin (); + } +- } + +- private void on_watch (DBusConnection conn) { +- // Start updating the time display quicker because someone is changing settings +- add_timeout (true); +- } ++ private async void setup_time_format () { ++ try { ++ var accounts_service = yield GLib.Bus.get_proxy (GLib.BusType.SYSTEM, ++ "org.freedesktop.Accounts", ++ "/org/freedesktop/Accounts"); ++ var user_path = accounts_service.find_user_by_name (GLib.Environment.get_user_name ()); ++ ++ var greeter_act = yield GLib.Bus.get_proxy (GLib.BusType.SYSTEM, ++ "org.freedesktop.Accounts", ++ user_path, ++ GLib.DBusProxyFlags.GET_INVALIDATED_PROPERTIES); ++ is_12h = ("12h" in greeter_act.time_format); ++ ((GLib.DBusProxy) greeter_act).g_properties_changed.connect ((changed_properties, invalidated_properties) => { ++ if (changed_properties.lookup_value ("TimeFormat", GLib.VariantType.STRING) != null) { ++ is_12h = ("12h" in greeter_act.time_format); ++ } ++ }); ++ } catch (Error e) { ++ critical (e.message); ++ // Connect to the GSettings instead ++ var clock_settings = new GLib.Settings ("org.gnome.desktop.interface"); ++ clock_settings.changed["clock-format"].connect (() => { ++ is_12h = ("12h" in clock_settings.get_string ("clock-format")); ++ }); + +- private void on_unwatch (DBusConnection conn) { +- // Stop updating the time display quicker +- add_timeout (false); +- } ++ is_12h = ("12h" in clock_settings.get_string ("clock-format")); ++ } ++ } + +- private void add_timeout (bool update_fast = false) { +- uint interval; +- if (update_fast || clock_show_seconds) { +- interval = 500; +- } else { +- interval = calculate_time_until_next_minute (); ++ private void on_watch (DBusConnection conn) { ++ // Start updating the time display quicker because someone is changing settings ++ add_timeout (true); + } + +- if (timeout_id > 0) { +- Source.remove (timeout_id); ++ private void on_unwatch (DBusConnection conn) { ++ // Stop updating the time display quicker ++ add_timeout (false); + } + +- timeout_id = Timeout.add (interval, () => { +- update_current_time (); +- minute_changed (); +- add_timeout (update_fast); ++ private void add_timeout (bool update_fast = false) { ++ uint interval; ++ if (update_fast || clock_show_seconds) { ++ interval = 500; ++ } else { ++ interval = calculate_time_until_next_minute (); ++ } + +- return false; +- }); +- } ++ if (timeout_id > 0) { ++ Source.remove (timeout_id); ++ } + +- public string format (string format) { +- if (current_time == null) { +- return "undef"; ++ timeout_id = Timeout.add (interval, () => { ++ update_current_time (); ++ minute_changed (); ++ add_timeout (update_fast); ++ ++ return false; ++ }); + } + +- return current_time.format (format); +- } ++ public string format (string format) { ++ if (current_time == null) { ++ return "undef"; ++ } + +- public GLib.DateTime get_current_time () { +- return current_time; +- } ++ return current_time.format (format); ++ } + +- private void update_current_time () { +- var local_time = new GLib.DateTime.now_local (); ++ public GLib.DateTime get_current_time () { ++ return current_time; ++ } + +- if (local_time == null) { +- critical ("Can't get the local time."); ++ private void update_current_time () { ++ var local_time = new GLib.DateTime.now_local (); + +- return; +- } ++ if (local_time == null) { ++ critical ("Can't get the local time."); + +- current_time = local_time; +- } ++ return; ++ } + +- private uint calculate_time_until_next_minute () { +- if (current_time == null) { +- return 60 * 1000; ++ current_time = local_time; + } + +- var seconds_until_next_minute = 60 - (current_time.to_unix () % 60); ++ private uint calculate_time_until_next_minute () { ++ if (current_time == null) { ++ return 60 * 1000; ++ } + +- return (uint)seconds_until_next_minute * 1000; +- } ++ var seconds_until_next_minute = 60 - (current_time.to_unix () % 60); + +- public static TimeManager get_default () { +- if (instance == null) { +- instance = new TimeManager (); ++ return (uint)seconds_until_next_minute * 1000; + } + +- return instance; ++ public static TimeManager get_default () { ++ if (instance == null) { ++ instance = new TimeManager (); ++ } ++ ++ return instance; ++ } + } + } +diff --git a/src/Util/DateIterator.vala b/src/Util/DateIterator.vala +new file mode 100644 +index 0000000..c2c771e +--- /dev/null ++++ b/src/Util/DateIterator.vala +@@ -0,0 +1,84 @@ ++/* ++ * Copyright 2011-2018 elementary, Inc. (https://elementary.io) ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public ++ * License along with this program; if not, write to the ++ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301 USA. ++ * ++ * Authored by: Corentin Noël ++ */ ++ ++namespace DateTimeIndicator { ++ public class Util.DateIterator : Object, Gee.Traversable, Gee.Iterator { ++ public GLib.DateTime current { get; construct set; } ++ public Util.DateRange range { get; construct; } ++ ++ // Required by Gee.Iterator ++ public bool valid { ++ get { ++ return true; ++ } ++ } ++ ++ // Required by Gee.Iterator ++ public bool read_only { ++ get { ++ return false; ++ } ++ } ++ ++ public DateIterator (Util.DateRange range) { ++ Object ( ++ range: range, ++ current: range.first_dt.add_days (-1) ++ ); ++ } ++ ++ public bool @foreach (Gee.ForallFunc f) { ++ var element = range.first_dt; ++ ++ while (element.compare (range.last_dt) < 0) { ++ if (f (element) == false) { ++ return false; ++ } ++ ++ element = element.add_days (1); ++ } ++ ++ return true; ++ } ++ ++ public bool next () { ++ if (!has_next ()) { ++ return false; ++ } ++ ++ current = this.current.add_days (1); ++ ++ return true; ++ } ++ ++ public bool has_next () { ++ return current.compare (range.last_dt) < 0; ++ } ++ ++ public new GLib.DateTime get () { ++ return current; ++ } ++ ++ public void remove () { ++ assert_not_reached (); ++ } ++ } ++} +diff --git a/src/Util/DateRange.vala b/src/Util/DateRange.vala +new file mode 100644 +index 0000000..82da7c8 +--- /dev/null ++++ b/src/Util/DateRange.vala +@@ -0,0 +1,68 @@ ++/* ++ * Copyright 2011-2019 elementary, Inc. (https://elementary.io) ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public ++ * License as published by the Free Software Foundation; either ++ * version 2 of the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public ++ * License along with this program; if not, write to the ++ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, ++ * Boston, MA 02110-1301 USA. ++ * ++ * Authored by: Corentin Noël ++ */ ++ ++namespace DateTimeIndicator { ++/* Represents date range from 'first' to 'last' inclusive */ ++ public class Util.DateRange : Object, Gee.Traversable, Gee.Iterable { ++ public GLib.DateTime first_dt { get; construct; } ++ public GLib.DateTime last_dt { get; construct; } ++ ++ public bool @foreach (Gee.ForallFunc f) { ++ foreach (var date in this) { ++ if (f (date) == false) { ++ return false; ++ } ++ } ++ ++ return true; ++ } ++ ++ public DateRange (GLib.DateTime first, GLib.DateTime last) { ++ Object ( ++ first_dt: first, ++ last_dt: last ++ ); ++ } ++ ++ public bool equals (DateRange other) { ++ return (first_dt == other.first_dt && last_dt == other.last_dt); ++ } ++ ++ public Gee.Iterator iterator () { ++ return new DateIterator (this); ++ } ++ ++ public Gee.List to_list () { ++ var list = new Gee.ArrayList ((Gee.EqualDataFunc? )datetime_equal_func); ++ ++ foreach (var date in this) { ++ list.add (date); ++ } ++ ++ return list; ++ } ++ ++ /* Returns true if 'a' and 'b' are the same GLib.DateTime */ ++ private bool datetime_equal_func (GLib.DateTime a, GLib.DateTime b) { ++ return a.equal (b); ++ } ++ } ++} +diff --git a/src/Widgets/calendar/Util.vala b/src/Util/Util.vala +similarity index 96% +rename from src/Widgets/calendar/Util.vala +rename to src/Util/Util.vala +index e51f784..c261f4b 100644 +--- a/src/Widgets/calendar/Util.vala ++++ b/src/Util/Util.vala +@@ -19,7 +19,7 @@ + * Authored by: Corentin Noël + */ + +-namespace Util { ++namespace DateTimeIndicator.Util { + static bool has_scrolled = false; + + public bool on_scroll_event (Gdk.EventScroll event) { +@@ -35,7 +35,7 @@ namespace Util { + + /* It's mouse scroll ! */ + if (choice == 1 || choice == -1) { +- DateTime.Widgets.CalendarModel.get_default ().change_month ((int)choice); ++ Models.CalendarModel.get_default ().change_month ((int)choice); + + return true; + } +@@ -46,14 +46,14 @@ namespace Util { + + if (choice > 0.3) { + reset_timer.begin (); +- DateTime.Widgets.CalendarModel.get_default ().change_month (1); ++ Models.CalendarModel.get_default ().change_month (1); + + return true; + } + + if (choice < -0.3) { + reset_timer.begin (); +- DateTime.Widgets.CalendarModel.get_default ().change_month (-1); ++ Models.CalendarModel.get_default ().change_month (-1); + + return true; + } +diff --git a/src/Widgets/CalendarView.vala b/src/Widgets/CalendarView.vala +new file mode 100644 +index 0000000..65cee28 +--- /dev/null ++++ b/src/Widgets/CalendarView.vala +@@ -0,0 +1,185 @@ ++/*- ++ * Copyright (c) 2011–2018 elementary, Inc. (https://elementary.io) ++ * ++ * This program is free software: you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation, either version 3 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see . ++ * ++ * Authored by: Maxwell Barvian ++ * Corentin Noël ++ */ ++ ++namespace DateTimeIndicator { ++ public class Widgets.CalendarView : Gtk.Grid { ++ public signal void day_double_click (); ++ public signal void event_updates (); ++ public signal void selection_changed (GLib.DateTime? new_date); ++ ++ public GLib.DateTime? selected_date { get; private set; } ++ ++ private Widgets.Grid grid; ++ private Gtk.Stack stack; ++ private Gtk.Grid big_grid; ++ ++ construct { ++ var label = new Gtk.Label (new GLib.DateTime.now_local ().format (_("%OB, %Y"))); ++ label.hexpand = true; ++ label.margin_start = 6; ++ label.xalign = 0; ++ label.width_chars = 13; ++ ++ var provider = new Gtk.CssProvider (); ++ provider.load_from_resource ("/io/elementary/desktop/wingpanel/datetime/ControlHeader.css"); ++ ++ var label_style_context = label.get_style_context (); ++ label_style_context.add_class ("header-label"); ++ label_style_context.add_provider (provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); ++ ++ var left_button = new Gtk.Button.from_icon_name ("pan-start-symbolic"); ++ var center_button = new Gtk.Button.from_icon_name ("office-calendar-symbolic"); ++ center_button.tooltip_text = _("Go to today's date"); ++ var right_button = new Gtk.Button.from_icon_name ("pan-end-symbolic"); ++ ++ var box_buttons = new Gtk.Grid (); ++ box_buttons.margin_end = 6; ++ box_buttons.valign = Gtk.Align.CENTER; ++ box_buttons.get_style_context ().add_class (Gtk.STYLE_CLASS_LINKED); ++ box_buttons.add (left_button); ++ box_buttons.add (center_button); ++ box_buttons.add (right_button); ++ ++ big_grid = create_big_grid (); ++ ++ stack = new Gtk.Stack (); ++ stack.add (big_grid); ++ stack.show_all (); ++ stack.expand = true; ++ ++ stack.notify["transition-running"].connect (() => { ++ if (stack.transition_running == false) { ++ stack.get_children ().foreach ((child) => { ++ if (child != stack.visible_child) { ++ child.destroy (); ++ } ++ }); ++ } ++ }); ++ ++ column_spacing = 6; ++ row_spacing = 6; ++ margin_start = margin_end = 10; ++ attach (label, 0, 0); ++ attach (box_buttons, 1, 0); ++ attach (stack, 0, 1, 2); ++ ++ var model = Models.CalendarModel.get_default (); ++ model.notify["data-range"].connect (() => { ++ label.label = model.month_start.format (_("%OB, %Y")); ++ ++ sync_with_model (); ++ ++ selected_date = null; ++ selection_changed (selected_date); ++ }); ++ ++ left_button.clicked.connect (() => { ++ model.change_month (-1); ++ }); ++ ++ right_button.clicked.connect (() => { ++ model.change_month (1); ++ }); ++ ++ center_button.clicked.connect (() => { ++ show_today (); ++ }); ++ } ++ ++ private Gtk.Grid create_big_grid () { ++ grid = new Widgets.Grid (); ++ grid.show_all (); ++ ++ grid.on_event_add.connect ((date) => { ++ show_date_in_maya (date); ++ day_double_click (); ++ }); ++ ++ grid.selection_changed.connect ((date) => { ++ selected_date = date; ++ selection_changed (date); ++ }); ++ ++ return grid; ++ } ++ ++ public void show_today () { ++ var calmodel = Models.CalendarModel.get_default (); ++ var today = Util.strip_time (new GLib.DateTime.now_local ()); ++ var start = Util.get_start_of_month (today); ++ selected_date = today; ++ if (!start.equal (calmodel.month_start)) { ++ calmodel.month_start = start; ++ } ++ sync_with_model (); ++ ++ grid.set_focus_to_today (); ++ } ++ ++ // TODO: As far as maya supports it use the Dbus Activation feature to run the calendar-app. ++ public void show_date_in_maya (GLib.DateTime date) { ++ var command = "io.elementary.calendar --show-day %s".printf (date.format ("%F")); ++ ++ try { ++ var appinfo = AppInfo.create_from_commandline (command, null, AppInfoCreateFlags.NONE); ++ appinfo.launch_uris (null, null); ++ } catch (GLib.Error e) { ++ var dialog = new Granite.MessageDialog.with_image_from_icon_name ( ++ _("Unable To Launch Calendar"), ++ _("The program \"io.elementary.calendar\" may not be installed"), ++ "dialog-error" ++ ); ++ dialog.show_error_details (e.message); ++ dialog.run (); ++ dialog.destroy (); ++ } ++ } ++ ++ /* Sets the calendar widgets to the date range of the model */ ++ private void sync_with_model () { ++ var model = Models.CalendarModel.get_default (); ++ if (grid.grid_range != null && (model.data_range.equals (grid.grid_range) || grid.grid_range.first_dt.compare (model.data_range.first_dt) == 0)) { ++ grid.update_today (); ++ return; // nothing else to do ++ } ++ ++ GLib.DateTime previous_first = null; ++ if (grid.grid_range != null) ++ previous_first = grid.grid_range.first_dt; ++ ++ big_grid = create_big_grid (); ++ stack.add (big_grid); ++ ++ grid.set_range (model.data_range, model.month_start); ++ grid.update_weeks (model.data_range.first_dt, model.num_weeks); ++ ++ if (previous_first != null) { ++ if (previous_first.compare (grid.grid_range.first_dt) == -1) { ++ stack.transition_type = Gtk.StackTransitionType.SLIDE_LEFT; ++ } else { ++ stack.transition_type = Gtk.StackTransitionType.SLIDE_RIGHT; ++ } ++ } ++ ++ stack.set_visible_child (big_grid); ++ } ++ } ++} +diff --git a/src/Widgets/EventRow.vala b/src/Widgets/EventRow.vala +index 8e0513e..1268311 100644 +--- a/src/Widgets/EventRow.vala ++++ b/src/Widgets/EventRow.vala +@@ -17,104 +17,106 @@ + * Boston, MA 02110-1301 USA. + */ + +-public class DateTime.EventRow : Gtk.ListBoxRow { +- public GLib.DateTime date { get; construct; } +- public unowned ICal.Component component { get; construct; } +- public unowned E.SourceCalendar cal { get; construct; } +- +- public GLib.DateTime start_time { get; private set; } +- public GLib.DateTime? end_time { get; private set; } +- public bool is_allday { get; private set; default = false; } +- +- private static Services.TimeManager time_manager; +- private static Gtk.CssProvider css_provider; +- +- private Gtk.Grid grid; +- private Gtk.Image event_image; +- private Gtk.Label time_label; +- +- public EventRow (GLib.DateTime date, ICal.Component component, E.Source source) { +- Object ( +- component: component, +- date: date, +- cal: (E.SourceCalendar?) source.get_extension (E.SOURCE_EXTENSION_CALENDAR) +- ); +- } +- +- static construct { +- css_provider = new Gtk.CssProvider (); +- css_provider.load_from_resource ("/io/elementary/desktop/wingpanel/datetime/EventRow.css"); +- +- time_manager = Services.TimeManager.get_default (); +- } ++namespace DateTimeIndicator { ++ public class EventRow : Gtk.ListBoxRow { ++ public GLib.DateTime date { get; construct; } ++ public unowned ICal.Component component { get; construct; } ++ public unowned E.SourceCalendar cal { get; construct; } ++ ++ public GLib.DateTime start_time { get; private set; } ++ public GLib.DateTime? end_time { get; private set; } ++ public bool is_allday { get; private set; default = false; } ++ ++ private static Services.TimeManager time_manager; ++ private static Gtk.CssProvider css_provider; ++ ++ private Gtk.Grid grid; ++ private Gtk.Image event_image; ++ private Gtk.Label time_label; ++ ++ public EventRow (GLib.DateTime date, ICal.Component component, E.Source source) { ++ Object ( ++ component: component, ++ date: date, ++ cal: (E.SourceCalendar?) source.get_extension (E.SOURCE_EXTENSION_CALENDAR) ++ ); ++ } + +- construct { +- start_time = Util.ical_to_date_time (component.get_dtstart ()); +- end_time = Util.ical_to_date_time (component.get_dtend ()); ++ static construct { ++ css_provider = new Gtk.CssProvider (); ++ css_provider.load_from_resource ("/io/elementary/desktop/wingpanel/datetime/EventRow.css"); + +- if (end_time != null && Util.is_the_all_day (start_time, end_time)) { +- is_allday = true; ++ time_manager = Services.TimeManager.get_default (); + } + +- unowned string icon_name = "office-calendar-symbolic"; +- if (end_time == null) { +- icon_name = "alarm-symbolic"; ++ construct { ++ start_time = Util.ical_to_date_time (component.get_dtstart ()); ++ end_time = Util.ical_to_date_time (component.get_dtend ()); ++ ++ if (end_time != null && Util.is_the_all_day (start_time, end_time)) { ++ is_allday = true; ++ } ++ ++ unowned string icon_name = "office-calendar-symbolic"; ++ if (end_time == null) { ++ icon_name = "alarm-symbolic"; ++ } ++ ++ event_image = new Gtk.Image.from_icon_name (icon_name, Gtk.IconSize.MENU); ++ event_image.valign = Gtk.Align.START; ++ ++ unowned Gtk.StyleContext event_image_context = event_image.get_style_context (); ++ event_image_context.add_provider (css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); ++ ++ var name_label = new Gtk.Label (component.get_summary ()); ++ name_label.hexpand = true; ++ name_label.ellipsize = Pango.EllipsizeMode.END; ++ name_label.lines = 3; ++ name_label.max_width_chars = 30; ++ name_label.wrap = true; ++ name_label.wrap_mode = Pango.WrapMode.WORD_CHAR; ++ name_label.xalign = 0; ++ ++ unowned Gtk.StyleContext name_label_context = name_label.get_style_context (); ++ name_label_context.add_class ("title"); ++ name_label_context.add_provider (css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); ++ ++ time_label = new Gtk.Label (null); ++ time_label.use_markup = true; ++ time_label.xalign = 0; ++ time_label.get_style_context ().add_class (Gtk.STYLE_CLASS_DIM_LABEL); ++ ++ grid = new Gtk.Grid (); ++ grid.column_spacing = 6; ++ grid.margin = 3; ++ grid.margin_start = grid.margin_end = 6; ++ grid.attach (event_image, 0, 0); ++ grid.attach (name_label, 1, 0); ++ if (!is_allday) { ++ grid.attach (time_label, 1, 1); ++ } ++ ++ unowned Gtk.StyleContext grid_context = grid.get_style_context (); ++ grid_context.add_class ("event"); ++ grid_context.add_provider (css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); ++ ++ add (grid); ++ ++ set_color (); ++ cal.notify["color"].connect (set_color); ++ ++ update_timelabel (); ++ time_manager.notify["is-12h"].connect (update_timelabel); + } + +- event_image = new Gtk.Image.from_icon_name (icon_name, Gtk.IconSize.MENU); +- event_image.valign = Gtk.Align.START; +- +- unowned Gtk.StyleContext event_image_context = event_image.get_style_context (); +- event_image_context.add_provider (css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); +- +- var name_label = new Gtk.Label (component.get_summary ()); +- name_label.hexpand = true; +- name_label.ellipsize = Pango.EllipsizeMode.END; +- name_label.lines = 3; +- name_label.max_width_chars = 30; +- name_label.wrap = true; +- name_label.wrap_mode = Pango.WrapMode.WORD_CHAR; +- name_label.xalign = 0; +- +- unowned Gtk.StyleContext name_label_context = name_label.get_style_context (); +- name_label_context.add_class ("title"); +- name_label_context.add_provider (css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); +- +- time_label = new Gtk.Label (null); +- time_label.use_markup = true; +- time_label.xalign = 0; +- time_label.get_style_context ().add_class (Gtk.STYLE_CLASS_DIM_LABEL); +- +- grid = new Gtk.Grid (); +- grid.column_spacing = 6; +- grid.margin = 3; +- grid.margin_start = grid.margin_end = 6; +- grid.attach (event_image, 0, 0); +- grid.attach (name_label, 1, 0); +- if (!is_allday) { +- grid.attach (time_label, 1, 1); ++ private void update_timelabel () { ++ var time_format = Granite.DateTime.get_default_time_format (time_manager.is_12h); ++ time_label.label = "%s – %s".printf (start_time.format (time_format), end_time.format (time_format)); + } + +- unowned Gtk.StyleContext grid_context = grid.get_style_context (); +- grid_context.add_class ("event"); +- grid_context.add_provider (css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); +- +- add (grid); +- +- set_color (); +- cal.notify["color"].connect (set_color); +- +- update_timelabel (); +- time_manager.notify["is-12h"].connect (update_timelabel); +- } +- +- private void update_timelabel () { +- var time_format = Granite.DateTime.get_default_time_format (time_manager.is_12h); +- time_label.label = "%s – %s".printf (start_time.format (time_format), end_time.format (time_format)); +- } +- +- private void set_color () { +- Util.set_event_calendar_color (cal, grid); +- Util.set_event_calendar_color (cal, event_image); ++ private void set_color () { ++ Util.set_event_calendar_color (cal, grid); ++ Util.set_event_calendar_color (cal, event_image); ++ } + } + } +diff --git a/src/Widgets/calendar/Grid.vala b/src/Widgets/Grid.vala +similarity index 95% +rename from src/Widgets/calendar/Grid.vala +rename to src/Widgets/Grid.vala +index 2b48636..165d11d 100644 +--- a/src/Widgets/calendar/Grid.vala ++++ b/src/Widgets/Grid.vala +@@ -20,11 +20,11 @@ + * Corentin Noël + */ + +-namespace DateTime.Widgets { ++namespace DateTimeIndicator { + /** + * Represents the entire date grid as a table. + */ +- public class Grid : Gtk.Grid { ++ public class Widgets.Grid : Gtk.Grid { + public Util.DateRange grid_range { get; private set; } + + /* +@@ -59,7 +59,7 @@ namespace DateTime.Widgets { + hexpand = true; + attach (week_sep_revealer, 1, 1, 1, 6); + +- DateTime.Indicator.settings.bind ("show-weeks", week_sep_revealer, "reveal-child", GLib.SettingsBindFlags.DEFAULT); ++ Indicator.settings.bind ("show-weeks", week_sep_revealer, "reveal-child", GLib.SettingsBindFlags.DEFAULT); + + data = new Gee.HashMap (); + events |= Gdk.EventMask.SCROLL_MASK; +@@ -77,7 +77,7 @@ namespace DateTime.Widgets { + day.set_selected (true); + day.set_state_flags (Gtk.StateFlags.FOCUSED, false); + selection_changed (selected_date); +- var calmodel = CalendarModel.get_default (); ++ var calmodel = Models.CalendarModel.get_default (); + var date_month = selected_date.get_month () - calmodel.month_start.get_month (); + var date_year = selected_date.get_year () - calmodel.month_start.get_year (); + +@@ -127,7 +127,7 @@ namespace DateTime.Widgets { + /* Create new widgets for the new range */ + + var date = Util.strip_time (today); +- date = date.add_days (CalendarModel.get_default ().week_starts_on - date.get_day_of_week ()); ++ date = date.add_days (Models.CalendarModel.get_default ().week_starts_on - date.get_day_of_week ()); + foreach (var label in header_labels) { + label.label = date.format ("%a"); + date = date.add_days (1); +@@ -221,7 +221,7 @@ namespace DateTime.Widgets { + week_labels[c].add (week_label); + week_labels[c].show_all (); + +- DateTime.Indicator.settings.bind ("show-weeks", week_labels[c], "reveal-child", GLib.SettingsBindFlags.DEFAULT); ++ Indicator.settings.bind ("show-weeks", week_labels[c], "reveal-child", GLib.SettingsBindFlags.DEFAULT); + + attach (week_labels[c], 0, c + 1); + +diff --git a/src/Widgets/GridDay.vala b/src/Widgets/GridDay.vala +new file mode 100644 +index 0000000..8c44443 +--- /dev/null ++++ b/src/Widgets/GridDay.vala +@@ -0,0 +1,180 @@ ++// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*- ++/*- ++ * Copyright (c) 2011–2018 elementary, Inc. (https://elementary.io) ++ * ++ * This program is free software: you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation, either version 3 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see . ++ * ++ * Authored by: Maxwell Barvian ++ * Corentin Noël ++ */ ++ ++namespace DateTimeIndicator { ++/** ++ * Represents a single day on the grid. ++ */ ++ public class Widgets.GridDay : Gtk.EventBox { ++ /* ++ * Event emitted when the day is double clicked or the ENTER key is pressed. ++ */ ++ public signal void on_event_add (GLib.DateTime date); ++ ++ public GLib.DateTime date { get; construct set; } ++ ++ private static Gtk.CssProvider provider; ++ private static Models.CalendarModel model; ++ ++ private Gee.HashMap event_dots; ++ private Gtk.Grid event_grid; ++ private Gtk.Label label; ++ private bool valid_grab = false; ++ ++ public GridDay (GLib.DateTime date) { ++ Object (date: date); ++ } ++ ++ static construct { ++ model = Models.CalendarModel.get_default (); ++ ++ provider = new Gtk.CssProvider (); ++ provider.load_from_resource ("/io/elementary/desktop/wingpanel/datetime/GridDay.css"); ++ } ++ ++ construct { ++ unowned Gtk.StyleContext style_context = get_style_context (); ++ style_context.add_provider (provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); ++ style_context.add_class ("circular"); ++ ++ label = new Gtk.Label (null); ++ ++ event_grid = new Gtk.Grid (); ++ event_grid.halign = Gtk.Align.CENTER; ++ event_grid.height_request = 6; ++ ++ var grid = new Gtk.Grid (); ++ grid.halign = grid.valign = Gtk.Align.CENTER; ++ grid.attach (label, 0, 0); ++ grid.attach (event_grid, 0, 1); ++ ++ can_focus = true; ++ events |= Gdk.EventMask.BUTTON_PRESS_MASK; ++ events |= Gdk.EventMask.KEY_PRESS_MASK; ++ events |= Gdk.EventMask.SMOOTH_SCROLL_MASK; ++ set_size_request (35, 35); ++ halign = Gtk.Align.CENTER; ++ hexpand = true; ++ add (grid); ++ show_all (); ++ ++ // Signals and handlers ++ button_press_event.connect (on_button_press); ++ key_press_event.connect (on_key_press); ++ scroll_event.connect ((event) => {return Util.on_scroll_event (event);}); ++ ++ notify["date"].connect (() => { ++ label.label = date.get_day_of_month ().to_string (); ++ }); ++ ++ event_dots = new Gee.HashMap (); ++ ++ model.events_added.connect (add_event_dots); ++ model.events_removed.connect (remove_event_dots); ++ } ++ ++ private void add_event_dots (E.Source source, Gee.Collection events) { ++ foreach (var component in events) { ++ if (event_dots.size >= 3) { ++ return; ++ } ++ ++ if (Util.calcomp_is_on_day (component, date)) { ++ unowned ICal.Component ical = component.get_icalcomponent (); ++ ++ var event_uid = ical.get_uid (); ++ if (!event_dots.has_key (event_uid)) { ++ var event_dot = new Gtk.Image (); ++ event_dot.gicon = new ThemedIcon ("pager-checked-symbolic"); ++ event_dot.pixel_size = 6; ++ ++ unowned Gtk.StyleContext style_context = event_dot.get_style_context (); ++ style_context.add_class (Granite.STYLE_CLASS_ACCENT); ++ style_context.add_provider (provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); ++ ++ var source_calendar = (E.SourceCalendar?) source.get_extension (E.SOURCE_EXTENSION_CALENDAR); ++ Util.set_event_calendar_color (source_calendar, event_dot); ++ ++ event_dots[event_uid] = event_dot; ++ ++ event_grid.add (event_dot); ++ } ++ } ++ } ++ ++ event_grid.show_all (); ++ } ++ ++ private void remove_event_dots (E.Source source, Gee.Collection events) { ++ foreach (var component in events) { ++ unowned ICal.Component ical = component.get_icalcomponent (); ++ var event_uid = ical.get_uid (); ++ var dot = event_dots[event_uid]; ++ if (dot != null) { ++ dot.destroy (); ++ event_dots.remove (event_uid); ++ } ++ } ++ } ++ ++ public void set_selected (bool selected) { ++ if (selected) { ++ set_state_flags (Gtk.StateFlags.SELECTED, true); ++ } else { ++ set_state_flags (Gtk.StateFlags.NORMAL, true); ++ } ++ } ++ ++ public void grab_focus_force () { ++ valid_grab = true; ++ grab_focus (); ++ } ++ ++ public override void grab_focus () { ++ if (valid_grab) { ++ base.grab_focus (); ++ valid_grab = false; ++ } ++ } ++ ++ public void sensitive_container (bool sens) { ++ label.sensitive = sens; ++ event_grid.sensitive = sens; ++ } ++ ++ private bool on_button_press (Gdk.EventButton event) { ++ if (event.type == Gdk.EventType.2BUTTON_PRESS && event.button == Gdk.BUTTON_PRIMARY) ++ on_event_add (date); ++ valid_grab = true; ++ grab_focus (); ++ return false; ++ } ++ ++ private bool on_key_press (Gdk.EventKey event) { ++ if (event.keyval == Gdk.keyval_from_name ("Return") ) { ++ on_event_add (date); ++ return true; ++ } ++ ++ return false; ++ } ++ } ++} +diff --git a/src/Widgets/PanelLabel.vala b/src/Widgets/PanelLabel.vala +index f253f9b..dff9a21 100644 +--- a/src/Widgets/PanelLabel.vala ++++ b/src/Widgets/PanelLabel.vala +@@ -17,55 +17,57 @@ + * Boston, MA 02110-1301 USA. + */ + +-public class DateTime.Widgets.PanelLabel : Gtk.Grid { +- private Gtk.Label date_label; +- private Gtk.Label time_label; +- private Services.TimeManager time_manager; ++namespace DateTimeIndicator { ++ public class Widgets.PanelLabel : Gtk.Grid { ++ private Gtk.Label date_label; ++ private Gtk.Label time_label; ++ private Services.TimeManager time_manager; + +- public string clock_format { get; set; } +- public bool clock_show_seconds { get; set; } +- public bool clock_show_weekday { get; set; } ++ public string clock_format { get; set; } ++ public bool clock_show_seconds { get; set; } ++ public bool clock_show_weekday { get; set; } + +- construct { +- date_label = new Gtk.Label (null); +- date_label.margin_end = 12; ++ construct { ++ date_label = new Gtk.Label (null); ++ date_label.margin_end = 12; + +- var date_revealer = new Gtk.Revealer (); +- date_revealer.transition_type = Gtk.RevealerTransitionType.SLIDE_LEFT; +- date_revealer.add (date_label); ++ var date_revealer = new Gtk.Revealer (); ++ date_revealer.transition_type = Gtk.RevealerTransitionType.SLIDE_LEFT; ++ date_revealer.add (date_label); + +- time_label = new Gtk.Label (null); ++ time_label = new Gtk.Label (null); + +- valign = Gtk.Align.CENTER; +- add (date_revealer); +- add (time_label); ++ valign = Gtk.Align.CENTER; ++ add (date_revealer); ++ add (time_label); + +- var clock_settings = new GLib.Settings ("io.elementary.desktop.wingpanel.datetime"); +- clock_settings.bind ("clock-format", this, "clock-format", SettingsBindFlags.DEFAULT); +- clock_settings.bind ("clock-show-seconds", this, "clock-show-seconds", SettingsBindFlags.DEFAULT); +- clock_settings.bind ("clock-show-date", date_revealer, "reveal_child", SettingsBindFlags.DEFAULT); +- clock_settings.bind ("clock-show-weekday", this, "clock-show-weekday", SettingsBindFlags.DEFAULT); ++ var clock_settings = new GLib.Settings ("io.elementary.desktop.wingpanel.datetime"); ++ clock_settings.bind ("clock-format", this, "clock-format", SettingsBindFlags.DEFAULT); ++ clock_settings.bind ("clock-show-seconds", this, "clock-show-seconds", SettingsBindFlags.DEFAULT); ++ clock_settings.bind ("clock-show-date", date_revealer, "reveal_child", SettingsBindFlags.DEFAULT); ++ clock_settings.bind ("clock-show-weekday", this, "clock-show-weekday", SettingsBindFlags.DEFAULT); + +- notify.connect (() => { +- update_labels (); +- }); ++ notify.connect (() => { ++ update_labels (); ++ }); + +- time_manager = Services.TimeManager.get_default (); +- time_manager.minute_changed.connect (update_labels); +- time_manager.notify["is-12h"].connect (update_labels); +- } +- +- private void update_labels () { +- string date_format; +- if (clock_format == "ISO8601") { +- date_format = "%F"; +- } else { +- date_format = Granite.DateTime.get_default_date_format (clock_show_weekday, true, false); ++ time_manager = Services.TimeManager.get_default (); ++ time_manager.minute_changed.connect (update_labels); ++ time_manager.notify["is-12h"].connect (update_labels); + } + +- date_label.label = time_manager.format (date_format); ++ private void update_labels () { ++ string date_format; ++ if (clock_format == "ISO8601") { ++ date_format = "%F"; ++ } else { ++ date_format = Granite.DateTime.get_default_date_format (clock_show_weekday, true, false); ++ } + +- string time_format = Granite.DateTime.get_default_time_format (time_manager.is_12h, clock_show_seconds); +- time_label.label = time_manager.format (time_format); ++ date_label.label = time_manager.format (date_format); ++ ++ string time_format = Granite.DateTime.get_default_time_format (time_manager.is_12h, clock_show_seconds); ++ time_label.label = time_manager.format (time_format); ++ } + } + } +diff --git a/src/Widgets/calendar/CalendarView.vala b/src/Widgets/calendar/CalendarView.vala +deleted file mode 100644 +index ef3f8f9..0000000 +--- a/src/Widgets/calendar/CalendarView.vala ++++ /dev/null +@@ -1,183 +0,0 @@ +-/*- +- * Copyright (c) 2011–2018 elementary, Inc. (https://elementary.io) +- * +- * This program is free software: you can redistribute it and/or modify +- * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or +- * (at your option) any later version. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License +- * along with this program. If not, see . +- * +- * Authored by: Maxwell Barvian +- * Corentin Noël +- */ +- +-public class DateTime.Widgets.CalendarView : Gtk.Grid { +- public signal void day_double_click (); +- public signal void event_updates (); +- public signal void selection_changed (GLib.DateTime? new_date); +- +- public GLib.DateTime? selected_date { get; private set; } +- +- private Grid grid; +- private Gtk.Stack stack; +- private Gtk.Grid big_grid; +- +- construct { +- var label = new Gtk.Label (new GLib.DateTime.now_local ().format (_("%OB, %Y"))); +- label.hexpand = true; +- label.margin_start = 6; +- label.xalign = 0; +- label.width_chars = 13; +- +- var provider = new Gtk.CssProvider (); +- provider.load_from_resource ("/io/elementary/desktop/wingpanel/datetime/ControlHeader.css"); +- +- var label_style_context = label.get_style_context (); +- label_style_context.add_class ("header-label"); +- label_style_context.add_provider (provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); +- +- var left_button = new Gtk.Button.from_icon_name ("pan-start-symbolic"); +- var center_button = new Gtk.Button.from_icon_name ("office-calendar-symbolic"); +- center_button.tooltip_text = _("Go to today's date"); +- var right_button = new Gtk.Button.from_icon_name ("pan-end-symbolic"); +- +- var box_buttons = new Gtk.Grid (); +- box_buttons.margin_end = 6; +- box_buttons.valign = Gtk.Align.CENTER; +- box_buttons.get_style_context ().add_class (Gtk.STYLE_CLASS_LINKED); +- box_buttons.add (left_button); +- box_buttons.add (center_button); +- box_buttons.add (right_button); +- +- big_grid = create_big_grid (); +- +- stack = new Gtk.Stack (); +- stack.add (big_grid); +- stack.show_all (); +- stack.expand = true; +- +- stack.notify["transition-running"].connect (() => { +- if (stack.transition_running == false) { +- stack.get_children ().foreach ((child) => { +- if (child != stack.visible_child) { +- child.destroy (); +- } +- }); +- } +- }); +- +- column_spacing = 6; +- row_spacing = 6; +- margin_start = margin_end = 10; +- attach (label, 0, 0); +- attach (box_buttons, 1, 0); +- attach (stack, 0, 1, 2); +- +- var model = CalendarModel.get_default (); +- model.notify["data-range"].connect (() => { +- label.label = model.month_start.format (_("%OB, %Y")); +- +- sync_with_model (); +- +- selected_date = null; +- selection_changed (selected_date); +- }); +- +- left_button.clicked.connect (() => { +- model.change_month (-1); +- }); +- +- right_button.clicked.connect (() => { +- model.change_month (1); +- }); +- +- center_button.clicked.connect (() => { +- show_today (); +- }); +- } +- +- private Gtk.Grid create_big_grid () { +- grid = new DateTime.Widgets.Grid (); +- grid.show_all (); +- +- grid.on_event_add.connect ((date) => { +- show_date_in_maya (date); +- day_double_click (); +- }); +- +- grid.selection_changed.connect ((date) => { +- selected_date = date; +- selection_changed (date); +- }); +- +- return grid; +- } +- +- public void show_today () { +- var calmodel = CalendarModel.get_default (); +- var today = Util.strip_time (new GLib.DateTime.now_local ()); +- var start = Util.get_start_of_month (today); +- selected_date = today; +- if (!start.equal (calmodel.month_start)) { +- calmodel.month_start = start; +- } +- sync_with_model (); +- +- grid.set_focus_to_today (); +- } +- +- // TODO: As far as maya supports it use the Dbus Activation feature to run the calendar-app. +- public void show_date_in_maya (GLib.DateTime date) { +- var command = "io.elementary.calendar --show-day %s".printf (date.format ("%F")); +- +- try { +- var appinfo = AppInfo.create_from_commandline (command, null, AppInfoCreateFlags.NONE); +- appinfo.launch_uris (null, null); +- } catch (GLib.Error e) { +- var dialog = new Granite.MessageDialog.with_image_from_icon_name ( +- _("Unable To Launch Calendar"), +- _("The program \"io.elementary.calendar\" may not be installed"), +- "dialog-error" +- ); +- dialog.show_error_details (e.message); +- dialog.run (); +- dialog.destroy (); +- } +- } +- +- /* Sets the calendar widgets to the date range of the model */ +- private void sync_with_model () { +- var model = CalendarModel.get_default (); +- if (grid.grid_range != null && (model.data_range.equals (grid.grid_range) || grid.grid_range.first_dt.compare (model.data_range.first_dt) == 0)) { +- grid.update_today (); +- return; // nothing else to do +- } +- +- GLib.DateTime previous_first = null; +- if (grid.grid_range != null) +- previous_first = grid.grid_range.first_dt; +- +- big_grid = create_big_grid (); +- stack.add (big_grid); +- +- grid.set_range (model.data_range, model.month_start); +- grid.update_weeks (model.data_range.first_dt, model.num_weeks); +- +- if (previous_first != null) { +- if (previous_first.compare (grid.grid_range.first_dt) == -1) { +- stack.transition_type = Gtk.StackTransitionType.SLIDE_LEFT; +- } else { +- stack.transition_type = Gtk.StackTransitionType.SLIDE_RIGHT; +- } +- } +- +- stack.set_visible_child (big_grid); +- } +-} +diff --git a/src/Widgets/calendar/GridDay.vala b/src/Widgets/calendar/GridDay.vala +deleted file mode 100644 +index a9b5a28..0000000 +--- a/src/Widgets/calendar/GridDay.vala ++++ /dev/null +@@ -1,178 +0,0 @@ +-// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*- +-/*- +- * Copyright (c) 2011–2018 elementary, Inc. (https://elementary.io) +- * +- * This program is free software: you can redistribute it and/or modify +- * it under the terms of the GNU General Public License as published by +- * the Free Software Foundation, either version 3 of the License, or +- * (at your option) any later version. +- * +- * This program is distributed in the hope that it will be useful, +- * but WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +- * GNU General Public License for more details. +- * +- * You should have received a copy of the GNU General Public License +- * along with this program. If not, see . +- * +- * Authored by: Maxwell Barvian +- * Corentin Noël +- */ +- +-/** +- * Represents a single day on the grid. +- */ +-public class DateTime.Widgets.GridDay : Gtk.EventBox { +- /* +- * Event emitted when the day is double clicked or the ENTER key is pressed. +- */ +- public signal void on_event_add (GLib.DateTime date); +- +- public GLib.DateTime date { get; construct set; } +- +- private static Gtk.CssProvider provider; +- private static Widgets.CalendarModel model; +- +- private Gee.HashMap event_dots; +- private Gtk.Grid event_grid; +- private Gtk.Label label; +- private bool valid_grab = false; +- +- public GridDay (GLib.DateTime date) { +- Object (date: date); +- } +- +- static construct { +- model = Widgets.CalendarModel.get_default (); +- +- provider = new Gtk.CssProvider (); +- provider.load_from_resource ("/io/elementary/desktop/wingpanel/datetime/GridDay.css"); +- } +- +- construct { +- unowned Gtk.StyleContext style_context = get_style_context (); +- style_context.add_provider (provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); +- style_context.add_class ("circular"); +- +- label = new Gtk.Label (null); +- +- event_grid = new Gtk.Grid (); +- event_grid.halign = Gtk.Align.CENTER; +- event_grid.height_request = 6; +- +- var grid = new Gtk.Grid (); +- grid.halign = grid.valign = Gtk.Align.CENTER; +- grid.attach (label, 0, 0); +- grid.attach (event_grid, 0, 1); +- +- can_focus = true; +- events |= Gdk.EventMask.BUTTON_PRESS_MASK; +- events |= Gdk.EventMask.KEY_PRESS_MASK; +- events |= Gdk.EventMask.SMOOTH_SCROLL_MASK; +- set_size_request (35, 35); +- halign = Gtk.Align.CENTER; +- hexpand = true; +- add (grid); +- show_all (); +- +- // Signals and handlers +- button_press_event.connect (on_button_press); +- key_press_event.connect (on_key_press); +- scroll_event.connect ((event) => {return Util.on_scroll_event (event);}); +- +- notify["date"].connect (() => { +- label.label = date.get_day_of_month ().to_string (); +- }); +- +- event_dots = new Gee.HashMap (); +- +- model.events_added.connect (add_event_dots); +- model.events_removed.connect (remove_event_dots); +- } +- +- private void add_event_dots (E.Source source, Gee.Collection events) { +- foreach (var component in events) { +- if (event_dots.size >= 3) { +- return; +- } +- +- if (Util.calcomp_is_on_day (component, date)) { +- unowned ICal.Component ical = component.get_icalcomponent (); +- +- var event_uid = ical.get_uid (); +- if (!event_dots.has_key (event_uid)) { +- var event_dot = new Gtk.Image (); +- event_dot.gicon = new ThemedIcon ("pager-checked-symbolic"); +- event_dot.pixel_size = 6; +- +- unowned Gtk.StyleContext style_context = event_dot.get_style_context (); +- style_context.add_class (Granite.STYLE_CLASS_ACCENT); +- style_context.add_provider (provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); +- +- var source_calendar = (E.SourceCalendar?) source.get_extension (E.SOURCE_EXTENSION_CALENDAR); +- Util.set_event_calendar_color (source_calendar, event_dot); +- +- event_dots[event_uid] = event_dot; +- +- event_grid.add (event_dot); +- } +- } +- } +- +- event_grid.show_all (); +- } +- +- private void remove_event_dots (E.Source source, Gee.Collection events) { +- foreach (var component in events) { +- unowned ICal.Component ical = component.get_icalcomponent (); +- var event_uid = ical.get_uid (); +- var dot = event_dots[event_uid]; +- if (dot != null) { +- dot.destroy (); +- event_dots.remove (event_uid); +- } +- } +- } +- +- public void set_selected (bool selected) { +- if (selected) { +- set_state_flags (Gtk.StateFlags.SELECTED, true); +- } else { +- set_state_flags (Gtk.StateFlags.NORMAL, true); +- } +- } +- +- public void grab_focus_force () { +- valid_grab = true; +- grab_focus (); +- } +- +- public override void grab_focus () { +- if (valid_grab) { +- base.grab_focus (); +- valid_grab = false; +- } +- } +- +- public void sensitive_container (bool sens) { +- label.sensitive = sens; +- event_grid.sensitive = sens; +- } +- +- private bool on_button_press (Gdk.EventButton event) { +- if (event.type == Gdk.EventType.2BUTTON_PRESS && event.button == Gdk.BUTTON_PRIMARY) +- on_event_add (date); +- valid_grab = true; +- grab_focus (); +- return false; +- } +- +- private bool on_key_press (Gdk.EventKey event) { +- if (event.keyval == Gdk.keyval_from_name ("Return") ) { +- on_event_add (date); +- return true; +- } +- +- return false; +- } +-} + +From 11f11073d74dac1d831560c3a92687531aaf846e Mon Sep 17 00:00:00 2001 +From: Dirli +Date: Thu, 9 Apr 2020 20:46:31 +0300 +Subject: [PATCH 2/8] Events list moved to a separate file + +--- + meson.build | 1 + + src/Indicator.vala | 113 +++------------------------------ + src/Widgets/EventsListBox.vala | 102 +++++++++++++++++++++++++++++ + 3 files changed, 113 insertions(+), 103 deletions(-) + create mode 100644 src/Widgets/EventsListBox.vala + +diff --git a/meson.build b/meson.build +index b44c5bd..1b52276 100644 +--- a/meson.build ++++ b/meson.build +@@ -46,6 +46,7 @@ shared_module( + 'src/Models/CalendarModel.vala', + 'src/Widgets/CalendarView.vala', + 'src/Widgets/EventRow.vala', ++ 'src/Widgets/EventsListBox.vala', + 'src/Widgets/Grid.vala', + 'src/Widgets/GridDay.vala', + 'src/Widgets/PanelLabel.vala', +diff --git a/src/Indicator.vala b/src/Indicator.vala +index b712c12..6a8d001 100644 +--- a/src/Indicator.vala ++++ b/src/Indicator.vala +@@ -22,9 +22,9 @@ namespace DateTimeIndicator { + public static GLib.Settings settings; + + private Widgets.PanelLabel panel_label; +- private Gtk.Grid main_grid; + private Widgets.CalendarView calendar; +- private Gtk.ListBox event_listbox; ++ private Widgets.EventsListBox event_listbox; ++ private Gtk.Grid main_grid; + private uint update_events_idle_source = 0; + + public Indicator () { +@@ -56,24 +56,7 @@ namespace DateTimeIndicator { + calendar = new Widgets.CalendarView (); + calendar.margin_bottom = 6; + +- var placeholder_label = new Gtk.Label (_("No Events on This Day")); +- placeholder_label.wrap = true; +- placeholder_label.wrap_mode = Pango.WrapMode.WORD; +- placeholder_label.margin_start = 12; +- placeholder_label.margin_end = 12; +- placeholder_label.max_width_chars = 20; +- placeholder_label.justify = Gtk.Justification.CENTER; +- placeholder_label.show_all (); +- +- var placeholder_style_context = placeholder_label.get_style_context (); +- placeholder_style_context.add_class (Gtk.STYLE_CLASS_DIM_LABEL); +- placeholder_style_context.add_class (Granite.STYLE_CLASS_H3_LABEL); +- +- event_listbox = new Gtk.ListBox (); +- event_listbox.selection_mode = Gtk.SelectionMode.NONE; +- event_listbox.set_header_func (header_update_func); +- event_listbox.set_placeholder (placeholder_label); +- event_listbox.set_sort_func (sort_function); ++ event_listbox = new Widgets.EventsListBox (); + + var scrolled_window = new Gtk.ScrolledWindow (null, null); + scrolled_window.hscrollbar_policy = Gtk.PolicyType.NEVER; +@@ -84,11 +67,11 @@ namespace DateTimeIndicator { + + main_grid = new Gtk.Grid (); + main_grid.margin_top = 12; +- main_grid.attach (calendar, 0, 0); +- main_grid.attach (new Gtk.Separator (Gtk.Orientation.VERTICAL), 1, 0); +- main_grid.attach (scrolled_window, 2, 0); +- main_grid.attach (new Wingpanel.Widgets.Separator (), 0, 2, 3); +- main_grid.attach (settings_button, 0, 3, 3); ++ main_grid.attach (calendar, 0, 0); ++ main_grid.attach (new Wingpanel.Widgets.Separator (), 0, 1); ++ main_grid.attach (settings_button, 0, 2); ++ main_grid.attach (new Gtk.Separator (Gtk.Orientation.VERTICAL), 1, 0, 1, 3); ++ main_grid.attach (scrolled_window, 2, 0, 1, 3); + + var size_group = new Gtk.SizeGroup (Gtk.SizeGroupMode.HORIZONTAL); + size_group.add_widget (calendar); +@@ -119,52 +102,6 @@ namespace DateTimeIndicator { + return main_grid; + } + +- private void header_update_func (Gtk.ListBoxRow lbrow, Gtk.ListBoxRow? lbbefore) { +- var row = (EventRow) lbrow; +- if (lbbefore != null) { +- var before = (EventRow) lbbefore; +- if (row.is_allday == before.is_allday) { +- row.set_header (null); +- return; +- } +- +- if (row.is_allday != before.is_allday) { +- var header_label = new Granite.HeaderLabel (_("During the Day")); +- header_label.margin_start = header_label.margin_end = 6; +- +- row.set_header (header_label); +- return; +- } +- } else { +- if (row.is_allday) { +- var allday_header = new Granite.HeaderLabel (_("All Day")); +- allday_header.margin_start = allday_header.margin_end = 6; +- +- row.set_header (allday_header); +- } +- return; +- } +- } +- +- [CCode (instance_pos = -1)] +- private int sort_function (Gtk.ListBoxRow child1, Gtk.ListBoxRow child2) { +- var e1 = (EventRow) child1; +- var e2 = (EventRow) child2; +- +- if (e1.start_time.compare (e2.start_time) != 0) { +- return e1.start_time.compare (e2.start_time); +- } +- +- // If they have the same date, sort them wholeday first +- if (e1.is_allday) { +- return -1; +- } else if (e2.is_allday) { +- return 1; +- } +- +- return 0; +- } +- + private void update_events_model (E.Source source, Gee.Collection events) { + idle_update_events (); + } +@@ -174,42 +111,12 @@ namespace DateTimeIndicator { + GLib.Source.remove (update_events_idle_source); + } + +- update_events_idle_source = GLib.Idle.add (update_events); +- } +- +- private bool update_events () { +- foreach (unowned Gtk.Widget widget in event_listbox.get_children ()) { +- widget.destroy (); +- } ++ update_events_idle_source = GLib.Idle.add (() => { ++ event_listbox.update_events (calendar.selected_date); + +- if (calendar.selected_date == null) { + update_events_idle_source = 0; + return GLib.Source.REMOVE; +- } +- +- var date = calendar.selected_date; +- +- var model = Models.CalendarModel.get_default (); +- +- var events_on_day = new Gee.TreeMap (); +- +- model.source_events.@foreach ((source, component_map) => { +- foreach (var comp in component_map.get_values ()) { +- if (Util.calcomp_is_on_day (comp, date)) { +- unowned ICal.Component ical = comp.get_icalcomponent (); +- var event_uid = ical.get_uid (); +- if (!events_on_day.has_key (event_uid)) { +- events_on_day[event_uid] = new EventRow (date, ical, source); +- +- event_listbox.add (events_on_day[event_uid]); +- } +- } +- } + }); +- +- event_listbox.show_all (); +- update_events_idle_source = 0; +- return GLib.Source.REMOVE; + } + + public override void opened () { +diff --git a/src/Widgets/EventsListBox.vala b/src/Widgets/EventsListBox.vala +new file mode 100644 +index 0000000..547e4c5 +--- /dev/null ++++ b/src/Widgets/EventsListBox.vala +@@ -0,0 +1,102 @@ ++namespace DateTimeIndicator { ++ public class Widgets.EventsListBox : Gtk.ListBox { ++ ++ public EventsListBox () { ++ selection_mode = Gtk.SelectionMode.NONE; ++ ++ var placeholder_label = new Gtk.Label (_("No Events on This Day")); ++ placeholder_label.wrap = true; ++ placeholder_label.wrap_mode = Pango.WrapMode.WORD; ++ placeholder_label.margin_start = 12; ++ placeholder_label.margin_end = 12; ++ placeholder_label.max_width_chars = 20; ++ placeholder_label.justify = Gtk.Justification.CENTER; ++ placeholder_label.show_all (); ++ ++ var placeholder_style_context = placeholder_label.get_style_context (); ++ placeholder_style_context.add_class (Gtk.STYLE_CLASS_DIM_LABEL); ++ placeholder_style_context.add_class (Granite.STYLE_CLASS_H3_LABEL); ++ ++ set_header_func (header_update_func); ++ set_placeholder (placeholder_label); ++ set_sort_func (sort_function); ++ } ++ ++ public void update_events (GLib.DateTime? selected_date) { ++ foreach (unowned Gtk.Widget widget in get_children ()) { ++ widget.destroy (); ++ } ++ ++ if (selected_date == null) { ++ return; ++ } ++ ++ var model = Models.CalendarModel.get_default (); ++ ++ var events_on_day = new Gee.TreeMap (); ++ ++ model.source_events.@foreach ((source, component_map) => { ++ foreach (var comp in component_map.get_values ()) { ++ if (Util.calcomp_is_on_day (comp, selected_date)) { ++ unowned ICal.Component ical = comp.get_icalcomponent (); ++ var event_uid = ical.get_uid (); ++ if (!events_on_day.has_key (event_uid)) { ++ events_on_day[event_uid] = new EventRow (selected_date, ical, source); ++ ++ add (events_on_day[event_uid]); ++ } ++ } ++ } ++ }); ++ ++ show_all (); ++ return; ++ } ++ ++ private void header_update_func (Gtk.ListBoxRow lbrow, Gtk.ListBoxRow? lbbefore) { ++ var row = (EventRow) lbrow; ++ if (lbbefore != null) { ++ var before = (EventRow) lbbefore; ++ if (row.is_allday == before.is_allday) { ++ row.set_header (null); ++ return; ++ } ++ ++ if (row.is_allday != before.is_allday) { ++ var header_label = new Granite.HeaderLabel (_("During the Day")); ++ header_label.margin_start = header_label.margin_end = 6; ++ ++ row.set_header (header_label); ++ return; ++ } ++ } else { ++ if (row.is_allday) { ++ var allday_header = new Granite.HeaderLabel (_("All Day")); ++ allday_header.margin_start = allday_header.margin_end = 6; ++ ++ row.set_header (allday_header); ++ } ++ return; ++ } ++ } ++ ++ [CCode (instance_pos = -1)] ++ private int sort_function (Gtk.ListBoxRow child1, Gtk.ListBoxRow child2) { ++ var e1 = (EventRow) child1; ++ var e2 = (EventRow) child2; ++ ++ if (e1.start_time.compare (e2.start_time) != 0) { ++ return e1.start_time.compare (e2.start_time); ++ } ++ ++ // If they have the same date, sort them wholeday first ++ if (e1.is_allday) { ++ return -1; ++ } else if (e2.is_allday) { ++ return 1; ++ } ++ ++ return 0; ++ } ++ } ++} + +From 262d91676f78f031bcfbff637344e52c63ab89bd Mon Sep 17 00:00:00 2001 +From: Dirli +Date: Sat, 11 Apr 2020 21:56:33 +0300 +Subject: [PATCH 3/8] added event manager + +--- + meson.build | 1 + + src/Indicator.vala | 38 ++++-- + src/Models/CalendarModel.vala | 224 +------------------------------ + src/Services/EventsManager.vala | 226 ++++++++++++++++++++++++++++++++ + src/Util/Util.vala | 57 ++------ + src/Widgets/CalendarView.vala | 9 ++ + src/Widgets/EventsListBox.vala | 7 +- + src/Widgets/Grid.vala | 31 +++++ + src/Widgets/GridDay.vala | 111 +++++++++++----- + 9 files changed, 385 insertions(+), 319 deletions(-) + create mode 100644 src/Services/EventsManager.vala + +diff --git a/meson.build b/meson.build +index 1b52276..e348e3d 100644 +--- a/meson.build ++++ b/meson.build +@@ -50,6 +50,7 @@ shared_module( + 'src/Widgets/Grid.vala', + 'src/Widgets/GridDay.vala', + 'src/Widgets/PanelLabel.vala', ++ 'src/Services/EventsManager.vala', + 'src/Services/TimeManager.vala', + dependencies: [ + dependency('glib-2.0'), +diff --git a/src/Indicator.vala b/src/Indicator.vala +index 6a8d001..bf4358f 100644 +--- a/src/Indicator.vala ++++ b/src/Indicator.vala +@@ -24,9 +24,14 @@ namespace DateTimeIndicator { + private Widgets.PanelLabel panel_label; + private Widgets.CalendarView calendar; + private Widgets.EventsListBox event_listbox; ++ ++ private Services.EventsManager event_manager; ++ + private Gtk.Grid main_grid; + private uint update_events_idle_source = 0; + ++ private bool opened_widget = false; ++ + public Indicator () { + Object ( + code_name: Wingpanel.Indicator.DATETIME, +@@ -56,10 +61,22 @@ namespace DateTimeIndicator { + calendar = new Widgets.CalendarView (); + calendar.margin_bottom = 6; + ++ event_manager = new Services.EventsManager (); ++ event_manager.events_updated.connect (update_events_model); ++ event_manager.events_added.connect ((source, events) => { ++ calendar.add_event_dots (source, events); ++ update_events_model (source, events); ++ }); ++ event_manager.events_removed.connect ((source, events) => { ++ calendar.remove_event_dots (source, events); ++ update_events_model (source, events); ++ }); ++ + event_listbox = new Widgets.EventsListBox (); + + var scrolled_window = new Gtk.ScrolledWindow (null, null); + scrolled_window.hscrollbar_policy = Gtk.PolicyType.NEVER; ++ scrolled_window.vscrollbar_policy = Gtk.PolicyType.AUTOMATIC; + scrolled_window.add (event_listbox); + + var settings_button = new Gtk.ModelButton (); +@@ -90,6 +107,12 @@ namespace DateTimeIndicator { + close (); + }); + ++ var model = Models.CalendarModel.get_default (); ++ model.notify["month-start"].connect (() => { ++ model.compute_ranges (); ++ event_manager.load_all_sources (); ++ }); ++ + settings_button.clicked.connect (() => { + try { + AppInfo.launch_default_for_uri ("settings://time", null); +@@ -103,7 +126,9 @@ namespace DateTimeIndicator { + } + + private void update_events_model (E.Source source, Gee.Collection events) { +- idle_update_events (); ++ if (opened_widget) { ++ idle_update_events (); ++ } + } + + private void idle_update_events () { +@@ -112,7 +137,7 @@ namespace DateTimeIndicator { + } + + update_events_idle_source = GLib.Idle.add (() => { +- event_listbox.update_events (calendar.selected_date); ++ event_listbox.update_events (calendar.selected_date, event_manager.source_events); + + update_events_idle_source = 0; + return GLib.Source.REMOVE; +@@ -122,18 +147,15 @@ namespace DateTimeIndicator { + public override void opened () { + calendar.show_today (); + +- Models.CalendarModel.get_default ().events_added.connect (update_events_model); +- Models.CalendarModel.get_default ().events_updated.connect (update_events_model); +- Models.CalendarModel.get_default ().events_removed.connect (update_events_model); ++ opened_widget = true; + } + + public override void closed () { +- Models.CalendarModel.get_default ().events_added.disconnect (update_events_model); +- Models.CalendarModel.get_default ().events_updated.disconnect (update_events_model); +- Models.CalendarModel.get_default ().events_removed.disconnect (update_events_model); ++ opened_widget = false; + } + } + } ++ + public Wingpanel.Indicator get_indicator (Module module) { + debug ("Activating DateTime Indicator"); + var indicator = new DateTimeIndicator.Indicator (); +diff --git a/src/Models/CalendarModel.vala b/src/Models/CalendarModel.vala +index 965b93e..d60a9ac 100644 +--- a/src/Models/CalendarModel.vala ++++ b/src/Models/CalendarModel.vala +@@ -35,17 +35,6 @@ namespace DateTimeIndicator { + /* The start of week, ie. Monday=1 or Sunday=7 */ + public GLib.DateWeekday week_starts_on { get; set; } + +- public HashTable> source_events { get; private set; } +- +- /* Notifies when events are added, updated, or removed */ +- public signal void events_added (E.Source source, Gee.Collection events); +- public signal void events_updated (E.Source source, Gee.Collection events); +- public signal void events_removed (E.Source source, Gee.Collection events); +- +- private E.SourceRegistry registry { get; private set; } +- private HashTable source_client; +- private HashTable source_view; +- + private static CalendarModel? calendar_model = null; + + public static CalendarModel get_default () { +@@ -59,12 +48,6 @@ namespace DateTimeIndicator { + } + + construct { +- open.begin (); +- +- source_client = new HashTable (str_hash, str_equal); +- source_events = new HashTable > (Util.source_hash_func, Util.source_equal_func); +- source_view = new HashTable (str_hash, str_equal); +- + int week_start = Posix.NLTime.FIRST_WEEKDAY.to_string ().data[0]; + if (week_start >= 1 && week_start <= 7) { + week_starts_on = (GLib.DateWeekday) (week_start - 1); +@@ -72,66 +55,6 @@ namespace DateTimeIndicator { + + month_start = Util.get_start_of_month (); + compute_ranges (); +- notify["month-start"].connect (on_parameter_changed); +- } +- +- private async void open () { +- try { +- registry = yield new E.SourceRegistry (null); +- registry.source_removed.connect (remove_source); +- registry.source_added.connect ((source) => add_source_async.begin (source)); +- +- // Add sources +- registry.list_sources (E.SOURCE_EXTENSION_CALENDAR).foreach ((source) => { +- E.SourceCalendar cal = (E.SourceCalendar)source.get_extension (E.SOURCE_EXTENSION_CALENDAR); +- if (cal.selected == true && source.enabled == true) { +- add_source_async.begin (source); +- } +- }); +- +- load_all_sources (); +- } catch (GLib.Error error) { +- critical (error.message); +- } +- } +- +- private void load_all_sources () { +- lock (source_client) { +- foreach (var id in source_client.get_keys ()) { +- var source = registry.ref_source (id); +- E.SourceCalendar cal = (E.SourceCalendar)source.get_extension (E.SOURCE_EXTENSION_CALENDAR); +- +- if (cal.selected == true && source.enabled == true) { +- load_source (source); +- } +- } +- } +- } +- +- private void remove_source (E.Source source) { +- debug ("Removing source '%s'", source.dup_display_name ()); +- /* Already out of the model, so do nothing */ +- unowned string uid = source.get_uid (); +- +- if (!source_view.contains (uid)) { +- return; +- } +- +- var current_view = source_view.get (uid); +- try { +- current_view.stop (); +- } catch (Error e) { +- warning (e.message); +- } +- +- source_view.remove (uid); +- lock (source_client) { +- source_client.remove (uid); +- } +- +- var events = source_events.get (source).get_values ().read_only_view; +- events_removed (source, events); +- source_events.remove (source); + } + + public void change_month (int relative) { +@@ -144,7 +67,7 @@ namespace DateTimeIndicator { + + /* --- Helper Methods ---// */ + +- private void compute_ranges () { ++ public void compute_ranges () { + var month_end = month_start.add_full (0, 1, -1); + + int dow = month_start.get_day_of_week (); +@@ -182,150 +105,5 @@ namespace DateTimeIndicator { + + debug (@"Date ranges: ($data_range_first <= $month_start < $month_end <= $data_range_last)"); + } +- +- private void load_source (E.Source source) { +- /* create empty source-event map */ +- var events = new Gee.TreeMultiMap ( +- (GLib.CompareDataFunc?) GLib.strcmp, +- (GLib.CompareDataFunc?) Util.calcomponent_compare_func +- ); +- source_events.set (source, events); +- /* query client view */ +- var iso_first = ECal.isodate_from_time_t ((time_t)data_range.first_dt.to_unix ()); +- var iso_last = ECal.isodate_from_time_t ((time_t)data_range.last_dt.add_days (1).to_unix ()); +- var query = @"(occur-in-time-range? (make-time \"$iso_first\") (make-time \"$iso_last\"))"; +- +- ECal.Client client; +- lock (source_client) { +- client = source_client.get (source.dup_uid ()); +- } +- +- if (client == null) { +- return; +- } +- +- debug ("Getting client-view for source '%s'", source.dup_display_name ()); +- client.get_view.begin (query, null, (obj, results) => { +- var view = on_client_view_received (results, source, client); +- view.objects_added.connect ((objects) => on_objects_added (source, client, objects)); +- view.objects_removed.connect ((objects) => on_objects_removed (source, client, objects)); +- view.objects_modified.connect ((objects) => on_objects_modified (source, client, objects)); +- try { +- view.start (); +- } catch (Error e) { +- critical (e.message); +- } +- +- source_view.set (source.dup_uid (), view); +- }); +- } +- +- private async void add_source_async (E.Source source) { +- debug ("Adding source '%s'", source.dup_display_name ()); +- try { +- var client = (ECal.Client) ECal.Client.connect_sync (source, ECal.ClientSourceType.EVENTS, -1, null); +- source_client.insert (source.dup_uid (), client); +- } catch (Error e) { +- critical (e.message); +- } +- +- Idle.add (() => { +- load_source (source); +- +- return false; +- }); +- } +- +- private void debug_event (E.Source source, ECal.Component event) { +- unowned ICal.Component comp = event.get_icalcomponent (); +- debug (@"Event ['$(comp.get_summary())', $(source.dup_display_name()), $(comp.get_uid()))]"); +- } +- +- /* --- Signal Handlers ---// */ +- private void on_parameter_changed () { +- compute_ranges (); +- load_all_sources (); +- } +- +- private ECal.ClientView on_client_view_received (AsyncResult results, E.Source source, ECal.Client client) { +- ECal.ClientView view; +- try { +- debug ("Received client-view for source '%s'", source.dup_display_name ()); +- bool status = client.get_view.end (results, out view); +- assert (status == true); +- } catch (Error e) { +- critical ("Error loading client-view from source '%s': %s", source.dup_display_name (), e.message); +- } +- +- return view; +- } +- +-#if E_CAL_2_0 +- private void on_objects_added (E.Source source, ECal.Client client, SList objects) { +-#else +- private void on_objects_added (E.Source source, ECal.Client client, SList objects) { +-#endif +- debug (@"Received $(objects.length()) added event(s) for source '%s'", source.dup_display_name ()); +- var events = source_events.get (source); +- var added_events = new Gee.ArrayList ((Gee.EqualDataFunc?) Util.calcomponent_equal_func); +- objects.foreach ((comp) => { +- unowned string uid = comp.get_uid (); +-#if E_CAL_2_0 +- client.generate_instances_for_object_sync (comp, (time_t) data_range.first_dt.to_unix (), (time_t) data_range.last_dt.to_unix (), null, (comp, start, end) => { +- var event = new ECal.Component.from_icalcomponent (comp); +-#else +- client.generate_instances_for_object_sync (comp, (time_t) data_range.first_dt.to_unix (), (time_t) data_range.last_dt.to_unix (), (event, start, end) => { +-#endif +- debug_event (source, event); +- events.set (uid, event); +- added_events.add (event); +- return true; +- }); +- }); +- } +- +-#if E_CAL_2_0 +- private void on_objects_modified (E.Source source, ECal.Client client, SList objects) { +-#else +- private void on_objects_modified (E.Source source, ECal.Client client, SList objects) { +-#endif +- debug (@"Received $(objects.length()) modified event(s) for source '%s'", source.dup_display_name ()); +- var updated_events = new Gee.ArrayList ((Gee.EqualDataFunc?) Util.calcomponent_equal_func); +- +- objects.foreach ((comp) => { +- unowned string uid = comp.get_uid (); +- var events = source_events.get (source).get (uid); +- updated_events.add_all (events); +- foreach (var event in events) { +- debug_event (source, event); +- } +- }); +- +- events_updated (source, updated_events.read_only_view); +- } +- +-#if E_CAL_2_0 +- private void on_objects_removed (E.Source source, ECal.Client client, SList cids) { +-#else +- private void on_objects_removed (E.Source source, ECal.Client client, SList cids) { +-#endif +- debug (@"Received $(cids.length()) removed event(s) for source '%s'", source.dup_display_name ()); +- var events = source_events.get (source); +- var removed_events = new Gee.ArrayList ((Gee.EqualDataFunc?) Util.calcomponent_equal_func); +- +- cids.foreach ((cid) => { +- if (cid == null) { +- return; +- } +- +- var comps = events.get (cid.get_uid ()); +- foreach (ECal.Component event in comps) { +- removed_events.add (event); +- debug_event (source, event); +- } +- }); +- +- events_removed (source, removed_events.read_only_view); +- } + } + } +diff --git a/src/Services/EventsManager.vala b/src/Services/EventsManager.vala +new file mode 100644 +index 0000000..d939777 +--- /dev/null ++++ b/src/Services/EventsManager.vala +@@ -0,0 +1,226 @@ ++namespace DateTimeIndicator { ++ public class Services.EventsManager : GLib.Object { ++ public signal void events_added (E.Source source, Gee.Collection events); ++ public signal void events_updated (E.Source source, Gee.Collection events); ++ public signal void events_removed (E.Source source, Gee.Collection events); ++ ++ public HashTable> source_events { get; private set; } ++ ++ private E.SourceRegistry registry { get; private set; } ++ private HashTable source_client; ++ private HashTable source_view; ++ ++ public EventsManager () { ++ ++ } ++ ++ construct { ++ source_client = new HashTable (str_hash, str_equal); ++ source_events = new HashTable > (Util.source_hash_func, Util.source_equal_func); ++ source_view = new HashTable (str_hash, str_equal); ++ ++ open.begin (); ++ } ++ ++ private async void open () { ++ try { ++ registry = yield new E.SourceRegistry (null); ++ registry.source_removed.connect (remove_source); ++ registry.source_added.connect ((source) => add_source_async.begin (source)); ++ ++ // Add sources ++ registry.list_sources (E.SOURCE_EXTENSION_CALENDAR).foreach ((source) => { ++ E.SourceCalendar cal = (E.SourceCalendar)source.get_extension (E.SOURCE_EXTENSION_CALENDAR); ++ if (cal.selected == true && source.enabled == true) { ++ add_source_async.begin (source); ++ } ++ }); ++ ++ load_all_sources (); ++ } catch (GLib.Error error) { ++ critical (error.message); ++ } ++ } ++ ++ public void load_all_sources () { ++ lock (source_client) { ++ foreach (var id in source_client.get_keys ()) { ++ var source = registry.ref_source (id); ++ E.SourceCalendar cal = (E.SourceCalendar)source.get_extension (E.SOURCE_EXTENSION_CALENDAR); ++ ++ if (cal.selected == true && source.enabled == true) { ++ load_source (source); ++ } ++ } ++ } ++ } ++ ++ private void remove_source (E.Source source) { ++ debug ("Removing source '%s'", source.dup_display_name ()); ++ /* Already out of the model, so do nothing */ ++ unowned string uid = source.get_uid (); ++ ++ if (!source_view.contains (uid)) { ++ return; ++ } ++ ++ var current_view = source_view.get (uid); ++ try { ++ current_view.stop (); ++ } catch (Error e) { ++ warning (e.message); ++ } ++ ++ source_view.remove (uid); ++ lock (source_client) { ++ source_client.remove (uid); ++ } ++ ++ var events = source_events.get (source).get_values ().read_only_view; ++ events_removed (source, events); ++ source_events.remove (source); ++ } ++ ++ private void load_source (E.Source source) { ++ var model = Models.CalendarModel.get_default (); ++ ++ /* create empty source-event map */ ++ var events = new Gee.TreeMultiMap ( ++ (GLib.CompareDataFunc?) GLib.strcmp, ++ (GLib.CompareDataFunc?) Util.calcomponent_compare_func ++ ); ++ source_events.set (source, events); ++ /* query client view */ ++ var iso_first = ECal.isodate_from_time_t ((time_t) model.data_range.first_dt.to_unix ()); ++ var iso_last = ECal.isodate_from_time_t ((time_t) model.data_range.last_dt.add_days (1).to_unix ()); ++ var query = @"(occur-in-time-range? (make-time \"$iso_first\") (make-time \"$iso_last\"))"; ++ ++ ECal.Client client; ++ lock (source_client) { ++ client = source_client.get (source.dup_uid ()); ++ } ++ ++ if (client == null) { ++ return; ++ } ++ ++ debug ("Getting client-view for source '%s'", source.dup_display_name ()); ++ client.get_view.begin (query, null, (obj, results) => { ++ var view = on_client_view_received (results, source, client); ++ view.objects_added.connect ((objects) => on_objects_added (source, client, objects)); ++ view.objects_removed.connect ((objects) => on_objects_removed (source, client, objects)); ++ view.objects_modified.connect ((objects) => on_objects_modified (source, client, objects)); ++ try { ++ view.start (); ++ } catch (Error e) { ++ critical (e.message); ++ } ++ ++ source_view.set (source.dup_uid (), view); ++ }); ++ } ++ ++ private async void add_source_async (E.Source source) { ++ debug ("Adding source '%s'", source.dup_display_name ()); ++ try { ++ var client = (ECal.Client) ECal.Client.connect_sync (source, ECal.ClientSourceType.EVENTS, -1, null); ++ source_client.insert (source.dup_uid (), client); ++ } catch (Error e) { ++ critical (e.message); ++ } ++ ++ Idle.add (() => { ++ load_source (source); ++ ++ return false; ++ }); ++ } ++ ++ private void debug_event (E.Source source, ECal.Component event) { ++ unowned ICal.Component comp = event.get_icalcomponent (); ++ debug (@"Event ['$(comp.get_summary())', $(source.dup_display_name()), $(comp.get_uid()))]"); ++ } ++ ++ private ECal.ClientView on_client_view_received (AsyncResult results, E.Source source, ECal.Client client) { ++ ECal.ClientView view; ++ try { ++ debug ("Received client-view for source '%s'", source.dup_display_name ()); ++ bool status = client.get_view.end (results, out view); ++ assert (status == true); ++ } catch (Error e) { ++ critical ("Error loading client-view from source '%s': %s", source.dup_display_name (), e.message); ++ } ++ ++ return view; ++ } ++ ++#if E_CAL_2_0 ++ private void on_objects_added (E.Source source, ECal.Client client, SList objects) { ++#else ++ private void on_objects_added (E.Source source, ECal.Client client, SList objects) { ++#endif ++ debug (@"Received $(objects.length()) added event(s) for source '%s'", source.dup_display_name ()); ++ var events = source_events.get (source); ++ var added_events = new Gee.ArrayList ((Gee.EqualDataFunc?) Util.calcomponent_equal_func); ++ var model = Models.CalendarModel.get_default (); ++ objects.foreach ((comp) => { ++ unowned string uid = comp.get_uid (); ++#if E_CAL_2_0 ++ client.generate_instances_for_object_sync (comp, (time_t) model.data_range.first_dt.to_unix (), (time_t) model.data_range.last_dt.to_unix (), null, (comp, start, end) => { ++ var event = new ECal.Component.from_icalcomponent (comp); ++#else ++ client.generate_instances_for_object_sync (comp, (time_t) model.data_range.first_dt.to_unix (), (time_t) model.data_range.last_dt.to_unix (), (event, start, end) => { ++#endif ++ debug_event (source, event); ++ events.set (uid, event); ++ added_events.add (event); ++ return true; ++ }); ++ }); ++ } ++ ++#if E_CAL_2_0 ++ private void on_objects_modified (E.Source source, ECal.Client client, SList objects) { ++#else ++ private void on_objects_modified (E.Source source, ECal.Client client, SList objects) { ++#endif ++ debug (@"Received $(objects.length()) modified event(s) for source '%s'", source.dup_display_name ()); ++ var updated_events = new Gee.ArrayList ((Gee.EqualDataFunc?) Util.calcomponent_equal_func); ++ ++ objects.foreach ((comp) => { ++ unowned string uid = comp.get_uid (); ++ var events = source_events.get (source).get (uid); ++ updated_events.add_all (events); ++ foreach (var event in events) { ++ debug_event (source, event); ++ } ++ }); ++ ++ events_updated (source, updated_events.read_only_view); ++ } ++ ++#if E_CAL_2_0 ++ private void on_objects_removed (E.Source source, ECal.Client client, SList cids) { ++#else ++ private void on_objects_removed (E.Source source, ECal.Client client, SList cids) { ++#endif ++ debug (@"Received $(cids.length()) removed event(s) for source '%s'", source.dup_display_name ()); ++ var events = source_events.get (source); ++ var removed_events = new Gee.ArrayList ((Gee.EqualDataFunc?) Util.calcomponent_equal_func); ++ ++ cids.foreach ((cid) => { ++ if (cid == null) { ++ return; ++ } ++ ++ var comps = events.get (cid.get_uid ()); ++ foreach (ECal.Component event in comps) { ++ removed_events.add (event); ++ debug_event (source, event); ++ } ++ }); ++ ++ events_removed (source, removed_events.read_only_view); ++ } ++ } ++} +diff --git a/src/Util/Util.vala b/src/Util/Util.vala +index c261f4b..b0bdf98 100644 +--- a/src/Util/Util.vala ++++ b/src/Util/Util.vala +@@ -20,47 +20,6 @@ + */ + + namespace DateTimeIndicator.Util { +- static bool has_scrolled = false; +- +- public bool on_scroll_event (Gdk.EventScroll event) { +- double delta_x; +- double delta_y; +- event.get_scroll_deltas (out delta_x, out delta_y); +- +- double choice = delta_x; +- +- if (((int)delta_x).abs () < ((int)delta_y).abs ()) { +- choice = delta_y; +- } +- +- /* It's mouse scroll ! */ +- if (choice == 1 || choice == -1) { +- Models.CalendarModel.get_default ().change_month ((int)choice); +- +- return true; +- } +- +- if (has_scrolled == true) { +- return true; +- } +- +- if (choice > 0.3) { +- reset_timer.begin (); +- Models.CalendarModel.get_default ().change_month (1); +- +- return true; +- } +- +- if (choice < -0.3) { +- reset_timer.begin (); +- Models.CalendarModel.get_default ().change_month (-1); +- +- return true; +- } +- +- return false; +- } +- + public GLib.DateTime get_start_of_month (owned GLib.DateTime? date = null) { + if (date == null) { + date = new GLib.DateTime.now_local (); +@@ -225,12 +184,12 @@ namespace DateTimeIndicator.Util { + return a.dup_uid () == b.dup_uid (); + } + +- public async void reset_timer () { +- has_scrolled = true; +- Timeout.add (500, () => { +- has_scrolled = false; +- +- return false; +- }); +- } ++ // public async void reset_timer () { ++ // has_scrolled = true; ++ // Timeout.add (500, () => { ++ // has_scrolled = false; ++ // ++ // return false; ++ // }); ++ // } + } +diff --git a/src/Widgets/CalendarView.vala b/src/Widgets/CalendarView.vala +index 65cee28..070580f 100644 +--- a/src/Widgets/CalendarView.vala ++++ b/src/Widgets/CalendarView.vala +@@ -181,5 +181,14 @@ namespace DateTimeIndicator { + + stack.set_visible_child (big_grid); + } ++ ++ public void add_event_dots (E.Source source, Gee.Collection events) { ++ grid.add_event_dots (source, events); ++ } ++ ++ ++ public void remove_event_dots (E.Source source, Gee.Collection events) { ++ grid.remove_event_dots (source, events); ++ } + } + } +diff --git a/src/Widgets/EventsListBox.vala b/src/Widgets/EventsListBox.vala +index 547e4c5..c25af2e 100644 +--- a/src/Widgets/EventsListBox.vala ++++ b/src/Widgets/EventsListBox.vala +@@ -1,6 +1,5 @@ + namespace DateTimeIndicator { + public class Widgets.EventsListBox : Gtk.ListBox { +- + public EventsListBox () { + selection_mode = Gtk.SelectionMode.NONE; + +@@ -22,7 +21,7 @@ namespace DateTimeIndicator { + set_sort_func (sort_function); + } + +- public void update_events (GLib.DateTime? selected_date) { ++ public void update_events (GLib.DateTime? selected_date, HashTable> source_events) { + foreach (unowned Gtk.Widget widget in get_children ()) { + widget.destroy (); + } +@@ -31,11 +30,9 @@ namespace DateTimeIndicator { + return; + } + +- var model = Models.CalendarModel.get_default (); +- + var events_on_day = new Gee.TreeMap (); + +- model.source_events.@foreach ((source, component_map) => { ++ source_events.@foreach ((source, component_map) => { + foreach (var comp in component_map.get_values ()) { + if (Util.calcomp_is_on_day (comp, selected_date)) { + unowned ICal.Component ical = comp.get_icalcomponent (); +diff --git a/src/Widgets/Grid.vala b/src/Widgets/Grid.vala +index 165d11d..660f212 100644 +--- a/src/Widgets/Grid.vala ++++ b/src/Widgets/Grid.vala +@@ -261,5 +261,36 @@ namespace DateTimeIndicator { + return date.get_year () * 10000 + date.get_month () * 100 + date.get_day_of_month (); + } + ++ public void add_event_dots (E.Source source, Gee.Collection events) { ++ data.foreach ((entry) => { ++ ++ foreach (var component in events) { ++ if (entry.value.skip_day ()) { ++ return true; ++ } ++ ++ if (Util.calcomp_is_on_day (component, entry.value.date)) { ++ entry.value.add_dots (source, component.get_icalcomponent ()); ++ } ++ } ++ ++ entry.value.show_event_grid (); ++ ++ return true; ++ }); ++ } ++ ++ public void remove_event_dots (E.Source source, Gee.Collection events) { ++ foreach (var component in events) { ++ unowned ICal.Component ical = component.get_icalcomponent (); ++ var event_uid = ical.get_uid (); ++ data.foreach ((entry) => { ++ if (entry.value.exist_event (event_uid)) { ++ entry.value.remove_dots (event_uid); ++ } ++ return true; ++ }); ++ } ++ } + } + } +diff --git a/src/Widgets/GridDay.vala b/src/Widgets/GridDay.vala +index 8c44443..00f82ea 100644 +--- a/src/Widgets/GridDay.vala ++++ b/src/Widgets/GridDay.vala +@@ -31,6 +31,8 @@ namespace DateTimeIndicator { + + public GLib.DateTime date { get; construct set; } + ++ private bool has_scrolled = false; ++ + private static Gtk.CssProvider provider; + private static Models.CalendarModel model; + +@@ -79,59 +81,100 @@ namespace DateTimeIndicator { + // Signals and handlers + button_press_event.connect (on_button_press); + key_press_event.connect (on_key_press); +- scroll_event.connect ((event) => {return Util.on_scroll_event (event);}); ++ scroll_event.connect (on_scroll_event); + + notify["date"].connect (() => { + label.label = date.get_day_of_month ().to_string (); + }); + + event_dots = new Gee.HashMap (); +- +- model.events_added.connect (add_event_dots); +- model.events_removed.connect (remove_event_dots); + } + +- private void add_event_dots (E.Source source, Gee.Collection events) { +- foreach (var component in events) { +- if (event_dots.size >= 3) { +- return; +- } ++ public bool on_scroll_event (Gdk.EventScroll event) { ++ double delta_x; ++ double delta_y; ++ event.get_scroll_deltas (out delta_x, out delta_y); ++ ++ double choice = delta_x; ++ ++ if (((int)delta_x).abs () < ((int)delta_y).abs ()) { ++ choice = delta_y; ++ } ++ ++ /* It's mouse scroll ! */ ++ if (choice == 1 || choice == -1) { ++ Models.CalendarModel.get_default ().change_month ((int)choice); + +- if (Util.calcomp_is_on_day (component, date)) { +- unowned ICal.Component ical = component.get_icalcomponent (); ++ return true; ++ } + +- var event_uid = ical.get_uid (); +- if (!event_dots.has_key (event_uid)) { +- var event_dot = new Gtk.Image (); +- event_dot.gicon = new ThemedIcon ("pager-checked-symbolic"); +- event_dot.pixel_size = 6; ++ if (has_scrolled == true) { ++ return true; ++ } + +- unowned Gtk.StyleContext style_context = event_dot.get_style_context (); +- style_context.add_class (Granite.STYLE_CLASS_ACCENT); +- style_context.add_provider (provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); ++ if (choice > 0.3) { ++ reset_timer.begin (); ++ Models.CalendarModel.get_default ().change_month (1); + +- var source_calendar = (E.SourceCalendar?) source.get_extension (E.SOURCE_EXTENSION_CALENDAR); +- Util.set_event_calendar_color (source_calendar, event_dot); ++ return true; ++ } + +- event_dots[event_uid] = event_dot; ++ if (choice < -0.3) { ++ reset_timer.begin (); ++ Models.CalendarModel.get_default ().change_month (-1); + +- event_grid.add (event_dot); +- } +- } ++ return true; + } + ++ return false; ++ } ++ ++ public async void reset_timer () { ++ has_scrolled = true; ++ Timeout.add (500, () => { ++ has_scrolled = false; ++ ++ return false; ++ }); ++ } ++ ++ public bool skip_day () { ++ return event_dots.size >= 3 ? true : false; ++ } ++ ++ public void show_event_grid () { + event_grid.show_all (); + } + +- private void remove_event_dots (E.Source source, Gee.Collection events) { +- foreach (var component in events) { +- unowned ICal.Component ical = component.get_icalcomponent (); +- var event_uid = ical.get_uid (); +- var dot = event_dots[event_uid]; +- if (dot != null) { +- dot.destroy (); +- event_dots.remove (event_uid); +- } ++ public void add_dots (E.Source source, ICal.Component ical) { ++ var event_uid = ical.get_uid (); ++ if (!event_dots.has_key (event_uid)) { ++ var event_dot = new Gtk. Image (); ++ event_dot.gicon = new ThemedIcon ("pager-checked-symbolic"); ++ event_dot.pixel_size = 6; ++ ++ unowned Gtk.StyleContext style_context = event_dot.get_style_context (); ++ style_context.add_class (Granite.STYLE_CLASS_ACCENT); ++ style_context.add_provider (provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); ++ ++ var source_calendar = (E.SourceCalendar?) source.get_extension (E.SOURCE_EXTENSION_CALENDAR); ++ Util.set_event_calendar_color (source_calendar, event_dot); ++ ++ event_dots[event_uid] = event_dot; ++ ++ event_grid.add (event_dot); ++ } ++ } ++ ++ public bool exist_event (string ical_uid) { ++ return event_dots.has_key (ical_uid); ++ } ++ ++ public void remove_dots (string event_uid) { ++ var dot = event_dots[event_uid]; ++ if (dot != null) { ++ dot.destroy (); ++ event_dots.unset (event_uid); + } + } + + +From c99db5e63b9c48aa1d069b97b98b0c07481de27d Mon Sep 17 00:00:00 2001 +From: Dirli +Date: Sat, 11 Apr 2020 23:44:14 +0300 +Subject: [PATCH 4/8] rename calendar elements + +--- + meson.build | 4 +-- + .../{GridDay.vala => CalendarDay.vala} | 4 +-- + src/Widgets/{Grid.vala => CalendarGrid.vala} | 26 +++++++-------- + src/Widgets/CalendarView.vala | 33 +++++++++---------- + 4 files changed, 33 insertions(+), 34 deletions(-) + rename src/Widgets/{GridDay.vala => CalendarDay.vala} (98%) + rename src/Widgets/{Grid.vala => CalendarGrid.vala} (91%) + +diff --git a/meson.build b/meson.build +index e348e3d..dcdd9b2 100644 +--- a/meson.build ++++ b/meson.build +@@ -44,11 +44,11 @@ shared_module( + 'src/Util/DateRange.vala', + 'src/Util/Util.vala', + 'src/Models/CalendarModel.vala', ++ 'src/Widgets/CalendarDay.vala', ++ 'src/Widgets/CalendarGrid.vala', + 'src/Widgets/CalendarView.vala', + 'src/Widgets/EventRow.vala', + 'src/Widgets/EventsListBox.vala', +- 'src/Widgets/Grid.vala', +- 'src/Widgets/GridDay.vala', + 'src/Widgets/PanelLabel.vala', + 'src/Services/EventsManager.vala', + 'src/Services/TimeManager.vala', +diff --git a/src/Widgets/GridDay.vala b/src/Widgets/CalendarDay.vala +similarity index 98% +rename from src/Widgets/GridDay.vala +rename to src/Widgets/CalendarDay.vala +index 00f82ea..a5ca920 100644 +--- a/src/Widgets/GridDay.vala ++++ b/src/Widgets/CalendarDay.vala +@@ -23,7 +23,7 @@ namespace DateTimeIndicator { + /** + * Represents a single day on the grid. + */ +- public class Widgets.GridDay : Gtk.EventBox { ++ public class Widgets.CalendarDay : Gtk.EventBox { + /* + * Event emitted when the day is double clicked or the ENTER key is pressed. + */ +@@ -41,7 +41,7 @@ namespace DateTimeIndicator { + private Gtk.Label label; + private bool valid_grab = false; + +- public GridDay (GLib.DateTime date) { ++ public CalendarDay (GLib.DateTime date) { + Object (date: date); + } + +diff --git a/src/Widgets/Grid.vala b/src/Widgets/CalendarGrid.vala +similarity index 91% +rename from src/Widgets/Grid.vala +rename to src/Widgets/CalendarGrid.vala +index 660f212..66e2757 100644 +--- a/src/Widgets/Grid.vala ++++ b/src/Widgets/CalendarGrid.vala +@@ -24,7 +24,7 @@ namespace DateTimeIndicator { + /** + * Represents the entire date grid as a table. + */ +- public class Widgets.Grid : Gtk.Grid { ++ public class Widgets.CalendarGrid : Gtk.Grid { + public Util.DateRange grid_range { get; private set; } + + /* +@@ -34,8 +34,8 @@ namespace DateTimeIndicator { + + public signal void selection_changed (GLib.DateTime new_date); + +- private Gee.HashMap data; +- private GridDay selected_gridday; ++ private Gee.HashMap data; ++ private Widgets.CalendarDay selected_gridday; + private Gtk.Label[] header_labels; + private Gtk.Revealer[] week_labels; + +@@ -61,12 +61,12 @@ namespace DateTimeIndicator { + + Indicator.settings.bind ("show-weeks", week_sep_revealer, "reveal-child", GLib.SettingsBindFlags.DEFAULT); + +- data = new Gee.HashMap (); ++ data = new Gee.HashMap (); + events |= Gdk.EventMask.SCROLL_MASK; + events |= Gdk.EventMask.SMOOTH_SCROLL_MASK; + } + +- private void on_day_focus_in (GridDay day) { ++ private void on_day_focus_in (Widgets.CalendarDay day) { + debug ("on_day_focus_in %s", day.date.to_string ()); + if (selected_gridday != null) { + selected_gridday.set_selected (false); +@@ -94,7 +94,7 @@ namespace DateTimeIndicator { + Gee.List dates = grid_range.to_list (); + for (int i = 0; i < dates.size; i++) { + var date = dates[i]; +- GridDay? day = data[day_hash (date)]; ++ Widgets.CalendarDay? day = data[day_hash (date)]; + if (day != null && day.name == "today") { + day.grab_focus_force (); + return; +@@ -119,7 +119,7 @@ namespace DateTimeIndicator { + + var new_dates = new_range.to_list (); + +- var data_new = new Gee.HashMap (); ++ var data_new = new Gee.HashMap (); + + /* Assert that a valid number of weeks should be displayed */ + assert (new_dates.size % 7 == 0); +@@ -138,7 +138,7 @@ namespace DateTimeIndicator { + + for (i = 0; i < new_dates.size; i++) { + var new_date = new_dates[i]; +- GridDay day; ++ Widgets.CalendarDay day; + + if (i < old_dates.size) { + /* A widget already exists for this date, just change it */ +@@ -147,7 +147,7 @@ namespace DateTimeIndicator { + day = update_day (data[day_hash (old_date)], new_date, today, month_start); + } else { + /* Still update_day to get the color of etc. right */ +- day = update_day (new GridDay (new_date), new_date, today, month_start); ++ day = update_day (new Widgets.CalendarDay (new_date), new_date, today, month_start); + day.on_event_add.connect ((date) => on_event_add (date)); + day.scroll_event.connect ((event) => { scroll_event (event); return false; }); + day.focus_in_event.connect ((event) => { +@@ -182,9 +182,9 @@ namespace DateTimeIndicator { + } + + /** +- * Updates the given GridDay so that it shows the given date. Changes to its style etc. ++ * Updates the given CalendarDay so that it shows the given date. Changes to its style etc. + */ +- private GridDay update_day (GridDay day, GLib.DateTime new_date, GLib.DateTime today, GLib.DateTime month_start) { ++ private Widgets.CalendarDay update_day (Widgets.CalendarDay day, GLib.DateTime new_date, GLib.DateTime today, GLib.DateTime month_start) { + update_today_style (day, new_date, today); + if (new_date.get_month () == month_start.get_month ()) { + day.sensitive_container (true); +@@ -237,13 +237,13 @@ namespace DateTimeIndicator { + int i = 0; + for (i = 0; i < dates.size; i++) { + var date = dates[i]; +- GridDay? day = data[day_hash (date)]; ++ Widgets.CalendarDay? day = data[day_hash (date)]; + if (day == null) return; + update_today_style (day, date, today); + } + } + +- private void update_today_style (GridDay day, GLib.DateTime date, GLib.DateTime today) { ++ private void update_today_style (Widgets.CalendarDay day, GLib.DateTime date, GLib.DateTime today) { + if (date.get_day_of_year () == today.get_day_of_year () && date.get_year () == today.get_year ()) { + day.name = "today"; + day.get_style_context ().add_class (Granite.STYLE_CLASS_ACCENT); +diff --git a/src/Widgets/CalendarView.vala b/src/Widgets/CalendarView.vala +index 070580f..db2139c 100644 +--- a/src/Widgets/CalendarView.vala ++++ b/src/Widgets/CalendarView.vala +@@ -26,7 +26,7 @@ namespace DateTimeIndicator { + + public GLib.DateTime? selected_date { get; private set; } + +- private Widgets.Grid grid; ++ private Widgets.CalendarGrid calendar_grid; + private Gtk.Stack stack; + private Gtk.Grid big_grid; + +@@ -105,20 +105,20 @@ namespace DateTimeIndicator { + } + + private Gtk.Grid create_big_grid () { +- grid = new Widgets.Grid (); +- grid.show_all (); ++ calendar_grid = new Widgets.CalendarGrid (); ++ calendar_grid.show_all (); + +- grid.on_event_add.connect ((date) => { ++ calendar_grid.on_event_add.connect ((date) => { + show_date_in_maya (date); + day_double_click (); + }); + +- grid.selection_changed.connect ((date) => { ++ calendar_grid.selection_changed.connect ((date) => { + selected_date = date; + selection_changed (date); + }); + +- return grid; ++ return calendar_grid; + } + + public void show_today () { +@@ -131,7 +131,7 @@ namespace DateTimeIndicator { + } + sync_with_model (); + +- grid.set_focus_to_today (); ++ calendar_grid.set_focus_to_today (); + } + + // TODO: As far as maya supports it use the Dbus Activation feature to run the calendar-app. +@@ -156,23 +156,23 @@ namespace DateTimeIndicator { + /* Sets the calendar widgets to the date range of the model */ + private void sync_with_model () { + var model = Models.CalendarModel.get_default (); +- if (grid.grid_range != null && (model.data_range.equals (grid.grid_range) || grid.grid_range.first_dt.compare (model.data_range.first_dt) == 0)) { +- grid.update_today (); ++ if (calendar_grid.grid_range != null && (model.data_range.equals (calendar_grid.grid_range) || calendar_grid.grid_range.first_dt.compare (model.data_range.first_dt) == 0)) { ++ calendar_grid.update_today (); + return; // nothing else to do + } + + GLib.DateTime previous_first = null; +- if (grid.grid_range != null) +- previous_first = grid.grid_range.first_dt; ++ if (calendar_grid.grid_range != null) ++ previous_first = calendar_grid.grid_range.first_dt; + + big_grid = create_big_grid (); + stack.add (big_grid); + +- grid.set_range (model.data_range, model.month_start); +- grid.update_weeks (model.data_range.first_dt, model.num_weeks); ++ calendar_grid.set_range (model.data_range, model.month_start); ++ calendar_grid.update_weeks (model.data_range.first_dt, model.num_weeks); + + if (previous_first != null) { +- if (previous_first.compare (grid.grid_range.first_dt) == -1) { ++ if (previous_first.compare (calendar_grid.grid_range.first_dt) == -1) { + stack.transition_type = Gtk.StackTransitionType.SLIDE_LEFT; + } else { + stack.transition_type = Gtk.StackTransitionType.SLIDE_RIGHT; +@@ -183,12 +183,11 @@ namespace DateTimeIndicator { + } + + public void add_event_dots (E.Source source, Gee.Collection events) { +- grid.add_event_dots (source, events); ++ calendar_grid.add_event_dots (source, events); + } + +- + public void remove_event_dots (E.Source source, Gee.Collection events) { +- grid.remove_event_dots (source, events); ++ calendar_grid.remove_event_dots (source, events); + } + } + } + +From 6b1b15305a9c90ff8b7e7244727a225984d34a14 Mon Sep 17 00:00:00 2001 +From: Dirli +Date: Sun, 12 Apr 2020 03:10:24 +0300 +Subject: [PATCH 5/8] evolution data server now optional + +--- + meson.build | 55 ++++++++++++++--------- + meson_options.txt | 1 + + src/Indicator.vala | 43 ++++++++++-------- + src/Util/Util.vala | 85 ++++++++++++++++------------------- + src/Widgets/CalendarDay.vala | 2 + + src/Widgets/CalendarGrid.vala | 2 + + src/Widgets/CalendarView.vala | 2 + + 7 files changed, 104 insertions(+), 86 deletions(-) + create mode 100644 meson_options.txt + +diff --git a/meson.build b/meson.build +index dcdd9b2..5fee9ab 100644 +--- a/meson.build ++++ b/meson.build +@@ -24,18 +24,40 @@ gresource = gnome.compile_resources( + wingpanel_dep = dependency('wingpanel-2.0') + wingpanel_indicatorsdir = wingpanel_dep.get_pkgconfig_variable('indicatorsdir', define_variable: ['libdir', libdir]) + ++deps = [ ++ dependency('glib-2.0'), ++ dependency('gobject-2.0'), ++ dependency('granite'), ++ dependency('gtk+-3.0'), ++ wingpanel_dep, ++ meson.get_compiler('vala').find_library('posix') ++] + +-libecal_dep = dependency('libecal-2.0', required: false) +-if libecal_dep.found() +- libical_dep = dependency('libical-glib') +- add_project_arguments('--define=E_CAL_2_0', language: 'vala') +- add_project_arguments('-DLIBICAL_GLIB_UNSTABLE_API=1', language: 'c') +-else +- libecal_dep = dependency('libecal-1.2', version: '>=3.8.0') +- libical_dep = dependency('libical') +- add_project_arguments('--vapidir', join_paths(meson.current_source_dir(), 'vapi'), language: 'vala') ++opt_files = [] ++ ++if get_option('evo') ++ libecal_dep = dependency ('libecal-2.0', required: false) ++ if libecal_dep.found() ++ deps += dependency('libical-glib') ++ deps += libecal_dep ++ add_project_arguments('--define=E_CAL_2_0', language: 'vala') ++ add_project_arguments('-DLIBICAL_GLIB_UNSTABLE_API=1', language: 'c') ++ else ++ deps += dependency('libecal-1.2', version: '>=3.8.0') ++ deps += dependency('libical') ++ add_project_arguments('--vapidir', join_paths(meson.current_source_dir(), 'vapi'), language: 'vala') ++ endif ++ ++ deps += dependency ('libedataserver-1.2') ++ opt_files += files ( ++ 'src/Widgets/EventRow.vala', ++ 'src/Widgets/EventsListBox.vala', ++ 'src/Services/EventsManager.vala', ++ ) ++ add_project_arguments('--define=USE_EVO', language: 'vala') + endif + ++ + shared_module( + meson.project_name(), + gresource, +@@ -47,21 +69,10 @@ shared_module( + 'src/Widgets/CalendarDay.vala', + 'src/Widgets/CalendarGrid.vala', + 'src/Widgets/CalendarView.vala', +- 'src/Widgets/EventRow.vala', +- 'src/Widgets/EventsListBox.vala', + 'src/Widgets/PanelLabel.vala', +- 'src/Services/EventsManager.vala', + 'src/Services/TimeManager.vala', +- dependencies: [ +- dependency('glib-2.0'), +- dependency('gobject-2.0'), +- dependency('granite'), +- dependency('gtk+-3.0'), +- libecal_dep, +- dependency('libedataserver-1.2'), +- libical_dep, +- wingpanel_dep, +- ], ++ opt_files, ++ dependencies: deps, + install: true, + install_dir : wingpanel_indicatorsdir, + ) +diff --git a/meson_options.txt b/meson_options.txt +new file mode 100644 +index 0000000..a1c9f0e +--- /dev/null ++++ b/meson_options.txt +@@ -0,0 +1 @@ ++option ('evo', type : 'boolean', value : true) +diff --git a/src/Indicator.vala b/src/Indicator.vala +index bf4358f..31c7af5 100644 +--- a/src/Indicator.vala ++++ b/src/Indicator.vala +@@ -23,9 +23,11 @@ namespace DateTimeIndicator { + + private Widgets.PanelLabel panel_label; + private Widgets.CalendarView calendar; +- private Widgets.EventsListBox event_listbox; + ++#if USE_EVO ++ private Widgets.EventsListBox event_listbox; + private Services.EventsManager event_manager; ++#endif + + private Gtk.Grid main_grid; + private uint update_events_idle_source = 0; +@@ -60,7 +62,20 @@ namespace DateTimeIndicator { + if (main_grid == null) { + calendar = new Widgets.CalendarView (); + calendar.margin_bottom = 6; ++ calendar.day_double_click.connect (() => { ++ close (); ++ }); ++ ++ var settings_button = new Gtk.ModelButton (); ++ settings_button.text = _("Date & Time Settings…"); + ++ main_grid = new Gtk.Grid (); ++ main_grid.margin_top = 12; ++ main_grid.attach (calendar, 0, 0); ++ main_grid.attach (new Wingpanel.Widgets.Separator (), 0, 1); ++ main_grid.attach (settings_button, 0, 2); ++ ++#if USE_EVO + event_manager = new Services.EventsManager (); + event_manager.events_updated.connect (update_events_model); + event_manager.events_added.connect ((source, events) => { +@@ -73,20 +88,16 @@ namespace DateTimeIndicator { + }); + + event_listbox = new Widgets.EventsListBox (); ++ event_listbox.row_activated.connect ((row) => { ++ calendar.show_date_in_maya (((EventRow) row).date); ++ close (); ++ }); + + var scrolled_window = new Gtk.ScrolledWindow (null, null); + scrolled_window.hscrollbar_policy = Gtk.PolicyType.NEVER; + scrolled_window.vscrollbar_policy = Gtk.PolicyType.AUTOMATIC; + scrolled_window.add (event_listbox); + +- var settings_button = new Gtk.ModelButton (); +- settings_button.text = _("Date & Time Settings…"); +- +- main_grid = new Gtk.Grid (); +- main_grid.margin_top = 12; +- main_grid.attach (calendar, 0, 0); +- main_grid.attach (new Wingpanel.Widgets.Separator (), 0, 1); +- main_grid.attach (settings_button, 0, 2); + main_grid.attach (new Gtk.Separator (Gtk.Orientation.VERTICAL), 1, 0, 1, 3); + main_grid.attach (scrolled_window, 2, 0, 1, 3); + +@@ -94,23 +105,17 @@ namespace DateTimeIndicator { + size_group.add_widget (calendar); + size_group.add_widget (event_listbox); + +- calendar.day_double_click.connect (() => { +- close (); +- }); +- + calendar.selection_changed.connect ((date) => { + idle_update_events (); + }); +- +- event_listbox.row_activated.connect ((row) => { +- calendar.show_date_in_maya (((EventRow) row).date); +- close (); +- }); ++#endif + + var model = Models.CalendarModel.get_default (); + model.notify["month-start"].connect (() => { + model.compute_ranges (); ++#if USE_EVO + event_manager.load_all_sources (); ++#endif + }); + + settings_button.clicked.connect (() => { +@@ -125,6 +130,7 @@ namespace DateTimeIndicator { + return main_grid; + } + ++#if USE_EVO + private void update_events_model (E.Source source, Gee.Collection events) { + if (opened_widget) { + idle_update_events (); +@@ -143,6 +149,7 @@ namespace DateTimeIndicator { + return GLib.Source.REMOVE; + }); + } ++#endif + + public override void opened () { + calendar.show_today (); +diff --git a/src/Util/Util.vala b/src/Util/Util.vala +index b0bdf98..26b343a 100644 +--- a/src/Util/Util.vala ++++ b/src/Util/Util.vala +@@ -32,38 +32,6 @@ namespace DateTimeIndicator.Util { + return datetime.add_full (0, 0, 0, -datetime.get_hour (), -datetime.get_minute (), -datetime.get_second ()); + } + +- /** +- * Converts the given ICal.Time to a DateTime. +- */ +- public TimeZone timezone_from_ical (ICal.Time date) { +- int is_daylight; +- var interval = date.get_timezone ().get_utc_offset (null, out is_daylight); +- bool is_positive = interval >= 0; +- interval = interval.abs (); +- var hours = (interval / 3600); +- var minutes = (interval % 3600) / 60; +- var hour_string = "%s%02d:%02d".printf (is_positive ? "+" : "-", hours, minutes); +- +- return new TimeZone (hour_string); +- } +- +- /** +- * Converts the given ICal.Time to a DateTime. +- * XXX : Track next versions of evolution in order to convert ICal.Timezone to GLib.TimeZone with a dedicated function… +- */ +- public GLib.DateTime ical_to_date_time (ICal.Time date) { +-#if E_CAL_2_0 +- int year, month, day, hour, minute, second; +- date.get_date (out year, out month, out day); +- date.get_time (out hour, out minute, out second); +- return new GLib.DateTime (timezone_from_ical (date), year, month, +- day, hour, minute, second); +-#else +- return new GLib.DateTime (timezone_from_ical (date), date.year, date.month, +- date.day, date.hour, date.minute, date.second); +-#endif +- } +- + /** + * Say if an event lasts all day. + */ +@@ -78,6 +46,7 @@ namespace DateTimeIndicator.Util { + } + } + ++#if USE_EVO + private Gee.HashMap? providers; + public void set_event_calendar_color (E.SourceCalendar cal, Gtk.Widget widget) { + if (providers == null) { +@@ -104,6 +73,38 @@ namespace DateTimeIndicator.Util { + style_context.add_provider (providers[color], Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); + } + ++ /** ++ * Converts the given ICal.Time to a DateTime. ++ */ ++ public TimeZone timezone_from_ical (ICal.Time date) { ++ int is_daylight; ++ var interval = date.get_timezone ().get_utc_offset (null, out is_daylight); ++ bool is_positive = interval >= 0; ++ interval = interval.abs (); ++ var hours = (interval / 3600); ++ var minutes = (interval % 3600) / 60; ++ var hour_string = "%s%02d:%02d".printf (is_positive ? "+" : "-", hours, minutes); ++ ++ return new TimeZone (hour_string); ++ } ++ ++ /** ++ * Converts the given ICal.Time to a DateTime. ++ * XXX : Track next versions of evolution in order to convert ICal.Timezone to GLib.TimeZone with a dedicated function… ++ */ ++ public GLib.DateTime ical_to_date_time (ICal.Time date) { ++#if E_CAL_2_0 ++ int year, month, day, hour, minute, second; ++ date.get_date (out year, out month, out day); ++ date.get_time (out hour, out minute, out second); ++ return new GLib.DateTime (timezone_from_ical (date), year, month, ++ day, hour, minute, second); ++#else ++ return new GLib.DateTime (timezone_from_ical (date), date.year, date.month, ++ date.day, date.hour, date.minute, date.second); ++#endif ++ } ++ + /* + * Gee Utility Functions + */ +@@ -113,6 +114,11 @@ namespace DateTimeIndicator.Util { + return key.dup_uid (). hash (); + } + ++ /* Returns true if 'a' and 'b' are the same E.Source */ ++ public bool source_equal_func (E.Source a, E.Source b) { ++ return a.dup_uid () == b.dup_uid (); ++ } ++ + /* Returns true if 'a' and 'b' are the same ECal.Component */ + public bool calcomponent_equal_func (ECal.Component a, ECal.Component b) { + return a.get_id ().equal (b.get_id ()); +@@ -178,18 +184,5 @@ namespace DateTimeIndicator.Util { + + return false; + } +- +- /* Returns true if 'a' and 'b' are the same E.Source */ +- public bool source_equal_func (E.Source a, E.Source b) { +- return a.dup_uid () == b.dup_uid (); +- } +- +- // public async void reset_timer () { +- // has_scrolled = true; +- // Timeout.add (500, () => { +- // has_scrolled = false; +- // +- // return false; +- // }); +- // } ++#endif + } +diff --git a/src/Widgets/CalendarDay.vala b/src/Widgets/CalendarDay.vala +index a5ca920..f9c742a 100644 +--- a/src/Widgets/CalendarDay.vala ++++ b/src/Widgets/CalendarDay.vala +@@ -146,6 +146,7 @@ namespace DateTimeIndicator { + event_grid.show_all (); + } + ++#if USE_EVO + public void add_dots (E.Source source, ICal.Component ical) { + var event_uid = ical.get_uid (); + if (!event_dots.has_key (event_uid)) { +@@ -177,6 +178,7 @@ namespace DateTimeIndicator { + event_dots.unset (event_uid); + } + } ++#endif + + public void set_selected (bool selected) { + if (selected) { +diff --git a/src/Widgets/CalendarGrid.vala b/src/Widgets/CalendarGrid.vala +index 66e2757..1d1e06c 100644 +--- a/src/Widgets/CalendarGrid.vala ++++ b/src/Widgets/CalendarGrid.vala +@@ -261,6 +261,7 @@ namespace DateTimeIndicator { + return date.get_year () * 10000 + date.get_month () * 100 + date.get_day_of_month (); + } + ++#if USE_EVO + public void add_event_dots (E.Source source, Gee.Collection events) { + data.foreach ((entry) => { + +@@ -292,5 +293,6 @@ namespace DateTimeIndicator { + }); + } + } ++#endif + } + } +diff --git a/src/Widgets/CalendarView.vala b/src/Widgets/CalendarView.vala +index db2139c..77c233c 100644 +--- a/src/Widgets/CalendarView.vala ++++ b/src/Widgets/CalendarView.vala +@@ -182,6 +182,7 @@ namespace DateTimeIndicator { + stack.set_visible_child (big_grid); + } + ++#if USE_EVO + public void add_event_dots (E.Source source, Gee.Collection events) { + calendar_grid.add_event_dots (source, events); + } +@@ -189,5 +190,6 @@ namespace DateTimeIndicator { + public void remove_event_dots (E.Source source, Gee.Collection events) { + calendar_grid.remove_event_dots (source, events); + } ++#endif + } + } + +From 16715f5114c0597d6961880bf877f04414400334 Mon Sep 17 00:00:00 2001 +From: Dirli +Date: Mon, 13 Apr 2020 22:21:07 +0300 +Subject: [PATCH 6/8] returned dots in the calendar + +--- + src/Indicator.vala | 6 ++-- + src/Services/EventsManager.vala | 28 +++++---------- + src/Widgets/CalendarDay.vala | 62 ++++++++++++++++++--------------- + src/Widgets/CalendarGrid.vala | 29 ++++++--------- + 4 files changed, 57 insertions(+), 68 deletions(-) + +diff --git a/src/Indicator.vala b/src/Indicator.vala +index 31c7af5..c7550aa 100644 +--- a/src/Indicator.vala ++++ b/src/Indicator.vala +@@ -105,8 +105,10 @@ namespace DateTimeIndicator { + size_group.add_widget (calendar); + size_group.add_widget (event_listbox); + +- calendar.selection_changed.connect ((date) => { +- idle_update_events (); ++ event_manager.open.begin ((obj, res) => { ++ calendar.selection_changed.connect ((date) => { ++ idle_update_events (); ++ }); + }); + #endif + +diff --git a/src/Services/EventsManager.vala b/src/Services/EventsManager.vala +index d939777..ad0397d 100644 +--- a/src/Services/EventsManager.vala ++++ b/src/Services/EventsManager.vala +@@ -10,33 +10,25 @@ namespace DateTimeIndicator { + private HashTable source_client; + private HashTable source_view; + +- public EventsManager () { +- +- } +- + construct { + source_client = new HashTable (str_hash, str_equal); + source_events = new HashTable > (Util.source_hash_func, Util.source_equal_func); + source_view = new HashTable (str_hash, str_equal); +- +- open.begin (); + } + +- private async void open () { ++ public async void open () { + try { + registry = yield new E.SourceRegistry (null); + registry.source_removed.connect (remove_source); +- registry.source_added.connect ((source) => add_source_async.begin (source)); ++ registry.source_added.connect (add_source); + + // Add sources + registry.list_sources (E.SOURCE_EXTENSION_CALENDAR).foreach ((source) => { +- E.SourceCalendar cal = (E.SourceCalendar)source.get_extension (E.SOURCE_EXTENSION_CALENDAR); ++ E.SourceCalendar cal = (E.SourceCalendar) source.get_extension (E.SOURCE_EXTENSION_CALENDAR); + if (cal.selected == true && source.enabled == true) { +- add_source_async.begin (source); ++ add_source (source); + } + }); +- +- load_all_sources (); + } catch (GLib.Error error) { + critical (error.message); + } +@@ -46,7 +38,7 @@ namespace DateTimeIndicator { + lock (source_client) { + foreach (var id in source_client.get_keys ()) { + var source = registry.ref_source (id); +- E.SourceCalendar cal = (E.SourceCalendar)source.get_extension (E.SOURCE_EXTENSION_CALENDAR); ++ E.SourceCalendar cal = (E.SourceCalendar) source.get_extension (E.SOURCE_EXTENSION_CALENDAR); + + if (cal.selected == true && source.enabled == true) { + load_source (source); +@@ -120,7 +112,7 @@ namespace DateTimeIndicator { + }); + } + +- private async void add_source_async (E.Source source) { ++ private void add_source (E.Source source) { + debug ("Adding source '%s'", source.dup_display_name ()); + try { + var client = (ECal.Client) ECal.Client.connect_sync (source, ECal.ClientSourceType.EVENTS, -1, null); +@@ -129,11 +121,7 @@ namespace DateTimeIndicator { + critical (e.message); + } + +- Idle.add (() => { +- load_source (source); +- +- return false; +- }); ++ load_source (source); + } + + private void debug_event (E.Source source, ECal.Component event) { +@@ -177,6 +165,8 @@ namespace DateTimeIndicator { + return true; + }); + }); ++ ++ events_added (source, added_events.read_only_view); + } + + #if E_CAL_2_0 +diff --git a/src/Widgets/CalendarDay.vala b/src/Widgets/CalendarDay.vala +index f9c742a..a2c4922 100644 +--- a/src/Widgets/CalendarDay.vala ++++ b/src/Widgets/CalendarDay.vala +@@ -36,7 +36,8 @@ namespace DateTimeIndicator { + private static Gtk.CssProvider provider; + private static Models.CalendarModel model; + +- private Gee.HashMap event_dots; ++ // private Gee.HashMap event_dots; ++ private Gee.ArrayList event_dots; + private Gtk.Grid event_grid; + private Gtk.Label label; + private bool valid_grab = false; +@@ -87,7 +88,8 @@ namespace DateTimeIndicator { + label.label = date.get_day_of_month ().to_string (); + }); + +- event_dots = new Gee.HashMap (); ++ // event_dots = new Gee.HashMap (); ++ event_dots = new Gee.ArrayList (); + } + + public bool on_scroll_event (Gdk.EventScroll event) { +@@ -138,44 +140,46 @@ namespace DateTimeIndicator { + }); + } + +- public bool skip_day () { +- return event_dots.size >= 3 ? true : false; +- } +- +- public void show_event_grid () { +- event_grid.show_all (); +- } +- + #if USE_EVO + public void add_dots (E.Source source, ICal.Component ical) { + var event_uid = ical.get_uid (); +- if (!event_dots.has_key (event_uid)) { +- var event_dot = new Gtk. Image (); +- event_dot.gicon = new ThemedIcon ("pager-checked-symbolic"); +- event_dot.pixel_size = 6; ++ if (event_dots.contains (event_uid)) { ++ return; ++ } + +- unowned Gtk.StyleContext style_context = event_dot.get_style_context (); +- style_context.add_class (Granite.STYLE_CLASS_ACCENT); +- style_context.add_provider (provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); ++ event_dots.add (event_uid); ++ if (event_dots.size > 3) { ++ return; ++ } + +- var source_calendar = (E.SourceCalendar?) source.get_extension (E.SOURCE_EXTENSION_CALENDAR); +- Util.set_event_calendar_color (source_calendar, event_dot); ++ var event_dot = new Gtk.Image (); ++ event_dot.gicon = new ThemedIcon ("pager-checked-symbolic"); ++ event_dot.pixel_size = 6; + +- event_dots[event_uid] = event_dot; ++ unowned Gtk.StyleContext style_context = event_dot.get_style_context (); ++ style_context.add_class (Granite.STYLE_CLASS_ACCENT); ++ style_context.add_provider (provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION); + +- event_grid.add (event_dot); +- } +- } ++ var source_calendar = (E.SourceCalendar?) source.get_extension (E.SOURCE_EXTENSION_CALENDAR); ++ Util.set_event_calendar_color (source_calendar, event_dot); + +- public bool exist_event (string ical_uid) { +- return event_dots.has_key (ical_uid); ++ event_grid.add (event_dot); ++ event_dot.show (); + } + + public void remove_dots (string event_uid) { +- var dot = event_dots[event_uid]; +- if (dot != null) { +- dot.destroy (); +- event_dots.unset (event_uid); ++ if (event_dots.contains (event_uid)) { ++ return; ++ } ++ ++ event_dots.remove (event_uid); ++ if (event_dots.size >= 3) { ++ return; ++ } ++ ++ var w = event_grid.get_children (); ++ if (w.length () > 0) { ++ w.nth_data (0).destroy (); + } + } + #endif +diff --git a/src/Widgets/CalendarGrid.vala b/src/Widgets/CalendarGrid.vala +index 1d1e06c..c544404 100644 +--- a/src/Widgets/CalendarGrid.vala ++++ b/src/Widgets/CalendarGrid.vala +@@ -263,22 +263,16 @@ namespace DateTimeIndicator { + + #if USE_EVO + public void add_event_dots (E.Source source, Gee.Collection events) { +- data.foreach ((entry) => { +- +- foreach (var component in events) { +- if (entry.value.skip_day ()) { +- return true; +- } +- +- if (Util.calcomp_is_on_day (component, entry.value.date)) { +- entry.value.add_dots (source, component.get_icalcomponent ()); +- } ++ foreach (var component in events) { ++ unowned ICal.Component? icomp = component.get_icalcomponent (); ++ ICal.Time? start_time = icomp.get_dtstart (); ++ time_t start_unix = start_time.as_timet (); ++ var t = new DateTime.from_unix_utc (start_unix); ++ var d_hash = day_hash (t); ++ if (data.has_key (d_hash)) { ++ data[d_hash].add_dots (source, component.get_icalcomponent ()); + } +- +- entry.value.show_event_grid (); +- +- return true; +- }); ++ } + } + + public void remove_event_dots (E.Source source, Gee.Collection events) { +@@ -286,9 +280,8 @@ namespace DateTimeIndicator { + unowned ICal.Component ical = component.get_icalcomponent (); + var event_uid = ical.get_uid (); + data.foreach ((entry) => { +- if (entry.value.exist_event (event_uid)) { +- entry.value.remove_dots (event_uid); +- } ++ entry.value.remove_dots (event_uid); ++ + return true; + }); + } + +From 149da28659883b01ceb0773b35c018d31aa1d912 Mon Sep 17 00:00:00 2001 +From: Dirli +Date: Tue, 14 Apr 2020 00:16:01 +0300 +Subject: [PATCH 7/8] issue #55 + +--- + src/Services/EventsManager.vala | 2 ++ + src/Widgets/CalendarDay.vala | 2 +- + src/Widgets/CalendarGrid.vala | 11 +++++++---- + 3 files changed, 10 insertions(+), 5 deletions(-) + +diff --git a/src/Services/EventsManager.vala b/src/Services/EventsManager.vala +index ad0397d..959762f 100644 +--- a/src/Services/EventsManager.vala ++++ b/src/Services/EventsManager.vala +@@ -208,6 +208,8 @@ namespace DateTimeIndicator { + removed_events.add (event); + debug_event (source, event); + } ++ ++ events.remove_all (cid.get_uid ()); + }); + + events_removed (source, removed_events.read_only_view); +diff --git a/src/Widgets/CalendarDay.vala b/src/Widgets/CalendarDay.vala +index a2c4922..10d088c 100644 +--- a/src/Widgets/CalendarDay.vala ++++ b/src/Widgets/CalendarDay.vala +@@ -168,7 +168,7 @@ namespace DateTimeIndicator { + } + + public void remove_dots (string event_uid) { +- if (event_dots.contains (event_uid)) { ++ if (!event_dots.contains (event_uid)) { + return; + } + +diff --git a/src/Widgets/CalendarGrid.vala b/src/Widgets/CalendarGrid.vala +index c544404..6e6cbdb 100644 +--- a/src/Widgets/CalendarGrid.vala ++++ b/src/Widgets/CalendarGrid.vala +@@ -279,11 +279,14 @@ namespace DateTimeIndicator { + foreach (var component in events) { + unowned ICal.Component ical = component.get_icalcomponent (); + var event_uid = ical.get_uid (); +- data.foreach ((entry) => { +- entry.value.remove_dots (event_uid); + +- return true; +- }); ++ ICal.Time? start_time = ical.get_dtstart (); ++ time_t start_unix = start_time.as_timet (); ++ var t = new DateTime.from_unix_utc (start_unix); ++ var d_hash = day_hash (t); ++ if (data.has_key (d_hash)) { ++ data[d_hash].remove_dots (event_uid); ++ } + } + } + #endif + +From a3910e2b8242b8c4837cc764da7f268a02d05d6e Mon Sep 17 00:00:00 2001 +From: Dirli +Date: Fri, 17 Apr 2020 00:52:53 +0300 +Subject: [PATCH 8/8] issue #127 + +--- + src/Indicator.vala | 1 + + src/Models/CalendarModel.vala | 17 ++++++--- + src/Services/EventsManager.vala | 17 +++++++++ + src/Widgets/CalendarDay.vala | 3 +- + src/Widgets/CalendarGrid.vala | 66 ++++++++++++++++++++++----------- + src/Widgets/CalendarView.vala | 17 ++++----- + src/Widgets/EventsListBox.vala | 6 ++- + 7 files changed, 87 insertions(+), 40 deletions(-) + +diff --git a/src/Indicator.vala b/src/Indicator.vala +index c7550aa..63614e0 100644 +--- a/src/Indicator.vala ++++ b/src/Indicator.vala +@@ -116,6 +116,7 @@ namespace DateTimeIndicator { + model.notify["month-start"].connect (() => { + model.compute_ranges (); + #if USE_EVO ++ event_listbox.clear_list (); + event_manager.load_all_sources (); + #endif + }); +diff --git a/src/Models/CalendarModel.vala b/src/Models/CalendarModel.vala +index d60a9ac..48b6e78 100644 +--- a/src/Models/CalendarModel.vala ++++ b/src/Models/CalendarModel.vala +@@ -57,12 +57,17 @@ namespace DateTimeIndicator { + compute_ranges (); + } + +- public void change_month (int relative) { +- month_start = month_start.add_months (relative); +- } +- +- public void change_year (int relative) { +- month_start = month_start.add_years (relative); ++ public void change_month (int m_relative, int y_relative = 0) { ++ if (y_relative == 0) { ++ month_start = month_start.add_months (m_relative); ++ } else { ++ if (m_relative == 0) { ++ month_start = month_start.add_years (y_relative); ++ } else { ++ GLib.DateTime tmp_date = month_start.add_months (m_relative); ++ month_start = tmp_date.add_years (y_relative); ++ } ++ } + } + + /* --- Helper Methods ---// */ +diff --git a/src/Services/EventsManager.vala b/src/Services/EventsManager.vala +index 959762f..6ece557 100644 +--- a/src/Services/EventsManager.vala ++++ b/src/Services/EventsManager.vala +@@ -1,3 +1,20 @@ ++/* ++ * Copyright (c) 2011-2020 elementary, Inc. (https://elementary.io) ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public ++ * License as published by the Free Software Foundation; either ++ * version 3 of the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see . ++ */ ++ + namespace DateTimeIndicator { + public class Services.EventsManager : GLib.Object { + public signal void events_added (E.Source source, Gee.Collection events); +diff --git a/src/Widgets/CalendarDay.vala b/src/Widgets/CalendarDay.vala +index 10d088c..735fdc1 100644 +--- a/src/Widgets/CalendarDay.vala ++++ b/src/Widgets/CalendarDay.vala +@@ -36,7 +36,6 @@ namespace DateTimeIndicator { + private static Gtk.CssProvider provider; + private static Models.CalendarModel model; + +- // private Gee.HashMap event_dots; + private Gee.ArrayList event_dots; + private Gtk.Grid event_grid; + private Gtk.Label label; +@@ -105,7 +104,7 @@ namespace DateTimeIndicator { + + /* It's mouse scroll ! */ + if (choice == 1 || choice == -1) { +- Models.CalendarModel.get_default ().change_month ((int)choice); ++ Models.CalendarModel.get_default ().change_month ((int) choice); + + return true; + } +diff --git a/src/Widgets/CalendarGrid.vala b/src/Widgets/CalendarGrid.vala +index 6e6cbdb..ef8edb6 100644 +--- a/src/Widgets/CalendarGrid.vala ++++ b/src/Widgets/CalendarGrid.vala +@@ -32,7 +32,7 @@ namespace DateTimeIndicator { + */ + public signal void on_event_add (GLib.DateTime date); + +- public signal void selection_changed (GLib.DateTime new_date); ++ public signal void selection_changed (GLib.DateTime new_date, bool up); + + private Gee.HashMap data; + private Widgets.CalendarDay selected_gridday; +@@ -66,25 +66,32 @@ namespace DateTimeIndicator { + events |= Gdk.EventMask.SMOOTH_SCROLL_MASK; + } + +- private void on_day_focus_in (Widgets.CalendarDay day) { +- debug ("on_day_focus_in %s", day.date.to_string ()); ++ private bool on_day_focus_in (Gdk.EventFocus event) { ++ var day = get_focus_child (); ++ if (day == null) { ++ return false; ++ } ++ + if (selected_gridday != null) { + selected_gridday.set_selected (false); + } + +- var selected_date = day.date; +- selected_gridday = day; +- day.set_selected (true); ++ var selected_date = (day as Widgets.CalendarDay).date; ++ selected_gridday = day as Widgets.CalendarDay; ++ (day as Widgets.CalendarDay).set_selected (true); + day.set_state_flags (Gtk.StateFlags.FOCUSED, false); +- selection_changed (selected_date); + var calmodel = Models.CalendarModel.get_default (); + var date_month = selected_date.get_month () - calmodel.month_start.get_month (); + var date_year = selected_date.get_year () - calmodel.month_start.get_year (); + + if (date_month != 0 || date_year != 0) { +- calmodel.change_month (date_month); +- calmodel.change_year (date_year); ++ selection_changed (selected_date, false); ++ calmodel.change_month (date_month, date_year); ++ } else { ++ selection_changed (selected_date, true); + } ++ ++ return false; + } + + public void set_focus_to_today () { +@@ -106,7 +113,7 @@ namespace DateTimeIndicator { + * Sets the given range to be displayed in the grid. Note that the number of days + * must remain the same. + */ +- public void set_range (Util.DateRange new_range, GLib.DateTime month_start) { ++ public void set_range (Util.DateRange new_range, GLib.DateTime month_start, GLib.DateTime? selected_date) { + var today = new GLib.DateTime.now_local (); + + Gee.List old_dates; +@@ -138,28 +145,46 @@ namespace DateTimeIndicator { + + for (i = 0; i < new_dates.size; i++) { + var new_date = new_dates[i]; +- Widgets.CalendarDay day; ++ Widgets.CalendarDay? day = null; + + if (i < old_dates.size) { + /* A widget already exists for this date, just change it */ + + var old_date = old_dates[i]; +- day = update_day (data[day_hash (old_date)], new_date, today, month_start); +- } else { ++ var d_hash = day_hash (old_date); ++ if (data.has_key (d_hash)) { ++ day = data[d_hash]; ++ } ++ } ++ ++ if (day == null) { + /* Still update_day to get the color of etc. right */ +- day = update_day (new Widgets.CalendarDay (new_date), new_date, today, month_start); ++ day = new Widgets.CalendarDay (new_date); + day.on_event_add.connect ((date) => on_event_add (date)); +- day.scroll_event.connect ((event) => { scroll_event (event); return false; }); +- day.focus_in_event.connect ((event) => { +- on_day_focus_in (day); +- ++ day.scroll_event.connect ((event) => { ++ scroll_event (event); + return false; + }); ++ day.focus_in_event.connect (on_day_focus_in); + + attach (day, col + 2, row); + day.show_all (); + } + ++ update_day (day, new_date, month_start); ++ update_today_style (day, new_date, today); ++ if (selected_date != null && day.date.equal (selected_date)) { ++ /* disabled the signal to avoid unnecessary signals and selected ++ * the specified day from the new period */ ++ debug (@"focus selected day $selected_date"); ++ day.focus_in_event.disconnect (on_day_focus_in); ++ day.grab_focus_force (); ++ day.set_selected (true); ++ day.set_state_flags (Gtk.StateFlags.FOCUSED, false); ++ selected_gridday = day; ++ day.focus_in_event.connect (on_day_focus_in); ++ } ++ + col = (col + 1) % 7; + row = (col == 0) ? row + 1 : row; + data_new.set (day_hash (new_date), day); +@@ -184,8 +209,7 @@ namespace DateTimeIndicator { + /** + * Updates the given CalendarDay so that it shows the given date. Changes to its style etc. + */ +- private Widgets.CalendarDay update_day (Widgets.CalendarDay day, GLib.DateTime new_date, GLib.DateTime today, GLib.DateTime month_start) { +- update_today_style (day, new_date, today); ++ private void update_day (Widgets.CalendarDay day, GLib.DateTime new_date, GLib.DateTime month_start) { + if (new_date.get_month () == month_start.get_month ()) { + day.sensitive_container (true); + } else { +@@ -193,8 +217,6 @@ namespace DateTimeIndicator { + } + + day.date = new_date; +- +- return day; + } + + public void update_weeks (GLib.DateTime date, int nr_of_weeks) { +diff --git a/src/Widgets/CalendarView.vala b/src/Widgets/CalendarView.vala +index 77c233c..fe957ab 100644 +--- a/src/Widgets/CalendarView.vala ++++ b/src/Widgets/CalendarView.vala +@@ -85,10 +85,7 @@ namespace DateTimeIndicator { + model.notify["data-range"].connect (() => { + label.label = model.month_start.format (_("%OB, %Y")); + +- sync_with_model (); +- +- selected_date = null; +- selection_changed (selected_date); ++ sync_with_model (selected_date != null); + }); + + left_button.clicked.connect (() => { +@@ -113,9 +110,11 @@ namespace DateTimeIndicator { + day_double_click (); + }); + +- calendar_grid.selection_changed.connect ((date) => { ++ calendar_grid.selection_changed.connect ((date, up) => { + selected_date = date; +- selection_changed (date); ++ if (up) { ++ selection_changed (date); ++ } + }); + + return calendar_grid; +@@ -154,9 +153,9 @@ namespace DateTimeIndicator { + } + + /* Sets the calendar widgets to the date range of the model */ +- private void sync_with_model () { ++ private void sync_with_model (bool show_selected = false) { + var model = Models.CalendarModel.get_default (); +- if (calendar_grid.grid_range != null && (model.data_range.equals (calendar_grid.grid_range) || calendar_grid.grid_range.first_dt.compare (model.data_range.first_dt) == 0)) { ++ if (!show_selected && calendar_grid.grid_range != null && (model.data_range.equals (calendar_grid.grid_range) || calendar_grid.grid_range.first_dt.compare (model.data_range.first_dt) == 0)) { + calendar_grid.update_today (); + return; // nothing else to do + } +@@ -168,7 +167,7 @@ namespace DateTimeIndicator { + big_grid = create_big_grid (); + stack.add (big_grid); + +- calendar_grid.set_range (model.data_range, model.month_start); ++ calendar_grid.set_range (model.data_range, model.month_start, show_selected ? selected_date : null); + calendar_grid.update_weeks (model.data_range.first_dt, model.num_weeks); + + if (previous_first != null) { +diff --git a/src/Widgets/EventsListBox.vala b/src/Widgets/EventsListBox.vala +index c25af2e..9022072 100644 +--- a/src/Widgets/EventsListBox.vala ++++ b/src/Widgets/EventsListBox.vala +@@ -21,10 +21,14 @@ namespace DateTimeIndicator { + set_sort_func (sort_function); + } + +- public void update_events (GLib.DateTime? selected_date, HashTable> source_events) { ++ public void clear_list () { + foreach (unowned Gtk.Widget widget in get_children ()) { + widget.destroy (); + } ++ } ++ ++ public void update_events (GLib.DateTime? selected_date, HashTable> source_events) { ++ clear_list (); + + if (selected_date == null) { + return; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index ed70687e050..c6a0e2f7779 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -1,5 +1,5 @@ { stdenv -, fetchFromGitHub +, fetchFromGitHub , pantheon , pkgconfig , meson @@ -28,6 +28,15 @@ stdenv.mkDerivation rec { sha256 = "0a0pqrpmrdd5pch30lizr9righlc7165z7krmnaxrzd0fvfkbr2h"; }; + patches = [ + # https://github.com/elementary/wingpanel-indicator-datetime/pull/207 + # Fixes lots of issues despite being rejected upstream + # https://github.com/elementary/wingpanel-indicator-datetime/issues/206 + # https://github.com/elementary/wingpanel-indicator-datetime/issues/55 + # https://github.com/elementary/wingpanel-indicator-datetime/issues/127 + ./207.patch + ]; + passthru = { updateScript = pantheon.updateScript { attrPath = "pantheon.${pname}"; -- cgit v1.2.3 From e323fbabba9c3aed2661d0f3c4f4e0e0620d335d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 22 Apr 2020 11:53:25 +0200 Subject: =?UTF-8?q?babeld:=201.9.1=20=E2=86=92=201.9.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dear all, Babeld-1.9.2 is available from https://www.irif.fr/~jch/software/files/babeld-1.9.2.tar.gz https://www.irif.fr/~jch/software/files/babeld-1.9.2.tar.gz.asc For more information about the Babel routing protocol, please see https://www.irif.fr/~jch/software/babel/ This is a bug fix release. It fixes two bugs where IPv4 prefixes could be represented incorrectly, with a range of confusing symptoms ; many thanks to Faban Bläse for diagnosing the issue. In addition, it fixes incorrect parsing of unknown address encodings, thanks to Théo Bastian for the fix. 21 April 2020: babeld-1.9.2 * Fixed two issues that could cause IPv4 routes to be represented incorrectly, with a range of confusing symptoms. Thanks to Fabian Bläse. * Fixed incorrect parsing of TLVs with an unknown Address Encoding. Thanks to Théophile Bastian. * Fixed access to mis-aligned data structure. Thanks to Antonin Décimo. -- Juliusz Chroboczek _______________________________________________ Babel-users mailing list Babel-users@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/babel-users --- pkgs/tools/networking/babeld/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix index a2f486717da..debd918eb39 100644 --- a/pkgs/tools/networking/babeld/default.nix +++ b/pkgs/tools/networking/babeld/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "babeld"; - version = "1.9.1"; + version = "1.9.2"; src = fetchurl { url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${pname}-${version}.tar.gz"; - sha256 = "1d503igqv9s5pgrhvxp1czjy2xfsjhagyyh2iny7g4cjvl0kq6qy"; + sha256 = "01vzhrspnm4sy9ggaz9n3bfl5hy3qlynr218j3mdcddzm3h00kqm"; }; preBuild = '' -- cgit v1.2.3 From 5a500ff0babbb1c5adf58389a774b28b97da7459 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 22 Apr 2020 12:37:04 -0500 Subject: blas,lapack: use correct name for library To match the soname, we need to use libblas.so.3, liblapack.so.3. --- pkgs/build-support/alternatives/blas/default.nix | 4 ++-- pkgs/build-support/alternatives/lapack/default.nix | 4 ++-- pkgs/development/libraries/science/math/mkl/default.nix | 8 ++++---- pkgs/development/libraries/science/math/openblas/default.nix | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/build-support/alternatives/blas/default.nix b/pkgs/build-support/alternatives/blas/default.nix index 8bba49b4550..bdee6688a74 100644 --- a/pkgs/build-support/alternatives/blas/default.nix +++ b/pkgs/build-support/alternatives/blas/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation { installPhase = ('' mkdir -p $out/lib $dev/include $dev/lib/pkgconfig - libblas="${lib.getLib blasProvider}/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}" + libblas="${lib.getLib blasProvider}/lib/libblas${canonicalExtension}" if ! [ -e "$libblas" ]; then echo "$libblas does not exist, ${blasProvider.name} does not provide libblas." @@ -100,7 +100,7 @@ Libs: -L$out/lib -lblas Cflags: -I$dev/include EOF - libcblas="${lib.getLib blasProvider}/lib/libcblas${stdenv.hostPlatform.extensions.sharedLibrary}" + libcblas="${lib.getLib blasProvider}/lib/libcblas${canonicalExtension}" if ! [ -e "$libcblas" ]; then echo "$libcblas does not exist, ${blasProvider.name} does not provide libcblas." diff --git a/pkgs/build-support/alternatives/lapack/default.nix b/pkgs/build-support/alternatives/lapack/default.nix index e260ad1bd93..5a19916f83e 100644 --- a/pkgs/build-support/alternatives/lapack/default.nix +++ b/pkgs/build-support/alternatives/lapack/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation { installPhase = ('' mkdir -p $out/lib $dev/include $dev/lib/pkgconfig - liblapack="${lib.getLib lapackProvider}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}" + liblapack="${lib.getLib lapackProvider}/lib/liblapack${canonicalExtension}" if ! [ -e "$liblapack" ]; then echo "$liblapack does not exist, ${lapackProvider.name} does not provide liblapack." @@ -74,7 +74,7 @@ Cflags: -I$dev/include Libs: -L$out/lib -llapack EOF - liblapacke="${lib.getLib lapackProvider}/lib/liblapacke${stdenv.hostPlatform.extensions.sharedLibrary}" + liblapacke="${lib.getLib lapackProvider}/lib/liblapacke${canonicalExtension}" if ! [ -e "$liblapacke" ]; then echo "$liblapacke does not exist, ${lapackProvider.name} does not provide liblapacke." diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index f9026ec7b99..ee861c14ab4 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -114,10 +114,10 @@ in stdenvNoCC.mkDerivation { '') + '' # Setup symlinks for blas / lapack - ln -s $out/lib/libmkl_rt${stdenvNoCC.hostPlatform.extensions.sharedLibrary} $out/lib/libblas${stdenvNoCC.hostPlatform.extensions.sharedLibrary} - ln -s $out/lib/libmkl_rt${stdenvNoCC.hostPlatform.extensions.sharedLibrary} $out/lib/libcblas${stdenvNoCC.hostPlatform.extensions.sharedLibrary} - ln -s $out/lib/libmkl_rt${stdenvNoCC.hostPlatform.extensions.sharedLibrary} $out/lib/liblapack${stdenvNoCC.hostPlatform.extensions.sharedLibrary} - ln -s $out/lib/libmkl_rt${stdenvNoCC.hostPlatform.extensions.sharedLibrary} $out/lib/liblapacke${stdenvNoCC.hostPlatform.extensions.sharedLibrary} + ln -s $out/lib/libmkl_rt${stdenvNoCC.hostPlatform.extensions.sharedLibrary} $out/lib/libblas${stdenvNoCC.hostPlatform.extensions.sharedLibrary}${stdenvNoCC.lib.optionalString stdenvNoCC.hostPlatform.isLinux ".3"} + ln -s $out/lib/libmkl_rt${stdenvNoCC.hostPlatform.extensions.sharedLibrary} $out/lib/libcblas${stdenvNoCC.hostPlatform.extensions.sharedLibrary}${stdenvNoCC.lib.optionalString stdenvNoCC.hostPlatform.isLinux ".3"} + ln -s $out/lib/libmkl_rt${stdenvNoCC.hostPlatform.extensions.sharedLibrary} $out/lib/liblapack${stdenvNoCC.hostPlatform.extensions.sharedLibrary}${stdenvNoCC.lib.optionalString stdenvNoCC.hostPlatform.isLinux ".3"} + ln -s $out/lib/libmkl_rt${stdenvNoCC.hostPlatform.extensions.sharedLibrary} $out/lib/liblapacke${stdenvNoCC.hostPlatform.extensions.sharedLibrary}${stdenvNoCC.lib.optionalString stdenvNoCC.hostPlatform.isLinux ".3"} ''; # fixDarwinDylibName fails for libmkl_cdft_core.dylib because the diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index c55a5cb7878..f6a40204587 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -178,10 +178,10 @@ EOF done # Setup symlinks for blas / lapack - ln -s $out/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary} - ln -s $out/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libcblas${stdenv.hostPlatform.extensions.sharedLibrary} - ln -s $out/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary} - ln -s $out/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/liblapacke${stdenv.hostPlatform.extensions.sharedLibrary} + ln -s $out/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libblas${stdenv.hostPlatform.extensions.sharedLibrary}${stdenv.lib.optionalString stdenv.hostPlatform.isLinux ".3"} + ln -s $out/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libcblas${stdenv.hostPlatform.extensions.sharedLibrary}${stdenv.lib.optionalString stdenv.hostPlatform.isLinux ".3"} + ln -s $out/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}${stdenv.lib.optionalString stdenv.hostPlatform.isLinux ".3"} + ln -s $out/lib/libopenblas${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/liblapacke${stdenv.hostPlatform.extensions.sharedLibrary}${stdenv.lib.optionalString stdenv.hostPlatform.isLinux ".3"} ''; meta = with stdenv.lib; { -- cgit v1.2.3 From 3d18975478e4f2cc9bd92fd44b7e9d8c331fcec1 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 22 Apr 2020 12:38:28 -0500 Subject: python.pkgs.scipy: set SCIPY_USE_G77_ABI_WRAPPER=1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To avoid segmentation fault on MKL, we need to use the CBLAS ABI. Normally, scipy will autodetect this, but here we don’t link using the ‘libmkl_rt.so’ name. So we need to manually set this. See https://github.com/scipy/scipy/blob/50012918db47f0ec3418dd53f0277daa589f82e3/doc/source/building/linux.rst#fortran-abi-mismatch --- pkgs/development/python-modules/scipy/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix index a9947e7e689..ace6c248ab2 100644 --- a/pkgs/development/python-modules/scipy/default.nix +++ b/pkgs/development/python-modules/scipy/default.nix @@ -53,6 +53,8 @@ in buildPythonPackage rec { setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; + SCIPY_USE_G77_ABI_WRAPPER = 1; + meta = { description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering. "; homepage = "https://www.scipy.org/"; -- cgit v1.2.3 From 4238b2b943f0e49fb00588b7080bc848382db36f Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Wed, 22 Apr 2020 12:43:14 -0500 Subject: doc/overlays.xml: fix missing documentation for blas/lapack This adds some more information to the documentation as well as addressing review from https://github.com/NixOS/nixpkgs/pull/85636. --- doc/using/overlays.xml | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/doc/using/overlays.xml b/doc/using/overlays.xml index 5f808839dd0..ada9ab38932 100644 --- a/doc/using/overlays.xml +++ b/doc/using/overlays.xml @@ -140,8 +140,8 @@ self: super:
Using overlays to configure alternatives - Certain software has different implementations of the same - interface. Other distributions have functionality to switch + Certain software packages have different implementations of the + same interface. Other distributions have functionality to switch between these. For example, Debian provides DebianAlternatives. Nixpkgs has what we call alternatives, which @@ -160,8 +160,9 @@ self: super: The Nixpkgs attribute is openblas for - ILP64 and openblasCompat for LP64. This - is the default. + ILP64 (integer width = 64 bits) and + openblasCompat for LP64 (integer width = + 32 bits). openblasCompat is the default. @@ -190,8 +191,15 @@ self: super: #83888, we are able to override the ‘blas’ and ‘lapack’ packages to use different implementations, through the ‘blasProvider’ and ‘lapackProvider’ argument. This can be used - to select a different provider. For example, an overlay can be - created that looks like: + to select a different provider. BLAS providers will have + symlinks in $out/lib/libblas.so.3 and + $out/lib/libcblas.so.3 to their respective + BLAS libraries. Likewise, LAPACK providers will have symlinks + in $out/lib/liblapack.so.3 and + $out/lib/liblapacke.so.3 to their respective + LAPCK libraries. For example, Intel MKL is both a BLAS and + LAPACK provider. An overlay can be created to use Intel MKL + that looks like: self: super: @@ -208,9 +216,12 @@ self: super: This overlay uses Intel’s MKL library for both BLAS and LAPACK interfaces. Note that the same can be accomplished at runtime - using LD_PRELOAD of libblas.so.3 and - liblapack.so.3. + using LD_LIBRARY_PATH of libblas.so.3 and + liblapack.so.3. For instance: + +$ LD_LIBRARY_PATH=$(nix-build -A mkl):$LD_LIBRARY_PATH nix-shell -p octave --run octave + Intel MKL requires an openmp implementation when running with multiple processors. By default, @@ -221,8 +232,8 @@ self: super: set it with LD_PRELOAD. Note that mkl is only available on x86_64-linux and - x86_64-darwin. Moreover, Hydra is not build - and distributing pre-compiled binaries using it. + x86_64-darwin. Moreover, Hydra is not + building and distributing pre-compiled binaries using it. For BLAS/LAPACK switching to work correctly, all packages must -- cgit v1.2.3 From 9aa4a4c7221f381fafdb2fb7d715409774bcde1e Mon Sep 17 00:00:00 2001 From: symphorien Date: Wed, 22 Apr 2020 19:49:29 +0200 Subject: texlab: 1.10.0 -> 2.0.0 (#85700) https://github.com/latex-lsp/texlab/releases/tag/v2.0.0 --- pkgs/development/tools/misc/texlab/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/texlab/default.nix b/pkgs/development/tools/misc/texlab/default.nix index 1edc86017ba..5cc67cb5e17 100644 --- a/pkgs/development/tools/misc/texlab/default.nix +++ b/pkgs/development/tools/misc/texlab/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "texlab"; - version = "1.10.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "latex-lsp"; repo = pname; rev = "v${version}"; - sha256 = "12zfcvbihirh38xxzc8fbx293m4vsrhq6kh0qnhnhlrx75m09l9i"; + sha256 = "0y8cv8y92a4nqwrvqk2cxgs6nspqjk8jm4spr8rgkwlpfbrg74xn"; }; - cargoSha256 = "08fi0c4s0d1p2rqxvj1y82zg6xl3n0ikgyhgrjwh6xay8f0121f0"; + cargoSha256 = "1qi1c4v5d5a4xcf1bjbdicrv35w6chl5swlm96c1h3pr9s09lqy7"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; -- cgit v1.2.3 From aa272d8e8269c72a34c04c2b8cf0390383d9e73d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 22 Apr 2020 19:53:19 +0200 Subject: waylandpp: fix after incorrect merge --- pkgs/development/libraries/waylandpp/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/waylandpp/default.nix b/pkgs/development/libraries/waylandpp/default.nix index 07de374c962..5b02ce826ad 100644 --- a/pkgs/development/libraries/waylandpp/default.nix +++ b/pkgs/development/libraries/waylandpp/default.nix @@ -25,15 +25,17 @@ stdenv.mkDerivation rec { sha256 = "1r4m0xhvwpcqxrqvp3hz1bzlkxqj2jiymd5r6hj8xjzz536hyprz"; }; - cmakeFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DWAYLAND_SCANNERPP=${buildPackages.waylandpp}/bin/wayland-scanner++"; + cmakeFlags = [ + "-DCMAKE_INSTALL_DATADIR=${placeholder "dev"}" + ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DWAYLAND_SCANNERPP=${buildPackages.waylandpp}/bin/wayland-scanner++" + ]; nativeBuildInputs = [ cmake pkgconfig ] ++ optional docSupport doxygen; buildInputs = [ pugixml wayland libGL libffi ]; outputs = [ "bin" "dev" "lib" "out" ] ++ optionals docSupport [ "doc" "devman" ]; - cmakeFlags = [ "-DCMAKE_INSTALL_DATADIR=${placeholder "dev"}" ]; - meta = with stdenv.lib; { description = "Wayland C++ binding"; homepage = "https://github.com/NilsBrause/waylandpp/"; -- cgit v1.2.3 From 0ccc411dd817c57486de97030cf3ae271bc0ea03 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 22 Apr 2020 19:53:19 +0200 Subject: waylandpp: fix after incorrect merge --- pkgs/development/libraries/waylandpp/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/waylandpp/default.nix b/pkgs/development/libraries/waylandpp/default.nix index 07de374c962..5b02ce826ad 100644 --- a/pkgs/development/libraries/waylandpp/default.nix +++ b/pkgs/development/libraries/waylandpp/default.nix @@ -25,15 +25,17 @@ stdenv.mkDerivation rec { sha256 = "1r4m0xhvwpcqxrqvp3hz1bzlkxqj2jiymd5r6hj8xjzz536hyprz"; }; - cmakeFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DWAYLAND_SCANNERPP=${buildPackages.waylandpp}/bin/wayland-scanner++"; + cmakeFlags = [ + "-DCMAKE_INSTALL_DATADIR=${placeholder "dev"}" + ] ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DWAYLAND_SCANNERPP=${buildPackages.waylandpp}/bin/wayland-scanner++" + ]; nativeBuildInputs = [ cmake pkgconfig ] ++ optional docSupport doxygen; buildInputs = [ pugixml wayland libGL libffi ]; outputs = [ "bin" "dev" "lib" "out" ] ++ optionals docSupport [ "doc" "devman" ]; - cmakeFlags = [ "-DCMAKE_INSTALL_DATADIR=${placeholder "dev"}" ]; - meta = with stdenv.lib; { description = "Wayland C++ binding"; homepage = "https://github.com/NilsBrause/waylandpp/"; -- cgit v1.2.3 From ba13482494ba0ece045b2fddeaed5e58d3312f39 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 22 Apr 2020 14:15:47 -0400 Subject: pulumi-bin: use nativeBuildInputs --- pkgs/tools/admin/pulumi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix index 07ad2d95f14..199789dbaa6 100644 --- a/pkgs/tools/admin/pulumi/default.nix +++ b/pkgs/tools/admin/pulumi/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation { wrapProgram $out/bin/pulumi --set LD_LIBRARY_PATH "${stdenv.cc.cc.lib}/lib" ''; - buildInputs = optionals stdenv.isLinux [ autoPatchelfHook makeWrapper ]; + nativeBuildInputs = optionals stdenv.isLinux [ autoPatchelfHook makeWrapper ]; meta = { homepage = "https://pulumi.io/"; -- cgit v1.2.3 From 712d1596ef899e728d27dcd2b766f6bb3242a356 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 22 Apr 2020 14:16:04 -0400 Subject: pulumi-bin: fix darwin build --- pkgs/tools/admin/pulumi/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/admin/pulumi/default.nix b/pkgs/tools/admin/pulumi/default.nix index 199789dbaa6..c0547f0c0c8 100644 --- a/pkgs/tools/admin/pulumi/default.nix +++ b/pkgs/tools/admin/pulumi/default.nix @@ -17,6 +17,7 @@ in stdenv.mkDerivation { installPhase = '' mkdir -p $out/bin cp * $out/bin/ + '' + optionalString stdenv.isLinux '' wrapProgram $out/bin/pulumi --set LD_LIBRARY_PATH "${stdenv.cc.cc.lib}/lib" ''; -- cgit v1.2.3 From 50b213a45e819d7f04d574789db34d1c0ebe2b65 Mon Sep 17 00:00:00 2001 From: Alvar Date: Wed, 22 Apr 2020 13:37:42 +0000 Subject: Revert "st: copy config file in 'prePatch' instead of 'preBuild'" Also change the custom config generation to the postPatch phase. --- pkgs/applications/misc/st/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index 33924bdb7be..bb3c57a5990 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -13,9 +13,8 @@ stdenv.mkDerivation rec { inherit patches; - prePatch = optionalString (conf != null) '' - cp ${writeText "config.def.h" conf} config.def.h - ''; + configFile = optionalString (conf!=null) (writeText "config.def.h" conf); + postPatch = optionalString (conf!=null) "cp ${configFile} config.def.h"; nativeBuildInputs = [ pkgconfig ncurses ]; buildInputs = [ libX11 libXft ] ++ extraLibs; -- cgit v1.2.3 From d1cc4c139b64290a98311b7a4fcee71cb040c279 Mon Sep 17 00:00:00 2001 From: Enno Lohmeier Date: Tue, 21 Apr 2020 16:41:59 +0200 Subject: pythonPackages.caldav: unbreak build --- pkgs/development/python-modules/caldav/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/caldav/default.nix b/pkgs/development/python-modules/caldav/default.nix index 895775eb87f..7a7a175362a 100644 --- a/pkgs/development/python-modules/caldav/default.nix +++ b/pkgs/development/python-modules/caldav/default.nix @@ -1,5 +1,12 @@ -{ lib, buildPythonPackage, fetchPypi -, tzlocal, requests, vobject, lxml, nose }: +{ lib +, buildPythonPackage +, fetchPypi +, tzlocal +, requests +, vobject +, lxml +, nose +}: buildPythonPackage rec { pname = "caldav"; @@ -12,11 +19,16 @@ buildPythonPackage rec { sha256 = "80c33b143539da3a471148ac89512f67d9df3a5286fae5a023e2ad3923246c0d"; }; + # xandikos is only a optional test dependency, not available for python3 + postPatch = '' + substituteInPlace setup.py \ + --replace ", 'xandikos'" "" + ''; + meta = with lib; { description = "This project is a CalDAV (RFC4791) client library for Python."; homepage = "https://pythonhosted.org/caldav/"; license = licenses.asl20; maintainers = with maintainers; [ marenz ]; - broken = true; # missing xandikos package }; } -- cgit v1.2.3 From ccb580fa4d7791b4074fe077a665497366bbd85e Mon Sep 17 00:00:00 2001 From: Savanni D'Gerinel Date: Wed, 22 Apr 2020 15:35:20 -0400 Subject: fitnesstrax: init at 0.1.0 (#83336) Co-authored-by: worldofpeace --- maintainers/maintainer-list.nix | 6 ++++ pkgs/applications/misc/fitnesstrax/default.nix | 43 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 51 insertions(+) create mode 100644 pkgs/applications/misc/fitnesstrax/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index dcf96307c3b..a12f5443c6d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6738,6 +6738,12 @@ githubId = 2347889; name = "Sauyon Lee"; }; + savannidgerinel = { + email = "savanni@luminescent-dreams.com"; + github = "savannidgerinel"; + githubId = 8534888; + name = "Savanni D'Gerinel"; + }; sb0 = { email = "sb@m-labs.hk"; github = "sbourdeauducq"; diff --git a/pkgs/applications/misc/fitnesstrax/default.nix b/pkgs/applications/misc/fitnesstrax/default.nix new file mode 100644 index 00000000000..f0081c39102 --- /dev/null +++ b/pkgs/applications/misc/fitnesstrax/default.nix @@ -0,0 +1,43 @@ +{ fetchFromGitHub +, glib +, gtk3 +, lib +, rustPlatform +, wrapGAppsHook +}: + +rustPlatform.buildRustPackage rec { + pname = "fitnesstrax"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "luminescent-dreams"; + repo = "fitnesstrax"; + rev = "${pname}-${version}"; + sha256 = "1k6zhnbs0ggx7q0ig2abcnzprsgrychlpvsh6d36dw6mr8zpfkp7"; + }; + + nativeBuildInputs = [ + wrapGAppsHook + ]; + + buildInputs = [ + glib + gtk3 + ]; + + cargoSha256 = "1xgyyxd2kz21xan0pk7rbxiym90s7m2qrzg2ddilcszva60bxdd9"; + + postInstall = '' + mkdir -p $out/share/glib-2.0/schemas + cp -r $src/share/* $out/share/ + glib-compile-schemas $out/share/glib-2.0/schemas + ''; + + meta = with lib; { + description = "Privacy-first fitness tracking"; + homepage = "https://github.com/luminescent-dreams/fitnesstrax"; + license = licenses.bsd3; + maintainers = with maintainers; [ savannidgerinel ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f45b6df2970..61d537441a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -920,6 +920,8 @@ in libfx2 = with python3Packages; toPythonApplication fx2; + fitnesstrax = callPackage ../applications/misc/fitnesstrax/default.nix { }; + fxlinuxprintutil = callPackage ../tools/misc/fxlinuxprintutil { }; genymotion = callPackage ../development/mobile/genymotion { }; -- cgit v1.2.3 From 3c8172bd3418ff4be0655ef9c5ec1b20cf9461ec Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Wed, 22 Apr 2020 22:36:37 +0200 Subject: vdirsyncer: fix failing test --- pkgs/tools/misc/vdirsyncer/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index ecf87b7c0a5..eee4e5648e9 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -53,6 +53,9 @@ python3Packages.buildPythonApplication rec { echo 'Version: ${version}' >PKG-INFO sed -i 's/spec.add_external_build(cmd=cmd/spec.add_external_build(cmd="true"/g' setup.py + + # fixing test + sed -i "s/invalid value for \"--verbosity\"/invalid value for \\\'--verbosity\\\'/" tests/system/cli/test_sync.py ''; preBuild = '' -- cgit v1.2.3 From af3e5fc48a266c8d765e101e2ee9d8aed93bfb3e Mon Sep 17 00:00:00 2001 From: Drew Date: Wed, 22 Apr 2020 16:40:23 -0400 Subject: pythonPackages.arrow: fix license (#85803) --- pkgs/development/python-modules/arrow/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/arrow/default.nix b/pkgs/development/python-modules/arrow/default.nix index 04295dce261..141ce20fdcb 100644 --- a/pkgs/development/python-modules/arrow/default.nix +++ b/pkgs/development/python-modules/arrow/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python library for date manipulation"; - license = "apache"; + license = licenses.asl20; maintainers = with maintainers; [ thoughtpolice ]; }; } -- cgit v1.2.3 From c9d35173685715caba08b4511c74c3bd8937fd83 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 22 Apr 2020 22:15:05 +0200 Subject: jwt-cli: 3.0.1 -> 3.1.0 --- pkgs/tools/security/jwt-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/jwt-cli/default.nix b/pkgs/tools/security/jwt-cli/default.nix index f2314d7a0e8..2161aa5f1cd 100644 --- a/pkgs/tools/security/jwt-cli/default.nix +++ b/pkgs/tools/security/jwt-cli/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "jwt-cli"; - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { owner = "mike-engel"; repo = pname; rev = version; - sha256 = "108pwk0h6zcbfmp0k8rhjxaa9yk8rhb78aaql22x48n11fnjl27i"; + sha256 = "0pmxis3m3madwnmswz9hn0i8fz6a9bg11slgrrwql7mx23ijqf6y"; }; - cargoSha256 = "1xh2ylx5fqblhlrs8yhl3zf8kvgrqnwdwmix6yzch9bi5mv5c11w"; + cargoSha256 = "165g1v0c8jxs8ddm8ld0hh7k8mvk3566ig43pf99hnw009fg1yc2"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; -- cgit v1.2.3 From ef6b333854fce8d5a0dc4c9a67e5eb7118b3b4ca Mon Sep 17 00:00:00 2001 From: "Aaron L. Zeng" Date: Wed, 8 Apr 2020 19:21:59 -0400 Subject: tixati: 2.67 -> 2.72 --- pkgs/applications/networking/p2p/tixati/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix index 8691335d129..151d652de52 100644 --- a/pkgs/applications/networking/p2p/tixati/default.nix +++ b/pkgs/applications/networking/p2p/tixati/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tixati"; - version = "2.67"; + version = "2.72"; src = fetchurl { url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz"; - sha256 = "0510wkwmwrlv61958zd5nsc4lr0l0lka3jf4pq3dyiyfsf4k20rq"; + sha256 = "04si7xwbpvljdbngmzlfvkn51wih3aqcb5g6r76wdh3pfpppskhr"; }; installPhase = '' -- cgit v1.2.3 From 903266491b7b9b0379e88709feca0af900def0d9 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Wed, 22 Apr 2020 19:22:46 +0200 Subject: vimPlugins.LanguageClient-neovim: 0.1.156 -> 0.1.157 --- pkgs/misc/vim-plugins/overrides.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 7333b61deae..ef27712b568 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -57,16 +57,16 @@ self: super: { }; LanguageClient-neovim = let - version = "0.1.156"; + version = "0.1.157"; LanguageClient-neovim-src = fetchurl { url = "https://github.com/autozimu/LanguageClient-neovim/archive/${version}.tar.gz"; - sha256 = "0bf2va6lpgw7wqpwpfidijbzphhvw48hyc2b529qv12vwgnd1shq"; + sha256 = "1ccq5akkm8n612ni5g7w7v5gv73g7p1d9i92k0bnsy33fvi3pmnh"; }; LanguageClient-neovim-bin = rustPlatform.buildRustPackage { name = "LanguageClient-neovim-bin"; src = LanguageClient-neovim-src; - cargoSha256 = "0w66fcrlaxf6zgkrfpgfybfbm759fzimnr3pjq6sm14frar7lhr6"; + cargoSha256 = "0r3f7sixkvgfrw0j81bxj1jpam5si9dnivrw63s29cvjxrdbnmqz"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CoreServices ]; # FIXME: Use impure version of CoreFoundation because of missing symbols. -- cgit v1.2.3 From a2bdcd794b4983f68e59dd5a77de65e4011e5ab1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 22 Apr 2020 23:01:31 +0200 Subject: gegl_0_4: try to fix tests timing out --- pkgs/development/libraries/gegl/4.0.nix | 9 +++++++-- .../libraries/gegl/patches/no-simple-backend-file-test.patch | 10 ---------- 2 files changed, 7 insertions(+), 12 deletions(-) delete mode 100644 pkgs/development/libraries/gegl/patches/no-simple-backend-file-test.patch diff --git a/pkgs/development/libraries/gegl/4.0.nix b/pkgs/development/libraries/gegl/4.0.nix index 858596597b1..4810390ac1b 100644 --- a/pkgs/development/libraries/gegl/4.0.nix +++ b/pkgs/development/libraries/gegl/4.0.nix @@ -46,8 +46,13 @@ stdenv.mkDerivation rec { }; patches = [ - # Remove gegl:simple / backend-file test that times out frequently - ./patches/no-simple-backend-file-test.patch + # Prevent deadlock making tests time-out + # https://gitlab.gnome.org/GNOME/gegl/issues/226 + # https://gitlab.gnome.org/GNOME/glib/issues/1941 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gegl/commit/1d530816266b52c8788bbe1504c5b2d6eceba036.patch"; + sha256 = "8PlUcLQkuskjDGCA2obUPDW3jE++A6B5YWVgvn+GFrU="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gegl/patches/no-simple-backend-file-test.patch b/pkgs/development/libraries/gegl/patches/no-simple-backend-file-test.patch deleted file mode 100644 index bf07572182b..00000000000 --- a/pkgs/development/libraries/gegl/patches/no-simple-backend-file-test.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/tests/simple/meson.build b/tests/simple/meson.build -index 2c735d80a..ae4d50f2a 100644 ---- a/tests/simple/meson.build -+++ b/tests/simple/meson.build -@@ -1,5 +1,4 @@ - testnames = [ -- 'backend-file', - 'buffer-cast', - 'buffer-changes', - 'buffer-extract', -- cgit v1.2.3 From 06e55a145b3db8f4f8ebd4bf54c68a796d3edbf3 Mon Sep 17 00:00:00 2001 From: ngerstle Date: Wed, 22 Apr 2020 23:35:31 +0200 Subject: keycloak: 9.0.2 -> 9.0.3 --- pkgs/servers/keycloak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index b5fec49b910..ce24cc7071f 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "keycloak"; - version = "9.0.2"; + version = "9.0.3"; src = fetchzip { url = "https://downloads.jboss.org/keycloak/${version}/keycloak-${version}.zip"; - sha256 = "0yavkmwhjb8i4j3g57nda77simlf1dj1m751xzbgxxq6nd0q73lw"; + sha256 = "0nlfa6wwgj04xgg4ps5gpjp4iq2lmas97y5qz61lhns1p42xr4ls"; }; nativeBuildInputs = [ makeWrapper ]; -- cgit v1.2.3 From f7b9c6c28bcf3b7d294f56e75c20b5932e346fdd Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 23 Apr 2020 08:49:28 +1000 Subject: gitAndTools.gh: 0.6.4 -> 0.7.0 https://github.com/cli/cli/releases/tag/v0.7.0 --- pkgs/applications/version-management/git-and-tools/gh/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gh/default.nix b/pkgs/applications/version-management/git-and-tools/gh/default.nix index acd09f0d0c0..597e0672073 100644 --- a/pkgs/applications/version-management/git-and-tools/gh/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gh/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "gh"; - version = "0.6.4"; + version = "0.7.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "0na8zfvcmdy968i47x6qd1jwfaphy5h18ff7ym5sxyia9a27yhf8"; + sha256 = "054mag8jgxkvx2f95ha10n45v4xv5lms69w76g95z18m62qhjcyl"; }; - modSha256 = "102v30wr9wmd6n20qdvgs5mp2s639pwbqqd71r8q52f42p694bi1"; + modSha256 = "0v33x9bnwjfg4425vralnsb4i22c0g1rcmaga9911v0i7d51k0fn"; buildFlagsArray = [ - "-ldflags=-X github.com/cli/cli/command.Version=${version}" + "-ldflags=-s -w -X github.com/cli/cli/command.Version=${version}" ]; subPackages = [ "cmd/gh" ]; -- cgit v1.2.3 From 0f2a0648168b54da298a24c5ddcbae8a67310cce Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 22 Apr 2020 18:00:00 -0500 Subject: bat: 0.13.0 -> 0.14.0 Changelog: https://github.com/sharkdp/bat/releases/tag/v0.14.0 --- pkgs/tools/misc/bat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index bf84502af2b..201ad5ed03f 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -4,17 +4,17 @@ rustPlatform.buildRustPackage rec { pname = "bat"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "1kaa6ps6v1wk9qs63h116k4pbz7y9mfbfxfbq7g89yjhzkjmh6xc"; + sha256 = "0wxmn3ifrgpfq44xs747qqik2p2vazdw5zi4imxqap2krha4k2ms"; fetchSubmodules = true; }; - cargoSha256 = "01l1y124gjh6gf9z1jkbpfzh0w92hrgwvsmqkqdw3a9pa4w5f6yg"; + cargoSha256 = "0bs6pqrg0vdam2h2ddikmgmksqlfjljqacc52rh6p546is6jcp2s"; nativeBuildInputs = [ pkgconfig llvmPackages.libclang installShellFiles makeWrapper ]; -- cgit v1.2.3 From 629068fe5b432e875a344db76d0d2da216e4fc22 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 22 Apr 2020 19:40:01 -0400 Subject: linux_latest-libre: 17402 -> 17445 --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index d167a89ea83..b13791ccb99 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "17402"; - sha256 = "1g151h6hdiwpvpip1r2rhbma8j13xghcyxddh0ppg9h548wwwack"; + rev = "17445"; + sha256 = "0d2gd2w4pbb728a7mw9dnq3aicwpjzg8zahg80ismvc9l1sym50a"; } , ... }: -- cgit v1.2.3 From 811411db6e67aac454cbdae8ff375ed467ef4eba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Wed, 22 Apr 2020 02:14:03 +0200 Subject: journald service: Add helpful comments about the journal getting full --- nixos/modules/system/boot/systemd.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index f955746f78a..2167df60bc9 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -593,6 +593,9 @@ in each other's limit. The value may be specified in the following units: s, min, h, ms, us. To turn off any kind of rate limiting, set either value to 0. + + See for important + considerations when setting this value. ''; }; @@ -604,6 +607,19 @@ in interval) that is applied to all messages generated on the system. This rate limiting is applied per-service, so that two services which log do not interfere with each other's limit. + + Note that the effective rate limit is multiplied by a factor derived + from the available free disk space for the journal as described on + + journald.conf(5). + + Note that the total amount of logs stored is limited by journald settings + such as SystemMaxUse, which defaults to a 4 GB cap. + + It is thus recommended to compute what period of time that you will be + able to store logs for when an application logs at full burst rate. + With default settings for log lines that are 100 Bytes long, this can + amount to just a few hours. ''; }; -- cgit v1.2.3 From 54b59dd6c006d498f5f261aeff7923e7140939ee Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 23 Apr 2020 08:37:04 +1000 Subject: nixos/cri-o: remove cni-plugins from environment.systemPackages --- nixos/modules/virtualisation/cri-o.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix index 7882b7fc19d..9bedb6be54a 100644 --- a/nixos/modules/virtualisation/cri-o.nix +++ b/nixos/modules/virtualisation/cri-o.nix @@ -42,7 +42,7 @@ in config = mkIf cfg.enable { environment.systemPackages = with pkgs; - [ cri-o cri-tools conmon cni-plugins iptables runc utillinux ]; + [ cri-o cri-tools conmon iptables runc utillinux ]; environment.etc."crictl.yaml".text = '' runtime-endpoint: unix:///var/run/crio/crio.sock ''; @@ -57,6 +57,10 @@ in ${concatMapStringsSep ", " (x: "\"" + x + "\"") cfg.registries} ] + [crio.network] + plugin_dirs = ["${pkgs.cni-plugins}/bin/"] + network_dir = "/etc/cni/net.d/" + [crio.runtime] conmon = "${pkgs.conmon}/bin/conmon" log_level = "${cfg.logLevel}" -- cgit v1.2.3 From 4102db21277175e847b9e5ea1eff95466d0e2a89 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 23 Apr 2020 08:37:05 +1000 Subject: nixos/podman: remove cni-plugins from environment.systemPackages --- nixos/modules/virtualisation/podman.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix index 2ec45fa18a4..1486b96e41d 100644 --- a/nixos/modules/virtualisation/podman.nix +++ b/nixos/modules/virtualisation/podman.nix @@ -66,7 +66,6 @@ in pkgs.slirp4netns # User-mode networking for unprivileged namespaces pkgs.fuse-overlayfs # CoW for images, much faster than default vfs pkgs.utillinux # nsenter - pkgs.cni-plugins # Networking plugins pkgs.iptables ] ++ lib.optional cfg.dockerCompat dockerCompat; -- cgit v1.2.3 From f09b8be73dbfd6d25cc7fe8ee2352dfc4751b231 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Wed, 22 Apr 2020 20:30:19 -0400 Subject: installer test: Fix grub extraConfig syntax It looks like `terminal_output.serial` is incorrect, according to the grub documentation: https://www.gnu.org/software/grub/manual/grub/html_node/Serial-terminal.html Related PR: #79406 --- nixos/tests/installer.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index c5abd458ec9..8d1bfa96d03 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -29,7 +29,7 @@ let boot.loader.grub.splashImage = null; ''} - boot.loader.grub.extraConfig = "serial; terminal_output.serial"; + boot.loader.grub.extraConfig = "serial; terminal_output serial"; ${if grubUseEfi then '' boot.loader.grub.device = "nodev"; boot.loader.grub.efiSupport = true; -- cgit v1.2.3 From 19c3bbfff1e6af89ae05d003922e8b1521f1b091 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 20 Apr 2020 11:03:42 -0400 Subject: elementary-planner: cleanup * add elementary theme The program forces this theme to be used * update description --- .../office/elementary-planner/default.nix | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/office/elementary-planner/default.nix b/pkgs/applications/office/elementary-planner/default.nix index b01c34d5a0e..0f5ec6137d6 100644 --- a/pkgs/applications/office/elementary-planner/default.nix +++ b/pkgs/applications/office/elementary-planner/default.nix @@ -1,6 +1,12 @@ -{ stdenv, fetchFromGitHub, fetchpatch -, meson, ninja, pkgconfig, desktop-file-utils -, python3, vala, wrapGAppsHook +{ stdenv +, fetchFromGitHub +, meson +, ninja +, pkgconfig +, desktop-file-utils +, python3 +, vala +, wrapGAppsHook , evolution-data-server , libical , libgee @@ -63,8 +69,15 @@ stdenv.mkDerivation rec { patchShebangs build-aux/meson/post_install.py ''; + preFixup = '' + gappsWrapperArgs+=( + # the theme is hardcoded + --prefix XDG_DATA_DIRS : "${pantheon.elementary-gtk-theme}/share" + ) + ''; + meta = with stdenv.lib; { - description = "Task and project manager designed to elementary OS"; + description = "Task manager with Todoist support designed for GNU/Linux 🚀️"; homepage = "https://planner-todo.web.app"; license = licenses.gpl3; maintainers = with maintainers; [ dtzWill ] ++ pantheon.maintainers; -- cgit v1.2.3 From 6cecb196fd7986bc5ec7378c7294a0476a3b1763 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 20 Apr 2020 11:35:49 -0400 Subject: pantheon.elementary-greeter: add elementary-gtk-theme --- pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 432f7c3ac5f..64c4509280a 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -103,6 +103,9 @@ stdenv.mkDerivation rec { # for the compositor --prefix PATH : "$out/bin" + + # the theme is hardcoded + --prefix XDG_DATA_DIRS : "${elementary-gtk-theme}/share" ) ''; -- cgit v1.2.3 From 834a49e0d4a99580cecd70b531f89126f0847759 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Mon, 20 Apr 2020 11:36:29 -0400 Subject: pantheon.wingpanel: add elementary-gtk-theme --- pkgs/desktops/pantheon/desktop/wingpanel/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index 64ebee4f13d..ff9925c5357 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -65,6 +65,13 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + preFixup = '' + gappsWrapperArgs+=( + # this theme is required + --prefix XDG_DATA_DIRS : "${elementary-gtk-theme}/share" + ) + ''; + meta = with stdenv.lib; { description = "The extensible top panel for Pantheon"; longDescription = '' -- cgit v1.2.3 From 480a55a6b695939a2e8b1cadc3205080a404c814 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Wed, 22 Apr 2020 21:54:41 -0400 Subject: doc/using/overlays.xml: update LD_LIBRARY_PATH example --- doc/using/overlays.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/using/overlays.xml b/doc/using/overlays.xml index ada9ab38932..3fa68e32a3c 100644 --- a/doc/using/overlays.xml +++ b/doc/using/overlays.xml @@ -220,7 +220,7 @@ self: super: liblapack.so.3. For instance: -$ LD_LIBRARY_PATH=$(nix-build -A mkl):$LD_LIBRARY_PATH nix-shell -p octave --run octave +$ LD_LIBRARY_PATH=$(nix-build -A mkl)/lib:$LD_LIBRARY_PATH nix-shell -p octave --run octave Intel MKL requires an openmp implementation -- cgit v1.2.3 From 6a4b7e51b0fe9d1c351a60c7733771a3c4bb50e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 22 Apr 2020 23:01:16 -0300 Subject: xfce.xfce4-whiskermenu-plugin: 2.4.3 -> 2.4.4 --- pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix index 262093af69f..0d9f6916e1c 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-whiskermenu-plugin"; - version = "2.4.3"; + version = "2.4.4"; rev-prefix = "v"; - sha256 = "1cs3fps1bj0dd5az7fwrvw1xl3y621qk4dma3n73p7rr19j7fpsn"; + sha256 = "08b82j9xp3vzjlc740s9svcjkbsal71ggp23y7dvjqppch7sdxzw"; nativeBuildInputs = [ cmake ]; -- cgit v1.2.3 From bab9dabd64df4cfa2d96c1d2abfb05ff7431420a Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Wed, 22 Apr 2020 22:24:43 -0400 Subject: dnnl: rename to oneDNN to track upstream project rename See the link in the default.nix file for details. This adds an alias for backwards compatibility. --- pkgs/development/libraries/dnnl/default.nix | 43 --------------------------- pkgs/development/libraries/oneDNN/default.nix | 42 ++++++++++++++++++++++++++ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 +-- 4 files changed, 45 insertions(+), 45 deletions(-) delete mode 100644 pkgs/development/libraries/dnnl/default.nix create mode 100644 pkgs/development/libraries/oneDNN/default.nix diff --git a/pkgs/development/libraries/dnnl/default.nix b/pkgs/development/libraries/dnnl/default.nix deleted file mode 100644 index 0d29c6eae8b..00000000000 --- a/pkgs/development/libraries/dnnl/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, substituteAll, cmake, bash }: - -# This was originally called mkl-dnn, then it was renamed to dnnl, and it has -# just recently been renamed again to oneDNN. In a follow-up, let's move the -# attr and alias dnnl -> oneDNN. See here for details: -# https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn -stdenv.mkDerivation rec { - pname = "dnnl"; - version = "1.4"; - - src = fetchFromGitHub { - owner = "oneapi-src"; - repo = "oneDNN"; - rev = "v${version}"; - sha256 = "162fb0c7klahz2irchhyxympi4fq4yp284apc53cadbss41mzld9"; - }; - - outputs = [ "out" "dev" "doc" ]; - - nativeBuildInputs = [ cmake ]; - - doCheck = true; - - # The test driver doesn't add an RPath to the build libdir - preCheck = '' - export LD_LIBRARY_PATH=$PWD/src - ''; - - # The cmake install gets tripped up and installs a nix tree into $out, in - # addition to the correct install; clean it up. - postInstall = '' - rm -r $out/nix - ''; - - meta = with lib; { - description = "oneAPI Deep Neural Network Library (oneDNN)"; - homepage = "https://01.org/dnnl"; - changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${version}"; - license = licenses.asl20; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ alexarice bhipple ]; - }; -} diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix new file mode 100644 index 00000000000..7d9adca074c --- /dev/null +++ b/pkgs/development/libraries/oneDNN/default.nix @@ -0,0 +1,42 @@ +{ stdenv, lib, fetchFromGitHub, cmake }: + +# This was originally called mkl-dnn, then it was renamed to dnnl, and it has +# just recently been renamed again to oneDNN. See here for details: +# https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn +stdenv.mkDerivation rec { + pname = "oneDNN"; + version = "1.4"; + + src = fetchFromGitHub { + owner = "oneapi-src"; + repo = "oneDNN"; + rev = "v${version}"; + sha256 = "162fb0c7klahz2irchhyxympi4fq4yp284apc53cadbss41mzld9"; + }; + + outputs = [ "out" "dev" "doc" ]; + + nativeBuildInputs = [ cmake ]; + + doCheck = true; + + # The test driver doesn't add an RPath to the build libdir + preCheck = '' + export LD_LIBRARY_PATH=$PWD/src + ''; + + # The cmake install gets tripped up and installs a nix tree into $out, in + # addition to the correct install; clean it up. + postInstall = '' + rm -r $out/nix + ''; + + meta = with lib; { + description = "oneAPI Deep Neural Network Library (oneDNN)"; + homepage = "https://01.org/dnnl"; + changelog = "https://github.com/oneapi-src/oneDNN/releases/tag/v${version}"; + license = licenses.asl20; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ alexarice bhipple ]; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9ad282149aa..3f5710d829c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -98,6 +98,7 @@ mapAliases ({ devicemapper = lvm2; # added 2018-04-25 digikam5 = digikam; # added 2017-02-18 dmtx = dmtx-utils; # added 2018-04-25 + dnnl = oneDNN; # added 2020-04-22 docbook5_xsl = docbook_xsl_ns; # added 2018-04-25 docbook_xml_xslt = docbook_xsl; # added 2018-04-25 double_conversion = double-conversion; # 2017-11-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 61d537441a9..e1856ae68e2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11400,8 +11400,6 @@ in dhex = callPackage ../applications/editors/dhex { }; - dnnl = callPackage ../development/libraries/dnnl { }; - double-conversion = callPackage ../development/libraries/double-conversion { }; dclib = callPackage ../development/libraries/dclib { }; @@ -13761,6 +13759,8 @@ in one_gadget = callPackage ../development/tools/misc/one_gadget { }; + oneDNN = callPackage ../development/libraries/oneDNN { }; + onedrive = callPackage ../applications/networking/sync/onedrive { }; oneko = callPackage ../applications/misc/oneko { }; -- cgit v1.2.3 From 41a95b1b7d88f45fb536640d8d8d482d89e8bce1 Mon Sep 17 00:00:00 2001 From: John Axel Eriksson Date: Wed, 22 Apr 2020 23:00:14 +0200 Subject: The systemd unit for k3s should differ between agents and servers --- nixos/modules/services/cluster/k3s/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/cluster/k3s/default.nix b/nixos/modules/services/cluster/k3s/default.nix index ccdf54d128e..2e8bf20a68f 100644 --- a/nixos/modules/services/cluster/k3s/default.nix +++ b/nixos/modules/services/cluster/k3s/default.nix @@ -81,8 +81,8 @@ in after = mkIf cfg.docker [ "docker.service" ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { - # Taken from https://github.com/rancher/k3s/blob/v1.17.4+k3s1/contrib/ansible/roles/k3s/node/templates/k3s.service.j2 - Type = "notify"; + # See: https://github.com/rancher/k3s/blob/dddbd16305284ae4bd14c0aade892412310d7edc/install.sh#L197 + Type = if cfg.role == "agent" then "exec" else "notify"; KillMode = "process"; Delegate = "yes"; Restart = "always"; -- cgit v1.2.3 From 4fb8fab4d6949fd1f499d0e5a312f8827dadda98 Mon Sep 17 00:00:00 2001 From: Ingo Blechschmidt Date: Mon, 13 Apr 2020 05:54:01 +0200 Subject: tigervnc: fix vncserver vncserver of tigervnc doesn't start because xauth is missing from $PATH --- pkgs/tools/admin/tigervnc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 9f105a7d5d5..0bb291d797b 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { rm -f $out/lib/xorg/protocol.txt wrapProgram $out/bin/vncserver \ - --prefix PATH : ${stdenv.lib.makeBinPath (with xorg; [ xterm twm xsetroot ]) } + --prefix PATH : ${stdenv.lib.makeBinPath (with xorg; [ xterm twm xsetroot xauth ]) } ''; buildInputs = with xorg; [ -- cgit v1.2.3 From 97851a33acfb0c160ab0fd19d3faf8a8862224c7 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 23 Apr 2020 12:01:49 +1000 Subject: podman: add passthru.tests --- pkgs/applications/virtualization/podman/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 5108c272a1c..2c1ad0b4297 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -9,6 +9,7 @@ , libseccomp , systemd , go-md2man +, nixosTests }: buildGoPackage rec { @@ -45,6 +46,8 @@ buildGoPackage rec { MANDIR=$man/share/man make install.man ''; + passthru.tests.podman = nixosTests.podman; + meta = with stdenv.lib; { homepage = "https://podman.io/"; description = "A program for managing pods, containers and container images"; -- cgit v1.2.3 From d0b9212338b18b3c70b30b8cef8ae7736eafa6c5 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Tue, 21 Apr 2020 14:41:10 +0200 Subject: x42-plugins: 20200114 -> 20200411 The patchShebangs need to stay. Upstream changed them to /usr/bin/env, but I forgot that doesn't exist at build time. --- pkgs/applications/audio/x42-plugins/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 8ec53b0c66a..20f87725f99 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -3,12 +3,12 @@ , libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { - version = "20200114"; + version = "20200411"; pname = "x42-plugins"; src = fetchurl { url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz"; - sha256 = "02f8wnsl9wg7pgf4sshr0hdjfjkwln870ffgjmb01nqk37v7hiyn"; + sha256 = "0y6778l2zc80kvp31mqw3vkcyi7g613jxn3g3lxqfa31i617gh6j"; }; nativeBuildInputs = [ pkgconfig ]; @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { patchPhase = '' patchShebangs ./stepseq.lv2/gridgen.sh - patchShebangs ./matrixmixer.lv2/genttl.sh #TODO: remove at next update, see https://github.com/x42/matrixmixer.lv2/issues/2 - patchShebangs ./matrixmixer.lv2/genhead.sh #TODO: remove at next update, see https://github.com/x42/matrixmixer.lv2/issues/2 + patchShebangs ./matrixmixer.lv2/genttl.sh + patchShebangs ./matrixmixer.lv2/genhead.sh sed -i 's|/usr/include/zita-convolver.h|${zita-convolver}/include/zita-convolver.h|g' ./convoLV2/Makefile ''; -- cgit v1.2.3 From a682c44e65c07e6e80836df54138e6091f14172e Mon Sep 17 00:00:00 2001 From: geistesk Date: Thu, 23 Apr 2020 09:35:41 +0200 Subject: golangci-lint: 1.24.0 -> 1.25.0 --- pkgs/development/tools/golangci-lint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 14311b0c7a5..3b82eea1049 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.24.0"; + version = "1.25.0"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "0m7mcppbgpx2kyl5f9nk61x521v49h18az5l4ads1f3jkkyiya6s"; + sha256 = "0xf9chk6f1ydg2wyi6wzj2fxl641z7iyk6spp5gb1chq7plsi8sm"; }; - modSha256 = "0ab1s8pqkpss15rd9brin39lzx2fqkvq2v3nhk8kfrgpari2addk"; + modSha256 = "15lb8y4kj2h514nl5517ah3ml9d2i71zv6ah08lpycz1b4v9hlwv"; subPackages = [ "cmd/golangci-lint" ]; meta = with lib; { -- cgit v1.2.3 From 14395cc68741ae6de4256360204fd192e4038da3 Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Wed, 22 Apr 2020 23:31:43 +0200 Subject: nixos/networkd: Fix restartTriggers 1d61efb7f177f7b70c467ab4940fde0a3481d4dc accidentially changed the restartTriggers of systemd-networkd.service` to point to the attribute name (in this case, a location relative to `/etc`), instead of the location of the network-related unit files in the nix store. This caused systemd-networkd to not get restarted on activation of new networking config, if the file name hasn't changed. Fix this, by pointing this back to the location in the nix store. --- nixos/modules/system/boot/networkd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 3078f84f6e9..a7580fb1997 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -1073,7 +1073,7 @@ in systemd.services.systemd-networkd = { wantedBy = [ "multi-user.target" ]; - restartTriggers = attrNames unitFiles; + restartTriggers = map (x: x.source) (attrValues unitFiles); # prevent race condition with interface renaming (#39069) requires = [ "systemd-udev-settle.service" ]; after = [ "systemd-udev-settle.service" ]; -- cgit v1.2.3 From f332109ebf67951b412457fee023222c4ed5f561 Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Wed, 22 Apr 2020 23:32:12 +0200 Subject: nixos/datadog-agent: Fix restartTriggers Fixes #85800 1d61efb7f177f7b70c467ab4940fde0a3481d4dc accidentially changed the restartTriggers of `datadog-agent.service` to point to the attribute name (in this case, a location relative to `/etc`), instead of the location of the config files in the nix store. This caused datadog to not get restarted on activation of new config, if the file name hasn't changed. Fix this, by pointing this back to the location in the nix store. --- nixos/modules/services/monitoring/datadog-agent.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/datadog-agent.nix b/nixos/modules/services/monitoring/datadog-agent.nix index 2c5fe47242e..f1cb890794e 100644 --- a/nixos/modules/services/monitoring/datadog-agent.nix +++ b/nixos/modules/services/monitoring/datadog-agent.nix @@ -225,7 +225,7 @@ in { Restart = "always"; RestartSec = 2; }; - restartTriggers = [ datadogPkg ] ++ attrNames etcfiles; + restartTriggers = [ datadogPkg ] ++ map (x: x.source) (attrValues etcfiles); } attrs; in { datadog-agent = makeService { -- cgit v1.2.3 From 920c51e40865929e6f0e4730be93da73ba1a34a7 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Thu, 23 Apr 2020 16:52:48 +0800 Subject: msmtp: fix for broken queueing PR #85846 --- pkgs/applications/networking/msmtp/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index f78b085b6c6..0117ab978cc 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig, texinfo +{ stdenv, lib, fetchurl, fetchpatch, autoreconfHook, pkgconfig, texinfo , netcat-gnu, gnutls, gsasl, libidn2, Security , withKeyring ? true, libsecret ? null , systemd ? null }: @@ -16,8 +16,13 @@ in stdenv.mkDerivation rec { sha256 = "1rarck61mz3mwg0l30vjj6j9fq6gc7gic0r1c1ppwpq2izj57jzc"; }; + # the 2nd patch should go when 1.8.9 is released patches = [ ./paths.patch + (fetchpatch { + url = "https://github.com/marlam/msmtp-mirror/commit/c78f24347ec996c7a3830b48403bf3736afca071.patch"; + sha256 = "0d4sc2f5838jriv65wahpgvwckkzqhdk3hs660fyg80si2i0l1bx"; + }) ]; buildInputs = [ gnutls gsasl libidn2 ] -- cgit v1.2.3 From 56e9d1f936159b5cbb2004c35033b6e68844c5a1 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 15 Apr 2020 19:21:43 +0000 Subject: chromiumOSPackages.updateScript: fix buildspec url "paladin" doesn't seem to be up to date, whereas "full" seems to match what cros-updates-serving.appspot.com reports is currently being shipped to Chromebooks. --- pkgs/applications/virtualization/crosvm/update.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/crosvm/update.py b/pkgs/applications/virtualization/crosvm/update.py index 280d6ec1811..29e68b9f579 100755 --- a/pkgs/applications/virtualization/crosvm/update.py +++ b/pkgs/applications/virtualization/crosvm/update.py @@ -17,7 +17,7 @@ components = ['chromiumos/platform/crosvm', 'chromiumos/third_party/adhd'] git_root = 'https://chromium.googlesource.com/' manifest_versions = f'{git_root}chromiumos/manifest-versions' -buildspecs_url = f'{manifest_versions}/+/refs/heads/master/paladin/buildspecs/' +buildspecs_url = f'{manifest_versions}/+/refs/heads/master/full/buildspecs/' # CrOS version numbers look like this: # [.].. -- cgit v1.2.3 From 98b3ac8d40c23d98e37ed6d1088380485b252fd0 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 21 Apr 2020 23:39:05 +0000 Subject: crosvm: 79.12607.0.0-rc4 -> 81.12871.0.0-rc1 --- .../applications/virtualization/crosvm/default.nix | 12 ++++++++---- .../virtualization/crosvm/upstream-info.json | 22 +++++++++++++--------- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/virtualization/crosvm/default.nix b/pkgs/applications/virtualization/crosvm/default.nix index 28614efa7f3..38ce277bf3f 100644 --- a/pkgs/applications/virtualization/crosvm/default.nix +++ b/pkgs/applications/virtualization/crosvm/default.nix @@ -1,5 +1,5 @@ -{ stdenv, rustPlatform, fetchgit, runCommand, symlinkJoin -, pkgconfig, minijail, dtc, libusb1, libcap +{ stdenv, lib, rustPlatform, fetchgit, runCommand, symlinkJoin +, pkgconfig, minijail, dtc, libusb1, libcap, linux }: let @@ -53,7 +53,7 @@ in ./default-seccomp-policy-dir.diff ]; - cargoSha256 = "1s9nfgfqk140hg08i0xzylnrgrx84dqss0vnvhxnydwy9q03nk7r"; + cargoSha256 = "0lhivwvdihslwp81i3sa5q88p5hr83bzkvklrcgf6x73arwk8kdz"; nativeBuildInputs = [ pkgconfig ]; @@ -73,13 +73,17 @@ in cp seccomp/${arch}/* $out/share/policy/ ''; + CROSVM_CARGO_TEST_KERNEL_BINARY = + lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) + "${linux}/${stdenv.hostPlatform.platform.kernelTarget}"; + passthru = { inherit adhdSrc; src = crosvmSrc; updateScript = ./update.py; }; - meta = with stdenv.lib; { + meta = with lib; { description = "A secure virtual machine monitor for KVM"; homepage = "https://chromium.googlesource.com/chromiumos/platform/crosvm/"; maintainers = with maintainers; [ qyliss ]; diff --git a/pkgs/applications/virtualization/crosvm/upstream-info.json b/pkgs/applications/virtualization/crosvm/upstream-info.json index 690eca38bff..bb9cc8841b4 100644 --- a/pkgs/applications/virtualization/crosvm/upstream-info.json +++ b/pkgs/applications/virtualization/crosvm/upstream-info.json @@ -1,19 +1,23 @@ { - "version": "79.12607.0.0-rc4", + "version": "81.12871.0.0-rc1", "components": { "chromiumos/platform/crosvm": { "url": "https://chromium.googlesource.com/chromiumos/platform/crosvm", - "rev": "cfb7db44eb9e5a0bca9a22bfb985252ef74ab251", - "date": "2019-10-17T23:22:08+00:00", - "sha256": "0gm1ggyzh9qfizm36jmh71c3anygxj1840cm94h71kzg9kiw0330", - "fetchSubmodules": false + "rev": "8b8c01e1ad31718932491e4aee63f56109a138e2", + "date": "2020-01-25T02:28:10+00:00", + "sha256": "1qmf1k06pwynh15c3nr9m6v90z2pkk930xniwvlvbvnazrk4rllg", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false }, "chromiumos/third_party/adhd": { "url": "https://chromium.googlesource.com/chromiumos/third_party/adhd", - "rev": "a8df1c52bde3bfd2aebc1d7adcd6f195eb212cb1", - "date": "2019-10-17T18:53:18+00:00", - "sha256": "1hyvnvwr5ka9zw4h7hhl6fpsfl2acp3zy4wr5qrw8s1cn8ljr9vy", - "fetchSubmodules": false + "rev": "f361d5b02623274723bff251dafa1e2a2887b013", + "date": "2020-01-23T18:37:46+00:00", + "sha256": "1p8iwjwgmcgmzri03ik2jaid8l0ch0bzn6z9z64dix1hlrvrlliw", + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false } } } -- cgit v1.2.3 From a82fe46ae171b249abefaf0b415473d086f148d6 Mon Sep 17 00:00:00 2001 From: oxalica Date: Thu, 23 Apr 2020 17:11:04 +0800 Subject: rust-analyzer: 2020-04-06 -> 2020-04-20 --- pkgs/development/tools/rust/rust-analyzer/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index ec500db47d9..7eccf4d0c37 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -2,10 +2,10 @@ { rust-analyzer-unwrapped = callPackage ./generic.nix rec { - rev = "2020-04-06"; + rev = "2020-04-20"; version = "unstable-${rev}"; - sha256 = "0cm12707rq88w9yd4kkh26pnaqfvif6yyshk42pfi9vyv4ljfpcv"; - cargoSha256 = "0q1qwji407pmklwb27z2jwyrvwyn8zkmrwm4nbcgk53ci4p6a17k"; + sha256 = "00v8b6pbm5fry6bfkrfd7phn0ps8annqrw9k71m3pd26sxnn1q5f"; + cargoSha256 = "0nd86gwlfjwdkcphpk8zvs95xxdm8p74wl7vcrx8fnvvfxnkpwmc"; }; rust-analyzer = callPackage ./wrapper.nix {} { -- cgit v1.2.3 From b95699970fb7d825fd4a710f5cfa3785a98435db Mon Sep 17 00:00:00 2001 From: oxalica Date: Thu, 23 Apr 2020 17:11:22 +0800 Subject: vscode-extensions.rust-analyzer: 2020-04-06 -> 2020-04-20 --- .../node-packages/node-packages-v10.nix | 2365 ++++++++++---------- .../rust-analyzer/build-deps/package.json | 10 +- 2 files changed, 1168 insertions(+), 1207 deletions(-) diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index 9740c66c974..434cc707bab 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -22,67 +22,67 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.901.1" = { + "@angular-devkit/architect-0.901.3" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.901.1"; + version = "0.901.3"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.901.1.tgz"; - sha512 = "foWDAurMfBDYLAJxHpTFkJBub1c2A8+eWHbBjgqIHmT8xadnE7t8nSA9XDl+k/kIoWw/qFU+6IttPirudYc/vw=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.901.3.tgz"; + sha512 = "CFjSj48nOJwejmFFtenIqSZWyxRe4fRQsg16l0R4sagW7YwMJSaW6Yl9hRHM8bviPRrTpGHnxeq1x506v1ARLw=="; }; }; - "@angular-devkit/core-9.1.1" = { + "@angular-devkit/core-9.1.3" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "9.1.1"; + version = "9.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.1.tgz"; - sha512 = "57MNew2u1QwVb69jxZyhXgdW9kqcGyWyRy2ui/hWCkWLg7RumWtyypmdTs89FNExB4HqtXlQ2eO3JZxfs7QR3w=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.3.tgz"; + sha512 = "VRV96prPy0Kdlm6XmI7DITqSMSc1bINimnOhzQre3euDX5OQty+EUqaexHtMv/SPDZX1agP+buHr6viv9YEhzA=="; }; }; - "@angular-devkit/schematics-9.1.1" = { + "@angular-devkit/schematics-9.1.3" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "9.1.1"; + version = "9.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.1.tgz"; - sha512 = "6wx2HcvafHvEjEa1tjDzW2hXrOiSE8ALqJUArb3+NoO1BDM42aGcqyPo0ODzKtDk12CgSsFXdNKRpQ5AmpSPtw=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.3.tgz"; + sha512 = "nNRoQPqoin5jzLKmTabIPLSqVw2Zjnk78XC4AhAM7rSisWMsZ6pw5+BNDITiKfq0LkSXfOs0DoJV/Vr9mLkn/A=="; }; }; - "@antora/asciidoc-loader-2.2.0" = { + "@antora/asciidoc-loader-2.3.0" = { name = "_at_antora_slash_asciidoc-loader"; packageName = "@antora/asciidoc-loader"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-2.2.0.tgz"; - sha512 = "dwKXao6eqbAh8O7OS1ZUgVHmbfl38z7RzBCM6DbTb1VODk1HGIgp6gxauGmy5rBvjrJTtz7M1Dxs+BzBApeyMw=="; + url = "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-2.3.0.tgz"; + sha512 = "mncSlmkk6rYH5SGplZtHjuieG3ve5bhm4x0f9WIFE+GhqajIogDjxTBNWNr9B2dVA4bMves7Sy+c5h+f9V3iVw=="; }; }; - "@antora/content-aggregator-2.2.0" = { + "@antora/content-aggregator-2.3.0" = { name = "_at_antora_slash_content-aggregator"; packageName = "@antora/content-aggregator"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-2.2.0.tgz"; - sha512 = "Dd3jvjIty75G5X04lf6XFK8wKwKo1bfJfafsvwwJuApILASt0Nrv+Z3O+rfc4MhaswgZNqVBrEcSJW9BJxXPtw=="; + url = "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-2.3.0.tgz"; + sha512 = "LbH65Hw5uk3QCX8sCsJGnIVapQbtkxgyaDAfxYJlXnBI4jjd92391k0vitFL7f+9dzEvSdzxUHJU/lPyi9eB6g=="; }; }; - "@antora/content-classifier-2.2.0" = { + "@antora/content-classifier-2.3.0" = { name = "_at_antora_slash_content-classifier"; packageName = "@antora/content-classifier"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/content-classifier/-/content-classifier-2.2.0.tgz"; - sha512 = "cVoL7aR619FNFN3bKiiFhLinaFktQ06OmMG+QMJW0tNRaeI1ATYtrpUvwG5KVuciwDZFKp+GboRUoud0OGLfJQ=="; + url = "https://registry.npmjs.org/@antora/content-classifier/-/content-classifier-2.3.0.tgz"; + sha512 = "x/GUrm62+zSA8uQYaPG1y8NDALSDeKKl+um0CrxV5nt8c6vEO80KODN4YEPqoC0tOq8zdT99J6ElYblpkxrW6Q=="; }; }; - "@antora/document-converter-2.2.0" = { + "@antora/document-converter-2.3.0" = { name = "_at_antora_slash_document-converter"; packageName = "@antora/document-converter"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/document-converter/-/document-converter-2.2.0.tgz"; - sha512 = "Ka3moJL5HRoaHUz6U1s9M36WGJg8vUmlQziUpKsC96GbgWyiNXIvNwvQN9kdAW0AXR1CNpIcZ8sl7ygIaa7pLA=="; + url = "https://registry.npmjs.org/@antora/document-converter/-/document-converter-2.3.0.tgz"; + sha512 = "RMvdqBIz+pXf5znuyVeR7GF8qw/zLfaRMmEzMzywYa+8Cappxy+pgs+BuAuH1TdAnsFzpPrIO211c2FE1OxXBg=="; }; }; "@antora/expand-path-helper-1.0.0" = { @@ -94,76 +94,76 @@ let sha512 = "hg3y6M3OvRTb7jtLAnwwloYDxafbyKYttcf16kGCXvP7Wqosh7c+Ag+ltaZ7VSebpzpphO/umb/BXdpU7rxapw=="; }; }; - "@antora/navigation-builder-2.2.0" = { + "@antora/navigation-builder-2.3.0" = { name = "_at_antora_slash_navigation-builder"; packageName = "@antora/navigation-builder"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/navigation-builder/-/navigation-builder-2.2.0.tgz"; - sha512 = "r78NVNN/PbbSbXI5+NJ4d5G0RM1cklv++djPI0xIjFPK8R7GsuQagAaEpZS9o8UKcRlIyyGTeaT8dWKnFxZh2w=="; + url = "https://registry.npmjs.org/@antora/navigation-builder/-/navigation-builder-2.3.0.tgz"; + sha512 = "bpdT50pUW8IbRHAwlwaRdMlqwdTCOGdh0novW2Z6uBi6KKKbl6K3BdbaVs/jwXalESWqkYHcyBpinMivsX4bBA=="; }; }; - "@antora/page-composer-2.2.0" = { + "@antora/page-composer-2.3.0" = { name = "_at_antora_slash_page-composer"; packageName = "@antora/page-composer"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/page-composer/-/page-composer-2.2.0.tgz"; - sha512 = "JBRqWjJE8pUJG7AU6GMYWo2avBHLzxBisyfFq9FGH7Uf+Shv+0RYImFH0fDX0Et+83sfg2i3y39SfTYXKLsc3g=="; + url = "https://registry.npmjs.org/@antora/page-composer/-/page-composer-2.3.0.tgz"; + sha512 = "ve4h3uColNuqGehSJ2qUw5dar1Ls3i+RBYh2HyVZZ84qjLoOjPGAALFYzRVJnYlEX6nAswNFhh5ll/hIuaxuHQ=="; }; }; - "@antora/playbook-builder-2.2.0" = { + "@antora/playbook-builder-2.3.0" = { name = "_at_antora_slash_playbook-builder"; packageName = "@antora/playbook-builder"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/playbook-builder/-/playbook-builder-2.2.0.tgz"; - sha512 = "GIbkyCnwdTJVHYwSEG4d6Px2Uh/zBiwLXK7zGsaMY4/DmbYBKzNK4xpt7fHXvIw2IyH9GA1XRQ7+vpBSg8VP8w=="; + url = "https://registry.npmjs.org/@antora/playbook-builder/-/playbook-builder-2.3.0.tgz"; + sha512 = "zuuTqY5dDXYhu4LfmFW3qzdFXSrXSo9NCDX9eBJ6MCXsuj64PqdOljzv4rWNy3HvmKOSCupfWCashJS0vuH2Dw=="; }; }; - "@antora/redirect-producer-2.2.0" = { + "@antora/redirect-producer-2.3.0" = { name = "_at_antora_slash_redirect-producer"; packageName = "@antora/redirect-producer"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/redirect-producer/-/redirect-producer-2.2.0.tgz"; - sha512 = "ZkUe95Wj3TiFrbXA0sRDCv+0yD1HxI84/2pQj6cnMV01vrfj9HKeMdbBG1Sgf5bmaDDJ1nImlT0l2g6t+pBIJg=="; + url = "https://registry.npmjs.org/@antora/redirect-producer/-/redirect-producer-2.3.0.tgz"; + sha512 = "/632VZlkpFIh5KlV3A9LqE4yGtYyQ+1vOb5A9yajYWsCnhqNfEMslMWuoLoQk4gzs3Ju+hz5MrAXp8sn1vbRvg=="; }; }; - "@antora/site-mapper-2.2.0" = { + "@antora/site-mapper-2.3.0" = { name = "_at_antora_slash_site-mapper"; packageName = "@antora/site-mapper"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-2.2.0.tgz"; - sha512 = "318hg4n6SjisAA5e3uq02IdSeW6hQwCo+2TfQQQlCY/+DlFV0V2ML2bicwSrdfweJ42o5TxgSQAtTuOc1YPjgA=="; + url = "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-2.3.0.tgz"; + sha512 = "XzIoYKJQXgOzsDeUlL/edVR9B9aaCYUHADvzYqDc1S5/czFQxpqIIgMfYCiYYc7pHk6nmj5rgx/6HfvDImv87w=="; }; }; - "@antora/site-publisher-2.2.0" = { + "@antora/site-publisher-2.3.0" = { name = "_at_antora_slash_site-publisher"; packageName = "@antora/site-publisher"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/site-publisher/-/site-publisher-2.2.0.tgz"; - sha512 = "3pcGacS72sOKnm7Hnx328AUWGMEDsNHHQla6lwHL7gtWGtn/9tpt0M+MtgkxZnOLmoif8pt/JWPmlnv6td2xSw=="; + url = "https://registry.npmjs.org/@antora/site-publisher/-/site-publisher-2.3.0.tgz"; + sha512 = "2qC0fDE70VKtyttPpRx9glPWL4M5x7HYVCs1K6+GmpuISmljO3c/09L+ExPsJiSVVFarnWmMu0w+76XqSRHlog=="; }; }; - "@antora/ui-loader-2.2.0" = { + "@antora/ui-loader-2.3.0" = { name = "_at_antora_slash_ui-loader"; packageName = "@antora/ui-loader"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/ui-loader/-/ui-loader-2.2.0.tgz"; - sha512 = "3d6SqtknM3PiLRw2wLtcMVVfmyHtfNuWo8+ZBRmUrZs8HfhGteV8/s4vpiOJZmLYhW4KLFgIgG09lFdD5t78Ow=="; + url = "https://registry.npmjs.org/@antora/ui-loader/-/ui-loader-2.3.0.tgz"; + sha512 = "EcBUwd4ImWI/BH0dZpH6CfDzBnAtQ2qUPChaeqVbmfCNpBvH6t09YYRVA713no21ypAF3AwBs3FGU1+vR6T/IQ=="; }; }; - "@apollo/federation-0.14.0" = { + "@apollo/federation-0.14.1" = { name = "_at_apollo_slash_federation"; packageName = "@apollo/federation"; - version = "0.14.0"; + version = "0.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.14.0.tgz"; - sha512 = "JNIWj8p9vd4c1kZFl70B1wUt2RwttSUHVef4UfTAyhN7PHX5D4J+IHTYurgOIC/yUqIURi7iVh8vAtudhpxtEA=="; + url = "https://registry.npmjs.org/@apollo/federation/-/federation-0.14.1.tgz"; + sha512 = "QuX2O3xO6mcTZdqttxHaMKWgq1v0nYRiDLe4k7DwAxVtb9nF8lsJDlup4Zicx3LBYhBCGQvumrYILuF/Amn6WQ=="; }; }; "@apollo/protobufjs-1.0.3" = { @@ -175,13 +175,13 @@ let sha512 = "gqeT810Ect9WIqsrgfUvr+ljSB5m1PyBae9HGdrRyQ3HjHjTcjVvxpsMYXlUk4rUHnrfUqyoGvLSy2yLlRGEOw=="; }; }; - "@apollographql/apollo-tools-0.4.5" = { + "@apollographql/apollo-tools-0.4.7" = { name = "_at_apollographql_slash_apollo-tools"; packageName = "@apollographql/apollo-tools"; - version = "0.4.5"; + version = "0.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.4.5.tgz"; - sha512 = "KOZC4Y+JM4iQQ7P4CVC878Ee7ya0QoHApGHu4klwjwZkYyOdWIvbML7JfXOUb/AfCO4DFmJfHCjRdAX09Ga6sQ=="; + url = "https://registry.npmjs.org/@apollographql/apollo-tools/-/apollo-tools-0.4.7.tgz"; + sha512 = "6QjZz6aLq6QXHgJ1AmSg4C4cBmhF5z3g7LPsk4g+zJoWKxiFuSIbrTe12ETtn6wgPq//e5p2agbXYydIjqs7gw=="; }; }; "@apollographql/graphql-language-service-interface-2.0.2" = { @@ -283,15 +283,6 @@ let sha512 = "aOHQPhsEyaB6p2n+AK981+onHoc+Ork9rcAQVSUJR33wUkGiWRpu6/C685knRyIZVsKeSdG5Q4xMiYeFUhuLzA=="; }; }; - "@babel/generator-7.9.4" = { - name = "_at_babel_slash_generator"; - packageName = "@babel/generator"; - version = "7.9.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.9.4.tgz"; - sha512 = "rjP8ahaDy/ouhrvCoU1E5mqaitWrxwuNGU+dy1EpaoK48jZay4MdkskKGIMHLZNewg8sAsqpGSREJwP0zH3YQA=="; - }; - }; "@babel/generator-7.9.5" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; @@ -1210,15 +1201,6 @@ let sha512 = "SAtyEjmA7KiEoL2eAOAUM6M9arQJGWxJKK0S9x0WyPOosHS420RXoxPhn57u/8orRnK8Kxm0nHQQNTX203cP1Q=="; }; }; - "@babel/types-7.9.0" = { - name = "_at_babel_slash_types"; - packageName = "@babel/types"; - version = "7.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz"; - sha512 = "BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng=="; - }; - }; "@babel/types-7.9.5" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; @@ -1453,13 +1435,13 @@ let sha512 = "tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ=="; }; }; - "@iarna/toml-2.2.3" = { + "@iarna/toml-2.2.5" = { name = "_at_iarna_slash_toml"; packageName = "@iarna/toml"; - version = "2.2.3"; + version = "2.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.3.tgz"; - sha512 = "FmuxfCuolpLl0AnQ2NHSzoUKWEJDFl63qXjzdoWBVyFCXzMGm1spBzk7LeHNoVCiWCF7mRVms9e6jEV9+MoPbg=="; + url = "https://registry.npmjs.org/@iarna/toml/-/toml-2.2.5.tgz"; + sha512 = "trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg=="; }; }; "@ionic/cli-framework-3.0.6" = { @@ -1579,22 +1561,22 @@ let sha512 = "tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw=="; }; }; - "@jest/transform-25.3.0" = { + "@jest/transform-25.4.0" = { name = "_at_jest_slash_transform"; packageName = "@jest/transform"; - version = "25.3.0"; + version = "25.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/transform/-/transform-25.3.0.tgz"; - sha512 = "W01p8kTDvvEX6kd0tJc7Y5VdYyFaKwNWy1HQz6Jqlhu48z/8Gxp+yFCDVj+H8Rc7ezl3Mg0hDaGuFVkmHOqirg=="; + url = "https://registry.npmjs.org/@jest/transform/-/transform-25.4.0.tgz"; + sha512 = "t1w2S6V1sk++1HHsxboWxPEuSpN8pxEvNrZN+Ud/knkROWtf8LeUmz73A4ezE8476a5AM00IZr9a8FO9x1+j3g=="; }; }; - "@jest/types-25.3.0" = { + "@jest/types-25.4.0" = { name = "_at_jest_slash_types"; packageName = "@jest/types"; - version = "25.3.0"; + version = "25.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/types/-/types-25.3.0.tgz"; - sha512 = "UkaDNewdqXAmCDbN2GlUM6amDKS78eCqiw/UmF5nE0mmLTd6moJkiZJML/X52Ke3LH7Swhw883IRXq8o9nWjVw=="; + url = "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz"; + sha512 = "XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw=="; }; }; "@kbrandwijk/swagger-to-graphql-2.4.3" = { @@ -2299,13 +2281,13 @@ let sha512 = "6+iaCMh/JXJaB2QWikqvGE9//wLEVYYwZd5sud8aLoLKog1Q75naZh2vlGVtg5Mq/NqpqGQvdIjJb3Bm+64AUQ=="; }; }; - "@oclif/config-1.14.0" = { + "@oclif/config-1.15.1" = { name = "_at_oclif_slash_config"; packageName = "@oclif/config"; - version = "1.14.0"; + version = "1.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/@oclif/config/-/config-1.14.0.tgz"; - sha512 = "KsOP/mx9lzTah+EtGqLUXN3PDL0J3zb9/dTneFyiUK2K6T7vFEGhV6OasmqTh4uMZHGYTGrNPV8x/Yw6qZNL6A=="; + url = "https://registry.npmjs.org/@oclif/config/-/config-1.15.1.tgz"; + sha512 = "GdyHpEZuWlfU8GSaZoiywtfVBsPcfYn1KuSLT1JTfvZGpPG6vShcGr24YZ3HG2jXUFlIuAqDcYlTzOrqOdTPNQ=="; }; }; "@oclif/errors-1.2.2" = { @@ -2398,13 +2380,13 @@ let sha512 = "eoOVMjILna7FVQf96iWc3+ZtE/ZT6y8ob8ZzcqKY1ibSQCnu4O/B7pJvzMx5cyZ/RjAff6DAdEb0O0Cjcxidkg=="; }; }; - "@octokit/endpoint-6.0.0" = { + "@octokit/endpoint-6.0.1" = { name = "_at_octokit_slash_endpoint"; packageName = "@octokit/endpoint"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.0.tgz"; - sha512 = "3nx+MEYoZeD0uJ+7F/gvELLvQJzLXhep2Az0bBSXagbApDvDW0LWwpnAIY/hb0Jwe17A0fJdz0O12dPh05cj7A=="; + url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.1.tgz"; + sha512 = "pOPHaSz57SFT/m3R5P8MUu4wLPszokn5pXcB/pzavLTQf2jbU+6iayTvzaY6/BiotuRS0qyEUkx3QglT4U958A=="; }; }; "@octokit/plugin-enterprise-rest-3.6.2" = { @@ -2443,13 +2425,13 @@ let sha512 = "EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ=="; }; }; - "@octokit/request-5.4.0" = { + "@octokit/request-5.4.2" = { name = "_at_octokit_slash_request"; packageName = "@octokit/request"; - version = "5.4.0"; + version = "5.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.0.tgz"; - sha512 = "uAJO6GI8z8VHBqtY7VTL9iFy1Y+UTp5ShpI97tY5z0qBfYKE9rZCRsCm23VmF00x+IoNJ7a0nuVITs/+wS9/mg=="; + url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.2.tgz"; + sha512 = "zKdnGuQ2TQ2vFk9VU8awFT4+EYf92Z/v3OlzRaSh4RIP0H6cvW1BFPXq4XYvNez+TPQjqN+0uSkCYnMFFhcFrw=="; }; }; "@octokit/request-error-1.2.1" = { @@ -2479,13 +2461,13 @@ let sha512 = "gfFKwRT/wFxq5qlNjnW2dh+qh74XgTQ2B179UX5K1HYCluioWj8Ndbgqw2PVqa1NnVJkGHp2ovMpVn/DImlmkw=="; }; }; - "@octokit/types-2.10.0" = { + "@octokit/types-2.12.1" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "2.10.0"; + version = "2.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-2.10.0.tgz"; - sha512 = "0/NN22MgQvNNgMjTwzWUzcIfFfks3faqiP1D1oQQz49KYeOWc+KkRG9ASbAPurrAnOaDiqnnuDYzhNT9cq4e8Q=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-2.12.1.tgz"; + sha512 = "LRLR1tjbcCfAmUElvTmMvLEzstpx6Xt/aQVTg2xvd+kHA2Ekp1eWl5t+gU7bcwjXHYEAzh4hH4WH+kS3vh+wRw=="; }; }; "@parcel/fs-1.11.0" = { @@ -2677,22 +2659,22 @@ let sha512 = "MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg=="; }; }; - "@schematics/angular-9.1.1" = { + "@schematics/angular-9.1.3" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "9.1.1"; + version = "9.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-9.1.1.tgz"; - sha512 = "V0DcDNgHQ2YR+PGZI6+pf/mUNNxt5SusShkZ1PbwIMk/HUQpzEGkLjm3v1Jw9eIZKiuDx615GNU1xDzQ/KyNRQ=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-9.1.3.tgz"; + sha512 = "3vxrPyvcIWvyWgbx/fpeQvMThXlmcnHTXVn2dpTcE2BzstAYdG17W3qouhvmlqd6m28orxkKKiZaJYMNTtnV/A=="; }; }; - "@schematics/update-0.901.1" = { + "@schematics/update-0.901.3" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.901.1"; + version = "0.901.3"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.901.1.tgz"; - sha512 = "g5B8hjXKCbUNLKCkWQxc5r2D9lOQXRTLZJNIqva+l/ck0AML5MpelxkqQId9ZGLfQqfFk/XjdSHRWgcmUs1WnA=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.901.3.tgz"; + sha512 = "kwfc9LMMi6ryN2oiat9vTqGMK1jKwI1c45Nm1xala35nsbQSQ12qeL3MrVmnSCeI14+cinFUbp8mWI9/3M+/Lg=="; }; }; "@serverless/cli-1.4.0" = { @@ -2713,13 +2695,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-2.29.3" = { + "@serverless/components-2.30.1" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "2.29.3"; + version = "2.30.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-2.29.3.tgz"; - sha512 = "Qrucf/k4QStcVLIvumGvf3oJlotxrcIswO0LnTu6WosPQHrVXy6uMTd2QF5raNMi4UTnOA86ZM//XXYkgGbDnw=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-2.30.1.tgz"; + sha512 = "blqZP6aRg9oj1A30ip2hndcvA1g+J8g8vFbUHtAfs5mp/r4KTD63tNagscSNKTSbc6csM3Z9w6yjW4KSarl8LQ=="; }; }; "@serverless/core-1.1.2" = { @@ -2776,13 +2758,13 @@ let sha512 = "29JV8XpJPTUSWgDwxhvZZ9fi9/5jCn1x5IeT+xEiEkpuXZU79wXlSfMfc8XtptOsDouZnOhBpKEZrItGp67CFw=="; }; }; - "@serverless/platform-client-china-1.0.5" = { + "@serverless/platform-client-china-1.0.6" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-1.0.5.tgz"; - sha512 = "EhiVkC3qh8uZQjcIXbN7n1eVCKiyvriJjghbOe4cigkNhT/dHPTFM23aK3h/rJowfP9P5+R4xfKsaCWRjA8Y3Q=="; + url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-1.0.6.tgz"; + sha512 = "565LsU74rDQQJAN6y8dTJpDNktqGGs2EvafXXEX021F+YlN3fIJebXRASN2Mgj4XWmzY7DbqC3v2wXF9j3LsGg=="; }; }; "@serverless/platform-sdk-2.3.0" = { @@ -2803,13 +2785,13 @@ let sha512 = "hcMiX523rkp6kHeKnM1x6/dXEY+d1UFSr901yVKeeCgpFy4u33UI9vlKaPweAZCF6Ahzqywf01IsFTuBVadCrQ=="; }; }; - "@serverless/utils-china-0.1.3" = { + "@serverless/utils-china-0.1.6" = { name = "_at_serverless_slash_utils-china"; packageName = "@serverless/utils-china"; - version = "0.1.3"; + version = "0.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-0.1.3.tgz"; - sha512 = "2KtmNFNGvWC/TAOkcnp8oDchAlLh/anpnxLifBb2xjbP50m3tOnoea5eU1QRENPOtCrg0iqCpfmfJ3eiCkaf0A=="; + url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-0.1.6.tgz"; + sha512 = "BPaKkRJ47yKTIqRkwF62V5Z/SGdNDmNtinu3fK4988CG1gXBVG2yb3Cq34A98B4BAwZdKzxKCV2n9q4dl1zolw=="; }; }; "@sindresorhus/is-0.14.0" = { @@ -2830,13 +2812,13 @@ let sha512 = "ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow=="; }; }; - "@sindresorhus/is-2.1.0" = { + "@sindresorhus/is-2.1.1" = { name = "_at_sindresorhus_slash_is"; packageName = "@sindresorhus/is"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@sindresorhus/is/-/is-2.1.0.tgz"; - sha512 = "lXKXfypKo644k4Da4yXkPCrwcvn6SlUW2X2zFbuflKHNjf0w9htru01bo26uMhleMXsDmnZ12eJLdrAZa9MANg=="; + url = "https://registry.npmjs.org/@sindresorhus/is/-/is-2.1.1.tgz"; + sha512 = "/aPsuoj/1Dw/kzhkgz+ES6TxG0zfTMGLwuK2ZG00k/iJzYHTLCE8mVU8EPqEOp/lmxPoq1C1C9RYToRKb2KEfg=="; }; }; "@slack/client-3.16.0" = { @@ -2875,22 +2857,13 @@ let sha512 = "ecbylK5Ol2ySb/WbfPj0s0GuLQR+KWKFzUgVaoNHaSoN6371qRWwf2uVr+hPUP4gXqCai21Ug/RDArfOhlPwrQ=="; }; }; - "@snyk/cli-interface-2.3.1" = { - name = "_at_snyk_slash_cli-interface"; - packageName = "@snyk/cli-interface"; - version = "2.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.3.1.tgz"; - sha512 = "JZvsmhDXSyjv1dkc12lPI3tNTNYlIaOiIQMYFg2RgqF3QmWjTyBUgRZcF7LoKyufHtS4dIudM6k1aHBpSaDrhw=="; - }; - }; - "@snyk/cli-interface-2.3.2" = { + "@snyk/cli-interface-2.4.0" = { name = "_at_snyk_slash_cli-interface"; packageName = "@snyk/cli-interface"; - version = "2.3.2"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.3.2.tgz"; - sha512 = "jmZyxVHqzYU1GfdnWCGdd68WY/lAzpPVyqalHazPj4tFJehrSfEFc82RMTYAMgXEJuvFRFIwhsvXh3sWUhIQmg=="; + url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.4.0.tgz"; + sha512 = "FH3RpJV83SFmNWR7FXS4O4sAF7oZZxAWmN6vwhADGJNAdgJYW4Acc6677ZSMnRpIHiFBHrsxso3Au+NQuu73xA=="; }; }; "@snyk/cocoapods-lockfile-parser-3.1.0" = { @@ -2938,6 +2911,15 @@ let sha512 = "nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA=="; }; }; + "@snyk/java-call-graph-builder-1.3.4" = { + name = "_at_snyk_slash_java-call-graph-builder"; + packageName = "@snyk/java-call-graph-builder"; + version = "1.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.3.4.tgz"; + sha512 = "3KXA5hTqvn6EZBEyMhA5zj0QCzu1WBPVBeUbQ4sNfftbVgfy/OFc9I/NPi39ALA2+tFYl1aKVIy1ECRea4Mc1w=="; + }; + }; "@snyk/ruby-semver-2.1.0" = { name = "_at_snyk_slash_ruby-semver"; packageName = "@snyk/ruby-semver"; @@ -3226,13 +3208,13 @@ let sha512 = "XO6INPbZCxdprl+9qa/AAbFFOMzzwqYxpjPgLICrMD6C2FCw6qfJOPcBk6JqqPLSaZ/Qx87qn4rpPmPMwaAK6w=="; }; }; - "@tootallnate/once-1.0.0" = { + "@tootallnate/once-1.1.2" = { name = "_at_tootallnate_slash_once"; packageName = "@tootallnate/once"; - version = "1.0.0"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@tootallnate/once/-/once-1.0.0.tgz"; - sha512 = "KYyTT/T6ALPkIRd2Ge080X/BsXvy9O0hcWTtMWkPvwAwF99+vn6Dv4GzrFT/Nn1LePr+FFDbRXXlqmsy9lw2zA=="; + url = "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz"; + sha512 = "RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="; }; }; "@types/accepts-1.3.5" = { @@ -3586,13 +3568,13 @@ let sha512 = "B8nG/OoE1ORZqCkBVsup/AKcvjdgoHnfi4pZMn5UwAPCbhk/96xyv284eBYW8JlQbQ7zDmnpFr68I/40mFoIBQ=="; }; }; - "@types/lodash-4.14.149" = { + "@types/lodash-4.14.150" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.149"; + version = "4.14.150"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.149.tgz"; - sha512 = "ijGqzZt/b7BfzcK9vTrS6MFljQRPn5BFWOx8oE0GYxribu6uV+aA9zZuXI1zc/etK9E8nrgdoF2+LgUw7+9tJQ=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.150.tgz"; + sha512 = "kMNLM5JBcasgYscD9x/Gvr6lTAv2NVgsKtet/hm93qMyf/D1pt+7jeEZklKJKxMVmXjxbRVQQGfqDSfipYCO6w=="; }; }; "@types/long-4.0.1" = { @@ -3631,31 +3613,31 @@ let sha1 = "69a23a3ad29caf0097f06eda59b361ee2f0639f6"; }; }; - "@types/node-10.17.19" = { + "@types/node-10.17.21" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.17.19"; + version = "10.17.21"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.17.19.tgz"; - sha512 = "46/xThm3zvvc9t9/7M3AaLEqtOpqlYYYcCZbpYVAQHG20+oMZBkae/VMrn4BTi6AJ8cpack0mEXhGiKmDNbLrQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.17.21.tgz"; + sha512 = "PQKsydPxYxF1DsAFWmunaxd3sOi3iMt6Zmx/tgaagHYmwJ/9cRH91hQkeJZaUGWbvn0K5HlSVEXkn5U/llWPpQ=="; }; }; - "@types/node-12.12.35" = { + "@types/node-12.12.37" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.12.35"; + version = "12.12.37"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.12.35.tgz"; - sha512 = "ASYsaKecA7TUsDrqIGPNk3JeEox0z/0XR/WsJJ8BIX/9+SkMSImQXKWfU/yBrSyc7ZSE/NPqLu36Nur0miCFfQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-12.12.37.tgz"; + sha512 = "4mXKoDptrXAwZErQHrLzpe0FN/0Wmf5JRniSVIdwUrtDf9wnmEV1teCNLBo/TwuXhkK/bVegoEn/wmb+x0AuPg=="; }; }; - "@types/node-13.11.1" = { + "@types/node-13.13.2" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.11.1"; + version = "13.13.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.11.1.tgz"; - sha512 = "eWQGP3qtxwL8FGneRrC5DwrJLGN4/dH1clNTuLfN81HCrxVtxRjygDTUoZJ5ASlDEeo0ppYFQjQIlXhtXpOn6g=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.13.2.tgz"; + sha512 = "LB2R1Oyhpg8gu4SON/mfforE525+Hi/M1ineICEDftqNVTyFg1aRIeGuTvXAoWHc4nbrFncWtJgMmoyRvuGh7A=="; }; }; "@types/node-6.14.10" = { @@ -3667,15 +3649,6 @@ let sha512 = "pF4HjZGSog75kGq7B1InK/wt/N08BuPATo+7HRfv7gZUzccebwv/fmWVGs/j6LvSiLWpCuGGhql51M/wcQsNzA=="; }; }; - "@types/node-fetch-2.5.5" = { - name = "_at_types_slash_node-fetch"; - packageName = "@types/node-fetch"; - version = "2.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.5.tgz"; - sha512 = "IWwjsyYjGw+em3xTvWVQi5MgYKbRs0du57klfTaZkv/B24AEQ/p/IopNeqIYNy3EsfHOpg8ieQSDomPcsYMHpA=="; - }; - }; "@types/node-fetch-2.5.6" = { name = "_at_types_slash_node-fetch"; packageName = "@types/node-fetch"; @@ -3802,13 +3775,13 @@ let sha512 = "GpTIuDpb9u4zIO165fUy9+fXcULdD8HFRNli04GehoMVbeNq7D6OBnqSmg3lxZnC+UvgUhEWKxdKiwYUkGltIw=="; }; }; - "@types/vscode-1.43.0" = { + "@types/vscode-1.44.0" = { name = "_at_types_slash_vscode"; packageName = "@types/vscode"; - version = "1.43.0"; + version = "1.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.43.0.tgz"; - sha512 = "kIaR9qzd80rJOxePKpCB/mdy00mz8Apt2QA5Y6rdrKFn13QNFNeP3Hzmsf37Bwh/3cS7QjtAeGSK7wSqAU0sYQ=="; + url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.44.0.tgz"; + sha512 = "WJZtZlinE3meRdH+I7wTsIhpz/GLhqEQwmPGeh4s1irWLwMzCeTV8WZ+pgPTwrDXoafVUWwo1LiZ9HJVHFlJSQ=="; }; }; "@types/ws-6.0.4" = { @@ -3865,13 +3838,13 @@ let sha512 = "te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="; }; }; - "@typescript-eslint/eslint-plugin-2.28.0" = { + "@typescript-eslint/eslint-plugin-2.29.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "2.28.0"; + version = "2.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.28.0.tgz"; - sha512 = "w0Ugcq2iatloEabQP56BRWJowliXUP5Wv6f9fKzjJmDW81hOTBxRoJ4LoEOxRpz9gcY51Libytd2ba3yLmSOfg=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.29.0.tgz"; + sha512 = "X/YAY7azKirENm4QRpT7OVmzok02cSkqeIcLmdz6gXUQG4Hk0Fi9oBAynSAyNXeGdMRuZvjBa0c1Lu0dn/u6VA=="; }; }; "@typescript-eslint/experimental-utils-1.13.0" = { @@ -3883,13 +3856,13 @@ let sha512 = "zmpS6SyqG4ZF64ffaJ6uah6tWWWgZ8m+c54XXgwFtUv0jNz8aJAVx8chMCvnk7yl6xwn8d+d96+tWp7fXzTuDg=="; }; }; - "@typescript-eslint/experimental-utils-2.28.0" = { + "@typescript-eslint/experimental-utils-2.29.0" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "2.28.0"; + version = "2.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.28.0.tgz"; - sha512 = "4SL9OWjvFbHumM/Zh/ZeEjUFxrYKtdCi7At4GyKTbQlrj1HcphIDXlje4Uu4cY+qzszR5NdVin4CCm6AXCjd6w=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.29.0.tgz"; + sha512 = "H/6VJr6eWYstyqjWXBP2Nn1hQJyvJoFdDtsHxGiD+lEP7piGnGpb/ZQd+z1ZSB1F7dN+WsxUDh8+S4LwI+f3jw=="; }; }; "@typescript-eslint/parser-1.13.0" = { @@ -3901,13 +3874,13 @@ let sha512 = "ITMBs52PCPgLb2nGPoeT4iU3HdQZHcPaZVw+7CsFagRJHUhyeTgorEwHXhFf3e7Evzi8oujKNpHc8TONth8AdQ=="; }; }; - "@typescript-eslint/parser-2.28.0" = { + "@typescript-eslint/parser-2.29.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "2.28.0"; + version = "2.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.28.0.tgz"; - sha512 = "RqPybRDquui9d+K86lL7iPqH6Dfp9461oyqvlXMNtap+PyqYbkY5dB7LawQjDzot99fqzvS0ZLZdfe+1Bt3Jgw=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.29.0.tgz"; + sha512 = "H78M+jcu5Tf6m/5N8iiFblUUv+HJDguMSdFfzwa6vSg9lKR8Mk9BsgeSjO8l2EshKnJKcbv0e8IDDOvSNjl0EA=="; }; }; "@typescript-eslint/typescript-estree-1.13.0" = { @@ -3919,13 +3892,13 @@ let sha512 = "b5rCmd2e6DCC6tCTN9GSUAuxdYwCM/k/2wdjHGrIRGPSJotWMCe/dGpi66u42bhuh8q3QBzqM4TMA1GUUCJvdw=="; }; }; - "@typescript-eslint/typescript-estree-2.28.0" = { + "@typescript-eslint/typescript-estree-2.29.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "2.28.0"; + version = "2.29.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.28.0.tgz"; - sha512 = "HDr8MP9wfwkiuqzRVkuM3BeDrOC4cKbO5a6BymZBHUt5y/2pL0BXD6I/C/ceq2IZoHWhcASk+5/zo+dwgu9V8Q=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.29.0.tgz"; + sha512 = "3YGbtnWy4az16Egy5Fj5CckkVlpIh0MADtAQza+jiMADRSKkjdpzZp/5WuvwK/Qib3Z0HtzrDFeWanS99dNhnA=="; }; }; "@vue/cli-shared-utils-4.3.1" = { @@ -4729,13 +4702,13 @@ let sha1 = "f291be701a2efc567a63fc7aa6afcded31430be1"; }; }; - "addons-linter-1.20.0" = { + "addons-linter-1.23.0" = { name = "addons-linter"; packageName = "addons-linter"; - version = "1.20.0"; + version = "1.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.20.0.tgz"; - sha512 = "EIyJnIkvXhBKgOzVFR873uGa4ny07odIl8i8qWxHAuVJWM/ZQtLouAbndA+cVRDbD66sK6HsO1oWN6WkdCr/uA=="; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-1.23.0.tgz"; + sha512 = "4ozo5E+KnsU9h94J496WQs6NYSnofxtw5/Sy63PmeB5FJ3KWERx1S9D8A+ixMAIMgaSiexHpp5alp9yjE0t4gg=="; }; }; "addr-to-ip-port-1.5.1" = { @@ -4927,22 +4900,22 @@ let sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; }; }; - "ajv-6.10.2" = { + "ajv-6.12.0" = { name = "ajv"; packageName = "ajv"; - version = "6.10.2"; + version = "6.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz"; - sha512 = "TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz"; + sha512 = "D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw=="; }; }; - "ajv-6.12.0" = { + "ajv-6.12.2" = { name = "ajv"; packageName = "ajv"; - version = "6.12.0"; + version = "6.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz"; - sha512 = "D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz"; + sha512 = "k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ=="; }; }; "ajv-6.5.3" = { @@ -5422,13 +5395,13 @@ let sha512 = "sbLEIMQrkV7RkIruqTPXxeCMkAAycv4yzTkBzRgOR1BrR5UB7qZtupqxkersTJSf0HZ3sbaNRrNV80TnnM7cUw=="; }; }; - "apollo-2.27.0" = { + "apollo-2.27.3" = { name = "apollo"; packageName = "apollo"; - version = "2.27.0"; + version = "2.27.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo/-/apollo-2.27.0.tgz"; - sha512 = "yA4/DihmCuz+8k1zsHCtuEslVtAY1oc9mCv7YLUr2B7TVLgbEzNNzNciMbSa5SIczt0S5I+tr6pBhMYPgsLN3A=="; + url = "https://registry.npmjs.org/apollo/-/apollo-2.27.3.tgz"; + sha512 = "9GWIdwah0o4XiNTGcoc4JIflBYf+3+JflKeqS3YfJ8uOzUPGSaFIt0Z42p43TJ9ALvJqnlcYy/cBCizihne3Xg=="; }; }; "apollo-cache-1.3.4" = { @@ -5485,13 +5458,13 @@ let sha512 = "sanUIqXWyyDpxY3fYOVU+Hsxwxdj5fmn3Zcy6CcMGnWmh9o7tautQAuod2a63wrDs1jcNQcFq3EKIpeB+2xECw=="; }; }; - "apollo-codegen-core-0.36.6" = { + "apollo-codegen-core-0.36.8" = { name = "apollo-codegen-core"; packageName = "apollo-codegen-core"; - version = "0.36.6"; + version = "0.36.8"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.36.6.tgz"; - sha512 = "wVQkjYrbJa3Ut98pP9z/DnPPdtYaXLmOe83TOM1/krX3MlhTD17VWx1pkLht+1Tuy7hEZErxA5d2bwaynSNfCg=="; + url = "https://registry.npmjs.org/apollo-codegen-core/-/apollo-codegen-core-0.36.8.tgz"; + sha512 = "T/JhiGIJHpqVw6YAbdxhDXUYqZjm5wqoGL4yc3rgpNH7Wo/TOFpiFu0FDQyncq2uU7za062Pj8lXj1jhC6uNzQ=="; }; }; "apollo-codegen-flow-0.20.0" = { @@ -5503,13 +5476,13 @@ let sha512 = "XgKE19B0Q74PBLVqHP/77NcCFrcvrN9wi3CcotH+FV8BeHTjvpHlilTsQMmd2STPt19cCvY2Qtz0EOeLXTUQ2Q=="; }; }; - "apollo-codegen-flow-0.34.6" = { + "apollo-codegen-flow-0.34.8" = { name = "apollo-codegen-flow"; packageName = "apollo-codegen-flow"; - version = "0.34.6"; + version = "0.34.8"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.34.6.tgz"; - sha512 = "jgoa9dlWNec+qD02hsWaLYtd2p9A97IbEcWX7aLaE5fifrK1rIA7lY6TLwlXc663YxBcgZzGaCfKtatqndfg9A=="; + url = "https://registry.npmjs.org/apollo-codegen-flow/-/apollo-codegen-flow-0.34.8.tgz"; + sha512 = "U81ZM2roWSSKrlZSqpltJfG5TRrDjqyyV+odC5GWzyYZUltYTqDqZjoleGeMguLBupDFOr21QUlM1LtJxeRAfQ=="; }; }; "apollo-codegen-flow-legacy-0.20.0" = { @@ -5530,13 +5503,13 @@ let sha512 = "NbnMOfUXXovlTGRj4mIZGXB9HvidQhwKfAmdYHox5peHPkjjsqEzxGCIuWCSnubWiCF2uHZnQoIkg4sXWf0KLw=="; }; }; - "apollo-codegen-scala-0.35.6" = { + "apollo-codegen-scala-0.35.8" = { name = "apollo-codegen-scala"; packageName = "apollo-codegen-scala"; - version = "0.35.6"; + version = "0.35.8"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.35.6.tgz"; - sha512 = "H5NAMdCb5cMB/YGUqCSDspPLRxMFklc9m2CBVpdo90cjIjb8YEJDJfqpLt1D6X5fX2xPhNYptCyeDkY1qXC9XQ=="; + url = "https://registry.npmjs.org/apollo-codegen-scala/-/apollo-codegen-scala-0.35.8.tgz"; + sha512 = "c9g7+2MLzDG217cy4KFMCCXxw+kBTjvUxjXG9+PwzP5cEMchFxlCQdMbOazY+s03Q8Uy4uYh6f+Kw0x0YaPoWw=="; }; }; "apollo-codegen-swift-0.20.0" = { @@ -5548,13 +5521,13 @@ let sha512 = "L9Y4StbXw0t/nuF+miz0ybSt/io6tsLc063Yeh1A8GCvhFFQyXE/yK0Rf3nO1Bl5Z9UZ5o8Aae9kK4GSWYIGNQ=="; }; }; - "apollo-codegen-swift-0.36.6" = { + "apollo-codegen-swift-0.36.8" = { name = "apollo-codegen-swift"; packageName = "apollo-codegen-swift"; - version = "0.36.6"; + version = "0.36.8"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.36.6.tgz"; - sha512 = "/F96GbAjBcLE8pKFv8+k4FyAaegPHl0vxF/2abxQEBfolwyLk5JufEBC2fSkS9Gf8PLQlDcEIxUFyqmBQzMbpA=="; + url = "https://registry.npmjs.org/apollo-codegen-swift/-/apollo-codegen-swift-0.36.8.tgz"; + sha512 = "PTZtRGfSFi8UkE8T92W2/zMFZ8GI59KQdotVWqUphaprhFnzHnig3YZf8L05eBgkbQuDPDckjBoRnICporG5Cw=="; }; }; "apollo-codegen-typescript-0.20.0" = { @@ -5566,13 +5539,13 @@ let sha512 = "mzlIJXz+5WPwzeALqRHHR9aPPEf6IlhSrjCawpUHmFU1NK9hgwbguYCEYZv9mKkYBUUgDY+9cGFK1cafJX70AQ=="; }; }; - "apollo-codegen-typescript-0.36.6" = { + "apollo-codegen-typescript-0.36.8" = { name = "apollo-codegen-typescript"; packageName = "apollo-codegen-typescript"; - version = "0.36.6"; + version = "0.36.8"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.36.6.tgz"; - sha512 = "Y6UZ+HP+RDp0zk3h+rCJ/7eHQKUea3fPB6YplZ80dAzcwYYfsx0WprtdSYnUgPT8Rimeg+WDZ4jzQpZ/udPiGQ=="; + url = "https://registry.npmjs.org/apollo-codegen-typescript/-/apollo-codegen-typescript-0.36.8.tgz"; + sha512 = "IL0UaqXuByNUjbn3oxEpBidnCIKwiNmXYpwj+EqKnnQhOVwiV7wyXYRhBFp3LoUQVW5UKZ+qulYujlCvYvaj0w=="; }; }; "apollo-codegen-typescript-legacy-0.20.0" = { @@ -5611,31 +5584,31 @@ let sha512 = "SGrIkUR7Q/VjU8YG98xcvo340C4DaNUhg/TXOtGsMlfiJDzHwVau/Bv6zifAzBafp2lj0XND6Daj5kyT/eSI/w=="; }; }; - "apollo-env-0.6.2" = { + "apollo-env-0.6.4" = { name = "apollo-env"; packageName = "apollo-env"; - version = "0.6.2"; + version = "0.6.4"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-env/-/apollo-env-0.6.2.tgz"; - sha512 = "Vb/doL1ZbzkNDJCQ6kYGOrphRx63rMERYo3MT2pzm2pNEdm6AK60InMgJaeh3RLK3cjGllOXFAgP8IY+m+TaEg=="; + url = "https://registry.npmjs.org/apollo-env/-/apollo-env-0.6.4.tgz"; + sha512 = "8tGDMFv3sZLd76b/ZAo8GbdWU5Qt3VEUWSB+FLN41p/hVShZw0XIo2s/i8pVCTAhaWiEiD0Cr+d/zi0/h5UTxA=="; }; }; - "apollo-graphql-0.4.1" = { + "apollo-graphql-0.4.3" = { name = "apollo-graphql"; packageName = "apollo-graphql"; - version = "0.4.1"; + version = "0.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.4.1.tgz"; - sha512 = "dz2wtGeCqUDAKAj4KXLKLZiFY791aoXduul3KcLo8/6SwqWlsuZiPe0oB8mENHZZc/EchCpTMTJZX2ZENsOt2A=="; + url = "https://registry.npmjs.org/apollo-graphql/-/apollo-graphql-0.4.3.tgz"; + sha512 = "eAl8w6TeuY0Q3x7TVqBjt4JObA34vUyctuDn2lOmkdIqlu1EKxNAnTlRtXkjQM89qUt0rK0teU8No0a2lMNGuw=="; }; }; - "apollo-language-server-1.21.1" = { + "apollo-language-server-1.21.3" = { name = "apollo-language-server"; packageName = "apollo-language-server"; - version = "1.21.1"; + version = "1.21.3"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.21.1.tgz"; - sha512 = "Yu5nw+0lGWNY9PmgogzXVRvnCNluGImeNmg4jQkXQlBR2TsQ9P3YSwujDIJ5cWWKjyi/0+3PtRYvIna58xZ/fg=="; + url = "https://registry.npmjs.org/apollo-language-server/-/apollo-language-server-1.21.3.tgz"; + sha512 = "PSPiOwR7Zd0alnZ0zeuUs7kEnWwV3jWIU01bsoy8eaF4Bi2fJD7AHnEyUOiu7V3V7xdJtnsJNTjyZy5MC0+Ohg=="; }; }; "apollo-link-1.2.14" = { @@ -6736,15 +6709,6 @@ let sha512 = "zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg=="; }; }; - "async-3.1.1" = { - name = "async"; - packageName = "async"; - version = "3.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-3.1.1.tgz"; - sha512 = "X5Dj8hK1pJNC2Wzo2Rcp9FBVdJMGRR/S7V+lH46s8GVFhtbo5O4Le5GECCF/8PISVdkUA6mMPvgz7qTTD1rf1g=="; - }; - }; "async-3.2.0" = { name = "async"; packageName = "async"; @@ -6997,13 +6961,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.657.0" = { + "aws-sdk-2.661.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.657.0"; + version = "2.661.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.657.0.tgz"; - sha512 = "CGxnYEFkZwIflH0cnylMtyNNmjkQIK5gG9L0MRGha4ANSogBrCXfWcjSWP1ziDK0FhRBAyJVdMX0il/kW4ya+A=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.661.0.tgz"; + sha512 = "dfGtbRQQUmcpj6WGVhj7q2PADCvDhLf+/aRGPXcMrm0cnHavkmHPVaSvrw2lJJJ5N9MsBKoUyacrVcIQkfNsgw=="; }; }; "aws-sign2-0.6.0" = { @@ -7141,13 +7105,13 @@ let sha512 = "m2CvfDW4+1qfDdsrtf4dwOslQC3yhbgyBFptncp4wvtdrDHqueW7slsYv4gArie056phvQFhT2nRcGS4bnm6mA=="; }; }; - "babel-jest-25.3.0" = { + "babel-jest-25.4.0" = { name = "babel-jest"; packageName = "babel-jest"; - version = "25.3.0"; + version = "25.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-jest/-/babel-jest-25.3.0.tgz"; - sha512 = "qiXeX1Cmw4JZ5yQ4H57WpkO0MZ61Qj+YnsVUwAMnDV5ls+yHon11XjarDdgP7H8lTmiEi6biiZA8y3Tmvx6pCg=="; + url = "https://registry.npmjs.org/babel-jest/-/babel-jest-25.4.0.tgz"; + sha512 = "p+epx4K0ypmHuCnd8BapfyOwWwosNCYhedetQey1awddtfmEX0MmdxctGl956uwUmjwXR5VSS5xJcGX9DvdIog=="; }; }; "babel-loader-8.1.0" = { @@ -7159,13 +7123,13 @@ let sha512 = "7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw=="; }; }; - "babel-plugin-dynamic-import-node-2.3.0" = { + "babel-plugin-dynamic-import-node-2.3.3" = { name = "babel-plugin-dynamic-import-node"; packageName = "babel-plugin-dynamic-import-node"; - version = "2.3.0"; + version = "2.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz"; - sha512 = "o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ=="; + url = "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz"; + sha512 = "jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ=="; }; }; "babel-plugin-istanbul-6.0.0" = { @@ -7177,13 +7141,13 @@ let sha512 = "AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ=="; }; }; - "babel-plugin-jest-hoist-25.2.6" = { + "babel-plugin-jest-hoist-25.4.0" = { name = "babel-plugin-jest-hoist"; packageName = "babel-plugin-jest-hoist"; - version = "25.2.6"; + version = "25.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.2.6.tgz"; - sha512 = "qE2xjMathybYxjiGFJg0mLFrz0qNp83aNZycWDY/SuHiZNq+vQfRQtuINqyXyue1ELd8Rd+1OhFSLjms8msMbw=="; + url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.4.0.tgz"; + sha512 = "M3a10JCtTyKevb0MjuH6tU+cP/NVQZ82QPADqI1RQYY1OphztsCeIeQmTsHmF/NS6m0E51Zl4QNsI3odXSQF5w=="; }; }; "babel-plugin-minify-builtins-0.5.0" = { @@ -7402,15 +7366,6 @@ let sha1 = "be241ca81404030678b748717322b89d0c8fe280"; }; }; - "babel-polyfill-6.26.0" = { - name = "babel-polyfill"; - packageName = "babel-polyfill"; - version = "6.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.26.0.tgz"; - sha1 = "379937abc67d7895970adc621f284cd966cf2153"; - }; - }; "babel-preset-current-node-syntax-0.1.2" = { name = "babel-preset-current-node-syntax"; packageName = "babel-preset-current-node-syntax"; @@ -7420,13 +7375,13 @@ let sha512 = "u/8cS+dEiK1SFILbOC8/rUI3ml9lboKuuMvZ/4aQnQmhecQAgPw5ew066C1ObnEAUmlx7dv/s2z52psWEtLNiw=="; }; }; - "babel-preset-jest-25.3.0" = { + "babel-preset-jest-25.4.0" = { name = "babel-preset-jest"; packageName = "babel-preset-jest"; - version = "25.3.0"; + version = "25.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-25.3.0.tgz"; - sha512 = "tjdvLKNMwDI9r+QWz9sZUQGTq1dpoxjUqFUpEasAc7MOtHg9XuLT2fx0udFG+k1nvMV0WvHHVAN7VmCZ+1Zxbw=="; + url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-25.4.0.tgz"; + sha512 = "PwFiEWflHdu3JCeTr0Pb9NcHHE34qWFnPQRVPvqQITx4CsDCzs6o05923I10XvLvn9nNsRHuiVgB72wG/90ZHQ=="; }; }; "babel-preset-minify-0.5.1" = { @@ -8671,13 +8626,13 @@ let sha512 = "yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA=="; }; }; - "browserslist-4.11.1" = { + "browserslist-4.12.0" = { name = "browserslist"; packageName = "browserslist"; - version = "4.11.1"; + version = "4.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.11.1.tgz"; - sha512 = "DCTr3kDrKEYNw6Jb9HFxVLQNaue8z+0ZfRBRjmCunKDEXEBajKDj2Y+Uelg+Pi29OnvaSGwjOsnRyNEkXzHg5g=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.12.0.tgz"; + sha512 = "UH2GkcEDSI0k/lRkuDSzFl9ZZ87skSy9w2XAn1MsZnL+4c4rqbBd3e82UWHbYDpztABrPBhZsTEeuxVfHppqDg=="; }; }; "bser-2.1.1" = { @@ -9400,15 +9355,6 @@ let sha1 = "a2aa5fb1af688758259c32c141426d78923b9b77"; }; }; - "camelcase-keys-6.1.2" = { - name = "camelcase-keys"; - packageName = "camelcase-keys"; - version = "6.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-6.1.2.tgz"; - sha512 = "QfFrU0CIw2oltVvpndW32kuJ/9YOJwUnmWrjlXt1nnJZHCaS9i6bfOpg9R4Lw8aZjStkJWM+jc0cdXjWBgVJSw=="; - }; - }; "camelcase-keys-6.2.2" = { name = "camelcase-keys"; packageName = "camelcase-keys"; @@ -9445,13 +9391,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001042" = { + "caniuse-lite-1.0.30001046" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001042"; + version = "1.0.30001046"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001042.tgz"; - sha512 = "igMQ4dlqnf4tWv0xjaaE02op9AJ2oQzXKjWf4EuAHFN694Uo9/EfPVIPJcmn2WkU9RqozCxx5e2KPcVClHDbDw=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001046.tgz"; + sha512 = "CsGjBRYWG6FvgbyGy+hBbaezpwiqIOLkxQPY4A4Ea49g1eNsnQuESB+n4QM0BKii1j80MyJ26Ir5ywTQkbRE4g=="; }; }; "capture-exit-2.0.0" = { @@ -9967,13 +9913,13 @@ let sha512 = "HqsYJgIc8ljJJOqOzLphjAs79EUuWSX3nzZi2LNkzlw3GIzAeZbaSektC8iT/tKvLqZq8yl1GJu5o6doA4TRbg=="; }; }; - "chrome-launcher-0.12.0" = { + "chrome-launcher-0.13.1" = { name = "chrome-launcher"; packageName = "chrome-launcher"; - version = "0.12.0"; + version = "0.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.12.0.tgz"; - sha512 = "rBUP4tvWToiileDi3UR0SbWKoUoDCYTRmVND2sdoBL1xANBgVz8V9h1yQluj3MEQaBJg0fRw7hW82uOPrJus7A=="; + url = "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-0.13.1.tgz"; + sha512 = "q8UiCNAknw6kCUvCVBTAEw1BwT0vaxabCrSjN3B/NWohp12YBD9+DalymYElSoKRD4KpVSu4CCl0us4v/J81Sg=="; }; }; "chrome-net-3.3.3" = { @@ -10264,13 +10210,13 @@ let sha1 = "7e673ee0dd39a611a486476e53f3c6b3941cb582"; }; }; - "cli-progress-3.7.0" = { + "cli-progress-3.8.0" = { name = "cli-progress"; packageName = "cli-progress"; - version = "3.7.0"; + version = "3.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/cli-progress/-/cli-progress-3.7.0.tgz"; - sha512 = "xo2HeQ3vNyAO2oYF5xfrk5YM6jzaDNEbeJRLAQir6QlH54g4f6AXW+fLyJ/f12gcTaCbJznsOdQcr/yusp/Kjg=="; + url = "https://registry.npmjs.org/cli-progress/-/cli-progress-3.8.0.tgz"; + sha512 = "3e+m7ecKbVTF2yo186vrrt/5217ZwE64z61kMwhSFmgrF3qZiTUuV9Fdh2RyzSkhLRfsqFf721KiUDEAJlP5pA=="; }; }; "cli-spinner-0.2.10" = { @@ -11164,15 +11110,6 @@ let sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; }; }; - "commander-3.0.2" = { - name = "commander"; - packageName = "commander"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-3.0.2.tgz"; - sha512 = "Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow=="; - }; - }; "commander-4.1.0" = { name = "commander"; packageName = "commander"; @@ -13145,13 +13082,13 @@ let sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q=="; }; }; - "dayjs-1.8.24" = { + "dayjs-1.8.25" = { name = "dayjs"; packageName = "dayjs"; - version = "1.8.24"; + version = "1.8.25"; src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.24.tgz"; - sha512 = "bImQZbBv86zcOWOq6fLg7r4aqMx8fScdmykA7cSh+gH1Yh8AM0Dbw0gHYrsOrza6oBBnkK+/OaR+UAa9UsMrDw=="; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.25.tgz"; + sha512 = "Pk36juDfQQGDCgr0Lqd1kw15w3OS6xt21JaLPE3lCfsEf8KrERGwDNwvK1tRjrjqFC0uZBJncT4smZQ4F+uV5g=="; }; }; "de-indent-1.0.2" = { @@ -14387,13 +14324,13 @@ let sha1 = "57ddacb47324ae5f58d2cc0da886db4ce9eeb718"; }; }; - "dispensary-0.49.0" = { + "dispensary-0.51.2" = { name = "dispensary"; packageName = "dispensary"; - version = "0.49.0"; + version = "0.51.2"; src = fetchurl { - url = "https://registry.npmjs.org/dispensary/-/dispensary-0.49.0.tgz"; - sha512 = "szH0vDORmGWEfwQgIqrhmrMpSGU2yXL3z7oe0NGx4sCbmnJdXXr5SQvRccPNCPrRuRPn2zPIITvwD9Lf+pcOew=="; + url = "https://registry.npmjs.org/dispensary/-/dispensary-0.51.2.tgz"; + sha512 = "liUDx/g1xFEBFoOL6308Vr0aYAZlGAyXGcOvuXVa/6qVBZT4QZrv4pVNeb5QOeD5C/Flta+A+qTnLkLnhgs40g=="; }; }; "diveSync-0.3.0" = { @@ -15233,13 +15170,13 @@ let sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="; }; }; - "electron-to-chromium-1.3.411" = { + "electron-to-chromium-1.3.415" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.411"; + version = "1.3.415"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.411.tgz"; - sha512 = "TDDfkuSYEbknN0kRPSAD8WzB452pJ6EmIxGbI9yQHkDxUNbD6Educ10DxyA9r/DuLL4z255IO1OZIw+eFK6XUw=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.415.tgz"; + sha512 = "GbtYqKffx3sU8G0HxwXuJFfs58Q7+iwLa5rBwaULwET6jWW8IAQSrVnu7vEfiUIcMVfbYyFg7cw3zdm+EbBJmw=="; }; }; "elegant-spinner-1.0.1" = { @@ -15293,7 +15230,7 @@ let version = "1.0.1"; src = fetchurl { name = "emitter-1.0.1.tar.gz"; - url = "https://codeload.github.com/component/emitter/tar.gz/1.0.1"; + url = https://codeload.github.com/component/emitter/tar.gz/1.0.1; sha256 = "0eae744826723877457f7a7ac7f31d68a5a060673b3a883f6a8e325bf48f313d"; }; }; @@ -15522,13 +15459,13 @@ let sha512 = "+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w=="; }; }; - "engine.io-3.4.0" = { + "engine.io-3.4.1" = { name = "engine.io"; packageName = "engine.io"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io/-/engine.io-3.4.0.tgz"; - sha512 = "XCyYVWzcHnK5cMz7G4VTu2W7zJS7SM1QkcelghyIk/FmobWBtXE7fwhBusEKvCSqc3bMh8fNFMlUkCKTFRxH2w=="; + url = "https://registry.npmjs.org/engine.io/-/engine.io-3.4.1.tgz"; + sha512 = "8MfIfF1/IIfxuc2gv5K+XlFZczw/BpTvqBdl0E2fBLkYQp4miv4LuDTVtYt4yMyaIFLEr4vtaSgV4mjvll8Crw=="; }; }; "engine.io-client-1.3.1" = { @@ -15549,13 +15486,13 @@ let sha512 = "y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw=="; }; }; - "engine.io-client-3.4.0" = { + "engine.io-client-3.4.1" = { name = "engine.io-client"; packageName = "engine.io-client"; - version = "3.4.0"; + version = "3.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.0.tgz"; - sha512 = "a4J5QO2k99CM2a0b12IznnyQndoEvtA4UAldhGzKqnHf42I3Qs2W5SPnDvatZRcMaNZs4IevVicBPayxYt6FwA=="; + url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.1.tgz"; + sha512 = "RJNmA+A9Js+8Aoq815xpGAsgWH1VoSYM//2VgIiu9lNOaHFfLpTjH4tOzktBpjIs5lvOfiNY1dwf+NuU6D38Mw=="; }; }; "engine.io-parser-1.0.6" = { @@ -16233,15 +16170,6 @@ let sha512 = "qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A=="; }; }; - "espree-6.1.2" = { - name = "espree"; - packageName = "espree"; - version = "6.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-6.1.2.tgz"; - sha512 = "2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA=="; - }; - }; "espree-6.2.1" = { name = "espree"; packageName = "espree"; @@ -16926,6 +16854,15 @@ let sha512 = "t4oX2z7uoSqATbMfsxWMbNjAL0T5zpvcJCk3Z9wnPPN7ibddhnmDZXHfEcoBMG2ojKXZoCyPMc5FbtK+G7SoDg=="; }; }; + "express-session-1.17.1" = { + name = "express-session"; + packageName = "express-session"; + version = "1.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/express-session/-/express-session-1.17.1.tgz"; + sha512 = "UbHwgqjxQZJiWRTMyhvWGvjBQduGCSBDhhZXYenziMFjxst5rMV+aJZ6hKPHZnPyHGsrqRICxtX8jtEbm/z36Q=="; + }; + }; "express-urlrewrite-1.2.0" = { name = "express-urlrewrite"; packageName = "express-urlrewrite"; @@ -17331,13 +17268,13 @@ let sha512 = "Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA=="; }; }; - "fast-text-encoding-1.0.1" = { + "fast-text-encoding-1.0.2" = { name = "fast-text-encoding"; packageName = "fast-text-encoding"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.1.tgz"; - sha512 = "x4FEgaz3zNRtJfLFqJmHWxkMDDvXVtaznj2V9jiP8ACUJrUgist4bP9FmDL2Vew2Y9mEQI/tG4GqabaitYp9CQ=="; + url = "https://registry.npmjs.org/fast-text-encoding/-/fast-text-encoding-1.0.2.tgz"; + sha512 = "5rQdinSsycpzvAoHga2EDn+LRX1d5xLFsuNG0Kg61JrAT/tASXcLL0nf/33v+sAxlQcfYmWbTURa1mmAf55jGw=="; }; }; "fast-url-parser-1.1.3" = { @@ -17907,13 +17844,13 @@ let sha512 = "ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng=="; }; }; - "firefox-profile-1.3.0" = { + "firefox-profile-1.3.1" = { name = "firefox-profile"; packageName = "firefox-profile"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/firefox-profile/-/firefox-profile-1.3.0.tgz"; - sha512 = "3d7JPnFC3GrwGW8wonAqy2E4YCI7A8MO7yVDkqS09uQ3tLvMLCY3Ytt4ntvVXvyzjVMRmrLW9W/CubnnzrdLCA=="; + url = "https://registry.npmjs.org/firefox-profile/-/firefox-profile-1.3.1.tgz"; + sha512 = "8q7DnwVIXvuJuBm1shr5ivRh0Ih2ytWwOIMwHInDSlVyrjQVXy7Ik0frItDdWb/P5CIpQFcMk9fPsUwNqi2lyQ=="; }; }; "first-chunk-stream-1.0.0" = { @@ -18780,6 +18717,15 @@ let sha512 = "R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA=="; }; }; + "fsevents-2.1.3" = { + name = "fsevents"; + packageName = "fsevents"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz"; + sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ=="; + }; + }; "fstream-0.1.31" = { name = "fstream"; packageName = "fstream"; @@ -19275,13 +19221,13 @@ let sha1 = "c57d1145eec16465ab9bfbdf575262b1691624d6"; }; }; - "git-parse-1.0.3" = { + "git-parse-1.0.4" = { name = "git-parse"; packageName = "git-parse"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/git-parse/-/git-parse-1.0.3.tgz"; - sha512 = "LlGDePBQ9Lr/jsL3ULrnV8SQL8sk3cdScyc+vAk6jVLkHBOxdIj3JosNWemH2o9pNnGtcqukl+ym1Nl6k5jw0Q=="; + url = "https://registry.npmjs.org/git-parse/-/git-parse-1.0.4.tgz"; + sha512 = "NSC71SqG6jN0XYPbib8t/mgguVLddw+xvkkLv2EsCFvHfsZjO+ZqMcGoGHHMqfhZllCDDAkOwZESkZEmICj9ZA=="; }; }; "git-raw-commits-2.0.0" = { @@ -19632,7 +19578,7 @@ let version = "2.0.1"; src = fetchurl { name = "global-2.0.1.tar.gz"; - url = "https://codeload.github.com/component/global/tar.gz/v2.0.1"; + url = https://codeload.github.com/component/global/tar.gz/v2.0.1; sha256 = "42be02b7148745447f6ba21137c972ca82d2cad92d30d63bd4fc310623901785"; }; }; @@ -20374,13 +20320,13 @@ let sha1 = "0054e1e744502e27c04c187c3ecc505dd54bbb4f"; }; }; - "gulp-vinyl-zip-2.1.3" = { + "gulp-vinyl-zip-2.2.0" = { name = "gulp-vinyl-zip"; packageName = "gulp-vinyl-zip"; - version = "2.1.3"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/gulp-vinyl-zip/-/gulp-vinyl-zip-2.1.3.tgz"; - sha512 = "wOHNPddyZ45il4wNz3Bk9ChpEq5FK/P76SSkqAMCLVZSOVtLBiDIVXDbYWDlfZpoYEjZQl+28I+Uzmmr6pSnBQ=="; + url = "https://registry.npmjs.org/gulp-vinyl-zip/-/gulp-vinyl-zip-2.2.0.tgz"; + sha512 = "7tKXptewHdKnOV0HGIyB/5+dvfmwmHq+hnolAQ64zz/pPomUXJcFPeYCkatRmOztkfZOn+14zoIFS2G39PkzIg=="; }; }; "gulplog-1.0.0" = { @@ -20392,13 +20338,13 @@ let sha1 = "e28c4d45d05ecbbed818363ce8f9c5926229ffe5"; }; }; - "gunzip-maybe-1.4.1" = { + "gunzip-maybe-1.4.2" = { name = "gunzip-maybe"; packageName = "gunzip-maybe"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.1.tgz"; - sha512 = "qtutIKMthNJJgeHQS7kZ9FqDq59/Wn0G2HYCRNjpup7yKfVI6/eqwpmroyZGFoCYaG+sW6psNVb4zoLADHpp2g=="; + url = "https://registry.npmjs.org/gunzip-maybe/-/gunzip-maybe-1.4.2.tgz"; + sha512 = "4haO1M4mLO91PW57BMsDFf75UmwoRX0GkdD+Faw+Lr+r/OZrOCS0pIBwOL1xCKQqnQzbNFGgK2V2CpBUPeFNTw=="; }; }; "handle-thing-2.0.1" = { @@ -20410,15 +20356,6 @@ let sha512 = "9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg=="; }; }; - "handlebars-4.5.3" = { - name = "handlebars"; - packageName = "handlebars"; - version = "4.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-4.5.3.tgz"; - sha512 = "3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA=="; - }; - }; "handlebars-4.7.6" = { name = "handlebars"; packageName = "handlebars"; @@ -23012,13 +22949,13 @@ let sha512 = "zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="; }; }; - "is-function-1.0.1" = { + "is-function-1.0.2" = { name = "is-function"; packageName = "is-function"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-function/-/is-function-1.0.1.tgz"; - sha1 = "12cfb98b65b57dd3d193a3121f5f6e2f437602b5"; + url = "https://registry.npmjs.org/is-function/-/is-function-1.0.2.tgz"; + sha512 = "lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ=="; }; }; "is-glob-2.0.1" = { @@ -23939,13 +23876,13 @@ let sha1 = "611ae1acf14f5e81f729507472819fe9733558a9"; }; }; - "isomorphic-git-0.70.4" = { + "isomorphic-git-0.78.5" = { name = "isomorphic-git"; packageName = "isomorphic-git"; - version = "0.70.4"; + version = "0.78.5"; src = fetchurl { - url = "https://registry.npmjs.org/isomorphic-git/-/isomorphic-git-0.70.4.tgz"; - sha512 = "Nk/iD4iEL35zY1B4l2PgPOJpVgTQzVH9W0oRkKc3vDbMjcfvs7nle4Y8NRghXIG27Z6KQVSTi/om6lTbzpfl+A=="; + url = "https://registry.npmjs.org/isomorphic-git/-/isomorphic-git-0.78.5.tgz"; + sha512 = "LrF5t9x7RdFeg84NsYpZo9qF1MZeb56LpBm6Jv47qMjnWMv0Il/3wPTA8I/lUYywgVbvF/e7xypHauj5auKW3w=="; }; }; "isomorphic-textencoder-1.0.1" = { @@ -24065,13 +24002,13 @@ let sha1 = "dc5ebed10d04a5e0eaf49ef0009bec473d1a6b31"; }; }; - "jaeger-client-3.17.2" = { + "jaeger-client-3.18.0" = { name = "jaeger-client"; packageName = "jaeger-client"; - version = "3.17.2"; + version = "3.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.17.2.tgz"; - sha512 = "19YloSidmKbrXHgecLWod8eXo7rm2ieUnsfg0ripTFGRCW5v2OWE96Gte4/tOQG/8N+T39VoLU2nMBdjbdMUJg=="; + url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.18.0.tgz"; + sha512 = "xZ9WvZDWLkZFq7SObpLwu1asMCKCgBRNcDxxGSvK+ZQ7OZyJC5xPlU+rJa4+s/P6autPBVwHpqMGbOERFxWuuA=="; }; }; "java-properties-1.0.2" = { @@ -24110,13 +24047,13 @@ let sha1 = "7a549bbd9ffe1585b0cd0a191e203055bee574b4"; }; }; - "jest-haste-map-25.3.0" = { + "jest-haste-map-25.4.0" = { name = "jest-haste-map"; packageName = "jest-haste-map"; - version = "25.3.0"; + version = "25.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.3.0.tgz"; - sha512 = "LjXaRa+F8wwtSxo9G+hHD/Cp63PPQzvaBL9XCVoJD2rrcJO0Zr2+YYzAFWWYJ5GlPUkoaJFJtOuk0sL6MJY80A=="; + url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.4.0.tgz"; + sha512 = "5EoCe1gXfGC7jmXbKzqxESrgRcaO3SzWXGCnvp9BcT0CFMyrB1Q6LIsjl9RmvmJGQgW297TCfrdgiy574Rl9HQ=="; }; }; "jest-regex-util-25.2.6" = { @@ -24137,22 +24074,22 @@ let sha512 = "RMVCfZsezQS2Ww4kB5HJTMaMJ0asmC0BHlnobQC6yEtxiFKIxohFA4QSXSabKwSggaNkqxn6Z2VwdFCjhUWuiQ=="; }; }; - "jest-util-25.3.0" = { + "jest-util-25.4.0" = { name = "jest-util"; packageName = "jest-util"; - version = "25.3.0"; + version = "25.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-util/-/jest-util-25.3.0.tgz"; - sha512 = "dc625P/KS/CpWTJJJxKc4bA3A6c+PJGBAqS8JTJqx4HqPoKNqXg/Ec8biL2Z1TabwK7E7Ilf0/ukSEXM1VwzNA=="; + url = "https://registry.npmjs.org/jest-util/-/jest-util-25.4.0.tgz"; + sha512 = "WSZD59sBtAUjLv1hMeKbNZXmMcrLRWcYqpO8Dz8b4CeCTZpfNQw2q9uwrYAD+BbJoLJlu4ezVPwtAmM/9/SlZA=="; }; }; - "jest-worker-25.2.6" = { + "jest-worker-25.4.0" = { name = "jest-worker"; packageName = "jest-worker"; - version = "25.2.6"; + version = "25.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-25.2.6.tgz"; - sha512 = "FJn9XDUSxcOR4cwDzRfL1z56rUofNTFs539FGASpd50RHdb6EVkhxQqktodW2mI49l+W3H+tFJDotCHUQF6dmA=="; + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-25.4.0.tgz"; + sha512 = "ghAs/1FtfYpMmYQ0AHqxV62XPvKdUDIBBApMZfly+E9JEmYh2K45G0R5dWxx986RN12pRCxsViwQVtGl+N4whw=="; }; }; "jetpack-id-1.0.0" = { @@ -24254,13 +24191,13 @@ let sha1 = "d6be2e4c377494e2378b1cae2920a91d1182d8c4"; }; }; - "jquery.terminal-2.15.2" = { + "jquery.terminal-2.15.4" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.15.2"; + version = "2.15.4"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.15.2.tgz"; - sha512 = "/G5L/laZLLO0tEQ+a94mLnvDXB5+PbC9IuZB+ikbw4E7W3GQkRpa0I15Z3xA+WbOaVZj+hEtPcKyyQLcKdjULQ=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.15.4.tgz"; + sha512 = "7XSLLjc2Il+1wtJQYQWkir8A5WnTMFEkwb1fGx3mASxQ+lp0Yu4Ua3iQTSKZGdYR3FINor9ToK107lJHEWOeYA=="; }; }; "js-base64-2.5.2" = { @@ -24731,6 +24668,15 @@ let sha512 = "ma5F/Bs47dZfJfDZ0Dt37eIbzVBVKZIDqsZSqdCCAPNHxKn+s3+CfMA6ahVVlf8Y1hyIjXkVLFU7yv4XxRfihA=="; }; }; + "jsonata-1.8.3" = { + name = "jsonata"; + packageName = "jsonata"; + version = "1.8.3"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonata/-/jsonata-1.8.3.tgz"; + sha512 = "r6ztI6ohbpRo77AxBm6vMs3aHZi2L2PaakW7TCPwSkeGcuAZ/SxXGLWH2Npwqq5+YBM/fg/g0EXg/pI9HvXQ8Q=="; + }; + }; "jsonc-parser-1.0.3" = { name = "jsonc-parser"; packageName = "jsonc-parser"; @@ -24929,13 +24875,13 @@ let sha1 = "b88f3a7b2e67a2a048152982c7a3756d9c4828f0"; }; }; - "jszip-3.3.0" = { + "jszip-3.4.0" = { name = "jszip"; packageName = "jszip"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/jszip/-/jszip-3.3.0.tgz"; - sha512 = "EJ9k766htB1ZWnsV5ZMDkKLgA+201r/ouFF8R2OigVjVdcm2rurcBrrdXaeqBJbqnUVMko512PYmlncBKE1Huw=="; + url = "https://registry.npmjs.org/jszip/-/jszip-3.4.0.tgz"; + sha512 = "gZAOYuPl4EhPTXT0GjhI3o+ZAz3su6EhLrKUoAivcKqyqC7laS5JEv4XWZND9BgcDcF83vI85yGbDmDR6UhrIg=="; }; }; "jszip-git://github.com/anmonteiro/jszip#patch-1" = { @@ -27703,13 +27649,13 @@ let sha512 = "LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA=="; }; }; - "make-dir-3.0.2" = { + "make-dir-3.1.0" = { name = "make-dir"; packageName = "make-dir"; - version = "3.0.2"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/make-dir/-/make-dir-3.0.2.tgz"; - sha512 = "rYKABKutXa6vXTXhoV18cBE7PaewPXHe/Bdq4v+ZLMhxbWApkFFplT0LcbMW+6BbjnQXzZ/sAvSE/JdguApG5w=="; + url = "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz"; + sha512 = "g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw=="; }; }; "make-error-1.3.6" = { @@ -28144,15 +28090,6 @@ let sha1 = "c6f34834a0d8dbc3b37c27ee8bbcb27c7775582e"; }; }; - "matcher-2.0.0" = { - name = "matcher"; - packageName = "matcher"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/matcher/-/matcher-2.0.0.tgz"; - sha512 = "nlmfSlgHBFx36j/Pl/KQPbIaqE8Zf0TqmSMjsuddHDg6PMSVgmyW9HpkLs0o0M1n2GIZ/S2BZBLIww/xjhiGng=="; - }; - }; "matcher-2.1.0" = { name = "matcher"; packageName = "matcher"; @@ -28261,13 +28198,13 @@ let sha1 = "c04891883c28c83602e1d06b05a11037e359b4c8"; }; }; - "mdn-browser-compat-data-1.0.3" = { + "mdn-browser-compat-data-1.0.15" = { name = "mdn-browser-compat-data"; packageName = "mdn-browser-compat-data"; - version = "1.0.3"; + version = "1.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-1.0.3.tgz"; - sha512 = "5n7c20IVrUiuOPSuhbkd5xoJPSzEEGsoMrmrdEtPHIw6gRPzonydcsguAmqGfSBd4d2DRoDQg533sijLUpeJLg=="; + url = "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-1.0.15.tgz"; + sha512 = "0jxT4ZqqCzJJfktX9d4NKgfRENy60kFzhVNV0mXNHvlnw8KrMe2cKOlEKs/Bz+odlgO0rRZAxU0OKiptqVhAXg=="; }; }; "mdn-data-2.0.4" = { @@ -28639,13 +28576,13 @@ let sha1 = "401fdec7ec21cdb9e03cd3d3021398da21b27085"; }; }; - "metals-languageclient-0.1.23" = { + "metals-languageclient-0.2.1" = { name = "metals-languageclient"; packageName = "metals-languageclient"; - version = "0.1.23"; + version = "0.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/metals-languageclient/-/metals-languageclient-0.1.23.tgz"; - sha512 = "Gi/qomdchfurnRIiEH8RjLbYZ926zJDE/acOx8xCtAx7Ai9vA49ZyJnh/BP0BNqe8VXVvPHmadmqdM+4lC7hLQ=="; + url = "https://registry.npmjs.org/metals-languageclient/-/metals-languageclient-0.2.1.tgz"; + sha512 = "8iVF+wKKZVN7r1/9JSv4QCJO2lRyqQvxs6+kmTviKVj/pYsH0qBR8vo7ne+7MkKrvyz8lnZCX29siv6sOWf3Qw=="; }; }; "metalsmith-2.3.0" = { @@ -28846,6 +28783,15 @@ let sha512 = "+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ=="; }; }; + "mime-db-1.44.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.44.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz"; + sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="; + }; + }; "mime-types-2.0.14" = { name = "mime-types"; packageName = "mime-types"; @@ -29179,13 +29125,13 @@ let sha1 = "f98ee7b5fffd3f4dadc5733827db0aa57f861880"; }; }; - "mirror-folder-3.0.0" = { + "mirror-folder-3.0.1" = { name = "mirror-folder"; packageName = "mirror-folder"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-3.0.0.tgz"; - sha512 = "fh6wDXcSpFoKY7ZPHnEv1+xjLOS7tlkEpTvl4Y6ZsT0HNjIaYg6ktq9ng8MPthFruunS8D/3GnPeaWhoQD3X9g=="; + url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-3.0.1.tgz"; + sha512 = "AWYvbeZbHljMuu+49wgCdLGVOekNh/vpIsIMkFZYcRAJCY9vH7+vHM/aEIY3mrbbrBkHyBDnbmoOWUTbHN4A8g=="; }; }; "mississippi-3.0.0" = { @@ -29260,6 +29206,15 @@ let sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; }; + "mkdirp-1.0.3" = { + name = "mkdirp"; + packageName = "mkdirp"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.3.tgz"; + sha512 = "6uCP4Qc0sWsgMLy1EOqqS/3rjDHOEnsStVr/4vtAIK2Y5i2kA7lFFejYrpIyiN9w0pYf4ckeCYT9f1r1P9KX5g=="; + }; + }; "mkdirp-1.0.4" = { name = "mkdirp"; packageName = "mkdirp"; @@ -29935,13 +29890,13 @@ let sha512 = "TghvYc72wlMGMVMluVo9WRJc0mB8KxxF/gZ4YYFy7V2ZQX9l7rgbPg7vjS9mt6U5HXODVFVI2bOduCzwOMv/lw=="; }; }; - "nan-2.14.0" = { + "nan-2.14.1" = { name = "nan"; packageName = "nan"; - version = "2.14.0"; + version = "2.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz"; - sha512 = "INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="; + url = "https://registry.npmjs.org/nan/-/nan-2.14.1.tgz"; + sha512 = "isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw=="; }; }; "nan-2.3.5" = { @@ -30263,13 +30218,13 @@ let sha1 = "06f58360c4c3b955bd467ddc85ae4511a3907a4c"; }; }; - "neat-input-1.11.0" = { + "neat-input-1.11.1" = { name = "neat-input"; packageName = "neat-input"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/neat-input/-/neat-input-1.11.0.tgz"; - sha512 = "B7VCdE3tMC8RnKGGHatjwcR0TsHB7SiDHmYXyZ7m9YzQRdOAOF9oSwWO/WP4DLqdCma22EXWuxzEGFD80JjBeA=="; + url = "https://registry.npmjs.org/neat-input/-/neat-input-1.11.1.tgz"; + sha512 = "fWo4KrgeLB2TPQ4d8BF1DexvOJYvYuj0IGtSL4Ri3UuT59lJnYiu90xMCMfciySXLVHdWhXq/10A/I/pBynh0g=="; }; }; "neat-log-2.4.0" = { @@ -30561,13 +30516,13 @@ let sha512 = "iEOqDAOFl6uN5jZGRj39Jdo8qALzf2HPXtpFso8+BMaDylDrUMYMwhFbfYGgxdnMlsRnxYTwv68kaXEpsHIapg=="; }; }; - "node-abi-2.15.0" = { + "node-abi-2.16.0" = { name = "node-abi"; packageName = "node-abi"; - version = "2.15.0"; + version = "2.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-2.15.0.tgz"; - sha512 = "FeLpTS0F39U7hHZU1srAK4Vx+5AHNVOTP+hxBNQknR/54laTHSFIJkDWDqiquY1LeLUgTfPN7sLPhMubx0PLAg=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-2.16.0.tgz"; + sha512 = "+sa0XNlWDA6T+bDLmkCUYn6W5k5W6BPRL6mqzSCs6H/xUgtl4D5x2fORKDzopKiU6wsyn/+wXlRXwXeSp+mtoA=="; }; }; "node-addon-api-1.7.1" = { @@ -31657,7 +31612,7 @@ let version = "0.9.15"; src = fetchurl { name = "oauth-0.9.15.tar.gz"; - url = "https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master"; + url = https://codeload.github.com/ciaranj/node-oauth/legacy.tar.gz/master; sha256 = "9341c28772841acde618c778e85e381976f425824b816100792f697e68aec947"; }; }; @@ -32192,15 +32147,6 @@ let sha1 = "707375e59ab9f73025899727679b20328171c9aa"; }; }; - "opentracing-0.13.0" = { - name = "opentracing"; - packageName = "opentracing"; - version = "0.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/opentracing/-/opentracing-0.13.0.tgz"; - sha1 = "6a341442f09d7d866bc11ed03de1e3828e3d6aab"; - }; - }; "opentracing-0.14.4" = { name = "opentracing"; packageName = "opentracing"; @@ -32372,6 +32318,15 @@ let sha512 = "fnDebVFyz309A73cqCipVL1fBZewq4vwgSHfxh43vVy31mbyoQ8sCH3Oeaog/owYOs/lLlGVPCISQonTneg6Pg=="; }; }; + "ora-4.0.4" = { + name = "ora"; + packageName = "ora"; + version = "4.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ora/-/ora-4.0.4.tgz"; + sha512 = "77iGeVU1cIdRhgFzCK8aw1fbtT1B/iZAvWjS+l/o1x0RShMgxHUZaD2yDpWsNCPwXg9z1ZA78Kbdvr8kBmG/Ww=="; + }; + }; "orchestrator-0.3.8" = { name = "orchestrator"; packageName = "orchestrator"; @@ -32462,13 +32417,13 @@ let sha512 = "Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q=="; }; }; - "os-locale-4.0.0" = { + "os-locale-5.0.0" = { name = "os-locale"; packageName = "os-locale"; - version = "4.0.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/os-locale/-/os-locale-4.0.0.tgz"; - sha512 = "HsSR1+2l6as4Wp2SGZxqLnuFHxVvh1Ir9pvZxyujsC13egZVe7P0YeBLN0ijQzM/twrO5To3ia3jzBXAvpMTEA=="; + url = "https://registry.npmjs.org/os-locale/-/os-locale-5.0.0.tgz"; + sha512 = "tqZcNEDAIZKBEPnHPlVDvKrp7NzgLi7jRmhKiUoa2NUmhl13FtkAGLUVR+ZsYvApBQdBfYm43A4tXXQ4IrYLBA=="; }; }; "os-name-3.1.0" = { @@ -34001,13 +33956,13 @@ let sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; }; }; - "pino-5.15.0" = { + "pino-6.0.0" = { name = "pino"; packageName = "pino"; - version = "5.15.0"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/pino/-/pino-5.15.0.tgz"; - sha512 = "7+FXMTA3H3sNP5+2miY2K9JKnAAW5GKuhHfNWsukFCsPprGQY3ctqpwbV74wAHW3Nl93cEEQ1G82MgOLM8P7TQ=="; + url = "https://registry.npmjs.org/pino/-/pino-6.0.0.tgz"; + sha512 = "3RfX2L76o7v230FP1fZ3Fo/WX7Su+P1Ld+pvBm2j+MyUjtA/KqDYxMkzBqzcX3R00zbC7Gf/HqIzyuu3tgvi9Q=="; }; }; "pino-std-serializers-2.4.2" = { @@ -34326,15 +34281,6 @@ let sha512 = "soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag=="; }; }; - "postcss-7.0.26" = { - name = "postcss"; - packageName = "postcss"; - version = "7.0.26"; - src = fetchurl { - url = "https://registry.npmjs.org/postcss/-/postcss-7.0.26.tgz"; - sha512 = "IY4oRjpXWYshuTDFxMVkJDtWIk2LhsTlu8bZnbEJA4+bYT16Lvpo8Qv6EvDumhYRgzjZl489pmsY3qVgJQ08nA=="; - }; - }; "postcss-7.0.27" = { name = "postcss"; packageName = "postcss"; @@ -34839,13 +34785,13 @@ let sha512 = "C2hrAPzmRdpuL3iH0TDdQ6XCc9M7Dcc3zEW5BLerY65G4tWWszwv6nG/ksi6ul5i2mx22ubdljgktXCtNkydkw=="; }; }; - "posthtml-0.12.2" = { + "posthtml-0.12.3" = { name = "posthtml"; packageName = "posthtml"; - version = "0.12.2"; + version = "0.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/posthtml/-/posthtml-0.12.2.tgz"; - sha512 = "vDMikGrmr2Ce4ralyBwfoTymA9Ycv2QSeaV+U9CdF/kHstsGSBVsTZ3Jt/BdACFuqCNyaICMdJI/rvGEreL7pA=="; + url = "https://registry.npmjs.org/posthtml/-/posthtml-0.12.3.tgz"; + sha512 = "Fbpi95+JJyR0tqU7pUy1zTSQFjAsluuwB9pJ1h0jtnGk7n/O2TBtP5nDl9rV0JVACjQ1Lm5wSp4ppChr8u3MhA=="; }; }; "posthtml-parser-0.4.2" = { @@ -34938,13 +34884,13 @@ let sha512 = "s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew=="; }; }; - "prettier-2.0.4" = { + "prettier-2.0.5" = { name = "prettier"; packageName = "prettier"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.0.4.tgz"; - sha512 = "SVJIQ51spzFDvh4fIbCLvciiDMCrRhlN3mbZvv/+ycjvmF5E73bKdGfU8QDLNmjYJf+lsGnDBC4UUnvTe5OO0w=="; + url = "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz"; + sha512 = "7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg=="; }; }; "prettier-bytes-1.0.4" = { @@ -35424,13 +35370,13 @@ let sha1 = "bc826e34c3af4697e8d0af7a669e4d612aedcd17"; }; }; - "protobufjs-6.8.9" = { + "protobufjs-6.9.0" = { name = "protobufjs"; packageName = "protobufjs"; - version = "6.8.9"; + version = "6.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/protobufjs/-/protobufjs-6.8.9.tgz"; - sha512 = "j2JlRdUeL/f4Z6x4aU4gj9I2LECglC+5qR2TrWb193Tla1qfdaNQTZ8I27Pt7K0Ajmvjjpft7O3KWTGciz4gpw=="; + url = "https://registry.npmjs.org/protobufjs/-/protobufjs-6.9.0.tgz"; + sha512 = "LlGVfEWDXoI/STstRDdZZKb/qusoAWUnmLg9R8OLSO473mBLWHowx8clbX5/+mKDEI+v7GzjoK9tRPZMMcoTrg=="; }; }; "protochain-1.0.5" = { @@ -36567,13 +36513,13 @@ let sha512 = "F9wwNePtXrzZenAB3ax0Y8TSKGvuB7Qw16J30hspEUTbfUM+H827XyN3rlpwhVmtm5wuZtbKIHjOnwDn7MUxWQ=="; }; }; - "quick-format-unescaped-3.0.3" = { + "quick-format-unescaped-4.0.1" = { name = "quick-format-unescaped"; packageName = "quick-format-unescaped"; - version = "3.0.3"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-3.0.3.tgz"; - sha512 = "dy1yjycmn9blucmJLXOfZDx1ikZJUi6E8bBZLnhPG5gBrVhHXx2xVyqqgKBubVNEXmx51dBACMHpoMQK/N/AXQ=="; + url = "https://registry.npmjs.org/quick-format-unescaped/-/quick-format-unescaped-4.0.1.tgz"; + sha512 = "RyYpQ6Q5/drsJyOhrWHYMWTedvjTIat+FTwv0K4yoUxzvekw2aRHMQJLlnvt8UantkZg2++bEzD9EdxXqkWf4A=="; }; }; "quick-lru-1.1.0" = { @@ -37260,6 +37206,15 @@ let sha512 = "XNvYvkfdAN9QewbrxeTOjgINkdY/odTgTS56ZNEWL9Ml0weT4T3sFtvnTuF+Gxyu46ANcRm1ntrF6F5LAJPAaQ=="; }; }; + "recast-0.19.0" = { + name = "recast"; + packageName = "recast"; + version = "0.19.0"; + src = fetchurl { + url = "https://registry.npmjs.org/recast/-/recast-0.19.0.tgz"; + sha512 = "HymYANYaUFpKoAkOZ2od16SB7A/BwCZbvYIs9Rc8K+wNThQctiCJ0AjLkPbo9eWdy3w5Eemk6I4MeEYbH12PBg=="; + }; + }; "rechoir-0.6.2" = { name = "rechoir"; packageName = "rechoir"; @@ -37386,15 +37341,6 @@ let sha512 = "F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA=="; }; }; - "regenerator-runtime-0.10.5" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.10.5"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz"; - sha1 = "336c3efc1220adcedda2c9fab67b5a7955a33658"; - }; - }; "regenerator-runtime-0.11.1" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; @@ -37404,15 +37350,6 @@ let sha512 = "MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="; }; }; - "regenerator-runtime-0.13.3" = { - name = "regenerator-runtime"; - packageName = "regenerator-runtime"; - version = "0.13.3"; - src = fetchurl { - url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz"; - sha512 = "naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw=="; - }; - }; "regenerator-runtime-0.13.5" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; @@ -38088,13 +38025,13 @@ let sha512 = "84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w=="; }; }; - "resolve-1.16.0" = { + "resolve-1.17.0" = { name = "resolve"; packageName = "resolve"; - version = "1.16.0"; + version = "1.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.16.0.tgz"; - sha512 = "LarL/PIKJvc09k1jaeT4kQb/8/7P+qV4qSnN2K80AES+OHdfZELAKVOBjxsvtToT/uLOfFbvYvKfZmV8cee7nA=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz"; + sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w=="; }; }; "resolve-1.7.1" = { @@ -38583,13 +38520,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.6.1" = { + "rollup-2.7.2" = { name = "rollup"; packageName = "rollup"; - version = "2.6.1"; + version = "2.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.6.1.tgz"; - sha512 = "1RhFDRJeg027YjBO6+JxmVWkEZY0ASztHhoEUEWxOwkh4mjO58TFD6Uo7T7Y3FbmDpRTfKhM5NVxJyimCn0Elg=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.7.2.tgz"; + sha512 = "SdtTZVMMVSPe7SNv4exUyPXARe5v/p3TeeG3LRA5WabLPJt4Usi3wVrvVlyAUTG40JJmqS6zbIHt2vWTss2prw=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -39006,13 +38943,13 @@ let sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; }; - "sass-formatter-0.4.4" = { + "sass-formatter-0.4.5" = { name = "sass-formatter"; packageName = "sass-formatter"; - version = "0.4.4"; + version = "0.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/sass-formatter/-/sass-formatter-0.4.4.tgz"; - sha512 = "pI/2olF5F3AMkAXbn71nJK7yAsWfRYLlyp7Suhiy4hzuNga05XaUzLO74lplCpvS8GVeUdFgef+8lU5+cHr60g=="; + url = "https://registry.npmjs.org/sass-formatter/-/sass-formatter-0.4.5.tgz"; + sha512 = "hBDkbtTE020JwUaGKo5q+ELNXXji1kyajVMt3YLRYD1PAwUQYR5aAdfAUAcb88AmYgJpQRQrsqZj+YGmUCdgCw=="; }; }; "sass-lookup-3.0.0" = { @@ -39087,13 +39024,13 @@ let sha512 = "i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g=="; }; }; - "schema-utils-2.6.5" = { + "schema-utils-2.6.6" = { name = "schema-utils"; packageName = "schema-utils"; - version = "2.6.5"; + version = "2.6.6"; src = fetchurl { - url = "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.5.tgz"; - sha512 = "5KXuwKziQrTVHh8j/Uxz+QUbxkaLW9X/86NBlx/gnKgtsZA2GIVMUn17qWhRFwF8jdYb3Dig5hRO/W5mZqy6SQ=="; + url = "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.6.tgz"; + sha512 = "wHutF/WPSbIi9x6ctjGGk2Hvl0VOz5l3EKEuKbjPlB30mKZUzb9A5k9yEXRX3pwyqVLPvpfZZEllaFq/M718hA=="; }; }; "scoped-regex-1.0.0" = { @@ -39330,15 +39267,6 @@ let sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="; }; }; - "semver-7.1.1" = { - name = "semver"; - packageName = "semver"; - version = "7.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.1.1.tgz"; - sha512 = "WfuG+fl6eh3eZ2qAf6goB7nhiCd7NPXhmyFxigB/TOkQyeLP8w8GsVehvtGNtnNmyboz4TgeK40B1Kbql/8c5A=="; - }; - }; "semver-7.1.3" = { name = "semver"; packageName = "semver"; @@ -39987,13 +39915,13 @@ let sha1 = "4e421f485ac7b13b08077a4476934d52c5ba3bb3"; }; }; - "simple-peer-9.6.2" = { + "simple-peer-9.7.0" = { name = "simple-peer"; packageName = "simple-peer"; - version = "9.6.2"; + version = "9.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.6.2.tgz"; - sha512 = "EOKoImCaqtNvXIntxT1CBBK/3pVi7tMAoJ3shdyd9qk3zLm3QPiRLb/sPC1G2xvKJkJc5fkQjCXqRZ0AknwTig=="; + url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.7.0.tgz"; + sha512 = "lZL/H/Znx7kai1kTrbxntVfbstGTnPF+w+hvnq2euBXoBg8m32mgEOpPmH9hS7ZOx0CMXcpgth/nNjZKp7aeow=="; }; }; "simple-sha1-2.1.2" = { @@ -40329,6 +40257,15 @@ let sha512 = "9NjxHVMd1U1LFw66Lya4LXgrsFUiuRiL4opxfTFo0LmMNzUoU5Bk/p0zDdg3FE5Wg61r4fP2D8w+QTl6M8CGiw=="; }; }; + "snyk-config-3.0.0" = { + name = "snyk-config"; + packageName = "snyk-config"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-config/-/snyk-config-3.0.0.tgz"; + sha512 = "sXjd7gUqPTmgkhtLowFkFU5J4xyS7tDIRUbHmpW/dvTjgmiH0ujobJzSdaim4W6pbiIf4snkGJsvHM3/wmdR5w=="; + }; + }; "snyk-docker-plugin-2.6.1" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; @@ -40374,22 +40311,22 @@ let sha512 = "A+CCyBSa4IKok5uEhqT+hV/35RO6APFNLqk9DRRHg7xW2/j//nPX8wTSZUPF8QeRNEk/sX+6df7M1y6PBHGSHA=="; }; }; - "snyk-mvn-plugin-2.9.0" = { + "snyk-mvn-plugin-2.10.0" = { name = "snyk-mvn-plugin"; packageName = "snyk-mvn-plugin"; - version = "2.9.0"; + version = "2.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.9.0.tgz"; - sha512 = "FBl78wCHNm0P/QOlipvOxzN2LrXlS6NBN0zXWYZ09P0hG65rmA3gKTg0QsHUjIBh1Pg9bw5aG4r/AHle6a6g6w=="; + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.10.0.tgz"; + sha512 = "npslocHJXUbdFxehMPQ8w4oX6bB6J6vHTWNRDF7u2+pIhVumQe1QOvZGjwh3up+vOCoKiEprO7gdt7vC8im1Vg=="; }; }; - "snyk-nodejs-lockfile-parser-1.17.0" = { + "snyk-nodejs-lockfile-parser-1.18.0" = { name = "snyk-nodejs-lockfile-parser"; packageName = "snyk-nodejs-lockfile-parser"; - version = "1.17.0"; + version = "1.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.17.0.tgz"; - sha512 = "i4GAYFj9TJLOQ8F+FbIJuJWdGymi8w/XcrEX0FzXk7DpYUCY3mWibyKhw8RasfYBx5vLwUzEvRMaQuc2EwlyfA=="; + url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.18.0.tgz"; + sha512 = "QGb6HBtnqefbVtrDyUqA3vXGo2DZJAlDxrsgIpKxFalhxmxmWQE3Fxx44V3aRq9H8iZ1eXb7s/drTsa/s9qGJQ=="; }; }; "snyk-nuget-plugin-1.16.0" = { @@ -40743,13 +40680,13 @@ let sha512 = "csdVyakzHJRyCevY4aZC2Eacda8paf+4nmRGF2N7KxCLKY2Ajn72JsExaQlJQ2BiXJncp44p3T+b80cU+2TTsg=="; }; }; - "sonic-boom-0.7.7" = { + "sonic-boom-1.0.1" = { name = "sonic-boom"; packageName = "sonic-boom"; - version = "0.7.7"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-0.7.7.tgz"; - sha512 = "Ei5YOo5J64GKClHIL/5evJPgASXFVpfVYbJV9PILZQytTK6/LCwHvsZJW2Ig4p9FMC2OrBrMnXKgRN/OEoAWfg=="; + url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-1.0.1.tgz"; + sha512 = "o9tx+bonVEXSaPtptyXQXpP8l6UV9Bi3im2geZskvWw2a/o/hrbWI7EBbbv+rOx6Hubnzun9GgH4WfbgEA3MFQ=="; }; }; "sorcery-0.10.0" = { @@ -40914,6 +40851,15 @@ let sha512 = "efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ=="; }; }; + "source-map-support-0.5.18" = { + name = "source-map-support"; + packageName = "source-map-support"; + version = "0.5.18"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.18.tgz"; + sha512 = "9luZr/BZ2QeU6tO2uG8N2aZpVSli4TSAOAqFOyTO51AJcD9P99c0K1h6dD6r6qo5dyT44BR5exweOaLLeldTkQ=="; + }; + }; "source-map-url-0.4.0" = { name = "source-map-url"; packageName = "source-map-url"; @@ -41022,13 +40968,13 @@ let sha512 = "lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q=="; }; }; - "spdx-exceptions-2.2.0" = { + "spdx-exceptions-2.3.0" = { name = "spdx-exceptions"; packageName = "spdx-exceptions"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz"; - sha512 = "2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA=="; + url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; + sha512 = "/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A=="; }; }; "spdx-expression-parse-3.0.0" = { @@ -42075,13 +42021,13 @@ let sha512 = "3QC47Mhv3/aZNFpDDVO44qQb9gwB9QggMEE0sQmkTAwBVYdBRWISdsywlkfm5II1Q5y/pmrHflti/IgmIzdDBg=="; }; }; - "streamroller-2.2.3" = { + "streamroller-2.2.4" = { name = "streamroller"; packageName = "streamroller"; - version = "2.2.3"; + version = "2.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/streamroller/-/streamroller-2.2.3.tgz"; - sha512 = "AegmvQsscTRhHVO46PhCDerjIpxi7E+d2GxgUDu+nzw/HuLnUdxHWr6WQ+mVn/4iJgMKKFFdiUwFcFRDvcjCtw=="; + url = "https://registry.npmjs.org/streamroller/-/streamroller-2.2.4.tgz"; + sha512 = "OG79qm3AujAM9ImoqgWEY1xG4HX+Lw+yY6qZj9R1K2mhF5bEmQ849wvrb+4vt4jLMLzwXttJlQbOdPOQVRv7DQ=="; }; }; "streamsearch-0.1.2" = { @@ -42822,13 +42768,13 @@ let sha512 = "XiyPqLdiHJ3CMphADCJg/JVQYcj3JfO8NomlLubSdGYgppfzE+g/7Fyusza/Kr7lC919BdwbfIqFxK8VO7+l4w=="; }; }; - "suf-regex-0.0.14" = { + "suf-regex-0.0.17" = { name = "suf-regex"; packageName = "suf-regex"; - version = "0.0.14"; + version = "0.0.17"; src = fetchurl { - url = "https://registry.npmjs.org/suf-regex/-/suf-regex-0.0.14.tgz"; - sha512 = "+WE5PZTfD6lVNCNsyBInJIAbok8LpqgOhvCbSViZeQ/JTxdxq7Lw+tSJXGM+jrIp81jj9GCMYvkl00JAkn2CtA=="; + url = "https://registry.npmjs.org/suf-regex/-/suf-regex-0.0.17.tgz"; + sha512 = "/TIMx0G1iXCGHm5XbqHTV86tkdETO7OUOB8UAWHc04M2mMQnWAIZeO6M9GuSibRVM8ewRcHAV3fOFY2z1XtWaQ=="; }; }; "sugarss-1.0.1" = { @@ -43209,13 +43155,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-4.23.3" = { + "systeminformation-4.23.5" = { name = "systeminformation"; packageName = "systeminformation"; - version = "4.23.3"; + version = "4.23.5"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.23.3.tgz"; - sha512 = "TIGmv7O1vVw00ldkj8ckHJr667l/lbLxvYB5IrJZ7pxzKXt7RmCduvzHbFM6k2Owif/dGd7oEmRkaQJEH9ewng=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.23.5.tgz"; + sha512 = "Zxd1wxN8KigQsDhZupVNAyHnkl+ombejuLpNhJ+LNezMxTLn7nBx9HNAIWUJnhAnSS0ZElQLQ1muqgnwbhgOHg=="; }; }; "syswide-cas-5.3.0" = { @@ -43552,6 +43498,15 @@ let sha1 = "0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"; }; }; + "temp-dir-2.0.0" = { + name = "temp-dir"; + packageName = "temp-dir"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz"; + sha512 = "aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg=="; + }; + }; "temp-write-3.4.0" = { name = "temp-write"; packageName = "temp-write"; @@ -44749,13 +44704,13 @@ let sha512 = "uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA=="; }; }; - "ts-node-8.8.2" = { + "ts-node-8.9.0" = { name = "ts-node"; packageName = "ts-node"; - version = "8.8.2"; + version = "8.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/ts-node/-/ts-node-8.8.2.tgz"; - sha512 = "duVj6BpSpUpD/oM4MfhO98ozgkp3Gt9qIp3jGxwU2DFvl/3IRaEAvbLa8G60uS7C77457e/m5TMowjedeRxI1Q=="; + url = "https://registry.npmjs.org/ts-node/-/ts-node-8.9.0.tgz"; + sha512 = "rwkXfOs9zmoHrV8xE++dmNd6ZIS+nmHHCxcV53ekGJrxFLMbp+pizpPS07ARvhwneCIECPppOwbZHvw9sQtU4w=="; }; }; "ts-process-promises-1.0.2" = { @@ -44767,6 +44722,15 @@ let sha512 = "6qWWz2HdFbD2uAfgS5t65Dd6HQKYjfra+YXQzKzxIG+RKTpoeDi+x+TW85SEF3cWUI2UecrOXJobvD+04MiTZg=="; }; }; + "tslib-1.11.0" = { + name = "tslib"; + packageName = "tslib"; + version = "1.11.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tslib/-/tslib-1.11.0.tgz"; + sha512 = "BmndXUtiTn/VDDrJzQE7Mm22Ix3PxgLltW9bSNLoeCY31gnG2OPx0QqJnuc9oMIKioYrz487i6K9o4Pdn0j+Kg=="; + }; + }; "tslib-1.11.1" = { name = "tslib"; packageName = "tslib"; @@ -45379,13 +45343,13 @@ let sha512 = "4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow=="; }; }; - "unbzip2-stream-1.4.1" = { + "unbzip2-stream-1.4.2" = { name = "unbzip2-stream"; packageName = "unbzip2-stream"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.1.tgz"; - sha512 = "sgDYfSDPMsA4Hr2/w7vOlrJBlwzmyakk1+hW8ObLvxSp0LA36LcL2XItGvOT3OSblohSdevMuT8FQjLsqyy4sA=="; + url = "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.2.tgz"; + sha512 = "pZMVAofMrrHX6Ik39hCk470kulCbmZ2SWfQLPmTWqfJV/oUm0gn1CblvHdUu4+54Je6Jq34x8kY6XjTy6dMkOg=="; }; }; "unc-path-regex-0.1.2" = { @@ -46486,15 +46450,6 @@ let sha1 = "3c2236476c4d32c5ff3c47002add7c13b9a82a53"; }; }; - "util.promisify-1.0.0" = { - name = "util.promisify"; - packageName = "util.promisify"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz"; - sha512 = "i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA=="; - }; - }; "util.promisify-1.0.1" = { name = "util.promisify"; packageName = "util.promisify"; @@ -47332,6 +47287,15 @@ let sha512 = "JvONPptw3GAQGXlVV2utDcHx0BiY34FupW/kI6mZ5x06ER5DdPG/tXWMVHjTNULF5uKPOUUD0SaXg5QaubJL0A=="; }; }; + "vscode-jsonrpc-5.1.0-next.1" = { + name = "vscode-jsonrpc"; + packageName = "vscode-jsonrpc"; + version = "5.1.0-next.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.1.0-next.1.tgz"; + sha512 = "mwLDojZkbmpizSJSmp690oa9FB9jig18SIDGZeBCvFc2/LYSRvMm/WwWtMBJuJ1MfFh7rZXfQige4Uje5Z9NzA=="; + }; + }; "vscode-languageclient-4.0.1" = { name = "vscode-languageclient"; packageName = "vscode-languageclient"; @@ -47341,13 +47305,13 @@ let sha512 = "0fuBZj9pMkeJ8OMyIvSGeRaRVhUaJt+yeFxi7a3sz/AbrngQdcxOovMXPgKuieoBSBKS05gXPS88BsWpJZfBkA=="; }; }; - "vscode-languageclient-6.1.3" = { + "vscode-languageclient-7.0.0-next.1" = { name = "vscode-languageclient"; packageName = "vscode-languageclient"; - version = "6.1.3"; + version = "7.0.0-next.1"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-6.1.3.tgz"; - sha512 = "YciJxk08iU5LmWu7j5dUt9/1OLjokKET6rME3cI4BRpiF6HZlusm2ZwPt0MYJ0lV5y43sZsQHhyon2xBg4ZJVA=="; + url = "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0-next.1.tgz"; + sha512 = "JrjCUhLpQZxQ5VpWpilOHDMhVsn0fdN5jBh1uFNhSr5c2loJvRdr9Km2EuSQOFfOQsBKx0+xvY8PbsypNEcJ6w=="; }; }; "vscode-languageserver-4.0.0" = { @@ -47413,6 +47377,15 @@ let sha512 = "zrMuwHOAQRhjDSnflWdJG+O2ztMWss8GqUUB8dXLR/FPenwkiBNkMIJJYfSN6sgskvsF0rHAoBowNQfbyZnnvw=="; }; }; + "vscode-languageserver-protocol-3.16.0-next.2" = { + name = "vscode-languageserver-protocol"; + packageName = "vscode-languageserver-protocol"; + version = "3.16.0-next.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.2.tgz"; + sha512 = "atmkGT/W6tF0cx4SaWFYtFs2UeSeC28RPiap9myv2YZTaTCFvTBEPNWrU5QRKfkyM0tbgtGo6T3UCQ8tkDpjzA=="; + }; + }; "vscode-languageserver-protocol-3.6.0" = { name = "vscode-languageserver-protocol"; packageName = "vscode-languageserver-protocol"; @@ -47458,6 +47431,15 @@ let sha512 = "+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ=="; }; }; + "vscode-languageserver-types-3.16.0-next.1" = { + name = "vscode-languageserver-types"; + packageName = "vscode-languageserver-types"; + version = "3.16.0-next.1"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.1.tgz"; + sha512 = "tZFUSbyjUcrh+qQf13ALX4QDdOfDX0cVaBFgy7ktJ0VwS7AW/yRKgGPSxVqqP9OCMNPdqP57O5q47w2pEwfaUg=="; + }; + }; "vscode-languageserver-types-3.6.0" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; @@ -47701,15 +47683,6 @@ let sha1 = "340a717bde765726fa0aa07d721e0147a551df0c"; }; }; - "watchpack-1.6.0" = { - name = "watchpack"; - packageName = "watchpack"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz"; - sha512 = "i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA=="; - }; - }; "watchpack-1.6.1" = { name = "watchpack"; packageName = "watchpack"; @@ -47809,13 +47782,13 @@ let sha512 = "VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA=="; }; }; - "webpack-4.42.1" = { + "webpack-4.43.0" = { name = "webpack"; packageName = "webpack"; - version = "4.42.1"; + version = "4.43.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.42.1.tgz"; - sha512 = "SGfYMigqEfdGchGhFFJ9KyRpQKnipvEvjc1TwrXEPCM6H5Wywu10ka8o3KGrMzSMxMQKt8aCHUFh5DaQ9UmyRg=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.43.0.tgz"; + sha512 = "GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g=="; }; }; "webpack-cli-3.3.11" = { @@ -48556,15 +48529,6 @@ let sha512 = "GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA=="; }; }; - "ws-7.2.1" = { - name = "ws"; - packageName = "ws"; - version = "7.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.2.1.tgz"; - sha512 = "sucePNSafamSKoOqoNfBd8V0StlkzJKL2ZAhGQinCfNQ+oacw+Pk7lcdAElecBF2VkLNZRiIb5Oi1Q5lVUVt2A=="; - }; - }; "ws-7.2.3" = { name = "ws"; packageName = "ws"; @@ -48868,7 +48832,7 @@ let version = "1.5.0"; src = fetchurl { name = "xmlhttprequest-1.5.0.tar.gz"; - url = "https://codeload.github.com/LearnBoost/node-XMLHttpRequest/tar.gz/0f36d0b5ebc03d85f860d42a64ae9791e1daa433"; + url = https://codeload.github.com/LearnBoost/node-XMLHttpRequest/tar.gz/0f36d0b5ebc03d85f860d42a64ae9791e1daa433; sha256 = "28dd0394d85befe8be4e9cd9f6803102780c62cbb09298cb174b52ff9777624f"; }; }; @@ -49421,22 +49385,22 @@ let sha512 = "CP0fwGk5Y+jel+A0AQbyqnIFZRRpkKOeYUibiTSmlgV9PcgNFFVwn86VcUIpDLOqVjF+9v+O9FWQMo+IUcV2mA=="; }; }; - "yeoman-environment-2.9.1" = { + "yeoman-environment-2.9.5" = { name = "yeoman-environment"; packageName = "yeoman-environment"; - version = "2.9.1"; + version = "2.9.5"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.9.1.tgz"; - sha512 = "m9sotsBPqOrV2aqaCM68pbY0HfLzeYuWnEAsJblfGSuMiIy+xie1S1j9qboOlHyGe9Wyvg8AQx3xSwrQvIvb0A=="; + url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.9.5.tgz"; + sha512 = "ntxV8VTZbP8QFuJZGT7vG8AsKeyGz8lXlfq2V2T5sl6SrU6UAEVgRreEGz9t+JbFGx1CSM/Ly2atG/avGuheyQ=="; }; }; - "yeoman-generator-4.8.2" = { + "yeoman-generator-4.8.3" = { name = "yeoman-generator"; packageName = "yeoman-generator"; - version = "4.8.2"; + version = "4.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-4.8.2.tgz"; - sha512 = "4kJAf2u5mee8yO7Ph6e64KLHeC7sCSYPCP7YcCUjussBFzoMEqJ2+Dn2Yj41rBLArSBBmZOQ/e2bMYlh6qQ9ag=="; + url = "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-4.8.3.tgz"; + sha512 = "yDPHBhfglqiyYlqBnaAmcE/wPznwSx11HCGVCpnnsqpnp45HmdsuBtiFSNDcygiFmz1HmkFWRLWHTai/b+9eiQ=="; }; }; "yn-3.1.1" = { @@ -49562,17 +49526,17 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "9.1.1"; + version = "9.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-9.1.1.tgz"; - sha512 = "sjRAV4UF8M5v+2gw+EwCYSgciBZDc05AbNxQt+uUdxdfR1QU9hifWq8WDxfOR6jdDP5YqMtQsNaFNwrUyjJJoQ=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-9.1.3.tgz"; + sha512 = "/7yHOuiyMgpcoBuADPrF4Eo9VDysA57fsyrMlOH2WZmKdsjW032StS9EIOue5RNQ7y0DwrtgtnkjbpZ6nYo3Pw=="; }; dependencies = [ - sources."@angular-devkit/architect-0.901.1" - sources."@angular-devkit/core-9.1.1" - sources."@angular-devkit/schematics-9.1.1" - sources."@schematics/angular-9.1.1" - sources."@schematics/update-0.901.1" + sources."@angular-devkit/architect-0.901.3" + sources."@angular-devkit/core-9.1.3" + sources."@angular-devkit/schematics-9.1.3" + sources."@schematics/angular-9.1.3" + sources."@schematics/update-0.901.3" sources."@types/color-name-1.1.1" sources."@yarnpkg/lockfile-1.1.0" sources."JSONStream-1.3.5" @@ -49810,7 +49774,7 @@ in sources."uuid-3.4.0" ]; }) - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."restore-cursor-3.1.0" sources."retry-0.10.1" sources."rimraf-3.0.2" @@ -49836,7 +49800,7 @@ in sources."source-map-0.7.3" sources."sourcemap-codec-1.4.8" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."sshpk-1.16.1" @@ -49891,7 +49855,7 @@ in buildInputs = globalBuildInputs; meta = { description = "CLI tool for Angular"; - homepage = "https://github.com/angular/angular-cli"; + homepage = https://github.com/angular/angular-cli; license = "MIT"; }; production = true; @@ -49901,18 +49865,18 @@ in "@antora/cli" = nodeEnv.buildNodePackage { name = "_at_antora_slash_cli"; packageName = "@antora/cli"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/cli/-/cli-2.2.0.tgz"; - sha512 = "/fQDYEMypZbC8LxpZak/3nsP8Rr3voXXvxSan/718uDJUHFwq1rHl9Y/pOoE/tRs0Qv1jtDvk2eZgFDlsMMmlQ=="; + url = "https://registry.npmjs.org/@antora/cli/-/cli-2.3.0.tgz"; + sha512 = "YiAP7Ib4zhAE+owOKg1/cJ+1AQX4BGfvaMnGkHaSf6srutoLLCRIbD0InpSNobf+ouSMqqk6fiLmBVt/cu03og=="; }; dependencies = [ - sources."@antora/playbook-builder-2.2.0" - sources."@iarna/toml-2.2.3" + sources."@antora/playbook-builder-2.3.0" + sources."@iarna/toml-2.2.5" sources."argparse-1.0.10" sources."camelcase-5.3.1" - sources."camelcase-keys-6.1.2" - sources."commander-3.0.2" + sources."camelcase-keys-6.2.2" + sources."commander-5.0.0" (sources."convict-5.2.0" // { dependencies = [ sources."json5-2.1.0" @@ -49935,7 +49899,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The command line interface for Antora."; - homepage = "https://antora.org/"; + homepage = https://antora.org/; license = "MPL-2.0"; }; production = true; @@ -49945,25 +49909,25 @@ in "@antora/site-generator-default" = nodeEnv.buildNodePackage { name = "_at_antora_slash_site-generator-default"; packageName = "@antora/site-generator-default"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/site-generator-default/-/site-generator-default-2.2.0.tgz"; - sha512 = "fy2tG1I3/FK1s/y/GhGMkFICtXkkSOpxVy5OjBXXfkBNHQIHYSLDv460Gz8NvSiVe99LWWa+FOpr5G13Bb0bvw=="; + url = "https://registry.npmjs.org/@antora/site-generator-default/-/site-generator-default-2.3.0.tgz"; + sha512 = "swDQeAEnC/ClmhHJ50UNJppUSAneOp2cHwZiRr3zUQ9+5+mvOrDEdHbyxH7mIwkoeiIcQ/UVw00bg4MwmQ0M0g=="; }; dependencies = [ - sources."@antora/asciidoc-loader-2.2.0" - sources."@antora/content-aggregator-2.2.0" - sources."@antora/content-classifier-2.2.0" - sources."@antora/document-converter-2.2.0" + sources."@antora/asciidoc-loader-2.3.0" + sources."@antora/content-aggregator-2.3.0" + sources."@antora/content-classifier-2.3.0" + sources."@antora/document-converter-2.3.0" sources."@antora/expand-path-helper-1.0.0" - sources."@antora/navigation-builder-2.2.0" - sources."@antora/page-composer-2.2.0" - sources."@antora/playbook-builder-2.2.0" - sources."@antora/redirect-producer-2.2.0" - sources."@antora/site-mapper-2.2.0" - sources."@antora/site-publisher-2.2.0" - sources."@antora/ui-loader-2.2.0" - sources."@iarna/toml-2.2.3" + sources."@antora/navigation-builder-2.3.0" + sources."@antora/page-composer-2.3.0" + sources."@antora/playbook-builder-2.3.0" + sources."@antora/redirect-producer-2.3.0" + sources."@antora/site-mapper-2.3.0" + sources."@antora/site-publisher-2.3.0" + sources."@antora/ui-loader-2.3.0" + sources."@iarna/toml-2.2.5" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."append-buffer-1.0.2" @@ -49975,6 +49939,7 @@ in sources."bl-4.0.2" sources."bops-0.0.7" sources."brace-expansion-1.1.11" + sources."braces-3.0.2" (sources."buffer-5.6.0" // { dependencies = [ sources."base64-js-1.3.1" @@ -49991,7 +49956,7 @@ in ]; }) sources."camelcase-5.3.1" - sources."camelcase-keys-6.1.2" + sources."camelcase-keys-6.2.2" sources."clean-git-ref-2.0.1" sources."clone-2.1.2" sources."clone-buffer-1.0.0" @@ -50028,7 +49993,6 @@ in sources."defer-to-connect-1.1.3" sources."define-properties-1.1.3" sources."diff3-0.0.3" - sources."duplexer-0.1.1" sources."duplexer3-0.1.4" (sources."duplexify-3.7.1" // { dependencies = [ @@ -50040,10 +50004,10 @@ in sources."end-of-stream-1.4.4" sources."escape-string-regexp-2.0.0" sources."esprima-4.0.1" - sources."event-stream-3.3.4" sources."exit-on-epipe-1.0.1" sources."extend-3.0.2" sources."fd-slicer-1.1.0" + sources."fill-range-7.0.1" (sources."flush-write-stream-1.1.1" // { dependencies = [ sources."readable-stream-2.3.7" @@ -50051,7 +50015,6 @@ in sources."string_decoder-1.1.1" ]; }) - sources."from-0.1.7" sources."fs-extra-8.1.0" (sources."fs-mkdirp-stream-1.0.0" // { dependencies = [ @@ -50088,7 +50051,7 @@ in ]; }) sources."graceful-fs-4.2.3" - (sources."gulp-vinyl-zip-2.1.3" // { + (sources."gulp-vinyl-zip-2.2.0" // { dependencies = [ sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" @@ -50096,7 +50059,7 @@ in sources."through2-2.0.5" ]; }) - sources."handlebars-4.5.3" + sources."handlebars-4.7.6" sources."has-symbols-1.0.1" sources."http-cache-semantics-4.1.0" sources."ieee754-1.1.13" @@ -50108,13 +50071,14 @@ in sources."is-extglob-2.1.1" sources."is-glob-3.1.0" sources."is-negated-glob-1.0.0" + sources."is-number-7.0.0" sources."is-relative-1.0.0" sources."is-unc-path-1.0.0" sources."is-utf8-0.2.1" sources."is-valid-glob-1.0.0" sources."is-windows-1.0.2" sources."isarray-1.0.0" - sources."isomorphic-git-0.70.4" + sources."isomorphic-git-0.78.5" sources."js-yaml-3.13.1" sources."json-buffer-3.0.0" sources."json-stable-stringify-without-jsonify-1.0.1" @@ -50129,13 +50093,11 @@ in ]; }) sources."lead-1.0.0" - sources."lodash-4.17.15" sources."lodash.clonedeep-4.5.0" sources."lowercase-keys-1.0.1" sources."map-obj-4.1.0" - sources."map-stream-0.1.0" sources."marky-1.2.1" - sources."matcher-2.0.0" + sources."matcher-2.1.0" sources."mime-db-1.43.0" sources."mime-types-2.1.26" sources."mimic-response-2.1.0" @@ -50153,11 +50115,6 @@ in sources."object.assign-4.1.0" sources."once-1.4.0" sources."opal-runtime-1.0.11" - (sources."optimist-0.6.1" // { - dependencies = [ - sources."minimist-0.0.10" - ]; - }) (sources."ordered-read-streams-1.0.1" // { dependencies = [ sources."readable-stream-2.3.7" @@ -50169,8 +50126,8 @@ in sources."pako-1.0.11" sources."path-dirname-1.0.2" sources."path-is-absolute-1.0.1" - sources."pause-stream-0.0.11" sources."pend-1.2.0" + sources."picomatch-2.2.2" sources."pify-4.0.1" sources."prepend-http-2.0.0" sources."printj-1.1.2" @@ -50207,9 +50164,7 @@ in sources."simple-concat-1.0.0" sources."simple-get-3.1.0" sources."source-map-0.6.1" - sources."split-0.3.3" sources."sprintf-js-1.0.3" - sources."stream-combiner-0.0.4" sources."stream-shift-1.0.1" sources."string_decoder-1.3.0" sources."through-2.3.8" @@ -50224,6 +50179,7 @@ in }) sources."to-absolute-glob-2.0.2" sources."to-readable-stream-1.0.0" + sources."to-regex-range-5.0.1" (sources."to-through-2.0.0" // { dependencies = [ sources."readable-stream-2.3.7" @@ -50252,7 +50208,7 @@ in ]; }) sources."vinyl-sourcemap-1.1.0" - sources."wordwrap-0.0.3" + sources."wordwrap-1.0.0" sources."wrappy-1.0.2" sources."xdg-basedir-3.0.0" sources."xmlhttprequest-1.8.0" @@ -50264,7 +50220,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The default site generator pipeline for producing and publishing static documentation sites with Antora."; - homepage = "https://antora.org/"; + homepage = https://antora.org/; license = "MPL-2.0"; }; production = true; @@ -50285,7 +50241,7 @@ in sources."acorn-globals-4.3.4" sources."acorn-walk-6.2.0" sources."agent-base-5.1.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -50427,7 +50383,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A secure and free password manager for all of your devices."; - homepage = "https://bitwarden.com/"; + homepage = https://bitwarden.com/; license = "GPL-3.0"; }; production = true; @@ -50444,13 +50400,13 @@ in }; dependencies = [ sources."@akryum/winattr-3.0.0" - sources."@apollo/federation-0.14.0" + sources."@apollo/federation-0.14.1" (sources."@apollo/protobufjs-1.0.3" // { dependencies = [ - sources."@types/node-10.17.19" + sources."@types/node-10.17.21" ]; }) - sources."@apollographql/apollo-tools-0.4.5" + sources."@apollographql/apollo-tools-0.4.7" sources."@apollographql/graphql-language-service-interface-2.0.2" sources."@apollographql/graphql-language-service-parser-2.0.2" sources."@apollographql/graphql-language-service-types-2.0.2" @@ -50467,7 +50423,7 @@ in sources."semver-5.7.1" ]; }) - sources."@babel/generator-7.9.4" + sources."@babel/generator-7.9.5" sources."@babel/helper-annotate-as-pure-7.8.3" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.8.3" (sources."@babel/helper-compilation-targets-7.8.7" // { @@ -50479,11 +50435,7 @@ in sources."@babel/helper-create-regexp-features-plugin-7.8.8" sources."@babel/helper-define-map-7.8.3" sources."@babel/helper-explode-assignable-expression-7.8.3" - (sources."@babel/helper-function-name-7.9.5" // { - dependencies = [ - sources."@babel/types-7.9.5" - ]; - }) + sources."@babel/helper-function-name-7.9.5" sources."@babel/helper-get-function-arity-7.8.3" sources."@babel/helper-hoist-variables-7.8.3" sources."@babel/helper-member-expression-to-functions-7.8.3" @@ -50557,7 +50509,6 @@ in sources."@babel/plugin-transform-unicode-regex-7.8.3" (sources."@babel/preset-env-7.9.5" // { dependencies = [ - sources."@babel/types-7.9.5" sources."semver-5.7.1" ]; }) @@ -50571,19 +50522,10 @@ in sources."semver-5.7.1" ]; }) - (sources."@babel/runtime-7.9.2" // { - dependencies = [ - sources."regenerator-runtime-0.13.5" - ]; - }) + sources."@babel/runtime-7.9.2" sources."@babel/template-7.8.6" - (sources."@babel/traverse-7.9.5" // { - dependencies = [ - sources."@babel/generator-7.9.5" - sources."@babel/types-7.9.5" - ]; - }) - sources."@babel/types-7.9.0" + sources."@babel/traverse-7.9.5" + sources."@babel/types-7.9.5" sources."@endemolshinegroup/cosmiconfig-typescript-loader-1.0.1" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" @@ -50598,7 +50540,7 @@ in sources."semver-5.7.1" ]; }) - sources."@oclif/config-1.14.0" + sources."@oclif/config-1.15.1" (sources."@oclif/errors-1.2.2" // { dependencies = [ sources."clean-stack-1.3.0" @@ -50682,8 +50624,8 @@ in sources."@types/long-4.0.1" sources."@types/mime-2.0.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.11.1" - (sources."@types/node-fetch-2.5.5" // { + sources."@types/node-13.13.2" + (sources."@types/node-fetch-2.5.6" // { dependencies = [ sources."form-data-3.0.0" ]; @@ -50706,7 +50648,7 @@ in sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."aggregate-error-3.0.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" sources."ansi-regex-4.1.0" @@ -50718,10 +50660,8 @@ in sources."normalize-path-2.1.1" ]; }) - (sources."apollo-2.27.0" // { + (sources."apollo-2.27.3" // { dependencies = [ - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" sources."strip-ansi-5.2.0" ]; }) @@ -50729,17 +50669,22 @@ in sources."apollo-cache-control-0.9.1" sources."apollo-cache-inmemory-1.6.5" sources."apollo-client-2.6.8" - sources."apollo-codegen-core-0.36.6" - sources."apollo-codegen-flow-0.34.6" - sources."apollo-codegen-scala-0.35.6" - sources."apollo-codegen-swift-0.36.6" - sources."apollo-codegen-typescript-0.36.6" + (sources."apollo-codegen-core-0.36.8" // { + dependencies = [ + sources."recast-0.19.0" + sources."source-map-0.6.1" + ]; + }) + sources."apollo-codegen-flow-0.34.8" + sources."apollo-codegen-scala-0.35.8" + sources."apollo-codegen-swift-0.36.8" + sources."apollo-codegen-typescript-0.36.8" sources."apollo-datasource-0.7.0" sources."apollo-engine-reporting-1.7.1" sources."apollo-engine-reporting-protobuf-0.4.4" - sources."apollo-env-0.6.2" - sources."apollo-graphql-0.4.1" - sources."apollo-language-server-1.21.1" + sources."apollo-env-0.6.4" + sources."apollo-graphql-0.4.3" + sources."apollo-language-server-1.21.3" sources."apollo-link-1.2.14" sources."apollo-link-context-1.0.20" sources."apollo-link-error-1.1.13" @@ -50788,18 +50733,7 @@ in sources."aws-sign2-0.7.0" sources."aws4-1.9.1" sources."babel-core-7.0.0-bridge.0" - sources."babel-plugin-dynamic-import-node-2.3.0" - (sources."babel-polyfill-6.26.0" // { - dependencies = [ - sources."core-js-2.6.11" - ]; - }) - (sources."babel-runtime-6.26.0" // { - dependencies = [ - sources."core-js-2.6.11" - sources."regenerator-runtime-0.11.1" - ]; - }) + sources."babel-plugin-dynamic-import-node-2.3.3" sources."backo2-1.0.2" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { @@ -50852,7 +50786,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-2.3.2" - sources."browserslist-4.11.1" + sources."browserslist-4.12.0" sources."buffer-5.6.0" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -50876,7 +50810,7 @@ in sources."callsites-2.0.0" sources."camel-case-3.0.0" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001042" + sources."caniuse-lite-1.0.30001046" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" sources."caseless-0.12.0" @@ -50907,7 +50841,7 @@ in sources."clean-stack-2.2.0" sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" - (sources."cli-progress-3.7.0" // { + (sources."cli-progress-3.8.0" // { dependencies = [ sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" @@ -51059,7 +50993,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.411" + sources."electron-to-chromium-1.3.415" sources."elegant-spinner-1.0.1" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" @@ -51171,11 +51105,7 @@ in sources."getpass-0.1.7" sources."git-clone-0.1.0" sources."git-config-path-1.0.1" - (sources."git-parse-1.0.3" // { - dependencies = [ - sources."util.promisify-1.0.0" - ]; - }) + sources."git-parse-1.0.4" (sources."git-rev-sync-2.0.0" // { dependencies = [ sources."graceful-fs-4.1.15" @@ -51456,7 +51386,7 @@ in sources."moment-2.24.0" sources."ms-2.0.0" sources."mute-stream-0.0.8" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nanoid-2.1.11" (sources."nanomatch-1.2.13" // { dependencies = [ @@ -51644,7 +51574,7 @@ in sources."redeyed-2.1.1" sources."regenerate-1.4.0" sources."regenerate-unicode-properties-8.2.0" - sources."regenerator-runtime-0.10.5" + sources."regenerator-runtime-0.13.5" sources."regenerator-transform-0.14.4" (sources."regex-not-1.0.2" // { dependencies = [ @@ -51667,7 +51597,7 @@ in sources."request-2.88.2" sources."request-promise-core-1.1.3" sources."request-promise-native-1.0.8" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-from-3.0.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" @@ -51752,14 +51682,14 @@ in sources."sort-keys-length-1.0.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - (sources."source-map-support-0.5.16" // { + (sources."source-map-support-0.5.18" // { dependencies = [ sources."source-map-0.6.1" ]; }) sources."source-map-url-0.4.0" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" (sources."split-string-3.1.0" // { @@ -51900,7 +51830,7 @@ in sources."treeify-1.1.0" sources."trim-repeated-1.0.0" sources."ts-invariant-0.4.4" - sources."ts-node-8.8.2" + sources."ts-node-8.9.0" sources."tslib-1.11.1" sources."tty-1.0.1" sources."tunnel-agent-0.6.0" @@ -51908,7 +51838,7 @@ in sources."type-fest-0.6.0" sources."type-is-1.6.18" sources."typescript-3.8.3" - sources."unbzip2-stream-1.4.1" + sources."unbzip2-stream-1.4.2" (sources."undefsafe-2.0.3" // { dependencies = [ sources."debug-2.6.9" @@ -52016,7 +51946,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Command line interface for rapid Vue.js development"; - homepage = "https://cli.vuejs.org/"; + homepage = https://cli.vuejs.org/; license = "MIT"; }; production = true; @@ -52322,7 +52252,7 @@ in sources."parse-passwd-1.0.0" sources."path-parse-1.0.6" sources."pkginfo-0.4.1" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."safe-buffer-5.1.2" sources."sax-0.5.8" sources."semver-5.7.1" @@ -52360,7 +52290,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.11.1" + sources."@types/node-13.13.2" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -52378,7 +52308,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Creating Electron app packages"; - homepage = "https://github.com/electron/asar"; + homepage = https://github.com/electron/asar; license = "MIT"; }; production = true; @@ -52388,10 +52318,10 @@ in bash-language-server = nodeEnv.buildNodePackage { name = "bash-language-server"; packageName = "bash-language-server"; - version = "1.13.0"; + version = "1.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-1.13.0.tgz"; - sha512 = "A9+8217g+/5lNYm/ajk8klm8FkT3iJYNBooifk0V9ieLZ/dItt29xP/iQWIDAwQxqFzZpsTc+5Py3RcjFzSH6A=="; + url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-1.13.1.tgz"; + sha512 = "9JbJ5i+wD6stYi2U2QF9xPrd1c+g5V2puLRet1y5UXOsqYhvYQt4E/JohRCYuHltbMX48dz8lx5RUcurkffZ7g=="; }; dependencies = [ sources."abab-2.0.3" @@ -52402,7 +52332,7 @@ in ]; }) sources."acorn-walk-6.2.0" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."array-equal-1.0.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -52536,7 +52466,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The browser package manager"; - homepage = "http://bower.io/"; + homepage = http://bower.io/; license = "MIT"; }; production = true; @@ -52609,7 +52539,7 @@ in sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-db-1.43.0" + sources."mime-db-1.44.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -52637,7 +52567,7 @@ in sources."read-pkg-up-1.0.1" sources."redent-1.0.0" sources."repeating-2.0.1" - sources."resolve-1.16.0" + sources."resolve-1.17.0" (sources."rimraf-2.7.1" // { dependencies = [ sources."glob-7.1.6" @@ -52648,7 +52578,7 @@ in sources."sort-keys-1.1.2" sources."sort-keys-length-1.0.1" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."sprintf-js-1.0.3" @@ -52666,7 +52596,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Generate nix expressions to fetch bower dependencies"; - homepage = "https://github.com/rvl/bower2nix"; + homepage = https://github.com/rvl/bower2nix; license = "GPL-3.0"; }; production = true; @@ -52795,7 +52725,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.0" sources."sha.js-2.4.11" @@ -52867,10 +52797,10 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-10.17.19" + sources."@types/node-13.13.2" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-regex-1.1.1" sources."ansi-styles-2.2.1" sources."append-0.1.1" @@ -53108,7 +53038,7 @@ in sources."plist-3.0.1" sources."process-nextick-args-2.0.1" sources."promiscuous-0.6.0" - sources."protobufjs-6.8.9" + sources."protobufjs-6.9.0" sources."psl-1.8.0" (sources."pump-0.3.5" // { dependencies = [ @@ -53148,7 +53078,7 @@ in sources."redent-1.0.0" sources."repeating-2.0.1" sources."request-2.88.2" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."rimraf-2.7.1" sources."router-0.6.2" sources."run-parallel-1.1.9" @@ -53186,7 +53116,7 @@ in }) sources."single-line-log-0.4.1" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."speedometer-0.1.4" @@ -53275,7 +53205,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A well-tested CSS minifier"; - homepage = "https://github.com/jakubpawlowicz/clean-css"; + homepage = https://github.com/jakubpawlowicz/clean-css; license = "MIT"; }; production = true; @@ -53490,10 +53420,10 @@ in coc-lists = nodeEnv.buildNodePackage { name = "coc-lists"; packageName = "coc-lists"; - version = "1.3.7"; + version = "1.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.3.7.tgz"; - sha512 = "b+BTZviGOZc7S5cyp9FHn7C/RD65YayWbIA6Oxws/uNwIi6U+T2jrHM4iNS+0g473wmNBdInGyVu1Bz6B1zYbg=="; + url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.3.8.tgz"; + sha512 = "fQUlrvZ06EacKHDQDNEgO6wW/5u6oY/0dm3JsdqRVfBcK3+hyGf9rfsDom1qxpjBt4CgPiLTRwbDqmvpwaI0Zg=="; }; buildInputs = globalBuildInputs; meta = { @@ -53508,10 +53438,10 @@ in coc-metals = nodeEnv.buildNodePackage { name = "coc-metals"; packageName = "coc-metals"; - version = "0.8.0"; + version = "0.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.8.0.tgz"; - sha512 = "PqBFyBu2yyofWYuKbVfgwNSJKQFklvfWU3Kv7EcinacWHfScCJqFZJMS4/3wA5xyjAPPEp9IiJ6rfpFFf8sEQg=="; + url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.8.1.tgz"; + sha512 = "69jOo9oD2JJUo5bMeoV5lcgaAJzMWO7KzWllckc+ZOGB46dE2Qev4MogRnwE/94GI6qc8Cx4RiMoRRLXYIWhyg=="; }; dependencies = [ sources."@babel/runtime-7.9.2" @@ -53560,7 +53490,7 @@ in sources."debug-4.1.1" ]; }) - (sources."metals-languageclient-0.1.23" // { + (sources."metals-languageclient-0.2.1" // { dependencies = [ sources."mkdirp-1.0.4" sources."semver-7.3.2" @@ -53593,7 +53523,7 @@ in sources."safe-buffer-5.2.0" sources."semver-6.3.0" sources."shell-quote-1.7.2" - (sources."streamroller-2.2.3" // { + (sources."streamroller-2.2.4" // { dependencies = [ sources."debug-4.1.1" ]; @@ -53660,7 +53590,7 @@ in sources."@typescript-eslint/typescript-estree-1.13.0" sources."acorn-6.4.1" sources."acorn-jsx-5.2.0" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ajv-keywords-3.4.1" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" @@ -53705,7 +53635,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001042" + sources."caniuse-lite-1.0.30001046" sources."capture-stack-trace-1.0.1" sources."ccount-1.0.5" sources."chalk-2.4.2" @@ -53791,7 +53721,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.2.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.411" + sources."electron-to-chromium-1.3.415" sources."emoji-regex-7.0.3" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -54196,7 +54126,7 @@ in sources."prelude-ls-1.1.2" sources."prepend-http-1.0.4" sources."preserve-0.2.0" - sources."prettier-2.0.4" + sources."prettier-2.0.5" (sources."prettier-eslint-9.0.1" // { dependencies = [ sources."prettier-1.19.1" @@ -54264,7 +54194,7 @@ in sources."require-from-string-2.0.2" sources."require-main-filename-1.0.1" sources."require-relative-0.8.7" - sources."resolve-1.16.0" + sources."resolve-1.17.0" (sources."resolve-cwd-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" @@ -54325,7 +54255,7 @@ in sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.0" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."specificity-0.3.2" @@ -54646,11 +54576,11 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.11.1" + sources."@types/node-13.13.2" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -54689,7 +54619,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."browserslist-4.11.1" + sources."browserslist-4.12.0" sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" sources."caller-callsite-2.0.0" @@ -54697,7 +54627,7 @@ in sources."callsites-2.0.0" sources."camelcase-4.1.0" sources."camelcase-keys-4.2.0" - sources."caniuse-lite-1.0.30001042" + sources."caniuse-lite-1.0.30001046" sources."ccount-1.0.5" sources."chalk-2.4.2" sources."character-entities-1.2.4" @@ -54756,7 +54686,7 @@ in sources."domhandler-2.4.2" sources."domutils-1.7.0" sources."dot-prop-5.2.0" - sources."electron-to-chromium-1.3.411" + sources."electron-to-chromium-1.3.415" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -55013,7 +54943,7 @@ in sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" sources."replace-ext-1.0.0" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-from-5.0.0" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -55067,7 +54997,7 @@ in sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.0" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."specificity-0.4.1" @@ -55245,7 +55175,7 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."semver-5.7.1" sources."sprintf-js-1.0.3" sources."supports-color-5.5.0" @@ -55301,10 +55231,10 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "1.4.15"; + version = "1.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.4.15.tgz"; - sha512 = "E7GGyo/DGcLnm/KhpHUMoo4yKsvqWYi054k1qWok1l5HUyCz5JwlN3MDUOj7SePm8PXCGS7ldFmRWyKiyU1jyw=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.5.1.tgz"; + sha512 = "33mkWOHgvB7hS/mfhCt4PfHAepnLQaTMvvsCWN3daks7yYnOdeMFplD5UORRRvvcJoOEdQBtXXu960I/Xe4MCg=="; }; dependencies = [ sources."typescript-3.8.3" @@ -55359,7 +55289,7 @@ in sources."@types/glob-7.1.1" sources."@types/json-schema-7.0.4" sources."@types/minimatch-3.0.3" - sources."@types/node-13.11.1" + sources."@types/node-13.13.2" sources."@types/normalize-package-data-2.4.0" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" @@ -55383,7 +55313,7 @@ in sources."indent-string-4.0.0" ]; }) - sources."ajv-6.12.0" + sources."ajv-6.12.2" (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -55888,7 +55818,7 @@ in sources."mout-0.5.0" sources."ms-2.1.2" sources."mute-stream-0.0.8" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nanomatch-1.2.13" sources."natural-compare-1.4.0" sources."nice-try-1.0.5" @@ -56079,7 +56009,7 @@ in sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."require-relative-0.8.7" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-from-5.0.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" @@ -56094,7 +56024,7 @@ in sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sass-formatter-0.4.4" + sources."sass-formatter-0.4.5" sources."sax-1.2.4" sources."semver-5.7.1" sources."semver-diff-2.1.0" @@ -56148,7 +56078,7 @@ in sources."source-map-url-0.4.0" sources."space-separated-tokens-1.1.5" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."split-string-3.1.0" @@ -56221,7 +56151,7 @@ in sources."stylus-supremacy-2.14.0" sources."suf-cli-0.1.1" sources."suf-node-1.1.1" - sources."suf-regex-0.0.14" + sources."suf-regex-0.0.17" sources."supports-color-5.5.0" sources."symbol-0.2.3" (sources."table-5.4.6" // { @@ -56498,7 +56428,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Unfancy JavaScript"; - homepage = "http://coffeescript.org/"; + homepage = http://coffeescript.org/; license = "MIT"; }; production = true; @@ -56636,10 +56566,10 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.11.1" + sources."@types/node-13.13.2" sources."abbrev-1.1.1" sources."accepts-1.3.7" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-0.3.1" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" @@ -57054,7 +56984,7 @@ in sources."tough-cookie-2.5.0" ]; }) - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-from-4.0.0" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" @@ -57115,7 +57045,7 @@ in sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.0" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."split-string-3.1.0" @@ -57246,7 +57176,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.11.1" + sources."@types/node-13.13.2" sources."aggregate-error-3.0.1" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" @@ -57403,7 +57333,7 @@ in }) sources."locate-path-2.0.0" sources."loud-rejection-1.6.0" - sources."make-dir-3.0.2" + sources."make-dir-3.1.0" sources."map-cache-0.2.2" sources."map-obj-2.0.0" sources."map-visit-1.0.0" @@ -57486,7 +57416,7 @@ in sources."regex-not-1.0.2" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-url-0.2.1" sources."ret-0.1.15" sources."safe-regex-1.1.0" @@ -57530,7 +57460,7 @@ in sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.0" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."split-string-3.1.0" @@ -57607,7 +57537,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-13.11.1" + sources."@types/node-13.13.2" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -57885,15 +57815,15 @@ in create-react-native-app = nodeEnv.buildNodePackage { name = "create-react-native-app"; packageName = "create-react-native-app"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/create-react-native-app/-/create-react-native-app-3.1.0.tgz"; - sha512 = "GqjMxZ/LNUXFxXKQP4u+uJlbsQhsgk7Mm0q2djYvI3sS/vPA+I1oqrEmsIrj5T3oCtWh3L+N9vd/8OQ5sLxOhw=="; + url = "https://registry.npmjs.org/create-react-native-app/-/create-react-native-app-3.1.1.tgz"; + sha512 = "l4f3E7chtJp4QxiPBxEAE6gFSSF/gm+RxTfyQzxsl3nTGe1wHUU9AYUQgXQ86zfyq7n8gGmRd3MS5wYLodKo8g=="; }; buildInputs = globalBuildInputs; meta = { description = "Create React Native apps with no build configuration."; - homepage = "https://github.com/expo/create-react-native-app"; + homepage = https://github.com/expo/create-react-native-app; license = "BSD-3-Clause"; }; production = true; @@ -57915,7 +57845,7 @@ in buildInputs = globalBuildInputs; meta = { description = "CSSLint"; - homepage = "http://csslint.net/"; + homepage = http://csslint.net/; license = "MIT"; }; production = true; @@ -57932,7 +57862,7 @@ in }; dependencies = [ sources."abstract-random-access-1.1.2" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-align-2.0.0" sources."ansi-diff-1.1.1" sources."ansi-regex-3.0.0" @@ -58211,7 +58141,7 @@ in sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" sources."is-fullwidth-code-point-2.0.0" - sources."is-function-1.0.1" + sources."is-function-1.0.2" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" (sources."is-number-3.0.0" // { @@ -58273,7 +58203,7 @@ in sources."min-document-2.19.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mirror-folder-3.0.0" + sources."mirror-folder-3.0.1" (sources."mixin-deep-1.3.2" // { dependencies = [ sources."is-extendable-1.0.1" @@ -58287,7 +58217,7 @@ in sources."multistream-2.1.1" sources."mute-stream-0.0.8" sources."mutexify-1.2.0" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nanoassert-1.1.0" sources."nanobus-4.4.0" sources."nanoguard-1.3.0" @@ -58296,7 +58226,7 @@ in sources."nanotiming-7.3.1" sources."napi-macros-2.0.0" sources."ncp-1.0.1" - sources."neat-input-1.11.0" + sources."neat-input-1.11.1" sources."neat-log-3.1.0" sources."neat-spinner-1.0.0" sources."neat-tasks-1.1.1" @@ -58570,7 +58500,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Dat is the package manager for data. Easily share and version control data."; - homepage = "https://datproject.org/"; + homepage = https://datproject.org/; license = "BSD-3-Clause"; }; production = true; @@ -58591,7 +58521,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A DHCP server written in JavaScript"; - homepage = "https://github.com/infusion/node-dhcp"; + homepage = https://github.com/infusion/node-dhcp; license = "MIT OR GPL-2.0"; }; production = true; @@ -58673,7 +58603,7 @@ in sources."mime-types-2.1.26" sources."minimist-0.0.10" sources."ms-0.7.0" - sources."nan-2.14.0" + sources."nan-2.14.1" (sources."native-dns-git+https://github.com/okTurtles/node-dns.git#08433ec98f517eed3c6d5e47bdf62603539cd402" // { dependencies = [ sources."native-dns-packet-git+https://github.com/okTurtles/native-dns-packet.git#8bf2714c318cfe7d31bca2006385882ccbf503e4" @@ -58736,7 +58666,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A blockchain-based DNS + HTTPS server that fixes HTTPS security, and more!"; - homepage = "https://github.com/okTurtles/dnschain"; + homepage = https://github.com/okTurtles/dnschain; license = "MPL-2.0"; }; production = true; @@ -58793,12 +58723,12 @@ in }; dependencies = [ sources."JSONStream-1.3.5" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.657.0" + sources."aws-sdk-2.661.0" sources."aws-sign2-0.7.0" sources."aws4-1.9.1" sources."base64-js-1.3.1" @@ -58973,18 +58903,18 @@ in sources."@babel/template-7.8.6" sources."@babel/traverse-7.9.5" sources."@babel/types-7.9.5" - sources."@sindresorhus/is-2.1.0" + sources."@sindresorhus/is-2.1.1" sources."@szmarczak/http-timer-4.0.5" sources."@types/cacheable-request-6.0.1" sources."@types/color-name-1.1.1" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.0" - sources."@types/node-13.11.1" + sources."@types/node-13.13.2" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" (sources."ansi-escapes-4.3.1" // { dependencies = [ sources."type-fest-0.11.0" @@ -59122,7 +59052,7 @@ in }) sources."loose-envify-1.4.0" sources."lowercase-keys-2.0.0" - (sources."make-dir-3.0.2" // { + (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -59191,7 +59121,7 @@ in ]; }) sources."redent-3.0.0" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-from-3.0.0" sources."responselike-2.0.0" sources."restore-cursor-3.1.0" @@ -59211,7 +59141,7 @@ in }) sources."source-map-0.5.7" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" (sources."string-length-3.1.0" // { @@ -59269,7 +59199,7 @@ in buildInputs = globalBuildInputs; meta = { description = "EmojiOne is a complete set of emojis designed for the web. It includes libraries to easily convert unicode characters to shortnames (:smile:) and shortnames to our custom emoji images. PNG formats provided for the emoji images."; - homepage = "https://www.emojione.com/"; + homepage = https://www.emojione.com/; }; production = true; bypassCache = true; @@ -59290,7 +59220,7 @@ in sources."@types/color-name-1.1.1" sources."acorn-7.1.1" sources."acorn-jsx-5.2.0" - sources."ajv-6.12.0" + sources."ajv-6.12.2" (sources."ansi-escapes-4.3.1" // { dependencies = [ sources."type-fest-0.11.0" @@ -59445,7 +59375,7 @@ in buildInputs = globalBuildInputs; meta = { description = "An AST-based pattern checker for JavaScript."; - homepage = "https://eslint.org/"; + homepage = https://eslint.org/; license = "MIT"; }; production = true; @@ -59467,7 +59397,7 @@ in sources."@types/color-name-1.1.1" sources."acorn-7.1.1" sources."acorn-jsx-5.2.0" - sources."ajv-6.12.0" + sources."ajv-6.12.2" (sources."ansi-escapes-4.3.1" // { dependencies = [ sources."type-fest-0.11.0" @@ -59575,7 +59505,7 @@ in sources."progress-2.0.3" sources."punycode-2.1.1" sources."regexpp-2.0.1" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-from-4.0.0" sources."restore-cursor-3.1.0" sources."rimraf-2.6.3" @@ -59627,7 +59557,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Makes eslint the fastest linter on the planet"; - homepage = "https://github.com/mantoni/eslint_d.js"; + homepage = https://github.com/mantoni/eslint_d.js; license = "MIT"; }; production = true; @@ -59643,7 +59573,7 @@ in sha1 = "81f5f98043cc2517053f96ba5d61ef5db430c010"; }; dependencies = [ - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-escapes-1.4.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -59774,14 +59704,14 @@ in sources."repeating-2.0.1" sources."request-2.88.2" sources."request-progress-2.0.1" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."restore-cursor-1.0.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-5.7.1" sources."signal-exit-3.0.3" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."sshpk-1.16.1" @@ -59968,7 +59898,7 @@ in ]; }) sources."redent-3.0.0" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."restore-cursor-3.1.0" sources."run-async-2.4.0" sources."rxjs-6.5.5" @@ -59979,7 +59909,7 @@ in sources."signal-exit-3.0.3" sources."slice-ansi-3.0.0" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."string-width-4.2.0" @@ -60243,7 +60173,7 @@ in }) sources."ms-2.0.0" sources."mute-stream-0.0.8" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nanomatch-1.2.13" sources."nconf-0.10.0" sources."ncp-0.4.2" @@ -60531,7 +60461,7 @@ in sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" sources."muxrpc-6.5.0" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nearley-2.19.2" sources."node-gyp-build-4.2.1" sources."node-polyglot-1.0.0" @@ -60652,7 +60582,7 @@ in buildInputs = globalBuildInputs; meta = { description = "git hosting on secure-scuttlebutt (ssb)"; - homepage = "https://git-ssb.celehner.com/%25n92DiQh7ietE%2BR%2BX%2FI403LQoyf2DtR3WQfCkDKlheQU%3D.sha256"; + homepage = https://git-ssb.celehner.com/%25n92DiQh7ietE%2BR%2BX%2FI403LQoyf2DtR3WQfCkDKlheQU%3D.sha256; license = "Fair"; }; production = true; @@ -60703,7 +60633,7 @@ in sources."@types/color-name-1.1.1" sources."@types/minimist-1.2.0" sources."@types/normalize-package-data-2.4.0" - sources."ajv-6.12.0" + sources."ajv-6.12.2" (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -60837,7 +60767,7 @@ in ]; }) sources."lowercase-keys-1.0.1" - sources."make-dir-3.0.2" + sources."make-dir-3.1.0" sources."map-obj-4.1.0" (sources."meow-6.1.0" // { dependencies = [ @@ -60861,7 +60791,7 @@ in sources."npm-run-path-4.0.1" sources."once-1.4.0" sources."onetime-5.1.0" - sources."ora-4.0.3" + sources."ora-4.0.4" sources."os-tmpdir-1.0.2" sources."p-cancelable-1.1.0" sources."p-limit-2.3.0" @@ -60896,7 +60826,7 @@ in sources."redent-3.0.0" sources."registry-auth-token-4.1.1" sources."registry-url-5.1.0" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."run-async-2.4.0" @@ -60908,7 +60838,7 @@ in sources."shebang-regex-3.0.0" sources."signal-exit-3.0.3" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."string-width-4.2.0" @@ -60974,7 +60904,7 @@ in sources."@types/color-name-1.1.1" sources."accepts-1.3.7" sources."agent-base-4.3.0" - sources."ajv-6.12.0" + sources."ajv-6.12.2" (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -61101,7 +61031,7 @@ in ]; }) sources."is-fullwidth-code-point-3.0.0" - (sources."ora-4.0.3" // { + (sources."ora-4.0.4" // { dependencies = [ sources."chalk-3.0.0" ]; @@ -61521,7 +61451,7 @@ in sources."request-promise-core-1.1.3" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-dir-1.0.1" sources."resolve-from-4.0.0" sources."responselike-1.0.2" @@ -61554,13 +61484,13 @@ in sources."simple-errors-1.0.1" sources."snake-case-2.1.0" sources."source-map-0.5.7" - (sources."source-map-support-0.5.16" // { + (sources."source-map-support-0.5.18" // { dependencies = [ sources."source-map-0.6.1" ]; }) sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."sprintf-js-1.0.3" @@ -61867,7 +61797,7 @@ in sources."regex-not-1.0.2" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -62033,7 +61963,7 @@ in sources."supports-color-7.1.0" ]; }) - sources."systeminformation-4.23.3" + sources."systeminformation-4.23.5" sources."term-canvas-0.0.5" sources."type-fest-0.11.0" sources."wordwrap-0.0.3" @@ -62311,7 +62241,7 @@ in }) sources."ms-2.0.0" sources."mute-stdout-1.0.1" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nanomatch-1.2.13" sources."next-tick-1.0.0" sources."normalize-package-data-2.5.0" @@ -62376,7 +62306,7 @@ in sources."replace-homedir-1.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-dir-1.0.1" sources."resolve-options-1.1.0" sources."resolve-url-0.2.1" @@ -62424,7 +62354,7 @@ in sources."source-map-url-0.4.0" sources."sparkles-1.0.1" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."split-string-3.1.0" @@ -62504,7 +62434,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The streaming build system."; - homepage = "https://gulpjs.com/"; + homepage = https://gulpjs.com/; license = "MIT"; }; production = true; @@ -62754,7 +62684,7 @@ in sources."replace-homedir-1.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -62793,7 +62723,7 @@ in sources."source-map-url-0.4.0" sources."sparkles-1.0.1" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."split-string-3.1.0" @@ -62849,7 +62779,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Command line interface for gulp"; - homepage = "http://gulpjs.com/"; + homepage = http://gulpjs.com/; license = "MIT"; }; production = true; @@ -62880,7 +62810,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Highly configurable, well-tested, JavaScript-based HTML minifier."; - homepage = "https://kangax.github.io/html-minifier/"; + homepage = https://kangax.github.io/html-minifier/; license = "MIT"; }; production = true; @@ -62896,7 +62826,7 @@ in sha512 = "uXuRyVhQa0HlNmZg5LJ1BRJvRq5f7IJL/34tItHhZr9re15pwaqAuLUAIcqtwd1bLUCE++7HVPtR+NSReFW0iA=="; }; dependencies = [ - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.1" @@ -63147,7 +63077,7 @@ in }) sources."moment-2.24.0" sources."mv-2.1.1" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."ncp-2.0.0" sources."once-1.4.0" sources."optimist-0.6.1" @@ -63231,7 +63161,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."jquery-3.5.0" - sources."jquery.terminal-2.15.2" + sources."jquery.terminal-2.15.4" sources."jsonfile-2.4.0" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" @@ -63250,7 +63180,7 @@ in buildInputs = globalBuildInputs; meta = { description = "High precision scientific calculator with support for physical units"; - homepage = "https://github.com/sharkdp/insect"; + homepage = https://github.com/sharkdp/insect; license = "MIT"; }; production = true; @@ -63571,7 +63501,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A tool for creating and developing Ionic Framework mobile apps."; - homepage = "https://ionicframework.com/"; + homepage = https://ionicframework.com/; license = "MIT"; }; production = true; @@ -63605,7 +63535,7 @@ in sources."@types/color-name-1.1.1" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."amdefine-1.0.1" sources."ansi-regex-2.1.1" sources."ansi-styles-4.2.1" @@ -63762,7 +63692,7 @@ in sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."ms-2.0.0" - sources."nan-2.14.0" + sources."nan-2.14.1" (sources."node-gyp-3.8.0" // { dependencies = [ sources."semver-5.3.0" @@ -63848,7 +63778,7 @@ in sources."request-2.88.2" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-url-0.2.1" sources."restore-cursor-3.1.0" sources."resumer-0.0.0" @@ -63867,7 +63797,7 @@ in sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.0" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."split-1.0.1" @@ -63994,10 +63924,10 @@ in jake = nodeEnv.buildNodePackage { name = "jake"; packageName = "jake"; - version = "10.4.6"; + version = "10.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/jake/-/jake-10.4.6.tgz"; - sha512 = "bfxWbCowItajx7PV0xyoRfLC1DCND7z308JD5OvMhmsjO9232onI0jbbFZFWnvLSMzniRBhOee9EggsWBQ1+Ew=="; + url = "https://registry.npmjs.org/jake/-/jake-10.5.2.tgz"; + sha512 = "2twpudoNYV7izUgKoLoVCwLFV+x8W5PQHri4ZPSm3L2viTq+DxVPQi9WJoeDSTCKE/G3lB5e78KAbeFhYQpgKA=="; }; dependencies = [ sources."ansi-styles-3.2.1" @@ -64066,11 +63996,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."iterare-1.2.0" - (sources."jaeger-client-3.17.2" // { - dependencies = [ - sources."opentracing-0.13.0" - ]; - }) + sources."jaeger-client-3.18.0" sources."lodash-4.17.15" sources."long-2.4.0" sources."minimatch-3.0.4" @@ -64112,7 +64038,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Implementation of the Language Server Protocol for JavaScript and TypeScript"; - homepage = "https://github.com/sourcegraph/javascript-typescript-langserver"; + homepage = https://github.com/sourcegraph/javascript-typescript-langserver; license = "Apache-2.0"; }; production = true; @@ -64139,7 +64065,7 @@ in ]; }) sources."acorn-walk-6.2.0" - sources."ajv-6.12.0" + sources."ajv-6.12.2" (sources."ansi-escape-sequences-4.1.0" // { dependencies = [ sources."array-back-3.1.0" @@ -64568,7 +64494,7 @@ in sources."safe-buffer-5.1.2" ]; }) - sources."nan-2.14.0" + sources."nan-2.14.1" (sources."nanomatch-1.2.13" // { dependencies = [ sources."is-windows-1.0.2" @@ -64581,7 +64507,7 @@ in sources."nextgen-events-1.3.0" sources."nice-try-1.0.5" sources."no-case-2.3.2" - sources."node-abi-2.15.0" + sources."node-abi-2.16.0" sources."node-bitmap-0.0.1" sources."node-emoji-1.10.0" sources."node-fetch-1.7.3" @@ -64962,7 +64888,7 @@ in buildInputs = globalBuildInputs; meta = { description = "beautifier.io for node"; - homepage = "https://beautifier.io/"; + homepage = https://beautifier.io/; license = "MIT"; }; production = true; @@ -64985,7 +64911,7 @@ in buildInputs = globalBuildInputs; meta = { description = "YAML 1.2 parser and serializer"; - homepage = "https://github.com/nodeca/js-yaml"; + homepage = https://github.com/nodeca/js-yaml; license = "MIT"; }; production = true; @@ -65081,7 +65007,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Static analysis tool for JavaScript"; - homepage = "http://jshint.com/"; + homepage = http://jshint.com/; license = "(MIT AND JSON)"; }; production = true; @@ -65124,7 +65050,7 @@ in buildInputs = globalBuildInputs; meta = { description = "JSON diff"; - homepage = "https://github.com/andreyvit/json-diff"; + homepage = https://github.com/andreyvit/json-diff; }; production = true; bypassCache = true; @@ -65179,7 +65105,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Various utilities for JSON References (http://tools.ietf.org/html/draft-pbryan-zyp-json-ref-03)."; - homepage = "https://github.com/whitlockjc/json-refs"; + homepage = https://github.com/whitlockjc/json-refs; license = "MIT"; }; production = true; @@ -65199,7 +65125,7 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" sources."accepts-1.3.7" - sources."ajv-6.12.0" + sources."ajv-6.12.2" (sources."ansi-align-3.0.0" // { dependencies = [ sources."string-width-3.1.0" @@ -65335,7 +65261,7 @@ in sources."lodash-id-0.14.0" sources."lowdb-1.0.0" sources."lowercase-keys-1.0.1" - sources."make-dir-3.0.2" + sources."make-dir-3.1.0" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" (sources."method-override-3.0.0" // { @@ -65460,7 +65386,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Get a full fake REST API with zero coding in less than 30 seconds"; - homepage = "https://github.com/typicode/json-server"; + homepage = https://github.com/typicode/json-server; license = "MIT"; }; production = true; @@ -65487,7 +65413,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Validate JSON"; - homepage = "http://zaach.github.com/jsonlint/"; + homepage = http://zaach.github.com/jsonlint/; }; production = true; bypassCache = true; @@ -65573,7 +65499,7 @@ in }) sources."fs-extra-7.0.1" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.2" + sources."fsevents-2.1.3" sources."get-caller-file-2.0.5" sources."glob-7.1.6" sources."glob-parent-5.1.1" @@ -65687,7 +65613,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Spectacular Test Runner for JavaScript."; - homepage = "http://karma-runner.github.io/"; + homepage = http://karma-runner.github.io/; license = "MIT"; }; production = true; @@ -65781,7 +65707,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Merges multiple lcov results into one"; - homepage = "https://github.com/mweibel/lcov-result-merger"; + homepage = https://github.com/mweibel/lcov-result-merger; license = "MIT"; }; production = true; @@ -65800,7 +65726,7 @@ in sources."abab-1.0.4" sources."acorn-2.7.0" sources."acorn-globals-1.0.9" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" sources."asn1-0.2.4" @@ -66149,7 +66075,7 @@ in sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@octokit/auth-token-2.4.0" - (sources."@octokit/endpoint-6.0.0" // { + (sources."@octokit/endpoint-6.0.1" // { dependencies = [ sources."is-plain-object-3.0.0" sources."isobject-4.0.0" @@ -66160,7 +66086,7 @@ in sources."@octokit/plugin-paginate-rest-1.1.2" sources."@octokit/plugin-request-log-1.0.0" sources."@octokit/plugin-rest-endpoint-methods-2.4.0" - (sources."@octokit/request-5.4.0" // { + (sources."@octokit/request-5.4.2" // { dependencies = [ sources."@octokit/request-error-2.0.0" sources."is-plain-object-3.0.0" @@ -66170,17 +66096,17 @@ in }) sources."@octokit/request-error-1.2.1" sources."@octokit/rest-16.43.1" - sources."@octokit/types-2.10.0" + sources."@octokit/types-2.12.1" sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.11.1" + sources."@types/node-13.13.2" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."agent-base-4.3.0" sources."agentkeepalive-3.5.2" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" @@ -66785,7 +66711,7 @@ in sources."request-2.88.2" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.16.0" + sources."resolve-1.17.0" (sources."resolve-cwd-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" @@ -66858,7 +66784,7 @@ in sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.0" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."split-1.0.1" @@ -67020,7 +66946,7 @@ in sha512 = "tlWX341RECuTOvoDIvtFqXsKj072hm3+9ymRBe76/mD6O5ZZecnlAOVDlWAleF2+aohFrxNidXhv2773f6kY7g=="; }; dependencies = [ - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."asap-2.0.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -67083,7 +67009,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Leaner CSS"; - homepage = "http://lesscss.org/"; + homepage = http://lesscss.org/; license = "Apache-2.0"; }; production = true; @@ -67108,7 +67034,7 @@ in buildInputs = globalBuildInputs; meta = { description = "clean-css plugin for less.js"; - homepage = "http://lesscss.org/"; + homepage = http://lesscss.org/; }; production = true; bypassCache = true; @@ -67282,7 +67208,7 @@ in sources."mixin-deep-1.3.2" sources."morgan-1.10.0" sources."ms-2.0.0" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nanomatch-1.2.13" sources."negotiator-0.6.2" sources."normalize-path-3.0.0" @@ -67456,7 +67382,7 @@ in dependencies = [ sources."accepts-1.3.7" sources."after-0.8.2" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."anymatch-1.3.2" sources."argparse-1.0.10" sources."arr-diff-2.0.0" @@ -67543,14 +67469,14 @@ in sources."ee-first-1.1.1" sources."emoji-regex-6.1.1" sources."encodeurl-1.0.2" - (sources."engine.io-3.4.0" // { + (sources."engine.io-3.4.1" // { dependencies = [ sources."cookie-0.3.1" sources."debug-4.1.1" sources."ms-2.1.2" ]; }) - (sources."engine.io-client-3.4.0" // { + (sources."engine.io-client-3.4.1" // { dependencies = [ sources."component-emitter-1.2.1" sources."debug-4.1.1" @@ -67689,7 +67615,7 @@ in ]; }) sources."ms-2.0.0" - sources."nan-2.14.0" + sources."nan-2.14.1" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -67949,7 +67875,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Live Markdown previews for your favourite editor."; - homepage = "https://github.com/shime/livedown"; + homepage = https://github.com/shime/livedown; license = "MIT"; }; production = true; @@ -68070,12 +67996,12 @@ in ]; }) sources."@istanbuljs/schema-0.1.2" - (sources."@jest/transform-25.3.0" // { + (sources."@jest/transform-25.4.0" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@jest/types-25.3.0" + sources."@jest/types-25.4.0" sources."@types/babel__core-7.1.7" sources."@types/babel__generator-7.6.1" sources."@types/babel__template-7.0.2" @@ -68085,7 +68011,7 @@ in sources."@types/istanbul-lib-coverage-2.0.1" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.1" - sources."@types/node-13.11.1" + sources."@types/node-13.13.2" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.4" @@ -68115,7 +68041,7 @@ in sources."acorn-7.1.1" sources."acorn-node-1.8.2" sources."acorn-walk-7.1.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.4.1" sources."amdefine-1.0.1" @@ -68154,15 +68080,15 @@ in sources."babel-helper-mark-eval-scopes-0.4.3" sources."babel-helper-remove-or-void-0.4.3" sources."babel-helper-to-multiple-sequence-expressions-0.5.0" - sources."babel-jest-25.3.0" + sources."babel-jest-25.4.0" (sources."babel-loader-8.1.0" // { dependencies = [ sources."mkdirp-0.5.5" ]; }) - sources."babel-plugin-dynamic-import-node-2.3.0" + sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-istanbul-6.0.0" - sources."babel-plugin-jest-hoist-25.2.6" + sources."babel-plugin-jest-hoist-25.4.0" sources."babel-plugin-minify-builtins-0.5.0" sources."babel-plugin-minify-constant-folding-0.5.0" sources."babel-plugin-minify-dead-code-elimination-0.5.1" @@ -68188,7 +68114,7 @@ in sources."babel-plugin-transform-simplify-comparison-operators-6.9.4" sources."babel-plugin-transform-undefined-to-void-6.9.4" sources."babel-preset-current-node-syntax-0.1.2" - sources."babel-preset-jest-25.3.0" + sources."babel-preset-jest-25.4.0" sources."babel-preset-minify-0.5.1" (sources."babel-runtime-6.26.0" // { dependencies = [ @@ -68238,7 +68164,7 @@ in sources."browserify-rsa-4.0.1" sources."browserify-sign-4.0.4" sources."browserify-zlib-0.2.0" - sources."browserslist-4.11.1" + sources."browserslist-4.12.0" sources."bser-2.1.1" sources."buffer-5.2.1" sources."buffer-from-1.1.1" @@ -68253,7 +68179,7 @@ in sources."cache-base-1.0.1" sources."cached-path-relative-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001042" + sources."caniuse-lite-1.0.30001046" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -68370,7 +68296,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.411" + sources."electron-to-chromium-1.3.415" sources."elliptic-6.5.2" sources."emoji-regex-7.0.3" sources."emojis-list-3.0.0" @@ -68460,7 +68386,7 @@ in sources."fs-constants-1.0.0" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.2" + sources."fsevents-2.1.3" sources."function-bind-1.1.1" sources."gensync-1.0.0-beta.1" sources."get-assigned-identifiers-1.2.0" @@ -68488,7 +68414,7 @@ in sources."globals-11.12.0" sources."google-closure-compiler-js-20170910.0.1" sources."graceful-fs-4.2.3" - (sources."gunzip-maybe-1.4.1" // { + (sources."gunzip-maybe-1.4.2" // { dependencies = [ sources."browserify-zlib-0.1.4" sources."pako-0.2.9" @@ -68565,11 +68491,11 @@ in sources."semver-6.3.0" ]; }) - sources."jest-haste-map-25.3.0" + sources."jest-haste-map-25.4.0" sources."jest-regex-util-25.2.6" sources."jest-serializer-25.2.6" - sources."jest-util-25.3.0" - (sources."jest-worker-25.2.6" // { + sources."jest-util-25.4.0" + (sources."jest-worker-25.4.0" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-7.1.0" @@ -68607,7 +68533,7 @@ in sources."loose-envify-1.4.0" sources."lru-cache-5.1.1" sources."magic-string-0.25.7" - (sources."make-dir-3.0.2" // { + (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -68651,7 +68577,7 @@ in ]; }) sources."ms-2.1.2" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nanomatch-1.2.13" sources."ncp-2.0.0" sources."neo-async-2.6.1" @@ -68791,7 +68717,7 @@ in sources."request-2.88.2" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.16.0" + sources."resolve-1.17.0" (sources."resolve-cwd-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" @@ -68827,7 +68753,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."schema-utils-2.6.5" + sources."schema-utils-2.6.6" sources."semver-5.7.1" sources."serialize-javascript-2.1.2" sources."set-blocking-2.0.0" @@ -68879,7 +68805,7 @@ in sources."source-list-map-0.1.8" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - (sources."source-map-support-0.5.16" // { + (sources."source-map-support-0.5.18" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -68887,7 +68813,7 @@ in sources."source-map-url-0.4.0" sources."sourcemap-codec-1.4.8" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."split-string-3.1.0" @@ -69013,7 +68939,7 @@ in sources."vm-browserify-1.1.2" sources."walker-1.0.7" sources."watchpack-1.6.1" - (sources."webpack-4.42.1" // { + (sources."webpack-4.43.0" // { dependencies = [ sources."acorn-6.4.1" sources."micromatch-3.1.10" @@ -69107,7 +69033,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Madoko is a fast scholarly Markdown processor written in Koka"; - homepage = "http://madoko.codeplex.com/"; + homepage = http://madoko.codeplex.com/; }; production = true; bypassCache = true; @@ -69123,7 +69049,7 @@ in }; dependencies = [ sources."@types/color-name-1.1.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-styles-4.2.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -69247,7 +69173,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Meeting room kiosk app for displaying meeting room schedules and booking rooms in your organization. Built against Google Apps, but other sources can be defined."; - homepage = "https://bitbucket.org/aahmed/meat"; + homepage = https://bitbucket.org/aahmed/meat; }; production = true; bypassCache = true; @@ -69800,7 +69726,7 @@ in sources."repeat-string-1.6.1" sources."replace-ext-1.0.0" sources."request-2.81.0" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-dir-1.0.1" sources."resolve-options-1.1.0" sources."resolve-url-0.2.1" @@ -70021,7 +69947,7 @@ in sources."find-up-3.0.0" sources."flat-4.1.0" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.2" + sources."fsevents-2.1.3" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" sources."glob-7.1.3" @@ -70105,7 +70031,7 @@ in buildInputs = globalBuildInputs; meta = { description = "simple, flexible, fun test framework"; - homepage = "https://mochajs.org/"; + homepage = https://mochajs.org/; license = "MIT"; }; production = true; @@ -70229,7 +70155,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Neovim client API and neovim remote plugin provider"; - homepage = "https://github.com/neovim/node-client"; + homepage = https://github.com/neovim/node-client; license = "MIT"; }; production = true; @@ -70268,7 +70194,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -70388,7 +70314,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Build tool and bindings loader for node-gyp that supports prebuilds"; - homepage = "https://github.com/prebuild/node-gyp-build"; + homepage = https://github.com/prebuild/node-gyp-build; license = "MIT"; }; production = true; @@ -70538,7 +70464,7 @@ in sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."ms-2.0.0" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."negotiator-0.6.2" (sources."node-pre-gyp-0.6.39" // { dependencies = [ @@ -70589,7 +70515,7 @@ in sources."qs-6.4.0" ]; }) - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."rimraf-2.2.8" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -70611,7 +70537,7 @@ in sources."signal-exit-3.0.3" sources."sntp-1.0.9" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" (sources."sshpk-1.16.1" // { @@ -70684,7 +70610,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Web Inspector based nodeJS debugger"; - homepage = "http://github.com/node-inspector/node-inspector"; + homepage = http://github.com/node-inspector/node-inspector; }; production = true; bypassCache = true; @@ -71251,7 +71177,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Low-code programming for event-driven applications"; - homepage = "http://nodered.org/"; + homepage = http://nodered.org/; license = "Apache-2.0"; }; production = true; @@ -71268,7 +71194,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -71393,7 +71319,7 @@ in ]; }) sources."request-2.88.2" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."retry-0.10.1" sources."rimraf-2.6.3" sources."safe-buffer-5.2.0" @@ -71404,7 +71330,7 @@ in sources."slasp-0.0.4" sources."slide-1.1.6" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."sshpk-1.16.1" @@ -71441,7 +71367,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Generate Nix expressions to build NPM packages"; - homepage = "https://github.com/svanderburg/node2nix"; + homepage = https://github.com/svanderburg/node2nix; license = "MIT"; }; production = true; @@ -71506,7 +71432,7 @@ in sources."end-of-stream-1.4.4" sources."escape-goat-2.1.1" sources."fill-range-7.0.1" - sources."fsevents-2.1.2" + sources."fsevents-2.1.3" sources."get-stream-4.1.0" sources."glob-parent-5.1.1" sources."global-dirs-2.0.1" @@ -71535,7 +71461,7 @@ in sources."keyv-3.1.0" sources."latest-version-5.1.0" sources."lowercase-keys-1.0.1" - (sources."make-dir-3.0.2" // { + (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -71605,7 +71531,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Simple monitor script for use during development of a node.js app."; - homepage = "http://nodemon.io/"; + homepage = http://nodemon.io/; license = "MIT"; }; production = true; @@ -71623,7 +71549,7 @@ in buildInputs = globalBuildInputs; meta = { description = "a package manager for JavaScript"; - homepage = "https://docs.npmjs.com/"; + homepage = https://docs.npmjs.com/; license = "Artistic-2.0"; }; production = true; @@ -71645,7 +71571,7 @@ in sources."@npmcli/promise-spawn-1.2.0" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@tootallnate/once-1.0.0" + sources."@tootallnate/once-1.1.2" sources."@types/color-name-1.1.1" sources."agent-base-6.0.0" sources."agentkeepalive-4.1.0" @@ -71779,7 +71705,7 @@ in sources."lodash-4.17.15" sources."lowercase-keys-1.0.1" sources."lru-cache-5.1.1" - (sources."make-dir-3.0.2" // { + (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -71919,7 +71845,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Find newer versions of dependencies than what your package.json or bower.json allows"; - homepage = "https://github.com/tjunnone/npm-check-updates"; + homepage = https://github.com/tjunnone/npm-check-updates; license = "Apache-2.0"; }; production = true; @@ -71937,7 +71863,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -72093,7 +72019,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Generate nix expressions to build npm packages"; - homepage = "https://github.com/NixOS/npm2nix"; + homepage = https://github.com/NixOS/npm2nix; }; production = true; bypassCache = true; @@ -72134,7 +72060,7 @@ in buildInputs = globalBuildInputs; meta = { description = "OCaml language server"; - homepage = "https://github.com/freebroccolo/ocaml-language-server"; + homepage = https://github.com/freebroccolo/ocaml-language-server; license = "Apache-2.0"; }; production = true; @@ -72248,7 +72174,7 @@ in sources."@babel/template-7.8.6" sources."@babel/traverse-7.9.5" sources."@babel/types-7.9.5" - sources."@iarna/toml-2.2.3" + sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@parcel/fs-1.11.0" @@ -72265,7 +72191,7 @@ in ]; }) sources."acorn-walk-6.2.0" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."alphanum-sort-1.0.2" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -72297,7 +72223,7 @@ in sources."atob-2.1.2" sources."aws-sign2-0.7.0" sources."aws4-1.9.1" - sources."babel-plugin-dynamic-import-node-2.3.0" + sources."babel-plugin-dynamic-import-node-2.3.3" (sources."babel-runtime-6.26.0" // { dependencies = [ sources."regenerator-runtime-0.11.1" @@ -72336,7 +72262,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.11.1" + sources."browserslist-4.12.0" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -72353,7 +72279,7 @@ in sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001042" + sources."caniuse-lite-1.0.30001046" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -72486,7 +72412,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.411" + sources."electron-to-chromium-1.3.415" sources."elliptic-6.5.2" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" @@ -72583,7 +72509,7 @@ in sources."html-tags-1.2.0" (sources."htmlnano-0.2.5" // { dependencies = [ - sources."posthtml-0.12.2" + sources."posthtml-0.12.3" sources."terser-4.6.11" ]; }) @@ -72715,7 +72641,7 @@ in }) sources."mkdirp-0.5.5" sources."ms-2.1.2" - sources."nan-2.14.0" + sources."nan-2.14.1" (sources."nanomatch-1.2.13" // { dependencies = [ sources."define-property-2.0.2" @@ -72892,7 +72818,7 @@ in sources."request-promise-native-1.0.8" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-from-3.0.0" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" @@ -72948,7 +72874,7 @@ in sources."snapdragon-util-3.0.1" sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" - sources."source-map-support-0.5.16" + sources."source-map-support-0.5.18" sources."source-map-url-0.4.0" (sources."split-string-3.1.0" // { dependencies = [ @@ -73119,7 +73045,7 @@ in sources."negotiator-0.6.2" ]; }) - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -73265,7 +73191,7 @@ in sources."ms-2.0.0" sources."msgpack5-3.6.0" sources."mv-2.1.1" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."ncp-2.0.0" sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" sources."neo-async-2.6.1" @@ -73614,7 +73540,7 @@ in sources."redent-1.0.0" sources."regexp.prototype.flags-1.3.0" sources."repeating-2.0.1" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."restore-cursor-2.0.0" sources."reverse-http-1.3.0" sources."rimraf-2.7.1" @@ -73640,7 +73566,7 @@ in }) sources."single-line-log-1.1.2" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."speedometer-0.1.4" @@ -73695,7 +73621,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Streaming torrent client for Node.js"; - homepage = "https://github.com/mafintosh/peerflix"; + homepage = https://github.com/mafintosh/peerflix; license = "MIT"; }; production = true; @@ -73714,7 +73640,7 @@ in sources."accepts-1.3.7" sources."addr-to-ip-port-1.5.1" sources."after-0.8.2" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."archiver-3.1.1" (sources."archiver-utils-2.1.0" // { dependencies = [ @@ -73802,14 +73728,14 @@ in sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - (sources."engine.io-3.4.0" // { + (sources."engine.io-3.4.1" // { dependencies = [ sources."cookie-0.3.1" sources."debug-4.1.1" sources."ms-2.1.2" ]; }) - (sources."engine.io-client-3.4.0" // { + (sources."engine.io-client-3.4.1" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" @@ -74076,15 +74002,15 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "4.13.0"; + version = "4.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-4.13.0.tgz"; - sha512 = "0zJwt+IxBCQECptU40AaUJOBOo830FV4wnSoUvIqVJpOg5HBa0mv/DTXRf/pjuvNYZcuO7KDoD2zXWuJk86khQ=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-4.14.0.tgz"; + sha512 = "O6B5OD+wiO4srzegQTs0LiOrdExLvoKgG7UFL5+Lu1DhgqhW9NFP/pPg8+zKSrOQTontH3GGSWAkinxM3tCqnw=="; }; buildInputs = globalBuildInputs; meta = { description = "Fast, disk space efficient package manager"; - homepage = "https://pnpm.js.org/"; + homepage = https://pnpm.js.org/; license = "MIT"; }; production = true; @@ -74107,7 +74033,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.11.1" + sources."@types/node-13.13.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."anymatch-3.1.1" @@ -74141,7 +74067,7 @@ in sources."find-up-4.1.0" sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.2" + sources."fsevents-2.1.3" sources."get-caller-file-2.0.5" sources."get-stdin-7.0.0" sources."glob-7.1.6" @@ -74253,15 +74179,15 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.0.4.tgz"; - sha512 = "SVJIQ51spzFDvh4fIbCLvciiDMCrRhlN3mbZvv/+ycjvmF5E73bKdGfU8QDLNmjYJf+lsGnDBC4UUnvTe5OO0w=="; + url = "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz"; + sha512 = "7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg=="; }; buildInputs = globalBuildInputs; meta = { description = "Prettier is an opinionated code formatter"; - homepage = "https://prettier.io/"; + homepage = https://prettier.io/; license = "MIT"; }; production = true; @@ -74547,7 +74473,7 @@ in ]; }) sources."reject-unsatisfied-npm-version-1.0.0" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-from-npm-3.1.0" sources."restore-cursor-2.0.0" sources."rimraf-2.7.1" @@ -74568,7 +74494,7 @@ in sources."slice-ansi-2.1.0" sources."sorcery-0.10.0" sources."source-map-0.5.7" - (sources."source-map-support-0.5.16" // { + (sources."source-map-support-0.5.18" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -74648,7 +74574,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A build system for PureScript projects"; - homepage = "https://github.com/purescript-contrib/pulp"; + homepage = https://github.com/purescript-contrib/pulp; license = "LGPL-3.0+"; }; production = true; @@ -74820,7 +74746,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A set of complementary tools to React, including the JSX transformer."; - homepage = "https://facebook.github.io/react"; + homepage = https://facebook.github.io/react; license = "BSD-3-Clause"; }; production = true; @@ -74838,7 +74764,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The HTML Presentation Framework"; - homepage = "http://revealjs.com/"; + homepage = http://revealjs.com/; license = "MIT"; }; production = true; @@ -74861,17 +74787,17 @@ in sources."@types/eslint-visitor-keys-1.0.0" sources."@types/estree-0.0.39" sources."@types/json-schema-7.0.4" - sources."@types/node-12.12.35" + sources."@types/node-12.12.37" sources."@types/node-fetch-2.5.6" sources."@types/resolve-0.0.8" - sources."@types/vscode-1.43.0" - sources."@typescript-eslint/eslint-plugin-2.28.0" - sources."@typescript-eslint/experimental-utils-2.28.0" - sources."@typescript-eslint/parser-2.28.0" - sources."@typescript-eslint/typescript-estree-2.28.0" + sources."@types/vscode-1.44.0" + sources."@typescript-eslint/eslint-plugin-2.29.0" + sources."@typescript-eslint/experimental-utils-2.29.0" + sources."@typescript-eslint/parser-2.29.0" + sources."@typescript-eslint/typescript-estree-2.29.0" sources."acorn-7.1.1" sources."acorn-jsx-5.2.0" - sources."ajv-6.12.0" + sources."ajv-6.12.2" (sources."ansi-escapes-4.3.1" // { dependencies = [ sources."type-fest-0.11.0" @@ -74958,7 +74884,7 @@ in sources."flatted-2.0.2" sources."form-data-3.0.0" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.2" + sources."fsevents-2.1.3" sources."functional-red-black-tree-1.0.1" sources."glob-7.1.6" sources."glob-parent-5.1.1" @@ -75047,11 +74973,11 @@ in sources."read-1.0.7" sources."readable-stream-3.6.0" sources."regexpp-3.1.0" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-from-4.0.0" sources."restore-cursor-3.1.0" sources."rimraf-2.6.3" - sources."rollup-2.6.1" + sources."rollup-2.7.2" sources."run-async-2.4.0" sources."rxjs-6.5.5" sources."safe-buffer-5.2.0" @@ -75112,10 +75038,10 @@ in sources."tmp-0.0.29" ]; }) - sources."vscode-jsonrpc-5.0.1" - sources."vscode-languageclient-6.1.3" - sources."vscode-languageserver-protocol-3.15.3" - sources."vscode-languageserver-types-3.15.1" + sources."vscode-jsonrpc-5.1.0-next.1" + sources."vscode-languageclient-7.0.0-next.1" + sources."vscode-languageserver-protocol-3.16.0-next.2" + sources."vscode-languageserver-types-3.16.0-next.1" sources."which-1.3.1" sources."word-wrap-1.2.3" sources."wrappy-1.0.2" @@ -75140,7 +75066,7 @@ in sha1 = "c8fa1fffb8258ce68adf75df73f90fbb6f23d198"; }; dependencies = [ - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" @@ -75390,10 +75316,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "1.67.3"; + version = "1.68.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-1.67.3.tgz"; - sha512 = "GELorbWZI0iLroPAwuHBDF7xlTAlSfhkcSjsb0CBdBgKz8EU8eqhalzl8dU+C+hOM5j/LJK/ATwaIxJXndqwCw=="; + url = "https://registry.npmjs.org/serverless/-/serverless-1.68.0.tgz"; + sha512 = "CLA8K4B/oZm1LwgUDAfCHiVYGszveDSlAUr2mIdzdcVc3CLjzlRZn7IVipy3myXOc7/+kocxOqs3VXogm9A4Wg=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -75407,7 +75333,7 @@ in sources."node-fetch-2.6.0" ]; }) - (sources."@serverless/components-2.29.3" // { + (sources."@serverless/components-2.30.1" // { dependencies = [ sources."fs-extra-8.1.0" sources."globby-10.0.2" @@ -75444,7 +75370,7 @@ in sources."https-proxy-agent-5.0.0" ]; }) - (sources."@serverless/platform-client-china-1.0.5" // { + (sources."@serverless/platform-client-china-1.0.6" // { dependencies = [ sources."https-proxy-agent-5.0.0" ]; @@ -75457,7 +75383,7 @@ in ]; }) sources."@serverless/template-1.1.3" - (sources."@serverless/utils-china-0.1.3" // { + (sources."@serverless/utils-china-0.1.6" // { dependencies = [ sources."https-proxy-agent-5.0.0" ]; @@ -75468,10 +75394,10 @@ in sources."@types/color-name-1.1.1" sources."@types/events-3.0.0" sources."@types/glob-7.1.1" - sources."@types/lodash-4.14.149" + sources."@types/lodash-4.14.150" sources."@types/minimatch-3.0.3" - sources."@types/node-13.11.1" - (sources."@typescript-eslint/typescript-estree-2.28.0" // { + sources."@types/node-13.13.2" + (sources."@typescript-eslint/typescript-estree-2.29.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -75479,7 +75405,7 @@ in sources."adm-zip-0.4.14" sources."after-0.8.2" sources."agent-base-6.0.0" - sources."ajv-6.12.0" + sources."ajv-6.12.2" (sources."ansi-align-3.0.0" // { dependencies = [ sources."emoji-regex-7.0.3" @@ -75530,7 +75456,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.657.0" // { + (sources."aws-sdk-2.661.0" // { dependencies = [ sources."buffer-4.9.1" sources."isarray-1.0.0" @@ -75705,7 +75631,7 @@ in ]; }) sources."dashdash-1.14.1" - sources."dayjs-1.8.24" + sources."dayjs-1.8.25" sources."debug-4.1.1" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" @@ -75782,7 +75708,7 @@ in sources."enabled-1.0.2" sources."encoding-0.1.12" sources."end-of-stream-1.4.4" - (sources."engine.io-client-3.4.0" // { + (sources."engine.io-client-3.4.1" // { dependencies = [ sources."ws-6.1.4" ]; @@ -75880,7 +75806,7 @@ in sources."type-1.2.0" ]; }) - sources."fsevents-2.1.2" + sources."fsevents-2.1.3" sources."get-amd-module-type-3.0.0" sources."get-own-enumerable-property-symbols-3.0.2" sources."get-proxy-2.1.0" @@ -76011,10 +75937,10 @@ in sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."jsonata-1.8.2" + sources."jsonata-1.8.3" sources."jsonfile-4.0.0" sources."jsprim-1.4.1" - (sources."jszip-3.3.0" // { + (sources."jszip-3.4.0" // { dependencies = [ sources."isarray-1.0.0" sources."readable-stream-2.3.7" @@ -76215,7 +76141,7 @@ in sources."request-promise-native-1.0.8" sources."requirejs-2.3.6" sources."requirejs-config-file-3.1.2" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-dependency-path-2.0.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" @@ -76293,7 +76219,7 @@ in sources."sort-keys-length-1.0.1" sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" - sources."source-map-support-0.5.16" + sources."source-map-support-0.5.18" sources."source-map-url-0.4.0" sources."split-string-3.1.0" sources."split2-3.1.1" @@ -76387,7 +76313,7 @@ in sources."type-check-0.3.2" sources."type-fest-0.11.0" sources."typescript-3.8.3" - sources."unbzip2-stream-1.4.1" + sources."unbzip2-stream-1.4.2" (sources."union-value-1.0.1" // { dependencies = [ sources."is-extendable-0.1.1" @@ -76486,7 +76412,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Serverless Framework - Build web, mobile and IoT applications with serverless architectures using AWS Lambda, Azure Functions, Google CloudFunctions & more"; - homepage = "https://serverless.com/framework/docs/"; + homepage = https://serverless.com/framework/docs/; license = "MIT"; }; production = true; @@ -76506,7 +76432,7 @@ in sources."CSSwhat-0.4.7" sources."accepts-1.3.7" sources."after-0.8.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."array-flatten-1.1.1" sources."arraybuffer.slice-0.0.6" sources."asn1-0.2.4" @@ -77023,7 +76949,7 @@ in sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."mv-2.1.1" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."ncp-2.0.0" sources."negotiator-0.5.3" sources."node-uuid-1.4.8" @@ -77120,18 +77046,25 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.305.1"; + version = "1.309.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.305.1.tgz"; - sha512 = "ThBDMwaVybu0aIXDjm5ecJUVxJePaf3qgv9g8Ocoldk7q9QJXBTvp+piAtyJlkGsWeWhCZAWATBxOcPRF30XcA=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.309.0.tgz"; + sha512 = "NVizsLhGNhgjI+wCy1TajQoko+GVjop3r10BxX12KKxj3bUE9cDhqzkXmngHzuyFhTfdhED6yOzdg+jDvm1VpA=="; }; dependencies = [ - sources."@snyk/cli-interface-2.3.2" + sources."@snyk/cli-interface-2.4.0" sources."@snyk/cocoapods-lockfile-parser-3.1.0" sources."@snyk/composer-lockfile-parser-1.2.0" sources."@snyk/configstore-3.2.0-rc1" sources."@snyk/dep-graph-1.16.1" sources."@snyk/gemfile-1.2.0" + (sources."@snyk/java-call-graph-builder-1.3.4" // { + dependencies = [ + sources."ci-info-2.0.0" + sources."debug-4.1.1" + sources."snyk-config-3.0.0" + ]; + }) sources."@snyk/ruby-semver-2.1.0" (sources."@snyk/snyk-cocoapods-plugin-2.1.1" // { dependencies = [ @@ -77144,7 +77077,7 @@ in sources."@types/debug-4.1.5" sources."@types/events-3.0.0" sources."@types/js-yaml-3.12.3" - sources."@types/node-13.11.1" + sources."@types/node-13.13.2" sources."@types/restify-4.3.6" sources."@types/semver-5.5.0" sources."@types/xml2js-0.4.3" @@ -77296,7 +77229,7 @@ in sources."isarray-0.0.1" sources."isexe-2.0.0" sources."js-yaml-3.13.1" - sources."jszip-3.3.0" + sources."jszip-3.4.0" sources."latest-version-3.1.0" sources."lcid-1.0.0" sources."levn-0.3.0" @@ -77356,6 +77289,7 @@ in sources."prelude-ls-1.1.2" sources."prepend-http-1.0.4" sources."process-nextick-args-2.0.1" + sources."progress-2.0.3" sources."promise-7.3.1" sources."protocols-1.4.7" (sources."proxy-agent-3.1.1" // { @@ -77419,15 +77353,14 @@ in ]; }) sources."snyk-module-1.9.1" - (sources."snyk-mvn-plugin-2.9.0" // { + (sources."snyk-mvn-plugin-2.10.0" // { dependencies = [ - sources."@snyk/cli-interface-2.3.1" sources."debug-4.1.1" sources."tmp-0.1.0" - sources."tslib-1.9.3" + sources."tslib-1.11.0" ]; }) - sources."snyk-nodejs-lockfile-parser-1.17.0" + sources."snyk-nodejs-lockfile-parser-1.18.0" sources."snyk-nuget-plugin-1.16.0" sources."snyk-paket-parser-1.5.0" (sources."snyk-php-plugin-1.7.0" // { @@ -77460,7 +77393,7 @@ in ]; }) sources."source-map-0.6.1" - sources."source-map-support-0.5.16" + sources."source-map-support-0.5.18" sources."sprintf-js-1.0.3" sources."statuses-1.5.0" (sources."string-width-2.1.1" // { @@ -77483,8 +77416,12 @@ in sources."string_decoder-1.3.0" ]; }) - sources."temp-dir-1.0.0" - sources."tempfile-2.0.0" + sources."temp-dir-2.0.0" + (sources."tempfile-2.0.0" // { + dependencies = [ + sources."temp-dir-1.0.0" + ]; + }) sources."term-size-1.2.0" sources."then-fs-2.0.0" sources."through-2.3.8" @@ -77576,8 +77513,8 @@ in sources."component-inherit-0.0.3" sources."cookie-0.3.1" sources."debug-4.1.1" - sources."engine.io-3.4.0" - (sources."engine.io-client-3.4.0" // { + sources."engine.io-3.4.1" + (sources."engine.io-client-3.4.1" // { dependencies = [ sources."ws-6.1.4" ]; @@ -77742,7 +77679,7 @@ in sources."redent-2.0.0" sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."restore-cursor-2.0.0" sources."round-to-3.0.0" sources."safe-buffer-5.2.0" @@ -77753,7 +77690,7 @@ in sources."shebang-regex-1.0.0" sources."signal-exit-3.0.3" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."speedtest-net-1.6.2" @@ -78169,7 +78106,7 @@ in sources."rimraf-2.4.5" ]; }) - sources."nan-2.14.0" + sources."nan-2.14.1" (sources."nanomatch-1.2.13" // { dependencies = [ sources."arr-diff-4.0.0" @@ -78588,7 +78525,7 @@ in buildInputs = globalBuildInputs; meta = { description = "network protocol layer for secure-scuttlebutt"; - homepage = "https://github.com/ssbc/ssb-server"; + homepage = https://github.com/ssbc/ssb-server; license = "MIT"; }; production = true; @@ -78606,7 +78543,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Send metric data from statsd to Stackdriver"; - homepage = "https://www.stackdriver.com/"; + homepage = https://www.stackdriver.com/; license = "MIT"; }; production = true; @@ -78664,7 +78601,7 @@ in sources."semver-5.0.3" ]; }) - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."align-text-0.1.4" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -78681,7 +78618,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.657.0" // { + (sources."aws-sdk-2.661.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -78808,7 +78745,7 @@ in sources."drange-1.1.1" (sources."dtrace-provider-0.8.8" // { dependencies = [ - sources."nan-2.14.0" + sources."nan-2.14.1" ]; }) sources."ecc-jsbn-0.1.2" @@ -78817,14 +78754,14 @@ in sources."ejs-0.8.8" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - (sources."engine.io-3.4.0" // { + (sources."engine.io-3.4.1" // { dependencies = [ sources."cookie-0.3.1" sources."debug-4.1.1" sources."ws-7.2.3" ]; }) - (sources."engine.io-client-3.4.0" // { + (sources."engine.io-client-3.4.1" // { dependencies = [ sources."debug-4.1.1" sources."ws-6.1.4" @@ -79175,7 +79112,7 @@ in sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."requires-port-1.0.0" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."ret-0.2.2" sources."rethinkdb-2.4.2" sources."retry-0.9.0" @@ -79237,7 +79174,7 @@ in }) sources."source-map-0.6.1" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."split-1.0.1" @@ -79525,7 +79462,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Nodejs-based tool for optimizing SVG vector graphics files"; - homepage = "https://github.com/svg/svgo"; + homepage = https://github.com/svg/svgo; license = "MIT"; }; production = true; @@ -79881,7 +79818,7 @@ in sources."ms-2.0.0" sources."multer-1.4.2" sources."mute-stream-0.0.5" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nanomatch-1.2.13" sources."native-promise-only-0.8.1" sources."neo-async-2.6.1" @@ -80171,7 +80108,7 @@ in sha256 = "886069ecc5eedf0371b948e8ff66e7f2943c85fe7cfdaa7183e1a3572d55852b"; }; dependencies = [ - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -80491,13 +80428,13 @@ in sources."repeat-string-1.6.1" sources."replace-ext-1.0.0" sources."require-from-string-2.0.2" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."rimraf-2.6.3" sources."safe-buffer-5.1.2" sources."semver-5.7.1" sources."slice-ansi-0.0.4" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."sprintf-js-1.0.3" @@ -80560,7 +80497,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The pluggable linting tool for text and markdown."; - homepage = "https://github.com/textlint/textlint/"; + homepage = https://github.com/textlint/textlint/; license = "MIT"; }; production = true; @@ -80582,7 +80519,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Latex plugin for [textlint](https://github.com/textlint/textlint "textlint")."; - homepage = "https://github.com/elzup/textlint-plugin-latex"; + homepage = https://github.com/elzup/textlint-plugin-latex; license = "MIT"; }; production = true; @@ -80621,7 +80558,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule check that abbreviations within parentheses."; - homepage = "https://github.com/azu/textlint-rule-abbr-within-parentheses"; + homepage = https://github.com/azu/textlint-rule-abbr-within-parentheses; license = "MIT"; }; production = true; @@ -80820,7 +80757,7 @@ in sources."repeat-string-1.6.1" sources."repeating-2.0.1" sources."replace-ext-1.0.0" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-from-5.0.0" sources."retext-english-3.0.4" sources."retext-equality-3.2.0" @@ -80841,7 +80778,7 @@ in ]; }) sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."split-0.2.10" @@ -80935,7 +80872,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule for alex"; - homepage = "https://github.com/textlint-rule/textlint-rule-alex"; + homepage = https://github.com/textlint-rule/textlint-rule-alex; license = "MIT"; }; production = true; @@ -80960,7 +80897,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule to check common misspellings"; - homepage = "https://github.com/io-monad/textlint-rule-common-misspellings"; + homepage = https://github.com/io-monad/textlint-rule-common-misspellings; license = "GPL-3.0"; }; production = true; @@ -80982,7 +80919,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Textlint rule to check correct usage of diacritics"; - homepage = "https://github.com/sapegin/textlint-rule-diacritics"; + homepage = https://github.com/sapegin/textlint-rule-diacritics; license = "MIT"; }; production = true; @@ -81019,7 +80956,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule that specify the maximum word count of a sentence."; - homepage = "https://github.com/azu/textlint-rule-en-max-word-count"; + homepage = https://github.com/azu/textlint-rule-en-max-word-count; license = "MIT"; }; production = true; @@ -81112,7 +81049,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule that check no start with duplicated conjunction."; - homepage = "https://github.com/textlint-rule/textlint-rule-no-start-duplicated-conjunction"; + homepage = https://github.com/textlint-rule/textlint-rule-no-start-duplicated-conjunction; license = "MIT"; }; production = true; @@ -81153,7 +81090,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule that check with or without period in list item."; - homepage = "https://github.com/textlint-rule/textlint-rule-period-in-list-item"; + homepage = https://github.com/textlint-rule/textlint-rule-period-in-list-item; license = "MIT"; }; production = true; @@ -81183,7 +81120,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Textlint rule to find filler words, buzzwords and chiches"; - homepage = "https://github.com/sapegin/textlint-rule-stop-words"; + homepage = https://github.com/sapegin/textlint-rule-stop-words; license = "MIT"; }; production = true; @@ -81213,7 +81150,7 @@ in buildInputs = globalBuildInputs; meta = { description = "TextLint rule to check correct terms spelling"; - homepage = "https://github.com/sapegin/textlint-rule-terminology"; + homepage = https://github.com/sapegin/textlint-rule-terminology; license = "MIT"; }; production = true; @@ -81253,7 +81190,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule that check unexpanded acronym word."; - homepage = "https://github.com/textlint-rule/textlint-rule-unexpanded-acronym"; + homepage = https://github.com/textlint-rule/textlint-rule-unexpanded-acronym; license = "MIT"; }; production = true; @@ -81293,7 +81230,7 @@ in buildInputs = globalBuildInputs; meta = { description = "textlint rule to check your English style with write good"; - homepage = "https://github.com/textlint-rule/textlint-rule-write-good"; + homepage = https://github.com/textlint-rule/textlint-rule-write-good; license = "MIT"; }; production = true; @@ -81309,7 +81246,7 @@ in sha512 = "ozjuU9/DaxT5r7ivckvdrzTLRoMCOiUlNbEAxldoHD3jzbbCEm561rHkEw0Caek31tOL4y0yqHiFuRBRoGbmiQ=="; }; dependencies = [ - sources."@sindresorhus/is-2.1.0" + sources."@sindresorhus/is-2.1.1" sources."@szmarczak/http-timer-4.0.5" sources."@tokenizer/token-0.1.1" sources."@types/cacheable-request-6.0.1" @@ -81317,14 +81254,14 @@ in sources."@types/debug-4.1.5" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-13.11.1" + sources."@types/node-13.13.2" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-1.0.0" sources."accepts-1.3.7" sources."after-0.8.2" sources."agent-base-4.3.0" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-regex-2.1.1" sources."ansi-styles-4.2.1" sources."aproba-1.2.0" @@ -81416,14 +81353,14 @@ in sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - (sources."engine.io-3.4.0" // { + (sources."engine.io-3.4.1" // { dependencies = [ sources."cookie-0.3.1" sources."debug-4.1.1" sources."ms-2.1.2" ]; }) - (sources."engine.io-client-3.4.0" // { + (sources."engine.io-client-3.4.1" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" @@ -81447,7 +81384,7 @@ in sources."extsprintf-1.4.0" sources."fast-deep-equal-3.1.1" sources."fast-json-stable-stringify-2.1.0" - sources."fast-text-encoding-1.0.1" + sources."fast-text-encoding-1.0.2" sources."file-type-14.1.3" sources."filename-reserved-regex-2.0.0" sources."filenamify-4.1.0" @@ -81537,7 +81474,7 @@ in sources."mkdirp-0.5.5" sources."ms-2.0.0" sources."mute-stream-0.0.8" - sources."nan-2.14.0" + sources."nan-2.14.1" (sources."needle-2.4.1" // { dependencies = [ sources."debug-3.2.6" @@ -81728,7 +81665,7 @@ in buildInputs = globalBuildInputs; meta = { description = "The self-hosted Web IRC client"; - homepage = "https://thelounge.chat/"; + homepage = https://thelounge.chat/; license = "MIT"; }; production = true; @@ -81746,7 +81683,7 @@ in buildInputs = globalBuildInputs; meta = { description = "JavaScript 3D library"; - homepage = "https://threejs.org/"; + homepage = https://threejs.org/; license = "MIT"; }; production = true; @@ -81781,7 +81718,7 @@ in }; dependencies = [ sources."adm-zip-0.4.13" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.3" @@ -81975,7 +81912,7 @@ in sources."mooremachine-2.3.0" sources."mute-stream-0.0.8" sources."mv-2.1.1" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."ncp-2.0.0" sources."once-1.3.2" sources."path-is-absolute-1.0.1" @@ -82087,7 +82024,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Joyent Triton CLI and client (https://www.joyent.com/triton)"; - homepage = "https://github.com/joyent/node-triton"; + homepage = https://github.com/joyent/node-triton; license = "MPL-2.0"; }; production = true; @@ -82136,7 +82073,7 @@ in buildInputs = globalBuildInputs; meta = { description = "TSUN: a repl for TypeScript Upgraded Node"; - homepage = "https://github.com/HerringtonDarkholme/typescript-repl"; + homepage = https://github.com/HerringtonDarkholme/typescript-repl; license = "MIT"; }; production = true; @@ -82177,7 +82114,7 @@ in buildInputs = globalBuildInputs; meta = { description = "TypeScript is a language for application scale JavaScript development"; - homepage = "https://www.typescriptlang.org/"; + homepage = https://www.typescriptlang.org/; license = "Apache-2.0"; }; production = true; @@ -82254,7 +82191,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" - sources."@types/node-13.11.1" + sources."@types/node-13.13.2" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."after-0.8.2" @@ -82335,14 +82272,14 @@ in sources."enabled-1.0.2" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - (sources."engine.io-3.4.0" // { + (sources."engine.io-3.4.1" // { dependencies = [ sources."cookie-0.3.1" sources."debug-4.1.1" sources."ms-2.1.2" ]; }) - (sources."engine.io-client-3.4.0" // { + (sources."engine.io-client-3.4.1" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" @@ -82355,7 +82292,7 @@ in sources."etag-1.8.1" sources."eve-0.5.4" sources."express-4.17.1" - (sources."express-session-1.17.0" // { + (sources."express-session-1.17.1" // { dependencies = [ sources."depd-2.0.0" sources."safe-buffer-5.2.0" @@ -82663,7 +82600,7 @@ in }; dependencies = [ sources."absolute-0.0.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-escapes-3.2.0" sources."ansi-red-0.1.1" sources."ansi-regex-3.0.0" @@ -82914,7 +82851,7 @@ in sources."tweetnacl-0.14.5" sources."uglify-js-3.9.1" sources."uid-0.0.2" - sources."unbzip2-stream-1.4.1" + sources."unbzip2-stream-1.4.2" sources."unyield-0.0.1" sources."unzip-response-2.0.1" sources."uri-js-4.2.2" @@ -82971,14 +82908,14 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-13.11.1" + sources."@types/node-13.13.2" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" sources."abbrev-1.1.1" sources."acorn-6.4.1" sources."acorn-jsx-5.2.0" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ajv-keywords-2.1.1" (sources."ansi-align-3.0.0" // { dependencies = [ @@ -83462,7 +83399,7 @@ in sources."mout-0.5.0" sources."ms-2.1.2" sources."mute-stream-0.0.7" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nanomatch-1.2.13" sources."natural-compare-1.4.0" sources."nice-try-1.0.5" @@ -83642,7 +83579,7 @@ in sources."resolve-from-1.0.1" ]; }) - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-from-5.0.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" @@ -83709,7 +83646,7 @@ in sources."source-map-url-0.4.0" sources."space-separated-tokens-1.1.5" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."split-string-3.1.0" @@ -83941,7 +83878,7 @@ in buildInputs = globalBuildInputs; meta = { description = "vue-language-server"; - homepage = "https://github.com/vuejs/vetur/tree/master/server"; + homepage = https://github.com/vuejs/vetur/tree/master/server; license = "MIT"; }; production = true; @@ -83951,10 +83888,10 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-4.1.0.tgz"; - sha512 = "nhAeZ3BHI4rCT/J+s7JHg0U3G6qUMV8Bi44ohWm8X6GjlQV8tGcD6rkvN4Zk2zzMGaF9sHUOcRjyN79Ih8P/PQ=="; + url = "https://registry.npmjs.org/web-ext/-/web-ext-4.2.0.tgz"; + sha512 = "WM03BEeC7CVw4PV8lwXKO6ag00MYdwMMe1SAJJfxz0uNMbTu7cYoH6Ia+e2DnAzpeOJLKCeL1IXvgxZSwVp4/Q=="; }; dependencies = [ sources."@babel/code-frame-7.8.3" @@ -83978,25 +83915,29 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.11.1" + sources."@types/node-13.13.2" sources."JSONSelect-0.2.1" sources."acorn-6.4.1" sources."acorn-jsx-5.2.0" sources."adbkit-2.11.1" sources."adbkit-logcat-1.1.0" sources."adbkit-monkey-1.0.1" - (sources."addons-linter-1.20.0" // { + (sources."addons-linter-1.23.0" // { dependencies = [ - sources."regenerator-runtime-0.13.3" + sources."@babel/runtime-7.9.2" + sources."decamelize-1.2.0" + sources."yargs-15.3.1" ]; }) sources."adm-zip-0.4.14" - sources."ajv-6.10.2" + sources."ajv-6.12.0" sources."ajv-keywords-1.5.1" sources."ajv-merge-patch-4.1.0" (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; @@ -84077,15 +84018,7 @@ in }) sources."bluebird-2.9.34" sources."boolbase-1.0.0" - (sources."boxen-4.2.0" // { - dependencies = [ - sources."ansi-regex-5.0.0" - sources."emoji-regex-8.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" - sources."strip-ansi-6.0.0" - ]; - }) + sources."boxen-4.2.0" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ @@ -84104,7 +84037,6 @@ in sources."cache-base-1.0.1" (sources."cacheable-request-6.1.0" // { dependencies = [ - sources."get-stream-5.1.0" sources."lowercase-keys-2.0.0" ]; }) @@ -84121,7 +84053,12 @@ in sources."normalize-path-3.0.0" ]; }) - sources."chrome-launcher-0.12.0" + (sources."chrome-launcher-0.13.1" // { + dependencies = [ + sources."mkdirp-0.5.5" + sources."rimraf-3.0.2" + ]; + }) sources."ci-info-2.0.0" sources."circular-json-0.3.3" (sources."class-utils-0.3.6" // { @@ -84147,9 +84084,6 @@ in (sources."cliui-6.0.0" // { dependencies = [ sources."ansi-regex-5.0.0" - sources."emoji-regex-8.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" sources."strip-ansi-6.0.0" ]; }) @@ -84219,9 +84153,11 @@ in sources."define-properties-1.1.3" sources."define-property-2.0.2" sources."delayed-stream-1.0.0" - (sources."dispensary-0.49.0" // { + (sources."dispensary-0.51.2" // { dependencies = [ - sources."async-3.1.1" + sources."async-3.2.0" + sources."decamelize-1.2.0" + sources."yargs-15.3.1" ]; }) sources."doctrine-3.0.0" @@ -84234,7 +84170,7 @@ in sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" sources."ecdsa-sig-formatter-1.0.11" - sources."emoji-regex-7.0.3" + sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -84245,7 +84181,7 @@ in sources."es6-iterator-2.0.3" sources."es6-map-0.1.5" sources."es6-promise-2.3.0" - sources."es6-promisify-6.0.2" + sources."es6-promisify-6.1.0" (sources."es6-set-0.1.5" // { dependencies = [ sources."es6-symbol-3.1.1" @@ -84265,6 +84201,7 @@ in sources."debug-4.1.1" sources."espree-5.0.1" sources."has-flag-3.0.0" + sources."mkdirp-0.5.5" sources."ms-2.1.2" sources."semver-5.7.1" sources."strip-ansi-4.0.0" @@ -84296,6 +84233,7 @@ in sources."ignore-3.3.10" sources."inquirer-0.12.0" sources."is-fullwidth-code-point-1.0.0" + sources."mkdirp-0.5.5" sources."onetime-1.1.0" sources."progress-1.1.8" sources."restore-cursor-1.0.1" @@ -84318,7 +84256,7 @@ in sources."eslint-scope-4.0.3" sources."eslint-utils-1.4.3" sources."eslint-visitor-keys-1.1.0" - (sources."espree-6.1.2" // { + (sources."espree-6.2.1" // { dependencies = [ sources."acorn-7.1.1" ]; @@ -84334,7 +84272,17 @@ in sources."esutils-2.0.3" sources."event-emitter-0.3.5" sources."event-to-promise-0.8.0" - sources."execa-1.0.0" + (sources."execa-4.0.0" // { + dependencies = [ + sources."cross-spawn-7.0.2" + sources."mimic-fn-2.1.0" + sources."onetime-5.1.0" + sources."path-key-3.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."which-2.0.2" + ]; + }) sources."exit-hook-1.1.1" (sources."expand-brackets-2.1.4" // { dependencies = [ @@ -84375,8 +84323,12 @@ in ]; }) sources."extsprintf-1.3.0" - sources."fast-deep-equal-2.0.1" - sources."fast-json-patch-2.2.1" + sources."fast-deep-equal-3.1.1" + (sources."fast-json-patch-2.2.1" // { + dependencies = [ + sources."fast-deep-equal-2.0.1" + ]; + }) sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fast-redact-2.0.0" @@ -84392,7 +84344,7 @@ in ]; }) sources."find-up-4.1.0" - (sources."firefox-profile-1.3.0" // { + (sources."firefox-profile-1.3.1" // { dependencies = [ sources."async-2.5.0" ]; @@ -84422,7 +84374,7 @@ in sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" sources."get-caller-file-2.0.5" - sources."get-stream-4.1.0" + sources."get-stream-5.1.0" sources."get-value-2.0.6" sources."getpass-0.1.7" (sources."git-rev-sync-2.0.0" // { @@ -84439,7 +84391,11 @@ in }) sources."global-dirs-2.0.1" sources."globals-11.12.0" - sources."got-9.6.0" + (sources."got-9.6.0" // { + dependencies = [ + sources."get-stream-4.1.0" + ]; + }) sources."graceful-fs-4.2.3" sources."graceful-readlink-1.0.1" sources."growly-1.3.0" @@ -84459,6 +84415,7 @@ in sources."htmlparser2-3.10.1" sources."http-cache-semantics-4.1.0" sources."http-signature-1.2.0" + sources."human-signals-1.1.1" sources."iconv-lite-0.4.24" sources."ieee754-1.1.13" sources."ignore-4.0.6" @@ -84474,13 +84431,23 @@ in sources."ini-1.3.5" (sources."inquirer-6.5.2" // { dependencies = [ - sources."ansi-regex-4.1.0" + sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."chalk-2.4.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."has-flag-3.0.0" - sources."strip-ansi-5.2.0" + sources."is-fullwidth-code-point-2.0.0" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."strip-ansi-4.0.0" + ]; + }) + (sources."strip-ansi-5.2.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + ]; + }) sources."supports-color-5.5.0" ]; }) @@ -84499,7 +84466,7 @@ in sources."is-descriptor-1.0.2" sources."is-extendable-1.0.1" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-2.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" sources."is-installed-globally-0.3.2" sources."is-mergeable-object-1.1.1" @@ -84519,7 +84486,7 @@ in sources."is-regex-1.0.5" sources."is-relative-0.1.3" sources."is-resolvable-1.1.0" - sources."is-stream-1.1.0" + sources."is-stream-2.0.0" sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" @@ -84582,7 +84549,7 @@ in sources."lodash.once-4.1.1" sources."lodash.sortby-4.7.0" sources."lowercase-keys-1.0.1" - (sources."make-dir-3.0.2" // { + (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -84591,12 +84558,13 @@ in sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."marky-1.2.1" - sources."mdn-browser-compat-data-1.0.3" + sources."mdn-browser-compat-data-1.0.15" (sources."mem-5.1.1" // { dependencies = [ sources."mimic-fn-2.1.0" ]; }) + sources."merge-stream-2.0.0" sources."micromatch-3.1.10" sources."mime-db-1.43.0" sources."mime-types-2.1.26" @@ -84605,11 +84573,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mixin-deep-1.3.2" - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) + sources."mkdirp-1.0.3" sources."moment-2.24.0" sources."ms-2.0.0" sources."multimatch-4.0.0" @@ -84617,11 +84581,12 @@ in (sources."mv-2.1.1" // { dependencies = [ sources."glob-6.0.4" + sources."mkdirp-0.5.5" sources."rimraf-2.4.5" ]; }) sources."mz-2.7.0" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nanomatch-1.2.13" sources."natural-compare-1.4.0" sources."natural-compare-lite-1.4.0" @@ -84637,7 +84602,11 @@ in }) sources."normalize-path-2.1.1" sources."normalize-url-4.5.0" - sources."npm-run-path-2.0.2" + (sources."npm-run-path-4.0.1" // { + dependencies = [ + sources."path-key-3.1.1" + ]; + }) sources."nth-check-1.0.2" sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" @@ -84666,12 +84635,11 @@ in sources."open-7.0.0" sources."optionator-0.8.3" sources."os-homedir-1.0.2" - sources."os-locale-4.0.0" + sources."os-locale-5.0.0" sources."os-shim-0.1.3" sources."os-tmpdir-1.0.2" sources."p-cancelable-1.1.0" sources."p-defer-1.0.0" - sources."p-finally-1.0.0" sources."p-is-promise-2.1.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" @@ -84698,11 +84666,11 @@ in sources."path-parse-1.0.6" sources."pend-1.2.0" sources."performance-now-2.1.0" - sources."pino-5.15.0" + sources."pino-6.0.0" sources."pino-std-serializers-2.4.2" sources."pluralize-1.2.1" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.26" // { + (sources."postcss-7.0.27" // { dependencies = [ sources."ansi-styles-3.2.1" (sources."chalk-2.4.2" // { @@ -84725,7 +84693,7 @@ in sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.5.2" - sources."quick-format-unescaped-3.0.3" + sources."quick-format-unescaped-4.0.1" (sources."rc-1.2.8" // { dependencies = [ sources."strip-json-comments-2.0.1" @@ -84769,7 +84737,7 @@ in sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."require-uncached-1.0.3" - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-from-1.0.1" sources."resolve-url-0.2.1" sources."responselike-1.0.2" @@ -84784,7 +84752,7 @@ in sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."semver-7.1.1" + sources."semver-7.1.3" (sources."semver-diff-3.1.1" // { dependencies = [ sources."semver-6.3.0" @@ -84806,6 +84774,7 @@ in (sources."sign-addon-2.0.5" // { dependencies = [ sources."core-js-3.6.4" + sources."es6-promisify-6.0.2" sources."punycode-1.4.1" sources."request-2.88.0" sources."tough-cookie-2.4.3" @@ -84817,6 +84786,7 @@ in sources."ansi-styles-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" + sources."is-fullwidth-code-point-2.0.0" ]; }) (sources."snapdragon-0.8.2" // { @@ -84849,7 +84819,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."sonic-boom-0.7.7" + sources."sonic-boom-1.0.1" sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" sources."source-map-support-0.5.16" @@ -84884,10 +84854,10 @@ in sources."once-1.3.3" ]; }) - (sources."string-width-2.1.1" // { + (sources."string-width-4.2.0" // { dependencies = [ - sources."ansi-regex-3.0.0" - sources."strip-ansi-4.0.0" + sources."ansi-regex-5.0.0" + sources."strip-ansi-6.0.0" ]; }) sources."string.prototype.trimend-1.0.1" @@ -84899,12 +84869,14 @@ in sources."strip-bom-4.0.0" sources."strip-bom-buf-2.0.0" sources."strip-bom-stream-4.0.0" - sources."strip-eof-1.0.0" + sources."strip-final-newline-2.0.0" sources."strip-json-comments-3.0.1" sources."supports-color-7.1.0" (sources."table-5.4.6" // { dependencies = [ sources."ansi-regex-4.1.0" + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; @@ -84971,37 +84943,30 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."verror-1.10.0" - sources."watchpack-1.6.0" + sources."watchpack-1.6.1" sources."wcwidth-1.0.1" sources."webidl-conversions-5.0.0" sources."whatwg-url-8.0.0" sources."when-3.7.7" sources."which-1.3.1" sources."which-module-2.0.0" - (sources."widest-line-3.1.0" // { - dependencies = [ - sources."ansi-regex-5.0.0" - sources."emoji-regex-8.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" - sources."strip-ansi-6.0.0" - ]; - }) + sources."widest-line-3.1.0" sources."winreg-0.0.12" sources."word-wrap-1.2.3" (sources."wrap-ansi-6.2.0" // { dependencies = [ sources."ansi-regex-5.0.0" - sources."emoji-regex-8.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" sources."strip-ansi-6.0.0" ]; }) sources."wrappy-1.0.2" - sources."write-1.0.3" + (sources."write-1.0.3" // { + dependencies = [ + sources."mkdirp-0.5.5" + ]; + }) sources."write-file-atomic-3.0.3" - sources."ws-7.2.1" + sources."ws-7.2.3" sources."xdg-basedir-4.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" @@ -85010,15 +84975,11 @@ in sources."y18n-4.0.0" (sources."yargs-15.1.0" // { dependencies = [ - sources."ansi-regex-5.0.0" sources."decamelize-1.2.0" - sources."emoji-regex-8.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" - sources."strip-ansi-6.0.0" + sources."yargs-parser-16.1.0" ]; }) - (sources."yargs-parser-16.1.0" // { + (sources."yargs-parser-18.1.3" // { dependencies = [ sources."decamelize-1.2.0" ]; @@ -85040,7 +85001,7 @@ in buildInputs = globalBuildInputs; meta = { description = "A command line tool to help build, run, and test web extensions"; - homepage = "https://github.com/mozilla/web-ext"; + homepage = https://github.com/mozilla/web-ext; license = "MPL-2.0"; }; production = true; @@ -85050,10 +85011,10 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "4.42.1"; + version = "4.43.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.42.1.tgz"; - sha512 = "SGfYMigqEfdGchGhFFJ9KyRpQKnipvEvjc1TwrXEPCM6H5Wywu10ka8o3KGrMzSMxMQKt8aCHUFh5DaQ9UmyRg=="; + url = "https://registry.npmjs.org/webpack/-/webpack-4.43.0.tgz"; + sha512 = "GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g=="; }; dependencies = [ sources."@webassemblyjs/ast-1.9.0" @@ -85077,7 +85038,7 @@ in sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."acorn-6.4.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.4.1" (sources."anymatch-2.0.0" // { @@ -85306,7 +85267,7 @@ in sources."mkdirp-0.5.5" sources."move-concurrently-1.0.1" sources."ms-2.0.0" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nanomatch-1.2.13" sources."neo-async-2.6.1" (sources."node-libs-browser-2.2.1" // { @@ -85418,7 +85379,7 @@ in sources."source-list-map-2.0.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - (sources."source-map-support-0.5.16" // { + (sources."source-map-support-0.5.18" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -85516,7 +85477,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Packs CommonJs/AMD modules for the browser. Allows to split your codebase into multiple bundles, which can be loaded on demand. Support loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff."; - homepage = "https://github.com/webpack/webpack"; + homepage = https://github.com/webpack/webpack; license = "MIT"; }; production = true; @@ -85864,9 +85825,9 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.11.1" + sources."@types/node-13.13.2" sources."accepts-1.3.7" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.4.1" sources."ansi-colors-3.2.4" @@ -86164,7 +86125,7 @@ in sources."ms-2.0.0" sources."multicast-dns-6.2.3" sources."multicast-dns-service-types-1.1.0" - sources."nan-2.14.0" + sources."nan-2.14.1" sources."nanomatch-1.2.13" sources."negotiator-0.6.2" sources."nice-try-1.0.5" @@ -86463,7 +86424,7 @@ in sha512 = "P15M5ZC8dyCjQHWwd4Ia/dm0SgVvZJMYeykVIVYXbGyqO4dWB5oyPHp9i7wjwo5LhtlhKbiBCdS2NvM07Wlybg=="; }; dependencies = [ - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.4.1" sources."ansi-colors-3.2.4" @@ -86581,7 +86542,7 @@ in buildInputs = globalBuildInputs; meta = { description = "Copy files && directories with webpack"; - homepage = "https://github.com/webpack-contrib/copy-webpack-plugin"; + homepage = https://github.com/webpack-contrib/copy-webpack-plugin; license = "MIT"; }; production = true; @@ -86608,7 +86569,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-10.17.19" + sources."@types/node-13.13.2" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.0" @@ -86781,7 +86742,7 @@ in }) sources."prettier-bytes-1.0.4" sources."process-nextick-args-2.0.1" - sources."protobufjs-6.8.9" + sources."protobufjs-6.9.0" sources."pump-3.0.0" sources."qap-3.3.1" sources."queue-microtask-1.1.2" @@ -86809,7 +86770,7 @@ in sources."semver-5.1.1" sources."simple-concat-1.0.0" sources."simple-get-2.8.1" - (sources."simple-peer-9.6.2" // { + (sources."simple-peer-9.7.0" // { dependencies = [ sources."debug-4.1.1" sources."ms-2.1.2" @@ -86878,7 +86839,7 @@ in buildInputs = globalBuildInputs; meta = { description = "WebTorrent, the streaming torrent client. For the command line."; - homepage = "https://webtorrent.io/"; + homepage = https://webtorrent.io/; license = "MIT"; }; production = true; @@ -87019,10 +86980,10 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.11.1" + sources."@types/node-13.13.2" sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.0.1" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."ansi-0.3.1" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" @@ -87589,7 +87550,7 @@ in sources."tough-cookie-2.5.0" ]; }) - sources."resolve-1.16.0" + sources."resolve-1.17.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" sources."restore-cursor-2.0.0" @@ -87659,7 +87620,7 @@ in sources."source-map-url-0.4.0" sources."spawn-sync-1.0.15" sources."spdx-correct-3.1.0" - sources."spdx-exceptions-2.2.0" + sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.0" sources."spdx-license-ids-3.0.5" sources."split-string-3.1.0" @@ -87832,7 +87793,7 @@ in ]; }) sources."yeoman-doctor-4.0.0" - (sources."yeoman-environment-2.9.1" // { + (sources."yeoman-environment-2.9.5" // { dependencies = [ sources."ansi-escapes-4.3.1" sources."ansi-regex-5.0.0" @@ -87878,13 +87839,13 @@ in sources."which-2.0.2" ]; }) - (sources."yeoman-generator-4.8.2" // { + (sources."yeoman-generator-4.8.3" // { dependencies = [ sources."debug-4.1.1" sources."diff-4.0.2" sources."find-up-3.0.0" sources."locate-path-3.0.0" - (sources."make-dir-3.0.2" // { + (sources."make-dir-3.1.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -87917,11 +87878,11 @@ in buildInputs = globalBuildInputs; meta = { description = "CLI tool for running Yeoman generators"; - homepage = "http://yeoman.io/"; + homepage = http://yeoman.io/; license = "BSD-2-Clause"; }; production = true; bypassCache = true; reconstructLock = true; }; -} +} \ No newline at end of file diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json index 5769db505d8..d42da3bbc5b 100644 --- a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json +++ b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json @@ -4,16 +4,16 @@ "dependencies": { "jsonc-parser": "^2.2.1", "node-fetch": "^2.6.0", - "vscode-languageclient": "6.1.3", + "vscode-languageclient": "7.0.0-next.1", "@rollup/plugin-commonjs": "^11.0.2", "@rollup/plugin-node-resolve": "^7.1.1", "@types/node": "^12.12.34", "@types/node-fetch": "^2.5.5", - "@types/vscode": "1.43.0", - "@typescript-eslint/eslint-plugin": "^2.26.0", - "@typescript-eslint/parser": "^2.26.0", + "@types/vscode": "1.44.0", + "@typescript-eslint/eslint-plugin": "^2.27.0", + "@typescript-eslint/parser": "^2.27.0", "eslint": "^6.8.0", - "rollup": "^2.3.2", + "rollup": "^2.3.3", "tslib": "^1.11.1", "typescript": "^3.8.3", "typescript-formatter": "^7.2.2", -- cgit v1.2.3 From 900e433380b7375372cd493b32e066507047e231 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 23 Apr 2020 04:20:00 -0500 Subject: sd: 0.7.2 -> 0.7.4 --- pkgs/tools/text/sd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/sd/default.nix b/pkgs/tools/text/sd/default.nix index a12f07d6da6..0e905be01f2 100644 --- a/pkgs/tools/text/sd/default.nix +++ b/pkgs/tools/text/sd/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "sd"; - version = "0.7.2"; + version = "0.7.4"; src = fetchFromGitHub { owner = "chmln"; repo = pname; rev = "v${version}"; - sha256 = "15siv3p22v7lj37b74pjsy360qx97d40q2xdzdg2srbi8svjgg27"; + sha256 = "0y1mabnp0sbvayn695x1yfw04d2bky0r69wyidld6hllq3kqn9y2"; }; - cargoSha256 = "1sa7ki7kyg98l2gcrdzk7182ghm1clyqljjb596mhzh48g8kddn5"; + cargoSha256 = "1ra6argxs5dmpxhrr3az21myp27fl3nkdjfqn8cam2xhld1y270l"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; -- cgit v1.2.3 From 461a252bee3768c04017ddd67564db80c09befd0 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Thu, 23 Apr 2020 11:59:33 +0200 Subject: verifast: change license to MIT It seems verifast was relicensed to MIT in 2016: https://github.com/verifast/verifast/commit/b3c1bce76aec40de115c666e8d6e7d09f3f35a78 As this was the only package using lib.licenses.msrla I dropped it. --- lib/licenses.nix | 6 ------ pkgs/applications/science/logic/verifast/default.nix | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index a4ac08bb20e..4c07797b16c 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -524,12 +524,6 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { fullName = "Microsoft Public License"; }; - msrla = { - fullName = "Microsoft Research License Agreement"; - url = "http://research.microsoft.com/en-us/projects/pex/msr-la.txt"; - free = false; - }; - nasa13 = spdx { spdxId = "NASA-1.3"; fullName = "NASA Open Source Agreement 1.3"; diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix index c5e8078eff2..49618d2586b 100644 --- a/pkgs/applications/science/logic/verifast/default.nix +++ b/pkgs/applications/science/logic/verifast/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { meta = { description = "Verification for C and Java programs via separation logic"; homepage = "http://people.cs.kuleuven.be/~bart.jacobs/verifast/"; - license = stdenv.lib.licenses.msrla; + license = stdenv.lib.licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; }; -- cgit v1.2.3 From 58f8e4a8c2d1c258710ec8389cc6615abf6463c7 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 23 Apr 2020 12:48:19 +0200 Subject: inxi: 3.0.38-1 -> 3.1.00-1 --- pkgs/tools/system/inxi/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index f5b5d4ef7a2..c1697e375e0 100644 --- a/pkgs/tools/system/inxi/default.nix +++ b/pkgs/tools/system/inxi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "inxi"; - version = "3.0.38-1"; + version = "3.1.00-1"; src = fetchFromGitHub { owner = "smxi"; repo = "inxi"; rev = version; - sha256 = "1qw3sxgd3ly916bzzl3873s3flngwd3vh57slw0shsj7ivz8bfnm"; + sha256 = "0md6yfd297l8695g0rsbs4mm74dc3k00rfjl4x2n4i33mkylp6qa"; }; buildInputs = [ perl makeWrapper ]; @@ -24,6 +24,13 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A full featured CLI system information tool"; + longDescription = '' + inxi is a command line system information script built for console and + IRC. It is also used a debugging tool for forum technical support to + quickly ascertain users' system configurations and hardware. inxi shows + system hardware, CPU, drivers, Xorg, Desktop, Kernel, gcc version(s), + Processes, RAM usage, and a wide variety of other useful information. + ''; homepage = "https://smxi.org/docs/inxi.htm"; changelog = "https://github.com/smxi/inxi/blob/${version}/inxi.changelog"; license = licenses.gpl3Plus; -- cgit v1.2.3 From 2e6cd807d76f59def382be7bbe07da8d9da8e80b Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 23 Apr 2020 14:28:52 +0300 Subject: nginxStable: 1.16.1 -> 1.18.0 --- pkgs/servers/http/nginx/stable.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/stable.nix b/pkgs/servers/http/nginx/stable.nix index 001ea60839a..c08615ef512 100644 --- a/pkgs/servers/http/nginx/stable.nix +++ b/pkgs/servers/http/nginx/stable.nix @@ -1,6 +1,6 @@ { callPackage, ... } @ args: callPackage ./generic.nix args { - version = "1.16.1"; - sha256 = "0az3vf463b538ajvaq94hsz9ipmjgnamfj1jy0v5flfks5njl77i"; + version = "1.18.0"; + sha256 = "16azscl74ym1far0s0p6xsjin1k1cm4wk80i9x5d74dznmx3wdsc"; } -- cgit v1.2.3 From cbfe203da738f81739a6a1d0b5a22b05bc65b6c9 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 23 Apr 2020 14:33:29 +0300 Subject: nginxMainline: 1.17.9 -> 1.18.0 --- pkgs/servers/http/nginx/mainline.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index b382d2891f9..74df3c16472 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix args { - version = "1.17.9"; - sha256 = "12dnrdxwnlid0wr797vdxj9z1fmxnk7ib55bznvl2g3mbi05vmkx"; + version = "1.18.0"; + sha256 = "16azscl74ym1far0s0p6xsjin1k1cm4wk80i9x5d74dznmx3wdsc"; } -- cgit v1.2.3 From 18504037c5f088ae8fb45c712da1b252ff992d4c Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 23 Apr 2020 13:49:27 +0200 Subject: inxi: Add a flag to install all recommended tools --- pkgs/tools/system/inxi/default.nix | 27 ++++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/inxi/default.nix b/pkgs/tools/system/inxi/default.nix index c1697e375e0..36456501618 100644 --- a/pkgs/tools/system/inxi/default.nix +++ b/pkgs/tools/system/inxi/default.nix @@ -1,6 +1,26 @@ -{ stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper }: +{ lib, stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper +, ps, dnsutils # dig is recommended for multiple categories +, withRecommends ? false # Install (almost) all recommended tools (see --recommends) +, withRecommendedSystemPrograms ? withRecommends, utillinuxMinimal, dmidecode +, file, hddtemp, iproute, ipmitool, usbutils, kmod, lm_sensors, smartmontools +, binutils, tree, upower +, withRecommendedDisplayInformationPrograms ? withRecommends, glxinfo, xorg +}: -stdenv.mkDerivation rec { +let + prefixPath = programs: + "--prefix PATH ':' '${stdenv.lib.makeBinPath programs}'"; + recommendedSystemPrograms = lib.optionals withRecommendedSystemPrograms [ + utillinuxMinimal dmidecode file hddtemp iproute ipmitool usbutils kmod + lm_sensors smartmontools binutils tree upower + ]; + recommendedDisplayInformationPrograms = lib.optionals + withRecommendedDisplayInformationPrograms + ([ glxinfo ] ++ (with xorg; [ xdpyinfo xprop xrandr ])); + programs = [ ps dnsutils ] # Core programs + ++ recommendedSystemPrograms + ++ recommendedDisplayInformationPrograms; +in stdenv.mkDerivation rec { pname = "inxi"; version = "3.1.00-1"; @@ -17,7 +37,8 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp inxi $out/bin/ wrapProgram $out/bin/inxi \ - --set PERL5LIB "${perlPackages.makePerlPath (with perlPackages; [ CpanelJSONXS ])}" + --set PERL5LIB "${perlPackages.makePerlPath (with perlPackages; [ CpanelJSONXS ])}" \ + ${prefixPath programs} mkdir -p $out/share/man/man1 cp inxi.1 $out/share/man/man1/ ''; -- cgit v1.2.3 From 62a608fd63d8d554c38943e6dc377fcd7132b513 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 23 Apr 2020 08:16:58 -0400 Subject: linux: 4.19.117 -> 4.19.118 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 6ff9919e192..ab3d1b1a719 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.117"; + version = "4.19.118"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "12xc1pwhwq4vp67hmn7hdynl4ik76cni79356hpzf1lbiqlrya6n"; + sha256 = "15lcq3xky59v88vb8vvnmgcsmm1fadz0m4jyrii6rynsz5jr6x49"; }; } // (args.argsOverride or {})) -- cgit v1.2.3 From 2f10053834b7e8eeecb35a49cffa741d231c8142 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 23 Apr 2020 08:17:06 -0400 Subject: linux: 5.4.34 -> 5.4.35 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 69519a156fe..08b28bc98dc 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.34"; + version = "5.4.35"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1ljcsrw9jknw2d9hb0yfr1pwy85l8z4rqycgd0kad9mb9lrw2glh"; + sha256 = "1m06k19pbb3wz8z2dgf03jvzbbdh6q8jwwdz509s902a53vxasz1"; }; } // (args.argsOverride or {})) -- cgit v1.2.3 From 45c22565f60293b2343b1881826683e00316cb69 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 23 Apr 2020 08:17:15 -0400 Subject: linux: 5.6.6 -> 5.6.7 --- pkgs/os-specific/linux/kernel/linux-5.6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.6.nix b/pkgs/os-specific/linux/kernel/linux-5.6.nix index 4ed77c98301..a31e6e26d3f 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.6.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.6.6"; + version = "5.6.7"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1m3blvkma08v5y11jh0vhf4sr7jbcylkh15bssb5dgp40p8cx134"; + sha256 = "1jljcva3gxg1yc2kw3jjgmhzzdm16nylzxl63zbndjza547l5813"; }; } // (args.argsOverride or {})) -- cgit v1.2.3 From f35d50c68c33038f2c8dbca043e788b7377b3c76 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Thu, 23 Apr 2020 14:15:21 +0200 Subject: openvpn: 2.4.7 -> 2.4.9 Fixes CVE-2020-11736 --- pkgs/tools/networking/openvpn/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix index 88ed0599c2c..09ad8db46ea 100644 --- a/pkgs/tools/networking/openvpn/default.nix +++ b/pkgs/tools/networking/openvpn/default.nix @@ -19,11 +19,11 @@ let in stdenv.mkDerivation rec { pname = "openvpn"; - version = "2.4.7"; + version = "2.4.9"; src = fetchurl { url = "https://swupdate.openvpn.net/community/releases/${pname}-${version}.tar.xz"; - sha256 = "0j7na936isk9j8nsdrrbw7wmy09inmjqvsb8mw8az7k61xbm6bx4"; + sha256 = "1qpbllwlha7cffsd5dlddb8rl22g9rar5zflkz1wrcllhvfkl7v4"; }; nativeBuildInputs = [ pkgconfig ]; @@ -33,13 +33,6 @@ in stdenv.mkDerivation rec { ++ optional useSystemd systemd ++ optional pkcs11Support pkcs11helper; - patches = [ - ( fetchpatch { - url = "https://sources.debian.org/data/main/o/openvpn/2.4.7-1/debian/patches/fix-pkcs11-helper-hang.patch"; - sha256 = "0c8jzbfsmb0mm9f7kkjxac1hk8q6igm267s687vx3mdqs1wys6bm"; - }) - ]; - configureFlags = optionals stdenv.isLinux [ "--enable-iproute2" "IPROUTE=${iproute}/sbin/ip" ] @@ -68,7 +61,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A robust and highly flexible tunneling application"; - downloadPage = "https://openvpn.net/index.php/open-source/downloads.html"; + downloadPage = "https://openvpn.net/community-downloads/"; homepage = "https://openvpn.net/"; license = licenses.gpl2; maintainers = with maintainers; [ viric ]; -- cgit v1.2.3 From 2108f1aa34aa219bd6a75a1faef59988b2f4ead1 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Thu, 23 Apr 2020 15:17:25 +0200 Subject: gnome3.file-roller: 3.36.1 -> 3.36.2 Fixes CVE-2020-11736. --- pkgs/desktops/gnome-3/apps/file-roller/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/apps/file-roller/default.nix index 1243d5fa5cb..a735d9f446d 100644 --- a/pkgs/desktops/gnome-3/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome-3/apps/file-roller/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "file-roller"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/file-roller/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0p22jxcagamvp08xfglz4cz1sp8w4p101npw0ggrkhh7vm8yb9bh"; + sha256 = "1lkb0m8ys13sy3b6c1kj3cqrqf5d1dqvhbp8spz8v9yjv3d7z3r6"; }; LANG = "en_US.UTF-8"; # postinstall.py -- cgit v1.2.3 From 5abb13d3e0b97910ea8ee6011b35866a9dc83e70 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Thu, 23 Apr 2020 14:00:23 +0200 Subject: kitty: 0.17.2 -> 0.17.3 https://github.com/kovidgoyal/kitty/releases/tag/v0.17.3 --- pkgs/applications/misc/kitty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix index d1682227920..90dd04c9d68 100644 --- a/pkgs/applications/misc/kitty/default.nix +++ b/pkgs/applications/misc/kitty/default.nix @@ -20,14 +20,14 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.17.2"; + version = "0.17.3"; format = "other"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; rev = "v${version}"; - sha256 = "0xiwz89ynhh8aj0c9jbqfsxf129hnzs0gz4bzcparnjisq2sh3cq"; + sha256 = "1nx8gjavq8kc656ayh3wign1f68b46jbnmy8zyks25wg0p9gid8l"; }; buildInputs = [ -- cgit v1.2.3 From 16f0335d3f12d752ba8eb6f0345fa84250f53dc2 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 23 Apr 2020 16:17:51 +0200 Subject: .github/CODEOWNERS: Remove myself as codeowner from some paths It's a bit too spammy! --- .github/CODEOWNERS | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index c9abac5851b..e37a4de9d07 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -55,9 +55,6 @@ # NixOS integration test driver /nixos/lib/test-driver @tfc -# New NixOS modules -/nixos/modules/module-list.nix @Infinisil - # Python-related code and docs /maintainers/scripts/update-python-libraries @FRidh /pkgs/top-level/python-packages.nix @FRidh @jonringer @@ -67,7 +64,7 @@ # Haskell /pkgs/development/compilers/ghc @cdepillabout -/pkgs/development/haskell-modules @cdepillabout @infinisil +/pkgs/development/haskell-modules @cdepillabout /pkgs/development/haskell-modules/default.nix @cdepillabout /pkgs/development/haskell-modules/generic-builder.nix @cdepillabout /pkgs/development/haskell-modules/hoogle.nix @cdepillabout -- cgit v1.2.3 From 98db2b575b732f1b93c008a09eaaf926f167436e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 23 Apr 2020 07:55:26 +0100 Subject: gotools: 2019-11-14 -> 2020-04-21 --- pkgs/development/tools/gotools/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index 430f17bfb5b..6efb1d5da8f 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gotools-unstable"; - version = "2019-11-14"; - rev = "4191b8cbba092238a318a71cdff48b20b4e1e5d8"; + version = "2020-04-21"; + rev = "72e4a01eba4315301fd9ce00c8c2f492580ded8a"; src = fetchgit { inherit rev; url = "https://go.googlesource.com/tools"; - sha256 = "16m62m303j4wqfjr1401xpqpb9m11bs6qc2dhf6x2za2d9pycish"; + sha256 = "0a8c7j4w784w441j3j3bh640vy1g6g214641qv485wyi0xj49anf"; }; # Build of golang.org/x/tools/gopls fails with: @@ -21,7 +21,7 @@ buildGoModule rec { rm -rf gopls ''; - modSha256 = "16cfzmfr9jv8wz0whl433xdm614dk63fzjxv6l1xvkagjmki49iy"; + modSha256 = "1pijbkp7a9n2naicg21ydii6xc0g4jm5bw42lljwaks7211ag8k9"; postConfigure = '' # Make the builtin tools available here -- cgit v1.2.3 From 684b41042a3e8d4a10fb681505eee882e33ef9f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 23 Apr 2020 08:41:04 +0100 Subject: gopls: init at 0.4.0 --- pkgs/development/tools/gopls/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/tools/gopls/default.nix diff --git a/pkgs/development/tools/gopls/default.nix b/pkgs/development/tools/gopls/default.nix new file mode 100644 index 00000000000..77fd195b1ab --- /dev/null +++ b/pkgs/development/tools/gopls/default.nix @@ -0,0 +1,23 @@ +{ stdenv, go, buildGoModule, fetchgit }: + +buildGoModule rec { + pname = "gopls"; + version = "0.4.0"; + rev = "72e4a01eba4315301fd9ce00c8c2f492580ded8a"; + + src = fetchgit { + rev = "gopls/v${version}"; + url = "https://go.googlesource.com/tools"; + sha256 = "1sn6f638hgqpyd8rfyal3y6i6p21x4340jnhsvmgcd8lph49pplb"; + }; + + modRoot = "gopls"; + modSha256 = "1p0g28i707xyxz1g6hb56qlc4km9ik7vjky0v80hw7n73vzs5mr9"; + + meta = with stdenv.lib; { + description = "Official language server for the Go language"; + homepage = "https://github.com/golang/tools/tree/master/gopls"; + license = licenses.bsd3; + maintainers = with maintainers; [ mic92 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e4c3019ff37..2c3b2cc0a11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17265,6 +17265,8 @@ in go-langserver = callPackage ../development/tools/go-langserver { }; + gopls = callPackage ../development/tools/gopls { }; + gotests = callPackage ../development/tools/gotests { }; gotestsum = callPackage ../development/tools/gotestsum { -- cgit v1.2.3 From 40740541acec6d88aaabbd4ec95d998c848c4eb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 23 Apr 2020 08:44:57 +0100 Subject: reftools: 2018-09-14 -> 2019-12-21 --- pkgs/development/tools/reftools/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/reftools/default.nix b/pkgs/development/tools/reftools/default.nix index c8f540485a3..7e71926b895 100644 --- a/pkgs/development/tools/reftools/default.nix +++ b/pkgs/development/tools/reftools/default.nix @@ -1,12 +1,14 @@ -{ buildGoPackage +{ buildGoModule , lib , fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "reftools-unstable"; - version = "2018-09-14"; - rev = "654d0ba4f96d62286ca33cd46f7674b84f76d399"; + version = "2019-12-21"; + rev = "65925cf013156409e591f7a1be4df96f640d02f4"; + + modSha256 = "1sihahgkcj018ixbnz58npfh4drhqip2xmc9p7lq3an8japb9nyx"; goPackagePath = "github.com/davidrjenni/reftools"; excludedPackages = "\\(cmd/fillswitch/test-fixtures\\)"; @@ -16,7 +18,7 @@ buildGoPackage rec { owner = "davidrjenni"; repo = "reftools"; - sha256 = "12y2h1h15xadc8pa3xsj11hpdxz5dss6k7xaa4h1ifkvnasjp5w2"; + sha256 = "18jg13skqi2v2vh2k6jvazv6ymhhybangjd23xn2asfk9g6cvnjs"; }; meta = with lib; { -- cgit v1.2.3 From 4508ccc6faf8d764e8af19ff1fb41bbe22f653e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 23 Apr 2020 08:47:58 +0100 Subject: gomodifytags: 2018-09-14 -> 1.4.0 --- pkgs/development/tools/gomodifytags/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/gomodifytags/default.nix b/pkgs/development/tools/gomodifytags/default.nix index 188f60e3ef0..2f784b999e2 100644 --- a/pkgs/development/tools/gomodifytags/default.nix +++ b/pkgs/development/tools/gomodifytags/default.nix @@ -1,17 +1,18 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { - pname = "gomodifytags-unstable"; - version = "2018-09-14"; - rev = "141225bf62b6e5c9c0c9554a2e993e8c30aebb1d"; +buildGoModule rec { + pname = "gomodifytags"; + version = "1.4.0"; + + modSha256 = "0nkdk2zgnwsg9lv20vqk2lshk4g9fqwqxd5bpr78nlahb9xk486s"; goPackagePath = "github.com/fatih/gomodifytags"; src = fetchFromGitHub { - inherit rev; owner = "fatih"; repo = "gomodifytags"; - sha256 = "16qbp594l90qpvf388wlv0kf6wvqj1vz2mqq0g3qcz6dkrc4cjqa"; + rev = "v${version}"; + sha256 = "1436wjqs6n2jxlyzx38nm4ih6fr11bybivg3wy5nvzfs6cs59q63"; }; meta = { -- cgit v1.2.3 From 771c6d57c51d625f7cc80df02a9e5f2cb164f5b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 23 Apr 2020 09:23:39 +0100 Subject: gopkgs: 2.0.1 -> 2.1.2 --- pkgs/development/tools/gopkgs/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/gopkgs/default.nix b/pkgs/development/tools/gopkgs/default.nix index 1f7d1d63a62..51c4255a013 100644 --- a/pkgs/development/tools/gopkgs/default.nix +++ b/pkgs/development/tools/gopkgs/default.nix @@ -1,19 +1,22 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "gopkgs"; - version = "2.0.1"; + version = "2.1.2"; goPackagePath = "github.com/uudashr/gopkgs"; - goDeps = ./deps.nix; + + subPackages = [ "cmd/gopkgs" ]; src = fetchFromGitHub { rev = "v${version}"; owner = "uudashr"; repo = "gopkgs"; - sha256 = "03zfwkmzwx2knkghky3irb2r78lbc1ccszjcg9y445b4pbqkn6w4"; + sha256 = "1jak1bg6k5iasscw68ra875k59k3iqhka2ykabsd427k1j3mypln"; }; + modSha256 = "0v9lg5kq3776b2s4kgyi19jy8shjqrr0f5ljrchsj1k7867sxiw7"; + meta = { description = "Tool to get list available Go packages."; homepage = "https://github.com/uudashr/gopkgs"; -- cgit v1.2.3 From 9e4b5b78bf65c87b32bb51d0c9042134c792b811 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 23 Apr 2020 09:39:26 +0100 Subject: impl: 2018-02-27 -> 2019-11-19 --- pkgs/development/tools/impl/default.nix | 7 +++---- pkgs/development/tools/impl/deps.nix | 23 +++++++++++++++++++++-- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/impl/default.nix b/pkgs/development/tools/impl/default.nix index 223f3d425c9..88b8abd842f 100644 --- a/pkgs/development/tools/impl/default.nix +++ b/pkgs/development/tools/impl/default.nix @@ -5,17 +5,16 @@ buildGoPackage rec { pname = "impl-unstable"; - version = "2018-02-27"; - rev = "3d0f908298c49598b6aa84f101c69670e15d1d03"; + version = "2019-11-19"; + rev = "6b9658ad00c7fbd61a7b50c195754413f6c4142c"; goPackagePath = "github.com/josharian/impl"; src = fetchFromGitHub { inherit rev; - owner = "josharian"; repo = "impl"; - sha256 = "0xpip20x5vclrl0by1760lg73v6lj6nmkbiazlskyvpkw44h8a7c"; + sha256 = "1d4fvj7fgiykznx1z4fmcc06x5hsqp9wn62m5qm1ds8m0rjqaxwi"; }; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/impl/deps.nix b/pkgs/development/tools/impl/deps.nix index 3477aaed607..f028df3be2d 100644 --- a/pkgs/development/tools/impl/deps.nix +++ b/pkgs/development/tools/impl/deps.nix @@ -1,11 +1,30 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 [ + { + goPackagePath = "golang.org/x/mod"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/mod"; + rev = "2addee1ccfb22349ab47953a3046338e461eb4d1"; + sha256 = "1r0drcji290nlq9czibcfynpwxyqx8a5p4b7lam6wblbh2lasfb6"; + }; + } { goPackagePath = "golang.org/x/tools"; fetch = { type = "git"; url = "https://go.googlesource.com/tools"; - rev = "96e9e165b75e735822645eff82850b08c377be36"; - sha256 = "1zj9ck5sg9b0pphxybmvxf64hhcap7v7j37fx3v5aknf18crjjdg"; + rev = "72e4a01eba4315301fd9ce00c8c2f492580ded8a"; + sha256 = "0a8c7j4w784w441j3j3bh640vy1g6g214641qv485wyi0xj49anf"; + }; + } + { + goPackagePath = "golang.org/x/xerrors"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/xerrors"; + rev = "9bdfabe68543c54f90421aeb9a60ef8061b5b544"; + sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c"; }; } ] -- cgit v1.2.3 From 32278c87912db21bfd3c544bfbbbcd2e7a58dfa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 23 Apr 2020 09:43:12 +0100 Subject: gocode: 2018-11-05 -> 2020-04-06 --- pkgs/development/tools/gocode/default.nix | 6 +++--- pkgs/development/tools/gocode/deps.nix | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/gocode/default.nix b/pkgs/development/tools/gocode/default.nix index 12c94cbd3cd..b4e9a8d43cb 100644 --- a/pkgs/development/tools/gocode/default.nix +++ b/pkgs/development/tools/gocode/default.nix @@ -2,8 +2,8 @@ buildGoPackage rec { pname = "gocode-unstable"; - version = "2018-11-05"; - rev = "0af7a86943a6e0237c90f8aeb74a882e1862c898"; + version = "2020-04-06"; + rev = "4acdcbdea79de6b3dee1c637eca5cbea0fdbe37c"; goPackagePath = "github.com/mdempsky/gocode"; excludedPackages = ''internal/suggest/testdata''; @@ -18,7 +18,7 @@ buildGoPackage rec { owner = "mdempsky"; repo = "gocode"; - sha256 = "0fxqn0v6dbwarn444lc1xrx5vfkcidi73f4ba7l4clsb9qdqgyam"; + sha256 = "0i1hc089gb6a4mcgg56vn5l0q96wrlza2n08l4349s3dc2j559fb"; }; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/gocode/deps.nix b/pkgs/development/tools/gocode/deps.nix index ac966269706..b2518109171 100644 --- a/pkgs/development/tools/gocode/deps.nix +++ b/pkgs/development/tools/gocode/deps.nix @@ -1,11 +1,12 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 [ { goPackagePath = "golang.org/x/tools"; fetch = { type = "git"; url = "https://go.googlesource.com/tools"; - rev = "78dc5bac0cacea7969e98b79c3b86597e0aa4e25"; - sha256 = "16jg2x1sfm39kz4rchn0gxyq99fnkxw6v51wxriqbs76a2wrznp9"; + rev = "72e4a01eba4315301fd9ce00c8c2f492580ded8a"; + sha256 = "0a8c7j4w784w441j3j3bh640vy1g6g214641qv485wyi0xj49anf"; }; } ] -- cgit v1.2.3 From 4fe70362b96f988d742989a008a804cf98bebc8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 23 Apr 2020 09:46:05 +0100 Subject: godef: 1.1.1 -> 1.1.2 --- pkgs/development/tools/godef/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/godef/default.nix b/pkgs/development/tools/godef/default.nix index 60a155cf6c8..5cf51599272 100644 --- a/pkgs/development/tools/godef/default.nix +++ b/pkgs/development/tools/godef/default.nix @@ -1,18 +1,20 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "godef"; - version = "1.1.1"; + version = "1.1.2"; rev = "v${version}"; goPackagePath = "github.com/rogpeppe/godef"; subPackages = [ "." ]; + modSha256 = "06mi8f2qs54gk2anxqcf70h96s63a99xhnlm294djyv37wy1yffi"; + src = fetchFromGitHub { inherit rev; owner = "rogpeppe"; repo = "godef"; - sha256 = "1bpzqnb9fsk1pjjap3gm94pqch1jz02rfah9hg8iqbfm0dzpy31b"; + sha256 = "0rhhg73kzai6qzhw31yxw3nhpsijn849qai2v9am955svmnckvf4"; }; meta = { -- cgit v1.2.3 From 40793b5e23cc48c56f7f9b4c3d09d4e6e1f8d402 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 23 Apr 2020 09:48:08 +0100 Subject: gogetdoc: 2018-10-25 -> 2019-02-28 --- pkgs/development/tools/gogetdoc/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/gogetdoc/default.nix b/pkgs/development/tools/gogetdoc/default.nix index 1835121ba19..744ff0b6073 100644 --- a/pkgs/development/tools/gogetdoc/default.nix +++ b/pkgs/development/tools/gogetdoc/default.nix @@ -1,12 +1,14 @@ -{ buildGoPackage +{ buildGoModule , lib , fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "gogetdoc-unstable"; - version = "2018-10-25"; - rev = "9098cf5fc236a5e25060730544af2ba6d65cd968"; + version = "2019-02-28"; + rev = "b37376c5da6aeb900611837098f40f81972e63e4"; + + modSha256 = "0j6a2b8hx54cnjz1ya65v9czg9ygqj6zwg52ffpz7cqkx0pgl9q4"; goPackagePath = "github.com/zmb3/gogetdoc"; excludedPackages = "\\(testdata\\)"; @@ -16,7 +18,7 @@ buildGoPackage rec { owner = "zmb3"; repo = "gogetdoc"; - sha256 = "159dgkd2lz07kimbpzminli5p539l4ry0dr93r46iz3lk5q76znl"; + sha256 = "1v74zd0x2xh10603p8raazssacv3y0x0lr9apkpsdk0bfp5jj0lr"; }; goDeps = ./deps.nix; -- cgit v1.2.3 From 019dc065ee5874eee1ef8f23f5236022843fd8c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 23 Apr 2020 08:11:06 +0100 Subject: gometalinter: remove gometalinter development has stopped. golangci-lint is the replacement --- pkgs/development/tools/gometalinter/default.nix | 70 ------------------------- pkgs/misc/vim-plugins/overrides.nix | 4 +- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 4 files changed, 3 insertions(+), 74 deletions(-) delete mode 100644 pkgs/development/tools/gometalinter/default.nix diff --git a/pkgs/development/tools/gometalinter/default.nix b/pkgs/development/tools/gometalinter/default.nix deleted file mode 100644 index 1cd83e443aa..00000000000 --- a/pkgs/development/tools/gometalinter/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ buildGoPackage -, deadcode -, errcheck -, fetchFromGitHub -, go -, go-check -, go-tools -, goconst -, gocyclo -, golint -, gosec -, gotools -, ineffassign -, maligned -, interfacer -, lib -, makeWrapper -, unconvert -}: - -with lib; - -let - runtimeDeps = [ - deadcode - errcheck - go - go-check - go-tools - goconst - gocyclo - golint - gosec - gotools - ineffassign - interfacer - maligned - unconvert - ]; - -in buildGoPackage rec { - pname = "gometalinter"; - version = "3.0.0"; - - goPackagePath = "github.com/alecthomas/gometalinter"; - excludedPackages = "\\(regressiontests\\)"; - - src = fetchFromGitHub { - owner = "alecthomas"; - repo = "gometalinter"; - rev = "v${version}"; - sha256 = "06dd60531qp0hxfwnxnyi36d6div1j781jvcb99ykhgrg0kwmzq9"; - }; - - postInstall = '' - wrapProgram $bin/bin/gometalinter --prefix PATH : "${makeBinPath runtimeDeps}" - ''; - - buildInputs = [ makeWrapper ]; - - allowGoReference = true; - - meta = with lib; { - description = "Concurrently run Go lint tools and normalise their output"; - homepage = "https://github.com/alecthomas/gometalinter"; - license = licenses.mit; - maintainers = with maintainers; [ kalbasit rvolosatovs ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index ef27712b568..66e956a0f16 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -22,7 +22,7 @@ # vim-go dependencies , asmfmt, delve, errcheck, godef, golint , gomodifytags, gotags, gotools, go-motion -, gnused, reftools, gogetdoc, gometalinter +, gnused, reftools, gogetdoc, golangci-lint , impl, iferr, gocode, gocode-gomod, go-tools # direnv-vim dependencies @@ -550,7 +550,7 @@ self: super: { godef gogetdoc golint - gometalinter + golangci-lint gomodifytags gotags gotools diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9ad282149aa..a115a70d44a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -169,6 +169,7 @@ mapAliases ({ go-pup = pup; # added 2017-12-19 gobjectIntrospection = gobject-introspection; # added 2018-12-02 goimports = gotools; # added 2018-09-16 + gometalinter = throw "Abandoned by upstream. Consider switching to golangci-lint instead"; # added 2020-04-23 google-gflags = gflags; # added 2019-07-25 googleAuthenticator = google-authenticator; # added 2016-10-16 grantlee5 = libsForQt5.grantlee; # added 2015-12-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2c3b2cc0a11..02352346e47 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8599,8 +8599,6 @@ in gogetdoc = callPackage ../development/tools/gogetdoc { }; - gometalinter = callPackage ../development/tools/gometalinter { }; - gox = callPackage ../development/tools/gox { }; gprolog = callPackage ../development/compilers/gprolog { }; -- cgit v1.2.3 From 1bceaa1ceeb68ea443be39065d03a335935021e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 23 Apr 2020 15:52:14 +0100 Subject: linux_hardened: fix evaluation --- pkgs/os-specific/linux/kernel/hardened-patches.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/hardened-patches.json b/pkgs/os-specific/linux/kernel/hardened-patches.json index 6eb83ee8bb1..b00bcbaa715 100644 --- a/pkgs/os-specific/linux/kernel/hardened-patches.json +++ b/pkgs/os-specific/linux/kernel/hardened-patches.json @@ -9,7 +9,7 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.117.a/linux-hardened-4.19.117.a.patch", "version_suffix": "a" }, - "5.4.34": { + "5.4.35": { "sha256": "1xwpqr9nzpjg837b3wnzb8fmrl2g9rz8gz5yb55vnnllbzbz36v6", "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.34.a/linux-hardened-5.4.34.a.patch", "version_suffix": "a" -- cgit v1.2.3 From 7c4282bf43c7c014db5911041dbf4537fcaec95f Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Thu, 23 Apr 2020 15:08:45 +0000 Subject: postgresql: remove version from passthru It is already available in the regular attrs. `passthru.version` prevents `overrideAttrs (attrs: { version = "x"; })` from taking effect. --- pkgs/servers/sql/postgresql/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index ec325fc3e42..8ba7e9c96cf 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -125,7 +125,7 @@ let disallowedReferences = [ stdenv.cc ]; passthru = { - inherit readline psqlSchema version; + inherit readline psqlSchema; pkgs = let scope = { postgresql = this; }; -- cgit v1.2.3 From 6dfd563633ba75e814f821e3b431ebefdc69da51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 23 Apr 2020 16:44:40 +0100 Subject: linux_latest-hardened: fix evaluation --- pkgs/os-specific/linux/kernel/hardened-patches.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/hardened-patches.json b/pkgs/os-specific/linux/kernel/hardened-patches.json index b00bcbaa715..f916ad13488 100644 --- a/pkgs/os-specific/linux/kernel/hardened-patches.json +++ b/pkgs/os-specific/linux/kernel/hardened-patches.json @@ -19,7 +19,7 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.5.19.a/linux-hardened-5.5.19.a.patch", "version_suffix": "a" }, - "5.6.6": { + "5.6.7": { "sha256": "0jiqh0frxirjbccgfdk007fca6r6n36n0pkqq4jszkckn59ayl7r", "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.6.a/linux-hardened-5.6.6.a.patch", "version_suffix": "a" -- cgit v1.2.3 From a4adb1f75b5ee41e8efcf0e2401aaee0aadbc4b9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 23 Apr 2020 18:00:47 +0200 Subject: =?UTF-8?q?coqPackages.equations:=201.2=20=E2=86=92=201.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/equations/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix index c1177dc9789..060fa3b4c81 100644 --- a/pkgs/development/coq-modules/equations/default.nix +++ b/pkgs/development/coq-modules/equations/default.nix @@ -21,15 +21,21 @@ let }; "8.9" = { - version = "1.2"; - rev = "v1.2-8.9"; - sha256 = "1q3wvicr43bgy7xn1diwh4j43mnrhprrc2xd22qlbz9cl6bhf8bj"; + version = "1.2.1"; + rev = "v1.2.1-8.9"; + sha256 = "0d8ddj6nc6p0k25cd8fs17cq427zhzbc3v9pk2wd2fnvk70nlfij"; }; "8.10" = { - version = "1.2"; - rev = "v1.2-8.10"; - sha256 = "1v5kx0xzxzsbs5r4w08rm1lrmjjggnd3ap0sd1my88ds17jzyasd"; + version = "1.2.1"; + rev = "v1.2.1-8.10-2"; + sha256 = "0j3z4l5nrbyi9zbbyqkc6kassjanwld2188mwmrbqspaypm2ys68"; + }; + + "8.11" = { + version = "1.2.1"; + rev = "v1.2.1-8.11"; + sha256 = "06k0h7lansxs479is3vj5ikg8s5k4c6svnqcwmxbni4wx8bhmg17"; }; }; param = params.${coq.coq-version}; -- cgit v1.2.3 From 0cd48c19f6c414c1c8151c302513e5cc1651ad59 Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Mon, 20 Apr 2020 07:19:45 -0700 Subject: prometheus: 2.17.1 -> 2.17.2 --- pkgs/servers/monitoring/prometheus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index d0b413a10a0..e43e625e449 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -1,13 +1,13 @@ { lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage }: let - version = "2.17.1"; + version = "2.17.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "prometheus"; repo = "prometheus"; - sha256 = "0ai9l7gx25x5m07617c0cjzwxknywwq822fn2q5b850hvs48whyv"; + sha256 = "1q89c98rdypfcw8sqzipwlmxg8vrm4b9vdryygnacxv4am7bxsia"; }; webui = mkYarnPackage { -- cgit v1.2.3 From af87f13d0c9ace72a46553de1208755fb52aaa22 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Wed, 22 Apr 2020 11:31:33 -0700 Subject: gtk3: 3.24.17 -> 3.24.18 --- pkgs/development/libraries/gtk/3.x.nix | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index c4e6af5d62a..a3fe432017c 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -48,7 +48,7 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "gtk+3"; - version = "3.24.17"; + version = "3.24.18"; outputs = [ "out" "dev" ] ++ optional withGtkDoc "devdoc"; outputBin = "dev"; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "1h5snvqz8f6zgwpmq7pblvfwj5dphfckj8bv7vdz1c0w49dja47j"; + sha256 = "1lia2ybd1661j6mvrc00iyd50gm7sy157bdzlyf4mr028rzzzspm"; }; patches = [ @@ -73,21 +73,6 @@ stdenv.mkDerivation rec { # https://gitlab.gnome.org/GNOME/gtk/merge_requests/1002 ./patches/01-build-Fix-path-handling-in-pkgconfig.patch - - # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/1634 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/79732da1ed8cb167440fb047c72cfc0d888a187b.patch"; - sha256 = "1ynrx81dkwjfqhvg80q28qbb6jabg4x73fkbrnligzgkzimfjpx3"; - }) - # https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/1633 - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/12fc9a45efcbb546eb7de13c5c4d3183f2f5a3b8.patch"; - sha256 = "00zrm77qk39p1hgn207az82cgvqiyp6is7dk0ssjxkc34403r78v"; - }) - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/5a52af20cba76474e631b2a7548963bcad22d66d.patch"; - sha256 = "0sbzzwa0si1w83m5abyf312f4w445wwlms53m5hb7kdgkjbhaa3f"; - }) ] ++ optionals stdenv.isDarwin [ # X11 module requires which is not installed on Darwin # let’s drop that dependency in similar way to how other parts of the library do it -- cgit v1.2.3 From 5faab9898e6f0fda94aad2027653c6b5474056e9 Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Thu, 23 Apr 2020 09:38:50 -0700 Subject: grafana: 6.7.2 -> 6.7.3 --- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index ac50717208a..66e534a0f9a 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "grafana"; - version = "6.7.2"; + version = "6.7.3"; goPackagePath = "github.com/grafana/grafana"; @@ -12,12 +12,12 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "03f6f9caxphrfbps0ljwwiq246vfjlznd8xs7a7va7kb823ff5li"; + sha256 = "14yrfrn59r3mxbkhs7mg7nlhnvvrmq959r8w4aj6m7wgr32jj8wl"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "0sgpc34jfldi0hkbqx9idkzm1n1jy82yhg29kdsvndxvi44z49lv"; + sha256 = "17h70h6cz1bdhczjqa68kxzfm4vi95zdnqzah8hcjr7rwnx874kr"; }; postPatch = '' -- cgit v1.2.3 From 17db6b8ad6c26fab4b6be20ebf4628587307fe4b Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 23 Apr 2020 13:10:39 -0400 Subject: elementary-planner: 2.3.2 -> 2.3.3 --- .../elementary-planner/0001-Revert-Add-patch.patch | 84 ---------------------- .../office/elementary-planner/default.nix | 14 +--- 2 files changed, 2 insertions(+), 96 deletions(-) delete mode 100644 pkgs/applications/office/elementary-planner/0001-Revert-Add-patch.patch diff --git a/pkgs/applications/office/elementary-planner/0001-Revert-Add-patch.patch b/pkgs/applications/office/elementary-planner/0001-Revert-Add-patch.patch deleted file mode 100644 index ede3bc7a6ad..00000000000 --- a/pkgs/applications/office/elementary-planner/0001-Revert-Add-patch.patch +++ /dev/null @@ -1,84 +0,0 @@ -From a6d8bd67416c848f9bf52f4746bda34216ae9993 Mon Sep 17 00:00:00 2001 -From: worldofpeace -Date: Sun, 19 Apr 2020 12:48:59 -0400 -Subject: [PATCH] Revert "Add patch" - -This reverts commit c44127936b785afda0e914da4c1dc1e66a0ac97b. ---- - src/Application.vala | 49 -------------------------------------------- - 1 file changed, 49 deletions(-) - -diff --git a/src/Application.vala b/src/Application.vala -index 43d52fbc..82a9ebe5 100644 ---- a/src/Application.vala -+++ b/src/Application.vala -@@ -127,66 +127,17 @@ public class Planner : Gtk.Application { - - utils.apply_theme_changed (); - -- // Set Theme and Icon - Gtk.Settings.get_default ().set_property ("gtk-icon-theme-name", "elementary"); - Gtk.Settings.get_default ().set_property ("gtk-theme-name", "elementary"); - -- // Path Theme -- var command = new Granite.Services.SimpleCommand (".", "echo $DESKTOP_SESSION"); -- command.run (); -- command.output_changed.connect ((text) => { -- print ("DESKTOP_SESSION: %s\n".printf (text)); -- }); -- -- if (get_os_info ("PRETTY_NAME") == null || get_os_info ("PRETTY_NAME").index_of ("elementary") == -1) { -- string CSS = """ -- window decoration { -- box-shadow: none; -- margin: 1px; -- } -- """; -- -- var _provider = new Gtk.CssProvider (); -- _provider.load_from_data (CSS, CSS.length); -- -- Gtk.StyleContext.add_provider_for_screen ( -- Gdk.Screen.get_default (), _provider, -- Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION -- ); -- } -- - // Set shortcut - string quick_add_shortcut = settings.get_string ("quick-add-shortcut"); - if (quick_add_shortcut == "") { - quick_add_shortcut = "Tab"; - settings.set_string ("quick-add-shortcut", quick_add_shortcut); - } -- - utils.set_quick_add_shortcut (quick_add_shortcut); - } -- -- public string get_os_info (string field) { -- string return_value = ""; -- var file = File.new_for_path ("/etc/os-release"); -- try { -- var osrel = new Gee.HashMap (); -- var dis = new DataInputStream (file.read ()); -- string line; -- // Read lines until end of file (null) is reached -- while ((line = dis.read_line (null)) != null) { -- var osrel_component = line.split ("=", 2); -- if (osrel_component.length == 2) { -- osrel[osrel_component[0]] = osrel_component[1].replace ("\"", ""); -- } -- } -- -- return_value = osrel[field]; -- } catch (Error e) { -- warning ("Couldn't read os-release file, assuming elementary OS"); -- } -- -- return return_value; -- } - - public override int command_line (ApplicationCommandLine command_line) { - bool silence_mode = false; --- -2.25.1 - diff --git a/pkgs/applications/office/elementary-planner/default.nix b/pkgs/applications/office/elementary-planner/default.nix index 0f5ec6137d6..3e3765ca77f 100644 --- a/pkgs/applications/office/elementary-planner/default.nix +++ b/pkgs/applications/office/elementary-planner/default.nix @@ -21,25 +21,15 @@ stdenv.mkDerivation rec { pname = "elementary-planner"; - version = "2.3.2"; + version = "2.3.3"; src = fetchFromGitHub { owner = "alainm23"; repo = "planner"; rev = version; - sha256 = "1kjk1zafx71zmax3whzpx6mzl037wlxri30bl2k9y9rg3fd09arr"; + sha256 = "1jc668hg26vb1q50abm6k566v9qimgs9skkwmlgi5h37vxm3ai1x"; }; - patches = [ - # Revert a patch the works around some stylesheet issues: - # https://github.com/alainm23/planner/issues/268 - # https://github.com/alainm23/planner/issues/303 - # The don't seem to be a problem with Pantheon on NixOS - # and for some reason produce the opposite effect with - # pantheon's stylesheet. - ./0001-Revert-Add-patch.patch - ]; - nativeBuildInputs = [ desktop-file-utils meson -- cgit v1.2.3 From 9e58c8363b08aa3533b4e7316e25f6da254cf678 Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Thu, 23 Apr 2020 09:52:38 -0700 Subject: kubernetes-helm: 3.1.2 -> 3.1.3 --- pkgs/applications/networking/cluster/helm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index aee162ba6f2..0eac175a170 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helm"; - version = "3.1.2"; + version = "3.1.3"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "0pg5cwgyfb4isy2fn233kj3bdn0i8qqp90yzix0khs5maalpnrk1"; + sha256 = "1j6pr1a9ff32bnjq9rncllmfpraip5r2fj3zsljw5jq68x5wamdc"; }; modSha256 = "0618zzi4x37ahsrazsr82anghhfva8yaryzb3p5d737p3ixbiyv8"; -- cgit v1.2.3 From a3f35c0267daa4395f66eb09343aac4e74336773 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sat, 18 Apr 2020 20:17:00 +0200 Subject: mednafen: Add alsaLib to get ALSA audio output --- pkgs/misc/emulators/mednafen/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix index feedfc2603e..ea860af1fdf 100644 --- a/pkgs/misc/emulators/mednafen/default.nix +++ b/pkgs/misc/emulators/mednafen/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, freeglut, libGLU, libGL, libcdio, libjack2 -, libsamplerate, libsndfile, libX11, SDL2, SDL2_net, zlib }: +, libsamplerate, libsndfile, libX11, SDL2, SDL2_net, zlib, alsaLib }: stdenv.mkDerivation rec { pname = "mednafen"; @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { libGLU libGL libcdio libjack2 + alsaLib libsamplerate libsndfile libX11 -- cgit v1.2.3 From 2c1db9649e66e9399fa572d3bb0da67c6e6e1962 Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 23 Apr 2020 18:43:44 +0100 Subject: linux_*_hardened: index patches by major kernel version This will avoid breaking the build whenever a non-major kernel update happens. In the update script, we map each kernel version to the latest patch for the latest kernel version less than or equal to what we have packaged. --- .../os-specific/linux/kernel/hardened-patches.json | 30 ++-- pkgs/os-specific/linux/kernel/patches.nix | 13 +- pkgs/os-specific/linux/kernel/update-hardened.py | 151 ++++++++++++--------- pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 109 insertions(+), 87 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened-patches.json b/pkgs/os-specific/linux/kernel/hardened-patches.json index f916ad13488..eecb27cdb66 100644 --- a/pkgs/os-specific/linux/kernel/hardened-patches.json +++ b/pkgs/os-specific/linux/kernel/hardened-patches.json @@ -1,27 +1,27 @@ { - "4.14.176": { + "4.14": { + "name": "linux-hardened-4.14.176.a.patch", "sha256": "0pr3m2j63mc746fcbzg1hlwv85im9f87qkl6r4033gwnpa9brcgk", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.176.a/linux-hardened-4.14.176.a.patch", - "version_suffix": "a" + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.176.a/linux-hardened-4.14.176.a.patch" }, - "4.19.117": { + "4.19": { + "name": "linux-hardened-4.19.117.a.patch", "sha256": "0c8dvh49nzypxwvsls10i896smvpdrk40x8ybljb3qk3r8j7niaw", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.117.a/linux-hardened-4.19.117.a.patch", - "version_suffix": "a" + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.117.a/linux-hardened-4.19.117.a.patch" }, - "5.4.35": { + "5.4": { + "name": "linux-hardened-5.4.34.a.patch", "sha256": "1xwpqr9nzpjg837b3wnzb8fmrl2g9rz8gz5yb55vnnllbzbz36v6", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.34.a/linux-hardened-5.4.34.a.patch", - "version_suffix": "a" + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.34.a/linux-hardened-5.4.34.a.patch" }, - "5.5.19": { + "5.5": { + "name": "linux-hardened-5.5.19.a.patch", "sha256": "1ya5nsfhr3nwz6qiz4pdhvm6k9mx1kr0prhdvhx3p40f1vk281sc", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.5.19.a/linux-hardened-5.5.19.a.patch", - "version_suffix": "a" + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.5.19.a/linux-hardened-5.5.19.a.patch" }, - "5.6.7": { + "5.6": { + "name": "linux-hardened-5.6.6.a.patch", "sha256": "0jiqh0frxirjbccgfdk007fca6r6n36n0pkqq4jszkckn59ayl7r", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.6.a/linux-hardened-5.6.6.a.patch", - "version_suffix": "a" + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.6.a/linux-hardened-5.6.6.a.patch" } } diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 69b0197d4e6..1c4af8c32a6 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -39,16 +39,9 @@ }; hardened = let - mkPatch = kernelVersion: patch: let - fullVersion = "${kernelVersion}.${patch.version_suffix}"; - name = "linux-hardened-${fullVersion}"; - in { - inherit name; - patch = fetchurl { - name = "${name}.patch"; - inherit (patch) url sha256; - meta.maintainers = with lib.maintainers; [ emily ]; - }; + mkPatch = kernelVersion: src: { + name = lib.removeSuffix ".patch" src.name; + patch = fetchurl src; }; patches = builtins.fromJSON (builtins.readFile ./hardened-patches.json); in lib.mapAttrs mkPatch patches; diff --git a/pkgs/os-specific/linux/kernel/update-hardened.py b/pkgs/os-specific/linux/kernel/update-hardened.py index 089e991d06b..7f6949653af 100755 --- a/pkgs/os-specific/linux/kernel/update-hardened.py +++ b/pkgs/os-specific/linux/kernel/update-hardened.py @@ -17,17 +17,7 @@ HERE = os.path.dirname(os.path.realpath(__file__)) HARDENED_GITHUB_REPO = 'anthraxx/linux-hardened' HARDENED_TRUSTED_KEY = os.path.join(HERE, 'anthraxx.asc') HARDENED_PATCHES_PATH = os.path.join(HERE, 'hardened-patches.json') -MIN_KERNEL = (4, 14) - -HARDENED_VERSION_RE = re.compile(r''' - (?P [\d.]+) \. - (?P [a-z]+) -''', re.VERBOSE) - -def parse_version(version): - match = HARDENED_VERSION_RE.fullmatch(version) - if match: - return match.groups() +MIN_KERNEL_VERSION = [4, 14] def run(*args, **kwargs): try: @@ -78,11 +68,12 @@ def fetch_patch(*, name, release): except StopIteration: raise KeyError(filename) + patch_filename = f'{name}.patch' try: - patch_url = find_asset(f'{name}.patch') - sig_url = find_asset(f'{name}.patch.sig') + patch_url = find_asset(patch_filename) + sig_url = find_asset(patch_filename + '.sig') except KeyError: - print(f'error: {name}.patch{{,sig}} not present', file=sys.stderr) + print(f'error: {patch_filename}{{,.sig}} not present', file=sys.stderr) return None sha256, patch_path = nix_prefetch_url(patch_url) @@ -97,16 +88,32 @@ def fetch_patch(*, name, release): return None return { + 'name': patch_filename, 'url': patch_url, 'sha256': sha256, } -def commit_patches(*, kernel_version, message): +def parse_version(version_str): + version = [] + for component in version_str.split('.'): + try: + version.append(int(component)) + except ValueError: + version.append(component) + return version + +def version_string(version): + return '.'.join(str(component) for component in version) + +def major_kernel_version_key(kernel_version): + return version_string(kernel_version[:-1]) + +def commit_patches(*, kernel_key, message): with open(HARDENED_PATCHES_PATH + '.new', 'w') as new_patches_file: json.dump(patches, new_patches_file, indent=4, sort_keys=True) new_patches_file.write('\n') os.rename(HARDENED_PATCHES_PATH + '.new', HARDENED_PATCHES_PATH) - message = f'linux/hardened-patches/{kernel_version}: {message}' + message = f'linux/hardened-patches/{kernel_key}: {message}' print(message) if os.environ.get('COMMIT'): run( @@ -125,74 +132,96 @@ NIX_VERSION_RE = re.compile(r''' ''', re.VERBOSE) # Get the set of currently packaged kernel versions. -kernel_versions = set() +kernel_versions = {} for filename in os.listdir(HERE): filename_match = re.fullmatch(r'linux-(\d+)\.(\d+)\.nix', filename) if filename_match: - if tuple(int(v) for v in filename_match.groups()) < MIN_KERNEL: - continue with open(os.path.join(HERE, filename)) as nix_file: for nix_line in nix_file: match = NIX_VERSION_RE.fullmatch(nix_line) if match: - kernel_versions.add(match.group('version')) + kernel_version = parse_version(match.group('version')) + if kernel_version < MIN_KERNEL_VERSION: + continue + kernel_key = major_kernel_version_key(kernel_version) + kernel_versions[kernel_key] = kernel_version -# Remove patches for old kernel versions. -for kernel_version in patches.keys() - kernel_versions: - del patches[kernel_version] - commit_patches(kernel_version=kernel_version, message='remove') +# Remove patches for unpackaged kernel versions. +for kernel_key in sorted(patches.keys() - kernel_versions.keys()): + commit_patches(kernel_key=kernel_key, message='remove') g = Github(os.environ.get('GITHUB_TOKEN')) repo = g.get_repo(HARDENED_GITHUB_REPO) -releases = repo.get_releases() -found_kernel_versions = set() failures = False -for release in releases: - remaining_kernel_versions = kernel_versions - found_kernel_versions - - if not remaining_kernel_versions: - break +# Match each kernel version with the best patch version. +releases = {} +for release in repo.get_releases(): + version = parse_version(release.tag_name) + # needs to look like e.g. 5.6.3.a + if len(version) < 4: + continue - version = release.tag_name - name = f'linux-hardened-{version}' - version_info = parse_version(version) - if not version_info: + kernel_version = version[:-1] + kernel_key = major_kernel_version_key(kernel_version) + try: + packaged_kernel_version = kernel_versions[kernel_key] + except KeyError: continue - kernel_version, version_suffix = version_info - if kernel_version in remaining_kernel_versions: - found_kernel_versions.add(kernel_version) - try: - old_version_suffix = patches[kernel_version]['version_suffix'] - old_version = f'{kernel_version}.{old_version_suffix}' - update = old_version_suffix < version_suffix - except KeyError: - update = True - old_version = None - - if update: - patch = fetch_patch(name=name, release=release) - if patch is None: - failures = True + release_info = { + 'version': version, + 'release': release, + } + + if kernel_version == packaged_kernel_version: + releases[kernel_key] = release_info + else: + # Fall back to the latest patch for this major kernel version, + # skipping patches for kernels newer than the packaged one. + if kernel_version > packaged_kernel_version: + continue + elif (kernel_key not in releases or + releases[kernel_key]['version'] < version): + releases[kernel_key] = release_info + +# Update hardened-patches.json for each release. +for kernel_key, release_info in releases.items(): + release = release_info['release'] + version = release_info['version'] + version_str = release.tag_name + name = f'linux-hardened-{version_str}' + + try: + old_filename = patches[kernel_key]['name'] + old_version_str = (old_filename + .replace('linux-hardened-', '') + .replace('.patch', '')) + old_version = parse_version(old_version_str) + update = old_version < version + except KeyError: + update = True + old_version = None + + if update: + patch = fetch_patch(name=name, release=release) + if patch is None: + failures = True + else: + patches[kernel_key] = patch + if old_version: + message = f'{old_version_str} -> {version_str}' else: - patch['version_suffix'] = version_suffix - patches[kernel_version] = patch - if old_version: - message = f'{old_version} -> {version}' - else: - message = f'init at {version}' - commit_patches(kernel_version=kernel_version, message=message) + message = f'init at {version_str}' + commit_patches(kernel_key=kernel_key, message=message) -missing_kernel_versions = kernel_versions - patches.keys() +missing_kernel_versions = kernel_versions.keys() - patches.keys() if missing_kernel_versions: print( f'warning: no patches for kernel versions ' + - ', '.join(missing_kernel_versions) + - '\nwarning: consider manually backporting older patches (bump ' - 'JSON key, set version_suffix to "NixOS-a")', + ', '.join(missing_kernel_versions), file=sys.stderr, ) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e4c3019ff37..166a4b82527 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17047,7 +17047,7 @@ in }; kernelPatches = kernel.kernelPatches ++ [ kernelPatches.tag_hardened - kernelPatches.hardened.${kernel.version} + kernelPatches.hardened.${kernel.meta.branch} ]; modDirVersionArg = kernel.modDirVersion + "-hardened"; }); -- cgit v1.2.3 From 9f56d3509c779572fb9546b4757f414ce0578ebd Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 23 Apr 2020 19:59:44 +0200 Subject: apostrophe: add alias from uberwriter The pkg is part of NixOS 20.03 as pkgs.uberwriter, so the rename to apostrophe might be confusing for some users. --- pkgs/top-level/aliases.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9ad282149aa..4247f30b01e 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -567,6 +567,7 @@ mapAliases ({ transporter = throw "transporter has been removed. It was archived upstream, so it's considered abandoned."; truecrypt = veracrypt; # added 2018-10-24 tshark = wireshark-cli; # added 2018-04-25 + uberwriter = apostrophe; # added 2020-04-23 ubootBeagleboneBlack = ubootAmx335xEVM; # added 2020-01-21 ucsFonts = ucs-fonts; # added 2016-07-15 ultrastardx-beta = ultrastardx; # added 2017-08-12 -- cgit v1.2.3 From 72cdc6d365d634f219ced3c28d4d37e5b03ec793 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 23 Apr 2020 20:22:10 +0200 Subject: matrix-synapse: 1.12.1 -> 1.12.4 https://github.com/matrix-org/synapse/releases/tag/v1.12.4 --- pkgs/servers/matrix-synapse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 87c6b6a6cc9..3962f7b2da8 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -23,11 +23,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.12.1"; + version = "1.12.4"; src = fetchPypi { inherit pname version; - sha256 = "0l3a5dvnahrzwqh8p0cnfr019bxxgd769jk2wprfvfd65h7p0g1r"; + sha256 = "0psr17ai42ma9923g9bj3q9fd8kph9rx7jpxsxwbfzr2y6lwr306"; }; patches = [ -- cgit v1.2.3 From 51502a72406760e88f28299ad346a2463ad53ebd Mon Sep 17 00:00:00 2001 From: Matt Huszagh Date: Thu, 23 Apr 2020 09:05:20 -0700 Subject: pyclipper: init at 1.1.0.post3 --- .../python-modules/pyclipper/default.nix | 35 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/pyclipper/default.nix diff --git a/pkgs/development/python-modules/pyclipper/default.nix b/pkgs/development/python-modules/pyclipper/default.nix new file mode 100644 index 00000000000..eaf20baf75c --- /dev/null +++ b/pkgs/development/python-modules/pyclipper/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, fetchPypi +, buildPythonPackage +, setuptools_scm +, cython +}: + +buildPythonPackage rec { + pname = "pyclipper"; + version = "1.1.0.post3"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "164yksvqwqvwzh8f8lq92asg87hd8rvcy2xb5vm4y4ccvd5xgb7i"; + }; + + nativeBuildInputs = [ + setuptools_scm + cython + ]; + + # Requires pytest_runner to perform tests, which requires deprecated + # features of setuptools. Seems better to not run tests. This should + # be fixed upstream. + doCheck = false; + pythonImportsCheck = [ "pyclipper" ]; + + meta = with stdenv.lib; { + description = "Cython wrapper for clipper library"; + homepage = "https://github.com/fonttools/pyclipper"; + license = licenses.mit; + maintainers = with maintainers; [ matthuszagh ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ea246c3f86a..3276a9bfcd4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1071,6 +1071,8 @@ in { purl = callPackage ../development/python-modules/purl { }; + pyclipper = callPackage ../development/python-modules/pyclipper { }; + pymystem3 = callPackage ../development/python-modules/pymystem3 { }; pymysql = callPackage ../development/python-modules/pymysql { }; -- cgit v1.2.3 From 59cea9da66cb3672fc1bcb2ad66329e6df2fb723 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 23 Apr 2020 15:34:41 -0300 Subject: xfce.xfce4-whiskermenu-plugin: fix gettext path in script --- .../xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix index 0d9f6916e1c..859a580bb70 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin/default.nix @@ -1,4 +1,4 @@ -{ mkXfceDerivation, gtk3, glib, cmake, exo, garcon, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: +{ mkXfceDerivation, gettext, gtk3, glib, cmake, exo, garcon, libxfce4ui, libxfce4util, xfce4-panel, xfconf }: mkXfceDerivation { category = "panel-plugins"; @@ -9,7 +9,12 @@ mkXfceDerivation { nativeBuildInputs = [ cmake ]; - buildInputs = [ exo garcon gtk3 glib libxfce4ui libxfce4util xfce4-panel xfconf ]; + buildInputs = [ gettext exo garcon gtk3 glib libxfce4ui libxfce4util xfce4-panel xfconf ]; + + postPatch = '' + substituteInPlace panel-plugin/xfce4-popup-whiskermenu.in \ + --replace gettext ${gettext}/bin/gettext + ''; postInstall = '' substituteInPlace $out/bin/xfce4-popup-whiskermenu \ -- cgit v1.2.3 From 08d634a7a0aadd5d2f2c26439878c39947e4ab98 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 9 Apr 2020 03:12:20 +0000 Subject: fmt: 6.1.2 -> 6.2.0 --- pkgs/development/libraries/fmt/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index 17aab0c8a34..42e1a252a76 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -1,16 +1,26 @@ -{ stdenv, fetchFromGitHub, cmake }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake }: stdenv.mkDerivation rec { pname = "fmt"; - version = "6.1.2"; + version = "6.2.0"; src = fetchFromGitHub { owner = "fmtlib"; repo = "fmt"; rev = version; - sha256 = "1ngb2fd7c2jnxi3x5kjgxmpixmyc737f77vibij43dl77ybiaihi"; + sha256 = "1vr08a8q94j66gas7ddbpdbq72b2ikd0mkgd5zd3l63610n8qajs"; }; + patches = [ + # Fix BC break breaking Kodi + # https://github.com/xbmc/xbmc/issues/17629 + # https://github.com/fmtlib/fmt/issues/1620 + (fetchpatch { + url = "https://github.com/fmtlib/fmt/commit/7d01859ef16e6b65bc023ad8bebfedecb088bf81.patch"; + sha256 = "vdttRGgdltabeRAs4/z0BNtW2dLOhCxtXQFGVFKpEG0="; + }) + ]; + outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake ]; -- cgit v1.2.3 From ec6bc32a3d706eeb26a6bf6ff7d85f873e21b36f Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 23 Apr 2020 16:08:12 -0400 Subject: uriparser: 0.9.1 -> 0.9.3 --- pkgs/development/libraries/uriparser/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix index 971e053d4f6..884bc101260 100644 --- a/pkgs/development/libraries/uriparser/default.nix +++ b/pkgs/development/libraries/uriparser/default.nix @@ -1,19 +1,26 @@ -{ lib, stdenv, fetchurl, gtest, pkgconfig, doxygen, graphviz }: +{ lib, stdenv, fetchurl, fetchpatch, cmake, gtest, doxygen, graphviz }: stdenv.mkDerivation rec { pname = "uriparser"; - version = "0.9.1"; + version = "0.9.3"; # Release tarball differs from source tarball src = fetchurl { url = "https://github.com/uriparser/uriparser/releases/download/${pname}-${version}/${pname}-${version}.tar.bz2"; - sha256 = "1gisi7h8hd6mswbiaaa3s25bnb77xf37pzrmjy63rcdpwcyqy93m"; + sha256 = "13z234jdaqs9jj7i66gcv4q1rgsypjz6cighnlm1j4g80pdlmbr8"; }; - nativeBuildInputs = [ pkgconfig doxygen graphviz ]; - buildInputs = lib.optional doCheck gtest; - configureFlags = lib.optional (!doCheck) "--disable-tests"; + patches = [ + # fixes tests + (fetchpatch { + url = "https://github.com/uriparser/uriparser/commit/f870e6c68696a6018702caa5c8a2feba9b0f99fa.diff"; + sha256 = "1nd6bhys9hwy6ippa42vm95zhw6hldm1s4xbdzmdjswc96as1ff5"; + }) + ]; + nativeBuildInputs = [ cmake doxygen graphviz ]; + + checkInputs = [ gtest ]; doCheck = stdenv.targetPlatform.system == stdenv.hostPlatform.system; meta = with stdenv.lib; { -- cgit v1.2.3 From 63b70bb4ef4d1ed7dd3546b039d9bf53c1483075 Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 23 Apr 2020 20:55:26 +0100 Subject: twitter-color-emoji: 12.1.2 -> 12.1.5 Twemoji version bump, plus a Fedora patch update to fix emoji size: https://src.fedoraproject.org/rpms/twitter-twemoji-fonts/c/282c789d3742d223968a7ddcae6e65374f6dcae1?branch=master --- pkgs/data/fonts/twitter-color-emoji/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/data/fonts/twitter-color-emoji/default.nix b/pkgs/data/fonts/twitter-color-emoji/default.nix index 4e464f37022..0e835cbedea 100644 --- a/pkgs/data/fonts/twitter-color-emoji/default.nix +++ b/pkgs/data/fonts/twitter-color-emoji/default.nix @@ -1,4 +1,4 @@ -# Based upon https://src.fedoraproject.org/rpms/twitter-twemoji-fonts/tree/454acad50ba584d9602ccd4238fc5e585abc15c9 +# Based upon https://src.fedoraproject.org/rpms/twitter-twemoji-fonts # The main difference is that we use “Twitter Color Emoji” name (which is recognized by upstream fontconfig) { stdenv @@ -15,14 +15,14 @@ }: let - version = "12.1.2"; + version = "12.1.5"; twemojiSrc = fetchFromGitHub { name = "twemoji"; owner = "twitter"; repo = "twemoji"; rev = "v${version}"; - sha256 = "0vzmlp83vnk4njcfkn03jcc1vkg2rf12zf5kj3p3a373xr4ds1zn"; + hash = "sha256-qb3bLiUgtA8QQ13u928kvM+3qwmQpyjUk0EPKja1kSk="; }; in @@ -54,10 +54,10 @@ stdenv.mkDerivation rec { ]; patches = [ - # ImageMagick -> GrahphicsMagick + # ImageMagick -> GraphicsMagick (fetchpatch { - url = "https://src.fedoraproject.org/rpms/twitter-twemoji-fonts/raw/3bc176c10ced2824fe03da5ff561e22a36bf8ccd/f/noto-emoji-use-gm.patch"; - sha256 = "0yfmfzaaiq5163c06172g4r734aysiqyv1s28siv642vqzsqh4i2"; + url = "https://src.fedoraproject.org/rpms/twitter-twemoji-fonts/raw/07778605d50696f6aa929020e82611a01d254c90/f/noto-emoji-use-gm.patch"; + sha256 = "sha256-kyJwT1SKS1vnXxvPTiIMK6TRHMp1ZOSlb6rodL4Jbxs="; }) ]; @@ -114,7 +114,9 @@ stdenv.mkDerivation rec { # In twemoji source ## Artwork is Creative Commons Attribution 4.0 International ## Non-artwork is MIT + # In Fedora twitter-twemoji-fonts source + ## spec files are MIT: https://fedoraproject.org/wiki/Licensing:Main#License_of_Fedora_SPEC_Files license = with licenses; [ asl20 ofl cc-by-40 mit ]; - maintainers = with maintainers; [ jtojnar ]; + maintainers = with maintainers; [ jtojnar emily ]; }; } -- cgit v1.2.3 From df3e072f24cd50dbe2e8255c9878b6a87ae53ed0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 23 Apr 2020 17:19:37 +0200 Subject: =?UTF-8?q?gnomeExtensions.dash-to-dock:=202020-03-19=20=E2=86=92?= =?UTF-8?q?=202020-04-20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gnome-3/extensions/dash-to-dock/default.nix | 23 ++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix index d508222188b..3784f109900 100644 --- a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix +++ b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix @@ -1,27 +1,34 @@ -{ stdenv, fetchFromGitHub, glib, gettext }: +{ stdenv +, fetchFromGitHub +, glib +, gettext +}: stdenv.mkDerivation rec { pname = "gnome-shell-dash-to-dock-unstable"; - version = "2020-03-19"; + version = "2020-04-20"; src = fetchFromGitHub { owner = "micheleg"; repo = "dash-to-dock"; # rev = "extensions.gnome.org-v" + version; - rev = "8c94a8d6db47ebc1273e690f4e0ba5e592f7f268"; - sha256 = "7nNfxAINqOIJCgYXYaPck2EJ1IOmzt6AkfDFknZ8GaI="; + rev = "1788f31b049b622f78d0e65c56bef76169022ca9"; + sha256 = "M3tlRbQ1PjKvNrKNtg0+CBEtzLSFQYauXJXQojdkHuk="; }; nativeBuildInputs = [ - glib gettext + glib + gettext ]; - makeFlags = [ "INSTALLBASE=$(out)/share/gnome-shell/extensions" ]; + makeFlags = [ + "INSTALLBASE=${placeholder "out"}/share/gnome-shell/extensions" + ]; meta = with stdenv.lib; { description = "A dock for the Gnome Shell"; - license = licenses.gpl2; - maintainers = with maintainers; [ eperuffo ]; homepage = "https://micheleg.github.io/dash-to-dock/"; + license = licenses.gpl2; + maintainers = with maintainers; [ eperuffo jtojnar ]; }; } -- cgit v1.2.3 From db664905e362c9299e80fb3a82d692381e010439 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 23 Apr 2020 16:32:41 -0400 Subject: uriparser: disable building docs --- pkgs/development/libraries/uriparser/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix index 884bc101260..de621b30e24 100644 --- a/pkgs/development/libraries/uriparser/default.nix +++ b/pkgs/development/libraries/uriparser/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, cmake, gtest, doxygen, graphviz }: +{ lib, stdenv, fetchurl, fetchpatch, cmake, gtest }: stdenv.mkDerivation rec { pname = "uriparser"; @@ -18,7 +18,11 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake doxygen graphviz ]; + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DURIPARSER_BUILD_DOCS=OFF" + ]; checkInputs = [ gtest ]; doCheck = stdenv.targetPlatform.system == stdenv.hostPlatform.system; -- cgit v1.2.3 From 69a7c3ba2d13b65ee0af80c94c25fff4e585c478 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Thu, 9 Apr 2020 22:27:26 -0400 Subject: pythonPackages.python-constraint: init at 1.4.0 --- .../python-modules/python-constraint/default.nix | 29 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/python-modules/python-constraint/default.nix diff --git a/pkgs/development/python-modules/python-constraint/default.nix b/pkgs/development/python-modules/python-constraint/default.nix new file mode 100644 index 00000000000..e6fcc4f8ab7 --- /dev/null +++ b/pkgs/development/python-modules/python-constraint/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + # Check inputs +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "python-constraint"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "python-constraint"; + repo = "python-constraint"; + rev = version; + sha256 = "1dv11406yxmmgkkhwzqicajbg2bmla5xfad7lv57zyahxz8jzz94"; + }; + + checkInputs = [ pytestCheckHook ]; + dontUseSetuptoolsCheck = true; + + meta = with lib; { + description = "Constraint Solving Problem resolver for Python."; + homepage = "https://labix.org/doc/constraint/"; + downloadPage = "https://github.com/python-constraint/python-constraint/releases"; + license = licenses.bsd2; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3276a9bfcd4..8def0f62a2f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3288,6 +3288,8 @@ in { pytools = callPackage ../development/python-modules/pytools { }; + python-constraint = callPackage ../development/python-modules/python-constraint { }; + python-ctags3 = callPackage ../development/python-modules/python-ctags3 { }; python-lzo = callPackage ../development/python-modules/python-lzo { -- cgit v1.2.3 From 1940e8320177dbe785c8492ea98c2b6d63a62d6d Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Thu, 9 Apr 2020 22:45:22 -0400 Subject: python3Packages.fastjsonschema: init at 2.14.4 --- .../python-modules/fastjsonschema/default.nix | 39 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/fastjsonschema/default.nix diff --git a/pkgs/development/python-modules/fastjsonschema/default.nix b/pkgs/development/python-modules/fastjsonschema/default.nix new file mode 100644 index 00000000000..b49f31e4022 --- /dev/null +++ b/pkgs/development/python-modules/fastjsonschema/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub + # Check inputs +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "fastjsonschema"; + version = "2.14.4"; + + disabled = pythonOlder "3.3"; + + src = fetchFromGitHub { + owner = "horejsek"; + repo = "python-fastjsonschema"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "0c3q31lqzrc52gacnqc271k5952qbyl0z4kagsqvl7fiwk84hqlz"; + }; + + checkInputs = [ pytestCheckHook ]; + dontUseSetuptoolsCheck = true; + disabledTests = [ + "benchmark" + + # these tests require network access + "remote ref" + "definitions" + ]; + + meta = with lib; { + description = "Fast JSON schema validator for Python."; + homepage = "https://horejsek.github.io/python-fastjsonschema/"; + license = licenses.bsd3; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8def0f62a2f..2cb35333656 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2761,6 +2761,8 @@ in { fastdtw = callPackage ../development/python-modules/fastdtw { }; + fastjsonschema = callPackage ../development/python-modules/fastjsonschema { }; + faulthandler = if ! isPy3k then callPackage ../development/python-modules/faulthandler {} else throw "faulthandler is built into ${python.executable}"; -- cgit v1.2.3 From e218af21ab0b62abcb50c98594d502b57711c9ae Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Fri, 10 Apr 2020 17:36:03 -0400 Subject: python3Packages.retworkx: init at 0.3.3 Replacement for networkx in qiskit-terra. --- .../python-modules/retworkx/default.nix | 59 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/development/python-modules/retworkx/default.nix diff --git a/pkgs/development/python-modules/retworkx/default.nix b/pkgs/development/python-modules/retworkx/default.nix new file mode 100644 index 00000000000..531edab2746 --- /dev/null +++ b/pkgs/development/python-modules/retworkx/default.nix @@ -0,0 +1,59 @@ +{ lib +, buildPythonPackage +, pythonOlder +, pythonAtLeast +, isPy37 +, isPy38 +, fetchFromGitHub +, fetchPypi + # Check inputs +, pytestCheckHook +}: + +let + rx-version = "0.3.3"; + wheel-args = if isPy37 then + { python = "cp37"; sha256 = "1gbz7sh9i4h41xs9c40lixfdigmvfykkgxgzwsrs8v0smx20dczy"; } + else if isPy38 then + { python = "cp38"; sha256 = "09xxgp4ac4q6mfkj6lsqqfrzz1cb02vxy7wlv0bq3z2hd0jcanxk"; } + else throw "python version & hash not included. Override attribute `wheel-args` with version & hash at https://pypi.org/project/retworkx"; + + github-source = fetchFromGitHub { + owner = "Qiskit"; + repo = "retworkx"; + rev = rx-version; + sha256 = "160w5vkzrl5rzcrdwhjq820i5lmc527m6hg0kxx0k6n2bz9qn26g"; + }; +in +buildPythonPackage rec { + pname = "retworkx"; + version = rx-version; + format = "wheel"; + + disabled = pythonOlder "3.5" || pythonAtLeast "3.9"; # compiled versions only included for 3.5 <= py <= 3.8 + + src = fetchPypi { + inherit pname version format; + inherit (wheel-args) python sha256; + abi = if pythonOlder "3.8" then "${wheel-args.python}m" else wheel-args.python; + platform = "manylinux2010_x86_64"; # i686, aarch64, and ppc64 also available, restricting to x86 for simplicity + }; + + pythonImportsCheck = [ "retworkx" ]; + + checkInputs = [ pytestCheckHook ]; + preCheck = '' + pushd $(mktemp -d) + cp -r ${github-source}/$sourceRoot/tests . + ''; + postCheck = "popd"; + + meta = with lib; { + description = "A python graph library implemented in Rust."; + homepage = "https://retworkx.readthedocs.io/en/latest/index.html"; + downloadPage = "https://github.com/Qiskit/retworkx/releases"; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger ]; + platforms = platforms.x86_64; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2cb35333656..ddb4136f367 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5526,6 +5526,8 @@ in { readchar = callPackage ../development/python-modules/readchar { }; + retworkx = callPackage ../development/python-modules/retworkx { }; + rivet = disabledIf isPy3k (toPythonModule (pkgs.rivet.override { python2 = python; })); -- cgit v1.2.3 From c6ea35d599496060ac3f523cf50b3e9630c1f0da Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Fri, 10 Apr 2020 09:09:27 -0400 Subject: python3Packages.qiskit-terra: 0.12.0 -> 0.13.0 Also add in optional visualization inputs as default to ensure that they are in the environment when used at runtime. Some hacks to avoid packaging retworkx (uses a semi-complicated Rust -> Python packaging system, will try to get that packaged in future). For now, just disabling retworkx, will need to package it in future. --- .../python-modules/qiskit-terra/default.nix | 51 ++++++++++++++-------- 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-terra/default.nix b/pkgs/development/python-modules/qiskit-terra/default.nix index 4a015e15d5d..14497b20b0d 100644 --- a/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/pkgs/development/python-modules/qiskit-terra/default.nix @@ -2,35 +2,41 @@ , pythonOlder , buildPythonPackage , fetchFromGitHub + # Python requirements , cython , dill +, fastjsonschema , jsonschema , numpy , marshmallow , marshmallow-polyfield -, matplotlib , networkx , ply , psutil +, python-constraint +, retworkx , scipy , sympy + # Python visualization requirements, semi-optional +, ipywidgets +, matplotlib +, pillow +, pydot +, pygments +, pylatexenc +, seaborn # test requirements , ddt , hypothesis -, ipywidgets , nbformat , nbconvert -, pillow -, pydot -, python -, pygraphviz -, pylatexenc , pytestCheckHook +, python }: buildPythonPackage rec { pname = "qiskit-terra"; - version = "0.12.0"; + version = "0.13.0"; disabled = pythonOlder "3.5"; @@ -38,13 +44,14 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - sha256 = "1yarfziy2w8n1d7zyyxykfs68608j8md4kwfyhbyc6wy483fk9sy"; + sha256 = "03fgqmyahgmkf5dbw19n9c1v8p4kmpk50wxhhc8435cclvs26x9j"; }; nativeBuildInputs = [ cython ]; propagatedBuildInputs = [ dill + fastjsonschema jsonschema numpy marshmallow @@ -53,34 +60,41 @@ buildPythonPackage rec { networkx ply psutil + python-constraint + retworkx scipy sympy + # Optional/visualization inputs + ipywidgets + matplotlib + pillow + pydot + pygments + pylatexenc + seaborn ]; + postPatch = '' + # Fix relative imports in tests + touch test/python/dagcircuit/__init__.py + ''; # *** Tests *** checkInputs = [ ddt hypothesis - ipywidgets nbformat nbconvert - pillow - pydot - pygraphviz - pylatexenc pytestCheckHook ]; + dontUseSetuptoolsCheck = true; # can't find setup.py, so fails. tested by pytest pythonImportsCheck = [ "qiskit" "qiskit.transpiler.passes.routing.cython.stochastic_swap.swap_trial" ]; - dontUseSetuptoolsCheck = true; # can't find setup.py, so fails. tested by pytest - disabledTests = [ - "test_long_name" # generated circuit images differ for some reason "test_jupyter_jobs_pbars" # needs IBMQ provider package (qiskit-ibmq-provider), circular dependency ]; @@ -112,7 +126,8 @@ buildPythonPackage rec { longDescription = '' Allows the user to write quantum circuits easily, and takes care of the constraints of real hardware. ''; - homepage = "https://github.com/QISKit/qiskit-terra"; + homepage = "https://qiskit.org/terra"; + downloadPage = "https://github.com/QISKit/qiskit-terra/releases"; license = licenses.asl20; maintainers = with maintainers; [ drewrisinger ]; }; -- cgit v1.2.3 From aec8e04689abdb9a60987e2f17195b6feb0928b2 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Fri, 10 Apr 2020 14:54:23 -0400 Subject: python3Packages.qiskit-aer: 0.4.1 -> 0.5.0 --- pkgs/development/python-modules/qiskit-aer/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index 7c36328f557..70c5ba38fea 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -18,16 +18,16 @@ buildPythonPackage rec { pname = "qiskit-aer"; - version = "0.4.1"; + version = "0.5.0"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "Qiskit"; - repo = pname; + repo = "qiskit-aer"; rev = version; fetchSubmodules = true; # fetch muparserx and other required libraries - sha256 = "1j2pv6jx5dlzanjp1qnf32s53d8jrlpv96nvymznkcnjvqn60gv9"; + sha256 = "05lsirrdnnr5yqhwkgv08d9aib8xq4xpd6aq2pfqsi9qkii2fff1"; }; nativeBuildInputs = [ @@ -49,7 +49,7 @@ buildPythonPackage rec { prePatch = '' # remove dependency on PyPi cmake package, which isn't in Nixpkgs - substituteInPlace setup.py --replace "'cmake'" "" + substituteInPlace setup.py --replace "'cmake!=3.17,!=3.17.0'" "" ''; dontUseCmakeConfigure = true; @@ -92,7 +92,8 @@ buildPythonPackage rec { meta = with lib; { description = "High performance simulators for Qiskit"; - homepage = "https://github.com/QISKit/qiskit-aer"; + homepage = "https://qiskit.org/aer"; + downloadPage = "https://github.com/QISKit/qiskit-aer/releases"; license = licenses.asl20; maintainers = with maintainers; [ drewrisinger ]; # Doesn't build on aarch64 (libmuparserx issue). -- cgit v1.2.3 From 88d49347f45bf48586a64bd1a2ddc85a472600d7 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Fri, 10 Apr 2020 16:35:54 -0400 Subject: python3Packages.qiskit-ignis: 0.2.0 -> 0.3.0 --- .../python-modules/qiskit-ignis/default.nix | 34 +++++++++++----------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-ignis/default.nix b/pkgs/development/python-modules/qiskit-ignis/default.nix index 2f0a99dc0f8..a421b5f84ad 100644 --- a/pkgs/development/python-modules/qiskit-ignis/default.nix +++ b/pkgs/development/python-modules/qiskit-ignis/default.nix @@ -5,42 +5,37 @@ , fetchpatch , numpy , qiskit-terra +, scikitlearn , scipy # Check Inputs +, ddt , pytestCheckHook , qiskit-aer }: buildPythonPackage rec { pname = "qiskit-ignis"; - version = "0.2.0"; + version = "0.3.0"; - disabled = pythonOlder "3.5"; + disabled = pythonOlder "3.6"; # Pypi's tarball doesn't contain tests src = fetchFromGitHub { owner = "Qiskit"; - repo = pname; + repo = "qiskit-ignis"; rev = version; - sha256 = "08a60xk5dq5wmqc23r4hr2v2nsf9hs0ybz832vbnd6d80dl6izyc"; + sha256 = "16h04n9hxw669nq2ii16l6h75x8afisvp3j062n4c62kcqci0x4x"; }; - patches = [ - # Update tests for compatibility with qiskit-aer 0.4 (#342). Remove in version > 0.2.0 - (fetchpatch { - url = "https://github.com/Qiskit/qiskit-ignis/commit/d78c494579f370058e68e360f10149db81b52477.patch"; - sha256 = "0ygkllf95c0jfvjg7gn399a5fd0wshsjpcn279kj7855m8j306h6"; - }) - # Fix statevector test over-eager validation (PR #333) - (fetchpatch { - url = "https://github.com/Qiskit/qiskit-ignis/commit/7cc8eb2e852b383ea429233fa43d3728931f1707.patch"; - sha256 = "0mdygykilg4qivdaa731z3y56l3ax4jp1sil9npqv0gn4p03c9g5"; - }) - ]; + # Fixed qiskit-ignis PR #385, figured this is easier than fetchpatch + postPatch = '' + substituteInPlace qiskit/ignis/logging/ignis_logging.py --replace "self.configure_logger" "self._configure_logger" + ''; propagatedBuildInputs = [ numpy qiskit-terra + scikitlearn scipy ]; @@ -49,13 +44,18 @@ buildPythonPackage rec { dontUseSetuptoolsCheck = true; preCheck = ''export HOME=$TMPDIR''; checkInputs = [ + ddt pytestCheckHook qiskit-aer ]; + # Test is in test/verification/test_entanglemet.py. test fails due to out-of-date calls & bad logic with this file since qiskit-ignis#328 + # see qiskit-ignis#386 for all issues. Should be able to re-enable in future. + disabledTests = [ "TestEntanglement" ]; meta = with lib; { description = "Qiskit tools for quantum hardware verification, noise characterization, and error correction"; - homepage = "https://github.com/QISKit/qiskit-ignis"; + homepage = "https://qiskit.org/ignis"; + downloadPage = "https://github.com/QISKit/qiskit-ignis/releases"; license = licenses.asl20; maintainers = with maintainers; [ drewrisinger ]; }; -- cgit v1.2.3 From 19abfc4e362a466f8d0109a40762079b20c0b700 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Thu, 16 Apr 2020 15:52:47 -0400 Subject: python3Packages.qiskit-aqua: 0.6.5 -> 0.6.6 --- pkgs/development/python-modules/qiskit-aqua/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-aqua/default.nix b/pkgs/development/python-modules/qiskit-aqua/default.nix index ee01a5c4cb5..9ff6404f2fc 100644 --- a/pkgs/development/python-modules/qiskit-aqua/default.nix +++ b/pkgs/development/python-modules/qiskit-aqua/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "qiskit-aqua"; - version = "0.6.5"; + version = "0.6.6"; disabled = pythonOlder "3.5"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-aqua"; rev = version; - sha256 = "03c0gl2qxyngf3cccjghjb0bhp0w78sdbvhim08cimf3cd577ldz"; + sha256 = "080m5nsy3ia6bcdypq5d3ijb7762yl1l9llygmxsi6si449zl2cp"; }; # Optional packages: pyscf (see below NOTE) & pytorch. Can install via pip/nix if needed. -- cgit v1.2.3 From ebedb915c210d99c52c40c17e09e4a2d9eff5f70 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 24 Apr 2020 08:07:37 +1000 Subject: maintainers/teams: update podman team --- maintainers/team-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index caee548d719..55482b00a3d 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -38,6 +38,6 @@ with lib.maintainers; { vdemeester zowoq ]; - scope = "Maintain Podman related packages and modules."; + scope = "Maintain Podman and CRI-O related packages and modules."; }; } -- cgit v1.2.3 From 4484e7981ea393203ea587c8e5bcb82ed470ffe0 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 24 Apr 2020 08:07:38 +1000 Subject: nixos/cri-o: update maintainers --- nixos/modules/virtualisation/cri-o.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix index 9bedb6be54a..e3ae1f0d854 100644 --- a/nixos/modules/virtualisation/cri-o.nix +++ b/nixos/modules/virtualisation/cri-o.nix @@ -6,6 +6,10 @@ let cfg = config.virtualisation.cri-o; in { + meta = { + maintainers = lib.teams.podman.members; + }; + options.virtualisation.cri-o = { enable = mkEnableOption "Container Runtime Interface for OCI (CRI-O)"; -- cgit v1.2.3 From b1138cc38685e7a2294f45967036fcf501ade039 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 24 Apr 2020 08:07:38 +1000 Subject: cni-plugins: update maintainers --- pkgs/applications/networking/cluster/cni/plugins.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index 9c6eec1a336..d457ddd98bf 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -37,6 +37,6 @@ buildGoPackage rec { homepage = "https://github.com/containernetworking/plugins"; license = licenses.asl20; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan saschagrunert ]; + maintainers = with maintainers; [ cstrahan ] ++ teams.podman.members; }; } -- cgit v1.2.3 From e3025ca12843f5d719a81a6105871078aec6903f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 24 Apr 2020 08:07:39 +1000 Subject: cri-o: update maintainers --- pkgs/applications/virtualization/cri-o/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 3ee467cd290..74a316ef52a 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -57,7 +57,7 @@ in buildGoPackage rec { description = ''Open Container Initiative-based implementation of the Kubernetes Container Runtime Interface''; license = licenses.asl20; - maintainers = with maintainers; [ saschagrunert ]; + maintainers = with maintainers; [ ] ++ teams.podman.members; platforms = platforms.linux; }; } -- cgit v1.2.3 From d8e8169bb02dd3dde32b1cfa7e5c3120b9aae8c7 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 24 Apr 2020 08:07:39 +1000 Subject: cri-tools: update maintainers --- pkgs/tools/virtualization/cri-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/tools/virtualization/cri-tools/default.nix index 8c57fdeed00..dced8672ee6 100644 --- a/pkgs/tools/virtualization/cri-tools/default.nix +++ b/pkgs/tools/virtualization/cri-tools/default.nix @@ -21,6 +21,6 @@ buildGoPackage rec { description = "CLI and validation tools for Kubelet Container Runtime Interface (CRI)"; homepage = "https://github.com/kubernetes-sigs/cri-tools"; license = lib.licenses.asl20; - maintainers = with maintainers; [ saschagrunert ]; + maintainers = with maintainers; [ ] ++ teams.podman.members; }; } -- cgit v1.2.3 From 540bbf43a6d0cc5d19e6e9ea7c9cba73dd0a2a02 Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Thu, 23 Apr 2020 22:50:05 +0100 Subject: remarkable-toolchain: init at 1.8-23.9.2019 --- .../remarkable/remarkable-toolchain/default.nix | 36 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix diff --git a/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix b/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix new file mode 100644 index 00000000000..412830369b9 --- /dev/null +++ b/pkgs/development/tools/misc/remarkable/remarkable-toolchain/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, libarchive, python3, file }: + +stdenv.mkDerivation rec { + pname = "remarkable-toolchain"; + version = "1.8-23.9.2019"; + + src = fetchurl { + url = "https://remarkable.engineering/oecore-x86_64-cortexa9hf-neon-toolchain-zero-gravitas-${version}.sh"; + sha256 = "6299955721bcd9bef92a87ad3cfe4d31df8e2da95b0c4b2cdded4431aa6748b0"; + }; + + nativeBuildInputs = [ + libarchive + python3 + file + ]; + + unpackCmd = "mkdir src; install $curSrc src/install-toolchain.sh"; + + dontBuild = true; + + installPhase = '' + patchShebangs install-toolchain.sh + sed -i -e '3,9d' install-toolchain.sh # breaks PATH + sed -i 's|PYTHON=.*$|PYTHON=${python3}/bin/python|' install-toolchain.sh + ./install-toolchain.sh -D -y -d $out + ''; + + meta = with stdenv.lib; { + description = "A toolchain for cross-compiling to reMarkable tablets"; + homepage = "https://remarkable.engineering/"; + license = licenses.gpl2; + maintainers = [ maintainers.nickhu ]; + platforms = platforms.x86_64; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86c4a550703..2ccf02e7fbc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8512,6 +8512,8 @@ in pscid = nodePackages.pscid; + remarkable-toolchain = callPackage ../development/tools/misc/remarkable/remarkable-toolchain { }; + tacacsplus = callPackage ../servers/tacacsplus { }; tamarin-prover = -- cgit v1.2.3 From 7fb25b93a4e3fcf8e51a5bdff6498da9ea5d0467 Mon Sep 17 00:00:00 2001 From: Keshav Kini Date: Wed, 22 Apr 2020 16:47:27 -0700 Subject: acl2: 8.2 -> 8.3 --- pkgs/development/interpreters/acl2/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index 9445d42f24e..39b243a0ce6 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -4,15 +4,15 @@ let hashes = { "8.0" = "1x1giy2c1y6krg3kf8pf9wrmvk981shv0pxcwi483yjqm90xng4r"; - "8.2" = "1x33kv6w9cbqzvyrihn61pzmqlvnk3drm8ksd5v0arg38i95awi3"; + "8.3" = "0c0wimaf16nrr3d6cxq6p7nr7rxffvpmn66hkpwc1m6zpcipf0y5"; }; revs = { "8.0" = "8.0"; - "8.2" = "8.2"; + "8.3" = "8.3"; }; in stdenv.mkDerivation rec { pname = "acl2"; - version = "8.2"; + version = "8.3"; src = fetchFromGitHub { owner = "acl2-devel"; @@ -72,6 +72,7 @@ in stdenv.mkDerivation rec { #[ free bsd3 mit gpl2 llgpl21 cc0 publicDomain ]; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ kini raskin ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.all; + broken = stdenv.isAarch64 && stdenv.isLinux; }; } -- cgit v1.2.3 From c17bbad264922f4418399ac7633d8cd8ac49a6c8 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Thu, 23 Apr 2020 18:04:34 -0400 Subject: python3Packages.qiskit-ibmq-provider: 0.6.0 -> 0.6.1 --- pkgs/development/python-modules/qiskit-ibmq-provider/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix index bed1bffe1a6..ea14bef2b9e 100644 --- a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix +++ b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "qiskit-ibmq-provider"; - version = "0.6.0"; + version = "0.6.1"; disabled = pythonOlder "3.6"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - sha256 = "0arbhwaa2kx04jbrj6hk3vvn92wdk6lrr9zx36pr6p22r0yyxnj9"; + sha256 = "16c73m9gp1wcrygr6mnc0a9ps0i872bgc7v1zbqyh50kxbcrnpnz"; }; propagatedBuildInputs = [ -- cgit v1.2.3 From 4238afcfefde3897641de6c5526b32d9108b70f2 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Fri, 10 Apr 2020 17:15:39 -0400 Subject: python3Packages.qiskit: 0.17.0 -> 0.18.2 --- pkgs/development/python-modules/qiskit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 3b5c9e706dc..ca0988955d5 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "qiskit"; # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history - version = "0.17.0"; + version = "0.18.2"; disabled = pythonOlder "3.5"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit"; rev = version; - sha256 = "1cnjcvvzklyq102fipqnwd5ham0sp0451gp7j79cwwsxzvji6pcc"; + sha256 = "05pwpcps1ksqx6m6hwq90l8sbak64fsz76yv4q3jplfjf6597k6p"; }; propagatedBuildInputs = [ -- cgit v1.2.3 From 3f2fdbb6f9edb3cf80d91b14fd199c0e390d8fd5 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 24 Apr 2020 10:13:31 +1000 Subject: libslirp: 4.2.0 -> 4.3.0 https://gitlab.freedesktop.org/slirp/libslirp/-/releases/v4.3.0 --- pkgs/development/libraries/libslirp/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libslirp/default.nix b/pkgs/development/libraries/libslirp/default.nix index 27a4d6ceb64..ee31e22628c 100644 --- a/pkgs/development/libraries/libslirp/default.nix +++ b/pkgs/development/libraries/libslirp/default.nix @@ -8,20 +8,24 @@ stdenv.mkDerivation rec { pname = "libslirp"; - version = "4.2.0"; + version = "4.3.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "slirp"; repo = pname; rev = "v${version}"; - sha256 = "1qk513fgfh4hwb1ajjmvg9m1bl97m3n731ymxqsh1c3fj468a2am"; + sha256 = "1hajbdwx20a48hp8kv6jqbjvnzjvcdqmbjfsymzy2xa80idqkfab"; }; nativeBuildInputs = [ meson ninja pkg-config ]; buildInputs = [ glib ]; + postPatch = '' + echo ${version} > .tarball-version + ''; + meta = with stdenv.lib; { description = "General purpose TCP-IP emulator"; homepage = "https://gitlab.freedesktop.org/slirp/libslirp"; -- cgit v1.2.3 From 478155679f95f1ba838749f36bb6fdc761df6f1e Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 24 Apr 2020 10:13:54 +1000 Subject: slirp4netns: 1.0.0 -> 1.0.1 https://github.com/rootless-containers/slirp4netns/releases/tag/v1.0.1 --- pkgs/tools/networking/slirp4netns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/slirp4netns/default.nix b/pkgs/tools/networking/slirp4netns/default.nix index f3bd0a23d58..6b9279a8190 100644 --- a/pkgs/tools/networking/slirp4netns/default.nix +++ b/pkgs/tools/networking/slirp4netns/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "slirp4netns"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "slirp4netns"; rev = "v${version}"; - sha256 = "152wmccz47anvx5w88qcz8higw80l17jl7i24xfj5574adviqnv2"; + sha256 = "1p5cvq0jsjkl136b8cz3j552x01g96j38ygh6m8ss62bmyzb8ayc"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; -- cgit v1.2.3 From 218049c5c20847bd97cc32a3508cbf51ef25ed44 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 23 Apr 2020 17:53:18 -0400 Subject: nixos/gitea: add settings option --- nixos/modules/services/misc/gitea.nix | 146 ++++++++++++++++++++++------------ 1 file changed, 94 insertions(+), 52 deletions(-) diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index 38910a5a005..d6a11c23014 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -14,53 +14,9 @@ let RUN_USER = ${cfg.user} RUN_MODE = prod - [database] - DB_TYPE = ${cfg.database.type} - ${optionalString (usePostgresql || useMysql) '' - HOST = ${if cfg.database.socket != null then cfg.database.socket else cfg.database.host + ":" + toString cfg.database.port} - NAME = ${cfg.database.name} - USER = ${cfg.database.user} - PASSWD = #dbpass# - ''} - ${optionalString useSqlite '' - PATH = ${cfg.database.path} - ''} - ${optionalString usePostgresql '' - SSL_MODE = disable - ''} - - [repository] - ROOT = ${cfg.repositoryRoot} - - [server] - DOMAIN = ${cfg.domain} - HTTP_ADDR = ${cfg.httpAddress} - HTTP_PORT = ${toString cfg.httpPort} - ROOT_URL = ${cfg.rootUrl} - STATIC_ROOT_PATH = ${cfg.staticRootPath} - LFS_JWT_SECRET = #jwtsecret# - - [session] - COOKIE_NAME = session - COOKIE_SECURE = ${boolToString cfg.cookieSecure} - - [security] - SECRET_KEY = #secretkey# - INSTALL_LOCK = true - - [log] - ROOT_PATH = ${cfg.log.rootPath} - LEVEL = ${cfg.log.level} - - [service] - DISABLE_REGISTRATION = ${boolToString cfg.disableRegistration} - - ${optionalString (cfg.mailerPasswordFile != null) '' - [mailer] - PASSWD = #mailerpass# - ''} - - ${cfg.extraConfig} + ${generators.toINI {} cfg.settings} + + ${optionalString (cfg.extraConfig != null) cfg.extraConfig} ''; in @@ -279,9 +235,36 @@ in ''; }; + settings = mkOption { + type = with types; attrsOf (attrsOf (oneOf [ bool int str ])); + default = {}; + description = '' + Gitea configuration. Refer to + for details on supported values. + ''; + example = literalExample '' + { + "cron.sync_external_users" = { + RUN_AT_START = true; + SCHEDULE = "@every 24h"; + UPDATE_EXISTING = true; + }; + mailer = { + ENABLED = true; + MAILER_TYPE = "sendmail"; + FROM = "do-not-reply@example.org"; + SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail"; + }; + other = { + SHOW_FOOTER_VERSION = false; + }; + } + ''; + }; + extraConfig = mkOption { - type = types.str; - default = ""; + type = with types; nullOr str; + default = null; description = "Configuration lines appended to the generated gitea configuration file."; }; }; @@ -294,6 +277,62 @@ in } ]; + services.gitea.settings = { + database = mkMerge [ + { + DB_TYPE = cfg.database.type; + } + (mkIf (useMysql || usePostgresql) { + HOST = if cfg.database.socket != null then cfg.database.socket else cfg.database.host + ":" + toString cfg.database.port; + NAME = cfg.database.name; + USER = cfg.database.user; + PASSWD = "#dbpass#"; + }) + (mkIf useSqlite { + PATH = cfg.database.path; + }) + (mkIf usePostgresql { + SSL_MODE = "disable"; + }) + ]; + + repository = { + ROOT = cfg.repositoryRoot; + }; + + server = { + DOMAIN = cfg.domain; + HTTP_ADDR = cfg.httpAddress; + HTTP_PORT = cfg.httpPort; + ROOT_URL = cfg.rootUrl; + STATIC_ROOT_PATH = cfg.staticRootPath; + LFS_JWT_SECRET = "#jwtsecret#"; + }; + + session = { + COOKIE_NAME = "session"; + COOKIE_SECURE = cfg.cookieSecure; + }; + + security = { + SECRET_KEY = "#secretkey#"; + INSTALL_LOCK = true; + }; + + log = { + ROOT_PATH = cfg.log.rootPath; + LEVEL = cfg.log.level; + }; + + service = { + DISABLE_REGISTRATION = cfg.disableRegistration; + }; + + mailer = mkIf (cfg.mailerPasswordFile != null) { + PASSWD = "#mailerpass#"; + }; + }; + services.postgresql = optionalAttrs (usePostgresql && cfg.database.createDatabase) { enable = mkDefault true; @@ -435,9 +474,12 @@ in users.groups.gitea = {}; - warnings = optional (cfg.database.password != "") - ''config.services.gitea.database.password will be stored as plaintext - in the Nix store. Use database.passwordFile instead.''; + warnings = + optional (cfg.database.password != "") '' + config.services.gitea.database.password will be stored as plaintext in the Nix store. Use database.passwordFile instead.'' ++ + optional (cfg.extraConfig != null) '' + services.gitea.`extraConfig` is deprecated, please use services.gitea.`settings`. + ''; # Create database passwordFile default when password is configured. services.gitea.database.passwordFile = -- cgit v1.2.3 From 94579ce01b99e84fde080f1b1acdc764ff778b82 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Fri, 24 Apr 2020 09:40:43 +0800 Subject: cargo-expand: 0.5.0 -> 0.6.0 --- pkgs/development/tools/rust/cargo-expand/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-expand/default.nix b/pkgs/development/tools/rust/cargo-expand/default.nix index 8274c50f582..ebe23e19737 100644 --- a/pkgs/development/tools/rust/cargo-expand/default.nix +++ b/pkgs/development/tools/rust/cargo-expand/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-expand"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "dtolnay"; repo = pname; rev = version; - sha256 = "1zpnhigsa0cyr3lj0h7z2xhi01zjrnakvvrgmqz4lyf5gabh9vcg"; + sha256 = "1xinaxxdsyhy8jl6albw8q9nl12iq11xny6a6a55niqzhvy1sdmp"; }; - cargoSha256 = "1rdh1b240gcjbk3wc384x459lbp8dy9a9mgrampqjk1n115zgbzp"; + cargoSha256 = "0i326vny4gygalsimsgkqsvlq09av8pv9a7a0yxcbk170a7zyxb0"; meta = with lib; { description = -- cgit v1.2.3 From bfe072dc4b29d7ecc687e8e3af29466ec3d81481 Mon Sep 17 00:00:00 2001 From: Savanni D'Gerinel Date: Thu, 23 Apr 2020 22:08:34 -0400 Subject: Add a Zenstates derivation --- pkgs/os-specific/linux/zenstates/default.nix | 54 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/os-specific/linux/zenstates/default.nix diff --git a/pkgs/os-specific/linux/zenstates/default.nix b/pkgs/os-specific/linux/zenstates/default.nix new file mode 100644 index 00000000000..b54ff669266 --- /dev/null +++ b/pkgs/os-specific/linux/zenstates/default.nix @@ -0,0 +1,54 @@ +# Zenstates provides access to a variety of CPU tunables no Ryzen processors. +# +# In particular, I am adding Zenstates because I need it to disable the C6 +# sleep state to stabilize wake from sleep on my Lenovo x395 system. After +# installing Zenstates, I need a before-sleep script like so: +# +# before-sleep = pkgs.writeScript "before-sleep" '' +# #!${pkgs.bash}/bin/bash +# ${pkgs.zenstates}/bin/zenstates --c6-disable +# ''; +# +# ... +# +# systemd.services.before-sleep = { +# description = "Jobs to run before going to sleep"; +# serviceConfig = { +# Type = "oneshot"; +# ExecStart = "${before-sleep}"; +# }; +# wantedBy = [ "sleep.target" ]; +# before = [ "sleep.target" ]; +# }; + +{ stdenv, fetchFromGitHub, python3 }: +stdenv.mkDerivation rec { + pname = "zenstates"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "r4m0n"; + repo = "ZenStates-Linux"; + rev = "0bc27f4740e382f2a2896dc1dabfec1d0ac96818"; + sha256 = "1h1h2n50d2cwcyw3zp4lamfvrdjy1gjghffvl3qrp6arfsfa615y"; + }; + + buildInputs = [ python3 ]; + + phases = [ "installPhase" ]; + + installPhase = '' + mkdir -p $out/bin + cp $src/zenstates.py $out/bin/zenstates + chmod +x $out/bin/zenstates + patchShebangs --build $out/bin/zenstates + ''; + + meta = with stdenv.lib; { + description = "Linux utility for Ryzen processors and motherboards"; + homepage = "https://github.com/r4m0n/ZenStates-Linux"; + license = licenses.mit; + maintainers = with maintainers; [ savannidgerinel ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 209bf184845..78f07dc3c16 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26505,4 +26505,5 @@ in jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { }; + zenstates = callPackage ../os-specific/linux/zenstates {}; } -- cgit v1.2.3 From 4db7911b5bf7e68eb085ac5f64e0cbc3f3bac237 Mon Sep 17 00:00:00 2001 From: Savanni D'Gerinel Date: Thu, 23 Apr 2020 22:17:30 -0400 Subject: Set version to 0.0.1 ZenStates-Linux doesn't actually have a version, so I'm setting the version to 0.0.1 in case the developer eventually does start doing releases. --- pkgs/os-specific/linux/zenstates/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/zenstates/default.nix b/pkgs/os-specific/linux/zenstates/default.nix index b54ff669266..4ac77c00aa3 100644 --- a/pkgs/os-specific/linux/zenstates/default.nix +++ b/pkgs/os-specific/linux/zenstates/default.nix @@ -24,7 +24,7 @@ { stdenv, fetchFromGitHub, python3 }: stdenv.mkDerivation rec { pname = "zenstates"; - version = "0.1.0"; + version = "0.0.1"; src = fetchFromGitHub { owner = "r4m0n"; -- cgit v1.2.3 From 131506ddd3def2bd83087d734d6873261757d1b9 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 24 Apr 2020 13:03:04 +1000 Subject: dnscontrol: use subPackages, upstream vendor --- .../applications/networking/dnscontrol/default.nix | 6 +- pkgs/applications/networking/dnscontrol/deps.nix | 1236 -------------------- 2 files changed, 1 insertion(+), 1241 deletions(-) delete mode 100644 pkgs/applications/networking/dnscontrol/deps.nix diff --git a/pkgs/applications/networking/dnscontrol/default.nix b/pkgs/applications/networking/dnscontrol/default.nix index 3f0a83d015d..e8500872d52 100644 --- a/pkgs/applications/networking/dnscontrol/default.nix +++ b/pkgs/applications/networking/dnscontrol/default.nix @@ -6,8 +6,6 @@ buildGoPackage rec { goPackagePath = "github.com/StackExchange/dnscontrol"; - goDeps = ./deps.nix; - src = fetchFromGitHub { owner = "StackExchange"; repo = pname; @@ -15,9 +13,7 @@ buildGoPackage rec { sha256 = "1j8i4k7bqkqmi6dmc9fxfab49a7qigig72rlbga902lw336p6cc7"; }; - postInstall = '' - rm $bin/bin/{build,convertzone,generate,validate} - ''; + subPackages = [ "." ]; meta = with stdenv.lib; { description = "Synchronize your DNS to multiple providers from a simple DSL"; diff --git a/pkgs/applications/networking/dnscontrol/deps.nix b/pkgs/applications/networking/dnscontrol/deps.nix deleted file mode 100644 index 55cb5daa18f..00000000000 --- a/pkgs/applications/networking/dnscontrol/deps.nix +++ /dev/null @@ -1,1236 +0,0 @@ -# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) -[ - { - goPackagePath = "cloud.google.com/go"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/gocloud"; - rev = "335e9e09b93e"; - sha256 = "1aiglr6d2369nf3s9ig1kc0nixsivcmh7p1fyzkcf6n6ql0p2zsm"; - }; - } - { - goPackagePath = "github.com/Azure/azure-sdk-for-go"; - fetch = { - type = "git"; - url = "https://github.com/Azure/azure-sdk-for-go"; - rev = "v39.1.0"; - sha256 = "1s0j7gh3d3p157py7v6525c6zs07hdiry97dhg4c8z7ww35wxhj7"; - }; - } - { - goPackagePath = "github.com/BurntSushi/toml"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/toml"; - rev = "v0.3.1"; - sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; - }; - } - { - goPackagePath = "github.com/BurntSushi/xgb"; - fetch = { - type = "git"; - url = "https://github.com/BurntSushi/xgb"; - rev = "27f122750802"; - sha256 = "18lp2x8f5bljvlz0r7xn744f0c9rywjsb9ifiszqqdcpwhsa0kvj"; - }; - } - { - goPackagePath = "github.com/DisposaBoy/JsonConfigReader"; - fetch = { - type = "git"; - url = "https://github.com/DisposaBoy/JsonConfigReader"; - rev = "5ea4d0ddac55"; - sha256 = "022wzrkf0rni9yb15439w81kj0kb4667zx6n2zq07ysw7lk6ahqz"; - }; - } - { - goPackagePath = "github.com/TomOnTime/utfutil"; - fetch = { - type = "git"; - url = "https://github.com/TomOnTime/utfutil"; - rev = "09c41003ee1d"; - sha256 = "01d6w8migw5px19jg0mm7qhsa1ydcz9wvl838nsclfw63x5sy70i"; - }; - } - { - goPackagePath = "github.com/alecthomas/kingpin"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/kingpin"; - rev = "v2.2.6"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "fb15b899a751"; - sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "f65c72e2690d"; - sha256 = "04jyqm7m3m01ppfy1f9xk4qvrwvs78q9zml6llyf2b3v5k6b2bbc"; - }; - } - { - goPackagePath = "github.com/andreyvit/diff"; - fetch = { - type = "git"; - url = "https://github.com/andreyvit/diff"; - rev = "c7f18ee00883"; - sha256 = "1s4qjkxig5yqahpzfl4xqh4kzi9mymdpkzq6kj3f4dr5dl3hlynr"; - }; - } - { - goPackagePath = "github.com/armon/go-metrics"; - fetch = { - type = "git"; - url = "https://github.com/armon/go-metrics"; - rev = "f0300d1749da"; - sha256 = "13l7c35ps0r27vxfil2w0xhhc7w5rh00awvlmn4cz0a937b9ffpv"; - }; - } - { - goPackagePath = "github.com/armon/go-radix"; - fetch = { - type = "git"; - url = "https://github.com/armon/go-radix"; - rev = "7fddfc383310"; - sha256 = "0y8chspn14n9xpsfb9gxnnf819rfpriaz64v81p7873a42kkhxb4"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "v1.29.21"; - sha256 = "0q97abz6cjj1gf3gfd52gjx39grfhlcjax8306zw9038a8v0nadc"; - }; - } - { - goPackagePath = "github.com/bgentry/speakeasy"; - fetch = { - type = "git"; - url = "https://github.com/bgentry/speakeasy"; - rev = "v0.1.0"; - sha256 = "02dfrj0wyphd3db9zn2mixqxwiz1ivnyc5xc7gkz58l5l27nzp8s"; - }; - } - { - goPackagePath = "github.com/billputer/go-namecheap"; - fetch = { - type = "git"; - url = "https://github.com/billputer/go-namecheap"; - rev = "0c7adb0710f8"; - sha256 = "09jkymml6f0nvz7md7s4ayj75xdms77ziz9rkw4kvj7jhv36302p"; - }; - } - { - goPackagePath = "github.com/cenkalti/backoff"; - fetch = { - type = "git"; - url = "https://github.com/cenkalti/backoff"; - rev = "v2.1.1"; - sha256 = "1mf4lsl3rbb8kk42x0mrhzzy4ikqy0jf6nxpzhkr02rdgwh6rjk8"; - }; - } - { - goPackagePath = "github.com/census-instrumentation/opencensus-proto"; - fetch = { - type = "git"; - url = "https://github.com/census-instrumentation/opencensus-proto"; - rev = "v0.2.1"; - sha256 = "19fcx3sc99i5dsklny6r073z5j20vlwn2xqm6di1q3b1xwchzqfj"; - }; - } - { - goPackagePath = "github.com/client9/misspell"; - fetch = { - type = "git"; - url = "https://github.com/client9/misspell"; - rev = "v0.3.4"; - sha256 = "1vwf33wsc4la25zk9nylpbp9px3svlmldkm0bha4hp56jws4q9cs"; - }; - } - { - goPackagePath = "github.com/cpuguy83/go-md2man"; - fetch = { - type = "git"; - url = "https://github.com/cpuguy83/go-md2man"; - rev = "v2.0.0"; - sha256 = "0r1f7v475dxxgzqci1mxfliwadcrk86ippflx9n411325l4g3ghv"; - }; - } - { - goPackagePath = "github.com/davecgh/go-spew"; - fetch = { - type = "git"; - url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.1"; - sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; - }; - } - { - goPackagePath = "github.com/digitalocean/godo"; - fetch = { - type = "git"; - url = "https://github.com/digitalocean/godo"; - rev = "v1.30.0"; - sha256 = "0z38lg1zd57b5ymxdxhz5rs5rynpzhqmbvm0marhh0v7v9bbk0rx"; - }; - } - { - goPackagePath = "github.com/dimchansky/utfbom"; - fetch = { - type = "git"; - url = "https://github.com/dimchansky/utfbom"; - rev = "v1.1.0"; - sha256 = "06s61wwd32fad1p8qn5blqjd5791avzb13fnqflkkg993adw49ww"; - }; - } - { - goPackagePath = "github.com/dnsimple/dnsimple-go"; - fetch = { - type = "git"; - url = "https://github.com/dnsimple/dnsimple-go"; - rev = "v0.31.0"; - sha256 = "0i074r3m0bqggmplswymgj6yfzbsrcqw8gn6py9x8g3kyl4si0x0"; - }; - } - { - goPackagePath = "github.com/envoyproxy/go-control-plane"; - fetch = { - type = "git"; - url = "https://github.com/envoyproxy/go-control-plane"; - rev = "5f8ba28d4473"; - sha256 = "1f1s764rd41vd9vgk3r14h1m6fz6pdvxj6fd83q58gxifbc4q5w4"; - }; - } - { - goPackagePath = "github.com/envoyproxy/protoc-gen-validate"; - fetch = { - type = "git"; - url = "https://github.com/envoyproxy/protoc-gen-validate"; - rev = "v0.1.0"; - sha256 = "0kxd3wwh3xwqk0r684hsy281xq4y71cd11d4q2hspcjbnlbwh7cy"; - }; - } - { - goPackagePath = "github.com/exoscale/egoscale"; - fetch = { - type = "git"; - url = "https://github.com/exoscale/egoscale"; - rev = "v0.23.0"; - sha256 = "0dgc08sdvy2cj7yygrlnyp6v9m829h4v0pm3vdsj9yx3bps5v7iy"; - }; - } - { - goPackagePath = "github.com/fatih/color"; - fetch = { - type = "git"; - url = "https://github.com/fatih/color"; - rev = "v1.7.0"; - sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; - }; - } - { - goPackagePath = "github.com/fatih/structs"; - fetch = { - type = "git"; - url = "https://github.com/fatih/structs"; - rev = "v1.1.0"; - sha256 = "1wrhb8wp8zpzggl61lapb627lw8yv281abvr6vqakmf569nswa9q"; - }; - } - { - goPackagePath = "github.com/go-acme/lego"; - fetch = { - type = "git"; - url = "https://github.com/go-acme/lego"; - rev = "v2.7.2"; - sha256 = "1137l22jrwk8hvdzjbmfkvd9nllp6sznzy66ngmcsc0ybp19hcry"; - }; - } - { - goPackagePath = "github.com/go-ldap/ldap"; - fetch = { - type = "git"; - url = "https://github.com/go-ldap/ldap"; - rev = "v3.0.2"; - sha256 = "1srb1nkcbs0v1hcdz6j4zhg000h763j83jlklsiwanvbp48y4lhz"; - }; - } - { - goPackagePath = "github.com/go-sql-driver/mysql"; - fetch = { - type = "git"; - url = "https://github.com/go-sql-driver/mysql"; - rev = "v1.5.0"; - sha256 = "11x0m9yf3kdnf6981182r824psgxwfaqhn3x3in4yiidp0w0hk3v"; - }; - } - { - goPackagePath = "github.com/go-test/deep"; - fetch = { - type = "git"; - url = "https://github.com/go-test/deep"; - rev = "042da051cf31"; - sha256 = "08bya0s7m15f5qm1kn2r42g1r4lpq0svpaqr0zaac4hmaxj7vnid"; - }; - } - { - goPackagePath = "github.com/gobwas/glob"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/glob"; - rev = "e7a84e9525fe"; - sha256 = "1v6vjklq06wqddv46ihajahaj1slv0imgaivlxr8bsx59i90js5q"; - }; - } - { - goPackagePath = "github.com/gofrs/uuid"; - fetch = { - type = "git"; - url = "https://github.com/gofrs/uuid"; - rev = "v3.2.0"; - sha256 = "1q63mp7bznhfgyw133c0wc0hpcj1cq9bcf7w1f8r6inkcrils1fz"; - }; - } - { - goPackagePath = "github.com/golang/glog"; - fetch = { - type = "git"; - url = "https://github.com/golang/glog"; - rev = "23def4e6c14b"; - sha256 = "0jb2834rw5sykfr937fxi8hxi2zy80sj2bdn9b3jb4b26ksqng30"; - }; - } - { - goPackagePath = "github.com/golang/mock"; - fetch = { - type = "git"; - url = "https://github.com/golang/mock"; - rev = "v1.3.1"; - sha256 = "1wnfa8njxdym1qb664dmfnkpm4pmqy22hqjlqpwaaiqhglb5g9d1"; - }; - } - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "v1.3.3"; - sha256 = "1cyyr52yhj3fzrily3rmsbqyj8va4ld75lmry0857m39rgpv8sy1"; - }; - } - { - goPackagePath = "github.com/golang/snappy"; - fetch = { - type = "git"; - url = "https://github.com/golang/snappy"; - rev = "v0.0.1"; - sha256 = "0gp3kkzlm3wh37kgkhbqxq3zx07iqbgis5w9mf4d64h6vjq760is"; - }; - } - { - goPackagePath = "github.com/google/btree"; - fetch = { - type = "git"; - url = "https://github.com/google/btree"; - rev = "v1.0.0"; - sha256 = "0ba430m9fbnagacp57krgidsyrgp3ycw5r7dj71brgp5r52g82p6"; - }; - } - { - goPackagePath = "github.com/google/go-cmp"; - fetch = { - type = "git"; - url = "https://github.com/google/go-cmp"; - rev = "v0.4.0"; - sha256 = "1x5pvl3fb5sbyng7i34431xycnhmx8xx94gq2n19g6p0vz68z2v2"; - }; - } - { - goPackagePath = "github.com/google/go-github"; - fetch = { - type = "git"; - url = "https://github.com/google/go-github"; - rev = "v17.0.0"; - sha256 = "1kvw95l77a5n5rgal9n1xjh58zxb3a40ij1j722b1h4z8yg9jhg4"; - }; - } - { - goPackagePath = "github.com/google/go-querystring"; - fetch = { - type = "git"; - url = "https://github.com/google/go-querystring"; - rev = "c8c88dbee036"; - sha256 = "1yckg2052mz7ps1m68wri6kyb5n4g0vx2yf7s0xs9gdqvvscp57l"; - }; - } - { - goPackagePath = "github.com/google/martian"; - fetch = { - type = "git"; - url = "https://github.com/google/martian"; - rev = "v2.1.0"; - sha256 = "197hil6vrjk50b9wvwyzf61csid83whsjj6ik8mc9r2lryxlyyrp"; - }; - } - { - goPackagePath = "github.com/google/pprof"; - fetch = { - type = "git"; - url = "https://github.com/google/pprof"; - rev = "54271f7e092f"; - sha256 = "14x4ydifz23rzaylggvwbm3dwlv1bc6s0bclmkxck9nbjbqw89vy"; - }; - } - { - goPackagePath = "github.com/googleapis/gax-go"; - fetch = { - type = "git"; - url = "https://github.com/googleapis/gax-go"; - rev = "v2.0.5"; - sha256 = "1lxawwngv6miaqd25s3ba0didfzylbwisd2nz7r4gmbmin6jsjrx"; - }; - } - { - goPackagePath = "github.com/gopherjs/gopherjs"; - fetch = { - type = "git"; - url = "https://github.com/gopherjs/gopherjs"; - rev = "0766667cb4d1"; - sha256 = "13pfc9sxiwjky2lm1xb3i3lcisn8p6mgjk2d927l7r92ysph8dmw"; - }; - } - { - goPackagePath = "github.com/gopherjs/jquery"; - fetch = { - type = "git"; - url = "https://github.com/gopherjs/jquery"; - rev = "73f4c7416038"; - sha256 = "1xhl0k52v3djalnd02a0ph572f85i1szj2x4q3lglkq40j7racd2"; - }; - } - { - goPackagePath = "github.com/hashicorp/errwrap"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/errwrap"; - rev = "v1.0.0"; - sha256 = "0slfb6w3b61xz04r32bi0a1bygc82rjzhqkxj2si2074wynqnr1c"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-cleanhttp"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-cleanhttp"; - rev = "v0.5.1"; - sha256 = "07kx3fhryqmaw3czacmm11qwx63js2q8cfq967vphk7xg9q377kk"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-hclog"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-hclog"; - rev = "v0.9.2"; - sha256 = "0pakba7rdkjgq50r79sbbpavymbyib77cy613wl734mpi30ywrxm"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-immutable-radix"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-immutable-radix"; - rev = "v1.0.0"; - sha256 = "1v3nmsnk1s8bzpclrhirz7iq0g5xxbw9q5gvrg9ss6w9crs72qr6"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-multierror"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-multierror"; - rev = "v1.0.0"; - sha256 = "00nyn8llqzbfm8aflr9kwsvpzi4kv8v45c141v88xskxp5xf6z49"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-plugin"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-plugin"; - rev = "v1.0.1"; - sha256 = "0aama8vdyrfzjdhxc1l4cwhmgydl989lywhq3pg3slzjg6r00rda"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-retryablehttp"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-retryablehttp"; - rev = "v0.6.3"; - sha256 = "1vnhr7yry71jldmmj5gxhq49crhi9vrmqc2i41mycpnva2zd8a0i"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-rootcerts"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-rootcerts"; - rev = "v1.0.1"; - sha256 = "0ca5h7vlvrghf24dzh8l6w5px293n173qxfkjxb9kgsl6hsrsl3y"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-sockaddr"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-sockaddr"; - rev = "v1.0.2"; - sha256 = "0y106nhd3s63lj7h7k21iq0br97h0z9qjrvx028zqcsq9407k9is"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-uuid"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-uuid"; - rev = "v1.0.1"; - sha256 = "0jvb88m0rq41bwgirsadgw7mnayl27av3gd2vqa3xvxp3fy0hp5k"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-version"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-version"; - rev = "v1.1.0"; - sha256 = "1ykh3jl5zj5a4irkgp5mq936bqkznmf9lp23qk741vh4r5874vi8"; - }; - } - { - goPackagePath = "github.com/hashicorp/golang-lru"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/golang-lru"; - rev = "v0.5.1"; - sha256 = "13f870cvk161bzjj6x41l45r5x9i1z9r2ymwmvm7768kg08zznpy"; - }; - } - { - goPackagePath = "github.com/hashicorp/hcl"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/hcl"; - rev = "v1.0.0"; - sha256 = "0q6ml0qqs0yil76mpn4mdx4lp94id8vbv575qm60jzl1ijcl5i66"; - }; - } - { - goPackagePath = "github.com/hashicorp/yamux"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/yamux"; - rev = "2f1d1f20f75d"; - sha256 = "1fga3p6j2g24ip9qjfwn3nqjr00m4nnjz92app7ms3sz7vgq2a7s"; - }; - } - { - goPackagePath = "github.com/hexonet/go-sdk"; - fetch = { - type = "git"; - url = "https://github.com/hexonet/go-sdk"; - rev = "v2.2.3"; - sha256 = "0mgkfrc7qlm4xf1v7kb29p7wq6rmaaha9zv8kwa27r8hjx6qnb8c"; - }; - } - { - goPackagePath = "github.com/jarcoal/httpmock"; - fetch = { - type = "git"; - url = "https://github.com/jarcoal/httpmock"; - rev = "v1.0.4"; - sha256 = "1x04i9hhvdxi9xmyf0vbi5azlh7rr4blsq7fbhps8i2gdpga612y"; - }; - } - { - goPackagePath = "github.com/jmespath/go-jmespath"; - fetch = { - type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "2437e8417af5"; - sha256 = "1hwcbr7nrlfshwr4hrac8ch8gvfpf07qi72bpqmqi272c67ma89v"; - }; - } - { - goPackagePath = "github.com/jstemmer/go-junit-report"; - fetch = { - type = "git"; - url = "https://github.com/jstemmer/go-junit-report"; - rev = "af01ea7f8024"; - sha256 = "1lp3n94ris12hac02wi31f3whs88lcrzwgdg43a5j6cafg9p1d0s"; - }; - } - { - goPackagePath = "github.com/jtolds/gls"; - fetch = { - type = "git"; - url = "https://github.com/jtolds/gls"; - rev = "v4.20.0"; - sha256 = "1k7xd2q2ysv2xsh373qs801v6f359240kx0vrl0ydh7731lngvk6"; - }; - } - { - goPackagePath = "github.com/kr/pretty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pretty"; - rev = "v0.1.0"; - sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; - }; - } - { - goPackagePath = "github.com/kr/pty"; - fetch = { - type = "git"; - url = "https://github.com/kr/pty"; - rev = "v1.1.1"; - sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; - }; - } - { - goPackagePath = "github.com/kr/text"; - fetch = { - type = "git"; - url = "https://github.com/kr/text"; - rev = "v0.1.0"; - sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; - }; - } - { - goPackagePath = "github.com/malexdev/utfutil"; - fetch = { - type = "git"; - url = "https://github.com/malexdev/utfutil"; - rev = "00c8d4a8e7a8"; - sha256 = "01d6w8migw5px19jg0mm7qhsa1ydcz9wvl838nsclfw63x5sy70i"; - }; - } - { - goPackagePath = "github.com/mattn/go-colorable"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-colorable"; - rev = "v0.0.9"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; - }; - } - { - goPackagePath = "github.com/mattn/go-isatty"; - fetch = { - type = "git"; - url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.3"; - sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n"; - }; - } - { - goPackagePath = "github.com/miekg/dns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/dns"; - rev = "v1.1.27"; - sha256 = "0fpd9alvhzrkb1c31n4lrxlpv1nlhy51w1yg39xxb3mjmrb7lby1"; - }; - } - { - goPackagePath = "github.com/mitchellh/cli"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/cli"; - rev = "v1.0.0"; - sha256 = "1i9kmr7rcf10d2hji8h4247hmc0nbairv7a0q51393aw2h1bnwg2"; - }; - } - { - goPackagePath = "github.com/mitchellh/copystructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/copystructure"; - rev = "v1.0.0"; - sha256 = "05njg92w1088v4yl0js0zdrpfq6k37i9j14mxkr3p90p5yd9rrrr"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-homedir"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-homedir"; - rev = "v1.1.0"; - sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-testing-interface"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-testing-interface"; - rev = "v1.0.0"; - sha256 = "1dl2js8di858bawg7dadlf1qjpkl2g3apziihjyf5imri3znyfpw"; - }; - } - { - goPackagePath = "github.com/mitchellh/go-wordwrap"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/go-wordwrap"; - rev = "v1.0.0"; - sha256 = "1jffbwcr3nnq6c12c5856bwzv2nxjzqk3jwgvxkwi1xhpd2by0bf"; - }; - } - { - goPackagePath = "github.com/mitchellh/mapstructure"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/mapstructure"; - rev = "v1.1.2"; - sha256 = "03bpv28jz9zhn4947saqwi328ydj7f6g6pf1m2d4m5zdh5jlfkrr"; - }; - } - { - goPackagePath = "github.com/mitchellh/reflectwalk"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/reflectwalk"; - rev = "v1.0.0"; - sha256 = "0wzkp0fdx22n8f7y9y37dgmnlrlfsv9zjdb48cbx7rsqsbnny7l0"; - }; - } - { - goPackagePath = "github.com/mjibson/esc"; - fetch = { - type = "git"; - url = "https://github.com/mjibson/esc"; - rev = "v0.2.0"; - sha256 = "0ci3bdm01prm114plcwkgzbqn825lh0zc1iqaw3jicjay5sh0bis"; - }; - } - { - goPackagePath = "github.com/namedotcom/go"; - fetch = { - type = "git"; - url = "https://github.com/namedotcom/go"; - rev = "08470befbe04"; - sha256 = "00ai7fd74sn4alqmpqsiyczirli50b7m059b6zzg1izy9g4cdd4g"; - }; - } - { - goPackagePath = "github.com/oklog/run"; - fetch = { - type = "git"; - url = "https://github.com/oklog/run"; - rev = "v1.0.0"; - sha256 = "1pbjza4claaj95fpqvvfrysvs10y7dm0pl6qr5lzh6qy1vnhmcgw"; - }; - } - { - goPackagePath = "github.com/ovh/go-ovh"; - fetch = { - type = "git"; - url = "https://github.com/ovh/go-ovh"; - rev = "ba5adb4cf014"; - sha256 = "1rwxib0pn2ni6nfn2sijvb6cd424n95gnqhs21q6mz08n9hnzspy"; - }; - } - { - goPackagePath = "github.com/pascaldekloe/goe"; - fetch = { - type = "git"; - url = "https://github.com/pascaldekloe/goe"; - rev = "v0.1.0"; - sha256 = "1dqd3mfb4z2vmv6pg6fhgvfc53vhndk24wcl9lj1rz02n6m279fq"; - }; - } - { - goPackagePath = "github.com/philhug/opensrs-go"; - fetch = { - type = "git"; - url = "https://github.com/philhug/opensrs-go"; - rev = "9dfa7433020d"; - sha256 = "1bjw3llpx5n1srylw08310ch14sz1pw5mban1yakax8606q3dqdf"; - }; - } - { - goPackagePath = "github.com/pierrec/lz4"; - fetch = { - type = "git"; - url = "https://github.com/pierrec/lz4"; - rev = "v2.0.5"; - sha256 = "0y5rh7z01zycd59nnjpkqq0ydyjmcg9j1xw15q1i600l9j9g617p"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "v0.9.1"; - sha256 = "1761pybhc2kqr6v5fm8faj08x9bql8427yqg6vnfv6nhrasx1mwq"; - }; - } - { - goPackagePath = "github.com/pmezard/go-difflib"; - fetch = { - type = "git"; - url = "https://github.com/pmezard/go-difflib"; - rev = "v1.0.0"; - sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; - }; - } - { - goPackagePath = "github.com/posener/complete"; - fetch = { - type = "git"; - url = "https://github.com/posener/complete"; - rev = "v1.1.1"; - sha256 = "1nbdiybjizbaxbf5q0xwbq0cjqw4bl6jggvsjzrpif0w86fcjda2"; - }; - } - { - goPackagePath = "github.com/prometheus/client_model"; - fetch = { - type = "git"; - url = "https://github.com/prometheus/client_model"; - rev = "14fe0d1b01d4"; - sha256 = "0zdmk6rbbx39cvfz0r59v2jg5sg9yd02b4pds5n5llgvivi99550"; - }; - } - { - goPackagePath = "github.com/renier/xmlrpc"; - fetch = { - type = "git"; - url = "https://github.com/renier/xmlrpc"; - rev = "ce4a1a486c03"; - sha256 = "0byvacdwhagva53r2frzqws3f5j7qzigmxzxahpcv300i8pm9i50"; - }; - } - { - goPackagePath = "github.com/robertkrimen/otto"; - fetch = { - type = "git"; - url = "https://github.com/robertkrimen/otto"; - rev = "c382bd3c16ff"; - sha256 = "043y6l647snsz71mdy84s2d3kn22aj6rbqd6c1vd8absvamqhlxa"; - }; - } - { - goPackagePath = "github.com/russross/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "v2.0.1"; - sha256 = "0nlz7isdd4rgnwzs68499hlwicxz34j2k2a0b8jy0y7ycd2bcr5j"; - }; - } - { - goPackagePath = "github.com/ryanuber/columnize"; - fetch = { - type = "git"; - url = "https://github.com/ryanuber/columnize"; - rev = "v2.1.0"; - sha256 = "0m9jhagb1k44zfcdai76xdf9vpi3bqdl7p078ffyibmz0z9jfap6"; - }; - } - { - goPackagePath = "github.com/ryanuber/go-glob"; - fetch = { - type = "git"; - url = "https://github.com/ryanuber/go-glob"; - rev = "v1.0.0"; - sha256 = "0mhrjy0iba3jr6bsgy7q50zjr42ar1njn1sb2fvihlkhxgb2ahv2"; - }; - } - { - goPackagePath = "github.com/sergi/go-diff"; - fetch = { - type = "git"; - url = "https://github.com/sergi/go-diff"; - rev = "v1.1.0"; - sha256 = "0ir8ali2vx0j7pipmlfd6k8c973akyy2nmbjrf008fm800zcp7z2"; - }; - } - { - goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; - fetch = { - type = "git"; - url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "v1.0.0"; - sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f"; - }; - } - { - goPackagePath = "github.com/smartystreets/assertions"; - fetch = { - type = "git"; - url = "https://github.com/smartystreets/assertions"; - rev = "b2de0cb4f26d"; - sha256 = "1i7ldgavgl35c7gk25p7bvdr282ckng090zr4ch9mk1705akx09y"; - }; - } - { - goPackagePath = "github.com/smartystreets/goconvey"; - fetch = { - type = "git"; - url = "https://github.com/smartystreets/goconvey"; - rev = "68dc04aab96a"; - sha256 = "1kas5v95fzhr88hg4rjy0vp03y4pzvy3pwwgkfz2yhn5nlj29nk6"; - }; - } - { - goPackagePath = "github.com/softlayer/softlayer-go"; - fetch = { - type = "git"; - url = "https://github.com/softlayer/softlayer-go"; - rev = "5e1c8cccc730"; - sha256 = "0jsi0f60gx92qm1n2lcz65v425bbqf59dsr0dw4x1wmychp25mk7"; - }; - } - { - goPackagePath = "github.com/stretchr/objx"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/objx"; - rev = "v0.1.0"; - sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w"; - }; - } - { - goPackagePath = "github.com/stretchr/testify"; - fetch = { - type = "git"; - url = "https://github.com/stretchr/testify"; - rev = "v1.5.1"; - sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl"; - }; - } - { - goPackagePath = "github.com/tdewolff/minify"; - fetch = { - type = "git"; - url = "https://github.com/tdewolff/minify"; - rev = "v2.3.6"; - sha256 = "0p4v4ab49lm5y438k5aks06fpiagbjw2j2x7i8jaa273mkgicrbb"; - }; - } - { - goPackagePath = "github.com/tdewolff/parse"; - fetch = { - type = "git"; - url = "https://github.com/tdewolff/parse"; - rev = "v2.3.4"; - sha256 = "00hclphbjgc5vjrqgnclp72v8c45k35vmj84d2a0f7bw8cc88zcd"; - }; - } - { - goPackagePath = "github.com/tdewolff/test"; - fetch = { - type = "git"; - url = "https://github.com/tdewolff/test"; - rev = "v1.0.6"; - sha256 = "12glhjb4cwp6yxwd17rwa6b4gxna3lm01bgc7yn9di58chc7lyh3"; - }; - } - { - goPackagePath = "github.com/tiramiseb/go-gandi"; - fetch = { - type = "git"; - url = "https://github.com/tiramiseb/go-gandi"; - rev = "e1cf2e430b3a"; - sha256 = "1m6wzif0dgssh5hzffwqg39789k9nwvj8xaq0d492f0fr14w0nng"; - }; - } - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "v2.1.1"; - sha256 = "0znf7pim7xsl8x6pcgi9vm0px48xrqfkw6ysn4yv6xc2569zpjs1"; - }; - } - { - goPackagePath = "github.com/vultr/govultr"; - fetch = { - type = "git"; - url = "https://github.com/vultr/govultr"; - rev = "v0.2.0"; - sha256 = "09103hb2rx93d6vyr54bqdai35d6l5q3klk09k53aqrijp8pycfz"; - }; - } - { - goPackagePath = "go.opencensus.io"; - fetch = { - type = "git"; - url = "https://github.com/census-instrumentation/opencensus-go"; - rev = "v0.22.0"; - sha256 = "05jr8gkr2w34i5wwki4zhl5ch0qrgi7cdgag5iy5gpxplhbrvbg9"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "2aa609cf4a9d"; - sha256 = "1yvis6fqbsd7f356aqyi18f76vnwj3bry6mxqnkvshq4cwrf92il"; - }; - } - { - goPackagePath = "golang.org/x/exp"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/exp"; - rev = "efd6b22b2522"; - sha256 = "0ysahwb7p6y09izks4ca8nk2w414gmjxzz44l5rmadlvk3k66cgp"; - }; - } - { - goPackagePath = "golang.org/x/image"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/image"; - rev = "0694c2d4d067"; - sha256 = "0v4rs4xpi7agbdzjw713mp7gzij8z89058s0yfj3276mzlns3zk4"; - }; - } - { - goPackagePath = "golang.org/x/lint"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/lint"; - rev = "959b441ac422"; - sha256 = "1mgcv5f00pkzsbwnq2y7vqvd1b4lr5a3s47cphh2qv4indfk7pck"; - }; - } - { - goPackagePath = "golang.org/x/mobile"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mobile"; - rev = "d3739f865fa6"; - sha256 = "079ck2dyikacnph9s5mf0hrjnqlk6lc8q64dwnyw45w3xbbc50mg"; - }; - } - { - goPackagePath = "golang.org/x/mod"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/mod"; - rev = "v0.2.0"; - sha256 = "1fp6885dclq77mh73v7i54v2b9llpv4di193zc8vmsbbkkc483cl"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "0de0cce0169b"; - sha256 = "1db7s5kbzyh2zd5lpv05n7hp8wbwdvgk0wpiwrlnig94mkr0y5aq"; - }; - } - { - goPackagePath = "golang.org/x/oauth2"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/oauth2"; - rev = "bf48bf16ab8d"; - sha256 = "1sirdib60zwmh93kf9qrx51r8544k1p9rs5mk0797wibz3m4mrdg"; - }; - } - { - goPackagePath = "golang.org/x/sync"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sync"; - rev = "cd5d95a43a6e"; - sha256 = "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "cb0a6d8edb6c"; - sha256 = "0xkrf2k6nn1qh64ckrc4rmf1vhkzs0p7f1rnhv4v4pz9mvgh3v6w"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "v0.3.2"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } - { - goPackagePath = "golang.org/x/time"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/time"; - rev = "9d24e82272b4"; - sha256 = "1f5nkr4vys2vbd8wrwyiq2f5wcaahhpxmia85d1gshcbqjqf8dkb"; - }; - } - { - goPackagePath = "golang.org/x/tools"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/tools"; - rev = "20ab64c0d93f"; - sha256 = "1gfhw6daabjy771b3c0k0yga18ja50845n648mgagsa441dxvlch"; - }; - } - { - goPackagePath = "golang.org/x/xerrors"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/xerrors"; - rev = "9bdfabe68543"; - sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c"; - }; - } - { - goPackagePath = "google.golang.org/api"; - fetch = { - type = "git"; - url = "https://code.googlesource.com/google-api-go-client"; - rev = "v0.20.0"; - sha256 = "13syr1x33k6mrn5w6l4sgdbzn368w3m60vf6kk2j10fwa45125rg"; - }; - } - { - goPackagePath = "google.golang.org/appengine"; - fetch = { - type = "git"; - url = "https://github.com/golang/appengine"; - rev = "v1.6.5"; - sha256 = "05hbq4cs7bqw0zl17bx8rzdkszid3nyl92100scg3jjrg70dhm7w"; - }; - } - { - goPackagePath = "google.golang.org/genproto"; - fetch = { - type = "git"; - url = "https://github.com/google/go-genproto"; - rev = "24fa4b261c55"; - sha256 = "109zhaqlfd8zkbr1hk6zqbs6vcxfrk64scjwh2nswph05gr0m84d"; - }; - } - { - goPackagePath = "google.golang.org/grpc"; - fetch = { - type = "git"; - url = "https://github.com/grpc/grpc-go"; - rev = "v1.27.0"; - sha256 = "1ijrmgrxyabfn51nm3p9l81iaasq5fg237wnr6mdc4dzsfcg8kd7"; - }; - } - { - goPackagePath = "gopkg.in/asn1-ber.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/asn1-ber.v1"; - rev = "f715ec2f112d"; - sha256 = "00ixms8x3lrhywbvq5v2sagcqsxa1pcnlk17dp5lnwckv3xg4psb"; - }; - } - { - goPackagePath = "gopkg.in/check.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/check.v1"; - rev = "41f04d3bba15"; - sha256 = "0vfk9czmlxmp6wndq8k17rhnjxal764mxfhrccza7nwlia760pjy"; - }; - } - { - goPackagePath = "gopkg.in/ini.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/ini.v1"; - rev = "v1.42.0"; - sha256 = "18ywm8zyv091j1pp5mvx8szl7928chk8lw02br6jy568d7rk4xal"; - }; - } - { - goPackagePath = "gopkg.in/ns1/ns1-go.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/ns1/ns1-go.v2"; - rev = "c563826f4cbe"; - sha256 = "0swpsy0bdkwqlb7i0fgxs55sdfsy7pbnh6a09crhbw5xldvswq5k"; - }; - } - { - goPackagePath = "gopkg.in/sourcemap.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/sourcemap.v1"; - rev = "v1.0.5"; - sha256 = "08rf2dl13hbnm3fq2cm0nnsspy9fhf922ln23cz5463cv7h62as4"; - }; - } - { - goPackagePath = "gopkg.in/square/go-jose.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/square/go-jose.v2"; - rev = "v2.3.1"; - sha256 = "11r93g9xrcjqj7qvq8sbd5hy5rnbpmim0vdsp6rbav8gl7wimaa3"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.8"; - sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw"; - }; - } - { - goPackagePath = "honnef.co/go/tools"; - fetch = { - type = "git"; - url = "https://github.com/dominikh/go-tools"; - rev = "ea95bdfd59fc"; - sha256 = "1763nw7pwpzkvzfnm63dgzcgbq9hwmq5l1nffchnhh77vgkaq4ic"; - }; - } - { - goPackagePath = "rsc.io/binaryregexp"; - fetch = { - type = "git"; - url = "https://github.com/rsc/binaryregexp"; - rev = "v0.2.0"; - sha256 = "1kar0myy85waw418zslviwx8846zj0m9cmqkxjx0fvgjdi70nc4b"; - }; - } -] -- cgit v1.2.3 From 3fe7332383518244afb5edd443ed12e1e321cdaa Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Fri, 24 Apr 2020 05:55:05 +0200 Subject: stig: use pytestCheckHook (#85364) --- pkgs/applications/networking/p2p/stig/default.nix | 24 ++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/p2p/stig/default.nix b/pkgs/applications/networking/p2p/stig/default.nix index 325dc653e5b..6b1a7ace902 100644 --- a/pkgs/applications/networking/p2p/stig/default.nix +++ b/pkgs/applications/networking/p2p/stig/default.nix @@ -1,9 +1,9 @@ { lib , fetchFromGitHub -, python3 +, python3Packages }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "stig"; # This project has a different concept for pre release / alpha, # Read the project's README for details: https://github.com/rndusr/stig#stig @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { --replace "urwidtrees>=1.0.3dev0" "urwidtrees" ''; - propagatedBuildInputs = with python3.pkgs; [ + propagatedBuildInputs = with python3Packages; [ urwid urwidtrees aiohttp @@ -38,17 +38,23 @@ python3.pkgs.buildPythonApplication rec { setproctitle ]; - checkInputs = with python3.pkgs; [ + checkInputs = with python3Packages; [ asynctest - pytest + pytestCheckHook ]; - # test_string__month_day_hour_minute_second fails on darwin - checkPhase = '' - LC_ALL=en_US.utf8 pytest tests \ - --deselect=tests/client_test/ttypes_test.py::TestTimestamp::test_string__month_day_hour_minute_second + dontUseSetuptoolsCheck = true; + + preCheck = '' + export LC_ALL=C ''; + pytestFlagsArray = [ + "tests" + # test_string__month_day_hour_minute_second fails on darwin + "--deselect=tests/client_test/ttypes_test.py::TestTimestamp::test_string__month_day_hour_minute_second" + ]; + meta = with lib; { description = "TUI and CLI for the BitTorrent client Transmission"; homepage = "https://github.com/rndusr/stig"; -- cgit v1.2.3 From 0944d77fc07414a5b69e9d8f75dae6a54faedc2b Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 24 Apr 2020 15:28:06 +1000 Subject: nixos/containers: move libpod to nixos/podman --- nixos/modules/virtualisation/containers.nix | 27 +-------------------------- nixos/modules/virtualisation/cri-o.nix | 2 +- nixos/modules/virtualisation/podman.nix | 26 ++++++++++++++++++++++++++ 3 files changed, 28 insertions(+), 27 deletions(-) diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index e6127e28486..7d184575640 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -30,7 +30,7 @@ in type = types.bool; default = false; description = '' - This option enables the common libpod container configuration module. + This option enables the common /etc/containers configuration module. ''; }; @@ -89,35 +89,10 @@ in ''; }; - libpod = mkOption { - default = {}; - description = "Libpod configuration"; - type = types.submodule { - options = { - - extraConfig = mkOption { - type = types.lines; - default = ""; - description = '' - Extra configuration that should be put in the libpod.conf - configuration file - ''; - - }; - }; - }; - }; - }; config = lib.mkIf cfg.enable { - environment.etc."containers/libpod.conf".text = '' - cni_plugin_dir = ["${pkgs.cni-plugins}/bin/"] - cni_config_dir = "/etc/cni/net.d/" - - '' + cfg.libpod.extraConfig; - environment.etc."containers/registries.conf".source = toTOML "registries.conf" { registries = lib.mapAttrs (n: v: { registries = v; }) cfg.registries; }; diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix index 9bedb6be54a..e28dbbcb757 100644 --- a/nixos/modules/virtualisation/cri-o.nix +++ b/nixos/modules/virtualisation/cri-o.nix @@ -85,7 +85,7 @@ in } ''; - # Enable common container configuration, this will create policy.json + # Enable common /etc/containers configuration virtualisation.containers.enable = true; systemd.services.crio = { diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix index 1486b96e41d..41d50dc7308 100644 --- a/nixos/modules/virtualisation/podman.nix +++ b/nixos/modules/virtualisation/podman.nix @@ -54,6 +54,25 @@ in ''; }; + libpod = mkOption { + default = {}; + description = "Libpod configuration"; + type = types.submodule { + options = { + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Extra configuration that should be put in the libpod.conf + configuration file + ''; + + }; + }; + }; + }; + }; config = lib.mkIf cfg.enable { @@ -70,8 +89,15 @@ in ] ++ lib.optional cfg.dockerCompat dockerCompat; + environment.etc."containers/libpod.conf".text = '' + cni_plugin_dir = ["${pkgs.cni-plugins}/bin/"] + cni_config_dir = "/etc/cni/net.d/" + + '' + cfg.libpod.extraConfig; + environment.etc."cni/net.d/87-podman-bridge.conflist".source = copyFile "${pkgs.podman.src}/cni/87-podman-bridge.conflist"; + # Enable common /etc/containers configuration virtualisation.containers.enable = true; }; -- cgit v1.2.3 From 1ae963172557035eb07fd27440ea0869770efdb7 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Thu, 23 Apr 2020 16:36:53 +0200 Subject: cri-o: 1.17.3 -> 1.18.0 - Make buildtags being able to set via the BUILDTAGS environment - Switch to go 1.14 Signed-off-by: Sascha Grunert --- pkgs/applications/virtualization/cri-o/default.nix | 14 +++++--------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 3ee467cd290..c78b04270a2 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -16,11 +16,9 @@ , which }: -let - buildTags = "apparmor seccomp selinux containers_image_ostree_stub"; -in buildGoPackage rec { +buildGoPackage rec { project = "cri-o"; - version = "1.17.3"; + version = "1.18.0"; name = "${project}-${version}${flavor}"; goPackagePath = "github.com/${project}/${project}"; @@ -29,7 +27,7 @@ in buildGoPackage rec { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "1cy2lqasfn5n20vlm3ckb6myci8ya6qv08dw8fq7z4ycnm39r1a6"; + sha256 = "142flmv54pj48rjqkd26fbxrcbx2cv6pdmrc33jgyvn6r99zliah"; }; outputs = [ "bin" "out" ]; @@ -38,13 +36,11 @@ in buildGoPackage rec { libseccomp libselinux lvm2 ] ++ stdenv.lib.optionals (glibc != null) [ glibc glibc.static ]; + BUILDTAGS = "apparmor seccomp selinux containers_image_ostree_stub"; buildPhase = '' pushd go/src/${goPackagePath} - make BUILDTAGS='${buildTags}' \ - bin/crio \ - bin/crio-status \ - bin/pinns + make binaries BUILDTAGS="$BUILDTAGS" ''; installPhase = '' install -Dm755 bin/crio $bin/bin/crio${flavor} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e4c3019ff37..6cf143fc69c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23306,9 +23306,7 @@ in crispyDoom = callPackage ../games/crispy-doom { }; - cri-o = callPackage ../applications/virtualization/cri-o { - buildGoPackage = buildGo112Package; - }; + cri-o = callPackage ../applications/virtualization/cri-o { }; ckan = callPackage ../games/ckan { }; -- cgit v1.2.3 From eb51b462aa027c3302067dba167666378f19bcf1 Mon Sep 17 00:00:00 2001 From: Bruno Bzeznik Date: Fri, 4 Oct 2019 12:37:17 +0200 Subject: Quast: init at 5.0.2 --- .../applications/science/biology/quast/default.nix | 58 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/applications/science/biology/quast/default.nix diff --git a/pkgs/applications/science/biology/quast/default.nix b/pkgs/applications/science/biology/quast/default.nix new file mode 100644 index 00000000000..e3c3ea23c2c --- /dev/null +++ b/pkgs/applications/science/biology/quast/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchurl, python3Packages, zlib, bash, coreutils }: + +let + pythonPackages = python3Packages; + inherit (pythonPackages) python; +in + +pythonPackages.buildPythonApplication rec { + pname = "quast"; + version = "5.0.2"; + + src = fetchurl { + url = "https://github.com/ablab/quast/releases/download/${pname}_${version}/${pname}-${version}.tar.gz"; + sha256 = "13ml8qywbb4cc7wf2x7z5mz1rjqg51ab8wkizwcg4f6c40zgif6d"; + }; + + pythonPath = with pythonPackages; [ simplejson joblib setuptools matplotlib ]; + + nativeBuildInputs = [ coreutils ]; + + buildInputs = [ zlib ] ++ pythonPath; + + dontConfigure = true; + + dontBuild = true; + + installPhase = '' + substituteInPlace quast_libs/bedtools/Makefile \ + --replace "/bin/bash" "${bash}/bin/bash" + mkdir -p "$out/${python.sitePackages}" + export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" + ${python.interpreter} setup.py install \ + --install-lib=$out/${python.sitePackages} \ + --prefix="$out" + ''; + + postFixup = '' + for file in $(find $out -type f -type f -perm /0111); do + old_rpath=$(patchelf --print-rpath $file) && \ + patchelf --set-rpath $old_rpath:${stdenv.cc.cc.lib}/lib $file || true + done + # Link to the master program + ln -s $out/bin/quast.py $out/bin/quast + ''; + + dontPatchELF = true; + + # Tests need to download data files, so manual run after packaging is needed + doCheck = false; + + meta = with stdenv.lib ; { + description = "Evaluates genome assemblies by computing various metrics"; + homepage = "https://github.com/ablab/quast"; + license = licenses.gpl2; + maintainers = [ maintainers.bzizou ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 614cd4e4e40..78f749dc385 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23058,6 +23058,8 @@ in prodigal = callPackage ../applications/science/biology/prodigal { }; + quast = callPackage ../applications/science/biology/quast { }; + raxml = callPackage ../applications/science/biology/raxml { }; raxml-mpi = appendToName "mpi" (raxml.override { -- cgit v1.2.3 From de6ebdff2f2528d85765cea4fedf124620a62493 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Fri, 24 Apr 2020 17:29:43 +0800 Subject: powerline-go: 1.15.0 -> 1.17.0 --- pkgs/tools/misc/powerline-go/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/tools/misc/powerline-go/default.nix index 47336e54d67..077116767c3 100644 --- a/pkgs/tools/misc/powerline-go/default.nix +++ b/pkgs/tools/misc/powerline-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "powerline-go"; - version = "1.15.0"; + version = "1.17.0"; src = fetchFromGitHub { owner = "justjanne"; repo = pname; rev = "v${version}"; - sha256 = "06i07m68l24v29j01qp2y91rwsfqh4x1nc8sxkjzrc7q1c7fsc1r"; + sha256 = "135j18d53nhg6adjd2hax067c5f1py9fyprzfcr3plsxnaki2hrx"; }; modSha256 = "0mz1qrwar9cgrhrgw4z3gwhjj62bnfnn59ji31zkyvwlc1mqh9an"; -- cgit v1.2.3 From d9078294cfdbf7c9b506feb1678d6f51820df7fc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 24 Apr 2020 11:32:18 +0200 Subject: python3Packages.pyviz_comms: 0.7.2 -> 0.7.4 --- pkgs/development/python-modules/pyviz-comms/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyviz-comms/default.nix b/pkgs/development/python-modules/pyviz-comms/default.nix index c62399db117..4bb0bce52eb 100644 --- a/pkgs/development/python-modules/pyviz-comms/default.nix +++ b/pkgs/development/python-modules/pyviz-comms/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyviz_comms"; - version = "0.7.2"; + version = "0.7.4"; src = fetchPypi { inherit pname version; - sha256 = "c1722a496b08eb20ae3f2fedcc1ebcd207567b62e6453c7198a0b8f78ae96049"; + sha256 = "092nl8pq1jqdylj0xyqwgi5qxvhy6qj2nx2lwwfkbnixlg6g8bbi"; }; propagatedBuildInputs = [ param ]; -- cgit v1.2.3 From 2030507f2dd29e0e34daced7f82e71c766e6f217 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 24 Apr 2020 11:32:29 +0200 Subject: python3Packages.param: 1.9.2 -> 1.9.3 --- pkgs/development/python-modules/param/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/param/default.nix b/pkgs/development/python-modules/param/default.nix index 3467cb488f5..096bb2cfb91 100644 --- a/pkgs/development/python-modules/param/default.nix +++ b/pkgs/development/python-modules/param/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "param"; - version = "1.9.2"; + version = "1.9.3"; src = fetchPypi { inherit pname version; - sha256 = "a2dcb07c6a4ff48bade69bb5d30d84a96911a7e9dcb76b6de975453f933332f8"; + sha256 = "10crjlsn5vx03xwlnhga9faqq2rlw0qwabi45vnvhmz22qbd8w43"; }; checkInputs = [ flake8 nose ]; -- cgit v1.2.3 From 955170761f845efc597ba686e248b970ecddd3b7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 24 Apr 2020 11:32:45 +0200 Subject: python3Packages.holoviews: 1.12.7 -> 1.13.2 --- pkgs/development/python-modules/holoviews/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/holoviews/default.nix b/pkgs/development/python-modules/holoviews/default.nix index 51f1e20662a..7b54d8cd5f1 100644 --- a/pkgs/development/python-modules/holoviews/default.nix +++ b/pkgs/development/python-modules/holoviews/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "holoviews"; - version = "1.12.7"; + version = "1.13.2"; src = fetchPypi { inherit pname version; - sha256 = "c63f76d1ce2261eb0cd147a24be25daff399e7df2c3d6ade3e813d2e9cb7d42f"; + sha256 = "00i8732qib86xqa3652vkr178ib3682cls4jcv5g52y0rlkd8bfg"; }; propagatedBuildInputs = [ -- cgit v1.2.3 From 67a61fbd34fe2494f22668169e3dc79e8967852a Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 24 Apr 2020 10:49:36 +0100 Subject: nixos/podman: Add rootless containers to test --- nixos/tests/podman.nix | 48 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 9 deletions(-) diff --git a/nixos/tests/podman.nix b/nixos/tests/podman.nix index ccfe8334a16..283db71d9a4 100644 --- a/nixos/tests/podman.nix +++ b/nixos/tests/podman.nix @@ -10,21 +10,51 @@ import ./make-test-python.nix ( nodes = { podman = { pkgs, ... }: - { - virtualisation.podman.enable = true; + { + virtualisation.podman.enable = true; + virtualisation.containers.users = [ + "alice" + ]; + + users.users.alice = { + isNormalUser = true; + home = "/home/alice"; + description = "Alice Foobar"; }; + + }; }; testScript = '' - start_all() + import shlex + + + def su_cmd(cmd): + cmd = shlex.quote(cmd) + return f"su alice -l -c {cmd}" + podman.wait_for_unit("sockets.target") - podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg") - podman.succeed( - "podman run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" - ) - podman.succeed("podman ps | grep sleeping") - podman.succeed("podman stop sleeping") + start_all() + + + with subtest("Run container as root"): + podman.succeed("tar cv --files-from /dev/null | podman import - scratchimg") + podman.succeed( + "podman run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" + ) + podman.succeed("podman ps | grep sleeping") + podman.succeed("podman stop sleeping") + + with subtest("Run container rootless"): + podman.succeed(su_cmd("tar cv --files-from /dev/null | podman import - scratchimg")) + podman.succeed( + su_cmd( + "podman run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10" + ) + ) + podman.succeed(su_cmd("podman ps | grep sleeping")) + podman.succeed(su_cmd("podman stop sleeping")) ''; } ) -- cgit v1.2.3 From 2058aeba20c1235d247734f6147a2dc2c7b4c30c Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 24 Apr 2020 12:08:41 +0200 Subject: python3Packages.panel: 0.7.0 -> 0.8.3 A newer version is available but requires bokeh >= 2. See https://github.com/NixOS/nixpkgs/pull/85758 for WIP bokeh PR. --- pkgs/development/python-modules/panel/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/panel/default.nix b/pkgs/development/python-modules/panel/default.nix index ef1553e6d09..fe401d9483e 100644 --- a/pkgs/development/python-modules/panel/default.nix +++ b/pkgs/development/python-modules/panel/default.nix @@ -7,15 +7,16 @@ , markdown , pyct , testpath +, tqdm }: buildPythonPackage rec { pname = "panel"; - version = "0.7.0"; + version = "0.8.3"; src = fetchPypi { inherit pname version; - sha256 = "71d446f469b424cb190bc896e78d0415b2bbebf17c6e5b024ed1a73b4448f8f4"; + sha256 = "0iz20k7mqn0560r4358yrzvrrfn00h8s6dim7p7y4icpgjw2mjnb"; }; propagatedBuildInputs = [ @@ -25,6 +26,7 @@ buildPythonPackage rec { markdown pyct testpath + tqdm ]; # infinite recursion in test dependencies (hvplot) -- cgit v1.2.3 From fa31ab96999aab3a2bbb219bce1bd4d5ffce4572 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 24 Apr 2020 11:17:49 +0100 Subject: emacsPackages.magit-circleci: Fix build --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 5c9456b76a6..5381d24e36d 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -170,6 +170,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + magit-circleci = super.magit-circleci.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + magit-annex = super.magit-annex.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = -- cgit v1.2.3 From 368f9ee7d14a2d7748a7ee9d4e39b1416272dfd3 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 24 Apr 2020 11:18:14 +0100 Subject: emacsPackages.magit-diff-flycheck: Fix build --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 5381d24e36d..46ef503dfe9 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -176,6 +176,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + magit-diff-flycheck = super.magit-diff-flycheck.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + magit-annex = super.magit-annex.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = -- cgit v1.2.3 From eb7aa2fce3feb4e0fca022a9da1e6f8b780db68d Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 24 Apr 2020 11:18:29 +0100 Subject: emacsPackages.magit-find-file: Fix build --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 46ef503dfe9..20d3e348c3b 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -182,6 +182,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + magit-find-file = super.magit-find-file.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + magit-annex = super.magit-annex.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = -- cgit v1.2.3 From 0c370e4946a1d7ab120e7bf0f0e7f862ce8fd392 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 24 Apr 2020 11:18:44 +0100 Subject: emacsPackages.magit-gh-pulls: Fix build --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 20d3e348c3b..91c05c5db10 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -188,6 +188,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + magit-gh-pulls = super.magit-gh-pulls.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + magit-annex = super.magit-annex.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = -- cgit v1.2.3 From d12a589b54b69ce8b1f19ab5ac059d2f676ba032 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 24 Apr 2020 11:18:58 +0100 Subject: emacsPackages.magit-imerge: Fix build --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 91c05c5db10..8fc2f04da28 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -194,6 +194,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + magit-imerge = super.magit-imerge.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + magit-annex = super.magit-annex.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = -- cgit v1.2.3 From bd30b6e47945b7b5c2e9d000dedbba313187b2cf Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 24 Apr 2020 11:19:10 +0100 Subject: emacsPackages.magit-lfs: Fix build --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 8fc2f04da28..6df0c3aa941 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -200,6 +200,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + magit-lfs = super.magit-lfs.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + magit-annex = super.magit-annex.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = -- cgit v1.2.3 From e581d92db8c2e915a4daa2f1f86b4dc65768e8c4 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 24 Apr 2020 11:19:23 +0100 Subject: emacsPackages.magit-org-todos: Fix build --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 6df0c3aa941..f35531e58a7 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -206,6 +206,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + magit-org-todos = super.magit-org-todos.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + magit-annex = super.magit-annex.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = -- cgit v1.2.3 From 43818efd94526c0ca928362410a436648fc355cf Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 24 Apr 2020 11:19:35 +0100 Subject: emacsPackages.magit-p4: Fix build --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index f35531e58a7..52adf13b51a 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -212,6 +212,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + magit-p4 = super.magit-p4.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + magit-annex = super.magit-annex.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = -- cgit v1.2.3 From df1fd7d2a4ef9d054f128eedf4d58b123e4fb2d0 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 24 Apr 2020 11:19:48 +0100 Subject: emacsPackages.magit-patch-changelog: Fix build --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 52adf13b51a..397e9ebe4bc 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -218,6 +218,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + magit-patch-changelog = super.magit-patch-changelog.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + magit-annex = super.magit-annex.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = -- cgit v1.2.3 From 69cd2d51a4c4707863a029ae8995e03554aa5031 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 24 Apr 2020 11:20:02 +0100 Subject: emacsPackages.magit-rbr: Fix build --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 397e9ebe4bc..f37d03b9539 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -224,6 +224,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + magit-rbr = super.magit-rbr.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + magit-annex = super.magit-annex.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = -- cgit v1.2.3 From 8827608af77179099fc60821fec3dcac1fafd250 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 24 Apr 2020 11:20:16 +0100 Subject: emacsPackages.magit-reviewboard: Fix build --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index f37d03b9539..1a533366785 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -230,6 +230,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + magit-reviewboard = super.magit-reviewboard.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + magit-annex = super.magit-annex.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = -- cgit v1.2.3 From f10c79e19ed67e22fe1bcb1d0c45c69e9becff38 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 24 Apr 2020 11:20:28 +0100 Subject: emacsPackages.magit-reviewboard: Add git input The build is still failing for unrelated reasons. --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 1a533366785..ccf4ac5ee26 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -236,6 +236,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + magit-stgit = super.magit-stgit.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + magit-annex = super.magit-annex.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = -- cgit v1.2.3 From a22e37b51b705fa16095957c6f0dedffda3a8e68 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 24 Apr 2020 11:20:51 +0100 Subject: emacsPackages.magit-tbdiff: Fix build --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index ccf4ac5ee26..aee8d1dda16 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -242,6 +242,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + magit-tbdiff = super.magit-tbdiff.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + magit-annex = super.magit-annex.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = -- cgit v1.2.3 From dd33024c37a09e7c715b0336839e092360d57221 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 24 Apr 2020 11:21:15 +0100 Subject: emacsPackages.magit-topgit: Fix build --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index aee8d1dda16..87619d93d7b 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -248,6 +248,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + magit-topgit = super.magit-topgit.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + magit-annex = super.magit-annex.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = -- cgit v1.2.3 From 63da0e5eee01b655c1b28cac0200d2bca89cbb10 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 24 Apr 2020 11:21:33 +0100 Subject: emacsPackages.magit-vcsh: Fix build --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 87619d93d7b..0dfc1d3b730 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -254,6 +254,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + magit-vcsh = super.magit-vcsh.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + magit-annex = super.magit-annex.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = -- cgit v1.2.3 From 9072afb6805889ac36328c74a13b54ddffbebe95 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 24 Apr 2020 11:21:43 +0100 Subject: emacsPackages.magit-gerrit: Fix build --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 0dfc1d3b730..6e79e0114b2 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -260,6 +260,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + magit-gerrit = super.magit-gerrit.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + magit-annex = super.magit-annex.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = -- cgit v1.2.3 From 69bac39af760ae1a0dd1278e79a259440249c7c1 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Fri, 24 Apr 2020 12:33:30 +0200 Subject: khal: fix test (#85811) --- pkgs/applications/misc/khal/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix index ae9576e6cbc..323fc501c84 100644 --- a/pkgs/applications/misc/khal/default.nix +++ b/pkgs/applications/misc/khal/default.nix @@ -41,6 +41,13 @@ with python3.pkgs; buildPythonApplication rec { checkInputs = [ pytest glibcLocales ]; LC_ALL = "en_US.UTF-8"; + postPatch = '' + sed -i \ + -e "s/Invalid value for \"ics\"/Invalid value for \\\'ics\\\'/" \ + -e "s/Invalid value for \"\[ICS\]\"/Invalid value for \\\'\[ICS\]\\\'/" \ + tests/cli_test.py + ''; + postInstall = '' # zsh completion install -D misc/__khal $out/share/zsh/site-functions/__khal -- cgit v1.2.3 From d8a6536f2540b446c62869f86b76d56305541346 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 24 Apr 2020 11:25:29 +0100 Subject: emacsPackages.kubernetes-evil: Fix build --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 6e79e0114b2..f489f763796 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -308,6 +308,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + kubernetes-evil = super.kubernetes-evil.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + # upstream issue: missing file header mhc = super.mhc.override { inherit (self.melpaPackages) calfw; -- cgit v1.2.3 From 12085f3ef9aaa0887e815ef8c101d68b3980d472 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 24 Apr 2020 11:26:22 +0100 Subject: emacsPackages.kapacitor: Fix build --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index f489f763796..e5e905e0349 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -302,6 +302,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + kapacitor = super.kapacitor.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + kubernetes = super.kubernetes.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = -- cgit v1.2.3 From b77f95191fff1b136117abf0c127d76260ae2df7 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 24 Apr 2020 11:28:24 +0100 Subject: emacsPackages.mandoku: Fix build --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index e5e905e0349..9d13985ee20 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -164,6 +164,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac ivy-rtags = fix-rtags super.ivy-rtags; + mandoku = super.mandoku.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + magit = super.magit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = -- cgit v1.2.3 From 5afaf77e58f04fb948111c7be172c50cbfd38f91 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 24 Apr 2020 11:28:43 +0100 Subject: emacsPackages.mandoku-tls: Fix build --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 9d13985ee20..f5c77bd09fd 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -170,6 +170,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + mandoku-tls = super.mandoku-tls.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + magit = super.magit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = -- cgit v1.2.3 From d655b917c1f594be01258c346b779414b93cca41 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 24 Apr 2020 09:14:07 +0200 Subject: mosh: fix build with bash-completion 2.10 Fixes #85893 --- .../networking/mosh/bash_completion_datadir.patch | 19 +++++++++++++++++++ pkgs/tools/networking/mosh/default.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/tools/networking/mosh/bash_completion_datadir.patch diff --git a/pkgs/tools/networking/mosh/bash_completion_datadir.patch b/pkgs/tools/networking/mosh/bash_completion_datadir.patch new file mode 100644 index 00000000000..4b71f125d28 --- /dev/null +++ b/pkgs/tools/networking/mosh/bash_completion_datadir.patch @@ -0,0 +1,19 @@ +diff --git a/configure.ac b/configure.ac +index 3ad983d..ff8ff96 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -476,13 +476,7 @@ AS_IF([echo "$protobuf_LIBS" | grep -q -- -pthread], + + # Bash completion needs to ask where it goes if >= 2.0 is installed. + AS_IF([test "$install_completion" != no], +- [PKG_CHECK_MODULES([BASH_COMPLETION], [bash-completion >= 2.0], +- [if test "$prefix" = "NONE"; then +- completions="`pkg-config --variable=completionsdir bash-completion`" +- else +- completions="`pkg-config --define-variable=prefix=$prefix --variable=completionsdir bash-completion`" +- fi], +- [completions="${sysconfdir}/bash_completion.d"]) ++ [completions="`pkg-config --define-variable=datadir=$datadir --variable=completionsdir bash-completion`"] + AC_SUBST([completions])]) + + AC_CONFIG_FILES([ diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index 648fdb9d20e..26c9035cd79 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation rec { url = "https://github.com/mobile-shell/mosh/commit/e5f8a826ef9ff5da4cfce3bb8151f9526ec19db0.patch"; sha256 = "15518rb0r5w1zn4s6981bf1sz6ins6gpn2saizfzhmr13hw4gmhm"; }) + # Fix build with bash-completion 2.10 + ./bash_completion_datadir.patch ]; postPatch = '' substituteInPlace scripts/mosh.pl \ -- cgit v1.2.3 From 27d8b3ef400b3d0e0c0b26fc40be813da69387c6 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 5 Apr 2020 08:40:32 -0400 Subject: musikcube: init at 0.90.1 --- pkgs/applications/audio/musikcube/default.nix | 56 ++++++++++++++++++++++ pkgs/applications/audio/musikcube/dont-strip.patch | 14 ++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 72 insertions(+) create mode 100644 pkgs/applications/audio/musikcube/default.nix create mode 100644 pkgs/applications/audio/musikcube/dont-strip.patch diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix new file mode 100644 index 00000000000..0c076946b92 --- /dev/null +++ b/pkgs/applications/audio/musikcube/default.nix @@ -0,0 +1,56 @@ +{ cmake +, pkg-config +, alsaLib +, boost +, curl +, fetchFromGitHub +, ffmpeg +, lame +, libev +, libmicrohttpd +, ncurses +, pulseaudio +, stdenv +, taglib +, systemdSupport ? stdenv.isLinux, systemd +}: + +stdenv.mkDerivation rec { + pname = "musikcube"; + version = "0.90.1"; + + src = fetchFromGitHub { + owner = "clangen"; + repo = pname; + rev = version; + sha256 = "1ff2cgbllrl2pl5zfbf0cd9qbf6hqpwr395sa1k245ar4f1rfwpg"; + }; + + # https://github.com/clangen/musikcube/issues/339 + patches = [ ./dont-strip.patch ]; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + buildInputs = [ + alsaLib + boost + curl + ffmpeg + lame + libev + libmicrohttpd + ncurses + pulseaudio + taglib + ] ++ stdenv.lib.optional systemdSupport systemd; + + meta = with stdenv.lib; { + description = "A fully functional terminal-based music player, library, and streaming audio server"; + homepage = "https://musikcube.com/"; + maintainers = [ maintainers.aanderse ]; + license = licenses.bsd3; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/audio/musikcube/dont-strip.patch b/pkgs/applications/audio/musikcube/dont-strip.patch new file mode 100644 index 00000000000..b7385dcddba --- /dev/null +++ b/pkgs/applications/audio/musikcube/dont-strip.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a3e02666..7c43c7e6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -370,9 +370,3 @@ endif() + # they don't yet exist! + add_custom_target(postbuild ALL DEPENDS musikcube musikcubed) + add_custom_command(TARGET postbuild POST_BUILD COMMAND cmake .) +- +-# strip binaries in release mode +-if (CMAKE_BUILD_TYPE MATCHES Release) +- message(STATUS "stripping binaries...") +- add_custom_command(TARGET postbuild POST_BUILD COMMAND "${CMAKE_SOURCE_DIR}/strip-nix.sh") +-endif() diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d3fac637ca8..55b8ab6a163 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20035,6 +20035,8 @@ in leftwm = callPackage ../applications/window-managers/leftwm { }; + musikcube = callPackage ../applications/audio/musikcube {}; + pinboard-notes-backup = haskell.lib.overrideCabal (haskell.lib.generateOptparseApplicativeCompletion "pnbackup" haskellPackages.pinboard-notes-backup) -- cgit v1.2.3 From b464d76126b400f921b7fb53044c5dee72f64156 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 24 Apr 2020 15:57:10 +1000 Subject: nixos/cri-o: share registries with nixos/containers --- nixos/doc/manual/release-notes/rl-2009.xml | 5 +++++ nixos/modules/virtualisation/cri-o.nix | 13 ++++--------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 3e29c19af8f..955c19bd98e 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -45,6 +45,11 @@ There is a new module for Podman(virtualisation.podman), a drop-in replacement for the Docker command line. + + + The new virtualisation.containers module manages configuration shared by the CRI-O and Podman modules. + +
diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix index a8ea611f624..89ba9c3c663 100644 --- a/nixos/modules/virtualisation/cri-o.nix +++ b/nixos/modules/virtualisation/cri-o.nix @@ -6,6 +6,10 @@ let cfg = config.virtualisation.cri-o; in { + imports = [ + (mkRenamedOptionModule [ "virtualisation" "cri-o" "registries" ] [ "virtualisation" "containers" "registries" "search" ]) + ]; + meta = { maintainers = lib.teams.podman.members; }; @@ -36,12 +40,6 @@ in default = "/pause"; description = "Pause command to be executed"; }; - - registries = mkOption { - type = types.listOf types.str; - default = [ "docker.io" "quay.io" ]; - description = "Registries to be configured for unqualified image pull"; - }; }; config = mkIf cfg.enable { @@ -57,9 +55,6 @@ in [crio.image] pause_image = "${cfg.pauseImage}" pause_command = "${cfg.pauseCommand}" - registries = [ - ${concatMapStringsSep ", " (x: "\"" + x + "\"") cfg.registries} - ] [crio.network] plugin_dirs = ["${pkgs.cni-plugins}/bin/"] -- cgit v1.2.3 From a46326141570098adc676cd66dc8030fa36d4998 Mon Sep 17 00:00:00 2001 From: talyz Date: Sat, 11 Apr 2020 21:48:37 +0200 Subject: php.buildEnv: Make the exported php package overridable This implements the override pattern for builds done with buildEnv, so that we can, for example, write php.override { fpmSupport = false; } and get a PHP package with the default extensions enabled, but PHP compiled without fpm support. --- pkgs/development/interpreters/php/default.nix | 86 ++++++++++++++------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 47 insertions(+), 41 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 1d6576b383c..4a80f79deeb 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -148,55 +148,61 @@ let generic' = { version, sha256, self, selfWithExtensions, ... }@args: let - php = generic (builtins.removeAttrs args [ "self" "selfWithExtensions" ]); + filteredArgs = builtins.removeAttrs args [ "self" "selfWithExtensions" ]; + php = generic filteredArgs; php-packages = (callPackage ../../../top-level/php-packages.nix { php = self; phpWithExtensions = selfWithExtensions; }); - buildEnv = { extensions ? (_: []), extraConfig ? "" }: - let - getExtName = ext: lib.removePrefix "php-" (builtins.parseDrvName ext.name).name; - enabledExtensions = extensions php-packages.extensions; - - # Generate extension load configuration snippets from the - # extension parameter. This is an attrset suitable for use - # with textClosureList, which is used to put the strings in - # the right order - if a plugin which is dependent on - # another plugin is placed before its dependency, it will - # fail to load. - extensionTexts = - lib.listToAttrs - (map (ext: - let - extName = getExtName ext; - type = "${lib.optionalString (ext.zendExtension or false) "zend_"}extension"; - in - lib.nameValuePair extName { - text = "${type}=${ext}/lib/php/extensions/${extName}.so"; - deps = lib.optionals (ext ? internalDeps) - (map getExtName ext.internalDeps); - }) - enabledExtensions); - - extNames = map getExtName enabledExtensions; - extraInit = writeText "custom-php.ini" '' + buildEnv = lib.makeOverridable ( + { extensions ? (_: []), extraConfig ? "", ... }@innerArgs: + let + filteredInnerArgs = builtins.removeAttrs innerArgs [ "extensions" "extraConfig" ]; + allArgs = filteredArgs // filteredInnerArgs; + php = generic allArgs; + + getExtName = ext: lib.removePrefix "php-" (builtins.parseDrvName ext.name).name; + enabledExtensions = extensions php-packages.extensions; + + # Generate extension load configuration snippets from the + # extension parameter. This is an attrset suitable for use + # with textClosureList, which is used to put the strings in + # the right order - if a plugin which is dependent on + # another plugin is placed before its dependency, it will + # fail to load. + extensionTexts = + lib.listToAttrs + (map (ext: + let + extName = getExtName ext; + type = "${lib.optionalString (ext.zendExtension or false) "zend_"}extension"; + in + lib.nameValuePair extName { + text = "${type}=${ext}/lib/php/extensions/${extName}.so"; + deps = lib.optionals (ext ? internalDeps) + (map getExtName ext.internalDeps); + }) + enabledExtensions); + + extNames = map getExtName enabledExtensions; + extraInit = writeText "custom-php.ini" '' ${lib.concatStringsSep "\n" (lib.textClosureList extensionTexts extNames)} ${extraConfig} ''; - in - symlinkJoin { - name = "php-with-extensions-${version}"; - inherit (php) version; - nativeBuildInputs = [ makeWrapper ]; - passthru = { - inherit buildEnv withExtensions enabledExtensions; - inherit (php-packages) packages extensions; - }; - paths = [ php ]; - postBuild = '' + in + symlinkJoin { + name = "php-with-extensions-${version}"; + inherit (php) version; + nativeBuildInputs = [ makeWrapper ]; + passthru = { + inherit buildEnv withExtensions enabledExtensions; + inherit (php-packages) packages extensions; + }; + paths = [ php ]; + postBuild = '' cp ${extraInit} $out/lib/custom-php.ini wrapProgram $out/bin/php --set PHP_INI_SCAN_DIR $out/lib @@ -205,7 +211,7 @@ let wrapProgram $out/bin/php-fpm --set PHP_INI_SCAN_DIR $out/lib fi ''; - }; + }); withExtensions = extensions: buildEnv { inherit extensions; }; in diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 78f07dc3c16..7f2c34039b4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9494,7 +9494,7 @@ in php73Extensions = recurseIntoAttrs php73.extensions; php74Extensions = recurseIntoAttrs php74.extensions; - inherit (callPackages ../development/interpreters/php { + inherit (callPackage ../development/interpreters/php { stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; }) php74 php73 php72 php74base php73base php72base; -- cgit v1.2.3 From bd6c12ba32b1b076baee6cfc0f1fc80b22e04987 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Thu, 23 Apr 2020 12:00:00 +0000 Subject: ibus: fix generation of 00-upstream-settings --- pkgs/tools/inputmethods/ibus/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 644fd5eef3b..238e133495c 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -16,6 +16,7 @@ , gtk2 , gtk3 , gtk-doc +, runCommand , isocodes , cldr-emoji-annotation , unicode-character-database @@ -47,6 +48,14 @@ let makeWrapper ${glib.dev}/bin/glib-mkenums $out/bin/glib-mkenums --unset PYTHONPATH ''; }; + # make-dconf-override-db.sh needs to execute dbus-launch in the sandbox, + # it will fail to read /etc/dbus-1/session.conf unless we add this flag + dbus-launch = runCommand "sandbox-dbus-launch" { + nativeBuildInputs = [ makeWrapper ]; + } '' + makeWrapper ${dbus}/bin/dbus-launch $out/bin/dbus-launch \ + --add-flags --config-file=${dbus.daemon}/share/dbus-1/session.conf + ''; in stdenv.mkDerivation rec { @@ -71,7 +80,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "installedTests" ]; postPatch = '' - echo \#!${runtimeShell} > data/dconf/make-dconf-override-db.sh + patchShebangs --build data/dconf/make-dconf-override-db.sh cp ${buildPackages.gtk-doc}/share/gtk-doc/data/gtk-doc.make . ''; @@ -105,6 +114,7 @@ stdenv.mkDerivation rec { python3BuildEnv vala wrapGAppsHook + dbus-launch ]; propagatedBuildInputs = [ -- cgit v1.2.3 From a71dc0b27e82d7783d84b7113056814800538bd9 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Thu, 23 Apr 2020 12:00:00 +0000 Subject: ibus: fix installation of dconf database Fixes this warning at ibus-daemon startup: (ibus-dconf:15691): dconf-WARNING **: 21:49:24.018: unable to open file '/etc/dconf/db/ibus': Failed to open file ?/etc/dconf/db/ibus?: open() failed: No such file or directory; expect degraded performance --- nixos/modules/i18n/input-method/ibus.nix | 2 +- nixos/modules/programs/dconf.nix | 35 +++++++++++++++++++++++--------- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/nixos/modules/i18n/input-method/ibus.nix b/nixos/modules/i18n/input-method/ibus.nix index b4746b21b65..cf24ecf5863 100644 --- a/nixos/modules/i18n/input-method/ibus.nix +++ b/nixos/modules/i18n/input-method/ibus.nix @@ -64,7 +64,7 @@ in # Without dconf enabled it is impossible to use IBus programs.dconf.enable = true; - programs.dconf.profiles.ibus = "${ibusPackage}/etc/dconf/profile/ibus"; + programs.dconf.packages = [ ibusPackage ]; services.dbus.packages = [ ibusAutostart diff --git a/nixos/modules/programs/dconf.nix b/nixos/modules/programs/dconf.nix index 6702e8efd1c..30fbd72a9ab 100644 --- a/nixos/modules/programs/dconf.nix +++ b/nixos/modules/programs/dconf.nix @@ -4,13 +4,24 @@ with lib; let cfg = config.programs.dconf; - - mkDconfProfile = name: path: - { - name = "dconf/profile/${name}"; - value.source = path; - }; - + cfgDir = pkgs.symlinkJoin { + name = "dconf-system-config"; + paths = map (x: "${x}/etc/dconf") cfg.packages; + postBuild = '' + mkdir -p $out/profile + mkdir -p $out/db + '' + ( + concatStringsSep "\n" ( + mapAttrsToList ( + name: path: '' + ln -s ${path} $out/profile/${name} + '' + ) cfg.profiles + ) + ) + '' + ${pkgs.dconf}/bin/dconf update $out/db + ''; + }; in { ###### interface @@ -22,18 +33,22 @@ in profiles = mkOption { type = types.attrsOf types.path; default = {}; - description = "Set of dconf profile files."; + description = "Set of dconf profile files, installed at /etc/dconf/profiles/name."; internal = true; }; + packages = mkOption { + type = types.listOf types.package; + default = []; + description = "A list of packages which provide dconf profiles and databases in /etc/dconf."; + }; }; }; ###### implementation config = mkIf (cfg.profiles != {} || cfg.enable) { - environment.etc = optionalAttrs (cfg.profiles != {}) - (mapAttrs' mkDconfProfile cfg.profiles); + environment.etc.dconf.source = mkIf (cfg.profiles != {} || cfg.packages != []) cfgDir; services.dbus.packages = [ pkgs.dconf ]; -- cgit v1.2.3 From 5b7ffe61403bdbc955e02f40ad0270f337a56475 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Fri, 24 Apr 2020 12:00:00 +0000 Subject: nixos/tests/ibus: fix test --- nixos/tests/installed-tests/ibus.nix | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/nixos/tests/installed-tests/ibus.nix b/nixos/tests/installed-tests/ibus.nix index af54b612b50..a4bc2a7d7de 100644 --- a/nixos/tests/installed-tests/ibus.nix +++ b/nixos/tests/installed-tests/ibus.nix @@ -5,16 +5,12 @@ makeInstalledTest { testConfig = { i18n.inputMethod.enabled = "ibus"; + systemd.user.services.ibus-daemon = { + serviceConfig.ExecStart = "${pkgs.ibus}/bin/ibus-daemon --xim --verbose"; + wantedBy = [ "graphical-session.target" ]; + partOf = [ "graphical-session.target" ]; + }; }; - preTestScript = '' - # ibus has ibus-desktop-testing-runner but it tries to manage desktop session so we just spawn ibus-daemon ourselves - machine.succeed("ibus-daemon --daemonize --verbose") - ''; - withX11 = true; - - # TODO: ibus-daemon is currently crashing or something - # maybe make ibus systemd service that auto-restarts? - meta.broken = true; } -- cgit v1.2.3 From 3ec47a7bb0b297bb6159a17c34f6f4945a7f765b Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Fri, 24 Apr 2020 14:15:44 +0200 Subject: libcbor: Fix pkgconfig being placed correctly Fixes #85932 --- pkgs/development/libraries/libcbor/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/development/libraries/libcbor/default.nix index 7067caa42c0..9b6a54d92f9 100644 --- a/pkgs/development/libraries/libcbor/default.nix +++ b/pkgs/development/libraries/libcbor/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { doCheck = false; # needs "-DWITH_TESTS=ON", but fails w/compilation error + cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; + NIX_CFLAGS_COMPILE = "-fno-lto"; meta = with stdenv.lib; { -- cgit v1.2.3 From edc421138b1786ca48b6fe03ed262a45a0056c72 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 24 Apr 2020 15:05:48 +0200 Subject: signal-desktop: 1.33.1 -> 1.33.3 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 7295f6c48ad..c39b199235d 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -23,7 +23,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.33.1"; # Please backport all updates to the stable channel. + version = "1.33.3"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0p9ak0cmk9b77dzbw4y2xmxqg211y62n7ckggwf7bcg48wzj0jy7"; + sha256 = "1brw1hidmrznb55cb794yvgzin7sf3cxnffivmag4vf2a2vcvf4y"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 2a77540f7fa98052cda70690d4b41490c241c9d6 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 24 Apr 2020 15:17:07 +0200 Subject: cargo-make: 0.30.5 -> 0.30.6 https://github.com/sagiegurari/cargo-make/releases/tag/0.30.6 --- pkgs/development/tools/rust/cargo-make/Cargo.lock | 754 ++++++++++----------- pkgs/development/tools/rust/cargo-make/default.nix | 6 +- 2 files changed, 372 insertions(+), 388 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-make/Cargo.lock b/pkgs/development/tools/rust/cargo-make/Cargo.lock index 923e8ab61bb..1f7b5c1d1b7 100644 --- a/pkgs/development/tools/rust/cargo-make/Cargo.lock +++ b/pkgs/development/tools/rust/cargo-make/Cargo.lock @@ -4,1102 +4,1086 @@ name = "adler32" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" [[package]] name = "aho-corasick" -version = "0.7.6" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada" dependencies = [ - "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr", ] [[package]] name = "ansi_term" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" dependencies = [ - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi", ] [[package]] name = "arrayref" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" [[package]] name = "arrayvec" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" [[package]] name = "attohttpc" version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de33d017f0add8b019c6d98c3132c82c8815ca96bbed8e8006e7402c840562b3" dependencies = [ - "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", - "http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)", - "url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "flate2", + "http", + "log", + "native-tls", + "openssl", + "url", ] [[package]] name = "atty" version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "hermit-abi", + "libc", + "winapi", ] -[[package]] -name = "autocfg" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "autocfg" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" [[package]] name = "base64" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" [[package]] name = "base64" version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5ca2cd0adc3f48f9e9ea5a6bbdf9ccc0bfade884847e484d452414c7ccffb3" [[package]] name = "bitflags" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "blake2b_simd" version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" dependencies = [ - "arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", - "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "arrayref", + "arrayvec", + "constant_time_eq", ] [[package]] name = "bytes" version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "c2-chacha" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -] +checksum = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1" [[package]] name = "cargo-make" -version = "0.30.5" -dependencies = [ - "ci_info 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", - "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", - "colored 1.9.2 (registry+https://github.com/rust-lang/crates.io-index)", - "dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "duckscript 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "duckscriptsdk 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "envmnt 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "fern 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "fsio 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "git_info 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "home 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "indexmap 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "run_script 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rust_info 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rusty-hook 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)", - "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)", - "shell2batch 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", +version = "0.30.6" +dependencies = [ + "ci_info", + "clap", + "colored", + "dirs", + "duckscript", + "duckscriptsdk", + "envmnt", + "fern", + "fsio", + "git_info", + "glob", + "home", + "indexmap", + "log", + "run_script", + "rust_info", + "rusty-hook", + "semver", + "serde", + "serde_derive", + "serde_json", + "shell2batch", + "toml", ] [[package]] name = "cc" -version = "1.0.50" +version = "1.0.52" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d87b23d6a92cd03af510a5ade527033f6aa6fa92161e2d5863a907d4c5e31d" [[package]] name = "cfg-if" version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" [[package]] name = "ci_info" version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b407009a4a51ae109dbdfcd7b6e4de38d148f37fad512b8c4623c642c4045e68" dependencies = [ - "envmnt 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "envmnt", ] [[package]] name = "clap" version = "2.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" dependencies = [ - "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "ansi_term", + "atty", + "bitflags", + "strsim", + "textwrap", + "unicode-width", + "vec_map", ] [[package]] name = "colored" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4ffc801dacf156c5854b9df4f425a626539c3a6ef7893cc0c5084a23f0b6c59" dependencies = [ - "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "atty", + "lazy_static", + "winapi", ] [[package]] name = "constant_time_eq" version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "core-foundation" -version = "0.6.4" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" dependencies = [ - "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys", + "libc", ] [[package]] name = "core-foundation-sys" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" [[package]] name = "crc32fast" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", ] [[package]] name = "crossbeam-utils" -version = "0.7.0" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" dependencies = [ - "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg", + "cfg-if", + "lazy_static", ] [[package]] name = "dirs" version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", + "dirs-sys", ] [[package]] name = "dirs-sys" version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_users 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", + "libc", + "redox_users", + "winapi", ] [[package]] name = "duckscript" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "606ba1f416b4babf0971b0510b7e49ecb948ad381e4943d5b96a7a22ac701386" dependencies = [ - "fsio 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "fsio", ] [[package]] name = "duckscriptsdk" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bdbd838e33acba34abb076b94db7bba43e9dbaccd00486322ce314ddc7d0979" dependencies = [ - "attohttpc 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "base64 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "duckscript 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "fsio 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "home 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", - "java-properties 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "meval 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "uname 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "which 3.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "whoami 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "attohttpc", + "base64 0.12.0", + "cfg-if", + "duckscript", + "fs_extra", + "fsio", + "glob", + "home", + "java-properties", + "meval", + "num_cpus", + "rand", + "uname", + "walkdir", + "which", + "whoami", ] [[package]] name = "encoding" version = "0.2.33" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" dependencies = [ - "encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)", - "encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)", - "encoding-index-simpchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)", - "encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)", - "encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)", + "encoding-index-japanese", + "encoding-index-korean", + "encoding-index-simpchinese", + "encoding-index-singlebyte", + "encoding-index-tradchinese", ] [[package]] name = "encoding-index-japanese" version = "1.20141219.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" dependencies = [ - "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "encoding_index_tests", ] [[package]] name = "encoding-index-korean" version = "1.20141219.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" dependencies = [ - "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "encoding_index_tests", ] [[package]] name = "encoding-index-simpchinese" version = "1.20141219.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" dependencies = [ - "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "encoding_index_tests", ] [[package]] name = "encoding-index-singlebyte" version = "1.20141219.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" dependencies = [ - "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "encoding_index_tests", ] [[package]] name = "encoding-index-tradchinese" version = "1.20141219.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" dependencies = [ - "encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "encoding_index_tests", ] [[package]] name = "encoding_index_tests" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" [[package]] name = "envmnt" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fba7e7d8c007e12db7b3bd6f04b8e47e206c9173d9c75413a042ccc941723c8" dependencies = [ - "fsio 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "indexmap 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "fsio", + "indexmap", ] [[package]] name = "fern" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c9a4820f0ccc8a7afd67c39a0f1a0f4b07ca1725164271a64939d7aeb9af065" dependencies = [ - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "log", ] [[package]] name = "flate2" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2cfff41391129e0a856d6d822600b8d71179d46879e310417eb9c762eb178b42" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", + "crc32fast", + "libc", + "miniz_oxide", ] [[package]] name = "fnv" version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" [[package]] name = "foreign-types" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ - "foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "foreign-types-shared", ] [[package]] name = "foreign-types-shared" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fs_extra" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674" [[package]] name = "fsio" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2131cb03096f67334dfba2f0bc46afc5564b08a919d042c6e217e2665741fc54" dependencies = [ - "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "users 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand", + "users", ] [[package]] name = "getopts" version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" dependencies = [ - "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-width", ] [[package]] name = "getrandom" version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", + "libc", + "wasi", ] [[package]] name = "git_info" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "add3a9c3c08c8905a2165ff06891dd1c3bb32d81b2a32d79528abc9793dfb06f" [[package]] name = "glob" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "hermit-abi" -version = "0.1.6" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a0d737e0f947a1864e93d33fdef4af8445a00d1ed8dc0c8ddb73139ea6abf15" dependencies = [ - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "libc", ] [[package]] name = "home" version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654" dependencies = [ - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi", ] [[package]] name = "http" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9" dependencies = [ - "bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)", - "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", + "bytes", + "fnv", + "itoa", ] [[package]] name = "idna" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" dependencies = [ - "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "matches", + "unicode-bidi", + "unicode-normalization", ] [[package]] name = "indexmap" -version = "1.3.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "076f042c5b7b98f31d205f1249267e12a6518c1481e9dae9764af19b707d2292" dependencies = [ - "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg", + "serde", ] [[package]] name = "itoa" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e" [[package]] name = "java-properties" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "caf4418ade5bde22a283a7f2fb537ea397ec102718f259f2630714e7a5b389fa" dependencies = [ - "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "encoding", + "regex", ] [[package]] name = "lazy_static" version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.66" +version = "0.2.69" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "99e85c08494b21a9054e7fe1374a732aeadaff3980b6990b94bfd3a70f690005" [[package]] name = "log" version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", ] [[package]] name = "matches" version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" [[package]] name = "memchr" -version = "2.3.0" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" [[package]] name = "meval" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f79496a5651c8d57cd033c5add8ca7ee4e3d5f7587a4777484640d9cb60392d9" dependencies = [ - "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "nom 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "fnv", + "nom", ] [[package]] name = "miniz_oxide" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa679ff6578b1cddee93d7e82e263b94a575e0bfced07284eb0c037c1d2416a5" dependencies = [ - "adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "adler32", ] [[package]] name = "native-tls" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d" dependencies = [ - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", - "schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", - "security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static", + "libc", + "log", + "openssl", + "openssl-probe", + "openssl-sys", + "schannel", + "security-framework", + "security-framework-sys", + "tempfile", ] [[package]] name = "nias" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab250442c86f1850815b5d268639dff018c0627022bc1940eb2d642ca1ce12f0" [[package]] name = "nom" version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5b8c256fd9471521bcb84c3cdba98921497f1a331cbc15b8030fc63b82050ce" [[package]] name = "num_cpus" -version = "1.12.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" dependencies = [ - "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "hermit-abi", + "libc", ] [[package]] name = "openssl" -version = "0.10.26" +version = "0.10.29" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cee6d85f4cb4c4f59a6a85d5b68a233d280c82e29e822913b9c8b129fbf20bdd" dependencies = [ - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags", + "cfg-if", + "foreign-types", + "lazy_static", + "libc", + "openssl-sys", ] [[package]] name = "openssl-probe" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" [[package]] name = "openssl-sys" -version = "0.9.53" +version = "0.9.55" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7717097d810a0f2e2323f9e5d11e71608355e24828410b55b9d4f18aa5f9a5d8" dependencies = [ - "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", - "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", - "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg", + "cc", + "libc", + "pkg-config", + "vcpkg", ] [[package]] name = "percent-encoding" version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" [[package]] name = "pkg-config" version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" [[package]] name = "ppv-lite86" version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" [[package]] name = "proc-macro2" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df246d292ff63439fea9bc8c0a270bed0e390d5ebd4db4ba15aba81111b5abe3" dependencies = [ - "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-xid", ] [[package]] name = "quote" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f" dependencies = [ - "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2", ] [[package]] name = "rand" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" dependencies = [ - "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "getrandom", + "libc", + "rand_chacha", + "rand_core", + "rand_hc", ] [[package]] name = "rand_chacha" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" dependencies = [ - "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "ppv-lite86", + "rand_core", ] [[package]] name = "rand_core" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" dependencies = [ - "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", + "getrandom", ] [[package]] name = "rand_hc" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" dependencies = [ - "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core", ] [[package]] name = "redox_syscall" version = "0.1.56" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" [[package]] name = "redox_users" version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431" dependencies = [ - "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", - "rust-argon2 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "getrandom", + "redox_syscall", + "rust-argon2", ] [[package]] name = "regex" -version = "1.3.3" +version = "1.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6020f034922e3194c711b82a627453881bc4682166cabb07134a10c26ba7692" dependencies = [ - "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "regex-syntax 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", - "thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "aho-corasick", + "memchr", + "regex-syntax", + "thread_local", ] [[package]] name = "regex-syntax" -version = "0.6.13" +version = "0.6.17" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fe5bd57d1d7414c6b5ed48563a2c855d995ff777729dcd91c369ec7fea395ae" [[package]] name = "remove_dir_all" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" dependencies = [ - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi", ] [[package]] name = "run_script" -version = "0.6.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9527b8b68ef929243a3e8ad7471a2d80f6ac23b810aafd3df4a2e5212d8dacc1" dependencies = [ - "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "users 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "fsio", ] [[package]] name = "rust-argon2" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017" dependencies = [ - "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", - "constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "base64 0.11.0", + "blake2b_simd", + "constant_time_eq", + "crossbeam-utils", ] [[package]] name = "rust_info" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be941f2b996df7ffaf093366039c9dc182b3ca2e00f3e81df44e08c3611e773d" [[package]] name = "rusty-hook" version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27138b73a8ce63ae918707a5e3b57f9b0c0842a57b82f0e43474cf4e3aaf0ff4" dependencies = [ - "ci_info 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)", - "getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", - "nias 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", + "ci_info", + "getopts", + "nias", + "toml", ] [[package]] name = "ryu" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3d612bc64430efeb3f7ee6ef26d590dce0c43249217bddc62112540c7941e1" [[package]] name = "same-file" version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" dependencies = [ - "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi-util", ] [[package]] name = "schannel" -version = "0.1.16" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "039c25b130bd8c1321ee2d7de7fde2659fa9c2744e4bb29711cfc852ea53cd19" dependencies = [ - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static", + "winapi", ] [[package]] name = "security-framework" -version = "0.3.4" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f331b9025654145cd425b9ded0caf8f5ae0df80d418b326e2dc1c3dc5eb0620" dependencies = [ - "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", - "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", ] [[package]] name = "security-framework-sys" -version = "0.3.3" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405" dependencies = [ - "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "core-foundation-sys", + "libc", ] [[package]] name = "semver" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" dependencies = [ - "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "semver-parser", ] [[package]] name = "semver-parser" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.104" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36df6ac6412072f67cf767ebbde4133a5b2e88e76dc6187fa7104cd16f783399" [[package]] name = "serde_derive" -version = "1.0.104" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e549e3abf4fb8621bd1609f11dfc9f5e50320802273b12f3811a67e6716ea6c" dependencies = [ - "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "serde_json" -version = "1.0.48" +version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da07b57ee2623368351e9a0488bb0b261322a15a6e0ae53e243cbdc0f4208da9" dependencies = [ - "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", - "ryu 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", + "itoa", + "ryu", + "serde", ] [[package]] name = "shell2batch" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "185a52ee351c1001753c9e3b2eb48c525ff7f51803a4f2cef4365b5c3b743f65" dependencies = [ - "regex 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "regex", ] [[package]] name = "smallvec" -version = "1.1.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7cb5678e1615754284ec264d9bb5b4c27d2018577fd90ac0ceb578591ed5ee4" [[package]] name = "strsim" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "syn" -version = "1.0.14" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "410a7488c0a728c7ceb4ad59b9567eb4053d02e8cc7f5c0e0eeeb39518369213" dependencies = [ - "proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2", + "quote", + "unicode-xid", ] [[package]] name = "tempfile" version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" dependencies = [ - "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", - "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if", + "libc", + "rand", + "redox_syscall", + "remove_dir_all", + "winapi", ] [[package]] name = "textwrap" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" dependencies = [ - "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-width", ] [[package]] name = "thread_local" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" dependencies = [ - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static", ] [[package]] name = "toml" version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" dependencies = [ - "serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)", + "serde", ] [[package]] name = "uname" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8" dependencies = [ - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "libc", ] [[package]] name = "unicode-bidi" version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" dependencies = [ - "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "matches", ] [[package]] name = "unicode-normalization" version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4" dependencies = [ - "smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec", ] [[package]] name = "unicode-width" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" [[package]] name = "unicode-xid" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" [[package]] name = "url" version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb" dependencies = [ - "idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "idna", + "matches", + "percent-encoding", ] [[package]] name = "users" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c72f4267aea0c3ec6d07eaabea6ead7c5ddacfafc5e22bcf8d186706851fb4cf" dependencies = [ - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "libc", ] [[package]] name = "vcpkg" version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" [[package]] name = "vec_map" version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" [[package]] name = "walkdir" version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" dependencies = [ - "same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "same-file", + "winapi", + "winapi-util", ] [[package]] name = "wasi" version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "which" version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724" dependencies = [ - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", + "libc", ] [[package]] name = "whoami" version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a08eb844b158ea881e81b94556eede7f7e306e4c7b976aad88f49e6e36dec391" [[package]] name = "winapi" version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" dependencies = [ - "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", ] [[package]] name = "winapi-i686-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ - "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi", ] [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" - -[metadata] -"checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" -"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" -"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -"checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee" -"checksum arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" -"checksum attohttpc 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de33d017f0add8b019c6d98c3132c82c8815ca96bbed8e8006e7402c840562b3" -"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" -"checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" -"checksum base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" -"checksum base64 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7d5ca2cd0adc3f48f9e9ea5a6bbdf9ccc0bfade884847e484d452414c7ccffb3" -"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -"checksum blake2b_simd 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" -"checksum bytes 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "130aac562c0dd69c56b3b1cc8ffd2e17be31d0b6c25b61c96b76231aa23e39e1" -"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" -"checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd" -"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" -"checksum ci_info 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b407009a4a51ae109dbdfcd7b6e4de38d148f37fad512b8c4623c642c4045e68" -"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" -"checksum colored 1.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8815e2ab78f3a59928fc32e141fbeece88320a240e43f47b2fd64ea3a88a5b3d" -"checksum constant_time_eq 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" -"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" -"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" -"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" -"checksum crossbeam-utils 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4" -"checksum dirs 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" -"checksum dirs-sys 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" -"checksum duckscript 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "606ba1f416b4babf0971b0510b7e49ecb948ad381e4943d5b96a7a22ac701386" -"checksum duckscriptsdk 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1bdbd838e33acba34abb076b94db7bba43e9dbaccd00486322ce314ddc7d0979" -"checksum encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" -"checksum encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" -"checksum encoding-index-korean 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" -"checksum encoding-index-simpchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" -"checksum encoding-index-singlebyte 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" -"checksum encoding-index-tradchinese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" -"checksum encoding_index_tests 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" -"checksum envmnt 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5fba7e7d8c007e12db7b3bd6f04b8e47e206c9173d9c75413a042ccc941723c8" -"checksum fern 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8c9a4820f0ccc8a7afd67c39a0f1a0f4b07ca1725164271a64939d7aeb9af065" -"checksum flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd6d6f4752952feb71363cffc9ebac9411b75b87c6ab6058c40c8900cf43c0f" -"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" -"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" -"checksum fs_extra 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674" -"checksum fsio 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2131cb03096f67334dfba2f0bc46afc5564b08a919d042c6e217e2665741fc54" -"checksum getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)" = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" -"checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" -"checksum git_info 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "add3a9c3c08c8905a2165ff06891dd1c3bb32d81b2a32d79528abc9793dfb06f" -"checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" -"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772" -"checksum home 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654" -"checksum http 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b708cc7f06493459026f53b9a61a7a121a5d1ec6238dee58ea4941132b30156b" -"checksum idna 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" -"checksum indexmap 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b54058f0a6ff80b6803da8faf8997cde53872b38f4023728f6830b06cd3c0dc" -"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" -"checksum java-properties 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "caf4418ade5bde22a283a7f2fb537ea397ec102718f259f2630714e7a5b389fa" -"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" -"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" -"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" -"checksum memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3197e20c7edb283f87c071ddfc7a2cca8f8e0b888c242959846a6fce03c72223" -"checksum meval 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f79496a5651c8d57cd033c5add8ca7ee4e3d5f7587a4777484640d9cb60392d9" -"checksum miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6f3f74f726ae935c3f514300cc6773a0c9492abc5e972d42ba0c0ebb88757625" -"checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e" -"checksum nias 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ab250442c86f1850815b5d268639dff018c0627022bc1940eb2d642ca1ce12f0" -"checksum nom 1.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a5b8c256fd9471521bcb84c3cdba98921497f1a331cbc15b8030fc63b82050ce" -"checksum num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6" -"checksum openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)" = "3a3cc5799d98e1088141b8e01ff760112bbd9f19d850c124500566ca6901a585" -"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" -"checksum openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)" = "465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f" -"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" -"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" -"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" -"checksum proc-macro2 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3acb317c6ff86a4e579dfa00fc5e6cca91ecbb4e7eb2df0468805b674eb88548" -"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" -"checksum rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" -"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" -"checksum redox_users 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431" -"checksum regex 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b5508c1941e4e7cb19965abef075d35a9a8b5cdf0846f30b4050e9b55dc55e87" -"checksum regex-syntax 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e734e891f5b408a29efbf8309e656876276f49ab6a6ac208600b4419bd893d90" -"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" -"checksum run_script 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2dfbbb48b9c7ee71baadd968640f81ca4bc930c1a2029441eede96a6933275ac" -"checksum rust-argon2 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017" -"checksum rust_info 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be941f2b996df7ffaf093366039c9dc182b3ca2e00f3e81df44e08c3611e773d" -"checksum rusty-hook 0.11.1 (registry+https://github.com/rust-lang/crates.io-index)" = "27138b73a8ce63ae918707a5e3b57f9b0c0842a57b82f0e43474cf4e3aaf0ff4" -"checksum ryu 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "535622e6be132bccd223f4bb2b8ac8d53cda3c7a6394944d3b2b33fb974f9d76" -"checksum same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -"checksum schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021" -"checksum security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8ef2429d7cefe5fd28bd1d2ed41c944547d4ff84776f5935b456da44593a16df" -"checksum security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e31493fc37615debb8c5090a7aeb4a9730bc61e77ab10b9af59f1a202284f895" -"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -"checksum serde 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "414115f25f818d7dfccec8ee535d76949ae78584fc4f79a6f45a904bf8ab4449" -"checksum serde_derive 1.0.104 (registry+https://github.com/rust-lang/crates.io-index)" = "128f9e303a5a29922045a830221b8f78ec74a5f544944f3d5984f8ec3895ef64" -"checksum serde_json 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)" = "9371ade75d4c2d6cb154141b9752cf3781ec9c05e0e5cf35060e1e70ee7b9c25" -"checksum shell2batch 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "185a52ee351c1001753c9e3b2eb48c525ff7f51803a4f2cef4365b5c3b743f65" -"checksum smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44e59e0c9fa00817912ae6e4e6e3c4fe04455e75699d06eedc7d85917ed8e8f4" -"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -"checksum syn 1.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "af6f3550d8dff9ef7dc34d384ac6f107e5d31c8f57d9f28e0081503f547ac8f5" -"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" -"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -"checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" -"checksum toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" -"checksum uname 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8" -"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -"checksum unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4" -"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" -"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" -"checksum url 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb" -"checksum users 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c72f4267aea0c3ec6d07eaabea6ead7c5ddacfafc5e22bcf8d186706851fb4cf" -"checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" -"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" -"checksum walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" -"checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -"checksum which 3.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d011071ae14a2f6671d0b74080ae0cd8ebf3a6f8c9589a2cd45f23126fe29724" -"checksum whoami 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a08eb844b158ea881e81b94556eede7f7e306e4c7b976aad88f49e6e36dec391" -"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" -"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -"checksum winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4ccfbf554c6ad11084fb7517daca16cfdcaccbdadba4fc336f032a8b12c2ad80" -"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index dd4bfd8cfe0..6054a43d227 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.30.5"; + version = "0.30.6"; src = let @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "sagiegurari"; repo = pname; rev = version; - sha256 = "0p6rzkrwyfcrg4qrlb67rf0wb12kqldl1xg0rfnwc23y17fbwx49"; + sha256 = "1kr3ay1gifyhwk6nlzq5vdi45583f5yvszk1pjsy2ki8l8j3ba3h"; }; in runCommand "source" {} '' @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "14gbs0ldkxxwav773r2851gyrd0h12dy3g0fcr2j3az4zq983ggd"; + cargoSha256 = "0zfylhfz2c8yfixjiv41kl1xgmbbh2c38cc8ajx1pxrhgn7ig5dv"; # Some tests fail because they need network access. # However, Travis ensures a proper build. -- cgit v1.2.3 From 03399906ecd2e5db78fc4d2c72c70150ed21bd07 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 24 Apr 2020 14:54:59 +0200 Subject: tdesktop: 2.0.1 -> 2.1.0 --- .../networking/instant-messengers/telegram/tdesktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 60fd95a1476..6f4099c1d8d 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -19,12 +19,12 @@ with lib; mkDerivation rec { pname = "telegram-desktop"; - version = "2.0.1"; + version = "2.1.0"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "0g3jw4can9gmp48s3b8s1w8n9xi54i142y74fszxf9jyq5drzlff"; + sha256 = "0l5917w90z9pg1al1hzcycb4yxv03vc88jg958ifl9nlvz1arll6"; }; postPatch = '' -- cgit v1.2.3 From 87520df25871ea7fb0ef268424ea7779982d09cd Mon Sep 17 00:00:00 2001 From: oxalica Date: Fri, 24 Apr 2020 21:27:11 +0800 Subject: tdesktop: 2.0.1 -> 2.1.0 --- .../networking/instant-messengers/telegram/tdesktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 60fd95a1476..6f4099c1d8d 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -19,12 +19,12 @@ with lib; mkDerivation rec { pname = "telegram-desktop"; - version = "2.0.1"; + version = "2.1.0"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "0g3jw4can9gmp48s3b8s1w8n9xi54i142y74fszxf9jyq5drzlff"; + sha256 = "0l5917w90z9pg1al1hzcycb4yxv03vc88jg958ifl9nlvz1arll6"; }; postPatch = '' -- cgit v1.2.3 From 409f57508d4e5c3679398d8b27ac0494fbfe4ce4 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 24 Apr 2020 17:18:07 +0200 Subject: slimrat: remove The package was marked as broken for 3 years, there were no upstream updates for 8 years, and the program requires third party services that don't provide APIs to work. I think it's safe to say that this program is not going to work. --- pkgs/tools/networking/slimrat/default.nix | 33 ------------------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 35 deletions(-) delete mode 100644 pkgs/tools/networking/slimrat/default.nix diff --git a/pkgs/tools/networking/slimrat/default.nix b/pkgs/tools/networking/slimrat/default.nix deleted file mode 100644 index 1c26dc27b3f..00000000000 --- a/pkgs/tools/networking/slimrat/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{stdenv, fetchurl, perlPackages, makeWrapper}: - -stdenv.mkDerivation { - name = "slimrat-1.0"; - src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/slimrat/slimrat-1.0.tar.bz2"; - sha256 = "139b71d45k4b1y47iq62a9732cnaqqbh8s4knkrgq2hx0jxpsk5a"; - }; - - buildInputs = [ makeWrapper ] ++ (with perlPackages; [ perl WWWMechanize LWP ]); - - patchPhase = '' - sed -e 's,#!.*,#!${perlPackages.perl}/bin/perl,' -i src/{slimrat,slimrat-gui} - ''; - - installPhase = '' - mkdir -p $out/share/slimrat $out/bin - cp -R src/* $out/share/slimrat - # slimrat-gui does not work (it needs the Gtk2 perl package) - for i in slimrat; do - makeWrapper $out/share/slimrat/$i $out/bin/$i \ - --prefix PERL5LIB : $PERL5LIB - done - ''; - - meta = { - homepage = "https://code.google.com/archive/p/slimrat/"; - description = "Linux Rapidshare downloader"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - broken = true; # officially abandonned upstream - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2d9852bcb6..a3cee11f9c8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6617,8 +6617,6 @@ in sleepyhead = callPackage ../applications/misc/sleepyhead {}; - slimrat = callPackage ../tools/networking/slimrat { }; - slirp4netns = callPackage ../tools/networking/slirp4netns/default.nix { }; slsnif = callPackage ../tools/misc/slsnif { }; -- cgit v1.2.3 From ff642c5694881f5009232f85e956edeeb89e0f97 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Fri, 24 Apr 2020 10:22:21 -0500 Subject: llvm/compiler-rt.nix: add i{4,5,6}86 to X86 architecture Fixes #85622 --- pkgs/development/compilers/llvm/10/compiler-rt.nix | 5 ++++- pkgs/development/compilers/llvm/6/compiler-rt.nix | 5 ++++- pkgs/development/compilers/llvm/7/compiler-rt.nix | 5 ++++- pkgs/development/compilers/llvm/8/compiler-rt.nix | 5 ++++- pkgs/development/compilers/llvm/9/compiler-rt.nix | 5 ++++- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/llvm/10/compiler-rt.nix b/pkgs/development/compilers/llvm/10/compiler-rt.nix index 4d31229d64c..c0ea436ae27 100644 --- a/pkgs/development/compilers/llvm/10/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/10/compiler-rt.nix @@ -55,7 +55,10 @@ stdenv.mkDerivation rec { # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by # a flag and turn the flag off during the stdenv build. - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = '' + substituteInPlace cmake/builtin-config-ix.cmake \ + --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' + '' + stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' '' + stdenv.lib.optionalString (useLLVM) '' diff --git a/pkgs/development/compilers/llvm/6/compiler-rt.nix b/pkgs/development/compilers/llvm/6/compiler-rt.nix index 1bdba107d7d..abb6796e3c7 100644 --- a/pkgs/development/compilers/llvm/6/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/6/compiler-rt.nix @@ -54,7 +54,10 @@ stdenv.mkDerivation { # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by # a flag and turn the flag off during the stdenv build. - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = '' + substituteInPlace cmake/builtin-config-ix.cmake \ + --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' + '' + stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' '' + stdenv.lib.optionalString (useLLVM) '' diff --git a/pkgs/development/compilers/llvm/7/compiler-rt.nix b/pkgs/development/compilers/llvm/7/compiler-rt.nix index 055fb01215f..e83a4a3c26f 100644 --- a/pkgs/development/compilers/llvm/7/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/7/compiler-rt.nix @@ -55,7 +55,10 @@ stdenv.mkDerivation { # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by # a flag and turn the flag off during the stdenv build. - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = '' + substituteInPlace cmake/builtin-config-ix.cmake \ + --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' + '' + stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' '' + stdenv.lib.optionalString (useLLVM) '' diff --git a/pkgs/development/compilers/llvm/8/compiler-rt.nix b/pkgs/development/compilers/llvm/8/compiler-rt.nix index 573c198d6da..b11659a78cc 100644 --- a/pkgs/development/compilers/llvm/8/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/8/compiler-rt.nix @@ -55,7 +55,10 @@ stdenv.mkDerivation { # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by # a flag and turn the flag off during the stdenv build. - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = '' + substituteInPlace cmake/builtin-config-ix.cmake \ + --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' + '' + stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' '' + stdenv.lib.optionalString (useLLVM) '' diff --git a/pkgs/development/compilers/llvm/9/compiler-rt.nix b/pkgs/development/compilers/llvm/9/compiler-rt.nix index c7723a98291..7d712017eae 100644 --- a/pkgs/development/compilers/llvm/9/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/9/compiler-rt.nix @@ -54,7 +54,10 @@ stdenv.mkDerivation rec { # can build this. If we didn't do it, basically the entire nixpkgs on Darwin would have an unfree dependency and we'd # get no binary cache for the entire platform. If you really find yourself wanting the TSAN, make this controllable by # a flag and turn the flag off during the stdenv build. - postPatch = stdenv.lib.optionalString stdenv.isDarwin '' + postPatch = '' + substituteInPlace cmake/builtin-config-ix.cmake \ + --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' + '' + stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace cmake/config-ix.cmake \ --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' '' + stdenv.lib.optionalString (useLLVM) '' -- cgit v1.2.3 From 34276b84c5b84f40d46fa3919fbdcd159856469c Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 24 Apr 2020 15:02:11 +0200 Subject: nvme-cli: 1.10.1 -> 1.11.1 --- pkgs/os-specific/linux/nvme-cli/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix index d0aca3bbc82..616ad9c6764 100644 --- a/pkgs/os-specific/linux/nvme-cli/default.nix +++ b/pkgs/os-specific/linux/nvme-cli/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, pkgconfig }: +{ lib, stdenv, fetchFromGitHub, pkg-config }: stdenv.mkDerivation rec { pname = "nvme-cli"; - version = "1.10.1"; + version = "1.11.1"; src = fetchFromGitHub { owner = "linux-nvme"; repo = "nvme-cli"; rev = "v${version}"; - sha256 = "12wp2wxmsw2v8m9bhvwvdbhdgx1md8iilhbl19sfzz2araiwi2x8"; + sha256 = "06cxs41biqx230grvpk7zid3apcaajjywrccag50krb6h2wqafdl"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkg-config ]; makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; @@ -20,8 +20,16 @@ stdenv.mkDerivation rec { installTargets = [ "install-spec" ]; meta = with lib; { - inherit (src.meta) homepage; + inherit (src.meta) homepage; # https://nvmexpress.org/ description = "NVM-Express user space tooling for Linux"; + longDescription = '' + NVM-Express is a fast, scalable host controller interface designed to + address the needs for not only PCI Express based solid state drives, but + also NVMe-oF(over fabrics). + This nvme program is a user space utility to provide standards compliant + tooling for NVM-Express drives. It was made specifically for Linux as it + relies on the IOCTLs defined by the mainline kernel driver. + ''; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ primeos tavyc ]; -- cgit v1.2.3 From d40391145108d3db0f06ddfc806e5de25547c032 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Fri, 24 Apr 2020 10:57:17 -0500 Subject: linux_testing: 5.6-rc7 -> 5.7-rc2 Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index e63fe96be6b..9e2ccaeae2b 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,15 +3,15 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.6-rc7"; - extraMeta.branch = "5.6"; + version = "5.7-rc2"; + extraMeta.branch = "5.7"; # modDirVersion needs to be x.y.z, will always add .0 modDirVersion = if (modDirVersionArg == null) then builtins.replaceStrings ["-"] [".0-"] version else modDirVersionArg; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0wv3ipfm970y2pyadwn5g7hd9bj117qk8jl8sdhrasbsy1p8936i"; + sha256 = "06h7lrif84gyzblrdgg4cirsr2v69sdbymwkk89nr3gc87hnjlvs"; }; # Should the testing kernels ever be built on Hydra? -- cgit v1.2.3 From 1f57d5e060e097f014b8c700771d395af87990d0 Mon Sep 17 00:00:00 2001 From: Ingo Blechschmidt Date: Fri, 24 Apr 2020 04:37:49 +0200 Subject: websocat: fix wrapping --- pkgs/tools/misc/websocat/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/websocat/default.nix b/pkgs/tools/misc/websocat/default.nix index 14617f207db..7870974531e 100644 --- a/pkgs/tools/misc/websocat/default.nix +++ b/pkgs/tools/misc/websocat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, openssl, rustPlatform, Security }: +{ stdenv, fetchFromGitHub, pkgconfig, openssl, rustPlatform, Security, makeWrapper, bash }: rustPlatform.buildRustPackage rec { pname = "websocat"; @@ -14,9 +14,17 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--features=ssl" ]; cargoSha256 = "09chj0bgf4r8v5cjq0hvb84zvh98nrzrh1m0wdqjy5gi7zc30cis"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig makeWrapper ]; buildInputs = [ openssl ] ++ stdenv.lib.optional stdenv.isDarwin Security; + # The wrapping is required so that the "sh-c" option of websocat works even + # if sh is not in the PATH (as can happen, for instance, when websocat is + # started as a systemd service). + postInstall = '' + wrapProgram $out/bin/websocat \ + --prefix PATH : ${stdenv.lib.makeBinPath [ bash ]} + ''; + meta = with stdenv.lib; { description = "Command-line client for WebSockets (like netcat/socat)"; homepage = "https://github.com/vi/websocat"; -- cgit v1.2.3 From 6695fdc961496648a1ddc38bac7b2c9e710df166 Mon Sep 17 00:00:00 2001 From: Ingo Blechschmidt Date: Sat, 11 Apr 2020 04:30:24 +0200 Subject: ttyd: 1.5.2 -> 1.6.0 --- pkgs/servers/ttyd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/ttyd/default.nix b/pkgs/servers/ttyd/default.nix index bee9b0e9a7c..b7fac5fc477 100644 --- a/pkgs/servers/ttyd/default.nix +++ b/pkgs/servers/ttyd/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchFromGitHub , pkgconfig, cmake, xxd -, openssl, libwebsockets, json_c, libuv +, openssl, libwebsockets, json_c, libuv, zlib }: with builtins; stdenv.mkDerivation rec { pname = "ttyd"; - version = "1.5.2"; + version = "1.6.0"; src = fetchFromGitHub { owner = "tsl0922"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "16nngc3dqrsgpapzvl34c0msgdd1fyp3k8r1jj1m9bch6z2p50bl"; + sha256 = "08skw3h897jb71sbnglj571h35pcb1mikzlh71sx5imjgi4hfczr"; }; nativeBuildInputs = [ pkgconfig cmake xxd ]; - buildInputs = [ openssl libwebsockets json_c libuv ]; + buildInputs = [ openssl libwebsockets json_c libuv zlib ]; enableParallelBuilding = true; outputs = [ "out" "man" ]; -- cgit v1.2.3 From dde5f5f899acc34407b604cbca4d4070e3111f13 Mon Sep 17 00:00:00 2001 From: talyz Date: Sun, 12 Apr 2020 13:55:57 +0200 Subject: php: Make all arguments to a PHP build overridable Make all arguments to a PHP build overridable; i.e, both configuration flags, such as valgrindSupport, and packages, such as valgrind: php.override { valgrindSupport = false; valgrind = valgrind-light; } This applies to packages built by generic and buildEnv/withExtensions; i.e, it works with both phpXX and phpXXBase packages. The following changes were also made to facilitate this: - generic and generic' are merged into one function - generic now takes all required arguments for a complete build and is meant to be called by callPackage - The main function called from all-packages.nix no longer takes all required arguments for a complete build - all arguments passed to it are however forwarded to the individual builds, thus default arguments can still be overridden from all-packages.nix --- pkgs/development/interpreters/php/default.nix | 460 +++++++++++++------------- 1 file changed, 232 insertions(+), 228 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 4a80f79deeb..7c6cb87dfb3 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -1,254 +1,258 @@ # We have tests for PCRE and PHP-FPM in nixos/tests/php/ or # both in the same attribute named nixosTests.php -{ callPackage, config, fetchurl, lib, makeWrapper, stdenv, symlinkJoin -, writeText , autoconf, automake, bison, flex, libtool, pkgconfig, re2c -, apacheHttpd, libargon2, libxml2, pcre, pcre2 , systemd, valgrind -}: +{ callPackage, lib, stdenv }@_args: let generic = - { version - , sha256 - , extraPatches ? [] - - # Sapi flags - , cgiSupport ? config.php.cgi or true - , cliSupport ? config.php.cli or true - , fpmSupport ? config.php.fpm or true - , pearSupport ? config.php.pear or true - , pharSupport ? config.php.phar or true - , phpdbgSupport ? config.php.phpdbg or true - - - # Misc flags - , apxs2Support ? config.php.apxs2 or (!stdenv.isDarwin) - , argon2Support ? config.php.argon2 or true - , cgotoSupport ? config.php.cgoto or false - , embedSupport ? config.php.embed or false - , ipv6Support ? config.php.ipv6 or true - , systemdSupport ? config.php.systemd or stdenv.isLinux - , valgrindSupport ? config.php.valgrind or true - , ztsSupport ? (config.php.zts or false) || (apxs2Support) - }: let - pcre' = if (lib.versionAtLeast version "7.3") then pcre2 else pcre; - in stdenv.mkDerivation { - pname = "php"; - - inherit version; - - enableParallelBuilding = true; - - nativeBuildInputs = [ autoconf automake bison flex libtool pkgconfig re2c ]; - - buildInputs = - # PCRE extension - [ pcre' ] - - # Enable sapis - ++ lib.optional pearSupport [ libxml2.dev ] - - # Misc deps - ++ lib.optional apxs2Support apacheHttpd - ++ lib.optional argon2Support libargon2 - ++ lib.optional systemdSupport systemd - ++ lib.optional valgrindSupport valgrind - ; - - CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; - - configureFlags = - # Disable all extensions - [ "--disable-all" ] - - # PCRE - ++ lib.optionals (lib.versionAtLeast version "7.4") [ "--with-external-pcre=${pcre'.dev}" ] - ++ lib.optionals (lib.versions.majorMinor version == "7.3") [ "--with-pcre-regex=${pcre'.dev}" ] - ++ lib.optionals (lib.versionOlder version "7.3") [ "--with-pcre-regex=${pcre'.dev}" ] - ++ [ "PCRE_LIBDIR=${pcre'}" ] - - - # Enable sapis - ++ lib.optional (!cgiSupport) "--disable-cgi" - ++ lib.optional (!cliSupport) "--disable-cli" - ++ lib.optional fpmSupport "--enable-fpm" - ++ lib.optional pearSupport [ "--with-pear=$(out)/lib/php/pear" "--enable-xml" "--with-libxml" ] - ++ lib.optional (pearSupport && (lib.versionOlder version "7.4")) "--enable-libxml" - ++ lib.optional pharSupport "--enable-phar" - ++ lib.optional phpdbgSupport "--enable-phpdbg" - - - # Misc flags - ++ lib.optional apxs2Support "--with-apxs2=${apacheHttpd.dev}/bin/apxs" - ++ lib.optional argon2Support "--with-password-argon2=${libargon2}" - ++ lib.optional cgotoSupport "--enable-re2c-cgoto" - ++ lib.optional embedSupport "--enable-embed" - ++ lib.optional (!ipv6Support) "--disable-ipv6" - ++ lib.optional systemdSupport "--with-fpm-systemd" - ++ lib.optional valgrindSupport "--with-valgrind=${valgrind.dev}" - ++ lib.optional ztsSupport "--enable-maintainer-zts" - ; - - hardeningDisable = [ "bindnow" ]; - - preConfigure = '' - # Don't record the configure flags since this causes unnecessary - # runtime dependencies - for i in main/build-defs.h.in scripts/php-config.in; do - substituteInPlace $i \ - --replace '@CONFIGURE_COMMAND@' '(omitted)' \ - --replace '@CONFIGURE_OPTIONS@' "" \ - --replace '@PHP_LDFLAGS@' "" - done - - export EXTENSION_DIR=$out/lib/php/extensions - - ./buildconf --copy --force - - if test -f $src/genfiles; then - ./genfiles - fi - '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace configure --replace "-lstdc++" "-lc++" - ''; - - postInstall = '' - test -d $out/etc || mkdir $out/etc - cp php.ini-production $out/etc/php.ini - ''; - - postFixup = '' - mkdir -p $dev/bin $dev/share/man/man1 - mv $out/bin/phpize $out/bin/php-config $dev/bin/ - mv $out/share/man/man1/phpize.1.gz \ - $out/share/man/man1/php-config.1.gz \ - $dev/share/man/man1/ - ''; - - src = fetchurl { - url = "https://www.php.net/distributions/php-${version}.tar.bz2"; - inherit sha256; - }; - - patches = [ ./fix-paths-php7.patch ] ++ extraPatches; - - separateDebugInfo = true; - - outputs = [ "out" "dev" ]; - - meta = with stdenv.lib; { - description = "An HTML-embedded scripting language"; - homepage = "https://www.php.net/"; - license = licenses.php301; - maintainers = with maintainers; [ globin etu ma27 ]; - platforms = platforms.all; - outputsToInstall = [ "out" "dev" ]; - }; - }; - - generic' = { version, sha256, self, selfWithExtensions, ... }@args: - let - filteredArgs = builtins.removeAttrs args [ "self" "selfWithExtensions" ]; - php = generic filteredArgs; - - php-packages = (callPackage ../../../top-level/php-packages.nix { - php = self; - phpWithExtensions = selfWithExtensions; - }); - - buildEnv = lib.makeOverridable ( - { extensions ? (_: []), extraConfig ? "", ... }@innerArgs: - let - filteredInnerArgs = builtins.removeAttrs innerArgs [ "extensions" "extraConfig" ]; - allArgs = filteredArgs // filteredInnerArgs; - php = generic allArgs; - - getExtName = ext: lib.removePrefix "php-" (builtins.parseDrvName ext.name).name; - enabledExtensions = extensions php-packages.extensions; - - # Generate extension load configuration snippets from the - # extension parameter. This is an attrset suitable for use - # with textClosureList, which is used to put the strings in - # the right order - if a plugin which is dependent on - # another plugin is placed before its dependency, it will - # fail to load. - extensionTexts = - lib.listToAttrs - (map (ext: - let - extName = getExtName ext; - type = "${lib.optionalString (ext.zendExtension or false) "zend_"}extension"; - in - lib.nameValuePair extName { - text = "${type}=${ext}/lib/php/extensions/${extName}.so"; - deps = lib.optionals (ext ? internalDeps) - (map getExtName ext.internalDeps); - }) - enabledExtensions); - - extNames = map getExtName enabledExtensions; - extraInit = writeText "custom-php.ini" '' - ${lib.concatStringsSep "\n" - (lib.textClosureList extensionTexts extNames)} - ${extraConfig} - ''; - in - symlinkJoin { - name = "php-with-extensions-${version}"; - inherit (php) version; - nativeBuildInputs = [ makeWrapper ]; - passthru = { - inherit buildEnv withExtensions enabledExtensions; - inherit (php-packages) packages extensions; + { callPackage, lib, stdenv, config, fetchurl, makeWrapper + , symlinkJoin, writeText, autoconf, automake, bison, flex, libtool + , pkgconfig, re2c, apacheHttpd, libargon2, libxml2, pcre, pcre2 + , systemd, valgrind + + , version + , sha256 + , extraPatches ? [] + + , defaultPhpExtensions + + # Sapi flags + , cgiSupport ? config.php.cgi or true + , cliSupport ? config.php.cli or true + , fpmSupport ? config.php.fpm or true + , pearSupport ? config.php.pear or true + , pharSupport ? config.php.phar or true + , phpdbgSupport ? config.php.phpdbg or true + + + # Misc flags + , apxs2Support ? config.php.apxs2 or (!stdenv.isDarwin) + , argon2Support ? config.php.argon2 or true + , cgotoSupport ? config.php.cgoto or false + , embedSupport ? config.php.embed or false + , ipv6Support ? config.php.ipv6 or true + , systemdSupport ? config.php.systemd or stdenv.isLinux + , valgrindSupport ? config.php.valgrind or true + , ztsSupport ? (config.php.zts or false) || (apxs2Support) + }@args: + let + self = generic args; + + php-packages = (callPackage ../../../top-level/php-packages.nix { + php = self; + phpWithExtensions = self.withExtensions defaultPhpExtensions; + }); + + buildEnv = lib.makeOverridable ( + { extensions ? (_: []), extraConfig ? "", ... }@innerArgs: + let + filteredInnerArgs = builtins.removeAttrs innerArgs [ "extensions" "extraConfig" ]; + allArgs = args // filteredInnerArgs; + php = generic allArgs; + + php-packages = (callPackage ../../../top-level/php-packages.nix { + inherit php phpWithExtensions; + }); + + getExtName = ext: lib.removePrefix "php-" (builtins.parseDrvName ext.name).name; + enabledExtensions = extensions php-packages.extensions; + + # Generate extension load configuration snippets from the + # extension parameter. This is an attrset suitable for use + # with textClosureList, which is used to put the strings in + # the right order - if a plugin which is dependent on + # another plugin is placed before its dependency, it will + # fail to load. + extensionTexts = + lib.listToAttrs + (map (ext: + let + extName = getExtName ext; + type = "${lib.optionalString (ext.zendExtension or false) "zend_"}extension"; + in + lib.nameValuePair extName { + text = "${type}=${ext}/lib/php/extensions/${extName}.so"; + deps = lib.optionals (ext ? internalDeps) + (map getExtName ext.internalDeps); + }) + enabledExtensions); + + extNames = map getExtName enabledExtensions; + extraInit = writeText "custom-php.ini" '' + ${lib.concatStringsSep "\n" + (lib.textClosureList extensionTexts extNames)} + ${extraConfig} + ''; + + phpWithExtensions = symlinkJoin rec { + name = "php-with-extensions-${version}"; + inherit (php) version; + nativeBuildInputs = [ makeWrapper ]; + passthru = { + inherit buildEnv withExtensions enabledExtensions; + inherit (php-packages) packages extensions; + }; + paths = [ php ]; + postBuild = '' + cp ${extraInit} $out/lib/custom-php.ini + + wrapProgram $out/bin/php --set PHP_INI_SCAN_DIR $out/lib + + if test -e $out/bin/php-fpm; then + wrapProgram $out/bin/php-fpm --set PHP_INI_SCAN_DIR $out/lib + fi + ''; }; - paths = [ php ]; - postBuild = '' - cp ${extraInit} $out/lib/custom-php.ini - - wrapProgram $out/bin/php --set PHP_INI_SCAN_DIR $out/lib - - if test -e $out/bin/php-fpm; then - wrapProgram $out/bin/php-fpm --set PHP_INI_SCAN_DIR $out/lib - fi - ''; - }); - - withExtensions = extensions: buildEnv { inherit extensions; }; - in - php.overrideAttrs (_: { - passthru = { - enabledExtensions = []; - inherit buildEnv withExtensions; - inherit (php-packages) packages extensions; + in + phpWithExtensions); + + withExtensions = extensions: buildEnv { inherit extensions; }; + + pcre' = if (lib.versionAtLeast version "7.3") then pcre2 else pcre; + in + stdenv.mkDerivation { + pname = "php"; + + inherit version; + + enableParallelBuilding = true; + + nativeBuildInputs = [ autoconf automake bison flex libtool pkgconfig re2c ]; + + buildInputs = + # PCRE extension + [ pcre' ] + + # Enable sapis + ++ lib.optional pearSupport [ libxml2.dev ] + + # Misc deps + ++ lib.optional apxs2Support apacheHttpd + ++ lib.optional argon2Support libargon2 + ++ lib.optional systemdSupport systemd + ++ lib.optional valgrindSupport valgrind + ; + + CXXFLAGS = lib.optionalString stdenv.cc.isClang "-std=c++11"; + + configureFlags = + # Disable all extensions + [ "--disable-all" ] + + # PCRE + ++ lib.optionals (lib.versionAtLeast version "7.4") [ "--with-external-pcre=${pcre'.dev}" ] + ++ lib.optionals (lib.versions.majorMinor version == "7.3") [ "--with-pcre-regex=${pcre'.dev}" ] + ++ lib.optionals (lib.versionOlder version "7.3") [ "--with-pcre-regex=${pcre'.dev}" ] + ++ [ "PCRE_LIBDIR=${pcre'}" ] + + + # Enable sapis + ++ lib.optional (!cgiSupport) "--disable-cgi" + ++ lib.optional (!cliSupport) "--disable-cli" + ++ lib.optional fpmSupport "--enable-fpm" + ++ lib.optional pearSupport [ "--with-pear=$(out)/lib/php/pear" "--enable-xml" "--with-libxml" ] + ++ lib.optional (pearSupport && (lib.versionOlder version "7.4")) "--enable-libxml" + ++ lib.optional pharSupport "--enable-phar" + ++ lib.optional phpdbgSupport "--enable-phpdbg" + + + # Misc flags + ++ lib.optional apxs2Support "--with-apxs2=${apacheHttpd.dev}/bin/apxs" + ++ lib.optional argon2Support "--with-password-argon2=${libargon2}" + ++ lib.optional cgotoSupport "--enable-re2c-cgoto" + ++ lib.optional embedSupport "--enable-embed" + ++ lib.optional (!ipv6Support) "--disable-ipv6" + ++ lib.optional systemdSupport "--with-fpm-systemd" + ++ lib.optional valgrindSupport "--with-valgrind=${valgrind.dev}" + ++ lib.optional ztsSupport "--enable-maintainer-zts" + ; + + hardeningDisable = [ "bindnow" ]; + + preConfigure = '' + # Don't record the configure flags since this causes unnecessary + # runtime dependencies + for i in main/build-defs.h.in scripts/php-config.in; do + substituteInPlace $i \ + --replace '@CONFIGURE_COMMAND@' '(omitted)' \ + --replace '@CONFIGURE_OPTIONS@' "" \ + --replace '@PHP_LDFLAGS@' "" + done + + export EXTENSION_DIR=$out/lib/php/extensions + + ./buildconf --copy --force + + if test -f $src/genfiles; then + ./genfiles + fi + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace configure --replace "-lstdc++" "-lc++" + ''; + + postInstall = '' + test -d $out/etc || mkdir $out/etc + cp php.ini-production $out/etc/php.ini + ''; + + postFixup = '' + mkdir -p $dev/bin $dev/share/man/man1 + mv $out/bin/phpize $out/bin/php-config $dev/bin/ + mv $out/share/man/man1/phpize.1.gz \ + $out/share/man/man1/php-config.1.gz \ + $dev/share/man/man1/ + ''; + + src = fetchurl { + url = "https://www.php.net/distributions/php-${version}.tar.bz2"; + inherit sha256; + }; + + patches = [ ./fix-paths-php7.patch ] ++ extraPatches; + + separateDebugInfo = true; + + outputs = [ "out" "dev" ]; + + passthru = { + enabledExtensions = []; + inherit buildEnv withExtensions; + inherit (php-packages) packages extensions; + }; + + meta = with stdenv.lib; { + description = "An HTML-embedded scripting language"; + homepage = "https://www.php.net/"; + license = licenses.php301; + maintainers = with maintainers; [ globin etu ma27 ]; + platforms = platforms.all; + outputsToInstall = [ "out" "dev" ]; + }; }; - }); - php72base = generic' { + php72base = callPackage generic (_args // { version = "7.2.29"; sha256 = "08xry2fgqgg8s0ym1hh11wkbr36av3zq1bn4krbciw1b7x8gb8ga"; - self = php72base; - selfWithExtensions = php72; + defaultPhpExtensions = defaultPhpExtensionsWithHash; # https://bugs.php.net/bug.php?id=76826 extraPatches = lib.optional stdenv.isDarwin ./php72-darwin-isfinite.patch; - }; + }); - php73base = generic' { + php73base = callPackage generic (_args // { version = "7.3.16"; sha256 = "0bh499v9dfgh9k51w4rird1slb9rh9whp5h37fb84c98d992s1xq"; - self = php73base; - selfWithExtensions = php73; + defaultPhpExtensions = defaultPhpExtensionsWithHash; # https://bugs.php.net/bug.php?id=76826 extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch; - }; + }); - php74base = generic' { + php74base = callPackage generic (_args // { version = "7.4.4"; sha256 = "17w2m4phhpj76x5fx67vgjrlkcczqvky3f5in1kjg2pch90qz3ih"; - self = php74base; - selfWithExtensions = php74; - }; + inherit defaultPhpExtensions; + }); defaultPhpExtensions = extensions: with extensions; ([ bcmath calendar curl ctype dom exif fileinfo filter ftp gd -- cgit v1.2.3 From abedfadd7376a2edf59bbfaa7ab101411d042529 Mon Sep 17 00:00:00 2001 From: talyz Date: Sun, 12 Apr 2020 22:52:51 +0200 Subject: php.buildEnv: Respect override Make buildEnv take earlier overridden values into account by forwarding all arguments (a merge of generic's arguments, all previous arguments and the current arguments) to the next invocation of buildEnv. --- pkgs/development/interpreters/php/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 7c6cb87dfb3..c1a7cdd11c4 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -43,12 +43,12 @@ let phpWithExtensions = self.withExtensions defaultPhpExtensions; }); - buildEnv = lib.makeOverridable ( + mkBuildEnv = prevArgs: lib.makeOverridable ( { extensions ? (_: []), extraConfig ? "", ... }@innerArgs: let - filteredInnerArgs = builtins.removeAttrs innerArgs [ "extensions" "extraConfig" ]; - allArgs = args // filteredInnerArgs; - php = generic allArgs; + allArgs = args // prevArgs // innerArgs; + filteredArgs = builtins.removeAttrs allArgs [ "extensions" "extraConfig" ]; + php = generic filteredArgs; php-packages = (callPackage ../../../top-level/php-packages.nix { inherit php phpWithExtensions; @@ -89,7 +89,9 @@ let inherit (php) version; nativeBuildInputs = [ makeWrapper ]; passthru = { - inherit buildEnv withExtensions enabledExtensions; + buildEnv = mkBuildEnv allArgs; + withExtensions = mkWithExtensions allArgs; + inherit enabledExtensions; inherit (php-packages) packages extensions; }; paths = [ php ]; @@ -106,7 +108,8 @@ let in phpWithExtensions); - withExtensions = extensions: buildEnv { inherit extensions; }; + mkWithExtensions = prevArgs: extensions: + mkBuildEnv prevArgs { inherit extensions; }; pcre' = if (lib.versionAtLeast version "7.3") then pcre2 else pcre; in @@ -216,7 +219,8 @@ let passthru = { enabledExtensions = []; - inherit buildEnv withExtensions; + buildEnv = mkBuildEnv {}; + withExtensions = mkWithExtensions {}; inherit (php-packages) packages extensions; }; -- cgit v1.2.3 From 8d1a524c22fe3301d52cc0eb0d592a0bc5a736f9 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Fri, 24 Apr 2020 10:50:56 -0500 Subject: ispc: 1.10.0 -> 1.13.0, cleanup, (co)maintain This includes several enhancements in the underlying compiler, including codegen improvements for AVX-512, Ice Lake CPU definitions, cross-{arch,os} compilation (currently unsupported due to multilib issues), and more. This also bumps the LLVM backend to the 10.0 release. Note that ispc itself requires a few extra stability patches on top of 10.0 for AVX-512 support, but these aren't applied for us. Therefore AVX-512 still has some extra, rough edges. Signed-off-by: Austin Seipp --- pkgs/development/compilers/ispc/default.nix | 69 +++++++++++++++-------------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 38 insertions(+), 35 deletions(-) diff --git a/pkgs/development/compilers/ispc/default.nix b/pkgs/development/compilers/ispc/default.nix index 022651a3c0e..01e1eaca6e1 100644 --- a/pkgs/development/compilers/ispc/default.nix +++ b/pkgs/development/compilers/ispc/default.nix @@ -1,42 +1,44 @@ -{stdenv, fetchFromGitHub, cmake, which, m4, python, bison, flex, llvmPackages, -testedTargets ? ["sse2"] # the default test target is sse4, but that is not supported by all Hydra agents +{ stdenv, fetchFromGitHub +, cmake, which, m4, python3, bison, flex, llvmPackages + + # the default test target is sse4, but that is not supported by all Hydra agents +, testedTargets ? [ "sse2" ] }: stdenv.mkDerivation rec { - version = "1.10.0"; - rev = "v${version}"; - - inherit testedTargets; - - pname = "ispc"; + pname = "ispc"; + version = "1.13.0"; src = fetchFromGitHub { - owner = "ispc"; - repo = "ispc"; - inherit rev; - sha256 = "1x07n2gaff3v32yvddrb659mx5gg12bnbsqbyfimp396wn04w60b"; + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "1l74xkpwwxc38k2ngg7mpvswziiy91yxslgfad6688hh1n5jvayd"; }; - doCheck = stdenv.isLinux; - - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake which m4 bison flex python3 ]; buildInputs = with llvmPackages; [ - which - m4 - python - bison - flex - llvm - llvmPackages.clang-unwrapped # we need to link against libclang, so we need the unwrapped + # we need to link against libclang, so we need the unwrapped + llvm llvmPackages.clang-unwrapped ]; - postPatch = "sed -i -e 's/curses/ncurses/g' CMakeLists.txt"; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace curses ncurses + substituteInPlace cmake/GenerateBuiltins.cmake \ + --replace 'bit 32 64' 'bit 64' + ''; + + inherit testedTargets; - # TODO: this correctly catches errors early, but also some things that are just weird and don't seem to be real - # errors - #configurePhase = '' - # makeFlagsArray=( SHELL="${bash}/bin/bash -o pipefail" ) - #''; + # needs 'transcendentals' executable, which is only on linux + doCheck = stdenv.isLinux; + + # the compiler enforces -Werror, and -fno-strict-overflow makes it mad. + # hilariously this is something of a double negative: 'disable' the + # 'strictoverflow' hardening protection actually means we *allow* the compiler + # to do strict overflow optimization. somewhat misleading... + hardeningDisable = [ "strictoverflow" ]; checkPhase = '' export ISPC_HOME=$PWD/bin @@ -55,13 +57,14 @@ stdenv.mkDerivation rec { "-DCLANG_EXECUTABLE=${llvmPackages.clang}/bin/clang" "-DISPC_INCLUDE_EXAMPLES=OFF" "-DISPC_INCLUDE_UTILS=OFF" - ]; + "-DARM_ENABLED=FALSE" + ]; meta = with stdenv.lib; { - homepage = "https://ispc.github.io/"; + homepage = "https://ispc.github.io/"; description = "Intel 'Single Program, Multiple Data' Compiler, a vectorised language"; - license = licenses.bsd3; - platforms = ["x86_64-linux" "x86_64-darwin"]; # TODO: buildable on more platforms? - maintainers = [ maintainers.aristid ]; + license = licenses.bsd3; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; # TODO: buildable on more platforms? + maintainers = with maintainers; [ aristid thoughtpolice ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aeb16d8da28..e763193c6f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12299,8 +12299,8 @@ in isocodes = callPackage ../development/libraries/iso-codes { }; ispc = callPackage ../development/compilers/ispc { - llvmPackages = llvmPackages_6; - stdenv = llvmPackages_6.stdenv; + stdenv = llvmPackages_10.stdenv; + llvmPackages = llvmPackages_10; }; isso = callPackage ../servers/isso { }; -- cgit v1.2.3 From 2d8ee2676c43dc46656deea84148b17f182b97a0 Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Fri, 24 Apr 2020 11:11:23 -0600 Subject: tut: 0.0.2 -> 0.0.7 --- pkgs/applications/misc/tut/default.nix | 4 +- pkgs/applications/misc/tut/deps.nix | 69 ++++++++++++++++++++++++++++------ 2 files changed, 59 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/applications/misc/tut/default.nix index 586766e5456..e9b09d68da6 100644 --- a/pkgs/applications/misc/tut/default.nix +++ b/pkgs/applications/misc/tut/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "tut"; - version = "0.0.2"; + version = "0.0.7"; goPackagePath = "github.com/RasmusLindroth/tut"; goDeps = ./deps.nix; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "RasmusLindroth"; repo = pname; rev = version; - sha256 = "0c44mgkmjnfpf06cj63i6mscxcsm5cipm0l4n6pjxhc7k3qhgsfw"; + sha256 = "1v1cvdsrxz1yj2vibx3iapw17ngfihjkr62zhxsn1msb77xyd7lb"; }; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/tut/deps.nix b/pkgs/applications/misc/tut/deps.nix index 89453f121a9..9264153e503 100644 --- a/pkgs/applications/misc/tut/deps.nix +++ b/pkgs/applications/misc/tut/deps.nix @@ -72,6 +72,15 @@ sha256 = "1csg9qkmbg4ksj5247kgqcy7bxvqgz6b98r0rv2s4c1mkc99gx2r"; }; } + { + goPackagePath = "github.com/gopherjs/gopherjs"; + fetch = { + type = "git"; + url = "https://github.com/gopherjs/gopherjs"; + rev = "0766667cb4d1"; + sha256 = "13pfc9sxiwjky2lm1xb3i3lcisn8p6mgjk2d927l7r92ysph8dmw"; + }; + } { goPackagePath = "github.com/gorilla/websocket"; fetch = { @@ -81,6 +90,15 @@ sha256 = "03n1n0nwz3k9qshmriycqznnnvd3dkzsfwpnfjzzvafjxk9kyapv"; }; } + { + goPackagePath = "github.com/jtolds/gls"; + fetch = { + type = "git"; + url = "https://github.com/jtolds/gls"; + rev = "v4.20.0"; + sha256 = "1k7xd2q2ysv2xsh373qs801v6f359240kx0vrl0ydh7731lngvk6"; + }; + } { goPackagePath = "github.com/kyoh86/xdg"; fetch = { @@ -158,8 +176,8 @@ fetch = { type = "git"; url = "https://github.com/pelletier/go-toml"; - rev = "v1.6.0"; - sha256 = "0l2830pi64fg0bdsyd5afkbw0p7879pppzdqqk3c7vjrjfmi5xbq"; + rev = "v1.7.0"; + sha256 = "0sqrwldjj2qxrgjz1diw1ffviya4ma7mz7nhdgydbisi2h55lqla"; }; } { @@ -167,8 +185,8 @@ fetch = { type = "git"; url = "https://github.com/rivo/tview"; - rev = "cd38d7432498"; - sha256 = "1rs048gf1jip0p20qir99vy5k0f3m54h7bh56l1sh8lxij5qj406"; + rev = "ca37f83cb2e7"; + sha256 = "05nifgrxv6aib8f20mhs9m0grdfdyyg5vyhk6zgwsxjlwbzaj021"; }; } { @@ -180,6 +198,24 @@ sha256 = "0flpc1px1l6b1lxzhdxi0mvpkkjchppvgxshxxnlmm40s76i9ww5"; }; } + { + goPackagePath = "github.com/smartystreets/assertions"; + fetch = { + type = "git"; + url = "https://github.com/smartystreets/assertions"; + rev = "b2de0cb4f26d"; + sha256 = "1i7ldgavgl35c7gk25p7bvdr282ckng090zr4ch9mk1705akx09y"; + }; + } + { + goPackagePath = "github.com/smartystreets/goconvey"; + fetch = { + type = "git"; + url = "https://github.com/smartystreets/goconvey"; + rev = "v1.6.4"; + sha256 = "07zjxwszayal88z1j2bwnqrsa32vg8l4nivks5yfr9j8xfsw7n6m"; + }; + } { goPackagePath = "github.com/tomnomnom/linkheader"; fetch = { @@ -212,8 +248,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "118fecf932d8"; - sha256 = "1rwrqfwh2yhnnhy7x0mbmlmk0rg1mi2jjad476y45i259a0c2ym6"; + rev = "d3edc9973b7e"; + sha256 = "12zbjwcsh9b0lwycqlkrnbyg5a6a9dzgj8hhgq399bdda5bd97y7"; }; } { @@ -230,8 +266,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "12a6c2dcc1e4"; - sha256 = "0z1g49d36kh459dz0xhnss2f88vw7n5b3l3637v46f7daddvln67"; + rev = "85ca7c5b95cd"; + sha256 = "1504qkgbhhm4f0bhk77v2r1lj6x171ay5m79alkg78wjb5cign5l"; }; } { @@ -248,8 +284,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/tools"; - rev = "90fa682c2a6e"; - sha256 = "03ic2xsy51jw9749wl7gszdbz99iijbd2bckgygl6cm9w5m364ak"; + rev = "ab21143f2384"; + sha256 = "15fk0psk53pplpyghz55bhay0kvsv5rikmn5hwgjnnyxq9vfy178"; }; } { @@ -261,13 +297,22 @@ sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; }; } + { + goPackagePath = "gopkg.in/ini.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/ini.v1"; + rev = "v1.55.0"; + sha256 = "1b7wsfal3b3pl5pv5n2qix09b3imh0zhirrphlsg5p2rb8fk0d0j"; + }; + } { goPackagePath = "gopkg.in/yaml.v2"; fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.4"; - sha256 = "11bwj757wi8kdrcnlgfqb8vv2d2xdhlghmyagd19i62khrkchsg2"; + rev = "v2.2.8"; + sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw"; }; } ] -- cgit v1.2.3 From 07f69d4e379d02c2d814afdbde4b839c7339fe91 Mon Sep 17 00:00:00 2001 From: Benjamin Andresen Date: Fri, 24 Apr 2020 19:44:19 +0200 Subject: babashka: 0.0.78 -> 0.0.89 --- pkgs/development/interpreters/clojure/babashka.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index db849bb542d..6d75ec17a75 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -3,17 +3,17 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "babashka"; - version = "0.0.78"; + version = "0.0.89"; reflectionJson = fetchurl { name = "reflection.json"; url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-reflection.json"; - sha256 = "1m1nwdxjsc6bkdzkbsll316ly0c3qxaimjzyfph1220irjxnm7xf"; + sha256 = "0bc5rbizd2lg7qfh733yiip8m9zqrwgjf5ca09sdibxp7nhhsjby"; }; src = fetchurl { url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "01w990zk5qjrbnc846snh6na002kdyrlrfnqwg03ibx20g3mr7if"; + sha256 = "11jhqbm3svvikr9glz8wwps1267y25g3384ijw6avn267s7d7l8c"; }; dontUnpack = true; @@ -40,6 +40,7 @@ stdenv.mkDerivation rec { --no-fallback \ --no-server \ --report-unsupported-elements-at-runtime \ + "--initialize-at-run-time=org.postgresql.sspi.SSPIClient" \ "-J-Xmx3g" ''; -- cgit v1.2.3 From a7f59a59469ffc4644db48bd12eade410501f9aa Mon Sep 17 00:00:00 2001 From: Benjamin Andresen Date: Wed, 22 Apr 2020 00:07:41 +0200 Subject: babashka: utf8 + nativeBuildinputs fix utf8: see borkdude/babashka/issues/359 nativeBuildinputs: this PR's review --- pkgs/development/interpreters/clojure/babashka.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index 6d75ec17a75..7f94a0695d4 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, graalvm8 }: +{ stdenv, fetchurl, graalvm8, glibcLocales }: with stdenv.lib; stdenv.mkDerivation rec { @@ -18,7 +18,8 @@ stdenv.mkDerivation rec { dontUnpack = true; - buildInputs = [ graalvm8 ]; + LC_ALL = "en_US.UTF-8"; + nativeBuildInputs = [ graalvm8 glibcLocales ]; buildPhase = '' native-image \ -- cgit v1.2.3 From 929ba8d4e1dfcb661d80c1b088a61fcba99891dc Mon Sep 17 00:00:00 2001 From: Matthew Ess Date: Mon, 13 Apr 2020 23:28:44 -0400 Subject: dotty: 0.20.0-RC1 -> 0.23.0-RC1 --- pkgs/development/compilers/scala/dotty-bare.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/scala/dotty-bare.nix b/pkgs/development/compilers/scala/dotty-bare.nix index 4bfc966bb45..d3f126052f5 100644 --- a/pkgs/development/compilers/scala/dotty-bare.nix +++ b/pkgs/development/compilers/scala/dotty-bare.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, ncurses }: stdenv.mkDerivation rec { - version = "0.20.0-RC1"; + version = "0.23.0-RC1"; pname = "dotty-bare"; src = fetchurl { url = "https://github.com/lampepfl/dotty/releases/download/${version}/dotty-${version}.tar.gz"; - sha256 = "08qs3m32cbh6516gcwraa1b5k935awmjxls6kg6xll722hkdd9l6"; + sha256 = "0c64dw2qp8mhgsll8viqaiy34wq1ablkbc4bi813a1r4nqg57sv0"; }; propagatedBuildInputs = [ jre ncurses.dev ] ; -- cgit v1.2.3 From 5ae928e18fe5b4093d96c6c4bf006ff2eb05109e Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Fri, 24 Apr 2020 19:57:31 +0200 Subject: lapack: fix darwin library identifiers The build system already sets these properly to the absolute path so no need to patch the libraries on darwin. $ otool -D result/lib/liblapacke.dylib result/lib/liblapacke.dylib: /nix/store/k88gy5s765yn3dc5ws3jbykyvklm7z96-openblas-0.3.8/lib/libopenblasp-r0.3.8.dylib Fixes #85713 --- pkgs/build-support/alternatives/lapack/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/build-support/alternatives/lapack/default.nix b/pkgs/build-support/alternatives/lapack/default.nix index 5a19916f83e..98b458b778a 100644 --- a/pkgs/build-support/alternatives/lapack/default.nix +++ b/pkgs/build-support/alternatives/lapack/default.nix @@ -54,10 +54,6 @@ stdenv.mkDerivation { '' + (if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then '' patchelf --set-soname liblapack${canonicalExtension} $out/lib/liblapack${canonicalExtension} patchelf --set-rpath "$(patchelf --print-rpath $out/lib/liblapack${canonicalExtension}):${lapackProvider}/lib" $out/lib/liblapack${canonicalExtension} -'' else if stdenv.hostPlatform.isDarwin then '' - install_name_tool -id liblapack${canonicalExtension} \ - -add_rpath ${lib.getLib lapackProvider}/lib \ - $out/lib/liblapack${canonicalExtension} '' else "") + '' if [ "$out/lib/liblapack${canonicalExtension}" != "$out/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}" ]; then @@ -87,10 +83,6 @@ EOF '' + (if stdenv.hostPlatform.parsed.kernel.execFormat.name == "elf" then '' patchelf --set-soname liblapacke${canonicalExtension} $out/lib/liblapacke${canonicalExtension} patchelf --set-rpath "$(patchelf --print-rpath $out/lib/liblapacke${canonicalExtension}):${lib.getLib lapackProvider}/lib" $out/lib/liblapacke${canonicalExtension} -'' else if stdenv.hostPlatform.isDarwin then '' - install_name_tool -id liblapacke${canonicalExtension} \ - -add_rpath ${lib.getLib lapackProvider}/lib \ - $out/lib/liblapacke${canonicalExtension} '' else "") + '' if [ -f "$out/lib/liblapacke.so.3" ]; then -- cgit v1.2.3 From 30328c3c3327d41b813cc4fd4f7e4eaaded8bc6e Mon Sep 17 00:00:00 2001 From: ryneeverett Date: Fri, 24 Apr 2020 19:02:31 +0000 Subject: ycmd: typescript completion support Link the already-packaged typescript package so that ycmd will support completions for javascript and typescript filetypes. The structure of these installation directories is "documented" here: . I don't completely understand why the language support is passed as optional attrs Is it because folks want to build leaner packages and pass null or because they want to target particular dependencies? At any rate I followed the pattern. --- pkgs/development/tools/misc/ycmd/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix index aee7af17730..02298d93b8a 100644 --- a/pkgs/development/tools/misc/ycmd/default.nix +++ b/pkgs/development/tools/misc/ycmd/default.nix @@ -2,6 +2,7 @@ , gocode ? null , godef ? null , gotools ? null +, nodePackages ? null , rustracerd ? null , fixDarwinDylibNames, Cocoa ? null }: @@ -69,6 +70,9 @@ stdenv.mkDerivation { TARGET=$out/lib/ycmd/third_party/go/src/golang.org/x/tools/cmd/gopls mkdir -p $TARGET ln -sf ${gotools}/bin/gopls $TARGET + '' + lib.optionalString (nodePackages != null) '' + TARGET=$out/lib/ycmd/third_party/tsserver + ln -sf ${nodePackages.typescript} $TARGET '' + lib.optionalString (rustracerd != null) '' TARGET=$out/lib/ycmd/third_party/racerd/target/release mkdir -p $TARGET -- cgit v1.2.3 From a3467dfa824de34d56c6305c7b15911fb9fd4f32 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 24 Apr 2020 21:39:08 +0200 Subject: gitAndTools.diff-so-fancy: 1.2.7 -> 1.3.0 https://github.com/so-fancy/diff-so-fancy/releases/tag/v1.3.0 --- .../version-management/git-and-tools/diff-so-fancy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix index ae064cb7b5e..c073edaee7d 100644 --- a/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix +++ b/pkgs/applications/version-management/git-and-tools/diff-so-fancy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "diff-so-fancy"; - version = "1.2.7"; + version = "1.3.0"; src = fetchFromGitHub { owner = "so-fancy"; repo = "diff-so-fancy"; rev = "v${version}"; - sha256 = "0y5cp236gi6h7llzai5d27086l4zz58mz1zs01r97xnnmjs9vw21"; + sha256 = "0aavxahzha2mms4vdwysk79pa6wzswpfwgsq2hwaxnaf66maahfl"; }; # Perl is needed here for patchShebangs -- cgit v1.2.3 From 0e82313c07d2894e67b6729d7158a761c80fe648 Mon Sep 17 00:00:00 2001 From: Gabor Greif Date: Sat, 11 Apr 2020 10:20:33 +0200 Subject: compilers/ghc: fix a few typos --- pkgs/development/compilers/ghc/8.10.1.nix | 2 +- pkgs/development/compilers/ghc/8.4.4.nix | 2 +- pkgs/development/compilers/ghc/8.6.5.nix | 2 +- pkgs/development/compilers/ghc/8.8.1.nix | 2 +- pkgs/development/compilers/ghc/8.8.2.nix | 2 +- pkgs/development/compilers/ghc/8.8.3.nix | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.10.1.nix b/pkgs/development/compilers/ghc/8.10.1.nix index 01e10b04d27..2421e80bfbd 100644 --- a/pkgs/development/compilers/ghc/8.10.1.nix +++ b/pkgs/development/compilers/ghc/8.10.1.nix @@ -176,7 +176,7 @@ stdenv.mkDerivation (rec { "--disable-large-address-space" ]; - # Make sure we never relax`$PATH` and hooks support for compatability. + # Make sure we never relax`$PATH` and hooks support for compatibility. strictDeps = true; # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix index e63f8207830..adfd20531ab 100644 --- a/pkgs/development/compilers/ghc/8.4.4.nix +++ b/pkgs/development/compilers/ghc/8.4.4.nix @@ -186,7 +186,7 @@ stdenv.mkDerivation (rec { "--disable-large-address-space" ]; - # Make sure we never relax`$PATH` and hooks support for compatability. + # Make sure we never relax`$PATH` and hooks support for compatibility. strictDeps = true; # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix index e746c6bfcba..c01f53aff9e 100644 --- a/pkgs/development/compilers/ghc/8.6.5.nix +++ b/pkgs/development/compilers/ghc/8.6.5.nix @@ -185,7 +185,7 @@ stdenv.mkDerivation (rec { "--disable-large-address-space" ]; - # Make sure we never relax`$PATH` and hooks support for compatability. + # Make sure we never relax`$PATH` and hooks support for compatibility. strictDeps = true; # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. diff --git a/pkgs/development/compilers/ghc/8.8.1.nix b/pkgs/development/compilers/ghc/8.8.1.nix index 9ebce6bdd48..ce0a7eb332b 100644 --- a/pkgs/development/compilers/ghc/8.8.1.nix +++ b/pkgs/development/compilers/ghc/8.8.1.nix @@ -170,7 +170,7 @@ stdenv.mkDerivation (rec { "--disable-large-address-space" ]; - # Make sure we never relax`$PATH` and hooks support for compatability. + # Make sure we never relax`$PATH` and hooks support for compatibility. strictDeps = true; # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. diff --git a/pkgs/development/compilers/ghc/8.8.2.nix b/pkgs/development/compilers/ghc/8.8.2.nix index 9039b1fa746..bf169a24c6a 100644 --- a/pkgs/development/compilers/ghc/8.8.2.nix +++ b/pkgs/development/compilers/ghc/8.8.2.nix @@ -176,7 +176,7 @@ stdenv.mkDerivation (rec { "--disable-large-address-space" ]; - # Make sure we never relax`$PATH` and hooks support for compatability. + # Make sure we never relax`$PATH` and hooks support for compatibility. strictDeps = true; # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. diff --git a/pkgs/development/compilers/ghc/8.8.3.nix b/pkgs/development/compilers/ghc/8.8.3.nix index 692ac9f0a12..30cbb87cce2 100644 --- a/pkgs/development/compilers/ghc/8.8.3.nix +++ b/pkgs/development/compilers/ghc/8.8.3.nix @@ -176,7 +176,7 @@ stdenv.mkDerivation (rec { "--disable-large-address-space" ]; - # Make sure we never relax`$PATH` and hooks support for compatability. + # Make sure we never relax`$PATH` and hooks support for compatibility. strictDeps = true; # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. -- cgit v1.2.3 From daf79ea7c7f874623e7e5ef953e7c342e6923ee3 Mon Sep 17 00:00:00 2001 From: Gabor Greif Date: Sat, 11 Apr 2020 11:53:01 +0200 Subject: compilers/ghc: apply structuredAttrs patch to other ghcs Ported from: > [haskell-updates c8aa9864405] ghc883: fix structuredAttrs build > Author: Robin Gloster > Date: Sat Apr 4 19:21:31 2020 +0200 > 1 file changed, 3 insertions(+), 3 deletions(-) --- pkgs/development/compilers/ghc/8.10.1.nix | 6 +++--- pkgs/development/compilers/ghc/8.8.2.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.10.1.nix b/pkgs/development/compilers/ghc/8.10.1.nix index 2421e80bfbd..cacff5bfcfd 100644 --- a/pkgs/development/compilers/ghc/8.10.1.nix +++ b/pkgs/development/compilers/ghc/8.10.1.nix @@ -73,7 +73,7 @@ let ''; # Splicer will pull out correct variations - libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] + libDeps = platform: stdenv.lib.optional enableTerminfo ncurses ++ [libffi] ++ stdenv.lib.optional (!enableIntegerSimple) gmp ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; @@ -160,10 +160,10 @@ stdenv.mkDerivation (rec { "--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [ + ] ++ stdenv.lib.optionals (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) [ + ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ diff --git a/pkgs/development/compilers/ghc/8.8.2.nix b/pkgs/development/compilers/ghc/8.8.2.nix index bf169a24c6a..4cc41620c2d 100644 --- a/pkgs/development/compilers/ghc/8.8.2.nix +++ b/pkgs/development/compilers/ghc/8.8.2.nix @@ -73,7 +73,7 @@ let ''; # Splicer will pull out correct variations - libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ] + libDeps = platform: stdenv.lib.optional enableTerminfo ncurses ++ [libffi] ++ stdenv.lib.optional (!enableIntegerSimple) gmp ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; @@ -160,10 +160,10 @@ stdenv.mkDerivation (rec { "--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ stdenv.lib.optional (targetPlatform == hostPlatform && !enableIntegerSimple) [ + ] ++ stdenv.lib.optionals (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) [ + ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib" ] ++ stdenv.lib.optionals (targetPlatform != hostPlatform) [ -- cgit v1.2.3 From a634bd0fd72ac4d3e41c278a6c76b0f83a0a924c Mon Sep 17 00:00:00 2001 From: Gabor Greif Date: Sat, 11 Apr 2020 12:05:08 +0200 Subject: ghc: drop 8.8.1 --- doc/languages-frameworks/haskell.section.md | 2 - pkgs/development/compilers/elm/default.nix | 6 +- pkgs/development/compilers/ghc/8.8.1.nix | 236 ---------------------------- pkgs/top-level/haskell-packages.nix | 11 -- 4 files changed, 3 insertions(+), 252 deletions(-) delete mode 100644 pkgs/development/compilers/ghc/8.8.1.nix diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md index 733e75c16a7..b727f2fb634 100644 --- a/doc/languages-frameworks/haskell.section.md +++ b/doc/languages-frameworks/haskell.section.md @@ -110,8 +110,6 @@ haskell.compiler.ghc844 ghc-8.4.4 haskell.compiler.ghc863Binary ghc-8.6.3-binary haskell.compiler.ghc865 ghc-8.6.5 haskell.compiler.integer-simple.ghc865 ghc-8.6.5 -haskell.compiler.ghc881 ghc-8.8.1 -haskell.compiler.integer-simple.ghc881 ghc-8.8.1 haskell.compiler.ghc882 ghc-8.8.2 haskell.compiler.integer-simple.ghc882 ghc-8.8.2 haskell.compiler.ghc883 ghc-8.8.3 diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index a1b3d736b99..069769dbd5e 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -4,7 +4,7 @@ let fetchElmDeps = import ./fetchElmDeps.nix { inherit stdenv lib fetchurl; }; - hsPkgs = haskell.packages.ghc881.override { + hsPkgs = haskell.packages.ghc883.override { overrides = self: super: with haskell.lib; let elmPkgs = rec { elm = overrideCabal (self.callPackage ./packages/elm.nix { }) (drv: { @@ -28,7 +28,7 @@ let `package/nix/build.sh` */ elm-format = justStaticExecutables (overrideCabal (self.callPackage ./packages/elm-format.nix {}) (drv: { - # GHC 8.8.1 support + # GHC 8.8.3 support # https://github.com/avh4/elm-format/pull/640 patches = [( fetchpatch { @@ -39,7 +39,7 @@ let # Tests are failing after upgrade to ghc881. # Cause is probably just a minor change in stdout output # see https://github.com/avh4/elm-format/pull/640 - doCheck = false; + # doCheck = false; jailbreak = true; })); diff --git a/pkgs/development/compilers/ghc/8.8.1.nix b/pkgs/development/compilers/ghc/8.8.1.nix deleted file mode 100644 index ce0a7eb332b..00000000000 --- a/pkgs/development/compilers/ghc/8.8.1.nix +++ /dev/null @@ -1,236 +0,0 @@ -{ stdenv, pkgsBuildTarget, targetPackages - -# build-tools -, bootPkgs -, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx -, bash - -, libiconv ? null, ncurses - -, # GHC can be built with system libffi or a bundled one. - libffi ? null - -, useLLVM ? !stdenv.targetPlatform.isx86 || stdenv.targetPlatform.isiOS -, # 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) - (if useLLVM then "perf-cross" else "perf-cross-ncg") - -, # 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; - - # ld.gold is disabled for musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 - # see #84670 and #49071 for more background. - useLdGold = targetPlatform.isLinux && !(targetPlatform.useLLVM or false) && !targetPlatform.isMusl; - -in -stdenv.mkDerivation (rec { - version = "8.8.1"; - name = "${targetPrefix}ghc-${version}"; - - src = fetchurl { - url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; - sha256 = "06kj4fhvijinjafiy4s873n60qly323rdlz9bmc79nhlp3cq72lh"; - }; - - enableParallelBuilding = true; - - outputs = [ "out" "doc" ]; - - 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 useLdGold ".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.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ - "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" - ] ++ stdenv.lib.optionals (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 useLdGold [ - "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 compatibility. - 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 bash ] ++ (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-${version}"; - }; - - 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/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index aa7ef02a388..ae985f8b75d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -56,12 +56,6 @@ in { buildLlvmPackages = buildPackages.llvmPackages_6; llvmPackages = pkgs.llvmPackages_6; }; - ghc881 = callPackage ../development/compilers/ghc/8.8.1.nix { - bootPkgs = packages.ghc865Binary; - inherit (buildPackages.python3Packages) sphinx; - buildLlvmPackages = buildPackages.llvmPackages_7; - llvmPackages = pkgs.llvmPackages_7; - }; ghc882 = callPackage ../development/compilers/ghc/8.8.2.nix { bootPkgs = packages.ghc865Binary; inherit (buildPackages.python3Packages) sphinx; @@ -134,11 +128,6 @@ in { ghc = bh.compiler.ghc865; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.6.x.nix { }; }; - ghc881 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc881; - ghc = bh.compiler.ghc881; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.8.x.nix { }; - }; ghc882 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc882; ghc = bh.compiler.ghc882; -- cgit v1.2.3 From 3186054a269e2608e09991e691be73b5d3cdd67f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 24 Apr 2020 11:58:00 +0200 Subject: LTS Haskell 15.9 --- .../haskell-modules/configuration-hackage2nix.yaml | 96 +++++++++++----------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ad59a764ebd..9409e00af2a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -72,7 +72,7 @@ default-package-overrides: # gi-gdkx11-4.x requires gtk-4.x, which is still under development and # not yet available in Nixpkgs - gi-gdkx11 < 4 - # LTS Haskell 15.8 + # LTS Haskell 15.9 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -309,7 +309,7 @@ default-package-overrides: - bitarray ==0.0.1.1 - bits ==0.5.2 - bitset-word8 ==0.1.1.1 - - bits-extra ==0.0.1.5 + - bits-extra ==0.0.2.0 - bitvec ==1.0.3.0 - blake2 ==0.3.0 - blanks ==0.3.0 @@ -346,7 +346,7 @@ default-package-overrides: - buffer-builder ==0.2.4.7 - buffer-pipe ==0.0 - bugsnag-hs ==0.1.0.0 - - butcher ==1.3.3.0 + - butcher ==1.3.3.1 - bv ==0.5 - bv-little ==1.1.1 - byteable ==0.1.1 @@ -408,7 +408,7 @@ default-package-overrides: - chimera ==0.3.1.0 - choice ==0.2.2 - chronologique ==0.3.1.1 - - chronos ==1.1 + - chronos ==1.1.1 - chronos-bench ==0.2.0.2 - chunked-data ==0.3.1 - cipher-aes ==0.2.11 @@ -823,20 +823,20 @@ default-package-overrides: - genvalidity-scientific ==0.2.1.1 - genvalidity-text ==0.7.0.2 - genvalidity-time ==0.3.0.0 - - genvalidity-typed-uuid ==0.0.0.1 + - genvalidity-typed-uuid ==0.0.0.2 - genvalidity-unordered-containers ==0.3.0.1 - - genvalidity-uuid ==0.1.0.3 + - genvalidity-uuid ==0.1.0.4 - genvalidity-vector ==0.3.0.1 - geojson ==4.0.2 - getopt-generics ==0.13.0.4 - ghc-compact ==0.1.0.0 - ghc-core ==0.5.6 - ghc-exactprint ==0.6.2 - - ghcid ==0.8.5 + - ghcid ==0.8.6 - ghci-hexcalc ==0.1.1.0 - ghcjs-codemirror ==0.0.0.2 - - ghc-lib ==8.8.3.20200224 - - ghc-lib-parser ==8.8.3.20200224 + - ghc-lib ==8.8.3.20200412.1 + - ghc-lib-parser ==8.8.3.20200412.1 - ghc-lib-parser-ex ==8.8.5.8 - ghc-paths ==0.1.0.12 - ghc-prof ==1.4.1.7 @@ -987,7 +987,7 @@ default-package-overrides: - hsc2hs ==0.68.7 - hscolour ==1.24.4 - hsdns ==1.8 - - hsebaysdk ==0.4.0.0 + - hsebaysdk ==0.4.1.0 - hsemail ==2.2.0 - hset ==2.2.0 - hs-functors ==0.1.6.0 @@ -1058,36 +1058,36 @@ default-package-overrides: - hunit-dejafu ==2.0.0.1 - hvect ==0.4.0.0 - hvega ==0.5.0.0 - - hw-balancedparens ==0.3.0.5 - - hw-bits ==0.7.1.5 - - hw-conduit ==0.2.0.6 - - hw-conduit-merges ==0.2.0.0 - - hw-diagnostics ==0.0.0.7 - - hw-dsv ==0.4.0 + - hw-balancedparens ==0.3.1.0 + - hw-bits ==0.7.2.0 + - hw-conduit ==0.2.1.0 + - hw-conduit-merges ==0.2.1.0 + - hw-diagnostics ==0.0.1.0 + - hw-dsv ==0.4.1.0 - hweblib ==0.6.3 - - hw-eliasfano ==0.1.1.1 - - hw-excess ==0.2.2.3 - - hw-fingertree ==0.1.1.1 - - hw-fingertree-strict ==0.1.1.3 - - hw-hedgehog ==0.1.0.5 - - hw-hspec-hedgehog ==0.1.0.9 - - hw-int ==0.0.0.4 - - hw-ip ==2.4.1.0 - - hw-json ==1.3.1.1 - - hw-json-simd ==0.1.0.4 - - hw-json-simple-cursor ==0.1.0.2 - - hw-json-standard-cursor ==0.2.1.3 - - hw-mquery ==0.2.0.2 - - hw-packed-vector ==0.2.0.1 - - hw-parser ==0.1.0.2 - - hw-prim ==0.6.2.40 - - hw-rankselect ==0.13.3.2 - - hw-rankselect-base ==0.3.3.0 - - hw-simd ==0.1.1.5 - - hw-streams ==0.0.0.12 + - hw-eliasfano ==0.1.2.0 + - hw-excess ==0.2.3.0 + - hw-fingertree ==0.1.2.0 + - hw-fingertree-strict ==0.1.2.0 + - hw-hedgehog ==0.1.1.0 + - hw-hspec-hedgehog ==0.1.1.0 + - hw-int ==0.0.1.0 + - hw-ip ==2.4.2.0 + - hw-json ==1.3.2.0 + - hw-json-simd ==0.1.1.0 + - hw-json-simple-cursor ==0.1.1.0 + - hw-json-standard-cursor ==0.2.2.0 + - hw-mquery ==0.2.1.0 + - hw-packed-vector ==0.2.1.0 + - hw-parser ==0.1.1.0 + - hw-prim ==0.6.3.0 + - hw-rankselect ==0.13.4.0 + - hw-rankselect-base ==0.3.4.0 + - hw-simd ==0.1.2.0 + - hw-streams ==0.0.1.0 - hw-string-parse ==0.0.0.4 - hw-succinct ==0.1.0.1 - - hw-xml ==0.5.0.0 + - hw-xml ==0.5.1.0 - hxt ==9.3.1.18 - hxt-charproperties ==9.4.0.0 - hxt-css ==0.1.0.3 @@ -1123,7 +1123,7 @@ default-package-overrides: - inj ==1.0 - inline-c ==0.9.1.0 - inline-c-cpp ==0.4.0.2 - - insert-ordered-containers ==0.2.3 + - insert-ordered-containers ==0.2.3.1 - inspection-testing ==0.4.2.4 - instance-control ==0.1.2.0 - int-cast ==0.2.0.0 @@ -1318,7 +1318,7 @@ default-package-overrides: - microlens-mtl ==0.2.0.1 - microlens-platform ==0.4.1 - microlens-process ==0.2.0.1 - - microlens-th ==0.4.3.4 + - microlens-th ==0.4.3.5 - microspec ==0.2.1.3 - microstache ==1.0.1.1 - midair ==0.2.0.1 @@ -1658,7 +1658,7 @@ default-package-overrides: - qm-interpolated-string ==0.3.0.0 - qrcode-core ==0.9.2 - qrcode-juicypixels ==0.8.0 - - quadratic-irrational ==0.1.0 + - quadratic-irrational ==0.1.1 - QuasiText ==0.1.2.6 - QuickCheck ==2.13.2 - quickcheck-arbitrary-adt ==0.3.1.0 @@ -1719,7 +1719,7 @@ default-package-overrides: - regex-compat ==0.95.2.0 - regex-compat-tdfa ==0.95.1.4 - regex-pcre ==0.95.0.0 - - regex-pcre-builtin ==0.95.1.1.8.43 + - regex-pcre-builtin ==0.95.1.2.8.43 - regex-posix ==0.96.0.0 - regex-tdfa ==1.3.1.0 - regex-with-pcre ==1.1.0.0 @@ -1761,7 +1761,7 @@ default-package-overrides: - runmemo ==1.0.0.1 - run-st ==0.1.1.0 - safe ==0.3.18 - - safecopy ==0.10.2 + - safecopy ==0.10.3 - safe-decimal ==0.2.0.0 - safe-exceptions ==0.1.7.0 - safe-exceptions-checked ==0.1.0 @@ -1787,7 +1787,7 @@ default-package-overrides: - scientific ==0.3.6.2 - scotty ==0.11.5 - scrypt ==0.5.0 - - sdl2 ==2.5.1.0 + - sdl2 ==2.5.2.0 - sdl2-gfx ==0.2 - sdl2-image ==2.0.0 - sdl2-mixer ==1.1.0 @@ -1825,7 +1825,7 @@ default-package-overrides: - servant-client-core ==0.16 - servant-conduit ==0.15 - servant-docs ==0.11.4 - - servant-elm ==0.7.1 + - servant-elm ==0.7.2 - servant-foreign ==0.15 - servant-js ==0.9.4.1 - servant-JuicyPixels ==0.3.0.5 @@ -2001,7 +2001,7 @@ default-package-overrides: - tasty-dejafu ==2.0.0.1 - tasty-discover ==4.2.1 - tasty-expected-failure ==0.11.1.2 - - tasty-golden ==2.3.3 + - tasty-golden ==2.3.3.1 - tasty-hedgehog ==1.0.0.2 - tasty-hspec ==1.1.5.1 - tasty-hunit ==0.10.0.2 @@ -2063,8 +2063,8 @@ default-package-overrides: - th-expand-syns ==0.4.6.0 - th-extras ==0.0.0.4 - th-lift ==0.8.1 - - th-lift-instances ==0.1.15 - - th-orphans ==0.13.9 + - th-lift-instances ==0.1.16 + - th-orphans ==0.13.10 - th-printf ==0.7 - thread-hierarchy ==0.3.0.1 - thread-local-storage ==0.2 @@ -2078,7 +2078,7 @@ default-package-overrides: - th-strict-compat ==0.1.0.1 - th-test-utils ==1.0.1 - thyme ==0.3.5.5 - - tidal ==1.4.8 + - tidal ==1.4.9 - tile ==0.3.0.0 - time-compat ==1.9.3 - timeit ==2.0 -- cgit v1.2.3 From ea1aa6590fd96478c8172b2621907f0c1086b282 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 24 Apr 2020 20:25:18 +0200 Subject: hackage2nix: update list of broken builds to fix evaluation --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 9409e00af2a..ec8ca9c3015 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3405,6 +3405,7 @@ broken-packages: - cal3d - cal3d-examples - cal3d-opengl + - calamity - calc - calculator - caldims @@ -7492,6 +7493,9 @@ broken-packages: - mp - mpdmate - mpi-hs + - mpi-hs-binary + - mpi-hs-cereal + - mpi-hs-store - mpppc - mpretty - mpris -- cgit v1.2.3 From b7f35fd6634524bd551d28cae34e9f7e86d04bef Mon Sep 17 00:00:00 2001 From: Mike Sperber Date: Mon, 20 Apr 2020 13:29:09 +0200 Subject: haskellPackages.tensorflow*: unmark newly unbroken packages --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ec8ca9c3015..069971c4e9e 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -9790,12 +9790,6 @@ broken-packages: - tempus - tensor - tensor-safe - - tensorflow - - tensorflow-core-ops - - tensorflow-logging - - tensorflow-opgen - - tensorflow-ops - - tensorflow-proto - termbox - termbox-banana - termbox-bindings -- cgit v1.2.3 From f3ec558ac6ac681bdbd05ea19e6adfd755e7e569 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Mon, 20 Apr 2020 15:25:03 +0100 Subject: haskellPackages.text-format: don't mark as broken --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 069971c4e9e..5ec8896c383 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -9826,7 +9826,6 @@ broken-packages: - text-and-plots - text-ansi - text-containers - - text-format - text-format-heavy - text-generic-pretty - text-icu-normalized -- cgit v1.2.3 From 86e2dd2c24f4ee75f6c3cf439c066b5c7f787184 Mon Sep 17 00:00:00 2001 From: Justin Humm Date: Fri, 10 Apr 2020 18:10:55 +0200 Subject: haskellPackages.{binary-strict,webify}: fix build webify needs a bump in the cabal file. As the last upstream commit is two years ago, I think it makes sense to not wait for upstream to merge the PR [0] and release a new version. [0] https://github.com/ananthakumaran/webify/pull/27 --- pkgs/development/haskell-modules/configuration-common.nix | 9 +++++++++ pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 -- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4cf9770c7a2..e080118d23a 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1505,4 +1505,13 @@ self: super: { # Test suite requires running a database server. Testing is done upstream. hasql-pool = dontCheck super.hasql-pool; + # This bumps optparse-applicative to <0.16 in the cabal file, as otherwise + # the version bounds are not satisfied. This can be removed if the PR at + # https://github.com/ananthakumaran/webify/pull/27 is merged and a new + # release of webify is published. + webify = appendPatch super.webify (pkgs.fetchpatch { + url = "https://github.com/ananthakumaran/webify/pull/27/commits/6d653e7bdc1ffda75ead46851b5db45e87cb2aa0.patch"; + sha256 = "sha256:0xbfhzhzg94b4r5qy5dg1c40liswwpqarrc2chcwgfbfnrmwkfc2"; + }); + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 5ec8896c383..474ae3b8893 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3110,7 +3110,6 @@ broken-packages: - binary-protocol-zmq - binary-search - binary-streams - - binary-strict - binary-typed - bind-marshal - BinderAnn @@ -10466,7 +10465,6 @@ broken-packages: - webdriver-w3c - WeberLogic - webfinger-client - - webify - webkit-javascriptcore - Webrexp - webserver -- cgit v1.2.3 From 3359dca08f11f5e92ef91d56ea32915e5c0c72f9 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 20 Apr 2020 15:17:49 +0200 Subject: haskellPackages.Euterpea: fix build, unbreak Build is failing due to too restrictive version constraints which were the only thing needing fixing. --- pkgs/development/haskell-modules/configuration-common.nix | 6 ++++++ pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e080118d23a..d08adf87996 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -592,6 +592,12 @@ self: super: { elm-server = markBroken super.elm-server; elm-yesod = markBroken super.elm-yesod; + # https://github.com/Euterpea/Euterpea2/issues/40 + Euterpea = appendPatch super.Euterpea (pkgs.fetchpatch { + url = "https://github.com/Euterpea/Euterpea2/pull/38.patch"; + sha256 = "13g462qmj8c7if797gnyvf8h0cddmm3xy0pjldw48w8f8sr4qsj0"; + }); + # https://github.com/athanclark/sets/issues/2 sets = dontCheck super.sets; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 474ae3b8893..7b43b826937 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -4510,7 +4510,6 @@ broken-packages: - eths-rlp - euphoria - eurofxref - - Euterpea - eve - eve-cli - event -- cgit v1.2.3 From 7c1c9dcc722c404719e247416319bc5e4bb91832 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 18 Apr 2020 02:30:33 +0200 Subject: hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.1 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/69af61c5a25138519c1a8007ca544820648bf2c0. --- .../haskell-modules/hackage-packages.nix | 2878 ++++++++++---------- 1 file changed, 1379 insertions(+), 1499 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index a33839a6227..2eca7e4ec58 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -5533,8 +5533,6 @@ self: { ]; description = "Library for computer music research and education"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "EventSocket" = callPackage @@ -20336,8 +20334,8 @@ self: { ({ mkDerivation, base, directory, filepath }: mkDerivation { pname = "WEditor"; - version = "0.1.0.0"; - sha256 = "06kg6sfs7l2zbclw7vh3d82r6x8wdxvp58k24sjmfzm41nq3j739"; + version = "0.2.1.1"; + sha256 = "0p0vrvg96va4jppcxr3r5m14ykb5jybn8iyj677dxpziwh5brhmq"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base directory filepath ]; doHaddock = false; @@ -20349,13 +20347,28 @@ self: { ({ mkDerivation, base, brick, microlens, vty, WEditor }: mkDerivation { pname = "WEditorBrick"; - version = "0.1.0.0"; - sha256 = "1im6wmpx3y6wbzg7fdyjw3zjg6c8nd1vkr49pp6m9jqr9wv8jmsg"; + version = "0.2.0.1"; + sha256 = "1bzrfbw14c0ad477z5s51n8181cgcxw6q93bdj1d1nrfgawq7znb"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base brick microlens vty WEditor ]; + executableHaskellDepends = [ base brick vty WEditor ]; description = "Text-editor widget with dynamic line-wrapping for use with Brick"; license = stdenv.lib.licenses.asl20; }) {}; + "WEditorHyphen" = callPackage + ({ mkDerivation, base, directory, hyphenation, WEditor }: + mkDerivation { + pname = "WEditorHyphen"; + version = "0.1.0.5"; + sha256 = "05f7dh75dx27q35bcj84mn3q6w0sd6jkcilykrlad9gm5ihbbcbk"; + libraryHaskellDepends = [ base hyphenation WEditor ]; + testHaskellDepends = [ base directory hyphenation WEditor ]; + description = "Language-specific hyphenation policies for WEditor"; + license = stdenv.lib.licenses.asl20; + }) {}; + "WL500gPControl" = callPackage ({ mkDerivation, base, directory, filepath, mtl, unix, WL500gPLib }: @@ -30822,6 +30835,70 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "apply-refact_0_6_0_0" = callPackage + ({ mkDerivation, base, containers, directory, filemanip, filepath + , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact + , silently, syb, tasty, tasty-expected-failure, tasty-golden + , temporary, transformers, unix-compat + }: + mkDerivation { + pname = "apply-refact"; + version = "0.6.0.0"; + sha256 = "0p2mqgjcqr1zcmk8zgr0yq7g8z1agsa6l493lkj6g3ya9lyhxgig"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory filemanip ghc ghc-exactprint mtl process + refact syb temporary transformers unix-compat + ]; + executableHaskellDepends = [ + base containers directory filemanip filepath ghc ghc-exactprint mtl + optparse-applicative process refact syb temporary transformers + unix-compat + ]; + testHaskellDepends = [ + base containers directory filemanip filepath ghc ghc-exactprint mtl + optparse-applicative process refact silently syb tasty + tasty-expected-failure tasty-golden temporary transformers + unix-compat + ]; + description = "Perform refactorings specified by the refact library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "apply-refact_0_7_0_0" = callPackage + ({ mkDerivation, base, containers, directory, filemanip, filepath + , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact + , silently, syb, tasty, tasty-expected-failure, tasty-golden + , temporary, transformers, unix-compat + }: + mkDerivation { + pname = "apply-refact"; + version = "0.7.0.0"; + sha256 = "1facic5lbc9xih6w1kfr3inwvada6y98n9xgc6iv6r057zr8jfp0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers directory filemanip ghc ghc-exactprint mtl process + refact syb temporary transformers unix-compat + ]; + executableHaskellDepends = [ + base containers directory filemanip filepath ghc ghc-exactprint mtl + optparse-applicative process refact syb temporary transformers + unix-compat + ]; + testHaskellDepends = [ + base containers directory filemanip filepath ghc ghc-exactprint mtl + optparse-applicative process refact silently syb tasty + tasty-expected-failure tasty-golden temporary transformers + unix-compat + ]; + description = "Perform refactorings specified by the refact library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "apply-refact" = callPackage ({ mkDerivation, base, containers, directory, filemanip, filepath , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact @@ -34200,16 +34277,16 @@ self: { broken = true; }) {}; - "aur_6_3_1" = callPackage - ({ mkDerivation, aeson, base, http-client, http-client-tls, servant - , servant-client, tasty, tasty-hunit, text + "aur_7_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, http-client + , http-client-tls, http-types, tasty, tasty-hunit, text }: mkDerivation { pname = "aur"; - version = "6.3.1"; - sha256 = "049n21n8b2qllig40fqrc72ah16d4r2ajhxxj851nkyi44fvz0ba"; + version = "7.0.0"; + sha256 = "1x355bd8xdg0xm4y89ciqz861chj0b6dkwq8ma7nc46acl25a18z"; libraryHaskellDepends = [ - aeson base http-client servant servant-client text + aeson base bytestring http-client http-types text ]; testHaskellDepends = [ base http-client http-client-tls tasty tasty-hunit @@ -34239,38 +34316,32 @@ self: { }) {}; "aura" = callPackage - ({ mkDerivation, aeson, aeson-pretty, algebraic-graphs, aur, base - , bytestring, containers, errors, filepath, generic-lens - , http-client, http-client-tls, http-types, language-bash - , megaparsec, microlens, microlens-ghc, mwc-random, network-uri - , nonempty-containers, optparse-applicative, paths, pretty-simple - , prettyprinter, prettyprinter-ansi-terminal, rio, scheduler - , semigroupoids, servant-client-core, stm, tasty, tasty-hunit, text - , these, time, transformers, typed-process, unliftio, versions - , witherable-class + ({ mkDerivation, aeson, algebraic-graphs, aur, base, bytestring + , containers, filepath, hashable, http-client, http-client-tls + , http-types, language-bash, megaparsec, microlens, network-uri + , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal + , rio, scheduler, stm, tasty, tasty-hunit, text, time, transformers + , typed-process, unliftio, versions }: mkDerivation { pname = "aura"; - version = "2.2.1"; - sha256 = "01biz0slwjn9pbjfpg2lc1fywjyk9y0zvhjrbv4kx9nxnbrb7b2b"; + version = "2.3.0"; + sha256 = "0m0f06qbg3dn4l5di5fmidjyk9qi14ppbbgbh126naccybjj3231"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-pretty algebraic-graphs aur base bytestring containers - errors filepath generic-lens http-client http-types language-bash - megaparsec microlens microlens-ghc mwc-random network-uri - nonempty-containers paths prettyprinter prettyprinter-ansi-terminal - rio scheduler semigroupoids servant-client-core stm text these time - transformers typed-process unliftio versions witherable-class + aeson algebraic-graphs aur base bytestring containers filepath + hashable http-client http-types language-bash megaparsec microlens + network-uri prettyprinter prettyprinter-ansi-terminal rio scheduler + stm text time transformers typed-process unliftio versions ]; executableHaskellDepends = [ - base bytestring containers errors http-client http-client-tls - microlens nonempty-containers optparse-applicative paths - pretty-simple prettyprinter prettyprinter-ansi-terminal rio text - transformers typed-process versions + base bytestring containers http-client http-client-tls microlens + optparse-applicative prettyprinter prettyprinter-ansi-terminal rio + text transformers typed-process versions ]; testHaskellDepends = [ - base bytestring containers megaparsec microlens paths rio tasty + base bytestring containers megaparsec microlens rio tasty tasty-hunit text versions ]; description = "A secure package manager for Arch Linux and the AUR"; @@ -36382,8 +36453,8 @@ self: { ({ mkDerivation, barbies, base, template-haskell }: mkDerivation { pname = "barbies-th"; - version = "0.1"; - sha256 = "1rabviwnyp4c9r6ym958nxgrjz18gdajrj1crdniyyd586giadh4"; + version = "0.1.1"; + sha256 = "0b8g8q1ddbsfwf1v3063wv3abpa3f90mbiwa4wgsgizflj7s1ik9"; libraryHaskellDepends = [ barbies base template-haskell ]; testHaskellDepends = [ barbies base ]; description = "Create strippable HKD via TH"; @@ -36686,13 +36757,14 @@ self: { "base16" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, criterion - , deepseq, memory, random-bytestring, tasty, tasty-hunit, text + , deepseq, memory, primitive, random-bytestring, tasty, tasty-hunit + , text }: mkDerivation { pname = "base16"; - version = "0.2.0.0"; - sha256 = "0j4mk7w8bg3q3ln5lcffdvaz36frizzq82z05l699y5g25abzrx4"; - libraryHaskellDepends = [ base bytestring text ]; + version = "0.2.0.1"; + sha256 = "1y7ighqi1id57kh04ks8bg8b2vvzmy25p4qgdq26y0ydfz33gmsh"; + libraryHaskellDepends = [ base bytestring primitive text ]; testHaskellDepends = [ base base16-bytestring bytestring memory random-bytestring tasty tasty-hunit text @@ -36935,6 +37007,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "base64-bytestring_1_1_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion, deepseq + , HUnit, QuickCheck, split, test-framework, test-framework-hunit + , test-framework-quickcheck2 + }: + mkDerivation { + pname = "base64-bytestring"; + version = "1.1.0.0"; + sha256 = "1adcnkcx4nh3d59k94bkndj0wkgbvchz576qwlpaa7148a86q391"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ + base bytestring containers HUnit QuickCheck split test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ + base bytestring containers criterion deepseq + ]; + description = "Fast base64 encoding and decoding for ByteStrings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "base64-bytestring-type" = callPackage ({ mkDerivation, aeson, base, base-compat, base64-bytestring , binary, bytestring, cereal, deepseq, hashable, http-api-data @@ -37876,12 +37970,12 @@ self: { }: mkDerivation { pname = "bearriver"; - version = "0.13.1.1"; - sha256 = "0gqlwj30rghlqsik1i7w2yrccpf7h4pm3adnq6v7dprnhfcz1pkw"; + version = "0.13.1.2"; + sha256 = "0jqb1jn6jdrg6pm80zhd86rwsa05rxn0675lxv0m8c2z07g5601c"; libraryHaskellDepends = [ base dunai MonadRandom mtl simple-affine-space transformers ]; - description = "A replacement of Yampa based on Monadic Stream Functions"; + description = "FRP Yampa replacement implemented with Monadic Stream Functions"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -39038,6 +39132,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "binary-io" = callPackage + ({ mkDerivation, base, binary, bytestring, hspec, process }: + mkDerivation { + pname = "binary-io"; + version = "0.0.1"; + sha256 = "1w0wqi60wdfhlmif7ji47cvf5608fg1b9hh7cz657ybv1lpc6s89"; + libraryHaskellDepends = [ base binary bytestring ]; + testHaskellDepends = [ base binary bytestring hspec process ]; + description = "Read and write values of types that implement Binary from and to Handles"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "binary-list" = callPackage ({ mkDerivation, base, binary, bytestring, criterion, deepseq , phantom-state, transformers @@ -39268,8 +39374,6 @@ self: { testHaskellDepends = [ base bytestring ]; description = "Binary deserialisation using strict ByteStrings"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "binary-tagged" = callPackage @@ -39806,7 +39910,7 @@ self: { description = "Low level bindings to the C levmar (Levenberg-Marquardt) library"; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs) blas; inherit (pkgs) liblapack;}; + }) {inherit (pkgs) blas; liblapack = null;}; "bindings-libcddb" = callPackage ({ mkDerivation, base, bindings-DSL, libcddb }: @@ -40569,8 +40673,8 @@ self: { }: mkDerivation { pname = "birch-beer"; - version = "0.2.4.0"; - sha256 = "1kiq4qq8xjw7l7mm973lxrr502fz7fybgcpzmrjiadhamjch8h9l"; + version = "0.2.4.2"; + sha256 = "09bk2qsq6rpa2sk817vb9w1y21rqjkj25i74cfw4rgzy2c550ffj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -41174,26 +41278,6 @@ self: { }) {}; "bits-extra" = callPackage - ({ mkDerivation, base, criterion, doctest, doctest-discover - , ghc-prim, hedgehog, hspec, hspec-discover, hw-hedgehog - , hw-hspec-hedgehog, vector - }: - mkDerivation { - pname = "bits-extra"; - version = "0.0.1.5"; - sha256 = "1f29jn8gxmi9nrwnrykq4z88cg8zsknbw7licmf44hlid0s5glf5"; - libraryHaskellDepends = [ base ghc-prim vector ]; - testHaskellDepends = [ - base doctest doctest-discover ghc-prim hedgehog hspec hw-hedgehog - hw-hspec-hedgehog - ]; - testToolDepends = [ doctest-discover hspec-discover ]; - benchmarkHaskellDepends = [ base criterion ghc-prim vector ]; - description = "Useful bitwise operations"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "bits-extra_0_0_2_0" = callPackage ({ mkDerivation, base, criterion, doctest, doctest-discover , ghc-prim, hedgehog, hspec, hspec-discover, hw-hedgehog , hw-hspec-hedgehog, vector @@ -41211,7 +41295,6 @@ self: { benchmarkHaskellDepends = [ base criterion ghc-prim vector ]; description = "Useful bitwise operations"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bits-extras" = callPackage @@ -41411,8 +41494,8 @@ self: { pname = "bitwise"; version = "1.0.0.1"; sha256 = "03xyzdkyb99gvm9g5chl07rqbnm7qrxba7wgmrfmal0rkwm0ibkn"; - revision = "2"; - editedCabalFile = "1mnh3629kgfivjwbbqwrkcyvg6iah5pncc5jzgq3ka5cq0kg09gz"; + revision = "3"; + editedCabalFile = "0sx6i1b9slicisnj53sv2jbdryyqd66amcm43xxqlv5srsqqijdm"; libraryHaskellDepends = [ array base bytestring ]; testHaskellDepends = [ base QuickCheck ]; benchmarkHaskellDepends = [ array base bytestring criterion ]; @@ -42048,6 +42131,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "blaze-markup_0_8_2_5" = callPackage + ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "blaze-markup"; + version = "0.8.2.5"; + sha256 = "0qbnydx79pappwd4mzmmqq0pilpkiq7f6rqmqzpi2jjyfxlbmlqv"; + libraryHaskellDepends = [ base blaze-builder bytestring text ]; + testHaskellDepends = [ + base blaze-builder bytestring containers HUnit QuickCheck tasty + tasty-hunit tasty-quickcheck text + ]; + description = "A blazingly fast markup combinator library for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "blaze-shields" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, blaze-svg, text }: mkDerivation { @@ -44084,18 +44185,20 @@ self: { "brok" = callPackage ({ mkDerivation, ansi-terminal, attoparsec, base, classy-prelude - , directory, file-embed, http-client, http-conduit, tasty - , tasty-discover, tasty-expected-failure, tasty-hunit, text, time + , connection, directory, file-embed, http-client, http-client-tls + , http-conduit, tasty, tasty-discover, tasty-expected-failure + , tasty-hunit, template-haskell, text, time }: mkDerivation { pname = "brok"; - version = "0.2.0.0"; - sha256 = "1fsh05433gkm89j4nf9whcif0iiscxbd32q307rjm1fwsfwp9c46"; + version = "1.0.0"; + sha256 = "07zi88xsacacqw6mg87ipic5y72vjpn9mx789bk9gk4jvd69z7x1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal attoparsec base classy-prelude directory file-embed - http-client http-conduit text time + ansi-terminal attoparsec base classy-prelude connection directory + file-embed http-client http-client-tls http-conduit + template-haskell text time ]; executableHaskellDepends = [ base classy-prelude file-embed ]; testHaskellDepends = [ @@ -45100,29 +45203,6 @@ self: { }) {system-glib = pkgs.glib;}; "butcher" = callPackage - ({ mkDerivation, base, bifunctors, containers, deque, extra, free - , hspec, microlens, microlens-th, mtl, multistate, pretty - , transformers, unsafe, void - }: - mkDerivation { - pname = "butcher"; - version = "1.3.3.0"; - sha256 = "1zp0j5ydbnk6x3yblhs9c6z2a3bmh9fvprqhx2wk3wyvrgkwsx8h"; - revision = "1"; - editedCabalFile = "1jw9dvkqdq24mgxvrrz4ymlqgrqkn4648dyy22wmx06lbqzcbqam"; - libraryHaskellDepends = [ - base bifunctors containers deque extra free microlens microlens-th - mtl multistate pretty transformers unsafe void - ]; - testHaskellDepends = [ - base containers deque extra free hspec microlens microlens-th mtl - multistate pretty transformers unsafe - ]; - description = "Chops a command or program invocation into digestable pieces"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "butcher_1_3_3_1" = callPackage ({ mkDerivation, base, bifunctors, containers, deque, extra, free , hspec, microlens, microlens-th, mtl, multistate, pretty , transformers, unsafe, void @@ -45141,7 +45221,6 @@ self: { ]; description = "Chops a command or program invocation into digestable pieces"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "butter" = callPackage @@ -47623,6 +47702,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cache-polysemy" = callPackage + ({ mkDerivation, base, cache, clock, hashable, polysemy + , polysemy-plugin + }: + mkDerivation { + pname = "cache-polysemy"; + version = "0.1.2"; + sha256 = "1psgf0x9hjhhnn7kn954b26kxd1c94cbhgv8xd2w3nxpmv2qh0m2"; + libraryHaskellDepends = [ + base cache clock hashable polysemy polysemy-plugin + ]; + testHaskellDepends = [ + base cache clock hashable polysemy polysemy-plugin + ]; + description = "cached hashmaps"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "cached" = callPackage ({ mkDerivation, base, containers, directory, doctest, filepath , protolude, QuickCheck, quickcheck-assertions, shake, text @@ -48016,6 +48113,35 @@ self: { broken = true; }) {}; + "calamity" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, concurrent-extra + , data-default-class, deepseq, deque, df1, di-polysemy, exceptions + , fmt, focus, generic-lens, generic-override + , generic-override-aeson, hashable, http-date, http-types, lens + , lens-aeson, mtl, polysemy, polysemy-plugin, reflection + , scientific, stm, stm-chans, stm-containers, text, text-show, time + , typerep-map, unordered-containers, vector, websockets + , wreq-patchable, wuss + }: + mkDerivation { + pname = "calamity"; + version = "0.1.0.0"; + sha256 = "0cpx7v210gyh3r5qzh704wx4fgrb913b5g4rys76jhnmp77a79wc"; + libraryHaskellDepends = [ + aeson async base bytestring concurrent-extra data-default-class + deepseq deque df1 di-polysemy exceptions fmt focus generic-lens + generic-override generic-override-aeson hashable http-date + http-types lens lens-aeson mtl polysemy polysemy-plugin reflection + scientific stm stm-chans stm-containers text text-show time + typerep-map unordered-containers vector websockets wreq-patchable + wuss + ]; + description = "A library for writing discord bots"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "calc" = callPackage ({ mkDerivation, array, base, harpy, haskell98, mtl }: mkDerivation { @@ -48720,6 +48846,42 @@ self: { broken = true; }) {}; + "cardano-transactions" = callPackage + ({ mkDerivation, ansi-terminal, base, base58-bytestring, bytestring + , cardano-binary, cardano-crypto, cardano-crypto-wrapper + , cardano-ledger, cardano-ledger-test, cardano-tx, cborg + , cryptonite, extra, hedgehog-quickcheck, hspec, memory + , optparse-applicative, process, QuickCheck, text + }: + mkDerivation { + pname = "cardano-transactions"; + version = "1.0.0"; + sha256 = "0qzf1yf85m0fwiayjb8g09w9dxq1zyg9xwjcd9p98i3dj6722yfa"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base base58-bytestring bytestring cardano-binary cardano-crypto + cardano-crypto-wrapper cardano-ledger cborg cryptonite extra memory + text + ]; + executableHaskellDepends = [ + ansi-terminal base bytestring cborg memory optparse-applicative + text + ]; + testHaskellDepends = [ + base bytestring cardano-crypto-wrapper cardano-ledger + cardano-ledger-test cborg hedgehog-quickcheck hspec process + QuickCheck text + ]; + testToolDepends = [ cardano-tx ]; + description = "Library utilities for constructing and signing Cardano transactions"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {cardano-binary = null; cardano-crypto = null; + cardano-crypto-wrapper = null; cardano-ledger = null; + cardano-ledger-test = null; cardano-tx = null;}; + "carettah" = callPackage ({ mkDerivation, base, cairo, directory, filepath, gtk , gtk2hs-buildtools, hcwiid, highlighting-kate, mtl, pandoc, pango @@ -51831,32 +51993,6 @@ self: { }) {}; "chronos" = callPackage - ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion - , deepseq, doctest, hashable, HUnit, old-locale, primitive - , QuickCheck, semigroups, test-framework, test-framework-hunit - , test-framework-quickcheck2, text, thyme, time, torsor, vector - }: - mkDerivation { - pname = "chronos"; - version = "1.1"; - sha256 = "0g41hchir6rxfnd8halg49y80pc9dr38k7b7cik18gqdasswwg6c"; - libraryHaskellDepends = [ - aeson attoparsec base bytestring hashable primitive semigroups text - torsor vector - ]; - testHaskellDepends = [ - attoparsec base bytestring doctest HUnit QuickCheck test-framework - test-framework-hunit test-framework-quickcheck2 text torsor - ]; - benchmarkHaskellDepends = [ - attoparsec base bytestring criterion deepseq old-locale QuickCheck - text thyme time vector - ]; - description = "A performant time library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "chronos_1_1_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion , deepseq, doctest, hashable, HUnit, old-locale, primitive , QuickCheck, semigroups, test-framework, test-framework-hunit @@ -51880,7 +52016,6 @@ self: { ]; description = "A performant time library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "chronos-bench" = callPackage @@ -52816,8 +52951,8 @@ self: { }: mkDerivation { pname = "clash-ghc"; - version = "1.2.0"; - sha256 = "1rv8bjs563c8r543crj69dnp1610bch3dsxb5c0wckf799l8bmpn"; + version = "1.2.1"; + sha256 = "0bczw02kgpiczagnv2aq2yjj0g2619gl8dzwpzsvfz5r1p8kp6f3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -52846,8 +52981,8 @@ self: { }: mkDerivation { pname = "clash-lib"; - version = "1.2.0"; - sha256 = "0w5ilrqagc7xj14ngjg0rgcc3vhkxhsrz21rgl9qhygcs1cam5j2"; + version = "1.2.1"; + sha256 = "1l6xibxbkfz91wkl55548wv48gba6n4pmbymb1fbhs43nx3hssil"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-terminal attoparsec base binary bytestring clash-prelude @@ -52883,10 +53018,10 @@ self: { }) {}; "clash-prelude" = callPackage - ({ mkDerivation, array, base, bifunctors, binary, bytestring - , constraints, containers, criterion, data-binary-ieee754 - , data-default-class, deepseq, doctest, ghc-prim - , ghc-typelits-extra, ghc-typelits-knownnat + ({ mkDerivation, array, base, bifunctors, binary, bytestring, Cabal + , cabal-doctest, constraints, containers, criterion + , data-binary-ieee754, data-default-class, deepseq, doctest + , ghc-prim, ghc-typelits-extra, ghc-typelits-knownnat , ghc-typelits-natnormalise, half, hashable, hint, integer-gmp , lens, QuickCheck, quickcheck-classes-base, recursion-schemes , reflection, singletons, tasty, tasty-hunit, tasty-quickcheck @@ -52895,8 +53030,9 @@ self: { }: mkDerivation { pname = "clash-prelude"; - version = "1.2.0"; - sha256 = "181ccw3ajdfhmlwjs9jiqy10b7whsp3pcqyxw166s8rda7h3pvpj"; + version = "1.2.1"; + sha256 = "18smrj545fvry8wj0hvawwcwc9yf1h1nsyyl337yh7xnxq9bycsy"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ array base bifunctors binary bytestring constraints containers data-binary-ieee754 data-default-class deepseq ghc-prim @@ -54777,6 +54913,45 @@ self: { broken = true; }) {}; + "co-log_0_4_0_1" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, chronos + , co-log-core, containers, contravariant, directory, filepath + , hedgehog, markdown-unlit, mtl, stm, text, transformers + , typerep-map, vector + }: + mkDerivation { + pname = "co-log"; + version = "0.4.0.1"; + sha256 = "08sqrsy55wrfc5bg5sz22hah0ix14wrxn20lka17ri17a818w9p7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-terminal base bytestring chronos co-log-core containers + contravariant directory filepath mtl stm text transformers + typerep-map vector + ]; + executableHaskellDepends = [ + base bytestring co-log-core mtl text typerep-map + ]; + executableToolDepends = [ markdown-unlit ]; + testHaskellDepends = [ base co-log-core hedgehog ]; + description = "Composable Contravariant Comonadic Logging Library"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "co-log-concurrent" = callPackage + ({ mkDerivation, base, co-log-core, stm }: + mkDerivation { + pname = "co-log-concurrent"; + version = "0.4.0.0"; + sha256 = "1gnfqg6c290ain7v06clxga6jj46bdry6vvsrk1dhcdqv1rvkfwz"; + libraryHaskellDepends = [ base co-log-core stm ]; + description = "Asynchronous backend for co-log library"; + license = stdenv.lib.licenses.mpl20; + }) {}; + "co-log-core" = callPackage ({ mkDerivation, base, doctest, Glob }: mkDerivation { @@ -54789,6 +54964,19 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "co-log-core_0_2_1_1" = callPackage + ({ mkDerivation, base, doctest, Glob }: + mkDerivation { + pname = "co-log-core"; + version = "0.2.1.1"; + sha256 = "04w8j39n1cfmzvvllbjj21w7g53lgppf5crk7n4i9hgspaxbwyik"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest Glob ]; + description = "Composable Contravariant Comonadic Logging Library"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "co-log-polysemy" = callPackage ({ mkDerivation, base, co-log-core, polysemy }: mkDerivation { @@ -54803,6 +54991,21 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "co-log-polysemy_0_0_1_2" = callPackage + ({ mkDerivation, base, co-log-core, polysemy }: + mkDerivation { + pname = "co-log-polysemy"; + version = "0.0.1.2"; + sha256 = "0g1qr6akgbnqs64xammvdpqjf5n5drx4a48w7lxw7l6n7z99rr4n"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base co-log-core polysemy ]; + executableHaskellDepends = [ base co-log-core polysemy ]; + description = "Composable Contravariant Comonadic Logging Library"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "co-log-sys" = callPackage ({ mkDerivation, aeson, base, co-log-core, fmt, microlens , monad-control, mtl, network, universum, unix @@ -55110,22 +55313,23 @@ self: { , bytestring, cereal, cereal-text, containers, deepseq , dependent-sum, ghc-prim, hashable, HUnit, monad-loops, mtl , random, ref-tf, reflex, template-haskell, test-framework - , test-framework-hunit, text, time + , test-framework-hunit, text, time, witherable }: mkDerivation { pname = "codeworld-api"; - version = "0.4.0"; - sha256 = "0smw8xjigq1sl3rppbhvifsrzjfbhy4d41m0rpjf1d1ahvby64ja"; + version = "0.5.0"; + sha256 = "17s1353jk5l93hxv7wnnf4hxzw0ds1gq16kxkf7ig985141cah1n"; libraryHaskellDepends = [ aeson base base64-bytestring blank-canvas bytestring cereal cereal-text containers deepseq dependent-sum ghc-prim hashable monad-loops mtl random ref-tf reflex template-haskell text time + witherable ]; testHaskellDepends = [ aeson base base64-bytestring blank-canvas bytestring cereal cereal-text containers deepseq dependent-sum ghc-prim hashable HUnit monad-loops mtl random ref-tf reflex template-haskell - test-framework test-framework-hunit text time + test-framework test-framework-hunit text time witherable ]; description = "Graphics library for CodeWorld"; license = stdenv.lib.licenses.asl20; @@ -59118,8 +59322,8 @@ self: { }: mkDerivation { pname = "configurator-pg"; - version = "0.2.2"; - sha256 = "0ibpsj3yf8qlcjr84i77j6llrsfpcxadqqgsqz90cwy92z5vjxrx"; + version = "0.2.3"; + sha256 = "0vbs52za4smxy8nag08ag2c9mjbpiw1a7ai5vd8is7db9732skfa"; libraryHaskellDepends = [ base containers megaparsec protolude scientific text ]; @@ -60129,8 +60333,8 @@ self: { ({ mkDerivation, base, containers, contravariant, mmorph }: mkDerivation { pname = "contracheck-applicative"; - version = "0.1.1.0"; - sha256 = "0lv9zq1lxnl9w77wnsywna4lh1cw7gh8ks3gwciij2x2bwlw48ns"; + version = "0.1.2"; + sha256 = "0vfw5fp6max40wrfkcsl0km8qpdp231b6agc16y758cg9isxbllg"; libraryHaskellDepends = [ base containers contravariant mmorph ]; description = "Validation types/typeclass based on the contravariance"; license = stdenv.lib.licenses.bsd3; @@ -61395,8 +61599,8 @@ self: { }: mkDerivation { pname = "cpkg"; - version = "0.2.5.1"; - sha256 = "08snjhmxjcsw2imglfpqggby7vn2vgbbz56d0mh4s6p73mrqnjgg"; + version = "0.2.5.2"; + sha256 = "1njjbvpnkjwxgsrjr3fihyvgr194mc94g2qxdq5yb1ai3sms7zsd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -62713,18 +62917,17 @@ self: { "crypto-classical" = callPackage ({ mkDerivation, base, bytestring, containers, crypto-numbers - , crypto-random, microlens, microlens-th, modular-arithmetic - , QuickCheck, text, transformers + , crypto-random, modular-arithmetic, QuickCheck, text, transformers }: mkDerivation { pname = "crypto-classical"; - version = "0.2.1"; - sha256 = "0mqvygx8pvvmaalqzr94nf400smq8y22shyvfhxrh69hs6q0dgw6"; + version = "0.3.0"; + sha256 = "1jkgdaln74sznkqr1knainpn3pbjih76rk3r7wmx28jvy57pm1b3"; libraryHaskellDepends = [ - base bytestring containers crypto-numbers crypto-random microlens - microlens-th modular-arithmetic text transformers + base bytestring containers crypto-numbers crypto-random + modular-arithmetic text transformers ]; - testHaskellDepends = [ base bytestring microlens QuickCheck ]; + testHaskellDepends = [ base bytestring QuickCheck ]; description = "An educational tool for studying classical cryptography schemes"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -63659,8 +63862,8 @@ self: { pname = "css-syntax"; version = "0.1.0.0"; sha256 = "02f000nzc0dhjhlp1z82q4far8ablvzalpk918lg54f63lbqdwsh"; - revision = "1"; - editedCabalFile = "14241m9nm3wbbhajw95gdj9mvfzf4hmrzvk2wgjvkm71mg4yhwnr"; + revision = "4"; + editedCabalFile = "0n3wf9yjpn29nl0f9jk3izp7d2iq00j6bp1y1v1k5vc1ycskhn5y"; libraryHaskellDepends = [ base scientific text ]; testHaskellDepends = [ base directory hspec QuickCheck scientific text @@ -65380,6 +65583,8 @@ self: { pname = "data-accessor-template"; version = "0.2.1.16"; sha256 = "15gd6xlrq5ica514m5rdcz2dl8bibdmbsmnc98ddhx491c9g5rwk"; + revision = "1"; + editedCabalFile = "0zz2v420zvinphs6jnngc40x7h8jn5rqj3nj8alpgfyqx59w41my"; libraryHaskellDepends = [ base data-accessor template-haskell utility-ht ]; @@ -65489,8 +65694,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "data-category"; - version = "0.7.1"; - sha256 = "0yvrqgid8b9awm1z31cpa465jfvjq8p23k23dxg567rm191n68kz"; + version = "0.8.1"; + sha256 = "06m5yb7ycxr1drvv67cyb01mhghhfac9y8wf7lpmq2z55h4hflb2"; description = "Category theory"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -69706,8 +69911,8 @@ self: { ({ mkDerivation, aeson, base, bytestring }: mkDerivation { pname = "deriving-aeson"; - version = "0.2.3"; - sha256 = "0cxkrsdbr2mq2i5w8762lc5cc9kyf3csscd9gmndrrdvicmq1yvv"; + version = "0.2.4"; + sha256 = "1wswirjqpmmzyag5y2jhys9pswl3fdrzjv69csvd655qg8iyybpb"; libraryHaskellDepends = [ aeson base ]; testHaskellDepends = [ aeson base bytestring ]; description = "Type driven generic aeson instance customisation"; @@ -70767,6 +70972,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "di-polysemy" = callPackage + ({ mkDerivation, base, df1, di-core, di-df1, di-handle, polysemy }: + mkDerivation { + pname = "di-polysemy"; + version = "0.1.1.0"; + sha256 = "08n98ivdvfb77slzbxvysy4cgvnf6jcxf0zqj1rr40rjfxaw2xcn"; + libraryHaskellDepends = [ + base df1 di-core di-df1 di-handle polysemy + ]; + description = "DI logger wrapped for Polysemy"; + license = stdenv.lib.licenses.mit; + }) {}; + "dia-base" = callPackage ({ mkDerivation, base, deepseq }: mkDerivation { @@ -74151,8 +74369,8 @@ self: { }: mkDerivation { pname = "dobutokO2"; - version = "0.31.0.0"; - sha256 = "16sk8igx7n07lkhvi5r78d15n4wmhbirall6s4zaqn8ab7sdga86"; + version = "0.35.2.0"; + sha256 = "1hr4l8flfjinvbdwxf3xmq3xknd19kbf3d2k23dy7y1fghd6vflh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74163,7 +74381,7 @@ self: { base bytestring directory mmsyn2 mmsyn3 mmsyn6ukr mmsyn7s mmsyn7ukr process vector ]; - description = "A program and a library to create experimental music from a mono audio and a Ukrainian text"; + description = "Helps to create experimental music from a file (or its part) and a Ukrainian text"; license = stdenv.lib.licenses.mit; }) {}; @@ -76160,6 +76378,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dunai_0_7_0" = callPackage + ({ mkDerivation, base, MonadRandom, simple-affine-space, tasty + , tasty-hunit, transformers, transformers-base + }: + mkDerivation { + pname = "dunai"; + version = "0.7.0"; + sha256 = "1gii02d557ak0h4sq5ra4n40y4sl88z74n6mwd0937xxlpiahwsh"; + libraryHaskellDepends = [ + base MonadRandom simple-affine-space transformers transformers-base + ]; + testHaskellDepends = [ base tasty tasty-hunit transformers ]; + description = "Generalised reactive framework supporting classic, arrowized and monadic FRP"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dunai-core" = callPackage ({ mkDerivation, base, MonadRandom, transformers, transformers-base }: @@ -76180,8 +76415,8 @@ self: { ({ mkDerivation, base, dunai, normaldistribution, QuickCheck }: mkDerivation { pname = "dunai-test"; - version = "0.1.0.0"; - sha256 = "0jkn1740adzv9jwsp6qa0sxfxg6x5cvqlss1yjwcr1chsvpk2d1m"; + version = "0.7.0"; + sha256 = "08pbfw10dkds8dwr913p0rikvs7vxfwyj5rdsr7njzh39fz9lqli"; libraryHaskellDepends = [ base dunai normaldistribution QuickCheck ]; @@ -76659,6 +76894,8 @@ self: { pname = "dynamic-plot"; version = "0.4.1.0"; sha256 = "1nly6ra0kd72q42hiaqism94vmyg5hp4ppyd024iiq9pcbgpq7r6"; + revision = "1"; + editedCabalFile = "0chaa06bzf3jd55c9s6wcnl7i8j2wl55rr9g50aia4gsc47azgxr"; libraryHaskellDepends = [ base colour colour-space constrained-categories containers data-default deepseq diagrams-cairo diagrams-core diagrams-gtk @@ -78098,8 +78335,8 @@ self: { }: mkDerivation { pname = "ejdb2-binding"; - version = "0.1.0.0"; - sha256 = "0vh40ssfrz22vdqw0lswq27rr7wpzndg5y74wjdsddy44pbgmmc9"; + version = "0.2.0.0"; + sha256 = "1lxyjnnwv3r05l8qc979kmrl9kk5h8mdx9ca4wx8r6plsn7b2a51"; libraryHaskellDepends = [ aeson base bytestring unordered-containers ]; @@ -79580,8 +79817,8 @@ self: { }: mkDerivation { pname = "encoding"; - version = "0.8.2"; - sha256 = "1lfh5pyc4f73870xz6dydksp5nspnzbkj4fvinhwdknhc5ii8353"; + version = "0.8.3"; + sha256 = "07flh8rmdbi8rhgg2jzv70yb91kkjkiidc8ww5mxjdk8av70wbj3"; setupHaskellDepends = [ base Cabal containers filepath ghc-prim HaXml ]; @@ -83299,6 +83536,18 @@ self: { broken = true; }) {}; + "extended-containers" = callPackage + ({ mkDerivation, base, hspec, QuickCheck, transformers, vector }: + mkDerivation { + pname = "extended-containers"; + version = "0.1.0.0"; + sha256 = "04m3i90iljx36yc528yz6dcgcrfvzkvjvghqjp741mqvmixdjsip"; + libraryHaskellDepends = [ base transformers vector ]; + testHaskellDepends = [ base hspec QuickCheck ]; + description = "Heap and Vector container types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "extended-reals" = callPackage ({ mkDerivation, base, deepseq, hashable, HUnit, QuickCheck, tasty , tasty-hunit, tasty-quickcheck, tasty-th @@ -86915,6 +87164,8 @@ self: { pname = "first-class-families"; version = "0.8.0.0"; sha256 = "190jl3vs7glkbm8ap90x9yzlj01yzxd818s3i0w4pz21b6d6sxav"; + revision = "1"; + editedCabalFile = "02z6wixk9kdgshxsz99lag29lb70kadg9wn6vsgk906wj014fv52"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base doctest Glob ]; description = "First class type families"; @@ -90868,10 +91119,8 @@ self: { ({ mkDerivation, base, bifunctors, lens, optparse-applicative }: mkDerivation { pname = "friendly"; - version = "0.1.0.0"; - sha256 = "0ikbfki5yvagc3xjbqwmzzp29idfviaylnan6cr39kna6fc8ajgx"; - revision = "2"; - editedCabalFile = "12j953w8zcix2iyqwkn08zpw1r1dd7jk8p8a3v5hs5rya1qb74si"; + version = "0.1.0.1"; + sha256 = "0860zmvlccdnjycmjr4wmi8ighps9dig5zik8hpj2h3z208ph8qp"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -92228,12 +92477,17 @@ self: { }) {}; "fusion-plugin" = callPackage - ({ mkDerivation, base, fusion-plugin-types, ghc, syb }: + ({ mkDerivation, base, containers, directory, filepath + , fusion-plugin-types, ghc, syb, time, transformers + }: mkDerivation { pname = "fusion-plugin"; - version = "0.2.0"; - sha256 = "0fbsmlkvxxfiwajl3ihidp2xmsds4y47sbqigng9pp78lhln35am"; - libraryHaskellDepends = [ base fusion-plugin-types ghc syb ]; + version = "0.2.1"; + sha256 = "08v43q428s6nw3diqaasdr0c9arrzvzvldcybj8wp2r66aw613ic"; + libraryHaskellDepends = [ + base containers directory filepath fusion-plugin-types ghc syb time + transformers + ]; description = "GHC plugin to make stream fusion more predictable"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -92265,8 +92519,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.15.4"; - sha256 = "03q3hd8m9m8xxpd0xbxqc0r2ycybznrxr4j1mr2qkzlf49qp1y2v"; + version = "0.15.5"; + sha256 = "07xd67202qv1fnka0nichpspzpyzlismlwdhlq0rr6nb3xriykxn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -94904,26 +95158,6 @@ self: { }) {}; "genvalidity-typed-uuid" = callPackage - ({ mkDerivation, base, genvalidity, genvalidity-hspec - , genvalidity-hspec-aeson, genvalidity-uuid, hspec, QuickCheck - , typed-uuid - }: - mkDerivation { - pname = "genvalidity-typed-uuid"; - version = "0.0.0.1"; - sha256 = "12b9pqly41kwvyqzlqs2nv882m0vvkf06bshngvhjl4ykn7almqk"; - libraryHaskellDepends = [ - base genvalidity genvalidity-uuid QuickCheck typed-uuid - ]; - testHaskellDepends = [ - base genvalidity genvalidity-hspec genvalidity-hspec-aeson - genvalidity-uuid hspec QuickCheck typed-uuid - ]; - description = "Generators for Phantom-Typed version of UUID"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-typed-uuid_0_0_0_2" = callPackage ({ mkDerivation, base, criterion, genvalidity , genvalidity-criterion, genvalidity-hspec, genvalidity-hspec-aeson , genvalidity-uuid, hspec, QuickCheck, typed-uuid @@ -94945,7 +95179,6 @@ self: { ]; description = "Generators for Phantom-Typed version of UUID"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-unordered-containers" = callPackage @@ -94970,24 +95203,6 @@ self: { }) {}; "genvalidity-uuid" = callPackage - ({ mkDerivation, base, genvalidity, genvalidity-hspec, hspec - , QuickCheck, uuid, validity, validity-uuid - }: - mkDerivation { - pname = "genvalidity-uuid"; - version = "0.1.0.3"; - sha256 = "1kjvl1i4nih5yyydilwsq1mssw1ljiipi20k5pxjh5rgb4f1p520"; - libraryHaskellDepends = [ - base genvalidity QuickCheck uuid validity validity-uuid - ]; - testHaskellDepends = [ - base genvalidity genvalidity-hspec hspec QuickCheck uuid - ]; - description = "GenValidity support for UUID"; - license = stdenv.lib.licenses.mit; - }) {}; - - "genvalidity-uuid_0_1_0_4" = callPackage ({ mkDerivation, base, criterion, genvalidity , genvalidity-criterion, genvalidity-hspec, hspec, QuickCheck, uuid , validity, validity-uuid @@ -95007,7 +95222,6 @@ self: { ]; description = "GenValidity support for UUID"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "genvalidity-vector" = callPackage @@ -95487,17 +95701,17 @@ self: { }) {}; "ghc-check" = callPackage - ({ mkDerivation, base, ghc, ghc-paths, template-haskell - , transformers + ({ mkDerivation, base, filepath, ghc, ghc-paths, process + , template-haskell, transformers }: mkDerivation { pname = "ghc-check"; - version = "0.1.0.3"; - sha256 = "1zrlnk3gzdb96592is2krk8qpk386bib0bpgw47yqj8qfcxqf76v"; + version = "0.3.0.0"; + sha256 = "19fgfkv68q1l93ql6g4xpa27pcv1v04vpfpq0rcvspp09xmcv1i4"; libraryHaskellDepends = [ - base ghc ghc-paths template-haskell transformers + base filepath ghc ghc-paths process template-haskell transformers ]; - description = "Detect mismatches between compile-time and run-time versions of the ghc api"; + description = "detect mismatches between compile-time and run-time versions of the ghc api"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -95804,8 +96018,8 @@ self: { }: mkDerivation { pname = "ghc-heap-view"; - version = "0.6.1"; - sha256 = "04lmj3ihdwcz483w2cpjs4zcpld8yk3aslkw2gl4mal3fpwf0vhx"; + version = "0.6.2"; + sha256 = "1wj11g24zap7r2xvp46dir54hwyki025xnkgymc73224lisc3134"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal filepath ]; libraryHaskellDepends = [ @@ -95909,8 +96123,8 @@ self: { }: mkDerivation { pname = "ghc-lib"; - version = "8.8.3.20200224"; - sha256 = "0qwv8i4x4ylixrbipxkii0zxz3j33cpahlckbn6chpp9b59bfdpa"; + version = "8.8.3.20200412.1"; + sha256 = "07xfj3p8w5964jv5py19p2pbcpbjcbwzpd4b46d43j80abzavgxg"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -95948,8 +96162,8 @@ self: { }: mkDerivation { pname = "ghc-lib-parser"; - version = "8.8.3.20200224"; - sha256 = "0hdn3sd4l1ph26f715i6mlqw6l6w8nnfp9jmlcwrjph14rpn1y15"; + version = "8.8.3.20200412.1"; + sha256 = "1bfyi3haq6qz9x5dbnjvf7m7wqrxqmv3i4kdivlh2v416d56apqd"; enableSeparateDataOutput = true; libraryHaskellDepends = [ array base binary bytestring containers deepseq directory filepath @@ -96892,32 +97106,6 @@ self: { }) {}; "ghcid" = callPackage - ({ mkDerivation, ansi-terminal, base, cmdargs, containers - , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit - , terminal-size, time, unix - }: - mkDerivation { - pname = "ghcid"; - version = "0.8.5"; - sha256 = "15zj78wasix4yz8mxx5hl6x1gj364vsbwn5arp7sbq13rywhs2qy"; - 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; - }) {}; - - "ghcid_0_8_6" = callPackage ({ mkDerivation, ansi-terminal, base, cmdargs, containers , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit , terminal-size, time, unix @@ -96941,7 +97129,6 @@ self: { ]; description = "GHCi based bare bones IDE"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ghcide" = callPackage @@ -98696,8 +98883,8 @@ self: { }: mkDerivation { pname = "git-brunch"; - version = "1.2.0.0"; - sha256 = "144i3rk9mx5qf1w231zramzr0vvwf8gq4h63v234jcxdlygysy5h"; + version = "1.3.1.0"; + sha256 = "0k1q3f9hyyagv67mpaj1159vic4kc44nk10nswg0pql38ai5bqvx"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -103733,13 +103920,14 @@ self: { "gopro-plus" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, exceptions , filepath, generic-deriving, HUnit, lens, lens-aeson, mtl, random - , retry, tasty, tasty-hunit, tasty-quickcheck, text, time - , transformers, unix, unliftio, unordered-containers, vector, wreq + , raw-strings-qq, retry, tasty, tasty-hunit, tasty-quickcheck, text + , time, transformers, unix, unliftio, unordered-containers, vector + , wreq }: mkDerivation { pname = "gopro-plus"; - version = "0.3.0.1"; - sha256 = "1c2g8ndqwlm8nz08nm66pz3j3wqdm0cn1r03ykay4g3lig7i27za"; + version = "0.3.1.0"; + sha256 = "06wggkl9p69xm75f3kkajacqr54fq7vqbmyldgapfqglbzs43z7g"; libraryHaskellDepends = [ aeson base bytestring containers exceptions filepath generic-deriving lens lens-aeson mtl random retry text time @@ -103747,9 +103935,9 @@ self: { ]; testHaskellDepends = [ aeson base bytestring containers exceptions filepath - generic-deriving HUnit lens lens-aeson mtl random retry tasty - tasty-hunit tasty-quickcheck text time transformers unix unliftio - unordered-containers vector wreq + generic-deriving HUnit lens lens-aeson mtl random raw-strings-qq + retry tasty tasty-hunit tasty-quickcheck text time transformers + unix unliftio unordered-containers vector wreq ]; description = "GoPro Plus Client API"; license = stdenv.lib.licenses.bsd3; @@ -105272,6 +105460,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "greskell_1_0_1_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover + , exceptions, greskell-core, hashable, hint, hspec, semigroups + , text, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "greskell"; + version = "1.0.1.0"; + sha256 = "0gknzbaldmziy7lj23g3l8q3ymxdr5vbis109j6r7zbjap1jy0in"; + libraryHaskellDepends = [ + aeson base exceptions greskell-core hashable semigroups text + transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base bytestring doctest doctest-discover greskell-core hint + hspec text unordered-containers + ]; + description = "Haskell binding for Gremlin graph query language"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "greskell-core" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, doctest , doctest-discover, hashable, hspec, QuickCheck, scientific @@ -107334,7 +107544,7 @@ self: { license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) blas; inherit (pkgs) liblapack;}; + }) {inherit (pkgs) blas; liblapack = null;}; "hXmixer" = callPackage ({ mkDerivation, base, directory, gtk3, process, split, text }: @@ -108036,6 +108246,34 @@ self: { broken = true; }) {}; + "hackage-security_0_5_3_0" = callPackage + ({ mkDerivation, base, base16-bytestring, base64-bytestring + , bytestring, Cabal, containers, cryptohash-sha256, directory + , ed25519, filepath, ghc-prim, mtl, network, network-uri, parsec + , pretty, QuickCheck, tar, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, temporary, time, transformers, zlib + }: + mkDerivation { + pname = "hackage-security"; + version = "0.5.3.0"; + sha256 = "08bwawc7ramgdh54vcly2m9pvfchp0ahhs8117jajni6x4bnx66v"; + revision = "6"; + editedCabalFile = "1xs2nkzlvkdz8g27yzfxbjdbdadfmgiydnlpn5dm77cg18r495ay"; + libraryHaskellDepends = [ + base base16-bytestring base64-bytestring bytestring Cabal + containers cryptohash-sha256 directory ed25519 filepath ghc-prim + mtl network network-uri parsec pretty tar template-haskell time + transformers zlib + ]; + testHaskellDepends = [ + base bytestring Cabal containers network-uri QuickCheck tar tasty + tasty-hunit tasty-quickcheck temporary time zlib + ]; + description = "Hackage security library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hackage-security" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring , bytestring, Cabal, containers, cryptohash-sha256, directory @@ -108355,6 +108593,23 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "haddock_2_23_1" = callPackage + ({ mkDerivation, base, filepath, haddock-api }: + mkDerivation { + pname = "haddock"; + version = "2.23.1"; + sha256 = "129lwai4609f910h7yhmmm1rbqzjla9rcg5dpzqihydsjyw5ii1s"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ base haddock-api ]; + testHaskellDepends = [ base filepath ]; + doCheck = false; + preCheck = "unset GHC_PACKAGE_PATH"; + description = "A documentation-generation tool for Haskell libraries"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "haddock" = callPackage ({ mkDerivation, base, filepath, haddock-api }: mkDerivation { @@ -108371,25 +108626,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "haddock-api_2_22_0" = callPackage - ({ mkDerivation, array, base, bytestring, Cabal, containers - , deepseq, directory, filepath, ghc, ghc-boot, ghc-paths - , haddock-library, hspec, hspec-discover, QuickCheck, transformers - , xhtml + "haddock-api_2_23_1" = callPackage + ({ mkDerivation, array, base, bytestring, containers, deepseq + , directory, filepath, ghc, ghc-boot, ghc-paths, haddock-library + , hspec, hspec-discover, QuickCheck, transformers, xhtml }: mkDerivation { pname = "haddock-api"; - version = "2.22.0"; - sha256 = "149q4zlf4m7wcrr4af2n2flh0jxjsypshbc229vsj1m0kmz4z014"; + version = "2.23.1"; + sha256 = "14dl17ajlr8354rmc49w4fsqxmrn0dl7wps3r4iipms5nhj5bm3d"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - array base bytestring Cabal containers deepseq directory filepath - ghc ghc-boot ghc-paths haddock-library transformers xhtml + array base bytestring containers deepseq directory filepath ghc + ghc-boot ghc-paths haddock-library transformers xhtml ]; testHaskellDepends = [ - array base bytestring Cabal containers deepseq directory filepath - ghc ghc-boot ghc-paths haddock-library hspec QuickCheck - transformers xhtml + array base bytestring containers deepseq directory filepath ghc + ghc-boot ghc-paths haddock-library hspec QuickCheck transformers + xhtml ]; testToolDepends = [ hspec-discover ]; description = "A documentation-generation tool for Haskell libraries"; @@ -109913,8 +110167,8 @@ self: { ({ mkDerivation, base, containers, random }: mkDerivation { pname = "hanabi-dealer"; - version = "0.8.0.0"; - sha256 = "0rlp5s8pgn9m7yblqpnjh2z7sy88m5zh7makjfvnxlrcl0bx0c52"; + version = "0.9.0.0"; + sha256 = "0bh2j0iz55g633lgm9zzlgq6419p0aabcpbhq1p7gj1bf7s2l1wm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers random ]; @@ -115153,37 +115407,35 @@ self: { , containers, data-default, deepseq, filepath, hashable , haskoin-core, haskoin-node, hedis, hspec, hspec-discover , http-types, monad-logger, mtl, network, nqe, optparse-applicative - , QuickCheck, random, resourcet, rocksdb-haskell, rocksdb-query - , scotty, string-conversions, text, time, transformers, unliftio + , QuickCheck, random, rocksdb-haskell, rocksdb-query, scotty + , string-conversions, text, time, transformers, unliftio , unordered-containers, wai, warp }: mkDerivation { pname = "haskoin-store"; - version = "0.21.2"; - sha256 = "0316bipi2y9ylac4yw1sm9xn8zid0cjr620qmhlk4cy4qhbgqfrz"; + version = "0.22.2"; + sha256 = "0h073f67rhp4w78lnn7vgg0v2i5p6cv1af16b80g3a55bd6mwkla"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring cereal conduit containers data-default deepseq hashable haskoin-core haskoin-node hedis http-types - monad-logger mtl network nqe QuickCheck random resourcet - rocksdb-haskell rocksdb-query scotty string-conversions text time - transformers unliftio unordered-containers wai warp + monad-logger mtl network nqe random rocksdb-haskell rocksdb-query + scotty string-conversions text time transformers unliftio + unordered-containers wai warp ]; executableHaskellDepends = [ aeson base bytestring cereal conduit containers data-default - deepseq filepath hashable haskoin-core haskoin-node hedis - http-types monad-logger mtl network nqe optparse-applicative - QuickCheck random resourcet rocksdb-haskell rocksdb-query scotty - string-conversions text time transformers unliftio - unordered-containers wai warp + deepseq filepath hashable haskoin-core monad-logger mtl nqe + optparse-applicative random string-conversions text time + transformers unliftio unordered-containers ]; testHaskellDepends = [ aeson base bytestring cereal conduit containers data-default deepseq hashable haskoin-core haskoin-node hedis hspec http-types - monad-logger mtl network nqe QuickCheck random resourcet - rocksdb-haskell rocksdb-query scotty string-conversions text time - transformers unliftio unordered-containers wai warp + monad-logger mtl network nqe QuickCheck random rocksdb-haskell + rocksdb-query scotty string-conversions text time transformers + unliftio unordered-containers wai warp ]; testToolDepends = [ hspec-discover ]; description = "Storage and index for Bitcoin and Bitcoin Cash"; @@ -117208,7 +117460,7 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) blas; inherit (pkgs) liblapack;}; + }) {inherit (pkgs) blas; liblapack = null;}; "hblock" = callPackage ({ mkDerivation, aeson, base, blaze-markup, bytestring, cereal @@ -121063,32 +121315,33 @@ self: { "hid-examples" = callPackage ({ mkDerivation, aeson, base, blaze-html, bytestring, cassava - , Chart, Chart-diagrams, data-default, directory, doctest, extra - , filepath, fmt, hedgehog, hint, http-client, mtl - , optparse-applicative, random, req, safe, safe-exceptions, split - , system-locale, tasty, tasty-golden, tasty-hedgehog, tasty-hspec - , text, time, transformers, unix-compat + , Chart, Chart-diagrams, containers, criterion, deepseq, directory + , doctest, extra, filepath, fingertree, fmt, hedgehog, hint + , http-client, mtl, optparse-applicative, random, req, safe + , safe-exceptions, split, tasty, tasty-golden, tasty-hedgehog + , tasty-hspec, text, time, transformers, unix-compat }: mkDerivation { pname = "hid-examples"; - version = "0.4"; - sha256 = "11r2ln131axkw31afki3jnrz1md668z0qnvx915qwyppga62rk8l"; + version = "0.5"; + sha256 = "1hs0cpls8x89dvv0ws1swagz92vrfcn84nw7jdaidc850168dygx"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base hedgehog safe safe-exceptions split + base fingertree hedgehog safe safe-exceptions split ]; executableHaskellDepends = [ aeson base blaze-html bytestring cassava Chart Chart-diagrams - data-default directory extra filepath fmt hedgehog hint http-client - mtl optparse-applicative random req safe safe-exceptions - system-locale text time transformers unix-compat + containers directory extra filepath fmt hedgehog hint http-client + mtl optparse-applicative random req safe safe-exceptions text time + transformers unix-compat ]; testHaskellDepends = [ base doctest filepath hedgehog tasty tasty-golden tasty-hedgehog tasty-hspec ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; doHaddock = false; description = "Examples to accompany the book \"Haskell in Depth\""; license = stdenv.lib.licenses.bsd3; @@ -123562,7 +123815,7 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) liblapack;}; + }) {liblapack = null;}; "hmatrix-csv" = callPackage ({ mkDerivation, base, bytestring, cassava, hmatrix, vector }: @@ -123651,7 +123904,7 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) blas; inherit (pkgs) liblapack;}; + }) {inherit (pkgs) blas; liblapack = null;}; "hmatrix-nipals" = callPackage ({ mkDerivation, base, hmatrix }: @@ -129245,22 +129498,6 @@ self: { }) {}; "hsebaysdk" = callPackage - ({ mkDerivation, aeson, base, bytestring, http-client, http-types - , text, time, transformers, unordered-containers - }: - mkDerivation { - pname = "hsebaysdk"; - version = "0.4.0.0"; - sha256 = "00c9vwlmx4i2a436ajznv1bwaqj5lgq05gpc928vn59v27gx0f07"; - libraryHaskellDepends = [ - aeson base bytestring http-client http-types text time transformers - unordered-containers - ]; - description = "Haskell eBay SDK"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hsebaysdk_0_4_1_0" = callPackage ({ mkDerivation, aeson, base, bytestring, http-client , http-client-tls, http-types, text, time, transformers , unordered-containers @@ -129275,7 +129512,6 @@ self: { ]; description = "Haskell eBay SDK"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hsemail" = callPackage @@ -129527,8 +129763,7 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) blas; inherit (pkgs) gsl; - inherit (pkgs) liblapack;}; + }) {inherit (pkgs) blas; inherit (pkgs) gsl; liblapack = null;}; "hsilop" = callPackage ({ mkDerivation, base, directory, filepath, haskeline, xdg-basedir @@ -134372,19 +134607,23 @@ self: { }) {}; "hurl" = callPackage - ({ mkDerivation, base, base64-bytestring, bytestring, containers - , directory, filepath, http-client, http-client-tls, http-types - , network-uri, process, text, xml-conduit, zlib + ({ mkDerivation, async, base, base64-bytestring, bytestring + , connection, containers, directory, filepath, http-client + , http-client-tls, http-types, network-uri, process, text + , xml-conduit, zlib }: mkDerivation { pname = "hurl"; - version = "1.3.0.0"; - sha256 = "1fb70wsqpy5jq5w8vrd0qszrpg670mfh25kw4ldapiw652az7w69"; + version = "1.4.1.0"; + sha256 = "1n7688m5n5f62h59jjh2w5aa4ir87ni3x9wqnkc902crsqrgj2js"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base base64-bytestring bytestring containers directory filepath - http-client http-client-tls http-types network-uri process text - xml-conduit zlib + async base base64-bytestring bytestring connection containers + directory filepath http-client http-client-tls http-types + network-uri process text xml-conduit zlib ]; + executableHaskellDepends = [ base directory network-uri ]; description = "Haskell URL resolver"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; @@ -134632,33 +134871,6 @@ self: { }) {}; "hw-balancedparens" = callPackage - ({ mkDerivation, base, criterion, deepseq, doctest - , doctest-discover, hedgehog, hspec, hspec-discover, hw-bits - , hw-excess, hw-fingertree, hw-hspec-hedgehog, hw-prim - , hw-rankselect-base, transformers, vector - }: - mkDerivation { - pname = "hw-balancedparens"; - version = "0.3.0.5"; - sha256 = "0mc1qxng09891rpdw8g6cbx61b7pvvd7v4jm3ngzi5byamm0sbxp"; - libraryHaskellDepends = [ - base deepseq hedgehog hspec hw-bits hw-excess hw-fingertree hw-prim - hw-rankselect-base vector - ]; - testHaskellDepends = [ - base doctest doctest-discover hedgehog hspec hw-bits - hw-hspec-hedgehog hw-prim hw-rankselect-base transformers vector - ]; - testToolDepends = [ doctest-discover hspec-discover ]; - benchmarkHaskellDepends = [ - base criterion hedgehog hw-bits hw-prim vector - ]; - doHaddock = false; - description = "Balanced parentheses"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-balancedparens_0_3_1_0" = callPackage ({ mkDerivation, base, criterion, deepseq, doctest , doctest-discover, hedgehog, hspec, hspec-discover, hw-bits , hw-excess, hw-fingertree, hw-hspec-hedgehog, hw-prim @@ -134683,33 +134895,9 @@ self: { doHaddock = false; description = "Balanced parentheses"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-bits" = callPackage - ({ mkDerivation, base, bitvec, bytestring, criterion, deepseq - , doctest, doctest-discover, hedgehog, hspec, hspec-discover - , hw-hspec-hedgehog, hw-int, hw-prim, hw-string-parse, vector - }: - mkDerivation { - pname = "hw-bits"; - version = "0.7.1.5"; - sha256 = "0gvbsnirlgsj58363zqg960j0ydx2bhgw4lwql71jf9kg7hd4kqb"; - libraryHaskellDepends = [ - base bitvec bytestring deepseq hw-int hw-prim hw-string-parse - vector - ]; - testHaskellDepends = [ - base bitvec bytestring doctest doctest-discover hedgehog hspec - hw-hspec-hedgehog hw-prim vector - ]; - testToolDepends = [ doctest-discover hspec-discover ]; - benchmarkHaskellDepends = [ base criterion vector ]; - description = "Bit manipulation"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-bits_0_7_2_0" = callPackage ({ mkDerivation, base, bitvec, bytestring, criterion, deepseq , doctest, doctest-discover, hedgehog, hspec, hspec-discover , hw-hspec-hedgehog, hw-int, hw-prim, hw-string-parse, vector @@ -134730,7 +134918,6 @@ self: { benchmarkHaskellDepends = [ base criterion vector ]; description = "Bit manipulation"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-ci-assist" = callPackage @@ -134757,28 +134944,6 @@ self: { }) {}; "hw-conduit" = callPackage - ({ mkDerivation, array, base, bytestring, conduit - , conduit-combinators, criterion, hspec, hspec-discover, mmap, time - , transformers, unliftio-core, vector, word8 - }: - mkDerivation { - pname = "hw-conduit"; - version = "0.2.0.6"; - sha256 = "0z90nslvvd5lkzkivklln3kbpgpwn4l6b45bdn7nhn9qa50ii1rc"; - libraryHaskellDepends = [ - array base bytestring conduit conduit-combinators time transformers - unliftio-core word8 - ]; - testHaskellDepends = [ base bytestring conduit hspec ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - base bytestring conduit criterion mmap vector - ]; - description = "Conduits for tokenizing streams"; - license = stdenv.lib.licenses.mit; - }) {}; - - "hw-conduit_0_2_1_0" = callPackage ({ mkDerivation, array, base, bytestring, conduit , conduit-combinators, criterion, doctest, doctest-discover, hspec , hspec-discover, mmap, time, transformers, unliftio-core, vector @@ -134801,28 +134966,9 @@ self: { ]; description = "Conduits for tokenizing streams"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-conduit-merges" = callPackage - ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec - , mtl, QuickCheck - }: - mkDerivation { - pname = "hw-conduit-merges"; - version = "0.2.0.0"; - sha256 = "1302b2dsvv8yazvq5vz9cs2fbqvdsh6zyprijb41g881riqa5klv"; - revision = "1"; - editedCabalFile = "1azji7zc0ygqjgd2shbqw7p8a2ll2qp3b1yq5i3665448brlwpvc"; - libraryHaskellDepends = [ base conduit conduit-extra mtl ]; - testHaskellDepends = [ - base bytestring conduit conduit-extra hspec mtl QuickCheck - ]; - description = "Additional merges and joins for Conduit"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-conduit-merges_0_2_1_0" = callPackage ({ mkDerivation, base, bytestring, conduit, conduit-extra, hspec , hspec-discover, mtl, QuickCheck }: @@ -134837,21 +134983,9 @@ self: { testToolDepends = [ hspec-discover ]; description = "Additional merges and joins for Conduit"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-diagnostics" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "hw-diagnostics"; - version = "0.0.0.7"; - sha256 = "1wfmrdpkvk2p045xchvwhnd1glq527ksgg0bs2qg5r0nyhsg55zi"; - libraryHaskellDepends = [ base ]; - description = "Diagnostics library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-diagnostics_0_0_1_0" = callPackage ({ mkDerivation, base, doctest, doctest-discover }: mkDerivation { pname = "hw-diagnostics"; @@ -134862,50 +134996,9 @@ self: { testToolDepends = [ doctest-discover ]; description = "Diagnostics library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-dsv" = callPackage - ({ mkDerivation, appar, base, bits-extra, bytestring, cassava - , criterion, deepseq, directory, doctest, doctest-discover - , generic-lens, ghc-prim, hedgehog, hspec, hspec-discover, hw-bits - , hw-hspec-hedgehog, hw-ip, hw-prim, hw-rankselect - , hw-rankselect-base, hw-simd, lens, mmap, optparse-applicative - , resourcet, text, vector, weigh - }: - mkDerivation { - pname = "hw-dsv"; - version = "0.4.0"; - sha256 = "1cpjfq3z4q5wmnlaskrzxhyybb07andc7gli7vv7njm9552bwyvf"; - revision = "2"; - editedCabalFile = "167zvbxwjmb25xmhcdhrshk03b98kh5ldrf2b6a4v8xlkj4p33qm"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bits-extra bytestring deepseq ghc-prim hw-bits hw-prim - hw-rankselect hw-rankselect-base hw-simd vector - ]; - executableHaskellDepends = [ - appar base bits-extra bytestring deepseq generic-lens ghc-prim - hedgehog hw-bits hw-ip hw-prim hw-rankselect hw-rankselect-base - hw-simd lens optparse-applicative resourcet text vector - ]; - testHaskellDepends = [ - base bits-extra bytestring cassava deepseq directory doctest - doctest-discover ghc-prim hedgehog hspec hw-bits hw-hspec-hedgehog - hw-prim hw-rankselect hw-rankselect-base hw-simd text vector weigh - ]; - testToolDepends = [ doctest-discover hspec-discover ]; - benchmarkHaskellDepends = [ - base bits-extra bytestring cassava criterion deepseq directory - ghc-prim hw-bits hw-prim hw-rankselect hw-rankselect-base hw-simd - mmap vector - ]; - description = "Unbelievably fast streaming DSV file parser"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-dsv_0_4_1_0" = callPackage ({ mkDerivation, appar, base, bits-extra, bytestring, cassava , criterion, deepseq, directory, doctest, doctest-discover , generic-lens, ghc-prim, hedgehog, hspec, hspec-discover, hw-bits @@ -134942,7 +135035,6 @@ self: { ]; description = "Unbelievably fast streaming DSV file parser"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-dump" = callPackage @@ -134977,43 +135069,6 @@ self: { }) {}; "hw-eliasfano" = callPackage - ({ mkDerivation, base, binary, bytestring, criterion, deepseq - , generic-lens, hedgehog, hspec, hspec-discover, hw-bits - , hw-hedgehog, hw-hspec-hedgehog, hw-int, hw-packed-vector, hw-prim - , hw-rankselect, hw-rankselect-base, lens, mmap - , optparse-applicative, resourcet, temporary-resourcet, vector - }: - mkDerivation { - pname = "hw-eliasfano"; - version = "0.1.1.1"; - sha256 = "0fmbcddw13m49xvw8gnpjh246mw4k9h3hr94k956bi1vdvywyqv7"; - revision = "1"; - editedCabalFile = "1i5in5h9jnx4p873qv80jmdd1ak6yyyf70002j3lhxyaxx9byy7k"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base deepseq hw-bits hw-int hw-packed-vector hw-prim hw-rankselect - hw-rankselect-base temporary-resourcet vector - ]; - executableHaskellDepends = [ - base binary bytestring generic-lens hw-bits hw-packed-vector - hw-prim hw-rankselect hw-rankselect-base lens optparse-applicative - resourcet temporary-resourcet vector - ]; - testHaskellDepends = [ - base hedgehog hspec hw-bits hw-hedgehog hw-hspec-hedgehog hw-int - hw-packed-vector hw-prim hw-rankselect hw-rankselect-base vector - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - base bytestring criterion hedgehog hspec hw-bits hw-hedgehog - hw-hspec-hedgehog hw-int hw-packed-vector hw-prim mmap vector - ]; - description = "Elias-Fano"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-eliasfano_0_1_2_0" = callPackage ({ mkDerivation, base, binary, bytestring, criterion, deepseq , doctest, doctest-discover, generic-lens, hedgehog, hspec , hspec-discover, hw-bits, hw-hedgehog, hw-hspec-hedgehog, hw-int @@ -135048,37 +135103,9 @@ self: { ]; description = "Elias-Fano"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-excess" = callPackage - ({ mkDerivation, base, bytestring, criterion, doctest - , doctest-discover, hedgehog, hspec, hspec-discover, hw-bits - , hw-hspec-hedgehog, hw-prim, hw-rankselect-base, QuickCheck, safe - , vector - }: - mkDerivation { - pname = "hw-excess"; - version = "0.2.2.3"; - sha256 = "1rlw53nbhjdvjqb1f0kacnmiiwhx04az6p4mf0iv5fwxcjh94q2r"; - revision = "1"; - editedCabalFile = "1bll4amizah25w4c6xplndig77hd6jh65q6zjyr5x4vr11vg6xbx"; - libraryHaskellDepends = [ - base hw-bits hw-prim hw-rankselect-base safe vector - ]; - testHaskellDepends = [ - base doctest doctest-discover hedgehog hspec hw-bits - hw-hspec-hedgehog hw-prim QuickCheck vector - ]; - testToolDepends = [ doctest-discover hspec-discover ]; - benchmarkHaskellDepends = [ - base bytestring criterion hw-prim vector - ]; - description = "Excess"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-excess_0_2_3_0" = callPackage ({ mkDerivation, base, bytestring, criterion, doctest , doctest-discover, hedgehog, hspec, hspec-discover, hw-bits , hw-hspec-hedgehog, hw-prim, hw-rankselect-base, QuickCheck, safe @@ -135101,27 +135128,9 @@ self: { ]; description = "Excess"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-fingertree" = callPackage - ({ mkDerivation, base, deepseq, hedgehog, hspec, hspec-discover - , hw-hspec-hedgehog, hw-prim - }: - mkDerivation { - pname = "hw-fingertree"; - version = "0.1.1.1"; - sha256 = "01ghnnnbbrdy9s84rcw37v3yvlrw5awgdmcrzh0xd5dxpw557psf"; - libraryHaskellDepends = [ base deepseq hw-prim ]; - testHaskellDepends = [ - base deepseq hedgehog hspec hw-hspec-hedgehog - ]; - testToolDepends = [ hspec-discover ]; - description = "Generic finger-tree structure, with example instances"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-fingertree_0_1_2_0" = callPackage ({ mkDerivation, base, deepseq, doctest, doctest-discover, hedgehog , hspec, hspec-discover, hw-hspec-hedgehog, hw-prim }: @@ -135137,31 +135146,9 @@ self: { testToolDepends = [ doctest-discover hspec-discover ]; description = "Generic finger-tree structure, with example instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-fingertree-strict" = callPackage - ({ mkDerivation, base, deepseq, hedgehog, hspec, hspec-discover - , HUnit, hw-hspec-hedgehog, QuickCheck, test-framework - , test-framework-hunit, test-framework-quickcheck2 - }: - mkDerivation { - pname = "hw-fingertree-strict"; - version = "0.1.1.3"; - sha256 = "1fy492nl10a7p9a0b0jrqj1yiar8wir2g3qms2mmd814brbfkm80"; - revision = "1"; - editedCabalFile = "1s7fcimgyf0vskkkms371icazjkkmscv9bkz2ysdhx708bza96v5"; - libraryHaskellDepends = [ base deepseq ]; - testHaskellDepends = [ - base hedgehog hspec HUnit hw-hspec-hedgehog QuickCheck - test-framework test-framework-hunit test-framework-quickcheck2 - ]; - testToolDepends = [ hspec-discover ]; - description = "Generic strict finger-tree structure"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-fingertree-strict_0_1_2_0" = callPackage ({ mkDerivation, base, deepseq, doctest, doctest-discover, hedgehog , hspec, hspec-discover, HUnit, hw-hspec-hedgehog, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -135179,22 +135166,9 @@ self: { testToolDepends = [ doctest-discover hspec-discover ]; description = "Generic strict finger-tree structure"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-hedgehog" = callPackage - ({ mkDerivation, base, hedgehog, vector }: - mkDerivation { - pname = "hw-hedgehog"; - version = "0.1.0.5"; - sha256 = "1wnfgmybccznrm2i6rrkg87mwxqng9y115wsbf4r40y6pica7kbi"; - libraryHaskellDepends = [ base hedgehog vector ]; - testHaskellDepends = [ base ]; - description = "Extra hedgehog functionality"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-hedgehog_0_1_1_0" = callPackage ({ mkDerivation, base, doctest, doctest-discover, hedgehog, vector }: mkDerivation { @@ -135206,27 +135180,9 @@ self: { testToolDepends = [ doctest-discover ]; description = "Extra hedgehog functionality"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-hspec-hedgehog" = callPackage - ({ mkDerivation, base, call-stack, hedgehog, hspec, hspec-discover - , HUnit, transformers - }: - mkDerivation { - pname = "hw-hspec-hedgehog"; - version = "0.1.0.9"; - sha256 = "1rfcz7fq7gp8xxlax8l1vfr88h9sh50ghs1iihy9jqv135d1dbky"; - libraryHaskellDepends = [ - base call-stack hedgehog hspec HUnit transformers - ]; - testHaskellDepends = [ base call-stack hedgehog hspec HUnit ]; - testToolDepends = [ hspec-discover ]; - description = "Interoperability between hspec and hedgehog"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-hspec-hedgehog_0_1_1_0" = callPackage ({ mkDerivation, base, call-stack, doctest, doctest-discover , hedgehog, hspec, hspec-discover, HUnit, transformers }: @@ -135243,27 +135199,9 @@ self: { testToolDepends = [ doctest-discover hspec-discover ]; description = "Interoperability between hspec and hedgehog"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-int" = callPackage - ({ mkDerivation, base, hedgehog, hspec, hspec-discover, hw-hedgehog - , hw-hspec-hedgehog - }: - mkDerivation { - pname = "hw-int"; - version = "0.0.0.4"; - sha256 = "0im0fk23v6gh6hwfr35swai5fnvkpw0rrssc3s0ac978c899a8iz"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base hedgehog hspec hw-hedgehog hw-hspec-hedgehog - ]; - testToolDepends = [ hspec-discover ]; - description = "Additional facilities for Integers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-int_0_0_1_0" = callPackage ({ mkDerivation, base, doctest, doctest-discover, hedgehog, hspec , hspec-discover, hw-hedgehog, hw-hspec-hedgehog }: @@ -135279,41 +135217,9 @@ self: { testToolDepends = [ doctest-discover hspec-discover ]; description = "Additional facilities for Integers"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-ip" = callPackage - ({ mkDerivation, appar, base, binary, bytestring, containers - , doctest, doctest-discover, generic-lens, hedgehog, hspec - , hspec-discover, hw-bits, hw-hspec-hedgehog, iproute, lens - , optparse-applicative, text - }: - mkDerivation { - pname = "hw-ip"; - version = "2.4.1.0"; - sha256 = "1zjl078xzing927fwwpck36ib8z5aggpi7g0z5gnhxd8isgqs6zh"; - revision = "1"; - editedCabalFile = "1dg3aa6wavdr3vh7va3yx3j272pb4zw48rm7r5a6xv6xrrd01a33"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - appar base containers generic-lens hedgehog hw-bits iproute text - ]; - executableHaskellDepends = [ - appar base binary bytestring generic-lens lens optparse-applicative - text - ]; - testHaskellDepends = [ - appar base doctest doctest-discover generic-lens hedgehog hspec - hw-bits hw-hspec-hedgehog text - ]; - testToolDepends = [ doctest-discover hspec-discover ]; - doHaddock = false; - description = "Library for manipulating IP addresses and CIDR blocks"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-ip_2_4_2_0" = callPackage ({ mkDerivation, appar, base, binary, bytestring, containers , doctest, doctest-discover, generic-lens, hedgehog, hspec , hspec-discover, hw-bits, hw-hspec-hedgehog, iproute, lens @@ -135340,52 +135246,9 @@ self: { doHaddock = false; description = "Library for manipulating IP addresses and CIDR blocks"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-json" = callPackage - ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base - , bits-extra, bytestring, criterion, directory, dlist, generic-lens - , hedgehog, hspec, hspec-discover, hw-balancedparens, hw-bits - , hw-hspec-hedgehog, hw-json-simd, hw-json-simple-cursor - , hw-json-standard-cursor, hw-mquery, hw-parser, hw-prim - , hw-rankselect, hw-rankselect-base, hw-simd, lens, mmap - , optparse-applicative, scientific, text, transformers, vector - , word8 - }: - mkDerivation { - pname = "hw-json"; - version = "1.3.1.1"; - sha256 = "0w0k8zkswpvawp3ni3av8ak18a8wj509dll0v3cq7i4lljv51b5l"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson ansi-wl-pprint attoparsec base bits-extra bytestring dlist - hw-balancedparens hw-bits hw-json-simple-cursor - hw-json-standard-cursor hw-mquery hw-parser hw-prim hw-rankselect - hw-rankselect-base hw-simd mmap text vector word8 - ]; - executableHaskellDepends = [ - base bytestring dlist generic-lens hw-balancedparens hw-json-simd - hw-json-simple-cursor hw-json-standard-cursor hw-mquery hw-prim - hw-rankselect hw-rankselect-base lens mmap optparse-applicative - text vector - ]; - testHaskellDepends = [ - aeson attoparsec base bytestring hedgehog hspec hw-balancedparens - hw-bits hw-hspec-hedgehog hw-json-simple-cursor - hw-json-standard-cursor hw-prim hw-rankselect hw-rankselect-base - scientific text transformers vector - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - base bytestring criterion directory hw-json-standard-cursor mmap - ]; - description = "Memory efficient JSON parser"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-json_1_3_2_0" = callPackage ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base , bits-extra, bytestring, criterion, directory, dlist, doctest , doctest-discover, generic-lens, hedgehog, hspec, hspec-discover @@ -135425,7 +135288,6 @@ self: { ]; description = "Memory efficient JSON parser"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-json-lens" = callPackage @@ -135456,26 +135318,6 @@ self: { }) {}; "hw-json-simd" = callPackage - ({ mkDerivation, base, bytestring, c2hs, hw-prim, lens - , optparse-applicative, vector - }: - mkDerivation { - pname = "hw-json-simd"; - version = "0.1.0.4"; - sha256 = "1qpk7vzya28y56qlb2fmx3ic39n9x2z8dh932rn0fp2d8n4dw8sa"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base bytestring hw-prim lens vector ]; - libraryToolDepends = [ c2hs ]; - executableHaskellDepends = [ - base bytestring hw-prim lens optparse-applicative vector - ]; - testHaskellDepends = [ base bytestring hw-prim lens vector ]; - description = "SIMD-based JSON semi-indexer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-json-simd_0_1_1_0" = callPackage ({ mkDerivation, base, bytestring, c2hs, doctest, doctest-discover , hw-prim, lens, optparse-applicative, transformers, vector }: @@ -135497,44 +135339,9 @@ self: { testToolDepends = [ doctest-discover ]; description = "SIMD-based JSON semi-indexer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-json-simple-cursor" = callPackage - ({ mkDerivation, base, bytestring, criterion, directory - , generic-lens, hedgehog, hspec, hspec-discover, hw-balancedparens - , hw-bits, hw-hspec-hedgehog, hw-json-simd, hw-prim, hw-rankselect - , hw-rankselect-base, lens, mmap, optparse-applicative, text - , vector, word8 - }: - mkDerivation { - pname = "hw-json-simple-cursor"; - version = "0.1.0.2"; - sha256 = "1yknymn8flni5bkfifaxmkv6b6r530ljvm6vx9m3kqwzikly9lpn"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring hw-balancedparens hw-bits hw-prim hw-rankselect - hw-rankselect-base vector word8 - ]; - executableHaskellDepends = [ - base bytestring generic-lens hw-balancedparens hw-json-simd hw-prim - hw-rankselect hw-rankselect-base lens mmap optparse-applicative - text vector - ]; - testHaskellDepends = [ - base bytestring hedgehog hspec hw-balancedparens hw-bits - hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base vector - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - base bytestring criterion directory mmap - ]; - description = "Memory efficient JSON parser"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-json-simple-cursor_0_1_1_0" = callPackage ({ mkDerivation, base, bytestring, criterion, directory, doctest , doctest-discover, generic-lens, hedgehog, hspec, hspec-discover , hw-balancedparens, hw-bits, hw-hspec-hedgehog, hw-json-simd @@ -135567,47 +135374,9 @@ self: { ]; description = "Memory efficient JSON parser"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-json-standard-cursor" = callPackage - ({ mkDerivation, array, base, bits-extra, bytestring, criterion - , directory, doctest, doctest-discover, generic-lens, hedgehog - , hspec, hspec-discover, hw-balancedparens, hw-bits - , hw-hspec-hedgehog, hw-json-simd, hw-prim, hw-rankselect - , hw-rankselect-base, lens, mmap, optparse-applicative, text - , vector, word8 - }: - mkDerivation { - pname = "hw-json-standard-cursor"; - version = "0.2.1.3"; - sha256 = "1809nrw3wlbsysq3dxq9igg2yi3qafkv34jx3vn7qq5rw541qlxv"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base bits-extra bytestring hw-balancedparens hw-bits - hw-json-simd hw-prim hw-rankselect hw-rankselect-base mmap vector - word8 - ]; - executableHaskellDepends = [ - base bytestring generic-lens hw-balancedparens hw-json-simd hw-prim - hw-rankselect hw-rankselect-base lens mmap optparse-applicative - text vector - ]; - testHaskellDepends = [ - base bits-extra bytestring doctest doctest-discover hedgehog hspec - hw-balancedparens hw-bits hw-hspec-hedgehog hw-prim hw-rankselect - hw-rankselect-base vector - ]; - testToolDepends = [ doctest-discover hspec-discover ]; - benchmarkHaskellDepends = [ - base bytestring criterion directory mmap - ]; - description = "Memory efficient JSON parser"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-json-standard-cursor_0_2_2_0" = callPackage ({ mkDerivation, array, base, bits-extra, bytestring, criterion , directory, doctest, doctest-discover, generic-lens, hedgehog , hspec, hspec-discover, hw-balancedparens, hw-bits @@ -135642,7 +135411,6 @@ self: { ]; description = "Memory efficient JSON parser"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-kafka-avro" = callPackage @@ -135722,28 +135490,6 @@ self: { }) {}; "hw-mquery" = callPackage - ({ mkDerivation, ansi-wl-pprint, base, dlist, hedgehog, hspec - , hspec-discover, hw-hspec-hedgehog, lens, semigroups - }: - mkDerivation { - pname = "hw-mquery"; - version = "0.2.0.2"; - sha256 = "1vcxyin3cyc0pkhbfjyjm4r44yxk17gny5jhfg6hdlgivp150yij"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-wl-pprint base dlist lens semigroups - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - base dlist hedgehog hspec hw-hspec-hedgehog lens - ]; - testToolDepends = [ hspec-discover ]; - description = "Monadic query DSL"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-mquery_0_2_1_0" = callPackage ({ mkDerivation, ansi-wl-pprint, base, dlist, doctest , doctest-discover, hedgehog, hspec, hspec-discover , hw-hspec-hedgehog, lens @@ -135763,41 +135509,9 @@ self: { testToolDepends = [ doctest-discover hspec-discover ]; description = "Monadic query DSL"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-packed-vector" = callPackage - ({ mkDerivation, base, binary, bytestring, criterion, deepseq - , directory, generic-lens, hedgehog, hspec, hspec-discover, hw-bits - , hw-hedgehog, hw-hspec-hedgehog, hw-prim, lens - , optparse-applicative, vector - }: - mkDerivation { - pname = "hw-packed-vector"; - version = "0.2.0.1"; - sha256 = "12181b9fp11cdgf6xngjla9012j8rag3zcssz70x5a7xxgnwfmfc"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base bytestring deepseq hw-bits hw-prim vector - ]; - executableHaskellDepends = [ - base binary bytestring generic-lens hw-bits hw-prim lens - optparse-applicative vector - ]; - testHaskellDepends = [ - base bytestring hedgehog hspec hw-bits hw-hedgehog - hw-hspec-hedgehog hw-prim vector - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - base criterion directory hedgehog hspec hw-prim vector - ]; - description = "Packed Vector"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-packed-vector_0_2_1_0" = callPackage ({ mkDerivation, base, binary, bytestring, criterion, deepseq , directory, doctest, doctest-discover, generic-lens, hedgehog , hspec, hspec-discover, hw-bits, hw-hedgehog, hw-hspec-hedgehog @@ -135826,27 +135540,9 @@ self: { ]; description = "Packed Vector"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-parser" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, hedgehog, hspec - , hspec-discover, hw-hspec-hedgehog, hw-prim, text - }: - mkDerivation { - pname = "hw-parser"; - version = "0.1.0.2"; - sha256 = "170dk943s2jbqqggxxfjxj23fbfk1532hgsrg63mr0v1ag9hlz1i"; - libraryHaskellDepends = [ - attoparsec base bytestring hw-prim text - ]; - testHaskellDepends = [ base hedgehog hspec hw-hspec-hedgehog ]; - testToolDepends = [ hspec-discover ]; - description = "Simple parser support"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-parser_0_1_1_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, doctest , doctest-discover, hedgehog, hspec, hspec-discover , hw-hspec-hedgehog, hw-prim, text @@ -135864,39 +135560,9 @@ self: { testToolDepends = [ doctest-discover hspec-discover ]; description = "Simple parser support"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-prim" = callPackage - ({ mkDerivation, base, bytestring, criterion, deepseq, directory - , doctest, doctest-discover, exceptions, ghc-prim, hedgehog, hspec - , hspec-discover, hw-hspec-hedgehog, mmap, QuickCheck, semigroups - , transformers, unliftio-core, vector - }: - mkDerivation { - pname = "hw-prim"; - version = "0.6.2.40"; - sha256 = "0vm5mcnlb5yas2z7rvzd1kzv39d3qw4bkrkfmv0i7vsdg33yb3fd"; - revision = "3"; - editedCabalFile = "14a8a1rfczi196nka364w6prjx1zddwf1iq265w5qcl0d1jmj679"; - libraryHaskellDepends = [ - base bytestring deepseq ghc-prim mmap semigroups transformers - unliftio-core vector - ]; - testHaskellDepends = [ - base bytestring directory doctest doctest-discover exceptions - hedgehog hspec hw-hspec-hedgehog mmap QuickCheck semigroups - transformers vector - ]; - testToolDepends = [ doctest-discover hspec-discover ]; - benchmarkHaskellDepends = [ - base bytestring criterion mmap semigroups transformers vector - ]; - description = "Primitive functions and data types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-prim_0_6_3_0" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, directory , doctest, doctest-discover, exceptions, ghc-prim, hedgehog, hspec , hspec-discover, hw-hspec-hedgehog, mmap, QuickCheck, transformers @@ -135921,7 +135587,6 @@ self: { ]; description = "Primitive functions and data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-prim-bits" = callPackage @@ -135945,45 +135610,6 @@ self: { }) {}; "hw-rankselect" = callPackage - ({ mkDerivation, base, bytestring, conduit, criterion, deepseq - , directory, doctest, doctest-discover, generic-lens, hedgehog - , hspec, hspec-discover, hw-balancedparens, hw-bits, hw-fingertree - , hw-hedgehog, hw-hspec-hedgehog, hw-prim, hw-rankselect-base, lens - , mmap, mtl, optparse-applicative, QuickCheck, resourcet - , transformers, vector - }: - mkDerivation { - pname = "hw-rankselect"; - version = "0.13.3.2"; - sha256 = "1p4b5nm8mgxlc7p5gcwh6dy85xgydpbw999zv27755dbfcv9nk4v"; - revision = "2"; - editedCabalFile = "13j391km170abxa74l5vda6aw1ad409p74yyxanizz97cjhjwdwb"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base deepseq hedgehog hspec hw-balancedparens hw-bits hw-fingertree - hw-prim hw-rankselect-base vector - ]; - executableHaskellDepends = [ - base directory generic-lens hw-bits hw-prim hw-rankselect-base lens - mmap mtl optparse-applicative vector - ]; - testHaskellDepends = [ - base directory doctest doctest-discover hedgehog hspec hw-bits - hw-hedgehog hw-hspec-hedgehog hw-prim hw-rankselect-base mmap - QuickCheck transformers vector - ]; - testToolDepends = [ doctest-discover hspec-discover ]; - benchmarkHaskellDepends = [ - base bytestring conduit criterion directory hw-bits hw-prim - hw-rankselect-base mmap resourcet vector - ]; - doHaddock = false; - description = "Rank-select"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-rankselect_0_13_4_0" = callPackage ({ mkDerivation, base, bytestring, conduit, criterion, deepseq , directory, doctest, doctest-discover, generic-lens, hedgehog , hspec, hspec-discover, hw-balancedparens, hw-bits, hw-fingertree @@ -136018,37 +135644,9 @@ self: { doHaddock = false; description = "Rank-select"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-rankselect-base" = callPackage - ({ mkDerivation, base, bits-extra, bitvec, criterion, hedgehog - , hspec, hspec-discover, hw-bits, hw-hedgehog, hw-hspec-hedgehog - , hw-int, hw-prim, hw-string-parse, QuickCheck, vector - }: - mkDerivation { - pname = "hw-rankselect-base"; - version = "0.3.3.0"; - sha256 = "17h4kmi9zcgm4sdpbmqh6rzygz7w0v95lfc6rmhc9a8bmmg30i5b"; - revision = "1"; - editedCabalFile = "03svpzjia8mbgy33lhmjhwpd6yq0n97l3fkmfnpyi3blc3yb3bd0"; - libraryHaskellDepends = [ - base bits-extra bitvec hw-bits hw-int hw-prim hw-string-parse - vector - ]; - testHaskellDepends = [ - base bits-extra bitvec hedgehog hspec hw-bits hw-hedgehog - hw-hspec-hedgehog hw-prim QuickCheck vector - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - base bits-extra criterion hw-bits hw-prim vector - ]; - description = "Rank-select base"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-rankselect-base_0_3_4_0" = callPackage ({ mkDerivation, base, bits-extra, bitvec, criterion, doctest , doctest-discover, hedgehog, hspec, hspec-discover, hw-bits , hw-hedgehog, hw-hspec-hedgehog, hw-int, hw-prim, hw-string-parse @@ -136072,40 +135670,9 @@ self: { ]; description = "Rank-select base"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-simd" = callPackage - ({ mkDerivation, base, bits-extra, bytestring, c2hs, cassava - , containers, criterion, deepseq, directory, hedgehog, hspec - , 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.5"; - sha256 = "0nhy3hi7gxbbjwh6rj4459nzbmlij2cjdg2zvdjgx3z3j5algqyb"; - libraryHaskellDepends = [ - base bits-extra bytestring deepseq hw-bits hw-prim hw-rankselect - hw-rankselect-base vector - ]; - libraryToolDepends = [ c2hs ]; - testHaskellDepends = [ - base bits-extra bytestring deepseq directory hedgehog hspec hw-bits - 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 - vector - ]; - description = "SIMD library"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-simd_0_1_2_0" = callPackage ({ mkDerivation, base, bits-extra, bytestring, c2hs, cassava , containers, criterion, deepseq, directory, doctest , doctest-discover, hedgehog, hspec, hspec-discover, hw-bits @@ -136135,40 +135702,9 @@ self: { ]; description = "SIMD library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-streams" = callPackage - ({ mkDerivation, base, bytestring, criterion, directory, exceptions - , ghc-prim, hedgehog, hspec, hspec-discover, hw-bits - , hw-hspec-hedgehog, hw-prim, mmap, primitive, QuickCheck - , semigroups, transformers, vector - }: - mkDerivation { - pname = "hw-streams"; - version = "0.0.0.12"; - sha256 = "087sn4gxhf29vg9ydx8sfq33q16cz6cmda5r63k9xdki4ba761m4"; - revision = "1"; - editedCabalFile = "1y5sw9mgkxwvgf91hl22p3q5kxy99phwfmx2lh87339w7d5bjdbw"; - libraryHaskellDepends = [ - base bytestring ghc-prim hw-bits hw-prim mmap primitive semigroups - transformers vector - ]; - testHaskellDepends = [ - base bytestring directory exceptions ghc-prim hedgehog hspec - hw-bits hw-hspec-hedgehog hw-prim mmap primitive QuickCheck - semigroups transformers vector - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - base bytestring criterion ghc-prim hw-bits hw-prim mmap primitive - semigroups transformers vector - ]; - description = "Primitive functions and data types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-streams_0_0_1_0" = callPackage ({ mkDerivation, base, bytestring, criterion, directory, doctest , doctest-discover, exceptions, ghc-prim, hedgehog, hspec , hspec-discover, hw-bits, hw-hspec-hedgehog, hw-prim, mmap @@ -136194,7 +135730,6 @@ self: { ]; description = "Primitive functions and data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hw-string-parse" = callPackage @@ -136275,46 +135810,6 @@ self: { }) {}; "hw-xml" = callPackage - ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base - , bytestring, cereal, containers, criterion, deepseq, generic-lens - , ghc-prim, hedgehog, hspec, hspec-discover, hw-balancedparens - , hw-bits, hw-hspec-hedgehog, hw-parser, hw-prim, hw-rankselect - , hw-rankselect-base, lens, mmap, mtl, optparse-applicative - , resourcet, text, transformers, vector, word8 - }: - mkDerivation { - pname = "hw-xml"; - version = "0.5.0.0"; - sha256 = "0cqrs19bd9yh67yczhhb1yf5dhcx2v6xikybd88vqwxdh51pxyyn"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - ansi-wl-pprint array attoparsec base bytestring cereal containers - deepseq ghc-prim hw-balancedparens hw-bits hw-parser hw-prim - hw-rankselect hw-rankselect-base lens mmap mtl resourcet text - transformers vector word8 - ]; - executableHaskellDepends = [ - attoparsec base bytestring deepseq generic-lens hw-balancedparens - hw-bits hw-prim hw-rankselect lens mmap mtl optparse-applicative - resourcet text vector - ]; - testHaskellDepends = [ - attoparsec base bytestring hedgehog hspec hw-balancedparens hw-bits - hw-hspec-hedgehog hw-prim hw-rankselect hw-rankselect-base text - vector - ]; - testToolDepends = [ hspec-discover ]; - benchmarkHaskellDepends = [ - base bytestring criterion hw-balancedparens hw-bits hw-prim mmap - resourcet vector - ]; - description = "XML parser based on succinct data structures"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "hw-xml_0_5_1_0" = callPackage ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base , bytestring, cereal, containers, criterion, deepseq, doctest , doctest-discover, generic-lens, ghc-prim, hedgehog, hspec @@ -136353,7 +135848,6 @@ self: { ]; description = "XML parser based on succinct data structures"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hwall-auth-iitk" = callPackage @@ -137550,8 +137044,8 @@ self: { pname = "hyraxAbif"; version = "0.2.3.21"; sha256 = "0ghhfv8gzs9sg13nj3mhqd24zbrkjj1dgsjz3sql6276kpa1p2kc"; - revision = "1"; - editedCabalFile = "0rg4wldliyaixmgcyina2cnm7l6gwpcdd2bim1q83clnfk32scar"; + revision = "2"; + editedCabalFile = "05fnq87n1rprz3mlw89g74b1arzhldn8yqj3la04g3r3m39fh2v1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -140626,28 +140120,6 @@ self: { }) {aether = null;}; "insert-ordered-containers" = callPackage - ({ mkDerivation, aeson, base, base-compat, hashable, lens - , optics-core, optics-extra, QuickCheck, semigroupoids, semigroups - , tasty, tasty-quickcheck, text, transformers, unordered-containers - }: - mkDerivation { - pname = "insert-ordered-containers"; - version = "0.2.3"; - sha256 = "1307v5w8lzxc1pmi5dvw1d2vmfs6z253xbr0nfzcgxfjmqvj60ik"; - libraryHaskellDepends = [ - aeson base base-compat hashable lens optics-core optics-extra - semigroupoids semigroups text transformers unordered-containers - ]; - testHaskellDepends = [ - aeson base base-compat hashable lens QuickCheck semigroupoids - semigroups tasty tasty-quickcheck text transformers - unordered-containers - ]; - description = "Associative containers retaining insertion order for traversals"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "insert-ordered-containers_0_2_3_1" = callPackage ({ mkDerivation, aeson, base, base-compat, hashable, lens , optics-core, optics-extra, QuickCheck, semigroupoids, semigroups , tasty, tasty-quickcheck, text, transformers, unordered-containers @@ -140667,7 +140139,6 @@ self: { ]; description = "Associative containers retaining insertion order for traversals"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "inserts" = callPackage @@ -142164,8 +141635,8 @@ self: { ({ mkDerivation, base, binary, bytestring, iproute }: mkDerivation { pname = "ip2location"; - version = "8.2.0"; - sha256 = "01ia5647y608xr5kqkxaamhaxs39k3x81wpj8aqzf24mirkalf23"; + version = "8.2.1"; + sha256 = "1ccr15yn2ska5wgwlcnfpi9w1xxkly0pwqibmdl9a1ggmwfsskv0"; libraryHaskellDepends = [ base binary bytestring iproute ]; description = "IP2Location Haskell package for IP geolocation"; license = stdenv.lib.licenses.mit; @@ -142177,8 +141648,8 @@ self: { ({ mkDerivation, base, binary, bytestring, iproute }: mkDerivation { pname = "ip2proxy"; - version = "2.2.0"; - sha256 = "12j8jd0ir24xgghvmac2npf9zqfbfq7fwj1ni2xdi8p673k3d0kd"; + version = "2.2.1"; + sha256 = "08ywvg39n59i8p66fpapcpj722lkam7pyd38525p3w4z735d8842"; libraryHaskellDepends = [ base binary bytestring iproute ]; description = "IP2Proxy Haskell package for proxy detection"; license = stdenv.lib.licenses.mit; @@ -142929,9 +142400,9 @@ self: { ({ mkDerivation, base, mtl, profunctors }: mkDerivation { pname = "iso-deriving"; - version = "0.0.6"; - sha256 = "1kcbz4dndrxhkyx67l1z4363rizbqnwnrgcw3kbm5p5zmr914v3h"; - libraryHaskellDepends = [ base profunctors ]; + version = "0.0.8"; + sha256 = "1w9fvnyanzmxs7yab9qhf3k9qy1lik7y5y5gzfv3jrxzwm0hivbi"; + libraryHaskellDepends = [ base mtl profunctors ]; testHaskellDepends = [ base mtl ]; description = "Deriving via arbitrary isomorphisms"; license = stdenv.lib.licenses.mit; @@ -145276,8 +144747,8 @@ self: { }: mkDerivation { pname = "json-autotype"; - version = "3.0.5"; - sha256 = "0kvbx4iyhh2r0abnswbvf862xfj08jlgvdd21xiz4zpnp2d1fx0h"; + version = "3.1.2"; + sha256 = "1wg1198jwgiy6yxr0msz1cvrkkv3zjx72ck3cykddy2hwx55113g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -148712,24 +148183,31 @@ self: { }) {}; "krank" = callPackage - ({ mkDerivation, aeson, base, hspec, megaparsec, mtl - , optparse-applicative, PyF, replace-megaparsec, req - , safe-exceptions, text, unordered-containers, utf8-string + ({ mkDerivation, aeson, base, bytestring, containers, hspec + , hspec-expectations, http-client, http-types, lifted-async, mtl + , optparse-applicative, pcre-heavy, pretty-terminal, PyF, req + , safe-exceptions, text, unordered-containers }: mkDerivation { pname = "krank"; - version = "0.1.0"; - sha256 = "121010sm7a2ggi1s75cy4f68z4nr2dp1i9cxq6snzbkl3dv5mmys"; + version = "0.2.0"; + sha256 = "0m41vyfzis6v0x7yys7xwr8yi04fydg6x2d04ispmi8mqjx0vgww"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson base megaparsec mtl PyF replace-megaparsec req - safe-exceptions text unordered-containers utf8-string + aeson base bytestring containers http-client http-types + lifted-async mtl pcre-heavy pretty-terminal PyF req safe-exceptions + text unordered-containers ]; executableHaskellDepends = [ - base mtl optparse-applicative PyF safe-exceptions text + base containers mtl optparse-applicative pcre-heavy pretty-terminal + PyF text + ]; + testHaskellDepends = [ + aeson base bytestring containers hspec hspec-expectations + http-client http-types mtl pcre-heavy PyF req safe-exceptions text + unordered-containers ]; - testHaskellDepends = [ base hspec megaparsec PyF ]; description = "Krank checks your code source comments for important markers"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -150194,8 +149672,8 @@ self: { }: mkDerivation { pname = "language-bash"; - version = "0.9.0"; - sha256 = "1n4icdd478b1j0rr79qyxx2g4xm8yvsplfw3mkdsskb79zmq5gga"; + version = "0.9.2"; + sha256 = "0pkl0cvkxhlpx492qlklizc27xw3yax6n8h27xq3bw1vlk3c0a36"; libraryHaskellDepends = [ base parsec prettyprinter transformers ]; testHaskellDepends = [ base directory filepath parsec process QuickCheck tasty @@ -151439,7 +150917,7 @@ self: { libraryPkgconfigDepends = [ liblapack ]; description = "Auto-generated interface to Fortran LAPACK"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) liblapack;}; + }) {liblapack = null;}; "lapack-ffi-tools" = callPackage ({ mkDerivation, base, bytestring, cassava, containers @@ -151759,8 +151237,8 @@ self: { }: mkDerivation { pname = "launchdarkly-server-sdk"; - version = "1.0.4"; - sha256 = "1g2qq1ncix5n4w8bshmmwi8km3ph1ys1s31l0fa3imjmz9fsi1l1"; + version = "2.0.0"; + sha256 = "0dfs9nq3vcf8w2k1x51pixb4wb47rg9nzyjgfpzx6vip296ivyf7"; libraryHaskellDepends = [ aeson attoparsec base base16-bytestring bytestring bytestring-conversion clock containers cryptohash exceptions extra @@ -152564,6 +152042,41 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "leb128" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, ghc-prim + , QuickCheck, test-framework, test-framework-quickcheck2 + , transformers + }: + mkDerivation { + pname = "leb128"; + version = "0.1.0.0"; + sha256 = "097xzdj1q17whnzwlpwnfapppgc4lqwmmfcv2694gzlil84rqwk7"; + libraryHaskellDepends = [ base bytestring ghc-prim transformers ]; + testHaskellDepends = [ + base bytestring QuickCheck test-framework + test-framework-quickcheck2 + ]; + benchmarkHaskellDepends = [ base bytestring criterion deepseq ]; + description = "LEB128 encoding logic for and in Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "leb128-cereal" = callPackage + ({ mkDerivation, base, bytestring, cereal, tasty, tasty-hunit + , tasty-quickcheck + }: + mkDerivation { + pname = "leb128-cereal"; + version = "1.0"; + sha256 = "1qjxcvcgdf4l1wzps7410yv3i5mi3ax17mq2f9wgbfbnm33329i7"; + libraryHaskellDepends = [ base bytestring cereal ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit tasty-quickcheck + ]; + description = "LEB128 and SLEB128 encoding"; + license = stdenv.lib.licenses.mit; + }) {}; + "leetify" = callPackage ({ mkDerivation, base, containers }: mkDerivation { @@ -161649,12 +161162,12 @@ self: { }) {}; "maquinitas-tidal" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, base, tidal }: mkDerivation { pname = "maquinitas-tidal"; - version = "0.2.1"; - sha256 = "14j4469yl1ypw97m33r2v37mlqxa689ish84k7ggwjdqxj9f64n2"; - libraryHaskellDepends = [ base ]; + version = "0.2.4"; + sha256 = "0apr5qkir3b6mnczi50lf3p349p1q3bl1sn4yg9dls2n3m147mf7"; + libraryHaskellDepends = [ base tidal ]; description = "library for MIDI control of hardware"; license = stdenv.lib.licenses.mit; }) {}; @@ -165018,23 +164531,6 @@ self: { }) {}; "microlens-th" = callPackage - ({ mkDerivation, base, containers, microlens, template-haskell - , th-abstraction, transformers - }: - mkDerivation { - pname = "microlens-th"; - version = "0.4.3.4"; - sha256 = "08cixz1840ycc1y2b8anf1pqzlhnh89i6wskixd5s5brf8jl0l79"; - libraryHaskellDepends = [ - base containers microlens template-haskell th-abstraction - transformers - ]; - testHaskellDepends = [ base microlens ]; - description = "Automatic generation of record lenses for microlens"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "microlens-th_0_4_3_5" = callPackage ({ mkDerivation, base, containers, microlens, template-haskell , th-abstraction, transformers }: @@ -165049,7 +164545,6 @@ self: { testHaskellDepends = [ base microlens ]; description = "Automatic generation of record lenses for microlens"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "micrologger" = callPackage @@ -166018,6 +165513,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "minizinc-process" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , hashable, process-extras, stringsearch, text + }: + mkDerivation { + pname = "minizinc-process"; + version = "0.1.0.0"; + sha256 = "0p2jb69k2n3dy47vx56pwh6pafccsm9r0nzqd60zss5fdrnxddf8"; + libraryHaskellDepends = [ + aeson base bytestring containers directory hashable process-extras + stringsearch text + ]; + description = "A set of helpers to call minizinc models"; + license = stdenv.lib.licenses.asl20; + }) {}; + "minlen" = callPackage ({ mkDerivation, base, mono-traversable, semigroups, transformers }: @@ -170049,8 +169560,8 @@ self: { ({ mkDerivation, base, bytestring, c2hs, monad-loops, mpich }: mkDerivation { pname = "mpi-hs"; - version = "0.7.1.0"; - sha256 = "1xja12laj9pznwkgllgn2126g0izgv7mp267jv0ihlzy4yv2ps8m"; + version = "0.7.1.2"; + sha256 = "0dhhvvncmsg6rnb16pi1da4zb82hlwyia0l5xxqz6s7518q0amkh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring monad-loops ]; @@ -170066,6 +169577,63 @@ self: { broken = true; }) {inherit (pkgs) mpich;}; + "mpi-hs-binary" = callPackage + ({ mkDerivation, base, binary, bytestring, monad-loops, mpi-hs }: + mkDerivation { + pname = "mpi-hs-binary"; + version = "0.1.1.0"; + sha256 = "10wlrm31drjgdviqzsvxlnj1mn1lli3n41z1xbfp0i80vmh29av3"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring monad-loops mpi-hs + ]; + executableHaskellDepends = [ base mpi-hs ]; + testHaskellDepends = [ base ]; + description = "MPI bindings for Haskell"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "mpi-hs-cereal" = callPackage + ({ mkDerivation, base, bytestring, cereal, monad-loops, mpi-hs }: + mkDerivation { + pname = "mpi-hs-cereal"; + version = "0.1.0.0"; + sha256 = "1sdizjk4xpc2hdh71s9ckjhq22appqj1c9s10mwxjgb9vd7bz07b"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring cereal monad-loops mpi-hs + ]; + executableHaskellDepends = [ base mpi-hs ]; + testHaskellDepends = [ base ]; + description = "MPI bindings for Haskell"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "mpi-hs-store" = callPackage + ({ mkDerivation, base, bytestring, monad-loops, mpi-hs, store }: + mkDerivation { + pname = "mpi-hs-store"; + version = "0.1.0.0"; + sha256 = "1afgamdbv7dq9r8jd7hn5y09rly75rhjk48da0d8hk0spcfdmnvq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring monad-loops mpi-hs store + ]; + executableHaskellDepends = [ base mpi-hs ]; + testHaskellDepends = [ base ]; + description = "MPI bindings for Haskell"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "mplayer-spot" = callPackage ({ mkDerivation, async, attoparsec, base, bytestring, conduit , conduit-extra, directory, filepath, process, semigroupoids @@ -174544,8 +174112,8 @@ self: { }: mkDerivation { pname = "net-spider"; - version = "0.4.2.0"; - sha256 = "1jpqkwgi13a0hw99andw6f8jsq8isqsqlqjc42bapy97wxba2bii"; + version = "0.4.3.0"; + sha256 = "19cvghyj6val79bsq3sh9gpr1f94dmmikmgsdasf6a26vcxr1q4y"; libraryHaskellDepends = [ aeson base containers data-interval extended-reals greskell greskell-websocket hashable monad-logger regex-applicative @@ -174627,24 +174195,26 @@ self: { }) {}; "net-spider-rpl-cli" = callPackage - ({ mkDerivation, base, greskell, hspec, ip, monad-logger - , net-spider, net-spider-cli, net-spider-rpl, optparse-applicative - , text, time, unordered-containers + ({ mkDerivation, base, bytestring, fast-logger, fgl, greskell + , hashable, hspec, ip, monad-logger, net-spider, net-spider-cli + , net-spider-rpl, optparse-applicative, text, time, transformers + , unordered-containers }: mkDerivation { pname = "net-spider-rpl-cli"; - version = "0.1.2.2"; - sha256 = "1l8h3d3m7h48n6vn7lhzlisf6hqr311q1yjxxp2ywkyx1fn3s9pp"; + version = "0.1.3.0"; + sha256 = "1hgzrl3fq1vp4dh4c0jf9kndclcrzapd124b4c9xd20xgidy01fd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base greskell monad-logger net-spider net-spider-cli net-spider-rpl - optparse-applicative text time unordered-containers + base fgl greskell monad-logger net-spider net-spider-cli + net-spider-rpl optparse-applicative text time transformers + unordered-containers ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ - base hspec ip net-spider net-spider-cli net-spider-rpl - optparse-applicative + base bytestring fast-logger hashable hspec ip monad-logger + net-spider net-spider-cli net-spider-rpl optparse-applicative text ]; description = "CLI executable of NetSpider.RPL."; license = stdenv.lib.licenses.bsd3; @@ -176748,8 +176318,8 @@ self: { }: mkDerivation { pname = "ngx-export-tools-extra"; - version = "0.4.1.0"; - sha256 = "1jf49drs7jl5c5swy7pf2b00nawp3m2nf95941sr74c6y6g4y87d"; + version = "0.4.1.1"; + sha256 = "15d5dj8mdihj8m559lrfwwpb55nkkkapwd9x84jxsv6pmnh5m0qh"; libraryHaskellDepends = [ aeson ansi-wl-pprint base base64 binary bytestring case-insensitive containers ede enclosed-exceptions http-client http-types @@ -179039,10 +178609,8 @@ self: { }: mkDerivation { pname = "nvim-hs"; - version = "2.1.0.2"; - sha256 = "0amlvrh213n9cfqax5gcy7zq3fd8q9hcskhjkbayvzsyf5hhr1rn"; - revision = "1"; - editedCabalFile = "1v52rmk7hbdn40964r50jjz3lanfc5q8xrdqpv1wmwviw3j4rip8"; + version = "2.1.0.3"; + sha256 = "19834hldpywsg52144i9b372msmw5pcj7v0fwiii14pns4sf6v7v"; libraryHaskellDepends = [ base bytestring cereal cereal-conduit conduit containers data-default deepseq foreign-store hslogger megaparsec messagepack @@ -180686,6 +180254,25 @@ self: { broken = true; }) {}; + "openapi-typed" = callPackage + ({ mkDerivation, aeson, base, hspec, optics-core, optics-extra + , text, unordered-containers, vector, yaml + }: + mkDerivation { + pname = "openapi-typed"; + version = "0.0.0.1"; + sha256 = "06wbcd5cr2dfdj1hbzi01byfr2lvvv0sncjsbx9n6vq2anh54wkm"; + libraryHaskellDepends = [ + aeson base text unordered-containers vector + ]; + testHaskellDepends = [ + aeson base hspec optics-core optics-extra text unordered-containers + yaml + ]; + description = "Types for OpenAPI"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "opench-meteo" = callPackage ({ mkDerivation, aeson, base, data-default, text, time }: mkDerivation { @@ -181168,26 +180755,46 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "opentelemetry_0_2_0" = callPackage - ({ mkDerivation, async, base, bytestring, clock, directory - , exceptions, hashable, random, stm, tasty, tasty-discover - , tasty-hunit, tasty-quickcheck, text, unordered-containers - }: + "opentelemetry_0_3_0" = callPackage + ({ mkDerivation, base, bytestring, exceptions }: mkDerivation { pname = "opentelemetry"; - version = "0.2.0"; - sha256 = "1nxkghxwjkgvdk6xhpssa7aifryn6rr0agbhyc0ybf2c76r1pr8b"; + version = "0.3.0"; + sha256 = "1mgq84ixi8hxhgim5d5mx6v1zc1sqrp8cffzw14rly3sfhdi1k0m"; + libraryHaskellDepends = [ base bytestring exceptions ]; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "opentelemetry-extra" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, clock, containers + , directory, exceptions, filepath, ghc-events, hashable + , http-client, http-client-tls, http-types, opentelemetry, random + , scientific, splitmix, stm, tasty, tasty-discover, tasty-hunit + , tasty-quickcheck, text, unordered-containers + }: + mkDerivation { + pname = "opentelemetry-extra"; + version = "0.3.0"; + sha256 = "00998jr520qmr9ii96r04bspfh8cdxwk951y02ic01higqjkx6xp"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ - base bytestring clock directory exceptions hashable random stm text + aeson async base bytestring clock containers directory exceptions + filepath ghc-events hashable http-client http-client-tls http-types + opentelemetry random scientific splitmix stm text unordered-containers ]; + executableHaskellDepends = [ + async base clock exceptions filepath http-client http-client-tls + opentelemetry text + ]; testHaskellDepends = [ - async base bytestring tasty tasty-discover tasty-hunit + base bytestring opentelemetry tasty tasty-discover tasty-hunit tasty-quickcheck ]; testToolDepends = [ tasty-discover ]; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "opentelemetry-http-client" = callPackage @@ -181206,32 +180813,43 @@ self: { }) {}; "opentelemetry-lightstep" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, exceptions - , http-client, http-client-tls, http-types, network, opentelemetry - , scientific, stm, text, unordered-containers + ({ mkDerivation, aeson, async, base, bytestring, clock, containers + , exceptions, filepath, ghc-events, http-client, http-client-tls + , http-types, network, opentelemetry, opentelemetry-extra + , scientific, splitmix, stm, text, unordered-containers }: mkDerivation { pname = "opentelemetry-lightstep"; - version = "0.2.0"; - sha256 = "03fv2lgwkqngp26rdrk2fzvnccdgjc7xsv3sl3adb3xwzppkn0xh"; + version = "0.3.0"; + sha256 = "0kfvls8alc8wq0habl4snvhvd3a808z07san1sbvwp215frxycy9"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson async base bytestring exceptions http-client http-client-tls - http-types network opentelemetry scientific stm text - unordered-containers + http-types network opentelemetry opentelemetry-extra scientific stm + text unordered-containers + ]; + executableHaskellDepends = [ + async base bytestring clock containers exceptions filepath + ghc-events http-client http-types opentelemetry opentelemetry-extra + splitmix text unordered-containers ]; - testHaskellDepends = [ async base opentelemetry ]; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; "opentelemetry-wai" = callPackage - ({ mkDerivation, base, http-types, opentelemetry, text, wai }: + ({ mkDerivation, base, bytestring, http-types, opentelemetry, text + , wai + }: mkDerivation { pname = "opentelemetry-wai"; - version = "0.2.0"; - sha256 = "1n27g8xjij05g7xxx8z50k39nmclhm707xs2pfqy830zdq1ldfl4"; - libraryHaskellDepends = [ base http-types opentelemetry text wai ]; + version = "0.3.0"; + sha256 = "0x2a3s1xdc66ww8p8nkpwblvhv9hng64baij3wvbcbn2n1lls531"; + libraryHaskellDepends = [ + base bytestring http-types opentelemetry text wai + ]; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -182591,15 +182209,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ormolu_0_0_4_0" = callPackage + "ormolu_0_0_5_0" = callPackage ({ mkDerivation, base, bytestring, containers, dlist, exceptions , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover, mtl , optparse-applicative, path, path-io, syb, text }: mkDerivation { pname = "ormolu"; - version = "0.0.4.0"; - sha256 = "1x3fdhnpbf7xd0h85909smr5nv2qz4fbljvvzmsk8ph653j5js1k"; + version = "0.0.5.0"; + sha256 = "1sf22silpj89sldd7wanlr34nsv77bq0cf4i0q1x2r20pz7s4w4m"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -182902,23 +182520,25 @@ self: { }) {}; "overloaded" = callPackage - ({ mkDerivation, base, bin, bytestring, containers, fin - , generic-lens, ghc, HUnit, lens, optics-core, ral, record-hasfield - , singleton-bool, sop-core, split, syb, symbols, tasty, tasty-hunit - , text, time, vec + ({ mkDerivation, assoc, base, bin, boring, bytestring, constraints + , containers, fin, generic-lens-lite, ghc, hmatrix, HUnit, lens + , optics-core, QuickCheck, ral, record-hasfield, singleton-bool + , sop-core, split, syb, symbols, tasty, tasty-hunit + , tasty-quickcheck, text, time, vec }: mkDerivation { pname = "overloaded"; - version = "0.2"; - sha256 = "1kp3vbdfwp9caicmj2k1qznbsn844pm75sy8ywwm86334f08vshk"; + version = "0.2.1"; + sha256 = "1qa2xq2hf792ivi92mimznwj86x9y1dpwz7rwcz99zvfk7a3hsis"; libraryHaskellDepends = [ - base bin bytestring containers fin ghc optics-core ral + assoc base bin bytestring containers fin ghc optics-core ral record-hasfield sop-core split syb symbols text time vec ]; testHaskellDepends = [ - base bin bytestring containers fin generic-lens HUnit lens - optics-core ral record-hasfield singleton-bool sop-core symbols - tasty tasty-hunit text time vec + assoc base bin boring bytestring constraints containers fin + generic-lens-lite hmatrix HUnit lens optics-core QuickCheck ral + record-hasfield singleton-bool sop-core symbols tasty tasty-hunit + tasty-quickcheck text time vec ]; doHaddock = false; description = "Overloaded pragmas as a plugin"; @@ -184940,8 +184560,8 @@ self: { ({ mkDerivation, base, directory, filepath, parallel-io }: mkDerivation { pname = "par-traverse"; - version = "0.2.0.0"; - sha256 = "1cbanrhaad3fq2kkpdkb3rh7c8qrc1v7by8v6mg4lrgghdx3msk8"; + version = "0.2.1.0"; + sha256 = "0rmv6wyisdg4srzjykikqqigfji6x5zn1cz2v3cyl0dms4yr4lig"; libraryHaskellDepends = [ base directory filepath parallel-io ]; description = "Traverse a directory in parallel"; license = stdenv.lib.licenses.bsd3; @@ -187414,6 +187034,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "penntreebank-megaparsec" = callPackage + ({ mkDerivation, base, containers, hspec, hspec-discover + , megaparsec, mtl, text, transformers + }: + mkDerivation { + pname = "penntreebank-megaparsec"; + version = "0.1.0"; + sha256 = "1wjwwpb1i10kasqxn9gkn34cpyjs83znmr6ps5sjr0zhqyg3dk3j"; + libraryHaskellDepends = [ + base containers megaparsec mtl transformers + ]; + testHaskellDepends = [ + base containers hspec megaparsec mtl text transformers + ]; + testToolDepends = [ hspec-discover ]; + description = "Parser combinators for trees in the Penn Treebank format"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "penny" = callPackage ({ mkDerivation, action-permutations, anonymous-sums, base , bytestring, cereal, containers, contravariant, either, matchers @@ -187569,8 +187208,8 @@ self: { }: mkDerivation { pname = "perceptual-hash"; - version = "0.1.3.3"; - sha256 = "15f36b1xv5lq7gw7nd10mmhfyi935v07rdq04vzl2msdd6cn0j3d"; + version = "0.1.3.5"; + sha256 = "0f36sy9ixwbx55m3634lr0hrhllj68wv5jilzq0xik2171g3rx2p"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -193320,6 +192959,25 @@ self: { broken = true; }) {}; + "popkey" = callPackage + ({ mkDerivation, base, bitvec, bytestring, containers, hspec + , hspec-discover, hw-bits, hw-prim, hw-rankselect + , hw-rankselect-base, profunctors, QuickCheck, store, text, vector + }: + mkDerivation { + pname = "popkey"; + version = "0.0.0.1"; + sha256 = "1gplzbbj6whmxchxr78zv32ixlf79sjgdz950jixl7z9p5pdrki7"; + libraryHaskellDepends = [ + base bitvec bytestring containers hw-bits hw-prim hw-rankselect + hw-rankselect-base profunctors store text vector + ]; + testHaskellDepends = [ base containers hspec QuickCheck ]; + testToolDepends = [ hspec-discover ]; + description = "Static key-value storage backed by poppy"; + license = stdenv.lib.licenses.mit; + }) {}; + "poppler" = callPackage ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers , gdk-pixbuf, glib, gtk, gtk2, gtk2hs-buildtools, mtl, pango @@ -196202,8 +195860,8 @@ self: { ({ mkDerivation, ghc-prim }: mkDerivation { pname = "prim"; - version = "0.1.0.2"; - sha256 = "0pq9mjvifbj3h6pi024kjias3vlzn6nw7g684bf5z58cg51cmckg"; + version = "0.1.0.6"; + sha256 = "187pzlgkyg64azwrr2q896wy4i5zrryjbp9ldg9hm5lgyv782vr2"; libraryHaskellDepends = [ ghc-prim ]; description = "An ergonomic but conservative interface to ghc-prim"; license = stdenv.lib.licenses.mit; @@ -198705,6 +198363,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "protolude_0_3_0" = callPackage + ({ mkDerivation, array, async, base, bytestring, containers + , deepseq, ghc-prim, hashable, mtl, mtl-compat, stm, text + , transformers, transformers-compat + }: + mkDerivation { + pname = "protolude"; + version = "0.3.0"; + sha256 = "1b6wprbwfdjyvds2bm6na0fbqgzdkj5ikkk33whbkyh3krd3i0s0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array async base bytestring containers deepseq ghc-prim hashable + mtl mtl-compat stm text transformers transformers-compat + ]; + description = "A small prelude"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "protolude-lifted" = callPackage ({ mkDerivation, async, base, lifted-async, lifted-base, protolude }: @@ -199826,20 +199504,20 @@ self: { "push-notify-apn" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, binary, bytestring - , containers, data-default, hspec, http2, http2-client - , optparse-applicative, random, semigroups, text, time, tls, x509 - , x509-store + , containers, data-default, hspec, http2, http2-client, lifted-base + , mtl, optparse-applicative, random, resource-pool, semigroups + , text, time, tls, x509, x509-store }: mkDerivation { pname = "push-notify-apn"; - version = "0.2.0.0"; - sha256 = "0lkdjpgd04b7jxcrqvn395bhdac0ms0jbxdigd1xpvj6d9w7f9x3"; + version = "0.2.0.1"; + sha256 = "1p33nwazxk4kk52vw6i8rrsgy8i3bzn0klp56bv6nj1751z3mzbj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base base16-bytestring binary bytestring containers - data-default http2 http2-client random semigroups text time tls - x509 x509-store + data-default http2 http2-client lifted-base mtl random + resource-pool semigroups text time tls x509 x509-store ]; executableHaskellDepends = [ base bytestring optparse-applicative semigroups text @@ -200697,26 +200375,6 @@ self: { }) {}; "quadratic-irrational" = callPackage - ({ mkDerivation, arithmoi, base, containers, directory, doctest - , filepath, mtl, numbers, QuickCheck, tasty, tasty-quickcheck - , transformers - }: - mkDerivation { - pname = "quadratic-irrational"; - version = "0.1.0"; - sha256 = "0kfgvixvcawfhw4vv0zg2r0d6hrlak01q9isqc3n3lc63qaifxgy"; - revision = "1"; - editedCabalFile = "11snayb371lpsz7p74sbbl3kq0i3i2vnp852x8vw482v48kld5vl"; - libraryHaskellDepends = [ arithmoi base containers transformers ]; - testHaskellDepends = [ - arithmoi base directory doctest filepath mtl numbers QuickCheck - tasty tasty-quickcheck - ]; - description = "An implementation of quadratic irrationals"; - license = stdenv.lib.licenses.mit; - }) {}; - - "quadratic-irrational_0_1_1" = callPackage ({ mkDerivation, arithmoi, base, containers, directory, doctest , filepath, integer-roots, mtl, numbers, QuickCheck, tasty , tasty-quickcheck, transformers @@ -200734,7 +200392,6 @@ self: { ]; description = "An implementation of quadratic irrationals"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "quandl-api" = callPackage @@ -200856,8 +200513,8 @@ self: { }: mkDerivation { pname = "quarantimer"; - version = "1.20200326"; - sha256 = "1q0rraxq1gv86chi64ijxxkx4dm8w9v2610wj58315bap3d3m91c"; + version = "1.20200422"; + sha256 = "1wcf9rh6543pv1dpf55jk12x6zsak29izy94q1l4hc31w32gi8xz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -203785,8 +203442,8 @@ self: { }: mkDerivation { pname = "rattletrap"; - version = "9.0.10"; - sha256 = "19xivp6hh6sz8wcn18y481pwxbggnw6dgbwdjiy42571q20gmzbw"; + version = "9.1.1"; + sha256 = "11q115yfjjafq2dyn88xc6xnynqw2i6yn7g9n8yy9qaa8jpgibzz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -205272,6 +204929,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "recursion-schemes-ix" = callPackage + ({ mkDerivation, base, containers, hspec, mtl, QuickCheck + , singlethongs + }: + mkDerivation { + pname = "recursion-schemes-ix"; + version = "0.1.0.0"; + sha256 = "1hg0ggba40n1455nd85wb6h2fr3hixf69a3d75a6g5dcahaqh39n"; + libraryHaskellDepends = [ base singlethongs ]; + testHaskellDepends = [ + base containers hspec mtl QuickCheck singlethongs + ]; + description = "Recursion schemes over indexed Functors"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "recursive-line-count" = callPackage ({ mkDerivation, base, bytestring, containers, filepath, gtk, mtl , process @@ -206135,8 +205808,8 @@ self: { }: mkDerivation { pname = "reflex-fsnotify"; - version = "0.2.0.0"; - sha256 = "0nxi3zjwwq36212qncpxi7rn30lgh0zy4swz10wxm55zb480dm8m"; + version = "0.2.1.0"; + sha256 = "1ym220myy521j4lm0wrjydg18ya5fw71j0mv3md35vmn18n6r0d4"; libraryHaskellDepends = [ base containers directory filepath fsnotify reflex ]; @@ -206849,21 +206522,6 @@ self: { }) {inherit (pkgs) pcre;}; "regex-pcre-builtin" = callPackage - ({ mkDerivation, array, base, bytestring, containers, regex-base - , text - }: - mkDerivation { - pname = "regex-pcre-builtin"; - version = "0.95.1.1.8.43"; - sha256 = "1akis4b9jp4a0qbwnpwm0nzlg76kb54wn2vlicc6yb4qha210fsd"; - libraryHaskellDepends = [ - array base bytestring containers regex-base text - ]; - description = "PCRE Backend for \"Text.Regex\" (regex-base)"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "regex-pcre-builtin_0_95_1_2_8_43" = callPackage ({ mkDerivation, array, base, bytestring, containers, regex-base , text }: @@ -206876,7 +206534,6 @@ self: { ]; description = "PCRE Backend for \"Text.Regex\" (regex-base)"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "regex-pcre-text" = callPackage @@ -209293,6 +208950,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "resourcet_1_2_4" = callPackage + ({ mkDerivation, base, containers, exceptions, hspec, mtl + , primitive, transformers, unliftio-core + }: + mkDerivation { + pname = "resourcet"; + version = "1.2.4"; + sha256 = "017v0r9qk4d7dd04dc03ghghyk1d4qj82gligyzg5fdz2rkg8i8x"; + libraryHaskellDepends = [ + base containers exceptions mtl primitive transformers unliftio-core + ]; + testHaskellDepends = [ base exceptions hspec transformers ]; + description = "Deterministic allocation and freeing of scarce resources"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "respond" = callPackage ({ mkDerivation, aeson, base, bifunctors, bytestring, containers , data-default-class, exceptions, fast-logger, formatting, HList @@ -210217,8 +209891,8 @@ self: { ({ mkDerivation, base, dunai, gloss, rhine }: mkDerivation { pname = "rhine-gloss"; - version = "0.6.0"; - sha256 = "1kfy993872iq93fc5bn6bz0xx13afbb5piwxyw8jdjp146jp2380"; + version = "0.6.0.1"; + sha256 = "1j3sbdlfn6hkksfxa5nw874pm9yxmc8hy14msjfsl3g3y0d501bh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base dunai gloss rhine ]; @@ -210349,8 +210023,8 @@ self: { ({ mkDerivation, base, Only, postgresql-simple, text, time }: mkDerivation { pname = "ribbit"; - version = "1.1.0.0"; - sha256 = "1pmg7ii6mpl22hlgmripwp44cz4pwp2yqa4z32f21lfr0y9slz8j"; + version = "1.1.0.1"; + sha256 = "076m5w4w08z8migb0v8vb6lybs06x1bfvxqfi9g633lz464hyi9v"; libraryHaskellDepends = [ base Only postgresql-simple text time ]; description = "Type-level Relational DB combinators"; license = stdenv.lib.licenses.mit; @@ -210467,8 +210141,8 @@ self: { }: mkDerivation { pname = "ridley"; - version = "0.3.1.3"; - sha256 = "0j7wvzk2x3xpvwwfkz1bll9awfrlbn1lcl50hm582plnl2pgddq0"; + version = "0.3.1.4"; + sha256 = "120yqfrkp4ziz8yn6xgzzhdszrvq1dk1szzh3q2m8w36c0g2qdhy"; enableSeparateDataOutput = true; libraryHaskellDepends = [ async base containers ekg-core ekg-prometheus-adapter inline-c @@ -213162,29 +212836,6 @@ self: { }) {}; "safecopy" = callPackage - ({ mkDerivation, array, base, bytestring, cereal, containers - , generic-data, HUnit, lens, lens-action, old-time, QuickCheck - , quickcheck-instances, tasty, tasty-quickcheck, template-haskell - , text, time, transformers, vector - }: - mkDerivation { - pname = "safecopy"; - version = "0.10.2"; - sha256 = "0x8j27qmvqk009q2jhs1a6rdi81xvgp76bwnbp0y8yvzynjcaagk"; - libraryHaskellDepends = [ - array base bytestring cereal containers generic-data old-time - template-haskell text time transformers vector - ]; - testHaskellDepends = [ - array base bytestring cereal containers HUnit lens lens-action - QuickCheck quickcheck-instances tasty tasty-quickcheck - template-haskell time vector - ]; - description = "Binary serialization with version control"; - license = stdenv.lib.licenses.publicDomain; - }) {}; - - "safecopy_0_10_3" = callPackage ({ mkDerivation, array, base, bytestring, cereal, containers , generic-data, HUnit, lens, lens-action, old-time, QuickCheck , quickcheck-instances, tasty, tasty-quickcheck, template-haskell @@ -213205,7 +212856,6 @@ self: { ]; description = "Binary serialization with version control"; license = stdenv.lib.licenses.publicDomain; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "safecopy-migrate" = callPackage @@ -213417,20 +213067,18 @@ self: { "sak" = callPackage ({ mkDerivation, base, brotli, bytestring, bz2, cpphs, directory , filepath, lz4-hs, lzlib, lzma, optparse-applicative, parallel-io - , zlib, zstd + , snappy-lazy, zlib, zstd }: mkDerivation { pname = "sak"; - version = "0.1.2.3"; - sha256 = "0ydc5ykkhxxvzcwncf0rvn3zk2gid7r0dwai63r3vsvp7mn2jg8g"; - revision = "1"; - editedCabalFile = "01xf0f5q458wgg8jndcimgpqmwvgvxlpf5cf7gb14v2y3vw2hzfj"; + version = "0.1.2.4"; + sha256 = "0gj0w8c4j43586k474ncjk4ldgjx5rbw36g5lacbn13lf3fid2ck"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ base brotli bytestring bz2 directory filepath lz4-hs lzlib lzma - optparse-applicative parallel-io zlib zstd + optparse-applicative parallel-io snappy-lazy zlib zstd ]; executableToolDepends = [ cpphs ]; description = "Compression command-line tool"; @@ -214430,6 +214078,23 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "scalpel_0_6_2" = callPackage + ({ mkDerivation, base, bytestring, case-insensitive, data-default + , http-client, http-client-tls, scalpel-core, tagsoup, text + }: + mkDerivation { + pname = "scalpel"; + version = "0.6.2"; + sha256 = "04hhvk0yjxha3yg6n9fxivrz97hpjjiiblnj0bvs5myax1ggkjch"; + libraryHaskellDepends = [ + base bytestring case-insensitive data-default http-client + http-client-tls scalpel-core tagsoup text + ]; + description = "A high level web scraping library for Haskell"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "scalpel-core" = callPackage ({ mkDerivation, base, bytestring, containers, criterion , data-default, fail, HUnit, pointedlist, regex-base, regex-tdfa @@ -214449,6 +214114,26 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "scalpel-core_0_6_2" = callPackage + ({ mkDerivation, base, bytestring, containers, criterion + , data-default, fail, HUnit, mtl, pointedlist, regex-base + , regex-tdfa, tagsoup, text, transformers, vector + }: + mkDerivation { + pname = "scalpel-core"; + version = "0.6.2"; + sha256 = "07mjff8aqwabx8yhq8bd7jpnarkkrjqss8h8s2wkfmfj808fllmf"; + libraryHaskellDepends = [ + base bytestring containers data-default fail mtl pointedlist + regex-base regex-tdfa tagsoup text transformers vector + ]; + testHaskellDepends = [ base HUnit regex-base regex-tdfa tagsoup ]; + benchmarkHaskellDepends = [ base criterion tagsoup text ]; + description = "A high level web scraping library for Haskell"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "scan" = callPackage ({ mkDerivation, base, parsec }: mkDerivation { @@ -215792,27 +215477,6 @@ self: { }) {}; "sdl2" = callPackage - ({ mkDerivation, base, bytestring, deepseq, exceptions, linear - , SDL2, StateVar, text, transformers, vector, weigh - }: - mkDerivation { - pname = "sdl2"; - version = "2.5.1.0"; - sha256 = "087df61fsmfsdc7pdn6sgsp5lf20nampa41illszii5jfr13s7gw"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bytestring exceptions linear StateVar text transformers vector - ]; - librarySystemDepends = [ SDL2 ]; - libraryPkgconfigDepends = [ SDL2 ]; - testHaskellDepends = [ base deepseq linear vector weigh ]; - description = "Both high- and low-level bindings to the SDL library (version 2.0.6+)."; - license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) SDL2;}; - - "sdl2_2_5_2_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, exceptions, linear , SDL2, StateVar, text, transformers, vector, weigh }: @@ -215831,7 +215495,6 @@ self: { testHaskellDepends = [ base deepseq linear vector weigh ]; description = "Both high- and low-level bindings to the SDL library (version 2.0.6+)."; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {inherit (pkgs) SDL2;}; "sdl2-cairo" = callPackage @@ -217625,6 +217288,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "serialise-uuid" = callPackage + ({ mkDerivation, base, bytestring, cborg, serialise, tasty + , tasty-hunit, tasty-quickcheck, uuid-types + }: + mkDerivation { + pname = "serialise-uuid"; + version = "0.1"; + sha256 = "0sw1vim04yflkznxkcdcljrns1nb6v0zjvwkx5spbb5dc0gk12v5"; + libraryHaskellDepends = [ + base bytestring cborg serialise uuid-types + ]; + testHaskellDepends = [ + base bytestring serialise tasty tasty-hunit tasty-quickcheck + uuid-types + ]; + description = "Encode and decode UUID values in CBOR using uuid-types, cborg and serialise"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "serialize-instances" = callPackage ({ mkDerivation, base, cereal, hashable, semigroups , unordered-containers @@ -218599,6 +218281,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "servant-docs-simple" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, hspec + , hspec-core, prettyprinter, raw-strings-qq, servant, text + }: + mkDerivation { + pname = "servant-docs-simple"; + version = "0.1.0.0"; + sha256 = "11591njaavchmlmdzwql7n3klfs6il1c1q4rd5h8n84krsah3y4r"; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring prettyprinter servant text + ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring hspec hspec-core prettyprinter + raw-strings-qq servant text + ]; + description = "Generate documentation via TypeRep for Servant API"; + license = stdenv.lib.licenses.mit; + }) {}; + "servant-ede" = callPackage ({ mkDerivation, aeson, base, bytestring, ede, either, filepath , http-media, http-types, semigroups, servant, servant-server, text @@ -218651,28 +218352,6 @@ self: { }) {}; "servant-elm" = callPackage - ({ mkDerivation, aeson, base, Diff, directory, elm-bridge, hspec - , HUnit, lens, servant, servant-client, servant-foreign, text - , wl-pprint-text - }: - mkDerivation { - pname = "servant-elm"; - version = "0.7.1"; - sha256 = "1r24hqv4xs1k280a0c3lcmfjrywh0663hh8xi8fpzlmsgmn2s464"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson base directory elm-bridge lens servant servant-foreign text - wl-pprint-text - ]; - testHaskellDepends = [ - aeson base Diff elm-bridge hspec HUnit servant servant-client text - ]; - description = "Automatically derive Elm functions to query servant webservices"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "servant-elm_0_7_2" = callPackage ({ mkDerivation, aeson, base, Diff, directory, elm-bridge, hspec , HUnit, lens, servant, servant-client, servant-foreign, text , wl-pprint-text @@ -218692,7 +218371,6 @@ self: { ]; description = "Automatically derive Elm functions to query servant webservices"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "servant-errors" = callPackage @@ -220545,6 +220223,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "serverless-haskell_0_10_5" = callPackage + ({ mkDerivation, aeson, aeson-casing, amazonka-core + , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive + , hspec, hspec-discover, http-types, iproute, lens, network + , network-simple, raw-strings-qq, text, time, unix + , unordered-containers + }: + mkDerivation { + pname = "serverless-haskell"; + version = "0.10.5"; + sha256 = "187pah3k88vp27k1imwj1mqxavd9zykms3is517xrp209ldx5kw1"; + libraryHaskellDepends = [ + aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base + bytestring case-insensitive http-types iproute lens network + network-simple text time unix unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base + bytestring case-insensitive hspec hspec-discover http-types iproute + lens network network-simple raw-strings-qq text time unix + unordered-containers + ]; + testToolDepends = [ hspec-discover ]; + description = "Deploying Haskell code onto AWS Lambda using Serverless"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "serversession" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , containers, data-default, hashable, hspec, nonce, path-pieces @@ -224418,6 +224124,18 @@ self: { broken = true; }) {}; + "singlethongs" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "singlethongs"; + version = "0.1"; + sha256 = "14f7nnlw4hwvv767qgm6cb3ywijm9gyzjprr0i4ffa04r283mm3q"; + libraryHaskellDepends = [ base template-haskell ]; + testHaskellDepends = [ base ]; + description = "Like singletons, but much smaller"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "singleton-bool" = callPackage ({ mkDerivation, base, dec }: mkDerivation { @@ -225494,6 +225212,19 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "slist_0_1_1_0" = callPackage + ({ mkDerivation, base, doctest, Glob }: + mkDerivation { + pname = "slist"; + version = "0.1.1.0"; + sha256 = "046v580i8kxx9fpsvavwpydyfsffky3m735c45dafixrkbhjz55d"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest Glob ]; + description = "Sized list"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sloane" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base , bloomfilter, bytestring, conduit, conduit-extra, containers @@ -227761,6 +227492,20 @@ self: { broken = true; }) {}; + "snappy-lazy" = callPackage + ({ mkDerivation, base, binary, bytestring, snappy, snappy-framing + }: + mkDerivation { + pname = "snappy-lazy"; + version = "0.1.0.0"; + sha256 = "02c2zxlzs5p29rsjj3vsnc2hdamr40is7fzybq6mf5rl9nkicggh"; + libraryHaskellDepends = [ + base binary bytestring snappy snappy-framing + ]; + description = "Lazy bytestring compression and decompression"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "sndfile-enumerators" = callPackage ({ mkDerivation, base, binary, bytestring, containers, filepath , iteratee, listlike-instances, MonadCatchIO-transformers @@ -228630,19 +228375,22 @@ self: { }) {}; "souffle-haskell" = callPackage - ({ mkDerivation, base, hspec, mtl, souffle, template-haskell, text + ({ mkDerivation, base, deepseq, directory, filepath, free, hspec + , mtl, process, souffle, template-haskell, temporary, text , type-errors-pretty, vector }: mkDerivation { pname = "souffle-haskell"; - version = "0.1.0"; - sha256 = "0m8p9fx4avv4kf4hbr248rk9k3vixzkx4gqmcslfra3d79akjyad"; + version = "0.2.0"; + sha256 = "0c67z5wrfi3pp5fyvl8k4j1r8h7ziy6hj5zrwrpf550p3a04chrm"; libraryHaskellDepends = [ - base mtl template-haskell text type-errors-pretty vector + base deepseq directory filepath free mtl process template-haskell + temporary text type-errors-pretty vector ]; libraryToolDepends = [ souffle ]; testHaskellDepends = [ - base hspec mtl template-haskell text type-errors-pretty vector + base deepseq directory filepath free hspec mtl process + template-haskell temporary text type-errors-pretty vector ]; testToolDepends = [ souffle ]; description = "Souffle Datalog bindings for Haskell"; @@ -230414,8 +230162,8 @@ self: { }: mkDerivation { pname = "squeal-postgresql"; - version = "0.6.0.1"; - sha256 = "1c8lsi3qjl1zp0hfhmrv5r6pqsvcilx3g1aw49rrvjrj9xlbbvws"; + version = "0.6.0.2"; + sha256 = "0798aw0ahjdjczz5i8n1dwix8vzd0ccl7cbf473x5mxn549nh0qm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -233498,15 +233246,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_51_0" = callPackage + "stratosphere_0_52_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.51.0"; - sha256 = "053q621zw2c0nf08qc232mnh1cn4qxyzshayis6siqabdnjlqnk2"; + version = "0.52.0"; + sha256 = "1js5rb5f0p7ryja5slpxjpvqfq4f72bw9f66ysd70cjvw3zf3hbh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -234266,6 +234014,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "streamly_0_7_2" = callPackage + ({ mkDerivation, atomic-primops, base, containers, deepseq + , directory, exceptions, fusion-plugin-types, ghc, ghc-prim, heaps + , hspec, lockfree-queue, monad-control, mtl, network, primitive + , QuickCheck, random, transformers, transformers-base + }: + mkDerivation { + pname = "streamly"; + version = "0.7.2"; + sha256 = "007i3rfza0v8zy34lq9ipq2biarg82prmd1vxr5f2zz5xln37wrm"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + atomic-primops base containers deepseq directory exceptions + fusion-plugin-types ghc-prim heaps lockfree-queue monad-control mtl + network primitive transformers transformers-base + ]; + testHaskellDepends = [ + base containers exceptions ghc hspec mtl QuickCheck random + transformers + ]; + description = "Beautiful Streaming, Concurrent and Reactive Composition"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "streamly-bytestring" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, filepath , gauge, hspec, hspec-discover, quickcheck-instances, random @@ -235028,6 +234802,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stripe-concepts_1_0_2_2" = callPackage + ({ mkDerivation, base, bytestring, text }: + mkDerivation { + pname = "stripe-concepts"; + version = "1.0.2.2"; + sha256 = "18dqw3fkviysazx1iy2ljnk6ngpck83ld0msnn8pn68l4qvvhl4r"; + libraryHaskellDepends = [ base bytestring text ]; + description = "Types for the Stripe API"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stripe-core" = callPackage ({ mkDerivation, aeson, base, bytestring, mtl, text, time , transformers, unordered-containers @@ -235108,10 +234894,8 @@ self: { }: mkDerivation { pname = "stripe-scotty"; - version = "1.0.0.0"; - sha256 = "195v1a3sl5skz2jr71r1b4za033s6hib7ld59f4fdrfdr5658sbs"; - revision = "1"; - editedCabalFile = "0c3r39217650yjxxs1523ywvyiirrh2f209gl4hfznyigkx2kg41"; + version = "1.0.0.2"; + sha256 = "1dvmagbxgmlf7970rwf0cjdk8fcpxkl1isiki1bpq4zd07cjnsfv"; libraryHaskellDepends = [ aeson base bytestring http-types scotty stripe-concepts stripe-signature text unordered-containers @@ -235137,6 +234921,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "stripe-signature_1_0_0_2" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, cryptonite + , memory, stripe-concepts, text + }: + mkDerivation { + pname = "stripe-signature"; + version = "1.0.0.2"; + sha256 = "1jjn4znk22993dpzwdqndnsyn4k76v7zqgm7j7dhvlgiwak6yxh6"; + libraryHaskellDepends = [ + base base16-bytestring bytestring cryptonite memory stripe-concepts + text + ]; + testHaskellDepends = [ base bytestring text ]; + description = "Verification of Stripe webhook signatures"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stripe-tests" = callPackage ({ mkDerivation, aeson, base, bytestring, free, hspec, hspec-core , mtl, random, stripe-core, text, time, transformers @@ -235162,8 +234964,8 @@ self: { }: mkDerivation { pname = "stripe-wreq"; - version = "1.0.1.0"; - sha256 = "0i5d0c9zha4v9361p92kq5bpma5dq5aqdkqdrghwpzx0pppfpx3y"; + version = "1.0.1.2"; + sha256 = "0hjk9d0xlg2a6nc2rmc19fmifcyrdj5m69100fy5xkq6brcqxjz1"; libraryHaskellDepends = [ aeson base bytestring lens stripe-concepts text unordered-containers wreq @@ -235613,8 +235415,8 @@ self: { }: mkDerivation { pname = "stylist"; - version = "1.2.0.0"; - sha256 = "1b3kz8kp2dda4f0vghbaxc6y29r39k197fzphy4av8p6vxgp2ka0"; + version = "2.0.0.0"; + sha256 = "1xb2vl4xjbgd52nqm378r43z4xlgzscfy9a7mqp522av3b4v61x7"; libraryHaskellDepends = [ async base css-syntax hashable network-uri text unordered-containers @@ -236861,6 +236663,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "swagger2_2_6" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, base-compat-batteries + , bytestring, Cabal, cabal-doctest, containers, cookie, doctest + , generics-sop, Glob, hashable, hspec, hspec-discover, http-media + , HUnit, insert-ordered-containers, lens, mtl, network, optics-core + , optics-th, QuickCheck, quickcheck-instances, scientific + , template-haskell, text, time, transformers, transformers-compat + , unordered-containers, utf8-string, uuid-types, vector + }: + mkDerivation { + pname = "swagger2"; + version = "2.6"; + sha256 = "0vkhikxf1gpspc9qjgnvz3glb01bd54bnc5kraac7dyn8cxzwak8"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson aeson-pretty base base-compat-batteries bytestring containers + cookie generics-sop hashable http-media insert-ordered-containers + lens mtl network optics-core optics-th QuickCheck scientific + template-haskell text time transformers transformers-compat + unordered-containers uuid-types vector + ]; + testHaskellDepends = [ + aeson base base-compat-batteries bytestring containers doctest Glob + hashable hspec HUnit insert-ordered-containers lens mtl QuickCheck + quickcheck-instances template-haskell text time + unordered-containers utf8-string vector + ]; + testToolDepends = [ hspec-discover ]; + description = "Swagger 2.0 data model"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "swapper" = callPackage ({ mkDerivation, base, binary, bytestring, deepseq, happstack-data , happstack-state, parallel, tokyocabinet @@ -238392,6 +238227,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "systemd_2_3_0" = callPackage + ({ mkDerivation, base, bytestring, network, transformers, unix }: + mkDerivation { + pname = "systemd"; + version = "2.3.0"; + sha256 = "1fa65j996snrdq83kh3jzzs2dsf2ddsscx596p03ykgknz1q1f16"; + libraryHaskellDepends = [ + base bytestring network transformers unix + ]; + testHaskellDepends = [ base network unix ]; + description = "Systemd facilities (Socket activation, Notify)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "systemstats" = callPackage ({ mkDerivation, base, micrologger, optparse-applicative, statgrab , text, text-format, transformers @@ -239762,8 +239612,8 @@ self: { }: mkDerivation { pname = "taskwarrior"; - version = "0.1.2.3"; - sha256 = "02vavv0ddx82h7xa3nky3s54fz8pnar8kgzssz83f08brw35qdjb"; + version = "0.2.0.0"; + sha256 = "1sljpsafyh2kxga7p9dz0nsvqlsmbd399xlgmncnyfh0z9cii7pw"; libraryHaskellDepends = [ aeson base bytestring process random text time unordered-containers uuid @@ -239902,28 +239752,6 @@ self: { }) {}; "tasty-golden" = callPackage - ({ mkDerivation, async, base, bytestring, containers, deepseq - , directory, filepath, mtl, optparse-applicative, process, tagged - , tasty, tasty-hunit, temporary - }: - mkDerivation { - pname = "tasty-golden"; - version = "2.3.3"; - sha256 = "07sk9hw41am2xcpfkzy1jv43wlyxkdd4ajwk8rw2jabva91kv68x"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - async base bytestring containers deepseq directory filepath mtl - optparse-applicative process tagged tasty temporary - ]; - testHaskellDepends = [ - base directory filepath process tasty tasty-hunit temporary - ]; - description = "Golden tests support for tasty"; - license = stdenv.lib.licenses.mit; - }) {}; - - "tasty-golden_2_3_3_1" = callPackage ({ mkDerivation, async, base, bytestring, containers, deepseq , directory, filepath, mtl, optparse-applicative, process, tagged , tasty, tasty-hunit, temporary, text @@ -239943,7 +239771,6 @@ self: { ]; description = "Golden tests support for tasty"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-groundhog-converters" = callPackage @@ -240872,10 +240699,8 @@ self: { }: mkDerivation { pname = "telegram-bot-simple"; - version = "0.2.0"; - sha256 = "1aafj27zj69hvzxv58cz7h8pjbc9c74hmg92swg2sy8ai1rcb34a"; - revision = "1"; - editedCabalFile = "1li6b3m9glhfg8agr9h0mrbxpr8zr46l57mzjfdqndm248ddbklv"; + version = "0.3.0"; + sha256 = "196zb03nj37qfmxgn5lagjdl759bgmnr1vsh26dbbv1zsmlp0pva"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -240897,24 +240722,24 @@ self: { }) {}; "telegram-raw-api" = callPackage - ({ mkDerivation, aeson, base, bytestring, connection - , deriving-aeson, generic-lens, http-client, http-client-tls - , http-media, lens, servant, servant-client, servant-client-core - , servant-multipart, telegram-types, text + ({ mkDerivation, aeson, base, bytestring, deriving-aeson + , generic-lens, hashable, http-client, http-client-tls, http-media + , lens, servant, servant-client, servant-client-core + , servant-multipart, telegram-types, text, time }: mkDerivation { pname = "telegram-raw-api"; - version = "0.1.0"; - sha256 = "0afj22mwxsqdb95m1lb03h4fssyfwsrvi2qdm2bajkvlgaz3h8zh"; + version = "0.3.0"; + sha256 = "0dlazp70jpffpbpdlbyzv7s33jr1ff8z4xjhvkgqyhs23mzi46rc"; libraryHaskellDepends = [ - aeson base bytestring connection deriving-aeson generic-lens + aeson base bytestring deriving-aeson generic-lens hashable http-media lens servant servant-client servant-multipart - telegram-types text + telegram-types text time ]; testHaskellDepends = [ - aeson base bytestring connection deriving-aeson generic-lens + aeson base bytestring deriving-aeson generic-lens hashable http-client http-client-tls http-media lens servant servant-client - servant-client-core servant-multipart telegram-types text + servant-client-core servant-multipart telegram-types text time ]; description = "Servant bindings to the Telegram bot API"; license = stdenv.lib.licenses.bsd3; @@ -240923,19 +240748,19 @@ self: { "telegram-types" = callPackage ({ mkDerivation, aeson, base, bytestring, deriving-aeson, filepath , generic-lens, lens, mime-types, open-union, servant - , servant-multipart, text + , servant-multipart, text, time }: mkDerivation { pname = "telegram-types"; - version = "0.1.0"; - sha256 = "19xrmqcgv5dih9vfxp5dvzzxsfs3x3rsz0ncw9x6xxzbmiirbc0k"; + version = "0.4.0"; + sha256 = "1giv1d713rfdc8svcba2ws8mv6g957f7v1dm3qr9p8082nry2llm"; libraryHaskellDepends = [ aeson base bytestring deriving-aeson filepath generic-lens lens - mime-types open-union servant servant-multipart text + mime-types open-union servant servant-multipart text time ]; testHaskellDepends = [ aeson base bytestring deriving-aeson filepath generic-lens lens - mime-types open-union servant servant-multipart text + mime-types open-union servant servant-multipart text time ]; description = "Types used in Telegram bot API"; license = stdenv.lib.licenses.bsd3; @@ -241033,8 +240858,8 @@ self: { ({ mkDerivation, base, time }: mkDerivation { pname = "tempi"; - version = "1.0.0.0"; - sha256 = "14sap7m01f0l8hkh63qidkivji3y3ivhfkvyq881dn5zs9iajq2l"; + version = "1.0.1.1"; + sha256 = "126j3bph2b7wsn7gvckx7b6sj69djcr57m4yzbdc895mq5zga88j"; libraryHaskellDepends = [ base time ]; description = "For representing musical tempi"; license = stdenv.lib.licenses.bsd3; @@ -241468,8 +241293,6 @@ self: { ]; description = "TensorFlow bindings"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {libtensorflow = null;}; "tensorflow-core-ops" = callPackage @@ -241490,8 +241313,6 @@ self: { ]; description = "Haskell wrappers for Core Tensorflow Ops"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tensorflow-logging" = callPackage @@ -241520,8 +241341,6 @@ self: { ]; description = "TensorBoard related functionality"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tensorflow-mnist" = callPackage @@ -241574,8 +241393,6 @@ self: { ]; description = "Code generation for TensorFlow operations"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tensorflow-ops" = callPackage @@ -241605,8 +241422,6 @@ self: { ]; description = "Friendly layer around TensorFlow bindings"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "tensorflow-proto" = callPackage @@ -241624,8 +241439,6 @@ self: { libraryToolDepends = [ protobuf ]; description = "TensorFlow protocol buffers"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) protobuf;}; "tensorflow-records" = callPackage @@ -242744,6 +242557,29 @@ self: { license = stdenv.lib.licenses.gpl2; }) {}; + "texmath_0_12_0_2" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , mtl, pandoc-types, parsec, process, syb, temporary, text + , utf8-string, xml + }: + mkDerivation { + pname = "texmath"; + version = "0.12.0.2"; + sha256 = "116i1f1qnkraygf05lpw7vg3h6zk8lh14k4i2yx6prb649d2iv1g"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers mtl pandoc-types parsec syb text xml + ]; + testHaskellDepends = [ + base bytestring directory filepath process temporary text + utf8-string xml + ]; + description = "Conversion between formats used to represent mathematics"; + license = stdenv.lib.licenses.gpl2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "texrunner" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, filepath , HUnit, io-streams, lens, mtl, process, semigroups, temporary @@ -242943,8 +242779,6 @@ self: { ]; description = "Text formatting"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "text-format-heavy" = callPackage @@ -244193,25 +244027,6 @@ self: { }) {}; "th-lift-instances" = callPackage - ({ mkDerivation, base, bytestring, containers, QuickCheck - , template-haskell, text, th-lift, transformers, vector - }: - mkDerivation { - pname = "th-lift-instances"; - version = "0.1.15"; - sha256 = "07x8rclsn355zsacgh9xk97j6n13d3457rwcpbwrw5lmq8qz3c13"; - libraryHaskellDepends = [ - base bytestring containers template-haskell text th-lift - transformers vector - ]; - testHaskellDepends = [ - base bytestring containers QuickCheck template-haskell text vector - ]; - description = "Lift instances for template-haskell for common data types"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "th-lift-instances_0_1_16" = callPackage ({ mkDerivation, base, bytestring, containers, QuickCheck , template-haskell, text, th-lift, transformers, vector }: @@ -244228,7 +244043,6 @@ self: { ]; description = "Lift instances for template-haskell for common data types"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-nowq" = callPackage @@ -244245,27 +244059,6 @@ self: { }) {}; "th-orphans" = callPackage - ({ mkDerivation, base, bytestring, ghc-prim, hspec, hspec-discover - , mtl, template-haskell, th-lift, th-lift-instances, th-reify-many - }: - mkDerivation { - pname = "th-orphans"; - version = "0.13.9"; - sha256 = "1xj1gssv77hdx1r3ndg8k49v3ipj3a6r7crkyvx13jrps3m6ng1z"; - revision = "1"; - editedCabalFile = "100gpi0np50vxlapyl6d05w8ss9l2gqacn28i228hsvhvrxxwjdy"; - libraryHaskellDepends = [ - base mtl template-haskell th-lift th-lift-instances th-reify-many - ]; - testHaskellDepends = [ - base bytestring ghc-prim hspec template-haskell th-lift - ]; - testToolDepends = [ hspec-discover ]; - description = "Orphan instances for TH datatypes"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "th-orphans_0_13_10" = callPackage ({ mkDerivation, base, bytestring, ghc-prim, hspec, hspec-discover , mtl, template-haskell, th-lift, th-lift-instances, th-reify-many }: @@ -244282,7 +244075,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Orphan instances for TH datatypes"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "th-pprint" = callPackage @@ -245376,27 +245168,6 @@ self: { }) {}; "tidal" = callPackage - ({ mkDerivation, base, bifunctors, bytestring, clock, colour - , containers, criterion, deepseq, hosc, microspec, mwc-random - , network, parsec, primitive, random, text, transformers, vector - , weigh - }: - mkDerivation { - pname = "tidal"; - version = "1.4.8"; - sha256 = "163ndsx6spicipsy52iqsrm97z6pfr4mm93d2dz7ffckbzsklmdb"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - base bifunctors bytestring clock colour containers deepseq hosc - mwc-random network parsec primitive random text transformers vector - ]; - testHaskellDepends = [ base containers microspec parsec ]; - benchmarkHaskellDepends = [ base criterion weigh ]; - description = "Pattern language for improvised music"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "tidal_1_4_9" = callPackage ({ mkDerivation, base, bifunctors, bytestring, clock, colour , containers, criterion, deepseq, hosc, microspec, mwc-random , network, parsec, primitive, random, text, transformers, vector @@ -245415,7 +245186,6 @@ self: { benchmarkHaskellDepends = [ base criterion weigh ]; description = "Pattern language for improvised music"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tidal-midi" = callPackage @@ -246419,6 +246189,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "timezone-olson_0_2_0" = callPackage + ({ mkDerivation, base, binary, bytestring, extensible-exceptions + , time, timezone-series + }: + mkDerivation { + pname = "timezone-olson"; + version = "0.2.0"; + sha256 = "0b9vh27b9nz803yhd93d5z63bs370lvn4vkdajxaak9clxlw6mwg"; + libraryHaskellDepends = [ + base binary bytestring extensible-exceptions time timezone-series + ]; + description = "A pure Haskell parser and renderer for binary Olson timezone files"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "timezone-olson-th" = callPackage ({ mkDerivation, base, template-haskell, time, timezone-olson , timezone-series @@ -251573,6 +251359,19 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "type-errors-pretty_0_0_1_1" = callPackage + ({ mkDerivation, base, doctest, Glob }: + mkDerivation { + pname = "type-errors-pretty"; + version = "0.0.1.1"; + sha256 = "1z6rqah3qnvnlckcw3xhsp4yyfd21harw6kzqbz20y6k7a22jlf0"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base doctest Glob ]; + description = "Combinators for writing pretty type errors easily"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "type-fun" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -252470,6 +252269,32 @@ self: { broken = true; }) {}; + "typerep-map_0_3_3_0" = callPackage + ({ mkDerivation, base, containers, criterion, deepseq + , dependent-map, dependent-sum, ghc-prim, ghc-typelits-knownnat + , hedgehog, hspec, hspec-hedgehog, primitive, vector + }: + mkDerivation { + pname = "typerep-map"; + version = "0.3.3.0"; + sha256 = "0j7f7k0knpdsh41p0bzg7yv32nz684s3vrxc8pig5ckmmadc4mh4"; + libraryHaskellDepends = [ + base containers deepseq ghc-prim primitive vector + ]; + testHaskellDepends = [ + base ghc-typelits-knownnat hedgehog hspec hspec-hedgehog + ]; + benchmarkHaskellDepends = [ + base criterion deepseq dependent-map dependent-sum + ghc-typelits-knownnat + ]; + doHaddock = false; + description = "Efficient implementation of a dependent map with types as keys"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "types-compat" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -253772,12 +253597,16 @@ self: { }) {}; "unicode-tricks" = callPackage - ({ mkDerivation, base, data-default, QuickCheck, text }: + ({ mkDerivation, base, data-default, hspec, hspec-discover + , QuickCheck, text + }: mkDerivation { pname = "unicode-tricks"; - version = "0.5.0.0"; - sha256 = "0zbsph58w6lfc2357zkl46nm0y08bh3d29ihz6jgpvzi6cxgf5fl"; + version = "0.7.0.0"; + sha256 = "0lwpdqzprm0s7dgn5pvb6plklr45s4qqa0cbash296zcx8195imx"; libraryHaskellDepends = [ base data-default QuickCheck text ]; + testHaskellDepends = [ base hspec ]; + testToolDepends = [ hspec-discover ]; description = "Functions to work with unicode blocks more convenient"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -257000,6 +256829,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "validity-containers_0_5_0_3" = callPackage + ({ mkDerivation, base, containers, validity }: + mkDerivation { + pname = "validity-containers"; + version = "0.5.0.3"; + sha256 = "064sd52y3cmfz9j1yhfz6wsm3993mnh9xgyzy6jzd4cdfmh19sdd"; + libraryHaskellDepends = [ base containers validity ]; + description = "Validity instances for containers"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validity-path" = callPackage ({ mkDerivation, base, filepath, genvalidity-hspec, hspec, path , validity @@ -262755,8 +262596,6 @@ self: { ]; description = "webfont generator"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "webkit" = callPackage @@ -263834,15 +263673,18 @@ self: { }) {}; "with-utf8" = callPackage - ({ mkDerivation, base, deepseq, hedgehog, HUnit, safe-exceptions - , tasty, tasty-discover, tasty-hedgehog, tasty-hunit, temporary - , text, unix + ({ mkDerivation, base, deepseq, directory, hedgehog, HUnit + , safe-exceptions, tasty, tasty-discover, tasty-hedgehog + , tasty-hunit, temporary, text, unix }: mkDerivation { pname = "with-utf8"; - version = "1.0.0.0"; - sha256 = "06xznaszw7d6rznvzhzw3y4z31b4vx4djms85rq4qsbpfbdrh2zc"; + version = "1.0.1.0"; + sha256 = "07b3zpdnaqvp7ipbjnq17is5a70l2bncjqxlnhixpq91bbsczlrp"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base safe-exceptions text ]; + executableHaskellDepends = [ base directory ]; testHaskellDepends = [ base deepseq hedgehog HUnit safe-exceptions tasty tasty-hedgehog tasty-hunit temporary text unix @@ -264882,6 +264724,44 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "wreq-patchable" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec + , authenticate-oauth, base, base16-bytestring, base64-bytestring + , bytestring, Cabal, cabal-doctest, case-insensitive, containers + , cryptonite, directory, doctest, exceptions, filepath, ghc-prim + , hashable, http-client, http-client-tls, http-types, HUnit, lens + , lens-aeson, memory, mime-types, network-info, psqueues + , QuickCheck, snap-core, snap-server, template-haskell, temporary + , test-framework, test-framework-hunit, test-framework-quickcheck2 + , text, time, time-locale-compat, transformers, unix-compat + , unordered-containers, uuid, vector + }: + mkDerivation { + pname = "wreq-patchable"; + version = "1.0.0.0"; + sha256 = "0dj1cq8jmvwk12r5b5hmlj5m9hbhkhjz8bm3zxahwqap5kbi7c1c"; + isLibrary = true; + isExecutable = true; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + aeson attoparsec authenticate-oauth base base16-bytestring + bytestring case-insensitive containers cryptonite exceptions + ghc-prim hashable http-client http-client-tls http-types lens + lens-aeson memory mime-types psqueues template-haskell text time + time-locale-compat unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-pretty base base64-bytestring bytestring + case-insensitive containers directory doctest filepath hashable + http-client http-types HUnit lens lens-aeson network-info + QuickCheck snap-core snap-server temporary test-framework + test-framework-hunit test-framework-quickcheck2 text time + transformers unix-compat unordered-containers uuid vector + ]; + description = "An easy-to-use HTTP client library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "wreq-sb" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec , authenticate-oauth, base, base16-bytestring, base64-bytestring @@ -266581,8 +266461,8 @@ self: { }: mkDerivation { pname = "xml-conduit-stylist"; - version = "1.1.0.0"; - sha256 = "0bj6mcd4k6wlrzizf3j2mnmbbl624k0xcsfrz9c3wpvdxb9iyqsr"; + version = "1.2.0.0"; + sha256 = "140ydh4yzafdiksh149jxvbjsd4r7bvfdh620bawqwnnc5dpk01q"; libraryHaskellDepends = [ base containers css-syntax network-uri stylist text unordered-containers xml-conduit -- cgit v1.2.3 From 8ab67c7a19e2102bbb4950134a8159876a8b775d Mon Sep 17 00:00:00 2001 From: David Guibert Date: Tue, 7 Apr 2020 10:16:32 +0200 Subject: haskell-packages: made darcs compile with ghc 8.8 --- .../haskell-modules/configuration-common.nix | 9 +- .../darcs-2.14.2-Compile-against-GHC-8.8.patch | 333 +++++++++++++++++++++ .../haskell-modules/patches/darcs-setup.patch | 120 ++++++++ pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 460 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/haskell-modules/patches/darcs-2.14.2-Compile-against-GHC-8.8.patch create mode 100644 pkgs/development/haskell-modules/patches/darcs-setup.patch diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d08adf87996..e78767facb7 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -45,6 +45,12 @@ self: super: { # Needs older QuickCheck version attoparsec-varword = dontCheck super.attoparsec-varword; + # http://bugs.darcs.net/issue2642 + darcs = doJailbreak (appendPatches super.darcs [ + ./patches/darcs-setup.patch + ./patches/darcs-2.14.2-Compile-against-GHC-8.8.patch + ]); + # Tests are failing # https://github.com/bos/statistics/issues/123 statistics = dontCheck super.statistics; @@ -1505,9 +1511,6 @@ self: super: { polysemy = self.polysemy_1_3_0_0; }; - # Fixed at head, but hasn't cut a release in awhile. - darcs = doJailbreak super.darcs; - # Test suite requires running a database server. Testing is done upstream. hasql-pool = dontCheck super.hasql-pool; diff --git a/pkgs/development/haskell-modules/patches/darcs-2.14.2-Compile-against-GHC-8.8.patch b/pkgs/development/haskell-modules/patches/darcs-2.14.2-Compile-against-GHC-8.8.patch new file mode 100644 index 00000000000..04ff068e1d0 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/darcs-2.14.2-Compile-against-GHC-8.8.patch @@ -0,0 +1,333 @@ +From 2490fa65eeba52699a7c0e303aa5cb9b78c2b1cf Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= +Date: Fri, 17 Apr 2020 20:49:23 +0200 +Subject: [PATCH] Compile against GHC 8.8 + +--- + Setup.hs | 15 --------------- + src/Darcs/Patch/Depends.hs | 2 +- + src/Darcs/Patch/Match.hs | 12 ++++++------ + src/Darcs/Patch/PatchInfoAnd.hs | 2 +- + src/Darcs/Patch/Prim/V1/Apply.hs | 6 +++--- + src/Darcs/Patch/Prim/V1/Commute.hs | 1 + + src/Darcs/Patch/ReadMonads.hs | 1 + + src/Darcs/Patch/V1/Commute.hs | 1 + + src/Darcs/Repository/Diff.hs | 2 +- + src/Darcs/Repository/Match.hs | 2 +- + src/Darcs/Util/Tree/Monad.hs | 4 ++-- + 12 files changed, 30 insertions(+), 42 deletions(-) + +diff --git a/Setup.hs b/Setup.hs +index f5cc3e8..05caac4 100644 +--- a/Setup.hs ++++ b/Setup.hs +@@ -75,21 +75,6 @@ + postInst = \ _ flags pkg lbi -> + installManpage pkg lbi (fromFlag $ installVerbosity flags) NoCopyDest, + +- sDistHook = \ pkg lbi hooks flags -> do +- let pkgVer = packageVersion pkg +- verb = fromFlag $ sDistVerbosity flags +- x <- versionPatches verb pkgVer +- y <- context verb +- rewriteFileEx silent "release/distributed-version" $ show x +- rewriteFileEx silent "release/distributed-context" $ show y +- putStrLn "about to hand over" +- let pkg' = pkg { library = sanity (library pkg) } +- sanity (Just lib) = Just $ lib { libBuildInfo = sanity' $ libBuildInfo lib } +- sanity _ = error "eh" +- sanity' bi = bi { otherModules = [ m | m <- otherModules bi, toFilePath m /= "Version" ] } +- +- sDistHook simpleUserHooks pkg' lbi hooks flags +- , + postConf = \_ _ _ _ -> return () --- Usually this checked for external C + --- dependencies, but we already have performed such + --- check in the confHook +--- a/darcs.cabal 1970-01-01 01:00:01.000000000 +0100 ++++ b/darcs.cabal 2020-04-18 10:26:07.605129733 +0200 +@@ -1,6 +1,5 @@ + Name: darcs + version: 2.14.2 +-x-revision: 1 + License: GPL-2 + License-file: COPYING + Author: David Roundy , +@@ -75,7 +74,7 @@ + description: Use libcurl for HTTP support. + + -- in future this could extend to any other external libraries, +--- e.g. libiconv ++-- e.g. libiconv + flag pkgconfig + description: Use pkgconfig to configure libcurl + default: False +@@ -113,7 +112,7 @@ + -- ---------------------------------------------------------------------- + + custom-setup +- setup-depends: base >= 4.9 && < 4.13, ++ setup-depends: base >= 4.9 && <5, + Cabal >= 1.24, + process >= 1.2.3.0 && < 1.7, + filepath >= 1.4.1 && < 1.5.0.0, +@@ -381,7 +380,7 @@ + else + build-depends: unix >= 2.7.1.0 && < 2.8 + +- build-depends: base >= 4.9 && < 4.13, ++ build-depends: base >= 4.9 && <5, + stm >= 2.1 && < 2.6, + binary >= 0.5 && < 0.10, + containers >= 0.5.6.2 && < 0.7, +@@ -402,19 +401,19 @@ + tar >= 0.5 && < 0.6, + data-ordlist == 0.4.*, + attoparsec >= 0.13.0.1 && < 0.14, +- zip-archive >= 0.3 && < 0.5, ++ zip-archive >= 0.3 && <1, + async >= 2.0.2 && < 2.3, +- sandi >= 0.4 && < 0.6, ++ sandi >= 0.4 && <1, + unix-compat >= 0.4.2 && < 0.6, + bytestring >= 0.10.6 && < 0.11, + old-time >= 1.1.0.3 && < 1.2, + time >= 1.5.0.1 && < 1.10, +- text >= 1.2.1.3 && < 1.3, ++ text >= 1.2.1.3 && <2, + directory >= 1.2.6.2 && < 1.4, + process >= 1.2.3.0 && < 1.7, + array >= 0.5.1.0 && < 0.6, + random >= 1.1 && < 1.2, +- hashable >= 1.2.3.3 && < 1.3, ++ hashable >= 1.2.3.3 && <2, + mmap >= 0.5.9 && < 0.6, + zlib >= 0.6.1.2 && < 0.7.0.0, + network-uri == 2.6.*, +@@ -443,7 +442,7 @@ + + -- The terminfo package cannot be built on Windows. + if flag(terminfo) && !os(windows) +- build-depends: terminfo >= 0.4.0.2 && < 0.5 ++ build-depends: terminfo >= 0.4.0.2 && <1 + cpp-options: -DHAVE_TERMINFO + + default-extensions: +@@ -500,7 +499,7 @@ + cc-options: -D_REENTRANT + + build-depends: darcs, +- base >= 4.9 && < 4.13 ++ base >= 4.9 && <5 + + -- ---------------------------------------------------------------------- + -- unit test driver +@@ -518,7 +517,7 @@ + build-depends: Win32 >= 2.3.1 && < 2.4 + + build-depends: darcs, +- base >= 4.9 && < 4.13, ++ base >= 4.9 && <5, + array >= 0.5.1.0 && < 0.6, + bytestring >= 0.10.6 && < 0.11, + cmdargs >= 0.10.10 && < 0.11, +@@ -527,15 +526,15 @@ + mtl >= 2.2.1 && < 2.3, + shelly >= 1.6.8 && < 1.9, + split >= 0.2.2 && < 0.3, +- text >= 1.2.1.3 && < 1.3, ++ text >= 1.2.1.3 && <2, + directory >= 1.2.6.2 && < 1.4, + FindBin >= 0.0.5 && < 0.1, +- QuickCheck >= 2.8.2 && < 2.13, ++ QuickCheck >= 2.8.2 && <3, + HUnit >= 1.3 && < 1.7, + test-framework >= 0.8.1.1 && < 0.9, + test-framework-hunit >= 0.3.0.2 && < 0.4, + test-framework-quickcheck2 >= 0.3.0.3 && < 0.4, +- zip-archive >= 0.3 && < 0.5 ++ zip-archive >= 0.3 && <1 + + -- https://github.com/yesodweb/Shelly.hs/issues/177 + if os(windows) +diff --git a/src/Darcs/Patch/Depends.hs b/src/Darcs/Patch/Depends.hs +index 8531294..a4c71cb 100644 +--- a/src/Darcs/Patch/Depends.hs ++++ b/src/Darcs/Patch/Depends.hs +@@ -251,7 +251,7 @@ splitOnTag _ (PatchSet NilRL NilRL) = Nothing + unwrapOneTagged :: (Monad m) => PatchSet rt p wX wY -> m (PatchSet rt p wX wY) + unwrapOneTagged (PatchSet (ts :<: Tagged t _ tps) ps) = + return $ PatchSet ts (tps :<: t +<+ ps) +-unwrapOneTagged _ = fail "called unwrapOneTagged with no Tagged's in the set" ++unwrapOneTagged _ = error "called unwrapOneTagged with no Tagged's in the set" + + -- | @getUncovered ps@ returns the 'PatchInfo' for all the patches in + -- @ps@ that are not depended on by anything else *through explicit +diff --git a/src/Darcs/Patch/Match.hs b/src/Darcs/Patch/Match.hs +index aba6c7a..2b6f53a 100644 +--- a/src/Darcs/Patch/Match.hs ++++ b/src/Darcs/Patch/Match.hs +@@ -421,7 +421,7 @@ getNonrangeMatchS fs repo = + Just m -> if nonrangeMatcherIsTag fs + then getTagS m repo + else getMatcherS Exclusive m repo +- Nothing -> fail "Pattern not specified in getNonrangeMatch." ++ Nothing -> error "Pattern not specified in getNonrangeMatch." + + -- | @firstMatch fs@ tells whether @fs@ implies a "first match", that + -- is if we match against patches from a point in the past on, rather +@@ -441,7 +441,7 @@ getFirstMatchS fs repo = + Just (_,b) -> unpullLastN repo b -- b is chronologically earlier than a + Nothing -> + case firstMatcher fs of +- Nothing -> fail "Pattern not specified in getFirstMatchS." ++ Nothing -> error "Pattern not specified in getFirstMatchS." + Just m -> if firstMatcherIsTag fs + then getTagS m repo + else getMatcherS Inclusive m repo +@@ -462,7 +462,7 @@ checkMatchSyntax :: [MatchFlag] -> IO () + checkMatchSyntax opts = + case getMatchPattern opts of + Nothing -> return () +- Just p -> either fail (const $ return ()) (parseMatch p::Either String (MatchFun rt DummyPatch)) ++ Just p -> either error (const $ return ()) (parseMatch p::Either String (MatchFun rt DummyPatch)) + + getMatchPattern :: [MatchFlag] -> Maybe String + getMatchPattern [] = Nothing +@@ -718,7 +718,7 @@ getMatcherS :: (ApplyMonad (ApplyState p) m, Matchable p) => + getMatcherS ioe m repo = + if matchExists m repo + then applyInvToMatcher ioe m repo +- else fail $ "Couldn't match pattern "++ show m ++ else error $ "Couldn't match pattern "++ show m + + getTagS :: (ApplyMonad (ApplyState p) m, MonadProgress m, Matchable p) => + Matcher rt p -> PatchSet rt p Origin wX -> m () +diff --git a/src/Darcs/Patch/PatchInfoAnd.hs b/src/Darcs/Patch/PatchInfoAnd.hs +index 2da7ec8..1147410 100644 +--- a/src/Darcs/Patch/PatchInfoAnd.hs ++++ b/src/Darcs/Patch/PatchInfoAnd.hs +@@ -167,7 +167,7 @@ conscientiously er (PIAP pinf hp) = + + -- | @hopefullyM@ is a version of @hopefully@ which calls @fail@ in a + -- monad instead of erroring. +-hopefullyM :: Monad m => PatchInfoAnd rt p wA wB -> m (WrappedNamed rt p wA wB) ++hopefullyM :: MonadFail m => PatchInfoAnd rt p wA wB -> m (WrappedNamed rt p wA wB) + hopefullyM (PIAP pinf hp) = case hopefully2either hp of + Right p -> return p + Left e -> fail $ renderString +diff --git a/src/Darcs/Patch/Prim/V1/Apply.hs b/src/Darcs/Patch/Prim/V1/Apply.hs +index bea7e41..7984d21 100644 +--- a/src/Darcs/Patch/Prim/V1/Apply.hs ++++ b/src/Darcs/Patch/Prim/V1/Apply.hs +@@ -41,13 +41,13 @@ instance Apply Prim where + apply (FP f (TokReplace t o n)) = mModifyFilePS f doreplace + where doreplace fc = + case tryTokReplace t (BC.pack o) (BC.pack n) fc of +- Nothing -> fail $ "replace patch to " ++ fn2fp f ++ Nothing -> error $ "replace patch to " ++ fn2fp f + ++ " couldn't apply." + Just fc' -> return fc' + apply (FP f (Binary o n)) = mModifyFilePS f doapply + where doapply oldf = if o == oldf + then return n +- else fail $ "binary patch to " ++ fn2fp f ++ else error $ "binary patch to " ++ fn2fp f + ++ " couldn't apply." + apply (DP d AddDir) = mCreateDirectory d + apply (DP d RmDir) = mRemoveDirectory d +@@ -115,7 +115,7 @@ applyHunk f h fc = + case applyHunkLines h fc of + Right fc' -> return fc' + Left msg -> +- fail $ ++ error $ + "### Error applying:\n" ++ renderHunk h ++ + "\n### to file " ++ fn2fp f ++ ":\n" ++ BC.unpack fc ++ + "### Reason: " ++ msg +diff --git a/src/Darcs/Patch/Prim/V1/Commute.hs b/src/Darcs/Patch/Prim/V1/Commute.hs +index 7639dbd..e1432e6 100644 +--- a/src/Darcs/Patch/Prim/V1/Commute.hs ++++ b/src/Darcs/Patch/Prim/V1/Commute.hs +@@ -58,6 +58,7 @@ instance Monad Perhaps where + Failed >>= _ = Failed + Unknown >>= _ = Unknown + return = Succeeded ++instance MonadFail Perhaps where + fail _ = Unknown + + instance Alternative Perhaps where +diff --git a/src/Darcs/Patch/ReadMonads.hs b/src/Darcs/Patch/ReadMonads.hs +index 62a4f81..e1cb149 100644 +--- a/src/Darcs/Patch/ReadMonads.hs ++++ b/src/Darcs/Patch/ReadMonads.hs +@@ -237,6 +237,7 @@ failSM _ = SM (\_ -> Nothing) + instance Monad SM where + (>>=) = bindSM + return = returnSM ++instance MonadFail SM where + fail = failSM + + instance ParserM SM where +diff --git a/src/Darcs/Patch/V1/Commute.hs b/src/Darcs/Patch/V1/Commute.hs +index 0bb41a3..c6c3382 100644 +--- a/src/Darcs/Patch/V1/Commute.hs ++++ b/src/Darcs/Patch/V1/Commute.hs +@@ -93,6 +93,7 @@ instance Monad Perhaps where + Failed >>= _ = Failed + Unknown >>= _ = Unknown + return = Succeeded ++instance MonadFail Perhaps where + fail _ = Unknown + + instance Alternative Perhaps where +diff --git a/src/Darcs/Repository/Diff.hs b/src/Darcs/Repository/Diff.hs +index 8078d49..e0e2341 100644 +--- a/src/Darcs/Repository/Diff.hs ++++ b/src/Darcs/Repository/Diff.hs +@@ -138,7 +138,7 @@ treeDiff da ft t1 t2 = do + do rmDirP <- diff p (Removed subtree) + addFileP <- diff p (Changed (File emptyBlob) b') + return $ joinGap (+>+) rmDirP addFileP +- diff p _ = fail $ "Missing case at path " ++ show p ++ diff p _ = error $ "Missing case at path " ++ show p + + text_diff p a b + | BL.null a && BL.null b = emptyGap NilFL +diff --git a/src/Darcs/Repository/Match.hs b/src/Darcs/Repository/Match.hs +index 08c9f13..f33cabe 100644 +--- a/src/Darcs/Repository/Match.hs ++++ b/src/Darcs/Repository/Match.hs +@@ -60,7 +60,7 @@ getNonrangeMatch :: (ApplyMonad (ApplyState p) DefaultIO, IsRepoType rt, RepoPat + getNonrangeMatch r = withRecordedMatch r . getMatch where + getMatch fs = case hasIndexRange fs of + Just (n, m) | n == m -> applyNInv (n-1) +- | otherwise -> fail "Index range is not allowed for this command." ++ | otherwise -> error "Index range is not allowed for this command." + _ -> getNonrangeMatchS fs + + getOnePatchset :: (IsRepoType rt, RepoPatch p) +diff --git a/src/Darcs/Util/Tree/Monad.hs b/src/Darcs/Util/Tree/Monad.hs +index 0e01d9b..296fdc4 100644 +--- a/src/Darcs/Util/Tree/Monad.hs ++++ b/src/Darcs/Util/Tree/Monad.hs +@@ -216,7 +216,7 @@ instance (Monad m) => TreeRO (TreeMonad m) where + t <- gets tree + let f = findFile t p' + case f of +- Nothing -> fail $ "No such file " ++ show p' ++ Nothing -> error $ "No such file " ++ show p' + Just x -> lift (readBlob x) + + currentDirectory = ask +@@ -251,7 +251,7 @@ instance (Monad m) => TreeRW (TreeMonad m) where + let item = find tr from' + found_to = find tr to' + unless (isNothing found_to) $ +- fail $ "Error renaming: destination " ++ show to ++ " exists." ++ error $ "Error renaming: destination " ++ show to ++ " exists." + unless (isNothing item) $ do + modifyItem from Nothing + modifyItem to item +-- +2.23.1 + diff --git a/pkgs/development/haskell-modules/patches/darcs-setup.patch b/pkgs/development/haskell-modules/patches/darcs-setup.patch new file mode 100644 index 00000000000..fbc7efde428 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/darcs-setup.patch @@ -0,0 +1,120 @@ +--- darcs-2.14.2/Setup.hs 2019-01-27 03:14:51.000000000 +1300 ++++ darcs.net/Setup.hs 2019-10-18 02:41:57.000000000 +1300 +@@ -11,7 +11,9 @@ + , TestSuite(testBuildInfo) + , updatePackageDescription + , cppOptions, ccOptions +- , library, libBuildInfo, otherModules ) ++ , library, libBuildInfo, otherModules ++ , ComponentName(CExeName) ++ ) + import Distribution.Package + ( packageVersion ) + import Distribution.Version( Version ) +@@ -21,24 +23,27 @@ + import Distribution.Simple.Setup + (buildVerbosity, copyDest, copyVerbosity, fromFlag, + haddockVerbosity, installVerbosity, sDistVerbosity, replVerbosity ) +-import Distribution.Simple.BuildPaths ( autogenModulesDir ) ++import Distribution.Simple.BuildPaths ( autogenPackageModulesDir ) + import Distribution.System + ( OS(Windows), buildOS ) + import Distribution.Simple.Utils + (copyFiles, createDirectoryIfMissingVerbose, rawSystemStdout, +- rewriteFile ) ++ rewriteFileEx) ++import Distribution.Types.UnqualComponentName + import Distribution.Verbosity +- ( Verbosity ) ++ ( Verbosity, silent ) + import Distribution.Text + ( display ) +-import Control.Monad ( unless, void ) + ++import Control.Monad ( unless, when, void ) + import System.Directory + ( doesDirectoryExist, doesFileExist ) + import System.IO + ( openFile, IOMode(..) ) + import System.Process (runProcess) + import Data.List( isInfixOf, lines ) ++import qualified Data.Map as M ++import Data.Maybe ( isJust ) + import System.FilePath ( () ) + import Foreign.Marshal.Utils ( with ) + import Foreign.Storable ( peek ) +@@ -75,8 +80,8 @@ + verb = fromFlag $ sDistVerbosity flags + x <- versionPatches verb pkgVer + y <- context verb +- rewriteFile "release/distributed-version" $ show x +- rewriteFile "release/distributed-context" $ show y ++ rewriteFileEx silent "release/distributed-version" $ show x ++ rewriteFileEx silent "release/distributed-context" $ show y + putStrLn "about to hand over" + let pkg' = pkg { library = sanity (library pkg) } + sanity (Just lib) = Just $ lib { libBuildInfo = sanity' $ libBuildInfo lib } +@@ -105,8 +110,7 @@ + littleEndian <- testEndianness + let args = ("-DPACKAGE_VERSION=" ++ show' version) : + [arg | (arg, True) <- -- include fst iff snd. +- [-- We have MAPI iff building on/for Windows. +- ("-DHAVE_MAPI", buildOS == Windows), ++ [ + ("-DLITTLEENDIAN", littleEndian), + ("-DBIGENDIAN", not littleEndian)]] + bi = emptyBuildInfo { cppOptions = args, ccOptions = args } +@@ -133,20 +137,26 @@ + -- man page + -- --------------------------------------------------------------------- + ++hasDarcsExe :: LocalBuildInfo -> Bool ++hasDarcsExe = isJust . M.lookup darcsExe . componentNameMap where ++ darcsExe = CExeName (mkUnqualComponentName "darcs") ++ + buildManpage :: LocalBuildInfo -> IO () +-buildManpage lbi = do +- let darcs = buildDir lbi "darcs/darcs" +- manpage = buildDir lbi "darcs/darcs.1" +- manpageHandle <- openFile manpage WriteMode +- void $ runProcess darcs ["help","manpage"] +- Nothing Nothing Nothing (Just manpageHandle) Nothing ++buildManpage lbi = ++ when (hasDarcsExe lbi) $ do ++ let darcs = buildDir lbi "darcs/darcs" ++ manpage = buildDir lbi "darcs/darcs.1" ++ manpageHandle <- openFile manpage WriteMode ++ void $ runProcess darcs ["help","manpage"] ++ Nothing Nothing Nothing (Just manpageHandle) Nothing + +-installManpage :: PackageDescription -> LocalBuildInfo +- -> Verbosity -> CopyDest -> IO () ++installManpage :: PackageDescription -> LocalBuildInfo -> Verbosity -> CopyDest -> IO () + installManpage pkg lbi verbosity copy = +- copyFiles verbosity +- (mandir (absoluteInstallDirs pkg lbi copy) "man1") +- [(buildDir lbi "darcs", "darcs.1")] ++ when (hasDarcsExe lbi) $ ++ copyFiles ++ verbosity ++ (mandir (absoluteInstallDirs pkg lbi copy) "man1") ++ [(buildDir lbi "darcs", "darcs.1")] + + -- --------------------------------------------------------------------- + -- version module +@@ -187,12 +197,13 @@ + generateVersionModule :: Verbosity -> LocalBuildInfo + -> String -> String -> IO () + generateVersionModule verbosity lbi version state = do +- let dir = autogenModulesDir lbi ++ let dir = autogenPackageModulesDir lbi + createDirectoryIfMissingVerbose verbosity True dir + ctx <- context verbosity + hash <- weakhash verbosity +- rewriteFile (dir "Version.hs") $ unlines ++ rewriteFileEx silent (dir "Version.hs") $ unlines + ["module Version where" ++ ,"import Darcs.Prelude" + ,"version, weakhash, context :: String" + ,"version = \"" ++ version ++ " (" ++ state ++ ")\"" + ,"weakhash = " ++ case hash of diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1d2f62ad1f2..c8a13e06501 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18947,7 +18947,7 @@ in dablin = callPackage ../applications/radio/dablin { }; - darcs = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskell.packages.ghc865.darcs) (drv: { + darcs = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.darcs) (drv: { configureFlags = (stdenv.lib.remove "-flibrary" drv.configureFlags or []) ++ ["-f-library"]; }); -- cgit v1.2.3 From 32c8e793bce08a7ec53c9da4d3924a681173c1e0 Mon Sep 17 00:00:00 2001 From: Ashesh Ambasta Date: Sun, 19 Apr 2020 09:47:06 +0200 Subject: Additional docs for doJailbreak Yesterday with @infinisil on #nixos, he pointed me to: peti/jailbreak-cabal#7 after a good deal of time wrangling through a package to make it work. The `nix-build -K` command, is very handy for debugging things like these, again I learnt from infinisil. And after much experimenting and looking through, it turned out that jailbreaking wasn't working as expected, and its documentation could point it out to avoid future confusion. --- pkgs/development/haskell-modules/lib.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix index aebab7b6f04..58d50592ac4 100644 --- a/pkgs/development/haskell-modules/lib.nix +++ b/pkgs/development/haskell-modules/lib.nix @@ -86,6 +86,11 @@ rec { future. Instead of jailbreaking, you can patch the cabal file. + + Note that jailbreaking at this time, doesn't lift bounds on + conditional branches. + https://github.com/peti/jailbreak-cabal/issues/7 has further details. + */ doJailbreak = drv: overrideCabal drv (drv: { jailbreak = true; }); -- cgit v1.2.3 From 28556cd9abcb31ea64c218b07535f6d6589a426b Mon Sep 17 00:00:00 2001 From: andys8 Date: Mon, 20 Apr 2020 16:34:07 +0200 Subject: Haskell: apply-refact version has to match ghc This commit maps: * GHC 8.6 to apply-refact 0.6 * GHC 8.8 to apply-refact 0.7 * GHC 8.10 to apply-refact 0.8 See: --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 2 ++ pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 2 ++ pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 2 ++ pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 3 +++ 4 files changed, 9 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 74ca5c9342f..b6595f67fee 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -94,4 +94,6 @@ self: super: { sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f"; }); + # Only 0.8 is compatible with ghc 8.10 https://hackage.haskell.org/package/apply-refact/changelog + apply-refact = super.apply-refact_0_8_0_0; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index d2eb43c7ca5..57c38b22ccd 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -91,4 +91,6 @@ self: super: { # ghc versions prior to 8.8.x needs additional dependency to compile successfully. ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex self.ghc-lib-parser; + # Only 0.6 is compatible with ghc 8.6 https://hackage.haskell.org/package/apply-refact/changelog + apply-refact = super.apply-refact_0_6_0_0; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 4c2f12b594f..56fdcede7cb 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -96,4 +96,6 @@ self: super: { # of issues with Cabal 3.x. darcs = dontDistribute super.darcs; + # Only 0.7 is compatible with ghc 8.7 https://hackage.haskell.org/package/apply-refact/changelog + apply-refact = super.apply-refact_0_7_0_0; } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 7b43b826937..83b4b388cd8 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2358,6 +2358,9 @@ extra-packages: - ansi-terminal == 0.10.3 # required by cabal-plan, and policeman in ghc-8.8.x - aeson-pretty < 0.8 # required by elm compiler - apply-refact < 0.4 # newer versions don't work with GHC 8.0.x + - apply-refact == 0.6.0.0 # works with GHC 8.6.x + - apply-refact == 0.7.0.0 # works with GHC 8.8.x + - apply-refact == 0.8.0.0 # works with GHC 8.10.x - binary > 0.7 && < 0.8 # keep a 7.x major release around for older compilers - binary > 0.8 && < 0.9 # keep a 8.x major release around for older compilers - blank-canvas < 0.6.3 # more recent versions depend on base-compat-batteries == 0.10.* but we're on base-compat-0.9.* -- cgit v1.2.3 From 5b3104acd43a14f647f00350e64a0c9cc81dca97 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Wed, 22 Apr 2020 10:08:42 +0900 Subject: Update pkgs/development/haskell-modules/configuration-hackage2nix.yaml --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 83b4b388cd8..e4472e400c1 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2358,9 +2358,9 @@ extra-packages: - ansi-terminal == 0.10.3 # required by cabal-plan, and policeman in ghc-8.8.x - aeson-pretty < 0.8 # required by elm compiler - apply-refact < 0.4 # newer versions don't work with GHC 8.0.x - - apply-refact == 0.6.0.0 # works with GHC 8.6.x - - apply-refact == 0.7.0.0 # works with GHC 8.8.x - - apply-refact == 0.8.0.0 # works with GHC 8.10.x + - apply-refact == 0.6.0.0 # works with GHC 8.6.x https://hackage.haskell.org/package/apply-refact/changelog + - apply-refact == 0.7.0.0 # works with GHC 8.8.x https://hackage.haskell.org/package/apply-refact/changelog + - apply-refact == 0.8.0.0 # works with GHC 8.10.x https://hackage.haskell.org/package/apply-refact/changelog - binary > 0.7 && < 0.8 # keep a 7.x major release around for older compilers - binary > 0.8 && < 0.9 # keep a 8.x major release around for older compilers - blank-canvas < 0.6.3 # more recent versions depend on base-compat-batteries == 0.10.* but we're on base-compat-0.9.* -- cgit v1.2.3 From da45fd982f6ec352e2adbd183c59a58139f5f769 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 24 Apr 2020 14:08:56 +0200 Subject: haskell-microlens-th: drop obsolete override --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index b6595f67fee..4b5a7360335 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -60,7 +60,6 @@ self: super: { zlib = doJailbreak super.zlib; # Use the latest version to fix the build. - microlens-th = self.microlens-th_0_4_3_5; optics-core = self.optics-core_0_3; repline = self.repline_0_3_0_0; ghc-lib-parser-ex = self.ghc-lib-parser-ex_8_10_0_4; -- cgit v1.2.3 From a1463efcdef66b95cf95827d417515abc59c3d3f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 24 Apr 2020 21:17:30 +0200 Subject: haskell-haddock: fix build with our default compiler ghc-8.8.3 Fixes https://github.com/NixOS/nixpkgs/issues/85728. --- pkgs/development/haskell-modules/configuration-common.nix | 5 ----- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 4 ++++ pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 3 ++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e78767facb7..90d9ad9cd49 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1067,11 +1067,6 @@ self: super: { # https://github.com/haskell-hvr/hgettext/issues/14 hgettext = doJailbreak super.hgettext; - # 2.23.0 supports GHC 8.x and up - haddock = super.haddock_2_22_0; - # haddock-api-2.22.0: Break out of “QuickCheck ==2.11.*, hspec >=2.4.4 && <2.6” - haddock-api = dontHaddock (doJailbreak (super.haddock-api_2_22_0)); - # The test suite is broken. Break out of "base-compat >=0.9.3 && <0.10, hspec >=2.4.4 && <2.5". haddock-library = doJailbreak (dontCheck super.haddock-library); diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 56fdcede7cb..bdd5a9007d7 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -41,6 +41,10 @@ self: super: { unix = null; xhtml = null; + # GHC 8.8.x can build haddock version 2.23.* + haddock = self.haddock_2_23_1; + haddock-api = self.haddock-api_2_23_1; + # These builds need Cabal 3.2.x. cabal2spec = super.cabal2spec.override { Cabal = self.Cabal_3_2_0_0; }; cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; }); diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index e4472e400c1..d57c49554c4 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2379,7 +2379,8 @@ extra-packages: - ghc-tcplugins-extra ==0.3.2 # required for polysemy-plugin 0.2.5.0 - gloss < 1.9.3 # new versions don't compile with GHC 7.8.x - haddock == 2.22.* # required on GHC 8.0.x - - haddock-api == 2.22.* # required on GHC 7.8.x + - haddock == 2.23.* # required on GHC < 8.10.x + - haddock-api == 2.23.* # required on GHC < 8.10.x - haddock-library ==1.7.* # required by stylish-cabal-0.5.0.0 - happy <1.19.6 # newer versions break Agda - happy == 1.19.9 # for purescript -- cgit v1.2.3 From e567a3b6222c478d30a4666be6f8f8cefccb3ae2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 24 Apr 2020 21:21:39 +0200 Subject: haskell-haddock: fix build with for the latest compiler ghc-8.10.1 --- pkgs/development/haskell-modules/configuration-common.nix | 1 + pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 3 +++ 2 files changed, 4 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 90d9ad9cd49..d6edaa86470 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1069,6 +1069,7 @@ self: super: { # The test suite is broken. Break out of "base-compat >=0.9.3 && <0.10, hspec >=2.4.4 && <2.5". haddock-library = doJailbreak (dontCheck super.haddock-library); + haddock-library_1_9_0 = doJailbreak (dontCheck super.haddock-library_1_9_0); # Generate shell completion. cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 4b5a7360335..96ab593cf84 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -42,6 +42,9 @@ self: super: { unix = null; xhtml = null; + # Deviate from Stackage LTS-15.x to fix the build. + haddock-library = self.haddock-library_1_9_0; + # Jailbreak to fix the build. async = doJailbreak super.async; ChasingBottoms = doJailbreak super.ChasingBottoms; -- cgit v1.2.3 From ea59fe7aa6d966d9c9d47da39823642f9e7b7074 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 24 Apr 2020 22:03:30 +0200 Subject: neomutt: 20200417 -> 20200424 https://github.com/neomutt/neomutt/releases/tag/20200424 --- .../networking/mailreaders/neomutt/default.nix | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 612af14b87f..73aef9d17c7 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -1,29 +1,20 @@ { stdenv, fetchFromGitHub, gettext, makeWrapper, tcl, which, writeScript , ncurses, perl , cyrus_sasl, gss, gpgme, kerberos, libidn, libxml2, notmuch, openssl , lmdb, libxslt, docbook_xsl, docbook_xml_dtd_42, mailcap, runtimeShell, sqlite, zlib -, fetchpatch +, glibcLocales }: stdenv.mkDerivation rec { - version = "20200417"; + version = "20200424"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "0s7943r2s14kavyjf7i70vca252l626539i09a9vk0i9sfi35vx5"; + sha256 = "055hxlfrpn5a50vnh31faskcdkcjyzzr02gj5x2dizpf7vd67162"; }; - patches = [ - # Remove on next release. Fixes the `change-folder` - # macro (https://github.com/neomutt/neomutt/issues/2268) - (fetchpatch { - url = "https://github.com/neomutt/neomutt/commit/9e7537caddb9c6adc720bb3322a7512cf51ab025.patch"; - sha256 = "1vmlvgnhx1ra3rnyjkpkv6lrqw8xfh2kkmqp43fqn9lnk3pkjxvv"; - }) - ]; - buildInputs = [ cyrus_sasl gss gpgme kerberos libidn ncurses notmuch openssl perl lmdb @@ -95,8 +86,10 @@ stdenv.mkDerivation rec { (cd test-files && ./setup.sh) export NEOMUTT_TEST_DIR=$(pwd)/test-files + export LC_ALL="en_US.UTF-8" ''; + checkInputs = [ glibcLocales ]; checkTarget = "test"; postCheck = "unset NEOMUTT_TEST_DIR"; -- cgit v1.2.3 From 295475a378a58d4ac344944b470eab2d3f97866e Mon Sep 17 00:00:00 2001 From: Kevin Stock Date: Fri, 24 Apr 2020 10:39:12 -0400 Subject: aspell, tla: use HTTPS instead of FTP ftp.gnu.org intends to disable the FTP protocol for downloads on this server, and strongly recommends using https instead. --- pkgs/applications/version-management/arch/default.nix | 2 +- pkgs/development/libraries/aspell/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/arch/default.nix b/pkgs/applications/version-management/arch/default.nix index 2108afc5106..d41040f49a0 100644 --- a/pkgs/applications/version-management/arch/default.nix +++ b/pkgs/applications/version-management/arch/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "tla-1.3.5"; src = fetchurl { - url = "ftp://ftp.gnu.org/old-gnu/gnu-arch/" + name + ".tar.gz"; + url = "https://ftp.gnu.org/old-gnu/gnu-arch/" + name + ".tar.gz"; sha256 = "01mfzj1i6p4s8191cgd5850hds1zls88hkf9rb6qx1vqjv585aj0"; }; diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix index 19ee39a3b9e..91fd83bf916 100644 --- a/pkgs/development/libraries/aspell/default.nix +++ b/pkgs/development/libraries/aspell/default.nix @@ -8,7 +8,7 @@ let # dictionary like Debian does. devaMapsSource = fetchzip { name = "aspell-u-deva"; - url = "ftp://ftp.gnu.org/gnu/aspell/dict/mr/aspell6-mr-0.10-0.tar.bz2"; + url = "https://ftp.gnu.org/gnu/aspell/dict/mr/aspell6-mr-0.10-0.tar.bz2"; sha256 = "1v8cdl8x2j1d4vbvsq1xrqys69bbccd6mi03fywrhkrrljviyri1"; }; -- cgit v1.2.3 From fc9ae0457543557828757667072c2576c28a798a Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 24 Apr 2020 17:51:40 -0400 Subject: gnome3.mutter334: 3.34.4 -> 3.34.5, backports Backports gnome-3-34 patches as well --- pkgs/desktops/gnome-3/core/mutter/3.34/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix b/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix index 51d3c4115d9..87696987850 100644 --- a/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/3.34/default.nix @@ -43,13 +43,13 @@ stdenv.mkDerivation rec { pname = "mutter"; - version = "3.34.4"; + version = "3.34.5"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "18hbw98p4h3d4qz57415smwmfg72s9a0nk8mb04ds1gn2lsm2d01"; + sha256 = "1i3r51ghfld1rf1rczzi3jhybz3mhywqcj2jyiqhfcyp1svlklfi"; }; mesonFlags = [ @@ -111,6 +111,13 @@ stdenv.mkDerivation rec { sha256 = "0imy2j8af9477jliwdq4jc40yw1cifsjjf196gnmwxr9rkj0hbrd"; }) + # gnome-3-34 2020-04-24 + # also fixes https://mail.gnome.org/archives/distributor-list/2020-April/msg00001.html + (fetchpatch { + url = "https://github.com/GNOME/mutter/compare/3.34.5..3bafd234248fdcd84bc62fef5e31c29fbb613909.patch"; + sha256 = "1a7krbdfmvx204p6av44rbp4ckp6ddg1mms8wkixxh2p871zq1pi"; + }) + # Drop inheritable cap_sys_nice, to prevent the ambient set from leaking # from mutter/gnome-shell, see https://github.com/NixOS/nixpkgs/issues/71381 ./drop-inheritable.patch -- cgit v1.2.3 From ee5cba24c31896b6aeb0af4e21b93b878e54f747 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 24 Apr 2020 18:22:59 -0400 Subject: Revert "ibus: fix dconf db installation" --- nixos/modules/i18n/input-method/ibus.nix | 2 +- nixos/modules/programs/dconf.nix | 35 +++++++++----------------------- nixos/tests/installed-tests/ibus.nix | 14 ++++++++----- pkgs/tools/inputmethods/ibus/default.nix | 12 +---------- 4 files changed, 21 insertions(+), 42 deletions(-) diff --git a/nixos/modules/i18n/input-method/ibus.nix b/nixos/modules/i18n/input-method/ibus.nix index cf24ecf5863..b4746b21b65 100644 --- a/nixos/modules/i18n/input-method/ibus.nix +++ b/nixos/modules/i18n/input-method/ibus.nix @@ -64,7 +64,7 @@ in # Without dconf enabled it is impossible to use IBus programs.dconf.enable = true; - programs.dconf.packages = [ ibusPackage ]; + programs.dconf.profiles.ibus = "${ibusPackage}/etc/dconf/profile/ibus"; services.dbus.packages = [ ibusAutostart diff --git a/nixos/modules/programs/dconf.nix b/nixos/modules/programs/dconf.nix index 30fbd72a9ab..6702e8efd1c 100644 --- a/nixos/modules/programs/dconf.nix +++ b/nixos/modules/programs/dconf.nix @@ -4,24 +4,13 @@ with lib; let cfg = config.programs.dconf; - cfgDir = pkgs.symlinkJoin { - name = "dconf-system-config"; - paths = map (x: "${x}/etc/dconf") cfg.packages; - postBuild = '' - mkdir -p $out/profile - mkdir -p $out/db - '' + ( - concatStringsSep "\n" ( - mapAttrsToList ( - name: path: '' - ln -s ${path} $out/profile/${name} - '' - ) cfg.profiles - ) - ) + '' - ${pkgs.dconf}/bin/dconf update $out/db - ''; - }; + + mkDconfProfile = name: path: + { + name = "dconf/profile/${name}"; + value.source = path; + }; + in { ###### interface @@ -33,22 +22,18 @@ in profiles = mkOption { type = types.attrsOf types.path; default = {}; - description = "Set of dconf profile files, installed at /etc/dconf/profiles/name."; + description = "Set of dconf profile files."; internal = true; }; - packages = mkOption { - type = types.listOf types.package; - default = []; - description = "A list of packages which provide dconf profiles and databases in /etc/dconf."; - }; }; }; ###### implementation config = mkIf (cfg.profiles != {} || cfg.enable) { - environment.etc.dconf.source = mkIf (cfg.profiles != {} || cfg.packages != []) cfgDir; + environment.etc = optionalAttrs (cfg.profiles != {}) + (mapAttrs' mkDconfProfile cfg.profiles); services.dbus.packages = [ pkgs.dconf ]; diff --git a/nixos/tests/installed-tests/ibus.nix b/nixos/tests/installed-tests/ibus.nix index a4bc2a7d7de..af54b612b50 100644 --- a/nixos/tests/installed-tests/ibus.nix +++ b/nixos/tests/installed-tests/ibus.nix @@ -5,12 +5,16 @@ makeInstalledTest { testConfig = { i18n.inputMethod.enabled = "ibus"; - systemd.user.services.ibus-daemon = { - serviceConfig.ExecStart = "${pkgs.ibus}/bin/ibus-daemon --xim --verbose"; - wantedBy = [ "graphical-session.target" ]; - partOf = [ "graphical-session.target" ]; - }; }; + preTestScript = '' + # ibus has ibus-desktop-testing-runner but it tries to manage desktop session so we just spawn ibus-daemon ourselves + machine.succeed("ibus-daemon --daemonize --verbose") + ''; + withX11 = true; + + # TODO: ibus-daemon is currently crashing or something + # maybe make ibus systemd service that auto-restarts? + meta.broken = true; } diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix index 238e133495c..644fd5eef3b 100644 --- a/pkgs/tools/inputmethods/ibus/default.nix +++ b/pkgs/tools/inputmethods/ibus/default.nix @@ -16,7 +16,6 @@ , gtk2 , gtk3 , gtk-doc -, runCommand , isocodes , cldr-emoji-annotation , unicode-character-database @@ -48,14 +47,6 @@ let makeWrapper ${glib.dev}/bin/glib-mkenums $out/bin/glib-mkenums --unset PYTHONPATH ''; }; - # make-dconf-override-db.sh needs to execute dbus-launch in the sandbox, - # it will fail to read /etc/dbus-1/session.conf unless we add this flag - dbus-launch = runCommand "sandbox-dbus-launch" { - nativeBuildInputs = [ makeWrapper ]; - } '' - makeWrapper ${dbus}/bin/dbus-launch $out/bin/dbus-launch \ - --add-flags --config-file=${dbus.daemon}/share/dbus-1/session.conf - ''; in stdenv.mkDerivation rec { @@ -80,7 +71,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" "installedTests" ]; postPatch = '' - patchShebangs --build data/dconf/make-dconf-override-db.sh + echo \#!${runtimeShell} > data/dconf/make-dconf-override-db.sh cp ${buildPackages.gtk-doc}/share/gtk-doc/data/gtk-doc.make . ''; @@ -114,7 +105,6 @@ stdenv.mkDerivation rec { python3BuildEnv vala wrapGAppsHook - dbus-launch ]; propagatedBuildInputs = [ -- cgit v1.2.3 From 974f11cb2972f470ab4b7a71fdf8f09dfdff562b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Apr 2020 00:04:31 +0200 Subject: gnome3.updateScript: Add freeze functionality On stable releases, we will want to change the freeze parameter in pkgs/desktops/gnome-3/update.nix to true to limit the gnome update script to only bump patch versions. --- pkgs/desktops/gnome-3/find-latest-version.py | 14 +++++++++++--- pkgs/desktops/gnome-3/update.nix | 16 +++++++++++++--- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome-3/find-latest-version.py b/pkgs/desktops/gnome-3/find-latest-version.py index b0359f79969..548cfa3411d 100644 --- a/pkgs/desktops/gnome-3/find-latest-version.py +++ b/pkgs/desktops/gnome-3/find-latest-version.py @@ -1,4 +1,5 @@ import argparse +import math import json import requests import sys @@ -27,13 +28,19 @@ version_policies = { 'none': no_policy, } -def make_version_policy(version_predicate, selected): - return lambda version: version_predicate(version, selected) +def make_version_policy(version_predicate, selected, upper_bound): + if not upper_bound: + upper_bound = [math.inf, math.inf] + else: + upper_bound = version_to_list(upper_bound) + + return lambda version: version_predicate(version, selected) and version_to_list(version) < upper_bound parser = argparse.ArgumentParser(description='Find latest version for a GNOME package by crawling their release server.') parser.add_argument('package-name', help='Name of the directory in https://ftp.gnome.org/pub/GNOME/sources/ containing the package.') parser.add_argument('version-policy', help='Policy determining which versions are considered stable. For most GNOME packages, odd minor versions are unstable but there are exceptions.', choices=version_policies.keys(), nargs='?', default='odd-unstable') parser.add_argument('requested-release', help='Most of the time, we will want to update to stable version but sometimes it is useful to test.', choices=['stable', 'unstable'], nargs='?', default='stable') +parser.add_argument('--upper-bound', dest='upper-bound', help='Only look for versions older than this one (useful for pinning dependencies).') if __name__ == '__main__': @@ -41,8 +48,9 @@ if __name__ == '__main__': package_name = getattr(args, 'package-name') requested_release = getattr(args, 'requested-release') + upper_bound = getattr(args, 'upper-bound') version_predicate = version_policies[getattr(args, 'version-policy')] - version_policy = make_version_policy(version_predicate, requested_release) + version_policy = make_version_policy(version_predicate, requested_release, upper_bound) # The structure of cache.json: https://gitlab.gnome.org/Infrastructure/sysadmin-bin/blob/master/ftpadmin#L762 cache = json.loads(requests.get('https://ftp.gnome.org/pub/GNOME/sources/{}/cache.json'.format(package_name)).text) diff --git a/pkgs/desktops/gnome-3/update.nix b/pkgs/desktops/gnome-3/update.nix index f42b6723950..555504086a4 100644 --- a/pkgs/desktops/gnome-3/update.nix +++ b/pkgs/desktops/gnome-3/update.nix @@ -1,8 +1,18 @@ -{ stdenv, lib, writeScript, python3, common-updater-scripts }: -{ packageName, attrPath ? packageName, versionPolicy ? "odd-unstable" }: +{ stdenv, pkgs, lib, writeScript, python3, common-updater-scripts }: +{ packageName, attrPath ? packageName, versionPolicy ? "odd-unstable", freeze ? false }: let python = python3.withPackages (p: [ p.requests ]); + upperBoundFlag = + let + package = lib.getAttrFromPath (lib.splitString "." attrPath) pkgs; + packageVersion = lib.getVersion package; + versionComponents = lib.versions.splitVersion packageVersion; + minorVersion = lib.versions.minor packageVersion; + minorAvailable = builtins.length versionComponents > 1 && builtins.match "[0-9]+" minorVersion != null; + nextMinor = builtins.fromJSON minorVersion + 1; + upperBound = "${lib.versions.major packageVersion}.${builtins.toString nextMinor}"; + in lib.optionalString (minorAvailable && freeze) ''--upper-bound="${upperBound}"''; updateScript = writeScript "gnome-update-script" '' #!${stdenv.shell} set -o errexit @@ -10,7 +20,7 @@ let attr_path="$2" version_policy="$3" PATH=${lib.makeBinPath [ common-updater-scripts python ]} - latest_tag=$(python "${./find-latest-version.py}" "$package_name" "$version_policy" "stable") + latest_tag=$(python "${./find-latest-version.py}" "$package_name" "$version_policy" "stable" ${upperBoundFlag}) update-source-version "$attr_path" "$latest_tag" ''; in [ updateScript packageName attrPath versionPolicy ] -- cgit v1.2.3 From b0a2fb1e03ee2cfc20f30e3b8578abb361b3fe42 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Apr 2020 00:26:49 +0200 Subject: gnome3.updateScript: format with black --- pkgs/desktops/gnome-3/find-latest-version.py | 40 ++++++++++++++++------------ 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/pkgs/desktops/gnome-3/find-latest-version.py b/pkgs/desktops/gnome-3/find-latest-version.py index 548cfa3411d..ad80af24bcb 100644 --- a/pkgs/desktops/gnome-3/find-latest-version.py +++ b/pkgs/desktops/gnome-3/find-latest-version.py @@ -4,8 +4,10 @@ import json import requests import sys + def version_to_list(version): - return list(map(int, version.split('.'))) + return list(map(int, version.split("."))) + def odd_unstable(version_str, selected): version = version_to_list(version_str) @@ -15,19 +17,22 @@ def odd_unstable(version_str, selected): even = version[1] % 2 == 0 prerelease = (version[1] >= 90 and version[1] < 100) or (version[1] >= 900 and version[1] < 1000) stable = even and not prerelease - if selected == 'stable': + if selected == "stable": return stable else: return True + def no_policy(version, selected): return True + version_policies = { - 'odd-unstable': odd_unstable, - 'none': no_policy, + "odd-unstable": odd_unstable, + "none": no_policy, } + def make_version_policy(version_predicate, selected, upper_bound): if not upper_bound: upper_bound = [math.inf, math.inf] @@ -36,33 +41,34 @@ def make_version_policy(version_predicate, selected, upper_bound): return lambda version: version_predicate(version, selected) and version_to_list(version) < upper_bound -parser = argparse.ArgumentParser(description='Find latest version for a GNOME package by crawling their release server.') -parser.add_argument('package-name', help='Name of the directory in https://ftp.gnome.org/pub/GNOME/sources/ containing the package.') -parser.add_argument('version-policy', help='Policy determining which versions are considered stable. For most GNOME packages, odd minor versions are unstable but there are exceptions.', choices=version_policies.keys(), nargs='?', default='odd-unstable') -parser.add_argument('requested-release', help='Most of the time, we will want to update to stable version but sometimes it is useful to test.', choices=['stable', 'unstable'], nargs='?', default='stable') -parser.add_argument('--upper-bound', dest='upper-bound', help='Only look for versions older than this one (useful for pinning dependencies).') + +parser = argparse.ArgumentParser(description="Find latest version for a GNOME package by crawling their release server.") +parser.add_argument("package-name", help="Name of the directory in https://ftp.gnome.org/pub/GNOME/sources/ containing the package.") +parser.add_argument("version-policy", help="Policy determining which versions are considered stable. For most GNOME packages, odd minor versions are unstable but there are exceptions.", choices=version_policies.keys(), nargs="?", default="odd-unstable") +parser.add_argument("requested-release", help="Most of the time, we will want to update to stable version but sometimes it is useful to test.", choices=["stable", "unstable"], nargs="?", default="stable") +parser.add_argument("--upper-bound", dest="upper-bound", help="Only look for versions older than this one (useful for pinning dependencies).") -if __name__ == '__main__': +if __name__ == "__main__": args = parser.parse_args() - package_name = getattr(args, 'package-name') - requested_release = getattr(args, 'requested-release') - upper_bound = getattr(args, 'upper-bound') - version_predicate = version_policies[getattr(args, 'version-policy')] + package_name = getattr(args, "package-name") + requested_release = getattr(args, "requested-release") + upper_bound = getattr(args, "upper-bound") + version_predicate = version_policies[getattr(args, "version-policy")] version_policy = make_version_policy(version_predicate, requested_release, upper_bound) # The structure of cache.json: https://gitlab.gnome.org/Infrastructure/sysadmin-bin/blob/master/ftpadmin#L762 - cache = json.loads(requests.get('https://ftp.gnome.org/pub/GNOME/sources/{}/cache.json'.format(package_name)).text) + cache = json.loads(requests.get(f"https://ftp.gnome.org/pub/GNOME/sources/{package_name}/cache.json").text) if type(cache) != list or cache[0] != 4: - print('Unknown format of cache.json file.', file=sys.stderr) + print("Unknown format of cache.json file.", file=sys.stderr) sys.exit(1) versions = cache[2][package_name] versions = sorted(filter(version_policy, versions), key=version_to_list) if len(versions) == 0: - print('No versions matched.', file=sys.stderr) + print("No versions matched.", file=sys.stderr) sys.exit(1) print(versions[-1]) -- cgit v1.2.3 From 9a66afc5d0620aff2f68a5608058f7972eea7ced Mon Sep 17 00:00:00 2001 From: peelz Date: Fri, 24 Apr 2020 19:25:48 -0400 Subject: obs-v4l2sink: add peelz to maintainers --- pkgs/applications/video/obs-studio/v4l2sink.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/video/obs-studio/v4l2sink.nix b/pkgs/applications/video/obs-studio/v4l2sink.nix index 19cfbf14076..1a1a48f11ed 100644 --- a/pkgs/applications/video/obs-studio/v4l2sink.nix +++ b/pkgs/applications/video/obs-studio/v4l2sink.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "obs studio output plugin for Video4Linux2 device"; homepage = "https://github.com/CatxFish/obs-v4l2sink"; - maintainers = with maintainers; [ colemickens ]; + maintainers = with maintainers; [ colemickens peelz ]; license = licenses.gpl2; platforms = [ "x86_64-linux" ]; }; -- cgit v1.2.3 From c42ac755a638a10c79ee68819443bf4ffc7c69e1 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 24 Apr 2020 06:00:00 -0500 Subject: python37Packages.scrapy: 2.0.1 -> 2.1.0 --- pkgs/development/python-modules/scrapy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 05c0c43c15c..2827f7151f4 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -26,7 +26,7 @@ }: buildPythonPackage rec { - version = "2.0.1"; + version = "2.1.0"; pname = "Scrapy"; disabled = isPy27; @@ -78,7 +78,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "85581a01f4160a103ca9906ffa4e44474f4ecd1685f0934728892c58ebf111f6"; + sha256 = "640aea0f9be9b055f5cfec5ab78ee88bb37a5be3809b138329bd2af51392ec7f"; }; postInstall = '' -- cgit v1.2.3 From e5707f2cb5b0e3c77e7862645616913cb027be9a Mon Sep 17 00:00:00 2001 From: Lisa Ugray Date: Tue, 21 Apr 2020 11:01:48 -0400 Subject: vimPlugins: Add meta.homepage Allow determining the source from a nix-env query to disambiguate which plugin you're using/about to use. --- pkgs/misc/vim-plugins/update.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/misc/vim-plugins/update.py index c6bf605ee47..84d57133d22 100755 --- a/pkgs/misc/vim-plugins/update.py +++ b/pkgs/misc/vim-plugins/update.py @@ -414,6 +414,7 @@ let rev = "{plugin.commit}"; sha256 = "{plugin.sha256}";{submodule_attr} }}; + meta.homepage = "https://github.com/{owner}/{repo}/"; }}; """ ) -- cgit v1.2.3 From dea7a90cccc3df1c1b6e85511b68152e375ef04f Mon Sep 17 00:00:00 2001 From: Lisa Ugray Date: Tue, 21 Apr 2020 13:17:51 -0400 Subject: vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 952 +++++++++++++++++++++++++++++------- 1 file changed, 763 insertions(+), 189 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index f506efda449..1099ca84af5 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -12,6 +12,7 @@ let rev = "2cbe946206ec622d9d8cf2c99317f204c4d41885"; sha256 = "0h62v9z5bh9xmaq22pqdb3z79i84a5rknqm68mjpy7nq7s3q42fa"; }; + meta.homepage = "https://github.com/vim-scripts/a.vim/"; }; ack-vim = buildVimPluginFrom2Nix { @@ -23,6 +24,7 @@ let rev = "36e40f9ec91bdbf6f1adf408522a73a6925c3042"; sha256 = "0yppr89hd1jyp0pj56hxdjbn32sr7pj3mihd18wxispvl5dqd6fm"; }; + meta.homepage = "https://github.com/mileszs/ack.vim/"; }; acp = buildVimPluginFrom2Nix { @@ -34,6 +36,7 @@ let rev = "5c627cec37d0d3b1670cb250d84e176e8b0c644e"; sha256 = "0h7s4nvxin7m2caka7g1hhlxj1bbiwsvw8s2lqwlh7nq43v23ghg"; }; + meta.homepage = "https://github.com/eikenb/acp/"; }; agda-vim = buildVimPluginFrom2Nix { @@ -45,6 +48,7 @@ let rev = "3643fa185ebe3bf35cf690a4b3b90d36e36405b0"; sha256 = "09lpg223l1s8zpsmbg1r18cnr7r3np32nsv185qgcv889mlildqn"; }; + meta.homepage = "https://github.com/derekelkins/agda-vim/"; }; alchemist-vim = buildVimPluginFrom2Nix { @@ -56,17 +60,19 @@ let rev = "9fc2594deea196897997c31e68056b7977f13495"; sha256 = "1mnghdw3yhqh1lzjqfrmwrvnx391dkayfzkgcpx7sx01hnvqc9ib"; }; + meta.homepage = "https://github.com/slashmili/alchemist.vim/"; }; ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2020-03-11"; + version = "2020-04-21"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "bbe5153fcb36dec9860ced33ae8ff0b5d76ac02a"; - sha256 = "1xvmh66lgii98z6f4lk1mjs73ysrvs55xdlcmf224k3as822jmw0"; + rev = "36e5337e30095afb10d02ef2ae362c8d6055e70d"; + sha256 = "0mcc2d0a4fiv2a1q8z778jzjj7i71v64m2zswsvpdym062b65fk3"; }; + meta.homepage = "https://github.com/dense-analysis/ale/"; }; align = buildVimPluginFrom2Nix { @@ -78,6 +84,7 @@ let rev = "787662fe90cd057942bc5b682fd70c87e1a9dd77"; sha256 = "0acacr572kfh7jvavbw61q5pkwrpi1albgancma063rpax1pddgp"; }; + meta.homepage = "https://github.com/vim-scripts/align/"; }; ansible-vim = buildVimPluginFrom2Nix { @@ -89,6 +96,7 @@ let rev = "ad76abd6bccfa1a5195d20f7964c6393fe1a9524"; sha256 = "098jnybc11cxv2q8396hx9r814i5793y7a9kdl4ambpbvhm86vad"; }; + meta.homepage = "https://github.com/pearofducks/ansible-vim/"; }; antonys-macro-repeater = buildVimPluginFrom2Nix { @@ -100,6 +108,7 @@ let rev = "61784d86b2654f3e261b9cc33360c5197704e266"; sha256 = "1cq5r091qbxjs9s12f7bb2fdm43gxwpnnh2l8nhj0n69jfk7gblw"; }; + meta.homepage = "https://github.com/ckarnell/antonys-macro-repeater/"; }; arcanist-vim = buildVimPluginFrom2Nix { @@ -111,6 +120,7 @@ let rev = "bd59e799e838c8d946d33142104b2db625dc15d6"; sha256 = "11v7gqa5rnv28q0i3d02g9sw22gkjn10afvjx7bg352d91knxn9m"; }; + meta.homepage = "https://github.com/solarnz/arcanist.vim/"; }; argtextobj-vim = buildVimPluginFrom2Nix { @@ -122,6 +132,7 @@ let rev = "f3fbe427f7b4ec436416a5816d714dc917dc530b"; sha256 = "1l4jh5hdmky1qj5z26jpnk49a6djjcvzyyr6pknrrgb8rzkiln48"; }; + meta.homepage = "https://github.com/vim-scripts/argtextobj.vim/"; }; ats-vim = buildVimPluginFrom2Nix { @@ -133,6 +144,7 @@ let rev = "a17576687217a2e8066356cc211afb99b5de65e8"; sha256 = "0dv60za39v2w5d9mbk1r263fqpv11bdfyqp39b0snw40f0kh92z0"; }; + meta.homepage = "https://github.com/vmchale/ats-vim/"; }; auto-git-diff = buildVimPluginFrom2Nix { @@ -144,6 +156,7 @@ let rev = "a14d52b7ed7e7fb69bf1de9d363f3abdd3410b3a"; sha256 = "0i0bnlxclh8pzanrxj428728mdx4wdy19fx499kiin87qr4r2hbn"; }; + meta.homepage = "https://github.com/hotwatermorning/auto-git-diff/"; }; auto-pairs = buildVimPluginFrom2Nix { @@ -155,6 +168,7 @@ let rev = "39f06b873a8449af8ff6a3eee716d3da14d63a76"; sha256 = "1hxf155cmavpxpbsxx6zk23hgl9grl6yrh165kp9bjvld9ng08ng"; }; + meta.homepage = "https://github.com/jiangmiao/auto-pairs/"; }; autoload_cscope-vim = buildVimPluginFrom2Nix { @@ -166,6 +180,7 @@ let rev = "26f428f400d96d25a9d633e6314f6e1760923db1"; sha256 = "150h6k4nd1msa21c0zxl68nwwq3qdmqi0d8h4as98rrz0b0lghn7"; }; + meta.homepage = "https://github.com/vim-scripts/autoload_cscope.vim/"; }; awesome-vim-colorschemes = buildVimPluginFrom2Nix { @@ -177,17 +192,19 @@ let rev = "4ad0ce02b8efa3c6e014e224a34b67b927d31c88"; sha256 = "0crg0gph8wmb412yvknh6ic42i3p5hd8c736rv61v52b2g0dgwxm"; }; + meta.homepage = "https://github.com/rafi/awesome-vim-colorschemes/"; }; ayu-vim = buildVimPluginFrom2Nix { pname = "ayu-vim"; - version = "2019-09-21"; + version = "2020-04-13"; src = fetchFromGitHub { owner = "ayu-theme"; repo = "ayu-vim"; - rev = "9dab20b38335ed06738f251e92e3817182063759"; - sha256 = "0m914bnrnv7gy49qzfdp1zl3a1h7zpicvh2xqdfqhp7h96psxwmx"; + rev = "a3a2d2a4ce36e0f681236b3ab15043c0b09460b1"; + sha256 = "06lhfwh8z178bgbbcz4mxjpk6zajz19x1jhaahbsqg3641y5pj0p"; }; + meta.homepage = "https://github.com/ayu-theme/ayu-vim/"; }; base16-vim = buildVimPluginFrom2Nix { @@ -199,6 +216,7 @@ let rev = "6191622d5806d4448fa2285047936bdcee57a098"; sha256 = "1qz21jizcy533mqk9wff1wqchhixkcfkysqcqs0x35wwpbri6nz8"; }; + meta.homepage = "https://github.com/chriskempson/base16-vim/"; }; bats-vim = buildVimPluginFrom2Nix { @@ -210,6 +228,7 @@ let rev = "3c283f594ff8bc7fb0c25cd07ebef0f17385f94a"; sha256 = "06f3hdf7y5gpwmc6inrhk938qmn7cr6mbk00amrnl1qjvk09givx"; }; + meta.homepage = "https://github.com/vim-scripts/bats.vim/"; }; bclose-vim = buildVimPluginFrom2Nix { @@ -221,6 +240,7 @@ let rev = "99018b4a2dd18aea1cbd3aa23565b01a0f8c5b73"; sha256 = "09a7g0nxn8cbnfz6za8q1p46kb5zbvxl80077hrjpnx4xc82xn2h"; }; + meta.homepage = "https://github.com/rbgrouleff/bclose.vim/"; }; bufexplorer = buildVimPluginFrom2Nix { @@ -232,6 +252,7 @@ let rev = "29258f58357acc10c672585a9efe8913d756734d"; sha256 = "00wjwk9yzfclrbd4p59b5wpl21s2vjs4ahn30xhpza93bk513wnq"; }; + meta.homepage = "https://github.com/jlanzarotta/bufexplorer/"; }; BufOnly-vim = buildVimPluginFrom2Nix { @@ -243,6 +264,7 @@ let rev = "43dd92303979bdb234a3cb2f5662847f7a3affe7"; sha256 = "1gvpaqvvxjma0dl1zai68bpv42608api4054appwkw9pgczkkcdl"; }; + meta.homepage = "https://github.com/vim-scripts/BufOnly.vim/"; }; calendar-vim = buildVimPluginFrom2Nix { @@ -254,6 +276,7 @@ let rev = "55d0495ff03260d82a5c80365cb754871ce35460"; sha256 = "0xi2g6x5lf8r36c5ld8pvz5c7n7jx3d6whwbk4gibmz6hlfrslwr"; }; + meta.homepage = "https://github.com/itchyny/calendar.vim/"; }; camelcasemotion = buildVimPluginFrom2Nix { @@ -265,17 +288,19 @@ let rev = "de439d7c06cffd0839a29045a103fe4b44b15cdc"; sha256 = "0yfsb0d9ly8abmc95nqcmr8r8ylif80zdjppib7g1qj1wapdhc69"; }; + meta.homepage = "https://github.com/bkad/camelcasemotion/"; }; caw-vim = buildVimPluginFrom2Nix { pname = "caw-vim"; - version = "2020-03-24"; + version = "2020-04-20"; src = fetchFromGitHub { owner = "tyru"; repo = "caw.vim"; - rev = "00ba51adaa5c2e6100a57e452fb6f5b6f1548f7a"; - sha256 = "0jmy81l726in57l89874lmfbgqz2gir81xa0np9c7rqypwrwg5r1"; + rev = "3c6b7d2448bd32bf998ae403c9c15d06ea641b36"; + sha256 = "06ym0qhcvd9ajlj6cd4y391bgfiwclzhb3cvrbv723j8amdv1y1q"; }; + meta.homepage = "https://github.com/tyru/caw.vim/"; }; changeColorScheme-vim = buildVimPluginFrom2Nix { @@ -287,6 +312,7 @@ let rev = "b041d49f828629d72f2232531a230d1ec5de2405"; sha256 = "0pybhsg9k9252d4ifdc4gsar8lkmfzbvs6xkzqq1m6f35l9wqk09"; }; + meta.homepage = "https://github.com/vim-scripts/changeColorScheme.vim/"; }; CheckAttach = buildVimPluginFrom2Nix { @@ -298,6 +324,7 @@ let rev = "8f0b1350431d1d34655a147e6f1cfe6cb5dda5f7"; sha256 = "1z9a40nbdjd3pnp28nfsi2bijsbaiphc0ia816f5flkchn07gmmj"; }; + meta.homepage = "https://github.com/chrisbra/CheckAttach/"; }; clang_complete = buildVimPluginFrom2Nix { @@ -309,6 +336,7 @@ let rev = "0b98d7533ad967aac3fc4c1a5b0508dafa8a676f"; sha256 = "04mdhc1kbv66blkn6qn98iyj659dac4z49nmpf3anglz8dgcxjgc"; }; + meta.homepage = "https://github.com/xavierd/clang_complete/"; }; clighter8 = buildVimPluginFrom2Nix { @@ -320,28 +348,31 @@ let rev = "839993b60dc4a19a58e4c7e7db1df04d911bb181"; sha256 = "01r92idbym2p1hiqszrprrl1hrqzz2yhzv8n08m8gycd7m227cwg"; }; + meta.homepage = "https://github.com/bbchung/clighter8/"; }; coc-css = buildVimPluginFrom2Nix { pname = "coc-css"; - version = "2019-06-25"; + version = "2020-04-15"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-css"; - rev = "235009ac2a92172cdae66987b172264230c04f74"; - sha256 = "1i7bhiibcr2k5c0l79ddsfxirkhxs3cp9x83b4ys1zy2yaxljlw6"; + rev = "41fe3122753b62c4416eb5e4ca4bef1cb3d3ebd2"; + sha256 = "13xg0v2iwf8nrd1bba5nmwgav37fb8q4fqr5bsg3qxlbghpw0bbl"; }; + meta.homepage = "https://github.com/neoclide/coc-css/"; }; coc-denite = buildVimPluginFrom2Nix { pname = "coc-denite"; - version = "2019-10-13"; + version = "2020-04-17"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-denite"; - rev = "803f8a2388fcf90881c13ff17da4eec01184401d"; - sha256 = "1gxj2jdii6icgdmkhhsxshi02xbsad0697cixklf3wsqlxrj3px5"; + rev = "50a573af21a9563f331f2711f3fd7a568c33907f"; + sha256 = "06h3if5sn5sqgrq1ql1j7g5xy658mwywd7ri1hajzi8s3mb5lanq"; }; + meta.homepage = "https://github.com/neoclide/coc-denite/"; }; coc-emmet = buildVimPluginFrom2Nix { @@ -353,6 +384,7 @@ let rev = "1e65237f65b94bd5f9376023f557a26c14c9d35a"; sha256 = "16f3gdnprxw939zwdy7lzksj1qwlwfs174vk0nzf1d8yb04a7y2g"; }; + meta.homepage = "https://github.com/neoclide/coc-emmet/"; }; coc-eslint = buildVimPluginFrom2Nix { @@ -364,28 +396,31 @@ let rev = "2f9de5cf232223f886b5e9711b0e9a5260f65db9"; sha256 = "0q1sizzj6ac6gzfp4s7ka600pa9f2dhr17v14j98cdlmyp6pyfhz"; }; + meta.homepage = "https://github.com/neoclide/coc-eslint/"; }; coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2020-04-04"; + version = "2020-04-19"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "e4f640215a55f1e3447aa872de7a4d83d003964c"; - sha256 = "1q78qw6nagd0wis6ixg7y290692a9fsrjmrv9cdiv7l8q4whqync"; + rev = "82e846d193856660be716c8b89e668aead06d665"; + sha256 = "0rpxjxw51mks6jq6akw5sgl77px038gdgqa4yhpmlpidb679apg2"; }; + meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; coc-git = buildVimPluginFrom2Nix { pname = "coc-git"; - version = "2020-04-03"; + version = "2020-04-18"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-git"; - rev = "54dba825875c6bd9e5a77121662d40c96bcedd99"; - sha256 = "007j7kkhp8j7l65frkbmvldfjq2jirpz60n6ascjsy5vq471i7n4"; + rev = "623a5351c8eca639e3cffee38f941426f2df2422"; + sha256 = "1v5q9775602drj7dr1dhshd22jbz6kxmkacqhbnddjpw2drdfzv1"; }; + meta.homepage = "https://github.com/neoclide/coc-git/"; }; coc-go = buildVimPluginFrom2Nix { @@ -397,6 +432,7 @@ let rev = "587501a4445c1edb5d5e10927c5f8274f0e0ea52"; sha256 = "16cgdxn93zf0q5d80xb9c6khzgx02qvsjdaw3kf07qqsmdjvy4gj"; }; + meta.homepage = "https://github.com/josa42/coc-go/"; }; coc-highlight = buildVimPluginFrom2Nix { @@ -408,6 +444,7 @@ let rev = "b4e82ebd5fe855d004dd481e2ecf2fa88faed284"; sha256 = "06h64jq8cgj5hc19inidns046kkb76750179jsw7xv5zbp93ygap"; }; + meta.homepage = "https://github.com/neoclide/coc-highlight/"; }; coc-html = buildVimPluginFrom2Nix { @@ -419,6 +456,7 @@ let rev = "8ae5d2832761b5868f69c67f33ce26f9edb26c65"; sha256 = "1rf9qfimnbxjr5s55pzm8npixan5cz2v17g4j34f18i9ky6yyk0b"; }; + meta.homepage = "https://github.com/neoclide/coc-html/"; }; coc-imselect = buildVimPluginFrom2Nix { @@ -430,6 +468,7 @@ let rev = "01442d2fb7d344122e59755f59782a0e1bf7d294"; sha256 = "1vqx9yna66njdw1my15ac6djr3yvnb6das96nx12mpingnw85kky"; }; + meta.homepage = "https://github.com/neoclide/coc-imselect/"; }; coc-java = buildVimPluginFrom2Nix { @@ -441,6 +480,7 @@ let rev = "e4dd6b744f7eb356afa8db7b958bdf5910b5ec6f"; sha256 = "0fndkbmi84qgqfj6ny04wm05mnrvrg36bb04vk7zj90k8a51xrrr"; }; + meta.homepage = "https://github.com/neoclide/coc-java/"; }; coc-jest = buildVimPluginFrom2Nix { @@ -452,6 +492,7 @@ let rev = "3fac1864ef1af87ee096f0ab6514a4b890363231"; sha256 = "1z2sbzr84gh935553g6bfkpx7s4i37s200a1s9dqay9cq92jh7hy"; }; + meta.homepage = "https://github.com/neoclide/coc-jest/"; }; coc-json = buildVimPluginFrom2Nix { @@ -463,28 +504,31 @@ let rev = "33ca64c00ee5c0d759a6f537b23971476b85f8e3"; sha256 = "07mblxxvl95kfy0wwm5r75j6y3v8fvyh6cwiza5rg1z9dlw1xddw"; }; + meta.homepage = "https://github.com/neoclide/coc-json/"; }; coc-lists = buildVimPluginFrom2Nix { pname = "coc-lists"; - version = "2020-03-03"; + version = "2020-04-18"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-lists"; - rev = "21761f5e9a48baf3dbb6540ff180f6071c1ed8c6"; - sha256 = "101n3cmhvm4hxznk5w4n7lbk552cwsyf28axa1d5rr838r3zg5wi"; + rev = "f68a09974d8bd9a4474bfc7845c2e628919bb619"; + sha256 = "1fcz7m1pbf69gnys9j777w77pxwsiwi1jdlcnb61c57xdrdcqr5d"; }; + meta.homepage = "https://github.com/neoclide/coc-lists/"; }; coc-metals = buildVimPluginFrom2Nix { pname = "coc-metals"; - version = "2020-04-10"; + version = "2020-04-21"; src = fetchFromGitHub { owner = "ckipp01"; repo = "coc-metals"; - rev = "675477fc9c95d87000eee343e7e478db5519654b"; - sha256 = "1x66hp1hxlyacijj1gbffa6cqv8lg6mralxa6rkqyby6wgiydswy"; + rev = "fdddbbdbe04cdb077b7a2006c295d7a95343c4bb"; + sha256 = "0g0zqxmakwmjr9ii0v5rxiyvv3k909lzvkxkw0hyhpdkbpmzjkxl"; }; + meta.homepage = "https://github.com/ckipp01/coc-metals/"; }; coc-neco = buildVimPluginFrom2Nix { @@ -496,6 +540,7 @@ let rev = "fe130c2c3b883f8b58f70f15bf36c73923faa3d9"; sha256 = "1yzh3p1xx6k6rnr9skdvy5lsb7hz4kh2y537ill8a7770y936vn8"; }; + meta.homepage = "https://github.com/neoclide/coc-neco/"; }; coc-pairs = buildVimPluginFrom2Nix { @@ -507,17 +552,19 @@ let rev = "79deeaabdc4f091c22f3dd67d439a0a336e8aa7e"; sha256 = "1w6p2dk7yj8ldxg1qxh9zpn9ypm6gn66gi0vbax33wf5c0dmp0v9"; }; + meta.homepage = "https://github.com/neoclide/coc-pairs/"; }; coc-prettier = buildVimPluginFrom2Nix { pname = "coc-prettier"; - version = "2020-04-03"; + version = "2020-04-13"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-prettier"; - rev = "77e32b628e9b5fc6732f8b43ba6aca36a2e3f305"; - sha256 = "13hfmdy0r4mlsvzvj0n0ik2dsxwkn58fkfqv6dgfxdc55nxwgkv0"; + rev = "771bb16700e8123d7a114ff9c02a8c3ba1641108"; + sha256 = "09srgkg1sqdh01ix767ssi4mp4p76g9am4pg8fzqdj3pdjyr2yk2"; }; + meta.homepage = "https://github.com/neoclide/coc-prettier/"; }; coc-python = buildVimPluginFrom2Nix { @@ -529,6 +576,7 @@ let rev = "6a5104d18ae5ebf7d9b84af7c4a34c6ced62aee8"; sha256 = "0l8zrb2bhv1apx2vp8gswqh7v64dxfd8124cggxfkkzdqyxr10w0"; }; + meta.homepage = "https://github.com/neoclide/coc-python/"; }; coc-r-lsp = buildVimPluginFrom2Nix { @@ -540,6 +588,7 @@ let rev = "a1b97e36c601975a8d730b6965f25592b1ecd1e7"; sha256 = "04g1kbgm8p0asrsibmg4w6wj8i2xzwc70g7rkcs2bj3pakbkvws6"; }; + meta.homepage = "https://github.com/neoclide/coc-r-lsp/"; }; coc-rls = buildVimPluginFrom2Nix { @@ -551,6 +600,7 @@ let rev = "c899418e8fae4a8c3eb15fee48513ae050b11d60"; sha256 = "0sipvs8r8i239l2334k4qnhwpaijwd524q598rp4ma34ry42c2xl"; }; + meta.homepage = "https://github.com/neoclide/coc-rls/"; }; coc-smartf = buildVimPluginFrom2Nix { @@ -562,17 +612,19 @@ let rev = "d40714eab8e5fe26fac492ffd30e98cd1bfbdec5"; sha256 = "0kfrq5hk8zn24cl7fiy48nyvd30a2dva93c61079axkdg9912yd7"; }; + meta.homepage = "https://github.com/neoclide/coc-smartf/"; }; coc-snippets = buildVimPluginFrom2Nix { pname = "coc-snippets"; - version = "2020-04-09"; + version = "2020-04-16"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-snippets"; - rev = "62aa65069c92bf7753bb122559e8807ec304a6f4"; - sha256 = "1fb884c841hpzhzv26fsq5yli3k5vk8yjq0l55zvlg3a2mxfpj6z"; + rev = "21f65e0de83936f8db27ce1bc4a93251adfeef5a"; + sha256 = "1ahh143yq6hb8f3xv5kvj3dy2017yzl9vn31gfabswvdmdjm37in"; }; + meta.homepage = "https://github.com/neoclide/coc-snippets/"; }; coc-solargraph = buildVimPluginFrom2Nix { @@ -584,6 +636,7 @@ let rev = "231447aae26a0e88aa6d9e207a7354c4ca37d564"; sha256 = "0amcx519r9j8jr6ckglywsjlyph3m5jq4qvbfwyir8ihxhxa4b0d"; }; + meta.homepage = "https://github.com/neoclide/coc-solargraph/"; }; coc-spell-checker = buildVimPluginFrom2Nix { @@ -595,6 +648,7 @@ let rev = "4a8195f5f22d9d7b42998b7e3b846aa2aef7de52"; sha256 = "1w8b9icwdam8ljprc8avs5pwdiwmx3j1jxsg03d1lvis9w5xm0cd"; }; + meta.homepage = "https://github.com/iamcco/coc-spell-checker/"; }; coc-stylelint = buildVimPluginFrom2Nix { @@ -606,6 +660,7 @@ let rev = "288a372261cbc23ae4a6e26b1621c6e3218d00ad"; sha256 = "1qir8diqnv1a78lzw9p3jsbni52gdg38rx1lj5i4iyff9282ir2x"; }; + meta.homepage = "https://github.com/neoclide/coc-stylelint/"; }; coc-tabnine = buildVimPluginFrom2Nix { @@ -617,6 +672,7 @@ let rev = "442c829185ecab2268d1b9fd076c5286bbd39562"; sha256 = "0as4b33nnp7anqbxkkja8lp37y4a74b3507zyk3gmmna0my1ca3r"; }; + meta.homepage = "https://github.com/neoclide/coc-tabnine/"; }; coc-tslint = buildVimPluginFrom2Nix { @@ -628,6 +684,7 @@ let rev = "6128761577806d7047fa05d1a527945490d6316c"; sha256 = "1vi4vrawknkd5wjyb0j143jbfis9vaanl219a7argirwjs057vpd"; }; + meta.homepage = "https://github.com/neoclide/coc-tslint/"; }; coc-tslint-plugin = buildVimPluginFrom2Nix { @@ -639,17 +696,19 @@ let rev = "acc1356253a5088f630d9910b5fc13dc5d108bbc"; sha256 = "1cjgimqgd70x5zhw641z6g4hc54vrkg3r4sscg092gkrdpkq3969"; }; + meta.homepage = "https://github.com/neoclide/coc-tslint-plugin/"; }; coc-tsserver = buildVimPluginFrom2Nix { pname = "coc-tsserver"; - version = "2020-04-10"; + version = "2020-04-18"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tsserver"; - rev = "17fdfd9462bdc6780ab3087ca9293411ca147490"; - sha256 = "1rwpjj24v1px8pkj21g36cl1nir6c4lhrsslf3i6hk41xa8jw64z"; + rev = "1f46ed360e0cae124add5ff9c4a0718fccb66acb"; + sha256 = "1fccyar9qmydj1ii7ixiwcnfrpsvk0q0xz3q4vr3mz34lmcj74rw"; }; + meta.homepage = "https://github.com/neoclide/coc-tsserver/"; }; coc-vetur = buildVimPluginFrom2Nix { @@ -661,6 +720,7 @@ let rev = "314df846b6bc2be9b7c808ed949a1fd693bba402"; sha256 = "14fmyrfmyk66wbfnbb2iwy7azjk10d8gyrv5p950aagmv8shif52"; }; + meta.homepage = "https://github.com/neoclide/coc-vetur/"; }; coc-vimtex = buildVimPluginFrom2Nix { @@ -672,6 +732,7 @@ let rev = "0a4f8ee29afc4e1dcfdc8846f116a1db32fa9867"; sha256 = "0z9kxm40kr8a5sa06vkg7xaai2n54y21xfkrsx774zzdkcrrkizk"; }; + meta.homepage = "https://github.com/neoclide/coc-vimtex/"; }; coc-wxml = buildVimPluginFrom2Nix { @@ -683,6 +744,7 @@ let rev = "f02550939d33a0175c34186904c376bbae878e60"; sha256 = "1448019dzdy55j4plhzlnp2qkfzk0zkqqs7kn94ndn60hn1x889m"; }; + meta.homepage = "https://github.com/neoclide/coc-wxml/"; }; coc-yaml = buildVimPluginFrom2Nix { @@ -694,6 +756,7 @@ let rev = "338192a2434b96b139fb8c07d260da00b3100997"; sha256 = "020jpsm9ss2v3x1g43m920w2yamv8khl7mg7wm4sx6qsl3rlfq4g"; }; + meta.homepage = "https://github.com/neoclide/coc-yaml/"; }; coc-yank = buildVimPluginFrom2Nix { @@ -705,17 +768,19 @@ let rev = "6cb8bc7f2d41b9fb75c797c5805444badeff3dd9"; sha256 = "0s28684531ihczg5nf2m3f8z1vx9fw4yllfq7jz8g7ifw922ddxb"; }; + meta.homepage = "https://github.com/neoclide/coc-yank/"; }; coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2020-04-10"; + version = "2020-04-21"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "09853cf2808904ed6eb93b207b5cec8dd69bfa34"; - sha256 = "0i5jciwparwx1zgisa6l40xmamafl6syykb2hc953q1hfl24z9a5"; + rev = "1cedc9a852cc7e246665ca1d662bd8978ac5405c"; + sha256 = "1vqm9s68148715gb5x5xrhl5ajwi881d86hq7906lp7b8gk5d6is"; }; + meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; colorizer = buildVimPluginFrom2Nix { @@ -727,6 +792,7 @@ let rev = "afc1491e5b9c36305ce710bdad2b48f069141183"; sha256 = "1dpiv9z8h6196acncyjhzd1qa56y17468fpxbfzrx5q2266sajc7"; }; + meta.homepage = "https://github.com/lilydjwg/colorizer/"; }; Colour-Sampler-Pack = buildVimPluginFrom2Nix { @@ -738,6 +804,7 @@ let rev = "05cded87b2ef29aaa9e930230bb88e23abff4441"; sha256 = "03v2r18sfgs0xbgy9p56pxfdg0lsk6m7wyr5hw63wm1nzpwiipg3"; }; + meta.homepage = "https://github.com/vim-scripts/Colour-Sampler-Pack/"; }; command-t = buildVimPluginFrom2Nix { @@ -750,6 +817,7 @@ let sha256 = "0iim0lhib6fiainyb48ibl2qzgv8cmn9yinmd1k6i2y5y26wlhfy"; fetchSubmodules = true; }; + meta.homepage = "https://github.com/wincent/command-t/"; }; committia-vim = buildVimPluginFrom2Nix { @@ -761,6 +829,7 @@ let rev = "d367190c7ffe95f4ac5d30b2e9da4cd9898579b9"; sha256 = "1yqsdy1mxc775qcrcl1yi930m2q6364mgjdj06vwnph1rg98w0ql"; }; + meta.homepage = "https://github.com/rhysd/committia.vim/"; }; concealedyank-vim = buildVimPluginFrom2Nix { @@ -772,6 +841,7 @@ let rev = "e7e65a395e0e6a266f3a808bc07441aa7d03ebbd"; sha256 = "0z7i8dmwfjh6mcrmgrxv3j86ic867617fas9mv4gqsrhhvrrkzsb"; }; + meta.homepage = "https://github.com/chikatoike/concealedyank.vim/"; }; context_filetype-vim = buildVimPluginFrom2Nix { @@ -783,6 +853,7 @@ let rev = "f200fe69939089da9e61bd9a3ff75b4ef7adc708"; sha256 = "06pclan83yww5qf26fmqhby8iks0rzlxgpk254vxmkihbypvpa51"; }; + meta.homepage = "https://github.com/Shougo/context_filetype.vim/"; }; cosco-vim = buildVimPluginFrom2Nix { @@ -794,6 +865,7 @@ let rev = "5752622192d9b27b3a5a274a5455613b56df6386"; sha256 = "01byd7j4gl7zb1bh61p839ka04x2sm0rgwvbb126az7dr6gpclyf"; }; + meta.homepage = "https://github.com/lfilho/cosco.vim/"; }; cpsm = buildVimPluginFrom2Nix { @@ -805,6 +877,7 @@ let rev = "900023c56dfdd200841d5c2f2f7000f332d2614f"; sha256 = "1p1ry11f39fcz32i3b3p0p8n99qrnvrx4d7p0123123dj7wbxk3p"; }; + meta.homepage = "https://github.com/nixprime/cpsm/"; }; csapprox = buildVimPluginFrom2Nix { @@ -816,17 +889,19 @@ let rev = "7981dac51d8b6776985aa08cb7b5ee98ea7f2ddd"; sha256 = "08g4x6nnd6hkgm2daa5ihhz75pcdx3jzzv8rfjls80qajlhx5rf6"; }; + meta.homepage = "https://github.com/godlygeek/csapprox/"; }; csv-vim = buildVimPluginFrom2Nix { pname = "csv-vim"; - version = "2020-03-10"; + version = "2020-04-20"; src = fetchFromGitHub { owner = "chrisbra"; repo = "csv.vim"; - rev = "e7fb581122df54fe9770cc5e565bef450e7d2478"; - sha256 = "1h15n1pdci34idks218r4kpwna1zb25hk8prsqzvjkj8mc6ch67y"; + rev = "22e07247161c72adc029497b77d1b5d91b6b184b"; + sha256 = "1p6zsqgbs9qr7dznq8nls8n405jjd0bsyzjrns9h8jxk6sf7n56j"; }; + meta.homepage = "https://github.com/chrisbra/csv.vim/"; }; ctrlp-cmatcher = buildVimPluginFrom2Nix { @@ -838,6 +913,7 @@ let rev = "6c36334f106b6fd981d23e724e9a618734cab43a"; sha256 = "1573kd6xf3n8sxlz2j4zadai4rnc7k3s9c54648yfzickwn57d8q"; }; + meta.homepage = "https://github.com/JazzCore/ctrlp-cmatcher/"; }; ctrlp-py-matcher = buildVimPluginFrom2Nix { @@ -849,6 +925,7 @@ let rev = "cf63fd546f1e80dd4db3db96afbeaad301d21f13"; sha256 = "0hs829x3vxv12y78hz5g4a5qpw05xf42dk0hxxk3ind77mnl1ir1"; }; + meta.homepage = "https://github.com/FelikZ/ctrlp-py-matcher/"; }; ctrlp-z = buildVimPluginFrom2Nix { @@ -860,6 +937,7 @@ let rev = "d1a69ec623ce24b9a30fc8fe3cd468c322b03026"; sha256 = "16nsj1g8lqmyizlb5ijwhf4dsmh0xv1kwqq6jxvhaf55vfga82yl"; }; + meta.homepage = "https://github.com/amiorin/ctrlp-z/"; }; ctrlp-vim = buildVimPluginFrom2Nix { @@ -871,6 +949,7 @@ let rev = "585143acbe15f362852d78bd050baff3c12902d7"; sha256 = "0ijkzlb08sc47cax4f328hlk68nscx5wdzhihpj106vrnfyrpyx3"; }; + meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/"; }; dart-vim-plugin = buildVimPluginFrom2Nix { @@ -882,6 +961,7 @@ let rev = "4375ab9cc1fe0077c36a9aba5dd7145ce4a2fa6f"; sha256 = "03cl55s4f2qa8hwag2w38gfc7mpp6jhy0vx7qsmkn24cqk1jvv2k"; }; + meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/"; }; defx-git = buildVimPluginFrom2Nix { @@ -893,6 +973,7 @@ let rev = "b5d0b842064ddb7a7af0e790f4648cb1909ed43f"; sha256 = "0i8vi6zhnv088qc3f3wa5h4b17xnpvmr603srhg44zx2clcjblnr"; }; + meta.homepage = "https://github.com/kristijanhusak/defx-git/"; }; defx-icons = buildVimPluginFrom2Nix { @@ -904,17 +985,19 @@ let rev = "2e4df3b6302da537ac7df28fbc0e0991c6c1aa0e"; sha256 = "0wkn02z75pvfl0xrhgq80sw0qfidjg5s0zm5mij632pq3dm7axiq"; }; + meta.homepage = "https://github.com/kristijanhusak/defx-icons/"; }; defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2020-04-03"; + version = "2020-04-20"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "ceea32bb05ec33512c556054b91aff9c1d89f1cb"; - sha256 = "0jfp9xvsin2p9zdd5hsrhkm6rjwdmf130xmis3zpm3n53nh88xh8"; + rev = "1fb1d5f9b09ff6da815dfcdf3dfcb277605b9650"; + sha256 = "0vih85hb4igy200lml7gvaiifkgydjqqjlh7ymcvg3sx5l6psapy"; }; + meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; delimitMate = buildVimPluginFrom2Nix { @@ -926,6 +1009,7 @@ let rev = "728b57a6564c1d2bdfb9b9e0f2f8c5ba3d7e0c5c"; sha256 = "0fskm9gz81dk8arcidrm71mv72a7isng1clssqkqn5wnygbiimsn"; }; + meta.homepage = "https://github.com/Raimondi/delimitMate/"; }; denite-extra = buildVimPluginFrom2Nix { @@ -937,6 +1021,7 @@ let rev = "af18257544027ce89269dba70c12aba1f5b9e23c"; sha256 = "0bmq9yhylfd3v6bfwvakw3pbsz5kk8wlmmql0yllqayp6410w25a"; }; + meta.homepage = "https://github.com/neoclide/denite-extra/"; }; denite-git = buildVimPluginFrom2Nix { @@ -948,28 +1033,31 @@ let rev = "88b5323a6fc0ace197eed5205215d80f3b613f91"; sha256 = "0b687i64hr8hll7pv7r1xz906b46cl2q62zm18ipikhkpva6iv13"; }; + meta.homepage = "https://github.com/neoclide/denite-git/"; }; denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2020-04-05"; + version = "2020-04-20"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "7a71d54b725344dad92939901f319223411dc102"; - sha256 = "01wk4id1gffp7d88r5znwsay0wqkssdbw1rc3wjaax9a604j0v1j"; + rev = "6d2174645f3a7ab790546940b02024d72296e4c1"; + sha256 = "0dnnnwr01c4jgjyjnk4hivj4hiyar4j60fy2jc3l91aqd4m845vl"; }; + meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; deol-nvim = buildVimPluginFrom2Nix { pname = "deol-nvim"; - version = "2020-04-12"; + version = "2020-04-14"; src = fetchFromGitHub { owner = "Shougo"; repo = "deol.nvim"; - rev = "1c240e64703b67e0c7fcfb51b59d2bc276b668f5"; - sha256 = "049xx1al44yj3r3wsqwi4z861dkcw06cgfw1czaiiy696dah5fn2"; + rev = "d438a6f550910a5688481ff0251771ac7dd09245"; + sha256 = "0p6kvl1pgf5d5rnag297dhjzzplmawvmi2j1r2m6p0732ls4qxrw"; }; + meta.homepage = "https://github.com/Shougo/deol.nvim/"; }; deoplete-clang = buildVimPluginFrom2Nix { @@ -982,6 +1070,7 @@ let sha256 = "1wvk61f8ph2vpl6llzmir3qs3zwaw3lrphs16d1j7ljkdl3bk49k"; fetchSubmodules = true; }; + meta.homepage = "https://github.com/deoplete-plugins/deoplete-clang/"; }; deoplete-dictionary = buildVimPluginFrom2Nix { @@ -993,6 +1082,7 @@ let rev = "e0879df5dce25b96d6a2a6f52a1a5e41d12b5992"; sha256 = "05p707b15fzhf0laqy3q0hi34vxpljy86cd5qvpjzx5h0ry32p09"; }; + meta.homepage = "https://github.com/deoplete-plugins/deoplete-dictionary/"; }; deoplete-emoji = buildVimPluginFrom2Nix { @@ -1004,6 +1094,7 @@ let rev = "1dfa2da6ae3ee146ddfbfdba48cf45f0c1d57d7d"; sha256 = "0drqbdmy8igq6rv7s2qlxsp391pydcynlr9gkaadzrg7pk4nlgsb"; }; + meta.homepage = "https://github.com/fszymanski/deoplete-emoji/"; }; deoplete-fish = buildVimPluginFrom2Nix { @@ -1015,6 +1106,7 @@ let rev = "c4cfb934bb6ec69d7f1aff9d376b7d436bba5c93"; sha256 = "19a6j4qsqljz1pmrn4fx8v1bhlfpqdq821fc2ibjd9h98f6dzi5p"; }; + meta.homepage = "https://github.com/ponko2/deoplete-fish/"; }; deoplete-github = buildVimPluginFrom2Nix { @@ -1026,6 +1118,7 @@ let rev = "8e30256e50b3914a7e57ea4d5976b6a499fb936f"; sha256 = "11n15nqi417sdcqgb6gkk6z4wrrdd8vdbd7wzqpg41140c73v5gm"; }; + meta.homepage = "https://github.com/SevereOverfl0w/deoplete-github/"; }; deoplete-go = buildVimPluginFrom2Nix { @@ -1038,6 +1131,7 @@ let sha256 = "0zmx98kz6pxfpakizr8xm1nrv1rjr0frz19pkik29mk6aj2b2l08"; fetchSubmodules = true; }; + meta.homepage = "https://github.com/deoplete-plugins/deoplete-go/"; }; deoplete-greek = buildVimPluginFrom2Nix { @@ -1049,18 +1143,20 @@ let rev = "aecf3b2f8acfab20c93a6dc88d55260a0df04cbf"; sha256 = "086qjbqps05zb2vnyb5q7a67i7al8mxxi86n0h5nsqdd0ws6qqhx"; }; + meta.homepage = "https://github.com/Inazuma110/deoplete-greek/"; }; deoplete-jedi = buildVimPluginFrom2Nix { pname = "deoplete-jedi"; - version = "2020-03-27"; + version = "2020-04-13"; src = fetchFromGitHub { owner = "deoplete-plugins"; repo = "deoplete-jedi"; - rev = "34e48ef9569536bee335d4e36849e739e31b8aeb"; - sha256 = "1xlgfngaahbnwk6bfnmzv63jdz70w0lvqzpa5zbsyb5p52p4a58i"; + rev = "42f4c24a951b0fb5e76a70e5234f16193a8a746d"; + sha256 = "1incjz7xsh4cfxw06ff07830ywn0p99b1zmml8pkapbnh3x2bjgc"; fetchSubmodules = true; }; + meta.homepage = "https://github.com/deoplete-plugins/deoplete-jedi/"; }; deoplete-julia = buildVimPluginFrom2Nix { @@ -1072,6 +1168,7 @@ let rev = "d60b976910685c99ca773c974e91c44eeda03a19"; sha256 = "0x5cc9g1g1w9myr6p1ahb9gpn2abpbggjdk2bc903f62pkrapvjf"; }; + meta.homepage = "https://github.com/JuliaEditorSupport/deoplete-julia/"; }; deoplete-khard = buildVimPluginFrom2Nix { @@ -1083,6 +1180,7 @@ let rev = "27221723a3bb8e480ff8cbe7f4be9ff38c076bf7"; sha256 = "0g7sysm5lb8fpgagfg4565fz4rn16djdc4m2213ryq1s3crx40gw"; }; + meta.homepage = "https://github.com/nicoe/deoplete-khard/"; }; deoplete-lsp = buildVimPluginFrom2Nix { @@ -1094,6 +1192,7 @@ let rev = "6aa2bfd73a181fa6b55021264c4a8a83237ce558"; sha256 = "1bcvfbv046fk34vnc1ly8civ3sibqlzli8vm2548dfxc55wcwsys"; }; + meta.homepage = "https://github.com/Shougo/deoplete-lsp/"; }; deoplete-notmuch = buildVimPluginFrom2Nix { @@ -1105,6 +1204,7 @@ let rev = "828b5acf1924f9869614e93855a0d8cc94f1a74d"; sha256 = "1l2pfazhpkz26zwbjdafvhgvjj533kncm7dywlandsf3cibm8mv9"; }; + meta.homepage = "https://github.com/Valodim/deoplete-notmuch/"; }; deoplete-phpactor = buildVimPluginFrom2Nix { @@ -1116,6 +1216,7 @@ let rev = "53e239effb8ff20fc0a192206e96d98d4f9001ad"; sha256 = "14097r9fmyp9zxfgv0fj2s52qd1v5cxdckfg4zph7lg3yri1hx9p"; }; + meta.homepage = "https://github.com/kristijanhusak/deoplete-phpactor/"; }; deoplete-rust = buildVimPluginFrom2Nix { @@ -1127,6 +1228,7 @@ let rev = "0a86e502113910c33448b337c4d50cabea120d25"; sha256 = "0wsck83jns40ny3740vwjhc8g5bh6zl71hkirbjxy6n4xgixa54h"; }; + meta.homepage = "https://github.com/sebastianmarkow/deoplete-rust/"; }; deoplete-tabnine = buildVimPluginFrom2Nix { @@ -1138,6 +1240,7 @@ let rev = "eef0e2340e19aea05fe5759b7da3b13cadd375c4"; sha256 = "0q10zcjhjgak3w365pagd4ym5mmj3yd1lfsxv0d4wr4lp9a51sd7"; }; + meta.homepage = "https://github.com/tbodt/deoplete-tabnine/"; }; deoplete-ternjs = buildVimPluginFrom2Nix { @@ -1149,6 +1252,7 @@ let rev = "5405e84a44fc4ab5234c9a253ad4aa2b161e5897"; sha256 = "0684f9ci0y4wihf04z9r8x55cir02al4wp911dz0zg678z8w0yha"; }; + meta.homepage = "https://github.com/carlitux/deoplete-ternjs/"; }; deoplete-zsh = buildVimPluginFrom2Nix { @@ -1160,17 +1264,19 @@ let rev = "92b7afc3804dd17a849b207e184359558ab8f444"; sha256 = "0zsbkl82kny1vmfv06iz576xsclbik0xr7ndzpb0ddhw5nfnicfx"; }; + meta.homepage = "https://github.com/deoplete-plugins/deoplete-zsh/"; }; deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2020-04-10"; + version = "2020-04-15"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "eb2307cfa84280041bc294e2091cee40a9183db8"; - sha256 = "1zhz2d37gsbc2v2pz4k5m58r9d70x3ngbzcm6kxarm0farismxqg"; + rev = "bbec852adee45a1500fa817a3c17889dc328cad0"; + sha256 = "159ki94lb3n1kkmnd4cbmyc96xbpni45p7fgsml8x314j6iiihgk"; }; + meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; dhall-vim = buildVimPluginFrom2Nix { @@ -1182,6 +1288,7 @@ let rev = "607958520f8bd4308fe52937e211f6db4ad84cf3"; sha256 = "0rnkmfrzsm4hg6ln8g8qj9ff8z2sk7cnf4gqrswychqhhkg1f817"; }; + meta.homepage = "https://github.com/vmchale/dhall-vim/"; }; direnv-vim = buildVimPluginFrom2Nix { @@ -1193,6 +1300,7 @@ let rev = "5e75084465ad37dd0a4d4b1198b5ffa8978ae4e1"; sha256 = "0vabsv98vwdjns3dliplg7x8ssyrin44af9jl248kdzkqw5fx445"; }; + meta.homepage = "https://github.com/direnv/direnv.vim/"; }; DoxygenToolkit-vim = buildVimPluginFrom2Nix { @@ -1204,6 +1312,7 @@ let rev = "afd8663d36d2ec19d26befdb10e89e912d26bbd3"; sha256 = "1za8li02j4nhqjjsyxg4p78638h5af4izim37zc0p1x55zr3i85r"; }; + meta.homepage = "https://github.com/vim-scripts/DoxygenToolkit.vim/"; }; echodoc-vim = buildVimPluginFrom2Nix { @@ -1215,6 +1324,7 @@ let rev = "31533d9c6c2723dfb4cf5691c83f330a3a0ccddd"; sha256 = "1ygm4g90zv009iqv8k8n4930a7gpij5jxbz7dqq2dfyj4jn37rkf"; }; + meta.homepage = "https://github.com/Shougo/echodoc.vim/"; }; editorconfig-vim = buildVimPluginFrom2Nix { @@ -1227,6 +1337,7 @@ let sha256 = "015sfz2j0mfnfpm6zf8jnh0lm8943cpccjlbj7ks1dsvs36m056i"; fetchSubmodules = true; }; + meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; }; elm-vim = buildVimPluginFrom2Nix { @@ -1238,6 +1349,7 @@ let rev = "165107a9fd2b20c8f050fc4f977b4e41c790b1e7"; sha256 = "0gf7b49by0ybx3ndz7sz5dwcfnps4sz6wsr02lyarj8f8116ysy5"; }; + meta.homepage = "https://github.com/elmcast/elm-vim/"; }; emmet-vim = buildVimPluginFrom2Nix { @@ -1250,6 +1362,7 @@ let sha256 = "0wjxx648lp11nqzgrdcbqikjs85knpvk594b9l25hadhd5awgahv"; fetchSubmodules = true; }; + meta.homepage = "https://github.com/mattn/emmet-vim/"; }; emodeline = buildVimPluginFrom2Nix { @@ -1261,6 +1374,7 @@ let rev = "19550795743876c2256021530209d83592f5924a"; sha256 = "0x9y7rzbk6g8cq6jkn37wi95wzhq0abban6w10652v4kdmjrxrr0"; }; + meta.homepage = "https://github.com/vim-scripts/emodeline/"; }; ensime-vim = buildVimPluginFrom2Nix { @@ -1272,17 +1386,19 @@ let rev = "caa734e84f002b25446c615706283a74edd4ecfe"; sha256 = "190qq8r2zs7xzmsag7ygk6dvpav3cnzlc40lc3fvwmkfwgci5zg0"; }; + meta.homepage = "https://github.com/ensime/ensime-vim/"; }; falcon = buildVimPluginFrom2Nix { pname = "falcon"; - version = "2020-03-02"; + version = "2020-04-16"; src = fetchFromGitHub { owner = "fenetikm"; repo = "falcon"; - rev = "b7ef5d0e1b15ce007ecf6adb94270c0d3468d90e"; - sha256 = "1dcf6ic74r1lg0a3zqhfp1wk2f7j8nsykfvrk2d0j7waj2xsni4v"; + rev = "da3468536410eb1ea59a0dd3054edf28d4577d8c"; + sha256 = "1cvw3n8ysxnm3w0rvk1rks815ha5grca1p3c7bkas6klrplfhlsc"; }; + meta.homepage = "https://github.com/fenetikm/falcon/"; }; far-vim = buildVimPluginFrom2Nix { @@ -1294,6 +1410,7 @@ let rev = "2a8a9c22237d224f2c24680901b61b6f9bffb061"; sha256 = "0hk2p10cx36dz6vf22v4hx3shkkhqhkmxp6s1l517kkchh98m4bg"; }; + meta.homepage = "https://github.com/brooth/far.vim/"; }; fastfold = buildVimPluginFrom2Nix { @@ -1305,6 +1422,7 @@ let rev = "5872cbe9d921eb3ec79dce14a1f492f44c1cbaaf"; sha256 = "07mls0yczg2cmia2jn0s2rvgwl07yxlm4hyvjd941p1knvn88x8q"; }; + meta.homepage = "https://github.com/konfekt/fastfold/"; }; ferret = buildVimPluginFrom2Nix { @@ -1316,6 +1434,7 @@ let rev = "24633d3047eb93013743b28b0ea735783c7850d9"; sha256 = "06c3x3fqks30rzkj7z28qsgx9fcghz86ajc0cx3aai69xhgdipb5"; }; + meta.homepage = "https://github.com/wincent/ferret/"; }; file-line = buildVimPluginFrom2Nix { @@ -1327,6 +1446,7 @@ let rev = "559088afaf10124ea663ee0f4f73b1de48fb1632"; sha256 = "1w183g0hj8jvzm6m1jw7m6xz3x1dld8n8342vnycsh6hyzdcg3mg"; }; + meta.homepage = "https://github.com/bogado/file-line/"; }; flake8-vim = buildVimPluginFrom2Nix { @@ -1339,17 +1459,19 @@ let sha256 = "14rv0p1vx4njlplkc72gz7r8sy9vc6n8x9l00zc777x5zzrhgz3g"; fetchSubmodules = true; }; + meta.homepage = "https://github.com/andviro/flake8-vim/"; }; float-preview-nvim = buildVimPluginFrom2Nix { pname = "float-preview-nvim"; - version = "2020-02-29"; + version = "2020-04-19"; src = fetchFromGitHub { owner = "ncm2"; repo = "float-preview.nvim"; - rev = "cbc23a28e8ea92d7c8dc22e727a62d42ef65086a"; - sha256 = "1qv05qv89sbh1cafl2597lj95yv8yxpxm3sxbbclrls1962f7hgy"; + rev = "3c2e230a3fe34b3a5fb74519797c29daa5a6a69a"; + sha256 = "1i5wj1hqimzrw3bwsf76w8l8yp654pdn8f61kp0v98xdgkab007d"; }; + meta.homepage = "https://github.com/ncm2/float-preview.nvim/"; }; floobits-neovim = buildVimPluginFrom2Nix { @@ -1361,6 +1483,7 @@ let rev = "29ab2ed4bd5c879df0bd6df313a776155eb98ad8"; sha256 = "0bnncn3waw9birpd51j27hrzlriz8dk4naxdajmbwznwcnbkkgwx"; }; + meta.homepage = "https://github.com/floobits/floobits-neovim/"; }; forms = buildVimPluginFrom2Nix { @@ -1372,6 +1495,7 @@ let rev = "b601e03fe0a3b8a43766231f4a6217e4492b4f75"; sha256 = "19kp1i5c6jmnpbsap9giayqbzlv7vh02mp4mjvicqj9n0nfyay74"; }; + meta.homepage = "https://github.com/megaannum/forms/"; }; fugitive-gitlab-vim = buildVimPluginFrom2Nix { @@ -1383,6 +1507,7 @@ let rev = "f3e56ff60fe3fb5ebc891cbe5fd12cd8c59ae6ef"; sha256 = "0cx3zd7f09prxjfrj201139j00wsw66fx5crw6dhblf4z6mfpgnx"; }; + meta.homepage = "https://github.com/shumphrey/fugitive-gitlab.vim/"; }; fzf-vim = buildVimPluginFrom2Nix { @@ -1394,6 +1519,7 @@ let rev = "f86ef1bce602713fe0b5b68f4bdca8c6943ecb59"; sha256 = "0h3mlc4lvnlzg7pfrr09vrfn93lglzfp5ca6bl4jhsi63xw7x3ad"; }; + meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; gen_tags-vim = buildVimPluginFrom2Nix { @@ -1405,6 +1531,7 @@ let rev = "208cd0490547bc8f7615eea1b26e4635d2e60a96"; sha256 = "00s1kxi1bsvz06z7x78kls0k6ncnbqdyz14fvdxxq82f6s1kdvdw"; }; + meta.homepage = "https://github.com/jsfaint/gen_tags.vim/"; }; gentoo-syntax = buildVimPluginFrom2Nix { @@ -1416,17 +1543,19 @@ let rev = "42163237b57c56de9a24fe6549e46c805fab2bb3"; sha256 = "1bg3ismjlp99drsfyrkjb137ypxmp0qpy8pp9ry9i8ljmnffbgal"; }; + meta.homepage = "https://github.com/gentoo/gentoo-syntax/"; }; ghcid = buildVimPluginFrom2Nix { pname = "ghcid"; - version = "2020-04-12"; + version = "2020-04-13"; src = fetchFromGitHub { owner = "ndmitchell"; repo = "ghcid"; - rev = "54553c5c915856d389a071aae5a2dba827727b7d"; - sha256 = "0dpwvyf3vrrdiy0w2hplf656c8b1yqlcv495r7bz9ksbyqhsp70f"; + rev = "bcbb1c9182fc1940d5e55bb716dc7621ab7c36bc"; + sha256 = "1my9khiq1ssqkp0nixrzly0xlyla6bzdl3x9ky6687848cpriaz0"; }; + meta.homepage = "https://github.com/ndmitchell/ghcid/"; }; ghcmod-vim = buildVimPluginFrom2Nix { @@ -1438,6 +1567,7 @@ let rev = "1d192d13d68ab59f9f46497a0909bf24a7b7dfff"; sha256 = "0bzahgzagnf0a9zv86jhdf8nc3p0yfz9izv5n3lc8gc12cp47d0a"; }; + meta.homepage = "https://github.com/eagletmt/ghcmod-vim/"; }; gitignore-vim = buildVimPluginFrom2Nix { @@ -1449,6 +1579,7 @@ let rev = "3ad6a15768945fd4fc1b013cec5d8c8e62c7bb87"; sha256 = "0fg36hrkwqb3accqm7ihw1cjs64fxf73zk06gickdkzq0zn4yl8x"; }; + meta.homepage = "https://github.com/vim-scripts/gitignore.vim/"; }; gitv = buildVimPluginFrom2Nix { @@ -1460,6 +1591,7 @@ let rev = "a73599c34202709eaa7da78f4fe32b97c6ef83f8"; sha256 = "0hhamv2q3z8cy4n9yzxq0jvs2x8qx4wx6c2qpsk82jsnghmzipd6"; }; + meta.homepage = "https://github.com/gregsexton/gitv/"; }; goyo-vim = buildVimPluginFrom2Nix { @@ -1471,6 +1603,7 @@ let rev = "6b6ed2734084fdbb6315357ddcaecf9c8e6f143d"; sha256 = "1ywlz1hn54kxyp5q0angriaarimq7ys7m6sk6l4x8jr1g2yh0afz"; }; + meta.homepage = "https://github.com/junegunn/goyo.vim/"; }; gruvbox = buildVimPluginFrom2Nix { @@ -1482,6 +1615,7 @@ let rev = "040138616bec342d5ea94d4db296f8ddca17007a"; sha256 = "0qk2mqs04qlxkc1ldgjbiv1yisi2xl2b8svmjz0hdp9y2l5vfccw"; }; + meta.homepage = "https://github.com/morhetz/gruvbox/"; }; gruvbox-community = buildVimPluginFrom2Nix { @@ -1493,6 +1627,7 @@ let rev = "f5711c15480b83378bde13306fa997057c0c81cd"; sha256 = "0vx289a7av31dxm58c6kmfdnsrwnq1rzj5rwci2pqjdac8ds2qm0"; }; + meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; gundo-vim = buildVimPluginFrom2Nix { @@ -1504,6 +1639,7 @@ let rev = "99e6240340d9ba07b66c544daf44fa7caffbf7e7"; sha256 = "0py35mmwnfl581isnbh33j3bjgghq17jnamdi1bg3akwyn1jyhqb"; }; + meta.homepage = "https://github.com/sjl/gundo.vim/"; }; gv-vim = buildVimPluginFrom2Nix { @@ -1515,6 +1651,7 @@ let rev = "72dc64df998355b41a75ebfa32adfd08ed5c5819"; sha256 = "01g4rnsh2n691n9a6gqhyzivr4mzlgz3i2mwb7vxpkp61yf755bb"; }; + meta.homepage = "https://github.com/junegunn/gv.vim/"; }; haskell-vim = buildVimPluginFrom2Nix { @@ -1526,6 +1663,7 @@ let rev = "b1ac46807835423c4a4dd063df6d5b613d89c731"; sha256 = "1vqj3r2v8skffywwgv4093ww7fm540437j5qz7n8q8787bs5w0br"; }; + meta.homepage = "https://github.com/neovimhaskell/haskell-vim/"; }; hasksyn = buildVimPluginFrom2Nix { @@ -1537,6 +1675,7 @@ let rev = "c434040bf13a17ca20a551223021b3ace7e453b9"; sha256 = "09998lnfcshqis5m062wlag6y476imq9jday9gp4ayjjl1cp3cwx"; }; + meta.homepage = "https://github.com/travitch/hasksyn/"; }; hlint-refactor-vim = buildVimPluginFrom2Nix { @@ -1548,6 +1687,7 @@ let rev = "fffb044ecef854a82c5c2efda252e09044ba03e0"; sha256 = "0z8d31arfy9aidg1dwj5msnnx799d9r7njkgh51z695w6ayxn6p8"; }; + meta.homepage = "https://github.com/mpickering/hlint-refactor-vim/"; }; iceberg-vim = buildVimPluginFrom2Nix { @@ -1559,6 +1699,7 @@ let rev = "1740235846c92666fe521e550a27fa47ebe5f5a3"; sha256 = "13zf899kgwjhrksznz2212ywml7nnqwq2dyam39nzywf8msg8va6"; }; + meta.homepage = "https://github.com/cocopon/iceberg.vim/"; }; idris-vim = buildVimPluginFrom2Nix { @@ -1570,6 +1711,7 @@ let rev = "091ed6b267749927777423160eeab520109dd9c1"; sha256 = "1zibar2vxcmai0k37ricwnimfdv1adxfbbvz871rc4l6h3q85if1"; }; + meta.homepage = "https://github.com/idris-hackers/idris-vim/"; }; Improved-AnsiEsc = buildVimPluginFrom2Nix { @@ -1581,6 +1723,7 @@ let rev = "e1c59a8e9203fab6b9150721f30548916da73351"; sha256 = "1smjs4kz2kmzprzp9az4957675nakb43146hshbby39j5xz4jsbz"; }; + meta.homepage = "https://github.com/vim-scripts/Improved-AnsiEsc/"; }; increment-activator = buildVimPluginFrom2Nix { @@ -1592,6 +1735,7 @@ let rev = "bff5516da9103fb093ffc0dc993b8d535eacbceb"; sha256 = "1swlv1mrck9s3n7fdg10c2nmlasf2fx8yfk01x3vii7l4aaa9w2y"; }; + meta.homepage = "https://github.com/nishigori/increment-activator/"; }; incsearch-easymotion-vim = buildVimPluginFrom2Nix { @@ -1603,6 +1747,7 @@ let rev = "fcdd3aee6f4c0eef1a515727199ece8d6c6041b5"; sha256 = "1bscr3xs1zggm9qzk1mb88fkc8qj6yrnkxmqwwyr75sf1xzy74mk"; }; + meta.homepage = "https://github.com/haya14busa/incsearch-easymotion.vim/"; }; incsearch-vim = buildVimPluginFrom2Nix { @@ -1614,6 +1759,7 @@ let rev = "25e2547fb0566460f5999024f7a0de7b3775201f"; sha256 = "05v0d9b5sm4d1bvhb01jk6s7brlli2xc16hvzr6gik1nm1ks6ai1"; }; + meta.homepage = "https://github.com/haya14busa/incsearch.vim/"; }; indentLine = buildVimPluginFrom2Nix { @@ -1625,6 +1771,7 @@ let rev = "15aceda8c4eea621b66faa8673fca0b9fbe2f457"; sha256 = "1icb1h811lp86hg4w8y8mmmsfm4c80n7m8r1wi58lnm60mjasas4"; }; + meta.homepage = "https://github.com/Yggdroot/indentLine/"; }; intero-neovim = buildVimPluginFrom2Nix { @@ -1636,6 +1783,7 @@ let rev = "4ce2d154379f8c95b3819512a9b67ead5204ffd0"; sha256 = "1na61qb31z80973jfi7ziw2zv6y73rm0bpfb6iqxjppmg4iqgl3i"; }; + meta.homepage = "https://github.com/parsonsmatt/intero-neovim/"; }; iosvkem = buildVimPluginFrom2Nix { @@ -1647,6 +1795,7 @@ let rev = "08e36b649c83eece7edbd2e04e42e077aebc78eb"; sha256 = "0jawl7fs6wl3ny9vsmzqv5pnkv5nn6wj1nx7hzgdl41183958pni"; }; + meta.homepage = "https://github.com/neutaaaaan/iosvkem/"; }; ir_black = buildVimPluginFrom2Nix { @@ -1658,6 +1807,7 @@ let rev = "4e45f1cbcc9c04cf32c8681c6b3b4534a33610ed"; sha256 = "13g9nqlqsjsxnrq37y33ldh41dw9q9dw07spfi7qwrskiwa0ayk7"; }; + meta.homepage = "https://github.com/twerth/ir_black/"; }; jdaddy-vim = buildVimPluginFrom2Nix { @@ -1669,6 +1819,7 @@ let rev = "3e44c2e6d22e2d6fc94863379b5b4f5424537321"; sha256 = "1ch12bffrs3gqqzdj9vh0i2azhc5d06i5vwds4rqcx797lqh7pzb"; }; + meta.homepage = "https://github.com/vim-scripts/jdaddy.vim/"; }; jedi-vim = buildVimPluginFrom2Nix { @@ -1681,6 +1832,7 @@ let sha256 = "0yj1bsfn43crmfn0ylyzyz41z0vmvapl5cgm7k1rnbj96i7vifx7"; fetchSubmodules = true; }; + meta.homepage = "https://github.com/davidhalter/jedi-vim/"; }; jellybeans-vim = buildVimPluginFrom2Nix { @@ -1692,6 +1844,7 @@ let rev = "ef83bf4dc8b3eacffc97bf5c96ab2581b415c9fa"; sha256 = "1zy3gjz5bna3l5a7k2ddqa0w7x8wbndy2vc9gmqfdsxdbhrgpvaz"; }; + meta.homepage = "https://github.com/nanotech/jellybeans.vim/"; }; Jenkinsfile-vim-syntax = buildVimPluginFrom2Nix { @@ -1703,6 +1856,7 @@ let rev = "164b457d87b65c6ca9e5998b69c6cd24248f62ac"; sha256 = "14s26hlsdqys7br84l9wiyvhcy17s6966mhgr9n6sdqmhz6lc4nm"; }; + meta.homepage = "https://github.com/martinda/Jenkinsfile-vim-syntax/"; }; jq-vim = buildVimPluginFrom2Nix { @@ -1714,17 +1868,19 @@ let rev = "6e056fa297ce58d45500b0937b8214400e9a50fa"; sha256 = "0dfsym34xiza9221bdsr51jykcxmz8bnkzi846bqxxjxiw0p3yk1"; }; + meta.homepage = "https://github.com/vito-c/jq.vim/"; }; julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2020-03-11"; + version = "2020-04-17"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "8ea33c2e5c3dd5cc82b2a86a9f7c97b8219aeb9c"; - sha256 = "0i7n5fs0a717il71yny8dsrvyyskj9cahg1wnx8nrkyn3x06myhh"; + rev = "34c24ee0f8476dfc573e22f9f6a6fe4eec466225"; + sha256 = "0yy50yb28md5z2yzcaq45cchd8c44q12xvwcb2yh3r9nhgqhll2h"; }; + meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; kotlin-vim = buildVimPluginFrom2Nix { @@ -1736,6 +1892,7 @@ let rev = "b9fa728701a0aa0b9a2ffe92f10880348fc27a8f"; sha256 = "1yqzxabhpc4jbdlzhsysp0vi1ayqg0vnpysvx4ynd9961q2fk3sz"; }; + meta.homepage = "https://github.com/udalov/kotlin-vim/"; }; lalrpop-vim = buildVimPluginFrom2Nix { @@ -1747,6 +1904,7 @@ let rev = "7073eec8efdeff37cacd4bca378c28dad02c3c14"; sha256 = "1xx6hlgrdbnk3d6rsn4jzbaqwankvnnmj4iilakaazddfaa0l6rr"; }; + meta.homepage = "https://github.com/qnighy/lalrpop.vim/"; }; LanguageClient-neovim = buildVimPluginFrom2Nix { @@ -1758,6 +1916,7 @@ let rev = "dd45e31449511152f2127fe862d955237caa130f"; sha256 = "1i1c98r9fg1mzyl15b3grk6v7s7frwadh86rr1ggz7aq1gwfy7dq"; }; + meta.homepage = "https://github.com/autozimu/LanguageClient-neovim/"; }; last256 = buildVimPluginFrom2Nix { @@ -1769,6 +1928,7 @@ let rev = "d29320c1fe715b47edaa1be068201ea5a54ab0c0"; sha256 = "16njh0p1j166dnf92110vlrj7gmrbsfkbkd8k6s9gfqjzbgd25jv"; }; + meta.homepage = "https://github.com/sk1418/last256/"; }; latex-box = buildVimPluginFrom2Nix { @@ -1780,6 +1940,7 @@ let rev = "3c2901e12cb78bfb2be58ba4c62a488612550fe1"; sha256 = "1z4mdy47cpwcdhvy8mr72vhlybxn1y59yd3ixf6ids1bzpkrd7zl"; }; + meta.homepage = "https://github.com/latex-box-team/latex-box/"; }; lean-vim = buildVimPluginFrom2Nix { @@ -1791,6 +1952,7 @@ let rev = "2ace010eb32603a65af7921954a0594a02523c6b"; sha256 = "0wq2lw4xx2qhz1xii9g7i6wz0y43b2icqrm6ypr9jmaac1rhiq7c"; }; + meta.homepage = "https://github.com/leanprover/lean.vim/"; }; lessspace-vim = buildVimPluginFrom2Nix { @@ -1802,6 +1964,7 @@ let rev = "dc05cf6c3b67e3f8c87da2e565c5524872526316"; sha256 = "154x6i2ncmcbc3snkzdcggq5m5zvlbjyry5lvr6n4qcvf65z5z44"; }; + meta.homepage = "https://github.com/thirtythreeforty/lessspace.vim/"; }; lexima-vim = buildVimPluginFrom2Nix { @@ -1813,17 +1976,19 @@ let rev = "aa32e972b69230625989daa09ee5fd74a2d877ef"; sha256 = "15cc09vb0yrasz76qkcqxhj95y1m6yrsx3wsn6khx39kp1bas0jd"; }; + meta.homepage = "https://github.com/cohama/lexima.vim/"; }; lf-vim = buildVimPluginFrom2Nix { pname = "lf-vim"; - version = "2019-10-11"; + version = "2020-04-13"; src = fetchFromGitHub { owner = "ptzz"; repo = "lf.vim"; - rev = "8ffbae128b8887283b2d4b3a660e5be0de58ea0c"; - sha256 = "0gzj9h31f4synjqfv8dhqihr6fgi3ar06xqjjl5fb4269p9964lb"; + rev = "505b5b6350671e978f8e7392e9b0dadbd98752a7"; + sha256 = "18g4hpdkhj747r7ga153nk8qc5rbnxx1avx1n2h1xsj5m75fdhjx"; }; + meta.homepage = "https://github.com/ptzz/lf.vim/"; }; lh-brackets = buildVimPluginFrom2Nix { @@ -1835,6 +2000,7 @@ let rev = "dc91bb1e8ef45a0810d9c1ad412863977c8c4baf"; sha256 = "1yjmykn92i54cajr5wrj7m0wvaigy106c3hm8ks30xn4zm970x03"; }; + meta.homepage = "https://github.com/LucHermitte/lh-brackets/"; }; lh-vim-lib = buildVimPluginFrom2Nix { @@ -1846,6 +2012,7 @@ let rev = "3a8383f2efbd7496c17a70bf4593773f6149435f"; sha256 = "0c6gnksyjyvsxqbp13q8bp9j4cg9x9m0kzrkx01p9k6wq297kpd9"; }; + meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; lightline-ale = buildVimPluginFrom2Nix { @@ -1857,6 +2024,7 @@ let rev = "a1931d473d6600ccf7e426158b79c9df29463dda"; sha256 = "1zmwi4b8sbl3zpzp8hlz7j3gg4p9628s0174pcd2n6mdkfh235g5"; }; + meta.homepage = "https://github.com/maximbaz/lightline-ale/"; }; lightline-bufferline = buildVimPluginFrom2Nix { @@ -1868,6 +2036,7 @@ let rev = "17683bc5802de7f295f2583a15461e2bc662f98b"; sha256 = "1rlamxwk2gm9pyxl9vym9w6rhgimzqa2hjghy3qdqwvif6w8ir6l"; }; + meta.homepage = "https://github.com/mengelbrecht/lightline-bufferline/"; }; lightline-vim = buildVimPluginFrom2Nix { @@ -1879,6 +2048,7 @@ let rev = "b8976d2e549b417e5d1c1594fb9034b749976cc0"; sha256 = "1w86bg63qvigdva1g8w4lba63ghlsxfbjb0rqsxyxg6w7m9k6lhd"; }; + meta.homepage = "https://github.com/itchyny/lightline.vim/"; }; limelight-vim = buildVimPluginFrom2Nix { @@ -1890,6 +2060,7 @@ let rev = "26e913a2e061195245bc62d24009ab67143a3c32"; sha256 = "0bxmihv9i96k6pl37pzgri03vbvjwlp34rl4gkj8w2ajhhi6nsnn"; }; + meta.homepage = "https://github.com/junegunn/limelight.vim/"; }; lushtags = buildVimPluginFrom2Nix { @@ -1901,6 +2072,7 @@ let rev = "fd7fa5a0162d9aa159559880d5ba4731e180eeaf"; sha256 = "03saw1w5pybj6yywzi8hinciv18znimm7k0h34k4pqp5gi1jfaql"; }; + meta.homepage = "https://github.com/mkasa/lushtags/"; }; matchit-zip = buildVimPluginFrom2Nix { @@ -1912,6 +2084,7 @@ let rev = "ced6c409c9beeb0b4142d21906606bd194411d1d"; sha256 = "1s9c4lnsmbfm97bp22jrmcp5lga5ihx23lzqqncvv7rcizkvr3dm"; }; + meta.homepage = "https://github.com/vim-scripts/matchit.zip/"; }; mattn-calendar-vim = buildVimPluginFrom2Nix { @@ -1923,6 +2096,7 @@ let rev = "de499b9525490b10edbd28fb8f0c4e81c6a6f20c"; sha256 = "0xvvkq9zckmv9pnzvxg71fblly8lksfi736brbcwcvnszqif4b69"; }; + meta.homepage = "https://github.com/mattn/calendar-vim/"; }; mayansmoke = buildVimPluginFrom2Nix { @@ -1934,6 +2108,7 @@ let rev = "168883af7aec05f139af251f47eadd5dfb802c9d"; sha256 = "1xxcky7i6sx7f1q8xka4gd2xg78w6sqjvqrdwgrdzv93fhf82rpd"; }; + meta.homepage = "https://github.com/vim-scripts/mayansmoke/"; }; molokai = buildVimPluginFrom2Nix { @@ -1945,6 +2120,7 @@ let rev = "c67bdfcdb31415aa0ade7f8c003261700a885476"; sha256 = "1piszjr5kyw43ac1f0jh9z88g824xknshrkchbys9qxlz7pd831s"; }; + meta.homepage = "https://github.com/tomasr/molokai/"; }; ncm2 = buildVimPluginFrom2Nix { @@ -1956,6 +2132,7 @@ let rev = "6596df4631ee1ee17351a78f382d4efd0b82c05e"; sha256 = "16276cjviij92ypqj9148828k4dhiywam0dz07v3rikknak11cra"; }; + meta.homepage = "https://github.com/ncm2/ncm2/"; }; ncm2-bufword = buildVimPluginFrom2Nix { @@ -1967,6 +2144,7 @@ let rev = "1d42750114e47a31286268880affcd66c6ae48d5"; sha256 = "14q76n5c70wvi48wm1alyckba71rp5300i35091ga197nkgphyaz"; }; + meta.homepage = "https://github.com/ncm2/ncm2-bufword/"; }; ncm2-jedi = buildVimPluginFrom2Nix { @@ -1978,6 +2156,7 @@ let rev = "b28bf6d054051cc1c7a6b148323d3adb9baa4ed5"; sha256 = "07pq8akzvlb8hzksgxx1c50j09ia0xnszq1f83x75kqsjg5f6nhy"; }; + meta.homepage = "https://github.com/ncm2/ncm2-jedi/"; }; ncm2-path = buildVimPluginFrom2Nix { @@ -1989,6 +2168,7 @@ let rev = "84b1e6b5f28ced2245ff08e6694101f029fdfca8"; sha256 = "0yqga8d423k2j6iknkyx1qs1shddpshi4sx78992sa15dax9d394"; }; + meta.homepage = "https://github.com/ncm2/ncm2-path/"; }; ncm2-tmux = buildVimPluginFrom2Nix { @@ -2000,6 +2180,7 @@ let rev = "17fa16ac1211af3d8e671f1591939d6f37bdd3bd"; sha256 = "1g99vbrdz06i36gpa95crwixj61my7c9miy7mbpfbiy4zykf2wl2"; }; + meta.homepage = "https://github.com/ncm2/ncm2-tmux/"; }; ncm2-ultisnips = buildVimPluginFrom2Nix { @@ -2011,6 +2192,7 @@ let rev = "a7462f3b7036dce045a472d8ec9d8fb9fb090212"; sha256 = "0f3qp33s5nh9nha9cgxggcmh7c1a5yrwvyyrszlh0x8nrzm1v1ma"; }; + meta.homepage = "https://github.com/ncm2/ncm2-ultisnips/"; }; neco-ghc = buildVimPluginFrom2Nix { @@ -2022,6 +2204,7 @@ let rev = "682869aca5dd0bde71a09ba952acb59c543adf7d"; sha256 = "1v7ibi4fp99s4lswz3v0gf4i0h5i5gpj05xpsf4cixwj2zgh206h"; }; + meta.homepage = "https://github.com/eagletmt/neco-ghc/"; }; neco-look = buildVimPluginFrom2Nix { @@ -2033,6 +2216,7 @@ let rev = "4d7f1fd7e406c302fba2a1358017c5a76d0f9fc1"; sha256 = "1brvzg15ni5j60wncpvxhs5k36wz83lhvfcnvja2l9yrngcgh6vr"; }; + meta.homepage = "https://github.com/ujihisa/neco-look/"; }; neco-syntax = buildVimPluginFrom2Nix { @@ -2044,6 +2228,7 @@ let rev = "6c3862ac82d2c917fa8b4126832de7d3a909f1fe"; sha256 = "1kmzlz6c5bs7f4dxgrdn4azwh55k6ghhyzy8jjdgj0wsb309y92k"; }; + meta.homepage = "https://github.com/Shougo/neco-syntax/"; }; neco-vim = buildVimPluginFrom2Nix { @@ -2055,6 +2240,7 @@ let rev = "4fbc3f5f3a2b2d5299c388e2f1ffef04fcaf87ba"; sha256 = "0lk5p2aihalcarsjnvn1yidgv0xqp1bk29wywsbp8ni964s0si39"; }; + meta.homepage = "https://github.com/Shougo/neco-vim/"; }; neocomplete-vim = buildVimPluginFrom2Nix { @@ -2066,6 +2252,7 @@ let rev = "0f83788cb67e0743a3a9c8d3a3a6e52a01bdc6c2"; sha256 = "1ydnb576qbdbij7ipciw0m46wbj45gj7xirpmqxazgp9y6b13isf"; }; + meta.homepage = "https://github.com/Shougo/neocomplete.vim/"; }; neodark-vim = buildVimPluginFrom2Nix { @@ -2077,6 +2264,7 @@ let rev = "44919aa0bebfa60e93e653fdd2a81d1c75c2e721"; sha256 = "1wz9ygfdg59jwi19l9njcxknf77azlx5nkf5q0ghk6zyv1mqwvc1"; }; + meta.homepage = "https://github.com/KeitaNakamura/neodark.vim/"; }; neoformat = buildVimPluginFrom2Nix { @@ -2088,6 +2276,7 @@ let rev = "d02b169e70bd6d2b2365bf6cda721967616a30bf"; sha256 = "1cya26wfqc7l7dqy854m4kwrq3w66knmn2cgviqh9cnsjzhwxs0d"; }; + meta.homepage = "https://github.com/sbdchd/neoformat/"; }; neoinclude-vim = buildVimPluginFrom2Nix { @@ -2099,6 +2288,7 @@ let rev = "5125e73de0a8b4f2c399e4896e21be1b8f7b3d39"; sha256 = "0qw63xyvrxvdzx01k5nnsv3p8zmnd77cwbkk24pikqrscxw3ypsz"; }; + meta.homepage = "https://github.com/Shougo/neoinclude.vim/"; }; neomake = buildVimPluginFrom2Nix { @@ -2110,6 +2300,7 @@ let rev = "d10e53956161176c7f8a1ef2899880d5384f47b0"; sha256 = "0zv27bln0n687s0xm19nrk16i58hmxdhy26jmjh335zji0ydx27v"; }; + meta.homepage = "https://github.com/neomake/neomake/"; }; neomru-vim = buildVimPluginFrom2Nix { @@ -2121,6 +2312,7 @@ let rev = "d9b92f73f7d9158e803d72f2baeb7da9ea30040e"; sha256 = "04fic8s4g19kgml1pb5fd6yzhsscq8yrpwbmg8sb0lqjas2qpakv"; }; + meta.homepage = "https://github.com/Shougo/neomru.vim/"; }; neosnippet-snippets = buildVimPluginFrom2Nix { @@ -2132,6 +2324,7 @@ let rev = "2e72985f712f0d5cb707beba151555a1f0003630"; sha256 = "1lvm37q9zq4a077f2zm9dfp8zfg5d3853bmlih6sc8d6i477kcmb"; }; + meta.homepage = "https://github.com/Shougo/neosnippet-snippets/"; }; neosnippet-vim = buildVimPluginFrom2Nix { @@ -2143,6 +2336,7 @@ let rev = "3aaf5e763410f57916227da407fd90726e19a612"; sha256 = "0zkw2q2s7756p4xgf49v4lj8lrzw35x81h1wzia7d9k92d7ivwca"; }; + meta.homepage = "https://github.com/Shougo/neosnippet.vim/"; }; NeoSolarized = buildVimPluginFrom2Nix { @@ -2154,17 +2348,19 @@ let rev = "70609c44215c8d2c43ad8c631296caae08a9c8d4"; sha256 = "0bxrm2vm3z1y37sm6m2hdn72g2sw31dx1xhmjvd0ng72cnp84d9k"; }; + meta.homepage = "https://github.com/icymind/NeoSolarized/"; }; neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2020-04-12"; + version = "2020-04-20"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "964745a9a8c2a61b876f3082fedcb321c415ab5e"; - sha256 = "0pmim51nj2c4njp5b9wihmg208chwc1vrq83ccff0hbmdc1djr60"; + rev = "e3ece229fc0f26cb114f629faa2dc979e16e8e8a"; + sha256 = "1g823p6qvxvxv5l9f3lb0dyf9pzrr7i3qw8n1rqfs2w0xipj6arl"; }; + meta.homepage = "https://github.com/kassio/neoterm/"; }; neovim-fuzzy = buildVimPluginFrom2Nix { @@ -2176,6 +2372,7 @@ let rev = "53383395befafce802c902c21b54847074454491"; sha256 = "064qi6zv2hrzn91pvr31b9zj2q0k9vbkk5csdhw5y52q26p1gakq"; }; + meta.homepage = "https://github.com/cloudhead/neovim-fuzzy/"; }; neovim-sensible = buildVimPluginFrom2Nix { @@ -2187,6 +2384,7 @@ let rev = "e7ab7544f15e59de2d9a1b42f58e590938e496e7"; sha256 = "06whnfvmzfdsx9gvkd2nxhx29939gjzibr2xadh54sj8ns646w58"; }; + meta.homepage = "https://github.com/jeffkreeftmeijer/neovim-sensible/"; }; neoyank-vim = buildVimPluginFrom2Nix { @@ -2198,6 +2396,7 @@ let rev = "1829c6e426f829edea46660d0db08d4488010fcd"; sha256 = "1y6fvxqpj3rwf1fmjib177lqzh3z7syp7bccn79g1j8177m515w6"; }; + meta.homepage = "https://github.com/Shougo/neoyank.vim/"; }; nerdcommenter = buildVimPluginFrom2Nix { @@ -2209,17 +2408,19 @@ let rev = "c62e618a1ab5a50a4028e3296500ba29d9b033d8"; sha256 = "0w4bxj423dxxkcxnfmipf8x5jfm058rq4g3m98wzcz5zbambv3qs"; }; + meta.homepage = "https://github.com/preservim/nerdcommenter/"; }; nerdtree = buildVimPluginFrom2Nix { pname = "nerdtree"; - version = "2020-04-10"; + version = "2020-04-15"; src = fetchFromGitHub { owner = "preservim"; repo = "nerdtree"; - rev = "f767dd34a0bda0a6db8efa43257c90981947f0ab"; - sha256 = "0m02yxs235jznf2y1hr6zj04fb3igra4lb8crgl3slsvdw3zndb1"; + rev = "29a321d061032df5b2ec347b6b4b778f665305a6"; + sha256 = "08gfmpikxz6j9hymf64fbxd1630x3gvkq72d2dmdfr9an2xxh6zm"; }; + meta.homepage = "https://github.com/preservim/nerdtree/"; }; nerdtree-git-plugin = buildVimPluginFrom2Nix { @@ -2231,6 +2432,7 @@ let rev = "95e20577cd442ad6256aff9bb2e9c80db05c13f0"; sha256 = "15i66mxvygs6xa2jvk7bqdagxx1lcvynmyb9g75whgbv7is80qn7"; }; + meta.homepage = "https://github.com/albfan/nerdtree-git-plugin/"; }; nim-vim = buildVimPluginFrom2Nix { @@ -2242,6 +2444,7 @@ let rev = "88f5e708a739fb26be6364ab2fabadf9fffb8d7b"; sha256 = "0ja8qx9c5g7k4phllvk3vz6s62iwpwsn40w6c32sybjs98jkrw7y"; }; + meta.homepage = "https://github.com/zah/nim.vim/"; }; nord-vim = buildVimPluginFrom2Nix { @@ -2253,17 +2456,19 @@ let rev = "f06189a4c054fe8c22e46aca4d451e03456f2283"; sha256 = "0gk4zq0gz3nnwfkldswg9bjpk0gf6d6mgfzcgvj0pnlbja6ass81"; }; + meta.homepage = "https://github.com/arcticicestudio/nord-vim/"; }; NrrwRgn = buildVimPluginFrom2Nix { pname = "NrrwRgn"; - version = "2020-03-27"; + version = "2020-04-21"; src = fetchFromGitHub { owner = "chrisbra"; repo = "NrrwRgn"; - rev = "f8b5c3c649fc12dd1181564f29ebc6c51e231126"; - sha256 = "1xh2ds1y5gj07ycw3b5lw7av92q39wwrq13mz8j37jmnhw0ppbl4"; + rev = "a558325a2d0cca810520ed2b62e0c0e543e97bf6"; + sha256 = "1ngwyga0pslkw1d5qwz98zz8axfwc0mvxig5yp59gra9awgk6nw8"; }; + meta.homepage = "https://github.com/chrisbra/NrrwRgn/"; }; nvim-cm-racer = buildVimPluginFrom2Nix { @@ -2275,6 +2480,7 @@ let rev = "2a8a4a49fa58c5dac9e0bed9511f6928930cacd2"; sha256 = "1yljxwypgn91084yyicbc2qprn31ld7s4drvnddzczyhzq5m2gpx"; }; + meta.homepage = "https://github.com/roxma/nvim-cm-racer/"; }; nvim-completion-manager = buildVimPluginFrom2Nix { @@ -2286,6 +2492,7 @@ let rev = "45a026afb8b309b3b80f2c1b5910f72a54a9b563"; sha256 = "0znwgry4ill0nxm096hc8s9vf20rf9xcq3dz8y8h7xlqzzsycl7a"; }; + meta.homepage = "https://github.com/roxma/nvim-completion-manager/"; }; nvim-gdb = buildVimPluginFrom2Nix { @@ -2297,6 +2504,7 @@ let rev = "9ea1cd2cd110a8efa40dc893036596b39f979a7a"; sha256 = "10qcs59r27fkzk0pg90gywbrz7y7b4hvavbws5kx6fjx3h2mbfsh"; }; + meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; nvim-hs-vim = buildVimPluginFrom2Nix { @@ -2308,17 +2516,19 @@ let rev = "5bc177a87c9575c4995df90a098d330fe6e02f75"; sha256 = "14jgvkvakpy36md5si2a3rf2w869snb65inriq68xbk32bg5pg8q"; }; + meta.homepage = "https://github.com/neovimhaskell/nvim-hs.vim/"; }; nvim-lsp = buildVimPluginFrom2Nix { pname = "nvim-lsp"; - version = "2020-04-10"; + version = "2020-04-21"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lsp"; - rev = "b6dc2ae6a95051e93486224481b80cb5b446dcc3"; - sha256 = "0nc47nig0bvbp3m246gjv06a32ysz20nmxs6pzga1klzm4mim5vl"; + rev = "39b743b9b36be26a5e58278d7608fe456a0ad3f8"; + sha256 = "15q7d0qxdvvn79rwy87aiynilxn8vcnym2w252x1p3s4wqsx1psi"; }; + meta.homepage = "https://github.com/neovim/nvim-lsp/"; }; nvim-terminal-lua = buildVimPluginFrom2Nix { @@ -2330,6 +2540,7 @@ let rev = "095f98aaa7265628a72cd2706350c091544b5602"; sha256 = "09hass19v3wrqgxjcr3b59w462lp2nw533zwb1nnmiz99gx1znpx"; }; + meta.homepage = "https://github.com/norcalli/nvim-terminal.lua/"; }; nvim-yarp = buildVimPluginFrom2Nix { @@ -2341,6 +2552,7 @@ let rev = "b710bf4daccb603a423754794fb446e5fbb59576"; sha256 = "16ma42niwsc066s991idfbwvm0dvwqwdr2zfkc3av10hyimxnzbb"; }; + meta.homepage = "https://github.com/roxma/nvim-yarp/"; }; nvimdev-nvim = buildVimPluginFrom2Nix { @@ -2352,6 +2564,7 @@ let rev = "994ff5daf571ad02cc96436002411b4fb235c91f"; sha256 = "07dx6qkxqpakl1hrqwhfjgdzcnl4j3j9qih0l20qn8p6askj3b2j"; }; + meta.homepage = "https://github.com/neovim/nvimdev.nvim/"; }; onehalf = buildVimPluginFrom2Nix { @@ -2363,6 +2576,7 @@ let rev = "fdcbffe3175c29bb78d19dcaf9b2a456482fcf1e"; sha256 = "0zbmh3cf2lnn3mcqbz4s992v6kaddq9nj4xb1wxvgyqp7kjkpwql"; }; + meta.homepage = "https://github.com/sonph/onehalf/"; }; open-browser-github-vim = buildVimPluginFrom2Nix { @@ -2374,6 +2588,7 @@ let rev = "db483ae17f02a8561e85b2071b90359a9a3bd18d"; sha256 = "09x9lfyi9gfhy4m1vp6z1kxpvi31rr8dnlqhh6fgskkziiqch3jw"; }; + meta.homepage = "https://github.com/tyru/open-browser-github.vim/"; }; open-browser-vim = buildVimPluginFrom2Nix { @@ -2385,6 +2600,7 @@ let rev = "57b894d0aa5f800220d25fdeeccf28d8a7f6ac89"; sha256 = "0q87hna0irl431kmd4knblzkahrmw3mrnvw1cq19indfky85516v"; }; + meta.homepage = "https://github.com/tyru/open-browser.vim/"; }; palenight-vim = buildVimPluginFrom2Nix { @@ -2396,6 +2612,7 @@ let rev = "f332f9efe73227a47c18bade892ac55682641733"; sha256 = "0nd2hqvxnjnbsp17x666nwyy0s9j9b6igyfhl44p7lkci6560gwp"; }; + meta.homepage = "https://github.com/drewtempelmeyer/palenight.vim/"; }; papercolor-theme = buildVimPluginFrom2Nix { @@ -2407,6 +2624,7 @@ let rev = "ddd09867ed4e020b3ba2eb47dc3ef365da5b0fed"; sha256 = "1dhbnd99xs6l5alqhn9m1nynmr9sbvrqj2137l23ysisprl3rgmr"; }; + meta.homepage = "https://github.com/NLKNguyen/papercolor-theme/"; }; pear-tree = buildVimPluginFrom2Nix { @@ -2418,6 +2636,7 @@ let rev = "3bb209d9637d6bd7506040b2fcd158c9a7917db3"; sha256 = "0n70rzw34lsnnprqna90ssqrka33qx3z0n2kj19ps8yp3j6lsxvk"; }; + meta.homepage = "https://github.com/tmsvg/pear-tree/"; }; peskcolor-vim = buildVimPluginFrom2Nix { @@ -2429,6 +2648,7 @@ let rev = "cba4fc739bbebacd503158f6509d9c226651f363"; sha256 = "15hw3casr5y3ckgcn6aq8vhk6g2hym41w51nvgf34hbj9fx1nvkq"; }; + meta.homepage = "https://github.com/andsild/peskcolor.vim/"; }; pig-vim = buildVimPluginFrom2Nix { @@ -2440,6 +2660,7 @@ let rev = "60d8a0883d3e474e61af46b581a5ce3af65e9bb5"; sha256 = "0az48a3slpzljb69d60cpahkshmdbss0snc8lmvf4yrc1gx8yncv"; }; + meta.homepage = "https://github.com/motus/pig.vim/"; }; plantuml-syntax = buildVimPluginFrom2Nix { @@ -2451,6 +2672,7 @@ let rev = "25070c47cae8c7a9d62c8c09a1339e761448fbc4"; sha256 = "1x2a1wnxs2qmv2zqgq2bmwskdp1i4ga0yjxjyziyr96p48m7dcjp"; }; + meta.homepage = "https://github.com/aklt/plantuml-syntax/"; }; pony-vim-syntax = buildVimPluginFrom2Nix { @@ -2462,6 +2684,7 @@ let rev = "caa34b3d7a15d9bfbfbb2f5944c85eb1eddcfafc"; sha256 = "0r2lv99hkm95dv8wy9rkrkcwz5wkmwggfwi5vakgw497l3a9jskr"; }; + meta.homepage = "https://github.com/dleonard0/pony-vim-syntax/"; }; PreserveNoEOL = buildVimPluginFrom2Nix { @@ -2473,6 +2696,7 @@ let rev = "940e3ce90e54d8680bec1135a21dcfbd6c9bfb62"; sha256 = "1726jpr2zf6jrb00pp082ikbx4mll3a877pnzs6i18f9fgpaqqgd"; }; + meta.homepage = "https://github.com/vim-scripts/PreserveNoEOL/"; }; prev_indent = buildVimPluginFrom2Nix { @@ -2484,6 +2708,7 @@ let rev = "79e9b1b9a6895bfd15463c45595ca599987a4b23"; sha256 = "03xqdwfkc7a84742ldsggi7ix99c7dhpmg6j13gkasyfk487ryh6"; }; + meta.homepage = "https://github.com/vim-scripts/prev_indent/"; }; psc-ide-vim = buildVimPluginFrom2Nix { @@ -2495,6 +2720,7 @@ let rev = "5fb4e329e5c0c7d80f0356ab4028eee9c8bd3465"; sha256 = "0gzbxsq6wh8d9z9vyrff4hdpc66yg9y8hnxq4kjrz9qrccc75c1f"; }; + meta.homepage = "https://github.com/frigoeu/psc-ide-vim/"; }; purescript-vim = buildVimPluginFrom2Nix { @@ -2506,6 +2732,7 @@ let rev = "67ca4dc4a0291e5d8c8da48bffc0f3d2c9739e7f"; sha256 = "1insh39hzbynr6qxb215qxhpifl5m8i5i0d09a3b6v679i7s11i8"; }; + meta.homepage = "https://github.com/purescript-contrib/purescript-vim/"; }; python-mode = buildVimPluginFrom2Nix { @@ -2517,6 +2744,7 @@ let rev = "f94b0d7b21714f950f5878b430fbfde21c3b7ad9"; sha256 = "0zxsa1agigzb9adrwq54pdyl984drdqzz3kkixaijkq77kkdvj0n"; }; + meta.homepage = "https://github.com/python-mode/python-mode/"; }; quick-scope = buildVimPluginFrom2Nix { @@ -2528,6 +2756,7 @@ let rev = "ac80025b868bb6e52b9dda893246ee5f992612de"; sha256 = "1pvw8d53dgm580r9n2qcx0w56g4kanvd00ny6c6l71hxw9lixnlb"; }; + meta.homepage = "https://github.com/unblevable/quick-scope/"; }; quickfix-reflector-vim = buildVimPluginFrom2Nix { @@ -2539,6 +2768,7 @@ let rev = "8e9c05a110b80ab66fc8bc3d5fe9e6fa168aada6"; sha256 = "1i8453z3s0xmbmbzk3kpxwvd42ar9v2m2gjqic9k7njpxw87czvs"; }; + meta.homepage = "https://github.com/stefandtw/quickfix-reflector.vim/"; }; quickfixstatus = buildVimPluginFrom2Nix { @@ -2550,6 +2780,7 @@ let rev = "fd3875b914fc51bbefefa8c4995588c088163053"; sha256 = "16vxhvyxq51y7wnx0c1fmdi2yb6kfr1pxijq65gxj8qwvbak2s3v"; }; + meta.homepage = "https://github.com/dannyob/quickfixstatus/"; }; rainbow = buildVimPluginFrom2Nix { @@ -2561,6 +2792,7 @@ let rev = "c876f4bc6e737241d53669415f88cb5f2afd8ad9"; sha256 = "1kmgm91q507qv9bvg37dn0lddzb8gwkmslajampnfjyfhbs0shgz"; }; + meta.homepage = "https://github.com/luochen1990/rainbow/"; }; rainbow_parentheses-vim = buildVimPluginFrom2Nix { @@ -2572,6 +2804,7 @@ let rev = "eb8baa5428bde10ecc1cb14eed1d6e16f5f24695"; sha256 = "1qw84imlhq4654mxazj7j3sp5g1j3yjxi496i08iix06dm15m5s7"; }; + meta.homepage = "https://github.com/kien/rainbow_parentheses.vim/"; }; random-vim = buildVimPluginFrom2Nix { @@ -2583,6 +2816,7 @@ let rev = "b2d85eb24a38074eab37a5acf2a295e1f2ad8989"; sha256 = "1lzy2cq4jcrsqyxlnbnd0y6j4mabm09bi7q22lf6vinqlb84w7sp"; }; + meta.homepage = "https://github.com/vim-scripts/random.vim/"; }; ranger-vim = buildVimPluginFrom2Nix { @@ -2594,6 +2828,7 @@ let rev = "6def86f4293d170480ce62cc41f15448075d7835"; sha256 = "0890rbmdw3p25cww6vsji7xrndcxsisfyv5przahpclk9fc9sxs8"; }; + meta.homepage = "https://github.com/rafaqz/ranger.vim/"; }; readline-vim = buildVimPluginFrom2Nix { @@ -2605,17 +2840,19 @@ let rev = "48f04c651728e8a7a8352eec697801aa32348564"; sha256 = "1vs91lkm9gwvp0bahx80ag6lw03r5x6kyih70l4sq8q0kydp5f13"; }; + meta.homepage = "https://github.com/ryvnf/readline.vim/"; }; Recover-vim = buildVimPluginFrom2Nix { pname = "Recover-vim"; - version = "2019-06-04"; + version = "2020-04-20"; src = fetchFromGitHub { owner = "chrisbra"; repo = "Recover.vim"; - rev = "491c7bab1632029318d682df927d62b298856db5"; - sha256 = "18bdsa6y9cdf92qafp4mlc2f6ny3qx8wl8p3i9x7q46i89bn7cxc"; + rev = "c84f07260f1e839bc7bfc2ab69bf4f3f4aaa423d"; + sha256 = "1q87n2xz6p879ihijvhxs1iv9iyrqcbx7z8dkql0ivbf572q9iwh"; }; + meta.homepage = "https://github.com/chrisbra/Recover.vim/"; }; Rename = buildVimPluginFrom2Nix { @@ -2627,6 +2864,7 @@ let rev = "b240f28d2ede65fa77cd99fe045efe79202f7a34"; sha256 = "1d1myg4zyc281zcc1ba9idbgcgxndb4a0jwqr4yqxhhzdgszw46r"; }; + meta.homepage = "https://github.com/vim-scripts/Rename/"; }; ReplaceWithRegister = buildVimPluginFrom2Nix { @@ -2638,6 +2876,7 @@ let rev = "832efc23111d19591d495dc72286de2fb0b09345"; sha256 = "0mb0sx85j1k59b1zz95r4vkq4kxlb4krhncq70mq7fxrs5bnhq8g"; }; + meta.homepage = "https://github.com/vim-scripts/ReplaceWithRegister/"; }; riv-vim = buildVimPluginFrom2Nix { @@ -2649,6 +2888,7 @@ let rev = "e26c3e8dce4c1332e802cde84f83e61ec8a13986"; sha256 = "1da3iwrpy08rayrsf8v0ml4khlp9j5i4cffpv9j3iyalcbhk2m9g"; }; + meta.homepage = "https://github.com/gu-fan/riv.vim/"; }; robotframework-vim = buildVimPluginFrom2Nix { @@ -2660,6 +2900,7 @@ let rev = "75d5b371a4da2a090a2872d55bd0dead013f334e"; sha256 = "091ac5rq6f1a7j2q3dy9rc00vckv21m4wd29ijj63jannr02v5ad"; }; + meta.homepage = "https://github.com/mfukar/robotframework-vim/"; }; rtorrent-syntax-file = buildVimPluginFrom2Nix { @@ -2671,17 +2912,19 @@ let rev = "885ca182c02bbbed4b62a3fcfe6fe62fa5b419ca"; sha256 = "1vhvmwnwi6862cckl8dqr8pgy0inrr0c31lic89826yv7mfl9mbz"; }; + meta.homepage = "https://github.com/ccarpita/rtorrent-syntax-file/"; }; rust-vim = buildVimPluginFrom2Nix { pname = "rust-vim"; - version = "2020-03-31"; + version = "2020-04-20"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust.vim"; - rev = "ce5f2b1c881de1b2101924dc5a19046399d74db2"; - sha256 = "0zjzn091js0i76klk9al4gw1l2ads132mjl0nrdhbvl7ilypdajh"; + rev = "2b916c8c8b3975988c13460918b46115f6a06802"; + sha256 = "06a9liz3a7fyjcd7phpfzrpqnjjzm5ai3bb41wh4hdc5ic8lgrij"; }; + meta.homepage = "https://github.com/rust-lang/rust.vim/"; }; salt-vim = buildVimPluginFrom2Nix { @@ -2693,6 +2936,7 @@ let rev = "6ca9e3500cc39dd417b411435d58a1b720b331cc"; sha256 = "0r79bpl98xcsmkw6dg83cf1ghn89rzsr011zirk3v1wfxclri2c4"; }; + meta.homepage = "https://github.com/saltstack/salt-vim/"; }; self = buildVimPluginFrom2Nix { @@ -2704,6 +2948,7 @@ let rev = "2ed666b547eddee6ae1fcc63babca4ba0b66a59f"; sha256 = "1gcwn6i5i3msg7hrlzsnv1bs6pm4jz9cff8ppaz2xdj8xv9qy6fn"; }; + meta.homepage = "https://github.com/megaannum/self/"; }; semshi = buildVimPluginFrom2Nix { @@ -2715,6 +2960,7 @@ let rev = "801d0c971d3d7291cf2fc22d74ac69155a71a279"; sha256 = "0adq1qxlxd53ps5byjvqmzk266f3wbvqmw74dkx6vd41zqw38wfx"; }; + meta.homepage = "https://github.com/numirias/semshi/"; }; seoul256-vim = buildVimPluginFrom2Nix { @@ -2726,6 +2972,7 @@ let rev = "cfc0167e546a40eb26ec2a0a0f1c141a8c1bcaf1"; sha256 = "1z980hsmf6gcvd16ja67az131mrgv5fv6v0ivsh0ga8hwc4f9l6q"; }; + meta.homepage = "https://github.com/junegunn/seoul256.vim/"; }; shabadou-vim = buildVimPluginFrom2Nix { @@ -2737,6 +2984,7 @@ let rev = "7d4bfed1ea8985ae125df3d1403cc19e252443e1"; sha256 = "1kvik1yf7yjg9jdmdw38yhkksxg0n3nry02banwik7wgjnpvg870"; }; + meta.homepage = "https://github.com/osyo-manga/shabadou.vim/"; }; ShowMultiBase = buildVimPluginFrom2Nix { @@ -2748,6 +2996,7 @@ let rev = "85a39fd12668ce973d3d9282263912b2b8f0d338"; sha256 = "0hg5352ahzgh2kwqha5v8ai024fld93xag93hb53wjf5b8nzsz8i"; }; + meta.homepage = "https://github.com/vim-scripts/ShowMultiBase/"; }; SimpylFold = buildVimPluginFrom2Nix { @@ -2759,6 +3008,7 @@ let rev = "aa0371d9d708388f3ba385ccc67a7504586a20d9"; sha256 = "1gjv78x2cgh79a04l411kdhkm53f93czs54p07kadpa9659z93ss"; }; + meta.homepage = "https://github.com/tmhedberg/SimpylFold/"; }; sky-color-clock-vim = buildVimPluginFrom2Nix { @@ -2770,6 +3020,7 @@ let rev = "9d4232cc249083f3c5d2eb4e2848e491b52df4ca"; sha256 = "1ln50rahb177vilzr4zc7v9znm8xfid1v8gddl83gr9srdbn2bbz"; }; + meta.homepage = "https://github.com/mopp/sky-color-clock.vim/"; }; smartpairs-vim = buildVimPluginFrom2Nix { @@ -2781,6 +3032,7 @@ let rev = "dc754c29509b1a942552b3cfa348e4aae209322c"; sha256 = "1pyynwz7wfbgccdxsyggzl0301qjj3wgyymah5spx8b3s42a6slj"; }; + meta.homepage = "https://github.com/gorkunov/smartpairs.vim/"; }; sourcemap-vim = buildVimPluginFrom2Nix { @@ -2792,6 +3044,7 @@ let rev = "0dd82d40faea2fdb0771067f46c01deb41610ba1"; sha256 = "1gcgnynallz420911fdfm0ccbv3zs78p69nnh2ls1r4vlfp7g350"; }; + meta.homepage = "https://github.com/chikatoike/sourcemap.vim/"; }; SpaceCamp = buildVimPluginFrom2Nix { @@ -2803,6 +3056,7 @@ let rev = "58fc865f83b600ee8906fe35d02749dec6659607"; sha256 = "0rv9a6gzn5q2ajsyfvsrybn7hyskckfa7wad4jr8xaylccn5r7x7"; }; + meta.homepage = "https://github.com/jaredgorski/SpaceCamp/"; }; Spacegray-vim = buildVimPluginFrom2Nix { @@ -2814,6 +3068,7 @@ let rev = "69e8fefce04e2aff6a01cc4c295493359b0e4fa1"; sha256 = "0ks5yd1vmpjw8ml7hqd2zz2d8mqkqhfw2ya73y1igf6as70za896"; }; + meta.homepage = "https://github.com/ajh17/Spacegray.vim/"; }; spacevim = buildVimPluginFrom2Nix { @@ -2825,6 +3080,7 @@ let rev = "30142a518ba77feb22791b5cb2387d88b70c58f2"; sha256 = "0m389cnpg17ca8s7vb9yrs40sxb56zg32lcpilnd63zfi7awgscg"; }; + meta.homepage = "https://github.com/ctjhoa/spacevim/"; }; sparkup = buildVimPluginFrom2Nix { @@ -2836,6 +3092,7 @@ let rev = "6fbfceef890e705c47b42b27be743ffed6f9296e"; sha256 = "17jgpvl879ik53rr3razfnbpfx63mzpp1rlvxxjsvvrk4g45dssm"; }; + meta.homepage = "https://github.com/chrisgeo/sparkup/"; }; splice-vim = buildVimPluginFrom2Nix { @@ -2847,6 +3104,7 @@ let rev = "815a28e687fdf78b67e9b9cd4c21277bbe658873"; sha256 = "0bh1gr2h6w872ql72rdlzpk5znl4lz01x6lgyf330sickizz5mvb"; }; + meta.homepage = "https://github.com/sjl/splice.vim/"; }; split-term-vim = buildVimPluginFrom2Nix { @@ -2858,17 +3116,19 @@ let rev = "a4e28cab77ad07fc8a0ebb62a982768c02eb287c"; sha256 = "12vrmbq1r8d6sgyxjwi0s856n1v4vjhrf8wpwq6l4ydmk1bnvjkb"; }; + meta.homepage = "https://github.com/vimlab/split-term.vim/"; }; splitjoin-vim = buildVimPluginFrom2Nix { pname = "splitjoin-vim"; - version = "2020-04-08"; + version = "2020-04-20"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "splitjoin.vim"; - rev = "4aeb3b59c8a2d080960d17318498652e93e33776"; - sha256 = "0gvchss74q4z54008hs8nylsr8xgz02wqshh7fqx3jbyhwb0zzms"; + rev = "62d42e1ac5dcf8f3c70bd344d31300ee39d0e580"; + sha256 = "1d0ik668lhkrd972brh99lizrfl249srj6y8i1ag4ykr99nmydqg"; }; + meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/"; }; starsearch-vim = buildVimPluginFrom2Nix { @@ -2880,6 +3140,7 @@ let rev = "9b8cda1e628160c83846db5a30899a1a1ba5c1c9"; sha256 = "1i1ygdqwhz4jqmz9lzjnx1a7s5chdqjsvgkmnd9x0s8ixqa41bpr"; }; + meta.homepage = "https://github.com/darfink/starsearch.vim/"; }; supertab = buildVimPluginFrom2Nix { @@ -2891,6 +3152,7 @@ let rev = "40fe711e088e2ab346738233dd5adbb1be355172"; sha256 = "0l5labq68kyprv63k1q35hz5ly0dd06mf2z202mccnix4mlxf0db"; }; + meta.homepage = "https://github.com/ervandew/supertab/"; }; sved = buildVimPluginFrom2Nix { @@ -2902,6 +3164,7 @@ let rev = "3362db72447e8ac812c7299c15ecfc9f41341713"; sha256 = "1r2nv069d6r2q6gbiz795x94mfjm9hnv05zka085hhq9a3yf1pgx"; }; + meta.homepage = "https://github.com/peterbjorgensen/sved/"; }; swift-vim = buildVimPluginFrom2Nix { @@ -2913,17 +3176,19 @@ let rev = "c4053da88208cef5a32a5862694d36b73f6ce310"; sha256 = "0awz0pf3awrwhay40wngfllpmmh24zwm02ra530x4n1hk74iwf2v"; }; + meta.homepage = "https://github.com/keith/swift.vim/"; }; syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2020-01-29"; + version = "2020-04-19"; src = fetchFromGitHub { owner = "vim-syntastic"; repo = "syntastic"; - rev = "f3766538720116f099a8b1517f76ae2f094afd20"; - sha256 = "1bzjav87fcibwlp8siqnx6x8wv8w3mwrrqrd5w19ny9scr5x2a65"; + rev = "b3e2d8470fddc7f2b598f09023ebc5045a3fb1fd"; + sha256 = "1ljsh0npbcv9g6l23z4jpba0bk1k5n13ix0p0rr22cipgzlxsbvh"; }; + meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; tabmerge = buildVimPluginFrom2Nix { @@ -2935,6 +3200,7 @@ let rev = "074e5f06f26e7108a0570071a0f938a821768c06"; sha256 = "0prkyza1n49cdaslcr57w8zv15vw78mlqbzib2xipmawzjq02idq"; }; + meta.homepage = "https://github.com/vim-scripts/tabmerge/"; }; tabpagebuffer-vim = buildVimPluginFrom2Nix { @@ -2946,6 +3212,7 @@ let rev = "4d95c3e6fa5ad887498f4cbe486c11e39d4a1fbc"; sha256 = "1z6zlpzkhwy1p2pmx9qrwb91dp9v4yi8jrdvm1if2k79ij4sl08f"; }; + meta.homepage = "https://github.com/Shougo/tabpagebuffer.vim/"; }; tabular = buildVimPluginFrom2Nix { @@ -2957,6 +3224,7 @@ let rev = "339091ac4dd1f17e225fe7d57b48aff55f99b23a"; sha256 = "0jq91770wsp2waw7pywxjqx59v0vg54gfzirgcd85pg61w22bfla"; }; + meta.homepage = "https://github.com/godlygeek/tabular/"; }; tagbar = buildVimPluginFrom2Nix { @@ -2968,6 +3236,7 @@ let rev = "679a9d9ac9579bd18225409d85ed4870fb6c9c62"; sha256 = "1s4736104vfaj7rfcdzcnmgbnxxi0ngs07km0p2fi1m2zc68602l"; }; + meta.homepage = "https://github.com/majutsushi/tagbar/"; }; taglist-vim = buildVimPluginFrom2Nix { @@ -2979,6 +3248,7 @@ let rev = "53041fbc45398a9af631a20657e109707a455339"; sha256 = "07aa2gfc73lznyi7w7cybzanspza3p67cv5hxr21g43zhs5k9izd"; }; + meta.homepage = "https://github.com/vim-scripts/taglist.vim/"; }; targets-vim = buildVimPluginFrom2Nix { @@ -2990,17 +3260,19 @@ let rev = "8d6ff2984cdfaebe5b7a6eee8f226a6dd1226f2d"; sha256 = "192wq3x64x11nm2jhs4yrc627b0lh002dfnj72xrc7jak9vbdps9"; }; + meta.homepage = "https://github.com/wellle/targets.vim/"; }; tcomment_vim = buildVimPluginFrom2Nix { pname = "tcomment_vim"; - version = "2020-03-15"; + version = "2020-04-13"; src = fetchFromGitHub { owner = "tomtom"; repo = "tcomment_vim"; - rev = "b9a075e36e9d8817b15e2edcdb8b6bf51a8d479c"; - sha256 = "1vyg2n7s8981km05zpfhzcvb1adwc26l034w9w1bjil72fywdad0"; + rev = "a20a34b0e3129314a820419234d8707a7cc9b872"; + sha256 = "1ms3yy1b1mpjckqfam4bdz2yllxvzac3dfbs213c0hz6l6y20y4n"; }; + meta.homepage = "https://github.com/tomtom/tcomment_vim/"; }; tender-vim = buildVimPluginFrom2Nix { @@ -3012,6 +3284,7 @@ let rev = "f93b2f373cc21826524c94fbd1f3b3a4c55173d2"; sha256 = "0bfns5vsbyh1s01s295hbf8h04n21cfkfp8b2r3cfr8mcvazpmpq"; }; + meta.homepage = "https://github.com/jacoborus/tender.vim/"; }; tern_for_vim = buildVimPluginFrom2Nix { @@ -3023,6 +3296,7 @@ let rev = "994ffbe783da36d67786b6c66a4bf784c5eab300"; sha256 = "0vpi5lqlyf6kcc0ha8hf3ch2h8v3awidgpwbrv9f3bqvyg4yhdcd"; }; + meta.homepage = "https://github.com/ternjs/tern_for_vim/"; }; thesaurus_query-vim = buildVimPluginFrom2Nix { @@ -3034,6 +3308,7 @@ let rev = "830a20ec77780ebfe8d2a7e8c740ca4abb079f89"; sha256 = "0kfqpjwashwf084cbz6dmhirk42a4n8d1zj17i086by17nx7qn1g"; }; + meta.homepage = "https://github.com/ron89/thesaurus_query.vim/"; }; thumbnail-vim = buildVimPluginFrom2Nix { @@ -3045,6 +3320,7 @@ let rev = "7d65524dddaeed5629e6b9c8926c56ef8dd0c553"; sha256 = "02707pl5dqfgkxx2i4wcfxx2zdpm86g5l4n4wn1dms35bcn2c8l8"; }; + meta.homepage = "https://github.com/itchyny/thumbnail.vim/"; }; tlib_vim = buildVimPluginFrom2Nix { @@ -3056,6 +3332,7 @@ let rev = "a071b6d41b20069a3520e0d101194a752968973b"; sha256 = "05swfvjyai32cbdpg10m3k2frkv017i1avf0nzilqavskvg04vi3"; }; + meta.homepage = "https://github.com/tomtom/tlib_vim/"; }; tmux-complete-vim = buildVimPluginFrom2Nix { @@ -3067,6 +3344,7 @@ let rev = "7237d8d8d60af7916e3b546a9f4f396df95a1b21"; sha256 = "05ypjahaf7gk4vjc8hhglmw7y8vyjxyhxq8sm0s3np05aw0gdbsc"; }; + meta.homepage = "https://github.com/wellle/tmux-complete.vim/"; }; todo-txt-vim = buildVimPluginFrom2Nix { @@ -3079,6 +3357,7 @@ let sha256 = "08m9q5f2pz6gjp0vkmm7glfsrbnldxi1j59dm5d7any6y96xxd6v"; fetchSubmodules = true; }; + meta.homepage = "https://github.com/freitass/todo.txt-vim/"; }; traces-vim = buildVimPluginFrom2Nix { @@ -3090,6 +3369,7 @@ let rev = "4d3858eb060a1fd2213b075a707d39cbb118ae3e"; sha256 = "0qny9z459x7hp5y43iivws2m312clacysdy1nnb3cr1fyhw9pflx"; }; + meta.homepage = "https://github.com/markonm/traces.vim/"; }; tslime-vim = buildVimPluginFrom2Nix { @@ -3101,6 +3381,7 @@ let rev = "28e9eba642a791c6a6b044433dce8e5451b26fb0"; sha256 = "1y5xikryv6851d0rjk9c64agawshp5208mwym6ma9ngs7s3s1l4x"; }; + meta.homepage = "https://github.com/jgdavey/tslime.vim/"; }; tsuquyomi = buildVimPluginFrom2Nix { @@ -3112,6 +3393,7 @@ let rev = "85fffd5939c8fc5750b35a937b965af2ad5b0b15"; sha256 = "1j5wdh0xa5yld4fy2msyjf1qvj8zx0iccc1bw63zzbrcl6rs30gx"; }; + meta.homepage = "https://github.com/Quramy/tsuquyomi/"; }; typescript-vim = buildVimPluginFrom2Nix { @@ -3123,6 +3405,7 @@ let rev = "17d85d8051ba21283e62a9101734981e10b732fd"; sha256 = "17z8ygns97wlnm4vq7kgkx3ymnbb2f6imxn02fc0iywkrhdqv7mj"; }; + meta.homepage = "https://github.com/leafgarland/typescript-vim/"; }; ultisnips = buildVimPluginFrom2Nix { @@ -3134,6 +3417,7 @@ let rev = "ee31ea1c7d08ced8577120b4c1d55c5a05351a75"; sha256 = "01nm3d95qjd2v3j9ln7w52i8bn2fgi5zms9078832w1x4iyb1mwn"; }; + meta.homepage = "https://github.com/SirVer/ultisnips/"; }; undotree = buildVimPluginFrom2Nix { @@ -3145,17 +3429,19 @@ let rev = "be23eacb2a63380bd79e207a738c728214ecc9d3"; sha256 = "00zyvff32zp7pyjzkq8da9xhr378mlpi8gj717yfr9wbwwarwfd7"; }; + meta.homepage = "https://github.com/mbbill/undotree/"; }; unicode-vim = buildVimPluginFrom2Nix { pname = "unicode-vim"; - version = "2020-04-05"; + version = "2020-04-20"; src = fetchFromGitHub { owner = "chrisbra"; repo = "unicode.vim"; - rev = "5a43fa177d6650cfb3224a3989f15e83999afa7f"; - sha256 = "187hznxcrvb1j8dj2rrdlk3f1cfx0d0l3fnfabh1da0m9cjg4xbh"; + rev = "ce061819e4304a9ff2f82779e12e5a30363ab47c"; + sha256 = "0k9gmf2rdvnlfqqhjlk206wimlh5di3smmrr9cgz0djq5pd3r5jz"; }; + meta.homepage = "https://github.com/chrisbra/unicode.vim/"; }; unite-vim = buildVimPluginFrom2Nix { @@ -3167,6 +3453,7 @@ let rev = "5addeca429f64130d74d2f7cb8255afdb9e309d2"; sha256 = "03bqljjc1h43qimm81mv8ywkx5388kd6clm2f7887diiww0fgvfi"; }; + meta.homepage = "https://github.com/Shougo/unite.vim/"; }; utl-vim = buildVimPluginFrom2Nix { @@ -3178,6 +3465,7 @@ let rev = "67a6506a7a8a3847d00d3af3e2ed9707460d5ce5"; sha256 = "0ax68nmzlka9193n2h82qzvhzv4dv6lm7rg3b1vhj2pn1r6ci6p4"; }; + meta.homepage = "https://github.com/vim-scripts/utl.vim/"; }; vader-vim = buildVimPluginFrom2Nix { @@ -3189,6 +3477,7 @@ let rev = "6fff477431ac3191c69a3a5e5f187925466e275a"; sha256 = "153cr1mrf5w5lyr8374brwx1z5yl9h0cnijxnd3xikh3yi3pbmwk"; }; + meta.homepage = "https://github.com/junegunn/vader.vim/"; }; vCoolor-vim = buildVimPluginFrom2Nix { @@ -3200,6 +3489,7 @@ let rev = "8fc037e453f4c2274f590bde4f9fb56167b14e57"; sha256 = "193cjxfha5xcpfjqqpyfa6xidys1zmmmwlcj7w2cxbr5j5bdnybm"; }; + meta.homepage = "https://github.com/KabbAmine/vCoolor.vim/"; }; verilog_systemverilog-vim = buildVimPluginFrom2Nix { @@ -3211,17 +3501,19 @@ let rev = "c6f7ca14554196ae15a5fef9e568d69f04b9ff56"; sha256 = "1hx9rgx44dhc449r0j6azkp1bm20n9c3fyb112w277a2jvf0a2c5"; }; + meta.homepage = "https://github.com/vhda/verilog_systemverilog.vim/"; }; vim = buildVimPluginFrom2Nix { pname = "vim"; - version = "2020-03-03"; + version = "2020-04-18"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "ed490ae07168ecd1636b9fe0998baeb770b87cd9"; - sha256 = "0b23r37az36kzlzr3k483r1yy142nmz09hc9wkwchs2zns30bqky"; + rev = "6a8cd0f825c3d7b071ebd0dce81a7707ec0be652"; + sha256 = "1qyqc7j8sdq3xnp871hgxdgxypkm8v5mfri2r89b0ydchrd15b2l"; }; + meta.homepage = "https://github.com/dracula/vim/"; }; vim-abolish = buildVimPluginFrom2Nix { @@ -3233,6 +3525,7 @@ let rev = "7e4da6e78002344d499af9b6d8d5d6fcd7c92125"; sha256 = "1n35igng3a6d5y4nh5pyb09s6khgcwbr3v0lnh33qb51cv4cnjh4"; }; + meta.homepage = "https://github.com/tpope/vim-abolish/"; }; vim-addon-actions = buildVimPluginFrom2Nix { @@ -3244,6 +3537,7 @@ let rev = "540cae09832ba6abf9fc63c55781bf86584c33ac"; sha256 = "011w5k09i01r9x64j20qj0f7d057m9wki2m8l2wds47l57hr3vz6"; }; + meta.homepage = "https://github.com/MarcWeber/vim-addon-actions/"; }; vim-addon-async = buildVimPluginFrom2Nix { @@ -3255,6 +3549,7 @@ let rev = "eca316a4480f68c2cb62128f3187dc7b2002afde"; sha256 = "1lk8ma51dd0syi73vq5r4qk9cpy6cq3llizvh94hmxblfjpvrs7q"; }; + meta.homepage = "https://github.com/MarcWeber/vim-addon-async/"; }; vim-addon-background-cmd = buildVimPluginFrom2Nix { @@ -3266,6 +3561,7 @@ let rev = "abf2abf339652d2bc79da81f9d131edfe2755f5a"; sha256 = "0csy68x686l3x5ancidxb5b6prg9k7ikybqzq3klx0gs5rmksfy4"; }; + meta.homepage = "https://github.com/MarcWeber/vim-addon-background-cmd/"; }; vim-addon-commenting = buildVimPluginFrom2Nix { @@ -3277,6 +3573,7 @@ let rev = "b7cf748ac1c9bf555cbd347589e3b7196030d20b"; sha256 = "0alak8h33vada2ckb0v06y82qlib5mhyc2yswlv1rqh8ypzhq3mc"; }; + meta.homepage = "https://github.com/MarcWeber/vim-addon-commenting/"; }; vim-addon-completion = buildVimPluginFrom2Nix { @@ -3288,6 +3585,7 @@ let rev = "021c449a5ce1ce4ac0af5955e05b0279c1cc0e75"; sha256 = "1ld059y2qwlc5bdfjm2p314s1qh31lxs54g944pw49r46s5nlslr"; }; + meta.homepage = "https://github.com/MarcWeber/vim-addon-completion/"; }; vim-addon-errorformats = buildVimPluginFrom2Nix { @@ -3299,6 +3597,7 @@ let rev = "bb83675cb0b8cc377fb0a79ba492ba2445674ba6"; sha256 = "09cds33lb5gm69wv5plgidprm8nf52vvg9qdzpq9mihvinvj5qv7"; }; + meta.homepage = "https://github.com/MarcWeber/vim-addon-errorformats/"; }; vim-addon-goto-thing-at-cursor = buildVimPluginFrom2Nix { @@ -3310,6 +3609,7 @@ let rev = "44f0cba27013cfc1f4e46697ba6de30b2a128cf7"; sha256 = "1s9021qnn95bzl8r7nx818j1kmjfjzg8xg07s071ic96lv40bcqp"; }; + meta.homepage = "https://github.com/MarcWeber/vim-addon-goto-thing-at-cursor/"; }; vim-addon-local-vimrc = buildVimPluginFrom2Nix { @@ -3321,6 +3621,7 @@ let rev = "6a27f95b35befa70cd0d049329cd0920566c764b"; sha256 = "0n8lwl1gyak149p7jpgm0qbmfj8hcg8hirx3dxdhizw0yc47ws7h"; }; + meta.homepage = "https://github.com/MarcWeber/vim-addon-local-vimrc/"; }; vim-addon-manager = buildVimPluginFrom2Nix { @@ -3332,6 +3633,7 @@ let rev = "d9e865f3c2de5d9b7eabbc976f606cf1b89e29ea"; sha256 = "0mgm2dqw8js9gajkrvm5n3k9m1grjxcrfc9xdzb3jxw1c0njdhcy"; }; + meta.homepage = "https://github.com/MarcWeber/vim-addon-manager/"; }; vim-addon-mru = buildVimPluginFrom2Nix { @@ -3343,6 +3645,7 @@ let rev = "e41e39bd9d1bf78ccfd8d5e1bc05ae5e1026c2bb"; sha256 = "0q6rxr9nrp63kidr3m3c2z5sda4g813pzshg0scxkjr8dxwhzdqm"; }; + meta.homepage = "https://github.com/MarcWeber/vim-addon-mru/"; }; vim-addon-mw-utils = buildVimPluginFrom2Nix { @@ -3354,6 +3657,7 @@ let rev = "6aaf4fee472db7cbec6d2c8eea69fdf3a8f8a75d"; sha256 = "1w99r6ck6gqg6b0fk9qj07q0b7p2qxav0ar6x294g34wsqij6xj5"; }; + meta.homepage = "https://github.com/MarcWeber/vim-addon-mw-utils/"; }; vim-addon-nix = buildVimPluginFrom2Nix { @@ -3365,6 +3669,7 @@ let rev = "3001a9db5f816dd7af11384f15415bddd146ef86"; sha256 = "195z2yz09wirpqjpsha8x7qcr9is1q8qph4j0svws6qbqrkh8ryy"; }; + meta.homepage = "https://github.com/MarcWeber/vim-addon-nix/"; }; vim-addon-other = buildVimPluginFrom2Nix { @@ -3376,6 +3681,7 @@ let rev = "7a395970b8817296c11e1de8310194c4ae6e1f89"; sha256 = "0sding7rc11imf5k9ki4h426wjiz8ywxa81v74xj3m23zm6l77sa"; }; + meta.homepage = "https://github.com/MarcWeber/vim-addon-other/"; }; vim-addon-php-manual = buildVimPluginFrom2Nix { @@ -3387,6 +3693,7 @@ let rev = "5f9810dd1f6e9f36a45f637ae6260ccff09256ff"; sha256 = "1kc67f12wccqdza069b75lpcbqp4kv4r23i4mfz0ihwif5mfnhir"; }; + meta.homepage = "https://github.com/MarcWeber/vim-addon-php-manual/"; }; vim-addon-signs = buildVimPluginFrom2Nix { @@ -3398,6 +3705,7 @@ let rev = "17a49f293d18174ff09d1bfff5ba86e8eee8e8ae"; sha256 = "0i4gfp30hmw1vqjl6zxjrgkca3ikdkcnjmma2mncjmcr6f59kjzy"; }; + meta.homepage = "https://github.com/MarcWeber/vim-addon-signs/"; }; vim-addon-sql = buildVimPluginFrom2Nix { @@ -3409,6 +3717,7 @@ let rev = "048a139af36829fce670c8ff80d3aad927557ee6"; sha256 = "0ihm157sby6csdwsnw2gwh3jmm3prm1mxwgkx2hsfwlmpb1vwwm3"; }; + meta.homepage = "https://github.com/MarcWeber/vim-addon-sql/"; }; vim-addon-syntax-checker = buildVimPluginFrom2Nix { @@ -3420,6 +3729,7 @@ let rev = "739e5719b77c6aea3299c27fc1f4238ac54a8344"; sha256 = "1rcn1ps06156nyglvxg6m7pn3vhvmnv5ad6kidp59hggyr5332i9"; }; + meta.homepage = "https://github.com/MarcWeber/vim-addon-syntax-checker/"; }; vim-addon-toggle-buffer = buildVimPluginFrom2Nix { @@ -3431,6 +3741,7 @@ let rev = "a1b38b9c5709cba666ed2d84ef06548f675c6b0b"; sha256 = "1xq38kfdm36c34ln66znw841q797w5gm8bpq1x64bsf2h6n3ml03"; }; + meta.homepage = "https://github.com/MarcWeber/vim-addon-toggle-buffer/"; }; vim-addon-xdebug = buildVimPluginFrom2Nix { @@ -3442,17 +3753,19 @@ let rev = "45f26407305b4ce6f8f5f37d2b5e6e4354104172"; sha256 = "1i64ppdfp2qqq7vw1jf160mj4ikc04v39iazdab83xmiqjsh8ixw"; }; + meta.homepage = "https://github.com/MarcWeber/vim-addon-xdebug/"; }; vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-04-10"; + version = "2020-04-20"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "a100e8967163d36ed624a71a313ce31cdd2b1151"; - sha256 = "0nissvkwxqncwaw73kwk4fjnr0l43c7vj98l398pn3bkj8kgpns9"; + rev = "eff4828b37d7f631aaec0465a315d627651b9037"; + sha256 = "1rm8kd90sf00sdgr8pqcansyrmrwsqd4v1fkyy7zl9x2jgrxkbrh"; }; + meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; vim-airline-themes = buildVimPluginFrom2Nix { @@ -3464,17 +3777,19 @@ let rev = "3fb676b8729a98817f561ef1554c0ad1a514c96a"; sha256 = "18bfw09ywmw10jiv37iw2ijf46jhj2yw5wndqdgn7k42gy1wk7p6"; }; + meta.homepage = "https://github.com/vim-airline/vim-airline-themes/"; }; vim-android = buildVimPluginFrom2Nix { pname = "vim-android"; - version = "2019-12-17"; + version = "2020-04-17"; src = fetchFromGitHub { owner = "hsanson"; repo = "vim-android"; - rev = "0849bcb6523d17a753fcaff8d40cbeed2d09cf65"; - sha256 = "1z3x72aprp950chk754h0qpf5lxh2svzk39flks5fanxaggkpkng"; + rev = "237827115523a1c39e3aed9f83bffb009b82a3c2"; + sha256 = "06padj0r3h2lhrf17vlq8ky4q2z7a1jppfb9gjms0sddvjcis5fc"; }; + meta.homepage = "https://github.com/hsanson/vim-android/"; }; vim-anzu = buildVimPluginFrom2Nix { @@ -3486,6 +3801,7 @@ let rev = "45b60d37cb9de90f6c89f7ddeacb7ae430ebcae2"; sha256 = "1p5lh4xsv9xsl8kx0h1bg6iy0if4a69hvairq69p50ffka83pv00"; }; + meta.homepage = "https://github.com/osyo-manga/vim-anzu/"; }; vim-asterisk = buildVimPluginFrom2Nix { @@ -3497,6 +3813,7 @@ let rev = "77e97061d6691637a034258cc415d98670698459"; sha256 = "1bm99j4vskbgzfn09567qi0462dvjrpdkifc4hg24bi02bx9hjrj"; }; + meta.homepage = "https://github.com/haya14busa/vim-asterisk/"; }; vim-auto-save = buildVimPluginFrom2Nix { @@ -3508,6 +3825,7 @@ let rev = "8c1d5dc919030aa712ad7201074ffb60961e9dda"; sha256 = "0dj45g56n0q4advc9sgch11ghb2h5ahk601gndwy02a0937axjh2"; }; + meta.homepage = "https://github.com/907th/vim-auto-save/"; }; vim-autoformat = buildVimPluginFrom2Nix { @@ -3519,6 +3837,7 @@ let rev = "555c956db3bdd8ae6f1aa5af1c5fd37eac749e6a"; sha256 = "0dhxa9jrhahqs1wh41115w8r3xcczbjpvnj65ldzs7q9vc4n12xq"; }; + meta.homepage = "https://github.com/Chiel92/vim-autoformat/"; }; vim-automkdir = buildVimPluginFrom2Nix { @@ -3530,6 +3849,7 @@ let rev = "dec143a8d9b266f73a42c63ede85bfc26280f79d"; sha256 = "00ix0y1ijbis8pj7pf6gv2g5z2s7kxwlr0viybwrs0li5acym6jp"; }; + meta.homepage = "https://github.com/benizi/vim-automkdir/"; }; vim-bazel = buildVimPluginFrom2Nix { @@ -3541,6 +3861,7 @@ let rev = "7c4987b4266d117a9f1d4c7fe7f4dfba33dfc8c8"; sha256 = "182w8ibr34z86nmx6byabkah0q9fgrzml8m2ardaqzqjqr2ya5yg"; }; + meta.homepage = "https://github.com/bazelbuild/vim-bazel/"; }; vim-beancount = buildVimPluginFrom2Nix { @@ -3552,6 +3873,7 @@ let rev = "8054352c43168ece62094dfc8ec510e347e19e3c"; sha256 = "0fd4fbdmhapdhjr3f9bhd4lqxzpdwwvpf64vyqwahkqn8hrrbc4m"; }; + meta.homepage = "https://github.com/nathangrigg/vim-beancount/"; }; vim-better-whitespace = buildVimPluginFrom2Nix { @@ -3563,6 +3885,7 @@ let rev = "8cf4b2175dd61416c2fe7d3234324a6c59d678de"; sha256 = "1iga1xdzygnr9rhv0kw01nr3vahl2d486p06slmri2vy8ngzym0q"; }; + meta.homepage = "https://github.com/ntpeters/vim-better-whitespace/"; }; vim-buffergator = buildVimPluginFrom2Nix { @@ -3574,6 +3897,7 @@ let rev = "947b60dca4d4fc6a041a6ec84b17ca6736d1b916"; sha256 = "0g7ymflzfdsj5793s32gc83bidqys5dxmw455viwpqgmgjxnar5c"; }; + meta.homepage = "https://github.com/jeetsukumaran/vim-buffergator/"; }; vim-bufferline = buildVimPluginFrom2Nix { @@ -3585,6 +3909,7 @@ let rev = "651fd010aa9613a4b8636a4af8a2db0d22800262"; sha256 = "0zls47a3v8dv3h63drbak1mxf3j2x3scvclk7bjwzlk2yp447das"; }; + meta.homepage = "https://github.com/bling/vim-bufferline/"; }; vim-bufkill = buildVimPluginFrom2Nix { @@ -3596,6 +3921,7 @@ let rev = "795dd38f3cff69d0d8fe9e71847907e200860959"; sha256 = "1nji86vjjbfjw4xy52yazq53hrlsr7v30xkx2awgiakz7ih0bdxa"; }; + meta.homepage = "https://github.com/qpkorr/vim-bufkill/"; }; vim-choosewin = buildVimPluginFrom2Nix { @@ -3607,6 +3933,7 @@ let rev = "f91cdb9be92ce3bb9bccba16e8c659d5e8d7454f"; sha256 = "1nq1vpwv6h5sc849y26nzkrmr9w3aj6w32apyih9kx0jh4ybv0xs"; }; + meta.homepage = "https://github.com/t9md/vim-choosewin/"; }; vim-clojure-highlight = buildVimPluginFrom2Nix { @@ -3618,6 +3945,7 @@ let rev = "9ac6cb8fef04b2c243377adb671324a60952aee0"; sha256 = "0fg3faj0fq7b8pqr0i33qdg2xfd5966lrjl1wkq6jcgvdqamhz0y"; }; + meta.homepage = "https://github.com/guns/vim-clojure-highlight/"; }; vim-clojure-static = buildVimPluginFrom2Nix { @@ -3629,6 +3957,7 @@ let rev = "fae5710a0b79555fe3296145be4f85148266771a"; sha256 = "0s98qrhv7xh7bvh8bm1vaxpw3n2mcxayay3k90ibgjrv1jpyvzx7"; }; + meta.homepage = "https://github.com/guns/vim-clojure-static/"; }; vim-closetag = buildVimPluginFrom2Nix { @@ -3640,6 +3969,7 @@ let rev = "90cf416c03ed841ad7f3d44f4d6f3192f216176a"; sha256 = "0kxba7s0s66m2k4j1v8iwq6m5j9843ha67br03dg7d9ya4qiyyw9"; }; + meta.homepage = "https://github.com/alvan/vim-closetag/"; }; vim-codefmt = buildVimPluginFrom2Nix { @@ -3651,6 +3981,7 @@ let rev = "d3d8b8b6d73da3e1b19089f98a85901f0b652e2f"; sha256 = "0r20cl6i4k7r2y5d8i3dbrxmn01mlnww2qgvjgmafa8nqd16gl57"; }; + meta.homepage = "https://github.com/google/vim-codefmt/"; }; vim-coffee-script = buildVimPluginFrom2Nix { @@ -3662,6 +3993,7 @@ let rev = "9e3b4de2a476caeb6ff21b5da20966d7c67a98bb"; sha256 = "1yzhyi12r508r2yjkzbcnddv3q4whjf3kchp23xs0snhwd9b981x"; }; + meta.homepage = "https://github.com/kchmck/vim-coffee-script/"; }; vim-colemak = buildVimPluginFrom2Nix { @@ -3673,6 +4005,7 @@ let rev = "6ac1c0bf362845355c65dfeab9a9987c1b4dc7ec"; sha256 = "1li7yc5vglrhf7w7i7gs2i7ihdb1bhx85basmpgqlf7790lv1599"; }; + meta.homepage = "https://github.com/kalbasit/vim-colemak/"; }; vim-colors-solarized = buildVimPluginFrom2Nix { @@ -3684,6 +4017,7 @@ let rev = "528a59f26d12278698bb946f8fb82a63711eec21"; sha256 = "05d3lmd1shyagvr3jygqghxd3k8a4vp32723fvxdm57fdrlyzcm1"; }; + meta.homepage = "https://github.com/altercation/vim-colors-solarized/"; }; vim-colorschemes = buildVimPluginFrom2Nix { @@ -3695,6 +4029,7 @@ let rev = "9e7ab1cfec5d3db85aa1c4e87329fd869ecf94e9"; sha256 = "0w9q41rl9g319xw2xs2yf34h3pdkq8a2pmh4gf9gb72v2k5z0dbm"; }; + meta.homepage = "https://github.com/flazz/vim-colorschemes/"; }; vim-colorstepper = buildVimPluginFrom2Nix { @@ -3706,6 +4041,7 @@ let rev = "f23ba0d995d41508a2dc9471cf31d3d01a4b5f05"; sha256 = "05ykxn0gmh8liz0zv5hb8df1ajggxp88izq3825m0yb3ma3k1jqs"; }; + meta.homepage = "https://github.com/jonbri/vim-colorstepper/"; }; vim-commentary = buildVimPluginFrom2Nix { @@ -3717,17 +4053,19 @@ let rev = "f8238d70f873969fb41bf6a6b07ca63a4c0b82b1"; sha256 = "09d81q9na7pvvrmxxqy09ffdzsx5v5dikinb704c9wm4ys2bidr9"; }; + meta.homepage = "https://github.com/tpope/vim-commentary/"; }; vim-cool = buildVimPluginFrom2Nix { pname = "vim-cool"; - version = "2018-01-11"; + version = "2020-04-18"; src = fetchFromGitHub { owner = "romainl"; repo = "vim-cool"; - rev = "06918c36b3396af0bec1e87e748a5dba55be87b9"; - sha256 = "099sbjdk944bnivqgqgbjplczfm3k84583ryrmpqf3lgrq6pl8wr"; + rev = "27ad4ecf7532b750fadca9f36e1c5498fc225af2"; + sha256 = "1in44gf7hs978nc9328zh1kj3jh04kcinw0m8spcbgj079782sg8"; }; + meta.homepage = "https://github.com/romainl/vim-cool/"; }; vim-cpp-enhanced-highlight = buildVimPluginFrom2Nix { @@ -3739,6 +4077,7 @@ let rev = "27e0ffc215b81fa5aa87eca396acd4421d36c060"; sha256 = "15nyd4yssswyi4brkch09rca0qh7p77li4xyrivmiapkr4a60vwb"; }; + meta.homepage = "https://github.com/octol/vim-cpp-enhanced-highlight/"; }; vim-csharp = buildVimPluginFrom2Nix { @@ -3750,17 +4089,19 @@ let rev = "b5982fc69bba7d507638a308d6875b031054280d"; sha256 = "16sf3yqvd36b4rkrh6w7jskvlkrgymwa13xcvh586lmlc7g6ilcx"; }; + meta.homepage = "https://github.com/OrangeT/vim-csharp/"; }; vim-css-color = buildVimPluginFrom2Nix { pname = "vim-css-color"; - version = "2019-08-28"; + version = "2020-04-16"; src = fetchFromGitHub { owner = "ap"; repo = "vim-css-color"; - rev = "1f9fe5c1f9e0a6bfc41b14d070f4d878d445ae96"; - sha256 = "0h0hdv492kw0gs8kn62gyvs29pjwvvg8gbsisx4wpw6qa6w457hn"; + rev = "741dd18a35e251ededc0687eea9b8d100d3b83b8"; + sha256 = "1mjwyznprhhfmwi1djyjgxkqv9bwima1ysxa9782rk198j2n87vs"; }; + meta.homepage = "https://github.com/ap/vim-css-color/"; }; vim-cue = buildVimPluginFrom2Nix { @@ -3772,6 +4113,7 @@ let rev = "482f0b1df03f59bbd1bf4bca99314770289a7f35"; sha256 = "05c9amxpn4zyb8hvcnzrzq43r70hzs32rhn5rjaf5jflgmwaph0q"; }; + meta.homepage = "https://github.com/jjo/vim-cue/"; }; vim-cursorword = buildVimPluginFrom2Nix { @@ -3783,6 +4125,7 @@ let rev = "b5f8a4b148b566626210d0c1f6b63036b62322bb"; sha256 = "0a4gznfxmg7a62xwk4mmjcxykcgmm7mh5vv7n5hskxjczdrvl400"; }; + meta.homepage = "https://github.com/itchyny/vim-cursorword/"; }; vim-cute-python = buildVimPluginFrom2Nix { @@ -3794,6 +4137,7 @@ let rev = "d7a6163f794500447242df2bedbe20bd751b92da"; sha256 = "1jrfd6z84cdzn3yxdfp0xfxygscq7s8kbzxk37hf9cf5pl9ln0qf"; }; + meta.homepage = "https://github.com/ehamberg/vim-cute-python/"; }; vim-dadbod = buildVimPluginFrom2Nix { @@ -3805,6 +4149,7 @@ let rev = "62646c502fac1455318933b9ea13ec5899ba7c84"; sha256 = "0qpgx81xpwr3ab3ardp820aqifvxh2jsk1qw94p26q6iiab7kdcv"; }; + meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; vim-dasht = buildVimPluginFrom2Nix { @@ -3816,6 +4161,7 @@ let rev = "9c7484eaea26b8dd1edd8af21a38cee6c4ef4f49"; sha256 = "1rjckipy7b4ygwvc1hbc24da1x3pwklbkfljrz16znlcm2y5q72k"; }; + meta.homepage = "https://github.com/sunaku/vim-dasht/"; }; vim-devicons = buildVimPluginFrom2Nix { @@ -3827,6 +4173,7 @@ let rev = "58e57b6eeb407dba7ff6e607342c08c32b6fd398"; sha256 = "0czkkhj2s9vjis5h4gajvnqc1nraxyqhyvzk2ndffhnzxvylhd5w"; }; + meta.homepage = "https://github.com/ryanoasis/vim-devicons/"; }; vim-diminactive = buildVimPluginFrom2Nix { @@ -3838,6 +4185,7 @@ let rev = "6f2e14e6ff6a038285937c378ec3685e6ff7ee36"; sha256 = "14jf5hh3v2f5wb10v09ygx15pxbwziv20pwv0fqkakxwf0vqwd50"; }; + meta.homepage = "https://github.com/blueyed/vim-diminactive/"; }; vim-dirdiff = buildVimPluginFrom2Nix { @@ -3849,6 +4197,7 @@ let rev = "5bf29d8a41b4ec93e6c04b9d4a6c626b408c27c5"; sha256 = "0nvhsj12gsjgncpmvg8b1qz675ghfcsib5gj22p7j4l4brih563r"; }; + meta.homepage = "https://github.com/will133/vim-dirdiff/"; }; vim-dirvish = buildVimPluginFrom2Nix { @@ -3860,17 +4209,19 @@ let rev = "0a53fadc22ab6df6aed9cc580c9e498715870522"; sha256 = "09q5xpc4xbskzxppp66ypzd5mnic5bcwxahmhb259ch9xs8qmrc6"; }; + meta.homepage = "https://github.com/justinmk/vim-dirvish/"; }; vim-dispatch = buildVimPluginFrom2Nix { pname = "vim-dispatch"; - version = "2020-02-10"; + version = "2020-04-19"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dispatch"; - rev = "3757ddad87073a6ded8c34dfabb28c325acf6c02"; - sha256 = "0vnkwn896v9dsqf329nvdik60bm6f0m0n32x3fqmzazqgqlx055j"; + rev = "fe6a34322829e466a7e8ce710a6ac5eabddff9fd"; + sha256 = "1m0dfm8r3d8zph6i4ln3jqfzs8hxbkq9rvxpij1m2vvk2hgy2nf5"; }; + meta.homepage = "https://github.com/tpope/vim-dispatch/"; }; vim-docbk = buildVimPluginFrom2Nix { @@ -3882,6 +4233,7 @@ let rev = "6ac0346ce96dbefe982b9e765a81c072997f2e9e"; sha256 = "1jnx39m152hf9j620ygagaydg6h8m8gxkr1fmxj6kgqf71jr0n9d"; }; + meta.homepage = "https://github.com/jhradilek/vim-docbk/"; }; vim-docbk-snippets = buildVimPluginFrom2Nix { @@ -3893,6 +4245,7 @@ let rev = "b8604893f46f6c570a55efff733f0371ac8a805d"; sha256 = "1qz3azgzv9718s2a6h8xw5nrvs4j776csmzsn9chvykdpx8rwim1"; }; + meta.homepage = "https://github.com/jhradilek/vim-snippets/"; }; vim-easy-align = buildVimPluginFrom2Nix { @@ -3904,6 +4257,7 @@ let rev = "12dd6316974f71ce333e360c0260b4e1f81169c3"; sha256 = "0gpfdla8shaf5ykgakrsf0h0w6ygvwcv3lfpnki24l790xhdi606"; }; + meta.homepage = "https://github.com/junegunn/vim-easy-align/"; }; vim-easygit = buildVimPluginFrom2Nix { @@ -3915,6 +4269,7 @@ let rev = "9770370a35838f70eda91d0c3006d0563ccc8d2a"; sha256 = "1a42s0nymakz20rjrpwmiqpnlndrkdakzbm53aclzcs61i9zq2k8"; }; + meta.homepage = "https://github.com/neoclide/vim-easygit/"; }; vim-easymotion = buildVimPluginFrom2Nix { @@ -3926,6 +4281,7 @@ let rev = "dd7b4b526775bc8553e16bc402020573b04a948c"; sha256 = "1dhhq1y6xa3q26irclad6254q89xpnxglfd92v3bq01l4p41zcqf"; }; + meta.homepage = "https://github.com/easymotion/vim-easymotion/"; }; vim-easytags = buildVimPluginFrom2Nix { @@ -3937,6 +4293,7 @@ let rev = "72a8753b5d0a951e547c51b13633f680a95b5483"; sha256 = "0i8ha1fa5d860b1mi0xp8kwsgb0b9vbzcg1bldzv6s5xd9yyi12i"; }; + meta.homepage = "https://github.com/xolox/vim-easytags/"; }; vim-eighties = buildVimPluginFrom2Nix { @@ -3948,17 +4305,19 @@ let rev = "1a6ea42ead1e31524ec94cfefb6afc1d8dacd170"; sha256 = "1yh1kny28c7f5qm52y7xd5aj4mycksfb0x1zvcb37c73ycdxc1v2"; }; + meta.homepage = "https://github.com/justincampbell/vim-eighties/"; }; vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2020-03-27"; + version = "2020-04-18"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "vim-elixir"; - rev = "47d05df7fb41493821b0b3e3db72d5faeae3aecd"; - sha256 = "10r9h359bla9gy48kvf2681r7gzk7klwrf488xc1rjzhgd41ila1"; + rev = "80f0dae8da035d60a094fd1b04bd5b803790ac2b"; + sha256 = "0gdsrbdj6nciivm4vaiq6kppky622r0wxjk4wb0q92j2dzadwsk9"; }; + meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; }; vim-elm-syntax = buildVimPluginFrom2Nix { @@ -3970,17 +4329,19 @@ let rev = "846a5929bff5795256fbca96707e451dbc755e36"; sha256 = "05jkx4dbkb646wy0igqpwc55iamm0a030dswhirg6nyl3x6qzgym"; }; + meta.homepage = "https://github.com/andys8/vim-elm-syntax/"; }; vim-endwise = buildVimPluginFrom2Nix { pname = "vim-endwise"; - version = "2019-11-13"; + version = "2020-04-19"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-endwise"; - rev = "bf90d8be447de667f4532b934d1a70881be56dd8"; - sha256 = "1czx891via5783yk222mhki94wvq75hxxp1xk1d5m90vwqb3azfn"; + rev = "97180a73ad26e1dcc1eebe8de201f7189eb08344"; + sha256 = "1f9nwp9qiip4alkpacwaq2nzsrx80a4cdwyrvajs6lrk48dv4hbw"; }; + meta.homepage = "https://github.com/tpope/vim-endwise/"; }; vim-eunuch = buildVimPluginFrom2Nix { @@ -3992,6 +4353,7 @@ let rev = "33e875b31c8b811a0a47908884a5e2339106bbe8"; sha256 = "1xadb22kd40swmww0qxmmkcpcq6viy8l167pjck5q32hfngll5d3"; }; + meta.homepage = "https://github.com/tpope/vim-eunuch/"; }; vim-exchange = buildVimPluginFrom2Nix { @@ -4003,6 +4365,7 @@ let rev = "05d82b87711c6c8b9b7389bfb91c24bc4f62aa87"; sha256 = "09fa156y8pxpzdbngifa7yzg1vjg1fjsgp1h9inj818zbig8mamb"; }; + meta.homepage = "https://github.com/tommcdo/vim-exchange/"; }; vim-expand-region = buildVimPluginFrom2Nix { @@ -4014,6 +4377,7 @@ let rev = "966513543de0ddc2d673b5528a056269e7917276"; sha256 = "0l30wjlk4vxr16f1njnvf8aw9yg9p9jisvcxbcg3znsq5q8ix6zv"; }; + meta.homepage = "https://github.com/terryma/vim-expand-region/"; }; vim-extradite = buildVimPluginFrom2Nix { @@ -4025,6 +4389,7 @@ let rev = "58c77fffbb5d61eb0b87c8b4ef0ad78e9659d621"; sha256 = "1mm2icx50q5iyhaz1dypnbqh14s1wsnw8skpxcm1klhqn02zk46f"; }; + meta.homepage = "https://github.com/int3/vim-extradite/"; }; vim-fetch = buildVimPluginFrom2Nix { @@ -4036,17 +4401,19 @@ let rev = "dd674b50b261275a6a75cab6929b7bb7c5c4acba"; sha256 = "1hadfzhzkq2n9k3yga55fsl6nm5mgl2vv975jnxsi4qgz9cwcsgr"; }; + meta.homepage = "https://github.com/wsdjeg/vim-fetch/"; }; vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2019-12-15"; + version = "2020-04-18"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "63d7209ff4f17d4bdc30f3478986b5bd44a47a3e"; - sha256 = "1n0p70w0qmbxffchxsmklraxqrzg1q6bwnp4qhy0xjcz89p3fzx5"; + rev = "6c968f26f0bd3dd04b18fad8761e0e9e1220a3da"; + sha256 = "1x74j3gghfmqh1mxswzhb6d0zdll735r5lrgn4g3z580y15h37w5"; }; + meta.homepage = "https://github.com/tpope/vim-fireplace/"; }; vim-fish = buildVimPluginFrom2Nix { @@ -4058,6 +4425,7 @@ let rev = "50b95cbbcd09c046121367d49039710e9dc9c15f"; sha256 = "1yvjlm90alc4zsdsppkmsja33wsgm2q6kkn9dxn6xqwnq4jw5s7h"; }; + meta.homepage = "https://github.com/dag/vim-fish/"; }; vim-flagship = buildVimPluginFrom2Nix { @@ -4069,6 +4437,7 @@ let rev = "e522bd0ffb0e329f695ead7d4288a6245ff22410"; sha256 = "0vqkdzd7b204kbinn12jk306kc9bn2f0yaifj49swd0g8hv6dk4b"; }; + meta.homepage = "https://github.com/tpope/vim-flagship/"; }; vim-flake8 = buildVimPluginFrom2Nix { @@ -4080,6 +4449,7 @@ let rev = "0c7cf6dc038223b44e3c0a702fe2acf997768e8a"; sha256 = "14k1b7gjj1sh40qsf4wxbn0dymmc4jvsrd9pacsr6li273aiy6gq"; }; + meta.homepage = "https://github.com/nvie/vim-flake8/"; }; vim-flatbuffers = buildVimPluginFrom2Nix { @@ -4091,6 +4461,7 @@ let rev = "ecd75c33576d982f3c83545dff7b3c9245285e75"; sha256 = "1mfi9als56cpfsz3s91hg3lci8zn7pr9s0l690wqh40vh57d1gxm"; }; + meta.homepage = "https://github.com/dcharbon/vim-flatbuffers/"; }; vim-flutter = buildVimPluginFrom2Nix { @@ -4102,6 +4473,7 @@ let rev = "030a4e609f8f38922fa4ec9a27836d9dabaae957"; sha256 = "0jibmr0v0pqml1cprs3qmkhhmacpb2bwpk8lhaz4dzp8jlga9g00"; }; + meta.homepage = "https://github.com/thosakwe/vim-flutter/"; }; vim-fsharp = buildVimPluginFrom2Nix { @@ -4113,6 +4485,7 @@ let rev = "012d98c981139976551a4d9779f5cce7f8d84d5c"; sha256 = "0ds300kjhm352ni3fwivsrnc9ls021d2x29f4cdszillamcgs7pw"; }; + meta.homepage = "https://github.com/fsharp/vim-fsharp/"; }; vim-ft-diff_fold = buildVimPluginFrom2Nix { @@ -4124,6 +4497,7 @@ let rev = "89771dffd3682ef82a4b3b3e9c971b9909f08e87"; sha256 = "0bk95cxkfzamlgv1x2jb1bnfas2pmvvqgpn5fvxddf0andm8sfma"; }; + meta.homepage = "https://github.com/thinca/vim-ft-diff_fold/"; }; vim-fugitive = buildVimPluginFrom2Nix { @@ -4135,6 +4509,7 @@ let rev = "85e2c73830b6bb01ce7fc3a926d2b25836a253eb"; sha256 = "1zbw8cnjl9m59grr65kfkgi8p4850rjp24f1plp4jhidjmsfhv7x"; }; + meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; vim-ghost = buildVimPluginFrom2Nix { @@ -4146,6 +4521,7 @@ let rev = "156f393d9c45a5c9dd16f9316a9ad125da67c449"; sha256 = "0b21yamsfrljk3mfjql0gzsv5mv24qwbs551hxqsapgmrv7j2acg"; }; + meta.homepage = "https://github.com/raghur/vim-ghost/"; }; vim-gist = buildVimPluginFrom2Nix { @@ -4157,6 +4533,7 @@ let rev = "2158eceb210b0a354bc17aa4144554e5d8bb6c79"; sha256 = "1dz33c63q7gghz35hyrvbshqw20faccs7bvxlda5w70mkbz9h9c4"; }; + meta.homepage = "https://github.com/mattn/vim-gist/"; }; vim-gista = buildVimPluginFrom2Nix { @@ -4168,6 +4545,7 @@ let rev = "af13c0062a46d73384f15abee5a54e164fcaad8e"; sha256 = "0f3pxahsaj37iln1k3289h7pj7z4fm0z3vfd0szf1spv3hzcjapd"; }; + meta.homepage = "https://github.com/lambdalisue/vim-gista/"; }; vim-gitbranch = buildVimPluginFrom2Nix { @@ -4179,17 +4557,19 @@ let rev = "8118dc1cdd387bd609852be4bf350360ce881193"; sha256 = "01gvd96mnzfc5s0951zzq122birg5svnximkldgb9kv5bmsnmh3j"; }; + meta.homepage = "https://github.com/itchyny/vim-gitbranch/"; }; vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2020-04-03"; + version = "2020-04-18"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "b7db78b258aa9925f3c86968b348413732964b3b"; - sha256 = "0933b60bma8xs7cmw1p2npfzyqmpww3frmcg51dsg2hsg9rq213q"; + rev = "2b62481d388c5e0e1dd11e74377523fdb98b6ac4"; + sha256 = "1x6x6wp1ggn2whrm5mi7wyz5b88syc4yvncgs8bjhbrc636psqhq"; }; + meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; vim-github-dashboard = buildVimPluginFrom2Nix { @@ -4201,28 +4581,31 @@ let rev = "8012a2016a9e39a50081c9d5db2deb09ae4a6010"; sha256 = "0jkr6mz5zcpbyswmiyprcbm8l93lkg5sr46r8kyds1n2vz19cf7x"; }; + meta.homepage = "https://github.com/junegunn/vim-github-dashboard/"; }; vim-glsl = buildVimPluginFrom2Nix { pname = "vim-glsl"; - version = "2019-11-01"; + version = "2020-04-21"; src = fetchFromGitHub { owner = "tikhomirov"; repo = "vim-glsl"; - rev = "fbdb226318e3e1747b29f31ad07c0cce07e9f22a"; - sha256 = "076fny258ynamnd1mnknmp1zlafvvxpx7p28985mms84k65ihvy5"; + rev = "36266238d96cd2219769793855a7e915f5e6a32c"; + sha256 = "0vxjbv5qn7lvvpqv1danmkg423cbf7czxzp208zlx9l82vnr24z8"; }; + meta.homepage = "https://github.com/tikhomirov/vim-glsl/"; }; vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-04-12"; + version = "2020-04-19"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "b995086646f29de25acbe7df2c08cc196c4641d7"; - sha256 = "12s04gnnkkmhlm36gxpy18ngxj88b9p5b6vzdq662gmwl3wk98nc"; + rev = "07869cdfb066dcb287673eee3effb30021a970b8"; + sha256 = "1gmfvlysy7s0rh3lwpq9fym59nfwm64grcfrrhf2d9gzvwip9326"; }; + meta.homepage = "https://github.com/fatih/vim-go/"; }; vim-grammarous = buildVimPluginFrom2Nix { @@ -4234,6 +4617,7 @@ let rev = "083cbee6094c9ec347d7c75af421be27d2ec7e70"; sha256 = "1cxycr2ijzxn9d5xgp9ri4f2i4d87a3100nsc11iwa2bzir4xsiz"; }; + meta.homepage = "https://github.com/rhysd/vim-grammarous/"; }; vim-grepper = buildVimPluginFrom2Nix { @@ -4245,6 +4629,7 @@ let rev = "dde6a660c7dd4e02b331da238ea477770073aca2"; sha256 = "0c411yg2s6wb8141lqpgasg7iwgvfwy88z6l0c0gccmk8knypxhm"; }; + meta.homepage = "https://github.com/mhinz/vim-grepper/"; }; vim-gui-position = buildVimPluginFrom2Nix { @@ -4256,6 +4641,7 @@ let rev = "065d0dcf96c28cfc0003d72c1b3c49203632f62a"; sha256 = "11kv9kkya9sybslg7lfhhcn2fi3n735zvprg8ch6kd58m82xr4n3"; }; + meta.homepage = "https://github.com/brennanfee/vim-gui-position/"; }; vim-gutentags = buildVimPluginFrom2Nix { @@ -4267,6 +4653,7 @@ let rev = "96cd7dbfe324e8983da68468085967e0b85dc898"; sha256 = "15xvknzy2r178jh0w76cagmxprxsznzk0zgv41h33rns4hy5q1vf"; }; + meta.homepage = "https://github.com/ludovicchabant/vim-gutentags/"; }; vim-hardtime = buildVimPluginFrom2Nix { @@ -4278,6 +4665,7 @@ let rev = "d9128568afa62947b7ac8f12c22d88e3de526a6b"; sha256 = "097wzfh4n4fnsq2gx4hbmyr731ciky8qcai5aiyh2baybvwshmr5"; }; + meta.homepage = "https://github.com/takac/vim-hardtime/"; }; vim-haskellconceal = buildVimPluginFrom2Nix { @@ -4289,6 +4677,7 @@ let rev = "802f82a5afee56e9e1251e6f756104a3bd114234"; sha256 = "1kh6853hi4rgl4z1xs8kz9l1q9w7lh0r42y2m0rabfpr6yh3091r"; }; + meta.homepage = "https://github.com/twinside/vim-haskellconceal/"; }; vim-haskellConcealPlus = buildVimPluginFrom2Nix { @@ -4300,6 +4689,7 @@ let rev = "d59da33c16966f694b2e4f0bfc57515a935da83f"; sha256 = "1y2hgcpls21738lhrgimsxnkhxxqczp05nmk68s28xssbn4dqgma"; }; + meta.homepage = "https://github.com/enomsg/vim-haskellConcealPlus/"; }; vim-hdevtools = buildVimPluginFrom2Nix { @@ -4311,6 +4701,7 @@ let rev = "ab33578bbdbcbd80050faf43e4adee1653fe34dc"; sha256 = "1xvjz6yidcywn1xmdqlxsz68lmkx6rmiqf6q2gfz56pzq1mfmski"; }; + meta.homepage = "https://github.com/bitc/vim-hdevtools/"; }; vim-hier = buildVimPluginFrom2Nix { @@ -4322,6 +4713,7 @@ let rev = "0b8c365263551a67404ebd7e528c55e17c1d3de7"; sha256 = "118pd9sx1bl9vfr89xrf536hfx4l162a43a1qpwpkqxzb9a3ca7n"; }; + meta.homepage = "https://github.com/jceb/vim-hier/"; }; vim-highlightedyank = buildVimPluginFrom2Nix { @@ -4333,6 +4725,7 @@ let rev = "931cc6bd53e4a1fdbe592751f0e13c0e401f0a49"; sha256 = "091qw0zlc80micn29wb6r8m4f7pplcv8bx1yfvbn3cba77qyj3nb"; }; + meta.homepage = "https://github.com/machakann/vim-highlightedyank/"; }; vim-hindent = buildVimPluginFrom2Nix { @@ -4344,6 +4737,7 @@ let rev = "f8e84c199fd00a3ccaf5bbbc97786bde9a4faa13"; sha256 = "1y4nnz38zal1ffs5n751dn9p9apk8q7pq3cw79r5z6fsdp942ai6"; }; + meta.homepage = "https://github.com/alx741/vim-hindent/"; }; vim-hoogle = buildVimPluginFrom2Nix { @@ -4355,6 +4749,7 @@ let rev = "871d104c92e33cb238506f2805f1652561978cc8"; sha256 = "17qvi57g72ijgk7nczczli3kcphvdf625fzqbqcmqpsawgvfd07n"; }; + meta.homepage = "https://github.com/Twinside/vim-hoogle/"; }; vim-html-template-literals = buildVimPluginFrom2Nix { @@ -4366,6 +4761,7 @@ let rev = "3b370b69bce94bdeb0ca7137f548356f775cadcc"; sha256 = "1wmyxscyqs6344jsn839dyrx7k3iiwv07ic9gxh5d93g5s3c3pml"; }; + meta.homepage = "https://github.com/jonsmithers/vim-html-template-literals/"; }; vim-husk = buildVimPluginFrom2Nix { @@ -4377,6 +4773,7 @@ let rev = "ad89559ff8a6c4b1e94a18b2d494a69a1f701d08"; sha256 = "09kqzaqa4jdh31q0a3nxbx9li7zg890qxh68rfzblzyx22xv4mka"; }; + meta.homepage = "https://github.com/vim-utils/vim-husk/"; }; vim-hybrid-material = buildVimPluginFrom2Nix { @@ -4388,6 +4785,7 @@ let rev = "f2e92ac7e5c4bb75d72f0abaea939e4364e00e2e"; sha256 = "01b9n598106qh68ky3fykczq13pldi221r7lrxvg0vnv2zp1z5qd"; }; + meta.homepage = "https://github.com/kristijanhusak/vim-hybrid-material/"; }; vim-iced-coffee-script = buildVimPluginFrom2Nix { @@ -4399,6 +4797,7 @@ let rev = "e42e0775fa4b1f8840c55cd36ac3d1cedbc1dea2"; sha256 = "14yfirny359rlrr082il2ys3hxiyrbbk794rdxrs2lasjy8rb1f7"; }; + meta.homepage = "https://github.com/noc7c9/vim-iced-coffee-script/"; }; vim-illuminate = buildVimPluginFrom2Nix { @@ -4410,6 +4809,7 @@ let rev = "80dafb9b0e7b9f4ce7c843d4104f455c8c5b1f42"; sha256 = "1yijaj1dqfmw4dsdmgj01sxizyraisxwjqh2hhbq93pdln4lm51f"; }; + meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; vim-indent-guides = buildVimPluginFrom2Nix { @@ -4421,6 +4821,7 @@ let rev = "54d889a63716ee2f1818aa2ec5082db47147147b"; sha256 = "0ahlbjv2ibhhnf9zqn85b2sh3wf9l0kmg2qmavz3z5fmf8sqljj2"; }; + meta.homepage = "https://github.com/nathanaelkane/vim-indent-guides/"; }; vim-indent-object = buildVimPluginFrom2Nix { @@ -4432,6 +4833,7 @@ let rev = "5c5b24c959478929b54a9e831a8e2e651a465965"; sha256 = "1kmwnz0jxjkvfzy06r7r73pcxfcyjp8p8m2d6qrhjfvzidgfhw19"; }; + meta.homepage = "https://github.com/michaeljsmith/vim-indent-object/"; }; vim-indentwise = buildVimPluginFrom2Nix { @@ -4443,6 +4845,7 @@ let rev = "608bd6876d3b56d469e0e615eb774a6e06095dbf"; sha256 = "0bnzk1afi88icq58389nxqz196gkxcj71qrxvw87d72h2zaspvcx"; }; + meta.homepage = "https://github.com/jeetsukumaran/vim-indentwise/"; }; vim-indexed-search = buildVimPluginFrom2Nix { @@ -4454,6 +4857,7 @@ let rev = "5af020bba084b699d0453f242d7d76711d64b1e3"; sha256 = "0cq265yqksh7jqazxn7qxr7bclrk2pq7py4c29wspsvbi0m3m8rc"; }; + meta.homepage = "https://github.com/henrik/vim-indexed-search/"; }; vim-ipython = buildVimPluginFrom2Nix { @@ -4465,6 +4869,7 @@ let rev = "42499f094b805b90b683afa5009cee99abd0bb75"; sha256 = "10wpfvfs8yv1bvzra4d5zy5glp62gbalpayxx7mkalhr2ccppy3x"; }; + meta.homepage = "https://github.com/ivanov/vim-ipython/"; }; vim-isort = buildVimPluginFrom2Nix { @@ -4476,6 +4881,7 @@ let rev = "b749d009075a333634dc61a039a2dc0e7f34609c"; sha256 = "1h8s21kwbjdg632jvd46r2va7il4f1dbgwfw8fkds0n08rbnpdjw"; }; + meta.homepage = "https://github.com/fisadev/vim-isort/"; }; vim-janah = buildVimPluginFrom2Nix { @@ -4487,6 +4893,7 @@ let rev = "3b8ae976987b6ade2abeac25f0208e8bc90d7138"; sha256 = "16bygyri9qxyhl8n8md945wwy1i9lss4hwxa7yjl9ms2fzzragv4"; }; + meta.homepage = "https://github.com/mhinz/vim-janah/"; }; vim-javacomplete2 = buildVimPluginFrom2Nix { @@ -4498,17 +4905,19 @@ let rev = "dc7951895a98c49c39622f65cdd7b39374c348bc"; sha256 = "1d8xiiwfg5wz57jyy7ahbi2bl5sjkhkpkqm2qbhsn7cd9vk36sxy"; }; + meta.homepage = "https://github.com/artur-shaik/vim-javacomplete2/"; }; vim-javascript = buildVimPluginFrom2Nix { pname = "vim-javascript"; - version = "2020-01-24"; + version = "2020-04-13"; src = fetchFromGitHub { owner = "pangloss"; repo = "vim-javascript"; - rev = "db595656304959dcc3805cf63ea9a430e3f01e8f"; - sha256 = "0lr0506zbax41xdbfgmm70iiyqi6g8lsmwfy9112fnd9n62s32yd"; + rev = "c3966153e81bc3766b1627e6ab0cd53333b61c1e"; + sha256 = "1sbd5a06linzkx59lndfw27r66ng2bfm4pgn2cgjlcsjmkbcgakn"; }; + meta.homepage = "https://github.com/pangloss/vim-javascript/"; }; vim-javascript-syntax = buildVimPluginFrom2Nix { @@ -4520,6 +4929,7 @@ let rev = "e65e4f01ba94761323450208c9bf7141428784db"; sha256 = "09561jf3cmzpm8jn8k34fd3av6i1mqi6n32bisri96jkabw8dpv7"; }; + meta.homepage = "https://github.com/jelera/vim-javascript-syntax/"; }; vim-jinja = buildVimPluginFrom2Nix { @@ -4531,6 +4941,7 @@ let rev = "8d330a7aaf0763d080dc82204b4aaba6ac0605c6"; sha256 = "1n62ga02rcj7jjgzvwr46pckj59dc1zqahjgampjcwdd8vf4mg3q"; }; + meta.homepage = "https://github.com/lepture/vim-jinja/"; }; vim-jsbeautify = buildVimPluginFrom2Nix { @@ -4543,6 +4954,7 @@ let sha256 = "06gxmqyxkw2mgdy6m7b248w0gzkwsjcpyihpnyf5cajb5aw4wk13"; fetchSubmodules = true; }; + meta.homepage = "https://github.com/maksimr/vim-jsbeautify/"; }; vim-jsdoc = buildVimPluginFrom2Nix { @@ -4554,6 +4966,7 @@ let rev = "b23073449d1df98ecfe73828079115e0d1d7573b"; sha256 = "0r91lr3gpjbaalqln7k8kv4q88w9rclfyji87yzmnr3apjaazyjj"; }; + meta.homepage = "https://github.com/heavenshell/vim-jsdoc/"; }; vim-json = buildVimPluginFrom2Nix { @@ -4565,6 +4978,7 @@ let rev = "3727f089410e23ae113be6222e8a08dd2613ecf2"; sha256 = "1c19pqrys45pzflj5jyrm4q6hcvs977lv6qsfvbnk7nm4skxrqp1"; }; + meta.homepage = "https://github.com/elzr/vim-json/"; }; vim-jsonnet = buildVimPluginFrom2Nix { @@ -4576,6 +4990,7 @@ let rev = "b7459b36e5465515f7cf81d0bb0e66e42a7c2eb5"; sha256 = "0fc6xpiyxly3ibs4lzn6dk9yd2cc353qb8lavag7zmims1bncvqf"; }; + meta.homepage = "https://github.com/google/vim-jsonnet/"; }; vim-jsx-pretty = buildVimPluginFrom2Nix { @@ -4587,6 +5002,7 @@ let rev = "496c44d89281d1e13c9bb4c75a2e69daba48b47b"; sha256 = "09xr8pbx27qpffcr0j1857cpyxgkv5xay6mgpzvynpxq21xrmm3q"; }; + meta.homepage = "https://github.com/MaxMEllon/vim-jsx-pretty/"; }; vim-kitty-navigator = buildVimPluginFrom2Nix { @@ -4598,6 +5014,7 @@ let rev = "c32357892f10117291461631d51a6bfd20e72b9a"; sha256 = "0zqvcnbns0vbxkqr0mpiapql8cvp54nn5a6mwc7l24jr6plhiwmn"; }; + meta.homepage = "https://github.com/knubie/vim-kitty-navigator/"; }; vim-lastplace = buildVimPluginFrom2Nix { @@ -4609,6 +5026,7 @@ let rev = "48ba343c8c1ca3039224727096aae214f51327d1"; sha256 = "0m8skd86p2cr0wz8rghj4is3fgnlh7vrw7can916li35i3hajid2"; }; + meta.homepage = "https://github.com/farmergreg/vim-lastplace/"; }; vim-latex-live-preview = buildVimPluginFrom2Nix { @@ -4620,6 +5038,7 @@ let rev = "855c30915547c7e9c19b7e6efb528730c071d2e8"; sha256 = "14fgbq7wyyhhzkd8832g07z97jg1b9awibzf3sn33ih7p5bb3hhp"; }; + meta.homepage = "https://github.com/xuhdev/vim-latex-live-preview/"; }; vim-lawrencium = buildVimPluginFrom2Nix { @@ -4631,6 +5050,7 @@ let rev = "e0c127cb4e4224453cb88faffd4627b7da499bcb"; sha256 = "1gvvr04x17157iz83rv45nlbj1qaz90j0l96q3fki3h1b0fw0099"; }; + meta.homepage = "https://github.com/ludovicchabant/vim-lawrencium/"; }; vim-leader-guide = buildVimPluginFrom2Nix { @@ -4642,6 +5062,7 @@ let rev = "8dff63fcc29811bb30fccb135f31ad488a9a6170"; sha256 = "1n1qgvr729r28rprjkam0blh4qscs8bxf6ay7v8x732axg9gpyav"; }; + meta.homepage = "https://github.com/hecal3/vim-leader-guide/"; }; vim-lean = buildVimPluginFrom2Nix { @@ -4653,6 +5074,7 @@ let rev = "02d678e4346dce35d6b2eed9a03b2b2d3cc84127"; sha256 = "1yw13wf7j92gk8fwkhls6bdbz2h7xbyq4qba8zsfm76rbqn7vzfg"; }; + meta.homepage = "https://github.com/mk12/vim-lean/"; }; vim-ledger = buildVimPluginFrom2Nix { @@ -4664,6 +5086,7 @@ let rev = "47186eb47f543becc34a048a37298954d89bf7c8"; sha256 = "0265614sa2d2s3xpzfliq159v7bmdvlc9yyw5c89pqv4b86gjxzf"; }; + meta.homepage = "https://github.com/ledger/vim-ledger/"; }; vim-lion = buildVimPluginFrom2Nix { @@ -4675,6 +5098,7 @@ let rev = "75306ac1922952ca1a401aee43ddbb304029926d"; sha256 = "0kkf91ppn5jhvnpmmjsp6rvf97pqj57jrbn3qmmy925ncfqh90ld"; }; + meta.homepage = "https://github.com/tommcdo/vim-lion/"; }; vim-liquid = buildVimPluginFrom2Nix { @@ -4686,6 +5110,7 @@ let rev = "9ebc192daec70e620c22d574b5a1c1e16f89a48c"; sha256 = "0cvcjiii5wv55n695284k520rrwi0l4gqpyiqnrpnhmsaqks0n0f"; }; + meta.homepage = "https://github.com/tpope/vim-liquid/"; }; vim-localvimrc = buildVimPluginFrom2Nix { @@ -4697,6 +5122,7 @@ let rev = "fc2f789ce7afa4bbdefbbb4599a802b39b7e7596"; sha256 = "19drgnsn4rb9kv30ykndwjgflsfs328dhm44a9hcp8f8faqpim3d"; }; + meta.homepage = "https://github.com/embear/vim-localvimrc/"; }; vim-logreview = buildVimPluginFrom2Nix { @@ -4708,28 +5134,31 @@ let rev = "b7b66ab338e904127d796af49235b8c29742f18f"; sha256 = "09lyymq0f3ybqdzhbpia7b0wcjbcyg5nkqd72qk8jkvc42da2af3"; }; + meta.homepage = "https://github.com/andreshazard/vim-logreview/"; }; vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2020-04-11"; + version = "2020-04-13"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "4da362f49254774fa5ad407ea3b2407db0147590"; - sha256 = "0wlgj485dy4sb3hbwi8kp69d8iw2zh5xny09xv2zk174dsvp7xxx"; + rev = "fb8056a305a4e3221304ca1483231b6960de5321"; + sha256 = "0glg6225h84ahabahb9q5inipbbi7shcx5y44s8r2gyaqw1l773p"; }; + meta.homepage = "https://github.com/natebosch/vim-lsc/"; }; vim-maktaba = buildVimPluginFrom2Nix { pname = "vim-maktaba"; - version = "2020-03-20"; + version = "2020-04-18"; src = fetchFromGitHub { owner = "google"; repo = "vim-maktaba"; - rev = "b31525d7f6170c68f900abe24748ac9fbaf1ee4d"; - sha256 = "0d6qss18dq36hvxv1if1aaylljsnp2isxajb5xh4zr4cxarrzbfi"; + rev = "f630b985facf383ae1657d569ff69582224cca04"; + sha256 = "1v0f9l12afr4kh6d9sdyl5fxvcgz0c018vll5932pfcrlwhkvdd3"; }; + meta.homepage = "https://github.com/google/vim-maktaba/"; }; vim-manpager = buildVimPluginFrom2Nix { @@ -4741,6 +5170,7 @@ let rev = "25bdd9448651a7669659b1b8d8d7a82acdfbf8af"; sha256 = "0d7rg4lvyxr4v34bimxpdkynmvs606fqvv0qpi7g139ng9hv6wqm"; }; + meta.homepage = "https://github.com/lambdalisue/vim-manpager/"; }; vim-markdown = buildVimPluginFrom2Nix { @@ -4752,6 +5182,7 @@ let rev = "da5a7ac96f517e0fd6f886bc3fbe27156ca1f946"; sha256 = "198bsv88njz6l2pf9yjxb8292aj7x8n2sxi50q3cdsg29a3y2i5c"; }; + meta.homepage = "https://github.com/plasticboy/vim-markdown/"; }; vim-mergetool = buildVimPluginFrom2Nix { @@ -4763,6 +5194,7 @@ let rev = "0275a85256ad173e3cde586d54f66566c01b607f"; sha256 = "1i3zil06zyndm400i2pfn64ykbs29fw8l720229a8ypp9mxcibcp"; }; + meta.homepage = "https://github.com/samoshkin/vim-mergetool/"; }; vim-metamath = buildVimPluginFrom2Nix { @@ -4774,6 +5206,7 @@ let rev = "50aff63608256909159f1b8fc3f09ba61b2bb9bd"; sha256 = "0gwqafhr18wv9ygq47cxwi0k4gj1xll4z8s61w9l9vwaiy5znssh"; }; + meta.homepage = "https://github.com/david-a-wheeler/vim-metamath/"; }; vim-misc = buildVimPluginFrom2Nix { @@ -4785,6 +5218,7 @@ let rev = "3e6b8fb6f03f13434543ce1f5d24f6a5d3f34f0b"; sha256 = "0rd9788dyfc58py50xbiaz5j7nphyvf3rpp3yal7yq2dhf0awwfi"; }; + meta.homepage = "https://github.com/xolox/vim-misc/"; }; vim-monokai-pro = buildVimPluginFrom2Nix { @@ -4796,6 +5230,7 @@ let rev = "c18f35725a5b0d569bfe6921fc4f56c029324828"; sha256 = "1nz8jnlhd6z9zqa9dfbxa9fabihpzz8ajlf4plkaxdy9137z1zqc"; }; + meta.homepage = "https://github.com/phanviet/vim-monokai-pro/"; }; vim-move = buildVimPluginFrom2Nix { @@ -4807,6 +5242,7 @@ let rev = "58049562efb0e6e077416d897b760c4dc9bb25c4"; sha256 = "18pnk6ri73a6dq86zh510wy1s0z1dwnsyay7lxrgirjgh3s9nhhq"; }; + meta.homepage = "https://github.com/matze/vim-move/"; }; vim-mucomplete = buildVimPluginFrom2Nix { @@ -4818,6 +5254,7 @@ let rev = "f13357964cc074d4fe747787065bfb19046f7fce"; sha256 = "0kqik4xgnk3cw7ls53djij086rbp49klzckc4zs4ph4cjwcpjhgq"; }; + meta.homepage = "https://github.com/lifepillar/vim-mucomplete/"; }; vim-multiple-cursors = buildVimPluginFrom2Nix { @@ -4829,6 +5266,7 @@ let rev = "701e92dd4cfd1b0f511e83a96d52bc590c0218dd"; sha256 = "0a7fghk025f8gj5rsixi1hn8vkg2982fja7maf427v3wq74s6j1c"; }; + meta.homepage = "https://github.com/terryma/vim-multiple-cursors/"; }; vim-nerdtree-tabs = buildVimPluginFrom2Nix { @@ -4840,6 +5278,7 @@ let rev = "07d19f0299762669c6f93fbadb8249da6ba9de62"; sha256 = "16iqhp5l6xvq0k8bq9ngqfhish1fwggpmvd7ni1fh5dqr00iii9x"; }; + meta.homepage = "https://github.com/jistr/vim-nerdtree-tabs/"; }; vim-nftables = buildVimPluginFrom2Nix { @@ -4851,6 +5290,7 @@ let rev = "01c7b97eff12fd4b624e6efa2c0468163db61ebc"; sha256 = "1n3mpaa60k4w0sqpkgw19aksa1sbcqz7vl8fp6bj6i63bhiprsqf"; }; + meta.homepage = "https://github.com/nfnty/vim-nftables/"; }; vim-niceblock = buildVimPluginFrom2Nix { @@ -4862,6 +5302,7 @@ let rev = "9302f527eefc0fde8df983cbb9710ad52c4213b5"; sha256 = "1d0rx7s10jl1q9y5s4235imizbyxrgkm4dxh5ankcr8s617l7mz2"; }; + meta.homepage = "https://github.com/kana/vim-niceblock/"; }; vim-ninja-feet = buildVimPluginFrom2Nix { @@ -4873,6 +5314,7 @@ let rev = "5b48f97bf4865a25f5f4568c45cdfd08f946ec4f"; sha256 = "1i3n5nlwyg65k0f0qrimbfs67l2xx39cqp4gyrycw4vzp6hs0lsc"; }; + meta.homepage = "https://github.com/tommcdo/vim-ninja-feet/"; }; vim-nix = buildVimPluginFrom2Nix { @@ -4884,6 +5326,7 @@ let rev = "a3eed01f4de995a51dfdd06287e44fcb231f6adf"; sha256 = "0pwdfwws1dj3705m00ghw3dvym5zbm00bfsj023gmbp6vr8wn6yi"; }; + meta.homepage = "https://github.com/LnL7/vim-nix/"; }; vim-obsession = buildVimPluginFrom2Nix { @@ -4895,6 +5338,7 @@ let rev = "96a3f837c112cb64e0a9857b69f6d6a71041155e"; sha256 = "11h7jyg7fhjmq3pmpc93nrsxm175ra14407rs3558h8p04snc159"; }; + meta.homepage = "https://github.com/tpope/vim-obsession/"; }; vim-one = buildVimPluginFrom2Nix { @@ -4906,6 +5350,7 @@ let rev = "6695e135415c53a8fbe96672e382200aa1ffb4b4"; sha256 = "0951r9kw23zlwd7fda6ib2d9k0akpfd2hvh82pasgw3ks9v1n2vf"; }; + meta.homepage = "https://github.com/rakr/vim-one/"; }; vim-operator-replace = buildVimPluginFrom2Nix { @@ -4917,6 +5362,7 @@ let rev = "1345a556a321a092716e149d4765a5e17c0e9f0f"; sha256 = "07cibp61zwbzpjfxqdc77fzrgnz8jhimmdhhyjr0lvgrjgvsnv6q"; }; + meta.homepage = "https://github.com/kana/vim-operator-replace/"; }; vim-operator-surround = buildVimPluginFrom2Nix { @@ -4928,6 +5374,7 @@ let rev = "80337a40a829cfc77b065a71d8a609e2ad7d2c8b"; sha256 = "0f9shg81bl39hz67ahbi6k6gbhky7gzp8by16fhiz75hbjgp9lq2"; }; + meta.homepage = "https://github.com/rhysd/vim-operator-surround/"; }; vim-operator-user = buildVimPluginFrom2Nix { @@ -4939,6 +5386,7 @@ let rev = "c3dfd41c1ed516b4b901c97562e644de62c367aa"; sha256 = "16y2fyrmwg4vkcl85i8xg8s6m39ca2jvgi9qm36b3vzbnkcifafb"; }; + meta.homepage = "https://github.com/kana/vim-operator-user/"; }; vim-orgmode = buildVimPluginFrom2Nix { @@ -4950,6 +5398,7 @@ let rev = "44faafa1d846691645b66e83f198f46afa755a6e"; sha256 = "1s649hksrwq70xyi8cvcd9bqcfyczga5c1g4fsas50rs107fcccn"; }; + meta.homepage = "https://github.com/jceb/vim-orgmode/"; }; vim-pager = buildVimPluginFrom2Nix { @@ -4961,17 +5410,19 @@ let rev = "a657d508b4d5a23aada7585c9f1e0063914c0c45"; sha256 = "10xm77pia916zf9i2llyhs89s653r98l6zq8cswm7cw61bjfxvv6"; }; + meta.homepage = "https://github.com/lambdalisue/vim-pager/"; }; vim-pandoc = buildVimPluginFrom2Nix { pname = "vim-pandoc"; - version = "2020-03-20"; + version = "2020-04-17"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "c473c298d570622d520f455698a95356e55d6dcf"; - sha256 = "1j4plsm7md6yhis8bmgznwln12gnnm0lg9wvxgydqd6wxrc6hfnd"; + rev = "c6e2ddb1318cc141b2d84d630e493a14df942ea1"; + sha256 = "15ci141jiv84ibrg1v98as1k376cnx06p1zp50w1qmccv696n8nv"; }; + meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/"; }; vim-pandoc-after = buildVimPluginFrom2Nix { @@ -4983,6 +5434,7 @@ let rev = "26513a138d5e2ba8c785e0d7dfec0218e983e9dd"; sha256 = "07wg4j2kx08s9hvvp8jspwb0v7fgac8m8cjr3y1sbq8ca18bkvgy"; }; + meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-after/"; }; vim-pandoc-syntax = buildVimPluginFrom2Nix { @@ -4994,6 +5446,7 @@ let rev = "0d1129e5cf1b0e3a90e923c3b5f40133bf153f7c"; sha256 = "162l2p8md8lfyfjxzlmlz5ky5kvvr6wjmdk8r8lk6ygpkl2b51f7"; }; + meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-syntax/"; }; vim-parinfer = buildVimPluginFrom2Nix { @@ -5005,6 +5458,7 @@ let rev = "a8c075ce5256bffbf1f62e08aba37dca88d0cf1a"; sha256 = "1v2pyjyxvqw2kl9j4pdpdlbl2q3jnndcb8iqgyygs7jn91c4s073"; }; + meta.homepage = "https://github.com/bhurlow/vim-parinfer/"; }; vim-pasta = buildVimPluginFrom2Nix { @@ -5016,6 +5470,7 @@ let rev = "cb4501a123d74fc7d66ac9f10b80c9d393746c66"; sha256 = "14rswwx24i75xzgkbx1hywan1msn2ki26353ly2pyvznnqss1pwq"; }; + meta.homepage = "https://github.com/sickill/vim-pasta/"; }; vim-pathogen = buildVimPluginFrom2Nix { @@ -5027,6 +5482,7 @@ let rev = "c6bc42404597c718e4a032a98e21e63321cbb05a"; sha256 = "1scj84vlrn2kavnq2wabhdzhnlkb3w046grv9j3976i5ykjmyiif"; }; + meta.homepage = "https://github.com/tpope/vim-pathogen/"; }; vim-peekaboo = buildVimPluginFrom2Nix { @@ -5038,6 +5494,7 @@ let rev = "cc4469c204099c73dd7534531fa8ba271f704831"; sha256 = "11lgf60v2kj772d9azkfddypwidcgfps5mvnhmp4gg0fmfx12h99"; }; + meta.homepage = "https://github.com/junegunn/vim-peekaboo/"; }; vim-pencil = buildVimPluginFrom2Nix { @@ -5049,6 +5506,7 @@ let rev = "09458527601fdb2fbd174317bdddfb34e4c64e79"; sha256 = "09b30cxlwbr9l07ya05is9q2y9vzbzhcc656nvjjzf968l496xr2"; }; + meta.homepage = "https://github.com/reedes/vim-pencil/"; }; vim-phabricator = buildVimPluginFrom2Nix { @@ -5060,6 +5518,7 @@ let rev = "065c7e3f2d92a6792b50f087393b2c9a10a1e825"; sha256 = "0yhf347fhrs0aqsq1swqihyav32442lv2chzjr3mzqcym8zbzsh6"; }; + meta.homepage = "https://github.com/jparise/vim-phabricator/"; }; vim-pico8-syntax = buildVimPluginFrom2Nix { @@ -5071,6 +5530,7 @@ let rev = "dbdd92fad0533eeaeaea844815d4de11e9507ce7"; sha256 = "0say0bb74rdbabgsf7rrbm8x841pmgh80fwr6kn94fgphr3vhm0s"; }; + meta.homepage = "https://github.com/justinj/vim-pico8-syntax/"; }; vim-plug = buildVimPluginFrom2Nix { @@ -5082,6 +5542,7 @@ let rev = "e718868e85e2a32410144dfcdc3ba1303719450d"; sha256 = "1znaapjdz9nwgvr5il6rck82mz4dhj1nan87w2216xwpp53w61fb"; }; + meta.homepage = "https://github.com/junegunn/vim-plug/"; }; vim-plugin-AnsiEsc = buildVimPluginFrom2Nix { @@ -5093,17 +5554,19 @@ let rev = "690f820d20b6e3a79ba20499874eb7333aa4ca5c"; sha256 = "05sf9xh7zs475kykz1hsp0xp7iiclp7pdiy3bpx7wlfp9z71bd9p"; }; + meta.homepage = "https://github.com/powerman/vim-plugin-AnsiEsc/"; }; vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2020-03-05"; + version = "2020-04-14"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "e86e0ad36ef9501acbc3e8c63a1d4fab104e47cb"; - sha256 = "0xr0fv26bxas315bvz0fkw11cg5j301vmy02a2aii90ljvyviv77"; + rev = "14dc82fc4e6c0c08078f97a24a6c1639c1cc5113"; + sha256 = "0cx9wvv8ca589wna7yy0qx0hc0c9g42y50fxa0y7vyw3wwkq8q7n"; }; + meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; vim-prettyprint = buildVimPluginFrom2Nix { @@ -5115,6 +5578,7 @@ let rev = "d6060d2b1ff1cff71714e126addd3b10883ade12"; sha256 = "0mb1ylsq4023ik9wd9iwzlynra2c320xp9h2i79bspapglgd5gk9"; }; + meta.homepage = "https://github.com/thinca/vim-prettyprint/"; }; vim-projectionist = buildVimPluginFrom2Nix { @@ -5126,17 +5590,19 @@ let rev = "17a8b2078a9ca1410d2080419e1cb9c9bb2e4492"; sha256 = "1vf3jdcfiq27k9mdwlvsm2hn1xgxr79ckq3jqq00avj50bpdzs1z"; }; + meta.homepage = "https://github.com/tpope/vim-projectionist/"; }; vim-prosession = buildVimPluginFrom2Nix { pname = "vim-prosession"; - version = "2019-11-01"; + version = "2020-04-20"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-prosession"; - rev = "84df77d6470491a67f926b9a6a6a8cc675c161ac"; - sha256 = "03p5ncdah3mxd2dxrqprd14gzyy2qlvf9y5hcsdcakf2hhsrxvlg"; + rev = "95f78bd0f719fee96569f30fd5f4199c4461efb7"; + sha256 = "1ix04f3nxxmxd36kzalx0hrbks30v44ydz15apvl1h8l8663hda2"; }; + meta.homepage = "https://github.com/dhruvasagar/vim-prosession/"; }; vim-protobuf = buildVimPluginFrom2Nix { @@ -5148,6 +5614,7 @@ let rev = "0d0f4e4b4087e0e608066aa2ba295e396d039931"; sha256 = "1vh9f34rb7pg6dc64xhr102yig6y03is74777av464bhq651z7p5"; }; + meta.homepage = "https://github.com/uarun/vim-protobuf/"; }; vim-ps1 = buildVimPluginFrom2Nix { @@ -5159,6 +5626,7 @@ let rev = "9fdf92846fbeb8445e535cf0c5bdb4b1dce4a506"; sha256 = "0w98zcjvb64fhd6ahy3cqrs4y7zacak9nzpkkhr03l6zzbqb5kz4"; }; + meta.homepage = "https://github.com/PProvost/vim-ps1/"; }; vim-pug = buildVimPluginFrom2Nix { @@ -5170,6 +5638,7 @@ let rev = "ea39cd942cf3194230cf72bfb838901a5344d3b3"; sha256 = "07141jkfnaia4ydc6qcg0bc06w720l2lzl7bm4bsjwswqrzmhfam"; }; + meta.homepage = "https://github.com/digitaltoad/vim-pug/"; }; vim-puppet = buildVimPluginFrom2Nix { @@ -5181,6 +5650,7 @@ let rev = "fc6e9efef797c505b2e67631ad2517d7d6e8f00d"; sha256 = "0a4qv8f74g6c2i9l6kv3zbcq9lskhdqg86w12f8hshw1vkfmfr4x"; }; + meta.homepage = "https://github.com/rodjek/vim-puppet/"; }; vim-python-pep8-indent = buildVimPluginFrom2Nix { @@ -5192,6 +5662,7 @@ let rev = "60ba5e11a61618c0344e2db190210145083c91f8"; sha256 = "1blyhkykfnf4pgfq9hn9l8pq0iqdvig9m4zd8qq9aa9rlm8f0kzh"; }; + meta.homepage = "https://github.com/Vimjas/vim-python-pep8-indent/"; }; vim-qml = buildVimPluginFrom2Nix { @@ -5203,6 +5674,7 @@ let rev = "b04de1dadb7dfe372d22f7529a001af1b5e19f4f"; sha256 = "1pxl70l0g4i8cbnpjhb9pyjhz982flkrng07y9xwzbdl2jx42i8s"; }; + meta.homepage = "https://github.com/peterhoeg/vim-qml/"; }; vim-quickrun = buildVimPluginFrom2Nix { @@ -5214,6 +5686,7 @@ let rev = "f637c35b16d6e83cc71dababbda2a64eb29b3f5e"; sha256 = "0yf9acqcj3x62qchz0z9mwgf1af5vz39kyzhv5jh1mc0vwksrdwl"; }; + meta.homepage = "https://github.com/thinca/vim-quickrun/"; }; vim-racer = buildVimPluginFrom2Nix { @@ -5225,6 +5698,7 @@ let rev = "950b78f36e568134f5dcabc9a146c61e0084d220"; sha256 = "0k62yybilh2052w6zfscw7daz7y1qnqv1311zngjim5z8xmp7j1l"; }; + meta.homepage = "https://github.com/racer-rust/vim-racer/"; }; vim-repeat = buildVimPluginFrom2Nix { @@ -5236,6 +5710,7 @@ let rev = "c947ad2b6a16983724a0153bdf7f66d7a80a32ca"; sha256 = "00hhbqcx21j0738ad5xh92lsykpa0qxhdy1s7wnwc8d3jndmyjwb"; }; + meta.homepage = "https://github.com/tpope/vim-repeat/"; }; vim-rhubarb = buildVimPluginFrom2Nix { @@ -5247,17 +5722,19 @@ let rev = "5130596a65330a4e8523d3ac1582f6c31ea6bc63"; sha256 = "1hpyxcmwrjxhkgkb0w2qpg8gh9bgiqwddyj4zx8hy2g8qnx7z5yj"; }; + meta.homepage = "https://github.com/tpope/vim-rhubarb/"; }; vim-rooter = buildVimPluginFrom2Nix { pname = "vim-rooter"; - version = "2020-02-17"; + version = "2020-04-17"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-rooter"; - rev = "8a0a201a17fae3f7656b99f74d67741986faba37"; - sha256 = "1r8kzzljs39ycc6jjh5anpl2gw73c2wb1bs8hjv6xnw1scln6gwq"; + rev = "d64f3e04df9914e784508019a1a1f291cbb40bd4"; + sha256 = "1vwydkjm5h12kcnqmg2cv1cqf9hmhmyy2lx5lj3g0g6ra27yfjnw"; }; + meta.homepage = "https://github.com/airblade/vim-rooter/"; }; vim-rsi = buildVimPluginFrom2Nix { @@ -5269,17 +5746,19 @@ let rev = "ad8ba6beae8e82339479104b914214a868c9f1fe"; sha256 = "1ycjwnbs6rks78yxh0k0ywpvic0663mv7kydy3kjpa4f5bnkgbvc"; }; + meta.homepage = "https://github.com/tpope/vim-rsi/"; }; vim-ruby = buildVimPluginFrom2Nix { pname = "vim-ruby"; - version = "2020-04-12"; + version = "2020-04-19"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "3db19e235bff9e6f6e0941836f67416dc761be32"; - sha256 = "045b2gcmbm5kc4c3kalkjc36ck9llrbxjj2amga0041svgzb79sy"; + rev = "fd49b25e08618b58db678c3f8ce6e443b1ad04e7"; + sha256 = "086pzicqal2cmvbrzy09d93c7cz5scgjcqc9xn4cw19dn55irllp"; }; + meta.homepage = "https://github.com/vim-ruby/vim-ruby/"; }; vim-salve = buildVimPluginFrom2Nix { @@ -5291,6 +5770,7 @@ let rev = "876104d364420a7a11a2d97729dd4ab0a2f8a72e"; sha256 = "1hj0qg182jv3cwg85rg4z0f8f8hr409is71z7sxhnhjq9fn1h6xj"; }; + meta.homepage = "https://github.com/tpope/vim-salve/"; }; vim-sandwich = buildVimPluginFrom2Nix { @@ -5302,6 +5782,7 @@ let rev = "02e3b6d1ff9ce346c115166855137b318b63c536"; sha256 = "1jd5i0ykvwf5jnm3g3rm2r0zn64xqk38p2xl55la9a1a99j9mfxh"; }; + meta.homepage = "https://github.com/machakann/vim-sandwich/"; }; vim-sayonara = buildVimPluginFrom2Nix { @@ -5313,6 +5794,7 @@ let rev = "357135ce127581fab2c0caf45d4b3fec4603aa77"; sha256 = "0m4pbpqq7m4rbqj1sxzx3r25znm9m5df6z6kndc6x5c1p27a63pi"; }; + meta.homepage = "https://github.com/mhinz/vim-sayonara/"; }; vim-scala = buildVimPluginFrom2Nix { @@ -5324,6 +5806,7 @@ let rev = "bbdfea4b98fdb8866a8a6060ec1294643cfeb413"; sha256 = "14q8j6vwqad2nwia29d0844v2zdcx04xn9dyicv13sdpivzcm4rb"; }; + meta.homepage = "https://github.com/derekwyatt/vim-scala/"; }; vim-scouter = buildVimPluginFrom2Nix { @@ -5335,6 +5818,7 @@ let rev = "5221901d4ad6b2ef8b370b336db2aa7f69f2b6dc"; sha256 = "0fx64hj1kzrsxz96195d5lm3x88zyycbcr78819mcbgfzyxis6b8"; }; + meta.homepage = "https://github.com/thinca/vim-scouter/"; }; vim-scriptease = buildVimPluginFrom2Nix { @@ -5346,6 +5830,7 @@ let rev = "86f49aca266e4b17420bcadd29009997d15668d8"; sha256 = "0kcv5q4qahqd316h5k81xnf8skn71126x4lw2i6wa2m2653d0k5c"; }; + meta.homepage = "https://github.com/tpope/vim-scriptease/"; }; vim-sensible = buildVimPluginFrom2Nix { @@ -5357,6 +5842,7 @@ let rev = "2d9f34c09f548ed4df213389caa2882bfe56db58"; sha256 = "153i3kh44ri046va3qdrbvvsv7gy25fsd9pc2yhrg23lvj169zfp"; }; + meta.homepage = "https://github.com/tpope/vim-sensible/"; }; vim-sexp = buildVimPluginFrom2Nix { @@ -5368,6 +5854,7 @@ let rev = "12292941903d9ac8151513189d2007e1ccfc95f0"; sha256 = "1mfqbmrbqgnsc34pmcsrc0c5zvgxhhnw4hx4g5wbssfk1ddyx6y0"; }; + meta.homepage = "https://github.com/guns/vim-sexp/"; }; vim-sexp-mappings-for-regular-people = buildVimPluginFrom2Nix { @@ -5379,6 +5866,7 @@ let rev = "7c3de2f13422fb4b62b4c34a660532c7b3d240c7"; sha256 = "0malswal9hnbq2wf1rx2lp1r69wpwsvyhgi46xbg079x2n857bmj"; }; + meta.homepage = "https://github.com/tpope/vim-sexp-mappings-for-regular-people/"; }; vim-signature = buildVimPluginFrom2Nix { @@ -5390,6 +5878,7 @@ let rev = "6bc3dd1294a22e897f0dcf8dd72b85f350e306bc"; sha256 = "08m5dg77yavria7n7iajkj4kqaw848763680003j2gbrjlhpprpm"; }; + meta.homepage = "https://github.com/kshenoy/vim-signature/"; }; vim-signify = buildVimPluginFrom2Nix { @@ -5401,6 +5890,7 @@ let rev = "56db16f8d3825c4d066c2faf05315c2b208cd5f5"; sha256 = "0alargsa6sxdxha6jshax7ff6jy8svzc9yxvsh83f8301zx9vmra"; }; + meta.homepage = "https://github.com/mhinz/vim-signify/"; }; vim-slash = buildVimPluginFrom2Nix { @@ -5412,6 +5902,7 @@ let rev = "31aee09b7ea8893a18fa34f65e63e364fc998444"; sha256 = "0ifdd3yqbk8hdvdmr4k44967lyvjnv9ig3r2145wn1lab797sbl4"; }; + meta.homepage = "https://github.com/junegunn/vim-slash/"; }; vim-sleuth = buildVimPluginFrom2Nix { @@ -5423,6 +5914,7 @@ let rev = "ea3f065f23cd0592062b8226c8fef08b6af3b459"; sha256 = "17w4m6zg1izcs75isy1jdzycgdr1ml1f5wqf1bjq80qgy3f28znp"; }; + meta.homepage = "https://github.com/tpope/vim-sleuth/"; }; vim-slime = buildVimPluginFrom2Nix { @@ -5434,6 +5926,7 @@ let rev = "a81139239d6447b1c021e4873e6a14b47f32b65a"; sha256 = "0wavkm9k2vm23nm5bmc3lpm6cac7mihzjcyk4r77qgdgmnnxkm49"; }; + meta.homepage = "https://github.com/jpalardy/vim-slime/"; }; vim-smalls = buildVimPluginFrom2Nix { @@ -5445,6 +5938,7 @@ let rev = "9619eae81626bd63f88165e0520c467698264e34"; sha256 = "0s5z3zv220cg95yky2av6w0jmpc56ysyhsx0596ksvgz5jwhpbad"; }; + meta.homepage = "https://github.com/t9md/vim-smalls/"; }; vim-smt2 = buildVimPluginFrom2Nix { @@ -5456,6 +5950,7 @@ let rev = "9582e37b1dfd75621e51a3ac2275b6c6c895317f"; sha256 = "0cas6c3pj55qhbcy2vaygg8l9gncjshi1g0a54l78x73d3y3wm03"; }; + meta.homepage = "https://github.com/bohlender/vim-smt2/"; }; vim-sneak = buildVimPluginFrom2Nix { @@ -5467,6 +5962,7 @@ let rev = "98a5c946d6dc76528b9d9b044059b5ef1fab5a48"; sha256 = "0xcxr658i5vzdkxfssd7zx6n3ar9b6dg4b2ddaswgnwq75xphrh9"; }; + meta.homepage = "https://github.com/justinmk/vim-sneak/"; }; vim-snipmate = buildVimPluginFrom2Nix { @@ -5478,17 +5974,19 @@ let rev = "b80367fefc2188c9d6c4a9eb1830360b09e13476"; sha256 = "0qq81hcavmaq76r38qfy1cxlmhj0aswbd41k2k9fyzilzq4r0bg8"; }; + meta.homepage = "https://github.com/garbas/vim-snipmate/"; }; vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2020-04-03"; + version = "2020-04-20"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "b62dfce8449d8a8196720ddd3cfecbca8bb7fe45"; - sha256 = "1c8r8hw4yqdnmn4nx37vdrjwc725qqr5rbzzxq8wl0min5c4lq1c"; + rev = "dbfffb971b46bfb9bc90763d4ccad97e3277cd7b"; + sha256 = "0rmpf1lrrq57pai2vn0q9qig73kdq7l54iar1qk46f7wxy3wi1dw"; }; + meta.homepage = "https://github.com/honza/vim-snippets/"; }; vim-solidity = buildVimPluginFrom2Nix { @@ -5500,6 +5998,7 @@ let rev = "569bbbedc3898236d5912fed0caf114936112ae4"; sha256 = "1qpfbbrm4gjgvbkimhpxyl4fsdqkyw4raf17nw0ibqillz2d3pxx"; }; + meta.homepage = "https://github.com/tomlion/vim-solidity/"; }; vim-sort-motion = buildVimPluginFrom2Nix { @@ -5511,6 +6010,7 @@ let rev = "49dfcabeee2bf3a85a6cc0774b35f687b6c9d0e5"; sha256 = "02v12iqy3gjhvh5aza6b6b3pfv2qkyyw83bxqjgbjj002f71ydkb"; }; + meta.homepage = "https://github.com/christoomey/vim-sort-motion/"; }; vim-sourcetrail = buildVimPluginFrom2Nix { @@ -5522,6 +6022,7 @@ let rev = "0fd679321ce51f65a37d04e4ea9031be6eaed85d"; sha256 = "1xgvvmah3zn22rjaa093vghwrchmpm5wj30lwwl6h398dyywz8bg"; }; + meta.homepage = "https://github.com/CoatiSoftware/vim-sourcetrail/"; }; vim-speeddating = buildVimPluginFrom2Nix { @@ -5533,17 +6034,19 @@ let rev = "fe98cfaa7ea9c4b838d42a6830437c919eb55b4e"; sha256 = "02875qswrmanr7b798ymlc7w60055q0av0qj3fh7fvpqhsqpg52k"; }; + meta.homepage = "https://github.com/tpope/vim-speeddating/"; }; vim-startify = buildVimPluginFrom2Nix { pname = "vim-startify"; - version = "2019-12-07"; + version = "2020-04-18"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-startify"; - rev = "05122f08c6a553992f7b0a9ad88016a89f51548a"; - sha256 = "09kg1zf5lmwlksqz11scnjazg5d862fjip48qakjbabf66f23svs"; + rev = "593388d3dbe7bfdcc06a714550d3253442b2fc65"; + sha256 = "1k0sgx8r3gi3k4ira1ilvc1jmj0k5apiv7x71dqnh41gfrz1i12h"; }; + meta.homepage = "https://github.com/mhinz/vim-startify/"; }; vim-stylish-haskell = buildVimPluginFrom2Nix { @@ -5555,6 +6058,7 @@ let rev = "ef12ab024cb3928ae57ce7c4fa519c4751afef99"; sha256 = "0ysz68v4c2i4kxchsvxgkpj5kb0jbm5x06ri1ns9cmk5gj01pmd6"; }; + meta.homepage = "https://github.com/nbouscal/vim-stylish-haskell/"; }; vim-stylishask = buildVimPluginFrom2Nix { @@ -5566,6 +6070,7 @@ let rev = "dcc12c724cec7f8aee7ad197752710eaa3bfd12c"; sha256 = "09k1n6r9gy3jikss84y141dqqsgc1a1ia89jj0367an53pfl6dn2"; }; + meta.homepage = "https://github.com/alx741/vim-stylishask/"; }; vim-subversive = buildVimPluginFrom2Nix { @@ -5577,6 +6082,7 @@ let rev = "4a2020248c8a09950b7e1a2cd864ffb88826572c"; sha256 = "0pqrb3hz1hjl42khn4691s3ajlswk6nms43hdbglj679y28bkzfi"; }; + meta.homepage = "https://github.com/svermeulen/vim-subversive/"; }; vim-surround = buildVimPluginFrom2Nix { @@ -5588,6 +6094,7 @@ let rev = "f51a26d3710629d031806305b6c8727189cd1935"; sha256 = "0aqrqn35xdiy80y7skxfsh3m33n6cdxw6lzz6aspfgzwllx2f0kr"; }; + meta.homepage = "https://github.com/tpope/vim-surround/"; }; vim-swap = buildVimPluginFrom2Nix { @@ -5599,6 +6106,7 @@ let rev = "e52ff679c88f4aa7a7afe77fb42af78c93ed33c8"; sha256 = "0rqvxqqk961syawmyc2qdfb4w9ilb1r3mxxij2ja1jbhl1f3w4vq"; }; + meta.homepage = "https://github.com/machakann/vim-swap/"; }; vim-SyntaxRange = buildVimPluginFrom2Nix { @@ -5610,17 +6118,19 @@ let rev = "dc33d8f84ebbf4c9fa03ce00b8adeb83e05249d3"; sha256 = "0nf0hkgl5fm0laxb5253br894259kz33zyiwxzrry6w3108alasr"; }; + meta.homepage = "https://github.com/inkarkat/vim-SyntaxRange/"; }; vim-table-mode = buildVimPluginFrom2Nix { pname = "vim-table-mode"; - version = "2020-03-02"; + version = "2020-04-19"; src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-table-mode"; - rev = "6412352b544bda764a9616c3090abb09729526bc"; - sha256 = "1z5v849vjbk4mdgkxs73b2nnvmqx7l6h3ycdb16qdhp9kppwmbvv"; + rev = "6a6f3565c3bd6ea903c9824b8e9367fcdeb7a7b5"; + sha256 = "0vxkakix6r4x1a4ipzhpr7ix7fxz2bqaskwkpmgap12wy5qg3rzs"; }; + meta.homepage = "https://github.com/dhruvasagar/vim-table-mode/"; }; vim-tabpagecd = buildVimPluginFrom2Nix { @@ -5632,6 +6142,7 @@ let rev = "8b71a03a037608fa5918f5096812577cec6355e4"; sha256 = "1mr6s2hvsf2a2nkjjvq78c9isfxk2k1ih890w740srbq6ssj0npm"; }; + meta.homepage = "https://github.com/kana/vim-tabpagecd/"; }; vim-tbone = buildVimPluginFrom2Nix { @@ -5643,6 +6154,7 @@ let rev = "82b0118772a87b659a6af49b26b0c4817ec7eccf"; sha256 = "0pbj4v6zhlpcxm10jcq50jf2rpqiyp2x0zpxa50s6y6gm834v9wc"; }; + meta.homepage = "https://github.com/tpope/vim-tbone/"; }; vim-terraform = buildVimPluginFrom2Nix { @@ -5654,17 +6166,19 @@ let rev = "89c47c6c68f6260ba34ee0733437d863046fbe95"; sha256 = "1gkr3akvx44802i8cv4zw8j3bk5qk0h0rgz5k9jgkfch2yc76gzg"; }; + meta.homepage = "https://github.com/hashivim/vim-terraform/"; }; vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2020-04-09"; + version = "2020-04-19"; src = fetchFromGitHub { owner = "janko"; repo = "vim-test"; - rev = "692b4b879520299ceffeaebb9b28173b75bf48da"; - sha256 = "0lkng56y1wi29jp595jx5vib9zmnsagjczsdl434dn3hakm76plq"; + rev = "42c216487a2a13dce04e84534461cc1cf96fa774"; + sha256 = "0912d62frdjm488sybhafl113xh4npylzk0gzblbgdi0fl2f9i52"; }; + meta.homepage = "https://github.com/janko/vim-test/"; }; vim-textobj-comment = buildVimPluginFrom2Nix { @@ -5676,6 +6190,7 @@ let rev = "58ae4571b76a5bf74850698f23d235eef991dd4b"; sha256 = "00wc14chwjfx95gl3yzbxm1ajx88zpzqz0ckl7xvd7gvkrf0mx04"; }; + meta.homepage = "https://github.com/glts/vim-textobj-comment/"; }; vim-textobj-function = buildVimPluginFrom2Nix { @@ -5687,6 +6202,7 @@ let rev = "adb50f38499b1f558cbd58845e3e91117e4538cf"; sha256 = "0cwl102si9zhhhpg6c0fjnyq35v6bl5f34p2s7b47isxdn0qvris"; }; + meta.homepage = "https://github.com/kana/vim-textobj-function/"; }; vim-textobj-haskell = buildVimPluginFrom2Nix { @@ -5698,6 +6214,7 @@ let rev = "ca656e98ea31e201f5bc543909398a6c8bb5d537"; sha256 = "096pjjl3ngw0hsh59j2x6pdrpqvp657rcxfyl9kw13ndqyd867xs"; }; + meta.homepage = "https://github.com/gibiansky/vim-textobj-haskell/"; }; vim-textobj-multiblock = buildVimPluginFrom2Nix { @@ -5709,6 +6226,7 @@ let rev = "670a5ba57d73fcd793f480e262617c6eb0103355"; sha256 = "1s71hdr73cl8yg9mrdflvzrdccpiv7qrlainai7gqw30r1hfhfzf"; }; + meta.homepage = "https://github.com/osyo-manga/vim-textobj-multiblock/"; }; vim-textobj-user = buildVimPluginFrom2Nix { @@ -5720,6 +6238,7 @@ let rev = "41a675ddbeefd6a93664a4dc52f302fe3086a933"; sha256 = "1y1g3vcm97fqjyigiajbvbck4nlc04vxl3535x4sl40s5jbm5vz3"; }; + meta.homepage = "https://github.com/kana/vim-textobj-user/"; }; vim-textobj-variable-segment = buildVimPluginFrom2Nix { @@ -5731,6 +6250,7 @@ let rev = "78457d4322b44bf89730e708b62b69df48c39aa3"; sha256 = "14dcrnk83hj4ixrkdgjrk9cf0193f82wqckdzd4w0b76adf3habj"; }; + meta.homepage = "https://github.com/Julian/vim-textobj-variable-segment/"; }; vim-themis = buildVimPluginFrom2Nix { @@ -5742,6 +6262,7 @@ let rev = "2d10aee9c9982f4f5974e88351934759c69640e7"; sha256 = "06ab0kjamzpyql71qmc8qhvb72rx07x2g598aidk8nqkk36x87ai"; }; + meta.homepage = "https://github.com/thinca/vim-themis/"; }; vim-tmux = buildVimPluginFrom2Nix { @@ -5753,6 +6274,7 @@ let rev = "4e77341a2f8b9b7e41e81e9debbcecaea5987c85"; sha256 = "16fgc0lx1jr8zbayanf5w677ssiw5xb8vwfaca295c8xlk760c3m"; }; + meta.homepage = "https://github.com/tmux-plugins/vim-tmux/"; }; vim-tmux-focus-events = buildVimPluginFrom2Nix { @@ -5764,6 +6286,7 @@ let rev = "e80960715c09aef8ab9204848ed1683805a93a33"; sha256 = "0ds6qw2i1r67jhxh9ff36al45bafsmbxxdc127l6iy2vl5wj0d3d"; }; + meta.homepage = "https://github.com/tmux-plugins/vim-tmux-focus-events/"; }; vim-tmux-navigator = buildVimPluginFrom2Nix { @@ -5775,6 +6298,7 @@ let rev = "8fdf78292bb3aed1c9de880be7e03efdbf23d306"; sha256 = "0y92na4dcfcsj5zbs3m7y6csl3sd46a9968id78cdn9cgg8iwzac"; }; + meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/"; }; vim-togglelist = buildVimPluginFrom2Nix { @@ -5786,6 +6310,7 @@ let rev = "cafedc49860950200f28f2e1d95ab6a87b79d113"; sha256 = "17y4ply2irz81gjv5hb51dy7wzv3l3sq6qaska31lswd5dgh1ifg"; }; + meta.homepage = "https://github.com/milkypostman/vim-togglelist/"; }; vim-toml = buildVimPluginFrom2Nix { @@ -5797,6 +6322,7 @@ let rev = "a4ec206052aa347d7df90dc4b6697b7f2b7929bc"; sha256 = "1dgykq4vl7vvj2f8lvg58rzqddm53i278g26ljwfimgqc8l6gmqd"; }; + meta.homepage = "https://github.com/cespare/vim-toml/"; }; vim-trailing-whitespace = buildVimPluginFrom2Nix { @@ -5808,6 +6334,7 @@ let rev = "6b7cdecff252474fe560d32c6f05641f3c5952c7"; sha256 = "0arv1hmlw7c1rlkc00hzjyg48pg8g4cc9q9l2hy8kpmsl037akm3"; }; + meta.homepage = "https://github.com/bronson/vim-trailing-whitespace/"; }; vim-tsx = buildVimPluginFrom2Nix { @@ -5819,6 +6346,7 @@ let rev = "77c89c42e189fefd3c9a632b37b7e3b3b9edf918"; sha256 = "0wmd6gql57bxp868sq2dchp9sc3jbisr4vaz4y0lczhmk0prds6n"; }; + meta.homepage = "https://github.com/ianks/vim-tsx/"; }; vim-twig = buildVimPluginFrom2Nix { @@ -5830,6 +6358,7 @@ let rev = "ad115512725bcc156f7f89b72ff563b9fa44933b"; sha256 = "1p7sfhk0mwx4xk88b29ijb9nfbjwsf6hf3nab2ybcw291qaa75nj"; }; + meta.homepage = "https://github.com/lumiliet/vim-twig/"; }; vim-unimpaired = buildVimPluginFrom2Nix { @@ -5841,6 +6370,7 @@ let rev = "08e66532bffed445c949ae0a0501940c000553ed"; sha256 = "0sm5rv6z0s80l9c39hijhnfggvgmi24ac6d9a1k58pzjz6i9w2vr"; }; + meta.homepage = "https://github.com/tpope/vim-unimpaired/"; }; vim-vinegar = buildVimPluginFrom2Nix { @@ -5852,6 +6382,7 @@ let rev = "fcce70f1403ba4101668a4c960c577bddbd00f06"; sha256 = "0zxqdyla40xcp0ps362b85bqwl3mp4zfmfdggl0gwvgd5m949yk0"; }; + meta.homepage = "https://github.com/tpope/vim-vinegar/"; }; vim-visual-increment = buildVimPluginFrom2Nix { @@ -5863,17 +6394,19 @@ let rev = "e50e8f7c062cec759f665278eb58535df1611a23"; sha256 = "1gd6mxp9y80wf7nxcm02104l54gqz5k3dgv1h98jl9a7q9swb8y6"; }; + meta.homepage = "https://github.com/triglav/vim-visual-increment/"; }; vim-visual-multi = buildVimPluginFrom2Nix { pname = "vim-visual-multi"; - version = "2020-04-06"; + version = "2020-04-21"; src = fetchFromGitHub { owner = "mg979"; repo = "vim-visual-multi"; - rev = "4b8e769b52922a17de4ef0ddb7aeacc18386a246"; - sha256 = "1xjcz3dzwxlpaw8pz8mjn1cfp9822c8yvjwws6m4bzalqr0a14a4"; + rev = "5983497180ce1406997e5329f526f40f76b21121"; + sha256 = "0hrc3kwrk65hdnapp056kxwzizifzdy9zsqn242d81nzymfa6353"; }; + meta.homepage = "https://github.com/mg979/vim-visual-multi/"; }; vim-visualstar = buildVimPluginFrom2Nix { @@ -5885,6 +6418,7 @@ let rev = "a18cd0e7a03311ac709595c1d261ed44b45c9098"; sha256 = "0yz6ci4i84xxrgazjfa5nsj3q8733p0b6vwcljk1l7ghdfiflvy4"; }; + meta.homepage = "https://github.com/thinca/vim-visualstar/"; }; vim-vue = buildVimPluginFrom2Nix { @@ -5896,6 +6430,7 @@ let rev = "c424294e769b26659176065f9713c395731f7b3a"; sha256 = "1ig8qacavr15i6z7whlkf2ivw5smnqsw3jwhh4dg5q6037k1hjh1"; }; + meta.homepage = "https://github.com/posva/vim-vue/"; }; vim-wakatime = buildVimPluginFrom2Nix { @@ -5907,6 +6442,7 @@ let rev = "dd74c71cd2ea23b4a6cba4b05c873983c16e297c"; sha256 = "1dc04vmpv62x2rfnfad2y60l5xzpw0167pbii9kss6n6ra81gayr"; }; + meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; vim-watchdogs = buildVimPluginFrom2Nix { @@ -5918,6 +6454,7 @@ let rev = "8ee2af37095af08376ba2409da152c2a36a4ee90"; sha256 = "1hvgqdcnnz09afbas5brwls2sifs8y78jmq44ldgsjny9l445df4"; }; + meta.homepage = "https://github.com/osyo-manga/vim-watchdogs/"; }; vim-which-key = buildVimPluginFrom2Nix { @@ -5929,6 +6466,7 @@ let rev = "4b70b443ba5838b165f90e26f9ed628d7d05e11d"; sha256 = "197rp20hngrq7qdlii0ai4vb81dlilah0q1wlil8hv3qcf4az7qr"; }; + meta.homepage = "https://github.com/liuchengxu/vim-which-key/"; }; vim-wordy = buildVimPluginFrom2Nix { @@ -5940,6 +6478,7 @@ let rev = "f0391713fa83771d64b065868331ef4754d861ed"; sha256 = "0v5cl3rrg2vrdb2al67hbh730rw8m2zvhb1vippv64k65mknkgp5"; }; + meta.homepage = "https://github.com/reedes/vim-wordy/"; }; vim-xdebug = buildVimPluginFrom2Nix { @@ -5951,6 +6490,7 @@ let rev = "a4980fa65f7f159780593ee37c178281691ba2c4"; sha256 = "1qh18r0sm4gh95sjbi2hnflvxdl4gk00jyy3n7z4i1gnx9ihxjqw"; }; + meta.homepage = "https://github.com/joonty/vim-xdebug/"; }; vim-xkbswitch = buildVimPluginFrom2Nix { @@ -5962,6 +6502,7 @@ let rev = "b9839555f70d319b4e21fc7bc9b559d91cf1260a"; sha256 = "1ql8yv8rxpr9j9phf4jddqs1j81vcb9gpp0p3fmy6f8nf4b26nvw"; }; + meta.homepage = "https://github.com/lyokha/vim-xkbswitch/"; }; vim-yaml = buildVimPluginFrom2Nix { @@ -5973,6 +6514,7 @@ let rev = "8fc9136a9c3f64b3e65bb6170391f9daf2c23056"; sha256 = "08bg7mxvgrl070m0kk4rmain7h3rv712jj6lk9l808cfjzaw9343"; }; + meta.homepage = "https://github.com/stephpy/vim-yaml/"; }; vim-yapf = buildVimPluginFrom2Nix { @@ -5984,6 +6526,7 @@ let rev = "b0c31bd73a6d1026765e659bd0a62c625ec057ad"; sha256 = "0ncv6kjyywljsq5fz71rkmgmqxm7msyscgndnj055bnx5sh9wk80"; }; + meta.homepage = "https://github.com/mindriot101/vim-yapf/"; }; vim2hs = buildVimPluginFrom2Nix { @@ -5995,6 +6538,7 @@ let rev = "f2afd55704bfe0a2d66e6b270d247e9b8a7b1664"; sha256 = "18lqrl3hqb6cmizc04bbnsh8j0g761w2q8wascbzzfw80dmxy36b"; }; + meta.homepage = "https://github.com/dag/vim2hs/"; }; vimacs = buildVimPluginFrom2Nix { @@ -6006,6 +6550,7 @@ let rev = "7b8e297722d55089f0f0535fe6422533c98112fb"; sha256 = "0x92jcpdlvxhhdpwkv7ig9ya7s96yqjy6ms9xnx8djkf12xql16f"; }; + meta.homepage = "https://github.com/andrep/vimacs/"; }; vimagit = buildVimPluginFrom2Nix { @@ -6017,6 +6562,7 @@ let rev = "bf7b16e99e075b019e56f2fbfb96c493ca3635e2"; sha256 = "1f7gvlhrvvkf69y5vfrkvidhx8aa03n1aqmdhk9qjd6sglfg5w0i"; }; + meta.homepage = "https://github.com/jreybert/vimagit/"; }; vimelette = buildVimPluginFrom2Nix { @@ -6028,6 +6574,7 @@ let rev = "662f47fe0da2625dc743532832fa39f490388fa7"; sha256 = "094xyqba64dndgr5gfcqp6hy3siw90niyrrwz0avs924abss6adg"; }; + meta.homepage = "https://github.com/gotcha/vimelette/"; }; vimfiler-vim = buildVimPluginFrom2Nix { @@ -6039,6 +6586,7 @@ let rev = "26d3fec10cb8921d510064411784301794229a93"; sha256 = "0iv1smk0999sfm3iqdlpb2il74l01lxfahwg87g7h3gq9frky2wd"; }; + meta.homepage = "https://github.com/Shougo/vimfiler.vim/"; }; VimOrganizer = buildVimPluginFrom2Nix { @@ -6050,6 +6598,7 @@ let rev = "cab0baf635eb9470e62d57d42f2d470180b06c8d"; sha256 = "0qncr00xn7lj1i469fzjaaghhqrlyg5s2wj4v6625dhg98y0irix"; }; + meta.homepage = "https://github.com/hsitz/VimOrganizer/"; }; vimoutliner = buildVimPluginFrom2Nix { @@ -6061,6 +6610,7 @@ let rev = "1031b16e6b0069229fe0f33a66489f81174fa4d9"; sha256 = "1gn21b8yr0bjg0y1nidk13zcl4f6z8wkrxncgkd1hlc14d99jkg0"; }; + meta.homepage = "https://github.com/vimoutliner/vimoutliner/"; }; vimpreviewpandoc = buildVimPluginFrom2Nix { @@ -6072,6 +6622,7 @@ let rev = "3b0a589140abf6cc5d19ad678a7f01822bbee34e"; sha256 = "15yjr01wfnhaqw1k8bgxk04vvh76y13zfms66irpihw79f9yzxi9"; }; + meta.homepage = "https://github.com/tex/vimpreviewpandoc/"; }; vimproc-vim = buildVimPluginFrom2Nix { @@ -6083,6 +6634,7 @@ let rev = "51f4664c92f0f1b121127c84d3b1c901e1c698f0"; sha256 = "06nzh4x7j7j3nvw2s4m1gmds0z0bldxbizja91jd43qma9xnwvlk"; }; + meta.homepage = "https://github.com/Shougo/vimproc.vim/"; }; vimshell-vim = buildVimPluginFrom2Nix { @@ -6094,17 +6646,19 @@ let rev = "ee683538f57aaf5094db9860f67f4957a763ffb4"; sha256 = "0inf9xx6ni1scxkn0b78qq0234r0ybrwpphyzcafw7i8kzisbn26"; }; + meta.homepage = "https://github.com/Shougo/vimshell.vim/"; }; vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-04-11"; + version = "2020-04-20"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "bd83ce759828c2bd0e210476717384002b9309ee"; - sha256 = "086j0grj6pqidcl3gaxqcc7njgnzv5z4gshrlisr996dfzyrab2v"; + rev = "f029f673b259206bb04ca71b97e68d9635b1c4ee"; + sha256 = "16m7ab5sy0gb900bf6ydynm1bhi11w60qmscqc66cmmb2hjz0iq2"; }; + meta.homepage = "https://github.com/lervag/vimtex/"; }; vimux = buildVimPluginFrom2Nix { @@ -6116,6 +6670,7 @@ let rev = "37f41195e6369ac602a08ec61364906600b771f1"; sha256 = "0k7ymak2ag67lb4sf80y4k35zj38rj0jf61bf50i6h1bgw987pra"; }; + meta.homepage = "https://github.com/benmills/vimux/"; }; vimwiki = buildVimPluginFrom2Nix { @@ -6127,6 +6682,7 @@ let rev = "64c9f3d36d632b1657616c06ea8f08f14cf6438d"; sha256 = "0wwfl0bafwh9p8lzic75d0nl6v5dnpfid7fbiffr0i72agp0gcq7"; }; + meta.homepage = "https://github.com/vimwiki/vimwiki/"; }; vissort-vim = buildVimPluginFrom2Nix { @@ -6138,17 +6694,19 @@ let rev = "75a5b08b64d2f762206bffd294066533891fa03c"; sha256 = "0a71b22apkhicca9nkd06jlcnqkf583mlpfh2mvl4d474viavqfn"; }; + meta.homepage = "https://github.com/navicore/vissort.vim/"; }; vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2020-04-12"; + version = "2020-04-19"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "5399f850c4c0a1224051e84f6a6cee93055e4e6a"; - sha256 = "13lh8wbyi9gwdn4mj5c88w4jp9jfi2zzxzdlccra67yrb1n3qymj"; + rev = "02b128dd37a63f82732c3a0a9db9b24430ad56af"; + sha256 = "1zmf9yrpxynbvajkv52z3njgzh89j4qx6w8ppnl7bkf4r85k09hl"; }; + meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; Vundle-vim = buildVimPluginFrom2Nix { @@ -6160,6 +6718,7 @@ let rev = "b255382d6242d7ea3877bf059d2934125e0c4d95"; sha256 = "0fkmklcq3fgvd6x6irz9bgyvcdaxafykk3k89gsi9p6b0ikw3rw6"; }; + meta.homepage = "https://github.com/VundleVim/Vundle.vim/"; }; wal-vim = buildVimPluginFrom2Nix { @@ -6171,6 +6730,7 @@ let rev = "10f228ce1e7947f62be412f916229131b7710239"; sha256 = "0aiwsrcqnazam56cvwmck4bf7w543cr219bkmq0ngqzna72h9735"; }; + meta.homepage = "https://github.com/dylanaraps/wal.vim/"; }; webapi-vim = buildVimPluginFrom2Nix { @@ -6182,6 +6742,7 @@ let rev = "10b8e926d85a3ab689c2966a3df1139bcb4e197f"; sha256 = "1hbm2mgsncqdjjfgabgncr4ji90mjsa3z0cx7813vdf113v41x26"; }; + meta.homepage = "https://github.com/mattn/webapi-vim/"; }; wmgraphviz-vim = buildVimPluginFrom2Nix { @@ -6193,6 +6754,7 @@ let rev = "f08ff5becd1e6e81d681ff2926f2cce29f63cb18"; sha256 = "12mb0lbkrzrxyawd9gg6igmsaylvsixcslim0lcgsrd551l9lq2l"; }; + meta.homepage = "https://github.com/wannesm/wmgraphviz.vim/"; }; wombat256-vim = buildVimPluginFrom2Nix { @@ -6204,6 +6766,7 @@ let rev = "8734ba45dcf5e38c4d2686b35c94f9fcb30427e2"; sha256 = "01fdvfwdfqn5xi88lfanb4lb6jmn1ma6wq6d9jj2x7qamdbpvsrg"; }; + meta.homepage = "https://github.com/vim-scripts/wombat256.vim/"; }; workflowish = buildVimPluginFrom2Nix { @@ -6215,6 +6778,7 @@ let rev = "65472189814dddd060aaa558103d837c2f9a5ec9"; sha256 = "044jxkcbycmmahi98qd0ynpc8baay72i45qymv4mxvl1d96fjbmd"; }; + meta.homepage = "https://github.com/lukaszkorecki/workflowish/"; }; xptemplate = buildVimPluginFrom2Nix { @@ -6226,6 +6790,7 @@ let rev = "79d650bad58b9c896ec47785f8a0c7b603105c2d"; sha256 = "1myxp0ldk0s46aipx1iswa9zx2fkc4gwqpmhbswqgg7sxl1bz30g"; }; + meta.homepage = "https://github.com/drmingdrmer/xptemplate/"; }; xterm-color-table-vim = buildVimPluginFrom2Nix { @@ -6237,6 +6802,7 @@ let rev = "9754e857e5f4fe1f8727106dcc682d21c29a51e4"; sha256 = "08a1d9428xwrjp40qgi34cb5fwgc239qf3agxl32k7bqbn08pq19"; }; + meta.homepage = "https://github.com/guns/xterm-color-table.vim/"; }; YankRing-vim = buildVimPluginFrom2Nix { @@ -6248,30 +6814,33 @@ let rev = "28854abef8fa4ebd3cb219aefcf22566997d8f65"; sha256 = "0zdp8pdsqgrh6lfw8ipjhrig6psvmdxkim9ik801y3r373sk2hxw"; }; + meta.homepage = "https://github.com/vim-scripts/YankRing.vim/"; }; yats-vim = buildVimPluginFrom2Nix { pname = "yats-vim"; - version = "2020-04-12"; + version = "2020-04-18"; src = fetchFromGitHub { owner = "HerringtonDarkholme"; repo = "yats.vim"; - rev = "d5c60217a27bba799b0ed5a2f16c61ea0a9b314e"; - sha256 = "1km829m6aa3pfgq6p0p0gb102w1b5w454iy8smz1zwipsc84zgp7"; + rev = "7978f7d52e1cfbdba1d17951c7bd4be527807e4e"; + sha256 = "0fiqbnqsyr743vxm8km4q7yyd26anya1yi89gkzjipq2vgpqx7hn"; fetchSubmodules = true; }; + meta.homepage = "https://github.com/HerringtonDarkholme/yats.vim/"; }; YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2020-04-06"; + version = "2020-04-18"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "97150c0b1fde6a7e3f3eea0abab7d114774dd1af"; - sha256 = "16lwi234cwnp8f5gr8cry40ak2y71f6a7rbqnkq92smmw38fycnq"; + rev = "367c1518cd6f2c8695000924b8ec2815a30a9af3"; + sha256 = "0c8982qj93b8rcb4m7dfczscqyfhv2y672irrrpg0kb2yxiwk51m"; fetchSubmodules = true; }; + meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; }; YUNOcommit-vim = buildVimPluginFrom2Nix { @@ -6283,6 +6852,7 @@ let rev = "981082055a73ef076d7e27477874d2303153a448"; sha256 = "0mjc7fn405vcx1n7vadl98p5wgm6jxrlbdbkqgjq8f1m1ir81zab"; }; + meta.homepage = "https://github.com/esneider/YUNOcommit.vim/"; }; zeavim-vim = buildVimPluginFrom2Nix { @@ -6294,6 +6864,7 @@ let rev = "298e52ad683680b4aa19b53d009cf0e6b9197664"; sha256 = "1qj6z0vd7y89wfwh84rndl4iz6cvilncih2fc5xgmljaarg914fs"; }; + meta.homepage = "https://github.com/KabbAmine/zeavim.vim/"; }; zenburn = buildVimPluginFrom2Nix { @@ -6305,6 +6876,7 @@ let rev = "ec6f369a000602e37e7c066b725f9d6bd12538f4"; sha256 = "1ff5ac8lp7fq854kgf03c5h695lm60giw0qda5z428mmzwq0xask"; }; + meta.homepage = "https://github.com/jnurmine/zenburn/"; }; zig-vim = buildVimPluginFrom2Nix { @@ -6316,6 +6888,7 @@ let rev = "0e914f2ab5ab9a9554c31b90be189dca5c4ee3a8"; sha256 = "1njf3flx5dcahvk92kaf879sd4a75yq4nnii4ljip7bvkyci8ipa"; }; + meta.homepage = "https://github.com/ziglang/zig.vim/"; }; zoomwintab-vim = buildVimPluginFrom2Nix { @@ -6327,6 +6900,7 @@ let rev = "63a70b9e12617d6565a0489c68efe44708d19cf8"; sha256 = "1dsi2d6wrv5x6w2hrrjzqivsspxxav0hdj0pymml6gry2jcbj4s9"; }; + meta.homepage = "https://github.com/troydm/zoomwintab.vim/"; }; }); -- cgit v1.2.3 From 35ee9b6d94991ea06afffb1195cddbc437593b40 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Fri, 24 Apr 2020 20:13:43 -0400 Subject: aspell, tla: use pname --- pkgs/applications/version-management/arch/default.nix | 13 +++++++------ pkgs/development/libraries/aspell/default.nix | 5 +++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/version-management/arch/default.nix b/pkgs/applications/version-management/arch/default.nix index d41040f49a0..c161d8446ac 100644 --- a/pkgs/applications/version-management/arch/default.nix +++ b/pkgs/applications/version-management/arch/default.nix @@ -1,18 +1,19 @@ { stdenv, fetchurl, which, diffutils, gnupatch, gnutar }: stdenv.mkDerivation rec { - name = "tla-1.3.5"; - + pname = "tla"; + version = "1.3.5"; + src = fetchurl { - url = "https://ftp.gnu.org/old-gnu/gnu-arch/" + name + ".tar.gz"; + url = "https://ftp.gnu.org/old-gnu/gnu-arch/tla-${version}.tar.gz"; sha256 = "01mfzj1i6p4s8191cgd5850hds1zls88hkf9rb6qx1vqjv585aj0"; }; patches = [ ./configure-tmpdir.patch ]; - buildInputs = [which]; - - propagatedBuildInputs = [diffutils gnupatch gnutar]; + buildInputs = [ which ]; + + propagatedBuildInputs = [ diffutils gnupatch gnutar ]; # Instead of GNU Autoconf, tla uses Tom Lord's now # defunct `package-framework'. diff --git a/pkgs/development/libraries/aspell/default.nix b/pkgs/development/libraries/aspell/default.nix index 91fd83bf916..68faef7e786 100644 --- a/pkgs/development/libraries/aspell/default.nix +++ b/pkgs/development/libraries/aspell/default.nix @@ -15,10 +15,11 @@ let in stdenv.mkDerivation rec { - name = "aspell-0.60.8"; + pname = "aspell"; + version = "0.60.8"; src = fetchurl { - url = "mirror://gnu/aspell/${name}.tar.gz"; + url = "mirror://gnu/aspell/aspell-${version}.tar.gz"; sha256 = "1wi60ankalmh8ds7nplz434jd7j94gdvbahdwsr539rlad8pxdzr"; }; -- cgit v1.2.3 From 8c0c24bf93b675c058d9c720d6c7665ba4deb90d Mon Sep 17 00:00:00 2001 From: misuzu Date: Mon, 20 Apr 2020 18:33:33 +0300 Subject: nix-simple-deploy: init at 0.1.1 --- .../nix-simple-deploy/default.nix | 23 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/package-management/nix-simple-deploy/default.nix diff --git a/pkgs/tools/package-management/nix-simple-deploy/default.nix b/pkgs/tools/package-management/nix-simple-deploy/default.nix new file mode 100644 index 00000000000..3bc0b35c0f1 --- /dev/null +++ b/pkgs/tools/package-management/nix-simple-deploy/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "nix-simple-deploy"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "misuzu"; + repo = pname; + rev = version; + sha256 = "12g0sbgs2dfnk0agp1kagfi1yhk26ga98zygxxrjhjxrqb2n5w80"; + }; + + cargoSha256 = "0svnz9r0lrmz333qpbpdddjd46vh9i74qchws8aifa2qwnqy0kmn"; + + meta = with stdenv.lib; { + description = "Deploy software or an entire NixOS system configuration to another NixOS system"; + homepage = "https://github.com/misuzu/nix-simple-deploy"; + license = with licenses; [ asl20 /* OR */ mit ]; + platforms = platforms.all; + maintainers = with maintainers; [ misuzu ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe3ebbf56a6..bbcdaf3a5a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25703,6 +25703,8 @@ in nix-serve = callPackage ../tools/package-management/nix-serve { }; + nix-simple-deploy = callPackage ../tools/package-management/nix-simple-deploy { }; + nixfmt = haskell.lib.justStaticExecutables haskellPackages.nixfmt; nixpkgs-fmt = callPackage ../tools/nix/nixpkgs-fmt { }; -- cgit v1.2.3 From 746ee6f4b4603768c4efd06357c5de79f159890d Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Fri, 24 Apr 2020 16:24:59 -0400 Subject: pythonPackages.pymavlink: 2.4.6 -> 2.4.8 --- pkgs/development/python-modules/pymavlink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymavlink/default.nix b/pkgs/development/python-modules/pymavlink/default.nix index d47ea812ca8..51b057e740c 100644 --- a/pkgs/development/python-modules/pymavlink/default.nix +++ b/pkgs/development/python-modules/pymavlink/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymavlink"; - version = "2.4.6"; + version = "2.4.8"; src = fetchPypi { inherit pname version; - sha256 = "1c8bxbm18h4idfdxqgklcz4n5bgsyl9y14gl9314fpflwa2c7ds8"; + sha256 = "1djzr6cg3l19icwplmpii7zzr8gms9qcc2lfr8yc05siqzclk5xk"; }; propagatedBuildInputs = [ future lxml ]; -- cgit v1.2.3 From bc93f123eafeef49edcca7e0bdf08c33b3a8c72a Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Fri, 24 Apr 2020 16:29:13 -0400 Subject: mavproxy: 1.8.18 -> 1.8.19 --- pkgs/applications/science/robotics/mavproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/applications/science/robotics/mavproxy/default.nix index 0348d015309..c354dad8042 100644 --- a/pkgs/applications/science/robotics/mavproxy/default.nix +++ b/pkgs/applications/science/robotics/mavproxy/default.nix @@ -3,11 +3,11 @@ buildPythonApplication rec { pname = "MAVProxy"; - version = "1.8.18"; + version = "1.8.19"; src = fetchPypi { inherit pname version; - sha256 = "1fi4m3591wws5cq43q8aljf91mzs6i9yhn9rimhpfrskbyf9knvm"; + sha256 = "1rbq2nm01212rp5xbl8p8kjl2mpgfppkwjsq3lnfw1v6g0m4359h"; }; propagatedBuildInputs = [ -- cgit v1.2.3 From 594b74c47629b9ca6cd9e16e7e90fc77a1a853d0 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 24 Apr 2020 21:05:59 -0400 Subject: typora: drop me from maintainers --- pkgs/applications/editors/typora/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index bd183f97c12..583229eb868 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { description = "A minimal Markdown reading & writing app"; homepage = "https://typora.io"; license = licenses.unfree; - maintainers = with maintainers; [ jensbin worldofpeace ]; + maintainers = with maintainers; [ jensbin ]; platforms = [ "x86_64-linux"]; }; } -- cgit v1.2.3 From c26e7f9aac4a12bc206d4461efd228697e1dd3a7 Mon Sep 17 00:00:00 2001 From: Julian Stecklina Date: Wed, 22 Apr 2020 12:43:20 +0200 Subject: open-watcom-bin: init at 1.9 This is a derivation for the binary distribution of the Open Watcom C/C++ compiler. --- .../compilers/open-watcom-bin/default.nix | 67 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 69 insertions(+) create mode 100644 pkgs/development/compilers/open-watcom-bin/default.nix diff --git a/pkgs/development/compilers/open-watcom-bin/default.nix b/pkgs/development/compilers/open-watcom-bin/default.nix new file mode 100644 index 00000000000..0cd80b6e1df --- /dev/null +++ b/pkgs/development/compilers/open-watcom-bin/default.nix @@ -0,0 +1,67 @@ +{ stdenvNoCC, fetchurl, qemu, expect, writeScript, ncurses }: + +let + + # We execute the installer in qemu-user, because otherwise the + # installer fails to open itself due to a failed stat() call. This + # seems like an incompatibility of new Linux kernels to run this + # ancient binary. + performInstall = writeScript "perform-ow-install" '' + #!${expect}/bin/expect -f + + spawn env TERMINFO=${ncurses}/share/terminfo TERM=vt100 ${qemu}/bin/qemu-i386 [lindex $argv 0] + + # Wait for button saying "I agree" with escape sequences. + expect "gree" + + # Navigate to "I Agree!" and hit enter. + send "\t\t\n" + + expect "Install Open Watcom" + + # Where do we want to install to. + send "$env(out)\n" + + expect "will be installed" + + # Select Full Installation, Next + send "fn" + + expect "Setup will now copy" + + # Next + send "n" + + expect "completed successfully" + send "\n" + ''; + +in +stdenvNoCC.mkDerivation rec { + pname = "open-watcom-bin"; + version = "1.9"; + + src = fetchurl { + url = "http://ftp.openwatcom.org/install/open-watcom-c-linux-${version}"; + sha256 = "1wzkvc6ija0cjj5mcyjng5b7hnnc5axidz030c0jh05pgvi4nj7p"; + }; + + dontUnpack = true; + dontBuild = true; + dontConfigure = true; + + installPhase = '' + cp ${src} install-bin + chmod +x install-bin + + ${performInstall} install-bin + ''; + + meta = with stdenvNoCC.lib; { + description = "A C/C++ Compiler (binary distribution)"; + homepage = "http://www.openwatcom.org/"; + license = licenses.watcom; + platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = [ maintainers.blitz ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f182b6d250c..16962f5996f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8996,6 +8996,8 @@ in inherit (ocaml-ng.ocamlPackages_4_05) ocaml; }; + open-watcom-bin = callPackage ../development/compilers/open-watcom-bin { }; + pforth = callPackage ../development/compilers/pforth {}; picat = callPackage ../development/compilers/picat { }; -- cgit v1.2.3 From 134f200cef170024748930e3a581017055ea0dde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexandre-Xavier=20Labont=C3=A9-Lamoureux?= Date: Fri, 24 Apr 2020 02:12:05 -0400 Subject: chocolate-doom: 2.3.0 -> 3.0.0 --- pkgs/games/chocolate-doom/default.nix | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/games/chocolate-doom/default.nix b/pkgs/games/chocolate-doom/default.nix index 7eef6b5dff8..1c2a24de01d 100644 --- a/pkgs/games/chocolate-doom/default.nix +++ b/pkgs/games/chocolate-doom/default.nix @@ -1,17 +1,22 @@ -{ stdenv, autoreconfHook, pkgconfig, SDL, SDL_mixer, SDL_net, fetchurl }: +{ stdenv, autoreconfHook, pkgconfig, SDL2, SDL2_mixer, SDL2_net, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "chocolate-doom-2.3.0"; - src = fetchurl { - url = "https://github.com/chocolate-doom/chocolate-doom/archive/${name}.tar.gz"; - sha256 = "0i57smxmbhxj0wgvxq845ba9zsn5nx5wmzkl71rdchyd4q5jmida"; + pname = "chocolate-doom"; + version = "3.0.0"; + + src = fetchFromGitHub { + owner = "chocolate-doom"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "0ajzb767wyj8vzhjpsmgslw42b0155ji4alk26shxl7k5ijbzn0j"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ SDL SDL_mixer SDL_net ]; - patchPhase = '' + + postPatch = '' sed -e 's#/games#/bin#g' -i src{,/setup}/Makefile.am ''; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + buildInputs = [ SDL2 SDL2_mixer SDL2_net ]; enableParallelBuilding = true; meta = { -- cgit v1.2.3 From 9d73d285802b08b0c0082d8b9a91ad27613547aa Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 24 Apr 2020 21:21:22 -0400 Subject: pantheon.switchboard-plug-pantheon-shell: 2.8.3 -> 2.8.4 --- .../pantheon/apps/switchboard-plugs/pantheon-shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix index c4487525954..a70fee63094 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-pantheon-shell"; - version = "2.8.3"; + version = "2.8.4"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "0ypyppxx51l3r3fgxrvjdwnz33lpbfh1bf27fww9fx9520wixnx8"; + sha256 = "1nnsv745inbdqk3xnbcaqmj87vr3kzh5hazbh8v3ib33cpi7wy88"; }; passthru = { -- cgit v1.2.3 From de9866e38cdf0b7d59e2ba2d7239533b8a2d85c1 Mon Sep 17 00:00:00 2001 From: Renato Florentino Garcia Date: Fri, 24 Apr 2020 22:21:36 -0300 Subject: asttokens: 1.1.13 -> 2.0.4 --- .../development/python-modules/asttokens/default.nix | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/asttokens/default.nix b/pkgs/development/python-modules/asttokens/default.nix index c6e4f3752ef..0f090d14aba 100644 --- a/pkgs/development/python-modules/asttokens/default.nix +++ b/pkgs/development/python-modules/asttokens/default.nix @@ -1,27 +1,19 @@ -{ lib, fetchPypi, buildPythonPackage, fetchpatch, astroid, six, coverage -, lazy-object-proxy, nose, wrapt +{ lib, fetchPypi, buildPythonPackage, + setuptools_scm, toml, six, astroid, pytest }: buildPythonPackage rec { pname = "asttokens"; - version = "1.1.13"; + version = "2.0.4"; src = fetchPypi { inherit pname version; - sha256 = "1vd4djlxmgznz84gzakkv45avnrcpgl1kir92l1pxyp0z5c0dh2m"; + sha256 = "0a2ixiz04aw4p0aivxh47k3fa9ql804l3y5iv5gcih9aizi5fbm4"; }; - patches = [ - # Fix tests for astroid 2.2 in python 3. Remove with the next release - (fetchpatch { - url = "https://github.com/gristlabs/asttokens/commit/21caaaa74105c410b3d84c3d8ff0dc2f612aac9a.patch"; - sha256 = "182xfr0cx4pxx0dv1l50a1c281h8ywir8vvd1zh5iicflivim1nv"; - }) - ]; + propagatedBuildInputs = [ setuptools_scm toml six astroid ]; - propagatedBuildInputs = [ lazy-object-proxy six wrapt astroid ]; - - checkInputs = [ coverage nose ]; + checkInputs = [ pytest ]; meta = with lib; { homepage = "https://github.com/gristlabs/asttokens"; -- cgit v1.2.3 From 19b77d4ad1427af795ae24f0e681d3bcb2ccd365 Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Fri, 24 Apr 2020 14:37:55 -0700 Subject: jazzy: 0.13.1 -> 0.13.3 --- pkgs/development/tools/jazzy/Gemfile.lock | 32 ++++++++------ pkgs/development/tools/jazzy/gemset.nix | 70 +++++++++++++++++++++---------- 2 files changed, 66 insertions(+), 36 deletions(-) diff --git a/pkgs/development/tools/jazzy/Gemfile.lock b/pkgs/development/tools/jazzy/Gemfile.lock index f703cb707e6..bed539369ac 100644 --- a/pkgs/development/tools/jazzy/Gemfile.lock +++ b/pkgs/development/tools/jazzy/Gemfile.lock @@ -12,10 +12,10 @@ GEM json (>= 1.5.1) atomos (0.1.3) claide (1.0.3) - cocoapods (1.8.4) + cocoapods (1.9.1) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.8.4) + cocoapods-core (= 1.9.1) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -30,13 +30,15 @@ GEM molinillo (~> 0.6.6) nap (~> 1.0) ruby-macho (~> 1.4) - xcodeproj (>= 1.11.1, < 2.0) - cocoapods-core (1.8.4) + xcodeproj (>= 1.14.0, < 2.0) + cocoapods-core (1.9.1) activesupport (>= 4.0.2, < 6) algoliasearch (~> 1.0) concurrent-ruby (~> 1.1) fuzzy_match (~> 2.0.4) nap (~> 1.0) + netrc (~> 0.11) + typhoeus (~> 1.0) cocoapods-deintegrate (1.0.4) cocoapods-downloader (1.3.0) cocoapods-plugins (1.0.0) @@ -46,18 +48,20 @@ GEM cocoapods-trunk (1.4.1) nap (>= 0.8, < 2.0) netrc (~> 0.11) - cocoapods-try (1.1.0) + cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.1.5) + concurrent-ruby (1.1.6) escape (0.0.4) - ffi (1.11.3) + ethon (0.12.0) + ffi (>= 1.3.0) + ffi (1.12.2) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) httpclient (2.8.3) i18n (0.9.5) concurrent-ruby (~> 1.0) - jazzy (0.13.1) + jazzy (0.13.3) cocoapods (~> 1.5) mustache (~> 1.1) open4 @@ -68,7 +72,7 @@ GEM xcinvoke (~> 0.3.0) json (2.3.0) liferaft (0.0.6) - minitest (5.13.0) + minitest (5.14.0) molinillo (0.6.6) mustache (1.1.1) nanaimo (0.2.6) @@ -76,17 +80,19 @@ GEM netrc (0.11.0) open4 (1.3.4) redcarpet (3.5.0) - rouge (3.14.0) + rouge (3.18.0) ruby-macho (1.4.0) - sassc (2.2.1) + sassc (2.3.0) ffi (~> 1.9) sqlite3 (1.4.2) thread_safe (0.3.6) - tzinfo (1.2.6) + typhoeus (1.3.1) + ethon (>= 0.9.0) + tzinfo (1.2.7) thread_safe (~> 0.1) xcinvoke (0.3.0) liferaft (~> 0.0.6) - xcodeproj (1.14.0) + xcodeproj (1.16.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) diff --git a/pkgs/development/tools/jazzy/gemset.nix b/pkgs/development/tools/jazzy/gemset.nix index 872b6296786..f4f9c8104d4 100644 --- a/pkgs/development/tools/jazzy/gemset.nix +++ b/pkgs/development/tools/jazzy/gemset.nix @@ -57,21 +57,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "007ssx75588ji2d8l8s6c95dng1c7b6yacng8nngpy7maijzjgzc"; + sha256 = "0wxr81qy4jsbxl066nlfp8zlqk31i6fsmd7f01xmi9bv04990hrs"; type = "gem"; }; - version = "1.8.4"; + version = "1.9.1"; }; cocoapods-core = { - dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap"]; + dependencies = ["activesupport" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "typhoeus"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zcisqb404828n5d3lbk9y2yyx8v2yr6rk1l8y9a4i1hp743fiad"; + sha256 = "0c1679fkyp06dwsh93r0ldzly9vc74g0br4jdngwvdl4g0j4fyzc"; type = "gem"; }; - version = "1.8.4"; + version = "1.9.1"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -132,12 +132,14 @@ version = "1.4.1"; }; cocoapods-try = { + groups = ["default"]; + platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gf2zjmcjhh9psq15yfy82wz5jnlihf5bcw79f8hlv4cnqyspncj"; + sha256 = "1znyp625rql37ivb5rk9fk9564cmax8icxfr041ysivpdrn98nql"; type = "gem"; }; - version = "1.1.0"; + version = "1.2.0"; }; colored2 = { source = { @@ -152,10 +154,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; + sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl"; type = "gem"; }; - version = "1.1.5"; + version = "1.1.6"; }; escape = { source = { @@ -165,15 +167,26 @@ }; version = "0.0.4"; }; + ethon = { + dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gggrgkcq839mamx7a8jbnp2h7x2ykfn34ixwskwb0lzx2ak17g9"; + type = "gem"; + }; + version = "0.12.0"; + }; ffi = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10ay35dm0lkcqprsiya6q2kwvyid884102ryipr4vrk790yfp8kd"; + sha256 = "10lfhahnnc91v63xpvk65apn61pib086zha3z5sp1xk9acfx12h4"; type = "gem"; }; - version = "1.11.3"; + version = "1.12.2"; }; fourflusher = { groups = ["default"]; @@ -230,10 +243,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0917v3dk9ks0apr0srk9sm6agk47iyh5bzfxqpkhd4dfgb4vpvjx"; + sha256 = "1iv98hfmxf1vib63bq8l0wgx5n8kw2kmsj55y2vs04f2kcav3n4n"; type = "gem"; }; - version = "0.13.1"; + version = "0.13.3"; }; json = { groups = ["default"]; @@ -258,10 +271,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w16p7cvslh3hxd3cia8jg4pd85z7rz7xqb16vh42gj4rijn8rmi"; + sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz"; type = "gem"; }; - version = "5.13.0"; + version = "5.14.0"; }; molinillo = { groups = ["default"]; @@ -332,10 +345,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k5jrp0qc9p61mfcwyn1a7dajmkw04z6y76wa8a0axh1v2wrw8ld"; + sha256 = "1n9h0ls2a2zq0bcsw31wxci1wdxb8s3vglfadxpcs6b04vkf6nqq"; type = "gem"; }; - version = "3.14.0"; + version = "3.18.0"; }; ruby-macho = { groups = ["default"]; @@ -353,10 +366,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09bnid7r5z5hcin5hykvpvv8xig27wbbckxwis60z2aaxq4j9siz"; + sha256 = "1qzfnvb8khvc6w2sn3k91mndc2w50xxx5c84jkr6xdxlmaq1a3kg"; type = "gem"; }; - version = "2.2.1"; + version = "2.3.0"; }; sqlite3 = { groups = ["default"]; @@ -376,16 +389,27 @@ }; version = "0.3.6"; }; + typhoeus = { + dependencies = ["ethon"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cni8b1idcp0dk8kybmxydadhfpaj3lbs99w5kjibv8bsmip2zi5"; + type = "gem"; + }; + version = "1.3.1"; + }; tzinfo = { dependencies = ["thread_safe"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04f18jdv6z3zn3va50rqq35nj3izjpb72fnf21ixm7vanq6nc4fp"; + sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; type = "gem"; }; - version = "1.2.6"; + version = "1.2.7"; }; xcinvoke = { dependencies = ["liferaft"]; @@ -402,9 +426,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1h9iba53mrb663qdqzpfbdwkwzqv7hndd0df71yr2kj2hzwjmkvb"; + sha256 = "1bkk8y6lzd86w9yx72hd1nil3fkk5f0v3il9vm554gzpl6dhc2bi"; type = "gem"; }; - version = "1.14.0"; + version = "1.16.0"; }; } \ No newline at end of file -- cgit v1.2.3 From 58d59e58d2dd46e751c4a0606f7415f7e40f5ac6 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 24 Apr 2020 16:52:00 +0200 Subject: afl: update homepage link to use HTTPS --- pkgs/tools/security/afl/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix index df5e3728943..def5458a240 100644 --- a/pkgs/tools/security/afl/default.nix +++ b/pkgs/tools/security/afl/default.nix @@ -68,7 +68,7 @@ let also useful for seeding other, more labor or resource-intensive testing regimes down the road. ''; - homepage = "http://lcamtuf.coredump.cx/afl/"; + homepage = "https://lcamtuf.coredump.cx/afl/"; license = stdenv.lib.licenses.asl20; platforms = ["x86_64-linux" "i686-linux"]; maintainers = with stdenv.lib.maintainers; [ thoughtpolice ris ]; -- cgit v1.2.3 From 02af43898913ad93fc33ca1a804b838f5396aa2b Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 24 Apr 2020 16:52:09 +0200 Subject: libdislocator: update homepage link to use HTTPS --- pkgs/tools/security/afl/libdislocator.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/afl/libdislocator.nix b/pkgs/tools/security/afl/libdislocator.nix index 953c59e435c..103786d1244 100644 --- a/pkgs/tools/security/afl/libdislocator.nix +++ b/pkgs/tools/security/afl/libdislocator.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - homepage = "http://lcamtuf.coredump.cx/afl/"; + homepage = "https://lcamtuf.coredump.cx/afl/"; description = '' Drop-in replacement for the libc allocator which improves the odds of bumping into heap-related security bugs in -- cgit v1.2.3 From 8998be8efbfe887c58ae17065bad0a0882c0183b Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 24 Apr 2020 16:52:46 +0200 Subject: AgdaStdlib: update homepage link to use HTTPS --- pkgs/development/libraries/agda/agda-stdlib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/agda/agda-stdlib/default.nix b/pkgs/development/libraries/agda/agda-stdlib/default.nix index 6056173c311..6647677f71c 100644 --- a/pkgs/development/libraries/agda/agda-stdlib/default.nix +++ b/pkgs/development/libraries/agda/agda-stdlib/default.nix @@ -19,7 +19,7 @@ agda.mkDerivation (self: rec { topSourceDirectories = [ "src" ]; meta = with stdenv.lib; { - homepage = "http://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary"; + homepage = "https://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary"; description = "A standard library for use with the Agda compiler"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; -- cgit v1.2.3 From 4f62d1f0b044545896adbe675b2881fb2d84e419 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 24 Apr 2020 16:53:59 +0200 Subject: ciopfs: update homepage link to use HTTPS --- pkgs/tools/filesystems/ciopfs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/ciopfs/default.nix b/pkgs/tools/filesystems/ciopfs/default.nix index 5beff7bf1c5..8b633ecbe0f 100644 --- a/pkgs/tools/filesystems/ciopfs/default.nix +++ b/pkgs/tools/filesystems/ciopfs/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ]; meta = { - homepage = "http://www.brain-dump.org/projects/ciopfs/"; + homepage = "https://www.brain-dump.org/projects/ciopfs/"; description = "A case-insensitive filesystem layered on top of any other filesystem"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; -- cgit v1.2.3 From 16b7e0c909e88918b0ddf321964dbd253c6e2a1e Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 24 Apr 2020 16:56:25 +0200 Subject: darling-dmg: update homepage link to use HTTPS --- pkgs/tools/filesystems/darling-dmg/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/darling-dmg/default.nix b/pkgs/tools/filesystems/darling-dmg/default.nix index 3548cf0a3dc..43823e5b51a 100644 --- a/pkgs/tools/filesystems/darling-dmg/default.nix +++ b/pkgs/tools/filesystems/darling-dmg/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { CXXFLAGS = [ "-DU_USING_ICU_NAMESPACE=1" ]; meta = { - homepage = "http://www.darlinghq.org/"; + homepage = "https://www.darlinghq.org/"; description = "Darling lets you open macOS dmgs on Linux"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl3; -- cgit v1.2.3 From cfa5b41053a4d3afdb10ce5c50ecf31f67465e97 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 24 Apr 2020 16:57:05 +0200 Subject: elm-instrument: update homepage link to use HTTPS --- pkgs/development/compilers/elm/packages/elm-instrument.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/elm/packages/elm-instrument.nix b/pkgs/development/compilers/elm/packages/elm-instrument.nix index 54077994fbd..4d7efcf1083 100644 --- a/pkgs/development/compilers/elm/packages/elm-instrument.nix +++ b/pkgs/development/compilers/elm/packages/elm-instrument.nix @@ -28,7 +28,7 @@ mkDerivation { quickcheck-io split tasty tasty-golden tasty-hunit tasty-quickcheck text ]; - homepage = "http://elm-lang.org"; + homepage = "https://elm-lang.org"; description = "Instrumentation library for Elm"; license = stdenv.lib.licenses.bsd3; } -- cgit v1.2.3 From 47dc4104d4082dde98a267ce843a83e67e8607a7 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 24 Apr 2020 16:58:05 +0200 Subject: libpgf: update homepage link to use HTTPS --- pkgs/development/libraries/libpgf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libpgf/default.nix b/pkgs/development/libraries/libpgf/default.nix index f262a7da131..7710c208199 100644 --- a/pkgs/development/libraries/libpgf/default.nix +++ b/pkgs/development/libraries/libpgf/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { # configureFlags = optional static "--enable-static --disable-shared"; meta = { - homepage = "http://www.libpgf.org/"; + homepage = "https://www.libpgf.org/"; description = "Progressive Graphics Format"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.unix; -- cgit v1.2.3 From 25180cd2d5fbaf5fc54d6ebc081e6422e18abc6b Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 24 Apr 2020 16:58:19 +0200 Subject: pgf: update homepage link to use HTTPS --- pkgs/tools/graphics/pgf/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/pgf/default.nix b/pkgs/tools/graphics/pgf/default.nix index 88684541fcc..d3f01fa7d1f 100644 --- a/pkgs/tools/graphics/pgf/default.nix +++ b/pkgs/tools/graphics/pgf/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { # configureFlags = optional static "--enable-static --disable-shared"; meta = { - homepage = "http://www.libpgf.org/"; + homepage = "https://www.libpgf.org/"; description = "Progressive Graphics Format command line program"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; -- cgit v1.2.3 From 308636a84c1a39071d98c94dc6555efa499ebb56 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 24 Apr 2020 16:58:45 +0200 Subject: lirc: update homepage link to use HTTPS --- pkgs/development/libraries/lirc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index 30d114122b6..1aaba1599c0 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Allows to receive and send infrared signals"; - homepage = "http://www.lirc.org/"; + homepage = "https://www.lirc.org/"; license = licenses.gpl2; platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; -- cgit v1.2.3 From 5fac10ccb1d12cdafaf879066d48aed91cbd86ed Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 24 Apr 2020 16:59:18 +0200 Subject: lv2: update homepage link to use HTTPS --- pkgs/development/libraries/audio/lv2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix index ec8c4b81dd1..e415aa5e4f2 100644 --- a/pkgs/development/libraries/audio/lv2/default.nix +++ b/pkgs/development/libraries/audio/lv2/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk2 libsndfile python3 ]; meta = with stdenv.lib; { - homepage = "http://lv2plug.in"; + homepage = "https://lv2plug.in"; description = "A plugin standard for audio systems"; license = licenses.mit; maintainers = [ maintainers.goibhniu ]; -- cgit v1.2.3 From cedcfede5eaadc4df07b2a118c18cf12e3b0d645 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 24 Apr 2020 16:59:52 +0200 Subject: p0f: update homepage link to use HTTPS --- pkgs/tools/security/p0f/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/p0f/default.nix b/pkgs/tools/security/p0f/default.nix index 1e618cdce1a..02d888b725f 100644 --- a/pkgs/tools/security/p0f/default.nix +++ b/pkgs/tools/security/p0f/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Passive network reconnaissance and fingerprinting tool"; - homepage = "http://lcamtuf.coredump.cx/p0f3/"; + homepage = "https://lcamtuf.coredump.cx/p0f3/"; license = stdenv.lib.licenses.lgpl21; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; -- cgit v1.2.3 From 79a11bd31019024d3ee024039f4c77a45c48d392 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 24 Apr 2020 17:00:11 +0200 Subject: pcg-c: update homepage link to use HTTPS --- pkgs/development/libraries/pcg-c/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/pcg-c/default.nix b/pkgs/development/libraries/pcg-c/default.nix index 550842e9f9f..593794c9c4d 100644 --- a/pkgs/development/libraries/pcg-c/default.nix +++ b/pkgs/development/libraries/pcg-c/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "A family of better random number generators"; - homepage = "http://www.pcg-random.org/"; + homepage = "https://www.pcg-random.org/"; license = stdenv.lib.licenses.asl20; longDescription = '' PCG is a family of simple fast space-efficient statistically good -- cgit v1.2.3 From e538248f695da9bd12d6efeb5a36436658606fa5 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 24 Apr 2020 17:00:35 +0200 Subject: pythonPackages.certifi: update homepage link to use HTTPS --- pkgs/development/python-modules/certifi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix index 35df76e68cd..04ae5a78bdb 100644 --- a/pkgs/development/python-modules/certifi/default.nix +++ b/pkgs/development/python-modules/certifi/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { }; meta = { - homepage = "http://certifi.io/"; + homepage = "https://certifi.io/"; description = "Python package for providing Mozilla's CA Bundle"; license = lib.licenses.isc; maintainers = with lib.maintainers; [ koral ]; -- cgit v1.2.3 From a55b6f1d062cd67089d5338db6ef62fc952c05ba Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 24 Apr 2020 17:00:59 +0200 Subject: pythonPackages.evernote: update homepage link to use HTTPS --- pkgs/development/python-modules/evernote/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/evernote/default.nix b/pkgs/development/python-modules/evernote/default.nix index 55b60315c50..b245ff11747 100644 --- a/pkgs/development/python-modules/evernote/default.nix +++ b/pkgs/development/python-modules/evernote/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Evernote SDK for Python"; - homepage = "http://dev.evernote.com"; + homepage = "https://dev.evernote.com"; license = licenses.asl20; maintainers = with maintainers; [ hbunke ]; }; -- cgit v1.2.3 From ed1136b8797def413e73a98b18ab57c94a167877 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 24 Apr 2020 17:01:20 +0200 Subject: pythonPackages.geopandas: update homepage link to use HTTPS --- pkgs/development/python-modules/geopandas/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix index 6b1b74cae8a..9a86acf83b5 100644 --- a/pkgs/development/python-modules/geopandas/default.nix +++ b/pkgs/development/python-modules/geopandas/default.nix @@ -30,7 +30,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python geospatial data analysis framework"; - homepage = "http://geopandas.org"; + homepage = "https://geopandas.org"; license = licenses.bsd3; maintainers = with maintainers; [ knedlsepp ]; }; -- cgit v1.2.3 From 2f49365ab92925cfb102ac6ff1de0fc5be9a269d Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 24 Apr 2020 17:01:58 +0200 Subject: pythonPackages.scikitlearn: update homepage link to use HTTPS --- pkgs/development/python-modules/scikitlearn/0.20.nix | 2 +- pkgs/development/python-modules/scikitlearn/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/scikitlearn/0.20.nix b/pkgs/development/python-modules/scikitlearn/0.20.nix index 790c2970376..4d8e8d00f43 100644 --- a/pkgs/development/python-modules/scikitlearn/0.20.nix +++ b/pkgs/development/python-modules/scikitlearn/0.20.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A set of python modules for machine learning and data mining"; - homepage = "http://scikit-learn.org"; + homepage = "https://scikit-learn.org"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix index d5d5ee8b788..c7519ee3962 100644 --- a/pkgs/development/python-modules/scikitlearn/default.nix +++ b/pkgs/development/python-modules/scikitlearn/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "A set of python modules for machine learning and data mining"; - homepage = "http://scikit-learn.org"; + homepage = "https://scikit-learn.org"; license = licenses.bsd3; maintainers = with maintainers; [ ]; }; -- cgit v1.2.3 From 41268500aeb30c652aeaa660020da9c274e7cc3e Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 24 Apr 2020 17:02:42 +0200 Subject: pythonPackages.subdownloader: update homepage link to use HTTPS --- pkgs/development/python-modules/subdownloader/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/subdownloader/default.nix b/pkgs/development/python-modules/subdownloader/default.nix index 8c5ab94f9d6..c4d57bef0ea 100644 --- a/pkgs/development/python-modules/subdownloader/default.nix +++ b/pkgs/development/python-modules/subdownloader/default.nix @@ -59,7 +59,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Tool for automatic download/upload subtitles for videofiles using fast hashing"; - homepage = "http://www.subdownloader.net"; + homepage = "https://www.subdownloader.net"; license = licenses.gpl3; }; -- cgit v1.2.3 From 77ab79cb4b06be77cbf39034aac1d19de5e620e5 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 24 Apr 2020 17:03:05 +0200 Subject: pythonPackages.untangle: update homepage link to use HTTPS --- pkgs/development/python-modules/untangle/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/untangle/default.nix b/pkgs/development/python-modules/untangle/default.nix index f8f172e78b1..9b8e915a8ba 100644 --- a/pkgs/development/python-modules/untangle/default.nix +++ b/pkgs/development/python-modules/untangle/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { meta = with lib; { description = "Convert XML documents into Python objects"; - homepage = "http://github.com/stchris/untangle"; + homepage = "https://github.com/stchris/untangle"; license = licenses.mit; maintainers = [ maintainers.arnoldfarkas ]; }; -- cgit v1.2.3 From f2843547125aa615d247e2020c71d945aad20e1d Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 24 Apr 2020 17:03:32 +0200 Subject: rambox: update homepage link to use HTTPS --- pkgs/applications/networking/instant-messengers/rambox/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index 1237892ef64..74a644d189d 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Free and Open Source messaging and emailing app that combines common web applications into one"; - homepage = "http://rambox.pro"; + homepage = "https://rambox.pro"; license = licenses.mit; maintainers = with maintainers; [ gnidorah ma27 ]; platforms = ["i686-linux" "x86_64-linux"]; -- cgit v1.2.3 From 56a7c4f05690acbc2608e35dd559331af7dbaaf8 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 24 Apr 2020 17:03:55 +0200 Subject: remarkjs: update homepage link to use HTTPS --- pkgs/development/web/remarkjs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/web/remarkjs/default.nix b/pkgs/development/web/remarkjs/default.nix index 7859e7b036f..d9cc433fd84 100644 --- a/pkgs/development/web/remarkjs/default.nix +++ b/pkgs/development/web/remarkjs/default.nix @@ -60,7 +60,7 @@ in stdenv.mkDerivation rec { ''; meta = { - homepage = "http://remarkjs.com"; + homepage = "https://remarkjs.com"; description = "A simple, in-browser, markdown-driven slideshow tool"; maintainers = []; platforms = stdenv.lib.platforms.linux; -- cgit v1.2.3 From 40dd2c27c64e06cb5648b0e80548e449d15f5e80 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 24 Apr 2020 17:04:15 +0200 Subject: rink: update homepage link to use HTTPS --- pkgs/applications/science/misc/rink/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/misc/rink/default.nix b/pkgs/applications/science/misc/rink/default.nix index 839fc8f9546..5d592c233b6 100644 --- a/pkgs/applications/science/misc/rink/default.nix +++ b/pkgs/applications/science/misc/rink/default.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { meta = with stdenv.lib; { description = "Unit-aware calculator"; - homepage = "http://rink.tiffnix.com"; + homepage = "https://rink.tiffnix.com"; license = with licenses; [ mpl20 gpl3 ]; maintainers = with maintainers; [ sb0 filalex77 ]; }; -- cgit v1.2.3 From 7a29abc75c6505a257e4266232793ea737c9703d Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 24 Apr 2020 17:04:59 +0200 Subject: restya-board: update homepage link to use HTTPS --- pkgs/servers/web-apps/restya-board/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/web-apps/restya-board/default.nix b/pkgs/servers/web-apps/restya-board/default.nix index 0dca4acc6b9..89e22b23361 100644 --- a/pkgs/servers/web-apps/restya-board/default.nix +++ b/pkgs/servers/web-apps/restya-board/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Web-based kanban board"; license = licenses.osl3; - homepage = "http://restya.com"; + homepage = "https://restya.com"; maintainers = with maintainers; [ tstrobel ]; platforms = platforms.linux; }; -- cgit v1.2.3 From 6d8e791b2879c8648acae48e749fcae469c4c44f Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 24 Apr 2020 17:05:25 +0200 Subject: rtptools: update homepage link to use HTTPS --- pkgs/tools/networking/rtptools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/rtptools/default.nix b/pkgs/tools/networking/rtptools/default.nix index a713331d7c2..5d439f183d2 100644 --- a/pkgs/tools/networking/rtptools/default.nix +++ b/pkgs/tools/networking/rtptools/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { }; meta = { description = "A number of small applications that can be used for processing RTP data"; - homepage = "http://www.cs.columbia.edu/irt/software/rtptools/"; + homepage = "https://www.cs.columbia.edu/irt/software/rtptools/"; maintainers = [ lib.maintainers.lheckemann ]; platforms = lib.platforms.unix; license = lib.licenses.bsd3; -- cgit v1.2.3 From 1659c302dda8f4541ab5b46f0484e51ba3df89da Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 24 Apr 2020 17:05:58 +0200 Subject: scribusUnstable: update homepage link to use HTTPS --- pkgs/applications/office/scribus/unstable.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/scribus/unstable.nix b/pkgs/applications/office/scribus/unstable.nix index d6084c0f37e..aa0c2dee979 100644 --- a/pkgs/applications/office/scribus/unstable.nix +++ b/pkgs/applications/office/scribus/unstable.nix @@ -116,7 +116,7 @@ mkDerivation rec { ]; platforms = platforms.linux; description = "Desktop Publishing (DTP) and Layout program for Linux"; - homepage = "http://www.scribus.net"; + homepage = "https://www.scribus.net"; # There are a lot of licenses... https://github.com/scribusproject/scribus/blob/20508d69ca4fc7030477db8dee79fd1e012b52d2/COPYING#L15-L19 license = with licenses; [ bsd3 -- cgit v1.2.3 From 50541332244e028058924eae2d15ba2198edf00a Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 24 Apr 2020 17:06:21 +0200 Subject: serviio: update homepage link to use HTTPS --- pkgs/servers/serviio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/serviio/default.nix b/pkgs/servers/serviio/default.nix index 6b1fdd10990..006c2fdff3e 100644 --- a/pkgs/servers/serviio/default.nix +++ b/pkgs/servers/serviio/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = "http://serviio.org"; + homepage = "https://serviio.org"; description = "UPnP Media Streaming Server"; longDescription = '' Serviio is a free media server. It allows you to stream your media files (music, video or images) -- cgit v1.2.3 From f527f9db3a039b54cb9616927c8f297acaa715b6 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 24 Apr 2020 17:06:47 +0200 Subject: snakemake: update homepage link to use HTTPS --- pkgs/applications/science/misc/snakemake/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index 34bdaf6bacf..e54dc785b08 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -28,7 +28,7 @@ python3Packages.buildPythonApplication rec { doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json meta = with stdenv.lib; { - homepage = "http://snakemake.bitbucket.io"; + homepage = "https://snakemake.bitbucket.io"; license = licenses.mit; description = "Python-based execution environment for make-like workflows"; longDescription = '' -- cgit v1.2.3 From 1e802d70aff1f74741c34c5965dbe202ab72078f Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 24 Apr 2020 16:55:31 +0200 Subject: clementine: update homepage link to use HTTPS --- pkgs/applications/audio/clementine/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 4a32b099d15..6ec25d233ff 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -91,7 +91,7 @@ let ''; meta = with stdenv.lib; { - homepage = "http://www.clementine-player.org"; + homepage = "https://www.clementine-player.org"; description = "A multiplatform music player"; license = licenses.gpl3Plus; platforms = platforms.linux; -- cgit v1.2.3 From df81d9a41c94792e02527dc9fa105153155f2e7c Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Fri, 24 Apr 2020 20:32:21 +0200 Subject: clementineUnfree: update homepage link to use HTTPS --- pkgs/applications/audio/clementine/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix index 6ec25d233ff..15d0f92b76a 100644 --- a/pkgs/applications/audio/clementine/default.nix +++ b/pkgs/applications/audio/clementine/default.nix @@ -130,7 +130,7 @@ let ''; enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = "http://www.clementine-player.org"; + homepage = "https://www.clementine-player.org"; description = "Spotify integration for Clementine"; # The blob itself is Apache-licensed, although libspotify is unfree. license = licenses.asl20; -- cgit v1.2.3 From 71171b3225a7cf4073a9519852791eb4c94e7ff0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 22 Apr 2020 18:50:27 +0200 Subject: Python tests: test venv from a nix env with Python 3.8 This test was disabled because it did not function yet, however, apparently it does with 3.8. --- pkgs/development/interpreters/python/tests.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/development/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix index 55065c45d57..f2fb6b95c37 100644 --- a/pkgs/development/interpreters/python/tests.nix +++ b/pkgs/development/interpreters/python/tests.nix @@ -38,17 +38,18 @@ let is_nixenv = "False"; }; + } // lib.optionalAttrs (python.pythonAtLeast "3.8") { # Venv built using Python Nix environment (python.buildEnv) # TODO: Cannot create venv from a nix env # Error: Command '['/nix/store/ddc8nqx73pda86ibvhzdmvdsqmwnbjf7-python3-3.7.6-venv/bin/python3.7', '-Im', 'ensurepip', '--upgrade', '--default-pip']' returned non-zero exit status 1. - # nixenv-venv = rec { - # env = runCommand "${python.name}-venv" {} '' - # ${pythonEnv.interpreter} -m venv $out - # ''; - # interpreter = "${env}/bin/${pythonEnv.executable}"; - # is_venv = "True"; - # is_nixenv = "True"; - # }; + nixenv-venv = rec { + env = runCommand "${python.name}-venv" {} '' + ${pythonEnv.interpreter} -m venv $out + ''; + interpreter = "${env}/bin/${pythonEnv.executable}"; + is_venv = "True"; + is_nixenv = "True"; + }; }; # All PyPy package builds are broken at the moment -- cgit v1.2.3 From 6f873e98f4405b6085f67e2baad67d925cd2a23b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 22 Apr 2020 18:51:16 +0200 Subject: Python integration tests: disable for older python 3 versions because the package that is used as part of the test does not support older versions. --- pkgs/development/interpreters/python/tests.nix | 2 +- .../python/tests/test_nix_pythonprefix/typeddep/default.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix index f2fb6b95c37..f7ec06ce4ff 100644 --- a/pkgs/development/interpreters/python/tests.nix +++ b/pkgs/development/interpreters/python/tests.nix @@ -53,7 +53,7 @@ let }; # All PyPy package builds are broken at the moment - integrationTests = lib.optionalAttrs (python.isPy3k && (!python.isPyPy)) rec { + integrationTests = lib.optionalAttrs (python.pythonAtLeast "3.7" && (!python.isPyPy)) rec { # Before the addition of NIX_PYTHONPREFIX mypy was broken with typed packages nix-pythonprefix-mypy = callPackage ./tests/test_nix_pythonprefix { interpreter = python; diff --git a/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/default.nix b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/default.nix index 06219a69fca..8d330fcdbfc 100644 --- a/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/default.nix +++ b/pkgs/development/interpreters/python/tests/test_nix_pythonprefix/typeddep/default.nix @@ -1,4 +1,4 @@ -{ buildPythonPackage }: +{ buildPythonPackage, pythonOlder }: buildPythonPackage { @@ -8,4 +8,6 @@ buildPythonPackage { src = ./.; + disabled = pythonOlder "3.7"; + } -- cgit v1.2.3 From 93a9ac696bad1b3afe072af85ae595686a5b7408 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 21 Apr 2020 10:51:15 +0200 Subject: playonlinux: fix build --- pkgs/applications/misc/playonlinux/default.nix | 60 +++++++++++++------------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix index fe9838fe0d9..e3b7c48d2b4 100644 --- a/pkgs/applications/misc/playonlinux/default.nix +++ b/pkgs/applications/misc/playonlinux/default.nix @@ -9,7 +9,7 @@ , imagemagick , netcat-gnu , p7zip -, python2Packages +, python2 , unzip , wget , wine @@ -27,25 +27,25 @@ let version = "4.3.4"; - binpath = stdenv.lib.makeBinPath - [ cabextract - python2Packages.python - gettext - glxinfo - gnupg - icoutils - imagemagick - netcat-gnu - p7zip - unzip - wget - wine - xdg-user-dirs - xterm - which - curl - jq - ]; + binpath = stdenv.lib.makeBinPath [ + cabextract + python + gettext + glxinfo + gnupg + icoutils + imagemagick + netcat-gnu + p7zip + unzip + wget + wine + xdg-user-dirs + xterm + which + curl + jq + ]; ld32 = if stdenv.hostPlatform.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32" @@ -54,6 +54,11 @@ let ld64 = "${stdenv.cc}/nix-support/dynamic-linker"; libs = pkgs: stdenv.lib.makeLibraryPath [ xorg.libX11 libGL ]; + python = python2.withPackages(ps: with ps; [ + wxPython + setuptools + ]); + in stdenv.mkDerivation { pname = "playonlinux"; inherit version; @@ -65,15 +70,13 @@ in stdenv.mkDerivation { nativeBuildInputs = [ makeWrapper ]; - buildInputs = - [ python2Packages.python - python2Packages.wxPython - python2Packages.setuptools - xorg.libX11 - libGL - ]; + buildInputs = [ + xorg.libX11 + libGL + python + ]; - patchPhase = '' + postPatch = '' patchShebangs python tests/python sed -i "s/ %F//g" etc/PlayOnLinux.desktop ''; @@ -85,7 +88,6 @@ in stdenv.mkDerivation { install -D -m644 etc/PlayOnLinux.desktop $out/share/applications/playonlinux.desktop makeWrapper $out/share/playonlinux/playonlinux $out/bin/playonlinux \ - --prefix PYTHONPATH : $PYTHONPATH:$(toPythonPath "$out") \ --prefix PATH : ${binpath} bunzip2 $out/share/playonlinux/bin/check_dd_x86.bz2 -- cgit v1.2.3 From bc8e1f3ad5fe633a3ca33550a35d99806db1e8d3 Mon Sep 17 00:00:00 2001 From: Rouven Czerwinski Date: Sat, 25 Apr 2020 08:23:41 +0200 Subject: pipewire: patch for SIGILL in fmt-ops Hydra run tests are failing with SIGILL, see [1] , import the upstream patch to fix the issue. Presumably not all hydra runners have the same instruction extensions, this should fix the tests on those without AVX2. [1]: https://hydra.nixos.org/build/117012754 --- pkgs/development/libraries/pipewire/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index 197282c5ac1..d873555c0fa 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchFromGitLab +, fetchpatch , meson , ninja , pkgconfig @@ -72,6 +73,13 @@ stdenv.mkDerivation rec { vulkan-loader xorg.libX11 ]; + patches = [ + # fix SIGILL in fmt-ops: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/227 + (fetchpatch { + url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/1b3aaba206f48e75bb34ff0cd00321bd3d6db2b4.patch"; + sha256 = "08bmr9k2r0q4r7vhhm28k558nk3mz3jfnqswvq9mcj7p0srmfb4x"; + }) + ]; mesonFlags = [ "-Ddocs=true" -- cgit v1.2.3 From 79e6d13a4adae7e82595b89e5149b002ab2bf16e Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 14 Apr 2020 11:39:02 +0200 Subject: ocamlPackages.cow: 2.2.0 -> 2.4.0 --- pkgs/development/ocaml-modules/cow/default.nix | 31 +++++++++++++------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/pkgs/development/ocaml-modules/cow/default.nix b/pkgs/development/ocaml-modules/cow/default.nix index 2a4d7004faa..787854f8e41 100644 --- a/pkgs/development/ocaml-modules/cow/default.nix +++ b/pkgs/development/ocaml-modules/cow/default.nix @@ -1,30 +1,29 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib -, ocamlbuild, topkg +{ lib, fetchurl, buildDunePackage, alcotest , uri, xmlm, omd, ezjsonm }: -stdenv.mkDerivation rec { - version = "2.2.0"; - pname = "ocaml-cow"; +buildDunePackage rec { + minimumOCamlVersion = "4.02.3"; - src = fetchFromGitHub { - owner = "mirage"; - repo = "ocaml-cow"; - rev = "v${version}"; - sha256 = "0snhabg7rfrrcq2ksr3qghiawd61cw3y4kp6rl7vs87j4cnk3kr2"; + version = "2.4.0"; + pname = "cow"; + + src = fetchurl { + url = "https://github.com/mirage/ocaml-cow/releases/download/v${version}/cow-v${version}.tbz"; + sha256 = "1x77lwpskda4zyikwxh500xjn90pgdwz6jm7ca7f36pyav4vl6zx"; }; - buildInputs = [ ocaml ocamlbuild findlib topkg ]; propagatedBuildInputs = [ xmlm uri ezjsonm omd ]; + checkInputs = [ alcotest ]; + doCheck = true; - inherit (topkg) buildPhase installPhase; - - meta = with stdenv.lib; { + meta = with lib; { description = "Caml on the Web"; longDescription = '' - Caml on the Web (COW) is a set of parsers and syntax extensions to let you manipulate HTML, CSS, XML, JSON and Markdown directly from OCaml code. + Writing web-applications requires a lot of skills: HTML, XML, JSON and + Markdown, to name but a few! This library provides OCaml combinators + for these web formats. ''; license = licenses.isc; maintainers = [ maintainers.sternenseemann ]; - inherit (ocaml.meta) platforms; }; } -- cgit v1.2.3 From 05db4f4fb9ba55662783bae84f7d936326141f30 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 25 Apr 2020 09:46:24 +0200 Subject: ocamlPackages.async_shell: remove at 109.28.03 This is a legacy version for OCaml 4.02 --- .../ocaml-modules/async_shell/default.nix | 22 ---------------------- pkgs/top-level/ocaml-packages.nix | 5 ----- 2 files changed, 27 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/async_shell/default.nix diff --git a/pkgs/development/ocaml-modules/async_shell/default.nix b/pkgs/development/ocaml-modules/async_shell/default.nix deleted file mode 100644 index 62b64a492d6..00000000000 --- a/pkgs/development/ocaml-modules/async_shell/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{stdenv, buildOcaml, fetchurl, async_p4, core_p4, core_extended_p4}: - -buildOcaml rec { - name = "async_shell"; - version = "109.28.03"; - - minimumSupportedOcamlVersion = "4.02"; - - src = fetchurl { - url = "https://github.com/janestreet/async_shell/archive/${version}.tar.gz"; - sha256 = "0b4497bea9124c5a665ee58fb0a73c5cbf2f757479df902e6870627196e6c105"; - }; - - propagatedBuildInputs = [ async_p4 core_p4 core_extended_p4 ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/janestreet/async_shell"; - description = "Shell helpers for Async"; - license = licenses.asl20; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 3cbb0a7df33..68e8c97825a 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -45,11 +45,6 @@ let async_kernel_p4 = callPackage ../development/ocaml-modules/async_kernel { }; - async_shell = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.async_shell - else callPackage ../development/ocaml-modules/async_shell { }; - async_unix_p4 = callPackage ../development/ocaml-modules/async_unix { }; async_p4 = -- cgit v1.2.3 From 6478e659da101280347734f645cc6248aa2100bc Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Sat, 25 Apr 2020 03:51:28 -0400 Subject: httplz: 1.8.0 -> 1.9.2 --- pkgs/tools/networking/httplz/cargo-lock.patch | 864 +++++++++++++------------- pkgs/tools/networking/httplz/default.nix | 6 +- 2 files changed, 438 insertions(+), 432 deletions(-) diff --git a/pkgs/tools/networking/httplz/cargo-lock.patch b/pkgs/tools/networking/httplz/cargo-lock.patch index 5ded54799a7..293d65f7a23 100644 --- a/pkgs/tools/networking/httplz/cargo-lock.patch +++ b/pkgs/tools/networking/httplz/cargo-lock.patch @@ -1,1269 +1,1275 @@ diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 -index 0000000..4b798fc +index 0000000..722bfbd --- /dev/null +++ b/Cargo.lock -@@ -0,0 +1,1263 @@ +@@ -0,0 +1,1269 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +[[package]] +name = "adler32" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" + +[[package]] +name = "aho-corasick" -+version = "0.7.6" ++version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8716408b8bc624ed7f65d223ddb9ac2d044c0547b6fa4b0d554f3a9540496ada" +dependencies = [ -+ "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memchr", +] + +[[package]] +name = "ansi_term" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +dependencies = [ -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi", +] + +[[package]] +name = "antidote" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5" + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ -+ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hermit-abi", ++ "libc", ++ "winapi", +] + +[[package]] +name = "autocfg" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" + +[[package]] +name = "autocfg" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" + +[[package]] +name = "base64" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" +dependencies = [ -+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder", ++ "safemem", +] + +[[package]] +name = "base64" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" +dependencies = [ -+ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "byteorder", +] + +[[package]] +name = "bitflags" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++ ++[[package]] ++name = "bitstring" ++version = "0.1.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3e54f7b7a46d7b183eb41e2d82965261fa8a1597c68b50aced268ee1fc70272d" + +[[package]] +name = "brotli-sys" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd" +dependencies = [ -+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc", ++ "libc", +] + +[[package]] +name = "brotli2" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e" +dependencies = [ -+ "brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "brotli-sys", ++ "libc", +] + +[[package]] +name = "byteorder" -+version = "1.3.2" ++version = "1.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" + +[[package]] +name = "bzip2" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b" +dependencies = [ -+ "bzip2-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bzip2-sys", ++ "libc", +] + +[[package]] +name = "bzip2-sys" -+version = "0.1.7" ++version = "0.1.8+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05305b41c5034ff0e93937ac64133d109b5a2660114ec45e9760bc6816d83038" +dependencies = [ -+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+] -+ -+[[package]] -+name = "c2-chacha" -+version = "0.2.3" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+dependencies = [ -+ "ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc", ++ "libc", +] + +[[package]] +name = "cc" -+version = "1.0.50" ++version = "1.0.52" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c3d87b23d6a92cd03af510a5ade527033f6aa6fa92161e2d5863a907d4c5e31d" + +[[package]] +name = "cfg-if" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" ++ ++[[package]] ++name = "cidr" ++version = "0.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2da1cf0f275bb8dc1867a7f40cdb3b746951db73a183048e6e37fa89ed81bd01" ++dependencies = [ ++ "bitstring", ++] + +[[package]] +name = "clap" +version = "2.33.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" +dependencies = [ -+ "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ansi_term", ++ "atty", ++ "bitflags", ++ "strsim", ++ "textwrap", ++ "unicode-width", ++ "vec_map", +] + +[[package]] +name = "cloudabi" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" +dependencies = [ -+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags", +] + +[[package]] +name = "core-foundation" -+version = "0.6.4" ++version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" +dependencies = [ -+ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation-sys", ++ "libc", +] + +[[package]] +name = "core-foundation-sys" -+version = "0.6.2" ++version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" + +[[package]] +name = "crc32fast" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" +dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", +] + +[[package]] +name = "ctrlc" -+version = "3.1.3" ++version = "3.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a4ba686dff9fa4c1c9636ce1010b0cf98ceb421361b0bb3d6faeec43bd217a7" +dependencies = [ -+ "nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "nix", ++ "winapi", +] + +[[package]] +name = "dtoa" -+version = "0.4.4" ++version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4358a9e11b9a09cf52383b451b49a169e8d797b68aa02301ff586d70d9661ea3" + +[[package]] +name = "either" +version = "1.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" + +[[package]] +name = "embed-resource" -+version = "1.3.1" ++version = "1.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1f6b0b4403da80c2fd32333937dd468292c001d778c587ae759b75432772715d" +dependencies = [ -+ "vswhom 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "vswhom", ++ "winreg", +] + +[[package]] +name = "flate2" -+version = "1.0.13" ++version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2cfff41391129e0a856d6d822600b8d71179d46879e310417eb9c762eb178b42" +dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "crc32fast", ++ "libc", ++ "miniz_oxide", +] + +[[package]] +name = "foreign-types" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" +dependencies = [ -+ "foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "foreign-types-shared", +] + +[[package]] +name = "foreign-types-shared" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" + +[[package]] +name = "fuchsia-cprng" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" + +[[package]] +name = "gcc" +version = "0.3.55" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" + +[[package]] +name = "getrandom" +version = "0.1.14" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" +dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "libc", ++ "wasi", +] + +[[package]] +name = "hermit-abi" -+version = "0.1.6" ++version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8a0d737e0f947a1864e93d33fdef4af8445a00d1ed8dc0c8ddb73139ea6abf15" +dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", +] + +[[package]] +name = "httparse" +version = "1.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" + +[[package]] +name = "https" -+version = "1.8.0" -+dependencies = [ -+ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", -+ "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "ctrlc 3.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "embed-resource 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hyper-native-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "iron 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazysort 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "md6 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "os-str-generic 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rfsapi 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_json 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "tabwriter 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", -+ "trivial_colours 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ++version = "1.9.2" ++dependencies = [ ++ "base64 0.10.1", ++ "brotli2", ++ "bzip2", ++ "cc", ++ "cidr", ++ "clap", ++ "ctrlc", ++ "embed-resource", ++ "flate2", ++ "hyper-native-tls", ++ "iron", ++ "itertools", ++ "lazy_static", ++ "lazysort", ++ "libc", ++ "md6", ++ "mime_guess", ++ "os-str-generic", ++ "percent-encoding 2.1.0", ++ "rand 0.7.3", ++ "regex", ++ "rfsapi", ++ "serde", ++ "serde_json", ++ "tabwriter", ++ "time", ++ "trivial_colours", ++ "unicase 2.6.0", ++ "walkdir", ++ "winapi", ++ "xml-rs", +] + +[[package]] +name = "hyper" +version = "0.10.16" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0a0652d9a2609a968c14be1a9ea00bf4b1d64e2e1f53a1b51b6fff3a6e829273" +dependencies = [ -+ "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", -+ "traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "base64 0.9.3", ++ "httparse", ++ "language-tags", ++ "log 0.3.9", ++ "mime", ++ "num_cpus", ++ "time", ++ "traitobject", ++ "typeable", ++ "unicase 1.4.2", ++ "url", +] + +[[package]] +name = "hyper-native-tls" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6d375598f442742b0e66208ee12501391f1c7ac0bafb90b4fe53018f81f06068" +dependencies = [ -+ "antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "antidote", ++ "hyper", ++ "native-tls", +] + +[[package]] +name = "idna" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" +dependencies = [ -+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ++ "matches", ++ "unicode-bidi", ++ "unicode-normalization", +] + +[[package]] +name = "iron" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c6d308ca2d884650a8bf9ed2ff4cb13fbb2207b71f64cda11dc9b892067295e8" +dependencies = [ -+ "hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "hyper-native-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", -+ "mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hyper", ++ "hyper-native-tls", ++ "log 0.3.9", ++ "mime_guess", ++ "modifier", ++ "num_cpus", ++ "plugin", ++ "typemap", ++ "url", +] + +[[package]] +name = "itertools" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" +dependencies = [ -+ "either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "either", +] + +[[package]] +name = "itoa" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c" + +[[package]] +name = "language-tags" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" + +[[package]] +name = "lazy_static" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" + +[[package]] +name = "lazysort" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d0e22ff43b231e0e2f87d74984e53ebc73b90ae13397e041214fb07efc64168f" + +[[package]] +name = "libc" -+version = "0.2.66" ++version = "0.2.69" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "99e85c08494b21a9054e7fe1374a732aeadaff3980b6990b94bfd3a70f690005" + +[[package]] +name = "log" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" +dependencies = [ -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.4.8", +] + +[[package]] +name = "log" +version = "0.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" +dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", +] + +[[package]] +name = "matches" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" + +[[package]] +name = "md6" -+version = "2.0.0" ++version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "21baf112ff708069b0d0544843236583c9c18675cc1af78ba4ace0f60f63fb31" +dependencies = [ -+ "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "gcc", ++ "libc", +] + +[[package]] +name = "memchr" -+version = "2.3.0" ++version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" + +[[package]] +name = "mime" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0" +dependencies = [ -+ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ++ "log 0.3.9", +] + +[[package]] +name = "mime_guess" -+version = "1.8.7" ++version = "1.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "216929a5ee4dd316b1702eedf5e74548c123d370f47841ceaac38ca154690ca3" +dependencies = [ -+ "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", -+ "phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "mime", ++ "phf", ++ "phf_codegen", ++ "unicase 1.4.2", +] + +[[package]] +name = "miniz_oxide" -+version = "0.3.5" ++version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aa679ff6578b1cddee93d7e82e263b94a575e0bfced07284eb0c037c1d2416a5" +dependencies = [ -+ "adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "adler32", +] + +[[package]] +name = "modifier" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "41f5c9112cb662acd3b204077e0de5bc66305fa8df65c8019d5adb10e9ab6e58" + +[[package]] +name = "native-tls" -+version = "0.2.3" ++version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d" +dependencies = [ -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", -+ "schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static", ++ "libc", ++ "log 0.4.8", ++ "openssl", ++ "openssl-probe", ++ "openssl-sys", ++ "schannel", ++ "security-framework", ++ "security-framework-sys", ++ "tempfile", +] + +[[package]] +name = "nix" -+version = "0.14.1" ++version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363" +dependencies = [ -+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags", ++ "cc", ++ "cfg-if", ++ "libc", ++ "void", +] + +[[package]] +name = "num-traits" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" +dependencies = [ -+ "num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "num-traits 0.2.11", +] + +[[package]] +name = "num-traits" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096" +dependencies = [ -+ "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 1.0.0", +] + +[[package]] +name = "num_cpus" -+version = "1.12.0" ++version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +dependencies = [ -+ "hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hermit-abi", ++ "libc", +] + +[[package]] +name = "openssl" -+version = "0.10.26" ++version = "0.10.29" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cee6d85f4cb4c4f59a6a85d5b68a233d280c82e29e822913b9c8b129fbf20bdd" +dependencies = [ -+ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags", ++ "cfg-if", ++ "foreign-types", ++ "lazy_static", ++ "libc", ++ "openssl-sys", +] + +[[package]] +name = "openssl-probe" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" + +[[package]] +name = "openssl-sys" -+version = "0.9.53" ++version = "0.9.55" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7717097d810a0f2e2323f9e5d11e71608355e24828410b55b9d4f18aa5f9a5d8" +dependencies = [ -+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)", -+ "vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 1.0.0", ++ "cc", ++ "libc", ++ "pkg-config", ++ "vcpkg", +] + +[[package]] +name = "os-str-generic" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "78f3d620827b89763f54b7f1da3029bd4e0ca7eb1ae61a5c4d3b0bc0dca5157e" + +[[package]] +name = "percent-encoding" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" + +[[package]] +name = "percent-encoding" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" + +[[package]] +name = "phf" +version = "0.7.24" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" +dependencies = [ -+ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "phf_shared", +] + +[[package]] +name = "phf_codegen" +version = "0.7.24" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" +dependencies = [ -+ "phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", -+ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", ++ "phf_generator", ++ "phf_shared", +] + +[[package]] +name = "phf_generator" +version = "0.7.24" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" +dependencies = [ -+ "phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "phf_shared", ++ "rand 0.6.5", +] + +[[package]] +name = "phf_shared" +version = "0.7.24" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" +dependencies = [ -+ "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "siphasher", ++ "unicase 1.4.2", +] + +[[package]] +name = "pkg-config" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" + +[[package]] +name = "plugin" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1a6a0dc3910bc8db877ffed8e457763b317cf880df4ae19109b9f77d277cf6e0" +dependencies = [ -+ "typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "typemap", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" + +[[package]] +name = "quote" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" + +[[package]] +name = "rand" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" +dependencies = [ -+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.7", ++ "libc", ++ "rand_chacha 0.1.1", ++ "rand_core 0.4.2", ++ "rand_hc 0.1.0", ++ "rand_isaac", ++ "rand_jitter", ++ "rand_os", ++ "rand_pcg", ++ "rand_xorshift", ++ "winapi", +] + +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ -+ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "getrandom", ++ "libc", ++ "rand_chacha 0.2.2", ++ "rand_core 0.5.1", ++ "rand_hc 0.2.0", +] + +[[package]] +name = "rand_chacha" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" +dependencies = [ -+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.7", ++ "rand_core 0.3.1", +] + +[[package]] +name = "rand_chacha" -+version = "0.2.1" ++version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ -+ "c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "ppv-lite86", ++ "rand_core 0.5.1", +] + +[[package]] +name = "rand_core" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" +dependencies = [ -+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.4.2", +] + +[[package]] +name = "rand_core" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" + +[[package]] +name = "rand_core" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +dependencies = [ -+ "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", ++ "getrandom", +] + +[[package]] +name = "rand_hc" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" +dependencies = [ -+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ -+ "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.5.1", +] + +[[package]] +name = "rand_isaac" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" +dependencies = [ -+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1", +] + +[[package]] +name = "rand_jitter" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" +dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "rand_core 0.4.2", ++ "winapi", +] + +[[package]] +name = "rand_os" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" +dependencies = [ -+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cloudabi", ++ "fuchsia-cprng", ++ "libc", ++ "rand_core 0.4.2", ++ "rdrand", ++ "winapi", +] + +[[package]] +name = "rand_pcg" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" +dependencies = [ -+ "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "autocfg 0.1.7", ++ "rand_core 0.4.2", +] + +[[package]] +name = "rand_xorshift" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" +dependencies = [ -+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1", +] + +[[package]] +name = "rdrand" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" +dependencies = [ -+ "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "rand_core 0.3.1", +] + +[[package]] +name = "redox_syscall" +version = "0.1.56" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" + +[[package]] +name = "regex" -+version = "1.3.3" ++version = "1.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a6020f034922e3194c711b82a627453881bc4682166cabb07134a10c26ba7692" +dependencies = [ -+ "aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "regex-syntax 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", -+ "thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "aho-corasick", ++ "memchr", ++ "regex-syntax", ++ "thread_local", +] + +[[package]] +name = "regex-syntax" -+version = "0.6.13" ++version = "0.6.17" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7fe5bd57d1d7414c6b5ed48563a2c855d995ff777729dcd91c369ec7fea395ae" + +[[package]] +name = "remove_dir_all" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" +dependencies = [ -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi", +] + +[[package]] +name = "rfsapi" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1b6fbc119d00459f80252adb96e554766d75de071ed5d3c49f46a000d137cd49" +dependencies = [ -+ "hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)", -+ "mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_derive 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", ++ "hyper", ++ "mime", ++ "serde", ++ "serde_derive", ++ "time", +] + +[[package]] +name = "safemem" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" + +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ -+ "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-util", +] + +[[package]] +name = "schannel" -+version = "0.1.16" ++version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "039c25b130bd8c1321ee2d7de7fde2659fa9c2744e4bb29711cfc852ea53cd19" +dependencies = [ -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static", ++ "winapi", +] + +[[package]] +name = "security-framework" -+version = "0.3.4" ++version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3f331b9025654145cd425b9ded0caf8f5ae0df80d418b326e2dc1c3dc5eb0620" +dependencies = [ -+ "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "bitflags", ++ "core-foundation", ++ "core-foundation-sys", ++ "libc", ++ "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" -+version = "0.3.3" ++version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405" +dependencies = [ -+ "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "core-foundation-sys", ++ "libc", +] + +[[package]] +name = "serde" +version = "0.9.15" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af" + +[[package]] +name = "serde_codegen_internals" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bc888bd283bd2420b16ad0d860e35ad8acb21941180a83a189bb2046f9d00400" +dependencies = [ -+ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "syn", +] + +[[package]] +name = "serde_derive" +version = "0.9.15" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "978fd866f4d4872084a81ccc35e275158351d3b9fe620074e7d7504b816b74ba" +dependencies = [ -+ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde_codegen_internals 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote", ++ "serde_codegen_internals", ++ "syn", +] + +[[package]] +name = "serde_json" +version = "0.9.10" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ad8bcf487be7d2e15d3d543f04312de991d631cfe1b43ea0ade69e6a8a5b16a1" +dependencies = [ -+ "dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", -+ "num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", -+ "serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dtoa", ++ "itoa", ++ "num-traits 0.1.43", ++ "serde", +] + +[[package]] +name = "siphasher" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" + +[[package]] +name = "smallvec" -+version = "1.1.0" ++version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c7cb5678e1615754284ec264d9bb5b4c27d2018577fd90ac0ceb578591ed5ee4" + +[[package]] +name = "strsim" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" + +[[package]] +name = "syn" +version = "0.11.11" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" +dependencies = [ -+ "quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", -+ "synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "quote", ++ "synom", ++ "unicode-xid", +] + +[[package]] +name = "synom" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" +dependencies = [ -+ "unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-xid", +] + +[[package]] +name = "tabwriter" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "36205cfc997faadcc4b0b87aaef3fbedafe20d38d4959a7ca6ff803564051111" +dependencies = [ -+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width", +] + +[[package]] +name = "tempfile" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" +dependencies = [ -+ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", -+ "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cfg-if", ++ "libc", ++ "rand 0.7.3", ++ "redox_syscall", ++ "remove_dir_all", ++ "winapi", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ -+ "unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unicode-width", +] + +[[package]] +name = "thread_local" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" +dependencies = [ -+ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "lazy_static", +] + +[[package]] +name = "time" -+version = "0.1.42" ++version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" +dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "winapi", +] + +[[package]] +name = "traitobject" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" + +[[package]] +name = "trivial_colours" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7153365ea16c5a0ce2eebc4da1b33339a6b21d90c49f670e82130639656bb458" + +[[package]] +name = "typeable" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887" + +[[package]] +name = "typemap" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6" +dependencies = [ -+ "unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ++ "unsafe-any", +] + +[[package]] +name = "unicase" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33" +dependencies = [ -+ "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "version_check 0.1.5", +] + +[[package]] +name = "unicase" +version = "2.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" +dependencies = [ -+ "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "version_check 0.9.1", +] + +[[package]] +name = "unicode-bidi" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" +dependencies = [ -+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "matches", +] + +[[package]] +name = "unicode-normalization" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4" +dependencies = [ -+ "smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "smallvec", +] + +[[package]] +name = "unicode-width" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" + +[[package]] +name = "unicode-xid" +version = "0.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" + +[[package]] +name = "unsafe-any" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f" +dependencies = [ -+ "traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "traitobject", +] + +[[package]] +name = "url" +version = "1.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" +dependencies = [ -+ "idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -+ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", ++ "idna", ++ "matches", ++ "percent-encoding 1.0.1", +] + +[[package]] +name = "vcpkg" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" + +[[package]] +name = "vec_map" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" + +[[package]] +name = "version_check" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" + +[[package]] +name = "version_check" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce" + +[[package]] +name = "void" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" + +[[package]] +name = "vswhom" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" +dependencies = [ -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", -+ "vswhom-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "libc", ++ "vswhom-sys", +] + +[[package]] +name = "vswhom-sys" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fc2f5402d3d0e79a069714f7b48e3ecc60be7775a2c049cb839457457a239532" +dependencies = [ -+ "cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)", -+ "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", ++ "cc", ++ "libc", +] + +[[package]] +name = "walkdir" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" +dependencies = [ -+ "same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", ++ "same-file", ++ "winapi", ++ "winapi-util", +] + +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" + +[[package]] +name = "winapi" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" +dependencies = [ -+ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -+ "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-util" -+version = "0.1.3" ++version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi", +] + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "winreg" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" +dependencies = [ -+ "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", ++ "winapi", +] + +[[package]] +name = "xml-rs" -+version = "0.8.0" ++version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+ -+[metadata] -+"checksum adler32 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5d2e7343e7fc9de883d1b0341e0b13970f764c14101234857d2ddafa1cb1cac2" -+"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d" -+"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -+"checksum antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5" -+"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -+"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" -+"checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" -+"checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" -+"checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" -+"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -+"checksum brotli-sys 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd" -+"checksum brotli2 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e" -+"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" -+"checksum bzip2 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "42b7c3cbf0fa9c1b82308d57191728ca0256cb821220f4e2fd410a72ade26e3b" -+"checksum bzip2-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "6584aa36f5ad4c9247f5323b0a42f37802b37a836f0ad87084d7a33961abe25f" -+"checksum c2-chacha 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "214238caa1bf3a496ec3392968969cab8549f96ff30652c9e56885329315f6bb" -+"checksum cc 1.0.50 (registry+https://github.com/rust-lang/crates.io-index)" = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd" -+"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" -+"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9" -+"checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -+"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d" -+"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" -+"checksum crc32fast 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" -+"checksum ctrlc 3.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c7dfd2d8b4c82121dfdff120f818e09fc4380b0b7e17a742081a89b94853e87f" -+"checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e" -+"checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" -+"checksum embed-resource 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bbaba4684ab0af1cbb3ef0b1f540ddc4b57b31940c920ea594efe09ab86e2a6c" -+"checksum flate2 1.0.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6bd6d6f4752952feb71363cffc9ebac9411b75b87c6ab6058c40c8900cf43c0f" -+"checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -+"checksum foreign-types-shared 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" -+"checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" -+"checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" -+"checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" -+"checksum hermit-abi 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eff2656d88f158ce120947499e971d743c05dbcbed62e5bd2f38f1698bbc3772" -+"checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" -+"checksum hyper 0.10.16 (registry+https://github.com/rust-lang/crates.io-index)" = "0a0652d9a2609a968c14be1a9ea00bf4b1d64e2e1f53a1b51b6fff3a6e829273" -+"checksum hyper-native-tls 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d375598f442742b0e66208ee12501391f1c7ac0bafb90b4fe53018f81f06068" -+"checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" -+"checksum iron 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c6d308ca2d884650a8bf9ed2ff4cb13fbb2207b71f64cda11dc9b892067295e8" -+"checksum itertools 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f56a2d0bc861f9165be4eb3442afd3c236d8a98afd426f65d92324ae1091a484" -+"checksum itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c" -+"checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" -+"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -+"checksum lazysort 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e22ff43b231e0e2f87d74984e53ebc73b90ae13397e041214fb07efc64168f" -+"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" -+"checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" -+"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" -+"checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" -+"checksum md6 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "54e5826684849cecd3fa05a6a5052c50a3542f163a9917ff0b91379426a2e45d" -+"checksum memchr 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3197e20c7edb283f87c071ddfc7a2cca8f8e0b888c242959846a6fce03c72223" -+"checksum mime 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0" -+"checksum mime_guess 1.8.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0d977de9ee851a0b16e932979515c0f3da82403183879811bc97d50bd9cc50f7" -+"checksum miniz_oxide 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6f3f74f726ae935c3f514300cc6773a0c9492abc5e972d42ba0c0ebb88757625" -+"checksum modifier 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "41f5c9112cb662acd3b204077e0de5bc66305fa8df65c8019d5adb10e9ab6e58" -+"checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e" -+"checksum nix 0.14.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6c722bee1037d430d0f8e687bbdbf222f27cc6e4e68d5caf630857bb2b6dbdce" -+"checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" -+"checksum num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "c62be47e61d1842b9170f0fdeec8eba98e60e90e5446449a0545e5152acd7096" -+"checksum num_cpus 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6" -+"checksum openssl 0.10.26 (registry+https://github.com/rust-lang/crates.io-index)" = "3a3cc5799d98e1088141b8e01ff760112bbd9f19d850c124500566ca6901a585" -+"checksum openssl-probe 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" -+"checksum openssl-sys 0.9.53 (registry+https://github.com/rust-lang/crates.io-index)" = "465d16ae7fc0e313318f7de5cecf57b2fbe7511fd213978b457e1c96ff46736f" -+"checksum os-str-generic 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "78f3d620827b89763f54b7f1da3029bd4e0ca7eb1ae61a5c4d3b0bc0dca5157e" -+"checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" -+"checksum percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" -+"checksum phf 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b3da44b85f8e8dfaec21adae67f95d93244b2ecf6ad2a692320598dcc8e6dd18" -+"checksum phf_codegen 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "b03e85129e324ad4166b06b2c7491ae27fe3ec353af72e72cd1654c7225d517e" -+"checksum phf_generator 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "09364cc93c159b8b06b1f4dd8a4398984503483891b0c26b867cf431fb132662" -+"checksum phf_shared 0.7.24 (registry+https://github.com/rust-lang/crates.io-index)" = "234f71a15de2288bcb7e3b6515828d22af7ec8598ee6d24c3b526fa0a80b67a0" -+"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" -+"checksum plugin 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "1a6a0dc3910bc8db877ffed8e457763b317cf880df4ae19109b9f77d277cf6e0" -+"checksum ppv-lite86 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "74490b50b9fbe561ac330df47c08f3f33073d2d00c150f719147d7c54522fa1b" -+"checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a" -+"checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" -+"checksum rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -+"checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" -+"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" -+"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -+"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" -+"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -+"checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" -+"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -+"checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" -+"checksum rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1166d5c91dc97b88d1decc3285bb0a99ed84b05cfd0bc2341bdf2d43fc41e39b" -+"checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" -+"checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" -+"checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" -+"checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -+"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" -+"checksum regex 1.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b5508c1941e4e7cb19965abef075d35a9a8b5cdf0846f30b4050e9b55dc55e87" -+"checksum regex-syntax 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "e734e891f5b408a29efbf8309e656876276f49ab6a6ac208600b4419bd893d90" -+"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" -+"checksum rfsapi 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1b6fbc119d00459f80252adb96e554766d75de071ed5d3c49f46a000d137cd49" -+"checksum safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" -+"checksum same-file 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -+"checksum schannel 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "87f550b06b6cba9c8b8be3ee73f391990116bf527450d2556e9b9ce263b9a021" -+"checksum security-framework 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8ef2429d7cefe5fd28bd1d2ed41c944547d4ff84776f5935b456da44593a16df" -+"checksum security-framework-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e31493fc37615debb8c5090a7aeb4a9730bc61e77ab10b9af59f1a202284f895" -+"checksum serde 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "34b623917345a631dc9608d5194cc206b3fe6c3554cd1c75b937e55e285254af" -+"checksum serde_codegen_internals 0.14.2 (registry+https://github.com/rust-lang/crates.io-index)" = "bc888bd283bd2420b16ad0d860e35ad8acb21941180a83a189bb2046f9d00400" -+"checksum serde_derive 0.9.15 (registry+https://github.com/rust-lang/crates.io-index)" = "978fd866f4d4872084a81ccc35e275158351d3b9fe620074e7d7504b816b74ba" -+"checksum serde_json 0.9.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ad8bcf487be7d2e15d3d543f04312de991d631cfe1b43ea0ade69e6a8a5b16a1" -+"checksum siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0b8de496cf83d4ed58b6be86c3a275b8602f6ffe98d3024a869e124147a9a3ac" -+"checksum smallvec 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44e59e0c9fa00817912ae6e4e6e3c4fe04455e75699d06eedc7d85917ed8e8f4" -+"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -+"checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad" -+"checksum synom 0.11.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a393066ed9010ebaed60b9eafa373d4b1baac186dd7e008555b0f702b51945b6" -+"checksum tabwriter 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "36205cfc997faadcc4b0b87aaef3fbedafe20d38d4959a7ca6ff803564051111" -+"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" -+"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -+"checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" -+"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" -+"checksum traitobject 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" -+"checksum trivial_colours 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7153365ea16c5a0ce2eebc4da1b33339a6b21d90c49f670e82130639656bb458" -+"checksum typeable 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887" -+"checksum typemap 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6" -+"checksum unicase 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33" -+"checksum unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -+"checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -+"checksum unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5479532badd04e128284890390c1e876ef7a993d0570b3597ae43dfa1d59afa4" -+"checksum unicode-width 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "caaa9d531767d1ff2150b9332433f32a24622147e5ebb1f26409d5da67afd479" -+"checksum unicode-xid 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f860d7d29cf02cb2f3f359fd35991af3d30bac52c57d265a3c461074cb4dc" -+"checksum unsafe-any 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f" -+"checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" -+"checksum vcpkg 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "3fc439f2794e98976c88a2a2dafce96b930fe8010b0a256b3c2199a773933168" -+"checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a" -+"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" -+"checksum version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "078775d0255232fb988e6fccf26ddc9d1ac274299aaedcedce21c6f72cc533ce" -+"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" -+"checksum vswhom 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "be979b7f07507105799e854203b470ff7c78a1639e330a58f183b5fea574608b" -+"checksum vswhom-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc2f5402d3d0e79a069714f7b48e3ecc60be7775a2c049cb839457457a239532" -+"checksum walkdir 2.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" -+"checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -+"checksum winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "8093091eeb260906a183e6ae1abdba2ef5ef2257a21801128899c3fc699229c6" -+"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -+"checksum winapi-util 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4ccfbf554c6ad11084fb7517daca16cfdcaccbdadba4fc336f032a8b12c2ad80" -+"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -+"checksum winreg 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b2986deb581c4fe11b621998a5e53361efe6b48a151178d0cd9eeffa4dc6acc9" -+"checksum xml-rs 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "541b12c998c5b56aa2b4e6f18f03664eef9a4fd0a246a55594efae6cc2d964b5" ++checksum = "2bb76e5c421bbbeb8924c60c030331b345555024d56261dae8f3e786ed817c23" diff --git a/pkgs/tools/networking/httplz/default.nix b/pkgs/tools/networking/httplz/default.nix index c4f003f884f..bf0a5b90388 100644 --- a/pkgs/tools/networking/httplz/default.nix +++ b/pkgs/tools/networking/httplz/default.nix @@ -3,13 +3,13 @@ rustPlatform.buildRustPackage rec { pname = "httplz"; - version = "1.8.0"; + version = "1.9.2"; src = fetchFromGitHub { owner = "thecoshman"; repo = "http"; rev = "v${version}"; - sha256 = "0i41hqig8v6w1qb6498239iix1rss0lznm5lcl9m3i439c2zv7pw"; + sha256 = "154alxxclz78r29m656c8yahnzq0vd64s4sp19h0ca92dfw4s46y"; }; nativeBuildInputs = [ makeWrapper pkgconfig ]; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--bin httplz" ]; cargoPatches = [ ./cargo-lock.patch ]; - cargoSha256 = "13hk9m09jff3bxbixsjvksiir4j4mak4ckvlq45bx5d5lh8sapxl"; + cargoSha256 = "1rpwzrr9bvw375vn97y5fqhraqz35d3ani9kfflvn2758x3g8gwf"; postInstall = '' wrapProgram $out/bin/httplz \ -- cgit v1.2.3 From 229ef0ea8a94ee889790851264397e285624879b Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Sun, 29 Dec 2019 12:11:14 +0000 Subject: TotalParserCombinators: remove broken package --- .../agda/TotalParserCombinators/contextfile | 259 --------------------- .../agda/TotalParserCombinators/default.nix | 26 --- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 287 deletions(-) delete mode 100644 pkgs/development/libraries/agda/TotalParserCombinators/contextfile delete mode 100644 pkgs/development/libraries/agda/TotalParserCombinators/default.nix diff --git a/pkgs/development/libraries/agda/TotalParserCombinators/contextfile b/pkgs/development/libraries/agda/TotalParserCombinators/contextfile deleted file mode 100644 index 46743cba3b6..00000000000 --- a/pkgs/development/libraries/agda/TotalParserCombinators/contextfile +++ /dev/null @@ -1,259 +0,0 @@ - -Context: - -[Updated the code in response to changes to Agda. -Nils Anders Danielsson **20150319181310 - Ignore-this: 52b9ff613d7f10b0c8f45591a0759d07 -] - -[Rolled back most of "Updated the code in response to changes to Agda". -Nils Anders Danielsson **20150319101420 - Ignore-this: c2ea7bdf79848235fa3ea64ebda116eb - * One of the Agda changes has been reverted. -] - -[Removed an outdated comment. -Nils Anders Danielsson **20150217162945 - Ignore-this: 3ff7732335750305fe220e65693f0cbf -] - -[Added the simplification "nonempty (return x) → fail". -Nils Anders Danielsson **20150217161718 - Ignore-this: 56ad6a68c314446d8986a8c1b49655d0 -] - -[Added Nonempty.nonempty-return. -Nils Anders Danielsson **20150217161629 - Ignore-this: 68829d3f9a248272c46848daa05ccfe3 -] - -[Updated the copyright year range. -Nils Anders Danielsson **20150212154744 - Ignore-this: 3410a12ca1f9de825b00e692b136d500 -] - -[Updated the code in response to changes to Agda. -Nils Anders Danielsson **20150212152207 - Ignore-this: 683b5eeca5fa9c8490bceaf68c23a204 -] - -[Updated the copyright year range. -Nils Anders Danielsson **20141128223227 - Ignore-this: 31d3f5e4fdd6fbfad9758d9bfd0d3a3e -] - -[Updated the code in response to changes to Agda and the library. -Nils Anders Danielsson **20141128223205 - Ignore-this: 6392ec67aab2c534a7195abed55be47 -] - -[Updated code to reflect changes to Agda. -Nils Anders Danielsson **20140425121055 - Ignore-this: 54d80fd647cb897eef85f57e9172f7db -] - -[Workaround for (possible) Agda bug. -Nils Anders Danielsson **20140228200347 - Ignore-this: b17884ad17a3bdb7faff678622365a8 -] - -[Updated code to reflect changes to library API. -Nils Anders Danielsson **20130307134644 - Ignore-this: 50d070a22a6796b9acdf19d44ba5de16 -] - -[Updated code to reflect changes to Agda and the library API. -Nils Anders Danielsson **20130228122951 - Ignore-this: 761dc4d85683a59cc3667a8706c88093 -] - -[Turned _◇_ into a constructor. -Nils Anders Danielsson **20120316125431 - Ignore-this: 41b492c3106a575f28f146253f78a5ae -] - -[Updated code to reflect changes to Agda. -Nils Anders Danielsson **20120316125416 - Ignore-this: e77d817d8b391c3b4806119d10848eb3 -] - -[Updated code to reflect changes to Agda. -Nils Anders Danielsson **20120215103344 - Ignore-this: 467716429d5553cd122722108ea82a08 -] - -[Modified a comment. -Nils Anders Danielsson **20120215103319 - Ignore-this: e57d4911f692f8a96a80017d910efc5f -] - -[Updated code to reflect change to library API. -Nils Anders Danielsson **20111006160229 - Ignore-this: 5359da54e7e6e0f92983fa3ecaccebf3 -] - -[Updated code to reflect changes to Agda and the library API. -Nils Anders Danielsson **20111003170117 - Ignore-this: cbdd35172e372779e12642985cf17268 -] - -[Rolled back addition of inversion lemmas. -Nils Anders Danielsson **20110930150912 - Ignore-this: 9c9b083f0afcf95aaaa55a01d871274e -] - -[Added inversion lemmas, implemented other lemmas using these lemmas. -Nils Anders Danielsson **20110930150842 - Ignore-this: 19b832c3f9e14d1e713b5911c094a130 - + This change was a response to a change to Agda's pattern matching - machinery. Subsequently the machinery was made more liberal again, - making this change unnecessary. -] - -[Updated code to reflect changes to library API. -Nils Anders Danielsson **20110517220158 - Ignore-this: ea9771a5014a25cb20afc2118638f8b5 -] - -[Updated code to reflect changes to Agda. -Nils Anders Danielsson **20110512124425 - Ignore-this: 97b154661679f574f6ab914583b14580 -] - -[Proved that many constructions preserve various preorders. -Nils Anders Danielsson **20110313012617 - Ignore-this: 8008efaff967c228448baa33b82edb81 -] - -[Updated code to reflect changes to library API. -Nils Anders Danielsson **20110313002106 - Ignore-this: 94799ba1ae411e59fd8c6c7eac3b8dfb -] - -[Simplified TotalRecognisers.LeftRecursion.MatchingParentheses. -Nils Anders Danielsson **20110118102159 - Ignore-this: 1e01a8092b0c0124979ffc5fe17a245c -] - -[Added TotalRecognisers.LeftRecursion.MatchingParentheses. -Nils Anders Danielsson **20110118102146 - Ignore-this: 13a3bc91425364e26c3047561655bb25 -] - -[Added a simplifying backend. -Nils Anders Danielsson **20101229012716 - Ignore-this: 9ac7ae21cd44c099633678a994fb9a3 -] - -[Fixed another "bug" in the deep simplifier. -Nils Anders Danielsson **20101229010854 - Ignore-this: e258adf963436ef715242db23c6808e - + Sometimes the first layer of bind's right-hand argument was not - simplified. -] - -[Made simplify₁ public and changed its type. -Nils Anders Danielsson **20101228235603 - Ignore-this: d39b8453a15089126261e098080223c6 -] - -[Deep simplification no longer adds casts. -Nils Anders Danielsson **20101228192850 - Ignore-this: 2ba016825adfa3a1e36922869eabfd39 -] - -[The first constructor in a simplified parser can no longer be a cast. -Nils Anders Danielsson **20101228175822 - Ignore-this: ce3e38cc0b9a096aa436655c9013ae97 -] - -[Modified the outline. -Nils Anders Danielsson **20101228173414 - Ignore-this: f8866e69f6d1a344e79fb6f708dfa4c -] - -[Added an example: a right recursive expression grammar. -Nils Anders Danielsson **20101228173159 - Ignore-this: 9a4d732b451cca08ba19aac5d115c678 -] - -[Rearranged the code. -Nils Anders Danielsson **20101228172209 - Ignore-this: 50fa29406d0f150669ff3feec4dbe513 -] - -[Renamed same-bag/set to (initial-bag-)cong. -Nils Anders Danielsson **20101228170706 - Ignore-this: dd3ce43d77dde74cc2428d2568dd2d30 -] - -[Added TotalParserCombinators.Force. -Nils Anders Danielsson **20101228153638 - Ignore-this: 3b6ff6ea20df0c1293494f06845d17eb -] - -[Proved that uses of subst can be erased. -Nils Anders Danielsson **20101228153621 - Ignore-this: f503ba495b923ae521718b6957167128 -] - -[The deep simplifier no longer skips layers. -Nils Anders Danielsson **20101228141138 - Ignore-this: 733a4a4a9aa0f890ad1740ecfc6a599f -] - -[Documented that the deep simplifier misses every second layer. -Nils Anders Danielsson **20101228121910 - Ignore-this: 8a0baf25b12f63f8748dbc1d16affacf -] - -[The simplifier now applies the token-bind rule more often. -Nils Anders Danielsson **20101227165413 - Ignore-this: 40132fa6f19602886bbe29aadd8a683c -] - -[Switched back to deep simplification, now with a proper proof. -Nils Anders Danielsson **20101227125434 - Ignore-this: ccc46e82f6f9c6c2a27ddb43d315f7dd -] - -[Simplified the soundness proof. -Nils Anders Danielsson **20101227123839 - Ignore-this: fb6826dd9836e34fc3bfdce2928ba13d -] - -[Made some _≈[_]P_ constructors conditionally coinductive. -Nils Anders Danielsson **20101227123827 - Ignore-this: f521f70475403697229051b62343a080 - + The structure of the soundness proof was also changed. -] - -[Unified And, AsymmetricChoice and Not. -Nils Anders Danielsson **20101225103109 - Ignore-this: 5ae8b80e1505fe6e707bb2307d22688c -] - -[Modified some comments. -Nils Anders Danielsson **20101225101051 - Ignore-this: e812d8c3e9720895c368f7a286f8315c -] - -[Modified a comment. -Nils Anders Danielsson **20101223202647 - Ignore-this: 16ea5dc01a4cbe0fe38714b2e4b7ff6 -] - -[Updated code to reflect changes to library API. -Nils Anders Danielsson **20101107162658 - Ignore-this: 9e38a10a9997c9825ece6ad9f871b673 -] - -[Added an alternative backend for TotalRecognisers.Simple. -Nils Anders Danielsson **20101020183743 - Ignore-this: a111a89e0c237e132b649561000f53d6 -] - -[TAG Code corresponding to the paper "Total Parser Combinators" (4). -Nils Anders Danielsson **20100928013815 - Ignore-this: 45ccc28373ed3974047315613eb14833 -] diff --git a/pkgs/development/libraries/agda/TotalParserCombinators/default.nix b/pkgs/development/libraries/agda/TotalParserCombinators/default.nix deleted file mode 100644 index 97cceebc1b6..00000000000 --- a/pkgs/development/libraries/agda/TotalParserCombinators/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, agda, fetchdarcs, AgdaStdlib }: - -agda.mkDerivation (self: rec { - version = "2015-03-19"; - name = "TotalParserCombinators-${version}"; - - src = fetchdarcs { - url = "http://www.cse.chalmers.se/~nad/repos/parser-combinators.code/"; - context = ./contextfile; - sha256 = "0jlbz8yni6i7vb2qsd41bdkpchqirvc5pavckaf97z7p4gqi2mlj"; - }; - - buildDepends = [ AgdaStdlib ]; - everythingFile = "TotalParserCombinators.agda"; - sourceDirectories = []; - topSourceDirectories = [ "../$sourceRoot" ]; - - meta = with stdenv.lib; { - homepage = "http://www.cse.chalmers.se/~nad/publications/danielsson-parser-combinators.html"; - description = "A monadic parser combinator library which guarantees termination of parsing"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = with maintainers; [ ]; - broken = true; - }; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bbcdaf3a5a7..49fda77d53b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15152,8 +15152,6 @@ in pretty = callPackage ../development/libraries/agda/pretty { }; - TotalParserCombinators = callPackage ../development/libraries/agda/TotalParserCombinators { }; - ### DEVELOPMENT / LIBRARIES / JAVA commonsBcel = callPackage ../development/libraries/java/commons/bcel { }; -- cgit v1.2.3 From 99fa0644c9a3cf8f3a9d24c37895e0942259d898 Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Sun, 29 Dec 2019 12:11:49 +0000 Subject: Agda-Sheaves: remove broken package --- .../libraries/agda/Agda-Sheaves/default.nix | 24 ---------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 26 deletions(-) delete mode 100644 pkgs/development/libraries/agda/Agda-Sheaves/default.nix diff --git a/pkgs/development/libraries/agda/Agda-Sheaves/default.nix b/pkgs/development/libraries/agda/Agda-Sheaves/default.nix deleted file mode 100644 index 513b79e6393..00000000000 --- a/pkgs/development/libraries/agda/Agda-Sheaves/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, agda, fetchgit }: - -agda.mkDerivation (self: rec { - version = "8a06162a8f0f7df308458db91d720cf8f7345d69"; - name = "Agda-Sheaves-${version}"; - src = fetchgit { - url = "https://github.com/jonsterling/Agda-Sheaves.git"; - rev = version; - sha256 = "1gjffyyi4gk9z380yw2wm0jg0a01zy8dnw7jrcc7222swisk5s2d"; - }; - - everythingFile = "sheaves.agda"; - topSourceDirectories = [ "../$sourceRoot" ]; - sourceDirectories = []; - - meta = { - homepage = "https://github.com/jonsterling/Agda-Sheaves"; - description = "Sheaves in Agda"; - license = stdenv.lib.licenses.cc-by-40; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ ]; - broken = true; # replaced by constructive-sheaf-semantics - }; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 49fda77d53b..6117b5fe7a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15144,8 +15144,6 @@ in inherit (haskellPackages) ghcWithPackages; }; - AgdaSheaves = callPackage ../development/libraries/agda/Agda-Sheaves { }; - bitvector = callPackage ../development/libraries/agda/bitvector { }; categories = callPackage ../development/libraries/agda/categories { }; -- cgit v1.2.3 From 781a9273a8d998b78fcd47b4f5facaeab7fc8e14 Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Sun, 29 Dec 2019 12:12:26 +0000 Subject: pretty: remove broken package --- pkgs/development/libraries/agda/pretty/contextfile | 43 ---------------------- pkgs/development/libraries/agda/pretty/default.nix | 26 ------------- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 71 deletions(-) delete mode 100644 pkgs/development/libraries/agda/pretty/contextfile delete mode 100644 pkgs/development/libraries/agda/pretty/default.nix diff --git a/pkgs/development/libraries/agda/pretty/contextfile b/pkgs/development/libraries/agda/pretty/contextfile deleted file mode 100644 index 2ea20153bbc..00000000000 --- a/pkgs/development/libraries/agda/pretty/contextfile +++ /dev/null @@ -1,43 +0,0 @@ - -Context: - -[Updated the code in response to a change to Agda. -Nils Anders Danielsson **20150319181428 - Ignore-this: f83c3dccfe25a2a5b9d0437d1dce0ec0 -] - -[Rolled back most of "Updated the code in response to changes to Agda". -Nils Anders Danielsson **20150319101413 - Ignore-this: 5a26cf9cf83d0d146cca0c15c857d20c - * One of the Agda changes has been reverted. -] - -[Updated the code in response to changes to Agda. -Nils Anders Danielsson **20150217101656 - Ignore-this: a12921aebbe0fb575ef391ba5789a391 -] - -[Modified the copyright year range. -Nils Anders Danielsson **20150213144338 - Ignore-this: 1d1b22457dd6dadcb47f5d7f3eea062 -] - -[Restored Grammar.Abstract and Grammar.Non-terminal. -Nils Anders Danielsson **20130727225031 - Ignore-this: ddccb15caa7a3c26e973997ffdb4eec1 -] - -[Modified the copyright year range. -Nils Anders Danielsson **20141128164015 - Ignore-this: b9c6dddc965738aa2a7670c4c18da67f -] - -[Updated the code to reflect changes to the library API. -Nils Anders Danielsson **20141128163950 - Ignore-this: 8094c47f23cef0fcc596ad0c18a92b56 -] - -[TAG Correct-by-Construction Pretty-Printing (2013-07-28) -Nils Anders Danielsson **20130727224432 - Ignore-this: 6aab9b2e6b638457767c8821f3c27cb4 -] diff --git a/pkgs/development/libraries/agda/pretty/default.nix b/pkgs/development/libraries/agda/pretty/default.nix deleted file mode 100644 index de4cfaa6637..00000000000 --- a/pkgs/development/libraries/agda/pretty/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, agda, fetchdarcs, AgdaStdlib }: - -agda.mkDerivation (self: rec { - version = "2015-03-19"; - name = "pretty-${version}"; - - src = fetchdarcs { - url = "http://www.cse.chalmers.se/~nad/repos/pretty/"; - context = ./contextfile; - sha256 = "0zmwh9kln7ykpmkx1qhqz64qm2arq62b17vs5fswnxk7mqxsmrf0"; - }; - - buildDepends = [ AgdaStdlib ]; - everythingFile = "Pretty.agda"; - sourceDirectories = []; - topSourceDirectories = [ "../$sourceRoot" ]; - - meta = with stdenv.lib; { - homepage = "http://www.cse.chalmers.se/~nad/publications/danielsson-correct-pretty.html"; - description = "Correct-by-Construction Pretty-Printing"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = with maintainers; [ ]; - broken = true; # 2018-04-11 - }; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6117b5fe7a5..0fafb6d5642 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15148,8 +15148,6 @@ in categories = callPackage ../development/libraries/agda/categories { }; - pretty = callPackage ../development/libraries/agda/pretty { }; - ### DEVELOPMENT / LIBRARIES / JAVA commonsBcel = callPackage ../development/libraries/java/commons/bcel { }; -- cgit v1.2.3 From 36840c5ff7813de552dedb894e4d9b6ae4e519a8 Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Sun, 29 Dec 2019 12:13:23 +0000 Subject: categories: remove broken package --- .../libraries/agda/categories/default.nix | 24 ---------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 26 deletions(-) delete mode 100644 pkgs/development/libraries/agda/categories/default.nix diff --git a/pkgs/development/libraries/agda/categories/default.nix b/pkgs/development/libraries/agda/categories/default.nix deleted file mode 100644 index fef01ee9be7..00000000000 --- a/pkgs/development/libraries/agda/categories/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, agda, fetchgit, AgdaStdlib }: - -agda.mkDerivation (self: rec { - version = "33409120d071656f5198c658145889ae2e86249c"; - name = "categories-${version}"; - - src = fetchgit { - url = "https://github.com/copumpkin/categories.git"; - rev = version; - sha256 = "15x834f7jn2s816b9vz8nm8p424ppzv6v9nayaawyl43qmaaaa5p"; - }; - - buildDepends = [ AgdaStdlib ]; - sourceDirectories = [ "Categories" "Graphs" ]; - - meta = { - homepage = "https://github.com/copumpkin/categories"; - description = "Categories parametrized by morphism equality, in Agda"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ ]; - broken = true; # doesn't work due to new agdastdlib, see #9471 - }; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0fafb6d5642..919c78bc00f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15146,8 +15146,6 @@ in bitvector = callPackage ../development/libraries/agda/bitvector { }; - categories = callPackage ../development/libraries/agda/categories { }; - ### DEVELOPMENT / LIBRARIES / JAVA commonsBcel = callPackage ../development/libraries/java/commons/bcel { }; -- cgit v1.2.3 From a519f22c03d65045996b77e89bb50c07728c85fd Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Sun, 29 Dec 2019 12:13:52 +0000 Subject: bitvector: remove broken package --- .../libraries/agda/bitvector/default.nix | 24 ---------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 26 deletions(-) delete mode 100644 pkgs/development/libraries/agda/bitvector/default.nix diff --git a/pkgs/development/libraries/agda/bitvector/default.nix b/pkgs/development/libraries/agda/bitvector/default.nix deleted file mode 100644 index bf9798557b1..00000000000 --- a/pkgs/development/libraries/agda/bitvector/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, agda, fetchgit, AgdaStdlib }: - -agda.mkDerivation (self: rec { - version = "f1c173313f2a41d95a8dc6053f9365a24690e18d"; - name = "bitvector-${version}"; - - src = fetchgit { - url = "https://github.com/copumpkin/bitvector.git"; - rev = version; - sha256 = "0jb421lxvyxz26sxa81qjmn1gfcxfh0fmbq128f0kslqhiiaqfrh"; - }; - - buildDepends = [ AgdaStdlib ]; - sourceDirectories = [ "Data" ]; - - meta = { - homepage = "https://github.com/copumpkin/bitvector"; - description = "Sequences of bits and common operations on them"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ ]; - broken = true; - }; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 919c78bc00f..f8dfe935f55 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15144,8 +15144,6 @@ in inherit (haskellPackages) ghcWithPackages; }; - bitvector = callPackage ../development/libraries/agda/bitvector { }; - ### DEVELOPMENT / LIBRARIES / JAVA commonsBcel = callPackage ../development/libraries/java/commons/bcel { }; -- cgit v1.2.3 From 6cbaa256fab7df0d213be5caa14a6a29c9a47ed0 Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Sun, 29 Dec 2019 12:25:43 +0000 Subject: agda-base: remove broken package --- .../libraries/agda/agda-base/default.nix | 23 ---------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 25 deletions(-) delete mode 100644 pkgs/development/libraries/agda/agda-base/default.nix diff --git a/pkgs/development/libraries/agda/agda-base/default.nix b/pkgs/development/libraries/agda/agda-base/default.nix deleted file mode 100644 index 678b3a28dc7..00000000000 --- a/pkgs/development/libraries/agda/agda-base/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, agda, fetchurl }: - -agda.mkDerivation (self: rec { - version = "0.1"; - name = "agda-base-${version}"; - - src = fetchurl { - url = "https://github.com/pcapriotti/agda-base/archive/v${version}.tar.gz"; - sha256 = "124h06p7jdiqr2x6r46sfab9r0cgb0fznr2qs5i1psl5yf3z74h8"; - }; - - sourceDirectories = [ "./." ]; - everythingFile = "README.agda"; - - meta = { - homepage = "https://github.com/pcapriotti/agda-base"; - description = "Base library for HoTT in Agda"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ ]; - broken = true; # largely replaced by HoTT-Agda - }; -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8dfe935f55..ea1a0791762 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15134,8 +15134,6 @@ in inherit (haskellPackages) Agda; }; - agdaBase = callPackage ../development/libraries/agda/agda-base { }; - agdaIowaStdlib = callPackage ../development/libraries/agda/agda-iowa-stdlib { }; agdaPrelude = callPackage ../development/libraries/agda/agda-prelude { }; -- cgit v1.2.3 From b9c221ccd89026af2e5b5b92344c9a465c374d2c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 25 Apr 2020 04:20:00 -0500 Subject: awsweeper: 0.6.0 -> 0.7.0 --- pkgs/tools/admin/awsweeper/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/awsweeper/default.nix b/pkgs/tools/admin/awsweeper/default.nix index 661747c2fd0..fda773b48cd 100644 --- a/pkgs/tools/admin/awsweeper/default.nix +++ b/pkgs/tools/admin/awsweeper/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "awsweeper"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "cloudetc"; repo = pname; rev = "v${version}"; - sha256 = "0sbd1jgzz3rxxwgbni885zvvcznfc51imaxwv7f064290iqlbrv4"; + sha256 = "1ybrrpnp6rh7rcwihww43cvhfhzzyy51rdk1hwy9ljpkg37k4y28"; }; - modSha256 = "14yvf0svh7xqpc2y7xr94pc6r7d3iv2nsr8qs3f5q29hdc5hv3fs"; + modSha256 = "07zz6wf9cq3wylihi9fx0rd85iybnq5z5c9gqw1lhpvqcrad4491"; meta = with lib; { description = "A tool to clean out your AWS account"; -- cgit v1.2.3 From 69bb53604e38f233492e34e57bbde19795ca41a1 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 25 Apr 2020 04:20:00 -0500 Subject: cloud-nuke: 0.1.7 -> 0.1.18 --- pkgs/development/tools/cloud-nuke/default.nix | 4 +- pkgs/development/tools/cloud-nuke/deps.nix | 93 +++++++++++++++++++++++++-- 2 files changed, 89 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/cloud-nuke/default.nix b/pkgs/development/tools/cloud-nuke/default.nix index f452b24cf07..6e070f3cc5f 100644 --- a/pkgs/development/tools/cloud-nuke/default.nix +++ b/pkgs/development/tools/cloud-nuke/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "cloud-nuke"; - version = "0.1.7"; + version = "0.1.18"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "054z6v13x55x9l5xnixxxszj8k2wa09b5ld2wq4gm4hc273s2m4k"; + sha256 = "1amk9bjrc9svvgllif2vr6xx7kc3xmwjbyb8prnm5zp82hymk5f1"; }; goPackagePath = "github.com/gruntwork-io/cloud-nuke"; diff --git a/pkgs/development/tools/cloud-nuke/deps.nix b/pkgs/development/tools/cloud-nuke/deps.nix index ffd50762ee2..c354bd985fd 100644 --- a/pkgs/development/tools/cloud-nuke/deps.nix +++ b/pkgs/development/tools/cloud-nuke/deps.nix @@ -5,8 +5,8 @@ fetch = { type = "git"; url = "https://github.com/aws/aws-sdk-go"; - rev = "180cc10e5ff368b86dee226b034af7d1672baec6"; - sha256 = "0xphkjqhcn8zq7gali0v32kq2xpbnnw1g7r5vr5p763q2z5c436w"; + rev = "1f4898f67806740d2a91c9dfe9a8be8a61523eb4"; + sha256 = "1znjv4irzqxwizdp3dxgb5w9x06xjs79a3s68afzrblz97kf94kc"; }; } { @@ -18,6 +18,15 @@ sha256 = "02dfrj0wyphd3db9zn2mixqxwiz1ivnyc5xc7gkz58l5l27nzp8s"; }; } + { + goPackagePath = "github.com/boombuler/barcode"; + fetch = { + type = "git"; + url = "https://github.com/boombuler/barcode"; + rev = "3cfea5ab600ae37946be2b763b8ec2c1cf2d272d"; + sha256 = "1fzb8wz1ny2sc78g9rm0bcm80pgwvkm2k6lmim2sb4jgm1j3sajd"; + }; + } { goPackagePath = "github.com/davecgh/go-spew"; fetch = { @@ -45,6 +54,33 @@ sha256 = "1skj4vh9h7c5lk1pw8y6740w2k99z398jl0aasn63x83viqjf1zw"; }; } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "72cd26f257d44c1114970e19afddcd812016007e"; + sha256 = "1fvsvwc1v2i0gqn01mynvi1shp5xm0xaym6xng09fcbqb56lbjx1"; + }; + } + { + goPackagePath = "github.com/golang/mock"; + fetch = { + type = "git"; + url = "https://github.com/golang/mock"; + rev = "b48cb6623c04dae64c28537143aca42d16561daf"; + sha256 = "1zb4n285mv85dh3y2f8fqbs30h2dhzw7vbczr6z0zg2gqr6vzg0q"; + }; + } + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "064e2069ce9c359c118179501254f67d7d37ba24"; + sha256 = "1b1ibx3rbiv7xwa9kz4b4zpp1fza5cjnn8v6749b4vrkjjmp3rqb"; + }; + } { goPackagePath = "github.com/gruntwork-io/gruntwork-cli"; fetch = { @@ -54,13 +90,22 @@ sha256 = "1x6g2s4f66c4pb8dwvjnj4i70ik43ak2x189v2ys218nz4zkjs74"; }; } + { + goPackagePath = "github.com/gruntwork-io/terratest"; + fetch = { + type = "git"; + url = "https://github.com/gruntwork-io/terratest"; + rev = "bd5fdfc1564ec40a149a6e579d6ca20ebf2eaca4"; + sha256 = "1vbipykcwhmzs2qxfxdnq3gdi3i5ds6pykjjxqw3f1llad2dihby"; + }; + } { goPackagePath = "github.com/jmespath/go-jmespath"; fetch = { type = "git"; url = "https://github.com/jmespath/go-jmespath"; - rev = "0b12d6b5"; - sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld"; + rev = "c2b33e84"; + sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz"; }; } { @@ -90,6 +135,15 @@ sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; }; } + { + goPackagePath = "github.com/pquerna/otp"; + fetch = { + type = "git"; + url = "https://github.com/pquerna/otp"; + rev = "43bebefda392017900e7a7b237b4c914c6a55b50"; + sha256 = "088njs8i7b0syyz20hzd3lcjxy61chc518d71lvykw2g9c9wsc7l"; + }; + } { goPackagePath = "github.com/sirupsen/logrus"; fetch = { @@ -104,8 +158,8 @@ fetch = { type = "git"; url = "https://github.com/stretchr/testify"; - rev = "b91bfb9ebec76498946beb6af7c0230c7cc7ba6c"; - sha256 = "178xyfgsbs40jq406aqj0r67ik1b81gdc28z45nbcw6hfhz82rvl"; + rev = "3ebf1ddaeb260c4b1ae502a01c7844fa8c1fa0e9"; + sha256 = "09r89m1wy4cjv2nps1ykp00qjpi0531r07q3s34hr7m6njk4srkl"; }; } { @@ -126,6 +180,15 @@ sha256 = "1621j82c1hiw4pxjdvaf5qyirwv5c0bqwlrhhna9pnjsgr5pkw33"; }; } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "ca1201d0de80cfde86cb01aea620983605dfe99b"; + sha256 = "16j9xyby1vfl4ch6wqzafxxxnxvcp8vhzknpchwabci1f2zcsn6i"; + }; + } { goPackagePath = "golang.org/x/sys"; fetch = { @@ -135,4 +198,22 @@ sha256 = "0gj9nwryyzf9rn33gl3zm6rxvg1zhrhwi36akipqj37x4g86h3gz"; }; } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "b2f4a3cf3c67576a2ee09e1fe62656a5086ce880"; + sha256 = "0zxlvwzxwkwz4bs4h9zc9979dx76y4xf9ks4d22bclg47dv59yry"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://github.com/go-yaml/yaml"; + rev = "53403b58ad1b561927d19068c655246f2db79d48"; + sha256 = "1inf7svydzscwv9fcjd2rm61a4xjk6jkswknybmns2n58shimapw"; + }; + } ] \ No newline at end of file -- cgit v1.2.3 From ccfdcf16f40e2e01a6183b591315d4da9fe8dcdd Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 25 Apr 2020 04:20:00 -0500 Subject: bat: 0.14.0 -> 0.15.0 Changelog: https://github.com/sharkdp/bat/releases/tag/v0.15.0 --- pkgs/tools/misc/bat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/bat/default.nix b/pkgs/tools/misc/bat/default.nix index 201ad5ed03f..d08a609735f 100644 --- a/pkgs/tools/misc/bat/default.nix +++ b/pkgs/tools/misc/bat/default.nix @@ -4,17 +4,17 @@ rustPlatform.buildRustPackage rec { pname = "bat"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "0wxmn3ifrgpfq44xs747qqik2p2vazdw5zi4imxqap2krha4k2ms"; + sha256 = "07yng5bwhin7yqj1hihmxgi8w0n45nks05a8795zwsw92k373ib4"; fetchSubmodules = true; }; - cargoSha256 = "0bs6pqrg0vdam2h2ddikmgmksqlfjljqacc52rh6p546is6jcp2s"; + cargoSha256 = "1xqbpij6lr0bqyi0cfwgp3d4hcjhibpdc4dfm9gb39mmbgradrzf"; nativeBuildInputs = [ pkgconfig llvmPackages.libclang installShellFiles makeWrapper ]; -- cgit v1.2.3 From 3acee227915c2f4b9aba5ecf5e6eb668ba47acee Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Fri, 24 Apr 2020 19:29:46 +0200 Subject: tartube: init at 2.0.016 --- pkgs/applications/video/tartube/default.nix | 68 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 70 insertions(+) create mode 100644 pkgs/applications/video/tartube/default.nix diff --git a/pkgs/applications/video/tartube/default.nix b/pkgs/applications/video/tartube/default.nix new file mode 100644 index 00000000000..ae222ae05a7 --- /dev/null +++ b/pkgs/applications/video/tartube/default.nix @@ -0,0 +1,68 @@ +{ stdenv +, lib +, fetchFromGitHub +, gdk-pixbuf +, gobject-introspection +, gtk3 +, libnotify +, pango +, python3Packages +, wrapGAppsHook +, youtube-dl +, glib +}: + +python3Packages.buildPythonApplication rec { + pname = "tartube"; + version = "2.0.016"; + + src = fetchFromGitHub { + owner = "axcore"; + repo = "tartube"; + rev = "v${version}"; + sha256 = "1y77ykihyi4v6xlsm5xldbs9lzq229l574rxz6qfvrjcbbwajfj9"; + }; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook + ]; + + strictDeps = false; + + propagatedBuildInputs = with python3Packages; [ + moviepy + pygobject3 + pyxdg + requests + ]; + + buildInputs = [ + gdk-pixbuf + gtk3 + glib + libnotify + pango + ]; + + postInstall = '' + mkdir -p $out/share/{man/man1,applications,pixmaps} + cp pack/tartube.1 $out/share/man/man1 + cp pack/tartube.desktop $out/share/applications + cp pack/tartube.{png,xpm} $out/share/pixmaps + ''; + + doCheck = false; + + makeWrapperArgs = [ + "--prefix PATH : ${stdenv.lib.makeBinPath [ youtube-dl ]}" + ]; + + meta = with lib; { + description = "A GUI front-end for youtube-dl"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ mkg20001 luc65r ]; + homepage = "https://tartube.sourceforge.io/"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0562f88570..f3e9568e8a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6870,6 +6870,8 @@ in tarsnapper = callPackage ../tools/backup/tarsnapper { }; + tartube = callPackage ../applications/video/tartube { }; + tayga = callPackage ../tools/networking/tayga { }; tcpcrypt = callPackage ../tools/security/tcpcrypt { }; -- cgit v1.2.3 From d89ed04ea4670664d637fc80129ad03561b53fea Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 6 Apr 2020 10:37:41 +0300 Subject: guvcview: fix gsettings filechooser errors --- pkgs/os-specific/linux/guvcview/default.nix | 32 ++++++++++++++++------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix index e87768a9ff1..c74978ac044 100644 --- a/pkgs/os-specific/linux/guvcview/default.nix +++ b/pkgs/os-specific/linux/guvcview/default.nix @@ -1,5 +1,5 @@ { config, stdenv, fetchurl, intltool, pkgconfig -, gtk3, portaudio, SDL2, ffmpeg, udev, libusb1, libv4l, alsaLib, gsl +, gtk3, portaudio, SDL2, ffmpeg, udev, libusb1, libv4l, alsaLib, gsl, wrapGAppsHook , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null }: assert pulseaudioSupport -> libpulseaudio != null; @@ -13,19 +13,23 @@ stdenv.mkDerivation rec { sha256 = "11byyfpkcik7wvf2qic77zjamfr2rhji97dpj1gy2fg1bvpiqf4m"; }; - buildInputs = - [ SDL2 - alsaLib - ffmpeg - gtk3 - intltool - libusb1 - libv4l - pkgconfig - portaudio - udev - gsl - ] ++ stdenv.lib.optional pulseaudioSupport libpulseaudio; + nativeBuildInputs = [ + wrapGAppsHook + ]; + + buildInputs = [ + SDL2 + alsaLib + ffmpeg + gtk3 + intltool + libusb1 + libv4l + pkgconfig + portaudio + udev + gsl + ] ++ stdenv.lib.optional pulseaudioSupport libpulseaudio; meta = with stdenv.lib; { description = "A simple interface for devices supported by the linux UVC driver"; -- cgit v1.2.3 From 6bac53e691cc0c4ead541977669b420e419cb860 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 6 Apr 2020 19:51:34 +0300 Subject: guvcview: move some packages to nativeBuildInputs --- pkgs/os-specific/linux/guvcview/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix index c74978ac044..0f120ba0171 100644 --- a/pkgs/os-specific/linux/guvcview/default.nix +++ b/pkgs/os-specific/linux/guvcview/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ + intltool + pkgconfig wrapGAppsHook ]; @@ -22,10 +24,8 @@ stdenv.mkDerivation rec { alsaLib ffmpeg gtk3 - intltool libusb1 libv4l - pkgconfig portaudio udev gsl -- cgit v1.2.3 From ac0f42dee8e37f9fd54b597c53635a490a7262d8 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 6 Apr 2020 23:45:54 +0300 Subject: guvcview: format arguments --- pkgs/os-specific/linux/guvcview/default.nix | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix index 0f120ba0171..fa525170056 100644 --- a/pkgs/os-specific/linux/guvcview/default.nix +++ b/pkgs/os-specific/linux/guvcview/default.nix @@ -1,6 +1,21 @@ -{ config, stdenv, fetchurl, intltool, pkgconfig -, gtk3, portaudio, SDL2, ffmpeg, udev, libusb1, libv4l, alsaLib, gsl, wrapGAppsHook -, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux, libpulseaudio ? null }: +{ config +, stdenv +, fetchurl +, intltool +, pkgconfig +, gtk3 +, portaudio +, SDL2 +, ffmpeg +, udev +, libusb1 +, libv4l +, alsaLib +, gsl +, wrapGAppsHook +, pulseaudioSupport ? config.pulseaudio or stdenv.isLinux +, libpulseaudio ? null +}: assert pulseaudioSupport -> libpulseaudio != null; -- cgit v1.2.3 From 6aaab573e276e05712ed9552835d4b7cb4232695 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 6 Apr 2020 23:46:21 +0300 Subject: guvcview: enable to build with both qt5 and gtk3 --- pkgs/os-specific/linux/guvcview/default.nix | 34 ++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix index fa525170056..0efdbcede48 100644 --- a/pkgs/os-specific/linux/guvcview/default.nix +++ b/pkgs/os-specific/linux/guvcview/default.nix @@ -3,7 +3,6 @@ , fetchurl , intltool , pkgconfig -, gtk3 , portaudio , SDL2 , ffmpeg @@ -12,9 +11,17 @@ , libv4l , alsaLib , gsl -, wrapGAppsHook +, libpng +, sfml , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux , libpulseaudio ? null +, useQt ? false +, qt5 ? null +, wrapQtAppsHook ? null +# can be turned off if used as a library +, useGtk ? true +, gtk3 ? null +, wrapGAppsHook ? null }: assert pulseaudioSupport -> libpulseaudio != null; @@ -31,20 +38,35 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ intltool pkgconfig - wrapGAppsHook - ]; + ] + ++ stdenv.lib.optionals (useGtk) [ wrapGAppsHook ] + ++ stdenv.lib.optionals (useQt) [ wrapQtAppsHook ] + ; buildInputs = [ SDL2 alsaLib ffmpeg - gtk3 libusb1 libv4l portaudio udev gsl - ] ++ stdenv.lib.optional pulseaudioSupport libpulseaudio; + libpng + sfml + ] + ++ stdenv.lib.optionals (pulseaudioSupport) [ libpulseaudio ] + ++ stdenv.lib.optionals (useGtk) [ gtk3 ] + ++ stdenv.lib.optionals (useQt) [ + qt5.qtbase + ] + ; + configureFlags = [ + "--enable-sfml" + ] + ++ stdenv.lib.optionals (useGtk) [ "--enable-gtk3" ] + ++ stdenv.lib.optionals (useQt) [ "--enable-qt5" ] + ; meta = with stdenv.lib; { description = "A simple interface for devices supported by the linux UVC driver"; -- cgit v1.2.3 From 1bfde2e0ce144059098f9a8c82fd008834c26acd Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 6 Apr 2020 23:47:51 +0300 Subject: qstopmotion: use more suitable guvcview build --- pkgs/top-level/all-packages.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f182b6d250c..2a05c25bd86 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21502,7 +21502,12 @@ in qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { }; - qstopmotion = libsForQt5.callPackage ../applications/video/qstopmotion { }; + qstopmotion = libsForQt5.callPackage ../applications/video/qstopmotion { + guvcview = guvcview.override { + useQt = true; + useGtk = false; + }; + }; qsynth = libsForQt5.callPackage ../applications/audio/qsynth { }; -- cgit v1.2.3 From aefb4d3dc94ccf219f01c27c856b078bbe573727 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 25 Apr 2020 01:04:50 +0200 Subject: dmenu-wayland: 2020-02-28 -> 2020-04-03 --- pkgs/applications/misc/dmenu/wayland.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/dmenu/wayland.nix b/pkgs/applications/misc/dmenu/wayland.nix index 7b17d484771..ca2e6f56e84 100644 --- a/pkgs/applications/misc/dmenu/wayland.nix +++ b/pkgs/applications/misc/dmenu/wayland.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "dmenu-wayland-unstable"; - version = "2020-02-28"; + version = "2020-04-03"; src = fetchFromGitHub { owner = "nyyManni"; repo = "dmenu-wayland"; - rev = "68e08e8bcde10a10ac3290431f173c6c7fce4238"; - sha256 = "10b1v2brgpgb6wkzn62haj56zmkf3aq6fs3p9rp6bxiw8bs2nvlm"; + rev = "550a7c39f3f925b803d51c616609c8cb6c0ea543"; + sha256 = "0az3w1csn4x6mjyacg6lf70kykdfqamic3hbr57mj83i5jjv0jlv"; }; outputs = [ "out" "man" ]; -- cgit v1.2.3 From a194de9a9d36fdbe5da26f622968afe3c9878e9e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 25 Apr 2020 01:26:01 +0200 Subject: diffoscope: 138 -> 142 --- pkgs/tools/misc/diffoscope/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 0ce0e1be325..02d9c504070 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -9,13 +9,15 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "138"; + version = "142"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "171nz5n4dayr7bj04h0x282vdk92kp7lgarnb3x0md91m2i9x997"; + sha256 = "0c6lvppghw9ynjg2radr8z3fc6lpgmgwr6kxyih7q4rxqf4gfv6i"; }; + outputs = [ "out" "man" ]; + patches = [ ./ignore_links.patch ]; -- cgit v1.2.3 From 74fcd4f2d61c0d93bb59ed1b1e12c60f7a530969 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 25 Apr 2020 12:12:54 +0200 Subject: ell: 0.30 -> 0.31 --- pkgs/os-specific/linux/ell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index 69c1f8de2ea..cb971d452d6 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { pname = "ell"; - version = "0.30"; + version = "0.31"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git"; rev = version; - sha256 = "0kiglgc02a6hqi1nhnl4d8lxax8b1fljp50pvqswrnbh7pgb5676"; + sha256 = "1qlpc906xd78fzxvvj2kxi3aikgnw0c0h3x620s131apax4qrnqa"; }; patches = [ -- cgit v1.2.3 From 61c95a2eec3691a3f494ffaf8b3c187f9e5e7634 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 25 Apr 2020 12:13:01 +0200 Subject: iwd: 1.6 -> 1.7 --- pkgs/os-specific/linux/iwd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index 02bd83d9da6..be2a4ff3e56 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -13,12 +13,12 @@ stdenv.mkDerivation rec { pname = "iwd"; - version = "1.6"; + version = "1.7"; src = fetchgit { url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git"; rev = version; - sha256 = "0c38c7a234cwdd5y1brq4w56xszs8zlp57rr3nvgp8z8djcy1qvx"; + sha256 = "1qi25qav1rv8gm5lbrip8ayq5vwynmyv2q4ar7bbmnjh6cglvyh2"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 77dc7ef908142a11d507c034e33edc1112be7187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 25 Apr 2020 11:03:30 +0100 Subject: wireguard-tools: reference tests --- pkgs/tools/networking/wireguard-tools/default.nix | 25 ++++++++++++++--------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index 0a86d7dec8f..82e74f1a4fd 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -1,12 +1,12 @@ -{ - stdenv, fetchzip, - - iptables ? null, - iproute ? null, - makeWrapper ? null, - openresolv ? null, - procps ? null, - wireguard-go ? null, +{ stdenv +, fetchzip +, nixosTests +, iptables ? null +, iproute ? null +, makeWrapper ? null +, openresolv ? null +, procps ? null +, wireguard-go ? null }: with stdenv.lib; @@ -47,7 +47,12 @@ stdenv.mkDerivation rec { done ''; - passthru.updateScript = ./update.sh; + passthru = { + updateScript = ./update.sh; + tests = { + inherit (nixosTests) wg-quick wireguard-generated wireguard-namespaces; + }; + }; meta = { description = "Tools for the WireGuard secure network tunnel"; -- cgit v1.2.3 From 21ec1f5eadc5f6ca8b0b6599eda3dcf59629f1f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 25 Apr 2020 07:19:26 +0100 Subject: wireguard: 1.0.20200401 -> 1.0.20200413 --- pkgs/os-specific/linux/wireguard/default.nix | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 890c774081b..6edbb1aa4d7 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, kernel, perl, wireguard-tools }: +{ stdenv, fetchzip, kernel, perl, wireguard-tools, bc }: # module requires Linux >= 3.10 https://www.wireguard.io/install/#kernel-requirements assert stdenv.lib.versionAtLeast kernel.version "3.10"; @@ -7,29 +7,31 @@ assert stdenv.lib.versionOlder kernel.version "5.6"; stdenv.mkDerivation rec { pname = "wireguard"; - version = "1.0.20200401"; + version = "1.0.20200413"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"; - sha256 = "1q4gfpbvbyracnl219xqfz5yqfc08i6g41z6bn2skx5x8jbll3aq"; + sha256 = "11dpw1inszbc3qjcfnap74kgjxkyyrx90vxv6wmsgkbp8lsl4p66"; }; - preConfigure = '' - cd src - sed -i '/depmod/,+1d' Makefile - ''; - hardeningDisable = [ "pic" ]; KERNELDIR = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; - INSTALL_MOD_PATH = "\${out}"; - - NIX_CFLAGS = ["-Wno-error=cpp"]; - nativeBuildInputs = [ perl ] ++ kernel.moduleBuildDependencies; + nativeBuildInputs = [ perl bc ] ++ kernel.moduleBuildDependencies; + preBuild = "cd src"; buildFlags = [ "module" ]; - installTargets = [ "module-install" ]; + + INSTALL_MOD_PATH = placeholder "out"; + installFlags = [ "DEPMOD=true" ]; + enableParallelBuilding = true; + + passthru = { + # remove this when our kernel comes with native wireguard support + # and our tests no longer tests this package + inherit (wireguard-tools) tests; + }; meta = with stdenv.lib; { inherit (wireguard-tools.meta) homepage license maintainers; -- cgit v1.2.3 From 5700232c3fadd8e5f02f21c5e99753544482b4d4 Mon Sep 17 00:00:00 2001 From: misuzu Date: Sat, 25 Apr 2020 13:00:05 +0300 Subject: nixos/nixos-installer: use temporary directory on target filesystem nix build should store it's temporary files on target filesystem. This should fix 'No space left on device' on systems with low amount of RAM when there is a need to build something like Linux kernel --- nixos/modules/installer/tools/nixos-install.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index defc46ad2a7..19676f4e735 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -83,8 +83,11 @@ if [[ ! -e $NIXOS_CONFIG && -z $system ]]; then fi # A place to drop temporary stuff. +tmpdir="$(mktemp -d -p $mountPoint)" trap "rm -rf $tmpdir" EXIT -tmpdir="$(mktemp -d)" + +# store temporary files on target filesystem by default +export TMPDIR=${TMPDIR:-$tmpdir} sub="auto?trusted=1" -- cgit v1.2.3 From 3e9f3a3ebd8c2925f28efa91cafa56948ecab021 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 25 Apr 2020 14:35:20 +0200 Subject: hostapd: apply patch for CVE-2019-16275 AP mode PMF disconnection protection bypass Published: September 11, 2019 Identifiers: - CVE-2019-16275 Latest version available from: https://w1.fi/security/2019-7/ Vulnerability hostapd (and wpa_supplicant when controlling AP mode) did not perform sufficient source address validation for some received Management frames and this could result in ending up sending a frame that caused associated stations to incorrectly believe they were disconnected from the network even if management frame protection (also known as PMF) was negotiated for the association. This could be considered to be a denial of service vulnerability since PMF is supposed to protect from this type of issues. It should be noted that if PMF is not enabled, there would be no protocol level protection against this type of denial service attacks. An attacker in radio range of the access point could inject a specially constructed unauthenticated IEEE 802.11 frame to the access point to cause associated stations to be disconnected and require a reconnection to the network. Vulnerable versions/configurations All hostapd and wpa_supplicants versions with PMF support (CONFIG_IEEE80211W=y) and a runtime configuration enabled AP mode with PMF being enabled (optional or required). In addition, this would be applicable only when using user space based MLME/SME in AP mode, i.e., when hostapd (or wpa_supplicant when controlling AP mode) would process authentication and association management frames. This condition would be applicable mainly with drivers that use mac80211. Possible mitigation steps - Merge the following commit to wpa_supplicant/hostapd and rebuild: AP: Silently ignore management frame from unexpected source address This patch is available from https://w1.fi/security/2019-7/ - Update to wpa_supplicant/hostapd v2.10 or newer, once available --- pkgs/os-specific/linux/hostapd/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix index 869a394cefb..8152655d457 100644 --- a/pkgs/os-specific/linux/hostapd/default.nix +++ b/pkgs/os-specific/linux/hostapd/default.nix @@ -17,7 +17,13 @@ stdenv.mkDerivation rec { # Note: fetchurl seems to be unhappy with openwrt git # server's URLs containing semicolons. Using the github mirror instead. url = "https://raw.githubusercontent.com/openwrt/openwrt/master/package/network/services/hostapd/patches/300-noscan.patch"; - sha256 = "04wg4yjc19wmwk6gia067z99gzzk9jacnwxh5wyia7k5wg71yj5k";}) + sha256 = "04wg4yjc19wmwk6gia067z99gzzk9jacnwxh5wyia7k5wg71yj5k"; + }) + (fetchurl { + name = "CVE-2019-16275.patch"; + url = "https://w1.fi/security/2019-7/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch"; + sha256 = "15xjyy7crb557wxpx898b5lnyblxghlij0xby5lmj9hpwwss34dz"; + }) ]; outputs = [ "out" "man" ]; -- cgit v1.2.3 From b5f9eb06b5a2e6513944283ecef97be1d4c92509 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 23 Apr 2020 18:23:25 +0200 Subject: ocamlPackages.mirage-time(-unix): init at 2.0.1 --- .../ocaml-modules/mirage-time/default.nix | 22 ++++++++++++++++++++++ .../development/ocaml-modules/mirage-time/unix.nix | 13 +++++++++++++ pkgs/top-level/ocaml-packages.nix | 4 ++++ 3 files changed, 39 insertions(+) create mode 100644 pkgs/development/ocaml-modules/mirage-time/default.nix create mode 100644 pkgs/development/ocaml-modules/mirage-time/unix.nix diff --git a/pkgs/development/ocaml-modules/mirage-time/default.nix b/pkgs/development/ocaml-modules/mirage-time/default.nix new file mode 100644 index 00000000000..b98fd3b6279 --- /dev/null +++ b/pkgs/development/ocaml-modules/mirage-time/default.nix @@ -0,0 +1,22 @@ +{ lib, buildDunePackage, fetchurl, ocaml_lwt }: + +buildDunePackage rec { + minimumOCamlVersion = "4.06"; + + pname = "mirage-time"; + version = "2.0.1"; + + src = fetchurl { + url = "https://github.com/mirage/mirage-time/releases/download/v${version}/mirage-time-v${version}.tbz"; + sha256 = "1w6mm4g7fc19cs0ncs0s9fsnb1k1s04qqzs9bsqvq8ngsb90cbh0"; + }; + + propagatedBuildInputs = [ ocaml_lwt ]; + + meta = with lib; { + homepage = "https://github.com/mirage/mirage-time"; + description = "Time operations for MirageOS"; + license = licenses.isc; + maintainers = with maintainers; [ sternenseemann ]; + }; +} diff --git a/pkgs/development/ocaml-modules/mirage-time/unix.nix b/pkgs/development/ocaml-modules/mirage-time/unix.nix new file mode 100644 index 00000000000..da5326bc075 --- /dev/null +++ b/pkgs/development/ocaml-modules/mirage-time/unix.nix @@ -0,0 +1,13 @@ +{ buildDunePackage, fetchurl, mirage-time, ocaml_lwt, duration }: + +buildDunePackage { + pname = "mirage-time-unix"; + + inherit (mirage-time) src version minimumOCamlVersion; + + propagatedBuildInputs = [ mirage-time ocaml_lwt duration ]; + + meta = mirage-time.meta // { + description = "Time operations for MirageOS on Unix"; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 3cbb0a7df33..cef4e913026 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -562,6 +562,10 @@ let mirage-stack = callPackage ../development/ocaml-modules/mirage-stack { }; + mirage-time = callPackage ../development/ocaml-modules/mirage-time { }; + + mirage-time-unix = callPackage ../development/ocaml-modules/mirage-time/unix.nix { }; + mlgmp = callPackage ../development/ocaml-modules/mlgmp { }; mlgmpidl = callPackage ../development/ocaml-modules/mlgmpidl { }; -- cgit v1.2.3 From 0c4386bf0a55a7332c0948abcd9c875e8627847f Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 23 Apr 2020 18:24:15 +0200 Subject: ocamlPackages.dns(-client): 4.4.1 -> 4.5.0 jackline: 2020-03-22 -> 2020-04-24 Dependency mtime is no longer needed --- .../networking/instant-messengers/jackline/default.nix | 8 ++++---- pkgs/development/ocaml-modules/dns/client.nix | 8 ++++++-- pkgs/development/ocaml-modules/dns/default.nix | 4 ++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/jackline/default.nix b/pkgs/applications/networking/instant-messengers/jackline/default.nix index 92857aa1a66..f2b026e79da 100644 --- a/pkgs/applications/networking/instant-messengers/jackline/default.nix +++ b/pkgs/applications/networking/instant-messengers/jackline/default.nix @@ -4,19 +4,19 @@ assert stdenv.lib.versionAtLeast ocamlPackages.ocaml.version "4.07"; stdenv.mkDerivation { pname = "jackline"; - version = "unstable-2020-03-22"; + version = "unstable-2020-04-24"; src = fetchFromGitHub { owner = "hannesm"; repo = "jackline"; - rev = "52f84525c74c43e8d03fb1e6ff025ccb2699e4aa"; - sha256 = "0wir573ah1w16xzdn9rfwk3569zq4ff5frp0ywq70va4gdlb679c"; + rev = "885b97b90d565f5f7c2b5f66f5edf14a82251b87"; + sha256 = "1mdn413ya2g0a1mrdbh1b65gnygrxb08k99z5lmidhh34kd1llsj"; }; buildInputs = with ocamlPackages; [ ocaml ocamlbuild findlib topkg ppx_sexp_conv ppx_deriving erm_xmpp tls mirage-crypto mirage-crypto-pk x509 domain-name - ocaml_lwt otr astring ptime mtime notty sexplib hex uutf + ocaml_lwt otr astring ptime notty sexplib hex uutf dns-client base64 ]; diff --git a/pkgs/development/ocaml-modules/dns/client.nix b/pkgs/development/ocaml-modules/dns/client.nix index d007533fe45..0dd0541138c 100644 --- a/pkgs/development/ocaml-modules/dns/client.nix +++ b/pkgs/development/ocaml-modules/dns/client.nix @@ -1,10 +1,14 @@ -{ lib, buildDunePackage, dns, ocaml_lwt, mirage-clock, mirage-random, mirage-stack, mtime, randomconv }: +{ lib, buildDunePackage, dns, ocaml_lwt, mirage-clock, mirage-time +, mirage-random, mirage-stack, mirage-crypto-rng, mtime, randomconv }: buildDunePackage { pname = "dns-client"; inherit (dns) src version; - propagatedBuildInputs = [ dns mtime ocaml_lwt mirage-clock mirage-random mirage-stack randomconv ]; + useDune2 = true; + + propagatedBuildInputs = [ dns mtime ocaml_lwt randomconv mirage-clock mirage-time + mirage-random mirage-stack mirage-crypto-rng ]; meta = dns.meta // { description = "Pure DNS resolver API"; diff --git a/pkgs/development/ocaml-modules/dns/default.nix b/pkgs/development/ocaml-modules/dns/default.nix index e2aac3367bf..01bbffd40b9 100644 --- a/pkgs/development/ocaml-modules/dns/default.nix +++ b/pkgs/development/ocaml-modules/dns/default.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "dns"; - version = "4.4.1"; + version = "4.5.0"; minimumOCamlVersion = "4.07"; src = fetchurl { url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-v${version}.tbz"; - sha256 = "18c09jf0kicv2xz40n367y774rg8qs07rr1vdk8bx8f7hnaa9cn8"; + sha256 = "10jrnnxvp06rvzk285wibyi9hn15qhjnqjy9xsfbwl8yhmzzqnq0"; }; propagatedBuildInputs = [ cstruct domain-name duration gmap ipaddr logs lru metrics ptime rresult ]; -- cgit v1.2.3 From 03c0ab3857e9667039c87ed7520a51a2ae12838c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Apr 2020 15:18:44 +0200 Subject: goocanvasmm2: fix update script attrPath --- pkgs/development/libraries/goocanvasmm/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/goocanvasmm/default.nix b/pkgs/development/libraries/goocanvasmm/default.nix index ef593c568a2..d8a910d4799 100644 --- a/pkgs/development/libraries/goocanvasmm/default.nix +++ b/pkgs/development/libraries/goocanvasmm/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; + attrPath = "goocanvasmm2"; }; }; -- cgit v1.2.3 From 22133c6bf3cf8b285db182dcf804476d6456beff Mon Sep 17 00:00:00 2001 From: Renato Garcia Date: Sat, 25 Apr 2020 10:19:54 -0300 Subject: snakemake: 5.13.0 -> 5.15.0 (#85913) --- pkgs/applications/science/misc/snakemake/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/misc/snakemake/default.nix b/pkgs/applications/science/misc/snakemake/default.nix index e54dc785b08..af4e225ca32 100644 --- a/pkgs/applications/science/misc/snakemake/default.nix +++ b/pkgs/applications/science/misc/snakemake/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "snakemake"; - version = "5.13.0"; + version = "5.15.0"; propagatedBuildInputs = with python3Packages; [ appdirs @@ -22,13 +22,13 @@ python3Packages.buildPythonApplication rec { src = python3Packages.fetchPypi { inherit pname version; - sha256 = "11snr7sgv70d3y63s5svijfx8f4xpggh96g8chr6lccl4mi1s9x9"; + sha256 = "10cd1k5vg8ra5fnpqpdbl04qwx6h2mmmqbn71pl8j69w9110dkys"; }; doCheck = false; # Tests depend on Google Cloud credentials at ${HOME}/gcloud-service-key.json meta = with stdenv.lib; { - homepage = "https://snakemake.bitbucket.io"; + homepage = "https://snakemake.readthedocs.io"; license = licenses.mit; description = "Python-based execution environment for make-like workflows"; longDescription = '' -- cgit v1.2.3 From f544c293ecc59a2e7c7be2deabe5f1cb5b7c160b Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Apr 2020 15:23:35 +0200 Subject: gnome3.updateScript: fix tarball eval on nonexisting attrpaths As reported in https://github.com/NixOS/nixpkgs/commit/974f11cb2972f470ab4b7a71fdf8f09dfdff562b#commitcomment-38735081, the tarball will fail to evaluate when updateScript is given a non-existing attrPath because getAttrFromPath uses abort, which terminates the evaluation. --- pkgs/desktops/gnome-3/update.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/update.nix b/pkgs/desktops/gnome-3/update.nix index 555504086a4..506c265270c 100644 --- a/pkgs/desktops/gnome-3/update.nix +++ b/pkgs/desktops/gnome-3/update.nix @@ -5,7 +5,7 @@ let python = python3.withPackages (p: [ p.requests ]); upperBoundFlag = let - package = lib.getAttrFromPath (lib.splitString "." attrPath) pkgs; + package = lib.attrByPath (lib.splitString "." attrPath) (throw "Cannot find attribute ‘${attrPath}’.") pkgs; packageVersion = lib.getVersion package; versionComponents = lib.versions.splitVersion packageVersion; minorVersion = lib.versions.minor packageVersion; -- cgit v1.2.3 From 4239bf17ec3c9a7583162dee93b2005dab956b77 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 25 Apr 2020 15:32:16 +0200 Subject: gnome3.updateScript: optimize unfrozen updates When the updates are not frozen, there is no need to try to extract versions from attributes. --- pkgs/desktops/gnome-3/update.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/update.nix b/pkgs/desktops/gnome-3/update.nix index 506c265270c..1bceddf77eb 100644 --- a/pkgs/desktops/gnome-3/update.nix +++ b/pkgs/desktops/gnome-3/update.nix @@ -12,7 +12,7 @@ let minorAvailable = builtins.length versionComponents > 1 && builtins.match "[0-9]+" minorVersion != null; nextMinor = builtins.fromJSON minorVersion + 1; upperBound = "${lib.versions.major packageVersion}.${builtins.toString nextMinor}"; - in lib.optionalString (minorAvailable && freeze) ''--upper-bound="${upperBound}"''; + in lib.optionalString (freeze && minorAvailable) ''--upper-bound="${upperBound}"''; updateScript = writeScript "gnome-update-script" '' #!${stdenv.shell} set -o errexit -- cgit v1.2.3 From 982c6fc68f6eb8b456c55b2b028bdf52522ead91 Mon Sep 17 00:00:00 2001 From: Cody Allen Date: Fri, 24 Apr 2020 06:42:57 -0700 Subject: unison-ucm: 1.0.M1h-alpha -> 1.0.M1j-alpha Replaces #84235 --- pkgs/development/compilers/unison/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix index a8867d31465..c2cbc03ca0f 100644 --- a/pkgs/development/compilers/unison/default.nix +++ b/pkgs/development/compilers/unison/default.nix @@ -4,18 +4,18 @@ stdenv.mkDerivation rec { pname = "unison-code-manager"; - milestone_id = "M1h"; + milestone_id = "M1j"; version = "1.0.${milestone_id}-alpha"; src = if (stdenv.isDarwin) then fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-osx.tar.gz"; - sha256 = "0iivm5gmbk0fq0zr3lvck6p1c2i7i54l3rf70z677529w9irzchp"; + sha256 = "1pvdjmasgl22inbr8nlizsg8s5zagn8bzwhaxqmwafkpsskz0hsg"; } else fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-linux64.tar.gz"; - sha256 = "0fb84c1yn8pidflh7kq696j3v4blkvbk1fsqp36h30p7vv676yci"; + sha256 = "1xpblx405cp3mv0vrhcqwjlxvrhgmc77mxbvcy93srxja3qai1af"; }; # The tarball is just the prebuilt binary, in the archive root. -- cgit v1.2.3 From 1985c6b9d5de7c2a19e0f58afcddf6123c2e62ae Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 18 Apr 2020 23:18:41 +0100 Subject: afl: fix afl-clang-fast++ by making it a copy of afl-clang-fast, not a symlink a symlink gets skipped by wrapProgram and this ends up confusing the nix cc wrapper's cpp mode detection --- pkgs/tools/security/afl/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix index def5458a240..e32aa034874 100644 --- a/pkgs/tools/security/afl/default.nix +++ b/pkgs/tools/security/afl/default.nix @@ -47,6 +47,11 @@ let # has totally different semantics in that case(?) - and also set a # proper AFL_CC and AFL_CXX so we don't pick up the wrong one out # of $PATH. + # first though we need to replace the afl-clang-fast++ symlink with + # a real copy to prevent wrapProgram skipping the symlink and confusing + # nix's cc wrapper + rm $out/bin/afl-clang-fast++ + cp $out/bin/afl-clang-fast $out/bin/afl-clang-fast++ for x in $out/bin/afl-clang-fast $out/bin/afl-clang-fast++; do wrapProgram $x \ --prefix AFL_PATH : "$out/lib/afl" \ -- cgit v1.2.3 From f5f85d16d19a4428f32fab798340aded12971b28 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 25 Apr 2020 17:48:31 +0200 Subject: epson-escpr2: 1.1.1 -> 1.1.11 --- pkgs/misc/drivers/epson-escpr2/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/drivers/epson-escpr2/default.nix b/pkgs/misc/drivers/epson-escpr2/default.nix index 4edc08a3571..a1420a0428b 100644 --- a/pkgs/misc/drivers/epson-escpr2/default.nix +++ b/pkgs/misc/drivers/epson-escpr2/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "epson-inkjet-printer-escpr2"; - version = "1.1.1"; + version = "1.1.11"; src = fetchurl { # To find new versions, visit @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { # version. # NOTE: Don't forget to update the webarchive link too! urls = [ - "https://download3.ebz.epson.net/dsc/f/03/00/09/72/04/c6d928e83e558c4ba1e7e8bcb5c1fe080b8095eb/epson-inkjet-printer-escpr2-1.1.1-1lsb3.2.src.rpm" - "https://web.archive.org/web/https://download3.ebz.epson.net/dsc/f/03/00/09/72/04/c6d928e83e558c4ba1e7e8bcb5c1fe080b8095eb/epson-inkjet-printer-escpr2-1.1.1-1lsb3.2.src.rpm" + "https://download3.ebz.epson.net/dsc/f/03/00/11/01/98/8ff121831d0a6be76e86b87c78178f3c93df6d0f/epson-inkjet-printer-escpr2-1.1.11-1lsb3.2.src.rpm" + "https://web.archive.org/web/20200425154102/https://download3.ebz.epson.net/dsc/f/03/00/11/01/98/8ff121831d0a6be76e86b87c78178f3c93df6d0f/epson-inkjet-printer-escpr2-1.1.11-1lsb3.2.src.rpm" ]; - sha256 = "02vdlhvinsx6vsjq172b2c1vrfzkg0w9j5lbsnjvj6yq3yqz5b5q"; + sha256 = "1gcdzmqli7jycljm66mdssivb3lk223ih6zg0l3lyn7hj2gbkinm"; }; patches = [ ./cups-filter-ppd-dirs.patch ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { Refer to the description of epson-escpr for usage. ''; license = licenses.gpl2; - maintainers = with maintainers; [ ma9e ]; + maintainers = with maintainers; [ ma9e ma27 ]; platforms = platforms.linux; }; } -- cgit v1.2.3 From c970de4586988fb104f4552f8dd5f83045ca9f72 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Apr 2020 17:58:13 +0200 Subject: haskell-dhall: disable the test suite Dhall 1.31.x still attempts to access the network during its test suite run, i.e. it attempts to connect to github.com. --- pkgs/development/haskell-modules/configuration-nix.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index ba885c0ecd5..817037e1e43 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -720,10 +720,9 @@ self: super: builtins.intersectAttrs super { # break infinite recursion with base-orphans primitive = dontCheck super.primitive; - # dhall-1.29.0 tests access the network. This override can be removed when - # dhall_1_29_0 is no longer used, since more recent versions of dhall don't - # access the network in checks. + # dhall's tests access the network. dhall_1_29_0 = dontCheck super.dhall_1_29_0; + dhall_1_31_1 = dontCheck super.dhall_1_31_1; cut-the-crap = let path = pkgs.stdenv.lib.makeBinPath [ pkgs.ffmpeg ]; -- cgit v1.2.3 From f2aa6b44d44304ad93f006eeedfd6a955909f450 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Apr 2020 17:59:35 +0200 Subject: haskell-system-fileio: jailbreak out of dependency on chell 0.4.x --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 96ab593cf84..23c555c5ac9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -56,6 +56,7 @@ self: super: { regex-posix = doJailbreak super.regex-posix; regex-tdfa = doJailbreak super.regex-tdfa; split = doJailbreak super.split; + system-fileio = doJailbreak super.system-fileio; tar = doJailbreak super.tar; tasty-expected-failure = doJailbreak super.tasty-expected-failure; unliftio-core = doJailbreak super.unliftio-core; -- cgit v1.2.3 From b24d2a90dd639bcd3083fe75fd675020884589c8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Apr 2020 18:00:09 +0200 Subject: configuration-ghc-8.10.x.nix: cosmetic --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 23c555c5ac9..17bd688ffaa 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -64,9 +64,9 @@ self: super: { zlib = doJailbreak super.zlib; # Use the latest version to fix the build. + ghc-lib-parser-ex = self.ghc-lib-parser-ex_8_10_0_4; optics-core = self.optics-core_0_3; repline = self.repline_0_3_0_0; - ghc-lib-parser-ex = self.ghc-lib-parser-ex_8_10_0_4; th-desugar = self.th-desugar_1_11; # `ghc-lib-parser-ex` (see conditionals in its `.cabal` file) does not need -- cgit v1.2.3 From 125ada17b0748038b8c58d69efcf50446f8716bd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Apr 2020 18:01:28 +0200 Subject: haskell-dhall: use the latest version when building with ghc-8.10.x --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 17bd688ffaa..4369b7176c9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -64,6 +64,7 @@ self: super: { zlib = doJailbreak super.zlib; # Use the latest version to fix the build. + dhall = self.dhall_1_31_1; ghc-lib-parser-ex = self.ghc-lib-parser-ex_8_10_0_4; optics-core = self.optics-core_0_3; repline = self.repline_0_3_0_0; -- cgit v1.2.3 From 6a6d0174ed1c87703e90cbc1702566a8b8e5e9d6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Apr 2020 18:01:48 +0200 Subject: haskell-pandoc: jailbreak out of haddock-library 1.8.x constraint --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 4369b7176c9..cf1624b3fb4 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -49,6 +49,7 @@ self: super: { async = doJailbreak super.async; ChasingBottoms = doJailbreak super.ChasingBottoms; hashable = doJailbreak super.hashable; + pandoc = doJailbreak super.pandoc; parallel = doJailbreak super.parallel; regex-base = doJailbreak super.regex-base; regex-compat = doJailbreak super.regex-compat; -- cgit v1.2.3 From 2ececf1ed9b90d228593fccf58aaf2a014a98352 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 25 Apr 2020 18:09:51 +0200 Subject: nixos/nscd: be more specific in the nscd.enable description on what breaks --- nixos/modules/services/system/nscd.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix index af26dd84707..d720f254b81 100644 --- a/nixos/modules/services/system/nscd.nix +++ b/nixos/modules/services/system/nscd.nix @@ -24,7 +24,11 @@ in enable = mkOption { type = types.bool; default = true; - description = "Whether to enable the Name Service Cache Daemon."; + description = '' + Whether to enable the Name Service Cache Daemon. + Disabling this is strongly discouraged, as this effectively disables NSS Lookups + from all non-glibc NSS modules, including the ones provided by systemd. + ''; }; config = mkOption { -- cgit v1.2.3 From 7b7764287cf5b78a98468a173099d228c19679f5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Apr 2020 18:16:57 +0200 Subject: haskell-cabal-plan: apply patch to fix the build with ghc-8.10.1 --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index cf1624b3fb4..1b24a68bf4d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -101,4 +101,12 @@ self: super: { # Only 0.8 is compatible with ghc 8.10 https://hackage.haskell.org/package/apply-refact/changelog apply-refact = super.apply-refact_0_8_0_0; + + # Apply patch to fix the build. + cabal-plan = appendPatch super.cabal-plan (pkgs.fetchpatch { + name = "cabal-plan-fix-for-ghc-8.10.x.patch"; + url = "https://github.com/haskell-hvr/cabal-plan/pull/55.patch"; + sha256 = "0lhs4vx5qg5ldhnyb9z7k0jmxhmd2f34x4xbwv6vsljs9vr02pd8"; + }); + } -- cgit v1.2.3 From 21a354b6dd31ce9b1250674218f0a9f49677f2ac Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Apr 2020 18:22:55 +0200 Subject: haskell-cabal-install-parsers: re-factor overrides to fix build with ghc-8.10.1 --- pkgs/development/haskell-modules/configuration-common.nix | 7 ++----- pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 4 ++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d6edaa86470..4b898972ded 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1457,11 +1457,8 @@ self: super: { cryptonite = dontCheck super.cryptonite; # The test suite depends on an impure cabal-install installation in - # $HOME, which we don't have in our build sandbox, and it is keeping - # up with the most recent Cabal version. - cabal-install-parsers = dontCheck (super.cabal-install-parsers.overrideScope (self: super: { - Cabal = self.Cabal_3_2_0_0; - })); + # $HOME, which we don't have in our build sandbox. + cabal-install-parsers = dontCheck super.cabal-install-parsers; # haskell-ci-0.8 needs cabal-install-parsers ==0.1, but we have 0.2. haskell-ci = doJailbreak super.haskell-ci; diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index bdd5a9007d7..7395d059b4d 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -102,4 +102,8 @@ self: super: { # Only 0.7 is compatible with ghc 8.7 https://hackage.haskell.org/package/apply-refact/changelog apply-refact = super.apply-refact_0_7_0_0; + + # The package needs the latest Cabal version. + cabal-install-parsers = super.cabal-install-parsers.overrideScope (self: super: { Cabal = self.Cabal_3_2_0_0; }); + } -- cgit v1.2.3 From 4c40b43a7c88a652bfdb6ca01836ec5ed34f4915 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Sat, 25 Apr 2020 12:27:34 -0400 Subject: p11-kit: add trust paths Fixes #82422 --- pkgs/development/libraries/p11-kit/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index a13e6746469..204de957f3d 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -26,14 +26,16 @@ stdenv.mkDerivation rec { configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" - "--without-trust-paths" - ]; # TODO: store trust anchors in a directory common to Nix and NixOS + "--with-trust-paths=/etc/ssl/certs/ca-certificates.crt" + ]; enableParallelBuilding = true; doCheck = !stdenv.isDarwin; - installFlags = [ "exampledir=\${out}/etc/pkcs11" ]; + installFlags = [ + "exampledir=${placeholder "out"}/etc/pkcs11" + ]; meta = with stdenv.lib; { description = "Library for loading and sharing PKCS#11 modules"; -- cgit v1.2.3 From 74ac6ffad033b657d2e94c03f0345b8e347ea21c Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 23 Apr 2020 20:51:52 +0200 Subject: libva: 2.6.1 -> 2.7.1 Fixes #85850. --- pkgs/development/libraries/libva-utils/default.nix | 15 ++++++++++----- pkgs/development/libraries/libva/default.nix | 19 +++++++++++++------ 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/libva-utils/default.nix b/pkgs/development/libraries/libva-utils/default.nix index a3c7cf05cfb..a4de995ada8 100644 --- a/pkgs/development/libraries/libva-utils/default.nix +++ b/pkgs/development/libraries/libva-utils/default.nix @@ -7,10 +7,10 @@ stdenv.mkDerivation rec { inherit (libva) version; src = fetchFromGitHub { - owner = "01org"; + owner = "intel"; repo = "libva-utils"; rev = version; - sha256 = "1yk9bg1wg4nqva3l01s6bghcvc3hb02gp62p1sy5qk0r9mn5kpik"; + sha256 = "13a0dccphi4cpr2cx45kg4djxsssi3d1fcjrkx27b16xiayp5lx9"; }; nativeBuildInputs = [ meson ninja pkgconfig ]; @@ -26,10 +26,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with stdenv.lib; { - description = "VAAPI tools: Video Acceleration API"; - homepage = "http://www.freedesktop.org/wiki/Software/vaapi"; + description = "A collection of utilities and examples for VA-API"; + longDescription = '' + libva-utils is a collection of utilities and examples to exercise VA-API + in accordance with the libva project. + ''; + homepage = "https://github.com/intel/libva-utils"; + changelog = "https://raw.githubusercontent.com/intel/libva-utils/${version}/NEWS"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ primeos ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index be374eaf895..86c6a88b1ef 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -7,14 +7,14 @@ stdenv.mkDerivation rec { name = "libva-${lib.optionalString minimal "minimal-"}${version}"; - version = "2.6.1"; + version = "2.7.1"; # Also update the hash for libva-utils! # update libva-utils and vaapiIntel as well src = fetchFromGitHub { - owner = "01org"; + owner = "intel"; repo = "libva"; rev = version; - sha256 = "1x34kf38p5rf52bf54ljr9f7knnbilm7kbszqnfk3lzsqrfc7r2g"; + sha256 = "0ywasac7z3hwggj8szp83sbxi2naa0a3amblx64y7i1hyyrn0csq"; }; outputs = [ "dev" "out" ]; @@ -38,10 +38,17 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "VAAPI library: Video Acceleration API"; - homepage = "http://www.freedesktop.org/wiki/Software/vaapi"; + description = "An implementation for VA-API (Video Acceleration API)"; + longDescription = '' + VA-API is an open-source library and API specification, which provides + access to graphics hardware acceleration capabilities for video + processing. It consists of a main library (this package) and + driver-specific acceleration backends for each supported hardware vendor. + ''; + homepage = "https://01.org/linuxmedia/vaapi"; + changelog = "https://raw.githubusercontent.com/intel/libva/${version}/NEWS"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ primeos ]; platforms = platforms.unix; }; } -- cgit v1.2.3 From 3f472552c4b23c5a62c557ac238227ec23fd0d56 Mon Sep 17 00:00:00 2001 From: chkno Date: Sat, 25 Apr 2020 09:54:07 -0700 Subject: gnucash: 3.9 -> 3.10 (#85978) --- pkgs/applications/office/gnucash/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index d7664b347ee..a8630381ebf 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -25,11 +25,11 @@ in stdenv.mkDerivation rec { pname = "gnucash"; - version = "3.9"; + version = "3.10"; src = fetchurl { url = "mirror://sourceforge/gnucash/${pname}-${version}.tar.bz2"; - sha256 = "1zxrgrjbs13vgr002rvl734w9f7zzxfq4xxmyhj777dwgkfds0ld"; + sha256 = "05kgg7mhizndwn7icnarqk3c19xrzfawf90y9nb3jdm6fv1741xn"; }; nativeBuildInputs = [ pkgconfig makeWrapper cmake gtest ]; @@ -69,7 +69,6 @@ stdenv.mkDerivation rec { ''; # TODO: The following tests FAILED: - # 61 - test-gnc-timezone (Failed) # 70 - test-load-c (Failed) # 71 - test-modsysver (Failed) # 72 - test-incompatdep (Failed) -- cgit v1.2.3 From 3e051b04cb6e4008d22c1998eb4cd5eddbcd87b4 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sat, 25 Apr 2020 10:28:21 -0400 Subject: thermald: 1.9.1 -> 2.1 --- pkgs/tools/system/thermald/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix index 560985a94f3..51a443b9bde 100644 --- a/pkgs/tools/system/thermald/default.nix +++ b/pkgs/tools/system/thermald/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchFromGitHub, autoconf, automake, libtool -, pkgconfig, dbus, dbus-glib, libxml2 }: +, pkgconfig, dbus, dbus-glib, libxml2, autoconf-archive }: stdenv.mkDerivation rec { pname = "thermald"; - version = "1.9.1"; + version = "2.1"; src = fetchFromGitHub { - owner = "01org"; + owner = "intel"; repo = "thermal_daemon"; rev = "v${version}"; - sha256 = "0iagc3jqpnh6q2fa1gx4wx6r8qg0556j60xr159zqg95djr4dv99"; + sha256 = "1k8svy03k57ld6p5d29i0ccrd1gics6kbyx1bkfmw9fh1bbljyf7"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake libtool dbus dbus-glib libxml2 ]; + buildInputs = [ autoconf automake libtool dbus dbus-glib libxml2 autoconf-archive ]; patchPhase = ''sed -e 's/upstartconfdir = \/etc\/init/upstartconfdir = $(out)\/etc\/init/' -i data/Makefile.am''; -- cgit v1.2.3 From f04b40ae4be7cb0790839d4539baf636639edbed Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 25 Apr 2020 20:33:40 +0300 Subject: qstopmotion: format inputs and arguments --- pkgs/applications/video/qstopmotion/default.nix | 50 +++++++++++++++++++++---- 1 file changed, 43 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix index 4a6d2a05a67..ec1df91bbfc 100644 --- a/pkgs/applications/video/qstopmotion/default.nix +++ b/pkgs/applications/video/qstopmotion/default.nix @@ -1,6 +1,22 @@ -{ mkDerivation, stdenv, fetchurl, qt5, ffmpeg, guvcview, cmake, ninja, libxml2 -, gettext, pkgconfig, libgphoto2, gphoto2, v4l-utils, libv4l, pcre -, qwt, extra-cmake-modules }: +{ stdenv +, mkDerivation +, fetchurl +, qt5 +, ffmpeg +, guvcview +, cmake +, ninja +, libxml2 +, gettext +, pkgconfig +, libgphoto2 +, gphoto2 +, v4l-utils +, libv4l +, pcre +, qwt +, extra-cmake-modules +}: mkDerivation rec { pname = "qstopmotion"; @@ -11,11 +27,31 @@ mkDerivation rec { sha256 = "03r6jxyq0bak2vsy2b78nk27m7fm96hnl8cx11l3l17704j4iglh"; }; - buildInputs = with qt5; [ v4l-utils libv4l pcre qtbase qtmultimedia ffmpeg guvcview - qwt qtquickcontrols qtimageformats qtxmlpatterns ]; + buildInputs = with qt5; [ + v4l-utils + libv4l + pcre + qtbase + qtmultimedia + ffmpeg + guvcview + qwt + qtquickcontrols + qtimageformats + qtxmlpatterns + ]; - nativeBuildInputs = [ pkgconfig cmake extra-cmake-modules ninja - gettext libgphoto2 gphoto2 libxml2 libv4l ]; + nativeBuildInputs = [ + pkgconfig + cmake + extra-cmake-modules + ninja + gettext + libgphoto2 + gphoto2 + libxml2 + libv4l + ]; patchPhase = '' substituteInPlace CMakeLists.txt \ -- cgit v1.2.3 From daf3b0868ab6f4f24b7bdfbd580cd068b4be9039 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Apr 2020 18:45:14 +0200 Subject: configuration-ghc-8.10.x.nix: cosmetic --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 1b24a68bf4d..dbfc65bab86 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -80,6 +80,7 @@ self: super: { # Jailbreak to fix the build. aeson-diff = doJailbreak super.aeson-diff; + brick = doJailbreak super.brick; cborg = doJailbreak super.cborg; cborg-json = doJailbreak super.cborg-json; exact-pi = doJailbreak super.exact-pi; @@ -87,7 +88,6 @@ self: super: { serialise = doJailbreak super.serialise; setlocale = doJailbreak super.setlocale; shellmet = doJailbreak super.shellmet; - brick = doJailbreak super.brick; # The shipped Setup.hs file is broken. csv = overrideCabal super.csv (drv: { preCompileBuildDriver = "rm Setup.hs"; }); -- cgit v1.2.3 From ceab66bf6e474d48a85cc0deec54946a4ae4eb28 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Apr 2020 18:45:53 +0200 Subject: haskell-lens: use latest version when building with ghc-8.10.1 --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index dbfc65bab86..70169cffffe 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -67,6 +67,7 @@ self: super: { # Use the latest version to fix the build. dhall = self.dhall_1_31_1; ghc-lib-parser-ex = self.ghc-lib-parser-ex_8_10_0_4; + lens = self.lens_4_19_2; optics-core = self.optics-core_0_3; repline = self.repline_0_3_0_0; th-desugar = self.th-desugar_1_11; -- cgit v1.2.3 From 53865f5f713ee112a9a9ffcfb23c8b14001c84ce Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Apr 2020 18:46:27 +0200 Subject: haskell-hlint: fix build with ghc-8.10.1 --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 70169cffffe..942176f8d8f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -110,4 +110,9 @@ self: super: { sha256 = "0lhs4vx5qg5ldhnyb9z7k0jmxhmd2f34x4xbwv6vsljs9vr02pd8"; }); + # https://github.com/ndmitchell/hlint/issues/959 + hlint = super.hlint.override { + ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex super.ghc-lib-parser; + }; + } -- cgit v1.2.3 From d28e92d5aa934cd78f41916711c891ba505bccc2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Apr 2020 19:04:22 +0200 Subject: haskell-weeder: jailbreak to fix the build with ghc-8.10.1 --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 942176f8d8f..a9387ec3be6 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -89,6 +89,7 @@ self: super: { serialise = doJailbreak super.serialise; setlocale = doJailbreak super.setlocale; shellmet = doJailbreak super.shellmet; + weeder = doJailbreak super.weeder; # https://github.com/ocharles/weeder/issues/15 # The shipped Setup.hs file is broken. csv = overrideCabal super.csv (drv: { preCompileBuildDriver = "rm Setup.hs"; }); -- cgit v1.2.3 From d3ae5625ffb410db8f79802de486c8e809ccf673 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Apr 2020 19:32:30 +0200 Subject: haskell-dbus: apply patch to fix the build Taken from https://github.com/rblaze/haskell-dbus/pull/48. --- .../haskell-modules/configuration-ghc-8.10.x.nix | 1 + .../patches/fix-dbus-for-ghc-8.10.x.patch | 383 +++++++++++++++++++++ 2 files changed, 384 insertions(+) create mode 100644 pkgs/development/haskell-modules/patches/fix-dbus-for-ghc-8.10.x.patch diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index a9387ec3be6..3721bb724f5 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -110,6 +110,7 @@ self: super: { url = "https://github.com/haskell-hvr/cabal-plan/pull/55.patch"; sha256 = "0lhs4vx5qg5ldhnyb9z7k0jmxhmd2f34x4xbwv6vsljs9vr02pd8"; }); + dbus = appendPatch super.dbus ./patches/fix-dbus-for-ghc-8.10.x.patch; # https://github.com/ndmitchell/hlint/issues/959 hlint = super.hlint.override { diff --git a/pkgs/development/haskell-modules/patches/fix-dbus-for-ghc-8.10.x.patch b/pkgs/development/haskell-modules/patches/fix-dbus-for-ghc-8.10.x.patch new file mode 100644 index 00000000000..7ed390d3f23 --- /dev/null +++ b/pkgs/development/haskell-modules/patches/fix-dbus-for-ghc-8.10.x.patch @@ -0,0 +1,383 @@ +Only in dbus-1.2.13-new: .codeclimate.yml +diff -ur dbus-1.2.13-old/dbus.cabal dbus-1.2.13-new/dbus.cabal +--- dbus-1.2.13-old/dbus.cabal 2020-04-25 19:29:27.372272952 +0200 ++++ dbus-1.2.13-new/dbus.cabal 2020-04-25 19:26:36.140991920 +0200 +@@ -1,172 +1,180 @@ +-cabal-version: >=1.8 + name: dbus + version: 1.2.13 + license: Apache-2.0 + license-file: license.txt +-maintainer: Andrey Sverdlichenko + author: John Millikin ++maintainer: Andrey Sverdlichenko ++build-type: Simple ++cabal-version: >= 1.8 ++category: Network, Desktop + stability: experimental + homepage: https://github.com/rblaze/haskell-dbus#readme ++ + synopsis: A client library for the D-Bus IPC system. + description: +- D-Bus is a simple, message-based protocol for inter-process +- communication, which allows applications to interact with other parts of +- the machine and the user's session using remote procedure calls. +- . +- D-Bus is a essential part of the modern Linux desktop, where it replaces +- earlier protocols such as CORBA and DCOP. +- . +- This library is an implementation of the D-Bus protocol in Haskell. It +- can be used to add D-Bus support to Haskell applications, without the +- awkward interfaces common to foreign bindings. +- . +- Example: connect to the session bus, and get a list of active names. +- . +- @ +- {-\# LANGUAGE OverloadedStrings \#-} +- . +- import Data.List (sort) +- import DBus +- import DBus.Client +- . +- main = do +- client <- connectSession +- // +- \-- Request a list of connected clients from the bus +- reply <- call_ client (methodCall \"\/org\/freedesktop\/DBus\" \"org.freedesktop.DBus\" \"ListNames\") +- { methodCallDestination = Just \"org.freedesktop.DBus\" +- } +- // +- \-- org.freedesktop.DBus.ListNames() returns a single value, which is +- \-- a list of names (here represented as [String]) +- let Just names = fromVariant (methodReturnBody reply !! 0) +- // +- \-- Print each name on a line, sorted so reserved names are below +- \-- temporary names. +- mapM_ putStrLn (sort names) +- @ +- . +- >$ ghc --make list-names.hs +- >$ ./list-names +- >:1.0 +- >:1.1 +- >:1.10 +- >:1.106 +- >:1.109 +- >:1.110 +- >ca.desrt.dconf +- >org.freedesktop.DBus +- >org.freedesktop.Notifications +- >org.freedesktop.secrets +- >org.gnome.ScreenSaver +-category: Network, Desktop +-build-type: Simple ++ D-Bus is a simple, message-based protocol for inter-process ++ communication, which allows applications to interact with other parts of ++ the machine and the user's session using remote procedure calls. ++ . ++ D-Bus is a essential part of the modern Linux desktop, where it replaces ++ earlier protocols such as CORBA and DCOP. ++ . ++ This library is an implementation of the D-Bus protocol in Haskell. It ++ can be used to add D-Bus support to Haskell applications, without the ++ awkward interfaces common to foreign bindings. ++ . ++ Example: connect to the session bus, and get a list of active names. ++ . ++ @ ++ {-\# LANGUAGE OverloadedStrings \#-} ++ . ++ import Data.List (sort) ++ import DBus ++ import DBus.Client ++ . ++ main = do ++ client <- connectSession ++ ++ -- Request a list of connected clients from the bus ++ reply <- call_ client (methodCall \"\/org\/freedesktop\/DBus\" \"org.freedesktop.DBus\" \"ListNames\") ++ { methodCallDestination = Just \"org.freedesktop.DBus\" ++ } ++ ++ -- org.freedesktop.DBus.ListNames() returns a single value, which is ++ -- a list of names (here represented as [String]) ++ let Just names = fromVariant (methodReturnBody reply !! 0) ++ ++ -- Print each name on a line, sorted so reserved names are below ++ -- temporary names. ++ mapM_ putStrLn (sort names) ++ @ ++ . ++ >$ ghc --make list-names.hs ++ >$ ./list-names ++ >:1.0 ++ >:1.1 ++ >:1.10 ++ >:1.106 ++ >:1.109 ++ >:1.110 ++ >ca.desrt.dconf ++ >org.freedesktop.DBus ++ >org.freedesktop.Notifications ++ >org.freedesktop.secrets ++ >org.gnome.ScreenSaver ++ ++ + extra-source-files: +- examples/dbus-monitor.hs +- examples/export.hs +- examples/introspect.hs +- examples/list-names.hs +- idlxml/dbus.xml ++ examples/dbus-monitor.hs ++ examples/export.hs ++ examples/introspect.hs ++ examples/list-names.hs ++ idlxml/dbus.xml + + source-repository head +- type: git +- location: https://github.com/rblaze/haskell-dbus ++ type: git ++ location: https://github.com/rblaze/haskell-dbus + + library +- exposed-modules: +- DBus +- DBus.Client +- DBus.Generation +- DBus.Internal.Address +- DBus.Internal.Message +- DBus.Internal.Types +- DBus.Internal.Wire +- DBus.Introspection +- DBus.Introspection.Parse +- DBus.Introspection.Render +- DBus.Introspection.Types +- DBus.Socket +- DBus.TH +- DBus.Transport +- hs-source-dirs: lib +- ghc-options: -W -Wall +- build-depends: +- base ==4.*, +- bytestring <0.11, +- cereal <0.6, +- conduit >=1.3.0 && <1.4, +- containers <0.7, +- deepseq <1.5, +- exceptions <0.11, +- filepath <1.5, +- lens <4.20, +- network >=3.0.1.0 && <3.2, +- parsec <3.2, +- random <1.2, +- split <0.3, +- template-haskell <2.16.0.0, +- text <1.3, +- th-lift <0.9, +- transformers <0.6, +- unix <2.8, +- vector <0.13, +- xml-conduit >=1.9.0.0 && <1.10.0.0, +- xml-types <0.4 ++ ghc-options: -W -Wall ++ hs-source-dirs: lib ++ ++ build-depends: ++ base >=4 && <5 ++ , bytestring ++ , cereal ++ , conduit >= 1.3.0 ++ , containers ++ , deepseq ++ , exceptions ++ , filepath ++ , lens < 4.20 ++ , network >= 3.0.1.0 && < 3.2 ++ , parsec ++ , random ++ , split ++ , template-haskell < 2.17.0.0 ++ , text ++ , th-lift < 0.9 ++ , transformers ++ , unix ++ , vector ++ , xml-conduit >= 1.9.0.0 && < 1.10.0.0 ++ , xml-types ++ ++ exposed-modules: ++ DBus ++ DBus.Client ++ DBus.Generation ++ DBus.Internal.Address ++ DBus.Internal.Message ++ DBus.Internal.Types ++ DBus.Internal.Wire ++ DBus.Introspection ++ DBus.Introspection.Parse ++ DBus.Introspection.Render ++ DBus.Introspection.Types ++ DBus.Socket ++ DBus.TH ++ DBus.Transport + + test-suite dbus_tests +- type: exitcode-stdio-1.0 +- main-is: DBusTests.hs +- hs-source-dirs: tests +- other-modules: +- DBusTests.Address +- DBusTests.BusName +- DBusTests.Client +- DBusTests.ErrorName +- DBusTests.Generation +- DBusTests.Integration +- DBusTests.InterfaceName +- DBusTests.Introspection +- DBusTests.MemberName +- DBusTests.Message +- DBusTests.ObjectPath +- DBusTests.Serialization +- DBusTests.Signature +- DBusTests.Socket +- DBusTests.TH +- DBusTests.Transport +- DBusTests.Util +- DBusTests.Variant +- DBusTests.Wire +- ghc-options: -W -Wall -fno-warn-orphans +- build-depends: +- dbus -any, +- base ==4.*, +- bytestring <0.11, +- cereal <0.6, +- containers <0.7, +- directory <1.4, +- extra <1.8, +- filepath <1.5, +- network >=3.0.1.0 && <3.2, +- parsec <3.2, +- process <1.7, +- QuickCheck <2.15, +- random <1.2, +- resourcet <1.3, +- tasty <1.3, +- tasty-hunit <0.11, +- tasty-quickcheck <0.11, +- text <1.3, +- transformers <0.6, +- unix <2.8, +- vector <0.13 ++ type: exitcode-stdio-1.0 ++ main-is: DBusTests.hs ++ hs-source-dirs: tests ++ ghc-options: -W -Wall -fno-warn-orphans ++ ++ build-depends: ++ dbus ++ , base >=4 && <5 ++ , bytestring ++ , cereal ++ , containers ++ , directory ++ , extra < 1.8 ++ , filepath ++ , network >= 3.0.1.0 && < 3.2 ++ , parsec ++ , process ++ , QuickCheck < 2.15 ++ , random ++ , resourcet ++ , tasty ++ , tasty-hunit ++ , tasty-quickcheck ++ , text ++ , transformers ++ , unix ++ , vector ++ ++ other-modules: ++ DBusTests.Address ++ DBusTests.BusName ++ DBusTests.Client ++ DBusTests.ErrorName ++ DBusTests.Generation ++ DBusTests.Integration ++ DBusTests.InterfaceName ++ DBusTests.Introspection ++ DBusTests.MemberName ++ DBusTests.Message ++ DBusTests.ObjectPath ++ DBusTests.Serialization ++ DBusTests.Signature ++ DBusTests.Socket ++ DBusTests.TH ++ DBusTests.Transport ++ DBusTests.Util ++ DBusTests.Variant ++ DBusTests.Wire + + benchmark dbus_benchmarks +- type: exitcode-stdio-1.0 +- main-is: DBusBenchmarks.hs +- hs-source-dirs: benchmarks +- ghc-options: -Wall -fno-warn-orphans +- build-depends: +- dbus -any, +- base ==4.*, +- criterion <1.6 ++ type: exitcode-stdio-1.0 ++ main-is: DBusBenchmarks.hs ++ hs-source-dirs: benchmarks ++ ghc-options: -Wall -fno-warn-orphans ++ ++ build-depends: ++ dbus ++ , base >=4 && <5 ++ , criterion +Only in dbus-1.2.13-new: .git +Only in dbus-1.2.13-new: .gitignore +diff -ur dbus-1.2.13-old/lib/DBus/Generation.hs dbus-1.2.13-new/lib/DBus/Generation.hs +--- dbus-1.2.13-old/lib/DBus/Generation.hs 2019-02-14 16:37:47.000000000 +0100 ++++ dbus-1.2.13-new/lib/DBus/Generation.hs 2020-04-25 19:26:36.144991997 +0200 +@@ -1,3 +1,4 @@ ++{-# LANGUAGE CPP #-} + {-# LANGUAGE OverloadedStrings #-} + {-# LANGUAGE TemplateHaskell #-} + module DBus.Generation where +@@ -26,6 +27,13 @@ + import Prelude hiding (mapM) + import System.Posix.Types (Fd(..)) + ++-- | Compatibility helper to create (total) tuple expressions ++mkTupE :: [Exp] -> Exp ++mkTupE = TupE ++#if MIN_VERSION_template_haskell(2,16,0) ++ . map Just ++#endif ++ + type ClientBusPathR a = ReaderT (Client, T.BusName, T.ObjectPath) IO a + + dbusInvoke :: (Client -> T.BusName -> T.ObjectPath -> a) -> ClientBusPathR a +@@ -232,8 +240,8 @@ + finalOutputNames <- buildOutputNames + let variantListExp = map makeToVariantApp methodArgNames + mapOrHead' = mapOrHead outputLength +- fromVariantExp = mapOrHead' makeFromVariantApp fromVariantOutputNames TupE +- finalResultTuple = mapOrHead' VarE finalOutputNames TupE ++ fromVariantExp = mapOrHead' makeFromVariantApp fromVariantOutputNames mkTupE ++ finalResultTuple = mapOrHead' VarE finalOutputNames mkTupE + maybeExtractionPattern = mapOrHead' makeJustPattern finalOutputNames TupP + getMethodCallDefDec = [d| + $( varP methodCallDefN ) = +@@ -432,7 +440,7 @@ + } + |] + let mapOrHead' = mapOrHead argCount +- fromVariantExp = mapOrHead' makeFromVariantApp fromVariantOutputNames TupE ++ fromVariantExp = mapOrHead' makeFromVariantApp fromVariantOutputNames mkTupE + maybeExtractionPattern = mapOrHead' makeJustPattern toHandlerOutputNames TupP + applyToName toApply n = AppE toApply $ VarE n + finalApplication = foldl applyToName (VarE handlerArgN) -- cgit v1.2.3 From ea37fe1f1ccfe1a71560f53e5a665f2313cd1b60 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Apr 2020 19:33:11 +0200 Subject: haskell-singletons: use latest versions when building with ghc-8.10.1 --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 3721bb724f5..8cc498638b5 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -70,6 +70,7 @@ self: super: { lens = self.lens_4_19_2; optics-core = self.optics-core_0_3; repline = self.repline_0_3_0_0; + singletons = self.singletons_2_7; th-desugar = self.th-desugar_1_11; # `ghc-lib-parser-ex` (see conditionals in its `.cabal` file) does not need -- cgit v1.2.3 From 4bff4d692d93d0c4430c592bb188c341e4e98ee9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Apr 2020 19:42:48 +0200 Subject: haskell-xmobar: jailbreak to fix the build with ghc-8.10.1 --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 8cc498638b5..a019593161c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -91,6 +91,7 @@ self: super: { setlocale = doJailbreak super.setlocale; shellmet = doJailbreak super.shellmet; weeder = doJailbreak super.weeder; # https://github.com/ocharles/weeder/issues/15 + xmobar = doJailbreak super.xmobar; # The shipped Setup.hs file is broken. csv = overrideCabal super.csv (drv: { preCompileBuildDriver = "rm Setup.hs"; }); -- cgit v1.2.3 From 6a627c416fe663ac16064f7a155afba9522910e4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Apr 2020 19:43:02 +0200 Subject: haskell-policeman: jailbreak to fix the build with ghc-8.10.1 --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index a019593161c..f0d88415616 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -86,6 +86,7 @@ self: super: { cborg = doJailbreak super.cborg; cborg-json = doJailbreak super.cborg-json; exact-pi = doJailbreak super.exact-pi; + policeman = doJailbreak super.policeman; relude = dontCheck (doJailbreak super.relude); serialise = doJailbreak super.serialise; setlocale = doJailbreak super.setlocale; -- cgit v1.2.3 From 4062592f3a17d814812ca696604ea22ad615ca12 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 25 Apr 2020 19:48:34 +0200 Subject: nixos/printing: make access to web-interface configurable Otherwise you'd always get a 403 when hosting the web-interface of cups at a different location than `localhost`. --- nixos/modules/services/printing/cupsd.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index 59306d625e6..e67badfcd29 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -153,6 +153,16 @@ in ''; }; + allowFrom = mkOption { + type = types.listOf types.str; + default = [ "localhost" ]; + example = [ "all" ]; + apply = concatMapStringsSep "\n" (x: "Allow ${x}"); + description = '' + From which hosts to allow unconditional access. + ''; + }; + bindirCmds = mkOption { type = types.lines; internal = true; @@ -403,19 +413,19 @@ in Order allow,deny - Allow localhost + ${cfg.allowFrom} Order allow,deny - Allow localhost + ${cfg.allowFrom} AuthType Basic Require user @SYSTEM Order allow,deny - Allow localhost + ${cfg.allowFrom} -- cgit v1.2.3 From 29330634557d60305c5c722a25cbf1ad7704ab13 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 25 Apr 2020 12:52:00 -0500 Subject: tflint: 0.15.4 -> 0.15.5 --- pkgs/development/tools/analysis/tflint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 200df98c0a2..8ad237bd1d2 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.15.4"; + version = "0.15.5"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "1z98zy04dj4hj94k9c9r1sfw167s3ywpxnjbylj7nsyxdlvwj37j"; + sha256 = "0mdxs019vzpfxaqkw4nb79p3rydril0ihbn55n4yyh0fznv6zzxi"; }; - modSha256 = "1j6vflvg2k544r0kkdiw64n6v467c0kr7l2m39h8yjbyjbmwl5xz"; + modSha256 = "0ksblhra7ln4ryggr2x8fzl8a7ljz5zdjgdxz82c75wd7wdbw8f5"; subPackages = [ "." ]; -- cgit v1.2.3 From 59588b68cd185a21b917daabc057dcd42a6803d8 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 25 Apr 2020 21:14:40 +0300 Subject: guvcview: use libsForQt5.callPackage --- pkgs/os-specific/linux/guvcview/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/guvcview/default.nix b/pkgs/os-specific/linux/guvcview/default.nix index 0efdbcede48..d780cade786 100644 --- a/pkgs/os-specific/linux/guvcview/default.nix +++ b/pkgs/os-specific/linux/guvcview/default.nix @@ -16,7 +16,7 @@ , pulseaudioSupport ? config.pulseaudio or stdenv.isLinux , libpulseaudio ? null , useQt ? false -, qt5 ? null +, qtbase ? null , wrapQtAppsHook ? null # can be turned off if used as a library , useGtk ? true @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optionals (pulseaudioSupport) [ libpulseaudio ] ++ stdenv.lib.optionals (useGtk) [ gtk3 ] ++ stdenv.lib.optionals (useQt) [ - qt5.qtbase + qtbase ] ; configureFlags = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a05c25bd86..5b773bf5929 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19848,7 +19848,7 @@ in gvisor-containerd-shim = callPackage ../applications/virtualization/gvisor/containerd-shim.nix { }; - guvcview = callPackage ../os-specific/linux/guvcview { }; + guvcview = libsForQt5.callPackage ../os-specific/linux/guvcview { }; gxmessage = callPackage ../applications/misc/gxmessage { }; -- cgit v1.2.3 From f0b1ace47346edeaade2e271227a5288128e1f8f Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 25 Apr 2020 21:18:23 +0300 Subject: qstopmotion: use libsForQt5.callPackage properly --- pkgs/applications/video/qstopmotion/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix index ec1df91bbfc..4491e7a1574 100644 --- a/pkgs/applications/video/qstopmotion/default.nix +++ b/pkgs/applications/video/qstopmotion/default.nix @@ -1,7 +1,11 @@ { stdenv , mkDerivation , fetchurl -, qt5 +, qtbase +, qtmultimedia +, qtquickcontrols +, qtimageformats +, qtxmlpatterns , ffmpeg , guvcview , cmake @@ -27,18 +31,18 @@ mkDerivation rec { sha256 = "03r6jxyq0bak2vsy2b78nk27m7fm96hnl8cx11l3l17704j4iglh"; }; - buildInputs = with qt5; [ + buildInputs = [ + qtbase + qtmultimedia + qtquickcontrols + qtimageformats + qtxmlpatterns v4l-utils libv4l pcre - qtbase - qtmultimedia ffmpeg guvcview qwt - qtquickcontrols - qtimageformats - qtxmlpatterns ]; nativeBuildInputs = [ -- cgit v1.2.3 From a4347f2b9248b28880e3d724b4a4301116f3e22a Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 25 Apr 2020 20:22:14 +0200 Subject: wireguard: reference missing `nixosTests.wireguard` --- pkgs/tools/networking/wireguard-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index 82e74f1a4fd..4fac72f7d03 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = ./update.sh; tests = { - inherit (nixosTests) wg-quick wireguard-generated wireguard-namespaces; + inherit (nixosTests) wireguard wg-quick wireguard-generated wireguard-namespaces; }; }; -- cgit v1.2.3 From 65527129079f45ce21652a1f26ae621fa74bd546 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 23 Apr 2020 14:43:48 -0300 Subject: deepin.deepin-anything: fix building with linux kernel 5.6 --- pkgs/desktops/deepin/deepin-anything/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/deepin/deepin-anything/default.nix b/pkgs/desktops/deepin/deepin-anything/default.nix index 7697c23ae14..be7fe818e5c 100644 --- a/pkgs/desktops/deepin/deepin-anything/default.nix +++ b/pkgs/desktops/deepin/deepin-anything/default.nix @@ -1,4 +1,4 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qtbase, udisks2-qt5, utillinux, +{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, pkgconfig, qtbase, udisks2-qt5, utillinux, dtkcore, deepin }: mkDerivation rec { @@ -12,6 +12,16 @@ mkDerivation rec { sha256 = "1kvyffrii4b012f6ld1ih14qrn7gg5cxbdpbkac0wxb22hnz0azm"; }; + patches = [ + # fix compilation error and add support to kernel 5.6 + # https://github.com/linuxdeepin/deepin-anything/pull/27 + (fetchpatch { + name = "linux-5.6.patch"; + url = "https://github.com/linuxdeepin/deepin-anything/commit/764b820c2bcd7248993349b32f91043fc58ee958.patch"; + sha256 = "1ww4xllxc2s04px6fy8wp5cyw54xaz155ry30sqz21vl8awfr36h"; + }) + ]; + outputs = [ "out" "modsrc" ]; nativeBuildInputs = [ -- cgit v1.2.3 From 170c2b19542a3ba8d5b05ed854b3bf841d863915 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 25 Apr 2020 21:33:09 +0200 Subject: androidStudioPackages.{dev,canary}: 4.1.0.6 -> 4.1.0.7 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index a6b99e58351..12badc8798e 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -18,9 +18,9 @@ let sha256Hash = "0lchi3l50826n1af1z24yclpf27v2q5p1zjbvcmn37wz46d4s4g2"; }; latestVersion = { # canary & dev - version = "4.1.0.6"; # "Android Studio 4.1 Canary 6" - build = "193.6381907"; - sha256Hash = "0sa5plr96m90wv5hi9bqwa11j6k8k9wa0ji8qmlimdhnpyzhsdrx"; + version = "4.1.0.7"; # "Android Studio 4.1 Canary 7" + build = "193.6401718"; + sha256Hash = "1xa61rhi7dgxm0y6yl5dxd09x530mzyxvx9bp1jprzfwvc7s0byh"; }; in { # Attributes are named by their corresponding release channels -- cgit v1.2.3 From c5e8985fd74e83dbb4a75309581af73c764811dd Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 25 Apr 2020 21:35:49 +0200 Subject: androidStudioPackages.beta: 4.0.0.13 -> 4.0.0.14 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 12badc8798e..8869f8a0f62 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,9 +13,9 @@ let sha256Hash = "0apxmp341m7mbpm2df3qvsbaifwy6yqq746kbhbwlw8bn9hrzv1k"; }; betaVersion = { - version = "4.0.0.13"; # "Android Studio 4.0 Beta 4" - build = "193.6348893"; - sha256Hash = "0lchi3l50826n1af1z24yclpf27v2q5p1zjbvcmn37wz46d4s4g2"; + version = "4.0.0.14"; # "Android Studio 4.0 Beta 5" + build = "193.6401094"; + sha256Hash = "11fmpf58z44i78ldkapzivz6md65744vqczzbwv8mkjkv9nz95rs"; }; latestVersion = { # canary & dev version = "4.1.0.7"; # "Android Studio 4.1 Canary 7" -- cgit v1.2.3 From 716c07c73c8aa30d58787455f4f20fb408cfe1f9 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 25 Apr 2020 23:04:18 +0300 Subject: qstopmotion: mark as broken for aarch64 --- pkgs/applications/video/qstopmotion/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/video/qstopmotion/default.nix b/pkgs/applications/video/qstopmotion/default.nix index 4491e7a1574..98af60c4937 100644 --- a/pkgs/applications/video/qstopmotion/default.nix +++ b/pkgs/applications/video/qstopmotion/default.nix @@ -76,6 +76,7 @@ mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = [ maintainers.leenaars ]; + broken = stdenv.isAarch64; platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; }; } -- cgit v1.2.3 From d13a19cfbaf43b1ad2fcf835b1a05410c2f98bcb Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Sat, 25 Apr 2020 16:10:38 -0400 Subject: snes9x-gtk: 1.57 -> 1.60 (#85910) --- pkgs/misc/emulators/snes9x-gtk/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/misc/emulators/snes9x-gtk/default.nix b/pkgs/misc/emulators/snes9x-gtk/default.nix index 0ae92121cab..6560024b19e 100644 --- a/pkgs/misc/emulators/snes9x-gtk/default.nix +++ b/pkgs/misc/emulators/snes9x-gtk/default.nix @@ -1,25 +1,22 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, wrapGAppsHook, intltool, pkgconfig -, SDL2, zlib, gtk3, libxml2, libXv, epoxy, minizip, portaudio }: +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig +, SDL2, zlib, gtk3, libxml2, libXv, epoxy, minizip, pulseaudio, portaudio }: stdenv.mkDerivation rec { pname = "snes9x-gtk"; - version = "1.57"; + version = "1.60"; src = fetchFromGitHub { owner = "snes9xgit"; repo = "snes9x"; rev = version; - sha256 = "1jcvj2l03b98iz6aq4x747vfz7i6h6j339z4brj4vz71s11vn31a"; + sha256 = "12hpn7zcdvp30ldpw2zf115yjqv55n1ldjbids7vx0lvbpr06dm1"; }; enableParallelBuilding = true; - nativeBuildInputs = [ autoreconfHook wrapGAppsHook intltool pkgconfig ]; - buildInputs = [ SDL2 zlib gtk3 libxml2 libXv epoxy minizip portaudio ]; + nativeBuildInputs = [ meson ninja pkgconfig ]; + buildInputs = [ SDL2 zlib gtk3 libxml2 libXv epoxy minizip pulseaudio portaudio ]; - preAutoreconf = '' - cd gtk - intltoolize - ''; + preConfigure = "cd gtk"; meta = with stdenv.lib; { homepage = "http://www.snes9x.com"; -- cgit v1.2.3 From a89b7739846caf72c884382c31c7d6dee34370ed Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sat, 25 Apr 2020 22:07:43 +0200 Subject: lib/tests: Allow overriding pkgs independent of lib being tested --- lib/tests/maintainers.nix | 11 ++++++----- lib/tests/release.nix | 15 ++++++++++++--- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/lib/tests/maintainers.nix b/lib/tests/maintainers.nix index 60d296eecae..d3ed398c80a 100644 --- a/lib/tests/maintainers.nix +++ b/lib/tests/maintainers.nix @@ -1,10 +1,11 @@ -# to run these tests: -# nix-build nixpkgs/lib/tests/maintainers.nix -# If nothing is output, all tests passed -{ pkgs ? import ../.. {} }: +# to run these tests (and the others) +# nix-build nixpkgs/lib/tests/release.nix +{ # The pkgs used for dependencies for the testing itself + pkgs +, lib +}: let - inherit (pkgs) lib; inherit (lib) types; maintainerModule = { config, ... }: { diff --git a/lib/tests/release.nix b/lib/tests/release.nix index ec0f9c32d3f..eebee1b49bc 100644 --- a/lib/tests/release.nix +++ b/lib/tests/release.nix @@ -1,8 +1,17 @@ -{ pkgs ? import ../.. {} }: +{ # The pkgs used for dependencies for the testing itself + # Don't test properties of pkgs.lib, but rather the lib in the parent directory + pkgs ? import ../.. {} // { lib = throw "pkgs.lib accessed, but the lib tests should use nixpkgs' lib path directly!"; } +}: pkgs.runCommandNoCC "nixpkgs-lib-tests" { - buildInputs = [ pkgs.nix (import ./check-eval.nix) (import ./maintainers.nix { inherit pkgs; }) ]; - NIX_PATH = "nixpkgs=${toString pkgs.path}"; + buildInputs = [ + pkgs.nix + (import ./check-eval.nix) + (import ./maintainers.nix { + inherit pkgs; + lib = import ../.; + }) + ]; } '' datadir="${pkgs.nix}/share" export TEST_ROOT=$(pwd)/test-tmp -- cgit v1.2.3 From a576482e4cbac5c02409a7864dc33750ad752cd0 Mon Sep 17 00:00:00 2001 From: peelz Date: Tue, 21 Apr 2020 10:59:49 -0400 Subject: obs-v4l2sink: add 32-bit support The rev was downgraded to the latest released version (0.1.0) because the the changes on master are mostly related to localization and README stuff. The only code-related change is insignificant. --- ...ind-ObsPluginHelpers.cmake-in-the-obs-src.patch | 25 ----------- pkgs/applications/video/obs-studio/v4l2sink.nix | 52 ++++++++++++---------- 2 files changed, 28 insertions(+), 49 deletions(-) delete mode 100644 pkgs/applications/video/obs-studio/0001-find-ObsPluginHelpers.cmake-in-the-obs-src.patch diff --git a/pkgs/applications/video/obs-studio/0001-find-ObsPluginHelpers.cmake-in-the-obs-src.patch b/pkgs/applications/video/obs-studio/0001-find-ObsPluginHelpers.cmake-in-the-obs-src.patch deleted file mode 100644 index b642fbc3ada..00000000000 --- a/pkgs/applications/video/obs-studio/0001-find-ObsPluginHelpers.cmake-in-the-obs-src.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 5798a2691467604e89fd9fb1cd5289ebd1b1d7b8 Mon Sep 17 00:00:00 2001 -From: Graham Christensen -Date: Fri, 20 Mar 2020 22:32:02 -0400 -Subject: [PATCH] find ObsPluginHelpers.cmake in the obs src - ---- - external/FindLibObs.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/external/FindLibObs.cmake b/external/FindLibObs.cmake -index ab0a3de..53a46b8 100644 ---- a/external/FindLibObs.cmake -+++ b/external/FindLibObs.cmake -@@ -95,7 +95,7 @@ if(LIBOBS_FOUND) - - set(LIBOBS_INCLUDE_DIRS ${LIBOBS_INCLUDE_DIR} ${W32_PTHREADS_INCLUDE_DIR}) - set(LIBOBS_LIBRARIES ${LIBOBS_LIB} ${W32_PTHREADS_LIB}) -- include(${LIBOBS_INCLUDE_DIR}/../cmake/external/ObsPluginHelpers.cmake) -+ include(${OBS_SRC}/cmake/external/ObsPluginHelpers.cmake) - - # allows external plugins to easily use/share common dependencies that are often included with libobs (such as FFmpeg) - if(NOT DEFINED INCLUDED_LIBOBS_CMAKE_MODULES) --- -2.25.0 - diff --git a/pkgs/applications/video/obs-studio/v4l2sink.nix b/pkgs/applications/video/obs-studio/v4l2sink.nix index 1a1a48f11ed..515cc001ee9 100644 --- a/pkgs/applications/video/obs-studio/v4l2sink.nix +++ b/pkgs/applications/video/obs-studio/v4l2sink.nix @@ -1,42 +1,46 @@ -{ stdenv, fetchFromGitHub -, cmake, pkgconfig, wrapQtAppsHook -, obs-studio }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, qtbase +, obs-studio +}: -stdenv.mkDerivation { - pname = "obs-v4l2sink-unstable"; - version = "20181012"; +stdenv.mkDerivation rec { + pname = "obs-v4l2sink"; + version = "0.1.0"; src = fetchFromGitHub { owner = "CatxFish"; repo = "obs-v4l2sink"; - rev = "1ec3c8ada0e1040d867ce567f177be55cd278378"; - sha256 = "03ah91cm1qz26k90mfx51l0d598i9bcmw39lkikjs1msm4c9dfxx"; + rev = version; + sha256 = "0l4lavaywih5lzwgxcbnvdrxhpvkrmh56li06s3aryikngxwsk3z"; }; - nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; - buildInputs = [ obs-studio ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ qtbase obs-studio ]; - patches = [ - ./0001-find-ObsPluginHelpers.cmake-in-the-obs-src.patch + cmakeFlags = with lib; [ + "-DLIBOBS_INCLUDE_DIR=${obs-studio.src}/libobs" ]; - cmakeFlags = [ - "-DLIBOBS_INCLUDE_DIR=${obs-studio}/include/obs" - "-DLIBOBS_LIBRARIES=${obs-studio}/lib" - "-DCMAKE_CXX_FLAGS=-I${obs-studio.src}/UI/obs-frontend-api" - "-DOBS_SRC=${obs-studio.src}" - ]; - - installPhase = '' - mkdir -p $out/share/obs/obs-plugins/v4l2sink/bin/64bit - cp ./v4l2sink.so $out/share/obs/obs-plugins/v4l2sink/bin/64bit/ + # obs-studio expects the shared object to be located in bin/32bit or bin/64bit + # https://github.com/obsproject/obs-studio/blob/d60c736cb0ec0491013293c8a483d3a6573165cb/libobs/obs-nix.c#L48 + postInstall = let + pluginPath = { + i686-linux = "bin/32bit"; + x86_64-linux = "bin/64bit"; + }.${stdenv.targetPlatform.system} or (throw "Unsupported system: ${stdenv.targetPlatform.system}"); + in '' + mkdir -p $out/share/obs/obs-plugins/v4l2sink/${pluginPath} + ln -s $out/lib/obs-plugins/v4l2sink.so $out/share/obs/obs-plugins/v4l2sink/${pluginPath} ''; - meta = with stdenv.lib; { + meta = with lib; { description = "obs studio output plugin for Video4Linux2 device"; homepage = "https://github.com/CatxFish/obs-v4l2sink"; maintainers = with maintainers; [ colemickens peelz ]; license = licenses.gpl2; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "i686-linux" ]; }; } -- cgit v1.2.3 From f2211de99ebd4c568e848649ef70bf5548d8ba6a Mon Sep 17 00:00:00 2001 From: peelz Date: Tue, 21 Apr 2020 11:00:36 -0400 Subject: obs-v4l2sink: fix v4l2device_close segfault --- pkgs/applications/video/obs-studio/v4l2sink.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/video/obs-studio/v4l2sink.nix b/pkgs/applications/video/obs-studio/v4l2sink.nix index 515cc001ee9..97eae68b6e7 100644 --- a/pkgs/applications/video/obs-studio/v4l2sink.nix +++ b/pkgs/applications/video/obs-studio/v4l2sink.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , qtbase , obs-studio @@ -20,6 +21,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ qtbase obs-studio ]; + patches = [ + # Fixes the segfault when stopping the plugin + (fetchpatch { + url = "https://github.com/CatxFish/obs-v4l2sink/commit/6604f01796d1b84a95714730ea51a6b8ac0e450b.diff"; + sha256 = "0crcvw02dj0aqy7hnhizjdsnhiw03zmg6cbdkasxz2mrrbyc3s88"; + }) + ]; + cmakeFlags = with lib; [ "-DLIBOBS_INCLUDE_DIR=${obs-studio.src}/libobs" ]; -- cgit v1.2.3 From 4f17832abfdd15cd05fab04b3eec607896fe1e18 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 26 Apr 2020 01:08:31 +0200 Subject: msmtp: 1.8.8 -> 1.8.10 (#86027) This update contains the full fix for the unfortunate and very annoying msmtpq regression [0]. #YAY This successfully reduces the amount of spam my setup generates :) (Note: SCNR) Relevant patches: - https://github.com/marlam/msmtp-mirror/commit/c78f24347ec996c7a3830b48403bf3736afca071 - https://github.com/marlam/msmtp-mirror/commit/dfb39595a5cdf048db4dfc438333a2b8948c5296 [0]: https://marlam.de/msmtp/news/ --- pkgs/applications/networking/msmtp/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index 0117ab978cc..9e990dcdf33 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, fetchpatch, autoreconfHook, pkgconfig, texinfo +{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig, texinfo , netcat-gnu, gnutls, gsasl, libidn2, Security , withKeyring ? true, libsecret ? null , systemd ? null }: @@ -9,20 +9,15 @@ let in stdenv.mkDerivation rec { pname = "msmtp"; - version = "1.8.8"; + version = "1.8.10"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "1rarck61mz3mwg0l30vjj6j9fq6gc7gic0r1c1ppwpq2izj57jzc"; + sha256 = "041g921rdjiv8bapp61gp4rylq8cckfkcwzyh8bs7xwxs4wpzfna"; }; - # the 2nd patch should go when 1.8.9 is released patches = [ ./paths.patch - (fetchpatch { - url = "https://github.com/marlam/msmtp-mirror/commit/c78f24347ec996c7a3830b48403bf3736afca071.patch"; - sha256 = "0d4sc2f5838jriv65wahpgvwckkzqhdk3hs660fyg80si2i0l1bx"; - }) ]; buildInputs = [ gnutls gsasl libidn2 ] -- cgit v1.2.3 From bc2a4b341a5a49a5068e5b361b5862df5e1ae9f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sat, 25 Apr 2020 14:27:50 +0200 Subject: nixos/nsswitch: Make databases more configurable Instead of hardcoding all nss modules that are added into nsswitch, there are now options exposed. This allows users to add own nss modules (I had this issue with winbindd, for example). Also, nss modules could be moved to their NixOS modules which would make the nsswitch module slimmer. As the lists are now handled by the modules system, we can use mkOrder to ensure a proper order as well as mkForce to override one specific database type instead of the entire file. --- nixos/modules/config/nsswitch.nix | 146 ++++++++++++++++++++++++++++---------- 1 file changed, 108 insertions(+), 38 deletions(-) diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix index 13277fe56e4..186dd7376e9 100644 --- a/nixos/modules/config/nsswitch.nix +++ b/nixos/modules/config/nsswitch.nix @@ -10,6 +10,7 @@ let canLoadExternalModules = config.services.nscd.enable; myhostname = canLoadExternalModules; mymachines = canLoadExternalModules; + # XXX Move these to their respective modules nssmdns = canLoadExternalModules && config.services.avahi.nssmdns; nsswins = canLoadExternalModules && config.services.samba.nsswins; ldap = canLoadExternalModules && (config.users.ldap.enable && config.users.ldap.nsswitch); @@ -17,28 +18,36 @@ let resolved = canLoadExternalModules && config.services.resolved.enable; googleOsLogin = canLoadExternalModules && config.security.googleOsLogin.enable; - hostArray = [ "files" ] - ++ optional mymachines "mymachines" - ++ optional nssmdns "mdns_minimal [NOTFOUND=return]" - ++ optional nsswins "wins" - ++ optional resolved "resolve [!UNAVAIL=return]" - ++ [ "dns" ] - ++ optional nssmdns "mdns" - ++ optional myhostname "myhostname"; - - passwdArray = [ "files" ] - ++ optional sssd "sss" - ++ optional ldap "ldap" - ++ optional mymachines "mymachines" - ++ optional googleOsLogin "cache_oslogin oslogin" - ++ [ "systemd" ]; - - shadowArray = [ "files" ] - ++ optional sssd "sss" - ++ optional ldap "ldap"; - - servicesArray = [ "files" ] - ++ optional sssd "sss"; + hostArray = mkMerge [ + (mkBefore [ "files" ]) + (mkIf mymachines [ "mymachines" ]) + (mkIf nssmdns [ "mdns_minimal [NOTFOUND=return]" ]) + (mkIf nsswins [ "wins" ]) + (mkIf resolved [ "resolve [!UNAVAIL=return]" ]) + (mkAfter [ "dns" ]) + (mkIf nssmdns (mkOrder 1501 [ "mdns" ])) # 1501 to ensure it's after dns + (mkIf myhostname (mkOrder 1600 [ "myhostname" ])) # 1600 to ensure it's always the last + ]; + + passwdArray = mkMerge [ + (mkBefore [ "files" ]) + (mkIf sssd [ "sss" ]) + (mkIf ldap [ "ldap" ]) + (mkIf mymachines [ "mymachines" ]) + (mkIf googleOsLogin [ "cache_oslogin oslogin" ]) + (mkIf canLoadExternalModules (mkAfter [ "systemd" ])) + ]; + + shadowArray = mkMerge [ + (mkBefore [ "files" ]) + (mkIf sssd [ "sss" ]) + (mkIf ldap [ "ldap" ]) + ]; + + servicesArray = mkMerge [ + (mkBefore [ "files" ]) + (mkIf sssd [ "sss" ]) + ]; in { options = { @@ -61,17 +70,73 @@ in { }; }; - system.nssHosts = mkOption { - type = types.listOf types.str; - default = []; - example = [ "mdns" ]; - description = '' - List of host entries to configure in /etc/nsswitch.conf. - ''; - }; + system.nssDatabases = { + passwd = mkOption { + type = types.listOf types.str; + description = '' + List of passwd entries to configure in /etc/nsswitch.conf. + + Note that "files" is always prepended while "systemd" is appended if nscd is enabled. + + This option only takes effect if nscd is enabled. + ''; + default = []; + }; + + group = mkOption { + type = types.listOf types.str; + description = '' + List of group entries to configure in /etc/nsswitch.conf. + + Note that "files" is always prepended while "systemd" is appended if nscd is enabled. + + This option only takes effect if nscd is enabled. + ''; + default = []; + }; + + shadow = mkOption { + type = types.listOf types.str; + description = '' + List of shadow entries to configure in /etc/nsswitch.conf. + Note that "files" is always prepended. + + This option only takes effect if nscd is enabled. + ''; + default = []; + }; + + hosts = mkOption { + type = types.listOf types.str; + description = '' + List of hosts entries to configure in /etc/nsswitch.conf. + + Note that "files" is always prepended, and "dns" and "myhostname" are always appended. + + This option only takes effect if nscd is enabled. + ''; + default = []; + }; + + services = mkOption { + type = types.listOf types.str; + description = '' + List of services entries to configure in /etc/nsswitch.conf. + + Note that "files" is always prepended. + + This option only takes effect if nscd is enabled. + ''; + default = []; + }; + }; }; + imports = [ + (mkRenamedOptionModule [ "system" "nssHosts" ] [ "system" "nssDatabases" "hosts" ]) + ]; + config = { assertions = [ { @@ -87,23 +152,28 @@ in { ]; # Name Service Switch configuration file. Required by the C - # library. !!! Factor out the mdns stuff. The avahi module - # should define an option used by this module. + # library. environment.etc."nsswitch.conf".text = '' - passwd: ${concatStringsSep " " passwdArray} - group: ${concatStringsSep " " passwdArray} - shadow: ${concatStringsSep " " shadowArray} + passwd: ${concatStringsSep " " config.system.nssDatabases.passwd} + group: ${concatStringsSep " " config.system.nssDatabases.group} + shadow: ${concatStringsSep " " config.system.nssDatabases.shadow} - hosts: ${concatStringsSep " " config.system.nssHosts} + hosts: ${concatStringsSep " " config.system.nssDatabases.hosts} networks: files ethers: files - services: ${concatStringsSep " " servicesArray} + services: ${concatStringsSep " " config.system.nssDatabases.services} protocols: files rpc: files ''; - system.nssHosts = hostArray; + system.nssDatabases = { + passwd = passwdArray; + group = passwdArray; + shadow = shadowArray; + hosts = hostArray; + services = servicesArray; + }; # Systemd provides nss-myhostname to ensure that our hostname # always resolves to a valid IP address. It returns all locally -- cgit v1.2.3 From c1facd193e8031a7a86ae1bf93318f99df65b392 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 19 Apr 2020 16:11:10 +1000 Subject: buildGoPackage: remove inactive maintainer --- pkgs/development/go-packages/generic/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix index 388280a905f..b4ec8bd1706 100644 --- a/pkgs/development/go-packages/generic/default.nix +++ b/pkgs/development/go-packages/generic/default.nix @@ -242,11 +242,7 @@ let # Add default meta information homepage = "https://${goPackagePath}"; platforms = go.meta.platforms or lib.platforms.all; - } // meta // { - # add an extra maintainer to every package - maintainers = (meta.maintainers or []) ++ - [ lib.maintainers.lethalman ]; - }; + } // meta; }); in if disabled then throw "${package.name} not supported for go ${go.meta.branch}" -- cgit v1.2.3 From 7a40eb5763a13f68af5d7f74cae166d6c2d73c4d Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 26 Apr 2020 13:16:50 +1000 Subject: docker-machine: use installShellFiles --- .../networking/cluster/docker-machine/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/cluster/docker-machine/default.nix b/pkgs/applications/networking/cluster/docker-machine/default.nix index 32108426032..a801a122374 100644 --- a/pkgs/applications/networking/cluster/docker-machine/default.nix +++ b/pkgs/applications/networking/cluster/docker-machine/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage rec { pname = "machine"; @@ -14,13 +14,13 @@ buildGoPackage rec { sha256 = "0xxzxi5v7ji9j2k7kxhi0ah91lfa7b9rg3nywgx0lkv8dlgp8kmy"; }; - postInstall = '' - mkdir -p \ - $bin/share/bash-completion/completions/ \ - $bin/share/zsh/site-functions/ + nativeBuildInputs = [ installShellFiles ]; - cp go/src/github.com/docker/machine/contrib/completion/bash/* $bin/share/bash-completion/completions/ - cp go/src/github.com/docker/machine/contrib/completion/zsh/* $bin/share/zsh/site-functions/ + postInstall = '' + pushd go/src/${goPackagePath}/contrib/completion + installShellCompletion --bash bash/* + installShellCompletion --zsh zsh/* + popd ''; meta = with stdenv.lib; { -- cgit v1.2.3 From 7c399a4ee080f33cc500a3fda33af6fccfd617bd Mon Sep 17 00:00:00 2001 From: rizary Date: Sun, 26 Apr 2020 08:38:44 +0700 Subject: nixpkgs-fmt: 0.7.0 -> 0.8.0 --- pkgs/tools/nix/nixpkgs-fmt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/nix/nixpkgs-fmt/default.nix b/pkgs/tools/nix/nixpkgs-fmt/default.nix index dfd7eb63b12..b95bb46a844 100644 --- a/pkgs/tools/nix/nixpkgs-fmt/default.nix +++ b/pkgs/tools/nix/nixpkgs-fmt/default.nix @@ -1,16 +1,16 @@ { lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "nixpkgs-fmt"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "v${version}"; - sha256 = "0b9wwv77bpq24yxky44ndgvxsx2zgsl15lvl6wklbkr41mwz3xis"; + sha256 = "09lhi8aidw9qf94n07mgs2nfac32a96wkx50glj35dhn06iwzwqr"; }; - cargoSha256 = "1vv2gypbmgd9lksrk5h2z3agcs1269p1i3im9529nhcsl62ckj7n"; + cargoSha256 = "15m40d9354412h51zn806pxsqjai48xiw8chf8slbi0cjxd268j9"; meta = with lib; { description = "Nix code formatter for nixpkgs"; -- cgit v1.2.3 From 3e0aa4af2da4e4010cd9011aaa125fed7ca220e6 Mon Sep 17 00:00:00 2001 From: Colin <486199+c00w@users.noreply.github.com> Date: Sun, 26 Apr 2020 04:37:59 -0400 Subject: Get rid of go 1.13 (#86036) Kubernetes builds with go1.14. Terraform has an upstream patch which fixes the macos mojave issues - it's a bug in terraform, not go. --- .../networking/cluster/terraform/default.nix | 10 +- pkgs/development/compilers/go/1.13.nix | 244 --------------------- pkgs/top-level/all-packages.nix | 22 +- 3 files changed, 10 insertions(+), 266 deletions(-) delete mode 100644 pkgs/development/compilers/go/1.13.nix diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index ee27422a139..50a5129226a 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, buildEnv, buildGoPackage, fetchFromGitHub, makeWrapper, coreutils -, runCommand, writeText, terraform-providers }: +, runCommand, writeText, terraform-providers, fetchpatch }: let goPackagePath = "github.com/hashicorp/terraform"; @@ -120,7 +120,13 @@ in rec { terraform_0_12 = pluggable (generic { version = "0.12.24"; sha256 = "1rjihp6qcaizp2nnv4z20kpmjnqcw95pq5rnhq381a3pdzr0cd0z"; - patches = [ ./provider-path.patch ]; + patches = [ + ./provider-path.patch + (fetchpatch { + name = "fix-mac-mojave-crashes.patch"; + url = "https://github.com/hashicorp/terraform/pull/24562.patch"; + sha256 = "1k70kk4hli72x8gza6fy3vpckdm3sf881w61fmssrah3hgmfmbrs"; + }) ]; passthru = { inherit plugins; }; }); diff --git a/pkgs/development/compilers/go/1.13.nix b/pkgs/development/compilers/go/1.13.nix deleted file mode 100644 index 8fee93cc4ab..00000000000 --- a/pkgs/development/compilers/go/1.13.nix +++ /dev/null @@ -1,244 +0,0 @@ -{ stdenv, fetchurl, tzdata, iana-etc, runCommand -, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation -, mailcap, runtimeShell -, buildPackages, pkgsTargetTarget -}: - -let - - inherit (stdenv.lib) optionals optionalString; - - goBootstrap = runCommand "go-bootstrap" {} '' - mkdir $out - cp -rf ${buildPackages.go_bootstrap}/* $out/ - chmod -R u+w $out - find $out -name "*.c" -delete - cp -rf $out/bin/* $out/share/go/bin/ - ''; - - goarch = platform: { - "i686" = "386"; - "x86_64" = "amd64"; - "aarch64" = "arm64"; - "arm" = "arm"; - "armv5tel" = "arm"; - "armv6l" = "arm"; - "armv7l" = "arm"; - }.${platform.parsed.cpu.name} or (throw "Unsupported system"); - -in - -stdenv.mkDerivation rec { - pname = "go"; - version = "1.13.8"; - - src = fetchurl { - url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "0d7cxffk72568h46srzswrxd0bsdip7amgkf499wzn6l6d3g0fxi"; - }; - - # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch procps ]; - buildInputs = [ cacert pcre ] - ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] - ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - - depsTargetTargetPropagated = optionals stdenv.isDarwin [ Security Foundation ]; - - hardeningDisable = [ "all" ]; - - prePatch = '' - patchShebangs ./ # replace /bin/bash - - # This source produces shell script at run time, - # and thus it is not corrected by patchShebangs. - substituteInPlace misc/cgo/testcarchive/carchive_test.go \ - --replace '#!/usr/bin/env bash' '#!${runtimeShell}' - - # Patch the mimetype database location which is missing on NixOS. - # but also allow static binaries built with NixOS to run outside nix - sed -i 's,\"/etc/mime.types,"${mailcap}/etc/mime.types\"\,\n\t&,' src/mime/type_unix.go - - # Disabling the 'os/http/net' tests (they want files not available in - # chroot builds) - rm src/net/{listen,parse}_test.go - rm src/syscall/exec_linux_test.go - - # !!! substituteInPlace does not seems to be effective. - # The os test wants to read files in an existing path. Just don't let it be /usr/bin. - sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go - sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go - # Disable the unix socket test - sed -i '/TestShutdownUnix/aif true \{ return\; \}' src/net/net_test.go - # Disable the hostname test - sed -i '/TestHostname/aif true \{ return\; \}' src/os/os_test.go - # ParseInLocation fails the test - sed -i '/TestParseInSydney/aif true \{ return\; \}' src/time/format_test.go - # Remove the api check as it never worked - sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go - # Remove the coverage test as we have removed this utility - sed -i '/TestCoverageWithCgo/aif true \{ return\; \}' src/cmd/go/go_test.go - # Remove the timezone naming test - sed -i '/TestLoadFixed/aif true \{ return\; \}' src/time/time_test.go - # Remove disable setgid test - sed -i '/TestRespectSetgidDir/aif true \{ return\; \}' src/cmd/go/internal/work/build_test.go - # Remove cert tests that conflict with NixOS's cert resolution - sed -i '/TestEnvVars/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go - # TestWritevError hangs sometimes - sed -i '/TestWritevError/aif true \{ return\; \}' src/net/writev_test.go - # TestVariousDeadlines fails sometimes - sed -i '/TestVariousDeadlines/aif true \{ return\; \}' src/net/timeout_test.go - - sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go - sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go - - # Disable cgo lookup tests not works, they depend on resolver - rm src/net/cgo_unix_test.go - - '' + optionalString stdenv.isLinux '' - # prepend the nix path to the zoneinfo files but also leave the original value for static binaries - # that run outside a nix server - sed -i 's,\"/usr/share/zoneinfo/,"${tzdata}/share/zoneinfo/\"\,\n\t&,' src/time/zoneinfo_unix.go - - '' + optionalString stdenv.isAarch32 '' - echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash - '' + optionalString stdenv.isDarwin '' - substituteInPlace src/race.bash --replace \ - "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true - sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go - sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go - sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go - - sed -i '/TestChdirAndGetwd/aif true \{ return\; \}' src/os/os_test.go - sed -i '/TestCredentialNoSetGroups/aif true \{ return\; \}' src/os/exec/exec_posix_test.go - sed -i '/TestRead0/aif true \{ return\; \}' src/os/os_test.go - sed -i '/TestSystemRoots/aif true \{ return\; \}' src/crypto/x509/root_darwin_test.go - - sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/aif true \{ return\; \}' src/cmd/go/go_test.go - sed -i '/TestBuildDashIInstallsDependencies/aif true \{ return\; \}' src/cmd/go/go_test.go - - sed -i '/TestDisasmExtld/aif true \{ return\; \}' src/cmd/objdump/objdump_test.go - - sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go - - # TestCurrent fails because Current is not implemented on Darwin - sed -i 's/TestCurrent/testCurrent/g' src/os/user/user_test.go - sed -i 's/TestLookup/testLookup/g' src/os/user/user_test.go - - touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd - ''; - - patches = [ - ./remove-tools-1.11.patch - ./ssl-cert-file-1.13.patch - ./remove-test-pie-1.13.patch - ./creds-test.patch - ./go-1.9-skip-flaky-19608.patch - ./go-1.9-skip-flaky-20072.patch - ./skip-external-network-tests.patch - ./skip-nohup-tests.patch - ] ++ [ - # breaks under load: https://github.com/golang/go/issues/25628 - (if stdenv.isAarch32 - then ./skip-test-extra-files-on-aarch32.patch - else ./skip-test-extra-files-on-386.patch) - ]; - - postPatch = '' - find . -name '*.orig' -exec rm {} ';' - ''; - - GOOS = stdenv.targetPlatform.parsed.kernel.name; - GOARCH = goarch stdenv.targetPlatform; - # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. - # Go will nevertheless build a for host system that we will copy over in - # the install phase. - GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; - GOHOSTARCH = goarch stdenv.buildPlatform; - - # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those - # to be different from CC/CXX - CC_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then - "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc" - else - null; - CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then - "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++" - else - null; - - GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); - GO386 = 387; # from Arch: don't assume sse2 on i686 - CGO_ENABLED = 1; - # Hopefully avoids test timeouts on Hydra - GO_TEST_TIMEOUT_SCALE = 3; - - # Indicate that we are running on build infrastructure - # Some tests assume things like home directories and users exists - GO_BUILDER_NAME = "nix"; - - GOROOT_BOOTSTRAP="${goBootstrap}/share/go"; - - postConfigure = '' - export GOCACHE=$TMPDIR/go-cache - # this is compiled into the binary - export GOROOT_FINAL=$out/share/go - - export PATH=$(pwd)/bin:$PATH - - # Independent from host/target, CC should produce code for the building system. - export CC=${buildPackages.stdenv.cc}/bin/cc - ulimit -a - ''; - - postBuild = '' - (cd src && ./make.bash) - ''; - - doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin; - - checkPhase = '' - runHook preCheck - (cd src && HOME=$TMPDIR GOCACHE=$TMPDIR/go-cache ./run.bash --no-rebuild) - runHook postCheck - ''; - - preInstall = '' - rm -r pkg/obj - # Contains the wrong perl shebang when cross compiling, - # since it is not used for anything we can deleted as well. - rm src/regexp/syntax/make_perl_groups.pl - '' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then '' - mv bin/*_*/* bin - rmdir bin/*_* - ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' - rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH} - ''} - '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then '' - rm -rf bin/*_* - ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' - rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH} - ''} - '' else ""); - - installPhase = '' - runHook preInstall - mkdir -p $GOROOT_FINAL - cp -a bin pkg src lib misc api doc $GOROOT_FINAL - ln -s $GOROOT_FINAL/bin $out/bin - runHook postInstall - ''; - - setupHook = ./setup-hook.sh; - - disallowedReferences = [ goBootstrap ]; - - meta = with stdenv.lib; { - branch = "1.13"; - homepage = "http://golang.org/"; - description = "The Go Programming language"; - license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan orivej mic92 rvolosatovs kalbasit Frostman ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a5ac3065d8..9d25c87a425 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8585,13 +8585,6 @@ in buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; }); - go_1_13 = callPackage ../development/compilers/go/1.13.nix ({ - inherit (darwin.apple_sdk.frameworks) Security Foundation; - } // lib.optionalAttrs stdenv.isAarch64 { - stdenv = gcc8Stdenv; - buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; - }); - go_1_14 = callPackage ../development/compilers/go/1.14.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; } // lib.optionalAttrs stdenv.isAarch64 { @@ -15230,9 +15223,6 @@ in buildGo112Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_12; }; - buildGo113Package = callPackage ../development/go-packages/generic { - go = buildPackages.go_1_13; - }; buildGo114Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_14; }; @@ -15242,9 +15232,6 @@ in buildGo112Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_12; }; - buildGo113Module = callPackage ../development/go-modules/generic { - go = buildPackages.go_1_13; - }; buildGo114Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_14; }; @@ -20343,9 +20330,7 @@ in kubeval-schema = callPackage ../applications/networking/cluster/kubeval/schema.nix { }; - kubernetes = callPackage ../applications/networking/cluster/kubernetes { - go = buildPackages.go_1_13; - }; + kubernetes = callPackage ../applications/networking/cluster/kubernetes { }; kubeseal = callPackage ../applications/networking/cluster/kubeseal { }; @@ -25973,10 +25958,7 @@ in termpdfpy = python3Packages.callPackage ../applications/misc/termpdf.py {}; - inherit (callPackage ../applications/networking/cluster/terraform { - # terraform 0.12 crashes with go1.14 on darwin https://github.com/hashicorp/terraform/issues/24287 - buildGoPackage = if stdenv.isDarwin then buildGo113Package else buildGoPackage; - }) + inherit (callPackage ../applications/networking/cluster/terraform { }) terraform_0_11 terraform_0_11-full terraform_0_12 -- cgit v1.2.3 From bb858898b139982fe304934fd4f95a71d19ad781 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 26 Apr 2020 12:56:28 +0200 Subject: terraform-providers: update-all --- .../cluster/terraform-providers/data.nix | 316 ++++++++++++--------- 1 file changed, 174 insertions(+), 142 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix index d07b6321cb2..90f7a0f7d8a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/data.nix @@ -4,9 +4,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-aci"; - rev = "v0.1.8"; - version = "0.1.8"; - sha256 = "14hya00ygz0khljjxwvkp6wbrbsavh2n8f26s2mjakph2havb8a3"; + rev = "v0.2.1"; + version = "0.2.1"; + sha256 = "1ylc3w5m68q7vvdignrgw3kwdmrw7w0blmfffxc4cam0a6a7q05l"; }; acme = { @@ -28,9 +28,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-alicloud"; - rev = "v1.77.0"; - version = "1.77.0"; - sha256 = "0g8i8dmxzgkzylh2hh4fa9nq6x8bmxqaz0ly0f0cijb82lcbc3qf"; + rev = "v1.80.1"; + version = "1.80.1"; + sha256 = "0d483lp3rwz99f77sds717hafzbz1z7gq58dw52qzqagam8lrc10"; }; archive = { @@ -52,33 +52,33 @@ { owner = "terraform-providers"; repo = "terraform-provider-auth0"; - rev = "v0.8.1"; - version = "0.8.1"; - sha256 = "0hfmbw76p99xa9jz2sjss56p4wzqqhnf9l9gqgyamywfrdd2bn57"; + rev = "v0.9.3"; + version = "0.9.3"; + sha256 = "04dd7jxhpw2dqj6h3sbknbl1fa92jzshznm8icxrjajpxhcnbc32"; }; - aviatrix = + avi = { owner = "terraform-providers"; - repo = "terraform-provider-aviatrix"; - rev = "v2.12.0"; - version = "2.12.0"; - sha256 = "01n3cqb5k8gd0cll3nqbdmnx3mi0scm57j0xpzhxnif14kpj15g6"; + repo = "terraform-provider-avi"; + rev = "18.2.8"; + version = "18.2.8"; + sha256 = "0vpa6wksvb4gz65hgq0vizw0bky400bqh9zgf41g0mqkhv3wwb4i"; }; - avi = + aviatrix = { owner = "terraform-providers"; - repo = "terraform-provider-avi"; - rev = "v0.2.1"; - version = "0.2.1"; - sha256 = "1pyknx5maq1qxm4i2y69iz9c2ym3q3n0fd4hbwxcl83n39cb5iy6"; + repo = "terraform-provider-aviatrix"; + rev = "v2.13.0"; + version = "2.13.0"; + sha256 = "1913fp3lfvdr3npwr0vbdhb4xsvyyr1r76hv3h7rg5fidf3vpw5a"; }; aws = { owner = "terraform-providers"; repo = "terraform-provider-aws"; - rev = "v2.55.0"; - version = "2.55.0"; - sha256 = "0pxmwdy5cin0navva1nf3l02yrqqbg01xcq3hf8w0ch8fgr8mr25"; + rev = "v2.59.0"; + version = "2.59.0"; + sha256 = "0hkvjvabw8phl5mb9km2dxm64a5lf56g9aq9qf593zsij1rsjwkk"; }; azuread = { @@ -92,9 +92,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-azurerm"; - rev = "v2.3.0"; - version = "2.3.0"; - sha256 = "195r6l0ddpjmmf947c1k5v0vdscnhsg2ilp6x7pna418pnx84y2d"; + rev = "v2.7.0"; + version = "2.7.0"; + sha256 = "0w4bafj3kn5kvkrc26ix1y9rgf3w4810x7la7g1aclpg7507fcv3"; }; azurestack = { @@ -108,9 +108,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-baiducloud"; - rev = "v1.1.0"; - version = "1.1.0"; - sha256 = "1va0b9vqfcv2nrqh8jwf80ylyl1x826jhb7h4ghnf18c144qm0i1"; + rev = "v1.2.0"; + version = "1.2.0"; + sha256 = "1s2vk4vjni5nc50pdw60pm0grrf835xy551i6d4cmfxkkpqx3f6f"; }; bigip = { @@ -180,17 +180,25 @@ { owner = "terraform-providers"; repo = "terraform-provider-cloudflare"; - rev = "v2.5.0"; - version = "2.5.0"; - sha256 = "1dqxn2iwbidmfb0850sicwqh4yp6ynarkl36lnr8nqw9lasvqr5a"; + rev = "v2.6.0"; + version = "2.6.0"; + sha256 = "01z2znif5yy4bawcf76b6d0j3b67fljbx87b4b2cb5vqy4l4aamk"; + }; + cloudinit = + { + owner = "hashicorp"; + repo = "terraform-provider-cloudinit"; + rev = "v1.0.0"; + version = "1.0.0"; + sha256 = "0i926f4xkfydd2bxmim69xrvi9ymn1vrc66zl117axzsmy9200zx"; }; cloudscale = { owner = "terraform-providers"; repo = "terraform-provider-cloudscale"; - rev = "v2.1.1"; - version = "2.1.1"; - sha256 = "122yi2wbd8mqddkwp2la6vwqw0kw7c9ff5j6y4xqczjg2bwb9mph"; + rev = "v2.1.2"; + version = "2.1.2"; + sha256 = "052pa17a77fkmhvygfgmpz87xlc08qvz1apzc2scg2449xfdv7zb"; }; cloudstack = { @@ -228,9 +236,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-digitalocean"; - rev = "v1.15.1"; - version = "1.15.1"; - sha256 = "0nld6lgz5vy8n4s0y0wpssrslp866rha2znli6pd5sw1nvi6yg0z"; + rev = "v1.16.0"; + version = "1.16.0"; + sha256 = "0yymgkn66a9mif0wic4rais7ap6d4gfxij835ssr2pr3rb49ay8d"; }; dme = { @@ -268,9 +276,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-dome9"; - rev = "v1.17.0"; - version = "1.17.0"; - sha256 = "123phc71rnb25lv9glybadhmr3pdsrbzl7xm6mj8j213a78qdmn5"; + rev = "v1.18.1"; + version = "1.18.1"; + sha256 = "0m4fxpik55z9ah5nlhvy314xyxvlaldqbwdp3bx1xs9kpm3znvyl"; }; dyn = { @@ -284,9 +292,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-exoscale"; - rev = "v0.16.1"; - version = "0.16.1"; - sha256 = "0gs39nx12ws0ikal9zyqkyfiljbxbw0pj7llj9xsq96s7crvy6xr"; + rev = "v0.16.2"; + version = "0.16.2"; + sha256 = "102z4v3shk0as76v90151j4c6p93wy16m1hzzk1yp50dlc8ffsks"; }; external = { @@ -300,9 +308,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-fastly"; - rev = "v0.13.0"; - version = "0.13.0"; - sha256 = "0mcjmk21fil4q98p8v3qln7s2fqbdkjv1pvba0cf9v9d101dhhi9"; + rev = "v0.14.0"; + version = "0.14.0"; + sha256 = "1ak5gyrv66dnf5qy54hvwc4478n3cs5nxd0nwa2vf0gn2zp55bhy"; }; flexibleengine = { @@ -332,33 +340,33 @@ { owner = "terraform-providers"; repo = "terraform-provider-github"; - rev = "v2.5.1"; - version = "2.5.1"; - sha256 = "1lqnwq5gsz34n6zzwajxrh0i1cbyicl4zxakr4fch7makri2fqwg"; + rev = "v2.6.1"; + version = "2.6.1"; + sha256 = "1hg5pij2hllj6m6x8salsgw404ap7pw6yccvgynw4y4k26dl0jlr"; }; gitlab = { owner = "terraform-providers"; repo = "terraform-provider-gitlab"; - rev = "v2.5.0"; - version = "2.5.0"; - sha256 = "1g7girhjks6p7rcs82p2zd8clp6kdfn6d1synlmfwiw6d3496fvf"; + rev = "v2.6.0"; + version = "2.6.0"; + sha256 = "0qy58fgwipcjwxz473rpcnpkb22n9hqsjckx88lhc2br4pgbcbrd"; }; google-beta = { owner = "terraform-providers"; repo = "terraform-provider-google-beta"; - rev = "v3.15.0"; - version = "3.15.0"; - sha256 = "1xncw82y48dcc464v2gzfmr94l3kgh9x2rlmpmmy6g4mihiwh38b"; + rev = "v3.18.0"; + version = "3.18.0"; + sha256 = "1rsaqrgr6ddgx1pala83y70dk32s0mvf6vi877awmimxjzsa1l4r"; }; google = { owner = "terraform-providers"; repo = "terraform-provider-google"; - rev = "v3.15.0"; - version = "3.15.0"; - sha256 = "0vw7sndy441xn34kiv2k9hq9p9g649amh7bk91rf0f5p8cmyll1c"; + rev = "v3.18.0"; + version = "3.18.0"; + sha256 = "18cxl1qw1wyvzvhgjm1s3c19hbi5z9s6mipgazhrac70myw8dmy7"; }; grafana = { @@ -372,9 +380,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-gridscale"; - rev = "v1.5.0"; - version = "1.5.0"; - sha256 = "05nzia9sa555k07gkhyyckdgn9n6a50w8l3id69rjq1jjh0pngd7"; + rev = "v1.5.1"; + version = "1.5.1"; + sha256 = "0m5j9y26a7jl3frnw1j8gll999brprgf0i29p201d3c9b02pxnla"; }; hcloud = { @@ -404,9 +412,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-heroku"; - rev = "v2.3.0"; - version = "2.3.0"; - sha256 = "1lv3l54fw6rgj2ixkz2dvaf3djj3slhrm0nlbza5c7zjb945igfq"; + rev = "v2.4.0"; + version = "2.4.0"; + sha256 = "1rhny1mbkqkfiqshps5mc5f3ykxnpypsdi72hw4g1k29pbvr4hh8"; }; http = { @@ -428,9 +436,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-huaweicloud"; - rev = "v1.13.0"; - version = "1.13.0"; - sha256 = "1caix3lycqnd856z6c3zp9mmq3vr7rblwhhbkwn4rrcld8sv285j"; + rev = "v1.14.0"; + version = "1.14.0"; + sha256 = "10g5xl3pspzmj0bjzqbw3br4k7kh2jplph06f7sz2zg9dncl4h5z"; }; icinga2 = { @@ -464,6 +472,14 @@ version = "1.3.0"; sha256 = "19af40g8hgz2rdz6523v0fs71ww7qdlf2mh5j9vb7pfzriqwa5k9"; }; + infoblox = + { + owner = "terraform-providers"; + repo = "terraform-provider-infoblox"; + rev = "v1.0.0"; + version = "1.0.0"; + sha256 = "0p95y5w3fzddygmsjc0j60z0f4aazvy5iwbwszj0i8gs42qhda2f"; + }; jdcloud = { owner = "terraform-providers"; @@ -484,9 +500,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-launchdarkly"; - rev = "v1.1.0"; - version = "1.1.0"; - sha256 = "1gj0srv8shn6qg109y1g42dx8dybkp3qrjn412bvs6f063ggk0zs"; + rev = "v1.2.2"; + version = "1.2.2"; + sha256 = "0rvyzn2a8bh8hvd3f6whfwzpx2frqnfmh8nwlasb0r4xya8lv3bc"; }; librato = { @@ -500,9 +516,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-linode"; - rev = "v1.9.2"; - version = "1.9.2"; - sha256 = "1nrk8fi0fwkcm4csrppjwv7vd2ilpbj01dywak696nj8b15w176q"; + rev = "v1.9.3"; + version = "1.9.3"; + sha256 = "12jwvpnv4xl9crq6jynking2rcl4ci8ci22db3fadigxqs98hb4w"; }; local = { @@ -556,9 +572,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-mongodbatlas"; - rev = "v0.4.2"; - version = "0.4.2"; - sha256 = "0cb8dh7bwz9yzyhz8v9j6ksi4dgmmz8d1qpm7234rj36ccirnjmz"; + rev = "v0.5.0"; + version = "0.5.0"; + sha256 = "15m7qmn1gd7gmzlqgf2q70kmihf8ihqabpkf122pxhb3iyikwh77"; }; mysql = { @@ -604,17 +620,17 @@ { owner = "terraform-providers"; repo = "terraform-provider-nomad"; - rev = "v1.4.4"; - version = "1.4.4"; - sha256 = "05029s8h8vx7pl0y3d9cd5nlww3483caxhwkbrmk0vs7zdgxk8ns"; + rev = "v1.4.5"; + version = "1.4.5"; + sha256 = "1sccm4mspjn92ky6nscsrmbb573mx53wzsvvapsf2p4119h9s30i"; }; ns1 = { owner = "terraform-providers"; repo = "terraform-provider-ns1"; - rev = "v1.8.0"; - version = "1.8.0"; - sha256 = "1h1pqrj11wdi0fnrrh2mkwahi59jl2vd8affy4acx7kny4n92s49"; + rev = "v1.8.1"; + version = "1.8.1"; + sha256 = "04s46f40md8hrqqiwj6wcq4qpx0115qk8hwbln9a7lsrh0zmmmb3"; }; nsxt = { @@ -644,9 +660,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-oci"; - rev = "v3.69.0"; - version = "3.69.0"; - sha256 = "17vndv6bpa9ajs7llnf64bb482b15virbv311d3ds5lrva4vvrv8"; + rev = "v3.72.0"; + version = "3.72.0"; + sha256 = "05sl702b0j9lpsy3bjac104qngjlsln0v2ni8a78j97xif8jb0an"; }; oktaasa = { @@ -660,9 +676,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-okta"; - rev = "v3.1.1"; - version = "3.1.1"; - sha256 = "1hky6hqrfyl2gj1lykb7gazj9awjgsxhc028558whm5rysx2wpsr"; + rev = "v3.2.0"; + version = "3.2.0"; + sha256 = "13z5srra4pj5p2dwzrqiny2ph4vmmp8q59ycmd7x2yi93fd02mcl"; }; oneandone = { @@ -676,9 +692,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-opc"; - rev = "v1.3.7"; - version = "1.3.7"; - sha256 = "01g09w8mqfp1d8phplsdj0vz63q5bgq9fqwy2kp4vrnwb70dq52w"; + rev = "v1.4.0"; + version = "1.4.0"; + sha256 = "1yl8bbh4pf94wlmna294zcawylr9hiaix82wr321g9wb0vi3d5l8"; }; opennebula = { @@ -692,9 +708,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-openstack"; - rev = "v1.26.0"; - version = "1.26.0"; - sha256 = "1vsvzs8112vbi0x99yg6niw0wr55p09x7cg85qwjd0r42gpfdfq2"; + rev = "v1.27.0"; + version = "1.27.0"; + sha256 = "0d6dms5y8vndcm10zfid1g13c5fi19z7hqll8z07jr0hgvhbzp2v"; }; opentelekomcloud = { @@ -708,9 +724,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-opsgenie"; - rev = "v0.2.9"; - version = "0.2.9"; - sha256 = "13y6awnm9j5qzq1bcmhg7ngzvx43h2dw9wmzdfi1xcpmv1ldvwpi"; + rev = "v0.3.1"; + version = "0.3.1"; + sha256 = "1ciqhibij0fk2z20yabl464mj9srp1v6dy04dyazmxkw46bm1lc5"; }; oraclepaas = { @@ -732,17 +748,17 @@ { owner = "terraform-providers"; repo = "terraform-provider-packet"; - rev = "v2.8.0"; - version = "2.8.0"; - sha256 = "1qnjla347hll0fav0ngnifblk6slbmh1klnm7k9jv327jmv92hz5"; + rev = "v2.8.1"; + version = "2.8.1"; + sha256 = "1idrvkc2bbp3vwz2w45nazr1hq10f7bmyamb57q7mlswydcyk6b2"; }; pagerduty = { owner = "terraform-providers"; repo = "terraform-provider-pagerduty"; - rev = "v1.5.1"; - version = "1.5.1"; - sha256 = "12n12sx1qxckqklcaphzr0j9bcwzrl6p8qzdc3d2csiqccqrpdas"; + rev = "v1.7.0"; + version = "1.7.0"; + sha256 = "168v1mpl9df63yp8zjq79hyxcjj4imyzg20rdn6n71d6iz8v85g8"; }; panos = { @@ -780,9 +796,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-profitbricks"; - rev = "v1.4.4"; - version = "1.4.4"; - sha256 = "0pzcl3pdhaykihvv1v38zrv607mydchvkzrzhwcakgmdkp3vq54i"; + rev = "v1.5.0"; + version = "1.5.0"; + sha256 = "0v9x8sj9c6acmbnkv4bnjvz93dd1fmg9b98rwghiakf968hxx6hl"; }; pureport = { @@ -804,9 +820,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-rancher2"; - rev = "v1.8.1"; - version = "1.8.1"; - sha256 = "15pvz1sd1x932yxdp7d679vax3dw56bfhp3422vxqsgmdgscwg1s"; + rev = "v1.8.3"; + version = "1.8.3"; + sha256 = "1k2d9j17b7sssliraww6as196ihdcra1ylhg1qbynklpr0asiwna"; }; rancher = { @@ -884,17 +900,17 @@ { owner = "terraform-providers"; repo = "terraform-provider-signalfx"; - rev = "v4.18.6"; - version = "4.18.6"; - sha256 = "1xjajkvkcksz0dnawjb3hv14ysp140g0vdj5warshafz8hjbys17"; + rev = "v4.19.4"; + version = "4.19.4"; + sha256 = "15cf9paqrcznj99gv6mxqvgvkd8qbxkwz2145h2qxp5vdcykj78g"; }; skytap = { owner = "terraform-providers"; repo = "terraform-provider-skytap"; - rev = "v0.14.0"; - version = "0.14.0"; - sha256 = "01cscykfw5qilf5rlvh7y2l3bqbv8f180ssqw7zqzyr9p4m6511l"; + rev = "v0.14.1"; + version = "0.14.1"; + sha256 = "0ygsdkv7czyhsjsx1q57rmmcl8x66d65yarhg40hlng5c7xpi52g"; }; softlayer = { @@ -928,6 +944,14 @@ version = "1.0.0"; sha256 = "1x295va6c72465cxps0kx3rrb7s9aip2cniy6icsg1b2yrsb9b26"; }; + sumologic = + { + owner = "terraform-providers"; + repo = "terraform-provider-sumologic"; + rev = "v2.0.0"; + version = "2.0.0"; + sha256 = "0j6lq9xcc3znjd4yd8gyzsbhwbbwi95k16kj1la9cicbvgra8iap"; + }; telefonicaopencloud = { owner = "terraform-providers"; @@ -948,9 +972,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-tencentcloud"; - rev = "v1.30.7"; - version = "1.30.7"; - sha256 = "0d7byng63sxbgn8f5r92lkcaqvq3r0plm619h63f47h6z6z8xarc"; + rev = "v1.32.0"; + version = "1.32.0"; + sha256 = "014zgslr14r446qifk4slq9g5qydxs7bk181gw227k9mr6krgba1"; }; terraform = { @@ -964,9 +988,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-tfe"; - rev = "v0.15.1"; - version = "0.15.1"; - sha256 = "0372yjifsr4kvbc36hzhzf6ajlg6wy1r2x94p67m7rgr2fw061n2"; + rev = "v0.16.0"; + version = "0.16.0"; + sha256 = "0c9csyp655wijlnr3rbmymg6gaa23y4fyav0b1y99qsxaa358af5"; }; tls = { @@ -984,13 +1008,21 @@ version = "0.6.0"; sha256 = "10z032fa64sd8d6r4v2f4m7gp93v8wb2zk2r13fflzg5rfk5740z"; }; + turbot = + { + owner = "terraform-providers"; + repo = "terraform-provider-turbot"; + rev = "v1.1.0"; + version = "1.1.0"; + sha256 = "1wb5n17rv1r5jn6xdzjjafw7s96i826x9ww8w6llllihgl798zn7"; + }; ucloud = { owner = "terraform-providers"; repo = "terraform-provider-ucloud"; - rev = "v1.17.0"; - version = "1.17.0"; - sha256 = "0dpy3bkrm20sk4zpkikas5c8ygl0zf9v6cnd34iblw1m41f44n7v"; + rev = "v1.19.0"; + version = "1.19.0"; + sha256 = "17wkhhxvriqix520nv4q4jrk7gah8kkq3l4nj0rzp1kdwxphmsz0"; }; ultradns = { @@ -1004,17 +1036,17 @@ { owner = "terraform-providers"; repo = "terraform-provider-vault"; - rev = "v2.9.0"; - version = "2.9.0"; - sha256 = "0a1jkwxz45qcbnd91im0xz948k197zal78n6y45bwcbqnil32yiy"; + rev = "v2.10.0"; + version = "2.10.0"; + sha256 = "1yg8ck9z5ycw8akfhnv4pnxyfzav9dzbhizv4dp78xi2gnddrawi"; }; vcd = { owner = "terraform-providers"; repo = "terraform-provider-vcd"; - rev = "v2.7.0"; - version = "2.7.0"; - sha256 = "0bh8hqxpy6722q1v9cnpvn8fqwh5llzz1aavrbsib5brgjc8vqmy"; + rev = "v2.8.0"; + version = "2.8.0"; + sha256 = "0myj5a9mrh7vg6h3gk5f0wsdp6832nz0z10h184107sdchpv253n"; }; venafi = { @@ -1028,17 +1060,17 @@ { owner = "terraform-providers"; repo = "terraform-provider-vra7"; - rev = "v0.5.0"; - version = "0.5.0"; - sha256 = "123yskwgzp771nx03sg49vwi5ph3zf2ajf06s7msj0blvz6wan4v"; + rev = "v1.0.1"; + version = "1.0.1"; + sha256 = "0qmldgxmrv840c5rbmskdf4f9g4v52gg9v7magm6j2w2g0dp1022"; }; vsphere = { owner = "terraform-providers"; repo = "terraform-provider-vsphere"; - rev = "v1.17.0"; - version = "1.17.0"; - sha256 = "16fglpfy8grlifaa1d1ymvjys7wh39m6py8h45g1xgs1jyfkz00s"; + rev = "v1.17.3"; + version = "1.17.3"; + sha256 = "109rg8w6szdqq2hb9jg4j3i79z5ppb6vayikl1cg8m8dsv2whhrj"; }; vthunder = { @@ -1052,9 +1084,9 @@ { owner = "terraform-providers"; repo = "terraform-provider-vultr"; - rev = "v1.1.4"; - version = "1.1.4"; - sha256 = "14anp7b759yyh78ickas52amads2lmwg85h8i0ikln7qhrhl42d7"; + rev = "v1.1.5"; + version = "1.1.5"; + sha256 = "06sxcqklqqsninqach05fzilh6k2h9bv66mgfhf9s53ggs5nm8z7"; }; wavefront = { @@ -1068,8 +1100,8 @@ { owner = "terraform-providers"; repo = "terraform-provider-yandex"; - rev = "v0.35.0"; - version = "0.35.0"; - sha256 = "10zj5s0zdgh54rlczyvkq292v9xj1ivvn2k9ml65l6j3h0axlgxv"; + rev = "v0.38.0"; + version = "0.38.0"; + sha256 = "16s9ffbdgws5hglfr6f48ipjv2sbkdpkg20m9s1m6v2f055nxwak"; }; } -- cgit v1.2.3 From 20f55a9fc072774e537486851d37383df1475cb0 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 26 Apr 2020 13:06:38 +0200 Subject: terraform-providers.ibm: move to update-all script --- .../cluster/terraform-providers/data.nix | 8 +++++ .../cluster/terraform-providers/default.nix | 9 ++--- .../cluster/terraform-providers/ibm/default.nix | 38 ---------------------- .../cluster/terraform-providers/update-all | 1 + 4 files changed, 14 insertions(+), 42 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix diff --git a/pkgs/applications/networking/cluster/terraform-providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix index 90f7a0f7d8a..fc23869a470 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/data.nix @@ -440,6 +440,14 @@ version = "1.14.0"; sha256 = "10g5xl3pspzmj0bjzqbw3br4k7kh2jplph06f7sz2zg9dncl4h5z"; }; + ibm = + { + owner = "IBM-Cloud"; + repo = "terraform-provider-ibm"; + rev = "v1.4.0"; + version = "1.4.0"; + sha256 = "147vl55g6c49ihk8z2hwfq2v7g1yj35id1qfjlz0dxalm7cwa3l6"; + }; icinga2 = { owner = "terraform-providers"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index c3c44160c1b..be24d21a430 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -50,9 +50,10 @@ let # These are the providers that don't fall in line with the default model special-providers = { - # Override the google providers + # Override providers that use Go modules + vendor/ folder google = patchGoModVendor automated-providers.google; google-beta = patchGoModVendor automated-providers.google-beta; + ibm = patchGoModVendor automated-providers.ibm; # providers that were moved to the `hashicorp` organization, # but haven't updated their references yet: @@ -129,12 +130,12 @@ let ''; }); - elasticsearch = callPackage ./elasticsearch {}; + # Packages that don't fit the default model + ansible = callPackage ./ansible {}; gandi = callPackage ./gandi {}; - ibm = callPackage ./ibm {}; + elasticsearch = callPackage ./elasticsearch {}; libvirt = callPackage ./libvirt {}; lxd = callPackage ./lxd {}; - ansible = callPackage ./ansible {}; }; in automated-providers // special-providers diff --git a/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix b/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix deleted file mode 100644 index bd667dbc15f..00000000000 --- a/pkgs/applications/networking/cluster/terraform-providers/ibm/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: - -# -# USAGE: -# install the following package globally or in nix-shell: -# -# (terraform.withPlugins ( plugins: [ terraform-provider-ibm ])) -# -# examples: -# https://github.com/IBM-Cloud/terraform-provider-ibm/tree/master/examples -# - -buildGoPackage rec { - pname = "terraform-provider-ibm"; - version = "0.11.1"; - - goPackagePath = "github.com/terraform-providers/terraform-provider-ibm"; - subPackages = [ "./" ]; - - src = fetchFromGitHub { - owner = "IBM-Cloud"; - repo = "terraform-provider-ibm"; - sha256 = "1vp1kzadfkacn6c4illxjra8yki1fx7h77b38fixkcvc79mzasmv"; - rev = "v${version}"; - }; - - # Terraform allow checking the provider versions, but this breaks - # if the versions are not provided via file paths. - postBuild = "mv go/bin/terraform-provider-ibm{,_v${version}}"; - - meta = with stdenv.lib; { - homepage = "https://github.com/IBM-Cloud/terraform-provider-ibm"; - description = "Terraform provider is used to manage IBM Cloud resources."; - platforms = platforms.all; - license = licenses.mpl20; - maintainers = with maintainers; [ jensbin ]; - }; -} diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-all b/pkgs/applications/networking/cluster/terraform-providers/update-all index 89ed5a94f2a..ef5503d03f1 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-all +++ b/pkgs/applications/networking/cluster/terraform-providers/update-all @@ -112,6 +112,7 @@ cd "$(dirname "$0")" # individual repos to fetch slugs=( + IBM-Cloud/terraform-provider-ibm ajbosco/terraform-provider-segment camptocamp/terraform-provider-pass poseidon/terraform-provider-matchbox -- cgit v1.2.3 From f6ee88f41e00fb6631e02dcb7153837c0c13b87b Mon Sep 17 00:00:00 2001 From: Benjamin Andresen Date: Sat, 25 Apr 2020 10:00:29 +0200 Subject: babashka: increase java heap space max to 4500 3g has very long build times and also doesn't build 100% of the time it's also the new default since: https://github.com/borkdude/babashka/commit/7fc33dcb21c067ea8212e07a55e3ac08c284409f --- pkgs/development/interpreters/clojure/babashka.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/clojure/babashka.nix b/pkgs/development/interpreters/clojure/babashka.nix index 7f94a0695d4..130eabbee34 100644 --- a/pkgs/development/interpreters/clojure/babashka.nix +++ b/pkgs/development/interpreters/clojure/babashka.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { --no-server \ --report-unsupported-elements-at-runtime \ "--initialize-at-run-time=org.postgresql.sspi.SSPIClient" \ - "-J-Xmx3g" + "-J-Xmx4500m" ''; installPhase = '' -- cgit v1.2.3 From 442f76893cae2cb0cb1deb3b8c53ebed3ab05e23 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 26 Apr 2020 13:21:15 +0200 Subject: terraform-providers.sops: init at 0.5.0 --- pkgs/applications/networking/cluster/terraform-providers/data.nix | 8 ++++++++ .../networking/cluster/terraform-providers/update-all | 1 + 2 files changed, 9 insertions(+) diff --git a/pkgs/applications/networking/cluster/terraform-providers/data.nix b/pkgs/applications/networking/cluster/terraform-providers/data.nix index fc23869a470..6994f2b85a3 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/data.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/data.nix @@ -928,6 +928,14 @@ version = "0.0.1"; sha256 = "1xcg5zm2n1pc3l7ng94k589r7ykv6fxsmr5qn9xmmpdf912rdnfq"; }; + sops = + { + owner = "carlpett"; + repo = "terraform-provider-sops"; + rev = "v0.5.0"; + version = "0.5.0"; + sha256 = "18zhqjkw1639a1vrxniws3sf5p91vrf5m7kksaj3yfiavsr5q2ki"; + }; spotinst = { owner = "terraform-providers"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/update-all b/pkgs/applications/networking/cluster/terraform-providers/update-all index ef5503d03f1..70dfc2f825d 100755 --- a/pkgs/applications/networking/cluster/terraform-providers/update-all +++ b/pkgs/applications/networking/cluster/terraform-providers/update-all @@ -115,6 +115,7 @@ slugs=( IBM-Cloud/terraform-provider-ibm ajbosco/terraform-provider-segment camptocamp/terraform-provider-pass + carlpett/terraform-provider-sops poseidon/terraform-provider-matchbox spaceapegames/terraform-provider-wavefront tweag/terraform-provider-nixos -- cgit v1.2.3 From 018aadcfa17397699f72e8c882a23e44b091b31a Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sun, 26 Apr 2020 13:35:16 +0200 Subject: terraform-providers.vpsadmin: init at 0.1.0 --- .../cluster/terraform-providers/default.nix | 1 + .../terraform-providers/vpsadmin/default.nix | 27 ++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index be24d21a430..82ce5a70679 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -136,6 +136,7 @@ let elasticsearch = callPackage ./elasticsearch {}; libvirt = callPackage ./libvirt {}; lxd = callPackage ./lxd {}; + vpsadmin = callPackage ./vpsadmin {}; }; in automated-providers // special-providers diff --git a/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix b/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix new file mode 100644 index 00000000000..2f788ed915e --- /dev/null +++ b/pkgs/applications/networking/cluster/terraform-providers/vpsadmin/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, buildGoModule }: +buildGoModule rec { + pname = "terraform-provider-vpsadmin"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "vpsfreecz"; + repo = "terraform-provider-vpsadmin"; + rev = "v${version}"; + hash = "sha256-+6jRjcManQdoKh7ewOJI1UaulY5OSbkIUHmtrBI33u4="; + }; + + modSha256 = "sha256-gz+t50uHFj4BQnJg6kOJI/joJVE+usLpVzTqziek2wY="; + + subPackages = [ "." ]; + + # Terraform allow checking the provider versions, but this breaks + # if the versions are not provided via file paths. + postInstall = "mv $out/bin/${pname}{,_v${version}}"; + + meta = with stdenv.lib; { + description = "Terraform provider for vpsAdmin"; + homepage = "https://github.com/vpsfreecz/terraform-provider-vpsadmin"; + license = licenses.mpl20; + maintainers = with maintainers; [ zimbatm ]; + }; +} -- cgit v1.2.3 From 9d7f94a3f0aa1cb0df6868a33f0202df37f69df1 Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Sun, 26 Apr 2020 14:51:34 +0300 Subject: rofi-file-browser: init at 1.1.1 (#86052) Co-authored-by: zimbatm --- .../misc/rofi-file-browser/default.nix | 34 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/applications/misc/rofi-file-browser/default.nix diff --git a/pkgs/applications/misc/rofi-file-browser/default.nix b/pkgs/applications/misc/rofi-file-browser/default.nix new file mode 100644 index 00000000000..10453b85849 --- /dev/null +++ b/pkgs/applications/misc/rofi-file-browser/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, rofi, gtk3 }: + +stdenv.mkDerivation rec { + pname = "rofi-file-browser-extended"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "marvinkreis"; + repo = pname; + rev = version; + sha256 = "10wk5sif3bmvsgyk2gdy0qhpv1b37zgzf89n3h0yh7pg195fi2gn"; + fetchSubmodules = true; + }; + + prePatch = '' + substituteInPlace ./CMakeLists.txt \ + --replace ' ''${ROFI_PLUGINS_DIR}' " $out/lib/rofi" \ + --replace "/usr/share/" "$out/share/" + ''; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ rofi gtk3 ]; + + ROFI_PLUGINS_DIR = "$out/lib/rofi"; + + dontUseCmakeBuildDir = true; + + meta = with stdenv.lib; { + description = "Use rofi to quickly open files"; + homepage = "https://github.com/marvinkreis/rofi-file-browser-extended"; + license = licenses.mit; + maintainers = with maintainers; [ jluttine ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9d25c87a425..3316b446b9a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20756,6 +20756,8 @@ in rofi-emoji = callPackage ../applications/misc/rofi-emoji { }; + rofi-file-browser = callPackage ../applications/misc/rofi-file-browser { }; + ympd = callPackage ../applications/audio/ympd { }; nload = callPackage ../applications/networking/nload { }; -- cgit v1.2.3 From 35812875a4455e2636eb24ddaf702faa4767fafa Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 26 Apr 2020 14:53:06 +0300 Subject: docs/python: document builders using doInstallCheck and not doCheck (#86051) --- doc/languages-frameworks/python.section.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index e6f0b64fa9c..dd989e6cc68 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -1059,6 +1059,11 @@ let in newpkgs.inkscape ``` +If you'd like to disable tests for a particular Python based package built with +`buildPythonPackage` or `buildPythonApplication`, you'd need to set +`doInstallCheck = false` and not `doCheck = false` as the later will take no +effect. + ### `python setup.py bdist_wheel` cannot create .whl Executing `python setup.py bdist_wheel` in a `nix-shell `fails with -- cgit v1.2.3 From f56459f7ec83c8afb7c355200c502aa8b0c8affe Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 26 Apr 2020 14:53:44 +0300 Subject: gpxsee: 7.28 -> 7.29 (#86050) --- pkgs/applications/misc/gpxsee/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 7077b855e3d..c519bf63e09 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -2,19 +2,19 @@ mkDerivation rec { pname = "gpxsee"; - version = "7.28"; + version = "7.29"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "0077y5az3hb46rvkqrpl4zxga5wnm85ca6rz1rdpwiwhq4ch9q8y"; + sha256 = "sha256-OTKyxEu7RZZy3JBHTM7YoH+G4lhoRfb1INLtQEKC5p4="; }; nativeBuildInputs = [ qmake qttools ]; preConfigure = '' - lrelease lang/*.ts + lrelease gpxsee.pro ''; postInstall = with stdenv; lib.optionalString isDarwin '' -- cgit v1.2.3 From 73f3469c765b24ec0ab5b2a2108d028806f32069 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sun, 26 Apr 2020 15:11:09 +0300 Subject: azpainter: 2.1.5 -> 2.1.6 (#86028) --- pkgs/applications/graphics/azpainter/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/graphics/azpainter/default.nix b/pkgs/applications/graphics/azpainter/default.nix index 2f636764e1f..67f1f47dccd 100644 --- a/pkgs/applications/graphics/azpainter/default.nix +++ b/pkgs/applications/graphics/azpainter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook +{ stdenv, fetchFromGitHub , libX11, libXext, libXi , freetype, fontconfig , libpng, libjpeg @@ -7,17 +7,15 @@ stdenv.mkDerivation rec { pname = "azpainter"; - version = "2.1.5"; + version = "2.1.6"; src = fetchFromGitHub { owner = "Symbian9"; repo = pname; - rev = "refs/tags/v${version}"; - sha256 = "0x5jmsprjissqcvwq75pqq9wgv4k9b7cy507hai8xk6xs3vxwgba"; + rev = "v${version}"; + sha256 = "sha256-al87Rnf4HkKdmtN3EqxC0zEHgVWwnVi7WttqT/Qxr0Q="; }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libX11 libXext libXi freetype fontconfig @@ -25,14 +23,11 @@ stdenv.mkDerivation rec { zlib ]; - configureFlags = [ - "--with-freetype-dir=${stdenv.lib.getDev freetype}/include/freetype2" - ]; - meta = with stdenv.lib; { description = "Full color painting software for illustration drawing"; homepage = "https://osdn.net/projects/azpainter"; license = licenses.gpl3Plus; maintainers = with maintainers; [ dtzWill ]; + platforms = with platforms; linux ++ darwin; }; } -- cgit v1.2.3 From 579e56fb9eb1ac259baf4badef9652f609cfa507 Mon Sep 17 00:00:00 2001 From: davidak Date: Sun, 26 Apr 2020 14:12:55 +0200 Subject: Update commit policy for stable release branches (#86026) only very few people followed the strict policy in the last 5 years. the maintainers accept backports without reason when it's obvious, so i updated the policy to reflect that --- doc/contributing/submitting-changes.xml | 48 ++++++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 12 deletions(-) diff --git a/doc/contributing/submitting-changes.xml b/doc/contributing/submitting-changes.xml index 73222c1a49a..a88965f5cc6 100644 --- a/doc/contributing/submitting-changes.xml +++ b/doc/contributing/submitting-changes.xml @@ -407,23 +407,47 @@ Additional information.
Stable release branches - + + For cherry-picking a commit to a stable release branch (backporting), use git cherry-pick -x <original commit> so that the original commit id is included in the commit. + + + + Add a reason for the backport by using git cherry-pick -xe <original commit> instead when it is not obvious from the original commit message. It is not needed when it’s a minor version update that includes security and bug fixes but don’t add new features or when the commit fixes an otherwise broken package. + + + + Here is an example of a cherry-picked commit message with good reason description: + + + +zfs: Keep trying root import until it works + +Works around #11003. + +(cherry picked from commit 98b213a11041af39b39473906b595290e2a4e2f9) + +Reason: several people cannot boot with ZFS on NVMe + + + + Other examples of reasons are: + + + - If you're cherry-picking a commit to a stable release branch (“backporting”), always use git cherry-pick -xe and ensure the message contains a clear description about why this needs to be included in the stable branch. + Previously the build would fail due to, e.g., getaddrinfo not being defined + + - An example of a cherry-picked commit would look like this: + The previous download links were all broken + + + + + Crash when starting on some X11 systems - -nixos: Refactor the world. - -The original commit message describing the reason why the world was torn apart. - -(cherry picked from commit abcdef) -Reason: I just had a gut feeling that this would also be wanted by people from -the stone age. -
-- cgit v1.2.3 -- cgit v1.2.3 From 6b3506458e1752f3d226b924f4407a0422b1cc6f Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Mon, 16 Mar 2020 20:15:47 -0400 Subject: tomcat-native: init at 1.2.23 --- pkgs/servers/http/tomcat/tomcat-native.nix | 29 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/servers/http/tomcat/tomcat-native.nix diff --git a/pkgs/servers/http/tomcat/tomcat-native.nix b/pkgs/servers/http/tomcat/tomcat-native.nix new file mode 100644 index 00000000000..57ab2a96b4d --- /dev/null +++ b/pkgs/servers/http/tomcat/tomcat-native.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, apr, jdk, openssl }: + +stdenv.mkDerivation rec { + pname = "tomcat-native"; + version = "1.2.23"; + + src = fetchurl { + url = "mirror://apache/tomcat/tomcat-connectors/native/${version}/source/${pname}-${version}-src.tar.gz"; + sha512 = "89a0363961d322a87f4e752f4727f54f28ac6e4ad10fa21b6b7390c62b041d4068672d95495d9233c1cad7d6c1dc3c85fbd0186894085b3b94e476876af160ee"; + }; + + sourceRoot = "${pname}-${version}-src/native"; + + buildInputs = [ apr jdk openssl ]; + + configureFlags = [ + "--with-apr=${apr.dev}" + "--with-java-home=${jdk}" + "--with-ssl=${openssl.dev}" + ]; + + meta = with stdenv.lib; { + description = "An optional component for use with Apache Tomcat that allows Tomcat to use certain native resources for performance, compatibility, etc"; + homepage = "https://tomcat.apache.org/native-doc/"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ aanderse ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04597ad02ae..80ca1d3454a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15667,6 +15667,8 @@ in tomcat_connectors = callPackage ../servers/http/apache-modules/tomcat-connectors { }; + tomcat-native = callPackage ../servers/http/tomcat/tomcat-native.nix { }; + pies = callPackage ../servers/pies { }; rpcbind = callPackage ../servers/rpcbind { }; -- cgit v1.2.3 From ef964a801ebe3d5e4ccaf682aa4adb5ee4d4e933 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 26 Apr 2020 15:51:20 +0200 Subject: =?UTF-8?q?coqPackages.coqhammer:=201.1.1=20=E2=86=92=201.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add support for Coq 8.11 --- pkgs/development/coq-modules/coqhammer/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/coq-modules/coqhammer/default.nix b/pkgs/development/coq-modules/coqhammer/default.nix index 7d9ec5e7312..16813ac4f11 100644 --- a/pkgs/development/coq-modules/coqhammer/default.nix +++ b/pkgs/development/coq-modules/coqhammer/default.nix @@ -13,8 +13,12 @@ let buildInputs = [ coq.ocamlPackages.camlp5 ]; }; "8.10" = { - version = "1.1.1"; - sha256 = "0b6r7bsygl1axbqybkhkr7zlwcd51ski5ql52994klrrxvjd58df"; + version = "1.2"; + sha256 = "1ir313mmkgp2c65wgw8c681a15clvri1wb1hyjqmj7ymx4shkl56"; + }; + "8.11" = { + version = "1.2"; + sha256 = "1w317h7r5llyamzn1kqb8j6p5sxks2j8vq8wnpzrx01jqbyibxgy"; }; }; param = params.${coq.coq-version}; -- cgit v1.2.3 From 9cf9e66e6ffb3b3d489ae481ef7aabe86de3a671 Mon Sep 17 00:00:00 2001 From: AmineChikhaoui Date: Sun, 26 Apr 2020 09:51:20 -0400 Subject: ec2-amis.nix: add NixOS 20.03 images Fixes #85857. --- nixos/modules/virtualisation/ec2-amis.nix | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix index 630c35bd08f..24de8cf1afb 100644 --- a/nixos/modules/virtualisation/ec2-amis.nix +++ b/nixos/modules/virtualisation/ec2-amis.nix @@ -310,5 +310,24 @@ let self = { "19.09".ap-east-1.hvm-ebs = "ami-055b2348db2827ff1"; "19.09".sa-east-1.hvm-ebs = "ami-018aab68377227e06"; - latest = self."19.09"; + # 20.03.1554.94e39623a49 + "20.03".eu-west-1.hvm-ebs = "ami-02c34db5766cc7013"; + "20.03".eu-west-2.hvm-ebs = "ami-0e32bd8c7853883f1"; + "20.03".eu-west-3.hvm-ebs = "ami-061edb1356c1d69fd"; + "20.03".eu-central-1.hvm-ebs = "ami-0a1a94722dcbff94c"; + "20.03".eu-north-1.hvm-ebs = "ami-02699abfacbb6464b"; + "20.03".us-east-1.hvm-ebs = "ami-0c5e7760748b74e85"; + "20.03".us-east-2.hvm-ebs = "ami-030296bb256764655"; + "20.03".us-west-1.hvm-ebs = "ami-050be818e0266b741"; + "20.03".us-west-2.hvm-ebs = "ami-06562f78dca68eda2"; + "20.03".ca-central-1.hvm-ebs = "ami-02365684a173255c7"; + "20.03".ap-southeast-1.hvm-ebs = "ami-0dbf353e168d155f7"; + "20.03".ap-southeast-2.hvm-ebs = "ami-04c0f3a75f63daddd"; + "20.03".ap-northeast-1.hvm-ebs = "ami-093d9cc49c191eb6c"; + "20.03".ap-northeast-2.hvm-ebs = "ami-0087df91a7b6ebd45"; + "20.03".ap-south-1.hvm-ebs = "ami-0a1a6b569af04af9d"; + "20.03".ap-east-1.hvm-ebs = "ami-0d18fdd309cdefa86"; + "20.03".sa-east-1.hvm-ebs = "ami-09859378158ae971d"; + + latest = self."20.03"; }; in self -- cgit v1.2.3 From ca2fd28d83b86d4d619b532a7622cd87a630df0f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 26 Apr 2020 16:22:33 +0200 Subject: Revert "docs/python: document builders using doInstallCheck and not doCheck (#86051)" For disabling tests when overriding, use `.overridePythonAttrs`. Discussion about aliasing `.overridePythonAttrs` to `.overrideAttrs`. https://github.com/NixOS/nixpkgs/pull/82772 This reverts commit 35812875a4455e2636eb24ddaf702faa4767fafa. --- doc/languages-frameworks/python.section.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index dd989e6cc68..e6f0b64fa9c 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -1059,11 +1059,6 @@ let in newpkgs.inkscape ``` -If you'd like to disable tests for a particular Python based package built with -`buildPythonPackage` or `buildPythonApplication`, you'd need to set -`doInstallCheck = false` and not `doCheck = false` as the later will take no -effect. - ### `python setup.py bdist_wheel` cannot create .whl Executing `python setup.py bdist_wheel` in a `nix-shell `fails with -- cgit v1.2.3 From 2ba79269590cd186c3ad6e5226c4322de8984d87 Mon Sep 17 00:00:00 2001 From: talyz Date: Sun, 12 Apr 2020 23:31:56 +0200 Subject: php.buildEnv: Provide a list of currently enabled extensions Rework withExtensions / buildEnv to handle currently enabled extensions better and make them compatible with override. They now accept a function with the named arguments enabled and all, where enabled is a list of currently enabled extensions and all is the set of all extensions. This gives us several nice properties: - You always get the right version of the list of currently enabled extensions - Invocations chain - It works well with overridden PHP packages - you always get the correct versions of extensions As a contrived example of what's possible, you can add ImageMagick, then override the version and disable fpm, then disable cgi, and lastly remove the zip extension like this: { pkgs ? (import ) {} }: with pkgs; let phpWithImagick = php74.withExtensions ({ all, enabled }: enabled ++ [ all.imagick ]); phpWithImagickWithoutFpm743 = phpWithImagick.override { version = "7.4.3"; sha256 = "wVF7pJV4+y3MZMc6Ptx21PxQfEp6xjmYFYTMfTtMbRQ="; fpmSupport = false; }; phpWithImagickWithoutFpmZip743 = phpWithImagickWithoutFpm743.withExtensions ( { enabled, all }: lib.filter (e: e != all.zip) enabled); phpWithImagickWithoutFpmZipCgi743 = phpWithImagickWithoutFpmZip743.override { cgiSupport = false; }; in phpWithImagickWithoutFpmZipCgi743 --- doc/languages-frameworks/php.section.md | 45 ++++++++++++++------------- nixos/doc/manual/release-notes/rl-2009.xml | 21 ++++++++----- nixos/modules/services/mail/roundcube.nix | 2 +- nixos/modules/services/web-apps/nextcloud.nix | 4 +-- pkgs/development/interpreters/php/default.nix | 41 +++++++++++++++--------- 5 files changed, 67 insertions(+), 46 deletions(-) diff --git a/doc/languages-frameworks/php.section.md b/doc/languages-frameworks/php.section.md index a302a9a7f87..31190f3b51a 100644 --- a/doc/languages-frameworks/php.section.md +++ b/doc/languages-frameworks/php.section.md @@ -30,7 +30,7 @@ opcache extension shipped with PHP is available at `php.extensions.opcache` and the third-party ImageMagick extension at `php.extensions.imagick`. -The different versions of PHP that nixpkgs provides is located under +The different versions of PHP that nixpkgs provides are located under attributes named based on major and minor version number; e.g., `php74` is PHP 7.4 with commonly used extensions installed, `php74base` is the same PHP runtime without extensions. @@ -39,28 +39,31 @@ attributes named based on major and minor version number; e.g., A PHP package with specific extensions enabled can be built using `php.withExtensions`. This is a function which accepts an anonymous -function as its only argument; the function should take one argument, -the set of all extensions, and return a list of wanted extensions. For -example, a PHP package with the opcache and ImageMagick extensions -enabled: +function as its only argument; the function should accept two named +parameters: `enabled` - a list of currently enabled extensions and +`all` - the set of all extensions, and return a list of wanted +extensions. For example, a PHP package with all default extensions and +ImageMagick enabled: ```nix -php.withExtensions (e: with e; [ imagick opcache ]) +php.withExtensions ({ enabled, all }: + enabled ++ [ all.imagick ]) ``` -Note that this will give you a package with _only_ opcache and -ImageMagick, none of the other extensions which are enabled by default -in the `php` package will be available. +To exclude some, but not all, of the default extensions, you can +filter the `enabled` list like this: -To enable building on a previous PHP package, the currently enabled -extensions are made available in its `enabledExtensions` -attribute. For example, to generate a package with all default -extensions enabled, except opcache, but with ImageMagick: +```nix +php.withExtensions ({ enabled, all }: + (lib.filter (e: e != php.extensions.opcache) enabled) + ++ [ all.imagick ]) +``` + +To build your list of extensions from the ground up, you can simply +ignore `enabled`: ```nix -php.withExtensions (e: - (lib.filter (e: e != php.extensions.opcache) php.enabledExtensions) - ++ [ e.imagick ]) +php.withExtensions ({ all, ... }: with all; [ opcache imagick ]) ``` If you want a PHP build with extra configuration in the `php.ini` @@ -73,7 +76,7 @@ and ImageMagick extensions enabled, and `memory_limit` set to `256M`: ```nix php.buildEnv { - extensions = e: with e; [ imagick opcache ]; + extensions = { all, ... }: with all; [ imagick opcache ]; extraConfig = "memory_limit=256M"; } ``` @@ -85,7 +88,7 @@ follows: ```nix let - myPhp = php.withExtensions (e: with e; [ imagick opcache ]); + myPhp = php.withExtensions ({ all, ... }: with all; [ opcache imagick ]); in { services.phpfpm.pools."foo".phpPackage = myPhp; }; @@ -94,7 +97,7 @@ in { ```nix let myPhp = php.buildEnv { - extensions = e: with e; [ imagick opcache ]; + extensions = { all, ... }: with all; [ imagick opcache ]; extraConfig = "memory_limit=256M"; }; in { @@ -105,8 +108,8 @@ in { ##### Example usage with `nix-shell` This brings up a temporary environment that contains a PHP interpreter -with the extensions `imagick` and `opcache` enabled. +with the extensions `imagick` and `opcache` enabled: ```sh -nix-shell -p 'php.buildEnv { extensions = e: with e; [ imagick opcache ]; }' +nix-shell -p 'php.withExtensions ({ all, ... }: with all; [ imagick opcache ])' ``` diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 3e29c19af8f..e4e44c8405f 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -135,18 +135,23 @@ - Since this release there's an easy way to customize your PHP install to get a much smaller - base PHP with only wanted extensions enabled. See the following snippet installing a smaller PHP - with the extensions imagick, opcache and + Since this release there's an easy way to customize your PHP + install to get a much smaller base PHP with only wanted + extensions enabled. See the following snippet installing a + smaller PHP with the extensions imagick, + opcache, pdo and pdo_mysql loaded: environment.systemPackages = [ -(pkgs.php.buildEnv { extensions = pp: with pp; [ - imagick - opcache - pdo_mysql - ]; }) + (pkgs.php.withExtensions + ({ all, ... }: with all; [ + imagick + opcache + pdo + pdo_mysql + ]) + ) ]; The default php attribute hasn't lost any extensions - diff --git a/nixos/modules/services/mail/roundcube.nix b/nixos/modules/services/mail/roundcube.nix index 21e92cfee01..ed1439745ac 100644 --- a/nixos/modules/services/mail/roundcube.nix +++ b/nixos/modules/services/mail/roundcube.nix @@ -7,7 +7,7 @@ let fpm = config.services.phpfpm.pools.roundcube; localDB = cfg.database.host == "localhost"; user = cfg.database.username; - phpWithPspell = pkgs.php.withExtensions (e: [ e.pspell ] ++ pkgs.php.enabledExtensions); + phpWithPspell = pkgs.php.withExtensions ({ enabled, all }: [ all.pspell ] ++ enabled); in { options.services.roundcube = { diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 5f6f2bc7a16..f826096bf60 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -11,8 +11,8 @@ let base = pkgs.php74; in base.buildEnv { - extensions = e: with e; - base.enabledExtensions ++ [ + extensions = { enabled, all }: with all; + enabled ++ [ apcu redis memcached imagick ]; extraConfig = phpOptionsStr; diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index c1a7cdd11c4..2313f9fbcc4 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -43,8 +43,16 @@ let phpWithExtensions = self.withExtensions defaultPhpExtensions; }); - mkBuildEnv = prevArgs: lib.makeOverridable ( - { extensions ? (_: []), extraConfig ? "", ... }@innerArgs: + # buildEnv wraps php to provide additional extensions and + # configuration. Its usage is documented in + # doc/languages-frameworks/php.section.md. + # + # Create a buildEnv with earlier overridden values and + # extensions functions in its closure. This is necessary for + # consecutive calls to buildEnv and overrides to work as + # expected. + mkBuildEnv = prevArgs: prevExtensionFunctions: lib.makeOverridable ( + { extensions ? ({...}: []), extraConfig ? "", ... }@innerArgs: let allArgs = args // prevArgs // innerArgs; filteredArgs = builtins.removeAttrs allArgs [ "extensions" "extraConfig" ]; @@ -54,8 +62,15 @@ let inherit php phpWithExtensions; }); + allExtensionFunctions = prevExtensionFunctions ++ [ extensions ]; + enabledExtensions = + builtins.foldl' + (state: f: + f { enabled = state; all = php-packages.extensions; }) + [] + allExtensionFunctions; + getExtName = ext: lib.removePrefix "php-" (builtins.parseDrvName ext.name).name; - enabledExtensions = extensions php-packages.extensions; # Generate extension load configuration snippets from the # extension parameter. This is an attrset suitable for use @@ -89,9 +104,8 @@ let inherit (php) version; nativeBuildInputs = [ makeWrapper ]; passthru = { - buildEnv = mkBuildEnv allArgs; - withExtensions = mkWithExtensions allArgs; - inherit enabledExtensions; + buildEnv = mkBuildEnv allArgs allExtensionFunctions; + withExtensions = mkWithExtensions allArgs allExtensionFunctions; inherit (php-packages) packages extensions; }; paths = [ php ]; @@ -108,8 +122,8 @@ let in phpWithExtensions); - mkWithExtensions = prevArgs: extensions: - mkBuildEnv prevArgs { inherit extensions; }; + mkWithExtensions = prevArgs: prevExtensionFunctions: extensions: + mkBuildEnv prevArgs prevExtensionFunctions { inherit extensions; }; pcre' = if (lib.versionAtLeast version "7.3") then pcre2 else pcre; in @@ -218,9 +232,8 @@ let outputs = [ "out" "dev" ]; passthru = { - enabledExtensions = []; - buildEnv = mkBuildEnv {}; - withExtensions = mkWithExtensions {}; + buildEnv = mkBuildEnv {} []; + withExtensions = mkWithExtensions {} []; inherit (php-packages) packages extensions; }; @@ -258,7 +271,7 @@ let inherit defaultPhpExtensions; }); - defaultPhpExtensions = extensions: with extensions; ([ + defaultPhpExtensions = { all, ... }: with all; ([ bcmath calendar curl ctype dom exif fileinfo filter ftp gd gettext gmp iconv intl json ldap mbstring mysqli mysqlnd opcache openssl pcntl pdo pdo_mysql pdo_odbc pdo_pgsql pdo_sqlite pgsql @@ -266,8 +279,8 @@ let tokenizer xmlreader xmlwriter zip zlib ] ++ lib.optionals (!stdenv.isDarwin) [ imap ]); - defaultPhpExtensionsWithHash = extensions: - (defaultPhpExtensions extensions) ++ [ extensions.hash ]; + defaultPhpExtensionsWithHash = { all, ... }: + (defaultPhpExtensions { inherit all; }) ++ [ all.hash ]; php74 = php74base.withExtensions defaultPhpExtensions; php73 = php73base.withExtensions defaultPhpExtensionsWithHash; -- cgit v1.2.3 From 72636bc2f6321e5e25414904685ba9fbabbbfb56 Mon Sep 17 00:00:00 2001 From: talyz Date: Fri, 24 Apr 2020 13:29:46 +0200 Subject: php: Get rid of all config.php parameters Since all options controlled by the config.php parameters can now be overridden directly, there's no reason to keep them around. --- nixos/doc/manual/release-notes/rl-2009.xml | 79 +++++++++++++-------------- pkgs/development/interpreters/php/default.nix | 29 +++++----- pkgs/servers/http/unit/default.nix | 12 ++-- pkgs/servers/uwsgi/default.nix | 4 +- pkgs/top-level/aliases.nix | 48 ++++++++-------- 5 files changed, 84 insertions(+), 88 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index e4e44c8405f..8231bf9842f 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -154,55 +154,50 @@ environment.systemPackages = [ ) ]; - The default php attribute hasn't lost any extensions - - the opcache extension was added there. + The default php attribute hasn't lost any + extensions. The opcache extension has been + added. All upstream PHP extensions are available under ]]>. - The updated php attribute is now easily customizable to your liking - by using extensions instead of writing config files or changing configure flags. - - Therefore we have removed the following configure flags: + All PHP config flags have been removed for + the following reasons: - PHP <literal>config</literal> flags that we don't read anymore: - config.php.argon2 - config.php.bcmath - config.php.bz2 - config.php.calendar - config.php.curl - config.php.exif - config.php.ftp - config.php.gd - config.php.gettext - config.php.gmp - config.php.imap - config.php.intl - config.php.ldap - config.php.libxml2 - config.php.libzip - config.php.mbstring - config.php.mysqli - config.php.mysqlnd - config.php.openssl - config.php.pcntl - config.php.pdo_mysql - config.php.pdo_odbc - config.php.pdo_pgsql - config.php.phpdbg - config.php.postgresql - config.php.readline - config.php.soap - config.php.sockets - config.php.sodium - config.php.sqlite - config.php.tidy - config.php.xmlrpc - config.php.xsl - config.php.zip - config.php.zlib + + + The updated php attribute is now easily + customizable to your liking by using + php.withExtensions or + php.buildEnv instead of writing config files + or changing configure flags. + + + + + The remaining configuration flags can now be set directly on + the php attribute. For example, instead of + + +php.override { + config.php.embed = true; + config.php.apxs2 = false; +} + + + you should now write + + +php.override { + embedSupport = true; + apxs2Support = false; +} + + + + diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 2313f9fbcc4..33071b06d95 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -17,23 +17,22 @@ let , defaultPhpExtensions # Sapi flags - , cgiSupport ? config.php.cgi or true - , cliSupport ? config.php.cli or true - , fpmSupport ? config.php.fpm or true - , pearSupport ? config.php.pear or true - , pharSupport ? config.php.phar or true - , phpdbgSupport ? config.php.phpdbg or true - + , cgiSupport ? true + , cliSupport ? true + , fpmSupport ? true + , pearSupport ? true + , pharSupport ? true + , phpdbgSupport ? true # Misc flags - , apxs2Support ? config.php.apxs2 or (!stdenv.isDarwin) - , argon2Support ? config.php.argon2 or true - , cgotoSupport ? config.php.cgoto or false - , embedSupport ? config.php.embed or false - , ipv6Support ? config.php.ipv6 or true - , systemdSupport ? config.php.systemd or stdenv.isLinux - , valgrindSupport ? config.php.valgrind or true - , ztsSupport ? (config.php.zts or false) || (apxs2Support) + , apxs2Support ? !stdenv.isDarwin + , argon2Support ? true + , cgotoSupport ? false + , embedSupport ? false + , ipv6Support ? true + , systemdSupport ? stdenv.isLinux + , valgrindSupport ? true + , ztsSupport ? apxs2Support }@args: let self = generic args; diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index 1e3ddb4ad8f..f8992bf166b 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -18,12 +18,12 @@ with stdenv.lib; let phpConfig = { - config.php.embed = true; - config.php.apxs2 = false; - config.php.systemd = false; - config.php.phpdbg = false; - config.php.cgi = false; - config.php.fpm = false; + embedSupport = true; + apxs2Support = false; + systemdSupport = false; + phpdbgSupport = false; + cgiSupport = false; + fpmSupport = false; }; php72-unit = php72base.override phpConfig; diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 29b807f1792..0f0d2c23e4c 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -8,8 +8,8 @@ }: let php-embed = php.override { - config.php.embed = true; - config.php.apxs2 = false; + embedSupport = true; + apxs2Support = false; }; pythonPlugin = pkg : lib.nameValuePair "python${if pkg.isPy2 then "2" else "3"}" { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9ad282149aa..678cb0d983a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -332,48 +332,50 @@ mapAliases ({ pg_tmp = ephemeralpg; # added 2018-01-16 php-embed = throw '' - php*-embed has been dropped, you can build the same package by using - something similar with this following snippet: - (php74.override { config.php.embed = true; config.php.apxs2 = false; }) + php*-embed has been dropped, you can build something similar + with the following snippet: + php74.override { embedSupport = true; apxs2Support = false; } ''; # added 2020-04-01 php72-embed = php-embed; # added 2020-04-01 php73-embed = php-embed; # added 2020-04-01 php74-embed = php-embed; # added 2020-04-01 phpPackages-embed = throw '' - php*Packages-embed has been dropped, you can build the same package by using - something similar with this following snippet: - (php74.override { config.php.embed = true; config.php.apxs2 = false; }).packages + php*Packages-embed has been dropped, you can build something + similar with the following snippet: + (php74.override { embedSupport = true; apxs2Support = false; }).packages ''; # added 2020-04-01 php74Packages-embed = phpPackages-embed; php73Packages-embed = phpPackages-embed; php72Packages-embed = phpPackages-embed; php-unit = throw '' - php*-unit has been dropped, you can build the same package by using - something similar with this following snippet: - (php74.override { - config.php.embed = true; - config.php.apxs2 = false; - config.php.systemd = false; - config.php.phpdbg = false; - config.php.cgi = false; - config.php.fpm = false; }) + php*-unit has been dropped, you can build something similar with + the following snippet: + php74.override { + embedSupport = true; + apxs2Support = false; + systemdSupport = false; + phpdbgSupport = false; + cgiSupport = false; + fpmSupport = false; + } ''; # added 2020-04-01 php72-unit = php-unit; # added 2020-04-01 php73-unit = php-unit; # added 2020-04-01 php74-unit = php-unit; # added 2020-04-01 phpPackages-unit = throw '' - php*Packages-unit has been dropped, you can build the same package by using - something similar with this following snippet: + php*Packages-unit has been dropped, you can build something + similar with this following snippet: (php74.override { - config.php.embed = true; - config.php.apxs2 = false; - config.php.systemd = false; - config.php.phpdbg = false; - config.php.cgi = false; - config.php.fpm = false; }).packages + embedSupport = true; + apxs2Support = false; + systemdSupport = false; + phpdbgSupport = false; + cgiSupport = false; + fpmSupport = false; + }).packages ''; # added 2020-04-01 php74Packages-unit = phpPackages-unit; php73Packages-unit = phpPackages-unit; -- cgit v1.2.3 From d61040716e4e7266f36e523f8ba5fa11f387548e Mon Sep 17 00:00:00 2001 From: talyz Date: Fri, 24 Apr 2020 18:11:40 +0200 Subject: php.buildEnv: Automatically include extension dependencies Some extensions depend on other extensions. Previously, these had to be added manually to the list of included extensions, or we got a cryptic error message pointing to strings-with-deps.nix, which wasn't very helpful. This makes sure all required extensions are included in the set from which textClosureList chooses its snippets. --- pkgs/development/interpreters/php/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 33071b06d95..2eda206ef2e 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -71,6 +71,19 @@ let getExtName = ext: lib.removePrefix "php-" (builtins.parseDrvName ext.name).name; + # Recursively get a list of all internal dependencies + # for a list of extensions. + getDepsRecursively = extensions: + let + deps = lib.concatMap + (ext: ext.internalDeps or []) + extensions; + in + if ! (deps == []) then + deps ++ (getDepsRecursively deps) + else + deps; + # Generate extension load configuration snippets from the # extension parameter. This is an attrset suitable for use # with textClosureList, which is used to put the strings in @@ -89,7 +102,7 @@ let deps = lib.optionals (ext ? internalDeps) (map getExtName ext.internalDeps); }) - enabledExtensions); + (enabledExtensions ++ (getDepsRecursively enabledExtensions))); extNames = map getExtName enabledExtensions; extraInit = writeText "custom-php.ini" '' -- cgit v1.2.3 From 6617a79ba320b6e47abfd05416a237ec557ae15c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 26 Apr 2020 12:21:32 -0400 Subject: linux: 4.14.176 -> 4.14.177 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 5d7337c27f6..6c5d86a0e69 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.176"; + version = "4.14.177"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "18jwxhf29ax54xnylmz9zfkslnxw7y3h215dbfmmvddfp9b0kbmw"; + sha256 = "04hq0i06mg2yc09jj2xk0vhf5q9yigzjzm55a5bvfy2a6j43r9rk"; }; } // (args.argsOverride or {})) -- cgit v1.2.3 From 6efb2ba2bf6ad5b80e934934bec53ad37fa0f06c Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 26 Apr 2020 12:22:05 -0400 Subject: linux: 4.4.219 -> 4.4.220 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index e99375ed62c..d846a015477 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.219"; + version = "4.4.220"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1mpxqb2m24ay4n9px4n2cyklxy4lhnv9q6wlvilx13rs5qfbb62f"; + sha256 = "1knj3qsl7x3fysdz1h0s980ddbafs3658z2y67w6sn79wp7d8blg"; }; } // (args.argsOverride or {})) -- cgit v1.2.3 From 4883dde6b7d6660ad83e9ef7e1fdee073023b43e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 26 Apr 2020 12:22:41 -0400 Subject: linux: 4.9.219 -> 4.9.220 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 78c76d12ddc..b05a3685c27 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.219"; + version = "4.9.220"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0i5wlyp11ss9p035bhq73xjx8iyk5dk4ynvd7msw5qfkrs6265vb"; + sha256 = "0bhbkybzbdsbmrjmb5m7hxxl8b3v6n79zhh86cbr95kzg1hcgnfs"; }; } // (args.argsOverride or {})) -- cgit v1.2.3 From be48bf2ba8fb92cdb02d2d453470f7bf36b46e3b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 26 Apr 2020 12:23:01 -0400 Subject: linux/hardened-patches/4.14: 4.14.176.a -> 4.14.177.a --- pkgs/os-specific/linux/kernel/hardened-patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened-patches.json b/pkgs/os-specific/linux/kernel/hardened-patches.json index eecb27cdb66..e365199a4bb 100644 --- a/pkgs/os-specific/linux/kernel/hardened-patches.json +++ b/pkgs/os-specific/linux/kernel/hardened-patches.json @@ -1,8 +1,8 @@ { "4.14": { - "name": "linux-hardened-4.14.176.a.patch", - "sha256": "0pr3m2j63mc746fcbzg1hlwv85im9f87qkl6r4033gwnpa9brcgk", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.176.a/linux-hardened-4.14.176.a.patch" + "name": "linux-hardened-4.14.177.a.patch", + "sha256": "0wiapq4nj16m5ywnz0k7k0fr5hpw2gjy68mjlk6x866rf8vhndrq", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.177.a/linux-hardened-4.14.177.a.patch" }, "4.19": { "name": "linux-hardened-4.19.117.a.patch", -- cgit v1.2.3 From 334627d92fda18682a870cdb152f8185a9fd673d Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 26 Apr 2020 12:23:03 -0400 Subject: linux/hardened-patches/5.6: 5.6.6.a -> 5.6.7.a --- pkgs/os-specific/linux/kernel/hardened-patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened-patches.json b/pkgs/os-specific/linux/kernel/hardened-patches.json index e365199a4bb..0f29e9b25d3 100644 --- a/pkgs/os-specific/linux/kernel/hardened-patches.json +++ b/pkgs/os-specific/linux/kernel/hardened-patches.json @@ -20,8 +20,8 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.5.19.a/linux-hardened-5.5.19.a.patch" }, "5.6": { - "name": "linux-hardened-5.6.6.a.patch", - "sha256": "0jiqh0frxirjbccgfdk007fca6r6n36n0pkqq4jszkckn59ayl7r", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.6.a/linux-hardened-5.6.6.a.patch" + "name": "linux-hardened-5.6.7.a.patch", + "sha256": "1dnk9df4v2iw05vpn0s8q6b0ci2rzl2wiq77vhr40mpbg6p18fap", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.7.a/linux-hardened-5.6.7.a.patch" } } -- cgit v1.2.3 From 4af476e2b3e75dbef3abc85291a2ebbb30f42dba Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 26 Apr 2020 12:23:05 -0400 Subject: linux/hardened-patches/5.4: 5.4.34.a -> 5.4.35.a --- pkgs/os-specific/linux/kernel/hardened-patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened-patches.json b/pkgs/os-specific/linux/kernel/hardened-patches.json index 0f29e9b25d3..f072543cac6 100644 --- a/pkgs/os-specific/linux/kernel/hardened-patches.json +++ b/pkgs/os-specific/linux/kernel/hardened-patches.json @@ -10,9 +10,9 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.117.a/linux-hardened-4.19.117.a.patch" }, "5.4": { - "name": "linux-hardened-5.4.34.a.patch", - "sha256": "1xwpqr9nzpjg837b3wnzb8fmrl2g9rz8gz5yb55vnnllbzbz36v6", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.34.a/linux-hardened-5.4.34.a.patch" + "name": "linux-hardened-5.4.35.a.patch", + "sha256": "0vcqgrzns4d3z93mn8mv0sxkmj7ylbr8prff72c4ssvb0kd7agy9", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.35.a/linux-hardened-5.4.35.a.patch" }, "5.5": { "name": "linux-hardened-5.5.19.a.patch", -- cgit v1.2.3 From a9fa6028adaa37f92efb33c827b27f40617e4cd9 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 26 Apr 2020 12:23:07 -0400 Subject: linux/hardened-patches/4.19: 4.19.117.a -> 4.19.118.a --- pkgs/os-specific/linux/kernel/hardened-patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened-patches.json b/pkgs/os-specific/linux/kernel/hardened-patches.json index f072543cac6..a87628dd769 100644 --- a/pkgs/os-specific/linux/kernel/hardened-patches.json +++ b/pkgs/os-specific/linux/kernel/hardened-patches.json @@ -5,9 +5,9 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.177.a/linux-hardened-4.14.177.a.patch" }, "4.19": { - "name": "linux-hardened-4.19.117.a.patch", - "sha256": "0c8dvh49nzypxwvsls10i896smvpdrk40x8ybljb3qk3r8j7niaw", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.117.a/linux-hardened-4.19.117.a.patch" + "name": "linux-hardened-4.19.118.a.patch", + "sha256": "120lnn9j9zsx1kcq4frcjmj2vj39x0g1yxrrx9nax2yjrzp4wfdw", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.118.a/linux-hardened-4.19.118.a.patch" }, "5.4": { "name": "linux-hardened-5.4.35.a.patch", -- cgit v1.2.3 From 25e4c9db6798252c7989775f51a0eaab760af833 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Fri, 24 Apr 2020 13:10:42 +0200 Subject: cypress: 4.3.0 -> 4.4.1 --- pkgs/development/web/cypress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index b70fa053a1d..3cb5b96d588 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec{ pname = "cypress"; - version = "4.3.0"; + version = "4.4.1"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "0lrjha3zrsclpk8bhmv14vy1y5liahjkvcd87zm6cik1rnscaspw"; + sha256 = "0da1y90a6i3fjhyrzwwn3pavzbqin9v5v7hx8halz6i7cf1halfi"; }; # don't remove runtime deps -- cgit v1.2.3 From 6c1201aa8ca994c1d385985fac5653df7d59a4a7 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sun, 19 Apr 2020 12:12:50 +0200 Subject: ledger-autosync: 1.0.1 -> 1.0.2 --- pkgs/applications/office/ledger-autosync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/ledger-autosync/default.nix b/pkgs/applications/office/ledger-autosync/default.nix index 00c40255861..3a0f362dcf7 100644 --- a/pkgs/applications/office/ledger-autosync/default.nix +++ b/pkgs/applications/office/ledger-autosync/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "ledger-autosync"; - version = "1.0.1"; + version = "1.0.2"; # no tests included in PyPI tarball src = fetchFromGitHub { owner = "egh"; repo = "ledger-autosync"; rev = "v${version}"; - sha256 = "1h5mjngdd3rmzwmy026xmas0491kxxi1vxkd5m1xii7y6j50z14q"; + sha256 = "0sh32jcf8iznnbg1kqlrswbzfmn4h3gkw32q20xwxzz4935pz1qk"; }; propagatedBuildInputs = with python3Packages; [ -- cgit v1.2.3 From 0f20af8bd36abb26b79a44bf9ee87692b3ba7397 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20St=C3=BChrk?= Date: Fri, 24 Apr 2020 20:57:58 +0200 Subject: skaffold: 1.6.0 -> 1.8.0 --- pkgs/development/tools/skaffold/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index d1d1200344f..5534492cf37 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,9 +2,9 @@ buildGoPackage rec { pname = "skaffold"; - version = "1.6.0"; + version = "1.8.0"; # rev is the ${version} commit, mainly for skaffold version command output - rev = "4cc0be23e41e37d8b1bca1464516538b2cc1bba0"; + rev = "bd280192092e28067f0f52584c8bcb4f4dc480e4"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; @@ -20,7 +20,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "0wz9x3p0hfajrkm1qrhl4kw7l7r3n6xv16chl4dxigaix8ga068h"; + sha256 = "0s1j1lij56idl981nq7dnvkil1ki283nfhcfqyl5g00payihlm73"; }; nativeBuildInputs = [ installShellFiles ]; -- cgit v1.2.3 From 9c32e5c495b76f9dee4ce2d5752bd65c9fad9835 Mon Sep 17 00:00:00 2001 From: davidak Date: Wed, 22 Apr 2020 00:50:51 +0200 Subject: CONTRIBUTING.md: Improve backport instructions --- .github/CONTRIBUTING.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index ae4f68dddc1..cb0264b0167 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -50,12 +50,13 @@ For package version upgrades and such a one-line commit message is usually suffi ## Backporting changes -To [backport a change into a release branch](https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches): +Follow these steps to backport a change into a release branch in compliance with the [commit policy](https://nixos.org/nixpkgs/manual/#submitting-changes-stable-release-branches). -1. Take note of the commit in which the change was introduced into `master`. +1. Take note of the commits in which the change was introduced into `master` branch. 2. Check out the target _release branch_, e.g. `release-20.03`. Do not use a _channel branch_ like `nixos-20.03` or `nixpkgs-20.03`. -3. Use `git cherry-pick -x `. -4. Open your backport PR. Make sure to select the release branch (e.g. `release-20.03`) as the target branch of the PR, and link to the PR in which the original change was made to `master`. +3. Create a branch for your change, e.g. `git checkout -b backport`. +4. When the reason to backport is not obvious from the original commit message, use `git cherry-pick -xe ` and add a reason. Otherwise use `git cherry-pick -x `. That's fine for minor version updates that only include security and bug fixes, commits that fixes an otherwise broken package or similar. +5. Push to GitHub and open a backport pull request. Make sure to select the release branch (e.g. `release-20.03`) as the target branch of the pull request, and link to the pull request in which the original change was comitted to `master`. The pull request title should be the commit title with the release version as prefix, e.g. `[20.03]`. ## Reviewing contributions -- cgit v1.2.3 From 75963b916077eb27cee7bc71133baedcfbfbfccd Mon Sep 17 00:00:00 2001 From: Evils Date: Tue, 17 Mar 2020 08:45:20 +0100 Subject: kicad: update.sh: set -e and some more suggestions from veprbl warn if an empty item gets through anyway and use UTC time cc #82634 --- .../science/electronics/kicad/update.sh | 30 +++++++++++++--------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/update.sh b/pkgs/applications/science/electronics/kicad/update.sh index 7dc0b008b6c..f048ccde4ec 100755 --- a/pkgs/applications/science/electronics/kicad/update.sh +++ b/pkgs/applications/science/electronics/kicad/update.sh @@ -1,6 +1,8 @@ #!/usr/bin/env nix-shell #!nix-shell -i bash -p coreutils git nix curl +set -e + # this script will generate versions.nix in the right location # this should contain the versions' revs and hashes # the stable revs are stored only for ease of skipping @@ -50,12 +52,11 @@ for arg in "$@"; do done here="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -now=$(date --iso-8601) +now=$(date --iso-8601 --utc) file="${here}/versions.nix" # just in case this runs in parallel -rand="$(head -c 3 /dev/urandom | base64)" -tmp="${here}/,versions.nix.${rand}" +tmp="${here}/,versions.nix.${RANDOM}" # libraries currently on github, move to $gitlab/libraries planned libs=( symbols templates footprints packages3d ) @@ -112,16 +113,16 @@ for version in "${all_versions[@]}"; do echo "Checking src" >&2 src_rev="$(${get_rev} "${gitlab}"/code/kicad.git "${version}" | cut -f1)" - ret="$(grep -sm 1 "\"${pname}\"" -A 4 "${file}" | grep -sm 1 "${src_rev}")" + has_rev="$(grep -sm 1 "\"${pname}\"" -A 4 "${file}" | grep -sm 1 "${src_rev}" || true)" has_hash="$(grep -sm 1 "\"${pname}\"" -A 5 "${file}" | grep -sm 1 "sha256")" - if [[ -n ${ret} && -n ${has_hash} && -z ${clean} ]]; then + if [[ -n ${has_rev} && -n ${has_hash} && -z ${clean} ]]; then echo "Reusing old ${pname}.src.sha256, already latest .rev" >&2 grep -sm 1 "\"${pname}\"" -A 5 "${file}" | grep -sm 1 "rev" -A 1 else printf "%8srev =\t\t\t\"%s\";\n" "" "${src_rev}" printf "%8ssha256 =\t\t\"%s\";\n" \ "" "$(${prefetch} "${gitlab_pre}${src_rev}")" - (( count++ )) + count=$((count+1)) fi printf "%6s};\n" "" printf "%4s};\n" "" @@ -132,25 +133,25 @@ for version in "${all_versions[@]}"; do echo "Checking i18n" >&2 i18n_rev="$(${get_rev} "${i18n}" "${version}" | cut -f1)" - ret="$(grep -sm 1 "\"${pname}\"" -A 11 "${file}" | grep -sm 1 "${i18n_rev}")" + has_rev="$(grep -sm 1 "\"${pname}\"" -A 11 "${file}" | grep -sm 1 "${i18n_rev}" || true)" has_hash="$(grep -sm 1 "\"${pname}\"" -A 12 "${file}" | grep -sm 1 "i18n.sha256")" - if [[ -n ${ret} && -n ${has_hash} && -z ${clean} ]]; then + if [[ -n ${has_rev} && -n ${has_hash} && -z ${clean} ]]; then echo "Reusing old kicad-i18n-${today}.src.sha256, already latest .rev" >&2 grep -sm 1 "\"${pname}\"" -A 12 "${file}" | grep -sm 1 "i18n" -A 1 else printf "%8si18n.rev =\t\t\"%s\";\n" "" "${i18n_rev}" printf "%8si18n.sha256 =\t\t\"%s\";\n" "" \ "$(${prefetch} "${i18n_pre}${i18n_rev}")" - (( count++ )) + count=$((count+1)) fi for lib in "${libs[@]}"; do echo "Checking ${lib}" >&2 url="${github}-${lib}.git" lib_rev="$(${get_rev} "${url}" "${version}" | cut -f1)" - ret="$(grep -sm 1 "\"${pname}\"" -A 19 "${file}" | grep -sm 1 "${lib_rev}" -A 1)" + has_rev="$(grep -sm 1 "\"${pname}\"" -A 19 "${file}" | grep -sm 1 "${lib_rev}" || true)" has_hash="$(grep -sm 1 "\"${pname}\"" -A 20 "${file}" | grep -sm 1 "${lib}.sha256")" - if [[ -n ${ret} && -n ${has_hash} && -z ${clean} ]]; then + if [[ -n ${has_rev} && -n ${has_hash} && -z ${clean} ]]; then echo "Reusing old kicad-${lib}-${today}.src.sha256, already latest .rev" >&2 grep -sm 1 "\"${pname}\"" -A 20 "${file}" | grep -sm 1 "${lib}" -A 1 else @@ -161,7 +162,7 @@ for version in "${all_versions[@]}"; do printf "\"%s\";\n" "${lib_rev}" printf "%8s%s.sha256 =\t\"%s\";\n" "" \ "${lib}" "$(${prefetch} "${github}-${lib}/archive/${lib_rev}.tar.gz")" - (( count++ )) + count=$((count+1)) fi done printf "%6s};\n" "" @@ -175,6 +176,11 @@ done printf "}\n" } > "${tmp}" +if grep '""' "${tmp}"; then + echo "empty value detected, out of space?" >&2 + exit "1" +fi + mv "${tmp}" "${file}" printf "\nFinished\nMoved output to %s\n\n" "${file}" >&2 -- cgit v1.2.3 From b80bd001e2abceac052c3a1fb68551021388383a Mon Sep 17 00:00:00 2001 From: Evils Date: Mon, 30 Mar 2020 04:09:25 +0200 Subject: kicad-unstable: 2020-02-10 -> 2020-04-25 cc #82634 --- .../science/electronics/kicad/versions.nix | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 6b9a981a87c..174532d6962 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -27,25 +27,25 @@ }; "kicad-unstable" = { kicadVersion = { - version = "2020-02-10"; + version = "2020-04-25"; src = { - rev = "1190e60dd426d246661e478db3287f266ec6cda2"; - sha256 = "0cgfad07j69cks97llj4hf3kga0d5qf728s89xwxrzcwm06k62bi"; + rev = "3759799d1e03b2da6a0dcd72273e4978880fc8f1"; + sha256 = "0ba14fla8m5zli68wfjkfc4ymvj4j8z92y3jigxs8hys0450bybi"; }; }; libVersion = { - version = "2020-02-10"; + version = "2020-04-25"; libSources = { - i18n.rev = "26786c4ca804bad7eb072f1ef381f00b5a2ff3ee"; - i18n.sha256 = "0iqr1xfw4s677afjy9bn5y41z4isp327f9y90wypkxiwwq3dfkfl"; - symbols.rev = "35b7da2d211d7cc036b37ad7f5e40ef03faa1bc7"; - symbols.sha256 = "0wbfw1swbfvfp47cn48pxpqlygjs3xh568ydrrs51v3w102x8y64"; - templates.rev = "0c0490897f803ab8b7c3dad438b7eb1f80e0417c"; - templates.sha256 = "0cs3bm3zb5ngw5ldn0lzw5bvqm4kvcidyrn76438alffwiz2b15g"; - footprints.rev = "9357b6f09312966c57fec9f66a516941d79c3038"; - footprints.sha256 = "0cgah1q0h012ffwfl220k7qb6hgbs0i91spq2j4v3lgpfr4g638d"; - packages3d.rev = "de368eb739abe41dfc3163e0e370477e857f9cc1"; - packages3d.sha256 = "0b3p5v8g24h6l7q3sbqz7ns0gnrf9l89glj86m5ybhizvls9vrrs"; + i18n.rev = "fc14baa52ca56a58b0048ab860bf31887d3cf8eb"; + i18n.sha256 = "05nayab7dkjyq7g3i9q7k55hcckpc0cmq4bbklmxx16rx4rbhzc6"; + symbols.rev = "0f9ff2d17237f90bb649bf0a52b6d454f68197e8"; + symbols.sha256 = "1a54428syn2xksc00n2bvh1alrx2vrqmp7cg7d2rn8nlq8yk4qd5"; + templates.rev = "7db8d4d0ea0711f1961d117853547fb3edbc3857"; + templates.sha256 = "1hppcsrkn4dk6ggby6ckh0q65qxkywrbyxa4lwpaf7pxjyv498xg"; + footprints.rev = "61df6d8853b4c68cca0ac87784c0a33cff9394d3"; + footprints.sha256 = "0blmhk8pwd4mi6rlsr4lf4lq7j01h6xbpbvr3pm8pmw8zylhi54v"; + packages3d.rev = "88bcf2e817fe000bb2c05e14489afc3b1a4e10ed"; + packages3d.sha256 = "0z9p1fn5xbz940kr5jz2ibzf09hpdi1c9izmabkffvrnfy6408x6"; }; }; }; -- cgit v1.2.3 From 2901db8e35ec70d768b94c11403d3323e23eff75 Mon Sep 17 00:00:00 2001 From: Sam Hug Date: Fri, 24 Apr 2020 10:53:44 -0700 Subject: vimPlugins: update --- pkgs/misc/vim-plugins/generated.nix | 150 ++++++++++++++++++------------------ 1 file changed, 75 insertions(+), 75 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 1099ca84af5..3248d568883 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -473,12 +473,12 @@ let coc-java = buildVimPluginFrom2Nix { pname = "coc-java"; - version = "2020-04-10"; + version = "2020-04-23"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-java"; - rev = "e4dd6b744f7eb356afa8db7b958bdf5910b5ec6f"; - sha256 = "0fndkbmi84qgqfj6ny04wm05mnrvrg36bb04vk7zj90k8a51xrrr"; + rev = "3c914c2b9e154889361d2631cd2188cf7e5fa020"; + sha256 = "0q7q2z7k2sxqgi6nyj669iq2p4h3962i8hv3gzg2mpi0p73xs98k"; }; meta.homepage = "https://github.com/neoclide/coc-java/"; }; @@ -521,12 +521,12 @@ let coc-metals = buildVimPluginFrom2Nix { pname = "coc-metals"; - version = "2020-04-21"; + version = "2020-04-22"; src = fetchFromGitHub { owner = "ckipp01"; repo = "coc-metals"; - rev = "fdddbbdbe04cdb077b7a2006c295d7a95343c4bb"; - sha256 = "0g0zqxmakwmjr9ii0v5rxiyvv3k909lzvkxkw0hyhpdkbpmzjkxl"; + rev = "b35bb16122d8771c9936f1203d0c712d45017f13"; + sha256 = "1w9vgxai421j3qbzbm42hq3fyzwf2a9n89y10vj9vhir0q0j8az0"; }; meta.homepage = "https://github.com/ckipp01/coc-metals/"; }; @@ -569,12 +569,12 @@ let coc-python = buildVimPluginFrom2Nix { pname = "coc-python"; - version = "2020-02-21"; + version = "2020-04-24"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-python"; - rev = "6a5104d18ae5ebf7d9b84af7c4a34c6ced62aee8"; - sha256 = "0l8zrb2bhv1apx2vp8gswqh7v64dxfd8124cggxfkkzdqyxr10w0"; + rev = "968aec39f74c6f80e6c9c3c0fed51b6113a1a35a"; + sha256 = "135z48idr8r7604ymiqdsml9z6d3swaja89697znszigpy05nz11"; }; meta.homepage = "https://github.com/neoclide/coc-python/"; }; @@ -593,12 +593,12 @@ let coc-rls = buildVimPluginFrom2Nix { pname = "coc-rls"; - version = "2019-12-07"; + version = "2020-04-23"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-rls"; - rev = "c899418e8fae4a8c3eb15fee48513ae050b11d60"; - sha256 = "0sipvs8r8i239l2334k4qnhwpaijwd524q598rp4ma34ry42c2xl"; + rev = "142353e2f71cb6c1b235db0cf430ca53e211613b"; + sha256 = "07gkspvh5l25vyny5waiw0y3fm5a8qbrml13r7llgp4lqzzh96bd"; }; meta.homepage = "https://github.com/neoclide/coc-rls/"; }; @@ -617,12 +617,12 @@ let coc-snippets = buildVimPluginFrom2Nix { pname = "coc-snippets"; - version = "2020-04-16"; + version = "2020-04-23"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-snippets"; - rev = "21f65e0de83936f8db27ce1bc4a93251adfeef5a"; - sha256 = "1ahh143yq6hb8f3xv5kvj3dy2017yzl9vn31gfabswvdmdjm37in"; + rev = "cad80795d4abcbbd2aa6da462af1087e9134b4eb"; + sha256 = "04wk7x148dcw3rx4fh3c7c80qillq0bf9vfdkc9l8xaglk0xh73h"; }; meta.homepage = "https://github.com/neoclide/coc-snippets/"; }; @@ -773,12 +773,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2020-04-21"; + version = "2020-04-23"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "1cedc9a852cc7e246665ca1d662bd8978ac5405c"; - sha256 = "1vqm9s68148715gb5x5xrhl5ajwi881d86hq7906lp7b8gk5d6is"; + rev = "0d4f02555e5aaecbd8efef47a70ba2f2c6412d1f"; + sha256 = "0129gr3hsagr1lzngvbgs4bnvj92izxavval0zyxgh68w3vlak42"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1038,12 +1038,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2020-04-20"; + version = "2020-04-21"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "6d2174645f3a7ab790546940b02024d72296e4c1"; - sha256 = "0dnnnwr01c4jgjyjnk4hivj4hiyar4j60fy2jc3l91aqd4m845vl"; + rev = "609c85797a5f6acc2e2357cf56e7f6c78c561145"; + sha256 = "0rx0nvsyzj1wl7p30g769cidspkq3xpvzpdhz94qfsczdm68yhi0"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; @@ -1692,12 +1692,12 @@ let iceberg-vim = buildVimPluginFrom2Nix { pname = "iceberg-vim"; - version = "2020-03-06"; + version = "2020-04-23"; src = fetchFromGitHub { owner = "cocopon"; repo = "iceberg.vim"; - rev = "1740235846c92666fe521e550a27fa47ebe5f5a3"; - sha256 = "13zf899kgwjhrksznz2212ywml7nnqwq2dyam39nzywf8msg8va6"; + rev = "acf6696e14fd8cfa2ed338076a7c3a68fad42486"; + sha256 = "1hy9n37nkkax6qdcg23a522bz26r8b23w9kj570qml9v3ck4ihqm"; }; meta.homepage = "https://github.com/cocopon/iceberg.vim/"; }; @@ -1873,12 +1873,12 @@ let julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2020-04-17"; + version = "2020-04-24"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "34c24ee0f8476dfc573e22f9f6a6fe4eec466225"; - sha256 = "0yy50yb28md5z2yzcaq45cchd8c44q12xvwcb2yh3r9nhgqhll2h"; + rev = "c97e5cfb6ef20b725f859af694bec9c6a3a44145"; + sha256 = "1349v5lhc4dg7ir42jj157jyf29bm7pj73h64n2501ddqdkb1zqd"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; @@ -2269,12 +2269,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2020-03-20"; + version = "2020-04-24"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "d02b169e70bd6d2b2365bf6cda721967616a30bf"; - sha256 = "1cya26wfqc7l7dqy854m4kwrq3w66knmn2cgviqh9cnsjzhwxs0d"; + rev = "7af08e5a80c095a836d3f6762b991c6f9c4f2f2f"; + sha256 = "17llh2jh2igkbjmnbii54g4x9g57y6xflh8d40wim980pb3jr57s"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -2353,12 +2353,12 @@ let neoterm = buildVimPluginFrom2Nix { pname = "neoterm"; - version = "2020-04-20"; + version = "2020-04-23"; src = fetchFromGitHub { owner = "kassio"; repo = "neoterm"; - rev = "e3ece229fc0f26cb114f629faa2dc979e16e8e8a"; - sha256 = "1g823p6qvxvxv5l9f3lb0dyf9pzrr7i3qw8n1rqfs2w0xipj6arl"; + rev = "48900bd6a008120aeb33e3807f1d2c18985ad210"; + sha256 = "1x788nrrxaa12cqsdi2gdx2haxji3v4rahpxjq309kd5s40m9z2j"; }; meta.homepage = "https://github.com/kassio/neoterm/"; }; @@ -2521,12 +2521,12 @@ let nvim-lsp = buildVimPluginFrom2Nix { pname = "nvim-lsp"; - version = "2020-04-21"; + version = "2020-04-24"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lsp"; - rev = "39b743b9b36be26a5e58278d7608fe456a0ad3f8"; - sha256 = "15q7d0qxdvvn79rwy87aiynilxn8vcnym2w252x1p3s4wqsx1psi"; + rev = "d1507239df1d9f2758f1ad75634046c4d024cfd8"; + sha256 = "00smhjk73xwzmxqjwqi1srmfbirl065gii65gj1lhfi6vha7h9k1"; }; meta.homepage = "https://github.com/neovim/nvim-lsp/"; }; @@ -3229,12 +3229,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2020-01-23"; + version = "2020-04-24"; src = fetchFromGitHub { owner = "majutsushi"; repo = "tagbar"; - rev = "679a9d9ac9579bd18225409d85ed4870fb6c9c62"; - sha256 = "1s4736104vfaj7rfcdzcnmgbnxxi0ngs07km0p2fi1m2zc68602l"; + rev = "1e50ea85361b7144acad459eb091973089b780f6"; + sha256 = "09w7vwzacny6kbf9s2ihan8k682qljp8zad1dh5ds0738a3nwxpl"; }; meta.homepage = "https://github.com/majutsushi/tagbar/"; }; @@ -3277,12 +3277,12 @@ let tender-vim = buildVimPluginFrom2Nix { pname = "tender-vim"; - version = "2020-02-18"; + version = "2020-04-24"; src = fetchFromGitHub { owner = "jacoborus"; repo = "tender.vim"; - rev = "f93b2f373cc21826524c94fbd1f3b3a4c55173d2"; - sha256 = "0bfns5vsbyh1s01s295hbf8h04n21cfkfp8b2r3cfr8mcvazpmpq"; + rev = "44d04bc9ecb0188e7b1a3e6b6715b9a63dc8f3e1"; + sha256 = "059my5q6gqjdkaf7qn842h92c6y7lp5z8wpwsi2ww6anzy85506z"; }; meta.homepage = "https://github.com/jacoborus/tender.vim/"; }; @@ -3506,12 +3506,12 @@ let vim = buildVimPluginFrom2Nix { pname = "vim"; - version = "2020-04-18"; + version = "2020-04-22"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "6a8cd0f825c3d7b071ebd0dce81a7707ec0be652"; - sha256 = "1qyqc7j8sdq3xnp871hgxdgxypkm8v5mfri2r89b0ydchrd15b2l"; + rev = "043518d3a9c48049bc0ae0af72dcbb239bf1d36d"; + sha256 = "0v25yk0d4488yn1yvzkpcqh8ldx51q4hbfn678vkr9ga5i0nkkwp"; }; meta.homepage = "https://github.com/dracula/vim/"; }; @@ -3758,12 +3758,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-04-20"; + version = "2020-04-24"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "eff4828b37d7f631aaec0465a315d627651b9037"; - sha256 = "1rm8kd90sf00sdgr8pqcansyrmrwsqd4v1fkyy7zl9x2jgrxkbrh"; + rev = "ff3f66ed30fbab70af1f37c8532327bd9617f7c7"; + sha256 = "1gppy9lk9vyxrqyb9lxvvl8nl31ha5mjwvhlang8g69j2vqpxikr"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -4502,12 +4502,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2020-04-12"; + version = "2020-04-21"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "85e2c73830b6bb01ce7fc3a926d2b25836a253eb"; - sha256 = "1zbw8cnjl9m59grr65kfkgi8p4850rjp24f1plp4jhidjmsfhv7x"; + rev = "05bbfcd0dc24088f302e7221c7ec000d0ee62982"; + sha256 = "1yrfci26yr02s2728jlk4bd29g1abh8dwps8q9l1pk93rzlchisc"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -4562,12 +4562,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2020-04-18"; + version = "2020-04-24"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "2b62481d388c5e0e1dd11e74377523fdb98b6ac4"; - sha256 = "1x6x6wp1ggn2whrm5mi7wyz5b88syc4yvncgs8bjhbrc636psqhq"; + rev = "6b46098b2a83becda06586d7c430ffdc4a27db88"; + sha256 = "0q8yvjgxvfjd40f3pspv2kzdcz45q242jfpl948mw74arl0121g8"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -4598,12 +4598,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-04-19"; + version = "2020-04-24"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "07869cdfb066dcb287673eee3effb30021a970b8"; - sha256 = "1gmfvlysy7s0rh3lwpq9fym59nfwm64grcfrrhf2d9gzvwip9326"; + rev = "b7edb21cc518a5404b16997df056d560b6ae067f"; + sha256 = "1acwh0kqk7vy0p5vinmm42c4map4qara0590yd6mzc3ym0zyjvi0"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -4898,12 +4898,12 @@ let vim-javacomplete2 = buildVimPluginFrom2Nix { pname = "vim-javacomplete2"; - version = "2019-12-17"; + version = "2020-04-23"; src = fetchFromGitHub { owner = "artur-shaik"; repo = "vim-javacomplete2"; - rev = "dc7951895a98c49c39622f65cdd7b39374c348bc"; - sha256 = "1d8xiiwfg5wz57jyy7ahbi2bl5sjkhkpkqm2qbhsn7cd9vk36sxy"; + rev = "3ebc63c4b79eec08eb81bdddc8f4c7cfe9cb702f"; + sha256 = "0dwgqnjcnnyvmrplbxkzmfyrm0rgd4z5kgx5989c528gp0dwhaja"; }; meta.homepage = "https://github.com/artur-shaik/vim-javacomplete2/"; }; @@ -5979,12 +5979,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2020-04-20"; + version = "2020-04-21"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "dbfffb971b46bfb9bc90763d4ccad97e3277cd7b"; - sha256 = "0rmpf1lrrq57pai2vn0q9qig73kdq7l54iar1qk46f7wxy3wi1dw"; + rev = "ad4407f31bf170b0813fb9b03f851cf79b5f65ca"; + sha256 = "0nr7xq5kz94fm578ds84pd3ydbhfbxs6r4fc5250anmazip2h2cw"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -6075,12 +6075,12 @@ let vim-subversive = buildVimPluginFrom2Nix { pname = "vim-subversive"; - version = "2020-04-10"; + version = "2020-04-22"; src = fetchFromGitHub { owner = "svermeulen"; repo = "vim-subversive"; - rev = "4a2020248c8a09950b7e1a2cd864ffb88826572c"; - sha256 = "0pqrb3hz1hjl42khn4691s3ajlswk6nms43hdbglj679y28bkzfi"; + rev = "9db5f782be230368a3a81a21d3eb93678f7523ae"; + sha256 = "0igv2yf1h1ajnv9c0z02pvgqciighwc1y53c9ahfqwxd58kpi5fj"; }; meta.homepage = "https://github.com/svermeulen/vim-subversive/"; }; @@ -6291,12 +6291,12 @@ let vim-tmux-navigator = buildVimPluginFrom2Nix { pname = "vim-tmux-navigator"; - version = "2019-12-10"; + version = "2020-04-23"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "8fdf78292bb3aed1c9de880be7e03efdbf23d306"; - sha256 = "0y92na4dcfcsj5zbs3m7y6csl3sd46a9968id78cdn9cgg8iwzac"; + rev = "44ba6fbe45895cd541ebfc87606add5c76e3829b"; + sha256 = "075cncr53w9xc1kqm50zl8yl18aspn3zdr6qjqyslf7gkw8yk38d"; }; meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/"; }; @@ -6651,12 +6651,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-04-20"; + version = "2020-04-23"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "f029f673b259206bb04ca71b97e68d9635b1c4ee"; - sha256 = "16m7ab5sy0gb900bf6ydynm1bhi11w60qmscqc66cmmb2hjz0iq2"; + rev = "3e2bf3f27ad7253767eefe0b4c4e551c602d5d77"; + sha256 = "1pxkim0mh691lb8clv1828nhs4cqzf8s3vkmynq7164mzvrf77sh"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -6699,12 +6699,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2020-04-19"; + version = "2020-04-24"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "02b128dd37a63f82732c3a0a9db9b24430ad56af"; - sha256 = "1zmf9yrpxynbvajkv52z3njgzh89j4qx6w8ppnl7bkf4r85k09hl"; + rev = "48631457714b6a611b96ad4785ec16a98b639515"; + sha256 = "05zabbnrxbgnymp6iyc6gmfj3sk752679kvyzk5jiraksi32djiw"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; -- cgit v1.2.3 From c0872bfc286797b5022a268bda3f3ed4e25594f8 Mon Sep 17 00:00:00 2001 From: Sam Hug Date: Sun, 26 Apr 2020 00:50:46 -0700 Subject: nodePackages.coc-rust-analyzer: init at 0.5.5 --- pkgs/development/node-packages/node-packages-v10.json | 1 + pkgs/development/node-packages/node-packages-v10.nix | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/pkgs/development/node-packages/node-packages-v10.json b/pkgs/development/node-packages/node-packages-v10.json index 177b7fdf12d..9ea5b2ec15d 100644 --- a/pkgs/development/node-packages/node-packages-v10.json +++ b/pkgs/development/node-packages/node-packages-v10.json @@ -35,6 +35,7 @@ , "coc-python" , "coc-r-lsp" , "coc-rls" +, "coc-rust-analyzer" , "coc-smartf" , "coc-snippets" , "coc-solargraph" diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index 434cc707bab..95edbef44e3 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -54491,6 +54491,24 @@ in bypassCache = true; reconstructLock = true; }; + coc-rust-analyzer = nodeEnv.buildNodePackage { + name = "coc-rust-analyzer"; + packageName = "coc-rust-analyzer"; + version = "0.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.5.5.tgz"; + sha512 = "l44UBTzSWkEL/uHb5GCR5m6HnheJmuJFbYqqJ+5n6Q+PJIpKSyzyNgMiC3nmsOWCT6W3Js83s1i6zTAu8Zy8LA=="; + }; + buildInputs = globalBuildInputs; + meta = { + description = "rust-analyzer for Vim/Neovim, works as an extension with coc.nvim"; + homepage = "https://github.com/fannheyward/coc-rust-analyzer#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; coc-smartf = nodeEnv.buildNodePackage { name = "coc-smartf"; packageName = "coc-smartf"; -- cgit v1.2.3 From 59087de17b74867c693a64274b10653eb65a5704 Mon Sep 17 00:00:00 2001 From: Sam Hug Date: Fri, 24 Apr 2020 11:42:22 -0700 Subject: vimPlugins.coc-rust-analyzer: init at 2020-04-24 --- pkgs/misc/vim-plugins/generated.nix | 11 +++++++++++ pkgs/misc/vim-plugins/overrides.nix | 6 ++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 3 files changed, 18 insertions(+) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 3248d568883..f0d93572de5 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -603,6 +603,17 @@ let meta.homepage = "https://github.com/neoclide/coc-rls/"; }; + coc-rust-analyzer = buildVimPluginFrom2Nix { + pname = "coc-rust-analyzer"; + version = "2020-04-24"; + src = fetchFromGitHub { + owner = "fannheyward"; + repo = "coc-rust-analyzer"; + rev = "1dcdf6768520bff29921c50ef904478cbdfe0fb8"; + sha256 = "1p6hyixx9bjpyy42g2w4bnxwv9hafs5ppsx1fq8gndnq3nsjcyl3"; + }; + }; + coc-smartf = buildVimPluginFrom2Nix { pname = "coc-smartf"; version = "2019-07-26"; diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index 66e956a0f16..4d5b532216d 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -229,6 +229,12 @@ self: super: { src = "${nodePackages.coc-rls}/lib/node_modules/coc-rls"; }; + coc-rust-analyzer = buildVimPluginFrom2Nix { + pname = "coc-rust-analyzer"; + version = nodePackages.coc-rust-analyzer.version; + src = "${nodePackages.coc-rust-analyzer}/lib/node_modules/coc-rust-analyzer"; + }; + coc-smartf = buildVimPluginFrom2Nix { pname = "coc-smartf"; version = nodePackages.coc-smartf.version; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 9a854d58b08..4af22bd833e 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -97,6 +97,7 @@ enomsg/vim-haskellConcealPlus ensime/ensime-vim ervandew/supertab esneider/YUNOcommit.vim +fannheyward/coc-rust-analyzer farmergreg/vim-lastplace fatih/vim-go FelikZ/ctrlp-py-matcher -- cgit v1.2.3 From 5adfa39a99073ea2be01a8e38656823bb3210605 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 26 Apr 2020 19:33:54 +0100 Subject: elpa-packages: 2020-04-26 --- .../editors/emacs-modes/elpa-generated.nix | 96 ++++++++++++++-------- 1 file changed, 63 insertions(+), 33 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 9ae07c1c900..e0e28f53b81 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -925,10 +925,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.6.13"; + version = "0.6.16"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.6.13.tar"; - sha256 = "1nxbp7w4xxij07q8manc15b896sl10yh2h1cg88prdqbw1wk62qr"; + url = "https://elpa.gnu.org/packages/ebdb-0.6.16.tar"; + sha256 = "0yn0nqjp68kwlrd4qs9fg3xizm9jnddkkyw25l0llq04b53zgjdl"; }; packageRequires = [ cl-lib emacs seq ]; meta = { @@ -1005,10 +1005,10 @@ elpaBuild { pname = "eglot"; ename = "eglot"; - version = "1.5"; + version = "1.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eglot-1.5.tar"; - sha256 = "00ifgz9r9xvy19zsz1yfls6n1acvms14p86nbw0x6ldjgvpf279i"; + url = "https://elpa.gnu.org/packages/eglot-1.6.tar"; + sha256 = "15hd6sx7qrpvlvhwwkcgdiki8pswwf4mm7hkm0xvznskfcp44spx"; }; packageRequires = [ emacs flymake jsonrpc ]; meta = { @@ -1367,10 +1367,10 @@ elpaBuild { pname = "gnorb"; ename = "gnorb"; - version = "1.6.5"; + version = "1.6.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnorb-1.6.5.tar"; - sha256 = "1har3j8gb65mawrwn93939jg157wbap138qa1z1myznrrish6vzc"; + url = "https://elpa.gnu.org/packages/gnorb-1.6.6.tar"; + sha256 = "1vlb9q7a622qylrgip5ld2yrzp4l58gl543i2jdxr7jxvamy22bp"; }; packageRequires = [ cl-lib ]; meta = { @@ -2011,10 +2011,10 @@ elpaBuild { pname = "modus-operandi-theme"; ename = "modus-operandi-theme"; - version = "0.6.0"; + version = "0.7.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.6.0.el"; - sha256 = "10smvzaxp90lsg0g61s2nzmfxwnlrxq9dv4rn771vlhra249y08v"; + url = "https://elpa.gnu.org/packages/modus-operandi-theme-0.7.0.el"; + sha256 = "17zvcqplbl3rk39k61v43ganzv06j49rlyickanwll5m1a3iibw2"; }; packageRequires = [ emacs ]; meta = { @@ -2026,10 +2026,10 @@ elpaBuild { pname = "modus-vivendi-theme"; ename = "modus-vivendi-theme"; - version = "0.6.0"; + version = "0.7.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.6.0.el"; - sha256 = "1b7wkz779f020gpil4spbdzmg2fx6l48wk1138564cv9kx3nkkz2"; + url = "https://elpa.gnu.org/packages/modus-vivendi-theme-0.7.0.el"; + sha256 = "1w4vrg39dghghkvll3h4kmzykc3zpp6pbychb39gcc13z2b06v8g"; }; packageRequires = [ emacs ]; meta = { @@ -2215,10 +2215,10 @@ elpaBuild { pname = "oauth2"; ename = "oauth2"; - version = "0.12"; + version = "0.13"; src = fetchurl { - url = "https://elpa.gnu.org/packages/oauth2-0.12.el"; - sha256 = "1rfyfy0h7shr3fmd8lh6s2i3ahfh28wb5fqiqlsjwspn5h77ll29"; + url = "https://elpa.gnu.org/packages/oauth2-0.13.el"; + sha256 = "0y5nbdwxz2hfr09xgsqgyv60vgx0rsaisibcpkz00klvgg26w33r"; }; packageRequires = []; meta = { @@ -2320,10 +2320,10 @@ elpaBuild { pname = "orgalist"; ename = "orgalist"; - version = "1.11"; + version = "1.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/orgalist-1.11.el"; - sha256 = "0zbqkk540rax32s8szp5zgz3a02zw88fc1dmjmyw6h3ls04m91kl"; + url = "https://elpa.gnu.org/packages/orgalist-1.12.el"; + sha256 = "1hwm7j0hbv2pg9w885ky1c9qga3grcfq8v216jv2ivkw8xzavysd"; }; packageRequires = [ emacs ]; meta = { @@ -2455,10 +2455,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.3.38"; + version = "0.3.43"; src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.3.38.tar"; - sha256 = "1m8f1z259c66k0hf0cfjqidfd0cra2c2mb7k5lj71v1kfckwj6bh"; + url = "https://elpa.gnu.org/packages/phps-mode-0.3.43.tar"; + sha256 = "099s7c0ll8bbfgynijjaciv2qnyg4r2akajkhlmchh7y10kp5ii4"; }; packageRequires = [ emacs ]; meta = { @@ -2500,10 +2500,10 @@ elpaBuild { pname = "posframe"; ename = "posframe"; - version = "0.6.0"; + version = "0.7.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/posframe-0.6.0.el"; - sha256 = "14x2jgjn8di03rrad4x4mn8fhcqibk1j5c0ya0vmv8648fki6i9d"; + url = "https://elpa.gnu.org/packages/posframe-0.7.0.el"; + sha256 = "1kwl83jb5k1hnx0s2qw972v0gjqbbvk4sdcdb1qbdxsyw36sylc9"; }; packageRequires = [ emacs ]; meta = { @@ -2575,10 +2575,10 @@ elpaBuild { pname = "rainbow-mode"; ename = "rainbow-mode"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.3.el"; - sha256 = "0cpwqllhv3cb0gii22cj9i731rk3sbf2drm5m52w5yclm8sfr339"; + url = "https://elpa.gnu.org/packages/rainbow-mode-1.0.4.el"; + sha256 = "0rp76gix1ph1wrmdax6y2m3i9y1dmgv7ikjz8xsl5lizkygsy9cg"; }; packageRequires = []; meta = { @@ -2857,6 +2857,21 @@ license = lib.licenses.free; }; }) {}; + scanner = callPackage ({ dash, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "scanner"; + ename = "scanner"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/scanner-0.1.tar"; + sha256 = "0hv4w7yzfdnz8vrfhw6i6agj9hs09vzsqr63nrp6dd93q0gk71mw"; + }; + packageRequires = [ dash emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/scanner.html"; + license = lib.licenses.free; + }; + }) {}; scroll-restore = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "scroll-restore"; @@ -2947,6 +2962,21 @@ license = lib.licenses.free; }; }) {}; + sm-c-mode = callPackage ({ elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "sm-c-mode"; + ename = "sm-c-mode"; + version = "1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/sm-c-mode-1.0.el"; + sha256 = "1lq65dhcvrh6ybla37lvni7wmbjb5nhm75ja9cl79148da1zrg91"; + }; + packageRequires = []; + meta = { + homepage = "https://elpa.gnu.org/packages/sm-c-mode.html"; + license = lib.licenses.free; + }; + }) {}; smalltalk-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "smalltalk-mode"; @@ -3539,10 +3569,10 @@ elpaBuild { pname = "web-server"; ename = "web-server"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/web-server-0.1.1.tar"; - sha256 = "1q51fhqw5al4iycdlighwv7jqgdpjb1a66glwd5jnc9b651yk42n"; + url = "https://elpa.gnu.org/packages/web-server-0.1.2.tar"; + sha256 = "10lcsl4dg2yr9zjd99gq9jz150wvvh6r5y9pd88l8y9vz16f2lim"; }; packageRequires = [ emacs ]; meta = { -- cgit v1.2.3 From 8c65a2f1de8b5c9afddd217f3ed425eae5e1399e Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 26 Apr 2020 19:47:27 +0100 Subject: melpa-packages: 2020-04-26 --- .../editors/emacs-modes/melpa-packages.nix | 108 +- .../editors/emacs-modes/recipes-archive-melpa.json | 5614 ++++++++++++-------- 2 files changed, 3434 insertions(+), 2288 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index f5c77bd09fd..39148c8fc6e 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -164,36 +164,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac ivy-rtags = fix-rtags super.ivy-rtags; - mandoku = super.mandoku.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); - - mandoku-tls = super.mandoku-tls.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); - magit = super.magit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); - magit-circleci = super.magit-circleci.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); - - magit-diff-flycheck = super.magit-diff-flycheck.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); - magit-find-file = super.magit-find-file.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = @@ -224,30 +200,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); - magit-p4 = super.magit-p4.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); - - magit-patch-changelog = super.magit-patch-changelog.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); - - magit-rbr = super.magit-rbr.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); - - magit-reviewboard = super.magit-reviewboard.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); - magit-stgit = super.magit-stgit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = @@ -314,12 +266,6 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); - kapacitor = super.kapacitor.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); - kubernetes = super.kubernetes.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = @@ -478,6 +424,12 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac packageRequires = with self; [ evil highlight ]; }); + kapacitor = super.kapacitor.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + forge = super.forge.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = @@ -486,6 +438,54 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac helm-rtags = fix-rtags super.helm-rtags; + mandoku = super.mandoku.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + mandoku-tls = super.mandoku-tls.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + magit-p4 = super.magit-p4.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + magit-rbr = super.magit-rbr.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + magit-diff-flycheck = super.magit-diff-flycheck.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + magit-reviewboard = super.magit-reviewboard.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + magit-patch-changelog = super.magit-patch-changelog.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + + magit-circleci = super.magit-circleci.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + orgit = (super.orgit.overrideAttrs (attrs: { # searches for Git at build time diff --git a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json index b512d5f5c75..2224c44f9c4 100644 --- a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json @@ -31,11 +31,11 @@ "url": "https://git.sr.ht/~zge/nullpointer-emacs", "unstable": { "version": [ - 20200313, - 1542 + 20200411, + 1227 ], - "commit": "1d29192a3c28ba088d93410bfcdd4bee0abb6610", - "sha256": "02kmfzkrl35y599w5yal5d7rjb3xi02zhvb8q0m3iw4mbm16sw28" + "commit": "59136313132c08ab5fddaa875f6abeb22916a04b", + "sha256": "0acdh1r28v6xcsh39r13xppzqb6m00jgxgsxl17779isw98w9a3y" }, "stable": { "version": [ @@ -67,17 +67,17 @@ }, { "ename": "2048-game", - "commit": "5b7972602399f9df9139cff177e38653bb0f43ed", - "sha256": "0z7x9bnyi3qlq7l0fskb61i6yr9gm7w7wplqd28wz8p1j5yw8aa0", - "fetcher": "bitbucket", - "repo": "zck/2048.el", + "commit": "d3828ad7599d13728b5571b882344c3ada434b85", + "sha256": "0i7g7fg21ndpfbdydij3fb683pqgd1sicb7x6rradbc8jpmcf5sq", + "fetcher": "hg", + "url": "https://hg.sr.ht/~zck/game-2048", "unstable": { "version": [ - 20151026, - 1933 + 20200417, + 259 ], - "commit": "ea6c3bce8ac1c17dae5ac711ae4e931c0495e455", - "sha256": "1p9qn9n8mfb4z62h1s94mlg0vshpzafbhsxgzvx78sqlf6bfc80l" + "commit": "aad4a590ea91f9a3256233b9b345e9159c6993f2", + "sha256": "1jd50m5w0g0yplzms4qvkxx16f7xsbm9h7sdrw1p130gbij252l3" } }, { @@ -960,8 +960,8 @@ "auto-complete", "yasnippet" ], - "commit": "7b8db219080b714a7b8ba452ddb82bd08f7db152", - "sha256": "1zm04hqy6dg57swk05qvl5idzb11camcdmh7lrh6mqsvrcsvym2q" + "commit": "6ca9baaafd3a3e429429986cc59097dcbfa7cda2", + "sha256": "0gj1w0ynd3nk84ac2l3anmcvm44p662scdy80zwp2xisfc0c301x" }, "stable": { "version": [ @@ -986,8 +986,8 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20200103, - 656 + 20200425, + 835 ], "deps": [ "dash", @@ -997,8 +997,8 @@ "s", "xcscope" ], - "commit": "7b8db219080b714a7b8ba452ddb82bd08f7db152", - "sha256": "1zm04hqy6dg57swk05qvl5idzb11camcdmh7lrh6mqsvrcsvym2q" + "commit": "6ca9baaafd3a3e429429986cc59097dcbfa7cda2", + "sha256": "0gj1w0ynd3nk84ac2l3anmcvm44p662scdy80zwp2xisfc0c301x" }, "stable": { "version": [ @@ -1064,8 +1064,8 @@ "auto-complete", "rtags" ], - "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5", - "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x" + "commit": "a42298e80dffae9a6b2e9816506174542f3cbbb7", + "sha256": "1674752bbyb7890na5p846dxcvh83zn0a6z19wras1x5c59s24i3" }, "stable": { "version": [ @@ -1212,11 +1212,11 @@ "repo": "tam17aki/ace-isearch", "unstable": { "version": [ - 20200205, - 1105 + 20200420, + 518 ], - "commit": "cb6d7306cb5d2d4d36cb3803c0eaf779d88c2666", - "sha256": "1lrgjz7a4s50shc74kx6k958i1ayv5pfncsrjb3n87bvrx9wq6g3" + "commit": "58e4f1ad5cbbd2f86d161881d3f3ded3a3db984c", + "sha256": "0mlswnyd89ir060kiinzlrh70mdy8nfm2zpwr9jj2p19hrslmc4r" }, "stable": { "version": [ @@ -1563,32 +1563,30 @@ "repo": "pauldub/activity-watch-mode", "unstable": { "version": [ - 20200130, - 805 + 20200416, + 637 ], "deps": [ "cl-lib", "json", - "projectile", "request" ], - "commit": "153d93eac0b9511dc00b50c2ba409c085b58602b", - "sha256": "18idfbdrk3b2y573g2ld5sqkb9j216ixik679qj7qdnwa2b7m2xx" + "commit": "9d591c5ec9a2b2c7b55a754dd37c7434b2ef9fdc", + "sha256": "0a1ylq0il5aca5y9acykaa47p8d9xb3jy4wgi1lpm60z06n4m99y" }, "stable": { "version": [ 1, - 1, - 1 + 3, + 0 ], "deps": [ "cl-lib", "json", - "projectile", "request" ], - "commit": "153d93eac0b9511dc00b50c2ba409c085b58602b", - "sha256": "18idfbdrk3b2y573g2ld5sqkb9j216ixik679qj7qdnwa2b7m2xx" + "commit": "9d591c5ec9a2b2c7b55a754dd37c7434b2ef9fdc", + "sha256": "0a1ylq0il5aca5y9acykaa47p8d9xb3jy4wgi1lpm60z06n4m99y" } }, { @@ -1819,14 +1817,14 @@ "repo": "Malabarba/aggressive-indent-mode", "unstable": { "version": [ - 20190828, - 1828 + 20200421, + 1149 ], "deps": [ "cl-lib" ], - "commit": "c28246ba09d53e32cd9d8cafb1830f50387d9985", - "sha256": "19qklr4wqy55cb2133qlnrhf9yggsf096l14glw4jwpvx3cn61dd" + "commit": "58348d29adf8d2f23da2798badd7f89ff59cd7cc", + "sha256": "1d9hi36ml449x7qqpvcgxqx0r88jpqf1pq9k38af66ny3vd6zwl6" }, "stable": { "version": [ @@ -1894,11 +1892,11 @@ "repo": "ralesi/ahk-mode", "unstable": { "version": [ - 20191221, - 2202 + 20200412, + 1832 ], - "commit": "377f79484cc43458f66c1ba5a61459b77e363591", - "sha256": "0vf9pg2yjldzm4nzvzw0w2cvrnxj4xpm3ymsnpzdd55mp7q3y1ag" + "commit": "729007b5f22a49f5187ff47fca18c0d674e73047", + "sha256": "0989iva0igmd3y61hihwnc7mhn11midimrnbpvq7d062iy7g4vaw" }, "stable": { "version": [ @@ -1942,11 +1940,11 @@ "repo": "skeeto/emacs-aio", "unstable": { "version": [ - 20190601, - 753 + 20200410, + 1409 ], - "commit": "0e8a18f1bbb5f7be0f88d8e02ef13494736d63bc", - "sha256": "1aikvka4s97p5s26vclrnamgj8agx1j8ls6q3x7mxf8mhpv4ghqz" + "commit": "9367005c44c42c46c8ca1e7d3f780731c7d123dd", + "sha256": "063avjlizpjc53myjzvkqsp64gkxwcc7w7shjdf1xgjb9b58pbc1" }, "stable": { "version": [ @@ -1965,14 +1963,14 @@ "repo": "AnthonyDiGirolamo/airline-themes", "unstable": { "version": [ - 20180411, - 406 + 20200408, + 2114 ], "deps": [ "powerline" ], - "commit": "8b528fbae0e557461315bed82883275d58df41f2", - "sha256": "1xydgf9w0i2anpmjhy8m0zv1hql4gb37i11xfn6xzwna572z1ml9" + "commit": "d81ec80d6fc36157c20015e9fd6b192cfc679035", + "sha256": "0h9iximw1n5pwfd8zfn1xx4dcrsvxcy8rmr2ng20kl8bflir3i6s" }, "stable": { "version": [ @@ -2242,14 +2240,14 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20200326, - 1553 + 20200411, + 520 ], "deps": [ "memoize" ], - "commit": "f6cbb51c152dd60be5718218600a4ec14d9fd6cc", - "sha256": "0a59m1vv0s7czsccfalqyyp3v4lhydn1wbvyxkzy8i9fsjqbyxsa" + "commit": "0b74fc361817e885580c3f3408079f949f5830e1", + "sha256": "0y7wgwkspa800pck4ijyzgp3nrg8xkky079k1ywz7p04jqvgxrpp" }, "stable": { "version": [ @@ -2272,14 +2270,14 @@ "repo": "jtbm37/all-the-icons-dired", "unstable": { "version": [ - 20200327, - 758 + 20200403, + 1018 ], "deps": [ "all-the-icons" ], - "commit": "816987d339630e43f77a5a64ef308e95d341dda7", - "sha256": "01wgxdw222pz2sv7x9jwlislkasaw01bkq1nkpdp4jwl816aza8l" + "commit": "fc2dfa1e9eb8bf1c402a675e7089638d702a27a5", + "sha256": "0zhyhz4lhx0d8wwh1xxxf7ck4s621fk9757ql2ypxbr4iqh7sjlp" } }, { @@ -2531,15 +2529,15 @@ "repo": "zwild/ammonite-term-repl", "unstable": { "version": [ - 20190618, - 1517 + 20200416, + 559 ], "deps": [ "s", "scala-mode" ], - "commit": "9b3fe36654f03f6ab461bbec413f9ea014829a49", - "sha256": "09n9b1zkhaq0ikbgklnlxpgyyjf8hs9f7dcpgx5jjwi4pj0wzvi9" + "commit": "b552fe21977e005c1c460bf6607557e67241a6b6", + "sha256": "0g6ldvzcm6arm6hxiz1y168mj73kipgbjzxciif2b4sd3z7wpnp6" } }, { @@ -2595,14 +2593,14 @@ "repo": "stardiviner/amread-mode", "unstable": { "version": [ - 20200322, - 843 + 20200404, + 1143 ], "deps": [ "cl-lib" ], - "commit": "76ebe8d56b4d19f2bf75f54479f0e7ecc9cbaac9", - "sha256": "09jmllb9an992mzgncxral8i7j532l8i80yvvqwaqwv9azwab5sd" + "commit": "a595828fcc2257f765139b576beb6c33b4fc3bce", + "sha256": "1mwlj48hjp59mcafia612qqzmqxh30k0jshzrnzsnwlfbbsdxjwj" } }, { @@ -2613,14 +2611,14 @@ "repo": "DarwinAwardWinner/amx", "unstable": { "version": [ - 20200215, - 1901 + 20200417, + 1513 ], "deps": [ "s" ], - "commit": "e512e74e8368f9b1cf83bee16dd2522f3b1dbeea", - "sha256": "08vx7rd36j4ls7a7i2vn7mf74vbzcyrzzv0wzqzyb8ihv4qhjc0g" + "commit": "7fb7b874291e0cdeb1f0acb18564a686ec86788d", + "sha256": "0yc2b814zcl3c6lgamrr63cl4r3ayzlyfqql8875fzflc541nnnc" }, "stable": { "version": [ @@ -2670,6 +2668,37 @@ "sha256": "1vydyyxd5n0pz0jlib3yvw8vnklp15nvyyj7qkm4wcyssi70q1rf" } }, + { + "ename": "anakondo", + "commit": "197ff9f72a46a5732495d97c6b0ecb526e6995f4", + "sha256": "14kypppdgvzj2plydcpd22b9wpkircr0nc6gs4rcw416h157l2bv", + "fetcher": "github", + "repo": "didibus/anakondo", + "unstable": { + "version": [ + 20200426, + 28 + ], + "deps": [ + "projectile" + ], + "commit": "50ca8b69e0e53e4163215f3fcc325620b4d5d5af", + "sha256": "1sy0hxrj1vffqcwl5l48hl9yq4qswwjfgcc4445lairfycd4l9m7" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "deps": [ + "json", + "projectile" + ], + "commit": "6ba040e6af4466949dcad2b4a47069705f200322", + "sha256": "05j9x11hy8wzq1fbbal1y1wzkw6h98l9pp8q0qmarg0lb6hjk52x" + } + }, { "ename": "anaphora", "commit": "8505db1945071a15ba0f2bb74b58d4a6875ca7d6", @@ -2845,8 +2874,8 @@ "repo": "davidshepherd7/anki-mode", "unstable": { "version": [ - 20191020, - 1441 + 20200413, + 1019 ], "deps": [ "dash", @@ -2854,8 +2883,8 @@ "request", "s" ], - "commit": "8022fbab57c47581102af831b4405fc27f71db92", - "sha256": "1nyiqd3093dbcimljj09vidanki6nbrzknzdxw4rkbl2kd1wfvlf" + "commit": "fcbcfa7cd7fb5c282e1138322e61242942729e3d", + "sha256": "06ab3zdaz5wf30zbci7cav3dvvnknnbzq18zfzzfi4xjcsi0zkvr" }, "stable": { "version": [ @@ -2930,11 +2959,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20200317, - 1703 + 20200330, + 1640 ], - "commit": "44b378b16ad407c36e8cf728e671c17116d854b6", - "sha256": "1xhmgadi4maci25si3mf854d0ammz7w9l317r4m81v1gkdfvv8wi" + "commit": "f0a71bb14806c79f09cb6aacb5ef98a852ef66e2", + "sha256": "1v2rbrhqg4kipk4l901xzfdc4wm5fkvvx4j3l8mfp7nvc2x8gcbw" }, "stable": { "version": [ @@ -3206,11 +3235,11 @@ "repo": "emacsorphanage/anzu", "unstable": { "version": [ - 20200328, - 2019 + 20200331, + 1717 ], - "commit": "61cb32aa61f9bd088c519ea3cc96b81e241efed7", - "sha256": "1b2zjich6mvypycsrz5jkpv5mbaj77jka17vcc5ss2390dad92f8" + "commit": "3e34fb3df53c0c68e842fa179c327a7395d1901d", + "sha256": "10jgh1mg8bxmpgaspsmqksgf3cqw9glap84cb9sdirvicsmisbsd" }, "stable": { "version": [ @@ -3271,20 +3300,20 @@ "repo": "dieter-wilhelm/apdl-mode", "unstable": { "version": [ - 20200329, - 2024 + 20200417, + 857 ], - "commit": "af7764828555486a78727194a001193d03dc12f0", - "sha256": "1p5w7kzmmsc3ayh4rvmd0a9g9wchvddhr22dx3jl7dx42s3sig5m" + "commit": "2fcf73e0d522e88e99813c84ac1c07f8a83b1e77", + "sha256": "1kfzvgxf34a1wdiiwv4q6bix24avdiwkldxbypkpw57sbrarwiva" }, "stable": { "version": [ 20, - 3, + 4, 0 ], - "commit": "17bbc63239d2b791887c3d263fa7b4e8ea9d0ccb", - "sha256": "0g9nf0853c56w8vpzys4rxw6ki887ajr3h7cgqb295aa16bg65x7" + "commit": "03d4d55f5d44584d6de50033cdc1b1bc87db83a3", + "sha256": "0yv3l3j3syn2i4ff9rvsx7a2vp7mv7p9y08dzcvl6km1909adzc6" } }, { @@ -4632,14 +4661,14 @@ "repo": "rranelli/auto-package-update.el", "unstable": { "version": [ - 20180712, - 2045 + 20200421, + 309 ], "deps": [ "dash" ], - "commit": "55870d313fbe9db40b1a2b59dbc420ba66a9297e", - "sha256": "06hnr7id7w774adip0yffxh6c2xk27j2kch03r8y0v19mnfrvb39" + "commit": "cf7f7486ed699f2ed7cc8af950740aece0de6124", + "sha256": "14sq8p3qbhlfmpisanjxpginiibngmb84mjga97aq5sgpxy38wix" }, "stable": { "version": [ @@ -4790,7 +4819,7 @@ "deps": [ "f" ], - "commit": "bfad607be640bed3a107e36c91b091e136c1c9ec", + "commit": "22cd3dd6d3206cdab5c72792479a8f7f04a2b3e9", "sha256": "0nwnmqhfy4378p43a12bc32y4qqw349xjkrdh6x7fkdsd4wpf7f4" } }, @@ -4822,16 +4851,16 @@ "repo": "robert-zaremba/auto-virtualenvwrapper.el", "unstable": { "version": [ - 20191120, - 1159 + 20200416, + 1128 ], "deps": [ "cl-lib", "s", "virtualenvwrapper" ], - "commit": "6380e8986d593655021f7f884d0d21895d7e63ad", - "sha256": "18k7azy456l7qizn3xnpb2dkj58gfrxy5q77dwplgakyvkr13y8p" + "commit": "f33e8c40e53c247ee6a4fd90af8805a9806735a1", + "sha256": "0hxwlm364xq66rp8izv0x09r37pg9kiddik0xbss736fdlw0sx4z" } }, { @@ -4909,11 +4938,11 @@ "url": "https://git.sr.ht/~zge/autocrypt", "unstable": { "version": [ - 20200327, - 1958 + 20200330, + 2301 ], - "commit": "f970fb51c80d582dcc6682106388d6a870ef2c83", - "sha256": "0qfawvnjyc0rrvr5zhkq7ngllrf5h9z3wsi2a75s74545d6nyyjq" + "commit": "a16bf93ba833264b10d19abfa8fa684d9be32081", + "sha256": "119nii5qdds53cmwz3f8rl7f4k5l783h6k6ahizdawy4rf54xfz4" } }, { @@ -5125,14 +5154,14 @@ "repo": "abo-abo/avy", "unstable": { "version": [ - 20200311, - 1106 + 20200422, + 1153 ], "deps": [ "cl-lib" ], - "commit": "3bf83140fad4c28f2dc4c7107b9d8fef84d17cb9", - "sha256": "1zicf7xynvxdx0pvg0zshvllabmjprvprjgg54phcbqlilcrq0hk" + "commit": "509471bad0e8094b8639729ec39ca141fae7d4bd", + "sha256": "0kj4nbp8g22xyvjdy8vh54v6zgd4f3z6srrw5pd55gbczm5csnbj" }, "stable": { "version": [ @@ -5319,11 +5348,11 @@ "url": "https://bitbucket.org/pdo/axiom-environment", "unstable": { "version": [ - 20200109, - 2207 + 20200411, + 1031 ], - "commit": "2c5384b994266008a20558db4ffe0525e66c0f5f", - "sha256": "17f40w9r4whz0v007pp13w060jq87ag42p21hcj93c14py5s4g67" + "commit": "25932da0dc40c6877463cbf019b14ab05a6b0164", + "sha256": "1xbps0k4x982gh1a0pscpx4kayjjyykvm5pyj516wwkya7bac4a6" } }, { @@ -5569,20 +5598,20 @@ "url": "https://git.sr.ht/~zge/bang", "unstable": { "version": [ - 20200325, - 1053 + 20200414, + 1123 ], - "commit": "11e121aed7f5fe90700bd3f49d987bff0a796c2d", - "sha256": "0y6rdfhywjp0d4l39hjhlzzwp64wgd3xrvr80c2f6xbc74c6l5hk" + "commit": "1fb0162ffd2115080d4e1ddf65935277cf3c75db", + "sha256": "12nr5la6y5dnh46rfij3p1srgpwdc3fiaf4ckfx6f9kl0n1zyrls" }, "stable": { "version": [ 1, 0, - 1 + 2 ], - "commit": "87b5ad3c81ccf0f2435e3c26ad7f9a1d6191ddb9", - "sha256": "10cybpw6wks2p21g1cz9rr6chvhv1s7jasrnzbcgpg8vkzb3dj48" + "commit": "1fb0162ffd2115080d4e1ddf65935277cf3c75db", + "sha256": "12nr5la6y5dnh46rfij3p1srgpwdc3fiaf4ckfx6f9kl0n1zyrls" } }, { @@ -5661,11 +5690,11 @@ "repo": "belak/base16-emacs", "unstable": { "version": [ - 20191031, - 1607 + 20200414, + 2048 ], - "commit": "9eba6874c80ab429bf5cbf6c76bb0399d3d2a2cb", - "sha256": "0ag5fsr3377rz6xfa0b9j54r90zh0yiz98kpa27xzhky4f5jpdah" + "commit": "d68512c0856f57a19cd49d1034199836352c15a0", + "sha256": "1h98ra53i7hc7zi9yjc6p29f70r04hivdczhw4imds13akq6j034" }, "stable": { "version": [ @@ -5719,6 +5748,44 @@ "sha256": "0q6scyva1psyam7jzygqcr1wayf70vrp237hm01q5i9cin8j4j1z" } }, + { + "ename": "basic-ide", + "commit": "9aaac29f5711f93f9ba7c14e5a332888e8920a86", + "sha256": "1pvgbc3vxqm4l8qc43g7b4viz4ilw828k9qlmb6ynzmij5ykrfrq", + "fetcher": "gitlab", + "repo": "sasanidas/emacs-c64-basic-ide", + "unstable": { + "version": [ + 20200416, + 1953 + ], + "deps": [ + "basic-mode", + "company", + "dash", + "f", + "flycheck" + ], + "commit": "5d186623fb6805db71fe5b226df497e6b2904b96", + "sha256": "1v9mhvi1fqh4pni03y3qrlrzj2jrz2s9jc5g3jjpxll4zhsfr6w4" + }, + "stable": { + "version": [ + 0, + 0, + 3 + ], + "deps": [ + "basic-mode", + "company", + "dash", + "f", + "flycheck" + ], + "commit": "5bfd5f91b9f91e46158e0419c6bb5c350e7684a1", + "sha256": "0nb6dbk8aclkq7jki52y4lwgbxg61xh1598l08yfv2l1ykhgg0n0" + } + }, { "ename": "basic-mode", "commit": "71801bdc0720f150edeab6796487c753c6e7c3f5", @@ -5794,17 +5861,17 @@ }, { "ename": "bazel-mode", - "commit": "3945f7eba7d5f248cace11a7946262ac2500b01a", - "sha256": "10590pbpg6mwkcwlm01nxf0ypw694h1b57frvn5rnc53al87i586", + "commit": "10f3918c55426c8c4754ef0dfccf19300e516012", + "sha256": "1gylmwlhzg6kgj9936799ppahbhicrxn2zpbr3417qycib84nl8x", "fetcher": "github", - "repo": "codesuki/bazel-mode", + "repo": "bazelbuild/emacs-bazel-mode", "unstable": { "version": [ - 20191110, - 2228 + 20200424, + 1953 ], - "commit": "7798e33cba5db14eb2c06ddcbc4e8fa361eb679c", - "sha256": "0gjm8276qj3a5kmh2qg93yadjhc2gcny058zpxwr6sialq9p7iwz" + "commit": "668a44907f7b3ad0e6fd300e319fba5862780140", + "sha256": "13llvkl40pybi4f1chak3v4f58fwwqw1kn9ygmv6dmn2wg4ag2mp" }, "stable": { "version": [ @@ -6099,11 +6166,11 @@ "repo": "DamienCassou/beginend", "unstable": { "version": [ - 20200203, - 1035 + 20200415, + 1752 ], - "commit": "3ab68d77839060f5e85bbf9455846b68cc63ef00", - "sha256": "049r18sa4646rhp2cidpdnk09c87xxf52d6mffq82xphzsniqarz" + "commit": "bb51f7ee9229ff0b6ec5ba4a730f7360246fb9ea", + "sha256": "0l7lbmn6ljh8yv7ch2fax47mr7kxly5b5ps5vg61ra15nv8v5vfr" }, "stable": { "version": [ @@ -6177,6 +6244,21 @@ "sha256": "0j508n860dp4in1psnkcriqck6by1jvnscalyff5na8hx6xgyysm" } }, + { + "ename": "bencoding", + "commit": "a668dc6c90a3be1a51be7478e385b9ab395f6852", + "sha256": "1qjk71gkzqq07yy84i0bkyg2wh0jn4gvglcknpcia38dd80m8b7z", + "fetcher": "github", + "repo": "xuchunyang/bencoding.el", + "unstable": { + "version": [ + 20200331, + 1102 + ], + "commit": "f0af19511831f3ade590879e7d1636387682a8e7", + "sha256": "1sfj694a6yjc4qwkxn2yvnl8xp8rzrkdgnsaj8ncwdyaa50xgw78" + } + }, { "ename": "bento", "commit": "aad104fd26adb419c5da1e3472807244794e8949", @@ -6373,14 +6455,14 @@ "repo": "cpitclaudel/biblio.el", "unstable": { "version": [ - 20190624, - 1408 + 20200416, + 1407 ], "deps": [ "biblio-core" ], - "commit": "efeeab720cb8e3f95ddb4298d0cc62393cf237e9", - "sha256": "1ikp1899sn8v46ng561nfj7j7vg234l3n8l8xx3gg7yxp2l9g8ms" + "commit": "eb9baf1d2bf6a073d24ccb717025baa693e98f3e", + "sha256": "0s7wld8ikfyn2rz8zr4g3lj59b2g95mj1jnqw6xvmxys0ahnb0r5" }, "stable": { "version": [ @@ -6420,16 +6502,16 @@ "repo": "cpitclaudel/biblio.el", "unstable": { "version": [ - 20190624, - 1408 + 20200416, + 307 ], "deps": [ "dash", "let-alist", "seq" ], - "commit": "efeeab720cb8e3f95ddb4298d0cc62393cf237e9", - "sha256": "1ikp1899sn8v46ng561nfj7j7vg234l3n8l8xx3gg7yxp2l9g8ms" + "commit": "eb9baf1d2bf6a073d24ccb717025baa693e98f3e", + "sha256": "0s7wld8ikfyn2rz8zr4g3lj59b2g95mj1jnqw6xvmxys0ahnb0r5" }, "stable": { "version": [ @@ -6501,6 +6583,45 @@ "sha256": "0vcdi0q6rbs3qqlpccy9hdv82zrx61gdj3fn444qashk84s085vf" } }, + { + "ename": "bibtex-completion", + "commit": "873ae2af16e03c8e10494be3f0e7840eb27172a3", + "sha256": "06mg9fwp6jwr6fbnzh4z8am47bspcl8hv0icmdpc9lmzbcyfpg8f", + "fetcher": "github", + "repo": "tmalsburg/helm-bibtex", + "unstable": { + "version": [ + 20200417, + 1725 + ], + "deps": [ + "biblio", + "cl-lib", + "dash", + "f", + "parsebib", + "s" + ], + "commit": "631dc607e8f29f1a585adde01d6785af1fb35d12", + "sha256": "09l1h1z493dc7hp109sqs1lkkcaw0mh762p5cpda9xymr9hf6w31" + }, + "stable": { + "version": [ + 2, + 0, + 0 + ], + "deps": [ + "cl-lib", + "dash", + "f", + "parsebib", + "s" + ], + "commit": "d6a98ac6f28d2a6a05e203115211c98333d40aca", + "sha256": "0arhy051945lxjqg77b275ny9nsv60cqj0qfpmvd8xkc07lqfn23" + } + }, { "ename": "bibtex-utils", "commit": "5764b6a880e8143db66e9011cc1c2bf0bcd61082", @@ -6852,11 +6973,11 @@ "repo": "raxod502/blackout", "unstable": { "version": [ - 20200326, - 1640 + 20200404, + 1550 ], - "commit": "87498cc91916c2f41d28e93fd80102c42b93ccf6", - "sha256": "156mnqwcpv3zl5pklqvmayq5j76hm4jc3has4qydfygz8fhx1zhy" + "commit": "af37650d99bb5ae3ab05577a5bf99d5ff26b1e66", + "sha256": "18n1l6rwwfjrgaygm7nhrxg92fdd21aqkb38lc55lx3qhlrw1qwv" }, "stable": { "version": [ @@ -6926,11 +7047,11 @@ "repo": "Sodaware/blitzmax-mode", "unstable": { "version": [ - 20200211, - 2205 + 20200415, + 1529 ], - "commit": "4814c35007035f0e26e0fadc50fffc4ab6d298ad", - "sha256": "160jd2rn1lgwgnm1ygdcsz1z0yxg9f1ps9wxqkv30xnkbnnxq10c" + "commit": "5f67bb3c8e4baf1f6881cc998f9f031641a7b08a", + "sha256": "1hcx6b3ka0n6sbi9p0z2wqlsxk5d2pvkjawpcyh40b5f1r6dpfmc" }, "stable": { "version": [ @@ -7126,8 +7247,8 @@ "deps": [ "cl-lib" ], - "commit": "b5df3647f55359f8546dcfa991a351673a069a49", - "sha256": "1rfv036wzlrbqbki5i24871a9f2h6zk7yqd1lq6gnqrc4y7m477c" + "commit": "6c8fa1b4961e279ae63130902996c5f71a2e64e4", + "sha256": "0kph9898s2m086p8gj97bbzr7mba9y7hmyxh1z4mgpv5808zvd05" }, "stable": { "version": [ @@ -7504,8 +7625,8 @@ 20200321, 2126 ], - "commit": "51f2d43e08960aa65a67273101733636026790a6", - "sha256": "0dzgkpaqlrqfzsmb61idlrp91vs3lrcymbdd4k6ls58kdv75v1j8" + "commit": "3b34032bdde6a37b4566c45ce93cb38da21d4965", + "sha256": "16p4404mxqgl1zqdalnq3bvbhwv11wgfl42871lxv3nndcsd30gr" }, "stable": { "version": [ @@ -7620,6 +7741,21 @@ "sha256": "08qz9l0gb7fvknzkp67srhldzkk8cylnbn0qwkflxgcs6ndfk95y" } }, + { + "ename": "brutal-theme", + "commit": "e415b9a4d269cfee5ee2b0e58acb18804c2a8cb7", + "sha256": "1xjj2ssw3lbx21w6g4m6vqc471v8jgmgk0zw1z1hkmygg0xipgl3", + "fetcher": "github", + "repo": "topikettunen/brutal-emacs", + "unstable": { + "version": [ + 20200415, + 602 + ], + "commit": "ee63563b7cb07aeec342722ae684426cb0465a98", + "sha256": "1wx6771iv4psvlwhng0n09g0w3yml1pw3ga5lghjz9j6hba0bc6s" + } + }, { "ename": "brutalist-theme", "commit": "ec889956a5685c3a60003ad2bfa04b03b57aa8e8", @@ -7946,14 +8082,14 @@ }, { "ename": "bufler", - "commit": "b50d5939113ca9a8ad1ba606f3d3030f110a800b", - "sha256": "0y1gfpb99777sxizxvqyffsmbv6ib4zasi2dyrf8imf4z45r6adh", + "commit": "4ba5657f237eea9073a46a4127be5795be07c687", + "sha256": "1zxvkrgwk7v3404vcwyv5nag60ri72qqi5fkpwwmzc9cs2bckj20", "fetcher": "github", "repo": "alphapapa/bufler.el", "unstable": { "version": [ - 20200318, - 2005 + 20200409, + 1253 ], "deps": [ "dash", @@ -7962,16 +8098,23 @@ "magit-section", "pretty-hydra" ], - "commit": "39e756a23196d12792a3af4a06ab024d8235ee19", - "sha256": "1b9ddgdd7b6x6353f8s6cv97xqsmmka6vwmv68sq75104wr189w5" + "commit": "b2b260e4f9e8ba76bb8b4d71344c7b75e05ac44f", + "sha256": "0ww7z2xz185i97wa1rnmqwlx2mvwx69hhlyi5m3sm0nkyckb2hjs" }, "stable": { "version": [ 0, - 1 + 2 + ], + "deps": [ + "dash", + "dash-functional", + "f", + "magit-section", + "pretty-hydra" ], - "commit": "2eca0959657030c5853020da017fe98a19bba3f1", - "sha256": "0yqgaqz41sbfdbvjxf773p5m2qsr4mm22j2qgn3mp0z1r5dx67ai" + "commit": "d6c79f04b7d288174d8294fb30488b567586364d", + "sha256": "0l35ssjry15wqcxnr8rf5lrv856pgnm0k2d4d6ag14ypjx9nfhw3" } }, { @@ -8275,11 +8418,11 @@ "repo": "jorgenschaefer/emacs-buttercup", "unstable": { "version": [ - 20200308, - 2200 + 20200412, + 1148 ], - "commit": "b360e3501703d8829a7dfc2d141e8c7c32c9bcfe", - "sha256": "0b3xkykfw8888zdg5w45kzij0d547j67crpc62mizh0fnc5naqvr" + "commit": "a91f2820256a4e0c8636cc33a2ef8515a26d3f81", + "sha256": "0nhsxj48a9aqfmwqs4m65zh2g0cmvijz4m69cvx1bcia31jaabpx" }, "stable": { "version": [ @@ -8304,8 +8447,8 @@ "deps": [ "buttercup" ], - "commit": "400227a45164e4e849048d288a02ab8243d09cd2", - "sha256": "1z972i1pzg8bkrzzbjha802486mybqyh9bhbvfk2sr6nzhvx2w1k" + "commit": "3ae4f84813c9e04e03a6e703990ca998b62b6deb", + "sha256": "0ndxbh2jff6qryczawzbg580744h18z7grg82dpg7fv0rbxnyi3j" }, "stable": { "version": [ @@ -8559,6 +8702,25 @@ "sha256": "1a0qdiihyc5qwz5j68hnpfp0fx3qbzgvzflrbfv072r7ldxzfi57" } }, + { + "ename": "calc-at-point", + "commit": "9ab725281ae66c1b97875518614a0f6312ace3a8", + "sha256": "1yzb2gmmdrcckgq1kd1gcbnbqf65aia7nx4j2lgrh2n9dlp40d03", + "fetcher": "github", + "repo": "walseb/calc-at-point", + "unstable": { + "version": [ + 20200406, + 1618 + ], + "deps": [ + "dash", + "dash-functional" + ], + "commit": "11e40c8db9493ada71964b73069c6db529016492", + "sha256": "06dmm6b2xflkwgk5mysi3ycbi6yz5n0sci191a15nnzxg7vh1fbf" + } + }, { "ename": "calendar-norway", "commit": "c5d01230027d5cec9da2545a9ce9270a611f6567", @@ -8721,8 +8883,8 @@ "repo": "beacoder/call-graph", "unstable": { "version": [ - 20200211, - 240 + 20200402, + 910 ], "deps": [ "anaconda-mode", @@ -8731,8 +8893,8 @@ "ivy", "tree-mode" ], - "commit": "768a1b2169dca60a130204065dbc54bdff415b0f", - "sha256": "12f9wc3kp3pafip283yr8qd5s93nmcf84b07i72fv69nxxi4a41q" + "commit": "2f47dcb65ed8dc5393df846b4175a4872e254c05", + "sha256": "0xn8xk2x3ih22vlfjvnl6853ddpk57q70z9b0vwhjvwmi4idz7xp" }, "stable": { "version": [ @@ -9190,8 +9352,8 @@ 20200314, 1557 ], - "commit": "37593d191b255d8633231099c70b1b26b3da0d39", - "sha256": "02pn3pxawl6268sy981iqialzyj9zy9dz6ci9jrkvbc8gp9gcvwh" + "commit": "11d91b4cce988e15d7c5fc4345535c9d7a92d53b", + "sha256": "19fgk6m951q9swr958337a3jk9b4xgvswkc73al6wsdkigygmhji" } }, { @@ -9240,8 +9402,8 @@ 20200314, 1557 ], - "commit": "37593d191b255d8633231099c70b1b26b3da0d39", - "sha256": "02pn3pxawl6268sy981iqialzyj9zy9dz6ci9jrkvbc8gp9gcvwh" + "commit": "11d91b4cce988e15d7c5fc4345535c9d7a92d53b", + "sha256": "19fgk6m951q9swr958337a3jk9b4xgvswkc73al6wsdkigygmhji" } }, { @@ -9421,11 +9583,11 @@ "repo": "anler/centered-window-mode", "unstable": { "version": [ - 20171127, - 949 + 20200426, + 1053 ], - "commit": "24f7c5be9def20879f46659082d497e67b55d7af", - "sha256": "0387x0z2l0yvbhkvh3rf3h2ddk7bvwgkpvpngwhhsjbc4hh4k3hz" + "commit": "f50859941ab5c7cbeaee410f2d38716252b552ac", + "sha256": "1l7m3gfn7j1mxs0rj1pm5avknplw2f34dd2k24n5rldfm41pf8i8" } }, { @@ -9510,17 +9672,17 @@ 20171115, 2108 ], - "commit": "f09d88781a5557d4b2b7d039757cc5e9a7ddd275", - "sha256": "10zr6a3z7gzvqvn5fb4l7hg9wi5vhmkdln0c44gskmikdsm173x1" + "commit": "5d5692e7526eb228308f91c10761f22c69c8ea35", + "sha256": "1shwvgakkv9q9mlvzcsxnrj4zd1ld8nf7k8pw6zl6j3wg0sj5fd3" }, "stable": { "version": [ 3, 15, - 0 + 1 ], - "commit": "76bc1fad91478de7064380c31d333e1975cf8126", - "sha256": "1amjzy3v7rhc6djl1ldqnhpd4m3prh7lfyd5hyb9fp0v8jhyg3w2" + "commit": "e766ee2484f9a7609688ac1832ff2ca7528624c5", + "sha256": "18iv6s2g7gz2dmqhipn6ln6g4qngywcj7fm4gqwrph04bx5dfqac" } }, { @@ -10183,8 +10345,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20200328, - 1555 + 20200420, + 735 ], "deps": [ "clojure-mode", @@ -10195,8 +10357,8 @@ "sesman", "spinner" ], - "commit": "dfc13f9c199920522ee02feac1d5da1c0b578b6b", - "sha256": "12yifir74qicryl5v5gl80s5m2qvlb09ck6jywx20yin3jkw6l58" + "commit": "7f4d4e81816e64238370e028824e6389f02a38c8", + "sha256": "03rbanapb2rg9is91r6c549gx96va5gkpdqhlm0gqgph4jg4jvfi" }, "stable": { "version": [ @@ -10688,8 +10850,8 @@ 20200327, 2241 ], - "commit": "7ee3f9c52f70f80820a8c66fb6f796d6e01dd92d", - "sha256": "1vgk4ci5di0dxm2ql02g1h484nd6abqiv2xa7fh2d9rbkfh9px30" + "commit": "01b39044b9b65fa4ea7d3166f8b1ffab6f740362", + "sha256": "1g1awdcqzrnw1a6gl4n87a97lniyn0ck5a51l9n6jz2m8k3idmsg" }, "stable": { "version": [ @@ -10794,8 +10956,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20200229, - 1105 + 20200405, + 1419 ], "deps": [ "cider", @@ -10808,8 +10970,8 @@ "seq", "yasnippet" ], - "commit": "92d372393a031e5fa73ef926447afe72b574cb45", - "sha256": "0lnis1qwk1gyxgapl06d7ww1mlb9a8ahl8zwa7y2n3jrgfm25qp4" + "commit": "8259791e054382457b87d1f78061b5e3ce948907", + "sha256": "0vn32b8vhlp75vj4schy8blmiddc6dn92jl4f935yd4sg7pm04cj" }, "stable": { "version": [ @@ -10972,11 +11134,11 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20200326, - 1542 + 20200419, + 559 ], - "commit": "2f8f3ce4974a5290a99077fcc9b36f1c42309b55", - "sha256": "145wpnbv3g2l7i6nckcs7bcrv8fj28gzpz3n0dl8vqlw0qb7hmgr" + "commit": "da9f1ec717dac1194404b4a4562dba6bd9a4ee3a", + "sha256": "0v4q031rvy34llbxhksqlzf3ign4q5xcwf6b3fzblb9k5nz2b3hr" }, "stable": { "version": [ @@ -11002,8 +11164,8 @@ "deps": [ "clojure-mode" ], - "commit": "2f8f3ce4974a5290a99077fcc9b36f1c42309b55", - "sha256": "145wpnbv3g2l7i6nckcs7bcrv8fj28gzpz3n0dl8vqlw0qb7hmgr" + "commit": "da9f1ec717dac1194404b4a4562dba6bd9a4ee3a", + "sha256": "0v4q031rvy34llbxhksqlzf3ign4q5xcwf6b3fzblb9k5nz2b3hr" }, "stable": { "version": [ @@ -11305,17 +11467,17 @@ 20190710, 1319 ], - "commit": "887eb6b7680685ae9bc8697f30bf6406df2d318e", - "sha256": "1lcfn79fn3cn0sdhw5f50l8830w6lh0j7lhrz7la27sg4ag5rmg0" + "commit": "eadafe2ebc419414fba42a3fe28b534bb2fc7a93", + "sha256": "11yhjsg2y6mxpd674wkqfwzfm4qzrmbh0mywq7617brg6hk71kb9" }, "stable": { "version": [ 3, 17, - 0 + 1 ], - "commit": "e3185e3d1b92a95c18f22f70b3cef6944dd019eb", - "sha256": "1r8nnaisx10d5r3kzyfz4af9mwb5f0nzz8nmn3xvnr12rryg2bwl" + "commit": "bd580b7d568493a795a855c0710ba4ad88532485", + "sha256": "1ng8svdxwgjj4aq9f89lx18znrlhcjgl0brsfxwissf1z0539l9d" } }, { @@ -11768,8 +11930,8 @@ 20200315, 929 ], - "commit": "6c25e4f29e1c75dabd350e04c190e81f7bca3cc3", - "sha256": "0fi0w7mjardvblqwvii9grgfzd11mjr2c35vzbq5dx01ydfib387" + "commit": "40464198e7bf2121694a7e6d87588342140a84ff", + "sha256": "0fhr0rvfrb9fmbh9zgzxx2c2zl28v16hxmn9jx6k73nsfwpy498j" }, "stable": { "version": [ @@ -11815,11 +11977,11 @@ "repo": "purcell/color-theme-sanityinc-tomorrow", "unstable": { "version": [ - 20200220, - 1500 + 20200419, + 156 ], - "commit": "437bdd7a96fee751c6f817aff0100dd44bb07b23", - "sha256": "0cjbl7m6a0mmiiidn7w7hcggc58l5503swfnasbzyd1pzdrnn15y" + "commit": "344b06ed3c139af717ebff59505fc66635678f6c", + "sha256": "00as07y5q71bscchbz3yzck4ljzbcd5x5ghzzajgz3pj484smz6z" }, "stable": { "version": [ @@ -11950,11 +12112,11 @@ "repo": "cyrus-and/comb", "unstable": { "version": [ - 20200114, - 1325 + 20200411, + 1040 ], - "commit": "bd8e11b8593bc48f81ce01c0657d5a7977cafdf6", - "sha256": "0ndz25x1l0rzn5j8xg9ql2s2lgin1893kzf722chyk8147qwb0i8" + "commit": "59e025c3afb867706b869ac4bf2623665eb99821", + "sha256": "16swixv88nbs6gscgzy5lizi66pw0c9fm03xpm1kinan8v2s9m3v" }, "stable": { "version": [ @@ -12246,11 +12408,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20200324, - 2145 + 20200425, + 118 ], - "commit": "61ddd9afb58879267bf947b152a68f3dbadb9259", - "sha256": "097xy8ar6dms4zn7ymxxgmhap096fs8nc5j3js5srzmv14rswm36" + "commit": "fdde3d112ba85d034f83f95deafa24fd13be36e4", + "sha256": "1krc5gxlkhr87hw5wlch1wfrjxdin8isg51f8m6kjy20jx57jalc" }, "stable": { "version": [ @@ -12270,8 +12432,8 @@ "repo": "pythonic-emacs/company-anaconda", "unstable": { "version": [ - 20200129, - 1830 + 20200404, + 1859 ], "deps": [ "anaconda-mode", @@ -12280,8 +12442,8 @@ "dash", "s" ], - "commit": "a31354ca8ea35c0b2c1f6bb2b1a02a6cfb5e564b", - "sha256": "05qaxb3qpz3bi6c88qspf50sh15hzc01354zhj0amd07bmqzhwfg" + "commit": "da1566db41a68809ef7f91ebf2de28118067c89b", + "sha256": "1x260p0fj33xg6hkrz9q9dqrpibp4yn2n9is3a6s4xxfb485rz0g" }, "stable": { "version": [ @@ -12388,8 +12550,8 @@ "axiom-environment", "company" ], - "commit": "2c5384b994266008a20558db4ffe0525e66c0f5f", - "sha256": "17f40w9r4whz0v007pp13w060jq87ag42p21hcj93c14py5s4g67" + "commit": "25932da0dc40c6877463cbf019b14ab05a6b0164", + "sha256": "1xbps0k4x982gh1a0pscpx4kayjjyykvm5pyj516wwkya7bac4a6" } }, { @@ -12528,14 +12690,14 @@ "repo": "redguardtoo/company-ctags", "unstable": { "version": [ - 20200209, - 47 + 20200407, + 803 ], "deps": [ "company" ], - "commit": "fa5a3f7b765fc0e42a378fa2293be4c2817fe04e", - "sha256": "1wgxmy1pwwc7mvgw9bx3vvaay1pirzghvpqs6d9mnx1wbzn1x29b" + "commit": "b159e45b38226e046cf6fb7d08a0cf864ebbf772", + "sha256": "0h0k06c9fabyz6akka1bpwkz69wzl7ajcm0p108xdf5lymc75v5h" }, "stable": { "version": [ @@ -12623,41 +12785,6 @@ "sha256": "0yvp3dwa9mwfyrqla27ycwyjad4bp1267bxv0chxcr4528hnygl3" } }, - { - "ename": "company-edbi", - "commit": "5d881ff0927d5bd7f8192f58927ceabb9bad4beb", - "sha256": "067ff1xdyqy4qzgk5pmqf4kksfjk1glkrslcj3rk4zmhcalwrfrm", - "fetcher": "github", - "repo": "proofit404/company-edbi", - "unstable": { - "version": [ - 20160221, - 1923 - ], - "deps": [ - "cl-lib", - "company", - "edbi", - "s" - ], - "commit": "ffaeff75d0457285d16d11db772881542a6026ad", - "sha256": "16v4wzb9sp9ryfhgl3rk108pqvam2v6rh6hl6008083g557nmhq1" - }, - "stable": { - "version": [ - 0, - 1 - ], - "deps": [ - "cl-lib", - "company", - "edbi", - "s" - ], - "commit": "08dc69ccfbcf10ca83f7075e9b735c6885cd7e11", - "sha256": "0n2hvrfbybsp57w6m9mm7ywjq30fwwx9bzc2rllfr06d2ms7naai" - } - }, { "ename": "company-emacs-eclim", "commit": "1e9d3075587fbd9ca188535fd945a7dc451c6d7e", @@ -12912,8 +13039,8 @@ "company", "go-mode" ], - "commit": "939b4a677f2f843ea13d9dd90206d57111f0ceb9", - "sha256": "1yfw8y6czkqgxpyfdxwvkcrsmwbca7l0lr4jqmnpmm5m5rylcwr9" + "commit": "4acdcbdea79de6b3dee1c637eca5cbea0fdbe37c", + "sha256": "0i1hc089gb6a4mcgg56vn5l0q96wrlza2n08l4349s3dc2j559fb" }, "stable": { "version": [ @@ -13192,8 +13319,8 @@ "company", "native-complete" ], - "commit": "11803df3706fb23d58e418a14ce981204a64e847", - "sha256": "0maljdxigd4fvrm7pv3ssyywl3c1zhfpqdymq933iig7d2hrwxm1" + "commit": "ccb5b52940a9374fbfe92947f0101e7254ba445d", + "sha256": "0p3qrl59qhczwysydsak66j7ixpykr3397xdvjj3hkmmcrsachic" } }, { @@ -13285,16 +13412,16 @@ "repo": "jethrokuan/company-org-roam", "unstable": { "version": [ - 20200329, - 609 + 20200403, + 614 ], "deps": [ "company", "dash", "org-roam" ], - "commit": "0d14bf56f53b1fcf14418d3e545785f4857b5f06", - "sha256": "0kjf3pqlb95m1z057sjkqmsi1qhh3d4snp29gk3fzz278bc7sl45" + "commit": "be645587aa51e764127dcbe49e70a13e618d4537", + "sha256": "0gk865wwkb9c6slfvm6sfq88c61s523bf52vi9rdq3gxghvqaaby" }, "stable": { "version": [ @@ -13325,8 +13452,8 @@ "cl-lib", "company" ], - "commit": "7b8db219080b714a7b8ba452ddb82bd08f7db152", - "sha256": "1zm04hqy6dg57swk05qvl5idzb11camcdmh7lrh6mqsvrcsvym2q" + "commit": "6ca9baaafd3a3e429429986cc59097dcbfa7cda2", + "sha256": "0gj1w0ynd3nk84ac2l3anmcvm44p662scdy80zwp2xisfc0c301x" }, "stable": { "version": [ @@ -13358,8 +13485,8 @@ "company", "phpactor" ], - "commit": "31fe2ea4dbd5c2f23efd6a4ec2ec881a4ced6b05", - "sha256": "0j52n0vs85q7zz5xfqw4rgrjjpr7mzfiqbzk7vwkcdmpnax608w5" + "commit": "860d7e8784b261ee71deba354d01c3038cd777ab", + "sha256": "1d3fijh11g70xhx3a47l75mrp64bvkk7hh9lg83nl30qhn2vrbn3" }, "stable": { "version": [ @@ -13423,15 +13550,15 @@ "repo": "tumashu/company-posframe", "unstable": { "version": [ - 20200327, - 148 + 20200408, + 400 ], "deps": [ "company", "posframe" ], - "commit": "18b83d29dae75239e22ca73d91eb09ceca5e77c4", - "sha256": "0gb3y80qhk1xgdx0iglcj78wvnbxnaiyvfgg0bmfvhswjii80160" + "commit": "9b59cd679c4396cbfe8118a9dfa8a5acfe038ac6", + "sha256": "1z18libg2nplx8a8dcycdzm354gczqzg8r37agzz0jk1a7frxa7m" }, "stable": { "version": [ @@ -13455,27 +13582,27 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20191224, - 220 + 20200404, + 1550 ], "deps": [ "company", "prescient" ], - "commit": "a194852e8022762843052e58a9d0fbdaa1df0fe5", - "sha256": "0da4s32fza42vdiqhh7cdim08by5i4909q93ivxkmgrmqfgdvz0p" + "commit": "0f4a89bdec61395138d968a38d375e63ccfbed63", + "sha256": "0nnf4y49pl9lcs90y5z6f02g1xwk1jjrl0qs7gcv6kpn0vn8kn0h" }, "stable": { "version": [ 4, - 0 + 1 ], "deps": [ "company", "prescient" ], - "commit": "ad9fbe8a17fe74b27a39bcc034f3da1865663387", - "sha256": "008hxy1vasnyz36wwg44gikpi80ng75hj85nrswk60b7z7cznbmr" + "commit": "aa3110281a0622fa7b5da115cefb71a319b5b1a0", + "sha256": "1rf5cz262hjpck7vpxg15bccdrwrmlhiyxc20liwcjb2ig36nis3" } }, { @@ -13651,8 +13778,8 @@ "company", "rtags" ], - "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5", - "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x" + "commit": "a42298e80dffae9a6b2e9816506174542f3cbbb7", + "sha256": "1674752bbyb7890na5p846dxcvh83zn0a6z19wras1x5c59s24i3" }, "stable": { "version": [ @@ -13717,8 +13844,8 @@ "company", "solidity-mode" ], - "commit": "b190993dcb8376e80fb1d9b71f3ed6170bd2a341", - "sha256": "0s5xk38k3mc1d40dszlcgfpn5rvb7nsnnpmgr3c0bwqa4xh6yqrg" + "commit": "022b3159832384a7dcdc2168809e698600826047", + "sha256": "144w84abffbrbb4wflgipndaasx82axf36xm373ybdih4131mi69" }, "stable": { "version": [ @@ -13873,46 +14000,6 @@ "sha256": "1g5qv1fg22x1nkj696n12ixa2akgzivdc5q7yzy502kqjg67mkx5" } }, - { - "ename": "company-tern", - "commit": "acc9b816796b9f142c53f90593952b43c962d2d8", - "sha256": "17pw4jx3f1hymj6sc0ri18jz9ngggj4a41kxx14fnmmm8adqn6wh", - "fetcher": "github", - "repo": "proofit404/company-tern", - "unstable": { - "version": [ - 20161004, - 1847 - ], - "deps": [ - "cl-lib", - "company", - "dash", - "dash-functional", - "s", - "tern" - ], - "commit": "10ac058b065ae73c1f30e9fb7d969dd1a79387be", - "sha256": "1pjyiy95axv92yxzks4ac871vcqxjnp7n2116nkdrdzzpmlb1x9h" - }, - "stable": { - "version": [ - 0, - 3, - 0 - ], - "deps": [ - "cl-lib", - "company", - "dash", - "dash-functional", - "s", - "tern" - ], - "commit": "b20b3e490bf277c8480712210e3c92ea489859ef", - "sha256": "1l4b54rqwsb32r8zwwrag7s35zc3kpviafdrqkq8r1nyshg2yccm" - } - }, { "ename": "company-terraform", "commit": "1d9732da975dcf59d3b311b19e20abbb29c33656", @@ -13952,15 +14039,15 @@ "repo": "Wilfred/company-try-hard", "unstable": { "version": [ - 20191106, - 2105 + 20200417, + 1603 ], "deps": [ "company", "dash" ], - "commit": "8a417255b4da9f2e3889f6024755290dcc5884d1", - "sha256": "14b3sad9a7dr8j7xhnspk905ybidqz8h4hx2rw4bgl25imhmlysz" + "commit": "2b41136b5ed6e02032d99bcdb0599ecf00394fa5", + "sha256": "07c4vsrixqw6d6d2mqm6xzzzc9l9mgwgabcc6jlnw78cxij1wrsx" } }, { @@ -14074,14 +14161,14 @@ }, { "ename": "competitive-programming-snippets", - "commit": "0100042ee1356dd709d8bbeec4539ddc64317baa", - "sha256": "1mdkv2pn83mgj7yy4xf8nkm9bvxldiy7gdx4bpv36b9xw5zz6q6r", + "commit": "9a6d2467c37bf095c0a1e4605744474999ce04e2", + "sha256": "1yblnm1ar466fgwvhxybqv8sp2hn40p10p6hhnn9gi1xj9napam7", "fetcher": "github", "repo": "sei40kr/competitive-programming-snippets", "unstable": { "version": [ - 20200122, - 1558 + 20200213, + 1521 ], "deps": [ "yasnippet" @@ -14102,6 +14189,21 @@ "sha256": "07l495vv3by6r62i48jbfyr5pp1p6896cz25gkc7p3xqwrhi2min" } }, + { + "ename": "completions-frame", + "commit": "dcbb088900f76c05b04ffe25d32e43a477a0556f", + "sha256": "1ng5wmk1vp6yqrcyld23mrs8xdfa010l9acjy1vgkcsxjp3nmv3x", + "fetcher": "github", + "repo": "muffinmad/emacs-completions-frame", + "unstable": { + "version": [ + 20200419, + 2027 + ], + "commit": "2e726a497605752d7d57aaf0adf53178c1e9f7e4", + "sha256": "0f4vaq84si57p7y0zl0l93vixv0ld1srrxvav40ipil3p9fm1yig" + } + }, { "ename": "composable", "commit": "1fc0f076198e4be46a33a26eea9f2d273dda12b8", @@ -14221,8 +14323,8 @@ "repo": "necaris/conda.el", "unstable": { "version": [ - 20200120, - 1721 + 20200420, + 1418 ], "deps": [ "dash", @@ -14230,8 +14332,8 @@ "pythonic", "s" ], - "commit": "335474e409774e31125fe320a4a54c8d92bf5fa2", - "sha256": "10aadbvsg6qy11nfkmc5rvivjvyak6501srmjl6lvzxsw8q79fj4" + "commit": "f187948f7bda856befb54a08473c9aae3e595c8a", + "sha256": "02i3nq35cq0vlrg3xppyldi7s0zimvlf8j07xdn6pxm5ilrlmsl6" }, "stable": { "version": [ @@ -14654,6 +14756,30 @@ "sha256": "00055gzv032xxzqm1hffipljy8fzgsm58cbv8dzajh035jvdgpv7" } }, + { + "ename": "cort", + "commit": "1c99109a816303b1a14ff15e7a8300c73910e3a7", + "sha256": "1r1plngky2djgpbja0xr2j7hgj79d0l2jcjq4kj97q6874r4fswq", + "fetcher": "github", + "repo": "conao3/cort.el", + "unstable": { + "version": [ + 20200330, + 1641 + ], + "commit": "eb94d2a5b3a048a495fb0218b2df9021f8c864f4", + "sha256": "0rc1jfqkc05ml41cp8dc8akrxx3ifziyjy1w4vvgpbb5z49m83ky" + }, + "stable": { + "version": [ + 3, + 0, + 5 + ], + "commit": "1df178e296feaf4465967567b1cfdce1dda5a09b", + "sha256": "0y23w34dcifk6cxw2kcgwydqdc8hn0mj5129z560fm6iwxd6cgkx" + } + }, { "ename": "cosmo", "commit": "3ab914dfefcddf6ecd65261bc11bd3eb12929c79", @@ -14677,14 +14803,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20200319, - 1329 + 20200422, + 1208 ], "deps": [ "swiper" ], - "commit": "64f05f4735bba8b708bc12cfc2cbfb7fb7706787", - "sha256": "16b75jw0by1f8divymfygjbp5mikc2bjz4nqd907mdsndf8k6i8q" + "commit": "47ec37b395cc1b304bbf91e804f138634544a9df", + "sha256": "05k2qjj4z8vljfppkphfhw67wvb5ij4nz4m158v89lx87y0phh74" }, "stable": { "version": [ @@ -14757,15 +14883,15 @@ "repo": "hlissner/emacs-counsel-css", "unstable": { "version": [ - 20191031, - 345 + 20200331, + 632 ], "deps": [ "cl-lib", "counsel" ], - "commit": "61a38c9d50fa9d1e38b2fa550d07130eb9322524", - "sha256": "0c8assn7dc8dhzyzk37x7y8s266pvr6hs0vh13y65z0sgxk59i2w" + "commit": "6427dfcbda0d2bbd81db03f9d6b56b06c260ac02", + "sha256": "1g8gz5mz2qclia64qmgw02h5ivywgn46d6djlr7vcdfyp774cf64" }, "stable": { "version": [ @@ -14824,14 +14950,14 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20200320, - 19 + 20200413, + 213 ], "deps": [ "counsel" ], - "commit": "0abd7a1b6abaf59a01774ca05f51cc0c6ce7f287", - "sha256": "0kfj3b8gx95pa7yaps25javmag2bnlz5zn802wf0x81np4d3hgjs" + "commit": "65298d82468a2221f154de3606ead9a7a7806fa0", + "sha256": "0zk4axx64s9bmwfnhi2yhcfd9bkxxv3l5q33ak6l6q5dmyprp8ay" }, "stable": { "version": [ @@ -15323,11 +15449,11 @@ "url": "https://git.sr.ht/~zge/cpp-capf", "unstable": { "version": [ - 20190723, - 1158 + 20200405, + 8 ], - "commit": "ca6d50f3853e1226a0ccad435aa8fbd7852c2149", - "sha256": "19vhayxy3ha3kkncz8vy5as2pdc17k4mycqszi2g0wywllnirhvv" + "commit": "0a4fd531e9e47369ff29d9f8583efd0bacd6bc50", + "sha256": "0q6kgh2mdx3pr8ywr3fhn96chvrf6zx6xxs2lyfviwmfq2c3pyph" }, "stable": { "version": [ @@ -15362,6 +15488,21 @@ "sha256": "1rk0bwdvfrp24z69flh7jg3c8vgvwk6vciixmmmldnrlwhpnbh6i" } }, + { + "ename": "cpu-sos", + "commit": "612eddcec84562a1f060c9eb5a63f77ce88da7ea", + "sha256": "1mjbcyz8j1d0l6jnfa3bk4ba5dbb8xih56rvfri61caqmy73s6pz", + "fetcher": "github", + "repo": "oitofelix/cpu-sos", + "unstable": { + "version": [ + 20200409, + 2356 + ], + "commit": "1594b76d4ad3a6e3c471d82da366226d156e6226", + "sha256": "1pqw1gilj3m35fqaj5j51ggmxzwhdiks0k36hxmw3ihr63am0j5f" + } + }, { "ename": "cql-mode", "commit": "1084dd0ec0f2e8fe6fa8e97b322833c14e8e59d1", @@ -15581,11 +15722,11 @@ "repo": "emacs-pe/crontab-mode", "unstable": { "version": [ - 20190827, - 1300 + 20200330, + 920 ], - "commit": "9acbb426c6bfb832e1e83f10fe01a8829452eb7e", - "sha256": "04wyngg5n5dr4ninfljl3n0gqx0pik5jbj6ny79bchrnxlh22f3k" + "commit": "9625228cbfce29ac3b443c6eff893ff828268f7d", + "sha256": "01s32ivn1fdqq99ms3s6a73hrqdc2r5khrg4jv3sniviql2k3i31" } }, { @@ -15707,11 +15848,11 @@ "repo": "josteink/csharp-mode", "unstable": { "version": [ - 20191126, - 1928 + 20200402, + 919 ], - "commit": "57bd21bda4edc16671a85c7d6d51484e40a6e640", - "sha256": "0chl9lzxn1mq59vy5lsim2iiy2hl20rg3d7ri41ljksjcfz9ki6v" + "commit": "31124dba6833a4de144ca508edb90d5adfeec209", + "sha256": "0jrj2ayna8bzhi441hhszhch3na08iciqnd7fsqrm8xbwlrq7l2x" }, "stable": { "version": [ @@ -15731,8 +15872,8 @@ "repo": "hlolli/csound-mode", "unstable": { "version": [ - 20200326, - 2154 + 20200402, + 1509 ], "deps": [ "dash", @@ -15740,8 +15881,8 @@ "multi", "shut-up" ], - "commit": "f278a0e13ecd6b00cd7b056a2e36021322bed8ea", - "sha256": "1axib3rgy7kdyprpp8cs94rc9yr34faii4n9f70jjkk6x7pr398m" + "commit": "81bec1a71934a56f677f442e2c22fb6336b366c4", + "sha256": "1cxg2c8sz76b3ml8blb4f268xl6ql959p2hi5i4llil4fggw6df2" }, "stable": { "version": [ @@ -15918,6 +16059,29 @@ "sha256": "1d89gxyzv0z0nk7v1aa4qa0xfms2g2dsrr07cw0d99xsnyxfky31" } }, + { + "ename": "ctrlf", + "commit": "46073c430c271aa1971e27948e7f6d4b65b3d533", + "sha256": "01d2zv7x588r55namcda58l21lg5sbwcn1ycnvg5md69pv5cg461", + "fetcher": "github", + "repo": "raxod502/ctrlf", + "unstable": { + "version": [ + 20200417, + 1549 + ], + "commit": "97b59f1974ddcfcd9eedcf4c2d286a38f5200273", + "sha256": "1axi9wdpr82ghsbjxz1k73v82kkp9g63ahgqy38w6560f40m32dr" + }, + "stable": { + "version": [ + 1, + 0 + ], + "commit": "41eecedf44f2235ce13e021906c4ce92deddefdc", + "sha256": "10gnhafas54zj3z9173h1g7b519ac4i26afclmw3w1pk6qyyb03z" + } + }, { "ename": "ctune", "commit": "927ecd888bc00abff13f5fc335a88dffc2bf6779", @@ -16266,8 +16430,8 @@ 20190111, 2150 ], - "commit": "6a30fecff5decdf20029763afea6183de3177dc3", - "sha256": "1qdxr4wdl7mmbahsdhybq4qmc6ahf2h342gf6y99y6jkj8akvjy3" + "commit": "f09e61ab721ad51526ec7a6798fc01d8346f539d", + "sha256": "0l6yzbshqkkbb4fhvnakrilbyc441va6r3yhczksaz0rxlyminlw" }, "stable": { "version": [ @@ -16364,11 +16528,11 @@ "repo": "cbowdon/daemons.el", "unstable": { "version": [ - 20200129, - 929 + 20200421, + 912 ], - "commit": "9320c6af524f923f20aa95c1a48b7ae41c3005a8", - "sha256": "0wlv3vjhw6v6q5br4bassw34k4kai6nrw10av4y6nkvw58i5b3h7" + "commit": "a26155d04cec399ffe25b88f71cbfa4ada784569", + "sha256": "0bvfcrr3blyz0861ysfw2qbfh1iq8nfdh1kw9wz4m7g6big27qgd" }, "stable": { "version": [ @@ -16433,8 +16597,8 @@ "repo": "jyp/dante", "unstable": { "version": [ - 20200131, - 1211 + 20200416, + 1217 ], "deps": [ "company", @@ -16445,8 +16609,8 @@ "lcr", "s" ], - "commit": "4955bc7363e250d22579bc34b0b4ab6611c0766c", - "sha256": "06xagrjl00iwvaf0cli3dhhvvn4x7ysvkir4120lwc9ispzc077m" + "commit": "7411904bfbde25cdb986e001ec682593dcb7c5e3", + "sha256": "0dhkp9g1cc1vlfk1fjncl3x3s7zd9a633ya85pjyxl70kky2qhnz" }, "stable": { "version": [ @@ -16474,8 +16638,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20200325, - 546 + 20200425, + 606 ], "deps": [ "bui", @@ -16486,8 +16650,8 @@ "lsp-treemacs", "s" ], - "commit": "e2086fc9fbde4413f779b314bd5a93f808a3fb78", - "sha256": "1ig4s5aimd7zfyaa4fgb584lpzmi38kbfqc4jncifh0i69mi6x9k" + "commit": "43c672747e537620f5385ec4bd86c393b16d84dd", + "sha256": "0mqhzwk0l32k94msxq69wlcwxn8gc34cqbgxs7z1x9nddjirqmb1" }, "stable": { "version": [ @@ -17144,6 +17308,37 @@ "sha256": "15r0qwjkl33p8kh2k5kxz9wnbkv1k470b1h0i6svvljkx9ynk68a" } }, + { + "ename": "dbc", + "commit": "0f82920ec0b8544c7008a57a412fe3ba15fc5e0f", + "sha256": "0xba153ky52iiyjndryzm6n3v019d0710r4k91chvv8gvyb4jr9z", + "fetcher": "gitlab", + "repo": "matsievskiysv/display-buffer-control", + "unstable": { + "version": [ + 20200331, + 1826 + ], + "deps": [ + "cl-lib", + "ht" + ], + "commit": "17c6640a409424ec32fdb6bfd6065562e726bf1f", + "sha256": "18mamp8j3lmmcpcyfrwrqppxvyx7zirn30rwp4wndczpyapkwv4n" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "cl-lib", + "ht" + ], + "commit": "5123477396a562fae350a89fbed79464cc498bc9", + "sha256": "0xd94cpqpv0yw70ajrvs69ygds62m40fk0m4s59zvdn5qs7ivj4k" + } + }, { "ename": "ddskk", "commit": "6eccccb79881eaa04af3ed6395cd2ab981d9c894", @@ -17152,15 +17347,15 @@ "repo": "skk-dev/ddskk", "unstable": { "version": [ - 20200325, - 1337 + 20200403, + 1308 ], "deps": [ "ccc", "cdb" ], - "commit": "37593d191b255d8633231099c70b1b26b3da0d39", - "sha256": "02pn3pxawl6268sy981iqialzyj9zy9dz6ci9jrkvbc8gp9gcvwh" + "commit": "11d91b4cce988e15d7c5fc4345535c9d7a92d53b", + "sha256": "19fgk6m951q9swr958337a3jk9b4xgvswkc73al6wsdkigygmhji" } }, { @@ -17202,16 +17397,16 @@ "repo": "Wilfred/deadgrep", "unstable": { "version": [ - 20200202, - 1520 + 20200411, + 652 ], "deps": [ "dash", "s", "spinner" ], - "commit": "3ec95398d09719a9dbdc3a67d29d22ca224516cf", - "sha256": "0rxzm30md5s87s6j1aqgjxa9kb637v11b7q194l8zzhf457ky6la" + "commit": "bdcdf138cd71b0a5a80ca64b3bd68b7355084757", + "sha256": "1f0gbl2s6h945h1d4pg6cms3w2jwppqiddy3ja9b02ckcld1c227" }, "stable": { "version": [ @@ -17235,11 +17430,11 @@ "url": "https://salsa.debian.org/emacsen-team/debian-el.git", "unstable": { "version": [ - 20181020, - 1513 + 20200401, + 1622 ], - "commit": "8ff1f5d73d5d56bee65e45e9d8ac4e75aa8b8e4c", - "sha256": "0hqxl0gi9csp2zfc65s01c3i6himh38fia46cn68i3hh5d6kb6qx" + "commit": "d7117ab18b15f449f194cd7d91ff22e55fcfa817", + "sha256": "09i2n4990d5ra4zqswzv8sjk4psd9lf71xdsgnfbr88pdv1q8bhf" }, "stable": { "version": [ @@ -17471,11 +17666,11 @@ "repo": "abo-abo/define-word", "unstable": { "version": [ - 20191031, - 1736 + 20200417, + 844 ], - "commit": "d8c76d503be3d561221631067ec5274e7c147248", - "sha256": "18yy7gw8x3y9sk3v7xpd59p425qc36dymj0wgk6mzarfq5rhv79h" + "commit": "08c71b1ff4fd07bf0c78d1fcf77efeaafc8f7443", + "sha256": "053kyg2jqayphdkm7s8fz8yl97yspib6qszcajyr77m6n7j4i764" }, "stable": { "version": [ @@ -17806,11 +18001,11 @@ "repo": "raxod502/diary-manager", "unstable": { "version": [ - 20190702, - 2148 + 20200404, + 1549 ], - "commit": "964dd7bf60a8e8abc880ef5b73319bc65d5ea5e3", - "sha256": "1w1hffypsx41n63yrpz0lcyzia4x4lis0sja8gksik7dvwwkyhwb" + "commit": "6d9b86faecb2ab7c2e1eb90dcf7bffdf70804470", + "sha256": "05v449px4nq565w9kcg2bbz1j27qlgiw17z4drgriz2qf2m50v18" }, "stable": { "version": [ @@ -17849,15 +18044,15 @@ "repo": "cqql/dictcc.el", "unstable": { "version": [ - 20200209, - 1810 + 20200421, + 1422 ], "deps": [ "cl-lib", "ivy" ], - "commit": "e07ebfc577b904b3387705a91395ac873e42c727", - "sha256": "0wi3iz31qizd3xsys1pyfr2zfn03x27lrja5s8170s27zqkwm56j" + "commit": "3950011197ba81f27cc82b4e6075c9100945f936", + "sha256": "0xmmkzsg48q6awhkbi5naqjm0yjdnwb437k17razgd6y99vyh0ns" }, "stable": { "version": [ @@ -17936,11 +18131,11 @@ "repo": "ideasman42/emacs-diff-at-point", "unstable": { "version": [ - 20200106, - 441 + 20200413, + 200 ], - "commit": "c26027d701f2a1512e0a2b18e4b34f02e9140ee0", - "sha256": "1c5pibjmpkw7fi26vnsvv5yjg4y851jccwymzwa06gbxb3jf5ggc" + "commit": "5b06de513297a80cf3a2081b8ee0914e90da810b", + "sha256": "1ib8297alpsvcxl9c56n2bjh5j4m49k92nz1mgdybiqwg3z4is21" } }, { @@ -17951,14 +18146,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20200329, - 1724 + 20200406, + 37 ], "deps": [ "cl-lib" ], - "commit": "7fce94f7d5eebea06aed153b0f574567182c8d2b", - "sha256": "11m9ab7ymvbsxgddwxwcr8mrll3m67lnib8bpmb9vmh16zb2mzcl" + "commit": "a625033fb1dde83f6e4c2fc21f632b22ec34b609", + "sha256": "01m0aknqn0pgb46877kbz9n1nqmlamrlm58g2q894imbhybgfpan" }, "stable": { "version": [ @@ -18627,11 +18822,11 @@ "repo": "thomp/dired-launch", "unstable": { "version": [ - 20200318, - 1715 + 20200403, + 308 ], - "commit": "1f73233065ddb077adb7019ae33efd8acce9b561", - "sha256": "1sc0y7ffvyq5785gcmlgkkblz1nyyx4a5h1m1bi50zkqpna1pxbf" + "commit": "6e5d26ca859f7af624351ba2af6b1be83982053b", + "sha256": "0xy8c90d6lv21cp5p2xzqqv5da2m3mry8bdkz54rknv2v9in8g0l" } }, { @@ -18831,14 +19026,14 @@ "repo": "jojojames/dired-sidebar", "unstable": { "version": [ - 20200226, - 333 + 20200409, + 801 ], "deps": [ "dired-subtree" ], - "commit": "5f88a4570eae9645be06ff22542f110aeb70dd7d", - "sha256": "0l1wr7g4lfqmvhw3vir6fmwxmid9sasxlf5pxxvh0z8kps53f0cn" + "commit": "6e569c851418890c21fd37d03a62f85343aa0900", + "sha256": "0jxljpmzncbh9xb22y4xr9bzcxwijy68pn8chqsvqmivss5py7n9" }, "stable": { "version": [ @@ -18928,11 +19123,11 @@ "repo": "renard/dired-toggle-sudo", "unstable": { "version": [ - 20151109, - 1006 + 20200401, + 1353 ], - "commit": "02449dbda4e168f99fe5352c9628df5d39e11483", - "sha256": "0ajj8d6k5in2hclcrqckinfh80ylddplva0ryfbkzsjkfq167cv2" + "commit": "13bbe52c54893f5aa3e56228450ffdd0c9e1d169", + "sha256": "1fw1pb1z6krqd1pfxxhr6rrfr9ckkcb0zsjzbjk0i2i1q5cg6car" }, "stable": { "version": [ @@ -19754,8 +19949,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20200218, - 1257 + 20200421, + 822 ], "deps": [ "dash", @@ -19765,8 +19960,8 @@ "tablist", "transient" ], - "commit": "a2092b3b170214587127b6c05f386504cae6981b", - "sha256": "1q3fgh3sjly62h86yvjqhr7j1yyrsfygk4rqkx0p7a052s2qvqi7" + "commit": "08745207332d940130a2357eb5c5e00fd88bd6af", + "sha256": "15fgcmld7z83b89jkwi0a5i9lls43kpbqav0lhfdyq3m941whzs4" }, "stable": { "version": [ @@ -19925,11 +20120,11 @@ "repo": "progfolio/doct", "unstable": { "version": [ - 20200329, - 1548 + 20200413, + 157 ], - "commit": "e788ec71dafdd57a5c0eb3633794abbe3355f0c9", - "sha256": "19zqhcjpb23h4nn9h22jn1gh7a53y5v8f52809scl3vif0ch9b2h" + "commit": "c237e72e0bc53a67a83c05d9c1bb28e80fd15c1e", + "sha256": "0bh7yckr1cfampc1kmigbg98b6kwvnjgq8143lqlj1hmg0hw5cb6" } }, { @@ -20044,30 +20239,30 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20200322, - 636 + 20200425, + 553 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "0642f7107102e88fb8818da02e6612c6855537ff", - "sha256": "1wmsrvzbvixzps6zp1d2r5fn7gkfwvjz2ksjqd6a8sd4swdx9ggk" + "commit": "c177959bbfa7fa6f199b1145c6986e55f462f1c1", + "sha256": "0iclkfryfj72c5377rydsxh090maq6i0sxj90cm6dalyazd7rl4k" }, "stable": { "version": [ - 2, - 9, - 2 + 3, + 0, + 0 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "e6d690bae01cb68e7171857fe07ac914d7a19f4b", - "sha256": "0k5rppzpycl1aggg6cvwvgxylgvjbxksvdah8fkrrmx3dwcr2y3p" + "commit": "b44955841a301f4930b054e912fa4c1a700d426d", + "sha256": "08m75rl5i812pa87zcsjvb4mm3jjhpwzgx9mf2m7sxj807airz5d" } }, { @@ -20078,14 +20273,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20200327, - 1325 + 20200331, + 1901 ], "deps": [ "cl-lib" ], - "commit": "bbb3725af973485424f6ca716b648923defa176c", - "sha256": "0pybwshmcfj0ll2hjcdrqdqbf6crn10pjlkbiyf3k23w5ayaql49" + "commit": "8d5ddbbb72752fdd981407bdc2e33d917675e919", + "sha256": "16d1mlz5ll89p2f4avz8cbyg2wkxkjydb19aff9y6c75pw948cks" }, "stable": { "version": [ @@ -20314,11 +20509,11 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20200324, - 1726 + 20200412, + 1112 ], - "commit": "e4672e22885772d2be0c75df03c4f805f1acf5fa", - "sha256": "0pb0q8grybzl3sh75km93n1cvk7wh5c2r2nbm8rkwzzhxrhrvffl" + "commit": "81d06717d1b75d2b51c1b7d3da93b6a01d7e253d", + "sha256": "1ywzxhygf8qyif4d6kg0rhbpdxxb74wnip8n4n9m9mabmff5xkzk" }, "stable": { "version": [ @@ -20562,19 +20757,19 @@ "repo": "jscheid/dtrt-indent", "unstable": { "version": [ - 20200306, - 1054 + 20200410, + 920 ], - "commit": "1569b712ea691a9b8df12af5ee8c8a4aa4853e45", - "sha256": "1149s9ym30nfdbb2ndk5ypl5wb984an6n37gycra15j3z15d60mh" + "commit": "9163cd990fb1f43dafed3948c6e406c13a45a6be", + "sha256": "1x73akd8l7bsn59wnz2cg0mxms98r1li40w3by121p9md49fd0r8" }, "stable": { "version": [ 1, - 0 + 1 ], - "commit": "1569b712ea691a9b8df12af5ee8c8a4aa4853e45", - "sha256": "1149s9ym30nfdbb2ndk5ypl5wb984an6n37gycra15j3z15d60mh" + "commit": "9163cd990fb1f43dafed3948c6e406c13a45a6be", + "sha256": "1x73akd8l7bsn59wnz2cg0mxms98r1li40w3by121p9md49fd0r8" } }, { @@ -20644,8 +20839,8 @@ "repo": "jacktasia/dumb-jump", "unstable": { "version": [ - 20200306, - 513 + 20200423, + 1658 ], "deps": [ "dash", @@ -20653,8 +20848,8 @@ "popup", "s" ], - "commit": "e8e9b0c2d1eda594fd40db9c64e93a70b426641b", - "sha256": "0m8771bzz972zf2lhv7f4z2x0rnnfc0iidb5jpz072wr3v52kark" + "commit": "d760aa880fc1052570ab0fd7e586eeffb7636af6", + "sha256": "0a27fv2yi4c19g78hgflrp8vx135v74q6n8ak3g3b2gh66vkvq7p" }, "stable": { "version": [ @@ -20698,17 +20893,17 @@ 20191016, 1241 ], - "commit": "d864995d98479a21fb88fcf6d24b8262f2fdeae2", - "sha256": "091c58yvvwly070dgzz1202njlp695fzq85873v4dak1rwxisrwh" + "commit": "17895c30724c2a5ea18c0140d4022e2ef83d7208", + "sha256": "0sgn56g1225ar45kgp5qcdd6fc95skr36zci1lz1fszy94v162z7" }, "stable": { "version": [ 2, - 4, - 0 + 5, + 1 ], - "commit": "ccd447e41a711f8a52bc854d71dba8677c900c34", - "sha256": "0i8b84mi38r431z4a1yh4xnn9z5mnk1g3di0qz6h4lsxq8pg2m0v" + "commit": "4d1ef91df8c732d516ddea4a953f5956e99692b2", + "sha256": "1ljhwsyl277lvmii4v439dafyc0y2l2jf2ds5zivpbrh168851di" } }, { @@ -20767,11 +20962,11 @@ "repo": "dylan-lang/dylan-mode", "unstable": { "version": [ - 20190831, - 1910 + 20200425, + 1347 ], - "commit": "4801b7adcc984edfffa3f951e2c35329fae2b6e4", - "sha256": "1xm27fc98rj8fsfm9na1x3d7zgp8fkxf782ajvirzbbq5nj0lyma" + "commit": "64f3aed546315c766331c69be3c7e78c7da6c333", + "sha256": "1r63gxy1hlij1ck570agvj39rynby6kna5kcfhrr0imi7hl98mzz" } }, { @@ -21098,14 +21293,14 @@ "repo": "redguardtoo/eacl", "unstable": { "version": [ - 20191230, - 1057 + 20200407, + 756 ], "deps": [ "ivy" ], - "commit": "a25c28f4ee1126d1ee51dae22843f3440520f1a3", - "sha256": "0pz894saz6ncira9ag9aqmfw394v56sfxldv25phh3z44y1ij01z" + "commit": "47b839f305e63e119b6a554497cd4b99512e8e00", + "sha256": "1gdppgjdapjx25ns5ja1lnnypq26m8w9s5vbnfg7p0j64kd2mdwh" }, "stable": { "version": [ @@ -21367,14 +21562,14 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20200327, - 1040 + 20200419, + 2017 ], "deps": [ "parsebib" ], - "commit": "f57e138d56bd293f30a64c33ab8b374758acfb08", - "sha256": "0h8bxy6p91hhx6mvzbxv2j3cr6bxcdbpgbaqa9ibcaxy72d9xrjp" + "commit": "87920ab793e6e854903eb101b80a0746f588dab6", + "sha256": "0mw5spmjn8yyjbdpas06rf9cmfsfa3k2z0yfrs7xvmaalpxz55xm" }, "stable": { "version": [ @@ -21397,11 +21592,11 @@ "repo": "flexibeast/ebuku", "unstable": { "version": [ - 20200203, - 1122 + 20200422, + 723 ], - "commit": "2f1af38469966c788483cbce4ab70436f72cf30d", - "sha256": "15liiczqjf8p2jr9356zrj65ijp5gdrnb5i7m09armyhb8282rmg" + "commit": "ec8a5057dd2bf6275c8cdfca53c51e0b7f21b8f3", + "sha256": "0j6g56vqi12m5533dm6f716vsqcw59awfbiiv0jafb5kw9wj698v" } }, { @@ -21547,90 +21742,6 @@ "sha256": "0xy3q68i47a3s81jwr0rdvc1722bp78ng56xm53pri05g1z0db9s" } }, - { - "ename": "edbi-database-url", - "commit": "e25bf3d65ef2fb09eb0802cfd3e3faee86a5cfdb", - "sha256": "018rxijmy0lvisy281d501ra9lnh5xi0wmvz5avbjpb0fi4q1zdn", - "fetcher": "github", - "repo": "proofit404/edbi-database-url", - "unstable": { - "version": [ - 20160221, - 1923 - ], - "deps": [ - "edbi" - ], - "commit": "d56c580268cd93651998c4c6b1c5558e6b6ca90f", - "sha256": "1nkfl8jngkdz8h951jig39af1wh5vrc5lqk58l2i4lc2znprj9lx" - } - }, - { - "ename": "edbi-django", - "commit": "10dd853022ab93e345761b04d760b3763f4d2384", - "sha256": "02vcbqgkvhlw9msf65777f85c8myxr95g2dz199nlfmz4vpqrkgq", - "fetcher": "github", - "repo": "proofit404/edbi-django", - "unstable": { - "version": [ - 20190212, - 1417 - ], - "deps": [ - "edbi", - "pythonic" - ], - "commit": "9b73db66c02a222fc62dc3bc590962f58c5b43d8", - "sha256": "1yinm4qzwpdmr4a0isbkiw6ny23gllajcppwh7g0d62di3v242dm" - } - }, - { - "ename": "edbi-minor-mode", - "commit": "5fb878b60c7ecbb1e3a47aef1d9765061c510644", - "sha256": "0p7vdf9cp6i7mhjxj82670pfflf1kacalmakb7ssgigs1nsf3spi", - "fetcher": "github", - "repo": "proofit404/edbi-minor-mode", - "unstable": { - "version": [ - 20160706, - 1447 - ], - "deps": [ - "edbi" - ], - "commit": "566a2141a6eb9d9d5d7e1bd7c251d1c5e8f0d2ec", - "sha256": "1g6mlmrwl8p5ffj9q298vymd9xi2kpp7mhbmz4by4f6a3g831c88" - }, - "stable": { - "version": [ - 0, - 1 - ], - "deps": [ - "edbi" - ], - "commit": "566a2141a6eb9d9d5d7e1bd7c251d1c5e8f0d2ec", - "sha256": "1g6mlmrwl8p5ffj9q298vymd9xi2kpp7mhbmz4by4f6a3g831c88" - } - }, - { - "ename": "edbi-sqlite", - "commit": "acc9b816796b9f142c53f90593952b43c962d2d8", - "sha256": "1w53ypz3pdqaml3vq9j3f1w443n8s9hb2ys090kxvjqnb8x8v44y", - "fetcher": "github", - "repo": "proofit404/edbi-sqlite", - "unstable": { - "version": [ - 20160221, - 1923 - ], - "deps": [ - "edbi" - ], - "commit": "52cb9ca1af7691b592f2cfd2f007847e7a4ccd5f", - "sha256": "1vll81386fx90lq5sy4rlxcik6mvw7zx5cc51f0yaca9bkcckp51" - } - }, { "ename": "ede-compdb", "commit": "3b70138b7d82aec2d60f4a7c0cd21e734a1fc52a", @@ -21787,8 +21898,8 @@ "deps": [ "websocket" ], - "commit": "7074fe87c2df4aa7afecb7513326f5d481dcf92d", - "sha256": "17kbakpr6d79cih1fmvnrivs0vk41fw0njhb5y6dbml6ppi11i57" + "commit": "e9ef6a72bdc6b58f932c51aa161869cee11b4bc9", + "sha256": "1akyxq0ja06q5bywa6nb4klnbvrw6f6d83bzrjdz2sc7ddk3a4hz" } }, { @@ -21887,8 +21998,8 @@ 20181016, 1125 ], - "commit": "af46de40e2991b046f04856c18a6483badce38aa", - "sha256": "1lfdfnc7cx3lqa69mpn72jhsz4dwmfnrfpzrnk6lfh10h65yfdiw" + "commit": "43f180809fcbc7e104f96f95608a97c4c2a2c8b3", + "sha256": "0v9nn85pw7lll516p8bb9y6dk44rj2h88ky4zz9wgkrppjs7qdb0" }, "stable": { "version": [ @@ -21961,8 +22072,8 @@ "deps": [ "editorconfig" ], - "commit": "ddf60923c6f4841cb593b2ea04c9c710a01d262f", - "sha256": "1v5a6s4x7cm6i0bxaqdpsg8vqj479lp5h45glx4ipk0icdq8cvd9" + "commit": "4f75e175ad15ce2038f926fe4f0e5a0c1d0cbc46", + "sha256": "12a78187ar4mxdf1sk8bkrdcxly1nc5m9krkry04jklj6h9dayj3" } }, { @@ -22071,8 +22182,8 @@ "repo": "sebastiw/edts", "unstable": { "version": [ - 20200304, - 1709 + 20200413, + 1929 ], "deps": [ "auto-complete", @@ -22083,8 +22194,8 @@ "popup", "s" ], - "commit": "22eb59692a792c6769ae0b2b9f9a2583133764b8", - "sha256": "015irp4vd4s2j2iw4p0r98kb60xyjbrpvckj8iixsja3qj8b63rw" + "commit": "e797eb57ede8332205b3abd7d7adeccbb319ad29", + "sha256": "1101yx1dg82msw0bbji9hpnzq029ghh9ca4a6588fik8sn3v786j" }, "stable": { "version": [ @@ -22247,17 +22358,17 @@ 20200107, 2333 ], - "commit": "6ea43326d142b714363042a27e06d3487f7845d7", - "sha256": "0pvaz69rjaz8m32s4chq7kavf20njb78l380xl97blj9h0yry1l4" + "commit": "8e0706fdb5ae139a1db93bdd24203a261b13c875", + "sha256": "09jqjdgjrg740a326vn086wj3gv548w19dk8pz9k7k3dvlncw24y" }, "stable": { "version": [ - 3, - 10, - 3 + 4, + 0, + 0 ], - "commit": "79ab16f093aa3b2373422d0044f3119467755f5e", - "sha256": "0fisq0g3css641fh7y9vhagkfbsm2rfw9pnzyz434cr41wnjmjfz" + "commit": "400465de0ece5b03607895bd1c83b1cfae34079a", + "sha256": "196jn2cmyjvjai3nbij5kk64djz908ch4kddi4qdpkighwslkh2i" } }, { @@ -22268,27 +22379,27 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20200320, - 852 + 20200424, + 1852 ], "deps": [ "flymake", "jsonrpc" ], - "commit": "2209779972eee595ff6ea8e75c002f7e5726b0c8", - "sha256": "08mfgg9s76wmjzvpdirnm8rsa3fsvlvjivxjdn53aj1pnky55z8d" + "commit": "e5cf30e26bd3107583418f2b4539c7385d37d6c8", + "sha256": "0fx2zx46j4mivb2h1bdz7n17bmmd6811az1wzi8g4q430kiv9hpi" }, "stable": { "version": [ 1, - 5 + 6 ], "deps": [ "flymake", "jsonrpc" ], - "commit": "33a4f869972f0958c15c33b47035672b265a8b55", - "sha256": "1x6nlsc93scq8lidx1l5ipi7r7s0p63m2vwkl77p3v59glir15cb" + "commit": "e02479a8c20cd79c3dfeb553deaaecd7d6e97e51", + "sha256": "13r1ysdhnxkc025wypwi6w507v18hm5qf0x29qrycql46f8klrjb" } }, { @@ -22299,28 +22410,28 @@ "repo": "non-Jedi/eglot-jl", "unstable": { "version": [ - 20200120, - 1457 + 20200413, + 1930 ], "deps": [ "eglot", "julia-mode" ], - "commit": "94e84fe0d14585192dca53e1e962bec7596f095c", - "sha256": "0dsnyp30c9nrglv4ifv6g272sa6pgrn5f75ak81z4pkdhdn6wvnb" + "commit": "a37aaa7c2a3e0282e02f97c0b8946dbd6d6cbf06", + "sha256": "09mzxg0j5a9dqx8sf5m91sapzdlr3vj5ds2ll7nxmgd57m185pfs" }, "stable": { "version": [ 1, - 1, - 1 + 2, + 0 ], "deps": [ "eglot", "julia-mode" ], - "commit": "94e84fe0d14585192dca53e1e962bec7596f095c", - "sha256": "0dsnyp30c9nrglv4ifv6g272sa6pgrn5f75ak81z4pkdhdn6wvnb" + "commit": "a37aaa7c2a3e0282e02f97c0b8946dbd6d6cbf06", + "sha256": "09mzxg0j5a9dqx8sf5m91sapzdlr3vj5ds2ll7nxmgd57m185pfs" } }, { @@ -22348,17 +22459,17 @@ }, { "ename": "eide", - "commit": "a42244392719c620b47bc43a7a8501dab4b6f74e", - "sha256": "1962shxcfn3v1ljann7182ca6ciy5xfbcd6l9l8rc8gikp55qv8m", + "commit": "1dd52b48fbac25ee2873645d87a1238351a6ff74", + "sha256": "1akmb48rpq05mmb022yh0qnjlbs1wx5x6f1gk2kw5fb5g45swb0c", "fetcher": "git", - "url": "https://framagit.org/eide/eide.git", + "url": "https://forge.tedomum.net/eide/eide.git", "unstable": { "version": [ - 20191213, - 2119 + 20200419, + 2126 ], - "commit": "2153a68b58910e7892b16cc32414e2be99e33f36", - "sha256": "17fbxijpiachsb16ngbv7wpy9f4m0456bc5q9g7z8qi28dgzlz9p" + "commit": "827f29b9fd8e20e2e460cffc67a8f9ac9623c450", + "sha256": "1bqsvk70l9n929b41xz6j3sg3irwrcrlbvqxpvq0d8jqjl4nw51g" }, "stable": { "version": [ @@ -22393,8 +22504,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20200328, - 2131 + 20200425, + 1940 ], "deps": [ "anaphora", @@ -22404,8 +22515,8 @@ "request", "websocket" ], - "commit": "6fc75f20aa0b6666e743ce674c6da526f88793b1", - "sha256": "10cm3pvpjrqy76xd9067ayn108z34014cyaal4vj2l69yrkfr0m1" + "commit": "42134adf3c95b7768e2d725bab39ddb98feafa09", + "sha256": "07lwxl5kbsc0xlmnvp524p3r4m9f4ldxnkwm0gmbk8aq1lg1gyw6" }, "stable": { "version": [ @@ -22479,8 +22590,8 @@ "repo": "kostafey/ejc-sql", "unstable": { "version": [ - 20200325, - 1455 + 20200424, + 1623 ], "deps": [ "auto-complete", @@ -22489,8 +22600,8 @@ "direx", "spinner" ], - "commit": "5bf46fc49b7827604ee82d56b80eee36630b562d", - "sha256": "0dcnzq9l1mnfrn7rq8kvyfkbw36r6iagp61c0p757xwfawsaxns4" + "commit": "0914ff731630ebdaa4e07dba97644e0e57bbf18e", + "sha256": "0qm4sdzxmkm35kg3ldijj6vwbdn8yflivyv09m4w05vz0liks0qa" }, "stable": { "version": [ @@ -22573,8 +22684,8 @@ 20181006, 225 ], - "commit": "456fea0866ee71cb5a68eb65e9464565674081bf", - "sha256": "1hcjf88xjgkgp5wv7ccnfifnmpdj33csx6xm7rrdal3cy0f3ydj8" + "commit": "64abd393d5cefb1d59380dcc1344befdf618735b", + "sha256": "006c2kgkky81mv7an24m55521ay0d6ang5cwi16ac88j8x3n1q4i" }, "stable": { "version": [ @@ -22687,20 +22798,19 @@ "repo": "raxod502/el-patch", "unstable": { "version": [ - 20191114, - 1639 + 20200404, + 1548 ], - "commit": "4744d6b1a5405001cb75f2c362a681964367319c", - "sha256": "1l4rjvdrdzvgq5zq6njg6gv0b7p6j545h4v27mpyxfh3z5jc8c49" + "commit": "f5c785a6f951a4aa6d6ab5cda84460dad2a072cc", + "sha256": "12fw4zk3w8kh8g94k4hcqjixxb1vvnv4qivc672lwdj4d8a218jw" }, "stable": { "version": [ - 2, 2, 3 ], - "commit": "ef56cbc6950dffd91de93009bafe51efb81eb84f", - "sha256": "18djslz177q6q33y82zmg2v6n9236a76kiqfvxdk4vbqzjbq82f7" + "commit": "278a27477a4d7032fe06bb56ab01701cb10df808", + "sha256": "15bwjl6377ngg3qwn1g8wc2wi61pcm6xlhjzj28ap5vz7y7zxps2" } }, { @@ -22841,11 +22951,11 @@ "repo": "tumashu/el2org", "unstable": { "version": [ - 20190504, - 1114 + 20200408, + 146 ], - "commit": "fbb2c5bff78564111ff1826976101555314bfc53", - "sha256": "17d85fdckbzj551j98j0hrhdj0ag8ba2kpk2ix8fmvdnssxdnvm0" + "commit": "7db77fdd73f378d4e60e34c11bbdf00677adc32c", + "sha256": "196nrg4cp57calv36if0fkc8bjiz6qzisr29ry49zmkgjlqaafq3" }, "stable": { "version": [ @@ -22991,8 +23101,8 @@ 20200316, 1956 ], - "commit": "7fa3b78d073c235ad945fc28d692c5f5fb60860a", - "sha256": "06cy6dsn3drfk0jkc10b96qzvi5rfhkjy7cib5dk2kqgg615is6d" + "commit": "c1a1b77ec0c7fff9ecf7122d10dcd16eebcd3829", + "sha256": "1gg3gxw5ks4fds7lgl9mqxyb2qjrdsdwyyc183nfz6aq0m4w91yb" }, "stable": { "version": [ @@ -23114,14 +23224,14 @@ "repo": "davidshepherd7/electric-operator", "unstable": { "version": [ - 20191005, - 1109 + 20200410, + 928 ], "deps": [ "dash" ], - "commit": "71d65e4abaef5e49a9e1b8fce706ce0296f9d5e2", - "sha256": "168ri3wahr6zjv2dvqc3jbqih2m4d0mfzp4gqw5mss000fqmx9ns" + "commit": "f8454905a147045f25ab03da7aa6406e4f20cc64", + "sha256": "1x087fry0yx5sk9vvgqv1zh7fkpgzvykl14fzns1920sxacgms68" }, "stable": { "version": [ @@ -23268,15 +23378,15 @@ "repo": "fasheng/elfeed-protocol", "unstable": { "version": [ - 20200307, - 1242 + 20200426, + 1143 ], "deps": [ "cl-lib", "elfeed" ], - "commit": "328dcf40def951ddc193f3d6ccb01cb58f9fc1cd", - "sha256": "0zqgkx6s9dcy6la62vlv4c12wx5a505pc1hhxiwhhpp93r61bh1z" + "commit": "294b0d70f2cb85d5563019343f14c64938ae4b07", + "sha256": "0bm6vn61awwa4yd97idjqbbwp3ypz11n5w9mswg5yivhg4kc82sm" }, "stable": { "version": [ @@ -23473,6 +23583,24 @@ "sha256": "09xbrk1li76fwa85kvd5xpr0zswrkh51p7a62sb8g422wpaqxiwx" } }, + { + "ename": "elisp-depmap", + "commit": "8c86ca9b1ad39282f965d36ec2a8df807cc0ebb1", + "sha256": "08qjrc3vrn18apnb856qd2m0wzza8755fbh8ly9nh58dlbjhkkd7", + "fetcher": "github", + "repo": "mtekman/elisp-depmap.el", + "unstable": { + "version": [ + 20200413, + 1215 + ], + "deps": [ + "dash" + ], + "commit": "e47616c968dd82e30cb10961452e2b46c7900163", + "sha256": "1jpqdi15lvyd48jsbndlallnjc8bkmv0mxwyf51m483vz9v8nn2i" + } + }, { "ename": "elisp-docstring-mode", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -23699,8 +23827,8 @@ "repo": "jcollard/elm-mode", "unstable": { "version": [ - 20200301, - 19 + 20200406, + 214 ], "deps": [ "dash", @@ -23708,8 +23836,8 @@ "reformatter", "s" ], - "commit": "3f042ec430e7d915bfdca21d4f4d6201a882434b", - "sha256": "16b66kv49bslnnhya2a9q0zshcwx58017sy0ab451j5zsq42v2qh" + "commit": "7782be0814b52f7c35a09b21a4839c1502a4707f", + "sha256": "0g3mxp80hfjwf3adaslwykk01w5fh5y6nwj4687wbm5dldvhr42i" }, "stable": { "version": [ @@ -24047,8 +24175,8 @@ "s", "yasnippet" ], - "commit": "fc54812f5f53889842e7e707727e50d9589443ca", - "sha256": "1jdpg6vq88kxg1wfhp9hwnvfadxazmznzscfhvr967fbgq46w6qj" + "commit": "816061cf16d53448d95612380855e7ccaf59a417", + "sha256": "0fjz3y0yh2hfmx0470jcyni1glc6m3bm5gh20iakvlwxf4wa8801" }, "stable": { "version": [ @@ -24236,15 +24364,15 @@ "repo": "wamei/elscreen-multi-term", "unstable": { "version": [ - 20151022, - 233 + 20200417, + 821 ], "deps": [ "elscreen", "multi-term" ], - "commit": "7b6048a0dd80f69460a62bbc6f1af8856141a5ea", - "sha256": "1cninrbgxzg0gykkpjx0i8pk2yc7sgr2kliqd35lgcxz2q4jlr51" + "commit": "4ea89bae0444d9d4377515929f76cb3e98140f1f", + "sha256": "0j5dpikjxwn1679ndy894g55qm9hs0n65lqyxx483h584nqxsdkg" } }, { @@ -24350,11 +24478,11 @@ "repo": "emacscollective/elx", "unstable": { "version": [ - 20191226, - 1614 + 20200422, + 1352 ], - "commit": "4cbdcd79524db4a71abbf761a3945617086f5d09", - "sha256": "1gb2sh2mcx8va8lgyc46pch9fswfm761935806myi9fl1v67ayk6" + "commit": "d5ebd8ab6439fea3dcae0bcaece6e914f4ee1f6c", + "sha256": "1h1dx6dpwr4cml2a57mz3lq4f746cja007ckrpk3vii9ap413hf8" }, "stable": { "version": [ @@ -25172,8 +25300,8 @@ "repo": "Wilfred/emacs-refactor", "unstable": { "version": [ - 20191122, - 1911 + 20200420, + 721 ], "deps": [ "cl-lib", @@ -25186,8 +25314,8 @@ "projectile", "s" ], - "commit": "8038ab88a000a835ca73af2068b1ef536bc7e33c", - "sha256": "1d27y6chxjf4k9cgsk93xjf1wq9lrv0516lpnqqlp2rdd7m3nv7y" + "commit": "a8f6ab823453decf43f0764d02e554d05009a631", + "sha256": "0d1qd9jzmh0vg1in6q1xjlwq85sgds5lfvyg2wi6z8ci5a7m3ahs" }, "stable": { "version": [ @@ -25358,25 +25486,6 @@ "sha256": "1in4wbwkxn8qfcsfjbczzk73z74w4ixlml61wk666dw0kpscgbs5" } }, - { - "ename": "envdir", - "commit": "79c1497f709f6d23e4886359e09ab0456ed61777", - "sha256": "085bfm4w7flrv8jvzdnzbdg3j5n29xfzbs1wlrr29mg9dja6s8g8", - "fetcher": "github", - "repo": "proofit404/envdir-mode", - "unstable": { - "version": [ - 20160221, - 1923 - ], - "deps": [ - "dash", - "f" - ], - "commit": "f29346c55ccf11d8c75628edc6d430ed63c36917", - "sha256": "1jyhr9gv3d0rxv5iks2g9x6xbxqv1bvf1fnih96h4pgsfxz8wrp6" - } - }, { "ename": "eopengrok", "commit": "2b87ea158a6fdbc6b4e40fd7c0f6814d135f8545", @@ -25647,14 +25756,14 @@ "repo": "atomontage/erc-crypt", "unstable": { "version": [ - 20200103, - 1329 + 20200424, + 2024 ], "deps": [ "cl-lib" ], - "commit": "26e16e0fc3af78e70b095f47995d2a368f8de61d", - "sha256": "197sj97j7mc9jwhamra4narnypdg3xpxy5rb95an5gqqzhy9bccm" + "commit": "ba36632666ea0a631d23b6fc54c16ada55673b02", + "sha256": "1q7bia9l672dfa0q4mrhv2cnxk2c8vhpl7n649zw7zwfpkqnzh70" }, "stable": { "version": [ @@ -26069,18 +26178,18 @@ 20200313, 1030 ], - "commit": "f805a35f696d965b297de3988a2340f86bfe88ba", - "sha256": "102yzbgmqyy5m74zhr8kaai17dyhg8k6w0ykxyvmb0q7ghwaq01s" + "commit": "7ec0ad6ed076b76de8cd52e28445f324a5f2853a", + "sha256": "0r0sn8vfmgamf3mnjjkkv9y0r8a6xkn5f5axw1av0liiv95kgrm8" }, "stable": { "version": [ 23, 0, -1, - 2 + 3 ], - "commit": "a24425668beed38e04039c292361e09c4826683f", - "sha256": "1i91p2hsajcwjqv10ri6jj2a94g68mb6fmxqx47g50fbc5f0dqj5" + "commit": "9f17d424ada5353db1e5b31296484d95679f8ca8", + "sha256": "0012fbf9a1whq2bzii73m645bvf4vww403fcd54j9k27916vcfx5" } }, { @@ -26870,14 +26979,14 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20200328, - 1547 + 20200419, + 1920 ], "deps": [ "julia-mode" ], - "commit": "1c2387fdba509c1c9d072150f65ccc318a570870", - "sha256": "0llsjqrvabcvpd2nhixiklwmm2lisywif77iwfrsdc6lfxp8cdd0" + "commit": "007fa4b5192154db3d90e6e861f96193c1b145f5", + "sha256": "12kj006yxl84fav2ryxx6ajk284rskgy6imi9wjpfl8qqfcykcm0" }, "stable": { "version": [ @@ -27326,16 +27435,16 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20200304, - 1421 + 20200417, + 1238 ], "deps": [ "cl-lib", "goto-chg", "undo-tree" ], - "commit": "296932406a0b55474fe4b6cb8db8b7d5e05633aa", - "sha256": "1gvmvczdfgq07chj98gqg5j2zyfdrq3znl8l6a81mbrjbvsyvmd3" + "commit": "d243eae8649272799ec3864fde14c1164f036940", + "sha256": "0fpjcxyzql7fl904asxbff3gqdc1byhwn32i38r4zd4bqrqsqfw4" }, "stable": { "version": [ @@ -27529,16 +27638,16 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20200327, - 722 + 20200426, + 848 ], "deps": [ "annalist", "cl-lib", "evil" ], - "commit": "2df9bedfa48bdc22e46bf4d43f6e2792d4cafbea", - "sha256": "17737k612gl5bhkkq8fdivk9rxbcypfl9hnm3mbp5v2wpr8chw3a" + "commit": "695e941d8ac59dc7534524e5cd27ced9490259a1", + "sha256": "0fdqxgkp0fl5862b15qxnl2njs97vznsydw5jm6hw8fq94a1crhn" }, "stable": { "version": [ @@ -27611,15 +27720,15 @@ "repo": "PythonNut/evil-easymotion", "unstable": { "version": [ - 20180114, - 654 + 20200424, + 135 ], "deps": [ "avy", "cl-lib" ], - "commit": "79c13ed3bce018ac09d358e642e5bd7025e93603", - "sha256": "0496dnbciq8gbivihas1y58gwd4nbfz767rr98zpwgkz8l2jvy73" + "commit": "f96c2ed38ddc07908db7c3c11bcd6285a3e8c2e9", + "sha256": "0xsva9bnlfwfmccm38qh3yvn4jr9za5rxqn4pwxbmhnx4rk47cch" } }, { @@ -28063,15 +28172,15 @@ "repo": "emacs-evil/evil-magit", "unstable": { "version": [ - 20200302, - 1611 + 20200409, + 1909 ], "deps": [ "evil", "magit" ], - "commit": "0b79aa33a478770865716dc0e09f95d91ec042a2", - "sha256": "0qxapq9nl1yr3ryg1q9n2ajffm308fai115mbvwmjl9sd6x2p3ly" + "commit": "253c644807013fe92429acdef418748794b8f254", + "sha256": "08mh7phxsdb9w4dfs0pmr4l4fdzzr2rm88z2s8karfi5j5ik2ag5" }, "stable": { "version": [ @@ -28131,8 +28240,8 @@ "deps": [ "evil" ], - "commit": "11d98debf8b051b10068137668eb54c2fede0e30", - "sha256": "1jppiqz1mlmz9wnxmaymg15sz6j59kghhrv95r6hkv90zwdvbqvw" + "commit": "076ace3ee22a61890f375ae492c634f71ce84301", + "sha256": "0d4xdrqa8ylh67wgyywxsh0crm06y31babc8sksrpwxlr12xyaww" }, "stable": { "version": [ @@ -28260,11 +28369,11 @@ "repo": "redguardtoo/evil-nerd-commenter", "unstable": { "version": [ - 20200324, - 2310 + 20200417, + 59 ], - "commit": "4387407615258d5e95f71bfb425cbe92dd813290", - "sha256": "0v31gbn423g20lqksvbc72z325lh0qjmgz8nhy8ygqli4b2msvzb" + "commit": "1bd2de52011c39777a3e8779b14cee2790dc873b", + "sha256": "0h8hzqjh6qq4fj0imrb5ic5m4zn3ig6s3b7b2x9r6ig9m15jpg6n" }, "stable": { "version": [ @@ -28672,15 +28781,15 @@ "repo": "hlissner/evil-snipe", "unstable": { "version": [ - 20200103, - 923 + 20200422, + 519 ], "deps": [ "cl-lib", "evil" ], - "commit": "3ec8adfd4990f95fa0fab2b7019ead3596857673", - "sha256": "0q689f52saky3rfap351n4bkjn0kpg7xkjias926affqpghywb1r" + "commit": "2ba6353bb9253dbbc4193f1d35403e7dcc1317b1", + "sha256": "1sqbwg41by88qq7npsw7w9q3zmfk5adzqpqh2m84zk6fd64mc6h2" }, "stable": { "version": [ @@ -28863,8 +28972,8 @@ "deps": [ "evil" ], - "commit": "296932406a0b55474fe4b6cb8db8b7d5e05633aa", - "sha256": "1gvmvczdfgq07chj98gqg5j2zyfdrq3znl8l6a81mbrjbvsyvmd3" + "commit": "d243eae8649272799ec3864fde14c1164f036940", + "sha256": "0fpjcxyzql7fl904asxbff3gqdc1byhwn32i38r4zd4bqrqsqfw4" }, "stable": { "version": [ @@ -29617,11 +29726,11 @@ "repo": "extemporelang/extempore-emacs-mode", "unstable": { "version": [ - 20200312, - 224 + 20200408, + 2253 ], - "commit": "9f370d6cba7f115896579b634c7550923503a4ab", - "sha256": "11qm9f850zm8l26q75j9mlbl5ydiyw7alan47h4nyfihpl4498qz" + "commit": "09518ae6650d7be33a4633a4c0f31b7130d04c6e", + "sha256": "0hfza9lzdsz94gxhmzyp9fwviscv19rmnjgd0q613faayn11sjsp" } }, { @@ -30549,11 +30658,11 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20200206, - 2001 + 20200405, + 1935 ], - "commit": "c02f4a9ed1b9c26f9cfc3237906c2844f5937622", - "sha256": "1bcdicgp3wlxpdzardx1ry9js192dy26q8af6pdlvrnxqvdl2asm" + "commit": "7fadf2580c3afcae3f6ebc54dad0e519b7600f1d", + "sha256": "1qpfpfdm2d8bdqm7h62y3hgbip67yqmblhg66zlmfxfdnsad5ls6" } }, { @@ -30635,16 +30744,16 @@ }, { "ename": "figlet", - "commit": "5b7972602399f9df9139cff177e38653bb0f43ed", - "sha256": "1m7hw56awdbvgzdnjysb3wqkhkjqy68jxsxh9f7fx266wjqhp6yj", - "fetcher": "bitbucket", + "commit": "caca0b2bc2aaac563074cbb4ea4296fce749e203", + "sha256": "0p5xnq3c4bvvy7nqgi18ylsha7kz9r7apw7lz84kq5hwhni298k5", + "fetcher": "github", "repo": "jpkotta/figlet", "unstable": { "version": [ 20160218, 2237 ], - "commit": "70ca269d706eedd34838fe2435073c6860be470b", + "commit": "19a38783a90e151faf047ff233a21a729db0cea9", "sha256": "1c18b1h154sdxkksqwk8snyk8n43bwzgavi75l8mnz8dnl1ciaxs" } }, @@ -30959,11 +31068,11 @@ "repo": "jming422/fira-code-mode", "unstable": { "version": [ - 20200316, - 1708 + 20200415, + 2356 ], - "commit": "64c4e655ea6ef29c7e720a5bf9281e865f2e3fa7", - "sha256": "0c11lfwdibx35wwvpq3vl4img4rz2slslqhlqaqbab212ii9jsmy" + "commit": "a61d7fce35eadba39236a6a3e9aa301e161d147b", + "sha256": "1bn81qwkvhznc5pi6bq08kp83208pj09vknfszx152r72sv5fpmz" } }, { @@ -31022,20 +31131,20 @@ "repo": "johanvts/emacs-fireplace", "unstable": { "version": [ - 20181211, - 1927 + 20200402, + 2206 ], - "commit": "571ffa7dd0ce46edca838df74d055aaa83da4d78", - "sha256": "1iw17rkihsn50p3zljag82v09zyav8bzgfn6mfa267fkf4f1fgjy" + "commit": "f6c23e259349922aae25cf2898ba815a7d8f2527", + "sha256": "16cb8grw2cfgdix1sr5a3fnwhhc93ci8qgbhgs5ilyayy2cb6s4c" }, "stable": { "version": [ 1, - 1, - 2 + 2, + 0 ], - "commit": "2b966ed65b714c613f79e9144d004dfa3b28f1ed", - "sha256": "1f5053bbvjdmm64zv6r2qkswkpwvx0s3qz4bwm9zya583a6g0nv8" + "commit": "f6c23e259349922aae25cf2898ba815a7d8f2527", + "sha256": "16cb8grw2cfgdix1sr5a3fnwhhc93ci8qgbhgs5ilyayy2cb6s4c" } }, { @@ -31325,6 +31434,21 @@ "sha256": "0z77lm6jv2w5z551pwarcx6xg9kx8fgms9dlskngfvnzbqkldj1f" } }, + { + "ename": "flatfluc-theme", + "commit": "de15ce71674965c5e0a8564ae2e640bc05dbd589", + "sha256": "0rpmiw71scdl3dgrvf2j9d909wmafyvlgraxfg5hsxngcyj5gjk0", + "fetcher": "github", + "repo": "seblemaguer/flatfluc-theme", + "unstable": { + "version": [ + 20200419, + 1033 + ], + "commit": "42f93b2ffb651901d6bad7eb5587790298dda371", + "sha256": "035zm6dh416jk1ipg35qnkr8cbfsjkb92dhc4ryay4p30rp1yljz" + } + }, { "ename": "flatland-black-theme", "commit": "641d1959bd31598fcdacd39a3d1bb077dcccfa5c", @@ -31442,16 +31566,16 @@ }, { "ename": "flex-isearch", - "commit": "5b7972602399f9df9139cff177e38653bb0f43ed", - "sha256": "1msgrimi2a0xm5h23p78jflh00bl5bx44xpc3sc9pspznjv1d0k3", - "fetcher": "bitbucket", + "commit": "caca0b2bc2aaac563074cbb4ea4296fce749e203", + "sha256": "0y5j90y4ssw3kwqhji9h4icy8xj2pa5fjvkbkl4x7rxs8kwwm989", + "fetcher": "github", "repo": "jpkotta/flex-isearch", "unstable": { "version": [ 20170308, 2010 ], - "commit": "8b934ea6f1e4324088f055454a2e8b714961854a", + "commit": "b1f7e04de762282c276343cc2709af9ff4abc9d2", "sha256": "0xbwrzkfv4i91qxs80p0pfjlvj5pyigvidby8m5lammm8idwx9dh" } }, @@ -31481,14 +31605,11 @@ "repo": "IvanMalison/flimenu", "unstable": { "version": [ - 20170418, - 147 - ], - "deps": [ - "dash" + 20200415, + 2353 ], - "commit": "9351201d89b05cbdaec312a6ebd7fd10c38d6112", - "sha256": "1qb08j66a9mvybqhc2vyywwn16w3kkjb06k50rfqf6sbcmndz8va" + "commit": "f110bc77415a7594742f3b12551571c4069c9157", + "sha256": "1y832w4n10k9lfi90lhq8l9s56zcg24j9j8jklkzby1vf34vq0ql" } }, { @@ -31633,11 +31754,11 @@ "repo": "amake/flutter.el", "unstable": { "version": [ - 20200226, - 640 + 20200416, + 1225 ], - "commit": "ec92a4df842ad7e5bd8f60a648ffe7b004abb09d", - "sha256": "1l7nd01p5p9l2a4k2rl61vjs337sagx4m3qr4isvhvy2bk2cppmy" + "commit": "293b7225b9bacbad4bf14d43d20a765f4862c563", + "sha256": "0acn2bdqcvj1m6plm304adgw6ndycv04qh6asgbgdwlz1admzjga" } }, { @@ -31655,8 +31776,8 @@ "flutter", "flycheck" ], - "commit": "ec92a4df842ad7e5bd8f60a648ffe7b004abb09d", - "sha256": "1l7nd01p5p9l2a4k2rl61vjs337sagx4m3qr4isvhvy2bk2cppmy" + "commit": "293b7225b9bacbad4bf14d43d20a765f4862c563", + "sha256": "0acn2bdqcvj1m6plm304adgw6ndycv04qh6asgbgdwlz1admzjga" } }, { @@ -31766,8 +31887,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20200329, - 2344 + 20200425, + 1426 ], "deps": [ "dash", @@ -31775,8 +31896,8 @@ "pkg-info", "seq" ], - "commit": "1751a4e9f8f6f20706a1620429422f101eabcd38", - "sha256": "10w9fgcwyni5iid7sfzrza155wrh481gdylwrwa7v640a9jmbyls" + "commit": "c8218044c849f21cc628b6c077e41c690f046bc0", + "sha256": "11n3h7x9nszqljd0awi6jzrhrkac7sdyrwvb94bikrj1d7yin25g" }, "stable": { "version": [ @@ -32053,14 +32174,14 @@ "repo": "borkdude/flycheck-clj-kondo", "unstable": { "version": [ - 20190619, - 1743 + 20200414, + 1444 ], "deps": [ "flycheck" ], - "commit": "f652a8dc4cff01e78bba50b555bae7ba6115b552", - "sha256": "09k87wfz4m16r32g6ry4jl2zagh1gpgfd9sik54wvyky24s605y4" + "commit": "5472c26ffdf754a0661357564874ffd4f8598805", + "sha256": "0nb88mil1nlhv0nalswl3xwndzz91yah52zpri2jfbyvivshpfm4" }, "stable": { "version": [ @@ -32491,8 +32612,8 @@ "let-alist", "seq" ], - "commit": "debd0af563cb6c2944367a691c7fa3021d9378c1", - "sha256": "1vl0lss2n50pz5wscqj6vhjwb4hbg8xx2chh5vafsrnn0a3fryrd" + "commit": "1b60050efd4729bfba548f3e5adbcb58436667cb", + "sha256": "1kjms9d2c98ffd1qxs879qhg0n4jzic0r5kni9y4gz3v09ww8zms" } }, { @@ -32637,20 +32758,20 @@ }, { "ename": "flycheck-grammalecte", - "commit": "fdd82aa0568d998a3d176b5ee47b8a227438ea09", - "sha256": "0xqg995a42cl6mvmpi68ay56fgs636cbzg65q5si5yc1yzgl74nv", + "commit": "ddaffa55c1b99cce9097c019efe9a236e2f5a395", + "sha256": "1fblc6mvj9n676ci8597as3rnwh6hmbh2hfwr92gi1dd8ibnd2pn", "fetcher": "git", "url": "https://git.deparis.io/flycheck-grammalecte/", "unstable": { "version": [ - 20200308, - 1452 + 20200416, + 1620 ], "deps": [ "flycheck" ], - "commit": "ca4b87d22474d3337db72e19f88105f557f44867", - "sha256": "0wj81xfy3wlgdlnhhyhz5lfkl6sfb2ajwb6s8f2y4bcvqa8gz3qj" + "commit": "d99833992eb874cbbd25e991e3037642e125bb59", + "sha256": "07ph5kk9zb375nkdqryzpfzqn9rr89minf2jgyzlnv58fzqiwpjp" }, "stable": { "version": [ @@ -32805,14 +32926,26 @@ "repo": "gexplorer/flycheck-indicator", "unstable": { "version": [ - 20190729, - 1501 + 20200331, + 1142 ], "deps": [ "flycheck" ], - "commit": "6b1386296ddf2ccc11ca8fa719dc0b2f16808424", - "sha256": "0bd8k3jzipm0r0242hpl2lkcdfnb367yf4xpj6r23g3y99f6f0yk" + "commit": "e00d9a20cbc21d6814c27cc9206296da394478e8", + "sha256": "0y3dzamm7xcac9fcgx88z48l6nkgmz5lx0a6lnxxywkh0h1y2kqn" + }, + "stable": { + "version": [ + 1, + 1, + 1 + ], + "deps": [ + "flycheck" + ], + "commit": "e00d9a20cbc21d6814c27cc9206296da394478e8", + "sha256": "0y3dzamm7xcac9fcgx88z48l6nkgmz5lx0a6lnxxywkh0h1y2kqn" } }, { @@ -32920,26 +33053,26 @@ "repo": "candid82/flycheck-joker", "unstable": { "version": [ - 20180913, - 504 + 20200412, + 2346 ], "deps": [ "flycheck" ], - "commit": "51e99e697761ee8dab863930910abdba7607c1bd", - "sha256": "07pxfvnrgp7f3rb27j1zrq04pncvga4291krqqy3dzwazsjplz48" + "commit": "93576295fef7a749bf779eeece5edd85e21868e2", + "sha256": "1hz5nlrhbrlwwk8rcjvc3jhj0g9wgm6xw903ap8fxq470mj99gln" }, "stable": { "version": [ 1, - 3, + 5, 0 ], "deps": [ "flycheck" ], - "commit": "51e99e697761ee8dab863930910abdba7607c1bd", - "sha256": "07pxfvnrgp7f3rb27j1zrq04pncvga4291krqqy3dzwazsjplz48" + "commit": "93576295fef7a749bf779eeece5edd85e21868e2", + "sha256": "1hz5nlrhbrlwwk8rcjvc3jhj0g9wgm6xw903ap8fxq470mj99gln" } }, { @@ -33162,8 +33295,8 @@ "deps": [ "flycheck" ], - "commit": "12a77ee8ee3f6e774365f63be3cd5aede6462dd5", - "sha256": "187v8877wh247j26d5h2qcnc8i3fmqgyzfvjjjlw9sswqgrln6m7" + "commit": "5b4e14ab0cbce2ff35fee7e69b5b95eafd609c80", + "sha256": "1cx1rm40ns3y5bdbk8hfycdaq16p4zxkjjss02xs6hl96yvc4kaj" } }, { @@ -33374,28 +33507,28 @@ "repo": "emacs-php/phpstan.el", "unstable": { "version": [ - 20200122, - 1256 + 20200411, + 531 ], "deps": [ "flycheck", "phpstan" ], - "commit": "a1c30ca634107551c20c846b5316ca5697adb06d", - "sha256": "0b7rnzk1zkrzh978bmh2dsy78f0sb4ia1w06khyqiby52m27q9k1" + "commit": "2f715a186c5fe6576de83d4c0b64a37e2bfce101", + "sha256": "03ix2s068pzmybj0fcb08dlfgdqw0pmqhbdf4id2077f67bfad0w" }, "stable": { "version": [ 0, - 3, - 3 + 5, + 0 ], "deps": [ "flycheck", "phpstan" ], - "commit": "535e172e1c561bc7b8c706b4e03bbf71689bd83a", - "sha256": "1hn1rdgymv81rm8nkibnc5jazgjrx3sz4w1lin85rgypzbfaf6wk" + "commit": "bf9e82a63f2ccb12af02c9e79a83e7989eeb7cb1", + "sha256": "15kv5xv6lcfgf048wr2zsnpvrplbxypy3wq56zvrzbq18hwprqg1" } }, { @@ -33406,16 +33539,16 @@ "repo": "Wilfred/flycheck-pkg-config", "unstable": { "version": [ - 20180430, - 2243 + 20200409, + 501 ], "deps": [ "dash", "flycheck", "s" ], - "commit": "e72e4c1b8153611ed82695673af84096f4d52795", - "sha256": "07zyrbib9qzy4kj3p7kljcfi53qhb28nf0sjhhkqzdj09iv2k9wf" + "commit": "b76b24ea1f4800f5fb96ce9c6c4788e0e63133d3", + "sha256": "01wzzrpfgh3z28qsynxvkfm92xy98vyvkkv31qh53kxxdicnzlh0" } }, { @@ -33575,14 +33708,14 @@ "repo": "msherry/flycheck-pycheckers", "unstable": { "version": [ - 20200206, - 2158 + 20200414, + 1901 ], "deps": [ "flycheck" ], - "commit": "c5349c0fb3b719469b7e66dbdfbe58d0813f6a74", - "sha256": "02886xggdb09880jp57cah3fmf1nm77gvb0aaws8j4abl278g7x5" + "commit": "467f9b94d9eecc8a8027cf204d304e258f72edaa", + "sha256": "03yiva5lmbfawdjjfsmqlqgvrdgfni1gh1qbdpma5gqhckz5j0d7" }, "stable": { "version": [ @@ -33679,8 +33812,8 @@ "flycheck", "rtags" ], - "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5", - "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x" + "commit": "a42298e80dffae9a6b2e9816506174542f3cbbb7", + "sha256": "1674752bbyb7890na5p846dxcvh83zn0a6z19wras1x5c59s24i3" }, "stable": { "version": [ @@ -34778,6 +34911,36 @@ "sha256": "1z6m3bggd3gmxvx92j16jmqm5h9jjxnmsd7adyf12ziy5n5rqcbc" } }, + { + "ename": "flymake-phpstan", + "commit": "bc0ea837b6813002826d861acb7f3cc506c337ba", + "sha256": "0fg2skkzd9xn42a5jdxg69bjg0jw26p5jrq6i5v815vgisxfgjbv", + "fetcher": "github", + "repo": "emacs-php/phpstan.el", + "unstable": { + "version": [ + 20200415, + 1637 + ], + "deps": [ + "phpstan" + ], + "commit": "2f715a186c5fe6576de83d4c0b64a37e2bfce101", + "sha256": "03ix2s068pzmybj0fcb08dlfgdqw0pmqhbdf4id2077f67bfad0w" + }, + "stable": { + "version": [ + 0, + 5, + 0 + ], + "deps": [ + "phpstan" + ], + "commit": "bf9e82a63f2ccb12af02c9e79a83e7989eeb7cb1", + "sha256": "15kv5xv6lcfgf048wr2zsnpvrplbxypy3wq56zvrzbq18hwprqg1" + } + }, { "ename": "flymake-puppet", "commit": "302dbe34e7949da9c65e9c7bf2ab924db91b968f", @@ -34980,8 +35143,8 @@ 20200329, 2005 ], - "commit": "bb413006afc23105a0f84df6fb82504a06483a55", - "sha256": "09cqn0255pxim34v5zfypbzr4clfd2ajlsyxpc9h64wg6v9876y5" + "commit": "78956f0e5bb9c4d35989657a55929e8e3f5691e6", + "sha256": "068mx5p4drwgppy4ry1rfq6qi79w6d82b4rnpl2jm37grsg94lix" } }, { @@ -35097,8 +35260,8 @@ 20200215, 1408 ], - "commit": "e765d1a3d9621decd478aa3fd08b53425da93a87", - "sha256": "195id7zscwbhmgv5jhcrvr65y4rwszdr4qz8l6w5bz5zxik2mxwp" + "commit": "fd8ac7a4f922ce5ea1cc5d4583a7d584847cb6b5", + "sha256": "1z7gcppp8nv4zm6giqwahc1svw1fa2ynjy5y3230dwcfn98m73c3" }, "stable": { "version": [ @@ -35125,8 +35288,8 @@ "avy-menu", "flyspell-correct" ], - "commit": "e765d1a3d9621decd478aa3fd08b53425da93a87", - "sha256": "195id7zscwbhmgv5jhcrvr65y4rwszdr4qz8l6w5bz5zxik2mxwp" + "commit": "fd8ac7a4f922ce5ea1cc5d4583a7d584847cb6b5", + "sha256": "1z7gcppp8nv4zm6giqwahc1svw1fa2ynjy5y3230dwcfn98m73c3" }, "stable": { "version": [ @@ -35157,8 +35320,8 @@ "flyspell-correct", "helm" ], - "commit": "e765d1a3d9621decd478aa3fd08b53425da93a87", - "sha256": "195id7zscwbhmgv5jhcrvr65y4rwszdr4qz8l6w5bz5zxik2mxwp" + "commit": "fd8ac7a4f922ce5ea1cc5d4583a7d584847cb6b5", + "sha256": "1z7gcppp8nv4zm6giqwahc1svw1fa2ynjy5y3230dwcfn98m73c3" }, "stable": { "version": [ @@ -35189,8 +35352,8 @@ "flyspell-correct", "ivy" ], - "commit": "e765d1a3d9621decd478aa3fd08b53425da93a87", - "sha256": "195id7zscwbhmgv5jhcrvr65y4rwszdr4qz8l6w5bz5zxik2mxwp" + "commit": "fd8ac7a4f922ce5ea1cc5d4583a7d584847cb6b5", + "sha256": "1z7gcppp8nv4zm6giqwahc1svw1fa2ynjy5y3230dwcfn98m73c3" }, "stable": { "version": [ @@ -35221,8 +35384,8 @@ "flyspell-correct", "popup" ], - "commit": "e765d1a3d9621decd478aa3fd08b53425da93a87", - "sha256": "195id7zscwbhmgv5jhcrvr65y4rwszdr4qz8l6w5bz5zxik2mxwp" + "commit": "fd8ac7a4f922ce5ea1cc5d4583a7d584847cb6b5", + "sha256": "1z7gcppp8nv4zm6giqwahc1svw1fa2ynjy5y3230dwcfn98m73c3" }, "stable": { "version": [ @@ -35505,8 +35668,8 @@ 20200321, 533 ], - "commit": "1a54066611da213626ab69ea426ba3c63ece3438", - "sha256": "1c7n099b8dkrcrvxsva7da1m1z01p0acbyj271lix9w331h9gbf6" + "commit": "9f82d31f9f0fb06bbc2ce18e21e79d1eabbe6c5e", + "sha256": "0b6g36frvp1i92qn8rv3dcm8sxiw5yvbvhl7j58x2xwvawn79nfd" } }, { @@ -35710,8 +35873,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20200309, - 937 + 20200425, + 2225 ], "deps": [ "closql", @@ -35723,8 +35886,8 @@ "markdown-mode", "transient" ], - "commit": "2e2d26cf428012f0ece53a81cde02179e72648aa", - "sha256": "0mpim6699cda3ds8gv1f2y021gssjrw9rg7w9b8h1ifhrl54x0qn" + "commit": "e2da80660a0550f613400ce3b238025589800417", + "sha256": "0m80w0qh6icj365pcg9d0kb2nvmv48c3874wy15mjcilzb6i97av" }, "stable": { "version": [ @@ -35758,8 +35921,8 @@ 20160102, 2253 ], - "commit": "799ca3e72b20a59a755a094b8cead57f654f3170", - "sha256": "0nj056x87gcpdqkgx3li5syp6wbj58a1mw2aqa48zflbqwyvs03i" + "commit": "15bbcb2d2df21910af3b9686b671e0c7d1c93b26", + "sha256": "1vfnpm6kp4xf3qc73i41rg73bhbym1sd4z6jam4k1f44iny0zqxz" }, "stable": { "version": [ @@ -35779,15 +35942,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20200219, - 1628 + 20200422, + 1731 ], "deps": [ "cl-lib", "language-id" ], - "commit": "8c8c47a863a397d947999fff4358caf20bafca0a", - "sha256": "0ayb57p114z64ppf74g2wpm2g2iga2vrl8rhay7fnfv1j2i4xjss" + "commit": "c157b57e963da0b44a079b0477d6c742e9c5a10b", + "sha256": "15pqff80ydcvkvbiyi50aix5mnwgrhvvajk60i6cwgkb2xghs20r" }, "stable": { "version": [ @@ -35924,26 +36087,26 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20200312, - 1315 + 20200416, + 841 ], "deps": [ "seq" ], - "commit": "92fdd9c8a5e405cd77ee6f338351b9ebc8976038", - "sha256": "0wa28wdd3kgxwaaiay0mha4w87x2p8z01vfn93y1256awx8kgg78" + "commit": "5998d977ca84930e124558007dc65370164ed960", + "sha256": "1hmc3pacscr0f02cw6hbbv444k07k5gf1909lyz8jpfr5r5wi2in" }, "stable": { "version": [ 3, - 0, - 3 + 1, + 0 ], "deps": [ "seq" ], - "commit": "974c9df2c73cf52030dfe0c771d97d3d37bd08e4", - "sha256": "0103rnq9x07a11930jgcg04ayd7npri9wd2j2ghr510y7sm86p0d" + "commit": "9027c6f2b2a2d7d64501e55ff3531cdef26c463d", + "sha256": "08giwg0jwk8zzj2i4cm08322qr6znrnv9a49za7c6j47bykpwj6s" } }, { @@ -36210,20 +36373,50 @@ "repo": "rnkn/freeze-it", "unstable": { "version": [ - 20200322, - 700 + 20200416, + 1605 ], - "commit": "0e2ddd99dc1211800d55e874c1bd078f879e0d9c", - "sha256": "08jdlwn8da8cgkpwpx8834rhx8is5iigq0cv3abbydmz5lrd72nl" + "commit": "b93af18633bc783c2cb8443808aeeaaca33e1146", + "sha256": "0gljal6hmchx5zyd268kwlqn8pqq206y8a89ff7kq6qaql88mngn" + }, + "stable": { + "version": [ + 0, + 2, + 1 + ], + "commit": "b93af18633bc783c2cb8443808aeeaaca33e1146", + "sha256": "0gljal6hmchx5zyd268kwlqn8pqq206y8a89ff7kq6qaql88mngn" + } + }, + { + "ename": "friendly-tramp-path", + "commit": "cb18ad238792570e5ef825a101059bfdc293949f", + "sha256": "120g9w1l4i544km5d1jx5g4vsfb92lizn7ibxl767zffgahqhbdf", + "fetcher": "github", + "repo": "p3r7/friendly-tramp-path", + "unstable": { + "version": [ + 20200419, + 851 + ], + "deps": [ + "cl-lib" + ], + "commit": "ce7d15dd96300d376d483d685aa4a34357da8d6a", + "sha256": "01v311c8w86s954adl1ncmbhmk07acm8pnak70gn93dpz77vl9g4" }, "stable": { "version": [ 0, 1, - 2 + 0 + ], + "deps": [ + "cl-lib" ], - "commit": "cf53f31e4f266b7f0b12e091de074e763c7d565b", - "sha256": "0drznbwci4swfxmmdvkm14qmpb9y9pykyflhh69l5fdxiigpdlb8" + "commit": "be2714118876c592fae199aaa877c49475b6176a", + "sha256": "1z1rcm8pc8p2d7zzf02nms6cz2ik8y1b95a58lqxlp8n75rz4c5i" } }, { @@ -36349,8 +36542,8 @@ "repo": "FStarLang/fstar-mode.el", "unstable": { "version": [ - 20200305, - 1654 + 20200424, + 2235 ], "deps": [ "company", @@ -36360,8 +36553,8 @@ "quick-peek", "yasnippet" ], - "commit": "aaaf2568881d3e5e08f8cbd04a9add49912552ad", - "sha256": "1wqbfz8sbvfl7v31a1i6mc6c8p5fyp8yflj87lavpk1d0h5dl8ly" + "commit": "d8b586518f32d4acde049852d81902670d1ee277", + "sha256": "0av315lf58nwgvix100bj279mq2pm175vwc5dip19gn73bq4d9vi" }, "stable": { "version": [ @@ -36391,8 +36584,8 @@ "deps": [ "cl-lib" ], - "commit": "2d85dafa9872fa34b463f6473e61a1ed71c17788", - "sha256": "0zwrlvp2i0n4imba84cc0hsivyaxv4sy98bsqfwpy65xm94h0d96" + "commit": "298bbddeb1dcc135c075d484f283f409f0d0d055", + "sha256": "199a1gs7ja9l3bc2sw9cwv9jv0zvqqaa2pp6hibbyl00rsk2xs58" }, "stable": { "version": [ @@ -36545,14 +36738,14 @@ "repo": "diku-dk/futhark-mode", "unstable": { "version": [ - 20200123, - 931 + 20200415, + 1228 ], "deps": [ "cl-lib" ], - "commit": "ca22b1e5fe46125b968c3da46e0bc9780b32e346", - "sha256": "1zkqlacxmiwprx8xbnp6phf3gh3faxghxv0j90019k0g3dq9l3ws" + "commit": "2befd490ce7d78a43d001b4bb0bd4300d086d645", + "sha256": "0p4ii7mbspx1fsmzx9n8z2siq9n8ixpisxs388ndd2ccp7x3k6nm" } }, { @@ -36821,11 +37014,11 @@ "repo": "koral/gcmh", "unstable": { "version": [ - 20200315, - 950 + 20200409, + 1456 ], - "commit": "9e241e0a9f921b04407050a0f0fada3d0c3b254a", - "sha256": "0k2qwkj0lacdb5kmvx2ip17wn7bg01y5166bi9lk9zzk3jbh70d3" + "commit": "b1bde5089169a74f62033d027e06e98cbeedd43f", + "sha256": "0k0gh1dr3hipg73mpgkw6hlg27c7c5r8aa61p4vj2rpmf6k90pc5" } }, { @@ -36836,20 +37029,20 @@ "repo": "GDQuest/emacs-gdscript-mode", "unstable": { "version": [ - 20200328, - 1820 + 20200404, + 112 ], - "commit": "56a864ecff99ae314b838b755cf26af66f4f9323", - "sha256": "0mlvvagdr2bj13ibms1vq8p9zp10ag4qhyfklkj93lg6j744qav4" + "commit": "9a74dd3b6cfe73dd7510faf26ee7bc14e3c7dbc6", + "sha256": "1rrwhb6ak0gajcci4kk7fdyfm0c5wfhj6zys9f4m5xjya9pb3wb4" }, "stable": { "version": [ 1, - 0, - 2 + 1, + 0 ], - "commit": "361439f28bd10649c9f58f1d3290b4ee63ee4f54", - "sha256": "1ymblv04as076yfi3inmc3s66j0nqslqvfx34s3da6s8g8zi0ash" + "commit": "86577f81dc2640d5388565d0430b4df241bdd38e", + "sha256": "0cpfdbza3gh1s6y5igs51b1m7g7dfa7jszjfawz3v2g49p4a5m2d" } }, { @@ -36937,11 +37130,11 @@ "repo": "jaor/geiser", "unstable": { "version": [ - 20200327, - 2213 + 20200419, + 2111 ], - "commit": "9b45785173dc61a2897b17edf27df9407d1d94ce", - "sha256": "0r21fs262jzzpilynnlnqc9bd42fbq7hn522dfnx93jjmni35kjc" + "commit": "07912e512a7bf1507d0dd5ba3774b684c5ac3287", + "sha256": "0w2rhk04x4wqcx6brfacqx3r7whyzdnbgwzfgmba0xsrpb2x7rpz" }, "stable": { "version": [ @@ -36961,14 +37154,14 @@ "repo": "noctuid/general.el", "unstable": { "version": [ - 20200320, - 2340 + 20200425, + 1425 ], "deps": [ "cl-lib" ], - "commit": "14ad4c888b34eb8ebd946d26917aaf2dd4fcce29", - "sha256": "09hp8aavimlhasnxl5z74pk6afvjpcpd6fpv7j2amdmyhbflxv9h" + "commit": "42e38034cd2305fa7432866323c923979d8f9b06", + "sha256": "0aalp4x5gp0yhv037ymspsj4n3vqzxld0c1nk8ihl50k6krl4kxy" } }, { @@ -37384,15 +37577,15 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20200309, - 936 + 20200425, + 2233 ], "deps": [ "let-alist", "treepy" ], - "commit": "a8bf337534ec583906db77a3d56f7d1b84bda952", - "sha256": "0cpbz79k6q5ang47qw4j3i99qz093xc40k8lsc9j21g07fihxiv5" + "commit": "03d2546614619f42ac2983e79d0069ca4cbcfbfc", + "sha256": "0j0j86cbv87i2wfcvcyjb53wdzd003770krlnpx0gjkq036vvkwk" }, "stable": { "version": [ @@ -37668,15 +37861,15 @@ "repo": "walseb/git-backup-ivy", "unstable": { "version": [ - 20191224, - 1254 + 20200424, + 1049 ], "deps": [ "git-backup", "ivy" ], - "commit": "0a6226c37b63660e6b246bc9bbcf919e44270a99", - "sha256": "081dfbxs417zv2dds4i16ak6dri41cfn012sbfmalp8qslpclb6z" + "commit": "d9361c9ad903e0d58f25ccebad99d9a753f1937a", + "sha256": "0jkkajv0scbp91al18fqqyvvcda2z6wkkbz0p1rcwzap5g96b7ag" } }, { @@ -37743,8 +37936,8 @@ "transient", "with-editor" ], - "commit": "236c44518d30c43c7035be32f02ba615d148b5ef", - "sha256": "0fbcx8qfymvd1i96a21gzsd4882qz6xlgccvba0dam8h9aninqf6" + "commit": "8de6ecf5c5c840f8a964c3e5bd4d7a1aedf04e10", + "sha256": "0fwaasr7g4qj9l8dxcy1228p2rpb2xy16w2g27gqdzyd6a5sc2jw" }, "stable": { "version": [ @@ -38015,11 +38208,11 @@ "repo": "sshaw/git-link", "unstable": { "version": [ - 20191119, - 1420 + 20200331, + 2329 ], - "commit": "2fb0e4be8801e7d53e02fc7f14ec0f9a14586ba2", - "sha256": "1y5qw5iyblj14zjvw4is51qyvmy2z0f0iba7cqr628zn9q1fqll6" + "commit": "7142ec898f0cb97aa5d1a68da7957b4710bbfa87", + "sha256": "0xcgzhlxd7ycfxmbgkwm04pdfjysygkka3jis4p45zy6mrackn4c" }, "stable": { "version": [ @@ -38811,11 +39004,11 @@ "repo": "jimhourihan/glsl-mode", "unstable": { "version": [ - 20191017, - 2148 + 20200420, + 1839 ], - "commit": "43d906688a8e2fe650005806eb69bea131d9321a", - "sha256": "1783gimn1adfgs2xybz15nrx8wsz1xb4xk8mxrc18hyci7fwk04r" + "commit": "9bf168017eb3af7a396165a79a7b870572d59666", + "sha256": "13k4am1bk20b6pncg145g4p9abw42ksgaj0zq2bz7b4b8pnfdzp0" } }, { @@ -39272,8 +39465,8 @@ "deps": [ "auto-complete" ], - "commit": "939b4a677f2f843ea13d9dd90206d57111f0ceb9", - "sha256": "1yfw8y6czkqgxpyfdxwvkcrsmwbca7l0lr4jqmnpmm5m5rylcwr9" + "commit": "4acdcbdea79de6b3dee1c637eca5cbea0fdbe37c", + "sha256": "0i1hc089gb6a4mcgg56vn5l0q96wrlza2n08l4349s3dc2j559fb" }, "stable": { "version": [ @@ -39517,8 +39710,8 @@ "cl-lib", "go-mode" ], - "commit": "85a20dac6cee1e4bcfff554a665bcb7cd21dc0d9", - "sha256": "09xivjss1vlpqyp8cbv6652sgy3rxp00ml7f76prx22cwfpq67db" + "commit": "734d5232455ffde088021ea5908849ac570e890f", + "sha256": "0228l3s3afmvm4cy3vwcpz3g2gkmyhqdq2kwwn1n5dsha8fzbdps" }, "stable": { "version": [ @@ -39610,11 +39803,11 @@ "repo": "dominikh/go-mode.el", "unstable": { "version": [ - 20200309, - 303 + 20200425, + 1740 ], - "commit": "85a20dac6cee1e4bcfff554a665bcb7cd21dc0d9", - "sha256": "09xivjss1vlpqyp8cbv6652sgy3rxp00ml7f76prx22cwfpq67db" + "commit": "734d5232455ffde088021ea5908849ac570e890f", + "sha256": "0228l3s3afmvm4cy3vwcpz3g2gkmyhqdq2kwwn1n5dsha8fzbdps" }, "stable": { "version": [ @@ -39718,8 +39911,8 @@ "deps": [ "go-mode" ], - "commit": "85a20dac6cee1e4bcfff554a665bcb7cd21dc0d9", - "sha256": "09xivjss1vlpqyp8cbv6652sgy3rxp00ml7f76prx22cwfpq67db" + "commit": "734d5232455ffde088021ea5908849ac570e890f", + "sha256": "0228l3s3afmvm4cy3vwcpz3g2gkmyhqdq2kwwn1n5dsha8fzbdps" }, "stable": { "version": [ @@ -39850,20 +40043,20 @@ "repo": "emacsorphanage/god-mode", "unstable": { "version": [ - 20200329, - 209 + 20200413, + 2144 ], - "commit": "b82ce18ae4db2078c03d92946e21808c1f325f15", - "sha256": "1a490s5s8884rhb35gw4dxdzk2djvdiw4zsp9866sfrwh7xcama4" + "commit": "1eb6ef3a4f67a805c5d6deb1e3895b6c853707d7", + "sha256": "0kqw6w72prhxbqvxccbrc80q82yfif0y99nfgqd60rfk9mpl369k" }, "stable": { "version": [ 2, 16, - 0 + 2 ], - "commit": "b82ce18ae4db2078c03d92946e21808c1f325f15", - "sha256": "1a490s5s8884rhb35gw4dxdzk2djvdiw4zsp9866sfrwh7xcama4" + "commit": "1eb6ef3a4f67a805c5d6deb1e3895b6c853707d7", + "sha256": "0kqw6w72prhxbqvxccbrc80q82yfif0y99nfgqd60rfk9mpl369k" } }, { @@ -39939,11 +40132,11 @@ "repo": "jixiuf/golden-ratio-scroll-screen", "unstable": { "version": [ - 20170224, - 229 + 20200419, + 451 ], - "commit": "44e947194d3e5cbe0fd2f3c4886a4e6e1a0c0791", - "sha256": "1wd19jskpp9w0lrg0ky3hvnliq9l09kmxy59hdp06hsdmvr31jwv" + "commit": "1b6ff0e3e8822423335d3f7d88c1fcb4cf43ce42", + "sha256": "0kniznqdbaim9llf76zi0cbwpa21xcf07w970hrspffjpzkcadnv" } }, { @@ -40038,8 +40231,8 @@ 20180130, 1736 ], - "commit": "305ac8725a166ed42e3f5dd3f80d6de2cf840ef1", - "sha256": "05znbhy98pyc6r7dii8drw4p8vy6f5b3zk0hmlw8w73vcwia59ay" + "commit": "43f20c361143beba2e0f3f737597f2f1f8725160", + "sha256": "0md3y2vr113sdgyf5q692fzif10bl0is96ly2hfgh6z27awb76l6" } }, { @@ -40401,8 +40594,8 @@ "magit-popup", "s" ], - "commit": "a01612b9850519603bfef116bd7bddd9c8e3b975", - "sha256": "0kbnhm6m7sf1j63yykrn4p7ykkjvvair3x95wi4b59icc6ydvwv7" + "commit": "3decde69e9aa0bcc8a831e3f87acae26c2151c4a", + "sha256": "1zvnhcbqqiv8671x3zizrpm789ci8z74xb6qr2ik6h4z79agmri8" }, "stable": { "version": [ @@ -41325,6 +41518,30 @@ "sha256": "1nl2ji5wvmfzchxpnmsgxn4v2lybyymyyh99lw3riqg6gb0phl9l" } }, + { + "ename": "gtk-variant", + "commit": "12bcbebf4b604e29cee443825c56336f5249e088", + "sha256": "1dcj0k2j89yx7k0cqqinb4xnhl0i2yivlvrb87xbj89zbijss967", + "fetcher": "github", + "repo": "bepvte/gtk-variant.el", + "unstable": { + "version": [ + 20200416, + 2136 + ], + "commit": "4462a5ab071ec001734e92d1ac2e5fa9721b94bd", + "sha256": "0v2h846k9xv47am66nv4piqhvn74xijhp2bq84v3wpls4msvfk70" + }, + "stable": { + "version": [ + 1, + 0, + 4 + ], + "commit": "4462a5ab071ec001734e92d1ac2e5fa9721b94bd", + "sha256": "0v2h846k9xv47am66nv4piqhvn74xijhp2bq84v3wpls4msvfk70" + } + }, { "ename": "guess-language", "commit": "6e78cb707943fcaaba0414d7af2af717efce84d0", @@ -41592,14 +41809,14 @@ "repo": "hhvm/hack-mode", "unstable": { "version": [ - 20191218, - 1628 + 20200421, + 157 ], "deps": [ "s" ], - "commit": "fd6a661b091490920804d043303596f9e60a5dd7", - "sha256": "1x4nymp53rdm1d0jjkz0mha4d8y8wzmakf65d56fn5mnziqh2l5d" + "commit": "330df61f7297344cff9cf9e2d802a4d041279de3", + "sha256": "00g9h96kb9d3qg544x9143hx4nc5crw67cq93ip4mrh3d86rkpc1" }, "stable": { "version": [ @@ -42043,11 +42260,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20200315, - 140 + 20200408, + 247 ], - "commit": "7032966ee76b23520001af916d9184b4a2d7a689", - "sha256": "0mk2fw33j1k8m6w0b6p15n7zl52kbwjda0p2zzvxbhlk3cvqmgd0" + "commit": "bbdbc0e9231f49a45ce787ebfb3f2b019615bf61", + "sha256": "0qln2zc4zx8w4ffplp6b17sksg578x61hyvwv1l79pc8bmpgn0ww" }, "stable": { "version": [ @@ -42377,30 +42594,30 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20200325, - 757 + 20200426, + 534 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "0181b7ef468def6ef5547c7241b5c4c854816166", - "sha256": "09yvc6jpcb93fwa5blgzaqpk3f3v5h6m2hxajih1y6fxrdaxgnhq" + "commit": "3fddd8c425c918074a4bda9982ce90c29e45adbd", + "sha256": "1vhdiwvv2s9gw6mh4dr1blqlyy1k0cvm4wx833cwzgdg5iakan1f" }, "stable": { "version": [ 3, 6, - 0 + 1 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "ac3c49be00df1efecc76ef0b33db2884039579b8", - "sha256": "0miq2q52pbicijp7pmj0widk252qixswywc03d120s4hya2b7vd7" + "commit": "55281e1390bae54310dc880ae3805e0595d5c1bd", + "sha256": "1sghq7xjd4a9ysh3cywd5rss9y47rwk82y86cwh1g7p0jv89gqaf" } }, { @@ -42500,14 +42717,14 @@ "repo": "emacsorphanage/helm-ag", "unstable": { "version": [ - 20200328, - 533 + 20200426, + 1427 ], "deps": [ "helm" ], - "commit": "ad3ef038584007fbf1b7d6e727be1f18e39a8730", - "sha256": "06gjbc1rkxg13nb2hr3gm65zyzpxv77pvsz7b7c9i3qfw782zsax" + "commit": "6387437acf687a64af66138649f8604d65eb6789", + "sha256": "177grx9flqg6d9vcl2ln7gflvh3r2in8va39sgd7a4vl6qn2w1lh" }, "stable": { "version": [ @@ -42638,26 +42855,22 @@ }, { "ename": "helm-bibtex", - "commit": "f4118a7721435240cf8489daa4dd39369208855b", - "sha256": "037pqgyyb2grg88yfxx1r8yp4lrgz2fyzz9fbbp34l8s6vk3cp4z", + "commit": "873ae2af16e03c8e10494be3f0e7840eb27172a3", + "sha256": "0ciz4lczfv9b4n12jd9r5w81yj884pmi53xmm9cqzvrv3hh9n8hs", "fetcher": "github", "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20191028, - 1313 + 20200415, + 1311 ], "deps": [ - "biblio", + "bibtex-completion", "cl-lib", - "dash", - "f", - "helm", - "parsebib", - "s" + "helm" ], - "commit": "d4471232be26793fbf56c0ac3690b5f537c378b9", - "sha256": "1bkzhic6qckb267025il1r3xcpz99kisphxiafni1pxvf9jafr0j" + "commit": "1e5b50652d1f5189cfeb6b5ce3c4437e0239d4f5", + "sha256": "05xl3x98w4cr81zp04dcqy5xnims8x3k77qxzddcqcrvi9zjlfc7" }, "stable": { "version": [ @@ -42810,6 +43023,37 @@ "sha256": "1yr5prp9xvd73balxbn4yn52zah2advq1186ba5aanj436pal0fh" } }, + { + "ename": "helm-bufler", + "commit": "4ba5657f237eea9073a46a4127be5795be07c687", + "sha256": "0wb1ds3acc36hl7798phbvhygfljjc6br11lf4y3043q8v0lz6gi", + "fetcher": "github", + "repo": "alphapapa/bufler.el", + "unstable": { + "version": [ + 20200409, + 1253 + ], + "deps": [ + "bufler", + "helm" + ], + "commit": "b2b260e4f9e8ba76bb8b4d71344c7b75e05ac44f", + "sha256": "0ww7z2xz185i97wa1rnmqwlx2mvwx69hhlyi5m3sm0nkyckb2hjs" + }, + "stable": { + "version": [ + 0, + 2 + ], + "deps": [ + "bufler", + "helm" + ], + "commit": "d6c79f04b7d288174d8294fb30488b567586364d", + "sha256": "0l35ssjry15wqcxnr8rf5lrv856pgnm0k2d4d6ag14ypjx9nfhw3" + } + }, { "ename": "helm-bundle-show", "commit": "2f10f7387cca102696c38af1d8dc0fe5da5e366f", @@ -43232,26 +43476,26 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20200306, - 1417 + 20200424, + 607 ], "deps": [ "async" ], - "commit": "0181b7ef468def6ef5547c7241b5c4c854816166", - "sha256": "09yvc6jpcb93fwa5blgzaqpk3f3v5h6m2hxajih1y6fxrdaxgnhq" + "commit": "3fddd8c425c918074a4bda9982ce90c29e45adbd", + "sha256": "1vhdiwvv2s9gw6mh4dr1blqlyy1k0cvm4wx833cwzgdg5iakan1f" }, "stable": { "version": [ 3, 6, - 0 + 1 ], "deps": [ "async" ], - "commit": "ac3c49be00df1efecc76ef0b33db2884039579b8", - "sha256": "0miq2q52pbicijp7pmj0widk252qixswywc03d120s4hya2b7vd7" + "commit": "55281e1390bae54310dc880ae3805e0595d5c1bd", + "sha256": "1sghq7xjd4a9ysh3cywd5rss9y47rwk82y86cwh1g7p0jv89gqaf" } }, { @@ -43415,14 +43659,14 @@ "repo": "emacs-helm/helm-dictionary", "unstable": { "version": [ - 20191110, - 2202 + 20200406, + 1632 ], "deps": [ "helm" ], - "commit": "6a21ac1ba424ffa87b3b3e1b53d0fdd529844a28", - "sha256": "1qpcly4v7yf6ncp951gl1c18riln86xgyasf66n56qj26mfq8bhq" + "commit": "1dfec049c7851754a5967329a60e9e9a9f805423", + "sha256": "042rn38myq8b2024mdpisakmqysp34mmhvbdnw433vl9qxw6pikd" } }, { @@ -44430,14 +44674,14 @@ "repo": "emacsorphanage/helm-gtags", "unstable": { "version": [ - 20200321, - 1456 + 20200409, + 1559 ], "deps": [ "helm" ], - "commit": "ff4329fec2cc1f53b404054ddab4cd16faef7241", - "sha256": "14jjjk258hg2d47d8fgg6qb410ij16400anx5kcghi2680a92f2w" + "commit": "25b81d7774622911c1e95d9020209ae4ace1542b", + "sha256": "14k0yrf8p015gsgdgq8ykvrjjhd1brq2gsfx7m3jv0p789yxw7zk" }, "stable": { "version": [ @@ -44949,16 +45193,16 @@ "repo": "emacs-lsp/helm-lsp", "unstable": { "version": [ - 20200103, - 1659 + 20200420, + 1546 ], "deps": [ "dash", "helm", "lsp-mode" ], - "commit": "6f62659cc528b7e37ffcc8fb356633acd7031be8", - "sha256": "1gf3pzrcxrymlj677mghxf4yrqiqa90y3ip1g1f1h186wnwa2vcg" + "commit": "db243993ea70be6343949759b4f2c556d9130751", + "sha256": "0yaik74g61iyrg9inarl7s9r6vnj75q5vxzxc5bkl224w49hf5bh" } }, { @@ -45145,16 +45389,17 @@ "repo": "emacs-helm/helm-navi", "unstable": { "version": [ - 20181226, - 29 + 20200401, + 904 ], "deps": [ "helm", + "helm-org", "navi-mode", "s" ], - "commit": "3b9abcc39ce7c657bc2dcc054b850dc2a7cf0448", - "sha256": "1kxv8qx7s51fnzrslwqrgayqvyq30ycnb84p5qy7jf0rf69hxxjh" + "commit": "9bba79119edd8959d26484326c2f6868b7d942c0", + "sha256": "136shiqwr7k95gqywrlqqykx1pgpvyjbfzggwj7q1akqjslxfffn" } }, { @@ -45280,6 +45525,42 @@ "sha256": "0j3xz59hl84asv332fk94j5c06w3ix6b14zrkhxr8vb5ci1b2b1k" } }, + { + "ename": "helm-org-multi-wiki", + "commit": "536cf8f9a0b16e6e9bda30de67d0da44bb1b5877", + "sha256": "0wk08m6y2rvjbj28h3hqf9w3cgx0ykiv8z6f6kqjfpik8fl2bzbj", + "fetcher": "github", + "repo": "akirak/org-multi-wiki", + "unstable": { + "version": [ + 20200419, + 1833 + ], + "deps": [ + "dash", + "helm", + "helm-org", + "org-multi-wiki", + "org-ql" + ], + "commit": "aef5975ac18d7cb101c0fb688333cc241782a8a0", + "sha256": "1m3p839wkrvf7n2467czj03rljv43bk32p7vlzdp5zby22bn7nag" + }, + "stable": { + "version": [ + 0, + 4, + 0 + ], + "deps": [ + "dash", + "org-multi-wiki", + "org-ql" + ], + "commit": "80791ea872939df0578dc3a2992a2f7fd5618971", + "sha256": "0avg5xwnb3c9ylj9dqdcqmh8kykl98jsr6cl3rrivkj7l47i1rl0" + } + }, { "ename": "helm-org-rifle", "commit": "f39cc94dde5aaf0d6cfea5c98dd52cdb0bcb1615", @@ -45999,8 +46280,8 @@ "helm", "rtags" ], - "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5", - "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x" + "commit": "a42298e80dffae9a6b2e9816506174542f3cbbb7", + "sha256": "1674752bbyb7890na5p846dxcvh83zn0a6z19wras1x5c59s24i3" }, "stable": { "version": [ @@ -46866,25 +47147,26 @@ "repo": "jjzmajic/hercules.el", "unstable": { "version": [ - 20190929, - 637 + 20200420, + 747 ], "deps": [ "which-key" ], - "commit": "031f8eec95240fc46481061f0f44822c0f7fe65e", - "sha256": "0snfmvri4cpmhrk5s4hxxlyzs3d58ysmqzaiyiz4979admdc1lmb" + "commit": "557da39878d0637395fdded91243b340c37eff7b", + "sha256": "1rp37rhkj8jm07dwr74vc68dhrbvyvrxjdavpb0h073ps9vl9dsc" }, "stable": { "version": [ 0, - 3 + 3, + 1 ], "deps": [ "which-key" ], - "commit": "031f8eec95240fc46481061f0f44822c0f7fe65e", - "sha256": "0snfmvri4cpmhrk5s4hxxlyzs3d58ysmqzaiyiz4979admdc1lmb" + "commit": "557da39878d0637395fdded91243b340c37eff7b", + "sha256": "1rp37rhkj8jm07dwr74vc68dhrbvyvrxjdavpb0h073ps9vl9dsc" } }, { @@ -46925,11 +47207,11 @@ "repo": "kuanyui/hexo.el", "unstable": { "version": [ - 20180815, - 219 + 20200416, + 1410 ], - "commit": "6bca18f911f6b2cd5c055ed73ddec98c385f9f86", - "sha256": "1zawz3nry832rhx80hyfqfs0gfw3hyrn96060zj3n75avx13rr8j" + "commit": "d600b6c2d51959f1331c8abf3953365544322afa", + "sha256": "07w6jlq3z5y019n5kplqn38gw60ffk2yx4vchp6qgif98lhcjiyr" } }, { @@ -47267,11 +47549,11 @@ "repo": "DarthFennec/highlight-indent-guides", "unstable": { "version": [ - 20190108, - 3 + 20200412, + 2328 ], - "commit": "0b10f38c54ffc099861ce8463e16a1b07ddbb203", - "sha256": "0fa41y9gdci60417zksj9bgjx1knwh781i3dfphkgr7qbx25iky7" + "commit": "1b12c7b440ff988c7237936187c1375ac4ddc7f4", + "sha256": "03dpwklrwbkminfds8v129w0i47p5mkwdyhlhv05a22xnmlanyrs" } }, { @@ -47345,16 +47627,16 @@ }, { "ename": "highlight-operators", - "commit": "e7bd74b7a3484e437c6db4f18613744ebae030f5", - "sha256": "00agrwp2i3mkacnp4qhqcnpwn5qlbj9qv97zrw7a7ldqga0vwvhn", - "fetcher": "bitbucket", + "commit": "caca0b2bc2aaac563074cbb4ea4296fce749e203", + "sha256": "1l0ci20r0qm4lc9chvvwxgyi3vg41n3ccj0csfgzilzicsvjs9ic", + "fetcher": "github", "repo": "jpkotta/highlight-operators", "unstable": { "version": [ 20170213, 2220 ], - "commit": "3938e88e78c592936fc8fc6eabbfaf7205a967c8", + "commit": "7696b43419505d6e3511ad2781f9f1dd3c55ef8c", "sha256": "1h5whrc1iphzq0g8x9mmkhjkbmbdg9i9bvr1y8zrwrs8za8k127y" } }, @@ -47729,11 +48011,11 @@ "repo": "ideasman42/emacs-hl-block-mode", "unstable": { "version": [ - 20200118, - 310 + 20200404, + 702 ], - "commit": "6a8f871d7aa5d0d58b7c6ede281f8f8965124c9e", - "sha256": "1jdqz3cfncka4rdqxa4qg7f8dhkwx2h9s16gd3xqjwh8xrpf9qnd" + "commit": "6dc75e71b0b179d7c087cf7de51823f5810d671a", + "sha256": "142nrxq72dkl45lq93c076nl2ifdl6vdgiydpcs4lwg0crja8qzl" } }, { @@ -47744,14 +48026,14 @@ "repo": "laishulu/hl-fill-column", "unstable": { "version": [ - 20190608, - 203 + 20200404, + 306 ], "deps": [ "names" ], - "commit": "612441e69772c24f9ce67ae73e47c84f29ee653d", - "sha256": "0b7770prp5sj4yinrdgzvblqky05vm245i40d38frcbghwqr2jl4" + "commit": "43cb3c35a92c912b7205b8a36f1ad0ec0a5b4a22", + "sha256": "0pf1hk21xbahccw1cdz95haqvhrf50cwg32qa36v9nammd37752z" } }, { @@ -48142,17 +48424,17 @@ 20200321, 1819 ], - "commit": "cf1cd543f68525732e0a9178c96a5f83a3cabc7f", - "sha256": "1yjfvx94ipps91fr8qbgafpkdp38yhlbzvggyi97g91ib2pxfals" + "commit": "6f9ed1a6517e3a43ef2deafc2f86c70b2abce008", + "sha256": "06vhxmvd57hf8kc21ncv6is9h70syjbzqwfcl3xf5zwcpc8vn13s" }, "stable": { "version": [ 1, 1, - 0 + 3 ], - "commit": "cf1cd543f68525732e0a9178c96a5f83a3cabc7f", - "sha256": "1yjfvx94ipps91fr8qbgafpkdp38yhlbzvggyi97g91ib2pxfals" + "commit": "6f9ed1a6517e3a43ef2deafc2f86c70b2abce008", + "sha256": "06vhxmvd57hf8kc21ncv6is9h70syjbzqwfcl3xf5zwcpc8vn13s" } }, { @@ -48538,11 +48820,11 @@ "repo": "humanoid-colors/emacs-humanoid-themes", "unstable": { "version": [ - 20200310, - 940 + 20200403, + 1939 ], - "commit": "57d7db70904faeeba9ccd0151e4ebf889403a40d", - "sha256": "0vxfq6gycgkfypyk91mwf2jg1mkldxpkd2v39j2nmlgbbw1ldaka" + "commit": "22c9a0987c7d746d7eb9fe850f93f232d91cae14", + "sha256": "1h3v76p17mzigwr0kpjlm5fgas4vvrm59g73l1699pnq1n1i5kgx" } }, { @@ -48979,6 +49261,21 @@ "sha256": "1mgn7b786j4hwq1ks012hxxgvrfn5rz90adi2j190gmjz60rc5g5" } }, + { + "ename": "icomplete-vertical", + "commit": "1a952162da476b4a0f496d9dc15d2d7a8d0964f6", + "sha256": "10rbsxp3jp8xyzcklpcc2zs0sv4pvvkqb7i96js9cp13nc9a7rgz", + "fetcher": "github", + "repo": "oantolin/icomplete-vertical", + "unstable": { + "version": [ + 20200417, + 1755 + ], + "commit": "a2ee9254085431ec9e5c88d522e2c700355003ef", + "sha256": "1bqnlvv1gvrjriazvzd3bq98r8ii6fqax0zznhvkl1ij5pf55a90" + } + }, { "ename": "icsql", "commit": "bf2a7e6572418d2f252d63068edd82c21eab874e", @@ -49651,11 +49948,11 @@ "repo": "victorhge/iedit", "unstable": { "version": [ - 20190419, - 803 + 20200412, + 756 ], - "commit": "e2c100cdd67b7d82835d281ac2cd1bf4f374bc8f", - "sha256": "0wr3w2id95wx2rma8n1ifjrv9rx37ly26ijc5zi58id0yrip3hnc" + "commit": "0fb3d380866664c3ab543acede606d343c257406", + "sha256": "0fz3p41j6d6bwk95v626j7w1z4rvbdxms6a4azy9dfncplnbnih0" }, "stable": { "version": [ @@ -50030,16 +50327,16 @@ }, { "ename": "immortal-scratch", - "commit": "1f9f4a59d88106ddfee740653abd28e305f6dfe0", - "sha256": "0rxhaqivvjij59hhv3mh4wwrc0bl0xv144j1i237xhlvhxk6nnn6", - "fetcher": "bitbucket", + "commit": "caca0b2bc2aaac563074cbb4ea4296fce749e203", + "sha256": "00g68abnssf9xw233zs09jyjqbm0720isamc97rfr95d7wvrb2cr", + "fetcher": "github", "repo": "jpkotta/immortal-scratch", "unstable": { "version": [ 20160517, 2118 ], - "commit": "b354aba33d91a16a1878c87a931564505f6a0ee1", + "commit": "faeab0ad6c33c74c0cbd1dfcebffaa0690de40c6", "sha256": "1mx9f8pwnbrm6q9ngdyv64aqkw1izj83m0mf7zqlpww7yfhv1q9b" } }, @@ -50382,26 +50679,26 @@ "repo": "clojure-emacs/inf-clojure", "unstable": { "version": [ - 20200118, - 1533 + 20200425, + 1648 ], "deps": [ "clojure-mode" ], - "commit": "49390d9dfde1d6354629b7662edd0ee422477f4a", - "sha256": "1jhh4ablxmwy4diai6jhki5ifiw1d0fcza7l9gy8iqqnd1yc2m25" + "commit": "f29861204ddbb032b425c7d693e8c006b7b027c6", + "sha256": "127kl64hqdy04qdbqr1xfzky3d8fzgbmp7z4hv6mjsc0p4s19azw" }, "stable": { "version": [ 2, - 1, + 2, 0 ], "deps": [ "clojure-mode" ], - "commit": "247ca70f8ba5104be292aea20fbde6adb37e359f", - "sha256": "11hyva006bc4hbhzjwb4brilm6fb7qfm5h66nl0gmmyva40y6412" + "commit": "ff72d667c2709166d19ac15a36f7aac3423cefa1", + "sha256": "07l8wkm0j6y2cj7bbb24x4rkjgf4q6ag0c1kcjs0sfmf1kaf14bk" } }, { @@ -50527,9 +50824,9 @@ }, { "ename": "info-buffer", - "commit": "3c44a1d69725b687444329d8af43c9799112b407", - "sha256": "1vkgkwgwym0j5xip7mai11anlpa2h7vd5m9i1xga1b23hcs9r1w4", - "fetcher": "github", + "commit": "6a7caa8c4fea7ef2211f01bc8340c660a6e6c5f3", + "sha256": "1si3sz34bmzcnqm4bc6nq7q2rmsyksh0610bn0r9frf12vakg28p", + "fetcher": "gitlab", "repo": "llvilanova/info-buffer", "unstable": { "version": [ @@ -50724,8 +51021,8 @@ 20191218, 2038 ], - "commit": "ed488fcbc8c015121a4b1acd8d08db229fd6735a", - "sha256": "14y87fvav10wjc88bbi1pwy8lxnqcdk4cahwhd9cg5bhsqwhm32m" + "commit": "8b648afaaab5eaddb7afcd602b8a76cbfb12412b", + "sha256": "0zfv4cnj11i7lagfyqmy4ch01szj450458yqffjn84hfikbf4q78" } }, { @@ -51578,11 +51875,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20200319, - 1247 + 20200425, + 1938 ], - "commit": "64f05f4735bba8b708bc12cfc2cbfb7fb7706787", - "sha256": "16b75jw0by1f8divymfygjbp5mikc2bjz4nqd907mdsndf8k6i8q" + "commit": "47ec37b395cc1b304bbf91e804f138634544a9df", + "sha256": "05k2qjj4z8vljfppkphfhw67wvb5ij4nz4m158v89lx87y0phh74" }, "stable": { "version": [ @@ -51596,26 +51893,22 @@ }, { "ename": "ivy-bibtex", - "commit": "c23c09225c57a9b9abe0a0a770a9184ae2e58f7c", - "sha256": "0qni48s09lgzqr98r49dhrzpfqp9yfwga11h7vhqclscjvlalpc2", + "commit": "873ae2af16e03c8e10494be3f0e7840eb27172a3", + "sha256": "0ri0f8cfzyymx9jrw0bldwzx74bzdd5gc90yv16hv239g65scbvx", "fetcher": "github", "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20191028, - 1313 + 20200415, + 1311 ], "deps": [ - "biblio", + "bibtex-completion", "cl-lib", - "dash", - "f", - "parsebib", - "s", "swiper" ], - "commit": "d4471232be26793fbf56c0ac3690b5f537c378b9", - "sha256": "1bkzhic6qckb267025il1r3xcpz99kisphxiafni1pxvf9jafr0j" + "commit": "1e5b50652d1f5189cfeb6b5ce3c4437e0239d4f5", + "sha256": "05xl3x98w4cr81zp04dcqy5xnims8x3k77qxzddcqcrvi9zjlfc7" }, "stable": { "version": [ @@ -51889,15 +52182,15 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20191018, - 1251 + 20200421, + 1120 ], "deps": [ "hydra", "ivy" ], - "commit": "64f05f4735bba8b708bc12cfc2cbfb7fb7706787", - "sha256": "16b75jw0by1f8divymfygjbp5mikc2bjz4nqd907mdsndf8k6i8q" + "commit": "47ec37b395cc1b304bbf91e804f138634544a9df", + "sha256": "05k2qjj4z8vljfppkphfhw67wvb5ij4nz4m158v89lx87y0phh74" }, "stable": { "version": [ @@ -52061,15 +52354,15 @@ "repo": "tumashu/ivy-posframe", "unstable": { "version": [ - 20191226, - 637 + 20200331, + 536 ], "deps": [ "ivy", "posframe" ], - "commit": "6d697ff00ac406b919eba8665b1bc18a2b423cda", - "sha256": "05zhfhml8bd1zi1msy6zjkimirwq59i9fwa0mxy9l88si3dmb2hb" + "commit": "ae9bafe94fe6b77b6fe45766ae6172646f6a5d50", + "sha256": "1j6yns5d7lh2v1nfcznrirl7qicdli9csciqvfgj4gkh72a97pw1" } }, { @@ -52080,27 +52373,27 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20191224, - 220 + 20200415, + 1457 ], "deps": [ "ivy", "prescient" ], - "commit": "a194852e8022762843052e58a9d0fbdaa1df0fe5", - "sha256": "0da4s32fza42vdiqhh7cdim08by5i4909q93ivxkmgrmqfgdvz0p" + "commit": "0f4a89bdec61395138d968a38d375e63ccfbed63", + "sha256": "0nnf4y49pl9lcs90y5z6f02g1xwk1jjrl0qs7gcv6kpn0vn8kn0h" }, "stable": { "version": [ 4, - 0 + 1 ], "deps": [ "ivy", "prescient" ], - "commit": "ad9fbe8a17fe74b27a39bcc034f3da1865663387", - "sha256": "008hxy1vasnyz36wwg44gikpi80ng75hj85nrswk60b7z7cznbmr" + "commit": "aa3110281a0622fa7b5da115cefb71a319b5b1a0", + "sha256": "1rf5cz262hjpck7vpxg15bccdrwrmlhiyxc20liwcjb2ig36nis3" } }, { @@ -52179,8 +52472,8 @@ "ivy", "rtags" ], - "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5", - "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x" + "commit": "a42298e80dffae9a6b2e9816506174542f3cbbb7", + "sha256": "1674752bbyb7890na5p846dxcvh83zn0a6z19wras1x5c59s24i3" }, "stable": { "version": [ @@ -52742,11 +53035,11 @@ "repo": "donderom/jazz-theme", "unstable": { "version": [ - 20170411, - 1411 + 20200417, + 2042 ], - "commit": "b1cb78a97cc4050f19d88a89e455c3e52d98240e", - "sha256": "0q9gfa40qh9wypvzg3xrv4kh6l51az9swb39133961dc8zrrrinm" + "commit": "b6694f09e10aa7df14836aac2f6615c32aa572dd", + "sha256": "1mjzfr2iz72n3ds6d0sqhqd2a5kcfn8d2kji9hqmydmplg247apx" } }, { @@ -53127,15 +53420,15 @@ "repo": "nyyManni/jiralib2", "unstable": { "version": [ - 20190927, - 2010 + 20200331, + 1940 ], "deps": [ "dash", "request" ], - "commit": "e913f8e4a994850d2cff18ce2b1f4177cac62c91", - "sha256": "022jndjwj0ml2w829id0nx43p24h6jpmilc12n9hiy4p80vjgy1y" + "commit": "ccf69e417911e091ec4c28d47d178ee63196c626", + "sha256": "170fjz7k9bk17qk7wrd56xw484xp8zckx635360pm0lfg4dvycpc" } }, { @@ -53757,14 +54050,14 @@ "repo": "skeeto/elisp-json-rpc", "unstable": { "version": [ - 20180104, - 1528 + 20200417, + 1629 ], "deps": [ "cl-lib" ], - "commit": "0992ae71964055230aa5d4d934a1b93b5dfd7eb4", - "sha256": "0nfccwxss3dz1ig6i3dig703xpsy90m7i96bm3pysrw2jfp4by9s" + "commit": "81a5a520072e20d18aeab2aac4d66c046b031e56", + "sha256": "13s18mjh6dpdxvva9yx4841rxvayxsvaj3vblxril6zm2wcqw2lm" } }, { @@ -53917,11 +54210,11 @@ "repo": "JuliaEditorSupport/julia-emacs", "unstable": { "version": [ - 20200324, - 1652 + 20200331, + 1658 ], - "commit": "1c122f1dff8dd2674245b2ce5e43b62504864bfd", - "sha256": "1ki42xx7vws8hb5vr1rgm2aih4qadf9qva8c4zq1hzmzq5j74jry" + "commit": "88d7d875ef32eb9fb76917c97150654bb91ac96a", + "sha256": "1zsqj31avcil6ml2clfxk7hnmg5fx014xqbbvhm17ii7ggky4qdn" }, "stable": { "version": [ @@ -53985,8 +54278,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20200327, - 602 + 20200423, + 2236 ], "deps": [ "cl-lib", @@ -53997,16 +54290,16 @@ "spinner", "vterm" ], - "commit": "c293f0db0203708e49139cb3b32e5826056ef972", - "sha256": "1fyw36c5f70j53jl03yk79pgr0x4q89mwyb77n9xcbscdhaxv3s2" + "commit": "e14c5590a79ee5529f574f6d4b0701d608e3e47b", + "sha256": "1xckmrdg41ai9qbpy9lxva4b1yq5jji9xff4fz9d4v72nqz7qn0w" }, "stable": { "version": [ 1, 0, 0, - -2, - 6 + -1, + 3 ], "deps": [ "cl-lib", @@ -54017,8 +54310,8 @@ "spinner", "vterm" ], - "commit": "596f59774edf213c4c4885992dda158de145be03", - "sha256": "0x8mlvq264ihhcdbkljhaij6hsvlh8s4fmrd8x970c7i3qi3hh7k" + "commit": "483d088853584a9f1603a062bce5705f0a7d99fe", + "sha256": "0k3lwq6r1y23gmlqx7a70psgzncf4k1zcykc7plzl79xas28rbrz" } }, { @@ -54153,8 +54446,8 @@ "repo": "dzop/emacs-jupyter", "unstable": { "version": [ - 20200329, - 828 + 20200417, + 1907 ], "deps": [ "cl-lib", @@ -54162,14 +54455,14 @@ "websocket", "zmq" ], - "commit": "b691d38483b6540d42d482a32d35eb54178e5658", - "sha256": "1lp6xg71snlsaffl7afrgjcs99l2axc5xrbkrncc50zjhxlimxrr" + "commit": "785edbbff65abb0c929dc2fbd8b8305c77fd529e", + "sha256": "1l1fd062dmig3mgkwixr4ly8x12z9skh5wj18hkyc84n7rwdar47" }, "stable": { "version": [ 0, 8, - 1 + 2 ], "deps": [ "cl-lib", @@ -54177,8 +54470,8 @@ "websocket", "zmq" ], - "commit": "6650dd35887e0e987385a4fb74b0a3c1661e149b", - "sha256": "152g22bm970px2mi3bfr6f59mvvbk2p8prv5vs5b9n0cmviqm50w" + "commit": "403c70c83cb3754c83da0932b0efaf5e72bdca9a", + "sha256": "1sr007wsl2y6wqpzkmv3inbpwhvgdcb2nmqzgfg7w1awapi2r13p" } }, { @@ -54766,11 +55059,11 @@ "repo": "tarsius/keycast", "unstable": { "version": [ - 20200103, - 1239 + 20200418, + 2028 ], - "commit": "adb55497c0f16e90069d6e5e86b4f9f65f13624b", - "sha256": "1sprdfx0gvyqmq0fkf4bf56q3d8xxig2vxi38nzjx90llzvka35q" + "commit": "a912c4db1b88390f76b14e3b47ded314fdc8f48c", + "sha256": "07gfldj9y4jfvna1rqlr7w6y6daqdsvc1fb2m7acjn37bpmfrc3b" }, "stable": { "version": [ @@ -54863,14 +55156,14 @@ "repo": "tarsius/keymap-utils", "unstable": { "version": [ - 20191222, - 2258 + 20200413, + 1858 ], "deps": [ "cl-lib" ], - "commit": "0b9bb7f4959ca54f0827b202f513ec7508c11e0e", - "sha256": "11y1vdrj2isn00mh428ynzqnfxjsg0138wx0bs619j0pv6d3j09g" + "commit": "195e0ca5b1b9967faf94a3e5a634d8975b796705", + "sha256": "0ckv9mbqb1f2lp17sv3nxjwww4ph9v3bhlxwvchvkkdlbcg87i5n" }, "stable": { "version": [ @@ -55186,8 +55479,8 @@ 20180702, 2029 ], - "commit": "26228b202e821824afd8b2536234b26c23ae1b9d", - "sha256": "1329xyhriha7037lnsg8bf4xqkc20f0h3bv7xifm2i40ib0z3wlx" + "commit": "108a9151eb55b00f246613c511d88b7d58334595", + "sha256": "16wsaz29avmv9p3lfy0wjgxfwpszq8g3v9vl05azqkvjahf0lxib" }, "stable": { "version": [ @@ -55209,15 +55502,15 @@ "repo": "stardiviner/kiwix.el", "unstable": { "version": [ - 20200315, - 332 + 20200426, + 637 ], "deps": [ "cl-lib", "request" ], - "commit": "d5e5780f3c933f873e1a19458c1ea269e9a57afe", - "sha256": "1p7fqw1j1kphvqb09c8s5lyqkxi7fd0gfpvyp0g0v0shdxydb9ix" + "commit": "6c6c44386e00d352d96064cb25b50e960cd1ba22", + "sha256": "16k93w5xylx3v5q1hlzmlmg1ydg88bklgi2idd3h6k3sbi4linvs" }, "stable": { "version": [ @@ -55474,16 +55767,16 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20200316, - 207 + 20200406, + 2112 ], "deps": [ "dash", "s", "transient" ], - "commit": "db3a999c028ffeeeb49936e8b921c364bf8f437e", - "sha256": "1ai33jma22agrxww6dcgsh6dbv5h36gixgs0b6n1q4d5v7k6d9q3" + "commit": "74db5b2e8418d0baeb8d3d0c274dfba3b9f32018", + "sha256": "1v8d8cvbqr12pglnd0lwijklfry5nz2j7nbv447bdkp5cp7y5f01" }, "stable": { "version": [ @@ -55509,8 +55802,8 @@ "evil", "kubel" ], - "commit": "db3a999c028ffeeeb49936e8b921c364bf8f437e", - "sha256": "1ai33jma22agrxww6dcgsh6dbv5h36gixgs0b6n1q4d5v7k6d9q3" + "commit": "74db5b2e8418d0baeb8d3d0c274dfba3b9f32018", + "sha256": "1v8d8cvbqr12pglnd0lwijklfry5nz2j7nbv447bdkp5cp7y5f01" }, "stable": { "version": [ @@ -55741,6 +56034,25 @@ "sha256": "1r8di1cmhcx2vfk3fsydx24spib1fi4wihnxa41favnkjzklz9jv" } }, + { + "ename": "lambdapi-mode", + "commit": "86702d5ad9279f03bdae5facb0b546e133c1fedd", + "sha256": "0ha9k0wc5snb5j0bpzjj91b7kd9ppsk8wbcj454wdkx87x73npdd", + "fetcher": "github", + "repo": "Deducteam/lambdapi", + "unstable": { + "version": [ + 20200423, + 1441 + ], + "deps": [ + "eglot", + "math-symbol-lists" + ], + "commit": "e205bd95602e120186a1e18ca825e6bbc3b6c4d1", + "sha256": "12y297h0hln7smy26nixqbjzy9nk1pwc2a7sab8dlzjkyz37zbfg" + } + }, { "ename": "lammps-mode", "commit": "8f5471a8e17977c17ad84b12a77fe80f37eda25e", @@ -55845,26 +56157,26 @@ "repo": "lassik/emacs-language-id", "unstable": { "version": [ - 20200321, - 724 + 20200409, + 607 ], "deps": [ "cl-lib" ], - "commit": "756f238b4fda63f6e0980f627869eb3c03d13f66", - "sha256": "18i1l7vpfa0y5zpy9hbcrkp79n30n7pkf0kasq718cj8ggczj120" + "commit": "bf17d80b6c4b58fb66cddc2b2914f57d48468e97", + "sha256": "1p21smbm3z6xfq0zk8pv62wppbbxx8mh994ax8b00kh16j7yhh2c" }, "stable": { "version": [ 0, - 4, - 2 + 5, + 1 ], "deps": [ "cl-lib" ], - "commit": "2c7b8599fc7fb56b0c820a9ae9f08053c71a8738", - "sha256": "10vrx3vfg8glrqngbyhwgkg5maib8ihv03psdd6qjhd0kik83498" + "commit": "bf17d80b6c4b58fb66cddc2b2914f57d48468e97", + "sha256": "1p21smbm3z6xfq0zk8pv62wppbbxx8mh994ax8b00kh16j7yhh2c" } }, { @@ -56197,20 +56509,40 @@ "repo": "conao3/leaf.el", "unstable": { "version": [ - 20200327, - 1411 + 20200422, + 644 ], - "commit": "199045bfe411afc30cb7c7d18b8a6b03edebeae1", - "sha256": "0apaa5w2zfycigdf8d7x3h8aw8m11mz8b6l2d546dlbvxr5yra28" + "commit": "27f21ed46a907a911222a72a31b41e414c956cfb", + "sha256": "041qgyskq39f91wjwr3d4ic5f1q7rvigannyyr9q4a2nbrn2dzhy" }, "stable": { "version": [ - 3, - 6, + 4, + 1, 0 ], - "commit": "c0a0fca2f9c83909c49729af75664411b4affab8", - "sha256": "18vrk19273xlg2nhkf7fvvhspnsfgk4dxa42x2q5599p9z7aph00" + "commit": "0841ab466a1542868b5448bb375ac9f0c33e2b3f", + "sha256": "0lpgkd2hhv98k7bi7zdplhlv0p3gbp4aq2cb0kyiwp2yxlnmkbzv" + } + }, + { + "ename": "leaf-convert", + "commit": "db2fa6cdfe98aea41eeafb59527050edfa9ef6e5", + "sha256": "1hw6imdf8f7939r077zccv0sa23xfcmwpbhjyb49g4nhzs5grpnv", + "fetcher": "github", + "repo": "conao3/leaf-convert.el", + "unstable": { + "version": [ + 20200415, + 1725 + ], + "deps": [ + "leaf", + "leaf-keywords", + "ppp" + ], + "commit": "2a8ec045d5d36e85e7deb2a46aefacaecf4bfafe", + "sha256": "133id4zd9dnx962r71m0irxvqs9dwaqnv5l4b8bjd3gigijah1dp" } }, { @@ -56221,14 +56553,14 @@ "repo": "conao3/leaf-keywords.el", "unstable": { "version": [ - 20200328, - 845 + 20200415, + 419 ], "deps": [ "leaf" ], - "commit": "3164f1f4b98be9efa9e28170cc9b8d14a10b3e56", - "sha256": "165x864rn9ha8dd3k62xgdp97fi961x75p6a7nldl0znzan65691" + "commit": "8c956f9e39cb589544a90861ac05b9b2ee4d320b", + "sha256": "0qy1hmg7ycbx898cx5cckmk5l8bysyvvdc5y2gl3bsxjwlv1wlrg" }, "stable": { "version": [ @@ -56240,6 +56572,56 @@ "sha256": "146h2n71f22gsqgh221ghx56qb9cq9qac3p77gxji535l2s9hbvk" } }, + { + "ename": "leaf-manager", + "commit": "e1d80f4662a0f77360244fc4b34f2076db4fd478", + "sha256": "1pr5yljhif5ffm63g6w6544cy6m15kljbdvxs87ivnisblbl4s21", + "fetcher": "github", + "repo": "conao3/leaf-manager.el", + "unstable": { + "version": [ + 20200414, + 543 + ], + "deps": [ + "leaf", + "leaf-convert", + "ppp" + ], + "commit": "f2ae35e02ebe218daa3076a0e9d83b4feadfbb0a", + "sha256": "09ll1vs9y6qmcl3qxil52mjw5bf7x896wjsij4kf0y5wd2fhra61" + } + }, + { + "ename": "leaf-tree", + "commit": "2e51160b1e5d277e66b9cff493b1f6b3c6f9ee28", + "sha256": "1xnqxwa978wbvx181v48zd37vckrj6p6wa7gas3fj648mwdjnii3", + "fetcher": "github", + "repo": "conao3/leaf-tree.el", + "unstable": { + "version": [ + 20200412, + 2355 + ], + "deps": [ + "imenu-list" + ], + "commit": "22f6c116cf1465c28d4a35d8a4587a8b614be175", + "sha256": "1bgjhrpq6a239v8vfi6i9qcbyrg76mpy4yykkb5da8hlp23idwy7" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "imenu-list" + ], + "commit": "22f6c116cf1465c28d4a35d8a4587a8b614be175", + "sha256": "1bgjhrpq6a239v8vfi6i9qcbyrg76mpy4yykkb5da8hlp23idwy7" + } + }, { "ename": "lean-mode", "commit": "42f4d6438c8aeb94ebc1782f2f5e2abd17f0ffde", @@ -56355,11 +56737,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20200328, - 1927 + 20200425, + 1517 ], - "commit": "bfa25a92d0cf63c5316b5aa8d50bd6809297ea9e", - "sha256": "1gx9brcwdmwhk0w2p93szdla5bgn25f1bsi9lna2l8ax1sn3l5kd" + "commit": "021eff5f88bf6392d7b3e511593e07471eb7833d", + "sha256": "0g4fgy39jp072b4ib0yxaxd3ndzxd1gx8inqqn9z9d7lxgc12l1g" }, "stable": { "version": [ @@ -56593,11 +56975,11 @@ "repo": "fniessen/emacs-leuven-theme", "unstable": { "version": [ - 20200122, - 1934 + 20200425, + 756 ], - "commit": "4bf80c2bb1e679b6e42e8d6547d6f33996830f73", - "sha256": "152731dwf0q1i1p5cjd3fwznl100vzsjk45ks1wxw4zv0w59q399" + "commit": "444d36526382466e6bcf11c58066bcef759e4c1f", + "sha256": "1768r5gb8cpz8a03rgswf5mny539w96hjw1rpvfqvj4zbv7bvd7n" } }, { @@ -56951,15 +57333,15 @@ "repo": "noctuid/link-hint.el", "unstable": { "version": [ - 20200205, - 2244 + 20200405, + 1607 ], "deps": [ "avy", "cl-lib" ], - "commit": "0d9cabcdb783ddc834ede6dcb1bed627c3acd303", - "sha256": "1ybzxc421wyy34w71lgbdfx7vgy9j6va9jjv1mkxa0zxqpdar974" + "commit": "7440704cacb5c0fab35fff8ec59d30fbea17f44a", + "sha256": "0j609j69lxyfvr2g89gdkjrk1vy0c1qq6m0p0ay468bh7l6crs7v" } }, { @@ -57092,6 +57474,35 @@ "sha256": "152vcp3mdlv33jf5va4rinl1d0k960gnfhbrqqrafazgx9j3ya8w" } }, + { + "ename": "lisp-local", + "commit": "2ec3f57a05e1b2e28ce33700d8ea98758b0bb69d", + "sha256": "1kzg2v0x0xf99mwd88bblbjfm9js4f40pibq6297xc9i5wrp3bv4", + "fetcher": "github", + "repo": "lispunion/emacs-lisp-local", + "unstable": { + "version": [ + 20200409, + 1330 + ], + "deps": [ + "cl-lib" + ], + "commit": "ff745a937f79df51cac0209b3cc3c35ce1d1fc61", + "sha256": "0ffwjv5fpzia772iavn9ily5m7l73pxf0amgqizzmbx12rx3kkhg" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "cl-lib" + ], + "commit": "ff745a937f79df51cac0209b3cc3c35ce1d1fc61", + "sha256": "0ffwjv5fpzia772iavn9ily5m7l73pxf0amgqizzmbx12rx3kkhg" + } + }, { "ename": "lispxmp", "commit": "ad10a684b4b2f01bc65883374f36fef156ff55d2", @@ -57115,8 +57526,8 @@ "repo": "abo-abo/lispy", "unstable": { "version": [ - 20200323, - 1616 + 20200425, + 1041 ], "deps": [ "ace-window", @@ -57125,8 +57536,8 @@ "iedit", "zoutline" ], - "commit": "b07ab5d8374c75bd1401b320fda17486325bc96d", - "sha256": "0gknqazf8pihn903518a5hmy5ggqmmq40rxz4kq2nfblpm6s5zkz" + "commit": "3c3f092824113278c57e93be1a2565f987ca0a4a", + "sha256": "1g0gmdq1n8l33ls4x06594hl8ayw8365ixgxp096d7qv7n5mxzn6" }, "stable": { "version": [ @@ -57521,11 +57932,20 @@ "repo": "lassik/emacs-live-preview", "unstable": { "version": [ - 20190415, - 2214 + 20200419, + 2143 ], - "commit": "bc3f79b58c4e428485b2cf800278004220f7433d", - "sha256": "1xlaq07wsgwzh3c0x50wgpj9i13nyk5ig45w1fx4156kmc69vjk8" + "commit": "7af1c74e0479c5b91d6368a4a3ff1342b83ef477", + "sha256": "0ifk0k6lfjzb0x0mgzh69jx0m166ljdg3ad69p51jw3m85c0wc6b" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "commit": "448d6d2b0912a46acd7d9a9b186b53425b1a7626", + "sha256": "1by62z8pch148ar47453bybg7q9drja73rq3pwcn9jb0yb6gn1xl" } }, { @@ -57536,20 +57956,20 @@ "repo": "donkirkby/live-py-plugin", "unstable": { "version": [ - 20200329, - 2216 + 20200401, + 420 ], - "commit": "18587cf78fa22d61a7365238da852be4a55c0656", - "sha256": "0141svf43miy1xyfc4wi3lrv0jyx97qbg9yhnxwlxz5i6gdrnyza" + "commit": "ab15012313217114d3f3940a6578df31ad223010", + "sha256": "1layngy8whcxgrpwhjdy41g194lkzq9z1wgv5rc4cg9smsbd6abi" }, "stable": { "version": [ 4, - 0, - 1 + 1, + 0 ], - "commit": "0cc8f0a31ef815e26eb7da314a516e908ba25838", - "sha256": "13wbsapnq5p75c27smzsgmmgzjbx7x2vbj7b7707bm6cakqjwdzv" + "commit": "0a0d881d8ff30a6007b998e9bb9dddb999cca16e", + "sha256": "1mdnbbd0kr5y4vr2xbay80v4n07gg5jkkn0k3ywypsin7fz5ihhl" } }, { @@ -57790,20 +58210,20 @@ "repo": "aki2o/log4e", "unstable": { "version": [ - 20170401, - 1304 + 20200420, + 745 ], - "commit": "c69424e407be0d9d0e54b427d8b18b1ac5a607e2", - "sha256": "1ng2cgqb83dhxm1hvsfdgzhfl80q9qkf07cr9hp7sxldy36hvxw8" + "commit": "7df0c1ff4656f8f993b87064b1567618eadb5546", + "sha256": "0dbnks76v05allzkhx9zmyqpn6sk5376n8k2rbpnaw6gmz1ib2fv" }, "stable": { "version": [ 0, 3, - 0 + 3 ], - "commit": "6592682ab7de0e3d1915aa4d3c53e083be79fbeb", - "sha256": "1l28n7a0v2zkknc70i1wn6qb5i21dkhfizzk8wcj28v44cgzk022" + "commit": "7df0c1ff4656f8f993b87064b1567618eadb5546", + "sha256": "0dbnks76v05allzkhx9zmyqpn6sk5376n8k2rbpnaw6gmz1ib2fv" } }, { @@ -57932,27 +58352,28 @@ "repo": "doublep/logview", "unstable": { "version": [ - 20200125, - 1808 + 20200331, + 2111 ], "deps": [ "datetime", "extmap" ], - "commit": "638dbd4833c6387be3849d0097b5b1a14c619afb", - "sha256": "1arzz27vf6r62m7qhfq049n5zw1x2zbbrvmlnvbd9yaanlgrf0hc" + "commit": "c67298a215136617de60c9041904ee6a455dcd4f", + "sha256": "0bjgzh4z4bz4nr97cn9wd92brg7wik37c0vd3kfisdalxq2wrgn5" }, "stable": { "version": [ 0, - 13 + 13, + 1 ], "deps": [ "datetime", "extmap" ], - "commit": "638dbd4833c6387be3849d0097b5b1a14c619afb", - "sha256": "1arzz27vf6r62m7qhfq049n5zw1x2zbbrvmlnvbd9yaanlgrf0hc" + "commit": "c67298a215136617de60c9041904ee6a455dcd4f", + "sha256": "0bjgzh4z4bz4nr97cn9wd92brg7wik37c0vd3kfisdalxq2wrgn5" } }, { @@ -58100,6 +58521,50 @@ "sha256": "1hwm7yxbwvb27pa35cgcxyjfjdjhk2a33i417q2akc7vppdbcmzh" } }, + { + "ename": "lsp-dart", + "commit": "acbba6bc6f1bb6e1153f1f75ca1dc025bb5a8993", + "sha256": "0q2x3i5yydnrplfgk8fcngdsxf1g1vz1jzkbwhiqf46wrv5vxwl3", + "fetcher": "github", + "repo": "emacs-lsp/lsp-dart", + "unstable": { + "version": [ + 20200423, + 2120 + ], + "deps": [ + "dap-mode", + "dart-mode", + "dash", + "f", + "ht", + "lsp-mode", + "lsp-treemacs", + "pkg-info" + ], + "commit": "a27d12209570fe10c60e55e0718123fc2e7f7e8f", + "sha256": "192nmx00s4hxylp4lqfycbi2g8aq7bbzmy70c1qxh7k5m24yigxj" + }, + "stable": { + "version": [ + 1, + 6, + 10 + ], + "deps": [ + "dap-mode", + "dart-mode", + "dash", + "f", + "ht", + "lsp-mode", + "lsp-treemacs", + "pkg-info" + ], + "commit": "a27d12209570fe10c60e55e0718123fc2e7f7e8f", + "sha256": "192nmx00s4hxylp4lqfycbi2g8aq7bbzmy70c1qxh7k5m24yigxj" + } + }, { "ename": "lsp-docker", "commit": "f592ec9b1d6a05e1e115d4b313be108c8e47ee67", @@ -58145,15 +58610,15 @@ "repo": "emacs-lsp/lsp-haskell", "unstable": { "version": [ - 20200309, - 2144 + 20200407, + 2216 ], "deps": [ "haskell-mode", "lsp-mode" ], - "commit": "582fa27c8894db888c92b5e53527b8deec82ea7f", - "sha256": "1jrvd8gnd7hc9xksryb35a2qzwwv7q6ncpcsb2l9ryfl5xd26i0a" + "commit": "f7d1f190ebacc96ddbc722e76730ca2db3c4ce38", + "sha256": "0wadna7y1ydx7d88rj15ylvy7gy2y30pr8wds6z10ds321qihs47" } }, { @@ -58182,16 +58647,16 @@ "repo": "emacs-lsp/lsp-ivy", "unstable": { "version": [ - 20200327, - 1007 + 20200418, + 1500 ], "deps": [ "dash", "ivy", "lsp-mode" ], - "commit": "39b90e7aef755b6e7756f2ae306d66b01cb4d18d", - "sha256": "1nss84rzpa1lwxx9sr28nsq1p6z82ifs7n7dh4zl6xm7rl7cr9pz" + "commit": "81e81ced99829358674c5a6bbe2c3e15cecd4ed8", + "sha256": "011126hz98qzb8zn1628z77j2s5w1hgvmb5saj2fr9wncgv1nax9" } }, { @@ -58202,8 +58667,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20200327, - 2019 + 20200425, + 1842 ], "deps": [ "dash", @@ -58215,8 +58680,8 @@ "request", "treemacs" ], - "commit": "5c6953441916c1e2e76ab0c41384ea6f57a18a5e", - "sha256": "13070b986jg1xd8chbr6am8915zg8wjk8mn9zlmn0d9k45zw1gsv" + "commit": "4f66649c2f02978145bd2e51ff8e6444b8631964", + "sha256": "08y81krxrfy9jm0qwmrszp1cainj37339503fqcnddaxgihvgnx1" }, "stable": { "version": [ @@ -58263,28 +58728,58 @@ "repo": "non-Jedi/lsp-julia", "unstable": { "version": [ - 20191011, - 1005 + 20200408, + 1412 ], "deps": [ "julia-mode", "lsp-mode" ], - "commit": "da66e78eb601b1652c3a9096e0ceea6b852aa6a0", - "sha256": "1xn7470lm322lqkkbg95qmzaadk85z3f2f3cx34iq00cmkkppcng" + "commit": "9f158a290168149fd301a1c1c2016600106ad5be", + "sha256": "077mrvxf8df4dppl3xqa7p3ksm3wcms64l306y7i5x878vyjgibv" }, "stable": { "version": [ 0, - 1, - 1 + 2, + 0 ], "deps": [ "julia-mode", "lsp-mode" ], - "commit": "6b0d1a3f32c5e6c5b4c0993f30303569a9e9e9bd", - "sha256": "11jisy6161j4mpqyi06slfr3l7cmmnp7xc6701hszmvl935znn3l" + "commit": "9f158a290168149fd301a1c1c2016600106ad5be", + "sha256": "077mrvxf8df4dppl3xqa7p3ksm3wcms64l306y7i5x878vyjgibv" + } + }, + { + "ename": "lsp-latex", + "commit": "5e3c176af536155c8110006fd4bc63eeb2b2d12c", + "sha256": "01kn9faak6y1zfd1143yj453hl6rp1xykrg5rp196zf6brywj5a1", + "fetcher": "github", + "repo": "ROCKTAKEY/lsp-latex", + "unstable": { + "version": [ + 20200425, + 920 + ], + "deps": [ + "lsp-mode" + ], + "commit": "6c5b0d926857b16c7cf6eae3111709393845f523", + "sha256": "1qgryycjbvdk2i11qsdzrrlmhsvrpwfn3kw4g73zri4vfwz9cr44" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "lsp-mode" + ], + "commit": "d016440fe364a016935bd90ae07e22d9012bcf8f", + "sha256": "0a6nryx7vshh4k0amlw3w3fn4yr8zlqxq5py8vj3pz4zkcndhxks" } }, { @@ -58295,8 +58790,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20200329, - 1431 + 20200426, + 440 ], "deps": [ "dash", @@ -58307,8 +58802,8 @@ "markdown-mode", "spinner" ], - "commit": "9835e93f5526110bdeb164e42d8da16c1e39feb7", - "sha256": "0vd0vdbhfv31r63cygg40bzfj2v66k3zqd66hmkfzghhjl9d4q9f" + "commit": "9c1ab8adf1a7674e15b643a4dd3781c4bed6537f", + "sha256": "127b2j0gfrkzb4g5p7hfv505afllhspni4w91kwgccf4b1a9di99" }, "stable": { "version": [ @@ -58399,6 +58894,24 @@ "sha256": "0dd4n0c1rbqcy7hl6gb9nqjj7hfv4566d6ipdlnxjma0zjs84sjf" } }, + { + "ename": "lsp-pascal", + "commit": "41e4088e4b0cd99aafac40c83188112a680a65f7", + "sha256": "08zvh9r1plnirdp8qb0p8xfq0y7qx7awq98gn8340f5zbwh9006q", + "fetcher": "github", + "repo": "arjanadriaanse/lsp-pascal", + "unstable": { + "version": [ + 20200422, + 1610 + ], + "deps": [ + "lsp-mode" + ], + "commit": "b132bdf66748e4abe0d4140f6d061b1ccd56082a", + "sha256": "09v79p6wsp775ky1wy5fr0hwh5j33jvdvcarjs20zbdwnrs53am8" + } + }, { "ename": "lsp-pyre", "commit": "5b243c6ab0a441531e02dc8fdd88c023ba505d25", @@ -58425,15 +58938,15 @@ "repo": "emacs-lsp/lsp-python-ms", "unstable": { "version": [ - 20200223, - 2136 + 20200425, + 555 ], "deps": [ "cl-lib", "lsp-mode" ], - "commit": "5d0c799099aa5810858174f390e28fff3894bc06", - "sha256": "002h0i93blsv092pnfmzsfx0pj98r9glki0ki9n7gxg1z3nb0ybp" + "commit": "19feb4aaaa03382e5d9841f237dd1685d8fe2994", + "sha256": "040qahn9h30n44ik0yrcdysx9lhvdnjxh1wj5nzylmzblxz9s2ga" }, "stable": { "version": [ @@ -58494,8 +59007,8 @@ "repo": "emacs-lsp/lsp-treemacs", "unstable": { "version": [ - 20200220, - 534 + 20200414, + 407 ], "deps": [ "dash", @@ -58505,8 +59018,8 @@ "lsp-mode", "treemacs" ], - "commit": "2e3606eebfa8bd909b45b88e59d8eecc6afea4a2", - "sha256": "08xpf677jj1cnfkbpb148h3wld8lvlarp2yq89539nfcmajx53ch" + "commit": "9d1a42b7d7abb112035f05f50ffde9834da034ae", + "sha256": "1kbr2ndbg0lqjcnsyvmpv513kzj3gy0kd0wa18ixh96i92a2znar" } }, { @@ -58517,8 +59030,8 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20200311, - 1837 + 20200402, + 839 ], "deps": [ "dash", @@ -58526,8 +59039,8 @@ "lsp-mode", "markdown-mode" ], - "commit": "134d9b725d21f8889f3dc72dddc418c6c6561f0e", - "sha256": "1ajza32nj4l5m0x9kghlwc2plavd507wajna6cdk5z276lyrn38a" + "commit": "242dfe859c3497c456eaacfd84942e12419529fe", + "sha256": "1sx4nn6mkqhxp67jvh8pp0i4g26rzyvlq2b59r7ipmxh91c2a4fh" }, "stable": { "version": [ @@ -58552,11 +59065,11 @@ "repo": "immerrr/lua-mode", "unstable": { "version": [ - 20191204, - 1434 + 20200405, + 1305 ], - "commit": "1f596a93b3f1caadd7bba01030f8c179b029600b", - "sha256": "0swnan2v2lc7s1jsnmkyzv7gajx08akgm6dvbsgm5hzp0mjbbpy4" + "commit": "658bf8f6c2bdcfe41cd14f5fb651563b41d0fbaa", + "sha256": "1qaqp2s5fnb2zz3bzc1yx79ilqxrf04lmd5gkk56nka4flyslp80" }, "stable": { "version": [ @@ -58607,14 +59120,14 @@ "repo": "sjbach/lusty-emacs", "unstable": { "version": [ - 20200115, - 1413 + 20200415, + 1456 ], "deps": [ "s" ], - "commit": "3f4be19e0c466399c680a355c402b09792123e4d", - "sha256": "1915w43dwvqkklxdh1scy4yxzmalyyrx76iy9wl024svwjq3i0np" + "commit": "1b7053b41083666c6805bcaeb55ece6dcc0d77cb", + "sha256": "1y3nzp6rpg7anv5xscbp4lzmfdvzffcxha9vx3mrclhjg6giz510" }, "stable": { "version": [ @@ -58673,26 +59186,26 @@ "repo": "montag451/lxc-tramp", "unstable": { "version": [ - 20200321, - 1815 + 20200414, + 1445 ], "deps": [ "cl-lib" ], - "commit": "ad03a98386d4cdb0df3eb323ecaab8fe6d0942c6", - "sha256": "1x43na4m7krkhhsvvync9k0rk4lxdakl52n43aafyx43zgv5zk8y" + "commit": "1585e55a5deb89e2f4e30a0ad9e0f121d1e0ebcb", + "sha256": "1zs4wcbxqx8275j2q1118ipqw7532cd6cdy2whw22ck4z5w47vfg" }, "stable": { "version": [ + 1, 0, - 2, 0 ], "deps": [ "cl-lib" ], - "commit": "ad03a98386d4cdb0df3eb323ecaab8fe6d0942c6", - "sha256": "1x43na4m7krkhhsvvync9k0rk4lxdakl52n43aafyx43zgv5zk8y" + "commit": "1585e55a5deb89e2f4e30a0ad9e0f121d1e0ebcb", + "sha256": "1zs4wcbxqx8275j2q1118ipqw7532cd6cdy2whw22ck4z5w47vfg" } }, { @@ -58973,8 +59486,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20200318, - 1224 + 20200425, + 2117 ], "deps": [ "async", @@ -58983,8 +59496,8 @@ "transient", "with-editor" ], - "commit": "236c44518d30c43c7035be32f02ba615d148b5ef", - "sha256": "0fbcx8qfymvd1i96a21gzsd4882qz6xlgccvba0dam8h9aninqf6" + "commit": "8de6ecf5c5c840f8a964c3e5bd4d7a1aedf04e10", + "sha256": "0fwaasr7g4qj9l8dxcy1228p2rpb2xy16w2g27gqdzyd6a5sc2jw" }, "stable": { "version": [ @@ -59019,8 +59532,8 @@ "cl-lib", "magit" ], - "commit": "9ffebd50a18adba70a9cfc2710012dfd650c5376", - "sha256": "0sihrmk9snazdj1dana7q89a5qd7xjclhmfqh15gvxchs4a8jwqg" + "commit": "0bc96737634e78ac7c7f8a3f73190531c0890914", + "sha256": "1lm8412n2046fz8n7rfbadyww2074lsxq0w4gm1x1alraz5im5h4" }, "stable": { "version": [ @@ -59311,8 +59824,8 @@ "libgit", "magit" ], - "commit": "236c44518d30c43c7035be32f02ba615d148b5ef", - "sha256": "0fbcx8qfymvd1i96a21gzsd4882qz6xlgccvba0dam8h9aninqf6" + "commit": "8de6ecf5c5c840f8a964c3e5bd4d7a1aedf04e10", + "sha256": "0fwaasr7g4qj9l8dxcy1228p2rpb2xy16w2g27gqdzyd6a5sc2jw" } }, { @@ -59460,14 +59973,14 @@ "repo": "magit/magit", "unstable": { "version": [ - 20200318, - 1224 + 20200425, + 2044 ], "deps": [ "dash" ], - "commit": "236c44518d30c43c7035be32f02ba615d148b5ef", - "sha256": "0fbcx8qfymvd1i96a21gzsd4882qz6xlgccvba0dam8h9aninqf6" + "commit": "8de6ecf5c5c840f8a964c3e5bd4d7a1aedf04e10", + "sha256": "0fwaasr7g4qj9l8dxcy1228p2rpb2xy16w2g27gqdzyd6a5sc2jw" }, "stable": { "version": [ @@ -60322,14 +60835,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20191230, - 1055 - ], - "deps": [ - "cl-lib" + 20200421, + 2222 ], - "commit": "e9dff50d572caa96b68a7466c18c97a8d6ed651c", - "sha256": "0v7a56fqwaqzqkpip7lpbsf9jnnwfjwd3jf61xnziv6j9sa46p1d" + "commit": "365697302345f8b9dc10bc975477452a282f7ae0", + "sha256": "1afjp0j5498zzbl8ycrz37cqdssfjlxcx5g4addzv0xaicfghgk6" }, "stable": { "version": [ @@ -60909,6 +61419,24 @@ "sha256": "10xxgvzjb7bl3lzgjkdsnnkd9wphkc2pm621agyjlayzcjnldz5p" } }, + { + "ename": "mc-calc", + "commit": "a8cded39a6c14d34f618aba136d48e162a70c433", + "sha256": "1lphlavndz0m3pw2kcrbqkavvcgmzn2p3av0h60ghndz00psqbys", + "fetcher": "github", + "repo": "hatheroldev/mc-calc", + "unstable": { + "version": [ + 20200420, + 1836 + ], + "deps": [ + "multiple-cursors" + ], + "commit": "74a046a5728919a4d1135ca62738326b0dde278c", + "sha256": "0498088pgbpywqdla8mzhpq4izzbdbqwq9cjzg0050y598pinpqq" + } + }, { "ename": "mc-extras", "commit": "12747bb8603ebc09ce0873f3317a99e34d818313", @@ -61208,6 +61736,25 @@ "sha256": "05gfprcrh9p06arsni58nf60inlf1zbd18i678r9xd4q0v35k491" } }, + { + "ename": "meow", + "commit": "b5515ad6f1b8e8296fba5bd91d7adf5e1fc229b4", + "sha256": "1s9wqmxg1g8crhsvwn4fh3hkn7pyfj5x71fal9yl0fk6gx59n1p0", + "fetcher": "github", + "repo": "DogLooksGood/meow", + "unstable": { + "version": [ + 20200425, + 1327 + ], + "deps": [ + "cl-lib", + "dash" + ], + "commit": "f9e4296ed96ca31c8197ba8a5576fc94ee433755", + "sha256": "0dgdf6xlylnnsm7954xa8vf50x4mfcr8gvajrcii2shbcb23b8c8" + } + }, { "ename": "merlin", "commit": "9338298a79b7f2d654df90b0f553aeed1428de13", @@ -61219,17 +61766,17 @@ 20191025, 851 ], - "commit": "37e38e44f57fa2caac5ed8a1268e747a42174c85", - "sha256": "1r73dy1wyrdclcnp9dpk7r463fwkh2ybi31q1mmxym1xwvkg5ahl" + "commit": "21f4ba18acd9ca3dc5c8263acfc46042a6aa557e", + "sha256": "1sp1g70wy8qp34641hlpk5xaf7vv359xgwc7z8cw7yvj39mn98va" }, "stable": { "version": [ 3, 3, - 3 + 4 ], - "commit": "73e9771bcc1c8f8575b505a62c58ad40004cf5f7", - "sha256": "12mh5p87rjwvkf6dqmxka4jbvhcd729972b726im6v0a27ncqh77" + "commit": "21f4ba18acd9ca3dc5c8263acfc46042a6aa557e", + "sha256": "1sp1g70wy8qp34641hlpk5xaf7vv359xgwc7z8cw7yvj39mn98va" } }, { @@ -61269,14 +61816,14 @@ "repo": "abrochard/mermaid-mode", "unstable": { "version": [ - 20200320, - 1357 + 20200420, + 2258 ], "deps": [ "f" ], - "commit": "a5b16bc4308e2a520711c2ef8a964e269115cbf7", - "sha256": "150a69rn0wkfb0bmyx21vywh7vcd5a3yfi7i9jgp8zf8hfclsymg" + "commit": "b8673381ff8bbfbdf3f165ae928e7c775a3117e9", + "sha256": "14w2mwqiksmng8pzm4l0c458q0i2m3p4wcfvvmagyqk6mfl05m4l" } }, { @@ -61397,8 +61944,8 @@ 20191018, 242 ], - "commit": "821ed77f0982dfeb1df50380931d53e6b7b7036f", - "sha256": "16hrnfz4jp5a672rvgk6ky9xfzvgxx73p5l96wh3x9294vyjd4vi" + "commit": "60eae1c8a7f82fbcc2660d785b33601daaa29f4b", + "sha256": "06ia4ba6c1yph259wr4y5sdkl1ry6pzbwhx807ia675rp0clp9hz" }, "stable": { "version": [ @@ -61418,14 +61965,14 @@ "repo": "ianxm/emacs-tracker", "unstable": { "version": [ - 20200126, - 1851 + 20200419, + 1758 ], "deps": [ "seq" ], - "commit": "4da64b60091c3d7b23c7c5fd3dba981122b0e1f7", - "sha256": "1jy07b1am1g4hwiwywmi9iyidv3yp933j2y4f9nmfhpb4yjs193y" + "commit": "287ced1bd51080897b2d6084f72f4a697e9b7e94", + "sha256": "190jpvd1li2185d1m9k2md5x0fz156a7lwwl57n4ir54j4h0s8ri" } }, { @@ -61522,8 +62069,8 @@ 20200104, 108 ], - "commit": "3bce96bbd509ad5ffb35ead52128dec5c1a67abf", - "sha256": "01wx7cvk3bvdvkpldhbj7wvqyrra7ajqjkgnj4knjg8m2wrhilhj" + "commit": "e9af8a2595e336542c9dfc656fe808ddc6937a59", + "sha256": "1s72qvg1jwqk27axiqb2wn7y1q3x0rf2mb20yc9kqva553fk5vzd" }, "stable": { "version": [ @@ -61549,8 +62096,8 @@ "deps": [ "calfw" ], - "commit": "86d3682ff9491893da671237be3cde0b0010ca85", - "sha256": "0md61pfjvx8xakahpig39ldfzvwdjgr19qxr78c7bzl98hbjpgq4" + "commit": "f9f048de9fe85a90d376d828ce3dad2a96c62c40", + "sha256": "1m6w12y9dcz85xm7lc7dhc7vjhw0bhdm0b4rcp1fr2sn9wv7c4wz" }, "stable": { "version": [ @@ -61672,17 +62219,17 @@ }, { "ename": "minesweeper", - "commit": "5b7972602399f9df9139cff177e38653bb0f43ed", - "sha256": "1n6r3a3rl09pv4jvb7ald1gaipqylfchggza973qv9rgh5g90nag", - "fetcher": "bitbucket", - "repo": "zck/minesweeper.el", + "commit": "d3828ad7599d13728b5571b882344c3ada434b85", + "sha256": "061l7xh7vjg5krz5lskj2jvrnsv2qq4bwg0qkkysmy4zp9f3m5iq", + "fetcher": "hg", + "url": "https://hg.sr.ht/~zck/minesweeper", "unstable": { "version": [ - 20150414, - 522 + 20200416, + 2342 ], - "commit": "d29af12fc6115399c11bdf7461a74cb810c97336", - "sha256": "1b2kn4c90hl07lzdg10wamd4lq8f24wmaj4zvr728pwyga99b2av" + "commit": "d4248e3c9b3e9e7277cb9e6d081330611898f334", + "sha256": "0b648nsnwn461r2alg9v220v0c4djyvwn7xgwh8c8sb9pjwbmw90" } }, { @@ -61711,11 +62258,11 @@ "repo": "muffinmad/emacs-mini-frame", "unstable": { "version": [ - 20200327, - 2218 + 20200424, + 852 ], - "commit": "30000e659b0ad2501591343b4818e5877783483b", - "sha256": "07b4903i3h91rjdixqsyhfclwg936n538bpiglay9r2klaa6kjp1" + "commit": "3aa8de59d170d7bdc16e5f829d952d82abd7739c", + "sha256": "02j2w4c4wvqr1csmr94rzhbrwhqfb5wmjngxa9wl58z1plwy4d8m" } }, { @@ -61741,25 +62288,25 @@ "repo": "kiennq/emacs-mini-modeline", "unstable": { "version": [ - 20200319, - 526 + 20200424, + 647 ], "deps": [ "dash" ], - "commit": "efe3f9743004d7989ea3b82d2bc71960e990bdc0", - "sha256": "0wy52ixj16029xk5grh1531afdcmpfi25iacl9bhplsrivzjl7hf" + "commit": "4f1dce78916cccd2e7066345ae2be3394a675c46", + "sha256": "0qbd6jdaqfs43i9cgs4n4d8vkv3nbcxcmwkd9xrj1d03rdmyzxh0" }, "stable": { "version": [ - 20200309, - 413 + 20200408, + 729 ], "deps": [ "dash" ], - "commit": "4d97bf35cf0f9d58b14d13a78172c15463820382", - "sha256": "0cqzqrc8wpxav08fx9n1ljpzf97hj3wdhizywj4avnyxj3g63zwi" + "commit": "b761e41479a2564e801ac6c427956203de3d62ca", + "sha256": "1ngggz4n35bklgya6ymc98w7y2annxcpdkikd5afd5jn8w7x2vxg" } }, { @@ -62031,6 +62578,21 @@ "sha256": "0ai4ff6hinajvnp8r86s5pv0rrv8h68ncdz4k98kka1ws2f79zdf" } }, + { + "ename": "mix", + "commit": "aaa1958ac6a0e59613e1b71e0eddbe4989d93e67", + "sha256": "1wflzfr7jgvd01il9zz96wasdyjxxi5nrzva9hlrkgqhp0h877sk", + "fetcher": "github", + "repo": "ayrat555/mix.el", + "unstable": { + "version": [ + 20200419, + 820 + ], + "commit": "37916fa5f7dfe448585fb83ea6253eb0f84df15f", + "sha256": "09pk4bakqz01ci06c79ywwb8ijdfgw3rxrz0wlaz4zmlbirkzma6" + } + }, { "ename": "mixed-pitch", "commit": "7d3c7af03e0bca3f834c32827cbcca29e29ef4db", @@ -62228,8 +62790,8 @@ "f", "js2-mode" ], - "commit": "33e1b521a8a8d0225df353b51f1e8a4588ee32d0", - "sha256": "1ln6wz452sfxy7ii211ha9p0n3pygxyzyk0raczfla3ln8dh989q" + "commit": "cfd5b1a8a32162575f1c30b82e17b74efb67cf1c", + "sha256": "015pinqd2bxac372dvmcxnc7z9qayq4xpa254sp31bdzn4r5xns4" }, "stable": { "version": [ @@ -62476,11 +63038,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20200330, - 706 + 20200425, + 1503 ], - "commit": "cedb331001d0623eb003591b2f650b8e5e4069ed", - "sha256": "0nw3jlx2h9127y9b8mmyrps9jyvr33yz2dr9q33j9fll1b8wapn0" + "commit": "0344a1b534468bdf072040d467ac853215d4fa63", + "sha256": "1bpryv6i8vm3g7avhns7nr65d82zq5kahh9kap7zg4w2a4gx1hl7" }, "stable": { "version": [ @@ -62500,11 +63062,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20200330, - 706 + 20200425, + 1503 ], - "commit": "cedb331001d0623eb003591b2f650b8e5e4069ed", - "sha256": "0nw3jlx2h9127y9b8mmyrps9jyvr33yz2dr9q33j9fll1b8wapn0" + "commit": "0344a1b534468bdf072040d467ac853215d4fa63", + "sha256": "1bpryv6i8vm3g7avhns7nr65d82zq5kahh9kap7zg4w2a4gx1hl7" }, "stable": { "version": [ @@ -62691,11 +63253,11 @@ "repo": "oneKelvinSmith/monokai-emacs", "unstable": { "version": [ - 20200329, - 49 + 20200416, + 2001 ], - "commit": "1b937eab15326b3b2e4183229a01376c30e6781c", - "sha256": "0c2sfzxag01w2n61xy02aw2hwv7k1nm64iwbjyf0rsqcq0m64pz8" + "commit": "4281fc13dadef98942c8d43024de024f2392fec5", + "sha256": "0049ny3m1mgn0b97m0clcmmh2xzn66flbsd8k45dn0qxm5wlaj3n" }, "stable": { "version": [ @@ -63566,14 +64128,14 @@ "repo": "agpchil/mu4e-maildirs-extension", "unstable": { "version": [ - 20200302, - 1228 + 20200410, + 820 ], "deps": [ "dash" ], - "commit": "bd81c3e1c1f690b124937960acd2a819e9a2483e", - "sha256": "0v6aih6gqzg631kpqrqgkj8nw6d7i5ih2qnmraf3i29m5y6gqync" + "commit": "36b1f3a561af173eccc7bebf10ee060af44ed6e7", + "sha256": "1k8xar4yal5nc4ixx78gvs4fvlxpa2c4fzkq3xzh6jwfbrc7g013" }, "stable": { "version": [ @@ -63782,6 +64344,25 @@ "sha256": "1bn6zx931vz2fa72ab999r33bxv8brn3cqmalvq25x7s4z3q1lyi" } }, + { + "ename": "multi-vterm", + "commit": "c87a280364597340baee7711aa33302c0a349fa7", + "sha256": "1dn1m30qmhv4sl84gki8l46rrkabn3ka7nb075q25h1b8lhhijci", + "fetcher": "github", + "repo": "suonlight/multi-vterm", + "unstable": { + "version": [ + 20200329, + 940 + ], + "deps": [ + "projectile", + "vterm" + ], + "commit": "11f1b0cc97a24aba66fb561a0a94e9a66375b30f", + "sha256": "0pzcwn13yj21qcga2agcv8as0jyrmw055fr8nbzvkp1jml4l3vwj" + } + }, { "ename": "multi-web-mode", "commit": "cae2ac3513e371a256be0f1a7468e38e686c2487", @@ -64580,11 +65161,11 @@ "repo": "CeleritasCelery/emacs-native-shell-complete", "unstable": { "version": [ - 20200321, - 2300 + 20200424, + 1635 ], - "commit": "11803df3706fb23d58e418a14ce981204a64e847", - "sha256": "0maljdxigd4fvrm7pv3ssyywl3c1zhfpqdymq933iig7d2hrwxm1" + "commit": "ccb5b52940a9374fbfe92947f0101e7254ba445d", + "sha256": "0p3qrl59qhczwysydsak66j7ixpykr3397xdvjj3hkmmcrsachic" } }, { @@ -64740,11 +65321,11 @@ "repo": "nickav/naysayer-theme.el", "unstable": { "version": [ - 20200326, - 1937 + 20200405, + 123 ], - "commit": "e4d80cb70324a45102075ea923af454a563e9133", - "sha256": "0kxlbvpszb0lrj5dzfmzc1iaxgvhcjwq4hwykif22mkgdigxppx3" + "commit": "9d0bef898f31368cd30e063d53d443dee29683b0", + "sha256": "1jbp8p58bjc0wxs548niv02q9889blnwwfs64h5sm96nzhyzrkn0" } }, { @@ -64969,6 +65550,26 @@ "sha256": "1xqp7aghc8xd1733azl27mjf57qvm0036qbkqmaks2ip8s8c6arj" } }, + { + "ename": "neuron-mode", + "commit": "6e4b79bc01b9ff2b00a4d0c80614f738a9e76dd6", + "sha256": "15ddpc64432013vn43amx0shnhr32cx1vkvn95chmddlkhx7ln16", + "fetcher": "github", + "repo": "felko/neuron-mode", + "unstable": { + "version": [ + 20200426, + 1310 + ], + "deps": [ + "counsel", + "f", + "markdown-mode" + ], + "commit": "aa97a6fbb5c3b33ad73a1ba31c7e50c8842091a1", + "sha256": "18nr1ayw9j3zfwj79qsqvf5nw36fqpyr2bq3cl93kck1adv949d8" + } + }, { "ename": "never-comment", "commit": "ef3f8e712c10d63fea009951d7916fe376267cbe", @@ -65215,8 +65816,8 @@ 20181024, 1439 ], - "commit": "8900fa55b56ba1e2f83b3f3ba2a1b336c97e5dc3", - "sha256": "0x6l5r5i1q7pbvziynbvb395q8rihkr1zyhp4xzw35xn55qyskiy" + "commit": "112217185e0351f9ad7fa17542862ac3c0922653", + "sha256": "0shby25dqy9hkb3chgshr2c3hqq6k35261sv3lw7zj5lxv9jrrkp" }, "stable": { "version": [ @@ -65498,8 +66099,8 @@ "repo": "dickmao/nndiscourse", "unstable": { "version": [ - 20200315, - 2046 + 20200418, + 2355 ], "deps": [ "anaphora", @@ -65508,8 +66109,8 @@ "json-rpc", "rbenv" ], - "commit": "280ac4943af307e6fe8d43a350c663c18c9c7ea8", - "sha256": "11ncy09y4lbivsp72l1lbg45ahqhgdzn56p9j4dxkczv5pnsg6p1" + "commit": "103eb5c13ad2d154c9386b2aa9dbea532435ee7a", + "sha256": "04nympxjg1dhahk7m71769c5lzsxxsnd9c62lqrkn22gvfzm0wm5" } }, { @@ -65520,8 +66121,8 @@ "repo": "dickmao/nnhackernews", "unstable": { "version": [ - 20200323, - 1803 + 20200407, + 1525 ], "deps": [ "anaphora", @@ -65529,8 +66130,8 @@ "dash-functional", "request" ], - "commit": "ab0db2b7e76efa8efc72c0f587a33da1f0dc9905", - "sha256": "10scn7y0v0hirwlckwxb8cr98qmdl0r6c605qdh8jigmcp4c782j" + "commit": "d5e58b373ab6c5f13174e76f5ae62539dc5cfc95", + "sha256": "0gqqdjmasjs1p6nal9s2yhas1xr2nm99rd3rns2b8cd5j04ccvaz" } }, { @@ -65556,8 +66157,8 @@ "repo": "dickmao/nnreddit", "unstable": { "version": [ - 20200327, - 413 + 20200417, + 1757 ], "deps": [ "anaphora", @@ -65566,8 +66167,8 @@ "request", "virtualenvwrapper" ], - "commit": "ccba00ddd62f06e9f085f7f58532b961369d1677", - "sha256": "0fkcp3masas1sdrhp27c017b4r2gw2gp65lcjkvcfck2k9hnypip" + "commit": "7f6e3bdbfa872af8e92ed339671772b46bc7f7f0", + "sha256": "1dbb4pm2dvyvgw6lxjhhdqplb1b1jbvnywy8d3abr5dpzfqzij8s" } }, { @@ -65593,14 +66194,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20200328, - 1359 + 20200413, + 2118 ], "deps": [ "cl-lib" ], - "commit": "92661bc9b33af1e9d405d23f226c1fc80c0c9c01", - "sha256": "1c1zrfnzr7vh4fsrzyr1ivsf07ydxyr4v1776z2xv9bynvwb6lhz" + "commit": "ea8d8654365eeeea366a3ee0f51689987f2803a8", + "sha256": "02mgcz04xz9wkid3gkykbpjw3vriai7anyq3b61iv3pk9kcdp6x3" }, "stable": { "version": [ @@ -65646,8 +66247,8 @@ "dash", "request" ], - "commit": "532eb14328027ee29e124768feec23a8ef7ee798", - "sha256": "1qc9im01fw7k9907a9d2a87hndyyn3sk1kw31cylsvrzsb7ss9f9" + "commit": "ebc6a4a1cc56c01d2bb882e4a40934a6a1f4e9ca", + "sha256": "04zhhz8v6bx627g1vhvd0s8bl5g3d6a1mfgf7pb13627npsvbrdx" } }, { @@ -65914,11 +66515,11 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20200323, - 121 + 20200416, + 1058 ], - "commit": "1fcf068e331b9b79e14f79c8b126711fc3d72cbb", - "sha256": "1pf9xds5csw6vwkb4b15isrw29psdifx8gl8y61la7d1k7b6m517" + "commit": "7b756d1e3885b70e81647a85432e0f2d043167c9", + "sha256": "0n0f6wsm6j980vxli6j6slixws45vgdbmw2xvwrs1j1h91vd0pc6" }, "stable": { "version": [ @@ -66068,14 +66669,14 @@ "repo": "shaneikennedy/npm.el", "unstable": { "version": [ - 20200329, - 1904 + 20200406, + 1429 ], "deps": [ "transient" ], - "commit": "2201ab1d9d424146c725d5e9ad24cc8e0219ba95", - "sha256": "18bm31f6zaskyncn97mfwxdih6b31jpm8v858m920i5j45gh78r5" + "commit": "187ddd2732deb49df1e87fbaace153afb8a3e7e1", + "sha256": "0kh8y0izab3rra5vb1229h77ykz704wh28m7vv0bsfn5lg02ridx" } }, { @@ -66562,8 +67163,8 @@ "deps": [ "axiom-environment" ], - "commit": "2c5384b994266008a20558db4ffe0525e66c0f5f", - "sha256": "17f40w9r4whz0v007pp13w060jq87ag42p21hcj93c14py5s4g67" + "commit": "25932da0dc40c6877463cbf019b14ab05a6b0164", + "sha256": "1xbps0k4x982gh1a0pscpx4kayjjyykvm5pyj516wwkya7bac4a6" } }, { @@ -67423,14 +68024,14 @@ "repo": "clemera/objed", "unstable": { "version": [ - 20200312, - 1817 + 20200403, + 1500 ], "deps": [ "cl-lib" ], - "commit": "9bb351313799bf4fb39f1b680cdf0a7ddccccbb4", - "sha256": "0lp7j4s2w3qmk288nnmh92ad58340srxq20nqiybgrijc0kxkx5a" + "commit": "e89d8dae3b2d4331a4455d2a7b203500537d184d", + "sha256": "1xjcbfqxpda73l8imw1pj9my71qqacri269cv7wnzsfrphqh526x" }, "stable": { "version": [ @@ -67641,20 +68242,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20200325, - 946 + 20200413, + 1503 ], - "commit": "5f22947a41780a59dab7252ef1e3d510e6e2b28a", - "sha256": "1y84lidg5jiix7ap46jakqn3y9x1gzdlnv5473r3qv3cxzaf7l2n" + "deps": [ + "org-re-reveal" + ], + "commit": "6db38600d651f4aea77e0d411466be7fb6314f39", + "sha256": "11akmygscph5pq1zc889pmlp8ab91qk29lwrrp3gxmgy2s5x9mgf" }, "stable": { "version": [ 2, - 7, - 2 + 9, + 0 + ], + "deps": [ + "org-re-reveal" ], - "commit": "5f22947a41780a59dab7252ef1e3d510e6e2b28a", - "sha256": "1y84lidg5jiix7ap46jakqn3y9x1gzdlnv5473r3qv3cxzaf7l2n" + "commit": "eec26a088d19cd202417f662bb487b550230d11f", + "sha256": "1vj99sj71qf622gc9fy6kafp4ki7arqljj1dwkl4k2fnf4hv3af7" } }, { @@ -67717,20 +68324,20 @@ "repo": "rnkn/olivetti", "unstable": { "version": [ - 20200320, - 1154 + 20200417, + 607 ], - "commit": "5dc27716c706166e1932f4a0e9f94384b6d17cb0", - "sha256": "0im6ds8mvnwfrh3z0cd05g32w9rklhl56xmhzl9i2180pv6qwil8" + "commit": "fa9757fbaa392be622ddf66c2535dfe4b5cca898", + "sha256": "196g4n2cr1w77k2a6582rc3c8fnnfps83f1kh76k8k3lvkjg8pjb" }, "stable": { "version": [ 1, 9, - 3 + 4 ], - "commit": "67e32a7754cda4c8d94227e80bfa708abb4e8e6d", - "sha256": "0928kn9yfwc2mhmja13y39iswlkk474xnszh9qza206j6r37h6p3" + "commit": "9005661e18d9eaaf1105018d084916e4927cc66b", + "sha256": "0ca80z6drsw9jkwijn6f05y1n7rmcypvh0yvsb77wnqrzd7y4p68" } }, { @@ -68186,8 +68793,8 @@ "request", "s" ], - "commit": "6819b6271960dcdc7c32981dadd48968a3640cef", - "sha256": "12frm9w6xh5rkfyvvvpwhdd55nlgsv8w4f52pch0sl437vidcsqg" + "commit": "4c15049079878fcd386cca5dba20b99296a1de84", + "sha256": "1avci3avwhrw040wwjgcv1hayk893y8iwln10vsjyb5rd78y9gsi" }, "stable": { "version": [ @@ -68222,16 +68829,16 @@ }, { "ename": "openwith", - "commit": "855ea20024b606314f8590129259747cac0bcc97", - "sha256": "0l3grbnn349cv26ap2phlmp2h94s68gqznh5zdqwc2cp7lf699sx", - "fetcher": "bitbucket", + "commit": "caca0b2bc2aaac563074cbb4ea4296fce749e203", + "sha256": "0swza74ndw0vkr7q513wp12c2yasla7aaqv0z98mzr0ssx12jld8", + "fetcher": "github", "repo": "jpkotta/openwith", "unstable": { "version": [ 20120531, 2136 ], - "commit": "aeb78782ec87680ea9f082a3f20a3675b3770cf9", + "commit": "1dc89670822966fab6e656f6519fdd7f01e8301a", "sha256": "1wl6gnxsyhaad4cl9bxjc0qbc5jzvlwbwjbajs0n1s6qr07d6r01" } }, @@ -68274,6 +68881,21 @@ "sha256": "1dwps9zv1jnc7m75j5cdla14pnv2vnivm5bq0zcvqfsvilvd38ds" } }, + { + "ename": "orderless", + "commit": "3f1f2c378e63c5ce8a8d37735f914ce0663a76d3", + "sha256": "102jfzq2zskaa8jcb4mmmndcdc8221qp0hqlgvwirnzkxms9ij4a", + "fetcher": "github", + "repo": "oantolin/orderless", + "unstable": { + "version": [ + 20200425, + 855 + ], + "commit": "b69b52289fdb0023a3123b1ddec5b490125345a3", + "sha256": "0vxpaqsad3x1lqga1ky7sipm8lk8ps66wpcvz52jdqasxmxzvrjm" + } + }, { "ename": "ordinal", "commit": "ea3dd6fe4cacc229dd1371cb66dd1cfd07321bf4", @@ -68572,14 +69194,14 @@ "repo": "Kungsgeten/org-brain", "unstable": { "version": [ - 20200328, - 1700 + 20200426, + 1410 ], "deps": [ "org" ], - "commit": "ec4bd9dd290459657426bb06e78f666ac0310420", - "sha256": "18937fm3np1ngxc1rmjsg0mzrf7jr56gd87ygsi84y5cmw4j08zb" + "commit": "ae7fe0f628bd093526786ece6917f7a4310e5e4d", + "sha256": "0szav8idqq2gmckaxqnjgcah978as2nhv43nl9vvvfkc9dc2l5x4" } }, { @@ -68677,14 +69299,14 @@ "repo": "Chobbes/org-chef", "unstable": { "version": [ - 20200220, - 2016 + 20200408, + 1328 ], "deps": [ "org" ], - "commit": "61686fd87892e60268fc43348282abbfd879e5c9", - "sha256": "0n493p9dqx9bb6jcrb34s1rk8afwpz1fdgwrm64g7a0y2mbfga74" + "commit": "67f50aa2a2839ffdb1c1a5e2f135e69f868e4b26", + "sha256": "041z6f5fyzc46grwqllz81hixkdqdic3a6zird7i0yy7cr2hqhcf" } }, { @@ -68760,11 +69382,11 @@ "repo": "justintaft/org-clock-split", "unstable": { "version": [ - 20200315, - 1716 + 20200331, + 526 ], - "commit": "322379f1bf08c74c034c5c86d8a3045675ee64ac", - "sha256": "0nigylzzxwm4wn8zp5vyrj4y41czcpkvglvy3p4dqn35agklz5mw" + "commit": "39e1d2912a7a7223e2356a5fc4dff03507ae084d", + "sha256": "0yvpmv0v56rsn43ffmwfhw8jjvfklw703qpmkx6d6paljjgy9k8l" } }, { @@ -68822,11 +69444,11 @@ "repo": "thisirs/org-context", "unstable": { "version": [ - 20200217, - 1006 + 20200418, + 1540 ], - "commit": "f354108ecd3d33cadee05a4aec95d2df4bc61ae9", - "sha256": "1zlqciqadhwkhmzlag7w0i83pn9gg0gikfcrv2qlr9nsn5rzzvj4" + "commit": "bbef096dc20b206b792b0ef310f2eed7c70ca3a0", + "sha256": "05s73wn2q3a0mfc14qlgcb1bas9addby0m43id2v8ljvxyigicr8" } }, { @@ -68852,16 +69474,16 @@ "url": "https://git.spwhitton.name/org-d20", "unstable": { "version": [ - 20190628, - 1356 + 20200416, + 2010 ], "deps": [ "dash", "s", "seq" ], - "commit": "0ca1b0a8d9ab0a7d687a9f2edb6eae2e57851129", - "sha256": "0wg95wirq964klpihhgv2flnkyjwwpdqiafn2b2l1785906csrcg" + "commit": "7ede5726d640c4f81146585f6eb907f51a0f6a19", + "sha256": "1p4irzcsq2sxmvpyrkrqs9ylp153mzwr31hvsnfh1f2nlghpicfk" }, "stable": { "version": [ @@ -68945,14 +69567,14 @@ "repo": "abo-abo/org-download", "unstable": { "version": [ - 20200311, - 1049 + 20200410, + 1444 ], "deps": [ "async" ], - "commit": "b96fd7ba02cbdae95cc37970ebcfae8afa8b25d2", - "sha256": "1fx621ll5kjw10n2xhba7h39m1cqvink61kyhb228p6h8cl63kss" + "commit": "46417e2bd30c9bcd1e8a1f4c554ad44543e869e6", + "sha256": "1jzmyr6v33x7012ljbc45w2ww3lb96i4nh1ydxzdjwnbvpj2j17s" }, "stable": { "version": [ @@ -69003,16 +69625,16 @@ "repo": "phillord/org-drill", "unstable": { "version": [ - 20200216, - 1336 + 20200412, + 1812 ], "deps": [ "org", "persist", "seq" ], - "commit": "4c114489e682e514e79701045d541ab6f3dc3fb4", - "sha256": "13y302lyscdqrba1sfx60yf5ji2xi7fbsvjsjbw7hiz63kg6rccy" + "commit": "35c1ce349949cc213f3076799211210f49431850", + "sha256": "06hc98z4sml7jrwm5zvbsw5x6q5jpa335almzkh6h85g1p8syfsn" }, "stable": { "version": [ @@ -69256,16 +69878,17 @@ "repo": "kidd/org-gcal.el", "unstable": { "version": [ - 20191018, - 921 + 20200424, + 1929 ], "deps": [ "alert", + "persist", "request", "request-deferred" ], - "commit": "6821e349673e9ba8d7ae7b84789f931889273dc0", - "sha256": "12alwnk50gsiz5b9mw8qvn317f7phb5vh2x7yvi9m72zdrdaf8pz" + "commit": "1667aba7c0a33e3c23c3a47fc04e89670684eddc", + "sha256": "1zzibnvsdq3iv874x6g6zrjb17mb036dln68mn4a1xlcwvv1king" }, "stable": { "version": [ @@ -69365,20 +69988,20 @@ "repo": "marcIhm/org-index", "unstable": { "version": [ - 20200323, - 1404 + 20200413, + 1609 ], - "commit": "601435b3aeff1b2c00f62deb39adf9b351e9b567", - "sha256": "0v6r78zcvzhj2wgaz22ddpbhjpggiii5j54hl12m02rpbqv0m524" + "commit": "f95dbec874f39aac3c8391a6e0b9796b981386f3", + "sha256": "1dylivz459a4d66rak9sipynyby01plhgjj2vvp9fqvia65yb2a4" }, "stable": { "version": [ 6, 1, - 2 + 3 ], - "commit": "601435b3aeff1b2c00f62deb39adf9b351e9b567", - "sha256": "0v6r78zcvzhj2wgaz22ddpbhjpggiii5j54hl12m02rpbqv0m524" + "commit": "f95dbec874f39aac3c8391a6e0b9796b981386f3", + "sha256": "1dylivz459a4d66rak9sipynyby01plhgjj2vvp9fqvia65yb2a4" } }, { @@ -69444,11 +70067,14 @@ "repo": "bastibe/org-journal", "unstable": { "version": [ - 20200311, - 710 + 20200424, + 1917 + ], + "deps": [ + "org" ], - "commit": "664c08e12cde19ce7dca645ba9accecda7266c32", - "sha256": "02gla6cs8w08jg8czl5855vxvs1jyxq839rh9f95d40x4jgc1rwy" + "commit": "8bf06b28d6f14f52d4968123e2b4b91930c8f947", + "sha256": "0k70k07c4lq20rqljmfkx1pfp8gq4qr0y46n8mh1smzxdznk9nlb" }, "stable": { "version": [ @@ -69603,29 +70229,29 @@ "repo": "alphapapa/org-make-toc", "unstable": { "version": [ - 20200110, - 1804 + 20200409, + 1436 ], "deps": [ "dash", "org", "s" ], - "commit": "be86a4e026befd9d10af42a22b2483c7969ccee1", - "sha256": "0348iq3bc3rxs5bqdvskyly4agqxiapamqkfm0323620kxl70agw" + "commit": "26fbd6a7e1e7f8e473fe3a5f74faec715c3a05aa", + "sha256": "08gkzl0cbgkyg31sxafqmq6v1hjgr2q62vnvncrdnhs3ly54inf8" }, "stable": { "version": [ 0, - 4 + 5 ], "deps": [ "dash", "org", "s" ], - "commit": "be86a4e026befd9d10af42a22b2483c7969ccee1", - "sha256": "0348iq3bc3rxs5bqdvskyly4agqxiapamqkfm0323620kxl70agw" + "commit": "43d4a2490a048b01ca5a6f44c5b4f24a458dfc95", + "sha256": "180ji6nnj6qj0rs1rdp1zlcrfsqf7ikb44ym8icbp5d6al2s4hnr" } }, { @@ -69636,26 +70262,26 @@ "repo": "org-mime/org-mime", "unstable": { "version": [ - 20200323, - 130 + 20200416, + 1048 ], "deps": [ "cl-lib" ], - "commit": "778f818ad3d101f27786556c2a7a9995d5da47c6", - "sha256": "0w3yyqn225c5y0if5pjvvszpasrvh3rh4f0bqjabrvqvrhf1q8ny" + "commit": "9f8444603806e6baa94b2b67a23aab0ea52fef97", + "sha256": "143qj0llargjm375q39lchxz1ws4vsh50f3ar66cclrjvxrfaqdg" }, "stable": { "version": [ 0, 1, - 6 + 7 ], "deps": [ "cl-lib" ], - "commit": "f8eac8ccdec2ebf1dec87d4f5f01b4b53f86c67c", - "sha256": "0gjdhhri2fm93phvv3fnw6iz5agpafryacj521j80jf1dmj2bj5h" + "commit": "9f8444603806e6baa94b2b67a23aab0ea52fef97", + "sha256": "143qj0llargjm375q39lchxz1ws4vsh50f3ar66cclrjvxrfaqdg" } }, { @@ -69727,14 +70353,50 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20200303, - 1716 + 20200422, + 1615 ], "deps": [ "htmlize" ], - "commit": "2f521a89b106750ebafa94503cdeb043a02c5ab5", - "sha256": "1wr8qdkf75swf4jfqbv0r2hw7d5bw73nyyv7xa0msbc1hyw33b6l" + "commit": "d41426854e6804d752b25346cf6ae79b0612784c", + "sha256": "0f3lvcgx60j2m97mxgzbxaw9ki37g3yxr6arv54b87572a7wdj8m" + } + }, + { + "ename": "org-multi-wiki", + "commit": "8138002578ef14e30561cac159e9a66406a4201a", + "sha256": "0wbybr9vf4hcwyi9rab8sm1xwxqmy7mbjv1jmm78j51kjh0cpgkj", + "fetcher": "github", + "repo": "akirak/org-multi-wiki", + "unstable": { + "version": [ + 20200419, + 1833 + ], + "deps": [ + "dash", + "org", + "org-ql", + "s" + ], + "commit": "aef5975ac18d7cb101c0fb688333cc241782a8a0", + "sha256": "1m3p839wkrvf7n2467czj03rljv43bk32p7vlzdp5zby22bn7nag" + }, + "stable": { + "version": [ + 0, + 4, + 0 + ], + "deps": [ + "dash", + "org", + "org-ql", + "s" + ], + "commit": "80791ea872939df0578dc3a2992a2f7fd5618971", + "sha256": "0avg5xwnb3c9ylj9dqdcqmh8kykl98jsr6cl3rrivkj7l47i1rl0" } }, { @@ -69819,6 +70481,27 @@ "sha256": "1vwfpdi7hfkxx4vi0cwg7rvqby3i0mymzdkyzrqzv30dazmcjpag" } }, + { + "ename": "org-noter-pdftools", + "commit": "caa6bf82ea660f8e1d68e45cc99c6f6427cf1327", + "sha256": "0k11njy2l8pxwpmxspy6qwvp1041p99xp9ha6pjxp3m3f7rik32h", + "fetcher": "github", + "repo": "fuxialexander/org-pdftools", + "unstable": { + "version": [ + 20200418, + 929 + ], + "deps": [ + "org", + "org-noter", + "org-pdftools", + "pdf-tools" + ], + "commit": "8cc15bb8014ed1f047eecc0abd8bf447f86c0505", + "sha256": "173118fplpz575dcbncrjjpid2ni0acsi9130r210vl6hal7yz08" + } + }, { "ename": "org-octopress", "commit": "fba6c3c645ba903f636814b5a2bb1baca0b5283b", @@ -69943,21 +70626,21 @@ }, { "ename": "org-parser", - "commit": "28d55005cbce276cda21021a8d9368568cb4bcc6", - "sha256": "06yb78mf486b986dhvqg3avflfyi271vykyars465qpk0v8ahq8h", - "fetcher": "bitbucket", - "repo": "zck/org-parser.el", + "commit": "d3828ad7599d13728b5571b882344c3ada434b85", + "sha256": "1galc2w2n2qnwxknym4wid1ldinf8fyf8vvh4ihnckcbh081nrhb", + "fetcher": "hg", + "url": "https://hg.sr.ht/~zck/org-parser", "unstable": { "version": [ - 20190207, - 521 + 20200417, + 301 ], "deps": [ "dash", "ht" ], - "commit": "8610aef8dc878fc001975780bcbcbab30dc929b7", - "sha256": "0vqh37y2b0dc8p9c04ici1h9n9ghd1jizcr1c2zvp75cyqsz09wv" + "commit": "fd4cb7035ff649378cc968b1ec2c386b5c565706", + "sha256": "1hnd4zhhwrd6gr1skvc64a3z9k3nmhwgcyy1cp2jfyhk0iwsrqfm" } }, { @@ -70001,16 +70684,16 @@ "repo": "fuxialexander/org-pdftools", "unstable": { "version": [ - 20200329, - 1507 + 20200422, + 1350 ], "deps": [ "org", "org-noter", "pdf-tools" ], - "commit": "96fe7275c75842732c3fd1527619088f66b6a80a", - "sha256": "1ri58hyksp4fhmm6323ndc1h3ljkxjgbzcp588h76fkpk19lzhq1" + "commit": "8cc15bb8014ed1f047eecc0abd8bf447f86c0505", + "sha256": "173118fplpz575dcbncrjjpid2ni0acsi9130r210vl6hal7yz08" } }, { @@ -70293,8 +70976,8 @@ "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20200315, - 2004 + 20200407, + 1706 ], "deps": [ "dash", @@ -70309,8 +70992,8 @@ "transient", "ts" ], - "commit": "ab5e9aa9116010e5da1995bf19ff26f55b93c214", - "sha256": "0h90vagb91zskvmy06yq0b1vjbkqry0fkxiagg4d076rbx3ryc0n" + "commit": "f4d7399e677904cdc7e220440610704e4bd668bc", + "sha256": "0vfnxmk6k9f4zqbcg4gsg2ga4xr2gqx81sq2hcimx49wvyxh2bwn" }, "stable": { "version": [ @@ -70409,15 +71092,15 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20200206, - 712 + 20200413, + 856 ], "deps": [ "htmlize", "org" ], - "commit": "e4460a98b6bfa01720c287a171252f49c1949801", - "sha256": "0hhwc6yfy69qwiyxca8r12rdxvrj44vzdsnvdk0yc9szsfnmn4hz" + "commit": "61549f4c00284a30e34caa3d76001b233ea5d2ad", + "sha256": "00r324nnci2l0jwx4jhzcrbyai5wmj5cjrav4253c23aqdn5ny96" }, "stable": { "version": [ @@ -70541,8 +71224,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20200309, - 1231 + 20200421, + 1354 ], "deps": [ "dash", @@ -70556,8 +71239,8 @@ "pdf-tools", "s" ], - "commit": "e3eb9215a540ba62a0b0253d003c704b7740deeb", - "sha256": "152wzlavx5b4ap9wdl3dql5idvsjl5zq6zjwcilp9pni6dn34w12" + "commit": "1eb4ddda003b04b49a9a00828347a46f2863ac9e", + "sha256": "19vvcipfhir39qd3qwirrrr6221k8kjviifva0qm6aqxv7hlfaqm" }, "stable": { "version": [ @@ -70681,8 +71364,8 @@ "repo": "jethrokuan/org-roam", "unstable": { "version": [ - 20200329, - 1330 + 20200426, + 1107 ], "deps": [ "dash", @@ -70692,13 +71375,13 @@ "org", "s" ], - "commit": "b86d2c8637f5eafd587c4cf4fe85e7d0380844f4", - "sha256": "04i8i3dixf50vqp8jrwcbf4c8d7m47g9lyzj76h49jd8bv2fqang" + "commit": "41423005010f2f78c3e9301b97f1b0db83fd29b5", + "sha256": "1w8xv4wiskibwla7ga5bcjqpvzgmcxm52zazqpjp210vp22v545z" }, "stable": { "version": [ 1, - 0, + 1, 0 ], "deps": [ @@ -70709,8 +71392,46 @@ "org", "s" ], - "commit": "1433dbc31602c412914c71ecc81aa5dcf6b03daf", - "sha256": "08pfa63k194dpk0y2gfa0nzn5lig81q0l9axkq5j4ibj6ifaap4a" + "commit": "27a63b59b176f9d2048de69eb0f525f3c7be8f5f", + "sha256": "18ljww204kf1pbgrrnx7bn6177lw1bs3npywbx2k1b5j35c3j8xv" + } + }, + { + "ename": "org-roam-bibtex", + "commit": "cc4e4ea60d2363eb691cb87ca3105bd25fc405ed", + "sha256": "1q9l49q478zlmcz0wi239qsz2pvmqxyb9qac2k42p19zqnfgkmsg", + "fetcher": "github", + "repo": "zaeph/org-roam-bibtex", + "unstable": { + "version": [ + 20200425, + 1114 + ], + "deps": [ + "bibtex-completion", + "f", + "org", + "org-roam", + "s" + ], + "commit": "6bbdebb39d7edf9b369c16311afa18cf00cecffc", + "sha256": "0fp9cmgn9g4hnqsj9bn5885him0wxbs3qwvnw9anrwyybg6sv2i6" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "bibtex-completion", + "f", + "org", + "org-roam", + "s" + ], + "commit": "9c224890ef9b8fb38b48d48d6f029be00f1c2166", + "sha256": "14f3d1yiidglwbygb5swk44fvky7cla3r11i4zx56hrf8lxjzhp6" } }, { @@ -70731,6 +71452,46 @@ "sha256": "1hn8y9933x5x6lxpijcqx97p3hln69ahabqdsl2bmzda3mxm4bn2" } }, + { + "ename": "org-runbook", + "commit": "1ddf4d4e4bd22cc85150c8cbf635ace1f54d64fc", + "sha256": "0dih8kv6fhqbfmw2x8ndl6gygssl3g0jr5qkbgbf4wkl5xjls3cg", + "fetcher": "github", + "repo": "tyler-dodge/org-runbook", + "unstable": { + "version": [ + 20200412, + 403 + ], + "deps": [ + "dash", + "f", + "ht", + "mustache", + "s", + "seq" + ], + "commit": "8bec754c3007238d4e1c7296454815bf7000b31d", + "sha256": "10bfc8pr576ia16w5mwkksg9yn0jhcsbrkzw9yrjkvq2yzqsgpc0" + }, + "stable": { + "version": [ + 1, + 0, + 6 + ], + "deps": [ + "dash", + "f", + "ht", + "mustache", + "s", + "seq" + ], + "commit": "53e8876a1587190ec4d103f9e94380f34797ce49", + "sha256": "1cyb956s3vshh2i4gd37m1cjxwq5s0xj55pwysgganwgxxw22c8n" + } + }, { "ename": "org-scrum", "commit": "8315b6834d76180fd050b0d5cc2239d604fe2f3b", @@ -70937,11 +71698,11 @@ "repo": "bastibe/org-static-blog", "unstable": { "version": [ - 20200324, - 747 + 20200415, + 623 ], - "commit": "635ec9901be9d03402dd3d4b11e71f07bf1cf6f9", - "sha256": "1fc0r53209igflfxm2dncpmdh8zncr40y1ylj1j2pcyrdlghqpvw" + "commit": "ce92384b364de6421ab67e6399ae56b8ea51df49", + "sha256": "09i23m9knhr8px1f71wx4csddmrzgy9k4s9a2mq4la1wmj1jy627" }, "stable": { "version": [ @@ -71028,26 +71789,26 @@ "repo": "integral-dw/org-superstar-mode", "unstable": { "version": [ - 20200311, - 1848 + 20200416, + 2354 ], "deps": [ "org" ], - "commit": "715a9681d31968807df349280f96932f1a986f37", - "sha256": "0klq0khb59hmkwhay0dln5zhii8mbk3d7rn7rddixrrh5x5ghrlv" + "commit": "09ddc28383d363a4b353348a433e24535b4af0e3", + "sha256": "14w06v76xi4f6hpq6xzicrjjv0b802g5zc9as4mpimfy5gx2xpm0" }, "stable": { "version": [ 1, - 0, - 0 + 2, + 1 ], "deps": [ "org" ], - "commit": "2f9f9d6b21cb54c2ce6af15ab0e3c73e2b962d78", - "sha256": "0q6180qwjpha10zsiw0ni6lanyjwlj8141a6qivfcs8nwczz7nvz" + "commit": "09ddc28383d363a4b353348a433e24535b4af0e3", + "sha256": "14w06v76xi4f6hpq6xzicrjjv0b802g5zc9as4mpimfy5gx2xpm0" } }, { @@ -71247,8 +72008,8 @@ "alert", "cl-lib" ], - "commit": "baa1ce6333157fed3b3799a80e6cf8c73c9e2c18", - "sha256": "04adkz950vvwyzy3da468nnqsknpr5kw5369w2yqhnph16cwwfxb" + "commit": "1e81ea29af1ccc7b4ddb42fe4e3fbfc0adf891b0", + "sha256": "0cqk9q26qby2y1l6x39jfrdrw9x9419mlx2zhndmlb6gv3lv35f9" }, "stable": { "version": [ @@ -71360,15 +72121,15 @@ "repo": "jplindstrom/emacs-org-transform-tree-table", "unstable": { "version": [ - 20150110, - 1433 + 20200413, + 1959 ], "deps": [ "dash", "s" ], - "commit": "0a9bf07f01bc5fc3b349aff64e83999a8de83b52", - "sha256": "1h15fr16kgbyrxambmk4hsmha6hx4c4yqkccb82g3wlvzmnqj5x3" + "commit": "d84e7fb87bf2d5fc2be252500de0cddf20facf4f", + "sha256": "16zi7rg3hdfspifr46gbvpnr1rr144a777whr1w3gp6m46xmgzhs" }, "stable": { "version": [ @@ -71428,6 +72189,25 @@ "sha256": "1jsc39xmli54mcqcdddzyaphmhlamwq167vfr2g133c3p0wx8swh" } }, + { + "ename": "org-treeusage", + "commit": "8868893e4109db9b348a62bc012c89648384994e", + "sha256": "1vxal0a4k348sqpivvahjlchk7w5a02dkqvxpqgjs1rlbs7vfv90", + "fetcher": "github", + "repo": "mtekman/org-treeusage.el", + "unstable": { + "version": [ + 20200418, + 1904 + ], + "deps": [ + "dash", + "org" + ], + "commit": "fe4323bc500e2d949848c75e8f59340971b35562", + "sha256": "0v9zd2lnzvdxz3wqvw0j3bzd7228x6k8dyr7pzmimkl4l26cybqm" + } + }, { "ename": "org-trello", "commit": "188ed8dc1ce2704838f7a2883c41243598150a46", @@ -71446,8 +72226,8 @@ "request-deferred", "s" ], - "commit": "e8e88239b5130307368f554b96fbf05ff4c207b5", - "sha256": "0kzvyv8rs0fsfbqsvgdjxlfa0qyi7wsdnfjw7c0hbwi25al39zm7" + "commit": "cd7bf366d40bb4af4a1a9801446dc98f713eac8a", + "sha256": "08pgn3llbk0sz5v50jqa7mvdv6dw507kgkrkk0ciii1jalg4786a" }, "stable": { "version": [ @@ -71602,19 +72382,20 @@ "repo": "marcIhm/org-working-set", "unstable": { "version": [ - 20200207, - 2036 + 20200416, + 813 ], - "commit": "813c2e7af2ec1dacf037b1f971f070a4f784d2a5", - "sha256": "12dagcvcba3j74grijgibpskr3qc373m25xkp2p86ap81bg58zn8" + "commit": "344d92ee5c117077317616e33d5945703059ac00", + "sha256": "1hzvv23bx4mscl3sw6nr8gggch8rdlyg33fhdv89xpgr700dx1nx" }, "stable": { "version": [ 2, - 0 + 1, + 6 ], - "commit": "813c2e7af2ec1dacf037b1f971f070a4f784d2a5", - "sha256": "12dagcvcba3j74grijgibpskr3qc373m25xkp2p86ap81bg58zn8" + "commit": "d6fff111930befa52a5cce128c986b0162ddf8c4", + "sha256": "1s9rqjn6c52kvz4v1ma6icdykvkvrvbyllpy5i1mg0pb4acbbwym" } }, { @@ -71656,8 +72437,8 @@ "metaweblog", "xml-rpc" ], - "commit": "821ed77f0982dfeb1df50380931d53e6b7b7036f", - "sha256": "16hrnfz4jp5a672rvgk6ky9xfzvgxx73p5l96wh3x9294vyjd4vi" + "commit": "60eae1c8a7f82fbcc2660d785b33601daaa29f4b", + "sha256": "06ia4ba6c1yph259wr4y5sdkl1ry6pzbwhx807ia675rp0clp9hz" }, "stable": { "version": [ @@ -71683,11 +72464,11 @@ "repo": "tumashu/org2ctex", "unstable": { "version": [ - 20191024, - 610 + 20200331, + 550 ], - "commit": "d4af170f5190dad3aa31ab1cf4c6f087d56ab111", - "sha256": "0m28mxsq1d5ggr8phfn94pb38lj8x3sxykh7hfqbwhphaza3by5q" + "commit": "2e40aa5e78b0562516f46f689e7b74cdf451cc2a", + "sha256": "06ip9663xvygpr484r09v7c55nn0pxmr30455iqpmxi32dwx974g" } }, { @@ -71816,11 +72597,11 @@ "repo": "kostafey/organic-green-theme", "unstable": { "version": [ - 20200301, - 1916 + 20200418, + 2058 ], - "commit": "9374259e1b22d68f30a1f5376052ab09dbad606d", - "sha256": "13jpfn4sjsw0lssrq0n75085j2g41ppmwky5mq0nyv8j0c0mmqpk" + "commit": "5218473fb500e58ccad3f73cfc4245f161869f89", + "sha256": "07l10mjgz0il5z7qpn2bw7621m5frgcmsb2pl9pyhfrjykvf8mih" } }, { @@ -71897,16 +72678,15 @@ "repo": "magit/orgit", "unstable": { "version": [ - 20191205, - 2300 + 20200417, + 1720 ], "deps": [ - "dash", "magit", "org" ], - "commit": "e7cddf39e301c87c36c7de13e429dee74874d5c8", - "sha256": "00s3a8i221didw8phlbvdvihj9pxkq9k9j9vh1g1mzd7cz58dm07" + "commit": "e147f055772cc934fe1f1d8619059badeb647c93", + "sha256": "1q3v22drqbjzzr6d0zdwczz1rq37iyh78k2nk1wirbs5z4ixfyx8" }, "stable": { "version": [ @@ -71931,15 +72711,15 @@ "repo": "tarsius/orglink", "unstable": { "version": [ - 20190919, - 1859 + 20200413, + 2124 ], "deps": [ "dash", "org" ], - "commit": "988ad54db45708b0fe835829d512eb6d5f6cf161", - "sha256": "1mswfbwz7fm9lriab365g7hq8hn85gxcsg8y41by9j0n8hb3hj5q" + "commit": "a5f5da06174d22dc21bbac167a8c2361fa84bf2b", + "sha256": "0sxali4vnqzk6mj0m7d82yr2ixvxxj5lzmxffyznpa7j6yndi2mm" }, "stable": { "version": [ @@ -71963,15 +72743,15 @@ "repo": "yoshinari-nomura/orglue", "unstable": { "version": [ - 20171220, - 1226 + 20200411, + 311 ], "deps": [ "epic", "org" ], - "commit": "ae2a45c19b52e45db7891093a3ff17ba2e51c507", - "sha256": "0h3b37wz4hlk022c0sq7c9p5z3v4n6cljhy8g1qjhnxac8y7mkr0" + "commit": "9d5a8e24be9acb8c55bb4d6aa8b98e30e2677401", + "sha256": "1n2l9acc54sbpbv5d1h2ib9cn7nbidmkvhhlwihqzpvvh7bhjfj7" } }, { @@ -72002,11 +72782,11 @@ "repo": "tbanel/orgaggregate", "unstable": { "version": [ - 20190812, - 604 + 20200423, + 2123 ], - "commit": "1a13f7f70357f369e16bfa3038a9fb760cbffb46", - "sha256": "11qygmgvjqc53gy5f3pz0hh5zsam1li8vbyr42wflfkv6cwxypdb" + "commit": "b4d8ee2b8e0062eaa15eac6805374c02b776bb88", + "sha256": "1p187hfll4jz44g7xxdhnnm0qjcf4gdxbrywdqxpdqvqs74pa18l" } }, { @@ -72017,11 +72797,11 @@ "repo": "tbanel/orgtblasciiplot", "unstable": { "version": [ - 20151215, - 2151 + 20200411, + 711 ], - "commit": "cd91f6ae26a7402e192a1f4fd6248f5797edf19e", - "sha256": "1vbnp37xz0nrpyi0hah345928zsb1xw915mdb0wybq1fzn93mp1z" + "commit": "59618630205fc8c0fcc74fb34c4581d9712a5181", + "sha256": "1qx6la70cdxr556d2kna4ra76kdliaqkwm97jahd20nhs2izvpl1" } }, { @@ -72032,14 +72812,14 @@ "repo": "tbanel/orgtbljoin", "unstable": { "version": [ - 20150121, - 2246 + 20200423, + 2129 ], "deps": [ "cl-lib" ], - "commit": "ccf5e0d96e053dc289da39a048715fcf36835ff2", - "sha256": "06nc82wiha11i79izqil53dkd95fl55nb5m739gyyzvx3sksb0dg" + "commit": "9a197de6c3036fbdb6309cbfd35ec31a69b3ebe7", + "sha256": "0fhq36g5k4nib5ykb92j12l3fnqj09xh2jai92l8c5nslgm00slr" } }, { @@ -72074,16 +72854,16 @@ "repo": "gregsexton/origami.el", "unstable": { "version": [ - 20180101, - 1553 + 20200331, + 1019 ], "deps": [ "cl-lib", "dash", "s" ], - "commit": "1f38085c8f9af7842765ed63f7d6dfe4dab59366", - "sha256": "0ha1qsz2p36pqa0sa2sp83lspbgx5lr7930qxnwd585liajzdd9x" + "commit": "e558710a975e8511b9386edc81cd6bdd0a5bda74", + "sha256": "0ycjbsn03cjzx6adabcvi1j7f92yhx3xjzj3xc68m1hw9r2f2gzf" } }, { @@ -72367,11 +73147,11 @@ "repo": "tarsius/outline-minor-faces", "unstable": { "version": [ - 20200103, - 1239 + 20200416, + 2211 ], - "commit": "d6247aaec44f60a9bd161c1d56960f80ab314a49", - "sha256": "0mscnbbv6cap818zhzz3ig6ychrw0zw84zyl2g1rksir0qj4hznf" + "commit": "d431b13e3d47cf2564a04a096d2162ca38593050", + "sha256": "05szncxfm7595ah63k1z3zmivk2z1lv28jcwb1fylx0s93f51z0c" }, "stable": { "version": [ @@ -72391,11 +73171,11 @@ "repo": "abingham/outline-toc.el", "unstable": { "version": [ - 20170730, - 1130 + 20200401, + 1208 ], - "commit": "31f04bea19cfcfb01a94d1fd2b72391cb02b7463", - "sha256": "1pqz2ynw51n3f7d9hknz80d42017lccsggkg13zqmn51wkjpc48j" + "commit": "81d373633b40628cc3a6b6fb534fd7730076bcdb", + "sha256": "1ad6bxa5x95n6i1197p13qy5fgzn1pslwbzqsf4rfy9bvr49g6q3" } }, { @@ -72538,11 +73318,11 @@ "repo": "myTerminal/overcast-theme", "unstable": { "version": [ - 20190326, - 1646 + 20200425, + 1601 ], - "commit": "afb8098ad2234a65ec614f4028f7cf2555134f46", - "sha256": "1fp8awdhpr92fygp6pbx9bdnkc1amngbwsr6c2haj7xb8717zckj" + "commit": "e02b835a08919ead079d7221d513348ac02ba92e", + "sha256": "0fy8739fbhmixgjxgd1j5v2rjkwhsqac5kczx3mdjlfd2w55k3h7" }, "stable": { "version": [ @@ -72605,6 +73385,21 @@ "sha256": "0qcinx4gpfzngirwfis7byrdbgbwk3pak7f8mx5fsbcdnybkk8sj" } }, + { + "ename": "owcmd", + "commit": "13e6df2397380eba31ecbf4a7c1214dedaf9cfad", + "sha256": "0lg6mk5bmfkiifzxz4ijr10nibr5zcbfxzy9cvg6bnzxns6nhgq5", + "fetcher": "github", + "repo": "fishyfriend/owcmd", + "unstable": { + "version": [ + 20200424, + 2314 + ], + "commit": "af0f79c16f573f4dbaafe77a430d7621857e706b", + "sha256": "0mjg5563bka3cc6rysw7fhhh51w4fpysa9ni9v5iv89d8i7mz0yd" + } + }, { "ename": "owdriver", "commit": "f3f9c1bb19345c6027a945e7f265632da1a391cb", @@ -72613,30 +73408,30 @@ "repo": "aki2o/owdriver", "unstable": { "version": [ - 20200326, - 1608 + 20200410, + 1901 ], "deps": [ "log4e", "smartrep", "yaxception" ], - "commit": "a243051365eb7ac0d1845c8b468b90510998f66e", - "sha256": "05a3s01y3sls6as28wvd1y5pmasqlz9k597yba10c0spxvlaijcn" + "commit": "3c52a7b11c8275fdb2e4cf98f68f2a48ad09a3ae", + "sha256": "1lxvcbpzpzs3vkgg4pif3k89ddmj5mamk2q18wc3gx0czs6v301d" }, "stable": { "version": [ 0, - 1, - 1 + 2, + 0 ], "deps": [ "log4e", "smartrep", "yaxception" ], - "commit": "a243051365eb7ac0d1845c8b468b90510998f66e", - "sha256": "05a3s01y3sls6as28wvd1y5pmasqlz9k597yba10c0spxvlaijcn" + "commit": "3c52a7b11c8275fdb2e4cf98f68f2a48ad09a3ae", + "sha256": "1lxvcbpzpzs3vkgg4pif3k89ddmj5mamk2q18wc3gx0czs6v301d" } }, { @@ -72798,14 +73593,14 @@ "repo": "kaushalmodi/ox-hugo", "unstable": { "version": [ - 20200305, - 1413 + 20200420, + 324 ], "deps": [ "org" ], - "commit": "1c1e3ec46785d93f4de2e71fc32604bd7c0fed40", - "sha256": "1cgwpj9x10z6y9ykbma39xakzisly5jhp5pkdiwrc5zq5psr2ddx" + "commit": "5106b430a139bb9e37beda177a082dfe36b407f5", + "sha256": "1x5hmvxy9dl88ix4ir1jshjavc99l8884if8c0v9gkjqb31ka9n7" }, "stable": { "version": [ @@ -73417,14 +74212,14 @@ "repo": "UndeadKernel/pacfiles-mode", "unstable": { "version": [ - 20181028, - 1744 + 20200418, + 1806 ], "deps": [ "cl-lib" ], - "commit": "ff58f387e0f85ca20c4c9f119bf13303bf8b5a76", - "sha256": "1my9qhnla61wgrhf0izjx0kyjrxwyz3cfh3xp80mmnxhxrrf21kl" + "commit": "222ae3f540cddee306067c83451cfece1112c09e", + "sha256": "1ps6blv2jhm4i2gr1fbsr1lii9cpr99prhwnxvhxxxy08c9b6mrx" }, "stable": { "version": [ @@ -73544,15 +74339,15 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20200313, - 2338 + 20200419, + 406 ], "deps": [ "cl-lib", "let-alist" ], - "commit": "0e27abf2e65340dc1523b27b923650b863472a5a", - "sha256": "1vrnriijm4c8129ndcimcai2x1mfybp2arkb1x3jpb9ak83ck9px" + "commit": "fb4662a755572c5add43869cdb6dcc577ca83a7f", + "sha256": "1flapr3aq38212m7w9ib56vqmaixz7ggmqd6hjhzphf6q1r5cv3l" }, "stable": { "version": [ @@ -73581,8 +74376,8 @@ "deps": [ "package-lint" ], - "commit": "0e27abf2e65340dc1523b27b923650b863472a5a", - "sha256": "1vrnriijm4c8129ndcimcai2x1mfybp2arkb1x3jpb9ak83ck9px" + "commit": "fb4662a755572c5add43869cdb6dcc577ca83a7f", + "sha256": "1flapr3aq38212m7w9ib56vqmaixz7ggmqd6hjhzphf6q1r5cv3l" }, "stable": { "version": [ @@ -73855,16 +74650,16 @@ "repo": "abo-abo/pamparam", "unstable": { "version": [ - 20200309, - 1703 + 20200410, + 1155 ], "deps": [ "hydra", "lispy", "worf" ], - "commit": "ed730f17074cb12a8fb9a0daa852d1abbfb34372", - "sha256": "0shzsgs5ds4lzw1fv13vdphbhxyqad5s7jwk5zqa5wg42sidxq3r" + "commit": "f9d83bbf5eb883bce6873dd6fd97484b6805215c", + "sha256": "0av69k6psrpmyadm2r0frwdbqyvpa4flzkrmi88w0vx3g0cxiv2k" } }, { @@ -73875,11 +74670,11 @@ "repo": "sebasmonia/panda", "unstable": { "version": [ - 20200317, - 1932 + 20200424, + 2206 ], - "commit": "2a17e3e5c57132777cfef9704565f6bfa129dbe2", - "sha256": "02aysxdb660dh19l07g6h2qvckrrd4aj79lryd6h7j3in1s0sn05" + "commit": "bdd9f80283d8ae4a69f8789e5f18b1560b94fe43", + "sha256": "1ld4igmmjk7p7dxm0mnfks3k0cqpqjxrvlmjdi0m7w11ba8dsah9" } }, { @@ -74063,14 +74858,14 @@ "repo": "ajgrf/parchment", "unstable": { "version": [ - 20200322, - 1714 + 20200424, + 1524 ], "deps": [ "autothemer" ], - "commit": "bf158a064e4a00a47d24ed0c1725204ce6675064", - "sha256": "1vqvfxrwrlmnmp0bidagphajwlxs6kf480xajkpz590m0zf1xfp3" + "commit": "766efdbd444cbefd9d01e7c6f55956d4c9a8db6c", + "sha256": "1jz9vf8wfjnnbbsnxzcpfvj19556w1z9887xvvwn6rsiqqlxgray" }, "stable": { "version": [ @@ -74408,15 +75203,15 @@ "repo": "clojure-emacs/parseedn", "unstable": { "version": [ - 20191113, - 831 + 20200419, + 1124 ], "deps": [ "a", "parseclj" ], - "commit": "f42ff988338484815ccd925c8f83a32c5d52319b", - "sha256": "0cx1zf82mjwlnj6znas8b94ws1f3n2h0imyybi9qirvsp90qd4sl" + "commit": "92bf875962e62f8c6370b56991d546f122536c6b", + "sha256": "0xli6cf0fzydnd683v3hk5kfsbxwh83s916fd64j8ak0wzjnlsfr" }, "stable": { "version": [ @@ -74556,8 +75351,8 @@ "s", "with-editor" ], - "commit": "98193d3bbb3538eda457d0db4ccccbcc4b04ce3d", - "sha256": "133b2m49jd2bw0k5f77y8gc2w53vhp3rym5mzqx7mlfgssgd795k" + "commit": "07b169ec32ad6961ed8625a0b932a663abcb01d2", + "sha256": "1dl3bck16zwhpspjrms11dknqgadnmpjqhcplkvv3v4f7vbnij6v" }, "stable": { "version": [ @@ -75049,6 +75844,21 @@ "sha256": "03k3xhrim4s3yvbnl8g8ci5g7chlffycdw7d6a1pz3077mxf1f1z" } }, + { + "ename": "pdb-capf", + "commit": "f0b7e12b9f49dc4ed1cc5a6893accc882896f334", + "sha256": "0656a2s8r8dg11in8r5xx984lcxd5g5l3x6vnha50s0c4nx93x3y", + "fetcher": "github", + "repo": "muffinmad/emacs-pdb-capf", + "unstable": { + "version": [ + 20200419, + 1237 + ], + "commit": "2f4099aa1330f87df4e9cd526de057ee9b71de6c", + "sha256": "0fdzhsz3784lf50mdabz9h2b6992cab2nnn4xv7rx2a8hsyyq1mq" + } + }, { "ename": "pdb-mode", "commit": "6aee132aa24322fe1ac88ae17ee6e77ae1ec8d11", @@ -75275,24 +76085,6 @@ "sha256": "02k379nig43j85wfm327pw6sh61kxrs1gwz0vgcbx9san4dp83bk" } }, - { - "ename": "perl6-mode", - "commit": "4e912dccdee12f745272d26ea10d5f106a27cabc", - "sha256": "0r5q2nggb9kbjcdfv81d7sm41jqz040j9z52fnck4b9mlz2dy6d0", - "fetcher": "github", - "repo": "perl6/perl6-mode", - "unstable": { - "version": [ - 20180619, - 1159 - ], - "deps": [ - "pkg-info" - ], - "commit": "88de065795d6863b23b6042576b9e90f8cbf8798", - "sha256": "0m8kc8j1rwy30439k4l5f351jkfjjp38mjm891ax8ghp9zk5pr7h" - } - }, { "ename": "perlbrew", "commit": "24bd9c2cd848f5003a244a7127e8fc5ef46bdca4", @@ -75497,25 +76289,25 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20200326, - 2358 + 20200418, + 1815 ], "deps": [ "cl-lib" ], - "commit": "2ac6aff0569923993a251beddb3046ec44841408", - "sha256": "1z05vk85zbq4pj1xs69p5x3hwdshl829y28d5j2ckivl313p4had" + "commit": "c3075b52db1f973202303fa306c56a24d9d47fc9", + "sha256": "0mcsrkga5y8sl05mv3n4lmjpgn9mcpy01w0qz55a6jv301rda3p0" }, "stable": { "version": [ 2, - 6 + 7 ], "deps": [ "cl-lib" ], - "commit": "2ac6aff0569923993a251beddb3046ec44841408", - "sha256": "1z05vk85zbq4pj1xs69p5x3hwdshl829y28d5j2ckivl313p4had" + "commit": "c3075b52db1f973202303fa306c56a24d9d47fc9", + "sha256": "0mcsrkga5y8sl05mv3n4lmjpgn9mcpy01w0qz55a6jv301rda3p0" } }, { @@ -75567,19 +76359,19 @@ "repo": "Alexander-Miller/pfuture", "unstable": { "version": [ - 20200113, - 620 + 20200425, + 1357 ], - "commit": "fbecd1562b34fcd15563b7cc00d98e5af0d7e43d", - "sha256": "1imqavzc0isba3yh128jzsy27x2983sjiqkf6q2xw43mbjknl8dy" + "commit": "d7926de3ba0105a36cfd00811fd6278aea903eef", + "sha256": "1chpin5277vbl2xvsl04pzzk7a9dbcvclibm2496gz6yvd19pwsf" }, "stable": { "version": [ 1, - 8 + 9 ], - "commit": "fbecd1562b34fcd15563b7cc00d98e5af0d7e43d", - "sha256": "1imqavzc0isba3yh128jzsy27x2983sjiqkf6q2xw43mbjknl8dy" + "commit": "d7926de3ba0105a36cfd00811fd6278aea903eef", + "sha256": "1chpin5277vbl2xvsl04pzzk7a9dbcvclibm2496gz6yvd19pwsf" } }, { @@ -75979,11 +76771,11 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20200323, - 1215 + 20200415, + 1405 ], - "commit": "b5d99881002e3c62ebe874ad9f48474afc16c62d", - "sha256": "0pq7nccmrbvrf7120d48aqymdwh5jgjvzwi2820hdw8j6b7prm4h" + "commit": "4d0b4a04401a2b9f9ff834f6ed58bc7cc5b878c0", + "sha256": "0lgw1lghib0vv4byrhjimldxyqyav4qypprk9ppvwjbad1j0hfkn" }, "stable": { "version": [ @@ -76071,8 +76863,8 @@ "repo": "emacs-php/phpactor.el", "unstable": { "version": [ - 20200324, - 1347 + 20200405, + 1544 ], "deps": [ "async", @@ -76081,8 +76873,8 @@ "f", "php-runtime" ], - "commit": "31fe2ea4dbd5c2f23efd6a4ec2ec881a4ced6b05", - "sha256": "0j52n0vs85q7zz5xfqw4rgrjjpr7mzfiqbzk7vwkcdmpnax608w5" + "commit": "860d7e8784b261ee71deba354d01c3038cd777ab", + "sha256": "1d3fijh11g70xhx3a47l75mrp64bvkk7hh9lg83nl30qhn2vrbn3" }, "stable": { "version": [ @@ -76136,20 +76928,26 @@ "repo": "emacs-php/phpstan.el", "unstable": { "version": [ - 20200122, - 1256 + 20200411, + 531 ], - "commit": "a1c30ca634107551c20c846b5316ca5697adb06d", - "sha256": "0b7rnzk1zkrzh978bmh2dsy78f0sb4ia1w06khyqiby52m27q9k1" + "deps": [ + "php-mode" + ], + "commit": "2f715a186c5fe6576de83d4c0b64a37e2bfce101", + "sha256": "03ix2s068pzmybj0fcb08dlfgdqw0pmqhbdf4id2077f67bfad0w" }, "stable": { "version": [ 0, - 3, - 3 + 5, + 0 ], - "commit": "535e172e1c561bc7b8c706b4e03bbf71689bd83a", - "sha256": "1hn1rdgymv81rm8nkibnc5jazgjrx3sz4w1lin85rgypzbfaf6wk" + "deps": [ + "php-mode" + ], + "commit": "bf9e82a63f2ccb12af02c9e79a83e7989eeb7cb1", + "sha256": "15kv5xv6lcfgf048wr2zsnpvrplbxypy3wq56zvrzbq18hwprqg1" } }, { @@ -76351,25 +77149,25 @@ "repo": "davep/pinboard.el", "unstable": { "version": [ - 20191203, - 1015 + 20200402, + 919 ], "deps": [ "cl-lib" ], - "commit": "9351a2320f1e75896f56032959c7bcbf9d9aa560", - "sha256": "080fzpr7is05cb8fj0rzhfc8pmb1rwfmkqnydj36d56da1ndrfmw" + "commit": "7c57f20667ead2bb27ab1d0a03307c28ea728bd9", + "sha256": "0d9z1hr2082sbg4dlmarksh598xd92w7c09xmdjyn1yqm39gsljw" }, "stable": { "version": [ 1, - 2 + 3 ], "deps": [ "cl-lib" ], - "commit": "e14dd43cf74f254a898ae1c698a97d58734fc1a8", - "sha256": "0ljxvp9yppnmy1lnnipqqbk09bmay523haa8h0gnfnrl02jwgs91" + "commit": "7c57f20667ead2bb27ab1d0a03307c28ea728bd9", + "sha256": "0d9z1hr2082sbg4dlmarksh598xd92w7c09xmdjyn1yqm39gsljw" } }, { @@ -76673,11 +77471,11 @@ "repo": "juergenhoetzel/pkgbuild-mode", "unstable": { "version": [ - 20181216, - 1331 + 20200425, + 616 ], - "commit": "e30e37730b5f30bc0dd5b9328fbf4cb3e6f46fdd", - "sha256": "1ijx067hlbr4yz9b9h58pwlqd4rgjgm27f5s1f9f3rwb249s36s1" + "commit": "bc22301198b3f581d89352510e847454fb1cb9ff", + "sha256": "11il65myybgfj30psicfgqpjwwpa6hwapf55d497x8kbixx2kpg1" }, "stable": { "version": [ @@ -76983,11 +77781,11 @@ "repo": "flexibeast/plisp-mode", "unstable": { "version": [ - 20190914, - 513 + 20200403, + 613 ], - "commit": "02738af25707e39d8a608b09a24173bb05f5be9f", - "sha256": "133wm5fd91z9k3zpflb455nglpgy1dqyz3mz2s694xyppw4rvkia" + "commit": "03dcd523295a0dec76356d23043428d850b03b70", + "sha256": "0g9bwd137z543pbdq4j74j0ql8j2657yxh4kb809jps9kxq8dc0k" } }, { @@ -77718,11 +78516,11 @@ "repo": "polymode/polymode", "unstable": { "version": [ - 20200316, - 1314 + 20200411, + 915 ], - "commit": "44265e35161d77f6eaa09388ea2256b89bd5dcc8", - "sha256": "18ssl2h861dm2jkd3df6wkfr48p8zk337dbvpq5522kia7fq1lbn" + "commit": "2a61fb6d3e805bc0e4ca7b6510510a955c6bfb6a", + "sha256": "0cphikjz9hwij1k41radyar6nh7md8v98qwn2j9lzcbyz69hrvaq" }, "stable": { "version": [ @@ -77801,14 +78599,14 @@ "repo": "ponylang/pony-snippets", "unstable": { "version": [ - 20160205, - 411 + 20200418, + 354 ], "deps": [ "yasnippet" ], - "commit": "b921bd943b528f04d4293625b28fd2d4a013a1bf", - "sha256": "183vml7090w1fx99rz9d8qjfbf089wqilyflk0512xz8al3gcd8q" + "commit": "115a0d5066f89554bee9cb1045bcda5a18ebd441", + "sha256": "1g11w52bf724zwwsvrcylk3ndjci2cnbzing77c91psz6d7zjkvw" }, "stable": { "version": [ @@ -77861,28 +78659,28 @@ "repo": "aki2o/emacs-pophint", "unstable": { "version": [ - 20200322, - 737 + 20200420, + 1429 ], "deps": [ "log4e", "yaxception" ], - "commit": "2c43423c87c6892b0fd16e3749e021a3743ee708", - "sha256": "0ila3vqv5wkna11qmm221iv1nzafnvffda19mqmv8fpl2iv1197s" + "commit": "5e13da4578ae7ba00e6f7bae31eb546d713cc19d", + "sha256": "01bwfswzzrjxrjaqysaqnav7h3swwyigxw7nj0cgrm3w8cp1y2a8" }, "stable": { "version": [ 1, - 1, + 3, 0 ], "deps": [ "log4e", "yaxception" ], - "commit": "2c43423c87c6892b0fd16e3749e021a3743ee708", - "sha256": "0ila3vqv5wkna11qmm221iv1nzafnvffda19mqmv8fpl2iv1197s" + "commit": "5e13da4578ae7ba00e6f7bae31eb546d713cc19d", + "sha256": "01bwfswzzrjxrjaqysaqnav7h3swwyigxw7nj0cgrm3w8cp1y2a8" } }, { @@ -78096,30 +78894,30 @@ "repo": "jcaw/porthole", "unstable": { "version": [ - 20190721, - 1428 + 20200404, + 1454 ], "deps": [ - "elnode", "f", - "json-rpc-server" + "json-rpc-server", + "web-server" ], - "commit": "0e73b8e527cfc9ecba2fa4f88382f588fb4a300d", - "sha256": "06nf12cvxk2dxqljrga59vp8wkvsif1mm3ahvy1nbjsq6s8zryq4" + "commit": "9e68b419acf9245208f8094e10041b7f04511473", + "sha256": "0kaf00924jg50l2zdhyf1lxsh44nfp4zbc23wxbir45xdx9rzl3z" }, "stable": { "version": [ 0, - 2, - 5 + 3, + 0 ], "deps": [ - "elnode", "f", - "json-rpc-server" + "json-rpc-server", + "web-server" ], - "commit": "481a3a247586417b7643d393113ff8faf95b327e", - "sha256": "1gdywyb1vq7i983d4bdhwdkk0vk0x09rms83xyk4j75qlqb05vp1" + "commit": "9e68b419acf9245208f8094e10041b7f04511473", + "sha256": "0kaf00924jg50l2zdhyf1lxsh44nfp4zbc23wxbir45xdx9rzl3z" } }, { @@ -78154,20 +78952,20 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20200319, - 907 + 20200426, + 819 ], - "commit": "c15800a8388696474fe9f8466fce1b40735b9304", - "sha256": "14xjly5cqziqb0gnklsgg28vimdrpq8273z2inf1c0jnak8x2vzn" + "commit": "093b29a53cbeda6d637ccc9ef4dfc47123e79b9e", + "sha256": "0wca1w667h930dyi3hm1kqiqapggnwbgqjbxiwpgj7l773s7xdbw" }, "stable": { "version": [ 0, - 6, + 7, 0 ], - "commit": "9638b9d9cf8b9727a13c86f70b5d33bf938497a5", - "sha256": "12r1as9lqqc6anckq455dqv8dbqahnbdzj437i11053wv33cv5vd" + "commit": "83b4d39fdda34355c01aecc22677f7376ae0f013", + "sha256": "0cjrl4xgs70hbw1a1mqkdmpcmrxaakw8csrz365c31vj14nii0ax" } }, { @@ -78372,11 +79170,14 @@ "repo": "conao3/ppp.el", "unstable": { "version": [ - 20200318, - 806 + 20200418, + 1551 + ], + "deps": [ + "leaf" ], - "commit": "bfb9ddfbc124b8b97d7a12610947b76794c0fd06", - "sha256": "1632y0vaxv043w4js5jpd9zr36bzy9pwxnhmlh44hmkvgfw07qvn" + "commit": "27683aa4a0df67b4539bcaa2e82d865023cf1fae", + "sha256": "0azqpmlz6r2amklzrgi0wgmy89fbkz0kkpikgf5gccfmks5pij6y" }, "stable": { "version": [ @@ -78434,19 +79235,19 @@ "repo": "raxod502/prescient.el", "unstable": { "version": [ - 20191224, - 220 + 20200412, + 1607 ], - "commit": "a194852e8022762843052e58a9d0fbdaa1df0fe5", - "sha256": "0da4s32fza42vdiqhh7cdim08by5i4909q93ivxkmgrmqfgdvz0p" + "commit": "0f4a89bdec61395138d968a38d375e63ccfbed63", + "sha256": "0nnf4y49pl9lcs90y5z6f02g1xwk1jjrl0qs7gcv6kpn0vn8kn0h" }, "stable": { "version": [ 4, - 0 + 1 ], - "commit": "ad9fbe8a17fe74b27a39bcc034f3da1865663387", - "sha256": "008hxy1vasnyz36wwg44gikpi80ng75hj85nrswk60b7z7cznbmr" + "commit": "aa3110281a0622fa7b5da115cefb71a319b5b1a0", + "sha256": "1rf5cz262hjpck7vpxg15bccdrwrmlhiyxc20liwcjb2ig36nis3" } }, { @@ -78622,25 +79423,26 @@ "repo": "alphapapa/prism.el", "unstable": { "version": [ - 20200315, - 1926 + 20200407, + 1148 ], "deps": [ "dash" ], - "commit": "636059b6ca21d7dd2d46776d799f94b476c62ee2", - "sha256": "014zvdqizjqp1cxs8a45nj2nfpvjsfmls41780pjdvzvrvyq16p0" + "commit": "b618f2cea2dbf7c13d8b4fec1760c346eb9ab036", + "sha256": "1fn6514ii2z1xbjzmp0h1mhxl1yaqqk4n6zgswhxdywni34cb6hs" }, "stable": { "version": [ 0, + 2, 2 ], "deps": [ "dash" ], - "commit": "636059b6ca21d7dd2d46776d799f94b476c62ee2", - "sha256": "014zvdqizjqp1cxs8a45nj2nfpvjsfmls41780pjdvzvrvyq16p0" + "commit": "b618f2cea2dbf7c13d8b4fec1760c346eb9ab036", + "sha256": "1fn6514ii2z1xbjzmp0h1mhxl1yaqqk4n6zgswhxdywni34cb6hs" } }, { @@ -79041,8 +79843,8 @@ "deps": [ "pkg-info" ], - "commit": "56e18fcefa2f286edfec98853189985823d0e53c", - "sha256": "0iq93ghwj96xxfsa5s90g36ngwpa92bj91zvkkk40zn9faqkdllc" + "commit": "2aa3a663fc9a9a75c3bf73699e40ecc0c3567268", + "sha256": "1cw4bgj9iglcs71zrbx8rjk19dfvnws795qbm52hm7zs95lfprxn" }, "stable": { "version": [ @@ -79156,8 +79958,8 @@ "repo": "asok/projectile-rails", "unstable": { "version": [ - 20200203, - 1226 + 20200417, + 1711 ], "deps": [ "f", @@ -79166,8 +79968,8 @@ "projectile", "rake" ], - "commit": "0398d940a201128946f619de842b0d1f9f0fffbd", - "sha256": "0cfrm56bxdwb96xqpdih6hqh61gvc1wal4yp7d7c414j8h0s7d02" + "commit": "11980b2bcb99208888856a9b8666ff329b6f0142", + "sha256": "0crb08byq1i9wcjmcl645wc03p1jadm4f9nd138rii69nzancwfl" }, "stable": { "version": [ @@ -79233,8 +80035,8 @@ "projectile", "sift" ], - "commit": "33b2c9ff964fe53bb55b37429faaa4e903bead7a", - "sha256": "0cb8rcxl0jwpbgz9kk136l2ranficv8lk85fhvly1lpslbjljds9" + "commit": "cdddba2d183146c340915003f1b5d09d13712c22", + "sha256": "0ln87nhq2vhsb0ywn7rp0b3hzms5z7l6cv6dng08yly12r2957if" }, "stable": { "version": [ @@ -79407,11 +80209,11 @@ "repo": "chuntaro/emacs-promise", "unstable": { "version": [ - 20200320, - 341 + 20200425, + 617 ], - "commit": "02c470bd6c7bf4ea4244d304f57997bad37c9bb7", - "sha256": "1sjwwram45pb9bjap6h24m6734qr5yhnai2lqbdvxd0nplfv91ng" + "commit": "2a8e71420e8c9d2d4ce951d4342762aeedaae654", + "sha256": "1drz8qbcw5qjh5v0vkvflni14g58nmkmyn11ksjd49ck296mfsp7" }, "stable": { "version": [ @@ -79487,11 +80289,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20200326, - 1804 + 20200416, + 1351 ], - "commit": "9196749d55413224355409d55003f7f8c8ba0f79", - "sha256": "17ak2nbgiqwldk6y4cg4qq49hnvzw32jm4m3dqag2smvkl6rjw19" + "commit": "e901c0bb73e0e66c95879bbb3738ac79e91ffeaa", + "sha256": "1j6dwcpplh98wf3mncidc8gn96pv58g71igim28gkqx21g8p2i40" }, "stable": { "version": [ @@ -79594,8 +80396,8 @@ 20170526, 1650 ], - "commit": "dec4939439d9ca2adf2bb14edccf876c2587faf2", - "sha256": "0kxrgv1pb38lsgpgilaqjlvw6inmlbs8rdrm2bfilzcwwrr92bi9" + "commit": "dddeed298bf84505f4d123a068f911025b351661", + "sha256": "10a70drfyanrjpx157aip402vd56ynm85ryzripd3w0symn9k1c3" }, "stable": { "version": [ @@ -79806,8 +80608,8 @@ "repo": "fvdbeek/emacs-pubmed", "unstable": { "version": [ - 20200315, - 1938 + 20200426, + 1239 ], "deps": [ "deferred", @@ -79815,14 +80617,14 @@ "s", "unidecode" ], - "commit": "cc5d258ac83650ad6e8043c8c01d9162c2460308", - "sha256": "13n7i80734848by8f0b3z0mqv0rh9x42hglkc8abhmilc0sg4i0y" + "commit": "e619042f3c0383c7d4e1762fb46ff680e90906d6", + "sha256": "1igvmwxfpa19aws7h066hk9axwgl3swp8lmn218c1hmq2j2jkwgz" }, "stable": { "version": [ 0, 4, - 2 + 3 ], "deps": [ "deferred", @@ -79830,8 +80632,8 @@ "s", "unidecode" ], - "commit": "f6e13137ad7731c8b0eb1720aed48d1a1edf4719", - "sha256": "1nanaj0liilnplh1njbmch7qsa2h7izkc51bpd4hxw6k4bslplqc" + "commit": "e619042f3c0383c7d4e1762fb46ff680e90906d6", + "sha256": "1igvmwxfpa19aws7h066hk9axwgl3swp8lmn218c1hmq2j2jkwgz" } }, { @@ -79872,11 +80674,11 @@ "repo": "flexibeast/pulseaudio-control", "unstable": { "version": [ - 20190828, - 1136 + 20200406, + 752 ], - "commit": "1b844a9b21d549bfe767990b4c611de3bc4e2241", - "sha256": "0fz2ynxxgq3j7hvfmqq24gvbfpc08apz6zw9cjav08r5z04n1xr3" + "commit": "a931533140547510decdc368f39b2d2b97ca725f", + "sha256": "1jvjn9jszjjapi167an49jxcvr88cvgjwykglhp4b8lwhbjfqw76" } }, { @@ -79956,26 +80758,25 @@ "repo": "voxpupuli/puppet-mode", "unstable": { "version": [ - 20180813, - 1947 + 20200419, + 1236 ], "deps": [ "pkg-info" ], - "commit": "7dee1b5a5debac6e56f9107492a413b6c0edb94d", - "sha256": "01isn90h50p5c6cgzwhb1jq8yacj0fxw9ppfqrnynckg6ydpvg74" + "commit": "0197b405c79a5d0718979f31df760bb3bfca38de", + "sha256": "0k1r0r1cvk6z3lj5shgd8ly78sfl8bbkmld6x5cvw481ynyb7rgy" }, "stable": { "version": [ 0, - 3 + 4 ], "deps": [ - "cl-lib", "pkg-info" ], - "commit": "d943149691abd7b66c85d58aee9657bfcf822c02", - "sha256": "0xr3s56p6fbm6wgw17galsl3kqvv8c7l1l1qvbhbay39yzs4ff14" + "commit": "73ea35bc7a3ad663c5b73f65cb6377eb0ae11d6f", + "sha256": "0c5q8qmbligzjsn05di4wh6ggpd3944j4yqb78vzd441b8ssq70i" } }, { @@ -80418,8 +81219,8 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20200326, - 719 + 20200426, + 505 ], "deps": [ "async", @@ -80427,21 +81228,22 @@ "pyim-basedict", "xr" ], - "commit": "84af8e80a4ac8fa19e7b01a3f9984280e7d501b4", - "sha256": "0351mvnnm0xzmlm71byxlbn8dp7qnpw8d12ghwdmd53q87pfgz9s" + "commit": "b934273bb33d6be6aea6e20e68930bc5aaf4a48a", + "sha256": "01ykgpzkv06gxiaqj4z1qwf00pwdfm0zxzbsy4xr8ciyhhxbc9pj" }, "stable": { "version": [ 1, - 8 + 9 ], "deps": [ "async", "popup", - "pyim-basedict" + "pyim-basedict", + "xr" ], - "commit": "8648d467d79b3bf1c3a99623f9329939cacc40da", - "sha256": "16rma4cv7xgky0g3x4an27v30jdi6i1sqw43cl99zhkqvp43l3f9" + "commit": "8fe9897f57e410a7637692d98c40876cb3bd6c2d", + "sha256": "1n9syy39rnma0giz2g1dhdfjj4nn5bls2qzswy48snfl5z5mfm5j" } }, { @@ -80494,14 +81296,14 @@ "repo": "tumashu/pyim-wbdict", "unstable": { "version": [ - 20190201, - 2300 + 20200331, + 542 ], "deps": [ "pyim" ], - "commit": "9799b689643052078f53d69342a82315251490f4", - "sha256": "1rqlckmlmwmnqvk8bbcyvwr54p6x9b1fph5f17anzlvwffdjsw5c" + "commit": "daa223e2603a5ef3e6c8e33575d8f4e4604a8d3c", + "sha256": "0inl29fa2l5grn6z2wszj43bv17yf7n9x8l77zk2xp8q3gkswd86" }, "stable": { "version": [ @@ -80573,8 +81375,8 @@ 20170402, 1255 ], - "commit": "53e5406b9279008f3ae8b5f045e5cd5773771d70", - "sha256": "0c6d0pmbinj65kacnqzbsa6acb3as8blrl5f202s8bbb9zd62vam" + "commit": "be5a61b13e48a129613e0c659bfd28bf9824f53c", + "sha256": "124pf14z2yc56bvn0vvg0irzl39q3bbng4zp75qjzgb7d387n4hb" } }, { @@ -80758,8 +81560,8 @@ 20190716, 921 ], - "commit": "0d2f783f5a868ded8a37aa5881f8952aa36b053f", - "sha256": "1cqcxdg4bv8ybw5ds5av4id39fyk711bfadc779ilj5dn0mcd4h7" + "commit": "ec253711f2bdcb3848046bb68f6405a7bf9eb0fb", + "sha256": "0m27h2ycjz212r012wh4wsahidclmb74gk9g3v6ym9a2120bk0dh" } }, { @@ -80815,11 +81617,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20200224, - 1148 + 20200417, + 648 ], - "commit": "5bf2c0dafb086684124c3997a618d40ac8db0fb0", - "sha256": "1hz9j8k4bybvi3kgq51rqi0rwy3d7c5wqvx2kkljh6734m9x8xp2" + "commit": "9c336295c830f684dbf043fbbde432c54a2b4678", + "sha256": "0h02d02wv5hkz3lnjr9zxr8dwd4b1v2r6wf808g0x6xqnm01wspm" }, "stable": { "version": [ @@ -81139,11 +81941,11 @@ "repo": "lbolla/emacs-quasi-monochrome", "unstable": { "version": [ - 20181213, - 827 + 20200415, + 705 ], - "commit": "68060dbbc0bbfe4924387392874186c5a29bb434", - "sha256": "0zp2xr0bjfqrpb0bqczzick1vvbjmipjavrdi70kw6a9caynvq22" + "commit": "b38d71860fdea945e10e8a766ac9dfa1410ade67", + "sha256": "0jcwfmamvpd22r5sbicbf9442b22lvldfrqldysm4l9yyxs11jy3" }, "stable": { "version": [ @@ -81437,15 +82239,15 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20200329, - 1841 + 20200420, + 1412 ], "deps": [ "faceup", "pos-tip" ], - "commit": "c8ac9971814ca9df8ec406f3b76c9ba4878a5d57", - "sha256": "0jnw9plmw3r2c12kcy4435v2kf0vmmla9ljb670zhcg690a5cjqh" + "commit": "2827e95c5a2605cc25a549b260763922ecd68983", + "sha256": "0f6k9nlg8kz739pla0hkyp010cgdw9jd0qcii1d6dd1w3a84xk3v" } }, { @@ -81608,6 +82410,24 @@ "sha256": "1dk2clsnmjy3bfv6laxf8sslvdajjbwpk83ss8v9xm55dcxjvd7n" } }, + { + "ename": "raku-mode", + "commit": "e9831cc66d9a9e6b6441e6a75d54ce57146571fd", + "sha256": "08c9mgvmcnhn2q1ldqsaabj623b9kxd7blgfjabbwrl7bqkqpwzp", + "fetcher": "github", + "repo": "Raku/raku-mode", + "unstable": { + "version": [ + 20200426, + 1156 + ], + "deps": [ + "pkg-info" + ], + "commit": "e4d8b0230a503f315087443e24708a78ad8665d9", + "sha256": "1864kwd5ixghsr219jlqmgg5gpv802q8xfsk8i8yi5dcy1jn1ckr" + } + }, { "ename": "rally-mode", "commit": "0914825c6d5ad26d2a8035fc33ad98df42df3c53", @@ -82045,11 +82865,11 @@ "repo": "ChillarAnand/real-auto-save", "unstable": { "version": [ - 20190224, - 1446 + 20200418, + 405 ], - "commit": "824ad04121493723b08838c8b96559947dca7ed9", - "sha256": "1szpjv04rp9x9ph44a5s56a2y96z5x474bccsjnmn6yhingh5qik" + "commit": "d55c63106f6000c065f9c256fc4491ea07b2745e", + "sha256": "0b4drlzc384rp43m5454g86d866hx1lj4qdi3mlaz835nl8m86ki" }, "stable": { "version": [ @@ -82068,16 +82888,16 @@ "repo": "realgud/realgud", "unstable": { "version": [ - 20191123, - 1341 + 20200418, + 1721 ], "deps": [ "load-relative", "loc-changes", "test-simple" ], - "commit": "94f283593304c2f673cb4940900197d9cb099faa", - "sha256": "00dzw6nqqsgdlcvpnq1zc2568l5hz7vynqx6vkvvbj3jafc6nwj7" + "commit": "e03446f54c7ee0b4ed3ec7300597046cf1de2bb8", + "sha256": "160pv9jx66ygl3z1g8yrw7f786403lbb182nz972yl4nyjchbdw7" }, "stable": { "version": [ @@ -82325,11 +83145,11 @@ "repo": "xendk/reaper", "unstable": { "version": [ - 20200120, - 2006 + 20200420, + 1703 ], - "commit": "6602e74d6190d2e8dd61358bebb513c3ae8b89fb", - "sha256": "1pywz6xm3wjkbcj5zr7w5xh5wfggvivnw94mmsm6lybnv2zgjg1d" + "commit": "c594d2fb9a027f360e98539a1debf5db639846b7", + "sha256": "0md3aqzy8rgvpafh6f8f2dwwrc43q317bk7p1whghfvji52aindv" }, "stable": { "version": [ @@ -82352,8 +83172,8 @@ 20190710, 1037 ], - "commit": "5e6205cfede8c10c6821dfd9f9757a9d8035ec04", - "sha256": "0w25z5v551w7fcjwk73dwxhp4lydjrn4rc99swd1ffxyzp5cap56" + "commit": "7cf6fbf4e8e86ebb76d118b2703e20b968e030d4", + "sha256": "0b8p7lh0ifrw9rqvv15q3ib206d1wfv3xafpqwc70zzwaxswvk06" }, "stable": { "version": [ @@ -82453,7 +83273,7 @@ 20180205, 556 ], - "commit": "6cb762efbd0aa323f96c687b6bebc9bf00a3ceb3", + "commit": "84bbac534cb114d8d11b86790435b65d36e99e68", "sha256": "0lnnh28qax4qk9n9sng7sgb0w0mnjc8abnch3bd0ba9g5x28z8bx" } }, @@ -82769,11 +83589,11 @@ "repo": "purcell/reformatter.el", "unstable": { "version": [ - 20200327, - 2358 + 20200426, + 818 ], - "commit": "e8f70b20caf6672353a2b0ee3161d4791c412696", - "sha256": "19mji7frfvj925nx2m2cdvsx0lf69dzdl5wbdppyra9717rsspbq" + "commit": "dc6278a6b1e3565604346ac41a6ffc3cbab04031", + "sha256": "147qrqs3ndc4xfbb9wiymjsskccp54qpj8bn3i19n9zwm4kmgdzr" }, "stable": { "version": [ @@ -82930,6 +83750,24 @@ "sha256": "18mskl1w5n2cksjds27d1gcrwb065vp9n6hnw9402j3n6z0w8srv" } }, + { + "ename": "rego-mode", + "commit": "fbc0b93675f6baab6ab023b596e65658c9e2a534", + "sha256": "0qdmn6kh4bh514qh0ii881c03p3hcdp1qlmdwpp5nlzxlkxbgp07", + "fetcher": "github", + "repo": "psibi/rego-mode", + "unstable": { + "version": [ + 20200413, + 450 + ], + "deps": [ + "reformatter" + ], + "commit": "41c99057d0406c7fb3895a03da777af3961a648d", + "sha256": "1dw6f60ysyvxgm5gpir37ay8z9csykxj0r7v9h6z38cswicg27sj" + } + }, { "ename": "related", "commit": "555932a7b9cf11b50a61c2a9dd2636fd6844fac8", @@ -83568,8 +84406,8 @@ 20200324, 1113 ], - "commit": "030e89a38df6d194546b0629f90c9e1898370eb7", - "sha256": "1mfjwxf1l0py2ididzdv86r118ws9iscdv23a0kgf2cjd6ydpbjc" + "commit": "a2a75a929fc022e752759ed2a38accc639128dbe", + "sha256": "0s6jmxq9sqi6pm2kdrdik30nyz136kk2gqzdibb0wcvpfylhwawn" } }, { @@ -83822,8 +84660,8 @@ "repo": "DogLooksGood/emacs-rime", "unstable": { "version": [ - 20200329, - 1205 + 20200415, + 1454 ], "deps": [ "cl-lib", @@ -83831,8 +84669,8 @@ "popup", "posframe" ], - "commit": "f78719e5d8c8d2ec6da0f66e0b1e7d660d3a5a89", - "sha256": "0pcncx1w7y8rnsg23lf055cc38xrwhx26yhrqwzdf996cad54y6w" + "commit": "9afeb4aa45771ef20c83d1208744d954273cbaf3", + "sha256": "00lnsxi2j1kvd28vq10ixj16qfkn22bw2m02zrs022d9jwcsza5r" } }, { @@ -84265,8 +85103,8 @@ 20200221, 36 ], - "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5", - "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x" + "commit": "a42298e80dffae9a6b2e9816506174542f3cbbb7", + "sha256": "1674752bbyb7890na5p846dxcvh83zn0a6z19wras1x5c59s24i3" }, "stable": { "version": [ @@ -84291,8 +85129,8 @@ "deps": [ "rtags" ], - "commit": "d370c09007d299dc6b6aae719bf728b95dd426c5", - "sha256": "0hakpd1dwhn2nkfhx4hli0l7hf3p1g8vpyrrczq45smfsz73d96x" + "commit": "a42298e80dffae9a6b2e9816506174542f3cbbb7", + "sha256": "1674752bbyb7890na5p846dxcvh83zn0a6z19wras1x5c59s24i3" }, "stable": { "version": [ @@ -84763,11 +85601,11 @@ "repo": "rust-lang/rust-mode", "unstable": { "version": [ - 20200322, - 1749 + 20200414, + 2105 ], - "commit": "2df6cf72163db57fd0c79fefd0e79f38f29f7d93", - "sha256": "1f8fbzkc6ifx91kcf5blx22bh3713qmm5kj95i06k8cn10nlx11f" + "commit": "a364b24af412659cc1074f533752356d1858b893", + "sha256": "1yj3b5li2flgxc3frmb7zjc92nhdq526jj6105zrsnj7ndxqycp4" }, "stable": { "version": [ @@ -84879,8 +85717,8 @@ 20180406, 808 ], - "commit": "03410e6a7a2b11e47e1fea3b7d9899c7df26435e", - "sha256": "074ny8y68fhnknkjxvrijrk534xzdiwip8wkifxfbwv3va315x83" + "commit": "43ba8b563bee3426cead0e6d4ddc09398e1a349d", + "sha256": "0bqdlcg5pah9a50dww8n5n0lzc8bzmpc230fdkinw8zrxph13p12" }, "stable": { "version": [ @@ -85270,8 +86108,8 @@ 20190413, 1246 ], - "commit": "cc2dfa14eb3922d93c15f30734e8211c77ceada1", - "sha256": "11n26dksppjylg5jafxf4j859n6c1062v85qci8fx762wicz0bkf" + "commit": "f13d03efece7c1f31e9c3fe2e99b71a33cc43e1c", + "sha256": "04b63yww5yz4jn18mzpv53yzs6g6kmxs61m2ycnf59cb6ax2ajbd" } }, { @@ -85465,14 +86303,14 @@ "repo": "technomancy/scpaste", "unstable": { "version": [ - 20190228, - 2151 + 20200415, + 40 ], "deps": [ "htmlize" ], - "commit": "568faaa70fa0413e2d165ad232cd4c6ec2815197", - "sha256": "160m4w0i9cj4zxmmsknmnvycscj9y8da39y1362kv7dpmwnxsxcp" + "commit": "ca95a8dd088e848bd1cab6be207c6a98343ee176", + "sha256": "01v199xkadcbdr627skhisixdqj0hbbyv912xgyypm1rxdjfhhx9" }, "stable": { "version": [ @@ -85633,11 +86471,11 @@ "repo": "ideasman42/emacs-scroll-on-drag", "unstable": { "version": [ - 20200328, - 116 + 20200411, + 1050 ], - "commit": "2d79a6d9c2497f701335fd66154a67cd51073c9f", - "sha256": "0m2605k8i2z44mqw5ibviwsbn3j8g8hs4q9cih5ip14lik6hhrdz" + "commit": "42d96a60a207cd73e7a58111358deb05f084c59e", + "sha256": "00l2n5kx5p18qdlfh2y355w34yp2fy401canrglz6dq1f7615lnz" } }, { @@ -85980,6 +86818,60 @@ "sha256": "1kkxm8ysjcx0vs6lic0lcncr2kcmjmh2n5y8j9303lhzzhh73psg" } }, + { + "ename": "selectrum", + "commit": "4273a6e55cf797d1fab1825618aab7e9b6c01886", + "sha256": "012jmgr7w6x0gy8ygpzyyk23adyzmr7cknz2w51zjapcilkf6ghv", + "fetcher": "github", + "repo": "raxod502/selectrum", + "unstable": { + "version": [ + 20200425, + 1449 + ], + "commit": "dc1c8e8704f5eb73c540f2b4ca3eed213d2c3246", + "sha256": "0acifs68m6y5zfwadvvvlg7s4zhgazmrg6al7piy1nycq7dmng6b" + }, + "stable": { + "version": [ + 1, + 0 + ], + "commit": "5995a4ba07a7b1b5f661ff050d93ad702f9014a4", + "sha256": "105zl102dwbzvk50xh6b824nq6p24kxhky18ghdnk5yi5sv620lm" + } + }, + { + "ename": "selectrum-prescient", + "commit": "5724ebca5ab5a1c3087cc13ae0693548666ed62b", + "sha256": "1zr83pq39i56v5bx78cp5cg2lrwz01975ng4h1ziv6nrh9p7vvr0", + "fetcher": "github", + "repo": "raxod502/prescient.el", + "unstable": { + "version": [ + 20200404, + 1550 + ], + "deps": [ + "prescient", + "selectrum" + ], + "commit": "0f4a89bdec61395138d968a38d375e63ccfbed63", + "sha256": "0nnf4y49pl9lcs90y5z6f02g1xwk1jjrl0qs7gcv6kpn0vn8kn0h" + }, + "stable": { + "version": [ + 4, + 1 + ], + "deps": [ + "prescient", + "selectrum" + ], + "commit": "aa3110281a0622fa7b5da115cefb71a319b5b1a0", + "sha256": "1rf5cz262hjpck7vpxg15bccdrwrmlhiyxc20liwcjb2ig36nis3" + } + }, { "ename": "semaphore", "commit": "1cffd8c7720e5a262b8635a5fd1ca36766f4c824", @@ -86022,14 +86914,14 @@ "repo": "wanderlust/semi", "unstable": { "version": [ - 20190708, - 1302 + 20200413, + 839 ], "deps": [ "flim" ], - "commit": "16228dc2d147d6ba8762c10fb25c54a3757ee9b0", - "sha256": "1hccmz9g1rl3qz77214ybnai143zay48kai214gk43dw05bcfavc" + "commit": "1d6e21e9ee42c2c5bf1a4422d2fe7af20aa7ff1e", + "sha256": "0pkqh95i6pj7iwghapa8hld78h1q5n50f1lah2l1k2hz4lm6r8zz" } }, { @@ -86040,16 +86932,16 @@ "repo": "conao3/seml-mode.el", "unstable": { "version": [ - 20200323, - 220 + 20200419, + 1022 ], "deps": [ "htmlize", "impatient-mode", "web-mode" ], - "commit": "32f0dbf5a9b39535bc079c9c70456479d0dd3fb2", - "sha256": "1284fdraamjsbaslyk8k75a3m1rfa1i8pwrh56k3vsmfmd8a0cib" + "commit": "4ca9d275948898602640a46573cb95d7eef913e5", + "sha256": "1wl5qsph19i0ll2ppn9va4563m4bfz1zpv99d7xd7w65x6cp29ci" }, "stable": { "version": [ @@ -86140,15 +87032,15 @@ "repo": "twlz0ne/separedit.el", "unstable": { "version": [ - 20200325, - 1711 + 20200407, + 728 ], "deps": [ "dash", "edit-indirect" ], - "commit": "2ee55780eeced9b0bb086a9d731526ee1a9c3658", - "sha256": "08xxl3z7abqk0m4lwflp0cnz7pcy66f6hps8dmxfas2hgl0qyz7i" + "commit": "e9a7b4402859d73f052330106d29ad14c3d9b6f3", + "sha256": "0d9w8n497j6q879rd9mqrmzvk3ssm95ayqbyfb5x0r3pnywdjp1b" } }, { @@ -86806,6 +87698,35 @@ "sha256": "10dq3qj1q8i6f604zws97xrvjxwrdcjj3ygh6xpna00cvf40llc2" } }, + { + "ename": "shfmt", + "commit": "a20dde08de1a7cd70739a791e1ae321e8f152685", + "sha256": "1k4rr658473vd6xad2z40dl7f26sb1zv9nc1938cg61pqi10bjan", + "fetcher": "github", + "repo": "purcell/emacs-shfmt", + "unstable": { + "version": [ + 20200421, + 103 + ], + "deps": [ + "reformatter" + ], + "commit": "342c55fab27f1e62472eebbb53cfc73b0d422a34", + "sha256": "0hmxa856hlai9ydarfsn5s9i8cnfrydgpa7mkh4a36klhdj21gfh" + }, + "stable": { + "version": [ + 0, + 1 + ], + "deps": [ + "reformatter" + ], + "commit": "cd94266badc71c1e981e904e10f28c6a80237a2f", + "sha256": "09w50l938phcpxvbg4ahyxl43k995ywavwac364nmcnvmip021qy" + } + }, { "ename": "shift-number", "commit": "b06be6b25078ddfabc1ef1145c817552f679c41c", @@ -86856,11 +87777,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20190930, - 730 + 20200406, + 2209 ], - "commit": "cbb15424431cd5f579b12307b8fa03122d525006", - "sha256": "1wwk5q3viw32pwmf4bjhbywkj0d1prwnldgdjfjzmr3rnvfw7w9h" + "commit": "e522a44b151d69d4a176e8809225598ab540fc4d", + "sha256": "1alishzz4j1hbfyfi09rkhffx6gv16yxln7q8jx25shb9rssivyz" } }, { @@ -87156,20 +88077,20 @@ "repo": "riscy/shx-for-emacs", "unstable": { "version": [ - 20200308, - 2356 + 20200410, + 639 ], - "commit": "0fec00c1eef75feeae0f71591762ba6a80bc2725", - "sha256": "0zl5lcy80m1pzwl4239lhcf0zb6px5jwbgjib136zh94l5k35wdb" + "commit": "e5b4bae0a1a9bb8a762da40397a04efdd0b2b397", + "sha256": "0p9b621rgy34r1hl9xfzxh4xpx9gpsr3n330ypfxhlr0s5754j73" }, "stable": { "version": [ 1, - 3, - 1 + 4, + 0 ], - "commit": "e90dccf40320ee0df306cab3f94fdb79504698b5", - "sha256": "0g4w5w53pknphxr7i7kwksq1789qi8rk8yk9gp4s788iq1f0i6vr" + "commit": "e5b4bae0a1a9bb8a762da40397a04efdd0b2b397", + "sha256": "0p9b621rgy34r1hl9xfzxh4xpx9gpsr3n330ypfxhlr0s5754j73" } }, { @@ -87195,11 +88116,11 @@ "repo": "webframp/sicp-info", "unstable": { "version": [ - 20180823, - 1222 + 20200421, + 242 ], - "commit": "26bc593aeae01da34ad92363b5bbd6aedab66da2", - "sha256": "0qvgdrzdp92mskqfh0x5garq0zcr8r7n834jlx5ky8q00xvb1a06" + "commit": "3efcd37eb7888845c5f3292beeb18219f9993e92", + "sha256": "1qlgg7r9v62mcw07svdkzrf5ccm6n9vg64h4p704rfzkxys1cwfs" } }, { @@ -87234,11 +88155,11 @@ "repo": "nlamirault/sift.el", "unstable": { "version": [ - 20190521, - 823 + 20200421, + 1423 ], - "commit": "33b2c9ff964fe53bb55b37429faaa4e903bead7a", - "sha256": "0cb8rcxl0jwpbgz9kk136l2ranficv8lk85fhvly1lpslbjljds9" + "commit": "cdddba2d183146c340915003f1b5d09d13712c22", + "sha256": "0ln87nhq2vhsb0ywn7rp0b3hzms5z7l6cv6dng08yly12r2957if" }, "stable": { "version": [ @@ -87383,6 +88304,29 @@ "sha256": "0dpn92rg813c4pq7a1vzj3znyxzp2lmvxqz6pzcqi0l2xn5r3wvb" } }, + { + "ename": "simple-modeline", + "commit": "054a7c164fae0c76ad2b3c6891d37a03f3e08823", + "sha256": "0c2wvwxwaa62r4vrw9g1lcgr8cv57mlfpsszynkn00cb7fhlhdmk", + "fetcher": "github", + "repo": "gexplorer/simple-modeline", + "unstable": { + "version": [ + 20200419, + 900 + ], + "commit": "e7e39660dadcef88e7e877ad1f24625873e90e51", + "sha256": "0s8979jd3x6yarq4ifn5wgn08s8z2kblzaagh4zywkhaj1i7mb4m" + }, + "stable": { + "version": [ + 1, + 1 + ], + "commit": "e7e39660dadcef88e7e877ad1f24625873e90e51", + "sha256": "0s8979jd3x6yarq4ifn5wgn08s8z2kblzaagh4zywkhaj1i7mb4m" + } + }, { "ename": "simple-mpc", "commit": "62d762308c1ec0c1d8f7b4755b7deb285cbac018", @@ -87721,8 +88665,8 @@ "repo": "yuya373/emacs-slack", "unstable": { "version": [ - 20200320, - 457 + 20200402, + 1656 ], "deps": [ "alert", @@ -87732,8 +88676,8 @@ "request", "websocket" ], - "commit": "03345aabe728da3f5238954eaa0ddbce604807d5", - "sha256": "0kyd959a9113vd7d4prgfga7sj6y6n8zrw6nkqxsfkm5sfpv31iv" + "commit": "d53a57a18fb7034182c3d02503f937761e6a2a64", + "sha256": "1xcfgyw9cky6msai2ap9fgcdasvmvn3k73rjmvnwcj4axh6vjvyx" } }, { @@ -87794,15 +88738,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20200326, - 1453 + 20200414, + 1444 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "faa0c6a0b7c77f6a2db8d3244f24563106857944", - "sha256": "1dgmakfazz3p6s64qmy03schapxi1010sa8g7p1paqkpawr9d5qp" + "commit": "221518f0d3d224403743e6690f6bb66c42d9dec9", + "sha256": "0wbxv461lq7760gsqjw5djhjkzmwxz563l97csn2637gb1wkn461" }, "stable": { "version": [ @@ -87825,27 +88769,27 @@ "repo": "anwyn/slime-company", "unstable": { "version": [ - 20200304, - 1107 + 20200424, + 1045 ], "deps": [ "company", "slime" ], - "commit": "e9153e42ec8f2089ea129ce24488dd3b5e0b9e47", - "sha256": "1dz8q9fjiip2xnw64cim0p5adbpc4lbljdiqjc5dq7bhwpff07jl" + "commit": "cec203c45ebd678b05341d1cdbe420ad07a1b8e0", + "sha256": "0dwj6kv8laivhisd9jrzdn1lxynqqxmimvyz3z0zz6qf0ijsl0wm" }, "stable": { "version": [ 1, - 1 + 3 ], "deps": [ "company", "slime" ], - "commit": "6c244690c80387a32b0cb984843e00c8b75ad6bb", - "sha256": "1hl1hqkc1pxga9k2k8k15d7dip7sfsmwf4wm4sh346m6nj606q8g" + "commit": "cec203c45ebd678b05341d1cdbe420ad07a1b8e0", + "sha256": "0dwj6kv8laivhisd9jrzdn1lxynqqxmimvyz3z0zz6qf0ijsl0wm" } }, { @@ -88280,6 +89224,24 @@ "sha256": "0q5hxg265ad9gpclv2kzikg6jvbf3zzb1mrykxn0n7mnvdfdlhsi" } }, + { + "ename": "smart-input-source", + "commit": "82ef5414e63fe94905f042534d8bde88fb5461c6", + "sha256": "1dx3cvbm9hrdfrj4ggf0hbmfag2hybdlrqgpzy48fc07dscv0acd", + "fetcher": "github", + "repo": "laishulu/emacs-smart-input-source", + "unstable": { + "version": [ + 20200423, + 1529 + ], + "deps": [ + "names" + ], + "commit": "048a6c729f5336fe800e97f995a387e11d386980", + "sha256": "19s8q8fb2kmmfllg50622hzp3jb19h9z9ik45k4v7aapdc7iw5yg" + } + }, { "ename": "smart-jump", "commit": "52f29e14e61b28cd1637ca5d6bd878d91a71251f", @@ -88467,17 +89429,17 @@ }, { "ename": "smart-tab", - "commit": "091dcc3775ec2137cb61d66df4e72aca4900897a", - "sha256": "0qi8jph2c9fdsv2mqgxd7wb3q4dax3g5x2hc53kbgkjxylagjvp5", - "fetcher": "github", - "repo": "genehack/smart-tab", + "commit": "ef37935f5f8ed12323374179a0673b5a4af57cdb", + "sha256": "1dm67sc1vylpf73m723hfjfqmm2yxrdckrgp6a3nq2586hkkid4l", + "fetcher": "git", + "url": "https://git.genehack.net/genehack/smart-tab.git", "unstable": { "version": [ - 20190916, - 137 + 20200416, + 2228 ], - "commit": "0f6963ce4de403fa43f3db68b31ce059f6251c3a", - "sha256": "16rh9wwjnqjk7hf7npfvwf28wmhd7bwnsnfgh592gv70xkcwywaa" + "commit": "67bf4f93f8afca61a3dc4f6c7a34b0b8ca9ede21", + "sha256": "1ws49lbafch1rb6g0j9k5h30c9shk3vvqhbjkf4qvhaqii94lgml" } }, { @@ -88647,11 +89609,11 @@ "repo": "aaptel/smblog-mode", "unstable": { "version": [ - 20190920, - 1823 + 20200424, + 938 ], - "commit": "fe866afbe19f804f80c37e077192576e4b0aad1a", - "sha256": "19zynq5izaafkj97a1f7dz8fljdr0mxsal8xcfa938clxihydaaz" + "commit": "fc949cff7051b31f0dbc7169774144533a27b92f", + "sha256": "07ks6d3gs264wv15lxa88pfi6i851h1wd9cacxs81wc7ijqc5sia" } }, { @@ -88872,15 +89834,15 @@ "repo": "kyleam/snakemake-mode", "unstable": { "version": [ - 20200222, - 1710 + 20200417, + 2230 ], "deps": [ "cl-lib", "magit-popup" ], - "commit": "701f970bfb48d2f7abb241b9f69127ff5b667c76", - "sha256": "0di8wqwj0l2vx29kkpy2h1yxrxgcq51y2lss5lmqp6kmw3avkvi2" + "commit": "03562dcd82964d53eff7314b844c2897d1d9af55", + "sha256": "1cj8628l196da5j54wl8wq7znvha44z1f6w9qqg37yw0pjynbvxz" }, "stable": { "version": [ @@ -89120,14 +90082,14 @@ "repo": "hlissner/emacs-solaire-mode", "unstable": { "version": [ - 20200120, - 455 + 20200423, + 742 ], "deps": [ "cl-lib" ], - "commit": "4ac324ccb0b751be80ce64449553462eafab4f32", - "sha256": "1klyzqrlsgx8q89zx1kn5z6wnpv1dmvbglldpv1y74hxhzi6ryps" + "commit": "adc8c0c60d914f6395eba0bee78feedda128b30b", + "sha256": "0kj6lhx57gl3809q4bmgv7cac8wk61g1sdyr4c2a0y9jkzf21x67" }, "stable": { "version": [ @@ -89150,14 +90112,14 @@ "repo": "bbatsov/solarized-emacs", "unstable": { "version": [ - 20200329, - 1048 + 20200411, + 1026 ], "deps": [ "dash" ], - "commit": "8cd79c8afd7563a69764c4174098d2b8e7fd0c96", - "sha256": "1x1cbyd7kr1izcbbffq1amxgg1gqfwaa5y4m17ffmdrhal37mdzb" + "commit": "c8f09494330900081ed5a4f020c972a37fd7b02e", + "sha256": "0z5srqz4g81bsyw74q04fwz30qvi4i08s7fszmwnwyr5xrf5dx42" }, "stable": { "version": [ @@ -89188,8 +90150,8 @@ "flycheck", "solidity-mode" ], - "commit": "b190993dcb8376e80fb1d9b71f3ed6170bd2a341", - "sha256": "0s5xk38k3mc1d40dszlcgfpn5rvb7nsnnpmgr3c0bwqa4xh6yqrg" + "commit": "022b3159832384a7dcdc2168809e698600826047", + "sha256": "144w84abffbrbb4wflgipndaasx82axf36xm373ybdih4131mi69" }, "stable": { "version": [ @@ -89213,11 +90175,11 @@ "repo": "ethereum/emacs-solidity", "unstable": { "version": [ - 20200124, - 827 + 20200418, + 921 ], - "commit": "b190993dcb8376e80fb1d9b71f3ed6170bd2a341", - "sha256": "0s5xk38k3mc1d40dszlcgfpn5rvb7nsnnpmgr3c0bwqa4xh6yqrg" + "commit": "022b3159832384a7dcdc2168809e698600826047", + "sha256": "144w84abffbrbb4wflgipndaasx82axf36xm373ybdih4131mi69" }, "stable": { "version": [ @@ -89245,8 +90207,8 @@ "dash", "request" ], - "commit": "b143b5c6161e3760f42a7a5405f5f7e97079e09a", - "sha256": "01ak3sr2hp2mmn81j1qdgyvrm9np979fpg2ngbnijnb8ai3gn30f" + "commit": "9fdb75e150e78170b3ca7863a8a0638c6ecc0fc0", + "sha256": "0qvr4cga8k4bn0jbfp626cjkxgvqkac902v7hxakj7l47arxcd5z" } }, { @@ -89285,6 +90247,48 @@ "sha256": "10gh1hvxq9gm29r6qzlnva7vjidd7n4kih4z2ihyvbvy9za20xqw" } }, + { + "ename": "sorcery-theme", + "commit": "cdb6f1cfbf3bbeb1eeb6440fb216e8e3b523bb0f", + "sha256": "1qsavwbqidva4m0mdw393qbwlibhkkywnxj9mshfmkwaq050ivb2", + "fetcher": "github", + "repo": "vxid/emacs-theme-sorcery", + "unstable": { + "version": [ + 20200413, + 2242 + ], + "deps": [ + "autothemer" + ], + "commit": "fb041d0d8d4ae2840ddcfb1bd56fefe687da8c52", + "sha256": "1j54m18xsn44m5xshmk2pfxn795svjn0zv77qwfxn1d2p5j0r6ni" + } + }, + { + "ename": "soria-theme", + "commit": "9196110908f0d2130f7963499a94853b5192ac8c", + "sha256": "1fmys72s4n334m60ywpmbxjbvjwp7qn14pasmnlkv3l1bw6jygsm", + "fetcher": "github", + "repo": "mssola/soria", + "unstable": { + "version": [ + 20200424, + 1530 + ], + "commit": "fcc14cc99f0d26abf91af682b5fdedf5a8a37003", + "sha256": "0mrh147q9zzs9nkc714iyly5aydx3svma0ix8sgrk7rqacfd56hv" + }, + "stable": { + "version": [ + 0, + 3, + 2 + ], + "commit": "5edb9379cd21411fb182239ed9ac19be4a278f32", + "sha256": "103837zizm5iqv3sskxgkhjij2icjx9sjvjhq2l9zi66rlh9gca7" + } + }, { "ename": "sort-words", "commit": "0a4bd566392d7cebe8a891d787439512e8d34cf9", @@ -89551,6 +90555,21 @@ "sha256": "1aqkkbf0xw4kqsy1jjn4xhs5vk2vcsqzs7f4p2sf1plnzsqxflw8" } }, + { + "ename": "space-theming", + "commit": "5529fcf16b877b01ee0aff710ebfb0ad5da8dba1", + "sha256": "0khjdmqv1q2pdas0xjfqs68xjg2nqms6g21bplg54ynsqcp7asv9", + "fetcher": "github", + "repo": "p3r7/space-theming", + "unstable": { + "version": [ + 20200415, + 810 + ], + "commit": "0a41a892180451d51095516e8ee2c9042be009c1", + "sha256": "02d07fs72fqg12lm7wxlmds1xyqf92ay0h9ghpkavwn6mphslpvc" + } + }, { "ename": "spacebar", "commit": "e4d1808eabdb9081441e01526efe81782ae0122f", @@ -89863,6 +90882,21 @@ "sha256": "0mhzjia900irv0ndiw6w2vzin1gvyaf48pghi16r562ci4lr963w" } }, + { + "ename": "spell-fu", + "commit": "abaa6522f18ca1f47788ebb3281fbfcdade2b7c7", + "sha256": "0c2yi5lz2ww7mm9ih3m374w65n73z4knhnbrvdyzd7ja3xb3l17n", + "fetcher": "gitlab", + "repo": "ideasman42/emacs-spell-fu", + "unstable": { + "version": [ + 20200426, + 600 + ], + "commit": "e62cfc4f08fc4743d6961fe3402adbf2260d7e70", + "sha256": "1w6jsn3p6956vk5pzwlbc211sswqai8ary8ad3fbhbjwxl5z3gsc" + } + }, { "ename": "sphinx-doc", "commit": "a3b80d346ad4fb415970beddb5f02ae795fbf1b4", @@ -90371,11 +91405,11 @@ "repo": "srcery-colors/srcery-emacs", "unstable": { "version": [ - 20200313, - 1310 + 20200422, + 1941 ], - "commit": "465a458e8c1629baa980988d43e441c4fdb92151", - "sha256": "04bncx9y1jqc6pzzl5c7dgdvzq012ymsp6ilkifg19xnz3bdmhm6" + "commit": "9630e465cc5166f723b7c5378e326561cf2a1738", + "sha256": "0ppaicggrrd3wrbjddw75mnsfli9a8db6bg21m1k7bafjkgraxfn" }, "stable": { "version": [ @@ -90418,14 +91452,14 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20200326, - 752 + 20200422, + 1730 ], "deps": [ "cl-lib" ], - "commit": "fa0c9e1fae26780dcce266df8ad8bf5efc971c30", - "sha256": "1azdc14y2jsmqcphk16qbxaj2fc7ajddwjjhc73xbhbn67knk1af" + "commit": "d55b4047fcfd3528fa9487d206773f45c7c2d038", + "sha256": "0c83wachsrrz0mnsb2lci6mr62ma40w05lxz7y8vrfyqppkcfa6a" }, "stable": { "version": [ @@ -90509,24 +91543,25 @@ "unstable": { "version": [ 20200329, - 1535 + 1558 ], "deps": [ "dash" ], - "commit": "67975f7773bfa0140d9dc09bd67df7f5489aa6ea", - "sha256": "0vwa1szfy45xpqqv44kyasjv2x0y2n3v680wlb1v3w2mxwwg8vda" + "commit": "a5377e4317365a3d5442e06d5c255d4a7c7618db", + "sha256": "1i3zmsn0w2k7p2hlzssibckm32kf05l56mkhg96x4sf06g3pwq1d" }, "stable": { "version": [ 0, - 4 + 4, + 1 ], "deps": [ "dash" ], - "commit": "d9dbedd773ad3a831e02e162c47936d6814a850a", - "sha256": "0895n7bss4wdydic1gflr03f2cwdyqywl16gvb599lpn288jhwvz" + "commit": "a5377e4317365a3d5442e06d5c255d4a7c7618db", + "sha256": "1i3zmsn0w2k7p2hlzssibckm32kf05l56mkhg96x4sf06g3pwq1d" } }, { @@ -90816,8 +91851,8 @@ 20171130, 1559 ], - "commit": "af37d392baa6f2e7445e9f714da743fd10153adf", - "sha256": "0bc34ri3d90fcjsin5nvli3ncqrh8x9iw8rhzdrwsbr9ildmr1ib" + "commit": "209d2233843778ebee12d103c41b226fa27ff266", + "sha256": "19rm3zznj0j8q5gsqpk6hy5l3gii4pmp5s2npl1zsiy6bb7p59c4" }, "stable": { "version": [ @@ -91050,20 +92085,21 @@ "repo": "stepnem/stripes-el", "unstable": { "version": [ - 20200322, - 2350 + 20200330, + 2022 ], - "commit": "8b0010acb9f92c7ab2fb8396aaf354fccedea7c5", - "sha256": "0q2zw9nvs9c27c7mcj9psqwf1r7p6k86y63d6q38hps22l063c9x" + "commit": "7b1d501f44b697a0514ef6759fd126d65867f18d", + "sha256": "0mx7l751jiijrjnbn3y6awasjy2c7k4ndgjq5c455vzxrlcbwr25" }, "stable": { "version": [ 0, 3, + 1, 1 ], - "commit": "8b0010acb9f92c7ab2fb8396aaf354fccedea7c5", - "sha256": "0q2zw9nvs9c27c7mcj9psqwf1r7p6k86y63d6q38hps22l063c9x" + "commit": "7b1d501f44b697a0514ef6759fd126d65867f18d", + "sha256": "0mx7l751jiijrjnbn3y6awasjy2c7k4ndgjq5c455vzxrlcbwr25" } }, { @@ -91543,8 +92579,8 @@ 20200327, 406 ], - "commit": "17a53e5f8dd45c6bca44659a80a79ca30d161635", - "sha256": "1hrrcg42b1fnf8y0mz3fli6mp7aha7w0rv7nhrsrvhrilnq97wzl" + "commit": "48a26af6a3395a8bf3f09747d0a205c6dbc79313", + "sha256": "12gg55jdb6b5jk0xizx2cqc795bgll2kap3jp08s1vr16zkdaryn" } }, { @@ -91733,26 +92769,26 @@ "repo": "swift-emacs/swift-mode", "unstable": { "version": [ - 20191130, - 544 + 20200418, + 617 ], "deps": [ "seq" ], - "commit": "1268425311ab20f1618df4e52cb1b79e28b553df", - "sha256": "1ghm5spzxxdvwn1lk3xci62hiv12x4hzjk5xh9q522a833nl04i4" + "commit": "2ab9ea1784a12a482ed9e3fb284b7a7658f40fff", + "sha256": "0wml7f8k3gqlxm0yg744271mqh087prlsfmbiv7fvkrcs55q0592" }, "stable": { "version": [ 8, 0, - 1 + 2 ], "deps": [ "seq" ], - "commit": "86f8f62294aa5a6d44fa872278d75a4a41f403d4", - "sha256": "0sszk2nwp6h9qk7vgh5n05pzh264br3x3r1hyj97gwf8jdqzkr74" + "commit": "2ab9ea1784a12a482ed9e3fb284b7a7658f40fff", + "sha256": "0wml7f8k3gqlxm0yg744271mqh087prlsfmbiv7fvkrcs55q0592" } }, { @@ -91823,8 +92859,8 @@ "deps": [ "ivy" ], - "commit": "64f05f4735bba8b708bc12cfc2cbfb7fb7706787", - "sha256": "16b75jw0by1f8divymfygjbp5mikc2bjz4nqd907mdsndf8k6i8q" + "commit": "47ec37b395cc1b304bbf91e804f138634544a9df", + "sha256": "05k2qjj4z8vljfppkphfhw67wvb5ij4nz4m158v89lx87y0phh74" }, "stable": { "version": [ @@ -92081,7 +93117,7 @@ "deps": [ "f" ], - "commit": "9bd33e73ecb2a0e3e3757c55c05f46b6937227e0", + "commit": "cd344b6c2cb6a8fcf061af2c85441644a4e7a006", "sha256": "193lq58mhkq0rrinkaxiyhkk60qf7q0gx03na2968zcrahrd8w75" }, "stable": { @@ -92101,8 +93137,8 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20200225, - 1928 + 20200425, + 1911 ], "deps": [ "cider", @@ -92119,13 +93155,13 @@ "slime", "smartparens" ], - "commit": "c8bdd672ec7fc50f72599081b87ef48bcec45c9c", - "sha256": "04s0nacv9qy5a95hsblz2an6ipzxmqi98pz71vyc0nghzp6j24zd" + "commit": "3dba2ae3f65bd1c40e3756e05a57ced039a15a7f", + "sha256": "1j2ycsi2ipbyaknscy0vgr1ybyvzl7j1q0gvazkl5rpihshz2shl" }, "stable": { "version": [ 0, - 5, + 6, 0 ], "deps": [ @@ -92143,8 +93179,8 @@ "slime", "smartparens" ], - "commit": "c8bdd672ec7fc50f72599081b87ef48bcec45c9c", - "sha256": "04s0nacv9qy5a95hsblz2an6ipzxmqi98pz71vyc0nghzp6j24zd" + "commit": "62bd31d8647b88ec179fb8ff89f583b55a0421cc", + "sha256": "1c2y65hcd0nydhkh7a903flq061x8hld272n00xn4dd0b8kvjp29" } }, { @@ -92203,35 +93239,6 @@ "sha256": "006siydqxqds0qqds0zxn821dk4pw14wyymyp03n594wgqzw7m8q" } }, - { - "ename": "syndicate", - "commit": "626bda1691d9c7a97fcf549f7a3f0d41d832cfde", - "sha256": "06nmldcw5dy2shhpk6nyix7gs57gsr5s9ksj57xgg8y2j3j0da95", - "fetcher": "github", - "repo": "KNX32542/syndicate", - "unstable": { - "version": [ - 20160603, - 1523 - ], - "deps": [ - "evil" - ], - "commit": "90cee202a06f5bab48268ebf9f62c43334b69f50", - "sha256": "1w0na1p9drdmbci7adj20amrabcpny9fb2v4bd967ils4f2wly75" - }, - "stable": { - "version": [ - 1, - 0 - ], - "deps": [ - "evil" - ], - "commit": "b839aaba0c8583a3254476b53976e3caac4f89a9", - "sha256": "01bymbsvbisnpb2wpqxhrvqx6cj57nh4xvpsbsr5rr1h4pm5jkzl" - } - }, { "ename": "synonymous", "commit": "ecf2c44c63e9f41f1733849bdef0d0c301485580", @@ -92307,14 +93314,14 @@ "repo": "emacs-berlin/syntactic-close", "unstable": { "version": [ - 20191119, - 1007 + 20200408, + 1148 ], "deps": [ "cl-lib" ], - "commit": "5760319d8fdb3672dd0e95880c30e9c4d92ab239", - "sha256": "0rkqflaz0npclnjsy2r6apkjrzlw5zrpa6j87sbjpnnh0jgcsmsq" + "commit": "c21ffdf6a2f8c2a83d3efc729852cd2b09fe03a6", + "sha256": "1m6y7njkn5vibgnr3pnh6nci75j2ksr93ajp01jwpxxxc0wmipa8" } }, { @@ -92343,9 +93350,9 @@ }, { "ename": "syntax-subword", - "commit": "5b7972602399f9df9139cff177e38653bb0f43ed", - "sha256": "1as89ffqz2h69fdwybgs5wibnrvskm7hd58vagfjkla9pjlpffpm", - "fetcher": "bitbucket", + "commit": "caca0b2bc2aaac563074cbb4ea4296fce749e203", + "sha256": "1nfbpckxfy95m7bnj08bnpf8zyxc0dyap5hq1plxl3lxb3c4fvr4", + "fetcher": "github", "repo": "jpkotta/syntax-subword", "unstable": { "version": [ @@ -92354,6 +93361,14 @@ ], "commit": "ad0db0fcb464652a1d3408f525dee9293ce2b70c", "sha256": "1wcgr6scvwwfmhhjbpq3riq0gmp4g08ffbl91fpgp72j8zrc1c6x" + }, + "stable": { + "version": [ + 0, + 2 + ], + "commit": "01b27feac37eb60cf73ff80374004d9e847e637d", + "sha256": "12jk28jbkq1pcpgsbknk8xzzghjh2dhwb54kag2hynldn4qgfkrz" } }, { @@ -92715,11 +93730,11 @@ "repo": "tmalsburg/tango-plus-theme", "unstable": { "version": [ - 20170214, - 1708 + 20200423, + 804 ], - "commit": "8ba8901397e3e9f1d53110487bfa0effc65015e7", - "sha256": "025dca4yqpai45s74nk41y075v8pv59fdna11c0qqz3ihyrdhbrq" + "commit": "1e9484bb392bb0aad2be159505c502320f8d0a5c", + "sha256": "1819s9c0nm4pkgcpxqnr20075krq30qn6hpg4zl54cnrxbfbiq9f" } }, { @@ -92769,11 +93784,11 @@ "repo": "saf-dmitry/taskpaper-mode", "unstable": { "version": [ - 20200321, - 2124 + 20200416, + 2114 ], - "commit": "9ca1afb561433ff6d2e8527e3d8d9152de5912f7", - "sha256": "0a3hlwzq9ckf7jcxq6drrgl1g8hi5ad0f6lgm3nawbsqmrb6r28y" + "commit": "eedf6a465b8ccc865c108a6f2715769300f5a499", + "sha256": "1p7wlv5i46f3d9kn3yiw6rga8mkln9m5xknzimzym2pyaclva41m" }, "stable": { "version": [ @@ -92817,20 +93832,20 @@ "deps": [ "cider" ], - "commit": "6c2631e3fd68e70110aa0cc5b83b7511eab363e2", - "sha256": "1sgnzgy0b61hxkj2fzkgnlrrpgsc5v1prns9hv1za4mv60xs8f15" + "commit": "8dfb4f92db2d8598ba809636a82d210c378b4845", + "sha256": "1sdi1rr9xq7spps5hagzs8irfljxmbd5y3hh4jiyvn54cwicg3g8" }, "stable": { "version": [ 2, 0, - 2 + 3 ], "deps": [ "cider" ], - "commit": "d4ce3b51e97fd7e9f5a650796dee9ba4079f9df0", - "sha256": "1vday9jnmzspnfy3ppladj0z5by4yysfwp1dnqv7n3ayyza5r8w0" + "commit": "ce85fd9bcd008031a605ea8913577f452b49e352", + "sha256": "06dm6gdh10jbmyjr0y96s06qi3k12phq522pviis68qm7v2ryr47" } }, { @@ -92969,14 +93984,14 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20200329, - 1557 + 20200423, + 1038 ], "deps": [ "visual-fill-column" ], - "commit": "0da852c0b72ad3473432f9e846ce1371d7c8cd61", - "sha256": "0n4jvl6c68wkddvsjfyw82rxy5h7ikc6qrjd35h2v864080gmbjp" + "commit": "50ef9bf06cc162b39cf3553b89b02faf5bc87835", + "sha256": "1h5100vmgwy52zp7ryarj4xw3gb9paj1qpm39mc9h62s6n1zysw7" }, "stable": { "version": [ @@ -93022,16 +94037,16 @@ "repo": "dbordak/telephone-line", "unstable": { "version": [ - 20191120, - 27 + 20200412, + 1614 ], "deps": [ "cl-generic", "cl-lib", "seq" ], - "commit": "bfe7b189d708d9cbc69ef2eaf5542108edc4257d", - "sha256": "0dkscbjms2557fzd7gawgsic6gfzypyn973skiyhy0y8zimmr406" + "commit": "65198f72f3b1ae618507aa28094f05d6de4846a9", + "sha256": "177v612ii8nj9nsmfxlf17gr3wair4whzggi3pshch7ghbxdqv5q" }, "stable": { "version": [ @@ -93665,14 +94680,14 @@ "repo": "TobiasZawada/texfrag", "unstable": { "version": [ - 20200104, - 41 + 20200424, + 205 ], "deps": [ "auctex" ], - "commit": "2a5561b4534a3b78718e2c5fe30550c89341874e", - "sha256": "1i583i2h9f5bsg663yl9xriv1lc5gb5w4ql6b5r9dwv33lg7l6mx" + "commit": "48118c4e38836117efb4eede927ab85d9a0d2013", + "sha256": "1dpvf9limh9b0sg0x41gyw9w5nf5nvkd7zzlyysswhinm6jba4iz" }, "stable": { "version": [ @@ -93836,26 +94851,26 @@ "repo": "myTerminal/theme-looper", "unstable": { "version": [ - 20200326, - 1651 + 20200410, + 1757 ], "deps": [ "cl-lib" ], - "commit": "7077ca11508c6a00d98d592dee967e92185480ff", - "sha256": "02kiaqlrb677773809sfkajz31p9fsr72k4k0g5297wlibr9ymjr" + "commit": "0e314ad21193441a26ce1839737e7a054e6a1a1b", + "sha256": "1v4rv2w8jdjzikwfjxsxqrbfwh6nm88v9x74pdhc3mq36qwl487g" }, "stable": { "version": [ 2, - 5, + 6, 0 ], "deps": [ "cl-lib" ], - "commit": "7077ca11508c6a00d98d592dee967e92185480ff", - "sha256": "02kiaqlrb677773809sfkajz31p9fsr72k4k0g5297wlibr9ymjr" + "commit": "0e314ad21193441a26ce1839737e7a054e6a1a1b", + "sha256": "1v4rv2w8jdjzikwfjxsxqrbfwh6nm88v9x74pdhc3mq36qwl487g" } }, { @@ -93979,18 +94994,18 @@ 20200212, 1903 ], - "commit": "9889eb8b3a3a773e8f06df327a76e408f9214cd4", - "sha256": "1vhfkfsrnhdzsk1353xl383nsb7x6a01v7r79lxdcrkj5yxppz0d" + "commit": "598704d0259d992af190a4388140b8aec07f40ef", + "sha256": "168sl4jbcyqms1cvg8x91kclim27v9zbfrw3cn2fmwmd2g29c31j" }, "stable": { "version": [ 2020, - 3, - 23, + 4, + 20, 0 ], - "commit": "186d782f02d80c7d8e93be352c2011ed4097c228", - "sha256": "1wj4ng9ymi0hszl3kmdg7rqrff4zk0zipbbn1jcxcii2swrkw12g" + "commit": "23496d2d53ecc70a2353c1a84699ac579e21e0a1", + "sha256": "0yvpnyzklsjppfhd9spgrf9gh3f36zvs3rz7fyc7bl3n68s3z7wq" } }, { @@ -94046,20 +95061,20 @@ "deps": [ "haskell-mode" ], - "commit": "5d4bce7a9af5e39e6df0d2577962579e31964b65", - "sha256": "0hnqcfvc8gca98wyzcrjldn9kcxdc4m8aa9cdr1884kp4kf5dmvj" + "commit": "3735a13c9bbe4fbb788d9dbc363701081253bafa", + "sha256": "0nm02pzhvg6lb3j4m8g4jfgkirv8pb6881bk2r74hijxvjamma0b" }, "stable": { "version": [ 1, 4, - 8 + 9 ], "deps": [ "haskell-mode" ], - "commit": "b28951be9abee7dc234c318849169bb578db3c49", - "sha256": "0absv56yqrqf3mzgs064q88lh6k28a7knzqrgdmf4100gf32np4j" + "commit": "252e3be53eb1bf6bfcd1b3c52af982506c84a89e", + "sha256": "19chvk24csg5w38q6yh1wky4nk4z8361p1q5q118427njqkl5ql3" } }, { @@ -94376,14 +95391,14 @@ "repo": "kuanyui/tldr.el", "unstable": { "version": [ - 20200302, - 1744 + 20200330, + 1025 ], "deps": [ "request" ], - "commit": "7203d1be3dcbf12131846ffe06601933fa874d74", - "sha256": "1bw6la463l2yfm7rp76ga4makfy4kpxgwi7ni5gxk31w11g26ryk" + "commit": "269bda7001613c0b70c0662d2a74d200765c1dcb", + "sha256": "0z8hkp15sdb0x0g67v6xa8ds28awz4i2vcbryj5zfpl15d0fiqc2" } }, { @@ -94409,15 +95424,15 @@ "repo": "laishulu/emacs-tmux-pane", "unstable": { "version": [ - 20200330, - 456 + 20200419, + 1331 ], "deps": [ "names", "s" ], - "commit": "942270359587d54f4fd6e37e8d35da38373447c5", - "sha256": "1x5b0680vxvjqcj5r3674n7gnp4994js13707pikl362bhv398kw" + "commit": "6e8d0584b0bbd412c5d29c87add7364299b3d2a0", + "sha256": "054qncg530paiv1vs27hs94m2y2fzvr4iind1rr16m8v8qf7zia6" } }, { @@ -94646,14 +95661,14 @@ "repo": "xuchunyang/tongbu.el", "unstable": { "version": [ - 20200321, - 1817 + 20200414, + 507 ], "deps": [ "web-server" ], - "commit": "cf3b3ee1468c3dcd1721a5e6802821c8f52f34ce", - "sha256": "0s4h711rwkpf1dbqbak4akbm95y8crd0niisx19jmk9lms5kj5n5" + "commit": "6f6e5c5446f0c5735357ab520b249ab97295653e", + "sha256": "05pg1qddsl0m4r73smrxpcvyiwa18d9jl6i8nfanlydwmmjqblb9" } }, { @@ -94963,8 +95978,8 @@ 20200226, 1612 ], - "commit": "a269614c69ad8b2703e6e5093d0017d6afad6cca", - "sha256": "0w50sh55c04gacx2pp19rvi0fwj9h19c9gzd8dpa82zjiidfxckr" + "commit": "afa0c2f98453b9ffd9d8160831debc7e36cdb87b", + "sha256": "0jkyrwxmfarbjqidvgxh0x4al9xh1wyd6r1rwvkbwxscz5111h3z" }, "stable": { "version": [ @@ -94976,6 +95991,24 @@ "sha256": "0w50sh55c04gacx2pp19rvi0fwj9h19c9gzd8dpa82zjiidfxckr" } }, + { + "ename": "transient-dwim", + "commit": "0ad7091aa6129c09e457c71274a42344acd6b823", + "sha256": "1q32if4i913vjbcpcdrfznjiih4c30ipnadn84zkr72wn5ndzlpq", + "fetcher": "github", + "repo": "conao3/transient-dwim.el", + "unstable": { + "version": [ + 20200411, + 2015 + ], + "deps": [ + "transient" + ], + "commit": "00d111e41e433736422e388e593b5c0df7d21bf9", + "sha256": "1gx3v5axvwah1yb0wba2l60dy72lcw7jw86cfjlg3m9a8xd090v7" + } + }, { "ename": "transmission", "commit": "9ed7e414687c0bd82b140a1bd8044084d094d18f", @@ -95164,8 +96197,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200328, - 1143 + 20200426, + 1031 ], "deps": [ "ace-window", @@ -95177,13 +96210,13 @@ "pfuture", "s" ], - "commit": "4c1add44cc0c5a710c22788663353c9c24909149", - "sha256": "0zykh36hfn3zldbs08csqysw4ykkaj736jnwzjzsb9rc39nwskid" + "commit": "93b4357f7d9ff559c195be1fc4a7ec3554053d48", + "sha256": "1rh0bbm2mqy4zwkxrcsc88qpg2j6cbjsqcf8l682ibmmnslrfqh9" }, "stable": { "version": [ 2, - 6 + 8 ], "deps": [ "ace-window", @@ -95195,8 +96228,8 @@ "pfuture", "s" ], - "commit": "e01ad21ea3cc0eba8cd460737116b51be32ffb45", - "sha256": "13gs8g05xj7np3i2q3bbxg6zgdiazzn1spxii4x0cyd4pg83c0i1" + "commit": "16b0819c6f27f45fe0495a29eeff5f01bd765b04", + "sha256": "0m083g3pg0n4ymi1w0jx34awr7cqbm4r561adij9kklblxsz7sc2" } }, { @@ -95214,20 +96247,20 @@ "evil", "treemacs" ], - "commit": "4c1add44cc0c5a710c22788663353c9c24909149", - "sha256": "0zykh36hfn3zldbs08csqysw4ykkaj736jnwzjzsb9rc39nwskid" + "commit": "93b4357f7d9ff559c195be1fc4a7ec3554053d48", + "sha256": "1rh0bbm2mqy4zwkxrcsc88qpg2j6cbjsqcf8l682ibmmnslrfqh9" }, "stable": { "version": [ 2, - 6 + 8 ], "deps": [ "evil", "treemacs" ], - "commit": "e01ad21ea3cc0eba8cd460737116b51be32ffb45", - "sha256": "13gs8g05xj7np3i2q3bbxg6zgdiazzn1spxii4x0cyd4pg83c0i1" + "commit": "16b0819c6f27f45fe0495a29eeff5f01bd765b04", + "sha256": "0m083g3pg0n4ymi1w0jx34awr7cqbm4r561adij9kklblxsz7sc2" } }, { @@ -95238,27 +96271,27 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200205, - 548 + 20200421, + 1426 ], "deps": [ "cl-lib", "treemacs" ], - "commit": "4c1add44cc0c5a710c22788663353c9c24909149", - "sha256": "0zykh36hfn3zldbs08csqysw4ykkaj736jnwzjzsb9rc39nwskid" + "commit": "93b4357f7d9ff559c195be1fc4a7ec3554053d48", + "sha256": "1rh0bbm2mqy4zwkxrcsc88qpg2j6cbjsqcf8l682ibmmnslrfqh9" }, "stable": { "version": [ 2, - 6 + 8 ], "deps": [ "cl-lib", "treemacs" ], - "commit": "e01ad21ea3cc0eba8cd460737116b51be32ffb45", - "sha256": "13gs8g05xj7np3i2q3bbxg6zgdiazzn1spxii4x0cyd4pg83c0i1" + "commit": "16b0819c6f27f45fe0495a29eeff5f01bd765b04", + "sha256": "0m083g3pg0n4ymi1w0jx34awr7cqbm4r561adij9kklblxsz7sc2" } }, { @@ -95269,29 +96302,29 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200302, - 553 + 20200421, + 1426 ], "deps": [ "magit", "pfuture", "treemacs" ], - "commit": "4c1add44cc0c5a710c22788663353c9c24909149", - "sha256": "0zykh36hfn3zldbs08csqysw4ykkaj736jnwzjzsb9rc39nwskid" + "commit": "93b4357f7d9ff559c195be1fc4a7ec3554053d48", + "sha256": "1rh0bbm2mqy4zwkxrcsc88qpg2j6cbjsqcf8l682ibmmnslrfqh9" }, "stable": { "version": [ 2, - 6 + 8 ], "deps": [ "magit", "pfuture", "treemacs" ], - "commit": "e01ad21ea3cc0eba8cd460737116b51be32ffb45", - "sha256": "13gs8g05xj7np3i2q3bbxg6zgdiazzn1spxii4x0cyd4pg83c0i1" + "commit": "16b0819c6f27f45fe0495a29eeff5f01bd765b04", + "sha256": "0m083g3pg0n4ymi1w0jx34awr7cqbm4r561adij9kklblxsz7sc2" } }, { @@ -95302,16 +96335,29 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200309, - 2057 + 20200421, + 1426 ], "deps": [ "dash", "persp-mode", "treemacs" ], - "commit": "4c1add44cc0c5a710c22788663353c9c24909149", - "sha256": "0zykh36hfn3zldbs08csqysw4ykkaj736jnwzjzsb9rc39nwskid" + "commit": "93b4357f7d9ff559c195be1fc4a7ec3554053d48", + "sha256": "1rh0bbm2mqy4zwkxrcsc88qpg2j6cbjsqcf8l682ibmmnslrfqh9" + }, + "stable": { + "version": [ + 2, + 8 + ], + "deps": [ + "dash", + "persp-mode", + "treemacs" + ], + "commit": "16b0819c6f27f45fe0495a29eeff5f01bd765b04", + "sha256": "0m083g3pg0n4ymi1w0jx34awr7cqbm4r561adij9kklblxsz7sc2" } }, { @@ -95329,20 +96375,20 @@ "projectile", "treemacs" ], - "commit": "4c1add44cc0c5a710c22788663353c9c24909149", - "sha256": "0zykh36hfn3zldbs08csqysw4ykkaj736jnwzjzsb9rc39nwskid" + "commit": "93b4357f7d9ff559c195be1fc4a7ec3554053d48", + "sha256": "1rh0bbm2mqy4zwkxrcsc88qpg2j6cbjsqcf8l682ibmmnslrfqh9" }, "stable": { "version": [ 2, - 6 + 8 ], "deps": [ "projectile", "treemacs" ], - "commit": "e01ad21ea3cc0eba8cd460737116b51be32ffb45", - "sha256": "13gs8g05xj7np3i2q3bbxg6zgdiazzn1spxii4x0cyd4pg83c0i1" + "commit": "16b0819c6f27f45fe0495a29eeff5f01bd765b04", + "sha256": "0m083g3pg0n4ymi1w0jx34awr7cqbm4r561adij9kklblxsz7sc2" } }, { @@ -96197,11 +97243,11 @@ "repo": "ideasman42/emacs-undo-fu", "unstable": { "version": [ - 20200305, - 28 + 20200413, + 159 ], - "commit": "aae7ec9784e8fab9b33adf25eac25e745653f19f", - "sha256": "02xlfjl9z822qixk9gxwv18n8ykdq793fd0qm9g0qsz0sn57mr8n" + "commit": "0ce9ac36144e80316fff50bfe1bc5dd7e5e7ded6", + "sha256": "1mqm2z8bp5dx9f9xq6bpgvk8xmzmh71bgxbff6kcliv0jy3jlakb" } }, { @@ -96212,11 +97258,11 @@ "repo": "ideasman42/emacs-undo-fu-session", "unstable": { "version": [ - 20200221, - 1152 + 20200408, + 11 ], - "commit": "35d4cf3771d905d647a35df050abfd9015833aad", - "sha256": "0846whh01bzxhl98wlywd11ki6wk2iyzzxvc5gnlj85cdasjrz10" + "commit": "b808ef0cdcdd2eef221c67eda567eed7fcb3d4af", + "sha256": "107dgdw1jh8mipgwal1g86nfckrpz2l53a1sqcg90nb0n8fkvy2q" } }, { @@ -96646,6 +97692,29 @@ "sha256": "0fgipv93x47cvyww07cqx8xa95jz36y6fy5rmaq40jnnmdkgq862" } }, + { + "ename": "unobtrusive-magit-theme", + "commit": "6dd57561738c2dc3ed6dc03f57d2487ce949f035", + "sha256": "05djixlq49dn1m64xs8b6w4kg650wrr8rs2pb72p1kfvp2a53g7w", + "fetcher": "github", + "repo": "tee3/unobtrusive-magit-theme", + "unstable": { + "version": [ + 20200411, + 1349 + ], + "commit": "aede357009655d19d4468320b2b61b0f26a47593", + "sha256": "1af8c7q3vxj23l2ah5waj9hn5pfp66834b4akm76jc5wqf0sr9j1" + }, + "stable": { + "version": [ + 0, + 4 + ], + "commit": "aede357009655d19d4468320b2b61b0f26a47593", + "sha256": "1af8c7q3vxj23l2ah5waj9hn5pfp66834b4akm76jc5wqf0sr9j1" + } + }, { "ename": "untitled-new-buffer", "commit": "de62e48115e1e5f9506e6d47a3b23c0420c1205b", @@ -96963,30 +98032,6 @@ "sha256": "0xg98ngrdlfjcb902qaljwhh9jszkafc2vm1x8627lnw1k7i6b3q" } }, - { - "ename": "usql", - "commit": "c8f6b968312a09d062fcc8f942d29c93df2a5a3c", - "sha256": "10ks164kcly5gkb2qmn700a51kph2sry4a64jwn60p5xl7w7af84", - "fetcher": "github", - "repo": "nickbarnwell/usql.el", - "unstable": { - "version": [ - 20180305, - 2323 - ], - "commit": "bfaf428b366a9a185eef84f0d645a98dc918fe3d", - "sha256": "00b1g30l86abg65wc9f4vcn4ccqa2zmn2mi33vdjrq3phw17d2ks" - }, - "stable": { - "version": [ - 0, - 0, - 3 - ], - "commit": "bfaf428b366a9a185eef84f0d645a98dc918fe3d", - "sha256": "00b1g30l86abg65wc9f4vcn4ccqa2zmn2mi33vdjrq3phw17d2ks" - } - }, { "ename": "utop", "commit": "30489fe52b4031184e54f994770aa3291257bc9d", @@ -96998,17 +98043,17 @@ 20190715, 1836 ], - "commit": "30c77ce4d7996822721e97ac8042d5bc0d415584", - "sha256": "03947csh8nzqqa58z2hq5i87kqf7z65f7b19nyvy0can2flznl7q" + "commit": "471cb311159773bbb280d0f1a4b47c54456c67a9", + "sha256": "09hxi1v5wvb952rwfmj48n6ndxkqn8ciaqj1cd9xgkw62h54agq9" }, "stable": { "version": [ 2, - 4, - 3 + 5, + 0 ], - "commit": "ba35712f1bd1c489a54088a4fd807f8484c1d98a", - "sha256": "1bl4943qpi3qy152dbdm5glhx19zsiylmn4rcxi8l66g58hikyjp" + "commit": "471cb311159773bbb280d0f1a4b47c54456c67a9", + "sha256": "09hxi1v5wvb952rwfmj48n6ndxkqn8ciaqj1cd9xgkw62h54agq9" } }, { @@ -97619,11 +98664,11 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20200326, - 2322 + 20200404, + 951 ], - "commit": "2c4252b2b57f65ebd9fd2c7a7771b4d0354f1d4c", - "sha256": "0g0hi1bhrx8bj0wbxwaimfpvl491sd079551199hcyhq607pcpp2" + "commit": "82cf1bde07b0c96b25d1dd16268663d8931fbb60", + "sha256": "18pjsjxrf844y3aw0fvj451cz08kw2j3idmhh3l15aj3jdwzjfbq" }, "stable": { "version": [ @@ -97722,14 +98767,14 @@ "repo": "baron42bba/vertica-snippets", "unstable": { "version": [ - 20191213, - 1109 + 20200423, + 1200 ], "deps": [ "yasnippet" ], - "commit": "2d1c45c63392ed869625bd062c19422600c9f555", - "sha256": "1gn57jfmma5h90m3b7l698rncmbygd2dbp48vvx1d1z9ks2rm8gg" + "commit": "6ced718d9120878878700592fab430a8542b748f", + "sha256": "1x04wrf3h6f4wsh4n2cl3n4byj9pxni918ri49hqxzm8h8hivigc" } }, { @@ -97778,22 +98823,22 @@ }, { "ename": "vhdl-tools", - "commit": "69fe2f8fb98ac1af1d3185f62ae1c89e646cfebf", - "sha256": "006d9xv60a90xalagczkziiimwsr1np9nn25zvnc4nlbf8j3fbbw", - "fetcher": "github", - "repo": "csantosb/vhdl-tools", + "commit": "b1a3336bff4d677b3bc7fbb8ef230ffc7b78e268", + "sha256": "0xdq9sicwpv3qzy833fqhvi4yllqmqgd4p9lbgq7dn1g8qz2gakn", + "fetcher": "gitlab", + "repo": "emacs-elisp/vhdl-tools", "unstable": { "version": [ - 20200128, - 957 + 20200330, + 1819 ], "deps": [ "ggtags", "helm-rg", "outshine" ], - "commit": "3dbfe8160e22053f0a9bee70ba6f8e1e3967bc46", - "sha256": "1pr7skldslq35ry17yyslfrl2d84msxyh0q77a3djv7ssqlpd270" + "commit": "11645a398a11cdc4b84838294521ecfb229d7856", + "sha256": "00wqvszxsfyxx7pn9w5jn5brw2lx7d577zbc7sc4jz5nlk0csxd4" }, "stable": { "version": [ @@ -97985,8 +99030,8 @@ "adaptive-wrap", "visual-fill-column" ], - "commit": "91fb699ead3f86663e56b48a10adeb5723ca7b84", - "sha256": "0rfrgjflgn0c9xj7f4fwdzyclp2p9fbfir19iwy77z7jnkjk78dv" + "commit": "291f6178a5423f01f2f69d6bc48603d4f605b61a", + "sha256": "15kg23xkcc060y8a5f9657gk3bvkax23myhajaa0b2i1qcd6p43i" } }, { @@ -98360,11 +99405,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20200327, - 1447 + 20200418, + 1610 ], - "commit": "996c535b9cc6aa70c3595413582d97abfab16edd", - "sha256": "0f84376rc9gm54llfln1528p82svczfrz9p48d1vh9pmf5ba09vw" + "commit": "0b04d31e2f0daf45452da2c5e214d2b42cd46a46", + "sha256": "1bdbr1hpzipxk41wx4qyvr2rkk4q4j8qnc09gd51wak7n4w3xz48" } }, { @@ -98375,14 +99420,14 @@ "repo": "jixiuf/vterm-toggle", "unstable": { "version": [ - 20200228, - 628 + 20200402, + 1516 ], "deps": [ "vterm" ], - "commit": "24d68a0ab920875d0834598688128e692fe9a5b2", - "sha256": "0bzxd5xzpajvg7mv7ggplcba7plchhlrl1m14dnx3nrx6q0936cr" + "commit": "15901e1e1eebd957ef18d38c920f944558ebd4fb", + "sha256": "1dcr242i9r7r4mr43qfv5ij254dnhf04gfi71y507zfpdr17zdix" } }, { @@ -98451,8 +99496,8 @@ "repo": "mihaiolteanu/vuiet", "unstable": { "version": [ - 20200326, - 1738 + 20200424, + 1400 ], "deps": [ "bind-key", @@ -98461,8 +99506,23 @@ "s", "versuri" ], - "commit": "c917155a0c72d9fceb9f7c39efcc97320f9e9028", - "sha256": "14djavnczks11lvmldwf0j8nnj4jd0jmz30l6r4hv12f3zjwyk7a" + "commit": "5da06a8acebcaf84a3581610ff24aae1b46f786b", + "sha256": "16yfnqpdzi3bih16d7dzbqmd30m7w8rkjylnsg9m951vc0lysk3p" + }, + "stable": { + "version": [ + 1, + 0 + ], + "deps": [ + "bind-key", + "lastfm", + "mpv", + "s", + "versuri" + ], + "commit": "4e15dacd6445d490fefc47070f8e5b98db5e0dc6", + "sha256": "18qcw9mh57jrd6qrgcma82q28d1dab2dy6v8pi08kadcy4w95y10" } }, { @@ -98513,8 +99573,8 @@ 20200325, 2226 ], - "commit": "cbb15424431cd5f579b12307b8fa03122d525006", - "sha256": "1wwk5q3viw32pwmf4bjhbywkj0d1prwnldgdjfjzmr3rnvfw7w9h" + "commit": "e522a44b151d69d4a176e8809225598ab540fc4d", + "sha256": "1alishzz4j1hbfyfi09rkhffx6gv16yxln7q8jx25shb9rssivyz" } }, { @@ -98636,15 +99696,15 @@ "repo": "abrochard/walkman", "unstable": { "version": [ - 20200319, - 1739 + 20200418, + 1554 ], "deps": [ "org", "transient" ], - "commit": "da90c9dcd501c1bb88c6bde055911c34bf4202a7", - "sha256": "04gzb1v6wva24xbl8r8rr1ys2zmz03ccl0517d3pkgbd9v1wha2f" + "commit": "07a7710084c328dc238626f8b6e7d019380502de", + "sha256": "13g8wgcv3qydx6vhznx1iypmlrzl3cm02prrkqp70gjvgblk06nm" } }, { @@ -98655,11 +99715,11 @@ "repo": "farlado/emacs-wallpaper", "unstable": { "version": [ - 20200321, - 1220 + 20200408, + 1353 ], - "commit": "762354e958dbe298de06d119493d1aee8ffd0112", - "sha256": "1vcpfamawaja9q2n5qqkfn1bn2psi3ymcniw9g66k3whkqsh0kji" + "commit": "9fb5be9c2f7279f7ef2860eefd416359b9026ba3", + "sha256": "18vm8g4iwf2a9l40bg7cvpdziv10mv24x61z86xwjmnqbr7sxd8q" } }, { @@ -98988,11 +100048,11 @@ "repo": "fxbois/web-mode", "unstable": { "version": [ - 20200301, - 1948 + 20200424, + 1153 ], - "commit": "b0bb4ab82ba64b6fa789212f03ad808bdaf77d68", - "sha256": "0v79xm0w8fr342jp27jlkph3av3kbzwdyip6djwykid4j6bcnv2i" + "commit": "6774c596a9b3988989d3bc96b6194e6f0df1d1b6", + "sha256": "1kv06qjcjxy5jw68za5bkmj4kwzc1snlxd7nahcy29rjkiczlh9c" }, "stable": { "version": [ @@ -99081,11 +100141,11 @@ "repo": "eschulte/emacs-web-server", "unstable": { "version": [ - 20200312, - 1154 + 20200330, + 1407 ], - "commit": "b49ba259cc7e490e8acdecd28e66063f5ad1325e", - "sha256": "0b5mhgzbf1xy07g1yl0nb45hr0n18h6zxvw07zvahj2x1px9s6yc" + "commit": "9edf4b5e3c6cea1738acf08241919e00437ec530", + "sha256": "1cf2g67q064pnji0hbg0x5ziqmxwim127sd4q849cifxj7a4rqaw" } }, { @@ -99132,28 +100192,28 @@ "repo": "etu/webpaste.el", "unstable": { "version": [ - 20200227, - 912 + 20200416, + 1007 ], "deps": [ "cl-lib", "request" ], - "commit": "ef33b0f298bf36cfb84b37af4870706fc376b0c3", - "sha256": "0v2yw3jbwlamkycgfmd5abxr764zyzcggyzn2ybzlkffxaxaz6dw" + "commit": "7a3060266459566e450c5cafc00bc90c6508eae5", + "sha256": "064lihjd6bddvlick8md1anhinkc88asvliw0z34c8bckxc3hqpr" }, "stable": { "version": [ 3, - 0, - 2 + 1, + 0 ], "deps": [ "cl-lib", "request" ], - "commit": "1a6c0e967f0340d825df33f4fab339eb904f5f5f", - "sha256": "15b97rszszgcivrsdx7368nxdb8lsag6wvmcvvm977splh9yjpwi" + "commit": "7a3060266459566e450c5cafc00bc90c6508eae5", + "sha256": "064lihjd6bddvlick8md1anhinkc88asvliw0z34c8bckxc3hqpr" } }, { @@ -99164,14 +100224,14 @@ "repo": "ahyatt/emacs-websocket", "unstable": { "version": [ - 20200321, - 102 + 20200419, + 2124 ], "deps": [ "cl-lib" ], - "commit": "31e122a9d7a1ae092e8f970df718fb8256e16574", - "sha256": "1yjdrpn2dwaarmcymf1i8lj72jyvrpp3jqwr3rv59bg8fldin0rs" + "commit": "078f83902c0846c00ed8e3b6c5add7ff9b98d8f9", + "sha256": "11nacz0vvhaa8582r0ylx5w886y2qysbvrh9s064g979vjyfh9rg" }, "stable": { "version": [ @@ -99609,11 +100669,11 @@ "repo": "lassik/emacs-whois", "unstable": { "version": [ - 20200326, - 1909 + 20200409, + 1538 ], - "commit": "2186a52db77badd809c99d5c21502878298d78f6", - "sha256": "1dnr7navhjzca2hapwx41xdx4i5fgjyjnw2ms5na6n572xp8kgnj" + "commit": "907abd9538c4a1e088853b816af883e5040fc430", + "sha256": "1qfkppciijyyg76idqqzjy351rki8y4pffwicprnrhv1qixfhdvv" }, "stable": { "version": [ @@ -99703,8 +100763,8 @@ "makey", "s" ], - "commit": "0379c80a0c2df77cd18e95741caf6fc8acd90a41", - "sha256": "1lkmr9024x8nv9chl21qp9dnl64qlp0lrfy592pzidpr3997xkjf" + "commit": "79098cd4cdfa144807cb710af4589c13a7033842", + "sha256": "04gfhjpn4q8d4y6177gdffwjbqq627083pff2ckw79pbvlj9f2mm" } }, { @@ -99944,6 +101004,21 @@ "sha256": "1dpy8hkjn87wbdkzyabhay4jx4dgc0ab2flyf0rjq1qaazk393sc" } }, + { + "ename": "winds", + "commit": "43a07dc1e9af8f832330131764147907826e06e5", + "sha256": "1a5kw44pyilgaydyp87his41b2hw0xijp6sggl7bd60jwgspa0wy", + "fetcher": "github", + "repo": "Javyre/winds.el", + "unstable": { + "version": [ + 20200425, + 1643 + ], + "commit": "a998e9397836f441d51f3c8d001dd407258a0ff5", + "sha256": "1qgkm1fl21r56gbsvwmld8mdf970zwjsj68qdpsa9m0j4kbw9m9c" + } + }, { "ename": "windsize", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -100203,14 +101278,26 @@ "repo": "p3r7/with-shell-interpreter", "unstable": { "version": [ - 20200319, - 1351 + 20200419, + 850 ], "deps": [ "cl-lib" ], - "commit": "e806b1e5537ba2f23b507a3cc28aa7c3cacd2315", - "sha256": "1qklc135ydslcxjhlgbmagib3j184gm72paky6glzdjh2yf8mm50" + "commit": "ffd9c6a3a058fe072458f90e117590988042c662", + "sha256": "194k0j6mg8dh5z5ia204glicbmy2laxyny7snbvf7b6xd9ajmj3w" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "cl-lib" + ], + "commit": "92549f9f80067ce32248ad2c05649673d2084fcf", + "sha256": "1dip0d5llr6sjisww283051s21ir8d5nzjdh22k3fjnz68mqq63s" } }, { @@ -100635,14 +101722,14 @@ "repo": "joostkremers/writeroom-mode", "unstable": { "version": [ - 20200303, - 2331 + 20200409, + 1927 ], "deps": [ "visual-fill-column" ], - "commit": "20c761b80031f2b44b9d9fb476e044e477359016", - "sha256": "1kx2xhvi579vhajvgl4spf9jd597fqa2bjh16yqfx2nikissvkhy" + "commit": "9b6e55fe49ab7760a826179df4f1c3b6c9a759df", + "sha256": "0kf88big78lnc2gxn00sykwi1ky4hacr7al2ihgwpznq9vbrj3p1" }, "stable": { "version": [ @@ -100741,20 +101828,20 @@ "repo": "redguardtoo/wucuo", "unstable": { "version": [ - 20200116, - 1447 + 20200421, + 441 ], - "commit": "92e562077cc21dbe285ad2fa7b171c8aae7b556f", - "sha256": "0wbmprg7nbwwpxffknkrg662v0dzdvlipz9f104bhaxvfcmy36ij" + "commit": "2b7632813fdbbfe5abddf7ce425dea607c9946cc", + "sha256": "1h3d7qqajwl9zm5j77y5s3s9sq0hpdakbapsd34xg2x87v0p1320" }, "stable": { "version": [ 0, - 0, - 7 + 1, + 0 ], - "commit": "92e562077cc21dbe285ad2fa7b171c8aae7b556f", - "sha256": "0wbmprg7nbwwpxffknkrg662v0dzdvlipz9f104bhaxvfcmy36ij" + "commit": "2b7632813fdbbfe5abddf7ce425dea607c9946cc", + "sha256": "1h3d7qqajwl9zm5j77y5s3s9sq0hpdakbapsd34xg2x87v0p1320" } }, { @@ -100910,11 +101997,11 @@ "repo": "xahlee/xah-fly-keys", "unstable": { "version": [ - 20200330, - 557 + 20200424, + 2358 ], - "commit": "d75567f7f6b85830b97b18ab1b5d8e70acaa05bf", - "sha256": "1lmca03y7h584agid7fr5g2w3s9psk55n0qlrcfgg10d67nq6l75" + "commit": "b0d87ab312a51ab8484deb8994e4effb3112d516", + "sha256": "1ivlcxm423syd35njrpnswdra3f30fqsfr6qdffiy6vajy0ykda7" } }, { @@ -100940,11 +102027,11 @@ "repo": "xahlee/lookup-word-on-internet", "unstable": { "version": [ - 20200225, - 31 + 20200420, + 1528 ], - "commit": "5ddd01520ca49d459f67567901fc08c84aa553bd", - "sha256": "07fx4vypgim39rw022v5m7gfp68095s393j8s28k2j038jqgzdp5" + "commit": "c97a43dc0cebbfc519d0cce5b547dcc5e22b2085", + "sha256": "1qkazkisgw5c9xzxqm6xzm124r1v4d4dcyazvw66nz5j2zl1i5qd" } }, { @@ -101393,14 +102480,11 @@ "repo": "atomontage/xterm-color", "unstable": { "version": [ - 20200103, - 1327 - ], - "deps": [ - "cl-lib" + 20200424, + 2025 ], - "commit": "4b21b619841c93c4700039a93eb1881beee9248c", - "sha256": "1v4i74xdp26k9r1nvbdz625l62acvfb2kkp1nvld05p6xkh0q68z" + "commit": "c389016e029c279c81fe4c0e1d757949b5ef36c0", + "sha256": "16lpjbb49f465h36x22ch84133d0ihbqpfhjh46sncpj22ddj8pl" }, "stable": { "version": [ @@ -101478,6 +102562,57 @@ "sha256": "04j4xwcdxlnrwxs89605zmwxszbi2j0z67v80651pshgnhj5p19i" } }, + { + "ename": "xwwp", + "commit": "83c34ae5023410cc31f93255275d6465b6152a10", + "sha256": "07r62haa1ks2xvfh4zkqadpsjdhk6kbafk1fmvcim3m13ma6gch1", + "fetcher": "github", + "repo": "canatella/xwwp", + "unstable": { + "version": [ + 20200413, + 757 + ], + "commit": "dcf6f9430dd9745e5f2705c0f42e013fab961c0e", + "sha256": "1aks12zbfcq4m4s1baxcdg2xjn2y9f4dw19576yp35hg2cb550v6" + } + }, + { + "ename": "xwwp-follow-link-helm", + "commit": "83c34ae5023410cc31f93255275d6465b6152a10", + "sha256": "0dcbhc4zy4n03fi6pz3k9hlnpk7ys6xx1v6c4rwcjzy5ly80alwq", + "fetcher": "github", + "repo": "canatella/xwwp", + "unstable": { + "version": [ + 20200331, + 800 + ], + "deps": [ + "xwwp" + ], + "commit": "dcf6f9430dd9745e5f2705c0f42e013fab961c0e", + "sha256": "1aks12zbfcq4m4s1baxcdg2xjn2y9f4dw19576yp35hg2cb550v6" + } + }, + { + "ename": "xwwp-follow-link-ivy", + "commit": "83c34ae5023410cc31f93255275d6465b6152a10", + "sha256": "0i5wqj4170iqznghy02dc2g5l5cs76hjhk88dcwwpbss1mabj8ig", + "fetcher": "github", + "repo": "canatella/xwwp", + "unstable": { + "version": [ + 20200331, + 800 + ], + "deps": [ + "xwwp" + ], + "commit": "dcf6f9430dd9745e5f2705c0f42e013fab961c0e", + "sha256": "1aks12zbfcq4m4s1baxcdg2xjn2y9f4dw19576yp35hg2cb550v6" + } + }, { "ename": "yabin", "commit": "cc44b28e32ff9b35f60744a175c2d1e3036db8bc", @@ -101558,8 +102693,8 @@ 20171022, 1412 ], - "commit": "ecb66f0b77aac0123e5b3336ee1910fa07fa44f9", - "sha256": "1cvsp6x94b223g21avr2z255s5xwdwmdxnhwzq8qj2c3qrax6sx9" + "commit": "e844b662819344eb726f67e525f377b9ee808b24", + "sha256": "0d8c70bip8wxpnjqhqf33kq4q2lb2qdk9w2a4bp2v707fpr4pv73" } }, { @@ -101696,11 +102831,11 @@ "repo": "Kungsgeten/yankpad", "unstable": { "version": [ - 20200108, - 1811 + 20200409, + 1747 ], - "commit": "dd97994a8bff58e4d98aa6cb90aa08c5ddde5c82", - "sha256": "114qnr8s5v2dr3v3jvy4aagyi1wbn3fw27mrb6zdg6faxvfpd8sk" + "commit": "acfccf3633d7fd3b91d717fda4ae98e8e3345a06", + "sha256": "0xprfvgfcjdl20j1hxjk3f4gy7m3v0x9p0vyl2ygxmjj7ibgi7kw" }, "stable": { "version": [ @@ -101719,11 +102854,11 @@ "repo": "JorisE/yapfify", "unstable": { "version": [ - 20200326, - 917 + 20200406, + 830 ], - "commit": "2e5d344b6d9cf1965a1153b160b3a52582d492ff", - "sha256": "1pi1dgcqz1xn5r4z5pjxbyx4kq75cxzl3711zzp0dyn48w0a7sj3" + "commit": "3df4e8ce65f55fd69479b3417525ce83a2b00b45", + "sha256": "13q84a4q5bv56r9dhi84jqbkx7dc1bvi42s01ahh8vmdvg4h39d3" }, "stable": { "version": [ @@ -101849,14 +102984,14 @@ "repo": "joaotavora/yasnippet", "unstable": { "version": [ - 20200329, - 1434 + 20200413, + 2221 ], "deps": [ "cl-lib" ], - "commit": "7c02bc142c3b157699ab8c4f24ff98da94401248", - "sha256": "1yjqlb9jdbsmmywgg49wd25psbf9637hzgnx5i1q3diaravlnji6" + "commit": "5b1217ab085fab4abeb1118dccb260691b446703", + "sha256": "0486kd8brxwmbmw9bjf0p9i99dyl17hbc5aa03z7psqqlsw713mx" }, "stable": { "version": [ @@ -101897,25 +103032,25 @@ "repo": "AndreaCrotti/yasnippet-snippets", "unstable": { "version": [ - 20200314, - 1030 + 20200425, + 1210 ], "deps": [ "yasnippet" ], - "commit": "d9a9ec282c6eb1156b06dd1362e018404221087d", - "sha256": "0kvpp1w02mr713lz9jnq0xwbl14f879g7f1icns3n6ilf8kgb104" + "commit": "937cb7bb1921db38ab2c0c62062e8e32a29eabed", + "sha256": "03v855gbr6ii21qw4h8whbzj88xi28sqpnz1yqd1a7ngrc149fgz" }, "stable": { "version": [ 0, - 20 + 22 ], "deps": [ "yasnippet" ], - "commit": "e813c1479a9fb2773d95ddba39c4aa0e7a1c33c5", - "sha256": "095w7cdmfwmmr6426mbq15n0a5izgbmv9408m9yh1pqz5x3v3vsx" + "commit": "e51a259527d685fe767b6ec951ad1940b1131a69", + "sha256": "1xcmx0frialb86z5adi07b6skqks326w3v1xn49c54gxim027i5d" } }, { @@ -102169,11 +103304,11 @@ "repo": "ryuslash/yoshi-theme", "unstable": { "version": [ - 20200307, - 704 + 20200422, + 208 ], - "commit": "25bde9dc4ca380941b6539757371aef91ca35968", - "sha256": "0p3qrp0wrqissbvz8bnpbrj67c2697mq1pni9c247fiijbcnl48j" + "commit": "caa83e4475885a2c9a126630f0feec1ce2eb0c4e", + "sha256": "0sga52lz54c2v08j6m9v3ddv7rlpdcgi9lkxn1cvajm5h60b20r8" }, "stable": { "version": [ @@ -102388,28 +103523,28 @@ "repo": "zephir-lang/zephir-mode", "unstable": { "version": [ - 20200329, - 1235 + 20200417, + 830 ], "deps": [ "cl-lib", "pkg-info" ], - "commit": "3e112ba7c52b5caad0c230e014b6e842d6379ab1", - "sha256": "1h6lhz7fvx6c2zwgjwm5aiax5f22v65dmq3rj0s51vpasyj2k9ib" + "commit": "4e9618b77dff67c1c7b6fff78605a62311db88b8", + "sha256": "0chh35h479jm0zcjxqyd9v1gzs2adicvyihdls87g8minmwvl19r" }, "stable": { "version": [ 0, - 5, + 6, 0 ], "deps": [ "cl-lib", "pkg-info" ], - "commit": "76c310faf792db93bc6750305f5b54aa6a4963bd", - "sha256": "1najsypq8qix6jgxqqj5kkfdp7b10l3xz25qw0y5lzz4by4pzzpa" + "commit": "9adc5cf07a9117d25eaab41867ddde914c6d2f5a", + "sha256": "0g2vfscikz8qa0danvcickcjnz99yjm9jgk3sci094gmgwka3j2y" } }, { @@ -102420,26 +103555,26 @@ "url": "https://gitlab.emacsos.com/sylecn/zero-el", "unstable": { "version": [ - 20200220, - 1619 + 20200405, + 1220 ], "deps": [ "s" ], - "commit": "3e6e45482c223d3a9610fb366e9cc3aab98a7aab", - "sha256": "1qqk419f4y59vadpqf4my75pzgap9maylfbmaw7k2sqwajy2mxnl" + "commit": "729da9f4b99acb744ee6974ed7f3d4e252fd19da", + "sha256": "1bcka4gzcb5r2y5g7a06l05n6ixvs7lm37w4ghvvq12ci2ypzp04" }, "stable": { "version": [ 2, - 6, + 8, 0 ], "deps": [ "s" ], - "commit": "3e6e45482c223d3a9610fb366e9cc3aab98a7aab", - "sha256": "1qqk419f4y59vadpqf4my75pzgap9maylfbmaw7k2sqwajy2mxnl" + "commit": "729da9f4b99acb744ee6974ed7f3d4e252fd19da", + "sha256": "1bcka4gzcb5r2y5g7a06l05n6ixvs7lm37w4ghvvq12ci2ypzp04" } }, { @@ -102479,14 +103614,25 @@ "repo": "efls/zetteldeft", "unstable": { "version": [ - 20200329, - 1506 + 20200415, + 1614 + ], + "deps": [ + "deft" + ], + "commit": "cba7554afe740f64adcdc615b5f4ab0e1e47c6a1", + "sha256": "1b1bqz02xh19syyv9w64q9msay84kpq3kkmpdqy8i7mvhsd4cdry" + }, + "stable": { + "version": [ + 0, + 3 ], "deps": [ "deft" ], - "commit": "1dd8b052bb4bc8fcd18740e798057ace97cb63ac", - "sha256": "16bkcp6mq98bn1qli2qi6wgf5zrkxfqs912fi9fg88bcixk50k9j" + "commit": "271ea573b0a4f265d16108db2ec7c928f3e9aa31", + "sha256": "0y709x03har1sm30vbja3k3vw4p1nfck5zii7cigl4vg0scpcri6" } }, { @@ -102907,22 +104053,22 @@ }, { "ename": "zpresent", - "commit": "3aae38ad54490fa650c832fb7d22e2c73b0fb060", - "sha256": "0316qyspmdbg94aw620133ilh8kfpr3db1p2cifgccgcacjv3v5j", - "fetcher": "bitbucket", - "repo": "zck/zpresent.el", + "commit": "d3828ad7599d13728b5571b882344c3ada434b85", + "sha256": "0i1qrb9qplmx9kx1286xypjyy48r9y3cvnlhi06r583adfr02wab", + "fetcher": "hg", + "url": "https://hg.sr.ht/~zck/zpresent", "unstable": { "version": [ - 20180605, - 438 + 20200417, + 309 ], "deps": [ "dash", "org-parser", "request" ], - "commit": "55fc14b66e2ea506247a4e7dd622a9dfe5545c4b", - "sha256": "17wkhl1a7jmg4ks011lf5h4f2vbhf8dl6vgzdzlmljk15f9hmw35" + "commit": "406967322b7692492a5942d901335d626cace4d0", + "sha256": "1nn6dvzcayh6nv6xn3siv09iixc5c3gy9c8y1fdwzq81yny9l2fr" } }, { -- cgit v1.2.3 From 35b81933528b627f4f7ee677ca535335f9714d2a Mon Sep 17 00:00:00 2001 From: Sebastien Bariteau Date: Sat, 4 Apr 2020 20:23:06 -0400 Subject: maintainers: add numkem --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b2187c8fb8f..1bd0ebffdba 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5608,6 +5608,12 @@ githubId = 369111; name = "Morgan Jones"; }; + numkem = { + name = "Sebastien Bariteau"; + email = "numkem@numkem.org"; + github = "numkem"; + githubId = 332423; + }; nyanloutre = { email = "paul@nyanlout.re"; github = "nyanloutre"; -- cgit v1.2.3 From a5e6e5c170e19dc4e674f8f46f237c9eb18450f4 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Sun, 26 Apr 2020 21:25:42 +0200 Subject: libmpack: fix source url Repository was moved to an organization. --- pkgs/development/libraries/libmpack/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libmpack/default.nix b/pkgs/development/libraries/libmpack/default.nix index cdc45956e7a..736474d29a5 100644 --- a/pkgs/development/libraries/libmpack/default.nix +++ b/pkgs/development/libraries/libmpack/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "libmpack"; version = "1.0.5"; src = fetchFromGitHub { - owner = "tarruda"; + owner = "libmpack"; repo = "libmpack"; rev = version; sha256 = "0rai5djdkjz7bsn025k5489in7r1amagw1pib0z4qns6b52kiar2"; -- cgit v1.2.3 From a7971df962fd026843f1707c237294341920757e Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Tue, 21 Apr 2020 06:01:08 +0200 Subject: perlPackages.GitAutofixup: init at 0.002007 --- pkgs/top-level/perl-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b3597404edd..2f933eeff1f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -7878,6 +7878,20 @@ let }; }; + GitAutofixup = buildPerlPackage rec { + pname = "GitAutofixup"; + version = "0.002007"; + src = fetchurl { + url = "mirror://cpan/authors/id/T/TO/TORBIAK/App-Git-Autofixup-${version}.tar.gz"; + sha256 = "1ydy15pibva0qr5vrv5mqyzw3zlc3wbszzv7932vh7m88vv6gfr6"; + }; + meta = { + maintainers = [ maintainers.DamienCassou ]; + description = "Create fixup commits for topic branches"; + license = stdenv.lib.licenses.artistic2; + }; + }; + GitPurePerl = buildPerlPackage { pname = "Git-PurePerl"; version = "0.53"; -- cgit v1.2.3 From 9a3d12e2aba4432b53d8ce40bdd8e1cf4d2c6e22 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Sun, 26 Apr 2020 21:28:40 +0200 Subject: luaPackages.mpack: use system mpack the luarocks package uses the builtin command and discards the Makefile. While using the makefile one needs to set some more flags. --- pkgs/development/lua-modules/overrides.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index cb429e59c92..84a15e8a674 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -294,6 +294,12 @@ with super; }; }); + mpack = super.mpack.override({ + buildInputs = [ pkgs.libmpack ]; + # the rockspec doesn't use the makefile so you may need to export more flags + USE_SYSTEM_LUA = "yes"; + USE_SYSTEM_MPACK = "yes"; + }); rapidjson = super.rapidjson.override({ preBuild = '' -- cgit v1.2.3 From 361684e97be1e7df659d67662f8cf044b7487a09 Mon Sep 17 00:00:00 2001 From: Kimat Boven Date: Sun, 26 Apr 2020 21:49:29 +0200 Subject: tmux: 3.0a -> 3.1 --- pkgs/tools/misc/tmux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 1aa221bd59e..c8b7dadf44d 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { pname = "tmux"; - version = "3.0a"; + version = "3.1"; outputs = [ "out" "man" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "tmux"; repo = "tmux"; rev = version; - sha256 = "0y9lv1yr0x50v3k70vzkc8hfr7yijlsi30p7dr7i8akp3lwmmc7h"; + sha256 = "1jgxal6jzzannh7hb3617r6g5p9yczl6a78m4kjnf3cxxm4jdaxz"; }; nativeBuildInputs = [ -- cgit v1.2.3 From b987b25c7cdb7c48c3a186cb46396b1d79f693e3 Mon Sep 17 00:00:00 2001 From: Sebastien Bariteau Date: Sun, 26 Apr 2020 16:00:05 -0400 Subject: hashi-ui: init at 1.3.8 --- pkgs/servers/hashi-ui/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/servers/hashi-ui/default.nix diff --git a/pkgs/servers/hashi-ui/default.nix b/pkgs/servers/hashi-ui/default.nix new file mode 100644 index 00000000000..019a8dca3b6 --- /dev/null +++ b/pkgs/servers/hashi-ui/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "hashi-ui"; + version = "1.3.8"; + + src = fetchurl { + url = "https://github.com/jippi/hashi-ui/releases/download/v${version}/hashi-ui-linux-amd64"; + sha256 = "999a34b6e99657ffc7e6c98a15b8ea744c28420e891a8802c7d99b737752dfb6"; + }; + + dontUnpack = true; + sourceRoot = "."; + + installPhase = '' + install -m755 -D $src $out/bin/hashi-ui + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/jippi/hashi-ui"; + description = "A modern user interface for hashicorp Consul & Nomad"; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ numkem ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3316b446b9a..775de256229 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15558,6 +15558,8 @@ in haka = callPackage ../tools/security/haka { }; + hashi-ui = callPackage ../servers/hashi-ui {}; + heapster = callPackage ../servers/monitoring/heapster { }; hbase = callPackage ../servers/hbase {}; -- cgit v1.2.3 From 3c00ca03a251693e58eb4e3c247ee1f640215783 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 26 Apr 2020 16:31:49 -0400 Subject: meson: Don't set CC and CXX I've since convinced upstream to not use such vars for the build platform during cross. Finally! --- pkgs/development/tools/build-managers/meson/default.nix | 2 -- pkgs/development/tools/build-managers/meson/setup-hook.sh | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 15b0a5ffcd0..977ffe837ec 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -90,8 +90,6 @@ python3Packages.buildPythonApplication rec { # checkInputs = [ ninja pkgconfig ]; # checkPhase = "python ./run_project_tests.py"; - inherit (stdenv) cc; - isCross = stdenv.targetPlatform != stdenv.hostPlatform; meta = with lib; { diff --git a/pkgs/development/tools/build-managers/meson/setup-hook.sh b/pkgs/development/tools/build-managers/meson/setup-hook.sh index 8d76ecdaf32..aef18e65ea1 100644 --- a/pkgs/development/tools/build-managers/meson/setup-hook.sh +++ b/pkgs/development/tools/build-managers/meson/setup-hook.sh @@ -25,7 +25,7 @@ mesonConfigurePhase() { echo "meson flags: $mesonFlags ${mesonFlagsArray[@]}" - CC=@cc@/bin/cc CXX=@cc@/bin/c++ meson build $mesonFlags "${mesonFlagsArray[@]}" + meson build $mesonFlags "${mesonFlagsArray[@]}" cd build if ! [[ -v enableParallelBuilding ]]; then -- cgit v1.2.3 From 8ce6552d6470b79df7aacdbd9f6faa307e24da86 Mon Sep 17 00:00:00 2001 From: Alex Branham Date: Sat, 25 Apr 2020 09:39:43 -0400 Subject: R: 3.6.3 -> 4.0.0 --- .../R/0001-Disable-test-pending-upstream-fix.patch | 26 ---------------------- pkgs/applications/science/math/R/default.nix | 15 +++++-------- .../science/math/R/fix-failing-test.patch | 25 +++++++++++++++++++++ 3 files changed, 31 insertions(+), 35 deletions(-) delete mode 100644 pkgs/applications/science/math/R/0001-Disable-test-pending-upstream-fix.patch create mode 100644 pkgs/applications/science/math/R/fix-failing-test.patch diff --git a/pkgs/applications/science/math/R/0001-Disable-test-pending-upstream-fix.patch b/pkgs/applications/science/math/R/0001-Disable-test-pending-upstream-fix.patch deleted file mode 100644 index 7bf32df0b7a..00000000000 --- a/pkgs/applications/science/math/R/0001-Disable-test-pending-upstream-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 85ede2cf452800710de136f4f864921d3bb9773c Mon Sep 17 00:00:00 2001 -From: Tom Hall -Date: Fri, 21 Feb 2020 22:56:06 +0000 -Subject: [PATCH] Disable test pending upstream fix - -See https://bugs.r-project.org/bugzilla/show_bug.cgi?id=17718 ---- - tests/reg-tests-1d.R | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/reg-tests-1d.R b/tests/reg-tests-1d.R -index 9b551a1fc8..18ce6027ed 100644 ---- a/tests/reg-tests-1d.R -+++ b/tests/reg-tests-1d.R -@@ -3079,7 +3079,7 @@ stopifnot(exprs = { - x[1:52] %% 3 == 2:1 - -x[1:52] %% 3 == 1:2 - }) # larger x suffer from cancellation (well, warning too early now): --tools::assertWarning(x[60:68] %% 3) -+#tools::assertWarning(x[60:68] %% 3) - - - ## Hilmar Berger's on R-devel list: 'data.frame() == NULL' etc --- -2.24.1 - diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 617a1826537..52da3b4a1ac 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, bzip2, gfortran, libX11, libXmu, libXt, libjpeg, libpng -, libtiff, ncurses, pango, pcre, perl, readline, tcl, texLive, tk, xz, zlib +, libtiff, ncurses, pango, pcre2, perl, readline, tcl, texLive, tk, xz, zlib , less, texinfo, graphviz, icu, pkgconfig, bison, imake, which, jdk, blas, lapack , curl, Cocoa, Foundation, libobjc, libcxx, tzdata, fetchpatch , withRecommendedPackages ? true @@ -12,27 +12,24 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { - name = "R-3.6.3"; + name = "R-4.0.0"; src = fetchurl { - url = "https://cran.r-project.org/src/base/R-3/${name}.tar.gz"; - sha256 = "13xaxwfbzj0bd6rn2n27z0n04lb93mcyq991w4vdbbg8v282jc49"; + url = "https://cran.r-project.org/src/base/R-4/${name}.tar.gz"; + sha256 = "0h1995smlyiyhx7gpg9paxsfqrcn6g9bbp5h9r47i6an3clv1gh6"; }; dontUseImakeConfigure = true; buildInputs = [ bzip2 gfortran libX11 libXmu libXt libXt libjpeg libpng libtiff ncurses - pango pcre perl readline texLive xz zlib less texinfo graphviz icu + pango pcre2 perl readline texLive xz zlib less texinfo graphviz icu pkgconfig bison imake which blas lapack curl tcl tk jdk ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa Foundation libobjc libcxx ]; patches = [ ./no-usr-local-search-paths.patch - ] ++ stdenv.lib.optionals stdenv.hostPlatform.isAarch64 [ - # Remove a test which fails on aarch64. - # See https://bugs.r-project.org/bugzilla/show_bug.cgi?id=17718 - ./0001-Disable-test-pending-upstream-fix.patch + ./fix-failing-test.patch ]; prePatch = stdenv.lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/applications/science/math/R/fix-failing-test.patch b/pkgs/applications/science/math/R/fix-failing-test.patch new file mode 100644 index 00000000000..5fb3b3b9c31 --- /dev/null +++ b/pkgs/applications/science/math/R/fix-failing-test.patch @@ -0,0 +1,25 @@ +From e8f54bc562eb301d204b5f880614be58a2b39a2b Mon Sep 17 00:00:00 2001 +From: maechler +Date: Mon, 30 Mar 2020 19:15:59 +0000 +Subject: [PATCH] no longer fail in norm() check for broken OpenBLAS Lapack + 3.9.0 + +git-svn-id: https://svn.r-project.org/R/trunk@78112 00db46b3-68df-0310-9c12-caf00c1e9a41 +--- + tests/reg-tests-1d.R | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tests/reg-tests-1d.R b/tests/reg-tests-1d.R +index 6b7de765a95..fafd6911e7a 100644 +--- a/tests/reg-tests-1d.R ++++ b/tests/reg-tests-1d.R +@@ -3836,7 +3836,8 @@ stopifnot(is.na( norm(diag(c(1, NA)), "2") )) + ## norm(, "F") + (m <- cbind(0, c(NA, 0), 0:-1)) + nTypes <- eval(formals(base::norm)$type) # "O" "I" "F" "M" "2" +-stopifnot(is.na( print(vapply(nTypes, norm, 0., x = m)) )) # print(): show NA *or* NaN ++print( # stopifnot( -- for now, as Lapack is still broken in some OpenBLAS -- FIXME ++ is.na( print(vapply(nTypes, norm, 0., x = m)) )) # print(): show NA *or* NaN + ## "F" gave non-NA with LAPACK 3.9.0, before our patch in R-devel and R-patched + + -- cgit v1.2.3 From cb1a13ad98779cfaac8b7d25857d8945c8233c22 Mon Sep 17 00:00:00 2001 From: Alex Branham Date: Sun, 26 Apr 2020 17:16:34 -0400 Subject: R: Update CRAN and bioconductor packages --- pkgs/development/r-modules/bioc-packages.nix | 8 +- pkgs/development/r-modules/cran-packages.nix | 1419 +++++++++++++------------- pkgs/development/r-modules/default.nix | 2 - 3 files changed, 722 insertions(+), 707 deletions(-) diff --git a/pkgs/development/r-modules/bioc-packages.nix b/pkgs/development/r-modules/bioc-packages.nix index c02ea4dda4a..aa5e23c40c4 100644 --- a/pkgs/development/r-modules/bioc-packages.nix +++ b/pkgs/development/r-modules/bioc-packages.nix @@ -197,7 +197,7 @@ in with self; { CrispRVariants = derive2 { name="CrispRVariants"; version="1.10.1"; sha256="0n1mw3ybbdaybbcms12cj4vy21wahq5srny0qnbxjlzyl1zjbpr0"; depends=[AnnotationDbi BiocParallel Biostrings GenomeInfoDb GenomicAlignments GenomicRanges ggplot2 gridExtra IRanges reshape2 Rsamtools S4Vectors]; }; CytoDx = derive2 { name="CytoDx"; version="1.2.1"; sha256="05apvaf4dmkdfsp2aary14i7znjyzk0k6rqcbsk6m98fkp3d9r8b"; depends=[doParallel dplyr flowCore glmnet rpart rpart_plot]; }; CytoML = derive2 { name="CytoML"; version="1.8.1"; sha256="18isg4kjdn975q8vpziisnyxj1jxm4lkq7hi9jy4imf7bffc234i"; depends=[base64enc Biobase data_table flowCore flowUtils flowWorkspace ggcyto graph jsonlite ncdfFlow openCyto plyr RBGL Rgraphviz XML]; }; - DAPAR = derive2 { name="DAPAR"; version="1.14.5"; sha256="0s09y5kpivaichzmfchksaayxchdmqgldcba0waxfxzsapwfb9p1"; depends=[AnnotationDbi Cairo clusterProfiler cp4p DAPARdata doParallel dplyr factoextra FactoMineR foreach ggplot2 gplots graph highcharter impute knitr lattice limma lme4 Matrix MSnbase norm openxlsx pcaMethods png preprocessCore RColorBrewer readxl reshape2 scales siggenes stringr tidyr tidyverse tmvtnorm vioplot vsn]; }; + DAPAR = derive2 { name="DAPAR"; version="1.14.5"; sha256="0s09y5kpivaichzmfchksaayxchdmqgldcba0waxfxzsapwfb9p1"; depends=[AnnotationDbi Cairo clusterProfiler cp4p DAPARdata doParallel dplyr factoextra FactoMineR foreach ggplot2 gplots graph highcharter imp4p impute knitr lattice limma lme4 Matrix MSnbase norm openxlsx pcaMethods png preprocessCore RColorBrewer readxl reshape2 scales siggenes stringr tidyr tidyverse tmvtnorm vioplot vsn]; }; DART = derive2 { name="DART"; version="1.30.0"; sha256="0dxwy95p43c0shx30y95sj1pl64kqkh2bsnj680q196zgyg937s6"; depends=[igraph]; }; DBChIP = derive2 { name="DBChIP"; version="1.26.0"; sha256="1wk8nvfcfhsymhbi6id0kd1jzcykh6hhikl2040g0v6gi252gv2v"; depends=[DESeq edgeR]; }; DChIPRep = derive2 { name="DChIPRep"; version="1.12.0"; sha256="1avcjr7r54grh3yn5pjbzji3syc8vvah9as7asv3cwmyqzaya4r0"; depends=[assertthat ChIPpeakAnno DESeq2 fdrtool GenomicRanges ggplot2 plyr purrr reshape2 S4Vectors smoothmest soGGi SummarizedExperiment tidyr]; }; @@ -491,8 +491,8 @@ in with self; { MSnID = derive2 { name="MSnID"; version="1.16.1"; sha256="077n6ljcnnl7q4w0qj8v46vm4sjk9vzzfqf7wsc6lz0wmyzqdng3"; depends=[Biobase data_table doParallel dplyr foreach iterators MSnbase mzID mzR ProtGenerics R_cache Rcpp reshape2]; }; MSnbase = derive2 { name="MSnbase"; version="2.8.3"; sha256="1kl1d7byphnfpmbl5fzbgs68dxskhpsdyx7ka51bpfn0nv3pp492"; depends=[affy Biobase BiocGenerics BiocParallel digest ggplot2 impute IRanges lattice MALDIquant MASS mzID mzR pcaMethods plyr preprocessCore ProtGenerics Rcpp S4Vectors scales vsn XML]; }; MSstats = derive2 { name="MSstats"; version="3.14.1"; sha256="1bgvdq1mfq6rxjf5ag2slrhy4056906wghsirrymf53nw3qz5g6s"; depends=[data_table doSNOW dplyr foreach ggplot2 ggrepel gplots limma lme4 marray MASS minpack_lm preprocessCore randomForest reshape2 snow stringr survival tidyr]; }; - MSstatsQC = derive2 { name="MSstatsQC"; version="2.0.1"; sha256="1f6gv1fqm5h6xs91wc1bamyri47qggb872qzriwzvff7ydn0q1ag"; depends=[dplyr ggExtra ggplot2 MSnbase plotly qcmetrics]; }; - MSstatsQCgui = derive2 { name="MSstatsQCgui"; version="1.2.1"; sha256="1k7dhiayf885ax1mg03yg1w4mamk3j1gsm7phszxl3i0j3c2gks7"; depends=[dplyr ggExtra gridExtra MSstatsQC plotly shiny]; }; + MSstatsQC = derive2 { name="MSstatsQC"; version="2.0.1"; sha256="1f6gv1fqm5h6xs91wc1bamyri47qggb872qzriwzvff7ydn0q1ag"; depends=[dplyr ggExtra ggplot2 MSnbase plotly qcmetrics RecordLinkage]; }; + MSstatsQCgui = derive2 { name="MSstatsQCgui"; version="1.2.1"; sha256="1k7dhiayf885ax1mg03yg1w4mamk3j1gsm7phszxl3i0j3c2gks7"; depends=[dplyr ggExtra gridExtra MSstatsQC plotly RecordLinkage shiny]; }; MSstatsTMT = derive2 { name="MSstatsTMT"; version="1.1.2"; sha256="0aaw3qillcfrjczdmd7s21v551hclnq8fn2zvn91wyr4i82q43rr"; depends=[data_table dplyr ggplot2 limma lme4 matrixStats MSstats nlme reshape2 tidyr]; }; MTseeker = derive2 { name="MTseeker"; version="1.0.6"; sha256="0fsb7k6pkl15q8csygpsjrz4jvy20mfd5rfmhl7q7ffj4d7sprxh"; depends=[Biobase BiocGenerics Biostrings circlize GenomeInfoDb GenomicAlignments GenomicFeatures GenomicRanges gmapR Homo_sapiens IRanges jsonlite Rsamtools rtracklayer S4Vectors SummarizedExperiment VariantAnnotation VariantTools viridis xml2]; }; MVCClass = derive2 { name="MVCClass"; version="1.56.0"; sha256="1hw36gd1z19dir6fl7j3dzqzi5p1668zbwpcz7l21hbyycv27l0j"; depends=[]; }; @@ -670,7 +670,7 @@ in with self; { 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.4"; sha256="1zvbin60p81qyk2c0m88dl94ivzyf4cpjdf2hnw8igmvlxszmb8k"; 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]; }; diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix index ae6197761d3..21e36b509cf 100644 --- a/pkgs/development/r-modules/cran-packages.nix +++ b/pkgs/development/r-modules/cran-packages.nix @@ -4,7 +4,7 @@ # Rscript generate-r-packages.R cran >new && mv new cran-packages.nix { self, derive }: -let derive2 = derive { snapshot = "2020-04-07"; }; +let derive2 = derive { snapshot = "2020-04-25"; }; in with self; { A3 = derive2 { name="A3"; version="1.0.0"; sha256="017hq9pjsv1h9i7cqk5cfx27as54shlhdsdvr6jkhb8jfkpdb6cw"; depends=[pbapply xtable]; }; ABACUS = derive2 { name="ABACUS"; version="1.0.0"; sha256="0m1dnkwjr1522l9ddbzzx7ayxvli17sbmk6s28adpmzzjwh2kd1i"; depends=[ggplot2 shiny]; }; @@ -27,7 +27,7 @@ in with self; { ADCT = derive2 { name="ADCT"; version="0.1.0"; sha256="1glf83ydx4v3ld8c4gb9h3jk6srd054bis5l8k57p1ba4fnqnnpp"; depends=[mvtnorm]; }; ADDT = derive2 { name="ADDT"; version="2.0"; sha256="044bb1jw2m8vwk5q8l7rlz4kqphjvy8i9d59rjg0k5q5l9vczfrp"; depends=[coneproj Matrix nlme]; }; ADGofTest = derive2 { name="ADGofTest"; version="0.3"; sha256="0ik817qzqp6kfbckjp1z7srlma0w6z2zcwykh0jdiv7nahwk3ncw"; depends=[]; }; - ADMM = derive2 { name="ADMM"; version="0.3.1"; sha256="121hqglivik65gv657bdv7a8kzgvrwgwckz2h746fcibv2s7dfsi"; depends=[doParallel foreach Matrix Rcpp RcppArmadillo Rdpack]; }; + ADMM = derive2 { name="ADMM"; version="0.3.2"; sha256="0wxjl9pdrcrbbcl1vq48ajgqdm2m1ymaf5xcnr5sf44v50lxyqic"; depends=[doParallel foreach Matrix Rcpp RcppArmadillo Rdpack]; }; ADMMnet = derive2 { name="ADMMnet"; version="0.1"; sha256="15f1zhgv7xai954qz2ahj4kpxyvr2svxpmybz7j43bhjpkq72dmq"; depends=[Matrix Rcpp RcppEigen]; }; ADMMsigma = derive2 { name="ADMMsigma"; version="2.1"; sha256="1943dza086s22pr0yz41wzn9cdg11x7fl9zr3w012865yj219m7l"; depends=[doParallel dplyr foreach ggplot2 Rcpp RcppArmadillo RcppProgress]; }; ADPF = derive2 { name="ADPF"; version="0.0.1"; sha256="1n7302xx77ngvp9i2h582i1mqslzllcdr0bn3pl2zk9jd8k97p7n"; depends=[]; }; @@ -64,7 +64,7 @@ in with self; { AMOEBA = derive2 { name="AMOEBA"; version="1.1"; sha256="1npzh3rpfnxd4r1pj1hm214sfgbw4wmq4ws093lnl7pvsl0q37xn"; depends=[rlecuyer snowfall spdep]; }; AMORE = derive2 { name="AMORE"; version="0.2-16"; sha256="0vw6hhykg1r6xxja6d4zb2y00x7pfkmhcq9xkidz8p4arinb7xnl"; depends=[]; }; AMPLE = derive2 { name="AMPLE"; version="0.0.2"; sha256="0j19f8rl7gkads4n52l5gfc5k7dx27sswzrypwl7dnxhfp4ivql7"; depends=[dplyr ggplot2 shiny shinyjs tidyr wesanderson]; }; - AMR = derive2 { name="AMR"; version="1.0.1"; sha256="06sqrwxd0zhp2i2shvq0lbh8arvvlfqymcf1jckgpsxidygr3j1q"; depends=[backports cleaner crayon data_table dplyr ggplot2 knitr microbenchmark pillar rlang tidyr]; }; + AMR = derive2 { name="AMR"; version="1.1.0"; sha256="0d157469rkpbxq7b53ibmz84vr6kcf896npn7w1vndfi5rjdlvb4"; depends=[backports cleaner crayon data_table dplyr ggplot2 knitr microbenchmark pillar R6 rlang tidyr vctrs]; }; ANN2 = derive2 { name="ANN2"; version="2.3.3"; sha256="12l02fnnfa42qy4w1bv2zr963k61xn7mbpj9rycdzi8wl18hxrb8"; depends=[ggplot2 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]; }; @@ -80,10 +80,12 @@ in with self; { APSIMBatch = derive2 { name="APSIMBatch"; version="0.1.0.2374"; sha256="0j44ijq1v1k60lka9nmw8m1jfjw7pidny9bvswqy5v82gzmwl29d"; depends=[]; }; APfun = derive2 { name="APfun"; version="0.1.4"; sha256="0k4m3zwxcjfb1y4njig6yyjqzsvqi99zmglbfpvp65s829zxd881"; depends=[maptools raster rgdal sp]; }; APtools = derive2 { name="APtools"; version="6.8.8"; sha256="171aydyd7s8qll7djl4ysy596wxdf5wfwpqwfi14jjglc9r9qrrr"; depends=[cmprsk survival]; }; + AQLSchemes = derive2 { name="AQLSchemes"; version="1.6-9"; sha256="0wv2w8nwkfx5j4ds2azasxwy8mafxaxj6pfdkqkf9n57w2q3i1bj"; depends=[]; }; AQuadtree = derive2 { name="AQuadtree"; version="1.0.0"; sha256="159p1cymvgf8grpnkgkf6nind2kv6c62aa96qb32aiayrgrm4y4c"; depends=[dplyr sp]; }; AR = derive2 { name="AR"; version="1.1"; sha256="1wn4g2997c4vc3mzq2pv8ld0ryp0i78v4zlqqryvhshxgnz4f2pr"; depends=[DISTRIB]; }; AR1seg = derive2 { name="AR1seg"; version="1.0"; sha256="0v9adx5wj9r4jwl3bqqmj0byiqfp585jz013qfqrq601wj8v4zi3"; depends=[Segmentor3IsBack]; }; ARCensReg = derive2 { name="ARCensReg"; version="2.1"; sha256="05zjk1wxqfigzg80lvx1940a059jfdr9zbzgzmz2n01glj1lvj63"; depends=[msm mvtnorm numDeriv tmvtnorm]; }; + ARDL = derive2 { name="ARDL"; version="0.1.0"; sha256="08hjxq961jq46kr6fqpjzv9c1sq63amqm0lr40p4wjl7mpf93xzm"; depends=[aod dplyr dynlm lmtest msm stringr zoo]; }; ARHT = derive2 { name="ARHT"; version="0.1.0"; sha256="1fz81a202r8vk655dg6a03zfq3gfkimqjvmc95k3j02xz0iv58kn"; depends=[]; }; ARIbrain = derive2 { name="ARIbrain"; version="0.2"; sha256="18c7yxkrnqh18gcfzvdc5wqig6ywdmjcy8rlz0fdj3b8fb84dfpr"; depends=[hommel plyr RNifti]; }; AROC = derive2 { name="AROC"; version="1.0-2"; sha256="1a7nxspq9kbzji417mr49i0s19ms8wyq48qz7rnlw1mrkipl4p6d"; depends=[Hmisc MASS Matrix moments nor1mix np spatstat]; }; @@ -123,7 +125,7 @@ in with self; { 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]; }; 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]; }; + AdMit = derive2 { name="AdMit"; version="2.1.5"; sha256="1gsskg3ayzyz0wa4abi20zzmkbnal6igwd6m7rafvpgzlffms1r9"; depends=[mvtnorm]; }; AdaSampling = derive2 { name="AdaSampling"; version="1.3"; sha256="1c8dh8lxyb076317n4qk2g3qv5j4mc1dszbh3k1p2b0nxiprqk5i"; depends=[caret class e1071 MASS]; }; AdapEnetClass = derive2 { name="AdapEnetClass"; version="1.2"; sha256="01k3mj4g1ckbng7wkzzn9h0k9yf01cpnnkly0sjda574c5jhj0rc"; depends=[glmnet imputeYn lars quadprog]; }; AdapSamp = derive2 { name="AdapSamp"; version="1.1.1"; sha256="1jayjrsiib2ij4rxxj59g71r3xhzl5yqh0lhi8k6cfy03i7dkvis"; depends=[pracma]; }; @@ -199,17 +201,18 @@ 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=[]; }; + Autoseed = derive2 { name="Autoseed"; version="0.1.0"; sha256="0xr3sjfccvp8h18jqxzajb2pfn4nm8q9maic6k9zzr15fxvphiy5"; depends=[]; }; AzureAuth = derive2 { name="AzureAuth"; version="1.2.3"; sha256="0vi5888qvsmdwvzz46wabg2244liwfzyjd13h1d3wvbarzy7m8wf"; depends=[httr jose jsonlite openssl R6 rappdirs]; }; AzureCognitive = derive2 { name="AzureCognitive"; version="1.0.0"; sha256="1yg8fq77fbgf21dg9zq7kkgqyx6ax9ma46yv1nhnvdhc3dpvax5a"; depends=[AzureAuth AzureRMR httr jsonlite]; }; AzureContainers = derive2 { name="AzureContainers"; version="1.2.1"; sha256="0ihs0wv91y1klzwcbfy44yx12l8rxpa4g2vm2dbd7g9pz172w7hl"; depends=[AzureGraph AzureRMR httr openssl processx R6]; }; AzureGraph = derive2 { name="AzureGraph"; version="1.1.0"; sha256="0b7bfzvv0115giahs12b0h4qq4fdc5qf5kc8hmvjca6jlgysgvf4"; depends=[AzureAuth httr jsonlite openssl R6]; }; AzureKeyVault = derive2 { name="AzureKeyVault"; version="1.0.3"; sha256="06lz7cg3f9qrl9nzi54fsx37gm517skjl0jn1fwq4s4b07p4klia"; depends=[AzureAuth AzureGraph AzureRMR httr jose jsonlite openssl R6]; }; AzureKusto = derive2 { name="AzureKusto"; version="1.0.5"; sha256="0xzrhqysazcwwp5ismf6pi0kyyncwwp4a0p9s47m0gm8fyhz1h7g"; depends=[AzureAuth AzureRMR DBI dplyr httr jsonlite openssl R6 rlang tibble tidyselect]; }; - AzureRMR = derive2 { name="AzureRMR"; version="2.3.1"; sha256="0i00fkmyh25pih6cjcsxabz2rmpgpvzc708yk98jh89yz8cwxkmy"; depends=[AzureAuth AzureGraph httr jsonlite R6 uuid]; }; - AzureStor = derive2 { name="AzureStor"; version="3.1.1"; sha256="0la91z2d8qnvxar1y3mj8kpg0a44qr8slljaig6padv2wq16xals"; depends=[AzureRMR httr mime openssl R6 xml2]; }; + AzureRMR = derive2 { name="AzureRMR"; version="2.3.2"; sha256="18lr68axnr728mhgydifgrvwj640vyhqhgh9y4ppb2xv5smbxq7n"; depends=[AzureAuth AzureGraph httr jsonlite R6 uuid]; }; + AzureStor = derive2 { name="AzureStor"; version="3.2.0"; sha256="0g5j5kb5kf62md3yjyjm2py823zikhnsdbq51gk66ixnzzily4sc"; depends=[AzureRMR httr mime openssl R6 xml2]; }; AzureVM = derive2 { name="AzureVM"; version="2.1.1"; sha256="0kls78lbyp5i0dg3a7nz183r7chw1hhwzqyvmp27jhihazls90ij"; depends=[AzureRMR jsonlite R6]; }; AzureVMmetadata = derive2 { name="AzureVMmetadata"; version="1.0.0"; sha256="0k99ncp9zkyxl0r51041rfgq49gb65f5d3yc89d1gg2aqavk3g2y"; depends=[httr openssl]; }; - AzureVision = derive2 { name="AzureVision"; version="1.0.0"; sha256="1mvnq65sh3kgxfwxvfp26vv0nwa3xldkp65ya4mm0rqxr4zm3h4w"; depends=[AzureCognitive AzureRMR httr]; }; + AzureVision = derive2 { name="AzureVision"; version="1.0.1"; sha256="0wfnq77rn10wpj0d3s8mbpybc3dgvjc4f3lhgalabif4h11zgz9c"; depends=[AzureCognitive AzureRMR httr]; }; BACA = derive2 { name="BACA"; version="1.3"; sha256="1vbip7wbzix1s2izbm4058wmwar7w5rv3q8bmj9pm7hcapfi19k0"; depends=[ggplot2 RDAVIDWebService rJava]; }; BACCO = derive2 { name="BACCO"; version="2.0-9"; sha256="0i1dnk0g3miyv3b60rzgjjm60180wxzv6v2q477r71q74b0v0r1y"; depends=[approximator calibrator emulator]; }; BACCT = derive2 { name="BACCT"; version="1.0"; sha256="0bpm4l27vbblzi2hhfbjw2af3ic2jbnyghkvchpq8ww43k8068iv"; depends=[ggplot2 reshape2 rjags]; }; @@ -221,18 +224,17 @@ in with self; { BALLI = derive2 { name="BALLI"; version="0.2.0"; sha256="0qmjwpj56n07dvjwfknqvc02f0y5mlwh2yz4lrw7c4wqgrckcpgi"; depends=[edgeR limma MASS]; }; BAMBI = derive2 { name="BAMBI"; version="2.2.0"; sha256="1ch74zwv01a42vpvr9irdb2a3ivs1zrgdb907p50pq2lasmqdxah"; depends=[bridgesampling coda future_apply gtools label_switching lattice loo mvtnorm qrng RColorBrewer Rcpp RcppArmadillo rootSolve scales]; }; BAMMtools = derive2 { name="BAMMtools"; version="2.1.7"; sha256="1xpks3in0mj1b82z3ax2k3q06bgr3sj0nhr2dbs2crbvszb8hcp2"; depends=[ape gplots Rcpp]; }; - BANEScarparkinglite = derive2 { name="BANEScarparkinglite"; version="0.1.3"; sha256="0z2n4ikj9cr2vcafpn0kmn5v24pdy7cd98asdy7njg5l54hajsxc"; depends=[dplyr httr lubridate RCurl readr rvest XML xml2]; }; BAREB = derive2 { name="BAREB"; version="0.1.0"; sha256="1h3bgfxbs489cywgblrpl8jjhgs1krimdvv6fryjnc9rhw1mymdr"; depends=[Rcpp RcppArmadillo]; }; - BARIS = derive2 { name="BARIS"; version="1.0.0"; sha256="15bydzp1mldp2zxl343qd1fygah6cj1iavwxb0zddzjzgksnn3y9"; depends=[data_table downloader dplyr httr janitor jsonlite magrittr memoise rgdal rio sf stringi stringr XML]; }; + BARIS = derive2 { name="BARIS"; version="1.1.0"; sha256="0ncc1c6bqkh42cgg2pgfwrjypgcb9a08m49hgf6g6h9f30vqqa52"; depends=[data_table downloader dplyr httr janitor jsonlite magrittr memoise miniUI rgdal rio rstudioapi sf shiny stringi stringr XML]; }; BART = derive2 { name="BART"; version="2.7"; sha256="16klaqzp525da6swlcdcr13mjlm88zpqyqnzjk6l4nlcwa3b7z1m"; depends=[nlme nnet Rcpp survival]; }; BAS = derive2 { name="BAS"; version="1.5.5"; sha256="1iakx36r4lnl6xs77m9mfcj5w3mb4g482s2mpzq65v69k10nj8lj"; depends=[]; }; BASIX = derive2 { name="BASIX"; version="1.1"; sha256="18dkvv1iwskfnlpl6xridcgqpalbbpm2616mvc3hfrc0b26v01id"; depends=[]; }; BASS = derive2 { name="BASS"; version="0.2.2"; sha256="1q3sihp2iv1ikggzgd2k3vh2myz8bz31rzlaavw0n84d0h1zjxy2"; depends=[]; }; BASiNET = derive2 { name="BASiNET"; version="0.0.4"; sha256="0pmn4znqhpav729ai7zr027a7sx6bz2lmlk086crmwm1fnwipqq4"; depends=[Biostrings igraph randomForest rJava rmcfs RWeka]; }; - BAT = derive2 { name="BAT"; version="2.0.0"; sha256="0fwyarkgxxgckaky2wjf311ymlh78942j51a2dvjkwlbshcdqbij"; depends=[hypervolume nls2 raster spatstat vegan]; }; + BAT = derive2 { name="BAT"; version="2.0.1"; sha256="0vc75a0m4my6f1fwciwaf6qhhqr09lc59zgifhhz1188xsrv28h1"; depends=[hypervolume nls2 raster spatstat vegan]; }; BAYESDEF = derive2 { name="BAYESDEF"; version="0.1.0"; sha256="030xskgqqg0n85mphjv32ks4ysvxb36f6ayy0176gps14jhmhcp7"; depends=[glmnet gWidgets readxl REdaS]; }; BAYSTAR = derive2 { name="BAYSTAR"; version="0.2-9"; sha256="0crillww1f1jvhjw639sf09lpc3wpzd69milah143gk9zlrkhmz2"; depends=[coda mvtnorm]; }; - BAwiR = derive2 { name="BAwiR"; version="1.2.2"; sha256="0src5d7bi9d8mcg9rijrz20v0a8gif52j7qggbvl2xa15gksxdag"; depends=[Anthropometry dplyr ggplot2 ggthemes hrbrthemes httr lubridate magrittr plyr purrr reshape2 rvest rworldmap scales stringi stringr tidyr xml2]; }; + BAwiR = derive2 { name="BAwiR"; version="1.2.3"; sha256="0kc4vq2cc6rp2hpy9a9bqmxvfpm9h4k9x7imwa9kgin3didi7vjp"; depends=[Anthropometry dplyr ggplot2 ggthemes hrbrthemes httr lubridate magrittr plyr purrr reshape2 rvest rworldmap scales stringi stringr tibble tidyr xml2]; }; BB = derive2 { name="BB"; version="2019.10-1"; sha256="0kf9sfsm3n036a8a8gjfpc9qdryvadb019kqjh80n1szdv7bdl04"; depends=[quadprog]; }; BBEST = derive2 { name="BBEST"; version="0.1-6"; sha256="1hvgi3679ixpq0c5qbxhkp1j0953k3lklglgxrq9mz2ry6z9n038"; depends=[DEoptim ggplot2 reshape2 shiny wmtsa]; }; BBI = derive2 { name="BBI"; version="0.3.0"; sha256="167sndfp3776p8n9zdpihc9xhqqi8wygzpl49dzkfj53gwa77rnn"; depends=[vegan]; }; @@ -307,7 +309,6 @@ in with self; { BMRV = derive2 { name="BMRV"; version="1.32"; sha256="1j1cwjk3l7f06nqdwrqdyhzm43bb8hj5wgdd14zc1grxyfc9ya95"; depends=[BH]; }; BMS = derive2 { name="BMS"; version="0.3.4"; sha256="0z3mk1xd1fphf80kdbashkn04jwsr2bghms4d7nav3pw73q41wql"; depends=[]; }; BMT = derive2 { name="BMT"; version="0.1.0.3"; sha256="1vdah5bsn41s2qriq15xi7dw9qzngaacmn5gk6yc7hi89dwyy3yj"; depends=[fitdistrplus partitions]; }; - BMTME = derive2 { name="BMTME"; version="1.0.12"; sha256="0v1f1c2nk7f51c017jscyzkx7y21b3lmxp46xgs8hqcfjfw9b65m"; depends=[BGLR doSNOW dplyr foreach matrixcalc mvtnorm progress Rcpp RcppArmadillo snow tidyr]; }; BMisc = derive2 { name="BMisc"; version="1.4.1"; sha256="176sqq24xyw9sz1pq721inmqwjxqqzbcp6w65f0m0n4b64yk5gyd"; depends=[]; }; BNDataGenerator = derive2 { name="BNDataGenerator"; version="1.0"; sha256="17zi83jhpn9ygavkpr9haffvd4622sca18jzzxxxmfq0ilrj201g"; depends=[]; }; BNN = derive2 { name="BNN"; version="1.0.2"; sha256="13h9xqfdqnc9d8brx1xlmvb4nrkpwncwjz98y7i3wijih85wkikd"; depends=[mvtnorm]; }; @@ -352,17 +353,16 @@ in with self; { BaPreStoPro = derive2 { name="BaPreStoPro"; version="0.1"; sha256="0zyyyrr5h8dhjsmgaii8jmb8ignvixpc9nzbfishw9yymjswvm57"; depends=[]; }; 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.1"; sha256="0ivrgv0i81hxfd1gpnx4z6akl0rpcb5sqsvk1xp7rbln14pg1pz4"; depends=[deSolve ggplot2 glpkAPI igraph Matrix plyr R_matlab Rcpp RcppArmadillo RcppEigen ReacTran reshape2 stringr sybil]; }; 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.9"; sha256="1cznrlgj75xwgpqqsnl0vnjd7pwvkna0cakdz4bcya4hn74dx27y"; depends=[gam mvtnorm survival]; }; BallMapper = derive2 { name="BallMapper"; version="0.2.0"; sha256="1hf94d41cks8mbrb985mpd0nqgirvm096cfv7bsy0182bbxlk6s1"; depends=[fields igraph networkD3 scales stringr testthat]; }; BarBorGradient = derive2 { name="BarBorGradient"; version="1.0.5"; sha256="0g2g7hrm23as1xbj79g48r8sj3gsj66fmi895jqlqfbqrl2fl7a5"; depends=[]; }; - BarcodingR = derive2 { name="BarcodingR"; version="1.0-2"; sha256="1mn5rdax8v1s2z3apk9z0kzy4hw19m8ql6j91l6wd29g2n2bjqxx"; depends=[ape class nnet sp]; }; + BarcodingR = derive2 { name="BarcodingR"; version="1.0-3"; sha256="03x26mrlvg00rnfh74wacpgbdk7xr2lq4yd0bx4q2442nli54rdv"; depends=[ape class nnet sp]; }; Barnard = derive2 { name="Barnard"; version="1.8"; sha256="1ki58hjs5kpmp76kwj1qi6hwmdvjphqb1lvrlhnmkgqxg4hw4vqg"; depends=[]; }; Barycenter = derive2 { name="Barycenter"; version="1.3.1"; sha256="0yhc0wwjqms569gnm8z2l9hgcbw8lyy437ynkij47pa4c1a1qvjy"; depends=[Rcpp RcppArmadillo]; }; BatchExperiments = derive2 { name="BatchExperiments"; version="1.4.2"; sha256="0zvcpgzhbna6p37jlf57j7mzrvh5xs5w17janmv9v4210cpbzi1q"; depends=[backports BatchJobs BBmisc checkmate data_table DBI RSQLite]; }; - BatchGetSymbols = derive2 { name="BatchGetSymbols"; version="2.5.6"; sha256="0cwnr4fxpjfm7l4jf3mmf14fdqnvavj5if0xf6fdx1spn59w8s97"; depends=[crayon curl dplyr furrr future lubridate purrr quantmod rvest scales stringr tibble tidyr XML zoo]; }; + BatchGetSymbols = derive2 { name="BatchGetSymbols"; version="2.5.7"; sha256="155wwskqagz3qcng71nn0v52mvassdinhmvaf1hv74dakvvfjrj2"; depends=[crayon curl dplyr furrr future lubridate purrr quantmod rvest scales stringr tibble tidyr XML zoo]; }; BatchJobs = derive2 { name="BatchJobs"; version="1.8"; sha256="1zz4sspj596pijxlz321g0jy2rg9ki83j6fihbwisjwr66p2vk1m"; depends=[backports BBmisc brew checkmate data_table DBI digest RSQLite sendmailR stringi]; }; BayHaz = derive2 { name="BayHaz"; version="0.1-3"; sha256="08ilghlkgyma5758yw7mdgqycqcillqmx73knzzdlg2kzc77dvg6"; depends=[]; }; BayLum = derive2 { name="BayLum"; version="0.1.3"; sha256="0hina84s8ax01zpnji4jqqkdap0phvxr78s4rnab0407xrydbf0w"; depends=[ArchaeoPhases coda hexbin KernSmooth Luminescence rjags]; }; @@ -392,15 +392,15 @@ in with self; { BayesMixSurv = derive2 { name="BayesMixSurv"; version="0.9.1"; sha256="19kf39881q00pap9afwvvggk4s4w3qpz17b7065nig1mvk8dnp8r"; depends=[survival]; }; BayesNI = derive2 { name="BayesNI"; version="0.1"; sha256="0zvr6rkb5zxgl53xby69d0j3yrfnlcmac6kwkxz77q5616w9dwq0"; depends=[]; }; BayesNSGP = derive2 { name="BayesNSGP"; version="0.1.1"; sha256="11c83iafhl8yasyy8xwk9wladbj986xpmgc8d3yd9dxkic71flw8"; depends=[FNN Matrix nimble StatMatch]; }; - BayesNetBP = derive2 { name="BayesNetBP"; version="1.4.0"; sha256="007anxk76rxwskc7fvbmaw7ihjnwqad0xmiy6iyv68lwrjifvpc2"; depends=[bnlearn doBy fields graph igraph qtl qtlnet RColorBrewer Rgraphviz]; }; + BayesNetBP = derive2 { name="BayesNetBP"; version="1.5.2"; sha256="0i5pr9q8fzfxwxp9cb85xs9gaywfbv6h37bg3xz01d292ir56pl9"; depends=[bnlearn doBy fields graph igraph qtl qtlnet RColorBrewer]; }; BayesPieceHazSelect = derive2 { name="BayesPieceHazSelect"; version="1.1.0"; sha256="0znbmv7crqycdx75jh02h6z8d6cifjszbrldv2yva4mkjxsydag5"; depends=[mvtnorm]; }; BayesPiecewiseICAR = derive2 { name="BayesPiecewiseICAR"; version="0.2.1"; sha256="1qrmw7zmygdzz84p76hyh2d8dx88b8xhbbd7radqm39g35zq5wz6"; depends=[mvtnorm]; }; - BayesPostEst = derive2 { name="BayesPostEst"; version="0.2.0"; sha256="0yyf9mawpq8ynw5mx0684f8yw3ajf01wadfdvs2yanjlgqbmy1sj"; depends=[carData caTools coda dplyr ggmcmc ggplot2 ggridges HDInterval R2jags reshape2 rlang ROCR runjags texreg tidyr]; }; BayesRS = derive2 { name="BayesRS"; version="0.1.3"; sha256="0fhvnckabp0z1cdsbjgv3ijnzaxwhrk83fwcflgqbhvm3a9lzr77"; depends=[coda ggplot2 metRology reshape rjags]; }; BayesReversePLLH = derive2 { name="BayesReversePLLH"; version="1.3"; sha256="07ijys5qd29qpa1hh6kbbp6fx97nmxydiijd0k0dh262vqfhh5ll"; depends=[Rcpp RcppArmadillo]; }; BayesS5 = derive2 { name="BayesS5"; version="1.41"; sha256="0vs6s50h4gpxda9lbxfgn76k9kp81l62a6bv22r7ixsjlnd4baql"; depends=[abind Matrix snowfall splines2]; }; BayesSAE = derive2 { name="BayesSAE"; version="1.0-2"; sha256="1xbx9hr254agpcqs1fl7qi7h19fd2bbmjszn44l566n2svgvxwf5"; depends=[coda Formula lattice]; }; - BayesSUR = derive2 { name="BayesSUR"; version="1.0-4"; sha256="1n38k9y1hvymfq556d5v2q69wqycvzdkjjgwzx0sz236wdqi64wv"; depends=[igraph Matrix Rcpp RcppArmadillo tikzDevice xml2]; }; + BayesSUR = derive2 { name="BayesSUR"; version="1.1-1"; sha256="0j5cmw85msqpb4zl4fdg1988d8z316zhbgm6yblfk4fgnszdnfh4"; depends=[igraph Matrix Rcpp RcppArmadillo tikzDevice xml2]; }; + BayesSampling = derive2 { name="BayesSampling"; version="1.0.0"; sha256="06gy902ksa753hn5p4zmsxaw6qg4qx4prd8n5m2w1300561cfbkl"; depends=[MASS Matrix]; }; BayesSpec = derive2 { name="BayesSpec"; version="0.5.3"; sha256="17gchdijcjhbr2y4glbq9szjh4qmgivzh6p4fllh589da18nzjcr"; depends=[mvtnorm pscl trust]; }; BayesSummaryStatLM = derive2 { name="BayesSummaryStatLM"; version="1.0-1"; sha256="05mlgyi4fglvjkpqyw3vcjpipqllx37svcb20c1mrsa46m6fm4s7"; depends=[ff mvnfast]; }; BayesTree = derive2 { name="BayesTree"; version="0.3-1.4"; sha256="0saca1ln582szqzc2c78z24b1lszzhc9hvsin73kb7r2dlg5ciii"; depends=[nnet]; }; @@ -419,7 +419,7 @@ in with self; { Bayesrel = derive2 { name="Bayesrel"; version="0.6.1"; sha256="1mdc53g17c4r078mw74iiir03ks8kv60qh16l8fqy00vzwvbgpi9"; depends=[coda ggplot2 ggridges LaplacesDemon lavaan MASS plotrix Rcsdp Rdpack]; }; BaylorEdPsych = derive2 { name="BaylorEdPsych"; version="0.5"; sha256="1kq6nvzdqwawygp7k62lw5hyccsj81jg82hq60yidgxnmmnnf7y2"; depends=[]; }; BcDiag = derive2 { name="BcDiag"; version="1.0.10"; sha256="1gyinmx5wn2kk70hiy28ghilkhfirfjbfqdrqq5h3wfb4khnq6pz"; depends=[fabia]; }; - Bchron = derive2 { name="Bchron"; version="4.7.0"; sha256="1wzi63szg6x6h8x5ngm8x3scp0qlgld5dyidqic5ibhvxd36rqhy"; depends=[coda dplyr ggforce ggplot2 ggridges magrittr MASS mclust purrr scales stringr]; }; + Bchron = derive2 { name="Bchron"; version="4.7.1"; sha256="1s6rvbxmsj5ksykxlvfzprxapn83wd8wcrq0yxpfd647jq4y7c20"; depends=[coda dplyr ggforce ggplot2 ggridges magrittr MASS mclust purrr scales stringr]; }; Bclim = derive2 { name="Bclim"; version="3.1.2"; sha256="0dd4fx3rlljj3zb1m8q1bam1bswg497l3y8k0h0mkvjn94b4jbag"; depends=[ggplot2 MASS mclust statmod]; }; BeSS = derive2 { name="BeSS"; version="1.0.8"; sha256="1yxinr3bfnk2ryal41l0j7i345aynrr62dd1rarrbyspxfrhimiq"; depends=[glmnet Matrix Rcpp RcppEigen survival]; }; Benchmarking = derive2 { name="Benchmarking"; version="0.28"; sha256="1f13m6fz9wd6zzknglcl0za16dbjsxn9f2714rpg8hcsr3hrlhdl"; depends=[lpSolveAPI ucminf]; }; @@ -430,17 +430,17 @@ in with self; { BetaBit = derive2 { name="BetaBit"; version="1.3"; sha256="1x9mfnijgi8726p82d52g2zgmliwsc97v2g96mz9ccz2vqqnwq4w"; depends=[digest]; }; BetaPASS = derive2 { name="BetaPASS"; version="1.1-1"; sha256="17q1bfmijv38zyaj5fxlylf5zmkqry4ca9wm5km6zpksgsg2kjjq"; depends=[betareg ggplot2 pbapply]; }; BeviMed = derive2 { name="BeviMed"; version="5.7"; sha256="1fjxin14x9i44wq6ad2i70k6sdfzy7zxyq1pibnmsyk4a0k2cfv1"; depends=[Rcpp]; }; - BeyondBenford = derive2 { name="BeyondBenford"; version="1.2"; sha256="0319jva0b43xcx7l0jyn0cxkazv7qi05bzmpas8wphk9f8r9jlim"; depends=[ggplot2]; }; + BeyondBenford = derive2 { name="BeyondBenford"; version="1.3"; sha256="08cfm4knssr5zhcc2xl7xgzxx39wv09hil305hi1s219ba7hzx3q"; depends=[ggplot2]; }; Bhat = derive2 { name="Bhat"; version="0.9-10"; sha256="1vg4pzrk3y0dk1kbf80mxsbz9ammkysh6bn26maiplmjagbj954v"; depends=[]; }; BiBitR = derive2 { name="BiBitR"; version="0.3.1"; sha256="0wfwph6nw12hb43j14i9ycj8m2zn0m5ynp7afq9cray8rbgvxfv6"; depends=[biclust cluster dendextend foreign lattice randomcoloR viridis]; }; - BiDAG = derive2 { name="BiDAG"; version="1.3.0"; sha256="0pbb77k0fipbd0bx9dxwlcqkgwyvx34865wc9b98g40zvzqn903f"; depends=[graph pcalg Rcpp Rgraphviz]; }; + BiDAG = derive2 { name="BiDAG"; version="1.3.4"; sha256="16s7925lz59sscj6zpbm9g1irpg21rqr9kn55175wll2gwgmhy4m"; depends=[graph pcalg Rcpp]; }; BiDimRegression = derive2 { name="BiDimRegression"; version="2.0.0"; sha256="0k0708z6xn04zjkc4sk15649wji6hl5q4rvd28sz5kbq7z54j1j5"; depends=[Formula]; }; BiProbitPartial = derive2 { name="BiProbitPartial"; version="1.0.3"; sha256="0y19b8bkwr7rpygmj03013slmfbyd7aj6714hm14w5rdbnckymw3"; depends=[coda Formula mvtnorm numDeriv optimr pbivnorm Rcpp RcppArmadillo RcppTN]; }; BiSEp = derive2 { name="BiSEp"; version="2.2"; sha256="1ha7rc1q54dr2xl4bpkiwl703igmmi9qphsgv2h0flq7iz0gr351"; depends=[AnnotationDbi GOSemSim mclust]; }; BiTrinA = derive2 { name="BiTrinA"; version="1.3"; sha256="0sjq5a21vpsjs0ad0v8gsqlbk3n8virg1hzj0nvgm3h3xqhymh1d"; depends=[diptest]; }; BiasedUrn = derive2 { name="BiasedUrn"; version="1.07"; sha256="13i2lgfnjhlbbm2yxfc2l5hswqw6x03pwba5csjmirv8kpjw4xr3"; depends=[]; }; BibPlots = derive2 { name="BibPlots"; version="0.0.6"; sha256="0gbywbxhqw226mzhxlkl98yky206f9m81wcrp6r4wj8wqhzc2fay"; depends=[]; }; - BifactorIndicesCalculator = derive2 { name="BifactorIndicesCalculator"; version="0.1.0"; sha256="1yawxab606408ribb1mb3aa6a46blv8aqhi9v68cyc0dbd3cjqx8"; depends=[lavaan mirt MplusAutomation tidyr]; }; + BifactorIndicesCalculator = derive2 { name="BifactorIndicesCalculator"; version="0.2.0"; sha256="117l4j9h64rh65zs5j0xzdx1mn172lkak6pvkhlbc9c8g5rkfcv2"; depends=[lavaan mirt MplusAutomation tidyr]; }; BigQuic = derive2 { name="BigQuic"; version="1.1-8"; sha256="1kg48jqm62qmz5x0h6fgvd5fs5dvg51x4spsn1q503ag4dqqdjc0"; depends=[Matrix Rcpp scalreg]; }; BigSEM = derive2 { name="BigSEM"; version="0.2"; sha256="091fdibcxd8a8kf9k4pvc1sah830wh179f28gag9g816h4qclnx9"; depends=[MASS parcor]; }; BigTSP = derive2 { name="BigTSP"; version="1.0"; sha256="1jdpa8rcnrhzn0hilb422pdxprdljrzpgr4f26668c1vv0kd6k4v"; depends=[gbm glmnet randomForest tree]; }; @@ -448,9 +448,9 @@ in with self; { BimodalIndex = derive2 { name="BimodalIndex"; version="1.1.9"; sha256="1m1dcj0ryjicaqjlkch7aymsklmvjvn2dvnbssi1cpi54bzn8l7g"; depends=[mclust oompaBase]; }; BinGSD = derive2 { name="BinGSD"; version="0.0.1"; sha256="0ygr5na7s82xa6vv9f3j6ns5sfhdacyykl1fg422lpkwbss39dnn"; depends=[mvtnorm]; }; BinMat = derive2 { name="BinMat"; version="0.1.2"; sha256="17f5aaz8csfs1x1x7dxvbi4g97cp75kz7ikijsyk4pgpalld58a4"; depends=[magrittr MASS pvclust]; }; - BinNonNor = derive2 { name="BinNonNor"; version="1.5.1"; sha256="1afxf0lcdsvw7ky3v25jyl9z9krknvw10ryi2fhgjbydq1nyijl6"; depends=[BB corpcor Matrix mvtnorm]; }; - BinNor = derive2 { name="BinNor"; version="2.3.1"; sha256="07f08nn9sbpgddm849rgabka1cb19j3s1yg1c1wydbgfkjakv95x"; depends=[corpcor Matrix mvtnorm psych]; }; - BinOrdNonNor = derive2 { name="BinOrdNonNor"; version="1.5"; sha256="0pw0a4g0v9g5k89hy5jz7hy4f3qg8fwyij6b1lj0b7bpy4mg0kv5"; depends=[BB corpcor GenOrd Matrix mvtnorm OrdNor]; }; + BinNonNor = derive2 { name="BinNonNor"; version="1.5.2"; sha256="13zgj4n4jhrmjv1wldvamg6dpd6qpn3nwflvf5qhhbd3r0h0jf9x"; depends=[BB corpcor Matrix mvtnorm]; }; + BinNor = derive2 { name="BinNor"; version="2.3.2"; sha256="1332lffb57si2vay4hcw6zj2mm0pzp3d9cd11vfszgnp17x8b5ss"; depends=[corpcor Matrix mvtnorm psych]; }; + BinOrdNonNor = derive2 { name="BinOrdNonNor"; version="1.5.1"; sha256="1rvzgh0ly349606aw6w4g32c1csy221qizf4wmfzbv19ppixpffy"; depends=[BB corpcor GenOrd Matrix mvtnorm OrdNor]; }; BinQuasi = derive2 { name="BinQuasi"; version="0.1-6"; sha256="0jf7zf3yqr2kgcm6h35234x2dqf65d2dzsh63b4q8m5l36r77k59"; depends=[BiocGenerics csaw edgeR GenomicAlignments GenomicRanges IRanges mgcv pracma quadprog RMySQL Rsamtools S4Vectors SummarizedExperiment]; }; BinSegBstrap = derive2 { name="BinSegBstrap"; version="1.0"; sha256="0iia9sbpnqp07h591d7ifvxq74nvnv0xspka2479qy7il9p65d3r"; depends=[Rcpp]; }; Binarize = derive2 { name="Binarize"; version="1.3"; sha256="0xmgxlfyvgkv7xpngy9am6ihzwbjbfgp7psfnyhb1v0kj9iy7ids"; depends=[diptest]; }; @@ -471,7 +471,6 @@ in with self; { Biocomb = derive2 { name="Biocomb"; version="0.4"; sha256="0jqfac81r5731m0i9jq7v5ns9263p8r7i03jyz10y915kfr6ikh6"; depends=[arules class e1071 FSelector gtools MASS nnet pamr pROC randomForest Rcpp rgl ROCR rpart RWeka]; }; Biodem = derive2 { name="Biodem"; version="0.4"; sha256="0k0p4s21089wg3r3pvyy9cxsdf4ijdl598gmxynbzvwpr670qnsh"; depends=[]; }; BiodiversityR = derive2 { name="BiodiversityR"; version="2.11-3"; sha256="1ba19vlxpy88xcryf3xki3h49hbmkz9hf69lni6swl2rh1k7fx41"; depends=[Rcmdr rgl vegan vegan3d]; }; - Biograph = derive2 { name="Biograph"; version="2.0.6"; sha256="0vklqwbifbac3v9ws9fs22yxpqqk5b3m96qzr8j0irnimb5kgh5p"; depends=[Epi etm ggplot2 lubridate msm mstate mvna plyr reshape survival]; }; Bioi = derive2 { name="Bioi"; version="0.2.10"; sha256="1ay8889490nfhxhh72fvk9z4h58xknm2b145xhbx2wbzj65zf9ib"; depends=[assertthat dplyr igraph Rcpp]; }; Biolinv = derive2 { name="Biolinv"; version="0.1-2"; sha256="0g9vw1jcsjawmddkixssm5gbncy17fdd6a3c5b2qd4hx81kxz8q9"; depends=[classInt fields raster sp spatstat]; }; Biopeak = derive2 { name="Biopeak"; version="1.0"; sha256="1l08m1jl8yygbdfzk8klpj1q2m7icvxi98vmk7akxs0sswjc6wd2"; depends=[cluster dbscan factoextra gplots RColorBrewer]; }; @@ -502,7 +501,7 @@ in with self; { BondValuation = derive2 { name="BondValuation"; version="0.1.0"; sha256="1sgnf5a6rm1br6i82bmp7s044012bwfxa9yb6bjkq8kr83mf7i6v"; depends=[Rcpp timeDate]; }; BoolFilter = derive2 { name="BoolFilter"; version="1.0.0"; sha256="14z4fzf8p4wgi939qs6v39a3xizccjcx7j4szsydllpkvxbwggbw"; depends=[BoolNet Rlab]; }; BoolNet = derive2 { name="BoolNet"; version="2.1.5"; sha256="11fysc39vfk3zb9qklryi8gl42c3hqgzlvci4jj0zkqnm0v9amqk"; depends=[igraph XML]; }; - Boom = derive2 { name="Boom"; version="0.9.4"; sha256="0m1yls9wm0p4k7v7760fycb4157k0f00h50gs1h6x17d5z9w2i7q"; depends=[MASS]; }; + Boom = derive2 { name="Boom"; version="0.9.5"; sha256="0k76lh8v25v5k0axmgvkn85kf3d36klqqp9nd8hzzaiwkfjc60kh"; depends=[MASS]; }; BoomSpikeSlab = derive2 { name="BoomSpikeSlab"; version="1.2.2"; sha256="0wz0b7ayhk97zva3mkxbpsf9ddsqdldzl1b1cv9b7qvakn8k7if9"; depends=[Boom]; }; BoostMLR = derive2 { name="BoostMLR"; version="1.0.2"; sha256="1iy8v9jc13wncz6z3rqlbxkf9lclq0qynp4m54b5xl35qz9xq676"; depends=[nlme Rcpp RcppArmadillo]; }; BootMRMR = derive2 { name="BootMRMR"; version="0.1"; sha256="07am80603pv1dh5ma3zb0idnslkzm5m3ym8sd1nhkh8zbc6qqmzs"; depends=[]; }; @@ -550,7 +549,7 @@ in with self; { CATkit = derive2 { name="CATkit"; version="3.3.3"; sha256="01q2ssyg0jcjgahaslfgpakjsv2wil654lc6xrg5xbbrkx7ccb90"; depends=[assertr CombMSC Hmisc magic MASS png rtf season signal]; }; CAinterprTools = derive2 { name="CAinterprTools"; version="1.0.0"; sha256="1ia4qfvj0nzxi6pwqnha2vpfcx3qwaw4vrjqiza11sai274j0pjy"; depends=[ca classInt cluster FactoMineR ggplot2 ggrepel Hmisc RcmdrMisc reshape2]; }; CAvariants = derive2 { name="CAvariants"; version="5.5"; sha256="0bxifvhpjay18k6gkppypc1d0zaln1zhnxabvvld0pz4h59s2hlv"; depends=[ggforce ggplot2 ggrepel gridExtra plotly]; }; - CB2 = derive2 { name="CB2"; version="1.3.0"; sha256="050fpyj0zrgl03a2mdp9xrl72ad0d92kl7s9swgn2a7g8ca34c0k"; depends=[dplyr ggplot2 glue magrittr metap pheatmap R_utils Rcpp RcppArmadillo readr stringr tibble tidyr]; }; + CB2 = derive2 { name="CB2"; version="1.3.1"; sha256="14jx583lgm2yisdz3mkswpgzxz5lb86c9x66b94cn9mrhcnqlfb7"; depends=[dplyr ggplot2 glue magrittr metap pheatmap R_utils Rcpp RcppArmadillo readr stringr tibble tidyr]; }; CBCgrps = derive2 { name="CBCgrps"; version="2.7"; sha256="1hqndrz3snir3pibqsbyzgbllgmdiprgq27a31vl29vkswpiwwsm"; depends=[nortest]; }; CBDA = derive2 { name="CBDA"; version="1.0.0"; sha256="0qm77vvqjgi83i8izly995ziv9ski8kgzqyq4g81i2k7a5dp8vxv"; depends=[doParallel foreach prettydoc SuperLearner]; }; CBPS = derive2 { name="CBPS"; version="0.21"; sha256="0av9lgdn9z57xl9cp53pi9nq971a6fj4przczw7sdb5saml3yr30"; depends=[glmnet MASS MatchIt nnet numDeriv]; }; @@ -591,6 +590,7 @@ in with self; { CIEE = derive2 { name="CIEE"; version="0.1.1"; sha256="03kq9cp0v41y0r2l9j5imcrsail2xsvlzhhhsrw454d4s9gqdql9"; depends=[survival]; }; CIFsmry = derive2 { name="CIFsmry"; version="1.0.1.1"; sha256="1m2m2zvg9ghy3bm2sll7jp4xm2vw58kc5xaxd2c9k82771m3a4j0"; depends=[]; }; CIM = derive2 { name="CIM"; version="1.0.0"; sha256="02l8rspiiv6vj6k0q6wpiazny3f2s4dsivsm7zb9cm90qh1rv2d7"; depends=[]; }; + CIMTx = derive2 { name="CIMTx"; version="0.1.0"; sha256="0z2xxmmlybgl3ydyhkdkyd9frwi8ddqi89dfwa0rdl6gg59rawmk"; depends=[arm BART car class dplyr gam magrittr Matching nnet SuperLearner tidyr tmle twang WeightIt]; }; CINID = derive2 { name="CINID"; version="1.2"; sha256="0pkgzi2j0045p10kjvnq8f4j1agzrqfw0czvvfrzj9yjfpj8xc99"; depends=[]; }; CINNA = derive2 { name="CINNA"; version="1.1.53"; sha256="0mp7fvsxiri6454s7hlpsy9r3ysy6vdb3yslnizgqi38rb17phik"; depends=[centiserve circlize corrplot dendextend factoextra FactoMineR GGally ggplot2 igraph intergraph network pheatmap plyr qdapTools Rtsne sna viridis]; }; CISE = derive2 { name="CISE"; version="0.1.0"; sha256="10mbi4v8dfdc9ngnrrmxpng8fnig5m8nv7799jksbcf6pnj8yv51"; depends=[far gdata glmnet MASS Matrix rARPACK]; }; @@ -614,7 +614,7 @@ in with self; { CNLTreg = derive2 { name="CNLTreg"; version="0.1-2"; sha256="07yi0ajil1113663v3gp5d3453r4l9qm442jnpydx4ygvjk7m2ha"; depends=[adlift miscTools nlt]; }; CNLTtsa = derive2 { name="CNLTtsa"; version="0.1-2"; sha256="1vy0jjg6s8yvsvkx4pin183y5bnikm5cmjcpa9znz9dj1w6hwr5r"; depends=[adlift CNLTreg fields nlt]; }; CNOGpro = derive2 { name="CNOGpro"; version="1.1"; sha256="1frsmhfqrlg1vsa06cabqmrzngq4p5gqwyb9qgnsgg81a9ybm6l8"; depends=[seqinr]; }; - CNVScope = derive2 { name="CNVScope"; version="2.9.4"; sha256="1nkaghrp7wn8h0gq6i4lny2n1lxhk0a6dwyz7d1k5k1vv6xnxwf8"; depends=[BiocManager biomaRt BSgenome_Hsapiens_UCSC_hg19 circlize data_table doParallel dplyr foreach GenomeInfoDb GenomicFeatures GenomicInteractions GenomicRanges ggplot2 heatmaply HiCseg htmltools htmlwidgets igraph InteractionSet IRanges jointseg logging magrittr Matrix matrixStats numbers OpenImageR plotly plyr RCurl reshape2 rslurm rtracklayer S4Vectors shiny shinycssloaders shinyjs shinythemes spatialfil stringr tibble tidyr visNetwork]; }; + CNVScope = derive2 { name="CNVScope"; version="3.0.5"; sha256="0y131sk4dihfnqz30c2jz2pkzk53f266afr56y097vnbhzsqpaiw"; depends=[BiocManager biomaRt BSgenome_Hsapiens_UCSC_hg19 circlize data_table doParallel dplyr DT foreach GenomeInfoDb GenomicFeatures GenomicInteractions GenomicRanges ggplot2 heatmaply HiCseg htmltools htmlwidgets igraph InteractionSet IRanges jointseg logging magrittr Matrix matrixStats numbers OpenImageR plotly plyr RCurl reshape2 rslurm rtracklayer S4Vectors shiny shinycssloaders shinyjs shinythemes spatialfil stringr tibble tidyr visNetwork]; }; CNprep = derive2 { name="CNprep"; version="2.0"; sha256="08dpjikx3ldqzw2kwb12q0kbw15qzl09srjdfs0sz9si0x6bfxs6"; depends=[mclust rlecuyer]; }; CNull = derive2 { name="CNull"; version="1.0"; sha256="14hy86zg18hqxi63bfzrpkz70yrzfxp2v2pva5xnrvx9dmlyz820"; depends=[ape Matrix PhyloMeasures Rcpp]; }; COBRA = derive2 { name="COBRA"; version="0.99.4"; sha256="1r1cw12d7c148pcgcg08bfsr1q1s736kfpyyss6b4d7ny7wgmqy4"; depends=[]; }; @@ -631,7 +631,7 @@ in with self; { COST = derive2 { name="COST"; version="0.1.0"; sha256="06xgnsccd621ihlrdmnnh14vh83q1r2bnp3iqi7vp5553b3y4l3w"; depends=[copula mvtnorm]; }; COUNT = derive2 { name="COUNT"; version="1.3.4"; sha256="02f7779fy0d2bql88x5v9csbxljhnyvl8wb8h83xrmwl7kaxsdpy"; depends=[MASS msme sandwich]; }; COUSCOus = derive2 { name="COUSCOus"; version="1.0.0"; sha256="1ykqi72v8v1b3g9qy6h34dvk5fynzf1rl2mby65p08axmaba5798"; depends=[bio3d matrixcalc]; }; - COVID19 = derive2 { name="COVID19"; version="0.2.1"; sha256="0fchc7a2g2q52ycbhbdrczvfrqvacwvkv72fdv4h4jsjn7j17hpl"; depends=[devtools dplyr gganimate ggplot2 ggthemes reshape2 rgdal sp tidyr]; }; + COVID19 = derive2 { name="COVID19"; version="1.0.0"; sha256="05nnpgiykyi2lk5pddxpwv9j64gvp0b9mb9n760nf226p2f0m7w4"; depends=[dplyr remotes tidyr]; }; CP = derive2 { name="CP"; version="1.6"; sha256="18zblf13riiz3mq3hkvg6vhiwjzpsn6mvgc2p0bqyldy98v4aisd"; depends=[survival]; }; CPAT = derive2 { name="CPAT"; version="0.1.0"; sha256="0zygncwww3cazwmx06bhzq0g41xcqfpw307azdhygc8jmcy6qj71"; depends=[purrr Rcpp RcppArmadillo Rdpack]; }; CPBayes = derive2 { name="CPBayes"; version="1.0.0"; sha256="0m9hy14xmaa0lswn2dlrjvqcsg14smxy3w1nmy48l3af1c2kjnxv"; depends=[forestplot MASS mvtnorm purrr]; }; @@ -677,7 +677,7 @@ in with self; { 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]; }; CaPO4Sim = derive2 { name="CaPO4Sim"; version="0.1.0"; sha256="1ihkx0swj9adz2pgfm9c20pcipq748czkyg76q3y0zk1j987nfik"; depends=[DT htmltools magrittr plotly purrr rintrojs shiny shinycssloaders shinydashboard shinydashboardPlus shinyjqui shinyjs shinyWidgets visNetwork]; }; - Cairo = derive2 { name="Cairo"; version="1.5-11"; sha256="1k9kpxcg5n4g6x2gydv344f4w0snqbhww14fnbbj1bny0mmv28xg"; depends=[]; }; + Cairo = derive2 { name="Cairo"; version="1.5-12"; sha256="02v29am4fac3fyq6y1w6r89zwbqqkxjsxrafcwb5s124ikxyl22f"; depends=[]; }; CalSim = derive2 { name="CalSim"; version="0.3.2"; sha256="1a4w9kh9ykms1i30hhd7h8gdkbfl6g071jmcy26j1sbshxrnq8s1"; depends=[spatstat]; }; Calculator_LR_FNs = derive2 { name="Calculator.LR.FNs"; version="1.3"; sha256="03qg9rnz623dwnp68xhhsh9788s49n6xp0migg1nnjaqhrahlgdd"; depends=[]; }; CalibratR = derive2 { name="CalibratR"; version="0.1.2"; sha256="1hnmhijckxd35h8mhpzqpglk1ykdih2c5kg17myc7cci5xjk9nfr"; depends=[doParallel fitdistrplus foreach ggplot2 pROC reshape2]; }; @@ -697,12 +697,10 @@ in with self; { CausalGAM = derive2 { name="CausalGAM"; version="0.1-4"; sha256="1riz11hfg96iks7734rg692l75nfrd3hmr9gw563j27rkk1nfkl6"; depends=[gam]; }; CausalImpact = derive2 { name="CausalImpact"; version="1.2.4"; sha256="0nszqvaxmz9jrb7wqdmjjplajk8mxpyyl14n2fm5p4pyx8srwphq"; depends=[assertthat Boom bsts dplyr ggplot2 zoo]; }; CausalKinetiX = derive2 { name="CausalKinetiX"; version="0.2.1"; sha256="0haxw4vvbw48hlvsl1d1y3xm48qm5vl0d3k5lj89ajwc618nk5jg"; depends=[cvTools deSolve fda glmnet pspline quadprog randomForest sundialr]; }; - 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]; }; CautiousLearning = derive2 { name="CautiousLearning"; version="1.0.1"; sha256="1m5x93l4bscrpcxk0pva6d6n2qnzhzxh0a6a81p97l8lqgs1qw2q"; depends=[BH Rcpp sitmo spc]; }; CePa = derive2 { name="CePa"; version="0.7.0"; sha256="0jykh0f168azphjd3h1q81wlvj8zn8qy0c4wi275gvw0xwi104mk"; depends=[graph igraph Rgraphviz]; }; CeRNASeek = derive2 { name="CeRNASeek"; version="2.1.2"; sha256="1bjx474wbxs4wxy6j4n578cggmcj0061kbbkyhfif65qbsfgrcf8"; depends=[gtools igraph survival]; }; CenBAR = derive2 { name="CenBAR"; version="0.1.0"; sha256="0qa1jzgvf33fi0vns7v49hjk0wkaxic7dw67m0wr33wjplf93wnh"; depends=[cvTools foreach glmnet MASS mvtnorm survival]; }; - CensMFM = derive2 { name="CensMFM"; version="2.0"; sha256="1p129x2b6avv7h5ifjmkds2yfw0jwm3q1cqyrpy8j9nkli0crg1y"; depends=[ggplot2 gridExtra MomTrunc mvtnorm tlrmvnmvt]; }; CensRegMod = derive2 { name="CensRegMod"; version="1.0"; sha256="0qqwkxn8knhcjb6mph7mp7mma56zxslbvkfgfajq2lq4gbg901y4"; depends=[]; }; Census2016 = derive2 { name="Census2016"; version="0.2.0"; sha256="1c88jmd565v19w8dbvai10f9y5lyfmzsxsjblc3gdykf9kharvcq"; depends=[data_table]; }; CepLDA = derive2 { name="CepLDA"; version="1.0.0"; sha256="15vhk7l5mw2kicw2x60r4z71hc415g8kaf2p06jgf7ykxmzkj7kg"; depends=[astsa class MASS multitaper]; }; @@ -718,7 +716,7 @@ in with self; { CheckDigit = derive2 { name="CheckDigit"; version="0.1-1"; sha256="0091q9f77a0n701n668zaghi6b2k3n2jlb1y91nghijkv32a7d0j"; depends=[]; }; ChemoSpec = derive2 { name="ChemoSpec"; version="5.2.12"; sha256="1qr09n2yc009x8ag0lbmn1m93qhck05jc8vx7j5wfa0g4i1b2r7f"; depends=[ChemoSpecUtils plyr readJDX]; }; ChemoSpec2D = derive2 { name="ChemoSpec2D"; version="0.4.147"; sha256="0rmnkk9ddxr32l09bj8qkh1jpffwkyczjr6vwk1qliwfwsbc78rl"; depends=[ChemoSpecUtils colorspace readJDX]; }; - ChemoSpecUtils = derive2 { name="ChemoSpecUtils"; version="0.4.38"; sha256="1b7czs41jsniw1hnrm1c5z6pc5yiybbdnp2bqr810farmv61slzz"; depends=[plyr]; }; + ChemoSpecUtils = derive2 { name="ChemoSpecUtils"; version="0.4.51"; sha256="0wwzv6qkm6iya6gld1jlxk1hnzf6ndpwjppk93bi6pgjkgjq5i5g"; depends=[plyr]; }; ChemometricsWithR = derive2 { name="ChemometricsWithR"; version="0.1.13"; sha256="166va1g3m1wv21qkmw4wpz0bsrclh3jih8smxphdc13l9pqgclpq"; depends=[devtools kohonen MASS pls]; }; ChillModels = derive2 { name="ChillModels"; version="1.0.2"; sha256="06hgg893anh5z8an4l1xl4liz7d0m79n21h116vkdlymayccydbr"; depends=[]; }; ChoR = derive2 { name="ChoR"; version="0.0-4"; sha256="08mildsx542zfm0kcdakcv7c71hb4jgbcq1lhidf0fz76zj1pzk1"; depends=[commonsMath rJava]; }; @@ -748,6 +746,7 @@ in with self; { ClimMobTools = derive2 { name="ClimMobTools"; version="0.3.2"; sha256="1nsisbqsgwk91by6bx8igf1bn94cbcvnw9dbs7gfb14wnng2422l"; depends=[climatrends httr jsonlite Matrix RSpectra tibble]; }; ClimProjDiags = derive2 { name="ClimProjDiags"; version="0.1.0"; sha256="00w7ffcv9axddjvmc0w58c9ncy8z58lf651c5pxsq7492x3vifcm"; depends=[multiApply PCICt plyr]; }; ClinicalTrialSummary = derive2 { name="ClinicalTrialSummary"; version="1.1.1"; sha256="0b5by4sn9yvrvxr9921yqsgp8ma3g1hi2qbp5j9m836db1zjhyla"; depends=[Rcpp]; }; + ClinicalUtilityRecal = derive2 { name="ClinicalUtilityRecal"; version="0.1.0"; sha256="17xj9cmdkjrzx7mshka2hlkxh8887sprdqix7fd8jcr9bmc6ad9r"; depends=[caret cowplot ggplot2 lattice nloptr]; }; CliquePercolation = derive2 { name="CliquePercolation"; version="0.2.0"; sha256="1zllhl1674734sr0hmfgwdyqlk4rcjdqqrd7rx30llqri478jdff"; depends=[colorspace igraph magrittr Matrix Polychrome qgraph]; }; CloneSeeker = derive2 { name="CloneSeeker"; version="1.0.9"; sha256="0xcdknh2fibg86h2ip8jzsv4sbai1yl19ni3g1h5p0zlyigkhs1s"; depends=[combinat gtools quantmod]; }; CluMP = derive2 { name="CluMP"; version="0.8"; sha256="130aqfxdp1pj5z3hnmy06rp5ywcmr389wn114ja5c2imxxkm3fi3"; depends=[amap data_table dplyr ggplot2 MASS NbClust rlang tableone]; }; @@ -755,7 +754,7 @@ in with self; { ClusBoot = derive2 { name="ClusBoot"; version="1.0"; sha256="1wh9mv932zarl8w098lgv2jpanp6r8nzdkyayv8nxk7nddl0bn1k"; depends=[]; }; ClusVis = derive2 { name="ClusVis"; version="1.2.0"; sha256="06yckdl3gxjia1gjjqpc29lvy4f7qf47fncslng9ggjnks6il145"; depends=[MASS mgcv mvtnorm Rcpp RcppArmadillo Rmixmod VarSelLCM]; }; ClussCluster = derive2 { name="ClussCluster"; version="0.1.0"; sha256="1436849m2mnm8j7lf653zv8lcvvg2ch8kkks4bvr39kx21wxy8ss"; depends=[ggplot2 reshape2 rlang scales VennDiagram]; }; - ClustBlock = derive2 { name="ClustBlock"; version="2.1.1"; sha256="0zgrv0bayrfp7hw14zmfl3752l1kjk27lfdgalbx39rgf4pn245g"; depends=[FactoMineR]; }; + ClustBlock = derive2 { name="ClustBlock"; version="2.2.0"; sha256="07hcgfap2bjcwy8bynz1hk2cb1amli204k2fsjc30m9p7bhyrqs3"; depends=[FactoMineR]; }; ClustGeo = derive2 { name="ClustGeo"; version="2.0"; sha256="1p5k2w1k7hnacbazzj2yhxh4z2jngnsl4v5a9b3c8z1dr4nhcwxc"; depends=[sp spdep]; }; ClustImpute = derive2 { name="ClustImpute"; version="0.1.3"; sha256="1rfs8vbpqjskl5ap12x6qmxg4ygaaycaas8x3ylaqvlvyy9ywhki"; depends=[ClusterR copula dplyr magrittr rlang]; }; ClustMMDD = derive2 { name="ClustMMDD"; version="1.0.4"; sha256="0sblf3crpai53dflhyi27yn6mg0xyy9dxhwsk8j57sq5vr50x686"; depends=[Rcpp]; }; @@ -767,7 +766,7 @@ in with self; { ClusterRankTest = derive2 { name="ClusterRankTest"; version="1.0"; sha256="01gzalhibqcdx3a6yc2cm1v77rscva73v5m5m0qkrgqdp9c8ph2a"; depends=[]; }; ClusterStability = derive2 { name="ClusterStability"; version="1.0.3"; sha256="1laa5m3y1rc7jr8q3i9qb3izs7qmadz169w9xm8q3mm3834ngn9b"; depends=[cluster clusterCrit copula Rcpp WeightedCluster]; }; ClusteredMutations = derive2 { name="ClusteredMutations"; version="1.0.1"; sha256="1n31nnvpjh1faw751k8m3ga3wfl0yhdpnszwckqhfzlma1jr8z04"; depends=[seriation]; }; - Clustering = derive2 { name="Clustering"; version="1.1"; sha256="0qc01bgvf7r7v2y24w4g6ha56mr2p7ng23g406pfnj3vykki8h0w"; depends=[advclust amap apcluster cluster ClusterR data_table gama gmp pracma pvclust sqldf xtable]; }; + Clustering = derive2 { name="Clustering"; version="1.6"; sha256="0r0awijhzv611qf2r2n1xwd369s9719r5hfvw2hipiy0jssfqfbv"; depends=[advclust amap apcluster cluster ClusterR data_table gama ggplot2 glue gmp pracma pvclust sqldf xtable]; }; CoClust = derive2 { name="CoClust"; version="0.3-2"; sha256="04xv807785xv9kdspsspx1302ardv8gda06kd590lgawjixai7dh"; depends=[copula gtools]; }; CoDiNA = derive2 { name="CoDiNA"; version="1.1.1"; sha256="00kda4grizdgh9xs0vywg9npjj7i97vbdf0hvzl96657rcillwdh"; depends=[data_table igraph magrittr plyr visNetwork]; }; CoFRA = derive2 { name="CoFRA"; version="0.1002"; sha256="0ldf84dxaanww3qkf64mz5gv3yv2rjp9m6dy64xckds66vw6x0m3"; depends=[gplots stringr]; }; @@ -867,7 +866,7 @@ in with self; { CropDetectR = derive2 { name="CropDetectR"; version="0.0.1"; sha256="14sabqld94if7f2m39bh6652cb62hcwx53k8q5k23anzzsn93qlj"; depends=[dplyr EBImage imager reshape2]; }; CrossClustering = derive2 { name="CrossClustering"; version="4.0.3"; sha256="05lbdmblwmmv24h46ixxabbrp7mpajyv7raw1p5h0dmsbfbq9hi5"; depends=[assertive cli cluster crayon dplyr flip glue magrittr mclust purrr]; }; CrossScreening = derive2 { name="CrossScreening"; version="0.1.1"; sha256="1gig80r8p611ysn35ajx7xdjj5wnkcf1vspcf0i06dmh75xpm3w9"; depends=[plyr tables]; }; - CrossVA = derive2 { name="CrossVA"; version="0.9.9"; sha256="0k2czhnb3jws86p2iv9fv3qarxbh1dd4xxnv2hdwz0y82y6mkkvx"; depends=[stringi]; }; + CrossVA = derive2 { name="CrossVA"; version="0.10.0"; sha256="08mq8d6la5gz3yv5a3lc70dxdgf29q1vngi8lrgdy58p9415pxjv"; depends=[stringi]; }; CrossValidate = derive2 { name="CrossValidate"; version="2.3.4"; sha256="1q5wnw2llvlw3hbjg0zccipk3ns31m2339x1aj6m526zhvgl2wvx"; depends=[Modeler oompaBase]; }; CryptRndTest = derive2 { name="CryptRndTest"; version="1.2.2"; sha256="1cg0agwqp1f7pgxdf9wilwparklyfsv900r47fpihnqw3ycvbdai"; depends=[gmp kSamples LambertW MissMech Rmpfr sfsmisc tseries]; }; CrypticIBDcheck = derive2 { name="CrypticIBDcheck"; version="0.3-3"; sha256="1c7n020i9lxp0fam05k9v4az4rvx8fakhzi9fkma82smpl709x8q"; depends=[car chopsticks ellipse rJPSGCS]; }; @@ -875,7 +874,7 @@ in with self; { Cubist = derive2 { name="Cubist"; version="0.2.3"; sha256="1x71n72n12alyl7d9vdf3xb3ks14lql4pxxxnimk2gq7brc5z10r"; 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.2"; sha256="0pgarrk6znfsl75bq8rvrfl371cs5qjy9xb8zp607pwlprwapvfp"; depends=[BH bit ff ffbase MASS Matrix Rcpp RcppEigen survival]; }; + Cyclops = derive2 { name="Cyclops"; version="2.0.3"; sha256="1gbr9v2qs542c128zmx8nwvccfc1d5gnmhaiy2pb6hj0cqy5fjzb"; 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]; }; @@ -888,11 +887,11 @@ in with self; { DAIME = derive2 { name="DAIME"; version="2.1.3"; sha256="099pbzgryz9lxhcqlrywcv8zl5af4ir5dyyqvgc16xi5bddxk7ld"; 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="1.0.1"; sha256="1jbyn57vn6d281a5y15h5d8ljin8cdb9lr7lbgggc950blyfv4g0"; depends=[ggplot2]; }; + DALEX = derive2 { name="DALEX"; version="1.2.0"; sha256="0mfcci54622gnk8al9fl2jhs9i2vfly7lam04y5rdacbyiam49j6"; depends=[ggplot2 iBreakDown ingredients]; }; DALEXtra = derive2 { name="DALEXtra"; version="0.2.1"; sha256="0r1vdjphmfwa95fpd3fx2hqfb23gb4i920j8l8xxraadr9hdac32"; depends=[DALEX ggdendro ggplot2 glmnet gridExtra reticulate]; }; DALY = derive2 { name="DALY"; version="1.5.0"; sha256="1v7ld01xcn5jiygl1c3xhd5h71ip90lks87fs9gmpnivp8jz5cr5"; depends=[]; }; DAMOCLES = derive2 { name="DAMOCLES"; version="2.2"; sha256="1rmm36k5w6y8pkb1vzkxnizx3my94kgai8h3x83cxr6mlbgn9lb8"; depends=[ape caper DAISIE DDD deSolve expm Hmisc Matrix matrixStats picante]; }; - DAMisc = derive2 { name="DAMisc"; version="1.5.3"; sha256="1lfhbynzbynaspgwc11prj0sd019nq7a7hhydim3znjb3i5q30z5"; depends=[AICcmodavg boot car clarkeTest coda effects fANCOVA gdata ggplot2 glue lattice latticeExtra MASS nnet optiscale rstan VGAM xtable]; }; + DAMisc = derive2 { name="DAMisc"; version="1.5.4"; sha256="1xs9jibpxg6py9ry4mad2yj4x99jnv19df0d6f9yc760wipb5ymk"; depends=[AICcmodavg boot car clarkeTest coda effects fANCOVA gdata ggplot2 glue lattice latticeExtra MASS nnet optiscale rstan xtable]; }; DAP = derive2 { name="DAP"; version="1.0"; sha256="0zzb05yxfaqp6qnr979q20rqy8sl5l825mxs0x9366qr7mz5k5ws"; depends=[MASS]; }; DBEST = derive2 { name="DBEST"; version="1.8"; sha256="1a598g02hpfgv572gchllqkppynnsp4lx764jg0g66w3b66k0kdy"; depends=[zoo]; }; DBGSA = derive2 { name="DBGSA"; version="1.2"; sha256="04zqh9y3nqcdzs5jn8aaq5idy9zl450ikvl788xs860wlg692qv2"; depends=[fdrtool]; }; @@ -903,13 +902,13 @@ in with self; { DCA = derive2 { name="DCA"; version="2.0"; sha256="1acy33vyf814kr0aj6kdvi9f1qzgynwwzv57ll01gd0iqq36374f"; depends=[coin elasticnet GPArotation locfdr modeest mvtnorm PMA]; }; DCCA = derive2 { name="DCCA"; version="0.1.1"; sha256="06xdx79r7dr14dlk5vgcyd8ar4sc72imlyk66bnia1kvlynvdy69"; depends=[checkmate]; }; 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="2.0.1"; sha256="1ma6f7233jm0rzm12f406scgrj4b6xnv39aaplpgcvpx160nv3j1"; depends=[MASS matrixcalc mvtnorm Rcpp]; }; + DCEM = derive2 { name="DCEM"; version="2.0.2"; sha256="0wzbjy70h9agfpmpc5v3y8cdj4d7w2kqq1vmhfsz7vhpxpd1ygd0"; depends=[MASS matrixcalc mvtnorm Rcpp]; }; DCG = derive2 { name="DCG"; version="0.9.3"; sha256="08718x6v3g7kpfv0gpgm19cn3d3ynj7yagzs0jic1j5rwvn04pfb"; 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]; }; DCM = derive2 { name="DCM"; version="0.1.1"; sha256="191gwfv30hdr789jmdrimcc7aqisz635anydsw2v4s28a3zjbipw"; depends=[gWidgets pander readxl]; }; DCODE = derive2 { name="DCODE"; version="1.0"; sha256="19dwms88q0ylxd92l3ivig8p8jjyhk8mhgz0l36m9pcq11gyjc0n"; depends=[seqinr]; }; - DCPO = derive2 { name="DCPO"; version="0.5.0"; sha256="03j0aibh70ghh4nkna1iqsbylih3nc85zv9cb91mc4fp9ygcicag"; depends=[beepr BH dplyr forcats janitor purrr Rcpp RcppEigen rstan rstantools StanHeaders tibble tidyr]; }; + DCPO = derive2 { name="DCPO"; version="0.5.1"; sha256="0kkp59qmr4lpggb3fzp28dxc3vdv32dyy6myv92rrf4s3lyzdxab"; depends=[beepr BH dplyr forcats janitor purrr Rcpp RcppEigen rstan rstantools StanHeaders tibble tidyr]; }; DCchoice = derive2 { name="DCchoice"; version="0.0.16"; sha256="0wwhdpljg1k70kydhh89lk6c461a9vjw6p2ijzhvgkv2pl5rxaag"; depends=[Formula interval MASS]; }; DChaos = derive2 { name="DChaos"; version="0.1-3"; sha256="12qi8m2rvd5r8clmi44hiwpnr6zf1sjw35wvbvm4nz3431xwf4ng"; depends=[entropy NeuralNetTools nnet outliers pracma sandwich xts zoo]; }; DCluster = derive2 { name="DCluster"; version="0.2-7"; sha256="008nyry64s5g80narcc58273v0jhqzfgwynka6mh7jgi7qsqnxjd"; depends=[boot MASS spdep]; }; @@ -931,19 +930,20 @@ in with self; { DET = derive2 { name="DET"; version="2.0.2"; sha256="01vyb3mv4g7zpk7cn44i4069ndk9sn9qqs9k52clqbnf1kl1ynbx"; depends=[doParallel pROC]; }; DEoptim = derive2 { name="DEoptim"; version="2.2-5"; sha256="0nlm2gdvd33yrwambmlrgj76inxz2a65ya7727l98fd4skfdw4mf"; depends=[]; }; DEoptimR = derive2 { name="DEoptimR"; version="1.0-8"; sha256="1vz546hyjyhly70z62h5n3mn62b8llhhmim8ffp9y6jnnb0i2sc4"; depends=[]; }; + DEploid = derive2 { name="DEploid"; version="0.5.3"; sha256="0k5bcpfwf9fhkv0wp6s1nvp4l6xgwmdbz3l8mmiy8q1ym7gpvwml"; depends=[htmlwidgets magrittr plotly Rcpp rmarkdown scales]; }; DFA_CANCOR = derive2 { name="DFA.CANCOR"; version="0.1.6"; sha256="0pyql8xms08qn8kzf1h984ik1pbyy8z1wa1lf588pb6clwmd2mk8"; depends=[MASS MVN]; }; DFIT = derive2 { name="DFIT"; version="1.0-3"; sha256="1h0wvcplb7j7dqz9hkaw30x92ngxzkdvkwpg0142hrqb201zfrac"; depends=[ggplot2 mvtnorm simex]; }; DGCA = derive2 { name="DGCA"; version="1.0.2"; sha256="0k2a24ycagyxdx54dh9w8km25xhmmmhyyl26g76z4g5gqvcw092k"; depends=[matrixStats WGCNA]; }; DGLMExtPois = derive2 { name="DGLMExtPois"; version="0.1.2"; sha256="11gfj1pnfk9f8ap66yswbc1pq6k2n6893jadh2nvnhlkdk47bm28"; depends=[COMPoissonReg nloptr progress]; }; DGM = derive2 { name="DGM"; version="1.7.2"; sha256="0z0f8bazzsahvjkpfif50db700mqb7arcglwsfxcar9qdy082vsn"; depends=[data_table ggplot2 Rcpp RcppArmadillo reshape2]; }; DGVM3D = derive2 { name="DGVM3D"; version="1.0.0"; sha256="17cxv8rm7kmxms7v7hzbwbdwa3xl1hwgiljf97ppwswglqyik9iv"; depends=[rgl]; }; - DHARMa = derive2 { name="DHARMa"; version="0.2.7"; sha256="13gs6v5z7lwjas7ln6nnlw125scmk517ma0y3jiwj1rn4vnhy41m"; depends=[ape doParallel foreach gap glmmTMB lme4 lmtest MASS mgcv qrnn sfsmisc spaMM]; }; + DHARMa = derive2 { name="DHARMa"; version="0.3.0"; sha256="160265r53b78lmgn9ynh0f2mqlb632rw8rvkpc72x9kwi7qw4yhw"; depends=[ape doParallel foreach gap glmmTMB lme4 lmtest MASS mgcv qgam sfsmisc spaMM]; }; DHBins = derive2 { name="DHBins"; version="1.1"; sha256="1g69acac7pxw8x0d9czyds7xljhbv9d686c99a3y8b4vh7dnx62s"; depends=[ggplot2]; }; 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]; }; DIFplus = derive2 { name="DIFplus"; version="1.1"; sha256="1k03lr437gx5y762z3h40hz9kcl4m8xgrndxvbyvsgmn2h6pbwsd"; depends=[plyr TestDataImputation]; }; - DIFtree = derive2 { name="DIFtree"; version="3.1.4"; sha256="1q02229vlmyxqasbxiscxvqpcip1r0sbwbp7ja909ljhc5b76pr8"; depends=[gridBase penalized plotrix VGAM]; }; + DIFtree = derive2 { name="DIFtree"; version="3.1.5"; sha256="110m24brsyvkvc03b9i48alg0x2ya69bz79c4cwi2bwr1cb2xfq1"; depends=[gridBase penalized plotrix VGAM]; }; DIME = derive2 { name="DIME"; version="1.2"; sha256="11l6mk6i3kqphrnq4iwk4b0ridbbpg2pr4pyqaqbsb06ng899xw0"; depends=[]; }; DIMORA = derive2 { name="DIMORA"; version="0.1.0"; sha256="0qcy2pqpx7za4ckf6wvmbhz5a52j44ksn81f8j1lj0z90idj6psn"; depends=[minpack_lm numDeriv]; }; DIRECT = derive2 { name="DIRECT"; version="1.0.1"; sha256="00z4xlc9kxn19lw2b8xq6krsf5v3wfbr1ghl5ah5shr9dnv84lc1"; depends=[]; }; @@ -951,7 +951,7 @@ in with self; { DIconvex = derive2 { name="DIconvex"; version="1.0.0"; sha256="0bnrq9nmryshir6ll43nz20aaqmmw0zjvfml72cpwbvrma8a3qmz"; depends=[lpSolveAPI]; }; DJL = derive2 { name="DJL"; version="3.2"; sha256="0vagpvmnbpnlxa1gj3y3gp0npf8hvpn8lyjrcggdn58rbcm2z3q9"; depends=[car lpSolveAPI]; }; DLASSO = derive2 { name="DLASSO"; version="2.0.2"; sha256="0xdygf6h89d9z4kqb46iqfxgdzq9dmkrxf9ypw78l4d8n9xx2gaa"; depends=[MASS]; }; - DLMtool = derive2 { name="DLMtool"; version="5.4.2"; sha256="0ja0729wsjwannjffz0mv0m6f7sq6sy14c1pbpbjm1547d9v01bn"; depends=[abind dplyr ggplot2 Rcpp RcppArmadillo snowfall]; }; + DLMtool = derive2 { name="DLMtool"; version="5.4.3"; sha256="0gyzwx419cby9x82i5r8xx6g7m97naj47lkay5kq5943sk7b3dvz"; depends=[abind dplyr ggplot2 Rcpp RcppArmadillo snowfall]; }; DMMF = derive2 { name="DMMF"; version="0.5.1.2"; sha256="0p82cfp0561j4ki20rznx46z7vqdxh128a0m0zj8d2wp3csn1aag"; depends=[raster rgdal sp]; }; DMRMark = derive2 { name="DMRMark"; version="1.1.1"; sha256="15wr6j0v9kvbv8y6flkp4svfqy059ziv89nxv91vp0pjmavhpdlz"; depends=[ellipse MCMCpack mvtnorm]; }; DMRnet = derive2 { name="DMRnet"; version="0.2.0"; sha256="1rbba8w4li240gw5z675d7skm72rh0zxzp4rhsn6ivj72jya7jw4"; depends=[glmnet grpreg]; }; @@ -973,7 +973,6 @@ in with self; { DPQ = derive2 { name="DPQ"; version="0.3-5"; sha256="0952aq9nh18mwldcxdi170i6aqz6snnsvl5g6qm8jq2m1i9jryjw"; depends=[sfsmisc]; }; DPWeibull = derive2 { name="DPWeibull"; version="1.5"; sha256="1dxrhd3wklg7q3grvplas6wcbs05kga1b2va6d0wkynld01ww9ii"; depends=[binaryLogic Rcpp truncdist]; }; DPtree = derive2 { name="DPtree"; version="1.0.1"; sha256="0d7zf695lwkx4gv50f08cbi3p3mjjay0qgrbmvybf9m15i4zmyd7"; depends=[MASS MCMCpack plyr Rdpack]; }; - DRAFT = derive2 { name="DRAFT"; version="0.3.0"; sha256="02y644fl5dk3qwvv45vb2zkkp4x1zciickna0pj56myh7ls08hxv"; depends=[coda ggplot2 gridExtra lubridate reshape]; }; DRAYL = derive2 { name="DRAYL"; version="1.0"; sha256="0cf5pyx6nwh8srdylpnmymv3dr67fm6qqpwd1hvj1wmyfc8fznpp"; depends=[cubature pracma RConics rmutil]; }; DREGAR = derive2 { name="DREGAR"; version="0.1.3.0"; sha256="15cplshs85r0z659mc7xmj5db7vc95wxs01c34isc22p8z0a287i"; depends=[msgps]; }; DRHotNet = derive2 { name="DRHotNet"; version="1.1"; sha256="040g9h2a2hmnd20y41xnms01iam68f6xhp2x0ckarmx961995bhg"; depends=[maptools PBSmapping raster sp spatstat spdep]; }; @@ -986,6 +985,7 @@ in with self; { DSBayes = derive2 { name="DSBayes"; version="1.1"; sha256="0iv4l11dww45qg8x6xcf82f9rcz8bcb9w1mj7c7ha9glv5sfb25v"; depends=[BB]; }; DSI = derive2 { name="DSI"; version="1.0.0"; sha256="0dc9xhmz4pg5d8pm2wiya7b0m793kx1campnaxl8mcs2gvdfahm9"; depends=[progress R6]; }; DSL = derive2 { name="DSL"; version="0.1-7"; sha256="05wj3zypr2kqfbka930qnwnk2r43pqi13pbs5n6lm8vdq4zjblw4"; depends=[]; }; + DSLite = derive2 { name="DSLite"; version="1.0.0"; sha256="05dd3bdlk0xsl5d6pc1sfraypjjppfpairg4k9vh1ca4a3cq8sr8"; depends=[DSI R6]; }; DSSAT = derive2 { name="DSSAT"; version="0.0.1"; sha256="06a5n484pc49ynrzaf3fm04884z6qwhd6kw0n4834fynpnflkkym"; depends=[dplyr glue lubridate purrr readr rlang stringr tidyr]; }; DSpat = derive2 { name="DSpat"; version="0.1.6"; sha256="1v6dahrp8q7fx0yrwgh6lk3ll2l8lzy146r28vkhz08ab8hiw431"; depends=[mgcv RandomFields rgeos sp spatstat]; }; DSpoty = derive2 { name="DSpoty"; version="0.1.0"; sha256="18z8gk3zj7k2szxg9579qy5klrqjw6zsk5x9jmwrv4qhb98fyji6"; depends=[dplyr httr purrr stringr]; }; @@ -1001,7 +1001,7 @@ in with self; { DTK = derive2 { name="DTK"; version="3.5"; sha256="0nxcvx25by2nfi47samzpfrd65qpgvcgd5hnq9psx83gv502g55l"; depends=[]; }; DTMCPack = derive2 { name="DTMCPack"; version="0.1-2"; sha256="0bibas5cf06qq834x9q2l2fyh6q9wrg07k8cn6almcyirzax6811"; depends=[]; }; DTR = derive2 { name="DTR"; version="1.7"; sha256="1lzvk9ar6xf3n2vvy8vb9mvrbx3nafzzhvz5g7vf79jd71yz54jd"; depends=[aod ggplot2 survival]; }; - DTRlearn2 = derive2 { name="DTRlearn2"; version="1.0"; sha256="0aly8byygpgsjfa1lzarcig2dvz852ihdlw7xhb7kx62y8prjzz1"; depends=[foreach glmnet kernlab MASS Matrix]; }; + DTRlearn2 = derive2 { name="DTRlearn2"; version="1.1"; sha256="0l756zb1wkpa1z5zjkc8jndmh2630gckxxfqslabzjmgsjf7fjgm"; depends=[foreach glmnet kernlab MASS Matrix]; }; DTRreg = derive2 { name="DTRreg"; version="1.5"; sha256="0milc5bmks6pxhl5f3zyv3w80ld733v05cvx8i531v2ynac4v6zb"; depends=[]; }; DTSg = derive2 { name="DTSg"; version="0.4.0"; sha256="0if4h5660wl5pb187lfhv00gdr9wp43w5xk1g4hf83jbnq06q424"; depends=[checkmate data_table R6]; }; DTWBI = derive2 { name="DTWBI"; version="1.1"; sha256="06lp4yc5nhacrgic78l014g2w1ibwgs8dp8zrahk5aripaczl25y"; depends=[dtw e1071 entropy lsa rlist]; }; @@ -1069,7 +1069,7 @@ in with self; { Devore7 = derive2 { name="Devore7"; version="0.7.6"; sha256="1m18p8h9vv4v0aq2fkjyj39vzb8a09azbbczhfiv4y88w540i8nw"; depends=[lattice MASS]; }; Dforest = derive2 { name="Dforest"; version="0.4.2"; sha256="19jyph2zqfyq9vv22kb6fqy89l0vcviv19zgk10hbd7q850f6ryn"; depends=[ggplot2 rpart]; }; DiPhiSeq = derive2 { name="DiPhiSeq"; version="0.2.0"; sha256="11l2inf99vxz9k292307j8c2b25kc1066svy3vxrfl72rrm4fqa7"; depends=[]; }; - DiPs = derive2 { name="DiPs"; version="0.6.0"; sha256="03mi4f56896mnj5g0k7zdh90qcn3ahdxf62mvjy03ajvsdradm4p"; depends=[liqueueR mvnfast plyr]; }; + DiPs = derive2 { name="DiPs"; version="0.6.1"; sha256="0r6r0i417z4ax7cw1a7jbjhi0h2i2n43vf0y4770hyrl3m6spwfj"; depends=[liqueueR mvnfast plyr]; }; DiSSMod = derive2 { name="DiSSMod"; version="1.0.0"; sha256="199yipbc2sx2lsl51rpfyh80bfxaahfd2llqmfsp946gvj7339hv"; depends=[MASS matrixcalc psych sfsmisc]; }; DiagrammeR = derive2 { name="DiagrammeR"; version="1.0.5"; sha256="0d73aiv4fra1xwq63n3139anp479ni7dh370lxc3rc15g5qayxq8"; depends=[downloader dplyr glue htmltools htmlwidgets igraph influenceR magrittr purrr RColorBrewer readr rlang rstudioapi scales stringr tibble tidyr viridis visNetwork]; }; DiagrammeRsvg = derive2 { name="DiagrammeRsvg"; version="0.1"; sha256="0j2cm1mx3zrb2k3pcrb96z2z3kws61gyyjsjjv5rqcb5lzdgi65k"; depends=[V8]; }; @@ -1080,7 +1080,7 @@ in with self; { DiceOptim = derive2 { name="DiceOptim"; version="2.0"; sha256="1hx4379yb6d36c494qc237vld4jnfxq18m994p5ii9ks6s7amifn"; depends=[DiceDesign DiceKriging mnormt pbivnorm randtoolbox rgenoud]; }; DiceView = derive2 { name="DiceView"; version="1.3-2"; sha256="0ny9gbaycrq3lr4gqil1yyhkkyxmabl8w6cmkkzlx3yaara0idkf"; depends=[DiceEval DiceKriging rgl]; }; DidacticBoost = derive2 { name="DidacticBoost"; version="0.1.1"; sha256="0z1h61n6nfjvb64fgkzi1sq7ag747crhh593hxkx0cpza29778rz"; depends=[rpart]; }; - Diderot = derive2 { name="Diderot"; version="0.12"; sha256="1cq8yk4r0csnslp286hzs04zzq44q0frz0kyll9jhqjil34qh0x7"; depends=[data_table doParallel foreach igraph RCurl splitstackshape stringi]; }; + Diderot = derive2 { name="Diderot"; version="0.13"; sha256="04d1drxn99r0fqq3zym7yyip9c8rfqhghq20q4zyb42l3hfgv9ai"; depends=[data_table doParallel foreach igraph RCurl splitstackshape stringi]; }; DiffCorr = derive2 { name="DiffCorr"; version="0.4.1"; sha256="1kxp9dbiww086rmvmjvfhbk7jl36dkj88qwii6zg57llf7l5l4hm"; depends=[fdrtool igraph multtest pcaMethods]; }; DiffNet = derive2 { name="DiffNet"; version="1.0-0"; sha256="04dvf0qxnc6jizwfjxw731j7d2fxyapk06rmqvga6h3p075q0mqk"; depends=[data_table doParallel foreach gplots Hmisc igraph lsa Matrix qlcMatrix Rcpp RcppEigen]; }; DiffXTables = derive2 { name="DiffXTables"; version="0.1.0"; sha256="1la512kvq1ziw1b3zzn2khh4cjcq2lwq1r17b84x7f4spbfp5l2b"; depends=[]; }; @@ -1113,7 +1113,7 @@ in with self; { DiversityOccupancy = derive2 { name="DiversityOccupancy"; version="1.0.6"; sha256="16x3fpchgd12mccvr1k11vjka97sy5vjvjcyd5y3pskgnpycc2sv"; depends=[dplyr ggplot2 glmulti MuMIn qpcR raster unmarked vegan]; }; DnE = derive2 { name="DnE"; version="2.1.0"; sha256="02cbfb3m9xf24wkgqc06k3k0rx7qlqh4ma43khg6fpvif6yyahrn"; depends=[]; }; DoE_MIParray = derive2 { name="DoE.MIParray"; version="0.13"; sha256="0lbcqfizgrnqmp0b2yn14br7xmabbhywy8h7161hx6hnvnam5r99"; depends=[combinat DoE_base]; }; - DoE_base = derive2 { name="DoE.base"; version="1.1-4"; sha256="0x50fjjg5kjinr2yjwb84icw86nhcgc5dv26z1h44bcwablcz74n"; depends=[combinat conf_design lattice MASS numbers partitions vcd]; }; + DoE_base = derive2 { name="DoE.base"; version="1.1-5"; sha256="15m1axp8wpvqdly62chb4p0jzfvmkma6bsw8gagzwm9ibh6xwmkq"; depends=[combinat conf_design lattice MASS numbers partitions vcd]; }; DoE_multi_response = derive2 { name="DoE.multi.response"; version="0.1.0"; sha256="1289jlp10999kvyg5adw3dyc2mhh20i6biyqjbxd6g80a8dajknx"; depends=[DoE_wrapper]; }; DoE_wrapper = derive2 { name="DoE.wrapper"; version="0.11"; sha256="08bgfaiivqqnkhjb18flk1cpa33rh70i6g8v25x1ma3ffxqrwh96"; depends=[AlgDesign DiceDesign DoE_base FrF2 lhs rsm]; }; DoEstRare = derive2 { name="DoEstRare"; version="0.2"; sha256="0y9ymw7114jk1rwiasq400bpgvkxv6rpc954c7v9mgxd3c2nfza7"; depends=[]; }; @@ -1141,7 +1141,7 @@ in with self; { DynTxRegime = derive2 { name="DynTxRegime"; version="4.3"; sha256="1la4y560rcs163cqmvpwsb1n70n6714kprdxpnkd849caaa93zir"; depends=[dfoptim kernlab modelObj rgenoud]; }; DynaRankR = derive2 { name="DynaRankR"; version="1.1.0"; sha256="1fzicainh1dm016cglm2x6j1i2g5r71vgrj0dnsflbxc5v426sqm"; depends=[dplyr rlang]; }; DynamicDistribution = derive2 { name="DynamicDistribution"; version="1.1"; sha256="1s78hpj2pxjs4vixin1i816qjbn3wk7b8rd2zdjp4d4rbxifcqf5"; depends=[]; }; - DynamicGP = derive2 { name="DynamicGP"; version="1.1-5"; sha256="12y56anyi3amn7czwkk4qakmgqq0mf80xrhb8ccy1sxzk7k86pfz"; depends=[lhs]; }; + DynamicGP = derive2 { name="DynamicGP"; version="1.1-6"; sha256="1d3ycx6vcv7rcagaxvfyxgsdigbzigxarm66ypkdasbli1507is3"; depends=[lhs]; }; E4tools = derive2 { name="E4tools"; version="0.1.1"; sha256="1kmj1fddybjia9ninhcy75kdmq152zjw7s24chpqr5wsblffr3yx"; depends=[accelerometry anytime BBmisc chron data_table DataCombine doParallel doSNOW foreach ggplot2 hms scales signal]; }; EAinference = derive2 { name="EAinference"; version="0.2.3"; sha256="1kzcfya3z6rf1vqjn72yjymdhrn4dzgmwifh3w6k22cy5jxffzn4"; depends=[hdi limSolve MASS msm mvtnorm Rcpp RcppArmadillo]; }; EBASS = derive2 { name="EBASS"; version="0.1"; sha256="14hxzj06wrc4ihflr7dqk28fsjwbcizr0jy54vhv0mk1y1gd4201"; depends=[]; }; @@ -1161,9 +1161,8 @@ in with self; { EDISON = derive2 { name="EDISON"; version="1.1.1"; sha256="12cc13ng5fc4nm0nvqxqplpb2ycz4cln73xqkk85dka2fnpykjc7"; depends=[corpcor MASS]; }; EDMeasure = derive2 { name="EDMeasure"; version="1.2.0"; sha256="1gyv86vip0a3939dbbwz29xkqzncw24r68fzykdjnv3b995510iv"; depends=[dHSIC energy rBayesianOptimization]; }; EDOIF = derive2 { name="EDOIF"; version="0.1.1"; sha256="0lhaajiq01rrvpp2xq2n6ka7pd4xz0spxrf1xv8ljpi2w9kk4p7l"; depends=[boot distr ellipsis ggplot2 igraph simpleboot]; }; - EDR = derive2 { name="EDR"; version="0.6-7"; sha256="17rdqggladlnziql7s7iy2pgqv5n2parwsllsy3b358y0cc1bxdn"; depends=[sm]; }; EEM = derive2 { name="EEM"; version="1.1.1"; sha256="0w20kakgcpyhfi7fcrss4w67pbaj87hi2scy7g05q3sg2ygac7gj"; depends=[colorRamps ggplot2 R_utils reshape2 sp]; }; - EFA_MRFA = derive2 { name="EFA.MRFA"; version="1.0.7"; sha256="0vblfagcr9zqdzygjrbbgg2pdd9v058ryac5mzy2ry02m534iadm"; depends=[ggplot2 optimbase PCovR psych reshape2 scales]; }; + EFA_MRFA = derive2 { name="EFA.MRFA"; version="1.0.9"; sha256="0id0dhpq9350ax573i769m83fncrd6rlp4qmwvf9jz1lbksighf0"; depends=[ggplot2 optimbase PCovR psych reshape2 scales]; }; EFAutilities = derive2 { name="EFAutilities"; version="2.0.0"; sha256="1vbpz9papk6vvch3kb2qm6nspa4llp4mpck6ky1j8kvkhjzm1za0"; depends=[GPArotation mvtnorm plyr]; }; EFDR = derive2 { name="EFDR"; version="1.0"; sha256="1344ysvrniqn1qv2hx9b9afg9fivccfrj393xy9cqz4j395b6jx0"; depends=[copula doParallel dplyr foreach gstat Matrix sp tidyr waveslim]; }; EFS = derive2 { name="EFS"; version="1.0.3"; sha256="1q8cf8dnxpv5s3lr9145y0wjhak4rz18dzah4xfs5qr4c8nlpl54"; depends=[party pROC randomForest ROCR]; }; @@ -1224,6 +1223,7 @@ in with self; { EW = derive2 { name="EW"; version="1.1"; sha256="0wc3v9qisiikvlp28xhlgsxb92fhkm6vslia6d0vpihyai0p1h1g"; depends=[]; }; EWGoF = derive2 { name="EWGoF"; version="2.2.2"; sha256="19gd9grjjdv6hilqj41g5qhz7m0ga40q88clwggbp5f0f1yd5sym"; depends=[Rcpp]; }; EWOC2 = derive2 { name="EWOC2"; version="1.0"; sha256="1x3l332pmh69kl0c1rka264mi69avdm938mzd79ck4y3qcgn07vr"; depends=[MASS rjags]; }; + EWS = derive2 { name="EWS"; version="0.1.0"; sha256="04bsl0s690k2wm7jnvgihj5r1fd1r3s2547j1sgl0zm8yvia2l8x"; depends=[numDeriv]; }; EXRQ = derive2 { name="EXRQ"; version="1.0"; sha256="1iqsr52sl2j5q03122a7rsp6n6a2bkysk2r908c89l36gk4sj2i5"; depends=[mnormt quantreg]; }; EZtune = derive2 { name="EZtune"; version="2.0.0"; sha256="1arrd9zkssb8ixx7r4nxwayksz1mk7jkvlcbm264pv9ya6kh3yrh"; depends=[ada e1071 GA gbm optimx rpart]; }; Eagle = derive2 { name="Eagle"; version="2.2"; sha256="04r2ii4wdxwmx82qd2csiiy6kjim6zmjnp0851qhz9iry84f0g5s"; depends=[data_table ggplot2 ggthemes matrixcalc mmap R_utils Rcpp RcppEigen shiny shinyBS shinyFiles shinyjs shinythemes]; }; @@ -1244,7 +1244,7 @@ in with self; { EcoVirtual = derive2 { name="EcoVirtual"; version="1.1"; sha256="1aryl2sb5ak390lgnm427ilm6xv9lmsjhwdnapzc033zvqb099gj"; depends=[]; }; Ecohydmod = derive2 { name="Ecohydmod"; version="1.0.0"; sha256="0imkzjqp3g28l42jz5m4p85wg5rawmn9hy1wys9xndnaliv6d7r2"; depends=[]; }; EconDemand = derive2 { name="EconDemand"; version="1.0"; sha256="1slpwiaxj7w21zdri9myrzwbwzl62m3cnp0g4fr2rkdlzgb6j5yj"; depends=[]; }; - EdSurvey = derive2 { name="EdSurvey"; version="2.4.0"; sha256="1h27q1qml1ba1b39ymg2ma48738h3027hg5qpxpgkz01xvlzqii3"; 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]; }; + EdSurvey = derive2 { name="EdSurvey"; version="2.5.0"; sha256="09zh0r93a0qkw4glnyrqzxjc13fai5nfjzd9sq06wnl6i9750bmq"; depends=[car data_table Formula glm2 haven LaF lfactors lme4 MASS Matrix NAEPprimer quantreg readxl tibble wCorr WeMix xtable]; }; EditImputeCont = derive2 { name="EditImputeCont"; version="1.1.6"; sha256="1hpm198awl30i7vbg1jk578s2i3f2kskirb33xvampcwn8mz0nhh"; depends=[editrules igraph Rcpp]; }; EffectLiteR = derive2 { name="EffectLiteR"; version="0.4-4"; sha256="17mhp4acj0myr2b54hgbb3wi5j6a6q999nqr9lwcbx3plyrwlljl"; depends=[car foreign ggplot2 lavaan lavaan_survey nnet shiny survey]; }; EffectStars = derive2 { name="EffectStars"; version="1.9-1"; sha256="131w5bdc615gaa2czi4wyc2f96jcg24ahcmggajrvyhxmi6rag5x"; depends=[VGAM]; }; @@ -1260,7 +1260,7 @@ in with self; { EmbedSOM = derive2 { name="EmbedSOM"; version="2.1.1"; sha256="1w61dni4vsglxqdhwdy5dcmzb6hx1wb9fhfki8wmal1yaza23ljy"; depends=[FNN ggplot2 igraph Matrix Rtsne umap uwot]; }; EmiStatR = derive2 { name="EmiStatR"; version="1.2.2.0"; sha256="0xwmwbybiyb9688l5n98vir3rwbbjgpw5qb25p20lhlj1pqg95w1"; depends=[doParallel foreach lattice xts zoo]; }; EmissV = derive2 { name="EmissV"; version="0.665.2.1"; sha256="1525h28xwwq94maj07rnx13l7i9q7wcrssld5q99741clvzrygk0"; depends=[data_table ncdf4 raster sf sp units]; }; - EmpiricalCalibration = derive2 { name="EmpiricalCalibration"; version="2.0.1"; sha256="0k37lncjq14py3fvcr925gh66i31aphkniv5dn86gibxzdvbjnqc"; depends=[ggplot2 gridExtra]; }; + EmpiricalCalibration = derive2 { name="EmpiricalCalibration"; version="2.0.2"; sha256="10as0xl24w9pap26cz21nqgysba70l9s4qxfbia7x0wfsz2s25jf"; depends=[ggplot2 gridExtra]; }; EncDNA = derive2 { name="EncDNA"; version="1.0.2"; sha256="0wy2cmcvyqjhg5mqbvdzmihfv8swx7ym2n9mjdqgx0kgnc7k614y"; depends=[Biostrings]; }; EnergyOnlineCPM = derive2 { name="EnergyOnlineCPM"; version="1.0"; sha256="1a3wvclqdwcvq5inhliwjnd7xzqbjvzs8h8ncy6qlhjq6s5n7nm8"; depends=[energy MASS]; }; EngrExpt = derive2 { name="EngrExpt"; version="0.1-8"; sha256="0zclvckj2i7j4kfs58hcjcl722vl2y6dcnjz238cjfgwv279gqhp"; depends=[lattice]; }; @@ -1279,7 +1279,7 @@ in with self; { EnviroStat = derive2 { name="EnviroStat"; version="0.4-2"; sha256="0ckax6vkx0vwczn21nm1dr8skvpm59xs3dgsa5bs54a3xhn5z9hs"; depends=[MASS]; }; Epi = derive2 { name="Epi"; version="2.40"; sha256="046y10vwks5y84pzccmrn6d4pd6qz70imvp1hw5ywp8fnwzfh4g5"; depends=[cmprsk data_table etm MASS Matrix mgcv numDeriv plyr survival zoo]; }; EpiContactTrace = derive2 { name="EpiContactTrace"; version="0.13.0"; sha256="1m9gawd0fv0pl9q8n9rnid8shdy88kxw4hr5fvvf9ifngf8ffmqa"; depends=[]; }; - EpiCurve = derive2 { name="EpiCurve"; version="2.2-1"; sha256="091q03lak2nfk83s10004qnwdng0gl4z92pc174mc41wns7f5d8v"; depends=[dplyr ggplot2 ISOweek RColorBrewer scales timeDate]; }; + EpiCurve = derive2 { name="EpiCurve"; version="2.3-1"; sha256="0yi49mdij8gx90kbppxdkm0xzaxhr9i7bpgis64vbx4bpy4ynxbb"; depends=[dplyr ggplot2 ISOweek RColorBrewer scales tibble timeDate]; }; EpiDynamics = derive2 { name="EpiDynamics"; version="0.3.1"; sha256="0m6yay3r7dqih19f76wxwgq6dh9p1zmp5d9ilj9nd262q61jcy53"; depends=[deSolve ggplot2 reshape2]; }; EpiEstim = derive2 { name="EpiEstim"; version="2.2-1"; sha256="1a21mskjvyz9qdvl3kkf0p15zn1nx1a49c5djp1lacrn6h7g8k9p"; depends=[coarseDataTools coda fitdistrplus ggplot2 gridExtra incidence reshape2 scales]; }; EpiILM = derive2 { name="EpiILM"; version="1.5"; sha256="0726sb6jisicphchzbcswh8nkgx12cb6sfgwa4ll35nm3vrb5xb1"; depends=[adaptMCMC coda LaplacesDemon]; }; @@ -1287,7 +1287,7 @@ in with self; { EpiModel = derive2 { name="EpiModel"; version="1.7.5"; sha256="0w7r26pcsw785rhd17j0sp840xa4mpsfiq04vk36afv27mgfx6wy"; depends=[ape deSolve doParallel ergm foreach ggplot2 lazyeval network networkDynamic RColorBrewer tergm]; }; EpiReport = derive2 { name="EpiReport"; version="0.1.0"; sha256="1bfh7nrwmplsk7whvmsf0wxg795xrwvarxw974v58mjb282yp87s"; depends=[dplyr extrafont flextable ggplot2 knitr officer png rmarkdown tidyr zoo]; }; EpiSignalDetection = derive2 { name="EpiSignalDetection"; version="0.1.1"; sha256="04bagnx9fs0r3167hmwgc389fl5hq7l4j6kdjjmi360vcaimx9qi"; depends=[dplyr DT ggplot2 ISOweek knitr pander rmarkdown shiny surveillance]; }; - EpiStats = derive2 { name="EpiStats"; version="1.3-1"; sha256="07iz6hhfcawfcb1n9znpafgmmgjgw7pikr71hh5c7f802k1qffw7"; depends=[dplyr epiR]; }; + EpiStats = derive2 { name="EpiStats"; version="1.4-1"; sha256="1i9ymqf0p8wplbmbq4j0ixprjvg22l4z05imxhfj087p3p2sqq8w"; depends=[dplyr epiR]; }; EpistemicGameTheory = derive2 { name="EpistemicGameTheory"; version="0.1.2"; sha256="0b2gnrvhlsw85qv63ib32pj55l7w63wgvbrj5rb209g6h46fby8m"; depends=[lpSolve]; }; Eplot = derive2 { name="Eplot"; version="1.0"; sha256="1glmkjjj432z9g4gi56pgvfrm5w86iplirnd5hm4s99qci2hgc64"; depends=[]; }; Equalden_HD = derive2 { name="Equalden.HD"; version="1.2"; sha256="1lwqnm2xg7x79xajjb4fx5b5yaqs0rn8myb2h52pfgm0v37lzvmb"; depends=[]; }; @@ -1331,18 +1331,18 @@ in with self; { FADA = derive2 { name="FADA"; version="1.3.5"; sha256="0srv3rghbkgyxbcjc1v68c5qgcir1d618skpc8imfmdaz9pnxchn"; depends=[corpcor crossval elasticnet glmnet MASS matrixStats mnormt sda sparseLDA]; }; FAMILY = derive2 { name="FAMILY"; version="0.1.19"; sha256="1912l2zj2cmh8yx8lkg8fpgvfddn6wbi1vrr4yx04mh73gk1s5mk"; depends=[pheatmap pROC]; }; FAMT = derive2 { name="FAMT"; version="2.5"; sha256="0mn85yy9zmiklfwqjbhbhzbawwp2yqrm9pvm8jhasn9c3kw1pcp2"; depends=[impute mnormt]; }; - FAMoS = derive2 { name="FAMoS"; version="0.2.0"; sha256="08xyj7bnkckyk0d0kxkz7nqm7ib5by0wqmx54pwk3ak4mmh9arzi"; depends=[future R_utils]; }; + FAMoS = derive2 { name="FAMoS"; version="0.3.0"; sha256="14gr9wv9bpibk0rrzzwijvdncx1fgnpbv55nqzbb4jhq7fdckmsa"; depends=[future R_utils]; }; FAOSTAT = derive2 { name="FAOSTAT"; version="2.1.2"; sha256="11pmbjz4vkg8a68qfkbqlhnggln1vp8m5pllg2y7wwxxa4ld71qk"; depends=[classInt data_table ggplot2 labeling MASS plyr RJSONIO]; }; FARDEEP = derive2 { name="FARDEEP"; version="1.0.1"; sha256="0blvjakcpkh9vpxryk7qyaqnija0r375ckv37kjlr34xg8pg9qnm"; depends=[nnls preprocessCore]; }; FASeg = derive2 { name="FASeg"; version="0.1.9"; sha256="0lazx8dyycyycr8467m9rkxkxhp4r2w737kpkb40y59wncmbvkik"; depends=[]; }; - FAdist = derive2 { name="FAdist"; version="2.2"; sha256="0nw3w4g7y846bm57xyjnb13g7z746kxf8mb2hnljwwsypcg6i2n8"; depends=[]; }; + FAdist = derive2 { name="FAdist"; version="2.3"; sha256="0vy9yavg5apawjfvch5a7abrmsnx36zhlk8jff3dvcx409lykrrn"; depends=[]; }; FAmle = derive2 { name="FAmle"; version="1.3.5"; sha256="1j6x5bbxnrwp9d6xlxc861xslawzfqhi3d11nphyc97afsz0ymnr"; depends=[mvtnorm]; }; FAwR = derive2 { name="FAwR"; version="1.1.1"; sha256="1hzgaxinq81v4f9743lnlj3bkby8pwmaw1gq0fb4yxazav8y7ihy"; depends=[glpkAPI lattice MASS]; }; FBFsearch = derive2 { name="FBFsearch"; version="1.1"; sha256="17fi501prnwwy5dh7kv7cx2zlz2dknjj542ga024s7jvg7i2rhg0"; depends=[Rcpp RcppArmadillo]; }; FBN = derive2 { name="FBN"; version="1.5.1"; sha256="0723krsddfi4cy2i3vd6pi483qjxniychnsi9r8nw7dm052nb4sf"; depends=[]; }; FCGR = derive2 { name="FCGR"; version="1.0-0"; sha256="015nnnc9fasx0qjrc3lbxv14rqwyx36xzsw9076grwm5pqahrdsb"; depends=[kerdiest KernSmooth MASS mgcv nlme pspline sfsmisc]; }; FCMapper = derive2 { name="FCMapper"; version="1.1"; sha256="1yjh8rs65nqslvwv7x4rif469zds41s7v3vhq6pca1y17kvj2in1"; depends=[igraph]; }; - FCPS = derive2 { name="FCPS"; version="1.1.0"; sha256="0svfd108nr9h45jiarnj686668hbp53g9gkl6kiiyskq3ws6hdn0"; depends=[DataVisualizations ggplot2 mclust]; }; + FCPS = derive2 { name="FCPS"; version="1.2.0"; sha256="0npgr3vd7f5xa02apzyyxbbvr5h6s57hii8sirp76avc1qz2371m"; depends=[DataVisualizations ggplot2 mclust]; }; FCSlib = derive2 { name="FCSlib"; version="1.1.0"; sha256="0sxpzcj6lard3xf24pq42iaryc3idccb076y69swckm0ixhrg85w"; depends=[tiff]; }; FD = derive2 { name="FD"; version="1.0-12"; sha256="0xdpciq14i8rh7v6mw174hip64r7mrzhx7gwri3vp9y7a1380sbi"; depends=[ade4 ape geometry vegan]; }; FDRSeg = derive2 { name="FDRSeg"; version="1.0-3"; sha256="0dh6m5vlx664kryh56jzi3zxydjwa5217nhbwn6adp0q5qdh6d8a"; depends=[Rcpp stepR]; }; @@ -1356,7 +1356,7 @@ in with self; { FField = derive2 { name="FField"; version="0.1.0"; sha256="05q16v2vv64qhbnf2l66dwzmvgzyaq8vxwwdabp534bw7z7zpi8q"; depends=[]; }; FGSG = derive2 { name="FGSG"; version="1.0.2"; sha256="1r3sjhzf9gcnbcx6rqr1s555z8lcwm3fxl096md2jji336ijlk79"; depends=[]; }; FGalgorithm = derive2 { name="FGalgorithm"; version="1.0"; sha256="1dq6yyb3l6c9fzvk9gs6pb240xb5hvc6fh8p3qd3c91b3m289mcc"; depends=[]; }; - FHDI = derive2 { name="FHDI"; version="1.3.2"; sha256="0s1g2ixdfajh99rslpp2p60297f6xcsdnbagqd6zzsl8wywjl9z4"; depends=[]; }; + FHDI = derive2 { name="FHDI"; version="1.4.0"; sha256="1plc4klvjid5ara6ay081xamxr14j3ldgqdm6ni8543cv07zwd74"; depends=[]; }; FHtest = derive2 { name="FHtest"; version="1.4"; sha256="1wsn0j9ydpp9nfswiqg21p09kgkvaq8fh0y0h8syqgizah7i8vs2"; depends=[interval KMsurv MASS perm survival]; }; FI = derive2 { name="FI"; version="1.0"; sha256="17qzl8qvxklpqrzsmvw4wq3lyqz3zkidr7ihxc4vdzmmz69pyh2f"; depends=[]; }; FIACH = derive2 { name="FIACH"; version="0.1.2"; sha256="151lc5m8pb7l07kxljm32zy5kd7a4zr5vgsgwsx7ywhijh0r0585"; depends=[Rcpp RcppArmadillo RNiftyReg tkrplot]; }; @@ -1364,12 +1364,14 @@ in with self; { FITSio = derive2 { name="FITSio"; version="2.1-0"; sha256="021xmbavigg70m96xw1bvsdasi5yj2wmafgb6xw4b09fmyv9hvjp"; depends=[]; }; FKF = derive2 { name="FKF"; version="0.1.5"; sha256="1qzf7y3f4xfirjkm795rcxckjbw6sn7xpilhkyvayqm2vyhf7518"; depends=[RUnit]; }; FKSUM = derive2 { name="FKSUM"; version="0.1.3"; sha256="1zz4hyqlq4517jksgx3jfz9m4gfnp49q272n0m4y9yabsd5fdv3a"; depends=[MASS rARPACK Rcpp RcppArmadillo]; }; + FLAME = derive2 { name="FLAME"; version="2.0.0"; sha256="067yy0b668pj25a0jscpjb98in22048vxs249a7pa4rs2c1cyai9"; depends=[devtools dplyr glmnet gmp magrittr mice rlang tidyr xgboost]; }; FLLat = derive2 { name="FLLat"; version="1.2-1"; sha256="0306bpwp2az4x4m5sv88hlh7vs0y5isfby7lxrn2gjnk76gg6mw1"; depends=[gplots]; }; FLR = derive2 { name="FLR"; version="1.0"; sha256="0k50vi73qj7sjps0s6b2hq1cmpa4qr2vwkpd2wv2w1hhhrj8lm0n"; depends=[combinat]; }; FLSSS = derive2 { name="FLSSS"; version="8.5.6"; sha256="1c6j54ihc385m1f0r86yb83zqv2myfskq48bh9dcynlnc9crs428"; depends=[Rcpp RcppParallel]; }; FLightR = derive2 { name="FLightR"; version="0.4.9"; sha256="0rcnkifq6mi1i5xhk6qy2gl3bry269y4isfr8phl3car0yj39lw1"; depends=[bit CircStats circular fields GeoLight ggmap ggplot2 ggsn maptools mgcv nlme raster RcppArmadillo rgdal rgeos sp truncnorm]; }; FMAdist = derive2 { name="FMAdist"; version="0.1.0"; sha256="0aa4sw93ia6cp386hrq6x448x4w0p6k198rjaqs474j25gqgxrv0"; depends=[EnvStats extraDistr fitdistrplus MASS quadprog STAR]; }; FMC = derive2 { name="FMC"; version="1.0.0"; sha256="1pfqxx7slgcmw4al7i8hy59f4han6b0b7b5az7yh1mscdnghl9bj"; depends=[minimalRSD]; }; + FMCCSD = derive2 { name="FMCCSD"; version="1.0"; sha256="0c50km5ba6biq9p3mycxhy00ij2gr6y5zf3q8ycq0g1mbk8ybfb7"; depends=[numDeriv orthopolynom Rcpp RcppArmadillo splines2]; }; FME = derive2 { name="FME"; version="1.3.6.1"; sha256="065y6r0cwvj1q5i3f88icdf4i47bz33hbhln42gyzqhlavvnj35f"; depends=[coda deSolve MASS minpack_lm minqa rootSolve]; }; FMP = derive2 { name="FMP"; version="1.4"; sha256="0w11a78nz4n7zih9h00xkv7prsy9hlxphbpa7hpnbvq9r98g08qm"; depends=[]; }; FMStable = derive2 { name="FMStable"; version="0.1-2"; sha256="00viigpqfbqc4hyl9cwicbwqf2ksjak28qrqaa16jhbqz93j4fck"; depends=[]; }; @@ -1460,7 +1462,7 @@ in with self; { 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]; }; - FlexScan = derive2 { name="FlexScan"; version="0.1.0"; sha256="02p8rh3krh30hmzykm03qvm0g1qcrqzcgzlzlww61pswd9j1g53m"; depends=[smerc sp spdep]; }; + FlexScan = derive2 { name="FlexScan"; version="0.2.0"; sha256="1jd93h96qhqvk9xx3va78v76fzl6y0rbm85022zpvk3wz4z2g1xs"; depends=[smerc sp spdep]; }; FlickrAPI = derive2 { name="FlickrAPI"; version="0.1.0.0"; sha256="0bbk7ac4s3gbcjhfg3yz06pxjid3hpd0mqzxzlj5sghn95f479h9"; depends=[jsonlite magrittr RCurl stringr]; }; FloodMapper = derive2 { name="FloodMapper"; version="1.0"; sha256="09pr6324namqrwdr2impgqmdmsf34g9pq91091cg9b1031djgzyq"; depends=[magick raster rgdal sp]; }; FlowRegEnvCost = derive2 { name="FlowRegEnvCost"; version="0.1.1"; sha256="0lw4kv4z0s23jy11y53rxxh7zxa7vajxrcnjgxd74xxs64vjlj88"; depends=[zoo]; }; @@ -1484,7 +1486,7 @@ in with self; { FossilSim = derive2 { name="FossilSim"; version="2.1.1"; sha256="1dffk14lszq84k61s1jar658qpjc1hm6rwa1gcwwvppvxj6gkvky"; depends=[ape TreeSim]; }; FourScores = derive2 { name="FourScores"; version="1.5.1"; sha256="1la9d1hfcmi0zg58yl0a7nj36giagh0fwrc7wxyqdq0c7zf1hfzq"; depends=[]; }; FourgameteP = derive2 { name="FourgameteP"; version="0.1.0"; sha256="15yn47737768fkjjv8ykc9lw7x58pq44k90d9d4c9hp20zw5f3by"; depends=[]; }; - FrF2 = derive2 { name="FrF2"; version="2.1-1"; sha256="0xvkhjn1rx7smval6jk78ck0z9qnjrccyrazw6bllss581vqlqjy"; depends=[DoE_base igraph scatterplot3d sfsmisc]; }; + FrF2 = derive2 { name="FrF2"; version="2.2"; sha256="0h3inqnb726mbazj72b6gnbn7mqhd9lrs0x5cragq10szx2hvpa8"; depends=[DoE_base igraph scatterplot3d sfsmisc]; }; FrF2_catlg128 = derive2 { name="FrF2.catlg128"; version="1.2-1"; sha256="0i4m5zb9dazpvmnp8wh3k51bm0vykh4gncnhdg71mfk4hzrfpdac"; depends=[FrF2]; }; FractalParameterEstimation = derive2 { name="FractalParameterEstimation"; version="1.1.2"; sha256="16xm2g723dm1n1h6as6yvy92sigzhj31f269g5rrzqjcd4d5m8an"; depends=[]; }; Fragman = derive2 { name="Fragman"; version="1.0.9"; sha256="03vmvmnyza4i46v1awkdjz6ccbsiq49dm0mlmwsm801rq6yfihgp"; depends=[]; }; @@ -1493,7 +1495,7 @@ in with self; { FreeSortR = derive2 { name="FreeSortR"; version="1.3"; sha256="1m6ahhixbbizzn09pz71zvinrdshn3j6gmy05jdxa9d932agqk0w"; depends=[ellipse smacof vegan]; }; FreqProf = derive2 { name="FreqProf"; version="0.0.1"; sha256="1yqn2435l2sghfcv5mma0rv9yqvpa69z8cqqsjlrlbih9gib82d4"; depends=[ggplot2 reshape2 shiny]; }; Fstability = derive2 { name="Fstability"; version="0.1.2"; sha256="0kscdmrs5namvhi112b47c811w0bg9s3xg48mfa566pxwxz1nv45"; depends=[]; }; - FunChisq = derive2 { name="FunChisq"; version="2.4.9.2"; sha256="1ap8319kfp6kixnj5qyjkxjwr8g5q0wdr10vng6ppjym8p8c6srn"; depends=[BH Rcpp Rdpack]; }; + FunChisq = derive2 { name="FunChisq"; version="2.5.0"; sha256="10x9c8a15qsrhnqmq9bxla4s0fanlys9fdiaacgvgspnc8426ppg"; depends=[BH Rcpp Rdpack]; }; FunCluster = derive2 { name="FunCluster"; version="1.09"; sha256="0i73asn1w4s6ydf2ddn5wpr0mwbbxzgmaly1pslarzkx71wk03fz"; depends=[cluster Hmisc]; }; FuncMap = derive2 { name="FuncMap"; version="1.0.10"; sha256="0iaay6qz9a2s77xjfpp7wm37y7xwnvmlw6s5k5riccmqzc6dcjs7"; depends=[mvbutils]; }; FunnelPlotR = derive2 { name="FunnelPlotR"; version="0.2.3"; sha256="16bw1fx2pzmxm8gavq791drnpsczxq5yyfbnl2h1xcrzlw4fw4b0"; depends=[dplyr ggplot2 ggrepel rlang scales]; }; @@ -1537,25 +1539,27 @@ in with self; { 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.7.9"; sha256="13pmj069r04h38hg61ibyn1ab15zdy9m0qv60vi25ahgsmg6ccvx"; depends=[alabama ggplot2 MASS nloptr numDeriv Rcpp RcppArmadillo Rsolnp shiny shinydashboard]; }; - GE = derive2 { name="GE"; version="0.0.3"; sha256="1w3sm1rqgkcz2ggq8nch7c8p295y8z430a4lrv1wmhnngg48mvhq"; depends=[CGE data_tree DiagrammeR stringr]; }; + GE = derive2 { name="GE"; version="0.0.7"; sha256="0fz90qda36gmdivp12gfxa6xm0fra583676vkcl8arvccqs9cn34"; depends=[CGE data_tree DiagrammeR stringr]; }; GEEaSPU = derive2 { name="GEEaSPU"; version="1.0.2"; sha256="02pwjqd94kranc1f69bx9rzk27kchavhvhl9fygjhrr40nwq3pbg"; depends=[gee Rcpp RcppArmadillo]; }; GEEmediate = derive2 { name="GEEmediate"; version="1.1.3"; sha256="1xprkpjp1pkq4ci1n32d3yy80hx3r4xf2j7f6hv7dvsn4cvdp417"; depends=[gee]; }; GENEAclassify = derive2 { name="GENEAclassify"; version="1.4.18"; sha256="17m58i3jridgxzcckcm0ydd2ijw3zjvg9w4an8j5jbnr62hmcb2s"; depends=[changepoint GENEAread MASS rpart signal]; }; GENEAread = derive2 { name="GENEAread"; version="2.0.8"; sha256="1phiwdq05h92vlrjbvx4xvazzls5bdlnwfxn5mghx0v9j0n3ahrm"; depends=[bitops mmap]; }; GENEAsphere = derive2 { name="GENEAsphere"; version="1.5.1"; sha256="1kgj7i9v2yn0b8lvvsf0nc6lg3i2syrcygwa51pcrzp57vv7hxn5"; depends=[GENEAread ggplot2 MASS misc3d rgl]; }; + GENLIB = derive2 { name="GENLIB"; version="1.0.8"; sha256="16n6i7g60hy43bkx075132k5h6ngz3llv0r91q01cnnqciyph6ka"; depends=[bootstrap doParallel foreach kinship2 lattice Matrix quadprog Rcpp]; }; GENMETA = derive2 { name="GENMETA"; version="0.1"; sha256="1mxwqnbg5bvx1qg62xcd62dl81k11l64yckhl3v854asnaczq3pp"; depends=[magic MASS Matrix]; }; GEOmap = derive2 { name="GEOmap"; version="2.4-4"; sha256="0wk2v0fwcwcm59k711fg829h2w58wkd36im4mg974iai6mqif7qh"; depends=[fields MBA RPMG splancs]; }; GESE = derive2 { name="GESE"; version="2.0.1"; sha256="0h3s2sbnv5wilr2mj6bnl2892p16pxrs341gg6jql1a540p669sk"; depends=[kinship2]; }; GESTr = derive2 { name="GESTr"; version="0.1"; sha256="1q12l2vcq6bcyybnknrmfbm6rpzcmxgq2vyj33xwhkmm9g2ii9k6"; depends=[gtools mclust]; }; - GET = derive2 { name="GET"; version="0.1-6"; sha256="1di2vc6fgbchws6haz7jn840g1pvvy6xlkgjisjp7n312i5mz1fd"; depends=[ggplot2 gridExtra gstat plyr sp spatstat]; }; + GET = derive2 { name="GET"; version="0.1-7"; sha256="0q32a7c09h6qcgyf2xav2i4ajc3i4hd2i7k1il99g5i5p6sx040i"; depends=[ggplot2 gridExtra spatstat]; }; GEVStableGarch = derive2 { name="GEVStableGarch"; version="1.1"; sha256="1iypv0k4cbvsdyglgvf7y52sqvl5qcin627pjqwq42kisqynm8d7"; depends=[fExtremes fGarch Rsolnp skewt stabledist timeDate timeSeries]; }; - GEVcdn = derive2 { name="GEVcdn"; version="1.1.6"; sha256="09lzhh16r1hsxa23jkq716yf3x9ap6fkkrz3ij2x83rvwznj8hb3"; depends=[VGAM]; }; + GEVcdn = derive2 { name="GEVcdn"; version="1.1.6-2"; sha256="0vmm9fhyrk5m0zwy7fpq5j9zinws0gn2saf4j9plqc9gj1gphjn0"; depends=[]; }; GEint = derive2 { name="GEint"; version="0.1.5"; sha256="179gpq4qjhgx1fhyjdb80rf2ip80zhhfyn8xjgwq1a425163q1y7"; depends=[bindata geepack mvtnorm nleqslv pracma rje speedglm]; }; GExMap = derive2 { name="GExMap"; version="1.1.3"; sha256="1a6i2z9ndgia4v96nkr77cjqnbgxigqbqlibg82gwa0a6pl7r7nz"; depends=[Biobase multtest]; }; GFA = derive2 { name="GFA"; version="1.0.3"; sha256="10sivsqxliwcrp0ay3n2my28zki6f8vpv8i9lbld8qinx1iv2mq3"; depends=[]; }; GFD = derive2 { name="GFD"; version="0.2.6"; sha256="1z98j6nvaa4vrh840q1iy5r0h9ns4xbrk3qfkq51l2kmbrck8r7a"; depends=[magic MASS Matrix plotrix plyr]; }; GFE = derive2 { name="GFE"; version="0.1.0"; sha256="0ywrg23z13kp8ggw4wbm4jvr2rvb6kra7ma0mgfj8xzkrxs6vi6m"; depends=[data_table dplyr TeachingSampling]; }; GFGM_copula = derive2 { name="GFGM.copula"; version="1.0.4"; sha256="0cw8ih9dj86cvks0qcpffzjx8lv6qiwvk3f1wri8zashj8lk9am6"; depends=[cmprsk compound_Cox joint_Cox]; }; + GGClassification = derive2 { name="GGClassification"; version="0.1"; sha256="03wis5ng2mnfhp33xrag8xbmvjagzr1909a6x94wv7s2spji00rp"; depends=[Rcpp RcppEigen]; }; GGEBiplotGUI = derive2 { name="GGEBiplotGUI"; version="1.0-9"; sha256="0nd0ky3m1avy82z48g7hcysq0y0agxjxdn0g624dkm2w99avxw3j"; depends=[rgl tkrplot]; }; GGEBiplots = derive2 { name="GGEBiplots"; version="0.1.1"; sha256="1xnxaylikjd378flw3rqw36z27b2limkmyad97zhf1cbva317d1b"; depends=[gge GGEBiplotGUI ggforce ggplot2 scales]; }; GGIR = derive2 { name="GGIR"; version="1.11-0"; sha256="0r0k48qbmm5fnl6rgpwgd8jc4l8nyjp2f4vv2givdqkmylw22281"; depends=[bitops data_table doParallel foreach GENEAread matlab Rcpp signal tuneR zoo]; }; @@ -1612,6 +1616,7 @@ in with self; { GPoM_FDLyapu = derive2 { name="GPoM.FDLyapu"; version="1.0"; sha256="1hpgiwh7b50gazp1msjsh2840b91wfrxhl2l45lxg6jr1m34q8pj"; depends=[deSolve GPoM]; }; GPrank = derive2 { name="GPrank"; version="0.1.4"; sha256="06j5fk427jkp5lphqlx48vfp4fagnxxnv4iyjcha8nvkswcblwgy"; depends=[gptk matrixStats RColorBrewer tigreBrowserWriter]; }; GPvam = derive2 { name="GPvam"; version="3.0-5"; sha256="0inhhx5ll4ybkwp71ijigxlyxsa0rdyxb38kgfgxb588dsk4scjz"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; }; + GPvecchia = derive2 { name="GPvecchia"; version="0.1.3"; sha256="1rabini84r5fvl630wkcikjzll89mamc6pqiilvcmsik5c6ymz3w"; depends=[BH fields FNN GpGp Matrix Rcpp RcppArmadillo sparseinv]; }; GRANBase = derive2 { name="GRANBase"; version="2.6.20"; sha256="0z9378qimdpxrslib2avimik3xqd41angfg12j8vmcbg7zh3binh"; depends=[covr desc dplyr GRANCore htmlTable jsonlite markdown RCurl sendmailR stringi switchr]; }; GRANCore = derive2 { name="GRANCore"; version="0.2.7"; sha256="0xnm7jb2s4ag4qvsfs1fq0f2ikvfqm3bvxhj8kmmxwynwl5pw287"; depends=[switchr]; }; GRAPE = derive2 { name="GRAPE"; version="0.1.1"; sha256="1jzvf45ch8x8f2x9kmvv02xz9bix5vplh8143vc4m1yyq42x09c6"; depends=[]; }; @@ -1629,7 +1634,7 @@ in with self; { GSIF = derive2 { name="GSIF"; version="0.5-5.1"; sha256="1nc177f200m3wfppmdh9cf6g2npx87c0mz2g17zdrw5crx688i8d"; depends=[aqp dismo gstat plotKML plyr raster rgdal RSAGA scales sp]; }; GSM = derive2 { name="GSM"; version="1.3.2"; sha256="04xjs9w4gaszwzxmsr7657ry2ywa9pvpwpczpvinxi8vpj347jbb"; depends=[gtools]; }; GSMX = derive2 { name="GSMX"; version="1.3"; sha256="1n1d7rixj14ari46snsmi48qfmy00ihmzvayk3hkrp2d2d0xi2gh"; depends=[MASS]; }; - GSODR = derive2 { name="GSODR"; version="2.0.1"; sha256="0wy2qim636g5rfy046r3qab3r58j3w7ngx57k5gdarbwcjzxw07y"; depends=[countrycode curl data_table future_apply httr R_utils]; }; + GSODR = derive2 { name="GSODR"; version="2.1.0"; sha256="11vww5yx9cz5jgnfm93akh6x6cl2j818b2p7iqc57vly6pi1fz2v"; depends=[countrycode curl data_table future_apply httr R_utils]; }; GSSE = derive2 { name="GSSE"; version="0.1"; sha256="034mmxa6kjq5kgikhb5q75viagz5ck9irrjbxm26zq9099qxm13b"; depends=[Iso zoo]; }; GSelection = derive2 { name="GSelection"; version="0.1.0"; sha256="052vh1haxlzbh3c5i24nrwphapik1y8ribmh6q4axd447ggc0ff9"; depends=[gdata penalized SAM]; }; GSparO = derive2 { name="GSparO"; version="1.0"; sha256="0xna2crxqwy8fj0s79rxbdcaz9x912rp1vdwqv1557fsnmfv2yf0"; depends=[ggplot2 ThreeWay]; }; @@ -1643,7 +1648,7 @@ in with self; { GWASExactHW = derive2 { name="GWASExactHW"; version="1.01"; sha256="19qmk8h7kxmn9kzw0x4xns5p3qqz27xkqq4q6zmh4jzizd0fsl78"; depends=[]; }; GWASbyCluster = derive2 { name="GWASbyCluster"; version="0.1.7"; sha256="0ivlkxbh8m23vbnjfmhk0vfczd5b8lzy9w4gm1m6jpvdm40kn70x"; depends=[Biobase limma rootSolve snpStats]; }; GWASinlps = derive2 { name="GWASinlps"; version="1.2"; sha256="036lv8f58kz6qdwaviyk1q1qsgcj9cimipq1cjrfpn8snkn7s1gh"; depends=[horseshoe mombf speedglm]; }; - GWASinspector = derive2 { name="GWASinspector"; version="1.4.6.7"; sha256="18shkl73fjsa324jfriyx8xsspdpixfpkcpgvqszkb511wj4r2sj"; depends=[data_table futile_logger ggplot2 gridExtra hash ini kableExtra knitr rmarkdown RSQLite]; }; + GWASinspector = derive2 { name="GWASinspector"; version="1.4.7"; sha256="0a75nh9hzhib2x5dg4598y3gyg7sflhdmj27j9hy2f5p03p4l64p"; depends=[data_table futile_logger ggplot2 gridExtra hash ini kableExtra knitr R_utils rmarkdown RSQLite]; }; GWEX = derive2 { name="GWEX"; version="1.0.2"; sha256="0iykciifbskcrx1qv4874nxli1sq6nbmlfinq4ksir3p93y7ds87"; depends=[abind doParallel EnvStats fGarch foreach lmomco MASS mvtnorm nleqslv Renext]; }; GWG = derive2 { name="GWG"; version="1.0"; sha256="1va0cd229dhhi1lmrkpwapcm96hrdmxilrmba02xnl7ikhisw0my"; depends=[]; }; GWLelast = derive2 { name="GWLelast"; version="1.2.2"; sha256="1nm4w5m4ca6npmpvh9nb0cnrbzlyv95nvvhgs3pqcrw4igagm4hj"; depends=[doParallel foreach geosphere glmnet sp spgwr]; }; @@ -1744,7 +1749,6 @@ in with self; { GxM = derive2 { name="GxM"; version="1.1"; sha256="02rv8qb46ylk22iqn9cgh63vkyrg9a8nr1d0d3j5hqhi0wyhc41r"; depends=[minqa nlme Rcpp]; }; HAC = derive2 { name="HAC"; version="1.0-6"; sha256="1cdh3s8nm17mfjj0zdxzhlmakcd0m12xfjx0b4gyx24xkahklr8i"; depends=[copula numDeriv]; }; HACSim = derive2 { name="HACSim"; version="1.0.5"; sha256="0161h3yhi3bh0jq7x105p3rjlrvl46k4iahfz4k84wsvw3akgk1a"; depends=[ape pegas Rcpp RcppArmadillo]; }; - HAP_ROR = derive2 { name="HAP.ROR"; version="1.0"; sha256="1id9amz1cc2l2vnpp0ikbhf8ghbgzqd1b9dfivnyglg7996c3gbg"; depends=[ape hash]; }; HAPim = derive2 { name="HAPim"; version="1.3"; sha256="03qy0pxazv3gdq3fck7171ixilb9zi1dwnvc4v7d726g0lvn80pg"; depends=[]; }; HARModel = derive2 { name="HARModel"; version="1.0"; sha256="17sajqi2g5z69gvnfhkn850jkavi8syhm58xadd2khrm73nvwh2i"; depends=[Rcpp RcppArmadillo sandwich xts zoo]; }; HARtools = derive2 { name="HARtools"; version="0.0.5"; sha256="10a92jsk1ccgxi5g6byrs4fbj5l2kih7vhib0jg6spdqi6rhqla1"; depends=[assertthat htmltools htmlwidgets jsonlite magrittr]; }; @@ -1755,7 +1759,7 @@ in with self; { HCR = derive2 { name="HCR"; version="0.1.1"; sha256="14s46dyw3ifp3pwwlcwbbl47i6hy2whjj1n65i28am5a33nycgha"; depends=[data_table]; }; HCT = derive2 { name="HCT"; version="0.1.0"; sha256="0p1bj0spqff8m27lvxdfhk8z1r1z04v1dsv7mqbjyzl07w005hk3"; depends=[rstan]; }; HCTR = derive2 { name="HCTR"; version="0.1.1"; sha256="1hg8mpallwxpmamk6q8x87w5hlqqwvbahfw5zmr9pisiagbwcsay"; depends=[glmnet harmonicmeanp MASS ncvreg Rdpack]; }; - HCmodelSets = derive2 { name="HCmodelSets"; version="1.1"; sha256="1krcwx6s4fh8ngx81lmdzd12i8k2yczvc4iv9k718xnaji1b8mkd"; depends=[ggplot2 mvtnorm survival]; }; + HCmodelSets = derive2 { name="HCmodelSets"; version="1.1.1"; sha256="1fk4q6422lzyf4cwirqz1d70av21m6pwmsy2rqjcraclr4mddw7s"; depends=[ggplot2 mvtnorm survival]; }; HDCI = derive2 { name="HDCI"; version="1.0-2"; sha256="0wxbv54kbygymhh4r7052vnbj603c1kya01ykvmqzzkjyyfzidkz"; depends=[doParallel foreach glmnet iterators lattice Matrix mvtnorm slam]; }; HDCurves = derive2 { name="HDCurves"; version="0.1.0"; sha256="1ifcbwcqgdxicqxcqrsl9kp3zadxhijpwff8ln309378vybr3gh1"; depends=[]; }; HDDesign = derive2 { name="HDDesign"; version="1.1"; sha256="1jim4h9bwn8r637va7m81kwwsfwyzs9pzn5a9i7c8xz8b1x191bj"; depends=[]; }; @@ -1789,7 +1793,7 @@ in with self; { HMM = derive2 { name="HMM"; version="1.0"; sha256="0z0hcqfixx1l2a6d3lpy5hmh0n4gjgs0jnck441akpp3vh37glzw"; depends=[]; }; HMMCont = derive2 { name="HMMCont"; version="1.0"; sha256="1drni4f72x83sprn65wnhw0pv1q8lfkgmxdr9h4rwv1accril85x"; depends=[]; }; HMMEsolver = derive2 { name="HMMEsolver"; version="0.1.2"; sha256="0msin7rq3npz221mvrw3zcs6bwz439six99iblx5p3hkp1n1ljf3"; depends=[Rcpp RcppArmadillo Rdpack]; }; - HMMcopula = derive2 { name="HMMcopula"; version="1.0.3"; sha256="192d0mg0smpdvxvlmha8h3pzfjmzf729ndijc0xngp9yq8syf882"; depends=[copula doParallel foreach matrixcalc mvtnorm]; }; + HMMcopula = derive2 { name="HMMcopula"; version="1.0.4"; sha256="1gmvav02r3miaq4jx05qjcgzw5qv6w1j77vck5gpps8p38zcp34m"; depends=[copula doParallel foreach matrixcalc mvtnorm]; }; HMMextra0s = derive2 { name="HMMextra0s"; version="1.0.0"; sha256="15y5q92x69sn80pc2x7xwbnsfrqpf7cjdja4hkq861jshkksbmg1"; depends=[ellipse mvtnorm]; }; HMMmlselect = derive2 { name="HMMmlselect"; version="0.1.5"; sha256="10h62h03hiip8m1h93sbln413l6cmxmc6hsq3rla6acjk6hfxb2v"; depends=[DirichletReg HiddenMarkov mclust mvtnorm Rcpp]; }; HMMpa = derive2 { name="HMMpa"; version="1.0.1"; sha256="0c3jmvcklywqsjmskx7zbw4d3l8i6bzr5h741v8iwgyw67mjn37g"; depends=[]; }; @@ -1799,7 +1803,6 @@ in with self; { HMVD = derive2 { name="HMVD"; version="1.0"; sha256="0agzvsl2n3zg3i519b93jqpiq9zix0bbrjdzk3ymsbb42dzkmj0d"; depends=[MASS]; }; HPbayes = derive2 { name="HPbayes"; version="0.1"; sha256="1kpqnv7ymf95sgb0ik7npc4qfkzc1zb483vwnjpba4f42jhf508y"; depends=[boot corpcor MASS mvtnorm numDeriv]; }; HRM = derive2 { name="HRM"; version="1.2.1"; sha256="0qsxwi0v61k1waw21nrz86jazd5wgq2drhan3w8pmb35q2z20s35"; depends=[data_table doBy ggplot2 MASS matrixcalc mvtnorm plyr pseudorank Rcpp reshape2 xtable]; }; - HRQoL = derive2 { name="HRQoL"; version="1.0"; sha256="1gr9rhr8gdnh7bw2v3r0xc3yhmzrx2gzgsd8wd5mmsp81ph0h5lz"; depends=[car fmsb Matrix matrixcalc numDeriv RColorBrewer rootSolve]; }; HRW = derive2 { name="HRW"; version="1.0-3"; sha256="12y43sl30949jc9ab10ipx8k4rvb9g8gwaazi8j3k1grh26ivpii"; depends=[KernSmooth]; }; HS = derive2 { name="HS"; version="1.1"; sha256="1vhbchc446j49jj7jgmy4l59n8ahk5l8jp1rl5xwsmn9iqir62mp"; depends=[data_table ggplot2 ggpubr partitions reshape2 tidyr zoo]; }; HSAUR = derive2 { name="HSAUR"; version="1.3-9"; sha256="0b2hyn59lr2pma87fcj7mli3qmrbnfhgd8fv02fa317rj52399qz"; depends=[]; }; @@ -1820,6 +1823,7 @@ in with self; { HWEintrinsic = derive2 { name="HWEintrinsic"; version="1.2.2"; sha256="035r5bi7m66g351cmrfmf4cj5qqm4fn5pgy3lzsp3gyp2dv0rkg5"; depends=[]; }; HYRISK = derive2 { name="HYRISK"; version="1.2"; sha256="1ngwwzv1pavmscpca3ryzfxzd9rppsh0sm7k4sp2kzc9c0bix4xp"; depends=[kerdiest pbapply reliaR rgenoud sets triangle]; }; HaDeX = derive2 { name="HaDeX"; version="1.1"; sha256="1c87bj4qiq28a51l90r5rhk9nzn8lgssby686fsin0d3y068krbg"; depends=[data_table dplyr DT ggplot2 gsubfn latex2exp readr readxl reshape2 shiny stringr tidyr]; }; + HadamardR = derive2 { name="HadamardR"; version="1.0.0"; sha256="0nr8m6fchpmlvhyisb61y0fymjjrk2k1sd67r14n87sgn3mafh4a"; depends=[numbers openxlsx]; }; HadoopStreaming = derive2 { name="HadoopStreaming"; version="0.2"; sha256="1l9msaizjvnsj1jrpghj4g057qifdgg6vbqhfxhn1fiqdqi2056q"; depends=[getopt]; }; HandTill2001 = derive2 { name="HandTill2001"; version="1.0.0"; sha256="0qxaxwizx24gm3iycdmwdn8mqvnwnjhacsp9nwl9w4djayb5a9sg"; depends=[]; }; Hapi = derive2 { name="Hapi"; version="0.0.3"; sha256="0jqjhfq38k161kqff5cx0vxpsmjm2y5ca7049mvqiwqwvi4fp08m"; depends=[ggplot2 HMM]; }; @@ -1854,7 +1858,7 @@ in with self; { Homeric = derive2 { name="Homeric"; version="0.1-3"; sha256="1vcs8fj39zpz45p7gph0mnx65hgr35na0b79i8llyw7i1h7zqzxr"; depends=[]; }; Hotelling = derive2 { name="Hotelling"; version="1.0-5"; sha256="1ism2lzi2kmi62gp319qsi64pj2kj5sfh50f1qnv8vgdkb76bdx5"; depends=[corpcor]; }; HyPhy = derive2 { name="HyPhy"; version="1.0"; sha256="0994ymv7sswbp8qw3pay34s926cflw2hq2gnchw7rknybvlsrinq"; depends=[ape R_utils]; }; - HyRiM = derive2 { name="HyRiM"; version="1.0.3"; sha256="0zx292554kr2s4107db5y7sr869kia9q6dyzhdjy11ksw23sj9m4"; depends=[compare orthopolynom]; }; + HyRiM = derive2 { name="HyRiM"; version="2.0.0"; sha256="1wif31xvrwz0dr6z0hfn1v2fxi8rxws52al6h9rlbzciy6xyl7a3"; depends=[compare grImport2 orthopolynom purrr Rglpk]; }; HybridFS = derive2 { name="HybridFS"; version="0.1.3"; sha256="0sb3i8ymgydi9hvxzdzydqap1gd7w5qcrs9clc0y5n26zd2mwqm5"; depends=[caTools FSelector InformationValue ROCR woeBinning]; }; HybridMC = derive2 { name="HybridMC"; version="0.2"; sha256="1wgzfyk0scwq9s2sdmc91fj7r4d7zlgwgnj6mdiia8w88ja8kzqy"; depends=[coda]; }; HydeNet = derive2 { name="HydeNet"; version="0.10.9"; sha256="1glzbr91cwp99qk1cyf8824fg8jvghgf84gc64jjn2q70vczcf5f"; depends=[checkmate DiagrammeR dplyr magrittr nnet pixiedust plyr rjags stringr]; }; @@ -1876,13 +1880,13 @@ in with self; { IBrokers = derive2 { name="IBrokers"; version="0.9-12"; sha256="0mhh4kgwrncrcysvnvah6xc7fhx5ywjzn258cs9xj9kzns0jblk6"; depends=[xts zoo]; }; IC2 = derive2 { name="IC2"; version="1.0-1"; sha256="03jjb62msxjxdg9l3zd1ns0d2w37hkxy5pnjgaywxw3vfk4zwfj9"; depends=[]; }; ICAFF = derive2 { name="ICAFF"; version="1.0.1"; sha256="0zazx4nv81s75appg10aayks04mx6m5n9yf5hqrbxh3yj68vzxfy"; depends=[]; }; - ICAMS = derive2 { name="ICAMS"; version="2.0.10"; sha256="1f22bwbxnqqccmkmsx4ll8qaviz9w7f64jx1whikvnhsxw634xp5"; depends=[Biostrings BSgenome data_table dplyr GenomeInfoDb GenomicRanges IRanges RColorBrewer stringi]; }; + ICAMS = derive2 { name="ICAMS"; version="2.1.2"; sha256="0jgylkc3asg41b0vac5vcyril0n93yqijjbzwwprfh3ps7pq87s0"; depends=[Biostrings BSgenome data_table dplyr GenomeInfoDb GenomicRanges IRanges RColorBrewer stringi zip]; }; ICAOD = derive2 { name="ICAOD"; version="0.9.9"; sha256="04s51rxhr4axxr1rnhnq87lcn9mjj8g18xr35awnmc4sjg2aavaf"; depends=[cubature mnormt mvQuad nloptr Rcpp RcppEigen sn]; }; ICBayes = derive2 { name="ICBayes"; version="1.2"; sha256="1hdh7g4nk6yy0xz9564vpvh1blrw30lvyw2wc5mmgn78kwjqla34"; depends=[coda HI survival]; }; ICC = derive2 { name="ICC"; version="2.3.0"; sha256="0y8zh9715cp9bglxpygqwgigrarq37sj845lk1xl0ydwinl0a6kk"; depends=[]; }; ICC_Sample_Size = derive2 { name="ICC.Sample.Size"; version="1.0"; sha256="1w6v1jp8bfvf6c49ikswkc5527gdx5cyqnw95x00pgmm6riwlsp9"; depends=[]; }; ICCbin = derive2 { name="ICCbin"; version="1.1.1"; sha256="1pzlaj7w98pgrlg3zvpmdv0dpgi5gih0j73qv86ak75fkxvrnzzw"; depends=[]; }; - ICD10gm = derive2 { name="ICD10gm"; version="1.0.4"; sha256="19346z1mfdbir47wy6qxniag81s3xwrxpfbiv1rar6a89z3pczlf"; depends=[dplyr magrittr purrr rlang stringi tibble tidyr tidyselect]; }; + ICD10gm = derive2 { name="ICD10gm"; version="1.1"; sha256="0m0j88c8mkc0v22dw25l76gch883n21ifw9dpc189mq887856jp8"; depends=[dplyr magrittr purrr rlang stringi tibble tidyr tidyselect]; }; ICDS = derive2 { name="ICDS"; version="0.1.1"; sha256="1jb98xi37jcf6nl5lx2ip9614l4w7lz7v53jpcbdj0ymqbfx1s70"; depends=[graphite igraph metap org_Hs_eg_db]; }; ICE = derive2 { name="ICE"; version="0.69"; sha256="04p8lakaha28mdh965w0ppyxfrz5ssi1n9xifvsbn3ihdra67rip"; depends=[KernSmooth]; }; ICEbox = derive2 { name="ICEbox"; version="1.1.2"; sha256="170gg2fg9307yc2b25lsj8d1zla0frjxl47qh0njlqlrpi8jmm7i"; depends=[sfsmisc]; }; @@ -1936,13 +1940,11 @@ in with self; { INSPIRE = derive2 { name="INSPIRE"; version="1.5"; sha256="0938l50yxnb5q628mp874ayx9ybvcjddis20y1hzm5cmlsg0hqhg"; depends=[missMDA]; }; IOHanalyzer = derive2 { name="IOHanalyzer"; version="0.1.3"; sha256="0l5baz68714vqlzfp6v1r93lwmv0nsq2wqidgf5zwj5r391y7c5g"; depends=[bsplus colorRamps colorspace colourpicker data_table dplyr DT ggplot2 igraph kableExtra magrittr markdown PlayerRatings plotly RColorBrewer Rcpp reshape2 scales shiny shinydashboard shinyjs withr]; }; IPCWK = derive2 { name="IPCWK"; version="1.0"; sha256="0hah1xl6zli0346jh57rjc5x8vynhaysj0l481rmvznsghv6im23"; depends=[MASS survival]; }; - IPDFileCheck = derive2 { name="IPDFileCheck"; version="0.6.2"; sha256="16fapss0y31y9ynizhv9z8zqywf0aam2v7g53dcwylvdjc6qpzi2"; depends=[dplyr eeptools GlobalOptions lubridate testthat]; }; IPEC = derive2 { name="IPEC"; version="0.1.2"; sha256="1fglr5hs61n13251145wqzvxy362fx32yzral96xd8li76ljxiic"; depends=[MASS numDeriv]; }; IPMRF = derive2 { name="IPMRF"; version="1.2"; sha256="1zvwwhiy0p134zvm5ldc92pdd1ap72bhbrlf02rz9m2hlsxmwy67"; depends=[gbm party randomForest]; }; IPPP = derive2 { name="IPPP"; version="1.1"; sha256="19ccs25fd56ns7ssi51w2jzjd4d57vyimwmfvf27mmigb537bd5y"; depends=[]; }; IPV = derive2 { name="IPV"; version="0.1.1"; sha256="0bd59sfqqz2g6lwzlg3vqpw0y8q989n4q76qr1dvnq847c6fg8wz"; depends=[ggforce ggplot2]; }; IPWboxplot = derive2 { name="IPWboxplot"; version="0.1.0"; sha256="0lyqcjnbissick5hzwrx21pykq4pww9j0i03j0gy43awl1cq5qq8"; depends=[isotone]; }; - IPWsurvival = derive2 { name="IPWsurvival"; version="0.5"; sha256="0lmw0ifj8cds8lzyjkkv0i0zim23p0a3pawlhmhdm3nfvwawb853"; depends=[survival]; }; IQCC = derive2 { name="IQCC"; version="0.7"; sha256="1zalpmyywkrnci0jd8irakjhiqmr52zhj1sbxf9pz5c7wks2rdbc"; depends=[MASS miscTools qcc]; }; IRATER = derive2 { name="IRATER"; version="0.0.1"; sha256="0jxdvjmnmangbqy3ibb5qrj9jz3wrzs0wa1r2gjk4v8vsbk0ipcf"; depends=[coda lattice plyr R2admb]; }; IRISMustangMetrics = derive2 { name="IRISMustangMetrics"; version="2.3.0"; sha256="09nzzalz107l6dscl4xxd8znwd9fppjlfyvn1vfd9jhx7mkjlnlq"; depends=[dplyr IRISSeismic pracma RCurl seismicRoll signal stringr XML]; }; @@ -1982,7 +1984,7 @@ in with self; { ImputeRobust = derive2 { name="ImputeRobust"; version="1.3-1"; sha256="1zvwlpffpm4gqysz57clf8jkqr72yjbzx90pdy95la51m0b6cdbd"; depends=[extremevalues gamlss gamlss_dist lattice mice purrr]; }; InDisc = derive2 { name="InDisc"; version="1.0.2"; sha256="1mvd6r1ly924n17275n4i9p8sghvm929kbir0bq6850kk2m0dgq7"; depends=[optimbase psych]; }; InPosition = derive2 { name="InPosition"; version="0.12.7.1"; sha256="0d9c7dwaa1v0j8p5ff9223fc2gkbmbvyqylma2d8l4x5m92jmkv0"; depends=[ExPosition prettyGraphs]; }; - InSilicoVA = derive2 { name="InSilicoVA"; version="1.2.7"; sha256="0xfvrsq84wm31j0ih5khqhkhk4ygijfkh9w2bjrw3d5wgpdm0yv3"; depends=[coda ggplot2 InterVA5 rJava]; }; + InSilicoVA = derive2 { name="InSilicoVA"; version="1.2.8"; sha256="0lxv8m394mv9likc8ph17xxd5san326n9c77q7vmgs03a6chqrjx"; depends=[coda ggplot2 InterVA5 rJava]; }; IncDTW = derive2 { name="IncDTW"; version="1.1.3.1"; sha256="1hwwsh70mmdwqaqw4xxnbvc3g2nhmx64bd0hzxh63wr15jch0w8b"; depends=[data_table ggplot2 Rcpp RcppArmadillo RcppParallel scales]; }; IncomPair = derive2 { name="IncomPair"; version="0.1.0"; sha256="156mc4csbxz976md7ikjd6sqamzsfc8ik9xf1qbhrfl8y7957kbb"; depends=[]; }; IncucyteDRC = derive2 { name="IncucyteDRC"; version="0.5.4"; sha256="1k7jqcyx5n4my5rbyfa693ganbk91xganyagq8x8szli9h1491ii"; depends=[cowplot dplyr drc DT ggplot2 magrittr shiny tidyr XML]; }; @@ -2037,13 +2039,15 @@ in with self; { IsoplotR = derive2 { name="IsoplotR"; version="3.3"; sha256="1bldpa7j37k29k51lpbpyr4g4939zw1n9dv498v92w82kzj2p6zf"; 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]; }; + ItemResponseTrees = derive2 { name="ItemResponseTrees"; version="0.2.4"; sha256="1qcq9sskfpfiixi38m8didml53r1a2cilvjg5pfwgcvnw10vrncz"; depends=[backports checkmate dplyr generics glue magrittr MASS Matrix mirt purrr rlang sets stringr tibble tidyr tidyselect]; }; + J4R = derive2 { name="J4R"; version="1.0.7"; sha256="02ngxyyl8hpjn1r0w8kahqp3hy9xm37m0g4hzb7mdxkkzcxpv7hx"; depends=[]; }; JADE = derive2 { name="JADE"; version="2.0-3"; sha256="1fj2wawx5ac1fvlp28naqha0i17f1sb47j2qqzgccvx17ycqmmjn"; depends=[clue]; }; JASPAR = derive2 { name="JASPAR"; version="0.0.1"; sha256="0wiyn7cz45hwy9zkvacx28zdrg78q6715cg4r9xgcb39q25s0dcy"; depends=[gtools]; }; JBTools = derive2 { name="JBTools"; version="0.7.2.9"; sha256="0bynqn3daqgmi3l9asy34mfwyfjkn35k465dfqqi3xwx6cbzlg5k"; depends=[colorspace foreach gplots plotrix]; }; JFE = derive2 { name="JFE"; version="2.1.3"; sha256="16fbwi9znvf560vlrpdipg69vw1kyg2081iz1l2adc2wyxp81dda"; depends=[BurStFin fAssets fBasics fPortfolio FRAPO iClick MASS quantmod rugarch tcltk2 timeDate timeSeries xts zoo]; }; JGEE = derive2 { name="JGEE"; version="1.1"; sha256="078348n623hlyc3n9yh67vv5acsnxapmbwybvrb1i7kawmqw5msi"; depends=[gee MASS]; }; JGL = derive2 { name="JGL"; version="2.3.1"; sha256="02p9z32f8j60wnh1szkjr2zfa9zwyw0gqinpsvll4dymf8cjawpw"; depends=[igraph]; }; - JGR = derive2 { name="JGR"; version="1.8-6"; sha256="0n3z4dm4q93did5b7hw802akhr6gyidshvlj2db4sghmf07czk2c"; depends=[JavaGD rJava]; }; + JGR = derive2 { name="JGR"; version="1.8-7"; sha256="0bwnps4n078ssmmnxc3pbhs3wc2x45i9f567yb5h7nqscmhb20fi"; depends=[JavaGD rJava]; }; JM = derive2 { name="JM"; version="1.4-8"; sha256="1nq07hw30fqnag1h08b7crl2yfs85gyrn70aaw11bdbjv06r2x55"; depends=[MASS nlme survival]; }; JMI = derive2 { name="JMI"; version="0.1.0"; sha256="05phkwfb9v4g9jixlvbj6br7sbi64zvrgjwfr0v87ijddkxc9si9"; depends=[Rcpp RcppArmadillo]; }; JMbayes = derive2 { name="JMbayes"; version="0.8-85"; sha256="0s11jpzflc2zg60g4ffcw23c2f4zz3mzddrc2cl5y43xl2v304lb"; depends=[doParallel foreach Hmisc jagsUI MASS nlme Rcpp RcppArmadillo rstan shiny survival xtable]; }; @@ -2053,7 +2057,7 @@ in with self; { JPEN = derive2 { name="JPEN"; version="1.0"; sha256="12rvp5bmlkwyr1gg336k655hp09gym0d2wwry70c1rz30x1sf2zs"; depends=[mvtnorm]; }; JQL = derive2 { name="JQL"; version="3.6.9"; sha256="0d926hngv4r6zl5f6yai3jwhl9hql2hv6ja3yjgplglkns66g4lh"; depends=[caret pdist randomForest]; }; JRF = derive2 { name="JRF"; version="0.1-4"; sha256="1xpvscn9iawwa0vfh3kfwzdni436bf42nvm18b8abh033ljvqpij"; depends=[]; }; - JSM = derive2 { name="JSM"; version="0.1.3"; sha256="1p5vlk2fcrb42pi7srkymjacfg05vlaspvhaw94lq1rhvxdw87yl"; depends=[nlme Rcpp RcppEigen statmod survival]; }; + JSM = derive2 { name="JSM"; version="1.0.0"; sha256="1nvzkmfwjk5p6j32scsm7gj1zymrbqsfzwwhfyy0mfqvk4rzrd3g"; depends=[nlme Rcpp RcppEigen statmod survival]; }; JSmediation = derive2 { name="JSmediation"; version="0.1.1"; sha256="06p413jfv02k88jdsbplnz696knxglgcqa4pjrgkhhic6awdh0jf"; depends=[broom data_table dplyr glue knitr magrittr MASS purrr rlang tibble]; }; JWileymisc = derive2 { name="JWileymisc"; version="1.1.0"; sha256="08c09jcax0ppl9q47px2anybcj8rfha8xdx226y002valqji5bz3"; depends=[cowplot data_table emmeans extraoperators ggplot2 ggthemes lavaan lme4 MASS mgcv mice multcompView psych quantreg rms robustbase VGAM]; }; JacobiEigen = derive2 { name="JacobiEigen"; version="0.3-3"; sha256="1zcs9qhf2216c590hj6qc837rnciyfsirg4zg655vxn59fgzpvyb"; depends=[Rcpp]; }; @@ -2070,6 +2074,7 @@ in with self; { JointNets = derive2 { name="JointNets"; version="2.0.1"; sha256="18n9dsy0w0nh7dznp6gw6g5fhhjhf5y589nb49hri0721kq1h3rb"; depends=[brainR igraph JGL lpSolve MASS misc3d oro_nifti pcaPP rgl shiny]; }; Julia = derive2 { name="Julia"; version="1.1"; sha256="0i1n150d89pkds7qyr0xycz6h07zikb2y07d5fcpaqs4446a8prg"; depends=[]; }; JuliaCall = derive2 { name="JuliaCall"; version="0.17.1"; sha256="0v0mn3q9mp8xq6bpm870v9a228b20n22cph3s0ngphni07pi0kwr"; depends=[knitr Rcpp]; }; + JuliaConnectoR = derive2 { name="JuliaConnectoR"; version="0.6.0"; sha256="174ghyj2fmacgm3a2gnpsv2yzg0fzskjqk25cvr8a9qqq2527bv4"; depends=[]; }; JumpTest = derive2 { name="JumpTest"; version="1.1"; sha256="0y375m5477nq0ybnjmfnd8hi45d8jmdnprqvw5f70llpd7bcghh0"; depends=[MASS Rcpp RcppEigen]; }; KANT = derive2 { name="KANT"; version="2.0"; sha256="169j72pmdkcj6hv8qgmc02aps0ppvvl1vnr1hzrb1gsf7zj7bs3y"; depends=[affy Biobase]; }; KCSKNNShiny = derive2 { name="KCSKNNShiny"; version="0.1.0"; sha256="13gzqf3g7vj8cc0xm5902q7lad2way8d0ri1fs01dnv97wmwbxvn"; depends=[caret dplyr FNN rhandsontable shiny]; }; @@ -2109,7 +2114,7 @@ in with self; { Knoema = derive2 { name="Knoema"; version="0.1.16"; sha256="0v6w8rrw8nd4l1by5w9xd4hbxp55cma89kljha47ykvmnflsrjsc"; depends=[base64enc digest httr jsonlite lubridate xts zoo]; }; KnowBR = derive2 { name="KnowBR"; version="2.0"; sha256="0i934gff8ldg0lm5cfcf3ip7abnparaaviq8avs7cbnacs6nw8i1"; depends=[fossil mgcv plotrix sp vegan]; }; KnowGRRF = derive2 { name="KnowGRRF"; version="1.0"; sha256="0nk0baibd184rsg23jx1wg4c2fcaqf8ww7822xrs3w5ym6vwd0rs"; depends=[MASS PRROC randomForest RRF]; }; - KoulMde = derive2 { name="KoulMde"; version="3.1.0"; sha256="158lg1jr3lgn85wgdxww6nldy9blxnnjry6hwkp6kcjpg9jljjl8"; depends=[expm Rcpp RcppArmadillo]; }; + KoulMde = derive2 { name="KoulMde"; version="3.1.1"; sha256="0k9077jpr6pv862l7rmrjmi06rl0nlfvn4zdxybsd876r1g861d1"; depends=[expm Rcpp RcppArmadillo]; }; Kpart = derive2 { name="Kpart"; version="1.2.2"; sha256="02df0pr8a0gm8558gbw9svxf5sybmg27grymy71ar9hjnhw5xlf2"; depends=[leaps]; }; KraljicMatrix = derive2 { name="KraljicMatrix"; version="0.2.1"; sha256="0yzilmiiyzd2x3v0cnjphf0wdwiblh37kgrvmfrdy49qly48pvi2"; depends=[dplyr ggplot2 magrittr tibble]; }; KrigInv = derive2 { name="KrigInv"; version="1.4.1"; sha256="0x12xff7lgr1v2243shfz9a8r02qs56p7i0b8j2s6bmrzj1abrwb"; depends=[anMC DiceKriging mvtnorm pbivnorm randtoolbox rgenoud]; }; @@ -2148,7 +2153,7 @@ in with self; { LFDREmpiricalBayes = derive2 { name="LFDREmpiricalBayes"; version="1.0"; sha256="1imw3djmbpdyplv9dmdzzirp9imk88j0kcxcyfh8yr9ywgd77x6b"; depends=[matrixStats R6]; }; LGEWIS = derive2 { name="LGEWIS"; version="1.1"; sha256="1i52vp0ghjzmyh4r8h6jpyij7x4skw99xvw017b56m8fg64zy70r"; depends=[CompQuadForm geeM mvtnorm SKAT]; }; LGRF = derive2 { name="LGRF"; version="1.0"; sha256="1kdx6y55aa9n6v43zfz6jk8amvvxbx79sqm1jx4ihgkpgcdglan7"; depends=[CompQuadForm geepack SKAT]; }; - LHD = derive2 { name="LHD"; version="0.1.2"; sha256="13g90v9mz1lx8fcwkyy1mg722zsairsay2mr77x0m4drg99ikq6r"; depends=[]; }; + LHD = derive2 { name="LHD"; version="0.1.3"; sha256="1cd3m67r6b6y4wszax0qgj4b00gy8lymfy8fvvyh21grsiyaysc8"; depends=[]; }; LICORS = derive2 { name="LICORS"; version="0.2.0"; sha256="0p9y21k1mj1v397jpb5g6jiw7rpzbyfwr4kv2rp3lyxyasy2ykf0"; depends=[fields FNN locfit Matrix mvtnorm RColorBrewer zoo]; }; LIHNPSD = derive2 { name="LIHNPSD"; version="0.2.1"; sha256="08ils29vvaq6abkgxbh028vwjw6l6h10cirbnwr65s458zvh4xqv"; depends=[BB Bolstad2 moments optimx Rmpfr sn]; }; LIM = derive2 { name="LIM"; version="1.4.6"; sha256="03x1gnm06bw1wrzc01110bjzd2mvjdzbc2mbrazh22jrmb32w5d8"; depends=[diagram limSolve]; }; @@ -2157,13 +2162,13 @@ 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.6.0"; sha256="1vzwcnp14bfbf7173fnxy1fwl8j9n2hrvmzw9ks6778ykg21q1f6"; depends=[Formula MASS mix mmm MultiLCIRT mvtnorm]; }; + LMest = derive2 { name="LMest"; version="2.6.1"; sha256="16amjb7dj5czlsjmr5s2hnjrfsiqwnc430q3hcncp3lllqib552g"; depends=[Formula MASS mix mmm MultiLCIRT mvtnorm]; }; LMfilteR = derive2 { name="LMfilteR"; version="0.1.2"; sha256="10agjrljnqw689nn9af9ihhb9sq2gmsx7l3zfmrizkavjjk67mcd"; depends=[MASS]; }; LN0SCIs = derive2 { name="LN0SCIs"; version="0.1.5"; sha256="09zr6lrvv7lw9qp3vz4n2dv0v3q7wq06wwvwpb2pm0r335bnrf89"; depends=[]; }; LNIRT = derive2 { name="LNIRT"; version="0.4.0"; sha256="0g2yqpsxz2fsvgvgn60yv2k8mv63anf6g2zzd9njarc524n874r8"; depends=[MASS]; }; LOGAN = derive2 { name="LOGAN"; version="1.0.0"; sha256="00y8kcykw01gv2g20vmpwkc3qqyafwbiw5pa731xlfnh1b8sn0hi"; depends=[dplyr foreign ggplot2 magrittr modules pander psych rlang stringr]; }; LOGICOIL = derive2 { name="LOGICOIL"; version="0.99.0"; sha256="1wgg7kigzzk5ghjn3hkjf1bb8d6mvjfmkwq64phri5jpxd742ps9"; depends=[nnet]; }; - LOST = derive2 { name="LOST"; version="1.3"; sha256="01ymnczsnfml04hb6hbi041khkz2aki78qr3hriw7n3bzs5i7xim"; depends=[e1071 gdata MASS miscTools pcaMethods rgl shapes]; }; + LOST = derive2 { name="LOST"; version="2.0.2"; sha256="15ggmvjy2k4j692y9h3anfzmb0hgnx66cbr76grwvcfysdx87ick"; depends=[e1071 gdata geomorph MASS miscTools pcaMethods rgl shapes]; }; LPBkg = derive2 { name="LPBkg"; version="1.2"; sha256="1pgv6cb7m2j7qnrzybnv6x67a3ry8kpvisqj86rvxzclc9q56fdn"; depends=[Hmisc orthopolynom polynom]; }; LPCM = derive2 { name="LPCM"; version="0.46-3"; sha256="1bm5y95lzwcv8arlh55sy17m6hz1x48bcjkrwf3x34ax90qimf66"; depends=[]; }; LPGraph = derive2 { name="LPGraph"; version="2.1"; sha256="1d2kslravi3v9kf6sdabwfpa9s9xxqj3s3d7f7qfcrpfydqixq1q"; depends=[car PMA]; }; @@ -2224,7 +2229,7 @@ in with self; { LearningRlab = derive2 { name="LearningRlab"; version="1.3"; sha256="14q8pm51yrfpny2wg5l0x02zibh7qn11zkg51igadq3r6256rfd1"; depends=[crayon magick]; }; LexisNexisTools = derive2 { name="LexisNexisTools"; version="0.3.0"; sha256="19fcyvq2gs6iyks5x2s0xvbxqzvh9h7hpympvyrsx4026zv8x5cz"; depends=[data_table pbapply quanteda stringdist stringi tibble]; }; LexisPlotR = derive2 { name="LexisPlotR"; version="0.4.0"; sha256="0vlm8wcaj3755cbxrfb7ybla9znd2cbklw2xwyyn6r9i4c9xsfih"; depends=[dplyr ggplot2 tidyr]; }; - LibOPF = derive2 { name="LibOPF"; version="2.5.0"; sha256="1jnqb9fbyfk3pakjj8mbkdp2ky8v8gsql02mxlfflji9vliy9dq5"; depends=[]; }; + LibOPF = derive2 { name="LibOPF"; version="2.6.0"; sha256="0xs4098qd4j1c1vl8x8620xkrfg0iisdzs203djaqb7vqlywmlrn"; depends=[]; }; LiblineaR = derive2 { name="LiblineaR"; version="2.10-8"; sha256="17ykazac7iv02bxl8xg948vhbdr32icdm1v4bk31zmslp4xsk08g"; depends=[]; }; LiblineaR_ACF = derive2 { name="LiblineaR.ACF"; version="1.94-2"; sha256="1ldkb63yhm1ki8i585wp5byx6y0kvclwy3ncacgcdqqk0p41cyi6"; depends=[]; }; Libra = derive2 { name="Libra"; version="1.6"; sha256="0fqmc6fhcmpg9ragk4r4k000wrix9dsd52baz58bp1c80wpvvcf3"; depends=[nnls]; }; @@ -2248,7 +2253,7 @@ in with self; { LncMod = derive2 { name="LncMod"; version="1.1"; sha256="08001y7s93i3k3478jqfh9zsgpq6ym1xmdmldi7s76zbfr1nknvy"; depends=[pheatmap survival]; }; LncPath = derive2 { name="LncPath"; version="1.1"; sha256="1cpsy681yq96867nr9g75xb0dilb016shqlhxpdn5xyiakrgjl4v"; depends=[igraph]; }; LocFDRPois = derive2 { name="LocFDRPois"; version="1.0.0"; sha256="0zzdp9wgwr6wn3grimghpj4vq34x37c8bqg8acfzlzih8frqal3r"; depends=[dplyr ggplot2]; }; - LocalControl = derive2 { name="LocalControl"; version="1.1.2"; sha256="0r1qjzwmnh4qgxi5lfpg7v0ksjvcqbn8c23y2cyvb58srmxv7plb"; depends=[cluster gss lattice Rcpp]; }; + LocalControl = derive2 { name="LocalControl"; version="1.1.2.1"; sha256="123s7r11ivnp7fz6zcvzrgfyc17cqvn8k1786hcmgkplq9qnmnf4"; depends=[cluster gss lattice Rcpp]; }; LocalControlStrategy = derive2 { name="LocalControlStrategy"; version="1.3.3"; sha256="05vggk5d0w3f9w5217c9hzy5jhwv24p2g8pcj0l6zxkhic01nbrl"; depends=[cluster lattice]; }; Lock5Data = derive2 { name="Lock5Data"; version="2.8"; sha256="17awskq78h23z2dy96d7hziljhnkx5phpd48q7cppxidyvzfywim"; depends=[]; }; Lock5withR = derive2 { name="Lock5withR"; version="1.2.2"; sha256="10x3i11pb4cig4pgfmw9984na5zjbg7d41y6crakiimf53ihx0c2"; depends=[]; }; @@ -2258,12 +2263,12 @@ in with self; { LogitNet = derive2 { name="LogitNet"; version="0.1-1"; sha256="08xi5rpbqkc1b3qj24blv3l0r68wcqbsbjcqxiypm75f3c2irc4i"; depends=[]; }; LogrankA = derive2 { name="LogrankA"; version="1.0"; sha256="005zkpzi8h03qvqlpkygrf9xv4q77klafkfxw47x04jvkhklwigb"; depends=[]; }; LogrankPower = derive2 { name="LogrankPower"; version="1.0.0"; sha256="04vynymfv01q423dd9i1li92rl3lp1af3rzn3z4mamkn51mi6my0"; depends=[survival survminer]; }; - LongCART = derive2 { name="LongCART"; version="1.1"; sha256="0arrv72jmp1v5vr0lf7ng56cbagjxad01hx80220a0nglbyjvgxf"; depends=[Formula nlme rpart]; }; + LongCART = derive2 { name="LongCART"; version="2.0"; sha256="1xpbyz6hqwhbcgjv6fxkry30fhq11nw2r9s3smwik8cw8yiciwl5"; depends=[Formula magic nlme rpart survival survminer]; }; LongMemoryTS = derive2 { name="LongMemoryTS"; version="0.1.0"; sha256="0n378sad8i283vs7q63spdhwpwjly2d5zj15d4v2085j7sc7z8vi"; depends=[fracdiff longmemo mvtnorm partitions Rcpp RcppArmadillo]; }; LoopAnalyst = derive2 { name="LoopAnalyst"; version="1.2-6"; sha256="1gy9v6qiwkwbwp4snif2imf6zn50ffjrig54ln57c5v5pk3phnvv"; depends=[nlme]; }; LoopRig = derive2 { name="LoopRig"; version="0.1.1"; sha256="11rarb9fg8abc4dpd8sd8safqw3v6g8k6rcrg2nw97xppwcz8c6b"; depends=[GenomicRanges IRanges S4Vectors]; }; LotkasLaw = derive2 { name="LotkasLaw"; version="0.0.1.0"; sha256="11kq52yavicimp7ll7ljrs69a5fxf68ydb9md7v6b02iw5mwbmz7"; depends=[]; }; - LowRankQP = derive2 { name="LowRankQP"; version="1.0.3"; sha256="1a46rk0fhpnrlfzmydy7zjswrm6hf056qxgf5p10naq6025whf8x"; depends=[]; }; + LowRankQP = derive2 { name="LowRankQP"; version="1.0.4"; sha256="0cg8f42s15vphnifw6gnrhxaj6j5hmgbq8xki5mkwjsizd0ch5na"; depends=[]; }; LowWAFOMNX = derive2 { name="LowWAFOMNX"; version="1.1.1"; sha256="0f75qsv6pisgvk39yagzfxscnyfsgh63rmhp4gpybpl0pqmjp48x"; depends=[Rcpp RSQLite]; }; LowWAFOMSobol = derive2 { name="LowWAFOMSobol"; version="1.1.1"; sha256="1ym3i2m1am356di9lcp5nfmxq0np3c4bwsv6bbmf7hg02j7dhwi4"; depends=[Rcpp RSQLite]; }; Luminescence = derive2 { name="Luminescence"; version="0.9.7"; sha256="15slaiwhk5a15kmxr5slkbsm963v0dwmdl4adnhvc3j0b0c0d0r8"; depends=[bbmle data_table DEoptim httr magrittr matrixStats minpack_lm plotrix raster Rcpp RcppArmadillo readxl shape XML zoo]; }; @@ -2360,7 +2365,7 @@ in with self; { MGDrivE = derive2 { name="MGDrivE"; version="1.5.0"; sha256="1dgmmc34m2pj1l2gkwg85sj4rbhhwyrp8cj4m9b9hlz134n3qgwy"; depends=[R6 Rcpp Rdpack]; }; MGL = derive2 { name="MGL"; version="1.1"; sha256="03q453swnangxyc4nvjhzw2zpcy5vp1wpilap5rwymnf0c0xi4j7"; depends=[]; }; MGLM = derive2 { name="MGLM"; version="0.2.0"; sha256="0yyqm53lvp59zy8lkffw9x3zhqrnh29j5v3yyzk6qrgj2slnc7nk"; depends=[]; }; - MGMS2 = derive2 { name="MGMS2"; version="1.0.1"; sha256="0pai8cf4czsscsw35plrqldmqryzn6zji41n4a3x73cr00msfxrb"; depends=[MALDIquant MALDIquantForeign]; }; + MGMS2 = derive2 { name="MGMS2"; version="1.0.2"; sha256="04f1ng4s163x7gvy1iaf0j8pzs0pm2r2saji0srbp2jyhrj68d7z"; depends=[MALDIquant MALDIquantForeign]; }; MGRASTer = derive2 { name="MGRASTer"; version="0.9"; sha256="0jmf2900r56v60981sabflkhid3yrqd9xd7crb56vgfl1qkva9zp"; depends=[]; }; MGSDA = derive2 { name="MGSDA"; version="1.4"; sha256="0grwl740yvz2av5nkvmyyrr8ji5f39sjs1c5gxp6lp9p36i2wc32"; depends=[MASS]; }; MHCtools = derive2 { name="MHCtools"; version="1.2.1"; sha256="1mf70x1vd8h8i0iapl54fp8q4gpqd61faxvhpxlhv49g8s5n9pbd"; depends=[rlist]; }; @@ -2370,7 +2375,8 @@ in with self; { MHTmult = derive2 { name="MHTmult"; version="0.1.0"; sha256="1y3vh2kab6nfkiz4nzdhrpy9h6drk1ibfd2h62hpr3y09z9a2yld"; depends=[]; }; MHTrajectoryR = derive2 { name="MHTrajectoryR"; version="1.0.1"; sha256="13idcjx7pjpwvr4c52938yqhhaj1gprb8hjhaim3jx4062wf9pla"; depends=[mgcv]; }; MHadaptive = derive2 { name="MHadaptive"; version="1.1-8"; sha256="1w3bm82v8ahxrf0vqn0pznv7dqn212drinkz8y5kr1flx423l9ws"; depends=[MASS]; }; - MIAmaxent = derive2 { name="MIAmaxent"; version="1.1.0"; sha256="1hdggbsy2bcb2vjrjvn2fjnc1lvig9sqrndjfy37l8z9ndqsi6dm"; depends=[dplyr e1071 raster]; }; + MIAmaxent = derive2 { name="MIAmaxent"; version="1.1.1"; sha256="0azp8w626fhlwrk2qj7lyz9mpxj1hl2l8l1f7pviigdqp35shwf1"; depends=[dplyr e1071 raster]; }; + MIDASwrappeR = derive2 { name="MIDASwrappeR"; version="0.5.1"; sha256="07108dg16i20fg6cvsnbflfz65smwk08vjmf1b193zyvhdikwhfm"; depends=[Rcpp]; }; MIDN = derive2 { name="MIDN"; version="1.0"; sha256="08i9zfmaywi5imp36ahjpirlkl55k01x543nz95i089w3sfrsz0g"; depends=[BiasedUrn]; }; MIICD = derive2 { name="MIICD"; version="2.4"; sha256="1xlvhyh3gg77cym10i8hrxm8r1jm4plvny2c4izic6w89snplyq6"; depends=[MASS mstate survival]; }; MIIVsem = derive2 { name="MIIVsem"; version="0.5.4"; sha256="1fb4xnbp6c3c2dx3jhyqw463ghj4ak8jld148dyrmi9031mqv4fy"; depends=[boot car lavaan Matrix numDeriv]; }; @@ -2413,7 +2419,7 @@ in with self; { MMLR = derive2 { name="MMLR"; version="0.2.0"; sha256="1jc33ani6w54j38kxzk0kfj1hjfk80cil2hdja2hcsk6kqwd431d"; depends=[pracma]; }; MMMS = derive2 { name="MMMS"; version="0.1"; sha256="1a71vs3k16j14zgqfd4v92dq9swrb44n9zww8na6di82nla8afck"; depends=[glmnet survival]; }; MMVBVS = derive2 { name="MMVBVS"; version="0.8.0"; sha256="08nkhrf62yywpm0nw22pqzlcm72sf4zq44640a7pf57bbzm38ccy"; depends=[ggplot2 Rcpp RcppArmadillo reshape reshape2 rlang]; }; - MMWRweek = derive2 { name="MMWRweek"; version="0.1.1"; sha256="16dwmpj13rzxmd2x7xaakw2zq2aly7ajjbfnc39qvdzk6n2x37wn"; depends=[]; }; + MMWRweek = derive2 { name="MMWRweek"; version="0.1.3"; sha256="1l1ks44v52iggw9nhs56lfj6804yab5b17k8fzrc6h1kvj3vda0s"; depends=[]; }; MMeM = derive2 { name="MMeM"; version="0.1.0"; sha256="1b0wdcyqnliw85il5vnwy9l4x1z42kirbg872hl47plwfrp9gahc"; depends=[jointDiag lme4 MASS Matrix matrixcalc psych stringr]; }; MNLR = derive2 { name="MNLR"; version="0.1.0"; sha256="0q80232ndp7pkklzqdbga1vf51dmsxaivm4ia4wah32rc2c87fqp"; depends=[caret e1071 nnet rmarkdown shiny]; }; MNLpred = derive2 { name="MNLpred"; version="0.0.2"; sha256="0b3pgy9hqxwzvw61arvz9zlhx1j4fy9qmzwwzxf67b4ybmkzzsgl"; depends=[MASS]; }; @@ -2463,18 +2469,18 @@ in with self; { MSCquartets = derive2 { name="MSCquartets"; version="1.0.5"; sha256="0gfbawv7ib31pxmcj8ki67a72jqacm8nlizgk95yg7afjlqiyz8v"; depends=[ape phangorn RandomFieldsUtils Rdpack zipfR]; }; MSEtool = derive2 { name="MSEtool"; version="1.5.0"; sha256="10kczcv468c9s1blh37bj2cyy8zhszlwg7azvw64w2xmqnc782g4"; depends=[abind coda corpcor DLMtool dplyr gplots MASS mvtnorm RcppEigen reshape2 rmarkdown snowfall TMB]; }; MSG = derive2 { name="MSG"; version="0.4"; sha256="0fdxgqfc87iwqnnrgh7m8bfxh8lv42ffi0xxy4i1rv94aiw8gfr5"; depends=[RColorBrewer]; }; - MSGARCH = derive2 { name="MSGARCH"; version="2.31"; sha256="15df35l5nr6cl3q7xprl6ifswh7mg1fvix1x9374qgyafwr40sq4"; depends=[coda expm fanplot MASS numDeriv Rcpp RcppArmadillo zoo]; }; + MSGARCH = derive2 { name="MSGARCH"; version="2.42"; sha256="1n5fvj6yx8sfi1vizw89410hc0d37w8mpqfsksdv01pgnfdcs11a"; depends=[coda expm fanplot MASS numDeriv Rcpp RcppArmadillo zoo]; }; MSGLasso = derive2 { name="MSGLasso"; version="2.1"; sha256="1k17vnvzr647pwfbdxrpqcsp34iygq86wf0ns4rq8cj6q5mik1bv"; depends=[]; }; MSIseq = derive2 { name="MSIseq"; version="1.0.0"; sha256="1v2why1k6pjsc04044nr74571p7541nciq7xkzmya3jq6dw878j3"; depends=[IRanges R_utils rJava RWeka]; }; MSMwRA = derive2 { name="MSMwRA"; version="1.3"; sha256="0b0fqfv6iick1brqik4rqz2936nfa51i6xlfavs65r9692wks73q"; depends=[]; }; MSPRT = derive2 { name="MSPRT"; version="2.1"; sha256="0c0hhpjpkx8yl5bxqn6nw747jli9fdzkwmi31lzr664r5xinxyf7"; depends=[doParallel foreach ggplot2 iterators nleqslv]; }; MSQC = derive2 { name="MSQC"; version="1.0.2"; sha256="11wcy04cpjlnc71s2svs4lm1cp718dz1p4a1603x6zwpbf22bygn"; depends=[rgl]; }; - MST = derive2 { name="MST"; version="2.1"; sha256="16mnsn2an02k4jrqb6yj0n1i563zny5v10ngfq1y28fqaw6h8yyq"; depends=[Formula MASS partykit survival]; }; + MST = derive2 { name="MST"; version="2.2"; sha256="0p833nyq9p0r0hy02f4sy6gv1wm9flj3dxkv73ihy8503r89bbzz"; depends=[Formula MASS partykit survival]; }; MSbox = derive2 { name="MSbox"; version="1.2.1"; sha256="0lmvpzsw13w18mzi5z85yzify3xsh5sx356ndggfzyl5d5wk7s8g"; depends=[stringr xml2]; }; MScombine = derive2 { name="MScombine"; version="1.4"; sha256="0s3gbf3s5mf00d5mkbqhd9wwnyps7qb4r3zbal8j8nsaspql9nd3"; depends=[plyr]; }; MSwM = derive2 { name="MSwM"; version="1.4"; sha256="1zhfar02s7hm4gjs1flkh9a4526d98hik8bqrksy75758baiqg7l"; depends=[nlme]; }; MTA = derive2 { name="MTA"; version="0.2.0"; sha256="1wic2rw63h2daha23fpyw80x7ywjwqq6rj5jg73iankvdg32mlvm"; depends=[cartography igraph sf sp]; }; - MTAR = derive2 { name="MTAR"; version="0.1.0"; sha256="1bq930m7rd1kgn5442p8dcycxi55vgkrmlwssva5w0p5javi4x4a"; depends=[CompQuadForm MASS Matrix seqMeta SKAT]; }; + MTAR = derive2 { name="MTAR"; version="0.1.1"; sha256="17r2da1hdvs8qvgar87zdl51jy8w30vczcsi6jrq0rdyi1lld641"; depends=[CompQuadForm MASS Matrix]; }; MTDrh = derive2 { name="MTDrh"; version="0.1.0"; sha256="0ass3b90nr4i0y7v30hk8xhq3hj9bxaxcsr4f8wfi0lnvzfv6aaa"; depends=[]; }; MTE = derive2 { name="MTE"; version="1.0.0"; sha256="009mrl9dgxafl4hrgfzvsfvgx3dljb0rbbs74j2cxc5ray87kp55"; depends=[parcor quantreg]; }; MTGS = derive2 { name="MTGS"; version="0.1.0"; sha256="0ijcw730xap5c38k8z4d976azwcnygxaiv2ksrad8j8nnvnh5zbd"; depends=[glmnet kernlab MRCE]; }; @@ -2489,7 +2495,7 @@ in with self; { MVLM = derive2 { name="MVLM"; version="0.1.4"; sha256="1zcj405dc4jbiqw6p0fcbam8yc9d6yjpmrx5wjw5zjvig3iqb91k"; depends=[CompQuadForm]; }; MVN = derive2 { name="MVN"; version="5.8"; sha256="1rk8zrf3bavywv4bca1aqsfrirxkvxh5lfwrnj0g8zncd69bd1fc"; 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]; }; - MVNtestchar = derive2 { name="MVNtestchar"; version="1.0.0"; sha256="1dsvpjxdf589ngwpga3kznpi6q4i9aaj09hwhvcj1inqg51wiwm6"; depends=[Hmisc]; }; + MVNtestchar = derive2 { name="MVNtestchar"; version="1.0.2"; sha256="08zvyx829bd2rxbz2i4fwr4hd34y93zgqsklp42zk2mrvfwbivbg"; depends=[ggplot2 Hmisc]; }; MVQuickGraphs = derive2 { name="MVQuickGraphs"; version="0.1.2"; sha256="1937w8y866bsn9kn6a98c91akhm9ddc5dr9wqm51lkbjyz1zm0j1"; depends=[plotrix]; }; MVR = derive2 { name="MVR"; version="1.33.0"; sha256="1ygz47a2p5r5axql5zsxvsn25pcqyxz6mpw50zfmzrcqdrfa3bg8"; depends=[statmod]; }; MVT = derive2 { name="MVT"; version="0.3"; sha256="0vinlv3d5daf8q7pd9xgs51nxz2njgdba5750vygmv883srlzi9d"; depends=[]; }; @@ -2508,7 +2514,7 @@ in with self; { MajKMeans = derive2 { name="MajKMeans"; version="0.1.0"; sha256="1zphrxyx3jd6rnh1y1qnc6bip34kfqk1a5ms4ps39gfngznh482m"; depends=[MASS]; }; MakefileR = derive2 { name="MakefileR"; version="1.0"; sha256="1pfjic2lsar8ghbb6byr4rqrs30qrgfih092z4rxdpsiwkk3y7l1"; depends=[magrittr]; }; Mangrove = derive2 { name="Mangrove"; version="1.21"; sha256="1qf3fjzf0sb6fqbfdbxwbw6wah3gg2qran4mgg13hcmk4n3j0hxp"; depends=[]; }; - ManifoldOptim = derive2 { name="ManifoldOptim"; version="0.1.5"; sha256="15549sgsrsq1b5l5bd3flcgzjyyw2ih211a7bdqv592jl672qq29"; depends=[Rcpp RcppArmadillo]; }; + ManifoldOptim = derive2 { name="ManifoldOptim"; version="1.0.0"; sha256="1lds4cs4v3gpibz74cz319x2zkc6nipiqw1ywcrmv125aixxzglp"; depends=[Rcpp RcppArmadillo]; }; ManlyMix = derive2 { name="ManlyMix"; version="0.1.14"; sha256="0zpcc74965n435d4fah41r9nz0kjyn46hkjl1s0kvlllqj6n69wg"; depends=[]; }; ManyTests = derive2 { name="ManyTests"; version="1.2"; sha256="1mi7wvnkcd95126f1h8vl8skn397yd2zqvcswprqar54p161wgyi"; depends=[]; }; Map2NCBI = derive2 { name="Map2NCBI"; version="1.4"; sha256="1ssqnm9g5p0nnhdyp9dqbbsz3hw8jzdwy0rv3csp8fxm0f1bi1kb"; depends=[rentrez]; }; @@ -2524,7 +2530,7 @@ in with self; { Massign = derive2 { name="Massign"; version="1.1.0"; sha256="09i32lsrx40rxrnb9alfipfrkipy4mza5nr4gcpn2a5h86ak9290"; depends=[]; }; MatManlyMix = derive2 { name="MatManlyMix"; version="1.1.1"; sha256="1d2vd5b9lirdybjclxh0nn4mghq64qjj4l8vnj95cni5pfa18a2c"; depends=[]; }; MatSkew = derive2 { name="MatSkew"; version="0.1.5"; sha256="019v2b1r0bvw84xs50smjb3jdz7gd2adz5d84xd8zq43lnml96d1"; depends=[]; }; - MatTransMix = derive2 { name="MatTransMix"; version="0.1.7"; sha256="1p67k2ysh7lahynlfyp30bxpzpc49jhdy2y5mfs09yhjwg0wl1by"; depends=[]; }; + MatTransMix = derive2 { name="MatTransMix"; version="0.1.8"; sha256="0090qfkal40kizr2j6jc9sksg5appp5pv3g8f9yp7jqcgb2hpggd"; depends=[]; }; MatchIt = derive2 { name="MatchIt"; version="3.0.2"; sha256="1pp91pw2sy9hik4sgn4gcsp40hb01n9pfccrwdcffwji5fd1aavq"; depends=[MASS Matching]; }; MatchLinReg = derive2 { name="MatchLinReg"; version="0.7.3"; sha256="1si0zn6vlgyj08841hfjx8an96a8ipnawl4zbalabmpy7r5bfwx8"; depends=[Hmisc Matching]; }; MatchThem = derive2 { name="MatchThem"; version="0.9.3"; sha256="05m141qn0a9ahraga1lpcjffbddmm70bx9m3javrr9727nnar9wf"; depends=[broom dplyr MatchIt mice survey WeightIt]; }; @@ -2539,7 +2545,7 @@ in with self; { MaxPro = derive2 { name="MaxPro"; version="4.1-2"; sha256="19a2wp93kx1wkbzd5bvljbm1rr96gr14w4fb0ppbgr2y2a4g8i1v"; depends=[nloptr]; }; MaxSkew = derive2 { name="MaxSkew"; version="1.1"; sha256="0x5x0jpvhp189jnmgh6d1h3ya0dicj5qfcrgr2fhp1v8jjhl125m"; depends=[]; }; MaxentVariableSelection = derive2 { name="MaxentVariableSelection"; version="1.0-3"; sha256="1cmxfdkm5k85b4ivlfy5521hkfj0gq2pb1qlxxklh0fprw87kp9c"; depends=[ggplot2 raster]; }; - MazamaCoreUtils = derive2 { name="MazamaCoreUtils"; version="0.4.2"; sha256="1p79wc3f1mcv9nlf8z277h1vzxl33w48knhn0yrw902vr5a0lzhf"; depends=[devtools dplyr futile_logger lubridate magrittr purrr rlang stringr tibble]; }; + MazamaCoreUtils = derive2 { name="MazamaCoreUtils"; version="0.4.3"; sha256="08zfd32xhggswzxj35zsvskyaiqx483pkw57f0i2afx3idz3p0am"; depends=[devtools dplyr futile_logger lubridate magrittr purrr rlang stringr tibble]; }; MazamaLocationUtils = derive2 { name="MazamaLocationUtils"; version="0.1.6"; sha256="187lrpc9z3k4jnd1nvqsb0qibz9xz9i1i61vssqm72h1hx1j9j6f"; depends=[digest dplyr geodist httr lubridate magrittr MazamaCoreUtils MazamaSpatialUtils readr revgeo rlang stringr]; }; MazamaSpatialUtils = derive2 { name="MazamaSpatialUtils"; version="0.6.4"; sha256="0wb221h8lwdcx5h5hkvpz9rarizry22qzydibcc2gs6b0d5514ms"; depends=[countrycode dplyr geojsonio lubridate magrittr rgdal rgeos rlang rmapshaper rvest shiny sp stringr xml2]; }; McSpatial = derive2 { name="McSpatial"; version="2.0"; sha256="18nmdzhszqcb5z9g8r9whxgsa0w3g7fk7852sgbahzyw750k95n4"; depends=[lattice locfit maptools quantreg RANN SparseM]; }; @@ -2568,6 +2574,7 @@ in with self; { MetaPCA = derive2 { name="MetaPCA"; version="0.1.4"; sha256="14g4v3hyxnds4l2q36mpz282yqg8ahgdw3b0qmj0xg17krrf5l2s"; depends=[foreach]; }; MetaPath = derive2 { name="MetaPath"; version="1.0"; sha256="1vvpfv6yc4rd4apqfs2yzm97xxsv43ghwqnjq6w1xrc4pdx2p634"; depends=[Biobase genefilter GSEABase impute]; }; MetaSKAT = derive2 { name="MetaSKAT"; version="0.80"; sha256="1hkkirbxl17v7sdbj4646fijlwvdw3p10h97r9h46cw6cn77v5gq"; depends=[SKAT]; }; + MetaStan = derive2 { name="MetaStan"; version="0.2.0"; sha256="035qmzkijaql5d9h1a83p535gihy4bbv9n839q9kpp0l05mdwgwm"; depends=[BH Rcpp RcppEigen rstan rstantools StanHeaders]; }; MetaSubtract = derive2 { name="MetaSubtract"; version="1.60"; sha256="19xg95g2qgyi90pz3733l596gzdj6dmb0k9i4qmhaq4yck69rrhj"; depends=[]; }; MetaUtility = derive2 { name="MetaUtility"; version="2.1.0"; sha256="1lbqqh56pwxlcksv0kf463hc20jb4rkjqkcqal000rzyzd4bi2zj"; depends=[dplyr metafor purrr stringr]; }; MetaboList = derive2 { name="MetaboList"; version="2.0"; sha256="10skvf14ls4qll0l9p6cig4lmj7138khcksyjvd1pqym9axk3wxn"; depends=[dplyr enviPick ggplot2 scales]; }; @@ -2584,10 +2591,11 @@ in with self; { Methplot = derive2 { name="Methplot"; version="1.0"; sha256="0aaqss9zfn55qi45jffxkksnkw510npjnkygafx49vl77bkagqh5"; depends=[ggplot2 reshape]; }; MethylCapSig = derive2 { name="MethylCapSig"; version="1.0.1"; sha256="16ch9aldr6a9jn42h387n7qvnzs0yx28f2yj6xq0kp476q7rf4ql"; depends=[geepack]; }; Metrics = derive2 { name="Metrics"; version="0.1.4"; sha256="0fh8qbjlwzagh272lgwr4bxcqcjb1qpz53mgs8rzlvncax6nk5bk"; depends=[]; }; - MetricsWeighted = derive2 { name="MetricsWeighted"; version="0.5.0"; sha256="0i9wla42i5p9yqjsrhjylyfszxl7p3k4yfwkvqsw9ncak611ig9x"; depends=[]; }; + MetricsWeighted = derive2 { name="MetricsWeighted"; version="0.5.1"; sha256="0gv66ly2cchx6lf75sw4izpy2frdnzficb8xirdgj57h8cg5yppd"; depends=[]; }; MfUSampler = derive2 { name="MfUSampler"; version="1.0.4"; sha256="0i5siq1jacxbfvakb97qnj3h7pk471rrx8ckwm0d8nl3j586s36y"; depends=[ars coda HI]; }; MiDA = derive2 { name="MiDA"; version="0.1.2"; sha256="144gxsxqljzskxsw5k0y69ix0pxlfvyyznxkjpf2ng4l47pg11z5"; depends=[caret gbm genefilter limma preprocessCore pROC SQN]; }; MiRAnorm = derive2 { name="MiRAnorm"; version="1.0.0"; sha256="154wv0j82xyc4y5cd2czh0q8kzhgrk6qsn0ahc1zn3fnrzc9fgz0"; depends=[ArgumentCheck cluster dendextend ggplot2 MASS npmv plyr reshape2]; }; + MiRKAT = derive2 { name="MiRKAT"; version="1.1.0"; sha256="15ah3zgf67sv0rxw99qvxsfbivni5pkcrmqhf0c3656bjwb397hd"; depends=[CompQuadForm ecodist GUniFrac lme4 MASS Matrix mixtools PearsonDS permute quantreg survival]; }; MiRSEA = derive2 { name="MiRSEA"; version="1.1"; sha256="0jpl6ws5yx1qjzdnip9a37nmvx81az4cbsjm57x613qjpwmg6by3"; depends=[]; }; MiSPU = derive2 { name="MiSPU"; version="1.0"; sha256="1l6q0fm5z5i6gigr940h8kc5rka08psmhcprp8grmsxk3qy2kply"; depends=[ape aSPU cluster Rcpp RcppArmadillo vegan]; }; MiST = derive2 { name="MiST"; version="1.0"; sha256="0gqln792gixqfh201xciaygmxbafa0wyv5gpbg9w5zkbbv44wrfk"; depends=[CompQuadForm]; }; @@ -2629,11 +2637,11 @@ in with self; { ModelMetrics = derive2 { name="ModelMetrics"; version="1.2.2.2"; sha256="0mrlsw4c5y1vdsqynxr2dcvmhh5h37pnd71jw5a5djpbda9g21jy"; depends=[data_table Rcpp]; }; Modelcharts = derive2 { name="Modelcharts"; version="0.1.0"; sha256="1jy78kyyh4r13px2d5bm7fra5bkcpimzfji0hmydspkfi3qla37x"; depends=[dplyr plotly]; }; Modeler = derive2 { name="Modeler"; version="3.4.5"; sha256="15gbg5568qj81wp6yy31amb2b7wl1wvlmgpmdp29lvz1p33jx2y1"; depends=[class ClassComparison ClassDiscovery e1071 neuralnet nnet oompaBase randomForest rpart TailRank]; }; - MomTrunc = derive2 { name="MomTrunc"; version="5.79"; sha256="01pbajb2vziw3hl4600mcwdljkh3lmacqz14mknj0fkd2qnqdrnm"; depends=[hypergeo mvtnorm Rcpp RcppArmadillo tlrmvnmvt]; }; + MomTrunc = derive2 { name="MomTrunc"; version="5.87"; sha256="1mnas2vws54h8zzf7f0drnk00rphfxr8g2277gcknbfpr8xkwacz"; depends=[hypergeo mvtnorm Rcpp RcppArmadillo tlrmvnmvt]; }; + Momocs = derive2 { name="Momocs"; version="1.3.0"; sha256="149q4qyplgvcvscg7846m0cjagvby3rj40g9bpx6kvd67arfrl6y"; depends=[cluster dendextend dplyr geometry geomorph ggplot2 jpeg magrittr MASS progress RColorBrewer rgeos sp vegan]; }; Mondrian = derive2 { name="Mondrian"; version="1.0-0"; sha256="07r64q518diphai951pw4vfaw4sd6bqwhi6q5cp4pcl3aqjynkmj"; depends=[RColorBrewer]; }; MonetDB_R = derive2 { name="MonetDB.R"; version="1.0.1"; sha256="1r7vki0rrzwcrfg4f2lfx30g614vf2xi62qb1rs21a9j5741lxlx"; depends=[codetools DBI digest]; }; MonoInc = derive2 { name="MonoInc"; version="1.1"; sha256="14rykw3bfj0vznz0rw4vsg1k4vanfv9cy867vspw966ncl4bw70h"; depends=[compare doParallel foreach iterators sitar]; }; - MonoPhy = derive2 { name="MonoPhy"; version="1.2"; sha256="0997kg8hfwgsc9s155z0wrf7rrhn3vf6681j9psjl3hsspg08z2r"; depends=[ape phangorn phytools RColorBrewer taxize]; }; MonoPoly = derive2 { name="MonoPoly"; version="0.3-10"; sha256="0ls3sjfkinp9c5002ww0xm4l2galf20w2f45nm5irkk9sbqas0jq"; depends=[quadprog]; }; Monte_Carlo_se = derive2 { name="Monte.Carlo.se"; version="0.1.0"; sha256="1d5gp4wvpvrlp82g8k8v668mzhmdlk2pvky34v7hxysap9xgmsqr"; depends=[]; }; MonteCarlo = derive2 { name="MonteCarlo"; version="1.0.6"; sha256="1jwq3by8zfy6sbzahcj5l0vicqn7yyqpb7xhfsaymfspm7xyq6pj"; depends=[abind codetools reshape rlecuyer snow snowfall]; }; @@ -2651,7 +2659,7 @@ in with self; { MtreeRing = derive2 { name="MtreeRing"; version="1.4.2"; sha256="097w65ijhdkag26z39kzqqp7bs3bcx4iqapj3qc8inh0iynhnxp6"; depends=[bmp dplR dplyr imager jpeg magick magrittr measuRing png shiny shinydashboard shinyWidgets spatstat tiff]; }; MuChPoint = derive2 { name="MuChPoint"; version="0.6.1"; sha256="15bqsc7bsjg55qxjwxh58bxbwz61a6wv4xxph994g4020b98l01x"; depends=[capushe Matrix Rcpp shiny]; }; MuFiCokriging = derive2 { name="MuFiCokriging"; version="1.2"; sha256="09p8wdmlsf21ibqyjigwdipcin3ij0naxcd035hqgfj76v20wiyv"; depends=[DiceKriging]; }; - MuMIn = derive2 { name="MuMIn"; version="1.43.15"; sha256="1xp0r7yqvll90jv7i5jx142vj5pmfpfmmn6i9a7kgqx26yzpq87h"; depends=[Matrix nlme]; }; + MuMIn = derive2 { name="MuMIn"; version="1.43.17"; sha256="1ac78wg94j37ikwb8r1lxk6jlj3m804q94630i5vcm663p99cqdc"; depends=[Matrix nlme]; }; MuViCP = derive2 { name="MuViCP"; version="1.3.2"; sha256="1wkiwdz4bblxf1zr57khljqkga9ks9aj1lnidvmhib94q6b8fnf4"; depends=[gtools MASS sm]; }; MullerPlot = derive2 { name="MullerPlot"; version="0.1.2"; sha256="0am5brdmbh2mw74fbw9nha6h4qlhj8psg3142mql1ad99bd0zg4w"; depends=[RColorBrewer]; }; MultAlloc = derive2 { name="MultAlloc"; version="1.2"; sha256="0c3sqfaa08s8mk4yz77kh6q6v9ic5xp52g9prfw1k2kv4nw1k2qd"; depends=[Rglpk]; }; @@ -2713,10 +2721,9 @@ in with self; { NGBVS = derive2 { name="NGBVS"; version="0.2.0"; sha256="1k7m7wy54irqci6ccclpylbmz0613ha7r531cji99jb7nkpzl6l0"; depends=[Rfast]; }; NGSSEML = derive2 { name="NGSSEML"; version="1.0"; sha256="1kwdziv2rdswbjq2rir2a6yw6ldnck1z7hahyywvw0kbm5fkb4zq"; depends=[car dlm fields interp mvtnorm]; }; NHANES = derive2 { name="NHANES"; version="2.1.0"; sha256="0aphv3rakfcfrv2km1xyxpj1bxiazy6gwrvs7lyhxmq468fk4c9a"; depends=[]; }; - NHEMOtree = derive2 { name="NHEMOtree"; version="1.0"; sha256="0ycprj2rz2fy6a7ps0bsr27iphmbfxi9pbvl8rcr6p8yagfb84mb"; depends=[emoa partykit rpart sets]; }; NHLData = derive2 { name="NHLData"; version="1.0.0"; sha256="0dfqalccbkmqrn3h1z6s78l818c8sqn7d6yc8mg872ygmszryci7"; depends=[]; }; NHMM = derive2 { name="NHMM"; version="3.10"; sha256="058p0lyizqhdhapvjxk2c7n0bpid340hv1dn0cypy5w12y7zml4s"; depends=[BayesLogit MASS MCMCpack msm Rcpp]; }; - NHMSAR = derive2 { name="NHMSAR"; version="1.16"; sha256="0qwc7hnzr69xfwxgg151j7d8ffas66w48d4p76njrkq7l7rb9681"; depends=[glasso lars ncvreg ucminf]; }; + NHMSAR = derive2 { name="NHMSAR"; version="1.17"; sha256="149zzk8apl4zv60xagl8zk3zv1fnrbfijmlwn8c4vypvlfdsr981"; depends=[glasso lars ncvreg ucminf]; }; NHPoisson = derive2 { name="NHPoisson"; version="3.3"; sha256="1i6n59ckcxk1hwyz97jmnv4yb96ianjma6ka8lpz79ivs41jniad"; depends=[car]; }; NHSRdatasets = derive2 { name="NHSRdatasets"; version="0.1.2"; sha256="0xiqbqq7xjyi1vxza853ylyiq4nqr6y10x8i13c2kj756biz4h1n"; depends=[]; }; NIPTeR = derive2 { name="NIPTeR"; version="1.0.2"; sha256="0ll6amqyw33a93xiccihidrnbaqlx1q7kqcd4wks7cvqawd8pgv1"; depends=[Rsamtools S4Vectors sets]; }; @@ -2737,7 +2744,7 @@ in with self; { NMOF = derive2 { name="NMOF"; version="2.1-0"; sha256="10dxy35ps8qmyfqhrz0g1yyc30d84wwmf084m94nv0pk87blw7s3"; depends=[]; }; NMVANOVA = derive2 { name="NMVANOVA"; version="1.1.0"; sha256="1jlqyg5vn7j8srvifjghd5a7820kadl8kbwib4qxalrfprq81h8p"; depends=[]; }; NNMIS = derive2 { name="NNMIS"; version="1.0.1"; sha256="1w2i4xlx249p589yqdgbx1ra406ycxw729vbk1lqadbn71m6blaz"; depends=[survival]; }; - NNS = derive2 { name="NNS"; version="0.5.0"; sha256="0faqxl7bsf819qljr5v7zgrvpadkxbkawmfjwd9cy23qms8dwphg"; depends=[data_table doParallel dtw rgl stringr]; }; + NNS = derive2 { name="NNS"; version="0.5.1"; sha256="1mlswbxqinqk5vayfnirrj5q738g76g5h0ws4wnayzcrgqf697a7"; depends=[data_table doParallel dtw rgl stringr]; }; NNTbiomarker = derive2 { name="NNTbiomarker"; version="0.29.11"; sha256="0sqlf7vzhpmq2g98c2qlrcqn3ba4ycfxbczgcjiqqhqsvgkpacc1"; depends=[magrittr mvbutils shiny stringr xtable]; }; NORMA = derive2 { name="NORMA"; version="0.1"; sha256="193q6dwn8v7k8xq0amjpvb3v6mn7c6agqa487gvjj78dy1qz720a"; depends=[rootSolve]; }; NORMT3 = derive2 { name="NORMT3"; version="1.0-3"; sha256="041s0qwmksy3c7j45n4hhqhq3rv2hncm2fi5srjpwf9fcj5wxypg"; depends=[]; }; @@ -2755,7 +2762,7 @@ in with self; { NPS = derive2 { name="NPS"; version="1.1"; sha256="02idja149a2sj97sks4lhsaflpifyxi6n0rjlcq9993f84szfgsi"; depends=[]; }; NPflow = derive2 { name="NPflow"; version="0.13.3"; sha256="1bgdkm82pmzjv46pkxpvh5ffffmc6q68x5jjl7k330w9vwgx2kf0"; depends=[ellipse fastcluster ggplot2 pheatmap Rcpp RcppArmadillo reshape2 truncnorm]; }; NPsimex = derive2 { name="NPsimex"; version="0.2-1"; sha256="1k9i1f5ckvzdns8f5qnm2zq7qs3wsgzsnfwdz21zmhmi6d0pwchm"; depends=[]; }; - NSM3 = derive2 { name="NSM3"; version="1.13"; sha256="0icjx9whn6ff25rh2p3pd8y3yc0f4ssw00g25dryzhfclqkcf006"; depends=[agricolae ash binom BSDA coin combinat fANCOVA gtools Hmisc km_ci MASS metafor nortest np partitions quantreg Rfit SemiPar SuppDists survival waveslim]; }; + NSM3 = derive2 { name="NSM3"; version="1.14"; sha256="0w6ls6k3m395wka6zl64i0nvxjm9c6b3yyd80f6k9k14lmgivm8p"; depends=[agricolae ash binom BSDA coin combinat fANCOVA gtools Hmisc km_ci MASS metafor nortest np partitions quantreg Rfit SemiPar SuppDists survival waveslim]; }; NSO1212 = derive2 { name="NSO1212"; version="1.0.0"; sha256="1yk07n9ksbazj27sax5jhs5f84zy80awrvkhziclsqm3h1g3h7w5"; depends=[httr jsonlite]; }; NST = derive2 { name="NST"; version="2.0.4"; sha256="0kwdfqr30av50k1s8sdf7714kzq9z1qrg85c3r7ljzrajj16vnl3"; depends=[ape permute vegan]; }; NSUM = derive2 { name="NSUM"; version="1.0"; sha256="1as4g3v7qlk9wxlpwhg293980jq9gy6qay77bbcrjf481gvkkbp6"; depends=[MASS MCMCpack]; }; @@ -2819,6 +2826,7 @@ in with self; { Numero = derive2 { name="Numero"; version="1.4.2"; sha256="1g9jbgygpr22lbikslkdmf7zphrcw826ijkc567av7c96nr9wkib"; depends=[Rcpp]; }; NutrienTrackeR = derive2 { name="NutrienTrackeR"; version="0.99.2"; sha256="1vzha3ywjbd877fqy3r2xkgi8m44s3ss65bij0vcc4mx8lajhgb5"; depends=[ggplot2]; }; OAIHarvester = derive2 { name="OAIHarvester"; version="0.3-0"; sha256="1c57jxb9n397wdkrirbfh70sxllrg9zsy0np698z7kcx83rz5lqr"; depends=[curl xml2]; }; + OBASpatial = derive2 { name="OBASpatial"; version="1.1"; sha256="1a6n440z50v75ms3lmjsa9z7cz0fkmj3k98wsqhq1s7sazd85am4"; depends=[cubature invgamma LaplacesDemon modeest truncdist]; }; OBMbpkg = derive2 { name="OBMbpkg"; version="1.0.0"; sha256="01wch8wwij3fd0jambk0hpkhlnp4ryrq8qnnr2w1iad9zssjyii5"; depends=[]; }; OBsMD = derive2 { name="OBsMD"; version="5.3"; sha256="10acj6d0nvf1zyirp001c2fhsg2gq33zywnp8w70gm1dk7pgzfzr"; depends=[]; }; OCA = derive2 { name="OCA"; version="0.1"; sha256="0kaf46gic8gp8f98y68kqvgm1baicwgvarfiwry1j0bd2rjad64d"; depends=[]; }; @@ -2849,6 +2857,7 @@ in with self; { OSMscale = derive2 { name="OSMscale"; version="0.5.1"; sha256="0rjhyhh1iafgd9h1pbd2clyg2sh0gg7y1aqmiislqyn6h6jrvgqn"; depends=[berryFunctions OpenStreetMap sp]; }; OSNMTF = derive2 { name="OSNMTF"; version="0.1.0"; sha256="0g83wqh97iz3g4ganj2dy3biyn8cmb0v8zz6rydald1hfszj8aa2"; depends=[dplyr MASS]; }; OSTSC = derive2 { name="OSTSC"; version="0.0.1"; sha256="0p92w25xvajsn44rd5hg1m7l9l4m0rpmw175nnqr438432hqh7cc"; depends=[doParallel doSNOW fields foreach MASS]; }; + OTE = derive2 { name="OTE"; version="1.0.1"; sha256="0jvvrrfhpc5kibbxrd5r4dj97jp5m072fxnkpcyz11gi65db3z4g"; depends=[randomForest]; }; OTRselect = derive2 { name="OTRselect"; version="1.0"; sha256="1bh14228yz552ngywjf1qyh1isqj4cgiy7n7d4zg8dpqwxr04ykp"; depends=[lars survival]; }; OTUtable = derive2 { name="OTUtable"; version="1.1.2"; sha256="1sm037ihm12xyp7ns5f0c1psflvm1aj3xnsj5nzh2rsjn35hvd6h"; depends=[]; }; OTclust = derive2 { name="OTclust"; version="1.0.2"; sha256="1nrgjn13nbki59i51m28h3z0bppmvcp7qgv09h2r2vvdk858iy9z"; depends=[class ggplot2 magrittr RColorBrewer Rcpp]; }; @@ -2865,7 +2874,7 @@ in with self; { Omisc = derive2 { name="Omisc"; version="0.1.2"; sha256="0ww83srfc7vr1gw2aaa5bahs6lvm11j4057hn06pclz1wb6fnbyw"; depends=[copula MASS psych]; }; OmnibusFisher = derive2 { name="OmnibusFisher"; version="1.0"; sha256="0x3q04g45nixgsrl4biqqi6bk4kx79spq5whm3n4ppr0nkv8dw4h"; depends=[CompQuadForm stringr survey]; }; OnAge = derive2 { name="OnAge"; version="1.0.1"; sha256="1zby5sf92c185b5m19jv4ndgbv6mz107nc47zn1d6bijrypzpc20"; depends=[]; }; - OncoBayes2 = derive2 { name="OncoBayes2"; version="0.6-3"; sha256="1m05m6g98az7qy14j3w0r5vym997a6c564y4ispl711s609yg2rr"; depends=[abind assertthat bayesplot BH checkmate dplyr Formula ggplot2 RBesT Rcpp RcppEigen rstan rstantools StanHeaders tibble tidyr]; }; + OncoBayes2 = derive2 { name="OncoBayes2"; version="0.6-4"; sha256="15l15yz547drhj7j02wq1qiqh74b3fivsmpzabhfc6ipblzil3vs"; depends=[abind assertthat bayesplot BH checkmate dplyr Formula ggplot2 RBesT Rcpp RcppEigen rstan rstantools StanHeaders tibble tidyr]; }; Oncotree = derive2 { name="Oncotree"; version="0.3.3"; sha256="147rc9ci66lxbb91ys2ig40sgmldi15p604yysrd4ccbxpbk2zwf"; depends=[boot]; }; OneArmPhaseTwoStudy = derive2 { name="OneArmPhaseTwoStudy"; version="1.0.3"; sha256="0q8g33s1jq0ipvwq83xhrly8idsh68licgyivxc628zbm1id5p38"; depends=[Rcpp]; }; OneR = derive2 { name="OneR"; version="2.2"; sha256="1k7rzhcwq5b2yi4zfsc1r0yb6w65gxj9835d2a1dclallja3zav2"; depends=[]; }; @@ -2873,7 +2882,7 @@ in with self; { OpasnetUtils = derive2 { name="OpasnetUtils"; version="1.3"; sha256="0mmn4dpk1wl8slg55xzhpk7jdwhkrka53rwmrsr73sikkh3mcyfn"; depends=[digest ggplot2 httpRequest igraph plyr RCurl reshape2 rgdal rjson sp triangle xtable]; }; OpenCL = derive2 { name="OpenCL"; version="0.2-1"; sha256="1bhnqwrb8phldk5hr06iyvw8fx03x01ddqr4y5zs4a1wpyah7j2w"; depends=[]; }; OpenImageR = derive2 { name="OpenImageR"; version="1.1.6"; sha256="1yl7xvb86vxyf8d5g58hhmrva0gyg8iabb9npsdlnl8j0bg5gfiw"; depends=[jpeg png R6 Rcpp RcppArmadillo shiny tiff]; }; - OpenLand = derive2 { name="OpenLand"; version="1.0.0"; sha256="0y4hhld08dj82j1dqmm5ywq8dkfcnlgg3g6ndhcj4h6ihrwq4xc7"; depends=[circlize dplyr ggplot2 gridExtra networkD3 raster tidyr]; }; + OpenLand = derive2 { name="OpenLand"; version="1.0.1"; sha256="1wa7hkfwvzzj9lm07hdajwf6g8ys3g2ff8vqva3gqwqa9j1fam9n"; depends=[circlize dplyr ggplot2 gridExtra networkD3 raster tidyr]; }; OpenML = derive2 { name="OpenML"; version="1.10"; sha256="132swv22ymm0wxq8y65y2niq8chmga1mnl1lgn6m3cgljvwad47r"; depends=[backports BBmisc checkmate curl data_table digest httr jsonlite memoise stringi XML]; }; OpenMPController = derive2 { name="OpenMPController"; version="0.2-5"; sha256="00hs8v47pr2d726z8izkfrgmayw147hdm16rr9rw1zs3ad216zjj"; depends=[]; }; OpenMx = derive2 { name="OpenMx"; version="2.17.3"; sha256="1s2pcg281ag3qz2wz8yi826f2d3kj3qg916js7zz0nsrljcyv5bc"; depends=[BH digest MASS Matrix Rcpp RcppEigen rpf StanHeaders]; }; @@ -2885,7 +2894,7 @@ in with self; { OptHedging = derive2 { name="OptHedging"; version="1.0"; sha256="0g7qaf5abvbcqv2h1dciwn3gwpz084ryqjjk0yabdm4ym0y38ddm"; depends=[]; }; OptInterim = derive2 { name="OptInterim"; version="3.0.1"; sha256="1ks24yv5jjhlvscwjppad27iass59da1mls99hlif0li9mvkbvyk"; depends=[clinfun mvtnorm]; }; OptM = derive2 { name="OptM"; version="0.1.3"; sha256="1dykfhnkrqz2axzzggpzaiknd52rx8zj4nk3nv2rvh74f9hv8px7"; depends=[boot SiZer]; }; - OptSig = derive2 { name="OptSig"; version="2.0"; sha256="1d5baq6zq5vkklg8sabzs9kril95swvqd6fzkfywixsqnyywcvvm"; depends=[pwr]; }; + OptSig = derive2 { name="OptSig"; version="2.1"; sha256="1k43qsjdc00plgsindjkfn6v098v0zfy7sjkh4n4ybib2qx3v8fn"; depends=[pwr]; }; OptimClassifier = derive2 { name="OptimClassifier"; version="0.1.5"; sha256="1j2svfy5lzvz5vazpf55fvzqy5kk0l47x8qfy6j2jz1dc3gjh2rs"; depends=[clisymbols crayon dplyr e1071 ggplot2 lme4 lmtest MASS nnet nortest rpart]; }; OptimaRegion = derive2 { name="OptimaRegion"; version="1.1"; sha256="1bikc12a5v3q7f26r14pdfmnxpyqzxa94a10mx5g954km3a329ly"; depends=[boot DepthProc fields geometry magrittr mclust nloptr Rdpack Rdsdp rsm spam stringr]; }; OptimalCutpoints = derive2 { name="OptimalCutpoints"; version="1.1-4"; sha256="0n2vmzkc733yzs155zdj2n8ng74x9hy4m91fl7fac8d4gnrnc8yg"; depends=[]; }; @@ -2904,7 +2913,7 @@ in with self; { 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.1"; sha256="0z4797j2gr37c1jnhivczff3y2dd2kilyncc087ihpwaa26wv0nl"; depends=[DDoutlier depth depthTools ggplot2 ldbod plotly spatstat]; }; - OutliersO3 = derive2 { name="OutliersO3"; version="0.6.2"; sha256="197r5mxvg968hisgqsd0p1sxjsakmn27gpsh3qx3cnvs1pikj3dr"; depends=[cellWise dplyr FastPCS forcats GGally ggplot2 HDoutliers memisc rlist robustbase robustX tidyr]; }; + OutliersO3 = derive2 { name="OutliersO3"; version="0.6.3"; sha256="165v572w9bnvay9f0xyxzbhgj1i86ndia4rzqy98i48dfdbdb990"; depends=[cellWise dplyr FastPCS forcats GGally ggplot2 HDoutliers memisc rlist robustbase robustX tidyr]; }; OutrankingTools = derive2 { name="OutrankingTools"; version="1.0"; sha256="0z7pslkkinn7flc4xwjg0bsfswf8ad4jv9rmglaj3fmjcx9b6wgj"; depends=[igraph]; }; OwenQ = derive2 { name="OwenQ"; version="1.0.3"; sha256="0kra8pvz21kqwzwsrqh6vwfyq9qqrar3glcycd2gip19273whdim"; depends=[BH Rcpp RcppEigen RcppNumerical]; }; OxyBS = derive2 { name="OxyBS"; version="1.5"; sha256="11l3gm0jvw993jb13f6kpv77m6z0d1jswscma2v28qzkw053r3dc"; depends=[]; }; @@ -2915,9 +2924,8 @@ in with self; { PAFway = derive2 { name="PAFway"; version="0.1.3"; sha256="1ggmqbls8i5zqihzi66kaw09bbip2spiiizfzkx7amcvpm8zsr7r"; depends=[GGally ggplot2 igraph network scales sna]; }; PAGI = derive2 { name="PAGI"; version="1.0"; sha256="01j1dz5ihqslpwp9yidmhw86l112l7rfkswmf03vss872mpvyp3f"; depends=[igraph]; }; PAGWAS = derive2 { name="PAGWAS"; version="2.0"; sha256="0bz47ivd32kx1amgqllqbxyyvj773q7wasgk924hmibabiixa8nx"; depends=[foreach lars mnormt]; }; - PAMA = derive2 { name="PAMA"; version="0.1.0"; sha256="19mz37h1kcfff7fkshg6qzgwm9vqgbzwjkcs5ydd1v6xq37lzapm"; depends=[mc2d PerMallows]; }; + PAMA = derive2 { name="PAMA"; version="0.1.1"; sha256="0iwfak74422gmfciin940rkqg7m2dkzv0d52jrkk0i6z58rhs426"; depends=[mc2d PerMallows]; }; PANDA = derive2 { name="PANDA"; version="0.9.9"; sha256="1sf3c49v4mb3mz2imqlqdbh1iab7bc2pxpi8bmgj2jld133555ip"; depends=[cluster GO_db]; }; - PANICr = derive2 { name="PANICr"; version="1.0.0"; sha256="167s1p7y8mmhcdnng0s5i09kjfh088jhmxs74rkyda52l9hyx363"; depends=[coda MCMCpack xts]; }; PARSE = derive2 { name="PARSE"; version="0.1.0"; sha256="0y408va1rfn3j8cb1i0k8kypyg9mb6yfj513l54f23z31d3bi45m"; depends=[doParallel foreach gplots mvtnorm]; }; PAS = derive2 { name="PAS"; version="1.2.5"; sha256="175p3bnpnhknfsc29hri0l2ipz1x6qcxs2bq7awns8lccam466r2"; depends=[glmnet]; }; PASWR = derive2 { name="PASWR"; version="1.1"; sha256="1rxymnqvflypc6m62f5vw65l8x1m2yah7r11hhpmzdq2l2sg8fci"; depends=[e1071 lattice MASS]; }; @@ -2939,6 +2947,7 @@ in with self; { 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]; }; + PCAmatchR = derive2 { name="PCAmatchR"; version="0.1.6"; sha256="0q4cs9212k1rmmgqy6lq99r6zb96iryszwh0d1xvg03gy7v1xn61"; depends=[]; }; PCAmixdata = derive2 { name="PCAmixdata"; version="3.1"; sha256="0flrsnbchwk06dmkg3vqykp9n4pqs265szn1r10navp8ki3rrmvh"; depends=[]; }; PCDSpline = derive2 { name="PCDSpline"; version="1.0"; sha256="15kmvcwvwlsr1107n7mfajvf9b1kcslnhsdx0drjjhsvq193qrqa"; depends=[matrixcalc nleqslv]; }; PCDimension = derive2 { name="PCDimension"; version="1.1.11"; sha256="0kpw0rpb9k82psfpd19vvvsakvm0pcz1n3kkkcihagp1kzlv4xkw"; depends=[changepoint ClassDiscovery cpm kernlab oompaBase]; }; @@ -2967,16 +2976,17 @@ in with self; { PGM2 = derive2 { name="PGM2"; version="1.0-1"; sha256="03282pcq7gw47awc2mxjsbz6w3zpqjhqd7fzg8la4p00cd0vvmr4"; depends=[]; }; PGRdup = derive2 { name="PGRdup"; version="0.2.3.5"; sha256="11lq2l0j6l3ixi3fmz2gd0idypl18gkhqfwbgg41gzzwj92lsrq4"; depends=[data_table ggplot2 gridExtra igraph stringdist stringi]; }; PHENIX = derive2 { name="PHENIX"; version="1.3.1"; sha256="1gd9ycrwawi81al4f5v559km1112giwqnwvvk8ynj4kdb5bqpyq4"; depends=[ppcor SuppDists]; }; - PHEindicatormethods = derive2 { name="PHEindicatormethods"; version="1.3.0"; sha256="1skjmrbqh5jm9h7nsgw91bq1ca8jyp59r97m4pd4aahcslab4zaq"; depends=[broom dplyr purrr rlang tidyr]; }; + PHEindicatormethods = derive2 { name="PHEindicatormethods"; version="1.3.1"; sha256="1q07jah44iajyrxqavxlgm752b46bjy5qcc6a36qjd6nbgx60ajh"; depends=[broom dplyr purrr rlang tibble tidyr]; }; PHInfiniteEstimates = derive2 { name="PHInfiniteEstimates"; version="1.3"; sha256="097a1wqh6c8y0ny6ikpkfqym4fw2vz7rrhqpf6xfb71vf3big90k"; depends=[coxphf lpSolve mlogit Rdpack survival]; }; - PHYLOGR = derive2 { name="PHYLOGR"; version="1.0.10"; sha256="17q760k5519alr2skvpnghz3c9jgw07lh5fpw4xf6hjk3qlqq82c"; depends=[]; }; + PHYLOGR = derive2 { name="PHYLOGR"; version="1.0.11"; sha256="1fq2ny093b4881nwgj6wr8qd5g4dcxb51sdx40ndyxxpq6jj16n9"; depends=[]; }; PHeval = derive2 { name="PHeval"; version="0.5.4"; sha256="06fy5dm4mnp29f01163rw1d1hyl7rlcp4pfw18s87ckpr931qyma"; depends=[survival]; }; PIGShift = derive2 { name="PIGShift"; version="1.0.1"; sha256="115dnsh4b1rxx1d2kc8x3vl5366h5f0i6gg8l1w3v0f8309qigis"; depends=[ape mvtnorm]; }; - PINSPlus = derive2 { name="PINSPlus"; version="2.0.1"; sha256="0fx07nkmh467iql8s4sy9llnnmd2rcl33vjny04r4am28rwkq4k2"; depends=[cluster doParallel entropy FNN foreach matrixStats Rcpp RcppArmadillo RcppParallel]; }; + PINSPlus = derive2 { name="PINSPlus"; version="2.0.2"; sha256="0i7fl5ns8i9vdgdb10nqljxqfl2xsnmshvyibp141ashp78hxwna"; depends=[cluster doParallel entropy FNN foreach irlba matrixStats mclust Rcpp RcppArmadillo RcppParallel]; }; PIPS = derive2 { name="PIPS"; version="1.0.1"; sha256="1c5v3s6xys9p1q32k6mpsffhi9gwsq951rh12hs76dmak862yspc"; depends=[]; }; PK = derive2 { name="PK"; version="1.3-5"; sha256="1wzz2qv6h6nc2hcsg4098951i608xbbhc9f9ngamfigh5sbmzbh6"; depends=[]; }; - PKI = derive2 { name="PKI"; version="0.1-5.1"; sha256="1xs3jxbczhkxnp7cyw2yh1jcwha92y9pdsbka1ligbla70bnvxyj"; depends=[base64enc]; }; - PKNCA = derive2 { name="PKNCA"; version="0.9.2"; sha256="091gxv2ajrlxh73rwim6miz4pzpix5917f40hh6wz25c7fkdbafs"; depends=[digest dplyr nlme rlang tidyr]; }; + PKI = derive2 { name="PKI"; version="0.1-7"; sha256="1y02s9g883b2i0ma5n4bz2ik06b9y7y75yhcdilmln2f9p9jyrr1"; depends=[base64enc]; }; + PKNCA = derive2 { name="PKNCA"; version="0.9.3"; sha256="0dbhzdbmcxvia21gn7mqmx7rinykyya2605nnrb7vbw1w6r1sjdv"; depends=[digest dplyr nlme rlang tidyr]; }; + PKPDmisc = derive2 { name="PKPDmisc"; version="2.1.2"; sha256="1cw0bfjwd1h1wbnb66271r1q0j205bdgpd4mdhn0nnigdjlxv549"; depends=[BH data_table dplyr ggplot2 lazyeval magrittr purrr Rcpp readr rlang stringr tibble]; }; PKPDmodels = derive2 { name="PKPDmodels"; version="0.3.2"; sha256="1h893civ77ahbgjnc6kq3l7rszmqmx9dlxwavldigpq3r79vd86k"; depends=[]; }; PKconverter = derive2 { name="PKconverter"; version="1.5"; sha256="1zk2sjrjhq7n2k2p29r2qc6qdghr3riyjvvawz0g74lidg7hm1ly"; depends=[shiny shinydashboard shinythemes]; }; PKgraph = derive2 { name="PKgraph"; version="1.7"; sha256="0g36cdv5cblqx69j48irxjc5nlw2cl3p714mlsblnd3362z1brwn"; depends=[cairoDevice ggplot2 gWidgetsRGtk2 lattice proto rggobi RGtk2]; }; @@ -3011,20 +3021,18 @@ in with self; { PPforest = derive2 { name="PPforest"; version="0.1.1"; sha256="0iplbw5b2vhqbp6gc123ykzmilwa80akljkv3jzfmi90ckm4k08m"; depends=[doParallel dplyr magrittr plyr Rcpp RcppArmadillo tidyr]; }; PPtree = derive2 { name="PPtree"; version="2.3.0"; sha256="002qjdx52r2h90wzrf2r3kz8fv3nwx08qbp909whn6r4pbdl532v"; depends=[MASS penalizedLDA]; }; PPtreeViz = derive2 { name="PPtreeViz"; version="2.0.4"; sha256="008hlgi56p9wydpsb2f1dxi4slml7p417c34lw00hivbl53d6x97"; depends=[ggplot2 gridExtra partykit Rcpp RcppArmadillo]; }; - PQLseq = derive2 { name="PQLseq"; version="1.1"; sha256="1h8baf0apxvimarr2qwlh6pdzv88ib1dzw927swsyimjg44wjbfc"; depends=[doParallel foreach Matrix Rcpp RcppArmadillo]; }; PREPShiny = derive2 { name="PREPShiny"; version="0.1.0"; sha256="0zsg07y6nhp2lma3pdz8xd981y3mh8k21il5jv0inma1d1xr4g3f"; depends=[dplyr psycho rmarkdown shiny]; }; PRIMAL = derive2 { name="PRIMAL"; version="1.0.2"; sha256="04fn0c10v9ai7vrrd4qr84rid3x42wq749rn5p1i6nkvmjv3dnhs"; depends=[Matrix Rcpp RcppEigen]; }; PRIMME = derive2 { name="PRIMME"; version="3.0-0"; sha256="1wvwdsaqg5rqx93svvhjvi64x6vxbr0a8za0a7cixy0vdg14vli4"; depends=[Matrix Rcpp]; }; PRIMsrc = derive2 { name="PRIMsrc"; version="0.8.2"; sha256="04g1saf511xs26m1iv9xfsmfs15fdfaxh5qlbay2mcb198270pd8"; depends=[glmnet Hmisc quantreg superpc survival]; }; - PRISM_forecast = derive2 { name="PRISM.forecast"; version="0.1.6"; sha256="0w0fjbaafq90ac35h70z8g95q1i812v0ivkif4lx8l3q7rhjrvb5"; depends=[glmnet xts zoo]; }; + PRISM_forecast = derive2 { name="PRISM.forecast"; version="0.2.0"; sha256="1r2fjnd5wjlb0y5x9pnh80dmkdfdr9yhqckynkc92ngc7dr1f44z"; depends=[glmnet xts zoo]; }; PRISMA = derive2 { name="PRISMA"; version="0.2-7"; sha256="0sk2d07m8rhipa0kdbaf8ngryda6f1ihp5akpnyw2llajf0x8as5"; depends=[ggplot2 gplots Matrix]; }; PRISMAstatement = derive2 { name="PRISMAstatement"; version="1.1.1"; sha256="1vvab8h71g8c910s2h4d12qafqdncfzmsh5f1b4m79plpqi3s49z"; depends=[DiagrammeR]; }; PROBShiny = derive2 { name="PROBShiny"; version="0.1.0"; sha256="17p6pb8nwq36ha697f2lf8nwzj5cylmh8rdzyag49ks5hi9painb"; depends=[epitools LaplacesDemon rmarkdown rpivotTable shiny shinyMatrix]; }; - PROJ = derive2 { name="PROJ"; version="0.1.5"; sha256="0wff6cqyq3ixsglflz5fyfg10akmwhh6np6jc158llxbb3krxjx3"; depends=[]; }; + PROJ = derive2 { name="PROJ"; version="0.1.6"; sha256="0h0iky99wqb4cz7imrwz2p3w71s8n21vfdjwi30w240vim6d3lgg"; depends=[]; }; PROMETHEE = derive2 { name="PROMETHEE"; version="1.1"; sha256="0r53mb9ndwm4yli3h50cfamsjzpq6b67g72mszm7lpbqpj58wqw6"; depends=[lpSolve]; }; PROSPER = derive2 { name="PROSPER"; version="0.3.2"; sha256="1w58sv519fjrmbv5q7pvfd4b3d22v33nlx9m232dkxj6i7qs1dcx"; depends=[data_table]; }; PROTOLIDAR = derive2 { name="PROTOLIDAR"; version="0.1"; sha256="0bz3071b0wlcvh40vl3dyiiixk5avsj6kjjnvlvx264i5g08rij4"; depends=[]; }; - PROreg = derive2 { name="PROreg"; version="1.0"; sha256="0c2vgzbdi29rlrnrb971dqrl7rlb9y3rw8nj5rjgwsjqxv607ssj"; depends=[car fmsb Matrix matrixcalc numDeriv RColorBrewer rootSolve]; }; PROscorer = derive2 { name="PROscorer"; version="0.0.1"; sha256="0mgj0mi0vzdk0agimsx4k9i4bss0j5lqiayzhldr1hrqrx2a4f3d"; depends=[PROscorerTools]; }; PROscorerTools = derive2 { name="PROscorerTools"; version="0.0.1"; sha256="1vliffkfqdn5l96bncfgayv19i20kmawlxi8q853wamj6npdpv5r"; depends=[]; }; PRROC = derive2 { name="PRROC"; version="1.3.1"; sha256="1m28h8pcd78049lz2qixhkcr9h5b3jik3maqzfbvq9y58z71i4a7"; depends=[]; }; @@ -3073,7 +3081,7 @@ in with self; { Paneldata = derive2 { name="Paneldata"; version="1.0"; sha256="00hk340x5d4mnpl3k0hy1nypgj55as2j7y2pgzfk3fpn3zls5zib"; depends=[]; }; ParBayesianOptimization = derive2 { name="ParBayesianOptimization"; version="1.1.0"; sha256="1famkdri08qsamn5ji4knq42pj8z4lkhacbr8mbj439hkmpsfxkv"; depends=[crayon data_table dbscan DiceKriging foreach ggplot2 ggpubr lhs plotly]; }; ParDNAcopy = derive2 { name="ParDNAcopy"; version="2.0"; sha256="017xwznhfibi8kp0ifww02c0qcq0vxs06rjww4kcp2bvdmld8kc4"; depends=[DNAcopy]; }; - ParallelLogger = derive2 { name="ParallelLogger"; version="1.1.2"; sha256="1yp0kb0fv0qr8lg2qbssz3gdvlpjmim18dak08ibfznwyivkfrna"; depends=[jsonlite snow XML]; }; + ParallelLogger = derive2 { name="ParallelLogger"; version="1.2.0"; sha256="1xc5lgyly7mmi8hw9kzm4yj09z1ngzqkgki7zjgfcrwvfz1lnknr"; depends=[jsonlite snow XML]; }; ParallelPC = derive2 { name="ParallelPC"; version="1.2"; sha256="07y7xb16865khxkvwsk1yglzyy7ja4aj2wpkipaz48i77c3x8bi2"; depends=[]; }; ParallelTree = derive2 { name="ParallelTree"; version="0.1.3"; sha256="1h53qwhc63fglm452b3by7f3g6f3hyqwkmwmbdqdb9rv3j4gvnvg"; depends=[ggplot2]; }; ParamHelpers = derive2 { name="ParamHelpers"; version="1.14"; sha256="1sx2ddm8hwvvmk0z65wa689w80py3fny82zjd4d29qwxlv854xmi"; depends=[backports BBmisc checkmate fastmatch]; }; @@ -3094,7 +3102,7 @@ in with self; { PearsonDS = derive2 { name="PearsonDS"; version="1.1"; sha256="0rqh9ji0bah3n1c6fcg7krgqs65qla9p3xrnc4jr7va6ph104im9"; depends=[]; }; PearsonICA = derive2 { name="PearsonICA"; version="1.2-4"; sha256="0jkbqha1nb9pf72ffki47wymsdmd50smkdhvpzvanv4y2rmqfhvg"; depends=[]; }; PedCNV = derive2 { name="PedCNV"; version="0.1"; sha256="09qxcjzwdgzdkbj28rzmfv7k3q2qsiapnvx3m45a835r57h5gynp"; depends=[ggplot2 Rcpp RcppArmadillo]; }; - PeerPerformance = derive2 { name="PeerPerformance"; version="2.2.1"; sha256="1igh8svdbxkcfgi2s70cpwdcy7jb4yhxias80vck203skyiq97vx"; depends=[lmtest sandwich]; }; + PeerPerformance = derive2 { name="PeerPerformance"; version="2.2.2"; sha256="03vkdfwa4smlsycgsd1hmg4qzib5nyknrsz100rqdfdw4g2xn6bn"; depends=[lmtest sandwich]; }; PenCoxFrail = derive2 { name="PenCoxFrail"; version="1.0.1"; sha256="0snjf8jxzyf30xj3wx9p6g073dqw592l1j1c6yxfg8y4kgzhzwq7"; depends=[Matrix Rcpp RcppArmadillo survival]; }; PenIC = derive2 { name="PenIC"; version="1.0.0"; sha256="0vcqawmbm8z6lkcxfq1b2png9viz5q669npbv0s7dn6smwhanlzz"; depends=[MASS Matrix numDeriv]; }; PepSAVIms = derive2 { name="PepSAVIms"; version="0.9.1"; sha256="0m4jrq6wcjy0k80gvrnm9f7kvi1ifx9182xfq0psyaxpj0ggvzij"; depends=[elasticnet]; }; @@ -3142,7 +3150,7 @@ in with self; { PointFore = derive2 { name="PointFore"; version="0.2.0"; sha256="0ml6xcdl4ygr01q0cjwd11ql7wal91jnf3hs1rfhfr4mh8jpgivx"; depends=[boot car ggplot2 gmm lubridate MASS sandwich]; }; PoisBinNonNor = derive2 { name="PoisBinNonNor"; version="1.3.1"; sha256="1pgaf3yamigcw32sczj4f1dpndwyrxirrfl4jv0vp5j1jd2zhb18"; depends=[BB corpcor Matrix mvtnorm]; }; PoisBinOrd = derive2 { name="PoisBinOrd"; version="1.4.1"; sha256="0bzgb88mg95h6liwnmflpssmz9n5xnwmipnqca611l1kp3rld0nk"; depends=[corpcor GenOrd Matrix mvtnorm]; }; - PoisBinOrdNonNor = derive2 { name="PoisBinOrdNonNor"; version="1.5.1"; sha256="07q0zddkb9vgp9iqw8s9w4cz6iwhdsggx8wf9ma9b5iqzigsv07n"; depends=[BB corpcor GenOrd MASS Matrix]; }; + PoisBinOrdNonNor = derive2 { name="PoisBinOrdNonNor"; version="1.5.2"; sha256="0a6ks20f9vnf8w8n0007yrqaa9vpgqq43vxa88dhvdpn6bbw5w0s"; depends=[BB corpcor GenOrd MASS Matrix]; }; PoisBinOrdNor = derive2 { name="PoisBinOrdNor"; version="1.6.1"; sha256="12mchs62xq5jrq7y66l53yvwgm8iisa16120jmja0xdcr9sgcr84"; depends=[corpcor GenOrd Matrix mvtnorm psych]; }; PoisNonNor = derive2 { name="PoisNonNor"; version="1.6.1"; sha256="0pk1hqydpd6f8419kn986kf55gc3hyycfjyj1nvqsml7ic56ic98"; depends=[BB corpcor MASS Matrix]; }; PoisNor = derive2 { name="PoisNor"; version="1.3.1"; sha256="1s1z6bpxaa1ibdgv6bd5phccswd9bh26abwcywlnb55xl5vrgknv"; depends=[corpcor Matrix mvtnorm]; }; @@ -3189,7 +3197,7 @@ in with self; { ProDenICA = derive2 { name="ProDenICA"; version="1.0"; sha256="04gnsnd0xzw3bfbssdp06bar0lk305ry2c97pmwxgiz3ay88dfsj"; depends=[gam]; }; ProFit = derive2 { name="ProFit"; version="1.3.3"; sha256="0jrw0v7dg5mf4zxg7pqybh9qzsiqb3nnz8g5qlc4iz73mhr9gm2b"; depends=[celestial checkmate cubature FITSio LaplacesDemon magicaxis RColorBrewer]; }; ProFound = derive2 { name="ProFound"; version="1.3.4"; sha256="1kn9kj0vq18jxiavdzx4l4kgyfwjnflfbyqfdihrdfrkz4xz4w3c"; depends=[celestial data_table doParallel FITSio foreach magicaxis RColorBrewer Rcpp]; }; - ProPublicaR = derive2 { name="ProPublicaR"; version="0.9.2"; sha256="17fghv7w4wm4q9nd6l4pl5ibk5i4zgdhlp5pvbzvymhvby0q06sw"; depends=[config dplyr httr lubridate stringr]; }; + ProPublicaR = derive2 { name="ProPublicaR"; version="1.1.1"; sha256="08bhqm64r79ywj394l1ywwcsjc79wzi85wlbp5xnr49bxzaysfp1"; depends=[config dplyr httr lubridate stringr]; }; ProTrackR = derive2 { name="ProTrackR"; version="0.3.7"; sha256="15m8g9v254avi68qr7v5q4fzhclkv1q849sj69fs0c9qcli1x384"; depends=[audio lattice signal tuneR XML]; }; ProbBayes = derive2 { name="ProbBayes"; version="1.1"; sha256="0bkbqyrmpy9swaxsl91w6iiw81znjf1lk4b0vqgn6wdnrir6gkmn"; depends=[ggplot2 gridExtra LearnBayes shiny]; }; ProbForecastGOP = derive2 { name="ProbForecastGOP"; version="1.3.2"; sha256="0fnw3g19lx4vs8vmn4qdirvybkiy2cxkhwkn9qa3phz45iixnvx4"; depends=[fields RandomFields]; }; @@ -3203,7 +3211,7 @@ in with self; { ProfoundData = derive2 { name="ProfoundData"; version="0.2.1"; sha256="1zqg821pv3i5nf76s7yppnmy13y14pj0l7rjhk50wlxrxdb53ibz"; depends=[DBI RNetCDF RSQLite settings sqldf zoo]; }; ProgGUIinR = derive2 { name="ProgGUIinR"; version="0.0-4"; sha256="0srhk42ssx4i096sbs4jacqjsc1ffqjxjgvpplzshlqaby1h3795"; depends=[ggplot2 MASS svMisc]; }; ProjectManagement = derive2 { name="ProjectManagement"; version="1.2.4"; sha256="1lv1yf6xslskjqz7mgi8brvpix9g7k0yy6q03gckz1rmcakzqj5p"; depends=[GameTheory kappalab lpSolveAPI plotly triangle]; }; - ProjectTemplate = derive2 { name="ProjectTemplate"; version="0.9.0"; sha256="07nj339k822xnjqcraivl85wcvnq3cp8gz051kq5zmfx19p1wvdv"; depends=[]; }; + ProjectTemplate = derive2 { name="ProjectTemplate"; version="0.9.1"; sha256="045xyycn2xjxb40vm6nvkp5csxzxasz9pqdnrgapv0ycf02s0c17"; depends=[]; }; ProjectionBasedClustering = derive2 { name="ProjectionBasedClustering"; version="1.1.1"; sha256="17y1yf8cbcl3yha7mbk22lxmk2v5n98mfqsa886a3012ang4m5sp"; depends=[deldir GeneralizedUmatrix geometry ggplot2 plotly Rcpp shiny shinyjs shinythemes vegan]; }; ProliferativeIndex = derive2 { name="ProliferativeIndex"; version="1.0.1"; sha256="03ipsbs8pfwr8wsx7j2y9c67ic4qcady7xpa47l8dr14ff63cfk7"; depends=[]; }; PropCIs = derive2 { name="PropCIs"; version="0.3-0"; sha256="1ywzi88igzaj2wnbrqa08cy7pw886z2m0x3j7rk45rin9mgpfdfd"; depends=[]; }; @@ -3285,6 +3293,7 @@ in with self; { R0 = derive2 { name="R0"; version="1.2-6"; sha256="1yvcgchxlj7hkgqkw6g8pxnracxkld1grgykkcr6wbhminbylqv8"; depends=[MASS]; }; R1magic = derive2 { name="R1magic"; version="0.3.2"; sha256="1xfldr5y7pfdi6qljjvckknsv2wi9rnzwmqxkpgnyc96md2fvwjr"; depends=[]; }; R2019nCoV = derive2 { name="R2019nCoV"; version="0.1.0"; sha256="1959mwacn0zzq0g5ili2v6aqs51rb6qvlsv16xx7qwml8xahf215"; depends=[dplyr ggplot2 jsonlite maps pinyin]; }; + R2Addhaz = derive2 { name="R2Addhaz"; version="0.1.0"; sha256="1xaqbzq2chsgkg1gc163fq8qcgzq9wwn2bm4mwvc31ay0gg4f3xi"; depends=[ahaz caTools pracma Rdpack survival zoo]; }; R2BEAT = derive2 { name="R2BEAT"; version="1.0.1"; sha256="0x0gb3gpvjmwa6f2p0p45m86l9iy7nwmcjhyi68lg694cvd9ny37"; depends=[]; }; R2BayesX = derive2 { name="R2BayesX"; version="1.1-1"; sha256="1ff8cscl839ykp7l34sscc8zqp516mh64igk7dfv9n02l40w8ypf"; depends=[BayesXsrc colorspace mgcv]; }; R2DGC = derive2 { name="R2DGC"; version="1.0.3"; sha256="0f84fmpf3m2s2p6bllvjs8rgnhwjy54adblv02dq8gakwvb4j2aw"; depends=[]; }; @@ -3325,6 +3334,7 @@ in with self; { RAthena = derive2 { name="RAthena"; version="1.8.0"; sha256="0i428qcw3myaiy9zyc2wzwaj2d4sv8lg7w8nqppkb00nslv00il8"; depends=[data_table DBI reticulate]; }; RBF = derive2 { name="RBF"; version="1.0.0"; sha256="0q2k2ar9cd62cykg99r86cflx2nknlg32fhhsjay4xs191fapw8j"; depends=[]; }; RBMRB = derive2 { name="RBMRB"; version="2.1.2"; sha256="1m6n2kfg83mlfy22k75hy5zjf547v0rdwk9w6l04yfyrr6himbr8"; depends=[data_table ggplot2 httr plotly rjson]; }; + RBNZ = derive2 { name="RBNZ"; version="1.0.1"; sha256="1bcjxzysdi1jhf46najppx86b791bxdgdq0xx8pjg57f6cwvws52"; depends=[httr lubridate readxl rvest xml2]; }; RBPcurve = derive2 { name="RBPcurve"; version="1.2"; sha256="0zkfvnhm780vid4qqdrx9mnc6jxxrmrnq47pqvk35rm3m4l96782"; depends=[BBmisc checkmate mlr shape TeachingDemos]; }; RBaseX = derive2 { name="RBaseX"; version="0.2.4"; sha256="0y3mza485jj7aj3x4hnspkkgsg8y3zmgvhd3zb9p01iafa3ck91p"; depends=[dplyr magrittr openssl R6 RCurl stringr tibble]; }; RBesT = derive2 { name="RBesT"; version="1.6-0"; sha256="0wanwx42ayy4likabdjkamzrlwgkwvas1mpcjdrsxirrl7bs38ds"; depends=[assertthat bayesplot BH checkmate dplyr Formula ggplot2 mvtnorm Rcpp RcppEigen rstan StanHeaders]; }; @@ -3349,8 +3359,8 @@ in with self; { RColorBrewer = derive2 { name="RColorBrewer"; version="1.1-2"; sha256="1pfcl8z1pnsssfaaz9dvdckyfnnc6rcq56dhislbf571hhg7isgk"; depends=[]; }; RConics = derive2 { name="RConics"; version="1.0"; sha256="1lwr7hi1102gm8fi9k5ra24s0rjmnkccihhqn3byckqx6y8kq7ds"; depends=[]; }; RCriteo = derive2 { name="RCriteo"; version="1.0.2"; sha256="1vyhnblw9zr5h6c25lf76p9vn95k8vr0hpq1sjkccdwl9yvsyhfy"; depends=[httr plyr RCurl XML]; }; - RCurl = derive2 { name="RCurl"; version="1.98-1.1"; sha256="1zqiawhx5v06vmcg87rmx2qdd9fa4svds3i9a1lphchvprr93jkf"; depends=[bitops]; }; - RCzechia = derive2 { name="RCzechia"; version="1.4.5"; sha256="1ar3vkslwzqmljq01swdqk72i2q4pcr7x58pi79gaxwx2p1h4bsl"; depends=[curl dplyr httr jsonlite lwgeom magrittr rlang sf]; }; + RCurl = derive2 { name="RCurl"; version="1.98-1.2"; sha256="1a57jm41550ah3v7cqdv5gdabhp375qgcndr901lns65qg6s0x2x"; depends=[bitops]; }; + RCzechia = derive2 { name="RCzechia"; version="1.4.6"; sha256="1p2np23pyvx6161ad3kcskjvipx5g3dgr58v0pdj7lh1lqnyqzc9"; depends=[curl dplyr httr jsonlite magrittr rlang 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="1.0"; sha256="13ly1p42njbcygwvkyii8sjqbsywjy5w5g1kd7m8kswi5dsk3qqv"; depends=[checkmate data_table lubridate pipeR R6 readxl rlist stringr xml2]; }; @@ -3365,7 +3375,7 @@ in with self; { REBayes = derive2 { name="REBayes"; version="2.2"; sha256="1jh5vw9pbcf5gpmx3b5b36fh8rz5y8npx53aai0kxh49kjf8d63c"; depends=[Matrix reliaR]; }; RECA = derive2 { name="RECA"; version="1.7"; sha256="1xikj20flqajpkw4wyynmqd1pafbylzwfrmc8bz9pqgggjjhrqql"; depends=[]; }; REDCapExporter = derive2 { name="REDCapExporter"; version="0.2.0"; sha256="0h9sz5hd5b0paqybid8xjx7lbirlknazx11phylqixmnl9a8qra3"; depends=[data_table keyring lubridate RCurl]; }; - REDCapR = derive2 { name="REDCapR"; version="0.10.2"; sha256="0rdni325k0641yfv4g9l1szg1bl48767n6r1xkh8q3fnvqaqwnrg"; depends=[dplyr httr magrittr readr rlang tibble tidyr]; }; + REDCapR = derive2 { name="REDCapR"; version="0.11.0"; sha256="0frhmnm25w9b84qk7vvvr8wkv1w3dmm0vqxav2cs7jimq38zwcvz"; depends=[checkmate dplyr httr magrittr readr rlang tibble tidyr]; }; REEMtree = derive2 { name="REEMtree"; version="0.90.3"; sha256="01sp36p12ky8vgsz6aik80w4abs70idr9sn4627lf94r92wwwsbc"; depends=[nlme rpart]; }; REGENT = derive2 { name="REGENT"; version="1.0.6"; sha256="1f2sjqkhw3rbmwbcmx7l7imj696kblisi8y3fz77xygbcbxa6rmq"; depends=[]; }; REPLesentR = derive2 { name="REPLesentR"; version="0.4.1"; sha256="0rwd7hxk12f4f1kpj6sl424yhbxi3h9dz6km5awijazmgv95carz"; depends=[dat knitr modules]; }; @@ -3396,7 +3406,6 @@ in with self; { RGENERATEPREC = derive2 { name="RGENERATEPREC"; version="1.2.5"; sha256="1jqyp91x569la1vc6wl6v7jq6iq1cx2qkds9yiqm85bgzydp4lxw"; depends=[blockmatrix copula Matrix RGENERATE RMAWGEN stringr]; }; RGF = derive2 { name="RGF"; version="1.0.6"; sha256="11pnbiyp39r95c8ajj2jyxz4h1zf6fi8ki78rmn4vp7xm2bl3zff"; depends=[Matrix R6 reticulate]; }; RGIFT = derive2 { name="RGIFT"; version="0.1-5"; sha256="1745fs4bq0ss39fiwljspvrmnkgbbpc1fjvhvcrsmp2iizq12sgn"; depends=[]; }; - RGISTools = derive2 { name="RGISTools"; version="1.0.0"; sha256="10ra22xsqz6y4dcc6vbi8fmbd2k84bhf9icys06z02sizzfm8dl7"; depends=[curl fields httr mapview raster Rdpack rjson rvest sf sp tmap urltools XML xml2]; }; RGeckoboard = derive2 { name="RGeckoboard"; version="0.1-5"; sha256="0h7x3kdmlba9siwcnf313ajmz2jsmyhl7pndzs7qaqina3hkl46r"; depends=[httr jsonlite]; }; RGenData = derive2 { name="RGenData"; version="1.0"; sha256="124h2qvp0f6cil7zf4ln3n0jlqcfzdwbihzfaklk2lxxn7gq4mbi"; depends=[]; }; RGenetics = derive2 { name="RGenetics"; version="0.1"; sha256="0x5sspd67hh08qm62whlnnd838m0np29q3bfzgwp6j85lhil3jrx"; depends=[]; }; @@ -3458,7 +3467,7 @@ in with self; { RMTL = derive2 { name="RMTL"; version="0.9"; sha256="08da67wvzmibziqhnlzh43sydaihk4rsq2k5hs6ih3jkkidrhlgv"; depends=[corpcor doParallel foreach MASS psych]; }; RMThreshold = derive2 { name="RMThreshold"; version="1.1"; sha256="0wkc42vcggib002ad6ch43h6avpdgl12szrrrfd2p0wl72cwn5n1"; depends=[Matrix png]; }; RMTstat = derive2 { name="RMTstat"; version="0.3"; sha256="1nn25q4kmh9kj975sxkrpa97vh5irqrlqhwsfinbck6h6ia4rsw1"; depends=[]; }; - RMaCzek = derive2 { name="RMaCzek"; version="1.3.2"; sha256="17w3ay8x8laqqfzzl34b7fsyk029rxss20bafh14yksw2qkvi8qy"; depends=[GA seriation]; }; + RMaCzek = derive2 { name="RMaCzek"; version="1.3.3"; sha256="1kn3h2gp08i8vq8304853bg5yydkdz7xlhqh2djn9r1iy69hhwg4"; depends=[GA seriation]; }; RMallow = derive2 { name="RMallow"; version="1.1"; sha256="1s6a3347739rfc8rrh2773b278gcbp8hf5j5psm61fz7bavy9gcj"; depends=[combinat]; }; RMariaDB = derive2 { name="RMariaDB"; version="1.0.8"; sha256="1xcr5lg9da4a49dcqy3hhrpz5jn51dqa6dc50vmkq1nw372yv2iw"; depends=[BH bit64 DBI hms plogr Rcpp]; }; RMark = derive2 { name="RMark"; version="2.2.7"; sha256="0qxa383cagzqrnfc3izybb4lrg8z1r3nw1j5b7h4wkjwy0k3kczb"; depends=[coda matrixcalc msm]; }; @@ -3487,12 +3496,10 @@ in with self; { RNifti = derive2 { name="RNifti"; version="1.1.0"; sha256="1z8ninp3aq18w0slcfn8r2fp48cdz8l0k0namsrnvgyp8lzcpqpn"; depends=[Rcpp]; }; RNiftyReg = derive2 { name="RNiftyReg"; version="2.6.8"; sha256="19lij5zplw7jw65ykkjl85iqpfq3i6sia4wnq7fmkv1xlzwda2f4"; depends=[ore Rcpp RcppEigen RNifti]; }; 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]; }; ROCS = derive2 { name="ROCS"; version="1.3"; sha256="11vdf8701ap6ya7c7kx9jhvg7qfc6vkij3jridna6f4xj384grki"; depends=[poibin rgl]; }; ROCit = derive2 { name="ROCit"; version="1.1.1"; sha256="1bip1zz5chm06pfikkscahph2clsaf9rhhpsla6vmvpfy0d8p070"; depends=[]; }; - ROCnReg = derive2 { name="ROCnReg"; version="1.0"; sha256="0fz1s2a71bb1l60mqvrzmac5wiaa43h4s9xbpaw90y5w2kdpz1ji"; depends=[lattice MASS Matrix moments nor1mix np pbivnorm spatstat]; }; - ROCt = derive2 { name="ROCt"; version="0.9.5"; sha256="0f7day0rv62ggm1nc7qkh45r6svr84mdk7xxpdf09pi4lbdx0rm6"; depends=[date relsurv survival timereg]; }; + ROCnReg = derive2 { name="ROCnReg"; version="1.0-1"; sha256="05rxb0hqk6w8xz8s52j0skc8p2b4fv8wdvvj8r77yimph1dlc13x"; depends=[lattice MASS Matrix moments nor1mix np pbivnorm spatstat]; }; ROCwoGS = derive2 { name="ROCwoGS"; version="1.0"; sha256="029nramxwhzqim315g1vkg1zsszzkic28w6ahwg9n7bk9d08adzk"; depends=[]; }; RODBC = derive2 { name="RODBC"; version="1.3-16"; sha256="0fcnszrkk7llz26wccs97glddw793i0f9bd7rwxrld24vn1lng92"; depends=[]; }; RODBCDBI = derive2 { name="RODBCDBI"; version="0.1.1"; sha256="0jkcc1lm8drsx1pkfj5h6rlbr98cgpvbf9ndzdwr048f3s8gd26i"; depends=[DBI RODBC]; }; @@ -3535,7 +3542,7 @@ in with self; { RPCLR = derive2 { name="RPCLR"; version="1.0"; sha256="03kpyszsjb656lfwx2yszv0a9ygxs1x1dla6mpkhcnqw00684fab"; depends=[MASS survival]; }; RPEClust = derive2 { name="RPEClust"; version="0.1.0"; sha256="1ysw45335lrxmj3j17xyvgz76p00v80f2m7wxfndh91wklqxzm8r"; depends=[clue clusteval mclust]; }; RPEGLMEN = derive2 { name="RPEGLMEN"; version="1.0.1"; sha256="1bcci0ih71bxdrwdz336c5wx47d094nczazy8mv3v41vivrk4jkh"; depends=[PerformanceAnalytics Rcpp RcppEigen RPEIF]; }; - RPEIF = derive2 { name="RPEIF"; version="1.0.7"; sha256="1n0b3fdl88wlncfm0k9cy7nj9mgkv3dv724ld2haypmmnbhkhr4j"; depends=[PerformanceAnalytics xts zoo]; }; + RPEIF = derive2 { name="RPEIF"; version="1.0.8"; sha256="0v8kgwzgn1sqs0rgb0mrvzxy1wnk07bm7s4nyz60xcamsj33laj0"; depends=[PerformanceAnalytics xts zoo]; }; RPESE = derive2 { name="RPESE"; version="1.0.3"; sha256="0a9nq60jg2bhj5cbbgkpz0zisqwrv7cgifbiampx2y6sfrkmhbjg"; depends=[boot PerformanceAnalytics RPEGLMEN RPEIF sandwich xts zoo]; }; RPEXE_RPEXT = derive2 { name="RPEXE.RPEXT"; version="0.0.1"; sha256="0m5ml8ywxrf66mjz6m3xp1lajd7wdq9g7xsaln8n7ykq7h5615fc"; depends=[]; }; RPEnsemble = derive2 { name="RPEnsemble"; version="0.4"; sha256="0y9g22swcz0m5jbzi87ahxw27fb3jlf3iwvxb73kkzixqlvksw9y"; depends=[class MASS]; }; @@ -3555,7 +3562,6 @@ in with self; { RPyGeo = derive2 { name="RPyGeo"; version="1.0.0"; sha256="1alqgx6blqqwxm76w05g82kc2icx8nvjw7qkdz73gf9ckgza5bb3"; depends=[magrittr purrr raster reticulate rmarkdown sf stringr]; }; 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.12"; sha256="1bmjgsdwivrvdysba4hq60xpp7xg1c0p1p05mdm0338zvzix5kb8"; depends=[Rcpp zoo]; }; RRF = derive2 { name="RRF"; version="1.9.1"; sha256="135adnf7cfs8gddmmmgmzarjzg0qfrd7l67367yhy2b1k0s5ng1w"; depends=[]; }; RRI = derive2 { name="RRI"; version="1.1"; sha256="0msdc5j5vx4snl8r3q5nn0mw2i80jds5pjykhmigcrx6jzg6h6i7"; depends=[Rcpp RcppArmadillo]; }; @@ -3573,7 +3579,7 @@ in with self; { RSAlgaeR = derive2 { name="RSAlgaeR"; version="1.0.0"; sha256="1hp0v2vkj9ixiv541d53kyl0ph3jsdc5w98r81gv5ck5ixrp6bxp"; depends=[cvTools ggplot2 hydroGOF lubridate mblm plyr]; }; RSCABS = derive2 { name="RSCABS"; version="0.9.4"; sha256="0zknwd07z933c405n14l7mwl4l697g5sfvw19244yv4fs7f6k5cg"; depends=[gWidgets gWidgetsRGtk2 R2HTML RGtk2]; }; RSCAT = derive2 { name="RSCAT"; version="1.1.0"; sha256="1sh80zlkwma88kssrlwvb6kpqs2dmhfzkck59fgp0xxgxa3vpram"; depends=[ggplot2 gridExtra Metrics rJava shiny shinycssloaders shinyjs]; }; - RSDA = derive2 { name="RSDA"; version="3.0.1"; sha256="1hxzccwjmbj5qnv2z96s9nj8r3fhbixycf4zfkaa5y1dacxz9mk4"; depends=[dplyr FactoMineR forcats ggplot2 ggpolypath glmnet magrittr nloptr princurve purrr randomcoloR reshape RJSONIO rlang scales sqldf stringr tibble tidyselect vctrs XML]; }; + RSDA = derive2 { name="RSDA"; version="3.0.3"; sha256="0335g7m97wx4c8aam19z5qn9s9kgjy67s0wdgcjfjm440pxk2l3r"; depends=[dplyr FactoMineR forcats ggplot2 ggpolypath glmnet labelled magrittr nloptr princurve purrr randomcoloR reshape RJSONIO rlang scales sqldf stringr tibble tidyselect vctrs XML]; }; RSE = derive2 { name="RSE"; version="1.3"; sha256="1dvmj1zwkbp1dj9r8kcvbd8rpknfwfdqaqc5gfl82bh823w72099"; depends=[]; }; RSEIS = derive2 { name="RSEIS"; version="3.9-0"; sha256="16jmakdq6rkyw3cm1ilnaw3ycsg12544ml9gla7y8mgpbglxsn6i"; depends=[RPMG Rwave]; }; RSGHB = derive2 { name="RSGHB"; version="1.2.2"; sha256="16s9iahbcdqykavm5cq8n76hlpfqlljl17xwh0vrz5ac7z4z3rdz"; depends=[MCMCpack]; }; @@ -3616,7 +3622,6 @@ in with self; { RTL = derive2 { name="RTL"; version="0.1.1"; sha256="1p5i9khwa470hc9bhxlxqh8w5vp73jcsr45mrhwpcyz3i2dlzdzr"; depends=[dplyr EIAdata fabletools feasts fGarch fitdistrplus forecast ggplot2 httr lubridate magrittr PerformanceAnalytics plotly purrr Quandl quantmod readr stringr tibble tibbletime tidyquant tidyr timetk tsibble xts zoo]; }; RTOMO = derive2 { name="RTOMO"; version="1.1-6"; sha256="03jb96ahzgp662vj2v65giv8ss61vad5w26kvq8hg9q06z879jza"; depends=[GEOmap RPMG RSEIS splancs]; }; RTaxometrics = derive2 { name="RTaxometrics"; version="2.3"; sha256="02446y86g21i37ycavg0xc1ggxk0k93d38n71fis9fav06lywxx3"; depends=[]; }; - RTest = derive2 { name="RTest"; version="1.2.6"; sha256="0f7wxscswkg2r6isp0vjfs44dbgqijmh97p053w2mcqi6z1s5cip"; 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.12"; sha256="066wyama0gk81l6kc0n31cmf007i1975i7hzvf46qbldvhsc52mc"; depends=[future future_apply Rcpp]; }; @@ -3631,13 +3636,13 @@ in with self; { RVowpalWabbit = derive2 { name="RVowpalWabbit"; version="0.0.13"; sha256="106lr6iz28gscczs18759zaki7dnxy1873swiakimfqmwpw9dp9n"; depends=[Rcpp]; }; RVtests = derive2 { name="RVtests"; version="1.2"; sha256="0k7w6ml981zvr5bix197qw4kaf7rz5jqnwqlxf7aryxbm39gk16c"; depends=[glmnet pls spls]; }; RWBP = derive2 { name="RWBP"; version="1.0"; sha256="104vr2cdk185hh4zn3vmqvb14p1q8ifk11wdgvk7fli1m1zxxwdd"; depends=[igraph lsa RANN SnowballC]; }; - RWDataPlyr = derive2 { name="RWDataPlyr"; version="0.6.3"; sha256="14p347v8vgbw471j3nxxn69cxpljriy9hp9haq6gnhx6d0739rcd"; depends=[data_table dplyr feather Rcpp tibble tidyr xts zoo]; }; + RWDataPlyr = derive2 { name="RWDataPlyr"; version="0.6.4"; sha256="1jjra885339n6kpqz28rn9byy4md4s0k47m6ll4a6srd4hsf3ni3"; depends=[data_table dplyr feather Rcpp tibble tidyr xts zoo]; }; RWebLogo = derive2 { name="RWebLogo"; version="1.0.3"; sha256="1n65mlnr163ywjnyyngnigbj0wpgkr38c3nx8hw5r8mwjnf3d617"; depends=[findpython]; }; RWeka = derive2 { name="RWeka"; version="0.4-42"; sha256="0111n0hr3a2gjd2pv5vlh8mian6k86cp0xrw0yyh6ijxhwl31rc4"; depends=[rJava RWekajars]; }; RWekajars = derive2 { name="RWekajars"; version="3.9.3-2"; sha256="06nsylv65z9hxym1b6qnwllh306bq5phsgr0qn4nyr5im8cv1rhn"; depends=[rJava]; }; RWiener = derive2 { name="RWiener"; version="1.3-2"; sha256="1sk4racp77jbhjaqkghalg139aznchyn1yknyrv975ck040zs8cw"; depends=[]; }; RWildbook = derive2 { name="RWildbook"; version="0.9.3"; sha256="1pznzmv8n33hhj61h07fha1gzafcx705n8323cnz3mx6ziijfh28"; depends=[data_table jsonlite marked]; }; - RWsearch = derive2 { name="RWsearch"; version="4.7.0"; sha256="1h6m5h9kbb3sl49ppaazac4y0nz57xw87sh9f4m50immg33il16z"; depends=[brew latexpdf networkD3 sig sos XML]; }; + RWsearch = derive2 { name="RWsearch"; version="4.8.0"; sha256="0zbf03dhcmbyrs2yhl3phk65471qnd7iszvk9rn81fqhd522vq66"; depends=[brew latexpdf networkD3 sig sos XML]; }; RXKCD = derive2 { name="RXKCD"; version="1.9.2"; sha256="1yk12ic6kdbwc44ppag2yfnga7xjmifkglhvcw93vc3qg469mm15"; depends=[jpeg plyr png RJSONIO]; }; RXMCDA = derive2 { name="RXMCDA"; version="1.5.5"; sha256="1ci73q8xf3xxqw8b7sk83v5vz2cqgcb4lkx7qi3hd1ff4xkz1fpa"; depends=[kappalab XML]; }; RXshrink = derive2 { name="RXshrink"; version="1.3.2"; sha256="00igwc4v2dc9328akrqswac7f4hn4ij03x9ck932xd0l67zfp8ah"; depends=[lars]; }; @@ -3648,7 +3653,7 @@ in with self; { RZooRoH = derive2 { name="RZooRoH"; version="0.2.3"; sha256="0ihfc8hxqmlkx1xhkz3psw8szwjp01imasvynxbzrjmjf4q6amvq"; depends=[data_table doParallel foreach iterators RColorBrewer]; }; RaPKod = derive2 { name="RaPKod"; version="0.9"; sha256="1qxzi2lf431zd44bcd98ybhzydy1cz12g864l6r668jk91aqy1qg"; depends=[kernlab MASS proxy Rcpp RcppArmadillo]; }; RaProR = derive2 { name="RaProR"; version="1.1-5"; sha256="11hwg609pjcd13qnbchbs86c3q8f4nmh1xfxg3dsiijljl6lzx3n"; depends=[]; }; - RaceID = derive2 { name="RaceID"; version="0.1.8"; sha256="0pkn9fdf0xi55nrylmqris9by1ywy3mcxkj0bcf4gp6knyqz6wz0"; depends=[cluster coop FateID FNN fpc ggplot2 ica igraph irlba locfit MASS Matrix pheatmap propr quadprog randomForest RColorBrewer Rcpp Rtsne umap vegan]; }; + RaceID = derive2 { name="RaceID"; version="0.1.9"; sha256="0jy0bavlzq522zp5jf4s1dkm2yi40kjwx9cks7lylqcr9sml6xj8"; depends=[cluster coop FateID FNN fpc ggplot2 ica igraph irlba locfit MASS Matrix NlcOptim pheatmap propr quadprog randomForest RColorBrewer Rcpp Rtsne umap vegan]; }; RadData = derive2 { name="RadData"; version="1.0.0"; sha256="14npn5vjcpvymdjkby83msjr3f1gsmzh0083gz6cgrp270fglkaw"; depends=[]; }; RadOnc = derive2 { name="RadOnc"; version="1.1.5"; sha256="0yz2pzcpz32xs04xfs90i714nn28cky7701w1h99cqsxsp892jkq"; depends=[geometry oro_dicom ptinpoly rgl]; }; RadTran = derive2 { name="RadTran"; version="1.0"; sha256="1sb8d4y3b37akbxhdavxrkp34zn3ip061b7gzy0ga57pyn76cvpn"; depends=[ReacTran rootSolve]; }; @@ -3734,13 +3739,14 @@ 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.4"; sha256="1m80pdhzi2p82db5xkbwc2m3fzv6df59955yj03nlq40fj7zx4nr"; depends=[]; }; + Rcpp = derive2 { name="Rcpp"; version="1.0.4.6"; sha256="00mk23zmrqn1c4mk9d6csjcbnl12wd7yicjk2ikmw5dyvdfngbs5"; depends=[]; }; Rcpp11 = derive2 { name="Rcpp11"; version="3.1.2.0"; sha256="1x6n1z7kizagr5ymvbwqb7nyn3lca4d4m0ks33zhcn9gay6g0fac"; depends=[]; }; RcppAPT = derive2 { name="RcppAPT"; version="0.0.6"; sha256="0gkvs276hwa4yzd1bwf12p83cq2i1k021nq4y6ll1gcrj41mkdns"; depends=[Rcpp]; }; RcppAlgos = derive2 { name="RcppAlgos"; version="2.4.1"; sha256="0s97v2agy8pzaqfjm7cabpfxpkidxl1zwi4vkjdhsfzxjp5xwwms"; depends=[gmp Rcpp RcppThread]; }; RcppAnnoy = derive2 { name="RcppAnnoy"; version="0.0.16"; sha256="0bfa35lp6vc4b0h3ymvdx50br233q8vvyjml34ngi81rj0imz3fr"; depends=[Rcpp]; }; - RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.9.850.1.0"; sha256="0q9clhmbwwph47hrhx5827m7njrcl2klihyqbkf0ihwlbqrjijwz"; depends=[Rcpp]; }; + RcppArmadillo = derive2 { name="RcppArmadillo"; version="0.9.860.2.0"; sha256="1rg9ak0zbv8d9cyj10jq52nrcbk1pvfz28kbkhpx79mpjhrl7pb5"; depends=[Rcpp]; }; RcppBDT = derive2 { name="RcppBDT"; version="0.2.3"; sha256="0gnj4gz754l80df7w3d5qn7a57z9kq494n00wp6f7vr8aqgq8wi1"; depends=[BH Rcpp]; }; + RcppBigIntAlgos = derive2 { name="RcppBigIntAlgos"; version="0.2.2"; sha256="1sby2bpp5w7mac4mm9grwyfvd54s0nida3grbs471prkba3h50zv"; depends=[gmp Rcpp RcppThread]; }; RcppCCTZ = derive2 { name="RcppCCTZ"; version="0.2.7"; sha256="0q4vj0dh04m2v2p8x0wd78hbfxzj4zi1nmp52ndwnirhs6zfny4l"; depends=[Rcpp]; }; RcppCNPy = derive2 { name="RcppCNPy"; version="0.2.10"; sha256="175bn75akwgz3vcp0n59kiqqz7q9cwkvih241nj8v810cp4gpmkp"; depends=[Rcpp]; }; RcppCWB = derive2 { name="RcppCWB"; version="0.2.8"; sha256="15iiv5kwh7c3pprpyyvjnbj80x9245f3zmfiy41w661n3cnka68p"; depends=[Rcpp]; }; @@ -3753,7 +3759,7 @@ in with self; { RcppDynProg = derive2 { name="RcppDynProg"; version="0.1.3"; sha256="099hbm355d30rwxqjd7j4dfw678551dc5v4y7yy6q4xxyf527lbs"; depends=[Rcpp RcppArmadillo wrapr]; }; RcppEigen = derive2 { name="RcppEigen"; version="0.3.3.7.0"; sha256="1b78qcjim0n9klgkr82n794d6bj9r9f33g0kcsszsns2hir65sk2"; depends=[Matrix Rcpp]; }; RcppEigenAD = derive2 { name="RcppEigenAD"; version="1.0.0"; sha256="18zm9hsfqwiicxsdm87ix3qc261ljxxn2s736p6aayx82b6vwkz6"; depends=[BH functional memoise Rcpp RcppEigen Rdpack readr]; }; - RcppEnsmallen = derive2 { name="RcppEnsmallen"; version="0.2.11.3.1"; sha256="03868qkz8miayjbgwlccrwqiy4yv7f3gmp89i4c96xs7q3ijwynn"; depends=[Rcpp RcppArmadillo]; }; + RcppEnsmallen = derive2 { name="RcppEnsmallen"; version="0.2.12.1.1"; sha256="1nrfkvmz7p6sv1chis205ac13grqzrr950bh5fv1hl5qhyjj2iyk"; depends=[Rcpp RcppArmadillo]; }; RcppExamples = derive2 { name="RcppExamples"; version="0.1.9"; sha256="0568zipgjxgmx086mlfpp5n7v8kf50gwrylvhl1bgvzb2vvr9dhj"; depends=[Rcpp]; }; RcppFaddeeva = derive2 { name="RcppFaddeeva"; version="0.1.0"; sha256="1rah18sdfmbcxy83i7vc9scrwyr34kn9xljkv9pa31js68gn2jrl"; depends=[knitr Rcpp]; }; RcppGSL = derive2 { name="RcppGSL"; version="0.3.7"; sha256="0cnw2k7cfqrm79r6j283aybflxig80x4n4rjkfp2317wf10mrsa5"; depends=[Rcpp]; }; @@ -3762,7 +3768,7 @@ in with self; { RcppHMM = derive2 { name="RcppHMM"; version="1.2.2"; sha256="0scdzmns1yw2gbarblzd6cbvndlysz54ff17qijiz17ql5cyzly6"; depends=[Rcpp RcppArmadillo]; }; RcppHNSW = derive2 { name="RcppHNSW"; version="0.2.0"; sha256="0gqdkw7vkcm544rz45g0hplg836ygzbfwk9gh9wr0817icvdb3qv"; depends=[Rcpp]; }; RcppHungarian = derive2 { name="RcppHungarian"; version="0.1"; sha256="1yx7kjjampjk47l8cqpv727g0nv23dnld9n8iwf7h1myfrl3yb6h"; depends=[Rcpp]; }; - RcppMLPACK = derive2 { name="RcppMLPACK"; version="1.0.10-6"; sha256="0vjx6azp3sny6nv5k1cs6vk61hmbllqw8mgvi7zn15p7ilmhsyyi"; depends=[BH Rcpp RcppArmadillo]; }; + RcppMLPACK = derive2 { name="RcppMLPACK"; version="1.0.10-7"; sha256="07vh1wyp2rxhfrb4vi5njchrby99bynd88na8qjxcnbypkgsrhbl"; depends=[BH Rcpp RcppArmadillo]; }; RcppMeCab = derive2 { name="RcppMeCab"; version="0.0.1.2"; sha256="0varavfbrqzma176rw0dr9v5chh7pxh5y9g0rs3v7hqnlghp22y2"; depends=[BH Rcpp RcppParallel]; }; RcppMsgPack = derive2 { name="RcppMsgPack"; version="0.2.3"; sha256="0ffdw5ckkax8j87q0ykjhyp45l7gvxjppdi73kc4r5qxvijll2g3"; depends=[BH Rcpp]; }; RcppNLoptExample = derive2 { name="RcppNLoptExample"; version="0.0.1"; sha256="1fml6hpa12q0lgg5fg6fi9lz6mckwh345pbh95mld2qagzvmg01n"; depends=[nloptr Rcpp]; }; @@ -3787,9 +3793,9 @@ in with self; { Rcsdp = derive2 { name="Rcsdp"; version="0.1.57.1"; sha256="1dya0c0fcwr6ydcamz8m06nnq0b80vg7b22dg5jv3qi1n1fgp4lv"; depends=[]; }; Rcssplot = derive2 { name="Rcssplot"; version="1.0.0"; sha256="0hnzwjwk9zh4zbzy8sa0z6amikvpd9k1p1abd38khr8q8k1k8jiv"; depends=[]; }; Rd2md = derive2 { name="Rd2md"; version="0.0.2"; sha256="07j1nnsk5nyl8kvgvh9f684g6bhc01jiq1fcmq2pnpx57jdzfbpi"; depends=[knitr]; }; - Rd2roxygen = derive2 { name="Rd2roxygen"; version="1.9"; sha256="029f85visar52002hdpfw5r2zq37kzbr8rgji76nnqi08jk0if4n"; depends=[formatR roxygen2]; }; + Rd2roxygen = derive2 { name="Rd2roxygen"; version="1.10"; sha256="1bd5n7gdnpwncyxa4csh6ky60yb2i1bn5scsmbaba58b56crgyb5"; depends=[formatR roxygen2 xfun]; }; Rdice = derive2 { name="Rdice"; version="1.0.0"; sha256="1xibvm690808p2g3jch7rh1825yrpgln2hjfclgxjwn822qvs4xr"; depends=[data_table]; }; - Rdimtools = derive2 { name="Rdimtools"; version="0.4.2"; sha256="1pklnvg3qrlhskhk2vra38nnqcfdi3fncddm39w9mpxzbzmb62k7"; depends=[ADMM CVXR Matrix Rcpp RcppArmadillo RcppDE Rcsdp Rdpack RSpectra Rtsne]; }; + Rdimtools = derive2 { name="Rdimtools"; version="1.0.1"; sha256="1r6pqnm0j21dp8mqbamqdnwabljw331gh8v68jayx67bn25ap3w9"; depends=[CVXR maotai Rcpp RcppArmadillo RcppDE RcppDist Rcsdp Rdpack RSpectra]; }; Rdistance = derive2 { name="Rdistance"; version="2.1.3"; sha256="03wh6y9h5jgfc6xdncpgyz0v7lqavikp3pf5wwfmm2rqfj7yjr8c"; depends=[]; }; Rdpack = derive2 { name="Rdpack"; version="0.11-1"; sha256="080y15p2hl4jsq91ak2f1y2kx1iqq5c5wzyx3zyhjwp01cahy0jq"; depends=[bibtex gbRd]; }; Rdrools = derive2 { name="Rdrools"; version="1.1.1"; sha256="0awdj1q9ysrhwli16izi0lb6pppqxs1lb6wlv40111q483p41fj7"; depends=[dplyr magrittr purrr Rdroolsjars rJava rlang tibble]; }; @@ -3806,6 +3812,7 @@ in with self; { RealVAMS = derive2 { name="RealVAMS"; version="0.4-3"; sha256="14jqrqza7bs11y1004wzi3bxkvkdfn43d82l0cyh6py8p37rfz28"; depends=[Matrix numDeriv Rcpp RcppArmadillo]; }; Rearrangement = derive2 { name="Rearrangement"; version="2.1"; sha256="0q253nj62rl65vjsq6503r80qa2j35wac8lv7ydp9w260p28z923"; depends=[quantreg]; }; Recon = derive2 { name="Recon"; version="0.3.0.0"; sha256="11gag2bl00pcy7ysfycaa58qarh6aigznldkc4kkn2178bl4ii62"; depends=[rootSolve]; }; + RecordLinkage = derive2 { name="RecordLinkage"; version="0.4-12"; sha256="0ycx2y8dbcslsvyvr2spnr5jy8m5la11ji0scdlqjymaamij8f3h"; depends=[ada data_table DBI e1071 evd ff ffbase ipred nnet rpart RSQLite xtable]; }; RecordTest = derive2 { name="RecordTest"; version="0.1.2"; sha256="19gxghp8b56gbyv2crjq2bzgaw5m3agd467ihbwkkjqli8cisgip"; depends=[ggplot2]; }; 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]; }; @@ -3829,11 +3836,12 @@ in with self; { RepaymentPlan = derive2 { name="RepaymentPlan"; version="0.1.0"; sha256="1fd4n24bd5s2kqmls7mmsidblaf8nzm97kz52mfsb6i6fci0pgah"; depends=[]; }; RepeatedHighDim = derive2 { name="RepeatedHighDim"; version="2.0.0"; sha256="1n9w4jb25pm0mmsahlfhkp9jmhgp5b21l1g85gm2wbxqkjsg7g0g"; depends=[MASS nlme]; }; Replicate = derive2 { name="Replicate"; version="1.2.0"; sha256="0kqy248c8n7qr5hwzvqm7flnjlwd60c577r1d4vzgfxn7azd5v3v"; depends=[ggplot2 metafor]; }; + Replication = derive2 { name="Replication"; version="0.1.2"; sha256="1za7zcdaf839xf8hxy4rcrr1p80n6a3ywb2bsl3wikwa0pxdvvbh"; depends=[blavaan lavaan MASS mice quadprog rjags runjags]; }; Repliscope = derive2 { name="Repliscope"; version="1.1.0"; sha256="0hij4ng77bkd979ndbhx1nqq2rfb69q23ghyd7illgvgrc79y9mr"; depends=[colourpicker ggplot2 shiny]; }; RepoGenerator = derive2 { name="RepoGenerator"; version="0.0.1"; sha256="0d6s2sqyycaqrg32xdkp3pr5i7qmvwrfrjcd7f94a9y3lz4bz5b5"; depends=[git2r httr rmarkdown rstudioapi]; }; ResistorArray = derive2 { name="ResistorArray"; version="1.0-32"; sha256="0zqnl0bbqrj5hn5ywhlqyrlz5ryql88qahlgs9989v4rljcxxlam"; depends=[]; }; ResourceSelection = derive2 { name="ResourceSelection"; version="0.3-5"; sha256="1vg5fkjfwkganxf0ji70pkp071841hjgr5sjxlaky8mx7n0cy80x"; depends=[MASS Matrix pbapply]; }; - RestRserve = derive2 { name="RestRserve"; version="0.2.1"; sha256="10g3gk8nsw5a4yly89mvm453y65rk0vjqsa0fcm69wdjhri91n1h"; depends=[checkmate jsonlite mime R6 Rcpp Rserve uuid]; }; + RestRserve = derive2 { name="RestRserve"; version="0.2.2"; sha256="1b8wbar98qhhl46s4i7qks5nm2wy5bvfi9029gpd4gmqsq4bmbm7"; depends=[checkmate jsonlite mime R6 Rcpp Rserve uuid]; }; RevEcoR = derive2 { name="RevEcoR"; version="0.99.3"; sha256="1nym263ynjdir5kxv35jnmki9mshlplq0sk3xnjd4ac6f1cfbfqj"; depends=[gtools igraph magrittr Matrix plyr purrr stringr XML]; }; Rexperigen = derive2 { name="Rexperigen"; version="0.2.1"; sha256="158ksnd1gvzq7ii0ys2v0wrfnr001hni0i8m77p1fn1arixgmqdw"; depends=[digest jsonlite RCurl]; }; Rfacebook = derive2 { name="Rfacebook"; version="0.6.15"; sha256="0hp2mbm0hnyasizszvh5x9hv7z2q633zck1a1gvk36nbxb1shx7c"; depends=[httpuv httr rjson]; }; @@ -3863,7 +3871,7 @@ in with self; { Rip46 = derive2 { name="Rip46"; version="1.0.2"; sha256="0wfp6fm5mgmjqjkn0c5hvjd95yn4zcv0s8xc5294qf5jqxp8b1w7"; depends=[Rcpp]; }; Rirt = derive2 { name="Rirt"; version="0.0.2"; sha256="0npd2g3a4dh5hlj6l06k1pf0j4731ybqqd4mpi4id16nf81cg104"; depends=[ggplot2 Rcpp reshape2]; }; Risk = derive2 { name="Risk"; version="1.0"; sha256="1i42xcc699syj108mvgklwb30wkf9c9jrg5rmd2ypnqk9mnyg2fg"; depends=[]; }; - RiskPortfolios = derive2 { name="RiskPortfolios"; version="2.1.2"; sha256="10kgr05npq9gyhglvpzk49hsr44rgscnygkv3b0gz7f6jxqkfj9z"; depends=[MASS nloptr quadprog]; }; + RiskPortfolios = derive2 { name="RiskPortfolios"; version="2.1.4"; sha256="1f5789sa2qjjsfsjxi1cidmpdla010zwvwspl46vzr97196hhig7"; 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.2"; sha256="0v689r9k52x8d4pvk6jlsgr6lp22fn3kn7s69hryyy3pmfmlbrh9"; depends=[imputeTS]; }; @@ -3871,7 +3879,7 @@ in with self; { RkMetrics = derive2 { name="RkMetrics"; version="1.3"; sha256="1k6vnr1r4h69iznib638z45gd0f8wc4g4h0ji9f0017883g77li1"; depends=[]; }; Rknots = derive2 { name="Rknots"; version="1.3.2"; sha256="1krhma8hy3l5lbm6d8rxjlj9jw1zrd16h4wy4p1clfa5vlhh3bwi"; depends=[bio3d rgl rSymPy]; }; Rlab = derive2 { name="Rlab"; version="2.15.1"; sha256="1pb0pj84i1s4ckdmcglqxa8brhjha4y4rfm9x0na15n7d9lzi9ag"; depends=[]; }; - Rlabkey = derive2 { name="Rlabkey"; version="2.3.4"; sha256="08f220a0blfvzn5qzvsydxdgbx44jlch5avaavlqixzizzwfrfhs"; depends=[httr jsonlite Rcpp]; }; + Rlabkey = derive2 { name="Rlabkey"; version="2.4.0"; sha256="0iah1b4f4gkyik30v0wrydnqx5g03l1jmkifyyfp03sg5cfvgzfv"; depends=[httr jsonlite Rcpp]; }; Rlda = derive2 { name="Rlda"; version="0.2.6"; sha256="0i8n01h9072q339p1kiqhcpwphw0d2x6bsszbhgfqc2b160dk2bl"; depends=[coda doParallel foreach gtools Rcpp RcppArmadillo RcppProgress]; }; Rlgt = derive2 { name="Rlgt"; version="0.1-3"; sha256="0g610v5rch5s31gc7dy9zx4mcgsdhn82y1pmr2rs14qma0v7x515"; depends=[BH forecast Rcpp RcppEigen rstan rstantools sn StanHeaders]; }; Rlibeemd = derive2 { name="Rlibeemd"; version="1.4.1"; sha256="06bb939awawpwn4g63b9jzq5b658lsznzy272zl0fy19x62c6bwr"; depends=[Rcpp]; }; @@ -3891,7 +3899,7 @@ in with self; { Rmst = derive2 { name="Rmst"; version="0.0.3"; sha256="1fykpii17k460qlsjhhh5vag02lhkyk5l3zjmg8hifqp0cjhz2fl"; depends=[ggplot2 Rata reshape2 Rirt]; }; RnavGraphImageData = derive2 { name="RnavGraphImageData"; version="0.0.4"; sha256="1k1gnkghap878fck0bbz9mm0fr4cli6lh1d11r0cf47fvl6cc4gr"; depends=[]; }; Rnmr1D = derive2 { name="Rnmr1D"; version="1.2.5"; sha256="0z97pmkksma225s948r0myd4638cy8vl1x2244w1r6n0cybymnd9"; depends=[base64enc doParallel foreach ggplot2 igraph impute MASS MassSpecWavelet Matrix plotly plyr ptw Rcpp signal speaq XML]; }; - Rnumerai = derive2 { name="Rnumerai"; version="0.3"; sha256="0zvfp9zp73gm6pflf9bx1xk1s45xwwvcd56cbris08d2zfj3b3nl"; depends=[httr lubridate]; }; + Rnumerai = derive2 { name="Rnumerai"; version="2.1"; sha256="1f16fp9gzcaz3ad7iyw10n8jrnmnhxygn00mrcg582jz62dih9bd"; depends=[dplyr ggplot2 httr lubridate purrr tidyr]; }; RobAStBase = derive2 { name="RobAStBase"; version="1.2.1"; sha256="0dn93bcyz9kxbj38sc1wisfa6v0666v9gk6y3zq0ihjkkhkmdwq3"; depends=[distr distrEx distrMod RandVar rrcov startupmsg]; }; RobAStRDA = derive2 { name="RobAStRDA"; version="1.2.0"; sha256="1s84j5in4av9zbbszv8j2rpigrd9ws9h4hz64jw7xagsj3xb49kz"; depends=[]; }; RobExtremes = derive2 { name="RobExtremes"; version="1.2.0"; sha256="150p94f0g75g54qcaq4x45lk4sxiyvv1zs4hxkicf46raybvsv89"; depends=[actuar distr distrEx distrMod evd RandVar RobAStBase RobAStRDA robustbase ROptEst startupmsg]; }; @@ -3925,7 +3933,6 @@ in with self; { 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.12"; sha256="0a3cpyw7fgfklwzzy77sm3brfdha4p9021jaaa2s2hknpr9c1fmp"; depends=[ape doBy geiger MASS Matrix mvnmle phylolm phytools Rcpp RcppArmadillo]; }; - Rpipedrive = derive2 { name="Rpipedrive"; version="0.1.1"; sha256="1rf16q0wfmd3n9idiqpmdhcw7sq27yk2cy9gfl5l6bzj0y6ax1q8"; depends=[httr jsonlite]; }; Rpoet = derive2 { name="Rpoet"; version="1.1.0"; sha256="11gp4zg0wc2a21956355rkr3i3dyaabfz0z30z4phn8s7y3yqr92"; depends=[]; }; 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=[]; }; @@ -3964,15 +3971,15 @@ in with self; { Rvmmin = derive2 { name="Rvmmin"; version="2018-4.17"; sha256="0mhzzwk311wa157l3n4x5x038asvjd81l45g1jclfsjr0smsffym"; depends=[optextras]; }; Rvoterdistance = derive2 { name="Rvoterdistance"; version="1.1"; sha256="16il36hkq1j6gyl5d8bx5khiiv6fy2m8vkhwiaaiqsliw2sspy4j"; depends=[Rcpp]; }; Rwave = derive2 { name="Rwave"; version="2.4-8"; sha256="1rmqwyj2r84sii0vfqhyhpi3n1n1zia2ca627fq9ksvwn110nrvh"; depends=[]; }; - Rwhois = derive2 { name="Rwhois"; version="1.0.3"; sha256="06mx98wi6r265ykkk81hk17yjkym6ar7c2cwp962ijfk3lxwc9l4"; depends=[stringr]; }; + Rwhois = derive2 { name="Rwhois"; version="1.0.4"; sha256="0gbw1fvin6hwm4893rif9grpsf5s2snzp7zvz3ra4f5jv5bflvpl"; depends=[stringr]; }; Rwinsteps = derive2 { name="Rwinsteps"; version="1.0-1.1"; sha256="0kaxhaa65k1hkhl4kqfxyyk6v967xncrdr5hy8b808zlbqriankc"; depends=[]; }; Rwofost = derive2 { name="Rwofost"; version="0.6-3"; sha256="0a6fp2hkf51hqmbyp7mlhhnzzxj2gcq0kdrlcm3qmpkv0y44wmmw"; depends=[meteor Rcpp]; }; Rwordseg = derive2 { name="Rwordseg"; version="0.3-2"; sha256="10jhfalh45rrcm76hwz4b5yl408ndx2wkr0i3q1avx6z6i45d8s6"; depends=[HMM tmcn]; }; RxCEcolInf = derive2 { name="RxCEcolInf"; version="0.1-4"; sha256="0qyhxqd5yi4d1prj0i4g3k29zi0mx6wkjx24ynb4arxw6h1vabh4"; depends=[coda lattice MASS MCMCpack mvtnorm]; }; RxODE = derive2 { name="RxODE"; version="0.9.2-0"; sha256="1ynn38wk08szi34pk0hmlnanmfg19arazsqzafyw5kd1v3fdx4g4"; depends=[assertthat brew cli dparser ggplot2 inline knitr lotri magrittr Matrix memoise mvnfast pillar PreciseSums Rcpp RcppArmadillo rex sys units]; }; RxnSim = derive2 { name="RxnSim"; version="1.0.3"; sha256="0fi4aic2brfbl6rsnnfwqq7l8ygvlmr98w0v749l3djpgn7sfrig"; depends=[data_table fingerprint rcdk rJava]; }; - Rxnat = derive2 { name="Rxnat"; version="1.0.6"; sha256="1wzb4dihzbyp23yggi1n7c5ikbq6h2gl9v7bgwxf00y2gwlabjx4"; depends=[httr RCurl]; }; - Ryacas = derive2 { name="Ryacas"; version="1.1.2"; sha256="1m5z6x4w461rwk5ay6fc7y3l4b1nwlhma0lis2q8v93adnwgmg7n"; depends=[magrittr Rcpp]; }; + Rxnat = derive2 { name="Rxnat"; version="1.0.8"; sha256="12xcs2l6vn50bwzfmv60j1qahjw2npfm1a3yjhffcxzh6p8chwbg"; depends=[httr RCurl]; }; + Ryacas = derive2 { name="Ryacas"; version="1.1.3"; sha256="12vkylq06c7kqvvf662cyzhdcnpy928xsjflf1kf0nh6y00gywf8"; depends=[magrittr Rcpp]; }; Ryacas0 = derive2 { name="Ryacas0"; version="0.4.2"; sha256="0k8q9v9016x8vfskwa6zmh2rbblqqfk8bryxslxaj8irzvkggnvl"; depends=[Rcpp settings xml2]; }; 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]; }; @@ -3985,7 +3992,6 @@ in with self; { SALTSampler = derive2 { name="SALTSampler"; version="1.1.0"; sha256="1lh1w5kcx2sqv5czpfypdbq5mw7pxjbdk0vyg23zzjs26ynbdkn9"; depends=[lattice]; }; SAM = derive2 { name="SAM"; version="1.1.2.1"; sha256="01gj9k1gf35vm11p0p590irqc5daaiwmq05rl2v3n8h2azaz1c7l"; depends=[Rcpp RcppEigen]; }; SAMBA = derive2 { name="SAMBA"; version="0.9.0"; sha256="0gxc1s82bfhqj1rpmp0fm87frv77rgr8qjqai7zdgfz3jm474any"; depends=[optimx survey]; }; - 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]; }; @@ -4083,7 +4089,7 @@ in with self; { SLHD = derive2 { name="SLHD"; version="2.1-1"; sha256="0y3ilxd0phmks8zkmpgw7p5zrkwq4k95h976cwk58pavvhfwj9kb"; depends=[]; }; SLICER = derive2 { name="SLICER"; version="0.2.0"; sha256="10i0hfl6js26n8xwk9pldzm9vv7hmii6gzj04lhqy0g3njds25kp"; depends=[alphahull igraph lle]; }; SLIDE = derive2 { name="SLIDE"; version="1.0.0"; sha256="0x4fm29r7icg33k8gw3vqvxib8n9a1xwg484x9yffybips9ka22c"; depends=[]; }; - SLOPE = derive2 { name="SLOPE"; version="0.1.3"; sha256="12naak08qjpn6l1ikqwf17h72zk4b5mppgxx7ks9wmnqy9ylhy3x"; depends=[Rcpp]; }; + SLOPE = derive2 { name="SLOPE"; version="0.2.1"; sha256="1ilwa8hkp8frai77vn1ba6wdqxhwcqpb0mw6ag2np5hjm2a8vrs3"; depends=[foreach lattice Matrix Rcpp RcppArmadillo]; }; SMARTAR = derive2 { name="SMARTAR"; version="1.0.0"; sha256="04v6nvkcjchln8jxa9qm9j2hrxbm8rm9v96v6j313ia8js0krp9q"; depends=[MASS]; }; SMARTp = derive2 { name="SMARTp"; version="0.1.1"; sha256="0gkhl9j4l67brfmln28m4q4hfi271jlg5aijnjwahlj8nsi6384y"; depends=[covr mvtnorm sn]; }; SMC = derive2 { name="SMC"; version="1.1"; sha256="1r4ajgi785lmpnlxrba0n6phmk1f0mb6b5yqk6hx8gng2w8ggclz"; depends=[]; }; @@ -4153,9 +4159,9 @@ in with self; { SRTtools = derive2 { name="SRTtools"; version="1.2.0"; sha256="1203i6nqclx0faxyvhdaapmfxy8h95jj83svxriqh1hpava5s1dy"; depends=[magrittr]; }; SSBtools = derive2 { name="SSBtools"; version="0.6.0"; sha256="1p00kacf49h475jdq9lf955dpzw81n399zzpzx7igp8d2snccy3f"; depends=[Matrix stringr]; }; SSDM = derive2 { name="SSDM"; version="0.2.8"; sha256="19l78dkjk76ababkd7xsfn0fy99khfa4i502q4vllpvch4cjz51c"; depends=[dismo e1071 earth gbm ggplot2 mgcv nnet poibin randomForest raster reshape2 rpart scales shiny shinydashboard shinyFiles sp spThin]; }; - SSDforR = derive2 { name="SSDforR"; version="1.5.12"; sha256="12vhdh808w4qbr7ipidx79y0lsn04za7d0m6dxpn8mgbplr64kdb"; depends=[MAd MASS metafor psych SingleCaseES TSA TTR]; }; + SSDforR = derive2 { name="SSDforR"; version="1.5.15"; sha256="0cdjv32mc0j5b3ih9lkcspc4p87i1mlq21bjyx59bd9vgfa1bhkw"; depends=[MAd MASS metafor psych SingleCaseES TTR]; }; SSLASSO = derive2 { name="SSLASSO"; version="1.2-2"; sha256="0vnn9ksdf0qgjflgx1sfj6q6j9jfnarbx2222rh9kb10jy8b16jv"; depends=[]; }; - SSLR = derive2 { name="SSLR"; version="0.9.0"; sha256="1k7a8f25jhswfhagbn8dr0lhc9148475v264kh0a4p0852vsbdlr"; depends=[dplyr foreach generics magrittr parsnip plyr proxy purrr RANN Rcpp RcppArmadillo rlang RSSL]; }; + SSLR = derive2 { name="SSLR"; version="0.9.1"; sha256="00a26p9y0f6df345qkl2ga0q11a6sasv7p76nyvwjb7wcgbl09kz"; depends=[dplyr foreach generics magrittr parsnip plyr proxy purrr RANN Rcpp RcppArmadillo rlang RSSL]; }; SSM = derive2 { name="SSM"; version="1.0.1"; sha256="1h8yyzh5rn5jay70kyzvwirfndi049a5w28qigrjv5rxd7ml84l7"; depends=[]; }; SSN = derive2 { name="SSN"; version="1.1.15"; sha256="057lh2ym82ff3c25vyh97csns4jwlbvxwc4jai0i4yplxf0ccmha"; depends=[BH igraph lattice maptools MASS Matrix rgdal rgeos RSQLite sp]; }; SSOSVM = derive2 { name="SSOSVM"; version="0.2.1"; sha256="11wlalpw6yhvv95xr8vvgxgl4jafc2ghzsk5wqyv71ahxarmrlss"; depends=[MASS mvtnorm Rcpp RcppArmadillo]; }; @@ -4191,7 +4197,6 @@ in with self; { SWMPrExtension = derive2 { name="SWMPrExtension"; version="1.1.3"; sha256="1xyn802aadx3fxckqvimkpwbx0pv6g3wqjzjx2k46qnm2gl6ck0v"; depends=[broom dplyr EnvStats flextable ggplot2 ggthemes leaflet lubridate magrittr maptools officer RColorBrewer rgdal rgeos rlang scales sp SWMPr tidyr]; }; SYNCSA = derive2 { name="SYNCSA"; version="1.3.4"; sha256="0n9za302x638s666xs86zy94qch9wn0rln8xy6x9jymhhq9zn0kj"; depends=[FD permute RcppArmadillo vegan]; }; SafeBayes = derive2 { name="SafeBayes"; version="1.1"; sha256="09bhd3z9ia2mvpn1h0hil00j6cm4x9y9ymxc3gj8wd4ybdi3jqlm"; depends=[]; }; - SafeQuant = derive2 { name="SafeQuant"; version="2.3.1"; sha256="0rgi0ij33sdvkpmjynfmsj0f29kl9l9ylsqckg5x4v49m6mzq1yh"; depends=[Biobase corrplot data_table epiR gplots limma optparse seqinr]; }; SailoR = derive2 { name="SailoR"; version="1.0"; sha256="1gb50qd9s3dwdvl6qihpkgwlhckbhn7h3wpz9k74xgyd874krcld"; depends=[]; }; Sample_Size = derive2 { name="Sample.Size"; version="1.0"; sha256="1vfnb2gg3rax4sxd81xqznfvh300nv45nn7zjsyrdjyg1n3ym7nw"; depends=[]; }; SampleSize4ClinicalTrials = derive2 { name="SampleSize4ClinicalTrials"; version="0.2.2"; sha256="19dl5sfrsmahrf1q0ljpjmp2821mn2h9d53ds9jyci0wv287gzs9"; depends=[]; }; @@ -4250,11 +4255,12 @@ in with self; { SequenceSpikeSlab = derive2 { name="SequenceSpikeSlab"; version="0.1.1"; sha256="079qm4klgaml99j4cshy3n54pg7q537zlagib4xd8mswdmqdvll6"; depends=[Rcpp RcppProgress selectiveInference]; }; Sequential = derive2 { name="Sequential"; version="3.1"; sha256="0wh5bxqgmkmlbz9bmvpv3lp8mq4iih86a73ccl6fycfpqvq6nf6i"; depends=[boot]; }; SequentialDesign = derive2 { name="SequentialDesign"; version="1.0"; sha256="1gi37pixwbpy7358id1c75rckr352hs8vjs8sk8qgsr97pkm5xdq"; depends=[Sequential]; }; + SetMethods = derive2 { name="SetMethods"; version="2.5"; sha256="1f90szzfv370k2a92p8hi8zcjcfj5dsffhkhdbqk00s45cpjsn20"; depends=[admisc betareg fmsb ggplot2 ggrepel lattice QCA scatterplot3d stargazer]; }; SetRank = derive2 { name="SetRank"; version="1.1.0"; sha256="0p7vwsw05s5hfw1mfh3fbm9nfzsymnxzrdjin7k21dx7asb618wy"; depends=[data_table igraph XML]; }; SetTest = derive2 { name="SetTest"; version="0.2.0"; sha256="08wc6cbnannmwkncqhpcw6l0y7c1v7z3awk5j7fd853nszfmpbk0"; depends=[]; }; - Seurat = derive2 { name="Seurat"; version="3.1.4"; sha256="0lhjbjhv1hnx5i3gkx41k68i8ykay3f24708h30wx9xywww9lsvi"; depends=[ape cluster cowplot fitdistrplus future future_apply ggplot2 ggrepel ggridges httr ica igraph irlba KernSmooth leiden lmtest MASS Matrix metap patchwork pbapply plotly png RANN RColorBrewer Rcpp RcppAnnoy RcppEigen RcppProgress reticulate rlang ROCR rsvd Rtsne scales sctransform tsne uwot]; }; + Seurat = derive2 { name="Seurat"; version="3.1.5"; sha256="1lbq2pqhb6ih6iqawlnzdh05zff71pwbw1cpfv2sld3pd7kz0zkm"; depends=[ape cluster cowplot fitdistrplus future future_apply ggplot2 ggrepel ggridges httr ica igraph irlba KernSmooth leiden lmtest MASS Matrix patchwork pbapply plotly png RANN RColorBrewer Rcpp RcppAnnoy RcppEigen RcppProgress reticulate rlang ROCR rsvd Rtsne scales sctransform tsne uwot]; }; ShapeChange = derive2 { name="ShapeChange"; version="1.4"; sha256="1ch7avx8mxjk8vrp17inaihmbsv968wflyk1n4fbjvacbl24vn2b"; depends=[coneproj quadprog]; }; - ShapePattern = derive2 { name="ShapePattern"; version="2.0.3"; sha256="13sp9hv0ynab1d9fmr8531qvrrx4x958pw50b5828mqbqsgk24ff"; depends=[landscapemetrics raster rgdal rgeos sp]; }; + ShapePattern = derive2 { name="ShapePattern"; version="2.0.4"; sha256="0bvcxm4rxi0a7cj7w6qpnqmpvqzdww7w43a2fa3bcks8g0hy71pc"; depends=[landscapemetrics raster rgdal rgeos sp]; }; ShapeSelectForest = derive2 { name="ShapeSelectForest"; version="1.4"; sha256="15ds3024qcvnq3pnbhpyd6hbif26mdzw1srqv44hwsllgzpi7602"; depends=[coneproj raster]; }; SharpeR = derive2 { name="SharpeR"; version="1.2.1"; sha256="1xcnbjwcqc9mhb6kqcarkmjcr5zrn5hryfp4i4rayra9yk9k18r8"; depends=[matrixcalc sadists]; }; ShiftShareSE = derive2 { name="ShiftShareSE"; version="1.0.1"; sha256="09sm3frapxv1zhxy84wqyaxdk5jx62ijszfa34zlknlgivividfy"; depends=[Formula]; }; @@ -4269,8 +4275,8 @@ in with self; { SigOptR = derive2 { name="SigOptR"; version="0.0.1"; sha256="1sylchhhz6kx4r8jx95cvsmjsacjh8pin7acf2fyw2a4nlx9r1a6"; depends=[httr jsonlite]; }; SigTree = derive2 { name="SigTree"; version="1.10.6"; sha256="18gh7azjr979ijc2y4yyskj24ay697rw3j7znc5p4a63s4vpxr9w"; depends=[ape MASS phyext2 phylobase phyloseq RColorBrewer vegan]; }; SightabilityModel = derive2 { name="SightabilityModel"; version="1.3"; sha256="0rgv5735y07yyv5y9c3flzha97ykn34ysmzy6as1z94hqfr4w746"; depends=[]; }; - Signac = derive2 { name="Signac"; version="0.2.4"; sha256="1szc4a4g8c2qrjm3i597byw0sj2sksvj2w7fr93d6n5w1y251260"; depends=[BiocGenerics Biostrings BSgenome data_table dplyr future future_apply GenomeInfoDb GenomicFeatures GenomicRanges gggenes ggplot2 ggseqlogo IRanges irlba Matrix patchwork pbapply Rsamtools S4Vectors Seurat tidyr zoo]; }; - SignifReg = derive2 { name="SignifReg"; version="2.1.1"; sha256="1796qy77fm8h0gnrwfm4sdfcbf2y3c8vvz4c6yrig0h4pjhhh07h"; depends=[]; }; + Signac = derive2 { name="Signac"; version="0.2.5"; sha256="01cpya2x9dzjxicqzrkiafhn571n3dw7n10rwz3cs528qgap43db"; depends=[BiocGenerics data_table dplyr future future_apply GenomeInfoDb GenomicRanges gggenes ggplot2 ggseqlogo IRanges irlba Matrix patchwork pbapply Rsamtools S4Vectors Seurat tidyr zoo]; }; + SignifReg = derive2 { name="SignifReg"; version="3.0"; sha256="0yvbf56ap29rfm10vdv3mc67x1aklkwwapi72vzsi2xhrgwf395d"; depends=[]; }; Sim_DiffProc = derive2 { name="Sim.DiffProc"; version="4.5"; sha256="1rrdkmyv9fj7jjafl8zvyzpdjli2s004v1wdsifnq1zp0vmv1m9q"; depends=[Deriv MASS]; }; Sim_PLFN = derive2 { name="Sim.PLFN"; version="1.0"; sha256="1jmsydhpfv2z9cr99hfy8cairhkkxpwk4wnz1adixwxazkn7qfah"; depends=[DISTRIB FuzzyNumbers]; }; SimBIID = derive2 { name="SimBIID"; version="0.1.4"; sha256="1kqa1bm0f9kx7nr936hhpsi6hjjb3mlppxycwwi5pmzv9snm83hg"; depends=[coda dplyr ggplot2 mvtnorm purrr RColorBrewer Rcpp RcppArmadillo RcppXPtrUtils tibble tidyr]; }; @@ -4283,6 +4289,7 @@ in with self; { SimEUCartelLaw = derive2 { name="SimEUCartelLaw"; version="1.0.1"; sha256="1wg9sayk55mp3f2qykvfk0cbqh050vh0n1fhpq4fmlxqll87aml9"; depends=[plot3D plot3Drgl rgl]; }; SimHaz = derive2 { name="SimHaz"; version="0.1"; sha256="04q4xyc1ki1zr3grm3khfg0kbykjy3j9qpg332l7pxp4j3wa3aw3"; depends=[survival]; }; SimInf = derive2 { name="SimInf"; version="6.5.1"; sha256="1sacky971igk2x8kmiqfavxvzvyxl53snjpb8zf72ffh3d2nn32c"; depends=[Matrix]; }; + SimJoint = derive2 { name="SimJoint"; version="0.3.7"; sha256="03xf8n1fbbq63wz8kyj19h9vqz14z463cv8xqhmaknlamnnyhis5"; depends=[Rcpp RcppArmadillo RcppParallel]; }; SimMultiCorrData = derive2 { name="SimMultiCorrData"; version="0.2.2"; sha256="0brszbqxf40y65xp96c5hp7hhvz3gv0xlg93r5ik8qdh0bn0y1sw"; depends=[BB GenOrd ggplot2 Matrix nleqslv psych triangle VGAM]; }; SimPhe = derive2 { name="SimPhe"; version="0.2.0"; sha256="01kzypahw41jk8s2c92h0k9w32yaicis07wb6k8qlqcmv0zj8xry"; depends=[]; }; SimRAD = derive2 { name="SimRAD"; version="0.96"; sha256="0ivvd3k04v1akbblxcjhlyc315z3ig7wjs0g3b37lvlfp54ppbrg"; depends=[Biostrings ShortRead zlibbioc]; }; @@ -4292,13 +4299,13 @@ in with self; { SimSCRPiecewise = derive2 { name="SimSCRPiecewise"; version="0.1.1"; sha256="0mhlx9m5db8a40wf275qh59345676m8bpjjmyx1v22f6m9p3b2n4"; depends=[]; }; SimSeq = derive2 { name="SimSeq"; version="1.4.0"; sha256="068gg484w07qb4wajik2s3z79xfj0jg5l4pz69267dxi5kzd9fas"; depends=[fdrtool]; }; SimTimeVar = derive2 { name="SimTimeVar"; version="1.0.0"; sha256="1x0lkgqwx1vz1gbyvy0hx20n638n30j0dny1iz5vs0cvviq3cdv8"; depends=[car corpcor ICC metafor miscTools mvtnorm plyr psych]; }; - SimVitD = derive2 { name="SimVitD"; version="0.1.1"; sha256="0xq9qi3vf1aggcwy2hn7q57zvis6ws1z4azvgp2xsndbn7rg9qda"; depends=[poisson]; }; + SimVitD = derive2 { name="SimVitD"; version="0.1.2"; sha256="0ilv17ngs1y09z459yn5wlg0bql93awdy3gbmrjhv00iyp30kvjp"; depends=[poisson]; }; SimilaR = derive2 { name="SimilaR"; version="1.0.7"; sha256="1zabx25wqvspyl8yxknr8glz9b0dmk9wn4yz8fry4wd1nx2hl28q"; depends=[BH Rcpp stringi]; }; SimilarityMeasures = derive2 { name="SimilarityMeasures"; version="1.4"; sha256="1w4klcln4hy9vcik9csg7b3b8kk4raxgckwfrhqg089d80xbqsxj"; depends=[]; }; 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="2.0.2"; sha256="0jv6yh6nh26wy18b4k3bi6pxhajmm2jw4hxxrjkpznn14c173qz5"; depends=[assertthat broom dplyr moments tibble]; }; + SimplifyStats = derive2 { name="SimplifyStats"; version="2.0.4"; sha256="08775g6fdx09y8pkfq4k8zxbxpwah7yqq5cg30lmxl7zrpmza5hv"; depends=[assertthat broom dplyr moments tibble]; }; Simpsons = derive2 { name="Simpsons"; version="0.1.0"; sha256="1pm6wga1yxc35zgz72plzq23d3l4bbzfdvhszdxmkn1pkk64h8ms"; depends=[mclust]; }; SinIW = derive2 { name="SinIW"; version="0.2"; sha256="1z7rcjy0i09a9hjpjj1x8i46lv042l20lvb6b0pnsky2sx3v78pd"; depends=[fdrtool pracma]; }; SingleCaseES = derive2 { name="SingleCaseES"; version="0.4.3"; sha256="05bd03ka6qxmq8ls9w0nfklya3qay90s3i0iqjpcd6id4g8cz2kb"; depends=[dplyr magrittr purrr rlang tidyr tidyselect]; }; @@ -4372,11 +4379,11 @@ in with self; { SpatialExtremes = derive2 { name="SpatialExtremes"; version="2.0-8"; sha256="0r2byz5xxc46zqnigdax28q7446ibmzmsmi10lmm2hdks3ml6sl3"; depends=[fields maps]; }; SpatialFloor = derive2 { name="SpatialFloor"; version="1.1.0"; sha256="07mwgcvkkq478l6wxvrdjs9d578x0kgs5xy86lgy5my0xqfcv6y8"; depends=[blocksdesign fields reshape2 taRifx]; }; SpatialGraph = derive2 { name="SpatialGraph"; version="1.0-2"; sha256="0cwswa5g3a6ng8qkwi04jz9pma4i0c16m7jpq6z3djzjin0znyk2"; depends=[igraph rgeos shape sp splancs]; }; - SpatialKDE = derive2 { name="SpatialKDE"; version="0.5.0"; sha256="15v8msvmpy72d0vjrra1rmkkxn7pm11bngr3liw2n43lwkh19l9i"; depends=[dplyr glue magrittr raster Rcpp rlang sf]; }; + SpatialKDE = derive2 { name="SpatialKDE"; version="0.6.1"; sha256="15znbhfflzz1x396mnnbx9lx8xs6rfr2564kr632qb2d9ihj9s45"; depends=[dplyr glue magrittr raster Rcpp rlang sf]; }; SpatialML = derive2 { name="SpatialML"; version="0.1.3"; sha256="0akip0kkd1jjid12iwmaxkhkvcfzkxmrnrsv0b6nnvpjdl1jb589"; depends=[randomForest]; }; SpatialNP = derive2 { name="SpatialNP"; version="1.1-4"; sha256="1hj9fjhyxcvl2d0wdqyc899wy4f6iyi03g65icavkmqnwcs8c7hc"; depends=[]; }; SpatialPack = derive2 { name="SpatialPack"; version="0.3-8"; sha256="0laixlr37048x2dr1zbk41kjp533w47khc1d9rihmlrwxrflprd0"; depends=[]; }; - SpatialPosition = derive2 { name="SpatialPosition"; version="2.0.0"; sha256="00z1kbkd7as4xnzqnizaap9qga4vakx7swyayli26ghp11krgfwr"; depends=[isoband lwgeom raster rgeos sf sp]; }; + SpatialPosition = derive2 { name="SpatialPosition"; version="2.0.1"; sha256="0ljhb5j05kxhw1c2ki1m1688mgbg4pnf8z324i21b9idrcypcizn"; depends=[isoband raster rgeos sf sp]; }; SpatialRoMLE = derive2 { name="SpatialRoMLE"; version="0.1.0"; sha256="1m80vcd27g11v0gxnjz6p4ghljpxdb8jpkns8ry5yzhfvcpf29jc"; depends=[]; }; SpatialTools = derive2 { name="SpatialTools"; version="1.0.4"; sha256="0jgbrzsx2klvihv65y1ycqyr8awp5kqqz4qwfyfibx3b56lzna1q"; depends=[Rcpp RcppArmadillo spBayes]; }; SpatialVS = derive2 { name="SpatialVS"; version="1.1"; sha256="1xghfiz9wmmx11ssms7zjy3ggkjmc6kkbdwp3v5wjwpwapafzdk3"; depends=[fields MASS nlme]; }; @@ -4426,6 +4433,7 @@ in with self; { StratSel = derive2 { name="StratSel"; version="1.3"; sha256="0hd6q8s8aiymcd33kv0gd0a4wzr86xxdzwn18jgpyk9q8pmg8gvl"; depends=[Formula MASS memisc mnormt pbivnorm]; }; Strategy = derive2 { name="Strategy"; version="1.0.1"; sha256="0phja1r0qfvcswvw5w1x6ny86p84wkqb029fdqgw10djdm9xp0f2"; depends=[xts zoo]; }; StratifiedBalancing = derive2 { name="StratifiedBalancing"; version="0.3.0"; sha256="0pklnm0q0imdhyzhwyb4i0j441dkk4k6qqlx8d4q2xnl62drqnvv"; depends=[bnlearn plyr]; }; + StratifiedMedicine = derive2 { name="StratifiedMedicine"; version="0.2.3"; sha256="03hjx3c7gfzsx3frh0k484xakw9ssrar4dlilw2x85m55hsn7v9r"; depends=[dplyr ggparty ggplot2 glmnet mvtnorm partykit ranger survival]; }; StratifiedRF = derive2 { name="StratifiedRF"; version="0.2.2"; sha256="0a5djia6xacs17nnr5knr1acwzicrffz73q9nvnhdmihazq8v27d"; depends=[C50 dplyr]; }; StratigrapheR = derive2 { name="StratigrapheR"; version="1.0.1"; sha256="0b63n91ns4z745nrdrrnjmj1pmqi5plj1fkbh9ix7i6a7bd2n023"; depends=[diagram dplyr shiny stringr XML]; }; StreamMetabolism = derive2 { name="StreamMetabolism"; version="1.1.2"; sha256="1sv30i7armk7jhxg5x9lh0r9qq3xixn1k2h0q89halkh1yraal8a"; depends=[chron maptools zoo]; }; @@ -4469,7 +4477,7 @@ in with self; { Survgini = derive2 { name="Survgini"; version="1.0"; sha256="1gxkdv2j1njbgnwb52vyhz7p2lrcg3hp6sry3kyhp4wkvf6gnhxi"; depends=[survival]; }; SvyNom = derive2 { name="SvyNom"; version="1.1"; sha256="1jym2x6nd9a3y7nk5hflqpy54gs67y4sqqspkvkalf5l2cc64did"; depends=[Hmisc rms survey survival]; }; SwarmSVM = derive2 { name="SwarmSVM"; version="0.1-6"; sha256="09xq7jx70qjyhblzh6kc40hdr0636rqqdnbka7m6rawhd8ivp8yz"; depends=[BBmisc checkmate e1071 kernlab LiblineaR Matrix SparseM]; }; - SwimmeR = derive2 { name="SwimmeR"; version="0.1.0.0"; sha256="0979527aaacfq8arp1qh7z3p9crq8x2v90899z2ab0fa6f9n282m"; depends=[dplyr purrr stringr tibble]; }; + SwimmeR = derive2 { name="SwimmeR"; version="0.2.0"; sha256="0x6vidrha9wj24ync3nyfcyzdjdq4z2yf52h4m3gr5pd3ir9pb8f"; depends=[dplyr ggplot2 magrittr pdftools purrr rvest scales stringr tibble]; }; SwissAir = derive2 { name="SwissAir"; version="1.1.5"; sha256="0lh69924vhyilgn562jqn8m7z4dq3xmdj09501sbs7hbxfaiiyly"; depends=[]; }; SyNet = derive2 { name="SyNet"; version="2.0"; sha256="0mb9dscddkvmkf7l3bbcy4dlfmrvvy588vxdqy5dr783bpa5dkiw"; depends=[tkrplot]; }; SymTS = derive2 { name="SymTS"; version="1.0"; sha256="17vhm00zd9yxl6li36bsfkm4rsizjsm93ibrzgqnkl72sqmmlwfi"; depends=[]; }; @@ -4553,7 +4561,7 @@ in with self; { TSMSN = derive2 { name="TSMSN"; version="0.0.1"; sha256="0zy9r6i1p161h1zh0vnz1npsh48q3nc2c5hcgzvf78nfznnn6wg1"; depends=[mvtnorm numDeriv progress sn]; }; TSMining = derive2 { name="TSMining"; version="1.0"; sha256="1n32acagffiw31pr485ly3phx33zw7vj009bvw4lbqpixa1pszj2"; depends=[foreach ggplot2 plyr reshape2]; }; TSMySQL = derive2 { name="TSMySQL"; version="2015.4-1"; sha256="1gdda7li320ba9qfxfl5c4cwl2ln5jdbvid98cryj175g0nbmx7b"; depends=[DBI RMySQL tframe TSdbi TSsql]; }; - TSP = derive2 { name="TSP"; version="1.1-9"; sha256="183m6crb0dv17llj86059n3hbgsahbhfcqlx0ijdzkssg11i1cy7"; depends=[foreach]; }; + TSP = derive2 { name="TSP"; version="1.1-10"; sha256="0z1v6m0vqjzxc4az3zyjaayygx0jr3mdmc56jjd421iqh0b9z5s4"; depends=[foreach]; }; TSPostgreSQL = derive2 { name="TSPostgreSQL"; version="2015.4-1"; sha256="11201zpbrva6gwc9hg8pynadrps6d8pb3syzba9nyjpv2ck6x3ry"; depends=[DBI RPostgreSQL tframe tframePlus TSdbi TSsql]; }; TSPred = derive2 { name="TSPred"; version="4.0"; sha256="0zjx33llkvvj7m4z16crybw0y6s6zvlblxn2in3j7v9cv0ihhsa8"; depends=[EMD forecast KFAS MuMIn vars wavelets]; }; TSS_RESTREND = derive2 { name="TSS.RESTREND"; version="0.2.13"; sha256="0wbwkhc1b5dql87sj1441cknidpgwcflwlid2yj6d64a6wsipn1l"; depends=[bfast broom ggplot2 RcppRoll strucchange]; }; @@ -4584,7 +4592,7 @@ in with self; { TULIP = derive2 { name="TULIP"; version="1.0"; sha256="0v0qnhlgj31mdl8xhhcbdlnmfcfn2scpr0bf2jxkxpyxiavqdfxy"; depends=[glmnet MASS Matrix tensr]; }; TUWmodel = derive2 { name="TUWmodel"; version="1.1-1"; sha256="1am3ywcj1rqgz5i2g9c6d6fgiv8b2nabllfy84xx1n18pin7mfbk"; depends=[]; }; TVMM = derive2 { name="TVMM"; version="2.0"; sha256="1ijrni80i4d4mli5c8rf9jmazs3hanhvhhk20fjgalk94zvbp7md"; depends=[MASS robustbase]; }; - Taba = derive2 { name="Taba"; version="0.1.0"; sha256="0pqmz7gyf719s5b7mjmmmxr5il3pzgsymibxir6ljpgdsdgbgi5s"; depends=[robustbase]; }; + Taba = derive2 { name="Taba"; version="0.1.1"; sha256="0dm2wi8k8gligb8j31xr6n95nplq669s7brn9xfnxxmmrmjlvlrl"; depends=[robustbase]; }; Table1Heatmap = derive2 { name="Table1Heatmap"; version="1.1"; sha256="1nrabjivfsdhaqmlq365pskkrp99jqsxn8vy03mdnqn5h5zv7wvx"; depends=[colorRamps]; }; TableHC = derive2 { name="TableHC"; version="0.1.2"; sha256="1il86xjc4h1sdq3gpi4s7xbkcgzpgfqy5ivzjdkbq45d06pssk21"; depends=[]; }; TableMonster = derive2 { name="TableMonster"; version="1.7"; sha256="1xa4bkcpzhm50dwbpya346swjjfw46n2x26xm30p8gppilg5c0lb"; depends=[xtable]; }; @@ -4604,8 +4612,8 @@ in with self; { Tcomp = derive2 { name="Tcomp"; version="1.0.1"; sha256="1k0gsf3yr5n9zc2yi6szxm6s7bf61lz4fx8m3v48jlp5w900prwb"; depends=[forecast Mcomp]; }; TeXCheckR = derive2 { name="TeXCheckR"; version="0.6.0"; sha256="1qrzslcipg3j1317dhizxhcxyx2dpx7jh91vkms10wgc6vpqgrw4"; depends=[clisymbols crayon data_table fastmatch hunspell hutils magrittr rstudioapi zoo]; }; TeachNet = derive2 { name="TeachNet"; version="0.7.1"; sha256="12kkpr96mq0jr07k7ivcmwhrfgas1qrfqfhxa4gm7vv3vkjn0gs9"; depends=[]; }; - TeachingDemos = derive2 { name="TeachingDemos"; version="2.10"; sha256="016pivvy8gzz8f3clnr5dg488rb1lf0l5s00c3v34gm1dgiw5x1f"; depends=[]; }; - TeachingSampling = derive2 { name="TeachingSampling"; version="4.0.1"; sha256="1hh56j1l8wyglnmy92cvh0awcyfjzk6iwgwnhdbc2infjq8fr1lg"; depends=[dplyr magrittr]; }; + TeachingDemos = derive2 { name="TeachingDemos"; version="2.12"; sha256="0i46d7269zhvr3c2a2w1lb3jnhc1cgwhcppqdmnl1ymgw5f40x9y"; depends=[]; }; + TeachingSampling = derive2 { name="TeachingSampling"; version="4.1.1"; sha256="02nywwmv0r8md00kra7wxwzvm6p51l4p8la51bxh8sqq8ajsdswh"; depends=[dplyr magrittr]; }; 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]; }; Temporal = derive2 { name="Temporal"; version="0.2.0"; sha256="114ld41l2dipw7cpyh7fy3n332v1dkiqvdng6vkk9wm6jmda7wya"; depends=[expint numDeriv plyr Rcpp RcppArmadillo]; }; @@ -4614,7 +4622,7 @@ in with self; { TestCor = derive2 { name="TestCor"; version="0.0.1.1"; sha256="1rxw5rz687ax3zlpaxb9bak6dd2jdl49h3fdzbz7r8vycwanwydq"; depends=[MASS Rcpp]; }; TestDataImputation = derive2 { name="TestDataImputation"; version="1.1"; sha256="10b1g9m2s6nbs8lrpcx3s1jf0fmqyd07mg3vx1pnma8r3vwy1yh7"; depends=[Amelia mice]; }; TestDesign = derive2 { name="TestDesign"; version="1.0.2"; sha256="1vz0bbbk74g3i4dlsd972n41mf0dhd74f9p2n47mgs3fh1r598zd"; depends=[crayon foreach logitnorm lpSolve Matrix Rcpp Rdpack]; }; - TestDimorph = derive2 { name="TestDimorph"; version="0.3.0"; sha256="0r9v32hz1gy1xyrz5yw8jsncnn8camzv8ha7k3df43rvnprv6xhf"; depends=[caret corrplot DescTools dplyr ggplot2 klaR MASS mda multcompView plotROC plyr purrr randomForest reshape2 Rfast rlang stringr tibble tidyr tmvtnorm truncnorm]; }; + TestDimorph = derive2 { name="TestDimorph"; version="0.3.1"; sha256="163swi09d3nhgp4zkic7gmh302955jm1qr0dv9l3ciyayrc8z842"; depends=[caret corrplot DescTools dplyr ggplot2 klaR MASS multcompView plotROC plyr purrr randomForest reshape2 Rfast rlang stringr tibble tidyr tmvtnorm truncnorm]; }; TestFunctions = derive2 { name="TestFunctions"; version="0.2.0"; sha256="018nkz8r6vqahrzq3d588i3ffb1bmd1pdk87j4ivcdsx99mq15sn"; depends=[]; }; TestScorer = derive2 { name="TestScorer"; version="1.7.2"; sha256="006c3g3gx55mfr93srldwvgz5vm6nkr3f57yi4qg6krn0d32865f"; depends=[]; }; TestingSimilarity = derive2 { name="TestingSimilarity"; version="1.1"; sha256="1iq0wh13rl6rby44ql4d286r1akzwmbpsvnq9p8lkl8709z0d34w"; depends=[alabama DoseFinding lattice]; }; @@ -4628,6 +4636,7 @@ in with self; { ThreeArmedTrials = derive2 { name="ThreeArmedTrials"; version="1.0-3"; sha256="06jhgl1fzvkvnhrjs4xcyw6yymwl499rw9xnfwpx44dzxi7nynxj"; depends=[MASS numDeriv]; }; ThreeGroups = derive2 { name="ThreeGroups"; version="0.21"; sha256="0hipxa45v9ysb2qbk33kjycnvqar7bff1ajxd6fzhpc3jc9hflw4"; depends=[]; }; ThreeWay = derive2 { name="ThreeWay"; version="1.1.3"; sha256="17yl8zq029wiy3c0f4ssljx85dnm9n862wj2d24w7p0lxlvarmz6"; depends=[]; }; + ThreeWiseMonkeys = derive2 { name="ThreeWiseMonkeys"; version="0.1.0"; sha256="1qdb3m15q0gg8dk2znc2syy2jdqsp2893a7ilfa8rg3r2vps86yg"; depends=[stringr tuneR]; }; Thresher = derive2 { name="Thresher"; version="1.1.3"; sha256="16zf5cwc2c5j61xcrqsycwrsc162spyqgk9mac7n37mymn5agbwp"; depends=[ade4 ClassDiscovery colorspace MASS movMF oompaBase PCDimension]; }; ThresholdROC = derive2 { name="ThresholdROC"; version="2.8.2"; sha256="1fsxf43syp371149wmbxjc13rrai69gc61xdlgrqplv4v0nqqk73"; depends=[MASS numDeriv pROC]; }; TickExec = derive2 { name="TickExec"; version="1.1"; sha256="0v0m0wi49yw0ply19vnirl2zwnk61sxalx24l8cadvkssgs13509"; depends=[]; }; @@ -4653,10 +4662,10 @@ in with self; { TopicScore = derive2 { name="TopicScore"; version="0.0.1"; sha256="1x6s3yn25rj8mbd25yi7f2rz0nwg8n0l1vs6r250kyjb17d2javm"; depends=[combinat Matrix quadprog RSpectra slam]; }; TotalCopheneticIndex = derive2 { name="TotalCopheneticIndex"; version="1.0.1"; sha256="0yc21vs10rzmwx0z6d0gyyncr25835vb7wpn392csc5big6d73xc"; depends=[memoise]; }; TouRnament = derive2 { name="TouRnament"; version="0.2.5"; sha256="09i0frzzxi5ymjlvh81rmisxh35amrvhxbkjq5351fhlpf1n977z"; depends=[]; }; - TraMineR = derive2 { name="TraMineR"; version="2.0-15"; sha256="0yfgrbdkzy5gpd7q7s64rd7i7k4b9myr3gd1zb7spl16pgvmp7zv"; depends=[boot cluster colorspace Hmisc RColorBrewer]; }; + TraMineR = derive2 { name="TraMineR"; version="2.2-0"; sha256="1xnhj5348kp7kg1cqiqm7s4v8yb4n7gxn17xg5qnnypca58szbpf"; depends=[boot cluster Hmisc RColorBrewer]; }; TraMineRextras = derive2 { name="TraMineRextras"; version="0.4.7"; sha256="0lls9683jq0ws62sqfj3zm1v2v3ymn0flpkv3iwqb5i84mj63aq6"; depends=[cluster RColorBrewer survival TraMineR]; }; TrackReconstruction = derive2 { name="TrackReconstruction"; version="1.2"; sha256="1kpdiwwzxsdwv5255xlvcnxvnp39ky0aws41g1l5i7cpbv88kca5"; depends=[fields RColorBrewer]; }; - Trading = derive2 { name="Trading"; version="1.2"; sha256="0wlwpf1iygcs0cy7ms57b1bbp8f3s193bvc6fcm31ih5ph8pr48i"; depends=[]; }; + Trading = derive2 { name="Trading"; version="2.0"; sha256="1n7m7kd539hpii2xvzhsg4zw4bgb63mh0k99fwk588wf19i0cywk"; depends=[PerformanceAnalytics reticulate]; }; TrafficBDE = derive2 { name="TrafficBDE"; version="0.1.0"; sha256="1lnh9lbjxaradivnd1dkd2szggjh2r4v7klpyxb862dxsmdxxrqw"; depends=[caret data_table dplyr lubridate neuralnet RCurl zoo]; }; Traitspace = derive2 { name="Traitspace"; version="1.1"; sha256="1wlrpnzb39vgkqy0ynbwlgrkkqgklrk6pw7f8p7p2i132qk2c291"; depends=[mclust permute]; }; TrajDataMining = derive2 { name="TrajDataMining"; version="0.1.6"; sha256="1n5qcyc1kb8rdrqaji7pp63l2gyr6jim8spm8ydb4lnqfcnrin9g"; depends=[geosphere rgdal RPostgreSQL sp spacetime trajectories xts]; }; @@ -4698,7 +4707,7 @@ in with self; { UKgrid = derive2 { name="UKgrid"; version="0.1.2"; sha256="135lvzaw4gjnc40aw28706fhiz7p06l1jhw830iyg03w2v4j0ar0"; depends=[data_table dplyr lubridate magrittr tsibble 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]; }; - UNPaC = derive2 { name="UNPaC"; version="1.0.0"; sha256="0mm5fqc5rdf24xw5kkh54nc3a0vp4vigkhl8wj14nyiw4xzi67lr"; depends=[glasso]; }; + UNPaC = derive2 { name="UNPaC"; version="1.1.0"; sha256="12w6vjvkzivnqa6jd75dwr8h8d8xbc2519pqnqw9fk3yanqzx9rk"; depends=[huge PDSCE]; }; UPMASK = derive2 { name="UPMASK"; version="1.2"; sha256="160rsb0nbndf61khcs3s8xv9nj7ln8zl6l11157ywdcjqd2q5qnq"; depends=[DBI dimRed loe MASS RSQLite]; }; UPSvarApprox = derive2 { name="UPSvarApprox"; version="0.1.1"; sha256="1lm3xzj70s070ag2sk24nq5ayckk3mnqfmwppbhq5i4y13fw6vip"; depends=[]; }; USAboundaries = derive2 { name="USAboundaries"; version="0.3.1"; sha256="1mqbxkv347307mbvn70929bi3l8wmiwrp86rxdgy45g2ddjdcb6s"; depends=[]; }; @@ -4714,15 +4723,15 @@ in with self; { Ultimixt = derive2 { name="Ultimixt"; version="2.1"; sha256="0fh2qpm7qpv1170jzbmzqhvwsn69lblizzisgasswy2nix2jjz4y"; depends=[coda gtools]; }; Umatrix = derive2 { name="Umatrix"; version="3.3"; sha256="188h959s5pawnny0fxlqmma03iww6af4x0y8p514bwh5xh9rj3kg"; depends=[abind AdaptGauss deldir fields geometry ggplot2 pdist plyr png pracma Rcpp reshape2 shiny shinyjs]; }; Umoments = derive2 { name="Umoments"; version="0.1.1"; sha256="089d0xmsp0419mxjp6fs0s1palvdkr0i5dzqckcn6r2kjqj7izjg"; depends=[]; }; - Umpire = derive2 { name="Umpire"; version="1.3.9"; sha256="0wqbi27mnjafg1cm82mrlavb9jcrxvh2z28m63gl7jw3zcyxn816"; depends=[]; }; + Umpire = derive2 { name="Umpire"; version="2.0.0"; sha256="0qdsy795r4vvf7lqwag4h2vcj6n23az15kj5vsclv343gl2xlvp9"; depends=[BimodalIndex mc2d]; }; UncDecomp = derive2 { name="UncDecomp"; version="1.0.1"; sha256="1m44pgk7nffay09m4gkwb0khq0qjd7bq1p72blsmib46wmnwqfsa"; depends=[dplyr ggplot2]; }; - UncertainInterval = derive2 { name="UncertainInterval"; version="0.5.2"; sha256="0ha3j34bzrrwywlww7370mnpx61vhf4gdz6hz0fbad7raf1ry2m1"; depends=[car MASS nloptr psych reshape2 rootSolve zoo]; }; + UncertainInterval = derive2 { name="UncertainInterval"; version="0.6.0"; sha256="0gyw1lgq1mni8m44lfi2vnd2wxq6i6ml6c6hy9amdbwmb7aymhhd"; depends=[car MASS nloptr psych reshape2 rootSolve zoo]; }; UniDOE = derive2 { name="UniDOE"; version="1.0.2"; sha256="14jz4acrvbv59sbr7gya8g0z749vv0i04gl5wl0y4218byjvw6bs"; depends=[Rcpp]; }; UniIsoRegression = derive2 { name="UniIsoRegression"; version="0.0-0"; sha256="0lmrmb9sbk41ak7sbcrzhfnijb1skgb4lqg9m9imc98lcp69h7z0"; depends=[Rcpp]; }; Unicode = derive2 { name="Unicode"; version="13.0.0-1"; sha256="12q98hdh46bbx17z6869bmn1j9bbhf524flvn76sqf20phk81xjy"; depends=[]; }; UniprotR = derive2 { name="UniprotR"; version="1.2.4"; sha256="1zzxm93390nxw27fr62vhd8pafkq6fiy8if0cx4raznlym5615is"; depends=[alakazam data_tree dplyr ggplot2 ggpubr gridExtra httr magick magrittr plyr scales tidyverse]; }; UnitCircle = derive2 { name="UnitCircle"; version="0.1.3"; sha256="0z5ssps8l5ka4aw4984qml15scw4pfssara5dls82afhfhpkszsr"; depends=[]; }; - UnivRNG = derive2 { name="UnivRNG"; version="1.2"; sha256="0cx6bdzzypxnaqi4wkb20saqd5sfa2rga5cqh694l70vj9c3zw26"; depends=[]; }; + UnivRNG = derive2 { name="UnivRNG"; version="1.2.2"; sha256="1hv0gg371ndljvn3x7s5vbkh51h1l1pjk57livw630mvb67cffqw"; depends=[]; }; UpSetR = derive2 { name="UpSetR"; version="1.4.0"; sha256="007i0njnjjy7vbrxabwav7a1kk2n0hn2mkvqsdzzfk10ckp5y7im"; depends=[ggplot2 gridExtra plyr scales]; }; UsingR = derive2 { name="UsingR"; version="2.0-6"; sha256="1lr8z45r5s7fxrd42rswm6w7s3k5nds244b9d525jb5v4n8w9kpw"; depends=[HistData Hmisc MASS]; }; UtilityFrailtyPH12 = derive2 { name="UtilityFrailtyPH12"; version="1.0"; sha256="06f5gmwwk1r14ab6v5jcxz0pmdph7ffi4y57mjg9byn7pjnibflk"; depends=[bindata mvtnorm Phase123 Rcpp RcppArmadillo]; }; @@ -4759,6 +4768,7 @@ in with self; { VSURF = derive2 { name="VSURF"; version="1.1.0"; sha256="1azfd4sb89mp27l86k293qj81x94gfiy1ihwnb6c558p8h69xsgf"; depends=[doParallel foreach randomForest ranger Rborist rpart]; }; VTShiny = derive2 { name="VTShiny"; version="0.1.0"; sha256="1zq6irla3q7hqs8jpjdya7vy3frqrj72rwmd1sgxwrkgpmpxw6x7"; depends=[EnvStats rmarkdown shiny]; }; VTrack = derive2 { name="VTrack"; version="1.21"; sha256="1acf2b8zy72shc4768rhikfa3590h3l3nwk32jk7pwsms0nb87rf"; depends=[checkmate doParallel foreach gdistance gstat Hmisc intervals lubridate plotKML plyr raster sp spacetime XML]; }; + VUROCS = derive2 { name="VUROCS"; version="1.0"; sha256="1r4hq7az50v7lbyx5w6b4zs2kwi5cypqn9k6ac4kr8jr3jlyanr3"; depends=[doParallel foreach Rcpp RcppArmadillo]; }; VWPre = derive2 { name="VWPre"; version="1.2.3"; sha256="0pvk7qmi6s8yqf6s0vbf1ldwrs2b37kgayrdsvfpvxhljg79zl1i"; depends=[dplyr ggplot2 mgcv rlang shiny tidyr]; }; VaRES = derive2 { name="VaRES"; version="1.0"; sha256="0gw05jiqgirhz3c8skbb07y4h44r6vi68gnd5y7ql455v0c2raza"; depends=[]; }; VancouvR = derive2 { name="VancouvR"; version="0.1.1"; sha256="1nzjdassan5kh7wk3xf6kry4jifgjn0gan61ibwhyzy1awpcfngv"; depends=[digest dplyr httr purrr readr rlang sf tibble urltools]; }; @@ -4822,7 +4832,7 @@ in with self; { WeibullFit = derive2 { name="WeibullFit"; version="0.1.0"; sha256="1a80gcqbmvb1rz2dr2syy16wn6ixjn6l40gayys9zy8302hky9ir"; depends=[e1071 FAdist glue kSamples mixdist optimx R_methodsS3 R_oo sqldf xtable]; }; WeibullR = derive2 { name="WeibullR"; version="1.0.12"; sha256="0rj4q9hd49b914lz8q1d8n96xrl0h29avn95aigb3z7f8knf7g9g"; depends=[Rcpp RcppArmadillo]; }; WeightIt = derive2 { name="WeightIt"; version="0.9.0"; sha256="0p16q0zc7xdxwsvdf15h97zj7cdhr1rmzawljsjn4yzqwqby7nsy"; depends=[backports crayon ggplot2]; }; - WeightSVM = derive2 { name="WeightSVM"; version="1.7-3"; sha256="0w0czic90fswiy7jdr0fqvwnj91755821kzpj7rl1dd5123qxacc"; depends=[class]; }; + WeightSVM = derive2 { name="WeightSVM"; version="1.7-4"; sha256="11j47c16q9qcxpbwi66018qvj7mmw4l9xkl47kyggmyz87kbrk73"; depends=[]; }; Weighted_Desc_Stat = derive2 { name="Weighted.Desc.Stat"; version="1.0"; sha256="030i12mnwlj976avvk3grrccgprsckmc35dm2ajwdfc9dijhypnj"; depends=[]; }; WeightedCluster = derive2 { name="WeightedCluster"; version="1.4"; sha256="05rmqhgfzh9fs4c1lhmrbk8s46ihaywy7n9qnivf7zcxxzxds0lj"; depends=[cluster RColorBrewer TraMineR]; }; WeightedPortTest = derive2 { name="WeightedPortTest"; version="1.0"; sha256="007v3w9ssiv2sds7sikpal27g6pxwxhs7bvcyw6kr0vg8gvlbi8h"; depends=[]; }; @@ -4843,7 +4853,7 @@ 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.2"; sha256="0w1iwl45kv6vq5fg88hlkv93bpbrw8jm1wnhk9qxznlm0g13z33x"; depends=[]; }; WriteXLS = derive2 { name="WriteXLS"; version="5.0.0"; sha256="1gypq7zh22kpraz0bgj4jyvy2hbj1l8r7m6y34531vjdgwf67sss"; depends=[]; }; - WufooR = derive2 { name="WufooR"; version="0.9"; sha256="13flcb7hwnhsnlak4m3mvwmbq2fd42027lgp8fhg25sra6dwcd7h"; depends=[dplyr httr jsonlite]; }; + WufooR = derive2 { name="WufooR"; version="1.0.1"; sha256="0iq1lc1b22zdvclkr4yivxxf8z5mdxik7lx9r3b38h2qy2rckqb2"; depends=[dplyr httr jsonlite]; }; XBRL = derive2 { name="XBRL"; version="0.99.18"; sha256="1bwvxqbxdf1ynz2bv27l86h05h8y19q2li2y79xk819p5nkxq341"; depends=[Rcpp]; }; XHWE = derive2 { name="XHWE"; version="1.0"; sha256="1ca8y9q3623d0vn91g62nrqf3pkbcbkpclmddw5byd37sdrgsi5l"; depends=[]; }; XKCDdata = derive2 { name="XKCDdata"; version="0.1.0"; sha256="1lx9frlbc549qrh4d3m79r3l9icfzqkgfgp8raa8x46a2havi0a5"; depends=[assertthat dplyr glue htmltools httr jsonlite magrittr tibble]; }; @@ -4908,7 +4918,7 @@ in with self; { abnormality = derive2 { name="abnormality"; version="0.1.0"; sha256="1fzfskl9akl06nliy8hkv2a0pznpj8pwcypg3gj5r2nzvr3kan9v"; depends=[MASS Matrix]; }; abodOutlier = derive2 { name="abodOutlier"; version="0.1"; sha256="1pvhgxmh23br84r0fbmv7g53z2427birdja96a67vqgz18r3fdvj"; depends=[cluster]; }; abstractr = derive2 { name="abstractr"; version="0.1.0"; sha256="1ymwp7syrynwd4i8aj2x5n8jdi9d96fjzl6jb09n0bnr5fgl7vig"; depends=[colourpicker emojifont ggplot2 gridExtra rintrojs shiny shinythemes]; }; - abtest = derive2 { name="abtest"; version="0.2.0"; sha256="1ky3cf827kj24bhcpk00v5zl5jdkii1gca0x81ay1cjkzfispgws"; depends=[Matrix mvtnorm plotrix RColorBrewer Rcpp sn truncnorm VGAM]; }; + abtest = derive2 { name="abtest"; version="0.2.1"; sha256="1zfd13d7dplawk24dbdr1ka8cbdp5w6sxb0zlm7k4dhvn6ksi8h0"; depends=[Matrix mvtnorm plotrix qgam RColorBrewer Rcpp sn truncnorm]; }; abundant = derive2 { name="abundant"; version="1.1"; sha256="1m76qdmqvwpgm0sihazi2dna7cgsz9rljal18vgffb5wamwmg9k7"; depends=[QUIC]; }; acc = derive2 { name="acc"; version="1.3.3"; sha256="1ii2vm47djxbixa75h690q1s2f9m9x6i8nkygik93j6dayr6kr1m"; depends=[circlize DBI ggplot2 iterators mhsmm nleqslv PhysicalActivity plyr R_utils Rcpp RcppArmadillo RSQLite zoo]; }; accSDA = derive2 { name="accSDA"; version="1.0.0"; sha256="0sgxy5y8kkc1n35657kifwfjsba7y5m1vbr7rkk5lmbpkzahqm61"; depends=[ggplot2 ggthemes gridExtra MASS rARPACK sparseLDA]; }; @@ -4932,13 +4942,13 @@ in with self; { acss = derive2 { name="acss"; version="0.2-5"; sha256="0cqa60544f58l5qd7h6xmsir40b9hqnq6pqgd5hfx2j2l5n7qhmk"; depends=[acss_data zoo]; }; acss_data = derive2 { name="acss.data"; version="1.0"; sha256="09kl4179ipr8bq19g89xcdi1xxs397zcx5cvgp6viy8gn687ilgv"; depends=[]; }; activPAL = derive2 { name="activPAL"; version="0.1.3"; sha256="1h6hp5z89ji73gdzxy1dgbfwjysiy5lvcqh90xagpb7sa7ahs3na"; depends=[devtools dplyr ggplot2 lubridate magrittr tidyr]; }; - activegp = derive2 { name="activegp"; version="1.0.3"; sha256="04yiaj908z7sl7g2z5c2irk79wym27mjdvyg5mz4c67hxmpkaj25"; depends=[hetGP lhs numDeriv Rcpp RcppArmadillo]; }; + activegp = derive2 { name="activegp"; version="1.0.4"; sha256="0sqx2pjy0mw8gls4k4qwl64ip55kgs3k10dfdixdrqly035rhr37"; depends=[hetGP lhs numDeriv Rcpp RcppArmadillo]; }; activity = derive2 { name="activity"; version="1.3"; sha256="12imqj366dp6pam5gap6ji56p5wf1073xz5g4iikfxf5l8snxw92"; depends=[circular insol pbapply]; }; activityCounts = derive2 { name="activityCounts"; version="0.1.2"; sha256="0zgxr2sk3a8kmygfxx1p5hnrfwdkxx7php6jlrhm8wv6052ck8jz"; depends=[lubridate magrittr seewave signal tibble]; }; activpalProcessing = derive2 { name="activpalProcessing"; version="1.0.2"; sha256="1y0bjx2qx53iy930y9iww4q1yzjj8y16cwgixk1mq3w4g1f116d1"; depends=[chron]; }; actogrammr = derive2 { name="actogrammr"; version="0.2.3"; sha256="1jzvarmd41yqlrkagzlc8m19n5mn0w0b36fy50lyvgrfsafjfbqa"; depends=[dplyr ggplot2 lubridate readr tidyr]; }; actuar = derive2 { name="actuar"; version="2.3-3"; sha256="0aw3hlan5y22mdqk1wvnw9ksqhwp4yy5hi0dpv21p7s0hyxhphih"; depends=[expint]; }; - actuaryr = derive2 { name="actuaryr"; version="1.1.0"; sha256="0v33rrw1m030a5w3v3f7pigfw1vwsclh48av0yjiha26mpvi3cal"; depends=[crayon dplyr lubridate magrittr purrr]; }; + actuaryr = derive2 { name="actuaryr"; version="1.1.1"; sha256="08dzn565ax2l2hrn2m32k6magjbskybywl0hsgkg11nrjvkznwnx"; depends=[crayon dplyr lubridate magrittr purrr tibble]; }; ada = derive2 { name="ada"; version="2.0-5"; sha256="1h3a07czp0w3hrhjcg1fz721y8vsfclzqi3rq8qfzgpfb4h1f06r"; depends=[rpart]; }; adabag = derive2 { name="adabag"; version="4.2"; sha256="109wrl1pwvmyv2l909hrvk7dg4aa9pv449mvdycp50zwrsw9w0a7"; depends=[caret doParallel foreach rpart]; }; adagio = derive2 { name="adagio"; version="0.7.1"; sha256="1h9l0ddrxq8y35iy9hdkxdvdwsqpnpkzzbkbwwhm4380lq1m7a3k"; depends=[]; }; @@ -4981,7 +4991,7 @@ in with self; { adjustedcranlogs = derive2 { name="adjustedcranlogs"; version="0.1.0"; sha256="08apfvpqvnnalx230p4qf5ckrwm1sgzras4zfrysgym5d4map9ci"; depends=[cranlogs dplyr lubridate rvest xml2]; }; adklakedata = derive2 { name="adklakedata"; version="0.6.1"; sha256="1lzj3ib4bgfkq5lq12n47pwc52h7k35xbbwj6brwsgx1gd4fx3x6"; depends=[httr rappdirs]; }; adlift = derive2 { name="adlift"; version="1.4-1"; sha256="14q7fnhlqvxdhnfjhdhfmadz241srplbm069a7ybbsql21cphpf3"; depends=[EbayesThresh]; }; - admisc = derive2 { name="admisc"; version="0.7"; sha256="0y3id9g792brvb7xdbg0cklsdpy4m9ayrkkaca8qmkdm1yarjmna"; depends=[]; }; + admisc = derive2 { name="admisc"; version="0.8"; sha256="071xrqimizhs7qgav84fggw8cls4dhhqvzp8f1g0xw1wvj0wnfx1"; depends=[]; }; admixturegraph = derive2 { name="admixturegraph"; version="1.0.2"; sha256="0ld4qyyvbnr5lz9ff64wjwif4c9xnqyjmbfgbl9bk6pia98zppl3"; depends=[doParallel dplyr foreach ggplot2 MASS neldermead pracma]; }; admmDensestSubmatrix = derive2 { name="admmDensestSubmatrix"; version="0.1.0"; sha256="1a5lfm10aj6wdjibdnmffn75zvy6x69w8nqcx2i23gxg6v0xlqcl"; depends=[Rdpack]; }; adnuts = derive2 { name="adnuts"; version="1.0.1"; sha256="1l52f33yzbvcz27iw0k6iwcnfanr65lw206d7w4609k2vmlw8ink"; depends=[ellipse R2admb rstan]; }; @@ -5063,7 +5073,7 @@ in with self; { altR2 = derive2 { name="altR2"; version="1.0.0"; sha256="15nvbq3n76p2857ipyf3q6rs2mwjqsp9gr3rmzbjfm8lrj0faxsv"; depends=[gsl purrr]; }; altair = derive2 { name="altair"; version="4.0.1"; sha256="0s3pvlh6y4h3ni5m8yli6gp6gps7pcpndag40ckr31302ai3bxvq"; depends=[assertthat htmlwidgets magrittr repr reticulate vegawidget]; }; alterryx = derive2 { name="alterryx"; version="0.5.0"; sha256="1p9q4244bm7hf6my8q951idw41xa5gcrdl7znmsng9pwxh8dnz3h"; depends=[base64enc digest httr jsonlite]; }; - altmeta = derive2 { name="altmeta"; version="2.3"; sha256="0fcd2pzp62871b37fcwz1zcidch5akj6a5npcvwzg4zwp8i9rmyl"; depends=[coda rjags]; }; + altmeta = derive2 { name="altmeta"; version="3.0"; sha256="0ga3w1igxfhmhxkvh20kjnxsbsx7lmcv894whpg8n59418s1h2gs"; depends=[coda lme4 Matrix metafor rjags]; }; amap = derive2 { name="amap"; version="0.8-18"; sha256="0zpcb73w413na23f6giml9311jh0j0y766w2fh9i40d2h7bbvyvs"; depends=[]; }; ambhasGW = derive2 { name="ambhasGW"; version="0.0.2"; sha256="0v517i4whip45pk6bwlwval9pz367pcgzz62b2z22mrwgi6m6bck"; depends=[raster rgdal yaml]; }; ambient = derive2 { name="ambient"; version="1.0.0"; sha256="0b8nd8g0ydglql2cwi4wmlnv5kyid8q51vz0p08f9m5x73k3z2bd"; depends=[Rcpp rlang]; }; @@ -5075,7 +5085,7 @@ in with self; { ammistability = derive2 { name="ammistability"; version="0.1.1"; sha256="1vp2857cwn4dd86vj8qf6h4z8hh5q2jvrlpmply8bf70mnmnq18h"; depends=[agricolae ggcorrplot ggplot2 Rdpack reshape2]; }; ampd = derive2 { name="ampd"; version="0.2"; sha256="0bi8qngd37n60ym516yjcahxc536vdwm60rq5ld32170hww69j7c"; depends=[]; }; ampir = derive2 { name="ampir"; version="0.1.0"; sha256="1z9ha329fbji9jlly84cn7z2fxclk3n3w0xddq1mw1gqq3dyb8ba"; depends=[caret kernlab Peptides Rcpp]; }; - amt = derive2 { name="amt"; version="0.0.9"; sha256="0hqs954gimpd24bwnac9mz91mgsw7v1nw7rw48j5ql7q0vd2bmxh"; 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]; }; + amt = derive2 { name="amt"; version="0.1.0"; sha256="0h7ifniqiq6cr0p42yjiykaindwkh1jf5wn0hzn2wg04x1cia995"; 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]; }; anMC = derive2 { name="anMC"; version="0.2.2"; sha256="0ab215nrqn535g9ayqzvgdckhwcrij1mc1296pvlj3grn3f8rhws"; depends=[mvtnorm Rcpp RcppArmadillo]; }; anacor = derive2 { name="anacor"; version="1.1-3"; sha256="0mj8g9p4fla0ax9jvcq7kii4lrhj8g872p11nys06anva22qjp51"; depends=[car colorspace fda]; }; analogsea = derive2 { name="analogsea"; version="0.8.0"; sha256="1naw9qh6rp1hz3mk19jir0qia1daizbfa695qbp1sg6rdh6is8ag"; depends=[httr jsonlite magrittr yaml]; }; @@ -5113,9 +5123,9 @@ in with self; { aods3 = derive2 { name="aods3"; version="0.4-1.1"; sha256="1kdmgzd5nkzm0awdjls6fc8p9hxsph9ha9k1jxbppdi4i6f0i7rv"; depends=[boot lme4]; }; aof = derive2 { name="aof"; version="0.1.2"; sha256="0552i5wvm04dq8a8y1x36sprc9cbx6k7c3bmsgqxm71dpsxajb0i"; depends=[bcpa]; }; aoos = derive2 { name="aoos"; version="0.5.0"; sha256="0y92vs27i0mkpjdclqzq4j9g1axkymhi3v8xp1v6hazh35yzjkfj"; depends=[magrittr roxygen2]; }; - aoristic = derive2 { name="aoristic"; version="0.6"; sha256="0b9h2l59vvrvbjjwwb43j74frvwa8lsj4x5kwhwpsfjfch1yqwjl"; depends=[classInt ggplot2 GISTools lubridate maptools MASS plotKML RColorBrewer reshape2 rgdal sp spatstat]; }; + aoristic = derive2 { name="aoristic"; version="1.0.0"; sha256="1qfphg5mh26q832pkh05q50lg60viyiwwcwmsagqb6r64llmysak"; depends=[foreign formattable ggplot2 htmltools lubridate openxlsx plyr]; }; apTreeshape = derive2 { name="apTreeshape"; version="1.5-0"; sha256="0mnydk157557pnkjvcadlghn5d8w9kxas4kwz4y4w21xg7z1jrig"; depends=[ape coda cubature pbapply quantreg]; }; - apa = derive2 { name="apa"; version="0.3.2"; sha256="09yqpl9vdi0kh5dyjlykdvvhya6cvy7mawsk2gvkvn0yq5bawvnv"; depends=[dplyr magrittr purrr rmarkdown stringr]; }; + apa = derive2 { name="apa"; version="0.3.3"; sha256="1nvhl5fqramsdrkpl1nmgr1vmki5c1lkdi1kkx7ihf0cz35f7c2a"; depends=[dplyr magrittr MBESS purrr rmarkdown stringr tibble]; }; apaTables = derive2 { name="apaTables"; version="2.0.5"; sha256="0h986jqdl65fd33gfa433ik77r6lm9zrq75qfk5r8xsdgzb4wgva"; depends=[boot broom car dplyr tibble]; }; apaText = derive2 { name="apaText"; version="0.1.1"; sha256="1r217k60w027i63nbj24b1rm37m4qf7a6iirc941s945babkxcmb"; depends=[dplyr]; }; apc = derive2 { name="apc"; version="1.3"; sha256="1hgkqkvry9is8kjk2w46k637sig7fdznnc75wbrc8bq1hbrmf785"; depends=[lattice]; }; @@ -5124,11 +5134,11 @@ in with self; { apdesign = derive2 { name="apdesign"; version="1.0.0"; sha256="041zyd7ih9nnj92jj9vb9ya1ij9lmj1dzx64q74vyiadw1ix5l66"; depends=[Matrix]; }; ape = derive2 { name="ape"; version="5.3"; sha256="08wbk1kxhs32bmmvqlqanbdg1w235amd35k8m00fngsj9h9xzc08"; depends=[lattice nlme Rcpp]; }; apercu = derive2 { name="apercu"; version="0.2.4"; sha256="046gf4dzypl6mmq7xqkyrdasq9rsjxzsii7w4nxkbn4c40kh7bf7"; depends=[pls]; }; - apex = derive2 { name="apex"; version="1.0.3"; sha256="157i67yvb9xqlhzcgkxj7n5lq65svxs82z38dv2c0k8p4krjl1pd"; depends=[adegenet ape phangorn]; }; + apex = derive2 { name="apex"; version="1.0.4"; sha256="1ddzbzpnc17yvbl5yfyp0widqlx48qwlh80xcmyzhv045s680rdk"; depends=[adegenet ape phangorn]; }; apexcharter = derive2 { name="apexcharter"; version="0.1.4"; sha256="1kn0i10wrkb48r3gxxv82mih575csv5695d1l90mh35x45hjgir6"; depends=[ggplot2 htmlwidgets jsonlite magrittr rlang shiny]; }; aphid = derive2 { name="aphid"; version="1.3.3"; sha256="1jqpn7w5sgy4k49qd9ci6yj89s55gzwl5w5ldw793mzpg6if7lfn"; depends=[kmer openssl Rcpp]; }; aplore3 = derive2 { name="aplore3"; version="0.9"; sha256="0af6klscsxvh4amp519b6r41bzysf61p040fj4l5706bbya1arhw"; depends=[]; }; - aplot = derive2 { name="aplot"; version="0.0.3"; sha256="1njlqna2m4p75jh4amqx658r48mkzfmnyjs1kg04p6sfbr5kycls"; depends=[ggplot2 magrittr patchwork]; }; + aplot = derive2 { name="aplot"; version="0.0.4"; sha256="09drrirj7k06gzhda36whpl21b7ca4grsxqlayaxrmilvapmf795"; depends=[ggplot2 magrittr patchwork]; }; aplpack = derive2 { name="aplpack"; version="1.3.3"; sha256="010saim43d3hr83ksi916846rh6qfbb0gvhsf5jbdx95m4bai9g3"; depends=[]; }; apmsWAPP = derive2 { name="apmsWAPP"; version="1.0"; sha256="1azgif06dsbadwlvv9nqs8vwixp6balrrbpj62khzmv1jvqr4072"; depends=[aroma_light Biobase DESeq edgeR genefilter gtools multtest seqinr]; }; apng = derive2 { name="apng"; version="1.0"; sha256="13hvr1w566anrhdicaqwqjgfq2lk3zkn5gcfgy8zazjnad4vy07y"; depends=[bitops]; }; @@ -5181,13 +5191,13 @@ in with self; { arrApply = derive2 { name="arrApply"; version="2.1"; sha256="0qy7iwi580rrf3sycsbv6qgxsqcdy9pdbnkdrx81j68qni9iw737"; depends=[Rcpp RcppArmadillo]; }; arrangements = derive2 { name="arrangements"; version="1.1.8"; sha256="03dzvahy8mwp6w1smnbp83zk8w8pfkmsfd1f68bd8jjvdb5lrz71"; depends=[gmp R6]; }; arrayhelpers = derive2 { name="arrayhelpers"; version="1.1-0"; sha256="02rl530qxi1idiqpmzg5wr9vl5c7phizhpj64k5pn8xq9zfxbpaz"; depends=[svUnit]; }; - arrow = derive2 { name="arrow"; version="0.16.0.2"; sha256="1h7c46qraz15dra38hfs6avv27j4d5x4s4cs10vnwyqik11gb2mv"; depends=[assertthat bit64 purrr R6 Rcpp rlang tidyselect vctrs]; }; + arrow = derive2 { name="arrow"; version="0.17.0"; sha256="0sacpxbz68797sf9irrjfchcfs1m4dbidnvb1z7gb4xiyin0npz8"; depends=[assertthat bit64 purrr R6 Rcpp rlang tidyselect vctrs]; }; ars = derive2 { name="ars"; version="0.6"; sha256="0zs1rk3i7pc9wcvxrvjcls194mfbvmkz7cb6pwd1cm3fzjwsyxsp"; depends=[]; }; arse = derive2 { name="arse"; version="1.0.0"; sha256="0ssaalc058m09gfcr1n0s729rx2plia3zkhlynj67drclyvhyb0i"; depends=[dplyr pracma]; }; arsenal = derive2 { name="arsenal"; version="3.4.0"; sha256="090q0kjpcjdxa6r22pb7wzhvgcdq41khh1af7pqgg1rvn2d97x4n"; depends=[knitr]; }; artfima = derive2 { name="artfima"; version="1.5"; sha256="1nqsq9fsqk9kag9n7i2r9yvf578nkdfrkkv7qy8650prka0jca2p"; depends=[gsl ltsa]; }; arules = derive2 { name="arules"; version="1.6-5"; sha256="0bcvfn8lvcv74vv9z3kgg7yq5hm7wjqhmzadi55cbm8zxd76g84v"; depends=[Matrix]; }; - arulesCBA = derive2 { name="arulesCBA"; version="1.1.6"; sha256="1b82am0sv5211x65r45k7pw52hfywv5i8zqr5asczdkx07s6273s"; depends=[arules discretization glmnet Matrix testthat]; }; + arulesCBA = derive2 { name="arulesCBA"; version="1.2.0"; sha256="1d72lrfbyr2g7n6r04vyaqs3pvs3jhkfr4yfgn2fj690q3ff0qr3"; depends=[arules discretization glmnet Matrix]; }; arulesNBMiner = derive2 { name="arulesNBMiner"; version="0.1-5"; sha256="1q4sx6c9637kc927d0ylmrh29cmn4mv5jxxpl09yaclzfihjlk9a"; depends=[arules rJava]; }; arulesSequences = derive2 { name="arulesSequences"; version="0.2-24"; sha256="0sgysrvmdsr6l0661llrmsnnn397n2niv0bhlm0i31ak0fwh1ljz"; depends=[arules]; }; arulesViz = derive2 { name="arulesViz"; version="1.3-3"; sha256="1c51l4hqai07qx20lbdvffxw9kx0vkgbccw7b9wz1h2n5ma90c8y"; depends=[arules colorspace DT igraph plotly scatterplot3d seriation vcd visNetwork]; }; @@ -5203,7 +5213,6 @@ in with self; { ashr = derive2 { name="ashr"; version="2.2-47"; sha256="1rqb5j30ylaf1h4l66x4jxyn5inrvhc42d90qd5mgkxsq0ghdlr4"; depends=[etrunct invgamma Matrix mixsqp Rcpp SQUAREM truncnorm]; }; asht = derive2 { name="asht"; version="0.9.4"; sha256="1aq384vgf26ig3isyp99z09glcjhl2qd43kp8qdcwk75dcrmxd7z"; depends=[bpcp coin exact2x2 exactci perm ssanv]; }; askpass = derive2 { name="askpass"; version="1.1"; sha256="07q0ik8jzk44vpwh48rr3fnpd7dzsdhjjsl4l850rffv3dyq4h6v"; depends=[sys]; }; - aslib = derive2 { name="aslib"; version="0.1"; sha256="0dkb6bb6dqavjklbciqxqhi3fdqib9asdnhiap2gp9b9wfnkyq7k"; depends=[BatchExperiments BatchJobs BBmisc checkmate corrplot ggplot2 llama mlr parallelMap ParamHelpers plyr reshape2 RWeka stringr yaml]; }; asnipe = derive2 { name="asnipe"; version="1.1.12"; sha256="01k2qr9vpazj4mhz4zpngav31d69qr73i8fc59x8gdbi3ipic7rs"; depends=[MASS Matrix]; }; aspace = derive2 { name="aspace"; version="3.2"; sha256="1g51mrzb6amafky2kg2mx63g6n327f505ndhna6s488xlsr1sl49"; depends=[Hmisc shapefiles splancs]; }; aspect = derive2 { name="aspect"; version="1.0-5"; sha256="0pbc0daxw20xcbgqyyd5gbs9kmbaf2dq8ajllx0mnfwdcak9jfgj"; depends=[]; }; @@ -5229,7 +5238,7 @@ in with self; { assertr = derive2 { name="assertr"; version="2.7"; sha256="1x868pd4dac1c7b1q5390wqh2f6s50km8nqcpim3nxcj2l4qkqdb"; depends=[dplyr MASS rlang]; }; assertthat = derive2 { name="assertthat"; version="0.2.1"; sha256="17wy5bdfzg73sg2clisg1k3zyn1adkj59x56m5nwia2k8z67zkw5"; depends=[]; }; assignPOP = derive2 { name="assignPOP"; version="1.1.9"; sha256="1cbk2l827mfi4fi1jai0lzbcj2wvrzd3kw4frmqn4anx6nbcr0qf"; depends=[caret doParallel e1071 foreach ggplot2 MASS randomForest reshape2 stringr tree]; }; - assignR = derive2 { name="assignR"; version="1.1.3"; sha256="0pmzgz955nqxlcnb0f0kbv415kysjl12niyh704ksvhs5yw0xhah"; depends=[maptools raster rgdal sp]; }; + assignR = derive2 { name="assignR"; version="1.2.0"; sha256="0p722j4nclbpvjrp0hrgz8c1cijlk31sfjlf84wz326qp12dy3af"; depends=[maptools raster rgdal sp]; }; assist = derive2 { name="assist"; version="3.1.6"; sha256="13r029z32f2xcspafx01jkgmabbjcvnp8wg1wx1liwxh3mf2zalg"; depends=[lattice nlme]; }; assocInd = derive2 { name="assocInd"; version="1.0.1"; sha256="16yzgvlqbapjhvzm5nw8vfrhh8mp9llnhck4bpgmszyrh93z1ha5"; depends=[]; }; assortnet = derive2 { name="assortnet"; version="0.12"; sha256="1vyzrb8vsi9pcdn6jd83k77bg0q2a3dwdvlnmxnshqiif2pakb8m"; depends=[]; }; @@ -5245,7 +5254,7 @@ in with self; { asymmetry = derive2 { name="asymmetry"; version="2.0.2"; sha256="0x5yzlf804mhwfr9244b04vnixiyh5d8vmqrfffgid3dijg2zszm"; 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.5"; sha256="0jvlch6yhcz5azxj9yllah0x98plws5camxqis58qyqiapgvl9h8"; depends=[DescTools doBy effsize Hmisc plyr reshape2 settings]; }; + atable = derive2 { name="atable"; version="0.1.6"; sha256="17i3vhfayi8h12c4y1spagb9wcq1vsrh7miz20rbinpi9x9671nj"; 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]; }; @@ -5261,7 +5270,7 @@ in with self; { 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="1.2.0"; sha256="14swypvjfkd8qi34dsv2sg2fj0ls4xz42vy4csd2qxj0zwi3rlap"; depends=[DALEX ggplot2 ggrepel gridExtra hnp scales]; }; - augSIMEX = derive2 { name="augSIMEX"; version="3.7.3"; sha256="0cdqpckc4aiwi2dnkcvk2m9n0bg9f7qmd84n3rdw6clcrd0f95wz"; depends=[Formula MASS nleqslv Rcpp rootSolve]; }; + augSIMEX = derive2 { name="augSIMEX"; version="3.7.4"; sha256="0620yxqi160ar91shl5macn890zpc60c9nqy4w8i6m7sskv6gl3z"; depends=[Formula MASS nleqslv Rcpp]; }; augmentedRCBD = derive2 { name="augmentedRCBD"; version="0.1.2"; sha256="1m5iwsy6a580k8b2ph186w2aa9nqy1551mwr4zx4cwyh06m8hrq3"; depends=[dplyr emmeans flextable ggplot2 moments multcomp multcompView officer Rdpack reshape2 stringi]; }; auk = derive2 { name="auk"; version="0.4.1"; sha256="0xrxl8qzmc0dnjn7s32wwrdv1z7v7a4wfpz4vrradfn84vxway30"; depends=[assertthat countrycode dplyr httr magrittr rlang stringi stringr tidyr]; }; aurelius = derive2 { name="aurelius"; version="0.8.4"; sha256="00bpf9sggvnajpmg3zsdgfjinkb6wbrcf1ris7qfhh1rp5rz4m4m"; depends=[gbm glmnet jsonlite]; }; @@ -5286,12 +5295,15 @@ in with self; { avar = derive2 { name="avar"; version="0.1.1"; sha256="1i0bk3y0ca58ihwn4di8rpkp5vs2j5b80rcvaf72n9h2hp8i2ncz"; depends=[Rcpp RcppArmadillo simts]; }; averisk = derive2 { name="averisk"; version="1.0.3"; sha256="02j27d4jxgy2bk5sgxp1xdfyqr321civs99qj0g8cp34gwqk0j3m"; depends=[MASS]; }; aweek = derive2 { name="aweek"; version="1.0.0"; sha256="0a9d4yp694qch34mf08qc5fwsn21h9mw1ak6vylaq73nwiihajw9"; depends=[]; }; - aws = derive2 { name="aws"; version="2.4-1"; sha256="00mc1qwah6i4ajmm01sklz86vz9rwchdsdrck5yrva2a2b1war22"; depends=[awsMethods gsl]; }; + aws = derive2 { name="aws"; version="2.4-2"; sha256="1czlsy64nx6j7h1smgb561yyv3f98pwqwglk77yla4mx3fp14bvq"; depends=[awsMethods gsl]; }; aws_alexa = derive2 { name="aws.alexa"; version="0.1.7"; sha256="0k3kwkmi13j2nrkyi6ahpc98s24idx4m5s4wkqkgqhi8xaljpp7c"; depends=[aws_signature dplyr httr xml2]; }; aws_comprehend = derive2 { name="aws.comprehend"; version="0.2.1"; sha256="0qn4mkdd17c8kmrm4ml7l1x3rzaw3gbykhrj3m0ga53crcqdhqri"; depends=[aws_signature httr jsonlite]; }; aws_ec2metadata = derive2 { name="aws.ec2metadata"; version="0.2.0"; sha256="1lbljg2fp3yh1hwlbmprkc1prw80jv0ycvpg1vggagm68wm5x288"; depends=[curl jsonlite]; }; + aws_iam = derive2 { name="aws.iam"; version="0.1.8"; sha256="1p4w50icfw6mrzr6aazdbh977yvyvsf1yavjscyvv11xf3y9f9j2"; depends=[aws_signature httr jsonlite xml2]; }; + aws_kms = derive2 { name="aws.kms"; version="0.1.4"; sha256="0f9l62g4z68ickzi4if3pw3algb41rn47z9cpxga8aggkclk86l4"; depends=[aws_signature base64enc httr jsonlite]; }; + aws_lambda = derive2 { name="aws.lambda"; version="0.2.0"; sha256="0vp13qw7mw8dz01q30z7bnj47qx9js1zmxasc2n733gi07fdj62f"; depends=[aws_signature base64enc httr jsonlite]; }; aws_polly = derive2 { name="aws.polly"; version="0.1.5"; sha256="1xfx9g5iq1wcl27cmj4ss3y3f5yr1qmma77ki09g3ji2xvd50101"; depends=[aws_signature httr jsonlite tuneR]; }; - aws_s3 = derive2 { name="aws.s3"; version="0.3.20"; sha256="02n4h5y792q9xr5mcv7lylv3p6nqbi754hj63c0vslx759p0yvbc"; depends=[aws_signature base64enc curl digest httr xml2]; }; + aws_s3 = derive2 { name="aws.s3"; version="0.3.21"; sha256="132cczq0ml7lpp2yl6l4p99dn1zihrncnpa6wyad4m9mnr50a8dx"; depends=[aws_signature base64enc curl digest httr xml2]; }; aws_signature = derive2 { name="aws.signature"; version="0.5.2"; sha256="0skibgf2l6n7ql51gnlmvjyfmaqa8ijc9gywmyhvrcj9bix2pydf"; depends=[base64enc digest]; }; aws_transcribe = derive2 { name="aws.transcribe"; version="0.1.3"; sha256="1nni1b935i2ir67lfhcj0106vzr310mk2jvln32gvzbnqxcggz7m"; depends=[aws_signature httr jsonlite]; }; aws_translate = derive2 { name="aws.translate"; version="0.1.4"; sha256="1x6cvpfddgwywsji4ywygmqn3pwy3i1aci9lk4nsrrfkzggwcbpb"; depends=[aws_signature httr jsonlite]; }; @@ -5322,9 +5334,9 @@ in with self; { bacr = derive2 { name="bacr"; version="1.0.1"; sha256="14zr1v4rihx0ra3x0vsb81vsz0g8gzskkdxkg7nhiz835hp2fiy8"; depends=[MCMCpack]; }; badgecreatr = derive2 { name="badgecreatr"; version="0.2.0"; sha256="0mdixklaxky5gs8zm99ky280vxxlbq1mxnaarq6x0d1cb71bzv4l"; depends=[git2r]; }; badger = derive2 { name="badger"; version="0.0.7"; sha256="1djgzn6ixfsdr0v4f3714mv2z2kl776dd2hq670g7bla4lp6344s"; depends=[desc dlstats rvcheck]; }; - bagRboostR = derive2 { name="bagRboostR"; version="0.0.2"; sha256="1k9w98p3ad3myzyqhcrc4rsn7196qvhnmk5ddx3fpd1rdvy2dnby"; depends=[randomForest]; }; baggedcv = derive2 { name="baggedcv"; version="1.0"; sha256="1rqs4sm6g1anck5s2dxlm1vcmylpphcbs2dpvf1sjki5lrzdq9z4"; depends=[doParallel foreach kedd mclust]; }; baggr = derive2 { name="baggr"; version="0.4.0"; sha256="1cbajifb4gavamj46zs9vk6ihhg6wnv2hn75452bdc2mc4ingn5n"; depends=[bayesplot BH crayon forestplot ggplot2 gridExtra Rcpp RcppEigen rstan rstantools StanHeaders testthat]; }; + baguette = derive2 { name="baguette"; version="0.0.1"; sha256="1n8fjac9jha3g48w1iddqrh54gd4lzv1bs3f747y6jasp99y3vg7"; depends=[butcher C50 dials dplyr earth furrr generics hardhat magrittr parsnip purrr rlang rpart rsample tibble tidyr withr]; }; bahc = derive2 { name="bahc"; version="0.1.0"; sha256="1i5s3qjwwsm94vplkifv72kql8wgiwsc7n1d0707rva92iyv7rcy"; depends=[fastcluster matrixStats]; }; bain = derive2 { name="bain"; version="0.2.4"; sha256="15car9j11s0ywss13g5swf1dxjjc91xmbkvx200mivca9bj6245m"; depends=[lavaan]; }; bairt = derive2 { name="bairt"; version="0.1.2"; sha256="17nc0lp0bzwshik33v0gq5d6nd2gvm4799b7rfiq089zhnzv90kj"; depends=[coda mvtnorm shiny shinyjs]; }; @@ -5360,11 +5372,12 @@ in with self; { basefun = derive2 { name="basefun"; version="1.0-7"; sha256="1g72g77yzf6ji4aglm4hpaqbz5ma2d6y93g7r17066iwyzl0ygn3"; depends=[Matrix orthopolynom polynom variables]; }; baseline = derive2 { name="baseline"; version="1.2-3"; sha256="1d8k5py3wn82nm9pnsnh9ylbdkmkm3j938cdil3igwd3qzkjp63b"; depends=[limSolve SparseM]; }; basetheme = derive2 { name="basetheme"; version="0.1.2"; sha256="0yck4qc7qd406s7kw95xgnfc0pfvzk3ylhkv6mk6l2wbkfm8ldrb"; depends=[]; }; + basf = derive2 { name="basf"; version="0.1.0"; sha256="0v4hhgg8qq4hdih22i3akrjpc4xjnwi81968nyfcv00gy8fd5gjv"; depends=[sf tibble]; }; basicMCMCplots = derive2 { name="basicMCMCplots"; version="0.2.5"; sha256="0sdvhm7n9n67gwymv7whk6f6lfgp74gczisqw90096la566ndd2f"; depends=[]; }; basicTrendline = derive2 { name="basicTrendline"; version="2.0.3"; sha256="10rq9hriyn50b28ikvl0vsvchbkrc0pjzxamq4ix1xd04n4drkl9"; depends=[investr scales]; }; basicspace = derive2 { name="basicspace"; version="0.24"; sha256="1cy226njbax7dcgql89fns4l4w9fq328x3h0vb93l5jk883jgi8h"; depends=[]; }; basictabler = derive2 { name="basictabler"; version="0.3.1"; sha256="1yrrg0mgxfqrn068ggx7b5xqj8wccigb5x6aya2hw3b035cbfprs"; depends=[dplyr htmltools htmlwidgets jsonlite R6]; }; - basket = derive2 { name="basket"; version="0.10.1"; sha256="1hwcfm7hgi6khqkw643n5i40pmr55117b6fh5als91r60k966w2m"; depends=[cli crayon dplyr foreach GenSA ggplot2 ggraph gridExtra igraph itertools RColorBrewer rlang tibble tidygraph tidyr]; }; + basket = derive2 { name="basket"; version="0.10.2"; sha256="0d3qp1p11w9warl4cd9icnygqyiarm6vzsnph2hl09lmsqbghahl"; depends=[cli crayon dplyr foreach GenSA ggplot2 ggraph gridExtra igraph itertools RColorBrewer tibble tidygraph tidyr]; }; 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=[]; }; @@ -5379,7 +5392,7 @@ in with self; { bayesCT = derive2 { name="bayesCT"; version="0.99.2"; sha256="11y22xg7f47vj47pd5z44g20ff2jjn67s39win0qngl69ii1ph98"; depends=[bayesDP dplyr magrittr msm purrr survival]; }; bayesDP = derive2 { name="bayesDP"; version="1.3.3"; sha256="0g2kw8rsa9s5ahvsr4j363nqs4s49pmbaxgsqrlg8nizjsmj8p49"; depends=[ggplot2 MCMCpack Rcpp RcppArmadillo survival]; }; bayesDem = derive2 { name="bayesDem"; version="2.5-1"; sha256="1cxrqil1p692mbzkcj1fvsx335qyy6c1y43mq48s4shs1hhc69bn"; depends=[bayesLife bayesPop bayesTFR gWidgets gWidgetsRGtk2 RGtk2 wpp2015]; }; - bayesGARCH = derive2 { name="bayesGARCH"; version="2.1.3"; sha256="1480mmzfshchfbfh3x420cq5qblfh59jkl21hkq2jvnwppksdn9w"; depends=[coda mvtnorm]; }; + bayesGARCH = derive2 { name="bayesGARCH"; version="2.1.5"; sha256="01lmpi659cisr7rixz8khaxzyvkvdkvcxjj37x3lw7dpf4ir2535"; depends=[coda mvtnorm]; }; bayesImageS = derive2 { name="bayesImageS"; version="0.6-0"; sha256="1m0az3z8hwaxpqd1ljly9vlp41dp7c7p39r0rx7k9vcs201vlcg8"; depends=[Rcpp RcppArmadillo]; }; bayesLife = derive2 { name="bayesLife"; version="4.1-0"; sha256="1sswnwv4x77sd07d3hpsf3wfd5szrdnc4fni8glzl8rk3y0r3jns"; depends=[bayesTFR car coda data_table hett wpp2019]; }; bayesPop = derive2 { name="bayesPop"; version="8.1-1"; sha256="1xhzind6k23rcgy1iw0bqks6wz77755qs9pw6sqinfi8qbv0ax1l"; depends=[abind bayesLife bayesTFR data_table fields googleVis MortCast plyr reshape2 rworldmap wpp2012 wpp2019]; }; @@ -5398,14 +5411,14 @@ in with self; { bayesloglin = derive2 { name="bayesloglin"; version="1.0.1"; sha256="0j2ziahf6mwsz2gvb1azvdzlmszlpqgr5zqcqa68pxgq947sa2cs"; depends=[igraph]; }; bayeslongitudinal = derive2 { name="bayeslongitudinal"; version="0.1.0"; sha256="0g45ikpnbry1albb3asrzab5z3sy98yf74c64qn02d65xgafifwg"; depends=[LearnBayes MASS mvtnorm]; }; bayesm = derive2 { name="bayesm"; version="3.1-4"; sha256="154glks7rsjkza0sfi1kj7wj727py9sl1ba6sswflwmwc9n226q6"; depends=[Rcpp RcppArmadillo]; }; - bayesmeta = derive2 { name="bayesmeta"; version="2.4"; sha256="0h2b237ml90z9xcbjy5fgc4l8k09210g101cf25mngbz76wxvy87"; depends=[forestplot metafor]; }; + bayesmeta = derive2 { name="bayesmeta"; version="2.5"; sha256="1dvprpmrqnwxhsxb4h972rx7mww6r6w7y5mjw7wm4p1pddzdhqyc"; depends=[forestplot metafor]; }; bayesmix = derive2 { name="bayesmix"; version="0.7-4"; sha256="1qms1nnk2nq3gqr8zf2b9ri4wv8jrxv5i8s087k1rwdvya3k5r9a"; depends=[coda rjags]; }; bayesplot = derive2 { name="bayesplot"; version="1.7.1"; sha256="0sq0ajnm96hmlqf1cv5n2gshh3qdij4n1zbm7qrniz2q6b5aj342"; depends=[dplyr ggplot2 ggridges glue reshape2 rlang tibble tidyselect]; }; bayespref = derive2 { name="bayespref"; version="1.0"; sha256="0gwlzs7qkgmf90np7xv85d27jjqggyhfj00vpya664a2znyjb3jm"; depends=[coda lattice MASS MCMCpack RColorBrewer]; }; bayesreg = derive2 { name="bayesreg"; version="1.1"; sha256="12g5sklip3i8fpzrhvbikhgnl6kx8fxb88hfv8f34jy71r3h7zyp"; depends=[pgdraw]; }; bayess = derive2 { name="bayess"; version="1.4"; sha256="0axipk5hn2hw3g4dfh7y3xa0dxqmi8kqpbr77nl14y7ydpija6xm"; depends=[combinat gplots MASS mnormt]; }; bayest = derive2 { name="bayest"; version="1.1"; sha256="0nl3zq5bp6yqw351vcrzph5y0jn9bml7isf4nsxl7braivalf72n"; depends=[]; }; - bayestestR = derive2 { name="bayestestR"; version="0.5.3"; sha256="1q24qh5p6bz4nbf4546kckh7d518x5pm1yhhbc8fwcnbca4kgqjz"; depends=[insight]; }; + bayestestR = derive2 { name="bayestestR"; version="0.6.0"; sha256="0s7wdmk8avgaqk2b7fcf4bsh13isrkl1q4y7z2y8jhdagxxxnzd1"; depends=[insight]; }; bayesvl = derive2 { name="bayesvl"; version="0.8.5"; sha256="1gb2in8hjiqb3daqz6phn1639i6p2w641kxrm3zh4rm3d6hg6hzr"; depends=[bayesplot bnlearn coda dplyr ggplot2 reshape2 rstan StanHeaders viridis]; }; bayfoxr = derive2 { name="bayfoxr"; version="0.0.1"; sha256="1295296mbjpmd0bg1pfxvyp0az3sry6gsq9ir3l8x64w5a4qrzd5"; depends=[]; }; baymedr = derive2 { name="baymedr"; version="0.1.0"; sha256="0y01s6dpnhnxqqvl15cdxmb5ysb685bbp47xifyp5nz8sjh2pci0"; depends=[rlang stringr]; }; @@ -5418,7 +5431,7 @@ in with self; { bbmle = derive2 { name="bbmle"; version="1.0.23.1"; sha256="0p3l9shbr2846qmw8n0fyzf4j7gmi08aypl82jml3dwh26q1whk0"; depends=[bdsmatrix lattice MASS Matrix mvtnorm numDeriv]; }; bbo = derive2 { name="bbo"; version="0.2"; sha256="19xrbla3bb3csg3gjjrpkgyr379zfwyh293bcrcd6j8rnm6g4i01"; depends=[]; }; bbreg = derive2 { name="bbreg"; version="1.0.0"; sha256="1v2m7ky9kd16psm9w8njfjzkwc4prvyq0fgbl6i210pjwwv9zvhr"; depends=[betareg expint Formula statmod]; }; - bbricks = derive2 { name="bbricks"; version="0.1.1"; sha256="0y5d01sr9351skvj5xqpiirz3yl3l0sdcmgbz2gb0wfffdqzkllc"; depends=[]; }; + bbricks = derive2 { name="bbricks"; version="0.1.2"; sha256="08ylvxkcpg4imrv6qzpmkxvdckqnib8b9ly47zircyjqmzzdrain"; depends=[]; }; bbw = derive2 { name="bbw"; version="0.1.3"; sha256="1z3an561qh0rfi3jhh1ghsdbg8aimqmf4hpqri2jz39in3p0gwg4"; depends=[car]; }; bc3net = derive2 { name="bc3net"; version="1.0.4"; sha256="15dghd0v1s71h77iw8b49v5h7wcda5mb4540lfyibsdipbashv2h"; depends=[c3net igraph infotheo lattice Matrix]; }; bcROCsurface = derive2 { name="bcROCsurface"; version="1.0-4"; sha256="0bhwwr9pa78a8lhjz2cfbm09jq585p89l6dr2ihpil4q5r8cmsjr"; depends=[boot nnet Rcpp RcppArmadillo rgl]; }; @@ -5474,14 +5487,14 @@ in with self; { bench = derive2 { name="bench"; version="1.1.1"; sha256="1ldqmf0anwgw6b9jgy5mnnjjncayc1x54pvjm6f5gqv0225ksdw3"; depends=[glue pillar profmem rlang tibble]; }; benchden = derive2 { name="benchden"; version="1.0.5"; sha256="1cwcgcm660k8rc8cpd9sfpzz66r55b4f4hcjc0hznpml35015zla"; depends=[]; }; benchmarkme = derive2 { name="benchmarkme"; version="1.0.3"; sha256="003d97rs0gb6l6hq7d4lxgdngrgb5lii6fxw2n7l50m14hib2sv2"; depends=[benchmarkmeData doParallel dplyr foreach httr Matrix tibble]; }; - benchmarkmeData = derive2 { name="benchmarkmeData"; version="1.0.3"; sha256="1qiw9d93y4m2ch20hsgvf1k3r9dqf60mrdr6cc647m1qv2syjgrk"; depends=[dplyr tibble]; }; + benchmarkmeData = derive2 { name="benchmarkmeData"; version="1.0.4"; sha256="1n4vjkagqlm6kw2hilf4gjfcdjad0bcg652j9nl2ygbq3kdnh1vf"; depends=[dplyr tibble]; }; benchr = derive2 { name="benchr"; version="0.2.5"; sha256="1xh1n41ll50zz3v26i8lg5f92i90rc78ywnl0rczryh621whx80n"; depends=[Rcpp RcppProgress]; }; 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-6"; sha256="1vywnc6k37gpaq7g59v3qa6619svcmnd8ri5zm5l0ila2s3ccb2c"; depends=[dplyr lazyeval readr]; }; berryFunctions = derive2 { name="berryFunctions"; version="1.18.2"; sha256="0yicwsz6v5nffvw2wmjmc2zhcik7avz3xmj8zhb77xhaq9dazk9s"; depends=[abind]; }; - bestNormalize = derive2 { name="bestNormalize"; version="1.4.3"; sha256="14snx2cv0bmks8lfvmvaggazak8fjch3143922lb3b1pnvcpxhg5"; depends=[doParallel doRNG dplyr foreach LambertW nortest]; }; + bestNormalize = derive2 { name="bestNormalize"; version="1.5.0"; sha256="0af21qxrz1jvkva8lz72h6c2xc5ha0rwiv253b4n1m8w27z39d7h"; depends=[doParallel doRNG dplyr foreach LambertW nortest recipes tibble]; }; bestSDP = derive2 { name="bestSDP"; version="0.1.2"; sha256="1rff6jij9wmlpalzilvid8jvj2pczrchx0yrg0vhy00j64zg6jzs"; depends=[dplyr DT ggplot2 readxl rlist shiny shinyBS shinydashboard shinyjs shinythemes shinyWidgets stringr tidyr]; }; bestglm = derive2 { name="bestglm"; version="0.37.3"; sha256="1zncy958hlwyyxrp6yvq1inq6mpyrbr6cdkf8maijfirr5j8f0ya"; depends=[glmnet grpreg lattice leaps pls]; }; betaboost = derive2 { name="betaboost"; version="1.0.1"; sha256="1zdyzxl2kp2i5lkiz280wz4av9wqklbn25zmq6n4yb6a579yjfn8"; depends=[gamboostLSS mboost]; }; @@ -5497,7 +5510,7 @@ in with self; { bezier = derive2 { name="bezier"; version="1.1.2"; sha256="1vw5128v8h973xwa1fdm9cw2jvrldj87nd55lddlp3qsz3ag4br6"; depends=[]; }; bfast = derive2 { name="bfast"; version="1.5.7"; sha256="0n75minka55rxpvs3qkj0c65ydn1gc3i8lkr2gdyn1adjkl5yn01"; depends=[forecast raster sp strucchange zoo]; }; bfp = derive2 { name="bfp"; version="0.0-40"; sha256="03risiq2b7bc3gwlgpcsy1gvja6n5w1j3kw13s2wrd420hddzk4s"; depends=[Rcpp]; }; - bfsMaps = derive2 { name="bfsMaps"; version="0.9.3"; sha256="10vp4hqha25h8hwc436zpyvryjcnswcrxmmx14cy31vsdfci571s"; depends=[DescTools maptools rgdal rlang sp spdep]; }; + bfsMaps = derive2 { name="bfsMaps"; version="0.9.4"; sha256="0pb081kpmf7040r99szhg7ppvb21cvc9k9bq6lhglinb8wxad9g8"; depends=[DescTools maptools rgdal rlang sp spdep]; }; bfsl = derive2 { name="bfsl"; version="0.1.0"; sha256="1hl53nis8bb1ffgkx91ij9vh680cpkb80y548y67y9w18iyd4aw4"; depends=[]; }; bfw = derive2 { name="bfw"; version="0.4.1"; sha256="1dwl6p70wbgippysl7vk8nv6rc78f6h5xl8fna98zv99qf0ib31c"; depends=[coda MASS runjags]; }; bgeva = derive2 { name="bgeva"; version="0.3-1"; sha256="0qm4xknyab8hdyn3in2hsvm8s062cnmqqf41b5jvax1mi5hs0z8c"; depends=[magic mgcv trust]; }; @@ -5505,15 +5518,15 @@ in with self; { bgmfiles = derive2 { name="bgmfiles"; version="0.0.6"; sha256="10qldfjjq5fx5jrrakdxc8k2pf0vp8ifg18nq56lvx9n28mqigim"; depends=[]; }; bgmm = derive2 { name="bgmm"; version="1.8.4"; sha256="1r8qd4niah18jg0lw3vqq1465likal5j7nvlgnblpidd5svn4a2n"; depends=[car combinat lattice mvtnorm]; }; bgsmtr = derive2 { name="bgsmtr"; version="0.7"; sha256="17706qims9637ppwg0vszkcm6kmvhzyrdihkgigpiv5lknhk2q3m"; depends=[CholWishart coda EDISON glmnet inline LaplacesDemon Matrix matrixcalc miscTools mnormt mvtnorm Rcpp sparseMVN statmod]; }; - bhm = derive2 { name="bhm"; version="1.15"; sha256="1xfm1k3wf4k1c65pd9201c00y4qda3lw9aycjh6q34ixyl6g5jg5"; depends=[coda MASS survival]; }; + bhm = derive2 { name="bhm"; version="1.16"; sha256="097vfpqkkbgps9wkabc1k18fa5vv0shbn1jz6g5l96xv96nvx93w"; depends=[coda ggplot2 MASS survival]; }; bhpm = derive2 { name="bhpm"; version="1.7"; sha256="0fhk2gmghibf7la864dzm19bm76525gzbj03vw0y0zwbv9shbpcp"; depends=[coda]; }; biasbetareg = derive2 { name="biasbetareg"; version="1.0"; sha256="1562zdin0y5mrp36ih11ir3h9cv49cx1l98chxd89fkj8x3c1fbg"; depends=[betareg]; }; bib2df = derive2 { name="bib2df"; version="1.1.1"; sha256="0d57883df774qqwpssmly3f1gci32yc5sgwc3x8f2rjih23s1nf6"; depends=[dplyr httr humaniformat stringr]; }; - bibliometrix = derive2 { name="bibliometrix"; version="2.3.2"; sha256="02sikbjnsfd1gxwlbdiafp35af22gmz2p6i951l3syxpcvylxfc8"; depends=[dplyr DT factoextra FactoMineR ggplot2 ggraph ggrepel igraph Matrix networkD3 RColorBrewer reshape2 rio RISmed rscopus shiny shinycssloaders shinythemes SnowballC stringdist stringr]; }; + bibliometrix = derive2 { name="bibliometrix"; version="3.0.0"; sha256="0nblrda78xrvm36v0xmgfm3wgwmmwnzwprw1bgzh8sr2w72cc0ym"; depends=[dimensionsR dplyr DT factoextra FactoMineR ggplot2 ggraph ggrepel igraph Matrix networkD3 pubmedR RColorBrewer rio rscopus shiny shinycssloaders shinythemes SnowballC stringdist stringr tidyr]; }; bibtex = derive2 { name="bibtex"; version="0.4.2.2"; sha256="140hkjzdp3033cvji861rd06z1ixgpnn4n5amygqsmhnixk8ff07"; depends=[stringr]; }; biclique = derive2 { name="biclique"; version="1.0.5"; sha256="1fdf2r1jc2x8yw0fcw7yyjdxz4b870w6y7mr68qixqxwpl6943zq"; depends=[]; }; biclust = derive2 { name="biclust"; version="2.0.2"; sha256="1pk7mvwlg4hkc4cn4w6wr2c192qx03d1xfwlzclk5bw1nmcg483b"; depends=[additivityTests colorspace flexclust ggplot2 lattice MASS tidyr]; }; - biclustermd = derive2 { name="biclustermd"; version="0.2.1"; sha256="0raszh41yag08icxm1g2jbsg4xxkxmc8kn7viz0ns08w3snpvr2v"; depends=[biclust clusteval doParallel dplyr foreach ggplot2 magrittr nycflights13 phyclust tidyr]; }; + biclustermd = derive2 { name="biclustermd"; version="0.2.2"; sha256="00d7lhkcr9bj45zwpm78hdp3qllfisx097dsql3g64v9ix2q44g5"; depends=[biclust clusteval doParallel dplyr foreach ggplot2 magrittr nycflights13 phyclust tidyr]; }; bife = derive2 { name="bife"; version="0.7"; sha256="04wnc6n3wcykzmhrnd2zkj507ymzbw1n8wssi3bwcylanzj59a3h"; depends=[data_table Formula Rcpp RcppArmadillo]; }; bigGP = derive2 { name="bigGP"; version="0.1-6"; sha256="0fwm06rzx1qbh16ii93x26i4v4yb50jk67k3qmzyr3gr4z9b9xhg"; depends=[Rmpi]; }; bigMap = derive2 { name="bigMap"; version="2.1.0"; sha256="0bpnzz3acqn006jk8db5yyvbhl3sq807926igjcxj813i3r0x98r"; depends=[BH bigmemory colorspace RColorBrewer Rcpp RcppArmadillo]; }; @@ -5524,17 +5537,18 @@ in with self; { bigchess = derive2 { name="bigchess"; version="1.7.1"; sha256="1h8i8qmnr9030xr8ld4rk7v6zpxbirw09i71imrrja6lsxr7v3qn"; depends=[ff ffbase processx RSQLite]; }; 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-7"; sha256="1s9l8n0a3nv6viyp62k890nhdpfh8jl1ahhsa51x7bx2agdqplhi"; depends=[BH bigmemory Matrix ncvreg Rcpp RcppArmadillo]; }; bigleaf = derive2 { name="bigleaf"; version="0.7.1"; sha256="0hsssz5973vapkmmh9dgzrijyjj1s75iarq3cpfi7ljm4n748qig"; depends=[robustbase solartime]; }; biglm = derive2 { name="biglm"; version="0.9-1"; sha256="1z7h4by457z93k5i6qf5rq7xmd1y2kcd1rq4pv465cd32d4mb2g1"; depends=[DBI]; }; biglmm = derive2 { name="biglmm"; version="0.9-1"; sha256="1f4w59jvq7lq0bh5fs41czw0yc8h56iijbj0hlcq47zyqx6gll9a"; depends=[DBI]; }; + bigmatch = derive2 { name="bigmatch"; version="0.6.2"; sha256="16nmc0n78gzk8x8jhxdilj47gjqqv46sgiivccn5zkv08k1h3jj2"; depends=[liqueueR mvnfast plyr rcbalance]; }; bigmemory = derive2 { name="bigmemory"; version="4.5.36"; sha256="03pg8mxdc7q0249visjmc8bc3xmwxsfg3i2n6higicj4cfz7zihq"; depends=[BH bigmemory_sri Rcpp]; }; bigmemory_sri = derive2 { name="bigmemory.sri"; version="0.1.3"; sha256="0mg14ilwdkd64q2ri9jdwnk7mp55dqim7xfifrs65sdsv1934h2m"; depends=[]; }; bigparallelr = derive2 { name="bigparallelr"; version="0.2.3"; sha256="1xg48zbwhchclc6lc67hc3j1d0b7cajd4whspj68ipm38w8h7l23"; depends=[bigassertr doParallel flock foreach RhpcBLASctl]; }; bigreadr = derive2 { name="bigreadr"; version="0.2.0"; sha256="0d5fgs16kdsl23jqrgz7in63pwhh7bvj7m8pa8nj11v84ji6lagr"; depends=[bigassertr data_table Rcpp]; }; bigrquery = derive2 { name="bigrquery"; version="1.2.0"; sha256="1ggh2gngr5x0g6y7d55y6kvn94anf7qi1bkc28cjmw61hxjq38fb"; depends=[assertthat bit64 curl DBI gargle glue httr jsonlite prettyunits progress rapidjsonr Rcpp rlang tibble]; }; bigsnpr = derive2 { name="bigsnpr"; version="1.3.0"; sha256="1021nxqpl018ph2np50n02szjdlwc71r6yx5sbszd8dxbpb0hfjn"; depends=[bigassertr bigparallelr bigreadr bigstatsr bigutilsr data_table foreach ggplot2 magrittr Matrix Rcpp RcppArmadillo rmio]; }; + bigsparser = derive2 { name="bigsparser"; version="0.1.0"; sha256="1f02hpdw2r6r4sqm16qz1rz0yz8rr42jlhnmigf0kqxvx5r9mwss"; depends=[bigassertr Rcpp rmio]; }; bigsplines = derive2 { name="bigsplines"; version="1.1-1"; sha256="1kf04p2lglzdi1fdryk27nmj2a2jca2ii7ki8vak93sq21isb179"; depends=[quadprog]; }; bigstatsr = derive2 { name="bigstatsr"; version="1.2.3"; sha256="0386hrfjsdnm5ns9kkym8nhzfadcn0shdr3yj77051lwxfngdmbx"; depends=[bigassertr bigparallelr cowplot foreach ggplot2 Rcpp RcppArmadillo rmio RSpectra tibble]; }; bigstep = derive2 { name="bigstep"; version="1.0.3"; sha256="0ygp1vljqqn5vzpjxlv9d6fxxv3bi2kfyqfs1gf0jgxwb9417b82"; depends=[bigmemory magrittr matrixStats R_utils RcppEigen speedglm]; }; @@ -5544,13 +5558,14 @@ in with self; { bigutilsr = derive2 { name="bigutilsr"; version="0.3.0"; sha256="0fjmczbfap20y39vaym01wxl0c4vckqxgjkki9z1s66rglxr6zg9"; depends=[bigassertr bigparallelr nabor Rcpp robustbase RSpectra]; }; bikeshare14 = derive2 { name="bikeshare14"; version="0.1.2"; sha256="1sib83driqv9k4aa131nw3xasslrxvnxkn3mr8kxycxccky025n9"; depends=[]; }; bikm1 = derive2 { name="bikm1"; version="1.0.0"; sha256="1pj41d59n3iflwc4iwnwv6g2vhjs9498k85cml7jwb814xpl9jsj"; depends=[ade4 ggplot2 gtools pracma reshape2]; }; - bild = derive2 { name="bild"; version="1.1-5"; sha256="03has1zi57inicahl52ja006vv5cdndyxfsxp77l6nc3zc6ixna8"; depends=[]; }; + bild = derive2 { name="bild"; version="1.2-0"; sha256="0aygx77fn2w249q6ghpxclhm9xb2ngdzrirldr3lpidg6ivc443v"; depends=[]; }; billboard = derive2 { name="billboard"; version="0.1.0"; sha256="1z3y8dijhc1381y91n5zq305xzm1gpvs0g4mdpfr7zrblpa8ws39"; depends=[tibble]; }; billboarder = derive2 { name="billboarder"; version="0.2.8"; sha256="1n51xildr8h3fqm3yhalgvq6pwlpzbcv230jg7skp8147wmwcmi7"; depends=[ggplot2 htmltools htmlwidgets jsonlite magrittr scales shiny]; }; bimetallic = derive2 { name="bimetallic"; version="1.0"; sha256="181qi4dr0zc7x6wziq7jdc1his20jmprfpq3hrfm56fr5n1sj8wl"; depends=[]; }; bimets = derive2 { name="bimets"; version="1.4.3"; sha256="00gbfjp4gshc5izbjlzsc6vib1rfkilbwd89xc4fn51z1hfsvpzl"; depends=[xts zoo]; }; bimixt = derive2 { name="bimixt"; version="1.0"; sha256="0nhszpzjqy8z3vngl5jdzqxzshnn92wgi0ci5n3n5kzi24xkfrzc"; depends=[pROC]; }; binGroup = derive2 { name="binGroup"; version="2.2-1"; sha256="0cb7j6b0s3y56mv1967awwri0kv0rf3sr3vwf9gc2zbjggxi9ffp"; depends=[partitions Rdpack]; }; + binGroup2 = derive2 { name="binGroup2"; version="1.0.2"; sha256="025b087av8zqn7i0ggfdzkkckqql4pc12z4h4r4bw8la2krcdw3z"; depends=[partitions rBeta2009 Rcpp RcppArmadillo Rdpack]; }; binMto = derive2 { name="binMto"; version="0.0-7"; sha256="0rg9rsdy14jx7zjv60krcz1vh0sxqimsai0wynhx2sx0kydw4ngy"; depends=[mvtnorm]; }; binaryGP = derive2 { name="binaryGP"; version="0.2"; sha256="0i4xi0gxk0lamjdygyx0azdp3kfqmva1g20nl3p65w4yx77m88d6"; depends=[GPfit lhs logitnorm nloptr Rcpp RcppArmadillo]; }; binaryLogic = derive2 { name="binaryLogic"; version="0.3.9"; sha256="19ig9qgjjnivfihjy41pc13qlrb95679mmk4zks5lbbri8qi4qxj"; depends=[]; }; @@ -5596,7 +5611,7 @@ in with self; { biomartr = derive2 { name="biomartr"; version="0.9.2"; sha256="12bw15hvjg7fbrq1mwn2xgzbplydy8rlq982hs118mlwdrlqb06q"; depends=[biomaRt Biostrings curl data_table downloader dplyr fs httr jsonlite philentropy purrr R_utils RCurl readr stringr tibble XML]; }; biomod2 = derive2 { name="biomod2"; version="3.4.6"; sha256="0nvxg0a78ynydx3wd16vaildw9x4hiagmx4wkrwkzbyhyi2pgza1"; depends=[abind caret checkmate dismo doParallel dplyr earth ENMeval foreach gbm ggplot2 lattice MASS maxnet mda nnet PresenceAbsence pROC purrr randomForest raster rasterVis reshape rlang rpart sp tidyr]; }; bionetdata = derive2 { name="bionetdata"; version="1.0.1"; sha256="1l362zxgcvxln47b1vc46ad6ww8ibwhqr2myxnz1dnk2a8nj7r2q"; depends=[]; }; - bios2mds = derive2 { name="bios2mds"; version="1.2.2"; sha256="1avzkbk91b7ifjba5zby5r2yw5mibf2wv05a4nj27gwxfwrr21cd"; depends=[amap cluster e1071 rgl scales]; }; + bios2mds = derive2 { name="bios2mds"; version="1.2.3"; sha256="1k0r3fnkzfczx3wp3m8zpndk6gxca7idsp0z13rw84zjrgqaw6jm"; depends=[amap cluster e1071 rgl scales]; }; bioset = derive2 { name="bioset"; version="0.2.3"; sha256="15vchim8cim42j1if0jars696rh50vmbggr9748q321f6ngm1w1i"; depends=[dplyr magrittr rlang tibble tidyr]; }; biosignalEMG = derive2 { name="biosignalEMG"; version="2.1.0"; sha256="0bbkrfqkmks4z8c7rh0k43lvm71vn3fzrw3kpj012ym77whwkvay"; depends=[signal]; }; biospear = derive2 { name="biospear"; version="1.0.2"; sha256="10y4hbncwiqpxzqvzjrmfgp804zczdgvwpjcj0dzaa0sx1njdzja"; depends=[cobs corpcor devtools glmnet grplasso MASS Matrix mboost pkgconfig plsRcox pROC PRROC RCurl survAUC survival]; }; @@ -5616,6 +5631,7 @@ in with self; { bisque = derive2 { name="bisque"; version="1.0.2"; sha256="0zp2r1vg29q2ds34hhyjv9pz761mi0qncx9p4ilwnfd5yj9pmzwq"; depends=[foreach itertools mvQuad Rcpp RcppArmadillo RcppEigen]; }; bit = derive2 { name="bit"; version="1.1-15.2"; sha256="12xjkkkmflkz8s435by4r23b57cz7z67z84907f6qg99hn1yg0qb"; depends=[]; }; bit64 = derive2 { name="bit64"; version="0.9-7"; sha256="07znvz9vp1nz1y5ljng4qyskvm943cdbmy996s67560ijxzsm6kv"; depends=[bit]; }; + bite = derive2 { name="bite"; version="0.3"; sha256="00sph3pdbb9p21s3263ni4by2ivvya1sbjm9wvwx1rwjr4f31jps"; depends=[ape coda MASS phytools sm vioplot xml2]; }; bitops = derive2 { name="bitops"; version="1.0-6"; sha256="176nr5wpnkavn5z0yy9f7d47l37ndnn2w3gv854xav8nnybi6wwv"; depends=[]; }; bitsqueezr = derive2 { name="bitsqueezr"; version="0.1.1"; sha256="0dy180r9cclq46mh0fzc68p5zm9x2z5pa8ajgsk7qycdkyw5v829"; depends=[]; }; biva = derive2 { name="biva"; version="0.1.0"; sha256="1vppvk2n60hhi7p8y8rdyckmh4yk70wqyhbg7rbgh833s66whypw"; depends=[corrgram rpivotTable shiny shinyAce]; }; @@ -5629,7 +5645,7 @@ in with self; { bizdays = derive2 { name="bizdays"; version="1.0.6"; sha256="1av96rj4fllfais9xwh1p8601xvsj0awfh9n2n1x5kzca966h8fq"; depends=[jsonlite]; }; bjscrapeR = derive2 { name="bjscrapeR"; version="0.1.0"; sha256="18chbgiwify272iqf0w4vsqh73wbk12d8m2awc5hbnfqblz3phwd"; depends=[dplyr glue readr tibble]; }; bkmr = derive2 { name="bkmr"; version="0.2.0"; sha256="0dk6dn73bqlvwinn3aginls4533931xcr3h59k0w60yxs3v8yakv"; depends=[dplyr fields magrittr MASS nlme tidyr tmvtnorm truncnorm]; }; - blackbox = derive2 { name="blackbox"; version="1.1.27"; sha256="1mpxil8fr56xiy64177s6m16pygfsr6i1bn4crvnhypz9197in8c"; depends=[foreach geometry lattice MASS nloptr numDeriv pbapply proxy rcdd Rcpp RcppEigen spaMM]; }; + blackbox = derive2 { name="blackbox"; version="1.1.32"; sha256="180y19ls0vdk98smhs9hxpcwg3hwpl62d19zdiml38bjlxmr0kav"; depends=[foreach geometry lattice MASS nloptr numDeriv pbapply proxy rcdd Rcpp RcppEigen spaMM]; }; blaise = derive2 { name="blaise"; version="1.3.4"; sha256="14jk62sw4xs0yip8gh1w2795l8p0ybv83c24ijizxymg16h7i9g7"; depends=[dplyr readr stringr tibble]; }; blandr = derive2 { name="blandr"; version="0.5.1"; sha256="1rqas71hlf000b3z824d8ljshf8bx91bbrzaxxnx5n3chv19w6z6"; depends=[ggplot2 jmvcore knitr R6 rmarkdown stringr]; }; blastula = derive2 { name="blastula"; version="0.3.1"; sha256="0vanb8ghzskicnk7gw7mw67790lw953jf3jgyyhd71qdgz6wjli7"; depends=[base64enc commonmark curl dplyr fs getPass here htmltools httr jsonlite magrittr mime rlang rmarkdown stringr uuid]; }; @@ -5660,7 +5676,7 @@ in with self; { bltm = derive2 { name="bltm"; version="0.1.0"; sha256="1sx4ii65ddvdw45za8j320v1s9d1pz5k2gx979yymhyxi8fmq69z"; depends=[mvnfast Rfast]; }; bmass = derive2 { name="bmass"; version="1.0.3"; sha256="0dafixd996lamn5kfbqpiawblalhyw1gi394j46n2sij2r209d76"; depends=[]; }; bmd = derive2 { name="bmd"; version="0.5"; sha256="0d4wxyymycb416sdn272292l70s1h2m5kv568vakx3rbvb8y6agy"; depends=[drc]; }; - bmem = derive2 { name="bmem"; version="1.5"; sha256="1miiki743rraralk9dp12dsjjajj3iizcrfwmplf6xas6pl8sfk6"; depends=[Amelia lavaan MASS sem snowfall]; }; + bmem = derive2 { name="bmem"; version="1.7"; sha256="1g259j2jzmbbv98l0w6jc4k18ad0a7hvq2s9jgjdxk8n6ymbx67v"; depends=[Amelia lavaan MASS sem snowfall]; }; bmeta = derive2 { name="bmeta"; version="0.1.2"; sha256="19pm60xpmlanngq4nbibp0n5m98xw24b2xghz92ly31i3mkg2n68"; depends=[forestplot R2jags]; }; bmixture = derive2 { name="bmixture"; version="1.4"; sha256="0dh4qy0snxw7d82v68zymwm5pfvzwdfkyaha6kgh2mvin5k2vaqm"; depends=[BDgraph]; }; bmk = derive2 { name="bmk"; version="1.0"; sha256="1wxkrlrhmsxsiraj8nyiax9bqs834ln2swykmpf40wxspkykgfdq"; depends=[coda functional plyr]; }; @@ -5671,7 +5687,7 @@ in with self; { bmrm = derive2 { name="bmrm"; version="4.1"; sha256="1brdd5mhr5282wkdc62lgsqcxw077p69rknjk7fjcs282ahcik2s"; depends=[LowRankQP lpSolve matrixStats Rcpp]; }; bnclassify = derive2 { name="bnclassify"; version="0.4.5"; sha256="1ik3n0g6gw7504ryg5skwygyc545150r297gii4mr2zj252lf069"; depends=[assertthat BH entropy matrixStats Rcpp rpart]; }; bnlearn = derive2 { name="bnlearn"; version="4.5"; sha256="0y452cw1dxm1cik4na1zq6g0zv5ybiwc1cq9sdashq1jacjpc158"; depends=[]; }; - bnma = derive2 { name="bnma"; version="1.0.0"; sha256="1gaplf5lw7x6nfihk6n0kyf67vx4d8zq6mylhwlmfhpfrpiy030k"; depends=[coda ggplot2 igraph rjags]; }; + bnma = derive2 { name="bnma"; version="1.1.1"; sha256="1iwm4843hq07i4r73vaf8pymk0p4m3vpbw3l37l79i4c2ysqgv3h"; depends=[coda ggplot2 igraph rjags]; }; bnnSurvival = derive2 { name="bnnSurvival"; version="0.1.5"; sha256="1d9jmfx0id4lmw122zga7hb52vlfdfqn4amhzpsmhyck99rv92j4"; depends=[pec prodlim Rcpp]; }; bnormnlr = derive2 { name="bnormnlr"; version="1.0"; sha256="0l2r7vqikak47nr6spdzgjzhvmkr9dc61lfnxybmajvcyy6ymqs9"; depends=[mvtnorm numDeriv]; }; bnpa = derive2 { name="bnpa"; version="0.3.0"; sha256="0qsxk47i7q4d8hbs2xj5k5sf8bqyzhq7rbj4y7w8ljprznlydgl9"; depends=[bnlearn fastDummies lavaan Rgraphviz semPlot xlsx]; }; @@ -5746,7 +5762,7 @@ in with self; { bridgedist = derive2 { name="bridgedist"; version="0.1.0"; sha256="0hqkpwpi3nv6mfhljl65zcflf4wy72ag36hdam6s7kynfj41qz6w"; depends=[]; }; bridger2 = derive2 { name="bridger2"; version="0.1.0"; sha256="0clp42nnbvd01n65azdi2ghp0mfqwsipzdl2d30q04lcvfkdpxrf"; depends=[BSDA data_table ggplot2 outliers plotly shiny shinydashboard]; }; bridgesampling = derive2 { name="bridgesampling"; version="1.0-0"; sha256="1awhvv0v42w2q6llqi1wqpaiv5zx74cqzigdsvphy2jfp8ajw64y"; depends=[Brobdingnag coda Matrix mvtnorm scales stringr]; }; - brinton = derive2 { name="brinton"; version="0.1.5"; sha256="1mc6xksf2zwpgs3q0nx4zz77307ysrsgdk3d96xb9rjxdx7l1xnh"; depends=[forcats GGally ggplot2 glue gridExtra lubridate pander RColorBrewer rmarkdown sm tibble]; }; + brinton = derive2 { name="brinton"; version="0.1.6"; sha256="080z4hs6fkfavrkfg3h6h150y7w5h4rxaag6bwlrrsx9dnwzpb3r"; depends=[forcats GGally ggplot2 glue gridExtra lubridate pander RColorBrewer rmarkdown sm tibble]; }; brio = derive2 { name="brio"; version="1.0.0"; sha256="10gjg205vvdwbw3nr8bfrxy5fzqd27y1fsbyn17xnpk57c66igvc"; depends=[]; }; briqr = derive2 { name="briqr"; version="0.1.0"; sha256="073pdk1094ng4kggzdjvihl791r2qlja1j2w3pfmh2027kn520r8"; depends=[dplyr httr jsonlite magrittr tibble]; }; briskaR = derive2 { name="briskaR"; version="0.1.2"; sha256="1y9sabj7pfgyvv6s3bbvrb0xhjhwc4pcfsfx847kqdajid92qx8w"; depends=[deldir fftwtools fields MASS mvtnorm pracma raster rgdal rgeos sp]; }; @@ -5754,9 +5770,9 @@ in with self; { brms = derive2 { name="brms"; version="2.12.0"; sha256="1699lwkklfhjz7fddawlig552g2zvrc34mqwrzqjgl35r9fm08gs"; 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.8"; sha256="119lxm691ci2bf62jwmbhqsl39xy3jvsi988rr6sdslwaxqyx35b"; depends=[Formula truncnorm]; }; broman = derive2 { name="broman"; version="0.69-5"; sha256="1y1l1p0ddy4a3vwa01yhrc5zcgnl673ar9prkn89pspbdab7km2s"; depends=[assertthat ggplot2 jsonlite RPushbullet]; }; - broom = derive2 { name="broom"; version="0.5.5"; sha256="0n7zd64263kfavdi28rl2bxrsa00c3m4vjhhjdrfwvvmrcxj39fx"; 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="2.5.0"; sha256="0m00sws1gzwydyyqhddgyzsc71q0z7fmnn4c3mc3yfsd6mgbb2jf"; depends=[broom broom_mixed dplyr magrittr parameters performance rlang tibble]; }; + broom = derive2 { name="broom"; version="0.5.6"; sha256="0da3jsb02xckrk6alznicn6l5lnyvdhc64qklyarnd77miqgc1hb"; depends=[backports dplyr generics nlme purrr reshape2 stringr tibble tidyr]; }; + broom_mixed = derive2 { name="broom.mixed"; version="0.2.5"; sha256="121yqj85q6pdnfhbma98a2qli1k1vkx6jdxzfg125m2iahxs9i9y"; depends=[broom coda dplyr nlme plyr purrr reshape2 stringr tibble tidyr TMB]; }; + broomExtra = derive2 { name="broomExtra"; version="4.0.0"; sha256="0sc6cikqcjmm9hr7xzz5l383p822dygsx50g8q358y92m1w2nka8"; depends=[broom broom_mixed dplyr ipmisc parameters performance 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.5.0"; sha256="07dxynk8pbpbsqwaxg9vhpjv4wx8mb1lqxy1nkczjayn1yrpjfm5"; depends=[ape conditionz crul curl phylocomr phytools taxize]; }; @@ -5776,6 +5792,7 @@ in with self; { bst = derive2 { name="bst"; version="0.3-17"; sha256="0x7hv0gx5kn8dwgbkabz7d4dh2l75zdawgdj5zxan13k7b9n3l8y"; depends=[doParallel foreach gbm rpart]; }; bsts = derive2 { name="bsts"; version="0.9.2"; sha256="1v32wsjcfcq0zwklrp0c83xw4h49v49nmjs973mdzh4q05wzlpmp"; depends=[Boom BoomSpikeSlab xts zoo]; }; btb = derive2 { name="btb"; version="0.1.30"; sha256="1f94zzpg3q6ldd436cv1wqpfbpw5f706073wk38a4dkg57dwrbgi"; depends=[BH Rcpp RcppArmadillo RcppParallel sf sp]; }; + btergm = derive2 { name="btergm"; version="1.9.7"; sha256="1p7s5432azz3rdsa7wb2nnlpajq1msard6x3lg95bdgjldnl3nfc"; depends=[boot coda ergm ggplot2 igraph Matrix network ROCR RSiena sna speedglm statnet_common xergm_common]; }; bucky = derive2 { name="bucky"; version="1.0.6"; sha256="01rlx0m6h66y1p9k5llg17qpajjhk2vmhbpwc4i5igf5x5g4clgc"; depends=[lmtest sandwich]; }; buildmer = derive2 { name="buildmer"; version="1.5"; sha256="0m9dz2fb2cwc5l7wnb2dsnqyfkh1ppnlfz9r38ihanav7awsrb17"; depends=[lme4 mgcv nlme plyr]; }; bujar = derive2 { name="bujar"; version="0.2-7"; sha256="1r14mh5j2w87mc6b192hi4qg97si2xv6v826j6c1awh7w3vqbbr9"; depends=[bst earth elasticnet gbm mboost mda modeltools mpath rms survival]; }; @@ -5796,9 +5813,9 @@ in with self; { bvenn = derive2 { name="bvenn"; version="0.1"; sha256="1xrya49w5bd2b7plfxpqla60b2828rkm0rjmc4qnqzvrahsbal0y"; depends=[]; }; bvls = derive2 { name="bvls"; version="1.4"; sha256="18aaf7kk5mks3a59wwqhm1ckpn6s704l9m5nzy0x5iw0s98ijbm2"; depends=[]; }; bwd = derive2 { name="bwd"; version="0.1.0"; sha256="1ryd5cqbpns9dsis2a9vjg6fcg23284c3dr3j3l18krdshdksfr0"; depends=[]; }; - bwimage = derive2 { name="bwimage"; version="1.2"; sha256="1wm17spxfrgf8kfc6fadri54sdk0b9813s9y4rp2xiwmy5sp6aj2"; depends=[jpeg png]; }; + bwimage = derive2 { name="bwimage"; version="1.3"; sha256="1r5l7z90q2qs92dzp78jj4gf1kg1gc85g6y5rn2z8vxjbvbc5vma"; depends=[jpeg png]; }; bwsTools = derive2 { name="bwsTools"; version="1.1.0"; sha256="06gvw966p2qgkw1c2rdr5hiha47aclb398kjf8sgh5dcka9sv256"; depends=[crossdes dplyr ggplot2 igraph magrittr rlang tidyr]; }; - bysykkel = derive2 { name="bysykkel"; version="0.2.3"; sha256="1cbfmmmw7a37fwgwgfvc8yqxl4dh5n30qcnva9wsm903wccmb2cr"; depends=[glue httr jsonlite lubridate magrittr tibble]; }; + bysykkel = derive2 { name="bysykkel"; version="0.3.1"; sha256="1lvqbax7dvli4265856f9667ckp9g5l4radz2cp0yk0slsjgsdpg"; depends=[glue httr jsonlite lubridate tibble]; }; bytescircle = derive2 { name="bytescircle"; version="1.1"; sha256="0c83d37kijcvr00pc4qqdci14cpbg6988izyjfjk1yliavyc6mwf"; depends=[]; }; bzinb = derive2 { name="bzinb"; version="1.0.4"; sha256="1424lwsm2ra124h0ahbl42szbx500fqkf9ccw9k1688iwxnfg7f2"; depends=[BH Rcpp]; }; c060 = derive2 { name="c060"; version="0.2-5"; sha256="1862lic0vvidbd7s63j65iz4rf70d5337l80vvrbgv8d7fhnxz0y"; depends=[glmnet lattice mlegp penalizedSVM peperr survival tgp]; }; @@ -5836,14 +5853,14 @@ in with self; { 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.2.3"; sha256="0sjniyi36ri0yz2bbhc0f8kwghz3wqcp1hi7sf2fx0y6hg33z6xn"; depends=[data_table overlap secr sp]; }; + camtrapR = derive2 { name="camtrapR"; version="2.0.2"; sha256="1bmxcwidzn993qsbz8cq9b9z449yhqd01bjx8imxykl0qy1xbbcq"; depends=[data_table overlap secr sp]; }; cancensus = derive2 { name="cancensus"; version="0.2.1"; sha256="09ck076csz9srz660c1y2lmmvdjk2k14w1bmwizfl5vs3sb1k010"; depends=[digest dplyr httr jsonlite rlang]; }; cancerGI = derive2 { name="cancerGI"; version="1.0.0"; sha256="1chkcyf9m98gbn6b3vmb1baw7kii4g5vxvg2xfi7i6wwdn8sqr65"; depends=[igraph qvalue reshape2 survival systemfit]; }; cancerTiming = derive2 { name="cancerTiming"; version="3.1.8"; sha256="1sfi8q2f5ag7iak0sf9pmqncb89w3gnxdiwjwpivkwhr28ais4mq"; depends=[gplots LearnBayes]; }; - candisc = derive2 { name="candisc"; version="0.8-0"; sha256="0hq5bwvq791rhff2c29xdjbbkcyydii1lbsy05c1fapyn88ir0mi"; depends=[car heplots]; }; + candisc = derive2 { name="candisc"; version="0.8-3"; sha256="0bshi686sad31052glai1wmzxshvafp1vkar7zirds3x737gb0fp"; depends=[car heplots]; }; canprot = derive2 { name="canprot"; version="0.1.2"; sha256="0lc31vw49sc2zsrn52aqqljcc4n79j4i4845sr201ga67w07vrrb"; depends=[CHNOSZ xtable]; }; cansim = derive2 { name="cansim"; version="0.3.5"; sha256="0lqkyq2n8v2y172ihyb9vh3mimrkg2yx2c42cxdaz4p7gqiq7z8r"; depends=[dplyr httr jsonlite purrr readr rlang rvest stringr tibble xml2]; }; - canvasXpress = derive2 { name="canvasXpress"; version="1.27.6"; sha256="0dhfkxmdmk3172pvby6ksysypg5z26byg26ny7wfy7b81rdwhqxk"; depends=[htmlwidgets httr]; }; + canvasXpress = derive2 { name="canvasXpress"; version="1.27.6-1"; sha256="0vk2iddcyc81qgvlw3k31sh2hsjbxsrcb77mxay3s32wkqr7knwa"; depends=[htmlwidgets httr]; }; canvasXpress_data = derive2 { name="canvasXpress.data"; version="1.27.6"; sha256="0kh5g3incl5lv4pb8fd9nzvlvfvyfs3bms78hlf71z8kkag9hzn1"; depends=[]; }; cap = derive2 { name="cap"; version="1.0"; sha256="1pv8hskxjbp589dn7rx80yaa1ld76x1w37bss2fyrys1p3qr78aa"; depends=[MASS multigroup]; }; caper = derive2 { name="caper"; version="1.0.1"; sha256="0md0sngj7wsv2d4d7fmyyz9qqismk3ps9l3qk1blqz1yi19pq124"; depends=[ape MASS mvtnorm]; }; @@ -5874,19 +5891,19 @@ in with self; { carrier = derive2 { name="carrier"; version="0.1.0"; sha256="0bqnwnnjqjk9q0lxq6kkz9s75ss10lfyyywyyi24m8wppxpw1vqc"; depends=[pryr rlang]; }; cartograflow = derive2 { name="cartograflow"; version="1.0.0"; sha256="1sczhvkkrdhcn2phjpsvb86ik0bgyhbgcza7dz6d4qmpl8195bs9"; depends=[dplyr g_data ggplot2 maptools plotly reshape2 rgdal rgeos rlang sp]; }; cartogram = derive2 { name="cartogram"; version="0.2.0"; sha256="1b6jr6sf821xa2cbm09zmnvvai6azh7p9zhz78a4yqpiwdw122sc"; depends=[packcircles sf]; }; - cartography = derive2 { name="cartography"; version="2.4.0"; sha256="1kfzs6dg3kgcs8z08qb22w2ji8fn1g5b4jcii4s76vqmwhs9rdmr"; depends=[classInt curl png raster Rcpp rgeos sf slippymath sp]; }; + cartography = derive2 { name="cartography"; version="2.4.1"; sha256="0pb914zbqvii95mfsqkxs2y22fj620ry2hdqbkbvh5pdq5ls549v"; depends=[classInt curl png raster Rcpp rgeos sf slippymath sp]; }; cartools = derive2 { name="cartools"; version="0.1.0"; sha256="0gc5502373f0c2m2rh6awvyfqrg1wx1f341dm2byk9znba887lgs"; depends=[animation devtools dplyr gapminder ggplot2 knitr rlist rmarkdown roxygen2 sde shiny tidyverse usethis]; }; carx = derive2 { name="carx"; version="0.7.1"; sha256="1qyqsj6pfzzqyaj6076zvgcimhl4cll6sxfb6aigm02rwfkq5gvh"; depends=[matrixStats mvtnorm nlme tmvtnorm xts zoo]; }; caschrono = derive2 { name="caschrono"; version="2.1"; sha256="0p103r6v37c4li1j9x5mdflhx24zil8nhgpdvw5ijrvyixds0nn2"; depends=[Hmisc zoo]; }; cascsim = derive2 { name="cascsim"; version="0.4"; sha256="0n6frnbby1pjpx1z9lzxflmja2mg0dy99c5f7biakpaqi82x5xjb"; depends=[copula fitdistrplus moments R2HTML scatterplot3d]; }; caseMatch = derive2 { name="caseMatch"; version="1.0.8"; sha256="0bp2g0zzcspa6riinsa3bp1qwiip6z058hn2y5mw0w9xah8a685a"; depends=[]; }; casebase = derive2 { name="casebase"; version="0.1.0"; sha256="0216qzyxv44cl9f806lal9lx4n0zzr9csx8ggyjva04h5iiqrq6w"; depends=[data_table ggplot2 survival VGAM]; }; - casen = derive2 { name="casen"; version="0.1.3"; sha256="0yg02n379l38b0hyg7ra1x8bbbi3ai68gzd03ykqr8y5f3s9wbcf"; depends=[dplyr fs glue haven janitor labelled magrittr purrr Rcpp rlang srvyr survey tibble tidyr]; }; + casen = derive2 { name="casen"; version="0.1.4"; sha256="19f52vqrzqd8mmnaf39jmsm5mhydv74gpnb4rxr3n9w07ppb77c9"; depends=[dplyr glue haven janitor labelled magrittr purrr rlang srvyr survey tibble tidyr]; }; casino = derive2 { name="casino"; version="0.1.0"; sha256="07fphn46718gr1zm0xr43mwv7yk697xrc40lxxin315cf3gm0cka"; depends=[crayon dplyr ggplot2 magrittr purrr R6 tibble tidyr]; }; cassandRa = derive2 { name="cassandRa"; version="0.1.0"; sha256="0rwqzxbflxn1iyggm3mq6pkbl61mhk4vdwqwzlwrhrvvr2ib236r"; depends=[bipartite boot dplyr ggplot2 magrittr purrr reshape2 tidyr vegan]; }; - castor = derive2 { name="castor"; version="1.5.5"; sha256="1bsdyi905zafk8av0svw6ql0pg4ns1q7w810xx448k0hpq4v468l"; depends=[naturalsort nloptr Rcpp]; }; + castor = derive2 { name="castor"; version="1.5.7"; sha256="1pkwjpl7mcpn4b6cbpcznjhkblx8g5m1gfyyqjm95zkmjbnqrjj0"; depends=[naturalsort nloptr Rcpp]; }; cat = derive2 { name="cat"; version="0.0-6.5"; sha256="1gv7chqp6kccipkrxjwhsa7yizizsmk4pj8672rgjmpfcc64pqfm"; depends=[]; }; - cat_dt = derive2 { name="cat.dt"; version="0.1.0"; sha256="1rxq1kaw03c7m2jz4n6v5x4l9fiaqahdrvh9624zapf9mfhky0lm"; depends=[Matrix Rglpk]; }; + cat_dt = derive2 { name="cat.dt"; version="0.2.0"; sha256="1g9058gqkk2ij29aicvvqx9yx7iwh4a58akp6qznppfln4zw9wcb"; depends=[ggplot2 Matrix Rglpk]; }; catIrt = derive2 { name="catIrt"; version="0.5-0"; sha256="09010z1q96nbnpys6mybspaqy57lvgd2cvwgnfijzgx3kl87pwnl"; depends=[numDeriv]; }; catR = derive2 { name="catR"; version="3.16"; sha256="1w39dxfzqk065v64qzmfamx8p1njsv13a461s6clagbqmhysmzbx"; depends=[]; }; catSurv = derive2 { name="catSurv"; version="1.2.0"; sha256="0z91643grmzgd1qn867c7nk3v38vyy6h7q0k082r6hgnfbl6vx6c"; depends=[BH jsonlite ltm plyr Rcpp RcppArmadillo RcppGSL RcppParallel]; }; @@ -5956,7 +5973,7 @@ in with self; { ceg = derive2 { name="ceg"; version="0.1.0"; sha256="01la7kv0a3inc9vy5x010ysicfiv404bqfgs8csvqixviap9rd74"; depends=[graph Rgraphviz]; }; celestial = derive2 { name="celestial"; version="1.4.6"; sha256="1gls0qvr8mxz79lsmk76v253f747g0cqys8p8wjmpijs8r0pyr4z"; depends=[NISTunits pracma RANN]; }; cellVolumeDist = derive2 { name="cellVolumeDist"; version="1.3"; sha256="00hq3nbfbnmg2lhrqd0glkh5ld50fv54ll3q6v875d1lgs44sln1"; depends=[gplots minpack_lm]; }; - cellWise = derive2 { name="cellWise"; version="2.1.0"; sha256="1zwpgzwrmpr354bdvqdd5hxx7a39m1057ncqzrk2azki37byhdqg"; depends=[ggplot2 gridExtra matrixStats Rcpp RcppArmadillo reshape2 robustbase rrcov scales svd]; }; + cellWise = derive2 { name="cellWise"; version="2.1.1"; sha256="10cx5nmqcxx6prwkcpv7av10qcl4qygra9sdnbavbvwgvf46l28z"; depends=[ggplot2 gridExtra matrixStats Rcpp RcppArmadillo reshape2 robustbase rrcov scales svd]; }; cellranger = derive2 { name="cellranger"; version="1.1.0"; sha256="16fgi3annn34c3cxi0pxf62mmmmxi21hp0zzlv7bkfsjqy4g4f2x"; depends=[rematch tibble]; }; celltrackR = derive2 { name="celltrackR"; version="0.3.1"; sha256="1mnqaklc3rkx5mm41n99ky11bjs4l0dppapkwfvkyg3a0h0xzsbb"; depends=[ellipse]; }; cem = derive2 { name="cem"; version="1.1.19"; sha256="17i6jp6czjgchg16zndnh828hs8v28x25gy5f8mkzfhc5pfjd8mq"; depends=[combinat lattice MatchIt nlme randomForest]; }; @@ -5973,7 +5990,7 @@ in with self; { censys = derive2 { name="censys"; version="0.1.0"; sha256="0r0yvaidn0qn96hx461415hywsjfgaz9wvvdssx7w97v2ndnk9sy"; depends=[httr jsonlite purrr stringi]; }; centiserve = derive2 { name="centiserve"; version="1.0.0"; sha256="1m6gqz2rk7023340laa5pc0ncbfka2qi9ajvh65fwijd7xvv3n5c"; depends=[igraph Matrix]; }; centralplot = derive2 { name="centralplot"; version="0.1.0"; sha256="1slzvbm1vvgj1gkcx9pb46fz8q55vfyqrxsvx4qzi5kp7d9h4dy2"; depends=[ggplot2]; }; - centrifugeR = derive2 { name="centrifugeR"; version="0.1.3"; sha256="00sdyj7p2dawnp7nbpnpxqzavfr5gbvrbvvqkldm187iclw6bci8"; depends=[pracma]; }; + centrifugeR = derive2 { name="centrifugeR"; version="0.1.4"; sha256="1gky1j5glgigpj21hhm6mkc2xvvb9q8k3y1p4zn40r82lvggpnhz"; depends=[pracma]; }; cents = derive2 { name="cents"; version="0.1-41"; sha256="03ycbd0c8b7danbblaixg6sm7msr9ixkanqswczqa8n2frhjfgj0"; depends=[]; }; cepR = derive2 { name="cepR"; version="0.1.0"; sha256="1yqny6vgsjbrfxlk965pyk38n87ylf4513kbaljmgggrlyaz0qap"; depends=[dplyr httr magrittr purrr tibble]; }; cepp = derive2 { name="cepp"; version="1.7"; sha256="01hvm6586xnb1crvk7brqh3dm2j44ia5lrl5swnf6pb682yskbq0"; depends=[randtoolbox trust]; }; @@ -6067,7 +6084,7 @@ in with self; { cit = derive2 { name="cit"; version="2.2"; sha256="1lf8r3r4zwvs08vl4byhw6rvf54nb7vg83558pi0b5866m7in4sc"; depends=[]; }; citbcmst = derive2 { name="citbcmst"; version="1.0.4"; sha256="1zkd117h9nahwbg5z6byw2grg5n3l0kyvv2ifrkww7ar30a2yikl"; depends=[]; }; citccmst = derive2 { name="citccmst"; version="1.0.2"; sha256="1b7awn1hjckxisfdi4ck697hwd4a5sqklwi7xzh6kgqhk9pv7vjn"; depends=[]; }; - citecorp = derive2 { name="citecorp"; version="0.2.2"; sha256="1a5hw9xaa84n847rb8a317svhya1dpfbb79sabaw6m6db4nagm6z"; depends=[crul data_table fauxpas jsonlite]; }; + citecorp = derive2 { name="citecorp"; version="0.3.0"; sha256="0lqxa6qfysrk3rpg9fnsxhrfsd0qsbfxhc3b43090fhlxq9gk3wm"; depends=[crul data_table fauxpas jsonlite]; }; citr = derive2 { name="citr"; version="0.3.2"; sha256="1qbarvafjb8jgkrnrhh6jw7mcglmjwf7dpdiibxf39jkmlhf7las"; depends=[assertthat curl httr miniUI RefManageR rstudioapi shiny shinyjs yaml]; }; ciuupi = derive2 { name="ciuupi"; version="1.1.0"; sha256="0czfmmf62p1vml24s87pdwv52spqycchpkqzwk8vyd4n1z27r5s2"; depends=[functional nloptr pracma statmod]; }; civis = derive2 { name="civis"; version="2.1.2"; sha256="085cy1icqn78vimkjv2zdd5m1qf47qj9hl8vkpd29a948nkiv9xf"; depends=[future httr jsonlite memoise]; }; @@ -6081,7 +6098,7 @@ in with self; { clarkeTest = derive2 { name="clarkeTest"; version="0.1.0"; sha256="0vbb3j9rnh42qyp78a4jykp7p560d0ryfp28xgvxax8h8hr80457"; depends=[]; }; class = derive2 { name="class"; version="7.3-16"; sha256="1jpdgj0lsi60q0mqbhfw809w8d66whix27y6wpdzll6775g3j3ll"; depends=[MASS]; }; classGraph = derive2 { name="classGraph"; version="0.7-5"; sha256="19jb9jr1gfg4karymrbilh0zjrlsczhy2q03x5b0jxnh4ykhxfj8"; depends=[graph Rgraphviz]; }; - classInt = derive2 { name="classInt"; version="0.4-2"; sha256="0w980hrw8sgfdfyd5dsimalq7gwhvqm7507abk7k363pvgks23dv"; depends=[class e1071 KernSmooth]; }; + classInt = derive2 { name="classInt"; version="0.4-3"; sha256="1b1lqhpzxm6b8pza8l3s0cxy74mm9y45lcd3354i2v3bg8m7mply"; depends=[class e1071 KernSmooth]; }; classifierplots = derive2 { name="classifierplots"; version="1.3.3"; sha256="01rvn0jwliyxj7q4cmyv8an5g7fzn6y3sccp8mj6bcqjyblfcfaa"; depends=[caret data_table ggplot2 gridExtra png Rcpp ROCR]; }; classifly = derive2 { name="classifly"; version="0.4"; sha256="0mw1vcas0gr1r4yvh0j02zhk7kp5342r0bhhg776hqgqdczgh5zj"; depends=[class plyr]; }; classyfireR = derive2 { name="classyfireR"; version="0.3.3"; sha256="17h9xx5ap77ry50rbpl9gi1hbp1vahdwl99kkqsra79b8aixs2kj"; depends=[cli clisymbols crayon dplyr httr jsonlite magrittr purrr stringr tibble]; }; @@ -6097,7 +6114,7 @@ in with self; { cleanr = derive2 { name="cleanr"; version="1.3.0"; sha256="15icq6p2sxaz5jsdwqlqg7mgal4310vk96w53wzv3dzpzxndz7s4"; depends=[checkmate pkgload rprojroot]; }; clere = derive2 { name="clere"; version="1.2.0"; sha256="0qc26ycycxphrbksk7jb1m6vh66a2zsnw8k4jnazs23sqdg24im9"; depends=[Rcpp RcppEigen]; }; clespr = derive2 { name="clespr"; version="1.1.2"; sha256="1993kd70w48a110im47vcpll0c6nfrm7m33r6l8rzgwnpsmcls8g"; depends=[AER clordr doParallel foreach magic MASS pbivnorm survival]; }; - clhs = derive2 { name="clhs"; version="0.7-2"; sha256="093hqqbmwbrcggqjcz4yiaavvwpv6xi12nc50ca9sg5ajlg4xg65"; depends=[cluster ggplot2 plyr raster reshape2 scales sp]; }; + clhs = derive2 { name="clhs"; version="0.7-3"; sha256="19v617dayirbzb5w6mz79lsjinvr2jjlwdm61pd2pppk099fxgqr"; depends=[cluster ggplot2 plyr raster reshape2 scales sp]; }; cli = derive2 { name="cli"; version="2.0.2"; sha256="1dhkah6jvr96k4h4agcc2rfls75bpjb0j58fzaz3dc0fp3jk8229"; depends=[assertthat crayon fansi glue]; }; cliapp = derive2 { name="cliapp"; version="0.1.0"; sha256="152hllp4iiva2qib79700v1mx1biy8bg4sy496vwq6mi4afvswjy"; depends=[cli crayon fansi glue prettycode progress R6 selectr withr xml2]; }; clickR = derive2 { name="clickR"; version="0.4.47"; sha256="1fs0zh9djgvy8cicvab9i6dji85l1z8wlr6wpfypnwvnblc64qam"; depends=[beeswarm boot flextable lme4 lmerTest officer xtable]; }; @@ -6105,14 +6122,13 @@ in with self; { clifford = derive2 { name="clifford"; version="1.0-2"; sha256="17br7p4zj1cjf1nbwbk0a2jjxj589qgvlnzi6yp4dqlf2g0w01z6"; depends=[BH Rcpp]; }; clifro = derive2 { name="clifro"; version="3.2-2"; sha256="11bfvaf1b1wv83dw8ggj7ldsc6fs8s3gl7jdzyq7l1w7innihp9s"; depends=[ggplot2 lubridate magrittr RColorBrewer RCurl reshape2 scales xml2]; }; clikcorr = derive2 { name="clikcorr"; version="1.0"; sha256="0zdnbcl5q293mmm6pbn4ri7p1q6z6sff74axsb3nyd153v2xamr5"; depends=[mvtnorm]; }; - climate = derive2 { name="climate"; version="0.9.3"; sha256="00gkfwzbfbpyd27w0rygmr7z143mx4dki7rj2631bc63rwj9dbch"; depends=[RCurl XML]; }; + climate = derive2 { name="climate"; version="0.9.4"; sha256="1xbywpk6xls93ipvmpislyrpmzbybg09040gvqg7w5pklnb4bvnf"; depends=[RCurl XML]; }; climateStability = derive2 { name="climateStability"; version="0.1.3"; sha256="1zag722sznr22xid2v1k4a9sh3sr3grfa3wwd2m943zpvyi1sk9a"; depends=[raster]; }; climatol = derive2 { name="climatol"; version="3.1.2"; sha256="0p3nk4n7izj0cmmqd9apa1gix5lfdzp08ydy0n7rkl5kbkmrkb6n"; depends=[mapdata maps]; }; climatrends = derive2 { name="climatrends"; version="0.1.0"; sha256="1jn7xib07n6f9vq614cxahxph4mrs8xbv484npl0702klpk6fjqg"; depends=[nasapower tibble]; }; climdex_pcic = derive2 { name="climdex.pcic"; version="1.1-11"; sha256="01ax0kas43g3h21ixzc80f9gl4m9846gmk8v48rr0gkhcmbcc6jx"; depends=[PCICt Rcpp]; }; clime = derive2 { name="clime"; version="0.4.1"; sha256="0qs9i7cprxddg1cmxhnmcfhl7v7g1r519ff2zfipxbs59m5xk9sf"; depends=[lpSolve]; }; climextRemes = derive2 { name="climextRemes"; version="0.2.1"; sha256="1ii79zfdz90agirh3kbq80qk8nib9ks8f42f6y664j4pwk9550w3"; depends=[boot extRemes]; }; - climwin = derive2 { name="climwin"; version="1.2.2"; sha256="02kc8zvmygy9vbcx6lmxz2pyiz0sii3l35m869zr3a8hi9rx000x"; depends=[evd ggplot2 gridExtra lme4 lubridate Matrix MuMIn nlme numDeriv plyr RcppRoll reshape]; }; clinDR = derive2 { name="clinDR"; version="2.2.1"; sha256="02l0k2kl3g9nq072ljiw8dfrrxpsrk7kb5drxb830jy8jdvys3hv"; depends=[doParallel DoseFinding foreach ggplot2 rstan]; }; clinPK = derive2 { name="clinPK"; version="0.9.0"; sha256="1n1m8szd8mxdshwz8l3hfdxi7zrmsah46kxkv7jiffwnfhijfhsm"; depends=[curl testit]; }; clinUtiDNA = derive2 { name="clinUtiDNA"; version="1.0"; sha256="0x3hb09073gkh60fc8ia0sfk948sm6z6j8sqkz275k4m8ryrabas"; depends=[]; }; @@ -6129,7 +6145,7 @@ in with self; { clpAPI = derive2 { name="clpAPI"; version="1.2.13"; sha256="1v1ff7plr9x212cfsva9xp80q7x3vgkgmwj8qj0cch36p5p4973h"; depends=[]; }; clr = derive2 { name="clr"; version="0.1.2"; sha256="088ks9lrhlyvg3yvlfmb0091yp6qp5bzg9h5r6ryv3bk6y56sajx"; depends=[dplyr lubridate magrittr]; }; clttools = derive2 { name="clttools"; version="1.3"; sha256="0va9k1b4xsb2sgpxzvid6sa8m6b8i3r4kgghclmb78nnrs480cwi"; depends=[]; }; - clubSandwich = derive2 { name="clubSandwich"; version="0.4.1"; sha256="0m0akad9fs1nzwgz1b2kd9ndf40vr780fha32k1i9m3p6cynn9n8"; depends=[sandwich]; }; + clubSandwich = derive2 { name="clubSandwich"; version="0.4.2"; sha256="0zmy42n0j0li3kzkbpwxhv6walvd5cffx1ra3p4ksxxk8fjdlf61"; depends=[sandwich]; }; clue = derive2 { name="clue"; version="0.3-57"; sha256="05rdcahawxlxci3fjxihjvvh33wqpxw50sx015165ab4nh3rsdkf"; depends=[cluster]; }; clues = derive2 { name="clues"; version="0.6.2.2"; sha256="1pvalkpvxjj6qrvffbx0sqvfmcxf6dkzrpklshkx1b2k5s4z8791"; depends=[]; }; cluscov = derive2 { name="cluscov"; version="1.1.0"; sha256="0345v5r6b53243h5bir29v0w77pmwjqjkqfrjnk5j5r1wbh98q1w"; depends=[MASS quantreg]; }; @@ -6138,7 +6154,7 @@ in with self; { 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.2-2"; sha256="143xq457migvdfylgyfs19arlmzc9gy360sva49fi56jaz6xqhvr"; depends=[RColorBrewer]; }; + clustMixType = derive2 { name="clustMixType"; version="0.2-5"; sha256="0i3n8w2lsaiak7nz5ypnwnjkr5qq0slklcdpykmaikfmzahihvla"; depends=[RColorBrewer]; }; clustcurv = derive2 { name="clustcurv"; version="2.0.0"; sha256="1zjyf81ifd2sgkgs548iy1awjhjmb541rrrw2pb92cn8ph7z7nc1"; depends=[data_table doParallel doRNG foreach ggfortify ggplot2 Gmedian KernSmooth npregfast RColorBrewer survival tidyr wesanderson]; }; cluster = derive2 { name="cluster"; version="2.1.0"; sha256="055af3yz2biqbsbwm4arwr1yqnj4gicpzv2i6dbfl5pnz2z5byga"; depends=[]; }; cluster_datasets = derive2 { name="cluster.datasets"; version="1.0-1"; sha256="0i68s9305q08fhynpq24qnlw03gg4hbk4184z3q3ycbi8njpr4il"; depends=[]; }; @@ -6154,7 +6170,6 @@ in with self; { 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.8"; sha256="10z5p79a7nafnljl3s17mw22zasxp45nfbxmhilmyfq6kblxj1zm"; depends=[ggplot2 reshape]; }; clustermole = derive2 { name="clustermole"; version="1.0.1"; sha256="15d7khwg4rjshbkkcqrmw9dk8wy683z8ix5n6xdrlvp0rq3l3n2c"; depends=[dplyr GSVA magrittr rlang tibble tidyr]; }; clustermq = derive2 { name="clustermq"; version="0.8.9"; sha256="128b71h9vxai3j7bbbkx9pm5mabpxdad5qwgxrc8a6sws790yn4b"; depends=[narray progress purrr R6 rzmq]; }; clusternomics = derive2 { name="clusternomics"; version="0.1.1"; sha256="05nkw6h2dvky07fj50myzw5xlkqyiflbn4vwqw8a1q2idv4awi7b"; depends=[magrittr MASS plyr]; }; @@ -6185,13 +6200,13 @@ in with self; { cnbdistr = derive2 { name="cnbdistr"; version="1.0.1"; sha256="05qi41jimslbngjgbwzfda0q25hb28ax79v9yckvrbpgjc8dk990"; depends=[hypergeo]; }; cncaGUI = derive2 { name="cncaGUI"; version="1.0"; sha256="1v55kvrc05bsm1qdyfw3r3h64wlv3s6clxbr8k512lfk99ry42kn"; depends=[MASS plotrix rgl shapes tcltk2 tkrplot]; }; cnmlcd = derive2 { name="cnmlcd"; version="1.2-0"; sha256="1vpn926wf8vkifscnb35y4c74721iar2wykrl50fcv0fg16yggnd"; depends=[lsei]; }; - cnum = derive2 { name="cnum"; version="0.1.0"; sha256="0hiinaa5sp5fvklgdwb3wb58cr7sczd87i4jmp23jm2nx5f4hjs6"; depends=[stringr]; }; + cnum = derive2 { name="cnum"; version="0.1.1"; sha256="03dl8s10jrkj70p4rdxj1d06n2silhfhc0w3jphzll7zx1p8w0pa"; depends=[stringr]; }; coRanking = derive2 { name="coRanking"; version="0.2.1"; sha256="10489vbd917mzz5lw7ygi6q8q5qa7sp5d8xgv1ykn4lfx0avch69"; depends=[]; }; coala = derive2 { name="coala"; version="0.6.0"; sha256="0h7kc12yc90y5i733l6sfd9h12h0a2c7wv9wscjslj18sl3w3ccv"; depends=[assertthat digest R6 Rcpp RcppArmadillo rehh scrm]; }; coalescentMCMC = derive2 { name="coalescentMCMC"; version="0.4-1"; sha256="0xxv1sw5byf84wdypg5sfazrmj75h4xpv7wh4x5cr9k0vgf80b3s"; depends=[ape coda lattice Matrix phangorn]; }; coalitions = derive2 { name="coalitions"; version="0.6.12"; sha256="11844sz65axj23xwv505jxck37xv3a5n36jpdr9ywvmb19gshar7"; depends=[checkmate dplyr ggplot2 gtools jsonlite lubridate magrittr purrr RCurl rlang rvest stringr tidyr xml2]; }; coarseDataTools = derive2 { name="coarseDataTools"; version="0.6-5"; sha256="1k42vl49kfbllc5d66yn7y9f4jgbkfibmd85nl7hwm0gkgkssg36"; depends=[MCMCpack]; }; - cobalt = derive2 { name="cobalt"; version="4.0.0"; sha256="14g5a0j3lcd61igsi2phhfpcfxwgiq7jlakr9nr4yb5h345zwvx7"; depends=[backports crayon ggplot2 ggstance gridExtra gtable]; }; + cobalt = derive2 { name="cobalt"; version="4.1.0"; sha256="1qpvkxbiw6i3q2kp9hvhxjkz9hyffbdgqzaqf71233nrbimqbg2w"; depends=[backports crayon ggplot2 gridExtra gtable]; }; cobiclust = derive2 { name="cobiclust"; version="0.1.0"; sha256="068cqrhx7lxsvcjb62rgrca7y20cybz4445bl1qc6k16ca4bh0m9"; depends=[cluster]; }; cobs = derive2 { name="cobs"; version="1.3-4"; sha256="0hiw5smk6kgk0gb9840kcqkhkybl7n30s77xhjc395x09izbgix1"; depends=[quantreg SparseM]; }; coca = derive2 { name="coca"; version="1.0.4"; sha256="1mk6vhy3s243rn4bwfr72900x0fcfs729k179kc81zvjj3v7m0h9"; depends=[caret cluster fpc glmnet Matrix nnet pheatmap RColorBrewer]; }; @@ -6201,7 +6216,7 @@ in with self; { cocorresp = derive2 { name="cocorresp"; version="0.4-1"; sha256="10prxmc80yk0l5v1gcy92clmjvjywimypqpzjb6gh5pipsqr4swr"; depends=[vegan]; }; cocron = derive2 { name="cocron"; version="1.0-1"; sha256="0dl14y9v9kndy5gzhhbhq3f31ja724y1hra40givy6bij7h2cj30"; depends=[]; }; coda = derive2 { name="coda"; version="0.19-3"; sha256="1mn50bshky968gn4nf6vnkaa768fnvm1xmhkms7szwdw9341zpyk"; depends=[lattice]; }; - coda_base = derive2 { name="coda.base"; version="0.2.1"; sha256="1ammzzh4w8g5d6c1wfqg7pglrc5lq8sr3qzgf1bjsrm9p5ysw1li"; depends=[MASS Rcpp RcppArmadillo]; }; + coda_base = derive2 { name="coda.base"; version="0.2.2"; sha256="166j7bf7gm28176ajm9gyl56ncwhlxrjizbp3ah6ssp7a72x2xyi"; depends=[Rcpp RcppArmadillo]; }; codadiags = derive2 { name="codadiags"; version="1.0"; sha256="1x243pn6qnkjyxs31h1hxy8x852r0fc952ww77g40qnrk8qw79xg"; depends=[coda]; }; codebook = derive2 { name="codebook"; version="0.8.2"; sha256="1glzrvffhrgya6617m8zgbf2r8v1y1wpml11ayanz4s4k2xzzlmc"; depends=[dplyr DT forcats future ggplot2 glue haven htmltools jsonlite knitr labeling labelled likert lubridate miniUI pander psych purrr rio rlang rmarkdown rstudioapi shiny skimr stringr tibble tidyr tidyselect userfriendlyscience]; }; codemetar = derive2 { name="codemetar"; version="0.1.8"; sha256="1zqpxh0hx7jh1xki1sx9bs5a30hv4gfaqqlnd630a5n68hghjmg2"; depends=[commonmark crul curl desc gh git2r glue jsonlite magrittr memoise pingr pkgbuild purrr readr sessioninfo stringi stringr tibble usethis whisker xml2]; }; @@ -6209,8 +6224,7 @@ in with self; { 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]; }; codingMatrices = derive2 { name="codingMatrices"; version="0.3.2"; sha256="0kldx2h3mksw4644d0ask6ij7i63rrwk0njlsvkbdjz3bf7pdv1b"; depends=[fractional Matrix]; }; - codyn = derive2 { name="codyn"; version="2.0.3"; sha256="1jmnkipalxfy8dwgskrx3npcmb717bpvkpx97md44xhh8l7mmk2s"; depends=[assertthat permute vegan]; }; - coefficientalpha = derive2 { name="coefficientalpha"; version="0.5"; sha256="0pfw64z7f0gp415nn7519rcw829a7wnwnjx94sc55jsvgb1di3kc"; depends=[lavaan rsem]; }; + coefficientalpha = derive2 { name="coefficientalpha"; version="0.7"; sha256="0li1js501sa8m0ba76ymn4lz5y4np7kf96gnxz9kypg50kd58yis"; depends=[lavaan rsem]; }; coefplot = derive2 { name="coefplot"; version="1.2.6"; sha256="036njf2xwmjvyamanb7nfn2n09ps2rdgk3zrxn6khwp8ly245nps"; depends=[dplyr dygraphs ggplot2 magrittr plyr purrr reshape2 tibble useful]; }; coenocliner = derive2 { name="coenocliner"; version="0.2-2"; sha256="0r4h0r3av2d1cxmjpwaabjn807626pzqnra2x542wdnnf7h8nmdf"; depends=[]; }; coenoflex = derive2 { name="coenoflex"; version="2.2-0"; sha256="06f75spl4wkbgicm0bksnid2lb1gkvi05915wn5y4km45d82fkkr"; depends=[mgcv]; }; @@ -6219,7 +6233,7 @@ in with self; { cofeatureR = derive2 { name="cofeatureR"; version="1.1.1"; sha256="1awfrlnbpw9ivfvaahznx6dx5jp8ln0154vh2pznp520q59h1mbs"; depends=[dplyr ggplot2 lazyeval tibble]; }; coga = derive2 { name="coga"; version="1.1.0"; sha256="0p2mdia89gj7w0j33qxil1l2zg6civj18i3pqym7aijzz1fgwnzp"; depends=[cubature Rcpp RcppGSL]; }; cogmapr = derive2 { name="cogmapr"; version="0.9.1"; sha256="1iz776avw05a0lcna78fycixacby4bjf8ar1jazsf34yss6zka23"; depends=[car dplyr ggplot2 graph magrittr Rgraphviz tidyr]; }; - cognitoR = derive2 { name="cognitoR"; version="1.0.0"; sha256="0nyfsfnmwx3a19imr3r49c4ga6gb13x2w5czn1n0qy0qsp5881w0"; depends=[base64enc config dplyr httr jsonlite shiny shinyjs yaml]; }; + cognitoR = derive2 { name="cognitoR"; version="1.0.1"; sha256="1qd3hsblciqnjysx3hqdkwmzpl2zf72jiwywicjpbpv1i703c4wx"; depends=[base64enc config dplyr httr jsonlite shiny shinyjs yaml]; }; cohorttools = derive2 { name="cohorttools"; version="0.1.2"; sha256="0hfpl2dm5ykagwmmdmk0hpbkzzd0zqmf9andm510safjp4mlbcy0"; depends=[cmprsk DiagrammeR DiagrammeRsvg Epi ggplot2 rsvg survival]; }; coil = derive2 { name="coil"; version="1.2.1"; sha256="0s11v1hcksljpxnlkmrlnnamx4mlsck45hsjm4xlhc1zb7x9kqf5"; depends=[ape aphid seqinr]; }; coin = derive2 { name="coin"; version="1.3-1"; sha256="0qi03fyqw42a2vnqcia5l2m1mzyarj2q1iblknx9n19bdsd53qjx"; depends=[libcoin matrixStats modeltools multcomp mvtnorm survival]; }; @@ -6234,13 +6248,12 @@ 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.2.5"; sha256="195i6kxy3h0q99jr5hi20m15zpk8fgb17126w7qyxfq7mhrsvhmh"; depends=[xptr]; }; + collections = derive2 { name="collections"; version="0.3.0"; sha256="01mgkfl849gy0xzs3ccbkg4pmpzs6f1n953izrcf5797qg8xqkr5"; depends=[]; }; collector = derive2 { name="collector"; version="0.1.3"; sha256="1yn6gzccdbp7n4qnwqpv66617qldjabzrlww41v6wqn9b7qyr0ii"; depends=[dplyr EnvStats evaluator flextable ggplot2 ggpubr magrittr officer purrr quanteda readr rlang rmarkdown stringr tibble tidyr xaringan]; }; collidr = derive2 { name="collidr"; version="0.1.2"; sha256="1b8yy0p1r4gs6azcl1aqkny3hws5hhl9bvsrkrhgk2r2xni9sk6f"; depends=[dplyr jsonlite stringr]; }; collpcm = derive2 { name="collpcm"; version="1.1"; sha256="14rlipdww5sm1ijp2ggpnd23m14qh10zm99cfq1w0kky9jfl0fkn"; depends=[latentnet network vegan]; }; colmozzie = derive2 { name="colmozzie"; version="1.1.1"; sha256="0sn7dqg7rnddnmdb10c6scws6kgi1lz4lw8nc698x63z431ah1p8"; depends=[]; }; coloc = derive2 { name="coloc"; version="3.2-1"; sha256="0sm2mji8bihvcshkh9g18sgbwznhh8j4hip50rk7ckac3vc8y75h"; depends=[BMA data_table ggplot2 reshape snpStats]; }; - colocalization = derive2 { name="colocalization"; version="1.0.1"; sha256="0ax560r5f629zv8rfa91ynx8g3kcn5ga553k5svircl21n65zb1y"; depends=[ggplot2]; }; colocalized = derive2 { name="colocalized"; version="0.2.0"; sha256="1q98wfqk0p9p92jgjf8liamz6grzwy6h57k7681fm07wfnyr268g"; depends=[doParallel foreach purrr]; }; colorBlindness = derive2 { name="colorBlindness"; version="0.1.6"; sha256="18922caddz7c5dj5mbyl7qihgsnk384w31k17rwngm5hckz2d5yi"; depends=[colorspace cowplot ggplot2 gridGraphics gtable]; }; colorRamps = derive2 { name="colorRamps"; version="2.3"; sha256="0shbjh83x1axv4drm5r3dwgbyv70idih8z4wlzjs4hiac2qfl41z"; depends=[]; }; @@ -6270,6 +6283,7 @@ in with self; { combiter = derive2 { name="combiter"; version="1.0.3"; sha256="11pcvrpbvkzkjwks2z6ww7s9d5fkh8zl0jw52a5ya3y1wkqcs3n6"; depends=[iterators itertools Rcpp]; }; comclim = derive2 { name="comclim"; version="0.9.5"; sha256="1s6zh16j0q2n7gkvhd4bym9w3hyg4b9n5lpgspqp2nlygdl6jxxb"; depends=[]; }; cometExactTest = derive2 { name="cometExactTest"; version="0.1.5"; sha256="0ar9axm9cd1wd937xcmsmd7xqilnfyab8gsrpkiqpc3fjh86qyrp"; depends=[dplyr]; }; + cometr = derive2 { name="cometr"; version="0.1"; sha256="00ikz2096bq8fh2sy15bgnwq0b1rbjj49yc0xs9v3xsr6ghsjkph"; depends=[callr httr jsonlite R_utils R6 yaml]; }; comf = derive2 { name="comf"; version="0.1.9"; sha256="0n9893nli8rf9g5c9yyqrhbk3xsbvynv1vlpn03i5xs05aj3r88h"; depends=[plyr reshape]; }; commandr = derive2 { name="commandr"; version="1.0.1"; sha256="1d6cha5wc1nx6jm8jscl7kgvn33xv0yxwjf6h3ar3dfbvi4pp5fk"; depends=[]; }; commentr = derive2 { name="commentr"; version="1.0.4"; sha256="0anlcbk8rj0yr8i23qmr6v5ws0695nkc3mvgr6pnq1fg2d4c4brj"; depends=[stringr]; }; @@ -6294,10 +6308,9 @@ in with self; { complexity = derive2 { name="complexity"; version="1.1.1"; sha256="1lpsvry88jpqfw0wkdlwjzkqjl17f4adjcqvq0dwk483mi54xnfk"; depends=[combinat shiny]; }; complexplus = derive2 { name="complexplus"; version="2.1"; sha256="16w9v7d1ckavqmr86l34frr37pkvdn0iqnb17ssb8xaggns5lgqx"; depends=[expm Matrix]; }; complmrob = derive2 { name="complmrob"; version="0.7.0"; sha256="0dvkc5y53041agkjz3rl898hkq686pxzr6flf2qx1g3jbza3pk1y"; depends=[boot ggplot2 robustbase scales]; }; - compositions = derive2 { name="compositions"; version="1.40-4"; sha256="0z40llyij3cc80ac1vzzrpykk6ysp89bn6dyyh40fbnc4anwx69a"; depends=[bayesm robustbase tensorA]; }; + compositions = derive2 { name="compositions"; version="1.40-5"; sha256="0l9ayz2nb2wqhl7v9hkfl7pd950ba0h6hma8zqncbcxh6xh2k7l7"; depends=[bayesm robustbase tensorA]; }; compound_Cox = derive2 { name="compound.Cox"; version="3.19"; sha256="1wl8jg916567nk0wy37in6syh7z2rw70v5jm7s0w3ifiqs5v7nzb"; depends=[numDeriv survival]; }; comprehenr = derive2 { name="comprehenr"; version="0.6.7"; sha256="0c0wid4lch7yrz41b8n773hy4zj80sfb1lhy4pclvlsjdr5zryk6"; depends=[]; }; - compstatr = derive2 { name="compstatr"; version="0.2.0"; sha256="07kak4dc1q44m58wb7ps4bf5ikcnjfkvd7fn1mxfxvqljrdy6978"; depends=[dplyr fs httr janitor lubridate purrr readr rlang rvest sf stringr tibble tidyr xml2]; }; compute_es = derive2 { name="compute.es"; version="0.2-5"; sha256="00133s3l3g70xrfnxgxhvbjr8izvaj9h0c73iaiyjmlgj84x69m8"; depends=[]; }; 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=[]; }; @@ -6306,9 +6319,9 @@ in with self; { concaveman = derive2 { name="concaveman"; version="1.0.0"; sha256="0b6a37h4k3p879gp4qp3297q0fzq3yn79yhkwjrcxhcl86sg5nb6"; depends=[dplyr jsonlite magrittr sf V8]; }; conclust = derive2 { name="conclust"; version="1.1"; sha256="1k9y1mniy7s51dmm5ia693k72s2vxk5bznxxf74s7mx9n3mg2i8r"; depends=[]; }; concor = derive2 { name="concor"; version="1.0-0.1"; sha256="0hjyvi6p16cyrmq0bq7fph1r5f3adp7zpf123wkm5bkjnc5122k0"; depends=[]; }; - concordance = derive2 { name="concordance"; version="1.6"; sha256="0pb4mndrh1nimf59ajjcydlvc79nm6p7c219iymkn0b1hbrnx7lf"; depends=[]; }; + concordance = derive2 { name="concordance"; version="2.0.0"; sha256="1xlm0c91bsbij8dr23fh781c6bg8l74kma6x7nnapkpm7jim279x"; depends=[dplyr purrr rlang stringr tibble tidyr]; }; concreg = derive2 { name="concreg"; version="0.6"; sha256="1ncs9cpviv5kd49hahlhi7wn2yk70msi22qv8fw91hf81ccimlp2"; depends=[survival]; }; - concurve = derive2 { name="concurve"; version="2.3.0"; sha256="1bjdlr3hpnv69g5jg2y18zkly0al3g9qj8cq0dlpk7x6930imqx7"; depends=[bcaboot boot dplyr flextable ggplot2 knitr MASS metafor officer pbmcapply ProfileLikelihood rlang scales survival survminer tibble tidyr]; }; + concurve = derive2 { name="concurve"; version="2.5.0"; sha256="1zmm3y1abm6gjvl9vjmsi2rn2vxgy4qp9crmlrhx3yzij58m15sq"; depends=[bcaboot boot cowplot dplyr flextable ggplot2 knitr lme4 MASS metafor officer patchwork pbmcapply ProfileLikelihood scales survival survminer tibble tidyr]; }; cond = derive2 { name="cond"; version="1.2-3.1"; sha256="1j0gf28mg2j6ahs83nk662bix1lb2c9184vn8sblw433zxqaa2ny"; depends=[statmod survival]; }; condGEE = derive2 { name="condGEE"; version="0.1-4"; sha256="0mqj2pc91n8h3arpd4b9f7ndbcnai21c67is22qg22wj7vhhs87h"; depends=[numDeriv rootSolve]; }; condMVNorm = derive2 { name="condMVNorm"; version="2020.1"; sha256="115pxnff2ckdxx0avbs0hfdhh1sljiz1y6h7ggd5hidrxd3559m4"; depends=[mvtnorm]; }; @@ -6329,7 +6342,7 @@ in with self; { 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.4"; sha256="0xp04cdvmp3b1phazhmjqn0vmax1b2218xsb5854ffv43m7qvrra"; depends=[memoise rlang]; }; - conflr = derive2 { name="conflr"; version="0.1.0"; sha256="1ppmg3n0r5wlnhw60lkbbfdakq3q79zf2vsnzh0wjmdb34w3p535"; depends=[askpass commonmark curl glue httr knitr miniUI purrr R6 rlang rmarkdown rstudioapi shiny stringi xml2]; }; + conflr = derive2 { name="conflr"; version="0.1.1"; sha256="1bjdmvi0n8746g7dxwgzh3fi33sq4bgfr0nd3nqd2caj8ryi2gv9"; depends=[askpass commonmark curl glue httr knitr miniUI purrr R6 rlang rmarkdown rstudioapi shiny stringi xml2]; }; conformalClassification = derive2 { name="conformalClassification"; version="1.0.0"; sha256="03v6xbgipb97byarqj0d38z9yb2g54mkkw343jxmi2j058z26yw7"; depends=[doParallel foreach mlbench randomForest]; }; confoundr = derive2 { name="confoundr"; version="1.2"; sha256="000vf828qv04pplx8yc8q3mafxf4g0axip6z5zbsj2581yxv9jjh"; depends=[dplyr ggplot2 gridExtra magrittr purrr rlang Rmpfr scales stringr tidyr]; }; confreq = derive2 { name="confreq"; version="1.5.5-0"; sha256="1aww0i9mh08y05941di40f9jagy7s48rw0cs7w55gsyffl5yy1ir"; depends=[gmp]; }; @@ -6340,11 +6353,12 @@ in with self; { conjurer = derive2 { name="conjurer"; version="1.1.1"; sha256="0rxbmr2s270sy7rbyb876sidbcjzv0g99s1n0w6pd6aymmf0715c"; depends=[]; }; connections = derive2 { name="connections"; version="0.1.1"; sha256="08fbyzyp26nh1a46p0zi3q0wzgl0cd9bjp4lhw2bwv1bv7yayamp"; depends=[DBI dbplyr dplyr pins rscontract uuid]; }; conover_test = derive2 { name="conover.test"; version="1.1.5"; sha256="0f1p10klidk1xic1wd48j9rjh2fb3z6pfjx4y021lglx1w3av68k"; depends=[]; }; + conquer = derive2 { name="conquer"; version="1.0.0"; sha256="0yqk3hl0rgb71zywc8lvvdrhmzh7aij6gqk83pf3ywd69va0mq38"; depends=[matrixStats Rcpp RcppArmadillo]; }; conquestr = derive2 { name="conquestr"; version="0.5.1"; sha256="1ha2jxh4xi39w4cznbdbbdhq5s5csmbf4p4j7blr80g72b46jvcp"; depends=[Rcpp reshape]; }; constants = derive2 { name="constants"; version="0.0.2"; sha256="1j9d52riwx7v1ppfdw0x517j7xh92qgskd4mj5yk9qa233brcwyy"; depends=[]; }; constellation = derive2 { name="constellation"; version="0.2.0"; sha256="1d49rnyf2z3bvx158nsmgmb0x7xcgxl9f8y98pwg5wlqck7af99q"; depends=[data_table]; }; constrainedKriging = derive2 { name="constrainedKriging"; version="0.2.4"; sha256="1a91s0b7yka37fb5pm172fmlqrhm6da370cqb9knvkg5n8vi4hys"; depends=[RandomFields rgeos sp spatialCovariance]; }; - contact = derive2 { name="contact"; version="1.2.1"; sha256="1xh6m6qsz4lhjy2mhzygxwjxp5d94y3sp6sfnhdp395y56zxp211"; depends=[ape data_table doParallel foreach geosphere igraph lubridate raster rgdal rgeos sf sp]; }; + contact = derive2 { name="contact"; version="1.2.2"; sha256="0pxjz6wra5kb2z5xahsdlnfhbiybr2dmp818vfvbrb0sp9ca4wkc"; depends=[ape data_table doParallel foreach geosphere igraph lubridate raster rgdal rgeos sf sp]; }; container = derive2 { name="container"; version="0.3.0"; sha256="128fj97mx52kap299fmhn3whnaismsd4cq3zqpbfvwxx2ii4fd33"; depends=[R6]; }; contextual = derive2 { name="contextual"; version="0.9.8.3"; sha256="0mpbbg13ba5lwsh6rcy5g8vbfycv3182bqkgw66rn3r8fvkmy516"; depends=[data_table doParallel foreach Formula iterators itertools R_devices R6 rjson]; }; contfrac = derive2 { name="contfrac"; version="1.1-12"; sha256="0sq5c7ny235yrkv2xc4insgxby6rvzc1qsj8h301cd2if3lwbgwm"; depends=[]; }; @@ -6354,7 +6368,7 @@ in with self; { contribution = derive2 { name="contribution"; version="0.1.0"; sha256="06y6qa7c0zifg6fqfpwry4z367ckiyk9v09n8cqc6q98c3ddkwj3"; depends=[dplyr ggplot2 gh magrittr rlang tidyr]; }; control = derive2 { name="control"; version="0.2.5"; sha256="02s8h5kwpzfrivx3ign84gwlybkcs03ibawyxdny9zz5yhb7x3bs"; depends=[expm Matrix pracma signal]; }; controlTest = derive2 { name="controlTest"; version="1.1.0"; sha256="19r8nvi35ldzgayifskjj706fv76hv6sj68yvggybp27rgyqbjfl"; depends=[survival]; }; - convergEU = derive2 { name="convergEU"; version="0.4.1"; sha256="0ycp26h54acvhzivkp5065h3bmd6jg6v5giqjashj9lzpr8ixihc"; depends=[broom caTools devtools dplyr eurostat formattable ggplot2 ggpubr gridExtra kableExtra knitr magrittr purrr readr readxl rlang rmarkdown stringr tibble tidyr tidyverse]; }; + convergEU = derive2 { name="convergEU"; version="0.4.2"; sha256="1zdfhfzpgpjx24gzz9cn98nbn42c7r5iq2fr6bwpn1lniw3hgx27"; depends=[broom caTools devtools dplyr eurostat formattable ggplot2 ggpubr gridExtra kableExtra knitr magrittr purrr readr readxl rlang rmarkdown stringr tibble tidyr tidyverse]; }; convertGraph = derive2 { name="convertGraph"; version="0.1"; sha256="1jsrygj6ydzc0nzyzaq95j4blqavj7dqz182vgm1ckv8an3if0jx"; depends=[]; }; convertr = derive2 { name="convertr"; version="0.1"; sha256="1y9aq5in2qv1323amblmq3g22flpqvpkgkrw12kahg56mqf2b3iq"; depends=[DT miniUI rstudioapi shiny]; }; convevol = derive2 { name="convevol"; version="1.3"; sha256="1b0lygbrdm6rqascck5iwjnm248lklc4cxr71qlgand5jsblpcnn"; depends=[ape cluster geiger MASS phytools]; }; @@ -6369,6 +6383,7 @@ in with self; { copBasic = derive2 { name="copBasic"; version="2.1.5"; sha256="0p7ngjpfhl4mjrcjmadik2ly5zzyjfafywjmaxza7frgrj6bflf4"; depends=[lmomco randtoolbox]; }; copCAR = derive2 { name="copCAR"; version="2.0-2"; sha256="032gphv64v2mmy63q86qgpa31i36ix6fkjsdxmzgqyxcyzgb0jcy"; depends=[mcmcse numDeriv Rcpp RcppArmadillo spam]; }; cope = derive2 { name="cope"; version="0.2.3"; sha256="1r02nb6wy25ixhdcbqqz167s7ny3hydpxfxry5ar4136qvcamgyy"; depends=[abind fields maps MASS Matrix mvtnorm nlme]; }; + copent = derive2 { name="copent"; version="0.1"; sha256="100mkig645gis01w7cbr1hyn7kmiwi5avmwknymimchqwyf026m6"; depends=[]; }; coppeCosenzaR = derive2 { name="coppeCosenzaR"; version="0.1.3"; sha256="1chwsfyaf5rmlsypr43n7px8b2220dfa5mzcriq1swylgbx4181l"; depends=[]; }; coprimary = derive2 { name="coprimary"; version="1.0"; sha256="0pjln9p5lzv6wl5xrz0kb90hnjlnp7ch2kvh054nxdbmlxv5akc3"; depends=[digest gsDesign plyr proto]; }; cops = derive2 { name="cops"; version="1.0-2"; sha256="0ifp3cai490lw6dnyyjj4822x8g2mswhaamnw5ljwnxdbmjwhhrw"; depends=[cmaes cordillera crs dfoptim GenSA MASS minqa NlcOptim nloptr pso rgenoud rgl Rsolnp scatterplot3d smacof subplex]; }; @@ -6393,14 +6408,14 @@ in with self; { corpcor = derive2 { name="corpcor"; version="1.6.9"; sha256="1hi3i9d3841snppq1ks5pd8cliq1b4rm4dpsczmfqvwksg8snkrf"; depends=[]; }; corpora = derive2 { name="corpora"; version="0.5"; sha256="0b4yw37msx9h8hf5mjs4h10gdmc1qc2gv5bzyj1r90n4gcli042d"; depends=[]; }; corporaexplorer = derive2 { name="corporaexplorer"; version="0.8.2"; sha256="14l64mcqfa2ayyl6d48s9fc2qh485wk02s23cy4nssn7sg1b3a5z"; depends=[data_table dplyr ggplot2 lubridate magrittr padr plyr RColorBrewer rlang rmarkdown scales shiny shinydashboard shinyjs shinyWidgets stringi stringr tibble tidyr]; }; - corpus = derive2 { name="corpus"; version="0.10.0"; sha256="0c984rsnbai2qrm2s10lkdfgx31m0ax46zhl74bns2bxfmagcn3l"; depends=[utf8]; }; + corpus = derive2 { name="corpus"; version="0.10.1"; sha256="1mcjn6jsrvyxwcf8kx86fy7z0zsarvq6ccja3r27v7b8fjrb8mng"; depends=[utf8]; }; corpustools = derive2 { name="corpustools"; version="0.4.2"; sha256="00v61i4c43s69mchy5zkbxgvxjx8kqlzm2vcb7snjblmd84w4id5"; depends=[data_table digest igraph Matrix quanteda R6 Rcpp RcppProgress RNewsflow SnowballC stringi tokenbrowser udpipe wordcloud]; }; corr2D = derive2 { name="corr2D"; version="1.0.0"; sha256="12k6vbqyb33kfj2xdg8rbydnp2yk15kv4b0m4lid4gf2lqmy3jwz"; depends=[colorspace doParallel fields foreach mmand profr rgl xtable]; }; corrDNA = derive2 { name="corrDNA"; version="1.0.1"; sha256="1mfjrzpcb63ydyj1yxa0wd3vh4z0rdwsqv09w0a0l4l7mhb5jz2k"; depends=[mvtnorm]; }; corrcoverage = derive2 { name="corrcoverage"; version="1.2.1"; sha256="0r5n2g341jlinwrxxwxkav9i6qsf097pmfi07aiq663b13r3864x"; depends=[data_table magrittr matrixStats Rcpp RcppArmadillo]; }; correctedAUC = derive2 { name="correctedAUC"; version="0.0.3"; sha256="0c2kq7asq5mp48p8niqb84wnw4q2q2985wxbrywrhsszm9p3xspb"; depends=[ICC mnormt]; }; corregp = derive2 { name="corregp"; version="2.0.2"; sha256="1v048dibn2x3y5mi2damcsr9i5kdig5n53g5j9gf31lqkzzjmnh3"; depends=[data_table diagram ellipse gplots rgl]; }; - correlation = derive2 { name="correlation"; version="0.1.0"; sha256="0idhw015s1a84z87mzy35rly700bd2mgsp3g9943c5yxnda2g17z"; depends=[bayestestR boot effectsize insight parameters]; }; + correlation = derive2 { name="correlation"; version="0.2.0"; sha256="0ckwpsvpnv7caz8pgxy5cf2pfhgvkgd29jm3vwan5nbyjwhgc9nb"; depends=[bayestestR effectsize insight parameters]; }; correlationfunnel = derive2 { name="correlationfunnel"; version="0.1.0"; sha256="0kg770nfr1cd31b8y8g1kx046k401lha9hbj7lq543gl7s77aw2x"; depends=[cli crayon dplyr forcats ggplot2 ggrepel magrittr plotly purrr recipes rlang rstudioapi stringr tibble tidyr]; }; correlbinom = derive2 { name="correlbinom"; version="0.0.1"; sha256="1ix3ccxzr7vqblbda5awsva3h95b69v7kc6adz622bbi8r36xxcq"; depends=[Rmpfr]; }; corrgram = derive2 { name="corrgram"; version="1.13"; sha256="1g5159vihsz5a2cfmg4g4i1lildn2x2wzck5sd0vml5810rxjpma"; depends=[seriation]; }; @@ -6409,7 +6424,7 @@ in with self; { corrsieve = derive2 { name="corrsieve"; version="1.6-8"; sha256="0ak3j9khcwv5rxbicck2sr260wpmd3xj254y7pdavx2fk0b72yxs"; depends=[]; }; corset = derive2 { name="corset"; version="0.1-4"; sha256="0ladyqvkys4cldvbhkii9jwn1k5p1ym2g5bgdlz1hq1sv30ixn2f"; depends=[]; }; cort = derive2 { name="cort"; version="0.3.0"; sha256="1krb3d0g060b9a5a3pb782vd632lfncbxbmcvh6q21as0flm2hpv"; depends=[furrr magrittr nloptr osqp purrr Rcpp Rdpack]; }; - corto = derive2 { name="corto"; version="1.0.5"; sha256="042bz48qiwkhms5ad6189dlng91nz6mdfwjar7816ry7vzfn92iw"; depends=[dplyr knitr pbapply plotrix rmarkdown]; }; + corto = derive2 { name="corto"; version="1.0.8"; sha256="0p9issdhi5iz7fjc0qc3s3vp286j1b3aydjvj273zcjshjhc27ia"; depends=[dplyr knitr pbapply plotrix rmarkdown]; }; corx = derive2 { name="corx"; version="1.0.2"; sha256="1k9k1w5i5yky6c9jn5s80rf0r5r6qn7w0xwamjbankp2i4ryna5z"; depends=[clipr crayon ggcorrplot glue moments ppcor psych tidyselect]; }; cosa = derive2 { name="cosa"; version="2.0.0"; sha256="1ra1m75ay829xlhjax82px4ffflnfgh2mrmzzj4i8ml545d9hmgr"; depends=[msm nloptr]; }; cosinor = derive2 { name="cosinor"; version="1.1"; sha256="02nnqg51vq48lzk667cyarnmhcf5mifnsdij7dlgqvz2k4fdq4pl"; depends=[ggplot2 shiny]; }; @@ -6427,7 +6442,7 @@ in with self; { 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.2"; sha256="0k6fjg0v9n7vi89wd025gdjh1q3l6nnc5yn8i2bfw0i5vmv8rhi3"; depends=[MASS]; }; - countrycode = derive2 { name="countrycode"; version="1.1.1"; sha256="1ys76s1sa6xj0mr5kryscwsh3dlrn9w35fx3fnr325j35xalyka4"; depends=[]; }; + countrycode = derive2 { name="countrycode"; version="1.1.2"; sha256="0ha2qmsmdrb6dkw62srcl1jxljkhh67jaj96ypz91c0sqz11zjjf"; depends=[]; }; countyfloods = derive2 { name="countyfloods"; version="0.1.0"; sha256="0ld8p8dfk9khvwffbn8sad0j3an25s7cvbi6jxljgx4zc6ldh699"; depends=[dataRetrieval dplyr ggplot2 lubridate maps plyr R_utils tidyr]; }; countytimezones = derive2 { name="countytimezones"; version="1.0.0"; sha256="0sk22fmz9d3wvlfvjl1xdavvl04q1ywy8ww2gi5am3yiizkf0v9w"; depends=[dplyr lubridate]; }; countyweather = derive2 { name="countyweather"; version="0.1.0"; sha256="0q56bnh9x6jyj1sdd1q4yv2n774mbv268pgp285bjybgqm2pyisz"; depends=[dplyr geosphere ggmap ggplot2 lubridate purrr raster rnoaa sp stringi tibble tidyr tigris]; }; @@ -6441,9 +6456,10 @@ in with self; { covequal = derive2 { name="covequal"; version="0.1.0"; sha256="1qj6djqf1rnjmnaz1nryj9dc104082w258dzjjp5q18gg1ck8v0c"; depends=[corpcor RMTstat]; }; covfefe = derive2 { name="covfefe"; version="0.1.0"; sha256="178qc77y4bn04qad3g70wr8y4v0ggyg807w67m8wvhbcxqr8yq7c"; depends=[tokenizers]; }; covglasso = derive2 { name="covglasso"; version="1.0.1"; sha256="1wyh5f7rhwrk042wcr31db4v0wpd12kxwfg1qqszdg3jq6xbyz25"; depends=[Rcpp RcppArmadillo]; }; - covid19_analytics = derive2 { name="covid19.analytics"; version="1.0"; sha256="18gk0n93f8by9695xpxbk16np7m925r8s5mghsbg2r85m8d3z70y"; depends=[ape deSolve gplots htmlwidgets pheatmap plotly]; }; + covid19_analytics = derive2 { name="covid19.analytics"; version="1.0.1"; sha256="1lig3sdx6a9r2b1mz3ichm0scjb9akaar0qziq7vsfp8ynsgb11r"; depends=[ape deSolve gplots htmlwidgets pheatmap plotly]; }; + covid19france = derive2 { name="covid19france"; version="0.1.0"; sha256="11072mc794l0m84k2b08zhyfvxf6n6ym91i7kkm3cbirxp6bhnqy"; depends=[dplyr glue lubridate magrittr readr stringr tidyr]; }; covid19italy = derive2 { name="covid19italy"; version="0.1.0"; sha256="1wd4f97gmw7l9zc0dpfwxii8gfhnwhk0c04gjvwk9xjdp5psx5gb"; depends=[devtools]; }; - covid19us = derive2 { name="covid19us"; version="0.1.1"; sha256="1rqfi0rgx7kl6pdvjiwrh4x4hr5x7jxr1v9sxma9jgqhg82mlmpi"; depends=[curl dplyr glue httr lubridate magrittr purrr snakecase stringr tibble tidyr]; }; + covid19us = derive2 { name="covid19us"; version="0.1.2"; sha256="13sj6pz81czima6n5zi1vdbzjbxa37nc6l6md3ix6w9rdhiajfbg"; depends=[curl dplyr glue httr lubridate magrittr purrr snakecase stringr tibble tidyr]; }; covr = derive2 { name="covr"; version="3.5.0"; sha256="1pvr95h7jg9hqq1qq1cccy323pkxldrwafl08151cc410499k4fb"; depends=[crayon digest httr jsonlite rex withr yaml]; }; covreg = derive2 { name="covreg"; version="1.0"; sha256="0v19yhknklmgl58zhvg4szznb374cdh65i7s8pcj2nwrarycwzaq"; depends=[]; }; covsep = derive2 { name="covsep"; version="1.1.0"; sha256="19dvwhl85yx9ddwxvnq5sdd534s6llcw61gckrav48hq49x1bqld"; depends=[mvtnorm]; }; @@ -6482,7 +6498,6 @@ in with self; { cqcr = derive2 { name="cqcr"; version="0.1.2"; sha256="11bcqr4bw11vjqdgddpfjb4dsk0dxdasddkp1g310l71vw7zaryg"; depends=[anytime dplyr httr jsonlite purrr rlang snakecase]; }; cqrReg = derive2 { name="cqrReg"; version="1.2"; sha256="1sn8pkbqb058lbysdf2y1s734351a91kwbanplyzv3makbbdm4ca"; depends=[quantreg Rcpp RcppArmadillo]; }; cquad = derive2 { name="cquad"; version="2.1"; sha256="1cq57qd33cbzhgnnw4fk36xch0prwr9a404sxi7b4ijwgzw84d0h"; depends=[MASS plm]; }; - 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-2"; sha256="0wwbdh5sfi2bg13nrlkxxij4k053kjx9afm4gjpgs6iir6pml711"; depends=[]; }; cranlike = derive2 { name="cranlike"; version="1.0.2"; sha256="06xgxgwpmfrwmcd0gnr9prjjbhd1y0ky1zb8yh09v0bvsf6ixnyx"; depends=[DBI debugme desc RSQLite]; }; @@ -6495,7 +6510,7 @@ in with self; { crblocks = derive2 { name="crblocks"; version="1.0-0"; sha256="0y101kgi7ryjv18fyjp0ralp4qj7kgshmbd4mf7n3hdjay0znss5"; depends=[]; }; crch = derive2 { name="crch"; version="1.0-4"; sha256="18qjvh1lkw1f6rrhnb21f30xxrcq8whbs3x1jgkw6q14rf1483ri"; depends=[Formula ordinal sandwich scoringRules]; }; credentials = derive2 { name="credentials"; version="1.1"; sha256="0izwskymymkxdwsdj7zapqpkc6g37c0m6c2na0y00s1kwr73d2qd"; depends=[askpass curl jsonlite openssl sys]; }; - creditmodel = derive2 { name="creditmodel"; version="1.1.8"; sha256="1l9l56cs9kh22j8ky2iklakwsw69j89gb6kz57yklj2sj543hzir"; depends=[cli data_table doParallel dplyr foreach ggplot2 glmnet rpart xgboost]; }; + creditmodel = derive2 { name="creditmodel"; version="1.1.9"; sha256="19jgxckjyssvr6nv6vsqizm3rzn1m445a0bsk4kp57nggrpnyahs"; depends=[cli data_table doParallel dplyr foreach ggplot2 glmnet rpart xgboost]; }; 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]; }; @@ -6507,7 +6522,7 @@ in with self; { crisp = derive2 { name="crisp"; version="1.0.0"; sha256="1gs8jnd9y9pd55w6kwv9mvmg3wd8hjiw3lwx7k242pxccsxklfxq"; depends=[MASS Matrix]; }; crmPack = derive2 { name="crmPack"; version="1.0.0"; sha256="11zy1ci9d0zjbmc0gws9j9qrnfcqvky1ws9p41wjn0zifcckc5gi"; depends=[GenSA ggplot2 gridExtra MASS mvtnorm rjags]; }; crmReg = derive2 { name="crmReg"; version="1.0.1"; sha256="1i3i4pd1ff7cmyd268p5kmncrk0lrq4q4cjhkhxbp2pah041q4wk"; depends=[FNN ggplot2 gplots pcaPP plyr robustbase rrcov]; }; - crminer = derive2 { name="crminer"; version="0.3.0"; sha256="03ynpnk3ni0l2cdlfk69vm1swlva0wjm7lnrb7b1dl9xdjr57lzn"; depends=[crul hoardr jsonlite pdftools xml2]; }; + crminer = derive2 { name="crminer"; version="0.3.2"; sha256="1zq689dk13z0sjp8awjj8jqiw2vkdw70fpyadyis0yfqxyvnzcv5"; depends=[crul hoardr jsonlite pdftools xml2]; }; crmn = derive2 { name="crmn"; version="0.0.21"; sha256="0wp99fsw7y859gp1x22f77r9rv1m0xspbzhzgshzf7hi86xb57k5"; depends=[Biobase pcaMethods]; }; crn = derive2 { name="crn"; version="1.1"; sha256="1fw0cwx478bs6hxidisykz444jj5g136zld1i8cv859lf44fvx2d"; depends=[chron RCurl]; }; crochet = derive2 { name="crochet"; version="2.2.0"; sha256="1cbv79nyycxk6f8ldcsnn2pvgxqlnrj0qs19nhafnq2clxy863k6"; depends=[]; }; @@ -6524,8 +6539,8 @@ in with self; { crossval = derive2 { name="crossval"; version="1.0.3"; sha256="0acpcisg6pkxblyc4j9hiri58h1rn7ay43p5ib5ia8a4a8bnfa4p"; depends=[]; }; crosswalkr = derive2 { name="crosswalkr"; version="0.2.6"; sha256="1rxd6vy7vdrawmg7zkydl1f2wwklnzgh9dsnxbg966xrr3l9x1n9"; depends=[haven labelled readr readxl tibble]; }; 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]; }; - crplyr = derive2 { name="crplyr"; version="0.3.3"; sha256="0jkh4jq0pwz1pqgckdylcdjg7d45z0xl3pdvyb93pcvi073na9na"; depends=[crunch dplyr ggplot2 lazyeval purrr rlang scales stringr tibble viridisLite]; }; + crov = derive2 { name="crov"; version="0.2.0"; sha256="1i3a5nagzinsla6p3wjyj3x12gyfqs6vapaqxgr3dh6m727jw5i5"; depends=[gtools VGAM]; }; + crplyr = derive2 { name="crplyr"; version="0.3.4"; sha256="1vpvp11xrlqq7qinndfda6r9dqfqin9gg75hx4y8sh3b9ar2zywd"; depends=[crunch dplyr ggplot2 lazyeval lifecycle purrr rlang scales stringr tibble tidyselect 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]; }; @@ -6569,9 +6584,9 @@ in with self; { ctqr = derive2 { name="ctqr"; version="1.1"; sha256="1iv6mms7p0xca91mpj61cj8kxv2bwqrpvwdsbx2lk6hgys8g70y2"; depends=[pch survival]; }; ctrdata = derive2 { name="ctrdata"; version="1.2"; sha256="146nb5sv6mj43kqs8iz58nzyx4xrrk5khay2hjjpfrh1g076bw8k"; depends=[clipr curl httr jsonlite nodbi rvest xml2]; }; ctrlGene = derive2 { name="ctrlGene"; version="1.0.1"; sha256="0x7j11v7jj4k1jml6lrnjq79awhrvsm3pig1yxsd337jlfml3ra9"; depends=[psych]; }; - ctsem = derive2 { name="ctsem"; version="3.1.1"; sha256="0l45bfvjjy4ak5bg6nfj8i9adl3qy79nllb0ldmhmg0wqxw76zs4"; depends=[BH cOde data_table Deriv ggplot2 MASS Matrix mize mvtnorm numDeriv OpenMx pkgbuild plyr quantreg Rcpp RcppEigen rstan rstantools StanHeaders]; }; + ctsem = derive2 { name="ctsem"; version="3.2.0"; sha256="1dsk74vci4k43b53lz9dwbrcj59f9fr527bls0l83kkas8dsd6m8"; depends=[BH cOde data_table Deriv ggplot2 MASS Matrix mize mvtnorm numDeriv OpenMx pkgbuild plyr quantreg Rcpp RcppEigen rstan rstantools StanHeaders]; }; ctv = derive2 { name="ctv"; version="0.8-5"; sha256="0kl6z8dbbjgm29q0c5xy6lihjgf5cdihrllm27x0zbcvy8lyl51p"; depends=[]; }; - cuRe = derive2 { name="cuRe"; version="1.0.0"; sha256="0bdj3ak1s6rg84d82iy95g1sdanl6y5a4rdsnixqzrhb9kvnrv0s"; depends=[date numDeriv relsurv rootSolve rstpm2 statmod survival]; }; + cuRe = derive2 { name="cuRe"; version="1.0.1"; sha256="0vw2iv9inz8md7lz6f1p456wxjc07kap1mvqf58hixqxbrb23dgi"; depends=[date numDeriv relsurv rstpm2 statmod survival]; }; cubature = derive2 { name="cubature"; version="2.0.4"; sha256="0jpyq8j7x06dpiz29w48av879ygldzgls9z810192hsymkmfaz6r"; depends=[Rcpp]; }; cubelyr = derive2 { name="cubelyr"; version="1.0.0"; sha256="0h9s5j9q05bdzdv7dbghzfbhqf96kyxyrxx1mqf8phzc77w4yh25"; depends=[dplyr glue pillar purrr rlang tibble tidyselect]; }; cubeview = derive2 { name="cubeview"; version="0.2.0"; sha256="1352hi2j9x9rx4iy3xvsca86nsh39x1vnymd17f5qc8c3plfm8db"; depends=[base64enc htmltools htmlwidgets lattice raster stars viridisLite]; }; @@ -6596,21 +6611,22 @@ in with self; { cusum = derive2 { name="cusum"; version="0.4.1"; sha256="0vjq3slkjdgls41xm637xkrg8jhv6y75xiyfcgpwrp32ixmakpcd"; depends=[checkmate data_table Rcpp]; }; cutoff = derive2 { name="cutoff"; version="1.3"; sha256="0anrvmlvcxah620il3fkq6ldp7hx4nwdnzcpmfc5mhlsry0lp178"; depends=[do ROCit set survival]; }; cutoffR = derive2 { name="cutoffR"; version="1.0"; sha256="1801jylmpp4msyf07rhg4153kky1zvi4v0kkjb9d51dc7zkhh531"; depends=[ggplot2 reshape2]; }; + cutpointr = derive2 { name="cutpointr"; version="1.0.2"; sha256="0jlh7d1nj9w1rw04sg89a81qxm6dfmsdqq37y1b10fllvhnc93fq"; 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]; }; cvGEE = derive2 { name="cvGEE"; version="0.3-0"; sha256="085qjm520l2441nakfxy851s6bfy5832b5fy54z5fp4xr1jn6snm"; depends=[]; }; cvTools = derive2 { name="cvTools"; version="0.3.2"; sha256="0b7xb6dmhqbvz32zyfbdvm9zjyc59snic6wp1r21ina48hchn3sj"; depends=[lattice robustbase]; }; cvar = derive2 { name="cvar"; version="0.4-0"; sha256="1rfsmw2a639pkj8l5g2xm6z48jrxsywbysk7c0czpdvrh4h9h84f"; depends=[fGarch gbutils Rdpack]; }; cvcqv = derive2 { name="cvcqv"; version="1.0.0"; sha256="0327r4jw6m4avcz1zvdkxszqwaw2s9sh1i1jagl6aggd7aaiiyg0"; depends=[boot dplyr MBESS R6 SciViews]; }; - cvcrand = derive2 { name="cvcrand"; version="0.0.4"; sha256="1150vn753m95gpc1clyf4xzzgwmnzdh83prw8a3ikps0l6grvrps"; depends=[tableone]; }; + cvcrand = derive2 { name="cvcrand"; version="0.1.0"; sha256="0zdf41sjqyi7mybxhypfx1vpc15w7qj9jg9bav64qbk0q5nk7jyc"; depends=[tableone]; }; cvequality = derive2 { name="cvequality"; version="0.2.0"; sha256="1im839vzfqylphp2vr20avnzkyl02n88fngbs63d4ik7c72d9992"; depends=[]; }; cvmdisc = derive2 { name="cvmdisc"; version="0.1.0"; sha256="19b9kxqgbk1d631l3jph87pzhk4zf3xd5q5j2xsrbqz8zmm96sn9"; depends=[CompQuadForm]; }; cvmgof = derive2 { name="cvmgof"; version="1.0.0"; sha256="0rnd7icqjprhbpmn383ah4fi5nz0hmg88fa612fmivkvnpn79v6j"; depends=[lattice]; }; - cvms = derive2 { name="cvms"; version="0.3.2"; sha256="0k7v5m95dqanm8hb8j4jx4r4phxx8zrl9nagqampy2sgiwlld6wg"; depends=[broom caret data_table dplyr ggplot2 lifecycle lme4 mltools MuMIn plyr pROC purrr rlang stringr tibble tidyr]; }; + cvms = derive2 { name="cvms"; version="1.0.1"; sha256="0z7vp323vlz53icpksgl9idnkg5sf3kh6gi2fpkwafrx0h7fqdr7"; depends=[broom checkmate data_table dplyr ggplot2 lifecycle lme4 MuMIn plyr pROC purrr recipes rlang stringr tibble tidyr]; }; cvq2 = derive2 { name="cvq2"; version="1.2.0"; sha256="19k95xg2y3wd4mx3wvbrc1invybd446g13vsp3dv05nw2kx4f6w8"; depends=[]; }; cvxbiclustr = derive2 { name="cvxbiclustr"; version="0.0.1"; sha256="00k75zy8v6qd5fg0h258i5z8ljjkfgkxz45cspysl1ap89d5n7df"; depends=[igraph Matrix]; }; cvxclustr = derive2 { name="cvxclustr"; version="1.1.1"; sha256="0idmx4wgz4d0b1xzmlq5bsk2f2q38lpf9c117hg97xsfndzn7vqj"; depends=[igraph Matrix]; }; - cwbtools = derive2 { name="cwbtools"; version="0.1.2"; sha256="0ylzh61587299zqa3i6fc76x2lhdmpvhj0h4bhqwy75csp1wisvp"; depends=[curl data_table pbapply R6 RcppCWB stringi xml2]; }; + cwbtools = derive2 { name="cwbtools"; version="0.2.0"; sha256="1f60zlj75a1fxvw92j8gg707lw4p23c7qg9zzk1s9ph4d42g63sb"; depends=[curl data_table jsonlite pbapply R6 RcppCWB RCurl rstudioapi stringi usethis xml2]; }; cwhmisc = derive2 { name="cwhmisc"; version="6.6"; sha256="1pf365g4f51cfrhlff9mqw2ddvkps0abax17zcn3vw1ba2djalnp"; depends=[lattice]; }; cwm = derive2 { name="cwm"; version="0.0.3"; sha256="1ln2l12whjhc2gx38hkf3xx26w5vz7m377kv67irh6rrywqqsyxn"; depends=[MASS matlab permute]; }; cxhull = derive2 { name="cxhull"; version="0.2.0"; sha256="1m03ym83ghgmb0j14aihfj6divmnr13f5s9jwknicjsxz3p3divk"; depends=[]; }; @@ -6628,6 +6644,7 @@ in with self; { cytofan = derive2 { name="cytofan"; version="0.1.0"; sha256="0gqs98mnwiawnyfb9hs5nlin8d1fj64bszn4b40gs8ajyh36r9pp"; depends=[ggplot2 RColorBrewer]; }; cytometree = derive2 { name="cytometree"; version="2.0.2"; sha256="18g7av73lmnyga1kk24bf8jy599zn9n6qhr13mxsqgi0zdinicfa"; depends=[cowplot ggplot2 GoFKernel igraph mclust Rcpp RcppArmadillo]; }; cytominer = derive2 { name="cytominer"; version="0.2.1"; sha256="0snifz15ijn5bfl3ppfqjp7ac68hsx0rzxlcnxj3285d10p0wljq"; depends=[caret doParallel dplyr foreach futile_logger magrittr Matrix purrr rlang tibble tidyr]; }; + czso = derive2 { name="czso"; version="0.2.3"; sha256="1gaflfi1sq49vjaah8mnbydvyqwwkl1ca2ay399dn9gw1kjcq0fd"; depends=[curl dplyr httr jsonlite lifecycle magrittr readr rlang stringi stringr tibble usethis]; }; d3Network = derive2 { name="d3Network"; version="0.5.2.1"; sha256="1gh979z9wksyxxxdzlfzibn0ysvf6h1ij7vwpd55fvbwr308syaw"; depends=[plyr rjson whisker]; }; d3Tree = derive2 { name="d3Tree"; version="0.2.0"; sha256="0xjr36hdd00dy8s8z1a1s44dn2wg0nm6yqc1rri2l0dqrbh4nrbn"; depends=[dplyr htmlwidgets magrittr plyr stringr]; }; d3heatmap = derive2 { name="d3heatmap"; version="0.6.1.2"; sha256="1ici8j0wzzklhmw94qlxm292qs562vc32wq8mnjsas2n1p35vkmk"; depends=[base64enc dendextend htmlwidgets png scales]; }; @@ -6642,7 +6659,7 @@ in with self; { dMod = derive2 { name="dMod"; version="1.0.1"; sha256="1xw52kliyiv9vrw0m9y7baqdcpqz4706625if8b63nfr70i77a9p"; depends=[cOde deSolve doParallel dplyr foreach ggplot2 plyr rootSolve stringr]; }; dSVA = derive2 { name="dSVA"; version="1.0"; sha256="0vy0flyg82x0n9vw6jf9f76qy84sp0wnis91faj37ac5hdv3pvsb"; depends=[sva]; }; daarem = derive2 { name="daarem"; version="0.4.1"; sha256="1krixphwjh4wp38in7ypwc4y4ncdrryhsnjnn1y48fm2jgc8zvjl"; depends=[]; }; - dabestr = derive2 { name="dabestr"; version="0.2.4"; sha256="1xy1fzfjajphpqwa3x0hsl6fyr55zq1az7la5wpdh0n3sbj1wkbd"; depends=[boot cowplot dplyr ellipsis forcats ggbeeswarm ggforce ggplot2 magrittr plyr rlang simpleboot stringr tibble tidyr]; }; + dabestr = derive2 { name="dabestr"; version="0.2.5"; sha256="0kaxqlagp7ckq3h67l608vzfq98yrd47skwb2pzcf3dg3q5gsjz6"; depends=[boot cowplot dplyr ellipsis forcats ggbeeswarm ggforce ggplot2 magrittr plyr RColorBrewer rlang simpleboot stringr tibble tidyr]; }; dad = derive2 { name="dad"; version="3.4.0"; sha256="0jgirdnp3gaychnjg4mp4p1mdn31hlngs1znzvlxhrd0cqyi4ccd"; depends=[DescTools e1071 ggplot2]; }; dae = derive2 { name="dae"; version="3.1-23"; sha256="1qpsnyjq2imci45hn0c00cwgvhdrcbrfrvwmjm87k8vb3g0wqhgr"; depends=[ggplot2 plyr]; }; daewr = derive2 { name="daewr"; version="1.2-3"; sha256="0ic7lpydsdiilqsbvc5yskrrl6a2l6kmgiz1idz0ic0klyk6rnig"; depends=[FrF2 lattice stringi]; }; @@ -6659,6 +6676,7 @@ in with self; { dann = derive2 { name="dann"; version="0.2.0"; sha256="18c9rx7qg76pnmg2h4zazqq7k0vxgqh70j85cb7cc8lf0qsj6l8i"; depends=[fpc ggplot2 MASS purrr Rcpp RcppArmadillo rlang stringr tibble]; }; danstat = derive2 { name="danstat"; version="0.1.0"; sha256="1wb4v4s9qc7qna7jgd1kk0xvyaqmxhnmjvr5wlk5jjl355lhjxbc"; depends=[httr jsonlite readr]; }; dapr = derive2 { name="dapr"; version="0.0.3"; sha256="136chxijyxrl5sbiggxf56zga26zqds647z1z2igwn5mdff1wxyb"; depends=[]; }; + daqapo = derive2 { name="daqapo"; version="0.3.0"; sha256="1fyl95y57grqckyx1vp4x4f2mq8rk0l2vxh4cyr75cw23j6p4lsc"; depends=[bupaR dplyr edeaR glue lubridate magrittr miniUI purrr readr rlang shiny stringdist stringr tidyr xesreadR]; }; darksky = derive2 { name="darksky"; version="1.3.0"; sha256="1740cw5qifgvqa0nafd6lmllxi32n1zm45zlify1yn3h1qdcszhb"; depends=[ggplot2 gridExtra gtable httr plyr]; }; dartR = derive2 { name="dartR"; version="1.1.11"; sha256="0k768ppm4iw4fi72dp8f1684kizqp1spfb4cnnqxq1dy6w0qz5i8"; depends=[adegenet ape data_table directlabels dismo doParallel foreach gdistance ggplot2 hierfstat igraph leaflet MASS mmod pca3d pegas plyr PopGenReport qvalue reshape2 rgdal rrBLUP seqinr SNPassoc SNPRelate sp StAMPP stringr tidyr vegan]; }; darts = derive2 { name="darts"; version="1.0"; sha256="07i5349s335jaags352mdx8chf47ay41q7b0mh2xjwn2h9kzgqib"; depends=[]; }; @@ -6666,7 +6684,6 @@ in with self; { dat = derive2 { name="dat"; version="0.4.0"; sha256="1nw16hsw9b4hpcl5rqrlw6yk9y2h1pd0ra1c7iz82sknkyd5afi6"; depends=[aoos data_table dplyr Formula magrittr progress tibble]; }; data_table = derive2 { name="data.table"; version="1.12.8"; sha256="1p7rf4v3ysflpgcmy9krkwmcy7z22wb08xm443649waz6lx5z9yk"; depends=[]; }; data_tree = derive2 { name="data.tree"; version="0.7.11"; sha256="1mm27p3k2qw77wqrx05qs39nazcgpn0af0ahlps4gm62fs9pzddq"; depends=[R6 stringr]; }; - dataCompareR = derive2 { name="dataCompareR"; version="0.1.2"; sha256="0n10dqnrlpwafxys68b3ly156235lhqby71qay0vb0r6bvl2g349"; depends=[dplyr knitr markdown stringi]; }; dataMaid = derive2 { name="dataMaid"; version="1.4.0"; sha256="133ipl06sc8iicvkbgjxfs0qia76r2p1qhi693vacgfdbd7cmak5"; depends=[ggplot2 gridExtra haven htmltools magrittr pander rmarkdown robustbase stringi whoami]; }; dataMeta = derive2 { name="dataMeta"; version="0.1.1"; sha256="13xxayqxbps07h0xr5b7sb7q30gy5zm7jzzaq4k20fskkjrzhzcm"; depends=[dplyr]; }; dataPreparation = derive2 { name="dataPreparation"; version="0.4.3"; sha256="1fchr68siq6vxz4qzlkrm2p6zld3s8mw7izmyzqffvrlqmrh0bdm"; depends=[data_table lubridate Matrix progress stringr]; }; @@ -6676,6 +6693,7 @@ in with self; { 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]; }; dataesgobr = derive2 { name="dataesgobr"; version="1.0.0"; sha256="10znkaq45m4bgiyjx4x8s6ilvxlry6h0z54pkg8jgmblrpfazmqb"; depends=[dplyr DT httr jsonlite readODS readr readxl shiny shinycssloaders shinyFiles shinyjs shinythemes stringi stringr yaml]; }; + dataframeexplorer = derive2 { name="dataframeexplorer"; version="0.1.6"; sha256="0sp2323lf3sq7na6z9v1lir46v75c7ssklbkkmjxx43pbw3q4rjy"; depends=[data_table dplyr magrittr openxlsx plyr tibble tidyr]; }; dataframes2xls = derive2 { name="dataframes2xls"; version="0.4.7"; sha256="10krlv0l5w021z0qd7rj93pzfjjmcjlda4xz4vq470bxbjmn1bss"; depends=[]; }; datafsm = derive2 { name="datafsm"; version="0.2.3"; sha256="18q6s8sz8bm2xlfvhj0x5sagpn363s3k21s428wd0bqzqlppwbmb"; depends=[caret GA Rcpp]; }; datagovsgR = derive2 { name="datagovsgR"; version="0.3.1"; sha256="03ynpga01yh8xm4p41kq32wvmbh9cf1jp1mbyzzl6ziwgz95n0q8"; depends=[data_table dplyr httr purrr stringr]; }; @@ -6691,7 +6709,6 @@ in with self; { dataresqc = derive2 { name="dataresqc"; version="1.0.3"; sha256="1b04lzb479p95iv7gzb5ds6c48l8kcps857qjy3wqkhr67jhd0dc"; depends=[]; }; datarium = derive2 { name="datarium"; version="0.1.0"; sha256="1v98yxsxhfqlalz5qy3x5axb7fy067vf3y0qg7ngixphmy9qybym"; depends=[]; }; datarobot = derive2 { name="datarobot"; version="2.17.0"; sha256="1k4idrbc9fgw8afc7cq9fqg189b86h1q0fkpq06k7dc4fl65wyna"; depends=[curl httr jsonlite yaml]; }; - datasailr = derive2 { name="datasailr"; version="0.8.2"; sha256="18zqvhgdhkgmwh01plz8n8vdga2yas76lqwsqhk7qxnjd2hnj0hx"; depends=[Rcpp]; }; datasauRus = derive2 { name="datasauRus"; version="0.1.4"; sha256="1w1yhwwrmh95bklacz44wjwynxd8cj3z8b9zvsnzmk18m5a4k0fl"; depends=[]; }; dataseries = derive2 { name="dataseries"; version="0.2.0"; sha256="11wc2p5m8qbdmkpbd21lpwl28a1dpab88c3gqyrhsn0298lpnip4"; depends=[]; }; datasets_load = derive2 { name="datasets.load"; version="1.2.0"; sha256="0x2m3k4grqizm97p41gjy3zkmhshicndp6cwyncl149yay6x8y5i"; depends=[DT miniUI shiny]; }; @@ -6721,7 +6738,7 @@ in with self; { dbnR = derive2 { name="dbnR"; version="0.3.4"; sha256="0m273disj1byg4g21zgwspryjsxsdqj9scih2m0hcghf76n22822"; depends=[bnlearn data_table magrittr Rcpp]; }; dbparser = derive2 { name="dbparser"; version="1.1.0"; sha256="12fx17bj076nl493mian9rz3iv1fx86qr0q2k2z6hqsvg4866q1j"; depends=[DBI dplyr odbc purrr readr RMariaDB RSQLite tibble XML]; }; dbplot = derive2 { name="dbplot"; version="0.3.3"; sha256="1svizj9hcd417yii8ll9s3mnvdqpa5awy9xl71kbwpfcnpdzqf1r"; depends=[dplyr ggplot2 magrittr purrr rlang]; }; - dbplyr = derive2 { name="dbplyr"; version="1.4.2"; sha256="1q2dflr88s5a1amzfld3087q422vf70052qn84zyd8895kdg10xp"; depends=[assertthat DBI dplyr glue purrr R6 rlang tibble tidyselect]; }; + dbplyr = derive2 { name="dbplyr"; version="1.4.3"; sha256="1si8sahr1kwq1xgjzi9klkahad07pyrsngy75y1f74f64907pb39"; depends=[assertthat DBI dplyr glue lifecycle purrr R6 rlang tibble tidyselect]; }; dbscan = derive2 { name="dbscan"; version="1.1-5"; sha256="1vh29nmmana2755zcy15i1mhj3amwc2r84cq9d71wqr7ygzynphk"; depends=[Rcpp]; }; dbstats = derive2 { name="dbstats"; version="1.0.5"; sha256="0pr80mx8y87l96hhg0rp3ajxl7yx2f8qr0y1zrjkbzxavjmp9k34"; depends=[cluster pls]; }; dbx = derive2 { name="dbx"; version="0.2.5"; sha256="1g1pm0zw667m0wdzndak1qzym527lcl6gmdfzi5b3rlinkk2y0s2"; depends=[DBI]; }; @@ -6759,7 +6776,7 @@ in with self; { decisionSupport = derive2 { name="decisionSupport"; version="1.105.2"; sha256="095qwgsw6y1clv2hyjr56s2wg8q1nhd22ikh9b3l2mcsw2xdzvjy"; depends=[chillR fANCOVA ggplot2 msm mvtnorm nleqslv rriskDistributions]; }; deckgl = derive2 { name="deckgl"; version="0.2.5"; sha256="1rqw84pzbip9752q4zmhrhv8gis5dc8q6v1kkgnblhkg10wrb0lw"; depends=[base64enc htmltools htmlwidgets jsonlite magrittr readr tibble yaml]; }; decode = derive2 { name="decode"; version="1.2"; sha256="1qp0765gl3pgfdzjwj7icf3zminxxmrlw6gx3vj51y6c2y5ws4as"; depends=[]; }; - decoder = derive2 { name="decoder"; version="1.1.13"; sha256="1kpcx754djfr8y0flpa1hrr92s0wbxw23rlvb6q3k9absvdvvmg6"; depends=[backports]; }; + decoder = derive2 { name="decoder"; version="1.2.2"; sha256="1jxgd32bn36ldal26wivhdxgjy247l7r4ickacr1p8rrwxvhpk18"; depends=[]; }; decomposedPSF = derive2 { name="decomposedPSF"; version="0.1.3"; sha256="0p9n0qi21facdp9c4fzs78ap4w1wvpvkv51kgx1gkr949kw8cv4n"; depends=[forecast PSF Rlibeemd tseries]; }; decompr = derive2 { name="decompr"; version="4.5.0"; sha256="1kbk4z1pr1j4i1sgfkjxzjy2j2fcmrf3vacnrpv1fba2ib10619k"; depends=[]; }; decon = derive2 { name="decon"; version="1.2-4"; sha256="1v4l0xq29rm8mks354g40g9jxn0didzlxg3g7z08m0gvj29zdj7s"; depends=[]; }; @@ -6773,7 +6790,6 @@ in with self; { deepdep = derive2 { name="deepdep"; version="0.2.0"; sha256="1yl1vnz9qysv38zn7dhz05s38l701zrbrx58bcpg862i8xf1nl40"; depends=[cranlogs ggforce ggplot2 ggraph graphlayouts httr igraph jsonlite scales]; }; deepdive = derive2 { name="deepdive"; version="1.0.1"; sha256="1385pxkcdaf3rs2br1dghm7d7zd94mfgmqjns4z09mryv72n7cl0"; depends=[data_table fastDummies plyr rpart stringr treeClust]; }; deepgmm = derive2 { name="deepgmm"; version="0.1.59"; sha256="1kmvk0vmfzs49n67j2cd1d46fi9gvmxklcqghgmwfw25k4xmpgkb"; depends=[corpcor mvtnorm]; }; - deeplr = derive2 { name="deeplr"; version="1.0.0"; sha256="0pg1vy4x53qns8qn5sv0nqplf23w8dwj0b0wbibpr52lgqjc34r7"; depends=[httr purrr rjson stringr tibble tokenizers utf8]; }; deepnet = derive2 { name="deepnet"; version="0.2"; sha256="09crwiq12wzwvdp3yxhc40vdh7hsnm4smqamnk4i6hli11ca90h4"; depends=[]; }; default = derive2 { name="default"; version="1.0.0"; sha256="0hzxgp9la9kll5cw3m4gd02rii571xsn1v53kz407k7k6rfg5mda"; depends=[]; }; define = derive2 { name="define"; version="0.2.8"; sha256="12xy1l1z1ilk85kbl7x4na99n6hc5axwrhpb6m6ipmbii4vv407v"; depends=[encode Hmisc latexpdf SASxport spec]; }; @@ -6803,6 +6819,7 @@ in with self; { denovolyzeR = derive2 { name="denovolyzeR"; version="0.2.0"; sha256="03ya5clzqp12lfhw073ri0pwgxn53a6pvnais317a8bv1yinxspb"; depends=[dplyr reshape2]; }; denpro = derive2 { name="denpro"; version="0.9.2"; sha256="19hrpfd44jaavq81dbyj3frris4aflfc8lig0471whv0pc6jci2k"; depends=[]; }; denseFLMM = derive2 { name="denseFLMM"; version="0.1.2"; sha256="1lfhd73zvvz6glq41lb2a9x63fjwjfp53zmy9g78fg6gz5lbnbpm"; depends=[MASS Matrix mgcv mvtnorm]; }; + densitr = derive2 { name="densitr"; version="0.1.0"; sha256="1vqdvfka6wdfxqfy2qcacss0h6wxykmwyijr5blpvlpafjdmngaq"; depends=[changepoint]; }; densityClust = derive2 { name="densityClust"; version="0.3"; sha256="1zry0vafajzmr37aylglxfvwplhdygbkb9cvzvh8cy0xgnjrnx13"; depends=[FNN ggplot2 ggrepel gridExtra RColorBrewer Rcpp Rtsne]; }; densratio = derive2 { name="densratio"; version="0.2.1"; sha256="0x333kfx5mdzzjsqy37j4bmv9iddlgp3wi4774lx8d159lbr6irp"; depends=[]; }; denstrip = derive2 { name="denstrip"; version="1.5.4"; sha256="0hzxphj740q6pfa1q42knr7n12bmnawg7b2fs74msxn83dka5cmq"; depends=[lattice]; }; @@ -6845,7 +6862,7 @@ in with self; { devFunc = derive2 { name="devFunc"; version="0.1"; sha256="0f2s5gssk9napmah7zcss1rnh7pzlq90gzwcnvyr9rrq6k118n8q"; depends=[plyr stringr]; }; devRate = derive2 { name="devRate"; version="0.1.10"; sha256="0c5hg98w83d02lvb7rbgx8c24li58vpxjy71if337p7cyzzd1lqg"; depends=[]; }; devoid = derive2 { name="devoid"; version="0.1.0"; sha256="1aq7yyfpid3r41c6v5v92im2iq9m3d7gnisc9rkc9zpjfpbpzpx8"; depends=[]; }; - devtools = derive2 { name="devtools"; version="2.2.2"; sha256="1bhb2j8ilpdzwd0c678mcgfpdw88vncsjma79afcikxmzcsz9279"; depends=[callr cli covr crayon desc digest DT ellipsis git2r glue httr jsonlite memoise pkgbuild pkgload rcmdcheck remotes rlang roxygen2 rstudioapi rversions sessioninfo testthat usethis withr]; }; + devtools = derive2 { name="devtools"; version="2.3.0"; sha256="1l6w765q180bg5mmdq5k2ymf6apz7ldhnknzf6ynfp1kf70pbhsg"; depends=[callr cli covr crayon desc digest DT ellipsis git2r glue httr jsonlite memoise pkgbuild pkgload rcmdcheck remotes rlang roxygen2 rstudioapi rversions sessioninfo testthat usethis withr]; }; dexter = derive2 { name="dexter"; version="1.0.7"; sha256="0didyrdiyv3vcimkmr7g4nl9pl6678vj0a7750nbi5zyn6q6dll9"; depends=[DBI dplyr MASS Rcpp RcppArmadillo rlang RSQLite tidyr]; }; dexterMST = derive2 { name="dexterMST"; version="0.1.2"; sha256="1h56dr2z2pzi4zdy3dmyb2vg2jg1v5602c497khkvrbr7qfx8zra"; depends=[crayon DBI dbplyr dexter dplyr fastmatch igraph Rcpp rlang RSQLite tibble tidyr]; }; dextergui = derive2 { name="dextergui"; version="0.2.2"; sha256="1g6qxjmxkrna10lahsdfilpjw587kk6zh8vs1saw9l27i3izpbi9"; depends=[Cairo DBI dexter dplyr DT ggExtra ggplot2 ggridges htmltools htmlwidgets jsonlite networkD3 RCurl readODS readxl rlang shiny shinyBS shinyFiles shinyjs tibble tidyr writexl]; }; @@ -6870,6 +6887,7 @@ in with self; { dgo = derive2 { name="dgo"; version="0.2.15"; sha256="16z3vag1fwsnmynqh0zpwq5qp5ac3xf4787lwqy7asx8qgcc3wmw"; depends=[assertthat data_table dgodata ggplot2 lubridate R6 rstan survey]; }; dgodata = derive2 { name="dgodata"; version="0.0.2"; sha256="03cyiig8pn7fdkrkrd29cwy5g63bp57bpl9jmdxfi03smngzbz0m"; depends=[]; }; dgof = derive2 { name="dgof"; version="1.2"; sha256="02qnb3i131hx05k8l5n3xbl5sqmmc2fh19bsgcacgj8ixs4wyjvi"; depends=[]; }; + dgumbel = derive2 { name="dgumbel"; version="1.0.1"; sha256="1qlc81rh6fcrai9ls27j83bjac26qhpfnchf9pdjz86dyclfjx43"; depends=[Rcpp RcppEigen]; }; dhReg = derive2 { name="dhReg"; version="0.1.0"; sha256="07x2zfcskia79xvz40g30qd9f2d4bn2s26bw892s469v3hcdqzyp"; depends=[forecast future future_apply testthat]; }; dhga = derive2 { name="dhga"; version="0.1"; sha256="1n48irj53g3kn451ak5ly50wxdn7qmzi2kib8clsvcx2n7mvpgcm"; depends=[VennDiagram]; }; dhglm = derive2 { name="dhglm"; version="2.0"; sha256="1918wkylldcdxjggly3a4yh4cv2nkig5bjfx0j79av633hahlg92"; depends=[boot car MASS Matrix sandwich]; }; @@ -6946,7 +6964,7 @@ in with self; { discreteRV = derive2 { name="discreteRV"; version="1.2.2"; sha256="1lhf67cccr96zl3j1sysh2bv0pbgvkbgjdzm35fvrdm7k74ypjsi"; depends=[MASS plyr]; }; discretecdAlgorithm = derive2 { name="discretecdAlgorithm"; version="0.0.7"; sha256="01x3qfjj7dwv0m9q8zdhfrpbj9ys9y5p7d3z8ywjrqy4jw88svjs"; depends=[igraph Rcpp RcppEigen sparsebnUtils]; }; discretization = derive2 { name="discretization"; version="1.0-1"; sha256="00vq2qsssnvgpx7ihbi9wcafpb29rgv01r06fwqf9nmv5hpwqbmp"; depends=[]; }; - discrim = derive2 { name="discrim"; version="0.0.1"; sha256="1g698bimrvzbzzv6mfafwmdyyziscr055zhssnz69j250mh81kyw"; depends=[dials parsnip purrr rlang tibble withr]; }; + discrim = derive2 { name="discrim"; version="0.0.2"; sha256="0zwr0rm8qsykimsqpxv8g76fzrspkfafrf4kfqvb7z941pi65y23"; depends=[dials parsnip purrr rlang tibble withr]; }; diseasemapping = derive2 { name="diseasemapping"; version="1.4.6"; sha256="16y2w8qjq442qdbqlrg3s2mn53rlcipl22m3q168gda5klm4f7sl"; depends=[sp]; }; disk_frame = derive2 { name="disk.frame"; version="0.3.4"; sha256="03mm73fps4hsryk3mlw088jx2z1a75xifwbixbv4fy38xihs973j"; depends=[benchmarkme bigreadr bit64 crayon data_table dplyr fs fst furrr future future_apply globals glue jsonlite pryr purrr Rcpp rlang stringr]; }; diskImageR = derive2 { name="diskImageR"; version="1.0.0"; sha256="1r19k5fdjn6vkn11p5df77fnxfqaz3nciiaai0f3pr2bgpfppzka"; depends=[subplex zoo]; }; @@ -6968,11 +6986,11 @@ in with self; { distdrawr = derive2 { name="distdrawr"; version="0.1.3"; sha256="1c8wznfml8k5gwyanfg7rqr22a96xx8rgm7f4z3bv5gsgsbps49y"; depends=[]; }; distfree_cr = derive2 { name="distfree.cr"; version="1.5.1"; sha256="0h7cywxnasxmqnl9f2f9wp4viwvv72hjx2drr78prqy3nn3lvqwx"; depends=[]; }; distill = derive2 { name="distill"; version="0.7"; sha256="111i58s7c9q317ypnpxm1gzc8ssb3751yr4l4j1wyjv49l72sayi"; depends=[base64enc bookdown digest downloader htmltools jsonlite knitr lubridate mime png progress rmarkdown rprojroot rstudioapi stringr whisker xfun xml2 yaml]; }; - distillery = derive2 { name="distillery"; version="1.0-6"; sha256="1mi3ig9jq0kd7yrwc5m37lmrw04p1b4lirnbsxi10z3n5yay4429"; depends=[]; }; + distillery = derive2 { name="distillery"; version="1.0-7"; sha256="0w72vb3p51m0hwms9icwgy1xg3dplmpjrxibl2s92lpdrv737249"; 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]; }; + distory = derive2 { name="distory"; version="1.4.4"; sha256="1ljrs91h4v1h5lb295hjki8bmra2lg3d1bn5x731pnv43pf3ck06"; depends=[ape]; }; distr = derive2 { name="distr"; version="2.8.0"; sha256="1dyff4m33xmw6hxb3jxzr8vvajg3qz3rfcrfxjxwsswlddfz0zdv"; depends=[MASS sfsmisc startupmsg]; }; - distr6 = derive2 { name="distr6"; version="1.3.5"; sha256="0qx5r8rwxpw6sqnyygr3z76srdfnkz1b72ymirpwbp865kmphx3j"; depends=[checkmate data_table R6 R62S3 set6]; }; + distr6 = derive2 { name="distr6"; version="1.3.6"; sha256="133vk8n21icdacwb2f5mq1rgnxz2gy11mqirlw55srzamy9mwdfw"; depends=[checkmate data_table R6 R62S3 set6]; }; distrDoc = derive2 { name="distrDoc"; version="2.8.0"; sha256="1iq2gbfbsf3h279yh3fnqsi39gdw15vc6r1g33xcb8kgmmqmvf0p"; depends=[distr distrEx distrMod distrSim distrTeach distrTEst MASS RandVar startupmsg]; }; distrEllipse = derive2 { name="distrEllipse"; version="2.8.0"; sha256="1ymfa8xpgs8zjp4psiwmll5z0vji496fivxmcavspzxy31cw70wx"; depends=[distr distrEx distrSim mvtnorm setRNG startupmsg]; }; distrEx = derive2 { name="distrEx"; version="2.8.0"; sha256="1gwhsnlrnzyp2x97d9wfdy5pa9z3q5il934wjv4kxs9wsvkwsr5h"; depends=[distr startupmsg]; }; @@ -7007,7 +7025,7 @@ in with self; { dlmap = derive2 { name="dlmap"; version="1.13"; sha256="0s6wlkggkm3qndwyvw72xv1n0mcjb7ss3ajbq2ll6rv30splq0db"; depends=[ibdreg mgcv nlme qtl wgaim]; }; dlnm = derive2 { name="dlnm"; version="2.3.9"; sha256="0vbrp9x7n94wjrigw124i3i7szy0bsh4sdggi8nsizn2ccsv5pnq"; depends=[mgcv nlme tsModel]; }; dlookr = derive2 { name="dlookr"; version="0.3.13"; sha256="1i1aiy4v3bvlrz0w0hc5qlv5flqgzbgavqmaql6bc8nz5s9p071s"; depends=[classInt corrplot DMwR dplyr ggplot2 gridExtra kableExtra knitr magrittr mice moments prettydoc purrr RcmdrMisc RColorBrewer rlang rmarkdown rpart smbinning tibble tidyr tidyselect tinytex xtable]; }; - dlsem = derive2 { name="dlsem"; version="2.4.5"; sha256="0ywcssjzkdqxlmjbsqdcgl9kivih5zw865556lnxx3zqnfygxzlv"; depends=[graph Rgraphviz]; }; + dlsem = derive2 { name="dlsem"; version="2.4.6"; sha256="1h3bwqqpfjkl41b2mbfhsj0pi9kri0h0i28wiid6arjrmm87nsf8"; depends=[graph Rgraphviz]; }; dlstats = derive2 { name="dlstats"; version="0.1.3"; sha256="0inij1rzw8i683lyzvnjhfzrng7zx727y9wcijv6ny2fw64cdd6n"; depends=[ggplot2 jsonlite magrittr RColorBrewer scales]; }; dm = derive2 { name="dm"; version="0.1.1"; sha256="15268znsb90ndpq7x55lb7brg67ydshki8mc6b53c5y6b8icl5mr"; depends=[backports cli DBI dplyr DT glue igraph lifecycle magrittr pillar purrr rlang tibble tidyr tidyselect vctrs]; }; dma = derive2 { name="dma"; version="1.4-0"; sha256="003snr09hazszwqnvjrbv8vyz6ihgcfcfhrlshg451dddn920615"; depends=[MASS]; }; @@ -7043,13 +7061,14 @@ 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.2.5"; sha256="0n4jh7rdj4qxmi1wns3ida8pa7rlvz6lrjl0n9ba18w3mgg1z483"; depends=[callr digest igraph magrittr osmdata Rcpp RcppParallel]; }; + dodgr = derive2 { name="dodgr"; version="0.2.6"; sha256="0fy7dd4gi1kymmlipz5xgl9sx9m7rybhqm6jjjj36bjmik90g675"; depends=[callr digest magrittr osmdata Rcpp RcppParallel RcppThread]; }; doex = derive2 { name="doex"; version="1.2"; sha256="1r999z30ipa04pgck0hfalqxihb1bj8sdhlkkhf4plb7maaz3qm3"; depends=[]; }; dominanceanalysis = derive2 { name="dominanceanalysis"; version="1.3.0"; sha256="0850z2ppdgbfwbv8l40ngl00n4mdj4ciky1g918zazd3jrg88s38"; depends=[]; }; domino = derive2 { name="domino"; version="0.3.1"; sha256="0f67w0z5jy82kgm3l1rji430ayigw30vmmwp3i1nz0xibsx7jxv4"; depends=[]; }; donut = derive2 { name="donut"; version="1.0.1"; sha256="17qiy9j0qm2q2gcysd5717bdl9nmkd7pd5z22pcj3icvxcpssval"; depends=[]; }; doremi = derive2 { name="doremi"; version="0.1.1"; sha256="1h36sj60l5sd5ybbdyrv0wkr9p18j7iwg111khq0znb71xi5nzp7"; depends=[data_table ggplot2 lme4 lmerTest zoo]; }; dosearch = derive2 { name="dosearch"; version="1.0.4"; sha256="1hq85jym0plf8hj77bfd623nhyjgfqqzm1w92n3lii3j5lv9vrwg"; depends=[Rcpp]; }; + dosedesignR = derive2 { name="dosedesignR"; version="0.2.4"; sha256="0c8rilx4afih457f9gafgijm569g366lp4wms0vhc0f9kgr1z8h3"; depends=[DoseFinding DT ggplot2 lattice latticeExtra shiny shinyjs]; }; dosresmeta = derive2 { name="dosresmeta"; version="2.0.1"; sha256="0qdalzdk7q4wx3vl5f3i64m8cb7vhi4pqzghar32j0a7l6gla04z"; depends=[mvmeta]; }; dostats = derive2 { name="dostats"; version="1.3.2"; sha256="15j9sik9j5pic5wrp0w26xkrhi337xkbikw0k7sa4yfimw6f84w5"; depends=[]; }; dotCall64 = derive2 { name="dotCall64"; version="1.0-0"; sha256="1b8p7m3w0m7bp977c6jz74xkd611cxg11j49yza59k5fp338scb9"; depends=[]; }; @@ -7059,13 +7078,12 @@ in with self; { doubcens = derive2 { name="doubcens"; version="1.1"; sha256="1hn65n67by3xqbcnaf5jja5pli0g6wpbbz2sfzd7i2nms7kiywhp"; depends=[]; }; double_truncation = derive2 { name="double.truncation"; version="1.4"; sha256="190fwl119ycmiszkq0mqc6dh8adwqx7b0ipmhz71qvqdzgh9gjm9"; depends=[]; }; downloader = derive2 { name="downloader"; version="0.4"; sha256="1axggnsc27zzgr7snf41j3zd1vp3nfpmq4zj4d01axc709dyg40q"; depends=[digest]; }; - downloadthis = derive2 { name="downloadthis"; version="0.1.2"; sha256="1d22xyy11gwvhqd8fks4gfq3j1sirbll2irj7jai01s7c4q2qswc"; depends=[base64enc bsplus fs htmltools magrittr mime purrr readr rmarkdown writexl]; }; + downloadthis = derive2 { name="downloadthis"; version="0.1.3"; sha256="187vgc9rmqq8iqqyqc79rd5q0ccnfs65794gs2pna1ma94ahcxc4"; depends=[base64enc bsplus fs htmltools magrittr mime purrr readr rmarkdown writexl]; }; downscale = derive2 { name="downscale"; version="3.0-1"; sha256="0kmv4d5fa6mmhmbfqfxzk1gv55j15d7madsdqi8470bwh0kkya4y"; depends=[cubature minpack_lm raster Rmpfr sp]; }; downscaledl = derive2 { name="downscaledl"; version="1.0"; sha256="0lqxngzpxj65b48j5w0n8dg6fp4lgg5zpgxc2wj6d9wh5f97l71b"; depends=[dplyr keras magrittr raster Rcpp RcppArmadillo rgdal rstack sp tensorflow]; }; downsize = derive2 { name="downsize"; version="0.2.2"; sha256="18b9shd79z0bsdnp0apqqwv6c73j4wnfiv41ywqz761nmxbldxbn"; depends=[magrittr R_utils]; }; dpa = derive2 { name="dpa"; version="1.0-3"; sha256="0dmwi68riddi1q4b10c12wx6n7pqfmv30ix5x72zpdbgm72v343h"; depends=[igraph sem]; }; dparser = derive2 { name="dparser"; version="0.1.8"; sha256="1yx425s3iq03j043g41pyfp3cgmajb4qh50zirhd0qpplzwy8xj5"; depends=[digest]; }; - dpcR = derive2 { name="dpcR"; version="0.5"; sha256="17l9g11qqs2fkskg331889m8nkkrwzrq0n684rdn62pnd5j2n5pi"; depends=[binom chipPCR dgof e1071 evd multcomp pracma qpcR rateratio_test readxl shiny signal spatstat]; }; dpcid = derive2 { name="dpcid"; version="1.0"; sha256="1gx8gyrxvm07mjiasl0b80y0x3crq6gy170v6s817d11jw44n86z"; depends=[]; }; dplR = derive2 { name="dplR"; version="1.7.1"; sha256="1df4g9zz47h0flx5ww6bvlm364q81l2c5flzpa985sv87rq6cz4j"; depends=[digest lattice Matrix matrixStats plyr png R_utils signal stringi stringr XML]; }; dplRCon = derive2 { name="dplRCon"; version="1.0"; sha256="10xnawgnhxp5y949fxs1vvadc1qz2ldy0s9w9w7kf6iqh59d35sw"; depends=[]; }; @@ -7079,7 +7097,6 @@ in with self; { 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.11"; sha256="0vv3h4sxw38grhr70s28sxkca20adnqdmpp8qqwlbr3dw950yaa3"; 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]; }; dragon = derive2 { name="dragon"; version="0.2.1"; sha256="1y2dav9151zdcqw1maxhh3s4c1syk5rs8yb8grx8xkffvg5123w7"; depends=[broom colorspace colourpicker cowplot DT igraph magrittr RColorBrewer shiny shinyBS shinydashboard shinythemes shinyWidgets tidyverse visNetwork]; }; 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]; }; @@ -7087,6 +7104,7 @@ in with self; { 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]; }; + dreamerr = derive2 { name="dreamerr"; version="1.0.0"; sha256="1ri5krfkk538x0afgs6jqv34sg3vad4dn2r395iivixpd77swvg1"; depends=[Formula]; }; drfit = derive2 { name="drfit"; version="0.7.2"; sha256="03ahzmjzrkdrv36yj6vfg3g5bwn6lb7mlxmli68sixag5h83xq7f"; depends=[DBI drc MASS odbc qcc reshape2]; }; drgee = derive2 { name="drgee"; version="1.1.10"; sha256="0hy7887mvlxh73zk2yzp46bqakq924n940j21lw25jgygmzz1176"; depends=[data_table nleqslv Rcpp RcppArmadillo survival]; }; driftR = derive2 { name="driftR"; version="1.1.0"; sha256="0mvrmwfqg234kk5klhmw7vmf8i0g485xkx5nk73iam16fbzl9y5g"; depends=[dplyr glue janitor lubridate magrittr readr readxl rlang stringr tibble]; }; @@ -7098,18 +7116,19 @@ in with self; { drugCombo = derive2 { name="drugCombo"; version="1.1.1"; sha256="0f4akxmj5jd89jm7kzkmqksxmb6fqj7jawvm3hpw6limyry3mp4z"; depends=[BIGL Deriv ggplot2 minpack_lm nlme rgl]; }; drumr = derive2 { name="drumr"; version="0.1.0"; sha256="09xi3sf424bpq10fq25j209dylfbi1lfd911r44ffadkxzvp5p1s"; depends=[audio stringr]; }; ds = derive2 { name="ds"; version="4.0"; sha256="1iic5fb27cnhsa83zg28hydrhzc01i9z0711xvk95c3gv7mbfp2p"; depends=[]; }; - ds4psy = derive2 { name="ds4psy"; version="0.1.0"; sha256="15knnl0ld8vnb3mv06p7425h7w5y5m598k4dny8svqwranhs856a"; depends=[cowplot ggplot2 here readr stringr tibble tidyr tidyverse unikn]; }; - 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]; }; + ds4psy = derive2 { name="ds4psy"; version="0.2.0"; sha256="0gh224lyrbrky9p68cp47w7zzp8gmy3hgd9dzq0fng47lx97v6dq"; depends=[cowplot dplyr ggplot2 here magrittr tibble unikn]; }; + dsa = derive2 { name="dsa"; version="0.74.18"; sha256="17pyr5jn6mjcch5cl22z8mg31anirmgdjs6k9vjmz5ar35fcb1vi"; depends=[dygraphs extrafont forecast ggplot2 gridExtra htmlwidgets R2HTML reshape2 rJava timeDate tsoutliers xtable xts zoo]; }; dsample = derive2 { name="dsample"; version="0.91.2.2"; sha256="18c0zxaqwgbn9kmkwlnicwd74ljy2sxj0b9ksif13pdlj3zn57h1"; depends=[MASS]; }; dscore = derive2 { name="dscore"; version="1.2.0"; sha256="01lv9yq5d817rx686l1cw1s2265a7wx9g41xhsdx59wkz37wrzwv"; depends=[dplyr Rcpp RcppArmadillo stringr tidyr]; }; dse = derive2 { name="dse"; version="2020.2-1"; sha256="170rxrniszs8h59ah4mn4mz8d7kzix4g3vlz4icd8w6bl40c6ykc"; depends=[setRNG tfplot tframe]; }; dslabs = derive2 { name="dslabs"; version="0.7.3"; sha256="0fhd6zwa4lmgrrybywvj1vxd98a483yca605dj2pwipqifh1x6ka"; depends=[ggplot2]; }; dslice = derive2 { name="dslice"; version="1.2.0"; sha256="1k9hxpmr563p8bpd9m991lx5ig366mzk9j1lzldci9pq4jiayin1"; depends=[ggplot2 Rcpp scales]; }; + dsm = derive2 { name="dsm"; version="2.3.0"; sha256="0b7jdhfrpkyjhxxlkgxsnnidmmpbb3jkx41iqmp08bxipbjyw4kr"; depends=[ggplot2 mgcv mrds nlme numDeriv plyr statmod]; }; dsr = derive2 { name="dsr"; version="0.2.2"; sha256="0bs5aspi2khs9n60q7d2ah6zv4rzhbyk2bafd17c12jzjqlh1228"; depends=[dplyr frailtypack rlang]; }; dsrTest = derive2 { name="dsrTest"; version="0.2.1"; sha256="1kljlfi7jf6fa8b5f3wxjsa9rlmzcp4qix3m2qyapz2lqd85mbb7"; depends=[asht exactci loglognorm]; }; dssd = derive2 { name="dssd"; version="0.2.1"; sha256="0lfr3bb3nba6pkg13d3kiblbp4naqxcdkvdqsa0y1zlhak74cgcj"; depends=[plot3D rgdal sf]; }; dst = derive2 { name="dst"; version="1.4.1"; sha256="1cz1fcyxpyv0ywmwlqdhgj3nzidnzcaxc1nkh8y5mph9wm612c25"; depends=[]; }; - dstack = derive2 { name="dstack"; version="0.1.0"; sha256="05a44d9wzl7jxd1q1jcrnih6w99rblchwh072fw3bhxsh7x35hga"; depends=[base64enc httr nanotime rjson rlist uuid yaml]; }; + dstack = derive2 { name="dstack"; version="0.2.0"; sha256="091hxqg6sy0qsz6jypi1nybg42mgdqw2ygkpmr5bnpc0n8yp55mq"; depends=[base64enc httr nanotime rjson rlist uuid yaml]; }; dstat = derive2 { name="dstat"; version="1.0.4"; sha256="023jp0xdbg200ww1gnr3fzgjqd82acag0jps7q6j6m27q11psvgz"; depends=[]; }; dtangle = derive2 { name="dtangle"; version="2.0.9"; sha256="0yg1fbrqixqp93vdw3grvz1la5l2kidgs730qp6yihkp3260cxf3"; depends=[DEoptimR]; }; dti = derive2 { name="dti"; version="1.5.1"; sha256="08da7v7sl88g2jixfplvw9rc5rvlifq3fvyrgh9naa5jsmd8h5ia"; depends=[adimpro aws awsMethods gsl oro_dicom oro_nifti quadprog rgl]; }; @@ -7132,7 +7151,7 @@ in with self; { dundermifflin = derive2 { name="dundermifflin"; version="0.1.1"; sha256="0rp8p4ln92kfxkczl7vi9r2jhxb1ky203s02940cjjkczsphpcc1"; depends=[crayon stringi]; }; dunn_test = derive2 { name="dunn.test"; version="1.3.5"; sha256="0lqwvyl3pyygfc73nf81gzw3zl3w43r7ki0yw2dgrzhkpb2iji4a"; depends=[]; }; dupiR = derive2 { name="dupiR"; version="1.2"; sha256="0p649yw7iz6hnp7rqa2gk3dqkjbqx1f6fzpf1xh9088nbf3bhhz3"; depends=[plotrix]; }; - dupree = derive2 { name="dupree"; version="0.2.0"; sha256="12dlqmvk2zlxh283xjf2d6x12cy6r3rsy88y5g40h9002m7i2jqy"; depends=[dplyr lintr magrittr purrr rlang stringdist tibble]; }; + dupree = derive2 { name="dupree"; version="0.3.0"; sha256="0q8c0z1yhym20rhfjrc8n03gk458z0n8axx013rcwk1vc2zwk670"; depends=[dplyr lintr magrittr purrr rlang stringdist tibble]; }; durmod = derive2 { name="durmod"; version="1.1-4"; sha256="0d721sbxjfh00gpxd4hj8iq04awfd0pcd6bw8cv7kny21l2f3w44"; depends=[data_table mvtnorm nloptr numDeriv Rcpp]; }; dvmisc = derive2 { name="dvmisc"; version="1.1.4"; sha256="01v6sixx0f3nrn6ymfifb3pvd2msfrwm21kmdv38laxq29vc4rsi"; depends=[cubature data_table dplyr ggplot2 MASS mvtnorm pracma rbenchmark Rcpp survey tab]; }; dwdradar = derive2 { name="dwdradar"; version="0.2.0"; sha256="06wa3m77931lv47530hyczwdjrrfdmgczmbhwy0z9fzhn8kz0ipp"; depends=[]; }; @@ -7179,7 +7198,7 @@ in with self; { ePCR = derive2 { name="ePCR"; version="0.9.9-11"; sha256="0bkvjvygdnzcc23sslgkcrx11mzwgsqss37lwnbr7rq0jp1sw46s"; depends=[Bolstad2 glmnet hamlet impute pracma survival timeROC]; }; eRTG3D = derive2 { name="eRTG3D"; version="0.6.2"; sha256="04m39jkp4lvv145wmcswc87qx36wpfkm95kq9fik8a3jb5myvjll"; depends=[CircStats ggplot2 gridExtra pbapply plotly plyr raster rasterVis sp tiff]; }; eRm = derive2 { name="eRm"; version="1.0-1"; sha256="0njqzznnhnkvalmhiq5yq1w7gwp2myki5cv61w42ydvd27hdyyg9"; depends=[colorspace lattice MASS Matrix psych]; }; - eSDM = derive2 { name="eSDM"; version="0.3.2"; sha256="0vjphknba4a6y1wdgv9v6r3a6kj088fq83b4387d4z72g0kkwcmc"; depends=[colorRamps colourpicker dichromat dplyr DT leaflet lwgeom purrr raster RColorBrewer rlang ROCR sf shiny shinycssloaders shinydashboard shinyjs tmap units viridis zip]; }; + eSDM = derive2 { name="eSDM"; version="0.3.3"; sha256="1iss3l7krcfjxa1pana1ijsbggpbv72gs2sc2gskdrhy5jwlk334"; depends=[dplyr magrittr purrr rlang ROCR sf shiny units]; }; eaf = derive2 { name="eaf"; version="1.9-1"; sha256="0h7nilqa11s4casalilmk4ssgcl1lqn1w4033zxgc20y7f9rxhsg"; depends=[modeltools]; }; earlyR = derive2 { name="earlyR"; version="0.0.1"; sha256="14davqhh3n5dfsddnfd79ni56bssrpwhvkqkdb77a8x9fn8w32pv"; depends=[distcrete EpiEstim epitrix]; }; earlygating = derive2 { name="earlygating"; version="1.0"; sha256="0y6xjkh9p8bvanc9p5sycah8v81k85xr8i7vyvjb9g4a64srwhd7"; depends=[betareg doParallel foreach]; }; @@ -7204,6 +7223,7 @@ in with self; { easypower = derive2 { name="easypower"; version="1.0.1"; sha256="1vf0zv55yf96wjxja6ifdjvgc9nw0jl0hnc1ygyjd8pmwbgdz9bl"; depends=[pwr]; }; easyr = derive2 { name="easyr"; version="0.3-1"; sha256="139xg91j01i5sczbifga3476j98qv9n3vs5wp4ai66blfsiqf1yy"; depends=[data_table digest dplyr foreign glue Hmisc lubridate openssl qs readxl rlang stringr tibble XML]; }; easyreg = derive2 { name="easyreg"; version="4.0"; sha256="1w4wlhziyhdyldm0zgnm73fnxrh0fv8hwcw5j8ircxb4npx7bcgg"; depends=[nlme]; }; + eatDB = derive2 { name="eatDB"; version="0.4.0"; sha256="0jdz36mzv8x2p4aifdscplnl1nb2dwwdmvc29wn14k47lm8c982h"; depends=[DBI RSQLite]; }; ebGenotyping = derive2 { name="ebGenotyping"; version="2.0.1"; sha256="1jllzc7kvvckrws8qhgvwy626llyb68sp1davp7swx48sf7rwcxc"; depends=[]; }; ebSNP = derive2 { name="ebSNP"; version="1.0"; sha256="0x3ijwg4yycsfy6jch1zvakzfvdgpiq8i7sqdp5assb8z1823w0b"; depends=[]; }; eba = derive2 { name="eba"; version="1.9-0"; sha256="1xbjd7n895wzzybpjf634a1jpbwqxwh7l17phz6zv7h6dfw19nx4"; depends=[nlme psychotools]; }; @@ -7225,13 +7245,12 @@ in with self; { eclust = derive2 { name="eclust"; version="0.1.0"; sha256="01x327w02m357lngmgv3drni2s67sass25xk9vni1z434n8i4428"; depends=[caret data_table dynamicTreeCut magrittr pacman pander stringr WGCNA]; }; ecm = derive2 { name="ecm"; version="4.4.0"; sha256="1f9x3lcihvnkc5fr4g94h0m5a9h4rjmq9hkjs34il2id8bw92gj7"; depends=[car]; }; ecmwfr = derive2 { name="ecmwfr"; version="1.2.2"; sha256="0gr1cqvl6p3x63kqg8v1xnk8h6g1acqb3agq9p51zqzcx40hdsrc"; depends=[curl getPass httr keyring memoise]; }; - ecodist = derive2 { name="ecodist"; version="2.0.3"; sha256="1fhlsiywvfyw03dhbwk2g9blymsjvzhcbwdsqn59bmdjk7aiy79x"; depends=[]; }; + ecodist = derive2 { name="ecodist"; version="2.0.5"; sha256="1kijyik0fnjhl69j230mkkdnkknmrbzj43mcj3xv7jy61i2sy0by"; depends=[]; }; ecolMod = derive2 { name="ecolMod"; version="1.2.6"; sha256="1n30faldfhpm2jkaw793vr220kgn3bmn8hxhw32rax294krmwn4v"; depends=[deSolve diagram rootSolve shape]; }; ecolottery = derive2 { name="ecolottery"; version="1.0.0"; sha256="0w5aq1aaqzz74vlj8hgnmn60l8rdrchx022dpspqnpvpzdlh65z5"; depends=[abc ggplot2]; }; econet = derive2 { name="econet"; version="0.1.81"; sha256="0hm1v4fjzyzdaxiw6lar7fxnqsckis3n7nrsravhbllhcf0aqq7w"; depends=[bbmle dplyr igraph intergraph MASS Matrix minpack_lm plyr sna spatstat_utils tnet]; }; econetwork = derive2 { name="econetwork"; version="0.4"; sha256="0p20yj4xki4cj4pww51i6wj6cxp5k3ksc2vcb4f4qh7lr82hnb09"; depends=[bipartite blockmodels igraph Matrix_utils rdiversity]; }; economiccomplexity = derive2 { name="economiccomplexity"; version="1.0"; sha256="1bqayzpfz26lb985l66j27qybyqx0148fiikb8diamq0mbx3picc"; depends=[igraph Matrix]; }; - econullnetr = derive2 { name="econullnetr"; version="0.2.0"; sha256="1amgwcsm42ffrdx5a11nkvdx37qqjfh7z54z1hl4b07n8rg1rp7c"; depends=[bipartite gtools reshape2]; }; ecoreg = derive2 { name="ecoreg"; version="0.2.3"; sha256="1bhh4bnvrvgz49wim5r0b4awfsn9l23wvl4kl0vny0s4hm7cgahc"; depends=[]; }; ecoseries = derive2 { name="ecoseries"; version="0.1.5"; sha256="1q35hp5hl6z28hns5rnp3mjn6hqp5qh714pagw7fw4d4a6wnvacy"; depends=[magrittr RCurl readr rjson rvest tibble xml2 zoo]; }; ecosim = derive2 { name="ecosim"; version="1.3-1"; sha256="0gpgjswqmibnz9lpcidvw3y1wmd38l4lyha4fbs0agiz6yyfiyjn"; depends=[deSolve stoichcalc]; }; @@ -7246,7 +7265,7 @@ in with self; { ed50 = derive2 { name="ed50"; version="0.1.1"; sha256="058p1750ba5hp4rczi26grgwjia2ny1880v1vfp6wxad13r459pq"; depends=[boot]; }; ed50simulation = derive2 { name="ed50simulation"; version="0.1.1"; sha256="00fknpssrpin8bpjhf2lsjx3lbpinrmqa6jzmgy3nslkc51x0939"; depends=[boot]; }; eda4treeR = derive2 { name="eda4treeR"; version="0.2.0"; sha256="0fh6nfgvbkvjm1f0b292ggi0mr8ylq5pg2wp8cph46j8rhbgbdxz"; depends=[dae dplyr emmeans ggplot2 lme4 magrittr pbkrtest tidyverse]; }; - edbuildmapr = derive2 { name="edbuildmapr"; version="0.1.0"; sha256="1wk0xxdlvpa9wj2cbiwj23kh6f24x29391lmwvw1rnhlqxrfypk7"; depends=[dplyr lwgeom magrittr sf spdep stringr tidyselect tmap]; }; + edbuildmapr = derive2 { name="edbuildmapr"; version="0.1.1"; sha256="1zv5031zx9lz6ii74947kp5vw8lqx0gi5si2mbvmfk7ywc4dv3jh"; depends=[dplyr magrittr sf spdep stringr tidyselect tmap]; }; edbuildr = derive2 { name="edbuildr"; version="0.1.1"; sha256="0cbwkvlj5w3vbg2k20fqxanrahly3ca22zdlfqk62v38i78cpldq"; depends=[dplyr magrittr openxlsx scales stringr tidyselect]; }; edcc = derive2 { name="edcc"; version="1.0-0"; sha256="036fi6mnn9480hkb378xb5jilkfvdydjmkyw4mcc9s1lz195f62w"; depends=[spc]; }; edci = derive2 { name="edci"; version="1.1-3"; sha256="1f1ry2adfranfrrvf1gkiy58pra3z6bray4v5fgr0z9n1ybcaff0"; depends=[]; }; @@ -7261,6 +7280,7 @@ in with self; { edgeCorr = derive2 { name="edgeCorr"; version="1.0"; sha256="19n67yc58ksin7xydrnfsyyw7fqawm5xli67cz4lv4wb62w6r6ld"; depends=[]; }; edgeRun = derive2 { name="edgeRun"; version="1.0.9"; sha256="0d5nc8fwlm61dbi00dwszj1zqlij4gfds3w1mpcqnnfilr2g3di1"; depends=[data_table edgeR]; }; edgebundleR = derive2 { name="edgebundleR"; version="0.1.4"; sha256="0pajr95qqppk2m4l7rfi46rll32z8a7lmq0vmb3p8n0aks5ajn1n"; depends=[htmlwidgets igraph rjson shiny]; }; + edgedata = derive2 { name="edgedata"; version="0.1.0"; sha256="0fx8s2gq9haj66r2zm9hmq0g93g8xgkraakpdpzd8n37pp0ivv7f"; depends=[]; }; edina = derive2 { name="edina"; version="0.1.1"; sha256="1lpmidyxi54byrsnwwadkh5rr454635xrwa4v2wz8mqr2hngxis3"; depends=[ggplot2 jjb Rcpp RcppArmadillo reshape2 rgen]; }; editData = derive2 { name="editData"; version="0.1.2"; sha256="1ibpd2rlm6i9izyizmdhzxv8agrw920hxbin5y79cmf78rdg1sxy"; depends=[DT miniUI rstudioapi shiny tibble]; }; editrules = derive2 { name="editrules"; version="2.9.3"; sha256="07j8wj0fk34irqgsz70h2wad3wdjv5xl1cl702vxbr0nvmpw2ngl"; depends=[igraph lpSolveAPI]; }; @@ -7273,15 +7293,14 @@ in with self; { eegkitdata = derive2 { name="eegkitdata"; version="1.0"; sha256="1krsadhamv1m8im8sa1yfl7injvrc4vv3p88ps1mpn8hibk5g51m"; depends=[]; }; eel = derive2 { name="eel"; version="1.1"; sha256="0cv6dhw57yy140g73z94g9x1s42fpyfliv9cm2z1alm7xwap1l0x"; depends=[emplik rootSolve]; }; eemR = derive2 { name="eemR"; version="1.0.1"; sha256="1w3nwlrbxm7z4c3acx991zk5drgs67qys7kgl0qakh5vrdsrxw3v"; depends=[assertthat dplyr pracma purrr R_matlab rlist stringr viridis]; }; - eeptools = derive2 { name="eeptools"; version="1.2.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.2"; sha256="0m392wrkmgvys7a2bk2w1swfkjikkllng8sy8wb8s2j9y6c3wanp"; depends=[bayesm cluster ggplot2 GreedyEPL gridExtra MASS Matrix mcclust]; }; effectR = derive2 { name="effectR"; version="1.0.2"; sha256="1icr1sx98x3h8rbky1agdh809arhjqcypyajl7y50yis8a5pkycb"; depends=[ggplot2 reshape2 rmarkdown seqinr shiny viridis]; }; effects = derive2 { name="effects"; version="4.1-4"; sha256="1jbpyji7qn5hz8a6afsfbng0nx0a7w0v3v51wpmnbipfjchyalhy"; depends=[carData colorspace estimability lattice lme4 nnet survey]; }; - effectsize = derive2 { name="effectsize"; version="0.2.0"; sha256="1liix8rf8xq3hzi7684bl0s20iflsq6g5mxr5k59wp2qwn1i6aww"; depends=[bayestestR insight parameters]; }; + effectsize = derive2 { name="effectsize"; version="0.3.0"; sha256="0kijp4wamkidaxysc11dd4vhvnm4wnbi87871wcbwn27k5b6i5dg"; depends=[bayestestR insight parameters]; }; effectsizescr = derive2 { name="effectsizescr"; version="0.1.0"; sha256="0shfjk6r3bz04jakrn5nwgymjx60lk83i0akcx7zqfxp3k8yncs5"; depends=[Kendall]; }; efflog = derive2 { name="efflog"; version="1.0"; sha256="1sfmq7xrr6psa6hwi05m44prjcpixnrl7la03k33n0bksj8r1w6b"; depends=[]; }; - effsize = derive2 { name="effsize"; version="0.7.9"; sha256="01gl6bacsn7yyg9a3s5f6z6i115rxrdfi19vz551xq287k4i6qqn"; depends=[]; }; + effsize = derive2 { name="effsize"; version="0.8.0"; sha256="129g9nv6qmbh6z7gazx4vxs5myvcgdhszi28396gsvzrlzi0ik8b"; depends=[]; }; efreadr = derive2 { name="efreadr"; version="0.2.2"; sha256="1h27by1m451wrnw017005avs5yj3fjzrm2lq5153aqm1mbbxxwvs"; depends=[dplyr ensurer magrittr readr]; }; efts = derive2 { name="efts"; version="0.9-0"; sha256="1cdn37sij3q73z9gal6x3nnnds55whfj5ywyww119hx092xcb2h4"; depends=[lubridate magrittr ncdf4 plyr stringr udunits2 xts]; }; ega = derive2 { name="ega"; version="2.0.0"; sha256="04kwh24aap22yclmcrix3vi553qb30hd43mgfzpdl0cw3ibrh7xg"; depends=[ggplot2 mgcv]; }; @@ -7301,10 +7320,11 @@ in with self; { eigenprcomp = derive2 { name="eigenprcomp"; version="1.0"; sha256="156qyv7sl8nng55n3ay6dnpayyfrqv27ndz40xf4w92is9zmymy0"; depends=[]; }; eikosograms = derive2 { name="eikosograms"; version="0.1.1"; sha256="13s5wqcc8iwnhn3msrh9dfrvq9bwlby93p9v5wcnrm8m9iskax1s"; depends=[plyr]; }; eimpute = derive2 { name="eimpute"; version="0.1.0"; sha256="0q8b98fmfrbk00jr7gzqaij781g5v9wj883xphyrvr0khlr499xl"; depends=[Rcpp RcppEigen]; }; + einet = derive2 { name="einet"; version="0.1.0"; sha256="02v4k6031q2bcjkhbypzkgdj1lyvqbsi1nb0y40zb26bk2381ycq"; depends=[assertthat entropy igraph magrittr shiny]; }; eive = derive2 { name="eive"; version="2.3"; sha256="073hwx944db7zxq6yib6yvciaic11k49zl1iqphippcd5ygkad80"; depends=[Rcpp]; }; eivtools = derive2 { name="eivtools"; version="0.1-8"; sha256="0ynmrql6dv10m7cwba5mzwlbvp6ab53nzqqvk3ihwyiqzmnnmpk4"; depends=[R2jags]; }; eiwild = derive2 { name="eiwild"; version="0.6.7"; sha256="1fp4kvlmcjjnzn2a5cmlzaf6y5q6cdbbi2nmvjyqc4y1bmwh3srf"; depends=[coda gtools lattice]; }; - eixport = derive2 { name="eixport"; version="0.4.5"; sha256="13c717ws4b71x2dd7x33v72plqkd88nhsbxr0w3wm09xfana7l5b"; depends=[cptcity ncdf4 raster sf sfheaders silicate sp tidyr]; }; + eixport = derive2 { name="eixport"; version="0.4.6"; sha256="0jyz6xqhl893zf902i36fpmj7a8hncpp1s0n9qr8kkwjba6yd1ba"; depends=[cptcity ncdf4 raster sf sfheaders silicate sp tidyr]; }; elaborator = derive2 { name="elaborator"; version="1.0"; sha256="1jhs1hiwlww0sr3yacg5amr1mhwjwa10b374klrkkvzzw2y20p1x"; depends=[bsplus dendextend dplyr forcats gclus haven plotly purrr RColorBrewer reshape2 rlang seriation shape shiny shinyBS shinycssloaders shinydashboard shinyjs shinyWidgets tidyr V8]; }; elasso = derive2 { name="elasso"; version="1.1"; sha256="0nz3vw803dvk4s45zc9swyrkjwna94z84dn4vfj3j17h74a0cij2"; depends=[glmnet SiZer]; }; elastic = derive2 { name="elastic"; version="1.1.0"; sha256="1xg8gqa0maasx85fbff4vid2r8s0fgzj4iswyayybzik99zb26ly"; depends=[crul curl jsonlite R6]; }; @@ -7332,9 +7352,8 @@ in with self; { elo = derive2 { name="elo"; version="2.1.1"; sha256="1i6qcw2plw12v065142kx58d911zr1gcsd1xic152zxvh89nmhxx"; depends=[pROC Rcpp]; }; elsa = derive2 { name="elsa"; version="1.1-28"; sha256="01sj2a4yhv5m6qj6ih26zw4yzd8s27lll7yp0yysjjrwz79a0fbq"; depends=[raster sp]; }; emIRT = derive2 { name="emIRT"; version="0.0.11"; sha256="1h91q9vi9cv14bmkaakyynw2z9sx51w0c2kw2in0x91wx7scmd0p"; depends=[pscl Rcpp RcppArmadillo]; }; - emax_glm = derive2 { name="emax.glm"; version="0.1.2"; sha256="04di6bp97cxjbbszakb64y15bjmnd2j8zvxdj8gdbgmhxk9wmbwd"; depends=[AER MASS pander pracma pROC]; }; emayili = derive2 { name="emayili"; version="0.3.9"; sha256="0cc4i0d56k1l87ifa0x9vpfw0615hk7hzgyxfp68fh5yrj0fc6ab"; depends=[base64enc curl glue httr magrittr mime stringi]; }; - emba = derive2 { name="emba"; version="0.1.2"; sha256="0bf0wvzhjr0xig9rz6jkb08bb6jfv8za48lyqgp9fkkv1nnz9hjg"; depends=[Ckmeans_1d_dp igraph magrittr purrr rje usefun visNetwork]; }; + emba = derive2 { name="emba"; version="0.1.4"; sha256="133831zghkjr8bx2b995zw7rmn9vwws3xwkjzd9akz8myfdzp55v"; depends=[Ckmeans_1d_dp igraph magrittr purrr readr rje usefun visNetwork]; }; embed = derive2 { name="embed"; version="0.0.6"; sha256="1bwr32923b04cnvsm3pqzsw4rnihjqdfpqkh6pga520dw9x2w1dd"; depends=[dplyr generics keras lme4 purrr recipes rlang rstanarm tensorflow tibble tidyr uwot withr]; }; embryogrowth = derive2 { name="embryogrowth"; version="7.6"; sha256="0bsg904jikb1dqichkinpgm0difg17sfczw6q4zab6r02s7yb53s"; depends=[deSolve HelpersMG numDeriv optimx]; }; emdbook = derive2 { name="emdbook"; version="1.3.12"; sha256="0ls3zxxlwmdv7zn1v9i1y9zc2sn0hbgmyjvsj7zn3ajsw7wwlih6"; depends=[bbmle coda lattice MASS plyr]; }; @@ -7345,7 +7364,7 @@ in with self; { emld = derive2 { name="emld"; version="0.4.0"; sha256="16ikzkvl4xn7ixa4sfh21isx2gpppvx5ajpann26f35645pm51xk"; depends=[jsonld jsonlite xml2 yaml]; }; emma = derive2 { name="emma"; version="0.1-0"; sha256="0psd8lrbcqla8mkhp0wlassaaimgwlmqy5yv2wwcq59mc5k1v27f"; depends=[clusterSim earth]; }; emme2 = derive2 { name="emme2"; version="0.9"; sha256="035s4h95ychqb14wib0dqbg4sjy9q01fsryr0ri25g1hsi5f8lpm"; depends=[reshape]; }; - emmeans = derive2 { name="emmeans"; version="1.4.5"; sha256="10fmvmd6q4zjr6b18hhc85mwrzv778qzj6lwl9kbs2fsfvsgw7mm"; depends=[estimability mvtnorm numDeriv plyr xtable]; }; + emmeans = derive2 { name="emmeans"; version="1.4.6"; sha256="0mxk7ghlv4r6sna4897q1la2xgyn1dw3r9srhm9x4h5l4701avfa"; depends=[estimability mvtnorm numDeriv plyr xtable]; }; emoa = derive2 { name="emoa"; version="0.5-0.1"; sha256="0rkr4d4fyqxmsrlbzar27z97qkw4cl1dkvfnhbdwpgg9fi1cixmz"; depends=[]; }; emojifont = derive2 { name="emojifont"; version="0.5.3"; sha256="1cdrrl3hvrs8rskyy6zgr7q2mmg8yb9k8sld1m64zsp7y009g19k"; depends=[ggplot2 proto showtext sysfonts]; }; emon = derive2 { name="emon"; version="1.3.2"; sha256="19khjjpyxvzhzihqq15w02l5v5ryyvxlklz1ch2gkmqcpnvyga32"; depends=[MASS mgcv]; }; @@ -7386,8 +7405,8 @@ in with self; { entropy = derive2 { name="entropy"; version="1.2.1"; sha256="10vg4818q5g54pv2nn9x5i7pvky5nsv96syy47pz2mgqp1273cpd"; depends=[]; }; entrymodels = derive2 { name="entrymodels"; version="0.2.0"; sha256="18byy6ky37n0a3ixrl6jik9pqbv07sbfkm9vb7wrziyywdfqmzp8"; depends=[dplyr magrittr readr]; }; envDocument = derive2 { name="envDocument"; version="2.4.1"; sha256="074m7adnasvys28kjdgj9071fi90vsl4yv5zvpxik4crlx098dlw"; depends=[]; }; - envalysis = derive2 { name="envalysis"; version="0.3.3"; sha256="1ys93g5gxr9x1v4hg98dcpwa40n5xkh1j8drrmpnmxwq6gv01r6r"; depends=[drc ggplot2]; }; - enveomics_R = derive2 { name="enveomics.R"; version="1.7.0"; sha256="0nk356svi25lzw5iza0jmg6krxhizilm7ja3sgym65319jpcflbp"; depends=[fitdistrplus investr sn]; }; + envalysis = derive2 { name="envalysis"; version="0.4"; sha256="1qfg8z63qc6n8agv0g7n3qjcwid32axwkyyjjxa271by335aplha"; depends=[drc ggplot2]; }; + enveomics_R = derive2 { name="enveomics.R"; version="1.8.0"; sha256="00akdhqs7jabk7g33rwmxs92jcr39shy9s456nqxk6x4244d2vb3"; depends=[fitdistrplus investr sn]; }; enviGCMS = derive2 { name="enviGCMS"; version="0.6.0"; sha256="0d0a7zv3nlsk8dq7wn3mg0nnvry56r9zm4y593mr1shcnmfm6nyn"; depends=[animation BiocParallel broom crosstalk data_table dplyr DT genefilter ggplot2 ggraph ggridges igraph mixtools plotly RColorBrewer Rdisop reshape2 rmarkdown shiny shinythemes]; }; enviPat = derive2 { name="enviPat"; version="2.4"; sha256="1gvb7jmwwh4l44b50xmrq3bysr2iv6442yh9pdk6n81g3bgpz1d0"; depends=[]; }; enviPick = derive2 { name="enviPick"; version="1.5"; sha256="04q6zwqq2ip8b8h2n1jpgx1bzcvi7lazljs0806wiakbc79x232p"; depends=[readMzXmlData shiny]; }; @@ -7408,7 +7427,7 @@ in with self; { epicontacts = derive2 { name="epicontacts"; version="1.1.0"; sha256="0f4a1y311z3fxw7ygj6fgsq6d2qn0ivxsjlh742pkmg3jb63s0f3"; depends=[colorspace dplyr igraph magrittr threejs visNetwork]; }; epidata = derive2 { name="epidata"; version="0.3.0"; sha256="1b00k086wiwhhrlh4348wqqza1v0whakwy5h7q95rmgxz7lppiim"; depends=[dplyr httr jsonlite purrr readr rvest stringi tidyr xml2]; }; epiflows = derive2 { name="epiflows"; version="0.2.0"; sha256="09ri1p73ih0i08irc06ff169hi5vcl8bdi63b056kzxgmv17yqkp"; depends=[epicontacts geosphere ggmap ggplot2 htmltools htmlwidgets leaflet sp tibble visNetwork]; }; - epikit = derive2 { name="epikit"; version="0.1.0"; sha256="0whb36y8z5apyiywd2bhqnay3qr6b8h5rqp8mxkksrhifibjjx4w"; depends=[binom dplyr forcats glue rlang scales tibble tidyr tidyselect]; }; + epikit = derive2 { name="epikit"; version="0.1.1"; sha256="0wa7lfkkwygqmbyfjmwr4si2cdi7s1hd1bwsk1jaip1d3r0hyyrb"; depends=[binom dplyr forcats glue rlang scales tibble tidyr tidyselect]; }; epimdr = derive2 { name="epimdr"; version="0.6-5"; sha256="1nxdlz7gl9vrha9iw92y0s9dmm101gkz0rsqxqg1rdxanr6hs6sh"; depends=[deSolve polspline shiny]; }; epinet = derive2 { name="epinet"; version="2.1.8"; sha256="10bgq66n99kkz0nhmsz508aypxk57zk19p5l3xrb28n72k4rfgrf"; depends=[network]; }; epiphy = derive2 { name="epiphy"; version="0.3.4"; sha256="04wsppjycnrzrml3zxrpr0xdxxas3hj8rskiivx5vfmfjpwipq4r"; depends=[ggplot2 msm pbapply Rcpp transport]; }; @@ -7426,6 +7445,7 @@ in with self; { eponge = derive2 { name="eponge"; version="0.1.0"; sha256="19wd80l35acij793spxglcwz346i2iivk6n0q2304wjcca6qzds7"; depends=[rlang]; }; epr = derive2 { name="epr"; version="3.0"; sha256="0czfz6qkcpa2qqs3pqii27hgpdvdzfrvxl0ip67v58hamq7kvjfv"; depends=[car lme4]; }; epsiwal = derive2 { name="epsiwal"; version="0.1.0"; sha256="0lmcmiqcc1pjj1d0zyn0hc23if1lkm85p6vcjqbddpnv9ags2mbh"; depends=[]; }; + epuR = derive2 { name="epuR"; version="0.1"; sha256="0dx808dq78c1s78fv0my79ar7h20fyxa0gpfdv85zi80v9g82g4z"; depends=[data_table lubridate openxlsx stringr xts zoo]; }; epubr = derive2 { name="epubr"; version="0.6.1"; sha256="0rp9q6hriilps5h6nc1226w5dvzws1g78pg3ldrq2r4dakpvsmjj"; depends=[dplyr magrittr tibble tidyr xml2 xslt]; }; epxToR = derive2 { name="epxToR"; version="0.4-0"; sha256="1vw9czdxp80jpvcc8bj5m4fshlavlawc1735m0s0d0x14z3giy6g"; depends=[httr XML]; }; eq5d = derive2 { name="eq5d"; version="0.7.0"; sha256="0k9hvazynphhpwpbxi9dgmrjqp0nlmgkikx6qpdg5hp2psl0lmyx"; depends=[]; }; @@ -7467,7 +7487,7 @@ in with self; { esaddle = derive2 { name="esaddle"; version="0.0.6"; sha256="0i89yid4zryc95aj8n512wj3cs5nx351w4rc1nghq5a7vp139fa7"; depends=[doParallel mvnfast plyr Rcpp RcppArmadillo]; }; esaps = derive2 { name="esaps"; version="0.1.0"; sha256="1rchs4i7n221gyhj9kbka4zmi2lf72q3ak2pdxkr7w6pcx6803yz"; depends=[plyr readODS readxl]; }; esc = derive2 { name="esc"; version="0.5.1"; sha256="0gns7gz55p6pha05413r3hlvd7f2v1amxkg13d197mab1ypqic7q"; depends=[]; }; - escalation = derive2 { name="escalation"; version="0.1.1"; sha256="16dw8c6cjmzazchwxyh5x2gqpbiaqwrfbjiv7bp5b06kazy106s1"; depends=[BOIN dfcrm dplyr gtools magrittr purrr stringr tibble tidyr tidyselect]; }; + escalation = derive2 { name="escalation"; version="0.1.2"; sha256="1s1kkh9wmd4sanmyramq4fa23fpb26v9nk4d2yg2phgaigxyp041"; depends=[BOIN dfcrm DiagrammeR dplyr ggplot2 gtools magrittr purrr RColorBrewer stringr tibble tidyr tidyselect viridis]; }; eseis = derive2 { name="eseis"; version="0.5.0"; sha256="03pjcms3aj7sm2wrld64v1dw53bqn9pmsayndma03abjh66rblii"; depends=[caTools fftw IRISSeismic matrixStats multitaper raster Rcpp reticulate rgdal rmarkdown shiny signal sp XML]; }; eshrink = derive2 { name="eshrink"; version="0.1.0"; sha256="0s1jl652za7qwv70kmc1h3vbwlijl49527pwpm0z347lz2jdcigj"; depends=[glmnet MASS]; }; esmisc = derive2 { name="esmisc"; version="0.0.3"; sha256="1d6xrdxwn85c8s60s7vzaymh7wa9f7fzd79hq5spzd12fr3zisvj"; depends=[ggplot2 raster readr]; }; @@ -7476,7 +7496,7 @@ in with self; { esreg = derive2 { name="esreg"; version="0.5.0"; sha256="1njwqm3hrcxwl6y7gwa4zq0q5139293qk503ahw23dxwzdsiy2z5"; depends=[Formula quantreg Rcpp RcppArmadillo]; }; essHist = derive2 { name="essHist"; version="1.2.2"; sha256="0rvlxfcl42h4pjqf37mx7bc4k21iwvnys6l5rf2jsl7yk1b9hmbn"; depends=[Rcpp]; }; essurvey = derive2 { name="essurvey"; version="1.0.5"; sha256="078bm5knrhij4rdv7hqv5ci0dfdci7lw4yrqbikp8miapivv88vp"; depends=[haven httr rvest tibble xml2]; }; - estatapi = derive2 { name="estatapi"; version="0.3.0"; sha256="0gjc5x1b2l5qnwdg77nzy6d7bf9q93ll39sfy89izqm8wsydwwkp"; depends=[dplyr httr purrr readr]; }; + estatapi = derive2 { name="estatapi"; version="0.4.0"; sha256="0wp5w9w0b832fnl7kchjqmychnf5896q50grw8hwdc1km14dfzkg"; depends=[dplyr httr purrr readr rlang tibble]; }; estimability = derive2 { name="estimability"; version="1.3"; sha256="0cifdaa71spkcxl4db4z884jrya865sg3dhcv4isd8fnzg2pjcd3"; depends=[]; }; estimatr = derive2 { name="estimatr"; version="0.22.0"; sha256="1kfih2fak7w9zqbhjgfrysdzrk4lpcx9p23x0gys4f9hxl9j1pm2"; depends=[Formula generics Rcpp RcppEigen rlang]; }; estmeansd = derive2 { name="estmeansd"; version="0.2.0"; sha256="07xbdsfz8vidp8pv2ix5g2y6y2cks14fzbjx74pa17696rnklrw3"; depends=[metaBLUE]; }; @@ -7489,7 +7509,7 @@ in with self; { ether = derive2 { name="ether"; version="0.1.6"; sha256="1f3phh5vdfvlxqrpzsn6ysz0q3mbhr862fzsd3sp8m8qhry86cbx"; depends=[dplyr httr jsonlite Rmpfr]; }; ethnobotanyR = derive2 { name="ethnobotanyR"; version="0.1.7"; sha256="13xbiywrw6ixby9s1ipwb45p9c96d75vw906fpzy6axdv2c4pp70"; depends=[circlize cowplot dplyr ggplot2 ggridges magrittr reshape]; }; etl = derive2 { name="etl"; version="0.3.8"; sha256="19m1sp3ryqb1gw7i9lh8dpmwbgy0c0dpsivj27wkr36bdhfvrfls"; depends=[DBI downloader dplyr janitor lubridate readr rlang rvest stringr tibble usethis xml2]; }; - etm = derive2 { name="etm"; version="1.0.5.1"; sha256="0m41pm277sd50pharigcqzr1a2g92wnmdf6fcab6fx16ia2fzrm7"; depends=[data_table lattice Rcpp RcppArmadillo survival]; }; + etm = derive2 { name="etm"; version="1.1"; sha256="02yvh473l5qajaymhsxwb235a9r7q3nsig9a9mrfca68xih8yvgd"; depends=[data_table lattice Rcpp RcppArmadillo survival]; }; etma = derive2 { name="etma"; version="1.1-1"; sha256="0g9244yx50y1gw0f37hskbcgyv4nldmzr86v3rmf3afabmjbyzjj"; depends=[]; }; etrunct = derive2 { name="etrunct"; version="0.1"; sha256="0ayazgyqlc8jcqr03cwfmfhm4pck6xri1r6vkgqy4arqkrrnrcqr"; depends=[]; }; eudract = derive2 { name="eudract"; version="0.9.2"; sha256="1yl72vhfaqq005h00bxafdqxpbm0qf9349gd9fq80h5vy20qrm3q"; depends=[dplyr magrittr tidyr xml2 xslt]; }; @@ -7501,7 +7521,7 @@ in with self; { evabic = derive2 { name="evabic"; version="0.0.1"; sha256="196gmq8v8a45zkk4qqr3hzbrrxnmwryb0q81bqcdap5zf4w7153x"; depends=[]; }; evalITR = derive2 { name="evalITR"; version="0.1.0"; sha256="05nqcy9x3f2ks9xvzd3cd000q2kybdycgrlvz5pv7ipw1dlysgg2"; depends=[]; }; evaluate = derive2 { name="evaluate"; version="0.14"; sha256="0a2y7j534gbgixkwj9r1z76l2vssw4g1hznzbpclc076wkdqpj58"; depends=[]; }; - evaluator = derive2 { name="evaluator"; version="0.4.1"; sha256="1h1s2n09i6r9w17lr8ry9acg6kfsmf3c4w45jdwvz1pmy1ss8whi"; depends=[cli crayon dplyr extrafont ggplot2 magrittr mc2d purrr readr readxl rlang rstudioapi scales stringi tibble tidyr vctrs viridis]; }; + evaluator = derive2 { name="evaluator"; version="0.4.2"; sha256="0k2fwim023lbnxq67hhv03cds824x8n374pnqsk67ajgahxwh3by"; depends=[cli crayon dplyr extrafont ggplot2 magrittr mc2d purrr readr readxl rlang rstudioapi scales stringi tibble tidyr vctrs viridis]; }; evclass = derive2 { name="evclass"; version="1.1.1"; sha256="00lbhcgswpv0amz0mb93kx9p91sf0d7zvxfw9i8x1zpmpfd6nhcj"; depends=[FNN]; }; evclust = derive2 { name="evclust"; version="1.1.0"; sha256="06w1spqz5gidycwzwf51414iy182bc1ncis7m4bwx6a268vrznnx"; depends=[FNN limSolve Matrix mclust plyr quadprog R_utils]; }; evd = derive2 { name="evd"; version="2.3-3"; sha256="1d2r8ppblxrq6s60pf0gv4rp8ja58j8lbpax8a996ais1hpfzi9g"; depends=[]; }; @@ -7511,7 +7531,7 @@ in with self; { eventdataR = derive2 { name="eventdataR"; version="0.2.0"; sha256="11apbbj68x1kxpwvihf4ng7wxy54jl1aw7r9hyq6gn7h8sk6lpjn"; depends=[]; }; events = derive2 { name="events"; version="0.5"; sha256="1zka4ygymifs8snd7cabl11b5lg3f8g8370dkm9ybl40bn8vvqq2"; depends=[]; }; eventstream = derive2 { name="eventstream"; version="0.1.0"; sha256="0imrs872b6fjvw74smniiiicvizyign6wmwwybljk704cshzcy2f"; depends=[abind AtmRay changepoint dbscan glmnet MASS tensorA]; }; - evgam = derive2 { name="evgam"; version="0.1.1"; sha256="0hhhbawmaywv3fb2qclngdsa4bdmrrl1kgy297hdhmlg9nqzanp6"; depends=[mgcv Rcpp RcppArmadillo]; }; + evgam = derive2 { name="evgam"; version="0.1.2"; sha256="0wnyrvfg1pj1adwmsvqwpnz31pfhj6vdsivj2mmdzqh4milf9l22"; depends=[mgcv Rcpp RcppArmadillo]; }; evian = derive2 { name="evian"; version="2.1.0"; sha256="1slnzq55gg3p16fs22v69mafiggiy5f70sj8fh65lc0hphybh6w2"; depends=[doParallel foreach ProfileLikelihood sandwich]; }; evidence = derive2 { name="evidence"; version="0.8.10"; sha256="02kqk95kx4nv13fg6z55a5rv6sq6lv8azg0jjxbkg1j6hg15p7ai"; depends=[LaplacesDemon lattice LearnBayes loo rstan rstanarm]; }; evidenceFactors = derive2 { name="evidenceFactors"; version="1.8"; sha256="0g9w1q8ir6qmvk5vvbpipiyias7nj74ks2h94ja7al8sz68gralx"; depends=[sensitivitymv]; }; @@ -7533,7 +7553,7 @@ in with self; { exactci = derive2 { name="exactci"; version="1.3-3"; sha256="03r35f6dyrck5pf43ypb1sjwfnvkhjkm1mbms3wh67ayfs2ypn0s"; depends=[ssanv]; }; exactextractr = derive2 { name="exactextractr"; version="0.2.1"; sha256="0wspmg4vb96yq38g17f10q54k8ijpzlhh3hac1d2dn9zgk3riffh"; depends=[raster Rcpp sf]; }; exactmeta = derive2 { name="exactmeta"; version="1.0-2"; sha256="1v807ns799qajffky4k18iah0s3qh2ava6sz5i85hwx9dhkz19h4"; depends=[]; }; - exampletestr = derive2 { name="exampletestr"; version="1.5.2"; sha256="0lfhgjirsl2b1vksjfrw3wlvw6x34d20vldh313qkjrg2yihpk1q"; depends=[checkmate filesstrings fs glue magrittr ore purrr readr rlang roxygen2 stringr styler usethis withr]; }; + exampletestr = derive2 { name="exampletestr"; version="1.6.1"; sha256="1szkx35wn24yi6iw6hkl85hzwqd8glvjq69hsypsxg1k4r1i99wg"; depends=[checkmate filesstrings fs magrittr ore purrr readr rlang roxygen2 rstudioapi stringr styler usethis withr]; }; exams = derive2 { name="exams"; version="2.3-6"; sha256="1cn0gmaayv857zl7l7zmnblmpx84qkjxqrigrymy578y04qjc4zx"; depends=[]; }; exceedProb = derive2 { name="exceedProb"; version="0.0.1"; sha256="02pb8b0rxygbv6501rcr2hb0bhz1r78k5znav161kk25fb9bxs5v"; depends=[BH Rcpp]; }; excelR = derive2 { name="excelR"; version="0.4.0"; sha256="1pb4sy54zjv5vrh7gjjv7qlpab74km6mfsmfyl0yhmr0jx01hrw0"; depends=[htmlwidgets jsonlite]; }; @@ -7566,7 +7586,7 @@ in with self; { extRC = derive2 { name="extRC"; version="1.0"; sha256="1cawfkd98n70y54qg8i2h82xrrgygr48sq31yzx9hllkx33pk97d"; depends=[MASS]; }; extRemes = derive2 { name="extRemes"; version="2.0-11"; sha256="0hmgynxhzswqnhwb2sxrkczgam8c17s3vpxqc5bcz0bwczpxxyvm"; 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]; }; + extdplyr = derive2 { name="extdplyr"; version="0.1.5"; sha256="1zbnp0h0lv1dr40dhdw6ii8rmc5lxcq4wjsm83xpd3y8x9xpglnl"; depends=[dplyr lazyeval tidyr]; }; exteriorMatch = derive2 { name="exteriorMatch"; version="1.0.0"; sha256="0cdfj1n502iws1g03rk7x0c18zyazqf3vci9kjm6lrv4j2qwrvip"; depends=[]; }; extfunnel = derive2 { name="extfunnel"; version="1.3"; sha256="162w5b2wjs3yqy8jisamsapav6swa8sskf1b6x5hglnrv3i4qyyy"; depends=[rmeta]; }; extlasso = derive2 { name="extlasso"; version="0.2"; sha256="05774y0i01lrbyws6zx5ymhcglllv1wc7gzrnyx8i5d1lxdinsyd"; depends=[]; }; @@ -7623,7 +7643,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="5.0"; sha256="1gii3mdii9nw423xxn9mhv1pjbw967wdarn828w04zm9dkdcwm48"; depends=[coda corrplot doParallel foreach ggplot2 label_switching MASS mclust mvtnorm RColorBrewer Rcpp RcppArmadillo]; }; - fable = derive2 { name="fable"; version="0.1.2"; sha256="0v5nqxdjwvzanzzl0fcb04zlrah8irbz09grlhd04lz8mmj8n8ih"; depends=[dplyr fabletools Rcpp rlang tidyr tsibble]; }; + fable = derive2 { name="fable"; version="0.2.0"; sha256="1z3yaf61zyz92lykzwid4scmfrpy73r7kq4zv01pcj9573p5khy3"; depends=[dplyr fabletools Rcpp rlang tibble tidyr tsibble]; }; fabletools = derive2 { name="fabletools"; version="0.1.3"; sha256="16lkr26sl88vnww2fsqiqdv4ljk0y1fyha55g0sq4vsnypg9bhdz"; depends=[dplyr generics ggplot2 R6 rlang tibble tidyr tidyselect tsibble vctrs]; }; fabricatr = derive2 { name="fabricatr"; version="0.10.0"; sha256="0kh2mfgyqz3fpilc4wycxj3vihhbdnjzsjrsp88nmsk0p5mjmljj"; depends=[rlang]; }; face = derive2 { name="face"; version="0.1-5"; sha256="0n7vlq29krsdcp8r32irhvf7xbcxy5g7663qncmbhj5x45sviqh6"; depends=[Matrix matrixcalc mgcv]; }; @@ -7631,7 +7651,7 @@ in with self; { facilitation = derive2 { name="facilitation"; version="0.5.2"; sha256="0gyqa3njyynvdhfziq33xqc7cjhszii67mk8809ncvh6abkdx1hw"; depends=[animation Matrix Rcpp]; }; factoextra = derive2 { name="factoextra"; version="1.0.7"; sha256="1allvdjhd3pq8xz30b1cymwcik5iaahghrjrlnn54cwkfhfg0kv2"; depends=[abind cluster dendextend FactoMineR ggplot2 ggpubr ggrepel reshape2 tidyr]; }; factoptd = derive2 { name="factoptd"; version="1.0.3"; sha256="1ir50im3kr1xhqk4qwrm2h5fq9gqgrwshbamvjlf8n1wnn03mcb6"; depends=[MASS partitions]; }; - factor_switching = derive2 { name="factor.switching"; version="1.0"; sha256="14h8m73lmayvwgi2mnfggs2q1nr2apbsddr7m46ws22nyzz6q7am"; depends=[coda HDInterval lpSolve]; }; + factor_switching = derive2 { name="factor.switching"; version="1.1"; sha256="126f7939xq3g27yfalp85ivwfpk93fs8gcig037z42i0xsywh9kp"; depends=[coda HDInterval lpSolve]; }; factorEx = derive2 { name="factorEx"; version="1.0.0"; sha256="12ykf42x5fqddlsvv3556sawfakribj0pwm5vfcg3y2y99a26qxg"; depends=[arm doParallel estimatr foreach genlasso igraph mvtnorm pbapply pbmcapply prodlim sandwich stringr]; }; factorMerger = derive2 { name="factorMerger"; version="0.4.0"; sha256="127k5h1gbbnjr6gxgck2n9glvvwkd69xq7n6gzmrq8gszk8v1x5m"; depends=[agricolae colorRamps dplyr forcats formula_tools ggplot2 ggpubr knitr magrittr MASS mvtnorm proxy reshape2 scales survival]; }; factorQR = derive2 { name="factorQR"; version="0.1-4"; sha256="1vl01fm5qfyhnqbl5y86vkr50b8cv07vzlqs3v6smqaqq6yp4lv4"; depends=[lattice]; }; @@ -7649,7 +7669,7 @@ in with self; { fairness = derive2 { name="fairness"; version="1.0.1"; sha256="1n17vrp0a3zii3444a2a7k33ffmyxmm15c8m7ln2fypya1z2pc5l"; depends=[caret devtools e1071 ggplot2 pROC]; }; faisalconjoint = derive2 { name="faisalconjoint"; version="1.15"; sha256="08sb4za8qyadvigq2z7b0r44qk2lpahpnz9nv16xfjb1zhdkz5w3"; depends=[]; }; fakeR = derive2 { name="fakeR"; version="1.0"; sha256="0f4ngnd8s34j1327zp3aqnsiw0gfxkp1i24ng20hrmfl13s1qmxp"; depends=[mvtnorm polycor pscl VGAM]; }; - fakemake = derive2 { name="fakemake"; version="1.7.0"; sha256="09z0pxpyk13m9bkw8b39axznrpa3l3ifrhfs3256il6kkq6sm749"; depends=[callr igraph MakefileR withr]; }; + fakemake = derive2 { name="fakemake"; version="1.7.1"; sha256="0mckcgc12yxmpsgkcnmaf1pa634rz8x1zc97h023pnsd1cdwsp4l"; 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=[]; }; @@ -7707,7 +7727,7 @@ in with self; { fasttime = derive2 { name="fasttime"; version="1.0-2"; sha256="11i4c0zrkvvqsax0az1fvmc0jxfsjyx28434k1qgzhj9g2j9m9cf"; depends=[]; }; fat2Lpoly = derive2 { name="fat2Lpoly"; version="1.2.4"; sha256="01a9d6b2f6g858vg64kr0w0qmv2jqhk9kk3hb6jdr2rly4j8p14x"; depends=[kinship2 multgee]; }; fauxnaif = derive2 { name="fauxnaif"; version="0.5.6"; sha256="1fgaj3rl2aqdf2x8z9lp8p5g7bfii98g4h2mmlhic4g135r7bznp"; depends=[glue magrittr rlang]; }; - fauxpas = derive2 { name="fauxpas"; version="0.2.0"; sha256="0l77gxcf06p984z9vgaf1kag609h9qyrgav84lxkv97h6f3fflnc"; depends=[httpcode R6 whisker]; }; + fauxpas = derive2 { name="fauxpas"; version="0.5.0"; sha256="129fzqb7wsskbn50s8x0marr4wm8jrns6hiycqcsk166k3dnyyy8"; depends=[httpcode R6 whisker]; }; favnums = derive2 { name="favnums"; version="1.0.0"; sha256="0siax7gjr25lpf1li3hawx6nviggs68c0lap2d9i38azlhvj891w"; depends=[]; }; fbRads = derive2 { name="fbRads"; version="0.2"; sha256="1a65gfvizzm6psspcvlhkxligdf9j1whrgzkg7ww520lk3z8lnnd"; depends=[bit64 data_table digest futile_logger jsonlite plyr RCurl]; }; fbRanks = derive2 { name="fbRanks"; version="2.0"; sha256="17kbmdpgqkj2n951c6mdsrgfga6kiij1gqiw1wpi0q3fq4dlfrzx"; depends=[igraph stringr]; }; @@ -7723,7 +7743,7 @@ in with self; { fcros = derive2 { name="fcros"; version="1.6.1"; sha256="04yr6lqs38lczsmdvdm78qn63836qj7xwspgh3h3n3gh8cssd83x"; depends=[]; }; fcuk = derive2 { name="fcuk"; version="0.1.21"; sha256="1sb7p1m5qb88028mrw95lhh8l7dxj696hjh88nfsdpnscryknfpv"; depends=[magrittr purrr stringdist tibble]; }; fdANOVA = derive2 { name="fdANOVA"; version="0.1.2"; sha256="1pycq5a4czqzi8wcfmlc9ncg827j7n0qxyj90wcv39nbcrnl3da1"; depends=[doBy doParallel fda foreach ggplot2 magic MASS]; }; - fda = derive2 { name="fda"; version="2.4.8.1"; sha256="0g50kj1dx7zarjv0lgwyzd2c7bv6di7nkndmywday5vjywgl8m7a"; depends=[Matrix]; }; + fda = derive2 { name="fda"; version="5.1.4"; sha256="0js4ggl3aiwsqk6npwz72yhcznkb63smddds24ngf6a0p8yp5p2x"; depends=[Matrix]; }; fda_usc = derive2 { name="fda.usc"; version="2.0.2"; sha256="0z44vkzjm2h6r5af0k1iic1szvw82rbwjrm541zlwn2jycj4q96a"; depends=[doParallel fda foreach iterators MASS mgcv nlme]; }; fdaACF = derive2 { name="fdaACF"; version="0.1.0"; sha256="19cnjs05cdln1jg568ybj1qsb8s848l8fzcw1p5i8rh92gm2x4w4"; depends=[CompQuadForm pracma]; }; fdaMixed = derive2 { name="fdaMixed"; version="0.6"; sha256="0hyhb67qvvhyq68k5h4ffvsl4lmw66nfy5l14kwxnn42h3b810sc"; depends=[Formula Rcpp RcppArmadillo]; }; @@ -7740,7 +7760,7 @@ in with self; { fdrci = derive2 { name="fdrci"; version="2.1"; sha256="1sgrsmlz7sbr1maw3qnpzqz3z75fh5nyiibpsq8j0y12xac8d0x3"; depends=[]; }; fdrtool = derive2 { name="fdrtool"; version="1.2.15"; sha256="1h46frlk7d9f4qx0bg6p55nrm9wwwz2sv6d1nz7061wdfsm69yb5"; depends=[]; }; fds = derive2 { name="fds"; version="1.8"; sha256="1284vncixrzrz9x6b52gslrbrbia07sd0xac7nwdqhp5f5v5wfi0"; depends=[rainbow RCurl]; }; - fdth = derive2 { name="fdth"; version="1.2-1"; sha256="0rr9p2rns5ws111iqcicrlpcv47fkbxf161yxkkzfs2l3f1kgw14"; depends=[]; }; + fdth = derive2 { name="fdth"; version="1.2-5"; sha256="01phrn8x245kplljjajqlsma7847j058spbxajnklamywf002qzr"; depends=[xtable]; }; feasts = derive2 { name="feasts"; version="0.1.3"; sha256="16fzwgyhb99cxn6ynq3qxdzf0gyqjh9q7sa9ma5rr23cr460rsab"; depends=[dplyr fabletools ggplot2 lubridate rlang scales slider tibble tidyr tsibble vctrs]; }; feather = derive2 { name="feather"; version="0.3.5"; sha256="1gxd0h2m56sjjlzn4dry6s13nddxc4l5i11gsvavaf2dwbahdzsh"; depends=[hms Rcpp tibble]; }; feature = derive2 { name="feature"; version="1.2.13"; sha256="07hkw0bv38naj2hdsx4xxrm2dngi6w3rbvgr7s50bjic8hlgy1ra"; depends=[ks misc3d rgl]; }; @@ -7753,14 +7773,14 @@ in with self; { federalregister = derive2 { name="federalregister"; version="0.2.0"; sha256="0qr8nd3ylnwcv1wxspw5i7ray5sh30zr648spg0lpqq8dp2b8p7b"; depends=[curl httr jsonlite]; }; fedregs = derive2 { name="fedregs"; version="1.0.0"; sha256="171j6r6qxnx9gk9x9gpdyh51ssrgmf7sczc4889qr3qqw15sm4bn"; depends=[dplyr httr magrittr purrr rvest stringi tidyr tidytext xml2]; }; fedreporter = derive2 { name="fedreporter"; version="0.2.1"; sha256="18hs358iyxmbh28jy9f65zvanpr6bk4gq75qbj255y1zzdsjr9x1"; depends=[httr jsonlite]; }; - feedeR = derive2 { name="feedeR"; version="0.0.7"; sha256="08mnfi96qkr1fj53ywqmya957swcwrfd3hqk0qaf2ni96sxxnp98"; depends=[digest dplyr lubridate RCurl XML]; }; + feedeR = derive2 { name="feedeR"; version="0.0.8"; sha256="15fl3xb7mp7as2hl97l2vvl2k8cp48dnzy17jgrw5g1hg4yk1wgh"; depends=[digest dplyr lubridate readr stringr tibble xml2]; }; feisr = derive2 { name="feisr"; version="1.0.1"; sha256="0pwaj509qz6z4rz54b10xmv2476qygmrm4bpc3szah6pf2pf0zmm"; depends=[aod Formula plm Rdpack]; }; fellov = derive2 { name="fellov"; version="0.1"; sha256="0z4b08ykajzwa5852dknqz5qqlmhklbwdq8x5zhyfmwba5zfbjav"; depends=[]; }; felp = derive2 { name="felp"; version="0.2.2"; sha256="1kd2619cj8697l1zpigz78vshc5gd8yvrg7zmw3mik7pjafz1k32"; depends=[prettycode]; }; fence = derive2 { name="fence"; version="1.0"; sha256="18l3fliww60d9n9hbfdny5vr9mi78krwpjj5sypdsb77d6332h9q"; depends=[fields ggplot2 lme4 MASS sae snow snowfall]; }; fergm = derive2 { name="fergm"; version="1.1.4"; sha256="1d979z2m5f13i1w9d8kh9rnaafavsap169w0nycpd5j2f3dfhyn7"; depends=[ergm extrafont ggplot2 matrixStats network reshape2 rstan]; }; fermicatsR = derive2 { name="fermicatsR"; version="1.4"; sha256="1587f67fypj22rdi1319zq765lcc9z518bzl1jr4lz6c8lrzfm9i"; depends=[]; }; - ff = derive2 { name="ff"; version="2.2-14"; sha256="1w724q4jpzbvzpilb2ifviaxkjgk9lzwxz9gksnvicbmfa20fqqw"; depends=[bit]; }; + ff = derive2 { name="ff"; version="2.2-14.2"; sha256="1r1pbrf5s4rdm3msxxr8fy1f2xjihqciclsnvxf59qzz6g1nmh7q"; depends=[bit]; }; ffbase = derive2 { name="ffbase"; version="0.12.8"; sha256="0mjk7dkq1ginqqfvngzny747ggf9a8fd7kblq96n5ys1jrwjyqhq"; depends=[bit fastmatch ff]; }; ffmanova = derive2 { name="ffmanova"; version="1.1.0"; sha256="0019m9vxnh5yxr5k7zflzyhd533a842cjjkcpqyannshnrbfndvy"; depends=[]; }; ffmetadata = derive2 { name="ffmetadata"; version="1.0.0"; sha256="0gjv5fl3p0kz28c91l4qf34a2685a24l5841ixdg7wivfs5v9npv"; depends=[httr jsonlite]; }; @@ -7792,17 +7812,18 @@ in with self; { filesstrings = derive2 { name="filesstrings"; version="3.1.5"; sha256="072alawp6j08mwlw1pz50g3lfi726kpsc744x5fvy71d7w4gqn6l"; depends=[checkmate magrittr matrixStats ore rlang strex stringi stringr tibble withr]; }; filling = derive2 { name="filling"; version="0.2.1"; sha256="17bhfzvzdyri8yx7b40yhdx3x2gb2vy2i8sz2cyjyw9idnd8svmr"; depends=[CVXR nabor Rcpp RcppArmadillo Rdpack ROptSpace RSpectra]; }; fillr = derive2 { name="fillr"; version="1.0.0"; sha256="1gx1ihp8j90ywmm6mmmfq4jd6apxawk9s5dfw3jq0wm1c290zqpv"; depends=[]; }; - finalfit = derive2 { name="finalfit"; version="1.0.0"; sha256="16bddxbj02yzlkvsn50r5qmqjbhlhpzi3q6mc8hp1afd1vydpmd3"; depends=[boot broom dplyr forcats GGally ggplot2 gridExtra lme4 magrittr mice pillar pROC purrr scales stringr survival tidyr]; }; - finbif = derive2 { name="finbif"; version="0.2.0"; sha256="1wb4hl5j2g3fgapd7x8jl2180s48p51nngyb8zvs7jacl32a04bh"; depends=[digest httr jsonlite lubridate lutz]; }; + finalfit = derive2 { name="finalfit"; version="1.0.1"; sha256="0ndnsllz8p96jj6in4ffqpfdawp45rh1fn2ralcrgdldhs6lg1xq"; depends=[boot broom dplyr forcats GGally ggplot2 gridExtra lme4 magrittr mice pillar pROC purrr scales stringr survival tidyr]; }; + finbif = derive2 { name="finbif"; version="0.3.0"; sha256="0f5mkwinnfqhv0kgywbzi1lhfdhnh5mhhh8kj5pyxfwncbg109z4"; depends=[digest httr jsonlite lubridate lutz]; }; finch = derive2 { name="finch"; version="0.3.0"; sha256="1cglyq3b0cvl05yrnpy6xn0nj0n817hgpcsxp3m07cvj8xidib02"; 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=[]; }; findviews = derive2 { name="findviews"; version="0.1.3"; sha256="1l1yhw5hvrn0rpkdsch8m69d2q5284jwccvv7r4ia4m0iqjfipj7"; depends=[ggplot2 gridExtra scales shiny]; }; fingerPro = derive2 { name="fingerPro"; version="1.1"; sha256="1a1lj8gyrbgcg8hr03cj2bjzlaafddspri7abc83ys1raqwd4j68"; depends=[car GGally ggplot2 gridExtra klaR MASS plyr Rcmdr Rcpp RcppGSL RcppProgress reshape rgl scales]; }; fingerprint = derive2 { name="fingerprint"; version="3.5.7"; sha256="04jcwkydjrs31pia6kq8z2n9s54im950q08hs2ay15xjxxkmb8ic"; depends=[]; }; - fingertipsR = derive2 { name="fingertipsR"; version="1.0.2"; sha256="15zhvdxp2l48b69hwq9bzafp94v405k5cw6824pi8kyslh95ibp8"; depends=[curl dplyr DT httr jsonlite miniUI readr rlang shiny shinycssloaders]; }; + fingertipsR = derive2 { name="fingertipsR"; version="1.0.3"; sha256="0r67d47w4qvxh7n70600z0i1s9ykpp0jshay69clgbmavl0vg7hv"; depends=[curl dplyr DT httr jsonlite miniUI readr rlang shiny shinycssloaders]; }; fingertipscharts = derive2 { name="fingertipscharts"; version="0.0.10"; sha256="1l3mirspz28djlzma04lkkynfbz8qfq0asr662q102j31qx6vnm4"; depends=[curl dplyr geojsonio ggplot2 httr leaflet lemon mapproj purrr rlang scales sf stringr tibble tidyr]; }; finiteruinprob = derive2 { name="finiteruinprob"; version="0.6"; sha256="0z4l0crymh58chxniqq70fqmvi6f5jkgvz72vbc7s3l9lrrapgr3"; depends=[numDeriv sdprisk]; }; + finity = derive2 { name="finity"; version="0.1.4.1"; sha256="0xs3vx0vj165hj4dq8ivrdf6fcvj23zhp2ai79rgpyb5rr5ndkvc"; depends=[BH Rcpp RcppArmadillo stabledist]; }; finreportr = derive2 { name="finreportr"; version="1.0.1"; sha256="1mansiyl4p4zqc1h2aw9zgzb3fy4mppgmshdm8mcf4nbm340g4vk"; depends=[curl dplyr httr rvest XBRL xml2]; }; fipe = derive2 { name="fipe"; version="0.0.1"; sha256="055jav8h4wws76jahm2d5dj49wkvzchh3f2vk5d50pny4dc7smar"; depends=[dplyr forcats furrr future httr jsonlite lubridate magrittr purrr readr stringr tibble tidyr]; }; firebase = derive2 { name="firebase"; version="0.1.0"; sha256="154a386ga9bjgam9rxp0y9033hx55p7f3294z52r6dz2y87h3lz2"; depends=[cli R6 shiny]; }; @@ -7814,7 +7835,7 @@ in with self; { fishmethods = derive2 { name="fishmethods"; version="1.11-1"; sha256="049a25rwxqy6a8jfm0irjka3bl7vkask32f9h7fsr5ddlyzvg5pz"; depends=[boot bootstrap data_table lme4 MASS numDeriv]; }; fishmove = derive2 { name="fishmove"; version="0.3-3"; sha256="1knbv087cg0czjcgdbrlpg69pp1dxb57b7ak5j1mcy7ay3a41a9h"; depends=[boot ggplot2 MASS plyr]; }; fishtree = derive2 { name="fishtree"; version="0.3.2"; sha256="19kq38l4cm7g2frvf2zdlk1j636k2f5k0bf6v7wn2zcmivy0xzsw"; depends=[ape jsonlite memoise rlang]; }; - fishualize = derive2 { name="fishualize"; version="0.1.0"; sha256="17ywlnjq1digkc73r9bc0czdwh7f3sp8lzbh53rx99dad7bpm9kd"; depends=[ggplot2 gridExtra png]; }; + fishualize = derive2 { name="fishualize"; version="0.2.0"; sha256="13z6n62fpans1fxjxlpz2xqqpq0ng5via67vk4nkvp0nxmlrlhky"; depends=[downloader dplyr ggplot2 gridExtra httr magrittr png rlang scales stringr tidyr]; }; fit_models = derive2 { name="fit.models"; version="0.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=[]; }; @@ -7832,17 +7853,17 @@ in with self; { fivethirtyeight = derive2 { name="fivethirtyeight"; version="0.5.0"; sha256="00cc7kjs54wk2cxbkd14gldsrjmf4i35vwr6c2kfsassvjjhbmpm"; depends=[]; }; fixedTimeEvents = derive2 { name="fixedTimeEvents"; version="1.0"; sha256="0z7ji8yzp4pj76ad64l7ivknkbi82ijx6abd3a18wicqhrh433sj"; depends=[]; }; fixerapi = derive2 { name="fixerapi"; version="0.1.6"; sha256="0ikf8dn0l9c9gshp4bph3wasl0bh6lfybinc8n1rvb202231hmgb"; depends=[jsonlite tibble tidyr]; }; - fixest = derive2 { name="fixest"; version="0.4.0"; sha256="0sajxi2sxljmj4614iwvrd48xhwcnr9z9lr5dy5n68iyps05s509"; depends=[Formula MASS nlme numDeriv Rcpp]; }; + fixest = derive2 { name="fixest"; version="0.4.1"; sha256="1jdx6mhi2hibd8zbpbba324z6f76irhkvwaanw2840qq8pql5rjf"; depends=[Formula MASS nlme numDeriv Rcpp]; }; fizzbuzzR = derive2 { name="fizzbuzzR"; version="0.1.1"; sha256="119gbi9y4n8r52hk9vj7zf795dv9xnk7lnngljjcd7ydnhygwd4h"; depends=[]; }; flacco = derive2 { name="flacco"; version="1.8"; sha256="15h2q9xgddy7gw6r52c2nk618f3z1mjn4xz9pzdvhm1d3kqggwa4"; depends=[BBmisc checkmate mlr]; }; flagr = derive2 { name="flagr"; version="0.3.2"; sha256="195c78cml2pjzfvpkaxbzcg1dfdqxi76138p0v3x3zzva9d8nlji"; depends=[]; }; + flair = derive2 { name="flair"; version="0.0.2"; sha256="0hvg9k7l6vdhmbmql1viyn54f07r31ssyyhdv2v242i0npa2l25r"; depends=[dplyr evaluate ggplot2 glue knitr magrittr purrr rmarkdown stringr]; }; flam = derive2 { name="flam"; version="3.2"; sha256="0v6kcl4n7wq052p7jdgbzlh9fpk8bzlrqw12i6pib1wd3slj0asa"; depends=[MASS Rcpp]; }; flamingos = derive2 { name="flamingos"; version="0.1.0"; sha256="0gic6y8wpxffpyi3zy0wh7apy4z6argxbz284n80k2mzh6lh029k"; depends=[Rcpp RcppArmadillo]; }; - flan = derive2 { name="flan"; version="0.7"; sha256="1r1vkf207k0il7r314gq1lxz0ndhdbbvx338mn8zhrkrd2ln9hpq"; depends=[lbfgsb3 Rcpp RcppArmadillo RcppGSL]; }; flare = derive2 { name="flare"; version="1.6.0.2"; sha256="1ybrsx1djqldw0l5l1iz4pfh6xxb8ckkg1ric7wnsr51wm9ljlh5"; depends=[igraph lattice MASS Matrix]; }; flars = derive2 { name="flars"; version="1.0"; sha256="06qma1ar1nj7n6g9alk1qydm5bkj6lsjx0pqkikxpb41d91civqk"; depends=[fda MASS Matrix Rcpp RcppEigen]; }; flashClust = derive2 { name="flashClust"; version="1.01-2"; sha256="0l4lpz451ll7f7lfxmb7ds24ppzhfg1c3ypvydglcc35p2dq99s8"; depends=[]; }; - flashlight = derive2 { name="flashlight"; version="0.7.1"; sha256="0sbq4jklp5idh850wvkszw2cpcxsyfrcn8icdg0fn3bbn55gls6x"; depends=[dplyr ggplot2 ggpubr MetricsWeighted rlang rpart rpart_plot tidyr]; }; + flashlight = derive2 { name="flashlight"; version="0.7.2"; sha256="1d0mps51sxg9hc8fr4462m2jwr0hv7f8qk6sxlh3d3x3ci9zk6xq"; depends=[dplyr ggplot2 ggpubr MetricsWeighted rlang rpart rpart_plot tidyr]; }; flatr = derive2 { name="flatr"; version="0.1.1"; sha256="10l98a3f57wahfpdqxj70r25zfhk4vzzd014pdnriy458yrfd7rw"; depends=[dplyr magrittr tibble]; }; flatxml = derive2 { name="flatxml"; version="0.0.2"; sha256="1f7pc3chzimkg23490qvppy63sk4ds3aaahc36sa4dc4qmhabyms"; depends=[RCurl xml2]; }; flexCWM = derive2 { name="flexCWM"; version="1.92"; sha256="1fxwq12mki10ikf5lyh1pb58svfzs4llg68v4d9iznia8aa0grhq"; depends=[ContaminatedMixt mclust numDeriv statmod]; }; @@ -7853,14 +7874,14 @@ in with self; { flexmixNL = derive2 { name="flexmixNL"; version="0.0.1"; sha256="0bk5v0cnsn1qkd1b86vj0bnpr4l9d6523kpkgzb1l1sqyscawfmm"; depends=[flexmix gnm]; }; flexrsurv = derive2 { name="flexrsurv"; version="1.4.5"; sha256="1xwh6fj854hr5j1mdh4cbp3hbrbdl4nb2ili876rq08wb9wq5pkf"; depends=[Epi formula_tools matrixcalc orthogonalsplinebasis statmod survival]; }; flexsurv = derive2 { name="flexsurv"; version="1.1.1"; sha256="0x7p1rv51pplfyyzcg63ssb8z56mig7y0363hkr0219w3cvyq9nr"; depends=[deSolve mstate muhaz mvtnorm quadprog Rcpp survival tibble tidyr]; }; - flexsurvcure = derive2 { name="flexsurvcure"; version="1.0.0"; sha256="1blhwbkp0a3a7xnqyxp952wxkihdxb0xh68sk827h8rxis9zr4z4"; depends=[flexsurv gtools survival]; }; + flexsurvcure = derive2 { name="flexsurvcure"; version="1.1.0"; sha256="0q77cc2l4xa7jkmx5sl9qwsxsdaf688ckp7j6pprv0nkzv8js16r"; depends=[flexsurv gtools survival]; }; flextable = derive2 { name="flextable"; version="0.5.9"; sha256="1rkz0nhwjy1l8sb0kmna5v492n2ydnk7gydswnmf88r8vfyjczhw"; depends=[base64enc data_table gdtools htmltools knitr officer rlang rmarkdown xml2]; }; flifo = derive2 { name="flifo"; version="0.1.5"; sha256="03x66l3ryrjvwbxxd0ncjrb5w9kc7fswmp5psb1cb7r87f395gm3"; depends=[bazar pryr]; }; flightplanning = derive2 { name="flightplanning"; version="0.8.0"; sha256="0q5xdjgjj9j73djpvzc34ig2gk43xan5jg9pn195m1x8lz41yvk9"; depends=[rgdal rgeos sp]; }; 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]; }; flipscores = derive2 { name="flipscores"; version="0.2"; sha256="0b55qxdrn6m0pbk4aj9zr1d9s7id6pclsaz939p48jmqx07zayjg"; depends=[]; }; - float = derive2 { name="float"; version="0.2-3"; sha256="1sf0pj5543alh25b96fw8jjsmiaky3r4nw9xhn349gv50rf0nhrj"; depends=[]; }; + float = derive2 { name="float"; version="0.2-4"; sha256="1wf1dfybgbhvh9sa5z41xkh8liwp5n9gyydfq2mpg6bag0r457z1"; depends=[]; }; flobr = derive2 { name="flobr"; version="0.2.0"; sha256="1pwk190bj1f8312bg95hj5y19ripm2jf6l1cbbsmfh2xw5x0xz0z"; depends=[blob checkr]; }; flock = derive2 { name="flock"; version="0.7"; sha256="1zg93p74icj4bhxnmnssj2xp6vw4yaksyavq03497v33xfpdxss7"; depends=[Rcpp]; }; flood = derive2 { name="flood"; version="0.1.1"; sha256="0nlmjh2l7dij1aqd70hhj0m550knlin3am14azqkx4pacs1kir3p"; depends=[copula evd magrittr TLMoments]; }; @@ -7878,14 +7899,14 @@ in with self; { flying = derive2 { name="flying"; version="0.1.3"; sha256="04wfcsbq8icvk1nnczvic5cp4nb40hxj3g6lasyb1dvhsh0svg0q"; depends=[kableExtra knitr Rcpp rmarkdown]; }; fma = derive2 { name="fma"; version="2.4"; sha256="1x175mhljvplm7b2iwcvkzalv3a79p8gqj9d4f06l5v4shxlrab9"; depends=[forecast]; }; fmbasics = derive2 { name="fmbasics"; version="0.3.0"; sha256="1dnf09rgwpc7n7ydlp7r5cwy2fa4vh1h9mbjqzfhk0208kz6jpl0"; depends=[assertthat fmdates lubridate tibble]; }; - fmcmc = derive2 { name="fmcmc"; version="0.2-0"; sha256="0hczf41pykxz8j9y8d2mqawzk5q9w44875jk4p4pf7jbkff5rzxf"; depends=[coda]; }; + fmcmc = derive2 { name="fmcmc"; version="0.3-0"; sha256="1r019pzk5h00s6ki897gbzsyhlnwljxklzqnfz87gbg1n5dvhqp4"; depends=[coda MASS]; }; fmdates = derive2 { name="fmdates"; version="0.1.4"; sha256="1bbcwkh65nf2gak9b81zgg32c5ihwhmai3nc43ayf6ivhqsxw8x0"; depends=[assertthat lubridate]; }; fmri = derive2 { name="fmri"; version="1.9.3"; sha256="0is9lgp27g8dv3rmxn4mlf9m53izx5j7h974cy3ls3lq0pdp99va"; depends=[aws metafor nlme]; }; fmriqa = derive2 { name="fmriqa"; version="0.3.0"; sha256="1z09nf1c305a78c129jvs21b9z91wyhazz41wrn4bimmhfhx7szv"; depends=[ggplot2 gridExtra imager optparse pracma RcppEigen reshape2 RNifti tidyr viridisLite]; }; fmsb = derive2 { name="fmsb"; version="0.7.0"; sha256="0x1wkzfdvv4s5xmr0whcwjz4aac71gacwymj2c3mzj2bbswwlw45"; depends=[]; }; 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.4"; sha256="1nxz41yhlg28jdihixy2w44nfvaliyfmxibxk58j7hfgyyvlm21s"; depends=[clisymbols crayon curl httr jsonlite rvest tibble xml2]; }; + foghorn = derive2 { name="foghorn"; version="1.1.5"; sha256="08lb3d7q7g0hvg68d9lbvssch0d4vxbfriy92pyx1vi57jaavnl6"; depends=[clisymbols crayon curl httr jsonlite rvest tibble xml2]; }; foieGras = derive2 { name="foieGras"; version="0.4.0"; sha256="0jrxdmsjxc8zjfgcv6n0kili0dzxppy0qdhqaji2ggklzynp4i33"; depends=[argosfilter dplyr furrr future ggplot2 gridExtra lubridate RcppEigen rworldmap sf stringr tibble tidyr TMB]; }; folderfun = derive2 { name="folderfun"; version="0.1.2"; sha256="08kfw7i5xqbk07ssp4j79p3x0gf0jq2fbcq99lb10r6ndcgp5rxp"; depends=[]; }; fontBitstreamVera = derive2 { name="fontBitstreamVera"; version="0.1.1"; sha256="0nipdlmhjv1wr3aidcl97nk6mppdkd65krgwqnhdsnv0jpfv761j"; depends=[]; }; @@ -7906,7 +7927,7 @@ in with self; { forecastHybrid = derive2 { name="forecastHybrid"; version="5.0.18"; sha256="0sgz50dl2939jl3azkxpv8kd00jcbkcgd5s6cng3kivrbrfslahp"; depends=[doParallel foreach forecast ggplot2 purrr thief zoo]; }; forecastML = derive2 { name="forecastML"; version="0.8.0"; sha256="18a05lp4v4gpplldwx3kwkblnhkplgjiis0jq529sjxk53plyfi1"; depends=[data_table dplyr dtplyr future_apply ggplot2 lubridate magrittr purrr rlang tibble tidyr]; }; forecastSNSTS = derive2 { name="forecastSNSTS"; version="1.3-0"; sha256="0p47x7ic2ib7znqbp8br4b2ci75f5w8x413z9g4n30m002p7irp1"; depends=[Rcpp]; }; - foreign = derive2 { name="foreign"; version="0.8-76"; sha256="1z6x2x1z12wnv0z4p74d91r5wfaq30sdz4ynwx0lncz1q45mhbh5"; depends=[]; }; + foreign = derive2 { name="foreign"; version="0.8-78"; sha256="01anirfbfa3ip5pyqv72cg4x7p0jsppmbvxrllw7bm28fl1hgiyq"; depends=[]; }; forensic = derive2 { name="forensic"; version="0.2"; sha256="0kn8wn6p3fm67w88fbarg467vfnb42pc2cdgibs0vlgzw8l2dmig"; depends=[combinat genetics]; }; forensim = derive2 { name="forensim"; version="4.3"; sha256="1jhlv9jv832qxxw39zsfgsf4gbkpyvywg11djldlr9vav7dlh3iw"; depends=[tcltk2 tkrplot]; }; forestChange = derive2 { name="forestChange"; version="1.0"; sha256="1d9qza1f16sz8pyafn3q7cyg9hw0ix4nqcgb9ipcnvmkyrc00f1a"; depends=[curl dplyr gdalUtils ggplot2 landscapemetrics raster rgdal rvest sp tibble xml2]; }; @@ -7916,10 +7937,10 @@ in with self; { forestRK = derive2 { name="forestRK"; version="0.0-5"; sha256="0zm0q7bckmjl1j3yh5pw4r6rq64rfmzjvmvqniza5691jagjz60m"; depends=[ggplot2 igraph knitr mlbench partykit pkgKitten rapportools]; }; forestSAS = derive2 { name="forestSAS"; version="1.0.1"; sha256="1jva2nivvcrczvqfhxa6vv1hsazp5m7djgfp7mfp1kpr136lyf2d"; depends=[spatstat]; }; forestinventory = derive2 { name="forestinventory"; version="0.3.1"; sha256="0brbg0q8j9ymvm527db7063kgs6i6flja7mxqk7yvaf3dh8wsi46"; depends=[ggplot2 plyr tidyr]; }; - forestmangr = derive2 { name="forestmangr"; version="0.9.1"; sha256="1b0yijc1yzgwkypyxb6v03sw32r3zz9rfjw63xiwzspq7hkbpinx"; depends=[broom car dplyr FinCal formattable ggdendro ggplot2 ggpmisc ggthemes gridExtra magrittr minpack_lm plyr purrr rlang scales systemfit tibble tidyr]; }; + forestmangr = derive2 { name="forestmangr"; version="0.9.2"; sha256="0f65yb4kixbvr8jp6063rgd8hxd5pycsx1dx9477222rmhp6f723"; depends=[broom car dplyr FinCal forcats formattable ggdendro ggplot2 ggpmisc ggthemes gridExtra magrittr minpack_lm plyr purrr rlang scales systemfit tibble tidyr tidyselect]; }; forestmodel = derive2 { name="forestmodel"; version="0.5.0"; sha256="09gwgsh42gkmhs8ijq5xfbbkb1hk6sjb0q32mw2ymc6x9ycr1a9j"; depends=[broom dplyr ggplot2 lazyeval tibble]; }; forestplot = derive2 { name="forestplot"; version="1.9"; sha256="1vcma7dvlvyhz6n25pj19h70i8xmz6vibkf945qkmj5hhrb7zxia"; depends=[checkmate magrittr]; }; - forestr = derive2 { name="forestr"; version="2.0.1"; sha256="1rxyp7d6np9qawrhc66fkdwylddnkha4d311c9w1x09pbnkwqzs8"; depends=[dplyr ggplot2 moments plyr viridis]; }; + forestr = derive2 { name="forestr"; version="2.0.2"; sha256="1kz8f3x2dmsprj2r23gz61fpwg7n14nbjxr16x4cpixvnk427p94"; depends=[dplyr ggplot2 moments plyr tibble tidyr viridis]; }; foretell = derive2 { name="foretell"; version="0.2.0"; sha256="18vi438n480gizfhnciw67gngvbjnmky19186b1wy75av7fgc1gp"; depends=[nloptr]; }; forge = derive2 { name="forge"; version="0.2.0"; sha256="0pjfzsc35agkh0zfw2czwajkbsyn6liys5irl5bhz5r1vim3jmwa"; depends=[magrittr rlang]; }; formatR = derive2 { name="formatR"; version="1.7"; sha256="1nsxbrx31k3y6yql30qkrvdfyznlia2qfvwv95mfiy7m7wdn4rm3"; depends=[]; }; @@ -7954,23 +7975,22 @@ in with self; { fracprolif = derive2 { name="fracprolif"; version="1.0.7"; sha256="124p5x59smqf8ba0xwhlq69w77zga2bv9plzwkadf700lzvaj2wx"; depends=[emg numDeriv]; }; fractal = derive2 { name="fractal"; version="2.0-4"; sha256="18lr9z0gslvfc3z8vyj3krqj3bfhg60zv1fzinrwwkc4cpk1w7mp"; depends=[ifultools MASS sapa scatterplot3d splus2R wmtsa]; }; fractaldim = derive2 { name="fractaldim"; version="0.8-4"; sha256="0fln4qn0d79agnnlzi8b9g9qn90zynq1cg9v5isiyi71345v45nr"; depends=[abind]; }; - fractalrock = derive2 { name="fractalrock"; version="1.1.0"; sha256="15f4w8hq3d8khgq269669ri16qxhar9646w40cw7wzh79r9gpf00"; depends=[futile_any futile_logger quantmod timeDate]; }; fractional = derive2 { name="fractional"; version="0.1.3"; sha256="1jz83y53s0xdphh1z3v3z7xhcmhx7rp0iiazw2vdsx2747r3rirn"; depends=[Rcpp]; }; + fragility = derive2 { name="fragility"; version="1.0"; sha256="13pb64i0mxcdvlpn71qs0vkv7rw1mxiy2cfnyw2ncnallw32ph5i"; depends=[metafor netmeta plotrix]; }; fragilityindex = derive2 { name="fragilityindex"; version="0.1.0"; sha256="06f7w0ff8mmydgylz5a0z29fc78spvmay3sjq0rz9k44w4bb9z3q"; depends=[pbapply stringr survival]; }; frailtyEM = derive2 { name="frailtyEM"; version="1.0.1"; sha256="0ajqmn8353va8k3idsl90xsrhpdqarfmvg84d4kwayxlqy6dmbb0"; depends=[expint ggplot2 magrittr Matrix msm numDeriv Rcpp survival tibble]; }; frailtyHL = derive2 { name="frailtyHL"; version="2.3"; sha256="115iv1d2c9mvviick8b24bn6kdbsvnf21nvfjm9a8dk0x07hrv5g"; depends=[cmprsk Matrix survival]; }; frailtySurv = derive2 { name="frailtySurv"; version="1.3.6"; sha256="0k41a5x7qzrajk2l59q5b8kjj084vids4ailr8r7r2lnf6r9xrav"; depends=[ggplot2 nleqslv numDeriv Rcpp reshape2 survival]; }; - frailtypack = derive2 { name="frailtypack"; version="3.1.0"; sha256="1x6i3kc8xl2dfmbljki94ivkh2hlkisq5hmxzk48i4288hrl2jcn"; depends=[boot doBy jsonlite MASS nlme rhandsontable shiny shinyBS shinydashboard shinyjs shinythemes statmod survC1 survival]; }; + frailtypack = derive2 { name="frailtypack"; version="3.2.0"; sha256="11159b60j6pk5vvvc8vlb606gjwbfc7d7aqb896aba2rciwddk6n"; depends=[boot doBy jsonlite MASS nlme rhandsontable shiny shinyBS shinydashboard shinyjs shinythemes statmod survC1 survival]; }; frair = derive2 { name="frair"; version="0.5.100"; sha256="1j557dqvc5xiz7xbl4h7vp55pc3hly8ci01qy36p02vlxhzf4hj3"; depends=[bbmle boot lamW]; }; frambgrowth = derive2 { name="frambgrowth"; version="0.1.0"; sha256="1xmy1zxp7aa2n8frlxhn1bl41zda1jldvvxb3q41yam3pslc8m1q"; depends=[]; }; franc = derive2 { name="franc"; version="1.1.2"; sha256="1bhszr0g0blx0jmdwxkicn1zz1fhfgyhzsncgy3181i987429gdg"; depends=[jsonlite]; }; frapplot = derive2 { name="frapplot"; version="0.1.3"; sha256="12924szk2p0582nv97gi8pxrbv41zqpjryc6jqgg4llhp7ydz7xf"; depends=[]; }; frbs = derive2 { name="frbs"; version="3.2-0"; sha256="0biv6j31qi0f4i063ygmbp6v6ws1nxijn5kyhg5sz1rnbr0msl28"; depends=[]; }; - fredr = derive2 { name="fredr"; version="1.0.0"; sha256="1hv51m0ihdpb73rp2gwj2q2xpjzlqpf9p3xzqdmy9nhwpfbj14nh"; depends=[httr jsonlite rlang tibble]; }; freealg = derive2 { name="freealg"; version="1.0-0"; sha256="0a3s89379lxr0dw068wfwzlqjq70zbaxil1vwwa4bf2i7s46mcgl"; depends=[Rcpp]; }; freegroup = derive2 { name="freegroup"; version="1.1-0"; sha256="0ssshs2d6l2ip1xx9x581w0cdnd2459a1mh360ybwajkjgak2ci6"; depends=[magic magrittr plyr]; }; freesurfer = derive2 { name="freesurfer"; version="1.6.7"; sha256="1wk0xjx0a99zm7gdn7i5z92wmqnlzng6n6g8w9whxvmy0rq6i19j"; depends=[neurobase R_utils reshape2]; }; - freesurferformats = derive2 { name="freesurferformats"; version="0.1.8"; sha256="13lqkw5bmbqviqsxb75ij8jicrgdxpahng5x5arazn38sksb9cg9"; depends=[pkgfilecache]; }; + freesurferformats = derive2 { name="freesurferformats"; version="0.1.9"; sha256="02qqp81b93dv84g3gbsl1705j5hj6ndv45npbbh35v5rsgswz9d9"; depends=[pkgfilecache]; }; freetypeharfbuzz = derive2 { name="freetypeharfbuzz"; version="0.2.5"; sha256="11agmqdp6sy32jk2840cj8wmgywq0yjar18zsnsn56qfvn4b1k1c"; depends=[fontquiver]; }; freqdist = derive2 { name="freqdist"; version="0.1"; sha256="1pb45jabv9s3qa7v1isd5wm9b0g9p04q5h18spcaax8397s0d2fv"; depends=[]; }; freqdom = derive2 { name="freqdom"; version="2.0.1"; sha256="0ig0ygnlcb5ndjjm5x8jpp37gvgwli9xv6zsvbbgfh72q418qswp"; depends=[matrixcalc mvtnorm]; }; @@ -7985,14 +8005,13 @@ in with self; { frmpd = derive2 { name="frmpd"; version="1.1.0"; sha256="0irgqdr0vr8k408lsxcrjkjbjvqvmy5mnjw9c1ghs86isrp5mciz"; depends=[]; }; frmqa = derive2 { name="frmqa"; version="0.1-5"; sha256="0vd5jnjzhkc0vd4cqn4cs6a3limd4fxwyb5i7845rwmkzk1944aj"; depends=[partitions Rmpfr]; }; fromo = derive2 { name="fromo"; version="0.2.1"; sha256="0srq13j0xqbyrmm8n93b5qwc25nz921z45yf467d7gfhxsbgy3hm"; depends=[Rcpp]; }; - frontier = derive2 { name="frontier"; version="1.1-6"; sha256="18qxzzhmxbwnflb90pls5d4kmijg0rhpsmnnysvmmppm8h6nf7nf"; depends=[Formula lmtest micEcon miscTools moments plm]; }; + frontier = derive2 { name="frontier"; version="1.1-8"; sha256="1qhasynm23yihmhb4d7w72msq2z1xf4xnzrkah3z8jv11yxhg1i2"; depends=[Formula lmtest micEcon miscTools moments plm]; }; frontiles = derive2 { name="frontiles"; version="1.2"; sha256="08qq25wbylvhvmq34wggyj0hwdlxfs9rfs8gjqsrg50xccchniqi"; depends=[classInt colorspace rgl sp]; }; frost = derive2 { name="frost"; version="0.0.4"; sha256="03snjlq4b9j84v0yimc3xzgjvryzzi76b9n53k0s2lvv1yzrri7x"; depends=[]; }; - frostr = derive2 { name="frostr"; version="0.1.0"; sha256="02ygg5dxpnv72gpwwsarhkl5hk6hldxjqpw875p7hb1ny7khgmfg"; depends=[httr jsonlite tibble tidyr]; }; frt = derive2 { name="frt"; version="0.1"; sha256="1qy76a1wkznaqzlyj1nq74mf1pnyly1s8gnff8q30zfccqk68cxv"; depends=[]; }; fs = derive2 { name="fs"; version="1.4.1"; sha256="0kksig9pk8aid9l6r250na8z8j9919jvs20lj0s6m9bcybgh74df"; depends=[]; }; fsMTS = derive2 { name="fsMTS"; version="0.1.5"; sha256="1vxj9wkzpbk44hby4fdyhj72748c65by612kpphs6vmgzmw4y471"; depends=[freqdom glasso lars mpmi randomForestSRC]; }; - fsbrain = derive2 { name="fsbrain"; version="0.0.3"; sha256="1s7i9rpazp5s3vnm9y6ajpy06wbd7gjdzr9mbndjnsb9w985957a"; depends=[dplyr fields freesurferformats pkgfilecache reshape rgl squash]; }; + fsbrain = derive2 { name="fsbrain"; version="0.1.0"; sha256="0gwn8cnafcvkmzw7lf5q63xyfkhbj8wy1szcwmazkpkmg0zlwwcv"; depends=[data_table dplyr fields freesurferformats pkgfilecache reshape rgl squash]; }; fscaret = derive2 { name="fscaret"; version="0.9.4.4"; sha256="18fhyfl3f8syyc3g937qx87dmwbv7dray6b97p1s6lnssiv61gsw"; depends=[caret gsubfn hmeasure]; }; fsdaR = derive2 { name="fsdaR"; version="0.4-9"; sha256="1iaqqdwhh29fhq4r64adfrjmsyzq4v60bz9111vkazj4kr45wxxv"; depends=[ggplot2 rJava rrcov]; }; fsia = derive2 { name="fsia"; version="1.1.1"; sha256="0id7cnswrqylgpwjil1zfn89ryrdpl20fim8x1srl8s1hm5bg35r"; depends=[]; }; @@ -8005,7 +8024,7 @@ in with self; { ftExtra = derive2 { name="ftExtra"; version="0.0.1"; sha256="0zgz4sjxx6ls27afb9djmxvwq46pp5jwxxbb87wnjc9fn5vvnnxy"; depends=[dplyr flextable jsonlite magrittr purrr rlang rmarkdown stringr tidyr tidyselect]; }; ftnonpar = derive2 { name="ftnonpar"; version="0.1-88"; sha256="0df9zxwjpfc939ccnm1iipwhpf76b34v0x74nsi1mm1g927dfl0i"; depends=[]; }; fts = derive2 { name="fts"; version="0.9.9.2"; sha256="08pwhi19db173d4nsk5rl8xa8qmaddj4bn3cjxb8ql4kny59i57q"; depends=[BH zoo]; }; - ftsa = derive2 { name="ftsa"; version="5.5"; sha256="1c7b3b6zrm45y2110j0dqlgilfiiyx4wqhgdiq82q6kagng32cl1"; depends=[colorspace fda forecast MASS pcaPP pdfCluster rainbow sde]; }; + ftsa = derive2 { name="ftsa"; version="5.6"; sha256="1zg15jf65hi8gg5s6xmk70x6w9k2ay1b5nf7xnvllis4hi9n8s3j"; depends=[colorspace fda forecast MASS pcaPP pdfCluster rainbow sde]; }; ftsspec = derive2 { name="ftsspec"; version="1.0.0"; sha256="12f9yws1r26i240ijq0xqprl3pgbw50wv68jsm75ycplbs2jsyhs"; depends=[sna]; }; fuel = derive2 { name="fuel"; version="1.0.2"; sha256="0ziw370ch8g2hnlimxfgski4n28b83jnwrhlh7ibszk0lz593rkr"; depends=[]; }; fueleconomy = derive2 { name="fueleconomy"; version="1.0.0"; sha256="16a8wyliiidi6rw14ksimygfkl4a7yhxvss7l9bcvr1wfiplrn65"; depends=[]; }; @@ -8016,11 +8035,12 @@ in with self; { fun = derive2 { name="fun"; version="0.2"; sha256="0944m10nym4rsb6rhdwqn04c7l3bz43jcw3q8hv4vljdf5kyg9ar"; depends=[]; }; funData = derive2 { name="funData"; version="1.3-4"; sha256="14s86s8ap52qr50cwmiqhkfnnb5ckf9hnmzslfmz44k3ydp9d7hp"; depends=[abind fields foreach]; }; funFEM = derive2 { name="funFEM"; version="1.1"; sha256="08798lvryykrxfvp2297anzl4gi81gwvc1qyyzq16nafjf65kwfy"; depends=[elasticnet fda MASS]; }; + funGp = derive2 { name="funGp"; version="0.1.0"; sha256="03khkwdq2kc7wxr7jr50kms4w63w6iz90431d960dg4s0gff29h8"; depends=[doFuture foreach future knitr microbenchmark progressr qdapRegex scales]; }; funHDDC = derive2 { name="funHDDC"; version="2.3.0"; sha256="1dym1bzywng5yjfzpppxx043pwcbvrxxq0bn1d6xqqkqcpzn2zhp"; depends=[fda MASS]; }; funLBM = derive2 { name="funLBM"; version="1.0"; sha256="0krx5v1lakrrxk0j249k7sr7c6r40yg1l8l10laf4444j2qn8rjp"; depends=[fda funFEM]; }; funModeling = derive2 { name="funModeling"; version="1.9.3"; sha256="0dqpb5igdpdnbwr6y8wr11hcn84clshnx0q913512jvcrx0h0pd9"; depends=[cli dplyr entropy ggplot2 gridExtra Hmisc lazyeval moments pander RColorBrewer reshape2 ROCR scales stringr]; }; funbarRF = derive2 { name="funbarRF"; version="1.0.2"; sha256="14xfhwp4vffl215fqdxdxpmjblyw75ylxqjzja794adywm06sz19"; depends=[BioSeqClass Biostrings randomForest]; }; - funchir = derive2 { name="funchir"; version="0.1.4"; sha256="1mbsy65628q117c2k01wvibpjd3ibigy4yc1c8m0rf9jwsc67qjb"; depends=[data_table]; }; + funchir = derive2 { name="funchir"; version="0.2.0"; sha256="1rj5khv1xcaaip5xh8kcsp2jgmbmnc9q5kwr46l4mxvxyndndi1k"; depends=[data_table]; }; functional = derive2 { name="functional"; version="0.6"; sha256="120qq9apg6bf39n9vnp68db5rdhwvnj2vi12a8j8243vq8kqxdqr"; depends=[]; }; functools = derive2 { name="functools"; version="0.2.0"; sha256="0g62jdia3n09vq8mx1m2r4nl3jfcadzpym0wkldzzzjcfs90vl6b"; depends=[]; }; funest = derive2 { name="funest"; version="0.0.1.3"; sha256="1pi556klfnbmrsx5c0f3v4hdn5m4dxxm71ijivanpwfqnfls8xh3"; depends=[funData MFPCA pec prodlim purrr ranger Rdpack survival tdROC]; }; @@ -8030,7 +8050,7 @@ in with self; { funneljoin = derive2 { name="funneljoin"; version="0.1.0"; sha256="17g1mvq9z5m29r0v2r2nn8980j515jamnpwvvnzj83vk84bz94rq"; depends=[broom dplyr glue magrittr purrr rlang tibble tidyr]; }; funprog = derive2 { name="funprog"; version="0.2.0"; sha256="1gs0mahvzgnv5pfvz32acq0jk3rnssg6bxqzlqpyqg0r3g4m80mf"; depends=[]; }; funr = derive2 { name="funr"; version="0.3.2"; sha256="11mjd1ba9kwawh7k5py54mkq4g1df79d7qivan8fj11qfwfzm679"; depends=[]; }; - funrar = derive2 { name="funrar"; version="1.4.0"; sha256="15pbc5v6ncs96hbka4nxxm33nbd7q0nign7wa136prziqnsyndwi"; depends=[cluster dplyr]; }; + funrar = derive2 { name="funrar"; version="1.4.1"; sha256="0xqccch59f8cz4a7ybjdr6k625bir5nsjrp4iyfirrb877d17m5z"; depends=[cluster]; }; funreg = derive2 { name="funreg"; version="1.2"; sha256="199zvqali0sb0z4yp20rm5da0kd7z3rgv47g1cb1apsbcw0cq51n"; depends=[MASS mgcv mvtnorm]; }; funtimes = derive2 { name="funtimes"; version="6.1"; sha256="1qr0z0nn3dv2yxq4sacsm0xs4pnda31zc10rz427rdyjrps85838"; depends=[dbscan Jmisc Kendall Rdpack]; }; furniture = derive2 { name="furniture"; version="1.9.7"; sha256="1czc1ayfpqf6h7n5fjzx1vwkzm9vg1dr62hl5k511b9kdc8lfsfh"; depends=[dplyr knitr magrittr]; }; @@ -8038,16 +8058,14 @@ in with self; { fusedest = derive2 { name="fusedest"; version="1.3.1"; sha256="1nz5bkvn8y9f8h0ya6wblryg7bwj1vnz1vyqmd1hfr85bxfgl83c"; depends=[igraph Matrix Rcpp RcppEigen]; }; fuser = derive2 { name="fuser"; version="1.0.1"; sha256="17lsfpd9hdichj3wflac896zyjbq7a8w2gmlgj8nbgg80f646fgr"; depends=[glmnet irlba Matrix Rcpp RcppEigen RSpectra]; }; fusionclust = derive2 { name="fusionclust"; version="1.0.0"; sha256="1h03nlk4gnz4j5h2h5bxazkka2qq983h7nglm1ghzqvbqjk6sv37"; depends=[bbmle]; }; - futile_any = derive2 { name="futile.any"; version="1.3.2"; sha256="09z12dlj7cnkfwnmgsjknsghirv1cry83w4a9k4d0w5a1jnlr5jg"; depends=[lambda_r]; }; futile_logger = derive2 { name="futile.logger"; version="1.4.3"; sha256="1r3nayk0z9n1svbf8640vw90dal5q07nkn0gv4bnva3pbzb352sy"; depends=[futile_options lambda_r]; }; - futile_matrix = derive2 { name="futile.matrix"; version="1.2.7"; sha256="0nbzcy5l3nllppwmdib1s11s7b4m7mfvqb90n6b2hgmd48jsw8wg"; depends=[futile_logger lambda_r lambda_tools RMTstat]; }; futile_options = derive2 { name="futile.options"; version="1.0.1"; sha256="0w15agpi88y3qkv6fl72zy2pzyplzgvnj41a4ixhg64mw1sck73s"; depends=[]; }; futile_paradigm = derive2 { name="futile.paradigm"; version="2.0.4"; sha256="14xsp1mgwhsawwmswqq81bv6jfz2z6ilr6pmnkx8cblyrl2nwh0v"; depends=[futile_options RUnit]; }; futility = derive2 { name="futility"; version="0.4"; sha256="0zjb87brz7pkx3nq3q30y69cmcxpqqsra447p60qh7005kgr9vx4"; depends=[]; }; - future = derive2 { name="future"; version="1.16.0"; sha256="1xaqh0b2knf5bp23mc0kriq0iqhqna31q3b7d960piqjhzrb03dm"; depends=[digest globals listenv]; }; + future = derive2 { name="future"; version="1.17.0"; sha256="0d4y7gwcgqx2z0y6h5bh4lrz0m7b0inii5cjcq0kk8za762bi8rg"; depends=[digest globals listenv]; }; future_BatchJobs = derive2 { name="future.BatchJobs"; version="0.16.2"; sha256="08lh1sp0v1vagi34s218a1ygj63whkf3s9w0kyf25v64gsdavkzc"; depends=[BatchJobs future R_utils]; }; - future_apply = derive2 { name="future.apply"; version="1.4.0"; sha256="1kgq6dv96hdy35kysqkn606nj7s9dp4ibgpm6n46gqhc5n75lzkk"; depends=[future globals]; }; - future_batchtools = derive2 { name="future.batchtools"; version="0.8.1"; sha256="034sgd5pcv6d4jbi21ishwz5r1ym82g1pvyv3s0sl1jsy5g55v0w"; depends=[batchtools future]; }; + future_apply = derive2 { name="future.apply"; version="1.5.0"; sha256="095a681ngbwbp7v53ladwya7ar8fgwnlgr3r1yklf3vdxwd54xll"; depends=[future globals]; }; + future_batchtools = derive2 { name="future.batchtools"; version="0.9.0"; sha256="1srcc4vv9nm49nq8llxik9ys4f45lz2shwlc4l9wp0zmxinzi3sr"; depends=[batchtools future]; }; future_callr = derive2 { name="future.callr"; version="0.5.0"; sha256="0rjvjmffc4m9kr4p40q1gyv1zf49m8q0fb04kmdi7a8q2jfflpna"; depends=[callr future]; }; future_tests = derive2 { name="future.tests"; version="0.2.1"; sha256="1f75y7s9yrsz8c3vbsvp55zllp6sbpjrxbxknm1rfhg4sc2ak33c"; depends=[cli crayon future prettyunits sessioninfo]; }; futureheatwaves = derive2 { name="futureheatwaves"; version="1.0.3"; sha256="122b2z86bzxfch67y6cpq8wj62mw0dgkzbmnpwi247kdx7w5mw1f"; depends=[data_table dplyr ggplot2 ggthemes leaflet Rcpp stringr tidyr]; }; @@ -8083,7 +8101,7 @@ in with self; { gRc = derive2 { name="gRc"; version="0.4-3.2"; sha256="0f8m83wqhmsn6p0v0msdzyy9vl900nc9ddr8y78181jxcd9mqd0d"; depends=[gRbase MASS]; }; gRim = derive2 { name="gRim"; version="0.2.1"; sha256="0j5r4pnjmyc9z0yfs8bgp0w8w4prlqwvnxmg5pm5gz09h8kkd2qq"; depends=[gRain graph gRbase igraph magrittr Rcpp RcppArmadillo RcppEigen Rgraphviz]; }; gSEM = derive2 { name="gSEM"; version="0.4.3.4"; sha256="18kh41ibvfflz59gykiq7j2c6a72i8b0w8c2mcprd1nzhnyhvmhy"; depends=[DiagrammeR htmlwidgets knitr MASS]; }; - gSeg = derive2 { name="gSeg"; version="0.6"; sha256="19njl093qidwjcwzxkzip78ahgq3zwhc0kscvhjpzb49qkg3srrj"; depends=[]; }; + gSeg = derive2 { name="gSeg"; version="0.7"; sha256="0np15vsnnksd59gzwk64fyjcawmrjq1n0rbjiw56zhsn19gkjx25"; depends=[]; }; gStream = derive2 { name="gStream"; version="0.2.0"; sha256="1f4xnbavm99yhjmaahazigps41mqlfvvl29kf4fs1yjqr531y36b"; depends=[]; }; gTests = derive2 { name="gTests"; version="0.2"; sha256="1h1sd8mrzcniq7rx7frdlxwpnsn8lifng1x99fqq703hs3znl1yq"; depends=[ade4]; }; gWQS = derive2 { name="gWQS"; version="2.0.1"; sha256="1yl8c9v66n5zbkdcxbrzmjdf24in3gkrxgnyr2lc7pi414zb2dbg"; depends=[broom dplyr future future_apply ggplot2 ggrepel kableExtra knitr MASS nnet plotROC reshape2 rlist Rsolnp]; }; @@ -8136,6 +8154,7 @@ in with self; { gap_datasets = derive2 { name="gap.datasets"; version="0.0.4"; sha256="1zlxm3nh1b1mqb94fq2b7sc7v99m9ywz7bz9lz5bhwblk5fzmjii"; depends=[]; }; gapfill = derive2 { name="gapfill"; version="0.9.6"; sha256="0384v7capab7dbyvz6b2jvnh840z6ab3857my0h3cgsys3lhn3c5"; depends=[fields foreach ggplot2 quantreg Rcpp]; }; gapminder = derive2 { name="gapminder"; version="0.3.0"; sha256="067cra1ca4ngwjx8d1y9pyzwcpsfi1wcal0glzyy6ghd1k6jflpv"; depends=[tibble]; }; + garchx = derive2 { name="garchx"; version="1.0"; sha256="1k8f6251hpj38rllw10w97r9j4asqg111kwcpnxh4rilbhjcra36"; depends=[zoo]; }; gargle = derive2 { name="gargle"; version="0.4.0"; sha256="08zhfk2sl342w35i5n2c93ayypg3z0kbl0020l3y9adqka1vazgx"; depends=[fs glue httr jsonlite rlang withr]; }; garray = derive2 { name="garray"; version="1.1.2"; sha256="0s2dgi556x9jnhafvzz4qkxdbq9dm12gsvsqd2g9iy3468fx9flq"; depends=[]; }; gaselect = derive2 { name="gaselect"; version="1.0.9"; sha256="089gyllcmq5rgf5yffclifc7rc8rmq4wk1dhznigxkij4zap67hx"; depends=[Rcpp RcppArmadillo]; }; @@ -8173,14 +8192,14 @@ in with self; { gdata = derive2 { name="gdata"; version="2.18.0"; sha256="0zwdj7lscgxr8r62ii8hbdh4mb7sa9w4f5nv32zzrxdvymcpya2b"; depends=[gtools]; }; gdimap = derive2 { name="gdimap"; version="0.1-9"; sha256="0ksbpcy739bvsiwis0pzd03zb4cvbd8d5wdf8whfn9k6mkj4x9rs"; depends=[abind colorspace geometry gridExtra gsl movMF oro_nifti rgl]; }; gdistance = derive2 { name="gdistance"; version="1.3-1"; sha256="04v86kdpag3dvp4zm4ia9y0g9nxa39ka0nmqyw7rkhkmzfs7m6hf"; depends=[igraph Matrix raster sp]; }; - gdm = derive2 { name="gdm"; version="1.4.1"; sha256="0nzjqc138fsd2fh4crblzhnvgcf9iaak9l866xvmzzimw3lrp7qw"; depends=[doParallel foreach raster Rcpp reshape2 vegan]; }; + gdm = derive2 { name="gdm"; version="1.4.2"; sha256="1q2bmqrxlac72jdmaldf4m6cwv60aaxxqws518dcn83bs788mbcm"; depends=[doParallel foreach raster Rcpp reshape2 vegan]; }; gdmp = derive2 { name="gdmp"; version="0.2.0"; sha256="0fy8x9l6swrb78apwq9d9msz2y8dkfd2fkyp1pkmzxwdb85lmcdm"; depends=[]; }; gdns = derive2 { name="gdns"; version="0.3.1"; sha256="1vydl7jacldidzx1hhqang9fw8zar8wy4cgdmr9pbw22ffw2qq7s"; depends=[httr jsonlite stringi]; }; gdpc = derive2 { name="gdpc"; version="1.1.1"; sha256="1wdfmsc8g7paj3rj75wcvqcjw92bkgc57nz1wc90y67gh1xvxs1i"; depends=[doParallel foreach Rcpp RcppArmadillo xts zoo]; }; gds = derive2 { name="gds"; version="0.1.0"; sha256="0kc3l93640x8d6g3pa9gbr7ci5hmryg9i1nqpasgnvb6ixv6azbm"; depends=[]; }; gdtools = derive2 { name="gdtools"; version="0.2.2"; sha256="08njzin0c6biw62j5w30r9j85vr1m2cg4hmv5d76nym860yrlqjf"; depends=[Rcpp systemfonts]; }; gdxdt = derive2 { name="gdxdt"; version="0.1.0"; sha256="1yrjixq4srmaiy5iaprix4096yhf3ldyklgjag4kxd3l5acwap4h"; depends=[data_table]; }; - gear = derive2 { name="gear"; version="0.2.0"; sha256="1mb2brw0gasmvfj5kajlyqfxiw1kg3fy56fqlldss5gbl29y67qr"; depends=[autoimage ggplot2 lattice optimx sp]; }; + gear = derive2 { name="gear"; version="0.3.4"; sha256="0ibn2kr0rjj546cbcqhr6x69s25xh7si5fri59055j42g62mdnxy"; depends=[autoimage optimx Rcpp]; }; gee = derive2 { name="gee"; version="4.13-20"; sha256="167pzgnmj4cjc41ykps1mfwi6s7y32zxyycn5z17vn4v0pp4q0ak"; depends=[]; }; gee4 = derive2 { name="gee4"; version="0.1.0.0"; sha256="1vvzb9sc69g292zmh9djd15jgc7falypd5p7mzw6ps7mirpbnicf"; depends=[Formula Rcpp RcppArmadillo]; }; geeM = derive2 { name="geeM"; version="0.10.1"; sha256="1r9zyjv7r7r7avdqi54dvczf971frz8pgrs1a04kan5mh4ls6xpy"; depends=[Matrix]; }; @@ -8197,7 +8216,6 @@ in with self; { gemtc = derive2 { name="gemtc"; version="0.8-4"; sha256="1vg71vskvpky84371vq9i2x1i8axd7dcsbbv4zac9h2xlf63l39j"; depends=[coda igraph meta plyr Rglpk rjags truncnorm]; }; gen2stage = derive2 { name="gen2stage"; version="1.0"; sha256="16xbzgkjskzm1wik3dznvwhqddrpmcgsgd372n4a67rbb46jgx6r"; depends=[clinfun]; }; gen5helper = derive2 { name="gen5helper"; version="1.0.1"; sha256="0z7hisn57md18vcfb6f44hy6zzp9dirrjyxi4x1id3mqa3mligb6"; depends=[dplyr ggplot2 minpack_lm naturalsort plyr pracma rlang tidyr]; }; - genBaRcode = derive2 { name="genBaRcode"; version="1.2.2"; sha256="0ls5xly4rrwjby04015yrs8f072fdg492bk4lj1zr2hy0z4m98jc"; depends=[ape Biostrings dplyr futile_logger future future_apply ggnetwork ggplot2 ggraph ggseqlogo ggtree igraph network phangorn RColorBrewer reshape2 S4Vectors shiny ShortRead stringdist VennDiagram visNetwork]; }; genBart = derive2 { name="genBart"; version="1.0.1"; sha256="12z5vj41npwawz954zqkjfmg9inh063ilh7m82pn73asrxif0ay3"; depends=[clValid data_table fastcluster ggplot2 gtools limma NMF pca3d psych qusage RColorBrewer reshape2 rmarkdown scales shiny shinydashboard shinyjs statmod stringr VennDiagram]; }; genSurv = derive2 { name="genSurv"; version="1.0.3"; sha256="0k5rfpq603szjb76gxffvsbqcav8182h8zwvg4kar68k72yfw1xs"; depends=[]; }; genTS = derive2 { name="genTS"; version="0.1.3"; sha256="1ky8h8yzqfkb91ny9z08gr7irzvjqr1b42k89ahcrmk458hjwgqr"; depends=[shiny]; }; @@ -8216,7 +8234,6 @@ in with self; { genepi = derive2 { name="genepi"; version="1.0.1"; sha256="1whhdlq9p8gmygv7464hvfz6dhm65gqq1dqls6hgpmw822zxgbd5"; depends=[]; }; genepop = derive2 { name="genepop"; version="1.1.7"; sha256="0b36nspq3kkad52k0viw1pdsf7h9h5ivi0ix7zg8i0z7vkhnm0cy"; depends=[Rcpp RcppProgress stringr]; }; generalCorr = derive2 { name="generalCorr"; version="1.1.5"; sha256="1kjmg9paxhpd6csia69k169qgm8s388iysrjnm4bqv9zxn21zwwg"; depends=[lattice meboot np psych xtable]; }; - generalKSStat = derive2 { name="generalKSStat"; version="1.0.3"; sha256="03jnklvji78xwfspz29jy2jmww893x9xxd25y9gbb73nqmjvgmmr"; depends=[Rcpp]; }; generalhoslem = derive2 { name="generalhoslem"; version="1.3.4"; sha256="0fmfhmdb16gf3v9h50vif4f3f6bm03qq7wplnmzyxa80jb60fcc0"; depends=[MASS reshape]; }; generator = derive2 { name="generator"; version="0.1.0"; sha256="0xjvnmnpdms8rrxxcz6pd8w4rnbv3ghzqv4m63zxia2l98x7z4rf"; depends=[]; }; generics = derive2 { name="generics"; version="0.0.2"; sha256="0xk1xhpy7gpv3pvaygzhpfdxj72zmb38pb4nscfyg2ff36vx3cvi"; depends=[]; }; @@ -8226,7 +8243,7 @@ in with self; { genie = derive2 { name="genie"; version="1.0.4"; sha256="0ymrn42ik0rfildmyq4z0gsd7injda0dsjgx69nqb6hq0x8s5hqa"; depends=[Rcpp]; }; genio = derive2 { name="genio"; version="1.0.12"; sha256="15v9hdnb1jknbvflvgyyhcx0cqjn3v9zl66mswk59j56qm58bkr9"; depends=[Rcpp readr tibble]; }; genius = derive2 { name="genius"; version="2.2.0"; sha256="0062g7wyclrbaljwib57s95x5wamc01fr3hgwjjzgv850vbbjqlv"; depends=[dplyr purrr readr reshape2 rvest stringr tibble tidyr tidytext]; }; - geniusr = derive2 { name="geniusr"; version="1.1.0"; sha256="1qnzqlgzq507g9iik00gh242nh3zcg38awrlaxl5zgnsp852kjnv"; depends=[attempt curl httr purrr rvest stringr tibble xml2]; }; + geniusr = derive2 { name="geniusr"; version="1.2.0"; sha256="04h0a61ngs0cmjf23imx76bm82dzkp4q4j31h3xlic05dx2lvyan"; depends=[curl dplyr httr purrr rvest stringr tibble xml2]; }; genlasso = derive2 { name="genlasso"; version="1.4"; sha256="01p1cs0h6gwr6f18aaqirgd8yxrhyamakc763y9dm6mndrba2x0g"; depends=[igraph MASS Matrix]; }; genlogis = derive2 { name="genlogis"; version="1.0.0"; sha256="01av5invhviii7adqihh10ib47rjzwfsqdgw3lfg1c72kzrqywgr"; depends=[distr doParallel foreach ggplot2 manipulate]; }; geno2proteo = derive2 { name="geno2proteo"; version="0.0.3"; sha256="1q054ai42f5gmrj791abj02f663zs7ymdh3pfs3b2lq6i4w9s2fb"; depends=[BiocGenerics GenomicRanges IRanges R_utils RUnit S4Vectors]; }; @@ -8238,7 +8255,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.1"; sha256="1vz4pq8rfvw0pbxhm83mbgsrj17ldcssq92b48p6vlpb403jsm91"; depends=[ggplot2 MASS nleqslv]; }; + genpwr = derive2 { name="genpwr"; version="1.0.2"; sha256="0k05l0d2qk2g3ic6f46xkhgy8ziwalrfx4nc0qi2k7i44kz720mg"; depends=[ggplot2 MASS nleqslv]; }; genridge = derive2 { name="genridge"; version="0.6.7"; sha256="07mdkkq4j8i5x8d4yfsp2rfpf7gkcgdcsw9b2ng5f7gdnblrw0dr"; depends=[car]; }; 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]; }; @@ -8262,7 +8279,7 @@ in with self; { geohashTools = derive2 { name="geohashTools"; version="0.3.0"; sha256="0lc5ib6iylbxn02bl72sh3b6j51zm3b1rnjrj5jdyjj22hm7n7sa"; depends=[]; }; geojson = derive2 { name="geojson"; version="0.3.2"; sha256="0iqf8jkqgl97a07v8ixr2pbvamwyjswqckdwl3kkxgx7bycndprv"; depends=[jqr jsonlite lazyeval magrittr protolite sp]; }; geojsonR = derive2 { name="geojsonR"; version="1.0.8"; sha256="015g1xpvbwgng5vh79q8gx6900skv3p7s2v3xbka08qllvsg5by1"; depends=[R6 Rcpp RcppArmadillo]; }; - geojsonio = derive2 { name="geojsonio"; version="0.9.0"; sha256="0w0qfag64js72qbm15gapgrh6xlh87dzwf0qs9gcrrlr69r5kvk1"; depends=[crul geojson jqr jsonlite magrittr maptools readr rgeos sf sp V8]; }; + geojsonio = derive2 { name="geojsonio"; version="0.9.2"; sha256="1m315vr0vw60g6j5i7x293szhji3d4p7f54hxmz1aqw4y7fkr8f6"; depends=[crul geojson jqr jsonlite magrittr maptools readr rgeos sf sp V8]; }; geojsonlint = derive2 { name="geojsonlint"; version="0.4.0"; sha256="0l6xlf6l9shyvdd2ghkhcgbkxpmycapfpxakzbvd92j1x8dmr9az"; depends=[crul jsonlite jsonvalidate V8]; }; geojsonsf = derive2 { name="geojsonsf"; version="1.3.3"; sha256="0a1ij0nq5d4cvrmqs0mpnc2a1c4h9ms29yln9iay9qi5c5pjdd1k"; depends=[curl jsonify rapidjsonr Rcpp sfheaders]; }; geoknife = derive2 { name="geoknife"; version="1.6.3"; sha256="092in9wihgijhbkawzjqwfyazz22n4sc06x2gj14yvmp63x5dj36"; depends=[curl httr progress sp whisker xml2]; }; @@ -8278,7 +8295,6 @@ in with self; { geoops = derive2 { name="geoops"; version="0.2.0"; sha256="0n9n0j849jbqv6y6lqhyhddr5zfz8i9yi03gpg9862nzkvxd3c4k"; depends=[Rcpp]; }; geophys = derive2 { name="geophys"; version="1.4-1"; sha256="1s64sbr0chv0z2vaw059khfkv8iga1kr6428kkglgafq5x2d6h3q"; depends=[cluster GEOmap RFOC RPMG RSEIS]; }; georob = derive2 { name="georob"; version="0.3-13"; sha256="1ddynk8ss5jslxrwz7rg650d05qa5sh5qc3rzkrq8s4hpvw1zqgw"; 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.4-1"; sha256="00c2566r50v4vgqzjvghf4spyfqqxnwkhxj38ivym3l8b0d5fd2x"; depends=[httr openssl R6 XML]; }; geoscale = derive2 { name="geoscale"; version="2.0"; sha256="0gisds0in32xhw54fxfyxvwxgrfjs871wmqf6l915nr896rlx0bm"; depends=[]; }; geosed = derive2 { name="geosed"; version="0.1.1"; sha256="07j4q6sgrf83h2gi2j5qap5rifz8gimdacd3b7ld1p3b6ai6kv3r"; depends=[]; }; @@ -8313,7 +8329,7 @@ in with self; { getopt = derive2 { name="getopt"; version="1.20.3"; sha256="0zzmzgwl9a4y3s34600vmih22d6y32294f9bvxrnmffnvkgmy7sk"; depends=[]; }; gets = derive2 { name="gets"; version="0.22"; sha256="0k5lji4gglb1is3j2596yibr6cx4h82aslwcbm4hb6jjb76ajmcv"; depends=[zoo]; }; getspres = derive2 { name="getspres"; version="0.1.1"; sha256="1k69b7by1398pc9knp97r3k6pv8hixzianqal71ggdrwsb3n1gis"; depends=[colorRamps colorspace dplyr metafor plotrix RColorBrewer]; }; - gettz = derive2 { name="gettz"; version="0.0.3"; sha256="1i06nfm824131q8lwwhrbzg2g9lbnmyp8k57w2vag7v8jj5rdrda"; depends=[]; }; + gettz = derive2 { name="gettz"; version="0.0.4"; sha256="1j83pdny3phfflkdjwiflyfvighn73pysw5bac4hx079dda8k25g"; depends=[]; }; gexp = derive2 { name="gexp"; version="1.0-1"; sha256="1i3sarsawax1landjbm8gxrcrimwzdgrbybzipqwxdrmlgvxslqk"; depends=[jpeg mvtnorm png]; }; 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]; }; @@ -8323,6 +8339,7 @@ in with self; { ggBubbles = derive2 { name="ggBubbles"; version="0.1.4"; sha256="116rl8j0s9xwhh9jl5yj9fspkhv2zrirbx9247hhns9ngrdn4i3x"; depends=[dplyr ggplot2]; }; ggChernoff = derive2 { name="ggChernoff"; version="0.2.0"; sha256="09bh9isvx3hwwvg72fv6z3fvp8dimpbhvbp328z8amq8jjhph4vf"; depends=[ggplot2 scales]; }; ggExtra = derive2 { name="ggExtra"; version="0.9"; sha256="18mbi6gblqmrsciad1d2c9ngllk6mayaqj43k40hjq9ydqnvjbgj"; depends=[colourpicker ggplot2 gtable miniUI R6 scales shiny shinyjs]; }; + ggPMX = derive2 { name="ggPMX"; version="1.1"; sha256="0magxjrm6za9g1hhmykv47gh6lyc1zz7bffcrchxnybsv5mih9p8"; depends=[assertthat checkmate data_table GGally ggplot2 gtable knitr magrittr R6 rmarkdown stringr yaml zoo]; }; ggQC = derive2 { name="ggQC"; version="0.0.31"; sha256="1j9cs97hcj5zmqvn5rjr3gl0b9748s3pv2nb7v66dsyjdwvj7wyy"; depends=[dplyr ggplot2 tidyr]; }; ggQQunif = derive2 { name="ggQQunif"; version="0.1.5"; sha256="0vrxmqxy946mwdq0mb2m1ch41r0chrw7hcn18dr3mp10bv7pl7wj"; depends=[dplyr ggplot2 scales]; }; ggROC = derive2 { name="ggROC"; version="1.0"; sha256="0p9gdy7ia59d5m84z9flz5b03ri7nbigb3fav2v2wrml300d24vn"; depends=[ggplot2]; }; @@ -8332,13 +8349,14 @@ in with self; { ggTimeSeries = derive2 { name="ggTimeSeries"; version="1.0.1"; sha256="12gi0zfl8g3x78skpkhska8b3z1pp636shrbx33rkq0iacsipqga"; depends=[data_table ggplot2]; }; ggVennDiagram = derive2 { name="ggVennDiagram"; version="0.3"; sha256="1jgxzb3iffhx6xyn14nldljkaangdvzrxzfkibsb6g787fgv8ng9"; depends=[dplyr ggplot2 sf VennDiagram]; }; ggallin = derive2 { name="ggallin"; version="0.1.1"; sha256="0hrxa7m07ppvnndivxcgxksdyblb6fw17aw46maqavlvcrz3fjgm"; depends=[ggplot2 scales]; }; - ggalluvial = derive2 { name="ggalluvial"; version="0.11.1"; sha256="05c59w9rmp59ajw8ybr155c9xfxzlgc76xcnxh3890nh7nn7h0m1"; depends=[dplyr ggplot2 lazyeval rlang tidyr tidyselect]; }; + ggalluvial = derive2 { name="ggalluvial"; version="0.11.3"; sha256="19kad21rysh9f6fifd9drw9q90c3chpq33pip10zl2k1zl2wlif0"; depends=[dplyr ggplot2 lazyeval rlang tidyr tidyselect]; }; ggalt = derive2 { name="ggalt"; version="0.4.0"; sha256="0ssa274d41vhd6crzjz7jqzbwgnjimxwxl23p2cx35aqs5wdfjpc"; depends=[ash dplyr extrafont ggplot2 gtable KernSmooth maps MASS plotly proj4 RColorBrewer scales tibble]; }; ggamma = derive2 { name="ggamma"; version="1.0.1"; sha256="1zc4p2bz4pxqycrzgb9wwl53lxqcikxsihna6ff8pmw1n623j85z"; depends=[]; }; gganimate = derive2 { name="gganimate"; version="1.0.5"; sha256="0kvz9gm56zz61bq7sky0m9mrlk8awjx0xm3yw9dawz1vw4a5fr3x"; depends=[ggplot2 glue plyr progress rlang scales stringi tweenr]; }; ggasym = derive2 { name="ggasym"; version="0.1.3"; sha256="1vfwzjwmh27ki0j7nadmnl28wddjs4nzmraak868hmph9a2bjdgj"; depends=[dplyr ggplot2 magrittr purrr rlang scales stringr tibble tidyr]; }; ggbeeswarm = derive2 { name="ggbeeswarm"; version="0.6.0"; sha256="0crk29p5vi1r3a988kms4y7r0iqwgwzsikgvh18r9wbzyr98bb5v"; depends=[beeswarm ggplot2 vipor]; }; ggbuildr = derive2 { name="ggbuildr"; version="0.1.0"; sha256="0pld635v6fv46ky7s4icwxlcnr7z6bp5ikf20adpkljwhy0wwxak"; depends=[ggplot2 purrr readr]; }; + ggbump = derive2 { name="ggbump"; version="0.1.0"; sha256="15cnzv2q3gylkmd1zj044cp14ldnkc4fzwmxaqpc8cagwf9i10zk"; depends=[dplyr ggplot2 purrr tidyr]; }; ggcharts = derive2 { name="ggcharts"; version="0.1.0"; sha256="0prv174ifhj4chp23r4wwmgkhw2g8q8chm2jixzbks2z08xqvahs"; depends=[dplyr ggplot2 magrittr patchwork rlang]; }; ggconf = derive2 { name="ggconf"; version="0.1.3"; sha256="0g4xasqhdiqfqahakv6p5npl56f2iakx4bnc9v9zcjr077kdda4n"; depends=[ggplot2 rly]; }; ggcorrplot = derive2 { name="ggcorrplot"; version="0.1.3"; sha256="0hi9lz121ya1l2lbm7rqlxg6fs6bvxck396dngnidrhl5fvqb41b"; depends=[ggplot2 reshape2]; }; @@ -8351,7 +8369,7 @@ in with self; { gge = derive2 { name="gge"; version="1.4"; sha256="0plwk5j2n0309ghgn8r4ws3azwn7n4jb7yfykiiwwalhs3k05lsa"; depends=[nipals reshape2 rgl]; }; ggeasy = derive2 { name="ggeasy"; version="0.1.2"; sha256="06rynzv6vqngay5cjrig550dfada66075qs69l4rpfqci0vh05km"; depends=[ggplot2 rlang]; }; 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.14.2"; sha256="1y3yfb07jrr6vkc8hk6rp52l70dj7042jvqgjzllslzy7hx2jhyw"; depends=[insight MASS sjlabelled]; }; + ggeffects = derive2 { name="ggeffects"; version="0.14.3"; sha256="06p80bgjhjknzlb4vs4n41i9n9vv5agncakl9f92zkaahgyzd6sd"; depends=[insight MASS sjlabelled]; }; ggenealogy = derive2 { name="ggenealogy"; version="1.0.1"; sha256="19six9ln1yaqv268abm9qvb61nl8zdz3gghwr8hmwsa94xwhzhkq"; depends=[ggplot2 igraph plotly plyr reshape2 tibble]; }; ggetho = derive2 { name="ggetho"; version="0.3.5"; sha256="1gwd4mkja2xypzm2c1w61lq126cn1fdcw8l8gkzsl2ljn2xd2phi"; depends=[behavr data_table ggplot2 labeling rlang scales stringr]; }; ggfan = derive2 { name="ggfan"; version="0.1.3"; sha256="1p3hbznpsaznlk0lnjyazc130www0p5919qplg3kspng7qh8p22w"; depends=[colorspace dplyr ggplot2 rstan]; }; @@ -8401,13 +8419,13 @@ in with self; { ggplotgui = derive2 { name="ggplotgui"; version="1.0.0"; sha256="1yfglg5438mwyml845isimzma5q6824x19jka509ng49bzmf1za0"; depends=[ggplot2 haven plotly RColorBrewer readr readxl shiny stringr]; }; ggplotify = derive2 { name="ggplotify"; version="0.0.5"; sha256="0pfnp4lrissf21z7867kdm6slr979kchyva8iaf83i1302kscph3"; depends=[ggplot2 gridGraphics rvcheck]; }; ggplotlyExtra = derive2 { name="ggplotlyExtra"; version="0.0.1"; sha256="1m2rhylpzj934gb50lxjp47rxz0kwl9i1p3n7w1rz4qi96pr5p1c"; depends=[ggplot2 plotly rlang]; }; - ggpmisc = derive2 { name="ggpmisc"; version="0.3.3"; sha256="1m5ajcy6l8gb2h2ph32ij9dgn6fqpcsf9nf5dr5gas7a15ihpcas"; depends=[broom dplyr ggplot2 gridExtra lubridate magrittr MASS plyr polynom rlang scales splus2R stringr tibble xts zoo]; }; + ggpmisc = derive2 { name="ggpmisc"; version="0.3.4"; sha256="0xc1yp0kphipq23ri4ij93garx1x2nrf4i0lhs6m10pp9yz7fbmj"; depends=[broom dplyr ggplot2 gridExtra lubridate magrittr MASS plyr polynom rlang scales splus2R stringr tibble xts zoo]; }; ggpointdensity = derive2 { name="ggpointdensity"; version="0.1.0"; sha256="0c9a14j3b0hvamqylhzldw2hjdxmfbllwahjkf3gg2rw337ld9iy"; depends=[ggplot2]; }; ggpol = derive2 { name="ggpol"; version="0.0.6"; sha256="1316g0y0i4nm4nsa422pbrv4w3g0rv1jxy6m7qasarq2mml9lxjs"; depends=[dplyr ggplot2 glue gtable plyr rlang tibble]; }; ggpolypath = derive2 { name="ggpolypath"; version="0.1.0"; sha256="0g9zfal3vqcx16fi4abxm6l5sam475lk1f6bdik487wc2v0dkq83"; depends=[ggplot2]; }; ggpubr = derive2 { name="ggpubr"; version="0.2.5"; sha256="0kb3hpmnhj4mkbx1kx0kv5y22himr8dijqx7ra0h8hi0pf2l2ha7"; depends=[cowplot dplyr ggplot2 ggrepel ggsci ggsignif glue gridExtra magrittr polynom purrr rlang scales tidyr]; }; ggpval = derive2 { name="ggpval"; version="0.2.3"; sha256="04s0pwi0pljdd8r6wnjyb3i3php6qgvpc1mdvhywcx2i2zqip2qx"; depends=[data_table ggplot2]; }; - ggquickeda = derive2 { name="ggquickeda"; version="0.1.5"; sha256="13kszfsxnpbkcn3lnlcmrw5a0c3ny8gv9dn4ciphl40rk7qpi26v"; depends=[colourpicker dplyr DT Formula GGally ggplot2 ggpmisc ggpubr ggrepel ggstance gridExtra Hmisc lazyeval markdown plotly quantreg rlang scales shiny shinyjs stringr survival survminer table1 tidyr]; }; + ggquickeda = derive2 { name="ggquickeda"; version="0.1.6"; sha256="1yj1gfl7hvshjp5gqm1jgrfvnnvrn32zkv5d2il41hmp8hp71y2d"; depends=[colourpicker dplyr DT Formula GGally ggplot2 ggpmisc ggpubr ggrepel ggstance gridExtra Hmisc lazyeval markdown plotly quantreg rlang scales shiny shinyjqui shinyjs stringr survival survminer table1 tidyr]; }; ggquiver = derive2 { name="ggquiver"; version="0.2.0"; sha256="1hsayqxf4brck1rx97yyprw1axc83lksgf7mn3rh8hqx4h1f5f0f"; depends=[dplyr ggplot2]; }; ggraph = derive2 { name="ggraph"; version="2.0.2"; sha256="1ckq82hg52vr2wydkqv2wrppgjyvddd6bwqzrngqlm7j71xapjl0"; depends=[digest dplyr ggforce ggplot2 ggrepel graphlayouts gtable igraph MASS Rcpp rlang scales tidygraph viridis]; }; ggraptR = derive2 { name="ggraptR"; version="1.2"; sha256="18r70pnz7x8728lg447ds7swgk539gga9shax7rs4x56a710pf3q"; depends=[dplyr ggplot2 pacman purrr shiny]; }; @@ -8428,9 +8446,9 @@ in with self; { ggspectra = derive2 { name="ggspectra"; version="0.3.5"; sha256="0pvkh4cr9nyhhv9ikjs7nhjagal63k8zfbik28cmw2c2x31m019v"; depends=[dplyr ggplot2 ggrepel lubridate photobiology photobiologyWavebands scales tidyr]; }; ggstance = derive2 { name="ggstance"; version="0.3.4"; sha256="0aqz3dn02cgij018a4sglqwrwr9dzzj12l8xr1064q7hfd4f64m1"; depends=[ggplot2 plyr rlang withr]; }; ggstar = derive2 { name="ggstar"; version="0.0.4"; sha256="02mvbp3pdx90b36nwpm975h0c11vza9177h3pym9nqxyx2dp72qa"; depends=[ggplot2 gridExtra scales]; }; - ggstatsplot = derive2 { name="ggstatsplot"; version="0.3.1"; sha256="05ily9798akg53w1k0sr9paizmz121y6acc74pghi09x9xdv3lbm"; depends=[broomExtra cowplot dplyr ggcorrplot ggExtra ggplot2 ggrepel ggsignif groupedstats insight ipmisc pairwiseComparisons paletteer purrr rlang statsExpressions tidyr]; }; + ggstatsplot = derive2 { name="ggstatsplot"; version="0.4.0"; sha256="01hyrhpbz5ggpy7r26z9dgfc56972kzj8x8awvsr634l522lwa7g"; depends=[broomExtra correlation cowplot dplyr ggcorrplot ggExtra ggplot2 ggrepel ggsignif groupedstats insight ipmisc pairwiseComparisons paletteer purrr rlang statsExpressions tidyr]; }; 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]; }; + ggtern = derive2 { name="ggtern"; version="3.3.0"; sha256="12lxmql9zspglp0baqp419l0vgilrf8lyxsza142bfyvmdbhh6d3"; depends=[compositions ggplot2 gridExtra gtable hexbin latex2exp lattice MASS plyr proto scales]; }; ggthemes = derive2 { name="ggthemes"; version="4.2.0"; sha256="0rrkzfggc1nlda1w1lbqdycx6nawxbkac1szhvkwrqlzh6agxcsv"; depends=[ggplot2 purrr scales stringr tibble]; }; ggupset = derive2 { name="ggupset"; version="0.2.1"; sha256="1hqd1csli8iifxdghkvbyrjal7h4dd92ya287llaa2v4wdsqa1hm"; depends=[ggplot2 gtable rlang scales tibble]; }; ggversa = derive2 { name="ggversa"; version="0.0.1"; sha256="0xqn8iznrm8q30pxwka88wi1z7lndi6lm12rq6ngcaxf294fbz01"; depends=[]; }; @@ -8438,9 +8456,9 @@ 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.5.0"; sha256="0mr92738s3j9wm6mkr5hd2flqsqw3vfjifv3fajsygysbwrl8dn8"; depends=[colorspace ggplot2 png Rcpp scales]; }; gh = derive2 { name="gh"; version="1.1.0"; sha256="1bc9bn1078s664hc806dh0y1ncxif77q479rfmxfir9z7hwaz7yy"; depends=[cli httr ini jsonlite]; }; - ghibli = derive2 { name="ghibli"; version="0.3.1"; sha256="1wnz26n0a3pgzigb2vp08v7swk061whi2zvfm6bih0aniqv5n7ml"; depends=[]; }; + ghibli = derive2 { name="ghibli"; version="0.3.2"; sha256="0762dy3x7w0q1swag2lh33cpqdr9bbqw0963ymdpnchawdh5m50z"; depends=[prismatic]; }; ghql = derive2 { name="ghql"; version="0.1.0"; sha256="19awg98r2hwwwwrwh0166y8ij1clf58vrf02i8fhhfzddx3an6bz"; depends=[crul graphql jsonlite R6]; }; - ghyp = derive2 { name="ghyp"; version="1.5.9"; sha256="1lvx8jq0gjz9398nxkra0pq3q2cl4zbnggj4z4pqp3p6dahb0364"; depends=[MASS numDeriv]; }; + ghyp = derive2 { name="ghyp"; version="1.6.0"; sha256="10v35slafbnxhjbv30vi784zw3jp1zaz4pp65jb9nw4f0vch3anc"; depends=[MASS numDeriv]; }; gibble = derive2 { name="gibble"; version="0.3.0"; sha256="19sj32jbq12a8zf03a39yqj8jln53nhb4b2v3khbq60nr9bxlm1r"; depends=[dplyr rlang tibble]; }; gibbs_met = derive2 { name="gibbs.met"; version="1.1-3"; sha256="1yb5n8rkphsnxqn8rv8i54pgycv9p7x1xhinx4l5wzrds3xhf2dc"; depends=[]; }; gifski = derive2 { name="gifski"; version="0.8.6"; sha256="00w4bzp0rrp4isy1rnxs6g1q07r3wndadk3mqdrxk2wxi7jmghna"; depends=[]; }; @@ -8489,7 +8507,6 @@ in with self; { glmglrt = derive2 { name="glmglrt"; version="0.1.0"; sha256="0y3bwf6lg6wh2kq5p4flmvnc15c87w4xgxb0qnbvwmdnabsjd7zh"; depends=[MASS parameters]; }; glmgraph = derive2 { name="glmgraph"; version="1.0.3"; sha256="16sq6i7kbw20nvwikpa02z3pb7wqw3270j6ss7f8sgf548skhmx0"; depends=[Rcpp RcppArmadillo]; }; glmlep = derive2 { name="glmlep"; version="0.2"; sha256="0rq2vxbr732r725pn8qdvppxcrhjhyvlr550svfgy1inq985c1w4"; depends=[]; }; - glmm = derive2 { name="glmm"; version="1.3.0"; sha256="088m626c2f75ij457mskdyi927y6g01m5rgfsjaxpm7xbywk51sw"; depends=[doParallel foreach itertools Matrix mvtnorm trust]; }; glmmEP = derive2 { name="glmmEP"; version="1.0-3.1"; sha256="0fql85m0mxn58jh3mgrcw56bb4dx7amrz39ngqrljwi5pv5i7aj4"; depends=[lme4 matrixcalc]; }; glmmLasso = derive2 { name="glmmLasso"; version="1.5.1"; sha256="1az9vdnyqyrfn1q7zrn6x4ywx77b0vg65cni45x37b0ybkwpis39"; depends=[Matrix minqa]; }; glmmML = derive2 { name="glmmML"; version="1.1.0"; sha256="121iclp86nfm9mybvfwascs937i0z2mbv982hn894q6g7jkqiw1l"; depends=[]; }; @@ -8557,7 +8574,7 @@ in with self; { googleCloudStorageR = derive2 { name="googleCloudStorageR"; version="0.5.1"; sha256="0sd6ca1ksv22avr5rcvkf5089f9igb8gqa83kidlc4xklaj6g92m"; depends=[assertthat curl googleAuthR httr jsonlite openssl yaml zip]; }; googleCloudVisionR = derive2 { name="googleCloudVisionR"; version="0.2.0"; sha256="1n4gkmnwp9wadxz1izggxnpcpm4bz3imhq5y3i2szr8zwafcqqjv"; depends=[data_table glue googleAuthR jsonlite purrr]; }; googleComputeEngineR = derive2 { name="googleComputeEngineR"; version="0.3.0"; sha256="1s0qvnijzkja645lim373swk815n3s1292q6sk3q36ss70q42cfg"; depends=[assertthat future googleAuthR httr jsonlite]; }; - googleLanguageR = derive2 { name="googleLanguageR"; version="0.2.0"; sha256="1l0gnynild95k9fw1d398zd4dkws97p13vvfv6jaklqj0xmh9ib8"; depends=[assertthat base64enc googleAuthR jsonlite magrittr purrr tibble]; }; + googleLanguageR = derive2 { name="googleLanguageR"; version="0.3.0"; sha256="0lm50g3gshp18nvygi6is2rayzhcx0rw2rvb4lvm0jlx5m96xgxb"; depends=[assertthat base64enc googleAuthR jsonlite magrittr purrr tibble]; }; googlePolylines = derive2 { name="googlePolylines"; version="0.7.2"; sha256="0czfsmf8gv38g950l9xkk67q9v53pk9xk9yr2flbdpm8nlrdpjz7"; depends=[BH Rcpp]; }; googlePrintr = derive2 { name="googlePrintr"; version="0.0.1"; sha256="19rm78x8qd61ilc6h1kn3dw63m6dfsckqkd3n76krvi0akgl72w5"; depends=[googleAuthR httr jsonlite]; }; googlePublicData = derive2 { name="googlePublicData"; version="0.16.1"; sha256="15hyslpqvncg21q581h061rfyg99y8lavqw1x8hzl7xzd49bn9r5"; depends=[readxl XML]; }; @@ -8571,11 +8588,11 @@ in with self; { googleway = derive2 { name="googleway"; version="2.7.1"; sha256="0axpr81p3gdp1nmfn000lk288sdn8z5qmzjvagdxqn5j44hq6sj1"; depends=[curl googlePolylines htmltools htmlwidgets jpeg jqr jsonlite magrittr scales shiny viridisLite]; }; goric = derive2 { name="goric"; version="1.1-0"; sha256="1smjq9vljszgngs5i6x55jwg0imzc5gsfdqxzcs4541fp3pvk999"; depends=[MASS Matrix mvtnorm nlme quadprog]; }; gorica = derive2 { name="gorica"; version="0.1.0"; sha256="09b5i6r2s449gvk0vagvf7kd6y0pgr4cz7hdwplq01x246bhjs6q"; depends=[bain lavaan lme4 MASS mvtnorm quadprog]; }; + gotop = derive2 { name="gotop"; version="0.1.0"; sha256="1gak2yqj82d8h34mksy8ii28n7ga0qfi3709gc1xpg7ax1bgp83h"; depends=[htmltools jsonlite rmarkdown]; }; govStatJPN = derive2 { name="govStatJPN"; version="0.1"; sha256="03sywa7rl5rblvv370mfszz5ngp850qf32yydy1fdx10lv5amrfl"; depends=[]; }; govdown = derive2 { name="govdown"; version="0.8.0"; sha256="0sfjpbpzpay9jw5fys8dkkfilw9r8yfj2xhb20pvjk3l6hrsjwvk"; depends=[rmarkdown]; }; gower = derive2 { name="gower"; version="0.2.1"; sha256="007ivwn1nagpi26qq8iih1c2l61c53glvv60n90hi341ry8vwgxg"; depends=[]; }; - gpDDE = derive2 { name="gpDDE"; version="0.8.2"; sha256="100g2f8zlpbwxb46h62pgvidll8aflz1zl4inyh8dml6vhm9pilp"; depends=[CollocInfer deSolve fda forecast lars limSolve MASS nnls penalized trustOptim TSA]; }; - gpairs = derive2 { name="gpairs"; version="1.2"; sha256="09mkdbs9hklxnmqcsnf65s3dfsfcr7kppp6zxj08v5hxym1gpz3l"; depends=[barcode colorspace lattice MASS vcd]; }; + gpairs = derive2 { name="gpairs"; version="1.3.3"; sha256="08m1ydrr239vnhjbl47mng3i2w9bqmd8fijrwsraq5ysvn826n27"; depends=[barcode colorspace lattice MASS vcd]; }; gpclib = derive2 { name="gpclib"; version="1.5-6"; sha256="11jjgg74l8hy9jz4jylhriqnzv8jcf12y1bkx22v29z3fhgkwkps"; depends=[]; }; gpg = derive2 { name="gpg"; version="1.2.2"; sha256="1qc7w4d6frp0j4yk0q7slkj1mps80bv78lixcpw1shgx48rp41kh"; depends=[askpass curl]; }; gpk = derive2 { name="gpk"; version="1.0"; sha256="1zfhkqyypb24mhbj2zi9qy3gw0kqxvlp8j5ni3zm7k5rz1bnrygg"; depends=[]; }; @@ -8583,7 +8600,7 @@ in with self; { gplots = derive2 { name="gplots"; version="3.0.3"; sha256="0hs6mk48i9yd43rg9wfjc2nxsjjwrnpifxqvxkv8ah18kvpd6xnp"; depends=[caTools gdata gtools KernSmooth]; }; gpmap = derive2 { name="gpmap"; version="0.1.1"; sha256="00jhslbxbp6dgq7bw346hfpw0gans048vsn7chyzjhyr7ah5xrfg"; depends=[foreach ggplot2 isotone plyr]; }; gppm = derive2 { name="gppm"; version="0.2.0"; sha256="1n9is3xj52lsck2fiy9j320p2ca6ib36s251i7g3iz99a77b0ahh"; depends=[ggplot2 ggthemes MASS mvtnorm Rcpp rstan]; }; - gprofiler2 = derive2 { name="gprofiler2"; version="0.1.8"; sha256="0xa2r40alsj9d1kgkchli7p9wcffbjqbz16f8crribgl47zwlvxc"; depends=[crosstalk dplyr ggplot2 gridExtra jsonlite plotly plyr RCurl tidyr viridisLite]; }; + gprofiler2 = derive2 { name="gprofiler2"; version="0.1.9"; sha256="112hmmvdwg8xz90w1bsbzc55y4xi9jj4dqy0q4bsgp49x58r92rb"; depends=[crosstalk dplyr ggplot2 gridExtra jsonlite plotly RCurl tidyr viridisLite]; }; gptk = derive2 { name="gptk"; version="1.08"; sha256="0fk6c8f8fni4y2n2cbfwywlfyz74xlb8lx25wajsxr2v4x74pa7l"; depends=[fields Matrix]; }; gpuR = derive2 { name="gpuR"; version="2.0.3"; sha256="1afbnrnk0hrsd3qa7gh269wxn1maq7dpi6wpjhhbp2gwr6100vqy"; depends=[assertive BH Rcpp RcppEigen RViennaCL]; }; gqlr = derive2 { name="gqlr"; version="0.0.2"; sha256="0gzhqyrbnz3qjzkr4slryrlfhlaxm474y9fahlj0sb0hvcx68pxj"; depends=[graphql jsonlite magrittr pryr R6]; }; @@ -8606,7 +8623,7 @@ in with self; { grapherator = derive2 { name="grapherator"; version="1.0.0"; sha256="071by9b8figbsf4g0f8a8mgcdksjksc57mnlgggilw7py1yjnjlh"; depends=[BBmisc checkmate deldir ggplot2 lhs reshape2 vegan]; }; graphframes = derive2 { name="graphframes"; version="0.1.2"; sha256="1bv7d0sggwab4rd486ayw9gkb5ja5p5fin5pn92xnrmz8cgwsfxq"; depends=[forge sparklyr tibble]; }; graphicalExtremes = derive2 { name="graphicalExtremes"; version="0.1.0"; sha256="1cc4xcb72yci2gq2zn3g1nh3ba802anpymm0hajdbz3kb0wz1gyn"; depends=[igraph matrixcalc mvtnorm Rdpack]; }; - graphicalVAR = derive2 { name="graphicalVAR"; version="0.2.2"; sha256="1jzhqbdylpzc8d28vz2k34i9dpxx5x34bgvx73z8wjglnn6j27b8"; depends=[dplyr glasso glmnet igraph Matrix mvtnorm qgraph Rcpp RcppArmadillo]; }; + graphicalVAR = derive2 { name="graphicalVAR"; version="0.2.3"; sha256="1xd98irbh67a7vbj6a4arl51dnkj5c0c1mcmh1c1hsac8mdj29w0"; 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.6.0"; sha256="1la016m37kp79zk8p1yx9kaha8y6d4w52w39h0mzv1mfsi6d75w0"; depends=[igraph Rcpp RcppArmadillo]; }; @@ -8647,6 +8664,7 @@ in with self; { gromovlab = derive2 { name="gromovlab"; version="0.7-6"; sha256="02s7x23610dbpmrqh7pimspa10v3fnmj48fwmh0a6igd74rmj2mg"; depends=[ape cluster glpkAPI igraph quadprog]; }; groupICA = derive2 { name="groupICA"; version="0.1.1"; sha256="1wl828ligvvw55xic383gdn7aq4mbwsnkl4ym6f71jn5g3p36d0i"; depends=[MASS]; }; groupRemMap = derive2 { name="groupRemMap"; version="0.1-0"; sha256="1bfp746j0dx7kk44nyjqmimvgw14par9ayvqxnzldc05qsazjdwx"; depends=[]; }; + groupWQS = derive2 { name="groupWQS"; version="0.0.1"; sha256="1009lw80knvspphvzz3jhclyflm9s300n2048gb7lrrnam657016"; depends=[glm2 Rsolnp]; }; groupdata2 = derive2 { name="groupdata2"; version="1.2.0"; sha256="119ianzcv5dwvdyfxmgm7qgv99zbanm1ikal0rxc70c5n5lagv83"; depends=[checkmate dplyr lifecycle numbers plyr rlang tibble]; }; grouped = derive2 { name="grouped"; version="0.6-0"; sha256="1glxgacpwk7yjbkwg5ci6bmb2il6hf5zhydwi5bbq6hc032m9976"; depends=[MASS]; }; groupedSurv = derive2 { name="groupedSurv"; version="1.0.4.1"; sha256="1kapz07hswpcvm9mmgc06l71f7ymx7aq816mzwca6cvccvqnrl5n"; depends=[BH doParallel foreach qvalue Rcpp RcppEigen]; }; @@ -8660,7 +8678,7 @@ in with self; { growthmodels = derive2 { name="growthmodels"; version="1.2.0"; sha256="1wy5z77819s3daa0mifafcjfkggsq0ac522yagj86ml3vf7yqppj"; depends=[]; }; growthrate = derive2 { name="growthrate"; version="1.3"; sha256="1ak3yqlm7dnkdjlmikwa57qnf7yd9n1ixz36gv3shr252750x9cd"; depends=[clime Matrix mvtnorm]; }; growthrates = derive2 { name="growthrates"; version="0.8.1"; sha256="1ivids4qfyhi3k5l6mvi6bhajnbxhiqmm4qdcmmfrmzs8c59cvvm"; depends=[deSolve FME lattice]; }; - grpSLOPE = derive2 { name="grpSLOPE"; version="0.2.1"; sha256="1r9irf83f7szhkdqis2rakil8fsr3rqsfrj4dmbg3r3rnr8wl8nh"; depends=[SLOPE]; }; + grpSLOPE = derive2 { name="grpSLOPE"; version="0.3.0"; sha256="0v20v3rdjmz517rl86nkrsaa1dl2p49kdkgk7ynv92p2ib37wwga"; depends=[Rcpp]; }; 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.2"; sha256="12432rdyv6b837n3b6kwjrqsmx7bs6qdmyz02x4l956pwmp5g7z5"; depends=[Matrix]; }; @@ -8675,7 +8693,7 @@ in with self; { gscaLCA = derive2 { name="gscaLCA"; version="0.0.2"; sha256="0s6rnyd632xq04pnyq1j3571qv7j5bzxir2nhk5jk9i8myf9fc9k"; depends=[devtools doSNOW fastDummies fclust foreach ggplot2 gridExtra MASS progress psych stringr]; }; gscounts = derive2 { name="gscounts"; version="0.1-3"; sha256="1xcsvnam858l9am30mmqb6m0vcflijhli22ix8g56rcvfsh208q1"; depends=[Rcpp]; }; gset = derive2 { name="gset"; version="1.1.0"; sha256="1gingqw6la8n7mnl47wpz9sicxca4zi2m8p35n6cnihrniibhajc"; depends=[Hmisc MCMCpack mvtnorm]; }; - gsheet = derive2 { name="gsheet"; version="0.4.2"; sha256="1mfpg91855qg0bi6wk0wy58b58lm06jw9fqdl6psqdvnmaf7n2w5"; depends=[httr stringr]; }; + gsheet = derive2 { name="gsheet"; version="0.4.5"; sha256="0b8q44cqkjfy6vnffm94czq4ag8xfbxik52026ahq95kcf9v2j91"; depends=[httr stringr]; }; gskat = derive2 { name="gskat"; version="1.0"; sha256="19mbif7wr88vk5wlc7m2l4xghjmfj2qd3s8yvjlkawbnjk8x6ib0"; depends=[CompQuadForm e1071 gee geepack Matrix]; }; gsl = derive2 { name="gsl"; version="2.1-6"; sha256="0p4rh7npp6qbfc5sxjq86xjn7c9ivf3pd60qf1hldwckjqin7m7m"; depends=[]; }; gsloid = derive2 { name="gsloid"; version="0.1.0"; sha256="1ma5si86ynfsis0pnw8hyv6xc4frbkhy5ks03mr0z16gasffkycg"; depends=[]; }; @@ -8693,13 +8711,13 @@ in with self; { gtable = derive2 { name="gtable"; version="0.3.0"; sha256="1lyncxf2dqdjgw1071cn9c8zwzkz6sldnd5cgmicf70bc726qf7x"; depends=[]; }; gtcorr = derive2 { name="gtcorr"; version="0.2-1"; sha256="1n56zmyv58jwr95p453jb86j82pdnq57gfc8m15jndjc9p31zl0m"; depends=[]; }; gte = derive2 { name="gte"; version="1.2-2"; sha256="1x528iakyjhh4j92cgm6fr49a3rdi4cqy28qhsfr2dwvxzxchl6h"; depends=[survival]; }; - gtfs2gps = derive2 { name="gtfs2gps"; version="1.0-7"; sha256="1g0aswyp10d77agz62h2wa6s83bh255dv3ygbp1cplpa1r6szsp8"; depends=[data_table furrr future lwgeom magrittr pbapply Rcpp sf sfheaders units]; }; + gtfs2gps = derive2 { name="gtfs2gps"; version="1.1-0"; sha256="13y8nry300g0c98asmxpqbaz7vxwlqqfd9d12290i0fmnzl3kn2z"; depends=[data_table furrr future lwgeom magrittr pbapply raster Rcpp rgdal sf sfheaders sp units]; }; 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.2"; sha256="1pnwy412wvhhvnnx8qg6s9hrgcnsfhnfcpf2560ipipk845acfsh"; depends=[]; }; gtop = derive2 { name="gtop"; version="0.2.0"; sha256="1nvvbf181x0miw3q0r2g0nklz29ljdsd07cazaajfls7pmhi0xw9"; depends=[hts lassoshooting quadprog]; }; gtrendsR = derive2 { name="gtrendsR"; version="1.4.4"; sha256="0b05m5jbgbhdjmwp89zaa276z1h2qib2h30msg69lhwbdcsva96q"; depends=[anytime curl ggplot2 jsonlite]; }; - gtsummary = derive2 { name="gtsummary"; version="1.2.6"; sha256="12ah610w1ry69rwlxdj3qq1hhcgsgmqq1wbh6bd6w48s389929y1"; depends=[broom broom_mixed crayon dplyr forcats glue knitr lifecycle magrittr purrr rlang stringr survival tibble tidyr tidyselect usethis]; }; + gtsummary = derive2 { name="gtsummary"; version="1.3.0"; sha256="0gwxpzvzdz0c7akidfgjbm44j4qx5yhh9009fl7qf2547380fsd7"; depends=[broom broom_mixed crayon dplyr forcats glue gt knitr lifecycle magrittr purrr rlang stringr survival tibble tidyr tidyselect usethis]; }; guardianapi = derive2 { name="guardianapi"; version="0.1.1"; sha256="17xmmr6pfzhdnmf45jzvk84gbfnmlw1qfv1gqjaw85vgm8b6jn6l"; depends=[dplyr httr jsonlite rlang tibble]; }; guess = derive2 { name="guess"; version="0.1"; sha256="198pxi0yipgm9wccpj3y4a0gkibhyxcmb7v5dz7ipzrk44ha5g6j"; depends=[Rsolnp]; }; guf = derive2 { name="guf"; version="1.0.2"; sha256="1dfmja2da211pcid4hr7x9q0sgz37756rpykm1ax862avdl8hsmc"; depends=[]; }; @@ -8708,7 +8726,7 @@ in with self; { gunsales = derive2 { name="gunsales"; version="0.1.2"; sha256="02vz16lhym72vvf48yai1g371wygdlmi63a6ylc147l0b69jgw31"; depends=[data_table dplyr ggplot2 seasonal x13binary zoo]; }; gustave = derive2 { name="gustave"; version="0.4.1"; sha256="1sdfx3zmnamdwgnyvs3rn38wmwiyww1a620jyfc984b9r2zqvd1w"; depends=[Matrix]; }; gutenbergr = derive2 { name="gutenbergr"; version="0.1.5"; sha256="1c6n2vj38srqmlcl0d2yp749rhn9n5mmz31x98fij4x55km53sci"; depends=[dplyr lazyeval purrr readr stringr urltools]; }; - gvc = derive2 { name="gvc"; version="0.5.2"; sha256="0cfvli6ap5kw3agv94d7g7rhmlxd66yyngc7c9pl4fsxf7sm6nx4"; depends=[decompr diagonals]; }; + gvc = derive2 { name="gvc"; version="5.2.0"; sha256="15z4r8xkz0alabh3z278hylz042f2r5cqdllc5n3hfx5q3ch19xx"; depends=[decompr diagonals]; }; gvcR = derive2 { name="gvcR"; version="0.1.0"; sha256="0r54924b9a65k11p8y3p7jxbvmpb7s7vs87v65hhl98gxacj5hk8"; depends=[dplyr eda4treeR lme4 magrittr]; }; gvcm_cat = derive2 { name="gvcm.cat"; version="1.9"; sha256="1kwfcmnl1ivv1lh3zxccwls2xfyx3l8v71ngc0bg6441i81d4xp5"; depends=[MASS Matrix mgcv]; }; gvlma = derive2 { name="gvlma"; version="1.0.0.3"; sha256="16dhd407bwjs91c3p9kk43646197s7n9vbyghxb4ckrpv3fsaxp0"; depends=[]; }; @@ -8720,7 +8738,7 @@ in with self; { gwrr = derive2 { name="gwrr"; version="0.2-1"; sha256="1fjk217pimnmxsimqp9sn02nr1mwy3hw3vsr95skbfsd6vdda14d"; depends=[fields lars]; }; gwsem = derive2 { name="gwsem"; version="0.1.17"; sha256="1f2hym3md1agq2ml7f2v1dkb308iy1rl68c12f7n3ycsw0ql70ix"; depends=[BH data_table lifecycle OpenMx qqman Rcpp]; }; gym = derive2 { name="gym"; version="0.1.0"; sha256="0vcwzgawqwjsf65hr1mbjkz3px8zsibfkn42jpsg39n13jpfjq8v"; depends=[httr jsonlite]; }; - h2o = derive2 { name="h2o"; version="3.28.0.4"; sha256="1nsbw4fbwizj30y0qvw8ln078ayaisl4zydjx9917hlsbc8wc3aq"; depends=[jsonlite RCurl]; }; + h2o = derive2 { name="h2o"; version="3.30.0.1"; sha256="1xdhd0h0hncg7s5nsrb97arqiyd9r3cxv1in36lx7pyplxcfy4fb"; depends=[jsonlite RCurl]; }; h2o4gpu = derive2 { name="h2o4gpu"; version="0.2.0"; sha256="06d2rrr27xvnsai6zjiaiw0jjfzdza1cc39c03d6pjkvnh0mqh2c"; depends=[magrittr reticulate]; }; hBayesDM = derive2 { name="hBayesDM"; version="1.0.2"; sha256="04p4d0hy2l6bmxyh2k5q0g19b7fbpsl9frmcvrf5rxkaasxyxwn6"; depends=[BH data_table ggplot2 loo Rcpp RcppEigen rstan StanHeaders]; }; hIRT = derive2 { name="hIRT"; version="0.3.0"; sha256="0s0i6p9iv0yv0l15dnwkpcmc91751jyjs1y1nz671lz6jpb8rz5c"; depends=[ltm Matrix pryr rms]; }; @@ -8801,7 +8819,7 @@ in with self; { heavy = derive2 { name="heavy"; version="0.38.196"; sha256="05k788ynw9fhhmjydzp8dbk1vhl44j2rz2shqwn02i40jmwdvwrk"; depends=[]; }; heddlr = derive2 { name="heddlr"; version="0.6.0"; sha256="0ixmcgvfbq4hi3wv1fyzpwacmxmixsw5yq6mq5xygk6ji03m1v23"; depends=[rlang utf8 yaml]; }; hedgehog = derive2 { name="hedgehog"; version="0.1"; sha256="1mvjnm2zlc4pvw9vnhxr0dj1g1sfqvlrnnhcipzfbvr147yan9l5"; depends=[rlang testthat]; }; - heemod = derive2 { name="heemod"; version="0.11.0"; sha256="0zzjq4cmyr25p4x91jw542jiqmds6qikbp8gyix34dcmk765drnk"; depends=[dplyr ggplot2 lazyeval memoise mvnfast plyr pryr rlang tibble]; }; + heemod = derive2 { name="heemod"; version="0.12.0"; sha256="14fa2bcmzxymnis6kj46phbcbxz2a9i9p8cqpq6s6c6hzj5g9fw6"; depends=[dplyr ggplot2 lazyeval memoise mvnfast plyr pryr purrr rlang tibble]; }; heims = derive2 { name="heims"; version="0.4.0"; sha256="0vnq31jwn09grni4gdhf1hzd87b62as4f65b2qw7ky6mi38ahr5d"; depends=[bit64 data_table fastmatch hutils lubridate magrittr]; }; helda = derive2 { name="helda"; version="1.0.1"; sha256="1qfnqa94csq7c67prpmyvnkkzbylv4cq4zsmici9c19s9yw4kf76"; depends=[dplyr ggplot2 rlang sqldf stringr]; }; helixvis = derive2 { name="helixvis"; version="1.0.1"; sha256="113rnpnrcnw18ks78fgq79zdrw3kmpzpimlc45gvj0za2fbyci3p"; depends=[ggforce ggplot2 rlang]; }; @@ -8811,7 +8829,7 @@ 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]; }; - hereR = derive2 { name="hereR"; version="0.3.2"; sha256="1kjz4g616i572n0kanwg1hbc5x9kmhwijpbm4jmyspvj4b2hlsxi"; depends=[curl data_table jsonlite lwgeom sf stringr]; }; + hereR = derive2 { name="hereR"; version="0.3.3"; sha256="0z8w50cjz2zivdlbxipn8av055ssgrv9077v4413xkjgv4c000f1"; depends=[curl data_table jsonlite lwgeom sf stringr]; }; heritability = derive2 { name="heritability"; version="1.3"; sha256="0a0pw8hppkgypl4jaa38hks9nxfwz2zbsd4w6w40j1hxlyy4km8m"; depends=[MASS]; }; hermite = derive2 { name="hermite"; version="1.1.2"; sha256="0j9s7ayvbvmgwybrvf703b72qbn8gskb105pis19ig2sslllzda3"; depends=[maxLik]; }; hero = derive2 { name="hero"; version="0.4.7"; sha256="129v2pjbxm5aalr5lfx0kh20rhwksnb80pc459pxg0xkwxvy1l3d"; depends=[fields Matrix optimx pbapply rgeos sp]; }; @@ -8849,9 +8867,9 @@ in with self; { highSCREEN = derive2 { name="highSCREEN"; version="0.3"; sha256="179l82n7l7dfn40k6zgigw56ggwqyi34gllc2wvcw3yvfnd3l7s4"; depends=[gplots]; }; highTtest = derive2 { name="highTtest"; version="1.1"; sha256="18hgxlr0y8y1d4ldqmfcg4536lhyn5p6w88sq1vj74qr5wzydga1"; depends=[]; }; highcharter = derive2 { name="highcharter"; version="0.7.0"; sha256="0qfv25dqr7l54jq3vrnwphsj7wzk0an3vfx1zik36wi05yf2w8br"; depends=[assertthat broom crosstalk dplyr htmltools htmlwidgets igraph jsonlite lubridate magrittr purrr quantmod rlang rlist stringr tibble tidyr whisker xts yaml zoo]; }; - highfrequency = derive2 { name="highfrequency"; version="0.6.4"; sha256="0ikxrjzssqcv6r96d86apiwsizcycj49jlzv4i0kxwfyxvvchkvq"; depends=[cubature data_table lubridate mvtnorm Rcpp RcppArmadillo RcppRoll readr robustbase xts zoo]; }; + highfrequency = derive2 { name="highfrequency"; version="0.6.5"; sha256="1j7wn75xql6pw7inmvh9729l320wd3ss68jhz7y8cp4c60w2mkww"; depends=[cubature data_table lubridate mvtnorm Rcpp RcppArmadillo RcppRoll readr robustbase xts zoo]; }; highlight = derive2 { name="highlight"; version="0.5.0"; sha256="1shar4y07wyixg0ichdrn2xhgwkl3mv2pxkalqzisc69w605b3hf"; depends=[]; }; - highlightHTML = derive2 { name="highlightHTML"; version="0.2.4"; sha256="0mww4n8g8d3mmmic56wcchg2k09fhf1i4ndjk6q4ic7mvxbcpcc8"; depends=[]; }; + highlightHTML = derive2 { name="highlightHTML"; version="0.2.5"; sha256="0j3zrvil7k5wfsbgfj2b4nbx77qsj3b4makv5angcf8s59p7q80r"; depends=[]; }; highmean = derive2 { name="highmean"; version="3.0"; sha256="1lq7z0l1737j4wvsy7951405afylyywp7vf2i7girzh459fdfzpc"; depends=[MASS mnormt mvtnorm]; }; 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]; }; @@ -8881,6 +8899,7 @@ in with self; { hmi = derive2 { name="hmi"; version="0.9.17"; sha256="08cppa061xn13lyp7d9jsybn0cc6k2ffml79m5bp7fk11gzq18mb"; depends=[boot coda linLIR lme4 MASS Matrix MCMCglmm mice msm mvtnorm nlme nnet ordinal pbivnorm rlang tmvtnorm VGAM]; }; hmlasso = derive2 { name="hmlasso"; version="0.0.1"; sha256="0ydcyz9pw30ji8ghrvkgcbmp27d661vajl97b8cwis52605a3gfx"; depends=[BH MASS Matrix Rcpp RSpectra]; }; hmm_discnp = derive2 { name="hmm.discnp"; version="2.1-12"; sha256="1jxbwqh0cc0f07qza0kjbhh3zy7xlk5q7gb8078kprg37if1qd2p"; depends=[nnet]; }; + hmma = derive2 { name="hmma"; version="1.0.0"; sha256="1gpdq1pka9j0yvci791g74kgrvbz9x9gnw7irf0048msis0lqcv4"; depends=[bnlearn graph MCMCpack mhsmm Rgraphviz]; }; hmmm = derive2 { name="hmmm"; version="1.0-4"; sha256="1sbr85lcmcw3lv0ygqwfbarr91dp3br1xnlygy49145cvl93nfci"; depends=[MASS mvtnorm nleqslv quadprog]; }; hms = derive2 { name="hms"; version="0.5.3"; sha256="1baki0qw5ijgiflvsdvqj3apg4yanf12vx14kwbqdzk5rz46fasf"; depends=[pkgconfig rlang vctrs]; }; hmstimer = derive2 { name="hmstimer"; version="0.0.2"; sha256="0qv2pls6mplnv3mylbiwh83gnvq2qkdpnnjnxnhrgmwia9fapixs"; depends=[]; }; @@ -8914,10 +8933,10 @@ in with self; { hpoPlot = derive2 { name="hpoPlot"; version="2.4"; sha256="176bf93gjwbi2z7nz81w4aycwax6f7jxvs3236zrmf0f0f4m7bkc"; depends=[functional magrittr Rgraphviz]; }; hqmisc = derive2 { name="hqmisc"; version="0.1-1"; sha256="0jcy2hb3dmzf9j4n92aq7247mx9w7n30wpsx0dkchqnjwlqwwncw"; depends=[]; }; hqreg = derive2 { name="hqreg"; version="1.4"; sha256="1j6zp3rmpjx409vm7kq159mlawg87wsq0ypdkan34yxxv9py2jmi"; depends=[]; }; - hrIPW = derive2 { name="hrIPW"; version="0.1.2"; sha256="0bgcz4v9cj3aajcp25bv4g7magj54n86qy5nmgr6kqm8sspy260x"; depends=[survival]; }; + hrIPW = derive2 { name="hrIPW"; version="0.1.3"; sha256="1ns0mxkcfs2jva4wsbqkybgasgyxvxlcfxayky6lrfhic8jxvmg4"; depends=[survival]; }; hrbrthemes = derive2 { name="hrbrthemes"; version="0.8.0"; sha256="057h60b5p53dcyjyfwlgjc1ry968s9s64dw78p443w8717zk7zpc"; depends=[extrafont gdtools ggplot2 htmltools knitr magrittr rmarkdown scales]; }; hrcomprisk = derive2 { name="hrcomprisk"; version="0.1.1"; sha256="0w0ij2yqgg6gkn3pdaism1xqw3dfnm670j2pmsd85qk1ybxzq9l5"; depends=[survival]; }; - hscovar = derive2 { name="hscovar"; version="0.1.2"; sha256="1w6iz6z7zbk4wh5bjf6qhalngm30c7kdc1qkyjmnc1ajvzk1r992"; depends=[foreach Matrix rlist]; }; + hscovar = derive2 { name="hscovar"; version="0.2.1"; sha256="0cy3x96dmw6cbsrnl3h1npzhxqy8bqy2437kz06qi7d5hmi4q721"; depends=[foreach Matrix pwr rlist]; }; hsdar = derive2 { name="hsdar"; version="1.0.1"; sha256="1apcch51hagrbm7x3s7wl78bm2mpyxg4py7syz37b58r9dph1905"; depends=[caret raster rgdal signal]; }; hsicCCA = derive2 { name="hsicCCA"; version="1.0"; sha256="1d4lkjrihwhl3jrsj7250ccd90nfwpllyavc3mp15fhcy2jnjci8"; depends=[]; }; hsm = derive2 { name="hsm"; version="0.2.0"; sha256="066shjikqrrkxpnra4zknax1a0sk5nx9ms1br58vwqqvqq479rym"; depends=[]; }; @@ -8937,7 +8956,7 @@ in with self; { httk = derive2 { name="httk"; version="2.0.1"; sha256="02msk6nb3sscww7pa68finfvpmrf8z4jsw08672q4qz50sjccjlp"; depends=[data_table deSolve magrittr msm mvtnorm purrr survey truncnorm]; }; httpRequest = derive2 { name="httpRequest"; version="0.0.10"; sha256="0f6mksy38p9nklsr44ki7a79df1f28jwn2jfyb6f9kbjzh98746j"; depends=[]; }; httpcache = derive2 { name="httpcache"; version="1.1.0"; sha256="11hdc1jj2jbgvsps1h55azq0cr2fl556k631ns9k0747sjfmy2k9"; depends=[digest httr]; }; - httpcode = derive2 { name="httpcode"; version="0.2.0"; sha256="06k853ihwzkcx4z3jzazpb03p91frqkwz18jy4fwr8j2nwyqbhgv"; depends=[]; }; + httpcode = derive2 { name="httpcode"; version="0.3.0"; sha256="0xig0rvc81hg7mw0iq9s0an1nw24fg0kfs2p2n6dzhwl9w506fjr"; depends=[]; }; httping = derive2 { name="httping"; version="0.2.0"; sha256="0hdcf51yak8yagy4xj9cyck934lgmvpkd08jvlql33ir5mqvvv3i"; depends=[httpcode httr jsonlite magrittr pryr]; }; httptest = derive2 { name="httptest"; version="3.3.0"; sha256="1xcq0siyjb17yggaycxgp3byi276vwfa71450zbbzcb8617wsapd"; depends=[curl digest httr jsonlite testthat]; }; httpuv = derive2 { name="httpuv"; version="1.5.2"; sha256="13ax0hs2lc39ilznh1zarwqdzahcbhb8adilrfik3xg0fkljpcwk"; depends=[BH later promises R6 Rcpp]; }; @@ -8956,11 +8975,12 @@ in with self; { hutilscpp = derive2 { name="hutilscpp"; version="0.3.0"; sha256="1x7h1fq6qyylda8k3a1v6s0cx7pf169k86akb6ccwgiikqqsp51h"; depends=[data_table hutils Rcpp]; }; huxtable = derive2 { name="huxtable"; version="4.7.1"; sha256="0nkx6kpvh4z0fby7cv9bvripkqdha4f4c893h53a543q0ap06pjh"; depends=[assertthat generics glue memoise rlang stringr tibble tidyselect]; }; hwde = derive2 { name="hwde"; version="0.67"; sha256="0wb2f9i5qi7w77ygh8bvydfpr7j5x8dyvnnhdkajaz0wdcpkyaqy"; depends=[]; }; + hwig = derive2 { name="hwig"; version="0.0.1"; sha256="0i9is1izwi82gcrngi1k6q6aq548rqpccvs3mp74jinqsw51czcf"; depends=[asnipe data_table spatsoc]; }; hwordcloud = derive2 { name="hwordcloud"; version="0.1.0"; sha256="0civbwv276lcwvfs4qzz14r8rk14kg1ml4zzhi3msnkkh29v70y2"; depends=[colourpicker htmlwidgets shiny wordcloud2]; }; hwriter = derive2 { name="hwriter"; version="1.3.2"; sha256="0arjsz854rfkfqhgvpqbm9lfni97dcjs66isdsfvwfd2wz932dbb"; depends=[]; }; 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]; }; - hybridModels = derive2 { name="hybridModels"; version="0.3.5"; sha256="0bg065j3y3xwxlib9i78pa0ghlblyp4qq1kmh3j02w8xi00rnrs6"; depends=[doParallel foreach ggplot2 GillespieSSA reshape2 stringr]; }; + hybridModels = derive2 { name="hybridModels"; version="0.3.6"; sha256="15405qz4fnvid7ka1l694hcc7s6yv39ff62rsdl7jhzq468qkikj"; depends=[doParallel doRNG 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.4-0"; sha256="0fw8b66k7gdkdjxgmdpp3lk9d8p0wmlvhq2rkcvajjb5wd09f43a"; depends=[hydroTSM xts zoo]; }; @@ -8990,11 +9010,11 @@ in with self; { iAdapt = derive2 { name="iAdapt"; version="0.1.0"; sha256="0ykcvqm1aswc4iypapml22194nxi6mxvxipy6wj7l9g4cazfa8j8"; depends=[shiny shinydashboard]; }; iBATCGH = derive2 { name="iBATCGH"; version="1.3"; sha256="0pnkkabzi57czcwd9i15nwv8ggwvyxmvn1wam7yrrrbvmi17lmrm"; depends=[msm Rcpp RcppArmadillo]; }; iBST = derive2 { name="iBST"; version="1.0"; sha256="02p7lcr1wrf21v4568jc8hmjcijy3fnbv77s8nlhv2s4p0pgzh5x"; depends=[Rcpp rpart survival]; }; - iBreakDown = derive2 { name="iBreakDown"; version="1.0"; sha256="1pqw2hgxg96x3v9y7wf8m8n1czhlhyxcwpavj4vl0s95d1dzzpcj"; depends=[DALEX ggplot2]; }; + iBreakDown = derive2 { name="iBreakDown"; version="1.2.0"; sha256="0y4zjpyn8j76jrs5phjzs5lfq3lqjspmrwcksqv9wq0rbdgh14vk"; depends=[ggplot2]; }; iC10 = derive2 { name="iC10"; version="1.5"; sha256="1xq6xv582wxdb0nc2nia3q38155gx8z26idiqyx7h1rjb20hhwdl"; depends=[iC10TrainingData impute pamr]; }; iC10TrainingData = derive2 { name="iC10TrainingData"; version="1.3.1"; sha256="175ymib3h359296hk36psryksisipx63ybvacz8hys21irzx58j1"; depends=[]; }; iCARH = derive2 { name="iCARH"; version="2.0.1.1"; sha256="0722dfydq16vhdk7hrdwngkppq0g20ghak614jfnrfr6rnrn630s"; depends=[abind ggplot2 igraph KEGGgraph MASS Matrix mc2d RCurl reshape2 rstan]; }; - iCellR = derive2 { name="iCellR"; version="1.4.0"; sha256="1hrn6afhl4ggpz145l0wxnjy6jpfqjc09w0g0lws31l1hpzakrhs"; depends=[ape ggdendro ggplot2 ggpubr ggrepel gridExtra hdf5r Hmisc htmlwidgets knitr Matrix NbClust pheatmap plotly plyr progress RColorBrewer reshape Rtsne scatterplot3d shiny uwot]; }; + iCellR = derive2 { name="iCellR"; version="1.4.5"; sha256="1pw2pnpp2q2h8iipilbaw6mdm7dkgrw5p7ya1zap04m005jzvap0"; depends=[ape ggdendro ggplot2 ggpubr ggrepel gridExtra hdf5r Hmisc htmlwidgets igraph knitr Matrix NbClust pheatmap plotly plyr progress RColorBrewer reshape Rtsne scatterplot3d shiny uwot]; }; iCiteR = derive2 { name="iCiteR"; version="0.2.1"; sha256="0hbps2q5i7yj6zvqawlayhqqr5iv39yqc0xnk7fvra7rimzc1qid"; depends=[httr]; }; iClick = derive2 { name="iClick"; version="1.5"; sha256="0yq0r9nz1mf9ci6l30ylqxbgl8mf1ahyqzr7m6nks0ygxabipdnd"; depends=[boot car coefplot fBasics forecast lattice lmtest lubridate openair papeR rugarch sandwich timeDate timeSeries xts zoo]; }; iCluster = derive2 { name="iCluster"; version="2.1.0"; sha256="09j36xv87d382m5ijkhmp2mxaajc4k97cf9k1hb11ksk7fxdqz6r"; depends=[caTools gdata gplots gtools lattice]; }; @@ -9021,7 +9041,7 @@ in with self; { iZID = derive2 { name="iZID"; version="0.0.1"; sha256="1jaqdh6i5xyfw4y2wd9qivzjklf4j2xxnya8ssn7rv5bz6misgcz"; depends=[doParallel extraDistr foreach rootSolve]; }; iadf = derive2 { name="iadf"; version="0.1.1"; sha256="0ys8rd05s0j6cs7snmp1car7lp7k4awvs8gnlqaw9zcd7w7k9r06"; depends=[dplR dplyr manipulate rlang tibble tidyr tidyselect]; }; iai = derive2 { name="iai"; version="1.2.0"; sha256="0v1xsnhx73ldpsbnki5g0q86dih1pcgb1f10mmq7dn47s2mm6zxg"; depends=[JuliaCall rlang stringr]; }; - iarm = derive2 { name="iarm"; version="0.3.0"; sha256="0v5zb2pgzqb9brmq0calmghq20i8w3wx147781v4f6ll0abkhvxx"; depends=[eRm PP psychotools vcdExtra]; }; + iarm = derive2 { name="iarm"; version="0.4.1"; sha256="1z0k970sk8qliknfsz88yij1aigf0dxk43h92iwg17xi64hvjs11"; depends=[eRm ggplot2 gridExtra Hmisc PP psychotools vcdExtra]; }; ibd = derive2 { name="ibd"; version="1.5"; sha256="0rxvy4hn4fpbv6y214ggkmgfvzwns5mkanp4h8201rjk3v84mk2r"; depends=[car emmeans lpSolve multcomp]; }; ibdreg = derive2 { name="ibdreg"; version="0.2.5"; sha256="1kaa5q1byi30wzr0mw4w2cv1ssxprzcwf91wrpqwkgcsdy7dkh2g"; depends=[]; }; ibeemd = derive2 { name="ibeemd"; version="1.0.1"; sha256="115z13q02gzixziknix2l53mi12zzg30ra9h35pv6qzrr11ra1ic"; depends=[deldir fields rgeos sp spdep]; }; @@ -9037,11 +9057,9 @@ in with self; { icRSF = derive2 { name="icRSF"; version="1.2"; sha256="1a7046lspk70cvrvzwzhnqcmc3cqa5a9bmzlw012jvcn39m2ca3l"; depends=[icensmis Rcpp]; }; ica = derive2 { name="ica"; version="1.0-2"; sha256="0ya1nph1zwhad0bfz4yxs27kl45yk1dhnphdlrq34p8pqrpmj8g7"; depends=[]; }; ical = derive2 { name="ical"; version="0.1.6"; sha256="1raanaagas1c8w66d8s045z5ip1i97xca4233d55jk6cazv0mb1w"; depends=[V8]; }; - icamix = derive2 { name="icamix"; version="1.0.6"; sha256="0jys9r7wjxlwsq5rssih2lvsar1192w8vigdhhrcmf3d5z5ic1kp"; depends=[Rcpp RcppArmadillo]; }; icapca = derive2 { name="icapca"; version="1.1"; sha256="131gdrk8vsbac0krmsryvsp21bn9hzxqxq847zn16cxjf6y5i3xb"; depends=[]; }; icarus = derive2 { name="icarus"; version="0.3.1"; sha256="0ipbhzvwdn1cnzgdw33cwv901768srxfi588bimjx2ssl80mqn3a"; depends=[]; }; iccbeta = derive2 { name="iccbeta"; version="1.2.0"; sha256="03ms1c8qpbgxabj3hh4n0gwcazw6cd0cvixck5rz8fkvj04xzjak"; depends=[lme4 Rcpp RcppArmadillo]; }; - icd = derive2 { name="icd"; version="4.0.6"; sha256="0zi56c6x2jy1yihrar6whhyb5csyhzwdxw0nr8c05xm28w1j6xwb"; depends=[rappdirs Rcpp RcppEigen]; }; icd_data = derive2 { name="icd.data"; version="1.0"; sha256="0cynr9327wfg88661w4hali48mb6ghyvlqgybsa38k9bbf57v8aa"; depends=[]; }; icdGLM = derive2 { name="icdGLM"; version="1.0.0"; sha256="1mh9kwn21n19v4lrmj33ghpna7dl66fx19gi6lcjanmrpzrkwdnz"; depends=[Matrix]; }; icemelt = derive2 { name="icemelt"; version="1.0"; sha256="13pjbyh2ggns36m8s43m2cb0kvisjlfxq75gqscldp75zjli2wi8"; depends=[survival]; }; @@ -9051,7 +9069,7 @@ in with self; { 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="3.3-3"; sha256="1jah3f7hicw66rwa0jfpr489c81im3h4cjihmdmk4fgq2kjnrdyb"; depends=[bibtex lattice]; }; + icesTAF = derive2 { name="icesTAF"; version="3.4-0"; sha256="1gsqcwz547g04x7ixrf7yiy0xf9p61fw2j7dqyj3y4wmfwll9wgz"; depends=[bibtex lattice]; }; 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.10.0"; sha256="1vd1qn1070rml7mygj9k13b96zrc77bw90g8f44s7wmhabn6214q"; depends=[igraph Rcpp sp]; }; @@ -9063,6 +9081,7 @@ in with self; { idbg = derive2 { name="idbg"; version="1.0"; sha256="1rxmj04hswxybrg7dfib3mjy8v8mdiv13zwbscp2q55z55hhf1m5"; depends=[]; }; idbr = derive2 { name="idbr"; version="0.3"; sha256="02syk7fmif0xnddl8189vnl329r8mwl3iwv2rsf6cw7mwg30fhyw"; depends=[countrycode dplyr httr jsonlite]; }; ideamdb = derive2 { name="ideamdb"; version="0.0.9"; sha256="1f4dcv6c8ny7pik547f4840vhll26mzfcijnfsiqx31xhn0gsizd"; depends=[dplyr ggplot2 stringr tidyr]; }; + idefix = derive2 { name="idefix"; version="0.4.3"; sha256="1kpan1499n9paibrr5gc0n5s05ls64fx8raiwckc7hfzsnh1fb26"; depends=[dplyr MASS mlogit Rcpp RcppArmadillo Rdpack scales shiny tmvtnorm]; }; idem = derive2 { name="idem"; version="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=[]; }; @@ -9075,7 +9094,6 @@ in with self; { idr = derive2 { name="idr"; version="1.2"; sha256="05nvgw1xdg670bsjjrxkgd1mrdkciccpw4krn0zcgdf2r21dzgwb"; depends=[]; }; ids = derive2 { name="ids"; version="1.0.1"; sha256="1s6ga94gds5ydr9f8qbjfgfpg2dvbnkcrlybqlb33hk3c0c2l8dn"; depends=[openssl uuid]; }; idx2r = derive2 { name="idx2r"; version="1.0.0"; sha256="14d3rasnf8mghwzpg6h4larybgy7drrv0jh71x28qwry49acsqyh"; depends=[]; }; - ie2misc = derive2 { name="ie2misc"; version="0.8.5"; sha256="1i59836a3kjsra5ibk66ic35yqk28p3biylall8gngjssiig92c1"; depends=[data_table gWidgets2 gWidgets2tcltk lubridate openxlsx qdap reader readxl stringi]; }; ieeeround = derive2 { name="ieeeround"; version="0.2-0"; sha256="0xaxrlalyn8w0w4fva8fd86306nvw3iyz44r0hvay3gsrmgn3fjh"; depends=[]; }; iemisc = derive2 { name="iemisc"; version="0.9.8"; sha256="0xpgafv1zl3gxs3jydqni5icdz74n7f0bgbdvw8gykrr1a6rarln"; depends=[CHNOSZ data_table fpCompare gsubfn IAPWS95 iemiscdata pracma r_import rgdal sp stringi testit units zoo]; }; iemiscdata = derive2 { name="iemiscdata"; version="0.6.1"; sha256="0a9x90kisgmrka0frk9myb1qdq3nl092n78wrif31b42arifa8h9"; depends=[]; }; @@ -9104,7 +9122,7 @@ in with self; { imagerExtra = derive2 { name="imagerExtra"; version="1.3.2"; sha256="1f6mxfn7am4ph9acbbx53r4bk4vsm73p7arh8rvrsic9pgma3gqf"; depends=[fftwtools imager magrittr Rcpp]; }; imageviewer = derive2 { name="imageviewer"; version="0.1.0"; sha256="1rsrwy5v0gnsmbay1zqijhvll2l1bs844m52w65588j9nlx4fci9"; depends=[htmlwidgets]; }; imagine = derive2 { name="imagine"; version="1.5.3"; sha256="1ss0gm769s8cmma3hnah15vmc2c5wxn0l3s4vas7jbvkwi62am6h"; depends=[Rcpp]; }; - imbalance = derive2 { name="imbalance"; version="1.0.2"; sha256="1vkzxm8wb9g1mibnlp63gnky2gcgai5j09v63zki3jpxwxwli4nx"; depends=[bnlearn C50 FNN ggplot2 KernelKnn mvtnorm Rcpp RcppArmadillo smotefamily]; }; + imbalance = derive2 { name="imbalance"; version="1.0.2.1"; sha256="14f7p3x8818b1asfynp3w4sxdacsd14dzs7r166s1jdadwwfwi1s"; 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.7"; sha256="1ch05d37gp0niml80k2apab1942aa05r77s52vgh2pfcx9kklv20"; depends=[dplyr httr jsonlite]; }; imgpalr = derive2 { name="imgpalr"; version="0.3.0"; sha256="1kb1ggrlkrh086nwq47sf2y20r7ydk4ww2j3gq0s4iz00aa34pxg"; depends=[downloader dplyr farver jpeg magrittr tibble]; }; @@ -9113,10 +9131,11 @@ in with self; { iml = derive2 { name="iml"; version="0.10.0"; sha256="0xm3q42qahq798ilgg050df0mahhbdfd3fx3i7cpx606h38si0x7"; depends=[checkmate data_table Formula future future_apply ggplot2 gridExtra Metrics prediction R6]; }; immer = derive2 { name="immer"; version="1.1-35"; sha256="1nmf9wxxyq3p8b5kikpsr8b0v4s84zjpahg1rxvcrhc8blg26hjq"; depends=[CDM coda MASS psychotools Rcpp RcppArmadillo sirt TAM]; }; immuneSIM = derive2 { name="immuneSIM"; version="0.8.7"; sha256="0brj12xnkzmn3n91vb39fq3q68wmzmwx9l38dl38yypp0l8pknjl"; depends=[Biostrings data_table ggplot2 ggthemes igraph Metrics plyr poweRlaw RColorBrewer repmis reshape2 stringdist stringr]; }; + imp4p = derive2 { name="imp4p"; version="0.9"; sha256="1z8q3h8smlnn3i7b0hpc360607ingqz4hblm93bmljri2k1amcvw"; depends=[Iso missForest missMDA norm Rcpp truncnorm]; }; impactflu = derive2 { name="impactflu"; version="0.1.0"; sha256="0wpaq2q61g6hl9fffs5cjbzdz1qc8dxsbknfs0iarwkn08460bn5"; depends=[dplyr glue lubridate magrittr Rcpp rlang tibble]; }; impimp = derive2 { name="impimp"; version="0.3.1"; sha256="0xkxph4f1rcpkryx9v339bfbsnq3xwdj1flb4j2dgh99apj126sq"; depends=[]; }; implicitMeasures = derive2 { name="implicitMeasures"; version="0.1.2"; sha256="0fss5rws8m53p3a26s2gb8bvg3ddiddnp25qj8jspa8f0iyzj48i"; depends=[ggplot2 stringr tidyr xtable]; }; - implied = derive2 { name="implied"; version="0.2.5"; sha256="0bw45vl19xvprh37rikmhh1dhykpgqy4pbq6l8pgdf7h118mvy2g"; depends=[]; }; + implied = derive2 { name="implied"; version="0.3.0"; sha256="08hjbw6fa9k71pfkbniwzbysnisl93bx3b7ik8dny029agp10nfx"; depends=[]; }; implyr = derive2 { name="implyr"; version="0.3.0"; sha256="1i0m95azyi46wnh59dcs52l78i1yqy677rlr4b6c0r945m67advn"; depends=[assertthat DBI dbplyr dplyr rlang tidyselect]; }; r_import = derive2 { name="r_import"; version="1.1.0"; sha256="0blf9539rbfwcmw8zsb4k58slb4pdnc075v34vmyjw752fznhcji"; depends=[]; }; importar = derive2 { name="importar"; version="0.1.1"; sha256="0xv445fmjhsbdlsq03k2rlycnggn3rcyq5a49zrg4jvjamzr0rgr"; depends=[]; }; @@ -9140,7 +9159,7 @@ in with self; { inbreedR = derive2 { name="inbreedR"; version="0.3.2"; sha256="09fr13ckyn2skiigkn4qdx5g080gcmyyrvzhcp0wrml9wpmy0h4z"; depends=[data_table]; }; incR = derive2 { name="incR"; version="1.1.0"; sha256="0q41bs7pf6hqyfwvcwc2sxq44jq95qq3qsddz53f8gphwjsyf1v7"; depends=[dplyr ggplot2 lubridate maptools rgeos]; }; inca = derive2 { name="inca"; version="0.0.4"; sha256="1r3niibd6pja59am8in9gpyvxi2g5bh8bqqhdixzwaj3xzyyipii"; depends=[Matrix Rcpp RcppArmadillo]; }; - incadata = derive2 { name="incadata"; version="0.8.2"; sha256="1ayr7krqcs25b5zg80m2s4g3pdasfaj2qfdnjp871im5i6bplai5"; depends=[backports decoder dplyr rvest sweidnumbr xml2]; }; + incadata = derive2 { name="incadata"; version="0.9.1"; sha256="0987zazkp3cxvk88i3yqb70s2i1cg108vc8wyhh2867s3rqdrpgh"; depends=[decoder 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.7.1"; sha256="1d76d1pm4g8y0jalc18dcipi1fzwx843gcbrspcbk8nhdkjxlny4"; depends=[aweek ggplot2]; }; inctools = derive2 { name="inctools"; version="1.0.15"; sha256="0ikldiwgizs2p9vcalk5729dr6krysnyr4ni0ybg9gljw7iafdlf"; depends=[binom cubature doParallel dplyr foreach ggplot2 glm2 magrittr plyr pracma rlang tibble tmvtnorm]; }; @@ -9169,7 +9188,7 @@ in with self; { infra = derive2 { name="infra"; version="0.1.2"; sha256="0jycnnmrrjq37lv67xbvh6p63d6l4vbgf3i1z9y7r75d6asspzn1"; depends=[]; }; infraFDTD_assist = derive2 { name="infraFDTD.assist"; version="0.6"; sha256="04j5nl5vxk79iciz6s9bpiyn319c2dbh7fdahgwira2r30w2fxv9"; depends=[fields]; }; infutil = derive2 { name="infutil"; version="1.0"; sha256="02d0hfbkdqjj0lm1fzwwxy60831kbcjn2m4rfblpib0krkbpz72n"; depends=[ltm]; }; - ingredients = derive2 { name="ingredients"; version="1.1"; sha256="0aim57f7b1pfb6cv28m8xlca40d84gickq32mzikqn20ini27xw7"; depends=[DALEX ggplot2 gridExtra scales]; }; + ingredients = derive2 { name="ingredients"; version="1.2.0"; sha256="1q196y9xzn4wk44fa1bvh0hcbizgm93rwir82nyk31k5pgixk967"; depends=[ggplot2 gridExtra scales]; }; ini = derive2 { name="ini"; version="0.3.1"; sha256="04yqij344dwm0xqgara8xia42mlmij3i8711qbb5534w05a1l6bv"; depends=[]; }; injectoR = derive2 { name="injectoR"; version="0.2.4"; sha256="0sa32cspp6y3m04yfmd02kxx55mk7l9jxf4r9pk1a6k3sqnj6fl8"; depends=[]; }; inlabru = derive2 { name="inlabru"; version="2.1.13"; sha256="1khsfhays6xna060f4h0rc7yjsq89xl42d36fy33ixgk0rh9vlnc"; depends=[ggplot2 Matrix rgdal rgeos sp]; }; @@ -9181,13 +9200,13 @@ 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.8.2"; sha256="0fjf7dwpv1a7qfbzixppg348z1ksq19kdjm08vcb2am7w0k3plcj"; depends=[]; }; + insight = derive2 { name="insight"; version="0.8.3"; sha256="0lm5a4r368mq1pwmxjk2xnz25lb9j4v7mdkl1bahk2alklxgb8yj"; depends=[]; }; insol = derive2 { name="insol"; version="1.2.1"; sha256="1d2vqmbp94ff80mfkmq4a8y12r6ryym8hh1568ip9qbn7snc64v1"; depends=[raster]; }; inspectdf = derive2 { name="inspectdf"; version="0.0.7"; sha256="03yli2fiyb3kw189aga9hiyxm9f9b2lhpx1cjv9silfgm0xj54lh"; depends=[dplyr ggfittext ggplot2 magrittr progress Rcpp tibble tidyr]; }; instaR = derive2 { name="instaR"; version="0.2.4"; sha256="0c4m471ragkpksr0h21cdgnjxcknf01xqz543dahxgzjg9ncjwhg"; depends=[httr jsonlite]; }; install_load = derive2 { name="install.load"; version="1.2.1"; sha256="148q0rjal5hfcb8ilxzd1bz38mn8vxqrsfg5x4jy48psk00fk3d9"; depends=[]; }; insuranceData = derive2 { name="insuranceData"; version="1.0"; sha256="0wryh8i1v3bnpbqn6d6dpxr9bwwl6mnh5cb5igz0yanh4m1rx96w"; depends=[]; }; - insurancerating = derive2 { name="insurancerating"; version="0.5.2"; sha256="09zy2gdwqslv5jy46lnqr2w2j45n2ma0i2bgksi378mn21h9m14h"; depends=[classInt data_table dplyr evtree ggplot2 lubridate mgcv patchwork stringr]; }; + insurancerating = derive2 { name="insurancerating"; version="0.6.0"; sha256="16032rjs0xhyg60iwbnwmx7kq86aqhfdrz67cj892zb0iii9y131"; depends=[classInt data_table dplyr evtree ggplot2 lubridate magrittr mgcv patchwork stringr tidyr]; }; intRegGOF = derive2 { name="intRegGOF"; version="0.85-5"; sha256="0xjq8vdlgqlzrvp752gd4qfrpnpapx7k6xzfsvfril8ngvm9a162"; depends=[]; }; intRvals = derive2 { name="intRvals"; version="1.0.0"; sha256="0391raj5wq6issvzqm8bfnv1ap2hh5nfsqi9r1x5ss37fvcq5fjm"; depends=[lme4 plyr]; }; intamap = derive2 { name="intamap"; version="1.4-9"; sha256="060sghkqsdrxpa340rvjskh2wafdkffa5q8nlbg1msnsmk639lkn"; depends=[automap doParallel evd foreach gstat MASS mvtnorm rgdal sp]; }; @@ -9200,11 +9219,12 @@ in with self; { integr = derive2 { name="integr"; version="1.0.0"; sha256="172vj29bdk42ibgwj7dl06wslpg2dccp1i8iscbz1yd0j5kw36sq"; depends=[DiagrammeR DiagrammeRsvg dplyr gtools rsvg]; }; intensity_analysis = derive2 { name="intensity.analysis"; version="0.1.6"; sha256="1ydmn7njqk6i2667zaha8mvfndss4im39czadg1f3z6sndp2lsji"; depends=[diffeR ggplot2 raster reshape2 rgdal]; }; interAdapt = derive2 { name="interAdapt"; version="0.1"; sha256="06ki36l1mrnd9lbm696a6gapr488dz8na4wvl9y1fif9hfv4zk25"; depends=[knitcitations knitr mvtnorm RCurl shiny]; }; + interactionR = derive2 { name="interactionR"; version="0.1.0"; sha256="0iv631ws6y6gc3cyihiw4x90n0r4l8j8gxw2g8l6j8hccg4avsdh"; depends=[car flextable huxtable msm officer]; }; interactionTest = derive2 { name="interactionTest"; version="1.2"; sha256="0ycr839l07xahakr4r2jvlmd0fcxfm4qi3g8agnyh24c2kwl3ck2"; depends=[]; }; interactions = derive2 { name="interactions"; version="1.1.3"; sha256="11nn3w4qsnh0idf7cwnrclg9h8vdjfl9rbvfk1c4l65pm4f61xrv"; depends=[cli crayon generics ggplot2 jtools rlang tibble]; }; - interep = derive2 { name="interep"; version="0.3.0"; sha256="03a51vambjl7gwxk43k47iff65lc6xs66vmkiw3dhxjr3b3nxrh8"; depends=[MASS Rcpp RcppArmadillo]; }; + interep = derive2 { name="interep"; version="0.3.1"; sha256="0j5mpbx0h1p7si3n532fpzsq5d2ris77vmvqabz1vdzlv4dzlmk8"; depends=[MASS Rcpp RcppArmadillo]; }; interferenceCI = derive2 { name="interferenceCI"; version="1.1"; sha256="19ky10nn6ygma6yy5h1krxx61aikh3yx5y39p68a944mz8f72vsn"; depends=[gtools]; }; - interflex = derive2 { name="interflex"; version="1.0.8"; sha256="117bq8cid36v6d2lrcywv5xqh6wm2z0fj9hwkjzwqhfkd8qhpq0a"; depends=[doParallel foreach ggplot2 lfe Lmoments lmtest mgcv pcse Rcpp RcppArmadillo sandwich]; }; + interflex = derive2 { name="interflex"; version="1.1.3"; sha256="1ga6m3f3dr70db5xkpbdx2vmv09cd2da8ky785dpl69chmxrcmhp"; depends=[caret doParallel foreach ggplot2 ggplotify gridExtra gtable lfe Lmoments lmtest mgcv pcse RColorBrewer Rcpp RcppArmadillo sandwich]; }; interfr = derive2 { name="interfr"; version="0.1.0"; sha256="1wn7i8dsll1qq3v39hgpbqnkjc8f4wlffy73453rw9lpq61y2fgj"; depends=[CircStats colorSpec plotrix]; }; intergraph = derive2 { name="intergraph"; version="2.0-2"; sha256="1ipxdrfxhcxhcbqvrzqh3impwk4xryqlqlgjl7f2mwrf365zs6ph"; depends=[igraph network]; }; interim = derive2 { name="interim"; version="0.8.0"; sha256="1hcq1cx6fv4ivvyd3ww3gsbw12g6rw83qqqbrcgzlnjl1q0jh3nf"; depends=[]; }; @@ -9258,8 +9278,9 @@ in with self; { ipfp = derive2 { name="ipfp"; version="1.0.1"; sha256="12aklhf9p70r9b2wi0qgbl835b4lil805c31n1ka4kdix4b4cpr4"; depends=[]; }; ipfr = derive2 { name="ipfr"; version="1.0.2"; sha256="0q44zw5g76qfqrqv6w2a8p905n4ljxab9jmyqk6fv9vs8j2kyivg"; depends=[dplyr ggplot2 magrittr mlr tidyr]; }; ipft = derive2 { name="ipft"; version="0.7.2"; sha256="0jifmkwac5yfl110200ljm3pas3321j068af9xqzqs0av20m8hps"; depends=[apcluster cluster dplyr ggplot2 Rcpp]; }; + ipify = derive2 { name="ipify"; version="0.2.0"; sha256="05mi8i839iadpz4apkxpxx86zphkgv748mwvdgjxnz82c7s10q9k"; depends=[httr]; }; iplots = derive2 { name="iplots"; version="1.1-7.1"; sha256="1bz8n9cnx6zy3wsr49h55r0l5ikfl0xjg4r76fi4giid2a3ba4lf"; depends=[png rJava]; }; - ipmisc = derive2 { name="ipmisc"; version="1.2.0"; sha256="0ga92xpq3inc1anwn4qr3xzrnlp79szb46ybvgyvxmg682wphlnf"; depends=[broomExtra crayon dplyr forcats rlang rstudioapi tibble tidyr zeallot]; }; + ipmisc = derive2 { name="ipmisc"; version="2.0.0"; sha256="0yjbxqi89nv7ksvxihfpbm4fn22y7jgj5ngpn5gd7rmg9bq68g0d"; depends=[crayon dplyr forcats magrittr rlang rstudioapi tibble tidyr zeallot]; }; ipptoolbox = derive2 { name="ipptoolbox"; version="1.2"; sha256="0scbny4crgr23qcp0vgsxhwmj5g5q5c1c4mb5mmb5njyvc34s01l"; depends=[AlgDesign copula evd kolmim triangle]; }; ipr = derive2 { name="ipr"; version="0.1.0"; sha256="1db06r784c6jga0anp6p5b3k47yfhr84nzxyjn52pc9zkg3yifjm"; depends=[]; }; ipred = derive2 { name="ipred"; version="0.9-9"; sha256="0vs1hqfx7yd0xdbmfsf2gim7spkni0845cj6gswn0nhdfdq7ma0d"; depends=[class MASS nnet prodlim rpart survival]; }; @@ -9285,7 +9306,7 @@ in with self; { irtDemo = derive2 { name="irtDemo"; version="0.1.4"; sha256="0rpwryybnj7b4bxn0mn1m496y85s2fpqdd78lmdl6jg1ck4j4pb3"; depends=[fGarch shiny]; }; irtProb = derive2 { name="irtProb"; version="1.2"; sha256="12wnvbzkh0mx9i3iyh1v2n2f2wjsjj7ad3dgv9xj949x4nbz16j0"; depends=[lattice moments]; }; irtoys = derive2 { name="irtoys"; version="0.2.1"; sha256="0h6iiaxikhbxhbyksbjnb09qdxinlkwr2v9yzs5wslbni14paq5q"; depends=[ltm sm]; }; - irtplay = derive2 { name="irtplay"; version="1.4.1"; sha256="0blc1jlj44rk9jgpffdwlx3pw1n72xkfi6mxb5mhd8qyc5ri1a8m"; depends=[dplyr ggplot2 gridExtra pbapply purrr reshape2 rlang statmod tidyr]; }; + irtplay = derive2 { name="irtplay"; version="1.5.0"; sha256="0jj3ac2vc1wkkwdaw8gw08y6y178n5lm468jymb6xrp1s22j22lm"; depends=[dplyr ggplot2 gridExtra Matrix pbapply purrr reshape2 rlang statmod tidyr]; }; irtrees = derive2 { name="irtrees"; version="0.1.0"; sha256="03jmfyx1ia987zhi74fmmcdz70wnm8c7z5z30rwzd1cs11dijjwv"; depends=[]; }; irtreliability = derive2 { name="irtreliability"; version="0.1-1"; sha256="15qs8bvgrwajj5kfd57rd34l1p2805ilyd7w60ngrqc14d6az9d2"; depends=[fastGHQuad ltm mirt]; }; isa2 = derive2 { name="isa2"; version="0.3.5"; sha256="17vm0906szhrh2k5x694vwcfijbzmd1v3axpszfybc0lgds437cv"; depends=[lattice]; }; @@ -9298,7 +9319,7 @@ in with self; { isni = derive2 { name="isni"; version="1.2"; sha256="1nw7i20fli3sg1g1dl17g8rz5bpx49gcmlyw4nvfyhdxqr38nb0r"; depends=[Formula lme4 matrixcalc mixor mvtnorm nlme nnet]; }; isnullptr = derive2 { name="isnullptr"; version="1.0.1"; sha256="0kwjxq59n3qncdw63vsdvz7v5mzbl5lmckdfgiiw35pzmahnxzh9"; depends=[]; }; isoSurv = derive2 { name="isoSurv"; version="0.1.0"; sha256="00dbrblqdylh2z636hwxr79lk2f8sa15wqcm7m6vd5m2jdhw4xay"; depends=[Iso survival]; }; - isoband = derive2 { name="isoband"; version="0.2.0"; sha256="1r023s73qypnvpx18znr9ymylr022m90v65mz2jasn0a1kjrfcbq"; depends=[Rcpp testthat]; }; + isoband = derive2 { name="isoband"; version="0.2.1"; sha256="1ndlnv4g9pbd02y50sx4ffg2ccwqbi7fm2v1lh22wdd8pq33d20q"; depends=[Rcpp testthat]; }; isoboost = derive2 { name="isoboost"; version="1.0.0"; sha256="0arah62y2gyjhrwjyf4hbzlzyvnx3594436pvk8jjcjyfk7bzr6c"; depends=[Iso isotone rpart]; }; isocat = derive2 { name="isocat"; version="0.2.5"; sha256="15y1pjyf1lcwxybrsr1n7z8w2dx1cpldcshc3fprqgy0zm2d9ij7"; depends=[foreach magrittr plyr raster sp]; }; isocir = derive2 { name="isocir"; version="2.0-6"; sha256="0dkxdx2g1c579q97r45shws2gylkwqlvrhmc14ddmzi45xhxlql6"; depends=[circular combinat TSP]; }; @@ -9328,7 +9349,7 @@ in with self; { ivdesc = derive2 { name="ivdesc"; version="1.0.0"; sha256="134dia4wwg7pazc92ccsb3pmsp9kpszr3j5ziyh0ld53qdmcsmz3"; depends=[knitr purrr rsample]; }; ivfixed = derive2 { name="ivfixed"; version="1.0"; sha256="0a26zrkvz0ffq4zxdx5vhr1nvsi9c15s6gvc1zy2pddjz31x2xi5"; depends=[Formula]; }; ivmodel = derive2 { name="ivmodel"; version="1.8.1"; sha256="0c0lzjvp9dzj92p65v5lqmr701ksklx06lf6fcylj2w9hczf5klw"; depends=[Formula ggplot2 Matrix reshape2]; }; - ivmte = derive2 { name="ivmte"; version="1.1.0"; sha256="0a7m04n7lyqykfix0shjhbgnl502zlyigxb997v8wbmx9sx2vk56"; depends=[Formula]; }; + ivmte = derive2 { name="ivmte"; version="1.2.0"; sha256="19jcydb5n950av2c9j89sakjkq1jbwnarrl0hwmdy573jqh4d8a5"; depends=[Formula]; }; ivpack = derive2 { name="ivpack"; version="1.2"; sha256="0cr5acjrn41d3q0b77hlg2jmsbf1msvys9gcavm1blsryg2bc03c"; depends=[AER lmtest sandwich]; }; ivpanel = derive2 { name="ivpanel"; version="1.0"; sha256="0irjmkw3nnd8ssidvj23lr0hihlhd9acsbaznh88lknx53ijc2qv"; depends=[Formula]; }; ivprobit = derive2 { name="ivprobit"; version="1.1"; sha256="05b5gf5gmi2yrkg61n7w12qlgpnjakd1z8hhqxy6py8hahsf84gm"; depends=[Formula]; }; @@ -9349,7 +9370,7 @@ in with self; { jagsUI = derive2 { name="jagsUI"; version="1.5.1"; sha256="1samj54hyarx9j6k652jl988y3fhxsqg50hfzxdwairg0m2mlgmq"; depends=[coda lattice rjags]; }; james_analysis = derive2 { name="james.analysis"; version="1.0.1"; sha256="1b2n4ds4ivfk564z87s2rxjl9j0y4drd3cmyv8jqpccmdvx1137d"; depends=[naturalsort rjson]; }; janeaustenr = derive2 { name="janeaustenr"; version="0.1.5"; sha256="1wyn4qc28a3sval8shmyi2d7s4nl3jh96s8pzq871brxcmrncbwr"; depends=[]; }; - janitor = derive2 { name="janitor"; version="1.2.1"; sha256="1sgak2zdwy9kwz24q88dpjjvnc8pmw9iansy5ci2hphh3wiykali"; depends=[dplyr magrittr purrr rlang snakecase tidyr]; }; + janitor = derive2 { name="janitor"; version="2.0.1"; sha256="1dy8dlvnxg057qxpd5lk30wcxa15vw95888ccd99sqra789llm3n"; depends=[dplyr lifecycle lubridate magrittr purrr rlang snakecase stringi stringr tidyr tidyselect]; }; jaod = derive2 { name="jaod"; version="0.2.0"; sha256="0cphwfmv5pbkf9hvz9w25gncldycgdfxmg6ajbvj9mdl46z3jddw"; depends=[crul jsonlite tibble]; }; 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]; }; @@ -9357,7 +9378,6 @@ in with self; { 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]; }; - jenkins = derive2 { name="jenkins"; version="1.0"; sha256="02yqadbwnpbscnyjf6xqdfz9j7dqyz3741nrwz4cn9d4j4c3sjdi"; depends=[curl jsonlite]; }; jetpack = derive2 { name="jetpack"; version="0.4.3"; sha256="16l4wkrkf4ihhhpwzd62gvz30n8lxyvail70vmcg41gzdyw76hbl"; depends=[crayon desc docopt packrat remotes]; }; jetset = derive2 { name="jetset"; version="3.4.0"; sha256="0c99h5npsv2gf5d59s4qhkaqmjhbwa3prcykk24wzhnpfq6y6xhp"; depends=[AnnotationDbi org_Hs_eg_db]; }; jfa = derive2 { name="jfa"; version="0.1.0"; sha256="13fhxzhaq29z1kbaf4y9gb1m3706gvd2wsann9kz2mbpa2p9jk3a"; depends=[]; }; @@ -9378,7 +9398,7 @@ in with self; { 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.5"; sha256="07rsxqvy62w2z48fkgbhfk5b3q9qwkmz11n8j8qkhipqs0h1zwwq"; depends=[lattice MASS nlme statmod survival]; }; - joineRML = derive2 { name="joineRML"; version="0.4.3"; sha256="0pry2kr53svv2jpzycmm0z9nirxmxxid8p332n6pn5j3bydh7jb4"; depends=[cobs doParallel foreach ggplot2 lme4 MASS Matrix mvtnorm nlme randtoolbox Rcpp RcppArmadillo survival]; }; + joineRML = derive2 { name="joineRML"; version="0.4.4"; sha256="1h4js01zp627b5z5c5daz2a2cz38f3m2a1bijcpmbg17qskv6wp0"; depends=[cobs doParallel foreach generics ggplot2 lme4 MASS Matrix mvtnorm nlme randtoolbox Rcpp RcppArmadillo survival tibble]; }; joineRmeta = derive2 { name="joineRmeta"; version="0.1.2"; sha256="0lkj3rry8kvdcl3dxrkvnql8rl3fsgc4lk5qdifhl41aws2q7ccs"; depends=[ggplot2 gridExtra gtools JM joineR lme4 MASS Matrix meta msm statmod survival]; }; joinet = derive2 { name="joinet"; version="0.0.3"; sha256="01rql7nidmzhrz6agy5kphsln5nl4lpyrqdrfmf5w98zjr8yqkpr"; depends=[cornet glmnet palasso]; }; joint_Cox = derive2 { name="joint.Cox"; version="3.7"; sha256="1h9cqmly5rrrqvxzkx5fxjaqzks9hpvb2ggaw8b5rn67wbyblrl9"; depends=[survival]; }; @@ -9392,7 +9412,7 @@ in with self; { jose = derive2 { name="jose"; version="1.0"; sha256="1yna3x4hi0vn23dqi605nn1y313brwh2wcv527bm3mdbscgsi2jf"; depends=[jsonlite openssl]; }; jpeg = derive2 { name="jpeg"; version="0.1-8.1"; sha256="1a8mi70x79a691r40yiw684jkg1mr9n8agkxlcksxcnrdybs9c0x"; depends=[]; }; jpmesh = derive2 { name="jpmesh"; version="1.2.0"; sha256="0n2il3y9fix0hrva08hk6hdqqqw5y0vwh5m89vqssr4pccyd1syd"; depends=[leaflet magrittr miniUI purrr rlang sf shiny tibble units]; }; - jpndistrict = derive2 { name="jpndistrict"; version="0.3.5"; sha256="0khhxk7s2kj2icms38vysbq031axq9kiia7873g2vxcn5d8aa6mf"; depends=[dplyr googlePolylines jpmesh leaflet lwgeom magrittr miniUI purrr rlang sf shiny tibble tidyr tidyselect]; }; + jpndistrict = derive2 { name="jpndistrict"; version="0.3.6"; sha256="0wwkj1m22mwzpagg2plzpwn51sjvnhzhz5q3y8wwza72zhd9sx3h"; depends=[dplyr googlePolylines jpmesh leaflet magrittr miniUI purrr rlang sf shiny tibble tidyr tidyselect]; }; jqr = derive2 { name="jqr"; version="1.1.0"; sha256="00x5a61bsn2ywzc2haz19f6h0sqhlx7z3k1n9y0729dwm4id89ms"; depends=[lazyeval magrittr]; }; jquerylib = derive2 { name="jquerylib"; version="0.1"; sha256="0spq9x6fmnw9nnxanwrm17pwsc29mfw7v7v91ypzwb79wkyx3lys"; depends=[htmltools]; }; jrc = derive2 { name="jrc"; version="0.3.1"; sha256="0vzmmzblwx055jvd90bz6s5iy901kqanbrs64c3wpaxvjigwf87z"; depends=[httpuv jsonlite mime R6 stringi stringr]; }; @@ -9410,10 +9430,10 @@ in with self; { jsonstat = derive2 { name="jsonstat"; version="0.0.2"; sha256="0p0d3snl1971p5ikrkmwqrjjh4fy0b89qk3rnd1dayfb0r80xnnj"; depends=[cli dplyr jsonlite rlang]; }; jsonvalidate = derive2 { name="jsonvalidate"; version="1.1.0"; sha256="1vxklvkva547mzbgi7hll46sfx274c6j4m70algygphz783x3dsx"; depends=[V8]; }; jsr223 = derive2 { name="jsr223"; version="0.3.3"; sha256="0i00nbsj6b4mx9pgp5rana1kj57hi4lz3lsiniv7baz5avmhp65n"; depends=[curl jdx R6 rJava]; }; - jstable = derive2 { name="jstable"; version="0.9.2"; sha256="0vp6bb2yqnh81avy085y6ylb3qll671xmjddi6gilzmbxpks9xl6"; depends=[car coxme data_table dplyr geepack labelled lme4 magrittr purrr survey survival tableone tibble]; }; + jstable = derive2 { name="jstable"; version="0.9.3"; sha256="0dac786q715syizmncg5ql3w6ahswsp15f8f61m3gxhnimn6f6la"; depends=[car coxme data_table dplyr geepack labelled lme4 magrittr purrr survey survival tableone tibble]; }; jstor = derive2 { name="jstor"; version="0.3.8"; sha256="034n9x4skn7l0d9c4qfa01vlrqpkvk0dgplmc6cz07qm0hl35xcw"; depends=[cli crayon dplyr furrr magrittr pryr purrr readr rlang stringr tibble tidyr xml2]; }; jtGWAS = derive2 { name="jtGWAS"; version="1.5.1"; sha256="06cgsncgrqslxcc7s0lb3zwa85bhzkmjzz3f04716xpzwa186vxq"; depends=[Rcpp]; }; - jtools = derive2 { name="jtools"; version="2.0.3"; sha256="1xnifd77ygvkq73wyfw2ic6x3m00k7jj1rw0q8jf0q29qbpda6an"; depends=[crayon generics ggplot2 magrittr pander pkgconfig rlang tibble]; }; + jtools = derive2 { name="jtools"; version="2.0.5"; sha256="1mlnspb75cwzqqjlskq21a19jlxljxqj8bnan3w782h1nnp52y6g"; depends=[crayon generics ggplot2 magrittr pander pkgconfig rlang tibble]; }; jtrans = derive2 { name="jtrans"; version="0.2.1"; sha256="18zggqdjzjhjwmsmdhl6kf35w9rdajpc2nffag4rs6134gn81i3m"; depends=[]; }; jubilee = derive2 { name="jubilee"; version="0.3.3"; sha256="1j2y44pfx9z2k169lh42b4dnfrrnk8jqsjn3wz4l9iscr6r91lx7"; depends=[data_table dplyr readxl xts yaml zoo]; }; junctions = derive2 { name="junctions"; version="1.1"; sha256="1v5jx4mw6x4q3fivsvidd49b8czzbvv5icj39h6jrpmqvrnc8w32"; depends=[Rcpp]; }; @@ -9436,6 +9456,7 @@ in with self; { kayadata = derive2 { name="kayadata"; version="0.4.3"; sha256="116bcjfsq9k4x6dy92xbs18rlc09wcwylqyni0dw4c8pww64n937"; 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]; }; + kcopula = derive2 { name="kcopula"; version="0.1.0"; sha256="07ddrq4lxp8i6n7c7ac7x9mdg9gfmlh7bv3n34qalwv0a6fa061w"; depends=[pracma]; }; kcpRS = derive2 { name="kcpRS"; version="1.0.0"; sha256="067j91rhw56kf15h7hxpm9qr6i59fvy5fh9ycfdqcps83wjgx62x"; depends=[doParallel foreach RColorBrewer Rcpp roll]; }; kde1d = derive2 { name="kde1d"; version="1.0.2"; sha256="0m6y1anzl5agb8xpywn2pv6hx4l7k0352bxnzxcs23iksbimxx13"; depends=[BH randtoolbox Rcpp RcppEigen]; }; kdecopula = derive2 { name="kdecopula"; version="0.9.2"; sha256="0g5c12wm3byd4chd8i9mxv599gsf4ip4qghx83j3mmhsmn05zf4y"; depends=[lattice locfit qrng quadprog Rcpp RcppArmadillo]; }; @@ -9459,12 +9480,13 @@ in with self; { kerndwd = derive2 { name="kerndwd"; version="2.0.2"; sha256="0nf5hyb274gn02n4lygwryv1jaqff77i040bd8gs1xykgvy6jxny"; depends=[]; }; kernelFactory = derive2 { name="kernelFactory"; version="0.3.0"; sha256="001kw9k3ivd4drd4mwqapkkk3f4jgljiaprhg2630hmll064s89j"; depends=[AUC genalg kernlab randomForest]; }; kernelPSI = derive2 { name="kernelPSI"; version="1.1.1"; sha256="1gnp3ixqmijy6xanlc4l8255biwxmlfyhd3y68arry9rzfjkmxpz"; depends=[CompQuadForm kernlab lmtest pracma Rcpp RcppArmadillo]; }; - kernelTDA = derive2 { name="kernelTDA"; version="0.1.1"; sha256="0rghj0yx32r6565mb06k83qfmnf7lajdhdg2zf8kjd9jyzidqdrn"; depends=[BH mvtnorm Rcpp RcppEigen Rdpack]; }; + kernelTDA = derive2 { name="kernelTDA"; version="1.0.0"; sha256="0nzb2z10c3pqj8p47w663mrnmk3g8x61zz99ka8fwcspw1wq3g8m"; depends=[BH mvtnorm Rcpp RcppEigen Rdpack]; }; kernelboot = derive2 { name="kernelboot"; version="0.1.7"; sha256="1465n9fasyxwm4xx9vajaf5n355z2qdkfzhpp3a6mkv58pydbjss"; depends=[future future_apply Rcpp]; }; kernhaz = derive2 { name="kernhaz"; version="0.1.0"; sha256="1cxwjnfyhxfjdbhs21airycs704jic21pdpsbxsx37wkl11cxpai"; depends=[doParallel foreach GA rgl]; }; kernlab = derive2 { name="kernlab"; version="0.9-29"; sha256="0vqhndl4zm7pvkfvq0f6i9cbrm7pij6kmdp7d7w39pa100x6knn3"; depends=[]; }; kernplus = derive2 { name="kernplus"; version="0.1.2"; sha256="0z5zpj89nw7cdphg6frmjwqjxsl6g95xsa8zgsxmw2q75wwj1saz"; depends=[circular KernSmooth mixtools]; }; kernscr = derive2 { name="kernscr"; version="1.0.5"; sha256="1kcj710q8jbc34g6fcv2nk07hpsb81mfx8hvivgxq8x58028gjzs"; depends=[MASS mvtnorm]; }; + keyATM = derive2 { name="keyATM"; version="0.1.0"; sha256="0jska1nzwbb7lmm18wpa99jdgvv7mgl1cm47k7qspg1jmx5alj5d"; depends=[dplyr fastmap ggplot2 ggrepel magrittr Matrix purrr quanteda Rcpp RcppEigen RcppProgress rlang stringr tibble tidyr]; }; keyholder = derive2 { name="keyholder"; version="0.1.4"; sha256="1k648a16015qq29msls2s5y5ql9myi1908klih5gj09pf2fr93wq"; depends=[dplyr rlang tibble]; }; keyplayer = derive2 { name="keyplayer"; version="1.0.3"; sha256="0j4n46r9ivkbzqz8g22dq2bpmx7bs05yb5qp27p9jnfh5x19v2ds"; depends=[igraph matpow sna]; }; keypress = derive2 { name="keypress"; version="1.2.0"; sha256="19l33519f726i3q20y34v1aavrn4fpj3zn5caij3l9q2asw2kqk2"; depends=[]; }; @@ -9517,7 +9539,7 @@ in with self; { knockoff = derive2 { name="knockoff"; version="0.3.2"; sha256="1ky69f3hwwgy2il097mx0z7aakxsq692g9ink8z8cb4wnrp4bk07"; depends=[corpcor glmnet gtools Matrix Rdsdp RSpectra]; }; knor = derive2 { name="knor"; version="0.0-7"; sha256="1xxv210sjj9w06pf36q7haz9fkqdc17jyqdsiqsxj3q8zj585qfc"; depends=[Rcpp]; }; knotR = derive2 { name="knotR"; version="1.0-2"; sha256="0kd1b9wibpwyaanz9ny61qgfvcg4d3rzpy05sfshlpp0b1y8d3xj"; depends=[]; }; - kntnr = derive2 { name="kntnr"; version="0.4.3"; sha256="1hr4c6yr2ddi69fpnmppmwn2hyc593gk8hc0p7qky5cdlllvqgbd"; depends=[base64enc dplyr httr jsonlite lubridate purrr rlang rstudioapi stringr tibble tidyr]; }; + kntnr = derive2 { name="kntnr"; version="0.4.4"; sha256="1af5qhj82dixf1qcbz3sfj52pzgy8gnafzifwxnhrp7vpn4rnv6m"; depends=[base64enc dplyr httr jsonlite lubridate purrr rlang rstudioapi stringr tibble tidyr]; }; koRpus = derive2 { name="koRpus"; version="0.11-5"; sha256="053882fnz6c7yjiz72jg6sawd9q57h110nd4yjay65piadi9mci5"; depends=[data_table sylly]; }; koRpus_lang_en = derive2 { name="koRpus.lang.en"; version="0.1-3"; sha256="013zxm5x5hwdx1hqgb7mh3zmn8dri3fhq1brmzg936gddhxap6is"; depends=[koRpus sylly_en]; }; kofdata = derive2 { name="kofdata"; version="0.1.3.4"; sha256="036d3mvhdlpaisms3vg6v35lvy48w8yld7mz3rdd3dw6bszzrg5k"; depends=[httr jsonlite xts zoo]; }; @@ -9583,7 +9605,6 @@ in with self; { laketemps = derive2 { name="laketemps"; version="0.5.1"; sha256="04742r379bzgbfr4243wwkb26cvfmnw50jzgygq7vblq00grzska"; depends=[dplyr reshape2]; }; lamW = derive2 { name="lamW"; version="1.3.0"; sha256="00qa1sxyqb2r7f9yidg43cq2v1285f45xpm3z928jpi424mpg0fc"; depends=[Rcpp RcppParallel]; }; lambda_r = derive2 { name="lambda.r"; version="1.2.4"; sha256="1mh1g0gsd58gng0hb29vww2yqb2jfs07kba5kxnnqck5j3izwlnj"; depends=[formatR]; }; - lambda_tools = derive2 { name="lambda.tools"; version="1.0.9"; sha256="1wslxxh6rxny3n06y16dqwpczi3k42vrq4pbwwshl6kzhl56r45b"; depends=[lambda_r]; }; lamme = derive2 { name="lamme"; version="0.0.1"; sha256="1x9jl79iqikpjixajly1k8w2nkzskns2m0v242giknl0ikw298h1"; depends=[]; }; landest = derive2 { name="landest"; version="1.0"; sha256="1lp5sfqk0n7i23fmwjgzsabml1fsji1h9xq5khxzaz1bzqv1s08g"; depends=[survival]; }; landpred = derive2 { name="landpred"; version="1.0"; sha256="1bl17xkx18i8i7arccnjmxvhjn4yiy7w64hg4n0xmhk8pg0l3mrg"; depends=[survival]; }; @@ -9596,7 +9617,7 @@ in with self; { languageR = derive2 { name="languageR"; version="1.5.0"; sha256="1iipnr2b4hd2w718prbh075j56m5xnchlcb2vg26m16qpydp6afn"; depends=[]; }; languagelayeR = derive2 { name="languagelayeR"; version="1.2.4"; sha256="1q82shdcdd84nr6bnfwgyyb81z8dycvj1i3vhwvdg710s15rgiyk"; depends=[attempt curl httr jsonlite]; }; languageserver = derive2 { name="languageserver"; version="0.3.5"; sha256="04i7pasvj2varq3khk6w0z1liwnwfr648gwvqz9qs7gkyknydp4y"; depends=[callr collections desc fs jsonlite lintr R6 repr stringi styler xml2 xmlparsedata]; }; - languageserversetup = derive2 { name="languageserversetup"; version="0.1.1"; sha256="07vwfgdw79zcr8wlmzs4b5mqmd7fa2ja76vpyjvlf07ifg7x82jw"; depends=[]; }; + languageserversetup = derive2 { name="languageserversetup"; version="0.1.2"; sha256="05i8kcp1zpbkrqpq5vxxvxk9p7phyngxl0q6v76va0i7qnmy1v7a"; depends=[]; }; 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=[]; }; @@ -9634,7 +9655,6 @@ in with self; { lazytrade = derive2 { name="lazytrade"; version="0.3.10"; sha256="1m8wv5ii4inqw45nzqfqyrhzajr37mk9v4h8vxvy0ya00cibs9hb"; depends=[dplyr ggplot2 h2o lubridate magrittr openssl readr ReinforcementLearning stringr]; }; lba = derive2 { name="lba"; version="2.4.4"; sha256="0izqndm992zv3sg8v5lpnxbdbxhpxl6hq3bf6xgq3pnw8vl3f6nb"; depends=[alabama MASS plotrix rgl scatterplot3d]; }; lbfgs = derive2 { name="lbfgs"; version="1.2.1"; sha256="0p99g4f3f63vhsw0s1m0y241is9lfqma86p26pvja1szlapz3jf5"; depends=[Rcpp]; }; - lbfgsb3 = derive2 { name="lbfgsb3"; version="2015-2.13.1"; sha256="15g465dy4izybmgmbgzmiyaxdfa6l1mcvyh6rc3hgapnlmnvb66m"; depends=[numDeriv]; }; lbfgsb3c = derive2 { name="lbfgsb3c"; version="2020-3.2"; sha256="07mhiaxhjjma5c65z3pz7wchgsqn4b19labzyq25ncnmj319fxrg"; depends=[numDeriv Rcpp RcppArmadillo]; }; lbiassurv = derive2 { name="lbiassurv"; version="1.1"; sha256="1i6l3y4rasqpqka7j39qjx22wjbilgc9pkp05an52aysfvfxy193"; depends=[actuar]; }; lbreg = derive2 { name="lbreg"; version="1.3"; sha256="1z9vixf6sl0k9lizngc3859lk32srkk1d8y133sl6s37ppmqb4s2"; depends=[MASS]; }; @@ -9654,7 +9674,7 @@ in with self; { ldaPrototype = derive2 { name="ldaPrototype"; version="0.1.1"; sha256="0r78x7sn6mg4hgwydk1lgvfzkmgwkzqq0kvn8pqawx9pg8d8h4jb"; depends=[checkmate colorspace data_table dendextend fs lda progress]; }; ldamatch = derive2 { name="ldamatch"; version="1.0.1"; sha256="1dmmjw7h0rrgwga7235bryzzvmx68gmkpy5v1pwvnkk4rxp8xamh"; depends=[car data_table entropy foreach gmp iterators iterpc kSamples MASS RUnit]; }; ldat = derive2 { name="ldat"; version="0.3.3"; sha256="1n8v4nzfv3ayr46ahrz60vasam8mx1phb4vss05d9xh7sxlkx7gv"; depends=[BH lvec Rcpp]; }; - ldatuning = derive2 { name="ldatuning"; version="1.0.0"; sha256="021k91a76yxjpda2850jcnxvawlrisvw35rw2p6ylfwkylaf4sz9"; depends=[ggplot2 reshape2 Rmpfr scales slam topicmodels]; }; + ldatuning = derive2 { name="ldatuning"; version="1.0.2"; sha256="0367y6k5i4sccwfcm89xyc62qblrlwnm6hsa2jf346rnrfz9hkkc"; depends=[ggplot2 reshape2 Rmpfr scales slam topicmodels]; }; ldbod = derive2 { name="ldbod"; version="0.1.2"; sha256="1ylzkswnhf4jnjx2ijasy49pj78ffx333za0bx2fnf3g85kicqiv"; depends=[mnormt RANN]; }; ldbounds = derive2 { name="ldbounds"; version="1.1-1.1"; sha256="10rmkidvvhwnrkc62c5ld44xhbvx1k8mch28h1yryakn8gznp3p8"; depends=[lattice]; }; ldhmm = derive2 { name="ldhmm"; version="0.5.1"; sha256="1jwgxwzz56n6hhpp1qks1x0jsfbrjgfsl6h5sp7498l4d2f279ij"; depends=[ecd ggplot2 moments optimx scales xts zoo]; }; @@ -9689,6 +9709,7 @@ in with self; { ledger = derive2 { name="ledger"; version="2.0.6"; sha256="11j4mzkkgphpwda5g9wl0ppxh5kslx7gqip5b7frmq1vk08fxf1p"; depends=[dplyr rio rlang stringr tibble tidyr tidyselect]; }; leerSIECyL = derive2 { name="leerSIECyL"; version="1.0.2"; sha256="1zx28gpnys9mmhq7wwljfnq92wj1h1vxgqiirnfmn36z942nvmxl"; depends=[RCurl]; }; legco = derive2 { name="legco"; version="0.1.3"; sha256="1615whdqihpzfhp5ll3x3jg4py04l52dc87kbdmgln4ygxyy5sqh"; depends=[httr jsonlite]; }; + legislatoR = derive2 { name="legislatoR"; version="1.0"; sha256="1553hpb2cmv3hw6v4c7qwgg8n18jwx101yaqnmaaiv8gfyh6j43m"; depends=[curl dplyr]; }; legocolors = derive2 { name="legocolors"; version="0.2.0"; sha256="06jbq12jzga1p5jajhnnkk11s9gjw5ngmnrvhmbvirhsbafp0fjv"; depends=[]; }; leiden = derive2 { name="leiden"; version="0.3.3"; sha256="1hh6bmbz6cpqwl4i94gxylgv9x92zbqdg81r8r4ymfy8c70f3df2"; depends=[igraph Matrix reticulate]; }; leiv = derive2 { name="leiv"; version="2.0-7"; sha256="15ay50886xx9k298npyksfpva8pck7fhqa40h9n3d7fzvqm5h1jp"; depends=[]; }; @@ -9699,6 +9720,7 @@ in with self; { lessR = derive2 { name="lessR"; version="3.9.3"; sha256="1r4hsznvrsy6cb1qwy5vnc9b8wbjsya87161z3w9crgxrw1dbls8"; depends=[colorspace ellipse foreign lattice latticeExtra leaps openxlsx png rmarkdown robustbase sas7bdat triangle viridisLite wesanderson]; }; lest = derive2 { name="lest"; version="1.1.0"; sha256="1d69kvdl31crv4ik8bwylq3s3f4skzrjc4x49c79w443g64n2jp9"; depends=[]; }; lestat = derive2 { name="lestat"; version="1.9"; sha256="1skxymdf3ncmdbskh7711xxgwsmwxfxnl52gcgw06jscx6s6wrsd"; depends=[MASS]; }; + letsR = derive2 { name="letsR"; version="3.2"; sha256="1ahmm290vgmdqnm7wz1fif1g31nsvqszkf921dpddv291xqmbksp"; depends=[fields geosphere maps maptools raster rgdal rgeos sp XML]; }; 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=[]; }; @@ -9714,14 +9736,13 @@ in with self; { lgrdata = derive2 { name="lgrdata"; version="0.1.1"; sha256="0h1crdhqfp6hzx30lp0w015scf2566hhrl2i7mkxy868rkl3aig9"; depends=[]; }; lgtdl = derive2 { name="lgtdl"; version="1.1.5"; sha256="1sixq56d2px36q0xq3kl0zwj2yzm3q8fhgqjvmajcdd5jl8l7130"; depends=[]; }; lhmixr = derive2 { name="lhmixr"; version="0.1.0"; sha256="1c4ydgq1z2y0xk8xqdsim6xvgxdbl3gglfk5kcr9k4m01arvv0rf"; depends=[]; }; - lhs = derive2 { name="lhs"; version="1.0.1"; sha256="0lzaqr7xi3ckln5nglv5xf5njm359slpz1jc6s02hpsqdw6armd4"; depends=[Rcpp]; }; - liayson = derive2 { name="liayson"; version="1.0.2"; sha256="1kz7svfjd8wr826kwqkisiyhszb5df7inf77w2yb2rahkza50m49"; depends=[ape arules biomaRt distances e1071 gplots matlab phangorn plyr proxy RColorBrewer]; }; + lhs = derive2 { name="lhs"; version="1.0.2"; sha256="0n0i1hr9gmc0hfcs2cvpjvdfgm6k26rhcq3q22r8ic0gfj953572"; depends=[Rcpp]; }; libcoin = derive2 { name="libcoin"; version="1.0-5"; sha256="1cm9x1dlg9f7fh7n5nw3x4a7rl88c7ylrlc8x3rx4mq5w1j42x0a"; depends=[mvtnorm]; }; librarian = derive2 { name="librarian"; version="1.7.0"; sha256="0n3q2ppa3p0w8ypgx9s738pmprfbqi9qg8n58xzplp809p903dj9"; depends=[BiocManager remotes]; }; librarysnapshot = derive2 { name="librarysnapshot"; version="0.1.2"; sha256="0v4x564zpm58kxs5n84bi6mcjhbzjg6a2lc30vsc8kbm3qy0nq38"; depends=[]; }; libsoc = derive2 { name="libsoc"; version="0.7"; sha256="1r548rvj98wl0yp6jx5d2qhvy1y4883qp0w3jjk97vp07a1cywn8"; depends=[]; }; libstableR = derive2 { name="libstableR"; version="1.0.2"; sha256="1gkcgbc8a7ks9x8mqmlz98hk55q3qy62izam7csz1s0r5dzsyqcr"; depends=[Rcpp RcppGSL]; }; - lidR = derive2 { name="lidR"; version="2.2.3"; sha256="05xz64c1f362gjsdhqjz3za444fjkssijhadn2f1qqqbb1bdd664"; depends=[BH data_table future gdalUtils glue lazyeval raster Rcpp RcppArmadillo RCSF rgdal rgeos rgl rlas sf sp]; }; + lidR = derive2 { name="lidR"; version="2.2.4"; sha256="1p0swwwwmfnyzq9k3zf68cl1b4l2vg2d5xy0s4vs5xqjfprbffwd"; depends=[BH data_table future gdalUtils glue lazyeval raster Rcpp RcppArmadillo RCSF rgdal rgeos rgl rlas sf sp]; }; lifecontingencies = derive2 { name="lifecontingencies"; version="1.3.6"; sha256="0v8xrnmviq938x779f3h55iq8bhvbkwgz35v1dxgzbxwclj7jycl"; depends=[markovchain Rcpp]; }; lifecourse = derive2 { name="lifecourse"; version="2.0"; sha256="1m8ihqvzhzpq2m2pdvh37bpq9pdbj23r3y0jkl3q8farh3qj473d"; depends=[TraMineR]; }; lifecycle = derive2 { name="lifecycle"; version="0.2.0"; sha256="0912865c6675fsblrfdk6s568krsj1x8qbk1kipy7m05xs6nwx19"; depends=[glue rlang]; }; @@ -9737,7 +9758,6 @@ in with self; { likelihoodAsy = derive2 { name="likelihoodAsy"; version="0.50"; sha256="009alsxsv9fjpihp3zl0a94y6cvr49nh21skba64lzz9fypm9j8l"; depends=[alabama cond digest nleqslv pracma Rsolnp]; }; likelihoodExplore = derive2 { name="likelihoodExplore"; version="0.1.0"; sha256="13cnql7pbx8qq1j3cfb3lkzzf2k55shpfa0jd00z30ys6imxzcfn"; depends=[lazyeval plyr]; }; likert = derive2 { name="likert"; version="1.3.5"; sha256="0c4irxs7pp1z8nj4s8cq23daw4h94n3h7x4f6q1d85614qcl9l3p"; depends=[ggplot2 gridExtra plyr psych reshape2 xtable]; }; - lilikoi = derive2 { name="lilikoi"; version="0.1.0"; sha256="1v7xrkv8xxmq6cdww4z1p9vlvy71cqgd3yb5mal4v9w2wrfaps6z"; depends=[caret corrplot devtools dplyr e1071 gbm ggplot2 glmnet hash Hmisc infotheo Matrix pamr princurve pROC R_oo randomForest reshape2 RWeka stringr]; }; lillies = derive2 { name="lillies"; version="0.2.7"; sha256="167hlqj9ivsjxhlfv3z1c017iqbj08aig86ncrk9inpqj3zvkyxy"; depends=[ddpcr dplyr knitr pracma progress rlang survival tidyr]; }; limSolve = derive2 { name="limSolve"; version="1.5.6"; sha256="1829rd2cnd8qj80z9a7sgc7gx4sf3kvl5g6d2a0lqqw30f9sjzmr"; depends=[lpSolve MASS quadprog]; }; lime = derive2 { name="lime"; version="0.5.1"; sha256="021wz43dfc3f2k275c98hcnnx7dyyjj18dm2zf8vh7rbk9bnf0sj"; depends=[assertthat ggplot2 glmnet gower htmlwidgets Matrix Rcpp RcppEigen shiny shinythemes stringi]; }; @@ -9786,7 +9806,6 @@ in with self; { live = derive2 { name="live"; version="1.5.13"; sha256="1s6yrbwlc4wqszl2yvy1x6d93my18ba8sm8pwfy547cd1x055vig"; depends=[breakDown data_table dplyr e1071 forestmodel ggplot2 gower MASS mlr shiny]; }; livechatR = derive2 { name="livechatR"; version="0.1.0"; sha256="1k0z6q3s9iw962m1lwlx45p95flzl5jg1xh6ng426v9jh1yyrbb2"; depends=[data_table dplyr jsonlite magrittr purrr]; }; 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]; }; @@ -9799,14 +9818,14 @@ in with self; { lmSupport = derive2 { name="lmSupport"; version="2.9.13"; sha256="0ln5c91mbxkymgnv2nw5m3nrm5bwckpikgb9x1qhmjc55m98wkb8"; depends=[AICcmodavg car gplots gvlma lme4 pbkrtest psych pwr]; }; lmboot = derive2 { name="lmboot"; version="0.0.1"; sha256="1v7a3vlv0187mpg3y3pj7f3pbk1v5n6amw732chy10vdw5nmfkwd"; depends=[evd]; }; lmds = derive2 { name="lmds"; version="0.1.0"; sha256="130azb0nc2wwxv0qi8v5s4rd02p9lc92zwn634pv7b8awbw81i65"; depends=[assertthat dynutils irlba Matrix]; }; - lme4 = derive2 { name="lme4"; version="1.1-21"; sha256="035j2hqkwv939xl07pm2vykvf3wlx8qj317846n9pkpqkyv58mbz"; depends=[boot lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen]; }; + lme4 = derive2 { name="lme4"; version="1.1-23"; sha256="0qh29kqli0l3naylgb6jha6jllx4nwryr3hv9yk37blgyyql5mcr"; depends=[boot lattice MASS Matrix minqa nlme nloptr Rcpp RcppEigen statmod]; }; lmeNB = derive2 { name="lmeNB"; version="1.3"; sha256="03khn9wgjbz34sx0p5b9wd3mhbknw8qyvyd5pvllmjipnir63d3q"; depends=[lmeNBBayes numDeriv statmod]; }; lmeNBBayes = derive2 { name="lmeNBBayes"; version="1.3.1"; sha256="13shfsh9x6151xy8gicb25sind90imrwclnmfj96b76p5dvhzabm"; depends=[]; }; lmeSplines = derive2 { name="lmeSplines"; version="1.1-10"; sha256="0fy6hspk7rqqkzv0czvvs8r4ishvs7zsf4ykvia65nj26w7yhyia"; depends=[nlme]; }; lmeVarComp = derive2 { name="lmeVarComp"; version="1.1"; sha256="0m6syydy89c52hhi0w503l5vkgya2d5ps70z5wmdd39nm4jna68w"; depends=[]; }; lmec = derive2 { name="lmec"; version="1.0"; sha256="09shj01h2dl5lh7ch0wayr7qyhlmk0prv3p1vfgy91sn0wpbqlxr"; depends=[mvtnorm]; }; lmem_qtler = derive2 { name="lmem.qtler"; version="0.1.1"; sha256="0qbllj66y294n1m8dsyrnwyvzscbzg8mb2dmjyghcrfaz925vkin"; depends=[lattice lme4 pastecs qtl stringr]; }; - lmerTest = derive2 { name="lmerTest"; version="3.1-1"; sha256="0r2vvs3nl6p8xla3gd943khb4ixp0alvspqpnz2y6n3wk8zgh3jj"; depends=[ggplot2 lme4 MASS numDeriv]; }; + lmerTest = derive2 { name="lmerTest"; version="3.1-2"; sha256="1qkdxx5sri65zgpb9gw4nkfkdam51kgy4hxclk5c40yk7y3p0n1q"; depends=[ggplot2 lme4 MASS numDeriv]; }; lmeresampler = derive2 { name="lmeresampler"; version="0.1.1"; sha256="13i0crk6agw5pcj3znvxj60jfsmncnir7ahwdczgm7kh08hk0f6l"; depends=[boot dplyr Matrix nlmeU plyr RLRsim]; }; lmf = derive2 { name="lmf"; version="1.2"; sha256="1xqlqmjl7wf5b2s2a1k1ara21v74b3wvwl4mhbj9dkdb0jcrgfva"; depends=[]; }; lmfor = derive2 { name="lmfor"; version="1.4"; sha256="012bk6r6gf6y9skfch2pqr2irv70108sz1x6hakl1bifb4lgnbjp"; depends=[magic nlme spatstat]; }; @@ -9843,6 +9862,7 @@ in with self; { lodGWAS = derive2 { name="lodGWAS"; version="1.0-7"; sha256="0g5b44d3wb5hnx5l2n76myb1pc9ml3a052n1a4gvgqapa5as35s2"; depends=[rms survival]; }; loder = derive2 { name="loder"; version="0.2.0"; sha256="0m6g8c25dmq0wgpy8y6cbggymxdvqwb6lp2yzs5bgpq183512spb"; depends=[]; }; lodi = derive2 { name="lodi"; version="0.9.2"; sha256="16xqcza87gsqi6kzx0bdv3w9zyvvppjd20rq08lc8vb75nlkx1yb"; depends=[rlang]; }; + lodr = derive2 { name="lodr"; version="1.0"; sha256="0bmdw489dv1069krnx9yi0bcgx1vx4ymc6s4pix4shha5c5fbiz4"; depends=[Rcpp RcppArmadillo Rdpack]; }; loe = derive2 { name="loe"; version="1.1"; sha256="1n16pgfxg9vcn729xxjbbvavg2ywbdcch9v2ph8nv3z7psc0q46c"; depends=[MASS]; }; loewesadditivity = derive2 { name="loewesadditivity"; version="0.1.0"; sha256="0j9vvh2ys09hy2k3mbrlf0p493ymrxvfsdcjw0p6rlls54z9lqqc"; depends=[dplyr ggplot2 gridExtra magrittr metR rlang rootSolve tidyr viridis]; }; log4r = derive2 { name="log4r"; version="0.3.2"; sha256="18r5g0817wfn0kmqwv6vf7r2vavi0xh6mqmxrh59y9w3c84npfhl"; depends=[]; }; @@ -9879,12 +9899,12 @@ in with self; { longitudinalData = derive2 { name="longitudinalData"; version="2.4.1"; sha256="0lnvcfgj721bawl1ciz0jw83mfsnzkhg6jn824vr3qdm4rbib2vd"; depends=[class clv misc3d rgl]; }; longitudinalcascade = derive2 { name="longitudinalcascade"; version="0.3.2.1"; sha256="03nqglxyz6qfalxdnyh2aarxv3agn0b3r4nhsji4v9703h4m1fvg"; depends=[dplyr ggplot2 lubridate rlang scales survival tidyr zoo]; }; longmemo = derive2 { name="longmemo"; version="1.1-2"; sha256="01rj5x9cgscsrakbx9155mbvs35fd3j484cfz5cds9vl521fjr3r"; depends=[]; }; - longpower = derive2 { name="longpower"; version="1.0-19"; sha256="0m5c544d6vl2zhbyi0spy7ylvr366m7vrmk3xfghcvd5anbzpjk6"; depends=[lme4 nlme]; }; + longpower = derive2 { name="longpower"; version="1.0-21"; sha256="0095jml46lchyp17gsqpjabq80xjddlvd4ir8y2jsg8sgd3pc8vs"; depends=[lme4 nlme]; }; longurl = derive2 { name="longurl"; version="0.3.0"; sha256="0ysa70zlkk3ybddj3yd3vbhjnkjbrisiz5a2hgbjx10p33m1r3am"; depends=[dplyr httr purrr]; }; loo = derive2 { name="loo"; version="2.2.0"; sha256="1hq1zcj76x55z9kic6cwf7mfq9pzqfbr341jbc9wp7x8ac4zcva6"; depends=[checkmate matrixStats]; }; lookupTable = derive2 { name="lookupTable"; version="0.1"; sha256="0ipy0glrad2gfr75kd8p3999xnfw4pgpbg6p064qa8ljqg0n1s49"; depends=[data_table dplyr]; }; loon = derive2 { name="loon"; version="1.2.3"; sha256="0h6vbsdp7m9wawjswzzpx7sq8q06xj9l1ln11vfwsyfnp4c66bfs"; depends=[gridExtra]; }; - loon_data = derive2 { name="loon.data"; version="0.0.6"; sha256="01bd3w5xfr7lnbdhi9al5svlg7x3xs4l0jbqsrlamzc96izkm952"; depends=[]; }; + loon_data = derive2 { name="loon.data"; version="0.0.8"; sha256="164i9dbx8a2mwydrzr9bsbx1fqwhg3avl373jk6mpn51m290f8vc"; depends=[]; }; loop = derive2 { name="loop"; version="1.1"; sha256="1gr257fm92rfh1sdhsb4hy0fzwjkwvwm3v85302gzn02f86qr5dm"; depends=[MASS]; }; loopr = derive2 { name="loopr"; version="1.0.1"; sha256="1qzfjv15ymk8mnvb556g2bfk64jpl0qcvh4bm3wihplr1whrwq6y"; depends=[dplyr lazyeval magrittr plyr R6]; }; loose_rock = derive2 { name="loose.rock"; version="1.0.16"; sha256="0vk9zmiy730c1d397v5p7v8ywjv1wv9vabmhdjyrfdx7bijfy57m"; depends=[digest dplyr futile_options ggplot2 MASS reshape2]; }; @@ -9951,7 +9971,7 @@ in with self; { lvmcomp = derive2 { name="lvmcomp"; version="1.2"; sha256="08hs97bdz4n0bdhvqqq5xywfy140s69c750rn38criq4cw4gm3z7"; depends=[coda Rcpp RcppArmadillo]; }; lvnet = derive2 { name="lvnet"; version="0.3.5"; sha256="1wqqxavs2s0hmlifyaa1jrlc8hj4z72fkgjckkmh9m2r4jp9zy0g"; depends=[corpcor dplyr glasso lavaan Matrix mvtnorm OpenMx psych qgraph semPlot]; }; lvplot = derive2 { name="lvplot"; version="0.2.0"; sha256="01sisj2vbx2yb5w9cjzyaf9j46vh4kkw05xccq1f7wmsg69zmj6b"; depends=[ggplot2 RColorBrewer]; }; - lwgeom = derive2 { name="lwgeom"; version="0.2-1"; sha256="00vm7dvy3s2vkggry9knmr3f39nbiacmwiwd0nvrd21yg47k2qi2"; depends=[Rcpp sf units]; }; + lwgeom = derive2 { name="lwgeom"; version="0.2-3"; sha256="0zq85lgmqhxa0f8kgq616lbnh9ads3cwjrfyf9hf1h85wfg0fa6n"; depends=[Rcpp sf units]; }; lxb = derive2 { name="lxb"; version="1.5"; sha256="16x1mvhxqhvibzmv6mlqcmkgic2sha1xagf7r2azmn4z8x1m9w6n"; depends=[]; }; lymphclon = derive2 { name="lymphclon"; version="1.3.0"; sha256="1jns41sk2rx1j3mg06dzy434k30gpfhbkn6s47fmyv1y8701vfl0"; depends=[corpcor expm MASS]; }; m2b = derive2 { name="m2b"; version="1.0"; sha256="0agzw67mmwrw1f61yn24z5w1pgjssdapg3li0a53i3ylnij45mzr"; depends=[caret caTools e1071 geosphere ggplot2 randomForest]; }; @@ -9968,7 +9988,7 @@ in with self; { mMPA = derive2 { name="mMPA"; version="1.2.0"; sha256="0g4zjknz52fpk7f436j95aw93aa8q2jwcrb1pqkm294kr276nnd9"; depends=[]; }; mQTL = derive2 { name="mQTL"; version="1.0"; sha256="0k80xvkr0b0mp3bj2s558fjxi2zf4k7ggnw6hsjm8lr84i108dks"; depends=[MASS outliers qtl]; }; mRMRe = derive2 { name="mRMRe"; version="2.1.0"; sha256="1m41859sa0nd4hdnsq3ir337834cpmgg564f6ph57dmmwz0wa8zy"; depends=[igraph survival]; }; - mRpostman = derive2 { name="mRpostman"; version="0.3.0"; sha256="18ky3xpgb4rns65574jr9fy8jwi6nrz6py9ai8nqf2r1s0bdmww3"; depends=[assertthat base64enc curl magrittr stringr]; }; + mRpostman = derive2 { name="mRpostman"; version="0.3.1"; sha256="0jghbqszf56xp3kvx9rcf11bj0j46hh3xgzvaihbpb67lcj8mvyw"; depends=[assertthat base64enc curl magrittr stringr]; }; mSTEM = derive2 { name="mSTEM"; version="1.0-1"; sha256="0mh09mqqpq9k8jrxs9d39009idld3b4y98ik75czdy580jmdg7mm"; depends=[doParallel foreach latex2exp]; }; mSimCC = derive2 { name="mSimCC"; version="0.0.1"; sha256="1f15r214srcdb4yacmy4hq890a674iqd2s7bry5dk20k46qdl026"; depends=[doParallel foreach]; }; mStats = derive2 { name="mStats"; version="3.2.2"; sha256="0bvv2133813qfqbqx45x7g3h82jkz8b322ldjj89x2wxc7alwmhs"; depends=[]; }; @@ -10012,10 +10032,11 @@ in with self; { mangoTraining = derive2 { name="mangoTraining"; version="1.0-7"; sha256="0lw46j44jhdcyh079a7zjmxcnv5c6qsfachinlwv3ild1gwggr3p"; depends=[]; }; manhattanly = derive2 { name="manhattanly"; version="0.2.0"; sha256="185fkakx4v35n4gmlpk2kfm2bm8p320q4khkw936m09zx3aqz398"; depends=[ggplot2 magrittr plotly]; }; manhplot = derive2 { name="manhplot"; version="1.1"; sha256="17yw10gpfp6bqmilb09v61jd2amz6cv1z38si4nqnhbvmac065qd"; depends=[ggplot2 ggrepel gridExtra reshape2]; }; + manifestoR = derive2 { name="manifestoR"; version="1.4.0"; sha256="1rnqm9s91q6kff951402zxl3cmnl8j19ybg9vmcmcm7bjbv5w2l0"; depends=[base64enc dplyr DT functional htmltools htmlwidgets httr jsonlite magrittr NLP psych tibble tm zoo]; }; manipulate = derive2 { name="manipulate"; version="1.0.1"; sha256="1klknqdfppi5lf6zbda3r2aqzsghabcsaxmvd3vw3cy3aa984zky"; depends=[]; }; manipulateWidget = derive2 { name="manipulateWidget"; version="0.10.1"; sha256="1vi71sjh7z1a880wffk8qqw7iysvk42q78giqxmm2sqz2a912qlx"; depends=[base64enc codetools htmltools htmlwidgets knitr miniUI shiny webshot]; }; manymodelr = derive2 { name="manymodelr"; version="0.2.4"; sha256="13d1lgz22wpvbn56m32w5m1w2gk2jz0p3m2130lmwain4nb9rsmk"; depends=[caret dplyr e1071 ggplot2 magrittr Metrics plyr purrr reshape2 tibble]; }; - maotai = derive2 { name="maotai"; version="0.1.4"; sha256="1kzhizprdq5fmvhm0s1qyn0kcrm5qkc6wjggvngr1bjpnh9kkds9"; depends=[cluster Matrix mclust Rcpp RcppArmadillo Rdpack RSpectra shapes]; }; + maotai = derive2 { name="maotai"; version="0.1.5"; sha256="08cww0hh3ry3sjxx9wwnddjgqyzfxpikif3wyhfpqdwlrbsrnk4j"; depends=[cluster labdsv Matrix Rcpp RcppArmadillo RcppDist Rdpack RSpectra Rtsne shapes]; }; mapReasy = derive2 { name="mapReasy"; version="1.0"; sha256="13va0z967ckwxnnianki5aj66km0x6r37nj4mz9qd3b0bps4g2kj"; depends=[Hmisc rgdal sp]; }; mapStats = derive2 { name="mapStats"; version="2.4"; sha256="18pp1sb9p4p300ffvmzjrg5bv1i7f78mhpggq83myc26c3a593na"; depends=[classInt colorspace Hmisc lattice maptools RColorBrewer reshape2 sp survey]; }; mapcan = derive2 { name="mapcan"; version="0.0.1"; sha256="1a4135wc1h4nzcv6xq0bg75i744wyq8p7q0ix7y2x2gb6s35w46k"; depends=[dplyr ggplot2 magrittr]; }; @@ -10031,10 +10052,10 @@ in with self; { maps = derive2 { name="maps"; version="3.3.0"; sha256="05i2ppl5z4p8rawgqmy3z4ia05fcblpq1vvrmrkgkkpdlhczx6hr"; depends=[]; }; mapsFinland = derive2 { name="mapsFinland"; version="0.1.1"; sha256="0kx9r28lvc6bbl478i9gyy58kbp5hi7akysyld87fxk5x0601j19"; depends=[]; }; mapsRinteractive = derive2 { name="mapsRinteractive"; version="1.0.0"; sha256="0lpmizhaan7zp201wjaq544wadizwpswch7sn6m3sjwn8rswg6av"; depends=[gstat raster rgdal rgeos sp]; }; - mapsapi = derive2 { name="mapsapi"; version="0.4.2"; sha256="1l7sp65ghdcli6ajkvlnhfizjq16mw2cmlf8jbif3al1vhbv4dvw"; depends=[bitops magrittr plyr sf xml2]; }; + mapsapi = derive2 { name="mapsapi"; version="0.4.5"; sha256="0qgdlwgc3rmkpdam4mk7jbs79l5mnzjxz5a763icvr1clgna6xn2"; depends=[bitops magrittr RgoogleMaps sf stars xml2]; }; maptools = derive2 { name="maptools"; version="0.9-9"; sha256="0v4llkxk8qs61vq4ykvaim4k23aagdaz0p62ns7zfq02sln3pfk9"; depends=[foreign lattice sp]; }; maptree = derive2 { name="maptree"; version="1.4-7"; sha256="1k7v84wvy6wz6g0dyiwvd3lvf78rlfidk60ll4fz7chvr2nrqdp4"; depends=[cluster rpart]; }; - mapview = derive2 { name="mapview"; version="2.7.0"; sha256="1cqa7hw7h0n6ing87bq903ax2m4iw82xb2jdgl55z9v9rdhxp0xh"; depends=[base64enc brew htmltools htmlwidgets lattice leafem leaflet leafpop png raster Rcpp satellite scales sf sp svglite uuid viridisLite webshot]; }; + mapview = derive2 { name="mapview"; version="2.7.8"; sha256="1hj9yx85jskmh6qm5ljzjlkxcwjffvswlgi453kn2rp7xzxbyv9b"; depends=[base64enc htmltools htmlwidgets lattice leafem leaflet leafpop png raster satellite scales sf sp viridisLite webshot]; }; mar1s = derive2 { name="mar1s"; version="2.1.1"; sha256="1ljkvgxrramfx1rnp2rg6516mjxaa6s96amrnmqymnyjz7wlf37l"; depends=[cmrutils fda zoo]; }; march = derive2 { name="march"; version="3.1"; sha256="1y3ndnkxrqxavp7b5dwhn1mijhhn06k5b6iickzjr4bfmpfnk340"; depends=[]; }; marcher = derive2 { name="marcher"; version="0.0-2"; sha256="0hcxbfrwniih4kvx5sxhlffz1pc87kf52v8hvaf193rhhdykis5q"; depends=[magrittr Matrix minpack_lm mvtnorm numDeriv plyr RColorBrewer scales zoo]; }; @@ -10081,7 +10102,7 @@ in with self; { matrixcalc = derive2 { name="matrixcalc"; version="1.0-3"; sha256="1c4w9dhi5w98qj1wwh9bbpnfk39rhiwjbanalr8bi5nmxkpcmrhp"; depends=[]; }; matrixpls = derive2 { name="matrixpls"; version="1.0.9"; sha256="13wsd0kbn77mjd5rkfdv9di8pxg898adrgdpqcyridvikjhqlh0j"; depends=[assertive lavaan MASS matrixcalc psych]; }; matrixsampling = derive2 { name="matrixsampling"; version="2.0.0"; sha256="05dbn7rj07jx1hj7i6k3akf11hysxg6v32kav9fvsqmiy2zkippa"; depends=[keep]; }; - matsbyname = derive2 { name="matsbyname"; version="0.4.12"; sha256="0pryr18xz06w9jlnq2wcy0nddlr456zqwcc4d8bfj1mm3mr9q9j7"; depends=[dplyr Hmisc magrittr purrr rlang tibble]; }; + matsbyname = derive2 { name="matsbyname"; version="0.4.13"; sha256="1sx6nqqndfs39dkim9c5gqxl4afacq2wkcnrj95byl5a24s3sw5d"; depends=[dplyr Hmisc magrittr purrr rlang tibble]; }; matsindf = derive2 { name="matsindf"; version="0.3.4"; sha256="0r8hs53c4xv7lldz8mzh3hy5jq64c3cza9yifjjzpwvlw42y631l"; depends=[dplyr magrittr matsbyname purrr rlang rlist tibble tidyr]; }; mau = derive2 { name="mau"; version="0.1.2"; sha256="1wgiai8f1kbjh9hfwv4m0kavd44ib5xb33p8m16zpawnw14m7sj5"; depends=[data_table ggplot2 gtools igraph RColorBrewer Rdpack stringr]; }; mauricer = derive2 { name="mauricer"; version="2.0.5"; sha256="01x1cigwr95hzyz1pm9w5xi2j9z4zf54p6bwhn0y865gln80wvnz"; depends=[beastier stringr]; }; @@ -10130,7 +10151,7 @@ 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.5"; sha256="0whandnda1fnjn5k3hgxdbp3b0xr7nlzy1j37saqb536h8q9dwkm"; depends=[]; }; + mclust = derive2 { name="mclust"; version="5.4.6"; sha256="1z46qask09x3xpv0wzvhn09218vwyrip4f5jrhnx96khpwvczzyl"; depends=[]; }; mclustcomp = derive2 { name="mclustcomp"; version="0.3.1"; sha256="0jdfdmgd46w7b38nbpd0lj9vqzi2nnf8fv0crj08lfin5ng7jvaa"; depends=[Rcpp RcppArmadillo Rdpack]; }; mcmc = derive2 { name="mcmc"; version="0.9-7"; sha256="0q42m8ab7b6bxhns494ksjdss5f3c5m2jjfdlfj6fk1nz7ax7i5p"; depends=[]; }; mcmcabn = derive2 { name="mcmcabn"; version="0.3"; sha256="0p4g7bnaq87kgfhsc3a8wdifngs4lb5il5wy9im81gz30ji9gbn7"; depends=[abn coda cowplot ggplot2 ggpubr gRbase]; }; @@ -10174,7 +10195,6 @@ in with self; { measurements = derive2 { name="measurements"; version="1.4.0"; sha256="1kihavs9vgxwqjm9z1zjjngkmcwfsv8dg7nn9nrv5r06k5hv8bz6"; depends=[]; }; measures = derive2 { name="measures"; version="0.2"; sha256="1pp6nz30fbsqsvznim9j4vvz3z57sq5r234807flxfy0w7knydbd"; depends=[]; }; meboot = derive2 { name="meboot"; version="1.4-7"; sha256="1i0h71aj49hyj889447s611gz668ys7xlr1i82b5nvaf6chfbfin"; depends=[dynlm nlme]; }; - mechkar = derive2 { name="mechkar"; version="1.14.6"; sha256="1yrxp0qkfr96sf8lprn33cjfjmpkhpw0wpbz7w2600a923zdhwqc"; depends=[car coxphw dplyr ggplot2 givitiR gmodels Hmisc InformationValue MASS pROC ResourceSelection rlang ROSE tibble writexl]; }; medExtractR = derive2 { name="medExtractR"; version="0.1"; sha256="08hzl5kk3jqs8vc53zrd1qj5g24dkpvwwvswqp57719c4ybi3ia3"; depends=[stringr]; }; mederrRank = derive2 { name="mederrRank"; version="0.0.8"; sha256="1fvvik3bhjm6c0mhi2ma915986k2nj3lr2839k5hfrr7dg3lw3f4"; depends=[BB numDeriv]; }; medfate = derive2 { name="medfate"; version="0.9.0"; sha256="0vxrj9x9f975vxfjsv83riyazlvbpn5q9z49ywnayiikn1snbrnh"; depends=[ggplot2 meteoland Rcpp sp spdep]; }; @@ -10212,7 +10232,7 @@ in with self; { merlin = derive2 { name="merlin"; version="0.0.2"; sha256="0r1hxbpqhih0nyya26hphymz4jrw88zfd3bypf1hwj5dsk60341f"; 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.6.0"; sha256="0z2s84i953l5wa0pa9zkspk4hjjgrd9j2ssn5ahgqriqg65w29q2"; depends=[checkmate data_table digest fields Formula formula_tools ggplot2 gtable lubridate memoise plyr purrr scales sp stringr]; }; + metR = derive2 { name="metR"; version="0.7.0"; sha256="0zdnsggvmkyxq0a6n7rhzp82n4hciayzajs4svw504i30ij5q5db"; depends=[checkmate data_table digest fields Formula formula_tools ggplot2 gtable lubridate memoise plyr purrr RCurl scales sp stringr]; }; metRology = derive2 { name="metRology"; version="0.9-28-1"; sha256="1syjwblyd18myxrs0hx4m91fgb6zs3r4g7w701j2f2pw6j9mvz0y"; depends=[MASS numDeriv robustbase]; }; metScanR = derive2 { name="metScanR"; version="1.2.3"; sha256="1v7zrxj3wspx6f5n5s75skcygbf3r85rn4p0z9iwbrbrgxwi4qgs"; depends=[geosphere leaflet matlab plyr RCurl]; }; meta = derive2 { name="meta"; version="4.11-0"; sha256="06miv0yjxqxabi9iff08hydzb6qjdahy3dswxgkdp5zybma6dva6"; depends=[CompQuadForm lme4 metafor]; }; @@ -10240,27 +10260,27 @@ in with self; { metaforest = derive2 { name="metaforest"; version="0.1.3"; sha256="1q6m60cd7gl7y0gdjd10ky25hwv5jc4x5g5sr5w61xc3j2hnw8in"; depends=[data_table ggplot2 gtable metafor ranger]; }; metafuse = derive2 { name="metafuse"; version="2.0-1"; sha256="1zdw22f5kzvy2xr3c2csy873hcags60as567brc2sw17d0apfy8j"; depends=[evd glmnet MASS Matrix]; }; metagam = derive2 { name="metagam"; version="0.1.0"; sha256="1mya00bvbxz3fg506s4km1193yamgzqqq8v6v286jcp19w4jr07s"; depends=[dplyr furrr ggplot2 knitr metafor metap purrr rlang stringr tibble tidyr viridis]; }; - metagear = derive2 { name="metagear"; version="0.5"; sha256="12q8g8dwz3xb31kqlj9d2k8czmkibcr3ll9s0xdl756pf5408l6y"; depends=[EBImage hexView MASS Matrix metafor RCurl stringr]; }; + metagear = derive2 { name="metagear"; version="0.6"; sha256="1xfpjqawnwsg2djnygzyg6ak7gylj60wlhfkkipnrpy8bbpvc8j2"; depends=[EBImage hexView MASS Matrix metafor RCurl stringr]; }; metagen = derive2 { name="metagen"; version="1.0"; sha256="0jvbm22976aqvmfnjzs51n2w099yj5hpx6hd0pgvbia80jk7b9vk"; depends=[BatchExperiments BatchJobs BBmisc ggplot2 lhs MASS metafor ParamHelpers plyr]; }; metaheuristicOpt = derive2 { name="metaheuristicOpt"; version="2.0.0"; sha256="0ra4hl9l1jlzymj218m2i6xrxfacyx4aaln5pk7q4di2ks0nq11m"; depends=[]; }; metamedian = derive2 { name="metamedian"; version="0.1.5"; sha256="1v2nha2qc9vs2s9nfvbia033ppprkwxj5fadlrpy20fj2lr8z7z6"; depends=[estmeansd Hmisc metafor]; }; metamer = derive2 { name="metamer"; version="0.2.0"; sha256="0wdhr83mph9v7vb9mfhf7lcwmp0smz72sniass7kxcbj6j9hga4g"; depends=[FNN progress]; }; metamicrobiomeR = derive2 { name="metamicrobiomeR"; version="1.1"; sha256="16ymdhhr7h2785gfgrw7qi1fjvawiz599h42qi7l0v6djinbxlw2"; depends=[caret compositions dplyr foreign gamlss gdata ggplot2 gplots gridExtra httr jsonlite knitr lme4 lmerTest magrittr matrixStats meta mgcv plyr randomForest RColorBrewer RCurl repmis reshape2 rmarkdown tidyr zCompositions]; }; metamisc = derive2 { name="metamisc"; version="0.2.2"; sha256="0ll245a3f442n7jyjshcn87l725mgk132ri73kynrwh0z8g2r7i5"; depends=[ggplot2 lme4 metafor mvtnorm plyr pROC]; }; - metan = derive2 { name="metan"; version="1.4.0"; sha256="0wzq2r22yzi7cr2algxq4fgmz58hv8zhk03r3qzhdvvxrm66rd9q"; depends=[ade4 cowplot dendextend dplyr FWDselect GGally ggforce ggplot2 ggrepel lme4 lmerTest magrittr progress purrr rlang tibble tidyr tidyselect]; }; - metansue = derive2 { name="metansue"; version="2.3"; sha256="18vy294862lfgxiw9cikai9svy3wpwk2bvz3vp20fcslg90mn3xp"; depends=[]; }; + metansue = derive2 { name="metansue"; version="2.4"; sha256="1ja7a3z4d764a1rcf256kmzf8xc6d8x7mqq12vzznw5ks8r2p9hk"; depends=[]; }; metap = derive2 { name="metap"; version="1.3"; sha256="1jmmmmjiklaxfl604hwqil193ydaghvd5jv8xsr4bx3pzn5i9kvz"; depends=[lattice mutoss Rdpack TFisher]; }; metaplot = derive2 { name="metaplot"; version="0.8.3"; sha256="1zw8bq2fy9m15dfc92ag0dz2k9dqrf5jbvfaycizcgsgaqd79s1c"; depends=[dplyr encode ggplot2 gridExtra gtable lattice magrittr rlang scales tidyr]; }; metaplotr = derive2 { name="metaplotr"; version="0.0.3"; sha256="01iala6cxsxv30fnlh80md5mpy3ksd2piw90zcls8f68g1c6v1jy"; depends=[ggplot2 gridExtra]; }; metaplus = derive2 { name="metaplus"; version="0.7-11"; sha256="05pkgw0zlq3q9mvdw2yxz9mxzqwq3c8q6cwvh87cigw1pf8y9an7"; depends=[bbmle boot fastGHQuad lme4 MASS metafor numDeriv]; }; metapost = derive2 { name="metapost"; version="1.0-6"; sha256="098f7sifg814mc4sb1nb4d6dlr1xms5hwyp08ksxg0i4ayf9jf3c"; depends=[gridBezier]; }; + metapower = derive2 { name="metapower"; version="0.1.0"; sha256="0y1s7szljpx763dm38nnm5q54x7paq0hn7l47c3vyjha99fpzzjw"; depends=[cowplot dplyr ggplot2 knitr magrittr rlang rmarkdown testthat tidyr]; }; metapro = derive2 { name="metapro"; version="1.5.8"; sha256="0ymbqzm317fiywzxaizddhvjzwp2wyx9y7zgbg4nrz11l3r2bp2n"; depends=[metap rSymPy]; }; metarep = derive2 { name="metarep"; version="1.0.1"; sha256="0jnxx11jxj63ry0bkjlh9g2x2pr2qi24nql99iibz2ckbx8344p3"; depends=[meta]; }; metasens = derive2 { name="metasens"; version="0.4-0"; sha256="1rgb2b48lwvrg1f39dzg6d9jr1ya2p7la2jrc3zs3jks28arjr2x"; depends=[meta]; }; metatest = derive2 { name="metatest"; version="1.0-5"; sha256="1h3dcs1m7606b3a41yw2lak3lrqmsbpnx67qv24wvq003apz1sfd"; depends=[]; }; metathis = derive2 { name="metathis"; version="1.0.2"; sha256="07aha4j401zlm6abfmq70vqc215bpsi5hqi50npz33rpb1m3r9rq"; depends=[htmltools knitr magrittr purrr]; }; metavcov = derive2 { name="metavcov"; version="1.1"; sha256="1x87knvypkfg0x223aiak7fy7zdlfn74crmvnqzhxf2vmxljnvnh"; depends=[corpcor]; }; - metaviz = derive2 { name="metaviz"; version="0.3.0"; sha256="1ayz9za3zwmyna1hanzm83gb7vw3dclj3z4g35rk5dz6s4zgqsvm"; depends=[dplyr ggplot2 ggpubr gridExtra metafor nullabor RColorBrewer]; }; + metaviz = derive2 { name="metaviz"; version="0.3.1"; sha256="0jvv49rw66v7saj2y1q88rp6fyzq7473af5d3k77ymvjbpqyrbyz"; depends=[dplyr ggplot2 ggpubr gridExtra metafor nullabor RColorBrewer]; }; metawho = derive2 { name="metawho"; version="0.2.0"; sha256="1mflkrlnb1wk9vbbj621cy64s78q677d8fcnsi1ybh49k7sqmw20"; depends=[dplyr forestmodel magrittr metafor purrr rlang]; }; meteR = derive2 { name="meteR"; version="1.2"; sha256="02637d3dnfq0jv9d74y99x7ms89y3jcmkpazc44g44sa7jx4i510"; depends=[distr nleqslv]; }; meteo = derive2 { name="meteo"; version="0.1-5"; sha256="0n37plka9vsxwd03lca3h6m8dcz3f1bi46jn3bz7vyilnkq9hcdk"; depends=[gstat plyr raster rgdal snowfall sp spacetime]; }; @@ -10279,14 +10299,14 @@ in with self; { mexhaz = derive2 { name="mexhaz"; version="1.7"; sha256="1z0516i7asyn3248xzvvc377slcy2zv6f9qalkd33r3dlc0js4s8"; depends=[lamW MASS numDeriv statmod survival]; }; mfGARCH = derive2 { name="mfGARCH"; version="0.1.9"; sha256="0vmxyjg2jj39dd1307d5jwz3033j8ldfqhysmmzl3i1b5ypfd5q5"; depends=[maxLik numDeriv Rcpp zoo]; }; mfbvar = derive2 { name="mfbvar"; version="0.5.3"; sha256="065bpwlzqmvgrdm9jp8030jcs4sqnckyxvrgdn0jcnmmgiq88vgx"; depends=[dplyr ggplot2 GIGrvg lubridate magrittr Rcpp RcppArmadillo RcppParallel RcppProgress stochvol tibble]; }; - mfe = derive2 { name="mfe"; version="0.1.4"; sha256="1lif39zr6x1ysv8s90b1wgshp5pa175fxcjvx0hz6g15d29gwgy6"; depends=[cluster clusterCrit e1071 ECoL infotheo MASS rpart rrcov]; }; + mfdb = derive2 { name="mfdb"; version="6.2-0"; sha256="11xi915plc90awasmny9ynwmz0yw18frfp1q2xv7bqk4v96fcxgp"; depends=[DBI getPass logging RPostgreSQL]; }; mfp = derive2 { name="mfp"; version="1.5.2"; sha256="1i90ggbyk2p1ym7xvbf4rhyl51kmfp6ibc1dnmphgw15wy56y97a"; depends=[survival]; }; mfx = derive2 { name="mfx"; version="1.2-2"; sha256="04pwp67i4sn4rf497pgy6qifwvrcmwyxn8x5sn96fy8qyrdzjfhj"; depends=[betareg lmtest MASS sandwich]; }; mgarchBEKK = derive2 { name="mgarchBEKK"; version="0.0.2"; sha256="1k4c34srnckbh5kchzmm44l91ma9sw0gi4y225igs3cl79212q9c"; depends=[mvtnorm tseries]; }; mgcViz = derive2 { name="mgcViz"; version="0.1.6"; sha256="12isaqpbhdg2qhw76wj6hqi233dw3md061bbirkgzr5clrb8kxlk"; depends=[gamm4 GGally ggplot2 gridExtra KernSmooth matrixStats mgcv miniUI plyr qgam rgl shiny viridis]; }; mgcv = derive2 { name="mgcv"; version="1.8-31"; sha256="1if34mqsn9r7g0l82lxvvx0wjhi9paqdymyd73nschxcl1if8vbk"; depends=[Matrix nlme]; }; mglmn = derive2 { name="mglmn"; version="0.0.2"; sha256="1ijkmr85s4yya0hfwcyqqskbprnkcbq8sc9c889i0gy0543fgqz4"; depends=[mvabund snowfall]; }; - mgm = derive2 { name="mgm"; version="1.2-7"; sha256="1s0m9xjq2d067ba2cx87q83nqmdza34vw9g0g0mqd8ap53rmqhas"; depends=[glmnet gtools Hmisc matrixcalc qgraph stringr]; }; + mgm = derive2 { name="mgm"; version="1.2-9"; sha256="0fbri6a6g36cpqw577hdmy2qyj8hd2zkaafj7s5564y1z7xkxn4x"; 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.1"; sha256="0v3386a7i71ixqidqfqakl428rnq0z9pjz08lgmyvray0ls5vmvi"; depends=[]; }; mgwrsar = derive2 { name="mgwrsar"; version="0.1"; sha256="13h56fgq3fs28fqh19hwbcza622xd921qnjwcgw2rjwaabqz70w5"; depends=[doParallel foreach htmltools leaflet Matrix nabor Rcpp RcppEigen sp spgwr]; }; @@ -10329,7 +10349,7 @@ in with self; { midas = derive2 { name="midas"; version="1.0.1"; sha256="1alqxk23651jnkg0xn4rpvk71z5rhvx3y0wjrgkw2qw95s7jjn72"; depends=[shiny xml2]; }; midasr = derive2 { name="midasr"; version="0.7"; sha256="02kjyzbznmy0362ambnnh8vc7ywbgikk3n7705sww9p0k0pywrrx"; depends=[forecast Formula MASS Matrix numDeriv optimx quantreg sandwich texreg zoo]; }; midastouch = derive2 { name="midastouch"; version="1.3"; sha256="1pjzcf0hjfhr5p0la8pz1njw7bhfrcrzpqfsdqk2z5c6dbh4awzq"; depends=[]; }; - midrangeMCP = derive2 { name="midrangeMCP"; version="1.3"; sha256="1733dlhzbgrjdzd88rh9dkqhxh05gr078sbmihab7whbrpsq8068"; depends=[SMR WriteXLS xtable]; }; + midrangeMCP = derive2 { name="midrangeMCP"; version="2.1"; sha256="0blvwyvvv5gvnwnlawmqyj00ziwchxk9f39f5nc8d066pwh3mcw4"; depends=[gWidgets gWidgetsRGtk2 pacman SMR writexl xtable]; }; migest = derive2 { name="migest"; version="1.8.1"; sha256="12gk1ip1kw3x35bazxqqjf1drbs2h7kpgzbh5psd6ppphj81dzjg"; depends=[dplyr magrittr mipfp purrr stringr tidyr]; }; migration_indices = derive2 { name="migration.indices"; version="0.3.0"; sha256="0h0yjcj70wzpgrv3wl1f2h2wangh1klsllq0i0935plgzw736mwd"; depends=[calibrate]; }; migui = derive2 { name="migui"; version="1.1"; sha256="1qchjsc7ff2b6s9w6ncj9knjv6pyp90jd4jxljn2rr1ix1gc45za"; depends=[arm gWidgets2 mi]; }; @@ -10339,7 +10359,7 @@ in with self; { mime = derive2 { name="mime"; version="0.9"; sha256="107sqarmyhxlch5nrg796i5z03p9mshskisiq2fm628ajk99gkrc"; depends=[]; }; mimi = derive2 { name="mimi"; version="0.2.0"; sha256="1ig34qd37my74nmlv3jcfrj7cnd55alxpf2flf2sssk2ws1y56xh"; depends=[data_table doParallel FactoMineR foreach glmnet rARPACK softImpute]; }; mimsy = derive2 { name="mimsy"; version="0.4.3"; sha256="1mj0g2j0fw3j36r59yad7bfqhpjl1mjlca9fmmvxfjr878b4ld5g"; depends=[dplyr lubridate magrittr openxlsx]; }; - minMSE = derive2 { name="minMSE"; version="0.1.1"; sha256="11m34nmxi2v80lsix8k44vl8ms5541js4av6h3pvx11px3i3c841"; depends=[MASS]; }; + minMSE = derive2 { name="minMSE"; version="0.3.1"; sha256="0xzd2hw7ga5fi54d35vr9n3sbnp6acak27fl4lv089sn1ig6s95p"; depends=[MASS]; }; mindr = derive2 { name="mindr"; version="1.2.3"; sha256="1slglva5ipbzj748k7rxvlw6g2iqdkvyf8qnplnzcjc2qsjljd1q"; 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-2"; sha256="1py6gylya8dhmxcyfrcwbwc5q226m041rs3cmj4q0dhqy8iy2zsw"; depends=[Rcpp RcppEigen]; }; @@ -10360,7 +10380,8 @@ in with self; { minxent = derive2 { name="minxent"; version="0.01"; sha256="1a0kak4ff1mnpvc9arr3sihp4adialnxxyaacdgmwpw61wgcir7h"; depends=[]; }; mipfp = derive2 { name="mipfp"; version="3.2.1"; sha256="1gxazpg81vj5dywpb6jb29188jw28qil6pfygawa7znnjn3k5ca6"; depends=[cmm numDeriv Rsolnp]; }; mipred = derive2 { name="mipred"; version="0.0.1"; sha256="0kijn2xj0dh28rm2sjgd8j1a3c5avc3fjfvvcmzfasvxqdjflv6j"; depends=[mice]; }; - mirt = derive2 { name="mirt"; version="1.31"; sha256="1jfpb69ih0kyffjf9k7z8yhfyw6ngqhkjxmpzgmm0v8lr2mnw0gq"; depends=[dcurver Deriv GPArotation lattice mgcv Rcpp RcppArmadillo vegan]; }; + miraculix = derive2 { name="miraculix"; version="0.9.20"; sha256="0s5r7ikym3s85706wznfc3lh3ap95pv1p2796bi1n19ivd671myc"; depends=[RandomFieldsUtils]; }; + mirt = derive2 { name="mirt"; version="1.32"; sha256="14xijqfyvhp7272n8h89kayi7va3cn2j02gw0fdxivfjlbqa03d2"; depends=[dcurver Deriv GPArotation lattice mgcv Rcpp RcppArmadillo vegan]; }; mirtCAT = derive2 { name="mirtCAT"; version="1.9.3"; sha256="1yd03rkviqxl9rsqnny3fgn2rj0hss49nav11b9w4np8lv9zkwgh"; depends=[lattice lpSolve markdown mirt pbapply Rcpp RcppArmadillo shiny]; }; misaem = derive2 { name="misaem"; version="0.9.2"; sha256="0awn0dvriycgmrx31ibckwjm2cq1wxrqjjjaq0bjgjsl37f4xnkk"; depends=[MASS mvtnorm]; }; misc3d = derive2 { name="misc3d"; version="0.8-4"; sha256="0qjzpw3h09qi2gfz52b7nhzd95p7yyxsd03fldc9wzzn6wi3vpkm"; depends=[]; }; @@ -10415,7 +10436,7 @@ in with self; { mixor = derive2 { name="mixor"; version="1.0.4"; sha256="1l296z0a3kamb1m94pfx3vczp36pa0np101fy5c23kh45s59pbs7"; depends=[survival]; }; mixreg = derive2 { name="mixreg"; version="0.0-6"; sha256="04g863yxrlj0wqsmzzxph5110g3gjk094r59zzk0b9r89m8vhpsl"; depends=[]; }; mixsep = derive2 { name="mixsep"; version="0.2.1-2"; sha256="1ywwag02wbx3pkd7h0j9aab44bdmwsaaz0p2pcqn1fs3cpw35wa2"; depends=[MASS RODBC tcltk2]; }; - mixsmsn = derive2 { name="mixsmsn"; version="1.1-6"; sha256="0zlbs0yn336xdzymrb065rbg1zj8f7zri77lmd7c4w1rxhfjh9a9"; depends=[mvtnorm]; }; + mixsmsn = derive2 { name="mixsmsn"; version="1.1-7"; sha256="1xw8bxkivp50ax0ygsravmzmksdqqg9fdm3hwpl39ikhj0cpa7zr"; depends=[mvtnorm]; }; mixsqp = derive2 { name="mixsqp"; version="0.3-17"; sha256="0dmk5xpgq55bwdjfrnv6frfx708frszscx03h8l9cdsj3l1d002n"; depends=[irlba Rcpp RcppArmadillo]; }; mixtNB = derive2 { name="mixtNB"; version="1.0"; sha256="0lqbm1yl54zfs0xcmf3f2vcg78rsqyzlgvpydhmhg7x6dkissb22"; depends=[]; }; mixtools = derive2 { name="mixtools"; version="1.2.0"; sha256="08whic8hmmzi55b7azwj11l2x5r9s5qbyrv7s9jr08156vqkw0zg"; depends=[kernlab MASS segmented survival]; }; @@ -10424,7 +10445,7 @@ in with self; { mize = derive2 { name="mize"; version="0.2.3"; sha256="1rc3mhcwidmfbkfyxwldm9hg25lh7a81jlj2zv45vsj5hbrmvk6c"; depends=[]; }; mizer = derive2 { name="mizer"; version="2.0.0"; sha256="152bjz37b1sjg1x9sl6286hisk2qpcckfh4gxw1wbdn7kh99law1"; depends=[assertthat deSolve dplyr ggplot2 plotly plyr progress Rcpp reshape2]; }; mkde = derive2 { name="mkde"; version="0.1"; sha256="04v84arpnmjrkk88ffphnhkz32x7y0dypk75jfmbbgcgv59xlglv"; depends=[raster Rcpp sp]; }; - mkin = derive2 { name="mkin"; version="0.9.49.9"; sha256="14wnmyrhf6b6cswgfv1a8caji1zk2r1xphg59fgw7527zbdzqm0r"; depends=[deSolve inline lmtest numDeriv pkgbuild R6]; }; + mkin = derive2 { name="mkin"; version="0.9.49.11"; sha256="1palzxv5vyk5hnc09mwja3xz42r3mqpqlcn5rc8kxkm4kg0z3v4c"; depends=[deSolve inline lmtest nlme numDeriv pkgbuild purrr R6]; }; mknapsack = derive2 { name="mknapsack"; version="0.1.0"; sha256="1kzmx7d512681a4hjirfgcd7a8rvndb4da66p16gms5nnxzsby9c"; depends=[assertthat data_table lpSolve]; }; mkssd = derive2 { name="mkssd"; version="1.1"; sha256="1qqzy6fn6sc3lxahc19hzzf1hzxsyvxqi7npynw0vkknlrvh2ijp"; depends=[]; }; mlPhaser = derive2 { name="mlPhaser"; version="0.01"; sha256="1s2mqlnbcjdkx0ghvr2sw9rzggqa4jy2vzi9vbyqkh6795lgck6n"; depends=[]; }; @@ -10442,7 +10463,7 @@ in with self; { mlergm = derive2 { name="mlergm"; version="0.5"; sha256="145004r8xihphsng8pna430a8rqg0ibqx92jwyjkn7hzpx17p7xf"; depends=[cowplot ergm GGally ggplot2 lpSolve Matrix network plyr reshape2 sna stringr]; }; mleur = derive2 { name="mleur"; version="1.0-6"; sha256="0mddphq3b6y2jaafaa9y41842kcaqdl3dh7j4pva55q2vcjcclj7"; depends=[fGarch lattice stabledist urca]; }; mlf = derive2 { name="mlf"; version="1.2.1"; sha256="09ihnibpknpp26hdlbxyr99yz7z0n8qpsjs5aq3zngng0yh3wdn9"; depends=[]; }; - mlflow = derive2 { name="mlflow"; version="1.7.0"; sha256="1hdqdwj8j59a2x15alihv0p8hz4hlr9pk6c1qkyimcgfbvj8py04"; depends=[base64enc forge fs git2r glue httpuv httr ini jsonlite openssl processx purrr reticulate rlang swagger tibble withr xml2 yaml zeallot]; }; + mlflow = derive2 { name="mlflow"; version="1.8.0"; sha256="03pdn05zgiz8plgf69nw4ji1fkzphampn7pk7ljf6w5dssznjja9"; depends=[base64enc forge fs git2r glue httpuv httr ini jsonlite openssl processx purrr reticulate rlang swagger tibble withr xml2 yaml zeallot]; }; mlgt = derive2 { name="mlgt"; version="0.16"; sha256="1nvdq6mvgr39ikkf73aggsb6pmbw132injj8fdkr8hgcmwm6lgd9"; depends=[seqinr]; }; mlica2 = derive2 { name="mlica2"; version="2.1"; sha256="0c3m1zd9x99n6lw12hfzmd59355z51xa8rhg1h7qwfn9p86r826f"; depends=[]; }; mlmRev = derive2 { name="mlmRev"; version="1.0-8"; sha256="0ln4nazhc1prnlmvhfzhx268vx3klb0xnz1nsiwh0pwyskskyzym"; depends=[lme4]; }; @@ -10454,15 +10475,15 @@ in with self; { mlogit = derive2 { name="mlogit"; version="1.0-3.1"; sha256="034vymf296abpajkic303j0x4mak62m8iav86k3d3g6hy3c03dp4"; depends=[Formula lmtest MASS Rdpack statmod zoo]; }; mlogitBMA = derive2 { name="mlogitBMA"; version="0.1-6"; sha256="1wl8ljh6rr1wx7dxmd1rq5wjbpz3426z8dpg7pkf1x9wr94a2q25"; depends=[abind BMA maxLik]; }; mlr = derive2 { name="mlr"; version="2.17.1"; sha256="0fwjl5dy516vrh2lx5rgps85q0jz8ka5dx61bz7lfxk21k8bjw8b"; depends=[backports BBmisc checkmate data_table ggplot2 parallelMap ParamHelpers stringi survival XML]; }; - mlr3 = derive2 { name="mlr3"; version="0.1.8"; sha256="02928qw5yc2zhfj69zrnmz0zraq2xf5vb7q7d11np2wdb0vsj1zk"; depends=[backports checkmate data_table digest lgr mlbench mlr3measures mlr3misc paradox R6 uuid]; }; + mlr3 = derive2 { name="mlr3"; version="0.2.0"; sha256="049wabal63560k0mlhn0rwydd50kjwlz56xygyqd18hhfjcnf6m1"; depends=[backports checkmate data_table digest lgr mlbench mlr3measures mlr3misc paradox R6 uuid]; }; mlr3data = derive2 { name="mlr3data"; version="0.1.0"; sha256="0cdicfrrmba87adkcnpzm9gkcspjskqsbs8xryj1d0c48lzws7ab"; depends=[]; }; mlr3db = derive2 { name="mlr3db"; version="0.1.5"; sha256="09hins00pc569vz26mkyg3736vhl01szl8hbwp2vyrh3mdn21c9m"; depends=[backports checkmate data_table digest dplyr mlr3 R6]; }; mlr3filters = derive2 { name="mlr3filters"; version="0.2.0"; sha256="1dps9v4w82qnhvlrshwpaqppjmy405syp4qdirm456ydfw2gywcy"; depends=[backports checkmate data_table mlr3 mlr3misc paradox R6]; }; - mlr3learners = derive2 { name="mlr3learners"; version="0.1.6"; sha256="1wifc8757klkcb84pvs602wa3kc2n7g4vz0m63a83vgxwghlpp6q"; depends=[data_table mlr3 mlr3misc paradox R6]; }; + mlr3learners = derive2 { name="mlr3learners"; version="0.2.0"; sha256="1r9f31wlhqwpslb2sgj6x3akggqdmnglb3s44zfhy6mqi1fwdgxn"; depends=[data_table mlr3 mlr3misc paradox R6]; }; mlr3measures = derive2 { name="mlr3measures"; version="0.1.3"; sha256="1hvhpshmdd76136srndd60d5xijpil5daf392y9lalqq0if6903d"; depends=[checkmate]; }; - mlr3misc = derive2 { name="mlr3misc"; version="0.1.8"; sha256="168d6az4paf3am4id6c9dnsyggnac3ccazr14594zs87a6cv87mn"; depends=[backports checkmate data_table R6]; }; + mlr3misc = derive2 { name="mlr3misc"; version="0.2.0"; sha256="0gynix0l0dzx6zjkw4fmb1rcyfp5vf4hvszf4ny2aqv3pggb03a8"; depends=[backports checkmate data_table R6]; }; mlr3pipelines = derive2 { name="mlr3pipelines"; version="0.1.3"; sha256="0qkhd4gcfh3higz0zqgrblxj70pszg8xb6l5flwp08hlwj1cw44j"; depends=[backports checkmate data_table digest mlr3 mlr3misc paradox R6 withr]; }; - mlr3proba = derive2 { name="mlr3proba"; version="0.1.4"; sha256="13bmpn20hkh19lhp6hpi9lbz8y5fily2mr5j931dm7839zc735q4"; depends=[checkmate data_table distr6 mlr3 mlr3misc mlr3pipelines paradox R6 survival]; }; + mlr3proba = derive2 { name="mlr3proba"; version="0.1.5"; sha256="1vnykzqbd27qaknxkcji17ld81z24hxwiw9d04m68vb8v62fkrag"; depends=[checkmate data_table distr6 mlr3 mlr3misc mlr3pipelines paradox R6 survival]; }; mlr3shiny = derive2 { name="mlr3shiny"; version="0.1.1"; sha256="0jn5n6k1dq59g5m6pvpp964pcjv1mjbdbdz7dag7gs26g8c215jb"; depends=[data_table DT e1071 mlr3 mlr3learners mlr3measures plyr purrr ranger readxl shiny shinyalert shinydashboard shinyjs shinythemes shinyWidgets stringr]; }; mlr3tuning = derive2 { name="mlr3tuning"; version="0.1.2"; sha256="0559jj4xbzg63df2rn0sw6r6fz5b463k2lcx83l4q3mki72pl9xx"; depends=[checkmate data_table lgr mlr3 mlr3misc paradox R6]; }; mlr3verse = derive2 { name="mlr3verse"; version="0.1.1"; sha256="1spwmylnsks479nkj688nd8h3slkh8cnmrxrvh7s2zyqla6arigx"; depends=[mlr3 mlr3db mlr3filters mlr3learners mlr3misc mlr3pipelines mlr3tuning mlr3viz paradox]; }; @@ -10505,6 +10526,7 @@ in with self; { mnormpow = derive2 { name="mnormpow"; version="0.1.1"; sha256="0z53vwhkhkkr6zrjhd3yr14mb02vh7lr63frf0ivajndxiap0s9v"; depends=[]; }; mnormt = derive2 { name="mnormt"; version="1.5-6"; sha256="0k8y08gj6z525yvc7y3dl2kzgnafbj3i7lvpamypsmqxf74zql99"; depends=[]; }; mnreadR = derive2 { name="mnreadR"; version="2.1.4"; sha256="11mfpf12pjpgvcih6q8l9fwspj2gy78fcirimzv7gn061nr4v7sg"; depends=[dplyr ggplot2 nlme tibble tidyr]; }; + mnt = derive2 { name="mnt"; version="1.0"; sha256="1an80q0gv65fd9av9kd5lic6z0g3w3ai2v8asgcvfqrdd87f3piw"; depends=[MASS pracma]; }; mob = derive2 { name="mob"; version="0.1.0"; sha256="0zxp02fl514wb3apcyg072wdydqbnbfqkjj9gq5ql1kkvgh9wqf8"; depends=[gbm Hmisc Rborist]; }; mobForest = derive2 { name="mobForest"; version="1.3.1"; sha256="1g5yfs70abl7pacprijlwdq3l72aqkbqs09z1pmw64wv4wa1vm25"; depends=[modeltools party sandwich strucchange zoo]; }; mobsim = derive2 { name="mobsim"; version="0.1.0"; sha256="077hw1162giwc90y5dvj9052i5hxdf2ii29m9q8ky028375dsd0f"; depends=[Rcpp sads vegan]; }; @@ -10524,8 +10546,9 @@ in with self; { modeest = derive2 { name="modeest"; version="2.4.0"; sha256="087dw0013y4m7fcl06mxylh9lnp6acysl80d80r9srv4pw4r950s"; depends=[fBasics stable stabledist statip]; }; modehunt = derive2 { name="modehunt"; version="1.0.7"; sha256="0qz9kmf1qfs2dr7kzm9l7ac0h5rvi3b9j9896p991sk4bcalsl0b"; depends=[]; }; model4you = derive2 { name="model4you"; version="0.9-5"; sha256="1l94196x594ff61f8iaywpmw9ra3g27bnlchjl14hb9h0l21vbgm"; depends=[Formula ggplot2 gridExtra partykit sandwich survival]; }; + modelDown = derive2 { name="modelDown"; version="1.1"; sha256="1l0aggkh0ykpqrp59bdz1cyl1ai397cw4hya80b7fm7s49imwczg"; depends=[archivist auditor breakDown DALEX devtools drifter DT ggplot2 kableExtra psych svglite whisker]; }; modelObj = derive2 { name="modelObj"; version="4.0"; sha256="1py2y80x37mmnl2y0pxdbhqkjrln6x210hg0g224d34lxk71m172"; depends=[]; }; - modelStudio = derive2 { name="modelStudio"; version="1.0.1"; sha256="0lghbxa27kyg1m8d3n8a6z9b248nzi4ahzvm221gbvxjgk0mrgi4"; depends=[iBreakDown ingredients jsonlite progress r2d3]; }; + modelStudio = derive2 { name="modelStudio"; version="1.0.2"; sha256="0n3hghhw255nfcfrngbbcldvfy96cc13qlim6palmaln4zqhxsi0"; depends=[digest iBreakDown ingredients jsonlite progress r2d3]; }; modelbased = derive2 { name="modelbased"; version="0.1.2"; sha256="0440pckpw9vfbvvhxsikayb0b6k479icr2m9ps0yr0xph240x9hw"; depends=[bayestestR emmeans insight parameters]; }; modeldata = derive2 { name="modeldata"; version="0.0.1"; sha256="0dzjgb5g60hgqppxvzin8m51clkw8d89if7dw5ha46j2paw1n5r9"; depends=[]; }; modeldb = derive2 { name="modeldb"; version="0.2.2"; sha256="14s8xh05qxv414xcnww1b3s0jqwnjb3l1dqf7q1qbw33ilwcmsfb"; depends=[dplyr ggplot2 progress purrr rlang tibble tidypredict]; }; @@ -10534,7 +10557,7 @@ in with self; { modelplotr = derive2 { name="modelplotr"; version="1.0.0"; sha256="1b1pcah28b2fsr5l7v3lwxgvl03jr2cyxk5x5plnc3vwy5g0bnpm"; depends=[dplyr ggfittext ggplot2 gridExtra magrittr RColorBrewer rlang scales]; }; modelr = derive2 { name="modelr"; version="0.1.6"; sha256="1x2m34m4qirb401krmgc5wg3g7ndbcglfab2l0655rmky3fz7rfp"; depends=[broom dplyr magrittr purrr rlang tibble tidyr tidyselect]; }; modelsummary = derive2 { name="modelsummary"; version="0.2.0"; sha256="16z9cdjdg8inp21sq54sc0s30w09draznq8x2zyg5cmsilrbn9p7"; depends=[broom checkmate dplyr generics gt magrittr purrr stringr tibble tidyr]; }; - modeltests = derive2 { name="modeltests"; version="0.1.0"; sha256="00g6jc41caxz2fqynv1pcwdabzwhppqmrrf2x4xzlxpf9sfxr919"; depends=[dplyr generics purrr testthat tibble]; }; + modeltests = derive2 { name="modeltests"; version="0.1.1"; sha256="0s6bnc2q0qxa3v92bsz5xczi4f9nhqz78vzb5jldjwlm4lwwy0xf"; depends=[dplyr generics purrr testthat tibble]; }; modeltools = derive2 { name="modeltools"; version="0.2-23"; sha256="1vqh69256h344sbj5affm0kmc77dakrxp6442xfdnfd0y5d8sgkb"; depends=[]; }; modelwordcloud = derive2 { name="modelwordcloud"; version="0.1"; sha256="0ardib0h923i7jk8bgcq6pn2zazx9acf9sdggifsk46hdz8hvqnm"; depends=[]; }; moderndive = derive2 { name="moderndive"; version="0.4.0"; sha256="16fbr80v0f5v6is19d5zh9s2qgqw2cb5q71lna7lp0hi22xljl98"; depends=[broom dplyr formula_tools ggplot2 glue infer janitor knitr magrittr rlang stringr tibble]; }; @@ -10543,14 +10566,12 @@ in with self; { modi = derive2 { name="modi"; version="0.1.0"; sha256="0v78vzb22v2h2qlfhsyi0d2j3c2gj3wgv67p6gv74269kiaglf92"; depends=[MASS norm]; }; modifiedmk = derive2 { name="modifiedmk"; version="1.5.0"; sha256="171l3ls7icaanqf6jb64jabwq0mis2g1fswr0jfkpkrw5iw1c66q"; depends=[boot]; }; modiscloud = derive2 { name="modiscloud"; version="0.14"; sha256="0vwhfp50yb21xkanvzk983vk0laflv60kj1ybx3fydfljwqx0rwj"; depends=[date raster rgdal sfsmisc sp]; }; - modmarg = derive2 { name="modmarg"; version="0.9.2"; sha256="1clyfvn5k87nyh5cj4b0yi2zkavwvnirhlirxkzi8m2qijdl9vgh"; depends=[]; }; modopt_matlab = derive2 { name="modopt.matlab"; version="1.0-2"; sha256="0g5mswalv4y7p1k3n8a6qf7wb072m4bjq2ml2j83dz2j2bmvygsd"; depends=[ROI ROI_plugin_glpk ROI_plugin_quadprog]; }; moduleColor = derive2 { name="moduleColor"; version="1.08-3"; sha256="183l968l49b7jbmvsjjnmk1xd36cpjkp777c00gw1f73h6nb2na8"; depends=[dynamicTreeCut impute]; }; modules = derive2 { name="modules"; version="0.8.0"; sha256="1xzlnnl4ka9h4qwq4gg65pzhacq9ip6v347yrhms14c86a851k8k"; depends=[]; }; modygliani = derive2 { name="modygliani"; version="1.0"; sha256="01g96cdm4hgbsh6xsdfjg7vp7zb138sxwgv0msrlm27a6p4fcnlx"; depends=[]; }; moezipfR = derive2 { name="moezipfR"; version="1.0.2"; sha256="0sfl1c7cvm1milcglcvz9lyvgricsdm7shx0jxyn50y7xz0padww"; depends=[tolerance VGAM]; }; mogavs = derive2 { name="mogavs"; version="1.1.0"; sha256="0lhmwdv991bv7j8k066jr7ii94w60ydjpf5pzmv8jlblf3w2pr02"; depends=[cvTools]; }; - mokken = derive2 { name="mokken"; version="3.0.0"; sha256="0fng0dh08f6h80z5q4gwkpkyinvhb52kf5i75gywhqz5cb2yfknl"; depends=[poLCA Rcpp]; }; moko = derive2 { name="moko"; version="1.0.2"; sha256="16hcr570h73ljgfb14pcli358m5vy022bqx1davn26z21n3ls44y"; depends=[DiceKriging DiceOptim emoa GenSA GPareto mco]; }; molaR = derive2 { name="molaR"; version="4.5"; sha256="1mfb05cfg0jh60yxnmwhja6m38185r58kbz2ak0ikgaqd9lls07s"; depends=[alphahull rgl Rvcg]; }; mombf = derive2 { name="mombf"; version="2.2.9"; sha256="0z7crgvl1c15s0pn6isa9i4phfsbhl6msc1jdbk88ckh09ilx0z7"; depends=[mclust mgcv mvtnorm ncvreg Rcpp RcppArmadillo survival]; }; @@ -10597,8 +10618,9 @@ in with self; { movecost = derive2 { name="movecost"; version="0.3"; sha256="0lrnk09sdbamxc4xhrkgggjcim1xhbsnq13f3ysadn7d1rjazl9i"; depends=[gdistance raster rgdal rgeos sp]; }; mozzie = derive2 { name="mozzie"; version="0.1.0"; sha256="09dwrv4r0hi19gzi1vpif3q4wlbny9h22430g1hhv0wkqs86mhmw"; depends=[]; }; mp = derive2 { name="mp"; version="0.4.1"; sha256="0awvwqwb25q47j14b450k1k5mh2yzwhn7gizjv5j7lyiamk30iwq"; depends=[Rcpp RcppArmadillo]; }; + mpMap2 = derive2 { name="mpMap2"; version="1.0.3"; sha256="0fa89sbqd22h4px9lizmsl7f5xmd1g56i6n1x0x418qvlmgrnn6j"; depends=[car fastcluster ggplot2 igraph jsonlite Matrix nnls progress pryr qtl RColorBrewer Rcpp sn]; }; mpa = derive2 { name="mpa"; version="0.7.3"; sha256="0mhnsbgr77fkn957zfiw8skyvgd084rja1y4wk5zf08q5xjs2zvn"; depends=[network]; }; - mpath = derive2 { name="mpath"; version="0.3-24"; sha256="0bwshhjmb5p5lm4c948yfr2dqms3k4g97xcd4avy5znxh30ra71z"; depends=[bst doParallel foreach MASS numDeriv pscl]; }; + mpath = derive2 { name="mpath"; version="0.3-25"; sha256="1s1n0d681vlgdil9yqm7c5hh62k5mljgzga9475m40ajam1gfcik"; depends=[bst doParallel foreach MASS numDeriv pscl]; }; mpbart = derive2 { name="mpbart"; version="0.2"; sha256="1145n0lxmm0kjm2lc358d79hqws48crj17pjvmchl1pbfd7zi4r8"; depends=[bayesm cvTools mlbench mlogit]; }; mpcmp = derive2 { name="mpcmp"; version="0.1.3"; sha256="11j12ns04g2xdw5r34x86bacwacf3618rzpqz8wvfs1l192l001c"; depends=[]; }; mpcv = derive2 { name="mpcv"; version="1.1"; sha256="0vwycspiw9saj811f6alkbijivy7szpahf35bxn2rpn2bdhbn21i"; depends=[lpSolve]; }; @@ -10606,7 +10628,7 @@ in with self; { mplot = derive2 { name="mplot"; version="1.0.4"; sha256="1f3llh1599q8259la02nvdigrs4p4j1l4qsp5bxi19my6gff0l10"; depends=[bestglm doParallel doRNG dplyr foreach ggplot2 glmnet googleVis leaps plyr reshape2 scales shiny shinydashboard tidyr]; }; mpm = derive2 { name="mpm"; version="1.0-22"; sha256="0wijw8v0wmbfrda5564cmnp788qmlkk21yn5cp5qk8aprm9l1fnk"; depends=[KernSmooth MASS]; }; mpmcorrelogram = derive2 { name="mpmcorrelogram"; version="0.1-4"; sha256="0gv9xswrfvndcjal0csab1w2cnl4rg8pznyxbz84b0qr95jg81ag"; depends=[vegan]; }; - mpmi = derive2 { name="mpmi"; version="0.43"; sha256="15nhh7lizx06mws6gibsvmv29mz1q9id5rqmdbzlk8h1050lcg20"; depends=[KernSmooth]; }; + mpmi = derive2 { name="mpmi"; version="0.43.1"; sha256="1lz7928vz52hs8dad9rj34hnkv8y0yj4mfiydwkrqvsl8avwc4qk"; depends=[KernSmooth]; }; mpoly = derive2 { name="mpoly"; version="1.1.1"; sha256="10is69ks22ka1cqw3xk0fvy4z3b2drm8lanqwj178qrzj7ipf7i0"; depends=[ggplot2 orthopolynom partitions plyr polynom stringi stringr tidyr]; }; mppR = derive2 { name="mppR"; version="1.2.1"; sha256="0q4pyfwypicmx8lqkgjkmagh6kyr6iww8xa64fxv0ayf8pcbzrca"; depends=[ggplot2 igraph qtl]; }; mppa = derive2 { name="mppa"; version="1.0"; sha256="06v6vq2nfh4b407x2gyvcp5wbdrcnk3m8y58akapi66lj8xplcx4"; depends=[]; }; @@ -10641,7 +10663,7 @@ in with self; { msap = derive2 { name="msap"; version="1.1.8"; sha256="0z5lm782jjb9w1h5vgz8bmxjdcrq9zb3xp1w5cb479jjc7krlgg3"; depends=[ade4 ape]; }; mschart = derive2 { name="mschart"; version="0.2.5"; sha256="08j342slv4ca6qkd12hh7jmmv5wv6kfxamw34dr6sd89kzrfdj0p"; depends=[cellranger data_table htmltools officer R6 writexl xml2]; }; mscstexta4r = derive2 { name="mscstexta4r"; version="0.1.2"; sha256="1hjcasmn33xav2mw085lcndv0432l6sz327aikf63491wj1sj7mw"; depends=[dplyr httr jsonlite pander stringi]; }; - mscstts = derive2 { name="mscstts"; version="0.5.2"; sha256="1zvicr1c9lh7cscbx7j5d98zkjwq7piggyz6ssz19gpp2gfc4igy"; depends=[httr jsonlite tuneR]; }; + mscstts = derive2 { name="mscstts"; version="0.5.3"; sha256="0snrlab77gmnlppz3hjkdjaxlqv7v68ncxlvgmw9g33p87g7fnkf"; depends=[httr jsonlite tuneR]; }; mscsweblm4r = derive2 { name="mscsweblm4r"; version="0.1.2"; sha256="031s00wpr9zfjpii56m67q1phn05vqlhb8cfzhyf6fbrxvpb8k7n"; depends=[httr jsonlite pander]; }; msd = derive2 { name="msd"; version="0.1.0"; sha256="03j50vq8mypidxzplznsa874inh5zy2v9rbw9yd7wsxwi8jf0s2b"; depends=[]; }; msda = derive2 { name="msda"; version="1.0.2"; sha256="05khpa5qasnngn6yvk87gv5262plqpw4knb6hzgy52w401k0y80r"; depends=[MASS Matrix]; }; @@ -10684,16 +10706,16 @@ in with self; { mulset = derive2 { name="mulset"; version="1.0.0"; sha256="0pigiy6hfiqh6x4zx6zqn3ykk36s3abzzyb67jdlf4jzc5zhrl9g"; depends=[digest gtools]; }; multDM = derive2 { name="multDM"; version="1.1.1"; sha256="06r9dxp1ww5prp1gq67ch1n173dqa93islbjhqnsdaqrhaa7wav2"; depends=[MTS]; }; multbxxc = derive2 { name="multbxxc"; version="1.0.1"; sha256="1ip5awjc2ljpy6nsr4y42x0yg4n7lyaxp9kzfjvwp41k9lriz4gm"; depends=[Rcpp RcppArmadillo rmumps]; }; - multcomp = derive2 { name="multcomp"; version="1.4-12"; sha256="14c2f10rz546w7ly5f4r6wnd07yj5gic38an17gxny1vf2nsff0b"; depends=[codetools mvtnorm sandwich survival TH_data]; }; + multcomp = derive2 { name="multcomp"; version="1.4-13"; sha256="1nszi22rcc551yc75h9cdfkdqsxw1rz30vadazmpyzihp1bh63yk"; depends=[codetools mvtnorm sandwich survival TH_data]; }; multcompView = derive2 { name="multcompView"; version="0.1-8"; sha256="1rfq9wvvrghq0542ff40wy8vdmsyd8spzz6ihcywcvxdfa8m6g8j"; depends=[]; }; multdyn = derive2 { name="multdyn"; version="1.6"; sha256="06yab2lmxp7lc7zjk8n194mn5vza0yjbp276iair3ry35my4h3v8"; depends=[data_table ggplot2 Rcpp RcppArmadillo reshape2]; }; multfisher = derive2 { name="multfisher"; version="1.1"; sha256="0vzvq7v2xz35fx8pg25c9xqkic09k6fcg9zh81j7pgqmzi2wwrp8"; depends=[]; }; - multgee = derive2 { name="multgee"; version="1.6.0"; sha256="17qrfvxxapqzjy2ps7kk9k9hkmb9zdxflwclyagp1amgv50la49f"; depends=[gnm VGAM]; }; + multgee = derive2 { name="multgee"; version="1.7.0"; sha256="0f7lwla0i0why8lk4fsyxsc1qhyq4asqvy5pr04mqfxxr8x3nm5v"; depends=[gnm VGAM]; }; multiApply = derive2 { name="multiApply"; version="2.1.1"; sha256="1vsknqzwkimmb9axa72slzpzij4mvkcy3578i7xjx3grfa6kbnlh"; depends=[doParallel foreach plyr]; }; multiAssetOptions = derive2 { name="multiAssetOptions"; version="0.1-1"; sha256="1kb4qxyl9shvrpqfxq26lhh3sssmyjcnhhcl6gcbb0s86snh9ms9"; depends=[Matrix]; }; multiCA = derive2 { name="multiCA"; version="1.1"; sha256="1vgb13cfq10g8hxykgi3is3mrlbm76vh40cznapl7xxmw226ccrl"; depends=[bitops multcomp]; }; multiColl = derive2 { name="multiColl"; version="1.0"; sha256="01csf5gjk2wrv6d0m1j23gk6dcixck318ywfq1a1a0j1dl9wmvx4"; depends=[]; }; - multiDimBio = derive2 { name="multiDimBio"; version="1.2.1"; sha256="1zykfchfl4icjp5y2pjd5vlfrpzhd13xbh2fy3indhh6kdzbdkyy"; depends=[ggplot2 gridGraphics lme4 MASS misc3d pcaMethods RColorBrewer]; }; + multiDimBio = derive2 { name="multiDimBio"; version="1.2.2"; sha256="0xadpvnyghpqh2q1gp1fqwv591sm3icmx60x4g8gn1vybi51k5rx"; depends=[ggplot2 gridGraphics lme4 MASS misc3d pcaMethods RColorBrewer]; }; multiPIM = derive2 { name="multiPIM"; version="1.4-3"; sha256="0j7d0cgs8zcyiyibzmfhcandad76sf4gm57wkcv98bf96wkls58l"; depends=[lars penalized polspline rpart]; }; multiRDPG = derive2 { name="multiRDPG"; version="1.0.1"; sha256="0r6n148pakixw4caj0zwib8zirgl98lm0mxqmhvmqjh389icskxc"; depends=[]; }; multiROC = derive2 { name="multiROC"; version="1.1.1"; sha256="15ydbxpkdyvsc55di13jvwh9p6dzxc1yj93w1cwsd8jp2y10wsd3"; depends=[boot magrittr zoo]; }; @@ -10731,10 +10753,9 @@ in with self; { multisensi = derive2 { name="multisensi"; version="2.1-1"; sha256="0f8i1jvrnmdsws5w7fz9k5pb5yfl5b9hnfd8aq4zj1r6m90kb6sz"; depends=[knitr sensitivity]; }; multisom = derive2 { name="multisom"; version="1.3"; sha256="0msxmrj4iawxg4vf4r7kj26zalxz4di2w4nxgxiakiig4g4ggy9z"; depends=[class kohonen]; }; multispatialCCM = derive2 { name="multispatialCCM"; version="1.0"; sha256="1fzd91w10iln8qb81z240lq3fi4gq22l4rh9npkav6fiq6g6rlp8"; depends=[]; }; - multistate = derive2 { name="multistate"; version="0.2"; sha256="0jdgyzc99k4py39g98c4dlcdl918568ihcyhb7csxbsn1zn1qm9l"; depends=[date relsurv statmod survival]; }; multistateutils = derive2 { name="multistateutils"; version="1.2.4"; sha256="1h1hi9pv28dbznjnafybjlbk196rj2f8lwrzwq2a5cpj0q7s582f"; depends=[data_table dplyr magrittr networkD3 Rcpp tidyr]; }; multitaper = derive2 { name="multitaper"; version="1.0-14"; sha256="04wd9bbhyx7697pfy0fpj02v1csr48hkpqj62h9p8a6w84ji4k68"; depends=[]; }; - multivariance = derive2 { name="multivariance"; version="2.2.0"; sha256="1877yym7fhnjhjdfchpdjrcyz10w7flsvjq78s51y0km0rblycph"; depends=[igraph microbenchmark Rcpp]; }; + multivariance = derive2 { name="multivariance"; version="2.3.0"; sha256="00hvsia4xcs2r2lj9qqnlj4klivvpx58fmhr4dgy3waq8pp5a0dv"; depends=[igraph microbenchmark Rcpp]; }; multivator = derive2 { name="multivator"; version="1.1-9"; sha256="0vbqvhmym46zjr1h4s53sjrddfjpv8wi0sq4lrh2rmqarq068416"; depends=[emulator mvtnorm]; }; multiviewtest = derive2 { name="multiviewtest"; version="2.0.0"; sha256="09svd9jbvn92vkaifr33vg5scyh6311kpkr0lgsdj6lycz9cb4q7"; depends=[doParallel foreach irlba Matrix matrixStats mclust randnet]; }; multiwave = derive2 { name="multiwave"; version="1.4"; sha256="19581kjcyw86cnzhvhhpn997fixm811ggmvb8jkb3dsxg8vp60jc"; depends=[]; }; @@ -10750,14 +10771,14 @@ in with self; { music = derive2 { name="music"; version="0.1.1"; sha256="04ygmlga7i8bpxcrlmj8wc956asf73krghga6fnh2flm675dp42f"; depends=[audio crayon]; }; musicNMR = derive2 { name="musicNMR"; version="0.0.2"; sha256="09xxc78ajk428yc3617jfxqp5fy89nfc24f1rig6cw28fflwqj0k"; depends=[seewave]; }; musica = derive2 { name="musica"; version="0.1.3"; sha256="0cfzfar706l0xdb0n11m18mayj5rrplvf4qry36vgxsiaxcba90r"; depends=[data_table lubridate magrittr qmap]; }; - mustashe = derive2 { name="mustashe"; version="0.1.1"; sha256="1ds6b1dbp669yys5946mfawxzxy0n9cqd6lqixy5a7jj8al5whnp"; depends=[digest formatR readr tibble]; }; + mustashe = derive2 { name="mustashe"; version="0.1.2"; sha256="0ihngnjay9zg8570za2rja0m2hxjy1ygc4zaif862sqflza68kdp"; depends=[digest formatR qs tibble]; }; mut = derive2 { name="mut"; version="1.1"; sha256="0v0vviarsmaiap3fa82ia01cblana65fd3cbj7jkd3aral6pm6yz"; depends=[expm Familias IBDsim paramlink]; }; mutSignatures = derive2 { name="mutSignatures"; version="1.2"; sha256="1kbp221lm43a5wiw754yjkd3qidmca20m0i8jlxsqk8ijbp40ky2"; depends=[cluster doParallel foreach ggplot2 pracma proxy]; }; mutoss = derive2 { name="mutoss"; version="0.1-12"; sha256="1yk7p7pb2xm38d3j19ysgwmix48lvimbhkhjjwk5jmr1a0ysx298"; depends=[multcomp multtest mvtnorm plotrix]; }; mutossGUI = derive2 { name="mutossGUI"; version="0.1-11"; sha256="08pcca9gzns83az6jbjzv4xhm1wgmchhzz4f54x1aq0nmvsz3qq1"; depends=[CommonJavaJars JavaGD JGR multcomp mutoss plotrix rJava]; }; mvLSW = derive2 { name="mvLSW"; version="1.2.3"; sha256="05g6v4jbg1km2215lxbwzx8frr4in7xal9pai3y6l23d66lvh1iz"; depends=[fields wavethresh xts zoo]; }; mvMISE = derive2 { name="mvMISE"; version="1.0"; sha256="0lnc5g3ksl5cvwylh8p8baxyvq3z32a2i337q7lhg00j031ccy5c"; depends=[lme4 MASS]; }; - mvMORPH = derive2 { name="mvMORPH"; version="1.1.1"; sha256="101ds24bir84yj7cnc4l4yv85xga981mk5ap420f3r9lp8db3h6x"; depends=[ape corpcor glassoFast pbmcapply phytools spam subplex]; }; + mvMORPH = derive2 { name="mvMORPH"; version="1.1.2"; sha256="0hhnd9ki9zcgxxfxjb0q2pmpgyfv9r5993n4rw87dh3mjxb0xsxx"; depends=[ape corpcor glassoFast pbmcapply phytools spam subplex]; }; mvMonitoring = derive2 { name="mvMonitoring"; version="0.1.0"; sha256="03nvq8nmrmrpzyxlsqzww5ghk640115l1jgmgwfahhjxkdpkzfxx"; depends=[BMS dplyr lazyeval plyr rlang robustbase xts zoo]; }; mvPot = derive2 { name="mvPot"; version="0.1.4"; sha256="04l9dn8amwp366b6lic5fkl4kck0x2m3xcsqz6as4c3h772nhq1w"; depends=[evd gmp MASS numbers]; }; mvQuad = derive2 { name="mvQuad"; version="1.0-6"; sha256="016477dhjdkqiadc631vzpbp967mn4yli6by3s1k348mlfirwsi3"; depends=[data_table statmod]; }; @@ -10780,7 +10801,7 @@ in with self; { mvnmle = derive2 { name="mvnmle"; version="0.1-11.1"; sha256="131k2bnn6194y3f35r9cgys8g1z2y52123ng8iijpkpbfd147y92"; depends=[]; }; mvnormtest = derive2 { name="mvnormtest"; version="0.1-9"; sha256="1iaxjwp7bgxhaa4xqvgqb61316mq2fb0452d0pabhmbxkvmvdnj6"; depends=[]; }; mvnpermute = derive2 { name="mvnpermute"; version="1.0.0"; sha256="0mbyj5i5vysrnl3pgypl0cjf3sylsvzfl1pcxkn0q16560vqh2ba"; depends=[]; }; - mvord = derive2 { name="mvord"; version="0.3.6"; sha256="0xg73pa7bj42ya69w8bmcgf1nfxa5yh1aq8fc0dk0ygcg3h0g21k"; depends=[BB dfoptim MASS Matrix minqa mnormt numDeriv optimx pbivnorm ucminf]; }; + mvord = derive2 { name="mvord"; version="1.0.0"; sha256="1x5846sb31s45817j05nr5pp8zd1rgq22n8wncj2a61y01ll7qwy"; depends=[BB dfoptim MASS Matrix minqa mnormt numDeriv optimx pbivnorm ucminf]; }; mvoutlier = derive2 { name="mvoutlier"; version="2.0.9"; sha256="1d562h3xicq962h27fi95qhrz9vkwxk0p8axhps1cy4b49w4bygi"; depends=[robCompositions robustbase sgeostat]; }; mvp = derive2 { name="mvp"; version="1.0-8"; sha256="0i2fd9s0dlpaa4vwkiq5is2d4vxc90hkdl0yk57gl651i8nxwnha"; depends=[magic magrittr mpoly partitions Rcpp]; }; mvprpb = derive2 { name="mvprpb"; version="1.0.4"; sha256="1kcjynz9s7vrvcgjb9sbqv7g50yiymbpkpg6ci34wznd33f7nrxm"; depends=[]; }; @@ -10838,10 +10859,9 @@ in with self; { nat_utils = derive2 { name="nat.utils"; version="0.5.1"; sha256="12g87ar795xfbz7wljksb24x9hqvcirjr50y4mbpx1427r0l7clv"; depends=[]; }; nationwider = derive2 { name="nationwider"; version="1.1.1"; sha256="1crflv2wvrsyrhl612f7awvm0yfhl381q7pq190n3ydg093y32r6"; depends=[dplyr httr lubridate magrittr readxl rvest stringr tidyr xml2 zoo]; }; natmanager = derive2 { name="natmanager"; version="0.4.0"; sha256="03vqy6kwc749ccydmjwjl49sydg534ijn0kpm11s4jp6nmybgzsa"; depends=[curl gh remotes usethis withr]; }; - natserv = derive2 { name="natserv"; version="0.3.0"; sha256="0plfcf9c1lwfmac3nnx07hyhpr12q6mfmmj0dz8xyxdspd2ps81w"; depends=[crul data_table tibble xml2]; }; + natserv = derive2 { name="natserv"; version="0.4.0"; sha256="11wws7ikvvlmg7b1g1v6qdnhh40783ap5j3w3533wwdlj1igjzms"; depends=[crul data_table tibble xml2]; }; natural = derive2 { name="natural"; version="0.9.0"; sha256="0zxwbf3gg2h0bhl2w0md3rd162vlsgg0dv3187hc0ax7333cc4cx"; depends=[glmnet Matrix]; }; naturalsort = derive2 { name="naturalsort"; version="0.1.3"; sha256="0mz801y9mzld9ypp3xmsjw2d8l9q97sdnv09wrci9xi3yg2sjf6d"; depends=[]; }; - nbc4va = derive2 { name="nbc4va"; version="1.1"; sha256="025p9h1ghrsq4h439gx25ffpyvh2kp1i51hm7kbzx8nmh4ka8aff"; depends=[]; }; nbconvertR = derive2 { name="nbconvertR"; version="1.3.2"; sha256="0yhmz177r1miain65vspclahhz8cg7638ldbpsw8ylgf7a60l0sg"; depends=[]; }; nbpMatching = derive2 { name="nbpMatching"; version="1.5.1"; sha256="0f90k9vq05gkc0sgywb98frig63df0ih4z41dq7m2inx1zk5rqns"; depends=[Hmisc MASS]; }; nc = derive2 { name="nc"; version="2020.3.23"; sha256="18hjwa86y14sdwzz46k6w9hb8s8w58bxmnqy2spib8qy6dvvpfj4"; depends=[data_table]; }; @@ -10891,7 +10911,7 @@ in with self; { netgsa = derive2 { name="netgsa"; version="3.1.0"; sha256="0mn4dnvckdskigdfbszjnfmb3m6yfbz4qc26qwh1wznwx5wmcbf0"; depends=[corpcor dplyr glassoFast glmnet graph graphite igraph magrittr Matrix msigdbr quadprog rlang]; }; netgwas = derive2 { name="netgwas"; version="1.11"; sha256="13d889ji6x0v5pmqlr1gs9yskm3262fzb5i2l9lw6y6bc72q3l06"; depends=[glasso huge igraph MASS Matrix qtl RBGL tmvtnorm]; }; netjack = derive2 { name="netjack"; version="1.2.0"; sha256="060ygb0kxi0gx1ya38cmf5hhyy6jkwq5519azdqhq5i324cwzzm7"; depends=[brainGraph ggplot2 igraph Rdpack]; }; - netmeta = derive2 { name="netmeta"; version="1.2-0"; sha256="0cy123bs5azg5yinncmgzaxm0m33dzxbwjh0xlvwv2v27m4w4sqk"; depends=[ggplot2 magic MASS meta]; }; + netmeta = derive2 { name="netmeta"; version="1.2-1"; sha256="11yigmk11a9gi3qg3gcszmnp11729qap8yv5pvsss5qfhahfs4qa"; depends=[ggplot2 magic MASS meta]; }; netrankr = derive2 { name="netrankr"; version="0.2.1"; sha256="0csgi09ijp7ygwk7x057l9xjrzyhr7sav8hamh0p6i72l6719ssl"; depends=[igraph Rcpp RcppArmadillo]; }; netregR = derive2 { name="netregR"; version="1.0.1"; sha256="0n5absjra0imddz1spy1piij5rdz76wi4g568yby3rbhkm1896rs"; depends=[Matrix]; }; nets = derive2 { name="nets"; version="0.9"; sha256="1wcr0fj50w3rqxw0k9cb81c2psdkb0dwwwzrjvxv50hksbhyi8kn"; depends=[igraph]; }; @@ -10906,7 +10926,7 @@ in with self; { networkTomography = derive2 { name="networkTomography"; version="0.3"; sha256="1hd7av231zz0d2f9ql5p6c95k7dj62hp0shdfshmyfjh8900amw7"; depends=[coda igraph KFAS limSolve plyr Rglpk]; }; networkreporting = derive2 { name="networkreporting"; version="0.1.1"; sha256="1ssbz8lw4mlwcblwfbyffvayvb2gmihq4qlz5q9222fn4aa3raxd"; depends=[dplyr functional ggplot2 lazyeval plyr reshape2 stringr surveybootstrap]; }; networksis = derive2 { name="networksis"; version="2.1-3"; sha256="1kvil3qs7xd94ak9jgvj1nss55gjg0y7d35zmass9h1hjkcrq7bg"; depends=[network]; }; - networktools = derive2 { name="networktools"; version="1.2.2"; sha256="1j6jqz02lgafykfdnvv4zgpglhijyhirc9zgjl7pj930wmnpy9p4"; depends=[cocor eigenmodel ggplot2 gridExtra igraph IsingFit NetworkComparisonTest nnet psych qgraph R_utils RColorBrewer reshape2 smacof wordcloud]; }; + networktools = derive2 { name="networktools"; version="1.2.3"; sha256="0jj5cbp036vjjfj10i1lxzj4yi06xbdy1j20j6a035s8l2wc57pl"; depends=[cocor eigenmodel ggplot2 gridExtra igraph IsingFit NetworkComparisonTest nnet psych qgraph R_utils RColorBrewer reshape2 smacof wordcloud]; }; networktree = derive2 { name="networktree"; version="0.2.2"; sha256="0dlci3sqdh6f3w82h0p6c2pn15d170m9ls8zllgscd1sbyry4k4x"; depends=[Formula gridBase Matrix mvtnorm partykit qgraph reshape2]; }; neuRosim = derive2 { name="neuRosim"; version="0.2-12"; sha256="1hsnw9xipdr74fydq9013252ycbi9igh28s0j4dbdx52pv3iixzl"; depends=[deSolve]; }; neural = derive2 { name="neural"; version="1.4.2.2"; sha256="05hrqgppgwp38rdzw86naglxj0bz3wqv04akq7f0jxbbjc6kwy4j"; depends=[]; }; @@ -10931,14 +10951,14 @@ in with self; { nhds = derive2 { name="nhds"; version="1.0.3"; sha256="1cgw3hmsik3vlnb1lgalhvhrqzwdv08dp80vwpw1nwbf8whcbxjn"; depends=[]; }; nhlscrape = derive2 { name="nhlscrape"; version="0.1.3"; sha256="0x6y747j6lha3jw4v2wavgd12xw5nx4m8biv9rmq9z0qy53vncjc"; depends=[DBI httr jsonlite RSQLite rvest xml2]; }; nhm = derive2 { name="nhm"; version="0.1.0"; sha256="1yf9hnbmfb7xj8mbhnq40wvd0pd88x9qspy1jr3x0n8nb75i3jlp"; depends=[deSolve maxLik mvtnorm]; }; - nhstplot = derive2 { name="nhstplot"; version="1.0.1"; sha256="1f07gfmbx80as54mlzdbs2z1vzc78rjy6i6m7zd4jplgcqdcynws"; depends=[ggplot2]; }; + nhstplot = derive2 { name="nhstplot"; version="1.1.0"; sha256="1yk7q731a4y9mhngdsb8xdw2id6m1q78329ja19hdpi6nnd7nhgn"; depends=[ggplot2]; }; nice = derive2 { name="nice"; version="0.4-1"; sha256="1p8vmimiq9sbjvbx6c2wqwwkpnzw4kkdvjry6qyadmm3frwhj5qb"; depends=[]; }; nicheROVER = derive2 { name="nicheROVER"; version="1.0"; sha256="0sa7wfpzkin78vz48vwa5iac82v5l1s3zczdxz8sc2kyg22fj0aw"; depends=[mvtnorm]; }; nichevol = derive2 { name="nichevol"; version="0.1.19"; sha256="0qj5cb0fyw0x1bczl6l0kl6jqir4yg8sb9fsfkd3h64d0ls2arl5"; depends=[ape castor concaveman geiger raster rgdal rgeos sf sp stringr]; }; nilde = derive2 { name="nilde"; version="1.1-3"; sha256="0h88if7dh16inyy5zh0yjqmc0c57k99la038p5vlwkj62vvjscmm"; depends=[]; }; nima = derive2 { name="nima"; version="0.6.2"; sha256="0n8r8h1m0v0ssbpv6p32jby49f45qbicwr0awm7x054p48qk49cy"; depends=[assertthat dplyr ggplot2 ggthemes gridExtra gtools scales]; }; nimble = derive2 { name="nimble"; version="0.9.0"; sha256="04anz8xfkdv2c00hax305lycp0gzjspsq34hfgm3w51kz6nqzhpb"; depends=[coda igraph R6]; }; - nimbleEcology = derive2 { name="nimbleEcology"; version="0.2.0"; sha256="0c8qs5j1n4fag8gw095rabmc619dwv9qyfzix29djjc4wr638xsd"; depends=[nimble]; }; + nimbleEcology = derive2 { name="nimbleEcology"; version="0.2.1"; sha256="0bf0pqvsfvbhnpnk5hs3f90dqvw2n1j9y8ajaw9j7n4gld3wzxqb"; depends=[nimble]; }; nipals = derive2 { name="nipals"; version="0.7"; sha256="14rq54qy4gc4l9f5h48vrsrh7sb0wzzxbvjn0zax82pz2fw6nybx"; 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]; }; @@ -10950,7 +10970,7 @@ in with self; { nlgeocoder = derive2 { name="nlgeocoder"; version="0.1.3"; sha256="13d30kfgfsny5gnn3yjfnclky6yixaa8sg0m689rszqxrvbrj79x"; depends=[jsonlite]; }; nlirms = derive2 { name="nlirms"; version="3.4.4"; sha256="1njyfip377a0f6hf9y32s077b4jv4h8ydbjgnl68yfypxbfn2xyx"; depends=[gridExtra gtable]; }; nlist = derive2 { name="nlist"; version="0.1.0"; sha256="0i5appxx79fcv2g0frkzlv2yfym6kmmzbsk76rbh7ap8hram04jg"; depends=[abind chk coda purrr term]; }; - nlme = derive2 { name="nlme"; version="3.1-145"; sha256="1i9a3afdmn2ziks0imz0j09ay9n0zb9mhrymy9mg97vvlz5diwrh"; depends=[lattice]; }; + nlme = derive2 { name="nlme"; version="3.1-147"; sha256="1rqc3wy3lmy0wczsvsn8yszzsxhppfwg4iznb1j6ki2qawpdij7g"; depends=[lattice]; }; nlmeODE = derive2 { name="nlmeODE"; version="1.1"; sha256="1zp1p98mzbfxidl87yrj2i9m21zlfp622dfnmyg8f2pyijhhn0y2"; depends=[deSolve lattice nlme]; }; nlmeU = derive2 { name="nlmeU"; version="0.70-3"; sha256="05kxymgybziiijpb17bhcd9aq4awmp5km67l2py9ypakivi0hc6l"; depends=[nlme]; }; nlmixr = derive2 { name="nlmixr"; version="1.1.1-7"; sha256="1dl3f0lns8cm32gx64i2jims4wknannl776mn2spzqh5z6g3nnzw"; depends=[BH brew cli dparser fastGHQuad flextable generics ggplot2 huxtable lbfgsb3c magrittr Matrix memoise n1qn1 nlme Rcpp RcppArmadillo RcppEigen RxODE StanHeaders stringr tidyr vpc yaml]; }; @@ -10976,6 +10996,7 @@ in with self; { nlt = derive2 { name="nlt"; version="2.2-1"; sha256="10wf00qzf28dxjfvv12wsqxlfn6xz15wk8njrzgsgm9px1g6s21f"; depends=[adlift EbayesThresh]; }; nltm = derive2 { name="nltm"; version="1.4.2"; sha256="02f3rn5l1hfvjpymy7vljmh6iq9w1w96016kx75qw563zwhmp5kx"; depends=[survival]; }; nlts = derive2 { name="nlts"; version="1.0-2"; sha256="0s49qjwavl9ns2746nn4zy4h4dh0njfcvznm3qd61qhs7np9w1db"; depends=[acepack locfit]; }; + nmaINLA = derive2 { name="nmaINLA"; version="0.2.0"; sha256="0z3iln81dj0sg64hi7dxypcslff5yl6nlx0hkra1kc24rhxfzhh2"; depends=[]; }; nmadb = derive2 { name="nmadb"; version="1.2.0"; sha256="17r5vc57ilhy6cfcqpfyp9nzzjaa5gc8qkgfn3y8sppqh1g1mi40"; depends=[devtools jsonlite RCurl readxl]; }; nmathresh = derive2 { name="nmathresh"; version="0.1.5"; sha256="0ndrkd68wkkj0ib0qamfmawfy4j07cg1nx4rx32amx2j0rc851yl"; depends=[ggplot2 gridExtra gtable Matrix nnls]; }; nmfem = derive2 { name="nmfem"; version="1.0.5"; sha256="0hlddml20bp38yp1dji3l9mc1vnzmdrj6myf19n9p9xb85a30b9c"; depends=[capushe d3heatmap dplyr mixtools plyr tidyr]; }; @@ -10984,7 +11005,7 @@ in with self; { nmslibR = derive2 { name="nmslibR"; version="1.0.4"; sha256="1fw565n4128nswl2qx248ab60is98iqijq5blwskxc9hjddf95a4"; depends=[KernelKnn Matrix R6 Rcpp RcppArmadillo reticulate]; }; nmw = derive2 { name="nmw"; version="0.1.4"; sha256="1vj7b2p40x0h3xp45qzar86i9439mj8y3r5hnlbwa025jqdf2g0q"; depends=[numDeriv]; }; nnGarrote = derive2 { name="nnGarrote"; version="1.0.2"; sha256="1rci3m362wlis8z9afbkcr9vk0ihvay389cq4c8jd9gmcwdrv61g"; depends=[caret glmnet multicool]; }; - nnTensor = derive2 { name="nnTensor"; version="1.0.2"; sha256="12h25kn3d70ldlqpd4nqnycv3mnzfx1f9gcw1yaspmnhs1x6gddf"; depends=[fields plot3D rTensor tagcloud]; }; + nnTensor = derive2 { name="nnTensor"; version="1.0.4"; sha256="1br3jcj79crrb7s22pjp0pxxkni8fagqkr96xb9sbf2dszyva15b"; depends=[fields ggplot2 plot3D rTensor tagcloud]; }; nna = derive2 { name="nna"; version="0.0.2.1"; sha256="17cz1jf7iv61wspqldfdwbdjhlr0wq09idkzlivfb8aik5w9f0z5"; depends=[]; }; nnet = derive2 { name="nnet"; version="7.3-13"; sha256="1z0rj5cm4ycw1y0gd5wwwg8c2298v90iybgqdqh17967jbi2125f"; depends=[]; }; nnetpredint = derive2 { name="nnetpredint"; version="1.2"; sha256="1c6s9wm6vhylwv4xhp2hkllw18zj8hdr17ls9vlxm9qs3wx1v48w"; depends=[RSNNS]; }; @@ -10992,6 +11013,7 @@ in with self; { nngeo = derive2 { name="nngeo"; version="0.3.7"; sha256="1xyj5zjhim2scigkr4ycz7ma18a0sgi60jrhrcv9rnn2fg1hx5c7"; depends=[lwgeom RANN sf units]; }; nnlasso = derive2 { name="nnlasso"; version="0.3"; sha256="1n7karlmgq61z9ywfx9xb5wvmxx40ydpnzzazj1xr70qlv5m0qk4"; depends=[]; }; nnls = derive2 { name="nnls"; version="1.4"; sha256="07vcrrxvswrvfiha6f3ikn640yg0m2b4yd9lkmim1g0jmsmpfp8f"; depends=[]; }; + nnt = derive2 { name="nnt"; version="0.1.4"; sha256="1rrqq8m3plsq13hsh53h948wbx37gl87hplj4ms2pxxf1zwqsmnj"; depends=[survival survRM2]; }; noaaoceans = derive2 { name="noaaoceans"; version="0.2.0"; sha256="1hvjkma14kl8f69ichk27ddxlg9cqnzif8x43ckxyny6h341bbkf"; depends=[httr jsonlite rvest xml2]; }; noaastormevents = derive2 { name="noaastormevents"; version="0.1.1"; sha256="1ra852r5hw1ng3f4jk866jx0z2dszwvbidmfrdjchv9bfrjwmlmx"; depends=[choroplethr choroplethrMaps data_table dplyr forcats ggplot2 htmltab hurricaneexposure lubridate maps plyr RColorBrewer rlang stringr tidyr viridis XML]; }; noctua = derive2 { name="noctua"; version="1.6.0"; sha256="1gdlfjgxrhkdp8klis2rz60hvldw5qlzhrcp8frbyjvb8qa83b76"; depends=[data_table DBI paws]; }; @@ -11070,7 +11092,6 @@ in with self; { nprotreg = derive2 { name="nprotreg"; version="1.0.0"; sha256="06n82i5m7sgfj759zdwwh8fqybkbchvnaaqcds64m6hbms592bh3"; depends=[expm]; }; npsf = derive2 { name="npsf"; version="0.5.2"; sha256="0iz4dh2cv1bi90wdf08x70rdm44xmzblck69rlg7vnsb6n2q2is9"; depends=[Formula randtoolbox Rcpp sfsmisc]; }; npsm = derive2 { name="npsm"; version="0.5.1"; sha256="00xh3x731lqb5vbzmfmlldrvc8s4s88dc394iifsn2g7r5naxks0"; depends=[plyr Rfit]; }; - npsp = derive2 { name="npsp"; version="0.7-5"; sha256="0ci3am6lbmb1raxdqj4ckcm7y1889j0zsk52awl15sjhkx8l2saa"; depends=[quadprog sp spam]; }; npsr = derive2 { name="npsr"; version="0.1.1"; sha256="1fzvilzjg9z05991sr1s1bdp17kfl6d1580qdllk8is9ac06np0v"; depends=[gmp infotheo MASS]; }; npst = derive2 { name="npst"; version="2.0"; sha256="1y5ij3nmh9pj6p97jpx75g26sk508mznr0l67cwj381zfb77hj1n"; depends=[]; }; npsurv = derive2 { name="npsurv"; version="0.4-0"; sha256="1wq4c9yfha5azjhrn40iiqkshmvh611sa90jp3lh82n4bl9zfk20"; depends=[lsei]; }; @@ -11099,7 +11120,7 @@ in with self; { numOSL = derive2 { name="numOSL"; version="2.6"; sha256="03h1p56650x4my5vq5jlmjsz5xj0w2j75qfr08rh7nr38dwgp1k8"; depends=[]; }; numbers = derive2 { name="numbers"; version="0.7-5"; sha256="1dz23rmjzdns4av28kk8bc9psj71q2bpcgm1m7sxnyzcxpm8hczc"; depends=[]; }; numbersBR = derive2 { name="numbersBR"; version="0.0.2"; sha256="0ihxlny745gpz1ngq862rydn1zwn8zni1xw9mmgw8hkylsrnjfq8"; depends=[stringr]; }; - numform = derive2 { name="numform"; version="0.5.0"; sha256="1c9vhzm4rjh8b5bkzkv1r9j2y1iqndq9ndandix28wdgn2v6lzv6"; depends=[glue]; }; + numform = derive2 { name="numform"; version="0.6.0"; sha256="0v19dcr5xwi0bf4s0qwipxpmxbw42l2li1h9i73kdrigznhlqq8h"; depends=[glue]; }; nutriNetwork = derive2 { name="nutriNetwork"; version="0.1.1"; sha256="0ya95h88jkiwc7cg7ic8bmyd7b0lgnhxrywwqvi2j6m6nbvvaxzy"; depends=[glasso huge igraph Matrix tmvtnorm]; }; nvctr = derive2 { name="nvctr"; version="0.1.1"; sha256="0hjrimg0hvwgkx2hbln6k8z0f2bp9kln7mxxh623qjp0hg4mcvcn"; depends=[magrittr pracma]; }; nvmix = derive2 { name="nvmix"; version="0.0-3"; sha256="0dvx21nfp82s7bk5vd9xxp9979w4mq8v1hx1zxa97sv2xr4g2m5y"; depends=[Matrix qrng]; }; @@ -11150,10 +11171,12 @@ in with self; { oenb = derive2 { name="oenb"; version="0.0.1"; sha256="1x1jlqp6r27c4gb7wafzpmh5rq6yq61a2d395r5lsmv2g5jb4biz"; depends=[dplyr XML]; }; ofGEM = derive2 { name="ofGEM"; version="1.0"; sha256="0xdkl8k12an9pdy6i5nay4m2iakrwsp0lr3zl8gphii75j0ywz7k"; depends=[CompQuadForm forestplot MASS]; }; officer = derive2 { name="officer"; version="0.3.8"; sha256="0xhx5n6qksyh2s9hvwhnc8y0hn362asc5y94ld06snad786hz0rw"; depends=[magrittr R6 uuid xml2 zip]; }; + offlineChange = derive2 { name="offlineChange"; version="0.0.4"; sha256="005afrm4ki4zz3zkgrf8c1v9gf5cjhc5g50mjkqya3r8npaccwq2"; depends=[Rcpp]; }; oglmx = derive2 { name="oglmx"; version="3.0.0.0"; sha256="13axmhbqhv4kkcdsdmp9r7p0d0kyqlsaqgyyllbkxlxb4hfz79b6"; depends=[maxLik]; }; ohenery = derive2 { name="ohenery"; version="0.1.1"; sha256="0i7cc110c30y7dm86srh2xkikkmlr28mvy0kkjxywxmiwnrsmzjq"; depends=[dplyr magrittr maxLik Rcpp]; }; ohtadstats = derive2 { name="ohtadstats"; version="2.1.1"; sha256="0hkjs322vii1dsminlkwpwi12sc9pd88jag7p4dmy6nfw2hh2d69"; depends=[lattice]; }; oii = derive2 { name="oii"; version="1.0.2.1"; sha256="1n41hikn53ikyynsravg127cw5csa8s0s1l63w5hym7c6j625ya5"; depends=[Deducer gmodels rapportools]; }; + ojsr = derive2 { name="ojsr"; version="0.1.0"; sha256="0lgpdcavk60qyqn3fprqmyi4bi43kjd8llnpb3bibx7h010kg834"; depends=[dplyr magrittr oai purrr rlang rvest stringr tidyr urltools xml2]; }; okcupiddata = derive2 { name="okcupiddata"; version="0.1.0"; sha256="1l04rr4yr73a6q2am9ylyr5prf347hkf2jx735w78rsb6472kbaq"; depends=[]; }; okmesonet = derive2 { name="okmesonet"; version="0.1.5"; sha256="1kzyzmg702ayzphn9jsk64m51mlnz37ylxiwq5gsr23vaiida680"; depends=[plyr]; }; olctools = derive2 { name="olctools"; version="0.3.0"; sha256="1gbchwynvmryarz32f24v56kj57h7x6nrrm878fkjkpq140cqwzz"; depends=[Rcpp]; }; @@ -11192,7 +11215,7 @@ in with self; { openNLP = derive2 { name="openNLP"; version="0.2-7"; sha256="15yl74wv6w1d2wwpn1xlkkpam3c62977gnqal651fv623v29gg35"; depends=[NLP openNLPdata rJava]; }; openNLPdata = derive2 { name="openNLPdata"; version="1.5.3-4"; sha256="0j45rh9qki8r5wavaysrfsvb3wc3x8jjicqff2yi0r34j58xvlv8"; depends=[rJava]; }; openSTARS = derive2 { name="openSTARS"; version="1.1.0"; sha256="1cjws49r22cmdax136zcy3k35yzbajkm6pyfibgcw2iqdxy1vcxg"; depends=[data_table progress raster rgdal rgrass7 sf sp SSN]; }; - openVA = derive2 { name="openVA"; version="1.0.9"; sha256="0pzcnyq45mb7041jx0krws65sxq4wldx01aafnsxqp1p5ly13y3p"; depends=[cli crayon ggplot2 InSilicoVA InterVA4 InterVA5 Tariff]; }; + openVA = derive2 { name="openVA"; version="1.0.10"; sha256="0ly0pwwj40sylv2c96siyq38j491527x4dd02xga9cnscinpbgvp"; depends=[cli crayon ggplot2 InSilicoVA InterVA4 InterVA5 Tariff]; }; openadds = derive2 { name="openadds"; version="0.2.0"; sha256="1jb8zd3rpxfkjkg895iab6m4cfi53p5vy3nnpjkgq7ym6499qjcv"; depends=[crul dplyr jsonlite maptools rappdirs readr tibble xml2]; }; openair = derive2 { name="openair"; version="2.7-2"; sha256="1bbhnbg9v2n3g4cnd3ryivdbid9kdcd45m0rfxr0hxbcq3a8gwmk"; depends=[cluster dplyr hexbin lattice latticeExtra lubridate mapproj MASS mgcv purrr Rcpp readr rlang tidyr]; }; openblender = derive2 { name="openblender"; version="0.5.71"; sha256="0imk1pam0rcdwclnz66n4bvwj94l6dc63fayar3ampd8j2mxpa4q"; depends=[httr jsonlite]; }; @@ -11203,9 +11226,10 @@ in with self; { opendatatoronto = derive2 { name="opendatatoronto"; version="0.1.3"; sha256="1rcdv2zk3ckrp2fig71lgzw5i06767qqlrdj80r4b522nxx7npyn"; depends=[ckanr curl magrittr readxl sf tibble xml2]; }; opendotaR = derive2 { name="opendotaR"; version="0.1.4"; sha256="17cygsw3nkg6zincfrcdh1509rlz3n5zrv9wvv7mjngm61sn79nf"; depends=[dplyr jsonlite lubridate]; }; openintro = derive2 { name="openintro"; version="1.7.1"; sha256="059azlasdkmp8f54qpjf3mq5dyqakw0dgx0kx85wfdmhq38zal5n"; depends=[]; }; + openmetrics = derive2 { name="openmetrics"; version="0.1.1"; sha256="16glrs2wisfkhnhmd11554fg9yp3axkj81kmwxcw12fgsq1bk52q"; depends=[R6]; }; openssl = derive2 { name="openssl"; version="1.4.1"; sha256="1ihz2qi33lhngl19xdanq0pbmfaacy63794mg8ll7z2lab3yryzp"; depends=[askpass]; }; opentraj = derive2 { name="opentraj"; version="1.0"; sha256="13nqal96199l8vkgmkvl542ksnappkscb6rbdmdapxyi977qrgxk"; depends=[doParallel foreach maptools openair plyr raster reshape rgdal sp]; }; - opentripplanner = derive2 { name="opentripplanner"; version="0.2.0.8"; sha256="0irk885r8s6xq0krnmb1ylz29z3dg9ypj7k7pf0lcxd5l74kh4jm"; depends=[checkmate dplyr geodist googlePolylines httr jsonlite pbapply sf]; }; + opentripplanner = derive2 { name="opentripplanner"; version="0.2.1.0"; sha256="0qml2mwpmbp91w2c6aynyssfffp88jdz995gh8j4pj7150bvsihy"; depends=[checkmate dplyr geodist googlePolylines httr jsonlite pbapply sf]; }; openxlsx = derive2 { name="openxlsx"; version="4.1.4"; sha256="1mwxldw9i9nfksx1i6h1kfs7vmsz9fgyllbsipar4vnfyqhqp8q7"; depends=[Rcpp stringi zip]; }; opera = derive2 { name="opera"; version="1.1"; sha256="1nvm7a1g0pzzlpyk7g5plys1byl4xq2wz59hqys5gxiq0y5sgqwm"; depends=[]; }; operator_tools = derive2 { name="operator.tools"; version="1.6.3"; sha256="1v4dg7xhz24dnp0zxn815x1405ig64ibii6y40la1gvmzcc41dz5"; depends=[]; }; @@ -11238,13 +11262,13 @@ in with self; { optimr = derive2 { name="optimr"; version="2019-12.16"; sha256="003wz9r3xdi47ad22l4dkhp0dalknb2s9fp82yamjx7x1xbfvcbk"; depends=[numDeriv optextras Rcgmin Rvmmin setRNG]; }; optimsimplex = derive2 { name="optimsimplex"; version="1.0-7"; sha256="1if32133556zwmijlz6085fg1h65442hy03lzia0ahap3yndqfqy"; depends=[optimbase]; }; optimus = derive2 { name="optimus"; version="0.2.0"; sha256="01njyjfrm6kjwx2qq41c0hsgxzydnrmr3538cpbfdn5i0z5blgyx"; depends=[mvabund ordinal]; }; - optimx = derive2 { name="optimx"; version="2020-2.2"; sha256="1dr281q21563ysh60sqca7in1pvzx776qn9v7wv1sp8hk7w99x21"; depends=[numDeriv]; }; + optimx = derive2 { name="optimx"; version="2020-4.2"; sha256="00bi2sr2hr7x6cfwlsn7hz2r56lcyv9naa8vmfcgr1r269fc50b3"; depends=[numDeriv]; }; optinterv = derive2 { name="optinterv"; version="0.1.0"; sha256="1yvjb9fyqj3pfglfdwdq4kpw9i5g5i3klgpqb05xdnacbnpdxvmp"; depends=[boot distances Hmisc lattice pbapply rootSolve weights]; }; optional = derive2 { name="optional"; version="2.0"; sha256="0hj0gwvk9svllv44kfdgv3a2mriwqnaxvn3rj7w1djha7mryl6jl"; depends=[magrittr]; }; optionstrat = derive2 { name="optionstrat"; version="1.4.1"; sha256="0vidaf888zdls5yxy7637fqg6r39l3rxw9bhn16s4xmag7kawljv"; depends=[]; }; optiscale = derive2 { name="optiscale"; version="1.2"; sha256="185yv0xizrrjik0ydyknms28p8ql9x54bhnq3wpyrbiinjm51fms"; depends=[lattice]; }; optmatch = derive2 { name="optmatch"; version="0.9-13"; sha256="1n6h6j0rk750jqxwxkbzdid1ig5xp8xpjw356xrqg02wm7x2gwzq"; depends=[digest Rcpp RItools survival]; }; - optparse = derive2 { name="optparse"; version="1.6.4"; sha256="0wyrc42ja3ab5szx46zmz8lm7vzfqxkjca0m0sms8g9hqbmmay6d"; depends=[getopt]; }; + optparse = derive2 { name="optparse"; version="1.6.6"; sha256="1l301dy3gc8pn7j00awcjh41wmc1ks9kswak255kbsa6f54rsxsi"; depends=[getopt]; }; optpart = derive2 { name="optpart"; version="3.0-3"; sha256="18h659gbgzflq81lcchc058xjgljkmhpsjkh51ylygwrv1qjrz2i"; 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]; }; @@ -11302,10 +11326,10 @@ in with self; { 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.1.3"; sha256="1a57fg8j7ski050l17hv137mlb5ir7qx7212y9d49arbwlh9bpcq"; depends=[curl httr jsonlite lubridate magrittr Rcpp rvest sp tibble xml2]; }; - osmose = derive2 { name="osmose"; version="0.1.1"; sha256="0fiijnrvvydhj6j9yb02rn5sg8arcpj3jz977m2zwjgqy878cffg"; depends=[rlist stringr]; }; + osmose = derive2 { name="osmose"; version="3.3.3"; sha256="0b6998m3id0llpvlj5xgdrrrx1j90kxax9nfn2a5f0xq7hpcd9cg"; depends=[fields knitr mgcv ncdf4 rappdirs rlist rmarkdown stringr]; }; osmplotr = derive2 { name="osmplotr"; version="0.3.2"; sha256="0k5rjxsi1sfcxcl6lf8zcncqnshz2jaz7hcwn2ifg4yhvxvkfma8"; depends=[curl e1071 ggm ggplot2 httr mapproj osmdata rgeos sp spatstat]; }; osqp = derive2 { name="osqp"; version="0.6.0.3"; sha256="1266n04c8zsv4ixf7y25jkccv9lx3rvmd7bnkxynbwga9psd3l0j"; depends=[Matrix R6 Rcpp]; }; - osrm = derive2 { name="osrm"; version="3.3.2"; sha256="10adkq8sm0jvyd35m8vvjxiqvay976fsgffyxh9sh564l053srkp"; depends=[gepaf isoband jsonlite lwgeom RCurl sf sp]; }; + osrm = derive2 { name="osrm"; version="3.3.3"; sha256="1kiy3ij2fkvaxsgbhwn1lvhqav6prsqfi5ipzkihi2piw2gfns2r"; depends=[gepaf isoband jsonlite RCurl sf 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.3.0"; sha256="02p0wiz791023zpwy8dq8blsax2yfji3cpp4b77n7ri1fsisfy39"; depends=[checkmate geojsonsf httr janitor jsonlite]; }; @@ -11320,7 +11344,7 @@ in with self; { outbreaks = derive2 { name="outbreaks"; version="1.5.0"; sha256="00369lnh65nfkcbjd5i39irdv2hcwy5cinb2dvv2x4c2q2ax9f0d"; depends=[]; }; outcomerate = derive2 { name="outcomerate"; version="1.0.1"; sha256="07mwml7r98qjgvrp938sqf7klyspz110583j0zwb72j69n4whmrj"; depends=[Rdpack]; }; outliers = derive2 { name="outliers"; version="0.14"; sha256="0vcqfqmmv4yblyp3s6bd25r49pxb7hjzipiic5a82924nqfqzkmn"; depends=[]; }; - outliertree = derive2 { name="outliertree"; version="1.1.3"; sha256="07spgpvw665f53ifcsxgdq5q8wm4fsvjmqf7qsbwknlvly06cmcn"; depends=[Rcereal Rcpp]; }; + outliertree = derive2 { name="outliertree"; version="1.2.0"; sha256="1az71acng963j58cina4ng40762g0japrms99ff7ly1pw4252vrq"; depends=[Rcereal Rcpp]; }; outreg = derive2 { name="outreg"; version="0.2.2"; sha256="04f1x7mxq4swbd7bfwjjgx4838jm6qj4piaighmhcscwrdkxa1cp"; depends=[magrittr reshape2 sandwich stringr tidyr]; }; ouxy = derive2 { name="ouxy"; version="1.1"; sha256="0f07m8zs4vnr0vpsdw1qdzdrq80qyq4477l06w9i3bb0n64yxcaa"; depends=[abc adephylo ape coda EasyABC geiger maps MCMCpack nlme phytools Sim_DiffProc TreeSim]; }; overdisp = derive2 { name="overdisp"; version="0.1.0"; sha256="0j1rr9grzhlma9hgljxhn70ia268pc6f3gbinrlqky3pg73xjg2k"; depends=[]; }; @@ -11329,7 +11353,6 @@ in with self; { overlapptest = derive2 { name="overlapptest"; version="1.1"; sha256="0r732za6lm7dk5r237nhadgbpinaz5dmb6f7pn3mbg0plkdy3mff"; depends=[spatstat]; }; overture = derive2 { name="overture"; version="0.4-0"; sha256="1s16x5kn0apb0w1f7hqzcsqvw3x621y5n6yr1qn7yb7431pdw3cz"; depends=[bigmemory]; }; owdbr = derive2 { name="owdbr"; version="1.0.1.1"; sha256="0q4654zr5aw04sssy7127vafry72b7p3d8i44fqvqg3055awin0i"; depends=[data_table dplyr httr jsonlite magrittr tibble]; }; - owl = derive2 { name="owl"; version="0.1.1"; sha256="1wc2i04pn8aimnyqbi02hhzmzi5kmh7ikbjccqbb6zb9i89v7gkx"; depends=[lattice Matrix Rcpp RcppArmadillo]; }; owmr = derive2 { name="owmr"; version="0.8.2"; sha256="0qlb5aw6n06yf8y2gd2fjp8kp3w0xgqh3fka7rxqndgvaqmin1a6"; depends=[httr jsonlite magrittr plyr tibble tidyr]; }; ows4R = derive2 { name="ows4R"; version="0.1-4"; sha256="1chvb7i9a6kalnjacfvwrnp5j0fhr6da6v6llazqarij9njxfing"; depends=[geometa httr openssl R6 rgdal sf XML]; }; oxcAAR = derive2 { name="oxcAAR"; version="1.0.0"; sha256="19inf2bcpfj4jzfym1v5f1w5fkmcycz5jrfc2hf0wsvixy53lfxa"; depends=[jsonlite stringr]; }; @@ -11361,7 +11384,7 @@ in with self; { packageRank = derive2 { name="packageRank"; version="0.3.0"; sha256="1617xah0c8rnyjq09k69yrmalfryx921fflpx7k7bk52zwrrblc9"; depends=[cranlogs data_table ggplot2 memoise RCurl rversions]; }; 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.2.1"; sha256="01nfh9han9k6gg59c6qhahfkwl9bi45ncs7mhrp0fkmxw6z21fyh"; depends=[crayon formattable htmlTable httr jsonlite lubridate pander stringr textutils tidyr]; }; - packager = derive2 { name="packager"; version="1.1.0"; sha256="1fsdh21ahhxrw77a3nwib0hypb5wn4xhz02qmm7r6z9bkg5njhak"; depends=[callr checkmate codetools crayon cyclocomp desc devtools fakemake git2r httr pkgbuild pkgload rcmdcheck remotes rprojroot usethis whisker whoami withr]; }; + packager = derive2 { name="packager"; version="1.2.0"; sha256="1jgcas51wmn00s4j9qxr8igs8mhdhv62f4pd5ajlx7qhc8h78qw8"; depends=[callr checkmate codetools crayon cyclocomp desc devtools fakemake git2r httr pkgbuild pkgload rcmdcheck remotes rprojroot usethis whisker whoami withr]; }; packagetrackr = derive2 { name="packagetrackr"; version="0.1.1"; sha256="0xjq27j7bd7lps0vp9gdinxn19wl10k2cp9wb2xjih7p6l0wd57g"; depends=[dplyr httr magrittr rappdirs]; }; packcircles = derive2 { name="packcircles"; version="0.3.3"; sha256="0gik0splf48zfl40297nh7lbgvd2qqlci99wv841mfy7858ai933"; depends=[Rcpp]; }; packrat = derive2 { name="packrat"; version="0.5.0"; sha256="1xy5dd2hrpqa07jfl4s7dsrya05mf36ms74j833scdz0zf89586n"; depends=[]; }; @@ -11382,7 +11405,7 @@ in with self; { pairsD3 = derive2 { name="pairsD3"; version="0.1.0"; sha256="0ql6pqijf24pfyid52hmf5fmh4w1ca3sm47z9vknqpnjbn47v8q2"; depends=[htmlwidgets shiny]; }; pairwise = derive2 { name="pairwise"; version="0.4.4-7"; sha256="1cgan403p9p08q3cwxnfwgrjg1l23dpmy4fjzcfla6mw24qn60wh"; depends=[]; }; pairwiseCI = derive2 { name="pairwiseCI"; version="0.1-27"; sha256="0yp9nibdrsddjqq6vdlfbpvmfgm209h99b6qqqd6wgfzng327822"; depends=[boot coin MASS MCPAN mcprofile]; }; - pairwiseComparisons = derive2 { name="pairwiseComparisons"; version="0.2.5"; sha256="1kvpa05102vy2dgcg7x7dmj2dk8h2z8ncpfcjfihaw32nabcrprx"; depends=[dplyr forcats ipmisc jmv purrr rlang tibble tidyr WRS2]; }; + pairwiseComparisons = derive2 { name="pairwiseComparisons"; version="0.3.0"; sha256="07l4i3wmi92b05ix2sy30nghwrqax5fp88f0y897bgyf7wm5fd1b"; depends=[broomExtra dplyr forcats ipmisc jmv purrr rlang tidyBF tidyr WRS2]; }; pak = derive2 { name="pak"; version="0.1.2"; sha256="05s8rg84w4xhpbaa98p3lgvsnbjrxfbcz5izgkamqa1dw4gdxml4"; depends=[assertthat base64enc callr cli cliapp crayon curl desc filelock glue jsonlite lpSolve pkgbuild pkgcache prettyunits processx ps R6 rematch2 rprojroot tibble]; }; palaeoSig = derive2 { name="palaeoSig"; version="2.0-3"; sha256="1sn2nbiq037l81qvrqbg7gf1312g8vy574hsfng07qk1jpx7vwkk"; depends=[assertr dplyr forcats ggplot2 ggrepel magrittr MASS mgcv purrr rioja rlang TeachingDemos tibble tidyr vegan]; }; palasso = derive2 { name="palasso"; version="0.0.7"; sha256="1r7kcx0i1xqvqpqwvh5khsv3g0hj3j8f56q9jbya18scywk2ivzg"; depends=[glmnet Matrix survival]; }; @@ -11421,14 +11444,14 @@ in with self; { paperplanes = derive2 { name="paperplanes"; version="0.0.1.9"; sha256="1d9grc95xqxn91lvk8v7w3z90bhl8savkhihwshyjp8ij2xpzfkl"; depends=[]; }; parSim = derive2 { name="parSim"; version="0.1.1"; sha256="1iqxv1qspx6b32qdczdzhc4sdjy5a2pb8mvg8jnc18jydi7ljs64"; depends=[dplyr pbapply]; }; parade = derive2 { name="parade"; version="0.1"; sha256="07x02j9jlldz4p0cyhw292041l3pziv56bhbzp4f0qpxhcbn5zn4"; depends=[]; }; - paradox = derive2 { name="paradox"; version="0.1.0"; sha256="00rhn8vwlcl4gnvgkqbaqyx9j1ymmgmqjry3smhc5xqnclx2spzs"; depends=[backports checkmate data_table mlr3misc R6]; }; + paradox = derive2 { name="paradox"; version="0.2.0"; sha256="0n26mpmbab8wpzwizgxwwms4qsm9p8vpifhvyqx0211zk10472hz"; depends=[backports checkmate data_table mlr3misc R6]; }; parallelDist = derive2 { name="parallelDist"; version="0.2.4"; sha256="0gqf9vi9hlbflxj941jv7hli8jiy2sqg8b312h401f8rkfqa9ckv"; depends=[Rcpp RcppArmadillo RcppParallel]; }; parallelML = derive2 { name="parallelML"; version="1.2"; sha256="05j0rb81i8342m8drwgmgi1w30q96yf501d83cdq4zhjbchphbl1"; depends=[doParallel foreach]; }; parallelMap = derive2 { name="parallelMap"; version="1.5.0"; sha256="0kjyskwvkqvsyjq55rhypif6z92r33llb7krrhc9f9w68xzp5yja"; depends=[BBmisc checkmate]; }; parallelSVM = derive2 { name="parallelSVM"; version="0.1-9"; sha256="0nhxkllpjc3775gpivj8c5a9ssl42zgvswwaw1sdhwg3cxcib99h"; depends=[doParallel e1071 foreach]; }; parallelize_dynamic = derive2 { name="parallelize.dynamic"; version="0.9-1"; sha256="03zypcvk1iwkgy6dmd5bxg3h2bqvjikxrbzw676804zi6y49mhln"; depends=[]; }; paramGUI = derive2 { name="paramGUI"; version="2.1.4"; sha256="0k2wkl99ji3w7xmd9k7zzvrr3dbf3237q7lxm527dnrq331pmxmi"; depends=[colorspace fields shiny shinydashboard TIMP]; }; - parameters = derive2 { name="parameters"; version="0.6.0"; sha256="0zin3ikc013hc713n5zs0dbhc3m4nfw1vhc3924z0mrww8r241xn"; depends=[bayestestR insight]; }; + parameters = derive2 { name="parameters"; version="0.6.1"; sha256="0mylxkf1y6mk4kf6c57x102sf4c800pfasjcfbf1hnsh6ya0m6dy"; depends=[bayestestR insight]; }; paramhetero = derive2 { name="paramhetero"; version="0.2.0"; sha256="16gvs8328bnqvhx47f0xwnmbmlakxmp4ivnjxk2b13z6qjs70ij4"; depends=[ggplot2 ggpubr lme4 survey]; }; paramlink = derive2 { name="paramlink"; version="1.1-2"; sha256="0y6wsrxwyavipmrjjznr2n920w0p6qlwapxc9mnkh9c6w3yznka2"; depends=[assertthat kinship2 maxLik]; }; params = derive2 { name="params"; version="0.6.1"; sha256="0w7k8k7z8p1y2w0dhpfssa868xaikfzfdjw2vlj1yl299k5yisax"; depends=[whisker]; }; @@ -11446,10 +11469,10 @@ in with self; { parsec = derive2 { name="parsec"; version="1.2.3"; sha256="142zxj34qsf0s537bcabf04yi2qfmy65bgczpkvbyv5vkajxl10v"; depends=[igraph netrankr]; }; parsedate = derive2 { name="parsedate"; version="1.2.0"; sha256="0gb3w6hmwxayhijpf36p5dk4h6bbdps57x3cgikwvvxkgi83rarr"; depends=[rematch2]; }; parsemsf = derive2 { name="parsemsf"; version="0.1.1"; sha256="0ks4503k06ib5lq4ar2rg0sdni99rjcqxj76b0mclasxbi07kjsa"; depends=[DBI dbplyr dplyr lazyeval RSQLite stringr tidyr]; }; - parsetools = derive2 { name="parsetools"; version="0.1.2"; sha256="0rdznny4wqq721ikcarpf4lcp9cb6911zpvjsn37flnclhvjwj0i"; depends=[]; }; - parsnip = derive2 { name="parsnip"; version="0.0.5"; sha256="1y3bkxkk1ib5p6zzz5js28n761rmxgws3rl1ravq37vk0h16bhg1"; depends=[dplyr generics globals glue magrittr prettyunits purrr rlang tibble tidyr vctrs]; }; + parsetools = derive2 { name="parsetools"; version="0.1.3"; sha256="1d18cdaw90g3362218d5i1j8n30p46drjygfri79sqgxhidb25sz"; depends=[]; }; + parsnip = derive2 { name="parsnip"; version="0.1.0"; sha256="0z28dwm1z5crlgrpkxfdllynhnhbr91qp7c03pv25wpkf445ypxb"; depends=[dplyr generics globals glue magrittr prettyunits purrr rlang tibble tidyr vctrs]; }; partDSA = derive2 { name="partDSA"; version="0.9.14"; sha256="1kp0cdsdjiay349jz22iqfzvspny8s343cfan8xahgf931k9h8p6"; depends=[survival]; }; - partialAR = derive2 { name="partialAR"; version="1.0.11"; sha256="1x7vsrjn91nr4bbkzz9mp8h93j9yhwwaqw1abh5n3bsrkq3xmgqj"; depends=[data_table ggplot2 KFAS MASS plot3D Rcpp tseries urca zoo]; }; + partialAR = derive2 { name="partialAR"; version="1.0.12"; sha256="0fv1ffgqdbl04b4cmfmvzwah8ms9cxx3dsdralkk92bxxhybcjsl"; depends=[data_table ggplot2 KFAS MASS plot3D Rcpp tseries urca zoo]; }; partialCI = derive2 { name="partialCI"; version="1.2.0"; sha256="0hi936yg4g5bg61ix2i68f8q4c5nvvshl2728ynz1rl970qfcrp7"; depends=[data_table ggplot2 glmnet KFAS MASS partialAR Rcpp TTR zoo]; }; partialOR = derive2 { name="partialOR"; version="0.9"; sha256="02vbvln8lswysaafpxq5rxb6crp7yhlc13i42kybv8fr10jaagjj"; depends=[nnet]; }; particles = derive2 { name="particles"; version="0.2.2"; sha256="0pncfpk89hsfjch8h5b86rx7hsgdyg9bsxc54f5bf0y8gh9v98qj"; depends=[digest dplyr igraph magrittr mgcv Rcpp rlang tidygraph]; }; @@ -11484,7 +11507,7 @@ in with self; { patrick = derive2 { name="patrick"; version="0.0.1"; sha256="16r0q3d9bq06393v46gabn9y9w2w7nqjcl65b7y2ryp35nv0aqsi"; depends=[dplyr purrr rlang testthat tibble]; }; patternator = derive2 { name="patternator"; version="0.1.0"; sha256="0s4vrhdfblllnhpz2awhhrkwm8d4170xg7fpsp7kvvqy8z8biwvi"; depends=[data_table]; }; patternize = derive2 { name="patternize"; version="0.0.2"; sha256="0hd6l66ybrjjndad5m2li9qqsjd0k2blhvjm469j6ab95073zq9f"; depends=[abind dplyr imager magrittr Morpho purrr raster rgdal RNiftyReg sp vegan]; }; - patternplot = derive2 { name="patternplot"; version="0.3.2"; sha256="0bzy1fq9za1251h8iiixyq397wnw9k3s59i3wi2pyjca2dydhr9a"; depends=[dplyr ggplot2 gridExtra gtable jpeg png R6 Rcpp RcppParallel]; }; + patternplot = derive2 { name="patternplot"; version="1.0.0"; sha256="0n4y23g894amwi62lx10k15i28rsmiaw52bds8dzmvkykkp9mm8q"; depends=[dplyr ggplot2 gridExtra gtable jpeg png R6 Rcpp RcppParallel]; }; pauwels2014 = derive2 { name="pauwels2014"; version="1.0"; sha256="1b7whn13lgydc69kg1fhnwkxirw0nqq75cfvii0yg0j4p8r1lw42"; depends=[deSolve ggplot2]; }; pavo = derive2 { name="pavo"; version="2.4.0"; sha256="1f71plrm5j5k66lw0za1a16rfjbl1gq4cwczybrc9rpzz6a0i6li"; depends=[cluster future_apply geometry lightr magick plot3D progressr sp viridisLite]; }; pawacc = derive2 { name="pawacc"; version="1.2.2"; sha256="0d5k0bq8zmb7sjvba3ljp97mba2iycnw44rnsnn2aajs02l1c2xg"; depends=[SparseM]; }; @@ -11565,6 +11588,7 @@ in with self; { pear = derive2 { name="pear"; version="1.2"; sha256="1ixmyzm72s18qrfv2m8xzh5503k1q90lhddq4sp46m0q7qyxb192"; depends=[]; }; pearson7 = derive2 { name="pearson7"; version="1.0-2"; sha256="0x8bnlzgmfah8lzdg8skxs7bm8yq0nkrhqi7q43h902j4jl5b8jy"; depends=[]; }; pec = derive2 { name="pec"; version="2019.11.03"; sha256="1h6fk3k9w61a9xqhvkm1zdv75nsl06n78036qvcxkcf0bkfxl360"; depends=[foreach prodlim rms survival timereg]; }; + pedSimulate = derive2 { name="pedSimulate"; version="0.0.3"; sha256="0nm8iszmi3f91l09ziw5iwmkdggx9j8w17sx3k2ar4wibq4swsfi"; depends=[]; }; pedgene = derive2 { name="pedgene"; version="3.3"; sha256="0y6kr5ad4fmxljsj0czs9h1dkz63wvqiira9ibgsf0707xb0vh7f"; depends=[CompQuadForm kinship2 Matrix survey]; }; pedigree = derive2 { name="pedigree"; version="1.4"; sha256="1dqfvzcl6f15n4d4anjkd0h8vwsbxjg1lmlj33px8rpp3y8xzdgw"; depends=[HaploSim Matrix reshape]; }; pedigreeTools = derive2 { name="pedigreeTools"; version="0.1"; sha256="0kgbjyw9dlp4s91cyg5w0p2vn2h9pg9ixrhc5pwvkp3v1acd0xfm"; depends=[Matrix]; }; @@ -11572,7 +11596,7 @@ in with self; { pedmut = derive2 { name="pedmut"; version="0.1.0"; sha256="0b8qlcl4g8kjix4q1drs1yk7wnilxqslv4p8svyabcg8wb4bnvwa"; depends=[]; }; pedometrics = derive2 { name="pedometrics"; version="0.7.0"; sha256="0rqldc67yrcg16i5q9wrmfmh3lw3qrfdxwdb4mxkjxx18v4fv737"; depends=[lattice latticeExtra Rcpp]; }; pedprobr = derive2 { name="pedprobr"; version="0.2.0"; sha256="1s986n05wciq0nwvaqhq5d4rdzdh9sli66qihmfm43rqy246kjlr"; depends=[pedmut pedtools]; }; - pedquant = derive2 { name="pedquant"; version="0.1.3"; sha256="11l6h0pvysb02f81rnwsyc8c2xj3p4smgi9dbmsv41ka54v6rss7"; depends=[curl data_table ggplot2 gridExtra httr jsonlite readr readxl rvest scales stringi TTR xml2 zoo]; }; + pedquant = derive2 { name="pedquant"; version="0.1.5"; sha256="01kmagaapx5qlvar0l862rl8s1caqzdld3qjygxi9zl232042x89"; depends=[curl data_table ggplot2 gridExtra httr jsonlite readr readxl rvest scales stringi TTR xml2 zoo]; }; pedtools = derive2 { name="pedtools"; version="0.9.3"; sha256="1jc11d1hd4wwc3lfa5h7g9sy6crybidc2mlasc3sbasjdzr1cyxb"; depends=[kinship2]; }; pegas = derive2 { name="pegas"; version="0.13"; sha256="002i7s4g0nhnq0v05gs0yssqiyhpq2f7rw2rhn31hsbgxc86frvy"; 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]; }; @@ -11586,7 +11610,7 @@ in with self; { pencopulaCond = derive2 { name="pencopulaCond"; version="0.2"; sha256="18hjjxnd0l2ms20ddqkghfbd4as5kq2rgwqzpz4y38k6nw76x511"; depends=[doParallel fda foreach igraph lattice latticeExtra pacotest quadprog TSP]; }; pendensity = derive2 { name="pendensity"; version="0.2.13"; sha256="1wcsib7m2161nqqrmgdvrj7lr8zq6njc9xr935hwfh3qbbgkmfjb"; depends=[fda lattice]; }; pense = derive2 { name="pense"; version="1.2.9"; sha256="0ls573kx3z09v848fi5pvidc5l2dhmqv9vvyjspzzfiff3z6w09i"; depends=[Matrix Rcpp RcppArmadillo robustbase]; }; - pensim = derive2 { name="pensim"; version="1.3.1"; sha256="0n4f4vyyvr362fd8sbppwhbhrfr6wvfa5706ynhx82xmq04rkfcn"; depends=[MASS penalized]; }; + pensim = derive2 { name="pensim"; version="1.3.2"; sha256="12rh9n6jjnlzjsdjjw60ams7l0n05skwkbql5d0jqrmpbxrca6rp"; depends=[MASS penalized]; }; peperr = derive2 { name="peperr"; version="1.1-7.1"; sha256="12k9crhsv3p4zrcbyr85cfwp68z3r1w2kb62g7jb7h311c7zykjx"; depends=[snowfall survival]; }; peptider = derive2 { name="peptider"; version="0.2.2"; sha256="109z81x6jcsx2651lclff7ak55zb1i89pyi58rxri40aamx4b1x2"; depends=[discreteRV dplyr plyr]; }; pequod = derive2 { name="pequod"; version="0.0-5"; sha256="0mwrgyrxgiifpnpy15qxpdrdmd7dxqihccrnj5nh8fq9fvwymamg"; depends=[car ggplot2]; }; @@ -11658,15 +11682,14 @@ in with self; { phiDelta = derive2 { name="phiDelta"; version="1.0.1"; sha256="0g1g5516p8i1gfpvsy75rdirib8sx1ki2mbf1cvgsnzh70h72gbv"; depends=[]; }; phia = derive2 { name="phia"; version="0.2-1"; sha256="0rv2akl5a488vax4sd9wnx765mch4vvcmg3iyxyljzl5kpqh5r00"; depends=[car Matrix]; }; philentropy = derive2 { name="philentropy"; version="0.4.0"; sha256="09vi6mfcig397226kq2fgymwg5ng8iysi6b2f616masscgshplxz"; depends=[dplyr KernSmooth Rcpp]; }; - phmm = derive2 { name="phmm"; version="0.7-14"; sha256="1kq7xgw3afzy1crbzqjpf2zqavmhiqkxh66j3nfisa1h4cq4kj9l"; depends=[lattice Matrix survival]; }; phonR = derive2 { name="phonR"; version="1.0-7"; sha256="0al2cbynnbvmd90lk1w1g1ppslqq0ng8vbb6bl7m4kqwd2lgv056"; depends=[deldir plotrix splancs]; }; phonTools = derive2 { name="phonTools"; version="0.2-2.1"; sha256="01i481mhswsys3gpasw9gn6nxkfmi7bz46g5c84m13pg0cv8hxc7"; depends=[]; }; phonenumber = derive2 { name="phonenumber"; version="0.2.2"; sha256="1m5idp538lvynmfp8m7l89js6hk5lpp26k419bdvj3hd3ap0n9lg"; depends=[]; }; phonfieldwork = derive2 { name="phonfieldwork"; version="0.0.3"; sha256="1d7rhyzdhm17hdd7ibvkgz3js01c7wskvxlhr1c6kzbvf0mibmb6"; depends=[phonTools rmarkdown tuneR]; }; phonics = derive2 { name="phonics"; version="1.3.2"; sha256="03iacdpzzw90jgh38mhs49gswz3292nlkizc1xr02xry6nd7357a"; depends=[BH data_table Rcpp]; }; - photobiology = derive2 { name="photobiology"; version="0.10.0"; sha256="04i8s658r4y1aynhnv58xgwcqc9la6yjn0gax791qs29ilxqs5zp"; depends=[dplyr lubridate plyr polynom rlang splus2R stringr tibble zoo]; }; + photobiology = derive2 { name="photobiology"; version="0.10.1"; sha256="1wg98lsixdz1qimigjxx7gwqxv36mgyb5i065gmsjf5jhd6w40jw"; depends=[dplyr lubridate plyr polynom rlang splus2R stringr tibble zoo]; }; photobiologyFilters = derive2 { name="photobiologyFilters"; version="0.5.0"; sha256="1zijk6g9xf29ql7pybjs1zqkyn8s2zav4vz2pskj548v6hmrcw3x"; depends=[photobiology]; }; - photobiologyInOut = derive2 { name="photobiologyInOut"; version="0.4.22"; sha256="0zk9cikvvxh8k9yixq3ssv9yk9i6142fp7iijm4n48nzma61fdd3"; depends=[colorSpec dplyr lazyeval lubridate photobiology readr readxl stringr tibble tidyr]; }; + photobiologyInOut = derive2 { name="photobiologyInOut"; version="0.4.22-1"; sha256="1dqjlcra3vqydxjf6rwha6y1bykkpqwf8bqjkljs4kb89642qbv1"; depends=[colorSpec dplyr lazyeval lubridate photobiology readr readxl stringr tibble tidyr]; }; photobiologyLEDs = derive2 { name="photobiologyLEDs"; version="0.4.3-1"; sha256="0inhl6ba1fzkak4752m60hkm6fzapzyz5kchvz18yv33dmm13v1c"; depends=[photobiology]; }; photobiologyLamps = derive2 { name="photobiologyLamps"; version="0.4.3"; sha256="1df7ngcyrmvhab80w1ggyv1p9srsvwr9f6pm8yl7hvkpkv6jbdsk"; depends=[photobiology]; }; photobiologyPlants = derive2 { name="photobiologyPlants"; version="0.4.2"; sha256="0ab5ks72mb5x03xc0ww9fcl0h13ja8402b1s670lqmmhyvp6fj3s"; depends=[photobiology photobiologyWavebands]; }; @@ -11719,7 +11742,7 @@ in with self; { pinnacle_data = derive2 { name="pinnacle.data"; version="0.1.4"; sha256="1sl36i2857b3xwx7iwgy8mkgjvz7nfa74ch1n8kcxbj59ib7mp8p"; depends=[tibble]; }; pinochet = derive2 { name="pinochet"; version="0.1.0"; sha256="0qy18mlw34cv9p7b3qb5bidxyq44k0hzj91hm5vp6wkjhik4knvi"; depends=[]; }; pinp = derive2 { name="pinp"; version="0.0.9"; sha256="1hdj0mqwz0hwl6jsh5zknbgg10bj49giqnr4y3lavfbk8d7qmmvs"; depends=[knitr rmarkdown]; }; - pins = derive2 { name="pins"; version="0.3.2"; sha256="0bjax4zwjx0csxqrn5v80mqx8aw4apsrqggxncvwprd98wlyakjr"; depends=[base64enc crayon httr jsonlite magrittr mime openssl rappdirs withr yaml zip]; }; + pins = derive2 { name="pins"; version="0.4.0"; sha256="1dg4553hjfy948nq3y7fx90ybdxnlwkfjv7zjfrf128zdwpvnb7x"; depends=[backports base64enc crayon digest filelock httr jsonlite magrittr mime openssl rappdirs withr yaml zip]; }; pinyin = derive2 { name="pinyin"; version="1.1.6"; sha256="0rw9qd5hbcmpi30vdqs31ijy37d8jlpqv0xif2nndb8cwj8x5bw2"; depends=[data_table splitstackshape]; }; pipe_design = derive2 { name="pipe.design"; version="0.5.1"; sha256="0r0szkdzifxmnnbr6675w8ij4zwqgxj3gwahc7a74mxr51f7qh8j"; depends=[ggplot2 gtools xtable]; }; pipeGS = derive2 { name="pipeGS"; version="0.4"; sha256="0ki4i70r5f195b4jfv3hxlxz3zj57mhy2yf4984bwr11impilz5w"; depends=[]; }; @@ -11738,10 +11761,10 @@ in with self; { pixmap = derive2 { name="pixmap"; version="0.4-11"; sha256="04klxp6jndw1bp6z40v20fbmdmdpfca2g0czmmmgbkark9s1183g"; depends=[]; }; pkgKitten = derive2 { name="pkgKitten"; version="0.1.5"; sha256="0nnib0gv9g22b9p01xigsgj04jv29fv7f444invfphfh9cc866m4"; depends=[]; }; pkgbuild = derive2 { name="pkgbuild"; version="1.0.6"; sha256="0xnlz6ivhkbmncg9hfw5p69lm4rjy3wn5lyxmygxyf4rrfnnqwxx"; depends=[callr cli crayon desc prettyunits R6 rprojroot withr]; }; - pkgcache = derive2 { name="pkgcache"; version="1.0.6"; sha256="1wxxrcrckgrbsqrk2l4xrrkmya85pzjij1nc8cqcym8q0sgy7vph"; depends=[assertthat callr cli curl digest filelock glue prettyunits processx R6 rappdirs rlang tibble uuid]; }; + pkgcache = derive2 { name="pkgcache"; version="1.0.7"; sha256="1abjswh5jkx60vssrsfgznl2l97rys00icwrxp1pm6i99aqsiscp"; depends=[assertthat callr cli curl digest filelock glue prettyunits processx R6 rappdirs rlang tibble uuid]; }; pkgcond = derive2 { name="pkgcond"; version="0.1.0"; sha256="0pxj798042g23cf19r67nbgdyhpd868n2pkqjvjgrgr8ivwnkf1h"; depends=[]; }; pkgconfig = derive2 { name="pkgconfig"; version="2.0.3"; sha256="0l1qph8zyi2sic3k2qcd7vlfl7rzfh1q7z7zvjkl5f7y1x2fy3rk"; depends=[]; }; - pkgdown = derive2 { name="pkgdown"; version="1.5.0"; sha256="03r33cdnbq3xzm9485xhq2pn3vwxiji6rz5s7lvrcyq2k0gmdw7g"; depends=[callr cli crayon desc digest evaluate fansi fs highlight httr magrittr MASS memoise openssl processx purrr rematch2 rlang rmarkdown rstudioapi tibble whisker withr xml2 yaml]; }; + pkgdown = derive2 { name="pkgdown"; version="1.5.1"; sha256="0sy7f4bzbdzh2z8m30hq2i5yx9vrpmridrg4l85qpvwm5j7yhd88"; depends=[callr cli crayon desc digest evaluate fansi fs highlight httr magrittr MASS memoise openssl processx purrr rematch2 rlang rmarkdown rstudioapi tibble whisker withr xml2 yaml]; }; pkgfilecache = derive2 { name="pkgfilecache"; version="0.1.2"; sha256="07x63w19fg7sl547501r2dx2ds5sfdfb29xvqrvjibf8265x25fw"; depends=[downloader rappdirs]; }; pkggraph = derive2 { name="pkggraph"; version="0.2.3"; sha256="1isiywgm20rypc5qr03p0k7lis76zzd96x5ncbvia644d2n13brm"; depends=[curl data_table dplyr ggnetwork ggplot2 htmltools igraph intergraph Matrix network networkD3 plyr RColorBrewer tibble]; }; pkgload = derive2 { name="pkgload"; version="1.0.2"; sha256="0z7jvharafahi2gv5547mk1n499isjzw06kfwymmxc0gd575d1ii"; depends=[desc pkgbuild rlang rprojroot rstudioapi withr]; }; @@ -11754,7 +11777,6 @@ in with self; { pks = derive2 { name="pks"; version="0.4-1"; sha256="1lwm65s2b9y6vr1yr683n535yz8hbzc6j289a6yp45v2yai72m07"; depends=[sets]; }; pksensi = derive2 { name="pksensi"; version="1.1.5"; sha256="108qm4y1ss1pd6nhckwmg8b45hc3pg0xn5ch8q2xzi1h9imm7hz3"; depends=[data_table deSolve dplyr getPass ggplot2 magrittr reshape]; }; 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]; }; placer = derive2 { name="placer"; version="0.1.3"; sha256="0d7b6mkyyrcjn1pqxlj9mjis6vzks986i7vhc8ffkp8hz8sc7271"; depends=[]; }; plainview = derive2 { name="plainview"; version="0.1.0"; sha256="0yvw357p1hwrlj4c2sjr4klmy6j98a3kbdfwg0snaiv0drdyhznk"; depends=[gdalUtils htmltools htmlwidgets lattice png raster viridisLite]; }; @@ -11796,10 +11818,10 @@ in with self; { plotluck = derive2 { name="plotluck"; version="1.1.1"; sha256="16wqj4xfa8b7kal6v8mp2zlhwf9l3y6y5n44qbpvy652gzb2rw2z"; depends=[ggplot2 hexbin Hmisc plyr quantreg RColorBrewer scales]; }; plotly = derive2 { name="plotly"; version="4.9.2.1"; sha256="1f0x83a2s7200iqi6gpngijks06fcvcbm6701d5r5rxpb8rawppl"; depends=[base64enc crosstalk data_table digest dplyr ggplot2 hexbin htmltools htmlwidgets httr jsonlite lazyeval magrittr promises purrr RColorBrewer rlang scales tibble tidyr viridisLite]; }; plotlyGeoAssets = derive2 { name="plotlyGeoAssets"; version="0.0.2"; sha256="1c6i4dz5qmym1pcddgffcqgb76jz84252xldprg2caylrqvzv6b7"; depends=[]; }; - plotmo = derive2 { name="plotmo"; version="3.5.6"; sha256="15555b7y62sc0z3r41gb56fmc6rmj1icnanyibx22v8kjz48vw3q"; depends=[Formula plotrix TeachingDemos]; }; + plotmo = derive2 { name="plotmo"; version="3.5.7"; sha256="135k643vf2np0y20zrhfy4id1bjg7bi285csg5fzvarwlr4nldma"; 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-7"; sha256="1x92mmyfry127zzr6cmcj6kjsc4zhxrrdlr0jcxn3bb0hpdfps54"; depends=[]; }; + plotrix = derive2 { name="plotrix"; version="3.7-8"; sha256="104llmr6dvlcnfpmd8zbdlv63k79djc4qqgadjavj4v4cmz1zkcc"; 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=[]; }; @@ -11811,6 +11833,7 @@ in with self; { plsdepot = derive2 { name="plsdepot"; version="0.1.17"; sha256="1i00wxr451xpfy6dnvcm11aqf9106jsh5hj7gpds22ysgm4iq5w4"; depends=[]; }; plsdof = derive2 { name="plsdof"; version="0.2-9"; sha256="1g41nbycgzjwrackbdf08q1phqpyy6zihm5ak2728683vd88fxzv"; depends=[MASS]; }; plsgenomics = derive2 { name="plsgenomics"; version="1.5-2"; sha256="1pvb50nv6jc99bm2hsxpzazg26y49yi24wwwim5xcjj6j1szbip4"; depends=[boot fields MASS plyr reshape2 RhpcBLASctl]; }; + plsmod = derive2 { name="plsmod"; version="0.0.1"; sha256="16yc8ydkc054is0f17nly4kwakfh410i3hqwas0479v1qywcszxb"; depends=[dplyr generics magrittr mixOmics parsnip purrr rlang tibble tidyr]; }; plsmselect = derive2 { name="plsmselect"; version="0.2.0"; sha256="044mwdqv5vw0apmx3yhn6xkdmw6baalvb8c6hhmawcs279kwi1m9"; depends=[dplyr glmnet mgcv survival]; }; plspm = derive2 { name="plspm"; version="0.4.9"; sha256="03aj1ffq11hh931dbkxy9ba74xyvzmr1ylrj4fw1rbryrwqg89v6"; depends=[amap diagram shape tester turner]; }; plspm_formula = derive2 { name="plspm.formula"; version="1.0.1"; sha256="1i2d1q8pz21js1ci8afnqzcky430hh1iwf5f6jr3j9yr9gs365k5"; depends=[plspm]; }; @@ -11829,7 +11852,7 @@ in with self; { pmd = derive2 { name="pmd"; version="0.1.5"; sha256="18a7j5lvsl2jsay4g7790slj12xkljlnrpvg66cq5cvsid8qm8x8"; depends=[rcdk RColorBrewer rmarkdown shiny]; }; pmdplyr = derive2 { name="pmdplyr"; version="0.3.1"; sha256="1155hikxfz9rp111sy96kj2dkka45ip1xi7kximq9ilsn5kwswzn"; depends=[dplyr lubridate magrittr pillar rlang tibble tidyr tidyselect vctrs]; }; pmhtutorial = derive2 { name="pmhtutorial"; version="1.5"; sha256="1hcw8hwpsivbhz86lnzy08q9n8vahnq8f7rmi4xkmg6b44582cqx"; depends=[mvtnorm Quandl]; }; - pmml = derive2 { name="pmml"; version="2.3.0"; sha256="13w5i98yj3ksbryzsgkx3i59iafywygyq1dk8x2c0nlb1nm0dji9"; depends=[stringr XML]; }; + pmml = derive2 { name="pmml"; version="2.3.1"; sha256="1qsrpbmwgmq9s45f30657cpfzkrvva8h1hqq1g3fd69p5g735rwp"; depends=[stringr XML]; }; pmmlTransformations = derive2 { name="pmmlTransformations"; version="1.3.3"; sha256="0315kb5x04pidpzr04yaxyynp0mz4ilzp7vkspq4agjkds5hyc88"; depends=[]; }; pmpp = derive2 { name="pmpp"; version="0.1.1"; sha256="1srmkih6zsyf8yf1f045xy1afcz0if6nf1ncslgrq6rgm7330lkw"; depends=[data_table dplyr ggplot2 magrittr MASS Matrix minqa moments plm pracma]; }; pmr = derive2 { name="pmr"; version="1.2.5"; sha256="0dq97dfjmgxlhr3a2n20vyyzfmamcicw878hdxpw31lw02xs6yls"; depends=[]; }; @@ -11847,7 +11870,7 @@ in with self; { pointRes = derive2 { name="pointRes"; version="1.1.3"; sha256="0yfzidc93ghpf116lxbx4fr0d71wl79y3nz6mkirx4pli6gb8x8d"; depends=[ggplot2 gridExtra plyr TripleR]; }; pointblank = derive2 { name="pointblank"; version="0.3.1.1"; sha256="0qqj3x4zvh14b2kirvvyzscm9jsk6k11s6cqjdwv6pyb32afn1iq"; depends=[blastula cli DBI dbplyr dplyr ggforce ggplot2 glue gt htmltools magrittr rlang scales tibble tidyselect]; }; pointdensityP = derive2 { name="pointdensityP"; version="0.3.4"; sha256="0vv8j1yz8n2vmmp6bg2i8w3dchdbybsdxn3sk5d1ync2knih8l2s"; depends=[data_table]; }; - 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]; }; + poio = derive2 { name="poio"; version="0.0-4"; sha256="12d47hn9rsx2n0fl107dpswfklnh8nkm0kspcxf7yfljayvxr474"; depends=[assertive_base assertive_files assertive_properties assertive_sets assertive_strings assertive_types devtools digest dplyr magrittr purrr R6 stringi tibble whoami]; }; poisDoubleSamp = derive2 { name="poisDoubleSamp"; version="1.1"; sha256="13wyj9jf161218y4zjv2haavlmanihp9l59cvh7x8pfr9dh2dwr8"; depends=[Rcpp]; }; poisFErobust = derive2 { name="poisFErobust"; version="2.0.0"; sha256="1i6y3745i385y3r45i0xk7ciw1k6brmn709k5qhx8xphq0k4an5n"; depends=[data_table glmmML]; }; poisbinom = derive2 { name="poisbinom"; version="1.0.1"; sha256="0mjxg0s3nck7qrmq4bbrhwxfwr6fqml54s9k8q1mkfzlifa7qyf7"; depends=[Rcpp]; }; @@ -11855,18 +11878,19 @@ in with self; { poisson = derive2 { name="poisson"; version="1.0"; sha256="1diyf1b84sr6iai3ghd3kcp6fc6w7fan49wzs1lzvxxsmp15ag2d"; depends=[]; }; poisson_glm_mix = derive2 { name="poisson.glm.mix"; version="1.2"; sha256="0328m279jfa1fasi9ha304k4wcybzr7hldww7wn0cl7anfxykbv8"; depends=[]; }; poissonMT = derive2 { name="poissonMT"; version="0.3-5"; sha256="14qkc8qz3423b13gp6gsp8cbb1nv9wwjjfa4i9zc15qy5i99ha26"; depends=[checkmate MASS robcbi robustbase]; }; + poissonreg = derive2 { name="poissonreg"; version="0.0.1"; sha256="04qika4k0hak8kp6z4jqdzslymy7wklw4bx6kcmz3932avlwyym9"; depends=[dplyr glue parsnip purrr rlang tibble tidyr]; }; poistweedie = derive2 { name="poistweedie"; version="1.0"; sha256="18992fafypds3qsb52c09fasm3hzlyh5zya6cw32wnhipmda643m"; depends=[]; }; poker = derive2 { name="poker"; version="0.8.8"; sha256="14ik77440z22k4kwq0p1fn7adzi0p8mh8j8hd7ayinvrab4b5r85"; depends=[]; }; polaroid = derive2 { name="polaroid"; version="0.0.1"; sha256="0m3jbiz4n7mgbbdkd28m6dqsclyjcgshpxd6ws8df7zchx7fch07"; depends=[argonDash argonR colourpicker ggplot2 hexSticker png shiny shinyWidgets]; }; policytree = derive2 { name="policytree"; version="0.9.2"; sha256="0d0b3rdmcr692rkbg223l0cwc86zlj2p75m9jlgk6w07f1n2h68p"; depends=[BH grf Rcpp]; }; poliscidata = derive2 { name="poliscidata"; version="2.2.3"; sha256="18mmdzf9hrfz36rh1rg1j5q1m131xadppy272y4f4yay0ljafbm2"; depends=[abind car descr ENmisc gplots Hmisc plotrix plyr survey weights xtable]; }; polite = derive2 { name="polite"; version="0.1.1"; sha256="15hiifaf63hx0xn453lr0xhdnxqifrgyrgrymp0a9k3j7qja59jk"; depends=[here httr magrittr memoise ratelimitr robotstxt rvest usethis]; }; - politeness = derive2 { name="politeness"; version="0.5.1"; sha256="0vvqh53kj4vm6wfg2fk5gdxyiycg7zg72m8d7qym9si930jbm32s"; depends=[data_table ggplot2 glmnet quanteda spacyr stringr textclean textir tm]; }; + politeness = derive2 { name="politeness"; version="0.6.0"; sha256="1mrg4k76h77qrd34b8imcn4nh0vchf8v6jbymlgigxgr7m75gpmj"; depends=[data_table ggplot2 glmnet quanteda spacyr stringr textclean textir tm]; }; politicaldata = derive2 { name="politicaldata"; version="0.1.3"; sha256="1n25k53mmlmmg9p9a36jh4z6xhl1yyv9v1c56mav873105h359wi"; depends=[]; }; pollen = derive2 { name="pollen"; version="0.72.0"; sha256="0plxc7rys5q4c1dwammv3b2pnys1hdh5ic0b2ndmv5cbyspf2h0y"; depends=[dplyr lubridate purrr]; }; pollimetry = derive2 { name="pollimetry"; version="1.0.1"; sha256="09zmcwlgzl4fnkdg2m424ibv3izzrm595c7pi4mc3bd1g8sa2ypn"; depends=[brms repmis]; }; pollstR = derive2 { name="pollstR"; version="2.0.1"; sha256="13g5z1hix1bmsxznq5qx82yf445rvvyn67ch9bihxm1hr4cr4sbl"; depends=[httr lubridate purrr stringr]; }; - pollster = derive2 { name="pollster"; version="0.1.0"; sha256="1hyh9xc6h6lzsbgymg3m1660ia7bg9c9nv2dgsy83lzpjrzc7yn5"; depends=[dplyr forcats labelled lubridate rlang stringr tidyr]; }; + pollster = derive2 { name="pollster"; version="0.1.1"; sha256="1a4k0d5cs9sziq1idd4q6dakl8cy3w8iakgqnd40w3d7vx63hmfd"; depends=[dplyr forcats labelled rlang stringr tidyr]; }; polmineR = derive2 { name="polmineR"; version="0.8.0"; sha256="1j9f83b1lfb02q830zaffrspxrhp58j9l3cc80cxiflmkm9s1jm9"; depends=[data_table DT jsonlite knitr magrittr Matrix pbapply R6 RcppCWB slam stringi tm xml2]; }; polspline = derive2 { name="polspline"; version="1.1.17"; sha256="0c7fnxpqpy3hibiim4yib6l6bq363s97wwvllxp4lp8h06fjcyyn"; depends=[]; }; polyCub = derive2 { name="polyCub"; version="0.7.1"; sha256="0ln1n5w64vgq63gm4mm9wzl9lbp7ppgaxg0ba0yw0xsr5cmkyp37"; depends=[sp]; }; @@ -11881,7 +11905,7 @@ in with self; { polycor = derive2 { name="polycor"; version="0.7-10"; sha256="0wzwzklflbhi8sv9m7ijwr16v9zmkk0j0v4pbcpf32f8lbn3psna"; 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]; }; + polylabelr = derive2 { name="polylabelr"; version="0.2.0"; sha256="01b2v0l5g8nxwbd6nwqv8ahypgh6gfhd4qabg75brlj7z1iyfzf2"; depends=[Rcpp]; }; polymapR = derive2 { name="polymapR"; version="1.0.20"; sha256="16gyzlvj2nfyl9ypv5cmvqvn3phxpxf36b0bnvslkxyyx0fsyxrx"; depends=[combinat doParallel foreach igraph knitr MDSMap]; }; polynom = derive2 { name="polynom"; version="1.4-0"; sha256="1pflscwc0qzdf0y60j7s0dkglgmz18xajywfbn6s263idyr8idy5"; depends=[]; }; polypoly = derive2 { name="polypoly"; version="0.0.2"; sha256="00c1hrnf575awvh0rlsnf6nkgi9p3fnqhd1knamkgb4icwi5s46d"; depends=[ggplot2 reshape2 rlang tibble]; }; @@ -11890,7 +11914,7 @@ in with self; { polywog = derive2 { name="polywog"; version="0.4-1"; sha256="02qk1cyvkd77mwlvhj1zzzi0bmy7qxz29j2v730wp7rz4w7h5x5n"; depends=[foreach Formula glmnet iterators Matrix miscTools ncvreg Rcpp stringr]; }; pom = derive2 { name="pom"; version="1.1"; sha256="02jv19apn0kmp1ric2cxajlaad2fmsz4nm4izd2c3691vzas7l83"; depends=[matrixcalc]; }; pomdp = derive2 { name="pomdp"; version="0.9.2"; sha256="0bzppkda355zj467ahcyaf2dsjajyiznzi0y07n9pf9ccr6rh5lg"; depends=[igraph]; }; - pomp = derive2 { name="pomp"; version="2.7"; sha256="0gqc84hsxms3s2qcb082vsvzfawbc5xyl11f3lkmqkpxmqyazs7h"; depends=[coda deSolve digest magrittr mvtnorm plyr reshape2]; }; + pomp = derive2 { name="pomp"; version="2.8"; sha256="13y1jfx9j2dqya9icv4k5wvkjs09d3xhqkzwicf0zdfqlypjd79l"; depends=[coda deSolve digest magrittr mvtnorm plyr reshape2]; }; pompom = derive2 { name="pompom"; version="0.2.0"; sha256="1alz3lrj7m16vhymsvvrcmf0kmgx88q2f3v4j6wiciqv77bnyai1"; depends=[ggplot2 lavaan qgraph reshape2]; }; pooh = derive2 { name="pooh"; version="0.3-2"; sha256="0qwa5j91aypasvsf4xcfbl6lz7llawdr38jiflzmfak2ad72rv7j"; depends=[]; }; pool = derive2 { name="pool"; version="0.1.4.3"; sha256="065pbvhgvvgv00df4kj4zn7mlbrv2iqa1583k0hlgavn15gfm6d2"; depends=[DBI dbplyr dplyr later R6]; }; @@ -11898,7 +11922,7 @@ in with self; { poolfstat = derive2 { name="poolfstat"; version="1.1.1"; sha256="12iwhfj1a87mbis7whgp4z3qg97xkj90rw8b9jsqnfmzhz6fn0yp"; depends=[doParallel foreach]; }; pooling = derive2 { name="pooling"; version="1.1.2"; sha256="19mrzax3k35fhgjpnlrigf0nscsdl3xb7k82s5q472k4bcz7ya5b"; depends=[cubature data_table dplyr dvmisc ggplot2 ggrepel mvtnorm numDeriv]; }; poolr = derive2 { name="poolr"; version="0.8-2"; sha256="1rkfnrz5x7f9kqpivj0gvs3fxfb9agnm8sybb7wmvvcsmshzrpkf"; depends=[Matrix]; }; - poorman = derive2 { name="poorman"; version="0.1.9"; sha256="0g3f02752i890pq3yayhjwlczddmwqcc67xza3249301k508vbpv"; depends=[]; }; + poorman = derive2 { name="poorman"; version="0.1.11"; sha256="06b1h2a391ha7jd38rr44mzf2wry2bcgg16ypcv2scnfiwm96gnk"; depends=[]; }; pop = derive2 { name="pop"; version="0.1"; sha256="0hbxdrkasb69x7ipddvyrzl5vvc7dd6rzj1vy7v3chg3rzgq89cj"; depends=[igraph MASS]; }; popEpi = derive2 { name="popEpi"; version="0.4.8"; sha256="1gc7kyik0209pc8mvl6c69lzb3dnkif0mby4l4pq8zfdz73lmi06"; depends=[data_table Epi survival]; }; popKorn = derive2 { name="popKorn"; version="0.3-0"; sha256="1zcl6ms7ghbcjyjgfg35h37ma8nspg15rk2ik82yalqlzxjf7kxw"; depends=[boot]; }; @@ -11928,15 +11952,16 @@ in with self; { postlightmercury = derive2 { name="postlightmercury"; version="1.2"; sha256="1345ckp50jplcdqp3a250c6mhapqh9322jzpxj5dyqmbg2nmgp9i"; depends=[crul jsonlite purrr rvest tibble xml2]; }; postlogic = derive2 { name="postlogic"; version="0.1.0.1"; sha256="11bpmfn375zpyg90dh44h86cvppzri1smmkn26jyydqjz74f4q9w"; depends=[]; }; potts = derive2 { name="potts"; version="0.5-9"; sha256="1kiha209w9nyyx4qqsdp51q2y7ny67nzqkdanlrh2106lcab3hj8"; depends=[]; }; + pould = derive2 { name="pould"; version="1.0.0"; sha256="03338c61njhrb1dyxndyci1kdalzc38h0l7a1majv8nf82k40l62"; depends=[BIGDAWG gap ggplot2 haplo_stats reshape2]; }; povcalnetR = derive2 { name="povcalnetR"; version="0.1.0"; sha256="11hwb52lrvdxplsx85ps54k2k7cvr0k4g5s2cj2a5l3rlqbyayx8"; depends=[dplyr ggplot2 ggthemes httr js jsonlite memoise naniar purrr readr stringr tibble tidyr]; }; powdR = derive2 { name="powdR"; version="1.2.0"; sha256="0l1sb4bxam53jg1zfzqy851652c0yr88gz04z97cqdcn7smg6fgi"; depends=[baseline DT ggplot2 ggpubr nnls plotly plyr reshape shiny shinyWidgets tidyr]; }; powdist = derive2 { name="powdist"; version="0.1.4"; sha256="1my88ag5q9hwkn2wy79jl9008gpvg0bsrnyc81gkdfi7pjh2mp1z"; depends=[gamlss_dist normalp rmutil]; }; - poweRlaw = derive2 { name="poweRlaw"; version="0.70.2"; sha256="1asr6ikr7hmj78jyg8r1gwvcjg14addkxdiz92nh06lv71a183r4"; depends=[VGAM]; }; + poweRlaw = derive2 { name="poweRlaw"; version="0.70.5"; sha256="1z1x93zc4qim53bx4cjq611xfa1rxw7cr2j2saq9vxr1j58fw99p"; depends=[pracma]; }; powerAnalysis = derive2 { name="powerAnalysis"; version="0.2.1"; sha256="0cma4v402n6wcb2gy9g1ymydzh8vimy9nfrrn8xhnjsf7x6jh215"; depends=[]; }; powerCompRisk = derive2 { name="powerCompRisk"; version="1.0.1"; sha256="11xprjn9hzi8gxrsi7wivwgchg9h2apgxa63fp466ngjfy5ybxf4"; depends=[mvtnorm]; }; powerEQTL = derive2 { name="powerEQTL"; version="0.1.3"; sha256="1045vkzl5p20mqlsm0j6vnyyvfz5v6jyy443c38sw1cps0a09i1n"; depends=[powerMediation]; }; powerGWASinteraction = derive2 { name="powerGWASinteraction"; version="1.1.3"; sha256="1i8gfsk9qzx54yn661i4x9k7n7b6r1jd808wv1hcq7870mzyb27k"; depends=[mvtnorm pwr]; }; - powerMediation = derive2 { name="powerMediation"; version="0.2.9"; sha256="1rk8h8qn4b68ra5h5hiy9fvvbpskj9y806rwrvl1l7gs7xlmji7l"; depends=[]; }; + powerMediation = derive2 { name="powerMediation"; version="0.3.2"; sha256="06liw58hwvd5n55axwldrngwfqckmi5yh2i9b2c75cghqdnihvby"; depends=[]; }; powerSurvEpi = derive2 { name="powerSurvEpi"; version="0.1.0"; sha256="1xxicvw113mc2y889rklws3xml5z64sgjpn4wg95gbw6nadch7zz"; depends=[survival]; }; powerbydesign = derive2 { name="powerbydesign"; version="1.0.4"; sha256="0xd4hylx7jl4ksycz5gfjcgy92mh5c9d4r34ap1g81ybmyk7yrsj"; depends=[gdata ggplot2 lme4 MASS plyr reshape2 stringr]; }; powerlmm = derive2 { name="powerlmm"; version="0.4.0"; sha256="0dpfvbp54lhz7ibzihqqrbl45s6dqxn6qyvv39mk2166hjcgi1h2"; depends=[lme4 MASS Matrix scales]; }; @@ -11947,7 +11972,7 @@ in with self; { ppclust = derive2 { name="ppclust"; version="1.1.0"; sha256="0vmgjjy7gin88qailzfcwapndl5s8fm6i8kw9gv6aykg9mr75xlv"; depends=[inaparc MASS]; }; ppcong = derive2 { name="ppcong"; version="0.0.2"; sha256="0k34ibzyxak2a8xhsf4jdp50w8k8dsd1nn3gcdcakx8s2rgymq7v"; depends=[curl jsonlite tfse tibble]; }; ppcor = derive2 { name="ppcor"; version="1.1"; sha256="1x9b2kb8s0bp92b17gby0jwzzr3i4cf3ap9c4nq7m8fav72g0y3a"; depends=[MASS]; }; - ppgam = derive2 { name="ppgam"; version="1.0.0"; sha256="0wna2z8pvr0zxvlp7zbvjnl99r1z976jiq44gwh425ypnla6wgpp"; depends=[evgam MASS mgcv]; }; + ppgam = derive2 { name="ppgam"; version="1.0.1"; sha256="0w2jci5k0y8m7rapj8w6xq849y59m7y4fp9n3f5l6q954mbc6bv0"; depends=[evgam MASS mgcv]; }; ppgmmga = derive2 { name="ppgmmga"; version="1.2"; sha256="1dq0p3xna5r1kiyhiziz3wc78dfqh362qhna5hmkjzhljawr9jg0"; depends=[cli crayon GA ggplot2 ggthemes mclust Rcpp RcppArmadillo]; }; ppitables = derive2 { name="ppitables"; version="0.5.2"; sha256="1fwl2mscnfkbdpdjb0vkyv6xrbi73rfkxlbpri35hfqscaxlzk98"; depends=[tibble tidyr]; }; ppls = derive2 { name="ppls"; version="1.6-1.1"; sha256="1zyrisy3c4cz896j1bjh61sf57wdl9p8ywdq268cl819szfq78mx"; depends=[MASS]; }; @@ -11975,7 +12000,7 @@ in with self; { predict3d = derive2 { name="predict3d"; version="0.1.3.3"; sha256="1kb3jacpgzln1ddnkfzhvfpzzf9wig60lppca6iy0fvq5cm8ddr4"; depends=[dplyr ggiraphExtra ggplot2 magrittr modelr moonBook plyr prediction purrr reshape2 rgl rlang stringr TH_data tidyr]; }; prediction = derive2 { name="prediction"; version="0.3.14"; sha256="0awlq5lxfia6m2b91w73rksp93rbwv5gwqb36wbji4rgq41rzbrx"; depends=[data_table]; }; predictionInterval = derive2 { name="predictionInterval"; version="1.0.0"; sha256="029hc57cblfcbqckrghf95l2rkn7acgb4yr36da01bx8bmpww0bn"; depends=[ggplot2 MASS MBESS pbapply]; }; - predictmeans = derive2 { name="predictmeans"; version="1.0.2"; sha256="191kidf66xy8g779chpsyxp02hgn1npb4acga9nnd5f428bvzfc7"; depends=[ggplot2 lme4 Matrix nlme numDeriv pbkrtest plyr]; }; + predictmeans = derive2 { name="predictmeans"; version="1.0.4"; sha256="11282jzmlkbawsh1k4582a7yh4xxfh01sn6zp5nbdsr9c9p6vqfz"; depends=[ggplot2 lme4 Matrix nlme numDeriv pbkrtest plyr]; }; predictoR = derive2 { name="predictoR"; version="1.1.0"; sha256="12y23q08m7v4dl6anbkhf7zxy8wkah5bxy1c2fdcwb6ng3snpfvb"; depends=[ada colourpicker corrplot DT e1071 flexdashboard glmnet kknn neuralnet randomForest rattle ROCR rpart shiny shinyAce shinydashboardPlus shinyjs shinyWidgets tidyverse xgboost zip]; }; predictrace = derive2 { name="predictrace"; version="1.0.0"; sha256="1vpamn1j1jqdjar14j7fn4gvr8wq8lpqfnrwifgl0qvpa4y1938y"; depends=[dplyr here tidyr]; }; predkmeans = derive2 { name="predkmeans"; version="0.1.1"; sha256="0352c50zlyzn8fczrkinayllj9jp978njjl7dazzkzypx0p20va5"; depends=[e1071 maxLik mgcv Rcpp RcppArmadillo]; }; @@ -12058,7 +12083,7 @@ in with self; { progenyClust = derive2 { name="progenyClust"; version="1.2"; sha256="0azp5pvk316s8xbawcqwqfd80fxb4xn8hc6aq87xwksc6fhwp94l"; depends=[Hmisc]; }; prognosticROC = derive2 { name="prognosticROC"; version="0.7"; sha256="0lscsyll41hpfzihdavygdzqw9xxjp48dmy4i17qsx5h01jl1h4i"; depends=[survival]; }; progress = derive2 { name="progress"; version="1.2.2"; sha256="0dgzb362641aqm8xd88iqa8jmpdm43xs0aba0d5kk6fvapnxi95l"; depends=[crayon hms prettyunits R6]; }; - progressr = derive2 { name="progressr"; version="0.4.0"; sha256="1wgqabp8qmg58gymv3wq9ci5mp64isbdgg1by5s9g8ncwyhnfalb"; depends=[digest]; }; + progressr = derive2 { name="progressr"; version="0.5.0"; sha256="0w4vx1sk0qxnzkjqzvc6facd142qah2nzzkrcmgnsajp025xxfs5"; depends=[digest]; }; proj4 = derive2 { name="proj4"; version="1.0-10"; sha256="1l6i4735ki6y2qhmg1gmrj93rzrvgpzi23rr3a1akkqp58bnyfaz"; depends=[]; }; projections = derive2 { name="projections"; version="0.3.1"; sha256="12vskql6x04jzik72a0vx83amfj01w9f7mxn052vsv7aaljbi124"; depends=[distcrete ggplot2 incidence]; }; projects = derive2 { name="projects"; version="2.1.0"; sha256="0clrspmrlfi8w8h8afbpfjfg74qn1ys6zsb8gj3g5p0lcap2269g"; depends=[dplyr fs lubridate magrittr purrr readr rlang rstudioapi sessioninfo stringr tibble vctrs zip]; }; @@ -12066,16 +12091,14 @@ in with self; { projpred = derive2 { name="projpred"; version="1.1.6"; sha256="07bixjpnvj9i5hsr9bfycnxryzsw2vg27z1lw86aj7948wdjgar1"; depends=[ggplot2 loo Rcpp RcppArmadillo]; }; promises = derive2 { name="promises"; version="1.1.0"; sha256="01l0ydjvvy6afcg5d6pzvk1ikd3djq8n2flv8c831ksn68z0zsn8"; depends=[later magrittr R6 Rcpp rlang]; }; promote = derive2 { name="promote"; version="1.1.1"; sha256="1cdz4xqinyzpbbgkxxd4f86n1h8zj88vp5z6w01cxd5ykyjf5411"; depends=[httr jsonlite stringr]; }; - promotionImpact = derive2 { name="promotionImpact"; version="0.1.3"; sha256="1aik47g82mian7yv5a4vi7wr4a7vx8larfqgar1mf2a7kqv5ik7w"; depends=[crayon data_table dplyr ggplot2 ggpubr KernSmooth lmtest prophet Rcpp reshape2 scales stringr strucchange]; }; prop_comb_RR = derive2 { name="prop.comb.RR"; version="1.2"; sha256="10s52fkq7rv6v4gw1yd46f0fbg89ksim0qhgb5jbglzrqh585ny5"; depends=[rootSolve]; }; propOverlap = derive2 { name="propOverlap"; version="1.0"; sha256="0q72z9vbkpll4i3wy3fq06rz97in2cm3jjnvl6p9w8qc44zjlcyl"; depends=[Biobase]; }; propagate = derive2 { name="propagate"; version="1.0-6"; sha256="17jinz1jramlsf87i7vyn2qp82rc1dacljfaxxplrk3crhw3bhs7"; depends=[ff MASS minpack_lm Rcpp tmvtnorm]; }; properties = derive2 { name="properties"; version="0.0-9"; sha256="1zd66cg31yd53rqsc0cwxhlpfn7kvc67qdh3vyj9qib8kwxaw1zl"; depends=[]; }; - prophet = derive2 { name="prophet"; version="0.6"; sha256="17whiynwfff7xajj89flr80kz2k4x559cbhf72fvyf9xpqg3vg09"; depends=[dplyr dygraphs extraDistr ggplot2 Rcpp rlang rstan scales tidyr xts]; }; proportion = derive2 { name="proportion"; version="2.0.0"; sha256="0a71f6hz6blb7550m9x0di84vp51yjhnn952301rwlrh3axf6dbr"; depends=[ggplot2 TeachingDemos]; }; propr = derive2 { name="propr"; version="4.2.6"; sha256="16ghgzpwz6q9zlaa0pc8wqv0wpz81c75n7zwjyr1lv9y19qwlkfg"; depends=[fastcluster ggplot2 igraph Rcpp]; }; prospectr = derive2 { name="prospectr"; version="0.2.0"; sha256="16ba2dmg1v2gsd66s25c28s413vg5xcbhicb75qwpijlgmjvfpgi"; depends=[foreach iterators Rcpp RcppArmadillo]; }; - protViz = derive2 { name="protViz"; version="0.6.3"; sha256="1ldciqh3f43xr9663yyhd9r6qwrg4c4vmkprlcancbnd460wakg7"; depends=[Rcpp]; }; + protViz = derive2 { name="protViz"; version="0.6.4"; sha256="1qq9bf4485x8cviry9fmhnv4hw9aw657w134003myzcv42c4pml6"; depends=[Rcpp]; }; protag = derive2 { name="protag"; version="1.0.0"; sha256="1iaw2w1d7hdvlg5vplpqc49wq08dgmm0ifvp2v0ggqb8invvdnw8"; depends=[dplyr ggplot2 RColorBrewer]; }; proteomicdesign = derive2 { name="proteomicdesign"; version="2.0"; sha256="01s47pgwxy4xx10f3qmbfv59gbaj0qw017kpkpsn33s8w7ad63r0"; depends=[MASS]; }; proteomics = derive2 { name="proteomics"; version="0.2"; sha256="01cd4sb79gcx8gbzl624scvjbwhgcsca1wdvvfkhsv7jfwdd2ry2"; depends=[foreach ggplot2 plyr reshape2]; }; @@ -12095,7 +12118,7 @@ in with self; { proxy = derive2 { name="proxy"; version="0.4-23"; sha256="17b6qfllqrhzrxqgx7dccffgybnkcria5a68ap5ly3plg04ypm4x"; depends=[]; }; proxyC = derive2 { name="proxyC"; version="0.1.5"; sha256="159bc42x4shm6n3rh9fc8ziv3ivq0ipmpbasrh279hhn1prc8gg6"; depends=[Matrix Rcpp RcppArmadillo RcppParallel]; }; prozor = derive2 { name="prozor"; version="0.2.11"; sha256="1a2k69fvgi6vxgczk81kh8r2jxc6nirc51w6ac239rqjzb1zyhjm"; depends=[AhoCorasickTrie doParallel dplyr foreach Matrix plyr readr seqinr stringr]; }; - prrd = derive2 { name="prrd"; version="0.0.2"; sha256="0ifs55yqvwbcs3xyc90yi763fgavdhajk1ba73g1kchn2ak39qhb"; depends=[config crayon data_table DBI liteq RSQLite]; }; + prrd = derive2 { name="prrd"; version="0.0.3"; sha256="1j1hcs5h6h9nz3pdjnw9p2y837706k9yxxjgiv0mgnwyh8pmz425"; depends=[config crayon data_table DBI liteq RSQLite]; }; pryr = derive2 { name="pryr"; version="0.1.4"; sha256="06vj5xl9x37kbd3l5bw7sbgfdnp37spvrjrn976rxi04clqk966k"; depends=[codetools Rcpp stringr]; }; ps = derive2 { name="ps"; version="1.3.2"; sha256="0127q6pw9iw8hhcfp231gmdh29nahh2n5jzc38avrzy7yrm4bwl9"; depends=[]; }; psData = derive2 { name="psData"; version="0.2.2"; sha256="013hb6lk9rm2w08m5jbw90ndrcd4wyy2h125jx07c9bs60wh4mp4"; depends=[countrycode DataCombine reshape2 rio xlsx]; }; @@ -12125,14 +12148,14 @@ in with self; { psychNET = derive2 { name="psychNET"; version="0.0.4.1"; sha256="1h30ag185h9jw1w9119a9hxp984g2yj85hgi4vcwznjj18ssx377"; depends=[bigtime car corpcor crayon doParallel fastDummies glmnet graphicalVAR gtools Hmisc igraph imputeTS longitudinal MASS Matrix mgm mlVAR ncvreg networktools ordinalNet picasso qgraph reshape2 SparseTSCGM vars]; }; psychReport = derive2 { name="psychReport"; version="0.7"; sha256="1dapzq20aw9l4r5grfjd2sf14ga3wcxg67pq5fj6q4bcg5dggc9l"; depends=[cli crayon dplyr ez testthat xtable]; }; psychTools = derive2 { name="psychTools"; version="1.9.12"; sha256="1l1q3l6i40kkbvfjx7nri21jqy9vhdbcc7b5g56a5cqdimkddvkn"; depends=[foreign psych]; }; - psychmeta = derive2 { name="psychmeta"; version="2.3.6"; sha256="16fqy75a5zrfp7jnm49fl6qmagw747zwdd5nkg3a3k4wc0kbn56w"; depends=[boot cli crayon curl data_table dplyr ggplot2 MASS metafor nor1mix progress purrr reshape2 rlang stringi stringr tibble tidyr tmvtnorm]; }; + psychmeta = derive2 { name="psychmeta"; version="2.3.8"; sha256="1sqcp88kkjdlni3wicjhgw9a8y4a53xr7avbqnq2wzz0n2fa1q29"; depends=[boot cli crayon curl data_table dplyr ggplot2 MASS metafor nor1mix progress purrr reshape2 rlang stringi stringr tibble tidyr tmvtnorm]; }; psycho = derive2 { name="psycho"; version="0.5.0"; sha256="0vcabk9j1yf7nz8fh3xg5rr2ia97mfkka23vbv9jya75dhgd84h2"; depends=[bayestestR dplyr effectsize ggplot2 insight parameters performance scales stringr tidyr]; }; psychometric = derive2 { name="psychometric"; version="2.2"; sha256="1b7cx6icixh8k3bv60fqxjjks23qn09vlcimqfv2x3m3nkf8p1s9"; depends=[multilevel nlme]; }; psychomix = derive2 { name="psychomix"; version="1.1-8"; sha256="0lfhfcmrk65gkr1yp317b515vmadbcf0vjcnc76d07yp6yfkz5qw"; depends=[flexmix Formula lattice modeltools psychotools]; }; - psychonetrics = derive2 { name="psychonetrics"; version="0.7"; sha256="0mcldwy70wj210v4z389lzcawrvjrgc1pv10556wciazcriwhzwk"; depends=[abind combinat corpcor dplyr GA ggplot2 glasso IsingSampler lavaan magrittr Matrix matrixcalc mgcv mvtnorm numDeriv optimx pbapply pbv psych qgraph Rcpp RcppArmadillo roptim tidyr ucminf VCA]; }; + psychonetrics = derive2 { name="psychonetrics"; version="0.7.1"; sha256="1aj4a0yihiypsvzsrni5qfdjl4h3gffyimrhqcdwfd9wz8q09126"; depends=[abind combinat corpcor dplyr GA ggplot2 glasso IsingSampler lavaan magrittr Matrix matrixcalc mgcv mvtnorm numDeriv optimx pbapply pbv psych qgraph Rcpp RcppArmadillo roptim tidyr ucminf VCA]; }; psychotools = derive2 { name="psychotools"; version="0.5-1"; sha256="0nm5ngdkyskkj5akbqavdz8njsa8mr61kzknnn1kkdz6bn6zy6lq"; depends=[]; }; psychotree = derive2 { name="psychotree"; version="0.15-3"; sha256="18lr9dlv5l5fw88n61ch251ddgy1cv6klcj7ba3fg109b86p3bgf"; depends=[Formula partykit psychotools]; }; - psychrolib = derive2 { name="psychrolib"; version="2.4.0"; sha256="0dz3lwds9lxwqdid88l6bkndk6lv1q7b0qzgf9imxmi8f8zhkrbh"; depends=[Rcpp]; }; + psychrolib = derive2 { name="psychrolib"; version="2.5.0"; sha256="154bv16fyyyp5zgcrl2ncyqy15ybjnhqmim75pba11sbww7jdfbw"; depends=[Rcpp]; }; psymonitor = derive2 { name="psymonitor"; version="0.0.2"; sha256="09288w2bk5jhnbyj516jqn5qb33yqqg5kqbg6ylqk7anlq2yg2sl"; depends=[doParallel foreach magrittr]; }; psyosphere = derive2 { name="psyosphere"; version="0.1.5"; sha256="14xnni31p2dh4wfnr2cmr3ymz5phx4506cq2n7ymy4k1587w25g6"; depends=[geosphere ggmap ggplot2 Hmisc lubridate plyr rgdal RgoogleMaps sp]; }; psyphy = derive2 { name="psyphy"; version="0.1-9"; sha256="1ndc6sy662wj2qfx7r97crlqjd8fdkfvfy59qmf34bcbzbg33riz"; depends=[]; }; @@ -12140,7 +12163,7 @@ in with self; { pterrace = derive2 { name="pterrace"; version="1.0"; sha256="15k5149jqjy20cck5121zsv2mk63amn5b8qgdlacivri9dpxjns1"; depends=[doParallel foreach plotly TDA viridis]; }; ptest = derive2 { name="ptest"; version="1.0-8"; sha256="1d30a23yknf7xgqj8adgr36pnh9dpffl1v5fq682f26fk3ss30qp"; depends=[quantreg]; }; ptinpoly = derive2 { name="ptinpoly"; version="2.4"; sha256="1jbj8z7lqg7w1mqdh230qjaydx2yb6ffgkc39k7dx8xl30g00i5b"; depends=[misc3d]; }; - ptmixed = derive2 { name="ptmixed"; version="0.4.3"; sha256="0n62zrv4j7h9605izzpxjknhr495ir3yjlvzgmk9hil15r8n0w06"; depends=[aod GLMMadaptive lme4 matrixcalc moments mvtnorm numDeriv tweeDEseq]; }; + ptmixed = derive2 { name="ptmixed"; version="0.5.2"; sha256="1vi9xh5kv9389hdfq1f3j32ymycsdy6w21lv0h4gg3giwvxwkz3p"; depends=[aod GLMMadaptive lme4 matrixcalc moments mvtnorm numDeriv tweeDEseq]; }; pts2polys = derive2 { name="pts2polys"; version="0.1.3"; sha256="0rmgryv0vds20npvaqvvwrhrx0grfcz9qwdy2w3bx945r0chhw39"; depends=[Rcpp]; }; 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]; }; @@ -12160,7 +12183,7 @@ in with self; { puniform = derive2 { name="puniform"; version="0.2.1"; sha256="0pizpq3v0jlvl41pqypk5i5ghyg2na8mysf2pcvihx4ha7415i51"; 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.3"; sha256="17lyys7dxjrwsfkq7a7hw65iy3qn3pp1sn70srdy64jf8adahc8g"; depends=[magrittr rlang]; }; + purrr = derive2 { name="purrr"; version="0.3.4"; sha256="1cj091rsjdj2xz16qhynyw72gh5cyhznifcfbrbygndfr4xwksr3"; depends=[magrittr rlang]; }; purrrlyr = derive2 { name="purrrlyr"; version="0.0.5"; sha256="0rcamyf7d01rpd9izh8xp66j130aqarfbc24p898dqhghb6q1ryq"; depends=[BH dplyr magrittr purrr Rcpp]; }; purrrogress = derive2 { name="purrrogress"; version="0.1.1"; sha256="1l7wr7jjpang9gx61pfw9qiapsviwpp13kbylmxvw7lz7q0khzcz"; depends=[assertthat glue hms pkgcond purrr R6 rlang testextra]; }; pushbar = derive2 { name="pushbar"; version="0.1.0"; sha256="1gxarv6x32y6ssrhsq3pyihzcvpnnj7bg0jf2cpcr99da78n1d9b"; depends=[jsonlite shiny]; }; @@ -12201,16 +12224,17 @@ in with self; { qcapower = derive2 { name="qcapower"; version="0.1.0"; sha256="14vszidjvyi8namwv5k0hpgdw1dpns5ilvxfwa920ivdg35709ki"; depends=[devtools ggforce ggplot2]; }; qcc = derive2 { name="qcc"; version="2.7"; sha256="0lc26w7p3d023lfr8v6v75m2vwqg9vi9pdipap19l4vbdq29l4zz"; depends=[MASS]; }; qccrs = derive2 { name="qccrs"; version="0.1.0"; sha256="0lwrmf2809zzdj5f25bb1psh57ibyw90ra41fy2i9vjmgph9wgiq"; depends=[dplyr magrittr purrr tibble]; }; - qcr = derive2 { name="qcr"; version="1.0"; sha256="1251naica44kccmikyzdi3ncxfmvyqbc4qspfqnc0w54cqpsy5rw"; depends=[fda_usc MASS mvtnorm qcc qualityTools]; }; + qcr = derive2 { name="qcr"; version="1.2"; sha256="10770a1rijhl2mhri8vgcdp9k17vbn93z0kiv1fsdd8z48ywbwx4"; depends=[fda_usc MASS mvtnorm qcc qualityTools]; }; qcv = derive2 { name="qcv"; version="1.0"; sha256="0hf02l9c1cpzs02mfn9swfc8l635qsvh6xrhj21g19h5rxaf8jwg"; depends=[]; }; - qdap = derive2 { name="qdap"; version="2.3.6"; sha256="1j9s5gfq2hz7vkh8j682ykfqvl11kjqa16nbmgyhv33l8wb79skf"; depends=[chron dplyr gdata gender ggplot2 gridExtra igraph NLP openNLP plotrix qdapDictionaries qdapRegex qdapTools RColorBrewer RCurl reports reshape2 scales stringdist tidyr tm venneuler wordcloud xlsx XML]; }; + qdap = derive2 { name="qdap"; version="2.4.1"; sha256="136vmcsnclcc1bgvfrsxq5f7vqpsf3590bx8j9770xfw9gx27ynw"; depends=[chron dplyr gdata gender ggplot2 gridExtra igraph NLP openNLP plotrix qdapDictionaries qdapRegex qdapTools RColorBrewer RCurl reshape2 scales stringdist tidyr tm venneuler wordcloud xlsx XML]; }; qdapDictionaries = derive2 { name="qdapDictionaries"; version="1.0.7"; sha256="0jdx7bxmvc4p41jb4fhaagg5jsbsi7gva870cmyia72li52grhyn"; depends=[]; }; qdapRegex = derive2 { name="qdapRegex"; version="0.7.2"; sha256="1xa8q1way3gjadrjh3mv3xr4c6b4h16nd2c6lgl969difplpfz9p"; depends=[stringi]; }; - qdapTools = derive2 { name="qdapTools"; version="1.3.3"; sha256="0a28jn57d2fas3009cm10z07fq77ql3ffcrhcxsiimb57179wj0n"; depends=[chron data_table RCurl XML]; }; + qdapTools = derive2 { name="qdapTools"; version="1.3.5"; sha256="09byvv39qmdcavlykpcvk248l2f7sw0pq64ynq2xffmnga3ji24c"; depends=[chron data_table RCurl XML]; }; qdm = derive2 { name="qdm"; version="0.1-0"; sha256="0cfxyy8s5zfb7867f9xv9scq9blq2qnw68x66m7y7nqlrrff5xdr"; depends=[]; }; qfasar = derive2 { name="qfasar"; version="1.2.1"; sha256="14370bmq4qx5j02va13wz52m2lgl4vb992p9587z9v2sxl1v4jjg"; depends=[Rsolnp]; }; qgam = derive2 { name="qgam"; version="1.3.2"; sha256="0lks2cj0p7irp1i01756v1l7i26d7alax1fbkc20qd6wpz840fi7"; depends=[doParallel mgcv plyr shiny]; }; - qgcomp = derive2 { name="qgcomp"; version="2.2.2"; sha256="0dszh56drh9h4gc4vb31749hjgl9k3yvj8x10d2nkr8ba29ng4x2"; depends=[arm future future_apply generics ggplot2 gridExtra pscl survival tibble]; }; + qgcomp = derive2 { name="qgcomp"; version="2.3.0"; sha256="1ik81vj0brwnzvaij25jq4jchhqqjayckihdjh1l1zy3vfphla5m"; depends=[arm future future_apply generics ggplot2 gridExtra pscl survival tibble]; }; + qgg = derive2 { name="qgg"; version="1.0.3"; sha256="0ylpsvhvkznw1b280im026mlwa5bydh3gdki72a7rr2vpjnbgxm2"; depends=[data_table MASS MCMCpack statmod]; }; qgraph = derive2 { name="qgraph"; version="1.6.5"; sha256="0pwys9irxvp0ap158drplyypkplbmwqinv0fmlsblk7q875cr592"; depends=[abind BDgraph colorspace corpcor d3Network dplyr fdrtool ggplot2 ggraph glasso gtools Hmisc huge igraph jpeg lavaan Matrix pbapply plyr png psych Rcpp reshape2 tidygraph]; }; qgtools = derive2 { name="qgtools"; version="2.0"; sha256="1gj7vbam53yr2rnxzfxng1p107bjcyjmyj47cxyzaiv19pznkbmw"; depends=[]; }; qha = derive2 { name="qha"; version="0.0.8"; sha256="0sdf6g6884wn73i237xkwszg2mq8xddhvyy225qzpplh5za4pnhl"; depends=[ade4 FactoClass FactoMineR]; }; @@ -12219,7 +12243,6 @@ in with self; { qif = derive2 { name="qif"; version="1.5"; sha256="12azs7c0anpd71d5663y1jrhirry6cr78wislp4fk64hmsbx7sx4"; depends=[MASS]; }; qiitr = derive2 { name="qiitr"; version="0.1.0"; sha256="1p0mcwgzvbib20l05wrnshkqx99vwr69dgy15dfwp75skyy5l797"; depends=[httr jsonlite purrr rstudioapi]; }; qkerntool = derive2 { name="qkerntool"; version="1.19"; sha256="14inry2hqvkmy0y2y3cl75ri4vri0hirv98gw2rymny69lia5x0s"; depends=[class]; }; - qlcData = derive2 { name="qlcData"; version="0.2.1"; sha256="0n1r7462zmyzkyi7mp3hf7pn7bgw1m1zs9flm3n199kjm8f6yyzy"; depends=[ape data_tree docopt phytools shiny stringi yaml]; }; qlcMatrix = derive2 { name="qlcMatrix"; version="0.9.7"; sha256="0iqkcvvy8rxlk0s83sjq57dd6fadb18p5z31lzy0gnzv1hsy1x8y"; depends=[docopt Matrix slam sparsesvd]; }; qmap = derive2 { name="qmap"; version="1.0-4"; sha256="02xvq1mw83gln7phacbi3vhkvb100crggbldv13mhwq3wjnmg5k2"; depends=[fitdistrplus]; }; qmethod = derive2 { name="qmethod"; version="1.5.5"; sha256="1s787big5f1m91n9s7yhxpsfx0161l7pyihlvfp9406k8qxs3jnl"; depends=[digest GPArotation knitr psych xtable]; }; @@ -12228,12 +12251,11 @@ in with self; { qoma_smuggler = derive2 { name="qoma.smuggler"; version="0.0.1"; sha256="03p9i0kr6i3adpb9lcszcmdr9p26nfy7f8hw2sbydazglaw4hscr"; depends=[lubridate rhli tibble]; }; qpcR = derive2 { name="qpcR"; version="1.4-1"; sha256="1r01q7jv3w59yx1gc0qw91rq7rvdhqsi8y57sqqkmwyqfw2x2vsv"; depends=[MASS Matrix minpack_lm rgl robustbase]; }; qpdf = derive2 { name="qpdf"; version="1.1"; sha256="03lnfncw8qd1fwfyqh1mjvnsjr3b63wxbah0wp5g7z7gba90dwbi"; depends=[askpass curl Rcpp]; }; - qqid = derive2 { name="qqid"; version="1.0.3"; sha256="1j2s5zilz97x4kl10g85qr3rxg022p9i601r6gvkaa57xcx6smw1"; depends=[qrandom]; }; qqman = derive2 { name="qqman"; version="0.1.4"; sha256="1v9s9ag1hfb47py87wb2nad4mbsfx35832hdmrh5kxrb2f11zl1s"; depends=[calibrate]; }; qqplotr = derive2 { name="qqplotr"; version="0.0.4"; sha256="1zy7mlnll0infr2las5c28vi5da04rm869dpccwcws1467mhys3k"; depends=[dplyr ggplot2 knitr MASS robustbase]; }; qqtest = derive2 { name="qqtest"; version="1.2.0"; sha256="1v0qbbp2dpqflpg7yif7hipwdbz27isfyfwcia1ln7z0nnvkjm8c"; depends=[]; }; qqvases = derive2 { name="qqvases"; version="1.0.0"; sha256="1fli4v1slmnwcmzmmfw84sa4mx3xzv3im1q0plb8811sbsgmwdvl"; depends=[shiny shinythemes]; }; - qrLMM = derive2 { name="qrLMM"; version="2.0"; sha256="0ci4679kfif1sk4009v89yfm5p6nyk7nhvikgd00rhrbqi9qaqy4"; depends=[ald lqr mvtnorm psych quantreg]; }; + qrLMM = derive2 { name="qrLMM"; version="2.1"; sha256="1viyllsd08dwgd5z930ml1nrcc9saaa18i5sx0bska8b0s7qh414"; depends=[ald lqr mvtnorm psych quantreg]; }; qrNLMM = derive2 { name="qrNLMM"; version="2.0"; sha256="0j69zhs1v4546xrkwra9c2q3kmhf593vi05yjn3b3s5nzh2k0i1x"; depends=[ald lqr mvtnorm psych quantreg]; }; qrage = derive2 { name="qrage"; version="1.0"; sha256="00j74bnkcpp0h8v44jwzj67q9aaw47ajc2fvgr6dckj9rymydinl"; depends=[htmlwidgets]; }; qrandom = derive2 { name="qrandom"; version="1.2.2"; sha256="1s0frb3qjaraigx79g0sm60dj216jrmp1lgzcvjk3rh7xdjhjrkn"; depends=[curl jsonlite Rmpfr]; }; @@ -12243,7 +12265,7 @@ in with self; { qrjoint = derive2 { name="qrjoint"; version="2.0-3"; sha256="1ymnq8mbvxfdi63f4554mjlix5n864v2nask27pkf3yfxmkr346k"; depends=[coda kernlab Matrix quantreg]; }; qrmdata = derive2 { name="qrmdata"; version="2019-12-03-1"; sha256="0738wiac0dgani0yy61kvpra7zj8qj5ak627i8cjd42zf1yjziz5"; depends=[xts]; }; qrmix = derive2 { name="qrmix"; version="0.9.0"; sha256="1r695d9bmmngvblh9jj0rnjymdaln9w0jywz51wla0bdssssf845"; depends=[MASS quantreg]; }; - qrmtools = derive2 { name="qrmtools"; version="0.0-12"; sha256="1gbnc8cl0iv5snkrz5vrg3k6c5zz74amrb6yxwnlhh69yh63zxhi"; depends=[ADGofTest lattice Quandl quantmod rugarch xts zoo]; }; + qrmtools = derive2 { name="qrmtools"; version="0.0-13"; sha256="1pr0q0wh3xjy3y59nkbpqfkakagbank3b31150rlxy72hkf52g1y"; depends=[ADGofTest lattice Quandl quantmod rugarch xts zoo]; }; qrng = derive2 { name="qrng"; version="0.0-7"; sha256="1dw1qqajxavlnfyh6xn58069fpfza28x1xjzd3diqlcxxlb4hjaf"; depends=[copula randtoolbox]; }; qrnn = derive2 { name="qrnn"; version="2.0.5"; sha256="0ligz67kbfg5cmvacnb7y0ms1v0c7mbvbcfsxyfiz543ppl3xn1v"; depends=[]; }; qs = derive2 { name="qs"; version="0.21.2"; sha256="1i4xrm9vz8ffl4mbw1qmgwkcm3j6ajw25ilj08n87ghy798pyab3"; depends=[RApiSerialize Rcpp]; }; @@ -12259,12 +12281,12 @@ in with self; { qtlcharts = derive2 { name="qtlcharts"; version="0.11-6"; sha256="114h19d741abyz7c0w0lir7m7816hw92lnd4shb3d9m94a9dwxqp"; depends=[htmlwidgets qtl]; }; qtlhot = derive2 { name="qtlhot"; version="1.0.4"; sha256="0gf0fsq91g830vqg5kz01zznm40qpjncy964ccvmms3i6d3hxd9m"; depends=[corpcor mnormt qtl]; }; qtlmt = derive2 { name="qtlmt"; version="0.1-6"; sha256="023h60z8d05832l2g7mg776hfjb0i7xpvhz3i899rc3h5pgjd94c"; depends=[]; }; - qtlnet = derive2 { name="qtlnet"; version="1.4.4"; sha256="1r9r6wp71i36ffcdxiljvh2c8nva868x2dx6bkinbaq8cixww2cx"; depends=[graph igraph pcalg qtl sem]; }; + qtlnet = derive2 { name="qtlnet"; version="1.5.4"; sha256="0jdf3hyzas0lyv2v4gqai9mhh7218a1mvm0nlwv9hfdbij0hi84v"; depends=[graph igraph pcalg qtl sem]; }; qtpaint = derive2 { name="qtpaint"; version="0.9.1"; sha256="08x7qcxwkaclwv1p4s9a5k95x35hzp69whiihkakjv5blm83m3g9"; depends=[qtbase]; }; 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.4.0"; sha256="196p1qiis1hbs8yxd5570cqln0zcp3ngbajf3rsc0rwgjzqgm3wv"; depends=[geometry gridBase png raster reproj scales sp viridis]; }; + quadmesh = derive2 { name="quadmesh"; version="0.4.5"; sha256="0wppxi8g3dq7x4f6dsv7843fhdb43rx45lky4aanqa2im81qa7l8"; depends=[geometry gridBase png raster reproj scales sp viridis]; }; quadprog = derive2 { name="quadprog"; version="1.5-8"; sha256="1ka9g8zak8sg4y2xbz93dfrldznlk9qpd4pq9z21cdcdn3b8s4i2"; depends=[]; }; quadprogXT = derive2 { name="quadprogXT"; version="0.0.5"; sha256="1yna2kx9pr58vyy6f4mwx4a6avjz84wwhcary88v1k0ihhv9swcz"; depends=[quadprog]; }; quadrupen = derive2 { name="quadrupen"; version="0.2-7"; sha256="05yn9cnnc1481k8yqc6dg5hcv0ll4v3h2yw3qyaarwhgyxiips11"; depends=[ggplot2 Matrix Rcpp RcppArmadillo reshape2 scales]; }; @@ -12290,6 +12312,7 @@ in with self; { quantregForest = derive2 { name="quantregForest"; version="1.3-7"; sha256="0lk7r02i6zpx9sdl2rp0r7fc3a84s8qhg49nh2x7k3vxwa095pjz"; depends=[randomForest RColorBrewer]; }; quantregGrowth = derive2 { name="quantregGrowth"; version="0.4-3"; sha256="0q2yk51hcn7jnvh14nxa7szfj4pr9grh5rdfwazaziilbwqdmw4f"; depends=[quantreg]; }; quantregRanger = derive2 { name="quantregRanger"; version="1.0"; sha256="1a9q2prr790bpw6s0y5ni5ppd3vqkjr0v4nqp6ywcj5n3sk69pvx"; depends=[ranger Rcpp]; }; + quantspec = derive2 { name="quantspec"; version="1.2-2"; sha256="1mn5r575hdffy1znd98njrms2pz84z8k4bv6qmbwgqwvh8pn10rg"; depends=[abind quantreg Rcpp snowfall zoo]; }; quarrint = derive2 { name="quarrint"; version="1.0.0"; sha256="13fdmmrgn23xd9vpywmcl7pf729gmcxjfl1wxs30axsbp4h1s6rk"; depends=[neuralnet]; }; queryparser = derive2 { name="queryparser"; version="0.2.0"; sha256="1fsp64rm4jch2jjw7czw9qmwb4f3s46avbf3z3gpvcfdq4aw65kb"; depends=[]; }; questionr = derive2 { name="questionr"; version="0.7.0"; sha256="1cschww3g2jhrfh87bxcaaig84yr0zcj0virmpx033yal606hmn4"; depends=[classInt highr htmltools labelled miniUI rstudioapi shiny]; }; @@ -12336,14 +12359,12 @@ in with self; { rCBA = derive2 { name="rCBA"; version="0.4.3"; sha256="10rc08gwsf15f4lci8bbgwpwj8n7k1m23hxk633v68g9amla5nvx"; depends=[arules R_utils rJava TunePareto]; }; rCMA = derive2 { name="rCMA"; version="1.1"; sha256="0dswshg80hbgcib5x9w791sh71q5s4435q8sm9dh170v4ngbax0w"; depends=[]; }; rCRM = derive2 { name="rCRM"; version="0.1"; sha256="01xxkrwd0iwhmq8dshgbn84qi6kky757y01alqrk0pkq2n8ghms4"; depends=[Rcpp RcppEigen]; }; - rCUR = derive2 { name="rCUR"; version="1.3"; sha256="1f38xbc5n91k2y88cg0sv1z2p4g5vl7v2k1024f42f7526g2p2lx"; depends=[lattice MASS Matrix]; }; rChoiceDialogs = derive2 { name="rChoiceDialogs"; version="1.0.6"; sha256="0lp8amdalirpsba44aa3r31xnhmi36qb9qf8f8gdxxbarpgprsbi"; depends=[rJava]; }; rClinicalCodes = derive2 { name="rClinicalCodes"; version="1.0.1"; sha256="1p4p8r2n0k8h9xdzbngb95rshjp3376f5lsx228biqmswhpkhvlf"; depends=[RCurl rjson stringr tm XML]; }; rDEA = derive2 { name="rDEA"; version="1.2-6"; sha256="0045crn7azsy3ggzr28vw5jd4f5aw5nj16cjnjxy2md3skfbc3zw"; depends=[maxLik slam truncnorm truncreg]; }; rDNAse = derive2 { name="rDNAse"; version="1.1-1"; sha256="0cl51q61kwvdsm5f49cjjbzggqam1fnr6gp15cmy6m2yahyxg1lk"; depends=[]; }; rDecode = derive2 { name="rDecode"; version="0.1.0"; sha256="1d0rrhycw9anhvx6czz7axkzhzqprdgi9sqfglmc962zf1x3hmn2"; depends=[]; }; rDotNet = derive2 { name="rDotNet"; version="0.9.1"; sha256="18cd5373pdfi1x958llb4cgjqdi1fb7h7m5nkdwcd4xw9hxhinzd"; depends=[Rcpp testthat]; }; - rEDM = derive2 { name="rEDM"; version="1.2.3"; sha256="1zz7rn57afax2hcffchzbkn0z6sbmbyhz6s6qbj5k92b48b1xdxb"; depends=[Rcpp RcppEigen]; }; rEMM = derive2 { name="rEMM"; version="1.0-11"; sha256="0ynjn10gcmxs8qnh6idb34ppmki91l8sl720x70xkzcqpahy0nic"; depends=[cluster clusterGeneration igraph MASS proxy]; }; rENA = derive2 { name="rENA"; version="0.2.0.1"; sha256="0sljnrhc710xbcdbsjx1rqrivbklgcnh7l4nqpnxdknvrxz6ky5y"; depends=[data_table doParallel foreach magrittr plotly R6 Rcpp RcppArmadillo scales]; }; rFDSN = derive2 { name="rFDSN"; version="0.0.0"; sha256="1ffiqpdzy4ipy2aci22zkih4373ifkjkpvsrza8awhyf9fwqwdsl"; depends=[XML]; }; @@ -12359,7 +12380,6 @@ in with self; { rIntervalTree = derive2 { name="rIntervalTree"; version="0.1.0"; sha256="0xd6wcra4zvphfgnz1rnnslx96p840zlgms367370xm4hyg6d37x"; depends=[]; }; 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.3"; sha256="0l8znqvg4qiygv6mxwff1ipanzxvcdn54m879sk8z7zn3x5sg6iw"; depends=[magrittr quanteda Rcpp RcppArmadillo RcppProgress reshape2 SnowballC]; }; rJava = derive2 { name="rJava"; version="0.9-12"; sha256="03vv0pj6san03c51iyqsyb1rwh3097dfpl2s8iswzzmc7k3shj12"; 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]; }; @@ -12371,9 +12391,9 @@ in with self; { rMEA = derive2 { name="rMEA"; version="1.1.0"; sha256="1aarnik0qjxg6h55xpskx1dwkp78nfdyrwpy9r6ffyxhz9jbplnj"; depends=[]; }; rMR = derive2 { name="rMR"; version="1.1.0"; sha256="0da1hclfnnlkp9by6zf2p079643p8nimplr9p3ipbjdy739j344z"; depends=[biglm]; }; rModeling = derive2 { name="rModeling"; version="0.0.3"; sha256="0xrjxayp59f31wwcqqkzs5my2j2lpbv1f4pp709fmqxz02vbdzhv"; depends=[caret e1071 MASS]; }; - 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.2"; sha256="0mir7b2693s27gll5j6fsgy7wq0fg48ddx6h78j7cgg7md75756f"; depends=[fields GEOmap MBA RCurl rvest stringr uuid XML]; }; + rNeighborGWAS = derive2 { name="rNeighborGWAS"; version="1.0.0"; sha256="13yhc279w5ds908bjplpqxf63db7hlp2dgnj8307ds4wkw6w1mbk"; depends=[gaston Matrix RcppParallel]; }; rODE = derive2 { name="rODE"; version="0.99.6"; sha256="0l518ghfw6283kckqcbh45a35vd73njy05v3dwghhhjdj7v3km8b"; depends=[data_table]; }; rPACI = derive2 { name="rPACI"; version="0.1.1"; sha256="0skpv7h91vfr8xkx0ic8yz7hcj1bbwd1f80sa9p9jn2rpfpzalv9"; depends=[]; }; rPAex = derive2 { name="rPAex"; version="1.0.1"; sha256="1v85qy8fg6vf1fqqqawzw4i9sfaihdqzbs0h91hpqbzkc4v7n2bb"; depends=[agricolae raster]; }; @@ -12381,7 +12401,6 @@ in with self; { rPowerSampleSize = derive2 { name="rPowerSampleSize"; version="1.0.2"; sha256="1insdfvcn1pirsnf7nwfia0kzgsmh2zpghgfj2yc35ld1r9j2hp2"; depends=[mvtnorm ssanv]; }; rPraat = derive2 { name="rPraat"; version="1.3.1"; sha256="01bz0ja35k8q3ncj9jaqbfh42sf5s73yrb6gsj11lapmfb3g8scf"; 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]; }; rQCC = derive2 { name="rQCC"; version="1.20.3"; sha256="01gi447qwm6j682s7ka034g28k74l3fr9ijam6l9n0f228q930gp"; depends=[]; }; rRAP = derive2 { name="rRAP"; version="1.1"; sha256="1nzvs8bjkbjraa33azxf9mrxsxh87qhh3qlldrcs5y4fq4ancyqb"; depends=[lars lassoshooting MASS]; }; rSCA = derive2 { name="rSCA"; version="3.1"; sha256="0dhd5325x05cbnw34mlipndw5xnncl9kj7kppb2s5bx2gllcdqqd"; depends=[]; }; @@ -12407,7 +12426,7 @@ in with self; { radar = derive2 { name="radar"; version="1.0.0"; sha256="1wh5j3cfbj01jx2kbm9ca5cqhbb0vw7ifjn426bllm4lbbd8l273"; depends=[]; }; radarBoxplot = derive2 { name="radarBoxplot"; version="1.0.0"; sha256="16s38yy984mb1hmsdw17z4nk2z4xg03xi0yrp7445yqv3fs1fghl"; depends=[]; }; radarchart = derive2 { name="radarchart"; version="0.3.1"; sha256="0gcxnbgj8ja1m4wzhbjy67m6zphf0c5ni9yx7sr7f0abm03ry753"; depends=[htmltools htmlwidgets]; }; - radiant = derive2 { name="radiant"; version="0.9.9.1"; sha256="18zj6lbs04vqslm4zgga6fvm868a0m55sk45kj5vl46jadb6a52f"; depends=[r_import radiant_basics radiant_data radiant_design radiant_model radiant_multivariate shiny]; }; + radiant = derive2 { name="radiant"; version="1.3.2"; sha256="02qc7s64ryfn0l88kfj61kdnrg8gl6dmrxzscgqh85fc1yaipjcf"; depends=[r_import radiant_basics radiant_data radiant_design radiant_model radiant_multivariate shiny]; }; radiant_basics = derive2 { name="radiant.basics"; version="1.3.4"; sha256="0y4s3zhphkaxlgwmiz96nwxq1s87i2i1mnph062xghlm7x92bwc3"; depends=[dplyr ggplot2 lubridate magrittr patchwork polycor psych r_import radiant_data scales shiny tidyr]; }; radiant_data = derive2 { name="radiant.data"; version="1.3.4"; sha256="19sjjb49inrfl7jzq4zpwhdslni0zrp30bl58pisin29ka3ylpzs"; depends=[base64enc broom car curl dplyr DT ggplot2 glue jsonlite knitr lubridate magrittr markdown MASS patchwork plotly psych r_import randomizr readr readxl rlang rmarkdown rstudioapi scales shiny shinyAce shinyFiles stringi tibble tidyr writexl]; }; radiant_design = derive2 { name="radiant.design"; version="1.3.5"; sha256="1514s21jybyvpi2sx06xsxfrzgg07x7xxhwsazc61v3w1mllj2xw"; depends=[AlgDesign dplyr magrittr mvtnorm polycor pwr r_import radiant_data randomizr shiny]; }; @@ -12416,7 +12435,6 @@ in with self; { radiomics = derive2 { name="radiomics"; version="0.1.3"; sha256="1ra94yaqw88slznhyv70kbfricxi44m4pnx1zh4ijghm491rphr5"; depends=[Rcpp reshape2 spatstat]; }; radir = derive2 { name="radir"; version="1.0.4"; sha256="12a99ig3n6kp5wa5rjp2w1nal4qqjs6vq05d3lrqcyl3bind6lqb"; depends=[hermite]; }; radix = derive2 { name="radix"; version="0.6"; sha256="0290n0yax8649srdjbq4439h0d9f6jsmxayyhp86igcnszcxilnb"; depends=[base64enc bookdown digest downloader htmltools jsonlite knitr lubridate mime png progress rmarkdown rprojroot rstudioapi stringr whisker xfun xml2 yaml]; }; - radjust = derive2 { name="radjust"; version="0.1.0"; sha256="0krryhqid16a6jfb007n0k6rc8r7c808h859a9pjid2jbkg0bm7l"; depends=[]; }; radlibs = derive2 { name="radlibs"; version="0.1.0"; sha256="1yyd63shc35mdixkz8gigwqb9g2l1baxgmzijhshpqavixdhazmk"; depends=[data_table lexicon stringr]; }; radmixture = derive2 { name="radmixture"; version="0.0.1"; sha256="0rs60xjd43lg5c9972qhpg6bsqfg2578qvrz7gz3bdip10jb1ryj"; depends=[magrittr MCMCpack plyr quadprog]; }; radsafer = derive2 { name="radsafer"; version="2.2.0"; sha256="0xkmyxw2lslgy22rnb1ll4zw4h06p4ldvaavvwnzy8l7mzqlr6in"; depends=[dplyr ggplot2 ggthemes magrittr RadData readr rlang stringr]; }; @@ -12431,7 +12449,7 @@ in with self; { rainette = derive2 { name="rainette"; version="0.1"; sha256="0rchm02bzahmwa11riyypfgb72dz5003y9zsyfknin0ckvqycysv"; depends=[dendextend dplyr formatR future future_apply ggplot2 ggwordcloud gridExtra highr miniUI progressr purrr quanteda RColorBrewer Rcpp rlang RSpectra shiny stringr tidyr]; }; rainfarmr = derive2 { name="rainfarmr"; version="0.1"; sha256="1gasnmyjnis6vv0krx6299ck2a6v9v1fgqajzqdpjaz2fsxn245i"; depends=[]; }; rakeR = derive2 { name="rakeR"; version="0.2.1"; sha256="0cd89q6k0y9z1qk9k06iw56lhj4c52ckr0g4qv6q95lkyrbi3qg8"; depends=[ipfp wrswoR]; }; - ralger = derive2 { name="ralger"; version="1.1.0"; sha256="077yi2xba2ilhsr0r689r74axazb3wpxz0w8ic6c17jplm828q7s"; depends=[crayon dplyr magrittr purrr robotstxt rvest stringr testthat tidyr xml2]; }; + ralger = derive2 { name="ralger"; version="2.0.0"; sha256="05hcrly7wf5bmfi14ji791vbix8q4fsl13la6yi7zjzwh1hd55sd"; depends=[crayon dplyr magrittr purrr robotstxt rvest stringr testthat tidyr xml2]; }; ramchoice = derive2 { name="ramchoice"; version="1.1"; sha256="1im9r95109919hfmici6avdqxh3a375wmg2lfy75z1gjivvcygbr"; depends=[MASS]; }; ramcmc = derive2 { name="ramcmc"; version="0.1.0-1"; sha256="0x8q0bah8fcyqlwap9iw52xhl6b989va5c144kgmfimh2b4yinc7"; depends=[Rcpp RcppArmadillo]; }; ramify = derive2 { name="ramify"; version="0.3.3"; sha256="0cxmkxhshg0vrcxai2gbm4iih04f44liv5nh5jiq85hjz8qbhdi2"; depends=[]; }; @@ -12481,15 +12499,16 @@ in with self; { rareGE = derive2 { name="rareGE"; version="0.1"; sha256="0v3a2wns77q923ilddicqzg0108f8kmfdnsff1n65icin7cfzsny"; depends=[MASS nlme survey]; }; rareNMtests = derive2 { name="rareNMtests"; version="1.1"; sha256="13r2hipqsf8z9k48ha5bh53n3plw1whb7crpy8zqqkcac8444b2z"; depends=[vegan]; }; rarms = derive2 { name="rarms"; version="1.0.0"; sha256="11wjxd3pxvjv1j2nz26l8f0kykk9w6lf08izhivfngp63dk2akns"; depends=[jsonlite]; }; - rasciidoc = derive2 { name="rasciidoc"; version="2.0.1"; sha256="0mj3qn048ppxddq2ml06hvccixxg7kvb9rsx9iy9mn4rr2caw67v"; depends=[document highr knitr]; }; + rasciidoc = derive2 { name="rasciidoc"; version="2.1.1"; sha256="05zlp14hiimf5p8l7381wvqzi28pbp7ig9a3i6n79zkrqz7hsab0"; depends=[document git2r highr knitr xfun]; }; rasclass = derive2 { name="rasclass"; version="0.2.2"; sha256="1lsmv8kh519mz3szb4k9s17fz1480cw0i4qk12givhhm2rpzjy50"; depends=[car e1071 nnet randomForest RSNNS]; }; rase = derive2 { name="rase"; version="0.3-3"; sha256="03jqf5y5vj354m9psp81wzw6d7dfqr76bfjqv9kannsakkj587sy"; depends=[ape mvtnorm polyCub rgl sm spatstat]; }; - raster = derive2 { name="raster"; version="3.0-12"; sha256="0rrbsigkqxsdic8fly6nrsc79zsliwvr1x2b4xqpl9d34vr50dvg"; depends=[Rcpp sp]; }; + raster = derive2 { name="raster"; version="3.1-5"; sha256="010sq00ijpmwac280ip9rryw0pxk0al8g675v2lc9rdrbgaj4rnv"; depends=[Rcpp sp]; }; rasterDT = derive2 { name="rasterDT"; version="0.3.1"; sha256="1dl083jm4x0shl7lq4in2alksgi63hp1p7j2cnsvkmwjaxygzm9v"; depends=[data_table fasterize raster sf]; }; rasterImage = derive2 { name="rasterImage"; version="0.4.0"; sha256="191m5k1rbbwziznmxbsq4g55afkw8gb5011i70f3wx3dscr3phxz"; depends=[plotrix]; }; rasterKernelEstimates = derive2 { name="rasterKernelEstimates"; version="1.0.1"; sha256="1733ic1hxym3gyibk2ysy5zzq7s9rbf6jx63x7irnrcavq151f8s"; depends=[raster]; }; rasterList = derive2 { name="rasterList"; version="0.5.8"; sha256="0q7apglxzpah04463z07cpkzyd6l6dbbdhm601brzh6yk75z20vh"; depends=[raster]; }; rasterVis = derive2 { name="rasterVis"; version="0.47"; sha256="1lsi3vk7s3bzw07vn57s6748flmbrj5s3n349cxbmhlm123vwghj"; depends=[hexbin lattice latticeExtra raster RColorBrewer sp viridisLite zoo]; }; + rasterdiv = derive2 { name="rasterdiv"; version="0.1-0"; sha256="19cz25wwv7h7h9c374mgci8ic1425g5rmsfhyv0bwaqhhn3wz93q"; depends=[doParallel foreach proxy raster svMisc]; }; rasterize = derive2 { name="rasterize"; version="0.1"; sha256="18nrhmq1qmi05rkyr86xsyc8nz0fbdpf2d45h62bbfzbfynqd4qy"; depends=[png]; }; rasterly = derive2 { name="rasterly"; version="0.1.0"; sha256="128699nc1y2parfwqfx31afdy3f91z5iarpx8q1v5qfmbmb12ppx"; depends=[data_table ggplot2 magrittr plotly Rcpp rlang]; }; rasterpdf = derive2 { name="rasterpdf"; version="0.1.1"; sha256="0zi54nifbb4dzb29i8rskynblw3z42vzaykwbq30ia5zs9q1bvm5"; depends=[png]; }; @@ -12508,15 +12527,16 @@ in with self; { rawKS = derive2 { name="rawKS"; version="0.1.0"; sha256="1yiw9imhgij49qbm9hk6psb73zngqmxxwnaxq144ydwb7fbk6j0z"; depends=[dplyr ggplot2 magrittr ROCR tidyr]; }; rawr = derive2 { name="rawr"; version="0.1.0"; sha256="1a8r1vyvki3z2ms4miqv6wq9pzympgifsjx0pzzs6f4b40m083lq"; depends=[dplyr jsonlite rvest xml2]; }; raws_profile = derive2 { name="raws.profile"; version="0.1.0"; sha256="04f7wk7x9j3rb6nn3zqss9vw0h9a4vpcjyilc2vqy0fm2by41xkg"; depends=[stringr tibble withr]; }; - rayimage = derive2 { name="rayimage"; version="0.2.5"; sha256="0ihi0i93ypk75h567ay3g46n8x4ni09r4r6p6spm16hji0ri5dp1"; depends=[jpeg magrittr png progress raster Rcpp RcppArmadillo]; }; - rayrender = derive2 { name="rayrender"; version="0.6.0"; sha256="19al04afiibd0hbvlps4zwmm085x0vnfkbn5lpd3mzyilccyjhcb"; depends=[assertthat magrittr png progress purrr raster Rcpp RcppThread tibble]; }; - rayshader = derive2 { name="rayshader"; version="0.13.7"; sha256="0mlygrsbg0nzz8hhz0q28hizqh3ck4vdi67i9cvgpkrrnm13jyqx"; depends=[doParallel foreach ggplot2 magrittr png progress raster rayrender Rcpp RcppArmadillo rgl scales]; }; - rbacon = derive2 { name="rbacon"; version="2.4.1"; sha256="0xxgdh3zr2k0asxklbpyn1d0q67hdmd5r81s9y8x4anjjvz5zx0g"; depends=[coda Rcpp]; }; + rayimage = derive2 { name="rayimage"; version="0.2.7"; sha256="075ms29ra354ygcxwazj3d217f94jq93hay4g6vl7g6sa0vnirrl"; depends=[jpeg magrittr png progress raster Rcpp RcppArmadillo]; }; + rayrender = derive2 { name="rayrender"; version="0.9.1"; sha256="1r2cpxlibkqmah1x3xdjzajz0kshbrmd575y8wngp44ihhajdzsd"; depends=[assertthat decido magrittr png progress purrr raster rayimage Rcpp RcppThread tibble]; }; + rayshader = derive2 { name="rayshader"; version="0.15.1"; sha256="0ppjjr2yawzr10jfrwlm4ih366sn5p7l6ql61k2yxwzc0516hsng"; depends=[doParallel foreach magrittr png progress raster Rcpp RcppArmadillo rgl scales]; }; + rbacon = derive2 { name="rbacon"; version="2.4.2"; sha256="0y6vsr2fyy059v10fdh8viwb7361pnh97k8zzh8105da9n6ymhrc"; depends=[coda Rcpp]; }; rbart = derive2 { name="rbart"; version="1.0"; sha256="1byfm1ycw9nfhdblqklyn8pxn6b9q5fa3inbgfpynqpsid97ig35"; depends=[Rcpp]; }; rbefdata = derive2 { name="rbefdata"; version="0.3.5"; sha256="12mcqz0pqgwfw5fmma0gwddj4zk0hpwmrsb74dvzqvgcvpfjnv98"; depends=[RColorBrewer RCurl rjson rtematres wordcloud XML]; }; rbenchmark = derive2 { name="rbenchmark"; version="1.0.0"; sha256="010fn3qwnk2k411cbqyvra1d12c3bhhl3spzm8kxffmirj4p2al9"; depends=[]; }; - rbgm = derive2 { name="rbgm"; version="0.0.5"; sha256="1gz9hxlwmj2ch1ds6mx1nlkwy4fm811jkz5fz3cl6675n11bjdpg"; depends=[dplyr geosphere raster readr rlang sp stringr tibble]; }; + rbgm = derive2 { name="rbgm"; version="0.1.0"; sha256="0jw7p6l0il0fz5rq7ra731xzj06aqqvm9s1r0hwa4rd74lkg198n"; depends=[dplyr geosphere raster reproj rlang sfheaders sp]; }; rbhl = derive2 { name="rbhl"; version="0.9.0"; sha256="0n9jxyrpq1s0yq13ylkhm0qcjlm8b25p19vpxv2s4wxan758zypd"; depends=[crul jsonlite plyr tibble xml2]; }; + rbi = derive2 { name="rbi"; version="0.10.3"; sha256="09hqv235fry60nqvd1is8n7szkq96w160xpw2pdxqdxvlh52cf2r"; depends=[data_table ncdf4 processx reshape2]; }; rbin = derive2 { name="rbin"; version="0.1.2"; sha256="0kiad4l0qplzxqx6zx5fp48lq5g6l80qgydfri0vh3giadzcmsp7"; depends=[DescTools dplyr forcats ggplot2 magrittr miniUI recipes rlang rstudioapi shiny tibble]; }; rbiouml = derive2 { name="rbiouml"; version="1.9"; sha256="01ysjq49nhawp0r2by7b15s4b7bzsbn2xhdcyyrh38vrl04rpf57"; depends=[RCurl RJSONIO]; }; rbison = derive2 { name="rbison"; version="0.8.0"; sha256="0x2yiq1wvm6mzmhfa3ds8mmhidv91hxi14nhz4nib6nmna3c9al2"; depends=[crul data_table dplyr ggplot2 jsonlite mapproj plyr sp]; }; @@ -12532,6 +12552,7 @@ in with self; { 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=[]; }; + rbw = derive2 { name="rbw"; version="0.2.0"; sha256="01y33gbljb6bvbdsr42vgfi75sywhwn313y5jv1y4kkc4iqzag1r"; depends=[rlang]; }; rcane = derive2 { name="rcane"; version="1.0"; sha256="0p2mgkq6fh0n289n2h19c52lnqxl05wvpmd6nwvgnjqwa4wwpa7r"; depends=[]; }; rcanvec = derive2 { name="rcanvec"; version="0.2.1"; sha256="0gsk2cfiysxjw2lrnpl2l524lvhh9nhnyyh79n8p7vykyqj711yn"; depends=[rgdal sp]; }; rcarbon = derive2 { name="rcarbon"; version="1.3.1"; sha256="1qdmbvp758758ny2d4y0xi5gdhzvjmwvxh6yjhmavhb454fys0yi"; depends=[doParallel foreach knitr sp spatstat]; }; @@ -12563,12 +12584,11 @@ in with self; { rcrossref = derive2 { name="rcrossref"; version="1.0.0"; sha256="1743qy5q0n2ij7x88nkk99w59vnl7g9fwpkwgb3a3s235f6lb4df"; depends=[bibtex crul dplyr DT jsonlite miniUI plyr R6 shiny stringr xml2]; }; rcrtan = derive2 { name="rcrtan"; version="0.1.1"; sha256="0kcp3gnjmp00i1hsjagpp0dlr6zgpc4y5ihpx93hm4m3fnzcmn7x"; depends=[dplyr magrittr purrrlyr tibble tidyr]; }; rcrypt = derive2 { name="rcrypt"; version="0.1.1"; sha256="002r5wr0bmqbj014iz8wacj883j6gqcxc786m6p9a7zdrjpx2pqi"; depends=[]; }; - rcss = derive2 { name="rcss"; version="1.8"; sha256="0c2i1zqjgl81i91b3bv70v54iib1d7hbsd1h63nip1al6lwnya4c"; depends=[nabor Rcpp RcppArmadillo]; }; rcube = derive2 { name="rcube"; version="0.5"; sha256="1162y7fs3fsbb5jj66g9kvxxhggprlifrabqbb9lqm8rrdwhz3r9"; depends=[magrittr]; }; rcv = derive2 { name="rcv"; version="0.2.1"; sha256="0i5z3a918ykl56dv3dvzwwcv550gvjjdg5kfh63jlpaxn9ybmv3f"; depends=[dplyr readr stringr tibble tidyr]; }; rdatacite = derive2 { name="rdatacite"; version="0.5.2"; sha256="07zbxr89fxx9nlp5w7n60rjm3prck08h0fjrq0pnpkbnnkx9cv9a"; depends=[crul jsonlite tibble]; }; rdataretriever = derive2 { name="rdataretriever"; version="2.0.0"; sha256="0gnvvxvlfh6j887y5w83q5kg6lqqcb0c54lfcx9qp3r28hpdlxkz"; depends=[reticulate]; }; - rdbnomics = derive2 { name="rdbnomics"; version="0.5.2"; sha256="149ma5rvrfd1hcjm47g7yqwiildqcf0q3n70jfhd48fqgs0x30l9"; depends=[curl data_table jsonlite]; }; + rdbnomics = derive2 { name="rdbnomics"; version="0.6.1"; sha256="1jvgmfa0qc3l2bp2896827vxpavc32bzby8x9z2wbyfmkk6pm985"; depends=[curl data_table jsonlite]; }; rdd = derive2 { name="rdd"; version="0.57"; sha256="1lpkzcjd18x51wzr4d1prdjfsw5978z6zap65psfs02nszy69nqp"; depends=[AER Formula lmtest sandwich]; }; rddensity = derive2 { name="rddensity"; version="1.0"; sha256="0v94izsghy35b33dq5b28p2lqs1fw1snyipdf9vgjz5s3qkzjkd8"; depends=[ggplot2 lpdensity]; }; rde = derive2 { name="rde"; version="0.1.0"; sha256="1zw9gdh90hl0wc5c0xwl5x7566r611wk73sbqdmpzpswjyyl9aqm"; depends=[clipr]; }; @@ -12588,7 +12608,7 @@ in with self; { rdoxygen = derive2 { name="rdoxygen"; version="1.0.0"; sha256="16907969w66xvy62k45rw10qfv4x8z6jkkc6i97vppkgnlvf4d4b"; depends=[devtools]; }; rdpla = derive2 { name="rdpla"; version="0.2.0"; sha256="0d32bp68z1agymcmjwnds4fkblhjrcx8i2q6f5b7sl4kdfdbjchf"; depends=[crul data_table hoardr jsonlite tibble]; }; rdpower = derive2 { name="rdpower"; version="0.5"; sha256="1kqfxh2g9dar130d0wld64iyd6iq51s2zrsjrprg1s3ssgi9xmb6"; depends=[rdrobust]; }; - rdrobust = derive2 { name="rdrobust"; version="0.99.6"; sha256="0dzg7yksa0cjj5gc77qq6isc97w00chjmf0ak3dbm6gjy68kv8nx"; depends=[ggplot2]; }; + rdrobust = derive2 { name="rdrobust"; version="0.99.7"; sha256="07v7cllcwmjgn8iscgm8lmxp1m6c9v6ikph4g3r4d4prbap7p556"; depends=[ggplot2]; }; 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.2.1"; sha256="0mm2psp8j1dfvah5d68a721kl3klins038nwgbv4s6x38a9amvq6"; depends=[curl digest ggplot2 gtools jsonlite knitr provSummarizeR provViz rmarkdown sessioninfo stringi XML]; }; @@ -12616,15 +12636,15 @@ in with self; { readmnist = derive2 { name="readmnist"; version="1.0.6"; sha256="0f2kp5r04k47gpvbj8x13c47zsis3bw3y8f5f37sh6jggblqr004"; depends=[]; }; readobj = derive2 { name="readobj"; version="0.3.2"; sha256="0n25n02f5kn8zv90n2xzdasjnrqisl4n5szb667jw57v40b726cw"; depends=[Rcpp]; }; readr = derive2 { name="readr"; version="1.3.1"; sha256="1wz496rw0ah433p755n3xac8gh7yzid4xgdjzd1a7wmpkgilvy9k"; depends=[BH clipr crayon hms R6 Rcpp tibble]; }; - readroper = derive2 { name="readroper"; version="0.9.1"; sha256="153iy144c4yxcs2cwr73czy69b4fj4q1g77rb8qmvp6blfwdcd71"; depends=[readr]; }; + readroper = derive2 { name="readroper"; version="0.9.3"; sha256="00l731hryx0igj0x7knljs9xq4gaczmsgw2hh05ngrl9y5s528dc"; depends=[readr]; }; readsdmx = derive2 { name="readsdmx"; version="0.3.0"; sha256="188yzkjblbjly032312w0fazj7k7j4ynqfc69xpblnw4gs708sx0"; depends=[Rcpp]; }; readstata13 = derive2 { name="readstata13"; version="0.9.2"; sha256="02mqwpzn7n3pqjxivnd1vlfc47xkyiywfz594x0f6vd2dym8rdwd"; depends=[Rcpp]; }; readtext = derive2 { name="readtext"; version="0.76"; sha256="1k79db2aay15gdb52cqd87wnwk0pn27y45c65741rk8rgddk7lwj"; depends=[antiword data_table digest httr jsonlite pdftools readODS readxl streamR stringi striprtf tibble xml2]; }; readtextgrid = derive2 { name="readtextgrid"; version="0.1.1"; sha256="03qrbmlpbjwx4ia0ydv6m9lwzalsas9pdhds82mg5f8ir0cd0qi6"; depends=[magrittr plyr purrr readr stringr tibble]; }; readthat = derive2 { name="readthat"; version="0.0.1"; sha256="04vnpvfa8in3gxi6nv3si59hr8hj17wq3a5n8rnpiaczg46qr1dr"; depends=[curl Rcpp]; }; - readwritesqlite = derive2 { name="readwritesqlite"; version="0.1.0"; sha256="15ahhdmrcas199ki3fl8mbdailgp0w18ki64nkq2f6sz9yyxngq1"; depends=[chk DBI hms lifecycle RSQLite tibble]; }; + readwritesqlite = derive2 { name="readwritesqlite"; version="0.1.1"; sha256="1s0av5ijnsan9lr3szdf91hf0xwyy9m0qidp8dxh2zpm5md4ipkr"; depends=[chk DBI hms lifecycle RSQLite tibble]; }; readxl = derive2 { name="readxl"; version="1.3.1"; sha256="15mambxr8c7k2ikdfsl1w3vxvm54dsnk0cl1qvks6iig7rql3d14"; depends=[cellranger progress Rcpp tibble]; }; - readxlsb = derive2 { name="readxlsb"; version="0.1.2"; sha256="0vm1hl8rjmcly6wkq06x9q5yswcdxasdc66xgpvhvw8mf0q6rlkd"; depends=[cellranger Rcpp xml2]; }; + readxlsb = derive2 { name="readxlsb"; version="0.1.3"; sha256="1n3j2g18n908z7n275mjjha9l358z1dvyg3p8gpymb66vaz55ims"; depends=[cellranger Rcpp xml2]; }; reams = derive2 { name="reams"; version="0.1"; sha256="07hqi0y59kv5lg0nl75xy8n48zw03y5m71zx58aiig94bf3yl95c"; depends=[leaps mgcv]; }; rebird = derive2 { name="rebird"; version="1.1.0"; sha256="0l1wignhs4hsy0yshr9gh9mwy8h794injkl5f7flkl1m4c39rz8w"; depends=[assertthat dplyr httr jsonlite]; }; rebmix = derive2 { name="rebmix"; version="2.11.0"; sha256="1rmpgzxpxk3dr0c625j5g37kvxvlqwprkixk7lwjwn4lviin3cwq"; depends=[mvtnorm]; }; @@ -12658,7 +12678,7 @@ in with self; { redlistr = derive2 { name="redlistr"; version="1.0.3"; sha256="003jxfmj1gryw77vnrvaxmpvjbshlq53wgcrj02mcywfcqzg4jcr"; depends=[plyr raster rgeos sp]; }; redux = derive2 { name="redux"; version="1.1.0"; sha256="0a551w7fph338mqzxda6y21lsad19dway7w18jw9cv1rgvcp9nvc"; depends=[R6 storr]; }; ref_ICAR = derive2 { name="ref.ICAR"; version="1.0"; sha256="0k6czsbjclgmi7vp5hl50jghkzm573s50993iz3dcv55mv662251"; depends=[coda MCMCglmm mvtnorm Rdpack rgdal spdep]; }; - referenceIntervals = derive2 { name="referenceIntervals"; version="1.1.1"; sha256="04199nxh216msaghkp66zsi96h76a7c42ldml0fm66v2vamcslg8"; depends=[boot car extremevalues outliers]; }; + referenceIntervals = derive2 { name="referenceIntervals"; version="1.2.0"; sha256="0wf8c71z7gq2f91q60dyy7mrxsnhq7x3wdllmzn2lpabgv2wrm85"; depends=[boot car extremevalues outliers]; }; refinr = derive2 { name="refinr"; version="0.3.1"; sha256="0q76sr050pg3ahwzcxj08mjig0k2jq8yh7nv6d914pwg3dhq05sn"; depends=[Rcpp stringdist stringi]; }; refnr = derive2 { name="refnr"; version="0.1.0"; sha256="1gjjzxpyxm1kf1pqk99bd7f2j85rzmww3r1268bccivf19rs881i"; depends=[]; }; refset = derive2 { name="refset"; version="0.1.1"; sha256="1xbwvm9066g3f7pd34z5jh04vph4ddy2lkcgmf4kiwa1k5czpwg1"; depends=[]; }; @@ -12669,7 +12689,7 @@ in with self; { regclass = derive2 { name="regclass"; version="1.6"; sha256="0m974k3yhf0dgv5f1qjs8c53mam0cll3cjn35ywfrmlfla0wlhf5"; depends=[bestglm leaps randomForest rpart rpart_plot VGAM]; }; regexPipes = derive2 { name="regexPipes"; version="0.0.1"; sha256="1hk0rhvmgzcyf5cyl8hjznl3ll25kpasqikfr6nxd6ian2slvmmb"; depends=[]; }; regexSelect = derive2 { name="regexSelect"; version="1.0.0"; sha256="0xnb9qa8l63ang4r40ky4qhlrs5mbzvmj98dgij26j3mq1ys1pa7"; depends=[shiny shinyjs]; }; - reghelper = derive2 { name="reghelper"; version="0.3.5"; sha256="1max91968w5ijnvi4pqhnvzcqj1dxw41cifzgf5mjg63ylpxsarx"; depends=[ggplot2 lme4 nlme]; }; + reghelper = derive2 { name="reghelper"; version="0.3.6"; sha256="0m90q6iq2y5fjdwwplvpjymzhc8kr2cdfb2gghfrzfzxnd3m4fg7"; depends=[ggplot2 lme4 nlme]; }; registr = derive2 { name="registr"; version="1.0.0"; sha256="1ysj2ab69w6g71d1kpcwyq0py71w6h7lfhk4nzgn2dhh6k8whwbn"; depends=[dplyr ggplot2 gridExtra magrittr Rcpp RcppArmadillo tidyr]; }; registry = derive2 { name="registry"; version="0.5-1"; sha256="1k3j6dx350awamr0dwwgkhfs46vsnj4nf08iw5byq0x7n3nkdsnz"; depends=[]; }; reglogit = derive2 { name="reglogit"; version="1.2-6"; sha256="1nnn8n5sqhbd3nzmwnpmcsmaxxxaqwbna7xm7q9vk4cqz9cm9b9s"; depends=[boot Matrix mvtnorm]; }; @@ -12722,7 +12742,7 @@ in with self; { repeated = derive2 { name="repeated"; version="1.1.2"; sha256="19kcsj96i1zpnwfan3gz5vrzc2gqlah0wrdr9vb4vvacz45wcdfq"; depends=[rmutil]; }; repec = derive2 { name="repec"; version="0.1.0"; sha256="0alr9fbmfxmnnnn1qymy65crcycynwz435jj0vangbb4p0qhv8pm"; depends=[jsonlite]; }; repfdr = derive2 { name="repfdr"; version="1.2.3"; sha256="0jpk44arg1jib0h2w90h851bs5cd1ss32fab9bfvf9iir2jk8985"; depends=[Rcpp]; }; - replicateBE = derive2 { name="replicateBE"; version="1.0.13"; sha256="1r5c4gwbwcdkcp1by8n3l4fn54vaxhp9fc5zbmgn43rpwbz1nsma"; depends=[lmerTest nlme pbkrtest PowerTOST readxl]; }; + replicateBE = derive2 { name="replicateBE"; version="1.0.14"; sha256="1x71wpmg1mb53jv150k8cb319rqqwnsbns05ac95hlpnkqp9jcf9"; depends=[lmerTest nlme pbkrtest PowerTOST readxl]; }; 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]; }; repmis = derive2 { name="repmis"; version="0.5"; sha256="0z5mjbsl24yjbl0aawr35grcal44rf2xbwv1hy7bdkms94ix79b5"; depends=[data_table digest httr plyr R_cache]; }; @@ -12731,7 +12751,6 @@ in with self; { reportROC = derive2 { name="reportROC"; version="3.4"; sha256="1gcck5ids0prrrbv4hqi76swxjhbx796p4qlxbf63ys3gvdzanxr"; depends=[pROC]; }; reportReg = derive2 { name="reportReg"; version="0.3.0"; sha256="0qwrpn61x69hmgln5fpc58dqfa3pba0lgjjyj0f3fh96wc9jyhq1"; depends=[nlme]; }; reportr = derive2 { name="reportr"; version="1.3.0"; sha256="0zynplxqvbmf23cm2rsz3wz2jx6mv55z94mn1k44ny3lx625cnpw"; depends=[ore]; }; - reports = derive2 { name="reports"; version="0.1.4"; sha256="0r74fjmdqax2x5fhbkdxb8gsvzi6v794fh81x4la9davz6w1fnxh"; depends=[]; }; reporttools = derive2 { name="reporttools"; version="1.1.2"; sha256="1i87xmp7zchcb8w8g7nypid06l2439qyrvpwsjz6qny954w6fa2b"; depends=[xtable]; }; repr = derive2 { name="repr"; version="1.1.0"; sha256="15jz780w4nd9qjd1g3gq8f5lkh60p2v3ig3hm5kl1rg3z4cf0gvl"; depends=[base64enc htmltools jsonlite pillar]; }; represent = derive2 { name="represent"; version="1.0"; sha256="0jvb40i6r1bh9ysfqwsj7s1g933d7z5fq9d618yjrqr6hbbqsvac"; depends=[]; }; @@ -12739,7 +12758,7 @@ in with self; { reprex = derive2 { name="reprex"; version="0.3.0"; sha256="0v7vxzs8alwz8y1cjicpimp5yimf1g9gb8x5wy3zhvrz6kk2lg10"; depends=[callr clipr fs rlang rmarkdown whisker withr]; }; reproducer = derive2 { name="reproducer"; version="0.3.1"; sha256="0clgbwfv24fjx6hj0km1nwy508dqbga8q8lyzqg801yrr8gidizd"; depends=[dplyr GetoptLong ggplot2 gridExtra httr jsonlite lme4 MASS metafor openxlsx readr reshape stringr tibble tidyr xtable]; }; reproducible = derive2 { name="reproducible"; version="1.0.0"; sha256="1zcxdvh3x1h0jcxcv62syl0midj2kk264vkanjj2bfhn4jbbbymi"; depends=[backports crayon data_table DBI digest fastdigest fpCompare gdalUtils glue googledrive httr magrittr memoise qs quickPlot R_utils raster remotes rgdal rlang RSQLite sf sp testthat versions]; }; - reproj = derive2 { name="reproj"; version="0.4.0"; sha256="0liwv4sgxdm42vyykjyc3jihcxk3b5q0d7cwgai8349nn1ah0wdh"; depends=[proj4 tibble]; }; + reproj = derive2 { name="reproj"; version="0.4.2"; sha256="0lxd1vsxcf0r96jkl5jrh3kyklf90wcs4a27cs6ck93x1cxjnnni"; depends=[crsmeta PROJ proj4]; }; repurrrsive = derive2 { name="repurrrsive"; version="1.0.0"; sha256="1nmy88h2bfv2bad282kbrmnkjx9d8klgzv4mm8nspm049s09ydmz"; depends=[tibble]; }; reqres = derive2 { name="reqres"; version="0.2.3"; sha256="0dly09h8dpjlmvrd1wfg1gqcqhm03ax97qr0nd1p0fg9y0pdapya"; depends=[assertthat brotli jsonlite R6 stringi urltools webutils xml2]; }; request = derive2 { name="request"; version="0.1.0"; sha256="1q7zd6q00gdqmgq7s7nq1ixmns8zn2amr5zah9rwnsn8dkllj9yh"; depends=[curl httr jsonlite lazyeval magrittr R6 whisker]; }; @@ -12753,7 +12772,7 @@ in with self; { 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]; }; - reshape2 = derive2 { name="reshape2"; version="1.4.3"; sha256="03ki5ka1dj208fc0dclbm0b4xp9d769pah2j9cs34l776p4r9zwa"; depends=[plyr Rcpp stringr]; }; + reshape2 = derive2 { name="reshape2"; version="1.4.4"; sha256="1n0jrajpvc8hjkh9z4g8bwq63qy5vy5cgl2pzjardyih4ngcz3fq"; depends=[plyr Rcpp stringr]; }; reshapeGUI = derive2 { name="reshapeGUI"; version="0.1.0"; sha256="0kb57isws8gw0nlr6v9lg06c8000hqw0fvhfjsjyf8w6zwbbq3zs"; depends=[gWidgets gWidgetsRGtk2 plyr reshape2]; }; resourcer = derive2 { name="resourcer"; version="1.0.0"; sha256="11abgyk0xs0sb3cw0fn6nh9wzbqnijja1mhj3hsdvz9n8k196b08"; depends=[httr R6]; }; respirometry = derive2 { name="respirometry"; version="1.0.2"; sha256="10dfy1xx2214x4lk0nxxi8c2h8j47gd8w004ic016j3m7a1vp3jd"; depends=[birk lubridate marelac measurements minpack_lm PKNCA seacarb segmented]; }; @@ -12772,6 +12791,7 @@ in with self; { retractcheck = derive2 { name="retractcheck"; version="1.0.0"; sha256="1c4p8afh9g359s560sswcys3manc0lqvk0aqgvd09p4rpzls2dm7"; depends=[httr plyr textreadr]; }; retrodesign = derive2 { name="retrodesign"; version="0.1.0"; sha256="173jrpzasimplv8vbm8gzpl8aibnsjkgvhz1hd75is0b2l8gnbxy"; depends=[]; }; retrosheet = derive2 { name="retrosheet"; version="1.1.1"; sha256="1x9gh9zjb4r1nyfbcb79c656a8hzrfasdir8p968inqmr08b57v0"; depends=[data_table httr lubridate purrr readr rvest stringi stringr tibble xml2]; }; + retry = derive2 { name="retry"; version="0.1.0"; sha256="1yfcfvszfjnvvnjcywgchyiyj3jk9nmvk3h40g6bc24xapfkfl2p"; depends=[later rlang]; }; reutils = derive2 { name="reutils"; version="0.2.3"; sha256="09dhf4s7wz3anrkzqi16abx64gk8ck2142kfd8pv71mjy3x548l7"; depends=[assertthat jsonlite RCurl tibble XML]; }; reval = derive2 { name="reval"; version="2.0.0"; sha256="1yxkyc6wdp5h3cp8i42a9cf0b1cwr4nmpd7svlp7bpfxlcnqqa0d"; depends=[doParallel foreach]; }; revdbayes = derive2 { name="revdbayes"; version="1.3.6"; sha256="15nrmnl3g4l8yn6x1xvbfjn4fznryvgkvaqyxjr929v05rrf3fl0"; depends=[bayesplot Rcpp RcppArmadillo rust]; }; @@ -12782,13 +12802,12 @@ in with self; { revgeo = derive2 { name="revgeo"; version="0.15"; sha256="1ns7d1817475lriss6wwgvdm6lj760p40yxqaifla13c2xb73a55"; depends=[RCurl RJSONIO]; }; revtools = derive2 { name="revtools"; version="0.4.1"; sha256="0nms7rwpdzf3xq2incraxppha4c830gcygpbnhwjs92c836hh2f0"; depends=[ade4 modeltools ngram plotly shiny shinydashboard slam SnowballC stringdist tm topicmodels viridisLite]; }; reweight = derive2 { name="reweight"; version="1.2.1"; sha256="0fv7q1zb3f4vplg3b5ykb1ydwbzmiajgd1ihrxl732ll8rkkfa4v"; depends=[]; }; - rex = derive2 { name="rex"; version="1.1.2"; sha256="0alsadgjgass3wr8y5d247j12qqzg454sc84vpskclrkmz778g5x"; depends=[lazyeval magrittr]; }; + rex = derive2 { name="rex"; version="1.2.0"; sha256="0m7bq8db3m5dhf01rw7xc7xy1ciq3m7dfgsl80p8cy4h8vqr3d06"; depends=[lazyeval]; }; rexpokit = derive2 { name="rexpokit"; version="0.26.6.6"; sha256="13dxra3s68i499g21z9i93mbn6n8s4xay5zmvslafaccbq3q1ray"; depends=[Rcpp]; }; rfPermute = derive2 { name="rfPermute"; version="2.1.81"; sha256="0mak4r3j5vbjjkcsbxj0yg2xrbipq4rz873b02drkb769nh3d16a"; depends=[abind dplyr ggplot2 gridExtra magrittr randomForest rlang scales swfscMisc tibble tidyr]; }; rfUtilities = derive2 { name="rfUtilities"; version="2.1-5"; sha256="1anwvmxn3xrc1aqxl75rzlk4wby8l54rmkp0bgi8dgbz2l223xr0"; depends=[cluster randomForest]; }; rfVarImpOOB = derive2 { name="rfVarImpOOB"; version="1.0"; sha256="1341bicd65qw3pz1j8d6c9baj9d6s70ljdaaf87xvx8pjnajrfsw"; depends=[binaryLogic dplyr ggplot2 ggpubr magrittr prob randomForest titanic]; }; rfacebookstat = derive2 { name="rfacebookstat"; version="2.0.2"; sha256="0szzrlszjxapn86mk29f1nn39fmkfwjslbbcmqqj2harlnccafr7"; depends=[dplyr httr jsonlite purrr stringr tidyr tidyselect]; }; - 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]; }; rfinterval = derive2 { name="rfinterval"; version="1.0.0"; sha256="1z7v0sbql6g2h3fr1268nj79rbx1d33hjfaraxhbikrjgb8mbp0w"; depends=[MASS ranger]; }; rfishbase = derive2 { name="rfishbase"; version="3.0.4"; sha256="1km3xjbf3l81sfmmjs55criq4xw6l3xa74f8g1rxsbr5bci9xlia"; depends=[dplyr gh magrittr memoise purrr readr rlang stringr]; }; @@ -12796,7 +12815,7 @@ in with self; { rfishnet2 = derive2 { name="rfishnet2"; version="0.1.0"; sha256="054cdgffy56yf5i0wy6kkyc68lim3zlk9czi6k5cy87lfjzcjqs9"; depends=[ggplot2 pracma sf]; }; rflexscan = derive2 { name="rflexscan"; version="0.2.0"; sha256="008xpbdqix18lwdqcx0mixwhv8v47kzpkblr53igp5766l04nfyj"; depends=[igraph Rcpp rgdal sp]; }; rflights = derive2 { name="rflights"; version="0.1.103"; sha256="1gxfsc3dhlzy6bpqjdxk5x309jmjgvxr8d9amnhrjdygzj6icf18"; depends=[httr]; }; - rfm = derive2 { name="rfm"; version="0.2.0"; sha256="1d07bms5ykfkw0ynfl21fhs9s6yvs44fn570vzi2dj8h5ywbsz15"; depends=[assertthat dplyr forcats ggplot2 ggthemes lubridate magrittr purrr RColorBrewer rlang tidyr xplorerr]; }; + rfm = derive2 { name="rfm"; version="0.2.1"; sha256="0p3y5pkxlm59jxwzyf6c5x9g8vbgvyn5d8j793szd075m11gk099"; depends=[dplyr ggplot2 ggthemes lubridate magrittr RColorBrewer rlang tibble tidyr xplorerr]; }; rfml = derive2 { name="rfml"; version="0.1.0"; sha256="133adpfjpp14m47841k6ybq9lrvby9bxgr5zs4i3akjr2575nq1j"; depends=[httr jsonlite PKI XML]; }; rfoaas = derive2 { name="rfoaas"; version="2.1.0"; sha256="0w6m3lvfb60a2zfvyc0ksnfllb2ndy45b301vk9f3nr27lxdz6dm"; depends=[httr]; }; rfordummies = derive2 { name="rfordummies"; version="0.1.4"; sha256="03y4kzf18xwk41dm1nzqqqk0aflwh1mcgfnh0lbr0r7hnsy3a77x"; depends=[openxlsx]; }; @@ -12808,13 +12827,14 @@ in with self; { 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=[]; }; - rgeolocate = derive2 { name="rgeolocate"; version="1.0.1"; sha256="1v9kd71wpxna1war0rbp91pc5wdqlganmj2c2fc5m5176dnxd2v3"; depends=[httr Rcpp]; }; + rgeolocate = derive2 { name="rgeolocate"; version="1.2.0"; sha256="0v83ldn6jh0jg6vnx3i8fc2nxp00vj63bkywr3dhpd11dj9l22hn"; depends=[httr Rcpp]; }; rgeopat2 = derive2 { name="rgeopat2"; version="0.3.9"; sha256="0l0sqkvjkzp4lmyk55l7zc02y04sa43cps47005gq8c38kyks45k"; depends=[readr sf stringr]; }; rgeoprofile = derive2 { name="rgeoprofile"; version="0.1.1"; sha256="0frpipmmhywbahcyj5rhypp9qxqkp6xkdj6sn8w1ipw6gv02zp7b"; depends=[aspace geosphere leaflet pals RANN raster sp splancs]; }; rgeos = derive2 { name="rgeos"; version="0.5-2"; sha256="0ajrrxfwfp184c6rnby3dq54hzp3rrx3px72dn7gbdn6c4li2bqz"; depends=[sp]; }; rgexf = derive2 { name="rgexf"; version="0.16.0"; sha256="1vj5ha1qx0xzflchxf25ycys6clfn9y32m1717afzkvhmkwisrra"; depends=[igraph servr XML]; }; rggobi = derive2 { name="rggobi"; version="2.1.22"; sha256="1g7k4xais9xkjlbvrkadr5d6c5rw4jp9c0gljhm71pa1fc9fcqff"; depends=[RGtk2]; }; - rgl = derive2 { name="rgl"; version="0.100.50"; sha256="165p932ml7dpjkm41zc47p5cdxar69il0m5yvg0avi8q01vr17ay"; depends=[crosstalk htmltools htmlwidgets jsonlite knitr magrittr manipulateWidget shiny]; }; + rgho = derive2 { name="rgho"; version="2.0.0"; sha256="18vsd40wrzm8h8xv7mngyndw18wasb5b868ihczvzrqfnf5bq758"; depends=[curl dplyr httr jsonlite lazyeval magrittr memoise readr tibble tidyr]; }; + rgl = derive2 { name="rgl"; version="0.100.54"; sha256="1mgs2d8igmcdzzymfwbqdrypmaidd4pra5n5gnhsn9pm6pqzidqp"; depends=[crosstalk htmltools htmlwidgets jsonlite knitr magrittr manipulateWidget shiny]; }; rglobi = derive2 { name="rglobi"; version="0.2.21"; sha256="12v6g1ja4rrw0vcrrzgd1llxfk64g9z4f0c90rkbd9cknvnn0id9"; depends=[curl RCurl readr rjson]; }; rglwidget = derive2 { name="rglwidget"; version="0.2.1"; sha256="0siqxn3gyl98i84p0yha821b4rdrp2i0942mkx819wnf7qwrpqcv"; depends=[rgl]; }; rgoogleslides = derive2 { name="rgoogleslides"; version="0.3.2"; sha256="0h9gws1vcf0zdd21d8b65c2yz9kxppp3218h5lhd5iz879ajwa2i"; depends=[assertthat httr jsonlite R6]; }; @@ -12862,7 +12882,7 @@ in with self; { riskclustr = derive2 { name="riskclustr"; version="0.2"; sha256="0j5gcm9a57yrg5ppqmacdjr16b9d8rwqkhq1mawy1fjpf18d2max"; depends=[aod gtools Matrix mlogit stringr]; }; risksetROC = derive2 { name="risksetROC"; version="1.0.4"; sha256="1fh0jf8v536qzf1v3awx3f73wykzicli4r54yg1z926ccqb4h80l"; depends=[MASS survival]; }; riskyr = derive2 { name="riskyr"; version="0.2.0"; sha256="0zq5qybqisbh9k7i57s8yw9xcm7yckcjk17h4ybcx4p8788gg5m3"; depends=[]; }; - ritis = derive2 { name="ritis"; version="0.8.0"; sha256="1ggcchavhxcd3pawcf631ca8w1y4v0ygm1hflvkmzhk4k9ci3g13"; depends=[crul data_table jsonlite solrium tibble]; }; + ritis = derive2 { name="ritis"; version="0.9.0"; sha256="0v0g7zbdx21ia98lb126cq2d1fwx24prng2p2r8lcgpxc34fdfsa"; depends=[crul data_table jsonlite solrium tibble]; }; riv = derive2 { name="riv"; version="2.0-5"; sha256="0n19jlrs12iysq45xyi3zvghkircg0ww5vbsfpnqkw5b22zsv30s"; depends=[MASS quantreg rrcov]; }; riverdist = derive2 { name="riverdist"; version="0.15.0"; sha256="145mvqnhv12dcvss54wdycgb3wwk95phl4kx5z0jnh3kmm1zsdl4"; depends=[rgdal sp]; }; rivernet = derive2 { name="rivernet"; version="1.2.1"; sha256="0p8jyigbxipwds9pdw2gzv3ql5yikg1ik4vbk4drylbp5xhmvyja"; depends=[]; }; @@ -12897,7 +12917,6 @@ in with self; { rlm = derive2 { name="rlm"; version="1.2"; sha256="18y735z05k9pms6iv1739qg3q12w099qhs42icxhqs5gcdhz92fm"; depends=[]; }; rlmDataDriven = derive2 { name="rlmDataDriven"; version="0.4.0"; sha256="1fhh2siafpqmvpxi2piccxvvn5n38s5d6as6iyn43rgpsslswc8g"; depends=[MASS tseries]; }; rlme = derive2 { name="rlme"; version="0.5"; sha256="0p26mw4g12l279lh80vqcjs3pvjr759ap2m622490k1i2ralxzif"; depends=[magic MASS mgcv nlme quantreg Rcpp robustbase stringr]; }; - 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]; }; rmRNAseq = derive2 { name="rmRNAseq"; version="0.1.0"; sha256="0hh44bn7z7945aw722haazw8dx7fwzym67jismkygzhnksh59wqi"; depends=[AUC Biobase DESeq2 edgeR limma MASS Matrix nlme reshape rlang splineTimeR statmod]; }; rma_exact = derive2 { name="rma.exact"; version="0.1.0"; sha256="1igs92la79akyqj84ah23lpcay7i33k7zgzcwm7sii782fhirivx"; depends=[abind metafor]; }; @@ -12924,7 +12943,7 @@ in with self; { rmetasim = derive2 { name="rmetasim"; version="3.1.14"; sha256="0rdkhfgyr97r2d1kd9g8ipb2pn563qxm1y4m9z678q0kqan2ddl0"; depends=[ade4 adegenet gtools pegas]; }; rmgarch = derive2 { name="rmgarch"; version="1.3-7"; sha256="108wrbqj4c02c9cyv5m5xlswb1mlfdrhggb005sixr2dcqghb163"; depends=[Bessel corpcor ff MASS Matrix pcaPP Rcpp RcppArmadillo Rsolnp rugarch shape spd xts zoo]; }; rmi = derive2 { name="rmi"; version="0.1.1"; sha256="1y0395l9lhskdrk3x9ps2dmv0sznsba0n6a9fmma33dc9dhywgf9"; depends=[BH Rcpp RcppArmadillo]; }; - rminer = derive2 { name="rminer"; version="1.4.3"; sha256="0x9lzzhhy5zld8fajf4aq1msvck2kg3hvkpaiw4lx7w14znda7kd"; depends=[adabag Cubist e1071 glmnet kernlab kknn lattice MASS mda nnet party plotrix pls randomForest rpart xgboost]; }; + rminer = derive2 { name="rminer"; version="1.4.5"; sha256="0xwlayzmn4z6g9l93mj0vjsh31mhpxcmccvjm0dr802cjiv3phjj"; depends=[adabag Cubist e1071 glmnet kernlab kknn lattice MASS mda nnet party plotrix pls randomForest rpart xgboost]; }; rmio = derive2 { name="rmio"; version="0.1.3"; sha256="0zd8kki9wmh4xnabf7nwjw66wb4x5wngn0073pzqcj84ggxgnwqc"; depends=[]; }; rmonad = derive2 { name="rmonad"; version="0.7.0"; sha256="1vjx8kk57xk7c2a05c6kn75n17842ya7j41hqj3wmgq8yvaxrngx"; depends=[digest glue igraph magrittr pryr]; }; rmpw = derive2 { name="rmpw"; version="0.0.4"; sha256="1a49rvdwvmccv4gfir48fw0b9jyrpc2q9zfyk5j9b7nxsx6x7abl"; depends=[gtools MASS]; }; @@ -12941,14 +12960,14 @@ in with self; { rnaturalearthdata = derive2 { name="rnaturalearthdata"; version="0.1.0"; sha256="1z32j5lz2lb8xgpkr73majw22k0b49iazj6jjc7j4w9k4zxxa102"; depends=[sp]; }; rnbp = derive2 { name="rnbp"; version="0.1.0"; sha256="01hx9r7ai42kcj8l7bmqrma8w3l1f9bmg2ingpqxirimxkfwv2k8"; depends=[curl httr jsonlite]; }; rncl = derive2 { name="rncl"; version="0.8.4"; sha256="0ss9jqrvv7bhvl5j74cjrp8r866d9dlavrbbfscwz3mhkgfx06bb"; depends=[progress Rcpp]; }; - rneos = derive2 { name="rneos"; version="0.3-2"; sha256="0m5mmhwnrk9ifv91s5ngmlvqqd7bw1n7glzkgk5i72cw0siiwmh0"; depends=[RCurl XML]; }; + rneos = derive2 { name="rneos"; version="0.4-0"; sha256="07b3vb0h36ilwb8iylgppl8wpi84f583frmscpj236s1aihqwrmx"; depends=[RCurl XML]; }; rnetcarto = derive2 { name="rnetcarto"; version="0.2.4"; sha256="0fk5rym6zp049bl1f7bkl2231mjh3pgnxn0nhvmzpsah08rh4rr6"; depends=[]; }; rngSetSeed = derive2 { name="rngSetSeed"; version="0.3-2"; sha256="00mqjjkhbnvxqkf1kz16gipsf98q62vmhx9v8140qs7c4ljbhc3a"; depends=[]; }; rngWELL = derive2 { name="rngWELL"; version="0.10-6"; sha256="0pjjcs9pqj7mf0mhb2cwd0aanqpwnm65bm86hk6mi2vw8rgnj2vv"; depends=[]; }; rngtools = derive2 { name="rngtools"; version="1.5"; sha256="0xgmg3qb6insc157as47mcm9sdjdpy9jirh7w06bxb7pfcxqfx42"; depends=[digest]; }; rngwell19937 = derive2 { name="rngwell19937"; version="0.6-0"; sha256="0m6icqf7nckdxxvmqvwfkrpjs10hc7l8xisc65q8iqpnpwl5p2f6"; depends=[]; }; rnn = derive2 { name="rnn"; version="0.9.8"; sha256="1f1h7x9vff0jrdkv1gpxlmlr5v1c81gsfxy4z83rq3v0drpxahnv"; depends=[shiny sigmoid]; }; - rnoaa = derive2 { name="rnoaa"; version="0.9.5"; sha256="123gzgycv8lnx9dikkqjn2fhnpzlwgxdmzkvdvf3kgwl1gw9170b"; depends=[crul dplyr geonames ggplot2 gridExtra hoardr isdparser jsonlite lubridate rappdirs scales tibble tidyr tidyselect XML xml2]; }; + rnoaa = derive2 { name="rnoaa"; version="0.9.6"; sha256="073w2jadpih9amamwm3arw1d168p69dfhz98gvvmqay3k7dmwg0z"; depends=[crul dplyr geonames ggplot2 gridExtra hoardr isdparser jsonlite lubridate rappdirs scales tibble tidyr tidyselect XML xml2]; }; rnpn = derive2 { name="rnpn"; version="0.1.0"; sha256="10xx8fxgdknv71ks42xxvf38xsmjy6s87y67wi21673v0n07fxb5"; depends=[data_table httr jsonlite plyr]; }; rnr = derive2 { name="rnr"; version="0.2.1"; sha256="1z9bab3qmq8d79bcvjzldbxlah2w8mqp2ifd0cn1348dafwa0dhi"; depends=[assertthat purrr]; }; rnrfa = derive2 { name="rnrfa"; version="2.0.2"; sha256="0sjg04y1s7wfvimwv19ay5qhldsvncy34j0r79ddys7pmzql1aic"; depends=[curl dplyr ggmap ggplot2 httr jsonlite lubridate rgdal sp tibble zoo]; }; @@ -12964,7 +12983,7 @@ in with self; { robin = derive2 { name="robin"; version="1.0.0"; sha256="0g0dzk20z98ygbxs3f8ylfjryxpdz5112jvdiax4iyj890yjp93c"; depends=[DescTools fdatest ggplot2 gprege igraph networkD3]; }; robis = derive2 { name="robis"; version="2.1.8"; sha256="1qi6ay0v3vc2gz5xalgj8vfx7zaiz5726mkkgwawxfj35gmdq0mk"; depends=[dplyr ggplot2 httr jsonlite leaflet]; }; robmed = derive2 { name="robmed"; version="0.6.0"; sha256="1rlfn85nq6dpwwlp3z567vq23i233iwsjb0jss4ahfbnayydq2ir"; depends=[boot ggplot2 quantreg robustbase shiny]; }; - robmixglm = derive2 { name="robmixglm"; version="1.0-3"; sha256="0y8djq3r6c620azja7s0xjphhfdq2sl6zhj711lmb7lm7mpidqnz"; depends=[actuar bbmle boot fastGHQuad MASS numDeriv Rcpp VGAM]; }; + robmixglm = derive2 { name="robmixglm"; version="1.0-4"; sha256="03h79s63wy5mik3ijqqikxczhklrhd50ih9800hpy5h2yy59rlhn"; depends=[actuar bbmle boot fastGHQuad MASS numDeriv Rcpp VGAM]; }; robotstxt = derive2 { name="robotstxt"; version="0.6.2"; sha256="1c1rhiwkdzvbspwa5km6gp3sjhzmb60ljibb2pf26s931lkr5b6l"; depends=[future future_apply httr magrittr spiderbar stringr]; }; robreg3S = derive2 { name="robreg3S"; version="0.3"; sha256="0rv8qh98wws1f40d1kmysyy9qin0ngsvwq63cnxbwi290wsnrvls"; depends=[GSE MASS robustbase]; }; robregcc = derive2 { name="robregcc"; version="1.0"; sha256="159ms69jqjkf8bhi4hkm929hpwqi8qbcfyaahcjlkyximv7qnqaz"; depends=[magrittr MASS Rcpp RcppArmadillo]; }; @@ -13012,7 +13031,7 @@ in with self; { roots = derive2 { name="roots"; version="1.0"; sha256="1ssmmmrg18xmqxs6f7dqv07357iwcvk21j1gxsl8s9njbj2plxai"; depends=[animation igraph rARPACK]; }; rope = derive2 { name="rope"; version="1.0"; sha256="06qp6h8cjnz0yacm4r39k99hrw74iyq16h5mqfcki7sf3zqbfm7r"; depends=[]; }; ropenaq = derive2 { name="ropenaq"; version="0.2.9"; sha256="0lrm5nncybvcl0k4k8pwrdg3115wsi0zcspqscfyw1rd3w2h2yjg"; depends=[crul dplyr jsonlite lubridate magrittr rlang tidyr]; }; - ropenblas = derive2 { name="ropenblas"; version="0.2.2"; sha256="1sbk41nd2hjv93a7xd1jlpcxs7gdrkp6j27x8312zarwla2ra0qd"; depends=[cli fs getPass git2r glue magrittr RCurl rstudioapi stringr XML]; }; + ropenblas = derive2 { name="ropenblas"; version="0.2.4"; sha256="1in91cgm94mdifxgajf4rh1ilj33pgy6cdp63x2wack9ynkpkj4h"; depends=[cli fs getPass git2r glue magrittr pingr RCurl rstudioapi stringr XML]; }; ropendata = derive2 { name="ropendata"; version="0.1.0"; sha256="1bv6y241abs6pb4wq5ybx9x4zh72kf8ffs3vlcgdsmhw4jwrsxdl"; depends=[httr jsonlite]; }; ropensecretsapi = derive2 { name="ropensecretsapi"; version="1.0.1"; sha256="0d4yl0h4am3blskdnzk119hk374c3vx0cg99r20w07yh8jfafrw7"; depends=[RCurl RJSONIO]; }; roperators = derive2 { name="roperators"; version="1.1.0"; sha256="0klmk1jmh1iysgf345qa6qyjmn1pkz072ha254k90flprgicg7c6"; depends=[]; }; @@ -13032,7 +13051,6 @@ in with self; { rotations = derive2 { name="rotations"; version="1.6.1"; sha256="175bbwj1bf58gwsw3721dsh8lsika5aqv787kfyjx041m4lar4zv"; depends=[ggplot2 gridExtra Rcpp RcppArmadillo rgl sphereplot]; }; rotl = derive2 { name="rotl"; version="3.0.10"; sha256="0fh7fmaylv9490yhw6sknv03xmx5isp29mlr0xypyh6mwagngd1q"; depends=[ape assertthat httr jsonlite rentrez rncl]; }; rotor = derive2 { name="rotor"; version="0.2.4"; sha256="0m947mihnxjzsb64p5dgi4v1y1g3c172xlhdg08nzb2z21qg4r73"; depends=[dint R6]; }; - roughrf = derive2 { name="roughrf"; version="1.0"; sha256="0nwdynqfb9yzjvi1lykgdkch3b4g09aj8vbd6sf5pyx473s066y4"; depends=[mice nnet randomForest]; }; round = derive2 { name="round"; version="0.12-1"; sha256="0smvyszxvq5c5p1mhkpcjphnmijjxn05n70xvg5syij200gn60fm"; depends=[]; }; roundhouse = derive2 { name="roundhouse"; version="0.0.1"; sha256="142dw9ky6fyp5n8zf5lymx083gi56q6wxj4jm0m8cjb0khiqw2lq"; depends=[httr jsonlite]; }; routr = derive2 { name="routr"; version="0.4.0"; sha256="1vswq7vm80nwb50grr4cs290kbq5lx9b19dq0c2wlp9d2dxk50si"; depends=[assertthat digest httpuv R6 reqres stringi uuid]; }; @@ -13057,7 +13075,7 @@ in with self; { rpicosat = derive2 { name="rpicosat"; version="1.0.1"; sha256="1zj2d6jairmvya91vhv9kpkf34zmzl9vlha5yvfjj0j0apmqc0li"; depends=[]; }; rpinterest = derive2 { name="rpinterest"; version="0.3.1"; sha256="0kkf73byhgzqxw85wda3nh7qsq81pc035vi6z3fhnvb9ssszwakc"; depends=[httr magrittr rjson]; }; rpivotTable = derive2 { name="rpivotTable"; version="0.3.0"; sha256="0ndhsw4nnz6wf0v8dh4sz8867m01jjkzw6aq7f490z1ypa3d9fv5"; depends=[htmlwidgets]; }; - rplos = derive2 { name="rplos"; version="0.8.6"; sha256="1i5dzlv57bpddf9qsnq0azc0fsbmzqz9bkrijabp2qwxg0w76mcx"; depends=[crul dplyr ggplot2 jsonlite lubridate plyr reshape2 solrium whisker]; }; + rplos = derive2 { name="rplos"; version="0.9.0"; sha256="104vwyf9lz2d07dlxpg1ivvp8q6bqq4jszrhdsy0y2qbi97424br"; depends=[crul dplyr ggplot2 jsonlite lubridate plyr reshape2 solrium whisker]; }; rplotengine = derive2 { name="rplotengine"; version="1.0-7"; sha256="1bbciq84l0h6g4qajlcqg3v66g2rspflv6k7x5h5qzwlcb4p4dps"; depends=[xtable]; }; rpls = derive2 { name="rpls"; version="0.4.0"; sha256="1dhnm8z6cn316p7mnnpc7l3acs2rq0bwc29amqg0fy4wyy54nrgc"; depends=[pcaPP robustbase]; }; rpmodel = derive2 { name="rpmodel"; version="1.0.4"; sha256="1rbygxk6dbi3pqxri5myc7f3y04haa0slpiaa330malg3dw5a9gc"; depends=[rlang]; }; @@ -13078,7 +13096,7 @@ in with self; { 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]; }; rpubs = derive2 { name="rpubs"; version="0.2.2"; sha256="18cnzhcvm7gx4k01ysqay53smrf8xqlbaszq41mny5c7qqh1fvpz"; depends=[rvest xml2]; }; - rqPen = derive2 { name="rqPen"; version="2.2.1"; sha256="0k6vk4gvhqjg8am6i48zbhbb6fzlhwy5xi0dmnszm6dhbfv7jvmx"; depends=[quantreg regpro]; }; + rqPen = derive2 { name="rqPen"; version="2.2.2"; sha256="077kdvfdyp5h8630k8jigbz8mfyby8vkjiqxpqv0wfi6cqcjlaf2"; depends=[quantreg regpro]; }; rqdatatable = derive2 { name="rqdatatable"; version="1.2.7"; sha256="1p41nc54h4fq57ps1ilm3sq3qr3xhi0bxxhl80ylai0qmb445jd4"; depends=[data_table rquery wrapr]; }; rquery = derive2 { name="rquery"; version="1.4.4"; sha256="1ccy9pmgbm4q3kljgx1pjhg2059pnb6jbnxq63z1fhnb59rm4nya"; depends=[wrapr]; }; rr = derive2 { name="rr"; version="1.4"; sha256="1c2h6ibjfwrjfqh1if3c90pdh0g2rf3p71j4p9w23xbbrx2l80pl"; depends=[arm coda magic MASS]; }; @@ -13115,13 +13133,13 @@ in with self; { rsconnect = derive2 { name="rsconnect"; version="0.8.16"; sha256="05ii0p0p7xpf8z0c1594s5q7wpwcs7lmlddrd67s5p2ka5m8qwiz"; depends=[curl digest jsonlite openssl packrat rstudioapi yaml]; }; rscontract = derive2 { name="rscontract"; version="0.1.1"; sha256="1s19p9cga0qm1diblqf3rmcbm3agiimq4lhfgk004cg7rhaa1lyh"; depends=[]; }; rscopus = derive2 { name="rscopus"; version="0.6.6"; sha256="0kl6rv0j2396b8izvy0lp1f588il6w3yhq6d4swv8x8z14rsgcpw"; depends=[dplyr glue httr jsonlite plyr tidyr]; }; - rscorecard = derive2 { name="rscorecard"; version="0.14.0"; sha256="0r951j0n841ihlig2aw76vxdd31zbx98k4sz92nmi8zb69669d5w"; depends=[dplyr httr jsonlite lazyeval magrittr purrr tidyr tidyselect]; }; + rscorecard = derive2 { name="rscorecard"; version="0.15.0"; sha256="1pjzgsd9g0prbzkhm99bbd5kbqbygvxpr3flcdn8dj3fmgh21m1y"; depends=[dplyr httr jsonlite lazyeval magrittr purrr tidyr tidyselect]; }; rsdepth = derive2 { name="rsdepth"; version="0.1-5"; sha256="064jbb6gnx0sm41w3sbi6mvsbzsfkjqfici6frk8sfm9ybvm591j"; depends=[]; }; - rsdmx = derive2 { name="rsdmx"; version="0.5-13"; sha256="1lgy5nbrl4frfn805lghyx1gl2h8lkvgk07365jyvb8rzfcl43av"; depends=[plyr RCurl XML]; }; + rsdmx = derive2 { name="rsdmx"; version="0.5-14"; sha256="1b4x87h8kfw8yhmfsjf9l1i0afr7bgvyp5a369m5gn6m07dvlbp9"; depends=[plyr RCurl XML]; }; rseedcalc = derive2 { name="rseedcalc"; version="1.3"; sha256="18zmpjv6g8f7pmvqlp6khxyys9kdnq5x4zxwb6gwybsh4jxrymkp"; depends=[]; }; - rsem = derive2 { name="rsem"; version="0.4.6"; sha256="16nsbp4s20396h2in0zymbpmsn24gqlbik0vgv86zhy1yg1rz9ia"; depends=[lavaan MASS]; }; - rsf = derive2 { name="rsf"; version="0.2.1"; sha256="0bmx9c8cxnn46bwr2za74kn6z2hyjdhj0i3c58c25pqhggyymxkb"; depends=[bookdown knitr magrittr rlang usethis yaml ymlthis]; }; - rsimsum = derive2 { name="rsimsum"; version="0.8.0"; sha256="0nszqffzh9lnds6grjpjyvv78ykvk4aj3s1dwabxi43qqk1p02f1"; depends=[checkmate ggplot2 ggridges rlang scales]; }; + rsem = derive2 { name="rsem"; version="0.5.0"; sha256="1xlk83ivmk8wm6mdmmwvv2z39r6scswgmsmy6dd4qbc3kiqn8cqm"; depends=[lavaan MASS]; }; + rsf = derive2 { name="rsf"; version="0.2.2"; sha256="016q6yly2vl6q9mkff2krri2rmzsm9gc9gippd8l38h5c8ri6cdl"; depends=[bookdown knitr magrittr rlang usethis yaml ymlthis]; }; + rsimsum = derive2 { name="rsimsum"; version="0.9.0"; sha256="02bnb6rr5dzvbywp88sp81lb6ibxlfqiba5vsgp5manx1zmbgjy0"; depends=[checkmate ggplot2 ggridges knitr rlang scales]; }; rsinaica = derive2 { name="rsinaica"; version="0.6.1"; sha256="1ba19b2fgnnl50qp6hgjppgxbadghq68qap9f0m51k2k3ijgfiwn"; depends=[dplyr httr jsonlite lubridate stringr]; }; rskey = derive2 { name="rskey"; version="0.4.1"; sha256="0l9z5zbii4wi7da6cl9mr62zn72pc3dgfhk6dp8sjx4jbzpa94s3"; depends=[berryFunctions miniUI rstudioapi shiny]; }; rsleep = derive2 { name="rsleep"; version="1.0.1"; sha256="0kjb5sgv1y50cqg54dy5cx9ngr64hx2bhfav314vm2alnxsk19jh"; depends=[edfReader ggplot2 jsonlite phonTools signal]; }; @@ -13150,6 +13168,7 @@ in with self; { rstpm2 = derive2 { name="rstpm2"; version="1.5.1"; sha256="0p1zqqjss8i5wca4qvr56d6p9ak20ki4cfbxja1wrhkp4kii29r6"; depends=[bbmle deSolve fastGHQuad mgcv Rcpp RcppArmadillo survival]; }; rstream = derive2 { name="rstream"; version="1.3.6"; sha256="1mr869hff5wdpw6a7x71366y8dxf9vljbb11fssfkhcf7hm2ipnj"; depends=[]; }; rstudioapi = derive2 { name="rstudioapi"; version="0.11"; sha256="0srh0m4mw4k6s7spwb84l4cx4xnn04cp5cjxi0fwza7bwavpzq0k"; depends=[]; }; + rsubgroup = derive2 { name="rsubgroup"; version="1.0"; sha256="1151w8lzsj3w7k56gdry44g9a8a1iqh5m0srd6mydzdxaj90q2pc"; depends=[foreign rJava]; }; rsurface = derive2 { name="rsurface"; version="1.1.0"; sha256="1pymbgvr72nqd66wap5wrcizzx2k9bfr6vkxv6dkvjmi8q7jl2gv"; depends=[plotly rsm]; }; rsurfer = derive2 { name="rsurfer"; version="0.2"; sha256="14zd8fhak12yha6miwb84085722v5ipk8lagijhc6af291kp70i9"; depends=[gdata stringr]; }; rsvd = derive2 { name="rsvd"; version="1.0.3"; sha256="1fvrw46fl5xb2akaa4mp8nja4h7nn4bdhnjdrk22fsdfqc7hwmhk"; depends=[Matrix]; }; @@ -13176,7 +13195,7 @@ in with self; { rtop = derive2 { name="rtop"; version="0.5-14"; sha256="1wwllckginnzisapbklpsizy47db24r83xahq4qsd8zhqvv9yj33"; depends=[gstat sp]; }; rtrek = derive2 { name="rtrek"; version="0.3.0"; sha256="0nfkmcyrb1gbgjjy62ffjlg6x93zy4s4qg6ii98gjbn0jp6pcj1j"; depends=[downloader dplyr ggplot2 jpeg jsonlite magrittr memoise purrr rvest tibble tidyr xml2]; }; rtrends = derive2 { name="rtrends"; version="0.1.0"; sha256="04xdggf36m294drb9z8khdjr6fgsg4bwkb4mmbbvqfzjpq4mq4y1"; depends=[dplyr lubridate tidyr]; }; - rtrim = derive2 { name="rtrim"; version="2.0.6"; sha256="18fvi8zbf9dqwi5x0sgy2aay5565ldvqpispqqb5gx2lwb9qra2r"; depends=[]; }; + rtrim = derive2 { name="rtrim"; version="2.1.1"; sha256="1l2ijkm4p3nd7n4q1b4y9pdyafgyf76zizpi7hhzw1rr9zkxhff2"; depends=[]; }; rts = derive2 { name="rts"; version="1.0-49"; sha256="086zlmcjsv7a38k1jfzq2vhlmx7nivhffcz83i57hl6wbkjl7gv2"; depends=[raster RCurl sp xts zoo]; }; rtsdata = derive2 { name="rtsdata"; version="0.1.2"; sha256="0h0zk8vy21xh0n6pcipgml0b0f4pfi94q6hjdqkxd3xsa6a5scra"; depends=[alfred anytime brotli curl data_table mongolite Quandl quantmod xts zoo]; }; rtson = derive2 { name="rtson"; version="1.3"; sha256="1gwvk7nmq9bz90jy1zh7lhr735iw804pmwxykdpaigcsnxk7zx03"; depends=[R6]; }; @@ -13194,7 +13213,7 @@ in with self; { runes = derive2 { name="runes"; version="0.0.1"; sha256="0aq4wlxwc00a39lgfvr2pyhh7hcrb3n19mm83qvr8kyz30dhghx9"; depends=[]; }; runittotestthat = derive2 { name="runittotestthat"; version="0.0-2"; sha256="15zdcvqkr5ivq6wk6dw8k6diginc6z7mdc18pswim90d99j2g9sm"; depends=[assertive RUnit]; }; runjags = derive2 { name="runjags"; version="2.0.4-6"; sha256="0w97s1j5v05fn4nclqwg56hl9vz6vi2l6sp042r6iyh024fsyg22"; depends=[coda lattice]; }; - runner = derive2 { name="runner"; version="0.3.2"; sha256="0m2xaj2w0186frzg29jwivf7gxfikvy14w53qpcybgnd1ng54l3a"; depends=[Rcpp]; }; + runner = derive2 { name="runner"; version="0.3.5"; sha256="0x73bza6dgi52f33hy94pqbbwwy1pmw8dzifrsfkz3kca2hgprzr"; depends=[Rcpp]; }; runstats = derive2 { name="runstats"; version="1.1.0"; sha256="0n9348af60j8a2mwgbafabspb4nm45ry92zlzmynja06zyx8lb2d"; depends=[fftwtools]; }; rusda = derive2 { name="rusda"; version="1.0.8"; sha256="0xx72jjf1pyixwpnvvgx5n2vc5gl46bam1caav043iqki68wb338"; depends=[foreach httr plyr RCurl stringr taxize testthat XML]; }; rusk = derive2 { name="rusk"; version="0.1.1"; sha256="0a6vbcnfzlfq9fmibiy0cwcfix65qhxq4f7wc7d53riga82s00lk"; depends=[dplyr ggforce ggplot2 reshape2 shiny tidyr]; }; @@ -13212,14 +13231,12 @@ in with self; { rvest = derive2 { name="rvest"; version="0.3.5"; sha256="0r0a5jic09xw5pk0x42pr99r3zab5m9s4x85ymx1sl769jz42zqf"; depends=[httr magrittr selectr xml2]; }; rvg = derive2 { name="rvg"; version="0.2.4"; sha256="12ghjppq5igic2mw8k3p5cnywm26c615ll3j3a9fasyyzkxx6i05"; depends=[gdtools officer Rcpp rlang 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.5.1.1.0"; sha256="1616xqchjyqqf2nmgx5rlpnw8g4696lvlpmrx7jav2cnvkff7s2i"; depends=[assertthat BH kde1d lattice Rcpp RcppEigen RcppThread wdm]; }; rvkstat = derive2 { name="rvkstat"; version="2.6.3"; sha256="0vh5gsvfs01f7mw0cl1wap1w1nsgr4fyv9fdays8b8ad3gc17a2r"; depends=[httr jsonlite RCurl tidyr]; }; rwalkr = derive2 { name="rwalkr"; version="0.5.2"; sha256="1661vg5mdizgynlniq6pibmhn0spnh3d4w6bh08nyjwwchkagrxi"; depends=[dplyr hms httr tidyr]; }; - rwars = derive2 { name="rwars"; version="1.0.0"; sha256="0kmwpr6gn3xsf0pqx153vblpjbhc34mzlgyv8xb2nw78nf8znfij"; depends=[httr]; }; 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]; }; - rwebstat = derive2 { name="rwebstat"; version="1.0.2"; sha256="14mzqs4qjb3qgpci1a1c4sj803mjnzv9j910zmhkg5l8bx9nj5xw"; depends=[dplyr getPass httr readr]; }; + rwebstat = derive2 { name="rwebstat"; version="1.1.0"; sha256="106dkhlr33ii17q45c1hrmbslwsj1qlmx325skch2q71mv7ii0lj"; depends=[dplyr getPass htmltools httr jsonlite readr stringr]; }; rwfec = derive2 { name="rwfec"; version="0.2"; sha256="0wmalfms59zi8jdn2s2qbcdckfkifl9vg19hzx4389mm5gk6qsbh"; depends=[Rcpp]; }; rwhatsapp = derive2 { name="rwhatsapp"; version="0.2.2"; sha256="00cgczgim3ls5jjaklpwfyf24794zhpdjj9pl9fkw20fxhz91bpd"; depends=[stringi tibble]; }; rworldmap = derive2 { name="rworldmap"; version="1.3-6"; sha256="1q1h0n9qr0m5pdx10swrh9ddsvdj8kv5nqngrf3lnx9rg9iwivjk"; depends=[fields maptools sp]; }; @@ -13291,6 +13308,7 @@ in with self; { sand = derive2 { name="sand"; version="1.0.3"; sha256="0h7djria9v75gqcygjcfznpchqgxjqc6b43arvq9ni1xjrq8sszf"; depends=[igraph igraphdata]; }; sandwich = derive2 { name="sandwich"; version="2.5-1"; sha256="1mk685b9wq7k566pbml52rj96i5h6b3vf215k9picgmq296nzvyv"; depends=[zoo]; }; sanitizers = derive2 { name="sanitizers"; version="0.1.0"; sha256="1c1831fnv1nzpq8nw9krgf9fm8v54w0gvcn4443b6jghnnbhn2n6"; depends=[]; }; + sanityTracker = derive2 { name="sanityTracker"; version="0.1.0"; sha256="0y041x840sg5c05ksljb1y4xag1cib19q5ygp443k13ryfbcgs9k"; depends=[checkmate data_table]; }; sankey = derive2 { name="sankey"; version="1.0.2"; sha256="0jvcr2bn69aklfbgj4hbsrc047mymrx0jmsg26m0g6w7n1igqvcw"; depends=[simplegraph]; }; sankeywheel = derive2 { name="sankeywheel"; version="0.1.0"; sha256="1sigj4jz13qj4s8vxk0dl2xsddqgyfxabj8yggkasawm7pryvbyy"; depends=[htmlwidgets]; }; santaR = derive2 { name="santaR"; version="1.0"; sha256="10g4z951mpxw9d21s5f6zwfch5xs9vx812fb0wyrbw9s8drmlbkh"; depends=[doParallel foreach ggplot2 gridExtra iterators pcaMethods plyr reshape2 shiny shinythemes]; }; @@ -13304,6 +13322,7 @@ in with self; { sarima = derive2 { name="sarima"; version="0.8.2"; sha256="0fyfba017p35g16b8xp9zvqp9dalhlgr7x5hpk10y29qh7k12z69"; depends=[dplyr FitAR FitARMA FKF Formula KFAS lagged ltsa numDeriv PolynomF Rcpp RcppArmadillo Rdpack]; }; sars = derive2 { name="sars"; version="1.2.1"; sha256="10j2cz66qpdicarxy2mx2hlmkvby3j83qrjm2irmfnwmscafg5f4"; depends=[cli crayon dplyr nortest numDeriv]; }; sas7bdat = derive2 { name="sas7bdat"; version="0.5"; sha256="0qxlapb6wdhzpwlmzlhscy3av7va3h6gkzsppn4sx5q960310an3"; depends=[]; }; + sasLM = derive2 { name="sasLM"; version="0.1.2"; sha256="0d7vklzqsdfg7rg8d3186ka0iqggyhksj0xlzd3rdm8wjd6h5839"; depends=[]; }; sasMap = derive2 { name="sasMap"; version="1.0.0"; sha256="11vhhxhakqm1gsb3p4s4966sapmrqfyw79zfppbx5lnqi3xr0ngn"; depends=[readr stringi stringr]; }; sass = derive2 { name="sass"; version="0.2.0"; sha256="0qzrncsnp0zd8jyp4whss92m7llqsfccmp9p9r3gdc7hlq1amp3z"; depends=[digest fs htmltools rlang]; }; sate = derive2 { name="sate"; version="1.1.0"; sha256="0d1b0gp5abh5g7a25ff40xdnncrl2afjnlcc56dbhqkk43gjah17"; depends=[MASS]; }; @@ -13320,15 +13339,14 @@ in with self; { sbmSDP = derive2 { name="sbmSDP"; version="0.2"; sha256="1sl46lqi6w0s7ghv4bywhic56cm2vib3kawprga760m6igargx4y"; depends=[Rcpp RcppArmadillo]; }; sboost = derive2 { name="sboost"; version="0.1.1"; sha256="126rqvpqwvwjxvsg1v04nkmd6af55j7sgx43jg2vnggyrlli9j9q"; depends=[dplyr Rcpp rlang]; }; sbpiper = derive2 { name="sbpiper"; version="1.9.0"; sha256="0pjq88ixk494wlz4nh5anbsn59mmh9wg564qh3vzwwqgxf1k61cg"; depends=[colorRamps data_table factoextra FactoMineR ggplot2 Hmisc reshape2 scales stringr]; }; - sbrl = derive2 { name="sbrl"; version="1.2"; sha256="1d0f2mlzzcghhvqagrr954qa69b5v47milw3iazxihh8q1qlird2"; depends=[arules Rcpp]; }; - sbtools = derive2 { name="sbtools"; version="1.1.10"; sha256="0pn4rp8cfvdjbfn4xgzhm5x5r73v11djksh6jdw7mv7nrci9rqpb"; depends=[curl httr jsonlite stringr]; }; + sbtools = derive2 { name="sbtools"; version="1.1.11"; sha256="06b27cxrfqps0lfgjcwxcal36dkf05y2lcmwrzjrm333zgnvcy6g"; depends=[curl httr jsonlite stringr]; }; sbw = derive2 { name="sbw"; version="1.0"; sha256="07lr2sh681q0wvyaf7ixif5riw9kfxv4hraxj8hzqaxcsip743vq"; depends=[MASS Matrix quadprog slam spatstat]; }; scBio = derive2 { name="scBio"; version="0.1.5"; sha256="12wch9dp7n9vigv7rp7i5b5sckn9vvckpclylinnbi1mhawxprv9"; depends=[doSNOW fields foreach LiblineaR limma raster sp]; }; scMappR = derive2 { name="scMappR"; version="0.1.1"; sha256="1mfbjv7gpj63q5gwqcajjrnbhr918nvl41hk8ggk1l30wqg4k4r1"; depends=[downloader ggplot2 gProfileR gprofiler2 GSVA limSolve pcaMethods pheatmap Seurat]; }; scModels = derive2 { name="scModels"; version="1.0.1"; sha256="0n2sc2l3wy08i0xq7jwigkr42wz9gyhlirmjmma9plnmkbrx0rp4"; depends=[Rcpp]; }; scPDSI = derive2 { name="scPDSI"; version="0.1.3"; sha256="00z5qk14c1ndrd63rhvknkp3dn3ad8z8mf00p9sb8wbsi908md44"; depends=[Rcpp]; }; scRNAtools = derive2 { name="scRNAtools"; version="1.0"; sha256="0x0lniqhq6q87y08kkkyvmk1g5b8i73hm3h86ba8rcv0v0n7ap9a"; depends=[ALL ConsensusClusterPlus corrplot edgeR foreach ggplot2 ggthemes Hmisc igraph lattice limma PerformanceAnalytics plyr reshape2 Rmisc Rtsne scatterplot3d survival TPEA]; }; - scTenifoldNet = derive2 { name="scTenifoldNet"; version="1.2.0"; sha256="1n86fcvx0a34xd2h9d9kmyn991lqh6573rrkicql946pm697g4vz"; depends=[MASS Matrix pbapply reticulate RSpectra]; }; + scTenifoldNet = derive2 { name="scTenifoldNet"; version="1.2.1"; sha256="091fczz5vjj8cq53dik229vrscsj68p6vpaqr8gdknjgc9nsc1ka"; depends=[MASS Matrix pbapply RSpectra]; }; scaRabee = derive2 { name="scaRabee"; version="1.1-3"; sha256="1yap3hi36f8hk93jn59nxrbgq8iw0xwkkm3pc2gb50cpcpaq41pd"; depends=[deSolve lattice neldermead]; }; scaffolder = derive2 { name="scaffolder"; version="0.0.1"; sha256="1va1mlhqv5qn0hm81ypdir9llr68222qxjp3jink69zpaskfbdib"; depends=[reticulate]; }; scagnostics = derive2 { name="scagnostics"; version="0.2-4.1"; sha256="1azg1xlid63l9mcyns9yyl3a3hykbl0sl0h5jhyvzjzahfyanq53"; depends=[rJava]; }; @@ -13350,7 +13368,7 @@ in with self; { scclust = derive2 { name="scclust"; version="0.2.2"; sha256="0w0qwz8wfdprs2bgv1cjvd2yb6g12jylad21a9rr3w5bkgxprcrp"; depends=[distances]; }; sccr = derive2 { name="sccr"; version="2.0"; sha256="1r5hmkij73l0z19smq080gr66nnlqk4v5sq0wcmidbxxsjpzwb45"; depends=[dplyr]; }; scdensity = derive2 { name="scdensity"; version="1.0.2"; sha256="173xm3bf8vxl30zk4n451al7m003byg9q4d1l1pfyfa4xnv8qdg9"; depends=[lpSolve quadprog]; }; - scdhlm = derive2 { name="scdhlm"; version="0.3.1"; sha256="1b5x4kqvmkpb8wbgfhnwqakisw6hfnvama2bsnd8kvw4alfanxhm"; depends=[nlme]; }; + scdhlm = derive2 { name="scdhlm"; version="0.3.2"; sha256="1im2z8bfslvrk3y8hqk4snf42fb2iw6yh6nrhijih8qx3jmpwlmb"; depends=[nlme]; }; scenario = derive2 { name="scenario"; version="1.0"; sha256="0v1b00kiny21yx4qkk2x51cy1zqibdnd68z76qia7h5py28yhxsi"; depends=[]; }; scgwr = derive2 { name="scgwr"; version="0.1.0"; sha256="1pyq6qnfhnzbkla1yp49sfkx5y4g26ccgi803axivyjyp5zvwc1b"; depends=[dplyr FNN spData]; }; schoRsch = derive2 { name="schoRsch"; version="1.7"; sha256="19h721v4a7rb1dlkbpb9s24x87fvz3q449ndi0rn0yc0m6mhmcvi"; depends=[]; }; @@ -13371,7 +13389,7 @@ in with self; { scoper = derive2 { name="scoper"; version="0.2.0"; sha256="1b4kyrml5yk46fw9hrp21i6w6ylck5qs64y0mzkbqr2wf1x4ncvs"; depends=[alakazam data_table doParallel dplyr foreach ggplot2 Rcpp rlang seqinr shazam stringi stringr]; }; 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.9"; sha256="0zafis8f4v9mw9l52v0d286fms5q3rgl7dvlz60f3sz41sl1y1gz"; depends=[data_table doParallel foreach ggplot2 gridExtra openxlsx stringi]; }; + scorecard = derive2 { name="scorecard"; version="0.3.0"; sha256="08zf99xxvl27lin5xqf781l3lr4cjlr8gyw5vw4ps1fnsn844c63"; depends=[data_table doParallel foreach ggplot2 gridExtra openxlsx stringi]; }; scorecardModelUtils = derive2 { name="scorecardModelUtils"; version="0.0.1.0"; sha256="09znaxrv14m58hsk5pac458xbpcsidc6ygcsw4q9j0p4yd80qbvl"; depends=[car e1071 gbm ggplot2 partykit randomForest reshape2 sqldf stringr]; }; scorepeak = derive2 { name="scorepeak"; version="0.1.2"; sha256="1g9n7kjqb9qk5b7hw8ysrc069w9dzc4z29ay6z1kbm0v4kkzp7bi"; depends=[checkmate Rcpp]; }; scorer = derive2 { name="scorer"; version="0.2.0"; sha256="1mc4hxcrqzh4dmz5fy40740bnrp4fxia81fj3cdw9382p67ivhim"; depends=[Rcpp]; }; @@ -13388,7 +13406,7 @@ in with self; { scriptuRs = derive2 { name="scriptuRs"; version="0.1.0"; sha256="1wbvfqcc0raazhdc6pyp93q859ilxfz9rz338p3sb7fjyxvparbl"; depends=[]; }; scrm = derive2 { name="scrm"; version="1.7.3-1"; sha256="090gsa23l9s4x92q4n7ggp491fc8ghgnjw5p7j67gd1i1iwr55n8"; depends=[Rcpp]; }; scrobbler = derive2 { name="scrobbler"; version="0.2.15"; sha256="079ms94q2h8ciqi9b4w9i1md57x844jz464hk7rr564n9wcfp4gj"; depends=[httr jsonlite]; }; - scrubr = derive2 { name="scrubr"; version="0.3.0"; sha256="0kc8m7b18l4nd84kqf0ibv2mchpm9w1bjwwpyjzg0zkkl7k3grs9"; depends=[crul curl data_table fastmatch hoardr jsonlite lazyeval magrittr Matrix qlcMatrix tibble]; }; + scrubr = derive2 { name="scrubr"; version="0.3.2"; sha256="1grh6gljxad2iig6vldv2j0wk83cj6v1pdqsldb6gp4kqyzbikq9"; depends=[crul curl data_table fastmatch hoardr jsonlite lazyeval magrittr Matrix qlcMatrix tibble]; }; scrypt = derive2 { name="scrypt"; version="0.1.3"; sha256="14iblgbp9v2by8fjbrpsd59iknp5babcz7j3yv1yxxzcwyb6wrrm"; depends=[Rcpp]; }; scs = derive2 { name="scs"; version="1.3-2"; sha256="10z5619gbnnygk8pkdx2qji56jlv1q6c1z4581pdkd9sfnhg1yp3"; depends=[]; }; sctransform = derive2 { name="sctransform"; version="0.2.1"; sha256="07v3lzccsrkh1glfxd1q20r8f8gl9ls5az0s1dvxm4vcls0hlhyn"; depends=[future_apply ggplot2 gridExtra MASS Matrix Rcpp RcppEigen reshape2]; }; @@ -13426,12 +13444,13 @@ in with self; { seasonalview = derive2 { name="seasonalview"; version="0.3"; sha256="1l705yc7ssldsfckbgnvd95sh3zzhpkmf1rr6ar2s60s3wsyly4n"; depends=[dygraphs htmlwidgets openxlsx seasonal shiny shinydashboard xtable xts zoo]; }; seastests = derive2 { name="seastests"; version="0.14.2"; sha256="04kx4sijnpsarq4iaclxvckgr5y0gmz5a0fmkkqjmfi3hm1kvw3d"; depends=[forecast xts zoo]; }; seawaveQ = derive2 { name="seawaveQ"; version="1.0.0"; sha256="19vm1f0qkmkkbnfy1hkqnfz6x2a7g9902ka76bhpcscynl69iy56"; depends=[lubridate NADA survival]; }; - secr = derive2 { name="secr"; version="4.2.0"; sha256="008yiv1dq5i1wnjpfb288v60yn58bn54n06rksvmbhppvpg9p4pd"; depends=[abind MASS mgcv nlme raster Rcpp RcppEigen RcppNumerical RcppParallel sp stringr]; }; - secrdesign = derive2 { name="secrdesign"; version="2.5.10"; sha256="14pi5k3iz8xzm832ms82hgzdg8sh9nfsns3dw7mm81n7p03014dd"; depends=[abind openCR secr]; }; + secr = derive2 { name="secr"; version="4.2.2"; sha256="09wf6dzssmcaa51s3c61k2n3z1xs5q981apzv03kbq6v0gbmisil"; depends=[abind MASS mgcv nlme raster Rcpp RcppEigen RcppNumerical RcppParallel sp stringr]; }; + secrdesign = derive2 { name="secrdesign"; version="2.5.11"; sha256="02fysbx6w1iw2ig54f9sgr74c40wfjwiwpdmxdjymsaynqnm9anl"; depends=[abind openCR secr]; }; secret = derive2 { name="secret"; version="1.0.0"; sha256="09b28f7ndc167bbanbdydralykq718fixnrgs5xr9d3fbdhz1vdl"; depends=[assertthat curl jsonlite openssl rprojroot]; }; secrettext = derive2 { name="secrettext"; version="0.1.0"; sha256="129v524yyb464mcij7hvzv05cxliaz5nm7v30g9g9ppskcdqhsx2"; depends=[dplyr magrittr rlang stringr testthat tidyr]; }; secrlinear = derive2 { name="secrlinear"; version="1.1.1"; sha256="0jcvraypkss1gphh4cjb0b4v9460fj4dw80yd057ah11p9942ggs"; depends=[igraph maptools MASS rgdal secr sp]; }; secsse = derive2 { name="secsse"; version="2.0.0"; sha256="0qsbn56vc6y19hmc94bimv1mf86ayxa8rj38qvvsxjfm9czmw2ac"; depends=[ape apTreeshape DDD deSolve doParallel foreach geiger phylobase]; }; + secuTrialR = derive2 { name="secuTrialR"; version="1.0.3"; sha256="06lmm3hpspi3vd5wvzpj9skay823z4km5jbxg11sv4xqh16sh4qh"; depends=[dplyr haven igraph lubridate magrittr purrr readr readxl rlang stringr tibble tidyr]; }; secure = derive2 { name="secure"; version="0.5"; sha256="16pv5m7rrcs8hcjj3kylq7smyzf2qk8rkg9m1b421w0ac7lg04x1"; depends=[MASS Rcpp RcppArmadillo]; }; securitytxt = derive2 { name="securitytxt"; version="0.1.1"; sha256="0yrydcc68qcsq5wrdfgwfi347pdd0zc8hp2ikmw3iz31anm3b4yw"; depends=[Rcpp]; }; see = derive2 { name="see"; version="0.4.1"; sha256="0w32jqs9b7bqm27ld21pmlwxsbhwpwwa5bv6w15p1lx56gzi5smi"; depends=[bayestestR dplyr effectsize ggplot2 ggridges insight magrittr parameters rlang]; }; @@ -13468,9 +13487,9 @@ in with self; { semPLS = derive2 { name="semPLS"; version="1.0-10"; sha256="0q5linjyv5npkw4grx3vq58iq2q1grf06ikivhkg8w7rvb7pqn6b"; depends=[lattice]; }; semPlot = derive2 { name="semPlot"; version="1.1.2"; sha256="0l1v9yi1pv59iwfknw4dh9qskk5y8r347jq1vq13gnfd3bmd71xr"; depends=[colorspace corpcor igraph lavaan lisrelToR OpenMx plyr qgraph regsem rockchalk sem XML]; }; semPower = derive2 { name="semPower"; version="1.0.0"; sha256="0wciz5qrd40q4mxq96pibnya11ac42n37c9xhjd4zfhznhjz06bb"; depends=[]; }; - semTable = derive2 { name="semTable"; version="1.6"; sha256="125dhdyy4idyxnn8j2ijbj9ikvz78hymr3m3x122ydsln89phsy1"; depends=[kutils lavaan plyr stationery xtable]; }; + semTable = derive2 { name="semTable"; version="1.7"; sha256="1zrp4iqdv9hlqicy5mqlvjrd6w9q8542hvdxs95l951xm2n4jp3z"; depends=[kutils lavaan plyr stationery xtable]; }; semTools = derive2 { name="semTools"; version="0.5-2"; sha256="1zj841pszfsikzp82cmh463qyc4xhdrqjqcnhc2r8mcflv12irv6"; depends=[lavaan]; }; - semantic_dashboard = derive2 { name="semantic.dashboard"; version="0.1.1"; sha256="0fd5qnw5jcmf5akkv59z1zjizsczwlmnpkfd8bfminhpa89sgp1y"; depends=[shiny shiny_semantic]; }; + semantic_dashboard = derive2 { name="semantic.dashboard"; version="0.1.5"; sha256="0bazaznmxmks11zgb9npvkblhy0ym554fnvgqsa02rlxxzzzljib"; depends=[glue htmltools shiny shiny_semantic]; }; semdiag = derive2 { name="semdiag"; version="0.1.2"; sha256="0kjcflw7dn907zx6790w7hnf5db6bf549whfsc0c2r173kf13irp"; depends=[sem]; }; semdrw = derive2 { name="semdrw"; version="0.1.0"; sha256="16hm1ifgspnxnlf3rfg5ylmql2fq91ig8nc5953ggyhfrjwbqx15"; depends=[dplyr lavaan psych semPlot semTools shiny shinyAce]; }; semds = derive2 { name="semds"; version="0.9-6"; sha256="10kvcmcy6qa2r5sram6azqgzl528rghfxgw2f2bq2fvhhq127dzq"; depends=[minpack_lm pracma]; }; @@ -13481,14 +13500,14 @@ in with self; { semtree = derive2 { name="semtree"; version="0.9.14"; sha256="1gyjrvqvqmm0dcbddjq90v3gsniiz9rl66nxiayvfbkhs4pih39z"; depends=[bitops cluster digest expm ggplot2 MASS matrixcalc matrixStats mvtnorm OpenMx plotrix rpart rpart_plot sets stringr tidyr]; }; semver = derive2 { name="semver"; version="0.2.0"; sha256="10wpkyms2cix3bsin2q0qhkbl445pwwpa5gm2s4jjw1989namkxy"; depends=[assertthat Rcpp]; }; semverutils = derive2 { name="semverutils"; version="0.1.0"; sha256="0y3zh8n8bgs3ag8yy9cnp0i0xrn0iqflcbrya70glyb40148w9sw"; depends=[foreach R6]; }; - sen2r = derive2 { name="sen2r"; version="1.3.3"; sha256="1wm6n1mqbrp7h25j0vjjdr2k8qc44hnkrwnnp7zlqmwwdn5iwnkd"; depends=[data_table doParallel foreach geojsonio httr jsonlite leaflet leaflet_extras mapedit raster RcppTOML sf shiny shinydashboard shinyFiles shinyjs shinyWidgets stars XML]; }; + sen2r = derive2 { name="sen2r"; version="1.3.4"; sha256="0cbrw7cjj555gclvhrf3ghz7i5qy6prba205pw6k8zf8fd8r8f0v"; depends=[data_table doParallel foreach geojsonio httr jsonlite leaflet leaflet_extras mapedit raster RcppTOML rgdal sf shiny shinydashboard shinyFiles shinyjs shinyWidgets stars XML]; }; sendmailR = derive2 { name="sendmailR"; version="1.2-1"; sha256="0z7ipywnzgkhfvl4zb2fjwl1xq7b5wib296vn9c9qgbndj6b1zh4"; depends=[base64enc]; }; sendplot = derive2 { name="sendplot"; version="4.0.0"; sha256="0ia2xck94nwirwxi38nv0viz5wb8291yiak6f0wgwh84irsrfp1h"; depends=[rtiff]; }; sensR = derive2 { name="sensR"; version="1.5-2"; sha256="073za0z6dawba2nd45hs20m0143kckxn3iglkyqz9vdfqwyv7wlq"; depends=[MASS multcomp numDeriv]; }; sensemakr = derive2 { name="sensemakr"; version="0.1.2"; sha256="0p5rh511fymbh8vkfwdv62xxwflkmrqwas1b16m0hlzjwyzdn03m"; depends=[]; }; sensiPhy = derive2 { name="sensiPhy"; version="0.8.5"; sha256="1kjkdklva5wzmw071gbn1v9g5cf0wzmvwgy5y0dgi530v6byaw8j"; depends=[ape caper geiger ggplot2 phylolm phytools]; }; sensibo_sky = derive2 { name="sensibo.sky"; version="1.0.0"; sha256="0s8gbj7qrcbcnflp7v0s93ykh2xgk7jwpyvzndj1f90hjy20x3bc"; depends=[glue httr jsonlite]; }; - sensitivity = derive2 { name="sensitivity"; version="1.18.0"; sha256="100hrr5yd5fg13gbg7mv5amny3igw8zra8pcl97vwfdxykqqjk5c"; depends=[boot ggplot2]; }; + sensitivity = derive2 { name="sensitivity"; version="1.18.1"; sha256="1dad2c2ckvb86izb1xsa12298sx9ywnpvb3h25x67y4jygcnhzjg"; depends=[boot ggplot2]; }; sensitivity2x2xk = derive2 { name="sensitivity2x2xk"; version="1.01"; sha256="1r829k939zzmi0j4chdaniajchcflmmjrl3a9hwnkg0wkfnjbvdl"; depends=[BiasedUrn mvtnorm]; }; sensitivityCalibration = derive2 { name="sensitivityCalibration"; version="0.0.1"; sha256="1fn07dra7dhpsg6f1yn1ayfpmvwaxma8cps94070nrpfwmdvi04g"; depends=[ggplot2 ggrepel plotly relaimpo splitstackshape stringi]; }; sensitivityPStrat = derive2 { name="sensitivityPStrat"; version="1.0-6"; sha256="0rfzvkpz7dll3173gll6np65dyb40zms63fkvaiwn0lk4aryinlh"; depends=[survival]; }; @@ -13520,7 +13539,6 @@ in with self; { sequence = derive2 { name="sequence"; version="2.0"; sha256="0r5h96gcp18lwgrl2pjlr71xqspkf6qmm1m0xjq5vadalfa7y294"; depends=[]; }; sequences = derive2 { name="sequences"; version="0.5.9"; sha256="17571m525b6a3k4f0m936wfq401181gx1fpb7x4v0fhaldzdmk3a"; depends=[Rcpp]; }; sequenza = derive2 { name="sequenza"; version="3.0.0"; sha256="13l16lacdcf7fn96yj3xqxap0l19ma9ppkxxx5qk9f5abbvdk303"; depends=[copynumber iotools pbapply readr seqminer squash]; }; - sequoia = derive2 { name="sequoia"; version="1.3.3"; sha256="0k0vl7rz9jylry80w8lbqyg3ws3bhkg8axpzy0rrd8xw1lxbpf93"; depends=[plyr]; }; sergeant = derive2 { name="sergeant"; version="0.5.2"; sha256="02chkyvmwd4nimw62v82rfbid1xqw5b1335na44pdi675g904250"; depends=[DBI dbplyr dplyr htmltools httr jsonlite purrr readr scales]; }; serial = derive2 { name="serial"; version="2.1.4"; sha256="1wvs3aa9h1dff2jrxszqwrfv2b281zap1dj2mhlx2w4k8hnggas0"; depends=[]; }; seriation = derive2 { name="seriation"; version="1.2-8"; sha256="1zbdxq0s5rc5v307b69fw9k52m0654ls7pf22lh35ggirig6lwsk"; depends=[cluster colorspace dendextend gclus gplots MASS qap registry TSP]; }; @@ -13540,7 +13558,7 @@ in with self; { setter = derive2 { name="setter"; version="0.0-1"; sha256="10fwrx8yysp99rrkbnn3rbz79vyzr2h3p7zxxlqapw1k2lllp0r5"; depends=[assertive_base]; }; settings = derive2 { name="settings"; version="0.2.4"; sha256="092sv6nccm6p2d695l9w0zfi2xgymk12c8p8lhl9nb86mxrb3nry"; depends=[]; }; severity = derive2 { name="severity"; version="2.0"; sha256="1mp19y2pn7nl9m8xfljc515kk5dirv0r2kypazpmd956lcivziqq"; depends=[]; }; - sf = derive2 { name="sf"; version="0.9-1"; sha256="1qghrskqwwlwxmmvkv7knhlr1a32ngyimycasy5gfazgviljsfn4"; depends=[classInt DBI magrittr Rcpp units]; }; + sf = derive2 { name="sf"; version="0.9-2"; sha256="01xplgy5nlwy3ajfch4h1ssa1xhm7q0jzscpz04dmvgqfzwhhdfh"; depends=[classInt DBI magrittr Rcpp units]; }; sfa = derive2 { name="sfa"; version="1.0-1"; sha256="1acqxgydf8j5csdkx0yf169x3yaa31r0ccdrqarh6vj1hacm89ad"; depends=[]; }; sfadv = derive2 { name="sfadv"; version="1.0.1"; sha256="1rfpm6km5pckwhqgpvidm6qsj5sjdaqqj5b0sgvpslivfa4c80cr"; depends=[gmm minpack_lm]; }; sfc = derive2 { name="sfc"; version="0.1.0"; sha256="0cm4mfcfd9bhf2j5fppsihzrfipnldb6q3xradd88z9pwgrkfx2a"; depends=[dplyr sna tidyr triangle zoo]; }; @@ -13550,7 +13568,6 @@ in with self; { sfsmisc = derive2 { name="sfsmisc"; version="1.1-6"; sha256="04fvjdab6vyyghyqy0abxvfbyr1myz6yib7ibwiyjw9yf7fjrcjp"; depends=[]; }; sft = derive2 { name="sft"; version="2.2-1"; sha256="0fxz64ba58n6ghfqsgq64n1c7qkvi8c3lsa86732mil9w71yxw33"; depends=[fda SuppDists]; }; sgPLS = derive2 { name="sgPLS"; version="1.7"; sha256="1jk2j1zn5vq82rcjflnk7g6y2q0v5jl14k804dmigqg013gbykql"; depends=[mixOmics mvtnorm]; }; - sgRSEA = derive2 { name="sgRSEA"; version="0.1"; sha256="0vyypnq81l36x0j44q2l9wbf3x4krz4fzypi7vyqhaq97mkzaw5j"; depends=[]; }; sgd = derive2 { name="sgd"; version="1.1.1"; sha256="055khw3jr7kr8la3jpzq1q25gk0qcclkv7g0q1sylhyqq2qdriwb"; depends=[BH bigmemory ggplot2 MASS Rcpp RcppArmadillo]; }; sgee = derive2 { name="sgee"; version="0.6-0"; sha256="055iydainzywb1s5id5rl9i94dj5arr9b6qz15p8wps49vm2mlp3"; depends=[copula mvtnorm]; }; sgeostat = derive2 { name="sgeostat"; version="1.0-27"; sha256="1iq9p2jk8bpv1h853a1l91d5c5dxnhkk3cmkd01siqqvj04hv4vb"; depends=[]; }; @@ -13593,7 +13610,7 @@ in with self; { shinyEffects = derive2 { name="shinyEffects"; version="0.1.0"; sha256="03fm2i1ydlp90w299nvz7dqs9724g0m2f0bc44ni8m2gz9cfpccs"; depends=[htmltools shiny shinydashboard]; }; shinyEventLogger = derive2 { name="shinyEventLogger"; version="0.1.1"; sha256="1piycfg9j0dg3fgq9f88gs7zvhldmrzn7ggy2ijbh6r7iwipwgdm"; depends=[bupaR jsonlite mongolite purrr R_utils shiny stringr]; }; shinyFeedback = derive2 { name="shinyFeedback"; version="0.1.0"; sha256="01qp75c5dsvc4xs1id1yhn81gmjl0hnjz8msf8mkvf4ifqal563f"; depends=[digest shiny]; }; - shinyFiles = derive2 { name="shinyFiles"; version="0.7.5"; sha256="1143m941hma9hc77c3xcw26c0ygfhn9ii2sbp9wrydxv4gc7mr8a"; depends=[fs htmltools jsonlite shiny tibble]; }; + shinyFiles = derive2 { name="shinyFiles"; version="0.8.0"; sha256="0gwyx37f2r86cldsyknws9pafpj8g5mg3mchlyl9ymgnk5f4b88w"; depends=[fs htmltools jsonlite shiny tibble]; }; shinyHeatmaply = derive2 { name="shinyHeatmaply"; version="0.2.0"; sha256="1n7c7dvvb9kqay2phcf0bkwi990x1cjl7js6pq05xx7rli5bc5h4"; depends=[dplyr heatmaply htmltools plotly readxl rmarkdown shiny xtable]; }; shinyKGode = derive2 { name="shinyKGode"; version="1.0.5"; sha256="004zwz4kqfijzvvwkq8v1gi25w1wrdlg8230g93w36gbi6cl2vk1"; depends=[ggplot2 gridExtra KGode mvtnorm pracma pspline reshape2 shiny shinyjs XML]; }; shinyKnobs = derive2 { name="shinyKnobs"; version="0.1.3"; sha256="1rxlvq4vr87krf7d6mpx0y53hyz8q1jnx6nv7mlhc1ck13q6fgac"; depends=[htmltools shiny]; }; @@ -13640,6 +13657,7 @@ in with self; { shock = derive2 { name="shock"; version="1.0"; sha256="11m52al591xjznl62q1waxsg5m1a1afmd0yqcc5zsjlrplykg4lp"; depends=[capushe GGMselect glasso igraph mvtnorm]; }; shopifyr = derive2 { name="shopifyr"; version="1.0.0"; sha256="05hih1v5vvr7vmwarizsdx8517g74s96fdsz3klcz3g12idx1nqn"; depends=[curl jsonlite R6]; }; shortcuts = derive2 { name="shortcuts"; version="1.4.0"; sha256="0y77napfz1v3s667cmyn8357xg5lncbw1hc3hm5kra6nalhq1jps"; depends=[rstudioapi]; }; + shorts = derive2 { name="shorts"; version="0.0.1"; sha256="17dsdf5byby0whpfv14dq22q51q1icfcdc4ww6hfjvbkfw23vy71"; depends=[LambertW nlme]; }; shotGroups = derive2 { name="shotGroups"; version="0.7.5.1"; sha256="0il6hlv2hnfx5rmj3vk3q9p24xqii77z6hdz5fsgyh4i3kgcyrjy"; depends=[boot coin CompQuadForm KernSmooth robustbase]; }; showimage = derive2 { name="showimage"; version="1.0.0"; sha256="1c0x3iqjdjsz3cdhc02b3qm2pwxjr1q2k87jwvxj9lnzzw81f1pl"; depends=[png]; }; showtext = derive2 { name="showtext"; version="0.7-1"; sha256="0a5gg72bfrc7wm0phj1aflj1wc08kfi81ac32na6ya9s2ivyimw5"; depends=[showtextdb sysfonts]; }; @@ -13673,7 +13691,8 @@ in with self; { signs = derive2 { name="signs"; version="0.1.2"; sha256="0dzf5pydvs93rvj6idw9l2asv1bxwz20df7qis2db84hfww2kc6m"; depends=[rlang scales]; }; sigora = derive2 { name="sigora"; version="3.0.5"; sha256="1240q42kpb4l1idanywzal7c85kp3ncdl5m2irh8qs5xrs02gdc7"; depends=[]; }; sigr = derive2 { name="sigr"; version="1.0.6"; sha256="01crx8r9bcq1kwlq66vypnv1r48fp3hbl06ykd8g2k5zm06w0yyi"; depends=[wrapr]; }; - silicate = derive2 { name="silicate"; version="0.3.0"; sha256="08d731pprz3y6r0pdww2vn02q506kjzkgg5y2kbjb11d276ffwzf"; depends=[crsmeta decido dplyr gibble gridBase magrittr purrr rlang tibble tidyr unjoin]; }; + siland = derive2 { name="siland"; version="2.0"; sha256="0g06adzydvrw7vq2a78m4lw1vc2k28mp2pj5q20629yknpv54ffr"; depends=[fasterize ggforce ggplot2 lme4 raster reshape2 sf sp]; }; + silicate = derive2 { name="silicate"; version="0.4.0"; sha256="1bvwdrmnrcnyq21sz50g9aksqhd5xkcqhd305mr606mgm183x5rn"; depends=[crsmeta decido dplyr gibble gridBase magrittr purrr rlang tibble unjoin]; }; sim1000G = derive2 { name="sim1000G"; version="1.40"; sha256="1avq6xfc34izavvp9vb5ccc2b9nc4m7cwr06ygnsmpgwi5nswbb8"; depends=[hapsim MASS readr stringr]; }; sim2Dpredictr = derive2 { name="sim2Dpredictr"; version="0.1.0"; sha256="0q1l75h1dcxnd60lcmf4sny1ywidfmm0yv9ylkb3yc13v469167i"; depends=[car dplyr ggplot2 magrittr MASS matrixcalc Rdpack spam tibble tidyverse]; }; simEd = derive2 { name="simEd"; version="1.0.3"; sha256="1yq0qblrz0zddx682rzwdaa0k0r223i123la7wbp73spnn38g4br"; depends=[rstream]; }; @@ -13701,7 +13720,7 @@ in with self; { simfinR = derive2 { name="simfinR"; version="0.2.1"; sha256="1png4cz92vnql2j2b5dlji8b6662ildj05lj1y1bw8xawv9i1i9b"; depends=[crayon dplyr jsonlite lubridate magrittr memoise purrr]; }; simglm = derive2 { name="simglm"; version="0.7.4"; sha256="0lgzbcfqqw94jib6vxl2cv8xcnjjikvdy8qlhq874g0h8spg0l5i"; depends=[broom dplyr future_apply Matrix purrr rlang]; }; simhelpers = derive2 { name="simhelpers"; version="0.1.0"; sha256="0imrp8zqdpyl466fywkjr4g3h9jzxfk96xrw8prlsvw1xlg6qrmm"; depends=[dplyr furrr future magrittr purrr Rdpack rlang rstudioapi tibble tidyr]; }; - simmer = derive2 { name="simmer"; version="4.4.0"; sha256="0kq13ly33hgnwcd53mm372cqcd8glpgdb1jn4q22gd6pbk6j7cjg"; depends=[BH codetools magrittr Rcpp]; }; + simmer = derive2 { name="simmer"; version="4.4.1"; sha256="1w7mzs7z0pczfdwn4xn3rq5jvymbhhz6sv1rdhcq71m3qymicdi2"; depends=[BH codetools magrittr Rcpp]; }; simmer_bricks = derive2 { name="simmer.bricks"; version="0.2.1"; sha256="1s73mfmpjz91n932kjk50aai5j3p1sjibq73yxrjdhlyhiy4d8lp"; depends=[simmer]; }; simmer_plot = derive2 { name="simmer.plot"; version="0.1.15"; sha256="0g13d6qw6cl7bzmpkckiswvg9n4mrrdbs195r3pyljaw5c5bmvhp"; depends=[DiagrammeR dplyr ggplot2 scales simmer tidyr]; }; simml = derive2 { name="simml"; version="0.1.0"; sha256="0j3vv3kp8rl4an6r0vzzn6syzi9h058v9040pshz0hldkhi21pby"; depends=[mgcv plyr]; }; @@ -13715,7 +13734,7 @@ in with self; { simpleboot = derive2 { name="simpleboot"; version="1.1-7"; sha256="0769dmrk8rw5v9598p7xlpawybwsdxnrqkxhavqpzy1vwg885575"; depends=[boot]; }; simplecolors = derive2 { name="simplecolors"; version="0.1.0"; sha256="08xsha7v9k55fqi9f49j2sh2yz8dm5g99rqcjfd1yrlw2mkcrq6a"; depends=[colorspace dplyr forcats ggplot2 magrittr stringr]; }; simplegraph = derive2 { name="simplegraph"; version="1.0.0"; sha256="1gcpbljp1fgaprxnmq23izf1h2x3p5dnxlylwqsnlcj50bvm46gq"; depends=[]; }; - simplevis = derive2 { name="simplevis"; version="1.0.0"; sha256="1vkf2cmfhsci5z0njyy1xrilycjjr2j9k1vqmw5am5dvqaj7nwda"; depends=[dplyr DT forcats ggplot2 janitor leaflet leaflet_extras leafpop lubridate magrittr plotly readr rgdal rlang rmarkdown scales sf shiny shinycssloaders stars stringr tibble tidyr viridis]; }; + simplevis = derive2 { name="simplevis"; version="1.1.0"; sha256="1kwsxa2w74z92z4a7a82nkc62jna9y9z718kasvp91h5f40mz0zr"; depends=[dplyr DT forcats ggplot2 janitor leaflet leaflet_extras leafpop lubridate magrittr plotly readr rgdal rlang rmarkdown scales sf shiny shinycssloaders stars stringr tibble tidyr viridis]; }; simplexdesign = derive2 { name="simplexdesign"; version="0.1.0"; sha256="139c1c2vpn2rf0q7ldciii3x18f5r62x0l7i6hdk25qwr9sp08k8"; depends=[DiceDesign GGally ggplot2 progress Rfast]; }; simplexreg = derive2 { name="simplexreg"; version="1.3"; sha256="1zkh00xbddhgz0qn0a5pj12n0hpx4f5kihpfj71x92pmxpzglcxh"; depends=[Formula plotrix]; }; simputation = derive2 { name="simputation"; version="0.2.4"; sha256="16adh97hfszvf934lf8mvwxvx71s7gwhzzhsbqz24zqik20pd6fq"; depends=[gower MASS rpart]; }; @@ -13748,7 +13767,7 @@ in with self; { sitools = derive2 { name="sitools"; version="1.4"; sha256="0c0qnvsv06g6v7hxad96fkp9j641v8472mbphvaxa60k3xc7ackb"; depends=[]; }; sitree = derive2 { name="sitree"; version="0.1-7"; sha256="08yamivn2vxgrizh5gvvr9cn3cn1657r0p2nrkwbqljqrhmzi7qd"; depends=[data_table lattice latticeExtra]; }; sitreeE = derive2 { name="sitreeE"; version="0.0-5"; sha256="16m8w0rxb40pimzd06znqskz74jk4rrki4gjy8nk24r1zih2cjq1"; depends=[data_table sitree]; }; - sizeMat = derive2 { name="sizeMat"; version="1.1.0"; sha256="1pxb99gd0zfrpbq2ndmhciv2bc8xdfgm0q1y771f6ji5665qxgfw"; depends=[MASS matrixStats MCMCpack]; }; + sizeMat = derive2 { name="sizeMat"; version="1.1.1"; sha256="1afkc5mcih4zva70fifx65wjm5ndi80hvlq23dvfrmhk4z94nnlx"; depends=[MASS matrixStats MCMCpack]; }; sjPlot = derive2 { name="sjPlot"; version="2.8.3"; sha256="0ip1rkjlhyf3axlc8qqss1qq1f0xrda890c1jmcbhm98wwjw264f"; depends=[bayestestR dplyr effectsize ggeffects ggplot2 insight knitr MASS parameters performance purrr rlang scales sjlabelled sjmisc sjstats tidyr]; }; sjdbc = derive2 { name="sjdbc"; version="1.6.0"; sha256="17ncgj2s2pjn3w3c1dgxv8g7y17h4p78iic86gsj2ahn0xpsmkcc"; depends=[rJava]; }; sjlabelled = derive2 { name="sjlabelled"; version="1.1.3"; sha256="1amq7i9sxf0pkxhskqc53xq5wvc9rdxm7cxyb4b6xh6qsskjnlsj"; depends=[haven insight]; }; @@ -13760,7 +13779,7 @@ in with self; { skellam = derive2 { name="skellam"; version="0.2.0"; sha256="0r5wbs5h7xc3k2vjxd4axwnxr9cmwm008fcyj1vyixkg8fa680gx"; depends=[]; }; skewlmm = derive2 { name="skewlmm"; version="0.1.0"; sha256="158nxycjg8bmx653nc57gdw02hf5szqbl2hgcb10yrmpssk15qbs"; depends=[dplyr ggplot2 moments mvtnorm nlme numDeriv purrr]; }; skewt = derive2 { name="skewt"; version="0.1"; sha256="1xm00zfzjv53cq9drfcx7w2ri5dwsq7kajrk2hc1mvw0b6s4x2ix"; depends=[]; }; - skimr = derive2 { name="skimr"; version="2.1"; sha256="18c86bzw8y08yg7gz4c5drxb33jd31iywbwzna2y246qijlsyvi5"; depends=[cli crayon dplyr knitr magrittr purrr repr rlang stringr tibble tidyr tidyselect withr]; }; + skimr = derive2 { name="skimr"; version="2.1.1"; sha256="0p2syjaz5f5p5d684j8kpv8hqhp9xcffjqqlblzgvj6n56h5h1sh"; depends=[cli crayon dplyr knitr magrittr purrr repr rlang stringr tibble tidyr tidyselect vctrs withr]; }; skm = derive2 { name="skm"; version="0.1.5.4"; sha256="06g3bdncq2r56d8k3dr87gqnibypbsps0gj4jxkw9q1sq1yaff3v"; depends=[data_table magrittr plyr Rcpp RcppArmadillo RcppParallel]; }; skmeans = derive2 { name="skmeans"; version="0.2-11"; sha256="1a8nwlym6pf0z13nnw1id2wls9lq788860yhjaqd56c3slzfsymn"; depends=[clue cluster slam]; }; skpr = derive2 { name="skpr"; version="0.64.2"; sha256="07fchgv0aqgw0hvcav08zzfzqg8nbw8ibbpd3bd11jx1fikx4vyr"; depends=[base64enc car crayon doParallel doRNG foreach future iterators kableExtra knitr lazyeval lme4 lmerTest magrittr nlme promises Rcpp RcppEigen rintrojs shiny shinyjs shinythemes survival viridis]; }; @@ -13784,7 +13803,7 @@ in with self; { slouch = derive2 { name="slouch"; version="2.1.4"; sha256="09ffx657hs913prv0rifhsz60h39lk0h4z28myx6yzxcfdk4f48d"; depends=[ape crayon memoise]; }; slowraker = derive2 { name="slowraker"; version="0.1.1"; sha256="0glc3ldvbqkvzfvhs4s5mzx1kfz05px4k7rx5jfp9dm9d0gfpvsx"; depends=[NLP openNLP SnowballC]; }; slp = derive2 { name="slp"; version="1.0-5"; sha256="0i9iv0s1wdp9cyzr8qixh6c7qvrj025vll13gyf8dfbidrp6hryl"; depends=[mgcv]; }; - slurmR = derive2 { name="slurmR"; version="0.3-0"; sha256="0301h8fzkghk41afkfprkbf3nia07apgjly0njan07vhk144k0qr"; depends=[]; }; + slurmR = derive2 { name="slurmR"; version="0.4-1"; sha256="00ihaq2f86spl4ra41lyszrgn52vgpfw0bv0px23gc6qngxzxd6y"; depends=[]; }; sm = derive2 { name="sm"; version="2.2-5.6"; sha256="0c4whcx879gb4lwvqnzxl5n9xgpcqh2c54ip9ami3mwfprzcv45q"; depends=[]; }; smaa = derive2 { name="smaa"; version="0.3-0"; sha256="0y7j4q147fdk7fffyinc803mfzzsmcdfx8bp695w3wkq1wwy9kyl"; depends=[]; }; smacof = derive2 { name="smacof"; version="2.1-0"; sha256="0bylwa9dwr0q8saifh4fag0srs84g6chvfmslhs8vx42alkq94pz"; depends=[candisc colorspace doParallel e1071 ellipse foreach Hmisc MASS nnls plotrix polynom weights wordcloud]; }; @@ -13888,7 +13907,6 @@ in with self; { somebm = derive2 { name="somebm"; version="0.1"; sha256="1iwwc94k6znh4d3bbjnvwp4chc4wg0iy4v2f99cs4jasrsimb4p8"; depends=[]; }; sommer = derive2 { name="sommer"; version="4.0.9"; sha256="0nrfra6n2rmgh1kxvsyxxxdy4fy6b2092lfmy5551l3l3hq5q3a2"; depends=[crayon lattice MASS Matrix Rcpp RcppArmadillo]; }; somplot = derive2 { name="somplot"; version="1.6.4"; sha256="06c8p2lqz3yxmxdl7ji8a3czvxnsbl7bwyiig76pkwc3a5qqfbb9"; depends=[hexbin]; }; - somspace = derive2 { name="somspace"; version="1.0.0"; sha256="1cp7mprapidzfphis697r3jipm1ig5198580mmdygvbajxcjib75"; depends=[data_table ggplot2 kohonen maps]; }; sonar = derive2 { name="sonar"; version="1.0.2"; sha256="1f0f5iqi3y9vnxyym14nm8dqxw0vcpnxmvvkx4sm612i4fclg1f9"; depends=[]; }; sonicLength = derive2 { name="sonicLength"; version="1.4.6"; sha256="0jh9zk908afqxacccsph6477cc8sbcc1vxbv7jz8ppgc20imw932"; depends=[]; }; sonicscrewdriver = derive2 { name="sonicscrewdriver"; version="0.0.1"; sha256="03v53blb8f67ybhqys4n0zxf7pk9g024ncq0g9rnj9qpr740zclb"; depends=[ggplot2 seewave tuneR]; }; @@ -13903,7 +13921,7 @@ in with self; { sotkanet = derive2 { name="sotkanet"; version="0.9.48"; sha256="1jw9agj92zzgad5kk9z6smjacimwinci6aaqlzmshivb8g8rv8zp"; depends=[RCurl rjson]; }; sotu = derive2 { name="sotu"; version="1.0.2"; sha256="0aqwkawaydsm91hz13msjg1a5llg7xmv6hxmfmsaganrl7iaym3c"; depends=[]; }; sound = derive2 { name="sound"; version="1.4.5"; sha256="1kbbb614d0fmj9l0yjiwf5yqnl7sby4xklp7qwp6rwjvq9bnm0ab"; depends=[]; }; - soundcorrs = derive2 { name="soundcorrs"; version="0.1.0"; sha256="1q02ll4yw7dlz3cmxb7i1svhpjmhxqglsswv1drlkzm8i3gfp9dk"; depends=[]; }; + soundcorrs = derive2 { name="soundcorrs"; version="0.1.1"; sha256="06d57ici4538mfw804vnqaf59n2zglqlxhdlmn9694v9q1xw24p6"; depends=[]; }; soundecology = derive2 { name="soundecology"; version="1.3.3"; sha256="16h6gbdlyav7wbfisdv1f2zsqhr45liidgj7qqk8giwjxgan8q97"; depends=[ineq oce pracma seewave tuneR vegan]; }; soundgen = derive2 { name="soundgen"; version="1.6.2"; sha256="093i8v2i3np1gny0dsnw3i20n5x67w312sslgabgmibak66cdb37"; depends=[dtw mvtnorm phonTools reshape2 seewave shiny shinyBS shinyjs tuneR zoo]; }; source_gist = derive2 { name="source.gist"; version="1.0.0"; sha256="03bv0l4ccz9p41cjw18wlz081vbjxzfgq3imlhq3pgy9jdwcd8fp"; depends=[RCurl rjson]; }; @@ -13925,7 +13943,7 @@ in with self; { spTDyn = derive2 { name="spTDyn"; version="2.0"; sha256="0wandd5iqyqb474096lky04rrgj31gnyqnlmgw8ypxsypd0gqdy0"; depends=[coda sp spacetime spTimer]; }; spThin = derive2 { name="spThin"; version="0.2.0"; sha256="0j10j1cbbwp3baqm3b59rxlnd643mkx1mirlxpnr1ad2g7xpm69f"; depends=[fields knitr spam]; }; spTimer = derive2 { name="spTimer"; version="3.3"; sha256="0vzqig9dq4k6p5s2gbm5arqiih28ghzjx0fs7ml70vx2f181jrxi"; depends=[coda extraDistr sp spacetime]; }; - spaMM = derive2 { name="spaMM"; version="3.1.27"; sha256="1a84nklxipaacndsyd87b8hb5908006416rkcpv60bzinnh1vnrn"; depends=[crayon gmp MASS Matrix minqa nlme nloptr pbapply proxy Rcpp RcppEigen]; }; + spaMM = derive2 { name="spaMM"; version="3.2.0"; sha256="1699zx097i20asf0yy7p7w45fbh4fqg8wj0ym8xz6fa85kalmma0"; depends=[crayon gmp MASS Matrix minqa nlme nloptr pbapply proxy Rcpp RcppEigen ROI ROI_plugin_glpk]; }; spaa = derive2 { name="spaa"; version="0.2.2"; sha256="163iipz1knxx1lzby9a3n1f014yqkf25z1wpwwy4gbx7sia499d5"; depends=[]; }; space = derive2 { name="space"; version="0.1-1.1"; sha256="09dpksbda4lg5hax47a9h9shjmggza6583slvdj0fldblykpyxck"; depends=[]; }; spaceNet = derive2 { name="spaceNet"; version="1.2"; sha256="1s2672icxs0qvdhl52xhllgvh1i9mjfrn5j3icyw6h61ljbnhy11"; depends=[MASS mclust permute RcppTN Rfast sna vegan]; }; @@ -13940,14 +13958,14 @@ in with self; { spam64 = derive2 { name="spam64"; version="2.5-1"; sha256="0fni9lwn51n0ax4qk1l1wslhbkfl44ryp5hgjprkql5a26nmv0nq"; depends=[]; }; spanel = derive2 { name="spanel"; version="0.1"; sha256="1riyvvfij277mclgik41gyi01qv0k466wyk2wbqqhlvrlj79yzsc"; depends=[]; }; spanish = derive2 { name="spanish"; version="0.4.2"; sha256="15drc11lh0qxpww50p0smi8qxfbln82bx0yd74jqf71irhk5jxyp"; depends=[magrittr xml2]; }; - spant = derive2 { name="spant"; version="1.3.0"; sha256="0bcd733llz81vb4f5bjhf0230qjh9ix0y5bbg3dar48kr380fsba"; depends=[abind complexplus fields foreach irlba lsei magrittr MASS matrixcalc miniUI minpack_lm mmand nloptr nnls numDeriv oro_dicom plyr pracma ptw readr RNifti RNiftyReg shiny signal smoother stringr tibble viridisLite]; }; + spant = derive2 { name="spant"; version="1.4.0"; sha256="0376ynqpjl2g4caskkrw0z1mcd495fiyalpb30fvhh1k0zwg2a8s"; depends=[abind complexplus fields foreach irlba lsei magrittr MASS matrixcalc miniUI minpack_lm mmand nloptr nnls numDeriv oro_dicom plyr pracma ptw readr RNifti RNiftyReg shiny signal smoother stringr tibble viridisLite]; }; sparcl = derive2 { name="sparcl"; version="1.0.4"; sha256="138krflvfdlx4hlh90mswds51i8aw2vv00gm5lgkfsvxj4w324jg"; depends=[]; }; spark_sas7bdat = derive2 { name="spark.sas7bdat"; version="1.2"; sha256="1kvzfjhf1q5jzlq5d04s7d96j63vnvqqrh8s03rwkl79h1dhqhhp"; depends=[sparklyr]; }; sparkavro = derive2 { name="sparkavro"; version="0.3.0"; sha256="0g6ac9msfbx8f8j8rj0hvlxjsn317zyam207q7i8kf0hshs1r58f"; depends=[DBI dplyr sparklyr]; }; sparkbq = derive2 { name="sparkbq"; version="0.1.1"; sha256="0gccm8q5a45k9zm8f90r7fhcmriq8d038p022k7cikbr6rqsrmyh"; depends=[sparklyr]; }; sparkhail = derive2 { name="sparkhail"; version="0.1.1"; sha256="1a9p9i7fs6l9rx5ha6akjjl7qhfak01xsjg28ysv0imikmwp6hy7"; depends=[dplyr sparklyr sparklyr_nested]; }; sparkline = derive2 { name="sparkline"; version="2.0"; sha256="0lrr1lm7603di7x3mf53cp13d9ssjh9gmb43wa6z9yqapis2djm2"; depends=[htmltools htmlwidgets]; }; - sparklyr = derive2 { name="sparklyr"; version="1.1.0"; sha256="19dgfj76nammj1di9bsn7s6k82ksj46jpqd6c309axxlly6grhj0"; depends=[assertthat base64enc config DBI dbplyr digest dplyr ellipsis forge generics httr jsonlite openssl purrr r2d3 rappdirs rlang rprojroot rstudioapi tibble tidyr withr xml2]; }; + sparklyr = derive2 { name="sparklyr"; version="1.2.0"; sha256="1bj9ndyz6nb7mw1pq0gksmw3xpwfjrj0mfmiiazzs3rvp91ap47c"; depends=[assertthat base64enc config DBI dbplyr digest dplyr ellipsis forge generics globals httr jsonlite openssl purrr r2d3 rappdirs rjson rlang rprojroot rstudioapi tibble tidyr withr xml2]; }; sparklyr_nested = derive2 { name="sparklyr.nested"; version="0.0.3"; sha256="0lva7fbjp253kxq3970h52cr8s52xycbi03d5shsyna8grhkbczj"; depends=[dplyr jsonlite listviewer purrr rlang sparklyr]; }; sparktex = derive2 { name="sparktex"; version="0.1"; sha256="0r6jnn9fj166pdhnjbsaqmfmnkq0qr1cjprihlnln9jad05mrkjx"; depends=[]; }; sparktf = derive2 { name="sparktf"; version="0.1.0"; sha256="0jd018n7553q0ldv6whxbj2s38myig0m8zq4fbp8fsv34q5wnsx4"; depends=[sparklyr]; }; @@ -13978,17 +13996,18 @@ in with self; { sparsio = derive2 { name="sparsio"; version="1.0.1"; sha256="181kzs9x3h497c7shfalbzrjz05bkj7mmjh9nyphxyi2jjrr6y1q"; depends=[Matrix Rcpp]; }; spate = derive2 { name="spate"; version="1.7"; sha256="1cr5jjrycfj9larsqgzfakk4qgfz8m5djg4ddzk6s3lg2iw06y43"; depends=[mvtnorm truncnorm]; }; spatgraphs = derive2 { name="spatgraphs"; version="3.2-1"; sha256="0n7f3r4ahv1w5mwx5mnib3g4263kz73rh1fcfk5wb12y52x8n1iz"; depends=[Matrix Rcpp]; }; - spathial = derive2 { name="spathial"; version="0.1.1"; sha256="1ki56j5hgf2yc80gw1a71xapkqksfmza6mnfwphkcljh973vqyxr"; depends=[class igraph knitr MASS matrixStats pracma rmarkdown Rtsne]; }; + spathial = derive2 { name="spathial"; version="0.1.2"; sha256="1vwzcwpmx8kwv821vjf940qd5am3k0shf1s14jva71mgxs70ddmb"; depends=[class igraph irlba knitr MASS matrixStats pracma rmarkdown Rtsne]; }; spatial = derive2 { name="spatial"; version="7.3-11"; sha256="04aw8j533sn63ybyrf4hyhrqm4058vfcb7yhjy07kq92mk94hi32"; depends=[]; }; spatial_tools = derive2 { name="spatial.tools"; version="1.6.2"; sha256="18x935ly2jpnah2dik44nsbin1wyy9v27galyf176bzmjhm029bb"; depends=[abind doParallel foreach iterators mmap raster rgdal sp]; }; spatialClust = derive2 { name="spatialClust"; version="1.1.1"; sha256="042yrmh1rb0hxynxlbdpcissgy9zazs5aqx7vj388ibynzijck3r"; depends=[ggplot2 maptools rgeos sp]; }; spatialCovariance = derive2 { name="spatialCovariance"; version="0.6-9"; sha256="1m86s9a059spp97y37dcirrgjshcqzpdj11cq92vji624w4nrhlb"; depends=[]; }; spatialEco = derive2 { name="spatialEco"; version="1.3-1"; sha256="075z9ggbm7kdl8aslpq5x0bniklnbmv9jb3ipx7r7xxvq5nf44pz"; depends=[cluster dplyr EnvStats exactextractr maptools MASS mgcv RANN raster RCurl readr rgeos rms sf sp SpatialPack spatstat spdep yaImpute]; }; spatialfil = derive2 { name="spatialfil"; version="0.15"; sha256="01fbn9zblz7rjsgqy3ikdqpf0p0idvb6m96mf7m7qi2ps5f48vzj"; depends=[abind fields]; }; + spatialfusion = derive2 { name="spatialfusion"; version="0.6-2"; sha256="1vqv4424m8rnmyg463mvnk26q7dis4wd47swyyc8f8r4qd85agnz"; depends=[fields Rcpp rstan SDraw sp]; }; spatialnbda = derive2 { name="spatialnbda"; version="1.0"; sha256="14mx5jybymasyia752f3vnr5vmswcavbz8bpqr69vlxphw27qkwk"; depends=[mvtnorm SocialNetworks]; }; spatialprobit = derive2 { name="spatialprobit"; version="0.9-11"; sha256="1cpxxylc0pm7h9m83m2cklrh4jni5x79r5m5gibxi6viahwxn9kc"; depends=[Matrix mvtnorm spdep tmvtnorm]; }; spatialreg = derive2 { name="spatialreg"; version="1.1-5"; sha256="0zdj67rvfvssjch5hwyi4gvyr7pjgfjrkbhnc4q9psfjp9rhggyx"; depends=[boot coda expm gmodels LearnBayes MASS Matrix nlme spData spdep]; }; - spatialrisk = derive2 { name="spatialrisk"; version="0.6.6"; sha256="0sdabbjd6d3r2qicq7brbfhayr0dqcfv3wpvw2kgm9zl7xymwaar"; depends=[automap classInt dplyr fs ggplot2 gstat lubridate mgcv Rcpp RcppProgress sf sp tmap viridis vroom]; }; + spatialrisk = derive2 { name="spatialrisk"; version="0.6.7"; sha256="1vd90v55wy7b1aqhlr2b6x445nwghn94qyz39439pcmp5y9n8zb8"; depends=[automap classInt dplyr fs ggplot2 gstat lubridate mgcv Rcpp RcppProgress sf sp tmap viridis vroom]; }; spatialsegregation = derive2 { name="spatialsegregation"; version="2.45"; sha256="04ibvk6shs15b8piln2lcnlj8s5gy6r7wraz6591dbc31grzaa36"; depends=[spatstat]; }; spatialwarnings = derive2 { name="spatialwarnings"; version="1.3.1"; sha256="139m6jaw6f5gglwqrd4f5mzr4vkqk2r1a069971y7ap2klzzbhns"; depends=[ggplot2 plyr Rcpp RcppArmadillo reshape2 tidyr VGAM]; }; spatialwidget = derive2 { name="spatialwidget"; version="0.2.2"; sha256="082w44i9is0cn4kgbqlnzclyp4fj2is0r5kla29nvm4m2y83bdjj"; depends=[BH colourvalues geojsonsf jsonify rapidjsonr Rcpp sfheaders]; }; @@ -14000,7 +14019,7 @@ in with self; { spatstat_local = derive2 { name="spatstat.local"; version="3.6-0"; sha256="19kv85smy8jp2bx1mgppav50k07xm8zvmf7snzj29rrspiws7sig"; depends=[spatstat spatstat_utils tensor]; }; spatstat_utils = derive2 { name="spatstat.utils"; version="1.17-0"; sha256="08h9kzkkxvlnngxnv5mdylfali5jj4yhgbr8kvf8l7glswz6ik9r"; depends=[]; }; spatsurv = derive2 { name="spatsurv"; version="1.4"; sha256="0sw5a532p3bbbh3pxvscmmmg6jw126ncpihxiv01bpwmf85ld4z2"; depends=[fields geostatsp iterators lubridate Matrix RandomFields raster RColorBrewer rgeos sp spatstat stringr survival]; }; - spbabel = derive2 { name="spbabel"; version="0.5.0"; sha256="0jwv3mirm5wkfqja0nwy25nfndis8px4awpjh4hk9bi77dfy14bf"; depends=[dplyr sp tibble]; }; + spbabel = derive2 { name="spbabel"; version="0.5.1"; sha256="1q4y5has7yrsn1hv5nzm4imciv5sw5ycsvy5mpikrs1i670rbp6b"; depends=[dplyr rlang sp tibble]; }; spc = derive2 { name="spc"; version="0.6.3"; sha256="0ik5qmf0f0l77rbg78rp8v606h0d1qp4kccl6j3vqfb2hjsqb7r0"; depends=[]; }; spc4sts = derive2 { name="spc4sts"; version="0.5.2"; sha256="039z6dnry5c2brmh7jsnb6cvb7a8nig1rrf4d4i5bpifi2x1hf06"; depends=[gridExtra LS2Wstat rpart]; }; spcadjust = derive2 { name="spcadjust"; version="1.1"; sha256="016i3zaaq800x4niz4fixa57nfj1m10sz5xskff4vq4v9fjn2sl0"; depends=[]; }; @@ -14035,7 +14054,7 @@ in with self; { 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-8"; sha256="0v4mnv9nl0dvmmfx10w03k02pwjjnip9526m3j1kpgn6c4wk1h93"; depends=[foreach rgdal 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]; }; + sperrorest = derive2 { name="sperrorest"; version="3.0.0"; sha256="0hhab72aqhjcznsghhxwnlxhmqr4wpnrndmy12b2cp5zbb0ca6q5"; depends=[future future_apply ROCR stringr]; }; spex = derive2 { name="spex"; version="0.6.0"; sha256="1m56vmp1zacipr8kw4pwh0rpc0jhi8a59351g9c6gpx48ysj9sbk"; depends=[quadmesh raster reproj sp]; }; spfrontier = derive2 { name="spfrontier"; version="0.2.5"; sha256="1vnvwcjbhvbmyn5rp4760amzy8k3y156q629fjymw9rw6zy45pbf"; depends=[ezsim moments mvtnorm numDeriv optimx spdep tmvtnorm]; }; spftir = derive2 { name="spftir"; version="0.1.0"; sha256="07vw8igy698jx671cj6hmf6ll9xvaq81fb6la7j95pqbd6jl284z"; depends=[pracma]; }; @@ -14065,7 +14084,7 @@ in with self; { splinetree = derive2 { name="splinetree"; version="0.2.0"; sha256="0gqb3kwca42crrx6fj42ryl5pkxvankhp1chdlvi5lgg8mzmqsnl"; depends=[ggplot2 mclust mosaic nlme rpart treeClust]; }; splitFeas = derive2 { name="splitFeas"; version="0.1.0"; sha256="1cfiis32h5kkp8r1mndmj4xss9gw96vdzk7q68q3jhbwqiaxp9rp"; depends=[corpcor matrixStats]; }; splitSelect = derive2 { name="splitSelect"; version="1.0.0"; sha256="044pmsdq1kvs3qjglrdpwq5kxvxfybpaqmqhnmwpw4xlql4afvyc"; depends=[caret doParallel foreach glmnet multicool mvnfast]; }; - splitTools = derive2 { name="splitTools"; version="0.2.0"; sha256="1wbssmlm0k261bk8a1x4zqfprsl0gp38a9asfa8iidsgw3yd9lf5"; depends=[]; }; + splitTools = derive2 { name="splitTools"; version="0.2.1"; sha256="09dpkrdfkhh7hqgf0r4c5qx74aghs2gqy47dyakkb19fbx66glhl"; depends=[]; }; splitfngr = derive2 { name="splitfngr"; version="0.1.2"; sha256="0cf9y68m72j890a732m0n784nr12ydljr6s8i80f0in6q8lmw8ls"; depends=[lbfgs]; }; splithalf = derive2 { name="splithalf"; version="0.7.1"; sha256="0mpg6i6zh4s9sz10gs0h3y1cc1zva7vs805sb3qkghx857psgyw3"; depends=[dplyr ggplot2 patchwork plyr Rcpp robustbase tidyr]; }; splithalfr = derive2 { name="splithalfr"; version="1.0.10"; sha256="08gl60dbjb4nq6ab0w7yj7ac0gnj0zxbvzlg3rkqczvx4r3gwkip"; depends=[dplyr rlang]; }; @@ -14102,7 +14121,7 @@ in with self; { spselect = derive2 { name="spselect"; version="0.0.1"; sha256="02aiml4dh40n6yl52ypramn4847ykdi4y5lhsmchnnp4nnnqycsn"; depends=[magic pracma tester]; }; spsh = derive2 { name="spsh"; version="1.1.0"; sha256="1rmsgp0mrb4153v5f5xby7r3izvgz1a0vi63g5p9q5jd6z0gd2i1"; depends=[DEoptim FME hypergeo lhs pracma Rdpack]; }; spsi = derive2 { name="spsi"; version="0.1"; sha256="0q995hdp7knic6nca0kf5yzkvv8rsskisbzpkh9pijxjmp1wnjrx"; depends=[plot3D]; }; - spsur = derive2 { name="spsur"; version="1.0.0.4"; sha256="0av0bay2dyfavsckqzjqr490k05fwfncr0yk1wxv741w35ww9mpx"; depends=[Formula MASS Matrix minqa numDeriv sparseMVN spdep]; }; + spsur = derive2 { name="spsur"; version="1.0.1.3"; sha256="0zhgj5vlc52j1mr1dkh08gfy0l2s9lqrqjraqsyx6p94gc4by1hv"; depends=[Formula gmodels MASS Matrix minqa numDeriv sparseMVN spatialreg spdep]; }; spsurv = derive2 { name="spsurv"; version="1.0.0"; sha256="11jlbzvzxv3d1d0nwpbii46ddvphglrxv25rw7pvxbybcx2i7k6x"; depends=[BH coda loo MASS Rcpp RcppEigen rstan rstantools StanHeaders survival]; }; spsurvey = derive2 { name="spsurvey"; version="4.1.2"; sha256="1lijys90x2s7xxx16bm6h9320kbldgpb1hnyij6s4fkrmqksk8mh"; depends=[crossdes deldir foreign Hmisc MASS rgeos sf sp]; }; spt = derive2 { name="spt"; version="2.5.1"; sha256="04j38d2b35p4798znnc49vqrg8r8bygwi07vybfj3nzimlp2mkrn"; depends=[]; }; @@ -14126,7 +14145,7 @@ in with self; { ssc = derive2 { name="ssc"; version="2.1-0"; sha256="1lq71p8hbjfg4a52009810k5dmhak9ddk1dywvhy7v2gjmxqnadw"; depends=[proxy]; }; sscor = derive2 { name="sscor"; version="0.2"; sha256="1kcrr90cxg6k4qkc3pidhkwf4dsnlgbxczxigr2afwpd9cpf104c"; depends=[mvtnorm pcaPP robustbase]; }; ssd = derive2 { name="ssd"; version="0.3"; sha256="1z61n9m6vn0ijawyz924ak0zfl9z13jsb4k4575b7c424ci2p6gy"; depends=[]; }; - ssdtools = derive2 { name="ssdtools"; version="0.1.1"; sha256="1vamc0b325i1jmzkqyjp7hym3x66pj9yflvplqa64m5nxr3q1anz"; depends=[abind actuar chk fitdistrplus ggplot2 lifecycle scales VGAM]; }; + ssdtools = derive2 { name="ssdtools"; version="0.2.0"; sha256="1nyym23q1f4v71g3rb5p59vdzylg8n90z2x2hkb7d6dycxjsyc8k"; depends=[abind actuar chk fitdistrplus ggplot2 lifecycle scales tibble VGAM]; }; sse = derive2 { name="sse"; version="0.7-16"; sha256="1kxdgbskw7v48jnif4dpmwxpsdznfx8d9q5nkf3ynw9xl38rzv23"; depends=[lattice]; }; ssev = derive2 { name="ssev"; version="0.1.0"; sha256="1iw07gw9vhg073s5kkxh5f1si6p998rc1i2zglnpk5c3pi3l55wp"; depends=[MESS pwr]; }; ssfa = derive2 { name="ssfa"; version="1.1"; sha256="0fkyalhsjmx2sf8xxkppf4vd272n99nbkxh1scidrsgp4jk6z7fx"; depends=[Matrix maxLik sp spdep]; }; @@ -14151,13 +14170,13 @@ in with self; { 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.4"; sha256="0a6b38lhi1p0n2hjq2j8aw2vkasdv50cpgllxfxla7ddwbhbk3nk"; depends=[data_table doParallel EmiStatR foreach ggplot2 hydroGOF lattice lmom mAr moments msm xts zoo]; }; - staRdom = derive2 { name="staRdom"; version="1.1.10"; sha256="17827w3kmj0ggap465q4chlh045ggvarik795c74sl5ldwc74ad8"; depends=[cdom data_table doParallel dplyr drc eemR foreach GGally ggplot2 gtools matrixStats MBA multiway pracma R_matlab readr stringr tibble tidyr zoo]; }; + staRdom = derive2 { name="staRdom"; version="1.1.11"; sha256="071irc8bam5rk72db0s7si2mmzq29245qk63q78fdn3ll2lb6gpf"; depends=[cdom data_table doParallel dplyr drc eemR foreach GGally ggplot2 gtools matrixStats MBA multiway pracma R_matlab readr stringr tibble tidyr zoo]; }; staTools = derive2 { name="staTools"; version="0.1.0"; sha256="1ksr0sjkhlwh0fkwcxjcxzbyxs1g78m4spkhrmgdpfzmk5zskqf9"; depends=[magicaxis Rcpp VGAM]; }; stability = derive2 { name="stability"; version="0.5.0"; sha256="0mz7ikfhpfbdcp72klq7fi4zfmx2w18gz46yhwywcc4dyi277m11"; depends=[dplyr ggfortify ggplot2 lme4 magrittr matrixStats reshape2 rlang scales tibble tidyr]; }; stable = derive2 { name="stable"; version="1.1.4"; sha256="01azqg4yi5wl6wfdpjq57w41x5z2b4dsp5n3vpkz24b9avk6rm8s"; depends=[rmutil stabledist]; }; stableGR = derive2 { name="stableGR"; version="1.0"; sha256="1glxrxqd3gr7npwlzcr2nmsmakydyxg7hswvb85gz1jvc6c6254f"; depends=[mcmcse mvtnorm]; }; stabledist = derive2 { name="stabledist"; version="0.7-1"; sha256="0scar396wiq6wkbkvwp4qrxqc1m075y56p37i6iry5rw796p1i86"; depends=[]; }; - stablelearner = derive2 { name="stablelearner"; version="0.1-1"; sha256="19mvk6dzg8zg0nj1q4sraqg6h3zj8xvnfc0jql1xiqas9wcypx7d"; depends=[e1071 MASS partykit]; }; + stablelearner = derive2 { name="stablelearner"; version="0.1-2"; sha256="18yrx2h71b857j0xyh68pj80p2xk6yhbfzhd3mdhiqw0irmc5755"; depends=[e1071 MASS party partykit randomForest ranger]; }; stablespec = derive2 { name="stablespec"; version="0.3.0"; sha256="0m143cq0baj2lyakhr31mqk2lg78jzpdlpv2bhwz6bzzip7mqi22"; depends=[foreach ggm graph matrixcalc nsga2R polycor Rgraphviz sem]; }; stabm = derive2 { name="stabm"; version="1.1.2"; sha256="01fg6zn6i710xfa9g15q4ca7vfgkfrk0iz6fvn8qp6y3dfrpm1sj"; depends=[BBmisc checkmate Matrix]; }; stabreg = derive2 { name="stabreg"; version="0.1.2"; sha256="1jrxyv0d33vd9vdlj1cv1a2qdz8iqgr726f54dgazwsz3cpyy2ia"; depends=[numDeriv]; }; @@ -14173,8 +14192,10 @@ in with self; { stapler = derive2 { name="stapler"; version="0.7.1"; sha256="1bzhahn72fzm2bjpis76hphv8whnkp2jq8bm1qldadhng4z1nsak"; depends=[matrixStats RNifti]; }; staplr = derive2 { name="staplr"; version="2.9.0"; sha256="1m1rikd1ijw9svdfm7nn9fnc9pycymbnnv2dq7ygs40jkq2mr4zp"; depends=[assertthat glue stringr]; }; stargazer = derive2 { name="stargazer"; version="5.2.2"; sha256="1pij76r60hkjlvxw6zw1v7gkib81smiqmjq7mwszn6xclq9lmsvh"; depends=[]; }; + starm = derive2 { name="starm"; version="0.1.0"; sha256="0y580c6inmfix6agwd5nr340l3hjk2xxs95s468j5pghpjpb8rmv"; depends=[Matrix]; }; starma = derive2 { name="starma"; version="1.3"; sha256="07r0kyabhgbm2v39fcrw0qhxcxj9a9cb45g9chzcnn9qmvramcwx"; depends=[ggplot2 Rcpp RcppArmadillo scales]; }; - stars = derive2 { name="stars"; version="0.4-0"; sha256="1wby9mkqybq17aakplhz22xp3xkpih9y5b2kc5mhgsl7s07glh42"; depends=[abind classInt lwgeom rlang sf units]; }; + stars = derive2 { name="stars"; version="0.4-1"; sha256="14f0qky7578g61rqjdvpkpr4393pxgqbmh5hycxrxcq0mc2aiqq3"; depends=[abind classInt lwgeom rlang sf units]; }; + starsExtra = derive2 { name="starsExtra"; version="0.0.3"; sha256="0zcz6jjs57k3vq2rdqf91ngcsl0qmdswpisp9zfj9af7f9i7bmm5"; depends=[mgcv nngeo sf stars units]; }; startR = derive2 { name="startR"; version="0.0.1"; sha256="12y57n3yip5rz4rln41896a15zv5b4c67k164282fh1p6ww9gr3r"; depends=[abind bigmemory future]; }; startup = derive2 { name="startup"; version="0.14.1"; sha256="0nvmhfar53yi3wsvhv4idx849psdj46qhkvkxjn52fa7yflkrwz8"; depends=[]; }; startupmsg = derive2 { name="startupmsg"; version="0.9.6"; sha256="0vkqxir4ady4dn9s70dfg1fxck2xg8vnmrmxjzvk01i6pc9zyq0x"; depends=[]; }; @@ -14195,11 +14216,11 @@ in with self; { statnet = derive2 { name="statnet"; version="2019.6"; sha256="17dj6vjnjyqrfhzjq1lys5b29j942kd15zffb69jidni3slf20q9"; depends=[ergm ergm_count network networkDynamic sna statnet_common tergm tsna]; }; statnet_common = derive2 { name="statnet.common"; version="4.3.0"; sha256="0ng90i0wm9wlyhjbnmnylc1bbqw396p1dr7f402dyry9x9ck6jl3"; depends=[coda]; }; statnetWeb = derive2 { name="statnetWeb"; version="0.5.5"; sha256="1v2zgbfl975gqhkhxvgdfhgbw7yf9y3p6kqqxldr9zskhmrn7p1x"; depends=[ergm lattice latticeExtra network RColorBrewer shiny sna]; }; - statnipokladna = derive2 { name="statnipokladna"; version="0.5.6"; sha256="1i5n0am5571b3q1x9rnf87shj9zjc829707wf7gxihfnlmzvrssd"; depends=[curl dplyr httr jsonlite lifecycle lubridate magrittr purrr readr rlang stringi stringr tibble tidyr usethis xml2]; }; + statnipokladna = derive2 { name="statnipokladna"; version="0.5.7"; sha256="0mj2dxianpd78127ggn0cml5nwwf6l26sds36qvfwbicaj7bk5jg"; depends=[curl dplyr httr jsonlite lifecycle lubridate magrittr purrr readr rlang stringi stringr tibble tidyr usethis xml2]; }; statprograms = derive2 { name="statprograms"; version="0.2.0"; sha256="0m7px7fmpz2zzlfdi7rbllcjvcjp8iy94f6fa1w4xinh7vz3y6vq"; depends=[]; }; statquotes = derive2 { name="statquotes"; version="0.2.2"; sha256="1xzc3ndddjrlyld0p4zcwwxkj7i3m3adj7c78x9l4lhlw9mxbbqg"; depends=[stringr tidytext wordcloud]; }; stats19 = derive2 { name="stats19"; version="1.2.0"; sha256="0956s8z8qrkij52fq15ydl15zi3kg5czcx7kjcg20nmby5dqmd34"; depends=[readr sf]; }; - statsExpressions = derive2 { name="statsExpressions"; version="0.3.1"; sha256="0wjqz9ybg95i95hxvasq8igdw8faqlj3pgcvg8n368v165x529kl"; depends=[BayesFactor boot broomExtra dplyr ez ipmisc metaBMA metafor metaplus psych purrr rcompanion rlang sjstats tibble tidyr WRS2]; }; + statsExpressions = derive2 { name="statsExpressions"; version="0.4.1"; sha256="0pzxl1w1ibcwcrzc4p8rc439s30hmcf8xwq7d9hq31vkf6kywpin"; depends=[boot broomExtra correlation dplyr effectsize ez ipmisc metafor metaplus purrr rcompanion rlang tidyBF tidyr WRS2]; }; statsguRu = derive2 { name="statsguRu"; version="0.1.0"; sha256="0pqz0la86mk6zp65zzbfwhxyrqqx040p8mrm2j9wqb53r8fbnmqc"; depends=[devtools htmltab plotrix]; }; statsr = derive2 { name="statsr"; version="0.1-0"; sha256="1z0wfj1jxz02x7vl6sr651v85k88wg8rx0k2kkrwzc4ynim8shms"; depends=[BayesFactor broom cubature dplyr ggplot2 gridExtra knitr rmarkdown shiny tidyr]; }; stcos = derive2 { name="stcos"; version="0.2.1"; sha256="1vjz7x9jign82h5kwqcy4jxqjdnhrsgf00dj5m51f6hvvzh3wv5s"; depends=[dplyr Matrix R6 Rcpp RcppArmadillo sf]; }; @@ -14239,7 +14260,7 @@ in with self; { stocks = derive2 { name="stocks"; version="1.1.4"; sha256="0b6rl7pfkgzbpwnv7zzkr36hs5f1zb60d16ijslf7g9m25vvcyg6"; depends=[dvmisc Hmisc lubridate quantmod rbenchmark RColorBrewer Rcpp TTR zoo]; }; stoichcalc = derive2 { name="stoichcalc"; version="1.1-3"; sha256="0z9fnapibfp070jxg27k74fdxpgszl07xiqfj448dkydpg8ydkrb"; depends=[]; }; stokes = derive2 { name="stokes"; version="1.0-5"; sha256="0xbjkrm9g7r2xnj629i5cfmmqkw60iq4k6lk3skmkj3xh20lcd5x"; depends=[magrittr partitions permutations spray]; }; - stopwords = derive2 { name="stopwords"; version="1.0"; sha256="1nmi0bpd0c238g5b8ch1v034m5ng9llhs519cgxdrj3sh9fplwlv"; depends=[ISOcodes]; }; + stopwords = derive2 { name="stopwords"; version="2.0"; sha256="155g00ansyqfpp1mzd2q6mn0k214xinf78nww2368h24kz761jjw"; depends=[desc ISOcodes usethis]; }; stormwindmodel = derive2 { name="stormwindmodel"; version="0.1.3"; sha256="0bh2avblcai49kz8v2i1awqvmzd8gpmla342xdb0siwfpd0caid3"; depends=[dplyr ggplot2 lubridate maps plyr rlang 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]; }; @@ -14251,7 +14272,7 @@ in with self; { 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.4.905"; sha256="0mxhrnqqdgwmv2lqs2sgwa95lq5v4dl6vdqyasknbbfd8vddf393"; depends=[adegenet ape apex copula data_table dplyr DT genepop ggplot2 gridExtra Hmisc magrittr pegas phangorn purrr RColorBrewer Rcpp readr rlang rmetasim stringi swfscMisc tibble tidyr]; }; - stratamatch = derive2 { name="stratamatch"; version="0.1.4"; sha256="0dnwlxz3cw66ww4j7fws6qx1na3ngvkw76bv5igra3lxnzkg217q"; depends=[dplyr Hmisc magrittr rlang survival]; }; + stratamatch = derive2 { name="stratamatch"; version="0.1.5"; sha256="12yk738acsdgn8n7brgl2pnha7ii91mzrksihv2rgks820rdjxip"; depends=[dplyr Hmisc magrittr rlang survival]; }; stratbr = derive2 { name="stratbr"; version="1.2"; sha256="15vkymmc61yz9szhfhc5663hfyqvh499ahwhr9mv1lhv5bikk0kb"; depends=[Rglpk snowfall stratification]; }; strategicplayers = derive2 { name="strategicplayers"; version="1.0"; sha256="19vijrlzawd701vvk9ig7yhzbirh39dxxcwfz8ywwvxxiaky5x55"; depends=[sna]; }; stratification = derive2 { name="stratification"; version="2.2-6"; sha256="1jlks3g8wpqlpci6v0ryyv93agiabdiklmk6ij0pc5icrfiynbhw"; depends=[]; }; @@ -14286,7 +14307,7 @@ in with self; { studyStrap = derive2 { name="studyStrap"; version="1.0.0"; sha256="0lvzqnq40j0xn74qrj0pqhr8zz34mbhfd7dg8bnadscsvj5ffm4c"; depends=[caret CCA dplyr MatrixCorrelation nnls pls tibble tidyverse]; }; styler = derive2 { name="styler"; version="1.3.2"; sha256="1waglhsy2c53qjgd2qhlzda3z0lbzbwx9fkrfhac41y6h91mgkrz"; depends=[backports cli magrittr purrr R_cache rematch2 rlang rprojroot tibble withr xfun]; }; stylest = derive2 { name="stylest"; version="0.1.0"; sha256="0dr7j9fh8kp6wsqql38s3rk596xl6m9nx0w1l5v25hv2bphidxzr"; depends=[corpus Matrix]; }; - stylo = derive2 { name="stylo"; version="0.7.1"; sha256="0l7z4d8q4kp9m0di0hch2zpbxmf7im4h0n95mrylqw93w768z76s"; depends=[ape class e1071 lattice pamr tcltk2 tsne]; }; + stylo = derive2 { name="stylo"; version="0.7.2"; sha256="0s49das1f9svg3grw6faivfxc33y3679z7qiib68fm8ckma94mj9"; depends=[ape class e1071 lattice pamr tcltk2 tsne]; }; suRtex = derive2 { name="suRtex"; version="0.9"; sha256="0xcy3x1079v10bn3n3y6lxignb9n3h57w4hhrvzi5y14x05jjyda"; depends=[]; }; subcopem2D = derive2 { name="subcopem2D"; version="1.3"; sha256="06wwd847g9pxd0z2a8494h3nc9s280a3s1510bir24m3z7w1pqf3"; depends=[]; }; subdetect = derive2 { name="subdetect"; version="1.1"; sha256="1bcc13avs5w9vmwyf71cnjd2kwmcavmzpwyv8gvsn61n7b4j8wlk"; depends=[]; }; @@ -14309,7 +14330,7 @@ in with self; { sudoku = derive2 { name="sudoku"; version="2.6"; sha256="13j7m06m38s654wn75kbbrin5nqda4faiawlsharxgrljcibcbrk"; depends=[]; }; sudokuAlt = derive2 { name="sudokuAlt"; version="0.2-1"; sha256="1y3li64xqag2ia8dg7q49jmlb1awl92rz6xa9zsbf0s9jman9wj9"; depends=[magrittr]; }; sugarbag = derive2 { name="sugarbag"; version="0.1.2"; sha256="0aikbcdnwvrwvhcchjic9x1r4xh00z8hzq7dc93ykg4wlggs5rx7"; depends=[dplyr geosphere lwgeom purrr rlang rmapshaper sf tibble tidyr]; }; - sugrrants = derive2 { name="sugrrants"; version="0.2.6"; sha256="125v8g36215hyil7vavdz27ng6709nh45m3zp9wwdqb6m4g36smy"; depends=[dplyr ggplot2 gtable lubridate rlang]; }; + sugrrants = derive2 { name="sugrrants"; version="0.2.7"; sha256="1clad4pafj3cf9ra48zf4bm6vvgb3ys7jg4m4qp5k3w4v81qdrnj"; depends=[dplyr ggplot2 gtable lubridate rlang]; }; sumFREGAT = derive2 { name="sumFREGAT"; version="1.1.0"; sha256="1ycdnf5ghrv3czi4lh5yc8n8690m3b8i85s46k7lya2k0rasvac4"; depends=[GBJ Matrix seqminer]; }; summariser = derive2 { name="summariser"; version="2.3.0"; sha256="0zliqy8dlcr2yy4ky8k68qn256xvpla8fcv7via19y40bmla37ic"; depends=[dplyr]; }; summarytools = derive2 { name="summarytools"; version="0.9.6"; sha256="03pcb2ild1rb9f15yq8b68p9bg10z5wk2x7ahgyzkwdh5f81vbq2"; depends=[base64enc checkmate dplyr htmltools lubridate magick matrixStats pander pryr rapportools tibble tidyr]; }; @@ -14328,7 +14349,7 @@ in with self; { superpc = derive2 { name="superpc"; version="1.09"; sha256="1p3xlg2n7p57n54g2w4frfrng5vjh97kp6ax4mrgvj3pqmd1m69z"; depends=[survival]; }; supervisedPRIM = derive2 { name="supervisedPRIM"; version="2.0.0"; sha256="1j5gsy119pvrhkkg048lyk6hjvn9x1bhmfy5g824gj3k1w5slrib"; depends=[prim]; }; suppdata = derive2 { name="suppdata"; version="1.1-1"; sha256="1sysd5w59y9hkm1ab8m9i1d976dv6cxchssc86s27bsibhsj2blc"; depends=[httr jsonlite rcrossref xml2]; }; - support_BWS = derive2 { name="support.BWS"; version="0.4-0"; sha256="09dd8nxfb0snsvq30z494i9pdkfl2vbhajlsxiib57h5jr0rc0ng"; depends=[]; }; + support_BWS = derive2 { name="support.BWS"; version="0.4-1"; sha256="0lfjcwgq74zmgrzybrxj4prvdy2qjlflxsqli7kslymfc653g5qa"; depends=[]; }; support_BWS2 = derive2 { name="support.BWS2"; version="0.3-0"; sha256="0k9yvg0n4lzsq43r53r9f70hq1q3zfljjafj9ds2p3c6qzgs9chi"; depends=[]; }; support_BWS3 = derive2 { name="support.BWS3"; version="0.2-0"; sha256="012kcvscz7m2is92r71731zc7xnp7pwyx30vivwjazrigp9bq1kl"; depends=[]; }; support_CEs = derive2 { name="support.CEs"; version="0.4-1"; sha256="1rbyl7v6m07dsp08kkk9020bh39rhx89q7d05rc5kxb6f7y66jyz"; depends=[DoE_base MASS RCurl simex XML]; }; @@ -14359,20 +14380,19 @@ in with self; { survexp_fr = derive2 { name="survexp.fr"; version="1.0"; sha256="12rjpnih0xld4dg5gl7gwxdxmrdmyzsymm7j05v98ynldd1jkjl8"; depends=[survival]; }; survey = derive2 { name="survey"; version="4.0"; sha256="1q9x0s86s72gl43zj49gypg6jj2b78xjvxr4lmy5147s9h7z8lxh"; depends=[lattice Matrix minqa mitools numDeriv survival]; }; surveybootstrap = derive2 { name="surveybootstrap"; version="0.0.1"; sha256="13rp6gj1dgdzcjbi2403pldygp1dyqx8zj0r1nvyghpi06x5gpb7"; depends=[dplyr functional plyr Rcpp RcppArmadillo stringr]; }; - surveydata = derive2 { name="surveydata"; version="0.2.4"; sha256="1nhpy40ibl1iirbc6np94mddsws2hn77zfqcaydfzd12i0jqg3gy"; depends=[assertthat dplyr DT ggplot2 magrittr purrr rlang scales tidyr]; }; + surveydata = derive2 { name="surveydata"; version="0.2.5"; sha256="07k54282y69sl4z85v0in6v4f3dpk3i807n5ysyb54p6j1gy95al"; depends=[assertthat dplyr DT ggplot2 magrittr purrr rlang scales tidyr]; }; surveyeditor = derive2 { name="surveyeditor"; version="1.0"; sha256="073219bcn1hlxl9ql6gncfvgn0m37pz5sb7h94nq6lf35dymq5zq"; depends=[]; }; surveyoutliers = derive2 { name="surveyoutliers"; version="0.1"; sha256="03nqw0zir3x57gg23hgsr2s99pv958kfsygqfwly96rvfdhr5p3v"; depends=[]; }; surveyplanning = derive2 { name="surveyplanning"; version="3.0"; sha256="1wnjizd5n5lyp8nw6srplrw7swrrivmbcphdvgaa9q1y8lkpq5w0"; depends=[data_table laeken]; }; surveysd = derive2 { name="surveysd"; version="1.2.0"; sha256="1w4cd52gdl65p16rza50n7pk2xfx3kxd1k16pr67j0pnyl7h2fqk"; 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]; }; - survival = derive2 { name="survival"; version="3.1-11"; sha256="1fbhbm3bnpg1nmj37h1d76x813ggvwk0cp51ixmmgb3pz47i5xj4"; 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]; }; + survival = derive2 { name="survival"; version="3.1-12"; sha256="07zj3gpwncw89hbiwjb6ih9axv5zwdqnbgz9yw9xzws6nrpdcbmn"; depends=[Matrix]; }; + survivalAnalysis = derive2 { name="survivalAnalysis"; version="0.1.2"; sha256="17pywrb10ql4li2jb3y3j0wy0x7wicq1x395a6igxy257kmblw18"; 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=[]; }; survivalsvm = derive2 { name="survivalsvm"; version="0.0.5"; sha256="1b4hrdrqq1z0kfn8vpdwg54388m25df2s6w9i574x3mkxkmkjkga"; depends=[Hmisc kernlab Matrix pracma quadprog survival]; }; survminer = derive2 { name="survminer"; version="0.4.6"; sha256="0c5q5pp78wsv00rrbhbfl1yrdng8n7z1mgqlrqzgb0pswlvv2w3z"; depends=[broom dplyr ggplot2 ggpubr gridExtra magrittr maxstat purrr scales survival survMisc tibble tidyr]; }; survsim = derive2 { name="survsim"; version="1.1.5"; sha256="0194w1h3v4p546wibp3xyhy2r84w3p9r6ggzhlf11v8467mjy0l9"; depends=[eha statmod]; }; - survsup = derive2 { name="survsup"; version="0.0.2"; sha256="0q41hn8iqib2w6gkz2mll4h46vr9ca25jrg0g5jr9wgrzsnf5jci"; depends=[broom colorspace dplyr ggplot2 gridExtra survival]; }; survtmle = derive2 { name="survtmle"; version="1.1.1"; sha256="1l13rvwq4915ij2a55fxdj3b3wkgjca1fbqzcgkjlpzkcn97k1nj"; depends=[dplyr ggplot2 ggsci Matrix plyr speedglm stringr SuperLearner tidyr]; }; survutils = derive2 { name="survutils"; version="1.0.2"; sha256="1ws4r5chz0cbf6vjmlj2xv9hmr968xyw8dc5g3j937xpbz40i75h"; depends=[broom dplyr ggplot2 glue lazyeval magrittr purrr survC1 survival]; }; survxai = derive2 { name="survxai"; version="0.2.0"; sha256="09sk7i0bsk5ql8dibqyykyv95i945bf43xpr4gv22w73zwc0n8hh"; depends=[breakDown ggplot2 pec prodlim scales survival survminer]; }; @@ -14387,7 +14407,7 @@ in with self; { svSocket = derive2 { name="svSocket"; version="0.9-57"; sha256="0id93b500iybza6sbn60ybm91mkh5cjpvhypqs4f3dv13m6blb9j"; depends=[svMisc]; }; svSweave = derive2 { name="svSweave"; version="0.9-8"; sha256="0zkng8lwdpjdbic9f6jnk2ndxbch2kjyz71ds1bksvd3kmk03lks"; depends=[knitr]; }; svTools = derive2 { name="svTools"; version="0.9-5"; sha256="040wr8cr2p35x6pr515bprmsw8ysajx4df5f2njz3ily61xf9szi"; depends=[codetools svMisc]; }; - svUnit = derive2 { name="svUnit"; version="0.7-12"; sha256="16iiryj3v34zbnk1x05g30paza7al1frqx52fkw8ka61icizsrf5"; depends=[]; }; + svUnit = derive2 { name="svUnit"; version="1.0.3"; sha256="0awz9ks0y1n98y9nq6rq65yj7y22z5q4a5w5qhkszkgc9669q1dw"; depends=[]; }; svWidgets = derive2 { name="svWidgets"; version="0.9-45"; sha256="08cpsy4abypjnv33arsgxk5i0gpdvdzj60wa1b22ca1n7d35mc80"; depends=[svMisc]; }; svapls = derive2 { name="svapls"; version="1.4"; sha256="12gk8wrgp556phdv89jqza22zmsnachsydr5vlz38s664d2lplbg"; depends=[class pls]; }; svars = derive2 { name="svars"; version="1.3.3"; sha256="1npjnxbxpidcpifgh2k6xs7drhc075cnzd7mb7wnxi9yz0v10fmr"; depends=[clue copula DEoptim expm ggplot2 pbapply Rcpp RcppArmadillo reshape2 steadyICA strucchange vars zoo]; }; @@ -14419,8 +14439,9 @@ in with self; { swirl = derive2 { name="swirl"; version="2.4.5"; sha256="0cqyn2rnqfkb2wza4zdr1kcms5l0igbq79xh5i7765agdday2z9w"; depends=[digest httr RCurl stringr testthat yaml]; }; swirlify = derive2 { name="swirlify"; version="0.5.3"; sha256="1bpg6yz2adgspjlwsf2q83j1bq0iyvp9938smgc41861nsclngwr"; depends=[base64enc readr rmarkdown shiny shinyAce stringr swirl whisker yaml]; }; swissMrP = derive2 { name="swissMrP"; version="0.62"; sha256="1vy6h6c4v49zlsli77ilj4df8cfh67rqmki71v6j1aqw6kf3b649"; depends=[arm blme lme4 maptools sp]; }; + swissparl = derive2 { name="swissparl"; version="0.2.1"; sha256="0181ls1gw68kfz3yqf8m2nwhah87i9m164rlbycy1kxq9adi93cs"; depends=[crayon dplyr ggplot2 httr jsonlite lubridate magrittr purrr stringr tibble tidyr]; }; switchnpreg = derive2 { name="switchnpreg"; version="0.8-0"; sha256="1vaanz01vd62ds2g2xv4kjlnvp13h59n8yqikwx07293ixd4qhpw"; depends=[expm fda HiddenMarkov MASS]; }; - switchr = derive2 { name="switchr"; version="0.14.2"; sha256="1a1yq12h5km42gp7gki7p215rnbwrs87xa2p0qndwqpvnaxgv6a4"; depends=[RCurl RJSONIO]; }; + switchr = derive2 { name="switchr"; version="0.14.3"; sha256="1aw9n6hh62qvggl1flpxfyqgp4sj6vj1mlfqfhx923hl53c7cr31"; depends=[RCurl RJSONIO]; }; swmmr = derive2 { name="swmmr"; version="0.9.1"; sha256="140sx0y00ngxsyn7n1l0aay7vk2jk8hf81aiwh46k761cpc5y28d"; 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]; }; @@ -14451,7 +14472,7 @@ in with self; { sysid = derive2 { name="sysid"; version="1.0.4"; sha256="0fr9gf5yjin3zvz850z4r4pqc1r4mwx8d46sl64i4csdm9qnqagy"; depends=[bitops ggplot2 polynom reshape2 signal tframe zoo]; }; syslognet = derive2 { name="syslognet"; version="0.1.2.1"; sha256="0nwni2mn7w43pfasqa2dwy1l6r0ymlkwlsyd5q47fajdr8v1ir0q"; depends=[]; }; systemfit = derive2 { name="systemfit"; version="1.1-24"; sha256="180ah91i98gjswpbkkdjgnc2c9rz3pl5bw035iks92nd5vl6w5wz"; depends=[car lmtest MASS Matrix sandwich]; }; - systemfonts = derive2 { name="systemfonts"; version="0.1.1"; sha256="0m0ljid683xcam2f14x7k2zv1yx4npac38a3gfv11vhxfbnpgp0z"; depends=[]; }; + systemfonts = derive2 { name="systemfonts"; version="0.2.0"; sha256="1aba07djvxqdmnsdbwvzcsbm2fddnhrssa54xyrlviiwsv2c1qsd"; depends=[]; }; 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]; }; @@ -14474,7 +14495,7 @@ in with self; { tabr = derive2 { name="tabr"; version="0.4.2"; sha256="0c3814dnz1vzgbmm3vp0icnzyaqs1kimqnsp4n8id7zn8vlmp21p"; depends=[crayon dplyr ggplot2 magrittr purrr tibble tidyr]; }; tabuSearch = derive2 { name="tabuSearch"; version="1.1.1"; sha256="0396a8hla508na1hmyyhfbl8w10dbg810cln2xyhhvxi7rr223dj"; depends=[]; }; tabula = derive2 { name="tabula"; version="1.5.1"; sha256="0mm08rgqdhc3b68xh9hk4rw4i69gb2c45679zni9kkv48pbxvrh7"; depends=[arkhe ca ggplot2 rlang]; }; - tabularaster = derive2 { name="tabularaster"; version="0.5.0"; sha256="0cqax6hq0pbxmqls3cs21cc86662wdzjyx4lkxw42dbw4v13f728"; depends=[dplyr fasterize gibble magrittr raster rlang sp spatstat spbabel spex tibble viridis]; }; + tabularaster = derive2 { name="tabularaster"; version="0.6.0"; sha256="0yaadc4774jwrp38ri6mfnw2x94yhb9kq50bf25naw05g5z6b1d0"; depends=[dplyr fasterize gibble magrittr raster rlang silicate spatstat tibble]; }; tabulizer = derive2 { name="tabulizer"; version="0.2.2"; sha256="0zd5cfqwgirqchw1mvziscxvzl8pb1y6rbfywkn9i9pxfydkm5vi"; depends=[png rJava tabulizerjars]; }; tabulizerjars = derive2 { name="tabulizerjars"; version="1.0.1"; sha256="005n2gyzzmq8h0mpj8xs6ri6llzwag7nqzpm4vnzp81vwy8kmf92"; depends=[rJava]; }; tabulog = derive2 { name="tabulog"; version="0.1.1"; sha256="0n6qjd7kmvxx5na71f358pw3bbwa69vh8qjkrs5mkb3izxabcq67"; depends=[yaml]; }; @@ -14486,17 +14507,14 @@ in with self; { tailr = derive2 { name="tailr"; version="0.1.3"; sha256="0agm83zwj6f3bpicbn2pcwira05v2pbv0g7myc1x06jxbw1qbfwp"; depends=[foolbox glue rlang]; }; taipan = derive2 { name="taipan"; version="0.1.2"; sha256="192sy5pgq74vs31p7jfn6svdzf9mk9ybppzhp1rlki1bagmm5f1r"; depends=[shiny]; }; takos = derive2 { name="takos"; version="0.1.0"; sha256="0a26jmxccpyk36sah9nz7pqpkc1rd9kbwrvwh0r0zp7lwvxbjb8w"; depends=[baseline broom colorRamps data_table devEMF MASS minpack_lm pracma segmented sfsmisc smoother]; }; - tanaka = derive2 { name="tanaka"; version="0.1.2"; sha256="17847xijmb6rv2vzvzx7piga1ihzsmdq4harjccm6qx0nfwij4vs"; depends=[isoband lwgeom raster sf]; }; + tanaka = derive2 { name="tanaka"; version="0.1.3"; sha256="1x5czib9vqpxbr61if1rnlyrld6gx2zf22jz5rcagb8x3bxmd5g6"; depends=[isoband raster sf]; }; tangles = derive2 { name="tangles"; version="0.8.1"; sha256="06a5hn5hkvgr6pcjz3n0vi1zwmv00wypi5f62agqh8mas80v44vh"; depends=[digest raster sp]; }; - tangram = derive2 { name="tangram"; version="0.4"; sha256="1yj5vwc8jkiic4zjag9k7w3j6dibqw5zsi78q6gssshsi9z0zbgy"; depends=[base64enc digest htmltools magrittr R6 stringi stringr]; }; tapkee = derive2 { name="tapkee"; version="1.1"; sha256="1s8710m4drhnycfv27bv1w7vqc99dvbcn8zxkahq0lrsx7q8i5mz"; depends=[]; }; tashu = derive2 { name="tashu"; version="0.1.0"; sha256="04xvmbcwi84zg1pqw21nmrbnkyx184wc200vl1vhmwxggq1i60np"; depends=[dplyr drat ggplot2 lubridate plyr randomForest RColorBrewer reshape2]; }; tatest = derive2 { name="tatest"; version="1.0"; sha256="1yd9pdpdhxwpllnj5wxa7ly29qiw8qywx9lx0w3nizczlx35fgjy"; depends=[]; }; tatoo = derive2 { name="tatoo"; version="1.1.1"; sha256="0w9rm6cnc1mpfyklb8njzjwph2c38niinzxiflrqjqfdp7nd8281"; depends=[assertthat colt crayon data_table magrittr openxlsx stringi withr]; }; tau = derive2 { name="tau"; version="0.0-21"; sha256="08wfl0pv865clpcvzmzb3rw3hl76f16n3j61fbmrzi50xf2diyx7"; depends=[]; }; 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]; }; - tawny_types = derive2 { name="tawny.types"; version="1.1.5"; sha256="1vg0hv91dif6cfqfzrf7m1qbk57fp8v97fp88whwmvs83yd521hq"; depends=[futile_logger futile_options lambda_r lambda_tools quantmod xts zoo]; }; taxa = derive2 { name="taxa"; version="0.3.3"; sha256="11x28mxpza0cckj9cf4zizrsz87h48vlxxan8kn8lwzdpy1xn8j8"; depends=[crayon dplyr jsonlite knitr lazyeval magrittr R6 rlang stringr taxize tibble tidyr]; }; taxadb = derive2 { name="taxadb"; version="0.1.0"; sha256="0nns9jpjawla90f12gi90562llb2j0pdhwlvy62mgcg0ghr39fgr"; depends=[arkdb curl DBI dbplyr dplyr jsonlite magrittr memoise progress rappdirs readr rlang RSQLite stringi tibble]; }; taxize = derive2 { name="taxize"; version="0.9.94"; sha256="0ig8x3pkfawjk7x3hkrm4n94askhqk71sa5bbbp2l6dirqbfmism"; depends=[ape bold cli crayon crul data_table foreach jsonlite natserv phangorn R6 ritis rotl rredlist tibble wikitaxa worrms xml2 zoo]; }; @@ -14510,7 +14528,7 @@ in with self; { tbl2xts = derive2 { name="tbl2xts"; version="0.1.3"; sha256="0yy0cpsflwx7fbql3vh0l87cvqgn0ghdqal4m7l9aplqhzdwxs3r"; depends=[dplyr lazyeval PerformanceAnalytics xts zoo]; }; tbm = derive2 { name="tbm"; version="0.3-2.1"; sha256="0srdcla6m5vlid27i793yynm3r2fg3nzr7zn6j923fcmnpdg2jcg"; depends=[basefun coneproj mboost mlt sandwich variables]; }; tbma = derive2 { name="tbma"; version="0.1.0"; sha256="066p3szfayyimwblghm1lipjf21xgscq1fzbzpqz16lqjpb99ni1"; depends=[data_table ranger RcppRoll zoo]; }; - tbrf = derive2 { name="tbrf"; version="0.1.4"; sha256="11b61h8ivjcmnx6jqm6a6b3hs7pwg5plfj4rnd3s6aibjwsa6l1w"; depends=[boot dplyr lubridate purrr rlang tibble tidyr]; }; + tbrf = derive2 { name="tbrf"; version="0.1.5"; sha256="1mxfvgb18a62igdh3af4m8x6fl69s25j4x7isd70w744w6jvch3h"; depends=[boot dplyr lubridate purrr rlang tibble tidyr]; }; tcR = derive2 { name="tcR"; version="2.2.4.1"; sha256="1m68wxbxwhiadav4mfcidsa1hgwy7k9x60gfbs4zn6az9ix827m6"; depends=[data_table dplyr ggplot2 gridExtra gtable igraph Rcpp reshape2 scales stringdist]; }; tcensReg = derive2 { name="tcensReg"; version="0.1.6"; sha256="052mlmkxxyqg2xm484srx2dx02bl69s6fqffwyn7758s34jwbcxl"; depends=[maxLik Rdpack]; }; tcgsaseq = derive2 { name="tcgsaseq"; version="1.8.1"; sha256="1v5b3qghygb81lqc2h1fijgw856b1778xndppq7r4b0zhhvb81ac"; depends=[CompQuadForm ggplot2 GSA KernSmooth statmod]; }; @@ -14523,6 +14541,7 @@ in with self; { tdr = derive2 { name="tdr"; version="0.13"; sha256="0i0hnb3fc4d1mbbxcpzmyfh1w2rahfjabg5iyxym3yjd6377al15"; depends=[ggplot2 lattice RColorBrewer]; }; tdsc = derive2 { name="tdsc"; version="1.0.3"; sha256="1h46cflxj27i9bkl7iqxn7kzccl9b8r3fa9f5ska3a9p57algfyv"; depends=[data_table moments]; }; tdthap = derive2 { name="tdthap"; version="1.1-11"; sha256="15qlj2bivvz3pizd8dq34wczbkbxhzqh3cqp1ixkdkprlyvcxj5k"; depends=[]; }; + tea = derive2 { name="tea"; version="1.1"; sha256="0ql7lrxk0ihm49kqsvz79ig8i54rwiy9nxav4v9hy72j9kj5bgjn"; depends=[Matrix]; }; teachingApps = derive2 { name="teachingApps"; version="1.0.4"; sha256="0wi25wdpkz7kh8r1s42wa9kiky8ilmcg8kgw0j1caygwg0bml2fa"; depends=[actuar BH d3heatmap data_table devtools diagram DiagrammeR dplyr DT dygraphs ggplot2 knitr leaflet magrittr markdown metricsgraphics miniUI networkD3 pacman plotly radarchart Rcpp RcppEigen RcppNumerical rprojroot scales shiny shinyAce shinydashboard shinythemes threejs tidyr visNetwork yaml]; }; tealeaves = derive2 { name="tealeaves"; version="1.0.0"; sha256="0hzih93h8c9gqvsmfaldq9jaw8hgvd4kmrlqlaqr6xhi6zhjqhf1"; depends=[crayon dplyr furrr future ggplot2 glue magrittr purrr rlang stringr tidyr units]; }; teamcolors = derive2 { name="teamcolors"; version="0.0.4"; sha256="0mqrjnkpxzv7armgbl9nwz42pjb9l94yml5lp41rhjj9414b2729"; depends=[dplyr ggplot2 tibble tidyr]; }; @@ -14553,7 +14572,7 @@ in with self; { tergmLite = derive2 { name="tergmLite"; version="2.1.7"; sha256="0djf7k0svdq4bnc84zxmxjns2fqggf0bs4h59jcl0yc36ka9k94n"; depends=[ergm network Rcpp statnet_common tergm]; }; term = derive2 { name="term"; version="0.1.0"; sha256="16nphv6kysjjd523ypwdsw6f7l4zvqa6z62012lv71wdkhkfvgnr"; depends=[chk lifecycle]; }; ternvis = derive2 { name="ternvis"; version="1.2"; sha256="057i6i3ygxrin0npc18gsg3dpdldzafyb5sr6lix5mhy6b09lkxf"; depends=[dichromat maps quadprog]; }; - terra = derive2 { name="terra"; version="0.5-2"; sha256="1zc2j5a3jgv8ld1wrqq03yllddyq1ljvnyq71ivcj8y6bc4alqma"; depends=[raster Rcpp]; }; + terra = derive2 { name="terra"; version="0.5-8"; sha256="0m2bfbjs4gz9mqzrris15b2p8mnb5skr96mpha7jkz3h9ybyzxm9"; depends=[raster Rcpp]; }; tesseract = derive2 { name="tesseract"; version="4.1"; sha256="1a7cf48n7hdd6inqz23ifqhq6kx6wxri34a79ns2vxaj6f4llxf0"; depends=[curl digest pdftools rappdirs Rcpp]; }; test2norm = derive2 { name="test2norm"; version="0.1.1"; sha256="11by5a1j6613akxj1nc16r07jfwxr1izkpvymr9yycnddiqyp42c"; depends=[mfp]; }; testDriveR = derive2 { name="testDriveR"; version="0.5.1"; sha256="0wjdqvsyv33fsg1lljp9m0bhz38mpfgpgickgj4zdspc9x6lbnv6"; depends=[]; }; @@ -14565,12 +14584,12 @@ in with self; { testforDEP = derive2 { name="testforDEP"; version="0.2.0"; sha256="1mgzhj8b35r5cm4bl0nnyxj0h7rwd28d17qvgvaky2kvm2r83cf9"; depends=[Hmisc minerva Rcpp]; }; testit = derive2 { name="testit"; version="0.11"; sha256="13iq4p8xzng88miizf04yv6z8vk7zhg1c8kd2h6swcmhqzq29yqj"; depends=[]; }; testthat = derive2 { name="testthat"; version="2.3.2"; sha256="0v70v2fs0f2ir962z9csbjlj8snrq9mbjfyhhb9dhz3zy26qs9hs"; depends=[cli crayon digest ellipsis evaluate magrittr pkgload praise R6 rlang withr]; }; - testthis = derive2 { name="testthis"; version="1.1.0"; sha256="1ci7q25f8lq7mvigdj48gvpi75j08s0kll72kwa88xyfx9q8m3yl"; depends=[assertthat devtools fs magrittr pkgload rprojroot stringi testthat usethis]; }; + testthis = derive2 { name="testthis"; version="1.1.1"; sha256="0csragn695698dpkr9d3md0g81bzpy5mybd0jik669q9cs8sdzh2"; depends=[assertthat devtools fs magrittr pkgload rprojroot stringi testthat usethis]; }; tetraclasse = derive2 { name="tetraclasse"; version="0.1.21"; sha256="1cl2cah0xi6x3rvvdy56iszai6rkbxc1w3x13v0l1z1nryff7c6a"; depends=[dplyr FactoMineR ggplot2 ggrepel magrittr reshape2 tibble tidyr]; }; texPreview = derive2 { name="texPreview"; version="1.4.4"; sha256="1a80ld5j7419nqxvg1nq0kiv7ls262n6bk6pkj3cyqjq6z2y01j0"; depends=[base64enc details fs htmltools knitr lifecycle magick magrittr rematch2 rstudioapi svgPanZoom whisker xml2]; }; texmex = derive2 { name="texmex"; version="2.4.5"; sha256="13wsrp418cgvma7a7hfhbs6ywp3j1j2sig7x60zh8v29pjcxic2n"; depends=[ggplot2 mvtnorm Rcpp]; }; texreg = derive2 { name="texreg"; version="1.36.23"; sha256="0yxaqimd7cyfrfpia6fnqm15lgs0bf5zyjzmnfm1v4qmf8kj8x6v"; depends=[]; }; - text_alignment = derive2 { name="text.alignment"; version="0.1.0"; sha256="0gss64x3z7n5jpqp4ypsrmkamcd1c7jknysmndsxqs35p2ansppn"; depends=[Rcpp]; }; + text_alignment = derive2 { name="text.alignment"; version="0.1.1"; sha256="0gf4rpk6l77v9fl7pbmyzq1jmb9kmzzdrpr8bsq05n9vv5lhaqqf"; depends=[Rcpp]; }; text2speech = derive2 { name="text2speech"; version="0.2.10"; sha256="08sg17avqdb7wl68hc6caljwsv4wziw7w0csc8ga4k7bh7r53h8l"; depends=[aws_signature dplyr googleAuthR googleLanguageR httr knitr magrittr mscstts tuneR]; }; text2vec = derive2 { name="text2vec"; version="0.6"; sha256="0r75cv77x2zm1z66s95hic71dpbqmybz39n48q6mz7gfd3m7312y"; depends=[data_table digest lgr Matrix mlapi R6 Rcpp rsparse stringi]; }; textTinyR = derive2 { name="textTinyR"; version="1.1.3"; sha256="0z9k978yk54zxrrjajcb0nanfhfpxm2bq2vbmk6w5s194da6y3xl"; depends=[BH data_table Matrix R6 Rcpp RcppArmadillo]; }; @@ -14583,14 +14602,13 @@ in with self; { 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.4"; sha256="1388blqxziqzjipys6icdifnnzgxvm0w3yr9jihl32ldd701rvvw"; 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]; }; textreadr = derive2 { name="textreadr"; version="0.9.0"; sha256="04nyjrfxgwq8g3bdj12nnkia2xn2zngk1rprlkpyicrisgq36agk"; depends=[antiword curl data_table pdftools readxl rvest striprtf textshape xml2]; }; - textrecipes = derive2 { name="textrecipes"; version="0.1.0"; sha256="05ib5j1bphninc2v0bpaxdn2bnkj5ak6ldm6z3dvj7gmxk7p5cjc"; depends=[dplyr generics magrittr Matrix purrr recipes rlang SnowballC stopwords stringr tibble tidyr tokenizers]; }; + textrecipes = derive2 { name="textrecipes"; version="0.2.0"; sha256="1wibykc1ix2l6wimczqi30z63cidvpq2b5hfj6irf2myhbz5cyv2"; depends=[dials dplyr generics magrittr Matrix modeldata purrr Rcpp recipes rlang SnowballC stopwords stringr tibble tidyr tokenizers vctrs]; }; textreg = derive2 { name="textreg"; version="0.1.5"; sha256="0h44z5hyndnvzd9axix7gpmhbdx347dfgxw9r8w38kyw6dklbjy6"; depends=[NLP Rcpp tm]; }; textreuse = derive2 { name="textreuse"; version="0.1.4"; sha256="0qfp7ffzb5p3k3wiw8i1zjskni8f38rzkjnss97j9f3vhhb8j4r7"; depends=[assertthat BH digest dplyr NLP Rcpp RcppProgress stringr tidyr]; }; - textshape = derive2 { name="textshape"; version="1.6.0"; sha256="1pl85wjq5rl25gdlh4cp0l14hn76rrmpl7l1fn7kq9lwj9yfpcs8"; depends=[data_table slam stringi]; }; + textshape = derive2 { name="textshape"; version="1.7.1"; sha256="02111kj3kka84mpx7s19bjna9cas8diw5fxz51v5ggz0ldswa5pa"; depends=[data_table slam stringi]; }; textstem = derive2 { name="textstem"; version="0.1.4"; sha256="1pbhi5ia3w16vsix2x3if51zd2v9bcv0j4lj9hfikgq1yz9zxmw2"; depends=[dplyr hunspell koRpus koRpus_lang_en lexicon quanteda SnowballC stringi textclean textshape]; }; textutils = derive2 { name="textutils"; version="0.2-0"; sha256="06w0d12l7g4z3m278x5ap0jxm2y1h6ssj4igfcxk7j8k5hy89l80"; depends=[]; }; tfCox = derive2 { name="tfCox"; version="0.1.0"; sha256="06mbiz1jwp8mv5dbwyvdvy1wpp8s3xp9hhsm94vrbvjaxg680g28"; depends=[Rcpp survival]; }; @@ -14614,12 +14632,11 @@ in with self; { thankr = derive2 { name="thankr"; version="1.0.0"; sha256="089ikp85d5ia6a1qzmw8dkgcmz628cibmwfzcpk7m3ii8acxq91w"; depends=[]; }; thectar = derive2 { name="thectar"; version="1.0.0"; sha256="1qh0qzg0ybb38kzm56xxlvhm201pdjm16aky5f1fdflcsszgy8mx"; depends=[proxy smacof]; }; theiaR = derive2 { name="theiaR"; version="0.3.0"; sha256="0z3i6dgf2mv954llb6vk6g09gdk1hi0fjygk09jp8p9cygn7r941"; depends=[askpass httr R6 raster XML]; }; - themetagenomics = derive2 { name="themetagenomics"; version="1.0.0"; sha256="1wchvbqlp6kkpahqdrc52pjn79c9xkr6qzfm6vpzc07lp6l05iji"; depends=[ggplot2 lda lme4 Matrix plotly Rcpp rstan scales shiny stm]; }; + themetagenomics = derive2 { name="themetagenomics"; version="1.0.1"; sha256="09hr351s5qqmiyv77fbf71yp2jx7b00s1j2afss3rbrvmcznkdma"; depends=[ggplot2 lda lme4 Matrix plotly Rcpp rstan scales shiny stm]; }; themis = derive2 { name="themis"; version="0.1.0"; sha256="1hsrm8z9fh8smzw9yda8j32zq9warnpy6rihyni0zwchgp3iyawq"; depends=[dials dplyr generics purrr RANN recipes rlang ROSE tibble tidyselect unbalanced withr]; }; 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=[]; }; - thickmatch = derive2 { name="thickmatch"; version="0.3.0"; sha256="0j5wajrc0ngmal01hnfw6vbqvmnqfrgii68ws8ypig934h2kv05g"; depends=[DiPs liqueueR mvnfast plyr rcbalance]; }; + thickmatch = derive2 { name="thickmatch"; version="0.3.1"; sha256="0q7wpilbk8jm3q7m5hb114jpbv4ri1745v9sbdf222l6ymds6pia"; depends=[DiPs MASS plyr rcbalance]; }; thief = derive2 { name="thief"; version="0.3"; sha256="12ymkkisg5p0g1gmvlczhp4dc7mirjg55fqqmz2d90673vlg6rfq"; depends=[forecast ggplot2 hts]; }; thinkr = derive2 { name="thinkr"; version="0.13"; sha256="1j43mjznriq8d5ki50rb41vgmzj2gq8sahvhj11742ggxd0bzvdb"; depends=[assertthat devtools dplyr ggplot2 lazyeval lubridate magrittr officer rvg stringi stringr tidyr]; }; thor = derive2 { name="thor"; version="1.1.1"; sha256="1hkv7xd633qqcgfm16ws6hn26ab0mv5gqs6n8g7cq1qv57dsqjmm"; depends=[R6 storr]; }; @@ -14633,13 +14650,12 @@ in with self; { thriftr = derive2 { name="thriftr"; version="1.1.5"; sha256="1s8fn0imja6gh5bb0h2g1pmvkwk5v0dmpml9yvcd5dhz9lxy6vdj"; depends=[R6 rly stringi]; }; thsls = derive2 { name="thsls"; version="0.1"; sha256="18z7apskydkg7iqrs2hgnzby578qsvyd73wx8v4z3aa338lssdi7"; depends=[Formula]; }; thurstonianIRT = derive2 { name="thurstonianIRT"; version="0.9.0"; sha256="0jjrdx5f581h8vh0fw4p85mlqfym467azp7cln48wzi1s28m9mn2"; depends=[BH dplyr lavaan magrittr MplusAutomation mvtnorm Rcpp RcppEigen rlang rstan rstantools StanHeaders tibble tidyr]; }; - tibble = derive2 { name="tibble"; version="3.0.0"; sha256="0s84h8ls5qwixbs1n5safr3xqmg3p0llzdrd9sp4vs2572mwzqzi"; depends=[cli crayon ellipsis fansi lifecycle magrittr pillar pkgconfig rlang vctrs]; }; - tibbleOne = derive2 { name="tibbleOne"; version="0.1.1"; sha256="1cdk0m6g187kj836jh1n0picpaaybr5dxwiks5ppj5bpybw7x3xc"; depends=[dplyr flextable forcats glue kableExtra knitr labelled lifecycle magrittr officer purrr rlang stringr tibble tidyr tidyselect vctrs]; }; + tibble = derive2 { name="tibble"; version="3.0.1"; sha256="17m7xvn423snq9dmr0bhx42j5rbc53w1viizxx4bvq37nz7m4i8m"; depends=[cli crayon ellipsis fansi lifecycle magrittr pillar pkgconfig rlang vctrs]; }; tibbletime = derive2 { name="tibbletime"; version="0.1.3"; sha256="0p42g73cmw460v372317as50ijvsg49avg9cf222ypf1v0ls3ig1"; depends=[assertthat dplyr glue hms lifecycle lubridate purrr Rcpp rlang tibble tidyselect vctrs 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=[]; }; - tidyBF = derive2 { name="tidyBF"; version="0.1.0"; sha256="1yxm0qrc0mbpidz5gdyann5xsc7arz21cfvfx29xgpgpidlgr3y8"; depends=[BayesFactor broomExtra dplyr ipmisc metaBMA rlang tibble tidyr]; }; + tidyBF = derive2 { name="tidyBF"; version="0.2.0"; sha256="0pl5h7zqs7gap4pzch0f7m58lgwdvgp0zlp6l328j3z9h46amh9y"; depends=[BayesFactor dplyr ipmisc metaBMA rlang tidyr]; }; tidyHeatmap = derive2 { name="tidyHeatmap"; version="0.99.9"; sha256="04vx1ck1s6v4fzxxd4cpm5z3f0dzx3b9262xabnq75swng90w03r"; depends=[circlize ComplexHeatmap dplyr magrittr purrr RColorBrewer rlang tidyr viridis]; }; tidyLPA = derive2 { name="tidyLPA"; version="1.0.6"; sha256="1c3v7zljs6isbxzmyqx065pb31hl15sma00wh7pv3wgzacibbgmx"; depends=[dplyr ggplot2 gtable mclust mix MplusAutomation tibble]; }; tidyMicro = derive2 { name="tidyMicro"; version="1.43"; sha256="1y399khg85979lh9s528y5qab711qybd1vfw5kvyy7253ikmcb3p"; depends=[ade4 broom car cowplot dplyr Evomorph factoextra ggplot2 ggrepel gridExtra latex2exp lme4 lsr magrittr MASS Matrix plotly plyr png purrr rlang scales scatterplot3d shapes stringr ThreeWay tibble tidyr tidyverse vegan VGAM]; }; @@ -14655,14 +14671,15 @@ in with self; { tidycwl = derive2 { name="tidycwl"; version="1.0.4"; sha256="1f3lrdl73lx0a0y6kz33i6s8nkcwdjdmc6mvnkqp3n8r851q46lg"; depends=[dplyr htmlwidgets jsonlite magrittr visNetwork webshot yaml]; }; tidydice = derive2 { name="tidydice"; version="0.0.6"; sha256="1g0x426gri1s0fyn2srl7ni0zvrnx1wvg5zcr19fxgdw9m8rxxp2"; depends=[assertthat dplyr ggplot2 magrittr purrr tibble]; }; tidyfast = derive2 { name="tidyfast"; version="0.2.1"; sha256="1bfs2wma705nx1lpndq75ama5dr9kkg8hwpklb20csnccnfrlvf6"; depends=[data_table Rcpp]; }; - tidyfst = derive2 { name="tidyfst"; version="0.9.4"; sha256="1nq37pa1hn2m9ijfd8c3h3h2d4vhcjhzyhspvm5xkm9r0cbgxwl3"; depends=[data_table fst stringr]; }; + tidyfst = derive2 { name="tidyfst"; version="0.9.5"; sha256="0dl7s04s1vgssvay05sjlp4z2ccivzjspqd7wvv50ncv5zrnlw8s"; depends=[data_table fst stringr]; }; + tidyft = derive2 { name="tidyft"; version="0.4.5"; sha256="0l6ixaqj356q319ms0bf655f530cgiia9saqdx9lryaf0b6i2hxb"; depends=[data_table fst stringr]; }; tidygapminder = derive2 { name="tidygapminder"; version="0.1.1"; sha256="1m6bynwnw1msrzvdmy12w3ympinqpd8j3may3rwmg9941nndjv2d"; depends=[data_table dplyr readxl tidyr]; }; tidygenomics = derive2 { name="tidygenomics"; version="0.1.2"; sha256="1cnwmmmzp9kg4k7iy2kgb22bdllpnz257pv1ahy3l11zy6bl48fc"; depends=[dplyr fuzzyjoin IRanges purrr Rcpp rlang tidyr]; }; tidygeocoder = derive2 { name="tidygeocoder"; version="0.2.5"; sha256="03zrl7zvwpcir44a5f2mixyd35rcyx8fpq7fjybb5z0bky068ir4"; depends=[dplyr httr jsonlite purrr rlang stringr tibble tidyr tmaptools]; }; 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.5.0"; sha256="0bf8rnk0yhdjjs79d4s833z9j165cwvg3xdmqg3kc5yzc31m4hsg"; depends=[cli crayon DBI dbplyr dplyr httr lubridate rappdirs readr rlang RSQLite tidyr]; }; tidyjson = derive2 { name="tidyjson"; version="0.2.4"; sha256="1nbg7wg8r38ydvcp3kbxmmnayxrdkl3p7x0fjxny3bj9a0fp99y7"; depends=[assertthat dplyr jsonlite magrittr purrr tibble tidyr]; }; - tidylog = derive2 { name="tidylog"; version="1.0.0"; sha256="12civvsgj9d7ligc84sqii6a8q3ll12b8xs99f6rqp4nhzhpavv3"; depends=[clisymbols dplyr glue tidyr]; }; + tidylog = derive2 { name="tidylog"; version="1.0.1"; sha256="1plhzspwbc1p8hh1a3nkil63mfp740zvlsrfpdq5db3ja2jqz680"; depends=[clisymbols dplyr glue tidyr]; }; tidymodels = derive2 { name="tidymodels"; version="0.1.0"; sha256="1bi5vh80f6f2ibhyaapgnl7q1mkkx8425vj6ci0ml5rb7l8jhjm8"; depends=[broom cli crayon dials dplyr ggplot2 infer magrittr parsnip pillar purrr recipes rlang rsample rstudioapi tibble tidyposterior tidypredict tidytext tune workflows yardstick]; }; tidymv = derive2 { name="tidymv"; version="2.2.0"; sha256="0g550b0frgk4wy3sicsqqinffrlbqzghhcnvh3snci6xd7j37hmm"; depends=[dplyr ggplot2 itsadug magrittr mgcv rlang tibble tidyr]; }; tidync = derive2 { name="tidync"; version="0.2.3"; sha256="1wjw3fmyj8f95f94zai58h8b6h0vqqlrw4c629jjgg8ayy7aay9p"; depends=[dplyr forcats magrittr ncdf4 ncmeta purrr rlang RNetCDF tibble tidyr]; }; @@ -14679,8 +14696,9 @@ in with self; { 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]; }; tidytable = derive2 { name="tidytable"; version="0.4.0"; sha256="16svngicns9xwkp1i16c1sd34p1w4np3nfd71pbz1b9w69pzc077"; depends=[data_table magrittr rlang]; }; - tidytext = derive2 { name="tidytext"; version="0.2.3"; sha256="12q6f7z3lzjgzmz5scp5jx89r2xkbvm20dc99kma9ddvbj7zj0y1"; depends=[dplyr generics hunspell janeaustenr Matrix purrr rlang stopwords stringr tokenizers]; }; - tidytidbits = derive2 { name="tidytidbits"; version="0.2.1"; sha256="1hyqk8p4w1mjk9f497f2lh8hlic6fs37jnawqpfmrl39ylx4z6r7"; depends=[dplyr extrafont forcats magrittr purrr rlang stringr tibble tidyr tidyselect]; }; + tidytext = derive2 { name="tidytext"; version="0.2.4"; sha256="0gck3f039qkpkwn92jlyfan76w0xydg17bh6nsg9qlba7c35kzs6"; depends=[dplyr generics hunspell janeaustenr Matrix purrr rlang stopwords stringr tokenizers]; }; + tidytidbits = derive2 { name="tidytidbits"; version="0.2.2"; sha256="1wy1bnfz7jkp357a2d916dmiw36jdqfnkvdg1fa19w8r7zzgrz7d"; depends=[dplyr extrafont forcats magrittr purrr rlang stringr tibble tidyr tidyselect]; }; + tidytransit = derive2 { name="tidytransit"; version="0.7.1"; sha256="1n1m67yvlk6fnls5hah43ycvwqvw3c4v6xhmmx06zr92r3lr7xql"; depends=[assertthat data_table digest dplyr hms httr lubridate readr rlang sf tibble tidyr zip]; }; tidytree = derive2 { name="tidytree"; version="0.3.3"; sha256="05b53dap0f784kl6s1wgck6m7brwmy6ifqp7v5l06s1spfspagl6"; depends=[ape dplyr lazyeval magrittr rlang tibble]; }; tidyverse = derive2 { name="tidyverse"; version="1.3.0"; sha256="02gyys08qv2v4cl2d66gml4d31ipxay0iyfwwksvxyclx60wp2kd"; depends=[broom cli crayon dbplyr dplyr forcats ggplot2 haven hms httr jsonlite lubridate magrittr modelr pillar purrr readr readxl reprex rlang rstudioapi rvest stringr tibble tidyr xml2]; }; tidyvpc = derive2 { name="tidyvpc"; version="1.0.0"; sha256="1f5ca0cbb3fwsdmb4zvgf8aglajmvks9jqidnx28ppy5w9qv1skc"; depends=[data_table magrittr quantreg rlang]; }; @@ -14713,7 +14731,7 @@ in with self; { timereg = derive2 { name="timereg"; version="1.9.4"; sha256="0jxm3h2sjc83klxdry5r1wgliadk6967cmiifycfpz282vpfxx7v"; depends=[lava numDeriv survival]; }; timesboot = derive2 { name="timesboot"; version="1.0"; sha256="1ixmcigi1bf42np93md8d3w464papg9hp85v0c3hg3vl4nsm2bji"; depends=[boot]; }; timeseriesdb = derive2 { name="timeseriesdb"; version="0.4.1"; sha256="1ghb3lg63fs9zx34l5qczv39mdccnmqzlc74l1zhb8qmsg8sm1g2"; depends=[data_table DBI jsonlite openxlsx RPostgreSQL shiny xtable xts zoo]; }; - timetk = derive2 { name="timetk"; version="0.1.3"; sha256="0p9vprknxwh5w3119dwvzl3hvckf4s3kag7gf3cyj685yv0m355c"; depends=[dplyr lazyeval lubridate padr purrr readr recipes rlang stringi tibble tidyr xts zoo]; }; + timetk = derive2 { name="timetk"; version="1.0.0"; sha256="1q8832jhzr5kan1mz1khdaw9p0yd5rii8lnibb02b3zgl2nmn8pk"; depends=[assertthat broom dplyr forcats forecast ggplot2 hms lazyeval lubridate padr plotly purrr readr recipes rlang rsample slider stringi stringr tibble tidyr timeDate xts zoo]; }; timetools = derive2 { name="timetools"; version="1.14"; sha256="13jchgd9fc8hxj74wm1kg4rwcng4yxblkq04i33djsqghgb5f9mj"; depends=[]; }; timetree = derive2 { name="timetree"; version="1.0"; sha256="1fpdp6mkwm67svqvkfflvqxn52y2041zl09rxrms28ybbd5f84c0"; depends=[phangorn XML]; }; timevis = derive2 { name="timevis"; version="0.5"; sha256="1psmnl6pkbizi2kjpaz9w32z2dkxlh4r229mfxsfqnjvf9sc34kj"; depends=[htmltools htmlwidgets jsonlite lubridate magrittr rmarkdown shiny]; }; @@ -14721,9 +14739,10 @@ in with self; { 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.2"; sha256="0afqlyi6d72x30pzzvmznz1l5pq4n30qiqa9ncbf0wjvqji7a182"; depends=[htmltools knitr rmarkdown]; }; + tinter = derive2 { name="tinter"; version="0.1.0"; sha256="02hfw2720qn70x0piahm8cy2ajsb5bqapr4vyvknm4v1yka1wmw3"; depends=[chk]; }; tinyProject = derive2 { name="tinyProject"; version="0.6.1"; sha256="0cflnfp5mib3j1y3n5yvi867h5a7z6xr6163gq9y9b6nrl2skxfk"; depends=[brew R_utils]; }; tinytest = derive2 { name="tinytest"; version="1.1.0"; sha256="1y3f0x56xagf9m5wr2b26qahww13p8i2s66yr51xy9pqxdyjh2yl"; depends=[]; }; - tinytex = derive2 { name="tinytex"; version="0.21"; sha256="088zzc2v0izbcs45p19v547pi78vkr08ibpvvi1g9bkbya4x3mq9"; depends=[xfun]; }; + tinytex = derive2 { name="tinytex"; version="0.22"; sha256="0s9f62v3ps5f8903ar6kxlf1z3b4v78vlw1nb05bq55dgj8brg3b"; 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]; }; @@ -14734,7 +14753,7 @@ in with self; { titeIR = derive2 { name="titeIR"; version="0.1.0"; sha256="047vidn3zydbjijwgz6qm2d9j2ny8ng2sv5jzm8zb300y7k2426c"; depends=[Iso]; }; titrationCurves = derive2 { name="titrationCurves"; version="0.1.0"; sha256="0z127sihd262mdik46sq9vcf05s7jsqmkpm3p4d779viw74bl768"; depends=[]; }; tkRplotR = derive2 { name="tkRplotR"; version="0.1.2"; sha256="146jqjnbxqsph804ysd2jrcmm5qvqa7yi4f41sq0myjlkqvd6ndk"; depends=[]; }; - tkrgl = derive2 { name="tkrgl"; version="0.8"; sha256="1c5jiahqpf3nfybkzmks785dlkchjdisvknxkb0biv3xj9nzgz14"; depends=[rgl]; }; + tkrgl = derive2 { name="tkrgl"; version="0.9"; sha256="00767mxsaqkp7wsazznx6pr9dw75xmnijjqncbpavqf67g0cjinp"; depends=[rgl]; }; tkrplot = derive2 { name="tkrplot"; version="0.0-24"; sha256="04gk48vm8ilj1n3b3ir66pcfv504ra4rlgc0ll4ixbnp6w566wr8"; depends=[]; }; tlemix = derive2 { name="tlemix"; version="0.1.3"; sha256="0c4mvdxlhbmyxj070xyipx4c27hwxlb3c5ps65ipm6gi8v8r6spj"; depends=[]; }; tlm = derive2 { name="tlm"; version="0.1.5"; sha256="1iw08pa70nb25fnv64834s5c8vl456a2rcng7x6v9vs5q37610g6"; depends=[boot]; }; @@ -14750,7 +14769,7 @@ in with self; { tm_plugin_mail = derive2 { name="tm.plugin.mail"; version="0.2-1"; sha256="0rn8jqv622qmc0zkz534ka5qnbca2rlabxm3vjbqplr6fh1ahwb1"; depends=[NLP tm]; }; tm_plugin_webmining = derive2 { name="tm.plugin.webmining"; version="1.3"; sha256="1694jidf01ilyk286q43bjchh1gg2fk33a2cwsf5jxv7jky3gl7h"; depends=[boilerpipeR NLP RCurl RJSONIO tm XML]; }; tm1r = derive2 { name="tm1r"; version="1.1.4"; sha256="165yn07nxywyxdd52g917rmzqyjpv6ai11fhl9g6dj163l4vcn5a"; depends=[httr jsonlite]; }; - tmap = derive2 { name="tmap"; version="2.3-2"; sha256="01v4z73xpxpg87daka2vcy1gj170qjg7qdl44vrfjrxib46cn2fa"; depends=[classInt htmltools htmlwidgets leaflet leafsync lwgeom raster RColorBrewer sf tmaptools units viridisLite]; }; + tmap = derive2 { name="tmap"; version="3.0"; sha256="0xd8kdrn1hvc9r73rjg6cjrvyprqkkriqf2fxnr8mkxv31zmmcg3"; depends=[classInt htmltools htmlwidgets leafem leaflet leafsync RColorBrewer sf stars tmaptools units viridisLite]; }; tmaptools = derive2 { name="tmaptools"; version="3.0"; sha256="0d36rv9275m32rqx259azqg55f1vpjihydhhic2bh4sjwxrbp58i"; depends=[classInt dichromat KernSmooth lwgeom magrittr raster RColorBrewer sf stars units viridisLite XML]; }; tmbstan = derive2 { name="tmbstan"; version="1.0.2"; sha256="1g4b415k36wij028xz15kwpv8hmx92kznsp231bnrprzw2vrninr"; depends=[BH Rcpp RcppEigen rstan StanHeaders TMB]; }; tmcn = derive2 { name="tmcn"; version="0.2-13"; sha256="0rf8mz6kdm83pm85kzfyzb8kd3iwaxv5bgphjpxlnq6z32m9yds7"; depends=[]; }; @@ -14770,12 +14789,11 @@ in with self; { tokenbrowser = derive2 { name="tokenbrowser"; version="0.1.4"; sha256="09bhwqqw2nr5c985ml8d6ik19r8jvxcj1l7v4xhb3y6n9k6dqxwr"; depends=[Rcpp stringi]; }; tokenizers = derive2 { name="tokenizers"; version="0.2.1"; sha256="006xf1vdrmp9skhpss9ldhmk4cwqk512cjp1pxm2gxfybpf7qq98"; depends=[Rcpp SnowballC stringi]; }; tokenizers_bpe = derive2 { name="tokenizers.bpe"; version="0.1.0"; sha256="1pwgjrzdcsafpv9rlyly6fckcjiymz0xcjm9byavj069kc4c69mi"; depends=[Rcpp]; }; - tolBasis = derive2 { name="tolBasis"; version="1.0"; sha256="0g4jdwklx92dffrz38kpm1sjzmvhdqzv6mj6hslsjii6sawiyibh"; depends=[lubridate polynom]; }; tolerance = derive2 { name="tolerance"; version="2.0.0"; sha256="001snzr2ipag3zprynydlbi9prkjzrllc054qh7m0qwkb3r19jjd"; depends=[MASS rgl]; }; toolmaRk = derive2 { name="toolmaRk"; version="0.0.1"; sha256="0pdr8lq4c11ia03v68lbfq38p3qp770mbj0nsbjsgbqi0pv9i1vx"; depends=[dplyr ggplot2 plyr reshape2]; }; tools4uplift = derive2 { name="tools4uplift"; version="0.1-1"; sha256="0difrjqgj8amc49mwh059ca9mr0z1fzy0g43vk43alsyl8lvajc4"; depends=[dplyr glmnet]; }; topicdoc = derive2 { name="topicdoc"; version="0.1.0"; sha256="0qliy6y8l09nblch1swlywam2awzwjl5xx0w8c3kiz48jxfysw0j"; depends=[slam topicmodels]; }; - topicmodels = derive2 { name="topicmodels"; version="0.2-9"; sha256="1757r5x8bsl4dk106xg6481mvdkdz9vwg87n7rpbvdkavsvhyxs0"; depends=[modeltools slam tm]; }; + topicmodels = derive2 { name="topicmodels"; version="0.2-11"; sha256="0jmp6wva99y0w40cfw7b0faylndhjam097x36ilc4vmyczcv89lw"; depends=[modeltools slam tm]; }; topmodel = derive2 { name="topmodel"; version="0.7.3"; sha256="15w9id90d6l0i0ji3ln3sxnpispb6pgabk4waysqn0nh6y4lfdgb"; depends=[]; }; topoDistance = derive2 { name="topoDistance"; version="1.0.1"; sha256="055z3gvqlb8nyy58ix89w7miav9gj3h43a4wcfc3kagd97xc3222"; depends=[gdistance igraph plotly raster RColorBrewer scales sp]; }; topologyGSA = derive2 { name="topologyGSA"; version="1.4.6"; sha256="0vas7qab5a86jb277ql63qjvfvx7iqqbcrwky7iyr0s8p8p794ia"; depends=[fields graph gRbase qpgraph]; }; @@ -14813,7 +14831,7 @@ in with self; { trajectories = derive2 { name="trajectories"; version="0.2-1"; sha256="0sw1gcwmz2d27ck8gm5xa9bmmpgpy483brdyi74wccchwb3nfw2m"; depends=[lattice sp spacetime zoo]; }; trajr = derive2 { name="trajr"; version="1.3.0"; sha256="1p092kqvwg3ncbk9hh8dij2grl1hfs3j5j64cqn227nr5b3xn1rc"; depends=[plotrix signal]; }; tram = derive2 { name="tram"; version="0.3-2"; sha256="043j8f2vhbm4alr47bv0ghv4358ckvd74hnlq8516b6is3ll1h72"; depends=[basefun Formula Matrix mlt multcomp sandwich survival variables]; }; - tramME = derive2 { name="tramME"; version="0.0.1"; sha256="1xsh6cm79bzxi2pw3ba5iwdr9077nssz485rpi5x451855pvbjll"; depends=[alabama basefun lme4 Matrix mlt nlme RcppEigen TMB tram variables]; }; + tramME = derive2 { name="tramME"; version="0.0.2"; sha256="1khzxjk1wp3gbhjxjlq07rmqr1rydjdbkl03fd6ld1dh1knl4bwp"; depends=[alabama basefun lme4 Matrix mlt nlme RcppEigen TMB tram variables]; }; tramnet = derive2 { name="tramnet"; version="0.0-2"; sha256="0q57cs9y0ssks7c9bbnhkvndl1yz6bsrpmcmml1nlvq2gs9rv9wg"; depends=[basefun CVXR lhs mlr mlrMBO mlt ParamHelpers sandwich smoof tram]; }; tranSurv = derive2 { name="tranSurv"; version="1.2.0"; sha256="0r698s2yg7ypyzid52a46p0bhl3xi4rh50bfnx0pacc65rigjr6f"; depends=[SQUAREM survival]; }; transcribeR = derive2 { name="transcribeR"; version="0.0.0"; sha256="0y2kxg2da71i962fhsjxsr2ic3b31fmffhj3gg97b0nykfpcviib"; depends=[httr]; }; @@ -14821,6 +14839,7 @@ in with self; { translate = derive2 { name="translate"; version="0.1.2"; sha256="1w0xrg1xxwfdanlammmixf06hwq700ssbjlc3cfigl50p87dbc5x"; depends=[functional lisp RCurl RJSONIO]; }; translateR = derive2 { name="translateR"; version="1.0"; sha256="11kh9hjpsj5rfmzybnh345n1gzb0pdksrjp04nzlv948yc0mg5gm"; depends=[httr RCurl RJSONIO textcat]; }; translation_ko = derive2 { name="translation.ko"; version="0.0.1.5.2"; sha256="1w5xibg4znhd39f3i0vsqckp6iia43nblqxnzgj0ny6s7zmdq1wd"; depends=[]; }; + transmem = derive2 { name="transmem"; version="0.1.0"; sha256="1rx83cwx8mg2iyqqq2bb4yp8bpa6n6pxm6af7jkyp1gafnv7dvci"; depends=[cmna ggformula ggplot2 plot3D]; }; transplantr = derive2 { name="transplantr"; version="0.2.0"; sha256="1kzi8rvswsmibxqnhqd1j42y848si6cxd8hpvwi55y8s4hcylw0y"; depends=[]; }; transport = derive2 { name="transport"; version="0.12-2"; sha256="1d49gm5lwih7b7rav3c42brcp6xi3y55xw11r9n8illjwjayfcxd"; depends=[data_table Rcpp RcppEigen]; }; trapezoid = derive2 { name="trapezoid"; version="2.0-0"; sha256="0f6rwmnn61bj97xxdgbydi94jizv1dbq0qycl60jb4dsxvif8l3n"; depends=[]; }; @@ -14875,7 +14894,7 @@ in with self; { tropicalSparse = derive2 { name="tropicalSparse"; version="0.1.0"; sha256="1ay6i3pzz5lpvznxqln31mijp86p6z0df7rvp0gm4lxvn294m7f8"; depends=[]; }; trotter = derive2 { name="trotter"; version="0.6"; sha256="0i8r2f2klkkfnjm7jhvga3gx6m7r97pd73d88004jzlm9ficspgy"; depends=[]; }; trread = derive2 { name="trread"; version="0.2.7"; sha256="158mwnwkmwjvir8caz42jqc599xn9qkqx6bsi76m8l6szf09s0sl"; depends=[assertthat data_table dplyr here hms htmltools httr lubridate magrittr readr rlang scales stringr tibble tidyr zip]; }; - trtf = derive2 { name="trtf"; version="0.3-6"; sha256="1h90d3bpfq3nr2c44lynan1scz650nbzjry5i687wxa1c348lvb6"; depends=[Formula libcoin mlt partykit sandwich variables]; }; + trtf = derive2 { name="trtf"; version="0.3-7"; sha256="11fq119x59adls2r0af2p19zwbk5ykn5brdzqbqxy8ngmpncmzxr"; depends=[Formula libcoin mlt partykit sandwich variables]; }; truelies = derive2 { name="truelies"; version="0.2.0"; sha256="1qxzw7x7xgp9x6klnq6jv0fl8al2l24br2sd59r5gq076gkqc47k"; depends=[hdrcde]; }; trueskill = derive2 { name="trueskill"; version="0.1"; sha256="0mqvm64fcsxjlh789lqdk6l28q31yhh6jjirwjlgbpxxb90c5107"; depends=[]; }; truncSP = derive2 { name="truncSP"; version="1.2.2"; sha256="1hdi518j3sg9273g01l1jqlmqya3ppim82ma7zakwqpmsjmzw18q"; depends=[boot truncreg]; }; @@ -14953,7 +14972,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.1"; sha256="056a241m3c1jhf8idly1bm4xja349cg5yzz19l45zyggml82snin"; depends=[Matrix Rcpp RcppArmadillo Rdpack]; }; - tvReg = derive2 { name="tvReg"; version="0.5.0"; sha256="17vbhny5dr62nwv30s15frdcdhcwk0hq7lwi3prpzyhl02bjhdyg"; depends=[bvarsv MASS Matrix plm systemfit vars]; }; + tvReg = derive2 { name="tvReg"; version="0.5.1"; sha256="18jif10pm1lsc9dwrb81cd55n6c6hdbhp01bk7q511lkzdx403hc"; depends=[bvarsv MASS Matrix plm systemfit vars]; }; tvd = derive2 { name="tvd"; version="0.1.0"; sha256="07al7gpm81a16q5nppsyc5rhv6zzkcvw72isx955b1q189v073aw"; depends=[Rcpp]; }; tvgeom = derive2 { name="tvgeom"; version="1.0.1"; sha256="1lr2vqgj5jfhzavwd43wcchhbicmf4dqjvyf66rvnjkw3jaig8dm"; depends=[]; }; tvm = derive2 { name="tvm"; version="0.4.0"; sha256="0v5b9s35q08a4z2ccph7g9q211w04x99sh72lrfby43fgl2jwyd1"; depends=[ggplot2 reshape2]; }; @@ -14993,8 +15012,8 @@ in with self; { ukbabynames = derive2 { name="ukbabynames"; version="0.1.1"; sha256="0vrwcf3hixd40ag6kb289anq2ys2k6vdhhsrjbizvndkyn8sr0r0"; depends=[]; }; ukbtools = derive2 { name="ukbtools"; version="0.11.3"; sha256="1j5p9ypn3s781582all64kvywih1ry0lqsh1zirr35g7r46fy783"; depends=[data_table doParallel dplyr foreach ggplot2 magrittr purrr readr scales stringr tibble tidyr XML]; }; ukgasapi = derive2 { name="ukgasapi"; version="0.17"; sha256="1jly1bzisvvx8pcsw0fb35xxvjgq7ydpxianf3dbxa88msdjr02d"; depends=[RCurl XML]; }; - uklr = derive2 { name="uklr"; version="1.0.0"; sha256="1c1r7d76rjh9ki2fwhv8chmhc2j5kzv3d9lv7qvr1cxyfsbxrsfb"; depends=[httr jsonlite tibble]; }; - ukpolice = derive2 { name="ukpolice"; version="0.1.2"; sha256="0jwc57360cr9fkqzs5j2jmnfagci86jzi6p5d5mpm35drsrzm1ca"; depends=[jsonlite purrr tibble]; }; + uklr = derive2 { name="uklr"; version="1.0.1"; sha256="0pr0qyf8zr8z1hzv8wziw9wddajja5dggs9cc9dw91v0kq5g5ris"; depends=[curl httr jsonlite tibble]; }; + ukpolice = derive2 { name="ukpolice"; version="0.1.4"; sha256="1ffrdl39fi5h68r1wm54q2y883ygz5lybd3jpmyd959zsj452559"; depends=[jsonlite purrr tibble]; }; ulid = derive2 { name="ulid"; version="0.3.0"; sha256="0xxkqrnlz3pkb3s1gacfzqav54w97gc0w8rh0fn1qy5rkmg2bplv"; depends=[Rcpp]; }; umap = derive2 { name="umap"; version="0.2.5.0"; sha256="0qp8zbh6fn8kn6q2h2lyjgmq3pr6gqwsd8ymqx25px13zjhxch9d"; depends=[openssl Rcpp reticulate RSpectra]; }; ump = derive2 { name="ump"; version="0.5-8"; sha256="1sg226caq9y41cwl7wr5s9z3bpq2j5p6rj6fy2pasbzimgzw0byx"; depends=[]; }; @@ -15037,7 +15056,6 @@ in with self; { updog = derive2 { name="updog"; version="1.2.0"; sha256="0q55h4rgr0hqn2fkcnd0pwmrawzcjmffvysps1cr061jd5yrzla4"; depends=[assertthat doParallel foreach ggplot2 ggthemes Rcpp RcppArmadillo reshape2 stringr]; }; uplift = derive2 { name="uplift"; version="0.3.5"; sha256="11xikfmg6dg8mhwqq6wq9j9aw4ljh84vywpm9v0fk8r5a1wyy2f6"; depends=[coin MASS penalized RItools tables]; }; uplifteval = derive2 { name="uplifteval"; version="0.1.0"; sha256="1gnn40c47rpx40j210bz6fb48d70p6spv3drr8hd5b3vzfz6686c"; depends=[dplyr ggplot2 gridExtra whisker]; }; - upmfit = derive2 { name="upmfit"; version="0.1.0"; sha256="0f0rk606v17abgw3mwlwihl6fsxprp44h2xbhv1675i18i36vbgx"; depends=[mcmcplots R2jags]; }; uptasticsearch = derive2 { name="uptasticsearch"; version="0.4.0"; sha256="19sf3zdj424pz4ms0xg4asplf2bczvhl8p22y13jna1g51xyv92a"; depends=[assertthat data_table futile_logger httr jsonlite purrr stringr uuid]; }; uptimeRobot = derive2 { name="uptimeRobot"; version="1.0.0"; sha256="1sbr0vs6jqcyxjbs7q45bsfdnp3bc59phw0h3fwajqq1cxjgzdww"; depends=[plyr RCurl rjson]; }; uqr = derive2 { name="uqr"; version="1.0.0"; sha256="0f7isjfb5almp1zypxzw3lfkygkcixmg0xdsw0zznf61r6qhbqyr"; depends=[gtools Hmisc]; }; @@ -15051,11 +15069,11 @@ in with self; { usdm = derive2 { name="usdm"; version="1.1-18"; sha256="1sis47fri2lrbx2ll5ps7bvycjqhncnia800izf11szgayim5lrv"; depends=[raster sp]; }; usedist = derive2 { name="usedist"; version="0.4.0"; sha256="0ddf1zcalbrn293qmr9kdzz3x16fzc4k1bwb1pjmwnspisqfi8kj"; depends=[]; }; useful = derive2 { name="useful"; version="1.2.6"; sha256="0n50v1q75k518sq23id14jphwla35q4sasahrnrnllwrachl67v1"; depends=[assertthat dplyr ggplot2 magrittr Matrix plyr purrr scales]; }; - usefun = derive2 { name="usefun"; version="0.4.3"; sha256="0vsz7kmkqfffw2jh33ag6h22qclxblf04aw82ss66j8xpxmkqhs6"; depends=[]; }; + usefun = derive2 { name="usefun"; version="0.4.5"; sha256="11cvsx5rip4r7mcv3n711vylh0lzh3d6lnlcdjvfsg1sa1dbspp8"; depends=[dplyr]; }; userfriendlyscience = derive2 { name="userfriendlyscience"; version="0.7.2"; sha256="17arxxha8qr876nrf9szpymgamxlvacj3lfbmpiv973kyi3hr7m4"; depends=[BiasedUrn car data_tree DiagrammeR digest diptest GGally ggplot2 ggrepel ggridges GPArotation gridExtra gtable knitr lavaan lme4 MASS MBESS minpack_lm pander plyr psych pwr RColorBrewer rio scales SCRT SuppDists ufs viridis XML xtable]; }; - usethis = derive2 { name="usethis"; version="1.5.1"; sha256="07an5wbikilg7cb3q6x5aykw8dfqnjrc3wpfb7gjmy0d9fh20fcy"; depends=[clipr clisymbols crayon curl desc fs gh git2r glue purrr rlang rprojroot rstudioapi whisker withr yaml]; }; + usethis = derive2 { name="usethis"; version="1.6.0"; sha256="12iyimqyza752anj29wpfisl8nz5r25kfcqbssybg24nb4wyy146"; depends=[cli clipr crayon curl desc fs gh git2r glue purrr rematch2 rlang rprojroot rstudioapi whisker withr yaml]; }; usfertilizer = derive2 { name="usfertilizer"; version="0.1.5"; sha256="05zjn39hqjjzzp4v4b1zbqq59205s7k0kikms951h57kbyvjz6vk"; depends=[tidyverse]; }; - ushr = derive2 { name="ushr"; version="0.2.2"; sha256="04j4hfwsk8idrl7c3lfcd1v7s8xxf2l0rlf2aixszsdbcfr9173n"; depends=[dplyr ggplot2 tidyr]; }; + ushr = derive2 { name="ushr"; version="0.2.3"; sha256="1ygyqgxw849165lpk81f114kgx9015b9a9dngavjy3ffqzrbb41k"; depends=[dplyr ggplot2 tidyr]; }; uskewFactors = derive2 { name="uskewFactors"; version="2.0"; sha256="0ndi5987ak8sa7krgiglsibfg0k7z9j8fg47hg1m8ar0sq4r1yj6"; depends=[MASS MCMCpack mvtnorm tmvtnorm]; }; usl = derive2 { name="usl"; version="3.0.0"; sha256="1ahry485kpzfc0pzi4zm039d5mpv1jycmhdpn0n0zn0drcrlhw0g"; depends=[nlsr]; }; usmap = derive2 { name="usmap"; version="0.5.0"; sha256="0fjmmw8xhba31gv8mx9k55881yb94z518csbqas3bvssq5s7048f"; depends=[]; }; @@ -15113,7 +15131,7 @@ in with self; { varrank = derive2 { name="varrank"; version="0.3"; sha256="0k7hz61ymxf7w2hh1v2yfb6qdjn68a8ckjfiw0jqqhjx4wh5crn7"; depends=[FNN]; }; vars = derive2 { name="vars"; version="1.5-3"; sha256="0zc6v827ll19n088n31afgjf65zqwvyzmmj4q3ab1xhqzxfsgbw6"; depends=[lmtest MASS sandwich strucchange urca]; }; varsExplore = derive2 { name="varsExplore"; version="0.1.0"; sha256="1sscz565i288nmk7sv03kj2xysfppvil4nl2lxxbvp3y4mrkz09b"; depends=[dplyr DT glue magrittr purrr rio rstudioapi stringr tidyr]; }; - varycoef = derive2 { name="varycoef"; version="0.2.10"; sha256="1gdny45zn1s492sx85aa8z86yfh2fwl9krq5kmmgxgmwy5gz0rjz"; depends=[fields optimParallel RandomFields sp spam]; }; + varycoef = derive2 { name="varycoef"; version="0.2.11"; sha256="13ccgc5dyac8224kpl5f1n6yw77m2f32amcr0h2c0z74sjwcxn54"; depends=[fields optimParallel RandomFields sp spam]; }; vaultr = derive2 { name="vaultr"; version="1.0.2"; sha256="1b7g0jplp5dw1img7d6wm75gaycb3z8a8mzc6s0iwvhbfl8vf574"; depends=[getPass httr jsonlite R6]; }; vbdm = derive2 { name="vbdm"; version="0.0.4"; sha256="1rbff0whhbfcf6q5wpr3ws1n4n2kcr79yifcni12vxg69a3v6dd3"; depends=[]; }; vbsr = derive2 { name="vbsr"; version="0.0.5"; sha256="1avskbxxyinjjdga4rnghcfvd4sypv4m39ysfaij5avvmi89bx3b"; depends=[]; }; @@ -15157,11 +15175,11 @@ in with self; { vfprogression = derive2 { name="vfprogression"; version="0.7.1"; sha256="0kgw1jx0rl9v8qy8qg7zjzdgvwqdi7k1lsvsx3lnpw4sfpkzsq23"; depends=[]; }; vhcub = derive2 { name="vhcub"; version="1.0.0"; sha256="04a8hdm4pxl8fzwy9q2wqc9q0dl5r49xwbid70yj9qlflh683id0"; depends=[Biostrings coRdon ggplot2 seqinr stringr]; }; vhica = derive2 { name="vhica"; version="0.2.7"; sha256="0zz4sffhrvh9raxygxma5a2jijq8nw8wqg8bc486sd2ahlv8g3s8"; depends=[]; }; - viafr = derive2 { name="viafr"; version="0.1.0"; sha256="14y5k1vskfzxfpzjkk9602p8mvvyfrf3qpr517zdb714wv3gwk3h"; depends=[assertthat crul dplyr jsonlite magrittr purrr rlang stringr tibble tidyr utf8]; }; + viafr = derive2 { name="viafr"; version="0.2.0"; sha256="08hvylrv4c8p5vazalagbkv3vhqmr9halbxkf05kfn74ssw8lljz"; depends=[assertthat crul dplyr jsonlite magrittr purrr rlang stringr tibble tidyr utf8]; }; vici = derive2 { name="vici"; version="0.5.2"; sha256="0qad8ab04ndd29kcmd388piiymablfc7xlv6iml4sxkid7z5kgby"; depends=[cowplot DT ggplot2 ggpubr nlme shiny tidyr]; }; vietnamcode = derive2 { name="vietnamcode"; version="0.1.1"; sha256="0vc0c1fg30afar2dkch5h27b8jbglcd9ja6d5hcypnibqz4c68vz"; depends=[]; }; viewshed3d = derive2 { name="viewshed3d"; version="3.0.0"; sha256="0yx271xx4nfxjlvrg0c5x77n6zcahmj9kvz6qpzdg3ysg4ydyika"; depends=[data_table lidR nabor pracma raster rgl sp TreeLS viridis]; }; - vimp = derive2 { name="vimp"; version="1.1.6"; sha256="1jczlg8sa62f9skn32gbc094lbm41w5hp65w1k1imqxcvb43n8ql"; depends=[SuperLearner]; }; + vimp = derive2 { name="vimp"; version="2.0.1"; sha256="0bwc4rdzdqvmhshk4l8d9x76fvd5f7g2jja182lsiz28v1jh8ga3"; depends=[dplyr magrittr rlang ROCR SuperLearner tibble]; }; vinereg = derive2 { name="vinereg"; version="0.7.0"; sha256="1fviqzs879n7rin3b0jks8dfvcxiay8jssqy7salslghpj7rkm84"; depends=[assertthat BH kde1d Rcpp RcppEigen RcppThread rvinecopulib wdm]; }; vines = derive2 { name="vines"; version="1.1.5"; sha256="057d2fdh03cq9kh4vz94arqscahmz14xbr2g59l0vn205lnyilf1"; depends=[ADGofTest copula cubature TSP]; }; violinmplot = derive2 { name="violinmplot"; version="0.2.1"; sha256="1j3hb03y988xa704kp25v1z1pmpxw5k1502zfqjaf8cy4lr3kzsc"; depends=[lattice]; }; @@ -15182,7 +15200,7 @@ in with self; { visdat = derive2 { name="visdat"; version="0.5.3"; sha256="1ikqp29nncbw1xlwyb9dqqgcdk9q0bs3wxhnhnjpb11vcjv7cz2j"; depends=[dplyr ggplot2 glue magrittr purrr readr tibble tidyr]; }; visit = derive2 { name="visit"; version="2.1"; sha256="0kkspih7m18g5pqlwrxpgjdwqxpp23c3xyvcnvv247abl9aq81rd"; depends=[BH Rcpp RcppEigen rstan sqldf StanHeaders]; }; visreg = derive2 { name="visreg"; version="2.6.1"; sha256="01k44nxxilz7yrw5rihsg4r49yqjmz4zxmafcq89zbygap1d68ay"; depends=[lattice]; }; - vistime = derive2 { name="vistime"; version="0.9.0"; sha256="1apyjapxqm05mlr4bx7s2x5v9ji8z8jb3spkrwcs0fibd6bq1dbb"; depends=[assertive plotly RColorBrewer]; }; + vistime = derive2 { name="vistime"; version="1.0.0"; sha256="0114qgfq5ns02sgxh81cf68jx7pk74na9g10f23d6lm8jxcwdsrz"; depends=[assertive ggplot2 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]; }; visualize = derive2 { name="visualize"; version="4.4.0"; sha256="1k3jpvj1yysxc4g1a1w3m1y91104aqxqv8jh9qdd23gwy7a29525"; depends=[]; }; @@ -15199,7 +15217,7 @@ in with self; { volesti = derive2 { name="volesti"; version="1.0.3"; sha256="099c49dy9iqrvmrmcm6h8af4q50q6b0ymnkk0s2bzaqczbpkwibj"; depends=[BH Rcpp RcppEigen]; }; volleystat = derive2 { name="volleystat"; version="0.2.0"; sha256="0n1r0bvvmba21cs3qgpnw9jxpgl2n82fhxa40sa1w2gav5rch5i6"; depends=[]; }; voronoiTreemap = derive2 { name="voronoiTreemap"; version="0.2.0"; sha256="1wvnqdrvba4ss4f3k8gzb720irdq2brv2aaq16ywifv8fnjf02r3"; depends=[data_tree DT htmlwidgets rlang shiny shinyjs]; }; - vortexR = derive2 { name="vortexR"; version="1.1.6"; sha256="113ndhf2f3hlhmgbg6gh5fq1az6d314fwl872dwypj2zsvfm7x03"; depends=[betareg data_table GGally ggplot2 glmulti gtools irr plyr R_utils stringr vortexRdata]; }; + vortexR = derive2 { name="vortexR"; version="1.1.7"; sha256="06i2rqbc3h2kv8jjrdlrg03xrzb3yiyzpnv2rvlkjcnn46f84bgf"; depends=[betareg data_table GGally ggplot2 glmulti gtools irr plyr R_utils stringr vortexRdata]; }; vortexRdata = derive2 { name="vortexRdata"; version="1.0.5"; sha256="0b47q3aslz4110a1bfaa103i098y2ngzrjh01rwasq3gd6xbif9n"; depends=[]; }; vosonSML = derive2 { name="vosonSML"; version="0.29.4"; sha256="0ngipwg83xw832ikaaqbyh2zxkwwwxalp6xrb60dk96z2r7qgj2r"; depends=[data_table dplyr Hmisc httpuv httr igraph magrittr purrr RCurl RedditExtractoR rlang rtweet stringr textutils tibble tictoc tm]; }; vote = derive2 { name="vote"; version="1.2-1"; sha256="14bqmamndq5l7mfij8kfzk2lyrn0b52jgafgy9qb93qvk1fr5raz"; depends=[formattable knitr]; }; @@ -15239,6 +15257,7 @@ in with self; { wahc = derive2 { name="wahc"; version="1.0"; sha256="1324xhajgmxq6dxzpnkcvxdpm2m3g47drhyb2b3h227cn3aakxyg"; depends=[]; }; waiter = derive2 { name="waiter"; version="0.1.0"; sha256="13csg6iy6fzr5fkz3wvmj1fvi0csijbgmvz262jnrq1c75srirmb"; depends=[magrittr R6 shiny]; }; wakefield = derive2 { name="wakefield"; version="0.3.3"; sha256="05z9a6g1cdavalp50wss7klnlcdbv3y1jvz1v8ry1x2bziy216y2"; depends=[chron dplyr ggplot2 stringi]; }; + waldo = derive2 { name="waldo"; version="0.1.0"; sha256="12405hc65mhwg69fp6m4g96zn8imx2jb9vl1pv6im0wmrqff3ay6"; depends=[cli diffobj fansi glue rematch2 rlang tibble]; }; walker = derive2 { name="walker"; version="0.3.1-1"; sha256="135x32ar8m4m4zxdz94c7wrddsb0ps58nywh2k2gh3kqjbbzxx7a"; depends=[bayesplot BH dplyr ggplot2 KFAS Rcpp RcppArmadillo RcppEigen rstan StanHeaders]; }; walkscoreAPI = derive2 { name="walkscoreAPI"; version="1.2"; sha256="1c2gfkl5yl3mkviah8s8zjnqk6lnzma1yilxgfxckdh5wywi39fx"; depends=[]; }; wallace = derive2 { name="wallace"; version="1.0.6.2"; sha256="0qhy1m9imwqmb6lzgx25xqqyrlja13g4l96c6q9mn008kmljpn0n"; depends=[dismo dplyr DT ENMeval leaflet leaflet_extras magrittr maptools raster RColorBrewer rgdal rgeos rmarkdown shiny shinyjs shinythemes spocc spThin testthat XML zip]; }; @@ -15272,8 +15291,8 @@ in with self; { wbsts = derive2 { name="wbsts"; version="2.0"; sha256="12k68nsrrxglrm9ik53rm8160xvjlsgzi7v4wp78jhmh2slmyxw3"; depends=[mvtnorm Rcpp wmtsa]; }; wdm = derive2 { name="wdm"; version="0.2.1"; sha256="05yc366g2lii305ljrhh9939gf8sf517alw5xcr2sdclr00qxal4"; depends=[Rcpp]; }; wdman = derive2 { name="wdman"; version="0.2.5"; sha256="1yf41lsrr9dbf5n4f5hv9mlmzl736fhnp9gxkm2g9apws6gsig02"; depends=[assertthat binman processx semver yaml]; }; - wdpar = derive2 { name="wdpar"; version="1.0.1"; sha256="0kqzizbs4bcph4vkv2v3wn6vcmdkpf9idl3wqadw805z2967ipv6"; depends=[assertthat cli countrycode curl httr lwgeom progress rappdirs RSelenium sf sp wdman xml2]; }; - weathercan = derive2 { name="weathercan"; version="0.3.3"; sha256="01hvrg2xx5nj7wspjhkwqs8lchya1ki16wj7flx1s1xzyd9n7x19"; depends=[dplyr httr lubridate purrr rlang rvest stringi stringr tidyr xml2]; }; + wdpar = derive2 { name="wdpar"; version="1.0.2"; sha256="0ybslv1vbvqskmr5s8b9ama6g30g8bjr74hir3mxdwsr4kf668sm"; depends=[assertthat cli countrycode curl httr lwgeom progress rappdirs RSelenium sf sp tibble wdman xml2]; }; + weathercan = derive2 { name="weathercan"; version="0.3.4"; sha256="1nglfmlwb3l1rlp7vgm2d77yx4fn39i8ps54v6jvsbs0p57s5xhi"; depends=[dplyr httr lubridate purrr rlang rvest stringi stringr tidyr tidyselect xml2]; }; weathermetrics = derive2 { name="weathermetrics"; version="1.2.2"; sha256="1hjhgsy3v8328hv4czxxz7kp68sxc10sy10f3dv5j8f6pka6qlsp"; depends=[]; }; weatherr = derive2 { name="weatherr"; version="0.1.2"; sha256="11sb5bmqccqkvlabsw4siy9n6ivsrvxavywvaffgrs3blmnygql9"; depends=[ggmap lubridate RJSONIO XML]; }; webTRISr = derive2 { name="webTRISr"; version="0.2.0"; sha256="10xj8qvibhnywsxd1yb4laz6b38qwn483a7bflizsndsgrbzdi5n"; depends=[dplyr httr jsonlite lubridate magrittr purrr readr sf stringr]; }; @@ -15307,7 +15326,7 @@ in with self; { wfe = derive2 { name="wfe"; version="1.9.1"; sha256="0lcg7hzdll1wqdwydkk96m4n715h8sjn3qwhabm245m0hqhdf7is"; depends=[arm MASS Matrix]; }; wfg = derive2 { name="wfg"; version="0.1"; sha256="1r6wb8v42mpapjfhmkmghm9fq21c3s4zmdxy8nlh31nsja71c37d"; depends=[igraph]; }; wfindr = derive2 { name="wfindr"; version="0.1.0"; sha256="0m5xj50hqdjj4lpbgx1kp3my4njr0nz09hd63rf4qf1ls8r7zil9"; depends=[dplyr magrittr]; }; - wflo = derive2 { name="wflo"; version="1.2"; sha256="17g60f4rs4lplawass2x6m8qj86hv5l13x94da9ff0w54dkh4qwq"; depends=[]; }; + wflo = derive2 { name="wflo"; version="1.5"; sha256="1k9iyyr15hzbsram1246zb415hgwg8kr15zp78q9b6yf3yr46kmb"; depends=[]; }; wgaim = derive2 { name="wgaim"; version="2.0-1"; sha256="1qiyfkpsbzjr9xsq5kqq6rlqpndngkn2irdfh3gyi45h6hn118j4"; depends=[ggplot2 qtl]; }; wgeesel = derive2 { name="wgeesel"; version="1.5"; sha256="0lybvsq5168cjybzv2dbyx2z8aakcx7i7ivm8zc90haiispm9n5x"; depends=[bindata CRTgeeDR geepack MASS PoisNor]; }; whatr = derive2 { name="whatr"; version="1.0.0"; sha256="0l9yvbqib2pf93dlslj5268c8l9zzywmy4kwijlvink6fasllrcn"; depends=[dplyr ggplot2 httr magrittr purrr rlang rvest scales stringr tibble tidyr xml2]; }; @@ -15323,7 +15342,7 @@ in with self; { wicket = derive2 { name="wicket"; version="0.4.0"; sha256="1lizzmj69bswzlk18fv2v4yxxc6dynvmkymdiafznzcyyz4a8xnf"; depends=[BH Rcpp]; }; widals = derive2 { name="widals"; version="0.6.1"; sha256="1094yaaq2xb0ykvc1j3hs87j1p4h7zgf8mkn4han8iw5fmr9zncy"; depends=[snowfall]; }; widgetframe = derive2 { name="widgetframe"; version="0.3.1"; sha256="0j0d73m72nzfc1wyrgsqr99ldx72adis6pd57mpim55hz0n9l224"; depends=[htmltools htmlwidgets magrittr purrr]; }; - widyr = derive2 { name="widyr"; version="0.1.2"; sha256="0mqj9w5sy8m2vqhjxmjrf68bfixbvmkigrsdzfnwvxp18hhfw5mj"; depends=[broom dplyr Matrix purrr reshape2 tidyr tidytext]; }; + widyr = derive2 { name="widyr"; version="0.1.3"; sha256="1mkgkn5lf3q9i3fhkz6v9lxl68kwhjn6bwxi3ks1v3njbsacnkay"; depends=[broom dplyr Matrix purrr reshape2 rlang tidyr tidytext]; }; wiesbaden = derive2 { name="wiesbaden"; version="1.2.2"; sha256="0zxz2cnxgx0p66ls1x2pz5i9iiv67ajm30a2n8m1alljnza6qigf"; depends=[httr jsonlite keyring readr stringi stringr xml2]; }; wikibooks = derive2 { name="wikibooks"; version="0.2"; sha256="178lhri1b8if2j7y7l9kqgyvmkn4z0bxp5l4dmm97x3pav98c7ks"; depends=[]; }; wikifacts = derive2 { name="wikifacts"; version="0.1.0"; sha256="01mwzqign59lh7wvf8q8kwkgnfxi9nkk6n0qwfh27q64fajw8clg"; depends=[magrittr rvest xml2]; }; @@ -15340,10 +15359,9 @@ in with self; { windex = derive2 { name="windex"; version="1.0"; sha256="0ci10x6mm5i03j05fyadxa0ic0ngpyp5nsn05p9m7v1is5jhxci0"; depends=[ape geiger scatterplot3d]; }; windfarmGA = derive2 { name="windfarmGA"; version="2.2.3"; sha256="13jdh0c8lkc3043mnqx23s06xxkf6dvk7w9kfvwhib58rlgy0p2n"; depends=[calibrate doParallel foreach ggplot2 gstat leaflet magrittr raster RColorBrewer Rcpp rgdal rworldmap sf sp spatstat]; }; wingui = derive2 { name="wingui"; version="0.2"; sha256="0yf6k33qpcjzyb7ckwsxpdw3pcsja2wsf08vaca7qw27yxrbmaa3"; depends=[Rcpp]; }; - wiod = derive2 { name="wiod"; version="0.3.0"; sha256="1f151xmc6bm5d28w5123nm0hv7j1v8hay4jk5fk8pwn6yljl1pah"; depends=[decompr gvc]; }; wiqid = derive2 { name="wiqid"; version="0.2.3"; sha256="166d9cdrj8vz2m5n1yxhckhs9nmd3sv13c3jcifzjixl45f8f2aa"; depends=[coda HDInterval MASS truncnorm]; }; wiseR = derive2 { name="wiseR"; version="1.0.1"; sha256="187ylwhk06957x9zm5r0m6w9wg08im83myz3s4gr927ig8yv3b5f"; depends=[arules bnlearn DescTools dplyr DT graph HydeNet igraph linkcomm missRanger psych RBGL Rgraphviz rhandsontable rintrojs shiny shinyalert shinyBS shinycssloaders shinydashboard shinyWidgets visNetwork]; }; - withr = derive2 { name="withr"; version="2.1.2"; sha256="11j6zykklxnvp4xqsr6a2xib665i38m3khdspp887nwagmvnydj1"; depends=[]; }; + withr = derive2 { name="withr"; version="2.2.0"; sha256="10mmfffjbnb2zq5x0kqhhb4z6va4micc6pjzvlfji34gyhffa8ac"; depends=[]; }; wkNNMI = derive2 { name="wkNNMI"; version="1.0.0"; sha256="0qpl1b2134kz9mjl38w93lp3g6kpv9ygv9hygpssm845k02hkw7c"; depends=[foreach infotheo]; }; wkb = derive2 { name="wkb"; version="0.4-0"; sha256="0mah538345npkb06bcj18mb6qnnx8nn7bdqmvqqpbawallh546a9"; depends=[sp]; }; wktmo = derive2 { name="wktmo"; version="1.0.5"; sha256="05pjyk0xsdazbi1x7xfmg097ybybd60zmzzm7sch1ikp05hzn0wb"; depends=[]; }; @@ -15377,10 +15395,10 @@ in with self; { wpp2015 = derive2 { name="wpp2015"; version="1.1-2"; sha256="07bnbmrshlqnlpca5djpq5crnpsmz228wmbpv1ah7ywnjvks6fyx"; depends=[plyr]; }; wpp2017 = derive2 { name="wpp2017"; version="1.2-3"; sha256="1w7cg31larvgaah16ch6z11jjq02i5f20hfwg63wvw5p6fyafivz"; depends=[data_table]; }; wpp2019 = derive2 { name="wpp2019"; version="1.1-1"; sha256="03c0ybk1m8lr6dxckm1950h617yhphgxsg01qj5ywbcm7rpvw1a0"; depends=[data_table]; }; - wppExplorer = derive2 { name="wppExplorer"; version="2.3-3"; sha256="0sz31xsdlk9p52sl5dik7g0qmkrjb7ydkknd154c988kqb5gbp0w"; depends=[DT ggplot2 googleVis Hmisc plyr reshape2 shiny shinyjs shinythemes wpp2019]; }; + wppExplorer = derive2 { name="wppExplorer"; version="2.3-4"; sha256="1pbmjg6y543aih8mxf9njfwpm090virhgqf8w0a5yx0jdfjwmz04"; depends=[DT ggplot2 googleVis Hmisc plyr reshape2 shiny shinyjs shinythemes wpp2019]; }; wql = derive2 { name="wql"; version="0.4.9"; sha256="0m16l807mhcjkbqhlzhc24pw4hl78fjyykiszlg337x3qs803fg2"; depends=[ggplot2 reshape2 zoo]; }; wqs = derive2 { name="wqs"; version="0.0.1"; sha256="14qaa9g9v4nqrv897laflib3wwhflyfaf9wpllmbi5xfv9223rcg"; depends=[glm2 Rsolnp]; }; - wrMisc = derive2 { name="wrMisc"; version="1.1.0"; sha256="10cg4l963aabynic25m6k3sp69d6amhkpqv5x5m38nidy4855jzb"; depends=[MASS]; }; + wrMisc = derive2 { name="wrMisc"; version="1.2.0"; sha256="1fv4bmzi00492s8mln79dsyil7phrrhkd028nc6zi050ssy9ggsi"; depends=[MASS]; }; wrProteo = derive2 { name="wrProteo"; version="1.0.0"; sha256="110rpwac6hccv8i55fdw3mzd500jip1ldzmqw4196igq61cd9m20"; depends=[limma wrMisc]; }; wrangle = derive2 { name="wrangle"; version="0.5.2"; sha256="1b6qgwdjvwbrarp9ylgkb5ia1p5a5g7ws0jyqrwc6hii8z5yj2qb"; depends=[dplyr lazyeval magrittr rlang tidyr]; }; wrapr = derive2 { name="wrapr"; version="2.0.0"; sha256="15171m6bljlmbzds24sy5z8spx8la5ahg1i49i8yghymkp6vvslw"; depends=[]; }; @@ -15399,29 +15417,29 @@ in with self; { wv = derive2 { name="wv"; version="0.1.1"; sha256="06xf3c97pjhln1v31waj8rmp4r0y2kp6v2x10pbpvi8m0nf5zfs1"; depends=[coda Rcpp RcppArmadillo simts]; }; wvtool = derive2 { name="wvtool"; version="1.0"; sha256="0x9awj6g5lzqp2lhwgh9ib7jmfdzyhwazrjvw1vwacqqfhbz8qxv"; depends=[]; }; wwntests = derive2 { name="wwntests"; version="1.0.0"; sha256="1wsqbhsnzkishqwxz5kjcb5xawafizi3ip4yzxj05p9rx9wja1yc"; depends=[ftsa MASS rainbow sde]; }; - wyz_code_metaTesting = derive2 { name="wyz.code.metaTesting"; version="1.1.11"; sha256="1misp5yc015himyd0qniwz1b7fh6x74pw7si5c4gh18brwszycpw"; depends=[crayon data_table lubridate tidyr wyz_code_offensiveProgramming]; }; - wyz_code_offensiveProgramming = derive2 { name="wyz.code.offensiveProgramming"; version="1.1.17"; sha256="00s8dzk86r3iaxvihzpgi550ljqy38sdlma7gvvb2mma6xa114i5"; depends=[crayon data_table lubridate R6 stringr tidyr]; }; - wyz_code_rdoc = derive2 { name="wyz.code.rdoc"; version="1.1.15"; sha256="08f3c9wnlwwv6lhzhl9aljwnqmz0hrf7j2hrd90wa6m31aaks7dj"; depends=[crayon data_table digest lubridate R6 stringr tidyr wyz_code_offensiveProgramming]; }; - wyz_code_testthat = derive2 { name="wyz.code.testthat"; version="1.1.16"; sha256="06xbhk5b0r8y98xl0lab5cndlhv3a9dvbhrnld39mhq1wwryx2sh"; depends=[data_table lubridate R6 tidyr wyz_code_offensiveProgramming]; }; + wyz_code_metaTesting = derive2 { name="wyz.code.metaTesting"; version="1.1.12"; sha256="17fmbym4kxxnygn91da2crxsq8kqh6sj5pzm197l202av0r9pvjd"; depends=[crayon data_table lubridate tidyr wyz_code_offensiveProgramming]; }; + wyz_code_offensiveProgramming = derive2 { name="wyz.code.offensiveProgramming"; version="1.1.18"; sha256="14wk0hjysz8ravwsmiki7dyllkbygq0l5mg516rbbf0wfq5zl7nl"; depends=[crayon data_table lubridate R6 stringr tidyr]; }; + wyz_code_rdoc = derive2 { name="wyz.code.rdoc"; version="1.1.16"; sha256="1f8yd1pkk9aamsx2x59jpa5jgq03hnbf9zrs1ah010sn3l51v1yr"; depends=[crayon data_table digest R6 stringr tidyr wyz_code_offensiveProgramming]; }; + wyz_code_testthat = derive2 { name="wyz.code.testthat"; version="1.1.17"; sha256="1hl6gqxpxa3fyzc01i37g9il4vc6z339iir4228yz7ky1x85xjna"; depends=[data_table lubridate R6 tidyr wyz_code_offensiveProgramming]; }; x_ent = derive2 { name="x.ent"; version="1.1.7"; sha256="15qra77dqhj27g3qx92gram4mq4n9fdidygdpvxfmcx7ww3vc6yh"; depends=[ggplot2 jsonlite statmod stringr xtable]; }; x12 = derive2 { name="x12"; version="1.9.0"; sha256="0hrcw1d52yp5rr4r120lcnfxw2rgs95njg37m28blcnfbq2flfc2"; depends=[stringr x13binary]; }; x12GUI = derive2 { name="x12GUI"; version="0.13.0"; sha256="1mga7g9gwb3nv2qs27lz4n9rp6j3svads28hql88sxaif6is3nk1"; depends=[cairoDevice Hmisc lattice RGtk2 stringr x12]; }; x13binary = derive2 { name="x13binary"; version="1.1.39-2"; sha256="1if8yayvn6rr98gwp0ypmlk3d9fjf0b9kxir2iwha506aslq70xp"; depends=[]; }; x3ptools = derive2 { name="x3ptools"; version="0.0.2"; sha256="1a3vdljd51kvd70mq9cr84r536zmby7vkd36a02z2sxabq03cl9s"; depends=[assertthat digest png rgl xml2 zoo]; }; 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]; }; xSub = derive2 { name="xSub"; version="2.0.2"; sha256="00mahp8fi6iskjaf5nwka67a7hqb3i08j8yrd4d2av39zfs268h2"; depends=[countrycode haven RCurl]; }; xVA = derive2 { name="xVA"; version="0.8.1"; sha256="0wr4i37sya5gg6v63ka16g9077gxbhvjqyqfaahhban8skzl2adf"; depends=[SACCR Trading]; }; xaringan = derive2 { name="xaringan"; version="0.16"; sha256="1jdj8qkadb09x7kvf93h4mp8gxk6lda8aspldhdki9qqpdc78gc8"; depends=[htmltools knitr rmarkdown servr xfun]; }; xbreed = derive2 { name="xbreed"; version="1.0.1.1"; sha256="032i04ginyf9dyabfkygnhrkq7lqdvvyw7s41vjimy2kvjrnkkkx"; depends=[BGLR]; }; xdcclarge = derive2 { name="xdcclarge"; version="0.1.0"; sha256="1j8wsidwmfjygqlwavxinv4bqc6rddy42jdmlknsjfrrs49yj8kn"; depends=[nlshrink Rcpp RcppArmadillo]; }; + xergm_common = derive2 { name="xergm.common"; version="1.7.8"; sha256="03mjpafwfkmyj5ba84jydap9rp0i602izjlbd511xbxcw6dx2k0b"; depends=[ergm network]; }; xesreadR = derive2 { name="xesreadR"; version="0.2.3"; sha256="1pvdx0mxg2f885bhy4hb3kqzcgva4q7hzzaipkfzyi5lnjdsbc81"; depends=[bupaR data_table dplyr lubridate purrr stringr tidyr XML xml2]; }; - xfun = derive2 { name="xfun"; version="0.12"; sha256="0sgh8kafi9x1glmmcp1ly827pm8q7fsfngbplr41fbb4nc9363df"; depends=[]; }; + xfun = derive2 { name="xfun"; version="0.13"; sha256="03iyqgx9mmdbd3qih70qzijjqcdg7k7ps5r1y6q8praanx9qvnm3"; depends=[]; }; xgb2sql = derive2 { name="xgb2sql"; version="0.1.2"; sha256="1gw5dw0ck5hip8mv347zaswrggk395bg2hgn02bvqs0d31jhmgvi"; depends=[data_table xgboost]; }; xgboost = derive2 { name="xgboost"; version="1.0.0.2"; sha256="1ld2w51c5fy3bl0kvjn1iplffc4lmin9s9zz5xx7xsm44d6j6kzd"; depends=[data_table magrittr Matrix stringi]; }; xgobi = derive2 { name="xgobi"; version="1.2-15"; sha256="03ym5mm16rb1bdwrymr393r3xgprp0ign45ryym3g0x2zi8dy557"; depends=[]; }; - xgxr = derive2 { name="xgxr"; version="1.0.7"; sha256="1hl2xblq06mgy0a1apfvdinyr8sqqmvqqi42xmcyl9di5x9kb0qx"; depends=[assertthat binom dplyr ggplot2 labeling magrittr pander png scales tibble]; }; + xgxr = derive2 { name="xgxr"; version="1.0.9"; sha256="1hci16ly4wzrjyfa7chwn6nnwlfnq77ix2w3gwrvlgfcjisbcsq1"; depends=[assertthat binom dplyr ggplot2 labeling magrittr pander png scales tibble]; }; 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]; }; xkcdcolors = derive2 { name="xkcdcolors"; version="1.0"; sha256="07fnjv01r3b951dqca2zs9b9f6hsgbpbpsrggvb8rps53kpid0i7"; depends=[FNN]; }; @@ -15432,7 +15450,7 @@ in with self; { xltabr = derive2 { name="xltabr"; version="0.1.2"; sha256="0pwbpcdiqkhvzxsi6yxly4zza12bw7zc7ji8cvhldw4yl5sxkz1l"; depends=[magrittr openxlsx]; }; xlutils3 = derive2 { name="xlutils3"; version="0.1.0"; sha256="1cxishi62bd36zlsy5qhzix1p68akdf9kpjg9gfm9aqpcijzccb9"; depends=[magrittr readxl]; }; xmeta = derive2 { name="xmeta"; version="1.1-5"; sha256="1r2mqrrcl7vmbyydw3kzpskinkiqr919bxgq69i1y6pbfim7jzag"; depends=[aod glmmML metafor mvmeta numDeriv]; }; - xml2 = derive2 { name="xml2"; version="1.3.0"; sha256="138v9374xwc7flw8fz8qp8q3w4fch2jviij0g10dg92xn9dsyani"; depends=[]; }; + xml2 = derive2 { name="xml2"; version="1.3.2"; sha256="1kx400v62xkd5xal7rzz7jcarz94ac8g1sh4i2dqr78qwgkzj8nz"; depends=[]; }; xmlparsedata = derive2 { name="xmlparsedata"; version="1.0.3"; sha256="0gjr3l5z5dp276lchr2649as1rkj56d2mlvbr66yg393zzw50lsh"; depends=[]; }; xmlrpc2 = derive2 { name="xmlrpc2"; version="1.1"; sha256="13rfw0civp3hzi4hn31x1idliid1qb73495x4c31z5msd35lzxrs"; depends=[base64enc curl xml2]; }; xmrr = derive2 { name="xmrr"; version="1.0.36"; sha256="0xxi8z9sp156508y5a7f4ax8yry7lg4qmn0hyk04dn1xr7syd4gs"; depends=[dplyr ggplot2 tidyr]; }; @@ -15450,7 +15468,7 @@ in with self; { xrf = derive2 { name="xrf"; version="0.1.2"; sha256="0mcyjw75f2w3hvx1r6lhc4yidmih2z6dfmkxvywm499whk2pcqhv"; depends=[dplyr fuzzyjoin glmnet Matrix rlang xgboost]; }; xrnet = derive2 { name="xrnet"; version="0.1.7"; sha256="136aadrvsdg9hizjg4q12h56ih0s3w88j3jpfb54ajgdmqw3pldi"; depends=[BH bigmemory foreach Rcpp RcppEigen]; }; xseq = derive2 { name="xseq"; version="0.2.1"; sha256="0bsakbfvkfv39q2ch2g21b17g84470sq4v73355cljlshsi6404i"; depends=[e1071 gptk impute preprocessCore RColorBrewer sfsmisc]; }; - xslt = derive2 { name="xslt"; version="1.4"; sha256="0qdrw6f0m5y4y9ky7r766jy4wqi6hw892xcfw4byfby9a4cfj7m6"; depends=[Rcpp xml2]; }; + xslt = derive2 { name="xslt"; version="1.4.1"; sha256="1gpqap5i2xabr9yrrkyr8kzzgqzpk6d6mgp4rqbkjdn77hs24krd"; depends=[Rcpp xml2]; }; xsp = derive2 { name="xsp"; version="0.1.2"; sha256="1jbmxa234v52qji8sz4bkg24c2n65b0zh9py1wyyfzw9n1wx5w0r"; depends=[ggplot2 reshape2]; }; xspliner = derive2 { name="xspliner"; version="0.0.4"; sha256="1j3wlw39r3ahhdfq3rks1zhnlmz14f4wk7bl7gf94yffasqg6k2r"; depends=[dplyr ggplot2 magrittr mgcv pdp pROC purrr tidyr]; }; xtable = derive2 { name="xtable"; version="1.8-4"; sha256="077xfm0gphvhsay75amd9v90zk57kjgrrlgih04fyrbqqblc1gjs"; depends=[]; }; @@ -15513,14 +15531,13 @@ 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.4"; sha256="10hv5li1l9gm1bl3k3c9qcmzkqa4ri0kccrsgw1mn8ddn11g9m0a"; depends=[abind coda Formula matrixcalc rjags]; }; - zoltr = derive2 { name="zoltr"; version="0.2.2"; sha256="0nxg37h6vlj5g6rxmgzy060h3lwfgjxvcf5gfpsgpg1mjg9h4k3f"; depends=[base64url httr jsonlite mockery readr webmockr]; }; + zoltr = derive2 { name="zoltr"; version="0.5.1"; sha256="12zh7y3pwidclscgvd0b0iaqq9j5y8mc8xd6pz4vs0jy5qs3ahar"; depends=[base64url dplyr httr jsonlite magrittr MMWRweek mockery readr rlang webmockr]; }; zoo = derive2 { name="zoo"; version="1.8-7"; sha256="1w4542zs53bm261g95086a60576v334g1jrhnbgdqni4izf2s1wy"; depends=[lattice]; }; zooaRch = derive2 { name="zooaRch"; version="1.2"; sha256="0grc378xppv0303sf4flfqz5002vq5a23nzbq4bsff41rww7dihc"; depends=[ggplot2]; }; zooaRchGUI = derive2 { name="zooaRchGUI"; version="1.0.2"; sha256="0snggx0d69ajz6xxwnv03l12jpjrjkpy2dgf4lrpm2l8rspd27i4"; depends=[car coda foreign geomorph ggplot2 MASS pgirmess raster readxl rjags sp spdep splancs tcltk2 tkrplot vegan]; }; zoocat = derive2 { name="zoocat"; version="0.2.0.1"; sha256="0rdjgf1gvnixqwxrnvzswb53yzcvjgvfkrms6d38bhfyw320kgdp"; depends=[plyr reshape2 scales zoo]; }; zooimage = derive2 { name="zooimage"; version="5.5.2"; sha256="0ck8w0zb9l1n9xvjwqshq9q9l8pigy3yslq2hnfbgcwk17kk9mp8"; depends=[digest DT filehash jpeg MASS mda mlearning png shiny svDialogs svMisc tiff]; }; zoom = derive2 { name="zoom"; version="2.0.4"; sha256="03f5rxfr6ncf1j6vpn7pip21q7ylj4bx0a5xphqb6x6i33lxf1g5"; depends=[]; }; - zoomgrid = derive2 { name="zoomgrid"; version="1.0.0"; sha256="1bjm2b1ll5ikym21ia7k6gfiw1bcplcn4p6fls2298nf20q63kaa"; depends=[]; }; zoon = derive2 { name="zoon"; version="0.6.5"; sha256="02y29vr2yn8al69km8faiqrwjrc1r3hsvw3dg8lwjr65cxw1krip"; depends=[dismo plyr randomForest raster RCurl rfigshare rgdal roxygen2 rworldmap sp testthat]; }; zscorer = derive2 { name="zscorer"; version="0.3.1"; sha256="0aijhs0fyird5gq68x4dxchb02mxa7ijk10k9zjhngghxbjj7iqn"; depends=[shiny]; }; ztable = derive2 { name="ztable"; version="0.2.0"; sha256="0g7khk5ifsdh9p31wlwh2l5mn1hzxzpv6qcn1wh34vsfjdmijjwy"; depends=[flextable magrittr moonBook officer RColorBrewer scales stringr]; }; diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 44ff794654d..68faec99dbc 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -328,7 +328,6 @@ let Rpoppler = [ pkgs.poppler ]; RPostgreSQL = [ pkgs.postgresql pkgs.postgresql ]; RProtoBuf = [ pkgs.protobuf ]; - rPython = [ pkgs.python ]; RSclient = [ pkgs.openssl.dev ]; Rserve = [ pkgs.openssl ]; Rssa = [ pkgs.fftw.dev ]; @@ -425,7 +424,6 @@ let Rsymphony = [ pkgs.pkgconfig pkgs.doxygen pkgs.graphviz pkgs.subversion ]; tcltk2 = [ pkgs.tcl pkgs.tk ]; tikzDevice = [ pkgs.which pkgs.texlive.combined.scheme-medium ]; - rPython = [ pkgs.which ]; gridGraphics = [ pkgs.which ]; adimpro = [ pkgs.which pkgs.xorg.xdpyinfo ]; mzR = [ pkgs.netcdf ]; -- cgit v1.2.3 From e726e341c607e4bd47b7c79303af43395d272ac1 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Wed, 22 Apr 2020 12:00:00 +0000 Subject: unison: fix unison-fsmonitor wrapper in an empty PATH Fixes: /nix/store/hyk3aky49zm2chq5cwclrsm56iqwfzwj-unison-2.51.2/bin/unison-fsmonitor: line 2: grep: command not found Happens when running unison in a systemd service. --- pkgs/applications/networking/sync/unison/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 535757503ca..7b7318544c5 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, ocamlPackages, fontschumachermisc, xset, makeWrapper, ncurses +{stdenv, fetchFromGitHub, ocamlPackages, fontschumachermisc, xset, makeWrapper, ncurses, gnugrep , enableX11 ? true}: let inherit (ocamlPackages) ocaml lablgtk; in @@ -38,7 +38,7 @@ stdenv.mkDerivation (rec { postInstall = if enableX11 then '' for i in $(cd $out/bin && ls); do wrapProgram $out/bin/$i \ - --run "[ -n \"\$DISPLAY\" ] && (${xset}/bin/xset q | grep -q \"${fontschumachermisc}\" || ${xset}/bin/xset +fp \"${fontschumachermisc}/lib/X11/fonts/misc\")" + --run "[ -n \"\$DISPLAY\" ] && (${xset}/bin/xset q | ${gnugrep}/bin/grep -q \"${fontschumachermisc}\" || ${xset}/bin/xset +fp \"${fontschumachermisc}/lib/X11/fonts/misc\")" done '' else ""; -- cgit v1.2.3 From e5e31593cebf0322fff2badcb8f85eb2cd40da74 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sun, 26 Apr 2020 14:29:17 -0700 Subject: openexr,imlbase: 2.3.0 -> 2.4.1 --- pkgs/development/libraries/ilmbase/bootstrap.patch | 15 -------------- pkgs/development/libraries/ilmbase/default.nix | 23 ++++++++-------------- pkgs/development/libraries/openexr/bootstrap.patch | 15 -------------- pkgs/development/libraries/openexr/default.nix | 22 ++++++++------------- 4 files changed, 16 insertions(+), 59 deletions(-) delete mode 100644 pkgs/development/libraries/ilmbase/bootstrap.patch delete mode 100644 pkgs/development/libraries/openexr/bootstrap.patch diff --git a/pkgs/development/libraries/ilmbase/bootstrap.patch b/pkgs/development/libraries/ilmbase/bootstrap.patch deleted file mode 100644 index db6af6daebd..00000000000 --- a/pkgs/development/libraries/ilmbase/bootstrap.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ur openexr-v2.2.0-src-orig/IlmBase/bootstrap openexr-v2.2.0-src/IlmBase/bootstrap ---- IlmBase/bootstrap 2015-03-31 01:02:41.000000000 -0400 -+++ IlmBase/bootstrap 2015-03-31 01:03:35.000000000 -0400 -@@ -47,11 +47,6 @@ - fi - } - --# Check if /usr/local/share/aclocal exists --if [ -d /usr/local/share/aclocal ]; then -- ACLOCAL_INCLUDE="$ACLOCAL_INCLUDE -I /usr/local/share/aclocal" --fi -- - run_cmd aclocal -I m4 $ACLOCAL_INCLUDE - run_cmd $LIBTOOLIZE --automake --copy - run_cmd automake --add-missing --copy diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index 99e47b0b303..4ea16a59e8b 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, buildPackages, automake, autoconf, libtool, which, - fetchpatch }: +{ stdenv, lib, buildPackages, automake, autoconf, libtool, which, + fetchpatch, openexr }: stdenv.mkDerivation rec { pname = "ilmbase"; - version = "2.3.0"; + version = lib.getVersion openexr; - src = fetchurl { - url = "https://github.com/openexr/openexr/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "0qiq5bqq9rxhqjiym2k36sx4vq8adgrz6xf6qwizi9bqm78phsa5"; - }; + # the project no longer provides separate tarballs. We may even want to merge + # the ilmbase package into openexr in the future. + src = openexr.src; + + sourceRoot = "source/IlmBase"; outputs = [ "out" "dev" ]; @@ -23,15 +24,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_LINK = "-pthread"; patches = [ - ./bootstrap.patch ./cross.patch - (fetchpatch { - name = "CVE-2018-18443.patch"; - url = "https://github.com/kdt3rd/openexr/commit/5fa930b82cff2db386c64ca512af19e60c14d32a.patch"; - sha256 = "1j6xd0qkx99acc1szycxaj0wwp01yac67jz48hwc4fwwpz8blx4s"; - stripLen = 1; - excludes = [ "CHANGES.md" ]; - }) ]; # fails 1 out of 1 tests with diff --git a/pkgs/development/libraries/openexr/bootstrap.patch b/pkgs/development/libraries/openexr/bootstrap.patch deleted file mode 100644 index af6669c16a4..00000000000 --- a/pkgs/development/libraries/openexr/bootstrap.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ur openexr-v2.2.0-src-orig/OpenEXR/bootstrap openexr-v2.2.0-src/OpenEXR/bootstrap ---- OpenEXR/bootstrap 2015-03-31 01:02:41.000000000 -0400 -+++ OpenEXR/bootstrap 2015-03-31 01:03:35.000000000 -0400 -@@ -47,11 +47,6 @@ - fi - } - --# Check if /usr/local/share/aclocal exists --if [ -d /usr/local/share/aclocal ]; then -- ACLOCAL_INCLUDE="$ACLOCAL_INCLUDE -I /usr/local/share/aclocal" --fi -- - run_cmd aclocal -I m4 $ACLOCAL_INCLUDE - run_cmd $LIBTOOLIZE --automake --copy - run_cmd automake --add-missing --copy diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index 328bce35357..da8fb429465 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, buildPackages, fetchurl, autoconf, automake, libtool, pkgconfig, +{ lib, stdenv, buildPackages, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, zlib, ilmbase, fetchpatch }: let @@ -8,22 +8,16 @@ in stdenv.mkDerivation rec { pname = "openexr"; - version = lib.getVersion ilmbase; + version = "2.4.1"; - src = fetchurl { - url = "https://github.com/openexr/openexr/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "19jywbs9qjvsbkvlvzayzi81s976k53wg53vw4xj66lcgylb6v7x"; + src = fetchFromGitHub { + owner = "AcademySoftwareFoundation"; + repo = "openexr"; + rev = "v${version}"; + sha256 = "020gyl8zv83ag6gbcchmqiyx9rh2jca7j8n52zx1gk4rck7kwc01"; }; - patches = [ - ./bootstrap.patch - (fetchpatch { - name = "CVE-2018-18444.patch"; - url = "https://github.com/openexr/openexr/commit/1b0f1e5d7dcf2e9d6cbb4e005e803808b010b1e0.patch"; - sha256 = "0f5m4wdwqqg8wfg7azzsz5yfpdrvws314rd4sqfc74j1g6wrcnqj"; - stripLen = 1; - }) - ]; + sourceRoot = "source/OpenEXR"; outputs = [ "bin" "dev" "out" "doc" ]; -- cgit v1.2.3 From bba6c109fe963464c2260483ffdaea76f33fa414 Mon Sep 17 00:00:00 2001 From: Tom Bereknyei Date: Sun, 26 Apr 2020 17:32:45 -0400 Subject: torque: substitute /bin/cp --- pkgs/servers/computing/torque/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/computing/torque/default.nix b/pkgs/servers/computing/torque/default.nix index 37c8d32ab6a..0941ca96922 100644 --- a/pkgs/servers/computing/torque/default.nix +++ b/pkgs/servers/computing/torque/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, openssl, flex, bison, pkgconfig, groff, libxml2, utillinux -, file, libtool, which, boost, autoreconfHook +, coreutils, file, libtool, which, boost, autoreconfHook }: stdenv.mkDerivation rec { @@ -32,6 +32,10 @@ stdenv.mkDerivation rec { --replace "contrib/init.d contrib/systemd" "" substituteInPlace src/cmds/Makefile.am \ --replace "/etc/" "$out/etc/" + substituteInPlace src/mom_rcp/pathnames.h \ + --replace /bin/cp ${coreutils}/bin/cp + substituteInPlace src/resmom/requests.c \ + --replace /bin/cp ${coreutils}/bin/cp ''; preConfigure = '' -- cgit v1.2.3 From 080c064d1da6c7292d99d9dd0b8468352754aff1 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Thu, 23 Apr 2020 10:23:32 -0700 Subject: opencv4: 4.1.2 -> 4.3.0 --- pkgs/development/libraries/opencv/4.x.nix | 14 +++--- .../opencv/cmake-don-t-use-OpenCVFindOpenEXR.patch | 55 ++++++++++++++++++++++ 2 files changed, 63 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/libraries/opencv/cmake-don-t-use-OpenCVFindOpenEXR.patch diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index abec6e1ace5..9dcb9956838 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -38,20 +38,20 @@ assert blas.implementation == "openblas" && lapack.implementation == "openblas"; let - version = "4.1.2"; + version = "4.3.0"; src = fetchFromGitHub { owner = "opencv"; repo = "opencv"; rev = version; - sha256 = "0c98ziwvfrzdzwn52a36d37n5rac8zmxq2jn479bzfaii1bib8xx"; + sha256 = "1r9bq9p1x99g2y8jvj9428sgqvljz75dm5vrfsma7hh5wjhz9775"; }; contribSrc = fetchFromGitHub { owner = "opencv"; repo = "opencv_contrib"; rev = version; - sha256 = "10ryyxhggin5dk5glf4ycyrfryqf50f4bs10biv6nxlrrinm2di4"; + sha256 = "068b4f95rlryab3mffxs2w6dnbmbhrnpsdgl007rxk4bwnz29y49"; }; # Contrib must be built in order to enable Tesseract support: @@ -62,8 +62,8 @@ let src = fetchFromGitHub { owner = "opencv"; repo = "opencv_3rdparty"; - rev = "32e315a5b106a7b89dbed51c28f8120a48b368b4"; - sha256 = "19w9f0r16072s59diqxsr5q6nmwyz9gnxjs49nglzhd66p3ddbkp"; + rev = "a56b6ac6f030c312b2dce17430eef13aed9af274"; + sha256 = "1msbkc3zixx61rcg6a04i1bcfhw1phgsrh93glq1n80hgsk3nbjq"; } + "/ippicv"; files = let name = platform : "ippicv_2019_${platform}_general_20180723.tgz"; in if stdenv.hostPlatform.system == "x86_64-linux" then @@ -168,7 +168,9 @@ stdenv.mkDerivation { # Also, work around https://github.com/NixOS/nixpkgs/issues/26304 with # what appears to be some stray headers in dnn/misc/tensorflow # in contrib when generating the Python bindings: - patches = lib.optional enableCuda ./cuda_opt_flow.patch; + patches = [ + ./cmake-don-t-use-OpenCVFindOpenEXR.patch + ] ++ lib.optional enableCuda ./cuda_opt_flow.patch; postPatch = '' sed -i '/Add these standard paths to the search paths for FIND_LIBRARY/,/^\s*$/{d}' CMakeLists.txt sed -i -e 's|if len(decls) == 0:|if len(decls) == 0 or "opencv2/" not in hdr:|' ./modules/python/src2/gen2.py diff --git a/pkgs/development/libraries/opencv/cmake-don-t-use-OpenCVFindOpenEXR.patch b/pkgs/development/libraries/opencv/cmake-don-t-use-OpenCVFindOpenEXR.patch new file mode 100644 index 00000000000..dc80b09b646 --- /dev/null +++ b/pkgs/development/libraries/opencv/cmake-don-t-use-OpenCVFindOpenEXR.patch @@ -0,0 +1,55 @@ +From 6d988c08e852379a163ecd20df8639196d84d014 Mon Sep 17 00:00:00 2001 +From: Bernardo Meurer +Date: Sun, 26 Apr 2020 14:50:25 -0700 +Subject: [PATCH] cmake: don't use OpenCVFindOpenEXR + +Use find_package for this. +--- + CMakeLists.txt | 2 ++ + cmake/OpenCVFindLibsGrfmt.cmake | 15 +++------------ + 2 files changed, 5 insertions(+), 12 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4c0b3880fc..0360469350 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -14,6 +14,8 @@ FATAL: In-source builds are not allowed. + ") + endif() + ++# the future! ++include(FindPkgConfig) + + include(cmake/OpenCVMinDepVersions.cmake) + +diff --git a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake +index 0beaf19317..4c5e46e615 100644 +--- a/cmake/OpenCVFindLibsGrfmt.cmake ++++ b/cmake/OpenCVFindLibsGrfmt.cmake +@@ -227,20 +227,11 @@ endif() + # --- OpenEXR (optional) --- + if(WITH_OPENEXR) + ocv_clear_vars(HAVE_OPENEXR) +- if(NOT BUILD_OPENEXR) +- include("${OpenCV_SOURCE_DIR}/cmake/OpenCVFindOpenEXR.cmake") +- endif() +- ++ pkg_check_modules(OPENEXR OpenEXR) + if(OPENEXR_FOUND) + set(HAVE_OPENEXR YES) +- else() +- ocv_clear_vars(OPENEXR_INCLUDE_PATHS OPENEXR_LIBRARIES OPENEXR_ILMIMF_LIBRARY OPENEXR_VERSION) +- +- set(OPENEXR_LIBRARIES IlmImf) +- add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/openexr") +- if(OPENEXR_VERSION) # check via TARGET doesn't work +- set(HAVE_OPENEXR YES) +- endif() ++ set(OPENEXR_INCLUDE_PATHS ${OPENEXR_INCLUDE_DIRS}) ++ set(OPENEXR_LIBRARIES ${OPENEXR_LIBRARIES}) + endif() + endif() + +-- +2.26.1 + -- cgit v1.2.3 From c27bd9af4e642173401b50047a4eaf1beaa1bda9 Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Fri, 24 Apr 2020 20:23:59 -0700 Subject: bat-extras: init at 20200408 --- pkgs/tools/misc/bat-extras/default.nix | 147 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 149 insertions(+) create mode 100644 pkgs/tools/misc/bat-extras/default.nix diff --git a/pkgs/tools/misc/bat-extras/default.nix b/pkgs/tools/misc/bat-extras/default.nix new file mode 100644 index 00000000000..0f98b819b0f --- /dev/null +++ b/pkgs/tools/misc/bat-extras/default.nix @@ -0,0 +1,147 @@ +{ stdenv, callPackage, fetchFromGitHub, bash, makeWrapper, ncurses, bat +# batgrep and batwatch +, less +# batgrep +, ripgrep +# prettybat +, withShFmt ? shfmt != null, shfmt ? null +, withPrettier ? nodePackages?prettier, nodePackages ? null +, withClangTools ? clang-tools != null, clang-tools ? null +, withRustFmt ? rustfmt != null, rustfmt ? null +# batwatch +, withEntr ? entr != null, entr ? null + }: + +let + # Core derivation that all the others are based on. + # This includes the complete source so the per-script derivations can run the tests. + core = stdenv.mkDerivation rec { + pname = "bat-extras"; + version = "20200408"; + + src = fetchFromGitHub { + owner = "eth-p"; + repo = pname; + rev = "v${version}"; + sha256 = "184d5rwasfpgbj2k98alg3wy8jmzna2dgfik98w2a297ky67s51v"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ bash makeWrapper ]; + + dontConfigure = true; + + postPatch = '' + substituteInPlace lib/constants.sh \ + --replace 'EXECUTABLE_BAT="bat"' 'EXECUTABLE_BAT="${bat}/bin/bat"' + + patchShebangs --build test.sh test/shimexec .test-framework/bin/best.sh + wrapProgram .test-framework/bin/best.sh \ + --prefix PATH : "${ncurses}/bin" + ''; + + buildPhase = '' + runHook preBuild + bash ./build.sh --minify=none --no-verify + runHook postBuild + ''; + + # Run the library tests as they don't have external dependencies + doCheck = true; + checkPhase = '' + runHook preCheck + # test list repeats suites. Unique them + declare -A test_suites + while read -r action arg _; do + [[ "$action" == "test_suite" && "$arg" == lib_* ]] && + test_suites+=(["$arg"]=1) + done <<<"$(bash ./test.sh --compiled --list --porcelain)" + (( ''${#test_suites[@]} != 0 )) || { + echo "Couldn't find any library test suites" + exit 1 + } + bash ./test.sh --compiled $(printf -- "--suite %q\n" "''${!test_suites[@]}") + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + cp -a . $out + runHook postInstall + ''; + + # A few random files have shebangs. Don't patch them, they don't make it into the final output. + # The per-script derivations will go ahead and patch the files they actually install. + dontPatchShebangs = true; + + meta = with stdenv.lib; { + description = "Bash scripts that integrate bat with various command line tools"; + homepage = "https://github.com/eth-p/bat-extras"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ bbigras lilyball ]; + platforms = platforms.all; + }; + }; + script = + name: # the name of the script + dependencies: # the tools we need to prefix onto PATH + stdenv.mkDerivation { + pname = "${core.pname}-${name}"; + inherit (core) version; + + src = core; + + nativeBuildInputs = [ bash makeWrapper ]; + # Make the dependencies available to the tests. + buildInputs = dependencies; + + # Patch shebangs now because our tests rely on them + postPatch = '' + patchShebangs --host bin/${name} + ''; + + dontConfigure = true; + dontBuild = true; # we've already built + + doCheck = true; + checkPhase = '' + runHook preCheck + bash ./test.sh --compiled --suite ${name} + runHook postCheck + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin + cp -p bin/${name} $out/bin/${name} + '' + stdenv.lib.optionalString (dependencies != []) '' + wrapProgram $out/bin/${name} \ + --prefix PATH : ${stdenv.lib.makeBinPath dependencies} + '' + '' + runHook postInstall + ''; + + # We already patched + dontPatchShebangs = true; + + inherit (core) meta; + }; + optionalDep = cond: dep: + assert cond -> dep != null; + stdenv.lib.optional cond dep; +in +{ + batgrep = script "batgrep" [ less ripgrep ]; + batman = (script "batman" []).overrideAttrs (drv: { + doCheck = stdenv.isDarwin; # test fails on Linux due to SIGPIPE (eth-p/bat-extras#19) + }); + batwatch = script "batwatch" ([ less ] ++ optionalDep withEntr entr); + prettybat = (script "prettybat" ([] + ++ optionalDep withShFmt shfmt + ++ optionalDep withPrettier nodePackages.prettier + ++ optionalDep withClangTools clang-tools + ++ optionalDep withRustFmt rustfmt) + ).overrideAttrs (drv: { + doCheck = stdenv.isDarwin; # test fails on Linux due to SIGPIPE (eth-p/bat-extras#19) + }); +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 61d537441a9..5bda6ea92ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1170,6 +1170,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + bat-extras = recurseIntoAttrs (callPackages ../tools/misc/bat-extras { }); + bc = callPackage ../tools/misc/bc { }; bdf2psf = callPackage ../tools/misc/bdf2psf { }; -- cgit v1.2.3 From c5e3472e2072ed0998571ce3961b8df65e2862cc Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sun, 26 Apr 2020 13:11:24 -0700 Subject: coreutils: set ac_cv_func_lchmod=no Bumping binutils to 2.32 broke coreutils for unknown reasons[1]. Upon further investigation we found that there was some issue with mknod inside a chroot[2][3], which setting ac_cv_func_lchmod to "no" _somehow_ fixes. We apply this fix and hope to never have to debug this again. Thanks to @flokli and @lnl7 who helped me chase after this and @pbogdan who found the fix in the fedora build. [1]: https://github.com/NixOS/nixpkgs/pull/85951 [2]: https://github.com/NixOS/nixpkgs/pull/85951#issuecomment-619601978 [3]: https://bugzilla.redhat.com/show_bug.cgi?id=1811038 --- pkgs/tools/misc/coreutils/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 49edc002bec..b39bef7cb2d 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -79,6 +79,7 @@ stdenv.mkDerivation (rec { ++ optional (singleBinary != false) ("--enable-single-binary" + optionalString (isString singleBinary) "=${singleBinary}") ++ optional withOpenssl "--with-openssl" + ++ optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no" ++ optional stdenv.hostPlatform.isSunOS "ac_cv_func_inotify_init=no" ++ optional withPrefix "--program-prefix=g" ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.libc == "glibc") [ -- cgit v1.2.3 From efdb29597a76c526dc0d9a55f8adf2ec5c33b0ee Mon Sep 17 00:00:00 2001 From: Guillaume Bouchard Date: Tue, 21 Jan 2020 20:09:13 +0100 Subject: binutils: 2.31.1 -> 2.33.1 - I've removed the stack of patch linked to https://sourceware.org/bugzilla/show_bug.cgi?id=23428 . The associated issue says it is closed and targeted for 2.32. - I've ugraded the "no_plugin" patch. The logic changed in https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=41f37a6fb71f2a3de388108f5cdfca9cbe6e9d51 and I tried to keep the same logic by disabling everything. It closes https://github.com/NixOS/nixpkgs/issues/78197 --- pkgs/development/tools/misc/binutils/default.nix | 10 ++------- .../tools/misc/binutils/no-plugins.patch | 26 ++++++++++++---------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index cd05ea354ca..e1ff92d00f4 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -16,7 +16,7 @@ let # Remove gold-symbol-visibility patch when updating, the proper fix # is now upstream. # https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=330b90b5ffbbc20c5de6ae6c7f60c40fab2e7a4f;hp=99181ccac0fc7d82e7dabb05dc7466e91f1645d3 - version = "2.31.1"; + version = "2.33.1"; basename = "binutils"; # The targetPrefix prepended to binary names to allow multiple binuntils on the # PATH to both be usable. @@ -31,7 +31,7 @@ let # HACK to ensure that we preserve source from bootstrap binutils to not rebuild LLVM normal-src = stdenv.__bootPackages.binutils-unwrapped.src or (fetchurl { url = "mirror://gnu/binutils/${basename}-${version}.tar.bz2"; - sha256 = "1l34hn1zkmhr1wcrgf0d4z7r3najxnw3cx2y2fk7v55zjlk3ik7z"; + sha256 = "1cmd0riv37bqy9mwbg6n3523qgr8b3bbm5kwj19sjrasl4yq9d0c"; }); in @@ -68,12 +68,6 @@ stdenv.mkDerivation { [ # https://sourceware.org/bugzilla/show_bug.cgi?id=22868 ./gold-symbol-visibility.patch - - # https://sourceware.org/bugzilla/show_bug.cgi?id=23428 - # un-break features so linking against musl doesn't produce crash-only binaries - ./0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch - ./0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch - ./0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch ] ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch; outputs = [ "out" "info" "man" ]; diff --git a/pkgs/development/tools/misc/binutils/no-plugins.patch b/pkgs/development/tools/misc/binutils/no-plugins.patch index 9624b7976b7..68cf51b7dd3 100644 --- a/pkgs/development/tools/misc/binutils/no-plugins.patch +++ b/pkgs/development/tools/misc/binutils/no-plugins.patch @@ -1,19 +1,21 @@ -diff -ru binutils-2.27-orig/bfd/plugin.c binutils-2.27/bfd/plugin.c ---- binutils-2.27-orig/bfd/plugin.c 2016-10-14 17:46:30.791315555 +0200 -+++ binutils-2.27/bfd/plugin.c 2016-10-14 17:46:38.583298765 +0200 -@@ -333,6 +333,7 @@ +diff --git a/bfd/plugin.c b/bfd/plugin.c +index 537ab60311..bfe7957f96 100644 +--- a/bfd/plugin.c ++++ b/bfd/plugin.c +@@ -386,6 +386,7 @@ load_plugin (bfd *abfd) if (plugin_program_name == NULL) return found; +#if 0 - plugin_dir = concat (BINDIR, "/../lib/bfd-plugins", NULL); - p = make_relative_prefix (plugin_program_name, - BINDIR, -@@ -364,6 +365,7 @@ - free (p); - if (d) - closedir (d); + /* Try not to search the same dir twice, by looking at st_dev and + st_ino for the dir. If we are on a file system that always sets + st_ino to zero or the actual st_ino is zero we might waste some +@@ -437,7 +438,7 @@ load_plugin (bfd *abfd) + if (found) + break; + } +- +#endif - return found; } + -- cgit v1.2.3 From c5f602f5b764ac6ee8e1e0c1b1b3ead88c381da7 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Fri, 24 Apr 2020 11:22:33 -0700 Subject: binutils: 2.33.1 -> 2.34 --- ...NU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch | 517 ------------------ ...86-Properly-add-X86_ISA_1_NEEDED-property.patch | 137 ----- ...roperly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch | 583 --------------------- pkgs/development/tools/misc/binutils/default.nix | 16 +- .../misc/binutils/gold-symbol-visibility.patch | 79 --- 5 files changed, 6 insertions(+), 1326 deletions(-) delete mode 100644 pkgs/development/tools/misc/binutils/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch delete mode 100644 pkgs/development/tools/misc/binutils/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch delete mode 100644 pkgs/development/tools/misc/binutils/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch delete mode 100644 pkgs/development/tools/misc/binutils/gold-symbol-visibility.patch diff --git a/pkgs/development/tools/misc/binutils/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch b/pkgs/development/tools/misc/binutils/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch deleted file mode 100644 index 5a047b0f070..00000000000 --- a/pkgs/development/tools/misc/binutils/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch +++ /dev/null @@ -1,517 +0,0 @@ -From 6737a6b34f4823deb7142f27b4074831a37ac1e1 Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" -Date: Fri, 20 Jul 2018 09:18:47 -0700 -Subject: [PATCH] x86: Add a GNU_PROPERTY_X86_ISA_1_USED note if needed - -When -z separate-code, which is enabled by default for Linux/x86, is -used to create executable, ld won't place any data in the code-only -PT_LOAD segment. If there are no data sections placed before the -code-only PT_LOAD segment, the program headers won't be mapped into -any PT_LOAD segment. When the executable tries to access it (based -on the program header address passed in AT_PHDR), it will lead to -segfault. This patch inserts a GNU_PROPERTY_X86_ISA_1_USED note if -there may be no data sections before the text section so that the -first PT_LOAD segment won't be code-only and will contain the program -header. - -Testcases are adjusted to either pass "-z noseparate-code" to ld or -discard the .note.gnu.property section. A Linux/x86 run-time test is -added. - -bfd/ - - PR ld/23428 - * elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): If the - separate code program header is needed, make sure that the first - read-only PT_LOAD segment has no code by adding a - GNU_PROPERTY_X86_ISA_1_USED note. - -ld/ - - PR ld/23428 - * testsuite/ld-elf/linux-x86.S: New file. - * testsuite/ld-elf/linux-x86.exp: Likewise. - * testsuite/ld-elf/pr23428.c: Likewise. - * testsuite/ld-elf/sec64k.exp: Pass "-z noseparate-code" to ld - for Linux/x86 targets. - * testsuite/ld-i386/abs-iamcu.d: Likewise. - * testsuite/ld-i386/abs.d: Likewise. - * testsuite/ld-i386/pr12718.d: Likewise. - * testsuite/ld-i386/pr12921.d: Likewise. - * testsuite/ld-x86-64/abs-k1om.d: Likewise. - * testsuite/ld-x86-64/abs-l1om.d: Likewise. - * testsuite/ld-x86-64/abs.d: Likewise. - * testsuite/ld-x86-64/pr12718.d: Likewise. - * testsuite/ld-x86-64/pr12921.d: Likewise. - * testsuite/ld-linkonce/zeroeh.ld: Discard .note.gnu.property - section. - * testsuite/ld-scripts/print-memory-usage.t: Likewise. - * testsuite/ld-scripts/size-2.t: Likewise. - * testsuite/lib/ld-lib.exp (run_ld_link_exec_tests): Use ld - to create executable if language is "asm". - -(cherry picked from commit 241e64e3b42cd9eba514b8e0ad2ef39a337f10a5) ---- - bfd/elfxx-x86.c | 60 ++++++++++++++----- - ld/testsuite/ld-elf/linux-x86.S | 63 ++++++++++++++++++++ - ld/testsuite/ld-elf/linux-x86.exp | 46 ++++++++++++++ - ld/testsuite/ld-elf/pr23428.c | 43 +++++++++++++ - ld/testsuite/ld-elf/sec64k.exp | 2 + - ld/testsuite/ld-i386/abs-iamcu.d | 2 +- - ld/testsuite/ld-i386/abs.d | 2 +- - ld/testsuite/ld-i386/pr12718.d | 2 +- - ld/testsuite/ld-i386/pr12921.d | 2 +- - ld/testsuite/ld-linkonce/zeroeh.ld | 1 + - ld/testsuite/ld-scripts/print-memory-usage.t | 2 + - ld/testsuite/ld-scripts/size-2.t | 1 + - ld/testsuite/ld-x86-64/abs-k1om.d | 2 +- - ld/testsuite/ld-x86-64/abs-l1om.d | 2 +- - ld/testsuite/ld-x86-64/abs.d | 2 +- - ld/testsuite/ld-x86-64/pr12718.d | 2 +- - ld/testsuite/ld-x86-64/pr12921.d | 2 +- - ld/testsuite/lib/ld-lib.exp | 5 +- - 20 files changed, 248 insertions(+), 25 deletions(-) - create mode 100644 ld/testsuite/ld-elf/linux-x86.S - create mode 100644 ld/testsuite/ld-elf/linux-x86.exp - create mode 100644 ld/testsuite/ld-elf/pr23428.c - -diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c -index a2497aab86..2e4ff88f1f 100644 ---- a/bfd/elfxx-x86.c -+++ b/bfd/elfxx-x86.c -@@ -2524,6 +2524,7 @@ _bfd_x86_elf_link_setup_gnu_properties - const struct elf_backend_data *bed; - unsigned int class_align = ABI_64_P (info->output_bfd) ? 3 : 2; - unsigned int got_align; -+ bfd_boolean has_text = FALSE; - - features = 0; - if (info->ibt) -@@ -2538,24 +2539,59 @@ _bfd_x86_elf_link_setup_gnu_properties - if (bfd_get_flavour (pbfd) == bfd_target_elf_flavour - && bfd_count_sections (pbfd) != 0) - { -+ if (!has_text) -+ { -+ /* Check if there is no non-empty text section. */ -+ sec = bfd_get_section_by_name (pbfd, ".text"); -+ if (sec != NULL && sec->size != 0) -+ has_text = TRUE; -+ } -+ - ebfd = pbfd; - - if (elf_properties (pbfd) != NULL) - break; - } - -- if (ebfd != NULL && features) -+ bed = get_elf_backend_data (info->output_bfd); -+ -+ htab = elf_x86_hash_table (info, bed->target_id); -+ if (htab == NULL) -+ return pbfd; -+ -+ if (ebfd != NULL) - { -- /* If features is set, add GNU_PROPERTY_X86_FEATURE_1_IBT and -- GNU_PROPERTY_X86_FEATURE_1_SHSTK. */ -- prop = _bfd_elf_get_property (ebfd, -- GNU_PROPERTY_X86_FEATURE_1_AND, -- 4); -- prop->u.number |= features; -- prop->pr_kind = property_number; -+ prop = NULL; -+ if (features) -+ { -+ /* If features is set, add GNU_PROPERTY_X86_FEATURE_1_IBT and -+ GNU_PROPERTY_X86_FEATURE_1_SHSTK. */ -+ prop = _bfd_elf_get_property (ebfd, -+ GNU_PROPERTY_X86_FEATURE_1_AND, -+ 4); -+ prop->u.number |= features; -+ prop->pr_kind = property_number; -+ } -+ else if (has_text -+ && elf_properties (ebfd) == NULL -+ && elf_tdata (info->output_bfd)->o->build_id.sec == NULL -+ && !htab->elf.dynamic_sections_created -+ && !info->traditional_format -+ && (info->output_bfd->flags & D_PAGED) != 0 -+ && info->separate_code) -+ { -+ /* If the separate code program header is needed, make sure -+ that the first read-only PT_LOAD segment has no code by -+ adding a GNU_PROPERTY_X86_ISA_1_USED note. */ -+ prop = _bfd_elf_get_property (ebfd, -+ GNU_PROPERTY_X86_ISA_1_USED, -+ 4); -+ prop->u.number = GNU_PROPERTY_X86_ISA_1_486; -+ prop->pr_kind = property_number; -+ } - - /* Create the GNU property note section if needed. */ -- if (pbfd == NULL) -+ if (prop != NULL && pbfd == NULL) - { - sec = bfd_make_section_with_flags (ebfd, - NOTE_GNU_PROPERTY_SECTION_NAME, -@@ -2581,12 +2617,6 @@ error_alignment: - - pbfd = _bfd_elf_link_setup_gnu_properties (info); - -- bed = get_elf_backend_data (info->output_bfd); -- -- htab = elf_x86_hash_table (info, bed->target_id); -- if (htab == NULL) -- return pbfd; -- - htab->r_info = init_table->r_info; - htab->r_sym = init_table->r_sym; - -diff --git a/ld/testsuite/ld-elf/linux-x86.S b/ld/testsuite/ld-elf/linux-x86.S -new file mode 100644 -index 0000000000..bdf40c6e01 ---- /dev/null -+++ b/ld/testsuite/ld-elf/linux-x86.S -@@ -0,0 +1,63 @@ -+ .text -+ .globl _start -+ .type _start,@function -+ .p2align 4 -+_start: -+ xorl %ebp, %ebp -+#ifdef __LP64__ -+ popq %rdi -+ movq %rsp, %rsi -+ andq $~15, %rsp -+#elif defined __x86_64__ -+ mov (%rsp),%edi -+ addl $4,%esp -+ movl %esp, %esi -+ andl $~15, %esp -+#else -+ popl %esi -+ movl %esp, %ecx -+ andl $~15, %esp -+ -+ subl $8,%esp -+ pushl %ecx -+ pushl %esi -+#endif -+ -+ call main -+ -+ hlt -+ -+ .type syscall, @function -+ .globl syscall -+ .p2align 4 -+syscall: -+#ifdef __x86_64__ -+ movq %rdi, %rax /* Syscall number -> rax. */ -+ movq %rsi, %rdi /* shift arg1 - arg5. */ -+ movq %rdx, %rsi -+ movq %rcx, %rdx -+ movq %r8, %r10 -+ movq %r9, %r8 -+ movq 8(%rsp),%r9 /* arg6 is on the stack. */ -+ syscall /* Do the system call. */ -+#else -+ push %ebp -+ push %edi -+ push %esi -+ push %ebx -+ mov 0x2c(%esp),%ebp -+ mov 0x28(%esp),%edi -+ mov 0x24(%esp),%esi -+ mov 0x20(%esp),%edx -+ mov 0x1c(%esp),%ecx -+ mov 0x18(%esp),%ebx -+ mov 0x14(%esp),%eax -+ int $0x80 -+ pop %ebx -+ pop %esi -+ pop %edi -+ pop %ebp -+#endif -+ ret /* Return to caller. */ -+ .size syscall, .-syscall -+ .section .note.GNU-stack,"",@progbits -diff --git a/ld/testsuite/ld-elf/linux-x86.exp b/ld/testsuite/ld-elf/linux-x86.exp -new file mode 100644 -index 0000000000..36217c6fb4 ---- /dev/null -+++ b/ld/testsuite/ld-elf/linux-x86.exp -@@ -0,0 +1,46 @@ -+# Expect script for simple native Linux/x86 tests. -+# Copyright (C) 2018 Free Software Foundation, Inc. -+# -+# This file is part of the GNU Binutils. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 3 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, -+# MA 02110-1301, USA. -+# -+ -+# Test very simple native Linux/x86 programs with linux-x86.S. -+if { ![isnative] || [which $CC] == 0 \ -+ || (![istarget "i?86-*-linux*"] \ -+ && ![istarget "x86_64-*-linux*"] \ -+ && ![istarget "amd64-*-linux*"]) } { -+ return -+} -+ -+# Add $PLT_CFLAGS if PLT is expected. -+global PLT_CFLAGS -+# Add $NOPIE_CFLAGS and $NOPIE_LDFLAGS if non-PIE is required. -+global NOPIE_CFLAGS NOPIE_LDFLAGS -+ -+run_ld_link_exec_tests [list \ -+ [list \ -+ "Run PR ld/23428 test" \ -+ "--no-dynamic-linker -z separate-code" \ -+ "" \ -+ { linux-x86.S pr23428.c } \ -+ "pr23428" \ -+ "pass.out" \ -+ "$NOPIE_CFLAGS -fno-asynchronous-unwind-tables" \ -+ "asm" \ -+ ] \ -+] -diff --git a/ld/testsuite/ld-elf/pr23428.c b/ld/testsuite/ld-elf/pr23428.c -new file mode 100644 -index 0000000000..3631ed7926 ---- /dev/null -+++ b/ld/testsuite/ld-elf/pr23428.c -@@ -0,0 +1,43 @@ -+#include -+#include -+#include -+ -+#define STRING_COMMA_LEN(STR) (STR), (sizeof (STR) - 1) -+ -+int -+main (int argc, char **argv) -+{ -+ char **ev = &argv[argc + 1]; -+ char **evp = ev; -+ ElfW(auxv_t) *av; -+ const ElfW(Phdr) *phdr = NULL; -+ size_t phnum = 0; -+ size_t loadnum = 0; -+ int fd = STDOUT_FILENO; -+ size_t i; -+ -+ while (*evp++ != NULL) -+ ; -+ -+ av = (ElfW(auxv_t) *) evp; -+ -+ for (; av->a_type != AT_NULL; ++av) -+ switch (av->a_type) -+ { -+ case AT_PHDR: -+ phdr = (const void *) av->a_un.a_val; -+ break; -+ case AT_PHNUM: -+ phnum = av->a_un.a_val; -+ break; -+ } -+ -+ for (i = 0; i < phnum; i++, phdr++) -+ if (phdr->p_type == PT_LOAD) -+ loadnum++; -+ -+ syscall (SYS_write, fd, STRING_COMMA_LEN ("PASS\n")); -+ -+ syscall (SYS_exit, !loadnum); -+ return 0; -+} -diff --git a/ld/testsuite/ld-elf/sec64k.exp b/ld/testsuite/ld-elf/sec64k.exp -index b58139e9dd..3909c0eaa1 100644 ---- a/ld/testsuite/ld-elf/sec64k.exp -+++ b/ld/testsuite/ld-elf/sec64k.exp -@@ -177,6 +177,8 @@ if { ![istarget "d10v-*-*"] - foreach sfile $sfiles { puts $ofd "#source: $sfile" } - if { [istarget spu*-*-*] } { - puts $ofd "#ld: --local-store 0:0" -+ } elseif { [istarget "i?86-*-linux*"] || [istarget "x86_64-*-linux*"] } { -+ puts $ofd "#ld: -z noseparate-code" - } else { - puts $ofd "#ld:" - } -diff --git a/ld/testsuite/ld-i386/abs-iamcu.d b/ld/testsuite/ld-i386/abs-iamcu.d -index ac9beff2e5..aba7d6b03f 100644 ---- a/ld/testsuite/ld-i386/abs-iamcu.d -+++ b/ld/testsuite/ld-i386/abs-iamcu.d -@@ -2,7 +2,7 @@ - #source: abs.s - #source: zero.s - #as: --32 -march=iamcu --#ld: -m elf_iamcu -+#ld: -m elf_iamcu -z noseparate-code - #objdump: -rs -j .text - - .*: file format .* -diff --git a/ld/testsuite/ld-i386/abs.d b/ld/testsuite/ld-i386/abs.d -index e660aca524..191ee4456a 100644 ---- a/ld/testsuite/ld-i386/abs.d -+++ b/ld/testsuite/ld-i386/abs.d -@@ -2,7 +2,7 @@ - #as: --32 - #source: abs.s - #source: zero.s --#ld: -melf_i386 -+#ld: -melf_i386 -z noseparate-code - #objdump: -rs - - .*: file format .* -diff --git a/ld/testsuite/ld-i386/pr12718.d b/ld/testsuite/ld-i386/pr12718.d -index ec51540a42..7eba52d95e 100644 ---- a/ld/testsuite/ld-i386/pr12718.d -+++ b/ld/testsuite/ld-i386/pr12718.d -@@ -1,6 +1,6 @@ - #name: PR ld/12718 - #as: --32 --#ld: -melf_i386 -+#ld: -melf_i386 -z noseparate-code - #readelf: -S - - There are 5 section headers, starting at offset 0x[0-9a-f]+: -diff --git a/ld/testsuite/ld-i386/pr12921.d b/ld/testsuite/ld-i386/pr12921.d -index e49079b3c8..ea2da3eb51 100644 ---- a/ld/testsuite/ld-i386/pr12921.d -+++ b/ld/testsuite/ld-i386/pr12921.d -@@ -1,6 +1,6 @@ - #name: PR ld/12921 - #as: --32 --#ld: -melf_i386 -+#ld: -melf_i386 -z noseparate-code - #readelf: -S --wide - - There are 7 section headers, starting at offset 0x[0-9a-f]+: -diff --git a/ld/testsuite/ld-linkonce/zeroeh.ld b/ld/testsuite/ld-linkonce/zeroeh.ld -index b22eaa12c9..f89855a08f 100644 ---- a/ld/testsuite/ld-linkonce/zeroeh.ld -+++ b/ld/testsuite/ld-linkonce/zeroeh.ld -@@ -2,4 +2,5 @@ SECTIONS { - .text 0xa00 : { *(.text); *(.gnu.linkonce.t.*) } - .gcc_except_table 0x2000 : { *(.gcc_except_table) } - .eh_frame 0x4000 : { *(.eh_frame) } -+ /DISCARD/ : { *(.note.gnu.property) } - } -diff --git a/ld/testsuite/ld-scripts/print-memory-usage.t b/ld/testsuite/ld-scripts/print-memory-usage.t -index 5ff057a5e3..6eda1d2dc4 100644 ---- a/ld/testsuite/ld-scripts/print-memory-usage.t -+++ b/ld/testsuite/ld-scripts/print-memory-usage.t -@@ -11,4 +11,6 @@ SECTIONS - *(.data) - *(.rw) - } -+ -+ /DISCARD/ : { *(.note.gnu.property) } - } -diff --git a/ld/testsuite/ld-scripts/size-2.t b/ld/testsuite/ld-scripts/size-2.t -index 723863995e..c3c4eddab4 100644 ---- a/ld/testsuite/ld-scripts/size-2.t -+++ b/ld/testsuite/ld-scripts/size-2.t -@@ -18,4 +18,5 @@ SECTIONS - LONG (SIZEOF (.tdata)) - LONG (SIZEOF (.tbss)) - } :image -+ /DISCARD/ : { *(.note.gnu.property) } - } -diff --git a/ld/testsuite/ld-x86-64/abs-k1om.d b/ld/testsuite/ld-x86-64/abs-k1om.d -index 2c26639fc0..6b0fde0eed 100644 ---- a/ld/testsuite/ld-x86-64/abs-k1om.d -+++ b/ld/testsuite/ld-x86-64/abs-k1om.d -@@ -2,7 +2,7 @@ - #source: ../ld-i386/abs.s - #source: ../ld-i386/zero.s - #as: --64 -march=k1om --#ld: -m elf_k1om -+#ld: -m elf_k1om -z noseparate-code - #objdump: -rs -j .text - - .*: file format .* -diff --git a/ld/testsuite/ld-x86-64/abs-l1om.d b/ld/testsuite/ld-x86-64/abs-l1om.d -index 1fb96d44b7..f87869f9d0 100644 ---- a/ld/testsuite/ld-x86-64/abs-l1om.d -+++ b/ld/testsuite/ld-x86-64/abs-l1om.d -@@ -2,7 +2,7 @@ - #source: ../ld-i386/abs.s - #source: ../ld-i386/zero.s - #as: --64 -march=l1om --#ld: -m elf_l1om -+#ld: -m elf_l1om -z noseparate-code - #objdump: -rs -j .text - #target: x86_64-*-linux* - -diff --git a/ld/testsuite/ld-x86-64/abs.d b/ld/testsuite/ld-x86-64/abs.d -index b24b018639..d99ab4685d 100644 ---- a/ld/testsuite/ld-x86-64/abs.d -+++ b/ld/testsuite/ld-x86-64/abs.d -@@ -1,7 +1,7 @@ - #name: Absolute non-overflowing relocs - #source: ../ld-i386/abs.s - #source: ../ld-i386/zero.s --#ld: -+#ld: -z noseparate-code - #objdump: -rs - - .*: file format .* -diff --git a/ld/testsuite/ld-x86-64/pr12718.d b/ld/testsuite/ld-x86-64/pr12718.d -index 07d17325d0..2c503ffbaa 100644 ---- a/ld/testsuite/ld-x86-64/pr12718.d -+++ b/ld/testsuite/ld-x86-64/pr12718.d -@@ -1,6 +1,6 @@ - #name: PR ld/12718 - #as: --64 --#ld: -melf_x86_64 -+#ld: -melf_x86_64 -z noseparate-code - #readelf: -S --wide - - There are 5 section headers, starting at offset 0x[0-9a-f]+: -diff --git a/ld/testsuite/ld-x86-64/pr12921.d b/ld/testsuite/ld-x86-64/pr12921.d -index 6fe6abee09..1162d55818 100644 ---- a/ld/testsuite/ld-x86-64/pr12921.d -+++ b/ld/testsuite/ld-x86-64/pr12921.d -@@ -1,6 +1,6 @@ - #name: PR ld/12921 - #as: --64 --#ld: -melf_x86_64 -+#ld: -melf_x86_64 -z noseparate-code - #readelf: -S --wide - - There are 7 section headers, starting at offset 0x[0-9a-f]+: -diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp -index cfbefe9028..1095091882 100644 ---- a/ld/testsuite/lib/ld-lib.exp -+++ b/ld/testsuite/lib/ld-lib.exp -@@ -1482,7 +1482,10 @@ proc run_ld_link_exec_tests { ldtests args } { - continue - } - -- if { [ string match "c++" $lang ] } { -+ if { [ string match "asm" $lang ] } { -+ set link_proc ld_link -+ set link_cmd $ld -+ } elseif { [ string match "c++" $lang ] } { - set link_proc ld_link - set link_cmd $CXX - } else { --- -2.20.1 - diff --git a/pkgs/development/tools/misc/binutils/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch b/pkgs/development/tools/misc/binutils/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch deleted file mode 100644 index ca50d9a57cd..00000000000 --- a/pkgs/development/tools/misc/binutils/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch +++ /dev/null @@ -1,137 +0,0 @@ -From 28a27bdbb9500797e6767f80c8128b09112aeed5 Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" -Date: Sat, 11 Aug 2018 06:41:33 -0700 -Subject: [PATCH] x86: Properly add X86_ISA_1_NEEDED property - -Existing properties may be removed during property merging. We avoid -adding X86_ISA_1_NEEDED property only if existing properties won't be -removed. - -bfd/ - - PR ld/23428 - * elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): Don't - add X86_ISA_1_NEEDED property only if existing properties won't - be removed. - -ld/ - - PR ld/23428 - * testsuite/ld-elf/dummy.s: New file. - * testsuite/ld-elf/linux-x86.S: Add X86_FEATURE_1_AND property. - * testsuite/ld-elf/linux-x86.exp: Add dummy.s to pr23428. - -(cherry picked from commit ab9e342807d132182892de1be1a92d6e91a5c1da) ---- - bfd/elfxx-x86.c | 28 ++++++++++++++++++++++------ - ld/testsuite/ld-elf/dummy.s | 1 + - ld/testsuite/ld-elf/linux-x86.S | 28 ++++++++++++++++++++++++++++ - ld/testsuite/ld-elf/linux-x86.exp | 2 +- - 6 files changed, 66 insertions(+), 7 deletions(-) - create mode 100644 ld/testsuite/ld-elf/dummy.s - -diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c -index 7ccfd25815..2d8f7b640b 100644 ---- a/bfd/elfxx-x86.c -+++ b/bfd/elfxx-x86.c -@@ -2588,7 +2588,6 @@ _bfd_x86_elf_link_setup_gnu_properties - prop->pr_kind = property_number; - } - else if (has_text -- && elf_properties (ebfd) == NULL - && elf_tdata (info->output_bfd)->o->build_id.sec == NULL - && !htab->elf.dynamic_sections_created - && !info->traditional_format -@@ -2598,11 +2597,28 @@ _bfd_x86_elf_link_setup_gnu_properties - /* If the separate code program header is needed, make sure - that the first read-only PT_LOAD segment has no code by - adding a GNU_PROPERTY_X86_ISA_1_NEEDED note. */ -- prop = _bfd_elf_get_property (ebfd, -- GNU_PROPERTY_X86_ISA_1_NEEDED, -- 4); -- prop->u.number = GNU_PROPERTY_X86_ISA_1_486; -- prop->pr_kind = property_number; -+ elf_property_list *list; -+ bfd_boolean need_property = TRUE; -+ -+ for (list = elf_properties (ebfd); list; list = list->next) -+ switch (list->property.pr_type) -+ { -+ case GNU_PROPERTY_STACK_SIZE: -+ case GNU_PROPERTY_NO_COPY_ON_PROTECTED: -+ case GNU_PROPERTY_X86_ISA_1_NEEDED: -+ /* These properties won't be removed during merging. */ -+ need_property = FALSE; -+ break; -+ } -+ -+ if (need_property) -+ { -+ prop = _bfd_elf_get_property (ebfd, -+ GNU_PROPERTY_X86_ISA_1_NEEDED, -+ 4); -+ prop->u.number = GNU_PROPERTY_X86_ISA_1_486; -+ prop->pr_kind = property_number; -+ } - } - - /* Create the GNU property note section if needed. */ -diff --git a/ld/testsuite/ld-elf/dummy.s b/ld/testsuite/ld-elf/dummy.s -new file mode 100644 -index 0000000000..403f98000d ---- /dev/null -+++ b/ld/testsuite/ld-elf/dummy.s -@@ -0,0 +1 @@ -+# Dummy -diff --git a/ld/testsuite/ld-elf/linux-x86.S b/ld/testsuite/ld-elf/linux-x86.S -index bdf40c6e01..d94abc1106 100644 ---- a/ld/testsuite/ld-elf/linux-x86.S -+++ b/ld/testsuite/ld-elf/linux-x86.S -@@ -61,3 +61,31 @@ syscall: - ret /* Return to caller. */ - .size syscall, .-syscall - .section .note.GNU-stack,"",@progbits -+ -+ .section ".note.gnu.property", "a" -+#ifdef __LP64__ -+ .p2align 3 -+#else -+ .p2align 2 -+#endif -+ .long 1f - 0f /* name length */ -+ .long 5f - 2f /* data length */ -+ .long 5 /* note type */ -+0: .asciz "GNU" /* vendor name */ -+1: -+#ifdef __LP64__ -+ .p2align 3 -+#else -+ .p2align 2 -+#endif -+2: .long 0xc0000002 /* pr_type. */ -+ .long 4f - 3f /* pr_datasz. */ -+3: -+ .long 0x2 -+4: -+#ifdef __LP64__ -+ .p2align 3 -+#else -+ .p2align 2 -+#endif -+5: -diff --git a/ld/testsuite/ld-elf/linux-x86.exp b/ld/testsuite/ld-elf/linux-x86.exp -index 36217c6fb4..f6f5a80853 100644 ---- a/ld/testsuite/ld-elf/linux-x86.exp -+++ b/ld/testsuite/ld-elf/linux-x86.exp -@@ -37,7 +37,7 @@ run_ld_link_exec_tests [list \ - "Run PR ld/23428 test" \ - "--no-dynamic-linker -z separate-code" \ - "" \ -- { linux-x86.S pr23428.c } \ -+ { linux-x86.S pr23428.c dummy.s } \ - "pr23428" \ - "pass.out" \ - "$NOPIE_CFLAGS -fno-asynchronous-unwind-tables" \ --- -2.20.1 - diff --git a/pkgs/development/tools/misc/binutils/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch b/pkgs/development/tools/misc/binutils/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch deleted file mode 100644 index 866d6db8ce2..00000000000 --- a/pkgs/development/tools/misc/binutils/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch +++ /dev/null @@ -1,583 +0,0 @@ -From d55c3e36094f06bb1fb02f5eac19fdccf1d91f7e Mon Sep 17 00:00:00 2001 -From: "H.J. Lu" -Date: Wed, 8 Aug 2018 06:09:15 -0700 -Subject: [PATCH] x86: Properly merge GNU_PROPERTY_X86_ISA_1_USED -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Without the GNU_PROPERTY_X86_ISA_1_USED property, all ISAs may be used. -If a bit in the GNU_PROPERTY_X86_ISA_1_USED property is unset, the -corresponding x86 instruction set isn’t used. When merging properties -from 2 input files and one input file doesn't have the -GNU_PROPERTY_X86_ISA_1_USED property, the output file shouldn't have -it neither. This patch removes the GNU_PROPERTY_X86_ISA_1_USED -property if an input file doesn't have it. - -This patch replaces the GNU_PROPERTY_X86_ISA_1_USED property with the -GNU_PROPERTY_X86_ISA_1_NEEDED property which is the minimum ISA -requirement. - -bfd/ - - PR ld/23486 - * elfxx-x86.c (_bfd_x86_elf_merge_gnu_properties): Remove - GNU_PROPERTY_X86_ISA_1_USED if an input file doesn't have it. - (_bfd_x86_elf_link_setup_gnu_properties): Adding the - GNU_PROPERTY_X86_ISA_1_NEEDED, instead of - GNU_PROPERTY_X86_ISA_1_USED, property. - -ld/ - - PR ld/23486 - * testsuite/ld-i386/i386.exp: Run PR ld/23486 tests. - * testsuite/ld-x86-64/x86-64.exp: Likewise. - * testsuite/ld-i386/pr23486a.d: New file. - * testsuite/ld-i386/pr23486b.d: Likewise. - * testsuite/ld-x86-64/pr23486a-x32.d: Likewise. - * testsuite/ld-x86-64/pr23486a.d: Likewise. - * testsuite/ld-x86-64/pr23486a.s: Likewise. - * testsuite/ld-x86-64/pr23486b-x32.d: Likewise. - * testsuite/ld-x86-64/pr23486b.d: Likewise. - * testsuite/ld-x86-64/pr23486b.s: Likewise. - * testsuite/ld-i386/property-3.r: Remove "x86 ISA used". - * testsuite/ld-i386/property-4.r: Likewise. - * testsuite/ld-i386/property-5.r: Likewise. - * testsuite/ld-i386/property-x86-ibt3a.d: Likewise. - * testsuite/ld-i386/property-x86-ibt3b.d: Likewise. - * testsuite/ld-i386/property-x86-shstk3a.d: Likewise. - * testsuite/ld-i386/property-x86-shstk3b.d: Likewise. - * testsuite/ld-x86-64/property-3.r: Likewise. - * testsuite/ld-x86-64/property-4.r: Likewise. - * testsuite/ld-x86-64/property-5.r: Likewise. - * testsuite/ld-x86-64/property-x86-ibt3a-x32.d: Likewise. - * testsuite/ld-x86-64/property-x86-ibt3a.d: Likewise. - * testsuite/ld-x86-64/property-x86-ibt3b-x32.d: Likewise. - * testsuite/ld-x86-64/property-x86-ibt3b.d: Likewise. - * testsuite/ld-x86-64/property-x86-shstk3a-x32.d: Likewise. - * testsuite/ld-x86-64/property-x86-shstk3a.d: Likewise. - * testsuite/ld-x86-64/property-x86-shstk3b-x32.d: Likewise. - * testsuite/ld-x86-64/property-x86-shstk3b.d: Likewise. - -(cherry picked from commit f7309df20c4e787041cedc4a6aced89c15259e54) ---- - bfd/elfxx-x86.c | 25 ++++++++++++--- - ld/testsuite/ld-i386/i386.exp | 2 ++ - ld/testsuite/ld-i386/pr23486a.d | 10 ++++++ - ld/testsuite/ld-i386/pr23486b.d | 10 ++++++ - ld/testsuite/ld-i386/property-3.r | 1 - - ld/testsuite/ld-i386/property-4.r | 1 - - ld/testsuite/ld-i386/property-5.r | 1 - - ld/testsuite/ld-i386/property-x86-ibt3a.d | 5 ++- - ld/testsuite/ld-i386/property-x86-ibt3b.d | 5 ++- - ld/testsuite/ld-i386/property-x86-shstk3a.d | 5 ++- - ld/testsuite/ld-i386/property-x86-shstk3b.d | 5 ++- - ld/testsuite/ld-x86-64/pr23486a-x32.d | 10 ++++++ - ld/testsuite/ld-x86-64/pr23486a.d | 10 ++++++ - ld/testsuite/ld-x86-64/pr23486a.s | 30 +++++++++++++++++ - ld/testsuite/ld-x86-64/pr23486b-x32.d | 10 ++++++ - ld/testsuite/ld-x86-64/pr23486b.d | 10 ++++++ - ld/testsuite/ld-x86-64/pr23486b.s | 30 +++++++++++++++++ - ld/testsuite/ld-x86-64/property-3.r | 1 - - ld/testsuite/ld-x86-64/property-4.r | 1 - - ld/testsuite/ld-x86-64/property-5.r | 1 - - .../ld-x86-64/property-x86-ibt3a-x32.d | 5 ++- - ld/testsuite/ld-x86-64/property-x86-ibt3a.d | 5 ++- - .../ld-x86-64/property-x86-ibt3b-x32.d | 5 ++- - ld/testsuite/ld-x86-64/property-x86-ibt3b.d | 5 ++- - .../ld-x86-64/property-x86-shstk3a-x32.d | 5 ++- - ld/testsuite/ld-x86-64/property-x86-shstk3a.d | 5 ++- - .../ld-x86-64/property-x86-shstk3b-x32.d | 5 ++- - ld/testsuite/ld-x86-64/property-x86-shstk3b.d | 5 ++- - ld/testsuite/ld-x86-64/x86-64.exp | 4 +++ - 31 files changed, 211 insertions(+), 47 deletions(-) - create mode 100644 ld/testsuite/ld-i386/pr23486a.d - create mode 100644 ld/testsuite/ld-i386/pr23486b.d - create mode 100644 ld/testsuite/ld-x86-64/pr23486a-x32.d - create mode 100644 ld/testsuite/ld-x86-64/pr23486a.d - create mode 100644 ld/testsuite/ld-x86-64/pr23486a.s - create mode 100644 ld/testsuite/ld-x86-64/pr23486b-x32.d - create mode 100644 ld/testsuite/ld-x86-64/pr23486b.d - create mode 100644 ld/testsuite/ld-x86-64/pr23486b.s - ---- a/bfd/elfxx-x86.c -+++ b/bfd/elfxx-x86.c -@@ -2407,12 +2407,27 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info, - switch (pr_type) - { - case GNU_PROPERTY_X86_ISA_1_USED: -+ if (aprop == NULL || bprop == NULL) -+ { -+ /* Only one of APROP and BPROP can be NULL. */ -+ if (aprop != NULL) -+ { -+ /* Remove this property since the other input file doesn't -+ have it. */ -+ aprop->pr_kind = property_remove; -+ updated = TRUE; -+ } -+ break; -+ } -+ goto or_property; -+ - case GNU_PROPERTY_X86_ISA_1_NEEDED: - if (aprop != NULL && bprop != NULL) - { -+or_property: - number = aprop->u.number; - aprop->u.number = number | bprop->u.number; -- /* Remove the property if ISA bits are empty. */ -+ /* Remove the property if all bits are empty. */ - if (aprop->u.number == 0) - { - aprop->pr_kind = property_remove; -@@ -2428,14 +2443,14 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info, - { - if (aprop->u.number == 0) - { -- /* Remove APROP if ISA bits are empty. */ -+ /* Remove APROP if all bits are empty. */ - aprop->pr_kind = property_remove; - updated = TRUE; - } - } - else - { -- /* Return TRUE if APROP is NULL and ISA bits of BPROP -+ /* Return TRUE if APROP is NULL and all bits of BPROP - aren't empty to indicate that BPROP should be added - to ABFD. */ - updated = bprop->u.number != 0; -@@ -2582,9 +2597,9 @@ _bfd_x86_elf_link_setup_gnu_properties - { - /* If the separate code program header is needed, make sure - that the first read-only PT_LOAD segment has no code by -- adding a GNU_PROPERTY_X86_ISA_1_USED note. */ -+ adding a GNU_PROPERTY_X86_ISA_1_NEEDED note. */ - prop = _bfd_elf_get_property (ebfd, -- GNU_PROPERTY_X86_ISA_1_USED, -+ GNU_PROPERTY_X86_ISA_1_NEEDED, - 4); - prop->u.number = GNU_PROPERTY_X86_ISA_1_486; - prop->pr_kind = property_number; -diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp -index 6d794fe653..78dad02579 100644 ---- a/ld/testsuite/ld-i386/i386.exp -+++ b/ld/testsuite/ld-i386/i386.exp -@@ -462,6 +462,8 @@ run_dump_test "pr23189" - run_dump_test "pr23194" - run_dump_test "pr23372a" - run_dump_test "pr23372b" -+run_dump_test "pr23486a" -+run_dump_test "pr23486b" - - if { !([istarget "i?86-*-linux*"] - || [istarget "i?86-*-gnu*"] -diff --git a/ld/testsuite/ld-i386/pr23486a.d b/ld/testsuite/ld-i386/pr23486a.d -new file mode 100644 -index 0000000000..41a6dcf7d5 ---- /dev/null -+++ b/ld/testsuite/ld-i386/pr23486a.d -@@ -0,0 +1,10 @@ -+#source: ../ld-x86-64/pr23486a.s -+#source: ../ld-x86-64/pr23486b.s -+#as: --32 -+#ld: -r -m elf_i386 -+#readelf: -n -+ -+Displaying notes found in: .note.gnu.property -+ Owner Data size Description -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586 -diff --git a/ld/testsuite/ld-i386/pr23486b.d b/ld/testsuite/ld-i386/pr23486b.d -new file mode 100644 -index 0000000000..08019b7274 ---- /dev/null -+++ b/ld/testsuite/ld-i386/pr23486b.d -@@ -0,0 +1,10 @@ -+#source: ../ld-x86-64/pr23486b.s -+#source: ../ld-x86-64/pr23486a.s -+#as: --32 -+#ld: -r -m elf_i386 -+#readelf: -n -+ -+Displaying notes found in: .note.gnu.property -+ Owner Data size Description -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586 -diff --git a/ld/testsuite/ld-i386/property-3.r b/ld/testsuite/ld-i386/property-3.r -index 0ed91f5922..d03203c1e5 100644 ---- a/ld/testsuite/ld-i386/property-3.r -+++ b/ld/testsuite/ld-i386/property-3.r -@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property - Owner Data size Description - GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: stack size: 0x800000 -- x86 ISA used: 586, SSE - x86 ISA needed: i486, 586 - #pass -diff --git a/ld/testsuite/ld-i386/property-4.r b/ld/testsuite/ld-i386/property-4.r -index cb2bc15d9a..da295eb6c7 100644 ---- a/ld/testsuite/ld-i386/property-4.r -+++ b/ld/testsuite/ld-i386/property-4.r -@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property - Owner Data size Description - GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: stack size: 0x800000 -- x86 ISA used: i486, 586, SSE - x86 ISA needed: i486, 586, SSE - #pass -diff --git a/ld/testsuite/ld-i386/property-5.r b/ld/testsuite/ld-i386/property-5.r -index 552965058c..e4141594b3 100644 ---- a/ld/testsuite/ld-i386/property-5.r -+++ b/ld/testsuite/ld-i386/property-5.r -@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property - Owner Data size Description - GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: stack size: 0x900000 -- x86 ISA used: i486, 586, SSE - x86 ISA needed: i486, 586, SSE - #pass -diff --git a/ld/testsuite/ld-i386/property-x86-ibt3a.d b/ld/testsuite/ld-i386/property-x86-ibt3a.d -index 4bb35b00fb..0aedea1614 100644 ---- a/ld/testsuite/ld-i386/property-x86-ibt3a.d -+++ b/ld/testsuite/ld-i386/property-x86-ibt3a.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: i486, 586, SSE2, SSE3 -- x86 ISA needed: 586, SSE, SSE3, SSE4_1 -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1 -diff --git a/ld/testsuite/ld-i386/property-x86-ibt3b.d b/ld/testsuite/ld-i386/property-x86-ibt3b.d -index 418d58a8f7..bd69ac6478 100644 ---- a/ld/testsuite/ld-i386/property-x86-ibt3b.d -+++ b/ld/testsuite/ld-i386/property-x86-ibt3b.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: i486, 586, SSE2, SSE3 -- x86 ISA needed: 586, SSE, SSE3, SSE4_1 -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1 -diff --git a/ld/testsuite/ld-i386/property-x86-shstk3a.d b/ld/testsuite/ld-i386/property-x86-shstk3a.d -index e261038f60..76d2a39f2c 100644 ---- a/ld/testsuite/ld-i386/property-x86-shstk3a.d -+++ b/ld/testsuite/ld-i386/property-x86-shstk3a.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: i486, 586, SSE2, SSE3 -- x86 ISA needed: 586, SSE, SSE3, SSE4_1 -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1 -diff --git a/ld/testsuite/ld-i386/property-x86-shstk3b.d b/ld/testsuite/ld-i386/property-x86-shstk3b.d -index 25f3d2361e..e770ecffa5 100644 ---- a/ld/testsuite/ld-i386/property-x86-shstk3b.d -+++ b/ld/testsuite/ld-i386/property-x86-shstk3b.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: i486, 586, SSE2, SSE3 -- x86 ISA needed: 586, SSE, SSE3, SSE4_1 -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1 -diff --git a/ld/testsuite/ld-x86-64/pr23486a-x32.d b/ld/testsuite/ld-x86-64/pr23486a-x32.d -new file mode 100644 -index 0000000000..6d9fa68cdb ---- /dev/null -+++ b/ld/testsuite/ld-x86-64/pr23486a-x32.d -@@ -0,0 +1,10 @@ -+#source: pr23486a.s -+#source: pr23486b.s -+#as: --x32 -+#ld: -r -m elf32_x86_64 -+#readelf: -n -+ -+Displaying notes found in: .note.gnu.property -+ Owner Data size Description -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586 -diff --git a/ld/testsuite/ld-x86-64/pr23486a.d b/ld/testsuite/ld-x86-64/pr23486a.d -new file mode 100644 -index 0000000000..dc2b7bf760 ---- /dev/null -+++ b/ld/testsuite/ld-x86-64/pr23486a.d -@@ -0,0 +1,10 @@ -+#source: pr23486a.s -+#source: pr23486b.s -+#as: --64 -defsym __64_bit__=1 -+#ld: -r -m elf_x86_64 -+#readelf: -n -+ -+Displaying notes found in: .note.gnu.property -+ Owner Data size Description -+ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586 -diff --git a/ld/testsuite/ld-x86-64/pr23486a.s b/ld/testsuite/ld-x86-64/pr23486a.s -new file mode 100644 -index 0000000000..a07d0c7ced ---- /dev/null -+++ b/ld/testsuite/ld-x86-64/pr23486a.s -@@ -0,0 +1,30 @@ -+ .section ".note.gnu.property", "a" -+.ifdef __64_bit__ -+ .p2align 3 -+.else -+ .p2align 2 -+.endif -+ .long 1f - 0f /* name length. */ -+ .long 4f - 1f /* data length. */ -+ /* NT_GNU_PROPERTY_TYPE_0 */ -+ .long 5 /* note type. */ -+0: -+ .asciz "GNU" /* vendor name. */ -+1: -+.ifdef __64_bit__ -+ .p2align 3 -+.else -+ .p2align 2 -+.endif -+ /* GNU_PROPERTY_X86_ISA_1_USED */ -+ .long 0xc0000000 /* pr_type. */ -+ .long 3f - 2f /* pr_datasz. */ -+2: -+ .long 0xa -+3: -+.ifdef __64_bit__ -+ .p2align 3 -+.else -+ .p2align 2 -+.endif -+4: -diff --git a/ld/testsuite/ld-x86-64/pr23486b-x32.d b/ld/testsuite/ld-x86-64/pr23486b-x32.d -new file mode 100644 -index 0000000000..0445e69d82 ---- /dev/null -+++ b/ld/testsuite/ld-x86-64/pr23486b-x32.d -@@ -0,0 +1,10 @@ -+#source: pr23486b.s -+#source: pr23486a.s -+#as: --x32 -+#ld: -r -m elf32_x86_64 -+#readelf: -n -+ -+Displaying notes found in: .note.gnu.property -+ Owner Data size Description -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586 -diff --git a/ld/testsuite/ld-x86-64/pr23486b.d b/ld/testsuite/ld-x86-64/pr23486b.d -new file mode 100644 -index 0000000000..dc2b7bf760 ---- /dev/null -+++ b/ld/testsuite/ld-x86-64/pr23486b.d -@@ -0,0 +1,10 @@ -+#source: pr23486a.s -+#source: pr23486b.s -+#as: --64 -defsym __64_bit__=1 -+#ld: -r -m elf_x86_64 -+#readelf: -n -+ -+Displaying notes found in: .note.gnu.property -+ Owner Data size Description -+ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586 -diff --git a/ld/testsuite/ld-x86-64/pr23486b.s b/ld/testsuite/ld-x86-64/pr23486b.s -new file mode 100644 -index 0000000000..c5167eeb65 ---- /dev/null -+++ b/ld/testsuite/ld-x86-64/pr23486b.s -@@ -0,0 +1,30 @@ -+ .section ".note.gnu.property", "a" -+.ifdef __64_bit__ -+ .p2align 3 -+.else -+ .p2align 2 -+.endif -+ .long 1f - 0f /* name length. */ -+ .long 4f - 1f /* data length. */ -+ /* NT_GNU_PROPERTY_TYPE_0 */ -+ .long 5 /* note type. */ -+0: -+ .asciz "GNU" /* vendor name. */ -+1: -+.ifdef __64_bit__ -+ .p2align 3 -+.else -+ .p2align 2 -+.endif -+ /* GNU_PROPERTY_X86_ISA_1_NEEDED */ -+ .long 0xc0000001 /* pr_type. */ -+ .long 3f - 2f /* pr_datasz. */ -+2: -+ .long 0x3 -+3: -+.ifdef __64_bit__ -+ .p2align 3 -+.else -+ .p2align 2 -+.endif -+4: -diff --git a/ld/testsuite/ld-x86-64/property-3.r b/ld/testsuite/ld-x86-64/property-3.r -index 0ed91f5922..d03203c1e5 100644 ---- a/ld/testsuite/ld-x86-64/property-3.r -+++ b/ld/testsuite/ld-x86-64/property-3.r -@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property - Owner Data size Description - GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: stack size: 0x800000 -- x86 ISA used: 586, SSE - x86 ISA needed: i486, 586 - #pass -diff --git a/ld/testsuite/ld-x86-64/property-4.r b/ld/testsuite/ld-x86-64/property-4.r -index cb2bc15d9a..da295eb6c7 100644 ---- a/ld/testsuite/ld-x86-64/property-4.r -+++ b/ld/testsuite/ld-x86-64/property-4.r -@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property - Owner Data size Description - GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: stack size: 0x800000 -- x86 ISA used: i486, 586, SSE - x86 ISA needed: i486, 586, SSE - #pass -diff --git a/ld/testsuite/ld-x86-64/property-5.r b/ld/testsuite/ld-x86-64/property-5.r -index 552965058c..e4141594b3 100644 ---- a/ld/testsuite/ld-x86-64/property-5.r -+++ b/ld/testsuite/ld-x86-64/property-5.r -@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property - Owner Data size Description - GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 - Properties: stack size: 0x900000 -- x86 ISA used: i486, 586, SSE - x86 ISA needed: i486, 586, SSE - #pass -diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d b/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d -index 011426f5a4..4cec728dc7 100644 ---- a/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d -+++ b/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -- x86 ISA needed: i486, 586, SSE2, SSE3 -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 -diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3a.d b/ld/testsuite/ld-x86-64/property-x86-ibt3a.d -index 1b4229a037..a8df49a351 100644 ---- a/ld/testsuite/ld-x86-64/property-x86-ibt3a.d -+++ b/ld/testsuite/ld-x86-64/property-x86-ibt3a.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -- x86 ISA needed: i486, 586, SSE2, SSE3 -+ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 -diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d b/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d -index 290ed6abf1..c112626711 100644 ---- a/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d -+++ b/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -- x86 ISA needed: i486, 586, SSE2, SSE3 -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 -diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3b.d b/ld/testsuite/ld-x86-64/property-x86-ibt3b.d -index 1142e03272..f10dffdc2c 100644 ---- a/ld/testsuite/ld-x86-64/property-x86-ibt3b.d -+++ b/ld/testsuite/ld-x86-64/property-x86-ibt3b.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -- x86 ISA needed: i486, 586, SSE2, SSE3 -+ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 -diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d b/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d -index 819542d181..0147a3c7b6 100644 ---- a/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d -+++ b/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -- x86 ISA needed: i486, 586, SSE2, SSE3 -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 -diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3a.d b/ld/testsuite/ld-x86-64/property-x86-shstk3a.d -index 4c5d0e0a18..1f8c2dc929 100644 ---- a/ld/testsuite/ld-x86-64/property-x86-shstk3a.d -+++ b/ld/testsuite/ld-x86-64/property-x86-shstk3a.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -- x86 ISA needed: i486, 586, SSE2, SSE3 -+ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 -diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d b/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d -index ba181e0bc5..7ca2539ca5 100644 ---- a/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d -+++ b/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -- x86 ISA needed: i486, 586, SSE2, SSE3 -+ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 -diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3b.d b/ld/testsuite/ld-x86-64/property-x86-shstk3b.d -index 5216f385dd..f66a40e449 100644 ---- a/ld/testsuite/ld-x86-64/property-x86-shstk3b.d -+++ b/ld/testsuite/ld-x86-64/property-x86-shstk3b.d -@@ -6,6 +6,5 @@ - - Displaying notes found in: .note.gnu.property - Owner Data size Description -- GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 -- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 -- x86 ISA needed: i486, 586, SSE2, SSE3 -+ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 -+ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 -diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp -index 6edb9e86f4..ae21e554ad 100644 ---- a/ld/testsuite/ld-x86-64/x86-64.exp -+++ b/ld/testsuite/ld-x86-64/x86-64.exp -@@ -403,6 +403,10 @@ run_dump_test "pr23372a" - run_dump_test "pr23372a-x32" - run_dump_test "pr23372b" - run_dump_test "pr23372b-x32" -+run_dump_test "pr23486a" -+run_dump_test "pr23486a-x32" -+run_dump_test "pr23486b" -+run_dump_test "pr23486b-x32" - - if { ![istarget "x86_64-*-linux*"] && ![istarget "x86_64-*-nacl*"]} { - return --- -2.20.1 - diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index e1ff92d00f4..ebbddbb2190 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -8,15 +8,13 @@ , bison ? null , flex , texinfo +, perl }: let reuseLibs = enableShared && withAllTargets; - # Remove gold-symbol-visibility patch when updating, the proper fix - # is now upstream. - # https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=330b90b5ffbbc20c5de6ae6c7f60c40fab2e7a4f;hp=99181ccac0fc7d82e7dabb05dc7466e91f1645d3 - version = "2.33.1"; + version = "2.34"; basename = "binutils"; # The targetPrefix prepended to binary names to allow multiple binuntils on the # PATH to both be usable. @@ -31,7 +29,7 @@ let # HACK to ensure that we preserve source from bootstrap binutils to not rebuild LLVM normal-src = stdenv.__bootPackages.binutils-unwrapped.src or (fetchurl { url = "mirror://gnu/binutils/${basename}-${version}.tar.bz2"; - sha256 = "1cmd0riv37bqy9mwbg6n3523qgr8b3bbm5kwj19sjrasl4yq9d0c"; + sha256 = "1rin1f5c7wm4n3piky6xilcrpf2s0n3dd5vqq8irrxkcic3i1w49"; }); in @@ -64,10 +62,6 @@ stdenv.mkDerivation { # cross-compiling. ./always-search-rpath.patch - ] ++ lib.optionals (!stdenv.targetPlatform.isVc4) - [ - # https://sourceware.org/bugzilla/show_bug.cgi?id=22868 - ./gold-symbol-visibility.patch ] ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch; outputs = [ "out" "info" "man" ]; @@ -75,9 +69,11 @@ stdenv.mkDerivation { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ bison + perl + texinfo ] ++ (lib.optionals stdenv.targetPlatform.isiOS [ autoreconfHook - ]) ++ lib.optionals stdenv.targetPlatform.isVc4 [ texinfo flex ]; + ]) ++ lib.optionals stdenv.targetPlatform.isVc4 [ flex ]; buildInputs = [ zlib gettext ]; inherit noSysDirs; diff --git a/pkgs/development/tools/misc/binutils/gold-symbol-visibility.patch b/pkgs/development/tools/misc/binutils/gold-symbol-visibility.patch deleted file mode 100644 index 0fb05a482d1..00000000000 --- a/pkgs/development/tools/misc/binutils/gold-symbol-visibility.patch +++ /dev/null @@ -1,79 +0,0 @@ -commit 8564af037f5c4c6d2744a89497691359205b2bbc -Author: Shea Levy -Date: Mon Mar 19 10:52:40 2018 -0400 - - Revert "Allow multiply-defined absolute symbols when they have the same value." - - This reverts commit 5dc824ed42cd173c1525f5abc76f4091f11a4dbc. - -diff --git a/gold/ChangeLog-2017 b/gold/ChangeLog-2017 -index b2a47710b5..d7ca1b48c0 100644 ---- a/gold/ChangeLog-2017 -+++ b/gold/ChangeLog-2017 -@@ -114,11 +114,6 @@ - (localedir): Define as @localedir@. - (gnulocaledir, gettextsrcdir): Use @datarootdir@. - --2017-11-28 Cary Coutant -- -- * resolve.cc (Symbol_table::resolve): Allow multiply-defined absolute -- symbols when they have the same value. -- - 2017-11-28 Cary Coutant - - * object.h (class Sized_relobj_file): Remove discarded_eh_frame_shndx_. -diff --git a/gold/resolve.cc b/gold/resolve.cc -index 4a5784cf8b..803576bfed 100644 ---- a/gold/resolve.cc -+++ b/gold/resolve.cc -@@ -247,28 +247,18 @@ Symbol_table::resolve(Sized_symbol* to, - Object* object, const char* version, - bool is_default_version) - { -- bool to_is_ordinary; -- const unsigned int to_shndx = to->shndx(&to_is_ordinary); -- - // It's possible for a symbol to be defined in an object file - // using .symver to give it a version, and for there to also be - // a linker script giving that symbol the same version. We - // don't want to give a multiple-definition error for this - // harmless redefinition. -+ bool to_is_ordinary; - if (to->source() == Symbol::FROM_OBJECT - && to->object() == object -- && to->is_defined() - && is_ordinary -+ && to->is_defined() -+ && to->shndx(&to_is_ordinary) == st_shndx - && to_is_ordinary -- && to_shndx == st_shndx -- && to->value() == sym.get_st_value()) -- return; -- -- // Likewise for an absolute symbol defined twice with the same value. -- if (!is_ordinary -- && st_shndx == elfcpp::SHN_ABS -- && !to_is_ordinary -- && to_shndx == elfcpp::SHN_ABS - && to->value() == sym.get_st_value()) - return; - -@@ -360,8 +350,8 @@ Symbol_table::resolve(Sized_symbol* to, - && (sym.get_st_bind() == elfcpp::STB_WEAK - || to->binding() == elfcpp::STB_WEAK) - && orig_st_shndx != elfcpp::SHN_UNDEF -+ && to->shndx(&to_is_ordinary) != elfcpp::SHN_UNDEF - && to_is_ordinary -- && to_shndx != elfcpp::SHN_UNDEF - && sym.get_st_size() != 0 // Ignore weird 0-sized symbols. - && to->symsize() != 0 - && (sym.get_st_type() != to->type() -@@ -372,7 +362,7 @@ Symbol_table::resolve(Sized_symbol* to, - { - Symbol_location fromloc - = { object, orig_st_shndx, static_cast(sym.get_st_value()) }; -- Symbol_location toloc = { to->object(), to_shndx, -+ Symbol_location toloc = { to->object(), to->shndx(&to_is_ordinary), - static_cast(to->value()) }; - this->candidate_odr_violations_[to->name()].insert(fromloc); - this->candidate_odr_violations_[to->name()].insert(toloc); -- cgit v1.2.3 From ebdf027f101c6734625c434c0a948d633581ac87 Mon Sep 17 00:00:00 2001 From: Kimat Boven Date: Sun, 26 Apr 2020 23:36:23 +0200 Subject: helm: 3.1.3 -> 3.2.0 --- pkgs/applications/networking/cluster/helm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 0eac175a170..deb6d75f12c 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "helm"; - version = "3.1.3"; + version = "3.2.0"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "1j6pr1a9ff32bnjq9rncllmfpraip5r2fj3zsljw5jq68x5wamdc"; + sha256 = "1x05xnc3czk7vpn9qnfdavdjy5agv800nh7jyqczpiw125l9jfyd"; }; - modSha256 = "0618zzi4x37ahsrazsr82anghhfva8yaryzb3p5d737p3ixbiyv8"; + modSha256 = "000knqwsajlqika4abp3fh721mn1vykcsnv3c1qw0mzffkmzwsqd"; subPackages = [ "cmd/helm" ]; buildFlagsArray = [ "-ldflags=-w -s -X helm.sh/helm/v3/internal/version.version=v${version}" ]; -- cgit v1.2.3 From 16df60734a76eedbe3f265ee492587f1f42c4796 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 26 Apr 2020 13:16:52 +1000 Subject: kops: use installShellFiles --- pkgs/applications/networking/cluster/kops/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index a5f1806e577..4d2e406c040 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, go-bindata }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, go-bindata, installShellFiles }: let goPackagePath = "k8s.io/kops"; @@ -18,7 +18,7 @@ let inherit sha256; }; - nativeBuildInputs = [ go-bindata ]; + nativeBuildInputs = [ go-bindata installShellFiles ]; subPackages = [ "cmd/kops" ]; buildFlagsArray = '' @@ -33,10 +33,10 @@ let ''; postInstall = '' - mkdir -p $bin/share/bash-completion/completions - mkdir -p $bin/share/zsh/site-functions - $bin/bin/kops completion bash > $bin/share/bash-completion/completions/kops - $bin/bin/kops completion zsh > $bin/share/zsh/site-functions/_kops + for shell in bash zsh; do + $bin/bin/kops completion $shell > kops.$shell + installShellCompletion kops.$shell + done ''; meta = with stdenv.lib; { -- cgit v1.2.3 From 954eab8ea9e88680d86c9ca050e38dcec573fbc7 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 26 Apr 2020 13:16:52 +1000 Subject: stern: use installShellFiles --- pkgs/applications/networking/cluster/stern/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix index 144d46043ff..95ad965c346 100644 --- a/pkgs/applications/networking/cluster/stern/default.nix +++ b/pkgs/applications/networking/cluster/stern/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildPackages, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, buildPackages, buildGoPackage, fetchFromGitHub, installShellFiles }: let isCrossBuild = stdenv.hostPlatform != stdenv.buildPlatform; in @@ -17,13 +17,15 @@ buildGoPackage rec { goDeps = ./deps.nix; + nativeBuildInputs = [ installShellFiles ]; + postInstall = let stern = if isCrossBuild then buildPackages.stern else "$bin"; in '' - mkdir -p $bin/share/bash-completion/completions - ${stern}/bin/stern --completion bash > $bin/share/bash-completion/completions/stern - mkdir -p $bin/share/zsh/site-functions - ${stern}/bin/stern --completion zsh > $bin/share/zsh/site-functions/_stern + for shell in bash zsh; do + ${stern}/bin/stern --completion $shell > stern.$shell + installShellCompletion stern.$shell + done ''; meta = with lib; { -- cgit v1.2.3 From 0bead921ca637672c3dfc545e2c7d649370388b9 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 26 Apr 2020 13:16:53 +1000 Subject: rclone: use installShellFiles --- pkgs/applications/networking/sync/rclone/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 2f484467450..57925a3292d 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, buildPackages }: +{ stdenv, buildGoPackage, fetchFromGitHub, buildPackages, installShellFiles }: buildGoPackage rec { pname = "rclone"; @@ -17,6 +17,8 @@ buildGoPackage rec { outputs = [ "bin" "out" "man" ]; + nativeBuildInputs = [ installShellFiles ]; + postInstall = let rcloneBin = @@ -25,10 +27,11 @@ buildGoPackage rec { else stdenv.lib.getBin buildPackages.rclone; in '' - install -D -m644 $src/rclone.1 $man/share/man/man1/rclone.1 - mkdir -p $bin/share/zsh/site-functions $bin/share/bash-completion/completions/ - ${rcloneBin}/bin/rclone genautocomplete zsh $bin/share/zsh/site-functions/_rclone - ${rcloneBin}/bin/rclone genautocomplete bash $bin/share/bash-completion/completions/rclone.bash + installManPage $src/rclone.1 + for shell in bash zsh; do + ${rcloneBin}/bin/rclone genautocomplete $shell rclone.$shell + installShellCompletion rclone.$shell + done ''; meta = with stdenv.lib; { -- cgit v1.2.3 From e75465256b44f6fcf38fa1a853a02f583e9710cf Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 26 Apr 2020 13:16:53 +1000 Subject: gitAndTools.hub: use installShellFiles --- .../version-management/git-and-tools/hub/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/hub/default.nix b/pkgs/applications/version-management/git-and-tools/hub/default.nix index 8890cd5eb23..9dbb497c8c9 100644 --- a/pkgs/applications/version-management/git-and-tools/hub/default.nix +++ b/pkgs/applications/version-management/git-and-tools/hub/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, groff, utillinux }: +{ stdenv, buildGoPackage, fetchFromGitHub, groff, installShellFiles, utillinux }: buildGoPackage rec { pname = "hub"; @@ -16,7 +16,7 @@ buildGoPackage rec { sha256 = "1qjab3dpia1jdlszz3xxix76lqrm4zbmqzd9ymld7h06awzsg2vh"; }; - nativeBuildInputs = [ groff utillinux ]; + nativeBuildInputs = [ groff installShellFiles utillinux ]; postPatch = '' patchShebangs . @@ -24,13 +24,13 @@ buildGoPackage rec { postInstall = '' cd go/src/${goPackagePath} - install -D etc/hub.zsh_completion "$bin/share/zsh/site-functions/_hub" - install -D etc/hub.bash_completion.sh "$bin/share/bash-completion/completions/hub" - install -D etc/hub.fish_completion "$bin/share/fish/vendor_completions.d/hub.fish" + installShellCompletion --zsh --name _hub etc/hub.zsh_completion + installShellCompletion --bash --name hub etc/hub.bash_completion.sh + installShellCompletion --fish --name hub.fish etc/hub.fish_completion LC_ALL=C.UTF8 \ make man-pages - cp -vr --parents share/man/man[1-9]/*.[1-9] $bin/ + installManPage share/man/man[1-9]/*.[1-9] ''; meta = with stdenv.lib; { -- cgit v1.2.3 From 2dca3f2aa7bda81591a53dad1a800f4158065da5 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 26 Apr 2020 13:16:55 +1000 Subject: prometheus-mail-exporter: use installShellFiles --- pkgs/servers/monitoring/prometheus/mail-exporter.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/mail-exporter.nix b/pkgs/servers/monitoring/prometheus/mail-exporter.nix index 1e29eefba2b..f845a6ef256 100644 --- a/pkgs/servers/monitoring/prometheus/mail-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mail-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage { pname = "mailexporter"; @@ -15,9 +15,11 @@ buildGoPackage { goDeps = ./mail-exporter_deps.nix; + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' - install -D -m 0444 -t $bin/share/man/man1 $src/man/mailexporter.1 - install -D -m 0444 -t $bin/share/man/man5 $src/man/mailexporter.conf.5 + installManPage $src/man/mailexporter.1 + installManPage $src/man/mailexporter.conf.5 ''; meta = with stdenv.lib; { -- cgit v1.2.3 From 94e4ec143f8dbbc59c987c00e02803a3c78b3a52 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 26 Apr 2020 13:16:55 +1000 Subject: cockroachdb: use installShellFiles --- pkgs/servers/sql/cockroachdb/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index 8f3d2a7b285..fb62ee58474 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -1,6 +1,7 @@ { stdenv, buildGoPackage, fetchurl , cmake, xz, which, autoconf , ncurses6, libedit, libunwind +, installShellFiles }: let @@ -8,7 +9,7 @@ let linuxDeps = [ ncurses6 ]; buildInputs = if stdenv.isDarwin then darwinDeps else linuxDeps; - nativeBuildInputs = [ cmake xz which autoconf ]; + nativeBuildInputs = [ installShellFiles cmake xz which autoconf ]; in buildGoPackage rec { @@ -42,7 +43,7 @@ buildGoPackage rec { runHook preInstall install -D cockroachoss $bin/bin/cockroach - install -D cockroach.bash $bin/share/bash-completion/completions/cockroach.bash + installShellCompletion cockroach.bash mkdir -p $man/share/man cp -r man $man/share/man -- cgit v1.2.3 From e7b44787b1c5afe0bbe8fa351ce8d77ffa2c5ceb Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 26 Apr 2020 13:16:56 +1000 Subject: lxd: use installShellFiles --- pkgs/tools/admin/lxd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 19fbff747fc..6051c16e91e 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -5,6 +5,7 @@ , writeShellScriptBin, apparmor-profiles, apparmor-parser , criu , bash +, installShellFiles }: buildGoPackage rec { @@ -39,11 +40,10 @@ buildGoPackage rec { '') ]} - mkdir -p "$bin/share/bash-completion/completions/" - cp -av go/src/github.com/lxc/lxd/scripts/bash/lxd-client "$bin/share/bash-completion/completions/lxc" + installShellCompletion --bash go/src/github.com/lxc/lxd/scripts/bash/lxd-client ''; - nativeBuildInputs = [ pkgconfig makeWrapper ]; + nativeBuildInputs = [ installShellFiles pkgconfig makeWrapper ]; buildInputs = [ lxc acl libcap libco-canonical.dev dqlite.dev raft-canonical.dev sqlite-replication udev.dev ]; -- cgit v1.2.3 From 148f8629cc00d5f71018e01abe301d0d052fbf4b Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 26 Apr 2020 13:16:57 +1000 Subject: gopass: use installShellFiles --- pkgs/tools/security/gopass/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 8af24bf7ab5..cb640fb1639 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, git, gnupg, xclip, wl-clipboard, makeWrapper }: +{ stdenv, buildGoPackage, fetchFromGitHub, git, gnupg, xclip, wl-clipboard, installShellFiles, makeWrapper }: buildGoPackage rec { pname = "gopass"; @@ -6,7 +6,7 @@ buildGoPackage rec { goPackagePath = "github.com/gopasspw/gopass"; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ installShellFiles makeWrapper ]; src = fetchFromGitHub { owner = "gopasspw"; @@ -22,13 +22,10 @@ buildGoPackage rec { ] ++ stdenv.lib.optional stdenv.isLinux wl-clipboard); postInstall = '' - mkdir -p \ - $bin/share/bash-completion/completions \ - $bin/share/zsh/site-functions \ - $bin/share/fish/vendor_completions.d - $bin/bin/gopass completion bash > $bin/share/bash-completion/completions/_gopass - $bin/bin/gopass completion zsh > $bin/share/zsh/site-functions/_gopass - $bin/bin/gopass completion fish > $bin/share/fish/vendor_completions.d/gopass.fish + for shell in bash fish zsh; do + $bin/bin/gopass completion $shell > gopass.$shell + installShellCompletion gopass.$shell + done ''; postFixup = '' -- cgit v1.2.3 From 8193ac091a54b55b3ada8f16085a67cf53e3c8e3 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 26 Apr 2020 13:16:57 +1000 Subject: vault: use installShellFiles --- pkgs/tools/security/vault/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 54be477cfe2..ae46bbae40a 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, buildGoPackage }: +{ stdenv, fetchFromGitHub, buildGoPackage, installShellFiles }: buildGoPackage rec { pname = "vault"; @@ -15,14 +15,16 @@ buildGoPackage rec { subPackages = [ "." ]; + nativeBuildInputs = [ installShellFiles ]; + buildFlagsArray = [ "-tags='vault'" "-ldflags=\"-X github.com/hashicorp/vault/sdk/version.GitCommit='v${version}'\"" ]; postInstall = '' - mkdir -p $bin/share/bash-completion/completions - echo "complete -C $bin/bin/vault vault" > $bin/share/bash-completion/completions/vault + echo "complete -C $bin/bin/vault vault" > vault.bash + installShellCompletion vault.bash ''; meta = with stdenv.lib; { -- cgit v1.2.3 From fb5cf24d7b2154b75911137d27d8715e2f93cd0b Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 26 Apr 2020 13:16:51 +1000 Subject: kompose: update completion --- pkgs/applications/networking/cluster/kompose/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/applications/networking/cluster/kompose/default.nix index 09a69f4b80e..2467ed93b32 100644 --- a/pkgs/applications/networking/cluster/kompose/default.nix +++ b/pkgs/applications/networking/cluster/kompose/default.nix @@ -15,9 +15,10 @@ buildGoPackage rec { nativeBuildInputs = [ installShellFiles ]; postInstall = '' - $bin/bin/kompose completion bash > kompose.bash - $bin/bin/kompose completion zsh > kompose.zsh - installShellCompletion kompose.{bash,zsh} + for shell in bash zsh; do + $bin/bin/kompose completion $shell > kompose.$shell + installShellCompletion kompose.$shell + done ''; meta = with lib; { -- cgit v1.2.3 From 454f8ef82aa776c8fd6a3da8bcf72211c3f6cfa9 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 26 Apr 2020 13:16:54 +1000 Subject: kind: update completion --- pkgs/development/tools/kind/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix index f86bc489837..6436c83ee21 100644 --- a/pkgs/development/tools/kind/default.nix +++ b/pkgs/development/tools/kind/default.nix @@ -19,9 +19,10 @@ buildGoPackage rec { nativeBuildInputs = [ installShellFiles ]; postInstall = '' - $bin/bin/kind completion bash > kind.bash - $bin/bin/kind completion zsh > kind.zsh - installShellCompletion kind.{bash,zsh} + for shell in bash zsh; do + $bin/bin/kind completion $shell > kind.$shell + installShellCompletion kind.$shell + done ''; meta = { -- cgit v1.2.3 From b0698e430b4649663ad079daf793ec1c075660ce Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 26 Apr 2020 18:17:00 -0500 Subject: gitAndTools.delta: 0.0.18 -> 0.1.1 --- .../version-management/git-and-tools/delta/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/delta/default.nix b/pkgs/applications/version-management/git-and-tools/delta/default.nix index 7bdeae65899..60950dc0465 100644 --- a/pkgs/applications/version-management/git-and-tools/delta/default.nix +++ b/pkgs/applications/version-management/git-and-tools/delta/default.nix @@ -1,20 +1,26 @@ -{ lib, fetchFromGitHub, rustPlatform, llvmPackages }: +{ lib, fetchFromGitHub, rustPlatform, llvmPackages, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "delta"; - version = "0.0.18"; + version = "0.1.1"; src = fetchFromGitHub { owner = "dandavison"; repo = pname; rev = version; - sha256 = "0cpd60861k9nd2gbzyb2hg5npnkgvsnyrvv7mlm30vb1833gz94z"; + sha256 = "1b5ap468d0gvgwkx6wqxvayzda2xw95lymd0kl38nq1fc0ica6hk"; }; LLVM_CONFIG_PATH = "${llvmPackages.llvm}/bin/llvm-config"; LIBCLANG_PATH = "${llvmPackages.libclang.lib}/lib"; - cargoSha256 = "12gl50q5hf6nq571fqxfv61z4mwfjyw4jb2yqyqbsinwj2frwaxn"; + cargoSha256 = "07mjl751r9d88fnmnan0ip0m3vxqf51vq2y7k3g3yywcgasj9jgr"; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --bash --name delta.bash completion/bash/completion.sh + ''; meta = with lib; { homepage = "https://github.com/dandavison/delta"; -- cgit v1.2.3 From 3e98f667abb3022253ce56ac00f1b99043e81aa8 Mon Sep 17 00:00:00 2001 From: Steve Purcell Date: Sun, 26 Apr 2020 17:41:02 +1200 Subject: dotnet: add initial support for arm64 `jellyfin` appeared unsupported on `aarch64` due to `dotnet` platform support in nixpkgs, but there are ARM64 downloads of the `dotnet` SDKs available. This change follows the kind of pattern used in the `firecracker` packaging to support selective x86_64/arm64 downloads. With this change I can build `jellyfin` on a Raspberry Pi 4. The other content hashes have been filled in, and all build successfully, but they have not been further tested. --- pkgs/development/compilers/dotnet/buildDotnet.nix | 14 +++--- pkgs/development/compilers/dotnet/default.nix | 54 +++++++++++++++++------ 2 files changed, 50 insertions(+), 18 deletions(-) diff --git a/pkgs/development/compilers/dotnet/buildDotnet.nix b/pkgs/development/compilers/dotnet/buildDotnet.nix index 1017c8b4975..6f4237d2dce 100644 --- a/pkgs/development/compilers/dotnet/buildDotnet.nix +++ b/pkgs/development/compilers/dotnet/buildDotnet.nix @@ -13,10 +13,14 @@ assert builtins.elem type [ "aspnetcore" "netcore" "sdk"]; , curl }: let pname = if type == "aspnetcore" then "aspnetcore-runtime" else if type == "netcore" then "dotnet-runtime" else "dotnet-sdk"; + suffix = { + x86_64-linux = "x64"; + aarch64-linux = "arm64"; + }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); urls = { - aspnetcore = "https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/${version}/${pname}-${version}-linux-x64.tar.gz"; - netcore = "https://dotnetcli.azureedge.net/dotnet/Runtime/${version}/${pname}-${version}-linux-x64.tar.gz"; - sdk = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/${pname}-${version}-linux-x64.tar.gz"; + aspnetcore = "https://dotnetcli.azureedge.net/dotnet/aspnetcore/Runtime/${version}/${pname}-${version}-linux-${suffix}.tar.gz"; + netcore = "https://dotnetcli.azureedge.net/dotnet/Runtime/${version}/${pname}-${version}-linux-${suffix}.tar.gz"; + sdk = "https://dotnetcli.azureedge.net/dotnet/Sdk/${version}/${pname}-${version}-linux-${suffix}.tar.gz"; }; descriptions = { aspnetcore = "ASP .NET Core runtime ${version}"; @@ -30,7 +34,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = builtins.getAttr type urls; - inherit sha512; + sha512 = sha512."${stdenv.hostPlatform.system}" or (throw "Missing hash for host system: ${stdenv.hostPlatform.system}"); }; sourceRoot = "."; @@ -61,7 +65,7 @@ in stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://dotnet.github.io/"; description = builtins.getAttr type descriptions; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; maintainers = with maintainers; [ kuznero ]; license = licenses.mit; }; diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index 7b7a564ba37..6497e8bdf96 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -5,27 +5,37 @@ dotnetCombined = with dotnetCorePackages; combinePackages [ sdk_3_1 sdk_2_2 sdk_ { callPackage }: let buildDotnet = attrs: callPackage (import ./buildDotnet.nix attrs) {}; - buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; } ); - buildNetCore = attrs: buildDotnet (attrs // { type = "netcore"; } ); - buildNetCoreSdk = attrs: buildDotnet (attrs // { type = "sdk"; } ); -in rec { + buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; }); + buildNetCore = attrs: buildDotnet (attrs // { type = "netcore"; }); + buildNetCoreSdk = attrs: buildDotnet (attrs // { type = "sdk"; }); +in +rec { combinePackages = attrs: callPackage (import ./combinePackages.nix attrs) {}; # v2.1.15 (LTS) aspnetcore_2_1 = buildAspNetCore { version = "2.1.16"; - sha512 = "0awdzi8dysbg8xcy4l8wx2sb8gaaklphmwv61qxh7dj6ih4nla34l02xdax1l8nw41znnnqzsa77avglnrz36pckm9mc52m7wc7877h"; + sha512 = { + x86_64-linux = "0awdzi8dysbg8xcy4l8wx2sb8gaaklphmwv61qxh7dj6ih4nla34l02xdax1l8nw41znnnqzsa77avglnrz36pckm9mc52m7wc7877h"; + aarch64-linux = null; # no aarch64 version of this package is available + }; }; netcore_2_1 = buildNetCore { version = "2.1.16"; - sha512 = "07vvmza32hsblpw4zpcksm2gicy4agh0d1fwradqj16y6xbh3frdp87mqgbj5m54mmyfp5bc8c46v1w6dfm1w3y80v2y46aynild45l"; + sha512 = { + x86_64-linux = "07vvmza32hsblpw4zpcksm2gicy4agh0d1fwradqj16y6xbh3frdp87mqgbj5m54mmyfp5bc8c46v1w6dfm1w3y80v2y46aynild45l"; + aarch64-linux = "27ab982vz9rn2vzpq68dqfzhryfixq3s0apx7vi0cwiray3scgfmf45fm7qj63k9mvaqnk5g69i339109yasw3q5vpvpyjc1ykbi710"; + }; }; sdk_2_1 = buildNetCoreSdk { version = "2.1.804"; - sha512 = "1kbzxcdgyvs94kkm6ikr1j0p0k3zq30d10sl69ig0rgbqbqm4rpqi6dq94jjbw7q3jlwz83vgq3549q38d2s9kalmzv9lmddn2kkc42"; + sha512 = { + x86_64-linux = "1kbzxcdgyvs94kkm6ikr1j0p0k3zq30d10sl69ig0rgbqbqm4rpqi6dq94jjbw7q3jlwz83vgq3549q38d2s9kalmzv9lmddn2kkc42"; + aarch64-linux = "2d97xvhxnkdgghqlichkwdxxh641dzkd9hq5xgffgvbqv1qsh31k9yib2q1nsarpnbx0d758bdn2jm2wvsj7nx0gpxlb3nab0b3hc2g"; + }; }; # v2.2 @@ -36,33 +46,51 @@ in rec { aspnetcore_3_0 = buildAspNetCore { version = "3.0.3"; - sha512 = "342v6kxxbxky09d1c392vvr9rm30lf75wccka1bk2h4advlcga5nlgv93g7vrq48bsyxfi5gc36r3b0dlwl1g409g5mlk1042n6d0yq"; + sha512 = { + x86_64-linux = "342v6kxxbxky09d1c392vvr9rm30lf75wccka1bk2h4advlcga5nlgv93g7vrq48bsyxfi5gc36r3b0dlwl1g409g5mlk1042n6d0yq"; + aarch64-linux = "2xkg4q88q5jw6jdz6cxj8vsjr475nd0fcvifkv1shdm2j9dsjy233hwpxbr140m5n5ggyh6z99238z9j4kp2az977y8y8irz8m8ppvf"; + }; }; netcore_3_0 = buildNetCore { version = "3.0.3"; - sha512 = "32ykpcw2xx708r2lxcwcbxnmy4sk159rlfjfvkw990qh7n79pm3lm2qwa3zhqcslznmpg18kwxz8qb5fgsa0h49g843xx4kyai0n7rx"; + sha512 = { + x86_64-linux = "32ykpcw2xx708r2lxcwcbxnmy4sk159rlfjfvkw990qh7n79pm3lm2qwa3zhqcslznmpg18kwxz8qb5fgsa0h49g843xx4kyai0n7rx"; + aarch64-linux = "1lp8din7d5jv5fkyq1a7m01i1xg9jwpiljvam1kcyzsnwzvi0cb4ji336cfx4lqrn95gvc75gkzi6q8b4fz0h21gvk6z6kmlcr63nyg"; + }; }; sdk_3_0 = buildNetCoreSdk { version = "3.0.103"; - sha512 = "2diiplgxs92fkb6ym68b02d79z4qn63x5qlky5lvr757c1zkh0vfpk3khawdg94kdn4qkn6dmyqr0msxqgmiqyhp63cadzqq4vx7b12"; + sha512 = { + x86_64-linux = "2diiplgxs92fkb6ym68b02d79z4qn63x5qlky5lvr757c1zkh0vfpk3khawdg94kdn4qkn6dmyqr0msxqgmiqyhp63cadzqq4vx7b12"; + aarch64-linux = "32843q2lj7dgciq62g9v1q31vwfjyv5vaxrz712d942mcg5lyzjygwri106bv4naq3a22131ldzwnsifbdn2vq1iz60raqdb7ss9vnf"; + }; }; # v3.1.1 (LTS) aspnetcore_3_1 = buildAspNetCore { version = "3.1.2"; - sha512 = "27708bk5liz8r39p4dzs41clgq298d49g8ipzdj56pz613vkfyv7bp91666ydz36aazm265j2g9ji3sk1f9kbgv6024zwrly5w9vqrm"; + sha512 = { + x86_64-linux = "27708bk5liz8r39p4dzs41clgq298d49g8ipzdj56pz613vkfyv7bp91666ydz36aazm265j2g9ji3sk1f9kbgv6024zwrly5w9vqrm"; + aarch64-linux = "2sm5yf376w5dm0za3gbcj251kc909fmlasmlyn70zhqp2jiii075vcqh40racjlwlhsfydx32cw7kgnv238lad5mw5jxy143zql5xl3"; + }; }; netcore_3_1 = buildNetCore { version = "3.1.2"; - sha512 = "3zwg1anrcni9kagmjxn485bpjvb146hkm7irmikq3v879gjhd2fgpscg226ds83l4pxll3r7lwris6ij952xmy8lsqraapd9111ba14"; + sha512 = { + x86_64-linux = "3zwg1anrcni9kagmjxn485bpjvb146hkm7irmikq3v879gjhd2fgpscg226ds83l4pxll3r7lwris6ij952xmy8lsqraapd9111ba14"; + aarch64-linux = "3hf61d5adlfffy51627ypp36qc5r55g9xwgfxqd0c7vj9bqmpiph673bvqqpr189df9shxr21p94cwrc5n36z72a37vw4ic8ks2yayx"; + }; }; sdk_3_1 = buildNetCoreSdk { version = "3.1.102"; - sha512 = "0lmz8ac5j0i4zcq4904kr6qibvyjcm2ckfg27kqyqfii00qmm80xb5sk3i7f06xqkbgkrqkbg9rsldk75akw6m5dxg932j602bxrb4w"; + sha512 = { + x86_64-linux = "0lmz8ac5j0i4zcq4904kr6qibvyjcm2ckfg27kqyqfii00qmm80xb5sk3i7f06xqkbgkrqkbg9rsldk75akw6m5dxg932j602bxrb4w"; + aarch64-linux = "34k6cm69gxm7vcd9m6bp47sdx96j32z6lfhb2vjcdznc6xgs2wy8zcang3b1mjm5919dq7v6iysm6ffcpgjhhphy7prlnaqa69q5mks"; + }; }; } -- cgit v1.2.3 From 467e6c2669e298f4919a5b4feebc1d8da5f5f3d8 Mon Sep 17 00:00:00 2001 From: MetaDark Date: Sun, 26 Apr 2020 22:35:25 -0400 Subject: pythonPackages.vdf: 3.2 -> 3.3 --- pkgs/development/python-modules/vdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vdf/default.nix b/pkgs/development/python-modules/vdf/default.nix index 73725c8e5e3..7d4e3e34b86 100644 --- a/pkgs/development/python-modules/vdf/default.nix +++ b/pkgs/development/python-modules/vdf/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "vdf"; - version = "3.2"; + version = "3.3"; src = fetchFromGitHub { owner = "ValvePython"; repo = pname; rev = "v${version}"; - sha256 = "08rb982hcwc9pr9gl0zfk9266h84fwbz097qjfkss3srwghr1247"; + sha256 = "0d9bhxdznry7kzyma00cxwjn6rqnd6vw8v5ym68k6qswgfzb569i"; }; checkInputs = [ pytest pytestcov mock ]; -- cgit v1.2.3 From 0f4ffe94fbfd1982ba18065ea0d02e37f14e6252 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 26 Apr 2020 15:42:50 +1000 Subject: etcd: 3.3.13 -> 3.3.20 --- pkgs/servers/etcd/default.nix | 41 ++++++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix index a5083a20cb7..9a2bf7ce590 100644 --- a/pkgs/servers/etcd/default.nix +++ b/pkgs/servers/etcd/default.nix @@ -1,33 +1,40 @@ -{ lib, libpcap, buildGoPackage, fetchFromGitHub }: - -with lib; +{ lib, buildGoPackage, fetchFromGitHub, nixosTests }: buildGoPackage rec { pname = "etcd"; - version = "3.3.13"; # After updating check that nixos tests pass - rev = "v${version}"; + version = "3.3.20"; + # change to "go.etcd.io/etcd" for >= 3.4 goPackagePath = "github.com/coreos/etcd"; src = fetchFromGitHub { - inherit rev; - owner = "coreos"; + owner = "etcd-io"; repo = "etcd"; - sha256 = "1kac4qfr83f2hdz35403f1ald05wc85vvhw79vxb431n61jvyaqy"; + rev = "v${version}"; + sha256 = "1iqq12kkky3cl28k7fabqqyx1i0a2wmbkq0bs8yhiwywp076k08w"; }; - subPackages = [ - "cmd/etcd" - "cmd/etcdctl" - ]; + buildPhase = '' + cd go/src/${goPackagePath} + patchShebangs . + ./build + ./functional/build + ''; + + installPhase = '' + install -Dm755 bin/* bin/functional/cmd/* -t $bin/bin + ''; - buildInputs = [ libpcap ]; + passthru.tests = with nixosTests; { + etcd = etcd; + etcd-cluster = etcd-cluster; + }; - meta = { + meta = with lib; { description = "Distributed reliable key-value store for the most critical data of a distributed system"; license = licenses.asl20; - homepage = "https://coreos.com/etcd/"; - maintainers = with maintainers; [offline]; - platforms = with platforms; linux; + homepage = "https://etcd.io/"; + maintainers = with maintainers; [ offline ]; + platforms = platforms.unix; }; } -- cgit v1.2.3 From 3c83386c6be2a01ff850d10e70aa8ce7fb2e9a93 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 27 Apr 2020 14:08:19 +1000 Subject: nixos/podman: add assertion for dockerCompat --- nixos/modules/virtualisation/podman.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix index 41d50dc7308..6b0871d21a8 100644 --- a/nixos/modules/virtualisation/podman.nix +++ b/nixos/modules/virtualisation/podman.nix @@ -100,6 +100,11 @@ in # Enable common /etc/containers configuration virtualisation.containers.enable = true; + assertions = [{ + assertion = cfg.dockerCompat -> !config.virtualisation.docker.enable; + message = "Option dockerCompat conflicts with docker"; + }]; + }; } -- cgit v1.2.3 From e9c44e8956968685360fc5922f47a8b209220a72 Mon Sep 17 00:00:00 2001 From: David Terry Date: Mon, 27 Apr 2020 08:15:39 +0200 Subject: wireguard-compat: 1.0.20200413 -> 1.0.20200426 https://lists.zx2c4.com/pipermail/wireguard/2020-April/005237.html --- pkgs/os-specific/linux/wireguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 6edbb1aa4d7..8c3f489753d 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -7,11 +7,11 @@ assert stdenv.lib.versionOlder kernel.version "5.6"; stdenv.mkDerivation rec { pname = "wireguard"; - version = "1.0.20200413"; + version = "1.0.20200426"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"; - sha256 = "11dpw1inszbc3qjcfnap74kgjxkyyrx90vxv6wmsgkbp8lsl4p66"; + sha256 = "0j343xk9qgmzn0j6kgvydfqjqslf2rv6r4ikfc59982xxny6f6l5"; }; hardeningDisable = [ "pic" ]; -- cgit v1.2.3 From b2556b13f560a964837a7bafcdcb43e2420388e8 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 27 Apr 2020 16:13:07 +1000 Subject: runc: remove hardeningDisable --- pkgs/applications/virtualization/runc/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index 39a1f6faeac..87385024967 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -24,8 +24,6 @@ buildGoPackage rec { goPackagePath = "github.com/opencontainers/runc"; outputs = [ "bin" "out" "man" ]; - hardeningDisable = [ "fortify" ]; - nativeBuildInputs = [ go-md2man installShellFiles pkg-config which ]; buildInputs = [ libseccomp libapparmor apparmor-parser ]; -- cgit v1.2.3 From a900a0a246567186f8d4b149906b540a0a825572 Mon Sep 17 00:00:00 2001 From: Mrinal Purohit Date: Mon, 27 Apr 2020 12:16:15 +0530 Subject: rescuetime: 2.14.5.3 -> 2.15.0.1 --- pkgs/applications/misc/rescuetime/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index 7212563816b..9784e24187b 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -5,15 +5,15 @@ let if stdenv.hostPlatform.system == "i686-linux" then fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_current_i386.deb"; - sha256 = "0rc744infrvs5l1c8qpsd1x2y40bpbxlwnmyj6nyli8fnqcnzh5l"; + sha256 = "1yzbs2lg04bq0clkr6gfkx3j6wrahpnxqfiq4askk9k76y4ncd4m"; } else fetchurl { name = "rescuetime-installer.deb"; url = "https://www.rescuetime.com/installers/rescuetime_current_amd64.deb"; - sha256 = "1cjsgqcv76b798rpdn72fkbm79shlqnxyh1741isi8gcp1gnimji"; + sha256 = "1njxsh601d0p6n0hxv44gcg8gd43xwym83xwqba26vj6xw82bknv"; }; in mkDerivation { # https://www.rescuetime.com/updates/linux_release_notes.html - name = "rescuetime-2.14.5.3"; + name = "rescuetime-2.15.0.1"; inherit src; nativeBuildInputs = [ dpkg ]; # avoid https://github.com/NixOS/patchelf/issues/99 -- cgit v1.2.3 From 3e4f1e5b675a7be4be76196ba483a204cd926b9c Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 26 Apr 2020 18:34:20 +1000 Subject: restic: use subPackages, installShellFiles --- pkgs/tools/backup/restic/default.nix | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index f8dbeadff09..df9d613ee44 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub, nixosTests}: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, installShellFiles, nixosTests}: buildGoPackage rec { pname = "restic"; @@ -13,23 +13,19 @@ buildGoPackage rec { sha256 = "0lydll93n1lcn1fl669b9cikmzz9d6vfpc8ky3ng5fi8kj3v1dz7"; }; + subPackages = [ "cmd/restic" ]; + + nativeBuildInputs = [ installShellFiles ]; + passthru.tests.restic = nixosTests.restic; - # Use a custom install phase here as by default the - # build-release-binaries and prepare-releases binaries are - # installed. - installPhase = '' - mkdir -p "$bin/bin" - cp go/bin/restic "$bin/bin" - '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' - mkdir -p \ - $bin/etc/bash_completion.d \ - $bin/share/zsh/vendor-completions \ - $bin/share/man/man1 + postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' $bin/bin/restic generate \ - --bash-completion $bin/etc/bash_completion.d/restic.sh \ - --zsh-completion $bin/share/zsh/vendor-completions/_restic \ - --man $bin/share/man/man1 + --bash-completion restic.bash \ + --zsh-completion restic.zsh \ + --man . + installShellCompletion restic.{bash,zsh} + installManPage *.1 ''; meta = with lib; { -- cgit v1.2.3 From 69f54c1e199ac4412402682c30313d803ceead8d Mon Sep 17 00:00:00 2001 From: Dmitry Kudriavtsev Date: Mon, 27 Apr 2020 00:13:59 -0700 Subject: magic-vlsi: init at 8.3.5 --- .../magic-vlsi/0001-strip-bin-prefix.patch | 10 ++++++ .../magic-vlsi/0002-fix-format-security.patch | 19 ++++++++++++ .../science/electronics/magic-vlsi/default.nix | 36 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 67 insertions(+) create mode 100644 pkgs/applications/science/electronics/magic-vlsi/0001-strip-bin-prefix.patch create mode 100644 pkgs/applications/science/electronics/magic-vlsi/0002-fix-format-security.patch create mode 100644 pkgs/applications/science/electronics/magic-vlsi/default.nix diff --git a/pkgs/applications/science/electronics/magic-vlsi/0001-strip-bin-prefix.patch b/pkgs/applications/science/electronics/magic-vlsi/0001-strip-bin-prefix.patch new file mode 100644 index 00000000000..1cef96ea140 --- /dev/null +++ b/pkgs/applications/science/electronics/magic-vlsi/0001-strip-bin-prefix.patch @@ -0,0 +1,10 @@ +diff --git a/scripts/makedbh b/scripts/makedbh +index 01e4fa5..d6299c6 100755 +--- a/scripts/makedbh ++++ b/scripts/makedbh +@@ -1,4 +1,4 @@ +-#!/bin/csh -f ++#!/usr/bin/env tcsh + # + # makes the "database.h" (1st argument, $1) file from "database.h.in" + # (2nd argument, $2), setting various mask operation definitions diff --git a/pkgs/applications/science/electronics/magic-vlsi/0002-fix-format-security.patch b/pkgs/applications/science/electronics/magic-vlsi/0002-fix-format-security.patch new file mode 100644 index 00000000000..37ae3519550 --- /dev/null +++ b/pkgs/applications/science/electronics/magic-vlsi/0002-fix-format-security.patch @@ -0,0 +1,19 @@ +diff --git a/database/DBio.c b/database/DBio.c +index 93c4b0b..292ea5f 100644 +--- a/database/DBio.c ++++ b/database/DBio.c +@@ -2378,12 +2378,12 @@ DBCellWriteFile(cellDef, f) + + #define FPRINTF(f,s)\ + {\ +- if (fprintf(f,s) == EOF) goto ioerror;\ ++ if (fprintf(f,"%s",s) == EOF) goto ioerror;\ + DBFileOffset += strlen(s);\ + } + #define FPRINTR(f,s)\ + {\ +- if (fprintf(f,s) == EOF) return 1;\ ++ if (fprintf(f,"%s",s) == EOF) return 1;\ + DBFileOffset += strlen(s);\ + } + diff --git a/pkgs/applications/science/electronics/magic-vlsi/default.nix b/pkgs/applications/science/electronics/magic-vlsi/default.nix new file mode 100644 index 00000000000..62b830547e5 --- /dev/null +++ b/pkgs/applications/science/electronics/magic-vlsi/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, m4, tcsh, libX11, tcl, tk, cairo, ncurses, mesa_glu, python3 }: + +stdenv.mkDerivation { + pname = "magic-vlsi"; + version = "8.3.5"; + + src = fetchurl { + url = "http://opencircuitdesign.com/magic/archive/magic-8.3.5.tgz"; + sha256 = "0wv4zmxlqjfaakgp802icn0cd9f8ylkz2sppix83axq8p5cg90yq"; + }; + + buildInputs = [ m4 tcsh libX11 tcl tk cairo ncurses mesa_glu ]; + nativeBuildInputs = [ python3 ]; + + configureFlags = [ + "--with-tcl=${tcl}" + "--with-tk=${tk}" + "--disable-werror" + ]; + + postPatch = '' + patchShebangs scripts/* + ''; + + patches = [ + ./0001-strip-bin-prefix.patch + ./0002-fix-format-security.patch + ]; + + meta = with stdenv.lib; { + description = "VLSI layout tool written in Tcl"; + homepage = "http://opencircuitdesign.com/magic/"; + license = licenses.mit; + maintainers = [ maintainers.dkudriavtsev ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5638580166c..405c801abba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3040,6 +3040,8 @@ in kramdown-asciidoc = callPackage ../tools/typesetting/kramdown-asciidoc { }; + magic-vlsi = callPackage ../applications/science/electronics/magic-vlsi { }; + mcrcon = callPackage ../tools/networking/mcrcon {}; rage = callPackage ../tools/security/rage { -- cgit v1.2.3 From cf536ed5a3c0e90e13cefb798774752d72100b89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 27 Apr 2020 08:06:25 +0100 Subject: raft-canonical: 0.9.17 -> 0.9.18 --- pkgs/development/libraries/raft-canonical/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/raft-canonical/default.nix b/pkgs/development/libraries/raft-canonical/default.nix index 201c332dfdd..ed3d7ae9e70 100644 --- a/pkgs/development/libraries/raft-canonical/default.nix +++ b/pkgs/development/libraries/raft-canonical/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "raft-canonical"; - version = "0.9.17"; + version = "0.9.18"; src = fetchFromGitHub { owner = "canonical"; repo = "raft"; rev = "v${version}"; - sha256 = "0q444wd6wz85g4zjkdsrf8z7chkjq9rxzq8l6fh37mgf7c23hv09"; + sha256 = "0f613aiyxqskz9d10f7r37ar9ngqsf9qsyk3jjf7s5l14wh6vl5k"; }; nativeBuildInputs = [ autoreconfHook file pkgconfig ]; -- cgit v1.2.3 From 498e960f294093d969e8161727cedc2eda5758fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 27 Apr 2020 08:14:48 +0100 Subject: dqlite: 1.4.0 -> 1.4.1 --- pkgs/development/libraries/dqlite/default.nix | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix index 131c22fccfb..cbd59949b79 100644 --- a/pkgs/development/libraries/dqlite/default.nix +++ b/pkgs/development/libraries/dqlite/default.nix @@ -5,24 +5,25 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "dqlite"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "canonical"; repo = pname; rev = "v${version}"; - sha256 = "19snm6cicxagcw9ys2jmjf6fchzs6pwm7h4jmyr0pn6zks2yjf1i"; + sha256 = "04h3wbfv6bkzzmcwaja33x2qkj3czn0p6fgbdgqd1xli8sx2c2k4"; }; nativeBuildInputs = [ autoreconfHook file pkgconfig ]; - buildInputs = [ libco-canonical.dev libuv raft-canonical.dev - sqlite-replication ]; - - preConfigure= '' - substituteInPlace configure --replace /usr/bin/ " " - ''; - - doCheck = true; + buildInputs = [ + libco-canonical.dev + libuv + raft-canonical.dev + sqlite-replication + ]; + + # tests hang for ever on x86_64-linux + doCheck = false; outputs = [ "dev" "out" ]; -- cgit v1.2.3 From c10d82358f875bb3c2104b7958777eb0033e024f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= Date: Mon, 27 Apr 2020 09:04:07 +0200 Subject: treewide: add types to boolean / enable options or make use of mkEnableOption --- nixos/modules/config/fonts/fontdir.nix | 1 + nixos/modules/config/fonts/ghostscript.nix | 1 + nixos/modules/config/ldap.nix | 2 ++ nixos/modules/security/apparmor-suid.nix | 1 + nixos/modules/security/pam.nix | 15 +++------------ nixos/modules/services/mail/postfix.nix | 1 + nixos/modules/services/mail/spamassassin.nix | 1 + nixos/modules/services/misc/autofs.nix | 1 + nixos/modules/services/misc/disnix.nix | 5 +---- nixos/modules/services/networking/gogoclient.nix | 1 + nixos/modules/services/networking/hostapd.nix | 2 ++ nixos/modules/services/networking/openfire.nix | 1 + nixos/modules/services/networking/ssh/lshd.nix | 6 ++++++ nixos/modules/services/networking/tcpcrypt.nix | 1 + nixos/modules/services/networking/wicd.nix | 1 + nixos/modules/services/web-servers/jboss/default.nix | 1 + nixos/modules/services/x11/display-managers/gdm.nix | 3 ++- nixos/modules/services/x11/hardware/digimend.nix | 7 +------ nixos/modules/virtualisation/xen-dom0.nix | 11 +++-------- 19 files changed, 31 insertions(+), 31 deletions(-) diff --git a/nixos/modules/config/fonts/fontdir.nix b/nixos/modules/config/fonts/fontdir.nix index cc70fbf8744..a6aa84ae822 100644 --- a/nixos/modules/config/fonts/fontdir.nix +++ b/nixos/modules/config/fonts/fontdir.nix @@ -25,6 +25,7 @@ in fonts = { enableFontDir = mkOption { + type = types.bool; default = false; description = '' Whether to create a directory with links to all fonts in diff --git a/nixos/modules/config/fonts/ghostscript.nix b/nixos/modules/config/fonts/ghostscript.nix index 1c62a525de9..b1dd81bf2d2 100644 --- a/nixos/modules/config/fonts/ghostscript.nix +++ b/nixos/modules/config/fonts/ghostscript.nix @@ -9,6 +9,7 @@ with lib; fonts = { enableGhostscriptFonts = mkOption { + type = types.bool; default = false; description = '' Whether to add the fonts provided by Ghostscript (such as diff --git a/nixos/modules/config/ldap.nix b/nixos/modules/config/ldap.nix index b554f197dc4..4c8b527676b 100644 --- a/nixos/modules/config/ldap.nix +++ b/nixos/modules/config/ldap.nix @@ -88,6 +88,7 @@ in }; useTLS = mkOption { + type = types.bool; default = false; description = '' If enabled, use TLS (encryption) over an LDAP (port 389) @@ -109,6 +110,7 @@ in daemon = { enable = mkOption { + type = types.bool; default = false; description = '' Whether to let the nslcd daemon (nss-pam-ldapd) handle the diff --git a/nixos/modules/security/apparmor-suid.nix b/nixos/modules/security/apparmor-suid.nix index 3c93f5440ab..6c479e070e2 100644 --- a/nixos/modules/security/apparmor-suid.nix +++ b/nixos/modules/security/apparmor-suid.nix @@ -9,6 +9,7 @@ with lib; ]; options.security.apparmor.confineSUIDApplications = mkOption { + type = types.bool; default = true; description = '' Install AppArmor profiles for commonly-used SUID application diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index bfc2a881387..aeb8629767b 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -545,6 +545,7 @@ in }; security.pam.enableSSHAgentAuth = mkOption { + type = types.bool; default = false; description = '' @@ -555,12 +556,7 @@ in ''; }; - security.pam.enableOTPW = mkOption { - default = false; - description = '' - Enable the OTPW (one-time password) PAM module. - ''; - }; + security.pam.enableOTPW = mkEnableOption "the OTPW (one-time password) PAM module"; security.pam.u2f = { enable = mkOption { @@ -719,12 +715,7 @@ in }; }; - security.pam.enableEcryptfs = mkOption { - default = false; - description = '' - Enable eCryptfs PAM module (mounting ecryptfs home directory on login). - ''; - }; + security.pam.enableEcryptfs = mkEnableOption "eCryptfs PAM module (mounting ecryptfs home directory on login)"; users.motd = mkOption { default = null; diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 19e11b31d9c..608f64a68fb 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -269,6 +269,7 @@ in }; enableSmtp = mkOption { + type = types.bool; default = true; description = "Whether to enable smtp in master.cf."; }; diff --git a/nixos/modules/services/mail/spamassassin.nix b/nixos/modules/services/mail/spamassassin.nix index f6c0b9c794c..4e642542ec6 100644 --- a/nixos/modules/services/mail/spamassassin.nix +++ b/nixos/modules/services/mail/spamassassin.nix @@ -15,6 +15,7 @@ in enable = mkEnableOption "the SpamAssassin daemon"; debug = mkOption { + type = types.bool; default = false; description = "Whether to run the SpamAssassin daemon in debug mode"; }; diff --git a/nixos/modules/services/misc/autofs.nix b/nixos/modules/services/misc/autofs.nix index 84f49f964b1..5e7c1e66828 100644 --- a/nixos/modules/services/misc/autofs.nix +++ b/nixos/modules/services/misc/autofs.nix @@ -57,6 +57,7 @@ in }; debug = mkOption { + type = types.bool; default = false; description = '' Pass -d and -7 to automount and write log to the system journal. diff --git a/nixos/modules/services/misc/disnix.nix b/nixos/modules/services/misc/disnix.nix index 0776ac67908..69386cdbb38 100644 --- a/nixos/modules/services/misc/disnix.nix +++ b/nixos/modules/services/misc/disnix.nix @@ -25,10 +25,7 @@ in description = "Whether to support multi-user mode by enabling the Disnix D-Bus service"; }; - useWebServiceInterface = mkOption { - default = false; - description = "Whether to enable the DisnixWebService interface running on Apache Tomcat"; - }; + useWebServiceInterface = mkEnableOption "the DisnixWebService interface running on Apache Tomcat"; package = mkOption { type = types.path; diff --git a/nixos/modules/services/networking/gogoclient.nix b/nixos/modules/services/networking/gogoclient.nix index c9b03bca711..99455b18314 100644 --- a/nixos/modules/services/networking/gogoclient.nix +++ b/nixos/modules/services/networking/gogoclient.nix @@ -19,6 +19,7 @@ in ''; }; autorun = mkOption { + type = types.bool; default = true; description = '' Whether to automatically start the tunnel. diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index 12c0626a941..6418ae69943 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -72,6 +72,7 @@ in }; noScan = mkOption { + type = types.bool; default = false; description = '' Do not scan for overlapping BSSs in HT40+/- mode. @@ -127,6 +128,7 @@ in }; wpa = mkOption { + type = types.bool; default = true; description = '' Enable WPA (IEEE 802.11i/D3.0) to authenticate with the access point. diff --git a/nixos/modules/services/networking/openfire.nix b/nixos/modules/services/networking/openfire.nix index c74f3611f79..fe0499d5232 100644 --- a/nixos/modules/services/networking/openfire.nix +++ b/nixos/modules/services/networking/openfire.nix @@ -12,6 +12,7 @@ with lib; enable = mkEnableOption "OpenFire XMPP server"; usePostgreSQL = mkOption { + type = types.bool; default = true; description = " Whether you use PostgreSQL service for your storage back-end. diff --git a/nixos/modules/services/networking/ssh/lshd.nix b/nixos/modules/services/networking/ssh/lshd.nix index 892e59778c3..41d0584080e 100644 --- a/nixos/modules/services/networking/ssh/lshd.nix +++ b/nixos/modules/services/networking/ssh/lshd.nix @@ -54,21 +54,25 @@ in }; syslog = mkOption { + type = types.bool; default = true; description = ''Whether to enable syslog output.''; }; passwordAuthentication = mkOption { + type = types.bool; default = true; description = ''Whether to enable password authentication.''; }; publicKeyAuthentication = mkOption { + type = types.bool; default = true; description = ''Whether to enable public key authentication.''; }; rootLogin = mkOption { + type = types.bool; default = false; description = ''Whether to enable remote root login.''; }; @@ -90,11 +94,13 @@ in }; tcpForwarding = mkOption { + type = types.bool; default = true; description = ''Whether to enable TCP/IP forwarding.''; }; x11Forwarding = mkOption { + type = types.bool; default = true; description = ''Whether to enable X11 forwarding.''; }; diff --git a/nixos/modules/services/networking/tcpcrypt.nix b/nixos/modules/services/networking/tcpcrypt.nix index 18f2e135124..5a91054e166 100644 --- a/nixos/modules/services/networking/tcpcrypt.nix +++ b/nixos/modules/services/networking/tcpcrypt.nix @@ -15,6 +15,7 @@ in options = { networking.tcpcrypt.enable = mkOption { + type = types.bool; default = false; description = '' Whether to enable opportunistic TCP encryption. If the other end diff --git a/nixos/modules/services/networking/wicd.nix b/nixos/modules/services/networking/wicd.nix index 03c6bd28aab..aa10a50f876 100644 --- a/nixos/modules/services/networking/wicd.nix +++ b/nixos/modules/services/networking/wicd.nix @@ -9,6 +9,7 @@ with lib; options = { networking.wicd.enable = mkOption { + type = types.bool; default = false; description = '' Whether to start wicd. Wired and diff --git a/nixos/modules/services/web-servers/jboss/default.nix b/nixos/modules/services/web-servers/jboss/default.nix index 3a125982831..ca5b8635fc0 100644 --- a/nixos/modules/services/web-servers/jboss/default.nix +++ b/nixos/modules/services/web-servers/jboss/default.nix @@ -60,6 +60,7 @@ in }; useJK = mkOption { + type = types.bool; default = false; description = "Whether to use to connector to the Apache HTTP server"; }; diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix index d7bef68e5bc..622ea62f3a9 100644 --- a/nixos/modules/services/x11/display-managers/gdm.nix +++ b/nixos/modules/services/x11/display-managers/gdm.nix @@ -93,16 +93,17 @@ in }; wayland = mkOption { + type = types.bool; default = true; description = '' Allow GDM to run on Wayland instead of Xserver. Note to enable Wayland with Nvidia you need to enable the . ''; - type = types.bool; }; nvidiaWayland = mkOption { + type = types.bool; default = false; description = '' Whether to allow wayland to be used with the proprietary diff --git a/nixos/modules/services/x11/hardware/digimend.nix b/nixos/modules/services/x11/hardware/digimend.nix index a9f5640905a..b1b1682f00b 100644 --- a/nixos/modules/services/x11/hardware/digimend.nix +++ b/nixos/modules/services/x11/hardware/digimend.nix @@ -16,12 +16,7 @@ in services.xserver.digimend = { - enable = mkOption { - default = false; - description = '' - Whether to enable the digimend drivers for Huion/XP-Pen/etc. tablets. - ''; - }; + enable = mkEnableOption "the digimend drivers for Huion/XP-Pen/etc. tablets"; }; diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix index 7f0af9901b9..7b2a66c4348 100644 --- a/nixos/modules/virtualisation/xen-dom0.nix +++ b/nixos/modules/virtualisation/xen-dom0.nix @@ -103,6 +103,7 @@ in }; forwardDns = mkOption { + type = types.bool; default = false; description = '' If set to true, the DNS queries from the @@ -135,14 +136,8 @@ in }; }; - virtualisation.xen.trace = - mkOption { - default = false; - description = - '' - Enable Xen tracing. - ''; - }; + virtualisation.xen.trace = mkEnableOption "Xen tracing"; + }; -- cgit v1.2.3 From b67cbe5a2d5b5c9a299a9721a06eed235e2278ed Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Sat, 18 Apr 2020 07:10:42 +0000 Subject: luajit_2_0, luajit_2_1: bump to 2020-03-20, GC64 mode switch --- pkgs/development/interpreters/luajit/2.0.nix | 5 +++-- pkgs/development/interpreters/luajit/2.1.nix | 5 +++-- pkgs/development/interpreters/luajit/default.nix | 12 ++++++++---- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/development/interpreters/luajit/2.0.nix b/pkgs/development/interpreters/luajit/2.0.nix index 7db3830447f..3f0fa7303eb 100644 --- a/pkgs/development/interpreters/luajit/2.0.nix +++ b/pkgs/development/interpreters/luajit/2.0.nix @@ -1,9 +1,10 @@ { self, callPackage, lib }: callPackage ./default.nix { inherit self; - version = "2.0.5"; + version = "2.0.5-2020-03-20"; + rev = "e613105"; isStable = true; - sha256 = "0yg9q4q6v028bgh85317ykc9whgxgysp76qzaqgq55y6jy11yjw7"; + sha256 = "0k843z90s4hi0qhri6ixy8sv21nig8jwbznpqgqg845ji530kqj7"; extraMeta = { # this isn't precise but it at least stops the useless Hydra build platforms = with lib; filter (p: p != "aarch64-linux") (platforms.linux ++ platforms.darwin); diff --git a/pkgs/development/interpreters/luajit/2.1.nix b/pkgs/development/interpreters/luajit/2.1.nix index e8f1b8b338c..b5a7894e98d 100644 --- a/pkgs/development/interpreters/luajit/2.1.nix +++ b/pkgs/development/interpreters/luajit/2.1.nix @@ -1,7 +1,8 @@ { self, callPackage }: callPackage ./default.nix { inherit self; - version = "2.1.0-beta3"; + version = "2.1.0-2020-03-20"; + rev = "9143e86"; isStable = false; - sha256 = "1hyrhpkwjqsv54hnnx4cl8vk44h9d6c9w0fz1jfjz00w255y7lhs"; + sha256 = "1zw1yr0375d6jr5x20zvkvk76hkaqamjynbswpl604w6r6id070b"; } diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 9be368a5902..9bc76c44937 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -1,7 +1,8 @@ -{ stdenv, fetchurl, buildPackages +{ stdenv, fetchFromGitHub, buildPackages , name ? "luajit-${version}" , isStable , sha256 +, rev , version , extraMeta ? {} , callPackage @@ -10,6 +11,7 @@ , enableFFI ? true , enableJIT ? true , enableJITDebugModule ? enableJIT +, enableGC64 ? stdenv.hostPlatform.isAarch64 , enable52Compat ? false , enableValgrindSupport ? false , valgrind ? null @@ -28,6 +30,7 @@ let optional (!enableFFI) "-DLUAJIT_DISABLE_FFI" ++ optional (!enableJIT) "-DLUAJIT_DISABLE_JIT" ++ optional enable52Compat "-DLUAJIT_ENABLE_LUA52COMPAT" + ++ optional (!enableGC64) "-DLUAJIT_DISABLE_GC64" ++ optional useSystemMalloc "-DLUAJIT_USE_SYSMALLOC" ++ optional enableValgrindSupport "-DLUAJIT_USE_VALGRIND" ++ optional enableGDBJITSupport "-DLUAJIT_USE_GDBJIT" @@ -37,9 +40,10 @@ let in stdenv.mkDerivation rec { inherit name version; - src = fetchurl { - url = "http://luajit.org/download/LuaJIT-${version}.tar.gz"; - inherit sha256; + src = fetchFromGitHub { + owner = "LuaJIT"; + repo = "LuaJIT"; + inherit sha256 rev; }; luaversion = "5.1"; -- cgit v1.2.3 From 9c716aa71a694675686e560f047b35f3a51b8841 Mon Sep 17 00:00:00 2001 From: georgewhewell Date: Sun, 26 Apr 2020 16:52:21 +0100 Subject: pythonPackages.bluepy: init at 1.3.0 --- pkgs/development/python-modules/bluepy/default.nix | 35 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/bluepy/default.nix diff --git a/pkgs/development/python-modules/bluepy/default.nix b/pkgs/development/python-modules/bluepy/default.nix new file mode 100644 index 00000000000..8d247b41d27 --- /dev/null +++ b/pkgs/development/python-modules/bluepy/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pkg-config +, glib +}: + +buildPythonPackage rec { + pname = "bluepy"; + version = "1.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1v0wjy1rz0rbwghr1z3xhdm06lqn9iig6vr5j2wmymh3w6pysw9a"; + }; + + buildInputs = [ glib ]; + nativeBuildInputs = [ pkg-config ]; + + # tests try to access hardware + checkPhase = '' + $out/bin/blescan --help > /dev/null + $out/bin/sensortag --help > /dev/null + $out/bin/thingy52 --help > /dev/null + ''; + pythonImportsCheck = [ "bluepy" ]; + + meta = with stdenv.lib; { + description = "Python interface to Bluetooth LE on Linux"; + homepage = "https://github.com/IanHarvey/bluepy"; + maintainers = with maintainers; [ georgewhewell ]; + license = licenses.gpl2; + }; + +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ddb4136f367..45cf2f3c05b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -518,6 +518,8 @@ in { blivet = callPackage ../development/python-modules/blivet { }; + bluepy = callPackage ../development/python-modules/bluepy { }; + boltons = callPackage ../development/python-modules/boltons { }; bravia-tv = callPackage ../development/python-modules/bravia-tv { }; -- cgit v1.2.3 From 412bb5e04dd405c2d4822c0eadff269f573e33a0 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 20 Apr 2020 17:09:02 +0200 Subject: gitlab: support passing --rev to the `update-all` script While it's already possible to invoke `update-data` with the `--rev` argument, one still needs to run all later phases manually. Fix this, by having `update-all` also accept a `--rev` argument, and pass it down to `update-data`. Also, make the help text a bit more usable, by suggesting the usual versioning scheme used these times. --- pkgs/applications/version-management/gitlab/update.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index a2a3a6d05b7..86ef1e9736c 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -100,7 +100,7 @@ def cli(): @cli.command('update-data') -@click.option('--rev', default='latest', help='The rev to use, \'latest\' points to the latest (stable) tag') +@click.option('--rev', default='latest', help='The rev to use (vX.Y.Z-ee), or \'latest\'') def update_data(rev: str): """Update data.nix""" repo = GitLabRepo() @@ -227,10 +227,11 @@ def update_gitlab_workhorse(): os.unlink(gitlab_workhorse_dir / fn) @cli.command('update-all') +@click.option('--rev', default='latest', help='The rev to use (vX.Y.Z-ee), or \'latest\'') @click.pass_context -def update_all(ctx): +def update_all(ctx, rev: str): """Update all gitlab components to the latest stable release""" - ctx.invoke(update_data, rev='latest') + ctx.invoke(update_data, rev=rev) ctx.invoke(update_rubyenv) ctx.invoke(update_yarnpkgs) ctx.invoke(update_gitaly) -- cgit v1.2.3 From 4c26ab4198b083f0647f1c0e64f985e211beff8f Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Tue, 21 Apr 2020 22:29:01 +0200 Subject: gitlab: update.py: invoke bundle lock manually `bundix -l` doesn't work, as it treats bundler's warning about upgrading the lockfile version as an error, so invoke `bundle lock` manually. --- pkgs/applications/version-management/gitlab/update.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index 86ef1e9736c..a128fd5bc40 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i python3 -p bundix common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.lxml python3Packages.click python3Packages.click-log vgo2nix yarn2nix +#! nix-shell -i python3 -p bundix bundler common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.lxml python3Packages.click python3Packages.click-log vgo2nix yarn2nix import click import click_log @@ -135,6 +135,7 @@ def update_rubyenv(): with open(rubyenv_dir / fn, 'w') as f: f.write(repo.get_file(fn, rev)) + subprocess.check_output(['bundle', 'lock'], cwd=rubyenv_dir) subprocess.check_output(['bundix'], cwd=rubyenv_dir) @@ -174,6 +175,7 @@ def update_gitaly(): with open(gitaly_dir / fn, 'w') as f: f.write(repo.get_file(fn, f"v{gitaly_server_version}")) + subprocess.check_output(['bundle', 'lock'], cwd=gitaly_dir) subprocess.check_output(['bundix'], cwd=gitaly_dir) os.environ['GOROOT'] = "" -- cgit v1.2.3 From d1902923fae5e0056ef69de5e6cf52b1573de225 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 20 Apr 2020 17:19:11 +0200 Subject: gitlab: 12.8.8 -> 12.8.9 See https://about.gitlab.com/releases/2020/04/14/critical-security-release-gitlab-12-dot-9-dot-3-released/ for details. --- pkgs/applications/version-management/gitlab/data.json | 10 +++++----- .../version-management/gitlab/rubyEnv/Gemfile | 2 +- .../version-management/gitlab/rubyEnv/Gemfile.lock | 16 ++++++++-------- .../version-management/gitlab/rubyEnv/gemset.nix | 16 ++++++++-------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index 8da56229a02..c651e8bab92 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "12.8.8", - "repo_hash": "1y8flmssz8bp07v7x9gxazqn5889hvkxk0k6py773gdnna5fd5fb", + "version": "12.8.9", + "repo_hash": "07vayjy3020hapbdx2wiv91g9xrfmvngbyj05hs2p0p3gwj6g2a4", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v12.8.8-ee", + "rev": "v12.8.9-ee", "passthru": { - "GITALY_SERVER_VERSION": "12.8.8", + "GITALY_SERVER_VERSION": "12.8.9", "GITLAB_PAGES_VERSION": "1.16.0", "GITLAB_SHELL_VERSION": "11.0.0", - "GITLAB_WORKHORSE_VERSION": "8.21.1" + "GITLAB_WORKHORSE_VERSION": "8.21.2" } } \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index 20c713e8c39..e8a58a6d59b 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -163,7 +163,7 @@ gem 'diffy', '~> 3.1.0' gem 'diff_match_patch', '~> 0.1.0' # Application server -gem 'rack', '~> 2.0.7' +gem 'rack', '~> 2.0.9' group :unicorn do gem 'unicorn', '~> 5.4.1' diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index a808e85e433..4d7b3d32a6b 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -173,7 +173,7 @@ GEM concord (0.1.5) adamantium (~> 0.2.0) equalizer (~> 0.0.9) - concurrent-ruby (1.1.5) + concurrent-ruby (1.1.6) connection_pool (2.2.2) contracts (0.11.0) cork (0.3.0) @@ -783,7 +783,7 @@ GEM public_suffix (4.0.3) pyu-ruby-sasl (0.0.3.3) raabro (1.1.6) - rack (2.0.7) + rack (2.0.9) rack-accept (0.4.5) rack (>= 0.4) rack-attack (6.2.0) @@ -854,17 +854,17 @@ GEM json recursive-open-struct (1.1.0) redis (4.1.3) - redis-actionpack (5.1.0) - actionpack (>= 4.0, < 7) - redis-rack (>= 1, < 3) + redis-actionpack (5.2.0) + actionpack (>= 5, < 7) + redis-rack (>= 2.1.0, < 3) redis-store (>= 1.1.0, < 2) redis-activesupport (5.2.0) activesupport (>= 3, < 7) redis-store (>= 1.3, < 2) redis-namespace (1.6.0) redis (>= 3.0.4) - redis-rack (2.0.6) - rack (>= 1.5, < 3) + redis-rack (2.1.2) + rack (>= 2.0.8, < 3) redis-store (>= 1.2, < 2) redis-rails (5.0.2) redis-actionpack (>= 5.0, < 6) @@ -1325,7 +1325,7 @@ DEPENDENCIES prometheus-client-mmap (~> 0.10.0) pry-byebug (~> 3.5.1) pry-rails (~> 0.3.9) - rack (~> 2.0.7) + rack (~> 2.0.9) rack-attack (~> 6.2.0) rack-cors (~> 1.0.6) rack-oauth2 (~> 1.9.3) diff --git a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index f92b72361df..dec89c43a82 100644 --- a/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -763,10 +763,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; + sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl"; type = "gem"; }; - version = "1.1.5"; + version = "1.1.6"; }; connection_pool = { groups = ["default"]; @@ -3501,10 +3501,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z90vflxbgjy2n84r7mbyax3i2vyvvrxxrf86ljzn5rw65jgnn2i"; + sha256 = "1mxzk12xylrz6d4n9jj5jasfscbf1pbk4idrb0nlf327lx9rwfkk"; type = "gem"; }; - version = "2.0.7"; + version = "2.0.9"; }; rack-accept = { dependencies = ["rack"]; @@ -3803,10 +3803,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hvai5ygkyii9wq8h98wim8shgrm7vkv0js62zpm85vdl1xzvphz"; + sha256 = "0c2276zzc0044zh37a8frx1v7hnra7z7k126154ps7njbqngfdv3"; type = "gem"; }; - version = "5.1.0"; + version = "5.2.0"; }; redis-activesupport = { dependencies = ["activesupport" "redis-store"]; @@ -3836,10 +3836,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pa19ydbk0l6wilwbxcjn6knfs4ffgj0rhaaldrlhf76pjgkaiqb"; + sha256 = "0ldw5sxyd80pv0gr89kvn6ziszlbs8lv1a573fkm6d0f11fps413"; type = "gem"; }; - version = "2.0.6"; + version = "2.1.2"; }; redis-rails = { dependencies = ["redis-actionpack" "redis-activesupport" "redis-store"]; -- cgit v1.2.3 From b1f66bfcb2647f8269c74a4c91584f6baf0ac1d9 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 20 Apr 2020 17:19:36 +0200 Subject: gitlab-workhorse: 8.21.1 -> 8.21.2 --- .../version-management/gitlab/gitlab-workhorse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index 491dd868dd9..dda67833567 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -3,13 +3,13 @@ buildGoPackage rec { pname = "gitlab-workhorse"; - version = "8.21.1"; + version = "8.21.2"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "1d384xw7hfrph4i61z9z315sik7ja9hgrvmhljirwxrch1fyx3m4"; + sha256 = "065yy8zfxahpybk3mbvc492by1lvssqcbqm8i4yp09m669rk239w"; }; goPackagePath = "gitlab.com/gitlab-org/gitlab-workhorse"; -- cgit v1.2.3 From 81c34ec54fc55b86fca436e24b408a8487062442 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 20 Apr 2020 17:19:49 +0200 Subject: gitaly: 12.8.8 -> 12.8.9 --- pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock | 2 +- pkgs/applications/version-management/gitlab/gitaly/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index b41c78f3a3d..e3f7865226a 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -242,4 +242,4 @@ DEPENDENCIES webmock (~> 3.4.0) BUNDLED WITH - 2.1.4 + 1.17.3 diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 45e7db5be8e..968b26632c7 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -28,14 +28,14 @@ let }; }); in buildGoPackage rec { - version = "12.8.8"; + version = "12.8.9"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "182jqglzbzq8jnlq6l634125jkvi67pfr1xck68n4k09gyzqllxv"; + sha256 = "06q1km2pigpl4yxl8pkzdy2yxzvsfm6n5r3kmd8h19j3sc6imbmh"; }; # Fix a check which assumes that hook files are writeable by their -- cgit v1.2.3 From 3629975546bf7acd3d37ab30c6336de47fee5636 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 27 Apr 2020 09:30:45 +0100 Subject: dqlite: limit build to Linux https://dqlite.io/docs/faq#are-windows-and-macos-supported --- pkgs/development/libraries/dqlite/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/dqlite/default.nix b/pkgs/development/libraries/dqlite/default.nix index cbd59949b79..aed7dc59bcb 100644 --- a/pkgs/development/libraries/dqlite/default.nix +++ b/pkgs/development/libraries/dqlite/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/CanonicalLtd/dqlite/"; license = licenses.asl20; maintainers = with maintainers; [ joko wucke13 ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } -- cgit v1.2.3 From 7c7e76450b249ddab740746fc6e8ac81554b3a01 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Mon, 27 Apr 2020 02:11:10 -0700 Subject: nixos/azure-new: use local nixpkgs --- nixos/maintainers/scripts/azure-new/examples/basic/image.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/maintainers/scripts/azure-new/examples/basic/image.nix b/nixos/maintainers/scripts/azure-new/examples/basic/image.nix index 74b12815158..ad62dcd14a0 100644 --- a/nixos/maintainers/scripts/azure-new/examples/basic/image.nix +++ b/nixos/maintainers/scripts/azure-new/examples/basic/image.nix @@ -1,5 +1,5 @@ let - pkgs = (import {}); + pkgs = (import ../../../../../../default.nix {}); machine = import "${pkgs.path}/nixos/lib/eval-config.nix" { system = "x86_64-linux"; modules = [ -- cgit v1.2.3 From 3b9b2f64ae75c552ff105c0c0fd9c56dc75c010b Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Tue, 21 Apr 2020 15:23:11 -0700 Subject: arc-theme: change fork, unmark as broken, v20190917 -> v20200416 --- pkgs/data/themes/arc/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/data/themes/arc/default.nix b/pkgs/data/themes/arc/default.nix index 53e81b323dc..14e1b248261 100644 --- a/pkgs/data/themes/arc/default.nix +++ b/pkgs/data/themes/arc/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "arc-theme"; - version = "20190917"; + version = "20200416"; src = fetchFromGitHub { - owner = "arc-design"; + owner = "jnsh"; repo = pname; - rev = version; - sha256 = "1qgpk4p2hi5hd4yy0hj93kq1vs0b32wb8qkaj1wi90c8gwddq5wa"; + rev = "0779e1ca84141d8b443cf3e60b85307a145169b6"; + sha256 = "1ddyi8g4rkd4mxadjvl66wc0lxpa4qdr98nbbhm5abaqfs2yldd4"; }; nativeBuildInputs = [ @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-gnome-shell" # 3.36 not supported + "--disable-cinnamon" # not equipped to test "--disable-unity" ]; @@ -44,10 +45,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Flat theme with transparent elements for GTK 3, GTK 2 and Gnome Shell"; - homepage = "https://github.com/arc-design/arc-theme"; + homepage = "https://github.com/jnsh/arc-theme"; license = licenses.gpl3; maintainers = with maintainers; [ simonvandel romildo ]; platforms = platforms.linux; - broken = true; # since libsass 3.6.3 }; } -- cgit v1.2.3 From 1d23950b5f019ed30f2ed4dfe8fb1f87c7ebc314 Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Mon, 27 Apr 2020 12:01:29 +0200 Subject: puredata: 0.49-0 -> 0.50-2 --- pkgs/applications/audio/puredata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/applications/audio/puredata/default.nix index 9880a65d0ca..4b221cd1a76 100644 --- a/pkgs/applications/audio/puredata/default.nix +++ b/pkgs/applications/audio/puredata/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "puredata"; - version = "0.49-0"; + version = "0.50-2"; src = fetchurl { url = "http://msp.ucsd.edu/Software/pd-${version}.src.tar.gz"; - sha256 = "18rzqbpgnnvyslap7k0ly87aw1bbxkb0rk5agpr423ibs9slxq6j"; + sha256 = "0dz6r6jy0zfs1xy1xspnrxxks8kddi9c7pxz4vpg2ygwv83ghpg5"; }; nativeBuildInputs = [ autoreconfHook gettext makeWrapper ]; -- cgit v1.2.3 From eac6c63db1a1783ef8cfd4921229185e34f51032 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 24 Apr 2020 23:37:45 +0200 Subject: hidapi: request libusb1 directly --- pkgs/development/libraries/hidapi/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix index 28e96244ba5..11cdd0ab7e0 100644 --- a/pkgs/development/libraries/hidapi/default.nix +++ b/pkgs/development/libraries/hidapi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, systemd, libusb +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, systemd, libusb1 , darwin }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ ] - ++ stdenv.lib.optionals stdenv.isLinux [ libusb systemd ]; + ++ stdenv.lib.optionals stdenv.isLinux [ libusb1 systemd ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3316b446b9a..668ef2561df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12141,9 +12141,7 @@ in heyefi = haskellPackages.heyefi; - hidapi = callPackage ../development/libraries/hidapi { - libusb = libusb1; - }; + hidapi = callPackage ../development/libraries/hidapi { }; highfive = callPackage ../development/libraries/highfive { }; -- cgit v1.2.3 From d0b9aa6fa28b55983e7cf2fa00f68b95d50f9ff8 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 24 Apr 2020 23:38:18 +0200 Subject: usbredir: request libusb1 directly Also, fix the website there, and tidy up the spice-gtk derivation, which makes use of libusb1 too. --- pkgs/development/libraries/spice-gtk/default.nix | 50 ++++++++++++------------ pkgs/development/libraries/usbredir/default.nix | 7 ++-- pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 30 insertions(+), 31 deletions(-) diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index f418ecda89e..22370cee448 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -1,35 +1,36 @@ { stdenv , fetchurl -, pkgconfig -, meson -, ninja -, python3 -, spice-protocol -, gettext -, openssl -, pixman -, gobject-introspection -, libjpeg_turbo -, zlib -, cyrus_sasl -, usbredir -, libsoup -, polkit , acl -, usbutils -, vala -, gtk3 +, cyrus_sasl +, docbook_xsl , epoxy -, libdrm +, gettext +, gobject-introspection , gst_all_1 -, phodav -, libopus , gtk-doc +, gtk3 , json-glib -, lz4 , libcacard +, libdrm +, libjpeg_turbo +, libopus +, libsoup +, libusb1 +, lz4 +, meson +, ninja +, openssl , perl -, docbook_xsl +, phodav +, pixman +, pkgconfig +, polkit +, python3 +, spice-protocol +, usbredir +, usbutils +, vala +, zlib , withPolkit ? true }: @@ -99,9 +100,10 @@ stdenv.mkDerivation rec { libcacard libdrm libjpeg_turbo + libopus + libusb1 lz4 openssl - libopus phodav pixman spice-protocol diff --git a/pkgs/development/libraries/usbredir/default.nix b/pkgs/development/libraries/usbredir/default.nix index 79cac738498..2ac7c823e22 100644 --- a/pkgs/development/libraries/usbredir/default.nix +++ b/pkgs/development/libraries/usbredir/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libusb }: +{ stdenv, fetchurl, pkgconfig, libusb1 }: stdenv.mkDerivation rec { pname = "usbredir"; @@ -12,14 +12,13 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-Wno-error"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libusb ]; - propagatedBuildInputs = [ libusb ]; + propagatedBuildInputs = [ libusb1 ]; outputs = [ "out" "dev" ]; meta = with stdenv.lib; { description = "USB traffic redirection protocol"; - homepage = "http://spice-space.org/page/UsbRedir"; + homepage = "https://www.spice-space.org/usbredir.html"; license = licenses.lgpl21; maintainers = [ maintainers.offline ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 668ef2561df..1fe75fa6391 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14793,9 +14793,7 @@ in ustr = callPackage ../development/libraries/ustr { }; - usbredir = callPackage ../development/libraries/usbredir { - libusb = libusb1; - }; + usbredir = callPackage ../development/libraries/usbredir { }; uthash = callPackage ../development/libraries/uthash { }; -- cgit v1.2.3 From 88048e3213e45b586abb9deae4c696cf6b8f1d42 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 24 Apr 2020 23:39:32 +0200 Subject: brickd: request libusb1 directly --- pkgs/servers/brickd/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/brickd/default.nix b/pkgs/servers/brickd/default.nix index b6c5b2a60af..4b18e73284f 100644 --- a/pkgs/servers/brickd/default.nix +++ b/pkgs/servers/brickd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, libusb, pkgconfig, pmutils, udev} : +{ stdenv, fetchgit, libusb1, pkgconfig, pmutils, udev} : let @@ -22,7 +22,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libusb pmutils udev ]; + buildInputs = [ libusb1 pmutils udev ]; # shell thing didn't work so i replaced it using nix prePatch = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1fe75fa6391..0dc77f5165f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5874,9 +5874,7 @@ in briss = callPackage ../tools/graphics/briss { }; - brickd = callPackage ../servers/brickd { - libusb = libusb1; - }; + brickd = callPackage ../servers/brickd { }; bully = callPackage ../tools/networking/bully { openssl = openssl_1_0_2; -- cgit v1.2.3 From f3a5fd548a76282b0fd808e118b09baa680105e3 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 24 Apr 2020 23:42:01 +0200 Subject: yubikey-personalization: request libusb1 directly --- pkgs/tools/misc/yubikey-personalization/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/yubikey-personalization/default.nix b/pkgs/tools/misc/yubikey-personalization/default.nix index 41cb53d9d3b..5ef828762f6 100644 --- a/pkgs/tools/misc/yubikey-personalization/default.nix +++ b/pkgs/tools/misc/yubikey-personalization/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libusb, libyubikey, json_c }: +{ stdenv, fetchurl, pkgconfig, libusb1, libyubikey, json_c }: stdenv.mkDerivation rec { pname = "yubikey-personalization"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libusb libyubikey json_c ]; + buildInputs = [ libusb1 libyubikey json_c ]; configureFlags = [ "--with-backend=libusb-1.0" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0dc77f5165f..c14ba92ce5e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15062,9 +15062,7 @@ in yubikey-neo-manager = callPackage ../tools/misc/yubikey-neo-manager { }; - yubikey-personalization = callPackage ../tools/misc/yubikey-personalization { - libusb = libusb1; - }; + yubikey-personalization = callPackage ../tools/misc/yubikey-personalization { }; yubikey-personalization-gui = libsForQt5.callPackage ../tools/misc/yubikey-personalization-gui { }; -- cgit v1.2.3 From 2c621ff4f4ad4eb2467fc9f98bab327a25f2e3ac Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 24 Apr 2020 23:43:07 +0200 Subject: cups: request libusb1 directly --- pkgs/misc/cups/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index f229ced8936..b16c0645cda 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -13,7 +13,7 @@ , acl , gmp , darwin -, libusb ? null +, libusb1 ? null , gnutls ? null , avahi ? null , libpaper ? null @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig removeReferencesTo ]; - buildInputs = [ zlib libjpeg libpng libtiff libusb gnutls libpaper ] + buildInputs = [ zlib libjpeg libpng libtiff libusb1 gnutls libpaper ] ++ optionals stdenv.isLinux [ avahi pam dbus ] ++ optional enableSystemd systemd # Separate from above only to not modify order, to avoid mass rebuilds; merge this with the above at next big change. @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { "--enable-dbus" "--enable-pam" "--with-dbusdir=${placeholder "out"}/share/dbus-1" - ] ++ optional (libusb != null) "--enable-libusb" + ] ++ optional (libusb1 != null) "--enable-libusb" ++ optional (gnutls != null) "--enable-ssl" ++ optional (avahi != null) "--enable-avahi" ++ optional (libpaper != null) "--enable-libpaper" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c14ba92ce5e..d2b58e1323d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25191,9 +25191,7 @@ in clinfo = callPackage ../tools/system/clinfo { }; - cups = callPackage ../misc/cups { - libusb = libusb1; - }; + cups = callPackage ../misc/cups { }; cups-filters = callPackage ../misc/cups/filters.nix { }; -- cgit v1.2.3 From f5368e0194ad794a98bd1cbd90a5b09ff3f3b2e3 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 24 Apr 2020 23:50:38 +0200 Subject: cnijfilter_4_00: request libusb1 directly --- pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix | 20 ++++++++++---------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix index 679d8906994..9b328c20b71 100644 --- a/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter_4_00/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, autoconf, automake, libtool, cups, popt, libtiff, libpng, - ghostscript, glib, libusb, libxml2 }: + ghostscript, glib, libusb1, libxml2 }: /* this derivation is basically just a transcription of the rpm .spec file included in the tarball */ -let arch = +let arch = if stdenv.hostPlatform.system == "x86_64-linux" then "64" else if stdenv.hostPlatform.system == "i686-linux" then "32" else throw "Unsupported system ${stdenv.hostPlatform.system}"; @@ -32,7 +32,7 @@ in stdenv.mkDerivation { buildInputs = [ autoconf libtool automake cups popt libtiff libpng - ghostscript glib libusb libxml2 ]; + ghostscript glib libusb1 libxml2 ]; # patches from https://github.com/tokiclover/bar-overlay/tree/master/net-print/cnijfilter patches = [ @@ -53,10 +53,10 @@ in stdenv.mkDerivation { configurePhase = '' cd libs - ./autogen.sh --prefix=$out + ./autogen.sh --prefix=$out cd ../bscc2sts - ./autogen.sh + ./autogen.sh cd ../cnijnpr ./autogen.sh --prefix=$out --enable-libpath=$out/lib/bjlib @@ -68,25 +68,25 @@ in stdenv.mkDerivation { ./autogen.sh --prefix=$out --enable-progpath=$out/bin cd ../pstocanonij - ./autogen.sh --prefix=$out --enable-progpath=$out/bin + ./autogen.sh --prefix=$out --enable-progpath=$out/bin cd ../backend ./autogen.sh --prefix=$out cd ../backendnet - ./autogen.sh --prefix=$out --enable-libpath=$out/lib/bjlib --enable-progpath=$out/bin + ./autogen.sh --prefix=$out --enable-libpath=$out/lib/bjlib --enable-progpath=$out/bin cd ../cmdtocanonij ./autogen.sh --prefix=$out --datadir=$out/share cd ../cnijbe - ./autogen.sh --prefix=$out --enable-progpath=$out/bin + ./autogen.sh --prefix=$out --enable-progpath=$out/bin cd ../lgmon2 substituteInPlace src/Makefile.am \ --replace /usr/include/libusb-1.0 \ - ${libusb.dev}/include/libusb-1.0 - ./autogen.sh --prefix=$out --enable-libpath=$out/lib/bjlib --enable-progpath=$out/bin + ${libusb1.dev}/include/libusb-1.0 + ./autogen.sh --prefix=$out --enable-libpath=$out/lib/bjlib --enable-progpath=$out/bin cd ..; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d2b58e1323d..6ead4f47408 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25239,9 +25239,7 @@ in # this driver ships with pre-compiled 32-bit binary libraries cnijfilter_2_80 = pkgsi686Linux.callPackage ../misc/cups/drivers/cnijfilter_2_80 { }; - cnijfilter_4_00 = callPackage ../misc/cups/drivers/cnijfilter_4_00 { - libusb = libusb1; - }; + cnijfilter_4_00 = callPackage ../misc/cups/drivers/cnijfilter_4_00 { }; cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 { libusb = libusb1; -- cgit v1.2.3 From d0e4ecb182bb2edc890c238abc6055701bcadddb Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 24 Apr 2020 23:53:01 +0200 Subject: cnijfilter2: request libusb1 directly --- pkgs/misc/cups/drivers/cnijfilter2/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/pkgs/misc/cups/drivers/cnijfilter2/default.nix index 323163bed33..b04ef89d215 100644 --- a/pkgs/misc/cups/drivers/cnijfilter2/default.nix +++ b/pkgs/misc/cups/drivers/cnijfilter2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip, autoconf, automake, cups, glib, libxml2, libusb, libtool +{ stdenv, lib, fetchzip, autoconf, automake, cups, glib, libxml2, libusb1, libtool , withDebug ? false }: stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; buildInputs = [ - cups automake autoconf glib libxml2 libusb libtool + cups automake autoconf glib libxml2 libusb1 libtool ]; # lgmon3's --enable-libdir flag is used soley for specifying in which @@ -37,7 +37,7 @@ stdenv.mkDerivation { cd lgmon3 substituteInPlace src/Makefile.am \ --replace /usr/include/libusb-1.0 \ - ${libusb.dev}/include/libusb-1.0 + ${libusb1.dev}/include/libusb-1.0 ./autogen.sh --prefix=$out --enable-progpath=$out/bin \ --datadir=$out/share \ --enable-libdir=/var/cache/cups diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ead4f47408..7050a0b9ba3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25241,9 +25241,7 @@ in cnijfilter_4_00 = callPackage ../misc/cups/drivers/cnijfilter_4_00 { }; - cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 { - libusb = libusb1; - }; + cnijfilter2 = callPackage ../misc/cups/drivers/cnijfilter2 { }; darcnes = callPackage ../misc/emulators/darcnes { }; -- cgit v1.2.3 From dd03e76f61889409273b1f5527c52092783f6bf4 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 24 Apr 2020 23:55:18 +0200 Subject: stlink: inline libusb-static This is a stlink-specific detail, and doesn't need to be in top-level.nix --- pkgs/development/tools/misc/stlink/default.nix | 10 +++++++--- pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix index c59847b1e0f..0aa8d07f765 100644 --- a/pkgs/development/tools/misc/stlink/default.nix +++ b/pkgs/development/tools/misc/stlink/default.nix @@ -1,9 +1,13 @@ { stdenv, fetchFromGitHub, cmake, libusb1 }: -# IMPORTANT: You need permissions to access the stlink usb devices. +let + # The Darwin build of stlink explicitly refers to static libusb. + libusb1' = if stdenv.isDarwin then libusb1.override { withStatic = true; } else libusb1; + +# IMPORTANT: You need permissions to access the stlink usb devices. # Add services.udev.pkgs = [ pkgs.stlink ] to your configuration.nix -stdenv.mkDerivation rec { +in stdenv.mkDerivation rec { pname = "stlink"; version = "1.6.0"; @@ -14,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "1mlkrxjxg538335g59hjb0zc739dx4mhbspb26z5gz3lf7d4xv6x"; }; - buildInputs = [ cmake libusb1 ]; + buildInputs = [ cmake libusb1' ]; patchPhase = '' sed -i 's@/etc/udev/rules.d@$ENV{out}/etc/udev/rules.d@' CMakeLists.txt sed -i 's@/etc/modprobe.d@$ENV{out}/etc/modprobe.d@' CMakeLists.txt diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7050a0b9ba3..d735aa94b7a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14614,10 +14614,7 @@ in stfl = callPackage ../development/libraries/stfl { }; - stlink = callPackage ../development/tools/misc/stlink { - # The Darwin build of stlink explicitly refers to static libusb. - libusb1 = if stdenv.isDarwin then libusb1.override { withStatic = true; } else libusb1; - }; + stlink = callPackage ../development/tools/misc/stlink { }; steghide = callPackage ../tools/security/steghide {}; -- cgit v1.2.3 From 4f27b45bb5884c4943ad1f9d9e62b2e64d2bb74d Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 24 Apr 2020 23:56:39 +0200 Subject: stlink: cmake is a nativeBuildInput --- pkgs/development/tools/misc/stlink/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix index 0aa8d07f765..7793d9185e7 100644 --- a/pkgs/development/tools/misc/stlink/default.nix +++ b/pkgs/development/tools/misc/stlink/default.nix @@ -18,7 +18,8 @@ in stdenv.mkDerivation rec { sha256 = "1mlkrxjxg538335g59hjb0zc739dx4mhbspb26z5gz3lf7d4xv6x"; }; - buildInputs = [ cmake libusb1' ]; + buildInputs = [ libusb1' ]; + nativeBuildInputs = [ cmake ]; patchPhase = '' sed -i 's@/etc/udev/rules.d@$ENV{out}/etc/udev/rules.d@' CMakeLists.txt sed -i 's@/etc/modprobe.d@$ENV{out}/etc/modprobe.d@' CMakeLists.txt -- cgit v1.2.3 From ce6dbccdfb0f111097b6d986f1e38dc26f78f319 Mon Sep 17 00:00:00 2001 From: Alexandre Esteves Date: Mon, 2 Dec 2019 05:07:43 +0000 Subject: ocamlPackages.bigstring: init at 0.2 --- .../ocaml-modules/bigstring/default.nix | 24 ++++++++++++++++++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/ocaml-modules/bigstring/default.nix diff --git a/pkgs/development/ocaml-modules/bigstring/default.nix b/pkgs/development/ocaml-modules/bigstring/default.nix new file mode 100644 index 00000000000..c74676e4a1e --- /dev/null +++ b/pkgs/development/ocaml-modules/bigstring/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, buildDunePackage }: + +buildDunePackage rec { + pname = "bigstring"; + version = "0.2"; + + minimumOCamlVersion = "4.03"; + + src = fetchFromGitHub { + owner = "c-cube"; + repo = "ocaml-bigstring"; + rev = version; + sha256 = "0ypdf29cmwmjm3djr5ygz8ls81dl41a4iz1xx5gbcdpbrdiapb77"; + }; + + doCheck = true; + + meta = with lib; { + homepage = https://github.com/c-cube/ocaml-bigstring; + description = "Bigstring built on top of bigarrays, and convenient functions"; + license = licenses.bsd2; + maintainers = [ maintainers.alexfmpe ]; + }; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index cef4e913026..14664fbedd7 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -75,6 +75,8 @@ let bigstringaf = callPackage ../development/ocaml-modules/bigstringaf { }; + bigstring = callPackage ../development/ocaml-modules/bigstring { }; + biocaml = callPackage ../development/ocaml-modules/biocaml { }; bistro = callPackage ../development/ocaml-modules/bistro { }; -- cgit v1.2.3 From c17800c081b84b5e350a74b9f59b121ecee7863d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 27 Apr 2020 12:29:05 +0200 Subject: =?UTF-8?q?zsh-powerlevel10k:=20v1.5.0=20=E2=86=92=20v1.6.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changes since the last release Wizard Configuration wizard now reacts to terminal size changes in real time and can function at much smaller terminal dimensions. Configs with prompt_char now have vi_mode disabled by default. Generated configs now unset DEFAULT_USER. Classic and Rainbow configs now set POWERLEVEL9K_MULTILINE_NEWLINE_PROMPT_GAP_BACKGROUND. This makes it easier to define 3-line prompt. New parameters If POWERLEVEL9K_CONFIG_FILE is set, configuration wizard will write configs to the specified location instead of the default ${ZDOTDIR:-~}/.p10k.zsh. gitstatus Support older macOS versions (at least El Capitan; even older versions might work). Support Linux on armv6, i386 and i686. Support cygwin and msys2 on i686. macOS builds now use iconv from Homebrew. gitstatusd binaries are now being built with https://github.com/romkatv/gitstatus/blob/release/mbuild. Misc The default icon for proxy segment is now ↔ instead of ⮂. The old icon is missing in many fonts. Bug fixes gitstatus once again works on 64-bit Linux without glibc. Instant prompt no longer gets gradually slower over time when XDG_HOME_CACHE is on a slow filesystem. Instant prompt no longer prints spurious erros when XDG_HOME_CACHE is on NTFS. The old-style (and discouraged) custom prompts now work on zsh 5.3.1. Configuration wizard once again presents "extra icons" and "fluent prompt" options when using 12-hour time format. --- pkgs/shells/zsh/zsh-powerlevel10k/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index 7fac0fb8ab8..3b117d4a1ab 100644 --- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "powerlevel10k"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "romkatv"; repo = "powerlevel10k"; rev = "v${version}"; - sha256 = "0r8vccgfy85ryswaigzgwmvhvrhlap7nrg7bi66w63877znqlksj"; + sha256 = "1v6lwjlc4qrxfv1yjy31xh59ayf7jprm3y87l75d08pzj1v4lsj5"; }; patches = [ -- cgit v1.2.3 From b53cabcfedc4077e9bdba6ebc7824ecd381c1994 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 27 Apr 2020 12:33:52 +0200 Subject: =?UTF-8?q?gitstatus:=20unstable-2020-03-15=20=E2=86=92=20unstable?= =?UTF-8?q?-2020-04-21?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../version-management/git-and-tools/gitstatus/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix index 26b736b8b6f..eab382386ef 100644 --- a/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitstatus/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "gitstatus"; - version = "unstable-2020-03-15"; + version = "unstable-2020-04-21"; src = fetchFromGitHub { owner = "romkatv"; repo = "gitstatus"; - rev = "c07996bc3ea1912652f52a816b830a5a3ee9b49c"; - sha256 = "07s8hwx3i5mnafi2xfim44z3q2nsvlcibfdxj17w8mkjhfpywi00"; + rev = "3494f25b0b3b2eac241cf669d1fea2b49ea42fb3"; + sha256 = "0b4g14dkkgih6zps2w1krl9xf44ysj02617zj1k51z127v2lpm1f"; }; buildInputs = [ (callPackage ./romkatv_libgit2.nix {}) ]; -- cgit v1.2.3 From ce6e0abd506edc20a937be172d1941cae71d7b70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 27 Apr 2020 11:35:27 +0100 Subject: iana_etc: 20190731 -> 20200407 --- pkgs/data/misc/iana-etc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/iana-etc/default.nix b/pkgs/data/misc/iana-etc/default.nix index d7d6c062e0c..2b2d2d19065 100644 --- a/pkgs/data/misc/iana-etc/default.nix +++ b/pkgs/data/misc/iana-etc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchzip }: let - version = "20190731"; + version = "20200407"; in fetchzip { name = "iana-etc-${version}"; url = "https://github.com/Mic92/iana-etc/releases/download/${version}/iana-etc-${version}.tar.gz"; - sha256 = "0vqr4zm53zn7z75ynmf59xfrlhpyk8f41xd6i4v8j0f7k6hfdvpi"; + sha256 = "1zmqim0l4lz5xbq7w2wi48fzsvg2msyw6c80dzw4vxll31frpy18"; postFetch = '' tar -xzvf $downloadedFile --strip-components=1 -- cgit v1.2.3 From 730d542ae02305c6f0fc2b02673bf886a3a8ad00 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Tue, 3 Mar 2020 23:21:06 -0800 Subject: firefox: wrapper: add libva to libs --- pkgs/applications/networking/browsers/firefox/wrapper.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 0afa8ca7b83..7505e7e2196 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -9,6 +9,7 @@ , fx_cast_bridge , udev , kerberos +, libva }: ## configurability of the wrapper itself @@ -64,7 +65,7 @@ let ++ lib.optional (cfg.enableFXCastBridge or false) fx_cast_bridge ++ extraNativeMessagingHosts ); - libs = lib.optional stdenv.isLinux udev + libs = lib.optionals stdenv.isLinux [ udev libva ] ++ lib.optional ffmpegSupport ffmpeg ++ lib.optional gssSupport kerberos ++ lib.optional gdkWayland libglvnd -- cgit v1.2.3 From 8f5e4d1b63f476f5a596f00f3bf59d72ba54e654 Mon Sep 17 00:00:00 2001 From: Max Wittig Date: Mon, 27 Apr 2020 12:57:17 +0200 Subject: gitlab-runner: 12.10.0 -> 12.10.1 (#86100) --- .../tools/continuous-integration/gitlab-runner/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index b18bea0c907..7c7862dbe3b 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "12.10.0"; + version = "12.10.1"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "1a2cfr72b15h3ymxf69a0inb4amfxivdhfaj711wgyvcf5ymnbsv"; + sha256 = "0xs0cnkqzmkbj8488s9kyc0m00g3n8vq9wplb99wrax86zs8dyw9"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "18if2xbkldpn0bwfyk6bgbdl9rdg4rjxc0im6lclwcgpbmslwx5r"; + sha256 = "1mcz9a44pa8wx8hk2x7rgp5brbw7a71dqilfrfchnjkg2c9q7x1q"; }; in buildGoPackage rec { @@ -29,7 +29,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0bsd3dk2fi21klqwzw8c181gv61qxbd32lj6mhkj9liz4flarhmv"; + sha256 = "1xvkr3zhn085mz7k3xbz7y5q9yjbmgp1h1sp3a2w27jmpmhl32zm"; }; patches = [ ./fix-shell-path.patch ]; -- cgit v1.2.3 From 7516cc722614d24890bada6d3ada1a30c86ecfd4 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 27 Apr 2020 10:10:25 +1000 Subject: openshift: use installShellFiles --- pkgs/applications/networking/cluster/openshift/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index a9b0ed3fcb5..bcd259b138f 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, buildGoPackage, which, go-bindata, rsync, utillinux -, coreutils, kerberos, clang +, coreutils, kerberos, clang, installShellFiles , components ? [ "cmd/oc" "cmd/openshift" @@ -35,7 +35,7 @@ in buildGoPackage rec { buildInputs = [ kerberos ]; - nativeBuildInputs = [ which rsync go-bindata clang ]; + nativeBuildInputs = [ which rsync go-bindata clang installShellFiles ]; patchPhase = '' patchShebangs ./hack @@ -74,8 +74,8 @@ in buildGoPackage rec { installPhase = '' mkdir -p $bin/bin cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$bin/bin/" - install -D -t "$bin/etc/bash_completion.d" contrib/completions/bash/* - install -D -t "$bin/share/zsh/site-functions" contrib/completions/zsh/* + installShellCompletion --bash contrib/completions/bash/* + installShellCompletion --zsh contrib/completions/zsh/* ''; meta = with stdenv.lib; { -- cgit v1.2.3 From bd6b2318c3881647a3cc179fdff92302661c9f84 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 27 Apr 2020 10:10:26 +1000 Subject: prometheus-alertmanager: use installShellFiles --- pkgs/servers/monitoring/prometheus/alertmanager.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index de6d834c4d6..9074c19e109 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -1,4 +1,4 @@ -{ stdenv, go, buildGoPackage, fetchFromGitHub }: +{ stdenv, go, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage rec { pname = "alertmanager"; @@ -24,9 +24,11 @@ buildGoPackage rec { -X ${t}.GoVersion=${stdenv.lib.getVersion go} ''; + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' - mkdir -p $bin/etc/bash_completion.d - $NIX_BUILD_TOP/go/bin/amtool --completion-script-bash > $bin/etc/bash_completion.d/amtool_completion.sh + $bin/bin/amtool --completion-script-bash > amtool.bash + installShellCompletion amtool.bash ''; meta = with stdenv.lib; { -- cgit v1.2.3 From b83b2591dd7fa3358d58532defc37c08df016d2f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 27 Apr 2020 10:10:26 +1000 Subject: aptly: use installShellFiles --- pkgs/tools/misc/aptly/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix index c163fdad3a1..792b12688aa 100644 --- a/pkgs/tools/misc/aptly/default.nix +++ b/pkgs/tools/misc/aptly/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, gnupg, bzip2, xz, graphviz }: +{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles, makeWrapper, gnupg, bzip2, xz, graphviz }: let @@ -29,11 +29,10 @@ buildGoPackage { goPackagePath = "github.com/aptly-dev/aptly"; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ installShellFiles makeWrapper ]; postInstall = '' - mkdir -p $bin/share/bash-completion/completions - ln -s ${aptlyCompletionSrc}/aptly $bin/share/bash-completion/completions + installShellCompletion --bash ${aptlyCompletionSrc}/aptly wrapProgram "$bin/bin/aptly" \ --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg bzip2 xz graphviz ]}" ''; -- cgit v1.2.3 From 481c7bbd718d0946870914a6f77be11f337c4fdb Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 27 Apr 2020 19:30:47 +1000 Subject: cloudfoundry-cli: use installShellFiles --- pkgs/development/tools/cloudfoundry-cli/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/cloudfoundry-cli/default.nix b/pkgs/development/tools/cloudfoundry-cli/default.nix index ab746c9c530..55d9854d792 100644 --- a/pkgs/development/tools/cloudfoundry-cli/default.nix +++ b/pkgs/development/tools/cloudfoundry-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: buildGoPackage rec { pname = "cloudfoundry-cli"; @@ -15,6 +15,8 @@ buildGoPackage rec { sha256 = "0dqrkimwhw016icgyf4cyipzy6vdz5jgickm33xxd9018dh3ibwq"; }; + nativeBuildInputs = [ installShellFiles ]; + makeTarget = let hps = stdenv.hostPlatform.system; in if hps == "x86_64-darwin" then "out/cf-cli_osx" @@ -33,7 +35,7 @@ buildGoPackage rec { installPhase = '' install -Dm555 out/cf "$bin/bin/cf" - install -Dm444 -t "$bin/share/bash-completion/completions/" "$src/ci/installers/completion/cf" + installShellCompletion --bash "$src/ci/installers/completion/cf" ''; meta = with stdenv.lib; { -- cgit v1.2.3 From cef17fb6eef2eec6636a786c575186586cb56cba Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 27 Apr 2020 20:03:23 +1000 Subject: heptio-ark: use excludedPackages --- pkgs/applications/networking/cluster/heptio-ark/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/heptio-ark/default.nix b/pkgs/applications/networking/cluster/heptio-ark/default.nix index 21f4011f070..aa86dcbeb24 100644 --- a/pkgs/applications/networking/cluster/heptio-ark/default.nix +++ b/pkgs/applications/networking/cluster/heptio-ark/default.nix @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "18h9hvp95va0hyl268gnzciwy1dqmc57bpifbj885870rdfp0ffv"; }; - postInstall = "rm $bin/bin/issue-template-gen"; + excludedPackages = [ "issue-template-gen" ]; meta = with stdenv.lib; { description = "A utility for managing disaster recovery, specifically for your Kubernetes cluster resources and persistent volumes"; -- cgit v1.2.3 From 16b418177ced67fa7b9b50fa3fa76a7a77486246 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 27 Apr 2020 20:06:45 +1000 Subject: git-lfs1: use subPackages --- pkgs/applications/version-management/git-lfs/1.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/git-lfs/1.nix b/pkgs/applications/version-management/git-lfs/1.nix index 0e0d75b0919..5b2a9906a4f 100644 --- a/pkgs/applications/version-management/git-lfs/1.nix +++ b/pkgs/applications/version-management/git-lfs/1.nix @@ -4,7 +4,7 @@ buildGoPackage rec { pname = "git-lfs"; version = "1.5.6"; rev = "0d02fb7d9a1c599bbf8c55e146e2845a908e04e0"; - + goPackagePath = "github.com/git-lfs/git-lfs"; src = fetchFromGitHub { @@ -14,8 +14,7 @@ buildGoPackage rec { sha256 = "0wddry1lqjccf4522fvhx6grx8h57xsz17lkaf5aybnrgw677w3d"; }; - # Tests fail with 'lfstest-gitserver.go:46: main redeclared in this block' - excludedPackages = [ "test" ]; + subPackages = [ "." ]; preBuild = '' pushd go/src/github.com/git-lfs/git-lfs @@ -23,9 +22,6 @@ buildGoPackage rec { popd ''; - postInstall = '' - rm -v $bin/bin/{man,script} - ''; meta = with stdenv.lib; { description = "Git extension for versioning large files"; homepage = "https://git-lfs.github.com/"; -- cgit v1.2.3 From 05683aceaef08906b8019c6714eb3843946c811a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 27 Apr 2020 20:16:16 +1000 Subject: blockbook: use subPackages --- pkgs/servers/blockbook/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/servers/blockbook/default.nix b/pkgs/servers/blockbook/default.nix index b931e8cfcb2..b6a1887bf80 100644 --- a/pkgs/servers/blockbook/default.nix +++ b/pkgs/servers/blockbook/default.nix @@ -39,9 +39,7 @@ buildGoPackage rec { packr clean && packr ''; - postInstall = '' - rm $bin/bin/{scripts,templates,trezor-common} - ''; + subPackages = [ "." ]; meta = with lib; { description = "Trezor address/account balance backend"; @@ -51,4 +49,3 @@ buildGoPackage rec { platforms = platforms.all; }; } - -- cgit v1.2.3 From 09f4fec63c5da8eb06c46fd6cc4aabd0fb8694ac Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 27 Apr 2020 12:01:10 +0100 Subject: emacs-packages: Expose manually packaged packages through emacsPackages.manualPackages --- pkgs/top-level/emacs-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix index 1853c7eb8ac..d044ed80048 100644 --- a/pkgs/top-level/emacs-packages.nix +++ b/pkgs/top-level/emacs-packages.nix @@ -78,7 +78,7 @@ in lib.makeScope newScope (self: lib.makeOverridable ({ // melpaStablePackages // { inherit melpaStablePackages; } // melpaPackages // { inherit melpaPackages; } // orgPackages // { inherit orgPackages; } - // manualPackages + // manualPackages // { inherit manualPackages; } // { inherit emacs melpaBuild trivialBuild; emacsWithPackages = emacsWithPackages self; -- cgit v1.2.3 From 3e6aa7ba47d74d875967a632108bfa51510c6f49 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 27 Apr 2020 12:18:13 +0100 Subject: emacsPackages.eopengrok: Fix build --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 39148c8fc6e..aee7e82cb24 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -105,6 +105,11 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + eopengrok = super.eopengrok.overrideAttrs (attrs: { + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + ess-R-data-view = super.ess-R-data-view.override { inherit (self.melpaPackages) ess ctable popup; }; -- cgit v1.2.3 From 716e320bcf0602d5a59d9188c7a8ea3f8bbe0105 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 27 Apr 2020 12:18:30 +0100 Subject: emacsPackages.gerrit: Fix build --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index aee7e82cb24..8307a2264af 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -441,6 +441,11 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + gerrit = super.gerrit.overrideAttrs (attrs: { + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + helm-rtags = fix-rtags super.helm-rtags; mandoku = super.mandoku.overrideAttrs (attrs: { -- cgit v1.2.3 From 15abc045440d47e432147e7ece0e452ad6358133 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 27 Apr 2020 12:18:37 +0100 Subject: emacsPackages.gerrit-download: Fix build --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 8307a2264af..6e0b4834b8a 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -446,6 +446,11 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + gerrit-download = super.gerrit-download.overrideAttrs (attrs: { + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + helm-rtags = fix-rtags super.helm-rtags; mandoku = super.mandoku.overrideAttrs (attrs: { -- cgit v1.2.3 From e1d4b8e867e503a444549592fce4565f852cf29f Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 27 Apr 2020 12:18:46 +0100 Subject: emacsPackages.github-pullrequest: Fix build --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 6e0b4834b8a..3d16ef9baf8 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -451,6 +451,11 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); + github-pullrequest = super.github-pullrequest.overrideAttrs (attrs: { + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + helm-rtags = fix-rtags super.helm-rtags; mandoku = super.mandoku.overrideAttrs (attrs: { -- cgit v1.2.3 From bcbfef7592165b9926edd67fc08a4432ded611a9 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 27 Apr 2020 12:18:57 +0100 Subject: emacsPackages.jist: Fix build --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 3d16ef9baf8..fb6a4268299 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -458,6 +458,11 @@ env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPac helm-rtags = fix-rtags super.helm-rtags; + jist = super.jist.overrideAttrs (attrs: { + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + mandoku = super.mandoku.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = -- cgit v1.2.3 From abe679b2ba76b9e9497d87f36920d6fff040b7b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 27 Apr 2020 10:18:13 +0100 Subject: kops: 1.16.0 -> 1.16.1 --- pkgs/applications/networking/cluster/kops/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 4d2e406c040..57e1fec2667 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -72,7 +72,7 @@ in rec { }; kops_1_16 = mkKops { - version = "1.16.0"; - sha256 = "1b2lzf6b29rs5imbpqp8gnp3b511lk7jrm2f62y32gmx0gyjws6a"; + version = "1.16.1"; + sha256 = "08vy57ln0qar961sf9vbrh29f04qj5siqsfim1kqwvj5xrvwa39i"; }; } -- cgit v1.2.3 From 4cc520ba0fcb460e42a04802982be1b8d3312773 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 27 Apr 2020 10:11:22 +0100 Subject: kops: remove old versions --- pkgs/applications/networking/cluster/kops/default.nix | 15 --------------- pkgs/top-level/all-packages.nix | 7 ++++--- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 57e1fec2667..3e1f63531bb 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -51,21 +51,6 @@ in rec { mkKops = generic; - kops_1_12 = mkKops { - version = "1.12.3"; - sha256 = "0rpbaz54l5v1z7ab5kpxcb4jyakkl5ysgz1sxajqmw2d6dvf7xly"; - }; - - kops_1_13 = mkKops { - version = "1.13.2"; - sha256 = "0lkkg34vn020r62ga8vg5d3a8jwvq00xlv3p1s01nkz33f6salng"; - }; - - kops_1_14 = mkKops { - version = "1.14.1"; - sha256 = "0ikd8qwrjh8s1sc95g18sm0q6p33swz2m1rjd8zw34mb2w9jv76n"; - }; - kops_1_15 = mkKops { version = "1.15.2"; sha256 = "1sjfd7pfi81ccq1dkgkh9xx6y94bqzlp727pvyf7l01x3d14z2b3"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5de0e20fe13..97cb7e8f1e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25438,11 +25438,12 @@ in kontemplate = callPackage ../applications/networking/cluster/kontemplate { }; + # In general we only want keep the last three minor versions around that + # correspond to the last three supported kubernetes versions: + # https://kubernetes.io/docs/setup/release/version-skew-policy/#supported-versions + # Exceptions are versions that we need to keep to allow upgrades from older NixOS releases inherit (callPackage ../applications/networking/cluster/kops {}) mkKops - kops_1_12 - kops_1_13 - kops_1_14 kops_1_15 kops_1_16 ; -- cgit v1.2.3 From 552d72957193ebd6051e9bf5ddeaa0c1ed59f96e Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Sun, 8 Mar 2020 19:37:53 -0700 Subject: firefox: wrapper: use ffmpeg_4 for vaapi without this, adding libva is insufficient to get VA-API working in Firefox. --- pkgs/applications/networking/browsers/firefox/wrapper.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 7505e7e2196..52773bf291a 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -2,7 +2,7 @@ ## various stuff that can be plugged in , flashplayer, hal-flash -, ffmpeg, xorg, libpulseaudio, libcanberra-gtk2, libglvnd +, ffmpeg_4, xorg, libpulseaudio, libcanberra-gtk2, libglvnd , gnome3/*.gnome-shell*/ , browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow , tridactyl-native @@ -66,7 +66,7 @@ let ++ extraNativeMessagingHosts ); libs = lib.optionals stdenv.isLinux [ udev libva ] - ++ lib.optional ffmpegSupport ffmpeg + ++ lib.optional ffmpegSupport ffmpeg_4 ++ lib.optional gssSupport kerberos ++ lib.optional gdkWayland libglvnd ++ lib.optionals (cfg.enableQuakeLive or false) -- cgit v1.2.3 From 45a09ec5bfade78db8b8f1cc21d2a9138e700b60 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 27 Apr 2020 08:10:35 -0400 Subject: slack: 4.4.{0,1} -> 4.4.2 --- .../networking/instant-messengers/slack/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix index e9a795b59cd..9cf436ff18f 100644 --- a/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -40,8 +40,13 @@ let throwSystem = throw "Unsupported system: ${system}"; sha256 = { - x86_64-darwin = "05xsbiviikrwfayjr6rvvfkm70681x2an6mgcg1cxw1fsi4sr6fd"; - x86_64-linux = "0h2rfgx92yq9a6dqsv9a0r8a6m5xfrywkljjk5w9snw49b0r1p12"; + x86_64-darwin = "0z731q00bwljlcmbjwqphyys7skqms1vg87pyi4nsvjmc7kjx7qg"; + x86_64-linux = "0wrs0i2bqv21ivy8s88khbww28b3gsw4abbbbjc76mqma9b0bajs"; + }.${system} or throwSystem; + + version = { + x86_64-darwin = "4.4.2"; + x86_64-linux = "4.4.2"; }.${system} or throwSystem; meta = with stdenv.lib; { @@ -53,8 +58,7 @@ let }; linux = stdenv.mkDerivation rec { - inherit pname meta; - version = "4.4.0"; + inherit pname meta version; src = fetchurl { url = "https://downloads.slack-edge.com/linux_releases/slack-desktop-${version}-amd64.deb"; inherit sha256; @@ -140,8 +144,7 @@ let }; darwin = stdenv.mkDerivation rec { - inherit pname meta; - version = "4.4.1"; + inherit pname meta version; phases = [ "installPhase" ]; -- cgit v1.2.3 From 31ead7d030b235fcbb7b6a6d92600f23702c7505 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Thu, 23 Apr 2020 11:44:55 +0200 Subject: srcOnly: rename buildInputs to nativeBuildInputs The only reason to pass build inputs is to extend the unpackPhase with custom unpack commands. Eg: add "unrar" to unpack rar sources. And those should really be passed as native build inputs. Why? Because nativeBuildInputs is for dependencies that are used at build time but will not propagate as runtime dependencies. And also, cross-compilation. --- pkgs/build-support/src-only/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/src-only/default.nix b/pkgs/build-support/src-only/default.nix index 8ca262a998b..c721fdf40c6 100644 --- a/pkgs/build-support/src-only/default.nix +++ b/pkgs/build-support/src-only/default.nix @@ -11,11 +11,21 @@ , src , stdenv ? orig.stdenv , patches ? [] -, buildInputs ? [] -, ... # needed when passing an existing derivation +, # deprecated, use the nativeBuildInputs + buildInputs ? [] +, # used to pass extra unpackers + nativeBuildInputs ? [] +, # needed when passing an existing derivation + ... }: stdenv.mkDerivation { - inherit src buildInputs patches name; + inherit + buildInputs + name + nativeBuildInputs + patches + src + ; installPhase = "cp -r . $out"; phases = ["unpackPhase" "patchPhase" "installPhase"]; } -- cgit v1.2.3 From 73e46470852753b3f3e22bf79bd4230ff0e1cdc2 Mon Sep 17 00:00:00 2001 From: Elyhaka <57923898+Elyhaka@users.noreply.github.com> Date: Fri, 17 Apr 2020 18:23:31 +0200 Subject: teams: fixing pulseaudio access --- .../instant-messengers/teams/default.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix index 63d922ab299..6b5acd8344a 100644 --- a/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -52,6 +52,28 @@ stdenv.mkDerivation rec { ln -s $out/opt/teams/teams $out/bin/ ''; + dontAutoPatchelf = true; + + # Includes runtimeDependencies in the RPATH of the included Node modules + # so that dynamic loading works. We cannot use directly runtimeDependencies + # here, since the libraries from runtimeDependencies are not propagated + # to the dynamically loadable node modules because of a condition in + # autoPatchElfHook since *.node modules have Type: DYN (Shared object file) + # instead of EXEC or INTERP it expects. + # Fixes: https://github.com/NixOS/nixpkgs/issues/85449 + postFixup = '' + autoPatchelf "$out" + + runtime_rpath="${lib.makeLibraryPath runtimeDependencies}" + + for mod in $(find "$out/opt/teams" -name '*.node'); do + mod_rpath="$(patchelf --print-rpath "$mod")" + + echo "Adding runtime dependencies to RPATH of Node module $mod" + patchelf --set-rpath "$runtime_rpath:$mod_rpath" "$mod" + done; + ''; + meta = with stdenv.lib; { description = "Microsoft Teams"; homepage = "https://teams.microsoft.com"; -- cgit v1.2.3 From fbb9bcaef4d91e80b610f2c018f07f823e801617 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 27 Apr 2020 16:23:33 +0300 Subject: gotify-server: 2.0.4 -> 2.0.5 Improved update script / procedure by getting all versions and shas needed to build it. --- pkgs/servers/gotify/default.nix | 10 +- pkgs/servers/gotify/mod-sha.nix | 1 + pkgs/servers/gotify/package.json | 5 +- pkgs/servers/gotify/source-sha.nix | 1 + pkgs/servers/gotify/ui.nix | 4 +- pkgs/servers/gotify/update-yarn-deps.sh | 20 ---- pkgs/servers/gotify/update.sh | 40 +++++++ pkgs/servers/gotify/version.nix | 1 + pkgs/servers/gotify/yarndeps.nix | 200 +++++++++++++++----------------- 9 files changed, 149 insertions(+), 133 deletions(-) create mode 100644 pkgs/servers/gotify/mod-sha.nix create mode 100644 pkgs/servers/gotify/source-sha.nix delete mode 100755 pkgs/servers/gotify/update-yarn-deps.sh create mode 100755 pkgs/servers/gotify/update.sh create mode 100644 pkgs/servers/gotify/version.nix diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix index f2014aac9fd..3f9f59a4aee 100644 --- a/pkgs/servers/gotify/default.nix +++ b/pkgs/servers/gotify/default.nix @@ -10,18 +10,18 @@ buildGoModule rec { pname = "gotify-server"; - # Note that when this is updated, along with the hash, the `ui.nix` file - # should include the same changes to the version and the sha256. - version = "2.0.14"; + # should be update just like all other files imported like that via the + # `update.sh` script. + version = import ./version.nix; src = fetchFromGitHub { owner = "gotify"; repo = "server"; rev = "v${version}"; - sha256 = "0hyy9fki2626cgd78l7fkk67lik6g1pkcpf6xr3gl07dxwcclyr8"; + sha256 = import ./source-sha.nix; }; - modSha256 = "1awhbc8qs2bwv6y2vwd92r4ys0l1bzymrb36iamr040x961682wv"; + modSha256 = import ./mod-sha.nix; postPatch = '' substituteInPlace app.go \ diff --git a/pkgs/servers/gotify/mod-sha.nix b/pkgs/servers/gotify/mod-sha.nix new file mode 100644 index 00000000000..16a3eddadb5 --- /dev/null +++ b/pkgs/servers/gotify/mod-sha.nix @@ -0,0 +1 @@ +"119f249rvlvxjhwc6wh10yyk3z41488mydmvxs44b5a4p67yvjfw" \ No newline at end of file diff --git a/pkgs/servers/gotify/package.json b/pkgs/servers/gotify/package.json index 1c84de17f46..00f71337071 100644 --- a/pkgs/servers/gotify/package.json +++ b/pkgs/servers/gotify/package.json @@ -3,9 +3,10 @@ "version": "0.2.0", "private": true, "homepage": ".", + "proxy": "http://localhost:80", "dependencies": { - "@material-ui/core": "^4.4.3", - "@material-ui/icons": "^4.4.3", + "@material-ui/core": "^4.9.5", + "@material-ui/icons": "^4.9.1", "axios": "^0.19.0", "codemirror": "^5.43.0", "detect-browser": "^3.0.0", diff --git a/pkgs/servers/gotify/source-sha.nix b/pkgs/servers/gotify/source-sha.nix new file mode 100644 index 00000000000..c11391fb85c --- /dev/null +++ b/pkgs/servers/gotify/source-sha.nix @@ -0,0 +1 @@ +"0igzgpzrxkz31njhybsap505mlr32k4qma32v5rafqdi2naz5iyl" \ No newline at end of file diff --git a/pkgs/servers/gotify/ui.nix b/pkgs/servers/gotify/ui.nix index 403f01c2a85..2a7f1843080 100644 --- a/pkgs/servers/gotify/ui.nix +++ b/pkgs/servers/gotify/ui.nix @@ -8,13 +8,13 @@ yarn2nix-moretea.mkYarnPackage rec { packageJSON = ./package.json; yarnNix = ./yarndeps.nix; - version = "2.0.14"; + version = import ./version.nix; src_all = fetchFromGitHub { owner = "gotify"; repo = "server"; rev = "v${version}"; - sha256 = "0hyy9fki2626cgd78l7fkk67lik6g1pkcpf6xr3gl07dxwcclyr8"; + sha256 = import ./source-sha.nix; }; src = "${src_all}/ui"; diff --git a/pkgs/servers/gotify/update-yarn-deps.sh b/pkgs/servers/gotify/update-yarn-deps.sh deleted file mode 100755 index d25b5c429df..00000000000 --- a/pkgs/servers/gotify/update-yarn-deps.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=../../../ -i bash -p wget yarn2nix-moretea.yarn2nix - -# This script is based upon: -# pkgs/applications/networking/instant-messengers/riot/update-riot-desktop.sh - -set -euo pipefail - -if [ "$#" -ne 1 ] || [[ "$1" == -* ]]; then - echo "Regenerates the Yarn dependency lock files for the gotify-server package." - echo "Usage: $0 " - exit 1 -fi - -GOTIFY_WEB_SRC="https://raw.githubusercontent.com/gotify/server/$1" - -wget "$GOTIFY_WEB_SRC/ui/package.json" -O package.json -wget "$GOTIFY_WEB_SRC/ui/yarn.lock" -O yarn.lock -yarn2nix --lockfile=yarn.lock > yarndeps.nix -rm yarn.lock diff --git a/pkgs/servers/gotify/update.sh b/pkgs/servers/gotify/update.sh new file mode 100755 index 00000000000..e26ffbde62e --- /dev/null +++ b/pkgs/servers/gotify/update.sh @@ -0,0 +1,40 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p wget yarn2nix-moretea.yarn2nix nix-prefetch-git jq + +set -euo pipefail + +dirname="$(dirname "$0")" + +latest_release=$(curl --silent https://api.github.com/repos/gotify/server/releases/latest) +version=$(jq -r '.tag_name' <<<"$latest_release") +echo got version $version +echo \""${version#v}"\" > "$dirname/version.nix" +printf '%s' $(nix-prefetch-git --quiet --rev ${version} https://github.com/gotify/server | jq .sha256) > $dirname/source-sha.nix +tput setaf 1 +echo zeroing modSha256 in $dirname/mod-sha.nix +tput sgr0 +printf '"%s"' "0000000000000000000000000000000000000000000000000000" > $dirname/mod-sha.nix + +GOTIFY_WEB_SRC="https://raw.githubusercontent.com/gotify/server/$version" + +curl --silent "$GOTIFY_WEB_SRC/ui/package.json" -o $dirname/package.json +echo downloaded package.json +curl --silent "$GOTIFY_WEB_SRC/ui/yarn.lock" -o $dirname/yarn.lock +echo downloaded yarndeps.nix +echo running yarn2nix +yarn2nix --lockfile=$dirname/yarn.lock > $dirname/yarndeps.nix +rm $dirname/yarn.lock +echo removed yarn.lock + +echo running nix-build for ui +nix-build -A gotify-server.ui +echo running nix-build for gotify itself in order to get modSha256 +set +e +modSha256="$(nix-build -A gotify-server 2>&1 | grep "got:" | cut -d':' -f3)" +set -e +printf '"%s"' "$modSha256" > $dirname/mod-sha.nix +tput setaf 2 +echo got modSha256 of: $modSha256 +tput sgr0 +echo running nix-build -A gotify-server which should build gotify-server normally +nix-build -A gotify-server diff --git a/pkgs/servers/gotify/version.nix b/pkgs/servers/gotify/version.nix new file mode 100644 index 00000000000..fbd14b6742d --- /dev/null +++ b/pkgs/servers/gotify/version.nix @@ -0,0 +1 @@ +"2.0.15" diff --git a/pkgs/servers/gotify/yarndeps.nix b/pkgs/servers/gotify/yarndeps.nix index 3f74ad74ccc..ef9d7cedd8e 100644 --- a/pkgs/servers/gotify/yarndeps.nix +++ b/pkgs/servers/gotify/yarndeps.nix @@ -713,6 +713,14 @@ sha1 = "935122c74c73d2240cafd32ddb5fc2a6cd35cf1f"; }; } + { + name = "_babel_runtime___runtime_7.8.7.tgz"; + path = fetchurl { + name = "_babel_runtime___runtime_7.8.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.7.tgz"; + sha1 = "8fefce9802db54881ba59f90bb28719b4996324d"; + }; + } { name = "_babel_template___template_7.4.4.tgz"; path = fetchurl { @@ -762,11 +770,11 @@ }; } { - name = "_emotion_hash___hash_0.7.3.tgz"; + name = "_emotion_hash___hash_0.7.4.tgz"; path = fetchurl { - name = "_emotion_hash___hash_0.7.3.tgz"; - url = "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.7.3.tgz"; - sha1 = "a166882c81c0c6040975dd30df24fae8549bd96f"; + name = "_emotion_hash___hash_0.7.4.tgz"; + url = "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.7.4.tgz"; + sha1 = "f14932887422c9056b15a8d222a9074a7dfa2831"; }; } { @@ -890,51 +898,51 @@ }; } { - name = "_material_ui_core___core_4.4.3.tgz"; + name = "_material_ui_core___core_4.9.5.tgz"; path = fetchurl { - name = "_material_ui_core___core_4.4.3.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/core/-/core-4.4.3.tgz"; - sha1 = "65665d2c4e9cb84e018774e1471f6d0417f4535e"; + name = "_material_ui_core___core_4.9.5.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/core/-/core-4.9.5.tgz"; + sha1 = "384869f2840b243241f7881a902f5ffc48360830"; }; } { - name = "_material_ui_icons___icons_4.5.1.tgz"; + name = "_material_ui_icons___icons_4.9.1.tgz"; path = fetchurl { - name = "_material_ui_icons___icons_4.5.1.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/icons/-/icons-4.5.1.tgz"; - sha1 = "6963bad139e938702ece85ca43067688018f04f8"; + name = "_material_ui_icons___icons_4.9.1.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/icons/-/icons-4.9.1.tgz"; + sha1 = "fdeadf8cb3d89208945b33dbc50c7c616d0bd665"; }; } { - name = "_material_ui_styles___styles_4.4.3.tgz"; + name = "_material_ui_styles___styles_4.9.0.tgz"; path = fetchurl { - name = "_material_ui_styles___styles_4.4.3.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.4.3.tgz"; - sha1 = "78239177723660093cc9a277db5759c01c693c2a"; + name = "_material_ui_styles___styles_4.9.0.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.9.0.tgz"; + sha1 = "10c31859f6868cfa9d3adf6b6c3e32c9d676bc76"; }; } { - name = "_material_ui_system___system_4.4.3.tgz"; + name = "_material_ui_system___system_4.9.3.tgz"; path = fetchurl { - name = "_material_ui_system___system_4.4.3.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/system/-/system-4.4.3.tgz"; - sha1 = "68ca8cf83614255fcd5b9d3a72ce8ee58a43a5c7"; + name = "_material_ui_system___system_4.9.3.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/system/-/system-4.9.3.tgz"; + sha1 = "ee48990d7941237fdaf21b7b399981d614bb0875"; }; } { - name = "_material_ui_types___types_4.1.1.tgz"; + name = "_material_ui_types___types_5.0.0.tgz"; path = fetchurl { - name = "_material_ui_types___types_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/types/-/types-4.1.1.tgz"; - sha1 = "b65e002d926089970a3271213a3ad7a21b17f02b"; + name = "_material_ui_types___types_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/types/-/types-5.0.0.tgz"; + sha1 = "26d6259dc6b39f4c2e1e9aceff7a11e031941741"; }; } { - name = "_material_ui_utils___utils_4.4.0.tgz"; + name = "_material_ui_utils___utils_4.7.1.tgz"; path = fetchurl { - name = "_material_ui_utils___utils_4.4.0.tgz"; - url = "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.4.0.tgz"; - sha1 = "9275421e2798a067850d201212d46f12725828ad"; + name = "_material_ui_utils___utils_4.7.1.tgz"; + url = "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.7.1.tgz"; + sha1 = "dc16c7f0d2cd02fbcdd5cfe601fd6863ae3cc652"; }; } { @@ -3041,14 +3049,6 @@ sha1 = "e138cc75e040c727b1966fe5e5f8c9aee256fe3b"; }; } - { - name = "convert_css_length___convert_css_length_2.0.1.tgz"; - path = fetchurl { - name = "convert_css_length___convert_css_length_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/convert-css-length/-/convert-css-length-2.0.1.tgz"; - sha1 = "90a76bde5bfd24d72881a5b45d02249b2c1d257c"; - }; - } { name = "convert_source_map___convert_source_map_1.6.0.tgz"; path = fetchurl { @@ -3282,11 +3282,11 @@ }; } { - name = "css_vendor___css_vendor_2.0.6.tgz"; + name = "css_vendor___css_vendor_2.0.7.tgz"; path = fetchurl { - name = "css_vendor___css_vendor_2.0.6.tgz"; - url = "https://registry.yarnpkg.com/css-vendor/-/css-vendor-2.0.6.tgz"; - sha1 = "a205f73d7562e8728c86ef6ce5ee7c7e5eefd71b"; + name = "css_vendor___css_vendor_2.0.7.tgz"; + url = "https://registry.yarnpkg.com/css-vendor/-/css-vendor-2.0.7.tgz"; + sha1 = "4e6d53d953c187981576d6a542acc9fb57174bda"; }; } { @@ -3537,14 +3537,6 @@ sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; }; } - { - name = "deepmerge___deepmerge_4.0.0.tgz"; - path = fetchurl { - name = "deepmerge___deepmerge_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.0.0.tgz"; - sha1 = "3e3110ca29205f120d7cb064960a39c3d2087c09"; - }; - } { name = "default_gateway___default_gateway_4.2.0.tgz"; path = fetchurl { @@ -5153,6 +5145,14 @@ sha1 = "b09178f0122184fb95acf525daaecb4d8f45958b"; }; } + { + name = "hoist_non_react_statics___hoist_non_react_statics_3.3.2.tgz"; + path = fetchurl { + name = "hoist_non_react_statics___hoist_non_react_statics_3.3.2.tgz"; + url = "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz"; + sha1 = "ece0acaf71d62c2969c2ec59feff42a4b1a85b45"; + }; + } { name = "hosted_git_info___hosted_git_info_2.8.4.tgz"; path = fetchurl { @@ -5905,14 +5905,6 @@ sha1 = "2c163b3fafb1b606d9d17928f05c2a1c38e07677"; }; } - { - name = "is_plain_object___is_plain_object_3.0.0.tgz"; - path = fetchurl { - name = "is_plain_object___is_plain_object_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-3.0.0.tgz"; - sha1 = "47bfc5da1b5d50d64110806c199359482e75a928"; - }; - } { name = "is_promise___is_promise_2.1.0.tgz"; path = fetchurl { @@ -6057,14 +6049,6 @@ sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; }; } - { - name = "isobject___isobject_4.0.0.tgz"; - path = fetchurl { - name = "isobject___isobject_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/isobject/-/isobject-4.0.0.tgz"; - sha1 = "3f1c9155e73b192022a80819bacd0343711697b0"; - }; - } { name = "isomorphic_fetch___isomorphic_fetch_2.2.1.tgz"; path = fetchurl { @@ -6546,67 +6530,67 @@ }; } { - name = "jss_plugin_camel_case___jss_plugin_camel_case_10.0.0_alpha.25.tgz"; + name = "jss_plugin_camel_case___jss_plugin_camel_case_10.0.4.tgz"; path = fetchurl { - name = "jss_plugin_camel_case___jss_plugin_camel_case_10.0.0_alpha.25.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.0.0-alpha.25.tgz"; - sha1 = "ea4389de47ccf3b4757f76e62cbb2e8b96b7a2c2"; + name = "jss_plugin_camel_case___jss_plugin_camel_case_10.0.4.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.0.4.tgz"; + sha1 = "3dedecec1e5bba0bf6141c2c05e2ab11ea4b468d"; }; } { - name = "jss_plugin_default_unit___jss_plugin_default_unit_10.0.0_alpha.25.tgz"; + name = "jss_plugin_default_unit___jss_plugin_default_unit_10.0.4.tgz"; path = fetchurl { - name = "jss_plugin_default_unit___jss_plugin_default_unit_10.0.0_alpha.25.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.0.0-alpha.25.tgz"; - sha1 = "df5b39bbc0114146101bb3cf8bc7e281e3d0f454"; + name = "jss_plugin_default_unit___jss_plugin_default_unit_10.0.4.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.0.4.tgz"; + sha1 = "df03885de20f20a1fc1c21bdb7c62e865ee400d9"; }; } { - name = "jss_plugin_global___jss_plugin_global_10.0.0_alpha.25.tgz"; + name = "jss_plugin_global___jss_plugin_global_10.0.4.tgz"; path = fetchurl { - name = "jss_plugin_global___jss_plugin_global_10.0.0_alpha.25.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.0.0-alpha.25.tgz"; - sha1 = "2b6a6a14ef6cdb9994dbadf709e480d5c871b5f6"; + name = "jss_plugin_global___jss_plugin_global_10.0.4.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.0.4.tgz"; + sha1 = "412245b56133cc88bec654a70d82d5922619f4c5"; }; } { - name = "jss_plugin_nested___jss_plugin_nested_10.0.0_alpha.25.tgz"; + name = "jss_plugin_nested___jss_plugin_nested_10.0.4.tgz"; path = fetchurl { - name = "jss_plugin_nested___jss_plugin_nested_10.0.0_alpha.25.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.0.0-alpha.25.tgz"; - sha1 = "b8e29d336e1850047914511681d56330e3ea24ac"; + name = "jss_plugin_nested___jss_plugin_nested_10.0.4.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.0.4.tgz"; + sha1 = "4d15ad13995fb6e4125618006473a096d2475d75"; }; } { - name = "jss_plugin_props_sort___jss_plugin_props_sort_10.0.0_alpha.25.tgz"; + name = "jss_plugin_props_sort___jss_plugin_props_sort_10.0.4.tgz"; path = fetchurl { - name = "jss_plugin_props_sort___jss_plugin_props_sort_10.0.0_alpha.25.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.0.0-alpha.25.tgz"; - sha1 = "dfaa1a6bf9863ae9593b99bf51cd26caea2fe0ec"; + name = "jss_plugin_props_sort___jss_plugin_props_sort_10.0.4.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.0.4.tgz"; + sha1 = "43c880ff8dfcf858f809f663ece5e65a1d945b5a"; }; } { - name = "jss_plugin_rule_value_function___jss_plugin_rule_value_function_10.0.0_alpha.25.tgz"; + name = "jss_plugin_rule_value_function___jss_plugin_rule_value_function_10.0.4.tgz"; path = fetchurl { - name = "jss_plugin_rule_value_function___jss_plugin_rule_value_function_10.0.0_alpha.25.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.0.0-alpha.25.tgz"; - sha1 = "35350da52334a6031808e197526227434c194277"; + name = "jss_plugin_rule_value_function___jss_plugin_rule_value_function_10.0.4.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.0.4.tgz"; + sha1 = "2f4cf4a86ad3eba875bb48cb9f4a7ed35cb354e7"; }; } { - name = "jss_plugin_vendor_prefixer___jss_plugin_vendor_prefixer_10.0.0_alpha.25.tgz"; + name = "jss_plugin_vendor_prefixer___jss_plugin_vendor_prefixer_10.0.4.tgz"; path = fetchurl { - name = "jss_plugin_vendor_prefixer___jss_plugin_vendor_prefixer_10.0.0_alpha.25.tgz"; - url = "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.0.0-alpha.25.tgz"; - sha1 = "bc0c4b6dcb28d4801775cbad70ad9bc7e0c7707b"; + name = "jss_plugin_vendor_prefixer___jss_plugin_vendor_prefixer_10.0.4.tgz"; + url = "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.0.4.tgz"; + sha1 = "1626ef612a4541cff17cf96815e1740155214ed2"; }; } { - name = "jss___jss_10.0.0_alpha.25.tgz"; + name = "jss___jss_10.0.4.tgz"; path = fetchurl { - name = "jss___jss_10.0.0_alpha.25.tgz"; - url = "https://registry.yarnpkg.com/jss/-/jss-10.0.0-alpha.25.tgz"; - sha1 = "20a506d8159e3f6bd91e133d54ffd3df0ffd3010"; + name = "jss___jss_10.0.4.tgz"; + url = "https://registry.yarnpkg.com/jss/-/jss-10.0.4.tgz"; + sha1 = "46ebdde1c40c9a079d64f3334cb88ae28fd90bfd"; }; } { @@ -7497,14 +7481,6 @@ sha1 = "2d10c06bdfd312ea9777695a4d28439456b75942"; }; } - { - name = "normalize_scroll_left___normalize_scroll_left_0.2.0.tgz"; - path = fetchurl { - name = "normalize_scroll_left___normalize_scroll_left_0.2.0.tgz"; - url = "https://registry.yarnpkg.com/normalize-scroll-left/-/normalize-scroll-left-0.2.0.tgz"; - sha1 = "9445d74275f303cc661e113329aefa492f58114c"; - }; - } { name = "normalize_url___normalize_url_3.3.0.tgz"; path = fetchurl { @@ -9249,6 +9225,14 @@ sha1 = "21ca9561399aad0ff1a7701c01683e8ca981edcb"; }; } + { + name = "react_is___react_is_16.13.0.tgz"; + path = fetchurl { + name = "react_is___react_is_16.13.0.tgz"; + url = "https://registry.yarnpkg.com/react-is/-/react-is-16.13.0.tgz"; + sha1 = "0f37c3613c34fe6b37cd7f763a0d6293ab15c527"; + }; + } { name = "react_is___react_is_16.10.0.tgz"; path = fetchurl { @@ -9449,6 +9433,14 @@ sha1 = "be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"; }; } + { + name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; + path = fetchurl { + name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz"; + sha1 = "d878a1d094b4306d10b9096484b33ebd55e26697"; + }; + } { name = "regenerator_transform___regenerator_transform_0.14.1.tgz"; path = fetchurl { -- cgit v1.2.3 From a8cfc04e41b691bc0b198ac8ab2d1d6c55a00057 Mon Sep 17 00:00:00 2001 From: Elyhaka <57923898+Elyhaka@users.noreply.github.com> Date: Wed, 18 Mar 2020 23:36:47 +0100 Subject: pop-gtk-theme: 2020-02-10 -> 2020-04-22 --- pkgs/data/themes/pop-gtk/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/data/themes/pop-gtk/default.nix b/pkgs/data/themes/pop-gtk/default.nix index 9bb2beae4d3..730f7754d8f 100644 --- a/pkgs/data/themes/pop-gtk/default.nix +++ b/pkgs/data/themes/pop-gtk/default.nix @@ -9,17 +9,18 @@ , gtk-engine-murrine , gdk-pixbuf , librsvg +, python3 }: stdenv.mkDerivation rec { pname = "pop-gtk-theme"; - version = "2020-02-10"; + version = "2020-04-22"; src = fetchFromGitHub { owner = "pop-os"; repo = "gtk-theme"; - rev = "ed888e9dd5de142cb899e362beedaf694594cc7e"; - sha256 = "0ryr1jx9pzij6pkv7sam07f90w5lbrzx0fj5vdxl94612mh76aad"; + rev = "b3f98dfd61cfff81f69cdc7f57bce7a9efaa36f4"; + sha256 = "0vhcc694x33sgcpbqkrc5bycbd7017k4iii0mjjxgd22jd5lzgkb"; }; nativeBuildInputs = [ @@ -29,6 +30,7 @@ stdenv.mkDerivation rec { gtk3 inkscape optipng + python3 ]; buildInputs = [ @@ -41,9 +43,9 @@ stdenv.mkDerivation rec { ]; postPatch = '' - for file in $(find -name render-\*.sh); do - patchShebangs "$file" + patchShebangs . + for file in $(find -name render-\*.sh); do substituteInPlace "$file" \ --replace 'INKSCAPE="/usr/bin/inkscape"' \ 'INKSCAPE="inkscape"' \ -- cgit v1.2.3 From 9d5375f7c9454240a016e3980c97f83c3bad79aa Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 27 Apr 2020 16:41:40 +0200 Subject: hpcg: init at 3.1 --- pkgs/tools/misc/hpcg/default.nix | 35 +++++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/tools/misc/hpcg/default.nix diff --git a/pkgs/tools/misc/hpcg/default.nix b/pkgs/tools/misc/hpcg/default.nix new file mode 100644 index 00000000000..6274178c266 --- /dev/null +++ b/pkgs/tools/misc/hpcg/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, openmpi } : + +stdenv.mkDerivation rec { + pname = "hpcg"; + version = "3.1"; + + src = fetchurl { + url = "http://www.hpcg-benchmark.org/downloads/${pname}-${version}.tar.gz"; + sha256 = "197lw2nwmzsmfsbvgvi8z7kj69n374kgfzzp8pkmk7mp2vkk991k"; + }; + + dontConfigure = true; + + enableParallelBuilding = true; + + buildInputs = [ openmpi ]; + + makeFlags = [ "arch=Linux_MPI" ]; + + installPhase = '' + mkdir -p $out/bin $out/share/hpcg + + cp bin/xhpcg $out/bin + cp bin/hpcg.dat $out/share/hpcg + ''; + + meta = with stdenv.lib; { + description = "HPC conjugate gradient benchmark"; + homepage = "https://www.hpcg-benchmark.org"; + platforms = platforms.linux; + license = licenses.bsd3; + maintainers = [ maintainers.markuskowa ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a5ac3065d8..ed2f7094826 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19899,6 +19899,8 @@ in howl = callPackage ../applications/editors/howl { }; + hpcg = callPackage ../tools/misc/hpcg/default.nix { }; + hpl = callPackage ../tools/misc/hpl { mpi = openmpi; }; hpmyroom = libsForQt5.callPackage ../applications/networking/hpmyroom { }; -- cgit v1.2.3 From 2805d6852928530726bee2f41a828ddea5b7cc54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 27 Apr 2020 17:36:51 +0100 Subject: nixpkgs-review: 2.3.0 -> 2.3.1 --- pkgs/tools/package-management/nixpkgs-review/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nixpkgs-review/default.nix b/pkgs/tools/package-management/nixpkgs-review/default.nix index b6455cc1705..922546009fc 100644 --- a/pkgs/tools/package-management/nixpkgs-review/default.nix +++ b/pkgs/tools/package-management/nixpkgs-review/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "nixpkgs-review"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "Mic92"; repo = "nixpkgs-review"; rev = version; - sha256 = "0qkvjl4f8a1905yj3ml32rfdr5q76igz21gn3dcya0pfqhrnb28i"; + sha256 = "1v988jsxx2r82q6mf3503130cny088hin2as00yi26jzxjkrjcli"; }; makeWrapperArgs = [ -- cgit v1.2.3 From a43ae05369c96319731c3341e1a6e612b7003d7c Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Mon, 27 Apr 2020 09:39:55 -0700 Subject: fish: 3.1.0 -> 3.1.1 https://github.com/fish-shell/fish-shell/compare/3.1.0...3.1.1 The patch we had to use for Apple SDKs was merged upstream, so it can be dropped. I ran nixpkgs-fmt, and removed the `with stdenv.lib;` scope expander. Additionally, did a little bit of cleanup. I plan on refactoring this more down the line, but this'll do for now. I finally figured out why we use `fetchurl` for the tagged release: the published release tarballs contain a version file, which the `build_tools/git_version_gen.sh` script reads (and uses as the version if it exists). The other thing it contains are pre-generated docs for various `fish` builtins. I've expanded the comment to document this so nobody is as confused as I was when I first saw it. (Though I plan to change this and add sphinx as a native build input in order to build the docs ourselves.) --- pkgs/shells/fish/default.nix | 129 ++++++++++++++++++++++++------------------- 1 file changed, 71 insertions(+), 58 deletions(-) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index bea56bd8c5a..bc456813ddf 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -1,20 +1,27 @@ -{ stdenv, fetchurl, coreutils, utillinux, - which, gnused, gnugrep, - groff, man-db, getent, libiconv, pcre2, - gettext, ncurses, python3, - cmake - , fetchpatch - - , writeText - , nixosTests - , useOperatingSystemEtc ? true - +{ stdenv +, lib +, fetchurl +, coreutils +, utillinux +, which +, gnused +, gnugrep +, groff +, man-db +, getent +, libiconv +, pcre2 +, gettext +, ncurses +, python3 +, cmake + +, writeText +, nixosTests +, useOperatingSystemEtc ? true }: - -with stdenv.lib; - let - etcConfigAppendixText = '' + etcConfigAppendix = writeText "config.fish.appendix" '' ############### ↓ Nix hook for sourcing /etc/fish/config.fish ↓ ############### # # # Origin: @@ -46,7 +53,7 @@ let ############### ↑ Nix hook for sourcing /etc/fish/config.fish ↑ ############### ''; - fishPreInitHooks = '' + fishPreInitHooks = writeText "__fish_build_paths_suffix.fish" '' # source nixos environment # note that this is required: # 1. For all shells, not just login shells (mosh needs this as do some other command-line utilities) @@ -90,40 +97,45 @@ let fish = stdenv.mkDerivation rec { pname = "fish"; - version = "3.1.0"; - - etcConfigAppendix = builtins.toFile "etc-config.appendix.fish" etcConfigAppendixText; + version = "3.1.1"; src = fetchurl { - # There are differences between the release tarball and the tarball github packages from the tag - # Hence we cannot use fetchFromGithub + # There are differences between the release tarball and the tarball GitHub + # packages from the tag. Specifically, it comes with a file containing its + # version, which is used in `build_tools/git_version_gen.sh` to determine + # the shell's actual version (and what it displays when running `fish + # --version`), as well as the local documentation for all builtins (and + # maybe other things). url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "0s2356mlx7fp9kgqgw91lm5ds2i9iq9hq071fbqmcp3875l1xnz5"; + sha256 = "1f12c56v7n4s0f9mi9xinviwj6kpwlcjwaig1d4vsk5wlgp7ip07"; }; - nativeBuildInputs = [ cmake ]; - buildInputs = [ ncurses libiconv pcre2 ]; + nativeBuildInputs = [ + cmake + ]; + + buildInputs = [ + ncurses + libiconv + pcre2 + ]; preConfigure = '' patchShebangs ./build_tools/git_version_gen.sh ''; - patches = [ - # Fixes compilation on old Apple SDKs - (fetchpatch { - url = "https://github.com/fish-shell/fish-shell/commit/10385d422b3e2a823faebfdaf13edd0e7f48a27f.patch"; - sha256 = "0hj13kyjf5wr9j5afd4mfylcr7mz68ilbncbcf307drk1lv1lvrn"; - }) - ]; - # Required binaries during execution # Python: Autocompletion generated from manpages and config editing propagatedBuildInputs = [ - coreutils gnugrep gnused - python3 groff gettext - ] ++ optional (!stdenv.isDarwin) man-db; - - postInstall = '' + coreutils + gnugrep + gnused + python3 + groff + gettext + ] ++ lib.optional (!stdenv.isDarwin) man-db; + + postInstall = with lib; '' sed -r "s|command grep|command ${gnugrep}/bin/grep|" \ -i "$out/share/fish/functions/grep.fish" sed -i "s|which |${which}/bin/which |" \ @@ -162,14 +174,14 @@ let sed -i "s|command manpath|command ${man-db}/bin/manpath|" \ "$out/share/fish/functions/man.fish" '' + optionalString useOperatingSystemEtc '' - tee -a $out/etc/fish/config.fish < ${(writeText "config.fish.appendix" etcConfigAppendixText)} + tee -a $out/etc/fish/config.fish < ${etcConfigAppendix} '' + '' - tee -a $out/share/fish/__fish_build_paths.fish < ${(writeText "__fish_build_paths_suffix.fish" fishPreInitHooks)} + tee -a $out/share/fish/__fish_build_paths.fish < ${fishPreInitHooks} ''; enableParallelBuilding = true; - meta = with stdenv.lib; { + meta = with lib; { description = "Smart and user-friendly command line shell"; homepage = "http://fishshell.com/"; license = licenses.gpl2; @@ -188,21 +200,22 @@ let # Test the fish_config tool by checking the generated splash page. # Since the webserver requires a port to run, it is not started. fishConfig = - let fishScript = writeText "test.fish" '' - set -x __fish_bin_dir ${fish}/bin - echo $__fish_bin_dir - cp -r ${fish}/share/fish/tools/web_config/* . - chmod -R +w * - # we delete everything after the fileurl is assigned - sed -e '/fileurl =/q' -i webconfig.py - echo "print(fileurl)" >> webconfig.py - # and check whether the message appears on the page - cat (${python3}/bin/python ./webconfig.py \ - | tail -n1 | sed -ne 's|.*\(/tmp/.*\)|\1|p' \ - ) | grep 'a href="http://localhost.*Start the Fish Web config' - - # cannot test the http server because it needs a localhost port - ''; + let + fishScript = writeText "test.fish" '' + set -x __fish_bin_dir ${fish}/bin + echo $__fish_bin_dir + cp -r ${fish}/share/fish/tools/web_config/* . + chmod -R +w * + # we delete everything after the fileurl is assigned + sed -e '/fileurl =/q' -i webconfig.py + echo "print(fileurl)" >> webconfig.py + # and check whether the message appears on the page + cat (${python3}/bin/python ./webconfig.py \ + | tail -n1 | sed -ne 's|.*\(/tmp/.*\)|\1|p' \ + ) | grep 'a href="http://localhost.*Start the Fish Web config' + + # cannot test the http server because it needs a localhost port + ''; in '' HOME=$(mktemp -d) ${fish}/bin/fish ${fishScript} @@ -210,6 +223,6 @@ let }; # FIXME(Profpatsch) replace withTests stub - withTests = flip const; - -in withTests tests fish + withTests = with lib; flip const; +in +withTests tests fish -- cgit v1.2.3 From 1672f4ead1d65263e70fd4ce7d595a82b2c43158 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Mar 2020 13:56:39 +0200 Subject: python3Packages.ipython: 7.12.0 -> 7.13.0 --- pkgs/development/python-modules/ipython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index fe89691431c..9d6624a7df4 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "ipython"; - version = "7.12.0"; + version = "7.13.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "d9459e7237e2e5858738ff9c3e26504b79899b58a6d49e574d352493d80684c6"; + sha256 = "ca478e52ae1f88da0102360e57e528b92f3ae4316aabac80a2cd7f7ab2efb48a"; }; prePatch = lib.optionalString stdenv.isDarwin '' -- cgit v1.2.3 From e19e5ac7f00faba7bbfee0d6ba30d24ccb62e584 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Mar 2020 13:56:39 +0200 Subject: python3Packages.jupyter_client: 5.3.4 -> 6.1.2 --- pkgs/development/python-modules/jupyter_client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix index 4855663ebc7..b26fa8d8ba9 100644 --- a/pkgs/development/python-modules/jupyter_client/default.nix +++ b/pkgs/development/python-modules/jupyter_client/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "jupyter_client"; - version = "5.3.4"; + version = "6.1.2"; src = fetchPypi { inherit pname version; - sha256 = "60e6faec1031d63df57f1cc671ed673dced0ed420f4377ea33db37b1c188b910"; + sha256 = "5724827aedb1948ed6ed15131372bc304a8d3ad9ac67ac19da7c95120d6b17e0"; }; propagatedBuildInputs = [ -- cgit v1.2.3 From cca7143293c06000e5cbf689c49c1b9060f0757e Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Mar 2020 13:56:39 +0200 Subject: python3Packages.jupyter_core: 4.6.1 -> 4.6.3 --- pkgs/development/python-modules/jupyter_core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter_core/default.nix index c10f3026876..fe40a3f09c4 100644 --- a/pkgs/development/python-modules/jupyter_core/default.nix +++ b/pkgs/development/python-modules/jupyter_core/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "jupyter_core"; - version = "4.6.1"; + version = "4.6.3"; src = fetchPypi { inherit pname version; - sha256 = "a183e0ec2e8f6adddf62b0a3fc6a2237e3e0056d381e536d3e7c7ecc3067e244"; + sha256 = "394fd5dd787e7c8861741880bdf8a00ce39f95de5d18e579c74b882522219e7e"; }; checkInputs = [ pytest mock glibcLocales nose ]; -- cgit v1.2.3 From 8311b59577f9aa683e262bc8c24b0923f878233d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Mar 2020 13:56:39 +0200 Subject: python3Packages.line_profiler: 2.1.2 -> 3.0.2 --- pkgs/development/python-modules/line_profiler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/line_profiler/default.nix b/pkgs/development/python-modules/line_profiler/default.nix index a60b023acd7..027e6b0d134 100644 --- a/pkgs/development/python-modules/line_profiler/default.nix +++ b/pkgs/development/python-modules/line_profiler/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "line_profiler"; - version = "2.1.2"; + version = "3.0.2"; src = fetchPypi { inherit pname version; - sha256 = "efa66e9e3045aa7cb1dd4bf0106e07dec9f80bc781a993fbaf8162a36c20af5c"; + sha256 = "7218ad6bd81f8649b211974bf108933910f016d66b49651effe7bbf63667d141"; }; patches = [ ./python37.patch ]; -- cgit v1.2.3 From 7ba0848eec7fc6b0faf16ba981764db9d71ce99d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Mar 2020 13:56:39 +0200 Subject: python3Packages.nbformat: 4.4.0 -> 5.0.4 --- pkgs/development/python-modules/nbformat/2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbformat/2.nix b/pkgs/development/python-modules/nbformat/2.nix index faf2cee2b00..35ee52b11ec 100644 --- a/pkgs/development/python-modules/nbformat/2.nix +++ b/pkgs/development/python-modules/nbformat/2.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "nbformat"; - version = "4.4.0"; + version = "5.0.4"; src = fetchPypi { inherit pname version; - sha256 = "f7494ef0df60766b7cabe0a3651556345a963b74dbc16bc7c18479041170d402"; + sha256 = "562de41fc7f4f481b79ab5d683279bf3a168858268d4387b489b7b02be0b324a"; }; LC_ALL="en_US.utf8"; -- cgit v1.2.3 From 62425ee576fd1f2a21c848d42812721b1c5349dc Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Mar 2020 13:56:39 +0200 Subject: python3Packages.notebook: 5.7.8 -> 6.0.3 --- pkgs/development/python-modules/notebook/2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/notebook/2.nix b/pkgs/development/python-modules/notebook/2.nix index 8b8cce2f824..6b891353679 100644 --- a/pkgs/development/python-modules/notebook/2.nix +++ b/pkgs/development/python-modules/notebook/2.nix @@ -25,11 +25,11 @@ buildPythonPackage rec { pname = "notebook"; - version = "5.7.8"; + version = "6.0.3"; src = fetchPypi { inherit pname version; - sha256 = "573e0ae650c5d76b18b6e564ba6d21bf321d00847de1d215b418acb64f056eb8"; + sha256 = "47a9092975c9e7965ada00b9a20f0cf637d001db60d241d479f53c0be117ad48"; }; LC_ALL = "en_US.utf8"; -- cgit v1.2.3 From f72c25454594dcd2aa0cb0f853fc756c60659fdd Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Mar 2020 13:56:39 +0200 Subject: python3Packages.numpy: 1.18.1 -> 1.18.2 --- pkgs/development/python-modules/numpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 4a062ca7b97..15d285e20fd 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -27,13 +27,13 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.18.1"; + version = "1.18.2"; format = "pyproject.toml"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "b6ff59cee96b454516e47e7721098e6ceebef435e3e21ac2d6c3b8b02628eb77"; + sha256 = "e7894793e6e8540dbeac77c87b489e331947813511108ae097f1715c018b8f3d"; }; nativeBuildInputs = [ gfortran pytest cython setuptoolsBuildHook ]; -- cgit v1.2.3 From 5cfd19274b7e9c66d1c3a5524cb46edf70e03586 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Mar 2020 13:56:39 +0200 Subject: python3Packages.qtconsole: 4.6.0 -> 4.7.2 --- pkgs/development/python-modules/qtconsole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index abf5509056d..0305b7c3be5 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "qtconsole"; - version = "4.6.0"; + version = "4.7.2"; src = fetchPypi { inherit pname version; - sha256 = "654f423662e7dfe6a9b26fac8ec76aedcf742c339909ac49f1f0c1a1b744bcd1"; + sha256 = "d7834598825169fc322390fdfd96bf791833ded21bf22803f083662edbbf3d75"; }; checkInputs = [ nose ] ++ lib.optionals isPy27 [mock]; -- cgit v1.2.3 From d2e945428ddfed461dd25ee4026d0aa54f21e34d Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Mar 2020 13:56:39 +0200 Subject: python3Packages.reikna: 0.7.4 -> 0.7.5 --- pkgs/development/python-modules/reikna/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reikna/default.nix b/pkgs/development/python-modules/reikna/default.nix index 611bdd66901..ebe3dc772d7 100644 --- a/pkgs/development/python-modules/reikna/default.nix +++ b/pkgs/development/python-modules/reikna/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "reikna"; - version = "0.7.4"; + version = "0.7.5"; src = fetchPypi { inherit pname version; - sha256 = "52bbce24fa1fd7bb950d38ce9b60f497dd00ac6b26688d80ab9bce709f063e71"; + sha256 = "d01f4264c8379ef2962a93aacb002d491b92ef9b5b22b45f77e7821dfa87bef7"; }; checkInputs = [ sphinx pytestcov pytest ]; -- cgit v1.2.3 From 04ccf59c50116b1d8ab55330c537446a1d6bec47 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Mar 2020 13:56:40 +0200 Subject: python3Packages.sounddevice: 0.3.14 -> 0.3.15 --- pkgs/development/python-modules/sounddevice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sounddevice/default.nix b/pkgs/development/python-modules/sounddevice/default.nix index 614f0881ff8..9a6baf80f04 100644 --- a/pkgs/development/python-modules/sounddevice/default.nix +++ b/pkgs/development/python-modules/sounddevice/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "sounddevice"; - version = "0.3.14"; + version = "0.3.15"; src = fetchPypi { inherit pname version; - sha256 = "c7b0f7ad86550668da55404eabcb63d4212ec622fcce86510092306b77d2e80a"; + sha256 = "028f6e5df83027f4bfba5d6d61e6d46eb8689f9e647825e09f539920dee17d2c"; }; propagatedBuildInputs = [ cffi numpy portaudio ]; -- cgit v1.2.3 From a034c1862769427e0365bea3ba784f753af1dc80 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Mar 2020 13:56:40 +0200 Subject: python3Packages.statsmodels: 0.11.0 -> 0.11.1 --- pkgs/development/python-modules/statsmodels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix index e2c7142c979..c65fb0990f0 100644 --- a/pkgs/development/python-modules/statsmodels/default.nix +++ b/pkgs/development/python-modules/statsmodels/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "statsmodels"; - version = "0.11.0"; + version = "0.11.1"; src = fetchPypi { inherit pname version; - sha256 = "0wcc7xbwlf8r2diw9fnzf4bg9h5cg406w7phd3dz37hx17yfi3ha"; + sha256 = "5bde3fa0a35a91b45dba7cbc28270b5b649ff1d721c89290883f6e831672d5f0"; }; checkInputs = with self; [ nose ]; -- cgit v1.2.3 From 10462514f7ff59c14befb62affd644812f6f3b6b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Mar 2020 13:56:40 +0200 Subject: python3Packages.tabulate: 0.8.6 -> 0.8.7 --- pkgs/development/python-modules/tabulate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tabulate/default.nix b/pkgs/development/python-modules/tabulate/default.nix index c482c517989..4686d02486f 100644 --- a/pkgs/development/python-modules/tabulate/default.nix +++ b/pkgs/development/python-modules/tabulate/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "0.8.6"; + version = "0.8.7"; pname = "tabulate"; src = fetchPypi { inherit pname version; - sha256 = "5470cc6687a091c7042cee89b2946d9235fe9f6d49c193a4ae2ac7bf386737c8"; + sha256 = "db2723a20d04bcda8522165c73eea7c300eda74e0ce852d9022e0159d7895007"; }; checkInputs = [ nose ]; -- cgit v1.2.3 From d2a2b7674b4872173e6e169d9bd28483ff79889b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Mar 2020 13:56:40 +0200 Subject: python3Packages.tqdm: 4.42.1 -> 4.44.0 --- pkgs/development/python-modules/tqdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index a6549ee07c9..5a24c4ec24f 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.42.1"; + version = "4.44.0"; src = fetchPypi { inherit pname version; - sha256 = "251ee8440dbda126b8dfa8a7c028eb3f13704898caaef7caa699b35e119301e2"; + sha256 = "4f882b23c492e7060f50d83af86f163b67e4cfbe35dfe12077e748c56282f438"; }; checkInputs = [ nose coverage glibcLocales flake8 ]; -- cgit v1.2.3 From 6eb61b5d923003371056eefd5393777109f9e380 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 29 Mar 2020 13:56:40 +0200 Subject: python3Packages.xarray: 0.15.0 -> 0.15.1 --- pkgs/development/python-modules/xarray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix index a950076a261..abce8ac12fe 100644 --- a/pkgs/development/python-modules/xarray/default.nix +++ b/pkgs/development/python-modules/xarray/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "xarray"; - version = "0.15.0"; + version = "0.15.1"; src = fetchPypi { inherit pname version; - sha256 = "c72d160c970725201f769e80fb91cbad68d6ebf21d68fcc371385a6c950459c3"; + sha256 = "64e3138d87b641e22fe7a003c94abc685896b247b63e434505c1e6b38c91a8fb"; }; checkInputs = [ pytest ]; -- cgit v1.2.3 From 6db84432b1f27083f393d184c8b29101586ff10f Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 21 Apr 2020 11:25:19 +0200 Subject: python: jupyter_client: 6.1.2 -> 6.1.3 --- pkgs/development/python-modules/jupyter_client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix index b26fa8d8ba9..008a74dfb3e 100644 --- a/pkgs/development/python-modules/jupyter_client/default.nix +++ b/pkgs/development/python-modules/jupyter_client/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "jupyter_client"; - version = "6.1.2"; + version = "6.1.3"; src = fetchPypi { inherit pname version; - sha256 = "5724827aedb1948ed6ed15131372bc304a8d3ad9ac67ac19da7c95120d6b17e0"; + sha256 = "3a32fa4d0b16d1c626b30c3002a62dfd86d6863ed39eaba3f537fade197bb756"; }; propagatedBuildInputs = [ -- cgit v1.2.3 From 67c4087ffb1bef22d4ca00399cda915ff4362459 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 21 Apr 2020 11:25:46 +0200 Subject: python: nbformat: 5.0.4 -> 5.0.6 --- pkgs/development/python-modules/nbformat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix index 35ee52b11ec..2f8c57e0033 100644 --- a/pkgs/development/python-modules/nbformat/default.nix +++ b/pkgs/development/python-modules/nbformat/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "nbformat"; - version = "5.0.4"; + version = "5.0.6"; src = fetchPypi { inherit pname version; - sha256 = "562de41fc7f4f481b79ab5d683279bf3a168858268d4387b489b7b02be0b324a"; + sha256 = "049af048ed76b95c3c44043620c17e56bc001329e07f83fec4f177f0e3d7b757"; }; LC_ALL="en_US.utf8"; -- cgit v1.2.3 From 5ca64bb0433bc6c49c2241c2f3b902a538bfb2b3 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 21 Apr 2020 11:26:16 +0200 Subject: python: numpy: 1.18.2 -> 1.18.3 --- pkgs/development/python-modules/numpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 15d285e20fd..0838509a849 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -27,13 +27,13 @@ let }; in buildPythonPackage rec { pname = "numpy"; - version = "1.18.2"; + version = "1.18.3"; format = "pyproject.toml"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e7894793e6e8540dbeac77c87b489e331947813511108ae097f1715c018b8f3d"; + sha256 = "e46e2384209c91996d5ec16744234d1c906ab79a701ce1a26155c9ec890b8dc8"; }; nativeBuildInputs = [ gfortran pytest cython setuptoolsBuildHook ]; -- cgit v1.2.3 From 697473975f9256adf717622ee6aea40358a9b260 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 21 Apr 2020 11:26:29 +0200 Subject: python: qtconsole: 4.7.2 -> 4.7.3 --- pkgs/development/python-modules/qtconsole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index 0305b7c3be5..6d3899e32e7 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "qtconsole"; - version = "4.7.2"; + version = "4.7.3"; src = fetchPypi { inherit pname version; - sha256 = "d7834598825169fc322390fdfd96bf791833ded21bf22803f083662edbbf3d75"; + sha256 = "8f5ae5571f0e921db9f2d12613ed667c350ee22c7db598d9bbbe143e8533f932"; }; checkInputs = [ nose ] ++ lib.optionals isPy27 [mock]; -- cgit v1.2.3 From f7a8dc83db3abcacc1f8eadd132b31baa93bad0b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 21 Apr 2020 11:27:08 +0200 Subject: python: tqdm: 4.44.0 -> 4.45.0 --- pkgs/development/python-modules/tqdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index 5a24c4ec24f..c00eac75ee0 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.44.0"; + version = "4.45.0"; src = fetchPypi { inherit pname version; - sha256 = "4f882b23c492e7060f50d83af86f163b67e4cfbe35dfe12077e748c56282f438"; + sha256 = "00339634a22c10a7a22476ee946bbde2dbe48d042ded784e4d88e0236eca5d81"; }; checkInputs = [ nose coverage glibcLocales flake8 ]; -- cgit v1.2.3 From 4ffb40bc7837a9e7d84889809e996062ca366402 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 22 Apr 2020 08:27:42 +0200 Subject: python3Packages.dask: 2.10.1 -> 2.14.0 --- pkgs/development/python-modules/dask/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix index b8dfd8deb4a..1b3a08aa997 100644 --- a/pkgs/development/python-modules/dask/default.nix +++ b/pkgs/development/python-modules/dask/default.nix @@ -3,7 +3,7 @@ , buildPythonPackage , fetchFromGitHub , fsspec -, pytest +, pytestCheckHook , pythonOlder , cloudpickle , numpy @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dask"; - version = "2.10.1"; + version = "2.14.0"; disabled = pythonOlder "3.5"; @@ -23,13 +23,15 @@ buildPythonPackage rec { owner = "dask"; repo = pname; rev = version; - sha256 = "035mr7385yf5ng5wf60qxr80529h8dsla5hymkyg68dxhkd0jvbr"; + sha256 = "0kj46pwzvdw8ii1h45y48wxvjid89yp4cfak2h4b8z8xic73fqgj"; }; checkInputs = [ - pytest + pytestCheckHook ]; + dontUseSetuptoolsCheck = true; + propagatedBuildInputs = [ bokeh cloudpickle @@ -50,9 +52,10 @@ buildPythonPackage rec { --replace "cmdclass=versioneer.get_cmdclass()," "" ''; - checkPhase = '' - pytest - ''; + disabledTests = [ + "test_argwhere_str" + "test_count_nonzero_str" + ]; meta = { description = "Minimal task scheduling abstraction"; -- cgit v1.2.3 From 166f2a01ebb640ee68da4f4f82451ad5b67525d8 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Sun, 26 Apr 2020 19:02:36 +0200 Subject: libglvnd: 1.2.0 -> 1.3.1 --- pkgs/development/libraries/libglvnd/default.nix | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index 5772e0d24f6..92cde8aef4c 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -2,34 +2,18 @@ stdenv.mkDerivation rec { pname = "libglvnd"; - version = "1.2.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "libglvnd"; rev = "v${version}"; - sha256 = "1hyywwjsmvsd7di603f7iznjlccqlc7yvz0j59gax7bljm9wb6ni"; + sha256 = "0mkzdzdxjxjl794rblq4mq33wmb8ikqmfswbqdbr8gw2kw4wlhdl"; }; nativeBuildInputs = [ autoreconfHook pkgconfig python3 addOpenGLRunpath ]; buildInputs = [ libX11 libXext xorgproto ]; - # The following 3 patches should be removed once libglvnd >1.2.0 is released - patches = [ - (fetchpatch { - url = "https://github.com/NVIDIA/libglvnd/commit/6f52473dac08c44b081b792874b4ce73122096da.patch"; - sha256 = "0rd9ihl8n33cm0rya5a7ki0hn31fh52r0gaj5d4w80jrsah2ayij"; - }) - (fetchpatch { - url = "https://github.com/NVIDIA/libglvnd/commit/51233cc52cbcbe25f8461830913c06f5b5bc9508.patch"; - sha256 = "1qx3nw8vq5xcrixmi7xw1vpy4gbf7kmx38rx8wg8x046g4mv8ijj"; - }) - (fetchpatch { - url = "https://github.com/NVIDIA/libglvnd/commit/5dfdc5a6dc60a3bdc63cd4510dabacba388da13a.patch"; - sha256 = "0gmb3619yz3z7n22afjh8p2y13bmsky4r0z0csm14is3wvdi64ya"; - }) - ]; - postPatch = lib.optionalString stdenv.isDarwin '' substituteInPlace src/GLX/Makefile.am \ --replace "-Wl,-Bsymbolic " "" -- cgit v1.2.3 From a7ca287ecb3bd5589d2f815a27f1152071d92b57 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Fri, 24 Apr 2020 17:01:57 -0400 Subject: nixos/qemu-vm: don't set -vga std This has been default since QEMU 2.2, it also prevents using a different -vga --- nixos/modules/virtualisation/qemu-vm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 31d332e9f07..85b75ba6804 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -499,7 +499,7 @@ in # FIXME: Consolidate this one day. virtualisation.qemu.options = mkMerge [ (mkIf (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [ - "-vga std" "-usb" "-device usb-tablet,bus=usb-bus.0" + "-usb" "-device usb-tablet,bus=usb-bus.0" ]) (mkIf (pkgs.stdenv.isAarch32 || pkgs.stdenv.isAarch64) [ "-device virtio-gpu-pci" "-device usb-ehci,id=usb0" "-device usb-kbd" "-device usb-tablet" -- cgit v1.2.3 From ddf043849371b348437e444c7e7df5d2b18a963b Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Thu, 23 Apr 2020 14:33:18 +0200 Subject: libssh: 0.8.8 -> 0.8.9 Fixes CVE-2020-1730. Release notes: https://www.libssh.org/2020/04/09/libssh-0-9-4-and-libssh-0-8-9-security-release/ --- pkgs/development/libraries/libssh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index bf6e0a491f2..c6accad9c3c 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libssh"; - version = "0.8.8"; + version = "0.8.9"; src = fetchurl { url = "https://www.libssh.org/files/0.8/${pname}-${version}.tar.xz"; - sha256 = "1qk5bm9r6199jbfk54f8w24vkl52051g8s3kmq4z2kdc6vbpy4jb"; + sha256 = "09b8w9m5qiap8wbvz4613nglsynpk8hn0q9b929ny2y4l2fy2nc5"; }; postPatch = '' -- cgit v1.2.3 From f05a209e34ebf92b6017d5314d648bc0972272d2 Mon Sep 17 00:00:00 2001 From: Konrad Borowski Date: Tue, 21 Apr 2020 09:44:11 +0200 Subject: libfido2: make builds reproducible --- pkgs/development/libraries/libfido2/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix index 30ecdda3da2..b062b10732e 100644 --- a/pkgs/development/libraries/libfido2/default.nix +++ b/pkgs/development/libraries/libfido2/default.nix @@ -22,6 +22,14 @@ stdenv.mkDerivation rec { buildInputs = [ hidapi libcbor openssl ] ++ stdenv.lib.optionals stdenv.isLinux [ udev ]; + patches = [ + # make build reproducible + (fetchpatch { + url = "https://github.com/Yubico/libfido2/commit/e79f7d7996e70d6b2ae9826fce81d61659cab4f6.patch"; + sha256 = "0jwg69f95qqf0ym24q1ka50d3d3338cyw4fdfzpw4sab0shiaq9v"; + }) + ]; + cmakeFlags = [ "-DUDEV_RULES_DIR=${placeholder "out"}/etc/udev/rules.d" "-DUSE_HIDAPI=1" -- cgit v1.2.3 From dde3e8edf49d46380903773c4826509a2de7a399 Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Mon, 27 Apr 2020 22:18:10 +0300 Subject: nix-prefetch-docker: Add `jq` into path Otheriwse running the tool fails with line 41: jq: command not found --- pkgs/build-support/docker/nix-prefetch-docker.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/docker/nix-prefetch-docker.nix b/pkgs/build-support/docker/nix-prefetch-docker.nix index c1d86adc6d8..6341eb0154b 100644 --- a/pkgs/build-support/docker/nix-prefetch-docker.nix +++ b/pkgs/build-support/docker/nix-prefetch-docker.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, nix, skopeo }: +{ stdenv, makeWrapper, nix, skopeo, jq }: with stdenv.lib; @@ -12,7 +12,7 @@ stdenv.mkDerivation { installPhase = '' install -vD ${./nix-prefetch-docker} $out/bin/$name; wrapProgram $out/bin/$name \ - --prefix PATH : ${makeBinPath [ nix skopeo ]} \ + --prefix PATH : ${makeBinPath [ nix skopeo jq ]} \ --set HOME /homeless-shelter ''; -- cgit v1.2.3 From 61a2045c9a2fd10ce061341209a5b3a649b6cc01 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Mon, 27 Apr 2020 22:19:14 +0200 Subject: pulseeffects: fix build Meson 0.54 is no longer able to find Boost: See https://github.com/NixOS/nixpkgs/issues/86131 --- pkgs/applications/audio/pulseeffects/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix index 2972849a2d4..eaedcb426b8 100644 --- a/pkgs/applications/audio/pulseeffects/default.nix +++ b/pkgs/applications/audio/pulseeffects/default.nix @@ -99,6 +99,11 @@ in stdenv.mkDerivation rec { ) ''; + # Meson is no longer able to pick up Boost automatically. + # https://github.com/NixOS/nixpkgs/issues/86131 + BOOST_INCLUDEDIR = "${stdenv.lib.getDev boost}/include"; + BOOST_LIBRARYDIR = "${stdenv.lib.getLib boost}/lib"; + meta = with stdenv.lib; { description = "Limiter, compressor, reverberation, equalizer and auto volume effects for Pulseaudio applications"; homepage = "https://github.com/wwmm/pulseeffects"; -- cgit v1.2.3 From 301ede41573ff8d1aefd14fef937721a378deee3 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Mon, 27 Apr 2020 16:22:25 -0400 Subject: hcxdumptool: fix incorrect pname --- pkgs/tools/security/hcxdumptool/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/hcxdumptool/default.nix b/pkgs/tools/security/hcxdumptool/default.nix index f1c2cee9f3a..6a2eee47143 100644 --- a/pkgs/tools/security/hcxdumptool/default.nix +++ b/pkgs/tools/security/hcxdumptool/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, openssl }: stdenv.mkDerivation rec { - pname = "hxcdumptool"; + pname = "hcxdumptool"; version = "6.0.5"; src = fetchFromGitHub { -- cgit v1.2.3 From c15f5903d7930c4f476d478aed7960a771ac55c2 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Thu, 9 Apr 2020 18:38:20 -0700 Subject: libquotient: rename from libqmatrixclient; v0.5.2 -> v0.5.3.2 aliases: throw messages for libqmatrixclient and quaternion-git --- .../libraries/libqmatrixclient/default.nix | 38 ---------------------- pkgs/development/libraries/libquotient/default.nix | 24 ++++++++++++++ pkgs/top-level/aliases.nix | 2 ++ pkgs/top-level/all-packages.nix | 5 +-- 4 files changed, 27 insertions(+), 42 deletions(-) delete mode 100644 pkgs/development/libraries/libqmatrixclient/default.nix create mode 100644 pkgs/development/libraries/libquotient/default.nix diff --git a/pkgs/development/libraries/libqmatrixclient/default.nix b/pkgs/development/libraries/libqmatrixclient/default.nix deleted file mode 100644 index 8027fd46ea8..00000000000 --- a/pkgs/development/libraries/libqmatrixclient/default.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake -, qtbase, qtmultimedia }: - -let - generic = version: sha256: prefix: stdenv.mkDerivation { - pname = "libqmatrixclient"; - inherit version; - - src = fetchFromGitHub { - owner = "QMatrixClient"; - repo = "libqmatrixclient"; - rev = "${prefix}${version}"; - inherit sha256; - }; - - postPatch = '' - sed -i -e '/example/Id' CMakeLists.txt - ''; - - buildInputs = [ qtbase qtmultimedia ]; - - nativeBuildInputs = [ cmake ]; - - meta = with stdenv.lib; { - description= "A Qt5 library to write cross-platfrom clients for Matrix"; - homepage = "https://matrix.org/docs/projects/sdk/libqmatrixclient.html"; - license = licenses.lgpl21; - platforms = with platforms; linux ++ darwin; - maintainers = with maintainers; [ peterhoeg ]; - }; - }; - -in rec { - libqmatrixclient_0_4 = generic "0.4.2.1" "056hvp2m74wx72yd8vai18siddj9l8bhrvrkc4ia4cwjsqw02kid" "v"; - libqmatrixclient_0_5 = generic "0.5.2" "1bhlqfs7251fss4icx794ka614npr6zyrpp4qwc4q5408ykfm7lr" ""; - - libqmatrixclient = libqmatrixclient_0_4; -} diff --git a/pkgs/development/libraries/libquotient/default.nix b/pkgs/development/libraries/libquotient/default.nix new file mode 100644 index 00000000000..9ece2c13bd2 --- /dev/null +++ b/pkgs/development/libraries/libquotient/default.nix @@ -0,0 +1,24 @@ +{ mkDerivation, lib, fetchFromGitHub, cmake, qtbase, qtmultimedia }: + +mkDerivation rec { + pname = "libquotient"; + version = "0.5.3.2"; + + src = fetchFromGitHub { + owner = "quotient-im"; + repo = "libQuotient"; + rev = version; + sha256 = "0gkwr3yw6k2m0j8cc085b5p2q788rf5nhp1p5hc5d55pc7mci2qs"; + }; + + buildInputs = [ qtbase qtmultimedia ]; + + nativeBuildInputs = [ cmake ]; + + meta = with lib; { + description = "A Qt5 library to write cross-platfrom clients for Matrix"; + homepage = "https://matrix.org/docs/projects/sdk/quotient"; + maintainers = with maintainers; [ colemickens ]; + license = licenses.lgpl21; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a115a70d44a..5b26ecb2da6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -250,6 +250,7 @@ mapAliases ({ libtxc_dxtn_s2tc = throw "removed 2020-03-16, now integrated in Mesa"; libudev = udev; # added 2018-04-25 libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it."; # 2019-12-10 + libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # added 2020-04-09 links = links2; # added 2016-01-31 linux_rpi0 = linux_rpi1; linuxPackages_rpi0 = linuxPackages_rpi1; @@ -432,6 +433,7 @@ mapAliases ({ quake3game = ioquake3; # added 2016-01-14 qwt6 = libsForQt5.qwt; # added 2015-12-19 qtpfsgui = throw "Is now luminanceHDR"; # added 2019-06-26 + quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # added 2020-04-09 rdf4store = throw "rdf4store has been removed from nixpkgs."; # added 2019-12-21 rdiff_backup = rdiff-backup; # added 2014-11-23 rdmd = dtools; # added 2017-08-19 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ed07788904..1fb7c2a45a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1240,10 +1240,7 @@ in charles4 ; - inherit (libsForQt5.callPackage ../development/libraries/libqmatrixclient { }) - libqmatrixclient_0_4 - libqmatrixclient_0_5 - libqmatrixclient; + libquotient = libsForQt5.callPackage ../development/libraries/libquotient {}; inherit (libsForQt5.callPackage ../applications/networking/instant-messengers/quaternion { }) quaternion -- cgit v1.2.3 From 3ceefd2086428dea238c7f1fe95ca9f74394ee62 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Thu, 2 Apr 2020 15:31:37 -0700 Subject: quaternion: 0.0.9.4c -> 0.0.9.4e --- .../instant-messengers/quaternion/default.nix | 79 +++++++++++----------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 41 insertions(+), 42 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix index ec6a497bde9..18b590304d8 100644 --- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -1,46 +1,47 @@ { mkDerivation, stdenv, lib, fetchFromGitHub, cmake -, qtbase, qtquickcontrols, qtkeychain, qtmultimedia, qttools -, libqmatrixclient_0_5 -, libsecret +, qtbase, qtquickcontrols, qtquickcontrols2, qtkeychain, qtmultimedia, qttools +, libquotient, libsecret }: -let - generic = version: sha256: prefix: library: mkDerivation { - pname = "quaternion"; - inherit version; - - src = fetchFromGitHub { - owner = "QMatrixClient"; - repo = "Quaternion"; - rev = "${prefix}${version}"; - inherit sha256; - }; - - buildInputs = [ qtbase qtmultimedia qtquickcontrols qtkeychain library libsecret ]; - - nativeBuildInputs = [ cmake qttools ]; +mkDerivation rec { + pname = "quaternion"; + version = "0.0.9.4e"; - postInstall = if stdenv.isDarwin then '' - mkdir -p $out/Applications - mv $out/bin/quaternion.app $out/Applications - rmdir $out/bin || : - '' else '' - substituteInPlace $out/share/applications/quaternion.desktop \ - --replace 'Exec=quaternion' "Exec=$out/bin/quaternion" - ''; - - meta = with lib; { - description = "Cross-platform desktop IM client for the Matrix protocol"; - homepage = "https://matrix.org/docs/projects/client/quaternion.html"; - license = licenses.gpl3; - maintainers = with maintainers; [ peterhoeg ]; - inherit (qtbase.meta) platforms; - inherit version; - }; + src = fetchFromGitHub { + owner = "QMatrixClient"; + repo = "Quaternion"; + rev = "${version}"; + sha256 = "sha256-2yEiILiitRPj2hCodUDM8UNVq8crb9nyX21ebuh5EEM="; }; -in rec { - quaternion = generic "0.0.9.4c" "12mkwiqqbi4774kwl7gha72jyf0jf547acy6rw8ry249zl4lja54" "" libqmatrixclient_0_5; - - quaternion-git = quaternion; + buildInputs = [ + qtbase + qtmultimedia + qtquickcontrols + qtquickcontrols2 + qtkeychain + libquotient + libsecret + ]; + + nativeBuildInputs = [ cmake qttools ]; + + postInstall = if stdenv.isDarwin then '' + mkdir -p $out/Applications + mv $out/bin/quaternion.app $out/Applications + rmdir $out/bin || : + '' else '' + substituteInPlace $out/share/applications/com.github.quaternion.desktop \ + --replace 'Exec=quaternion' "Exec=$out/bin/quaternion" + ''; + + meta = with lib; { + description = + "Cross-platform desktop IM client for the Matrix protocol"; + homepage = "https://matrix.org/docs/projects/client/quaternion.html"; + license = licenses.gpl3; + maintainers = with maintainers; [ peterhoeg ]; + inherit (qtbase.meta) platforms; + inherit version; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1fb7c2a45a5..0628fdaad86 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1242,9 +1242,7 @@ in libquotient = libsForQt5.callPackage ../development/libraries/libquotient {}; - inherit (libsForQt5.callPackage ../applications/networking/instant-messengers/quaternion { }) - quaternion - quaternion-git; + quaternion = libsForQt5.callPackage ../applications/networking/instant-messengers/quaternion { }; tensor = libsForQt5.callPackage ../applications/networking/instant-messengers/tensor { }; -- cgit v1.2.3 From 93862d05f7dc169bc4c74409d0d6333b32c94b4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 27 Apr 2020 08:31:39 +0100 Subject: PULL_REQUEST_TEMPLATE: try to simplify call-for-review The text is quite long and hard to read in hub (because it is one whole line with no line breaks). Also simplified the language/sentence structure a bit for non-native speakers. --- .github/PULL_REQUEST_TEMPLATE.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 8b12c5f1aac..f4433807809 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,4 +1,13 @@ - + + ###### Motivation for this change -- cgit v1.2.3 From 87b02f74cf553eaba81c5e14f78c98c03399af69 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Mon, 27 Apr 2020 14:21:05 -0700 Subject: fish: disable codesigning We don't have access to the codesign binary. --- pkgs/shells/fish/default.nix | 4 ++++ pkgs/shells/fish/dont-codesign-on-mac.diff | 12 ++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/shells/fish/dont-codesign-on-mac.diff diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index bc456813ddf..69072c44319 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -110,6 +110,10 @@ let sha256 = "1f12c56v7n4s0f9mi9xinviwj6kpwlcjwaig1d4vsk5wlgp7ip07"; }; + # We don't have access to the codesign executable, so we patch this out. + # For more information, see: https://github.com/fish-shell/fish-shell/issues/6952 + patches = lib.optional stdenv.isDarwin ./dont-codesign-on-mac.diff; + nativeBuildInputs = [ cmake ]; diff --git a/pkgs/shells/fish/dont-codesign-on-mac.diff b/pkgs/shells/fish/dont-codesign-on-mac.diff new file mode 100644 index 00000000000..c61350b0549 --- /dev/null +++ b/pkgs/shells/fish/dont-codesign-on-mac.diff @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7d220a032..786b60e6e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -183,7 +183,6 @@ ENDFUNCTION(CODESIGN_ON_MAC target) + # Define a function to link dependencies. + FUNCTION(FISH_LINK_DEPS_AND_SIGN target) + TARGET_LINK_LIBRARIES(${target} fishlib) +- CODESIGN_ON_MAC(${target}) + ENDFUNCTION(FISH_LINK_DEPS_AND_SIGN) + + # Define libfish.a. -- cgit v1.2.3 From 12a614b633e26b14fe27bc5e4ac406a3a68efc60 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 27 Apr 2020 00:55:35 +0200 Subject: brutespray: 1.6.6 -> 1.6.8 https://github.com/x90skysn3k/brutespray/blob/brutespray-1.6.8/CHANGELOG.md#changelog --- pkgs/tools/security/brutespray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/brutespray/default.nix b/pkgs/tools/security/brutespray/default.nix index be7c99f5252..78dd789047d 100644 --- a/pkgs/tools/security/brutespray/default.nix +++ b/pkgs/tools/security/brutespray/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "brutespray"; - version = "1.6.6"; + version = "1.6.8"; src = fetchFromGitHub { owner = "x90skysn3k"; repo = pname; rev = "brutespray-${version}"; - sha256 = "1rj8fkq1xz4ph1pmldphlsa25mg6xl7i7dranb0qjx00jhfxjxjh"; + sha256 = "1pi4d5vcvvjsby39dq995dlhpxdicmfhqsiw23hr25m38ccfm3rh"; }; postPatch = '' -- cgit v1.2.3 From 1f20c084a73cc8c70d61ae5cbfa71da6bd8a3658 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 27 Apr 2020 01:15:13 +0200 Subject: passExtensions.pass-audit: 1.0.1 -> 1.1 --- ...Make-it-possible-to-run-the-tests-offline.patch | 175 --------------------- .../security/pass/extensions/audit/default.nix | 9 +- 2 files changed, 5 insertions(+), 179 deletions(-) delete mode 100644 pkgs/tools/security/pass/extensions/audit/0001-Make-it-possible-to-run-the-tests-offline.patch diff --git a/pkgs/tools/security/pass/extensions/audit/0001-Make-it-possible-to-run-the-tests-offline.patch b/pkgs/tools/security/pass/extensions/audit/0001-Make-it-possible-to-run-the-tests-offline.patch deleted file mode 100644 index 36faf3140cc..00000000000 --- a/pkgs/tools/security/pass/extensions/audit/0001-Make-it-possible-to-run-the-tests-offline.patch +++ /dev/null @@ -1,175 +0,0 @@ -From 37c2b4d2940476555aeec20fe1e5e3fa0492a94e Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch -Date: Sun, 15 Mar 2020 19:58:53 +0100 -Subject: [PATCH] Make it possible to run the tests offline - -Helpful when developing without network access, also makes sure that -the test actually depend on the API's data like number of breaches -(which will change in time). ---- - tests/commons.py | 25 +++++++++++++++++++++++++ - tests/test_audit.py | 8 +++++--- - tests/test_pass_audit.py | 10 +++++++++- - tests/test_pwned.py | 8 +++++--- - 4 files changed, 44 insertions(+), 7 deletions(-) - -diff --git a/tests/commons.py b/tests/commons.py -index 13c4cb1..4f1ecd8 100644 ---- a/tests/commons.py -+++ b/tests/commons.py -@@ -56,3 +56,28 @@ class TestPass(TestBase): - for path in self.store.list(root): - data[path] = self.store.show(path) - return data -+ -+ -+def mock_request(*args, **kwargs): -+ class MockResponse: -+ def __init__(self): -+ data = [ -+ "D5EE0CB1A41071812CCED2F1930E6E1A5D2:2", -+ "2DC183F740EE76F27B78EB39C8AD972A757:52579", -+ "CF164D7A51A1FD864B1BF9E1CE8A3EC171B:4", -+ "D0B910E7A3028703C0B30039795E908CEB2:7", -+ "AD6438836DBE526AA231ABDE2D0EEF74D42:3", -+ "EBAB0A7CE978E0194608B572E4F9404AA21:3", -+ "17727EAB0E800E62A776C76381DEFBC4145:120", -+ "5370372AC65308F03F6ED75EC6068C8E1BE:1386", -+ "1E4C9B93F3F0682250B6CF8331B7EE68FD8:3730471", -+ "437FAA5A7FCE15D1DDCB9EAEAEA377667B8:123422", -+ "944C22589AC652B0F47918D58CA0CDCCB63:411" -+ ] -+ -+ self.text = "\r\n".join(data) -+ -+ def raise_for_status(self): -+ pass -+ -+ return MockResponse() -diff --git a/tests/test_audit.py b/tests/test_audit.py -index d8c7a9a..5e0a9cf 100644 ---- a/tests/test_audit.py -+++ b/tests/test_audit.py -@@ -17,12 +17,13 @@ - # - - from .. import pass_audit --from tests.commons import TestPass -- -+from tests.commons import TestPass, mock_request -+from unittest import mock - - class TestPassAudit(TestPass): - passwords_nb = 7 - -+ @mock.patch('requests.get', mock_request) - def test_password_notpwned(self): - """Testing: pass audit for password not breached with K-anonymity method.""" - data = self._getdata("Password/notpwned") -@@ -30,9 +31,10 @@ class TestPassAudit(TestPass): - breached = audit.password() - self.assertTrue(len(breached) == 0) - -+ @mock.patch('requests.get', mock_request) - def test_password_pwned(self): - """Testing: pass audit for password breached with K-anonymity method.""" -- ref_counts = [51259, 3, 114, 1352, 3645804, 78773, 396] -+ ref_counts = [52579, 3, 120, 1386, 3730471, 123422, 411] - data = self._getdata("Password/pwned") - audit = pass_audit.PassAudit(data) - breached = audit.password() -diff --git a/tests/test_pass_audit.py b/tests/test_pass_audit.py -index 4c10f87..2c949f7 100644 ---- a/tests/test_pass_audit.py -+++ b/tests/test_pass_audit.py -@@ -19,7 +19,8 @@ - import os - - from .. import pass_audit --from tests.commons import TestPass -+from tests.commons import TestPass, mock_request -+from unittest import mock - - - class TestPassAuditCMD(TestPass): -@@ -47,6 +48,7 @@ class TestPassAuditCMD(TestPass): - cmd = ['--not-an-option', '-q'] - self._passaudit(cmd, 2) - -+ @mock.patch('requests.get', mock_request) - def test_pass_audit_StoreNotInitialized(self): - """Testing: store not initialized.""" - cmd = ['Password/', '-v'] -@@ -56,6 +58,7 @@ class TestPassAuditCMD(TestPass): - os.rename(os.path.join(self.store.prefix, 'backup.gpg-id'), - os.path.join(self.store.prefix, '.gpg-id')) - -+ @mock.patch('requests.get', mock_request) - def test_pass_audit_InvalidID(self): - """Testing: invalid user ID.""" - os.rename(os.path.join(self.store.prefix, '.gpg-id'), -@@ -66,26 +69,31 @@ class TestPassAuditCMD(TestPass): - os.rename(os.path.join(self.store.prefix, 'backup.gpg-id'), - os.path.join(self.store.prefix, '.gpg-id')) - -+ @mock.patch('requests.get', mock_request) - def test_pass_audit_NotAFile(self): - """Testing: pass audit not_a_file.""" - cmd = ['not_a_file'] - self._passaudit(cmd, 1) - -+ @mock.patch('requests.get', mock_request) - def test_pass_audit_passwords_notpwned(self): - """Testing: pass audit Password/notpwned.""" - cmd = ['Password/notpwned'] - self._passaudit(cmd) - -+ @mock.patch('requests.get', mock_request) - def test_pass_audit_passwords_pwned(self): - """Testing: pass audit Password/pwned.""" - cmd = ['Password/pwned'] - self._passaudit(cmd) - -+ @mock.patch('requests.get', mock_request) - def test_pass_audit_passwords_good(self): - """Testing: pass audit Password/good.""" - cmd = ['Password/good'] - self._passaudit(cmd) - -+ @mock.patch('requests.get', mock_request) - def test_pass_audit_passwords_all(self): - """Testing: pass audit .""" - cmd = [''] -diff --git a/tests/test_pwned.py b/tests/test_pwned.py -index 5ce6bc6..c28939a 100644 ---- a/tests/test_pwned.py -+++ b/tests/test_pwned.py -@@ -17,7 +17,8 @@ - # - - from .. import pass_audit --from tests.commons import TestPass -+from tests.commons import TestPass, mock_request -+from unittest import mock - - - class TestPwnedAPI(TestPass): -@@ -25,12 +26,13 @@ class TestPwnedAPI(TestPass): - def setUp(self): - self.api = pass_audit.PwnedAPI() - -+ @mock.patch('requests.get', mock_request) - def test_password_range(self): - """Testing: https://api.haveibeenpwned.com/range API.""" - prefix = '21BD1' - Hash = '21BD12DC183F740EE76F27B78EB39C8AD972A757' - hashes, counts = self.api.password_range(prefix) - self.assertIn(Hash, hashes) -- self.assertTrue(counts[hashes.index(Hash)] == 51259) -+ self.assertTrue(counts[hashes.index(Hash)] == 52579) - self.assertTrue(len(hashes) == len(counts)) -- self.assertTrue(len(hashes) == 527) -+ self.assertTrue(len(hashes) == 11) --- -2.25.0 - diff --git a/pkgs/tools/security/pass/extensions/audit/default.nix b/pkgs/tools/security/pass/extensions/audit/default.nix index 5f8e0f7b1c6..144d13238f2 100644 --- a/pkgs/tools/security/pass/extensions/audit/default.nix +++ b/pkgs/tools/security/pass/extensions/audit/default.nix @@ -5,23 +5,24 @@ let in stdenv.mkDerivation rec { pname = "pass-audit"; - version = "1.0.1"; + version = "1.1"; src = fetchFromGitHub { owner = "roddhjav"; repo = "pass-audit"; rev = "v${version}"; - sha256 = "1mdckw0dwcnv8smp1za96y0zmdnykbkw2606v7mzfnzbz4zjdlwl"; + sha256 = "1vapymgpab91kh798mirgs1nb7j9qln0gm2d3321cmsghhb7xs45"; }; patches = [ - ./0001-Make-it-possible-to-run-the-tests-offline.patch ./0002-Fix-audit.bash-setup.patch ]; postPatch = '' substituteInPlace audit.bash \ - --replace '/usr/bin/env python3' "${pythonEnv}/bin/python3" + --replace 'python3' "${pythonEnv}/bin/python3" + substituteInPlace Makefile \ + --replace "install --root" "install --prefix ''' --root" ''; outputs = [ "out" "man" ]; -- cgit v1.2.3 From 1066f11e4b9171b52f543f94d1c945c828543732 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 27 Apr 2020 01:20:00 +0200 Subject: mautrix-whatsapp: 2020-04-21 -> 2020-04-21-1 --- pkgs/servers/mautrix-whatsapp/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index 5e011f17b70..c0d01855be0 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,16 +2,16 @@ buildGoModule { pname = "mautrix-whatsapp-unstable"; - version = "2020-04-21"; + version = "2020-04-21-1"; src = fetchFromGitHub { owner = "tulir"; repo = "mautrix-whatsapp"; - rev = "53fe1b18184fc0967658805abc8560641f8d2cb0"; - sha256 = "0rahj9v7cgvk4w3m41jbs8vnya37dhq5wxyhyg74kwrv8a2nqxra"; + rev = "e0aea74abf090bc9dc499332b28bf03640c162f8"; + sha256 = "1gayjyh0x0axc1xak38zkdhvx6fy8pwlniqsirqy2mwcgkkll9i5"; }; - modSha256 = "0jn88a4hagwfkw9bv8cg12ywsg35znmfkmhi1v7k2qpj5qzi81w6"; + modSha256 = "1pddabyyz6q1snx9j7yv7dchasqa1y8nbpb5zrwmrpnwpns8kxl7"; meta = with stdenv.lib; { homepage = "https://github.com/tulir/mautrix-whatsapp"; -- cgit v1.2.3 From caadc44285ee33f06a255d26231c0507a44ba8e8 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Mon, 27 Apr 2020 20:54:57 +0200 Subject: diffoscope: 142 -> 143 --- pkgs/tools/misc/diffoscope/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 02d9c504070..39a137d3c0e 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -9,11 +9,11 @@ # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python3Packages.buildPythonApplication rec { pname = "diffoscope"; - version = "142"; + version = "143"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "0c6lvppghw9ynjg2radr8z3fc6lpgmgwr6kxyih7q4rxqf4gfv6i"; + sha256 = "09vvhzsxxgjvdnd48hdfz50i2svacdnwc2idirj4b27czi7c3czb"; }; outputs = [ "out" "man" ]; -- cgit v1.2.3 From bb4bb607d4cf5db528eea6e47482f7035ab61dbf Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Thu, 23 Apr 2020 10:10:58 -0700 Subject: hugo: 0.69.0 -> 0.69.2 --- pkgs/applications/misc/hugo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index 7fc042832b5..e58c933b84b 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "hugo"; - version = "0.69.0"; + version = "0.69.2"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "050gqjrdfy5ygwl60qdspjn9s6a84k311g3p2fk3sr7i4rnwf36l"; + sha256 = "0bw31264q8w2r3fm3g2qjh9531nmbn942vl5rjf2cjff25c0d4ji"; }; - modSha256 = "07zfqz7d2slswiyx0pw6ip4l428q7nc3i95d4w6d7hfqp0pvp6i0"; + modSha256 = "1i1mw8jcklmnsqawc1jkgw4h1dxjxb9zaf2p8pgfzxzpy5cp6qkl"; buildFlags = [ "-tags" "extended" ]; -- cgit v1.2.3 From 3f00b95282f2e25436370341867e9d8a2f03f875 Mon Sep 17 00:00:00 2001 From: Keshav Kini Date: Mon, 27 Apr 2020 16:05:18 -0700 Subject: makeself: 2.4.0 -> 2.4.2 Upstream now provides a Makefile that builds a self-extracting installer and also has a test target. We don't need the self-extracting installer, but we might as well build it anyway as an additional test. --- .../misc/makeself/Use-rm-from-PATH.patch | 43 ---------------------- pkgs/applications/misc/makeself/default.nix | 17 +++++---- 2 files changed, 10 insertions(+), 50 deletions(-) delete mode 100644 pkgs/applications/misc/makeself/Use-rm-from-PATH.patch diff --git a/pkgs/applications/misc/makeself/Use-rm-from-PATH.patch b/pkgs/applications/misc/makeself/Use-rm-from-PATH.patch deleted file mode 100644 index 80b9ebf4d57..00000000000 --- a/pkgs/applications/misc/makeself/Use-rm-from-PATH.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 81cf57e4653360af7f1718391e424fa05d8ea000 Mon Sep 17 00:00:00 2001 -From: Keshav Kini -Date: Thu, 9 Aug 2018 18:36:15 -0700 -Subject: [PATCH] Use `rm` from PATH - -On NixOS (a Linux distribution), there is no `/bin/rm`, but an `rm` -command will generally be available in one's path when running shell -scripts. Here, I change a couple of invocations of `/bin/rm` into -invocations of `rm` to deal with this issue. - -Since `rm` is already called elsewhere in the script without an -absolute path, I assume this change will not cause any -regressions. Still, I've tested this on a CentOS machine and a NixOS -machine, though not other platforms. ---- - makeself-header.sh | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/makeself-header.sh b/makeself-header.sh -index 4d2c005..2babf34 100755 ---- a/makeself-header.sh -+++ b/makeself-header.sh -@@ -515,7 +515,7 @@ if test x"\$quiet" = xn; then - fi - res=3 - if test x"\$keep" = xn; then -- trap 'echo Signal caught, cleaning up >&2; cd \$TMPROOT; /bin/rm -rf "\$tmpdir"; eval \$finish; exit 15' 1 2 3 15 -+ trap 'echo Signal caught, cleaning up >&2; cd \$TMPROOT; rm -rf "\$tmpdir"; eval \$finish; exit 15' 1 2 3 15 - fi - - if test x"\$nodiskspace" = xn; then -@@ -581,7 +581,7 @@ if test x"\$script" != x; then - fi - if test x"\$keep" = xn; then - cd "\$TMPROOT" -- /bin/rm -rf "\$tmpdir" -+ rm -rf "\$tmpdir" - fi - eval \$finish; exit \$res - EOF --- -2.14.1 - diff --git a/pkgs/applications/misc/makeself/default.nix b/pkgs/applications/misc/makeself/default.nix index 7dedf52e893..6fcd86596fb 100644 --- a/pkgs/applications/misc/makeself/default.nix +++ b/pkgs/applications/misc/makeself/default.nix @@ -1,22 +1,21 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2.4.0"; + version = "2.4.2"; pname = "makeself"; src = fetchFromGitHub { owner = "megastep"; repo = "makeself"; rev = "release-${version}"; - sha256 = "1lw3gx1zpzp2wmzrw5v7k31vfsrdzadqha9ni309fp07g8inrr9n"; + fetchSubmodules = true; + sha256 = "07cq7q71bv3fwddkp2863ylry2ivds00f8sjy8npjpdbkailxm21"; }; - # backported from https://github.com/megastep/makeself/commit/77156e28ff21231c400423facc7049d9c60fd1bd - patches = [ ./Use-rm-from-PATH.patch ]; + patchPhase = "patchShebangs test"; - postPatch = '' - sed -e "s|^HEADER=.*|HEADER=$out/share/${pname}-${version}/makeself-header.sh|" -i makeself.sh - ''; + doCheck = true; + checkTarget = "test"; installPhase = '' mkdir -p $out/{bin,share/{${pname}-${version},man/man1}} @@ -26,6 +25,10 @@ stdenv.mkDerivation rec { cp makeself-header.sh $out/share/${pname}-${version} ''; + fixupPhase = '' + sed -e "s|^HEADER=.*|HEADER=$out/share/${pname}-${version}/makeself-header.sh|" -i $out/bin/makeself + ''; + meta = with stdenv.lib; { homepage = "http://megastep.org/makeself"; description = "Utility to create self-extracting packages"; -- cgit v1.2.3 From cd49c481e18efa4f3fe9850d1d798d3244efefb3 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 28 Apr 2020 01:30:57 +0100 Subject: emacsPackages.filesets-plus: Remove package It's refering to an unversioned emacswiki file with the wrong hash. --- .../editors/emacs-modes/filesets-plus/default.nix | 22 ---------------------- .../editors/emacs-modes/manual-packages.nix | 2 -- 2 files changed, 24 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/filesets-plus/default.nix diff --git a/pkgs/applications/editors/emacs-modes/filesets-plus/default.nix b/pkgs/applications/editors/emacs-modes/filesets-plus/default.nix deleted file mode 100644 index ad22faf3dff..00000000000 --- a/pkgs/applications/editors/emacs-modes/filesets-plus/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ fetchurl, melpaBuild }: - -melpaBuild { - pname = "filesets-plus"; - version = "20170222.55"; - - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/filesets%2b.el"; - sha256 = "0iajkgh0n3pbrwwxx9rmrrwz8dw2m7jsp4mggnhq7zsb20ighs00"; - name = "filesets+.el"; - }; - - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/filesets-plus+"; - sha256 = "1wn99cb53ykds87lg9mrlfpalrmjj177nwskrnp9wglyqs65lk4g"; - name = "filesets-plus"; - }; - - meta = { - homepage = "https://melpa.org/#/filesets+"; - }; -} diff --git a/pkgs/applications/editors/emacs-modes/manual-packages.nix b/pkgs/applications/editors/emacs-modes/manual-packages.nix index f04319f23de..3f4c0088a7c 100644 --- a/pkgs/applications/editors/emacs-modes/manual-packages.nix +++ b/pkgs/applications/editors/emacs-modes/manual-packages.nix @@ -68,8 +68,6 @@ ess-R-object-popup = callPackage ./ess-R-object-popup { }; - filesets-plus = callPackage ./filesets-plus { }; - font-lock-plus = callPackage ./font-lock-plus { }; ghc-mod = melpaBuild { -- cgit v1.2.3 From 9b52db99a8e25bb133a8ec3b80d3367b8316ecc5 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 28 Apr 2020 01:31:44 +0100 Subject: emacsPackages.hexrgb: Remove package It's refering to an unversioned emacswiki file with the wrong hash. --- .../editors/emacs-modes/hexrgb/default.nix | 23 ---------------------- .../editors/emacs-modes/manual-packages.nix | 2 -- 2 files changed, 25 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/hexrgb/default.nix diff --git a/pkgs/applications/editors/emacs-modes/hexrgb/default.nix b/pkgs/applications/editors/emacs-modes/hexrgb/default.nix deleted file mode 100644 index 8b9ebcd6026..00000000000 --- a/pkgs/applications/editors/emacs-modes/hexrgb/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ fetchurl, lib, melpaBuild }: - -melpaBuild { - pname = "hexrgb"; - version = "20170304.1017"; - - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/hexrgb.el"; - sha256 = "1aj1fsc3wr8174xs45j2wc2mm6f8v6zs40xn0r4qisdw0plmsbsy"; - name = "hexrgb.el"; - }; - - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/hexrgb"; - sha256 = "0mzqslrrf7sc262syj3ja7b7rnbg80dwf2p9bzxdrzx6b8vvsx06"; - name = "hexrgb"; - }; - - meta = { - homepage = "https://melpa.org/#/hexrgb"; - license = lib.licenses.gpl2Plus; - }; -} diff --git a/pkgs/applications/editors/emacs-modes/manual-packages.nix b/pkgs/applications/editors/emacs-modes/manual-packages.nix index 3f4c0088a7c..9711a1ccbb2 100644 --- a/pkgs/applications/editors/emacs-modes/manual-packages.nix +++ b/pkgs/applications/editors/emacs-modes/manual-packages.nix @@ -107,8 +107,6 @@ }; }; - hexrgb = callPackage ./hexrgb { }; - header2 = callPackage ./header2 { }; helm-words = callPackage ./helm-words { }; -- cgit v1.2.3 From 576e67ae75450e0a02efde6c3818dd90517c6551 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 28 Apr 2020 01:31:57 +0100 Subject: emacsPackages.header2: Remove package It's refering to an unversioned emacswiki file with the wrong hash. --- .../editors/emacs-modes/header2/default.nix | 23 ---------------------- .../editors/emacs-modes/manual-packages.nix | 2 -- 2 files changed, 25 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/header2/default.nix diff --git a/pkgs/applications/editors/emacs-modes/header2/default.nix b/pkgs/applications/editors/emacs-modes/header2/default.nix deleted file mode 100644 index 171d8c6b16a..00000000000 --- a/pkgs/applications/editors/emacs-modes/header2/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ fetchurl, lib, melpaBuild }: - -melpaBuild { - pname = "header2"; - version = "20170223.1949"; - - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/header2.el"; - sha256 = "0cv74cfihr13jrgyqbj4x0na659djfyrhflxni6jdbgbysi4zf6k"; - name = "header2.el"; - }; - - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/header2"; - sha256 = "1dg25krx3wxma2l5vb2ji7rpfp17qbrl62jyjpa52cjfsvyp6v06"; - name = "header2"; - }; - - meta = { - homepage = "https://melpa.org/#/header2"; - license = lib.licenses.gpl3; - }; -} diff --git a/pkgs/applications/editors/emacs-modes/manual-packages.nix b/pkgs/applications/editors/emacs-modes/manual-packages.nix index 9711a1ccbb2..993f08fb3d9 100644 --- a/pkgs/applications/editors/emacs-modes/manual-packages.nix +++ b/pkgs/applications/editors/emacs-modes/manual-packages.nix @@ -107,8 +107,6 @@ }; }; - header2 = callPackage ./header2 { }; - helm-words = callPackage ./helm-words { }; icicles = callPackage ./icicles { }; -- cgit v1.2.3 From 7e69b3ff240650971321f6e999c4d1dd96980ee1 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 28 Apr 2020 01:32:17 +0100 Subject: emacsPackages.icicles: Remove package It's refering to an unversioned emacswiki file with the wrong hash. --- .../editors/emacs-modes/icicles/default.nix | 43 ---------------------- .../editors/emacs-modes/manual-packages.nix | 2 - 2 files changed, 45 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/icicles/default.nix diff --git a/pkgs/applications/editors/emacs-modes/icicles/default.nix b/pkgs/applications/editors/emacs-modes/icicles/default.nix deleted file mode 100644 index 94634292228..00000000000 --- a/pkgs/applications/editors/emacs-modes/icicles/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, fetchurl, emacs }: - -let - modules = [ - { name = "icicles.el"; sha256 = "1744n5g2kmv3r261ipa0fhrgnapl0chxz57bbbls3bp30cnnfrs7"; } - { name = "icicles-chg.el"; sha256 = "058sxa8wh3vqr3zy677q6m2lfx4n477rnb8921s1p6wgs55v7dp4"; } - { name = "icicles-cmd1.el"; sha256 = "064hyy8nxvlg298s5qnmk7aczbasfpddhx57jxaldyyzkca3n2h5"; } - { name = "icicles-cmd2.el"; sha256 = "0a77fx0pxyfrg9nxvqvzz247v6cljjfz9dnfs7lc8qgdvksxs261"; } - { name = "icicles-doc1.el"; sha256 = "04j5qvj7pqnjh8h2y2sdgi7x55czdp9xn7yysr3bzcmr1rq5p4bz"; } - { name = "icicles-doc2.el"; sha256 = "1k8vfhi3fa4bzsxr074bw5q6srvq6z6hi61rzlxdw7pah6qf7hcz"; } - { name = "icicles-face.el"; sha256 = "1pvygqzmh6ag0zhfjn1vhdvlhxybwxzj22ah2pc0ls80dlywhi4l"; } - { name = "icicles-fn.el"; sha256 = "02vwa9dx9393d7kxrf443r1lj7y9ihkh25cmd418pwfgmw2yd5s7"; } - { name = "icicles-mac.el"; sha256 = "13nxgg9k5w39lga90jwn1c7v756dqlfln2qh312vfaxfjfijfv9r"; } - { name = "icicles-mcmd.el"; sha256 = "17d4zlf3r09wmarwyc1cbjv0pyklg4cdhwh3h643d4v8mhs5hnil"; } - { name = "icicles-mode.el"; sha256 = "1xfv8nryf5y2gygg02naawzm5qhrkba3h84g43518r1xc6rgbpp6"; } - { name = "icicles-opt.el"; sha256 = "154mgcd1ksnmlyb4ijy2njqq75i8cj4k47phplxsi648pzqnda77"; } - { name = "icicles-var.el"; sha256 = "0f94299q1z0va4v1s5ijpksaqlaz88ay1qbmlzq0i2wnxnsliys8"; } - ]; - - forAll = f: map f modules; -in -stdenv.mkDerivation rec { - version = "2019-02-22"; - pname = "icicles"; - - srcs = forAll ({name, sha256}: fetchurl { url = "https://www.emacswiki.org/emacs/download/${name}"; inherit sha256; }); - - buildInputs = [ emacs ]; - - unpackPhase = "for m in $srcs; do cp $m $(echo $m | cut -d- -f2-); done"; - - buildPhase = "emacs --batch -L . -f batch-byte-compile *.el"; - - installPhase = "mkdir -p $out/share/emacs/site-lisp/emacswiki/${pname}-${version}/; cp *.el *.elc $out/share/emacs/site-lisp/emacswiki/${pname}-${version}/"; - - meta = { - homepage = "https://www.emacswiki.org/emacs/Icicles"; - description = "Enhance Emacs minibuffer input with cycling and powerful completion"; - license = stdenv.lib.licenses.gpl2Plus; - platforms = emacs.meta.platforms; - maintainers = with stdenv.lib.maintainers; [ scolobb ]; - }; -} diff --git a/pkgs/applications/editors/emacs-modes/manual-packages.nix b/pkgs/applications/editors/emacs-modes/manual-packages.nix index 993f08fb3d9..1ccc30e50b4 100644 --- a/pkgs/applications/editors/emacs-modes/manual-packages.nix +++ b/pkgs/applications/editors/emacs-modes/manual-packages.nix @@ -109,8 +109,6 @@ helm-words = callPackage ./helm-words { }; - icicles = callPackage ./icicles { }; - lib-requires = callPackage ./lib-requires { }; -- cgit v1.2.3 From fe218d167264ae10fedfaa6ea5339ca2adfbf88f Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 28 Apr 2020 01:32:30 +0100 Subject: emacsPackages.lib-requires: Remove package It's refering to an unversioned emacswiki file with the wrong hash. --- .../editors/emacs-modes/lib-requires/default.nix | 23 ---------------------- .../editors/emacs-modes/manual-packages.nix | 3 --- 2 files changed, 26 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/lib-requires/default.nix diff --git a/pkgs/applications/editors/emacs-modes/lib-requires/default.nix b/pkgs/applications/editors/emacs-modes/lib-requires/default.nix deleted file mode 100644 index 84dae10127e..00000000000 --- a/pkgs/applications/editors/emacs-modes/lib-requires/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ fetchurl, lib, melpaBuild }: - -melpaBuild { - pname = "lib-requires"; - version = "20170307.757"; - - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/lib-requires.el"; - sha256 = "04lrkdjrhsgg7vgvw1mkr9a5m9xlyvjvnj2aj6w453bgmnp1mbvv"; - name = "lib-requires.el"; - }; - - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/lib-requires"; - sha256 = "1g22jh56z8rnq0h80wj10gs38yig1rk9xmk3kmhmm5mm6b14iwdx"; - name = "lib-requires"; - }; - - meta = { - homepage = "https://melpa.org/#/lib-requires"; - license = lib.licenses.gpl2Plus; - }; -} diff --git a/pkgs/applications/editors/emacs-modes/manual-packages.nix b/pkgs/applications/editors/emacs-modes/manual-packages.nix index 1ccc30e50b4..df9ab99029e 100644 --- a/pkgs/applications/editors/emacs-modes/manual-packages.nix +++ b/pkgs/applications/editors/emacs-modes/manual-packages.nix @@ -109,9 +109,6 @@ helm-words = callPackage ./helm-words { }; - lib-requires = - callPackage ./lib-requires { }; - org-mac-link = callPackage ./org-mac-link { }; -- cgit v1.2.3 From 5e62eddcdd3252ebfacb21e63790230e95369c1d Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 28 Apr 2020 01:32:49 +0100 Subject: emacsPackages.thingatpt-plus: Remove package It's refering to an unversioned emacswiki file with the wrong hash. --- .../editors/emacs-modes/manual-packages.nix | 2 -- .../editors/emacs-modes/thingatpt-plus/default.nix | 23 ---------------------- 2 files changed, 25 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix diff --git a/pkgs/applications/editors/emacs-modes/manual-packages.nix b/pkgs/applications/editors/emacs-modes/manual-packages.nix index df9ab99029e..8965bcabdc8 100644 --- a/pkgs/applications/editors/emacs-modes/manual-packages.nix +++ b/pkgs/applications/editors/emacs-modes/manual-packages.nix @@ -123,8 +123,6 @@ sv-kalender = callPackage ./sv-kalender { }; - thingatpt-plus = callPackage ./thingatpt-plus { }; - tramp = callPackage ./tramp { }; yaoddmuse = callPackage ./yaoddmuse { }; diff --git a/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix b/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix deleted file mode 100644 index 820919b5321..00000000000 --- a/pkgs/applications/editors/emacs-modes/thingatpt-plus/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ fetchurl, lib, melpaBuild }: - -melpaBuild { - pname = "thingatpt-plus"; - version = "20170307.1539"; - - src = fetchurl { - url = "https://www.emacswiki.org/emacs/download/thingatpt+.el"; - sha256 = "1k9y354315gvhbdk0m9xpjx24w1bwrnzlnfiils8xgdwnw4py99a"; - name = "thingatpt+.el"; - }; - - recipe = fetchurl { - url = "https://raw.githubusercontent.com/milkypostman/melpa/a5d15f875b0080b12ce45cf696c581f6bbf061ba/recipes/thingatpt+"; - sha256 = "0w031lzjl5phvzsmbbxn2fpziwkmdyxsn08h6b9lxbss1prhx7aa"; - name = "thingatpt-plus"; - }; - - meta = { - homepage = "https://melpa.org/#/thingatpt+"; - license = lib.licenses.gpl2Plus; - }; -} -- cgit v1.2.3 From caeae9076e98c89ac6012248c02ec3edd4fc27e6 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 28 Apr 2020 01:33:03 +0100 Subject: emacsPackages.yaoddmuse: Remove package It's refering to an unversioned emacswiki file with the wrong hash. --- .../editors/emacs-modes/manual-packages.nix | 2 -- .../editors/emacs-modes/yaoddmuse/default.nix | 30 ---------------------- 2 files changed, 32 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/yaoddmuse/default.nix diff --git a/pkgs/applications/editors/emacs-modes/manual-packages.nix b/pkgs/applications/editors/emacs-modes/manual-packages.nix index 8965bcabdc8..4ca2d736e65 100644 --- a/pkgs/applications/editors/emacs-modes/manual-packages.nix +++ b/pkgs/applications/editors/emacs-modes/manual-packages.nix @@ -125,8 +125,6 @@ tramp = callPackage ./tramp { }; - yaoddmuse = callPackage ./yaoddmuse { }; - zeitgeist = callPackage ./zeitgeist { }; # From old emacsPackages (pre emacsPackagesNg) diff --git a/pkgs/applications/editors/emacs-modes/yaoddmuse/default.nix b/pkgs/applications/editors/emacs-modes/yaoddmuse/default.nix deleted file mode 100644 index 4dc56894914..00000000000 --- a/pkgs/applications/editors/emacs-modes/yaoddmuse/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{stdenv, fetchurl, emacs}: - -stdenv.mkDerivation { - name = "yaoddmuse-0.1.2"; - - src = fetchurl { - url = "http://emacswiki.org/emacs/download/yaoddmuse.el"; - sha256 = "0vlllq3xmnlni0ws226pqxj68nshclbl5rgqv6y11i3yvzgiazr6"; - }; - - phases = [ "buildPhase" "installPhase"]; - - buildInputs = [ emacs ]; - - buildPhase = '' - cp $src yaoddmuse.el - emacs --batch -f batch-byte-compile yaoddmuse.el - ''; - - installPhase = '' - install -d $out/share/emacs/site-lisp - install yaoddmuse.el $out/share/emacs/site-lisp - ''; - - meta = { - description = "Comprehensive Emacs integration with Oddmuse wikis"; - homepage = "http://emacswiki.org/emacs/Yaoddmuse"; - platforms = stdenv.lib.platforms.all; - }; -} -- cgit v1.2.3 From 8fd2c89b5433feed76a110383adef6d55fb54cca Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 28 Apr 2020 04:39:48 +0200 Subject: python3.pkgs.pyusb: remove unnecessary libusb-compat dependency It was added in https://github.com/NixOS/nixpkgs/commit/4d7cc55344a18142b4b4120cfe81b18344d78b0b without any rationale. python2.pkgs.nxt-python seems to build without it. Maybe it for some reason uses the libusb-0.1 backend but propagating the compat library would not enable that. --- pkgs/development/python-modules/pyusb/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyusb/default.nix b/pkgs/development/python-modules/pyusb/default.nix index d646f7930f9..424bdd9266e 100644 --- a/pkgs/development/python-modules/pyusb/default.nix +++ b/pkgs/development/python-modules/pyusb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchPypi, buildPythonPackage, libusb, libusb1 }: +{ stdenv, fetchPypi, buildPythonPackage, libusb1 }: buildPythonPackage rec { pname = "pyusb"; @@ -17,8 +17,6 @@ buildPythonPackage rec { sed -i -e "s|find_library=None|find_library=lambda _:\"$libusb\"|" usb/backend/libusb1.py ''; - propagatedBuildInputs = [ libusb ]; - # No tests included doCheck = false; -- cgit v1.2.3 From 3dc1caa68337b88ecc12b7fe14b1f13bacf05307 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 28 Apr 2020 04:47:19 +0200 Subject: python3.pkgs.pyusb: update the homepage --- pkgs/development/python-modules/pyusb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyusb/default.nix b/pkgs/development/python-modules/pyusb/default.nix index 424bdd9266e..624090e98aa 100644 --- a/pkgs/development/python-modules/pyusb/default.nix +++ b/pkgs/development/python-modules/pyusb/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Python USB access module (wraps libusb 1.0)"; # can use other backends - homepage = "http://pyusb.sourceforge.net/"; + homepage = "https://pyusb.github.io/pyusb/"; license = licenses.bsd3; maintainers = with maintainers; [ bjornfor ]; }; -- cgit v1.2.3 From 4f422e4efb539a88f978603d375a80f08b5270dc Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 28 Apr 2020 05:31:50 +0200 Subject: lutris: remove duplicate libusb --- pkgs/applications/misc/lutris/chrootenv.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/lutris/chrootenv.nix b/pkgs/applications/misc/lutris/chrootenv.nix index 2861991cc41..84246f4ba12 100644 --- a/pkgs/applications/misc/lutris/chrootenv.nix +++ b/pkgs/applications/misc/lutris/chrootenv.nix @@ -92,7 +92,7 @@ in buildFHSUserEnv { multiPkgs = pkgs: with pkgs; [ # Common libsndfile libtheora libogg libvorbis libopus libGLU libpcap libpulseaudio - libao libusb libevdev udev libgcrypt libxml2 libusb libpng libmpeg2 libv4l + libao libevdev udev libgcrypt libxml2 libusb libpng libmpeg2 libv4l libjpeg libxkbcommon libass libcdio libjack2 libsamplerate libzip libmad libaio libcap libtiff libva libgphoto2 libxslt libsndfile giflib zlib glib alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils -- cgit v1.2.3 From e89e2edc7349c0df15fa03b8229c370340547538 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 28 Apr 2020 05:29:39 +0200 Subject: libusb-compat-0_1: rename from libusb --- .../blockchains/monero-gui/default.nix | 4 +- pkgs/applications/blockchains/monero/default.nix | 4 +- .../graphics/sane/backends/brscan4/default.nix | 6 +-- pkgs/applications/graphics/sane/frontends.nix | 4 +- pkgs/applications/graphics/sane/xsane.nix | 4 +- pkgs/applications/misc/digitalbitbox/default.nix | 4 +- pkgs/applications/misc/garmin-plugin/default.nix | 4 +- pkgs/applications/misc/golden-cheetah/default.nix | 10 ++--- pkgs/applications/misc/lutris/chrootenv.nix | 2 +- pkgs/applications/misc/nut/default.nix | 6 +-- pkgs/applications/misc/qlandkartegt/garmindev.nix | 4 +- pkgs/applications/misc/qlcplus/default.nix | 4 +- pkgs/applications/misc/subsurface/default.nix | 4 +- pkgs/applications/radio/sdrangel/default.nix | 4 +- pkgs/applications/radio/soapysdr/default.nix | 4 +- pkgs/applications/radio/welle-io/default.nix | 4 +- pkgs/applications/science/math/cemu/default.nix | 4 +- .../science/robotics/gazebo/default.nix | 4 +- pkgs/applications/video/kodi/default.nix | 6 +-- pkgs/development/arduino/arduino-core/default.nix | 8 ++-- pkgs/development/libraries/garmintools/default.nix | 4 +- pkgs/development/libraries/hamlib/default.nix | 4 +- pkgs/development/libraries/libftdi/default.nix | 6 +-- pkgs/development/libraries/libnfc/default.nix | 4 +- pkgs/development/libraries/libusb-compat/0.1.nix | 47 ++++++++++++++++++++++ pkgs/development/libraries/libusb/default.nix | 47 ---------------------- pkgs/development/libraries/lirc/default.nix | 4 +- pkgs/development/libraries/openct/default.nix | 4 +- pkgs/development/libraries/scmccid/default.nix | 4 +- pkgs/development/libraries/unicap/default.nix | 4 +- pkgs/development/misc/msp430/mspdebug.nix | 4 +- pkgs/development/mobile/webos/novacomd.nix | 4 +- pkgs/development/mobile/xpwn/default.nix | 4 +- .../development/tools/analysis/radare2/default.nix | 4 +- pkgs/development/tools/misc/avrdude/default.nix | 4 +- pkgs/development/tools/misc/blackmagic/default.nix | 4 +- .../tools/misc/dfu-programmer/default.nix | 4 +- .../tools/misc/micronucleus/default.nix | 4 +- .../tools/misc/teensy-loader-cli/default.nix | 4 +- .../tools/misc/wishbone-tool/default.nix | 4 +- pkgs/development/tools/misc/xc3sprog/default.nix | 4 +- pkgs/misc/cups/drivers/samsung/1.00.36/default.nix | 6 +-- pkgs/misc/cups/drivers/samsung/1.00.37.nix | 6 +-- pkgs/misc/cups/drivers/samsung/4.01.17.nix | 4 +- pkgs/misc/drivers/epkowa/default.nix | 4 +- pkgs/misc/drivers/gutenprint/default.nix | 4 +- pkgs/os-specific/linux/g15daemon/default.nix | 4 +- pkgs/servers/monitoring/lcdproc/default.nix | 4 +- pkgs/tools/bluetooth/obex-data-server/default.nix | 4 +- pkgs/tools/bluetooth/openobex/default.nix | 4 +- pkgs/tools/misc/gnokii/default.nix | 4 +- pkgs/tools/misc/grub/2.0x.nix | 4 +- pkgs/tools/misc/grub/trusted.nix | 4 +- pkgs/tools/misc/pk2cmd/default.nix | 6 +-- pkgs/tools/misc/sixpair/default.nix | 4 +- pkgs/tools/misc/urjtag/default.nix | 4 +- pkgs/tools/misc/xburst-tools/default.nix | 4 +- pkgs/tools/security/gnupg/20.nix | 4 +- pkgs/tools/security/libacr38u/default.nix | 4 +- pkgs/tools/security/pcsc-scm-scl011/default.nix | 4 +- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 62 files changed, 176 insertions(+), 175 deletions(-) create mode 100644 pkgs/development/libraries/libusb-compat/0.1.nix delete mode 100644 pkgs/development/libraries/libusb/default.nix diff --git a/pkgs/applications/blockchains/monero-gui/default.nix b/pkgs/applications/blockchains/monero-gui/default.nix index 48a6d81b6ba..cfd3998ee36 100644 --- a/pkgs/applications/blockchains/monero-gui/default.nix +++ b/pkgs/applications/blockchains/monero-gui/default.nix @@ -5,7 +5,7 @@ , qtquickcontrols, qtquickcontrols2 , monero, unbound, readline, boost, libunwind , libsodium, pcsclite, zeromq, cppzmq -, hidapi, libusb, protobuf, randomx +, hidapi, libusb-compat-0_1, protobuf, randomx }: with stdenv.lib; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { qtxmlpatterns monero unbound readline boost libunwind libsodium pcsclite zeromq - cppzmq hidapi libusb protobuf randomx + cppzmq hidapi libusb-compat-0_1 protobuf randomx ]; NIX_CFLAGS_COMPILE = [ "-Wno-error=format-security" ]; diff --git a/pkgs/applications/blockchains/monero/default.nix b/pkgs/applications/blockchains/monero/default.nix index 2a04beb9379..d1abd395657 100644 --- a/pkgs/applications/blockchains/monero/default.nix +++ b/pkgs/applications/blockchains/monero/default.nix @@ -2,7 +2,7 @@ , cmake, pkgconfig , boost, miniupnpc, openssl, unbound, cppzmq , zeromq, pcsclite, readline, libsodium, hidapi -, pythonProtobuf, randomx, rapidjson, libusb +, pythonProtobuf, randomx, rapidjson, libusb-compat-0_1 , CoreData, IOKit, PCSC }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { boost miniupnpc openssl unbound cppzmq zeromq pcsclite readline libsodium hidapi randomx rapidjson - pythonProtobuf libusb + pythonProtobuf libusb-compat-0_1 ] ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit CoreData PCSC ]; cmakeFlags = [ diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix index 22e8a2ca536..2ada41ac98a 100644 --- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix +++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb }: +{ stdenv, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb-compat-0_1 }: let myPatchElf = file: with stdenv.lib; '' @@ -30,13 +30,13 @@ in stdenv.mkDerivation rec { ''; nativeBuildInputs = [ makeWrapper patchelf coreutils udevRules ]; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; dontBuild = true; patchPhase = '' ${myPatchElf "opt/brother/scanner/brscan4/brsaneconfig4"} - RPATH=${libusb.out}/lib + RPATH=${libusb-compat-0_1.out}/lib for a in usr/lib64/sane/*.so*; do if ! test -L $a; then patchelf --set-rpath $RPATH $a diff --git a/pkgs/applications/graphics/sane/frontends.nix b/pkgs/applications/graphics/sane/frontends.nix index 188431bda6c..885dff311b8 100644 --- a/pkgs/applications/graphics/sane/frontends.nix +++ b/pkgs/applications/graphics/sane/frontends.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, sane-backends, libX11, gtk2, pkgconfig, libusb ? null }: +{ stdenv, fetchurl, sane-backends, libX11, gtk2, pkgconfig, libusb-compat-0_1 ? null }: stdenv.mkDerivation rec { pname = "sane-frontends"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ sane-backends libX11 gtk2 ] - ++ stdenv.lib.optional (libusb != null) libusb; + ++ stdenv.lib.optional (libusb-compat-0_1 != null) libusb-compat-0_1; nativeBuildInputs = [ pkgconfig ]; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/sane/xsane.nix b/pkgs/applications/graphics/sane/xsane.nix index 22a8f4dc3bd..04d19dee8a8 100644 --- a/pkgs/applications/graphics/sane/xsane.nix +++ b/pkgs/applications/graphics/sane/xsane.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, sane-backends, sane-frontends, libX11, gtk2, pkgconfig, libpng -, libusb ? null +, libusb-compat-0_1 ? null , gimpSupport ? false, gimp ? null }: @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [libpng sane-backends sane-frontends libX11 gtk2 ] - ++ (if libusb != null then [libusb] else []) + ++ (if libusb-compat-0_1 != null then [libusb-compat-0_1] else []) ++ stdenv.lib.optional gimpSupport gimp; meta = { diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix index a6ae4530655..95159d1927a 100644 --- a/pkgs/applications/misc/digitalbitbox/default.nix +++ b/pkgs/applications/misc/digitalbitbox/default.nix @@ -7,7 +7,7 @@ , libtool , qrencode , udev -, libusb +, libusb-compat-0_1 , makeWrapper , pkgconfig , qtbase @@ -70,7 +70,7 @@ in stdenv.mkDerivation rec { libevent libtool udev - libusb + libusb-compat-0_1 qrencode qtbase diff --git a/pkgs/applications/misc/garmin-plugin/default.nix b/pkgs/applications/misc/garmin-plugin/default.nix index ba6868b62f6..95cbdd9c19b 100644 --- a/pkgs/applications/misc/garmin-plugin/default.nix +++ b/pkgs/applications/misc/garmin-plugin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, garmintools, libgcrypt, libusb, pkgconfig, tinyxml, zlib }: +{ stdenv, fetchurl, garmintools, libgcrypt, libusb-compat-0_1, pkgconfig, tinyxml, zlib }: stdenv.mkDerivation { name = "garmin-plugin-0.3.26"; src = fetchurl { @@ -7,7 +7,7 @@ stdenv.mkDerivation { }; sourceRoot = "GarminPlugin-0.3.26/src"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ garmintools libusb libgcrypt tinyxml zlib ]; + buildInputs = [ garmintools libusb-compat-0_1 libgcrypt tinyxml zlib ]; configureFlags = [ "--with-libgcrypt-prefix=${libgcrypt.dev}" "--with-garmintools-incdir=${garmintools}/include" diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix index 3dffc5c77c2..761d05e5f9f 100644 --- a/pkgs/applications/misc/golden-cheetah/default.nix +++ b/pkgs/applications/misc/golden-cheetah/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, mkDerivation , qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools -, qtconnectivity, qtcharts, libusb +, qtconnectivity, qtcharts, libusb-compat-0_1 , yacc, flex, zlib, qmake, makeDesktopItem, makeWrapper }: @@ -27,7 +27,7 @@ in mkDerivation rec { buildInputs = [ qtbase qtsvg qtserialport qtwebengine qtmultimedia qttools zlib - qtconnectivity qtcharts libusb + qtconnectivity qtcharts libusb-compat-0_1 ]; nativeBuildInputs = [ flex makeWrapper qmake yacc ]; @@ -39,9 +39,9 @@ in mkDerivation rec { cp src/gcconfig.pri.in src/gcconfig.pri cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri echo 'QMAKE_LRELEASE = ${qttools.dev}/bin/lrelease' >> src/gcconfig.pri - echo 'LIBUSB_INSTALL = ${libusb}' >> src/gcconfig.pri - echo 'LIBUSB_INCLUDE = ${libusb.dev}/include' >> src/gcconfig.pri - echo 'LIBUSB_LIBS = -L${libusb}/lib -lusb' >> src/gcconfig.pri + echo 'LIBUSB_INSTALL = ${libusb-compat-0_1}' >> src/gcconfig.pri + echo 'LIBUSB_INCLUDE = ${libusb-compat-0_1.dev}/include' >> src/gcconfig.pri + echo 'LIBUSB_LIBS = -L${libusb-compat-0_1}/lib -lusb' >> src/gcconfig.pri sed -i -e '21,23d' qwt/qwtconfig.pri # Removed forced installation to /usr/local # Use qtwebengine instead of qtwebkit diff --git a/pkgs/applications/misc/lutris/chrootenv.nix b/pkgs/applications/misc/lutris/chrootenv.nix index 84246f4ba12..4505432b236 100644 --- a/pkgs/applications/misc/lutris/chrootenv.nix +++ b/pkgs/applications/misc/lutris/chrootenv.nix @@ -92,7 +92,7 @@ in buildFHSUserEnv { multiPkgs = pkgs: with pkgs; [ # Common libsndfile libtheora libogg libvorbis libopus libGLU libpcap libpulseaudio - libao libevdev udev libgcrypt libxml2 libusb libpng libmpeg2 libv4l + libao libevdev udev libgcrypt libxml2 libusb-compat-0_1 libpng libmpeg2 libv4l libjpeg libxkbcommon libass libcdio libjack2 libsamplerate libzip libmad libaio libcap libtiff libva libgphoto2 libxslt libsndfile giflib zlib glib alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix index ce80ae14f23..8f188818d4f 100644 --- a/pkgs/applications/misc/nut/default.nix +++ b/pkgs/applications/misc/nut/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, neon, libusb, openssl, udev, avahi, freeipmi +{ stdenv, fetchurl, pkgconfig, neon, libusb-compat-0_1, openssl, udev, avahi, freeipmi , libtool, makeWrapper, autoreconfHook, fetchpatch }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ neon libusb openssl udev avahi freeipmi ]; + buildInputs = [ neon libusb-compat-0_1 openssl udev avahi freeipmi ]; nativeBuildInputs = [ autoreconfHook libtool pkgconfig makeWrapper ]; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram $out/bin/nut-scanner --prefix LD_LIBRARY_PATH : \ - "$out/lib:${neon}/lib:${libusb.out}/lib:${avahi}/lib:${freeipmi}/lib" + "$out/lib:${neon}/lib:${libusb-compat-0_1.out}/lib:${avahi}/lib:${freeipmi}/lib" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/qlandkartegt/garmindev.nix b/pkgs/applications/misc/qlandkartegt/garmindev.nix index 21378084214..8705abd9259 100644 --- a/pkgs/applications/misc/qlandkartegt/garmindev.nix +++ b/pkgs/applications/misc/qlandkartegt/garmindev.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, libusb }: +{ stdenv, fetchurl, cmake, libusb-compat-0_1 }: stdenv.mkDerivation rec { pname = "garmindev"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/qlcplus/default.nix b/pkgs/applications/misc/qlcplus/default.nix index c0b844d121a..77a24413bdd 100644 --- a/pkgs/applications/misc/qlcplus/default.nix +++ b/pkgs/applications/misc/qlcplus/default.nix @@ -1,5 +1,5 @@ { stdenv, mkDerivation, fetchFromGitHub, qmake, pkgconfig, udev -, qtmultimedia, qtscript, alsaLib, ola, libftdi1, libusb +, qtmultimedia, qtscript, alsaLib, ola, libftdi1, libusb-compat-0_1 , libsndfile, libmad }: @@ -16,7 +16,7 @@ mkDerivation rec { nativeBuildInputs = [ qmake pkgconfig ]; buildInputs = [ - udev qtmultimedia qtscript alsaLib ola libftdi1 libusb libsndfile libmad + udev qtmultimedia qtscript alsaLib ola libftdi1 libusb-compat-0_1 libsndfile libmad ]; qmakeFlags = [ "INSTALLROOT=$(out)" ]; diff --git a/pkgs/applications/misc/subsurface/default.nix b/pkgs/applications/misc/subsurface/default.nix index d262fb74c4b..e189351022b 100644 --- a/pkgs/applications/misc/subsurface/default.nix +++ b/pkgs/applications/misc/subsurface/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchFromGitHub, autoreconfHook, cmake, wrapQtAppsHook, pkgconfig, qmake -, curl, grantlee, libgit2, libusb, libssh2, libxml2, libxslt, libzip, zlib +, curl, grantlee, libgit2, libusb-compat-0_1, libssh2, libxml2, libxslt, libzip, zlib , qtbase, qtconnectivity, qtlocation, qtsvg, qttools, qtwebkit, libXcomposite }: @@ -83,7 +83,7 @@ in stdenv.mkDerivation { buildInputs = [ libdc googlemaps - curl grantlee libgit2 libssh2 libusb libxml2 libxslt libzip + curl grantlee libgit2 libssh2 libusb-compat-0_1 libxml2 libxslt libzip qtbase qtconnectivity qtsvg qttools qtwebkit ]; diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index 7cb64f92f3f..6d0a19334de 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -13,7 +13,7 @@ libav, libiio, libopus, libpulseaudio, -libusb, +libusb-compat-0_1, limesuite, mkDerivation, ocl-icd, @@ -51,7 +51,7 @@ in mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - glew opencv3 libusb boost libopus limesuite libav libiio libpulseaudio + glew opencv3 libusb-compat-0_1 boost libopus limesuite libav libiio libpulseaudio qtbase qtwebsockets qtmultimedia rtl-sdr airspy hackrf fftwFloat codec2' cm256cc serialdv ]; diff --git a/pkgs/applications/radio/soapysdr/default.nix b/pkgs/applications/radio/soapysdr/default.nix index 36df6ad19d3..676f7d3c839 100644 --- a/pkgs/applications/radio/soapysdr/default.nix +++ b/pkgs/applications/radio/soapysdr/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, lndir, makeWrapper , fetchFromGitHub, cmake -, libusb, pkgconfig +, libusb-compat-0_1, pkgconfig , usePython ? false , python, ncurses, swig2 , extraPackages ? [] @@ -25,7 +25,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ cmake makeWrapper pkgconfig ]; - buildInputs = [ libusb ncurses ] + buildInputs = [ libusb-compat-0_1 ncurses ] ++ lib.optionals usePython [ python swig2 ]; propagatedBuildInputs = lib.optional usePython python.pkgs.numpy; diff --git a/pkgs/applications/radio/welle-io/default.nix b/pkgs/applications/radio/welle-io/default.nix index 971399c4a22..05187440899 100644 --- a/pkgs/applications/radio/welle-io/default.nix +++ b/pkgs/applications/radio/welle-io/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig , qtbase, qtcharts, qtmultimedia, qtquickcontrols, qtquickcontrols2 -, faad2, rtl-sdr, soapysdr-with-plugins, libusb, fftwSinglePrec, lame, mpg123 }: +, faad2, rtl-sdr, soapysdr-with-plugins, libusb-compat-0_1, fftwSinglePrec, lame, mpg123 }: let version = "2.1"; @@ -23,7 +23,7 @@ in mkDerivation { faad2 fftwSinglePrec lame - libusb + libusb-compat-0_1 mpg123 qtbase qtcharts diff --git a/pkgs/applications/science/math/cemu/default.nix b/pkgs/applications/science/math/cemu/default.nix index f91e5be5170..b41135229dd 100644 --- a/pkgs/applications/science/math/cemu/default.nix +++ b/pkgs/applications/science/math/cemu/default.nix @@ -4,7 +4,7 @@ , SDL2 , libGL , libarchive -, libusb +, libusb-compat-0_1 , qtbase , qmake , git @@ -33,7 +33,7 @@ mkDerivation rec { SDL2 libGL libarchive - libusb + libusb-compat-0_1 qtbase libpng_apng ]; diff --git a/pkgs/applications/science/robotics/gazebo/default.nix b/pkgs/applications/science/robotics/gazebo/default.nix index aea298b6548..86572e73c75 100644 --- a/pkgs/applications/science/robotics/gazebo/default.nix +++ b/pkgs/applications/science/robotics/gazebo/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, cmake, pkgconfig, boost, protobuf, freeimage , boost-build, boost_process , xorg_sys_opengl, tbb, ogre, tinyxml-2 - , libtar, glxinfo, libusb, libxslt, ignition + , libtar, glxinfo, libusb-compat-0_1, libxslt, ignition , pythonPackages, utillinux # these deps are hidden; cmake doesn't catch them @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { tinyxml-2 libtar glxinfo - libusb + libusb-compat-0_1 libxslt ignition.math2 sdformat diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index c83705ac416..e4da20c8487 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -25,7 +25,7 @@ , rtmpSupport ? true, rtmpdump ? null , sambaSupport ? true, samba ? null , udevSupport ? true, udev ? null -, usbSupport ? false, libusb ? null +, usbSupport ? false, libusb-compat-0_1 ? null , vdpauSupport ? true, libvdpau ? null , useWayland ? false, wayland ? null, wayland-protocols ? null , waylandpp ? null, libxkbcommon ? null @@ -39,7 +39,7 @@ assert pulseSupport -> libpulseaudio != null; assert rtmpSupport -> rtmpdump != null; assert sambaSupport -> samba != null; assert udevSupport -> udev != null; -assert usbSupport -> libusb != null && ! udevSupport; # libusb won't be used if udev is avaliable +assert usbSupport -> libusb-compat-0_1 != null && ! udevSupport; # libusb-compat-0_1 won't be used if udev is avaliable assert vdpauSupport -> libvdpau != null; assert useWayland -> wayland != null && wayland-protocols != null && waylandpp != null && libxkbcommon != null; @@ -189,7 +189,7 @@ in stdenv.mkDerivation { ++ lib.optional rtmpSupport rtmpdump ++ lib.optional sambaSupport samba ++ lib.optional udevSupport udev - ++ lib.optional usbSupport libusb + ++ lib.optional usbSupport libusb-compat-0_1 ++ lib.optional vdpauSupport libvdpau ++ lib.optionals useWayland [ wayland diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index aa472512d14..3512dcbd2bc 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, fetchurl, jdk, ant -, libusb, libusb1, unzip, zlib, ncurses, readline +, libusb-compat-0_1, libusb1, unzip, zlib, ncurses, readline , withGui ? false, gtk2 ? null, withTeensyduino ? false /* Packages needed for Teensyduino */ , upx, fontconfig, xorg, gcc @@ -42,7 +42,7 @@ let glib gtk2 libpng12 - libusb + libusb-compat-0_1 pango udev xorg.libSM @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { }; - buildInputs = [ jdk ant libusb libusb1 unzip zlib ncurses5 readline + buildInputs = [ jdk ant libusb-compat-0_1 libusb1 unzip zlib ncurses5 readline ] ++ stdenv.lib.optionals withTeensyduino [ upx ]; downloadSrcList = builtins.attrValues externalDownloads; downloadDstList = builtins.attrNames externalDownloads; @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { javaPath = lib.makeBinPath [jdk]; # Everything else will be patched into rpath - rpath = (lib.makeLibraryPath [zlib libusb libusb1 readline ncurses5 stdenv.cc.cc]); + rpath = (lib.makeLibraryPath [zlib libusb-compat-0_1 libusb1 readline ncurses5 stdenv.cc.cc]); installPhase = '' mkdir -p $out/share/arduino diff --git a/pkgs/development/libraries/garmintools/default.nix b/pkgs/development/libraries/garmintools/default.nix index a086648c912..aa6ebfd3395 100644 --- a/pkgs/development/libraries/garmintools/default.nix +++ b/pkgs/development/libraries/garmintools/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchurl, libusb }: +{ stdenv, fetchurl, libusb-compat-0_1 }: stdenv.mkDerivation { name = "garmintools-0.10"; src = fetchurl { url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/garmintools/garmintools-0.10.tar.gz"; sha256 = "1vjc8h0z4kx2h52yc3chxn3wh1krn234fg12sggbia9zjrzhpmgz"; }; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; meta = { description = "Provides the ability to communicate with the Garmin Forerunner 305 via the USB interface"; homepage = "https://code.google.com/archive/p/garmintools/"; # community clone at https://github.com/ianmartin/garmintools diff --git a/pkgs/development/libraries/hamlib/default.nix b/pkgs/development/libraries/hamlib/default.nix index 8a359314dee..8ef8b55be52 100644 --- a/pkgs/development/libraries/hamlib/default.nix +++ b/pkgs/development/libraries/hamlib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, perl, python2, swig, gd, libxml2, tcl, libusb, pkgconfig, +{stdenv, fetchurl, perl, python2, swig, gd, libxml2, tcl, libusb-compat-0_1, pkgconfig, boost, libtool, perlPackages }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ perl perlPackages.ExtUtilsMakeMaker python2 swig gd libxml2 - tcl libusb pkgconfig boost libtool ]; + tcl libusb-compat-0_1 pkgconfig boost libtool ]; configureFlags = [ "--with-perl-binding" "--with-python-binding" "--with-tcl-binding" "--with-rigmatrix" ]; diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix index d483cc16f08..88c848397de 100644 --- a/pkgs/development/libraries/libftdi/default.nix +++ b/pkgs/development/libraries/libftdi/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libusb}: +{stdenv, fetchurl, libusb-compat-0_1}: with stdenv; mkDerivation rec { name = "libftdi-0.20"; @@ -8,9 +8,9 @@ with stdenv; mkDerivation rec { sha256 = "13l39f6k6gff30hsgh0wa2z422g9pyl91rh8a8zz6f34k2sxaxii"; }; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; - propagatedBuildInputs = [ libusb ]; + propagatedBuildInputs = [ libusb-compat-0_1 ]; # Hack to avoid TMPDIR in RPATHs. preFixup = ''rm -rf "$(pwd)" ''; diff --git a/pkgs/development/libraries/libnfc/default.nix b/pkgs/development/libraries/libnfc/default.nix index c3661a233af..ed7412d6611 100644 --- a/pkgs/development/libraries/libnfc/default.nix +++ b/pkgs/development/libraries/libnfc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libusb, readline }: +{ stdenv, fetchurl, libusb-compat-0_1, readline }: stdenv.mkDerivation { pname = "libnfc"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "0wj0iwwcpmpalyk61aa7yc6i4p9hgdajkrgnlswgk0vnwbc78pll"; }; - buildInputs = [ libusb readline ]; + buildInputs = [ libusb-compat-0_1 readline ]; meta = with stdenv.lib; { description = "Open source library libnfc for Near Field Communication"; diff --git a/pkgs/development/libraries/libusb-compat/0.1.nix b/pkgs/development/libraries/libusb-compat/0.1.nix new file mode 100644 index 00000000000..2830ef28458 --- /dev/null +++ b/pkgs/development/libraries/libusb-compat/0.1.nix @@ -0,0 +1,47 @@ +{ stdenv +, lib +, fetchFromGitHub +, autoreconfHook +, patchelf +, pkgconfig +, libusb1 +}: + +stdenv.mkDerivation rec { + pname = "libusb-compat"; + version = "0.1.7"; + + outputs = [ "out" "dev" ]; # get rid of propagating systemd closure + outputBin = "dev"; + + nativeBuildInputs = [ autoreconfHook patchelf pkgconfig ]; + + buildInputs = [ libusb1 ]; + + src = fetchFromGitHub { + owner = "libusb"; + repo = "libusb-compat-0.1"; + rev = "v${version}"; + sha256 = "1nybccgjs14b3phhaycq2jx1gym4nf6sghvnv9qdfmlqxacx0jz5"; + }; + + patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./fix-headers.patch; + + # without this, libusb-compat is unable to find libusb1 + postFixup = '' + find $out/lib -name \*.so\* -type f -exec \ + patchelf --set-rpath ${lib.makeLibraryPath buildInputs} {} \; + ''; + + meta = with stdenv.lib; { + homepage = "https://libusb.info/"; + repositories.git = "https://github.com/libusb/libusb-compat-0.1"; + description = "cross-platform user-mode USB device library"; + longDescription = '' + libusb is a cross-platform user-mode library that provides access to USB devices. + The current API is of 1.0 version (libusb-1.0 API), this library is a wrapper exposing the legacy API. + ''; + license = licenses.lgpl2Plus; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libusb/default.nix b/pkgs/development/libraries/libusb/default.nix deleted file mode 100644 index 2830ef28458..00000000000 --- a/pkgs/development/libraries/libusb/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv -, lib -, fetchFromGitHub -, autoreconfHook -, patchelf -, pkgconfig -, libusb1 -}: - -stdenv.mkDerivation rec { - pname = "libusb-compat"; - version = "0.1.7"; - - outputs = [ "out" "dev" ]; # get rid of propagating systemd closure - outputBin = "dev"; - - nativeBuildInputs = [ autoreconfHook patchelf pkgconfig ]; - - buildInputs = [ libusb1 ]; - - src = fetchFromGitHub { - owner = "libusb"; - repo = "libusb-compat-0.1"; - rev = "v${version}"; - sha256 = "1nybccgjs14b3phhaycq2jx1gym4nf6sghvnv9qdfmlqxacx0jz5"; - }; - - patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ./fix-headers.patch; - - # without this, libusb-compat is unable to find libusb1 - postFixup = '' - find $out/lib -name \*.so\* -type f -exec \ - patchelf --set-rpath ${lib.makeLibraryPath buildInputs} {} \; - ''; - - meta = with stdenv.lib; { - homepage = "https://libusb.info/"; - repositories.git = "https://github.com/libusb/libusb-compat-0.1"; - description = "cross-platform user-mode USB device library"; - longDescription = '' - libusb is a cross-platform user-mode library that provides access to USB devices. - The current API is of 1.0 version (libusb-1.0 API), this library is a wrapper exposing the legacy API. - ''; - license = licenses.lgpl2Plus; - platforms = platforms.unix; - }; -} diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index 1aaba1599c0..97079be0962 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, help2man, python3, - alsaLib, xlibsWrapper, libxslt, systemd, libusb, libftdi1 }: + alsaLib, xlibsWrapper, libxslt, systemd, libusb-compat-0_1, libftdi1 }: stdenv.mkDerivation rec { name = "lirc-0.10.1"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig help2man (python3.withPackages (p: with p; [ pyyaml setuptools ])) ]; - buildInputs = [ alsaLib xlibsWrapper libxslt systemd libusb libftdi1 ]; + buildInputs = [ alsaLib xlibsWrapper libxslt systemd libusb-compat-0_1 libftdi1 ]; configureFlags = [ "--sysconfdir=/etc" diff --git a/pkgs/development/libraries/openct/default.nix b/pkgs/development/libraries/openct/default.nix index f8977c1b59c..27a832daf47 100644 --- a/pkgs/development/libraries/openct/default.nix +++ b/pkgs/development/libraries/openct/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, pcsclite, libusb +{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, pcsclite, libusb-compat-0_1 , doxygen, libxslt }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ pcsclite libusb doxygen libxslt ]; + buildInputs = [ pcsclite libusb-compat-0_1 doxygen libxslt ]; preInstall = '' mkdir -p $out/etc diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/development/libraries/scmccid/default.nix index 5b07482507c..0d980d9d1a2 100644 --- a/pkgs/development/libraries/scmccid/default.nix +++ b/pkgs/development/libraries/scmccid/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, patchelf, libusb}: +{stdenv, fetchurl, patchelf, libusb-compat-0_1}: assert stdenv ? cc && stdenv.cc.libc != null; @@ -18,7 +18,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ patchelf ]; installPhase = '' - RPATH=${libusb.out}/lib:${stdenv.cc.libc.out}/lib + RPATH=${libusb-compat-0_1.out}/lib:${stdenv.cc.libc.out}/lib for a in proprietary/*/Contents/Linux/*.so*; do if ! test -L $a; then diff --git a/pkgs/development/libraries/unicap/default.nix b/pkgs/development/libraries/unicap/default.nix index 2c2b814b68d..87ca28fee98 100644 --- a/pkgs/development/libraries/unicap/default.nix +++ b/pkgs/development/libraries/unicap/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libusb, libraw1394, dcraw, intltool, perl, v4l-utils }: +{ stdenv, fetchurl, libusb-compat-0_1, libraw1394, dcraw, intltool, perl, v4l-utils }: stdenv.mkDerivation rec { pname = "libunicap"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "05zcnnm4dfc6idihfi0fq5xka6x86zi89wip2ca19yz768sd33s9"; }; - buildInputs = [ libusb libraw1394 dcraw intltool perl v4l-utils ]; + buildInputs = [ libusb-compat-0_1 libraw1394 dcraw intltool perl v4l-utils ]; patches = [ # Debian has a patch that fixes the build. diff --git a/pkgs/development/misc/msp430/mspdebug.nix b/pkgs/development/misc/msp430/mspdebug.nix index 6bb6b683f55..3c7ff00151a 100644 --- a/pkgs/development/misc/msp430/mspdebug.nix +++ b/pkgs/development/misc/msp430/mspdebug.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libusb, readline ? null }: +{ stdenv, fetchFromGitHub, libusb-compat-0_1, readline ? null }: let version = "0.25"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { sha256 = "0prgwb5vx6fd4bj12ss1bbb6axj2kjyriyjxqrzd58s5jyyy8d3c"; }; - buildInputs = [ libusb readline ]; + buildInputs = [ libusb-compat-0_1 readline ]; makeFlags = [ "PREFIX=$(out)" "INSTALL=install" ] ++ (if readline == null then [ "WITHOUT_READLINE=1" ] else []); diff --git a/pkgs/development/mobile/webos/novacomd.nix b/pkgs/development/mobile/webos/novacomd.nix index 4d62dd305d3..932ec0e59d6 100644 --- a/pkgs/development/mobile/webos/novacomd.nix +++ b/pkgs/development/mobile/webos/novacomd.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchpatch, webos, cmake, pkgconfig, -libusb }: +libusb-compat-0_1 }: stdenv.mkDerivation rec { pname = "novacomd"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig webos.cmake-modules ]; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; cmakeFlags = [ "-DWEBOS_TARGET_MACHINE_IMPL=host" ]; diff --git a/pkgs/development/mobile/xpwn/default.nix b/pkgs/development/mobile/xpwn/default.nix index 9ec5977d594..0c49a29b322 100644 --- a/pkgs/development/mobile/xpwn/default.nix +++ b/pkgs/development/mobile/xpwn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, zlib, libpng, bzip2, libusb, openssl }: +{ stdenv, fetchFromGitHub, cmake, zlib, libpng, bzip2, libusb-compat-0_1, openssl }: stdenv.mkDerivation rec { pname = "xpwn"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { strictDeps = true; nativeBuildInputs = [ cmake ]; - buildInputs = [ zlib libpng bzip2 libusb openssl ]; + buildInputs = [ zlib libpng bzip2 libusb-compat-0_1 openssl ]; meta = with stdenv.lib; { homepage = "http://planetbeing.lighthouseapp.com/projects/15246-xpwn"; diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 37dc9e51bea..48a1f20cfd9 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchFromGitHub , buildPackages , pkgconfig -, libusb, readline, libewf, perl, zlib, openssl +, libusb-compat-0_1, readline, libewf, perl, zlib, openssl , libuv, file, libzip, xxHash , gtk2 ? null, vte ? null, gtkdialog ? null , python3 ? null @@ -84,7 +84,7 @@ let depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ file readline libusb libewf perl zlib openssl libuv ] + buildInputs = [ file readline libusb-compat-0_1 libewf perl zlib openssl libuv ] ++ optional useX11 [ gtkdialog vte gtk2 ] ++ optional rubyBindings [ ruby ] ++ optional pythonBindings [ python3 ] diff --git a/pkgs/development/tools/misc/avrdude/default.nix b/pkgs/development/tools/misc/avrdude/default.nix index bca091d6309..bb0520cf28e 100644 --- a/pkgs/development/tools/misc/avrdude/default.nix +++ b/pkgs/development/tools/misc/avrdude/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, yacc, flex, libusb, libelf, libftdi1, readline +{ stdenv, fetchurl, yacc, flex, libusb-compat-0_1, libelf, libftdi1, readline # docSupport is a big dependency, disabled by default , docSupport ? false, texLive ? null, texinfo ? null, texi2html ? null }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optionals docSupport "--enable-doc"; - buildInputs = [ yacc flex libusb libelf libftdi1 readline ] + buildInputs = [ yacc flex libusb-compat-0_1 libelf libftdi1 readline ] ++ stdenv.lib.optionals docSupport [ texLive texinfo texi2html ]; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/misc/blackmagic/default.nix b/pkgs/development/tools/misc/blackmagic/default.nix index 224cf16d763..6e733cfe28a 100644 --- a/pkgs/development/tools/misc/blackmagic/default.nix +++ b/pkgs/development/tools/misc/blackmagic/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub -, gcc-arm-embedded, libftdi1, libusb, pkgconfig +, gcc-arm-embedded, libftdi1, libusb-compat-0_1, pkgconfig , python, pythonPackages }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { buildInputs = [ libftdi1 - libusb + libusb-compat-0_1 python pythonPackages.intelhex ]; diff --git a/pkgs/development/tools/misc/dfu-programmer/default.nix b/pkgs/development/tools/misc/dfu-programmer/default.nix index 10e6dc0d8b8..a474ccc7e59 100644 --- a/pkgs/development/tools/misc/dfu-programmer/default.nix +++ b/pkgs/development/tools/misc/dfu-programmer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libusb }: +{ stdenv, fetchurl, libusb-compat-0_1 }: let version = "0.7.2"; in @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "dfu-programmer"; inherit version; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; src = fetchurl { url = "mirror://sourceforge/dfu-programmer/${pname}-${version}.tar.gz"; diff --git a/pkgs/development/tools/misc/micronucleus/default.nix b/pkgs/development/tools/misc/micronucleus/default.nix index 9fbafebb10c..890439adc6e 100644 --- a/pkgs/development/tools/misc/micronucleus/default.nix +++ b/pkgs/development/tools/misc/micronucleus/default.nix @@ -1,7 +1,7 @@ { pkgs , stdenv -, libusb +, libusb-compat-0_1 , fetchFromGitHub , lib }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "14msy9amlbflw5mqrbs57b7bby3nsgx43srr7215zyhfdgsla0in"; }; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; makeFlags = stdenv.lib.optionals stdenv.isDarwin [ "CC=cc" ]; installPhase = '' diff --git a/pkgs/development/tools/misc/teensy-loader-cli/default.nix b/pkgs/development/tools/misc/teensy-loader-cli/default.nix index e03320f8429..62c480707cd 100644 --- a/pkgs/development/tools/misc/teensy-loader-cli/default.nix +++ b/pkgs/development/tools/misc/teensy-loader-cli/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, go-md2man, installShellFiles, libusb }: +{ stdenv, fetchFromGitHub, go-md2man, installShellFiles, libusb-compat-0_1 }: stdenv.mkDerivation rec { pname = "teensy-loader-cli"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1yx8vsh6b29pqr4zb6sx47429i9x51hj9psn8zksfz75j5ivfd5i"; }; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; nativeBuildInputs = [ go-md2man installShellFiles ]; diff --git a/pkgs/development/tools/misc/wishbone-tool/default.nix b/pkgs/development/tools/misc/wishbone-tool/default.nix index 8c2e27d6450..d900d14e33c 100644 --- a/pkgs/development/tools/misc/wishbone-tool/default.nix +++ b/pkgs/development/tools/misc/wishbone-tool/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, libusb }: +{ lib, fetchFromGitHub, rustPlatform, libusb-compat-0_1 }: let version = "0.6.9"; @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage { ''; cargoSha256 = "0d5kcwy0cgxqfxf2xysw65ng84q4knhp4fgvh6dwqhf0nsca9gvs"; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; meta = with lib; { description = "Manipulate a Wishbone device over some sort of bridge"; diff --git a/pkgs/development/tools/misc/xc3sprog/default.nix b/pkgs/development/tools/misc/xc3sprog/default.nix index b39e9028afd..1ccd6c2ec4f 100644 --- a/pkgs/development/tools/misc/xc3sprog/default.nix +++ b/pkgs/development/tools/misc/xc3sprog/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, cmake, libusb, libftdi }: +{ stdenv, fetchsvn, cmake, libusb-compat-0_1, libftdi }: # The xc3sprog project doesn't seem to make proper releases, they only put out # prebuilt binary subversion snapshots on sourceforge. @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { rev = version; }; - buildInputs = [ cmake libusb libftdi ]; + buildInputs = [ cmake libusb-compat-0_1 libftdi ]; meta = with stdenv.lib; { description = "Command-line tools for programming FPGAs, microcontrollers and PROMs via JTAG"; diff --git a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix b/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix index 308be5337d0..4088ce700de 100644 --- a/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix +++ b/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cups, libusb, libxml2, perl }: +{ stdenv, fetchurl, cups, libusb-compat-0_1, libxml2, perl }: let @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { buildInputs = [ cups - libusb + libusb-compat-0_1 libxml2 perl ]; @@ -91,7 +91,7 @@ in stdenv.mkDerivation rec { done patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$out/lib/libscmssc.so" - patchelf --set-rpath "$out/lib:${libxml2.out}/lib:${libusb.out}/lib" "$out/lib/sane/libsane-smfp.so.1.0.1" + patchelf --set-rpath "$out/lib:${libxml2.out}/lib:${libusb-compat-0_1.out}/lib" "$out/lib/sane/libsane-smfp.so.1.0.1" ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ ''; diff --git a/pkgs/misc/cups/drivers/samsung/1.00.37.nix b/pkgs/misc/cups/drivers/samsung/1.00.37.nix index b7e75c2a16a..c205560706f 100644 --- a/pkgs/misc/cups/drivers/samsung/1.00.37.nix +++ b/pkgs/misc/cups/drivers/samsung/1.00.37.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cups, libusb, libxml2 }: +{ stdenv, fetchurl, cups, libusb-compat-0_1, libxml2 }: let @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { buildInputs = [ cups - libusb + libusb-compat-0_1 libxml2 ]; @@ -74,7 +74,7 @@ in stdenv.mkDerivation rec { done patchelf --set-rpath "$out/lib:${stdenv.lib.getLib cups}/lib" "$out/lib/libscmssc.so" - patchelf --set-rpath "$out/lib:${libxml2.out}/lib:${libusb.out}/lib" "$out/lib/sane/libsane-smfp.so.1.0.1" + patchelf --set-rpath "$out/lib:${libxml2.out}/lib:${libusb-compat-0_1.out}/lib" "$out/lib/sane/libsane-smfp.so.1.0.1" ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ ''; diff --git a/pkgs/misc/cups/drivers/samsung/4.01.17.nix b/pkgs/misc/cups/drivers/samsung/4.01.17.nix index 755003e4d30..5de93b20cb8 100644 --- a/pkgs/misc/cups/drivers/samsung/4.01.17.nix +++ b/pkgs/misc/cups/drivers/samsung/4.01.17.nix @@ -11,14 +11,14 @@ # } # (This advice was tested on the 1st November 2016.) -{ stdenv, fetchurl, cups, libusb }: +{ stdenv, fetchurl, cups, libusb-compat-0_1 }: # Do not bump lightly! Visit # to see what will break when upgrading. Consider a new versioned attribute. let installationPath = if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64" else "i386"; appendPath = if stdenv.hostPlatform.system == "x86_64-linux" then "64" else ""; - libPath = stdenv.lib.makeLibraryPath [ cups libusb ] + ":$out/lib:${stdenv.cc.cc.lib}/lib${appendPath}"; + libPath = stdenv.lib.makeLibraryPath [ cups libusb-compat-0_1 ] + ":$out/lib:${stdenv.cc.cc.lib}/lib${appendPath}"; in stdenv.mkDerivation rec { pname = "samsung-UnifiedLinuxDriver"; version = "4.01.17"; diff --git a/pkgs/misc/drivers/epkowa/default.nix b/pkgs/misc/drivers/epkowa/default.nix index ecf79a953fe..9724e68a04d 100644 --- a/pkgs/misc/drivers/epkowa/default.nix +++ b/pkgs/misc/drivers/epkowa/default.nix @@ -3,7 +3,7 @@ pkgconfig, libtool, gtk2, libxml2, libxslt, -libusb, +libusb-compat-0_1, sane-backends, rpm, cpio, getopt, @@ -263,7 +263,7 @@ stdenv.mkDerivation rec { gtk2 libxml2 libtool - libusb + libusb-compat-0_1 sane-backends makeWrapper ]; diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix index 96c0968882d..9946f499329 100644 --- a/pkgs/misc/drivers/gutenprint/default.nix +++ b/pkgs/misc/drivers/gutenprint/default.nix @@ -2,7 +2,7 @@ { stdenv, lib, fetchurl, makeWrapper, pkgconfig , ijs, zlib , gimp2Support ? false, gimp -, cupsSupport ? true, cups, libusb, perl +, cupsSupport ? true, cups, libusb-compat-0_1, perl }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = [ ijs zlib ] ++ lib.optionals gimp2Support [ gimp.gtk gimp ] - ++ lib.optionals cupsSupport [ cups libusb perl ]; + ++ lib.optionals cupsSupport [ cups libusb-compat-0_1 perl ]; configureFlags = lib.optionals cupsSupport [ "--disable-static-genppd" # should be harmless on NixOS diff --git a/pkgs/os-specific/linux/g15daemon/default.nix b/pkgs/os-specific/linux/g15daemon/default.nix index d00bf2f7433..c670fc86d13 100644 --- a/pkgs/os-specific/linux/g15daemon/default.nix +++ b/pkgs/os-specific/linux/g15daemon/default.nix @@ -5,7 +5,7 @@ , fetchpatch , patchelf , freetype -, libusb +, libusb-compat-0_1 }: let license = lib.licenses.gpl2; @@ -25,7 +25,7 @@ let sha256 = "1mkrf622n0cmz57lj8w9q82a9dcr1lmyyxbnrghrxzb6gvifnbqk"; }; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; enableParallelBuilding = true; diff --git a/pkgs/servers/monitoring/lcdproc/default.nix b/pkgs/servers/monitoring/lcdproc/default.nix index 927c7945b91..e469ee6b408 100644 --- a/pkgs/servers/monitoring/lcdproc/default.nix +++ b/pkgs/servers/monitoring/lcdproc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, makeWrapper, pkgconfig -, doxygen, freetype, libX11, libftdi, libusb, libusb1, ncurses, perl }: +, doxygen, freetype, libX11, libftdi, libusb-compat-0_1, libusb1, ncurses, perl }: stdenv.mkDerivation rec { pname = "lcdproc"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { "--with-pidfile-dir=/run" ]; - buildInputs = [ freetype libX11 libftdi libusb libusb1 ncurses ]; + buildInputs = [ freetype libX11 libftdi libusb-compat-0_1 libusb1 ncurses ]; nativeBuildInputs = [ autoreconfHook doxygen makeWrapper pkgconfig ]; # In 0.5.9: gcc: error: libbignum.a: No such file or directory diff --git a/pkgs/tools/bluetooth/obex-data-server/default.nix b/pkgs/tools/bluetooth/obex-data-server/default.nix index 15661d6e360..f95869e789c 100644 --- a/pkgs/tools/bluetooth/obex-data-server/default.nix +++ b/pkgs/tools/bluetooth/obex-data-server/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libusb, glib, dbus-glib, bluez, openobex, dbus }: +{ stdenv, fetchurl, pkgconfig, libusb-compat-0_1, glib, dbus-glib, bluez, openobex, dbus }: stdenv.mkDerivation rec { name = "obex-data-server-0.4.6"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libusb glib dbus-glib bluez openobex dbus ]; + buildInputs = [ libusb-compat-0_1 glib dbus-glib bluez openobex dbus ]; patches = [ ./obex-data-server-0.4.6-build-fixes-1.patch ]; diff --git a/pkgs/tools/bluetooth/openobex/default.nix b/pkgs/tools/bluetooth/openobex/default.nix index ccf2eee1bb1..7ac0234852c 100644 --- a/pkgs/tools/bluetooth/openobex/default.nix +++ b/pkgs/tools/bluetooth/openobex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, bluez, libusb, cmake }: +{ stdenv, fetchurl, pkgconfig, bluez, libusb-compat-0_1, cmake }: stdenv.mkDerivation rec { name = "openobex-1.7.2"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ bluez libusb ]; + buildInputs = [ bluez libusb-compat-0_1 ]; configureFlags = [ "--enable-apps" ]; diff --git a/pkgs/tools/misc/gnokii/default.nix b/pkgs/tools/misc/gnokii/default.nix index c0e516a15ad..25c31666191 100644 --- a/pkgs/tools/misc/gnokii/default.nix +++ b/pkgs/tools/misc/gnokii/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, intltool, perl, gettext, libusb, pkgconfig, bluez +{ stdenv, fetchurl, intltool, perl, gettext, libusb-compat-0_1, pkgconfig, bluez , readline, pcsclite, libical, gtk2, glib, libXpm }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - perl intltool gettext libusb + perl intltool gettext libusb-compat-0_1 glib gtk2 pkgconfig bluez readline libXpm pcsclite libical ]; diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index a64df866981..4e00a4ddd49 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, flex, bison, python, autoconf, automake, gnulib, libtool -, gettext, ncurses, libusb, freetype, qemu, lvm2, unifont, pkgconfig +, gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2, unifont, pkgconfig , fuse # only needed for grub-mount , zfs ? null , efiSupport ? false @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ bison flex python pkgconfig autoconf automake ]; - buildInputs = [ ncurses libusb freetype gettext lvm2 fuse libtool ] + buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 fuse libtool ] ++ optional doCheck qemu ++ optional zfsSupport zfs; diff --git a/pkgs/tools/misc/grub/trusted.nix b/pkgs/tools/misc/grub/trusted.nix index 27676c4745b..f14758a3ae7 100644 --- a/pkgs/tools/misc/grub/trusted.nix +++ b/pkgs/tools/misc/grub/trusted.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchgit, autogen, flex, bison, python, autoconf, automake -, gettext, ncurses, libusb, freetype, qemu, lvm2 +, gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2 , for_HP_laptop ? false }: @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autogen flex bison python autoconf automake ]; - buildInputs = [ ncurses libusb freetype gettext lvm2 ] + buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 ] ++ optional doCheck qemu; hardeningDisable = [ "stackprotector" "pic" ]; diff --git a/pkgs/tools/misc/pk2cmd/default.nix b/pkgs/tools/misc/pk2cmd/default.nix index 97628da67f7..8c7e5b8bcf2 100644 --- a/pkgs/tools/misc/pk2cmd/default.nix +++ b/pkgs/tools/misc/pk2cmd/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libusb, makeWrapper}: +{stdenv, fetchurl, libusb-compat-0_1, makeWrapper}: stdenv.mkDerivation { name = "pk2cmd-1.20"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "1yjpi2qshnqfpan4w3ggakkr3znfrx5cxkny92ka7v9na3g2fc4h"; }; - makeFlags = [ "LIBUSB=${libusb.dev}" "linux" ]; + makeFlags = [ "LIBUSB=${libusb-compat-0_1.dev}" "linux" ]; installPhase = '' mkdir -p $out/bin $out/share/pk2 @@ -16,7 +16,7 @@ stdenv.mkDerivation { wrapProgram $out/bin/pk2cmd --prefix PATH : $out/share/pk2 ''; - buildInputs = [ libusb makeWrapper ]; + buildInputs = [ libusb-compat-0_1 makeWrapper ]; meta = { homepage = "https://www.microchip.com/pickit2"; diff --git a/pkgs/tools/misc/sixpair/default.nix b/pkgs/tools/misc/sixpair/default.nix index fafee99db5a..f738ed71ec7 100644 --- a/pkgs/tools/misc/sixpair/default.nix +++ b/pkgs/tools/misc/sixpair/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libusb }: +{ stdenv, fetchurl, libusb-compat-0_1 }: stdenv.mkDerivation { name = "sixpair-2007-04-18"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { # hcitool is depricated patches = [ ./hcitool.patch ]; - buildInputs = [ libusb ]; + buildInputs = [ libusb-compat-0_1 ]; unpackPhase = '' cp $src sixpair.c diff --git a/pkgs/tools/misc/urjtag/default.nix b/pkgs/tools/misc/urjtag/default.nix index 67b25eaca82..2056fb9d0a5 100644 --- a/pkgs/tools/misc/urjtag/default.nix +++ b/pkgs/tools/misc/urjtag/default.nix @@ -1,5 +1,5 @@ { stdenv, autoconf, automake, pkgconfig, gettext, libtool, bison -, flex, which, subversion, fetchsvn, makeWrapper, libftdi, libusb, readline +, flex, which, subversion, fetchsvn, makeWrapper, libftdi, libusb-compat-0_1, readline , python3 , svfSupport ? true , bsdlSupport ? true @@ -19,7 +19,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gettext autoconf automake libtool bison flex which - subversion makeWrapper readline libftdi libusb python3 ]; + subversion makeWrapper readline libftdi libusb-compat-0_1 python3 ]; configureFlags = [ (stdenv.lib.enableFeature svfSupport "svf") diff --git a/pkgs/tools/misc/xburst-tools/default.nix b/pkgs/tools/misc/xburst-tools/default.nix index 48045999329..12acbcfbe1c 100644 --- a/pkgs/tools/misc/xburst-tools/default.nix +++ b/pkgs/tools/misc/xburst-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, libusb, libusb1, autoconf, automake, libconfuse, pkgconfig +{ stdenv, fetchgit, libusb-compat-0_1, libusb1, autoconf, automake, libconfuse, pkgconfig , gccCross ? null }: @@ -30,7 +30,7 @@ stdenv.mkDerivation { dontCrossStrip = true; nativeBuildInputs = [ autoconf automake pkgconfig ]; - buildInputs = [ libusb libusb1 libconfuse ] ++ + buildInputs = [ libusb-compat-0_1 libusb1 libconfuse ] ++ stdenv.lib.optional (gccCross != null) gccCross; meta = { diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix index ea900160752..f5b693fed35 100644 --- a/pkgs/tools/security/gnupg/20.nix +++ b/pkgs/tools/security/gnupg/20.nix @@ -4,7 +4,7 @@ # Each of the dependencies below are optional. # Gnupg can be built without them at the cost of reduced functionality. , pinentry ? null, guiSupport ? false -, openldap ? null, bzip2 ? null, libusb ? null, curl ? null +, openldap ? null, bzip2 ? null, libusb-compat-0_1 ? null, curl ? null }: with stdenv.lib; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ readline zlib libgpgerror libgcrypt libassuan libksba pth - openldap bzip2 libusb curl libiconv ]; + openldap bzip2 libusb-compat-0_1 curl libiconv ]; patches = [ ./gpgkey2ssh-20.patch ]; diff --git a/pkgs/tools/security/libacr38u/default.nix b/pkgs/tools/security/libacr38u/default.nix index 45d0279099f..b56c15af3d6 100644 --- a/pkgs/tools/security/libacr38u/default.nix +++ b/pkgs/tools/security/libacr38u/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, pcsclite , libusb }: +{ stdenv, fetchurl, pkgconfig, pcsclite , libusb-compat-0_1 }: stdenv.mkDerivation { version = "1.7.11"; @@ -12,7 +12,7 @@ stdenv.mkDerivation { doCheck = true; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ pcsclite libusb ]; + buildInputs = [ pcsclite libusb-compat-0_1 ]; preBuild = '' makeFlagsArray=(usbdropdir="$out/pcsc/drivers"); diff --git a/pkgs/tools/security/pcsc-scm-scl011/default.nix b/pkgs/tools/security/pcsc-scm-scl011/default.nix index b400d628fd7..62f4c3e8556 100644 --- a/pkgs/tools/security/pcsc-scm-scl011/default.nix +++ b/pkgs/tools/security/pcsc-scm-scl011/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, libusb }: +{ stdenv, fetchurl, unzip, libusb-compat-0_1 }: let arch = if stdenv.hostPlatform.system == "i686-linux" then "32" @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { cp -r proprietary/*.bundle $out/pcsc/drivers ''; - libPath = stdenv.lib.makeLibraryPath [ libusb ]; + libPath = stdenv.lib.makeLibraryPath [ libusb-compat-0_1 ]; fixupPhase = '' patchelf --set-rpath $libPath \ diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5b26ecb2da6..910a8f3c67c 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -249,6 +249,7 @@ mapAliases ({ libtxc_dxtn = throw "removed 2020-03-16, now integrated in Mesa"; libtxc_dxtn_s2tc = throw "removed 2020-03-16, now integrated in Mesa"; libudev = udev; # added 2018-04-25 + libusb = libusb-compat-0_1; # added 2020-04-28 libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it."; # 2019-12-10 libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # added 2020-04-09 links = links2; # added 2016-01-31 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0628fdaad86..ad6b2b1a53a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13356,7 +13356,7 @@ in liburcu = callPackage ../development/libraries/liburcu { }; - libusb = callPackage ../development/libraries/libusb {}; + libusb-compat-0_1 = callPackage ../development/libraries/libusb-compat/0.1.nix {}; libusb1 = callPackage ../development/libraries/libusb1 { inherit (darwin) libobjc; -- cgit v1.2.3 From 45edbeb81d19c8687d11cc7d56c54f940b7dc1a7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 28 Apr 2020 05:41:00 +0200 Subject: libusb: point alias to libusb1 Until recently, libusb-compat propagated libusb1 and many packages unknowingly used it to obtain libusb1. When https://github.com/NixOS/nixpkgs/pull/82944 removed this evil propagation, it broke many packages with such incorrect assumption. This patch trades the breakage of packages wanting libusb1 caused by the PR for a hopefully less common breakage of the packages relying on the compat library. --- pkgs/top-level/aliases.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 910a8f3c67c..7fbc1e3d398 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -249,7 +249,7 @@ mapAliases ({ libtxc_dxtn = throw "removed 2020-03-16, now integrated in Mesa"; libtxc_dxtn_s2tc = throw "removed 2020-03-16, now integrated in Mesa"; libudev = udev; # added 2018-04-25 - libusb = libusb-compat-0_1; # added 2020-04-28 + libusb = libusb1; # added 2020-04-28 libsexy = throw "libsexy has been removed from nixpkgs, as it's abandoned and no package needed it."; # 2019-12-10 libqmatrixclient = throw "libqmatrixclient was renamed to libquotient"; # added 2020-04-09 links = links2; # added 2016-01-31 -- cgit v1.2.3 From b3f812688c6c30a2a02f6047523ef51afb40df7d Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Mon, 27 Apr 2020 16:39:11 -0500 Subject: kde/{kate,konqueror,okular}: decrease text mimetype preference These .desktop files set InitialPreference>1 which will override other associations even the .desktop appears first in XDG_DATA_DIRS. This applies to: - org.kde.kate.desktop - org.kde.kwrite.desktop - kfmclient_html.desktop - okularApplication_txt.desktop Fixes #86137 --- pkgs/applications/kde/kate.nix | 10 ++++++++++ pkgs/applications/kde/konqueror.nix | 10 +++++++++- pkgs/applications/kde/okular.nix | 9 +++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/kde/kate.nix b/pkgs/applications/kde/kate.nix index f01a57a55d4..e0d0273efde 100644 --- a/pkgs/applications/kde/kate.nix +++ b/pkgs/applications/kde/kate.nix @@ -14,6 +14,16 @@ mkDerivation { maintainers = [ lib.maintainers.ttuegel ]; }; + # InitialPreference values are too high and end up making kate & + # kwrite defaults for anything considered text/plain. Resetting to + # 1, which is the default. + postPatch = '' + substituteInPlace kate/data/org.kde.kate.desktop \ + --replace InitialPreference=9 InitialPreference=1 + substituteInPlace kwrite/data/org.kde.kwrite.desktop \ + --replace InitialPreference=8 InitialPreference=1 + ''; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ libgit2 diff --git a/pkgs/applications/kde/konqueror.nix b/pkgs/applications/kde/konqueror.nix index e6442fea2f9..62ed3db063e 100644 --- a/pkgs/applications/kde/konqueror.nix +++ b/pkgs/applications/kde/konqueror.nix @@ -12,9 +12,17 @@ mkDerivation { kdelibs4support kcmutils khtml kdesu qtwebkit qtwebengine qtx11extras qtscript qtwayland ]; + + # InitialPreference values are too high and any text/html ends up + # opening konqueror, even if firefox or chromium are also available. + # Resetting to 1, which is the default. + postPatch = '' + substituteInPlace kfmclient_html.desktop \ + --replace InitialPreference=9 InitialPreference=1 + ''; + meta = { license = with lib.licenses; [ gpl2 ]; maintainers = with lib.maintainers; [ ]; }; } - diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix index f07df73a255..3bcdb9ca842 100644 --- a/pkgs/applications/kde/okular.nix +++ b/pkgs/applications/kde/okular.nix @@ -18,6 +18,15 @@ mkDerivation { kwindowsystem libkexiv2 libspectre libzip phonon poppler qca-qt5 qtdeclarative qtsvg threadweaver kcrash ] ++ lib.optional (!stdenv.isAarch64) chmlib; + + # InitialPreference values are too high and end up making okular + # default for anything considered text/plain. Resetting to 1, which + # is the default. + postPatch = '' + substituteInPlace generators/txt/okularApplication_txt.desktop \ + --replace InitialPreference=3 InitialPreference=1 + ''; + meta = with lib; { homepage = "http://www.kde.org"; license = with licenses; [ gpl2 lgpl21 fdl12 bsd3 ]; -- cgit v1.2.3 From 1e814e356a309d41de07c2d12f7eb0780b5b4809 Mon Sep 17 00:00:00 2001 From: Christoph Neidahl Date: Tue, 28 Apr 2020 01:48:28 +0200 Subject: palemoon: 28.8.4 -> 28.9.1, add GTK3 option --- .../networking/browsers/palemoon/default.nix | 98 +++++++++++++--------- 1 file changed, 58 insertions(+), 40 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index 7c010b91a1e..b22a35bc54f 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -1,25 +1,28 @@ -{ stdenv, fetchFromGitHub, makeDesktopItem +{ stdenv, lib, fetchgit, makeDesktopItem , pkgconfig, autoconf213, alsaLib, bzip2, cairo , dbus, dbus-glib, ffmpeg, file, fontconfig, freetype , gnome2, gnum4, gtk2, hunspell, libevent, libjpeg , libnotify, libstartup_notification, makeWrapper -, libGLU, libGL, perl, python, libpulseaudio +, libGLU, libGL, perl, python2, libpulseaudio , unzip, xorg, wget, which, yasm, zip, zlib + +, withGTK3 ? false, gtk3 }: let - libPath = stdenv.lib.makeLibraryPath [ ffmpeg ]; + libPath = lib.makeLibraryPath [ ffmpeg ]; + gtkVersion = if withGTK3 then "3" else "2"; in stdenv.mkDerivation rec { pname = "palemoon"; - version = "28.8.4"; + version = "28.9.1"; - src = fetchFromGitHub { - owner = "MoonchildProductions"; - repo = "UXP"; - rev = "PM${version}_Release"; - sha256 = "1k2j4rlgjwkns3a592pbiwwhrpja3fachvzby1his3d1mhdvyc6f"; + src = fetchgit { + url = "https://github.com/MoonchildProductions/Pale-Moon.git"; + rev = "${version}_Release"; + sha256 = "1772by9r9l1l0wmj4hs89r3zyckcbrq1krb09bn3pxvjjywzvkfl"; + fetchSubmodules = true; }; desktopItem = makeDesktopItem { @@ -29,7 +32,7 @@ in stdenv.mkDerivation rec { desktopName = "Pale Moon"; genericName = "Web Browser"; categories = "Application;Network;WebBrowser;"; - mimeType = stdenv.lib.concatStringsSep ";" [ + mimeType = lib.concatStringsSep ";" [ "text/html" "text/xml" "application/xhtml+xml" @@ -40,60 +43,75 @@ in stdenv.mkDerivation rec { ]; }; + nativeBuildInputs = [ + file gnum4 makeWrapper perl pkgconfig python2 wget which + ]; + buildInputs = [ - alsaLib bzip2 cairo dbus dbus-glib ffmpeg file fontconfig freetype - gnome2.GConf gnum4 gtk2 hunspell libevent libjpeg libnotify - libstartup_notification makeWrapper libGLU libGL perl - pkgconfig python libpulseaudio unzip wget which yasm zip zlib - ] ++ (with xorg; [ + alsaLib bzip2 cairo dbus dbus-glib ffmpeg fontconfig freetype + gnome2.GConf gtk2 hunspell libevent libjpeg libnotify + libstartup_notification libGLU libGL + libpulseaudio unzip yasm zip zlib + ] + ++ (with xorg; [ libX11 libXext libXft libXi libXrender libXScrnSaver libXt pixman xorgproto - ]); + ]) + ++ lib.optional withGTK3 gtk3; enableParallelBuilding = true; configurePhase = '' - export MOZBUILD_STATE_PATH=$(pwd)/mozbuild export MOZCONFIG=$(pwd)/mozconfig export MOZ_NOSPAM=1 - export builddir=$(pwd)/pmbuild - echo > $MOZCONFIG " - mk_add_options AUTOCLOBBER=1 - mk_add_options MOZ_OBJDIR=$builddir - ac_add_options --enable-application=palemoon + # Keep this similar to the official .mozconfig file, + # only minor changes for portability are permitted with branding. + # https://developer.palemoon.org/build/linux/ + echo > $MOZCONFIG ' + # Clear this if not a 64bit build + _BUILD_64=${lib.optionalString stdenv.hostPlatform.is64bit "1"} - ac_add_options --enable-optimize='-O2' - - # Please see https://www.palemoon.org/redist.shtml for restrictions when using the official branding. - ac_add_options --enable-official-branding - export MOZILLA_OFFICIAL=1 + # Set GTK Version to 2 or 3 + _GTK_VERSION=${gtkVersion} - ac_add_options --enable-default-toolkit=cairo-gtk2 + # Standard build options for Pale Moon + ac_add_options --enable-application=palemoon + ac_add_options --enable-optimize="-O2 -w" + ac_add_options --enable-default-toolkit=cairo-gtk$_GTK_VERSION ac_add_options --enable-jemalloc ac_add_options --enable-strip - ac_add_options --with-pthreads + ac_add_options --enable-devtools - ac_add_options --disable-tests ac_add_options --disable-eme - ac_add_options --disable-parental-controls - ac_add_options --disable-accessibility ac_add_options --disable-webrtc ac_add_options --disable-gamepad + ac_add_options --disable-tests + ac_add_options --disable-debug ac_add_options --disable-necko-wifi ac_add_options --disable-updater + ac_add_options --with-pthreads + + # Please see https://www.palemoon.org/redist.shtml for restrictions when using the official branding. + ac_add_options --enable-official-branding + export MOZILLA_OFFICIAL=1 + + ac_add_options --x-libraries=${lib.makeLibraryPath [ xorg.libX11 ]} + + export MOZ_PKG_SPECIAL=gtk$_GTK_VERSION - ac_add_options --x-libraries=${xorg.libX11.out}/lib + # + # NixOS-specific adjustments + # ac_add_options --prefix=$out - mk_add_options MOZ_MAKE_FLAGS='-j$NIX_BUILD_CORES' + + mk_add_options MOZ_MAKE_FLAGS="-j$NIX_BUILD_CORES" mk_add_options AUTOCONF=${autoconf213}/bin/autoconf - " + ' ''; - buildPhase = '' - $src/mach build - ''; + buildPhase = "$src/mach build"; installPhase = '' $src/mach install @@ -104,7 +122,7 @@ in stdenv.mkDerivation rec { for n in 16 22 24 32 48 256; do size=$n"x"$n mkdir -p $out/share/icons/hicolor/$size/apps - cp $src/application/palemoon/branding/official/default$n.png \ + cp $src/palemoon/branding/official/default$n.png \ $out/share/icons/hicolor/$size/apps/palemoon.png done @@ -112,7 +130,7 @@ in stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : "${libPath}" ''; - meta = with stdenv.lib; { + meta = with lib; { description = "An Open Source, Goanna-based web browser focusing on efficiency and customization"; longDescription = '' Pale Moon is an Open Source, Goanna-based web browser focusing on -- cgit v1.2.3 From 8a339b4a797b4b2bfcac7142f2835b8271d137e5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 28 Apr 2020 06:36:57 +0200 Subject: =?UTF-8?q?webkitgtk:=202.28.1=20=E2=86=92=202.28.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * https://webkitgtk.org/security/WSA-2020-0005.html * https://webkitgtk.org/2020/04/24/webkitgtk2.28.2-released.html --- pkgs/development/libraries/webkitgtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index f1a5ddfd4a0..84ffd2cd813 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -61,13 +61,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "webkitgtk"; - version = "2.28.1"; + version = "2.28.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz"; - sha256 = "rLwmo+1cE/OeRodc9EepwFQbbPsX+eeIQyNDHLMn89g="; + sha256 = "udI1Jc/Y0iw3tdlkqf6ajOdYMEKi+NOSLnHmu8aMML0="; }; patches = optionals stdenv.isLinux [ -- cgit v1.2.3 From 8d1d6454f38edd0f605b5bef23209d92503f0cb0 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Mon, 27 Apr 2020 17:05:48 -0400 Subject: jid: 0.7.2 -> 0.7.6 --- pkgs/development/tools/jid/default.nix | 6 ++--- pkgs/development/tools/jid/deps.nix | 40 ++++++++++++++++++++++++---------- 2 files changed, 32 insertions(+), 14 deletions(-) diff --git a/pkgs/development/tools/jid/default.nix b/pkgs/development/tools/jid/default.nix index f63d580bca0..e031159d37c 100644 --- a/pkgs/development/tools/jid/default.nix +++ b/pkgs/development/tools/jid/default.nix @@ -2,15 +2,15 @@ buildGoPackage rec { pname = "jid"; - version = "0.7.2"; + version = "0.7.6"; goPackagePath = "github.com/simeji/jid"; src = fetchFromGitHub { owner = "simeji"; repo = "jid"; - rev = version; - sha256 = "0p4srp85ilcafrn9d36rzpzg5k5jd7is93p68hamgxqyiiw6a8fi"; + rev = "v${version}"; + sha256 = "15fgi7cpq5bg2lnpr7rip359xwj2kvlj6j2qzi837c26adnw973x"; }; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/jid/deps.nix b/pkgs/development/tools/jid/deps.nix index a027902d2df..6e2d5514a83 100644 --- a/pkgs/development/tools/jid/deps.nix +++ b/pkgs/development/tools/jid/deps.nix @@ -1,12 +1,12 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) [ { goPackagePath = "github.com/bitly/go-simplejson"; fetch = { type = "git"; url = "https://github.com/bitly/go-simplejson"; - rev = "9db4a59bd4d803ae0c173a7d8a538e056cd59d57"; - sha256 = "0cbnjzjq55jnzk07zdk7nb96yzgpyawm1r6km3xignn8ih4bnn6g"; + rev = "v0.5.0"; + sha256 = "0n9f9dz1jn1jx86d48569nznpjn9fmq3knn7r65xpy7jhih284jj"; }; } { @@ -14,8 +14,26 @@ fetch = { type = "git"; url = "https://github.com/fatih/color"; - rev = "3f9d52f7176a6927daacff70a3e8d1dc2025c53e"; - sha256 = "165ww24x6ba47ji4j14mp3f006ksnmi53ws9280pgd2zcw91nbn8"; + rev = "v1.7.0"; + sha256 = "0v8msvg38r8d1iiq2i5r4xyfx0invhc941kjrsg5gzwvagv55inv"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "v0.0.9"; + sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "v0.0.4"; + sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; }; } { @@ -23,8 +41,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-runewidth"; - rev = "c88d7e5f2e24de48a200a2655ac8a0910be9a0f7"; - sha256 = "14prmzjlv9z31n6caaaq1kwi4p0mp3x4pv5r7d0575lcampa41jw"; + rev = "v0.0.4"; + sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs"; }; } { @@ -32,7 +50,7 @@ fetch = { type = "git"; url = "https://github.com/nsf/termbox-go"; - rev = "60ab7e3d12ed91bc1b2486559c4b3a6b62297577"; + rev = "60ab7e3d12ed"; sha256 = "040064fh7wzdmv8flw6svi007hiqs1cjk1a3k3gpg7gii3npifsl"; }; } @@ -41,7 +59,7 @@ fetch = { type = "git"; url = "https://github.com/nwidger/jsoncolor"; - rev = "75a6de4340e59be95f0884b9cebdda246e0fdf40"; + rev = "75a6de4340e5"; sha256 = "0aiv42xijrqgrxfx6pfyrndpwqv8i1qwsk190jdczyjxlnki2nki"; }; } @@ -50,8 +68,8 @@ fetch = { type = "git"; url = "https://github.com/pkg/errors"; - rev = "059132a15dd08d6704c67711dae0cf35ab991756"; - sha256 = "0bxkbh2rq40kdk8i05am5np77cnskx3571v2k300j5mmj1rl1ijg"; + rev = "v0.8.0"; + sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; }; } ] -- cgit v1.2.3 From fe7f770666bbd940b54a7cd6ef366eb6151ef655 Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Tue, 28 Apr 2020 05:25:38 +0000 Subject: sof-firmware: init at 1.4.2 --- nixos/modules/hardware/all-firmware.nix | 1 + .../linux/firmware/sof-firmware/default.nix | 28 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 31 insertions(+) create mode 100644 pkgs/os-specific/linux/firmware/sof-firmware/default.nix diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix index 16be8bcfdd7..b07edb0f6ac 100644 --- a/nixos/modules/hardware/all-firmware.nix +++ b/nixos/modules/hardware/all-firmware.nix @@ -51,6 +51,7 @@ in { rtlwifi_new-firmware zd1211fw alsa-firmware + sof-firmware openelec-dvb-firmware ] ++ optional (pkgs.stdenv.hostPlatform.isAarch32 || pkgs.stdenv.hostPlatform.isAarch64) raspberrypiWirelessFirmware ++ optionals (versionOlder config.boot.kernelPackages.kernel.version "4.13") [ diff --git a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix new file mode 100644 index 00000000000..73ab46b3c8a --- /dev/null +++ b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl }: + +with stdenv.lib; +stdenv.mkDerivation rec { + pname = "sof-firmware"; + version = "1.4.2"; + + src = fetchurl { + url = "https://www.alsa-project.org/files/pub/misc/sof/${pname}-${version}.tar.bz2"; + sha256 = "1nkh020gjm45vxd6fvmz63hj16ilff2nl5avvsklajjs6xci1sf5"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + rm lib/firmware/intel/{sof/LICENCE,sof-tplg/LICENCE} + mkdir $out + cp -r lib $out/lib + ''; + + meta = with stdenv.lib; { + description = "Sound Open Firmware"; + homepage = "https://www.sofproject.org/"; + license = with licenses; [ bsd3 isc ]; + maintainers = with maintainers; [ lblasc ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ed07788904..a6ba99ce008 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6666,6 +6666,8 @@ in python = python3; }; + sof-firmware = callPackage ../os-specific/linux/firmware/sof-firmware { }; + softhsm = callPackage ../tools/security/softhsm { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) Security; -- cgit v1.2.3 From a217a1ae59599b68d9bf2d2804fdfd44fd4c3c90 Mon Sep 17 00:00:00 2001 From: foxit64 Date: Tue, 28 Apr 2020 08:40:01 +0200 Subject: update telegraf 1.14.0 => 1.14.1 --- pkgs/servers/monitoring/telegraf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index 4785d78ab18..ab94971aa3c 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "telegraf"; - version = "1.14.0"; + version = "1.14.1"; goPackagePath = "github.com/influxdata/telegraf"; @@ -14,7 +14,7 @@ buildGoModule rec { owner = "influxdata"; repo = "telegraf"; rev = "v${version}"; - sha256 = "062j4sm7im4iv5i9afr771724srvwwcqbhkyznlzncaz06mk1sn7"; + sha256 = "17lzz0f9vzyfwr3kgwg6i6361hqzq54jnaaw9rdc132xppdx03nr"; }; modSha256 = "1q7il1x1pfyz15z23cs0kk7zyacn6b3y28b1q52bqi30l1x8bdbp"; -- cgit v1.2.3 From 7c1859020820152c7d5292e2bec78cc1dd3e7034 Mon Sep 17 00:00:00 2001 From: paumr Date: Tue, 28 Apr 2020 08:40:36 +0200 Subject: watson: format with nixpkgs-fmt --- pkgs/applications/office/watson/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix index 160e8210083..e18756d8d17 100644 --- a/pkgs/applications/office/watson/default.nix +++ b/pkgs/applications/office/watson/default.nix @@ -1,4 +1,3 @@ -{ stdenv, pythonPackages, fetchpatch }: with pythonPackages; @@ -14,7 +13,7 @@ buildPythonApplication rec { checkPhase = '' pytest -vs tests - ''; + ''; checkInputs = [ py pytest pytest-datafiles mock pytest-mock pytestrunner ]; propagatedBuildInputs = [ requests click arrow ]; @@ -23,6 +22,6 @@ buildPythonApplication rec { homepage = "https://tailordev.github.io/Watson/"; description = "A wonderful CLI to track your time!"; license = licenses.mit; - maintainers = with maintainers; [ mguentner nathyong ] ; + maintainers = with maintainers; [ mguentner nathyong ]; }; } -- cgit v1.2.3 From 2d0a06377ad2fda40c62fd2f5885328ea7a54281 Mon Sep 17 00:00:00 2001 From: paumr Date: Tue, 28 Apr 2020 08:46:48 +0200 Subject: watson: added bash/zsh completions --- pkgs/applications/office/watson/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/office/watson/default.nix b/pkgs/applications/office/watson/default.nix index e18756d8d17..52c94ce378e 100644 --- a/pkgs/applications/office/watson/default.nix +++ b/pkgs/applications/office/watson/default.nix @@ -1,3 +1,4 @@ +{ stdenv, pythonPackages, fetchpatch, installShellFiles }: with pythonPackages; @@ -15,8 +16,14 @@ buildPythonApplication rec { pytest -vs tests ''; + postInstall = '' + installShellCompletion --bash --name watson watson.completion + installShellCompletion --zsh --name _watson watson.zsh-completion + ''; + checkInputs = [ py pytest pytest-datafiles mock pytest-mock pytestrunner ]; propagatedBuildInputs = [ requests click arrow ]; + nativeBuildInputs = [ installShellFiles ]; meta = with stdenv.lib; { homepage = "https://tailordev.github.io/Watson/"; -- cgit v1.2.3 From c0a838df38c03cb269061905510c33dd071b517a Mon Sep 17 00:00:00 2001 From: talyz Date: Tue, 28 Apr 2020 09:05:26 +0200 Subject: nixos/gitlab: Fix services.gitlab.enableStartTLSAuto 'toString false' results in an empty string, which, in this context, is a syntax error. Use boolToString instead. Fixes #86160 --- nixos/modules/services/misc/gitlab.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index aa958985379..730166b04d2 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -180,7 +180,7 @@ let ${optionalString (cfg.smtp.passwordFile != null) ''password: "@smtpPassword@",''} domain: "${cfg.smtp.domain}", ${optionalString (cfg.smtp.authentication != null) "authentication: :${cfg.smtp.authentication},"} - enable_starttls_auto: ${toString cfg.smtp.enableStartTLSAuto}, + enable_starttls_auto: ${boolToString cfg.smtp.enableStartTLSAuto}, ca_file: "/etc/ssl/certs/ca-certificates.crt", openssl_verify_mode: '${cfg.smtp.opensslVerifyMode}' } -- cgit v1.2.3 From 9c3bb10d9a51d28ce849fd21af238c2608882564 Mon Sep 17 00:00:00 2001 From: David Arroyo Date: Sun, 26 Apr 2020 02:56:46 +0000 Subject: ocamlPackages.tsdl: 0.9.4 -> 0.9.7 From the release notes: * Require OCaml 4.03 and handle stdlib deprecations. * Drop result depency. * Drop ocb-stubblr dependency The library has also been re-licensed from BSD3 to ISC. --- pkgs/development/ocaml-modules/tsdl/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix index 1bac71d301f..f614c476140 100644 --- a/pkgs/development/ocaml-modules/tsdl/default.nix +++ b/pkgs/development/ocaml-modules/tsdl/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg, ctypes, result, SDL2, pkgconfig, ocb-stubblr }: -if !stdenv.lib.versionAtLeast ocaml.version "4.02" +if !stdenv.lib.versionAtLeast ocaml.version "4.03" then throw "tsdl is not available for OCaml ${ocaml.version}" else let pname = "tsdl"; - version = "0.9.4"; + version = "0.9.7"; webpage = "https://erratique.ch/software/${pname}"; in @@ -15,11 +15,11 @@ stdenv.mkDerivation { src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "13af37w2wybx8yzgjr5zz5l50402ldl614qiwphl1q69hig5mag2"; + sha256 = "1zwv0ixkigh1gzk5n49rwvz2f2m62jdkkqg40j7dclg4gri7691f"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ocaml findlib ocamlbuild topkg result ocb-stubblr ]; + buildInputs = [ ocaml findlib ocamlbuild topkg ]; propagatedBuildInputs = [ SDL2 ctypes ]; preConfigure = '' @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { homepage = webpage; description = "Thin bindings to the cross-platform SDL library"; - license = licenses.bsd3; + license = licenses.isc; platforms = ocaml.meta.platforms or []; }; } -- cgit v1.2.3 From 5933af631d690ea9cc5138ae779f55deb4e1eefe Mon Sep 17 00:00:00 2001 From: Enno Lohmeier Date: Tue, 28 Apr 2020 10:14:22 +0200 Subject: kapacitor: 1.5.1 -> 1.5.4 --- pkgs/servers/monitoring/kapacitor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/kapacitor/default.nix b/pkgs/servers/monitoring/kapacitor/default.nix index eb4face42aa..93f0531887c 100644 --- a/pkgs/servers/monitoring/kapacitor/default.nix +++ b/pkgs/servers/monitoring/kapacitor/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "kapacitor"; - version = "1.5.1"; + version = "1.5.4"; goPackagePath = "github.com/influxdata/kapacitor"; @@ -10,14 +10,14 @@ buildGoPackage rec { owner = "influxdata"; repo = "kapacitor"; rev = "v${version}"; - sha256 = "17f3my1zmqmcx7qqhdcq8n73l60bsxnnxqgvnw0cnf0xsa5g1yks"; + sha256 = "1sd0gwqwa2bk81lshs8cy49mk1nh4azjkk0283rh0rkimy90l0zz"; }; meta = with lib; { description = "Open source framework for processing, monitoring, and alerting on time series data"; license = licenses.mit; homepage = "https://influxdata.com/time-series-platform/kapacitor/"; - maintainers = with maintainers; [offline]; + maintainers = with maintainers; [ offline ]; platforms = with platforms; linux; }; } -- cgit v1.2.3 From ca388c9fced8f51497e0c30f3a153628fc7713a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 25 Apr 2020 11:32:24 +0100 Subject: gox: 20181025 -> 1.0.1 --- pkgs/development/tools/gox/default.nix | 11 ++++------- pkgs/development/tools/gox/deps.nix | 11 ----------- 2 files changed, 4 insertions(+), 18 deletions(-) delete mode 100644 pkgs/development/tools/gox/deps.nix diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix index ac4e2c582c4..7c800df0a6b 100644 --- a/pkgs/development/tools/gox/default.nix +++ b/pkgs/development/tools/gox/default.nix @@ -1,25 +1,22 @@ { stdenv, buildGoPackage, fetchFromGitHub }: -buildGoPackage { +buildGoPackage rec { pname = "gox"; - version = "20181025"; + version = "1.0.1"; goPackagePath = "github.com/mitchellh/gox"; src = fetchFromGitHub { owner = "mitchellh"; repo = "gox"; - rev = "9cc487598128d0963ff9dcc51176e722788ec645"; - sha256 = "18indkdwq2m1wy95d71lgbf46jxxrfc5km1fys5laapz993h77v6"; + rev = "v${version}"; + sha256 = "0mkh81hd7kn45dz7b6yhzqsg2mvg1g6pwx89jjigxrnqhyg9vrl7"; }; - goDeps = ./deps.nix; - meta = with stdenv.lib; { homepage = "https://github.com/mitchellh/gox"; description = "A dead simple, no frills Go cross compile tool"; platforms = platforms.all; license = licenses.mpl20; }; - } diff --git a/pkgs/development/tools/gox/deps.nix b/pkgs/development/tools/gox/deps.nix deleted file mode 100644 index c4991e38ff0..00000000000 --- a/pkgs/development/tools/gox/deps.nix +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - goPackagePath = "github.com/mitchellh/iochan"; - fetch = { - type = "git"; - url = "https://github.com/mitchellh/iochan"; - rev = "87b45ffd0e9581375c491fef3d32130bb15c5bd7"; - sha256 = "1435kdcx3j1xgr6mm5c7w7hjx015jb20yfqlkp93q143hspf02fx"; - }; - } -] -- cgit v1.2.3 From 72773b9c975de70ada208d3a62c2a8e1a707e24d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 22 Apr 2020 14:50:32 +0100 Subject: prey-bash-client: remove prey-bash-client is deprecated since 2018 --- nixos/modules/module-list.nix | 1 - nixos/modules/rename.nix | 4 +++ nixos/modules/security/prey.nix | 51 ------------------------------------ pkgs/tools/security/prey/default.nix | 48 --------------------------------- pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 4 insertions(+), 102 deletions(-) delete mode 100644 nixos/modules/security/prey.nix delete mode 100644 pkgs/tools/security/prey/default.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 7244a7e0a89..0cd17775e51 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -196,7 +196,6 @@ ./security/pam_usb.nix ./security/pam_mount.nix ./security/polkit.nix - ./security/prey.nix ./security/rngd.nix ./security/rtkit.nix ./security/wrappers/default.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 410db8fd84e..a946268494e 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -49,6 +49,10 @@ with lib; simply add the brightnessctl package to environment.systemPackages. '') + (mkRemovedOptionModule ["services" "prey" ] '' + prey-bash-client is deprecated upstream + '') + # Do NOT add any option renames here, see top of the file ]; } diff --git a/nixos/modules/security/prey.nix b/nixos/modules/security/prey.nix deleted file mode 100644 index b899ccb6c3e..00000000000 --- a/nixos/modules/security/prey.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.prey; - myPrey = pkgs.prey-bash-client.override { - apiKey = cfg.apiKey; - deviceKey = cfg.deviceKey; - }; -in { - options = { - - services.prey = { - enable = mkOption { - default = false; - type = types.bool; - description = '' - Enables the - shell client. Be sure to specify both API and device keys. - Once enabled, a cron job will run every 15 - minutes to report status information. - ''; - }; - - deviceKey = mkOption { - type = types.str; - description = '' - Device key obtained by visiting - - and clicking on your device. - ''; - }; - - apiKey = mkOption { - type = types.str; - description = '' - API key obtained from - . - ''; - }; - }; - - }; - - config = mkIf cfg.enable { - environment.systemPackages = [ myPrey ]; - services.cron.systemCronJobs = [ "*/15 * * * * root ${myPrey}/prey.sh" ]; - }; - -} diff --git a/pkgs/tools/security/prey/default.nix b/pkgs/tools/security/prey/default.nix deleted file mode 100644 index c6675601231..00000000000 --- a/pkgs/tools/security/prey/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ stdenv, fetchurl, fetchgit, curl, scrot, imagemagick, xawtv, inetutils, makeWrapper, coreutils -, apiKey ? "" -, deviceKey ? "" }: - -# TODO: this should assert keys are set, somehow if set through .override assertion fails -#assert apiKey != ""; -#assert deviceKey != ""; - -let - modulesSrc = fetchgit { - url = "git://github.com/prey/prey-bash-client-modules.git"; - rev = "aba260ef110834cb2e92923a31f50c15970639ee"; - sha256 = "9cb1ad813d052a0a3e3bbdd329a8711ae3272e340379489511f7dd578d911e30"; - }; -in stdenv.mkDerivation rec { - pname = "prey-bash-client"; - version = "0.6.0"; - - src = fetchurl { - url = "https://github.com/prey/prey-bash-client/archive/v${version}.tar.gz"; - sha256 = "09cb15jh4jdwvix9nx048ajkw2r5jaflk68y3rkha541n8n0qwh0"; - }; - - buildInputs = [ curl scrot imagemagick xawtv makeWrapper ]; - - phases = "unpackPhase installPhase"; - - installPhase = '' - substituteInPlace config --replace api_key=\'\' "api_key='${apiKey}'" - substituteInPlace config --replace device_key=\'\' "device_key='${deviceKey}'" - - substituteInPlace prey.sh --replace /bin/bash $(type -Pp bash) - mkdir -p $out/modules - cp -R . $out - cp -R ${modulesSrc}/* $out/modules/ - wrapProgram "$out/prey.sh" \ - --prefix PATH ":" "${stdenv.lib.makeBinPath [ xawtv imagemagick curl scrot inetutils coreutils ]}" \ - --set CURL_CA_BUNDLE "/etc/ssl/certs/ca-certificates.crt" - ''; - - meta = with stdenv.lib; { - homepage = "https://preyproject.com"; - description = "Proven tracking software that helps you find, lock and recover your devices when stolen or missing"; - maintainers = with maintainers; [ domenkozar ]; - license = licenses.gpl3; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0628fdaad86..cce12ffc26c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6025,8 +6025,6 @@ in prettyping = callPackage ../tools/networking/prettyping { }; - prey-bash-client = callPackage ../tools/security/prey { }; - profile-cleaner = callPackage ../tools/misc/profile-cleaner { }; profile-sync-daemon = callPackage ../tools/misc/profile-sync-daemon { }; -- cgit v1.2.3 From 75a0f049122bfaab6ed30a22267b9d0b071ce7d4 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 28 Apr 2020 04:20:00 -0500 Subject: vdirsyncerStable: fix build --- pkgs/tools/misc/vdirsyncer/stable.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/vdirsyncer/stable.nix b/pkgs/tools/misc/vdirsyncer/stable.nix index d3fe47001d1..ada70678e34 100644 --- a/pkgs/tools/misc/vdirsyncer/stable.nix +++ b/pkgs/tools/misc/vdirsyncer/stable.nix @@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec { ''; checkPhase = '' - make DETERMINISTIC_TESTS=true test + make DETERMINISTIC_TESTS=true PYTEST_ARGS="--deselect=tests/system/cli/test_sync.py::test_verbosity" test ''; meta = with lib; { -- cgit v1.2.3 From 7b4aa95e6c3c3fa72a33b5b6acb2c972bcbe5925 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 28 Apr 2020 04:20:00 -0500 Subject: act: 0.2.7 -> 0.2.8 --- pkgs/development/tools/misc/act/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index 885cef99111..8df465c4958 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.7"; + version = "0.2.8"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "v${version}"; - sha256 = "0qx3vwsynmil1h3d2dzvqz0jzshfyy3vin14zjfmd353d915hf06"; + sha256 = "14ird8z8f467spa0kdzjf6lq7pipq7rwxrdk6ppv7y1fxw96qm9x"; }; - modSha256 = "0276dngh29kzgm95d23r8ajjrrkss0v0f0wfq1ribgsxh17v0y5n"; + modSha256 = "09q8dh4g4k0y7mrhwyi9py7zdiipmq91j3f32cn635v2xw6zyg2k"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; -- cgit v1.2.3 From 8d6ba1e4232ed84289cbacbf41b2b886d6701fd3 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 28 Apr 2020 04:20:00 -0500 Subject: vdirsyncer: fix build on darwin --- pkgs/tools/misc/vdirsyncer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix index eee4e5648e9..61c9b9df877 100644 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ b/pkgs/tools/misc/vdirsyncer/default.nix @@ -65,7 +65,7 @@ python3Packages.buildPythonApplication rec { checkPhase = '' rm -rf vdirsyncer - make DETERMINISTIC_TESTS=true test + make DETERMINISTIC_TESTS=true PYTEST_ARGS="--deselect=tests/unit/utils/test_vobject.py::test_replace_uid --deselect=tests/unit/sync/test_sync.py::TestSyncMachine" test ''; meta = with stdenv.lib; { -- cgit v1.2.3 From 7dfada5f078527d608e887e74a1c17b86fa1063f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 28 Apr 2020 10:34:56 +0100 Subject: gopherclient: remove - no updated since 2016 - broken since 2018 --- .../networking/gopher/gopherclient/default.nix | 45 ---------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 47 deletions(-) delete mode 100644 pkgs/applications/networking/gopher/gopherclient/default.nix diff --git a/pkgs/applications/networking/gopher/gopherclient/default.nix b/pkgs/applications/networking/gopher/gopherclient/default.nix deleted file mode 100644 index 40e9401a40d..00000000000 --- a/pkgs/applications/networking/gopher/gopherclient/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, buildGoPackage, fetchgit, makeWrapper, pkgconfig, qtbase, qtdeclarative, qtwebengine }: - -buildGoPackage rec { - pname = "gopherclient"; - version = "2016-10-02"; - rev = "91c41b5542d08001636708e2a5054521a6004702"; - - goPackagePath = "github.com/prologic/gopherclient"; - - src = fetchgit { - inherit rev; - url = "https://github.com/prologic/gopherclient"; - sha256 = "0b1gvxhv4zg930hvric9mmbfp0lnww0sqlkkfbzfkif3wz9ni5y9"; - }; - - nativeBuildInputs = [ makeWrapper pkgconfig ]; - - buildInputs = [ qtbase qtdeclarative qtwebengine ]; - - preBuild = '' - # Generate gopherclient resources with genqrc. - ln -s ${goPackagePath}/vendor/gopkg.in go/src/ - GOBIN="$(pwd)" go install -v gopkg.in/qml.v1/cmd/genqrc - PATH="$(pwd):$PATH" go generate ${goPackagePath} - ''; - - NIX_CFLAGS_COMPILE = [ - # go-qml needs private Qt headers. - "-I${qtbase.dev}/include/QtCore/${qtbase.version}" - ]; - - postInstall = '' - # https://github.com/prologic/gopherclient/#usage - wrapProgram $bin/bin/gopherclient --prefix GODEBUG , cgocheck=0 - ''; - - meta = with stdenv.lib; { - homepage = "https://github.com/prologic/gopherclient"; - description = "Gopher Qt GUI client"; - license = licenses.mit; - maintainers = with maintainers; [ orivej ]; - platforms = platforms.linux; - broken = true; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0628fdaad86..30e211f810c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19412,8 +19412,6 @@ in gopher = callPackage ../applications/networking/gopher/gopher { }; - gopherclient = libsForQt5.callPackage ../applications/networking/gopher/gopherclient { }; - goxel = callPackage ../applications/graphics/goxel { }; gpa = callPackage ../applications/misc/gpa { }; -- cgit v1.2.3 From 5a16436ffb24dc0a129a843dda60cfbab6aef269 Mon Sep 17 00:00:00 2001 From: Bruno Bzeznik Date: Tue, 28 Apr 2020 11:38:21 +0200 Subject: libpsm2: init at 11.2.156 (#85920) * libpsm2: init at 11.2.156 --- pkgs/os-specific/linux/libpsm2/default.nix | 42 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/os-specific/linux/libpsm2/default.nix diff --git a/pkgs/os-specific/linux/libpsm2/default.nix b/pkgs/os-specific/linux/libpsm2/default.nix new file mode 100644 index 00000000000..b9e41380da8 --- /dev/null +++ b/pkgs/os-specific/linux/libpsm2/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchFromGitHub, numactl, pkgconfig }: + +stdenv.mkDerivation rec { + pname = "libpsm2"; + version = "11.2.156"; + ifs_version = "10_10_2_0_44"; + + preConfigure= '' + export UDEVDIR=$out/etc/udev + substituteInPlace ./Makefile --replace "udevrulesdir}" "prefix}/etc/udev"; + ''; + + enableParallelBuilding = true; + + buildInputs = [ numactl pkgconfig ]; + + installFlags = [ + "DESTDIR=$(out)" + "UDEVDIR=/etc/udev" + "LIBPSM2_COMPAT_CONF_DIR=/etc" + ]; + + src = fetchFromGitHub { + owner = "intel"; + repo = "opa-psm2"; + rev = "IFS_RELEASE_${ifs_version}"; + sha256 = "0ckrfzih1ga9yvximxjdh0z05kn9l858ykqiblv18w6ka3gra1xz"; + }; + + postInstall = '' + mv $out/usr/* $out + rmdir $out/usr + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/intel/opa-psm2"; + description = "The PSM2 library supports a number of fabric media and stacks"; + license = with licenses; [ gpl2 bsd3 ]; + platforms = [ "x86_64-linux" ]; + maintainers = [ maintainers.bzizou ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0628fdaad86..dfbc4b8ffd1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2084,6 +2084,8 @@ in xkbd = callPackage ../applications/misc/xkbd { }; + libpsm2 = callPackage ../os-specific/linux/libpsm2 { }; + optar = callPackage ../tools/graphics/optar {}; obinskit = callPackage ../applications/misc/obinskit {}; -- cgit v1.2.3 From 4f5e0efb3c66cd1dff03ca1916295bf1d44c7754 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 28 Apr 2020 10:44:06 +0100 Subject: blsd: remove upstream is dead and package does not build anymore --- pkgs/tools/misc/blsd/default.nix | 29 ----------------------------- pkgs/tools/misc/blsd/deps.nix | 12 ------------ pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 43 deletions(-) delete mode 100644 pkgs/tools/misc/blsd/default.nix delete mode 100644 pkgs/tools/misc/blsd/deps.nix diff --git a/pkgs/tools/misc/blsd/default.nix b/pkgs/tools/misc/blsd/default.nix deleted file mode 100644 index 6e6a9b7c5ab..00000000000 --- a/pkgs/tools/misc/blsd/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, libgit2 }: - -buildGoPackage { - pname = "blsd"; - version = "2017-07-27"; - - goPackagePath = "github.com/junegunn/blsd"; - - src = fetchFromGitHub { - owner = "junegunn"; - repo = "blsd"; - rev = "a2ac619821e502452abdeae9ebab45026893b9e8"; - sha256 = "0b0q6i4i28cjqgxqmwxbps22gp9rcd3jz562q5wvxrwlpbzlls2h"; - }; - - goDeps = ./deps.nix; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libgit2 ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/junegunn/blsd"; - description = "List directories in breadth-first order"; - license = licenses.mit; - maintainers = [ maintainers.magnetophon ]; - platforms = platforms.unix; - broken = true; # since 2020-02-08, libgit2 is incompatible upstream is dead. - }; -} diff --git a/pkgs/tools/misc/blsd/deps.nix b/pkgs/tools/misc/blsd/deps.nix deleted file mode 100644 index d212f213a60..00000000000 --- a/pkgs/tools/misc/blsd/deps.nix +++ /dev/null @@ -1,12 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/libgit2/git2go"; - fetch = { - type = "git"; - url = "https://github.com/libgit2/git2go"; - rev = "14280de4da0f392935854a7cbdd67b2a5505c3a8"; - sha256 = "17ppd7byzir8rhdk645dmggi700scb8f401yiwx8zy81q41dk1qi"; - }; - } -] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0628fdaad86..5ae30b50fe0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1270,8 +1270,6 @@ in blockdiag = with python3Packages; toPythonApplication blockdiag; - blsd = callPackage ../tools/misc/blsd { }; - bluez-alsa = callPackage ../tools/bluetooth/bluez-alsa { }; bluez-tools = callPackage ../tools/bluetooth/bluez-tools { }; -- cgit v1.2.3 From 3ba5bc71303ca9ad249ed74d8fff80deaf254376 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 28 Apr 2020 12:14:39 +0200 Subject: fasttext: 0.9.1 -> 0.9.2 Changelog: https://github.com/facebookresearch/fastText/releases/tag/v0.9.2 --- pkgs/applications/science/machine-learning/fasttext/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/machine-learning/fasttext/default.nix b/pkgs/applications/science/machine-learning/fasttext/default.nix index 2ae5e0eeddc..64124594e1e 100644 --- a/pkgs/applications/science/machine-learning/fasttext/default.nix +++ b/pkgs/applications/science/machine-learning/fasttext/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fasttext"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "facebookresearch"; repo = "fastText"; rev = "v${version}"; - sha256 = "1cbzz98qn8aypp4r5kwwwc9wiq5bwzv51kcsb15xjfs9lz8h3rii"; + sha256 = "07cz2ghfq6amcljaxpdr5chbd64ph513y8zqmibfx2xwfp74xkhn"; }; nativeBuildInputs = [ cmake ]; -- cgit v1.2.3 From 90136f0b7747223424a167443c5e73b3a6e3e76f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 28 Apr 2020 12:16:20 +0200 Subject: python3Packages.fasttext: reuse pname, version, and src from fasttext --- pkgs/development/python-modules/fasttext/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/fasttext/default.nix b/pkgs/development/python-modules/fasttext/default.nix index 050b3873a00..68f0f0e938f 100644 --- a/pkgs/development/python-modules/fasttext/default.nix +++ b/pkgs/development/python-modules/fasttext/default.nix @@ -1,15 +1,7 @@ -{stdenv, buildPythonPackage, fetchFromGitHub, numpy, pybind11}: +{stdenv, buildPythonPackage, fetchFromGitHub, numpy, pkgs, pybind11 }: buildPythonPackage rec { - pname = "fasttext"; - version = "0.9.1"; - - src = fetchFromGitHub { - owner = "facebookresearch"; - repo = "fastText"; - rev = "v${version}"; - sha256 = "1cbzz98qn8aypp4r5kwwwc9wiq5bwzv51kcsb15xjfs9lz8h3rii"; - }; + inherit (pkgs.fasttext) pname version src; buildInputs = [ pybind11 ]; -- cgit v1.2.3 From 3f175184904d925ad21bf07b1c783d2977a5a4c5 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 18 Apr 2020 23:21:06 +1000 Subject: buildGoPackage: use $out instead of $bin --- doc/languages-frameworks/go.xml | 12 ------------ nixos/doc/manual/release-notes/rl-2009.xml | 5 +++++ pkgs/development/go-packages/generic/default.nix | 9 +++------ 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml index 84b146532b1..70c135555ea 100644 --- a/doc/languages-frameworks/go.xml +++ b/doc/languages-frameworks/go.xml @@ -191,18 +191,6 @@ deis = buildGoPackage rec { To extract dependency information from a Go package in automated way use go2nix. It can produce complete derivation and goDeps file for Go programs. - - buildGoPackage produces where bin includes program binaries. You can test build a Go binary as follows: - -$ nix-build -A deis.bin - - or build all outputs with: - -$ nix-build -A deis.all - - bin output will be installed by default with nix-env -i or systemPackages. - - You may use Go packages installed into the active Nix profiles by adding the following to your ~/.bashrc: diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 07f11239366..65cea9ca1c4 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -312,6 +312,11 @@ environment.systemPackages = [ the notmuch.emacs output. + + + The default output of buildGoPackage is now $out instead of $bin. + + diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix index b4ec8bd1706..54d1c743bee 100644 --- a/pkgs/development/go-packages/generic/default.nix +++ b/pkgs/development/go-packages/generic/default.nix @@ -203,15 +203,15 @@ let installPhase = args.installPhase or '' runHook preInstall - mkdir -p $bin + mkdir -p $out dir="$NIX_BUILD_TOP/go/bin" - [ -e "$dir" ] && cp -r $dir $bin + [ -e "$dir" ] && cp -r $dir $out runHook postInstall ''; preFixup = preFixup + '' - find $bin/bin -type f -exec ${removeExpr removeReferences} '{}' + || true + find $out/bin -type f -exec ${removeExpr removeReferences} '{}' + || true ''; strictDeps = true; @@ -235,9 +235,6 @@ let enableParallelBuilding = enableParallelBuilding; - # I prefer to call this dev but propagatedBuildInputs expects $out to exist - outputs = args.outputs or [ "bin" "out" ]; - meta = { # Add default meta information homepage = "https://${goPackagePath}"; -- cgit v1.2.3 From c59c4e358989ce49afd177e6899549fbb8f8bf7f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 28 Apr 2020 11:50:34 +1000 Subject: nixos/*: use $out instead of $bin with buildGoPackage --- nixos/modules/programs/singularity.nix | 4 ++-- .../services/continuous-integration/gitlab-runner.nix | 2 +- nixos/modules/services/misc/confd.nix | 2 +- nixos/modules/services/misc/etcd.nix | 2 +- nixos/modules/services/misc/gitea.nix | 16 ++++++++-------- nixos/modules/services/misc/gogs.nix | 6 +++--- nixos/modules/services/misc/leaps.nix | 2 +- nixos/modules/services/misc/ssm-agent.nix | 3 +-- nixos/modules/services/monitoring/bosun.nix | 2 +- nixos/modules/services/monitoring/grafana-reporter.nix | 2 +- nixos/modules/services/monitoring/grafana.nix | 2 +- .../services/monitoring/prometheus/exporters/snmp.nix | 2 +- nixos/modules/services/monitoring/scollector.nix | 2 +- nixos/modules/services/networking/consul.nix | 8 ++++---- nixos/modules/services/networking/flannel.nix | 6 +++--- nixos/modules/services/networking/skydns.nix | 2 +- nixos/modules/services/security/hologram-agent.nix | 4 ++-- nixos/modules/services/security/hologram-server.nix | 2 +- nixos/modules/services/security/oauth2_proxy.nix | 2 +- nixos/modules/services/web-apps/mattermost.nix | 2 +- nixos/modules/virtualisation/ecs-agent.nix | 3 +-- nixos/modules/virtualisation/lxd.nix | 2 +- nixos/modules/virtualisation/podman.nix | 8 +++----- 23 files changed, 41 insertions(+), 45 deletions(-) diff --git a/nixos/modules/programs/singularity.nix b/nixos/modules/programs/singularity.nix index b27e122bd1d..6ac64a81fc2 100644 --- a/nixos/modules/programs/singularity.nix +++ b/nixos/modules/programs/singularity.nix @@ -5,8 +5,8 @@ let cfg = config.programs.singularity; singularity = pkgs.singularity.overrideAttrs (attrs : { installPhase = attrs.installPhase + '' - mv $bin/libexec/singularity/bin/starter-suid $bin/libexec/singularity/bin/starter-suid.orig - ln -s /run/wrappers/bin/singularity-suid $bin/libexec/singularity/bin/starter-suid + mv $out/libexec/singularity/bin/starter-suid $out/libexec/singularity/bin/starter-suid.orig + ln -s /run/wrappers/bin/singularity-suid $out/libexec/singularity/bin/starter-suid ''; }); in { diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix index bd4cf6a37ba..cce4797e13f 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -127,7 +127,7 @@ in serviceConfig = { StateDirectory = "gitlab-runner"; ExecReload= "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - ExecStart = ''${cfg.package.bin}/bin/gitlab-runner run \ + ExecStart = ''${cfg.package}/bin/gitlab-runner run \ --working-directory ${cfg.workDir} \ --config /etc/gitlab-runner/config.toml \ --service gitlab-runner \ diff --git a/nixos/modules/services/misc/confd.nix b/nixos/modules/services/misc/confd.nix index 8e9bec15dd4..c1ebdb3dde9 100755 --- a/nixos/modules/services/misc/confd.nix +++ b/nixos/modules/services/misc/confd.nix @@ -75,7 +75,7 @@ in { wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; serviceConfig = { - ExecStart = "${cfg.package.bin}/bin/confd"; + ExecStart = "${cfg.package}/bin/confd"; }; }; diff --git a/nixos/modules/services/misc/etcd.nix b/nixos/modules/services/misc/etcd.nix index 7322e1c080b..32360d43768 100644 --- a/nixos/modules/services/misc/etcd.nix +++ b/nixos/modules/services/misc/etcd.nix @@ -178,7 +178,7 @@ in { serviceConfig = { Type = "notify"; - ExecStart = "${pkgs.etcd.bin}/bin/etcd"; + ExecStart = "${pkgs.etcd}/bin/etcd"; User = "etcd"; LimitNOFILE = 40000; }; diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix index 38910a5a005..7c8e2c75577 100644 --- a/nixos/modules/services/misc/gitea.nix +++ b/nixos/modules/services/misc/gitea.nix @@ -335,7 +335,7 @@ in description = "gitea"; after = [ "network.target" ] ++ lib.optional usePostgresql "postgresql.service" ++ lib.optional useMysql "mysql.service"; wantedBy = [ "multi-user.target" ]; - path = [ gitea.bin pkgs.gitAndTools.git ]; + path = [ gitea pkgs.gitAndTools.git ]; preStart = let runConfig = "${cfg.stateDir}/custom/conf/app.ini"; @@ -347,11 +347,11 @@ in cp -f ${configFile} ${runConfig} if [ ! -e ${secretKey} ]; then - ${gitea.bin}/bin/gitea generate secret SECRET_KEY > ${secretKey} + ${gitea}/bin/gitea generate secret SECRET_KEY > ${secretKey} fi if [ ! -e ${jwtSecret} ]; then - ${gitea.bin}/bin/gitea generate secret LFS_JWT_SECRET > ${jwtSecret} + ${gitea}/bin/gitea generate secret LFS_JWT_SECRET > ${jwtSecret} fi KEY="$(head -n1 ${secretKey})" @@ -374,7 +374,7 @@ in HOOKS=$(find ${cfg.repositoryRoot} -mindepth 4 -maxdepth 6 -type f -wholename "*git/hooks/*") if [ "$HOOKS" ] then - sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${gitea.bin}/bin/gitea,g' $HOOKS + sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${gitea}/bin/gitea,g' $HOOKS sed -ri 's,/nix/store/[a-z0-9.-]+/bin/env,${pkgs.coreutils}/bin/env,g' $HOOKS sed -ri 's,/nix/store/[a-z0-9.-]+/bin/bash,${pkgs.bash}/bin/bash,g' $HOOKS sed -ri 's,/nix/store/[a-z0-9.-]+/bin/perl,${pkgs.perl}/bin/perl,g' $HOOKS @@ -383,7 +383,7 @@ in # update command option in authorized_keys if [ -r ${cfg.stateDir}/.ssh/authorized_keys ] then - sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${gitea.bin}/bin/gitea,g' ${cfg.stateDir}/.ssh/authorized_keys + sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gitea,${gitea}/bin/gitea,g' ${cfg.stateDir}/.ssh/authorized_keys fi ''; @@ -392,7 +392,7 @@ in User = cfg.user; Group = "gitea"; WorkingDirectory = cfg.stateDir; - ExecStart = "${gitea.bin}/bin/gitea web"; + ExecStart = "${gitea}/bin/gitea web"; Restart = "always"; # Filesystem @@ -450,7 +450,7 @@ in description = "gitea dump"; after = [ "gitea.service" ]; wantedBy = [ "default.target" ]; - path = [ gitea.bin ]; + path = [ gitea ]; environment = { USER = cfg.user; @@ -461,7 +461,7 @@ in serviceConfig = { Type = "oneshot"; User = cfg.user; - ExecStart = "${gitea.bin}/bin/gitea dump"; + ExecStart = "${gitea}/bin/gitea dump"; WorkingDirectory = cfg.stateDir; }; }; diff --git a/nixos/modules/services/misc/gogs.nix b/nixos/modules/services/misc/gogs.nix index ee99967c261..c5070aaa356 100644 --- a/nixos/modules/services/misc/gogs.nix +++ b/nixos/modules/services/misc/gogs.nix @@ -200,7 +200,7 @@ in description = "Gogs (Go Git Service)"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - path = [ pkgs.gogs.bin ]; + path = [ pkgs.gogs ]; preStart = let runConfig = "${cfg.stateDir}/custom/conf/app.ini"; @@ -230,7 +230,7 @@ in HOOKS=$(find ${cfg.repositoryRoot} -mindepth 4 -maxdepth 4 -type f -wholename "*git/hooks/*") if [ "$HOOKS" ] then - sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gogs,${pkgs.gogs.bin}/bin/gogs,g' $HOOKS + sed -ri 's,/nix/store/[a-z0-9.-]+/bin/gogs,${pkgs.gogs}/bin/gogs,g' $HOOKS sed -ri 's,/nix/store/[a-z0-9.-]+/bin/env,${pkgs.coreutils}/bin/env,g' $HOOKS sed -ri 's,/nix/store/[a-z0-9.-]+/bin/bash,${pkgs.bash}/bin/bash,g' $HOOKS sed -ri 's,/nix/store/[a-z0-9.-]+/bin/perl,${pkgs.perl}/bin/perl,g' $HOOKS @@ -242,7 +242,7 @@ in User = cfg.user; Group = cfg.group; WorkingDirectory = cfg.stateDir; - ExecStart = "${pkgs.gogs.bin}/bin/gogs web"; + ExecStart = "${pkgs.gogs}/bin/gogs web"; Restart = "always"; }; diff --git a/nixos/modules/services/misc/leaps.nix b/nixos/modules/services/misc/leaps.nix index d4e88ecbebd..ef89d3e64d0 100644 --- a/nixos/modules/services/misc/leaps.nix +++ b/nixos/modules/services/misc/leaps.nix @@ -55,7 +55,7 @@ in Restart = "on-failure"; WorkingDirectory = stateDir; PrivateTmp = true; - ExecStart = "${pkgs.leaps.bin}/bin/leaps -path ${toString cfg.path} -address ${cfg.address}:${toString cfg.port}"; + ExecStart = "${pkgs.leaps}/bin/leaps -path ${toString cfg.path} -address ${cfg.address}:${toString cfg.port}"; }; }; }; diff --git a/nixos/modules/services/misc/ssm-agent.nix b/nixos/modules/services/misc/ssm-agent.nix index e951a4c7ffa..f7c05deeecb 100644 --- a/nixos/modules/services/misc/ssm-agent.nix +++ b/nixos/modules/services/misc/ssm-agent.nix @@ -35,7 +35,7 @@ in { path = [ fake-lsb-release ]; serviceConfig = { - ExecStart = "${cfg.package.bin}/bin/agent"; + ExecStart = "${cfg.package}/bin/agent"; KillMode = "process"; Restart = "on-failure"; RestartSec = "15min"; @@ -43,4 +43,3 @@ in { }; }; } - diff --git a/nixos/modules/services/monitoring/bosun.nix b/nixos/modules/services/monitoring/bosun.nix index b1c12cce1f8..04e9da1c81a 100644 --- a/nixos/modules/services/monitoring/bosun.nix +++ b/nixos/modules/services/monitoring/bosun.nix @@ -148,7 +148,7 @@ in { User = cfg.user; Group = cfg.group; ExecStart = '' - ${cfg.package.bin}/bin/bosun -c ${configFile} + ${cfg.package}/bin/bosun -c ${configFile} ''; }; }; diff --git a/nixos/modules/services/monitoring/grafana-reporter.nix b/nixos/modules/services/monitoring/grafana-reporter.nix index b5a78e4583e..893c15d568b 100644 --- a/nixos/modules/services/monitoring/grafana-reporter.nix +++ b/nixos/modules/services/monitoring/grafana-reporter.nix @@ -59,7 +59,7 @@ in { "-templates ${cfg.templateDir}" ]; in { - ExecStart = "${pkgs.grafana_reporter.bin}/bin/grafana-reporter ${args}"; + ExecStart = "${pkgs.grafana_reporter}/bin/grafana-reporter ${args}"; }; }; }; diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 0f8bc2471e3..b0c81a46d4d 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -535,7 +535,7 @@ in { ${optionalString cfg.provision.enable '' export GF_PATHS_PROVISIONING=${provisionConfDir}; ''} - exec ${cfg.package.bin}/bin/grafana-server -homepath ${cfg.dataDir} + exec ${cfg.package}/bin/grafana-server -homepath ${cfg.dataDir} ''; serviceConfig = { WorkingDirectory = cfg.dataDir; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix index 045e48a3d0f..01276366e97 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/snmp.nix @@ -58,7 +58,7 @@ in in { serviceConfig = { ExecStart = '' - ${pkgs.prometheus-snmp-exporter.bin}/bin/snmp_exporter \ + ${pkgs.prometheus-snmp-exporter}/bin/snmp_exporter \ --config.file=${escapeShellArg configFile} \ --log.format=${escapeShellArg cfg.logFormat} \ --log.level=${cfg.logLevel} \ diff --git a/nixos/modules/services/monitoring/scollector.nix b/nixos/modules/services/monitoring/scollector.nix index 38cd2213de7..6f13ce889cb 100644 --- a/nixos/modules/services/monitoring/scollector.nix +++ b/nixos/modules/services/monitoring/scollector.nix @@ -118,7 +118,7 @@ in { serviceConfig = { User = cfg.user; Group = cfg.group; - ExecStart = "${cfg.package.bin}/bin/scollector -conf=${conf} ${lib.concatStringsSep " " cfg.extraOpts}"; + ExecStart = "${cfg.package}/bin/scollector -conf=${conf} ${lib.concatStringsSep " " cfg.extraOpts}"; }; }; diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix index 689cbc8a986..f7d2afead06 100644 --- a/nixos/modules/services/networking/consul.nix +++ b/nixos/modules/services/networking/consul.nix @@ -179,15 +179,15 @@ in (filterAttrs (n: _: hasPrefix "consul.d/" n) config.environment.etc); serviceConfig = { - ExecStart = "@${cfg.package.bin}/bin/consul consul agent -config-dir /etc/consul.d" + ExecStart = "@${cfg.package}/bin/consul consul agent -config-dir /etc/consul.d" + concatMapStrings (n: " -config-file ${n}") configFiles; - ExecReload = "${cfg.package.bin}/bin/consul reload"; + ExecReload = "${cfg.package}/bin/consul reload"; PermissionsStartOnly = true; User = if cfg.dropPrivileges then "consul" else null; Restart = "on-failure"; TimeoutStartSec = "infinity"; } // (optionalAttrs (cfg.leaveOnStop) { - ExecStop = "${cfg.package.bin}/bin/consul leave"; + ExecStop = "${cfg.package}/bin/consul leave"; }); path = with pkgs; [ iproute gnugrep gawk consul ]; @@ -238,7 +238,7 @@ in serviceConfig = { ExecStart = '' - ${cfg.alerts.package.bin}/bin/consul-alerts start \ + ${cfg.alerts.package}/bin/consul-alerts start \ --alert-addr=${cfg.alerts.listenAddr} \ --consul-addr=${cfg.alerts.consulAddr} \ ${optionalString cfg.alerts.watchChecks "--watch-checks"} \ diff --git a/nixos/modules/services/networking/flannel.nix b/nixos/modules/services/networking/flannel.nix index dd2f6454e95..4c040112d28 100644 --- a/nixos/modules/services/networking/flannel.nix +++ b/nixos/modules/services/networking/flannel.nix @@ -19,8 +19,8 @@ in { package = mkOption { description = "Package to use for flannel"; type = types.package; - default = pkgs.flannel.bin; - defaultText = "pkgs.flannel.bin"; + default = pkgs.flannel; + defaultText = "pkgs.flannel"; }; publicIp = mkOption { @@ -167,7 +167,7 @@ in { touch /run/flannel/docker '' + optionalString (cfg.storageBackend == "etcd") '' echo "setting network configuration" - until ${pkgs.etcdctl.bin}/bin/etcdctl set /coreos.com/network/config '${builtins.toJSON networkConfig}' + until ${pkgs.etcdctl}/bin/etcdctl set /coreos.com/network/config '${builtins.toJSON networkConfig}' do echo "setting network configuration, retry" sleep 1 diff --git a/nixos/modules/services/networking/skydns.nix b/nixos/modules/services/networking/skydns.nix index 6ad18bb2240..e79d6de9264 100644 --- a/nixos/modules/services/networking/skydns.nix +++ b/nixos/modules/services/networking/skydns.nix @@ -83,7 +83,7 @@ in { SKYDNS_NAMESERVERS = concatStringsSep "," cfg.nameservers; }; serviceConfig = { - ExecStart = "${cfg.package.bin}/bin/skydns"; + ExecStart = "${cfg.package}/bin/skydns"; }; }; diff --git a/nixos/modules/services/security/hologram-agent.nix b/nixos/modules/services/security/hologram-agent.nix index a5087b0a99b..e37334b3cf5 100644 --- a/nixos/modules/services/security/hologram-agent.nix +++ b/nixos/modules/services/security/hologram-agent.nix @@ -43,12 +43,12 @@ in { description = "Provide EC2 instance credentials to machines outside of EC2"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - requires = [ "network-link-dummy0.service" "network-addresses-dummy0.service" ]; + requires = [ "network-link-dummy0.service" "network-addresses-dummy0.service" ]; preStart = '' /run/current-system/sw/bin/rm -fv /run/hologram.sock ''; serviceConfig = { - ExecStart = "${pkgs.hologram.bin}/bin/hologram-agent -debug -conf ${cfgFile} -port ${cfg.httpPort}"; + ExecStart = "${pkgs.hologram}/bin/hologram-agent -debug -conf ${cfgFile} -port ${cfg.httpPort}"; }; }; diff --git a/nixos/modules/services/security/hologram-server.nix b/nixos/modules/services/security/hologram-server.nix index bad02c7440b..4acf6ae0e21 100644 --- a/nixos/modules/services/security/hologram-server.nix +++ b/nixos/modules/services/security/hologram-server.nix @@ -123,7 +123,7 @@ in { wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${pkgs.hologram.bin}/bin/hologram-server --debug --conf ${cfgFile}"; + ExecStart = "${pkgs.hologram}/bin/hologram-server --debug --conf ${cfgFile}"; }; }; }; diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix index 46caadee204..d5c5437329e 100644 --- a/nixos/modules/services/security/oauth2_proxy.nix +++ b/nixos/modules/services/security/oauth2_proxy.nix @@ -577,7 +577,7 @@ in serviceConfig = { User = "oauth2_proxy"; Restart = "always"; - ExecStart = "${cfg.package.bin}/bin/oauth2_proxy ${configString}"; + ExecStart = "${cfg.package}/bin/oauth2_proxy ${configString}"; EnvironmentFile = mkIf (cfg.keyFile != null) cfg.keyFile; }; }; diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix index 853347bf86e..f5c2c356afc 100644 --- a/nixos/modules/services/web-apps/mattermost.nix +++ b/nixos/modules/services/web-apps/mattermost.nix @@ -224,7 +224,7 @@ in serviceConfig = { User = "nobody"; Group = "nogroup"; - ExecStart = "${pkgs.matterircd.bin}/bin/matterircd ${concatStringsSep " " cfg.matterircd.parameters}"; + ExecStart = "${pkgs.matterircd}/bin/matterircd ${concatStringsSep " " cfg.matterircd.parameters}"; WorkingDirectory = "/tmp"; PrivateTmp = true; Restart = "always"; diff --git a/nixos/modules/virtualisation/ecs-agent.nix b/nixos/modules/virtualisation/ecs-agent.nix index fc51b159579..93fefe56d1a 100644 --- a/nixos/modules/virtualisation/ecs-agent.nix +++ b/nixos/modules/virtualisation/ecs-agent.nix @@ -38,9 +38,8 @@ in { if [ ! -z "$ECS_DATADIR" ]; then mkdir -p "$ECS_DATADIR" fi - ${cfg.package.bin}/bin/agent + ${cfg.package}/bin/agent ''; }; }; } - diff --git a/nixos/modules/virtualisation/lxd.nix b/nixos/modules/virtualisation/lxd.nix index de48d3a780e..53b89a9f55b 100644 --- a/nixos/modules/virtualisation/lxd.nix +++ b/nixos/modules/virtualisation/lxd.nix @@ -108,7 +108,7 @@ in ''; serviceConfig = { - ExecStart = "@${cfg.package.bin}/bin/lxd lxd --group lxd"; + ExecStart = "@${cfg.package}/bin/lxd lxd --group lxd"; Type = "simple"; KillMode = "process"; # when stopping, leave the containers alone LimitMEMLOCK = "infinity"; diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix index 41d50dc7308..35f879840dd 100644 --- a/nixos/modules/virtualisation/podman.nix +++ b/nixos/modules/virtualisation/podman.nix @@ -6,13 +6,11 @@ let # Provides a fake "docker" binary mapping to podman dockerCompat = pkgs.runCommandNoCC "${pkgs.podman.pname}-docker-compat-${pkgs.podman.version}" { - outputs = [ "out" "bin" "man" ]; + outputs = [ "out" "man" ]; inherit (pkgs.podman) meta; } '' - mkdir $out - - mkdir -p $bin/bin - ln -s ${pkgs.podman.bin}/bin/podman $bin/bin/docker + mkdir -p $out/bin + ln -s ${pkgs.podman}/bin/podman $out/bin/docker mkdir -p $man/share/man/man1 for f in ${pkgs.podman.man}/share/man/man1/*; do -- cgit v1.2.3 From b5dc07a4b471e6f651af3b13e4bd841b6b3ea6ed Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 28 Apr 2020 11:50:57 +1000 Subject: treewide: use $out instead of $bin with buildGoPackage --- pkgs/applications/blockchains/dcrwallet.nix | 4 ++-- pkgs/applications/blockchains/quorum.nix | 4 ++-- pkgs/applications/misc/overmind/default.nix | 2 +- pkgs/applications/networking/cluster/k3s/default.nix | 8 ++++---- pkgs/applications/networking/cluster/kompose/default.nix | 2 +- pkgs/applications/networking/cluster/kops/default.nix | 2 +- .../networking/cluster/minishift/default.nix | 2 +- .../networking/cluster/openshift/default.nix | 4 ++-- pkgs/applications/networking/cluster/stern/default.nix | 2 +- .../networking/cluster/terraform/default.nix | 4 ++-- .../networking/cluster/terragrunt/default.nix | 2 +- pkgs/applications/networking/sync/rclone/default.nix | 4 ++-- .../version-management/git-and-tools/grv/default.nix | 2 +- pkgs/applications/version-management/gitea/default.nix | 4 ++-- .../version-management/gitlab/gitaly/default.nix | 2 +- .../version-management/gitlab/gitlab-shell/default.nix | 4 ++-- pkgs/applications/version-management/gogs/default.nix | 4 ++-- pkgs/applications/virtualization/containerd/default.nix | 4 ++-- pkgs/applications/virtualization/cri-o/default.nix | 7 +++---- pkgs/applications/virtualization/docker-slim/default.nix | 2 +- pkgs/applications/virtualization/docker/proxy.nix | 2 +- pkgs/applications/virtualization/podman/default.nix | 4 ++-- pkgs/applications/virtualization/runc/default.nix | 4 ++-- pkgs/applications/virtualization/singularity/default.nix | 12 ++++++------ pkgs/desktops/deepin/dde-api/default.nix | 4 +--- pkgs/desktops/deepin/dde-daemon/default.nix | 2 -- pkgs/desktops/deepin/startdde/default.nix | 4 +--- pkgs/development/tools/buildah/default.nix | 4 ++-- pkgs/development/tools/cloudfoundry-cli/default.nix | 2 +- .../tools/container-linux-config-transpiler/default.nix | 4 ++-- .../continuous-integration/buildkite-agent/default.nix | 4 ++-- .../continuous-integration/buildkite-agent/generic.nix | 12 ++++++------ .../continuous-integration/gitlab-runner/default.nix | 8 ++++---- pkgs/development/tools/deis/default.nix | 4 ++-- pkgs/development/tools/dep2nix/default.nix | 2 +- pkgs/development/tools/doctl/default.nix | 2 +- pkgs/development/tools/fac/default.nix | 2 +- pkgs/development/tools/go2nix/default.nix | 4 ++-- pkgs/development/tools/gocode-gomod/default.nix | 2 +- pkgs/development/tools/kind/default.nix | 2 +- pkgs/development/tools/misc/hound/default.nix | 2 +- pkgs/development/tools/out-of-tree/default.nix | 2 +- pkgs/development/tools/skaffold/default.nix | 2 +- pkgs/development/tools/skopeo/default.nix | 2 +- pkgs/development/tools/toxiproxy/default.nix | 4 ++-- pkgs/development/tools/vgo2nix/default.nix | 2 +- pkgs/development/tools/wally-cli/default.nix | 2 +- pkgs/games/boohu/default.nix | 2 +- pkgs/games/harmonist/default.nix | 2 +- pkgs/misc/logging/beats/6.x.nix | 2 +- pkgs/misc/logging/beats/7.x.nix | 2 +- pkgs/servers/dex/default.nix | 4 ++-- pkgs/servers/etcd/default.nix | 2 +- pkgs/servers/meguca/default.nix | 6 +++--- pkgs/servers/miniflux/default.nix | 2 +- pkgs/servers/monitoring/grafana-reporter/default.nix | 2 +- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- pkgs/servers/monitoring/loki/default.nix | 2 +- pkgs/servers/monitoring/prometheus/alertmanager.nix | 2 +- pkgs/servers/monitoring/prometheus/default.nix | 6 +++--- pkgs/servers/monitoring/prometheus/postfix-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/pushgateway.nix | 2 +- pkgs/servers/monitoring/uchiwa/default.nix | 4 ++-- pkgs/servers/nginx-sso/default.nix | 4 ++-- pkgs/servers/sql/cockroachdb/default.nix | 8 ++------ pkgs/tools/admin/docker-credential-helpers/default.nix | 6 +++--- pkgs/tools/admin/lxd/default.nix | 4 ++-- pkgs/tools/backup/diskrsync/default.nix | 2 +- pkgs/tools/backup/duplicacy/default.nix | 2 +- pkgs/tools/backup/restic/default.nix | 2 +- pkgs/tools/backup/restic/rest-server.nix | 2 +- pkgs/tools/filesystems/gcsfuse/default.nix | 4 ++-- pkgs/tools/misc/aptly/default.nix | 2 +- pkgs/tools/misc/direnv/default.nix | 6 +++--- pkgs/tools/misc/mongodb-tools/default.nix | 2 +- pkgs/tools/misc/phraseapp-client/default.nix | 2 +- pkgs/tools/misc/tewisay/default.nix | 6 +++--- pkgs/tools/networking/assh/default.nix | 2 +- pkgs/tools/networking/dd-agent/datadog-agent.nix | 16 ++++++++-------- pkgs/tools/networking/guardian-agent/default.nix | 8 ++++---- pkgs/tools/package-management/morph/default.nix | 4 ++-- pkgs/tools/security/gopass/default.nix | 4 ++-- pkgs/tools/security/notary/default.nix | 2 +- pkgs/tools/security/vault/default.nix | 2 +- pkgs/tools/security/verifpal/default.nix | 4 ++-- pkgs/tools/system/localtime/default.nix | 2 +- pkgs/tools/virtualization/cri-tools/default.nix | 2 +- pkgs/tools/virtualization/distrobuilder/default.nix | 2 +- 88 files changed, 153 insertions(+), 164 deletions(-) diff --git a/pkgs/applications/blockchains/dcrwallet.nix b/pkgs/applications/blockchains/dcrwallet.nix index 163ed2615d3..258aad8e1bd 100644 --- a/pkgs/applications/blockchains/dcrwallet.nix +++ b/pkgs/applications/blockchains/dcrwallet.nix @@ -29,8 +29,8 @@ buildGoPackage rec { ''; installPhase = '' - mkdir -pv $bin/bin - cp -v dcrwallet $bin/bin + mkdir -pv $out/bin + cp -v dcrwallet $out/bin ''; diff --git a/pkgs/applications/blockchains/quorum.nix b/pkgs/applications/blockchains/quorum.nix index 49bc0be108f..f745860f661 100644 --- a/pkgs/applications/blockchains/quorum.nix +++ b/pkgs/applications/blockchains/quorum.nix @@ -21,8 +21,8 @@ buildGoPackage rec { ''; installPhase = '' - mkdir -pv $bin/bin - cp -v build/bin/geth build/bin/bootnode build/bin/swarm $bin/bin + mkdir -pv $out/bin + cp -v build/bin/geth build/bin/bootnode build/bin/swarm $out/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/overmind/default.nix b/pkgs/applications/misc/overmind/default.nix index 7603a66cd36..29dc6f54e6c 100644 --- a/pkgs/applications/misc/overmind/default.nix +++ b/pkgs/applications/misc/overmind/default.nix @@ -8,7 +8,7 @@ buildGoPackage rec { nativeBuildInputs = [ makeWrapper ]; postInstall = '' - wrapProgram "$bin/bin/overmind" --prefix PATH : "${lib.makeBinPath [ tmux which ]}" + wrapProgram "$out/bin/overmind" --prefix PATH : "${lib.makeBinPath [ tmux which ]}" ''; src = fetchFromGitHub { diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index b18e1f08dd4..134684f0639 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -126,8 +126,8 @@ let installPhase = '' pushd go/src/${goPackagePath} - mkdir -p "$bin/bin" - install -m 0755 -t "$bin/bin" ./bin/* + mkdir -p "$out/bin" + install -m 0755 -t "$out/bin" ./bin/* popd ''; @@ -181,8 +181,8 @@ let installPhase = '' pushd go/src/${goPackagePath} - mkdir -p "$bin/bin" - install -m 0755 -t "$bin/bin" ./dist/artifacts/k3s + mkdir -p "$out/bin" + install -m 0755 -t "$out/bin" ./dist/artifacts/k3s popd ''; diff --git a/pkgs/applications/networking/cluster/kompose/default.nix b/pkgs/applications/networking/cluster/kompose/default.nix index 2467ed93b32..c01e1c8c004 100644 --- a/pkgs/applications/networking/cluster/kompose/default.nix +++ b/pkgs/applications/networking/cluster/kompose/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { nativeBuildInputs = [ installShellFiles ]; postInstall = '' for shell in bash zsh; do - $bin/bin/kompose completion $shell > kompose.$shell + $out/bin/kompose completion $shell > kompose.$shell installShellCompletion kompose.$shell done ''; diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 3e1f63531bb..2a86fed0d08 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -34,7 +34,7 @@ let postInstall = '' for shell in bash zsh; do - $bin/bin/kops completion $shell > kops.$shell + $out/bin/kops completion $shell > kops.$shell installShellCompletion kops.$shell done ''; diff --git a/pkgs/applications/networking/cluster/minishift/default.nix b/pkgs/applications/networking/cluster/minishift/default.nix index 3dcfbf6fd7e..0c932396e9e 100644 --- a/pkgs/applications/networking/cluster/minishift/default.nix +++ b/pkgs/applications/networking/cluster/minishift/default.nix @@ -48,7 +48,7 @@ in buildGoPackage rec { ''; postInstall = '' - wrapProgram "$bin/bin/minishift" \ + wrapProgram "$out/bin/minishift" \ --prefix PATH ':' '${lib.makeBinPath [ docker-machine-kvm openshift ]}' ''; diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index bcd259b138f..67845c06695 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -72,8 +72,8 @@ in buildGoPackage rec { ''; installPhase = '' - mkdir -p $bin/bin - cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$bin/bin/" + mkdir -p $out/bin + cp -a "_output/local/bin/$(go env GOOS)/$(go env GOARCH)/"* "$out/bin/" installShellCompletion --bash contrib/completions/bash/* installShellCompletion --zsh contrib/completions/zsh/* ''; diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix index 95ad965c346..8ad0e8711f2 100644 --- a/pkgs/applications/networking/cluster/stern/default.nix +++ b/pkgs/applications/networking/cluster/stern/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { nativeBuildInputs = [ installShellFiles ]; postInstall = - let stern = if isCrossBuild then buildPackages.stern else "$bin"; in + let stern = if isCrossBuild then buildPackages.stern else "$out"; in '' for shell in bash zsh; do ${stern}/bin/stern --completion $shell > stern.$shell diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 50a5129226a..516c4e51402 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -26,7 +26,7 @@ let postInstall = '' # remove all plugins, they are part of the main binary now - for i in $bin/bin/*; do + for i in $out/bin/*; do if [[ $(basename $i) != terraform ]]; then rm "$i" fi @@ -88,7 +88,7 @@ let buildCommand = '' mkdir -p $out/bin/ - makeWrapper "${terraform.bin}/bin/terraform" "$out/bin/terraform" \ + makeWrapper "${terraform}/bin/terraform" "$out/bin/terraform" \ --set NIX_TERRAFORM_PLUGIN_DIR "${ buildEnv { name = "tf-plugin-env"; diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 26c969c671f..4e3066fc6ab 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -23,7 +23,7 @@ buildGoPackage rec { ''; postInstall = '' - wrapProgram $bin/bin/terragrunt \ + wrapProgram $out/bin/terragrunt \ --set TERRAGRUNT_TFPATH ${lib.getBin terraform.full}/bin/terraform ''; diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/applications/networking/sync/rclone/default.nix index 57925a3292d..2fde398b2f5 100644 --- a/pkgs/applications/networking/sync/rclone/default.nix +++ b/pkgs/applications/networking/sync/rclone/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { subPackages = [ "." ]; - outputs = [ "bin" "out" "man" ]; + outputs = [ "out" "man" ]; nativeBuildInputs = [ installShellFiles ]; @@ -23,7 +23,7 @@ buildGoPackage rec { let rcloneBin = if stdenv.buildPlatform == stdenv.hostPlatform - then "$bin" + then "$out" else stdenv.lib.getBin buildPackages.rclone; in '' diff --git a/pkgs/applications/version-management/git-and-tools/grv/default.nix b/pkgs/applications/version-management/git-and-tools/grv/default.nix index 8c915762b6e..64a4f8a823c 100644 --- a/pkgs/applications/version-management/git-and-tools/grv/default.nix +++ b/pkgs/applications/version-management/git-and-tools/grv/default.nix @@ -36,7 +36,7 @@ buildGoPackage { installPhase = '' runHook preInstall - install -D grv $bin/bin/grv + install -D grv $out/bin/grv runHook postInstall ''; diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 570fb2ce56f..b18ac251016 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -44,7 +44,7 @@ buildGoPackage rec { ) ''; - outputs = [ "bin" "out" "data" ]; + outputs = [ "out" "data" ]; postInstall = '' mkdir $data @@ -52,7 +52,7 @@ buildGoPackage rec { mkdir -p $out cp -R ./go/src/${goPackagePath}/options/locale $out/locale - wrapProgram $bin/bin/gitea \ + wrapProgram $out/bin/gitea \ --prefix PATH : ${makeBinPath [ bash git gzip openssh ]} ''; diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 968b26632c7..37a2fc23af0 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -65,7 +65,7 @@ in buildGoPackage rec { "'/run/gitlab/shell-config.yml'" ''; - outputs = [ "bin" "out" "ruby" ]; + outputs = [ "out" "ruby" ]; meta = with stdenv.lib; { homepage = "https://gitlab.com/gitlab-org/gitaly"; diff --git a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix index 40860b13e4d..2b4fddaa9c8 100644 --- a/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix +++ b/pkgs/applications/version-management/gitlab/gitlab-shell/default.nix @@ -18,8 +18,8 @@ buildGoPackage rec { goDeps = ./deps.nix; postInstall = '' - cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/bin/* $bin/bin - cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/{support,VERSION} $bin/ + cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/bin/* $out/bin + cp -r "$NIX_BUILD_TOP/go/src/$goPackagePath"/{support,VERSION} $out/ ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/version-management/gogs/default.nix b/pkgs/applications/version-management/gogs/default.nix index a35778ac023..48667ad8be3 100644 --- a/pkgs/applications/version-management/gogs/default.nix +++ b/pkgs/applications/version-management/gogs/default.nix @@ -34,13 +34,13 @@ buildGoPackage rec { ( optional sqliteSupport "sqlite" ++ optional pamSupport "pam"); - outputs = [ "bin" "out" "data" ]; + outputs = [ "out" "data" ]; postInstall = '' mkdir $data cp -R $src/{public,templates} $data - wrapProgram $bin/bin/gogs \ + wrapProgram $out/bin/gogs \ --prefix PATH : ${makeBinPath [ bash git gzip openssh ]} ''; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 7ce4390ba30..fbeb2e3382f 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { }; goPackagePath = "github.com/containerd/containerd"; - outputs = [ "bin" "out" "man" ]; + outputs = [ "out" "man" ]; nativeBuildInputs = [ go-md2man utillinux ]; @@ -33,7 +33,7 @@ buildGoPackage rec { installPhase = '' for b in bin/*; do - install -Dm555 $b $bin/$b + install -Dm555 $b $out/$b done make man diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 74a316ef52a..dacc404b3a8 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -32,7 +32,6 @@ in buildGoPackage rec { sha256 = "1cy2lqasfn5n20vlm3ckb6myci8ya6qv08dw8fq7z4ycnm39r1a6"; }; - outputs = [ "bin" "out" ]; nativeBuildInputs = [ git pkgconfig which ]; buildInputs = [ btrfs-progs gpgme libapparmor libassuan libgpgerror libseccomp libselinux lvm2 ] @@ -47,9 +46,9 @@ in buildGoPackage rec { bin/pinns ''; installPhase = '' - install -Dm755 bin/crio $bin/bin/crio${flavor} - install -Dm755 bin/crio-status $bin/bin/crio-status${flavor} - install -Dm755 bin/pinns $bin/bin/pinns${flavor} + install -Dm755 bin/crio $out/bin/crio${flavor} + install -Dm755 bin/crio-status $out/bin/crio-status${flavor} + install -Dm755 bin/pinns $out/bin/pinns${flavor} ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index a4c2be05061..996d52bacab 100644 --- a/pkgs/applications/virtualization/docker-slim/default.nix +++ b/pkgs/applications/virtualization/docker-slim/default.nix @@ -33,7 +33,7 @@ buildGoPackage rec { # docker-slim tries to create its state dir next to the binary (inside the nix # store), so we set it to use the working directory at the time of invocation postInstall = '' - wrapProgram "$bin/bin/docker-slim" --add-flags '--state-path "$(pwd)"' + wrapProgram "$out/bin/docker-slim" --add-flags '--state-path "$(pwd)"' ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/virtualization/docker/proxy.nix b/pkgs/applications/virtualization/docker/proxy.nix index dde0b481497..cb3518d7d3d 100644 --- a/pkgs/applications/virtualization/docker/proxy.nix +++ b/pkgs/applications/virtualization/docker/proxy.nix @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = null; installPhase = '' - install -m755 -D ./go/bin/proxy $bin/bin/docker-proxy + install -m755 -D ./go/bin/proxy $out/bin/docker-proxy ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 2c1ad0b4297..b8f8459796a 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -25,7 +25,7 @@ buildGoPackage rec { goPackagePath = "github.com/containers/libpod"; - outputs = [ "bin" "out" "man" ]; + outputs = [ "out" "man" ]; nativeBuildInputs = [ pkg-config go-md2man installShellFiles ]; @@ -40,7 +40,7 @@ buildGoPackage rec { ''; installPhase = '' - install -Dm555 bin/podman $bin/bin/podman + install -Dm555 bin/podman $out/bin/podman installShellCompletion --bash completions/bash/podman installShellCompletion --zsh completions/zsh/_podman MANDIR=$man/share/man make install.man diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index 87385024967..b29b1f97d21 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -22,7 +22,7 @@ buildGoPackage rec { }; goPackagePath = "github.com/opencontainers/runc"; - outputs = [ "bin" "out" "man" ]; + outputs = [ "out" "man" ]; nativeBuildInputs = [ go-md2man installShellFiles pkg-config which ]; buildInputs = [ libseccomp libapparmor apparmor-parser ]; @@ -38,7 +38,7 @@ buildGoPackage rec { ''; installPhase = '' - install -Dm755 runc $bin/bin/runc + install -Dm755 runc $out/bin/runc installManPage man/*/* ''; diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index 4477e7c7b1d..f6a1a3bc6a9 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -42,7 +42,7 @@ buildGoPackage rec { patchShebangs . sed -i 's|defaultPath := "[^"]*"|defaultPath := "${stdenv.lib.makeBinPath propagatedBuildInputs}"|' cmd/internal/cli/actions.go - ./mconfig -V ${version} -p $bin --localstatedir=/var + ./mconfig -V ${version} -p $out --localstatedir=/var # Don't install SUID binaries sed -i 's/-m 4755/-m 755/g' builddir/Makefile @@ -54,16 +54,16 @@ buildGoPackage rec { ''; installPhase = '' - make -C builddir install LOCALSTATEDIR=$bin/var - chmod 755 $bin/libexec/singularity/bin/starter-suid - wrapProgram $bin/bin/singularity --prefix PATH : ${stdenv.lib.makeBinPath propagatedBuildInputs} + make -C builddir install LOCALSTATEDIR=$out/var + chmod 755 $out/libexec/singularity/bin/starter-suid + wrapProgram $out/bin/singularity --prefix PATH : ${stdenv.lib.makeBinPath propagatedBuildInputs} ''; postFixup = '' - find $bin/ -type f -executable -exec remove-references-to -t ${go} '{}' + || true + find $out/libexec/ -type f -executable -exec remove-references-to -t ${go} '{}' + || true # These etc scripts shouldn't have their paths patched - cp etc/actions/* $bin/etc/singularity/actions/ + cp etc/actions/* $out/etc/singularity/actions/ ''; meta = with stdenv.lib; { diff --git a/pkgs/desktops/deepin/dde-api/default.nix b/pkgs/desktops/deepin/dde-api/default.nix index 9fb18d04df8..accc7e2b701 100644 --- a/pkgs/desktops/deepin/dde-api/default.nix +++ b/pkgs/desktops/deepin/dde-api/default.nix @@ -37,8 +37,6 @@ buildGoPackage rec { goDeps = ./deps.nix; - outputs = [ "out" ]; - nativeBuildInputs = [ pkgconfig deepin-gettext-tools # build @@ -109,7 +107,7 @@ buildGoPackage rec { installPhase = '' make install PREFIX="$out" SYSTEMD_LIB_DIR="$out/lib" -C go/src/${goPackagePath} mv $out/share/gocode $out/share/go - remove-references-to -t ${go} $out/bin/* $out/lib/deepin-api/* + remove-references-to -t ${go} $out/lib/deepin-api/* ''; postFixup = '' diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix index fdbb7856b06..ad818b2606c 100644 --- a/pkgs/desktops/deepin/dde-daemon/default.nix +++ b/pkgs/desktops/deepin/dde-daemon/default.nix @@ -29,8 +29,6 @@ buildGoPackage rec { goDeps = ./deps.nix; - outputs = [ "out" ]; - nativeBuildInputs = [ pkgconfig dbus-factory diff --git a/pkgs/desktops/deepin/startdde/default.nix b/pkgs/desktops/deepin/startdde/default.nix index 3050e7b9e13..137417f3754 100644 --- a/pkgs/desktops/deepin/startdde/default.nix +++ b/pkgs/desktops/deepin/startdde/default.nix @@ -22,8 +22,6 @@ buildGoPackage rec { goDeps = ./deps.nix; - outputs = [ "out" ]; - nativeBuildInputs = [ pkgconfig dbus-factory @@ -114,7 +112,7 @@ buildGoPackage rec { installPhase = '' make install PREFIX="$out" -C go/src/${goPackagePath} rm -rf $out/share/lightdm # this is uselesss for NixOS - remove-references-to -t ${go} $out/bin/* $out/sbin/* + remove-references-to -t ${go} $out/sbin/* ''; postFixup = '' diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 84b28631308..09d1e16a8b0 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -22,7 +22,7 @@ buildGoPackage rec { sha256 = "187cvb3i5cwm7cwxmzpl2ca7900yb6v6b6cybyz5mnd5ccy5ff1q"; }; - outputs = [ "bin" "man" "out" ]; + outputs = [ "out" "man" ]; goPackagePath = "github.com/containers/buildah"; excludedPackages = [ "tests" ]; @@ -35,7 +35,7 @@ buildGoPackage rec { buildPhase = '' pushd go/src/${goPackagePath} make GIT_COMMIT="unknown" - install -Dm755 buildah $bin/bin/buildah + install -Dm755 buildah $out/bin/buildah installShellCompletion --bash contrib/completions/bash/buildah ''; diff --git a/pkgs/development/tools/cloudfoundry-cli/default.nix b/pkgs/development/tools/cloudfoundry-cli/default.nix index 55d9854d792..1fa45a32c05 100644 --- a/pkgs/development/tools/cloudfoundry-cli/default.nix +++ b/pkgs/development/tools/cloudfoundry-cli/default.nix @@ -34,7 +34,7 @@ buildGoPackage rec { ''; installPhase = '' - install -Dm555 out/cf "$bin/bin/cf" + install -Dm555 out/cf "$out/bin/cf" installShellCompletion --bash "$src/ci/installers/completion/cf" ''; diff --git a/pkgs/development/tools/container-linux-config-transpiler/default.nix b/pkgs/development/tools/container-linux-config-transpiler/default.nix index 0e6c58aa7ba..005c5d55b79 100644 --- a/pkgs/development/tools/container-linux-config-transpiler/default.nix +++ b/pkgs/development/tools/container-linux-config-transpiler/default.nix @@ -20,8 +20,8 @@ buildGoPackage rec { ''; postInstall = '' - mv $bin/bin/{internal,ct} - rm $bin/bin/tools + mv $out/bin/{internal,ct} + rm $out/bin/tools ''; meta = { diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index 9182c889598..ceaa704b565 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -24,10 +24,10 @@ buildGoPackage rec { postInstall = '' # Fix binary name - mv $bin/bin/{agent,buildkite-agent} + mv $out/bin/{agent,buildkite-agent} # These are runtime dependencies - wrapProgram $bin/bin/buildkite-agent \ + wrapProgram $out/bin/buildkite-agent \ --prefix PATH : '${stdenv.lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}' ''; diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix index 1d50e4ff6d5..39178201456 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/generic.nix @@ -15,17 +15,17 @@ buildGoPackage { postInstall = '' ${stdenv.lib.optionalString hasBootstrapScript '' # Install bootstrap.sh - mkdir -p $bin/libexec/buildkite-agent - cp $NIX_BUILD_TOP/go/src/${goPackagePath}/templates/bootstrap.sh $bin/libexec/buildkite-agent - sed -e "s|#!/bin/bash|#!${bash}/bin/bash|g" -i $bin/libexec/buildkite-agent/bootstrap.sh + mkdir -p $out/libexec/buildkite-agent + cp $NIX_BUILD_TOP/go/src/${goPackagePath}/templates/bootstrap.sh $out/libexec/buildkite-agent + sed -e "s|#!/bin/bash|#!${bash}/bin/bash|g" -i $out/libexec/buildkite-agent/bootstrap.sh ''} # Fix binary name - mv $bin/bin/{agent,buildkite-agent} + mv $out/bin/{agent,buildkite-agent} # These are runtime dependencies - wrapProgram $bin/bin/buildkite-agent \ - ${stdenv.lib.optionalString hasBootstrapScript "--set BUILDKITE_BOOTSTRAP_SCRIPT_PATH $bin/libexec/buildkite-agent/bootstrap.sh"} \ + wrapProgram $out/bin/buildkite-agent \ + ${stdenv.lib.optionalString hasBootstrapScript "--set BUILDKITE_BOOTSTRAP_SCRIPT_PATH $out/libexec/buildkite-agent/bootstrap.sh"} \ --prefix PATH : '${stdenv.lib.makeBinPath [ openssh git coreutils gnused gnugrep ]}' ''; diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 7c7862dbe3b..e152b0ba638 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -35,10 +35,10 @@ buildGoPackage rec { patches = [ ./fix-shell-path.patch ]; postInstall = '' - touch $bin/bin/hello - install -d $bin/bin/helper-images - ln -sf ${docker_x86_64} $bin/bin/helper-images/prebuilt-x86_64.tar.xz - ln -sf ${docker_arm} $bin/bin/helper-images/prebuilt-arm.tar.xz + touch $out/bin/hello + install -d $out/bin/helper-images + ln -sf ${docker_x86_64} $out/bin/helper-images/prebuilt-x86_64.tar.xz + ln -sf ${docker_arm} $out/bin/helper-images/prebuilt-arm.tar.xz ''; meta = with lib; { diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix index 4625c79767f..9e45d5988cc 100644 --- a/pkgs/development/tools/deis/default.nix +++ b/pkgs/development/tools/deis/default.nix @@ -9,8 +9,8 @@ buildGoPackage rec { subPackages = [ "client" ]; postInstall = '' - if [ -f "$bin/bin/client" ]; then - mv "$bin/bin/client" "$bin/bin/deis" + if [ -f "$out/bin/client" ]; then + mv "$out/bin/client" "$out/bin/deis" fi ''; diff --git a/pkgs/development/tools/dep2nix/default.nix b/pkgs/development/tools/dep2nix/default.nix index 86a1ac6d6b1..9d14f7c1c1e 100644 --- a/pkgs/development/tools/dep2nix/default.nix +++ b/pkgs/development/tools/dep2nix/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { ]; postFixup = '' - wrapProgram $bin/bin/dep2nix \ + wrapProgram $out/bin/dep2nix \ --prefix PATH : ${nix-prefetch-scripts}/bin ''; diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index f84167afca8..f9c55555536 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -21,7 +21,7 @@ buildGoPackage rec { postInstall = '' export HOME=$(mktemp -d) # attempts to write to /homeless-shelter for shell in bash fish zsh; do - $bin/bin/doctl completion $shell > doctl.$shell + $out/bin/doctl completion $shell > doctl.$shell installShellCompletion doctl.$shell done ''; diff --git a/pkgs/development/tools/fac/default.nix b/pkgs/development/tools/fac/default.nix index 331c86ad88c..6a23f84f236 100644 --- a/pkgs/development/tools/fac/default.nix +++ b/pkgs/development/tools/fac/default.nix @@ -18,7 +18,7 @@ buildGoPackage rec { nativeBuildInputs = [ makeWrapper ]; postInstall = '' - wrapProgram $bin/bin/fac \ + wrapProgram $out/bin/fac \ --prefix PATH : ${git}/bin # Install man page, not installed by default diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix index 96f82cc827f..300f82ee548 100644 --- a/pkgs/development/tools/go2nix/default.nix +++ b/pkgs/development/tools/go2nix/default.nix @@ -17,14 +17,14 @@ buildGoPackage rec { goDeps = ./deps.nix; - outputs = [ "bin" "out" "man" ]; + outputs = [ "out" "man" ]; nativeBuildInputs = [ go-bindata gotools makeWrapper ]; preBuild = ''go generate ./...''; postInstall = '' - wrapProgram $bin/bin/go2nix \ + wrapProgram $out/bin/go2nix \ --prefix PATH : ${nix-prefetch-git}/bin \ --prefix PATH : ${git}/bin diff --git a/pkgs/development/tools/gocode-gomod/default.nix b/pkgs/development/tools/gocode-gomod/default.nix index 3ed719cbfce..603568236e6 100644 --- a/pkgs/development/tools/gocode-gomod/default.nix +++ b/pkgs/development/tools/gocode-gomod/default.nix @@ -25,7 +25,7 @@ buildGoPackage rec { goDeps = ./deps.nix; postInstall = '' - mv $bin/bin/gocode $bin/bin/gocode-gomod + mv $out/bin/gocode $out/bin/gocode-gomod ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/kind/default.nix b/pkgs/development/tools/kind/default.nix index 6436c83ee21..c9bea694549 100644 --- a/pkgs/development/tools/kind/default.nix +++ b/pkgs/development/tools/kind/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { nativeBuildInputs = [ installShellFiles ]; postInstall = '' for shell in bash zsh; do - $bin/bin/kind completion $shell > kind.$shell + $out/bin/kind completion $shell > kind.$shell installShellCompletion kind.$shell done ''; diff --git a/pkgs/development/tools/misc/hound/default.nix b/pkgs/development/tools/misc/hound/default.nix index d3afbbc1bc7..2d7431f9e8b 100644 --- a/pkgs/development/tools/misc/hound/default.nix +++ b/pkgs/development/tools/misc/hound/default.nix @@ -27,7 +27,7 @@ buildGoPackage rec { postInstall = with stdenv; let binPath = lib.makeBinPath [ mercurial git ]; in '' - wrapProgram $bin/bin/houndd --prefix PATH : ${binPath} + wrapProgram $out/bin/houndd --prefix PATH : ${binPath} ''; meta = { diff --git a/pkgs/development/tools/out-of-tree/default.nix b/pkgs/development/tools/out-of-tree/default.nix index 5faeec2387d..434f0186d89 100644 --- a/pkgs/development/tools/out-of-tree/default.nix +++ b/pkgs/development/tools/out-of-tree/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { goDeps = ./deps.nix; postFixup = '' - wrapProgram $bin/bin/out-of-tree \ + wrapProgram $out/bin/out-of-tree \ --prefix PATH : "${stdenv.lib.makeBinPath [ qemu docker which ]}" ''; diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index 5534492cf37..dce42380c50 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -26,7 +26,7 @@ buildGoPackage rec { nativeBuildInputs = [ installShellFiles ]; postInstall = '' for shell in bash zsh; do - $bin/bin/skaffold completion $shell > skaffold.$shell + $out/bin/skaffold completion $shell > skaffold.$shell installShellCompletion skaffold.$shell done ''; diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 7d4e4e0c69e..f7e1478bbec 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -34,7 +34,7 @@ buildGoPackage { inherit version; inherit src goPackagePath; - outputs = [ "bin" "man" "out" ]; + outputs = [ "out" "man" ]; excludedPackages = [ "integration" ]; diff --git a/pkgs/development/tools/toxiproxy/default.nix b/pkgs/development/tools/toxiproxy/default.nix index a5c13e2266e..cdf3ed5b71a 100644 --- a/pkgs/development/tools/toxiproxy/default.nix +++ b/pkgs/development/tools/toxiproxy/default.nix @@ -15,8 +15,8 @@ buildGoPackage rec { buildFlagsArray = "-ldflags=-X github.com/Shopify/toxiproxy.Version=v${version}"; postInstall = '' - mv $bin/bin/cli $bin/bin/toxiproxy-cli - mv $bin/bin/cmd $bin/bin/toxiproxy-cmd + mv $out/bin/cli $out/bin/toxiproxy-cli + mv $out/bin/cmd $out/bin/toxiproxy-cmd ''; meta = { diff --git a/pkgs/development/tools/vgo2nix/default.nix b/pkgs/development/tools/vgo2nix/default.nix index 5f2a45f7427..65cc4b145fb 100644 --- a/pkgs/development/tools/vgo2nix/default.nix +++ b/pkgs/development/tools/vgo2nix/default.nix @@ -28,7 +28,7 @@ buildGoPackage { postInstall = with stdenv; let binPath = lib.makeBinPath [ nix-prefetch-git go ]; in '' - wrapProgram $bin/bin/vgo2nix --prefix PATH : ${binPath} + wrapProgram $out/bin/vgo2nix --prefix PATH : ${binPath} ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/wally-cli/default.nix b/pkgs/development/tools/wally-cli/default.nix index 5d2550b89cb..ca8b40c4d53 100644 --- a/pkgs/development/tools/wally-cli/default.nix +++ b/pkgs/development/tools/wally-cli/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { }; postInstall = '' - mv $bin/bin/cli $bin/bin/wally + mv $out/bin/cli $out/bin/wally ''; goDeps = ./deps.nix; diff --git a/pkgs/games/boohu/default.nix b/pkgs/games/boohu/default.nix index 3dcfe201d2c..3ca8ee4693a 100644 --- a/pkgs/games/boohu/default.nix +++ b/pkgs/games/boohu/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - postInstall = "mv $bin/bin/boohu.git $bin/bin/boohu"; + postInstall = "mv $out/bin/boohu.git $out/bin/boohu"; meta = with stdenv.lib; { description = "A new coffee-break roguelike game"; diff --git a/pkgs/games/harmonist/default.nix b/pkgs/games/harmonist/default.nix index 19074a309dd..fb9e1cf6617 100644 --- a/pkgs/games/harmonist/default.nix +++ b/pkgs/games/harmonist/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - postInstall = "mv $bin/bin/harmonist.git $bin/bin/harmonist"; + postInstall = "mv $out/bin/harmonist.git $out/bin/harmonist"; meta = with stdenv.lib; { description = "A stealth coffee-break roguelike game"; diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix index d3f284a2ddb..c3bca18a9a4 100644 --- a/pkgs/misc/logging/beats/6.x.nix +++ b/pkgs/misc/logging/beats/6.x.nix @@ -47,7 +47,7 @@ in { ''; buildInputs = [ systemd.dev ]; postFixup = let libPath = stdenv.lib.makeLibraryPath [ systemd.lib ]; in '' - patchelf --set-rpath ${libPath} "$bin/bin/journalbeat" + patchelf --set-rpath ${libPath} "$out/bin/journalbeat" ''; }; } diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix index cdc8417a9c1..61c89339fe7 100644 --- a/pkgs/misc/logging/beats/7.x.nix +++ b/pkgs/misc/logging/beats/7.x.nix @@ -46,7 +46,7 @@ in { ''; buildInputs = [ systemd.dev ]; postFixup = let libPath = stdenv.lib.makeLibraryPath [ systemd.lib ]; in '' - patchelf --set-rpath ${libPath} "$bin/bin/journalbeat" + patchelf --set-rpath ${libPath} "$out/bin/journalbeat" ''; }; } diff --git a/pkgs/servers/dex/default.nix b/pkgs/servers/dex/default.nix index 799b73294e8..09a3cd877ab 100644 --- a/pkgs/servers/dex/default.nix +++ b/pkgs/servers/dex/default.nix @@ -22,8 +22,8 @@ buildGoPackage rec { ]; postInstall = '' - mkdir -p $bin/share - cp -r $src/web $bin/share/web + mkdir -p $out/share + cp -r $src/web $out/share/web ''; meta = with lib; { diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix index 9a2bf7ce590..bdb4b4883da 100644 --- a/pkgs/servers/etcd/default.nix +++ b/pkgs/servers/etcd/default.nix @@ -22,7 +22,7 @@ buildGoPackage rec { ''; installPhase = '' - install -Dm755 bin/* bin/functional/cmd/* -t $bin/bin + install -Dm755 bin/* bin/functional/cmd/* -t $out/bin ''; passthru.tests = with nixosTests; { diff --git a/pkgs/servers/meguca/default.nix b/pkgs/servers/meguca/default.nix index 3088ee190e7..4c5521e97bb 100644 --- a/pkgs/servers/meguca/default.nix +++ b/pkgs/servers/meguca/default.nix @@ -35,9 +35,9 @@ buildGoPackage { ''; installPhase = '' - mkdir -p $bin/bin $bin/share/meguca - cp meguca $bin/bin - cp -r www $bin/share/meguca + mkdir -p $out/bin $out/share/meguca + cp meguca $out/bin + cp -r www $out/share/meguca ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/miniflux/default.nix b/pkgs/servers/miniflux/default.nix index bb841da74d2..43c41250970 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { ''; postInstall = '' - mv $bin/bin/miniflux.app $bin/bin/miniflux + mv $out/bin/miniflux.app $out/bin/miniflux ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/monitoring/grafana-reporter/default.nix b/pkgs/servers/monitoring/grafana-reporter/default.nix index 24756cc8bd2..d6f3c28d82b 100644 --- a/pkgs/servers/monitoring/grafana-reporter/default.nix +++ b/pkgs/servers/monitoring/grafana-reporter/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { }; postInstall = '' - wrapProgram $bin/bin/grafana-reporter \ + wrapProgram $out/bin/grafana-reporter \ --prefix PATH : ${makeBinPath [ tetex ]} ''; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 66e534a0f9a..7fdd9c70d9a 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -29,10 +29,10 @@ buildGoPackage rec { postInstall = '' tar -xvf $srcStatic - mkdir -p $bin/share/grafana - mv grafana-*/{public,conf,tools} $bin/share/grafana/ + mkdir -p $out/share/grafana + mv grafana-*/{public,conf,tools} $out/share/grafana/ '' + lib.optionalString phantomJsSupport '' - ln -sf ${phantomjs2}/bin/phantomjs $bin/share/grafana/tools/phantomjs/phantomjs + ln -sf ${phantomjs2}/bin/phantomjs $out/share/grafana/tools/phantomjs/phantomjs ''; meta = with lib; { diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index a4117d923e3..e8804702f0d 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -24,7 +24,7 @@ buildGoPackage rec { buildInputs = stdenv.lib.optionals stdenv.isLinux [ systemd.dev ]; preFixup = stdenv.lib.optionalString stdenv.isLinux '' - wrapProgram $bin/bin/promtail \ + wrapProgram $out/bin/promtail \ --prefix LD_LIBRARY_PATH : "${systemd.lib}/lib" ''; diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix index 9074c19e109..9402fa44eed 100644 --- a/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -27,7 +27,7 @@ buildGoPackage rec { nativeBuildInputs = [ installShellFiles ]; postInstall = '' - $bin/bin/amtool --completion-script-bash > amtool.bash + $out/bin/amtool --completion-script-bash > amtool.bash installShellCompletion amtool.bash ''; diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index e43e625e449..28b76234dd8 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -54,9 +54,9 @@ in buildGoPackage rec { ''; preInstall = '' - mkdir -p "$bin/share/doc/prometheus" "$bin/etc/prometheus" - cp -a $src/documentation/* $bin/share/doc/prometheus - cp -a $src/console_libraries $src/consoles $bin/etc/prometheus + mkdir -p "$out/share/doc/prometheus" "$out/etc/prometheus" + cp -a $src/documentation/* $out/share/doc/prometheus + cp -a $src/console_libraries $src/consoles $out/etc/prometheus ''; doCheck = true; diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix index 8202a8c8c29..b5a93343252 100644 --- a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix @@ -43,7 +43,7 @@ buildGoPackage rec { ]; postInstall = optionalString withSystemdSupport '' - wrapProgram $bin/bin/postfix_exporter \ + wrapProgram $out/bin/postfix_exporter \ --prefix LD_LIBRARY_PATH : "${systemd.lib}/lib" ''; diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index 0cb41f099c6..1425fccdca4 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -29,7 +29,7 @@ buildGoPackage rec { doInstallCheck = true; installCheckPhase = '' - export PATH=$PATH:$bin/bin + export PATH=$PATH:$out/bin pushgateway --help diff --git a/pkgs/servers/monitoring/uchiwa/default.nix b/pkgs/servers/monitoring/uchiwa/default.nix index 065af0079b0..9f0be68e168 100644 --- a/pkgs/servers/monitoring/uchiwa/default.nix +++ b/pkgs/servers/monitoring/uchiwa/default.nix @@ -16,7 +16,7 @@ let goPackagePath = "github.com/${owner}/${repo}"; inherit src; postInstall = '' - mkdir $out + mkdir -p $out cp go/src/github.com/sensu/uchiwa/public/index.html $out/ ''; }; @@ -37,7 +37,7 @@ in stdenv.mkDerivation { buildCommand = '' mkdir -p $out/bin $out/public - makeWrapper ${backend.bin}/bin/uchiwa $out/bin/uchiwa \ + makeWrapper ${backend}/bin/uchiwa $out/bin/uchiwa \ --add-flags "-p $out/public" ln -s ${backend.out}/index.html $out/public/index.html ln -s ${frontend.out}/bower_components $out/public/bower_components diff --git a/pkgs/servers/nginx-sso/default.nix b/pkgs/servers/nginx-sso/default.nix index e9bd705ffa9..769a8605f03 100644 --- a/pkgs/servers/nginx-sso/default.nix +++ b/pkgs/servers/nginx-sso/default.nix @@ -15,8 +15,8 @@ buildGoPackage rec { }; postInstall = '' - mkdir -p $bin/share - cp -R $src/frontend $bin/share + mkdir -p $out/share + cp -R $src/frontend $out/share ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index fb62ee58474..2ce8e901e86 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -42,7 +42,7 @@ buildGoPackage rec { installPhase = '' runHook preInstall - install -D cockroachoss $bin/bin/cockroach + install -D cockroachoss $out/bin/cockroach installShellCompletion cockroach.bash mkdir -p $man/share/man @@ -51,11 +51,7 @@ buildGoPackage rec { runHook postInstall ''; - # Unfortunately we have to keep an empty reference to $out, because it seems - # buildGoPackages only nukes references to the go compiler under $bin, effectively - # making all binary output under $bin mandatory. Ideally, we would just use - # $out and $man and remove $bin since there's no point in an empty path. :( - outputs = [ "bin" "man" "out" ]; + outputs = [ "out" "man" ]; meta = with stdenv.lib; { homepage = "https://www.cockroachlabs.com"; diff --git a/pkgs/tools/admin/docker-credential-helpers/default.nix b/pkgs/tools/admin/docker-credential-helpers/default.nix index 1f4315afc40..38762b6fd29 100644 --- a/pkgs/tools/admin/docker-credential-helpers/default.nix +++ b/pkgs/tools/admin/docker-credential-helpers/default.nix @@ -32,11 +32,11 @@ buildGoPackage rec { installPhase = if stdenv.isDarwin then '' - install -Dm755 -t $bin/bin bin/docker-credential-osxkeychain + install -Dm755 -t $out/bin bin/docker-credential-osxkeychain '' else '' - install -Dm755 -t $bin/bin bin/docker-credential-pass - install -Dm755 -t $bin/bin bin/docker-credential-secretservice + install -Dm755 -t $out/bin bin/docker-credential-pass + install -Dm755 -t $out/bin bin/docker-credential-secretservice ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 6051c16e91e..e4ac149a8ed 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -31,9 +31,9 @@ buildGoPackage rec { postInstall = '' # test binaries, code generation - rm $bin/bin/{deps,macaroon-identity,generate} + rm $out/bin/{deps,macaroon-identity,generate} - wrapProgram $bin/bin/lxd --prefix PATH : ${stdenv.lib.makeBinPath [ + wrapProgram $out/bin/lxd --prefix PATH : ${stdenv.lib.makeBinPath [ acl rsync gnutar xz btrfs-progs gzip dnsmasq squashfsTools iproute iptables ebtables bash criu (writeShellScriptBin "apparmor_parser" '' exec '${apparmor-parser}/bin/apparmor_parser' -I '${apparmor-profiles}/etc/apparmor.d' "$@" diff --git a/pkgs/tools/backup/diskrsync/default.nix b/pkgs/tools/backup/diskrsync/default.nix index 81209444455..b96d6d75725 100644 --- a/pkgs/tools/backup/diskrsync/default.nix +++ b/pkgs/tools/backup/diskrsync/default.nix @@ -17,7 +17,7 @@ buildGoPackage rec { buildInputs = [ makeWrapper ]; preFixup = '' - wrapProgram "$bin/bin/diskrsync" --argv0 diskrsync --prefix PATH : ${openssh}/bin + wrapProgram "$out/bin/diskrsync" --argv0 diskrsync --prefix PATH : ${openssh}/bin ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/backup/duplicacy/default.nix b/pkgs/tools/backup/duplicacy/default.nix index 1d754e4324d..b261289f0bf 100644 --- a/pkgs/tools/backup/duplicacy/default.nix +++ b/pkgs/tools/backup/duplicacy/default.nix @@ -19,7 +19,7 @@ buildGoPackage rec { ''; installPhase = '' - install -D duplicacy_main $bin/bin/duplicacy + install -D duplicacy_main $out/bin/duplicacy ''; meta = with lib; { diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index df9d613ee44..f366533f9bf 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { passthru.tests.restic = nixosTests.restic; postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' - $bin/bin/restic generate \ + $out/bin/restic generate \ --bash-completion restic.bash \ --zsh-completion restic.zsh \ --man . diff --git a/pkgs/tools/backup/restic/rest-server.nix b/pkgs/tools/backup/restic/rest-server.nix index c7f12cb751b..45a4df74b15 100644 --- a/pkgs/tools/backup/restic/rest-server.nix +++ b/pkgs/tools/backup/restic/rest-server.nix @@ -19,7 +19,7 @@ buildGoPackage rec { ''; installPhase = '' - install -Dt $bin/bin rest-server + install -Dt $out/bin rest-server ''; meta = with lib; { diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index f8d955dbfc1..3f0e261b18d 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -16,8 +16,8 @@ buildGoPackage rec { subPackages = [ "." "tools/mount_gcsfuse" ]; postInstall = '' - ln -s $bin/bin/mount_gcsfuse $bin/bin/mount.gcsfuse - ln -s $bin/bin/mount_gcsfuse $bin/bin/mount.fuse.gcsfuse + ln -s $out/bin/mount_gcsfuse $out/bin/mount.gcsfuse + ln -s $out/bin/mount_gcsfuse $out/bin/mount.fuse.gcsfuse ''; meta = with lib;{ diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix index 792b12688aa..3c97c168429 100644 --- a/pkgs/tools/misc/aptly/default.nix +++ b/pkgs/tools/misc/aptly/default.nix @@ -33,7 +33,7 @@ buildGoPackage { postInstall = '' installShellCompletion --bash ${aptlyCompletionSrc}/aptly - wrapProgram "$bin/bin/aptly" \ + wrapProgram "$out/bin/aptly" \ --prefix PATH ":" "${stdenv.lib.makeBinPath [ gnupg bzip2 xz graphviz ]}" ''; diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index 3c7e72f6d73..7a57c7ad08b 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -23,9 +23,9 @@ buildGoPackage rec { installPhase = '' mkdir -p $out - make install DESTDIR=$bin - mkdir -p $bin/share/fish/vendor_conf.d - echo "eval ($bin/bin/direnv hook fish)" > $bin/share/fish/vendor_conf.d/direnv.fish + make install DESTDIR=$out + mkdir -p $out/share/fish/vendor_conf.d + echo "eval ($out/bin/direnv hook fish)" > $out/share/fish/vendor_conf.d/direnv.fish ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix index f216e358d8a..c3e9a0dc2ff 100644 --- a/pkgs/tools/misc/mongodb-tools/default.nix +++ b/pkgs/tools/misc/mongodb-tools/default.nix @@ -45,7 +45,7 @@ in buildGoPackage { runHook preBuild ${stdenv.lib.concatMapStrings (t: '' - go build -o "$bin/bin/${t}" -tags ssl -ldflags "-s -w" $goPackagePath/${t}/main + go build -o "$out/bin/${t}" -tags ssl -ldflags "-s -w" $goPackagePath/${t}/main '') tools} runHook postBuild diff --git a/pkgs/tools/misc/phraseapp-client/default.nix b/pkgs/tools/misc/phraseapp-client/default.nix index a66a6688ad4..35bd84005b5 100644 --- a/pkgs/tools/misc/phraseapp-client/default.nix +++ b/pkgs/tools/misc/phraseapp-client/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { }; postInstall = '' - ln -s $bin/bin/phraseapp-client $bin/bin/phraseapp + ln -s $out/bin/phraseapp-client $out/bin/phraseapp ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/tewisay/default.nix b/pkgs/tools/misc/tewisay/default.nix index d2a8a1d0e87..b4f834bdd1a 100644 --- a/pkgs/tools/misc/tewisay/default.nix +++ b/pkgs/tools/misc/tewisay/default.nix @@ -18,12 +18,12 @@ buildGoPackage rec { goDeps = ./deps.nix; postInstall = '' - install -D -t $bin/share/tewisay/cows go/src/${goPackagePath}/cows/*.cow + install -D -t $out/share/tewisay/cows go/src/${goPackagePath}/cows/*.cow ''; preFixup = '' - wrapProgram $bin/bin/tewisay \ - --prefix COWPATH : $bin/share/tewisay/cows + wrapProgram $out/bin/tewisay \ + --prefix COWPATH : $out/share/tewisay/cows ''; meta = { diff --git a/pkgs/tools/networking/assh/default.nix b/pkgs/tools/networking/assh/default.nix index 9d4230524be..7b796a52e3a 100644 --- a/pkgs/tools/networking/assh/default.nix +++ b/pkgs/tools/networking/assh/default.nix @@ -10,7 +10,7 @@ buildGoPackage rec { nativeBuildInputs = [ makeWrapper ]; postInstall = '' - wrapProgram "$bin/bin/assh" \ + wrapProgram "$out/bin/assh" \ --prefix PATH : ${openssh}/bin ''; diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index 57d7244148d..dc29a95d92b 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -47,8 +47,8 @@ in buildGoPackage rec { # DataDog use paths relative to the agent binary, so fix these. postPatch = '' - sed -e "s|PyChecksPath =.*|PyChecksPath = \"$bin/${python.sitePackages}\"|" \ - -e "s|distPath =.*|distPath = \"$bin/share/datadog-agent\"|" \ + sed -e "s|PyChecksPath =.*|PyChecksPath = \"$out/${python.sitePackages}\"|" \ + -e "s|distPath =.*|distPath = \"$out/share/datadog-agent\"|" \ -i cmd/agent/common/common_nix.go sed -e "s|/bin/hostname|${lib.getBin hostname}/bin/hostname|" \ -i pkg/util/hostname_nix.go @@ -57,14 +57,14 @@ in buildGoPackage rec { # Install the config files and python modules from the "dist" dir # into standard paths. postInstall = '' - mkdir -p $bin/${python.sitePackages} $bin/share/datadog-agent - cp -R $src/cmd/agent/dist/conf.d $bin/share/datadog-agent - cp -R $src/cmd/agent/dist/{checks,utils,config.py} $bin/${python.sitePackages} + mkdir -p $out/${python.sitePackages} $out/share/datadog-agent + cp -R $src/cmd/agent/dist/conf.d $out/share/datadog-agent + cp -R $src/cmd/agent/dist/{checks,utils,config.py} $out/${python.sitePackages} - cp -R $src/pkg/status/dist/templates $bin/share/datadog-agent + cp -R $src/pkg/status/dist/templates $out/share/datadog-agent - wrapProgram "$bin/bin/agent" \ - --set PYTHONPATH "$bin/${python.sitePackages}" \ + wrapProgram "$out/bin/agent" \ + --set PYTHONPATH "$out/${python.sitePackages}" \ --prefix LD_LIBRARY_PATH : ${systemd.lib}/lib ''; diff --git a/pkgs/tools/networking/guardian-agent/default.nix b/pkgs/tools/networking/guardian-agent/default.nix index a5e8dc10d34..262234ca67b 100644 --- a/pkgs/tools/networking/guardian-agent/default.nix +++ b/pkgs/tools/networking/guardian-agent/default.nix @@ -23,14 +23,14 @@ buildGoPackage rec { goDeps = ./deps.nix; postInstall = '' - mkdir -p $bin/bin $out/share/doc/${pname} - cp -v ./go/src/github.com/StanfordSNR/${pname}/scripts/* $bin/bin/ + mkdir -p $out/bin $out/share/doc/${pname} + cp -v ./go/src/github.com/StanfordSNR/${pname}/scripts/* $out/bin/ cp -vr ./go/src/github.com/StanfordSNR/${pname}/{AUTHORS,doc,LICENSE,README.md} $out/share/doc/guardian-agent ''; postFixup = '' - wrapProgram $bin/bin/sga-guard \ - --prefix PATH : "$bin/bin" \ + wrapProgram $out/bin/sga-guard \ + --prefix PATH : "$out/bin" \ --prefix PATH : "${autossh}/bin" ''; diff --git a/pkgs/tools/package-management/morph/default.nix b/pkgs/tools/package-management/morph/default.nix index a1d2f15ad13..130bf2bb2e5 100644 --- a/pkgs/tools/package-management/morph/default.nix +++ b/pkgs/tools/package-management/morph/default.nix @@ -29,10 +29,10 @@ buildGoPackage rec { postInstall = '' mkdir -p $lib cp -v $src/data/*.nix $lib - wrapProgram $bin/bin/morph --prefix PATH : ${lib.makeBinPath [ openssh ]}; + wrapProgram $out/bin/morph --prefix PATH : ${lib.makeBinPath [ openssh ]}; ''; - outputs = [ "out" "bin" "lib" ]; + outputs = [ "out" "lib" ]; meta = with lib; { description = "Morph is a NixOS host manager written in Golang."; diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index cb640fb1639..4aee3737664 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -23,13 +23,13 @@ buildGoPackage rec { postInstall = '' for shell in bash fish zsh; do - $bin/bin/gopass completion $shell > gopass.$shell + $out/bin/gopass completion $shell > gopass.$shell installShellCompletion gopass.$shell done ''; postFixup = '' - wrapProgram $bin/bin/gopass \ + wrapProgram $out/bin/gopass \ --prefix PATH : "${wrapperPath}" ''; diff --git a/pkgs/tools/security/notary/default.nix b/pkgs/tools/security/notary/default.nix index 4f0b5f2c954..15797fc8665 100644 --- a/pkgs/tools/security/notary/default.nix +++ b/pkgs/tools/security/notary/default.nix @@ -26,7 +26,7 @@ buildGoPackage rec { installPhase = '' runHook preInstall - install -D bin/notary $bin/bin/notary + install -D bin/notary $out/bin/notary runHook postInstall ''; diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index ae46bbae40a..5c1409dae1a 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -23,7 +23,7 @@ buildGoPackage rec { ]; postInstall = '' - echo "complete -C $bin/bin/vault vault" > vault.bash + echo "complete -C $out/bin/vault vault" > vault.bash installShellCompletion vault.bash ''; diff --git a/pkgs/tools/security/verifpal/default.nix b/pkgs/tools/security/verifpal/default.nix index 95afb580d4e..e1e5e100bd1 100644 --- a/pkgs/tools/security/verifpal/default.nix +++ b/pkgs/tools/security/verifpal/default.nix @@ -28,8 +28,8 @@ buildGoPackage rec { ''; installPhase = '' - mkdir -p $bin/bin - cp go/src/$goPackagePath/build/bin/linux/verifpal $bin/bin/ + mkdir -p $out/bin + cp go/src/$goPackagePath/build/bin/linux/verifpal $out/bin/ ''; meta = { diff --git a/pkgs/tools/system/localtime/default.nix b/pkgs/tools/system/localtime/default.nix index 4dcb6afb00f..805a70c74e9 100644 --- a/pkgs/tools/system/localtime/default.nix +++ b/pkgs/tools/system/localtime/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { makeFlags = [ "PREFIX=${placeholder "out"}" - "BINDIR=${placeholder "bin"}/bin" + "BINDIR=${placeholder "out"}/bin" ]; buildPhase = '' diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/tools/virtualization/cri-tools/default.nix index dced8672ee6..65a7f7d1980 100644 --- a/pkgs/tools/virtualization/cri-tools/default.nix +++ b/pkgs/tools/virtualization/cri-tools/default.nix @@ -14,7 +14,7 @@ buildGoPackage rec { buildPhase = '' pushd go/src/${goPackagePath} - make all install BINDIR=$bin/bin + make all install BINDIR=$out/bin ''; meta = with lib; { diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix index a781f3a4424..6ad8c355ee2 100644 --- a/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/pkgs/tools/virtualization/distrobuilder/default.nix @@ -23,7 +23,7 @@ buildGoPackage rec { goDeps = ./deps.nix; postInstall = '' - wrapProgram $bin/bin/distrobuilder --prefix PATH ":" ${binPath} + wrapProgram $out/bin/distrobuilder --prefix PATH ":" ${binPath} ''; nativeBuildInputs = [ pkgconfig makeWrapper ]; -- cgit v1.2.3 From 6f693a9afe846e5ba6c4de551e63a91e4b246f6b Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Tue, 28 Apr 2020 12:28:37 +0200 Subject: pandoc: remove GHC from the runtime closure (2.4GB -> 180MB) Also moves the overrides to its own file before we clutter all-packages.nix any further. Comparison of the runtime closure: Before: [{'path': b'/nix/store/mxaxvp33wg9sim8qh2kkw041v492bvxj-libunistring-0.9.10', 'size': '1,634,416'}, {'path': b'/nix/store/hjng28vbd73qq9iz9j8r397x19aa8fp9-libidn2-2.3.0', 'size': '222,672'}, {'path': b'/nix/store/6m2k8kx8h216jlx9dg3lp4m90bz05yck-glibc-2.30', 'size': '31,082,264'}, {'path': b'/nix/store/0infa8sv151a1j6zz6lizbpmwv4ksh67-gcc-9.2.0-lib', 'size': '6,284,904'}, {'path': b'/nix/store/9si14qjcz8072c0v42zbkglq08s2cg04-bash-4.4-p23', 'size': '1,325,208'}, {'path': b'/nix/store/bnqfi6ycx6khjfmyyz0wvdgaq4k5p8wv-ghc-8.6.5-doc', 'size': '264,802,472'}, {'path': b'/nix/store/8xhn1y70dbvc5sqxaxvbgc5nqdiahyb2-hashable-1.2.7.0-doc', 'size': '902,800'}, {'path': b'/nix/store/cikknfzlf88qj0fi5m7r547biyji0vnw-primitive-0.6.4.0-doc', 'size': '4,520,392'}, {'path': b'/nix/store/drbcz1f6qfas7r8fsb6qriafzypah1kd-integer-logarithms-1' b'.0.3-doc', 'size': '354,280'}, {'path': b'/nix/store/idk0kl0xg7kmzri5d9bfz4h32ycbz1bw-scientific-0.3.6.2-doc', 'size': '925,408'}, {'path': b'/nix/store/0qxwawz8fc3nz59n07scgh1b3l68ifwf-attoparsec-0.13.2.3-' b'doc', 'size': '3,234,760'}, {'path': b'/nix/store/6wfnl0kvgz9r1z8wp53ildc2hgsysybl-libffi-3.3', 'size': '56,728'}, {'path': b'/nix/store/d38akrx7lljl6pl5gqdxcsmf57k9w08v-gmp-6.2.0', 'size': '751,936'}, {'path': b'/nix/store/fv7c5dxd6cq0w2yl21rpsgmwra87h7x5-ncurses-6.1-20190112', 'size': '3,556,472'}, {'path': b'/nix/store/m0w464nw8ry965np116v3zi0azhcr2ql-attr-2.4.48', 'size': '89,136'}, {'path': b'/nix/store/fv2g7kwbr8a609rzq56fv8lm5h1brwxd-acl-2.2.53', 'size': '109,920'}, {'path': b'/nix/store/bgvd279hrb53i3ah2mi0nf8jp6g6g6g9-coreutils-8.31', 'size': '1,839,848'}, {'path': b'/nix/store/6hhxlbabm7xxdfdw9mbxb8llh63k1bxx-linux-headers-4.19.16', 'size': '4,960,528'}, {'path': b'/nix/store/v235kcs9jfd5vw9d1ylwilqvf49dyjhg-glibc-2.30-bin', 'size': '2,750,608'}, {'path': b'/nix/store/c9l946swbx2v67mwamd3vrypha4l9nz0-glibc-2.30-dev', 'size': '2,479,160'}, {'path': b'/nix/store/qvgf4g9c5h3wzq4xjy566vc0pqgc9fjq-zlib-1.2.11', 'size': '124,336'}, {'path': b'/nix/store/pbfnvqlf8bgp09gy601554ph83y4qzp5-gcc-9.2.0', 'size': '143,309,504'}, {'path': b'/nix/store/nyhj00w339gk2gaj3faz70gjrnbmam8v-binutils-2.31.1', 'size': '33,502,640'}, {'path': b'/nix/store/yrrr7hwcmlr11cl61rjmclp9wrrb92iy-expand-response-params', 'size': '17,368'}, {'path': b'/nix/store/sh8l6la5mv29girlgswnd23s0vfpcfdn-binutils-wrapper-2.3' b'1.1', 'size': '37,992'}, {'path': b'/nix/store/i5k2ibiprmks1bddmjm12fgi30maldzf-pcre-8.43', 'size': '497,632'}, {'path': b'/nix/store/sjvvyjp67sssnpl0k0g5ysmcm8xscwp4-gnugrep-3.4', 'size': '802,368'}, {'path': b'/nix/store/1v0410l20p343l6cvpijz8bi4if2ysh6-gcc-wrapper-9.2.0', 'size': '41,392'}, {'path': b'/nix/store/m0cjgyzlz31s85kl92vgcggsdvb9svcj-libffi-3.3-dev', 'size': '20,296'}, {'path': b'/nix/store/qfmbizy1jv469c1cjfv2vx5h9mdmqapc-gmp-6.2.0-dev', 'size': '215,640'}, {'path': b'/nix/store/yvmfc6lcsljxb8mdpaz63yl1j0z2zzm2-perl-5.30.1', 'size': '53,237,064'}, {'path': b'/nix/store/hz3nwwc0k32ygvjn63gw8gm0nf9gprd8-ghc-8.6.5', 'size': '1,479,053,416'}, {'path': b'/nix/store/6dva17vynqmcib4zjiwn2wqm3nalwks0-integer-logarithms-1' b'.0.3', 'size': '623,632'}, {'path': b'/nix/store/akabgy94c61fnazi0qag5jsj8ysc5y0p-primitive-0.6.4.0', 'size': '9,668,344'}, {'path': b'/nix/store/m2ba7a3d39g0qqr3xd80wgbli555n9q6-hashable-1.2.7.0', 'size': '2,462,152'}, {'path': b'/nix/store/bas2z2zbc24namg1b81kb7cg8x6d6fiw-scientific-0.3.6.2', 'size': '3,125,400'}, {'path': b'/nix/store/0plyy7kq8nxkmv9zi4glgfkcmlz255zl-attoparsec-0.13.2.3', 'size': '16,785,040'}, {'path': b'/nix/store/amya73lz4zziz1zgzb4fvb5b2mn27g8m-random-1.1-doc', 'size': '567,288'}, {'path': b'/nix/store/2n12ini2shm6s7l59ghw98qz198qlnxk-splitmix-0.0.3-doc', 'size': '439,144'}, {'path': b'/nix/store/i5l69z2c0fa4rfkcjjz5bh1ygj3gv742-vector-0.12.1.2-doc', 'size': '17,714,256'}, {'path': b'/nix/store/2na544033hzy4dv5vdy6g48wfzb2ggy2-vector-0.12.1.2', 'size': '47,636,440'}, {'path': b'/nix/store/2yjdlxxhzdi05jcpv8i8dcg8dvg2ms5l-readline-6.3p08', 'size': '391,888'}, {'path': b'/nix/store/ra9ccq229ni22zbxcw3spyjzxxriiraa-network-uri-2.6.2.0-' b'doc', 'size': '919,848'}, {'path': b'/nix/store/3jibbksnd12zj2vkvnm0alp89ax6cfp8-network-uri-2.6.2.0', 'size': '4,475,984'}, {'path': b'/nix/store/cbl6ryhcwbmmqcqmn3g05l5vwsqq7lhh-syb-0.7.1-doc', 'size': '1,077,416'}, {'path': b'/nix/store/iwdppd7ffrx6sbnrx968g3p8s9siixvq-QuickCheck-2.13.2-doc', 'size': '5,510,272'}, {'path': b'/nix/store/8iqwq1m1lc44n23f44rfzvq879crgsd8-unordered-containers' b'-0.2.10.0-doc', 'size': '2,505,120'}, {'path': b'/nix/store/cwgsw7fmsl32z4wwg4wmb8r4i9cqi7ax-base-compat-0.10.5-doc', 'size': '3,928,200'}, {'path': b'/nix/store/dfs4nsfcmvrqb4pfs528mcbx7p6h8rd9-dlist-0.8.0.7-doc', 'size': '287,408'}, {'path': b'/nix/store/fmj6pfcrz6gwpd5ikrhv3sv1lvhzdnkr-tagged-0.8.6-doc', 'size': '585,768'}, {'path': b'/nix/store/fq7gnr6x16s36yyq3ijzg705frg04dsy-th-abstraction-0.3.1' b'.0-doc', 'size': '1,423,760'}, {'path': b'/nix/store/qhbh3dj2b9rx7xplp5fz48fpa05rcws1-uuid-types-1.0.3-doc', 'size': '495,104'}, {'path': b'/nix/store/cmx2kqns3vy0xlpfwbnxfz4br4a050yv-base-orphans-0.8.2-doc', 'size': '1,109,168'}, {'path': b'/nix/store/wj6r2pm4vsbqm17fmcnz3mm8iam9myc8-time-compat-1.9.2.2-' b'doc', 'size': '1,879,624'}, {'path': b'/nix/store/v0w0r8idgapbna2qjb6g2k2k16qfqz0d-aeson-1.4.6.0-doc', 'size': '8,699,624'}, {'path': b'/nix/store/3zsd0wqy8c3x9nvja8bhs8r10y4wl1p1-pandoc-types-1.17.6.' b'1-doc', 'size': '2,551,784'}, {'path': b'/nix/store/4857x32hdkrrd2iqsn2m5d95xaj1s4p8-network-2.8.0.1-doc', 'size': '2,117,320'}, {'path': b'/nix/store/7qn29l7gyvnfc0pvxsmqr7nvkpw0ndn1-tagged-0.8.6', 'size': '1,883,152'}, {'path': b'/nix/store/84i7995b3md52k9xvys2jdq7pmyrxckv-unordered-containers' b'-0.2.10.0', 'size': '6,878,528'}, {'path': b'/nix/store/ankhr2045qag4g0jb14p2z5mjqp7mdpn-base-orphans-0.8.2', 'size': '1,619,536'}, {'path': b'/nix/store/cjqcam9fp4bkbz5c2scgpgrywzny8h2k-dlist-0.8.0.7', 'size': '732,544'}, {'path': b'/nix/store/d3jdb9fz47z35p05pr3xgyrg7sffp78b-base-compat-0.10.5', 'size': '2,244,632'}, {'path': b'/nix/store/k0jpihzyqp475i39haciq86h929lp1ql-random-1.1', 'size': '3,503,896'}, {'path': b'/nix/store/i88qnwrc40lskrji9pb0q8f5qpdd7jbi-uuid-types-1.0.3', 'size': '1,643,272'}, {'path': b'/nix/store/jl9ns5773w6vx0rqhv1f67ydsww22r27-time-compat-1.9.2.2', 'size': '4,675,896'}, {'path': b'/nix/store/pwfwlzn5qa61aravfhw670hjd3cyacfs-th-abstraction-0.3.1.0', 'size': '5,370,256'}, {'path': b'/nix/store/bciw51ipp7z9npkpwyj1nkjx6ayk62yl-aeson-1.4.6.0', 'size': '66,540,376'}, {'path': b'/nix/store/g8daac71hgx0h735rwnj5n69mswxv4xp-pandoc-2.7.3-data', 'size': '641,776'}, {'path': b'/nix/store/r9rz4fiq8z4gppzf7miqkq1cbnw40yz6-splitmix-0.0.3', 'size': '766,920'}, {'path': b'/nix/store/hs0mrcymg5alw1jlz46pb5ypgk7yf3js-QuickCheck-2.13.2', 'size': '20,329,560'}, {'path': b'/nix/store/pf2bzndm7l357pc3hi5chsavvnn1wbmp-syb-0.7.1', 'size': '2,904,168'}, {'path': b'/nix/store/gkllhz4s27p4nqnwyrxc04c6829bsnkn-pandoc-types-1.17.6.1', 'size': '19,829,464'}, {'path': b'/nix/store/pywbwq86hy6c592aa1fnzvj8nqvmq90i-lua-5.3.5', 'size': '1,585,744'}, {'path': b'/nix/store/r0kkdb3ilqi2blsc77nlkyxvvwwfalh9-HTTP-4000.3.14-doc', 'size': '3,377,184'}, {'path': b'/nix/store/r900ixyg8b9i6ygayax9p4rgh79lzbky-network-2.8.0.1', 'size': '9,063,944'}, {'path': b'/nix/store/rq51qlkaf3v5g51q19f9dwyfxv86q3qq-HTTP-4000.3.14', 'size': '11,520,256'}, {'path': b'/nix/store/z7ln4gszk2nns7qs9k0j6zvw20cv22hw-pandoc-2.7.3', 'size': '131,976,264'}] total: 2,476,810,912 After: [{'path': b'/nix/store/00d9ds1iqjxpbp3c2rsb0wyl3ypcck4y-pandoc-2.7.3-data', 'size': '641,776'}, {'path': b'/nix/store/mxaxvp33wg9sim8qh2kkw041v492bvxj-libunistring-0.9.10', 'size': '1,634,416'}, {'path': b'/nix/store/hjng28vbd73qq9iz9j8r397x19aa8fp9-libidn2-2.3.0', 'size': '222,672'}, {'path': b'/nix/store/6m2k8kx8h216jlx9dg3lp4m90bz05yck-glibc-2.30', 'size': '31,082,264'}, {'path': b'/nix/store/0infa8sv151a1j6zz6lizbpmwv4ksh67-gcc-9.2.0-lib', 'size': '6,284,904'}, {'path': b'/nix/store/fv7c5dxd6cq0w2yl21rpsgmwra87h7x5-ncurses-6.1-20190112', 'size': '3,556,472'}, {'path': b'/nix/store/2yjdlxxhzdi05jcpv8i8dcg8dvg2ms5l-readline-6.3p08', 'size': '391,888'}, {'path': b'/nix/store/6wfnl0kvgz9r1z8wp53ildc2hgsysybl-libffi-3.3', 'size': '56,728'}, {'path': b'/nix/store/d38akrx7lljl6pl5gqdxcsmf57k9w08v-gmp-6.2.0', 'size': '751,936'}, {'path': b'/nix/store/pywbwq86hy6c592aa1fnzvj8nqvmq90i-lua-5.3.5', 'size': '1,585,744'}, {'path': b'/nix/store/qvgf4g9c5h3wzq4xjy566vc0pqgc9fjq-zlib-1.2.11', 'size': '124,336'}, {'path': b'/nix/store/gg13d8cj775qbn81sbvjqlazxm14b2jq-pandoc-2.7.3', 'size': '131,919,072'}] total: 178,252,208 --- pkgs/development/tools/pandoc/default.nix | 29 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +---- 2 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/tools/pandoc/default.nix diff --git a/pkgs/development/tools/pandoc/default.nix b/pkgs/development/tools/pandoc/default.nix new file mode 100644 index 00000000000..ce7132b0007 --- /dev/null +++ b/pkgs/development/tools/pandoc/default.nix @@ -0,0 +1,29 @@ +{ haskellPackages, haskell, removeReferencesTo }: + +let + static = haskell.lib.justStaticExecutables haskellPackages.pandoc; + +in + (haskell.lib.overrideCabal static (drv: { + configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"]; + buildDepends = drv.buildDepends or [] ++ [haskellPackages.file-embed]; + buildTools = (drv.buildTools or []) ++ [ removeReferencesTo ]; + })).overrideAttrs (drv: { + + # These libraries are still referenced, because pandoc references + # their `Paths_*` module for figuring out their version. + # The `Paths_*` module is generated by Cabal, and contains the + # version, but also paths to e.g. the data directories, which + # lead to a transitive runtime dependency on the whole GHC distribution. + # This should ideally be fixed in haskellPackages (or even Cabal), + # but a minimal pandoc is important enough to patch it manually. + disallowedReferences = [ haskellPackages.pandoc-types haskellPackages.HTTP ]; + postInstall = '' + remove-references-to \ + -t ${haskellPackages.pandoc-types} \ + $out/bin/pandoc + remove-references-to \ + -t ${haskellPackages.HTTP} \ + $out/bin/pandoc + ''; + }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2fae02ba57..ba33311a39e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5752,10 +5752,7 @@ in pal = callPackage ../tools/misc/pal { }; - pandoc = haskell.lib.overrideCabal (haskell.lib.justStaticExecutables haskellPackages.pandoc) (drv: { - configureFlags = drv.configureFlags or [] ++ ["-fembed_data_files"]; - buildDepends = drv.buildDepends or [] ++ [haskellPackages.file-embed]; - }); + pandoc = callPackage ../development/tools/pandoc { }; pamtester = callPackage ../tools/security/pamtester { }; -- cgit v1.2.3 From 7686c2cc6ad7d4606ed35b29ea42f4d33de7cba1 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 28 Apr 2020 11:53:00 +0100 Subject: fish: Patch __fish_anypython function to return build input python3 --- pkgs/shells/fish/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index bea56bd8c5a..ec4e72dba07 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -148,6 +148,13 @@ let sed -i "s|/usr/local/sbin /sbin /usr/sbin||" \ $out/share/fish/completions/{sudo.fish,doas.fish} + cat > $out/share/fish/functions/__fish_anypython.fish < Date: Tue, 28 Apr 2020 08:03:25 -0300 Subject: pop-icon-theme: init at 2020-03-04 --- pkgs/data/icons/pop-icon-theme/default.nix | 45 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/data/icons/pop-icon-theme/default.nix diff --git a/pkgs/data/icons/pop-icon-theme/default.nix b/pkgs/data/icons/pop-icon-theme/default.nix new file mode 100644 index 00000000000..76b393dcf79 --- /dev/null +++ b/pkgs/data/icons/pop-icon-theme/default.nix @@ -0,0 +1,45 @@ +{ stdenv +, fetchFromGitHub +, meson +, ninja +, gtk3 +, breeze-icons +, gnome3 +, pantheon +, hicolor-icon-theme +}: + +stdenv.mkDerivation rec { + pname = "pop-icon-theme"; + version = "2020-03-04"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = "icon-theme"; + rev = "11f18cb48455b47b6535018f1968777100471be1"; + sha256 = "1s4pjwv2ynw400gnzgzczlxzw3gxh5s8cxxbi9zpxq4wzjg6jqyv"; + }; + + nativeBuildInputs = [ + meson + ninja + gtk3 + ]; + + propagatedBuildInputs = [ + breeze-icons + gnome3.adwaita-icon-theme + pantheon.elementary-icon-theme + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; + + meta = with stdenv.lib; { + description = "Icon theme for Pop!_OS with a semi-flat design and raised 3D motifs"; + homepage = "https://github.com/pop-os/icon-theme"; + license = with licenses; [ cc-by-sa-40 gpl3 ]; + platforms = platforms.unix; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2fae02ba57..0cdc4f041d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18131,6 +18131,8 @@ in pop-gtk-theme = callPackage ../data/themes/pop-gtk { }; + pop-icon-theme = callPackage ../data/icons/pop-icon-theme { }; + posix_man_pages = callPackage ../data/documentation/man-pages-posix { }; powerline-fonts = callPackage ../data/fonts/powerline-fonts { }; -- cgit v1.2.3 From 9eede8946155b8d30a48e1fe21fa52680e9ee353 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Tue, 28 Apr 2020 13:11:43 +0200 Subject: dbeaver: 7.0.2 -> 7.0.3 --- pkgs/applications/misc/dbeaver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 64c3f8ac282..163cb5ed54e 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "dbeaver-ce"; - version = "7.0.2"; + version = "7.0.3"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "0p75kvs9ng5i5x5cpdqxlf18y3k83pqsvrkab0i1azk3x4lfkzmd"; + sha256 = "189rsavmaa7480r61qhpzagia3c8jr3dfcl01ks3nfyq53j08hml"; }; installPhase = '' -- cgit v1.2.3 From 7c995a453220b0269ffd844344982fcc195212ef Mon Sep 17 00:00:00 2001 From: Julian Stecklina Date: Wed, 22 Apr 2020 13:13:59 +0200 Subject: virtualbox: build BIOS from C instead of alternative sources VirtualBox ships with "alternative BIOS sources" for its virtual BIOS. These are generated by first compiling the BIOS C sources with the Open Watcom toolchain, disassembling the output and checking in the disassembly into the VirtualBox repo. The result means that the BIOS C code cannot be patched, because it's not compiled from the C sources, if Open Watcom is not there. As Open Watcom is now available in nixpkgs, we can just ignore the alternative BIOS sources and compile it from C directly. --- pkgs/applications/virtualization/virtualbox/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index df7b81a43c8..7b7929d9f1d 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -3,6 +3,9 @@ , libpng, glib, lvm2, libXrandr, libXinerama, libopus, qtbase, qtx11extras , qttools, qtsvg, qtwayland, pkgconfig, which, docbook_xsl, docbook_xml_dtd_43 , alsaLib, curl, libvpx, nettools, dbus, substituteAll, fetchpatch +# If open-watcom-bin is not passed, VirtualBox will fall back to use +# the shipped alternative sources (assembly). +, open-watcom-bin ? null , makeself, perl , javaBindings ? true, jdk ? null # Almost doesn't affect closure size , pythonBindings ? false, python3 ? null @@ -148,6 +151,7 @@ in stdenv.mkDerivation { ${optionalString (!pulseSupport) "--disable-pulse"} \ ${optionalString (!enableHardening) "--disable-hardening"} \ ${optionalString (!enable32bitGuests) "--disable-vmmraw"} \ + ${optionalString (open-watcom-bin != null) "--with-ow-dir=${open-watcom-bin}"} \ --disable-kmods sed -e 's@PKG_CONFIG_PATH=.*@PKG_CONFIG_PATH=${libIDL}/lib/pkgconfig:${glib.dev}/lib/pkgconfig ${libIDL}/bin/libIDL-config-2@' \ -i AutoConfig.kmk -- cgit v1.2.3 From a89afa13fd898900c7b0a2df696c3f11433e2a76 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 14 Apr 2020 11:27:12 +0200 Subject: ocamlPackages.angstrom*: 0.12.1 -> 0.13.0 also updates: * ocamlPackages.angstrom-unix * ocamlPackages.angstrom-lwt-unix * ocamlPackages.angstrom-async --- pkgs/development/ocaml-modules/angstrom/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/angstrom/default.nix b/pkgs/development/ocaml-modules/angstrom/default.nix index 21482266c28..b05190ed491 100644 --- a/pkgs/development/ocaml-modules/angstrom/default.nix +++ b/pkgs/development/ocaml-modules/angstrom/default.nix @@ -2,15 +2,15 @@ buildDunePackage rec { pname = "angstrom"; - version = "0.12.1"; + version = "0.13.0"; - minimumOCamlVersion = "4.03"; + minimumOCamlVersion = "4.04"; src = fetchFromGitHub { owner = "inhabitedtype"; repo = pname; rev = version; - sha256 = "0w0wavqzdy2hrh7cjyl9w72ad4vndhwhknwvyacvkwkja5wys5b2"; + sha256 = "0vzbwd8j34iv7n6gwqq2mf25q7rqpnpxnifb9ssxhq55p5dd1kp4"; }; checkInputs = [ alcotest ]; -- cgit v1.2.3 From 660d2841372733dfb3424270b1a866e6479ba3b5 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 28 Apr 2020 13:45:43 +0200 Subject: signal-desktop: 1.33.3 -> 1.33.4 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index c39b199235d..2c781d7dd49 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -23,7 +23,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.33.3"; # Please backport all updates to the stable channel. + version = "1.33.4"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "1brw1hidmrznb55cb794yvgzin7sf3cxnffivmag4vf2a2vcvf4y"; + sha256 = "0mcxia2zaflaazfdl1ngpab0dyhwwzbhad7brc6kwhjxydbnmwcd"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 9d88d8e23d2a701bc2aa2a19e9714ba106178daa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 28 Apr 2020 08:56:15 -0300 Subject: gnome: document packaging icon themes --- doc/languages-frameworks/gnome.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/doc/languages-frameworks/gnome.xml b/doc/languages-frameworks/gnome.xml index 7671714d8a9..afc2de27db5 100644 --- a/doc/languages-frameworks/gnome.xml +++ b/doc/languages-frameworks/gnome.xml @@ -40,6 +40,23 @@ +
+ Packaging icon themes + + + Icon themes may inherit from other icon themes. The inheritance is specified using the `Inherits` key in the `index.theme` file distributed with the icon theme. According to the icon theme specification icons not provided by the theme are looked for in its parent icon themes. Therefore the parent themes should be installed as dependencies for a more complete experience regarding the icon sets used. + + + + The package hicolor-icon-theme provides a setup hook which makes symbolic links for the parent themes into the directory share/icons of the current theme directory in the nix store, making sure they can be found at runtime. For that to work the packages providing parent icon themes should be listed as propagated build dependencies, toghether with hicolor-icon-theme. + + + + Also make sure that icon-theme.cache is installed for each theme provided by the package, and set dontDropIconThemeCache to true so that the cache file is not removed by the gtk3 setup hook. + + +
+
GTK Themes -- cgit v1.2.3 From facfa00202afbd9753053ed079f3888773d27a80 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 28 Apr 2020 13:59:05 +0200 Subject: signal-desktop: Add passthru.tests --- .../networking/instant-messengers/signal-desktop/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 2c781d7dd49..4a751bac4ac 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, wrapGAppsHook +{ stdenv, lib, fetchurl, autoPatchelfHook, dpkg, wrapGAppsHook, nixosTests , gnome2, gtk3, atk, at-spi2-atk, cairo, pango, gdk-pixbuf, glib, freetype, fontconfig , dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite , libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib @@ -121,6 +121,9 @@ in stdenv.mkDerivation rec { autoPatchelf --no-recurse -- $out/lib/Signal/ ''; + # Tests if the application launches and waits for "Link your phone to Signal Desktop": + passthru.tests.application-launch = nixosTests.signal-desktop; + meta = { description = "Private, simple, and secure messenger"; longDescription = '' -- cgit v1.2.3 From 83c66e956fa16930ac8ccfad199007b494ce6346 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Tue, 28 Apr 2020 12:00:00 +0000 Subject: nix-du: fix with strictDeps Fixes https://github.com/symphorien/nix-du/issues/4 --- pkgs/tools/package-management/nix-du/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix index fa1394242d2..417962733af 100644 --- a/pkgs/tools/package-management/nix-du/default.nix +++ b/pkgs/tools/package-management/nix-du/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1a6svl89dcdb5fpvs2i32i6agyhl0sx7kkkw70rqr17fyzl5psai"; doCheck = true; - checkInputs = [ graphviz ]; + checkInputs = [ nix graphviz ]; buildInputs = [ boost -- cgit v1.2.3 From 30d5f9709a2744a8cc469aa08853c860a64da7bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 22 Apr 2020 13:23:48 +0100 Subject: kinetic-cpp-client: remove - not updated since 2015 - upstream has no releases since 2016 - has no maintainer in nixpkgs - marked as insecure because of old openssl --- .../libraries/kinetic-cpp-client/build-fix.patch | 224 --------------------- .../libraries/kinetic-cpp-client/default.nix | 58 ------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 - 4 files changed, 1 insertion(+), 286 deletions(-) delete mode 100644 pkgs/development/libraries/kinetic-cpp-client/build-fix.patch delete mode 100644 pkgs/development/libraries/kinetic-cpp-client/default.nix diff --git a/pkgs/development/libraries/kinetic-cpp-client/build-fix.patch b/pkgs/development/libraries/kinetic-cpp-client/build-fix.patch deleted file mode 100644 index 49edbf63a54..00000000000 --- a/pkgs/development/libraries/kinetic-cpp-client/build-fix.patch +++ /dev/null @@ -1,224 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8217cba..a6c1d70 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -32,7 +32,7 @@ else(APPLE) - endif(${BUILD_FOR_ARM}) - endif(APPLE) - --set(CMAKE_CXX_FLAGS "--std=c++0x -Wall -Wextra -Werror -Wno-unknown-warning-option -Wno-unused-parameter -Wno-null-dereference -Wno-unused-local-typedefs -DGTEST_USE_OWN_TR1_TUPLE=1 ${BUILD_PIC_COMPILER_FLAGS}") -+set(CMAKE_CXX_FLAGS "--std=c++11 -DGTEST_USE_OWN_TR1_TUPLE=1 ${BUILD_PIC_COMPILER_FLAGS}") - - set(TEST_BINARY "kinetic_client_test") - set(TEST_BINARY_PATH ${kinetic_cpp_client_BINARY_DIR}/${TEST_BINARY}) -@@ -50,103 +50,16 @@ set(GENERATED_SOURCES_PATH ${kinetic_cpp_client_SOURCE_DIR}/src/main/generated) - set(PREFIX "${CMAKE_BINARY_DIR}/vendor") - set(EXTERNAL_PREFIX "${kinetic_cpp_client_BINARY_DIR}/vendor") - --include(ExternalProject) -- --set(KINETIC_PROTO_VERSION "3.0.0") --set(KINETIC_PROTO_MD5 "85ca027b870811a297c1f6d792498934") -- --ExternalProject_add( -- kinetic-proto -- PREFIX ${PREFIX} -- DOWNLOAD_COMMAND curl -L https://github.com/Seagate/kinetic-protocol/archive/${KINETIC_PROTO_VERSION}.tar.gz -o kinetic-proto.tar.gz && openssl md5 kinetic-proto.tar.gz | grep -q ${KINETIC_PROTO_MD5} && rm -rf kinetic-proto && mkdir -p kinetic-proto && tar -xz --strip-components 1 -C kinetic-proto -f kinetic-proto.tar.gz -- BUILD_IN_SOURCE 1 -- CONFIGURE_COMMAND "" -- BUILD_COMMAND "" -- INSTALL_COMMAND "" --) -- --ExternalProject_add( -- gflags -- PREFIX ${EXTERNAL_PREFIX} -- URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/gflags-2.0-no-svn-files.tar.gz" -- URL_MD5 "9084829124e02a7e6be0f0f824523423" -- CONFIGURE_COMMAND ../gflags/configure --prefix=${EXTERNAL_PREFIX} --enable-static ${CONFIG_HOST_FLAG} ${CHILD_MAKE_FLAGS} ${PIC_MAKE_FLAGS} --) -- --ExternalProject_add( -- glog -- PREFIX ${EXTERNAL_PREFIX} -- URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/glog-0.3.3.tar.gz" -- URL_MD5 "a6fd2c22f8996846e34c763422717c18" -- PATCH_COMMAND sh ${kinetic_cpp_client_SOURCE_DIR}/patches/apply-glog-patches.sh ${kinetic_cpp_client_SOURCE_DIR} -- CONFIGURE_COMMAND ../glog/configure --prefix=${EXTERNAL_PREFIX} --with-gflags=${EXTERNAL_PREFIX} --enable-static ${CONFIG_HOST_FLAG} ${CHILD_MAKE_FLAGS} ${PIC_MAKE_FLAGS} -- DEPENDS gflags --) -- --ExternalProject_add( -- gtest -- PREFIX ${EXTERNAL_PREFIX} -- URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/gtest-1.6.0.zip" -- URL_MD5 "4577b49f2973c90bf9ba69aa8166b786" -- BUILD_IN_SOURCE 1 -- CONFIGURE_COMMAND "" -- BUILD_COMMAND ${CMAKE_CXX_COMPILER} -DGTEST_USE_OWN_TR1_TUPLE=1 -I../gtest -I../gtest/include -c ../gtest/src/gtest-all.cc && ar -rv libgtest.a gtest-all.o && ranlib libgtest.a -- INSTALL_COMMAND "" --) -- --ExternalProject_add( -- gmock -- PREFIX ${EXTERNAL_PREFIX} -- URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/gmock-1.6.0.zip" -- URL_MD5 "f547f47321ca88d3965ca2efdcc2a3c1" -- BUILD_IN_SOURCE 1 -- CONFIGURE_COMMAND "" -- BUILD_COMMAND ${CMAKE_CXX_COMPILER} -DGTEST_USE_OWN_TR1_TUPLE=1 -I../gmock -I../gmock/include -I../gtest -I../gtest/include -c ../gmock/src/gmock-all.cc && ar -rv libgmock.a gmock-all.o && ranlib libgmock.a -- INSTALL_COMMAND "" -- DEPENDS gtest --) -- --ExternalProject_add( -- openssl -- PREFIX ${EXTERNAL_PREFIX} -- URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/openssl-1.0.1g.tar.gz" -- URL_MD5 "de62b43dfcd858e66a74bee1c834e959" -- BUILD_IN_SOURCE 1 -- CONFIGURE_COMMAND ${OPENSSL_CONFIGURE_COMMAND} --prefix=${EXTERNAL_PREFIX} ${BUILD_PIC_COMPILER_FLAG} -- BUILD_COMMAND touch apps/openssl && touch openssl.pc && make ${CHILD_MAKE_FLAGS} build_libs libssl.pc libcrypto.pc -- INSTALL_COMMAND make install_sw --) -- --# The protobuf build requires the existence of a protoc binary that can be --# executed on the host machine. To handle cross compilation, we always build --# protobuf once for the host so that we have a suitable copy of protoc. --ExternalProject_add( -- protoc -- PREFIX ${EXTERNAL_PREFIX}/host -- URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/protobuf-2.5.0.tar.bz2" -- URL_MD5 "a72001a9067a4c2c4e0e836d0f92ece4" -- CONFIGURE_COMMAND ../protoc/configure --prefix=${EXTERNAL_PREFIX}/host --enable-static --) -- - # Protobuf code generation rules --set(PROTOC_PATH "${PREFIX}/host/bin/protoc") --set(PROTO_DIR "${CMAKE_BINARY_DIR}/vendor/src/kinetic-proto") -+set(PROTOC_PATH "protoc") -+set(PROTO_DIR "${CMAKE_BINARY_DIR}/kinetic-proto") - set(PROTO_ORIG_PATH "${PROTO_DIR}/kinetic.proto") - set(PROTO_MODIFIED_PATH "${PROTO_DIR}/kinetic_client.proto") --ExternalProject_add( -- protobuf -- PREFIX ${EXTERNAL_PREFIX} -- URL "${kinetic_cpp_client_SOURCE_DIR}/tarballs/protobuf-2.5.0.tar.bz2" -- URL_MD5 "a72001a9067a4c2c4e0e836d0f92ece4" -- CONFIGURE_COMMAND ../protobuf/configure --prefix=${EXTERNAL_PREFIX} --enable-static --with-protoc=${PROTOC_PATH} ${CONFIG_HOST_FLAG} ${CHILD_MAKE_FLAGS} ${PIC_MAKE_FLAGS} -- DEPENDS protoc --) - - add_custom_command( - COMMENT "Compiling protobuf" - OUTPUT ${GENERATED_SOURCES_PATH}/kinetic_client.pb.h ${GENERATED_SOURCES_PATH}/kinetic_client.pb.cc - COMMAND mkdir -p ${GENERATED_SOURCES_PATH} && sed 's/com\\.seagate\\.kinetic\\.proto/com.seagate.kinetic.client.proto/' ${PROTO_ORIG_PATH} > ${PROTO_MODIFIED_PATH} && ${PROTOC_PATH} -I=${PROTO_DIR} --cpp_out=${GENERATED_SOURCES_PATH} ${PROTO_MODIFIED_PATH} -- DEPENDS kinetic-proto protoc protobuf - ) - set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${GENERATED_SOURCES_PATH}) - -@@ -157,21 +70,10 @@ include_directories( - - src/test/mock - src/test -- -- ${EXTERNAL_PREFIX}/include -- ${EXTERNAL_PREFIX}/src/gmock/include -- ${EXTERNAL_PREFIX}/src/gtest/include - ) - - set(LIBRARY_DEPENDENCIES - kinetic_client -- ${CMAKE_BINARY_DIR}/vendor/lib/libglog.a -- ${CMAKE_BINARY_DIR}/vendor/lib/libgflags.a -- ${CMAKE_BINARY_DIR}/vendor/lib/libssl.a -- ${CMAKE_BINARY_DIR}/vendor/lib/libcrypto.a -- ${CMAKE_BINARY_DIR}/vendor/lib/libprotobuf.a -- ${CMAKE_BINARY_DIR}/vendor/src/gtest/libgtest.a -- ${CMAKE_BINARY_DIR}/vendor/src/gmock/libgmock.a - ${CMAKE_THREAD_LIBS_INIT} - dl - ) -@@ -180,12 +82,68 @@ set(LIBRARY_DEPENDENCIES - # Otherwise glog uses the standard glibc unwinder and there is no dependency. - find_library(LIBUNWIND "unwind") - if(LIBUNWIND) -- set(LIBRARY_DEPENDENCIES -- ${LIBRARY_DEPENDENCIES} -+ set(LIBRARY_DEPENDENCIES -+ ${LIBRARY_DEPENDENCIES} - ${LIBUNWIND} - ) - endif() - -+find_library(LIBSSL "ssl") -+if(LIBSSL) -+ set(LIBRARY_DEPENDENCIES -+ ${LIBRARY_DEPENDENCIES} -+ ${LIBSSL} -+ ) -+endif() -+ -+find_library(LIBCRYPTO "crypto") -+if(LIBCRYPTO) -+ set(LIBRARY_DEPENDENCIES -+ ${LIBRARY_DEPENDENCIES} -+ ${LIBCRYPTO} -+ ) -+endif() -+ -+find_library(LIBPROTOBUF "protobuf") -+if(LIBPROTOBUF) -+ set(LIBRARY_DEPENDENCIES -+ ${LIBRARY_DEPENDENCIES} -+ ${LIBPROTOBUF} -+ ) -+endif() -+ -+find_library(LIBGLOG "glog") -+if(LIBGLOG) -+ set(LIBRARY_DEPENDENCIES -+ ${LIBRARY_DEPENDENCIES} -+ ${LIBGLOG} -+ ) -+endif() -+ -+find_library(LIBGFLAGS "gflags") -+if(LIBGFLAGS) -+ set(LIBRARY_DEPENDENCIES -+ ${LIBRARY_DEPENDENCIES} -+ ${LIBGFLAGS} -+ ) -+endif() -+ -+find_library(LIBGMOCK "gmock") -+if(LIBGMOCK) -+ set(LIBRARY_DEPENDENCIES -+ ${LIBRARY_DEPENDENCIES} -+ ${LIBGMOCK} -+ ) -+endif() -+ -+find_library(LIBGTEST "gtest") -+if(LIBGTEST) -+ set(LIBRARY_DEPENDENCIES -+ ${LIBRARY_DEPENDENCIES} -+ ${LIBGTEST} -+ ) -+endif() -+ - add_library(kinetic_client - src/main/generated/kinetic_client.pb.cc - src/main/hmac_provider.cc -diff --git a/src/test/kinetic_cpp_client_test.cc b/src/test/kinetic_cpp_client_test.cc -index 2079fab..c5004a2 100644 ---- a/src/test/kinetic_cpp_client_test.cc -+++ b/src/test/kinetic_cpp_client_test.cc -@@ -22,6 +22,7 @@ - - #include - -+#include "gflags/gflags.h" - #include "gtest/gtest.h" - #include "glog/logging.h" - diff --git a/pkgs/development/libraries/kinetic-cpp-client/default.nix b/pkgs/development/libraries/kinetic-cpp-client/default.nix deleted file mode 100644 index e2b81d77640..00000000000 --- a/pkgs/development/libraries/kinetic-cpp-client/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ stdenv, fetchgit, fetchurl, cmake, protobuf, libunwind, openssl, glog -, gflags, gmock, gtest -}: - -let - protoTar = fetchurl { - url = "https://github.com/Seagate/kinetic-protocol/archive/3.0.0.tar.gz"; - sha256 = "0406pp0sdf0rg6s5g18r2d8si2rin7p6qbzp7c6pma5hyzsygz48"; - }; -in -stdenv.mkDerivation { - name = "kinetic-cpp-client-2015-04-14"; - - src = fetchgit { - url = "git://github.com/Seagate/kinetic-cpp-client.git"; - rev = "015085a5c89db0398f80923053f36b9e0611e107"; - sha256 = "0gm34sl6lyidnxgg1lrhkxkxqj8z1y2cqn7zhzz2f1k50pigi5da"; - }; - - patches = [ ./build-fix.patch ]; - - postPatch = '' - mkdir -p build/kinetic-proto - tar -x --strip-components 1 -C build/kinetic-proto -f ${protoTar} - ''; - - nativeBuildInputs = [ cmake protobuf ]; - buildInputs = [ libunwind glog gflags gmock gtest ]; - - # The headers and library include from these and there is no provided pc file - propagatedBuildInputs = [ protobuf openssl ]; - - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=true" - ]; - - preCheck = '' - # The checks cannot find libkinetic_client.so otherwise - export LD_LIBRARY_PATH="$(pwd)" - ''; - - installPhase = '' - # There is no included install script so do our best - mkdir -p $out/lib - cp libkinetic_client.so $out/lib - cp -r ../include $out - cp ../src/main/generated/kinetic_client.pb.h $out/include - ''; - - doCheck = true; - - meta = with stdenv.lib; { - homepage = "https://github.com/Seagate/kinetic-cpp-client"; - description = "Code for producing C and C++ kinetic clients"; - license = licenses.lgpl21; - platforms = platforms.unix; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5b26ecb2da6..9d861fc538f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -212,6 +212,7 @@ mapAliases ({ keepassx-reboot = keepassx-community; # added 2017-02-01 keepassx2-http = keepassx-reboot; # added 2016-10-17 keybase-go = keybase; # added 2016-08-24 + kinetic-cpp-client = throw "kinetic-cpp-client has been removed from nixpkgs, as it's abandoned."; # 2020-04-28 kicad-with-packages3d = kicad; # added 2019-11-25 krename-qt5 = krename; # added 2017-02-18 keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # 2019-12-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0628fdaad86..48b0db7f096 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12360,10 +12360,6 @@ in kf5gpgmepp = libsForQt5.callPackage ../development/libraries/kf5gpgmepp { }; - kinetic-cpp-client = callPackage ../development/libraries/kinetic-cpp-client { - openssl = openssl_1_0_2; - }; - krb5 = callPackage ../development/libraries/kerberos/krb5.nix { inherit (buildPackages.darwin) bootstrap_cmds; }; -- cgit v1.2.3 From c0fe9d609df757bf3666978e6c1cc4b2946c0561 Mon Sep 17 00:00:00 2001 From: hyperfekt Date: Tue, 28 Apr 2020 14:05:28 +0200 Subject: nixos/fish: prevent fish from generating completions on first run --- nixos/modules/programs/fish.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix index 87f6816e4ac..48b324a0fe8 100644 --- a/nixos/modules/programs/fish.nix +++ b/nixos/modules/programs/fish.nix @@ -178,6 +178,10 @@ in set -l post (string join0 $fish_complete_path | string match --regex "[^\x00]*generated_completions.*" | string split0 | string match -er ".") set fish_complete_path $prev "/etc/fish/generated_completions" $post end + # prevent fish from generating completions on first run + if not test -d $__fish_user_data_dir/generated_completions + ${pkgs.coreutils}/bin/mkdir $__fish_user_data_dir/generated_completions + end ''; environment.etc."fish/generated_completions".source = -- cgit v1.2.3 From db4aece8849ddd9ea466a7a91cea3c2f875a15f8 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 28 Apr 2020 14:04:30 +0200 Subject: chromium: 81.0.4044.122 -> 81.0.4044.129 https://chromereleases.googleblog.com/2020/04/stable-channel-update-for-desktop_27.html This update includes 2 security fixes. CVEs: CVE-2020-6462 CVE-2020-6461 --- .../networking/browsers/chromium/upstream-info.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 77505b47d85..40ddafd2541 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "1s16wl101yabq0l7w0q50lxkr2gn090pcaj6l5sj6g5xvi9lhgbf"; - sha256bin64 = "0k6fsqlpiwp9vds83hb3cg9xf74hqgbfdm3ijyad2rmwc5rqk0ax"; - version = "83.0.4103.14"; + sha256 = "1s3flhzp69g62285r9nwc5m9fa65ldx19inwdm4nq1m5bn63v6lj"; + sha256bin64 = "0xbbj89xx98vvw1a4l4wj7hhwjasdmkxbbkgaad2cj4zqmbb8h52"; + version = "83.0.4103.23"; }; dev = { - sha256 = "0djppzwzpfyyfjb1mhy5wws2379m3wpzyk2x3kw5nd0mdz35hbny"; - sha256bin64 = "1wg55qhfvd5zvigjl6496za81mh9b2c5da53zy07bk8wj91ly8pf"; - version = "84.0.4115.5"; + sha256 = "1jgx55sb3azwb2rni89yxlz94j264iilwh0br29sngcailxamrbd"; + sha256bin64 = "107yndkcdb78zxpswn9aja63n0q4q5q49183058z5jm4zlplkgad"; + version = "84.0.4122.7"; }; stable = { - sha256 = "0ahqh3vmzbpai4xwn7qybgw9phc8ssjdvfc7384mxqk9swqgv7qg"; - sha256bin64 = "0gpgim244594m35qwf625blwdqgjbp4qr846wq75a9a9zqwqs05w"; - version = "81.0.4044.122"; + sha256 = "1ls663s1f74p912x42qp3zcvm17kmjiv1ij6yy1c14gdhcpmjx7z"; + sha256bin64 = "0nzds27x1j3298cq5xkgikjdddymbw88gcpnlm03492b6090257y"; + version = "81.0.4044.129"; }; } -- cgit v1.2.3 From a78e9182c876d89d3baa1bc273450838580c7cda Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 28 Apr 2020 14:54:29 +0200 Subject: =?UTF-8?q?zsh-powerlevel10k:=20v1.6.0=20=E2=86=92=20v1.6.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changes since the last release Bug fixes Configuration wizard no longer redraws screen every second Configuration wizard no longer prints spurious errors before the charset screen Configuration wizard once again honors prompt frame selection --- pkgs/shells/zsh/zsh-powerlevel10k/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index 3b117d4a1ab..60e58bbcfb9 100644 --- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "powerlevel10k"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "romkatv"; repo = "powerlevel10k"; rev = "v${version}"; - sha256 = "1v6lwjlc4qrxfv1yjy31xh59ayf7jprm3y87l75d08pzj1v4lsj5"; + sha256 = "1hlad5rf6piillmc83bkf03bbw78ylhhfxpxlkdc30ai9y5dpfvv"; }; patches = [ -- cgit v1.2.3 From 5e4fe400c00fe72dec5b7ff28bcdb015f586f12f Mon Sep 17 00:00:00 2001 From: Eric Dallo Date: Tue, 28 Apr 2020 09:56:30 -0300 Subject: dart: 2.7.1 -> 2.7.2 (stable) + 2.8.0-dev.10.0 -> 2.9.0-4.0.dev (dev) --- pkgs/development/interpreters/dart/default.nix | 26 +++++++++++++------------- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix index eda8e450bba..050e7f14979 100644 --- a/pkgs/development/interpreters/dart/default.nix +++ b/pkgs/development/interpreters/dart/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, version ? "2.7.1" }: +{ stdenv, fetchurl, unzip, version ? "2.7.2" }: let @@ -24,29 +24,29 @@ let url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; sha256 = "1p5bn04gr91chcszgmw5ng8mlzgwsrdr2v7k7ppwr1slkx97fsrh"; }; - "2.7.1-x86_64-linux" = fetchurl { + "2.7.2-x86_64-linux" = fetchurl { url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; - sha256 = "1zjd9hxxg1dsyzkzgqjvl933kprf8h143z5qi4mj1iczxv7zp27a"; + sha256 = "0vvsgda1smqdjn35yiq9pxx8f5haxb4hqnspcsfs6sn5c36k854v"; }; - "2.7.1-i686-linux" = fetchurl { + "2.7.2-i686-linux" = fetchurl { url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${i686}-release.zip"; - sha256 = "0cggr1jbhzahmazlhba0vw2chz9zxd98jgk6zxvxdnw5hvkx8si1"; + sha256 = "0dj01d2wwrp3cc5x73vs6fzhs6db60gkbjlrw3w9j04wcx69i38m"; }; - "2.7.1-aarch64-linux" = fetchurl { + "2.7.2-aarch64-linux" = fetchurl { url = "${base}/${stable_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; - sha256 = "0m4qlc3zy87habr61npykvpclggn5k4hadl59v2b0ymvxa4h5zfh"; + sha256 = "1p66fkdh1kv0ypmadmg67c3y3li3aaf1lahqh2g6r6qrzbh5da2p"; }; - "2.8.0-dev.10.0-x86_64-linux" = fetchurl { + "2.9.0-4.0.dev-x86_64-linux" = fetchurl { url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${x86_64}-release.zip"; - sha256 = "17x0q94zampm99dd2sn6q1644lfwcl0ig2rdlmfzd9i4llj2ddbl"; + sha256 = "16d9842fb3qbc0hy0zmimav9zndfkq96glgykj20xssc88qpjk2r"; }; - "2.8.0-dev.10.0-i686-linux" = fetchurl { + "2.9.0-4.0.dev-i686-linux" = fetchurl { url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${i686}-release.zip"; - sha256 = "0hmkg4jrffzh8x2mxn8nbf7dl7k0v2vacbmxgpsl382vw9wwj96j"; + sha256 = "105wgyxmi491c7qw0z3zhn4lv52h80ngyz4ch9dyj0sq8nndz2rc"; }; - "2.8.0-dev.10.0-aarch64-linux" = fetchurl { + "2.9.0-4.0.dev-aarch64-linux" = fetchurl { url = "${base}/${dev_version}/release/${version}/sdk/dartsdk-linux-${aarch64}-release.zip"; - sha256 = "185ipcmr9h76g44kzlj5pyj99cljlap82rhd1c2larfklyj5ryvv"; + sha256 = "1x6mlmc4hccmx42k7srhma18faxpxvghjwqahna80508rdpljwgc"; }; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2fae02ba57..527da9955f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26244,8 +26244,8 @@ in dart = callPackage ../development/interpreters/dart { }; dart_old = dart.override { version = "1.24.3"; }; - dart_stable = dart.override { version = "2.7.1"; }; - dart_dev = dart.override { version = "2.8.0-dev.10.0"; }; + dart_stable = dart.override { version = "2.7.2"; }; + dart_dev = dart.override { version = "2.9.0-4.0.dev"; }; httrack = callPackage ../tools/backup/httrack { }; -- cgit v1.2.3 From deda5e8b0535fb3a268cb50fe60765930a0881a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 28 Apr 2020 14:23:36 +0100 Subject: python3.pkgs.fasttext: add pythonImportsCheck --- pkgs/development/python-modules/fasttext/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/fasttext/default.nix b/pkgs/development/python-modules/fasttext/default.nix index 68f0f0e938f..42e6446e864 100644 --- a/pkgs/development/python-modules/fasttext/default.nix +++ b/pkgs/development/python-modules/fasttext/default.nix @@ -5,6 +5,8 @@ buildPythonPackage rec { buildInputs = [ pybind11 ]; + pythonImportsCheck = [ "fasttext" ]; + propagatedBuildInputs = [ numpy ]; preBuild = '' -- cgit v1.2.3 From 1e2a5584220eefc0374df3f0ab068b58cbb8adaf Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 28 Apr 2020 08:30:00 -0500 Subject: nodejs-12_x: 12.16.2 -> 12.16.3 Changelog: https://github.com/nodejs/node/releases/tag/v12.16.3 --- pkgs/development/web/nodejs/v12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index 14b64094efa..af8595b5641 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "12.16.2"; - sha256 = "0y5yd6h13fr34byi7h5xdjaivgcxiz0ykcmpk9nm5ra01b54fp2m"; + version = "12.16.3"; + sha256 = "18srfcv9zi39960szdnd4rgfj9w295z1agjvpw8arwn75449nmgh"; } -- cgit v1.2.3 From d103dc49986ed4c7a242a832d4f74a85062e2395 Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Tue, 28 Apr 2020 15:08:13 +0200 Subject: linux: do not depend on systemd indirectly utillinux depends on systemd because: * uuidd supports socket activation * lslogins can show recent journal entries * fstrim comes with a service file (and we use this in NixOS) * logger can write journal entries (See https://www.openembedded.org/pipermail/openembedded-core/2015-February/102069.html) systemd doesn't depend on utillinux but on utillinuxMinimal which is a version of utillinux without these features to avoid cyclic dependencies. With this change, the linux kernel (of which i don't fully understand why it would depend on util-linux in the first place, but this was added in https://github.com/NixOS/nixpkgs/pull/32137/files without too much explanation) depends on the minimal version of util-linux too. This makes it that every time we change build flags in systemd the linux kernel doesn't have to wastefully rebuild. --- pkgs/os-specific/linux/kernel/manual-config.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index 71505840b86..d73e0a8ac90 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -1,6 +1,6 @@ { buildPackages, runCommand, nettools, bc, bison, flex, perl, rsync, gmp, libmpc, mpfr, openssl , libelf, cpio -, utillinux +, utillinuxMinimal , writeTextFile }: @@ -281,7 +281,7 @@ let in assert stdenv.lib.versionAtLeast version "4.14" -> libelf != null; -assert stdenv.lib.versionAtLeast version "4.15" -> utillinux != null; +assert stdenv.lib.versionAtLeast version "4.15" -> utillinuxMinimal != null; stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches configfile) // { pname = "linux"; inherit version; @@ -292,7 +292,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.platform kernelPatches nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr ] ++ optional (stdenv.hostPlatform.platform.kernelTarget == "uImage") buildPackages.ubootTools ++ optional (stdenv.lib.versionAtLeast version "4.14") libelf - ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinux + ++ optional (stdenv.lib.versionAtLeast version "4.15") utillinuxMinimal ++ optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ] ++ optional (stdenv.lib.versionAtLeast version "5.2") cpio ; -- cgit v1.2.3 From 0162890ce0641f48a57bc0f0f62b24fe0ccb7e94 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 28 Apr 2020 15:36:07 +0200 Subject: python3Packages.mysql-connector: 8.0.19 -> 8.0.20 --- .../python-modules/mysql-connector/default.nix | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/mysql-connector/default.nix b/pkgs/development/python-modules/mysql-connector/default.nix index 4608d3f93e6..5850d7e67b0 100644 --- a/pkgs/development/python-modules/mysql-connector/default.nix +++ b/pkgs/development/python-modules/mysql-connector/default.nix @@ -1,22 +1,16 @@ -{ lib, buildPythonPackage, fetchFromGitHub, python, protobuf3_6 }: +{ lib, buildPythonPackage, fetchFromGitHub, python }: let - py = python.override { - packageOverrides = self: super: { - protobuf = super.protobuf.override { - protobuf = protobuf3_6; - }; - }; - }; + py = python; in buildPythonPackage rec { pname = "mysql-connector"; - version = "8.0.19"; + version = "8.0.20"; src = fetchFromGitHub { owner = "mysql"; repo = "mysql-connector-python"; rev = version; - sha256 = "1jscmc5s7mwx43gvxjlqc30ylp5jjpmkqx7s3b9nllbh926p3ixg"; + sha256 = "1pm98mjbkhwawhni98cjhp0gg3mim75i0sdby77vzrlcrxajxkbw"; }; propagatedBuildInputs = with py.pkgs; [ protobuf dnspython ]; @@ -33,6 +27,7 @@ in buildPythonPackage rec { implements the DB API v2.0 specification. ''; homepage = "https://github.com/mysql/mysql-connector-python"; + changelog = "https://raw.githubusercontent.com/mysql/mysql-connector-python/${version}/CHANGES.txt"; license = [ lib.licenses.gpl2 ]; maintainers = with lib.maintainers; [ primeos ]; }; -- cgit v1.2.3 From 128b93e06142914a88c91f3c9f03ce52f6cb569e Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 26 Apr 2020 16:32:56 -0400 Subject: meson: Patch to ingest env vars like autoconf See comment in code and the PR it references, https://github.com/mesonbuild/meson/pull/6827, for details. We can remove entries from the cross file because they will be gotten from env vars now. --- pkgs/development/tools/build-managers/meson/default.nix | 11 +++++------ .../tools/build-managers/meson/more-env-vars.patch | 16 ++++++++++++++++ 2 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/tools/build-managers/meson/more-env-vars.patch diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 977ffe837ec..3fb435c5c2b 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -45,6 +45,11 @@ python3Packages.buildPythonApplication rec { # We remove the check so multiple outputs can work sanely. ./allow-dirs-outside-of-prefix.patch + # Meson is currently inspecting fewer variables than autoconf does, which + # makes it harder for us to use setup hooks, etc. Taken from + # https://github.com/mesonbuild/meson/pull/6827 + ./more-env-vars.patch + # Unlike libtool, vanilla Meson does not pass any information # about the path library will be installed to to g-ir-scanner, # breaking the GIR when path other than ${!outputLib}/lib is used. @@ -67,13 +72,7 @@ python3Packages.buildPythonApplication rec { crossFile = writeTextDir "cross-file.conf" '' [binaries] - c = '${targetPackages.stdenv.cc.targetPrefix}cc' - cpp = '${targetPackages.stdenv.cc.targetPrefix}c++' - ar = '${targetPackages.stdenv.cc.bintools.targetPrefix}ar' - strip = '${targetPackages.stdenv.cc.bintools.targetPrefix}strip' pkgconfig = 'pkg-config' - ld = '${targetPackages.stdenv.cc.targetPrefix}ld' - objcopy = '${targetPackages.stdenv.cc.targetPrefix}objcopy' [properties] needs_exe_wrapper = true diff --git a/pkgs/development/tools/build-managers/meson/more-env-vars.patch b/pkgs/development/tools/build-managers/meson/more-env-vars.patch new file mode 100644 index 00000000000..a8f860f03cc --- /dev/null +++ b/pkgs/development/tools/build-managers/meson/more-env-vars.patch @@ -0,0 +1,16 @@ +diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py +index ac13a710..e0d07c51 100644 +--- a/mesonbuild/envconfig.py ++++ b/mesonbuild/envconfig.py +@@ -119,9 +119,9 @@ def get_env_var_pair(for_machine: MachineChoice, + # compiling we fall back on the unprefixed host version. This + # allows native builds to never need to worry about the 'BUILD_*' + # ones. +- ([var_name + '_FOR_BUILD'] if is_cross else [var_name]), ++ [var_name + '_FOR_BUILD'] + ([] if is_cross else [var_name]), + # Always just the unprefixed host verions +- ([] if is_cross else [var_name]), ++ [var_name], + )[for_machine] + for var in candidates: + value = os.environ.get(var) -- cgit v1.2.3 From 70171d321eb808f2bd4c99f6f32b09ff7e730f5b Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 27 Apr 2020 16:56:08 -0400 Subject: mrtrix: 3.0_RC3_latest -> 3.0.0 --- .../science/biology/mrtrix/default.nix | 31 ++++++++++++++++------ 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/science/biology/mrtrix/default.nix b/pkgs/applications/science/biology/mrtrix/default.nix index 6959b2caab8..528277e05e3 100644 --- a/pkgs/applications/science/biology/mrtrix/default.nix +++ b/pkgs/applications/science/biology/mrtrix/default.nix @@ -1,17 +1,17 @@ { stdenv, lib, fetchFromGitHub, python, makeWrapper -, eigen, fftw, libtiff, zlib, ants, bc +, eigen, fftw, libtiff, libpng, zlib, ants, bc , qt5, libGL, libGLU, libX11, libXext , withGui ? true }: stdenv.mkDerivation rec { pname = "mrtrix"; - version = "3.0_RC3_latest"; + version = "3.0.0"; src = fetchFromGitHub { owner = "MRtrix3"; repo = "mrtrix3"; rev = version; - sha256 = "184nv524p8j94qicjy9l288bqcgl2yxqqs55a7042i0gfsnwp51c"; + sha256 = "1vvmmbw3m0bdfwp4szr62ygzsvkj0ss91cx5zlkspsr1rff05f9b"; fetchSubmodules = true; }; @@ -22,7 +22,9 @@ stdenv.mkDerivation rec { python fftw libtiff - zlib ] ++ lib.optionals withGui [ + libpng + zlib + ] ++ lib.optionals withGui [ libGL libGLU libX11 @@ -34,9 +36,14 @@ stdenv.mkDerivation rec { installCheckInputs = [ bc ]; postPatch = '' - patchShebangs ./build ./configure ./run_tests ./bin/population_template + patchShebangs ./build ./configure ./run_tests ./bin/* + + # patching interpreters before fixup is needed for tests: + patchShebangs ./bin/* + patchShebangs testing/binaries/data/vectorstats/*py + substituteInPlace ./run_tests \ - --replace 'git submodule update --init >> $LOGFILE 2>&1' "" + --replace 'git submodule update --init $datadir >> $LOGFILE 2>&1' "" ''; configurePhase = '' @@ -50,7 +57,13 @@ stdenv.mkDerivation rec { (cd testing && ../build) ''; - installCheckPhase = "./run_tests"; + installCheckPhase = '' + ./run_tests units + ./run_tests binaries + + # can also `./run_tests scripts`, but this fails due to lack of FSL package + # (and there's no convenient way to disable individual tests) + ''; doInstallCheck = true; installPhase = '' @@ -63,7 +76,9 @@ stdenv.mkDerivation rec { postInstall = '' for prog in $out/bin/*; do - wrapProgram $prog --prefix PATH : ${lib.makeBinPath [ ants ]} + if [[ -x "$prog" ]]; then + wrapProgram $prog --prefix PATH : ${lib.makeBinPath [ ants ]} + fi done ''; -- cgit v1.2.3 From e9d6d15d631717e4c2b1e370f8742360ad4d0533 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 28 Apr 2020 10:44:04 -0400 Subject: oh-my-zsh: 2020-04-10 -> 2020-04-26 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index f11ef6a6cd9..f6c3425f285 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2020-04-10"; + version = "2020-04-26"; pname = "oh-my-zsh"; - rev = "d53355ab38763c6f637008d019c8e8b98f19b714"; + rev = "c686aa3dbb30704b2f8f52bf1aae19a7e41c23c1"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "1rf086f26plqsyx4h19acqacwyr99amavhn1lk0g13kk58kcq9v6"; + sha256 = "022ddr8p0kjin2374z5icvcrbw9q77gm5jxqvvgkrhqg8lp6n14l"; }; pathsToLink = [ "/share/oh-my-zsh" ]; -- cgit v1.2.3 From 8245230753d260b61b928fad7e00323f38ca450f Mon Sep 17 00:00:00 2001 From: John Ericson Date: Sun, 26 Apr 2020 16:47:27 -0400 Subject: meson: Make target-agnostic The cross file is added in the `mkDerivation`. It isn't nice putting build tool-specific stuff here, but our current architecture gives us little alternative. --- .../tools/build-managers/meson/default.nix | 28 --------------------- .../tools/build-managers/meson/setup-hook.sh | 5 ---- pkgs/stdenv/generic/make-derivation.nix | 29 ++++++++++++++++++++++ 3 files changed, 29 insertions(+), 33 deletions(-) diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 3fb435c5c2b..3809d19e7d0 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -3,20 +3,8 @@ , stdenv , writeTextDir , substituteAll -, targetPackages }: -let - # See https://mesonbuild.com/Reference-tables.html#cpu-families - cpuFamilies = { - aarch64 = "aarch64"; - armv5tel = "arm"; - armv6l = "arm"; - armv7l = "arm"; - i686 = "x86"; - x86_64 = "x86_64"; - }; -in python3Packages.buildPythonApplication rec { pname = "meson"; version = "0.54.0"; @@ -70,27 +58,11 @@ python3Packages.buildPythonApplication rec { setupHook = ./setup-hook.sh; - crossFile = writeTextDir "cross-file.conf" '' - [binaries] - pkgconfig = 'pkg-config' - - [properties] - needs_exe_wrapper = true - - [host_machine] - system = '${targetPackages.stdenv.targetPlatform.parsed.kernel.name}' - cpu_family = '${cpuFamilies.${targetPackages.stdenv.targetPlatform.parsed.cpu.name}}' - cpu = '${targetPackages.stdenv.targetPlatform.parsed.cpu.name}' - endian = ${if targetPackages.stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"} - ''; - # 0.45 update enabled tests but they are failing doCheck = false; # checkInputs = [ ninja pkgconfig ]; # checkPhase = "python ./run_project_tests.py"; - isCross = stdenv.targetPlatform != stdenv.hostPlatform; - meta = with lib; { homepage = "https://mesonbuild.com"; description = "SCons-like build system that use python as a front-end language and Ninja as a building backend"; diff --git a/pkgs/development/tools/build-managers/meson/setup-hook.sh b/pkgs/development/tools/build-managers/meson/setup-hook.sh index aef18e65ea1..3d946fcffd5 100644 --- a/pkgs/development/tools/build-managers/meson/setup-hook.sh +++ b/pkgs/development/tools/build-managers/meson/setup-hook.sh @@ -5,11 +5,6 @@ mesonConfigurePhase() { mesonFlags="--prefix=$prefix $mesonFlags" fi - # Build release by default. - if [ -n "@isCross@" ]; then - crossMesonFlags="--cross-file=@crossFile@/cross-file.conf" - fi - # See multiple-outputs.sh and meson’s coredata.py mesonFlags="\ --libdir=${!outputLib}/lib --libexecdir=${!outputLib}/libexec \ diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index a11b280b047..e6363ce42c0 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -49,6 +49,7 @@ in rec { # Configure Phase , configureFlags ? [] , cmakeFlags ? [] + , mesonFlags ? [] , # Target is not included by default because most programs don't care. # Including it then would cause needless mass rebuilds. # @@ -252,6 +253,34 @@ in rec { ++ lib.optional (stdenv.buildPlatform.uname.system != null) "-DCMAKE_HOST_SYSTEM_NAME=${stdenv.buildPlatform.uname.system}" ++ lib.optional (stdenv.buildPlatform.uname.processor != null) "-DCMAKE_HOST_SYSTEM_PROCESSOR=${stdenv.buildPlatform.uname.processor}" ++ lib.optional (stdenv.buildPlatform.uname.release != null) "-DCMAKE_HOST_SYSTEM_VERSION=${stdenv.buildPlatform.uname.release}"; + + mesonFlags = if mesonFlags == null then null else let + # See https://mesonbuild.com/Reference-tables.html#cpu-families + cpuFamilies = { + aarch64 = "aarch64"; + armv5tel = "arm"; + armv6l = "arm"; + armv7l = "arm"; + i686 = "x86"; + x86_64 = "x86_64"; + }; + crossFile = builtins.toFile "cross-file.conf" ('' + [properties] + needs_exe_wrapper = true + + [host_machine] + system = '${stdenv.targetPlatform.parsed.kernel.name}' + cpu_family = '${cpuFamilies.${stdenv.targetPlatform.parsed.cpu.name}}' + cpu = '${stdenv.targetPlatform.parsed.cpu.name}' + endian = ${if stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"} + '' + # TODO should have target prefix too, issue #86077 + + '' + + [binaries] + pkgconfig = 'pkg-config' + ''); + in [ "--cross-file=${crossFile}" ] ++ mesonFlags; } // lib.optionalAttrs (attrs.enableParallelBuilding or false) { enableParallelChecking = attrs.enableParallelChecking or true; } // lib.optionalAttrs (hardeningDisable != [] || hardeningEnable != []) { -- cgit v1.2.3 From edddc7c82a848f1b1f23344a338b5d56b38178c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Tue, 28 Apr 2020 17:02:46 +0200 Subject: nixos/sss: Move nsswitch config into the module --- nixos/modules/config/nsswitch.nix | 10 +--------- nixos/modules/services/misc/sssd.nix | 5 +++++ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix index 186dd7376e9..0acd8900e7b 100644 --- a/nixos/modules/config/nsswitch.nix +++ b/nixos/modules/config/nsswitch.nix @@ -14,7 +14,6 @@ let nssmdns = canLoadExternalModules && config.services.avahi.nssmdns; nsswins = canLoadExternalModules && config.services.samba.nsswins; ldap = canLoadExternalModules && (config.users.ldap.enable && config.users.ldap.nsswitch); - sssd = canLoadExternalModules && config.services.sssd.enable; resolved = canLoadExternalModules && config.services.resolved.enable; googleOsLogin = canLoadExternalModules && config.security.googleOsLogin.enable; @@ -31,7 +30,6 @@ let passwdArray = mkMerge [ (mkBefore [ "files" ]) - (mkIf sssd [ "sss" ]) (mkIf ldap [ "ldap" ]) (mkIf mymachines [ "mymachines" ]) (mkIf googleOsLogin [ "cache_oslogin oslogin" ]) @@ -40,15 +38,9 @@ let shadowArray = mkMerge [ (mkBefore [ "files" ]) - (mkIf sssd [ "sss" ]) (mkIf ldap [ "ldap" ]) ]; - servicesArray = mkMerge [ - (mkBefore [ "files" ]) - (mkIf sssd [ "sss" ]) - ]; - in { options = { @@ -172,7 +164,7 @@ in { group = passwdArray; shadow = shadowArray; hosts = hostArray; - services = servicesArray; + services = mkBefore [ "files" ]; }; # Systemd provides nss-myhostname to ensure that our hostname diff --git a/nixos/modules/services/misc/sssd.nix b/nixos/modules/services/misc/sssd.nix index 36008d25741..77f6ccfe64f 100644 --- a/nixos/modules/services/misc/sssd.nix +++ b/nixos/modules/services/misc/sssd.nix @@ -75,6 +75,11 @@ in { }; system.nssModules = optional cfg.enable pkgs.sssd; + system.nssDatabases = { + passwd = [ "sss" ]; + shadow = [ "sss" ]; + services = [ "sss" ]; + }; services.dbus.packages = [ pkgs.sssd ]; }) -- cgit v1.2.3 From bd0e684f9a62d13bfcfc9b20bbcae49b401cd034 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Tue, 28 Apr 2020 17:00:46 +0200 Subject: wtf: 0.28.0 -> 0.29.0 --- pkgs/applications/misc/wtf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/wtf/default.nix b/pkgs/applications/misc/wtf/default.nix index 12780ca73a1..e557c5081c8 100644 --- a/pkgs/applications/misc/wtf/default.nix +++ b/pkgs/applications/misc/wtf/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "wtf"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "wtfutil"; repo = pname; rev = "v${version}"; - sha256 = "0pybj2h844x9vncwdcaymihyd1mwdnxxpnzpq0p29ra0cwmsxcgr"; + sha256 = "0v6yafpz3sycq6yb7w4dyxqclszvdgwbyhqs5ii8ckynqcf6ifn7"; }; - modSha256 = "00xvhajag25kfkizi2spv4ady3h06as43rnbjzfbv7z1mln844y4"; + modSha256 = "0csxc5q7i2iq8z71ysfan2kwf4mghi89i5zja5g1a4cvmcabiq1g"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; -- cgit v1.2.3 From 75a3a9af8d73d49acb6c543f36ff6feebef445fe Mon Sep 17 00:00:00 2001 From: Bruno Bzeznik Date: Tue, 28 Apr 2020 16:52:56 +0200 Subject: libfabric: init at 1.10.0 --- pkgs/os-specific/linux/libfabric/default.nix | 29 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/os-specific/linux/libfabric/default.nix diff --git a/pkgs/os-specific/linux/libfabric/default.nix b/pkgs/os-specific/linux/libfabric/default.nix new file mode 100644 index 00000000000..6383832a7e7 --- /dev/null +++ b/pkgs/os-specific/linux/libfabric/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook, libpsm2 }: + +stdenv.mkDerivation rec { + pname = "libfabric"; + version = "1.10.0"; + + enableParallelBuilding = true; + + src = fetchFromGitHub { + owner = "ofiwg"; + repo = pname; + rev = "v${version}"; + sha256 = "0amgc5w7qg96r9a21jl92m6jzn4z2j3iyk7jf7kwyzfi4jhlkv89"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook ] ; + + buildInputs = [ libpsm2 ] ; + + configureFlags = [ "--enable-psm2=${libpsm2}" ] ; + + meta = with stdenv.lib; { + homepage = "http://libfabric.org/"; + description = "Open Fabric Interfaces"; + license = with licenses; [ gpl2 bsd2 ]; + platforms = [ "x86_64-linux" ]; + maintainers = [ maintainers.bzizou ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0ea39aa744..cf457b7dd79 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12798,6 +12798,8 @@ in libf2c = callPackage ../development/libraries/libf2c {}; + libfabric = callPackage ../os-specific/linux/libfabric {}; + libfive = callPackage ../development/libraries/libfive { }; libfixposix = callPackage ../development/libraries/libfixposix {}; -- cgit v1.2.3 From f7b417440dc79eb8067be7e61215185fefe91e96 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 28 Apr 2020 10:46:28 -0400 Subject: jenkins: 2.222.1 -> 2.222.3 --- pkgs/development/tools/continuous-integration/jenkins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 6baa91f44c9..c40572a4f2a 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.222.1"; + version = "2.222.3"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "0glmx8xi99mbfr84hi4sn36qkxw00rfn8wlz5n674ygbdj1vnv2s"; + sha256 = "1087rih5cb4ici538rcgkrfhcqckbs9i2mpzd59zcx4yw91dca8m"; }; buildCommand = '' -- cgit v1.2.3 From 6da294e8dfc9a07ebc94ee2b5bb835c87a17684e Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Tue, 28 Apr 2020 11:57:49 -0400 Subject: starship: 0.40.1 -> 0.41.0 --- pkgs/tools/misc/starship/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 5503c8ecc56..6e720bf1034 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -3,13 +3,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.40.1"; + version = "0.41.0"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "0jnm586wx5by1b6v78v78a84qzg05n1ha1hlmnjfyzhgjkbkayp1"; + sha256 = "1m5pi49g3pj2qr5slyasda5xp9lz3xhz3qb9k0pa6fvcn9581r9q"; }; nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { --replace "/bin/echo" "echo" ''; - cargoSha256 = "1jrlzihcq543z6hb1gq8zq6hqvgralzsknj3xnb6gia1n49b3zxz"; + cargoSha256 = "18z1p8xj1v9w6amc52gc2vcn5f4z8k71ig20zmj005v24si9pfwf"; checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; meta = with stdenv.lib; { -- cgit v1.2.3 From cc89b93798c8a5a81609979f813fde9baaeb7181 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Tue, 28 Apr 2020 11:35:46 -0400 Subject: python3Packages.batchgenerators: 0.19.7 -> 0.20.0 --- .../python-modules/batchgenerators/default.nix | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/batchgenerators/default.nix b/pkgs/development/python-modules/batchgenerators/default.nix index 001c3cc19a5..63aa7883e3a 100644 --- a/pkgs/development/python-modules/batchgenerators/default.nix +++ b/pkgs/development/python-modules/batchgenerators/default.nix @@ -1,30 +1,36 @@ { lib , buildPythonPackage , isPy27 -, fetchPypi +, fetchFromGitHub , pytest , unittest2 , future , numpy +, pillow , scipy , scikitlearn , scikitimage , threadpoolctl }: - buildPythonPackage rec { pname = "batchgenerators"; - version = "0.19.7"; + version = "0.20.0"; disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "0qqzwqf5r0q6jh8avz4f9kf8x96crvdnkznhf24pbm0faf8yk67q"; + src = fetchFromGitHub { + owner = "MIC-DKFZ"; + repo = pname; + rev = "v${version}"; + sha256 = "0cc3i4wznqb7lk8n6jkprvkpsby6r7khkxqwn75k8f01mxgjfpvf"; + }; - propagatedBuildInputs = [ future numpy scipy scikitlearn scikitimage threadpoolctl ]; + propagatedBuildInputs = [ + future numpy pillow scipy scikitlearn scikitimage threadpoolctl + ]; + checkInputs = [ pytest unittest2 ]; checkPhase = "pytest tests"; -- cgit v1.2.3 From 359c6b5bc18e1d9d0662e0cc5a62bbb2ce97250b Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 22 Apr 2020 09:36:04 -0400 Subject: pythonPackages.cloudflare: init at 2.6.5 --- .../python-modules/cloudflare/default.nix | 36 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/cloudflare/default.nix diff --git a/pkgs/development/python-modules/cloudflare/default.nix b/pkgs/development/python-modules/cloudflare/default.nix new file mode 100644 index 00000000000..02454b74efa --- /dev/null +++ b/pkgs/development/python-modules/cloudflare/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +, future +, pyyaml +, jsonlines +}: + +buildPythonPackage rec { + pname = "cloudflare"; + version = "2.6.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "4463d5f2927338384169315f34c2a8ac0840075b59489f8d1d773b91caba6c39"; + }; + + propagatedBuildInputs = [ + requests + future + pyyaml + jsonlines + ]; + + # no tests associated with package + doCheck = false; + pythonImportsCheck = [ "CloudFlare" ]; + + meta = with lib; { + description = "Python wrapper for the Cloudflare v4 API"; + homepage = "https://github.com/cloudflare/python-cloudflare"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 45cf2f3c05b..3e0e1b4428c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2218,6 +2218,8 @@ in { closure-linter = callPackage ../development/python-modules/closure-linter { }; + cloudflare = callPackage ../development/python-modules/cloudflare { }; + cloudpickle = callPackage ../development/python-modules/cloudpickle { }; cmdline = callPackage ../development/python-modules/cmdline { }; -- cgit v1.2.3 From 27c7e7d38ab9ae972c2802bcea0253875eeed48e Mon Sep 17 00:00:00 2001 From: Chris Ostrouchov Date: Wed, 22 Apr 2020 09:46:52 -0400 Subject: pythonPackages.auth0-python: init at 3.9.1 --- .../python-modules/auth0-python/default.nix | 31 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/python-modules/auth0-python/default.nix diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix new file mode 100644 index 00000000000..7e2b09cca68 --- /dev/null +++ b/pkgs/development/python-modules/auth0-python/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, requests +, mock +}: + +buildPythonPackage rec { + pname = "auth0-python"; + version = "3.9.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "c2fdc3ff230638a2776d2b3761e787ca93dc33a26f841504fc260f947256f453"; + }; + + propagatedBuildInputs = [ + requests + ]; + + checkInputs = [ + mock + ]; + + meta = with lib; { + description = "Auth0 Python SDK"; + homepage = "https://github.com/auth0/auth0-python"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3e0e1b4428c..68debd34013 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -248,6 +248,8 @@ in { authres = callPackage ../development/python-modules/authres { }; + auth0-python = callPackage ../development/python-modules/auth0-python { }; + autograd = callPackage ../development/python-modules/autograd { }; autologging = callPackage ../development/python-modules/autologging { }; -- cgit v1.2.3 From d94444e44fd03585e8242fe4f718533c501b9312 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 28 Apr 2020 19:15:10 +0200 Subject: amdadl-sdk, amdapp-sdk: remove these libraries are obsolete and nothing in the nixpkgs tree requires them --- pkgs/development/misc/amdadl-sdk/default.nix | 50 ---------- .../amdapp-sdk/01-remove-aparapi-samples.patch | 10 -- pkgs/development/misc/amdapp-sdk/default.nix | 108 --------------------- pkgs/development/misc/amdapp-sdk/gcc-5.patch | 11 --- pkgs/top-level/all-packages.nix | 20 ---- 5 files changed, 199 deletions(-) delete mode 100644 pkgs/development/misc/amdadl-sdk/default.nix delete mode 100644 pkgs/development/misc/amdapp-sdk/01-remove-aparapi-samples.patch delete mode 100644 pkgs/development/misc/amdapp-sdk/default.nix delete mode 100644 pkgs/development/misc/amdapp-sdk/gcc-5.patch diff --git a/pkgs/development/misc/amdadl-sdk/default.nix b/pkgs/development/misc/amdadl-sdk/default.nix deleted file mode 100644 index 236480598b9..00000000000 --- a/pkgs/development/misc/amdadl-sdk/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ requireFile, stdenv, unzip }: - -stdenv.mkDerivation { - version = "6.0"; - pname = "amdadl-sdk"; - - src = requireFile { - name = "ADL_SDK_6.0.zip"; - url = "http://developer.amd.com/tools-and-sdks/graphics-development/display-library-adl-sdk/"; - sha256 = "429f4fd1edebb030d6366f4e0a877cf105e4383f7dd2ccf54e5aef8f2e4242c9"; - }; - - buildInputs = [ unzip ]; - - doCheck = false; - - unpackPhase = '' - unzip $src - ''; - - patchPhase = '' - sed -i -e '/include/a \#include ' include/adl_structures.h || die - ''; - - buildPhase = '' - #Build adlutil - cd adlutil - gcc main.c -o adlutil -DLINUX -ldl -I ../include/ - cd .. - ''; - - installPhase = '' - #Install SDK - mkdir -p $out/bin - cp -r include "$out/" - cp "adlutil/adlutil" "$out/bin/adlutil" - - #Fix modes - chmod -R 755 "$out/bin/" - ''; - - meta = with stdenv.lib; { - description = "API to access display driver functionality for ATI graphics cards"; - homepage = "https://developer.amd.com/tools/graphics-development/display-library-adl-sdk/"; - license = licenses.unfree; - maintainers = [ maintainers.offline ]; - platforms = stdenv.lib.platforms.linux; - hydraPlatforms = []; - }; -} diff --git a/pkgs/development/misc/amdapp-sdk/01-remove-aparapi-samples.patch b/pkgs/development/misc/amdapp-sdk/01-remove-aparapi-samples.patch deleted file mode 100644 index f474f76f01e..00000000000 --- a/pkgs/development/misc/amdapp-sdk/01-remove-aparapi-samples.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- samples/Makefile 2012-11-29 05:58:48.000000000 +0100 -+++ samples/Makefile 2012-12-30 20:13:30.926576277 +0100 -@@ -3,7 +3,6 @@ - include $(DEPTH)/make/openclsdkdefs.mk - - SUBDIRS = opencl --SUBDIRS += aparapi - ifneq ($(OS), lnx) - SUBDIRS += C++Amp - ifeq ($(BITS), 64) diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix deleted file mode 100644 index 68109e05e61..00000000000 --- a/pkgs/development/misc/amdapp-sdk/default.nix +++ /dev/null @@ -1,108 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, perl, libGLU, libGL, xorg, - version? "2.8", # What version - samples? false # Should samples be installed -}: - -let - - bits = if stdenv.hostPlatform.system == "x86_64-linux" then "64" - else "32"; - - arch = if stdenv.hostPlatform.system == "x86_64-linux" then "x86_64" - else "x86"; - - src_info = { - "2.6" = { - url = "http://download2-developer.amd.com/amd/APPSDK/AMD-APP-SDK-v2.6-lnx${bits}.tgz"; - x86 = "03vyvqp44f96036zsyy8n21ymbzy2bx09hlbd6ci3ikj8g7ic1dm"; - x86_64 = "1fj55358s4blxq9bp77k07gqi22n5nfkzwjkbdc62gmy1zxxlhih"; - }; - - "2.7" = { - url = "http://download2-developer.amd.com/amd/APPSDK/AMD-APP-SDK-v2.7-lnx${bits}.tgz"; - x86 = "1v26n7g1xvlg5ralbfk3qiy34gj8fascpnjzm3120b6sgykfp16b"; - x86_64 = "08bi43bgnsxb47vbirh09qy02w7zxymqlqr8iikk9aavfxjlmch1"; - patches = [ ./gcc-5.patch]; - }; - - "2.8" = { - url = "https://developer.amd.com/wordpress/media/2012/11/AMD-APP-SDK-v2.8-lnx${bits}.tgz"; - x86 = "99610737f21b2f035e0eac4c9e776446cc4378a614c7667de03a82904ab2d356"; - x86_64 = "d9c120367225bb1cd21abbcf77cb0a69cfb4bb6932d0572990104c566aab9681"; - - # TODO: Add support for aparapi, java parallel api - patches = [ ./01-remove-aparapi-samples.patch ./gcc-5.patch]; - }; - }; - -in stdenv.mkDerivation { - pname = "amdapp-sdk"; - inherit version; - - src = fetchurl { - url = stdenv.lib.getAttrFromPath [version "url"] src_info; - sha256 = stdenv.lib.getAttrFromPath [version arch] src_info; - }; - - patches = stdenv.lib.attrByPath [version "patches"] [] src_info; - - patchFlags = [ "-p0" ]; - buildInputs = [ makeWrapper perl libGLU libGL xorg.libX11 xorg.libXext xorg.libXaw xorg.libXi xorg.libXxf86vm ]; - propagatedBuildInputs = [ stdenv.cc ]; - NIX_LDFLAGS = "-lX11 -lXext -lXmu -lXi -lXxf86vm"; - doCheck = false; - - unpackPhase = '' - tar xvzf $src - tar xf AMD-APP-SDK-v${version}-*-lnx${bits}.tgz - cd AMD-APP-SDK-v${version}-*-lnx${bits} - ''; - - buildPhase = if !samples then ''echo "nothing to build"'' else null; - - installPhase = '' - # Install SDK - mkdir -p $out - cp -r {docs,include} "$out/" - mkdir -p "$out/"{bin,lib,samples/opencl/bin} - cp -r "./bin/${arch}/clinfo" "$out/bin/clinfo" - cp -r "./lib/${arch}/"* "$out/lib/" - - # Register ICD - mkdir -p "$out/etc/OpenCL/vendors" - echo "$out/lib/libamdocl${bits}.so" > "$out/etc/OpenCL/vendors/amd.icd" - # The OpenCL ICD specifications: http://www.khronos.org/registry/cl/extensions/khr/cl_khr_icd.txt - - # Install includes - mkdir -p "$out/usr/include/"{CAL,OpenVideo} - install -m644 './include/OpenVideo/'{OVDecode.h,OVDecodeTypes.h} "$out/usr/include/OpenVideo/" - - ${ if samples then '' - # Install samples - find ./samples/opencl/ -mindepth 1 -maxdepth 1 -type d -not -name bin -exec cp -r {} "$out/samples/opencl" \; - cp -r "./samples/opencl/bin/${arch}/"* "$out/samples/opencl/bin" - for f in $(find "$out/samples/opencl/bin/" -type f -not -name "*.*"); - do - wrapProgram "$f" --prefix PATH ":" "${stdenv.cc}/bin" - done'' else "" - } - - # Create wrappers - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/clinfo - patchelf --set-rpath ${stdenv.cc.cc.lib}/lib64:${stdenv.cc.cc.lib}/lib $out/bin/clinfo - - # Fix modes - find "$out/" -type f -exec chmod 644 {} \; - chmod -R 755 "$out/bin/" - find "$out/samples/opencl/bin/" -type f -name ".*" -exec chmod 755 {} \; - find "$out/samples/opencl/bin/" -type f -not -name "*.*" -exec chmod 755 {} \; - ''; - - meta = with stdenv.lib; { - description = "AMD Accelerated Parallel Processing (APP) SDK, with OpenCL 1.2 support"; - homepage = "https://developer.amd.com/amd-accelerated-parallel-processing-app-sdk/"; - license = licenses.amd; - maintainers = [ maintainers.offline ]; - platforms = [ "i686-linux" "x86_64-linux" ]; - }; -} diff --git a/pkgs/development/misc/amdapp-sdk/gcc-5.patch b/pkgs/development/misc/amdapp-sdk/gcc-5.patch deleted file mode 100644 index dc8538db4c1..00000000000 --- a/pkgs/development/misc/amdapp-sdk/gcc-5.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- include/CL/cl.hpp -+++ include/CL/cl.hpp -@@ -201,7 +201,7 @@ - #include - #define __CL_FUNCTION_TYPE typename std::function - #define CL_USE_CPP_FUNCTORS --#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 1 && !defined(STLPORT)) || defined(__APPLE__) || defined(__MACOSX) -+#elif (((__GNUC__ == 4 && __GNUC_MINOR__ >= 1) || (__GNUC__ >= 5)) && !defined(STLPORT)) || defined(__APPLE__) || defined(__MACOSX) - #include - #define __CL_FUNCTION_TYPE typename std::tr1::function - #define CL_USE_CPP_FUNCTORS diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf457b7dd79..4e9c6e99dd9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9695,26 +9695,6 @@ in ### DEVELOPMENT / MISC - amdadlsdk = callPackage ../development/misc/amdadl-sdk { }; - - amdappsdk26 = amdappsdk.override { - version = "2.6"; - }; - - amdappsdk27 = amdappsdk.override { - version = "2.7"; - }; - - amdappsdk28 = amdappsdk.override { - version = "2.8"; - }; - - amdappsdk = callPackage ../development/misc/amdapp-sdk { }; - - amdappsdkFull = amdappsdk.override { - samples = true; - }; - h3 = callPackage ../development/misc/h3 { }; amtk = callPackage ../development/libraries/amtk { }; -- cgit v1.2.3 From e257a92472e63c06662c69bd4e2b1b50db37938a Mon Sep 17 00:00:00 2001 From: evils <30512529+evils@users.noreply.github.com> Date: Tue, 28 Apr 2020 19:20:43 +0200 Subject: foldingathome: 7.5.1 -> 7.6.9 (#86171) --- pkgs/applications/science/misc/foldingathome/client.nix | 4 ++-- pkgs/applications/science/misc/foldingathome/control.nix | 4 ++-- pkgs/applications/science/misc/foldingathome/viewer.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/misc/foldingathome/client.nix b/pkgs/applications/science/misc/foldingathome/client.nix index 9a29fde0a43..74a53902ee0 100644 --- a/pkgs/applications/science/misc/foldingathome/client.nix +++ b/pkgs/applications/science/misc/foldingathome/client.nix @@ -10,7 +10,7 @@ }: let majMin = stdenv.lib.versions.majorMinor version; - version = "7.5.1"; + version = "7.6.9"; fahclient = stdenv.mkDerivation rec { inherit version; @@ -18,7 +18,7 @@ let src = fetchurl { url = "https://download.foldingathome.org/releases/public/release/fahclient/debian-stable-64bit/v${majMin}/fahclient_${version}_amd64.deb"; - hash = "sha256-7+RwYdMoZnJZwYFbmLxsN9ozk2P7jpOGZz9qlvTTfSY="; + sha256 = "1v4yijjjdq9qx1fp60flp9ya6ywl9qdsgkzwmzjzp8sd5gfvhyr6"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/misc/foldingathome/control.nix b/pkgs/applications/science/misc/foldingathome/control.nix index e8eba4c2ab2..72217689ff1 100644 --- a/pkgs/applications/science/misc/foldingathome/control.nix +++ b/pkgs/applications/science/misc/foldingathome/control.nix @@ -8,7 +8,7 @@ }: let majMin = stdenv.lib.versions.majorMinor version; - version = "7.5.1"; + version = "7.6.9"; python = python2.withPackages ( @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.foldingathome.org/releases/public/release/fahcontrol/debian-stable-64bit/v${majMin}/fahcontrol_${version}-1_all.deb"; - hash = "sha256-ydN4I6vmZpI9kD+/TXxgWc+AQqIIlUvABEycWmY1tNg="; + sha256 = "1fh7ybbp3qlqzh18c4gva3aaymv7d31mqchrv235a1axldha1s9s"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/misc/foldingathome/viewer.nix b/pkgs/applications/science/misc/foldingathome/viewer.nix index 03fa54cd733..a35df650300 100644 --- a/pkgs/applications/science/misc/foldingathome/viewer.nix +++ b/pkgs/applications/science/misc/foldingathome/viewer.nix @@ -11,7 +11,7 @@ }: let majMin = stdenv.lib.versions.majorMinor version; - version = "7.5.1"; + version = "7.6.9"; in stdenv.mkDerivation rec { inherit version; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.foldingathome.org/releases/public/release/fahviewer/debian-stable-64bit/v${majMin}/fahviewer_${version}_amd64.deb"; - hash = "sha256-yH0zGjX8aNBEJ5lq7wWydcpp2rO+9Ah++q9eJ+ldeyk="; + sha256 = "04wr86g11wpmsczzwzak4gvalcihb47rn3zp6qriawhxyac9nf93"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 657b336d7283527feaacec2b1db2258975d392d1 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Tue, 28 Apr 2020 19:46:15 +0200 Subject: =?UTF-8?q?ocamlPackages.x509:=200.11.0=20=E2=86=92=200.11.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/x509/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix index d30b23aa3ee..eae40d4dfae 100644 --- a/pkgs/development/ocaml-modules/x509/default.nix +++ b/pkgs/development/ocaml-modules/x509/default.nix @@ -8,11 +8,11 @@ buildDunePackage rec { minimumOCamlVersion = "4.07"; pname = "x509"; - version = "0.11.0"; + version = "0.11.1"; src = fetchurl { url = "https://github.com/mirleft/ocaml-x509/releases/download/v${version}/x509-v${version}.tbz"; - sha256 = "0gcs3vpmixxxx2q4b2iphb1xw1jffya1wkp0p1xbmsfcghzrj20m"; + sha256 = "1vmjqwmxf7zz157rlp3wp3zp88kw62m4f22i0xmxhinssd0dvr9c"; }; useDune2 = true; -- cgit v1.2.3 From 6449a4e84b7c51fd80668a30d21b8880736fec1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 28 Apr 2020 14:59:06 -0300 Subject: Apply suggestions from code review Co-Authored-By: Jan Tojnar --- doc/languages-frameworks/gnome.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/languages-frameworks/gnome.xml b/doc/languages-frameworks/gnome.xml index afc2de27db5..159216ca981 100644 --- a/doc/languages-frameworks/gnome.xml +++ b/doc/languages-frameworks/gnome.xml @@ -44,11 +44,11 @@ Packaging icon themes - Icon themes may inherit from other icon themes. The inheritance is specified using the `Inherits` key in the `index.theme` file distributed with the icon theme. According to the icon theme specification icons not provided by the theme are looked for in its parent icon themes. Therefore the parent themes should be installed as dependencies for a more complete experience regarding the icon sets used. + Icon themes may inherit from other icon themes. The inheritance is specified using the Inherits key in the index.theme file distributed with the icon theme. According to the icon theme specification, icons not provided by the theme are looked for in its parent icon themes. Therefore the parent themes should be installed as dependencies for a more complete experience regarding the icon sets used. - The package hicolor-icon-theme provides a setup hook which makes symbolic links for the parent themes into the directory share/icons of the current theme directory in the nix store, making sure they can be found at runtime. For that to work the packages providing parent icon themes should be listed as propagated build dependencies, toghether with hicolor-icon-theme. + The package hicolor-icon-theme provides a setup hook which makes symbolic links for the parent themes into the directory share/icons of the current theme directory in the nix store, making sure they can be found at runtime. For that to work the packages providing parent icon themes should be listed as propagated build dependencies, together with hicolor-icon-theme. -- cgit v1.2.3 From f5ddad7d5eec46c4bb9a70c13be283483eccd85b Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Tue, 28 Apr 2020 14:01:52 -0400 Subject: pantheon.gala: 3.3.0 -> 3.3.1 https://github.com/elementary/gala/releases/tag/3.3.1 --- pkgs/desktops/pantheon/desktop/gala/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 9db8baa4e94..9b370847fc8 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "gala"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "02g6x190lylng8d07pwx2bqcc71rq48f0dxh30mgndfii6k21qgs"; + sha256 = "03cq9ihgjasnv1n4v3dn1m3ypzj26k2ybd5b1a7yrbprb35zbrs4"; }; passthru = { -- cgit v1.2.3 From e6f7f84325d01024a696a64af84faefe71c348ce Mon Sep 17 00:00:00 2001 From: "Maxine E. Aubrey" Date: Tue, 28 Apr 2020 19:16:11 +0200 Subject: nomad: 0.11.0 -> 0.11.1 --- pkgs/applications/networking/cluster/nomad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index 829ea1000f0..da668b9589a 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "nomad"; - version = "0.11.0"; + version = "0.11.1"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/nomad"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "0jg7h52wlgd2aslx13fs97j3b8g5xfgil3p2jsc4j95l7lmqn7bv"; + sha256 = "1pcn1bk7sqhhsrm3izqljwyrwdz6bdlplrajvjzka39l3k6f9hgc"; }; # ui: -- cgit v1.2.3 From df202b418dca671a37ea977716458ab1b718d9c2 Mon Sep 17 00:00:00 2001 From: Cody Allen Date: Mon, 27 Apr 2020 15:03:14 -0700 Subject: unison-ucm: 1.0.M1j-alpha -> 1.0.M1l-alpha Follow-up to #85940. There were a couple of issues with the 1.0.M1j-alpha release that were promptly fixed. --- pkgs/development/compilers/unison/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/unison/default.nix b/pkgs/development/compilers/unison/default.nix index c2cbc03ca0f..c17f85b4936 100644 --- a/pkgs/development/compilers/unison/default.nix +++ b/pkgs/development/compilers/unison/default.nix @@ -4,18 +4,18 @@ stdenv.mkDerivation rec { pname = "unison-code-manager"; - milestone_id = "M1j"; + milestone_id = "M1l"; version = "1.0.${milestone_id}-alpha"; src = if (stdenv.isDarwin) then fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-osx.tar.gz"; - sha256 = "1pvdjmasgl22inbr8nlizsg8s5zagn8bzwhaxqmwafkpsskz0hsg"; + sha256 = "0qbxakrp3p3k3k8a1m2g24ivs3c8j5rj7ij84i7k548505rva9qr"; } else fetchurl { url = "https://github.com/unisonweb/unison/releases/download/release/${milestone_id}/unison-linux64.tar.gz"; - sha256 = "1xpblx405cp3mv0vrhcqwjlxvrhgmc77mxbvcy93srxja3qai1af"; + sha256 = "152yzv7j4nyp228ngzbhki9fid1xdqrjvl1rwxc05wq30jwwqx0x"; }; # The tarball is just the prebuilt binary, in the archive root. -- cgit v1.2.3 From 2091d42ceff0b7bccd675dc65e655874e0f2c4f0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 28 Apr 2020 21:34:37 +0200 Subject: =?UTF-8?q?openldap:=202.4.49=20=E2=86=92=202.4.50?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: CVE-2020-12243 In filter.c in slapd in OpenLDAP before 2.4.50, LDAP search filters with nested boolean expressions can result in denial of service (daemon crash). --- pkgs/development/libraries/openldap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index cc9e44d990d..b5adc78c7ce 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, cyrus_sasl, db, groff, libtool }: stdenv.mkDerivation rec { - name = "openldap-2.4.49"; + name = "openldap-2.4.50"; src = fetchurl { url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${name}.tgz"; - sha256 = "0vp524rsngdcykf6ki7vprsyg7gj8z7hszg8xwxz50219fa1gcg3"; + sha256 = "1f46nlfwmys110j36sifm7ah8m8f3s10c3vaiikmmigmifapvdaw"; }; # TODO: separate "out" and "bin" -- cgit v1.2.3 From 555b8c1a46c197d251553a25e051da9e76ddc3af Mon Sep 17 00:00:00 2001 From: Johannes Rosenberger Date: Tue, 28 Apr 2020 18:10:19 +0200 Subject: libextractor: add support for gstreamer plugin The gstreamer plugin provides support for additional common file/tagging formats like id3 tags in mp3 files. In addition, it e.g. exposes more tags than the FLAC plugin for FLAC files. Increase of closure size: 86.71 MB (52.8%) --- .../development/libraries/libextractor/default.nix | 28 ++++++++++++++++++++-- .../libextractor/gst-hardcode-plugins.patch | 11 +++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/libextractor/gst-hardcode-plugins.patch diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index ea155440c8d..3db0b056c0f 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -1,8 +1,21 @@ -{ fetchurl, stdenv, libtool, gettext, zlib, bzip2, flac, libvorbis +{ fetchurl, stdenv, substituteAll +, libtool, gettext, zlib, bzip2, flac, libvorbis , exiv2, libgsf, rpm, pkgconfig, fetchpatch +, gstreamerSupport ? true, gst_all_1 ? null +# ^ Needed e.g. for proper id3 and FLAC support. +# Set to `false` to decrease package closure size by about 87 MB (53%). +, gstPlugins ? (gst: [ gst.gst-plugins-base gst.gst-plugins-good ]) +# If an application needs additional gstreamer plugins it can also make them +# available by adding them to the environment variable +# GST_PLUGIN_SYSTEM_PATH_1_0, e.g. like this: +# postInstall = '' +# wrapProgram $out/bin/extract --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" +# ''; +# See also . , gtkSupport ? true, glib ? null, gtk3 ? null , videoSupport ? true, ffmpeg ? null, libmpeg2 ? null}: +assert gstreamerSupport -> gst_all_1 != null && builtins.isList (gstPlugins gst_all_1); assert gtkSupport -> glib != null && gtk3 != null; assert videoSupport -> ffmpeg != null && libmpeg2 != null; @@ -28,6 +41,15 @@ stdenv.mkDerivation rec { sha256 = "01xhcjbzv6p53wz7y2ii76kb8m9iwvnm4ip9w4a0bpgaxqz4b9fw"; excludes = [ "ChangeLog" ]; }) + ] ++ stdenv.lib.optionals gstreamerSupport [ + + # Libraries cannot be wrapped so we need to hardcode the plug-in paths. + (substituteAll { + src = ./gst-hardcode-plugins.patch; + load_gst_plugins = stdenv.lib.concatMapStrings + (plugin: ''gst_registry_scan_path(gst_registry_get(), "${plugin}/lib/gstreamer-1.0");'') + (gstPlugins gst_all_1); + }) ]; preConfigure = @@ -40,7 +62,9 @@ stdenv.mkDerivation rec { [ libtool gettext zlib bzip2 flac libvorbis exiv2 libgsf rpm pkgconfig - ] ++ stdenv.lib.optionals gtkSupport [ glib gtk3 ] + ] ++ stdenv.lib.optionals gstreamerSupport + ([ gst_all_1.gstreamer ] ++ gstPlugins gst_all_1) + ++ stdenv.lib.optionals gtkSupport [ glib gtk3 ] ++ stdenv.lib.optionals videoSupport [ ffmpeg libmpeg2 ]; configureFlags = [ diff --git a/pkgs/development/libraries/libextractor/gst-hardcode-plugins.patch b/pkgs/development/libraries/libextractor/gst-hardcode-plugins.patch new file mode 100644 index 00000000000..73ecf5f252f --- /dev/null +++ b/pkgs/development/libraries/libextractor/gst-hardcode-plugins.patch @@ -0,0 +1,11 @@ +--- a/src/plugins/gstreamer_extractor.c ++++ b/src/plugins/gstreamer_extractor.c +@@ -2215,6 +2215,7 @@ void __attribute__ ((constructor)) + gstreamer_init () + { + gst_init (NULL, NULL); ++ @load_gst_plugins@ + g_log_set_default_handler (&log_handler, NULL); + g_log_set_handler (NULL, G_LOG_LEVEL_MASK | G_LOG_FLAG_FATAL | G_LOG_FLAG_RECURSION, + &log_handler, NULL); + -- cgit v1.2.3 From 30fce6f31b6f8a857616c8de23656af2d2ea0c67 Mon Sep 17 00:00:00 2001 From: Alex Whitt Date: Tue, 28 Apr 2020 13:35:41 -0400 Subject: rdesktop: 1.8.6 -> 1.9.0 --- pkgs/applications/networking/remote/rdesktop/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix index 02a2c63b439..4c67105dafc 100644 --- a/pkgs/applications/networking/remote/rdesktop/default.nix +++ b/pkgs/applications/networking/remote/rdesktop/default.nix @@ -1,21 +1,21 @@ -{stdenv, fetchFromGitHub, openssl, libX11, libgssglue, pkgconfig, autoreconfHook +{stdenv, fetchFromGitHub, openssl, libX11, krb5, libXcursor, libtasn1, nettle, gnutls, pkgconfig, autoreconfHook , enableCredssp ? (!stdenv.isDarwin) } : stdenv.mkDerivation (rec { pname = "rdesktop"; - version = "1.8.6"; + version = "1.9.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "02sbhnqbasa54c75c86qw9w9h9sxxbnldj7bjv2gvn18lmq5rm20"; + sha256 = "1s6k1jwd28y38ymk3lfv76ch4arpfwrbdhpkbnwwy3fc4617gb78"; }; nativeBuildInputs = [pkgconfig autoreconfHook]; - buildInputs = [openssl libX11] - ++ stdenv.lib.optional enableCredssp libgssglue; + buildInputs = [openssl libX11 libXcursor libtasn1 nettle gnutls] + ++ stdenv.lib.optional enableCredssp krb5; configureFlags = [ "--with-ipv6" -- cgit v1.2.3 From ae0685129bb8e37da6306f08549cf43b8c02e767 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 28 Apr 2020 16:42:26 -0400 Subject: sherpa: 2.2.8 -> 2.2.9 --- pkgs/applications/science/physics/sherpa/default.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix index 85b2ddd4d07..314fc522500 100644 --- a/pkgs/applications/science/physics/sherpa/default.nix +++ b/pkgs/applications/science/physics/sherpa/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sherpa"; - version = "2.2.8"; + version = "2.2.9"; src = fetchurl { url = "https://www.hepforge.org/archive/sherpa/SHERPA-MC-${version}.tar.gz"; - sha256 = "1al1imdrknvbcy8k113xysc14lln4msbv281bf0kx7p73wz59mv3"; + sha256 = "1z7vws97k6zfzyqx0dkv2kq8d83dibi73i5jiqk5a22yplp6bnjh"; }; buildInputs = [ gfortran sqlite lhapdf rivet ]; @@ -21,13 +21,11 @@ stdenv.mkDerivation rec { "--enable-rivet=${rivet}" ]; - CXXFLAGS = "-std=c++11"; # needed for rivet on OSX - - meta = { + meta = with stdenv.lib; { description = "Simulation of High-Energy Reactions of PArticles in lepton-lepton, lepton-photon, photon-photon, lepton-hadron and hadron-hadron collisions"; - license = stdenv.lib.licenses.gpl2; - homepage = "https://gitlab.com/sherpa-team/sherpa"; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ veprbl ]; + license = licenses.gpl2; + homepage = "https://gitlab.com/sherpa-team/sherpa"; + platforms = platforms.unix; + maintainers = with maintainers; [ veprbl ]; }; } -- cgit v1.2.3 From 92212a59df51900437beba6d98dc3da9a84ccdb2 Mon Sep 17 00:00:00 2001 From: matthuszagh Date: Tue, 28 Apr 2020 13:49:19 -0700 Subject: pythonPackages.pylibftdi: init at 0.18.1 (#71286) --- .../python-modules/pylibftdi/default.nix | 38 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 4 +++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/python-modules/pylibftdi/default.nix diff --git a/pkgs/development/python-modules/pylibftdi/default.nix b/pkgs/development/python-modules/pylibftdi/default.nix new file mode 100644 index 00000000000..9e8f96665d0 --- /dev/null +++ b/pkgs/development/python-modules/pylibftdi/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchPypi +, httpserver +, libftdi1 +, libusb1 +}: + +buildPythonPackage rec { + pname = "pylibftdi"; + version = "0.18.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "17c5h4xz1grynbpffngjflk3dlw2g2zbhkwb7h5v4n9rjdv41l5x"; + }; + + propagatedBuildInputs = [ + httpserver + libftdi1 + libusb1 + ]; + + postPatch = '' + substituteInPlace pylibftdi/driver.py \ + --replace "self._load_library('libusb')" "cdll.LoadLibrary('${libusb1.out}/lib/libusb1.so')" \ + --replace "self._load_library('libftdi')" "cdll.LoadLibrary('${libftdi1.out}/lib/libftdi1.so')" + ''; + + pythonImportsCheck = [ "pylibftdi" ]; + + meta = with lib; { + homepage = "https://bitbucket.org/codedstructure/pylibftdi/src/default/"; + description = "Minimal pythonic wrapper to Intra2net's libftdi driver for FTDI's USB devices"; + license = licenses.mit; + maintainers = with maintainers; [ matthuszagh ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 68debd34013..755c724e275 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1222,6 +1222,10 @@ in { pylev = callPackage ../development/python-modules/pylev { }; + pylibftdi = callPackage ../development/python-modules/pylibftdi { + inherit (pkgs) libusb1; + }; + pymatgen = callPackage ../development/python-modules/pymatgen { }; pymatgen-lammps = callPackage ../development/python-modules/pymatgen-lammps { }; -- cgit v1.2.3 From 7b38685bb613ffb06c1e5ea1b5d26bae9bd63b58 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Tue, 28 Apr 2020 22:48:28 +0200 Subject: skypeforlinux: 8.58.0.93 -> 8.59.0.77 --- .../networking/instant-messengers/skypeforlinux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index 5eda7971748..f7dbf223a9b 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.58.0.93"; + version = "8.59.0.77"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -64,7 +64,7 @@ let "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; - sha256 = "1nqadil50z896jg0r202gw3xmm3diawn0pnh6n6nxn900f02avl3"; + sha256 = "1cnlwlp84942ywji3x60zvhijavazdxfym3rfzq3ysky28b6mn6i"; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; -- cgit v1.2.3 From cf858e6d57c4753ca872ef9c24d2c31cb6a1204f Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 28 Apr 2020 16:51:44 -0400 Subject: mkDerivation mesonFlags: Fix cross file logic to handle more cases Otherwise eval breaks --- pkgs/stdenv/generic/make-derivation.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index e6363ce42c0..b06541a7e41 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -256,21 +256,19 @@ in rec { mesonFlags = if mesonFlags == null then null else let # See https://mesonbuild.com/Reference-tables.html#cpu-families - cpuFamilies = { - aarch64 = "aarch64"; - armv5tel = "arm"; - armv6l = "arm"; - armv7l = "arm"; - i686 = "x86"; - x86_64 = "x86_64"; - }; + cpuFamily = platform: with platform; + /**/ if isAarch64 then "arm" + else if isAarch32 then "aarch64" + else if isx86_32 then "x86" + else if isx86_64 then "x86_64" + else platform.parsed.cpu.family + builtins.toString platform.parsed.cpu.bits; crossFile = builtins.toFile "cross-file.conf" ('' [properties] needs_exe_wrapper = true [host_machine] system = '${stdenv.targetPlatform.parsed.kernel.name}' - cpu_family = '${cpuFamilies.${stdenv.targetPlatform.parsed.cpu.name}}' + cpu_family = '${cpuFamily stdenv.targetPlatform}' cpu = '${stdenv.targetPlatform.parsed.cpu.name}' endian = ${if stdenv.targetPlatform.isLittleEndian then "'little'" else "'big'"} '' -- cgit v1.2.3 From de2b31490b6e52de5581417ee0904e8d8f3e0f1b Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Tue, 28 Apr 2020 13:51:13 -0700 Subject: zoom-us: 3.5.385850.0413 -> 5.0.398100.0427 --- pkgs/applications/networking/instant-messengers/zoom-us/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index ef06f26522d..84f334be06f 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -15,11 +15,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "3.5.385850.0413"; + version = "5.0.398100.0427"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "049kxgkyaxknxpk0hf1a7bxn0c08dk250z3q2ba9pc1xkrn5kdnw"; + sha256 = "0b9jdicr783wagp2j79106bbk68974j3v8zg8nvky5fydl6ngjvi"; }; }; -- cgit v1.2.3 From ee28064389194bb614e5d34118e8fd51aa0f7bf9 Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Sat, 18 Apr 2020 20:35:04 -0700 Subject: macvim: Clean up hybrid compilation environment MacVim compiles the Vim part using `/usr/bin/clang` and the GUI part using Xcode. The Xcode portion always uses Xcode's own SDK and we have no workable alternative. The Vim portion so far has been compiling using a hybrid compilation environment, where it uses the SDK for most stuff but picks up a bunch of library linker paths (including libSystem) by virtue of Ruby's LDFLAGS. This hybrid compilation environment meant that if the SDK headers referenced a symbol that the library itself didn't have, this could produce link errors. Previously we attempted to fix this by synthesizing an include path that contained just the one header from Nix's Libsystem that referenced the missing symbol, to get rid of the reference and allow linking to work again, but this was very hacky and runs the risk of future Xcode SDK changes producing the same errors with different headers, or of future SDK versions expecting the intercepted header to contain a definition that Nix's doesn't. This new approach is to just clean up the compilation environment such that the Vim portion is compiling against the Xcode SDK as well, by sanitizing the LDFLAGS produced by the configure script so it stops referencing Nix's versions of OS libraries. This means the resulting Vim binary no longer depends at runtime on Nix for anything except the scripting language support, but that's how it's been for the MacVim binary all along anyway, and this approach should keep us insulated against future Xcode SDK changes. --- pkgs/applications/editors/vim/macvim.nix | 44 ++++++++++++++++++------------ pkgs/applications/editors/vim/macvim.patch | 20 -------------- 2 files changed, 27 insertions(+), 37 deletions(-) diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 2a13c0ea700..93ec48e54e0 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -22,14 +22,6 @@ let mkdir -p $out/bin ln -s /usr/bin/xcrun /usr/bin/xcodebuild /usr/bin/tiffutil /usr/bin/qlmanage $out/bin ''; - # I'm not really sure how configure finds Nix Libsystem, but we get link errors when using - # Xcode 11.4 if we're compiling against Xcode's SDK but using Nix Libsystem. We can't just pass - # Libsystem's includes though as that causes other issues, particularly with availability macros. - # This is a horrible hack but let's just pass the header that's causing problems. - fakeLibsystemInclude = runCommand "macvim-libsystem-include-shim" {} '' - mkdir -p $out/include/sys/_types - ln -s ${darwin.Libsystem}/include/sys/_types/_fd_def.h $out/include/sys/_types - ''; in stdenv.mkDerivation { @@ -74,7 +66,6 @@ stdenv.mkDerivation { "--with-tlib=ncurses" "--with-compiledby=Nix" "--disable-sparkle" - "LDFLAGS=-headerpad_max_install_names" ]; makeFlags = ''PREFIX=$(out) CPPFLAGS="-Wno-error"''; @@ -89,19 +80,12 @@ stdenv.mkDerivation { # This is unfortunate, but we need to use the same compiler as Xcode, # but Xcode doesn't provide a way to configure the compiler. - # - # If you're willing to modify the system files, you can do this: - # http://hamelot.co.uk/programming/add-gcc-compiler-to-xcode-6/ - # - # But we don't have that option. preConfigure = '' CC=/usr/bin/clang DEV_DIR=$(/usr/bin/xcode-select -print-path)/Platforms/MacOSX.platform/Developer configureFlagsArray+=( "--with-developer-dir=$DEV_DIR" - # Also pass `-g -O` because configure would add those if we weren't setting CFLAGS. - "CFLAGS=-g -O -isystem ${fakeLibsystemInclude}/include" ) '' # For some reason having LD defined causes PSMTabBarControl to fail at link-time as it @@ -111,8 +95,34 @@ stdenv.mkDerivation { '' ; + # Because we're building with system clang, this means we're building against Xcode's SDK and + # linking against system libraries. The configure script is picking up Nix Libsystem (via ruby) + # so we need to patch that out or we'll get linker issues. The MacVim binary built by Xcode links + # against the system anyway so it doesn't really matter that the Vim binary will too. If we + # decide that matters, we can always patch it back to the Nix libsystem post-build. + # It also picks up libiconv, libunwind, and objc4 from Nix. These seem relatively harmless but + # let's strip them out too. + # + # Note: If we do add a post-build install_name_tool patch, we need to add the + # "LDFLAGS=-headerpad_max_install_names" flag to configureFlags and either patch it into the + # Xcode project or pass it as a flag to xcodebuild as well. postConfigure = '' - substituteInPlace src/auto/config.mk --replace "PERL_CFLAGS =" "PERL_CFLAGS = -I${darwin.libutil}/include" + substituteInPlace src/auto/config.mk \ + --replace "PERL_CFLAGS =" "PERL_CFLAGS = -I${darwin.libutil}/include" \ + --replace " -L${stdenv.cc.libc}/lib" "" \ + --replace " -L${darwin.libobjc}/lib" "" \ + --replace " -L${darwin.libunwind}/lib" "" \ + --replace " -L${darwin.libiconv}/lib" "" + + # All the libraries we stripped have -osx- in their name as of this time. + # Assert now that this pattern no longer appears in config.mk. + ( # scope variable + while IFS="" read -r line; do + if [[ "$line" == LDFLAGS*-osx-* ]]; then + echo "WARNING: src/auto/config.mk contains reference to Nix osx library" >&2 + fi + done Date: Tue, 28 Apr 2020 13:22:31 -0400 Subject: openexr,ilmbase: Switch to cmake-based build It appears that the autotools based build isn't supported on Darwin. Just use the stdenv-builtin cmake build everywhere, as it works just fine and is simpler. --- pkgs/development/libraries/ilmbase/default.nix | 23 ++++++------- pkgs/development/libraries/openexr/default.nix | 45 +++++++------------------- 2 files changed, 20 insertions(+), 48 deletions(-) diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index 4ea16a59e8b..9d2479c2e0b 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -1,9 +1,13 @@ -{ stdenv, lib, buildPackages, automake, autoconf, libtool, which, - fetchpatch, openexr }: +{ stdenv +, buildPackages +, cmake +, libtool +, openexr +}: stdenv.mkDerivation rec { pname = "ilmbase"; - version = lib.getVersion openexr; + version = stdenv.lib.getVersion openexr; # the project no longer provides separate tarballs. We may even want to merge # the ilmbase package into openexr in the future. @@ -13,19 +17,10 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - preConfigure = '' - patchShebangs ./bootstrap - ./bootstrap - ''; - + nativeBuildInputs = [ cmake libtool ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; - nativeBuildInputs = [ automake autoconf libtool which ]; - - NIX_CFLAGS_LINK = "-pthread"; - patches = [ - ./cross.patch - ]; + patches = [ ./cross.patch ]; # fails 1 out of 1 tests with # "lt-ImathTest: testBoxAlgo.cpp:892: void {anonymous}::boxMatrixTransform(): Assertion `b21 == b2' failed" diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index da8fb429465..425afc70f37 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -1,11 +1,13 @@ -{ lib, stdenv, buildPackages, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, - zlib, ilmbase, fetchpatch }: - -let - # Doesn't really do anything when not crosscompiling - emulator = stdenv.hostPlatform.emulator buildPackages; -in - +{ lib +, stdenv +, buildPackages +, fetchFromGitHub +, zlib +, ilmbase +, fetchpatch +, cmake +, libtool +}: stdenv.mkDerivation rec { pname = "openexr"; version = "2.4.1"; @@ -17,36 +19,11 @@ stdenv.mkDerivation rec { sha256 = "020gyl8zv83ag6gbcchmqiyx9rh2jca7j8n52zx1gk4rck7kwc01"; }; - sourceRoot = "source/OpenEXR"; - outputs = [ "bin" "dev" "out" "doc" ]; - - # Needed because there are some generated sources. Solution: just run them under QEMU. - postPatch = '' - for file in b44ExpLogTable dwaLookups - do - # Ecape for both sh and Automake - emu=${lib.escapeShellArg (lib.replaceStrings ["$"] ["$$"] emulator)} - before="./$file > $file.h" - after="$emu $before" - substituteInPlace IlmImf/Makefile.am \ - --replace "$before" "$after" - done - - # Make sure the patch succeeded - [[ $(grep "$emu" IlmImf/Makefile.am | wc -l) = 2 ]] - ''; - - preConfigure = '' - patchShebangs ./bootstrap - ./bootstrap - ''; - - nativeBuildInputs = [ pkgconfig autoconf automake libtool ]; + nativeBuildInputs = [ cmake libtool ]; propagatedBuildInputs = [ ilmbase zlib ]; enableParallelBuilding = true; - doCheck = false; # fails 1 of 1 tests meta = with stdenv.lib; { description = "A high dynamic-range (HDR) image file format"; -- cgit v1.2.3 From 3fb6a304d0d46edc94b2a84197a17867345d1067 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 29 Apr 2020 08:31:03 +1000 Subject: podman: 1.9.0 -> 1.9.1 https://github.com/containers/libpod/releases/tag/v1.9.1 --- pkgs/applications/virtualization/podman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 2c1ad0b4297..8ca193194bc 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -14,13 +14,13 @@ buildGoPackage rec { pname = "podman"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "containers"; repo = "libpod"; rev = "v${version}"; - sha256 = "19y48lpf7pvw5f5pzpknn92rq9xwbrpvi8mj7mc4dby6skqadrk4"; + sha256 = "0dr5vd52fnjwx3zn2nj2nlvkbvh5bg579nf3qw8swrn8i1jwxd6j"; }; goPackagePath = "github.com/containers/libpod"; -- cgit v1.2.3 From 7550ab98b0a305afda06121e6f135a7556b7e753 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 28 Apr 2020 23:36:40 +0200 Subject: libbfd: fix build The patch to separate it from `binutils` didn't apply anymore after updating `binutils` to 2.34[1]. [1] #85951 --- .../binutils/build-components-separately.patch | 38 +++++++--------------- 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/pkgs/development/tools/misc/binutils/build-components-separately.patch b/pkgs/development/tools/misc/binutils/build-components-separately.patch index d3cd0d2131c..38fa4934a28 100644 --- a/pkgs/development/tools/misc/binutils/build-components-separately.patch +++ b/pkgs/development/tools/misc/binutils/build-components-separately.patch @@ -1,19 +1,8 @@ -From bc09a9236f67e710d545ac11bcdac7b55dbcc1a0 Mon Sep 17 00:00:00 2001 -From: John Ericson -Date: Thu, 12 Oct 2017 11:16:57 -0400 -Subject: [PATCH] Build components separately - ---- - bfd/configure.ac | 18 +++--------------- - opcodes/Makefile.am | 17 +++++++++++++---- - opcodes/configure.ac | 45 ++++++--------------------------------------- - 3 files changed, 22 insertions(+), 58 deletions(-) - diff --git a/bfd/configure.ac b/bfd/configure.ac -index 9a183c1628..8728837384 100644 +index c5bfbd5d..45ad4c26 100644 --- a/bfd/configure.ac +++ b/bfd/configure.ac -@@ -241,31 +241,19 @@ AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed, +@@ -278,31 +278,19 @@ AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed, LT_LIB_M @@ -33,26 +22,26 @@ index 9a183c1628..8728837384 100644 - SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" - fi - - # More hacks to build DLLs on Windows. case "${host}" in + # More hacks to build DLLs on Windows. *-*-cygwin*) SHARED_LDFLAGS="-no-undefined" - SHARED_LIBADD="-L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lcygwin -lkernel32" + SHARED_LIBADD="-liberty -lintl -lcygwin -lkernel32" ;; - # Hack to build or1k-src on OSX - or1k*-*-darwin*) + # Use built-in libintl on macOS, since it is not provided by libc. + *-*-darwin*) - SHARED_LIBADD="-L`pwd`/../libiberty/pic -L`pwd`/../intl -liberty -lintl" + SHARED_LIBADD="-liberty -lintl" ;; esac diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am -index 925e7ff651..47b395c195 100644 +index 4f06074a..6836c589 100644 --- a/opcodes/Makefile.am +++ b/opcodes/Makefile.am -@@ -52,7 +52,7 @@ libopcodes_la_LDFLAGS += -rpath $(rpath_bfdlibdir) +@@ -51,7 +51,7 @@ libopcodes_la_LDFLAGS += -rpath $(rpath_bfdlibdir) endif # This is where bfd.h lives. @@ -61,7 +50,7 @@ index 925e7ff651..47b395c195 100644 BUILD_LIBS = @BUILD_LIBS@ BUILD_LIB_DEPS = @BUILD_LIB_DEPS@ -@@ -303,7 +303,7 @@ OFILES = @BFD_MACHINES@ +@@ -301,7 +301,7 @@ OFILES = @BFD_MACHINES@ # development.sh is used to determine -Werror default. CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/development.sh @@ -70,7 +59,7 @@ index 925e7ff651..47b395c195 100644 disassemble.lo: disassemble.c if am__fastdepCC -@@ -324,12 +324,21 @@ libopcodes_la_SOURCES = dis-buf.c disassemble.c dis-init.c +@@ -322,12 +322,21 @@ libopcodes_la_SOURCES = dis-buf.c disassemble.c dis-init.c # old version of libbfd, or to pick up libbfd for the wrong architecture # if host != build. So for building with shared libraries we use a # hardcoded path to libbfd.so instead of relying on the entries in libbfd.la. @@ -95,10 +84,10 @@ index 925e7ff651..47b395c195 100644 # the build directory so that we don't have to convert all the # programs that use libopcodes.a simultaneously. This is a hack which diff --git a/opcodes/configure.ac b/opcodes/configure.ac -index b9f5eb8a4f..ef2c2152b7 100644 +index 00be9c88..6e589ae4 100644 --- a/opcodes/configure.ac +++ b/opcodes/configure.ac -@@ -89,6 +89,7 @@ AC_PROG_INSTALL +@@ -86,6 +86,7 @@ AC_PROG_INSTALL AC_CHECK_HEADERS(string.h strings.h stdlib.h limits.h) ACX_HEADER_STRING @@ -106,7 +95,7 @@ index b9f5eb8a4f..ef2c2152b7 100644 AC_CHECK_DECLS([basename, stpcpy]) -@@ -134,61 +135,27 @@ AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed, +@@ -137,61 +138,27 @@ AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed, LT_LIB_M @@ -173,6 +162,3 @@ index b9f5eb8a4f..ef2c2152b7 100644 ;; esac --- -2.14.2 - -- cgit v1.2.3 From 6c9beaa744ede63e633b59c4e32c5953cc079ad2 Mon Sep 17 00:00:00 2001 From: Lionello Lunesu Date: Sat, 18 Apr 2020 16:56:02 +0800 Subject: dmd: 2.085.1 -> 2.091.1 Apply patch dlang/dmd#11053 --- pkgs/development/compilers/dmd/binary.nix | 52 ++++++++++++++++++++++++++++ pkgs/development/compilers/dmd/bootstrap.nix | 9 +++++ pkgs/development/compilers/dmd/default.nix | 34 +++++++++++------- 3 files changed, 83 insertions(+), 12 deletions(-) create mode 100644 pkgs/development/compilers/dmd/binary.nix create mode 100644 pkgs/development/compilers/dmd/bootstrap.nix diff --git a/pkgs/development/compilers/dmd/binary.nix b/pkgs/development/compilers/dmd/binary.nix new file mode 100644 index 00000000000..cd3a15889b2 --- /dev/null +++ b/pkgs/development/compilers/dmd/binary.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames, glibc +, version, hashes }: +with stdenv; +let + OS = if hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name; + MODEL = toString hostPlatform.parsed.cpu.bits; +in mkDerivation { + pname = "dmd-bootstrap"; + inherit version; + + src = fetchurl rec { + name = "dmd.${version}.${OS}.tar.xz"; + url = "http://downloads.dlang.org/releases/2.x/${version}/${name}"; + sha256 = hashes.${OS} or (throw "missing bootstrap sha256 for OS ${OS}"); + }; + + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ fixDarwinDylibNames autoPatchelfHook ]; + propagatedBuildInputs = [ curl tzdata ] ++ lib.optional hostPlatform.isLinux glibc; + + installPhase = '' + mkdir -p $out + + # try to copy model-specific binaries into bin first + mv ${OS}/bin${MODEL} $out/bin || true + + mv src license.txt ${OS}/* $out/ + + # move man into place + mkdir -p $out/share + mv man $out/share/ + + # move docs into place + mkdir -p $out/share/doc + mv html/d $out/share/doc/ + + # fix paths in dmd.conf (one level less) + substituteInPlace $out/bin/dmd.conf --replace "/../../" "/../" + ''; + + meta = with lib; { + inherit version; + description = "Digital Mars D Compiler Package"; + # As of 2.075 all sources and binaries use the boost license + license = licenses.boost; + maintainers = [ maintainers.lionello ]; + homepage = "https://dlang.org/"; + platforms = [ "x86_64-darwin" "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/compilers/dmd/bootstrap.nix b/pkgs/development/compilers/dmd/bootstrap.nix new file mode 100644 index 00000000000..087781ae2ca --- /dev/null +++ b/pkgs/development/compilers/dmd/bootstrap.nix @@ -0,0 +1,9 @@ +{ callPackage }: +callPackage ./binary.nix { + version = "2.090.1"; + hashes = { + # Get these from `nix-prefetch-url http://downloads.dlang.org/releases/2.x/2.090.1/dmd.2.090.1.linux.tar.xz` etc.. + osx = "0rbn7j4dr3q0y09fblpj999bi063pi4230rqd5xgd3gwxxa0cz7l"; + linux = "1vk6lsvd6y7ccvffd23yial4ig90azaxf2rxc6yvidqd1qhan807"; + }; +} diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 9281e01ad3e..028c863d0cf 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -1,11 +1,13 @@ { stdenv, lib, fetchFromGitHub , makeWrapper, unzip, which, writeTextFile -, curl, tzdata, gdb, darwin, git -, targetPackages, ldc -, version ? "2.085.1" -, dmdSha256 ? "0ccidfcawrcwdpfjwjiln5xwr4ffp8i2hwx52p8zn3xmc5yxm660" -, druntimeSha256 ? "109f2glsqrlshk06761xlw4r5v22mivp873cq9g5gcax3g00k617" -, phobosSha256 ? "0giispqqx8j8xg6c0hm7nx77bcahiwic8rvf12sws3sv5pizv8pr" +, curl, tzdata, gdb, darwin, git, callPackage +, targetPackages, fetchpatch +, dmdBootstrap ? callPackage ./bootstrap.nix { } +, HOST_DMD ? "${dmdBootstrap}/bin/dmd" +, version ? "2.091.1" +, dmdSha256 ? "0brz0n84jdkhr4sq4k91w48p739psbhbb1jk2pi9q60psmx353yr" +, druntimeSha256 ? "0smgpmfriffh110ksski1s5j921kmxbc2zjy0dyj9ksyrxbzklbl" +, phobosSha256 ? "1n00anajgibrfs1xzvrmag28hvbvkc0w1fwlimqbznvhf28rhrxs" }: let @@ -51,7 +53,17 @@ stdenv.mkDerivation rec { }) ]; - patchFlags = [ "--directory=dmd" "-p1" ]; + patchFlags = [ "--directory=dmd" "-p1" "-F3" ]; + patches = [ + (fetchpatch { + url = "https://github.com/dlang/dmd/commit/4157298cf04f7aae9f701432afd1de7b7e05c30f.patch"; + sha256 = "0v4xgqmrx5r8vbx5a4v88s0xnm23mam9nm99yfga7s2sxr0hi5p2"; + }) + (fetchpatch { + url = "https://github.com/dlang/dmd/commit/14547ae37a97678a80a32fea4c76626bbd8595ca.patch"; + sha256 = "17f7glbmq61r9zy9y40p1zwgqc9daf2sbly3p6d6z9wsd1p57xnl"; + }) + ]; sourceRoot = "."; @@ -65,12 +77,11 @@ stdenv.mkDerivation rec { postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" "" '' - + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' substituteInPlace phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)" ''; - nativeBuildInputs = [ ldc makeWrapper unzip which gdb git ] + nativeBuildInputs = [ makeWrapper unzip which gdb git ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin (with darwin.apple_sdk.frameworks; [ Foundation @@ -89,7 +100,7 @@ stdenv.mkDerivation rec { # Buid and install are based on http://wiki.dlang.org/Building_DMD buildPhase = '' cd dmd - make -j$NIX_BUILD_CORES -f posix.mak INSTALL_DIR=$out BUILD=release ENABLE_RELEASE=1 PIC=1 HOST_DMD=ldmd2 + make -j$NIX_BUILD_CORES -f posix.mak INSTALL_DIR=$out BUILD=release ENABLE_RELEASE=1 PIC=1 HOST_DMD=${HOST_DMD} cd ../druntime make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} cd ../phobos @@ -147,8 +158,7 @@ stdenv.mkDerivation rec { # Everything is now Boost licensed, even the backend. # https://github.com/dlang/dmd/pull/6680 license = licenses.boost; - maintainers = with maintainers; [ ThomasMader ]; + maintainers = with maintainers; [ ThomasMader lionello ]; platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; }; } - -- cgit v1.2.3 From 6e7a36bcb32924dda472a300c142c959e98d4e83 Mon Sep 17 00:00:00 2001 From: Lionello Lunesu Date: Sun, 26 Apr 2020 16:31:51 +0800 Subject: Update patch dlang/dmd#11053 --- pkgs/development/compilers/dmd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index 028c863d0cf..bdce25096ba 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -60,8 +60,8 @@ stdenv.mkDerivation rec { sha256 = "0v4xgqmrx5r8vbx5a4v88s0xnm23mam9nm99yfga7s2sxr0hi5p2"; }) (fetchpatch { - url = "https://github.com/dlang/dmd/commit/14547ae37a97678a80a32fea4c76626bbd8595ca.patch"; - sha256 = "17f7glbmq61r9zy9y40p1zwgqc9daf2sbly3p6d6z9wsd1p57xnl"; + url = "https://github.com/dlang/dmd/commit/1b8a4c90b040bf2f0b68a2739de4991315580b13.patch"; + sha256 = "1iih6aalv4fsw9mbrlrybhngkkchzzrzg7q8zl047w36c0x397cs"; }) ]; -- cgit v1.2.3 From e0777cba1913491e8cb90c4692664907bbe7841f Mon Sep 17 00:00:00 2001 From: Lionello Lunesu Date: Mon, 27 Apr 2020 06:39:12 +0800 Subject: Patch bash in test6952.d --- pkgs/development/compilers/dmd/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix index bdce25096ba..a6d4f7e1e20 100644 --- a/pkgs/development/compilers/dmd/default.nix +++ b/pkgs/development/compilers/dmd/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub , makeWrapper, unzip, which, writeTextFile , curl, tzdata, gdb, darwin, git, callPackage -, targetPackages, fetchpatch +, targetPackages, fetchpatch, bash , dmdBootstrap ? callPackage ./bootstrap.nix { } , HOST_DMD ? "${dmdBootstrap}/bin/dmd" , version ? "2.091.1" @@ -74,7 +74,10 @@ stdenv.mkDerivation rec { patchShebangs . ''; - postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' + postPatch = '' + substituteInPlace dmd/test/dshell/test6952.d --replace "/usr/bin/env bash" "${bash}/bin/bash" + '' + + stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" "" '' + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' -- cgit v1.2.3 From 386da32bb04def5693902ed10eb3b16acdd04d0a Mon Sep 17 00:00:00 2001 From: Lionello Lunesu Date: Mon, 27 Apr 2020 06:47:17 +0800 Subject: ldc: 1.17.0 -> 1.20.1 This reverts commit 31d630c3a4f0f5b417244e054b0a88ecf9ec1acf. --- pkgs/development/compilers/ldc/binary.nix | 41 +++++++ pkgs/development/compilers/ldc/bootstrap.nix | 10 ++ pkgs/development/compilers/ldc/default.nix | 174 +-------------------------- pkgs/development/compilers/ldc/generic.nix | 143 ++++++++++++++++++++++ 4 files changed, 197 insertions(+), 171 deletions(-) create mode 100644 pkgs/development/compilers/ldc/binary.nix create mode 100644 pkgs/development/compilers/ldc/bootstrap.nix create mode 100644 pkgs/development/compilers/ldc/generic.nix diff --git a/pkgs/development/compilers/ldc/binary.nix b/pkgs/development/compilers/ldc/binary.nix new file mode 100644 index 00000000000..56d40be8619 --- /dev/null +++ b/pkgs/development/compilers/ldc/binary.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, curl, tzdata, autoPatchelfHook, fixDarwinDylibNames, libxml2 +, version, hashes }: +with stdenv; +let + OS = if hostPlatform.isDarwin then "osx" else hostPlatform.parsed.kernel.name; + ARCH = toString hostPlatform.parsed.cpu.name; +in mkDerivation { + pname = "ldc-bootstrap"; + inherit version; + + src = fetchurl rec { + name = "ldc2-${version}-${OS}-${ARCH}.tar.xz"; + url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/${name}"; + sha256 = hashes."${OS}-${ARCH}" or (throw "missing bootstrap sha256 for ${OS}-${ARCH}"); + }; + + dontConfigure = true; + dontBuild = true; + + nativeBuildInputs = [ fixDarwinDylibNames autoPatchelfHook ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxml2 stdenv.cc.cc ]; + + propagatedBuildInputs = [ curl tzdata ]; + + installPhase = '' + mkdir -p $out + + mv bin etc import lib LICENSE README $out/ + ''; + + meta = with lib; { + inherit version; + description = "The LLVM-based D Compiler"; + homepage = "https://github.com/ldc-developers/ldc"; + # from https://github.com/ldc-developers/ldc/blob/master/LICENSE + license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ]; + maintainers = with maintainers; [ ThomasMader lionello ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; + }; +} diff --git a/pkgs/development/compilers/ldc/bootstrap.nix b/pkgs/development/compilers/ldc/bootstrap.nix new file mode 100644 index 00000000000..fde4c842684 --- /dev/null +++ b/pkgs/development/compilers/ldc/bootstrap.nix @@ -0,0 +1,10 @@ +{ callPackage }: +callPackage ./binary.nix { + version = "1.19.0"; + hashes = { + # Get these from `nix-prefetch-url https://github.com/ldc-developers/ldc/releases/download/v1.19.0/ldc2-1.19.0-osx-x86_64.tar.xz` etc.. + osx-x86_64 = "1bp3xkh9zp64dzq8isanib1gacb3nfbl70qv15qygwk1zan6zgy7"; + linux-x86_64 = "146grr2lwarfk13wgkpyb77xb6b3as1is2rf4s2hipqjmc8biy1h"; + linux-aarch64 = "1fv6jshfvi15m7masgxq1hgp216qjd5amizrqdf26vhrq3a08li3"; + }; +} diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix index 19fe2981c83..5a4baabcf8d 100644 --- a/pkgs/development/compilers/ldc/default.nix +++ b/pkgs/development/compilers/ldc/default.nix @@ -1,173 +1,5 @@ -{ stdenv, fetchurl, cmake, ninja, llvm_5, llvm_8, curl, tzdata -, libconfig, lit, gdb, unzip, darwin, bash -, callPackage, makeWrapper, runCommand, targetPackages -, bootstrapVersion ? false -, version ? "1.17.0" -, ldcSha256 ? "1aag5jfrng6p4ms0fs90hjbv9bcj3hj8h52r68c3cm6racdajbva" -}: - -let - bootstrapLdc = if !bootstrapVersion then - # LDC 0.17.x is the last version which doesn't need a working D compiler to - # build so we use that version to bootstrap the actual build. - callPackage ./default.nix { - bootstrapVersion = true; - version = "0.17.6"; - ldcSha256 = "0qf5kbxddgmg3kqzi0kf4bgv8vdrnv16y07hcpm0cwv9mc3qr2w6"; - } - else - ""; - - pathConfig = runCommand "ldc-lib-paths" {} '' - mkdir $out - echo ${tzdata}/share/zoneinfo/ > $out/TZDatabaseDirFile - echo ${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} > $out/LibcurlPathFile - ''; -in - -stdenv.mkDerivation rec { - pname = "ldc"; - inherit version; - - enableParallelBuilding = true; - - src = fetchurl { - url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz"; - sha256 = ldcSha256; - }; - - # https://issues.dlang.org/show_bug.cgi?id=19553 - hardeningDisable = [ "fortify" ]; - - postUnpack = '' - 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 - - # test depends on current year - rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/ddocYear.d - '' - - + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) '' - # https://github.com/NixOS/nixpkgs/issues/34817 - rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall - ''; - - postPatch = '' - # Setting SHELL=$SHELL when dmd testsuite is run doesn't work on Linux somehow - substituteInPlace tests/d2/dmd-testsuite/Makefile --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash" - '' - - + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isLinux) '' - substituteInPlace runtime/phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" "" - '' - - + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) '' - substituteInPlace runtime/phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)" - '' - - + stdenv.lib.optionalString (bootstrapVersion && stdenv.hostPlatform.isDarwin) '' - # Was not able to compile on darwin due to "__inline_isnanl" - # being undefined. - # TODO Remove with version > 0.17.6 - substituteInPlace dmd2/root/port.c --replace __inline_isnanl __inline_isnan - ''; - - nativeBuildInputs = [ cmake ninja makeWrapper unzip ] - ++ stdenv.lib.optionals (!bootstrapVersion) [ - bootstrapLdc lit lit.python - ] - ++ stdenv.lib.optional (!bootstrapVersion && stdenv.hostPlatform.isDarwin) - # https://github.com/NixOS/nixpkgs/issues/57120 - # https://github.com/NixOS/nixpkgs/pull/59197#issuecomment-481972515 - llvm_5 - ++ 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.optionals (bootstrapVersion) [ - libconfig llvm_5 - ] - ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin - darwin.apple_sdk.frameworks.Foundation; - - - buildInputs = [ curl tzdata ]; - - cmakeFlags = stdenv.lib.optionals (!bootstrapVersion) [ - "-DD_FLAGS=-d-version=TZDatabaseDir;-d-version=LibcurlPath;-J${pathConfig}" - "-DCMAKE_BUILD_TYPE=Release" - ]; - - postConfigure = '' - export DMD=$PWD/bin/ldmd2 - ''; - - makeFlags = [ "DMD=$DMD" ]; - - fixNames = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' - fixDarwinDylibNames() { - local flags=() - - for fn in "$@"; do - flags+=(-change "$(basename "$fn")" "$fn") - done - - for fn in "$@"; do - if [ -L "$fn" ]; then continue; fi - echo "$fn: fixing dylib" - install_name_tool -id "$fn" "''${flags[@]}" "$fn" - done - } - - fixDarwinDylibNames $(find "$(pwd)/lib" -name "*.dylib") - export DYLD_LIBRARY_PATH=$(pwd)/lib - ''; - - # https://github.com/ldc-developers/ldc/issues/2497#issuecomment-459633746 - additionalExceptions = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin - "|druntime-test-shared"; - - doCheck = !bootstrapVersion; - - checkPhase = stdenv.lib.optionalString doCheck '' - # Build default lib test runners - ninja -j$NIX_BUILD_CORES all-test-runners - - ${fixNames} - - # Run dmd testsuite - export DMD_TESTSUITE_MAKE_ARGS="-j$NIX_BUILD_CORES DMD=$DMD CC=$CXX" - ctest -V -R "dmd-testsuite" - - # Build and run LDC D unittests. - ctest --output-on-failure -R "ldc2-unittest" - - # Run LIT testsuite. - ctest -V -R "lit-tests" - - # Run default lib unittests - ctest -j$NIX_BUILD_CORES --output-on-failure -E "ldc2-unittest|lit-tests|dmd-testsuite${additionalExceptions}" - ''; - - postInstall = '' - wrapProgram $out/bin/ldc2 \ - --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \ - --set-default CC "${targetPackages.stdenv.cc}/bin/cc" - ''; - - meta = with stdenv.lib; { - description = "The LLVM-based D compiler"; - homepage = "https://github.com/ldc-developers/ldc"; - # from https://github.com/ldc-developers/ldc/blob/master/LICENSE - license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ]; - maintainers = with maintainers; [ ThomasMader ]; - platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; - }; +import ./generic.nix { + version = "1.20.1"; + ldcSha256 = "1bqsgab22v02pc3c9gcyf15y7aimadv24d68icaw5lpgnvzxy89b"; } diff --git a/pkgs/development/compilers/ldc/generic.nix b/pkgs/development/compilers/ldc/generic.nix new file mode 100644 index 00000000000..c93d423945c --- /dev/null +++ b/pkgs/development/compilers/ldc/generic.nix @@ -0,0 +1,143 @@ +{ version, ldcSha256 }: +{ stdenv, fetchurl, cmake, ninja, llvm_5, llvm_8, curl, tzdata +, libconfig, lit, gdb, unzip, darwin, bash +, callPackage, makeWrapper, runCommand, targetPackages +, ldcBootstrap ? callPackage ./bootstrap.nix { } +}: + +let + pathConfig = runCommand "ldc-lib-paths" {} '' + mkdir $out + echo ${tzdata}/share/zoneinfo/ > $out/TZDatabaseDirFile + echo ${curl.out}/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} > $out/LibcurlPathFile + ''; + +in + +stdenv.mkDerivation rec { + pname = "ldc"; + inherit version; + + enableParallelBuilding = true; + + src = fetchurl { + url = "https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz"; + sha256 = ldcSha256; + }; + + # https://issues.dlang.org/show_bug.cgi?id=19553 + hardeningDisable = [ "fortify" ]; + + postUnpack = '' + patchShebangs . + '' + + '' + 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 + + # test depends on current year + rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/ddocYear.d + '' + + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + # https://github.com/NixOS/nixpkgs/issues/34817 + rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall + ''; + + postPatch = '' + # Setting SHELL=$SHELL when dmd testsuite is run doesn't work on Linux somehow + substituteInPlace tests/d2/dmd-testsuite/Makefile --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash" + '' + + stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' + substituteInPlace runtime/phobos/std/socket.d --replace "assert(ih.addrList[0] == 0x7F_00_00_01);" "" + '' + + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace runtime/phobos/std/socket.d --replace "foreach (name; names)" "names = []; foreach (name; names)" + ''; + + nativeBuildInputs = [ + cmake ninja makeWrapper unzip ldcBootstrap lit lit.python + ] + ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.apple_sdk.frameworks.Foundation + # https://github.com/NixOS/nixpkgs/issues/57120 + # https://github.com/NixOS/nixpkgs/pull/59197#issuecomment-481972515 + llvm_5 + ] + ++ stdenv.lib.optionals (!stdenv.hostPlatform.isDarwin) [ + llvm_8 + # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 + gdb + ]; + + buildInputs = [ curl tzdata ]; + + cmakeFlags = [ + "-DD_FLAGS=-d-version=TZDatabaseDir;-d-version=LibcurlPath;-J${pathConfig}" + "-DCMAKE_BUILD_TYPE=Release" + ]; + + postConfigure = '' + export DMD=$PWD/bin/ldmd2 + ''; + + makeFlags = [ "DMD=$DMD" ]; + + fixNames = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + fixDarwinDylibNames() { + local flags=() + + for fn in "$@"; do + flags+=(-change "$(basename "$fn")" "$fn") + done + + for fn in "$@"; do + if [ -L "$fn" ]; then continue; fi + echo "$fn: fixing dylib" + install_name_tool -id "$fn" "''${flags[@]}" "$fn" + done + } + + fixDarwinDylibNames $(find "$(pwd)/lib" -name "*.dylib") + export DYLD_LIBRARY_PATH=$(pwd)/lib + ''; + + # https://github.com/ldc-developers/ldc/issues/2497#issuecomment-459633746 + additionalExceptions = stdenv.lib.optionalString stdenv.hostPlatform.isDarwin + "|druntime-test-shared"; + + checkPhase = '' + # Build default lib test runners + ninja -j$NIX_BUILD_CORES all-test-runners + + ${fixNames} + + # Run dmd testsuite + export DMD_TESTSUITE_MAKE_ARGS="-j$NIX_BUILD_CORES DMD=$DMD" + ctest -V -R "dmd-testsuite" + + # Build and run LDC D unittests. + ctest --output-on-failure -R "ldc2-unittest" + + # Run LIT testsuite. + ctest -V -R "lit-tests" + + # Run default lib unittests + ctest -j$NIX_BUILD_CORES --output-on-failure -E "ldc2-unittest|lit-tests|dmd-testsuite${additionalExceptions}" + ''; + + postInstall = '' + wrapProgram $out/bin/ldc2 \ + --prefix PATH ":" "${targetPackages.stdenv.cc}/bin" \ + --set-default CC "${targetPackages.stdenv.cc}/bin/cc" + ''; + + meta = with stdenv.lib; { + description = "The LLVM-based D compiler"; + homepage = "https://github.com/ldc-developers/ldc"; + # from https://github.com/ldc-developers/ldc/blob/master/LICENSE + license = with licenses; [ bsd3 boost mit ncsa gpl2Plus ]; + maintainers = with maintainers; [ ThomasMader lionello ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; + }; +} -- cgit v1.2.3 From 764c8203b833176d546395a5c1adf193a9ca73f8 Mon Sep 17 00:00:00 2001 From: Matthew Bauer Date: Tue, 28 Apr 2020 18:56:01 -0500 Subject: =?UTF-8?q?nixos/systemd.nix:=20don=E2=80=99t=20require=20online?= =?UTF-8?q?=20for=20multi-user.target?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Not all systems need to be online to boot up. So, don’t pull network-online.target into multi-user.target. Services that need online network can still require it. This increases my boot time from ~9s to ~5s. --- nixos/modules/system/boot/systemd.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 2167df60bc9..58e2f9d3bfc 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -1033,7 +1033,6 @@ in systemd.services.systemd-journald.stopIfChanged = false; systemd.targets.local-fs.unitConfig.X-StopOnReconfiguration = true; systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true; - systemd.targets.network-online.wantedBy = [ "multi-user.target" ]; systemd.services.systemd-binfmt.wants = [ "proc-sys-fs-binfmt_misc.mount" ]; # Don't bother with certain units in containers. -- cgit v1.2.3 From 4007ceb6afa4bee457d7248ffcbb19740d2ecd78 Mon Sep 17 00:00:00 2001 From: Colin <486199+c00w@users.noreply.github.com> Date: Tue, 28 Apr 2020 20:16:20 -0400 Subject: treewide get rid of go 1.12 (#83253) * treewide Drop unneeded go 1.12 overrides * Fix packr to be go module compatible. I updated to version 2.8.0 which is the latest on master. Then due to the 2 different sets of go modules which are used, I split the build into two different derivations, then merged them togethor using symlinkJoin to have the same output structure as the existing derivation. * Remove consul dependency on go1.12 I updated the consul version to 1.7.2 and flipped it to building using modules. * Remove go1.12 from perkeep. Update the version to the latest unstable on master. * Update scaleway-cli to not be pinned to go1.12 Switched the version to 1.20 * Update prometheus-varnish-exporter to not depend on go1.12 * Update lnd to build with go1.12 Updated the version Forced only building subpackages with main to prevent panics over multiple modules in one repo * Remove go1.12 from openshift Had to update the version to 4.1.0 and do a bit of munging to get this to work * Remove go1.12 completely. These are no longer needed. * Update bazel-watcher and make it build with go 1.14 --- pkgs/applications/blockchains/lnd.nix | 8 +- pkgs/applications/misc/perkeep/default.nix | 6 +- .../networking/cluster/openshift/default.nix | 23 +- pkgs/development/compilers/go/1.12.nix | 247 --------------------- .../development/compilers/go/remove-test-pie.patch | 24 -- .../compilers/go/ssl-cert-file-1.12.1.patch | 59 ----- pkgs/development/libraries/packr/default.nix | 43 +++- pkgs/development/tools/bazel-watcher/default.nix | 24 +- pkgs/servers/consul/default.nix | 30 +-- .../monitoring/prometheus/varnish-exporter.nix | 8 +- pkgs/tools/admin/scaleway-cli/default.nix | 4 +- pkgs/top-level/aliases.nix | 3 + pkgs/top-level/all-packages.nix | 95 ++------ 13 files changed, 104 insertions(+), 470 deletions(-) delete mode 100644 pkgs/development/compilers/go/1.12.nix delete mode 100644 pkgs/development/compilers/go/remove-test-pie.patch delete mode 100644 pkgs/development/compilers/go/ssl-cert-file-1.12.1.patch diff --git a/pkgs/applications/blockchains/lnd.nix b/pkgs/applications/blockchains/lnd.nix index dd45746c8df..0aa087e20af 100644 --- a/pkgs/applications/blockchains/lnd.nix +++ b/pkgs/applications/blockchains/lnd.nix @@ -2,16 +2,18 @@ buildGoModule rec { pname = "lnd"; - version = "0.9.0-beta"; + version = "0.9.2-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - sha256 = "1hq105s9ykp6nsn4iicjnl3mwspqkbfsswkx7sgzv3jggg08fkq9"; + sha256 = "0gm33z89fiqv231ks2mkpsblskcsijipq8fcmip6m6jy8g06b1gb"; }; - modSha256 = "1pvcvpiz6ck8xkgpypchrq9kgkik0jxd7f3jhihbgldsh4zaqiaq"; + modSha256 = "1khxplvyaqgaddrx1nna1fw0nb1xz9bmqpxpfifif4f5nmx90gbr"; + + subPackages = ["cmd/lncli" "cmd/lnd"]; meta = with lib; { description = "Lightning Network Daemon"; diff --git a/pkgs/applications/misc/perkeep/default.nix b/pkgs/applications/misc/perkeep/default.nix index 87a6bdf5e53..5a1e5ba65de 100644 --- a/pkgs/applications/misc/perkeep/default.nix +++ b/pkgs/applications/misc/perkeep/default.nix @@ -13,13 +13,13 @@ let in buildGoPackage rec { name = "perkeep-${version}"; - version = "unstable-2019-07-29"; + version = "unstable-2020-03-23"; src = fetchFromGitHub { owner = "perkeep"; repo = "perkeep"; - rev = "c9f78d02adf9740f3b8d403a1418554293cc9f41"; - sha256 = "11rin94pjzg0kvizrq9ss42fjw7wfwx3g1pk8zdlhyfkiwwh2rmg"; + rev = "c2e31370ddefd86b6112a5d891100ea3382a4254"; + sha256 = "0jf02k20ms7h60wglcq6dj3vqi9rlfww7db5iplgwznbij70c1i4"; }; goPackagePath = "perkeep.org"; diff --git a/pkgs/applications/networking/cluster/openshift/default.nix b/pkgs/applications/networking/cluster/openshift/default.nix index bcd259b138f..19272c37ee8 100644 --- a/pkgs/applications/networking/cluster/openshift/default.nix +++ b/pkgs/applications/networking/cluster/openshift/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, buildGoPackage, which, go-bindata, rsync, utillinux -, coreutils, kerberos, clang, installShellFiles +, coreutils, kerberos, ncurses, clang, installShellFiles , components ? [ "cmd/oc" "cmd/openshift" @@ -9,12 +9,12 @@ with lib; let - version = "3.11.0"; + version = "4.1.0"; ver = stdenv.lib.elemAt (stdenv.lib.splitVersion version); versionMajor = ver 0; versionMinor = ver 1; versionPatch = ver 2; - gitCommit = "0cbc58b"; + gitCommit = "b4261e0"; # version is in vendor/k8s.io/kubernetes/pkg/version/base.go k8sversion = "v1.11.1"; k8sgitcommit = "b1b2997"; @@ -28,29 +28,17 @@ in buildGoPackage rec { owner = "openshift"; repo = "origin"; rev = "v${version}"; - sha256 = "06q4v2a1mm6c659ab0rzkqz6b66vx4avqfg0s9xckwhq420lzgka"; + sha256 = "16bc6ljm418kxz92gz8ldm82491mvlqamrvigyr6ff72rf7ml7ba"; }; goPackagePath = "github.com/openshift/origin"; - buildInputs = [ kerberos ]; + buildInputs = [ kerberos ncurses ]; nativeBuildInputs = [ which rsync go-bindata clang installShellFiles ]; patchPhase = '' patchShebangs ./hack - - substituteInPlace pkg/oc/clusterup/docker/host/host.go \ - --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt findmnt' \ - 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/findmnt' - - substituteInPlace pkg/oc/clusterup/docker/host/host.go \ - --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mount' \ - 'nsenter --mount=/rootfs/proc/1/ns/mnt ${utillinux}/bin/mount' - - substituteInPlace pkg/oc/clusterup/docker/host/host.go \ - --replace 'nsenter --mount=/rootfs/proc/1/ns/mnt mkdir' \ - 'nsenter --mount=/rootfs/proc/1/ns/mnt ${coreutils}/bin/mkdir' ''; buildPhase = '' @@ -58,6 +46,7 @@ in buildGoPackage rec { # Openshift build require this variables to be set # unless there is a .git folder which is not the case with fetchFromGitHub echo "OS_GIT_VERSION=v${version}" >> os-version-defs + echo "OS_GIT_TREE_STATE=clean" >> os-version-defs echo "OS_GIT_MAJOR=${versionMajor}" >> os-version-defs echo "OS_GIT_MINOR=${versionMinor}" >> os-version-defs echo "OS_GIT_PATCH=${versionPatch}" >> os-version-defs diff --git a/pkgs/development/compilers/go/1.12.nix b/pkgs/development/compilers/go/1.12.nix deleted file mode 100644 index 65e97d4e929..00000000000 --- a/pkgs/development/compilers/go/1.12.nix +++ /dev/null @@ -1,247 +0,0 @@ -{ stdenv, fetchurl, tzdata, iana-etc, runCommand -, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation -, mailcap, runtimeShell -, buildPackages, pkgsTargetTarget -}: - -let - - inherit (stdenv.lib) optionals optionalString; - - goBootstrap = runCommand "go-bootstrap" {} '' - mkdir $out - cp -rf ${buildPackages.go_bootstrap}/* $out/ - chmod -R u+w $out - find $out -name "*.c" -delete - cp -rf $out/bin/* $out/share/go/bin/ - ''; - - goarch = platform: { - i686 = "386"; - x86_64 = "amd64"; - aarch64 = "arm64"; - arm = "arm"; - armv5tel = "arm"; - armv6l = "arm"; - armv7l = "arm"; - }.${platform.parsed.cpu.name} or (throw "Unsupported system"); - -in - -stdenv.mkDerivation rec { - pname = "go"; - version = "1.12.17"; - - src = fetchurl { - url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "09cbl90maxry713wd18jdqrms3ivbvcm472csnxc78rsqhc851yy"; - }; - - # perl is used for testing go vet - nativeBuildInputs = [ perl which pkgconfig patch procps ]; - buildInputs = [ cacert pcre ] - ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] - ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; - - depsTargetTargetPropagated = optionals stdenv.isDarwin [ Security Foundation ]; - - hardeningDisable = [ "all" ]; - - prePatch = '' - patchShebangs ./ # replace /bin/bash - - # This source produces shell script at run time, - # and thus it is not corrected by patchShebangs. - substituteInPlace misc/cgo/testcarchive/carchive_test.go \ - --replace '#!/usr/bin/env bash' '#!${runtimeShell}' - - # Patch the mimetype database location which is missing on NixOS. - substituteInPlace src/mime/type_unix.go \ - --replace '/etc/mime.types' '${mailcap}/etc/mime.types' - - # Disabling the 'os/http/net' tests (they want files not available in - # chroot builds) - rm src/net/{listen,parse}_test.go - rm src/syscall/exec_linux_test.go - - # !!! substituteInPlace does not seems to be effective. - # The os test wants to read files in an existing path. Just don't let it be /usr/bin. - sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go - sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go - # Disable the unix socket test - sed -i '/TestShutdownUnix/areturn' src/net/net_test.go - # Disable the hostname test - sed -i '/TestHostname/areturn' src/os/os_test.go - # ParseInLocation fails the test - sed -i '/TestParseInSydney/areturn' src/time/format_test.go - # Remove the api check as it never worked - sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go - # Remove the coverage test as we have removed this utility - sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go - # Remove the timezone naming test - sed -i '/TestLoadFixed/areturn' src/time/time_test.go - # Remove disable setgid test - sed -i '/TestRespectSetgidDir/areturn' src/cmd/go/internal/work/build_test.go - # Remove cert tests that conflict with NixOS's cert resolution - sed -i '/TestEnvVars/areturn' src/crypto/x509/root_unix_test.go - # TestWritevError hangs sometimes - sed -i '/TestWritevError/areturn' src/net/writev_test.go - # TestVariousDeadlines fails sometimes - sed -i '/TestVariousDeadlines/areturn' src/net/timeout_test.go - - sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go - sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go - - # Disable cgo lookup tests not works, they depend on resolver - rm src/net/cgo_unix_test.go - - # Disable TestGcSys because it's flakey in our tests, but the failure is not - # reproducible by multiple people in other environments. - # See https://github.com/NixOS/nixpkgs/issues/68361#issuecomment-537849272 and following - # NOTE: Try re-enabling for releases newer than 1.12.9 - sed -i '/TestGcSys/areturn' src/runtime/gc_test.go - - '' + optionalString stdenv.isLinux '' - sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go - '' + optionalString stdenv.isAarch32 '' - echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash - '' + optionalString stdenv.isDarwin '' - substituteInPlace src/race.bash --replace \ - "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true - sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go - sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go - sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go - - sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go - sed -i '/TestCredentialNoSetGroups/areturn' src/os/exec/exec_posix_test.go - sed -i '/TestRead0/areturn' src/os/os_test.go - sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go - - sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go - sed -i '/TestBuildDashIInstallsDependencies/areturn' src/cmd/go/go_test.go - - sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go - - sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go - - # TestCurrent fails because Current is not implemented on Darwin - sed -i 's/TestCurrent/testCurrent/g' src/os/user/user_test.go - sed -i 's/TestLookup/testLookup/g' src/os/user/user_test.go - - touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd - ''; - - patches = [ - ./remove-tools-1.11.patch - ./ssl-cert-file-1.12.1.patch - ./remove-test-pie.patch - ./creds-test.patch - ./go-1.9-skip-flaky-19608.patch - ./go-1.9-skip-flaky-20072.patch - ./skip-external-network-tests.patch - ./skip-nohup-tests.patch - ] ++ [ - # breaks under load: https://github.com/golang/go/issues/25628 - (if stdenv.isAarch32 - then ./skip-test-extra-files-on-aarch32.patch - else ./skip-test-extra-files-on-386.patch) - ]; - - postPatch = '' - find . -name '*.orig' -exec rm {} ';' - ''; - - GOOS = stdenv.targetPlatform.parsed.kernel.name; - GOARCH = goarch stdenv.targetPlatform; - # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. - # Go will nevertheless build a for host system that we will copy over in - # the install phase. - GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; - GOHOSTARCH = goarch stdenv.buildPlatform; - - # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those - # to be different from CC/CXX - CC_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then - "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc" - else - null; - CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then - "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++" - else - null; - - GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); - GO386 = 387; # from Arch: don't assume sse2 on i686 - CGO_ENABLED = 1; - # Hopefully avoids test timeouts on Hydra - GO_TEST_TIMEOUT_SCALE = 3; - - # Indicate that we are running on build infrastructure - # Some tests assume things like home directories and users exists - GO_BUILDER_NAME = "nix"; - - GOROOT_BOOTSTRAP="${goBootstrap}/share/go"; - - postConfigure = '' - export GOCACHE=$TMPDIR/go-cache - # this is compiled into the binary - export GOROOT_FINAL=$out/share/go - - export PATH=$(pwd)/bin:$PATH - - # Independent from host/target, CC should produce code for the building system. - export CC=${buildPackages.stdenv.cc}/bin/cc - ulimit -a - ''; - - postBuild = '' - (cd src && ./make.bash) - ''; - - doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin; - - checkPhase = '' - runHook preCheck - (cd src && HOME=$TMPDIR GOCACHE=$TMPDIR/go-cache ./run.bash --no-rebuild) - runHook postCheck - ''; - - preInstall = '' - rm -r pkg/{bootstrap,obj} - # Contains the wrong perl shebang when cross compiling, - # since it is not used for anything we can deleted as well. - rm src/regexp/syntax/make_perl_groups.pl - '' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then '' - mv bin/*_*/* bin - rmdir bin/*_* - ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' - rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH} - ''} - '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then '' - rm -rf bin/*_* - ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' - rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH} - ''} - '' else ""); - - installPhase = '' - runHook preInstall - mkdir -p $GOROOT_FINAL - cp -a bin pkg src lib misc api doc $GOROOT_FINAL - ln -s $GOROOT_FINAL/bin $out/bin - runHook postInstall - ''; - - setupHook = ./setup-hook.sh; - - disallowedReferences = [ goBootstrap ]; - - meta = with stdenv.lib; { - branch = "1.12"; - homepage = "http://golang.org/"; - description = "The Go Programming language"; - license = licenses.bsd3; - maintainers = with maintainers; [ cstrahan orivej mic92 rvolosatovs Frostman ]; - platforms = platforms.linux ++ platforms.darwin; - }; -} diff --git a/pkgs/development/compilers/go/remove-test-pie.patch b/pkgs/development/compilers/go/remove-test-pie.patch deleted file mode 100644 index fb8e116af76..00000000000 --- a/pkgs/development/compilers/go/remove-test-pie.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- source.org/src/cmd/dist/test.go 2018-02-22 10:40:40.089632339 +0000 -+++ source/src/cmd/dist/test.go 2018-02-22 10:56:53.075193788 +0000 -@@ -526,21 +526,6 @@ - }) - } - -- // Test internal linking of PIE binaries where it is supported. -- if goos == "linux" && goarch == "amd64" && !isAlpineLinux() { -- // Issue 18243: We don't have a way to set the default -- // dynamic linker used in internal linking mode. So -- // this test is skipped on Alpine. -- t.tests = append(t.tests, distTest{ -- name: "pie_internal", -- heading: "internal linking of -buildmode=pie", -- fn: func(dt *distTest) error { -- t.addCmd(dt, "src", t.goTest(), "reflect", "-buildmode=pie", "-ldflags=-linkmode=internal", t.timeout(60)) -- return nil -- }, -- }) -- } -- - // sync tests - t.tests = append(t.tests, distTest{ - name: "sync_cpu", diff --git a/pkgs/development/compilers/go/ssl-cert-file-1.12.1.patch b/pkgs/development/compilers/go/ssl-cert-file-1.12.1.patch deleted file mode 100644 index aa3116d76c1..00000000000 --- a/pkgs/development/compilers/go/ssl-cert-file-1.12.1.patch +++ /dev/null @@ -1,59 +0,0 @@ -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/pkgs/development/libraries/packr/default.nix b/pkgs/development/libraries/packr/default.nix index 4482a9cd312..6a53743a10e 100644 --- a/pkgs/development/libraries/packr/default.nix +++ b/pkgs/development/libraries/packr/default.nix @@ -1,22 +1,46 @@ { buildGoModule , fetchFromGitHub , lib +, stdenv +, symlinkJoin }: -buildGoModule rec { - pname = "packr"; - version = "2.7.1"; +let p2 = buildGoModule rec { + pname = "packr2"; + version = "2.8.0"; src = fetchFromGitHub { owner = "gobuffalo"; - repo = pname; + repo = "packr"; rev = "v${version}"; - sha256 = "0m5kl2fq8gf1v4vllgag2xl8fd382sdgqrcdb8f5alsnrdn08kb9"; + sha256 = "1x78yq2yg0r82h7a67078llni85gk9nbd2ismlbqgppap7fcpyai"; + }+"/v2"; + + subPackages = [ "packr2" ]; + + modSha256 = "1xxqyn78074jna0iri7sks6b2l4sdnn5sg57n09vrrf6kh39h2y9"; + + meta = with stdenv.lib; { + description = "The simple and easy way to embed static files into Go binaries"; + homepage = "https://github.com/gobuffalo/packr"; + license = licenses.mit; + maintainers = with maintainers; [ mmahut ]; + }; +}; +p1 = buildGoModule rec { + pname = "packr1"; + version = "2.8.0"; + + src = fetchFromGitHub { + owner = "gobuffalo"; + repo = "packr"; + rev = "v${version}"; + sha256 = "1x78yq2yg0r82h7a67078llni85gk9nbd2ismlbqgppap7fcpyai"; }; - subPackages = [ "packr" "v2/packr2" ]; + subPackages = [ "packr" ]; - modSha256 = "0afhkvivma16bi8rz3kwcsz9mhmcn4zm6rrymxkvazx6b844hcdv"; + modSha256 = "045qfdi82yhpghjd0cimxhas4nkj7g30n9qyvkrl9ck01sahx76f"; meta = with lib; { description = "The simple and easy way to embed static files into Go binaries"; @@ -24,4 +48,9 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ mmahut ]; }; +}; +in +symlinkJoin{ + name = "packr"; + paths = [p1 p2]; } diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index 27c72b351e7..9cdd72eeaaf 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -5,35 +5,29 @@ , go , python , stdenv +, iana-etc +, mailcap +, tzdata }: let patches = [ ./use-go-in-path.patch - - # update rules_go to fix the build. Remove these when updating past 0.10.3 - (fetchpatch { - url = "https://github.com/bazelbuild/bazel-watcher/commit/686130f50cea274f7453f6abc8c5249654047462.patch"; - sha256 = "0rzs01sfiinl5d3dq9sx1bhl8kkzppdwh964fr7bzafqcxv5llmb"; - }) - (fetchpatch { - url = "https://github.com/bazelbuild/bazel-watcher/commit/18bdb44832ccc533e0ab3923ef80060eeb24582d.patch"; - sha256 = "0k5hvlxlg4n092d53cbfxqqhzc6f1jv4licdhhi1dhckkhb4sdk6"; - }) ]; in buildBazelPackage rec { name = "bazel-watcher-${version}"; - version = "0.10.3"; + version = "0.13.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "bazel-watcher"; rev = "v${version}"; - sha256 = "17z4nqqsdrainbh8fmhf6sgrxwf7aknadmn94z1yqpxa7kb9x33v"; + sha256 = "1fc3sp79znbbq1yjap56lham72n7cap8yfghpzrzmpl5brybjkvm"; }; nativeBuildInputs = [ go git python ]; + removeRulesCC = false; bazelTarget = "//ibazel"; @@ -55,6 +49,10 @@ buildBazelPackage rec { rm -rf $bazelOut/external/{go_sdk,\@go_sdk.marker} sed -e '/^FILE:@go_sdk.*/d' -i $bazelOut/external/\@*.marker + # Retains go build input markers + chmod -R 755 $bazelOut/external/{bazel_gazelle_go_repository_cache,@\bazel_gazelle_go_repository_cache.marker} + rm -rf $bazelOut/external/{bazel_gazelle_go_repository_cache,@\bazel_gazelle_go_repository_cache.marker} + # Remove the gazelle tools, they contain go binaries that are built # non-deterministically. As long as the gazelle version matches the tools # should be equivalent. @@ -62,7 +60,7 @@ buildBazelPackage rec { sed -e '/^FILE:@bazel_gazelle_go_repository_tools.*/d' -i $bazelOut/external/\@*.marker ''; - sha256 = "0cmj186n2y1g9kkdhcivmh2qvigvpnbp03m575b7hgsxi1cp3ssj"; + sha256 = "0wj573dcirssr2cmq90b4yl57mv3gsxaj1s26afvkz1dvyxmq7sz"; }; buildAttrs = { diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 8703e76cb71..299ad0bdbcb 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -1,19 +1,17 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "consul"; version = "1.7.2"; rev = "v${version}"; - goPackagePath = "github.com/hashicorp/consul"; - - # Note: Currently only release tags are supported, because they have the Consul UI - # vendored. See - # https://github.com/NixOS/nixpkgs/pull/48714#issuecomment-433454834 - # If you want to use a non-release commit as `src`, you probably want to improve - # this derivation so that it can build the UI's JavaScript from source. - # See https://github.com/NixOS/nixpkgs/pull/49082 for something like that. - # Or, if you want to patch something that doesn't touch the UI, you may want + # Note: Currently only release tags are supported, because they have the Consul UI + # vendored. See + # https://github.com/NixOS/nixpkgs/pull/48714#issuecomment-433454834 + # If you want to use a non-release commit as `src`, you probably want to improve + # this derivation so that it can build the UI's JavaScript from source. + # See https://github.com/NixOS/nixpkgs/pull/49082 for something like that. + # Or, if you want to patch something that doesn't touch the UI, you may want # to apply your changes as patches on top of a release commit. src = fetchFromGitHub { owner = "hashicorp"; @@ -22,8 +20,14 @@ buildGoPackage rec { sha256 = "1q587d8aqfkwg4fymr56fnf038vkxbdqz5yilz96dzny27dhspj4"; }; - preBuild = '' - buildFlagsArray+=("-ldflags" "-X github.com/hashicorp/consul/version.GitDescribe=v${version} -X github.com/hashicorp/consul/version.Version=${version} -X github.com/hashicorp/consul/version.VersionPrerelease=") + # This corresponds to paths with package main - normally unneeded but consul + # has a split module structure in one repo + subPackages = ["." "connect/certgen"]; + + modSha256 = "164834gr8a7qvp72ccjpkbbg4h8idrcxvcp1fl7yi59iqsswfr7b"; + + preBuild = '' + buildFlagsArray+=("-ldflags" "-X github.com/hashicorp/consul/version.GitDescribe=v${version} -X github.com/hashicorp/consul/version.Version=${version} -X github.com/hashicorp/consul/version.VersionPrerelease=") ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix index d7767567195..03656470b92 100644 --- a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "prometheus_varnish_exporter"; - version = "1.5.2"; + version = "unstable-2020-03-26"; src = fetchFromGitHub { owner = "jonnenauha"; repo = "prometheus_varnish_exporter"; - rev = version; - sha256 = "0rpabw6a6paavv62f0gzhax9brzcgkly27rhkf0ihw8736gkw8ar"; + rev = "f0f90fc69723de8b716cda16cb419e8a025130ff"; + sha256 = "1viiiyvhpr7cnf8ykaaq4fzgg9xvn4hnlhv7cagy3jkjlmz60947"; }; - modSha256 = "0w1zg9jc2466srx9pdckw7rzn7ma4pbd0617b1h98v364wjzgj72"; + modSha256 = "1vb720axjziiqcba4bdi528r6mc97ci0pfsk0ny50isrkh0s3jzz"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/admin/scaleway-cli/default.nix b/pkgs/tools/admin/scaleway-cli/default.nix index 68c20493d19..f9b608ebc4c 100644 --- a/pkgs/tools/admin/scaleway-cli/default.nix +++ b/pkgs/tools/admin/scaleway-cli/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec{ pname = "scaleway-cli"; - version = "1.17"; + version = "1.20"; goPackagePath = "github.com/scaleway/scaleway-cli"; @@ -10,7 +10,7 @@ buildGoPackage rec{ owner = "scaleway"; repo = "scaleway-cli"; rev = "v${version}"; - sha256 = "0v50wk6q8537880whi6w83dia9y934v0s2xr1z52cn3mrsjghsnd"; + sha256 = "14likzp3hl04nq9nmpmh9m5zqjyspy5cyk20dkh03c1nhkd4vcnx"; }; meta = with stdenv.lib; { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9d861fc538f..7aa3ace7b5f 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -60,6 +60,8 @@ mapAliases ({ bittorrentSync14 = throw "bittorrentSync14 has been deprecated by resilio-sync."; # added 2019-06-03 bittorrentSync20 = throw "bittorrentSync20 has been deprecated by resilio-sync."; # added 2019-06-03 buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12 + buildGo112Package = throw "buildGo112Package has been removed"; # added 2020-04-26 + buildGo112Module = throw "buildGo112Module has been removed"; # added 2020-04-26 bundler_HEAD = bundler; # added 2015-11-15 cantarell_fonts = cantarell-fonts; # added 2018-03-03 catfish = xfce.catfish; # added 2019-12-22 @@ -166,6 +168,7 @@ mapAliases ({ gnuradio-rds = gr-rds; # added 2019-05-27 gnuradio-osmosdr = gr-osmosdr; # added 2019-05-27 gnustep-make = gnustep.make; # added 2016-7-6 + go_1_12 = throw "go_1_12 has been removed"; # added 2020-04-26 go-pup = pup; # added 2017-12-19 gobjectIntrospection = gobject-introspection; # added 2018-12-02 goimports = gotools; # added 2018-09-16 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f23704e76e8..666927850d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -292,11 +292,7 @@ in packer = callPackage ../development/tools/packer { }; - packr = callPackage ../development/libraries/packr { - # Version 2.6.0 fails to build with go 1.13 due to nested modules: - # go: directory v2/packr2 is outside main module - buildGoModule = buildGo112Module; - }; + packr = callPackage ../development/libraries/packr { }; pet = callPackage ../development/tools/pet { }; @@ -1497,11 +1493,7 @@ in compactor = callPackage ../applications/networking/compactor { }; - consul = callPackage ../servers/consul { - # Version 1.6.0 fails to build with go 1.13 due to broken dependency: - # go/src/github.com/hashicorp/consul/vendor/github.com/envoyproxy/go-control-plane/envoy/type/http_status.pb.go:11:2: code in directory /build/go/src/github.com/hashicorp/consul/vendor/github.com/envoyproxy/protoc-gen-validate/validate expects import "github.com/lyft/protoc-gen-validate/validate" - buildGoPackage = buildGo112Package; - }; + consul = callPackage ../servers/consul { }; consul-alerts = callPackage ../servers/monitoring/consul-alerts { }; @@ -2772,11 +2764,7 @@ in curl_unix_socket = callPackage ../tools/networking/curl-unix-socket { }; - curlie = callPackage ../tools/networking/curlie { - # Version 1.2.0 fails to build with go 1.13 due to: - # verifying golang.org/x/crypto@v0.0.0-20180524125353-159ae71589f3: golang.org/x/crypto@v0.0.0-20180524125353-159ae71589f3: Get https://sum.golang.org/lookup/golang.org/x/crypto@v0.0.0-20180524125353-159ae71589f3: dial tcp: lookup sum.golang.org on [::1]:53: read udp [::1]:49088->[::1]:53: read: connection refused - buildGoModule = buildGo112Module; - }; + curlie = callPackage ../tools/networking/curlie { }; cunit = callPackage ../tools/misc/cunit { }; bcunit = callPackage ../tools/misc/bcunit { }; @@ -3900,9 +3888,7 @@ in grpcurl = callPackage ../tools/networking/grpcurl { }; - grpcui = callPackage ../tools/networking/grpcui { - buildGoModule = buildGo112Module; - }; + grpcui = callPackage ../tools/networking/grpcui { }; grub = pkgsi686Linux.callPackage ../tools/misc/grub ({ stdenv = overrideCC stdenv buildPackages.pkgsi686Linux.gcc6; @@ -4325,12 +4311,7 @@ in iperf3 = callPackage ../tools/networking/iperf/3.nix { }; iperf = iperf3; - ipfs = callPackage ../applications/networking/ipfs { - # Version 0.4.22 fails to build with go 1.13 due to version validation: - # go: github.com/go-critic/go-critic@v0.0.0-20181204210945-ee9bf5809ead: invalid pseudo-version: does not match version-control timestamp (2019-02-10T22:04:43Z) - # This is fixed in master, but release containing the fix does not exist yet. - buildGoModule = buildGo112Module; - }; + ipfs = callPackage ../applications/networking/ipfs { }; ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { }; @@ -5431,7 +5412,7 @@ in noip = callPackage ../tools/networking/noip { }; - nomad = callPackage ../applications/networking/cluster/nomad { }; + nomad = callPackage ../applications/networking/cluster/nomad { }; notable = callPackage ../applications/misc/notable { }; @@ -8571,13 +8552,6 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; - go_1_12 = callPackage ../development/compilers/go/1.12.nix ({ - inherit (darwin.apple_sdk.frameworks) Security Foundation; - } // lib.optionalAttrs stdenv.isAarch64 { - stdenv = gcc8Stdenv; - buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; - }); - go_1_14 = callPackage ../development/compilers/go/1.14.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; } // lib.optionalAttrs stdenv.isAarch64 { @@ -9951,9 +9925,7 @@ in bazel-remote = callPackage ../development/tools/build-managers/bazel/bazel-remote { }; - bazel-watcher = callPackage ../development/tools/bazel-watcher { - go = go_1_12; - }; + bazel-watcher = callPackage ../development/tools/bazel-watcher { }; bazel-gazelle = callPackage ../development/tools/bazel-gazelle { }; @@ -15204,18 +15176,12 @@ in ### DEVELOPMENT / GO MODULES - buildGo112Package = callPackage ../development/go-packages/generic { - go = buildPackages.go_1_12; - }; buildGo114Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_14; }; buildGoPackage = buildGo114Package; - buildGo112Module = callPackage ../development/go-modules/generic { - go = buildPackages.go_1_12; - }; buildGo114Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_14; }; @@ -15534,9 +15500,7 @@ in grafana_reporter = callPackage ../servers/monitoring/grafana-reporter { }; - gobetween = callPackage ../servers/gobetween { - buildGoModule = buildGo112Module; - }; + gobetween = callPackage ../servers/gobetween { }; h2o = callPackage ../servers/http/h2o { }; @@ -15994,11 +15958,7 @@ in prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-exporter.nix { }; prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { }; prometheus-unifi-exporter = callPackage ../servers/monitoring/prometheus/unifi-exporter { }; - prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { - # Version 1.5.1 fails to build with go 1.13 due to test failure - # FAIL github.com/jonnenauha/prometheus_varnish_exporter 0.041s - buildGoModule = buildGo112Module; - }; + prometheus-varnish-exporter = callPackage ../servers/monitoring/prometheus/varnish-exporter.nix { }; prometheus-jmx-httpserver = callPackage ../servers/monitoring/prometheus/jmx-httpserver.nix { }; prometheus-wireguard-exporter = callPackage ../servers/monitoring/prometheus/wireguard-exporter.nix { inherit (darwin.apple_sdk.frameworks) Security; @@ -16394,9 +16354,7 @@ in cpustat = callPackage ../os-specific/linux/cpustat { }; - cockroachdb = callPackage ../servers/sql/cockroachdb { - buildGoPackage = buildGo112Package; - }; + cockroachdb = callPackage ../servers/sql/cockroachdb { }; conky = callPackage ../os-specific/linux/conky ({ lua = lua5_3_compat; @@ -17250,11 +17208,7 @@ in gotests = callPackage ../development/tools/gotests { }; - gotestsum = callPackage ../development/tools/gotestsum { - # Version 0.3.5 fails to build with go 1.13: - # build ./testjson/internal/badmain: cannot find module for path ./testjson/internal/badmain - buildGoModule = buildGo112Module; - }; + gotestsum = callPackage ../development/tools/gotestsum { }; impl = callPackage ../development/tools/impl { }; @@ -18739,11 +18693,7 @@ in poppler = poppler_0_61; }; - perkeep = callPackage ../applications/misc/perkeep { - # Revision c9f78d02adf9740f3b8d403a1418554293cc9f41 fails to build with go 1.13 due to a dependency: - # go: bazil.org/fuse@v0.0.0-20160811212531-371fbbdaa898: Get https://proxy.golang.org/bazil.org/fuse/@v/v0.0.0-20160811212531-371fbbdaa898.mod: dial tcp: lookup proxy.golang.org on [::1]:53: read udp [::1]:36526->[::1]:53: read: connection refused - buildGoPackage = buildGo112Package; - }; + perkeep = callPackage ../applications/misc/perkeep { }; canto-curses = callPackage ../applications/networking/feedreaders/canto-curses { }; @@ -20558,10 +20508,7 @@ in marp = callPackage ../applications/office/marp { }; - magnetico = callPackage ../applications/networking/p2p/magnetico { - # Version 2019-08-14 fails to build with go 1.13 due to missing go.sum - buildGoModule = buildGo112Module; - }; + magnetico = callPackage ../applications/networking/p2p/magnetico { }; matchbox = callPackage ../applications/window-managers/matchbox { }; @@ -20849,9 +20796,7 @@ in open-policy-agent = callPackage ../development/tools/open-policy-agent { }; - openshift = callPackage ../applications/networking/cluster/openshift { - buildGoPackage = buildGo112Package; - }; + openshift = callPackage ../applications/networking/cluster/openshift { }; oroborus = callPackage ../applications/window-managers/oroborus {}; @@ -22086,9 +22031,7 @@ in teleprompter = callPackage ../applications/misc/teleprompter {}; - tendermint = callPackage ../tools/networking/tendermint { - buildGoModule = buildGo112Module; - }; + tendermint = callPackage ../tools/networking/tendermint { }; termdown = (newScope pythonPackages) ../applications/misc/termdown { }; @@ -23132,9 +23075,7 @@ in }; litecoind = litecoin.override { withGui = false; }; - lnd = callPackage ../applications/blockchains/lnd.nix { - buildGoModule = buildGo112Module; - }; + lnd = callPackage ../applications/blockchains/lnd.nix { }; monero = callPackage ../applications/blockchains/monero { inherit (darwin.apple_sdk.frameworks) CoreData IOKit PCSC; @@ -23799,9 +23740,7 @@ in sauerbraten = callPackage ../games/sauerbraten {}; - scaleway-cli = callPackage ../tools/admin/scaleway-cli { - buildGoPackage = buildGo112Package; - }; + scaleway-cli = callPackage ../tools/admin/scaleway-cli { }; scid = callPackage ../games/scid { tcl = tcl-8_5; -- cgit v1.2.3 From 56be910cd3876d7f4d866c6b11320865df60a5d4 Mon Sep 17 00:00:00 2001 From: Alex Branham Date: Tue, 28 Apr 2020 20:25:10 -0400 Subject: Rstudio: 1.2.5033 -> 1.2.5042 Need the patch to backport a fix so Rstudio compiles against R 4.0.0 --- pkgs/applications/editors/rstudio/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index d429bb4bcbb..3fe845a067b 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchurl, fetchFromGitHub, makeDesktopItem, cmake, boost, zlib +{ lib, mkDerivation, fetchurl, fetchpatch, fetchFromGitHub, makeDesktopItem, cmake, boost, zlib , openssl, R, qtbase, qtxmlpatterns, qtsensors, qtwebengine, qtwebchannel , libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc , llvmPackages @@ -8,7 +8,7 @@ with lib; let verMajor = "1"; verMinor = "2"; - verPatch = "5033"; + verPatch = "5042"; version = "${verMajor}.${verMinor}.${verPatch}"; ginVer = "2.1.2"; gwtVer = "2.8.1"; @@ -26,11 +26,19 @@ mkDerivation rec { owner = "rstudio"; repo = "rstudio"; rev = "v${version}"; - sha256 = "0f3p2anz9xay2859bxj3bvyj582igsp628qxsccpkgn0jifvi4np"; + sha256 = "1n67fa357v51j3z1ma8v2ydfsx3y8n10k2svmfcf4mdzsi8w0kc5"; }; # Hack RStudio to only use the input R and provided libclang. - patches = [ ./r-location.patch ./clang-location.patch ]; + patches = [ ./r-location.patch ./clang-location.patch + (fetchpatch { + # Fetch a patch to ensure Rstudio compiles against R + # 4.0.0, should be removed next 1.2.X Rstudio update + # or possibly 1.3.X + url = "https://github.com/rstudio/rstudio/commit/3fb2397c2f208bb8ace0bbaf269481ccb96b5b20.patch"; + sha256 = "0qpgjy6aash0fc0xbns42cwpj3nsw49nkbzwyq8az01xwg81g0f3"; + }) + ]; postPatch = '' substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R} substituteInPlace src/cpp/core/libclang/LibClang.cpp \ -- cgit v1.2.3 From c9fef6230a09bb45e8336c7025ec81bb9089f8b0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 29 Apr 2020 04:06:06 +0200 Subject: =?UTF-8?q?dnsmasq:=202.80=20=E2=86=92=202.81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: CVE-2019-14834 A vulnerability was found in dnsmasq before version 2.81, where the memory leak allows remote attackers to cause a denial of service (memory consumption) via vectors involving DHCP response creation. Changelog: version 2.81 Improve cache behaviour for TCP connections. For ease of implementaion, dnsmasq has always forked a new process to handle each incoming TCP connection. A side-effect of this is that any DNS queries answered from TCP connections are not cached: when TCP connections were rare, this was not a problem. With the coming of DNSSEC, it is now the case that some DNSSEC queries have answers which spill to TCP, and if, for instance, this applies to the keys for the root, then those never get cached, and performance is very bad. This fix passes cache entries back from the TCP child process to the main server process, and fixes the problem. Remove the NO_FORK compile-time option, and support for uclinux. In an era where everything has an MMU, this looks like an anachronism, and it adds to (Ok, multiplies!) the combinatorial explosion of compile-time options. Thanks to Kevin Darbyshire-Bryant for the patch. Fix line-counting when reading /etc/hosts and friends; for correct error messages. Thanks to Christian Rosentreter for reporting this. Fix bug in DNS non-terminal code, added in 2.80, which could sometimes cause a NODATA rather than an NXDOMAIN reply. Thanks to Norman Rasmussen, Sven Mueller and Maciej Żenczykowski for spotting and diagnosing the bug and providing patches. Support TCP-fastopen (RFC-7413) on both incoming and outgoing TCP connections, if supported and enabled in the OS. Improve kernel-capability manipulation code under Linux. Dnsmasq now fails early if a required capability is not available, and tries not to request capabilities not required by its configuration. Add --shared-network config. This enables allocation of addresses by the DHCP server in subnets where the server (or relay) does not have an interface on the network in that subnet. Many thanks to kamp.de for sponsoring this feature. Fix broken contrib/lease_tools/dhcp_lease_time.c. A packet validation check got borked in commit 2b38e382 and release 2.80. Thanks to Tomasz Szajner for spotting this. Fix compilation against nettle version 3.5 and later. Fix spurious DNSSEC validation failures when the auth section of a reply contains unsigned RRs from a signed zone, with the exception that NSEC and NSEC3 RRs must always be signed. Thanks to Tore Anderson for spotting and diagnosing the bug. Add --dhcp-ignore-clid. This disables reading of DHCP client identifier option (option 61), so clients are only identified by MAC addresses. Fix a bug which stopped --dhcp-name-match from working when a hostname is supplied in --dhcp-host. Thanks to James Feeney for spotting this. Fix bug which caused very rarely caused zero-length DHCPv6 packets. Thanks to Dereck Higgins for spotting this. Add --tftp-single-port option. Enhance --conf-dir to load files in a deterministic order. Thanks to Evgenii Seliavka for the suggestion and initial patch. In the router advert code, handle case where we have two different interfaces on the same IPv6 net, and we are doing RA/DHCP service on only one of them. Thanks to NIIBE Yutaka for spotting this case and making the initial patch. Support prefixed ranges of ipv6 addresses in dhcp-host. This eases problems chain-netbooting, where each link in the chain requests an address using a different UID. With a single address, only one gets the "static" address, but with this fix, enough addresses can be reserved for all the stages of the boot. Many thanks to Harald Jensås for his work on this idea and earlier patches. Add filtering by tag of --dhcp-host directives. Based on a patch by Harald Jensås. Allow empty server spec in --rev-server, to match --server. Remove DSA signature verification from DNSSEC, as specified in RFC 8624. Thanks to Loganaden Velvindron for the original patch. Add --script-on-renewal option. --- pkgs/tools/networking/dnsmasq/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index 667eb9feb0c..055f92141b2 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -12,21 +12,13 @@ let ]); in stdenv.mkDerivation rec { - name = "dnsmasq-2.80"; + name = "dnsmasq-2.81"; src = fetchurl { url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.xz"; - sha256 = "1fv3g8vikj3sn37x1j6qsywn09w1jipvlv34j3q5qrljbrwa5ayd"; + sha256 = "1yzq6anwgr5rlnwydpszb51cyhp2vjq29b24ck19flbwac1sk73l"; }; - patches = [ - # Fix build with nettle 3.5 - (fetchpatch { - name = "nettle-3.5.patch"; - url = "thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=patch;h=ab73a746a0d6fcac2e682c5548eeb87fb9c9c82e"; - sha256 = "1hnixij3jp1p6zc3bx2dr92yyf9jp1ahhl9hiiq7bkbhbrw6mbic"; - }) - ]; postPatch = stdenv.lib.optionalString stdenv.hostPlatform.isLinux '' sed '1i#include ' -i src/dhcp.c ''; -- cgit v1.2.3 From c3c3f68020af668e0c9ce3c93077e5f1fcafc87b Mon Sep 17 00:00:00 2001 From: Dave Nicponski Date: Wed, 22 Apr 2020 18:58:45 -0400 Subject: xcbuild: add compatibility support for exporting sdk info "Real" xcodebuild allows using `xcodebuild -version -sdk` without an sdk version argument, which will dump sdk info for all the installed sdks. Bazel"s "xcode cc toolchain setup on mac" process uses this to determine which SDK version is actually installed. This change allows using a nix-supplied pinned compiler and build system under bazel. --- pkgs/development/tools/xcbuild/wrapper.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/xcbuild/wrapper.nix b/pkgs/development/tools/xcbuild/wrapper.nix index cd7b8616366..861ef0fc847 100644 --- a/pkgs/development/tools/xcbuild/wrapper.nix +++ b/pkgs/development/tools/xcbuild/wrapper.nix @@ -110,11 +110,15 @@ runCommand "xcodebuild-${xcbuild.version}" { mkdir -p $out/Applications/Xcode.app/Contents ln -s $out $out/Applications/Xcode.app/Contents/Developer + # The native xcodebuild command supports an invocation like "xcodebuild -version -sdk" without specifying the specific SDK, so we simulate this by + # detecting this case and simulating the output; printing the header and appending the normal output via appending the sdk version to the positional + # arguments we pass through to the wrapped xcodebuild. makeWrapper ${xcbuild}/bin/xcodebuild $out/bin/xcodebuild \ --add-flags "-xcconfig ${xcconfig}" \ --add-flags "DERIVED_DATA_DIR=." \ --set DEVELOPER_DIR "$out" \ --set SDKROOT ${sdkName} \ + --run '[ "$#" -eq 2 ] && [ "$1" = "-version" ] && [ "$2" = "-sdk" ] && echo ${sdkName}.sdk - macOS ${sdkVer} \(macosx${sdkVer}\) && set -- "$@" "${sdkName}"' \ --run '[ "$1" = "-version" ] && [ "$#" -eq 1 ] && (echo Xcode ${xcodeVer}; echo Build version ${sdkBuildVersion}) && exit 0' \ --run '[ "$1" = "-license" ] && exit 0' -- cgit v1.2.3 From 38b084f621b51c721341331ae13e321010d8eebb Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 28 Apr 2020 22:51:22 -0400 Subject: meson: Fix cross The old `CC=.. CXX= .. meson ...` env var hack I removed in 3c00ca03a251693e58eb4e3c247ee1f640215783 had a side effect of ensuring that Meson always had access to a native C compiler, which unforunately it expects in most cases. Thankfully, that will be fixed soon. --- pkgs/development/tools/build-managers/meson/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 3809d19e7d0..0eae4215d46 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -3,6 +3,7 @@ , stdenv , writeTextDir , substituteAll +, pkgsHostHost }: python3Packages.buildPythonApplication rec { @@ -58,6 +59,10 @@ python3Packages.buildPythonApplication rec { setupHook = ./setup-hook.sh; + # Ensure there will always be a native C compiler when meson is used, as a + # workaround until https://github.com/mesonbuild/meson/pull/6512 lands. + depsHostHostPropagated = [ pkgsHostHost.stdenv.cc ]; + # 0.45 update enabled tests but they are failing doCheck = false; # checkInputs = [ ninja pkgconfig ]; -- cgit v1.2.3 From 05d26adb0ad90ec17ad38a0ed638e9be33cbc7c7 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Tue, 28 Apr 2020 22:55:37 -0400 Subject: mkDerivation mesonFlags: Fix arm cpu families In my haste to unbreak eval, I screwed up and got the bit-widths, backwards. --- pkgs/stdenv/generic/make-derivation.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index b06541a7e41..09879451d8e 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -257,8 +257,8 @@ in rec { mesonFlags = if mesonFlags == null then null else let # See https://mesonbuild.com/Reference-tables.html#cpu-families cpuFamily = platform: with platform; - /**/ if isAarch64 then "arm" - else if isAarch32 then "aarch64" + /**/ if isAarch32 then "arm" + else if isAarch64 then "aarch64" else if isx86_32 then "x86" else if isx86_64 then "x86_64" else platform.parsed.cpu.family + builtins.toString platform.parsed.cpu.bits; -- cgit v1.2.3 From 462fa8bbaf9c6db560c7803e9dfa7dd985b43c2e Mon Sep 17 00:00:00 2001 From: Pavel Goran Date: Sat, 29 Feb 2020 10:19:01 +0000 Subject: pykms: replace logging patch The logging "sed-patch" that was introduced for version 20190611 worked poorly: it was too intrusive (breaking the --logfile option), and it didn't prevent using in-store file for logging by default. The new logging patch (an actual "diff-patch") is less intrusive: it just changes the default log file's location to be the current directory instead of the executable's directory. --- pkgs/tools/networking/pykms/default.nix | 8 +++----- .../pykms/log-to-current-directory-by-default.patch | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 pkgs/tools/networking/pykms/log-to-current-directory-by-default.patch diff --git a/pkgs/tools/networking/pykms/default.nix b/pkgs/tools/networking/pykms/default.nix index e1a13b73120..345999c00bc 100644 --- a/pkgs/tools/networking/pykms/default.nix +++ b/pkgs/tools/networking/pykms/default.nix @@ -44,16 +44,14 @@ in buildPythonApplication rec { propagatedBuildInputs = [ systemd pytz tzlocal ]; + # Fix https://github.com/SystemRage/py-kms/issues/64 : + patches = [ ./log-to-current-directory-by-default.patch ]; + postPatch = '' siteDir=$out/${python3.sitePackages} substituteInPlace pykms_DB2Dict.py \ --replace "'KmsDataBase.xml'" "'$siteDir/KmsDataBase.xml'" - - # we are logging to journal - sed -i pykms_Misc.py \ - -e '6ifrom systemd import journal' \ - -e 's/log_obj.addHandler(log_handler)/log_obj.addHandler(journal.JournalHandler())/' ''; format = "other"; diff --git a/pkgs/tools/networking/pykms/log-to-current-directory-by-default.patch b/pkgs/tools/networking/pykms/log-to-current-directory-by-default.patch new file mode 100644 index 00000000000..7c8c65b63a2 --- /dev/null +++ b/pkgs/tools/networking/pykms/log-to-current-directory-by-default.patch @@ -0,0 +1,20 @@ +# By default, create log files in current directory, instead of the script directory. +--- ../original/py-kms/pykms_Client.py ++++ py-kms/pykms_Client.py +@@ -48,5 +48,5 @@ + 'choi' : ["CRITICAL", "ERROR", "WARNING", "INFO", "DEBUG", "MINI"]}, + 'lfile' : {'help' : 'Use this option to set an output log file. The default is \"pykms_logclient.log\" or type \"STDOUT\" to view log info on stdout.', +- 'def' : os.path.dirname(os.path.abspath( __file__ )) + "/pykms_logclient.log", 'des' : "logfile"}, ++ 'def' : "pykms_logclient.log", 'des' : "logfile"}, + 'lsize' : {'help' : 'Use this flag to set a maximum size (in MB) to the output log file. Desactivated by default.', 'def' : 0, 'des': "logsize"}, + } +--- ../original/py-kms/pykms_Server.py ++++ py-kms/pykms_Server.py +@@ -85,5 +85,5 @@ + 'choi' : ["CRITICAL", "ERROR", "WARNING", "INFO", "DEBUG", "MINI"]}, + 'lfile' : {'help' : 'Use this option to set or not an output log file. The default is \"pykms_logserver.log\" or type \"STDOUT\" to view log info on stdout.', +- 'def' : os.path.dirname(os.path.abspath( __file__ )) + "/pykms_logserver.log", 'des' : "logfile"}, ++ 'def' : "pykms_logserver.log", 'des' : "logfile"}, + 'lsize' : {'help' : 'Use this flag to set a maximum size (in MB) to the output log file. Desactivated by default.', 'def' : 0, 'des': "logsize"}, + } + ''); -- cgit v1.2.3 From c678d68cdb98cfbaca4abb9b53991ee86ebe89a7 Mon Sep 17 00:00:00 2001 From: Pavel Goran Date: Sat, 29 Feb 2020 11:14:17 +0000 Subject: nixos/pykms: add SyslogIdentifier --- nixos/modules/services/misc/pykms.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/misc/pykms.nix b/nixos/modules/services/misc/pykms.nix index 25aa27ae767..d6aeae48ccb 100644 --- a/nixos/modules/services/misc/pykms.nix +++ b/nixos/modules/services/misc/pykms.nix @@ -82,6 +82,7 @@ in { ]); ProtectHome = "tmpfs"; WorkingDirectory = libDir; + SyslogIdentifier = "pykms"; Restart = "on-failure"; MemoryLimit = cfg.memoryLimit; }; -- cgit v1.2.3 From 7a15b6037b37e39814851b95daba837864783e08 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Tue, 28 Apr 2020 21:26:50 -0700 Subject: fish: 3.1.1 -> 3.1.2 https://github.com/fish-shell/fish-shell/compare/3.1.1...3.1.2 "This release of fish fixes a major issue discovered in fish 3.1.1: Commands such as `fzf` and `enhancd`, when used with `eval`, would hang. `eval` buffered output too aggressively, which has been fixed." --- pkgs/shells/fish/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 5ac637ed6b1..0f18eb79d2d 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -97,7 +97,7 @@ let fish = stdenv.mkDerivation rec { pname = "fish"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { # There are differences between the release tarball and the tarball GitHub @@ -107,7 +107,7 @@ let # --version`), as well as the local documentation for all builtins (and # maybe other things). url = "https://github.com/fish-shell/fish-shell/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "1f12c56v7n4s0f9mi9xinviwj6kpwlcjwaig1d4vsk5wlgp7ip07"; + sha256 = "1vblmb3x2k2cb0db5jdyflppnlqsm7i6jjaidyhmvaaw7ch2gffm"; }; # We don't have access to the codesign executable, so we patch this out. @@ -197,7 +197,7 @@ let homepage = "http://fishshell.com/"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = with maintainers; [ ocharles ]; + maintainers = with maintainers; [ ocharles cole-h ]; }; passthru = { -- cgit v1.2.3 From 95b35a2514ffc941720ae18dfd5088d492a226da Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 22 Apr 2020 15:03:33 +0200 Subject: =?UTF-8?q?coqPackages.gappalib:=201.4.1=20=E2=86=92=201.4.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/gappalib/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/coq-modules/gappalib/default.nix b/pkgs/development/coq-modules/gappalib/default.nix index c432d2175ec..eb431b9faf2 100644 --- a/pkgs/development/coq-modules/gappalib/default.nix +++ b/pkgs/development/coq-modules/gappalib/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, which, coq, flocq }: stdenv.mkDerivation { - name = "coq${coq.coq-version}-gappalib-1.4.1"; + name = "coq${coq.coq-version}-gappalib-1.4.3"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/37917/gappalib-coq-1.4.1.tar.gz"; - sha256 = "0d3f23a871haglg8hq1jgxz3y5nryiwy12b5xfnfjn279jfqqjw4"; + url = "https://gforge.inria.fr/frs/download.php/file/38302/gappalib-coq-1.4.3.tar.gz"; + sha256 = "108k9dks04wbcqz38pf0zz11hz5imbzimpnkgjrk5gp1hifih370"; }; nativeBuildInputs = [ which ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation { }; passthru = { - compatibleCoqVersions = stdenv.lib.flip builtins.elem [ "8.7" "8.8" "8.9" ]; + compatibleCoqVersions = stdenv.lib.flip builtins.elem [ "8.8" "8.9" "8.10" "8.11" ]; }; } -- cgit v1.2.3 From d21cc14114dc59207963aaca09c3254eec2168c6 Mon Sep 17 00:00:00 2001 From: jakobrs Date: Tue, 28 Apr 2020 15:05:18 +0200 Subject: v4l2loopback: 0.12.4 -> 0.12.5 --- pkgs/os-specific/linux/v4l2loopback/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix index db384c71d74..32ae45fbb0e 100644 --- a/pkgs/os-specific/linux/v4l2loopback/default.nix +++ b/pkgs/os-specific/linux/v4l2loopback/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "v4l2loopback-${version}-${kernel.version}"; - version = "0.12.4"; + version = "0.12.5"; src = fetchFromGitHub { owner = "umlaeute"; repo = "v4l2loopback"; rev = "v${version}"; - sha256 = "0sp7n6hprgf1z7vzwshs5gyyn6syn4pw5xx7xqrfcwkx6cja6sys"; + sha256 = "1qi4l6yam8nrlmc3zwkrz9vph0xsj1cgmkqci4652mbpbzigg7vn"; }; hardeningDisable = [ "format" "pic" ]; -- cgit v1.2.3 From a6dc21fa2daf78b7d18d9373ac797cdf2a96814c Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Wed, 29 Apr 2020 01:19:54 -0400 Subject: nixos/pantheon: fix doc typo --- nixos/modules/services/x11/desktop-managers/pantheon.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.xml b/nixos/modules/services/x11/desktop-managers/pantheon.xml index 9541f2cfd4e..7905ceebd9a 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.xml +++ b/nixos/modules/services/x11/desktop-managers/pantheon.xml @@ -1,7 +1,7 @@ - Pantheon Destkop + Pantheon Desktop Pantheon is the desktop environment created for the elementary OS distribution. It is written from scratch in Vala, utilizing GNOME technologies with GTK 3 and Granite. -- cgit v1.2.3 From f08904b2f7e2ca2e59c86f8ac646a0c2b8da5388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 22 Apr 2020 16:00:09 +0100 Subject: tmsu: 0.7.4 -> 0.7.5 --- pkgs/tools/filesystems/tmsu/default.nix | 56 ++++++++++----------------------- pkgs/tools/filesystems/tmsu/deps.nix | 39 +++++++++++++++++++++++ 2 files changed, 56 insertions(+), 39 deletions(-) create mode 100644 pkgs/tools/filesystems/tmsu/deps.nix diff --git a/pkgs/tools/filesystems/tmsu/default.nix b/pkgs/tools/filesystems/tmsu/default.nix index c7d11d415a5..d8533a4e777 100644 --- a/pkgs/tools/filesystems/tmsu/default.nix +++ b/pkgs/tools/filesystems/tmsu/default.nix @@ -1,55 +1,33 @@ -{ stdenv, fetchgit, fetchFromGitHub, go, fuse }: +{ stdenv, buildGoPackage, fetchgit, fetchFromGitHub, go, fuse, installShellFiles }: -stdenv.mkDerivation rec { +buildGoPackage rec { pname = "tmsu"; - version = "0.7.4"; - - go-sqlite3 = fetchgit { - url = "git://github.com/mattn/go-sqlite3"; - rev = "c9a0db5d8951646743317f0756da0339fe144dd5"; - sha256 = "1m0q9869fis0dhg34g5wc5xi6pby491spfxi23w461h29higbrqh"; - }; - - go-fuse = fetchgit { - url = "git://github.com/hanwen/go-fuse"; - rev = "8c85ded140ac1889372a0e22d8d21e3d10a303bd"; - sha256 = "1iph2hpvby2mfwqg9pp39xjqdl9a09h4442yfdn5l67pznljh2bi"; - }; + version = "0.7.5"; + goPackagePath = "github.com/oniony/TMSU"; src = fetchFromGitHub { owner = "oniony"; repo = "tmsu"; rev = "v${version}"; - sha256 = "1g9gxlll2g4qkqbrshq3888sy1lgw6p5dvcrl5qyh6w73yimi1cq"; + sha256 = "0834hah7p6ad81w60ifnxyh9zn09ddfgrll04kwjxwp7ypbv38wq"; }; - buildInputs = [ go fuse ]; + goDeps = ./deps.nix; - preBuild = '' - mkdir -p src/github.com/mattn/go-sqlite3/ - ln -s ${go-sqlite3}/* src/github.com/mattn/go-sqlite3 + buildInputs = [ fuse ]; + nativeBuildInputs = [ installShellFiles ]; - mkdir -p src/github.com/hanwen/go-fuse - ln -s ${go-fuse}/* src/github.com/hanwen/go-fuse - - mkdir -p src/github.com/oniony/tmsu - ln -s ${src}/* src/github.com/oniony/tmsu - - patchShebangs tests/. - - export GOPATH=$PWD - export GOCACHE=$TMPDIR/go-cache + preBuild = '' + mv go/src/${goPackagePath} src + mv src/src/${goPackagePath} go/src/${goPackagePath} + export GOPATH=$PWD:$GOPATH ''; - installPhase = '' - mkdir -p $out/bin - mkdir -p $out/sbin - mkdir -p $out/share/man/man1 - mkdir -p $out/share/zsh/site-functions - make install INSTALL_DIR=$out/bin \ - MOUNT_INSTALL_DIR=$out/sbin \ - MAN_INSTALL_DIR=$out/share/man/man1 \ - ZSH_COMP_INSTALL_DIR=$out/share/zsh/site-functions + postInstall = '' + mv $bin/bin/{TMSU,tmsu} + cp src/misc/bin/* $bin/bin/ + installManPage src/misc/man/tmsu.1 + installShellCompletion --zsh src/misc/zsh/_tmsu ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/filesystems/tmsu/deps.nix b/pkgs/tools/filesystems/tmsu/deps.nix new file mode 100644 index 00000000000..90e64b434c4 --- /dev/null +++ b/pkgs/tools/filesystems/tmsu/deps.nix @@ -0,0 +1,39 @@ +# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 +[ + { + goPackagePath = "github.com/hanwen/go-fuse"; + fetch = { + type = "git"; + url = "https://github.com/hanwen/go-fuse"; + rev = "730713460d4fc41afdc2533bd37ff60c94c0c586"; + sha256 = "1y44d08fxyis99s6jxdr6dbbw5kv3wb8lkhq3xmr886i4w41lz03"; + }; + } + { + goPackagePath = "github.com/mattn/go-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "98a44bcf5949f178c8116fa30e62c9ac2ef65927"; + sha256 = "108rk74ringkkyx05zlq5khh32fsfi0przyzrpsr1r5j57xrhxj0"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "3c4aac89819a5fdc28d906456729d3423fd46969"; + sha256 = "16q9ay6bl28zrnb377p8lvrs2nd98h7i6y3yi8ccjwzg1czbfdsi"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "1957bb5e6d1f523308b49060df02171d06ddfc77"; + sha256 = "0imqk4l9785rw7ddvywyf8zn7k3ga6f17ky8rmf8wrri7nknr03f"; + }; + } +] -- cgit v1.2.3 From 39269244f156254c4f08110e5d8a45a6d876286b Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Wed, 29 Apr 2020 09:15:52 +0200 Subject: xkcdpass: make available as application but keep it as a lib, too, because it can be imported as a module: https://github.com/redacted/XKCD-password-generator/tree/xkcdpass-1.17.3#using-xkcdpass-as-an-imported-module --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4a88ffc1c2..1c45b27158f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3116,6 +3116,8 @@ in wob = callPackage ../tools/misc/wob { }; + xkcdpass = with pythonPackages; toPythonApplication xkcdpass; + xob = callPackage ../tools/X11/xob { }; z-lua = callPackage ../tools/misc/z-lua { }; -- cgit v1.2.3 From c07a4675a3b00cc3c462e1e6cb893cc437f30f4e Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Thu, 14 Nov 2019 11:11:59 +0100 Subject: kubernix: v0.2.0 Signed-off-by: Sascha Grunert --- .../networking/cluster/kubernix/default.nix | 24 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/applications/networking/cluster/kubernix/default.nix diff --git a/pkgs/applications/networking/cluster/kubernix/default.nix b/pkgs/applications/networking/cluster/kubernix/default.nix new file mode 100644 index 00000000000..2251b12e499 --- /dev/null +++ b/pkgs/applications/networking/cluster/kubernix/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "kubernix"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "saschagrunert"; + repo = pname; + rev = "v${version}"; + sha256 = "04dzfdzjwcwwaw9min322g30q0saxpq5kqzld4f22fmk820ki6gp"; + }; + + cargoSha256 = "17agwqx7nhzi124yq1s6zpqb227drrhp9c11r3jbicc08dz88bwg"; + doCheck = false; + + meta = with stdenv.lib; { + description = "Single dependency Kubernetes clusters for local testing, experimenting and development"; + homepage = "https://github.com/saschagrunert/kubernix"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ saschagrunert ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4a88ffc1c2..9146bbdd8fd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20250,6 +20250,8 @@ in kubeseal = callPackage ../applications/networking/cluster/kubeseal { }; + kubernix = callPackage ../applications/networking/cluster/kubernix { }; + kubectl = callPackage ../applications/networking/cluster/kubectl { }; kubeless = callPackage ../applications/networking/cluster/kubeless { }; -- cgit v1.2.3 From 6fc9fd53dba25f61a6493e7c0d8fef5eca9c51bf Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Wed, 29 Apr 2020 03:34:41 +0000 Subject: linux config: enable Sound Open Firmware support --- pkgs/os-specific/linux/kernel/common-config.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 0a58ed87e6c..088ec4ebf44 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -254,6 +254,27 @@ let SND_USB_CAIAQ_INPUT = yes; # Enable PSS mixer (Beethoven ADSP-16 and other compatible) PSS_MIXER = whenOlder "4.12" yes; + # Enable Sound Open Firmware support + } // optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" && + versionAtLeast version "5.5") { + SND_SOC_SOF_TOPLEVEL = yes; + SND_SOC_SOF_ACPI = module; + SND_SOC_SOF_PCI = module; + SND_SOC_SOF_APOLLOLAKE_SUPPORT = yes; + SND_SOC_SOF_CANNONLAKE_SUPPORT = yes; + SND_SOC_SOF_COFFEELAKE_SUPPORT = yes; + SND_SOC_SOF_COMETLAKE_H_SUPPORT = yes; + SND_SOC_SOF_COMETLAKE_LP_SUPPORT = yes; + SND_SOC_SOF_ELKHARTLAKE_SUPPORT = yes; + SND_SOC_SOF_GEMINILAKE_SUPPORT = yes; + SND_SOC_SOF_HDA_AUDIO_CODEC = yes; + SND_SOC_SOF_HDA_COMMON_HDMI_CODEC = yes; + SND_SOC_SOF_HDA_LINK = yes; + SND_SOC_SOF_ICELAKE_SUPPORT = yes; + SND_SOC_SOF_INTEL_TOPLEVEL = yes; + SND_SOC_SOF_JASPERLAKE_SUPPORT = yes; + SND_SOC_SOF_MERRIFIELD_SUPPORT = yes; + SND_SOC_SOF_TIGERLAKE_SUPPORT = yes; }; usb-serial = { -- cgit v1.2.3 From 3628b1c6bf84f00e67c4a81e9063607f0348a4d6 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 29 Apr 2020 13:58:15 +0800 Subject: libeatmydata: allow building from checkout Also include note about running tests. --- .../development/libraries/libeatmydata/default.nix | 38 ++++++++++++++++------ 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/libeatmydata/default.nix b/pkgs/development/libraries/libeatmydata/default.nix index aeaa45a7905..da7a186bea6 100644 --- a/pkgs/development/libraries/libeatmydata/default.nix +++ b/pkgs/development/libraries/libeatmydata/default.nix @@ -1,23 +1,41 @@ -{ stdenv, fetchurl, makeWrapper }: +{ stdenv, fetchFromGitHub, autoreconfHook, strace, which }: stdenv.mkDerivation rec { - name = "libeatmydata-105"; + pname = "libeatmydata"; + version = "105"; - src = fetchurl { - url = "https://www.flamingspork.com/projects/libeatmydata/${name}.tar.gz"; - sha256 = "1pd8sc73cgc41ldsvq6g8ics1m5k8gdcb91as9yg8z5jnrld1lmx"; + src = fetchFromGitHub { + owner = "stewartsmith"; + repo = pname; + rev = "${pname}-${version}"; + sha256 = "0sx803h46i81h67xbpd3c7ky0nhaw4gij214nsx4lqig70223v9r"; }; patches = [ ./find-shell-lib.patch ]; + patchFlags = "-p0"; + postPatch = '' - substituteInPlace eatmydata.in --replace NIX_OUT_DIR $out + substituteInPlace eatmydata.in \ + --replace NIX_OUT_DIR $out + + patchShebangs . ''; - meta = { - homepage = "https://www.flamingspork.com/projects/libeatmydata/"; - license = stdenv.lib.licenses.gpl3Plus; + nativeBuildInputs = [ + autoreconfHook + ] ++ stdenv.lib.optionals doCheck [ strace which ]; + + # while we can *build* in parallel, the tests also run in parallel which does + # not work with v105. Later versions (unreleased) have a fix for that. The + # problem is that on hydra we cannot use strace, so the tests don't run there. + enableParallelBuilding = true; + doCheck = false; + + meta = with stdenv.lib; { description = "Small LD_PRELOAD library to disable fsync and friends"; - platforms = stdenv.lib.platforms.unix; + homepage = "https://www.flamingspork.com/projects/libeatmydata/"; + license = licenses.gpl3Plus; + platforms = platforms.unix; }; } -- cgit v1.2.3 From ac885e1b876b1d9ed4b48932fe3f36bc7bbffaa3 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 29 Apr 2020 04:20:00 -0500 Subject: fstar: install completions --- pkgs/development/compilers/fstar/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix index b8864584ee6..548abeff78d 100644 --- a/pkgs/development/compilers/fstar/default.nix +++ b/pkgs/development/compilers/fstar/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, z3, ocamlPackages, makeWrapper }: +{ stdenv, fetchFromGitHub, z3, ocamlPackages, makeWrapper, installShellFiles }: stdenv.mkDerivation rec { pname = "fstar"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0wix7l229afkn6c6sk4nwkfq0nznsiqdkds4ixi2yyf72immwmmb"; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper installShellFiles ]; buildInputs = with ocamlPackages; [ z3 ocaml findlib batteries menhir stdint @@ -33,6 +33,9 @@ stdenv.mkDerivation rec { installFlags = [ "-C" "src/ocaml-output" ]; postInstall = '' wrapProgram $out/bin/fstar.exe --prefix PATH ":" "${z3}/bin" + installShellCompletion --bash .completion/bash/fstar.exe.bash + installShellCompletion --fish .completion/fish/fstar.exe.fish + installShellCompletion --zsh --name _fstar.exe .completion/zsh/__fstar.exe ''; meta = with stdenv.lib; { -- cgit v1.2.3 From 878ed3e2b5c66e5e31352b6b8e64f08e6a13ea31 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 29 Apr 2020 04:20:00 -0500 Subject: icu67: init at 67.1 Changelog: https://github.com/unicode-org/icu/releases/tag/release-67-1 --- pkgs/development/libraries/icu/67.nix | 4 ++++ pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 9 insertions(+) create mode 100644 pkgs/development/libraries/icu/67.nix diff --git a/pkgs/development/libraries/icu/67.nix b/pkgs/development/libraries/icu/67.nix new file mode 100644 index 00000000000..23a1069ea14 --- /dev/null +++ b/pkgs/development/libraries/icu/67.nix @@ -0,0 +1,4 @@ +import ./base.nix { + version = "67.1"; + sha256 = "1p6mhvxl0xr2n0g6xdps3mwzwlv6mjsz3xlpm793p9aiybb0ra4l"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7f3386883d1..c096df4cfe8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12184,6 +12184,11 @@ in })); icu66 = callPackage ../development/libraries/icu/66.nix ({ nativeBuildRoot = buildPackages.icu66.override { buildRootOnly = true; }; + } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { + stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' + })); + icu67 = callPackage ../development/libraries/icu/67.nix ({ + nativeBuildRoot = buildPackages.icu67.override { buildRootOnly = true; }; } // (stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && stdenv.cc.isGNU) { stdenv = gcc6Stdenv; # with gcc-7: undefined reference to `__divmoddi4' })); -- cgit v1.2.3 From 7b8408fd4b634cc81111ca3b04059c51f15b10e8 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 29 Apr 2020 11:29:10 +0200 Subject: mu: 1.4.1 -> 1.4.3 --- pkgs/tools/networking/mu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index aa1e004d1af..c103637c685 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "mu"; - version = "1.4.1"; + version = "1.4.3"; src = fetchFromGitHub { owner = "djcb"; repo = "mu"; rev = version; - sha256 = "0q2ik7fj5k9i76js4ijyxbgrwqff437lass0sd5if2r40rqh0as0"; + sha256 = "1i9chd8ks1q4g5pyscsir6pw4kahkx3k8ckzbi8j3gr6jz1qzzsg"; }; buildInputs = [ -- cgit v1.2.3 From 329cc874e47fc95ac582849c7799ebe166b6ac5b Mon Sep 17 00:00:00 2001 From: Lisa Ugray Date: Wed, 29 Apr 2020 05:45:03 -0400 Subject: shadowenv: 2.0.0 -> 2.0.2 Pick up shell completions --- pkgs/tools/misc/shadowenv/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/shadowenv/default.nix b/pkgs/tools/misc/shadowenv/default.nix index a464ea638bd..7c9352d3310 100644 --- a/pkgs/tools/misc/shadowenv/default.nix +++ b/pkgs/tools/misc/shadowenv/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "shadowenv"; - version = "2.0.0"; + version = "2.0.2"; src = fetchFromGitHub { owner = "Shopify"; repo = pname; rev = version; - sha256 = "1fjqm4qr85wb0i3vazp0w74izfzvkycdii7dlpdp5zs8jgb35pdh"; + sha256 = "1x5i5km6wblqbc0fibdjdlqkamqswxwhy8p6cbfz2nvcia7fgsf1"; }; - cargoSha256 = "1n8qh730nhdmpm08mm2ppcl3nkcgm50cyz9q5h6dlzq4bv4rijp4"; + cargoSha256 = "1hrsbd6025sfgnwr7smp43yzi7w2lfyfbdxhapgizrpwbq8y7xzd"; nativeBuildInputs = [ installShellFiles ]; @@ -20,6 +20,9 @@ rustPlatform.buildRustPackage rec { postInstall = '' installManPage man/man1/shadowenv.1 installManPage man/man5/shadowlisp.5 + installShellCompletion --bash sh/completions/shadowenv.bash + installShellCompletion --fish sh/completions/shadowenv.fish + installShellCompletion --zsh sh/completions/_shadowenv ''; meta = with stdenv.lib; { -- cgit v1.2.3 From 8ce65087c333097ab714d23800b69fc471ec48ca Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 8 Apr 2020 18:30:45 +0200 Subject: broadcom_sta: fix build on 5.6 --- pkgs/os-specific/linux/broadcom-sta/default.nix | 2 + .../os-specific/linux/broadcom-sta/linux-5.6.patch | 87 ++++++++++++++++++++++ 2 files changed, 89 insertions(+) create mode 100644 pkgs/os-specific/linux/broadcom-sta/linux-5.6.patch diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index f1b560e9f8b..ecaa3896044 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -35,6 +35,8 @@ stdenv.mkDerivation { ./linux-4.12.patch ./linux-4.15.patch ./linux-5.1.patch + # source: https://salsa.debian.org/Herrie82-guest/broadcom-sta/-/commit/247307926e5540ad574a17c062c8da76990d056f + ./linux-5.6.patch ./null-pointer-fix.patch ./gcc.patch ]; diff --git a/pkgs/os-specific/linux/broadcom-sta/linux-5.6.patch b/pkgs/os-specific/linux/broadcom-sta/linux-5.6.patch new file mode 100644 index 00000000000..df5af79f77c --- /dev/null +++ b/pkgs/os-specific/linux/broadcom-sta/linux-5.6.patch @@ -0,0 +1,87 @@ +From dd057e40a167f4febb1a7c77dd32b7d36056952c Mon Sep 17 00:00:00 2001 +From: Herman van Hazendonk +Date: Tue, 31 Mar 2020 17:09:55 +0200 +Subject: [PATCH] Add fixes for 5.6 kernel + +Use ioremap instead of ioremap_nocache and proc_ops instead of file_operations on Linux kernel 5.6 and above. + +Signed-off-by: Herman van Hazendonk +--- + src/shared/linux_osl.c | 6 +++++- + src/wl/sys/wl_linux.c | 21 ++++++++++++++++++++- + 2 files changed, 25 insertions(+), 2 deletions(-) + +diff --git a/src/shared/linux_osl.c b/src/shared/linux_osl.c +index 6157d18..dcfc075 100644 +--- a/src/shared/linux_osl.c ++++ b/src/shared/linux_osl.c +@@ -942,7 +942,11 @@ osl_getcycles(void) + void * + osl_reg_map(uint32 pa, uint size) + { +- return (ioremap_nocache((unsigned long)pa, (unsigned long)size)); ++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) ++ return (ioremap((unsigned long)pa, (unsigned long)size)); ++ #else ++ return (ioremap_nocache((unsigned long)pa, (unsigned long)size)); ++ #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) */ + } + + void +diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c +index 0d05100..6d9dd0d 100644 +--- a/src/wl/sys/wl_linux.c ++++ b/src/wl/sys/wl_linux.c +@@ -582,10 +582,17 @@ wl_attach(uint16 vendor, uint16 device, ulong regs, + } + wl->bcm_bustype = bustype; + ++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) ++ if ((wl->regsva = ioremap(dev->base_addr, PCI_BAR0_WINSZ)) == NULL) { ++ WL_ERROR(("wl%d: ioremap() failed\n", unit)); ++ goto fail; ++ } ++ #else + if ((wl->regsva = ioremap_nocache(dev->base_addr, PCI_BAR0_WINSZ)) == NULL) { + WL_ERROR(("wl%d: ioremap() failed\n", unit)); + goto fail; + } ++ #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) */ + + wl->bar1_addr = bar1_addr; + wl->bar1_size = bar1_size; +@@ -772,8 +779,13 @@ wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) + if ((val & 0x0000ff00) != 0) + pci_write_config_dword(pdev, 0x40, val & 0xffff00ff); + bar1_size = pci_resource_len(pdev, 2); ++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) ++ bar1_addr = (uchar *)ioremap(pci_resource_start(pdev, 2), ++ bar1_size); ++ #else + bar1_addr = (uchar *)ioremap_nocache(pci_resource_start(pdev, 2), + bar1_size); ++ #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) */ + wl = wl_attach(pdev->vendor, pdev->device, pci_resource_start(pdev, 0), PCI_BUS, pdev, + pdev->irq, bar1_addr, bar1_size); + +@@ -3335,12 +3347,19 @@ wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t + } + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) ++static const struct proc_ops wl_fops = { ++ .proc_read = wl_proc_read, ++ .proc_write = wl_proc_write, ++}; ++#else + static const struct file_operations wl_fops = { + .owner = THIS_MODULE, + .read = wl_proc_read, + .write = wl_proc_write, + }; +-#endif ++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) */ ++#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) */ + + static int + wl_reg_proc_entry(wl_info_t *wl) -- cgit v1.2.3 From c3d5d92f4a9b78357b803d0591bc9adf0e17f584 Mon Sep 17 00:00:00 2001 From: talyz Date: Fri, 24 Apr 2020 19:34:34 +0200 Subject: php.buildEnv: Add phpIni attribute for easy access to the php.ini --- nixos/modules/services/web-servers/apache-httpd/default.nix | 2 +- pkgs/development/interpreters/php/default.nix | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 5e55baa203a..b72b249220d 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -338,7 +338,7 @@ let } '' cat ${php}/etc/php.ini > $out - cat ${php}/lib/custom-php.ini > $out + cat ${php.phpIni} > $out echo "$options" >> $out ''; diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 2eda206ef2e..4256e34980d 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -105,7 +105,7 @@ let (enabledExtensions ++ (getDepsRecursively enabledExtensions))); extNames = map getExtName enabledExtensions; - extraInit = writeText "custom-php.ini" '' + extraInit = writeText "php.ini" '' ${lib.concatStringsSep "\n" (lib.textClosureList extensionTexts extNames)} ${extraConfig} @@ -118,11 +118,12 @@ let passthru = { buildEnv = mkBuildEnv allArgs allExtensionFunctions; withExtensions = mkWithExtensions allArgs allExtensionFunctions; + phpIni = "${phpWithExtensions}/lib/php.ini"; inherit (php-packages) packages extensions; }; paths = [ php ]; postBuild = '' - cp ${extraInit} $out/lib/custom-php.ini + cp ${extraInit} $out/lib/php.ini wrapProgram $out/bin/php --set PHP_INI_SCAN_DIR $out/lib -- cgit v1.2.3 From a0a75a947ad001367d7d474b2b6e422f355714a7 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Wed, 29 Apr 2020 13:21:04 +0300 Subject: emplace: 0.2.15 -> 0.2.19 --- pkgs/tools/package-management/emplace/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix index bb91697ab57..389d1feb346 100644 --- a/pkgs/tools/package-management/emplace/default.nix +++ b/pkgs/tools/package-management/emplace/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "emplace"; - version = "0.2.15"; + version = "0.2.19"; src = fetchFromGitHub { owner = "tversteeg"; repo = pname; rev = "v${version}"; - sha256 = "1h1z18m504kflzv9wcybkgc4xr5w9l9d7qsjri0an57lxv6dpv0f"; + sha256 = "0vw0axnb7gil6lr72rixp4v3pspi0jq99x8h954mdcff2jr031x5"; }; - cargoSha256 = "1wfxy4py2xwf1m0i52jq1f9xgzc7v5m55crl0xbp8f0raflksaxk"; + cargoSha256 = "118rxiwvi9k6jq5y0k7yn4w9zlb0fd6xdcyrv38ipr8qrj16cjrq"; meta = with lib; { description = "Mirror installed software on multiple machines"; -- cgit v1.2.3 From 3bdfedde2a8fe00075a60b527c3f2d913b124ae7 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Wed, 29 Apr 2020 13:24:20 +0300 Subject: frp: 0.32.0 -> 0.33.0 --- pkgs/tools/networking/frp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix index f44e2208646..438740600c7 100644 --- a/pkgs/tools/networking/frp/default.nix +++ b/pkgs/tools/networking/frp/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "frp"; - version = "0.32.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "fatedier"; repo = pname; rev = "v${version}"; - sha256 = "1hj3xy7ihwl66hyxc1m8k3fwgz5jyx1bd32f80d7266klhjqf6nw"; + sha256 = "1z914p20n3i1bf4hx5iq2fylx1s49knb70cbg53ji2n7nrm1q33r"; }; modSha256 = "1v90w5grc0vjpcp0m56d73zi0qnbswgz1rcvcwrjfa3rwqhigbal"; -- cgit v1.2.3 From c8549856113eb12ffdb3a542d07a1bad5ccd64e1 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Wed, 29 Apr 2020 13:29:50 +0300 Subject: gleam: 0.7.1 -> 0.8.0-rc1 --- pkgs/development/compilers/gleam/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index 5179142e40e..976a3b54209 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.7.1"; + version = "0.8.0-rc1"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "v${version}"; - sha256 = "1bcxq7bgn0kf1vdw6id8s3izz6mwf3ivr8iph4miig302qm9lmmr"; + sha256 = "1asn9k4s9m9fr4cx8f1z2npkby7vjdsypn4q6xfy3bk2pgn306bl"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "17bvms65frxhw0d196qswh3jjqlriidq3xi3mfjjgfh6n17rh608"; + cargoSha256 = "1jxbq32s68zvanmwvq5wm46bkigziqgl920cf2xg5hcv4l25f03n"; meta = with stdenv.lib; { description = "A statically typed language for the Erlang VM"; -- cgit v1.2.3 From ca417e5c958a5108811c8f5e55e78513dd99b972 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Wed, 29 Apr 2020 13:33:01 +0300 Subject: monolith: 2.2.2 -> 2.2.4 --- pkgs/tools/backup/monolith/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/monolith/default.nix b/pkgs/tools/backup/monolith/default.nix index 5d086abf780..046fe130ffb 100644 --- a/pkgs/tools/backup/monolith/default.nix +++ b/pkgs/tools/backup/monolith/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "monolith"; - version = "2.2.2"; + version = "2.2.4"; src = fetchFromGitHub { owner = "Y2Z"; repo = pname; rev = "v${version}"; - sha256 = "08xbpn6kdfiyvz5pwx9hkzbgb40z6dicmiry7frclw0aibal9avi"; + sha256 = "0am992dhqv0vpk4zsc9wwnbzhpdx98wm9dxi89bq2yr3l77lml3d"; }; - cargoSha256 = "10zwyg54f05m6ldpnchqzxjkb6rlpcl80crdnk8s6wkf18qny4i3"; + cargoSha256 = "03nd8pzrd66rv12l7qr9i4kdrdr8hk1mz8ihvd982cjd2dlisipd"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; -- cgit v1.2.3 From 6d83e9572dd64844ad4b48df5e140fa3476f1056 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Wed, 29 Apr 2020 13:36:27 +0300 Subject: hydroxide: 0.2.11 -> 0.2.14 --- pkgs/applications/networking/hydroxide/default.nix | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/hydroxide/default.nix b/pkgs/applications/networking/hydroxide/default.nix index 75c1cdaece9..679b3f4014f 100644 --- a/pkgs/applications/networking/hydroxide/default.nix +++ b/pkgs/applications/networking/hydroxide/default.nix @@ -2,24 +2,16 @@ buildGoModule rec { pname = "hydroxide"; - version = "0.2.11"; + version = "0.2.14"; src = fetchFromGitHub { owner = "emersion"; repo = pname; rev = "v${version}"; - sha256 = "0rn35iyli80kgj3yn93lrx0ybgc8fhvmkvx1d18ill7r4cmavand"; + sha256 = "0d8wjyzmw89yhrszz487f7i19rcz7xlx4w2wd4c69k5nsdrs6dys"; }; - modSha256 = "0b19rcif8yiyvhrsjd3q5nsvr580lklamlphx4dk47n456ckcqfp"; - - # FIXME: remove with next release - patches = [ - (fetchpatch { - url = "https://github.com/emersion/hydroxide/commit/80e0fa6f3e0154338fb0af8a82ca32ae6281dd15.patch"; - sha256 = "1xi0clzgz14a7sxnwr0li7sz9p05sfh3zh5iqg2qz5f415k9jknj"; - }) - ]; + modSha256 = "0888ikywclhjb4n7xqxc7hvzlhx1qhf4c3skaddqs3nrxm171jwn"; subPackages = [ "cmd/hydroxide" ]; -- cgit v1.2.3 From b2a9a3e9cbe3eadb613161d88bd407f797ce270e Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 28 Apr 2020 21:23:03 +0100 Subject: podman: Wrap packages required to run containers --- nixos/modules/virtualisation/podman.nix | 15 ++----- .../applications/virtualization/podman/wrapper.nix | 48 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 +- 3 files changed, 53 insertions(+), 13 deletions(-) create mode 100644 pkgs/applications/virtualization/podman/wrapper.nix diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix index 41d50dc7308..57c9c07df45 100644 --- a/nixos/modules/virtualisation/podman.nix +++ b/nixos/modules/virtualisation/podman.nix @@ -77,17 +77,8 @@ in config = lib.mkIf cfg.enable { - environment.systemPackages = [ - pkgs.podman # Docker compat - pkgs.runc # Default container runtime - pkgs.crun # Default container runtime (cgroups v2) - pkgs.conmon # Container runtime monitor - pkgs.slirp4netns # User-mode networking for unprivileged namespaces - pkgs.fuse-overlayfs # CoW for images, much faster than default vfs - pkgs.utillinux # nsenter - pkgs.iptables - ] - ++ lib.optional cfg.dockerCompat dockerCompat; + environment.systemPackages = [ pkgs.podman ] + ++ lib.optional cfg.dockerCompat dockerCompat; environment.etc."containers/libpod.conf".text = '' cni_plugin_dir = ["${pkgs.cni-plugins}/bin/"] @@ -95,7 +86,7 @@ in '' + cfg.libpod.extraConfig; - environment.etc."cni/net.d/87-podman-bridge.conflist".source = copyFile "${pkgs.podman.src}/cni/87-podman-bridge.conflist"; + environment.etc."cni/net.d/87-podman-bridge.conflist".source = copyFile "${pkgs.podman-unwrapped.src}/cni/87-podman-bridge.conflist"; # Enable common /etc/containers configuration virtualisation.containers.enable = true; diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix new file mode 100644 index 00000000000..0b905c0c709 --- /dev/null +++ b/pkgs/applications/virtualization/podman/wrapper.nix @@ -0,0 +1,48 @@ +{ podman-unwrapped +, runCommand +, makeWrapper +, lib +, extraPackages ? [] +, podman # Docker compat +, runc # Default container runtime +, crun # Default container runtime (cgroups v2) +, conmon # Container runtime monitor +, slirp4netns # User-mode networking for unprivileged namespaces +, fuse-overlayfs # CoW for images, much faster than default vfs +, utillinux # nsenter +, cni-plugins +, iptables +}: + +let + podman = podman-unwrapped; + + binPath = lib.makeBinPath ([ + runc + crun + conmon + slirp4netns + fuse-overlayfs + utillinux + iptables + ] ++ extraPackages); + +in runCommand podman.name { + inherit (podman) name pname version meta outputs; + nativeBuildInputs = [ + makeWrapper + ]; + +} '' + # Symlink everything but $bin from podman-unwrapped + ${ + lib.concatMapStringsSep "\n" + (o: "ln -s ${podman.${o}} ${placeholder o}") + (builtins.filter (o: o != "bin") + podman.outputs)} + + mkdir -p $bin/bin + ln -s ${podman-unwrapped}/share $bin/share + makeWrapper ${podman-unwrapped}/bin/podman $bin/bin/podman \ + --prefix PATH : ${binPath} +'' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4a88ffc1c2..51f1a6a1db6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5966,7 +5966,8 @@ in podiff = callPackage ../tools/text/podiff { }; - podman = callPackage ../applications/virtualization/podman { }; + podman = callPackage ../applications/virtualization/podman/wrapper.nix { }; + podman-unwrapped = callPackage ../applications/virtualization/podman { }; podman-compose = python3Packages.callPackage ../applications/virtualization/podman-compose {}; -- cgit v1.2.3 From 78cba5ac1e0883f939766523927205f7a722fa5c Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 28 Apr 2020 21:27:18 +0100 Subject: nixos.podman: Expose extraPackages from the podman wrapper --- nixos/modules/virtualisation/podman.nix | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix index 57c9c07df45..815d0778ae7 100644 --- a/nixos/modules/virtualisation/podman.nix +++ b/nixos/modules/virtualisation/podman.nix @@ -4,18 +4,20 @@ let inherit (lib) mkOption types; + podmanPackage = (pkgs.podman.override { inherit (cfg) extraPackages; }); + # Provides a fake "docker" binary mapping to podman - dockerCompat = pkgs.runCommandNoCC "${pkgs.podman.pname}-docker-compat-${pkgs.podman.version}" { + dockerCompat = pkgs.runCommandNoCC "${podmanPackage.pname}-docker-compat-${podmanPackage.version}" { outputs = [ "out" "bin" "man" ]; - inherit (pkgs.podman) meta; + inherit (podmanPackage) meta; } '' mkdir $out mkdir -p $bin/bin - ln -s ${pkgs.podman.bin}/bin/podman $bin/bin/docker + ln -s ${podmanPackage.bin}/bin/podman $bin/bin/docker mkdir -p $man/share/man/man1 - for f in ${pkgs.podman.man}/share/man/man1/*; do + for f in ${podmanPackage.man}/share/man/man1/*; do basename=$(basename $f | sed s/podman/docker/g) ln -s $f $man/share/man/man1/$basename done @@ -54,6 +56,19 @@ in ''; }; + extraPackages = mkOption { + type = with types; listOf package; + default = [ ]; + example = lib.literalExample '' + [ + pkgs.gvisor + ] + ''; + description = '' + Extra packages to be installed in the Podman wrapper. + ''; + }; + libpod = mkOption { default = {}; description = "Libpod configuration"; @@ -77,12 +92,11 @@ in config = lib.mkIf cfg.enable { - environment.systemPackages = [ pkgs.podman ] + environment.systemPackages = [ podmanPackage ] ++ lib.optional cfg.dockerCompat dockerCompat; environment.etc."containers/libpod.conf".text = '' cni_plugin_dir = ["${pkgs.cni-plugins}/bin/"] - cni_config_dir = "/etc/cni/net.d/" '' + cfg.libpod.extraConfig; -- cgit v1.2.3 From 704a018aaea16e044c1adf33accce6be2884911d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 29 Apr 2020 01:11:43 +0200 Subject: coturn: apply patch for CVE-2020-6061/6062 Fixes: CVE-2020-6061, CVE-2020-6062 An exploitable heap overflow vulnerability exists in the way CoTURN 4.5.1.1 web server parses POST requests. A specially crafted HTTP POST request can lead to information leaks and other misbehavior. An attacker needs to send an HTTPS request to trigger this vulnerability. An exploitable denial-of-service vulnerability exists in the way CoTURN 4.5.1.1 web server parses POST requests. A specially crafted HTTP POST request can lead to server crash and denial of service. An attacker needs to send an HTTP request to trigger this vulnerability. --- pkgs/servers/coturn/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix index 24dc256ba69..51502c3fd97 100644 --- a/pkgs/servers/coturn/default.nix +++ b/pkgs/servers/coturn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl, libevent }: +{ stdenv, fetchFromGitHub, fetchpatch, openssl, libevent }: stdenv.mkDerivation rec { pname = "coturn"; @@ -13,7 +13,14 @@ stdenv.mkDerivation rec { buildInputs = [ openssl libevent ]; - patches = [ ./pure-configure.patch ]; + patches = [ + ./pure-configure.patch + (fetchpatch { + name = "CVE-2020-6061+6062.patch"; + url = "https://sources.debian.org/data/main/c/coturn/4.5.1.1-1.2/debian/patches/CVE-2020-6061+6062.patch"; + sha256 = "0fcy1wp91bb4hlhnp96sf9bs0d9hf3pwx5f7b1r9cfvr3l5c1bk2"; + }) + ]; meta = with stdenv.lib; { homepage = "https://coturn.net/"; -- cgit v1.2.3 From f0240514d2b036d6d4121f466c391e04c018a91b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 29 Apr 2020 06:01:00 -0500 Subject: jetbrains-mono: 1.0.5 -> 1.0.6 Changelog: https://github.com/JetBrains/JetBrainsMono/releases/tag/v1.0.6 --- pkgs/data/fonts/jetbrains-mono/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/jetbrains-mono/default.nix b/pkgs/data/fonts/jetbrains-mono/default.nix index 4297d15da94..718b6b218df 100644 --- a/pkgs/data/fonts/jetbrains-mono/default.nix +++ b/pkgs/data/fonts/jetbrains-mono/default.nix @@ -1,14 +1,14 @@ { lib, fetchzip }: let - version = "1.0.5"; + version = "1.0.6"; in fetchzip rec { name = "JetBrainsMono-${version}"; url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrainsMono-${version}.zip"; - sha256 = "1iqqix7rr22ij0cn7vg812qs4gbjpphndgbzm57abqk658lra4kl"; + sha256 = "1198k5zw91g85h6n7rg3y7wcj1nrbby9zlr6zwlmiq0nb37n0d3g"; postFetch = '' mkdir -p $out/share/fonts -- cgit v1.2.3 From ef990961bc98e6b8dbad47b0ea0da2b302df5476 Mon Sep 17 00:00:00 2001 From: talyz Date: Fri, 24 Apr 2020 21:28:33 +0200 Subject: php.buildEnv: Provide the unwrapped php package in php.unwrapped This is useful if you need to access the dev output of the unwrapped derivation. --- doc/languages-frameworks/php.section.md | 7 +++++++ pkgs/development/interpreters/php/default.nix | 1 + 2 files changed, 8 insertions(+) diff --git a/doc/languages-frameworks/php.section.md b/doc/languages-frameworks/php.section.md index 31190f3b51a..abf91a31769 100644 --- a/doc/languages-frameworks/php.section.md +++ b/doc/languages-frameworks/php.section.md @@ -66,6 +66,13 @@ ignore `enabled`: php.withExtensions ({ all, ... }: with all; [ opcache imagick ]) ``` +`php.withExtensions` provides extensions by wrapping a minimal php +base package, providing a `php.ini` file listing all extensions to be +loaded. You can access this package through the `php.unwrappedPhp` +attribute; useful if you, for example, need access to the `dev` +output. The generated `php.ini` file can be accessed through the +`php.phpIni` attribute. + If you want a PHP build with extra configuration in the `php.ini` file, you can use `php.buildEnv`. This function takes two named and optional parameters: `extensions` and `extraConfig`. `extensions` diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 4256e34980d..78dc5d2e98a 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -119,6 +119,7 @@ let buildEnv = mkBuildEnv allArgs allExtensionFunctions; withExtensions = mkWithExtensions allArgs allExtensionFunctions; phpIni = "${phpWithExtensions}/lib/php.ini"; + unwrapped = php; inherit (php-packages) packages extensions; }; paths = [ php ]; -- cgit v1.2.3 From 3bfd4e864f6c97c47efb1a353566e4fe4402b611 Mon Sep 17 00:00:00 2001 From: talyz Date: Sun, 26 Apr 2020 16:41:39 +0200 Subject: php: Add passthru.tests --- pkgs/development/interpreters/php/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 78dc5d2e98a..57a0b716979 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -1,11 +1,11 @@ # We have tests for PCRE and PHP-FPM in nixos/tests/php/ or # both in the same attribute named nixosTests.php -{ callPackage, lib, stdenv }@_args: +{ callPackage, lib, stdenv, nixosTests }@_args: let generic = - { callPackage, lib, stdenv, config, fetchurl, makeWrapper + { callPackage, lib, stdenv, nixosTests, config, fetchurl, makeWrapper , symlinkJoin, writeText, autoconf, automake, bison, flex, libtool , pkgconfig, re2c, apacheHttpd, libargon2, libxml2, pcre, pcre2 , systemd, valgrind @@ -120,6 +120,7 @@ let withExtensions = mkWithExtensions allArgs allExtensionFunctions; phpIni = "${phpWithExtensions}/lib/php.ini"; unwrapped = php; + tests = nixosTests.php; inherit (php-packages) packages extensions; }; paths = [ php ]; -- cgit v1.2.3 From 5cad1b4aff3054b9c3ab97c420cce7b09b342dc8 Mon Sep 17 00:00:00 2001 From: talyz Date: Wed, 29 Apr 2020 12:46:26 +0200 Subject: php: Get rid of the phpXXbase attributes, update docs Since the introduction of php.unwrapped there's no real need for the phpXXbase attributes, so let's remove them to lessen potential confusion and clutter. Also update the docs to make it clear how to get hold of an unwrapped PHP if needed. --- doc/languages-frameworks/php.section.md | 27 ++++++++++++++------------- pkgs/development/interpreters/php/default.nix | 2 +- pkgs/servers/http/unit/default.nix | 12 ++++++------ pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/doc/languages-frameworks/php.section.md b/doc/languages-frameworks/php.section.md index abf91a31769..101f7b043ff 100644 --- a/doc/languages-frameworks/php.section.md +++ b/doc/languages-frameworks/php.section.md @@ -9,18 +9,24 @@ Several versions of PHP are available on Nix, each of which having a wide variety of extensions and libraries available. -The attribute `php` refers to the version of PHP considered most -stable and thoroughly tested in nixpkgs for any given release of -NixOS. Note that while this version of PHP may not be the latest major -release from upstream, any version of PHP supported in nixpkgs may be -utilized by specifying the desired attribute by version, such as -`php74`. +The different versions of PHP that nixpkgs provides are located under +attributes named based on major and minor version number; e.g., +`php74` is PHP 7.4. Only versions of PHP that are supported by upstream for the entirety of a given NixOS release will be included in that release of NixOS. See [PHP Supported Versions](https://www.php.net/supported-versions.php). +The attribute `php` refers to the version of PHP considered most +stable and thoroughly tested in nixpkgs for any given release of +NixOS - not necessarily the latest major release from upstream. + +All available PHP attributes are wrappers around their respective +binary PHP package and provide commonly used extensions this way. The +real PHP 7.4 package, i.e. the unwrapped one, is available as +`php74.unwrapped`; see the next section for more details. + Interactive tools built on PHP are put in `php.packages`; composer is for example available at `php.packages.composer`. @@ -30,12 +36,7 @@ opcache extension shipped with PHP is available at `php.extensions.opcache` and the third-party ImageMagick extension at `php.extensions.imagick`. -The different versions of PHP that nixpkgs provides are located under -attributes named based on major and minor version number; e.g., -`php74` is PHP 7.4 with commonly used extensions installed, -`php74base` is the same PHP runtime without extensions. - -#### Installing PHP with packages +#### Installing PHP with extensions A PHP package with specific extensions enabled can be built using `php.withExtensions`. This is a function which accepts an anonymous @@ -68,7 +69,7 @@ php.withExtensions ({ all, ... }: with all; [ opcache imagick ]) `php.withExtensions` provides extensions by wrapping a minimal php base package, providing a `php.ini` file listing all extensions to be -loaded. You can access this package through the `php.unwrappedPhp` +loaded. You can access this package through the `php.unwrapped` attribute; useful if you, for example, need access to the `dev` output. The generated `php.ini` file can be accessed through the `php.phpIni` attribute. diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 57a0b716979..a67a26f083b 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -302,5 +302,5 @@ let php72 = php72base.withExtensions defaultPhpExtensionsWithHash; in { - inherit php72base php73base php74base php72 php73 php74; + inherit php72 php73 php74; } diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index f8992bf166b..0779a31f106 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, which , withPython2 ? false, python2 , withPython3 ? true, python3, ncurses -, withPHP72 ? false, php72base -, withPHP73 ? true, php73base +, withPHP72 ? false, php72 +, withPHP73 ? true, php73 , withPerl528 ? false, perl528 , withPerl530 ? true, perl530 , withPerldevel ? false, perldevel @@ -26,8 +26,8 @@ let fpmSupport = false; }; - php72-unit = php72base.override phpConfig; - php73-unit = php73base.override phpConfig; + php72-unit = php72.override phpConfig; + php73-unit = php73.override phpConfig; in stdenv.mkDerivation rec { version = "1.16.0"; pname = "unit"; @@ -71,8 +71,8 @@ in stdenv.mkDerivation rec { postConfigure = '' ${optionalString withPython2 "./configure python --module=python2 --config=${python2}/bin/python2-config --lib-path=${python2}/lib"} ${optionalString withPython3 "./configure python --module=python3 --config=${python3}/bin/python3-config --lib-path=${python3}/lib"} - ${optionalString withPHP72 "./configure php --module=php72 --config=${php72-unit.dev}/bin/php-config --lib-path=${php72-unit}/lib"} - ${optionalString withPHP73 "./configure php --module=php73 --config=${php73-unit.dev}/bin/php-config --lib-path=${php73-unit}/lib"} + ${optionalString withPHP72 "./configure php --module=php72 --config=${php72-unit.unwrapped.dev}/bin/php-config --lib-path=${php72-unit}/lib"} + ${optionalString withPHP73 "./configure php --module=php73 --config=${php73-unit.unwrapped.dev}/bin/php-config --lib-path=${php73-unit}/lib"} ${optionalString withPerl528 "./configure perl --module=perl528 --perl=${perl528}/bin/perl"} ${optionalString withPerl530 "./configure perl --module=perl530 --perl=${perl530}/bin/perl"} ${optionalString withPerldevel "./configure perl --module=perldev --perl=${perldevel}/bin/perl"} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7f2c34039b4..c960ebcf7c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9496,7 +9496,7 @@ in inherit (callPackage ../development/interpreters/php { stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; - }) php74 php73 php72 php74base php73base php72base; + }) php74 php73 php72; picoc = callPackage ../development/interpreters/picoc {}; -- cgit v1.2.3 From 2535cdfe91b9e0100a2950a128648c2ba509eb8c Mon Sep 17 00:00:00 2001 From: talyz Date: Wed, 29 Apr 2020 12:52:39 +0200 Subject: php: Unify the usage of the php package in php-packages.nix Instead of using two different php packages in php-packages.nix, one wrapper and one unwrapped, simply use the wrapper and use its "unwrapped" attribute when necessary. Also, get rid of the packages and extensions attributes from the base package, since they're no longer needed. --- pkgs/development/interpreters/php/default.nix | 15 +-------------- pkgs/top-level/php-packages.nix | 25 +++++++++++++------------ 2 files changed, 14 insertions(+), 26 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index a67a26f083b..4c79691f504 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -14,8 +14,6 @@ let , sha256 , extraPatches ? [] - , defaultPhpExtensions - # Sapi flags , cgiSupport ? true , cliSupport ? true @@ -35,13 +33,6 @@ let , ztsSupport ? apxs2Support }@args: let - self = generic args; - - php-packages = (callPackage ../../../top-level/php-packages.nix { - php = self; - phpWithExtensions = self.withExtensions defaultPhpExtensions; - }); - # buildEnv wraps php to provide additional extensions and # configuration. Its usage is documented in # doc/languages-frameworks/php.section.md. @@ -58,7 +49,7 @@ let php = generic filteredArgs; php-packages = (callPackage ../../../top-level/php-packages.nix { - inherit php phpWithExtensions; + php = phpWithExtensions; }); allExtensionFunctions = prevExtensionFunctions ++ [ extensions ]; @@ -249,7 +240,6 @@ let passthru = { buildEnv = mkBuildEnv {} []; withExtensions = mkWithExtensions {} []; - inherit (php-packages) packages extensions; }; meta = with stdenv.lib; { @@ -265,7 +255,6 @@ let php72base = callPackage generic (_args // { version = "7.2.29"; sha256 = "08xry2fgqgg8s0ym1hh11wkbr36av3zq1bn4krbciw1b7x8gb8ga"; - defaultPhpExtensions = defaultPhpExtensionsWithHash; # https://bugs.php.net/bug.php?id=76826 extraPatches = lib.optional stdenv.isDarwin ./php72-darwin-isfinite.patch; @@ -274,7 +263,6 @@ let php73base = callPackage generic (_args // { version = "7.3.16"; sha256 = "0bh499v9dfgh9k51w4rird1slb9rh9whp5h37fb84c98d992s1xq"; - defaultPhpExtensions = defaultPhpExtensionsWithHash; # https://bugs.php.net/bug.php?id=76826 extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch; @@ -283,7 +271,6 @@ let php74base = callPackage generic (_args // { version = "7.4.4"; sha256 = "17w2m4phhpj76x5fx67vgjrlkcczqvky3f5in1kjg2pch90qz3ih"; - inherit defaultPhpExtensions; }); defaultPhpExtensions = { all, ... }: with all; ([ diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 0cda058459d..b9247cf0a17 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgs, fetchgit, php, phpWithExtensions, autoconf, pkgconfig, re2c +{ stdenv, lib, pkgs, fetchgit, php, autoconf, pkgconfig, re2c , gettext, bzip2, curl, libxml2, openssl, gmp, icu, oniguruma, libsodium , html-tidy, libzip, zlib, pcre, pcre2, libxslt, aspell, openldap, cyrus_sasl , uwimap, pam, libiconv, enchant1, libXpm, gd, libwebp, libjpeg, libpng @@ -8,7 +8,8 @@ let buildPecl = import ../build-support/build-pecl.nix { - inherit php lib; + php = php.unwrapped; + inherit lib; inherit (pkgs) stdenv autoreconfHook fetchurl re2c; }; @@ -43,7 +44,7 @@ in installPhase = '' mkdir -p $out/bin install -D $src $out/libexec/box/box.phar - makeWrapper ${phpWithExtensions}/bin/php $out/bin/box \ + makeWrapper ${php}/bin/php $out/bin/box \ --add-flags "-d phar.readonly=0 $out/libexec/box/box.phar" ''; @@ -71,7 +72,7 @@ in installPhase = '' mkdir -p $out/bin install -D $src $out/libexec/composer/composer.phar - makeWrapper ${phpWithExtensions}/bin/php $out/bin/composer \ + makeWrapper ${php}/bin/php $out/bin/composer \ --add-flags "$out/libexec/composer/composer.phar" \ --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.unzip ]} ''; @@ -163,7 +164,7 @@ in installPhase = '' mkdir -p $out/bin install -D $src $out/libexec/phpcbf/phpcbf.phar - makeWrapper ${phpWithExtensions}/bin/php $out/bin/phpcbf \ + makeWrapper ${php}/bin/php $out/bin/phpcbf \ --add-flags "$out/libexec/phpcbf/phpcbf.phar" ''; @@ -190,7 +191,7 @@ in installPhase = '' mkdir -p $out/bin install -D $src $out/libexec/phpcs/phpcs.phar - makeWrapper ${phpWithExtensions}/bin/php $out/bin/phpcs \ + makeWrapper ${php}/bin/php $out/bin/phpcs \ --add-flags "$out/libexec/phpcs/phpcs.phar" ''; @@ -217,7 +218,7 @@ in installPhase = '' mkdir -p $out/bin install -D $src $out/libexec/phpstan/phpstan.phar - makeWrapper ${phpWithExtensions}/bin/php $out/bin/phpstan \ + makeWrapper ${php}/bin/php $out/bin/phpstan \ --add-flags "$out/libexec/phpstan/phpstan.phar" ''; @@ -537,7 +538,7 @@ in }; pdo_oci = buildPecl rec { - inherit (php) src version; + inherit (php.unwrapped) src version; pname = "pdo_oci"; sourceRoot = "php-${version}/ext/pdo_oci"; @@ -548,8 +549,8 @@ in internalDeps = [ php.extensions.pdo ]; postPatch = '' - sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 - ''; + sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 + ''; }; pdo_sqlsrv = buildPecl { @@ -746,11 +747,11 @@ in pname = "php-${name}"; extensionName = name; - inherit (php) version src; + inherit (php.unwrapped) version src; sourceRoot = "php-${php.version}/ext/${name}"; enableParallelBuilding = true; - nativeBuildInputs = [ php autoconf pkgconfig re2c ]; + nativeBuildInputs = [ php.unwrapped autoconf pkgconfig re2c ]; inherit configureFlags internalDeps buildInputs zendExtension doCheck; -- cgit v1.2.3 From 5506463c2f63a9a111191de97aab0ef9c3d87124 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 1 Apr 2020 14:01:41 +0200 Subject: google-compute-engine-oslogin: 1.5.3 -> 20200325.00 Google moved their oslogin guest tools to another repository. Point src to there, and bump to the latest version There's now a Makefile, so we can avoid having our own custom installPhase, and we also get manpages. I successfully ran the oslogin tests, so assuming the google cloud metadata server still behaves like in our test, logins should work. I saw a nscd segfault, not sure if it's caused by this or was already the case before. It'd be great if someone could test this on an actual VM. --- .../google-compute-engine-oslogin/default.nix | 33 +++++++++++----------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix b/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix index 31ea1cb2a94..2c2444de4e5 100644 --- a/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix +++ b/pkgs/tools/virtualization/google-compute-engine-oslogin/default.nix @@ -1,4 +1,5 @@ { stdenv +, lib , fetchFromGitHub , curl , json_c @@ -8,22 +9,20 @@ stdenv.mkDerivation rec { pname = "google-compute-engine-oslogin"; - version = "1.5.3"; - # from packages/google-compute-engine-oslogin/packaging/debian/changelog + version = "20200325.00"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; - repo = "compute-image-packages"; - rev = "20190522"; - sha256 = "16jbbrnz49g843h813r408dbvfa2hicf8canxwbfxr2kzhv7ycmm"; + repo = "guest-oslogin"; + rev = version; + sha256 = "03hk95pgzcgy6ginp8zdy0fbk88m6n65qq22jq490z1xwbjffm8r"; }; - sourceRoot = "source/packages/google-compute-engine-oslogin"; postPatch = '' # change sudoers dir from /var/google-sudoers.d to /run/google-sudoers.d (managed through systemd-tmpfiles) - substituteInPlace pam_module/pam_oslogin_admin.cc --replace /var/google-sudoers.d /run/google-sudoers.d + substituteInPlace src/pam/pam_oslogin_admin.cc --replace /var/google-sudoers.d /run/google-sudoers.d # fix "User foo not allowed because shell /bin/bash does not exist" - substituteInPlace compat.h --replace /bin/bash ${bashInteractive}/bin/bash + substituteInPlace src/include/compat.h --replace /bin/bash ${bashInteractive}/bin/bash ''; buildInputs = [ curl.dev pam ]; @@ -31,15 +30,15 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE="-I${json_c.dev}/include/json-c"; NIX_CFLAGS_LINK="-L${json_c}/lib"; - installPhase = '' - mkdir -p $out/{bin,lib} - - install -Dm755 libnss_cache_google-compute-engine-oslogin-${version}.so $out/lib/libnss_cache_oslogin.so.2 - install -Dm755 libnss_google-compute-engine-oslogin-${version}.so $out/lib/libnss_oslogin.so.2 - - install -Dm755 pam_oslogin_admin.so pam_oslogin_login.so $out/lib - install -Dm755 google_{oslogin_nss_cache,authorized_keys} $out/bin - ''; + makeFlags = [ + "VERSION=${version}" + "DESTDIR=${placeholder "out"}" + "PREFIX=/" + "BINDIR=/bin" + "LIBDIR=/lib" + "PAMDIR=/lib" + "MANDIR=/share/man" + ]; enableParallelBuilding = true; -- cgit v1.2.3 From f38e45c2e0ea15c1882308299fbe24f6c46b8243 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 1 Apr 2020 15:53:56 +0200 Subject: nixos/google-oslogin: improve mock server some slightly better error handling for nonexistent users, less parsing of URLs and query strings by hand. --- nixos/tests/google-oslogin/server.py | 81 ++++++++++++++++++++++++++---------- 1 file changed, 59 insertions(+), 22 deletions(-) diff --git a/nixos/tests/google-oslogin/server.py b/nixos/tests/google-oslogin/server.py index bfc527cb97d..eb0c77982d0 100644 --- a/nixos/tests/google-oslogin/server.py +++ b/nixos/tests/google-oslogin/server.py @@ -7,24 +7,27 @@ import hashlib import base64 from http.server import BaseHTTPRequestHandler, HTTPServer +from urllib.parse import urlparse, parse_qs from typing import Dict SNAKEOIL_PUBLIC_KEY = os.environ['SNAKEOIL_PUBLIC_KEY'] -def w(msg): +def w(msg: bytes): sys.stderr.write(f"{msg}\n") sys.stderr.flush() -def gen_fingerprint(pubkey): +def gen_fingerprint(pubkey: str): decoded_key = base64.b64decode(pubkey.encode("ascii").split()[1]) return hashlib.sha256(decoded_key).hexdigest() -def gen_email(username): + +def gen_email(username: str): """username seems to be a 21 characters long number string, so mimic that in a reproducible way""" return str(int(hashlib.sha256(username.encode()).hexdigest(), 16))[0:21] + def gen_mockuser(username: str, uid: str, gid: str, home_directory: str, snakeoil_pubkey: str) -> Dict: snakeoil_pubkey_fingerprint = gen_fingerprint(snakeoil_pubkey) # seems to be a 21 characters long numberstring, so mimic that in a reproducible way @@ -56,7 +59,8 @@ def gen_mockuser(username: str, uid: str, gid: str, home_directory: str, snakeoi class ReqHandler(BaseHTTPRequestHandler): - def _send_json_ok(self, data): + + def _send_json_ok(self, data: dict): self.send_response(200) self.send_header('Content-type', 'application/json') self.end_headers() @@ -64,29 +68,62 @@ class ReqHandler(BaseHTTPRequestHandler): w(out) self.wfile.write(out) + def _send_json_success(self, success=True): + self.send_response(200) + self.send_header('Content-type', 'application/json') + self.end_headers() + out = json.dumps({"success": success}).encode() + w(out) + self.wfile.write(out) + + def _send_404(self): + self.send_response(404) + self.end_headers() + def do_GET(self): p = str(self.path) - # mockuser and mockadmin are allowed to login, both use the same snakeoil public key - if p == '/computeMetadata/v1/oslogin/users?username=mockuser' \ - or p == '/computeMetadata/v1/oslogin/users?uid=1009719690': - self._send_json_ok(gen_mockuser(username='mockuser', uid='1009719690', gid='1009719690', - home_directory='/home/mockuser', snakeoil_pubkey=SNAKEOIL_PUBLIC_KEY)) - elif p == '/computeMetadata/v1/oslogin/users?username=mockadmin' \ - or p == '/computeMetadata/v1/oslogin/users?uid=1009719691': - self._send_json_ok(gen_mockuser(username='mockadmin', uid='1009719691', gid='1009719691', - home_directory='/home/mockadmin', snakeoil_pubkey=SNAKEOIL_PUBLIC_KEY)) - - # mockuser is allowed to login - elif p == f"/computeMetadata/v1/oslogin/authorize?email={gen_email('mockuser')}&policy=login": - self._send_json_ok({'success': True}) - - # mockadmin may also become root - elif p == f"/computeMetadata/v1/oslogin/authorize?email={gen_email('mockadmin')}&policy=login" or p == f"/computeMetadata/v1/oslogin/authorize?email={gen_email('mockadmin')}&policy=adminLogin": - self._send_json_ok({'success': True}) + pu = urlparse(p) + params = parse_qs(pu.query) + + # users endpoint + if pu.path == "/computeMetadata/v1/oslogin/users": + # mockuser and mockadmin are allowed to login, both use the same snakeoil public key + if params.get('username') == ['mockuser'] or params.get('uid') == ["1009719690"]: + username = "mockuser" + uid = "1009719690" + elif params.get('username') == ['mockadmin'] or params.get('uid') == ["1009719691"]: + username = "mockadmin" + uid = "1009719691" + else: + self._send_404() + return + + self._send_json_ok(gen_mockuser(username=username, uid=uid, gid=uid, home_directory=f"/home/{username}", snakeoil_pubkey=SNAKEOIL_PUBLIC_KEY)) + return + + # authorize endpoint + elif pu.path == "/computeMetadata/v1/oslogin/authorize": + # is user allowed to login? + if params.get("policy") == ["login"]: + # mockuser and mockadmin are allowed to login + if params.get('email') == [gen_email("mockuser")] or params.get('email') == [gen_email("mockadmin")]: + self._send_json_success() + return + self._send_json_success(False) + return + # is user allowed to become root? + elif params.get("policy") == ["adminLogin"]: + # only mockadmin is allowed to become admin + self._send_json_success((params['email'] == [gen_email("mockadmin")])) + return + # send 404 for other policies + else: + self._send_404() + return else: sys.stderr.write(f"Unhandled path: {p}\n") sys.stderr.flush() - self.send_response(501) + self.send_response(404) self.end_headers() self.wfile.write(b'') -- cgit v1.2.3 From 21da5c4f6f8a63475545751aee53552ee9bc72eb Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 1 Apr 2020 16:21:38 +0200 Subject: nixos/oslogin: put mockuser and mockadmin in constants, rename This allows us to change them easily without search/replacing. Afterwards, we rename them to look a bit more like they are on GCP. --- nixos/tests/google-oslogin/default.nix | 18 +++++++++++------- nixos/tests/google-oslogin/server.py | 14 ++++++++------ 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/nixos/tests/google-oslogin/default.nix b/nixos/tests/google-oslogin/default.nix index 1977e92e987..97783c81f39 100644 --- a/nixos/tests/google-oslogin/default.nix +++ b/nixos/tests/google-oslogin/default.nix @@ -22,6 +22,8 @@ in { client = { ... }: {}; }; testScript = '' + MOCKUSER = "mockuser_nixos_org" + MOCKADMIN = "mockadmin_nixos_org" start_all() server.wait_for_unit("mock-google-metadata.service") @@ -29,10 +31,10 @@ in { # mockserver should return a non-expired ssh key for both mockuser and mockadmin server.succeed( - '${pkgs.google-compute-engine-oslogin}/bin/google_authorized_keys mockuser | grep -q "${snakeOilPublicKey}"' + f'${pkgs.google-compute-engine-oslogin}/bin/google_authorized_keys {MOCKUSER} | grep -q "${snakeOilPublicKey}"' ) server.succeed( - '${pkgs.google-compute-engine-oslogin}/bin/google_authorized_keys mockadmin | grep -q "${snakeOilPublicKey}"' + f'${pkgs.google-compute-engine-oslogin}/bin/google_authorized_keys {MOCKADMIN} | grep -q "${snakeOilPublicKey}"' ) # install snakeoil ssh key on the client, and provision .ssh/config file @@ -50,20 +52,22 @@ in { client.fail("ssh ghost@server 'true'") # we should be able to connect as mockuser - client.succeed("ssh mockuser@server 'true'") + client.succeed(f"ssh {MOCKUSER}@server 'true'") # but we shouldn't be able to sudo client.fail( - "ssh mockuser@server '/run/wrappers/bin/sudo /run/current-system/sw/bin/id' | grep -q 'root'" + f"ssh {MOCKUSER}@server '/run/wrappers/bin/sudo /run/current-system/sw/bin/id' | grep -q 'root'" ) # we should also be able to log in as mockadmin - client.succeed("ssh mockadmin@server 'true'") + client.succeed(f"ssh {MOCKADMIN}@server 'true'") # pam_oslogin_admin.so should now have generated a sudoers file - server.succeed("find /run/google-sudoers.d | grep -q '/run/google-sudoers.d/mockadmin'") + server.succeed( + f"find /run/google-sudoers.d | grep -q '/run/google-sudoers.d/{MOCKADMIN}'" + ) # and we should be able to sudo client.succeed( - "ssh mockadmin@server '/run/wrappers/bin/sudo /run/current-system/sw/bin/id' | grep -q 'root'" + f"ssh {MOCKADMIN}@server '/run/wrappers/bin/sudo /run/current-system/sw/bin/id' | grep -q 'root'" ) ''; }) diff --git a/nixos/tests/google-oslogin/server.py b/nixos/tests/google-oslogin/server.py index eb0c77982d0..5ea9bbd2c96 100644 --- a/nixos/tests/google-oslogin/server.py +++ b/nixos/tests/google-oslogin/server.py @@ -11,6 +11,8 @@ from urllib.parse import urlparse, parse_qs from typing import Dict SNAKEOIL_PUBLIC_KEY = os.environ['SNAKEOIL_PUBLIC_KEY'] +MOCKUSER="mockuser_nixos_org" +MOCKADMIN="mockadmin_nixos_org" def w(msg: bytes): @@ -88,11 +90,11 @@ class ReqHandler(BaseHTTPRequestHandler): # users endpoint if pu.path == "/computeMetadata/v1/oslogin/users": # mockuser and mockadmin are allowed to login, both use the same snakeoil public key - if params.get('username') == ['mockuser'] or params.get('uid') == ["1009719690"]: - username = "mockuser" + if params.get('username') == [MOCKUSER] or params.get('uid') == ["1009719690"]: + username = MOCKUSER uid = "1009719690" - elif params.get('username') == ['mockadmin'] or params.get('uid') == ["1009719691"]: - username = "mockadmin" + elif params.get('username') == [MOCKADMIN] or params.get('uid') == ["1009719691"]: + username = MOCKADMIN uid = "1009719691" else: self._send_404() @@ -106,7 +108,7 @@ class ReqHandler(BaseHTTPRequestHandler): # is user allowed to login? if params.get("policy") == ["login"]: # mockuser and mockadmin are allowed to login - if params.get('email') == [gen_email("mockuser")] or params.get('email') == [gen_email("mockadmin")]: + if params.get('email') == [gen_email(MOCKUSER)] or params.get('email') == [gen_email(MOCKADMIN)]: self._send_json_success() return self._send_json_success(False) @@ -114,7 +116,7 @@ class ReqHandler(BaseHTTPRequestHandler): # is user allowed to become root? elif params.get("policy") == ["adminLogin"]: # only mockadmin is allowed to become admin - self._send_json_success((params['email'] == [gen_email("mockadmin")])) + self._send_json_success((params['email'] == [gen_email(MOCKADMIN)])) return # send 404 for other policies else: -- cgit v1.2.3 From d518884d3899c99ce8289bd13d7123e4db305e05 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 29 Apr 2020 14:37:52 +0200 Subject: =?UTF-8?q?gtk3:=203.24.18=20=E2=86=92=203.24.20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtk/blob/db39ce2b1699acaf5d0ba160cf7cc68ccf6e16d6/NEWS#L1-38 Also switch to a merged pkg-config patch and add a patch comment. --- pkgs/development/libraries/gtk/3.x.nix | 18 ++++++++++--- .../01-build-Fix-path-handling-in-pkgconfig.patch | 30 ---------------------- 2 files changed, 14 insertions(+), 34 deletions(-) delete mode 100644 pkgs/development/libraries/gtk/patches/01-build-Fix-path-handling-in-pkgconfig.patch diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix index a3fe432017c..1e618730cd8 100644 --- a/pkgs/development/libraries/gtk/3.x.nix +++ b/pkgs/development/libraries/gtk/3.x.nix @@ -48,7 +48,7 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "gtk+3"; - version = "3.24.18"; + version = "3.24.20"; outputs = [ "out" "dev" ] ++ optional withGtkDoc "devdoc"; outputBin = "dev"; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gtk+/${stdenv.lib.versions.majorMinor version}/gtk+-${version}.tar.xz"; - sha256 = "1lia2ybd1661j6mvrc00iyd50gm7sy157bdzlyf4mr028rzzzspm"; + sha256 = "Laxp9xbo0EunqVCRWJ4rquyV3KzpMssVg5Fj20ebHfM="; }; patches = [ @@ -71,12 +71,17 @@ stdenv.mkDerivation rec { sha256 = "0g6fhqcv8spfy3mfmxpyji93k8d4p4q4fz1v9a1c1cgcwkz41d7p"; }) - # https://gitlab.gnome.org/GNOME/gtk/merge_requests/1002 - ./patches/01-build-Fix-path-handling-in-pkgconfig.patch + # Fix path handling in pkg-config + # https://gitlab.gnome.org/GNOME/gtk/merge_requests/1793 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gtk/commit/6d9db8610eff8c12d594d53b7813d9eea1247801.patch"; + sha256 = "QHseZWgPlZBDEM2dIVixUJkGZMCaYjahkLmSCqCcoWU="; + }) ] ++ optionals stdenv.isDarwin [ # X11 module requires which is not installed on Darwin # let’s drop that dependency in similar way to how other parts of the library do it # e.g. https://gitlab.gnome.org/GNOME/gtk/blob/3.24.4/gtk/gtk-launch.c#L31-33 + # https://gitlab.gnome.org/GNOME/gtk/merge_requests/536 ./patches/3.0-darwin-x11.patch ]; @@ -92,6 +97,11 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-DG_ENABLE_DEBUG -DG_DISABLE_CAST_CHECKS"; postPatch = '' + # TODO: Remove in 3.24.21 + # https://gitlab.gnome.org/GNOME/gtk/issues/2669 + echo "${stdenv.shell}" > check-version.py + chmod +x check-version.py + files=( build-aux/meson/post-install.py demos/gtk-demo/geninclude.py diff --git a/pkgs/development/libraries/gtk/patches/01-build-Fix-path-handling-in-pkgconfig.patch b/pkgs/development/libraries/gtk/patches/01-build-Fix-path-handling-in-pkgconfig.patch deleted file mode 100644 index ec69a12514f..00000000000 --- a/pkgs/development/libraries/gtk/patches/01-build-Fix-path-handling-in-pkgconfig.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 7b692e618c4183a51af3d3b0037f106c4fec2355 Mon Sep 17 00:00:00 2001 -From: worldofpeace -Date: Fri, 19 Jul 2019 13:32:57 -0400 -Subject: [PATCH] build: Fix path handling in pkgconfig - ---- - meson.build | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/meson.build b/meson.build -index 36913b3f04..161b378ba5 100644 ---- a/meson.build -+++ b/meson.build -@@ -834,10 +834,10 @@ configure_file(input: 'config.h.meson', - # pkg-config files - bit of a mess all of this - pkgconf = configuration_data() - --pkgconf.set('prefix', get_option('prefix')) -+pkgconf.set('prefix', gtk_prefix) - pkgconf.set('exec_prefix', '${prefix}') --pkgconf.set('libdir', '${prefix}/@0@'.format(get_option('libdir'))) --pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) -+pkgconf.set('libdir', gtk_libdir) -+pkgconf.set('includedir', join_paths('${prefix}', gtk_includedir)) - pkgconf.set('GTK_API_VERSION', gtk_api_version) - pkgconf.set('VERSION', meson.project_version()) - pkgconf.set('GTK_BINARY_VERSION', gtk_binary_version) --- -2.22.0 - -- cgit v1.2.3 From 4644776b2e95027eba4a7f3c4e1a9fd08a12e2f6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 29 Apr 2020 15:04:25 +0200 Subject: monotone: openssl in botan is not needed, so drop to avoid old openssl --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4a88ffc1c2..c27720b6119 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20611,6 +20611,7 @@ in monotone = callPackage ../applications/version-management/monotone { lua = lua5; + botan = botan.override (x: { openssl = null; }); }; monotoneViz = callPackage ../applications/version-management/monotone-viz { -- cgit v1.2.3 From dcb01353b3041e067958f3bdde85635730475ee3 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Wed, 29 Apr 2020 15:23:50 +0200 Subject: nixos/tests/elk.nix: fix issue in the elasticsearch-curator The elasticsearch-curator was not deleting indices because the indices had ILM policies associated with them. This is now fixed by configuring the elasticsearch-curator with `allow_ilm_indices: true`. Also see: https://github.com/elastic/curator/issues/1490 --- nixos/tests/elk.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix index d3dc6dde135..7e87197ed9f 100644 --- a/nixos/tests/elk.nix +++ b/nixos/tests/elk.nix @@ -101,6 +101,7 @@ let prefixed indices. Ignore the error if the filter does not result in an actionable list of indices (ignore_empty_list) and exit cleanly. options: + allow_ilm_indices: true ignore_empty_list: True disable_action: False filters: -- cgit v1.2.3 From d4f2e5f273f3805e54973948b422fc5fda17f05e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 29 Apr 2020 12:39:15 +0200 Subject: =?UTF-8?q?zsh-powerlevel10k:=20v1.6.1=20=E2=86=92=20v1.7.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changes since the last release New and changed parameters POWERLEVEL9K_DIR_TRUNCATE_BEFORE_MARKER can now be set to last (equivalent to true from older versions) or first (new feature). Bug fixes gitstatus once again works on 32-bit ARM Linux (armv6l and armv7l). --- pkgs/shells/zsh/zsh-powerlevel10k/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index 60e58bbcfb9..169173a42e8 100644 --- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "powerlevel10k"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "romkatv"; repo = "powerlevel10k"; rev = "v${version}"; - sha256 = "1hlad5rf6piillmc83bkf03bbw78ylhhfxpxlkdc30ai9y5dpfvv"; + sha256 = "04j37qmgzj62gixysj3di9dccfib4hx1c4ld9kcms3ag7k403bgj"; }; patches = [ -- cgit v1.2.3 From ee7eaaf06e1ce25f62698550bfe8ea2fe9ec3551 Mon Sep 17 00:00:00 2001 From: Bruno Bzeznik Date: Wed, 29 Apr 2020 15:45:25 +0200 Subject: openmpi: add libfabric support (for omnipath networks) --- pkgs/development/libraries/openmpi/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 30085e950a4..627ac68d68d 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, fetchpatch, gfortran, perl, libnl , rdma-core, zlib, numactl, libevent, hwloc, pkgsTargetTarget, symlinkJoin +, libpsm2, libfabric # Enable CUDA support , cudaSupport ? false, cudatoolkit ? null @@ -9,6 +10,10 @@ # Pass PATH/LD_LIBRARY_PATH to point to current mpirun by default , enablePrefix ? false + +# Enable libfabric support (necessary for Omnipath networks) on x86_64 linux +, fabricSupport ? stdenv.isLinux && stdenv.isx86_64 + }: assert !cudaSupport || cudatoolkit != null; @@ -44,7 +49,8 @@ in stdenv.mkDerivation rec { ++ lib.optionals isLinux [ libnl numactl ] ++ lib.optionals cudaSupport [ cudatoolkit ] ++ [ libevent hwloc ] - ++ lib.optional (isLinux || isFreeBSD) rdma-core; + ++ lib.optional (isLinux || isFreeBSD) rdma-core + ++ lib.optional fabricSupport [ libpsm2 libfabric ]; nativeBuildInputs = [ perl ]; @@ -56,6 +62,7 @@ in stdenv.mkDerivation rec { # https://github.com/openucx/ucx # https://www.open-mpi.org/faq/?category=buildcuda ++ lib.optionals cudaSupport [ "--with-cuda=${cudatoolkit_joined}" "--enable-dlopen" ] + ++ lib.optionals fabricSupport [ "--with-psm2=${libpsm2}" "--with-libfabric=${libfabric}" ] ; enableParallelBuilding = true; -- cgit v1.2.3 From ff76d777fb99d7829c65da6037c70352843ed0a7 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 29 Apr 2020 15:48:24 +0200 Subject: Revert "binutils: 2.33.1 -> 2.34" This reverts commit c5f602f5b764ac6ee8e1e0c1b1b3ead88c381da7. --- ...NU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch | 517 ++++++++++++++++++ ...86-Properly-add-X86_ISA_1_NEEDED-property.patch | 137 +++++ ...roperly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch | 583 +++++++++++++++++++++ pkgs/development/tools/misc/binutils/default.nix | 16 +- .../misc/binutils/gold-symbol-visibility.patch | 79 +++ 5 files changed, 1326 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/tools/misc/binutils/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch create mode 100644 pkgs/development/tools/misc/binutils/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch create mode 100644 pkgs/development/tools/misc/binutils/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch create mode 100644 pkgs/development/tools/misc/binutils/gold-symbol-visibility.patch diff --git a/pkgs/development/tools/misc/binutils/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch b/pkgs/development/tools/misc/binutils/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch new file mode 100644 index 00000000000..5a047b0f070 --- /dev/null +++ b/pkgs/development/tools/misc/binutils/0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch @@ -0,0 +1,517 @@ +From 6737a6b34f4823deb7142f27b4074831a37ac1e1 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Fri, 20 Jul 2018 09:18:47 -0700 +Subject: [PATCH] x86: Add a GNU_PROPERTY_X86_ISA_1_USED note if needed + +When -z separate-code, which is enabled by default for Linux/x86, is +used to create executable, ld won't place any data in the code-only +PT_LOAD segment. If there are no data sections placed before the +code-only PT_LOAD segment, the program headers won't be mapped into +any PT_LOAD segment. When the executable tries to access it (based +on the program header address passed in AT_PHDR), it will lead to +segfault. This patch inserts a GNU_PROPERTY_X86_ISA_1_USED note if +there may be no data sections before the text section so that the +first PT_LOAD segment won't be code-only and will contain the program +header. + +Testcases are adjusted to either pass "-z noseparate-code" to ld or +discard the .note.gnu.property section. A Linux/x86 run-time test is +added. + +bfd/ + + PR ld/23428 + * elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): If the + separate code program header is needed, make sure that the first + read-only PT_LOAD segment has no code by adding a + GNU_PROPERTY_X86_ISA_1_USED note. + +ld/ + + PR ld/23428 + * testsuite/ld-elf/linux-x86.S: New file. + * testsuite/ld-elf/linux-x86.exp: Likewise. + * testsuite/ld-elf/pr23428.c: Likewise. + * testsuite/ld-elf/sec64k.exp: Pass "-z noseparate-code" to ld + for Linux/x86 targets. + * testsuite/ld-i386/abs-iamcu.d: Likewise. + * testsuite/ld-i386/abs.d: Likewise. + * testsuite/ld-i386/pr12718.d: Likewise. + * testsuite/ld-i386/pr12921.d: Likewise. + * testsuite/ld-x86-64/abs-k1om.d: Likewise. + * testsuite/ld-x86-64/abs-l1om.d: Likewise. + * testsuite/ld-x86-64/abs.d: Likewise. + * testsuite/ld-x86-64/pr12718.d: Likewise. + * testsuite/ld-x86-64/pr12921.d: Likewise. + * testsuite/ld-linkonce/zeroeh.ld: Discard .note.gnu.property + section. + * testsuite/ld-scripts/print-memory-usage.t: Likewise. + * testsuite/ld-scripts/size-2.t: Likewise. + * testsuite/lib/ld-lib.exp (run_ld_link_exec_tests): Use ld + to create executable if language is "asm". + +(cherry picked from commit 241e64e3b42cd9eba514b8e0ad2ef39a337f10a5) +--- + bfd/elfxx-x86.c | 60 ++++++++++++++----- + ld/testsuite/ld-elf/linux-x86.S | 63 ++++++++++++++++++++ + ld/testsuite/ld-elf/linux-x86.exp | 46 ++++++++++++++ + ld/testsuite/ld-elf/pr23428.c | 43 +++++++++++++ + ld/testsuite/ld-elf/sec64k.exp | 2 + + ld/testsuite/ld-i386/abs-iamcu.d | 2 +- + ld/testsuite/ld-i386/abs.d | 2 +- + ld/testsuite/ld-i386/pr12718.d | 2 +- + ld/testsuite/ld-i386/pr12921.d | 2 +- + ld/testsuite/ld-linkonce/zeroeh.ld | 1 + + ld/testsuite/ld-scripts/print-memory-usage.t | 2 + + ld/testsuite/ld-scripts/size-2.t | 1 + + ld/testsuite/ld-x86-64/abs-k1om.d | 2 +- + ld/testsuite/ld-x86-64/abs-l1om.d | 2 +- + ld/testsuite/ld-x86-64/abs.d | 2 +- + ld/testsuite/ld-x86-64/pr12718.d | 2 +- + ld/testsuite/ld-x86-64/pr12921.d | 2 +- + ld/testsuite/lib/ld-lib.exp | 5 +- + 20 files changed, 248 insertions(+), 25 deletions(-) + create mode 100644 ld/testsuite/ld-elf/linux-x86.S + create mode 100644 ld/testsuite/ld-elf/linux-x86.exp + create mode 100644 ld/testsuite/ld-elf/pr23428.c + +diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c +index a2497aab86..2e4ff88f1f 100644 +--- a/bfd/elfxx-x86.c ++++ b/bfd/elfxx-x86.c +@@ -2524,6 +2524,7 @@ _bfd_x86_elf_link_setup_gnu_properties + const struct elf_backend_data *bed; + unsigned int class_align = ABI_64_P (info->output_bfd) ? 3 : 2; + unsigned int got_align; ++ bfd_boolean has_text = FALSE; + + features = 0; + if (info->ibt) +@@ -2538,24 +2539,59 @@ _bfd_x86_elf_link_setup_gnu_properties + if (bfd_get_flavour (pbfd) == bfd_target_elf_flavour + && bfd_count_sections (pbfd) != 0) + { ++ if (!has_text) ++ { ++ /* Check if there is no non-empty text section. */ ++ sec = bfd_get_section_by_name (pbfd, ".text"); ++ if (sec != NULL && sec->size != 0) ++ has_text = TRUE; ++ } ++ + ebfd = pbfd; + + if (elf_properties (pbfd) != NULL) + break; + } + +- if (ebfd != NULL && features) ++ bed = get_elf_backend_data (info->output_bfd); ++ ++ htab = elf_x86_hash_table (info, bed->target_id); ++ if (htab == NULL) ++ return pbfd; ++ ++ if (ebfd != NULL) + { +- /* If features is set, add GNU_PROPERTY_X86_FEATURE_1_IBT and +- GNU_PROPERTY_X86_FEATURE_1_SHSTK. */ +- prop = _bfd_elf_get_property (ebfd, +- GNU_PROPERTY_X86_FEATURE_1_AND, +- 4); +- prop->u.number |= features; +- prop->pr_kind = property_number; ++ prop = NULL; ++ if (features) ++ { ++ /* If features is set, add GNU_PROPERTY_X86_FEATURE_1_IBT and ++ GNU_PROPERTY_X86_FEATURE_1_SHSTK. */ ++ prop = _bfd_elf_get_property (ebfd, ++ GNU_PROPERTY_X86_FEATURE_1_AND, ++ 4); ++ prop->u.number |= features; ++ prop->pr_kind = property_number; ++ } ++ else if (has_text ++ && elf_properties (ebfd) == NULL ++ && elf_tdata (info->output_bfd)->o->build_id.sec == NULL ++ && !htab->elf.dynamic_sections_created ++ && !info->traditional_format ++ && (info->output_bfd->flags & D_PAGED) != 0 ++ && info->separate_code) ++ { ++ /* If the separate code program header is needed, make sure ++ that the first read-only PT_LOAD segment has no code by ++ adding a GNU_PROPERTY_X86_ISA_1_USED note. */ ++ prop = _bfd_elf_get_property (ebfd, ++ GNU_PROPERTY_X86_ISA_1_USED, ++ 4); ++ prop->u.number = GNU_PROPERTY_X86_ISA_1_486; ++ prop->pr_kind = property_number; ++ } + + /* Create the GNU property note section if needed. */ +- if (pbfd == NULL) ++ if (prop != NULL && pbfd == NULL) + { + sec = bfd_make_section_with_flags (ebfd, + NOTE_GNU_PROPERTY_SECTION_NAME, +@@ -2581,12 +2617,6 @@ error_alignment: + + pbfd = _bfd_elf_link_setup_gnu_properties (info); + +- bed = get_elf_backend_data (info->output_bfd); +- +- htab = elf_x86_hash_table (info, bed->target_id); +- if (htab == NULL) +- return pbfd; +- + htab->r_info = init_table->r_info; + htab->r_sym = init_table->r_sym; + +diff --git a/ld/testsuite/ld-elf/linux-x86.S b/ld/testsuite/ld-elf/linux-x86.S +new file mode 100644 +index 0000000000..bdf40c6e01 +--- /dev/null ++++ b/ld/testsuite/ld-elf/linux-x86.S +@@ -0,0 +1,63 @@ ++ .text ++ .globl _start ++ .type _start,@function ++ .p2align 4 ++_start: ++ xorl %ebp, %ebp ++#ifdef __LP64__ ++ popq %rdi ++ movq %rsp, %rsi ++ andq $~15, %rsp ++#elif defined __x86_64__ ++ mov (%rsp),%edi ++ addl $4,%esp ++ movl %esp, %esi ++ andl $~15, %esp ++#else ++ popl %esi ++ movl %esp, %ecx ++ andl $~15, %esp ++ ++ subl $8,%esp ++ pushl %ecx ++ pushl %esi ++#endif ++ ++ call main ++ ++ hlt ++ ++ .type syscall, @function ++ .globl syscall ++ .p2align 4 ++syscall: ++#ifdef __x86_64__ ++ movq %rdi, %rax /* Syscall number -> rax. */ ++ movq %rsi, %rdi /* shift arg1 - arg5. */ ++ movq %rdx, %rsi ++ movq %rcx, %rdx ++ movq %r8, %r10 ++ movq %r9, %r8 ++ movq 8(%rsp),%r9 /* arg6 is on the stack. */ ++ syscall /* Do the system call. */ ++#else ++ push %ebp ++ push %edi ++ push %esi ++ push %ebx ++ mov 0x2c(%esp),%ebp ++ mov 0x28(%esp),%edi ++ mov 0x24(%esp),%esi ++ mov 0x20(%esp),%edx ++ mov 0x1c(%esp),%ecx ++ mov 0x18(%esp),%ebx ++ mov 0x14(%esp),%eax ++ int $0x80 ++ pop %ebx ++ pop %esi ++ pop %edi ++ pop %ebp ++#endif ++ ret /* Return to caller. */ ++ .size syscall, .-syscall ++ .section .note.GNU-stack,"",@progbits +diff --git a/ld/testsuite/ld-elf/linux-x86.exp b/ld/testsuite/ld-elf/linux-x86.exp +new file mode 100644 +index 0000000000..36217c6fb4 +--- /dev/null ++++ b/ld/testsuite/ld-elf/linux-x86.exp +@@ -0,0 +1,46 @@ ++# Expect script for simple native Linux/x86 tests. ++# Copyright (C) 2018 Free Software Foundation, Inc. ++# ++# This file is part of the GNU Binutils. ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 3 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, ++# MA 02110-1301, USA. ++# ++ ++# Test very simple native Linux/x86 programs with linux-x86.S. ++if { ![isnative] || [which $CC] == 0 \ ++ || (![istarget "i?86-*-linux*"] \ ++ && ![istarget "x86_64-*-linux*"] \ ++ && ![istarget "amd64-*-linux*"]) } { ++ return ++} ++ ++# Add $PLT_CFLAGS if PLT is expected. ++global PLT_CFLAGS ++# Add $NOPIE_CFLAGS and $NOPIE_LDFLAGS if non-PIE is required. ++global NOPIE_CFLAGS NOPIE_LDFLAGS ++ ++run_ld_link_exec_tests [list \ ++ [list \ ++ "Run PR ld/23428 test" \ ++ "--no-dynamic-linker -z separate-code" \ ++ "" \ ++ { linux-x86.S pr23428.c } \ ++ "pr23428" \ ++ "pass.out" \ ++ "$NOPIE_CFLAGS -fno-asynchronous-unwind-tables" \ ++ "asm" \ ++ ] \ ++] +diff --git a/ld/testsuite/ld-elf/pr23428.c b/ld/testsuite/ld-elf/pr23428.c +new file mode 100644 +index 0000000000..3631ed7926 +--- /dev/null ++++ b/ld/testsuite/ld-elf/pr23428.c +@@ -0,0 +1,43 @@ ++#include ++#include ++#include ++ ++#define STRING_COMMA_LEN(STR) (STR), (sizeof (STR) - 1) ++ ++int ++main (int argc, char **argv) ++{ ++ char **ev = &argv[argc + 1]; ++ char **evp = ev; ++ ElfW(auxv_t) *av; ++ const ElfW(Phdr) *phdr = NULL; ++ size_t phnum = 0; ++ size_t loadnum = 0; ++ int fd = STDOUT_FILENO; ++ size_t i; ++ ++ while (*evp++ != NULL) ++ ; ++ ++ av = (ElfW(auxv_t) *) evp; ++ ++ for (; av->a_type != AT_NULL; ++av) ++ switch (av->a_type) ++ { ++ case AT_PHDR: ++ phdr = (const void *) av->a_un.a_val; ++ break; ++ case AT_PHNUM: ++ phnum = av->a_un.a_val; ++ break; ++ } ++ ++ for (i = 0; i < phnum; i++, phdr++) ++ if (phdr->p_type == PT_LOAD) ++ loadnum++; ++ ++ syscall (SYS_write, fd, STRING_COMMA_LEN ("PASS\n")); ++ ++ syscall (SYS_exit, !loadnum); ++ return 0; ++} +diff --git a/ld/testsuite/ld-elf/sec64k.exp b/ld/testsuite/ld-elf/sec64k.exp +index b58139e9dd..3909c0eaa1 100644 +--- a/ld/testsuite/ld-elf/sec64k.exp ++++ b/ld/testsuite/ld-elf/sec64k.exp +@@ -177,6 +177,8 @@ if { ![istarget "d10v-*-*"] + foreach sfile $sfiles { puts $ofd "#source: $sfile" } + if { [istarget spu*-*-*] } { + puts $ofd "#ld: --local-store 0:0" ++ } elseif { [istarget "i?86-*-linux*"] || [istarget "x86_64-*-linux*"] } { ++ puts $ofd "#ld: -z noseparate-code" + } else { + puts $ofd "#ld:" + } +diff --git a/ld/testsuite/ld-i386/abs-iamcu.d b/ld/testsuite/ld-i386/abs-iamcu.d +index ac9beff2e5..aba7d6b03f 100644 +--- a/ld/testsuite/ld-i386/abs-iamcu.d ++++ b/ld/testsuite/ld-i386/abs-iamcu.d +@@ -2,7 +2,7 @@ + #source: abs.s + #source: zero.s + #as: --32 -march=iamcu +-#ld: -m elf_iamcu ++#ld: -m elf_iamcu -z noseparate-code + #objdump: -rs -j .text + + .*: file format .* +diff --git a/ld/testsuite/ld-i386/abs.d b/ld/testsuite/ld-i386/abs.d +index e660aca524..191ee4456a 100644 +--- a/ld/testsuite/ld-i386/abs.d ++++ b/ld/testsuite/ld-i386/abs.d +@@ -2,7 +2,7 @@ + #as: --32 + #source: abs.s + #source: zero.s +-#ld: -melf_i386 ++#ld: -melf_i386 -z noseparate-code + #objdump: -rs + + .*: file format .* +diff --git a/ld/testsuite/ld-i386/pr12718.d b/ld/testsuite/ld-i386/pr12718.d +index ec51540a42..7eba52d95e 100644 +--- a/ld/testsuite/ld-i386/pr12718.d ++++ b/ld/testsuite/ld-i386/pr12718.d +@@ -1,6 +1,6 @@ + #name: PR ld/12718 + #as: --32 +-#ld: -melf_i386 ++#ld: -melf_i386 -z noseparate-code + #readelf: -S + + There are 5 section headers, starting at offset 0x[0-9a-f]+: +diff --git a/ld/testsuite/ld-i386/pr12921.d b/ld/testsuite/ld-i386/pr12921.d +index e49079b3c8..ea2da3eb51 100644 +--- a/ld/testsuite/ld-i386/pr12921.d ++++ b/ld/testsuite/ld-i386/pr12921.d +@@ -1,6 +1,6 @@ + #name: PR ld/12921 + #as: --32 +-#ld: -melf_i386 ++#ld: -melf_i386 -z noseparate-code + #readelf: -S --wide + + There are 7 section headers, starting at offset 0x[0-9a-f]+: +diff --git a/ld/testsuite/ld-linkonce/zeroeh.ld b/ld/testsuite/ld-linkonce/zeroeh.ld +index b22eaa12c9..f89855a08f 100644 +--- a/ld/testsuite/ld-linkonce/zeroeh.ld ++++ b/ld/testsuite/ld-linkonce/zeroeh.ld +@@ -2,4 +2,5 @@ SECTIONS { + .text 0xa00 : { *(.text); *(.gnu.linkonce.t.*) } + .gcc_except_table 0x2000 : { *(.gcc_except_table) } + .eh_frame 0x4000 : { *(.eh_frame) } ++ /DISCARD/ : { *(.note.gnu.property) } + } +diff --git a/ld/testsuite/ld-scripts/print-memory-usage.t b/ld/testsuite/ld-scripts/print-memory-usage.t +index 5ff057a5e3..6eda1d2dc4 100644 +--- a/ld/testsuite/ld-scripts/print-memory-usage.t ++++ b/ld/testsuite/ld-scripts/print-memory-usage.t +@@ -11,4 +11,6 @@ SECTIONS + *(.data) + *(.rw) + } ++ ++ /DISCARD/ : { *(.note.gnu.property) } + } +diff --git a/ld/testsuite/ld-scripts/size-2.t b/ld/testsuite/ld-scripts/size-2.t +index 723863995e..c3c4eddab4 100644 +--- a/ld/testsuite/ld-scripts/size-2.t ++++ b/ld/testsuite/ld-scripts/size-2.t +@@ -18,4 +18,5 @@ SECTIONS + LONG (SIZEOF (.tdata)) + LONG (SIZEOF (.tbss)) + } :image ++ /DISCARD/ : { *(.note.gnu.property) } + } +diff --git a/ld/testsuite/ld-x86-64/abs-k1om.d b/ld/testsuite/ld-x86-64/abs-k1om.d +index 2c26639fc0..6b0fde0eed 100644 +--- a/ld/testsuite/ld-x86-64/abs-k1om.d ++++ b/ld/testsuite/ld-x86-64/abs-k1om.d +@@ -2,7 +2,7 @@ + #source: ../ld-i386/abs.s + #source: ../ld-i386/zero.s + #as: --64 -march=k1om +-#ld: -m elf_k1om ++#ld: -m elf_k1om -z noseparate-code + #objdump: -rs -j .text + + .*: file format .* +diff --git a/ld/testsuite/ld-x86-64/abs-l1om.d b/ld/testsuite/ld-x86-64/abs-l1om.d +index 1fb96d44b7..f87869f9d0 100644 +--- a/ld/testsuite/ld-x86-64/abs-l1om.d ++++ b/ld/testsuite/ld-x86-64/abs-l1om.d +@@ -2,7 +2,7 @@ + #source: ../ld-i386/abs.s + #source: ../ld-i386/zero.s + #as: --64 -march=l1om +-#ld: -m elf_l1om ++#ld: -m elf_l1om -z noseparate-code + #objdump: -rs -j .text + #target: x86_64-*-linux* + +diff --git a/ld/testsuite/ld-x86-64/abs.d b/ld/testsuite/ld-x86-64/abs.d +index b24b018639..d99ab4685d 100644 +--- a/ld/testsuite/ld-x86-64/abs.d ++++ b/ld/testsuite/ld-x86-64/abs.d +@@ -1,7 +1,7 @@ + #name: Absolute non-overflowing relocs + #source: ../ld-i386/abs.s + #source: ../ld-i386/zero.s +-#ld: ++#ld: -z noseparate-code + #objdump: -rs + + .*: file format .* +diff --git a/ld/testsuite/ld-x86-64/pr12718.d b/ld/testsuite/ld-x86-64/pr12718.d +index 07d17325d0..2c503ffbaa 100644 +--- a/ld/testsuite/ld-x86-64/pr12718.d ++++ b/ld/testsuite/ld-x86-64/pr12718.d +@@ -1,6 +1,6 @@ + #name: PR ld/12718 + #as: --64 +-#ld: -melf_x86_64 ++#ld: -melf_x86_64 -z noseparate-code + #readelf: -S --wide + + There are 5 section headers, starting at offset 0x[0-9a-f]+: +diff --git a/ld/testsuite/ld-x86-64/pr12921.d b/ld/testsuite/ld-x86-64/pr12921.d +index 6fe6abee09..1162d55818 100644 +--- a/ld/testsuite/ld-x86-64/pr12921.d ++++ b/ld/testsuite/ld-x86-64/pr12921.d +@@ -1,6 +1,6 @@ + #name: PR ld/12921 + #as: --64 +-#ld: -melf_x86_64 ++#ld: -melf_x86_64 -z noseparate-code + #readelf: -S --wide + + There are 7 section headers, starting at offset 0x[0-9a-f]+: +diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp +index cfbefe9028..1095091882 100644 +--- a/ld/testsuite/lib/ld-lib.exp ++++ b/ld/testsuite/lib/ld-lib.exp +@@ -1482,7 +1482,10 @@ proc run_ld_link_exec_tests { ldtests args } { + continue + } + +- if { [ string match "c++" $lang ] } { ++ if { [ string match "asm" $lang ] } { ++ set link_proc ld_link ++ set link_cmd $ld ++ } elseif { [ string match "c++" $lang ] } { + set link_proc ld_link + set link_cmd $CXX + } else { +-- +2.20.1 + diff --git a/pkgs/development/tools/misc/binutils/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch b/pkgs/development/tools/misc/binutils/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch new file mode 100644 index 00000000000..ca50d9a57cd --- /dev/null +++ b/pkgs/development/tools/misc/binutils/0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch @@ -0,0 +1,137 @@ +From 28a27bdbb9500797e6767f80c8128b09112aeed5 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Sat, 11 Aug 2018 06:41:33 -0700 +Subject: [PATCH] x86: Properly add X86_ISA_1_NEEDED property + +Existing properties may be removed during property merging. We avoid +adding X86_ISA_1_NEEDED property only if existing properties won't be +removed. + +bfd/ + + PR ld/23428 + * elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): Don't + add X86_ISA_1_NEEDED property only if existing properties won't + be removed. + +ld/ + + PR ld/23428 + * testsuite/ld-elf/dummy.s: New file. + * testsuite/ld-elf/linux-x86.S: Add X86_FEATURE_1_AND property. + * testsuite/ld-elf/linux-x86.exp: Add dummy.s to pr23428. + +(cherry picked from commit ab9e342807d132182892de1be1a92d6e91a5c1da) +--- + bfd/elfxx-x86.c | 28 ++++++++++++++++++++++------ + ld/testsuite/ld-elf/dummy.s | 1 + + ld/testsuite/ld-elf/linux-x86.S | 28 ++++++++++++++++++++++++++++ + ld/testsuite/ld-elf/linux-x86.exp | 2 +- + 6 files changed, 66 insertions(+), 7 deletions(-) + create mode 100644 ld/testsuite/ld-elf/dummy.s + +diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c +index 7ccfd25815..2d8f7b640b 100644 +--- a/bfd/elfxx-x86.c ++++ b/bfd/elfxx-x86.c +@@ -2588,7 +2588,6 @@ _bfd_x86_elf_link_setup_gnu_properties + prop->pr_kind = property_number; + } + else if (has_text +- && elf_properties (ebfd) == NULL + && elf_tdata (info->output_bfd)->o->build_id.sec == NULL + && !htab->elf.dynamic_sections_created + && !info->traditional_format +@@ -2598,11 +2597,28 @@ _bfd_x86_elf_link_setup_gnu_properties + /* If the separate code program header is needed, make sure + that the first read-only PT_LOAD segment has no code by + adding a GNU_PROPERTY_X86_ISA_1_NEEDED note. */ +- prop = _bfd_elf_get_property (ebfd, +- GNU_PROPERTY_X86_ISA_1_NEEDED, +- 4); +- prop->u.number = GNU_PROPERTY_X86_ISA_1_486; +- prop->pr_kind = property_number; ++ elf_property_list *list; ++ bfd_boolean need_property = TRUE; ++ ++ for (list = elf_properties (ebfd); list; list = list->next) ++ switch (list->property.pr_type) ++ { ++ case GNU_PROPERTY_STACK_SIZE: ++ case GNU_PROPERTY_NO_COPY_ON_PROTECTED: ++ case GNU_PROPERTY_X86_ISA_1_NEEDED: ++ /* These properties won't be removed during merging. */ ++ need_property = FALSE; ++ break; ++ } ++ ++ if (need_property) ++ { ++ prop = _bfd_elf_get_property (ebfd, ++ GNU_PROPERTY_X86_ISA_1_NEEDED, ++ 4); ++ prop->u.number = GNU_PROPERTY_X86_ISA_1_486; ++ prop->pr_kind = property_number; ++ } + } + + /* Create the GNU property note section if needed. */ +diff --git a/ld/testsuite/ld-elf/dummy.s b/ld/testsuite/ld-elf/dummy.s +new file mode 100644 +index 0000000000..403f98000d +--- /dev/null ++++ b/ld/testsuite/ld-elf/dummy.s +@@ -0,0 +1 @@ ++# Dummy +diff --git a/ld/testsuite/ld-elf/linux-x86.S b/ld/testsuite/ld-elf/linux-x86.S +index bdf40c6e01..d94abc1106 100644 +--- a/ld/testsuite/ld-elf/linux-x86.S ++++ b/ld/testsuite/ld-elf/linux-x86.S +@@ -61,3 +61,31 @@ syscall: + ret /* Return to caller. */ + .size syscall, .-syscall + .section .note.GNU-stack,"",@progbits ++ ++ .section ".note.gnu.property", "a" ++#ifdef __LP64__ ++ .p2align 3 ++#else ++ .p2align 2 ++#endif ++ .long 1f - 0f /* name length */ ++ .long 5f - 2f /* data length */ ++ .long 5 /* note type */ ++0: .asciz "GNU" /* vendor name */ ++1: ++#ifdef __LP64__ ++ .p2align 3 ++#else ++ .p2align 2 ++#endif ++2: .long 0xc0000002 /* pr_type. */ ++ .long 4f - 3f /* pr_datasz. */ ++3: ++ .long 0x2 ++4: ++#ifdef __LP64__ ++ .p2align 3 ++#else ++ .p2align 2 ++#endif ++5: +diff --git a/ld/testsuite/ld-elf/linux-x86.exp b/ld/testsuite/ld-elf/linux-x86.exp +index 36217c6fb4..f6f5a80853 100644 +--- a/ld/testsuite/ld-elf/linux-x86.exp ++++ b/ld/testsuite/ld-elf/linux-x86.exp +@@ -37,7 +37,7 @@ run_ld_link_exec_tests [list \ + "Run PR ld/23428 test" \ + "--no-dynamic-linker -z separate-code" \ + "" \ +- { linux-x86.S pr23428.c } \ ++ { linux-x86.S pr23428.c dummy.s } \ + "pr23428" \ + "pass.out" \ + "$NOPIE_CFLAGS -fno-asynchronous-unwind-tables" \ +-- +2.20.1 + diff --git a/pkgs/development/tools/misc/binutils/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch b/pkgs/development/tools/misc/binutils/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch new file mode 100644 index 00000000000..866d6db8ce2 --- /dev/null +++ b/pkgs/development/tools/misc/binutils/0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch @@ -0,0 +1,583 @@ +From d55c3e36094f06bb1fb02f5eac19fdccf1d91f7e Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Wed, 8 Aug 2018 06:09:15 -0700 +Subject: [PATCH] x86: Properly merge GNU_PROPERTY_X86_ISA_1_USED +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Without the GNU_PROPERTY_X86_ISA_1_USED property, all ISAs may be used. +If a bit in the GNU_PROPERTY_X86_ISA_1_USED property is unset, the +corresponding x86 instruction set isn’t used. When merging properties +from 2 input files and one input file doesn't have the +GNU_PROPERTY_X86_ISA_1_USED property, the output file shouldn't have +it neither. This patch removes the GNU_PROPERTY_X86_ISA_1_USED +property if an input file doesn't have it. + +This patch replaces the GNU_PROPERTY_X86_ISA_1_USED property with the +GNU_PROPERTY_X86_ISA_1_NEEDED property which is the minimum ISA +requirement. + +bfd/ + + PR ld/23486 + * elfxx-x86.c (_bfd_x86_elf_merge_gnu_properties): Remove + GNU_PROPERTY_X86_ISA_1_USED if an input file doesn't have it. + (_bfd_x86_elf_link_setup_gnu_properties): Adding the + GNU_PROPERTY_X86_ISA_1_NEEDED, instead of + GNU_PROPERTY_X86_ISA_1_USED, property. + +ld/ + + PR ld/23486 + * testsuite/ld-i386/i386.exp: Run PR ld/23486 tests. + * testsuite/ld-x86-64/x86-64.exp: Likewise. + * testsuite/ld-i386/pr23486a.d: New file. + * testsuite/ld-i386/pr23486b.d: Likewise. + * testsuite/ld-x86-64/pr23486a-x32.d: Likewise. + * testsuite/ld-x86-64/pr23486a.d: Likewise. + * testsuite/ld-x86-64/pr23486a.s: Likewise. + * testsuite/ld-x86-64/pr23486b-x32.d: Likewise. + * testsuite/ld-x86-64/pr23486b.d: Likewise. + * testsuite/ld-x86-64/pr23486b.s: Likewise. + * testsuite/ld-i386/property-3.r: Remove "x86 ISA used". + * testsuite/ld-i386/property-4.r: Likewise. + * testsuite/ld-i386/property-5.r: Likewise. + * testsuite/ld-i386/property-x86-ibt3a.d: Likewise. + * testsuite/ld-i386/property-x86-ibt3b.d: Likewise. + * testsuite/ld-i386/property-x86-shstk3a.d: Likewise. + * testsuite/ld-i386/property-x86-shstk3b.d: Likewise. + * testsuite/ld-x86-64/property-3.r: Likewise. + * testsuite/ld-x86-64/property-4.r: Likewise. + * testsuite/ld-x86-64/property-5.r: Likewise. + * testsuite/ld-x86-64/property-x86-ibt3a-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-ibt3a.d: Likewise. + * testsuite/ld-x86-64/property-x86-ibt3b-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-ibt3b.d: Likewise. + * testsuite/ld-x86-64/property-x86-shstk3a-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-shstk3a.d: Likewise. + * testsuite/ld-x86-64/property-x86-shstk3b-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-shstk3b.d: Likewise. + +(cherry picked from commit f7309df20c4e787041cedc4a6aced89c15259e54) +--- + bfd/elfxx-x86.c | 25 ++++++++++++--- + ld/testsuite/ld-i386/i386.exp | 2 ++ + ld/testsuite/ld-i386/pr23486a.d | 10 ++++++ + ld/testsuite/ld-i386/pr23486b.d | 10 ++++++ + ld/testsuite/ld-i386/property-3.r | 1 - + ld/testsuite/ld-i386/property-4.r | 1 - + ld/testsuite/ld-i386/property-5.r | 1 - + ld/testsuite/ld-i386/property-x86-ibt3a.d | 5 ++- + ld/testsuite/ld-i386/property-x86-ibt3b.d | 5 ++- + ld/testsuite/ld-i386/property-x86-shstk3a.d | 5 ++- + ld/testsuite/ld-i386/property-x86-shstk3b.d | 5 ++- + ld/testsuite/ld-x86-64/pr23486a-x32.d | 10 ++++++ + ld/testsuite/ld-x86-64/pr23486a.d | 10 ++++++ + ld/testsuite/ld-x86-64/pr23486a.s | 30 +++++++++++++++++ + ld/testsuite/ld-x86-64/pr23486b-x32.d | 10 ++++++ + ld/testsuite/ld-x86-64/pr23486b.d | 10 ++++++ + ld/testsuite/ld-x86-64/pr23486b.s | 30 +++++++++++++++++ + ld/testsuite/ld-x86-64/property-3.r | 1 - + ld/testsuite/ld-x86-64/property-4.r | 1 - + ld/testsuite/ld-x86-64/property-5.r | 1 - + .../ld-x86-64/property-x86-ibt3a-x32.d | 5 ++- + ld/testsuite/ld-x86-64/property-x86-ibt3a.d | 5 ++- + .../ld-x86-64/property-x86-ibt3b-x32.d | 5 ++- + ld/testsuite/ld-x86-64/property-x86-ibt3b.d | 5 ++- + .../ld-x86-64/property-x86-shstk3a-x32.d | 5 ++- + ld/testsuite/ld-x86-64/property-x86-shstk3a.d | 5 ++- + .../ld-x86-64/property-x86-shstk3b-x32.d | 5 ++- + ld/testsuite/ld-x86-64/property-x86-shstk3b.d | 5 ++- + ld/testsuite/ld-x86-64/x86-64.exp | 4 +++ + 31 files changed, 211 insertions(+), 47 deletions(-) + create mode 100644 ld/testsuite/ld-i386/pr23486a.d + create mode 100644 ld/testsuite/ld-i386/pr23486b.d + create mode 100644 ld/testsuite/ld-x86-64/pr23486a-x32.d + create mode 100644 ld/testsuite/ld-x86-64/pr23486a.d + create mode 100644 ld/testsuite/ld-x86-64/pr23486a.s + create mode 100644 ld/testsuite/ld-x86-64/pr23486b-x32.d + create mode 100644 ld/testsuite/ld-x86-64/pr23486b.d + create mode 100644 ld/testsuite/ld-x86-64/pr23486b.s + +--- a/bfd/elfxx-x86.c ++++ b/bfd/elfxx-x86.c +@@ -2407,12 +2407,27 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info, + switch (pr_type) + { + case GNU_PROPERTY_X86_ISA_1_USED: ++ if (aprop == NULL || bprop == NULL) ++ { ++ /* Only one of APROP and BPROP can be NULL. */ ++ if (aprop != NULL) ++ { ++ /* Remove this property since the other input file doesn't ++ have it. */ ++ aprop->pr_kind = property_remove; ++ updated = TRUE; ++ } ++ break; ++ } ++ goto or_property; ++ + case GNU_PROPERTY_X86_ISA_1_NEEDED: + if (aprop != NULL && bprop != NULL) + { ++or_property: + number = aprop->u.number; + aprop->u.number = number | bprop->u.number; +- /* Remove the property if ISA bits are empty. */ ++ /* Remove the property if all bits are empty. */ + if (aprop->u.number == 0) + { + aprop->pr_kind = property_remove; +@@ -2428,14 +2443,14 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info, + { + if (aprop->u.number == 0) + { +- /* Remove APROP if ISA bits are empty. */ ++ /* Remove APROP if all bits are empty. */ + aprop->pr_kind = property_remove; + updated = TRUE; + } + } + else + { +- /* Return TRUE if APROP is NULL and ISA bits of BPROP ++ /* Return TRUE if APROP is NULL and all bits of BPROP + aren't empty to indicate that BPROP should be added + to ABFD. */ + updated = bprop->u.number != 0; +@@ -2582,9 +2597,9 @@ _bfd_x86_elf_link_setup_gnu_properties + { + /* If the separate code program header is needed, make sure + that the first read-only PT_LOAD segment has no code by +- adding a GNU_PROPERTY_X86_ISA_1_USED note. */ ++ adding a GNU_PROPERTY_X86_ISA_1_NEEDED note. */ + prop = _bfd_elf_get_property (ebfd, +- GNU_PROPERTY_X86_ISA_1_USED, ++ GNU_PROPERTY_X86_ISA_1_NEEDED, + 4); + prop->u.number = GNU_PROPERTY_X86_ISA_1_486; + prop->pr_kind = property_number; +diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp +index 6d794fe653..78dad02579 100644 +--- a/ld/testsuite/ld-i386/i386.exp ++++ b/ld/testsuite/ld-i386/i386.exp +@@ -462,6 +462,8 @@ run_dump_test "pr23189" + run_dump_test "pr23194" + run_dump_test "pr23372a" + run_dump_test "pr23372b" ++run_dump_test "pr23486a" ++run_dump_test "pr23486b" + + if { !([istarget "i?86-*-linux*"] + || [istarget "i?86-*-gnu*"] +diff --git a/ld/testsuite/ld-i386/pr23486a.d b/ld/testsuite/ld-i386/pr23486a.d +new file mode 100644 +index 0000000000..41a6dcf7d5 +--- /dev/null ++++ b/ld/testsuite/ld-i386/pr23486a.d +@@ -0,0 +1,10 @@ ++#source: ../ld-x86-64/pr23486a.s ++#source: ../ld-x86-64/pr23486b.s ++#as: --32 ++#ld: -r -m elf_i386 ++#readelf: -n ++ ++Displaying notes found in: .note.gnu.property ++ Owner Data size Description ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586 +diff --git a/ld/testsuite/ld-i386/pr23486b.d b/ld/testsuite/ld-i386/pr23486b.d +new file mode 100644 +index 0000000000..08019b7274 +--- /dev/null ++++ b/ld/testsuite/ld-i386/pr23486b.d +@@ -0,0 +1,10 @@ ++#source: ../ld-x86-64/pr23486b.s ++#source: ../ld-x86-64/pr23486a.s ++#as: --32 ++#ld: -r -m elf_i386 ++#readelf: -n ++ ++Displaying notes found in: .note.gnu.property ++ Owner Data size Description ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586 +diff --git a/ld/testsuite/ld-i386/property-3.r b/ld/testsuite/ld-i386/property-3.r +index 0ed91f5922..d03203c1e5 100644 +--- a/ld/testsuite/ld-i386/property-3.r ++++ b/ld/testsuite/ld-i386/property-3.r +@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property + Owner Data size Description + GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 + Properties: stack size: 0x800000 +- x86 ISA used: 586, SSE + x86 ISA needed: i486, 586 + #pass +diff --git a/ld/testsuite/ld-i386/property-4.r b/ld/testsuite/ld-i386/property-4.r +index cb2bc15d9a..da295eb6c7 100644 +--- a/ld/testsuite/ld-i386/property-4.r ++++ b/ld/testsuite/ld-i386/property-4.r +@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property + Owner Data size Description + GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 + Properties: stack size: 0x800000 +- x86 ISA used: i486, 586, SSE + x86 ISA needed: i486, 586, SSE + #pass +diff --git a/ld/testsuite/ld-i386/property-5.r b/ld/testsuite/ld-i386/property-5.r +index 552965058c..e4141594b3 100644 +--- a/ld/testsuite/ld-i386/property-5.r ++++ b/ld/testsuite/ld-i386/property-5.r +@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property + Owner Data size Description + GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 + Properties: stack size: 0x900000 +- x86 ISA used: i486, 586, SSE + x86 ISA needed: i486, 586, SSE + #pass +diff --git a/ld/testsuite/ld-i386/property-x86-ibt3a.d b/ld/testsuite/ld-i386/property-x86-ibt3a.d +index 4bb35b00fb..0aedea1614 100644 +--- a/ld/testsuite/ld-i386/property-x86-ibt3a.d ++++ b/ld/testsuite/ld-i386/property-x86-ibt3a.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: i486, 586, SSE2, SSE3 +- x86 ISA needed: 586, SSE, SSE3, SSE4_1 ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1 +diff --git a/ld/testsuite/ld-i386/property-x86-ibt3b.d b/ld/testsuite/ld-i386/property-x86-ibt3b.d +index 418d58a8f7..bd69ac6478 100644 +--- a/ld/testsuite/ld-i386/property-x86-ibt3b.d ++++ b/ld/testsuite/ld-i386/property-x86-ibt3b.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: i486, 586, SSE2, SSE3 +- x86 ISA needed: 586, SSE, SSE3, SSE4_1 ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1 +diff --git a/ld/testsuite/ld-i386/property-x86-shstk3a.d b/ld/testsuite/ld-i386/property-x86-shstk3a.d +index e261038f60..76d2a39f2c 100644 +--- a/ld/testsuite/ld-i386/property-x86-shstk3a.d ++++ b/ld/testsuite/ld-i386/property-x86-shstk3a.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: i486, 586, SSE2, SSE3 +- x86 ISA needed: 586, SSE, SSE3, SSE4_1 ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1 +diff --git a/ld/testsuite/ld-i386/property-x86-shstk3b.d b/ld/testsuite/ld-i386/property-x86-shstk3b.d +index 25f3d2361e..e770ecffa5 100644 +--- a/ld/testsuite/ld-i386/property-x86-shstk3b.d ++++ b/ld/testsuite/ld-i386/property-x86-shstk3b.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: i486, 586, SSE2, SSE3 +- x86 ISA needed: 586, SSE, SSE3, SSE4_1 ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1 +diff --git a/ld/testsuite/ld-x86-64/pr23486a-x32.d b/ld/testsuite/ld-x86-64/pr23486a-x32.d +new file mode 100644 +index 0000000000..6d9fa68cdb +--- /dev/null ++++ b/ld/testsuite/ld-x86-64/pr23486a-x32.d +@@ -0,0 +1,10 @@ ++#source: pr23486a.s ++#source: pr23486b.s ++#as: --x32 ++#ld: -r -m elf32_x86_64 ++#readelf: -n ++ ++Displaying notes found in: .note.gnu.property ++ Owner Data size Description ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586 +diff --git a/ld/testsuite/ld-x86-64/pr23486a.d b/ld/testsuite/ld-x86-64/pr23486a.d +new file mode 100644 +index 0000000000..dc2b7bf760 +--- /dev/null ++++ b/ld/testsuite/ld-x86-64/pr23486a.d +@@ -0,0 +1,10 @@ ++#source: pr23486a.s ++#source: pr23486b.s ++#as: --64 -defsym __64_bit__=1 ++#ld: -r -m elf_x86_64 ++#readelf: -n ++ ++Displaying notes found in: .note.gnu.property ++ Owner Data size Description ++ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586 +diff --git a/ld/testsuite/ld-x86-64/pr23486a.s b/ld/testsuite/ld-x86-64/pr23486a.s +new file mode 100644 +index 0000000000..a07d0c7ced +--- /dev/null ++++ b/ld/testsuite/ld-x86-64/pr23486a.s +@@ -0,0 +1,30 @@ ++ .section ".note.gnu.property", "a" ++.ifdef __64_bit__ ++ .p2align 3 ++.else ++ .p2align 2 ++.endif ++ .long 1f - 0f /* name length. */ ++ .long 4f - 1f /* data length. */ ++ /* NT_GNU_PROPERTY_TYPE_0 */ ++ .long 5 /* note type. */ ++0: ++ .asciz "GNU" /* vendor name. */ ++1: ++.ifdef __64_bit__ ++ .p2align 3 ++.else ++ .p2align 2 ++.endif ++ /* GNU_PROPERTY_X86_ISA_1_USED */ ++ .long 0xc0000000 /* pr_type. */ ++ .long 3f - 2f /* pr_datasz. */ ++2: ++ .long 0xa ++3: ++.ifdef __64_bit__ ++ .p2align 3 ++.else ++ .p2align 2 ++.endif ++4: +diff --git a/ld/testsuite/ld-x86-64/pr23486b-x32.d b/ld/testsuite/ld-x86-64/pr23486b-x32.d +new file mode 100644 +index 0000000000..0445e69d82 +--- /dev/null ++++ b/ld/testsuite/ld-x86-64/pr23486b-x32.d +@@ -0,0 +1,10 @@ ++#source: pr23486b.s ++#source: pr23486a.s ++#as: --x32 ++#ld: -r -m elf32_x86_64 ++#readelf: -n ++ ++Displaying notes found in: .note.gnu.property ++ Owner Data size Description ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586 +diff --git a/ld/testsuite/ld-x86-64/pr23486b.d b/ld/testsuite/ld-x86-64/pr23486b.d +new file mode 100644 +index 0000000000..dc2b7bf760 +--- /dev/null ++++ b/ld/testsuite/ld-x86-64/pr23486b.d +@@ -0,0 +1,10 @@ ++#source: pr23486a.s ++#source: pr23486b.s ++#as: --64 -defsym __64_bit__=1 ++#ld: -r -m elf_x86_64 ++#readelf: -n ++ ++Displaying notes found in: .note.gnu.property ++ Owner Data size Description ++ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586 +diff --git a/ld/testsuite/ld-x86-64/pr23486b.s b/ld/testsuite/ld-x86-64/pr23486b.s +new file mode 100644 +index 0000000000..c5167eeb65 +--- /dev/null ++++ b/ld/testsuite/ld-x86-64/pr23486b.s +@@ -0,0 +1,30 @@ ++ .section ".note.gnu.property", "a" ++.ifdef __64_bit__ ++ .p2align 3 ++.else ++ .p2align 2 ++.endif ++ .long 1f - 0f /* name length. */ ++ .long 4f - 1f /* data length. */ ++ /* NT_GNU_PROPERTY_TYPE_0 */ ++ .long 5 /* note type. */ ++0: ++ .asciz "GNU" /* vendor name. */ ++1: ++.ifdef __64_bit__ ++ .p2align 3 ++.else ++ .p2align 2 ++.endif ++ /* GNU_PROPERTY_X86_ISA_1_NEEDED */ ++ .long 0xc0000001 /* pr_type. */ ++ .long 3f - 2f /* pr_datasz. */ ++2: ++ .long 0x3 ++3: ++.ifdef __64_bit__ ++ .p2align 3 ++.else ++ .p2align 2 ++.endif ++4: +diff --git a/ld/testsuite/ld-x86-64/property-3.r b/ld/testsuite/ld-x86-64/property-3.r +index 0ed91f5922..d03203c1e5 100644 +--- a/ld/testsuite/ld-x86-64/property-3.r ++++ b/ld/testsuite/ld-x86-64/property-3.r +@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property + Owner Data size Description + GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 + Properties: stack size: 0x800000 +- x86 ISA used: 586, SSE + x86 ISA needed: i486, 586 + #pass +diff --git a/ld/testsuite/ld-x86-64/property-4.r b/ld/testsuite/ld-x86-64/property-4.r +index cb2bc15d9a..da295eb6c7 100644 +--- a/ld/testsuite/ld-x86-64/property-4.r ++++ b/ld/testsuite/ld-x86-64/property-4.r +@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property + Owner Data size Description + GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 + Properties: stack size: 0x800000 +- x86 ISA used: i486, 586, SSE + x86 ISA needed: i486, 586, SSE + #pass +diff --git a/ld/testsuite/ld-x86-64/property-5.r b/ld/testsuite/ld-x86-64/property-5.r +index 552965058c..e4141594b3 100644 +--- a/ld/testsuite/ld-x86-64/property-5.r ++++ b/ld/testsuite/ld-x86-64/property-5.r +@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property + Owner Data size Description + GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 + Properties: stack size: 0x900000 +- x86 ISA used: i486, 586, SSE + x86 ISA needed: i486, 586, SSE + #pass +diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d b/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d +index 011426f5a4..4cec728dc7 100644 +--- a/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d ++++ b/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 +- x86 ISA needed: i486, 586, SSE2, SSE3 ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 +diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3a.d b/ld/testsuite/ld-x86-64/property-x86-ibt3a.d +index 1b4229a037..a8df49a351 100644 +--- a/ld/testsuite/ld-x86-64/property-x86-ibt3a.d ++++ b/ld/testsuite/ld-x86-64/property-x86-ibt3a.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 +- x86 ISA needed: i486, 586, SSE2, SSE3 ++ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 +diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d b/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d +index 290ed6abf1..c112626711 100644 +--- a/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d ++++ b/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 +- x86 ISA needed: i486, 586, SSE2, SSE3 ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 +diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3b.d b/ld/testsuite/ld-x86-64/property-x86-ibt3b.d +index 1142e03272..f10dffdc2c 100644 +--- a/ld/testsuite/ld-x86-64/property-x86-ibt3b.d ++++ b/ld/testsuite/ld-x86-64/property-x86-ibt3b.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 +- x86 ISA needed: i486, 586, SSE2, SSE3 ++ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 +diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d b/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d +index 819542d181..0147a3c7b6 100644 +--- a/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d ++++ b/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 +- x86 ISA needed: i486, 586, SSE2, SSE3 ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 +diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3a.d b/ld/testsuite/ld-x86-64/property-x86-shstk3a.d +index 4c5d0e0a18..1f8c2dc929 100644 +--- a/ld/testsuite/ld-x86-64/property-x86-shstk3a.d ++++ b/ld/testsuite/ld-x86-64/property-x86-shstk3a.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 +- x86 ISA needed: i486, 586, SSE2, SSE3 ++ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 +diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d b/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d +index ba181e0bc5..7ca2539ca5 100644 +--- a/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d ++++ b/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 +- x86 ISA needed: i486, 586, SSE2, SSE3 ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 +diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3b.d b/ld/testsuite/ld-x86-64/property-x86-shstk3b.d +index 5216f385dd..f66a40e449 100644 +--- a/ld/testsuite/ld-x86-64/property-x86-shstk3b.d ++++ b/ld/testsuite/ld-x86-64/property-x86-shstk3b.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 +- x86 ISA needed: i486, 586, SSE2, SSE3 ++ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 +diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp +index 6edb9e86f4..ae21e554ad 100644 +--- a/ld/testsuite/ld-x86-64/x86-64.exp ++++ b/ld/testsuite/ld-x86-64/x86-64.exp +@@ -403,6 +403,10 @@ run_dump_test "pr23372a" + run_dump_test "pr23372a-x32" + run_dump_test "pr23372b" + run_dump_test "pr23372b-x32" ++run_dump_test "pr23486a" ++run_dump_test "pr23486a-x32" ++run_dump_test "pr23486b" ++run_dump_test "pr23486b-x32" + + if { ![istarget "x86_64-*-linux*"] && ![istarget "x86_64-*-nacl*"]} { + return +-- +2.20.1 + diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index ebbddbb2190..e1ff92d00f4 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -8,13 +8,15 @@ , bison ? null , flex , texinfo -, perl }: let reuseLibs = enableShared && withAllTargets; - version = "2.34"; + # Remove gold-symbol-visibility patch when updating, the proper fix + # is now upstream. + # https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=330b90b5ffbbc20c5de6ae6c7f60c40fab2e7a4f;hp=99181ccac0fc7d82e7dabb05dc7466e91f1645d3 + version = "2.33.1"; basename = "binutils"; # The targetPrefix prepended to binary names to allow multiple binuntils on the # PATH to both be usable. @@ -29,7 +31,7 @@ let # HACK to ensure that we preserve source from bootstrap binutils to not rebuild LLVM normal-src = stdenv.__bootPackages.binutils-unwrapped.src or (fetchurl { url = "mirror://gnu/binutils/${basename}-${version}.tar.bz2"; - sha256 = "1rin1f5c7wm4n3piky6xilcrpf2s0n3dd5vqq8irrxkcic3i1w49"; + sha256 = "1cmd0riv37bqy9mwbg6n3523qgr8b3bbm5kwj19sjrasl4yq9d0c"; }); in @@ -62,6 +64,10 @@ stdenv.mkDerivation { # cross-compiling. ./always-search-rpath.patch + ] ++ lib.optionals (!stdenv.targetPlatform.isVc4) + [ + # https://sourceware.org/bugzilla/show_bug.cgi?id=22868 + ./gold-symbol-visibility.patch ] ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch; outputs = [ "out" "info" "man" ]; @@ -69,11 +75,9 @@ stdenv.mkDerivation { depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ bison - perl - texinfo ] ++ (lib.optionals stdenv.targetPlatform.isiOS [ autoreconfHook - ]) ++ lib.optionals stdenv.targetPlatform.isVc4 [ flex ]; + ]) ++ lib.optionals stdenv.targetPlatform.isVc4 [ texinfo flex ]; buildInputs = [ zlib gettext ]; inherit noSysDirs; diff --git a/pkgs/development/tools/misc/binutils/gold-symbol-visibility.patch b/pkgs/development/tools/misc/binutils/gold-symbol-visibility.patch new file mode 100644 index 00000000000..0fb05a482d1 --- /dev/null +++ b/pkgs/development/tools/misc/binutils/gold-symbol-visibility.patch @@ -0,0 +1,79 @@ +commit 8564af037f5c4c6d2744a89497691359205b2bbc +Author: Shea Levy +Date: Mon Mar 19 10:52:40 2018 -0400 + + Revert "Allow multiply-defined absolute symbols when they have the same value." + + This reverts commit 5dc824ed42cd173c1525f5abc76f4091f11a4dbc. + +diff --git a/gold/ChangeLog-2017 b/gold/ChangeLog-2017 +index b2a47710b5..d7ca1b48c0 100644 +--- a/gold/ChangeLog-2017 ++++ b/gold/ChangeLog-2017 +@@ -114,11 +114,6 @@ + (localedir): Define as @localedir@. + (gnulocaledir, gettextsrcdir): Use @datarootdir@. + +-2017-11-28 Cary Coutant +- +- * resolve.cc (Symbol_table::resolve): Allow multiply-defined absolute +- symbols when they have the same value. +- + 2017-11-28 Cary Coutant + + * object.h (class Sized_relobj_file): Remove discarded_eh_frame_shndx_. +diff --git a/gold/resolve.cc b/gold/resolve.cc +index 4a5784cf8b..803576bfed 100644 +--- a/gold/resolve.cc ++++ b/gold/resolve.cc +@@ -247,28 +247,18 @@ Symbol_table::resolve(Sized_symbol* to, + Object* object, const char* version, + bool is_default_version) + { +- bool to_is_ordinary; +- const unsigned int to_shndx = to->shndx(&to_is_ordinary); +- + // It's possible for a symbol to be defined in an object file + // using .symver to give it a version, and for there to also be + // a linker script giving that symbol the same version. We + // don't want to give a multiple-definition error for this + // harmless redefinition. ++ bool to_is_ordinary; + if (to->source() == Symbol::FROM_OBJECT + && to->object() == object +- && to->is_defined() + && is_ordinary ++ && to->is_defined() ++ && to->shndx(&to_is_ordinary) == st_shndx + && to_is_ordinary +- && to_shndx == st_shndx +- && to->value() == sym.get_st_value()) +- return; +- +- // Likewise for an absolute symbol defined twice with the same value. +- if (!is_ordinary +- && st_shndx == elfcpp::SHN_ABS +- && !to_is_ordinary +- && to_shndx == elfcpp::SHN_ABS + && to->value() == sym.get_st_value()) + return; + +@@ -360,8 +350,8 @@ Symbol_table::resolve(Sized_symbol* to, + && (sym.get_st_bind() == elfcpp::STB_WEAK + || to->binding() == elfcpp::STB_WEAK) + && orig_st_shndx != elfcpp::SHN_UNDEF ++ && to->shndx(&to_is_ordinary) != elfcpp::SHN_UNDEF + && to_is_ordinary +- && to_shndx != elfcpp::SHN_UNDEF + && sym.get_st_size() != 0 // Ignore weird 0-sized symbols. + && to->symsize() != 0 + && (sym.get_st_type() != to->type() +@@ -372,7 +362,7 @@ Symbol_table::resolve(Sized_symbol* to, + { + Symbol_location fromloc + = { object, orig_st_shndx, static_cast(sym.get_st_value()) }; +- Symbol_location toloc = { to->object(), to_shndx, ++ Symbol_location toloc = { to->object(), to->shndx(&to_is_ordinary), + static_cast(to->value()) }; + this->candidate_odr_violations_[to->name()].insert(fromloc); + this->candidate_odr_violations_[to->name()].insert(toloc); -- cgit v1.2.3 From e30f1e3c80dad49893b7921c393583f3a149bceb Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 29 Apr 2020 15:48:25 +0200 Subject: Revert "coreutils: set ac_cv_func_lchmod=no" This reverts commit c5e3472e2072ed0998571ce3961b8df65e2862cc. --- pkgs/tools/misc/coreutils/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index b39bef7cb2d..49edc002bec 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -79,7 +79,6 @@ stdenv.mkDerivation (rec { ++ optional (singleBinary != false) ("--enable-single-binary" + optionalString (isString singleBinary) "=${singleBinary}") ++ optional withOpenssl "--with-openssl" - ++ optional stdenv.hostPlatform.isLinux "ac_cv_func_lchmod=no" ++ optional stdenv.hostPlatform.isSunOS "ac_cv_func_inotify_init=no" ++ optional withPrefix "--program-prefix=g" ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.hostPlatform.libc == "glibc") [ -- cgit v1.2.3 From 607c4d8bb8909f17e3083bb1504430eb7332a974 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 29 Apr 2020 15:48:26 +0200 Subject: Revert "binutils: 2.31.1 -> 2.33.1" This reverts commit efdb29597a76c526dc0d9a55f8adf2ec5c33b0ee. --- pkgs/development/tools/misc/binutils/default.nix | 10 +++++++-- .../tools/misc/binutils/no-plugins.patch | 26 ++++++++++------------ 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index e1ff92d00f4..cd05ea354ca 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -16,7 +16,7 @@ let # Remove gold-symbol-visibility patch when updating, the proper fix # is now upstream. # https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=330b90b5ffbbc20c5de6ae6c7f60c40fab2e7a4f;hp=99181ccac0fc7d82e7dabb05dc7466e91f1645d3 - version = "2.33.1"; + version = "2.31.1"; basename = "binutils"; # The targetPrefix prepended to binary names to allow multiple binuntils on the # PATH to both be usable. @@ -31,7 +31,7 @@ let # HACK to ensure that we preserve source from bootstrap binutils to not rebuild LLVM normal-src = stdenv.__bootPackages.binutils-unwrapped.src or (fetchurl { url = "mirror://gnu/binutils/${basename}-${version}.tar.bz2"; - sha256 = "1cmd0riv37bqy9mwbg6n3523qgr8b3bbm5kwj19sjrasl4yq9d0c"; + sha256 = "1l34hn1zkmhr1wcrgf0d4z7r3najxnw3cx2y2fk7v55zjlk3ik7z"; }); in @@ -68,6 +68,12 @@ stdenv.mkDerivation { [ # https://sourceware.org/bugzilla/show_bug.cgi?id=22868 ./gold-symbol-visibility.patch + + # https://sourceware.org/bugzilla/show_bug.cgi?id=23428 + # un-break features so linking against musl doesn't produce crash-only binaries + ./0001-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch + ./0001-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch + ./0001-x86-Properly-add-X86_ISA_1_NEEDED-property.patch ] ++ lib.optional stdenv.targetPlatform.isiOS ./support-ios.patch; outputs = [ "out" "info" "man" ]; diff --git a/pkgs/development/tools/misc/binutils/no-plugins.patch b/pkgs/development/tools/misc/binutils/no-plugins.patch index 68cf51b7dd3..9624b7976b7 100644 --- a/pkgs/development/tools/misc/binutils/no-plugins.patch +++ b/pkgs/development/tools/misc/binutils/no-plugins.patch @@ -1,21 +1,19 @@ -diff --git a/bfd/plugin.c b/bfd/plugin.c -index 537ab60311..bfe7957f96 100644 ---- a/bfd/plugin.c -+++ b/bfd/plugin.c -@@ -386,6 +386,7 @@ load_plugin (bfd *abfd) +diff -ru binutils-2.27-orig/bfd/plugin.c binutils-2.27/bfd/plugin.c +--- binutils-2.27-orig/bfd/plugin.c 2016-10-14 17:46:30.791315555 +0200 ++++ binutils-2.27/bfd/plugin.c 2016-10-14 17:46:38.583298765 +0200 +@@ -333,6 +333,7 @@ if (plugin_program_name == NULL) return found; +#if 0 - /* Try not to search the same dir twice, by looking at st_dev and - st_ino for the dir. If we are on a file system that always sets - st_ino to zero or the actual st_ino is zero we might waste some -@@ -437,7 +438,7 @@ load_plugin (bfd *abfd) - if (found) - break; - } -- + plugin_dir = concat (BINDIR, "/../lib/bfd-plugins", NULL); + p = make_relative_prefix (plugin_program_name, + BINDIR, +@@ -364,6 +365,7 @@ + free (p); + if (d) + closedir (d); +#endif + return found; } - -- cgit v1.2.3 From 2364d98c6025d57cdf97d08d25f5956e396142e5 Mon Sep 17 00:00:00 2001 From: Alexey Shmalko Date: Wed, 29 Apr 2020 16:52:29 +0300 Subject: meson: remove rasendubi from maintainers I lagged behind meson changes and I can't provide good reviews or fix meson issues. I am therefore resigning from meson maintainership. --- pkgs/development/tools/build-managers/meson/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 15b0a5ffcd0..0dbe9ec7842 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -98,7 +98,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://mesonbuild.com"; description = "SCons-like build system that use python as a front-end language and Ninja as a building backend"; license = licenses.asl20; - maintainers = with maintainers; [ jtojnar mbe rasendubi ]; + maintainers = with maintainers; [ jtojnar mbe ]; platforms = platforms.all; }; } -- cgit v1.2.3 From f7ac956a2b5b8c7f3a50c63547af493c68372169 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 28 Apr 2020 04:20:00 -0500 Subject: buildDunePackage: add support for parallel build dune allows to specify the number of jobs to build the package. --- pkgs/build-support/ocaml/dune.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/ocaml/dune.nix b/pkgs/build-support/ocaml/dune.nix index 435bbe89c1c..b134effab8a 100644 --- a/pkgs/build-support/ocaml/dune.nix +++ b/pkgs/build-support/ocaml/dune.nix @@ -1,6 +1,6 @@ { stdenv, ocaml, findlib, dune, dune_2, opaline }: -{ pname, version, buildInputs ? [], ... }@args: +{ pname, version, buildInputs ? [], enableParallelBuilding ? true, ... }@args: let Dune = if args.useDune2 or false then dune_2 else dune; in @@ -11,14 +11,16 @@ else stdenv.mkDerivation ({ + inherit enableParallelBuilding; + buildPhase = '' runHook preBuild - dune build -p ${pname} + dune build -p ${pname} ''${enableParallelBuilding:+-j $NIX_BUILD_CORES} runHook postBuild ''; checkPhase = '' runHook preCheck - dune runtest -p ${pname} + dune runtest -p ${pname} ''${enableParallelBuilding:+-j $NIX_BUILD_CORES} runHook postCheck ''; installPhase = '' -- cgit v1.2.3 From 237ef3095c7604a36ab231d282fcfce02613130d Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 29 Apr 2020 16:48:50 +0200 Subject: Revert "libbfd: fix build" This reverts commit 7550ab98b0a305afda06121e6f135a7556b7e753. --- .../binutils/build-components-separately.patch | 38 +++++++++++++++------- 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/pkgs/development/tools/misc/binutils/build-components-separately.patch b/pkgs/development/tools/misc/binutils/build-components-separately.patch index 38fa4934a28..d3cd0d2131c 100644 --- a/pkgs/development/tools/misc/binutils/build-components-separately.patch +++ b/pkgs/development/tools/misc/binutils/build-components-separately.patch @@ -1,8 +1,19 @@ +From bc09a9236f67e710d545ac11bcdac7b55dbcc1a0 Mon Sep 17 00:00:00 2001 +From: John Ericson +Date: Thu, 12 Oct 2017 11:16:57 -0400 +Subject: [PATCH] Build components separately + +--- + bfd/configure.ac | 18 +++--------------- + opcodes/Makefile.am | 17 +++++++++++++---- + opcodes/configure.ac | 45 ++++++--------------------------------------- + 3 files changed, 22 insertions(+), 58 deletions(-) + diff --git a/bfd/configure.ac b/bfd/configure.ac -index c5bfbd5d..45ad4c26 100644 +index 9a183c1628..8728837384 100644 --- a/bfd/configure.ac +++ b/bfd/configure.ac -@@ -278,31 +278,19 @@ AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed, +@@ -241,31 +241,19 @@ AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed, LT_LIB_M @@ -22,26 +33,26 @@ index c5bfbd5d..45ad4c26 100644 - SHARED_LIBADD="-L`pwd`/../libiberty/pic -liberty" - fi - + # More hacks to build DLLs on Windows. case "${host}" in - # More hacks to build DLLs on Windows. *-*-cygwin*) SHARED_LDFLAGS="-no-undefined" - SHARED_LIBADD="-L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lcygwin -lkernel32" + SHARED_LIBADD="-liberty -lintl -lcygwin -lkernel32" ;; - # Use built-in libintl on macOS, since it is not provided by libc. - *-*-darwin*) + # Hack to build or1k-src on OSX + or1k*-*-darwin*) - SHARED_LIBADD="-L`pwd`/../libiberty/pic -L`pwd`/../intl -liberty -lintl" + SHARED_LIBADD="-liberty -lintl" ;; esac diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am -index 4f06074a..6836c589 100644 +index 925e7ff651..47b395c195 100644 --- a/opcodes/Makefile.am +++ b/opcodes/Makefile.am -@@ -51,7 +51,7 @@ libopcodes_la_LDFLAGS += -rpath $(rpath_bfdlibdir) +@@ -52,7 +52,7 @@ libopcodes_la_LDFLAGS += -rpath $(rpath_bfdlibdir) endif # This is where bfd.h lives. @@ -50,7 +61,7 @@ index 4f06074a..6836c589 100644 BUILD_LIBS = @BUILD_LIBS@ BUILD_LIB_DEPS = @BUILD_LIB_DEPS@ -@@ -301,7 +301,7 @@ OFILES = @BFD_MACHINES@ +@@ -303,7 +303,7 @@ OFILES = @BFD_MACHINES@ # development.sh is used to determine -Werror default. CONFIG_STATUS_DEPENDENCIES = $(BFDDIR)/development.sh @@ -59,7 +70,7 @@ index 4f06074a..6836c589 100644 disassemble.lo: disassemble.c if am__fastdepCC -@@ -322,12 +322,21 @@ libopcodes_la_SOURCES = dis-buf.c disassemble.c dis-init.c +@@ -324,12 +324,21 @@ libopcodes_la_SOURCES = dis-buf.c disassemble.c dis-init.c # old version of libbfd, or to pick up libbfd for the wrong architecture # if host != build. So for building with shared libraries we use a # hardcoded path to libbfd.so instead of relying on the entries in libbfd.la. @@ -84,10 +95,10 @@ index 4f06074a..6836c589 100644 # the build directory so that we don't have to convert all the # programs that use libopcodes.a simultaneously. This is a hack which diff --git a/opcodes/configure.ac b/opcodes/configure.ac -index 00be9c88..6e589ae4 100644 +index b9f5eb8a4f..ef2c2152b7 100644 --- a/opcodes/configure.ac +++ b/opcodes/configure.ac -@@ -86,6 +86,7 @@ AC_PROG_INSTALL +@@ -89,6 +89,7 @@ AC_PROG_INSTALL AC_CHECK_HEADERS(string.h strings.h stdlib.h limits.h) ACX_HEADER_STRING @@ -95,7 +106,7 @@ index 00be9c88..6e589ae4 100644 AC_CHECK_DECLS([basename, stpcpy]) -@@ -137,61 +138,27 @@ AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed, +@@ -134,61 +135,27 @@ AC_CACHE_CHECK(linker --as-needed support, bfd_cv_ld_as_needed, LT_LIB_M @@ -162,3 +173,6 @@ index 00be9c88..6e589ae4 100644 ;; esac +-- +2.14.2 + -- cgit v1.2.3 From 940c4fc4c69cb518f03545a3f0945422951f8c06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 29 Apr 2020 15:32:56 +0100 Subject: home-assistant: 0.108.7 -> 0.109.0 --- .../0001-setup.py-relax-dependencies.patch | 20 +++++++++++--------- pkgs/servers/home-assistant/component-packages.nix | 20 +++++++++++--------- pkgs/servers/home-assistant/default.nix | 4 ++-- pkgs/servers/home-assistant/frontend.nix | 4 ++-- pkgs/servers/home-assistant/parse-requirements.py | 2 +- 5 files changed, 27 insertions(+), 23 deletions(-) diff --git a/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch b/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch index e18842f49aa..e1cf8ada016 100644 --- a/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch +++ b/pkgs/servers/home-assistant/0001-setup.py-relax-dependencies.patch @@ -1,4 +1,4 @@ -From 679364e1cd95dc7179dbd3114ec35b282fbcb0af Mon Sep 17 00:00:00 2001 +From 55cb3ba4458bd43588e7921906d091d001130ab0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 9 Apr 2020 07:20:46 +0100 Subject: [PATCH] setup.py: relax dependencies @@ -8,14 +8,14 @@ Content-Transfer-Encoding: 8bit Signed-off-by: Jörg Thalheim --- - setup.py | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) + setup.py | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/setup.py b/setup.py -index e0daacd98b..7166f1f228 100755 +index 0c56e89b67..ba04546130 100755 --- a/setup.py +++ b/setup.py -@@ -32,10 +32,10 @@ PROJECT_URLS = { +@@ -32,24 +32,24 @@ PROJECT_URLS = { PACKAGES = find_packages(exclude=["tests", "tests.*"]) REQUIRES = [ @@ -26,14 +26,16 @@ index e0daacd98b..7166f1f228 100755 - "attrs==19.3.0", + "attrs>=19.3.0", "bcrypt==3.1.7", - "certifi>=2019.11.28", +- "certifi>=2020.4.5.1", ++ "certifi>=2019.11.28", "ciso8601==2.1.3", -@@ -43,13 +43,13 @@ REQUIRES = [ +- "importlib-metadata==1.6.0", ++ "importlib-metadata>=1.5.0", "jinja2>=2.11.1", "PyJWT==1.7.1", # PyJWT has loose dependency. We want the latest one. -- "cryptography==2.8", -+ "cryptography>=2.8", +- "cryptography==2.9", ++ "cryptography>=2.9", "pip>=8.0.3", "python-slugify==4.0.0", "pytz>=2019.03", diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 0ae33cd4895..28c0322720a 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "0.108.7"; + version = "0.109.0"; components = { "abode" = ps: with ps; [ ]; # missing inputs: abodepy "acer_projector" = ps: with ps; [ pyserial]; @@ -42,11 +42,13 @@ "arduino" = ps: with ps; [ ]; # missing inputs: PyMata "arest" = ps: with ps; [ ]; "arlo" = ps: with ps; [ ha-ffmpeg]; # missing inputs: pyarlo + "arris_tg2492lg" = ps: with ps; [ ]; # missing inputs: arris-tg2492lg "aruba" = ps: with ps; [ pexpect]; "arwn" = ps: with ps; [ aiohttp-cors hbmqtt paho-mqtt]; "asterisk_cdr" = ps: with ps; [ ]; # missing inputs: asterisk_mbox "asterisk_mbox" = ps: with ps; [ ]; # missing inputs: asterisk_mbox "asuswrt" = ps: with ps; [ ]; # missing inputs: aioasuswrt + "atag" = ps: with ps; [ ]; # missing inputs: pyatag "aten_pe" = ps: with ps; [ ]; # missing inputs: atenpdu "atome" = ps: with ps; [ ]; # missing inputs: pyatome "august" = ps: with ps; [ ]; # missing inputs: py-august @@ -86,7 +88,7 @@ "bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280 "bmw_connected_drive" = ps: with ps; [ ]; # missing inputs: bimmer_connected "bom" = ps: with ps; [ ]; # missing inputs: bomradarloop - "braviatv" = ps: with ps; [ bravia-tv getmac]; + "braviatv" = ps: with ps; [ bravia-tv]; "broadlink" = ps: with ps; [ broadlink]; "brother" = ps: with ps; [ ]; # missing inputs: brother "brottsplatskartan" = ps: with ps; [ ]; # missing inputs: brottsplatskartan @@ -139,7 +141,7 @@ "datadog" = ps: with ps; [ datadog]; "ddwrt" = ps: with ps; [ ]; "deconz" = ps: with ps; [ ]; # missing inputs: pydeconz - "decora" = ps: with ps; [ ]; # missing inputs: bluepy decora + "decora" = ps: with ps; [ bluepy]; # missing inputs: decora "decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi "default_config" = ps: with ps; [ pynacl aiohttp-cors defusedxml distro hass-nabucasa netdisco sqlalchemy zeroconf]; # missing inputs: home-assistant-frontend "delijn" = ps: with ps; [ ]; # missing inputs: pydelijn @@ -327,7 +329,7 @@ "hive" = ps: with ps; [ ]; # missing inputs: pyhiveapi "hlk_sw16" = ps: with ps; [ ]; # missing inputs: hlk-sw16 "homeassistant" = ps: with ps; [ ]; - "homekit" = ps: with ps; [ HAP-python]; + "homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors]; # missing inputs: base36 fnvhash "homekit_controller" = ps: with ps; [ ]; # missing inputs: aiohomekit[IP] "homematic" = ps: with ps; [ pyhomematic]; "homematicip_cloud" = ps: with ps; [ ]; # missing inputs: homematicip @@ -467,7 +469,7 @@ "microsoft_face" = ps: with ps; [ aiohttp-cors]; "microsoft_face_detect" = ps: with ps; [ aiohttp-cors]; "microsoft_face_identify" = ps: with ps; [ aiohttp-cors]; - "miflora" = ps: with ps; [ ]; # missing inputs: bluepy miflora + "miflora" = ps: with ps; [ bluepy]; # missing inputs: miflora "mikrotik" = ps: with ps; [ ]; # missing inputs: librouteros "mill" = ps: with ps; [ ]; # missing inputs: millheater "min_max" = ps: with ps; [ ]; @@ -548,6 +550,7 @@ "openalpr_cloud" = ps: with ps; [ ]; "openalpr_local" = ps: with ps; [ ]; "opencv" = ps: with ps; [ numpy]; # missing inputs: opencv-python-headless + "openerz" = ps: with ps; [ ]; # missing inputs: openerz-api "openevse" = ps: with ps; [ ]; # missing inputs: openevsewifi "openexchangerates" = ps: with ps; [ ]; "opengarage" = ps: with ps; [ ]; @@ -567,7 +570,7 @@ "otp" = ps: with ps; [ pyotp]; "owntracks" = ps: with ps; [ pynacl aiohttp-cors]; "panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta - "panasonic_viera" = ps: with ps; [ wakeonlan]; # missing inputs: panasonic_viera + "panasonic_viera" = ps: with ps; [ ]; # missing inputs: panasonic_viera "pandora" = ps: with ps; [ pexpect]; "panel_custom" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend "panel_iframe" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend @@ -576,6 +579,7 @@ "persistent_notification" = ps: with ps; [ ]; "person" = ps: with ps; [ ]; "philips_js" = ps: with ps; [ ]; # missing inputs: ha-philipsjs + "pi4ioe5v9xxxx" = ps: with ps; [ ]; # missing inputs: pi4ioe5v9xxxx "pi_hole" = ps: with ps; [ ]; # missing inputs: hole "picotts" = ps: with ps; [ ]; "piglow" = ps: with ps; [ ]; # missing inputs: piglow @@ -603,7 +607,6 @@ "pulseaudio_loopback" = ps: with ps; [ ]; "push" = ps: with ps; [ aiohttp-cors]; "pushbullet" = ps: with ps; [ pushbullet]; - "pushetta" = ps: with ps; [ ]; # missing inputs: pushetta "pushover" = ps: with ps; [ pushover-complete]; "pushsafer" = ps: with ps; [ ]; "pvoutput" = ps: with ps; [ ]; @@ -761,8 +764,8 @@ "syncthru" = ps: with ps; [ ]; # missing inputs: pysyncthru "synology" = ps: with ps; [ ]; # missing inputs: py-synology "synology_chat" = ps: with ps; [ ]; + "synology_dsm" = ps: with ps; [ ]; # missing inputs: python-synology "synology_srm" = ps: with ps; [ ]; # missing inputs: synology-srm - "synologydsm" = ps: with ps; [ ]; # missing inputs: python-synology "syslog" = ps: with ps; [ ]; "system_health" = ps: with ps; [ aiohttp-cors]; "system_log" = ps: with ps; [ aiohttp-cors]; @@ -912,7 +915,6 @@ "yessssms" = ps: with ps; [ ]; # missing inputs: YesssSMS "yi" = ps: with ps; [ aioftp ha-ffmpeg]; "yr" = ps: with ps; [ xmltodict]; - "yweather" = ps: with ps; [ yahooweather]; "zabbix" = ps: with ps; [ ]; # missing inputs: pyzabbix "zamg" = ps: with ps; [ ]; "zengge" = ps: with ps; [ ]; # missing inputs: zengge diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index d04c2fa5c96..03805344ae6 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -67,7 +67,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.108.7"; + hassVersion = "0.109.0"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -86,7 +86,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "home-assistant"; rev = version; - sha256 = "0nk1615ms6nlmhgmsgsknc6m7b19baan8m4kr4s97njngiardxm7"; + sha256 = "1b5y464yhngivxkz3cg2b7j2ssawy7fqr3si5pdmqkgz1dbqihhn"; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 6ca763768ea..bcb770b8dc6 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20200418.0"; + version = "20200427.1"; src = fetchPypi { inherit pname version; - sha256 = "12px8znc6nw5ndg4f28lvfpqsnzi00b5qgpdj9jwny0fss4aglnb"; + sha256 = "0ch669asyjqbh73y4a170j86hw9in2fw3xmxaxwh5r6sgx28k4v7"; }; # no Python tests implemented diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index 1467c3b528c..f802485d6c6 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -80,7 +80,7 @@ def parse_components(version: str = "master"): # Recursively get the requirements of a component and its dependencies def get_reqs(components, component): - requirements = set(components[component]["requirements"]) + requirements = set(components[component].get("requirements", [])) deps = components[component].get("dependencies", []) for dependency in deps: requirements.update(get_reqs(components, dependency)) -- cgit v1.2.3 From e4aab9cded57b7ac1c0e66a6892240f2ce86f4fe Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Tue, 28 Apr 2020 22:48:35 +0200 Subject: skypeforlinux: add additional mirror The university of chigaco keeps the binaries of old releases. This reduces the change of #81868 and #85724 happening again in the future. --- .../applications/networking/instant-messengers/skypeforlinux/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index f7dbf223a9b..0cc8cd848c5 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -62,6 +62,7 @@ let fetchurl { urls = [ "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" + "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; sha256 = "1cnlwlp84942ywji3x60zvhijavazdxfym3rfzq3ysky28b6mn6i"; -- cgit v1.2.3 From fb4c730386d05839e8c16e5ac563bf145acad88e Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Wed, 29 Apr 2020 17:21:25 +0200 Subject: plex: 1.19.1.2645 -> 1.19.2.2737 --- pkgs/servers/plex/raw.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/plex/raw.nix b/pkgs/servers/plex/raw.nix index ea01919ce20..cdeaaa77c05 100644 --- a/pkgs/servers/plex/raw.nix +++ b/pkgs/servers/plex/raw.nix @@ -8,13 +8,13 @@ # server, and the FHS userenv and corresponding NixOS module should # automatically pick up the changes. stdenv.mkDerivation rec { - version = "1.19.1.2645-ccb6eb67e"; + version = "1.19.2.2737-b69929dab"; pname = "plexmediaserver"; # Fetch the source src = fetchurl { url = "https://downloads.plex.tv/plex-media-server-new/${version}/redhat/plexmediaserver-${version}.x86_64.rpm"; - sha256 = "0ivv6apavkgy4zryhwam20jjfgy8sxpccqp0bi5ylh33jpxhm096"; + sha256 = "00s3ab66wnpwkjrp0ng8srcy3l32sh5ibv0i9m6l4d0a19hr01fs"; }; outputs = [ "out" "basedb" ]; -- cgit v1.2.3 From 8532d16e3dd0d84bfa7bb9147eb42fa9dbbc6342 Mon Sep 17 00:00:00 2001 From: Mike Sperber Date: Wed, 29 Apr 2020 17:27:21 +0200 Subject: openexr, imlbase: unbreak on macOS With the default configuration, the libraries are generated with a -2_4.24.dylib suffix, and linking with -l...-2_4 doesn't work. Pass the configure option to turn off the suffix. --- pkgs/development/libraries/ilmbase/default.nix | 3 +++ pkgs/development/libraries/openexr/default.nix | 3 +++ 2 files changed, 6 insertions(+) diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index 4ea16a59e8b..0244725177e 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -18,6 +18,9 @@ stdenv.mkDerivation rec { ./bootstrap ''; + # otherwise, the pkgconfig info for the libraries will not match the filenames + configureFlags = stdenv.lib.optionalString stdenv.isDarwin "--enable-namespaceversioning=no"; + depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ automake autoconf libtool which ]; diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index da8fb429465..81a5ab1db99 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -42,6 +42,9 @@ stdenv.mkDerivation rec { ./bootstrap ''; + # otherwise, the pkgconfig info for the libraries will not match the filenames + configureFlags = stdenv.lib.optionalString stdenv.isDarwin "--enable-namespaceversioning=no"; + nativeBuildInputs = [ pkgconfig autoconf automake libtool ]; propagatedBuildInputs = [ ilmbase zlib ]; -- cgit v1.2.3 From 26d3ae2f240ae85f27d566e78f7732b6aecec686 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 29 Apr 2020 16:09:20 +0200 Subject: knot-resolver: 5.0.1 -> 5.1.0 https://gitlab.labs.nic.cz/knot/knot-resolver/-/tags/v5.1.0 The upcoming major version will contain reworked hints/policy/prefill/rebinding/view modules and related functionalities. Please participate in the following survey to ensure we do not forget about your particular use-case: https://www.knot-resolver.cz/survey/ It will help us to improve Knot Resolver. Thank you! --- pkgs/servers/dns/knot-resolver/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/dns/knot-resolver/default.nix b/pkgs/servers/dns/knot-resolver/default.nix index b0be6c9b3b3..4964755332d 100644 --- a/pkgs/servers/dns/knot-resolver/default.nix +++ b/pkgs/servers/dns/knot-resolver/default.nix @@ -16,21 +16,13 @@ lua = luajitPackages; unwrapped = stdenv.mkDerivation rec { pname = "knot-resolver"; - version = "5.0.1"; + version = "5.1.0"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/${pname}-${version}.tar.xz"; - sha256 = "4a93264ad0cda7ea2252d1ba057e474722f77848165f2893e0c76e21ae406415"; + sha256 = "9ab179d1dccc6ba59aacac81a4cd10a039615c7a846d9f77f26b851da25d1a86"; }; - patches = [ - (fetchpatch { # merged to upstream master, remove on update - name = "zfs-cpu-usage.diff"; - url = "https://gitlab.labs.nic.cz/knot/knot-resolver/merge_requests/946.diff"; - sha256 = "0mcvx4pfnl19h6zrv2fcgxdjarqzczn2dz85sylcczsfvdmn6i5m"; - }) - ]; - outputs = [ "out" "dev" ]; # Path fixups for the NixOS service. -- cgit v1.2.3 From 42afec1e5876775653335aa46042f99cf0ca96e3 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Thu, 30 Apr 2020 01:04:39 +0900 Subject: bash-completion: ignore failing gcc tests on Aarch32 --- pkgs/shells/bash/bash-completion/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/shells/bash/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix index c223985c2fb..8463b1750d1 100644 --- a/pkgs/shells/bash/bash-completion/default.nix +++ b/pkgs/shells/bash/bash-completion/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { # - ignore test_screen because it assumes vt terminals exist checkPhase = '' pytest . \ - ${stdenv.lib.optionalString (stdenv.hostPlatform.isAarch64) "--ignore=test/t/test_gcc.py"} \ + ${stdenv.lib.optionalString (stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isAarch32) "--ignore=test/t/test_gcc.py"} \ --ignore=test/t/test_chsh.py \ --ignore=test/t/test_ether_wake.py \ --ignore=test/t/test_ifdown.py \ -- cgit v1.2.3 From 445d554b9bfb8b4b5a12cc498602c7048481e0af Mon Sep 17 00:00:00 2001 From: Nathan Fish Date: Wed, 29 Apr 2020 16:57:30 +0000 Subject: ipfs: 0.4.23 -> 0.5.0 --- pkgs/applications/networking/ipfs/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index b94fc1addb0..037b94f9acf 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -2,21 +2,26 @@ buildGoModule rec { pname = "ipfs"; - version = "0.4.23"; + version = "0.5.0"; rev = "v${version}"; + buildPhase = '' + sed -i 'd#\$(d)/preload.sh > $@#' plugin/loader/Rules.mk + make install + ''; + src = fetchFromGitHub { owner = "ipfs"; repo = "go-ipfs"; inherit rev; - sha256 = "19m1bhqf1jghdv2ngdnjdk1kvjcxbkgm1ccdkmkabv4ii43h8jwm"; + sha256 = "0dbyvs49wyqj46c8hvz0fr4vpgfrdj1h8blniwzjf0jabgvw8nik"; }; postPatch = '' rm -rf test/dependencies ''; - modSha256 = "12m4ind1s8zaa6kssblc28z2cafy20w2jp80kzif39hg5ar9bijm"; + modSha256 = "00xgsvpl47miy6paxl8yn6p76h6ssccackh50z0l4r5s7wcc25q8"; meta = with stdenv.lib; { description = "A global, versioned, peer-to-peer filesystem"; -- cgit v1.2.3 From 410c38f3171c6d6f2dc6de9e4766e41f46a52a94 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Wed, 29 Apr 2020 19:56:37 +0200 Subject: Revert "PHP maintainer team" --- .github/CODEOWNERS | 3 +- maintainers/team-list.nix | 11 ---- nixos/tests/php/fpm.nix | 4 +- nixos/tests/php/httpd.nix | 4 +- nixos/tests/php/pcre.nix | 4 +- pkgs/development/interpreters/php/default.nix | 5 +- pkgs/top-level/php-packages.nix | 81 ++++++--------------------- 7 files changed, 25 insertions(+), 87 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 7c39ce48a3f..e37a4de9d07 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -176,7 +176,6 @@ # PHP /doc/languages-frameworks/php.section.md @etu -/nixos/tests/php @etu -/pkgs/build-support/build-pecl.nix @etu /pkgs/development/interpreters/php @etu /pkgs/top-level/php-packages.nix @etu +/pkgs/build-support/build-pecl.nix @etu diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 1fed6a4d9bf..9fe952e5415 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -43,17 +43,6 @@ with lib.maintainers; { scope = "Maintain GNOME desktop environment and platform."; }; - php = { - members = [ - aanderse - etu - globin - ma27 - talyz - ]; - scope = "Maintain PHP related packages and extensions."; - }; - podman = { members = [ adisbladis diff --git a/nixos/tests/php/fpm.nix b/nixos/tests/php/fpm.nix index 513abd94373..1e4ced24b6c 100644 --- a/nixos/tests/php/fpm.nix +++ b/nixos/tests/php/fpm.nix @@ -1,6 +1,6 @@ -import ../make-test-python.nix ({pkgs, lib, ...}: { +import ../make-test-python.nix ({pkgs, ...}: { name = "php-fpm-nginx-test"; - meta.maintainers = lib.teams.php.members; + meta.maintainers = with pkgs.stdenv.lib.maintainers; [ etu ]; machine = { config, lib, pkgs, ... }: { services.nginx = { diff --git a/nixos/tests/php/httpd.nix b/nixos/tests/php/httpd.nix index 1092e0ecadd..fc3ff986734 100644 --- a/nixos/tests/php/httpd.nix +++ b/nixos/tests/php/httpd.nix @@ -1,6 +1,6 @@ -import ../make-test-python.nix ({pkgs, lib, ...}: { +import ../make-test-python.nix ({pkgs, ...}: { name = "php-httpd-test"; - meta.maintainers = lib.teams.php.members; + meta.maintainers = with pkgs.stdenv.lib.maintainers; [ etu ]; machine = { config, lib, pkgs, ... }: { services.httpd = { diff --git a/nixos/tests/php/pcre.nix b/nixos/tests/php/pcre.nix index 3dd0964e60f..016dca81d52 100644 --- a/nixos/tests/php/pcre.nix +++ b/nixos/tests/php/pcre.nix @@ -1,9 +1,7 @@ let testString = "can-use-subgroups"; -in import ../make-test-python.nix ({lib, ...}: { +in import ../make-test-python.nix ({ ...}: { name = "php-httpd-pcre-jit-test"; - meta.maintainers = lib.teams.php.members; - machine = { lib, pkgs, ... }: { time.timeZone = "UTC"; services.httpd = { diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 2dada0082e2..1d6576b383c 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -138,9 +138,9 @@ let meta = with stdenv.lib; { description = "An HTML-embedded scripting language"; - homepage = "https://www.php.net"; + homepage = "https://www.php.net/"; license = licenses.php301; - maintainers = teams.php.members; + maintainers = with maintainers; [ globin etu ma27 ]; platforms = platforms.all; outputsToInstall = [ "out" "dev" ]; }; @@ -194,7 +194,6 @@ let passthru = { inherit buildEnv withExtensions enabledExtensions; inherit (php-packages) packages extensions; - inherit (php) meta; }; paths = [ php ]; postBuild = '' diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 35c0312e34d..0cda058459d 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -51,7 +51,7 @@ in description = "An application for building and managing Phars"; license = licenses.mit; homepage = "https://box-project.github.io/box2/"; - maintainers = with maintainers; [ jtojnar ] ++ teams.php.members; + maintainers = with maintainers; [ jtojnar ]; }; }; @@ -80,7 +80,7 @@ in description = "Dependency Manager for PHP"; license = licenses.mit; homepage = "https://getcomposer.org/"; - maintainers = with maintainers; [ offline ] ++ teams.php.members; + maintainers = with maintainers; [ globin offline ]; }; }; @@ -107,7 +107,7 @@ in description = "A tool to automatically fix PHP coding standards issues"; license = licenses.mit; homepage = "http://cs.sensiolabs.org/"; - maintainers = with maintainers; [ jtojnar ] ++ teams.php.members; + maintainers = with maintainers; [ jtojnar ]; }; }; @@ -144,7 +144,7 @@ in description = "This tool check syntax of PHP files faster than serial check with fancier output"; license = licenses.bsd2; homepage = "https://github.com/JakubOnderka/PHP-Parallel-Lint"; - maintainers = with maintainers; [ jtojnar ] ++ teams.php.members; + maintainers = with maintainers; [ jtojnar ]; }; }; @@ -171,7 +171,7 @@ in description = "PHP coding standard beautifier and fixer"; license = licenses.bsd3; homepage = "https://squizlabs.github.io/PHP_CodeSniffer/"; - maintainers = with maintainers; [ cmcdragonkai ] ++ teams.php.members; + maintainers = with maintainers; [ cmcdragonkai etu ]; }; }; @@ -198,7 +198,7 @@ in description = "PHP coding standard tool"; license = licenses.bsd3; homepage = "https://squizlabs.github.io/PHP_CodeSniffer/"; - maintainers = with maintainers; [ javaguirre ] ++ teams.php.members; + maintainers = with maintainers; [ javaguirre etu ]; }; }; @@ -224,15 +224,15 @@ in meta = with pkgs.lib; { description = "PHP Static Analysis Tool"; longDescription = '' - PHPStan focuses on finding errors in your code without actually - running it. It catches whole classes of bugs even before you write - tests for the code. It moves PHP closer to compiled languages in the - sense that the correctness of each line of the code can be checked - before you run the actual line. - ''; + PHPStan focuses on finding errors in your code without actually running + it. It catches whole classes of bugs even before you write tests for the + code. It moves PHP closer to compiled languages in the sense that the + correctness of each line of the code can be checked before you run the + actual line. + ''; license = licenses.mit; homepage = "https://github.com/phpstan/phpstan"; - maintainers = teams.php.members; + maintainers = with maintainers; [ etu ]; }; }; @@ -259,7 +259,6 @@ in description = "A static analysis tool for finding errors in PHP applications"; license = licenses.mit; homepage = "https://github.com/vimeo/psalm"; - maintainers = teams.php.members; }; }; @@ -286,7 +285,7 @@ in description = "PsySH is a runtime developer console, interactive debugger and REPL for PHP."; license = licenses.mit; homepage = "https://psysh.org/"; - maintainers = with maintainers; [ caugner ] ++ teams.php.members; + maintainers = with maintainers; [ caugner ]; }; }; }; @@ -309,8 +308,6 @@ in checkFlagsArray = ["REPORT_EXIT_STATUS=1" "NO_INTERACTION=1"]; makeFlags = [ "phpincludedir=$(dev)/include" ]; outputs = [ "out" "dev" ]; - - meta.maintainers = lib.teams.php.members; }; apcu_bc = buildPecl { @@ -323,8 +320,6 @@ in php.extensions.apcu pcre' ]; - - meta.maintainers = lib.teams.php.members; }; ast = buildPecl { @@ -332,8 +327,6 @@ in pname = "ast"; sha256 = "16c5isldm4csjbcvz1qk2mmrhgvh24sxsp6w6f5a37xpa3vciawp"; - - meta.maintainers = lib.teams.php.members; }; couchbase = buildPecl rec { @@ -381,7 +374,6 @@ in '') ]; - meta.maintainers = lib.teams.php.members; meta.broken = isPhp74; # Build error }; @@ -414,7 +406,6 @@ in ''; license = licenses.php301; homepage = "https://bitbucket.org/osmanov/pecl-event/"; - maintainers = teams.php.members; }; }; @@ -427,8 +418,6 @@ in configureFlags = [ "--enable-igbinary" ]; makeFlags = [ "phpincludedir=$(dev)/include" ]; outputs = [ "out" "dev" ]; - - meta.maintainers = lib.teams.php.members; }; imagick = buildPecl { @@ -440,8 +429,6 @@ in configureFlags = [ "--with-imagick=${pkgs.imagemagick.dev}" ]; nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = [ pcre' ]; - - meta.maintainers = lib.teams.php.members; }; mailparse = buildPecl { @@ -453,8 +440,6 @@ in postConfigure = '' echo "#define HAVE_MBSTRING 1" >> config.h ''; - - meta.maintainers = lib.teams.php.members; }; maxminddb = buildPecl rec { @@ -474,7 +459,7 @@ in meta = with pkgs.lib; { description = "C extension that is a drop-in replacement for MaxMind\\Db\\Reader"; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ ajs124 das_j ] ++ teams.php.members; + maintainers = with maintainers; [ ajs124 das_j ]; }; }; @@ -501,8 +486,6 @@ in nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = with pkgs; [ cyrus_sasl zlib ]; - - meta.maintainers = lib.teams.php.members; }; mongodb = buildPecl { @@ -520,8 +503,6 @@ in zlib pcre' ] ++ lib.optional (pkgs.stdenv.isDarwin) pkgs.darwin.apple_sdk.frameworks.Security; - - meta.maintainers = lib.teams.php.members; }; oci8 = buildPecl { @@ -535,8 +516,6 @@ in postPatch = '' sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 ''; - - meta.maintainers = lib.teams.php.members; }; pcov = buildPecl { @@ -546,8 +525,6 @@ in sha256 = "1psfwscrc025z8mziq69pcx60k4fbkqa5g2ia8lplb94mmarj0v1"; buildInputs = [ pcre' ]; - - meta.maintainers = lib.teams.php.members; }; pcs = buildPecl { @@ -556,7 +533,6 @@ in sha256 = "0d4p1gpl8gkzdiv860qzxfz250ryf0wmjgyc8qcaaqgkdyh5jy5p"; - meta.maintainers = lib.teams.php.members; meta.broken = isPhp74; # Build error }; @@ -572,10 +548,8 @@ in internalDeps = [ php.extensions.pdo ]; postPatch = '' - sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 - ''; - - meta.maintainers = lib.teams.php.members; + sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 + ''; }; pdo_sqlsrv = buildPecl { @@ -587,8 +561,6 @@ in internalDeps = [ php.extensions.pdo ]; buildInputs = [ pkgs.unixODBC ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ]; - - meta.maintainers = lib.teams.php.members; }; php_excel = buildPecl rec { @@ -604,8 +576,6 @@ in }; configureFlags = [ "--with-excel" "--with-libxl-incdir=${pkgs.libxl}/include_c" "--with-libxl-libdir=${pkgs.libxl}/lib" ]; - - meta.maintainers = lib.teams.php.members; }; pinba = let @@ -631,7 +601,6 @@ in statistics server for PHP using MySQL as a read-only interface. ''; homepage = "http://pinba.org/"; - maintainers = teams.php.members; }; }; @@ -649,7 +618,6 @@ in ''; license = licenses.bsd3; homepage = "https://developers.google.com/protocol-buffers/"; - maintainers = teams.php.members; }; }; @@ -685,8 +653,6 @@ in session ] ++ lib.optionals (lib.versionOlder php.version "7.4") [ hash ]; - - meta.maintainers = lib.teams.php.members; }; sqlsrv = buildPecl { @@ -696,8 +662,6 @@ in sha256 = "1kv4krk1w4hri99b0sdgwgy9c4y0yh217wx2y3irhkfi46kdrjnw"; buildInputs = [ pkgs.unixODBC ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ]; - - meta.maintainers = lib.teams.php.members; }; v8 = buildPecl { @@ -708,8 +672,6 @@ in buildInputs = [ pkgs.v8_6_x ]; configureFlags = [ "--with-v8=${pkgs.v8_6_x}" ]; - - meta.maintainers = lib.teams.php.members; meta.broken = true; }; @@ -721,8 +683,6 @@ in buildInputs = [ pkgs.v8_6_x ]; configureFlags = [ "--with-v8js=${pkgs.v8_6_x}" ]; - - meta.maintainers = lib.teams.php.members; meta.broken = true; }; @@ -736,8 +696,6 @@ in checkTarget = "test"; zendExtension = true; - - meta.maintainers = lib.teams.php.members; }; yaml = buildPecl { @@ -751,8 +709,6 @@ in ]; nativeBuildInputs = [ pkgs.pkgconfig ]; - - meta.maintainers = lib.teams.php.members; }; zmq = buildPecl { @@ -767,7 +723,6 @@ in nativeBuildInputs = [ pkgs.pkgconfig ]; - meta.maintainers = lib.teams.php.members; meta.broken = isPhp73; }; } // (let @@ -827,8 +782,6 @@ in --prune-empty-dirs \ . $dev/include/ ''; - - meta.maintainers = lib.teams.php.members; }); # This list contains build instructions for different modules that one may -- cgit v1.2.3 From d2fe77de339d9ee504a299fe90f34ae5337133b2 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 19 Apr 2020 20:47:42 +0200 Subject: maintainers/teams: Add php team --- maintainers/team-list.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 9fe952e5415..1fed6a4d9bf 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -43,6 +43,17 @@ with lib.maintainers; { scope = "Maintain GNOME desktop environment and platform."; }; + php = { + members = [ + aanderse + etu + globin + ma27 + talyz + ]; + scope = "Maintain PHP related packages and extensions."; + }; + podman = { members = [ adisbladis -- cgit v1.2.3 From 6d5b0b13f3365c79b3857badfffbcf0141f5d2ea Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 19 Apr 2020 20:48:06 +0200 Subject: php: Set maintainer team as maintainers Also passthrough the meta of the package to have description, homepage, license, maintainers and other metadata passed through to the commonly used attribute. --- pkgs/development/interpreters/php/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 4c79691f504..e0aea60e293 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -113,6 +113,7 @@ let unwrapped = php; tests = nixosTests.php; inherit (php-packages) packages extensions; + inherit (php) meta; }; paths = [ php ]; postBuild = '' @@ -246,7 +247,7 @@ let description = "An HTML-embedded scripting language"; homepage = "https://www.php.net/"; license = licenses.php301; - maintainers = with maintainers; [ globin etu ma27 ]; + maintainers = teams.php.members; platforms = platforms.all; outputsToInstall = [ "out" "dev" ]; }; -- cgit v1.2.3 From faa134cd435ceda7eea41fa57c3d6a1af7d62e90 Mon Sep 17 00:00:00 2001 From: hyperfekt Date: Sat, 11 Apr 2020 22:04:24 +0200 Subject: nym: init at 0.6.0 --- pkgs/applications/networking/nym/default.nix | 54 ++++++++++++++++++++++++++++ pkgs/applications/networking/nym/update.sh | 37 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 93 insertions(+) create mode 100644 pkgs/applications/networking/nym/default.nix create mode 100755 pkgs/applications/networking/nym/update.sh diff --git a/pkgs/applications/networking/nym/default.nix b/pkgs/applications/networking/nym/default.nix new file mode 100644 index 00000000000..6bb86c016ba --- /dev/null +++ b/pkgs/applications/networking/nym/default.nix @@ -0,0 +1,54 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkgconfig +, openssl +, libredirect +, writeText +}: + +rustPlatform.buildRustPackage rec { + pname = "nym"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "nymtech"; + repo = "nym"; + rev = "v${version}"; + sha256 = "1q9i24mzys6a9kp9n0bnxr3iwzblabmc6iif3ah75gffyf0cipk4"; + }; + + cargoSha256 = "0qas544bs4wyllvqf2r5mvqxs1nviwcvxa3rzq10dvjyjm1xyh3k"; + + nativeBuildInputs = [ pkgconfig ]; + + buildInputs = [ openssl ]; + + /* + Nym's test presence::converting_mixnode_presence_into_topology_mixnode::it_returns_resolved_ip_on_resolvable_hostname tries to resolve nymtech.net. + Since there is no external DNS resolution available in the build sandbox, we point cargo and its children (that's what we remove the 'unsetenv' call for) to a hosts file in which we statically resolve nymtech.net. + */ + preCheck = '' + export LD_PRELOAD=${libredirect.overrideAttrs (drv: { + postPatch = "sed -i -e /unsetenv/d libredirect.c"; + })}/lib/libredirect.so + export NIX_REDIRECTS=/etc/hosts=${writeText "nym_resolve_test_hosts" "127.0.0.1 nymtech.net"} + ''; + + postCheck = "unset NIX_REDIRECTS LD_PRELOAD"; + + + passthru.updateScript = ./update.sh; + + meta = with lib; { + description = "A mixnet providing IP-level privacy"; + longDescription = '' + Nym routes IP packets through other participating nodes to hide their source and destination. + In contrast with Tor, it prevents timing attacks at the cost of latency. + ''; + homepage = "https://nymtech.net"; + license = licenses.asl20; + maintainers = [ maintainers.ehmry ]; + platforms = with platforms; intersectLists (linux ++ darwin) (x86 ++ x86_64); # see https://github.com/nymtech/nym/issues/179 for architectures + }; +} diff --git a/pkgs/applications/networking/nym/update.sh b/pkgs/applications/networking/nym/update.sh new file mode 100755 index 00000000000..0c65521c7f8 --- /dev/null +++ b/pkgs/applications/networking/nym/update.sh @@ -0,0 +1,37 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq nix-prefetch + +# adapted from rust-analyzer + +set -euo pipefail +cd "$(dirname "$0")" +nixpkgs=../../../.. + +owner=$(sed -nE 's/.*\bowner = "(.*)".*/\1/p' ./default.nix) +repo=$(sed -nE 's/.*\brepo = "(.*)".*/\1/p' ./default.nix) +rev=$( + curl -s "https://api.github.com/repos/$owner/$repo/releases" | + jq 'map(select(.prerelease | not)) | .[0].tag_name' --raw-output +) +version=${rev:1} +old_version=$(sed -nE 's/.*\bversion = "(.*)".*/\1/p' ./default.nix) +if grep -q 'cargoSha256 = ""' ./default.nix; then + old_version='broken' +fi +if [[ "$version" == "$old_version" ]]; then + echo "Up to date: $version" + exit +fi +echo "$old_version -> $version" + +sha256=$(nix-prefetch -f "$nixpkgs" nym.src --rev "$rev") +# Clear cargoSha256 to avoid inconsistency. +sed -e "s/version = \".*\"/version = \"$version\"/" \ + -e "s/sha256 = \".*\"/sha256 = \"$sha256\"/" \ + -e "s/cargoSha256 = \".*\"/cargoSha256 = \"\"/" \ + --in-place ./default.nix + +echo "Prebuilding for cargoSha256" +cargo_sha256=$(nix-prefetch "{ sha256 }: (import $nixpkgs {}).nym.cargoDeps.overrideAttrs (_: { outputHash = sha256; })") +sed "s/cargoSha256 = \".*\"/cargoSha256 = \"$cargo_sha256\"/" \ + --in-place ./default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11c9ad361fd..882bea9b826 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5520,6 +5520,8 @@ in nylon = callPackage ../tools/networking/nylon { }; + nym = callPackage ../applications/networking/nym { }; + nzbget = callPackage ../tools/networking/nzbget { }; oathToolkit = callPackage ../tools/security/oath-toolkit { }; -- cgit v1.2.3 From ed12b30bee39d5b8748ca5a94180ff1a181d6247 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 19 Apr 2020 20:51:34 +0200 Subject: php.extensions: Add php maintainer team to all extensions --- pkgs/top-level/php-packages.nix | 48 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index b9247cf0a17..be9c7a5ad13 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -309,6 +309,8 @@ in checkFlagsArray = ["REPORT_EXIT_STATUS=1" "NO_INTERACTION=1"]; makeFlags = [ "phpincludedir=$(dev)/include" ]; outputs = [ "out" "dev" ]; + + meta.maintainers = lib.teams.php.members; }; apcu_bc = buildPecl { @@ -321,6 +323,8 @@ in php.extensions.apcu pcre' ]; + + meta.maintainers = lib.teams.php.members; }; ast = buildPecl { @@ -328,6 +332,8 @@ in pname = "ast"; sha256 = "16c5isldm4csjbcvz1qk2mmrhgvh24sxsp6w6f5a37xpa3vciawp"; + + meta.maintainers = lib.teams.php.members; }; couchbase = buildPecl rec { @@ -375,6 +381,7 @@ in '') ]; + meta.maintainers = lib.teams.php.members; meta.broken = isPhp74; # Build error }; @@ -407,6 +414,7 @@ in ''; license = licenses.php301; homepage = "https://bitbucket.org/osmanov/pecl-event/"; + maintainers = teams.php.members; }; }; @@ -419,6 +427,8 @@ in configureFlags = [ "--enable-igbinary" ]; makeFlags = [ "phpincludedir=$(dev)/include" ]; outputs = [ "out" "dev" ]; + + meta.maintainers = lib.teams.php.members; }; imagick = buildPecl { @@ -430,6 +440,8 @@ in configureFlags = [ "--with-imagick=${pkgs.imagemagick.dev}" ]; nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = [ pcre' ]; + + meta.maintainers = lib.teams.php.members; }; mailparse = buildPecl { @@ -441,6 +453,8 @@ in postConfigure = '' echo "#define HAVE_MBSTRING 1" >> config.h ''; + + meta.maintainers = lib.teams.php.members; }; maxminddb = buildPecl rec { @@ -460,7 +474,7 @@ in meta = with pkgs.lib; { description = "C extension that is a drop-in replacement for MaxMind\\Db\\Reader"; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ ajs124 das_j ]; + maintainers = with maintainers; [ ajs124 das_j ] ++ teams.php.members; }; }; @@ -487,6 +501,8 @@ in nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = with pkgs; [ cyrus_sasl zlib ]; + + meta.maintainers = lib.teams.php.members; }; mongodb = buildPecl { @@ -504,6 +520,8 @@ in zlib pcre' ] ++ lib.optional (pkgs.stdenv.isDarwin) pkgs.darwin.apple_sdk.frameworks.Security; + + meta.maintainers = lib.teams.php.members; }; oci8 = buildPecl { @@ -517,6 +535,8 @@ in postPatch = '' sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 ''; + + meta.maintainers = lib.teams.php.members; }; pcov = buildPecl { @@ -526,6 +546,8 @@ in sha256 = "1psfwscrc025z8mziq69pcx60k4fbkqa5g2ia8lplb94mmarj0v1"; buildInputs = [ pcre' ]; + + meta.maintainers = lib.teams.php.members; }; pcs = buildPecl { @@ -534,6 +556,7 @@ in sha256 = "0d4p1gpl8gkzdiv860qzxfz250ryf0wmjgyc8qcaaqgkdyh5jy5p"; + meta.maintainers = lib.teams.php.members; meta.broken = isPhp74; # Build error }; @@ -551,6 +574,8 @@ in postPatch = '' sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 ''; + + meta.maintainers = lib.teams.php.members; }; pdo_sqlsrv = buildPecl { @@ -562,6 +587,8 @@ in internalDeps = [ php.extensions.pdo ]; buildInputs = [ pkgs.unixODBC ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ]; + + meta.maintainers = lib.teams.php.members; }; php_excel = buildPecl rec { @@ -577,6 +604,8 @@ in }; configureFlags = [ "--with-excel" "--with-libxl-incdir=${pkgs.libxl}/include_c" "--with-libxl-libdir=${pkgs.libxl}/lib" ]; + + meta.maintainers = lib.teams.php.members; }; pinba = let @@ -602,6 +631,7 @@ in statistics server for PHP using MySQL as a read-only interface. ''; homepage = "http://pinba.org/"; + maintainers = teams.php.members; }; }; @@ -619,6 +649,7 @@ in ''; license = licenses.bsd3; homepage = "https://developers.google.com/protocol-buffers/"; + maintainers = teams.php.members; }; }; @@ -654,6 +685,8 @@ in session ] ++ lib.optionals (lib.versionOlder php.version "7.4") [ hash ]; + + meta.maintainers = lib.teams.php.members; }; sqlsrv = buildPecl { @@ -663,6 +696,8 @@ in sha256 = "1kv4krk1w4hri99b0sdgwgy9c4y0yh217wx2y3irhkfi46kdrjnw"; buildInputs = [ pkgs.unixODBC ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ]; + + meta.maintainers = lib.teams.php.members; }; v8 = buildPecl { @@ -673,6 +708,8 @@ in buildInputs = [ pkgs.v8_6_x ]; configureFlags = [ "--with-v8=${pkgs.v8_6_x}" ]; + + meta.maintainers = lib.teams.php.members; meta.broken = true; }; @@ -684,6 +721,8 @@ in buildInputs = [ pkgs.v8_6_x ]; configureFlags = [ "--with-v8js=${pkgs.v8_6_x}" ]; + + meta.maintainers = lib.teams.php.members; meta.broken = true; }; @@ -697,6 +736,8 @@ in checkTarget = "test"; zendExtension = true; + + meta.maintainers = lib.teams.php.members; }; yaml = buildPecl { @@ -710,6 +751,8 @@ in ]; nativeBuildInputs = [ pkgs.pkgconfig ]; + + meta.maintainers = lib.teams.php.members; }; zmq = buildPecl { @@ -724,6 +767,7 @@ in nativeBuildInputs = [ pkgs.pkgconfig ]; + meta.maintainers = lib.teams.php.members; meta.broken = isPhp73; }; } // (let @@ -783,6 +827,8 @@ in --prune-empty-dirs \ . $dev/include/ ''; + + meta.maintainers = lib.teams.php.members; }); # This list contains build instructions for different modules that one may -- cgit v1.2.3 From 0b04a477a1c562afaf415463f5f9611c456b8721 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 19 Apr 2020 20:51:57 +0200 Subject: php.packages: Add php maintainer team to all packages --- pkgs/top-level/php-packages.nix | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index be9c7a5ad13..a15ca794cac 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -52,7 +52,7 @@ in description = "An application for building and managing Phars"; license = licenses.mit; homepage = "https://box-project.github.io/box2/"; - maintainers = with maintainers; [ jtojnar ]; + maintainers = with maintainers; [ jtojnar ] ++ teams.php.members; }; }; @@ -81,7 +81,7 @@ in description = "Dependency Manager for PHP"; license = licenses.mit; homepage = "https://getcomposer.org/"; - maintainers = with maintainers; [ globin offline ]; + maintainers = with maintainers; [ offline ] ++ teams.php.members; }; }; @@ -108,7 +108,7 @@ in description = "A tool to automatically fix PHP coding standards issues"; license = licenses.mit; homepage = "http://cs.sensiolabs.org/"; - maintainers = with maintainers; [ jtojnar ]; + maintainers = with maintainers; [ jtojnar ] ++ teams.php.members; }; }; @@ -145,7 +145,7 @@ in description = "This tool check syntax of PHP files faster than serial check with fancier output"; license = licenses.bsd2; homepage = "https://github.com/JakubOnderka/PHP-Parallel-Lint"; - maintainers = with maintainers; [ jtojnar ]; + maintainers = with maintainers; [ jtojnar ] ++ teams.php.members; }; }; @@ -172,7 +172,7 @@ in description = "PHP coding standard beautifier and fixer"; license = licenses.bsd3; homepage = "https://squizlabs.github.io/PHP_CodeSniffer/"; - maintainers = with maintainers; [ cmcdragonkai etu ]; + maintainers = with maintainers; [ cmcdragonkai ] ++ teams.php.members; }; }; @@ -199,7 +199,7 @@ in description = "PHP coding standard tool"; license = licenses.bsd3; homepage = "https://squizlabs.github.io/PHP_CodeSniffer/"; - maintainers = with maintainers; [ javaguirre etu ]; + maintainers = with maintainers; [ javaguirre ] ++ teams.php.members; }; }; @@ -225,15 +225,15 @@ in meta = with pkgs.lib; { description = "PHP Static Analysis Tool"; longDescription = '' - PHPStan focuses on finding errors in your code without actually running - it. It catches whole classes of bugs even before you write tests for the - code. It moves PHP closer to compiled languages in the sense that the - correctness of each line of the code can be checked before you run the - actual line. - ''; + PHPStan focuses on finding errors in your code without actually + running it. It catches whole classes of bugs even before you write + tests for the code. It moves PHP closer to compiled languages in the + sense that the correctness of each line of the code can be checked + before you run the actual line. + ''; license = licenses.mit; homepage = "https://github.com/phpstan/phpstan"; - maintainers = with maintainers; [ etu ]; + maintainers = teams.php.members; }; }; @@ -260,6 +260,7 @@ in description = "A static analysis tool for finding errors in PHP applications"; license = licenses.mit; homepage = "https://github.com/vimeo/psalm"; + maintainers = teams.php.members; }; }; @@ -286,7 +287,7 @@ in description = "PsySH is a runtime developer console, interactive debugger and REPL for PHP."; license = licenses.mit; homepage = "https://psysh.org/"; - maintainers = with maintainers; [ caugner ]; + maintainers = with maintainers; [ caugner ] ++ teams.php.members; }; }; }; -- cgit v1.2.3 From 3e10bd8762230ce9f7a685b610e49fc439547e04 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 19 Apr 2020 20:56:42 +0200 Subject: nixosTests.php: Add maintainer team as maintainers --- nixos/tests/php/fpm.nix | 4 ++-- nixos/tests/php/httpd.nix | 4 ++-- nixos/tests/php/pcre.nix | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/nixos/tests/php/fpm.nix b/nixos/tests/php/fpm.nix index 1e4ced24b6c..513abd94373 100644 --- a/nixos/tests/php/fpm.nix +++ b/nixos/tests/php/fpm.nix @@ -1,6 +1,6 @@ -import ../make-test-python.nix ({pkgs, ...}: { +import ../make-test-python.nix ({pkgs, lib, ...}: { name = "php-fpm-nginx-test"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ etu ]; + meta.maintainers = lib.teams.php.members; machine = { config, lib, pkgs, ... }: { services.nginx = { diff --git a/nixos/tests/php/httpd.nix b/nixos/tests/php/httpd.nix index fc3ff986734..1092e0ecadd 100644 --- a/nixos/tests/php/httpd.nix +++ b/nixos/tests/php/httpd.nix @@ -1,6 +1,6 @@ -import ../make-test-python.nix ({pkgs, ...}: { +import ../make-test-python.nix ({pkgs, lib, ...}: { name = "php-httpd-test"; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ etu ]; + meta.maintainers = lib.teams.php.members; machine = { config, lib, pkgs, ... }: { services.httpd = { diff --git a/nixos/tests/php/pcre.nix b/nixos/tests/php/pcre.nix index 016dca81d52..3dd0964e60f 100644 --- a/nixos/tests/php/pcre.nix +++ b/nixos/tests/php/pcre.nix @@ -1,7 +1,9 @@ let testString = "can-use-subgroups"; -in import ../make-test-python.nix ({ ...}: { +in import ../make-test-python.nix ({lib, ...}: { name = "php-httpd-pcre-jit-test"; + meta.maintainers = lib.teams.php.members; + machine = { lib, pkgs, ... }: { time.timeZone = "UTC"; services.httpd = { -- cgit v1.2.3 From 338205d61ed99b9778535137b99cddf895eca629 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sun, 19 Apr 2020 20:58:18 +0200 Subject: codeowners: Add etu as owner of php tests --- .github/CODEOWNERS | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index e37a4de9d07..7c39ce48a3f 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -176,6 +176,7 @@ # PHP /doc/languages-frameworks/php.section.md @etu +/nixos/tests/php @etu +/pkgs/build-support/build-pecl.nix @etu /pkgs/development/interpreters/php @etu /pkgs/top-level/php-packages.nix @etu -/pkgs/build-support/build-pecl.nix @etu -- cgit v1.2.3 From 5abed165e076f96207f6c38d0b1584610c10c22d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 25 Apr 2020 14:01:05 -0300 Subject: lxqt: format nix expressions with nixpkgs-fmt --- pkgs/desktops/lxqt/compton-conf/default.nix | 14 ++++- pkgs/desktops/lxqt/default.nix | 65 +++++++++++----------- pkgs/desktops/lxqt/libfm-qt/default.nix | 17 ++++-- pkgs/desktops/lxqt/liblxqt/default.nix | 15 ++++- pkgs/desktops/lxqt/libqtxdg/default.nix | 19 ++++++- pkgs/desktops/lxqt/libsysstat/default.nix | 17 +++++- pkgs/desktops/lxqt/lximage-qt/default.nix | 16 +++++- pkgs/desktops/lxqt/lxqt-about/default.nix | 13 ++++- pkgs/desktops/lxqt/lxqt-admin/default.nix | 14 ++++- pkgs/desktops/lxqt/lxqt-archiver/default.nix | 13 ++++- pkgs/desktops/lxqt/lxqt-build-tools/default.nix | 22 +++++++- pkgs/desktops/lxqt/lxqt-config/default.nix | 19 ++++++- pkgs/desktops/lxqt/lxqt-globalkeys/default.nix | 14 ++++- pkgs/desktops/lxqt/lxqt-notificationd/default.nix | 14 ++++- .../desktops/lxqt/lxqt-openssh-askpass/default.nix | 14 ++++- pkgs/desktops/lxqt/lxqt-panel/default.nix | 34 ++++++++--- pkgs/desktops/lxqt/lxqt-policykit/default.nix | 19 +++++-- .../desktops/lxqt/lxqt-powermanagement/default.nix | 16 +++++- pkgs/desktops/lxqt/lxqt-qtplugin/default.nix | 16 ++++-- pkgs/desktops/lxqt/lxqt-runner/default.nix | 20 ++++++- pkgs/desktops/lxqt/lxqt-session/default.nix | 17 +++++- pkgs/desktops/lxqt/lxqt-sudo/default.nix | 15 ++++- pkgs/desktops/lxqt/lxqt-themes/default.nix | 7 ++- pkgs/desktops/lxqt/obconf-qt/default.nix | 15 ++++- pkgs/desktops/lxqt/pavucontrol-qt/default.nix | 14 ++++- pkgs/desktops/lxqt/pcmanfm-qt/default.nix | 15 ++++- pkgs/desktops/lxqt/qlipper/default.nix | 17 +++++- pkgs/desktops/lxqt/qps/default.nix | 24 ++++++-- pkgs/desktops/lxqt/qterminal/default.nix | 12 +++- pkgs/desktops/lxqt/qtermwidget/default.nix | 19 ++++++- pkgs/desktops/lxqt/screengrab/default.nix | 15 ++++- 31 files changed, 458 insertions(+), 103 deletions(-) diff --git a/pkgs/desktops/lxqt/compton-conf/default.nix b/pkgs/desktops/lxqt/compton-conf/default.nix index fe44b707f76..30b4dd95a67 100644 --- a/pkgs/desktops/lxqt/compton-conf/default.nix +++ b/pkgs/desktops/lxqt/compton-conf/default.nix @@ -1,5 +1,13 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, lxqt, - libconfig }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, qtbase +, qttools +, lxqt +, libconfig +}: mkDerivation rec { pname = "compton-conf"; @@ -27,7 +35,7 @@ mkDerivation rec { preConfigure = '' substituteInPlace autostart/CMakeLists.txt \ --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \ - ''; + ''; meta = with lib; { description = "GUI configuration tool for compton X composite manager"; diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index 6b03c2a6c9e..b3c38a8e4fa 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -1,5 +1,4 @@ { pkgs, makeScope, libsForQt5 }: - let packages = self: with self; { @@ -7,42 +6,42 @@ let # - https://github.com/lxqt/lxqt/wiki/Building-from-source ### BASE - libqtxdg = callPackage ./libqtxdg { }; - lxqt-build-tools = callPackage ./lxqt-build-tools { }; - libsysstat = callPackage ./libsysstat { }; - liblxqt = callPackage ./liblxqt { }; + libqtxdg = callPackage ./libqtxdg {}; + lxqt-build-tools = callPackage ./lxqt-build-tools {}; + libsysstat = callPackage ./libsysstat {}; + liblxqt = callPackage ./liblxqt {}; ### CORE 1 - libfm-qt = callPackage ./libfm-qt { }; - lxqt-about = callPackage ./lxqt-about { }; - lxqt-admin = callPackage ./lxqt-admin { }; - lxqt-config = callPackage ./lxqt-config { }; - lxqt-globalkeys = callPackage ./lxqt-globalkeys { }; - lxqt-notificationd = callPackage ./lxqt-notificationd { }; - lxqt-openssh-askpass = callPackage ./lxqt-openssh-askpass { }; - lxqt-policykit = callPackage ./lxqt-policykit { }; - lxqt-powermanagement = callPackage ./lxqt-powermanagement { }; - lxqt-qtplugin = callPackage ./lxqt-qtplugin { }; - lxqt-session = callPackage ./lxqt-session { }; - lxqt-sudo = callPackage ./lxqt-sudo { }; - lxqt-themes = callPackage ./lxqt-themes { }; - pavucontrol-qt = libsForQt5.callPackage ./pavucontrol-qt { }; - qtermwidget = callPackage ./qtermwidget { }; + libfm-qt = callPackage ./libfm-qt {}; + lxqt-about = callPackage ./lxqt-about {}; + lxqt-admin = callPackage ./lxqt-admin {}; + lxqt-config = callPackage ./lxqt-config {}; + lxqt-globalkeys = callPackage ./lxqt-globalkeys {}; + lxqt-notificationd = callPackage ./lxqt-notificationd {}; + lxqt-openssh-askpass = callPackage ./lxqt-openssh-askpass {}; + lxqt-policykit = callPackage ./lxqt-policykit {}; + lxqt-powermanagement = callPackage ./lxqt-powermanagement {}; + lxqt-qtplugin = callPackage ./lxqt-qtplugin {}; + lxqt-session = callPackage ./lxqt-session {}; + lxqt-sudo = callPackage ./lxqt-sudo {}; + lxqt-themes = callPackage ./lxqt-themes {}; + pavucontrol-qt = libsForQt5.callPackage ./pavucontrol-qt {}; + qtermwidget = callPackage ./qtermwidget {}; ### CORE 2 - lxqt-panel = callPackage ./lxqt-panel { }; - lxqt-runner = callPackage ./lxqt-runner { }; - pcmanfm-qt = callPackage ./pcmanfm-qt { }; + lxqt-panel = callPackage ./lxqt-panel {}; + lxqt-runner = callPackage ./lxqt-runner {}; + pcmanfm-qt = callPackage ./pcmanfm-qt {}; ### OPTIONAL - qterminal = callPackage ./qterminal { }; - compton-conf = pkgs.qt5.callPackage ./compton-conf { }; - obconf-qt = callPackage ./obconf-qt { }; - lximage-qt = callPackage ./lximage-qt { }; - qps = callPackage ./qps { }; - screengrab = callPackage ./screengrab { }; - qlipper = callPackage ./qlipper { }; - lxqt-archiver = callPackage ./lxqt-archiver { }; + qterminal = callPackage ./qterminal {}; + compton-conf = pkgs.qt5.callPackage ./compton-conf {}; + obconf-qt = callPackage ./obconf-qt {}; + lximage-qt = callPackage ./lximage-qt {}; + qps = callPackage ./qps {}; + screengrab = callPackage ./screengrab {}; + qlipper = callPackage ./qlipper {}; + lxqt-archiver = callPackage ./lxqt-archiver {}; preRequisitePackages = [ pkgs.gvfs # virtual file systems support for PCManFM-QT @@ -107,5 +106,5 @@ let ]; }; - -in makeScope libsForQt5.newScope packages +in +makeScope libsForQt5.newScope packages diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix index d383b46a9ae..f0c2c232786 100644 --- a/pkgs/desktops/lxqt/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/libfm-qt/default.nix @@ -1,7 +1,16 @@ -{ - lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, - pcre, libexif, xorg, libfm, menu-cache, - qtx11extras, qttools +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, lxqt-build-tools +, pcre +, libexif +, xorg +, libfm +, menu-cache +, qtx11extras +, qttools }: mkDerivation rec { diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix index ec7fe0a7665..2c69642f84f 100644 --- a/pkgs/desktops/lxqt/liblxqt/default.nix +++ b/pkgs/desktops/lxqt/liblxqt/default.nix @@ -1,5 +1,16 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, - qttools, qtsvg, libqtxdg, polkit-qt, kwindowsystem, xorg }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtx11extras +, qttools +, qtsvg +, libqtxdg +, polkit-qt +, kwindowsystem +, xorg +}: mkDerivation rec { pname = "liblxqt"; diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix index 14bb21e1469..6009047d823 100644 --- a/pkgs/desktops/lxqt/libqtxdg/default.nix +++ b/pkgs/desktops/lxqt/libqtxdg/default.nix @@ -1,4 +1,11 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qtsvg, lxqt-build-tools }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, qtbase +, qtsvg +, lxqt-build-tools +}: mkDerivation rec { pname = "libqtxdg"; @@ -11,9 +18,15 @@ mkDerivation rec { sha256 = "16jqnpc740a6phq7vcgy85hl7253yzyw4m5h71r0vijk79ir73b5"; }; - nativeBuildInputs = [ cmake lxqt-build-tools ]; + nativeBuildInputs = [ + cmake + lxqt-build-tools + ]; - buildInputs = [ qtbase qtsvg ]; + buildInputs = [ + qtbase + qtsvg + ]; preConfigure = '' cmakeFlagsArray+=( diff --git a/pkgs/desktops/lxqt/libsysstat/default.nix b/pkgs/desktops/lxqt/libsysstat/default.nix index 0e63d32c746..cfbf7c3c72e 100644 --- a/pkgs/desktops/lxqt/libsysstat/default.nix +++ b/pkgs/desktops/lxqt/libsysstat/default.nix @@ -1,4 +1,10 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, lxqt-build-tools }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, qtbase +, lxqt-build-tools +}: mkDerivation rec { pname = "libsysstat"; @@ -11,9 +17,14 @@ mkDerivation rec { sha256 = "10h9n7km7yx8bnmzxi4nn1yqq03hizjkrx4745j0mczy7niiffsz"; }; - nativeBuildInputs = [ cmake lxqt-build-tools ]; + nativeBuildInputs = [ + cmake + lxqt-build-tools + ]; - buildInputs = [ qtbase ]; + buildInputs = [ + qtbase + ]; meta = with lib; { description = "Library used to query system info and statistics"; diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix index e47a9ec1b48..0a1cf72e452 100644 --- a/pkgs/desktops/lxqt/lximage-qt/default.nix +++ b/pkgs/desktops/lxqt/lximage-qt/default.nix @@ -1,5 +1,17 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, - qtx11extras, qtsvg, xorg, lxqt-build-tools, libfm-qt, libexif }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, qtbase +, qttools +, qtx11extras +, qtsvg +, xorg +, lxqt-build-tools +, libfm-qt +, libexif +}: mkDerivation rec { pname = "lximage-qt"; diff --git a/pkgs/desktops/lxqt/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix index 19a06925b3e..a6df2c1f321 100644 --- a/pkgs/desktops/lxqt/lxqt-about/default.nix +++ b/pkgs/desktops/lxqt/lxqt-about/default.nix @@ -1,4 +1,15 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtx11extras +, qttools +, qtsvg +, kwindowsystem +, liblxqt +, libqtxdg +}: mkDerivation rec { pname = "lxqt-about"; diff --git a/pkgs/desktops/lxqt/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix index 0a9ef8cfb84..db78f66e36a 100644 --- a/pkgs/desktops/lxqt/lxqt-admin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-admin/default.nix @@ -1,4 +1,16 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtx11extras, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, polkit-qt }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtx11extras +, qttools +, qtsvg +, kwindowsystem +, liblxqt +, libqtxdg +, polkit-qt +}: mkDerivation rec { pname = "lxqt-admin"; diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix index 2c4d040a432..481e2faad44 100644 --- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix +++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix @@ -1,4 +1,15 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, json-glib, libfm-qt, qtbase, qttools, qtx11extras }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, lxqt-build-tools +, json-glib +, libfm-qt +, qtbase +, qttools +, qtx11extras +}: mkDerivation rec { # pname = "lxqt-archiver"; diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix index d06cb7be928..559695bfa30 100644 --- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix +++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix @@ -1,4 +1,12 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, pcre, qtbase, glib }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, pcre +, qtbase +, glib +}: mkDerivation rec { pname = "lxqt-build-tools"; @@ -11,9 +19,17 @@ mkDerivation rec { sha256 = "0i7m9s4g5rsw28vclc9nh0zcapx85cqfwxkx7rrw7wa12svy7pm2"; }; - nativeBuildInputs = [ cmake pkgconfig setupHook ]; + nativeBuildInputs = [ + cmake + pkgconfig + setupHook + ]; - buildInputs = [ qtbase glib pcre ]; + buildInputs = [ + qtbase + glib + pcre + ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix index 41fe965161d..11629bfad4b 100644 --- a/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -1,6 +1,19 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, - qtx11extras, qttools, qtsvg, kwindowsystem, libkscreen, liblxqt, - libqtxdg, xorg }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, lxqt-build-tools +, qtbase +, qtx11extras +, qttools +, qtsvg +, kwindowsystem +, libkscreen +, liblxqt +, libqtxdg +, xorg +}: mkDerivation rec { pname = "lxqt-config"; diff --git a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix index ca760d2a090..b6d8a06a0a6 100644 --- a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix +++ b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix @@ -1,4 +1,16 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtbase +, qttools +, qtx11extras +, qtsvg +, kwindowsystem +, liblxqt +, libqtxdg +}: mkDerivation rec { pname = "lxqt-globalkeys"; diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix index 5790be3c77f..913ba88cc74 100644 --- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix +++ b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix @@ -1,4 +1,16 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, qtx11extras }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtbase +, qttools +, qtsvg +, kwindowsystem +, liblxqt +, libqtxdg +, qtx11extras +}: mkDerivation rec { pname = "lxqt-notificationd"; diff --git a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix index 26730f57b43..87b2f5f325c 100644 --- a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix +++ b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix @@ -1,4 +1,16 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtbase +, qttools +, qtsvg +, qtx11extras +, kwindowsystem +, liblxqt +, libqtxdg +}: mkDerivation rec { pname = "lxqt-openssh-askpass"; diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix index 57938a5f521..f6302e37f06 100644 --- a/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -1,10 +1,30 @@ -{ - lib, mkDerivation, fetchFromGitHub, - cmake, pkgconfig, lxqt-build-tools, - qtbase, qttools, qtx11extras, qtsvg, libdbusmenu, kwindowsystem, solid, - kguiaddons, liblxqt, libqtxdg, lxqt-globalkeys, libsysstat, - xorg, libstatgrab, lm_sensors, libpulseaudio, alsaLib, menu-cache, - lxmenu-data, pcre, libXdamage +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, lxqt-build-tools +, qtbase +, qttools +, qtx11extras +, qtsvg +, libdbusmenu +, kwindowsystem +, solid +, kguiaddons +, liblxqt +, libqtxdg +, lxqt-globalkeys +, libsysstat +, xorg +, libstatgrab +, lm_sensors +, libpulseaudio +, alsaLib +, menu-cache +, lxmenu-data +, pcre +, libXdamage }: mkDerivation rec { diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix index 33a2d517fa4..13392e8ce0c 100644 --- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix +++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix @@ -1,7 +1,18 @@ -{ - lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, - qtbase, qttools, qtx11extras, qtsvg, polkit-qt, kwindowsystem, liblxqt, - libqtxdg, pcre +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, lxqt-build-tools +, qtbase +, qttools +, qtx11extras +, qtsvg +, polkit-qt +, kwindowsystem +, liblxqt +, libqtxdg +, pcre }: mkDerivation rec { diff --git a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix index 997a9cda3d9..d0922d51cc6 100644 --- a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix +++ b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix @@ -1,4 +1,18 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, solid, kidletime, liblxqt, libqtxdg }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtbase +, qttools +, qtx11extras +, qtsvg +, kwindowsystem +, solid +, kidletime +, liblxqt +, libqtxdg +}: mkDerivation rec { pname = "lxqt-powermanagement"; diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix index abb09aae838..25b752def23 100644 --- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix @@ -1,7 +1,15 @@ -{ - lib, mkDerivation, fetchFromGitHub, - cmake, lxqt-build-tools, - qtbase, qtx11extras, qttools, qtsvg, libdbusmenu, libqtxdg, libfm-qt +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtbase +, qtx11extras +, qttools +, qtsvg +, libdbusmenu +, libqtxdg +, libfm-qt }: mkDerivation rec { diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix index e4f39184ffd..03e6538c21c 100644 --- a/pkgs/desktops/lxqt/lxqt-runner/default.nix +++ b/pkgs/desktops/lxqt/lxqt-runner/default.nix @@ -1,5 +1,21 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, kwindowsystem, liblxqt, libqtxdg, lxqt-globalkeys, qtx11extras, -menu-cache, muparser, pcre }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, lxqt-build-tools +, qtbase +, qttools +, qtsvg +, kwindowsystem +, liblxqt +, libqtxdg +, lxqt-globalkeys +, qtx11extras +, menu-cache +, muparser +, pcre +}: mkDerivation rec { pname = "lxqt-runner"; diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix index 0493dd9fbb1..74ce0afd892 100644 --- a/pkgs/desktops/lxqt/lxqt-session/default.nix +++ b/pkgs/desktops/lxqt/lxqt-session/default.nix @@ -1,4 +1,19 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt-build-tools, qtbase, qttools, qtsvg, qtx11extras, kwindowsystem, liblxqt, libqtxdg, xorg, xdg-user-dirs }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, lxqt-build-tools +, qtbase +, qttools +, qtsvg +, qtx11extras +, kwindowsystem +, liblxqt +, libqtxdg +, xorg +, xdg-user-dirs +}: mkDerivation rec { pname = "lxqt-session"; diff --git a/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix index 9c76f0383b5..ef85a9a45e2 100644 --- a/pkgs/desktops/lxqt/lxqt-sudo/default.nix +++ b/pkgs/desktops/lxqt/lxqt-sudo/default.nix @@ -1,4 +1,17 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, liblxqt, libqtxdg, sudo }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtbase +, qttools +, qtx11extras +, qtsvg +, kwindowsystem +, liblxqt +, libqtxdg +, sudo +}: mkDerivation rec { pname = "lxqt-sudo"; diff --git a/pkgs/desktops/lxqt/lxqt-themes/default.nix b/pkgs/desktops/lxqt/lxqt-themes/default.nix index 1cc56d62a06..d00c91f51a8 100644 --- a/pkgs/desktops/lxqt/lxqt-themes/default.nix +++ b/pkgs/desktops/lxqt/lxqt-themes/default.nix @@ -1,4 +1,9 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +}: mkDerivation rec { pname = "lxqt-themes"; diff --git a/pkgs/desktops/lxqt/obconf-qt/default.nix b/pkgs/desktops/lxqt/obconf-qt/default.nix index 1b1e2e92b0f..52574ea3bad 100644 --- a/pkgs/desktops/lxqt/obconf-qt/default.nix +++ b/pkgs/desktops/lxqt/obconf-qt/default.nix @@ -1,5 +1,16 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, pcre, qtbase, qttools, - qtx11extras, xorg, lxqt-build-tools, openbox }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, pcre +, qtbase +, qttools +, qtx11extras +, xorg +, lxqt-build-tools +, openbox +}: mkDerivation rec { pname = "obconf-qt"; diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix index 308077bc099..3eff3ec7fe3 100644 --- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix +++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix @@ -1,5 +1,15 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt, libpulseaudio, - pcre, qtbase, qttools, qtx11extras }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, lxqt +, libpulseaudio +, pcre +, qtbase +, qttools +, qtx11extras +}: mkDerivation rec { pname = "pavucontrol-qt"; diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix index b294cdf52ab..1ac853bd701 100644 --- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix +++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix @@ -1,5 +1,16 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, lxqt, qtbase, qttools, - qtx11extras, libfm-qt, menu-cache, lxmenu-data }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, lxqt +, qtbase +, qttools +, qtx11extras +, libfm-qt +, menu-cache +, lxmenu-data +}: mkDerivation rec { pname = "pcmanfm-qt"; diff --git a/pkgs/desktops/lxqt/qlipper/default.nix b/pkgs/desktops/lxqt/qlipper/default.nix index d5da4737f8f..ce32f8e9123 100644 --- a/pkgs/desktops/lxqt/qlipper/default.nix +++ b/pkgs/desktops/lxqt/qlipper/default.nix @@ -1,4 +1,10 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qttools }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, qtbase +, qttools +}: mkDerivation rec { pname = "qlipper"; @@ -11,9 +17,14 @@ mkDerivation rec { sha256 = "0vlm4ab9isi7i2bimnyrk6083j2dfdrs14qj59vjcjri7mcwmf76"; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + ]; - buildInputs = [ qtbase qttools ]; + buildInputs = [ + qtbase + qttools + ]; meta = with lib; { description = "Cross-platform clipboard history applet"; diff --git a/pkgs/desktops/lxqt/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix index cba01522de0..f68cadea9a2 100644 --- a/pkgs/desktops/lxqt/qps/default.nix +++ b/pkgs/desktops/lxqt/qps/default.nix @@ -1,5 +1,12 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qtx11extras, qttools, - lxqt-build-tools }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, qtbase +, qtx11extras +, qttools +, lxqt-build-tools +}: mkDerivation rec { pname = "qps"; @@ -12,15 +19,22 @@ mkDerivation rec { sha256 = "03rl59yk3b24j0y0k8dpdpb3yi4f1l642zn5pp5br3s2vwx1vzkg"; }; - nativeBuildInputs = [ cmake lxqt-build-tools ]; + nativeBuildInputs = [ + cmake + lxqt-build-tools + ]; - buildInputs = [ qtbase qtx11extras qttools ]; + buildInputs = [ + qtbase + qtx11extras + qttools + ]; meta = with lib; { description = "Qt based process manager"; homepage = "https://github.com/lxqt/qps"; license = licenses.gpl2; - platforms = with platforms; linux; # does not build on darwin + platforms = with platforms; linux; # does not build on darwin maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix index 2b4844654b0..02464cc3e4d 100644 --- a/pkgs/desktops/lxqt/qterminal/default.nix +++ b/pkgs/desktops/lxqt/qterminal/default.nix @@ -1,5 +1,13 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, lxqt-build-tools, qtermwidget, - qtbase, qttools, qtx11extras }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, lxqt-build-tools +, qtermwidget +, qtbase +, qttools +, qtx11extras +}: mkDerivation rec { pname = "qterminal"; diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix index d20d4445c25..900aec9db8a 100644 --- a/pkgs/desktops/lxqt/qtermwidget/default.nix +++ b/pkgs/desktops/lxqt/qtermwidget/default.nix @@ -1,4 +1,11 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, qtbase, qttools, lxqt-build-tools }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, qtbase +, qttools +, lxqt-build-tools +}: mkDerivation rec { pname = "qtermwidget"; @@ -11,9 +18,15 @@ mkDerivation rec { sha256 = "1pz8dwb86jpga4vfyn5v9n2s6dx3zh74yfp1kjsmsmhf878zs6lv"; }; - nativeBuildInputs = [ cmake lxqt-build-tools ]; + nativeBuildInputs = [ + cmake + lxqt-build-tools + ]; - buildInputs = [ qtbase qttools ]; + buildInputs = [ + qtbase + qttools + ]; meta = with lib; { description = "A terminal emulator widget for Qt 5"; diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix index 7eff539091f..99d6af06d4f 100644 --- a/pkgs/desktops/lxqt/screengrab/default.nix +++ b/pkgs/desktops/lxqt/screengrab/default.nix @@ -1,4 +1,17 @@ -{ lib, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, qttools, qtx11extras, qtsvg, kwindowsystem, libqtxdg, xorg, autoPatchelfHook }: +{ lib +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, qtbase +, qttools +, qtx11extras +, qtsvg +, kwindowsystem +, libqtxdg +, xorg +, autoPatchelfHook +}: mkDerivation rec { pname = "screengrab"; -- cgit v1.2.3 From d50107d17bc861120dcbcc073c5bbdc9454d825d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 26 Apr 2020 11:34:17 -0300 Subject: lxqt: add update script tailored to LXQt packages --- pkgs/desktops/lxqt/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix index b3c38a8e4fa..45714260381 100644 --- a/pkgs/desktops/lxqt/default.nix +++ b/pkgs/desktops/lxqt/default.nix @@ -2,6 +2,14 @@ let packages = self: with self; { + # Update script tailored to LXQt packages from git repository + lxqtUpdateScript = { pname, version, src }: + pkgs.genericUpdater { + inherit pname version; + attrPath = "lxqt.${pname}"; + versionLister = "${pkgs.common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; + }; + # For compiling information, see: # - https://github.com/lxqt/lxqt/wiki/Building-from-source -- cgit v1.2.3 From f27301cd32996529b5acc1b6ef84711020930293 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 26 Apr 2020 11:53:59 -0300 Subject: lxqt: add updater script to individual packages --- pkgs/desktops/lxqt/compton-conf/default.nix | 2 ++ pkgs/desktops/lxqt/libfm-qt/default.nix | 5 ++++- pkgs/desktops/lxqt/liblxqt/default.nix | 3 +++ pkgs/desktops/lxqt/libqtxdg/default.nix | 3 +++ pkgs/desktops/lxqt/libsysstat/default.nix | 3 +++ pkgs/desktops/lxqt/lximage-qt/default.nix | 3 +++ pkgs/desktops/lxqt/lxqt-about/default.nix | 3 +++ pkgs/desktops/lxqt/lxqt-admin/default.nix | 3 +++ pkgs/desktops/lxqt/lxqt-archiver/default.nix | 6 ++++-- pkgs/desktops/lxqt/lxqt-build-tools/default.nix | 3 +++ pkgs/desktops/lxqt/lxqt-config/default.nix | 3 +++ pkgs/desktops/lxqt/lxqt-globalkeys/default.nix | 3 +++ pkgs/desktops/lxqt/lxqt-notificationd/default.nix | 3 +++ pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix | 3 +++ pkgs/desktops/lxqt/lxqt-panel/default.nix | 3 +++ pkgs/desktops/lxqt/lxqt-policykit/default.nix | 3 +++ pkgs/desktops/lxqt/lxqt-powermanagement/default.nix | 3 +++ pkgs/desktops/lxqt/lxqt-qtplugin/default.nix | 3 +++ pkgs/desktops/lxqt/lxqt-runner/default.nix | 3 +++ pkgs/desktops/lxqt/lxqt-session/default.nix | 3 +++ pkgs/desktops/lxqt/lxqt-sudo/default.nix | 3 +++ pkgs/desktops/lxqt/lxqt-themes/default.nix | 3 +++ pkgs/desktops/lxqt/obconf-qt/default.nix | 3 +++ pkgs/desktops/lxqt/pavucontrol-qt/default.nix | 2 ++ pkgs/desktops/lxqt/pcmanfm-qt/default.nix | 3 +++ pkgs/desktops/lxqt/qlipper/default.nix | 3 +++ pkgs/desktops/lxqt/qps/default.nix | 3 +++ pkgs/desktops/lxqt/qterminal/default.nix | 3 +++ pkgs/desktops/lxqt/qtermwidget/default.nix | 3 +++ pkgs/desktops/lxqt/screengrab/default.nix | 3 +++ 30 files changed, 90 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/compton-conf/default.nix b/pkgs/desktops/lxqt/compton-conf/default.nix index 30b4dd95a67..251e0da48cd 100644 --- a/pkgs/desktops/lxqt/compton-conf/default.nix +++ b/pkgs/desktops/lxqt/compton-conf/default.nix @@ -37,6 +37,8 @@ mkDerivation rec { --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \ ''; + passthru.updateScript = lxqt.lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "GUI configuration tool for compton X composite manager"; homepage = "https://github.com/lxqt/compton-conf"; diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix index f0c2c232786..eadf8968371 100644 --- a/pkgs/desktops/lxqt/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/libfm-qt/default.nix @@ -11,10 +11,11 @@ , menu-cache , qtx11extras , qttools +, lxqtUpdateScript }: mkDerivation rec { - pname = "libfm-qt-unstable"; + pname = "libfm-qt"; version = "2019-09-22"; src = fetchFromGitHub { @@ -42,6 +43,8 @@ mkDerivation rec { menu-cache ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "Core library of PCManFM-Qt (Qt binding for libfm)"; homepage = "https://github.com/lxqt/libfm-qt"; diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix index 2c69642f84f..f7133a7bf6d 100644 --- a/pkgs/desktops/lxqt/liblxqt/default.nix +++ b/pkgs/desktops/lxqt/liblxqt/default.nix @@ -10,6 +10,7 @@ , polkit-qt , kwindowsystem , xorg +, lxqtUpdateScript }: mkDerivation rec { @@ -42,6 +43,8 @@ mkDerivation rec { sed -i "s|\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}|''${out}/share/polkit-1/actions|" CMakeLists.txt ''; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "Core utility library for all LXQt components"; homepage = "https://github.com/lxqt/liblxqt"; diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix index 6009047d823..3d5803c6fbe 100644 --- a/pkgs/desktops/lxqt/libqtxdg/default.nix +++ b/pkgs/desktops/lxqt/libqtxdg/default.nix @@ -5,6 +5,7 @@ , qtbase , qtsvg , lxqt-build-tools +, lxqtUpdateScript }: mkDerivation rec { @@ -36,6 +37,8 @@ mkDerivation rec { ) ''; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "Qt implementation of freedesktop.org xdg specs"; homepage = "https://github.com/lxqt/libqtxdg"; diff --git a/pkgs/desktops/lxqt/libsysstat/default.nix b/pkgs/desktops/lxqt/libsysstat/default.nix index cfbf7c3c72e..55ae5e5f396 100644 --- a/pkgs/desktops/lxqt/libsysstat/default.nix +++ b/pkgs/desktops/lxqt/libsysstat/default.nix @@ -4,6 +4,7 @@ , cmake , qtbase , lxqt-build-tools +, lxqtUpdateScript }: mkDerivation rec { @@ -26,6 +27,8 @@ mkDerivation rec { qtbase ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "Library used to query system info and statistics"; homepage = "https://github.com/lxqt/libsysstat"; diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix index 0a1cf72e452..f0258ad186a 100644 --- a/pkgs/desktops/lxqt/lximage-qt/default.nix +++ b/pkgs/desktops/lxqt/lximage-qt/default.nix @@ -11,6 +11,7 @@ , lxqt-build-tools , libfm-qt , libexif +, lxqtUpdateScript }: mkDerivation rec { @@ -41,6 +42,8 @@ mkDerivation rec { libexif ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "The image viewer and screenshot tool for lxqt"; homepage = "https://github.com/lxqt/lximage-qt"; diff --git a/pkgs/desktops/lxqt/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix index a6df2c1f321..94b8e8e0617 100644 --- a/pkgs/desktops/lxqt/lxqt-about/default.nix +++ b/pkgs/desktops/lxqt/lxqt-about/default.nix @@ -9,6 +9,7 @@ , kwindowsystem , liblxqt , libqtxdg +, lxqtUpdateScript }: mkDerivation rec { @@ -36,6 +37,8 @@ mkDerivation rec { libqtxdg ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "Dialogue window providing information about LXQt and the system it's running on"; homepage = "https://github.com/lxqt/lxqt-about"; diff --git a/pkgs/desktops/lxqt/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix index db78f66e36a..3d9d222a9c3 100644 --- a/pkgs/desktops/lxqt/lxqt-admin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-admin/default.nix @@ -10,6 +10,7 @@ , liblxqt , libqtxdg , polkit-qt +, lxqtUpdateScript }: mkDerivation rec { @@ -43,6 +44,8 @@ mkDerivation rec { -i lxqt-admin-user/CMakeLists.txt ''; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "LXQt system administration tool"; homepage = "https://github.com/lxqt/lxqt-admin"; diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix index 481e2faad44..de8c14ae658 100644 --- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix +++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix @@ -9,11 +9,11 @@ , qtbase , qttools , qtx11extras +, lxqtUpdateScript }: mkDerivation rec { - # pname = "lxqt-archiver"; - pname = "lxqt-archiver-unstable"; + pname = "lxqt-archiver"; version = "2019-09-25"; src = fetchFromGitHub { @@ -41,6 +41,8 @@ mkDerivation rec { hardeningDisable = [ "format" ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "Archive tool for the LXQt desktop environment"; homepage = "https://github.com/lxqt/lxqt-archiver/"; diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix index 559695bfa30..97a4c7d898a 100644 --- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix +++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix @@ -6,6 +6,7 @@ , pcre , qtbase , glib +, lxqtUpdateScript }: mkDerivation rec { @@ -40,6 +41,8 @@ mkDerivation rec { cp ${./LXQtConfigVars.cmake} $out/share/cmake/lxqt-build-tools/modules/LXQtConfigVars.cmake ''; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "Various packaging tools and scripts for LXQt applications"; homepage = "https://github.com/lxqt/lxqt-build-tools"; diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix index 11629bfad4b..84eb45005f1 100644 --- a/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -13,6 +13,7 @@ , liblxqt , libqtxdg , xorg +, lxqtUpdateScript }: mkDerivation rec { @@ -54,6 +55,8 @@ mkDerivation rec { sed -i "/\''${XORG_LIBINPUT_INCLUDE_DIRS}/a ${xorg.xf86inputlibinput.dev}/include/xorg" lxqt-config-input/CMakeLists.txt ''; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "Tools to configure LXQt and the underlying operating system"; homepage = "https://github.com/lxqt/lxqt-config"; diff --git a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix index b6d8a06a0a6..adf7a8f40f6 100644 --- a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix +++ b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix @@ -10,6 +10,7 @@ , kwindowsystem , liblxqt , libqtxdg +, lxqtUpdateScript }: mkDerivation rec { @@ -38,6 +39,8 @@ mkDerivation rec { libqtxdg ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "LXQt service for global keyboard shortcuts registration"; homepage = "https://github.com/lxqt/lxqt-globalkeys"; diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix index 913ba88cc74..7d5b4ad9b72 100644 --- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix +++ b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix @@ -10,6 +10,7 @@ , liblxqt , libqtxdg , qtx11extras +, lxqtUpdateScript }: mkDerivation rec { @@ -38,6 +39,8 @@ mkDerivation rec { qtx11extras ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "The LXQt notification daemon"; homepage = "https://github.com/lxqt/lxqt-notificationd"; diff --git a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix index 87b2f5f325c..5f4070ea0bb 100644 --- a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix +++ b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix @@ -10,6 +10,7 @@ , kwindowsystem , liblxqt , libqtxdg +, lxqtUpdateScript }: mkDerivation rec { @@ -38,6 +39,8 @@ mkDerivation rec { libqtxdg ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "GUI to query passwords on behalf of SSH agents"; homepage = "https://github.com/lxqt/lxqt-openssh-askpass"; diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix index f6302e37f06..0db3b4d0a6a 100644 --- a/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -25,6 +25,7 @@ , lxmenu-data , pcre , libXdamage +, lxqtUpdateScript }: mkDerivation rec { @@ -69,6 +70,8 @@ mkDerivation rec { libXdamage ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "The LXQt desktop panel"; homepage = "https://github.com/lxqt/lxqt-panel"; diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix index 13392e8ce0c..d8a98604f8a 100644 --- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix +++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix @@ -13,6 +13,7 @@ , liblxqt , libqtxdg , pcre +, lxqtUpdateScript }: mkDerivation rec { @@ -44,6 +45,8 @@ mkDerivation rec { pcre ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "The LXQt PolicyKit agent"; homepage = "https://github.com/lxqt/lxqt-policykit"; diff --git a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix index d0922d51cc6..2ded2cca40e 100644 --- a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix +++ b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix @@ -12,6 +12,7 @@ , kidletime , liblxqt , libqtxdg +, lxqtUpdateScript }: mkDerivation rec { @@ -42,6 +43,8 @@ mkDerivation rec { libqtxdg ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "Power management module for LXQt"; homepage = "https://github.com/lxqt/lxqt-powermanagement"; diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix index 25b752def23..4e50b62258f 100644 --- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix @@ -10,6 +10,7 @@ , libdbusmenu , libqtxdg , libfm-qt +, lxqtUpdateScript }: mkDerivation rec { @@ -43,6 +44,8 @@ mkDerivation rec { --replace "DESTINATION \"\''${QT_PLUGINS_DIR}" "DESTINATION \"$qtPluginPrefix" ''; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "LXQt Qt platform integration plugin"; homepage = "https://github.com/lxqt/lxqt-qtplugin"; diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix index 03e6538c21c..1b8044a2c2b 100644 --- a/pkgs/desktops/lxqt/lxqt-runner/default.nix +++ b/pkgs/desktops/lxqt/lxqt-runner/default.nix @@ -15,6 +15,7 @@ , menu-cache , muparser , pcre +, lxqtUpdateScript }: mkDerivation rec { @@ -48,6 +49,8 @@ mkDerivation rec { pcre ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "Tool used to launch programs quickly by typing their names"; homepage = "https://github.com/lxqt/lxqt-runner"; diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix index 74ce0afd892..0077de58aa7 100644 --- a/pkgs/desktops/lxqt/lxqt-session/default.nix +++ b/pkgs/desktops/lxqt/lxqt-session/default.nix @@ -13,6 +13,7 @@ , libqtxdg , xorg , xdg-user-dirs +, lxqtUpdateScript }: mkDerivation rec { @@ -45,6 +46,8 @@ mkDerivation rec { xdg-user-dirs ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "An alternative session manager ported from the original razor-session"; homepage = "https://github.com/lxqt/lxqt-session"; diff --git a/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix index ef85a9a45e2..5c6db9927d1 100644 --- a/pkgs/desktops/lxqt/lxqt-sudo/default.nix +++ b/pkgs/desktops/lxqt/lxqt-sudo/default.nix @@ -11,6 +11,7 @@ , liblxqt , libqtxdg , sudo +, lxqtUpdateScript }: mkDerivation rec { @@ -40,6 +41,8 @@ mkDerivation rec { sudo ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "GUI frontend for sudo/su"; homepage = "https://github.com/lxqt/lxqt-sudo"; diff --git a/pkgs/desktops/lxqt/lxqt-themes/default.nix b/pkgs/desktops/lxqt/lxqt-themes/default.nix index d00c91f51a8..f149d6d8935 100644 --- a/pkgs/desktops/lxqt/lxqt-themes/default.nix +++ b/pkgs/desktops/lxqt/lxqt-themes/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , cmake , lxqt-build-tools +, lxqtUpdateScript }: mkDerivation rec { @@ -21,6 +22,8 @@ mkDerivation rec { lxqt-build-tools ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "Themes, graphics and icons for LXQt"; homepage = "https://github.com/lxqt/lxqt-themes"; diff --git a/pkgs/desktops/lxqt/obconf-qt/default.nix b/pkgs/desktops/lxqt/obconf-qt/default.nix index 52574ea3bad..3eb04de9848 100644 --- a/pkgs/desktops/lxqt/obconf-qt/default.nix +++ b/pkgs/desktops/lxqt/obconf-qt/default.nix @@ -10,6 +10,7 @@ , xorg , lxqt-build-tools , openbox +, lxqtUpdateScript }: mkDerivation rec { @@ -40,6 +41,8 @@ mkDerivation rec { openbox ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "The Qt port of obconf, the Openbox configuration tool"; homepage = "https://github.com/lxqt/obconf-qt"; diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix index 3eff3ec7fe3..304a10dd811 100644 --- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix +++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix @@ -36,6 +36,8 @@ mkDerivation rec { pcre ]; + passthru.updateScript = lxqt.lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "A Pulseaudio mixer in Qt (port of pavucontrol)"; homepage = "https://github.com/lxqt/pavucontrol-qt"; diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix index 1ac853bd701..308f41621de 100644 --- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix +++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix @@ -10,6 +10,7 @@ , libfm-qt , menu-cache , lxmenu-data +, lxqtUpdateScript }: mkDerivation rec { @@ -39,6 +40,8 @@ mkDerivation rec { lxmenu-data ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "File manager and desktop icon manager (Qt port of PCManFM and libfm)"; homepage = "https://github.com/lxqt/pcmanfm-qt"; diff --git a/pkgs/desktops/lxqt/qlipper/default.nix b/pkgs/desktops/lxqt/qlipper/default.nix index ce32f8e9123..dba428f096c 100644 --- a/pkgs/desktops/lxqt/qlipper/default.nix +++ b/pkgs/desktops/lxqt/qlipper/default.nix @@ -4,6 +4,7 @@ , cmake , qtbase , qttools +, lxqtUpdateScript }: mkDerivation rec { @@ -26,6 +27,8 @@ mkDerivation rec { qttools ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "Cross-platform clipboard history applet"; homepage = "https://github.com/pvanek/qlipper"; diff --git a/pkgs/desktops/lxqt/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix index f68cadea9a2..651955fa3cf 100644 --- a/pkgs/desktops/lxqt/qps/default.nix +++ b/pkgs/desktops/lxqt/qps/default.nix @@ -6,6 +6,7 @@ , qtx11extras , qttools , lxqt-build-tools +, lxqtUpdateScript }: mkDerivation rec { @@ -30,6 +31,8 @@ mkDerivation rec { qttools ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "Qt based process manager"; homepage = "https://github.com/lxqt/qps"; diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix index 02464cc3e4d..5bf23788d95 100644 --- a/pkgs/desktops/lxqt/qterminal/default.nix +++ b/pkgs/desktops/lxqt/qterminal/default.nix @@ -7,6 +7,7 @@ , qtbase , qttools , qtx11extras +, lxqtUpdateScript }: mkDerivation rec { @@ -32,6 +33,8 @@ mkDerivation rec { qtermwidget ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "A lightweight Qt-based terminal emulator"; homepage = "https://github.com/lxqt/qterminal"; diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix index 900aec9db8a..95bc189b3dc 100644 --- a/pkgs/desktops/lxqt/qtermwidget/default.nix +++ b/pkgs/desktops/lxqt/qtermwidget/default.nix @@ -5,6 +5,7 @@ , qtbase , qttools , lxqt-build-tools +, lxqtUpdateScript }: mkDerivation rec { @@ -28,6 +29,8 @@ mkDerivation rec { qttools ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "A terminal emulator widget for Qt 5"; homepage = "https://github.com/lxqt/qtermwidget"; diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix index 99d6af06d4f..e706e6e2bee 100644 --- a/pkgs/desktops/lxqt/screengrab/default.nix +++ b/pkgs/desktops/lxqt/screengrab/default.nix @@ -11,6 +11,7 @@ , libqtxdg , xorg , autoPatchelfHook +, lxqtUpdateScript }: mkDerivation rec { @@ -41,6 +42,8 @@ mkDerivation rec { xorg.libXdmcp ]; + passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; + meta = with lib; { description = "Crossplatform tool for fast making screenshots"; homepage = "https://github.com/lxqt/screengrab"; -- cgit v1.2.3 From 99a75d1239f746b0a2a52f67eea004bc6db10da6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 26 Apr 2020 13:03:53 -0300 Subject: lxqt: remove old update script --- pkgs/desktops/lxqt/update.sh | 39 --------------------------------------- 1 file changed, 39 deletions(-) delete mode 100755 pkgs/desktops/lxqt/update.sh diff --git a/pkgs/desktops/lxqt/update.sh b/pkgs/desktops/lxqt/update.sh deleted file mode 100755 index 47d3dfb3d5f..00000000000 --- a/pkgs/desktops/lxqt/update.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p libarchive curl common-updater-scripts - -set -eu -o pipefail - -cd "$(dirname "${BASH_SOURCE[0]}")" -root=../../.. -export NIXPKGS_ALLOW_UNFREE=1 - -lxqt_version=0.14.1 -lxqtrepo=https://downloads.lxqt.org/${lxqt_version}.html - -version() { - (cd "$root" && nix-instantiate --eval --strict -A "$1.version" 2>/dev/null | tr -d '"') -} - -update_lxqt() { - local pname - local pversion - curl -sS ${lxqtrepo} | sed -rne 's|.*(.+) (.+)
|\1 \2|p' | - while read pname pversion; do - local pversionold=$(version lxqt.$pname) - if [[ "$pversion" = "$pversionold" ]]; then - echo "nothing to do, $pname $pversion is current" - else - echo "$pname: $pversionold -> $pversion" - (cd "$root" - local pfile=$(EDITOR=echo nix edit -f. lxqt.$pname 2>/dev/null) - update-source-version lxqt.$pname "$pversion" - git add $pfile - git commit -m "lxqt.$pname: $pversionold -> $pversion" - ) - fi - echo - done - echo DONE -} - -update_lxqt -- cgit v1.2.3 From d1460ad71fa96d4ada3b1fbce115726af1ee87d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 26 Apr 2020 17:25:21 -0300 Subject: lxqt.libqtxdg: 3.4.0 -> 3.5.0 --- pkgs/desktops/lxqt/libqtxdg/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix index 3d5803c6fbe..526da0d84a4 100644 --- a/pkgs/desktops/lxqt/libqtxdg/default.nix +++ b/pkgs/desktops/lxqt/libqtxdg/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "libqtxdg"; - version = "3.4.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "16jqnpc740a6phq7vcgy85hl7253yzyw4m5h71r0vijk79ir73b5"; + sha256 = "00dzs6zc8prc0mxmvq0pmpy1qi8rysg97as7jfd0ndk5jii0nd85"; }; nativeBuildInputs = [ @@ -31,9 +31,7 @@ mkDerivation rec { preConfigure = '' cmakeFlagsArray+=( - "-DQTXDGX_ICONENGINEPLUGIN_INSTALL_PATH=$out/$qtPluginPrefix" - "-DCMAKE_INSTALL_INCLUDEDIR=include" - "-DCMAKE_INSTALL_LIBDIR=lib" + "-DQTXDGX_ICONENGINEPLUGIN_INSTALL_PATH=$out/$qtPluginPrefix/iconengines" ) ''; -- cgit v1.2.3 From fc04b40ba0bc0509c7d022bf658eb99eebd84d9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 26 Apr 2020 17:25:21 -0300 Subject: lxqt.libfm-qt: 2019-09-22 -> 0.15.0 --- pkgs/desktops/lxqt/libfm-qt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix index eadf8968371..ba83f0e3167 100644 --- a/pkgs/desktops/lxqt/libfm-qt/default.nix +++ b/pkgs/desktops/lxqt/libfm-qt/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "libfm-qt"; - version = "2019-09-22"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = "libfm-qt"; - rev = "7c94e9efb996df0602f1f2b34b0216ba9b6df498"; - sha256 = "1fnli2kh7n4hxmqwcb1n06lyk67d9a2fx6z70gas5jzym7r2h5vw"; + rev = version; + sha256 = "0isshh627zr69kdmjxsy75i1nh95ky2wfhgy90g8j4zijpkdrd3l"; }; nativeBuildInputs = [ -- cgit v1.2.3 From e1366251f7004a7f9b3e123ac0310df0320dfe69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 26 Apr 2020 17:25:21 -0300 Subject: lxqt.liblxqt: 0.14.1 -> 0.15.0 --- pkgs/desktops/lxqt/liblxqt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix index f7133a7bf6d..e72593548cc 100644 --- a/pkgs/desktops/lxqt/liblxqt/default.nix +++ b/pkgs/desktops/lxqt/liblxqt/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "liblxqt"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0g2502lcws5j74p82qhfryz9n51cvi85hb50r5s227xhkv91q65k"; + sha256 = "1dqxsz8fy6xyzbkxhsymmr71yw4d5dwjgqd4rdjn0r9gk8ajrfzp"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 88068d4298af96452d74f883325fcc62296cff18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 26 Apr 2020 17:25:22 -0300 Subject: lxqt.compton-conf: 0.14.1 -> 0.15.0 --- pkgs/desktops/lxqt/compton-conf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/compton-conf/default.nix b/pkgs/desktops/lxqt/compton-conf/default.nix index 251e0da48cd..b41d766c1ad 100644 --- a/pkgs/desktops/lxqt/compton-conf/default.nix +++ b/pkgs/desktops/lxqt/compton-conf/default.nix @@ -11,13 +11,13 @@ mkDerivation rec { pname = "compton-conf"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0bx21r83ahmsqf7bm1h17pi4y9js1iqsv7nwnlq58rc0ddkkhcdb"; + sha256 = "1wqnajarkrpmc60jr1zw5w39lvlf9ii4ri9wgyn55hh1rkbzi7py"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 8a3a3e18c72175c229c92deef68382b40402762e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 26 Apr 2020 17:25:22 -0300 Subject: lxqt.libsysstat: 0.4.2 -> 0.4.3 --- pkgs/desktops/lxqt/libsysstat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/libsysstat/default.nix b/pkgs/desktops/lxqt/libsysstat/default.nix index 55ae5e5f396..642b57fe0d7 100644 --- a/pkgs/desktops/lxqt/libsysstat/default.nix +++ b/pkgs/desktops/lxqt/libsysstat/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "libsysstat"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "10h9n7km7yx8bnmzxi4nn1yqq03hizjkrx4745j0mczy7niiffsz"; + sha256 = "1dlshyv7pd7gwl55rd3msppjdpz2pwp5f4da9a9wapg7kiskqahf"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 7df24e37463b81d9c0600fe34d0ae70f031b448b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 26 Apr 2020 17:25:22 -0300 Subject: lxqt.lximage-qt: 0.14.1 -> 0.15.0 --- pkgs/desktops/lxqt/lximage-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix index f0258ad186a..22ce26526ac 100644 --- a/pkgs/desktops/lxqt/lximage-qt/default.nix +++ b/pkgs/desktops/lxqt/lximage-qt/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "lximage-qt"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "175l2w5w6iag01v05jq90pxx0al24wpw3mgsbcgqhl4z6h860r32"; + sha256 = "1pz0ird5vyrz1xycfn2vqh628f2mzwrx0psnp4hqdmj1xk9bjkbp"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 9967ba6e234e18e04a738ffea54f0c127b4986c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 26 Apr 2020 17:25:22 -0300 Subject: lxqt.lxqt-about: 0.14.1 -> 0.15.0 --- pkgs/desktops/lxqt/lxqt-about/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix index 94b8e8e0617..01365129467 100644 --- a/pkgs/desktops/lxqt/lxqt-about/default.nix +++ b/pkgs/desktops/lxqt/lxqt-about/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "lxqt-about"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0dj2rhbhnkzmv1iqqyq0bcp03imwnvxdr7rnpqnrs9kkjacm8zvr"; + sha256 = "0bgwh9jbvpnsdcij0bfkgzg0pb0ljjalv65q4q0hlha430pmpv3x"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 05d5013dcb092982ee0b90b9be68712855549634 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 26 Apr 2020 17:25:22 -0300 Subject: lxqt.lxqt-admin: 0.14.1 -> 0.15.0 --- pkgs/desktops/lxqt/lxqt-admin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix index 3d9d222a9c3..21a637bc669 100644 --- a/pkgs/desktops/lxqt/lxqt-admin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-admin/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "lxqt-admin"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "121qj46app2bqdr24g5sz2mdjfd9w86wpgkwap46s0zgxm4li44i"; + sha256 = "16fbnlvla8lq6rkv5gpmkw2jj9h1wzd3jcf8sjrbns6ygyfdxx3a"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 34fbdf786726541540daa1dacaf4e3a6531000a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 26 Apr 2020 17:25:22 -0300 Subject: lxqt.lxqt-archiver: 2019-09-25 -> 0.1.1 --- pkgs/desktops/lxqt/lxqt-archiver/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix index de8c14ae658..ae772272c4b 100644 --- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix +++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix @@ -14,13 +14,13 @@ mkDerivation rec { pname = "lxqt-archiver"; - version = "2019-09-25"; + version = "0.1.1"; src = fetchFromGitHub { owner = "lxqt"; repo = "lxqt-archiver"; - rev = "62501255434b2ba6a8fd043a5af13dc0df038a5b"; - sha256 = "1af58k68karmnay7xgngzlmcgkmvx6hay5m1xbl5id9hh16n20in"; + rev = version; + sha256 = "0c0y8sy12laqyanvy6mmnpjvy1yb8k3241pbxhc3nyl5zrq3hzdh"; }; nativeBuildInputs = [ @@ -37,8 +37,6 @@ mkDerivation rec { qtx11extras ]; - cmakeFlags = [ "-DPULL_TRANSLATIONS=NO" ]; - hardeningDisable = [ "format" ]; passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; -- cgit v1.2.3 From 9440c55bd3676bb0ae9a4876475b449a540cc094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 26 Apr 2020 17:25:22 -0300 Subject: lxqt.lxqt-build-tools: 0.6.0 -> 0.7.0 --- pkgs/desktops/lxqt/lxqt-build-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix index 97a4c7d898a..92ce3c2fe50 100644 --- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix +++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix @@ -11,13 +11,13 @@ mkDerivation rec { pname = "lxqt-build-tools"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0i7m9s4g5rsw28vclc9nh0zcapx85cqfwxkx7rrw7wa12svy7pm2"; + sha256 = "18l1w9lyf3nyj05wjhaj4lclak6qydlhw9bqi6kxgr1bv8k709lf"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 46c9168a4a88c6b761494738d144697424399840 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 26 Apr 2020 17:25:22 -0300 Subject: lxqt.lxqt-config: 0.14.1 -> 0.15.0 --- pkgs/desktops/lxqt/lxqt-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix index 84eb45005f1..677b90b25c5 100644 --- a/pkgs/desktops/lxqt/lxqt-config/default.nix +++ b/pkgs/desktops/lxqt/lxqt-config/default.nix @@ -18,13 +18,13 @@ mkDerivation rec { pname = "lxqt-config"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0x1k08587i2pakxlrj2n0l82r179sfywnzn2cphxiy89r5zpn7vi"; + sha256 = "1nqkc716rl4c0rad4vqlqadm6lljrhwpdflaa5k9lrdiingr0s7s"; }; nativeBuildInputs = [ -- cgit v1.2.3 From f23a0bef1dd8f3c0f089c1f26e19cde699a32450 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 26 Apr 2020 17:25:22 -0300 Subject: lxqt.lxqt-globalkeys: 0.14.3 -> 0.15.0 --- pkgs/desktops/lxqt/lxqt-globalkeys/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix index adf7a8f40f6..59e2096dea4 100644 --- a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix +++ b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "lxqt-globalkeys"; - version = "0.14.3"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1ij9abjnqbnkcb7qqk3x7y4amr6l7kkmwhdpc0x2qk4yikn5ijdg"; + sha256 = "09vib713zbmnwicijycl3n9q35l45lrcw129lf9z95s3ch81x1hm"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 786f16256100784235e675c3419ab7db0df55664 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 26 Apr 2020 17:25:23 -0300 Subject: lxqt.lxqt-notificationd: 0.14.1 -> 0.15.0 --- pkgs/desktops/lxqt/lxqt-notificationd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix index 7d5b4ad9b72..43f9bf31932 100644 --- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix +++ b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "lxqt-notificationd"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1ihaf2i361j2snyy6kg8ccpfnc8hppvacmxjqzb1lpyaf1ajd139"; + sha256 = "0vqk1rc4fn2s0ls6sl03vzsb16xczrxab4rzjim3azm4pwsxjd1k"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 5986986273a8ec096be90374c062263cfe9704f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 26 Apr 2020 17:25:23 -0300 Subject: lxqt.lxqt-openssh-askpass: 0.14.1 -> 0.15.0 --- pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix index 5f4070ea0bb..a164571800a 100644 --- a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix +++ b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "lxqt-openssh-askpass"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "04jmvhhlhhspwzj4hfq7fnaa3h7h02z3rlq8p55hzlzkvshqqh1q"; + sha256 = "056bj3ssp4vqapzqg3da3m95vi92043j7mv70lmpznxdwyjwgxc3"; }; nativeBuildInputs = [ -- cgit v1.2.3 From fb459877959990b60feff125aef0d9dbdbfb11f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 26 Apr 2020 17:25:23 -0300 Subject: lxqt.lxqt-panel: 0.14.1 -> 0.15.0 --- pkgs/desktops/lxqt/lxqt-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix index 0db3b4d0a6a..705d6aec793 100644 --- a/pkgs/desktops/lxqt/lxqt-panel/default.nix +++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix @@ -30,13 +30,13 @@ mkDerivation rec { pname = "lxqt-panel"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1py3i7qgm6h2iwjwqfjml1rp06s7ls1d7z5i9iizsmfshdzkaq86"; + sha256 = "0k2gqf9f4g8fpny8p5m1anzk7mdxm9dgh6xlngz25nj4mshnq3xs"; }; nativeBuildInputs = [ -- cgit v1.2.3 From bd3e596db3dcb7a50a830ca51aa10a8816c68562 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 26 Apr 2020 17:25:24 -0300 Subject: lxqt.lxqt-policykit: 0.14.1 -> 0.15.0 --- pkgs/desktops/lxqt/lxqt-policykit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix index d8a98604f8a..7575c805a31 100644 --- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix +++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix @@ -18,13 +18,13 @@ mkDerivation rec { pname = "lxqt-policykit"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0mh9jw09r0mk8xmgvmzk3yyfix0pzqya28rcx71fqjpbdv1sc44l"; + sha256 = "001zgjxgvzp7clfqr46sx8m3a7v38xxgxjqrpz01lxx18zik3d9h"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 4c3d8a7af924e90f86b09ba2f6f1300e7e8f4bc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 26 Apr 2020 17:25:24 -0300 Subject: lxqt.lxqt-powermanagement: 0.14.1 -> 0.15.0 --- pkgs/desktops/lxqt/lxqt-powermanagement/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix index 2ded2cca40e..2b48a2a04b5 100644 --- a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix +++ b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix @@ -17,13 +17,13 @@ mkDerivation rec { pname = "lxqt-powermanagement"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1nhp4a28bpczhwz8b8da355zsxr1qwmkrm3bwllwp39liw947clx"; + sha256 = "0gqxy4d05gibsvq27qdfwp5v19310l0ln4bvwaan6ailbyyya90f"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 2c195fa118d4187ff6f5310a613621ccfd860850 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 26 Apr 2020 17:25:24 -0300 Subject: lxqt.lxqt-qtplugin: 0.14.0 -> 0.15.0 --- pkgs/desktops/lxqt/lxqt-qtplugin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix index 4e50b62258f..02a43b4a8c1 100644 --- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix +++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "lxqt-qtplugin"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "16n50lxnya03zcviw65sy5dyg9dsrn64k91mrqfvraf6d90md4al"; + sha256 = "17x5jr78rbsf4pbvc4y3wwkpvsmynzkxy2ifvwhqyc2gmjspp8il"; }; nativeBuildInputs = [ -- cgit v1.2.3 From c11f0d460a16f2a45fa102d7b1da61d36ff43268 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 26 Apr 2020 17:25:24 -0300 Subject: lxqt.lxqt-runner: 0.14.1 -> 0.15.0 --- pkgs/desktops/lxqt/lxqt-runner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix index 1b8044a2c2b..8a27ef41610 100644 --- a/pkgs/desktops/lxqt/lxqt-runner/default.nix +++ b/pkgs/desktops/lxqt/lxqt-runner/default.nix @@ -20,13 +20,13 @@ mkDerivation rec { pname = "lxqt-runner"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "01a8ycpkzcbh85y4025pd3nbpnzxh98ll1xwz4ykz13yvm0l2n1w"; + sha256 = "1x6s4k27cvj2k51hwpcp3l686c2am504ckry4fm76h0mlnkffjm5"; }; nativeBuildInputs = [ -- cgit v1.2.3 From b92e9cd9d7a26f3af4ce502186853e37492ba02b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 26 Apr 2020 17:25:24 -0300 Subject: lxqt.lxqt-session: 0.14.1 -> 0.15.0 --- pkgs/desktops/lxqt/lxqt-session/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix index 0077de58aa7..2e513b23988 100644 --- a/pkgs/desktops/lxqt/lxqt-session/default.nix +++ b/pkgs/desktops/lxqt/lxqt-session/default.nix @@ -18,13 +18,13 @@ mkDerivation rec { pname = "lxqt-session"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0s6b0lblb795zz1p7sy677c1iznhmdzc4vw3jkc2agmsrhm7if7s"; + sha256 = "0kbk13dpmr75yd905n30k51cl7srrxz31ma4kacx450qgr5rwawn"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 4748da50411efb018731510ee6658937f99248ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 26 Apr 2020 17:25:24 -0300 Subject: lxqt.lxqt-sudo: 0.14.1 -> 0.15.0 --- pkgs/desktops/lxqt/lxqt-sudo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix index 5c6db9927d1..5f8fbcd2a6a 100644 --- a/pkgs/desktops/lxqt/lxqt-sudo/default.nix +++ b/pkgs/desktops/lxqt/lxqt-sudo/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "lxqt-sudo"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1my0wpic20493rdlabp9ghag1g3nhwafk2yklkgczlajmarakgpc"; + sha256 = "1j8pxqxb2c10hrfq34nfx75pc0cz6044j4w458nnxbgvl5b8cdcb"; }; nativeBuildInputs = [ -- cgit v1.2.3 From a303e67d0bf855005924f729933ce0f1dda71ab7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 26 Apr 2020 17:25:24 -0300 Subject: lxqt.lxqt-themes: 0.14.0 -> 0.15.0 --- pkgs/desktops/lxqt/lxqt-themes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/lxqt-themes/default.nix b/pkgs/desktops/lxqt/lxqt-themes/default.nix index f149d6d8935..4613017b8a9 100644 --- a/pkgs/desktops/lxqt/lxqt-themes/default.nix +++ b/pkgs/desktops/lxqt/lxqt-themes/default.nix @@ -8,13 +8,13 @@ mkDerivation rec { pname = "lxqt-themes"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "09dkcgnf3lmfly8v90p6wjlj5rin83pbailvvpx2jr8a48a8zb9f"; + sha256 = "1magzckhgrac2b5jm83hj3s8x4hyfnbh2v86lfa4c36whnfvsz29"; }; nativeBuildInputs = [ -- cgit v1.2.3 From e6e984b284e8433fd512b6a238c8a4c2ef0176e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 26 Apr 2020 17:25:25 -0300 Subject: lxqt.obconf-qt: 0.14.1 -> 0.15.0 --- pkgs/desktops/lxqt/obconf-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/obconf-qt/default.nix b/pkgs/desktops/lxqt/obconf-qt/default.nix index 3eb04de9848..91baba60d8a 100644 --- a/pkgs/desktops/lxqt/obconf-qt/default.nix +++ b/pkgs/desktops/lxqt/obconf-qt/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "obconf-qt"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "15dizs072ylmld1lxwgqkvybqy8ms8zki5586xm305jnlmrkb4lq"; + sha256 = "13bah70k78kscrr01z7dwdzwhay8mz0f7gfsg2a6w113mgqkn7ib"; }; nativeBuildInputs = [ -- cgit v1.2.3 From ee602ab73afb3e44d43551c2e45868858a690a37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 26 Apr 2020 17:25:25 -0300 Subject: lxqt.pavucontrol-qt: 0.14.1 -> 0.15.0 --- pkgs/desktops/lxqt/pavucontrol-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix index 304a10dd811..24343d42374 100644 --- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix +++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "pavucontrol-qt"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "124dk41v8l5pv7afi1h7fgbhm8zj605yfd8b769sn7id2bqj7bis"; + sha256 = "0ppm79c6pkz2hvs1rri55d3s46j6r0vhiv634wzap9qshjb1j367"; }; nativeBuildInputs = [ -- cgit v1.2.3 From a8351ff1e8f8cb24280ba5e383665d08cb01cad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 26 Apr 2020 17:25:25 -0300 Subject: lxqt.pcmanfm-qt: 0.14.1 -> 0.15.0 --- pkgs/desktops/lxqt/pcmanfm-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix index 308f41621de..f5a5b18cfc0 100644 --- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix +++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix @@ -15,13 +15,13 @@ mkDerivation rec { pname = "pcmanfm-qt"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1zchxlbyiifing94mqwh45pp7z3ihldknqiaz0kanq1cnma1jj6k"; + sha256 = "16zwd2jfrmsnzfpywirkrpyilq1jj99liwvg77l20b1dbql9dc0q"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 9269465cba97d2b98d3f20f707c52624bd8fc33e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 26 Apr 2020 17:25:25 -0300 Subject: lxqt.qlipper: 5.1.1 -> 5.1.2 --- pkgs/desktops/lxqt/qlipper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/qlipper/default.nix b/pkgs/desktops/lxqt/qlipper/default.nix index dba428f096c..fca585c4593 100644 --- a/pkgs/desktops/lxqt/qlipper/default.nix +++ b/pkgs/desktops/lxqt/qlipper/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "qlipper"; - version = "5.1.1"; + version = "5.1.2"; src = fetchFromGitHub { owner = "pvanek"; repo = pname; rev = version; - sha256 = "0vlm4ab9isi7i2bimnyrk6083j2dfdrs14qj59vjcjri7mcwmf76"; + sha256 = "0zpkcqfylcfwvadp1bidcrr64d8ls5c7bdnkfqwjjd32sd35ly60"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 30e551f614ecdca8a3945cd88b6a6af6c3f9b115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 26 Apr 2020 17:25:25 -0300 Subject: lxqt.qps: 2.0.0 -> 2.1.0 --- pkgs/desktops/lxqt/qps/default.nix | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/lxqt/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix index 651955fa3cf..7ef9db40f7c 100644 --- a/pkgs/desktops/lxqt/qps/default.nix +++ b/pkgs/desktops/lxqt/qps/default.nix @@ -2,22 +2,25 @@ , mkDerivation , fetchFromGitHub , cmake -, qtbase -, qtx11extras -, qttools +, kwindowsystem +, liblxqt +, libqtxdg , lxqt-build-tools , lxqtUpdateScript +, qtbase +, qttools +, qtx11extras }: mkDerivation rec { pname = "qps"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "03rl59yk3b24j0y0k8dpdpb3yi4f1l642zn5pp5br3s2vwx1vzkg"; + sha256 = "0jg7sfhdm5xsahzcw8hc2vpp5p3sqzdqwp4my65nj85i7wzgxmva"; }; nativeBuildInputs = [ @@ -26,9 +29,12 @@ mkDerivation rec { ]; buildInputs = [ + kwindowsystem + liblxqt + libqtxdg qtbase - qtx11extras qttools + qtx11extras ]; passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; -- cgit v1.2.3 From 9aa8d4cc2e0c2f68f04771b96f3ca8d25314ddc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 26 Apr 2020 17:25:26 -0300 Subject: lxqt.qterminal: 0.14.1 -> 0.15.0 --- pkgs/desktops/lxqt/qterminal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix index 5bf23788d95..c7bcf6dad3b 100644 --- a/pkgs/desktops/lxqt/qterminal/default.nix +++ b/pkgs/desktops/lxqt/qterminal/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "qterminal"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "0bq6lvns56caijdmjm05nsj9vg69v9x5vid24bfxasck6q8nw24w"; + sha256 = "1vna0fvdasrdx7l5zxaaxi1v9fy34g2qblgkdhpczxivnmmxm5a3"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 7729ea883bdf81d02e5723dabce86940fddd9506 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 26 Apr 2020 17:25:26 -0300 Subject: lxqt.qtermwidget: 0.14.1 -> 0.15.0 --- pkgs/desktops/lxqt/qtermwidget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix index 95bc189b3dc..fc3fb4a5db0 100644 --- a/pkgs/desktops/lxqt/qtermwidget/default.nix +++ b/pkgs/desktops/lxqt/qtermwidget/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "qtermwidget"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1pz8dwb86jpga4vfyn5v9n2s6dx3zh74yfp1kjsmsmhf878zs6lv"; + sha256 = "07wvcc650998yav9hr4hpm842j0iqdvls3mn9n2n4v8xvm7cii2m"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 2c9560df2a46e68fa6145a7522c4ec47de92fbab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 26 Apr 2020 17:25:26 -0300 Subject: lxqt.screengrab: 2.0.0 -> 2.0.1 --- pkgs/desktops/lxqt/screengrab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix index e706e6e2bee..6a2e14fa50d 100644 --- a/pkgs/desktops/lxqt/screengrab/default.nix +++ b/pkgs/desktops/lxqt/screengrab/default.nix @@ -16,13 +16,13 @@ mkDerivation rec { pname = "screengrab"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "lxqt"; repo = pname; rev = version; - sha256 = "1syvdqq45dr8hwigl9ax1wxr33m8z23nh6xzzlqbflyyd93xzjmn"; + sha256 = "07wm9q0nkrvmyb12kvh0709qrwizlxgy6i5j2czhb4giljrpr4x6"; }; nativeBuildInputs = [ -- cgit v1.2.3 From f51314210e12529c76048d3dd12b922f63a07c61 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 29 Apr 2020 21:23:44 +0200 Subject: winetricks: 20191224 -> 20200412 --- pkgs/misc/emulators/wine/sources.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix index 0e3eb2ce698..964e08674ca 100644 --- a/pkgs/misc/emulators/wine/sources.nix +++ b/pkgs/misc/emulators/wine/sources.nix @@ -56,8 +56,8 @@ in rec { winetricks = fetchFromGitHub rec { # https://github.com/Winetricks/winetricks/releases - version = "20191224"; - sha256 = "07q3zh2i3xqzpg46ljarhq3a4ha9zwpc6jqzvly0kfglkh3b3v66"; + version = "20200412"; + sha256 = "0ccr8wdmhkhbccxs5hvn44ppl969n8j0c3rnnir5v6akjcb2nzzv"; owner = "Winetricks"; repo = "winetricks"; rev = version; -- cgit v1.2.3 From 47da7aafdfbe1df48cc25b056895d7dc1edf5e84 Mon Sep 17 00:00:00 2001 From: Lucas Savva Date: Wed, 29 Apr 2020 20:31:17 +0100 Subject: nixos/acme: update documentation --- nixos/modules/security/acme.nix | 6 +- nixos/modules/security/acme.xml | 234 ++++++++++++++++++++++++++++++++-------- 2 files changed, 195 insertions(+), 45 deletions(-) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 39976380e3b..6c3b5fc50b6 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -87,13 +87,13 @@ let default = {}; example = literalExample '' { - "example.org" = "/srv/http/nginx"; + "example.org" = null; "mydomain.org" = null; } ''; description = '' - A list of extra domain names, which are included in the one certificate to be issued, with their - own server roots if needed. + A list of extra domain names, which are included in the one certificate to be issued. + Setting a distinct server root is deprecated and not functional in 20.03+ ''; }; diff --git a/nixos/modules/security/acme.xml b/nixos/modules/security/acme.xml index 2b29c117484..d8de26109bb 100644 --- a/nixos/modules/security/acme.xml +++ b/nixos/modules/security/acme.xml @@ -10,88 +10,238 @@ for Let's Encrypt. The alternative ACME client lego is used under the hood. + + Automatic cert validation and configuration for Apache and Nginx virtual + hosts is included in NixOS, however if you would like to generate a wildcard + cert or you are not using a web server you will have to configure DNS + based validation. +
Prerequisites - You need to have a running HTTP server for verification. The server must - have a webroot defined that can serve + To use the ACME module, you must accept the provider's terms of service + by setting + to true. The Let's Encrypt ToS can be found + here. + + + + You must also set an email address to be used when creating accounts with + Let's Encrypt. You can set this for all certs with + + and/or on a per-cert basis with + . + This address is only used for registration and renewal reminders, + and cannot be used to administer the certificates in any way. + + + + You will need an HTTP server or DNS server for verification. For HTTP, + the server must have a webroot defined that can serve .well-known/acme-challenge. This directory must be - writeable by the user that will run the ACME client. + writeable by the user that will run the ACME client. For DNS, you must + set up credentials with your provider/server for use with lego. +
+
+ Using ACME certificates in Nginx - For instance, this generic snippet could be used for Nginx: + NixOS supports fetching ACME certificates for you by setting + enableACME + = true; in a virtualHost config. We first create self-signed + placeholder certificates in place of the real ACME certs. The placeholder + certs are overwritten when the ACME certs arrive. For + foo.example.com the config would look like. + + -http { - server { - server_name _; - listen 80; - listen [::]:80; - - location /.well-known/acme-challenge { - root /var/www/challenges; - } + = true; + = "admin+acme@example.com"; +services.nginx = { + enable = true; + virtualHosts = { + "foo.example.com" = { + forceSSL = true; + enableACME = true; + # All serverAliases will be added as extra domains on the certificate. + serverAliases = [ "bar.example.com" ]; + locations."/" = { + root = "/var/www"; + }; + }; - location / { - return 301 https://$host$request_uri; - } - } + # We can also add a different vhost and reuse the same certificate + # but we have to append extraDomains manually. + security.acme.certs."foo.example.com".extraDomains."baz.example.com" = null; + "baz.example.com" = { + forceSSL = true; + useACMEHost = "foo.example.com"; + locations."/" = { + root = "/var/www"; + }; + }; + }; } +
+
+ Using ACME certificates in Apache/httpd + + + Using ACME certificates with Apache virtual hosts is identical + to using them with Nginx. The attribute names are all the same, just replace + "nginx" with "httpd" where appropriate.
- Configuring + Manual configuration of HTTP-01 validation - To enable ACME certificate retrieval & renewal for a certificate for - foo.example.com, add the following in your - configuration.nix: + First off you will need to set up a virtual host to serve the challenges. + This example uses a vhost called certs.example.com, with + the intent that you will generate certs for all your vhosts and redirect + everyone to HTTPS. + + + + = true; + = "admin+acme@example.com"; +services.nginx = { + enable = true; + virtualHosts = { + "acmechallenge.example.com" = { + # Catchall vhost, will redirect users to HTTPS for all vhosts + serverAliases = [ "*.example.com" ]; + # /var/lib/acme/.challenges must be writable by the ACME user + # and readable by the Nginx user. + # By default, this is the case. + locations."/.well-known/acme-challenge" = { + root = "/var/lib/acme/.challenges"; + }; + locations."/" = { + return = "301 https://$host$request_uri"; + }; + }; + }; +} +# Alternative config for Apache +services.httpd = { + enable = true; + virtualHosts = { + "acmechallenge.example.com" = { + # Catchall vhost, will redirect users to HTTPS for all vhosts + serverAliases = [ "*.example.com" ]; + # /var/lib/acme/.challenges must be writable by the ACME user and readable by the Apache user. + # By default, this is the case. + documentRoot = "/var/lib/acme/.challenges"; + extraConfig = '' + RewriteEngine On + RewriteCond %{HTTPS} off + RewriteCond %{REQUEST_URI} !^/\.well-known/acme-challenge [NC] + RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI} [R=301] + ''; + }; + }; +} + + + + Now you need to configure ACME to generate a certificate. + + ."foo.example.com" = { - webroot = "/var/www/challenges"; + webroot = "/var/lib/acme/.challenges"; email = "foo@example.com"; + # Since we have a wildcard vhost to handle port 80, + # we can generate certs for anything! + # Just make sure your DNS resolves them. + extraDomains = [ "mail.example.com" ]; }; - The private key key.pem and certificate fullchain.pem will be put into /var/lib/acme/foo.example.com. + Refer to for all available configuration options for the security.acme module.
-
- Using ACME certificates in Nginx +
+ Configuring ACME for DNS validation - NixOS supports fetching ACME certificates for you by setting - enableACME - = true; in a virtualHost config. We first create self-signed - placeholder certificates in place of the real ACME certs. The placeholder - certs are overwritten when the ACME certs arrive. For - foo.example.com the config would look like. + This is useful if you want to generate a wildcard certificate, since + Let's Encrypt will only hand out wildcard certs over DNS validation. + There a number of supported DNS providers and servers you can utilise, + see the lego docs + for provider/server specific configuration values. For the sake of these + docs, we will provide a fully self-hosted example using bind. -services.nginx = { - enable = true; - virtualHosts = { - "foo.example.com" = { - forceSSL = true; - enableACME = true; - locations."/" = { - root = "/var/www"; - }; - }; - }; +services.bind = { + enable = true; + extraConfig = '' + include "/var/secrets/dnskeys.conf"; + ''; + zones = [ + rec { + name = "example.com"; + file = "/var/db/bind/${name}"; + master = true; + extraConfig = "allow-update { key rfc2136key.example.com.; };"; + } + ]; } + +# Now we can configure ACME + = true; + = "admin+acme@example.com"; +."example.com" = { + domain = "*.example.com"; + dnsProvider = "rfc2136"; + credentialsFile = "/var/secrets/certs.secret"; + # We don't need to wait for propagation since this is a local DNS server + dnsPropagationCheck = false; +}; + + + The dnskeys.conf and certs.secret + must be kept secure and thus you should not keep their contents in your + Nix config. Instead, generate them one time with these commands: + + + +mkdir -p /var/secrets +tsig-keygen rfc2136key.example.com > /var/secrets/dnskeys.conf +chown named:root /var/secrets/dnskeys.conf +chmod 400 /var/secrets/dnskeys.conf + +# Copy the secret value from the dnskeys.conf, and put it in +# RFC2136_TSIG_SECRET below + +cat > /var/secrets/certs.secret << EOF +RFC2136_NAMESERVER='127.0.0.1:53' +RFC2136_TSIG_ALGORITHM='hmac-sha256.' +RFC2136_TSIG_KEY='rfc2136key.example.com' +RFC2136_TSIG_SECRET='your secret key' +EOF +chmod 400 /var/secrets/certs.secret + + + + Now you're all set to generate certs! You should monitor the first invokation + by running systemctl start acme-example.com.service & + journalctl -fu acme-example.com.service and watching for errors. +
-- cgit v1.2.3 From ca44d3eb1ed011a1e93deaa8a3dbe78e57236de8 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 29 Apr 2020 15:25:15 -0400 Subject: linux: 4.19.118 -> 4.19.119 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index ab3d1b1a719..b3073ac1779 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.118"; + version = "4.19.119"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "15lcq3xky59v88vb8vvnmgcsmm1fadz0m4jyrii6rynsz5jr6x49"; + sha256 = "1klvdzz8sndg2zsr1anfy9p5fc1aapjqvc249myrbndyf55bk91b"; }; } // (args.argsOverride or {})) -- cgit v1.2.3 From 100e81982dba166a2287179d62184c2a59d6613f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 29 Apr 2020 15:25:57 -0400 Subject: linux: 5.4.35 -> 5.4.36 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 08b28bc98dc..2672a239e3b 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.35"; + version = "5.4.36"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1m06k19pbb3wz8z2dgf03jvzbbdh6q8jwwdz509s902a53vxasz1"; + sha256 = "13avfvimjyg4lhj9micgib9bb5qpx11cja5liypid0rf2acfmymr"; }; } // (args.argsOverride or {})) -- cgit v1.2.3 From bbf8ce13ebd6bb89d12fedd5b20e5f5a80b20145 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 29 Apr 2020 15:26:45 -0400 Subject: linux: 5.6.7 -> 5.6.8 --- pkgs/os-specific/linux/kernel/linux-5.6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.6.nix b/pkgs/os-specific/linux/kernel/linux-5.6.nix index a31e6e26d3f..c5bd84abf16 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.6.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.6.7"; + version = "5.6.8"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1jljcva3gxg1yc2kw3jjgmhzzdm16nylzxl63zbndjza547l5813"; + sha256 = "1pw2q9509jzp84b6qasaais2ws25v2wrjh072q0x3j520zzl5q8r"; }; } // (args.argsOverride or {})) -- cgit v1.2.3 From 01aec5f3b2ae49053a03f0a4c6dec5faff3d4826 Mon Sep 17 00:00:00 2001 From: geistesk Date: Wed, 29 Apr 2020 18:20:10 +0200 Subject: st: 0.8.2 -> 0.8.3 --- pkgs/applications/misc/st/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix index bb3c57a5990..018fd9306ae 100644 --- a/pkgs/applications/misc/st/default.nix +++ b/pkgs/applications/misc/st/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "st-0.8.2"; + name = "st-0.8.3"; src = fetchurl { url = "https://dl.suckless.org/st/${name}.tar.gz"; - sha256 = "0ddz2mdp1c7q67rd5vrvws9r0493ln0mlqyc3d73dv8im884xdxf"; + sha256 = "0ll5wbw1szs70wdf8zy1y2ig5mfbqw2w4ls8d64r8z3y4gdf76lk"; }; inherit patches; -- cgit v1.2.3 From c13178ff1a5093639d87a233ae45580976e4bf0b Mon Sep 17 00:00:00 2001 From: geistesk Date: Wed, 29 Apr 2020 18:26:51 +0200 Subject: golangci-lint: 1.25.0 -> 1.25.1 --- pkgs/development/tools/golangci-lint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index 3b82eea1049..c33a4cf69f5 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.25.0"; + version = "1.25.1"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "0xf9chk6f1ydg2wyi6wzj2fxl641z7iyk6spp5gb1chq7plsi8sm"; + sha256 = "04r26nn72myacs6v2jq8mi4kjik82iwsh6w59h4k9yk0my3fjwia"; }; - modSha256 = "15lb8y4kj2h514nl5517ah3ml9d2i71zv6ah08lpycz1b4v9hlwv"; + modSha256 = "1pz5f2hv2lssiwsp60hsycg2ijyafb7r5fl2yrvflqg547k3n8x2"; subPackages = [ "cmd/golangci-lint" ]; meta = with lib; { -- cgit v1.2.3 From 68f56479e148c04ab97b1393c385f090c6e983be Mon Sep 17 00:00:00 2001 From: Christian Harke Date: Wed, 29 Apr 2020 00:45:56 +0200 Subject: spectrwm: 2.7.2 -> 3.3.0 - Update to the latest version. - Stop using unstable `fetchurl` for GitHub archive reference #32997. - Take maintainership as requested by jb55 in #86265. --- maintainers/maintainer-list.nix | 10 ++++++ .../window-managers/spectrwm/default.nix | 38 +++++++--------------- 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 1bd0ebffdba..35dd144796e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1406,6 +1406,16 @@ githubId = 1103294; name = "Christopher Rosset"; }; + christianharke = { + email = "christian@harke.ch"; + github = "christianharke"; + githubId = 13007345; + name = "Christian Harke"; + keys = [{ + longkeyid = "rsa4096/0x830A9728630966F4"; + fingerprint = "4EBB 30F1 E89A 541A A7F2 52BE 830A 9728 6309 66F4"; + }]; + }; christopherpoole = { email = "mail@christopherpoole.net"; github = "christopherpoole"; diff --git a/pkgs/applications/window-managers/spectrwm/default.nix b/pkgs/applications/window-managers/spectrwm/default.nix index 1eb19e2de6f..b38cb990617 100644 --- a/pkgs/applications/window-managers/spectrwm/default.nix +++ b/pkgs/applications/window-managers/spectrwm/default.nix @@ -1,51 +1,37 @@ -{ fetchurl -, libX11 -, libXrandr -, libXcursor -, libXft -, libXt -, libxcb -, xcbutil -, xcb-util-cursor -, xcbutilkeysyms -, xcbutilwm -, stdenv -}: +{ stdenv, fetchFromGitHub, pkgconfig, xorg }: stdenv.mkDerivation { pname = "spectrwm"; - version = "2.7.2"; + version = "3.3.0"; - src = fetchurl { - url = "https://github.com/conformal/spectrwm/archive/SPECTRWM_2_7_2.tar.gz"; - sha256 = "1yssqnhxlfl1b60gziqp8c5pzs1lr8p6anrnp9ga1zfdql3b7993"; + src = fetchFromGitHub { + owner = "conformal"; + repo = "spectrwm"; + rev = "SPECTRWM_3_3_0"; + sha256 = "139mswlr0z5dbp5migm98qqg84syq0py1qladp3226xy6q3bnn08"; }; - - buildInputs = [ - libX11 - libxcb + nativeBuildInputs = [ pkgconfig ]; + buildInputs = with xorg; [ libXrandr libXcursor libXft libXt xcbutil - xcb-util-cursor xcbutilkeysyms xcbutilwm ]; sourceRoot = let subdir = if stdenv.isDarwin then "osx" else "linux"; - in "spectrwm-SPECTRWM_2_7_2/${subdir}"; + in "source/${subdir}"; - makeFlags = [ "PREFIX=$(out)" ]; - installPhase = "PREFIX=$out make install"; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; meta = with stdenv.lib; { description = "A tiling window manager"; homepage = "https://github.com/conformal/spectrwm"; - maintainers = with maintainers; [ jb55 ]; + maintainers = with maintainers; [ christianharke ]; license = licenses.isc; platforms = platforms.all; -- cgit v1.2.3 From d6bcacc4af09d1903de25cc8a54d1a5e329bd67c Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Wed, 29 Apr 2020 22:11:13 +0200 Subject: tmux: 3.1 -> 3.1a From the changelog: * Do not close stdout prematurely in control mode since it is needed to print exit messages. Prevents hanging when detaching with iTerm2. Signed-off-by: Matthias Beyer --- pkgs/tools/misc/tmux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index c8b7dadf44d..4d17768b8dc 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { pname = "tmux"; - version = "3.1"; + version = "3.1a"; outputs = [ "out" "man" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "tmux"; repo = "tmux"; rev = version; - sha256 = "1jgxal6jzzannh7hb3617r6g5p9yczl6a78m4kjnf3cxxm4jdaxz"; + sha256 = "1j85d5mj7zf3k17wsrm45m79ygc6dljc4as3crvp12r45k8xg9k6"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 435713eac2237abc1708497cf71a621fc49cc5ea Mon Sep 17 00:00:00 2001 From: Flakebi Date: Sun, 19 Apr 2020 15:19:26 +0200 Subject: salt: 2019.2.0 -> 3000.2 --- pkgs/tools/admin/salt/default.nix | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index b648cdb2512..b378f082865 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -1,21 +1,38 @@ -{ - stdenv, pythonPackages, openssl, - +{ lib +, python3 +, openssl # Many Salt modules require various Python modules to be installed, # passing them in this array enables Salt to find them. - extraInputs ? [] +, extraInputs ? [] }: +let + + py = python3.override { + packageOverrides = self: super: { + # Can be unpinned once https://github.com/saltstack/salt/issues/56007 is resolved + msgpack = super.msgpack.overridePythonAttrs ( + oldAttrs: rec { + version = "0.6.2"; + src = oldAttrs.src.override { + inherit version; + sha256 = "0c0q3vx0x137567msgs5dnizghnr059qi5kfqigxbz26jf2jyg7a"; + }; + } + ); + }; + }; -pythonPackages.buildPythonApplication rec { +in +py.pkgs.buildPythonApplication rec { pname = "salt"; - version = "2019.2.0"; + version = "3000.2"; - src = pythonPackages.fetchPypi { + src = py.pkgs.fetchPypi { inherit pname version; - sha256 = "1kgn3lway0zwwysyzpphv05j4xgxk92dk4rv1vybr2527wmvp5an"; + sha256 = "1n90qqhsvbf4pc4pcbya3rjfkblbccf4np4mxpghjqaa16fl4cqf"; }; - propagatedBuildInputs = with pythonPackages; [ + propagatedBuildInputs = with py.pkgs; [ jinja2 markupsafe msgpack @@ -24,8 +41,6 @@ pythonPackages.buildPythonApplication rec { pyzmq requests tornado_4 - ] ++ stdenv.lib.optionals (!pythonPackages.isPy3k) [ - futures ] ++ extraInputs; patches = [ ./fix-libcrypto-loading.patch ]; @@ -40,7 +55,7 @@ pythonPackages.buildPythonApplication rec { # as is it rather long. doCheck = false; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://saltstack.com/"; description = "Portable, distributed, remote execution and configuration management system"; maintainers = with maintainers; [ aneeshusa ]; -- cgit v1.2.3 From 45201a8e09bfd4648533aa8eb4e038cafd6bd765 Mon Sep 17 00:00:00 2001 From: Flakebi Date: Wed, 29 Apr 2020 22:19:29 +0200 Subject: birdtray: 1.8.0 -> 1.8.1 --- pkgs/applications/misc/birdtray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/birdtray/default.nix b/pkgs/applications/misc/birdtray/default.nix index 00707fc7ec5..5385cf67884 100644 --- a/pkgs/applications/misc/birdtray/default.nix +++ b/pkgs/applications/misc/birdtray/default.nix @@ -11,13 +11,13 @@ mkDerivation rec { pname = "birdtray"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "gyunaev"; repo = pname; rev = version; - sha256 = "15d0gz889vf9b2a046m93s5kdi6lw2sqjd5gaxgjkjrs20x5vr18"; + sha256 = "15l8drdmamq1dpqpj0h9ajj2r5vcs23cx421drvhfgs6bqlzd1hl"; }; nativeBuildInputs = [ cmake pkgconfig ]; -- cgit v1.2.3 From c7f91514795840eddcb51b820ce0ee5b8e545e27 Mon Sep 17 00:00:00 2001 From: Dmitry Olyenyov Date: Wed, 29 Apr 2020 23:45:11 +0300 Subject: darktable: 3.0.1 -> 3.0.2 --- pkgs/applications/graphics/darktable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 771e6677b17..948b4ddd54d 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation rec { - version = "3.0.1"; + version = "3.0.2"; pname = "darktable"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - sha256 = "1dvwmgnlfvi1lvdhgyddcp5apwlc8v5gwy9gmfcpra8lv8hkjjy5"; + sha256 = "1yrnkw8c47kmy2x6m1xp69hwyk02xyc8pd9kvcmyj54lzrhzdfka"; }; nativeBuildInputs = [ cmake ninja llvm pkgconfig intltool perl desktop-file-utils wrapGAppsHook ]; -- cgit v1.2.3 From 4d9e007563aade0b3abdc26e71f3d16e59aa6462 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 29 Apr 2020 23:08:15 +0200 Subject: nettle: 3.5.1 -> 3.6 https://lists.lysator.liu.se/pipermail/nettle-bugs/2020/008967.html Ed448 should now just work in knot-{dns,resolver}. --- pkgs/development/libraries/nettle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix index 36c9f0e6ac7..7c0c6476bd0 100644 --- a/pkgs/development/libraries/nettle/default.nix +++ b/pkgs/development/libraries/nettle/default.nix @@ -1,10 +1,10 @@ { callPackage, fetchurl, ... } @ args: callPackage ./generic.nix (args // rec { - version = "3.5.1"; + version = "3.6"; src = fetchurl { url = "mirror://gnu/nettle/nettle-${version}.tar.gz"; - sha256 = "06clvkdfxhlbagn4afssylmn5vrak59dlmnvy8b2xc31hycs3k3m"; + sha256 = "1wg3sprl0bzy49cmbwwm91vw67hk1x5i3ksdygsciyxz587hsk6j"; }; }) -- cgit v1.2.3 From 5f26d13f3769aca1891113eb5484473c382ece49 Mon Sep 17 00:00:00 2001 From: Jesse Wattenbarger Date: Wed, 29 Apr 2020 17:19:15 -0400 Subject: hy: 0.17.0 -> 0.18.0 (#84661) Co-Authored-By: Jon --- pkgs/development/interpreters/hy/default.nix | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/hy/default.nix b/pkgs/development/interpreters/hy/default.nix index 5816b3a175c..a3aca532b0f 100644 --- a/pkgs/development/interpreters/hy/default.nix +++ b/pkgs/development/interpreters/hy/default.nix @@ -1,23 +1,32 @@ -{ stdenv, fetchurl, python2Packages }: +{ stdenv, python3Packages }: -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "hy"; - version = "0.17.0"; + version = "0.18.0"; - src = python2Packages.fetchPypi { + src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1gdbqsirsdxj320wnp7my5awzs1kfs6m4fqmkzbd1zd47qzj0zfi"; + sha256 = "04dfwm336gw61fmgwikvh0cnxk682p19b4w555wl5d7mlym4rwj2"; }; - propagatedBuildInputs = with python2Packages; [ + checkInputs = with python3Packages; [ flake8 pytest ]; + + propagatedBuildInputs = with python3Packages; [ appdirs astor clint + colorama fastentrypoints funcparserlib rply + pygments ]; + # Hy does not include tests in the source distribution from PyPI, so only test executable. + checkPhase = '' + $out/bin/hy --help > /dev/null + ''; + meta = with stdenv.lib; { description = "A LISP dialect embedded in Python"; homepage = "http://hylang.org/"; -- cgit v1.2.3 From 467a987f0be457683001c38c24c50aa71f58ae4b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 29 Apr 2020 23:38:23 +0200 Subject: steam: update generated runtime dependencies The referenced zenity URL wasn't valid anymore: trying http://repo.steampowered.com/steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt6_amd64.deb % Total % Received % Xferd Average Speed Time Time Time Current Dload Upload Total Spent Left Speed 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0 curl: (22) The requested URL returned error: 404 Not Found --- pkgs/games/steam/runtime-generated.nix | 276 +++++++++++++++++++-------------- 1 file changed, 156 insertions(+), 120 deletions(-) diff --git a/pkgs/games/steam/runtime-generated.nix b/pkgs/games/steam/runtime-generated.nix index 36f16b6155b..2f9fc517790 100644 --- a/pkgs/games/steam/runtime-generated.nix +++ b/pkgs/games/steam/runtime-generated.nix @@ -129,6 +129,15 @@ name = "libatk1.0-0.deb"; }; } + rec { + name = "libatomic1_5.4.0-7.really.6+steamrt1.2+srt2_amd64"; + sha256 = "8dd843d4497f66c1af07551d8cc636e63ffff692187b51d0a01191c96bc0049a"; + url = "mirror://steamrt/pool/main/g/gcc-5/libatomic1_5.4.0-7.really.6+steamrt1.2+srt2_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "libatomic1.deb"; + }; + } rec { name = "libattr1_2.4.46-5ubuntu1+steamrt1.1+srt2_amd64"; sha256 = "d33b00c3e19337f3abbb070f646adda7420f171f5487dca5e253b68b63a4d8fc"; @@ -246,6 +255,15 @@ name = "libcap2.deb"; }; } + rec { + name = "libcapsule-tools-relocatable_0.20190926.0-0co1+srt1_amd64"; + sha256 = "9ddaac17a0f812eec785e34eefccb8ea24a4abf0fa6ad008d03b26d5493ea010"; + url = "mirror://steamrt/pool/main/libc/libcapsule/libcapsule-tools-relocatable_0.20190926.0-0co1+srt1_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "libcapsule-tools-relocatable.deb"; + }; + } rec { name = "libcg_3.0.0016-0ubuntu1+srt6_amd64"; sha256 = "6e627aa3ff1724ec8759431f3ead530f4c1511eb2b881d168a1929c8eac2e196"; @@ -669,6 +687,15 @@ name = "libindicator7.deb"; }; } + rec { + name = "libitm1_5.4.0-7.really.6+steamrt1.2+srt2_amd64"; + sha256 = "3c01841997e77fe1616b16936394c86383dc76e875f70e6d96ed016e4b945050"; + url = "mirror://steamrt/pool/main/g/gcc-5/libitm1_5.4.0-7.really.6+steamrt1.2+srt2_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "libitm1.deb"; + }; + } rec { name = "libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt5_amd64"; sha256 = "9a419baf1b88386cf643ca64965de607321e5d27f13c5bd68be0eb1a803fd7a9"; @@ -993,6 +1020,15 @@ name = "libpulse0.deb"; }; } + rec { + name = "libquadmath0_5.4.0-7.really.6+steamrt1.2+srt2_amd64"; + sha256 = "12523138b2f21cd6d824b5c778ee49789ef0129ba6207cf03d3cf6b4138b1a1b"; + url = "mirror://steamrt/pool/main/g/gcc-5/libquadmath0_5.4.0-7.really.6+steamrt1.2+srt2_amd64.deb"; + source = fetchurl { + inherit url sha256; + name = "libquadmath0.deb"; + }; + } rec { name = "libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt6_amd64"; sha256 = "e55b129066b92ab99f518d2f857b54e8754c3c873b5fb603270e3c4c36564a7b"; @@ -1192,27 +1228,27 @@ }; } rec { - name = "libsteam-runtime-tools-0-0_0.20200109.0-0+steamrt1.1+srt1_amd64"; - sha256 = "680a2855b601ecccc81179df162722081ad0c7f4d1689e25bbce9d19de1a3eb6"; - url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-0_0.20200109.0-0+steamrt1.1+srt1_amd64.deb"; + name = "libsteam-runtime-tools-0-0_0.20200415.0+srt1_amd64"; + sha256 = "0db05ccf5ca6705a6001d2c43ae5163cc289ef60126381bf886014e2344b4190"; + url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-0_0.20200415.0+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsteam-runtime-tools-0-0.deb"; }; } rec { - name = "libsteam-runtime-tools-0-helpers_0.20200109.0-0+steamrt1.1+srt1_amd64"; - sha256 = "b33f5c1217c7927057428b54faa4d0fcdddda1b5b18d708f755e96893ed6e108"; - url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-helpers_0.20200109.0-0+steamrt1.1+srt1_amd64.deb"; + name = "libsteam-runtime-tools-0-helpers_0.20200415.0+srt1_amd64"; + sha256 = "c568548d3c73df1c61efe06574e4ab17c2250059e9659690dec6c43db8695ce8"; + url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-helpers_0.20200415.0+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsteam-runtime-tools-0-helpers.deb"; }; } rec { - name = "libsteam-runtime-tools-0-relocatable-libs_0.20200109.0-0+steamrt1.1+srt1_amd64"; - sha256 = "4f2ddb4dd6f48636f95bb301541a023ba8235672e1e053be8da9961787958d18"; - url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-relocatable-libs_0.20200109.0-0+steamrt1.1+srt1_amd64.deb"; + name = "libsteam-runtime-tools-0-relocatable-libs_0.20200415.0+srt1_amd64"; + sha256 = "450c03778f4901e8b54f5dc879b071a84d18f4fc65e6308b91eebf40c77ef093"; + url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-relocatable-libs_0.20200415.0+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libsteam-runtime-tools-0-relocatable-libs.deb"; @@ -1444,18 +1480,18 @@ }; } rec { - name = "libvulkan1_1.2.135~srt-0+steamrt1.1+srt1_amd64"; - sha256 = "99b0d38e6a2240dbea57c3ebee18de7013ee5d346c82bc82243c18e66bc50ae4"; - url = "mirror://steamrt/pool/main/v/vulkan-loader/libvulkan1_1.2.135~srt-0+steamrt1.1+srt1_amd64.deb"; + name = "libvulkan1_1.2.135.0-1~steamrt1.1+srt1_amd64"; + sha256 = "fa3dfb44b47c35e8a16de3c8240accdca131b70dd59a84f6e38cc6824219fa28"; + url = "mirror://steamrt/pool/main/v/vulkan-loader/libvulkan1_1.2.135.0-1~steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libvulkan1.deb"; }; } rec { - name = "libwaffle-1-0_1.6.0-2~steamrt1.3+srt1_amd64"; - sha256 = "40ebf5f91707d0f183841ab8673f7bdd6d77540f090fc97cb69be54381c382be"; - url = "mirror://steamrt/pool/main/w/waffle/libwaffle-1-0_1.6.0-2~steamrt1.3+srt1_amd64.deb"; + name = "libwaffle-1-0_1.6.1-0+steamrt1.1+srt1_amd64"; + sha256 = "a2a73515ddef193da5de918190df27fce75cf27c3081662c2f6fc5d227c96cc4"; + url = "mirror://steamrt/pool/main/w/waffle/libwaffle-1-0_1.6.1-0+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "libwaffle-1-0.deb"; @@ -1912,27 +1948,27 @@ }; } rec { - name = "steam-runtime-tools-bin_0.20200109.0-0+steamrt1.1+srt1_amd64"; - sha256 = "b5fcefb31c79a4ac085ef1050cdb2770507fbcf04eae713f9f16fdc3a483a85d"; - url = "mirror://steamrt/pool/main/s/steam-runtime-tools/steam-runtime-tools-bin_0.20200109.0-0+steamrt1.1+srt1_amd64.deb"; + name = "steam-runtime-tools-bin_0.20200415.0+srt1_amd64"; + sha256 = "e21848eb4cf02402600a952f5ca8bafbd95db9f5b3bb8d5af746721c5ac4ebc3"; + url = "mirror://steamrt/pool/main/s/steam-runtime-tools/steam-runtime-tools-bin_0.20200415.0+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "steam-runtime-tools-bin.deb"; }; } rec { - name = "steamrt-legacy_1.20200128.0+srt1_amd64"; - sha256 = "16a8adf316032424fa5cd53f498c53472c45a66b572e8c60adb2ff3ae7556eed"; - url = "mirror://steamrt/pool/main/s/steamrt/steamrt-legacy_1.20200128.0+srt1_amd64.deb"; + name = "steamrt-legacy_1.20200421.0+srt1_amd64"; + sha256 = "9ee2744dbefc6c8055d3f496ad8e7ab8df01049a5571b9558c23b15001218fa6"; + url = "mirror://steamrt/pool/main/s/steamrt/steamrt-legacy_1.20200421.0+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "steamrt-legacy.deb"; }; } rec { - name = "steamrt-libs_1.20200128.0+srt1_amd64"; - sha256 = "18247c8534f8d67f63f4ece884b15276e0eecf540d0758ed6d5ae8b6a6ba510b"; - url = "mirror://steamrt/pool/main/s/steamrt/steamrt-libs_1.20200128.0+srt1_amd64.deb"; + name = "steamrt-libs_1.20200421.0+srt1_amd64"; + sha256 = "52ffad4cdca3f7f1c8091474a1a978941512c993e52d15fadab49165e248603b"; + url = "mirror://steamrt/pool/main/s/steamrt/steamrt-libs_1.20200421.0+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "steamrt-libs.deb"; @@ -1975,72 +2011,54 @@ }; } rec { - name = "vulkan-tools_1.2.131.1+dfsg1-1+steamrt1.1+srt1_amd64"; - sha256 = "b5c0c3fd9f5329f2aff54ce73f9281e3e61156556e1ee50c697b37f2144b1531"; - url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-tools_1.2.131.1+dfsg1-1+steamrt1.1+srt1_amd64.deb"; + name = "vulkan-tools_1.2.135.0+dfsg1-1~steamrt1.1+srt1_amd64"; + sha256 = "bb70e1a31fe204319ea24292fe0ee7a9073f1b8f79e66ffb1ab192e500f8452b"; + url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-tools_1.2.135.0+dfsg1-1~steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "vulkan-tools.deb"; }; } rec { - name = "vulkan-tools-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_amd64"; - sha256 = "33b03b9413ec308f5ee5b8699e9f9ad939b501b602eea185fdcaa69863deb70c"; - url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-tools-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_amd64.deb"; + name = "vulkan-tools-multiarch_1.2.135.0+dfsg1-1~steamrt1.1+srt1_amd64"; + sha256 = "8e8aa0bf8fe147dd52e442a88e57a16f86b3a807201175585d47c64531865822"; + url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-tools-multiarch_1.2.135.0+dfsg1-1~steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "vulkan-tools-multiarch.deb"; }; } rec { - name = "vulkan-utils_1.2.131.1+dfsg1-1+steamrt1.1+srt1_all"; - sha256 = "f10004e20ed5fc93edf035f8f34bb9f8307eb34974a3ed5aae9ba87f00a2c468"; - url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-utils_1.2.131.1+dfsg1-1+steamrt1.1+srt1_all.deb"; - source = fetchurl { - inherit url sha256; - name = "vulkan-utils.deb"; - }; - } - rec { - name = "vulkan-utils-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_amd64"; - sha256 = "a1e9387bb5cb7effb23c5994dd2724614cfed7a447ec9c449ee4effcab58fd4c"; - url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-utils-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_amd64.deb"; - source = fetchurl { - inherit url sha256; - name = "vulkan-utils-multiarch.deb"; - }; - } - rec { - name = "waffle-utils_1.6.0-2~steamrt1.3+srt1_amd64"; - sha256 = "b465d2c357b0376f355a99ac99830e78974747859ec4ca9084bdeff9891920d6"; - url = "mirror://steamrt/pool/main/w/waffle/waffle-utils_1.6.0-2~steamrt1.3+srt1_amd64.deb"; + name = "waffle-utils_1.6.1-0+steamrt1.1+srt1_amd64"; + sha256 = "ad14f1e2dcc6b9ed7b036989cf5f18efb683879927a4b474692bbe1d7ddbe94c"; + url = "mirror://steamrt/pool/main/w/waffle/waffle-utils_1.6.1-0+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "waffle-utils.deb"; }; } rec { - name = "waffle-utils-multiarch_1.6.0-2~steamrt1.3+srt1_amd64"; - sha256 = "de563095affd9fd5a4ec2941b72481bbd6176bdc210dad587372bab3cec406c1"; - url = "mirror://steamrt/pool/main/w/waffle/waffle-utils-multiarch_1.6.0-2~steamrt1.3+srt1_amd64.deb"; + name = "waffle-utils-multiarch_1.6.1-0+steamrt1.1+srt1_amd64"; + sha256 = "cf66bcb711bee45fb722d4125d37d8001fe7f3691f81ac224b62f849af0b4fba"; + url = "mirror://steamrt/pool/main/w/waffle/waffle-utils-multiarch_1.6.1-0+steamrt1.1+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "waffle-utils-multiarch.deb"; }; } rec { - name = "zenity_3.4.0-0ubuntu4+steamrt2+srt6_amd64"; - sha256 = "5eb59aa8d2211153c780aab2304e8694d7eb0204f284193ff2a037dc9e1274db"; - url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt6_amd64.deb"; + name = "zenity_3.4.0-0ubuntu4+steamrt3+srt1_amd64"; + sha256 = "c31a99f8d47cba157db251ea97cd14074d99c622969dd4d4173f76494feb7723"; + url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt3+srt1_amd64.deb"; source = fetchurl { inherit url sha256; name = "zenity.deb"; }; } rec { - name = "zenity-common_3.4.0-0ubuntu4+steamrt2+srt6_all"; - sha256 = "bc8f0b80672833be72c6dd87d406b5fc0ef92e51f91e3a461678fc97844649bc"; - url = "mirror://steamrt/pool/main/z/zenity/zenity-common_3.4.0-0ubuntu4+steamrt2+srt6_all.deb"; + name = "zenity-common_3.4.0-0ubuntu4+steamrt3+srt1_all"; + sha256 = "7ec603c8b00c5573e88e1df9785af4baef93b54e377e697515eb939b7c119cdc"; + url = "mirror://steamrt/pool/main/z/zenity/zenity-common_3.4.0-0ubuntu4+steamrt3+srt1_all.deb"; source = fetchurl { inherit url sha256; name = "zenity-common.deb"; @@ -2183,6 +2201,15 @@ name = "libatk1.0-0.deb"; }; } + rec { + name = "libatomic1_5.4.0-7.really.6+steamrt1.2+srt2_i386"; + sha256 = "aafd5b3b573f22562e3f93bfa449ca374e2788fb14d555193c5c57e996def8fb"; + url = "mirror://steamrt/pool/main/g/gcc-5/libatomic1_5.4.0-7.really.6+steamrt1.2+srt2_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "libatomic1.deb"; + }; + } rec { name = "libattr1_2.4.46-5ubuntu1+steamrt1.1+srt2_i386"; sha256 = "bcea5d6f2743c617dac44c4d836b6937a64816f3c288a56b656ee4adbf63714a"; @@ -2300,6 +2327,15 @@ name = "libcap2.deb"; }; } + rec { + name = "libcapsule-tools-relocatable_0.20190926.0-0co1+srt1_i386"; + sha256 = "5ce9e11e0204db54cecb59b59b1c6fc6bd5e4aefe73a327dbb85283b08591428"; + url = "mirror://steamrt/pool/main/libc/libcapsule/libcapsule-tools-relocatable_0.20190926.0-0co1+srt1_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "libcapsule-tools-relocatable.deb"; + }; + } rec { name = "libcg_3.0.0016-0ubuntu1+srt6_i386"; sha256 = "a21ba20d03f43163c1222fbc6a570c20783a1d504dcf92306ab029c437fd0df9"; @@ -2723,6 +2759,15 @@ name = "libindicator7.deb"; }; } + rec { + name = "libitm1_5.4.0-7.really.6+steamrt1.2+srt2_i386"; + sha256 = "188591aec152ece7b33b765079593a110a005046977d15794d5cc3be5b3381c7"; + url = "mirror://steamrt/pool/main/g/gcc-5/libitm1_5.4.0-7.really.6+steamrt1.2+srt2_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "libitm1.deb"; + }; + } rec { name = "libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt5_i386"; sha256 = "a59a4de570335899d10f36b4b9552ee894fc0bb21c4ee4e06ed689f3fa55c2e6"; @@ -3047,6 +3092,15 @@ name = "libpulse0.deb"; }; } + rec { + name = "libquadmath0_5.4.0-7.really.6+steamrt1.2+srt2_i386"; + sha256 = "58f646279972a537cf838fc935f9f37285e5255604d7b5c1e034644e77d3e25b"; + url = "mirror://steamrt/pool/main/g/gcc-5/libquadmath0_5.4.0-7.really.6+steamrt1.2+srt2_i386.deb"; + source = fetchurl { + inherit url sha256; + name = "libquadmath0.deb"; + }; + } rec { name = "libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt6_i386"; sha256 = "8827d782d8fedf7fe0285bbab14914e61d2ac5fe5e7ea297fbff916c7fd73939"; @@ -3246,27 +3300,27 @@ }; } rec { - name = "libsteam-runtime-tools-0-0_0.20200109.0-0+steamrt1.1+srt1_i386"; - sha256 = "dfd80854857cdbc764f799f34acd7f37a4c3e773c4ba5c7c81394071148a140f"; - url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-0_0.20200109.0-0+steamrt1.1+srt1_i386.deb"; + name = "libsteam-runtime-tools-0-0_0.20200415.0+srt1_i386"; + sha256 = "7da98a9a206829dbf5cc95570049502d1cf8dd2a2234a981787f14cc098c1739"; + url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-0_0.20200415.0+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libsteam-runtime-tools-0-0.deb"; }; } rec { - name = "libsteam-runtime-tools-0-helpers_0.20200109.0-0+steamrt1.1+srt1_i386"; - sha256 = "f2c5fc6abcc3a938e2a0b27e8682b56944a2a61416e8d0edb5878af2e16c98cb"; - url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-helpers_0.20200109.0-0+steamrt1.1+srt1_i386.deb"; + name = "libsteam-runtime-tools-0-helpers_0.20200415.0+srt1_i386"; + sha256 = "bf06ad0ef0d5c80ddff53c58e4397c87fd655e1913ecf48a29560d27719b4d71"; + url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-helpers_0.20200415.0+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libsteam-runtime-tools-0-helpers.deb"; }; } rec { - name = "libsteam-runtime-tools-0-relocatable-libs_0.20200109.0-0+steamrt1.1+srt1_i386"; - sha256 = "c06ea7ec21d2114925c09d5245e87482c81cc4e1928ed31827ab58cb094721ae"; - url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-relocatable-libs_0.20200109.0-0+steamrt1.1+srt1_i386.deb"; + name = "libsteam-runtime-tools-0-relocatable-libs_0.20200415.0+srt1_i386"; + sha256 = "79e3b5b5a2904daccb17f5f54e3a87842dd9408fe04a8fee8d4ee83c3a3c0bcf"; + url = "mirror://steamrt/pool/main/s/steam-runtime-tools/libsteam-runtime-tools-0-relocatable-libs_0.20200415.0+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libsteam-runtime-tools-0-relocatable-libs.deb"; @@ -3498,18 +3552,18 @@ }; } rec { - name = "libvulkan1_1.2.135~srt-0+steamrt1.1+srt1_i386"; - sha256 = "ac161149e1106247de706788a7ea29dbe5e3c17c2b8aedf97ec892b311abbb75"; - url = "mirror://steamrt/pool/main/v/vulkan-loader/libvulkan1_1.2.135~srt-0+steamrt1.1+srt1_i386.deb"; + name = "libvulkan1_1.2.135.0-1~steamrt1.1+srt1_i386"; + sha256 = "dd6167b259a8ec4c927f3fa710d01456321b3ff40f6daa3383ec353866615aaa"; + url = "mirror://steamrt/pool/main/v/vulkan-loader/libvulkan1_1.2.135.0-1~steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libvulkan1.deb"; }; } rec { - name = "libwaffle-1-0_1.6.0-2~steamrt1.3+srt1_i386"; - sha256 = "875ebdcc60fd8be86b6e83a2155bea69aa3ef7442d60eef277bcdf814c663452"; - url = "mirror://steamrt/pool/main/w/waffle/libwaffle-1-0_1.6.0-2~steamrt1.3+srt1_i386.deb"; + name = "libwaffle-1-0_1.6.1-0+steamrt1.1+srt1_i386"; + sha256 = "06f22a35ca49969e44f1bdaca82a1d085e69211bf3b39915d77d80f414ea8668"; + url = "mirror://steamrt/pool/main/w/waffle/libwaffle-1-0_1.6.1-0+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "libwaffle-1-0.deb"; @@ -3966,27 +4020,27 @@ }; } rec { - name = "steam-runtime-tools-bin_0.20200109.0-0+steamrt1.1+srt1_i386"; - sha256 = "52e587b75463b08e0e903e30cd4b836bd4e39ead8d556807e5628eff36fdc477"; - url = "mirror://steamrt/pool/main/s/steam-runtime-tools/steam-runtime-tools-bin_0.20200109.0-0+steamrt1.1+srt1_i386.deb"; + name = "steam-runtime-tools-bin_0.20200415.0+srt1_i386"; + sha256 = "3ea27a32f19f6e5133385fe4072f3d9a027c4f83604355baa34cf3ae5e346db5"; + url = "mirror://steamrt/pool/main/s/steam-runtime-tools/steam-runtime-tools-bin_0.20200415.0+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "steam-runtime-tools-bin.deb"; }; } rec { - name = "steamrt-legacy_1.20200128.0+srt1_i386"; - sha256 = "3adf8b89ac83f12eeb431785bd18a569b1174bc81aa24d5c562687b823704f28"; - url = "mirror://steamrt/pool/main/s/steamrt/steamrt-legacy_1.20200128.0+srt1_i386.deb"; + name = "steamrt-legacy_1.20200421.0+srt1_i386"; + sha256 = "08371f2a03aacd50f578b7aca4e6934fc60b9db1927e9eb3c8f1a5f6421e79e5"; + url = "mirror://steamrt/pool/main/s/steamrt/steamrt-legacy_1.20200421.0+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "steamrt-legacy.deb"; }; } rec { - name = "steamrt-libs_1.20200128.0+srt1_i386"; - sha256 = "8ad6092d1b4d257883ca4f3fac8ee5b9a71413c8bdbc149a9bec843047867311"; - url = "mirror://steamrt/pool/main/s/steamrt/steamrt-libs_1.20200128.0+srt1_i386.deb"; + name = "steamrt-libs_1.20200421.0+srt1_i386"; + sha256 = "0f84ef7ebea603df58d4549a8368a51ceb3989d136174870bfd4c2ed50a13195"; + url = "mirror://steamrt/pool/main/s/steamrt/steamrt-libs_1.20200421.0+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "steamrt-libs.deb"; @@ -4029,72 +4083,54 @@ }; } rec { - name = "vulkan-tools_1.2.131.1+dfsg1-1+steamrt1.1+srt1_i386"; - sha256 = "6a8576cc6fadc4d18c97b100dc24bad1906f6f56cab024997787355025695df4"; - url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-tools_1.2.131.1+dfsg1-1+steamrt1.1+srt1_i386.deb"; + name = "vulkan-tools_1.2.135.0+dfsg1-1~steamrt1.1+srt1_i386"; + sha256 = "1a252f79e90034726d80e49ab892ddfd504fa32dfef93887ed2c6e6e83e77248"; + url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-tools_1.2.135.0+dfsg1-1~steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "vulkan-tools.deb"; }; } rec { - name = "vulkan-tools-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_i386"; - sha256 = "fae0430f540c71bd8f6ab3099f8aa132d2eda858b66facf3d8a586ab38cffde6"; - url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-tools-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_i386.deb"; + name = "vulkan-tools-multiarch_1.2.135.0+dfsg1-1~steamrt1.1+srt1_i386"; + sha256 = "f7f68aefcb4f45f855949ad84463c68071595568db27480d3df3ed9be5683b5f"; + url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-tools-multiarch_1.2.135.0+dfsg1-1~steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "vulkan-tools-multiarch.deb"; }; } rec { - name = "vulkan-utils_1.2.131.1+dfsg1-1+steamrt1.1+srt1_all"; - sha256 = "f10004e20ed5fc93edf035f8f34bb9f8307eb34974a3ed5aae9ba87f00a2c468"; - url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-utils_1.2.131.1+dfsg1-1+steamrt1.1+srt1_all.deb"; - source = fetchurl { - inherit url sha256; - name = "vulkan-utils.deb"; - }; - } - rec { - name = "vulkan-utils-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_i386"; - sha256 = "f81b81ef14f11662d2d5e5a7f688c2ef4f9ad9625ec5e59de91aab3f1ad45406"; - url = "mirror://steamrt/pool/main/v/vulkan-tools/vulkan-utils-multiarch_1.2.131.1+dfsg1-1+steamrt1.1+srt1_i386.deb"; - source = fetchurl { - inherit url sha256; - name = "vulkan-utils-multiarch.deb"; - }; - } - rec { - name = "waffle-utils_1.6.0-2~steamrt1.3+srt1_i386"; - sha256 = "37df214d4f0fd1c5e9afce405756fc1615f2d5cba468b34569b13f3e8a08a2a5"; - url = "mirror://steamrt/pool/main/w/waffle/waffle-utils_1.6.0-2~steamrt1.3+srt1_i386.deb"; + name = "waffle-utils_1.6.1-0+steamrt1.1+srt1_i386"; + sha256 = "c88c88a12f5a9486a20275624c45ab7ac2170e846ea1368d1180e7b39c9d586f"; + url = "mirror://steamrt/pool/main/w/waffle/waffle-utils_1.6.1-0+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "waffle-utils.deb"; }; } rec { - name = "waffle-utils-multiarch_1.6.0-2~steamrt1.3+srt1_i386"; - sha256 = "5866f8bf43b6c19608670a8c565ce8f0dac9db9c943e65ac25e9cb4f951997a4"; - url = "mirror://steamrt/pool/main/w/waffle/waffle-utils-multiarch_1.6.0-2~steamrt1.3+srt1_i386.deb"; + name = "waffle-utils-multiarch_1.6.1-0+steamrt1.1+srt1_i386"; + sha256 = "9aa2ee8c466c343dda5c8db9465238eb5f4cb55b5cfcfca8a3c109ba1d6c6d65"; + url = "mirror://steamrt/pool/main/w/waffle/waffle-utils-multiarch_1.6.1-0+steamrt1.1+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "waffle-utils-multiarch.deb"; }; } rec { - name = "zenity_3.4.0-0ubuntu4+steamrt2+srt6_i386"; - sha256 = "1c772d4f96424d204ab4913efcafbe43518257ca5032ca7b23d6c6ab76439117"; - url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt6_i386.deb"; + name = "zenity_3.4.0-0ubuntu4+steamrt3+srt1_i386"; + sha256 = "b8b0d0781ed2e59ac22af8006e61323a5f1f5be44d47e0fea0ca32e8c575528d"; + url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt3+srt1_i386.deb"; source = fetchurl { inherit url sha256; name = "zenity.deb"; }; } rec { - name = "zenity-common_3.4.0-0ubuntu4+steamrt2+srt6_all"; - sha256 = "bc8f0b80672833be72c6dd87d406b5fc0ef92e51f91e3a461678fc97844649bc"; - url = "mirror://steamrt/pool/main/z/zenity/zenity-common_3.4.0-0ubuntu4+steamrt2+srt6_all.deb"; + name = "zenity-common_3.4.0-0ubuntu4+steamrt3+srt1_all"; + sha256 = "7ec603c8b00c5573e88e1df9785af4baef93b54e377e697515eb939b7c119cdc"; + url = "mirror://steamrt/pool/main/z/zenity/zenity-common_3.4.0-0ubuntu4+steamrt3+srt1_all.deb"; source = fetchurl { inherit url sha256; name = "zenity-common.deb"; -- cgit v1.2.3 From 42539c4c89bffb45b371cff16751bd79f91b96cb Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 29 Apr 2020 23:46:00 +0200 Subject: roundcube: 1.4.3 -> 1.4.4 https://github.com/roundcube/roundcubemail/releases/tag/1.4.4 --- pkgs/servers/roundcube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index 939424ff2bf..a1dc25e6e28 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.4.3"; + version = "1.4.4"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "1gsl9rpdkv388i6zvciladhb15fw94a8xjyh4ai1664nkwl51wi4"; + sha256 = "1my726p0wmsn21nbdsjx02h6hnbh8nidzipzdy0gk0qgda1j729b"; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; -- cgit v1.2.3 From 9e6db1f44a4edee158c88e39b4d73549af925d33 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 28 Apr 2020 18:27:52 +1000 Subject: minikube: use makefile --- .../networking/cluster/minikube/default.nix | 65 +++++++++------------- 1 file changed, 27 insertions(+), 38 deletions(-) diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index d48a28f46a8..9c5727ec735 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -1,67 +1,56 @@ { stdenv , buildGoModule , fetchFromGitHub -, pkgconfig -, makeWrapper , go-bindata +, installShellFiles +, pkg-config +, which , libvirt , vmnet }: buildGoModule rec { - pname = "minikube"; + pname = "minikube"; version = "1.9.2"; + # for -ldflags - commit = "1b78a7b8a99ad6a3c62b8d22f57120d614d17935"; + commit = "1b78a7b8a99ad6a3c62b8d22f57120d614d17935"; - goPackagePath = "k8s.io/minikube"; - subPackages = [ "cmd/minikube" ]; - modSha256 = "1pxs6myszgma3rzz0nhfjbnylv6m0xzlinvmlg0c4ijvkkzxg3v5"; + modSha256 = "1pxs6myszgma3rzz0nhfjbnylv6m0xzlinvmlg0c4ijvkkzxg3v5"; src = fetchFromGitHub { - owner = "kubernetes"; - repo = "minikube"; - rev = "v${version}"; + owner = "kubernetes"; + repo = "minikube"; + rev = "v${version}"; sha256 = "025v45427d885qkjjg7ig8fgrvjalnf1lajsj0cnbwbih2m69svg"; }; - nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ libvirt ] - ++ stdenv.lib.optionals stdenv.isDarwin [ vmnet ]; - - preBuild = '' - go-bindata -nomemcopy -o pkg/minikube/assets/assets.go -pkg assets deploy/addons/... - go-bindata -nomemcopy -o pkg/minikube/translate/translations.go -pkg translate translations/... + nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ]; - VERSION_MAJOR=$(grep "^VERSION_MAJOR" Makefile | sed "s/^.*\s//") - VERSION_MINOR=$(grep "^VERSION_MINOR" Makefile | sed "s/^.*\s//") - ISO_VERSION=v$VERSION_MAJOR.$VERSION_MINOR.0 - ISO_BUCKET=$(grep "^ISO_BUCKET" Makefile | sed "s/^.*\s//") + buildInputs = if stdenv.isDarwin then [ vmnet ] else if stdenv.isLinux then [ libvirt ] else null; - export buildFlagsArray="-ldflags=\ - -X ${goPackagePath}/pkg/version.version=v${version} \ - -X ${goPackagePath}/pkg/version.isoVersion=$ISO_VERSION \ - -X ${goPackagePath}/pkg/version.isoPath=$ISO_BUCKET \ - -X ${goPackagePath}/pkg/version.gitCommitID=${commit} \ - -X ${goPackagePath}/pkg/drivers/kvm.version=v${version} \ - -X ${goPackagePath}/pkg/drivers/kvm.gitCommitID=${commit} \ - -X ${goPackagePath}/pkg/drivers/hyperkit.version=v${version} \ - -X ${goPackagePath}/pkg/drivers/hyperkit.gitCommitID=${commit}" + buildPhase = '' + make COMMIT=${commit} ''; - postInstall = '' - mkdir -p $out/share/bash-completion/completions/ - MINIKUBE_WANTUPDATENOTIFICATION=false MINIKUBE_WANTKUBECTLDOWNLOADMSG=false HOME=$PWD $out/bin/minikube completion bash > $out/share/bash-completion/completions/minikube + installPhase = '' + install out/minikube -Dt $out/bin + + export HOME=$PWD + export MINIKUBE_WANTUPDATENOTIFICATION=false + export MINIKUBE_WANTKUBECTLDOWNLOADMSG=false - mkdir -p $out/share/zsh/site-functions/ - MINIKUBE_WANTUPDATENOTIFICATION=false MINIKUBE_WANTKUBECTLDOWNLOADMSG=false HOME=$PWD $out/bin/minikube completion zsh > $out/share/zsh/site-functions/_minikube + for shell in bash zsh; do + $out/bin/minikube completion $shell > minikube.$shell + installShellCompletion minikube.$shell + done ''; meta = with stdenv.lib; { - homepage = "https://github.com/kubernetes/minikube"; + homepage = "https://minikube.sigs.k8s.io"; description = "A tool that makes it easy to run Kubernetes locally"; - license = licenses.asl20; + license = licenses.asl20; maintainers = with maintainers; [ ebzzry copumpkin vdemeester atkinschang ]; - platforms = with platforms; unix; + platforms = platforms.unix; }; } -- cgit v1.2.3 From 3d396266ae8346da9b6e35d4acfaa4f7278f5821 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 28 Apr 2020 18:27:51 +1000 Subject: docker-machine-hyperkit: use makefile --- .../networking/cluster/docker-machine/hyperkit.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix index ba3b1e4d889..ec5a79e9ace 100644 --- a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix +++ b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix @@ -1,19 +1,20 @@ { lib, buildGoModule, minikube }: buildGoModule rec { - inherit (minikube) version src nativeBuildInputs buildInputs goPackagePath preBuild; + inherit (minikube) version src nativeBuildInputs buildInputs modSha256 commit; pname = "docker-machine-hyperkit"; - subPackages = [ "cmd/drivers/hyperkit" ]; - modSha256 = minikube.go-modules.outputHash; + buildPhase = '' + make docker-machine-driver-hyperkit COMMIT=${commit} + ''; - postInstall = '' - mv $out/bin/hyperkit $out/bin/docker-machine-driver-hyperkit + installPhase = '' + install out/docker-machine-driver-hyperkit -Dt $out/bin ''; meta = with lib; { - homepage = "https://github.com/kubernetes/minikube/blob/master/docs/drivers.md"; + homepage = "https://minikube.sigs.k8s.io/docs/drivers/hyperkit"; description = "HyperKit driver for docker-machine."; license = licenses.asl20; maintainers = with maintainers; [ atkinschang ]; -- cgit v1.2.3 From 170bf218c68a1096fc1a64de47face3f885c6944 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 28 Apr 2020 18:27:51 +1000 Subject: docker-machine-kvm2: use makefile --- .../networking/cluster/docker-machine/kvm2.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix index 6659b18b1bd..fa33c2c4ee0 100644 --- a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix +++ b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix @@ -1,22 +1,23 @@ { lib, buildGoModule, minikube }: buildGoModule rec { - inherit (minikube) version src nativeBuildInputs buildInputs goPackagePath preBuild; + inherit (minikube) version src nativeBuildInputs buildInputs modSha256 commit; pname = "docker-machine-kvm2"; - subPackages = [ "cmd/drivers/kvm" ]; - modSha256 = minikube.go-modules.outputHash; + buildPhase = '' + make docker-machine-driver-kvm2 COMMIT=${commit} + ''; - postInstall = '' - mv $out/bin/kvm $out/bin/docker-machine-driver-kvm2 + installPhase = '' + install out/docker-machine-driver-kvm2 -Dt $out/bin ''; meta = with lib; { - homepage = "https://github.com/kubernetes/minikube/blob/master/docs/drivers.md"; + homepage = "https://minikube.sigs.k8s.io/docs/drivers/kvm2"; description = "KVM2 driver for docker-machine."; license = licenses.asl20; maintainers = with maintainers; [ tadfisher atkinschang ]; - platforms = platforms.unix; + platforms = platforms.linux; }; } -- cgit v1.2.3 From 3283e78f5b6e343d0b2a10bd80d5f1aa71a9ba35 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 29 Apr 2020 17:33:00 -0500 Subject: nodejs-13_x: 13.13.0 -> 13.14.0 Changelog: https://github.com/nodejs/node/releases/tag/v13.14.0 --- pkgs/development/web/nodejs/v13.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/nodejs/v13.nix b/pkgs/development/web/nodejs/v13.nix index 1f32c660f89..f157269b636 100644 --- a/pkgs/development/web/nodejs/v13.nix +++ b/pkgs/development/web/nodejs/v13.nix @@ -1,13 +1,13 @@ { callPackage, openssl, icu, python3, enableNpm ? true }: let - buildNodejs = callPackage ./nodejs.nix { + buildNodejs = callPackage ./nodejs.nix { inherit openssl icu; python = python3; }; in buildNodejs { inherit enableNpm; - version = "13.13.0"; - sha256 = "0wy7d2alli59gwl73hpaf3bz1wxkkcw5yjsgyz42695fz86p64b7"; + version = "13.14.0"; + sha256 = "1gi9nl99wsiqpwm266jdsa8g6rmjw4wqwgrkx9f2qk1y3hjcs0vf"; } -- cgit v1.2.3 From 948b38300d722b6c688e91ed0d13f3fbe7805716 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 29 Apr 2020 19:11:14 -0400 Subject: vtkWithQt4: actually build QVTK libs/headers (#84772) - VTK_USE_QT is obsolete and didn't have the intended effect --- pkgs/development/libraries/vtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index a7e1bc43290..6a7e26c753c 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { # At least, we use -fPIC for other packages to be able to use this in shared # objects. cmakeFlags = [ "-DCMAKE_C_FLAGS=-fPIC" "-DCMAKE_CXX_FLAGS=-fPIC" "-DVTK_USE_SYSTEM_TIFF=1" "-DOPENGL_INCLUDE_DIR=${libGL}/include" ] - ++ optional (qtLib != null) [ "-DVTK_USE_QT:BOOL=ON" ] + ++ optional (qtLib != null) [ "-DVTK_Group_Qt:BOOL=ON" ] ++ optional stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${OpenGL}/Library/Frameworks" ] ++ optional enablePython [ "-DVTK_WRAP_PYTHON:BOOL=ON" ]; @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { meta = { description = "Open source libraries for 3D computer graphics, image processing and visualization"; - homepage = "http://www.vtk.org/"; + homepage = "https://www.vtk.org/"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ knedlsepp ]; platforms = with stdenv.lib.platforms; unix; -- cgit v1.2.3 From 80425fa14aa52a280bc4a49e52583574f1975fcc Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 29 Apr 2020 23:57:04 +0200 Subject: wasm-bindgen-cli: 0.2.60 -> 0.2.61 https://github.com/rustwasm/wasm-bindgen/releases/tag/0.2.61 --- .../wasm-bindgen-cli/0001-Add-cargo.lock.patch | 226 ++++++++++----------- .../development/tools/wasm-bindgen-cli/default.nix | 6 +- 2 files changed, 116 insertions(+), 116 deletions(-) diff --git a/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch b/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch index 29886fccd5f..b4fa5a8353c 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch +++ b/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch @@ -1,6 +1,6 @@ -From 786cd8df9e9fa245c4dbab1bfd21b7949b8a5300 Mon Sep 17 00:00:00 2001 +From b0d7b8b348adba8131b12f99be7a9a30a1cca867 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch -Date: Thu, 26 Mar 2020 01:54:11 +0100 +Date: Thu, 30 Apr 2020 00:24:57 +0200 Subject: [PATCH] Add cargo.lock --- @@ -10,7 +10,7 @@ Subject: [PATCH] Add cargo.lock diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 -index 00000000..976ea6d4 +index 00000000..8ae15438 --- /dev/null +++ b/Cargo.lock @@ -0,0 +1,2527 @@ @@ -49,9 +49,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "anyhow" -+version = "1.0.27" ++version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "013a6e0a2cbe3d20f9c60b65458f7a7f7a5e636c5d0f45a5a6aee5d4b1f01785" ++checksum = "d9a60d744a80c30fcb657dfe2c1b22bcb3e814c1a1e3674f32bf5820b570fbff" + +[[package]] +name = "arrayref" @@ -213,9 +213,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "cc" -+version = "1.0.50" ++version = "1.0.52" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd" ++checksum = "c3d87b23d6a92cd03af510a5ade527033f6aa6fa92161e2d5863a907d4c5e31d" + +[[package]] +name = "cfg-if" @@ -359,9 +359,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "curl" -+version = "0.4.28" ++version = "0.4.29" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "eda1c0c03cacf3365d84818a40293f0e3f3953db8759c9c565a3b434edf0b52e" ++checksum = "762e34611d2d5233a506a79072be944fddd057db2f18e04c0d6fa79e3fd466fd" +dependencies = [ + "curl-sys", + "libc", @@ -374,9 +374,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "curl-sys" -+version = "0.4.30+curl-7.69.1" ++version = "0.4.31+curl-7.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "923b38e423a8f47a4058e96f2a1fa2865a6231097ee860debd678d244277d50c" ++checksum = "dcd62757cc4f5ab9404bc6ca9f0ae447e729a1403948ce5106bd588ceac6a3b0" +dependencies = [ + "cc", + "libc", @@ -494,9 +494,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "filetime" -+version = "0.2.8" ++version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1ff6d4dab0aa0c8e6346d46052e93b13a16cf847b54ed357087c35011048cc7d" ++checksum = "f59efc38004c988e4201d11d263b8171f49a2e7ec0bdbb71773433f271504a5e" +dependencies = [ + "cfg-if", + "libc", @@ -604,9 +604,9 @@ index 00000000..976ea6d4 +checksum = "9a5081aa3de1f7542a794a397cde100ed903b0630152d0973479018fd85423a7" +dependencies = [ + "proc-macro-hack", -+ "proc-macro2 1.0.9", ++ "proc-macro2 1.0.10", + "quote 1.0.3", -+ "syn 1.0.17", ++ "syn 1.0.18", +] + +[[package]] @@ -692,9 +692,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "hermit-abi" -+version = "0.1.8" ++version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1010591b26bbfe835e9faeabeb11866061cc7dcebffd56ad7d0942d0e61aefd8" ++checksum = "61565ff7aaace3525556587bd2dc31d4a07071957be715e63ce7b1eccf51a8f4" +dependencies = [ + "libc", +] @@ -772,9 +772,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "jpeg-decoder" -+version = "0.1.18" ++version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0256f0aec7352539102a9efbcb75543227b7ab1117e0f95450023af730128451" ++checksum = "5b47b4c4e017b01abdc5bcc126d2d1002e5a75bbe3ce73f9f4f311a916363704" +dependencies = [ + "byteorder", + "rayon", @@ -782,7 +782,7 @@ index 00000000..976ea6d4 + +[[package]] +name = "js-sys" -+version = "0.3.37" ++version = "0.3.38" +dependencies = [ + "wasm-bindgen", + "wasm-bindgen-futures", @@ -811,9 +811,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "libc" -+version = "0.2.68" ++version = "0.2.69" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0" ++checksum = "99e85c08494b21a9054e7fe1374a732aeadaff3980b6990b94bfd3a70f690005" + +[[package]] +name = "libz-sys" @@ -1001,9 +1001,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "num_cpus" -+version = "1.12.0" ++version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "46203554f085ff89c235cd12f7075f3233af9b11ed7c9e16dfe2560d03313ce6" ++checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +dependencies = [ + "hermit-abi", + "libc", @@ -1011,9 +1011,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "openssl" -+version = "0.10.28" ++version = "0.10.29" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "973293749822d7dd6370d6da1e523b0d1db19f06c459134c658b2a4261378b52" ++checksum = "cee6d85f4cb4c4f59a6a85d5b68a233d280c82e29e822913b9c8b129fbf20bdd" +dependencies = [ + "bitflags 1.2.1", + "cfg-if", @@ -1031,18 +1031,18 @@ index 00000000..976ea6d4 + +[[package]] +name = "openssl-src" -+version = "111.7.0+1.1.1e" ++version = "111.9.0+1.1.1g" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6fde5a8c01ef8aa31ff8d0aaf9bae248581ed8840fca0b66e51cc9f294a8cb2c" ++checksum = "a2dbe10ddd1eb335aba3780eb2eaa13e1b7b441d2562fd962398740927f39ec4" +dependencies = [ + "cc", +] + +[[package]] +name = "openssl-sys" -+version = "0.9.54" ++version = "0.9.55" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "1024c0a59774200a555087a6da3f253a9095a5f344e353b212ac4c8b8e450986" ++checksum = "7717097d810a0f2e2323f9e5d11e71608355e24828410b55b9d4f18aa5f9a5d8" +dependencies = [ + "autocfg 1.0.0", + "cc", @@ -1108,9 +1108,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "pin-utils" -+version = "0.1.0-alpha.4" ++version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5894c618ce612a3fa23881b152b608bafb8c56cfc22f434a3ba3120b40f7b587" ++checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "pkg-config" @@ -1167,35 +1167,35 @@ index 00000000..976ea6d4 + +[[package]] +name = "proc-macro-error" -+version = "0.4.12" ++version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "18f33027081eba0a6d8aba6d1b1c3a3be58cbb12106341c2d5759fcd9b5277e7" ++checksum = "98e9e4b82e0ef281812565ea4751049f1bdcdfccda7d3f459f2e138a40c08678" +dependencies = [ + "proc-macro-error-attr", -+ "proc-macro2 1.0.9", ++ "proc-macro2 1.0.10", + "quote 1.0.3", -+ "syn 1.0.17", ++ "syn 1.0.18", + "version_check 0.9.1", +] + +[[package]] +name = "proc-macro-error-attr" -+version = "0.4.12" ++version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "8a5b4b77fdb63c1eca72173d68d24501c54ab1269409f6b672c85deb18af69de" ++checksum = "4f5444ead4e9935abd7f27dc51f7e852a0569ac888096d5ec2499470794e2e53" +dependencies = [ -+ "proc-macro2 1.0.9", ++ "proc-macro2 1.0.10", + "quote 1.0.3", -+ "syn 1.0.17", ++ "syn 1.0.18", + "syn-mid", + "version_check 0.9.1", +] + +[[package]] +name = "proc-macro-hack" -+version = "0.5.14" ++version = "0.5.15" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "fcfdefadc3d57ca21cf17990a28ef4c0f7c61383a28cb7604cf4a18e6ede1420" ++checksum = "0d659fe7c6d27f25e9d80a1a094c223f5246f6a6596453e09d7229bf42750b63" + +[[package]] +name = "proc-macro-nested" @@ -1214,9 +1214,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "proc-macro2" -+version = "1.0.9" ++version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "6c09721c6781493a2a492a96b5a5bf19b65917fe6728884e7c44dd0c60ca3435" ++checksum = "df246d292ff63439fea9bc8c0a270bed0e390d5ebd4db4ba15aba81111b5abe3" +dependencies = [ + "unicode-xid 0.2.0", +] @@ -1242,7 +1242,7 @@ index 00000000..976ea6d4 +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f" +dependencies = [ -+ "proc-macro2 1.0.9", ++ "proc-macro2 1.0.10", +] + +[[package]] @@ -1495,9 +1495,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "regex" -+version = "1.3.6" ++version = "1.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7f6946991529684867e47d86474e3a6d0c0ab9b82d5821e314b1ede31fa3a4b3" ++checksum = "a6020f034922e3194c711b82a627453881bc4682166cabb07134a10c26ba7692" +dependencies = [ + "aho-corasick", + "memchr", @@ -1578,9 +1578,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "ryu" -+version = "1.0.3" ++version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "535622e6be132bccd223f4bb2b8ac8d53cda3c7a6394944d3b2b33fb974f9d76" ++checksum = "ed3d612bc64430efeb3f7ee6ef26d590dce0c43249217bddc62112540c7941e1" + +[[package]] +name = "safemem" @@ -1628,29 +1628,29 @@ index 00000000..976ea6d4 + +[[package]] +name = "serde" -+version = "1.0.105" ++version = "1.0.106" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e707fbbf255b8fc8c3b99abb91e7257a622caeb20a9818cbadbeeede4e0932ff" ++checksum = "36df6ac6412072f67cf767ebbde4133a5b2e88e76dc6187fa7104cd16f783399" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" -+version = "1.0.105" ++version = "1.0.106" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "ac5d00fc561ba2724df6758a17de23df5914f20e41cb00f94d5b7ae42fffaff8" ++checksum = "9e549e3abf4fb8621bd1609f11dfc9f5e50320802273b12f3811a67e6716ea6c" +dependencies = [ -+ "proc-macro2 1.0.9", ++ "proc-macro2 1.0.10", + "quote 1.0.3", -+ "syn 1.0.17", ++ "syn 1.0.18", +] + +[[package]] +name = "serde_json" -+version = "1.0.48" ++version = "1.0.52" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9371ade75d4c2d6cb154141b9752cf3781ec9c05e0e5cf35060e1e70ee7b9c25" ++checksum = "a7894c8ed05b7a3a279aeb79025fdec1d3158080b75b98a08faf2806bb799edd" +dependencies = [ + "itoa", + "ryu", @@ -1677,15 +1677,15 @@ index 00000000..976ea6d4 + +[[package]] +name = "smallvec" -+version = "1.2.0" ++version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "5c2fb2ec9bcd216a5b0d0ccf31ab17b5ed1d627960edff65bbe95d3ce221cefc" ++checksum = "c7cb5678e1615754284ec264d9bb5b4c27d2018577fd90ac0ceb578591ed5ee4" + +[[package]] +name = "socket2" -+version = "0.3.11" ++version = "0.3.12" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e8b74de517221a2cb01a53349cf54182acdc31a074727d3079068448c0676d85" ++checksum = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918" +dependencies = [ + "cfg-if", + "libc", @@ -1713,9 +1713,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "structopt" -+version = "0.3.12" ++version = "0.3.14" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "c8faa2719539bbe9d77869bfb15d4ee769f99525e707931452c97b693b3f159d" ++checksum = "863246aaf5ddd0d6928dfeb1a9ca65f505599e4e1b399935ef7e75107516b4ef" +dependencies = [ + "clap", + "lazy_static", @@ -1724,15 +1724,15 @@ index 00000000..976ea6d4 + +[[package]] +name = "structopt-derive" -+version = "0.4.5" ++version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "3f88b8e18c69496aad6f9ddf4630dd7d585bcaf765786cb415b9aec2fe5a0430" ++checksum = "d239ca4b13aee7a2142e6795cbd69e457665ff8037aed33b3effdc430d2f927a" +dependencies = [ + "heck", + "proc-macro-error", -+ "proc-macro2 1.0.9", ++ "proc-macro2 1.0.10", + "quote 1.0.3", -+ "syn 1.0.17", ++ "syn 1.0.18", +] + +[[package]] @@ -1748,11 +1748,11 @@ index 00000000..976ea6d4 + +[[package]] +name = "syn" -+version = "1.0.17" ++version = "1.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "0df0eb663f387145cab623dea85b09c2c5b4b0aef44e945d928e682fce71bb03" ++checksum = "410a7488c0a728c7ceb4ad59b9567eb4053d02e8cc7f5c0e0eeeb39518369213" +dependencies = [ -+ "proc-macro2 1.0.9", ++ "proc-macro2 1.0.10", + "quote 1.0.3", + "unicode-xid 0.2.0", +] @@ -1763,9 +1763,9 @@ index 00000000..976ea6d4 +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a" +dependencies = [ -+ "proc-macro2 1.0.9", ++ "proc-macro2 1.0.10", + "quote 1.0.3", -+ "syn 1.0.17", ++ "syn 1.0.18", +] + +[[package]] @@ -1832,21 +1832,20 @@ index 00000000..976ea6d4 + +[[package]] +name = "threadpool" -+version = "1.7.1" ++version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e2f0c90a5f3459330ac8bc0d2f879c693bb7a2f59689c1083fc4ef83834da865" ++checksum = "e8dae184447c15d5a6916d973c642aec485105a13cd238192a6927ae3e077d66" +dependencies = [ + "num_cpus", +] + +[[package]] +name = "time" -+version = "0.1.42" ++version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" ++checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" +dependencies = [ + "libc", -+ "redox_syscall", + "winapi", +] + @@ -1900,9 +1899,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "trybuild" -+version = "1.0.24" ++version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "24b4e093c5ed1a60b22557090120aa14f90ca801549c0949d775ea07c1407720" ++checksum = "4e5696e4fd793743fbcc29943fe965ea3993b6c3d2a6a3a35c6680d926fd3a49" +dependencies = [ + "glob", + "lazy_static", @@ -2038,9 +2037,9 @@ index 00000000..976ea6d4 +checksum = "2bc16925d405153a91e01cdac2a5549aa25ca9148b5176e25e601f6536344d94" +dependencies = [ + "heck", -+ "proc-macro2 1.0.9", ++ "proc-macro2 1.0.10", + "quote 1.0.3", -+ "syn 1.0.17", ++ "syn 1.0.18", +] + +[[package]] @@ -2051,7 +2050,7 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen" -+version = "0.2.60" ++version = "0.2.61" +dependencies = [ + "cfg-if", + "js-sys", @@ -2067,7 +2066,7 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen-anyref-xform" -+version = "0.2.60" ++version = "0.2.61" +dependencies = [ + "anyhow", + "rayon", @@ -2079,14 +2078,14 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen-backend" -+version = "0.2.60" ++version = "0.2.61" +dependencies = [ + "bumpalo", + "lazy_static", + "log 0.4.8", -+ "proc-macro2 1.0.9", ++ "proc-macro2 1.0.10", + "quote 1.0.3", -+ "syn 1.0.17", ++ "syn 1.0.18", + "wasm-bindgen-shared", +] + @@ -2100,7 +2099,7 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen-cli" -+version = "0.2.60" ++version = "0.2.61" +dependencies = [ + "anyhow", + "assert_cmd", @@ -2128,7 +2127,7 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen-cli-support" -+version = "0.2.60" ++version = "0.2.61" +dependencies = [ + "anyhow", + "base64 0.9.3", @@ -2150,7 +2149,7 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen-futures" -+version = "0.4.10" ++version = "0.4.11" +dependencies = [ + "cfg-if", + "futures-channel-preview", @@ -2162,7 +2161,7 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen-macro" -+version = "0.2.60" ++version = "0.2.61" +dependencies = [ + "quote 1.0.3", + "trybuild", @@ -2173,18 +2172,18 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen-macro-support" -+version = "0.2.60" ++version = "0.2.61" +dependencies = [ -+ "proc-macro2 1.0.9", ++ "proc-macro2 1.0.10", + "quote 1.0.3", -+ "syn 1.0.17", ++ "syn 1.0.18", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-multi-value-xform" -+version = "0.2.60" ++version = "0.2.61" +dependencies = [ + "anyhow", + "rayon", @@ -2205,11 +2204,11 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen-shared" -+version = "0.2.60" ++version = "0.2.61" + +[[package]] +name = "wasm-bindgen-test" -+version = "0.3.10" ++version = "0.3.11" +dependencies = [ + "console_error_panic_hook", + "js-sys", @@ -2235,15 +2234,15 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen-test-macro" -+version = "0.3.10" ++version = "0.3.11" +dependencies = [ -+ "proc-macro2 1.0.9", ++ "proc-macro2 1.0.10", + "quote 1.0.3", +] + +[[package]] +name = "wasm-bindgen-threads-xform" -+version = "0.2.60" ++version = "0.2.61" +dependencies = [ + "anyhow", + "walrus", @@ -2252,7 +2251,7 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen-wasm-conventions" -+version = "0.2.60" ++version = "0.2.61" +dependencies = [ + "anyhow", + "walrus", @@ -2260,7 +2259,7 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen-wasm-interpreter" -+version = "0.2.60" ++version = "0.2.61" +dependencies = [ + "anyhow", + "log 0.4.8", @@ -2271,18 +2270,18 @@ index 00000000..976ea6d4 + +[[package]] +name = "wasm-bindgen-webidl" -+version = "0.2.60" ++version = "0.2.61" +dependencies = [ + "anyhow", + "env_logger", + "heck", + "lazy_static", + "log 0.4.8", -+ "proc-macro2 1.0.9", ++ "proc-macro2 1.0.10", + "quote 1.0.3", + "sourcefile", + "structopt", -+ "syn 1.0.17", ++ "syn 1.0.18", + "wasm-bindgen-backend", + "weedle", +] @@ -2336,25 +2335,25 @@ index 00000000..976ea6d4 + +[[package]] +name = "wast" -+version = "11.0.0" ++version = "14.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "df4d67ba9266f4fcaf2e8a1afadc5e2a959e51aecc07b1ecbdf85a6ddaf08bde" ++checksum = "47b11c94c63d5365a76ea287f8e6e5b6050233fae4b2423aea2a1e126a385e17" +dependencies = [ + "leb128", +] + +[[package]] +name = "wat" -+version = "1.0.12" ++version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "9a9400dc1c8512087b2d974b1b9b0a6c4e6e26e7e8acf629e3e351165a1ed301" ++checksum = "03db18bc33cff3859c296efbefdcc00763a644539feeadca3415a1cee8a2835d" +dependencies = [ -+ "wast 11.0.0", ++ "wast 14.0.0", +] + +[[package]] +name = "web-sys" -+version = "0.3.37" ++version = "0.3.38" +dependencies = [ + "js-sys", + "wasm-bindgen", @@ -2393,6 +2392,7 @@ index 00000000..976ea6d4 +name = "websockets" +version = "0.1.0" +dependencies = [ ++ "js-sys", + "wasm-bindgen", + "web-sys", +] @@ -2437,9 +2437,9 @@ index 00000000..976ea6d4 + +[[package]] +name = "winapi-util" -+version = "0.1.3" ++version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "4ccfbf554c6ad11084fb7517daca16cfdcaccbdadba4fc336f032a8b12c2ad80" ++checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] @@ -2542,5 +2542,5 @@ index 00000000..976ea6d4 + "web-sys", +] -- -2.25.0 +2.25.4 diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index b52346d96a8..0385ba79d7f 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "wasm-bindgen-cli"; - version = "0.2.60"; + version = "0.2.61"; src = fetchFromGitHub { owner = "rustwasm"; repo = "wasm-bindgen"; rev = version; - sha256 = "1jr4v5y9hbkyg8gjkr3qc2qxwhyagfs8q3y3z248mr1919mcas8h"; + sha256 = "1lz4yscs17vix96isqpwwjhjcgj46zh2ljiwvfsk44wky8vwkyb7"; }; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; nativeBuildInputs = [ pkgconfig ]; - cargoSha256 = "08g110qahipgm1qyyihgqwnkr23w0gk1gp63ici5dj2qsxnc4mxv"; + cargoSha256 = "1vblvajhx5gn08rinv6bnw61zah62il015rzm0d4vs2b9p0iaann"; cargoPatches = [ ./0001-Add-cargo.lock.patch ]; cargoBuildFlags = [ "-p" pname ]; -- cgit v1.2.3 From 0bdc8d7a58a38e4159bbd52a64b8341a98615b8b Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 8 Jan 2020 19:24:11 +0100 Subject: nixos/networkd: add RoutesToDNS to DHCP section --- nixos/modules/system/boot/networkd.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index a7580fb1997..80c8428c63f 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -276,13 +276,14 @@ let checkDhcp = checkUnitConfig "DHCP" [ (assertOnlyFields [ - "UseDNS" "UseNTP" "UseMTU" "Anonymize" "SendHostname" "UseHostname" + "UseDNS" "RoutesToDNS" "UseNTP" "UseMTU" "Anonymize" "SendHostname" "UseHostname" "Hostname" "UseDomains" "UseRoutes" "UseTimezone" "CriticalConnection" "ClientIdentifier" "VendorClassIdentifier" "UserClass" "DUIDType" "DUIDRawData" "IAID" "RequestBroadcast" "RouteMetric" "RouteTable" "ListenPort" "RapidCommit" ]) (assertValueOneOf "UseDNS" boolValues) + (assertValueOneOf "RoutesToDNS" boolValues) (assertValueOneOf "UseNTP" boolValues) (assertValueOneOf "UseMTU" boolValues) (assertValueOneOf "Anonymize" boolValues) -- cgit v1.2.3 From 56aa58c99548ba76b4305cc3cfcf02613d92adff Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Wed, 29 Apr 2020 10:01:08 +0200 Subject: black: make available as application but keep it as a lib, too, because some software in NixPkgs imports it as a module. --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4a88ffc1c2..7d340e7a190 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9935,6 +9935,8 @@ in bison = callPackage ../development/tools/parsing/bison { }; yacc = bison; # TODO: move to aliases.nix + black = with python3Packages; toPythonApplication black; + blackmagic = callPackage ../development/tools/misc/blackmagic { }; bloaty = callPackage ../development/tools/bloaty { }; -- cgit v1.2.3 From 417c0ac2586208b9f91acf938a7dbe9fef4eac15 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 30 Apr 2020 09:39:32 +1000 Subject: docker-machine-kvm2: test aarch64 build --- pkgs/applications/networking/cluster/docker-machine/kvm2.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix index fa33c2c4ee0..6af1bf126b5 100644 --- a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix +++ b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix @@ -5,6 +5,10 @@ buildGoModule rec { pname = "docker-machine-kvm2"; + postPatch = '' + sed -i '/GOARCH=$*/d' Makefile + ''; + buildPhase = '' make docker-machine-driver-kvm2 COMMIT=${commit} ''; -- cgit v1.2.3 From a3082bc6b796f539cbe02bffbb058966acb629b6 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 30 Apr 2020 01:03:18 +0200 Subject: systemd: regenerate patches It seems nix is much more permissive in applying patches than git am. These patches were regenerated by running `git am path/to/nixpkgs/pkgs/os-specific/linux/systemd/*.patch`, and manually running `patch -p1 < path/to/nixpkgs/pkgs/os-specific/linux/systemd/*N.patch` where necessary. --- ...e-units-for-uninitialised-encrypted-devic.patch | 6 +- ...002-Don-t-try-to-unmount-nix-or-nix-store.patch | 42 +++ ...003-Don-t-try-to-unmount-nix-or-nix-store.patch | 42 --- .../linux/systemd/0003-Fix-NixOS-containers.patch | 34 +++ .../linux/systemd/0004-Fix-NixOS-containers.patch | 34 --- .../0004-Look-for-fsck-in-the-right-place.patch | 25 ++ ...-Add-some-NixOS-specific-unit-directories.patch | 107 +++++++ ...rid-of-a-useless-message-in-user-sessions.patch | 31 ++ .../0006-Look-for-fsck-in-the-right-place.patch | 25 -- ...-Add-some-NixOS-specific-unit-directories.patch | 107 ------- ...ocaled-timedated-disable-methods-that-cha.patch | 118 ++++++++ .../linux/systemd/0008-Fix-hwdb-paths.patch | 32 +++ ...Change-usr-share-zoneinfo-to-etc-zoneinfo.patch | 132 +++++++++ ...rid-of-a-useless-message-in-user-sessions.patch | 31 -- ...ocaled-timedated-disable-methods-that-cha.patch | 118 -------- ...10-localectl-use-etc-X11-xkb-for-list-x11.patch | 27 ++ .../linux/systemd/0011-Fix-hwdb-paths.patch | 32 --- ...-create-statedir-and-don-t-touch-prefixdi.patch | 26 ++ ...Change-usr-share-zoneinfo-to-etc-zoneinfo.patch | 132 --------- ...ault-configuration-into-out-share-factory.patch | 313 ++++++++++++++++++++ ...stemd-environment-when-calling-generators.patch | 42 +++ ...13-localectl-use-etc-X11-xkb-for-list-x11.patch | 27 -- .../0014-add-rootprefix-to-lookup-dir-paths.patch | 38 +++ ...tdown-execute-scripts-in-etc-systemd-syst.patch | 27 ++ ...-create-statedir-and-don-t-touch-prefixdi.patch | 26 -- ...ep-execute-scripts-in-etc-systemd-system-.patch | 26 ++ ...-nodes.service-Update-ConditionFileNotEmp.patch | 27 ++ ...ault-configuration-into-out-share-factory.patch | 317 --------------------- ...h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch | 33 +++ ...stemd-environment-when-calling-generators.patch | 42 --- .../0021-add-rootprefix-to-lookup-dir-paths.patch | 38 --- ...tdown-execute-scripts-in-etc-systemd-syst.patch | 27 -- ...ep-execute-scripts-in-etc-systemd-system-.patch | 26 -- ...odes.service-Update-ConditionFileNotEmpty.patch | 27 -- ...h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch | 33 --- pkgs/os-specific/linux/systemd/default.nix | 34 +-- 36 files changed, 1100 insertions(+), 1104 deletions(-) create mode 100644 pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch delete mode 100644 pkgs/os-specific/linux/systemd/0003-Don-t-try-to-unmount-nix-or-nix-store.patch create mode 100644 pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch delete mode 100644 pkgs/os-specific/linux/systemd/0004-Fix-NixOS-containers.patch create mode 100644 pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch create mode 100644 pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch create mode 100644 pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch delete mode 100644 pkgs/os-specific/linux/systemd/0006-Look-for-fsck-in-the-right-place.patch delete mode 100644 pkgs/os-specific/linux/systemd/0007-Add-some-NixOS-specific-unit-directories.patch create mode 100644 pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch create mode 100644 pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch create mode 100644 pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch delete mode 100644 pkgs/os-specific/linux/systemd/0009-Get-rid-of-a-useless-message-in-user-sessions.patch delete mode 100644 pkgs/os-specific/linux/systemd/0010-hostnamed-localed-timedated-disable-methods-that-cha.patch create mode 100644 pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch delete mode 100644 pkgs/os-specific/linux/systemd/0011-Fix-hwdb-paths.patch create mode 100644 pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch delete mode 100644 pkgs/os-specific/linux/systemd/0012-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch create mode 100644 pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch create mode 100644 pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch delete mode 100644 pkgs/os-specific/linux/systemd/0013-localectl-use-etc-X11-xkb-for-list-x11.patch create mode 100644 pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch create mode 100644 pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch delete mode 100644 pkgs/os-specific/linux/systemd/0016-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch create mode 100644 pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch create mode 100644 pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch delete mode 100644 pkgs/os-specific/linux/systemd/0018-Install-default-configuration-into-out-share-factory.patch create mode 100644 pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch delete mode 100644 pkgs/os-specific/linux/systemd/0019-inherit-systemd-environment-when-calling-generators.patch delete mode 100644 pkgs/os-specific/linux/systemd/0021-add-rootprefix-to-lookup-dir-paths.patch delete mode 100644 pkgs/os-specific/linux/systemd/0022-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch delete mode 100644 pkgs/os-specific/linux/systemd/0023-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch delete mode 100644 pkgs/os-specific/linux/systemd/0024-kmod-static-nodes.service-Update-ConditionFileNotEmpty.patch delete mode 100644 pkgs/os-specific/linux/systemd/0025-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch diff --git a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch index 5418a6d9d91..a7f5a15e050 100644 --- a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch +++ b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch @@ -1,7 +1,7 @@ -From a6c9317a905ef478b8e0d3dad263990feb5d11cb Mon Sep 17 00:00:00 2001 +From 7900e82a60e22354ab2b1c71f4664c1e2357ab23 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Jan 2013 15:46:30 +0100 -Subject: [PATCH 01/27] Start device units for uninitialised encrypted devices +Subject: [PATCH 01/18] Start device units for uninitialised encrypted devices This is necessary because the NixOS service that initialises the filesystem depends on the appearance of the device unit. Also, this @@ -28,5 +28,5 @@ index c34b606216..3ab8c1c3fe 100644 SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}!="crypto_LUKS", SYMLINK+="gpt-auto-root" SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}=="crypto_LUKS", SYMLINK+="gpt-auto-root-luks" -- -2.24.1 +2.26.2 diff --git a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch new file mode 100644 index 00000000000..c5679bb393c --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch @@ -0,0 +1,42 @@ +From 1e2f2f80e106910bbf3fd27438b794937ff3a1a8 Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra +Date: Fri, 12 Apr 2013 13:16:57 +0200 +Subject: [PATCH 02/18] Don't try to unmount /nix or /nix/store + +They'll still be remounted read-only. + +https://github.com/NixOS/nixos/issues/126 +--- + src/core/mount.c | 2 ++ + src/shutdown/umount.c | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/src/core/mount.c b/src/core/mount.c +index 1c4aefd734..a5553226f8 100644 +--- a/src/core/mount.c ++++ b/src/core/mount.c +@@ -412,6 +412,8 @@ static bool mount_is_extrinsic(Mount *m) { + + if (PATH_IN_SET(m->where, /* Don't bother with the OS data itself */ + "/", /* (strictly speaking redundant: should already be covered by the perpetual flag check above) */ ++ "/nix", ++ "/nix/store", + "/usr", + "/etc")) + return true; +diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c +index 8a5e80eeaa..fab35ed6f3 100644 +--- a/src/shutdown/umount.c ++++ b/src/shutdown/umount.c +@@ -414,6 +414,8 @@ static int delete_dm(dev_t devnum) { + + static bool nonunmountable_path(const char *path) { + return path_equal(path, "/") ++ || path_equal(path, "/nix") ++ || path_equal(path, "/nix/store") + #if ! HAVE_SPLIT_USR + || path_equal(path, "/usr") + #endif +-- +2.26.2 + diff --git a/pkgs/os-specific/linux/systemd/0003-Don-t-try-to-unmount-nix-or-nix-store.patch b/pkgs/os-specific/linux/systemd/0003-Don-t-try-to-unmount-nix-or-nix-store.patch deleted file mode 100644 index 75110faf923..00000000000 --- a/pkgs/os-specific/linux/systemd/0003-Don-t-try-to-unmount-nix-or-nix-store.patch +++ /dev/null @@ -1,42 +0,0 @@ -From fd9c882581877eef8ba1b34a9502a1ff546b3833 Mon Sep 17 00:00:00 2001 -From: Eelco Dolstra -Date: Fri, 12 Apr 2013 13:16:57 +0200 -Subject: [PATCH 03/27] Don't try to unmount /nix or /nix/store - -They'll still be remounted read-only. - -https://github.com/NixOS/nixos/issues/126 ---- - src/core/mount.c | 4 +++- - src/shutdown/umount.c | 2 ++ - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/core/mount.c b/src/core/mount.c -index a0dfa6a1a7..4ca6adcdc6 100644 ---- a/src/core/mount.c -+++ b/src/core/mount.c -@@ -414,6 +414,8 @@ static bool mount_is_extrinsic(Mount *m) { - - if (PATH_IN_SET(m->where, /* Don't bother with the OS data itself */ - "/", /* (strictly speaking redundant: should already be covered by the perpetual flag check above) */ -+ "/nix", -+ "/nix/store", - "/usr", - "/etc")) - return true; -diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c -index 2d07d3d6c1..8b112f464e 100644 ---- a/src/shutdown/umount.c -+++ b/src/shutdown/umount.c -@@ -373,6 +373,8 @@ static int delete_dm(dev_t devnum) { - - static bool nonunmountable_path(const char *path) { - return path_equal(path, "/") -+ || path_equal(path, "/nix") -+ || path_equal(path, "/nix/store") - #if ! HAVE_SPLIT_USR - || path_equal(path, "/usr") - #endif --- -2.25.1 - diff --git a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch new file mode 100644 index 00000000000..fb038c369f8 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch @@ -0,0 +1,34 @@ +From 1ff6f3a4250240e1ba56861e31819fe3c5516844 Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra +Date: Wed, 16 Apr 2014 10:59:28 +0200 +Subject: [PATCH 03/18] Fix NixOS containers + +In NixOS containers, the init script is bind-mounted into the +container, so checking early whether it exists will fail. +--- + src/nspawn/nspawn.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c +index 734dee1130..a97b1a4bc9 100644 +--- a/src/nspawn/nspawn.c ++++ b/src/nspawn/nspawn.c +@@ -5018,6 +5018,7 @@ static int run(int argc, char *argv[]) { + goto finish; + } + } else { ++#if 0 + const char *p, *q; + + if (arg_pivot_root_new) +@@ -5032,6 +5033,7 @@ static int run(int argc, char *argv[]) { + r = -EINVAL; + goto finish; + } ++#endif + } + + } else { +-- +2.26.2 + diff --git a/pkgs/os-specific/linux/systemd/0004-Fix-NixOS-containers.patch b/pkgs/os-specific/linux/systemd/0004-Fix-NixOS-containers.patch deleted file mode 100644 index ffb139b71e1..00000000000 --- a/pkgs/os-specific/linux/systemd/0004-Fix-NixOS-containers.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 58c4a7b4e9d9c34b92deded6aea814738821059d Mon Sep 17 00:00:00 2001 -From: Eelco Dolstra -Date: Wed, 16 Apr 2014 10:59:28 +0200 -Subject: [PATCH 04/27] Fix NixOS containers - -In NixOS containers, the init script is bind-mounted into the -container, so checking early whether it exists will fail. ---- - src/nspawn/nspawn.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 5d9290b1cf..26615901c3 100644 ---- a/src/nspawn/nspawn.c -+++ b/src/nspawn/nspawn.c -@@ -4924,6 +4924,7 @@ static int run(int argc, char *argv[]) { - goto finish; - } - } else { -+#if 0 - const char *p, *q; - - if (arg_pivot_root_new) -@@ -4938,6 +4939,7 @@ static int run(int argc, char *argv[]) { - r = -EINVAL; - goto finish; - } -+#endif - } - - } else { --- -2.24.1 - diff --git a/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch b/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch new file mode 100644 index 00000000000..3f102bd4d9b --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch @@ -0,0 +1,25 @@ +From 9cc4c2f4fd5d082aa039073a3620df536261100a Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra +Date: Thu, 1 May 2014 14:10:10 +0200 +Subject: [PATCH 04/18] Look for fsck in the right place + +--- + src/fsck/fsck.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c +index 80f7107b9d..74e48a385f 100644 +--- a/src/fsck/fsck.c ++++ b/src/fsck/fsck.c +@@ -370,7 +370,7 @@ static int run(int argc, char *argv[]) { + } else + dash_c[0] = 0; + +- cmdline[i++] = "/sbin/fsck"; ++ cmdline[i++] = "/run/current-system/sw/bin/fsck"; + cmdline[i++] = arg_repair; + cmdline[i++] = "-T"; + +-- +2.26.2 + diff --git a/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch b/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch new file mode 100644 index 00000000000..af7d227eda2 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch @@ -0,0 +1,107 @@ +From a036a1754104df9b9f7d9b3787840a83b06d0c18 Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra +Date: Fri, 19 Dec 2014 14:46:17 +0100 +Subject: [PATCH 05/18] Add some NixOS-specific unit directories + +Look in /nix/var/nix/profiles/default/lib/systemd for units provided +by packages in the default (system-wide) profile, and in +/etc/systemd-mutable/system for persistent, mutable units (not +recommended). + +Also, remove /usr and /lib as these don't exist on NixOS. +--- + src/core/systemd.pc.in | 4 ++-- + src/shared/path-lookup.c | 18 +++++------------- + 2 files changed, 7 insertions(+), 15 deletions(-) + +diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in +index 8331832c7a..bedb97115d 100644 +--- a/src/core/systemd.pc.in ++++ b/src/core/systemd.pc.in +@@ -17,8 +17,8 @@ systemduserunitdir=${prefix}/lib/systemd/user + systemduserpresetdir=${prefix}/lib/systemd/user-preset + systemdsystemconfdir=${sysconfdir}/systemd/system + systemduserconfdir=${sysconfdir}/systemd/user +-systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/run/systemd/system:/usr/local/lib/systemd/system:${systemdsystemunitdir}:/usr/lib/systemd/system:/lib/systemd/system +-systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/run/systemd/user:/usr/local/lib/systemd/user:/usr/local/share/systemd/user:${systemduserunitdir}:/usr/lib/systemd/user:/usr/share/systemd/user ++systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/etc/systemd-mutable/system:/nix/var/nix/profiles/default/lib/systemd/user:/run/systemd/system:${systemdsystemunitdir} ++systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/etc/systemd-mutable/user:/nix/var/nix/profiles/default/lib/systemd/system:/run/systemd/user:${systemduserunitdir} + systemdsystemgeneratordir=${rootprefix}/lib/systemd/system-generators + systemdusergeneratordir=${prefix}/lib/systemd/user-generators + systemdsystemgeneratorpath=/run/systemd/system-generators:/etc/systemd/system-generators:/usr/local/lib/systemd/system-generators:${systemdsystemgeneratordir} +diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c +index 5b16209745..13c0a57637 100644 +--- a/src/shared/path-lookup.c ++++ b/src/shared/path-lookup.c +@@ -98,17 +98,14 @@ int xdg_user_data_dir(char **ret, const char *suffix) { + } + + static const char* const user_data_unit_paths[] = { +- "/usr/local/lib/systemd/user", +- "/usr/local/share/systemd/user", + USER_DATA_UNIT_PATH, +- "/usr/lib/systemd/user", +- "/usr/share/systemd/user", + NULL + }; + + static const char* const user_config_unit_paths[] = { + USER_CONFIG_UNIT_PATH, + "/etc/systemd/user", ++ "/etc/systemd-mutable/user", + NULL + }; + +@@ -603,15 +600,14 @@ int lookup_paths_init( + persistent_config, + SYSTEM_CONFIG_UNIT_PATH, + "/etc/systemd/system", ++ "/etc/systemd-mutable/system", ++ "/nix/var/nix/profiles/default/lib/systemd/system", + STRV_IFNOTNULL(persistent_attached), + runtime_config, + "/run/systemd/system", + STRV_IFNOTNULL(runtime_attached), + STRV_IFNOTNULL(generator), +- "/usr/local/lib/systemd/system", + SYSTEM_DATA_UNIT_PATH, +- "/usr/lib/systemd/system", +- STRV_IFNOTNULL(flags & LOOKUP_PATHS_SPLIT_USR ? "/lib/systemd/system" : NULL), + STRV_IFNOTNULL(generator_late)); + break; + +@@ -627,14 +623,12 @@ int lookup_paths_init( + persistent_config, + USER_CONFIG_UNIT_PATH, + "/etc/systemd/user", ++ "/etc/systemd-mutable/user", ++ "/nix/var/nix/profiles/default/lib/systemd/user", + runtime_config, + "/run/systemd/user", + STRV_IFNOTNULL(generator), +- "/usr/local/share/systemd/user", +- "/usr/share/systemd/user", +- "/usr/local/lib/systemd/user", + USER_DATA_UNIT_PATH, +- "/usr/lib/systemd/user", + STRV_IFNOTNULL(generator_late)); + break; + +@@ -823,14 +817,12 @@ char **generator_binary_paths(UnitFileScope scope) { + case UNIT_FILE_SYSTEM: + return strv_new("/run/systemd/system-generators", + "/etc/systemd/system-generators", +- "/usr/local/lib/systemd/system-generators", + SYSTEM_GENERATOR_PATH); + + case UNIT_FILE_GLOBAL: + case UNIT_FILE_USER: + return strv_new("/run/systemd/user-generators", + "/etc/systemd/user-generators", +- "/usr/local/lib/systemd/user-generators", + USER_GENERATOR_PATH); + + default: +-- +2.26.2 + diff --git a/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch b/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch new file mode 100644 index 00000000000..9e93b1497ef --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch @@ -0,0 +1,31 @@ +From d96e5224001ea437549eae7b00173b61d459209e Mon Sep 17 00:00:00 2001 +From: Eelco Dolstra +Date: Mon, 11 May 2015 15:39:38 +0200 +Subject: [PATCH 06/18] Get rid of a useless message in user sessions + +Namely lots of variants of + + Unit nix-var-nix-db.mount is bound to inactive unit dev-disk-by\x2dlabel-nixos.device. Stopping, too. + +in containers. +--- + src/core/unit.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/core/unit.c b/src/core/unit.c +index 2816bcef55..0e5102a28c 100644 +--- a/src/core/unit.c ++++ b/src/core/unit.c +@@ -2043,7 +2043,8 @@ static void unit_check_binds_to(Unit *u) { + } + + assert(other); +- log_unit_info(u, "Unit is bound to inactive unit %s. Stopping, too.", other->id); ++ if (u->type != UNIT_MOUNT || detect_container() <= 0) ++ log_unit_info(u, "Unit is bound to inactive unit %s. Stopping, too.", other->id); + + /* A unit we need to run is gone. Sniff. Let's stop this. */ + r = manager_add_job(u->manager, JOB_STOP, u, JOB_FAIL, NULL, &error, NULL); +-- +2.26.2 + diff --git a/pkgs/os-specific/linux/systemd/0006-Look-for-fsck-in-the-right-place.patch b/pkgs/os-specific/linux/systemd/0006-Look-for-fsck-in-the-right-place.patch deleted file mode 100644 index 5972b646867..00000000000 --- a/pkgs/os-specific/linux/systemd/0006-Look-for-fsck-in-the-right-place.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c841ffab8fb6174b51382b9d4334f78c74018730 Mon Sep 17 00:00:00 2001 -From: Eelco Dolstra -Date: Thu, 1 May 2014 14:10:10 +0200 -Subject: [PATCH 06/27] Look for fsck in the right place - ---- - src/fsck/fsck.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c -index 55e6544d31..3626aadda7 100644 ---- a/src/fsck/fsck.c -+++ b/src/fsck/fsck.c -@@ -371,7 +371,7 @@ static int run(int argc, char *argv[]) { - } else - dash_c[0] = 0; - -- cmdline[i++] = "/sbin/fsck"; -+ cmdline[i++] = "/run/current-system/sw/bin/fsck"; - cmdline[i++] = arg_repair; - cmdline[i++] = "-T"; - --- -2.24.1 - diff --git a/pkgs/os-specific/linux/systemd/0007-Add-some-NixOS-specific-unit-directories.patch b/pkgs/os-specific/linux/systemd/0007-Add-some-NixOS-specific-unit-directories.patch deleted file mode 100644 index 7d537197fae..00000000000 --- a/pkgs/os-specific/linux/systemd/0007-Add-some-NixOS-specific-unit-directories.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 8c0be07ccbad35d0c1106015057996aa55b9a1f9 Mon Sep 17 00:00:00 2001 -From: Eelco Dolstra -Date: Fri, 19 Dec 2014 14:46:17 +0100 -Subject: [PATCH 07/27] Add some NixOS-specific unit directories - -Look in /nix/var/nix/profiles/default/lib/systemd for units provided -by packages in the default (system-wide) profile, and in -/etc/systemd-mutable/system for persistent, mutable units (not -recommended). - -Also, remove /usr and /lib as these don't exist on NixOS. ---- - src/core/systemd.pc.in | 4 ++-- - src/shared/path-lookup.c | 18 +++++------------- - 2 files changed, 7 insertions(+), 15 deletions(-) - -diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in -index 5d1ddd7620..21b977d6fc 100644 ---- a/src/core/systemd.pc.in -+++ b/src/core/systemd.pc.in -@@ -17,8 +17,8 @@ systemduserunitdir=${prefix}/lib/systemd/user - systemduserpresetdir=${prefix}/lib/systemd/user-preset - systemdsystemconfdir=${sysconfdir}/systemd/system - systemduserconfdir=${sysconfdir}/systemd/user --systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/run/systemd/system:/usr/local/lib/systemd/system:${systemdsystemunitdir}:/usr/lib/systemd/system:/lib/systemd/system --systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/run/systemd/user:/usr/local/lib/systemd/user:/usr/local/share/systemd/user:${systemduserunitdir}:/usr/lib/systemd/user:/usr/share/systemd/user -+systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/etc/systemd-mutable/system:/nix/var/nix/profiles/default/lib/systemd/user:/run/systemd/system:${systemdsystemunitdir} -+systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/etc/systemd-mutable/user:/nix/var/nix/profiles/default/lib/systemd/system:/run/systemd/user:${systemduserunitdir} - systemdsystemgeneratordir=${rootprefix}/lib/systemd/system-generators - systemdusergeneratordir=${prefix}/lib/systemd/user-generators - systemdsleepdir=${rootprefix}/lib/systemd/system-sleep -diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c -index 6bf0ff0316..2b6324ad8c 100644 ---- a/src/shared/path-lookup.c -+++ b/src/shared/path-lookup.c -@@ -99,17 +99,14 @@ int xdg_user_data_dir(char **ret, const char *suffix) { - } - - static const char* const user_data_unit_paths[] = { -- "/usr/local/lib/systemd/user", -- "/usr/local/share/systemd/user", - USER_DATA_UNIT_PATH, -- "/usr/lib/systemd/user", -- "/usr/share/systemd/user", - NULL - }; - - static const char* const user_config_unit_paths[] = { - USER_CONFIG_UNIT_PATH, - "/etc/systemd/user", -+ "/etc/systemd-mutable/user", - NULL - }; - -@@ -604,15 +601,14 @@ int lookup_paths_init( - persistent_config, - SYSTEM_CONFIG_UNIT_PATH, - "/etc/systemd/system", -+ "/etc/systemd-mutable/system", -+ "/nix/var/nix/profiles/default/lib/systemd/system", - STRV_IFNOTNULL(persistent_attached), - runtime_config, - "/run/systemd/system", - STRV_IFNOTNULL(runtime_attached), - STRV_IFNOTNULL(generator), -- "/usr/local/lib/systemd/system", - SYSTEM_DATA_UNIT_PATH, -- "/usr/lib/systemd/system", -- STRV_IFNOTNULL(flags & LOOKUP_PATHS_SPLIT_USR ? "/lib/systemd/system" : NULL), - STRV_IFNOTNULL(generator_late)); - break; - -@@ -628,14 +624,12 @@ int lookup_paths_init( - persistent_config, - USER_CONFIG_UNIT_PATH, - "/etc/systemd/user", -+ "/etc/systemd-mutable/user", -+ "/nix/var/nix/profiles/default/lib/systemd/user", - runtime_config, - "/run/systemd/user", - STRV_IFNOTNULL(generator), -- "/usr/local/share/systemd/user", -- "/usr/share/systemd/user", -- "/usr/local/lib/systemd/user", - USER_DATA_UNIT_PATH, -- "/usr/lib/systemd/user", - STRV_IFNOTNULL(generator_late)); - break; - -@@ -824,14 +818,12 @@ char **generator_binary_paths(UnitFileScope scope) { - case UNIT_FILE_SYSTEM: - return strv_new("/run/systemd/system-generators", - "/etc/systemd/system-generators", -- "/usr/local/lib/systemd/system-generators", - SYSTEM_GENERATOR_PATH); - - case UNIT_FILE_GLOBAL: - case UNIT_FILE_USER: - return strv_new("/run/systemd/user-generators", - "/etc/systemd/user-generators", -- "/usr/local/lib/systemd/user-generators", - USER_GENERATOR_PATH); - - default: --- -2.24.1 - diff --git a/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch b/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch new file mode 100644 index 00000000000..a14178a3610 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch @@ -0,0 +1,118 @@ +From 23d17b5f60d9b494ee8b7399350478d24e91e460 Mon Sep 17 00:00:00 2001 +From: Gabriel Ebner +Date: Sun, 6 Dec 2015 14:26:36 +0100 +Subject: [PATCH 07/18] hostnamed, localed, timedated: disable methods that + change system settings. + +--- + src/hostname/hostnamed.c | 9 +++++++++ + src/locale/localed.c | 9 +++++++++ + src/timedate/timedated.c | 10 ++++++++++ + 3 files changed, 28 insertions(+) + +diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c +index 21f6471495..8c5af7619f 100644 +--- a/src/hostname/hostnamed.c ++++ b/src/hostname/hostnamed.c +@@ -422,6 +422,9 @@ static int method_set_hostname(sd_bus_message *m, void *userdata, sd_bus_error * + if (r < 0) + return r; + ++ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, ++ "Changing system settings via systemd is not supported on NixOS."); ++ + if (isempty(name)) + name = c->data[PROP_STATIC_HOSTNAME]; + +@@ -478,6 +481,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_ + if (r < 0) + return r; + ++ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, ++ "Changing system settings via systemd is not supported on NixOS."); ++ + name = empty_to_null(name); + + if (streq_ptr(name, c->data[PROP_STATIC_HOSTNAME])) +@@ -535,6 +541,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess + if (r < 0) + return r; + ++ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, ++ "Changing system settings via systemd is not supported on NixOS."); ++ + name = empty_to_null(name); + + if (streq_ptr(name, c->data[prop])) +diff --git a/src/locale/localed.c b/src/locale/localed.c +index 09f16d25f4..c1cb87cef1 100644 +--- a/src/locale/localed.c ++++ b/src/locale/localed.c +@@ -275,6 +275,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er + if (r < 0) + return r; + ++ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, ++ "Changing system settings via systemd is not supported on NixOS."); ++ + /* If single locale without variable name is provided, then we assume it is LANG=. */ + if (strv_length(l) == 1 && !strchr(*l, '=')) { + if (!locale_is_valid(*l)) +@@ -410,6 +413,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro + if (r < 0) + return r; + ++ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, ++ "Changing system settings via systemd is not supported on NixOS."); ++ + keymap = empty_to_null(keymap); + keymap_toggle = empty_to_null(keymap_toggle); + +@@ -586,6 +592,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err + if (r < 0) + return r; + ++ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, ++ "Changing system settings via systemd is not supported on NixOS."); ++ + layout = empty_to_null(layout); + model = empty_to_null(model); + variant = empty_to_null(variant); +diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c +index 5e2fb50d83..63865f557c 100644 +--- a/src/timedate/timedated.c ++++ b/src/timedate/timedated.c +@@ -652,6 +652,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error * + if (r < 0) + return r; + ++ if (getenv("NIXOS_STATIC_TIMEZONE")) ++ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, ++ "Changing timezone via systemd is not supported when it is set in NixOS configuration."); ++ + if (!timezone_is_valid(z, LOG_DEBUG)) + return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid or not installed time zone '%s'", z); + +@@ -731,6 +735,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error + if (r < 0) + return r; + ++ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, ++ "Changing system settings via systemd is not supported on NixOS."); ++ + if (lrtc == c->local_rtc) + return sd_bus_reply_method_return(m, NULL); + +@@ -923,6 +930,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error + if (r < 0) + return r; + ++ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, ++ "Changing system settings via systemd is not supported on NixOS."); ++ + r = context_update_ntp_status(c, bus, m); + if (r < 0) + return r; +-- +2.26.2 + diff --git a/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch b/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch new file mode 100644 index 00000000000..d857be55890 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch @@ -0,0 +1,32 @@ +From e827145cf4390cf926897f591f0105b43e6fc3e2 Mon Sep 17 00:00:00 2001 +From: Nikolay Amiantov +Date: Thu, 7 Jul 2016 02:47:13 +0300 +Subject: [PATCH 08/18] Fix hwdb paths + +Patch by vcunat. +--- + src/libsystemd/sd-hwdb/sd-hwdb.c | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/src/libsystemd/sd-hwdb/sd-hwdb.c b/src/libsystemd/sd-hwdb/sd-hwdb.c +index b3febdbb31..eba00a5bc7 100644 +--- a/src/libsystemd/sd-hwdb/sd-hwdb.c ++++ b/src/libsystemd/sd-hwdb/sd-hwdb.c +@@ -297,13 +297,8 @@ static int trie_search_f(sd_hwdb *hwdb, const char *search) { + } + + static const char hwdb_bin_paths[] = +- "/etc/systemd/hwdb/hwdb.bin\0" + "/etc/udev/hwdb.bin\0" +- "/usr/lib/systemd/hwdb/hwdb.bin\0" +-#if HAVE_SPLIT_USR +- "/lib/systemd/hwdb/hwdb.bin\0" +-#endif +- UDEVLIBEXECDIR "/hwdb.bin\0"; ++ ; + + _public_ int sd_hwdb_new(sd_hwdb **ret) { + _cleanup_(sd_hwdb_unrefp) sd_hwdb *hwdb = NULL; +-- +2.26.2 + diff --git a/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch b/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch new file mode 100644 index 00000000000..8d7c1eb8e7a --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch @@ -0,0 +1,132 @@ +From 5da944d33a915222509ecd73c69fe7ae8917334f Mon Sep 17 00:00:00 2001 +From: Nikolay Amiantov +Date: Tue, 11 Oct 2016 13:12:08 +0300 +Subject: [PATCH 09/18] Change /usr/share/zoneinfo to /etc/zoneinfo + +NixOS uses this path. +--- + man/localtime.xml | 4 ++-- + src/basic/time-util.c | 6 +++--- + src/firstboot/firstboot.c | 2 +- + src/nspawn/nspawn.c | 4 ++-- + src/timedate/timedated.c | 8 ++++---- + 5 files changed, 12 insertions(+), 12 deletions(-) + +diff --git a/man/localtime.xml b/man/localtime.xml +index 0f1652ee2e..71c4f95c2e 100644 +--- a/man/localtime.xml ++++ b/man/localtime.xml +@@ -20,7 +20,7 @@ + + + +- /etc/localtime -> ../usr/share/zoneinfo/… ++ /etc/localtime -> zoneinfo/… + + + +@@ -30,7 +30,7 @@ + system-wide timezone of the local system that is used by + applications for presentation to the user. It should be an + absolute or relative symbolic link pointing to +- /usr/share/zoneinfo/, followed by a timezone ++ /etc/zoneinfo/, followed by a timezone + identifier such as Europe/Berlin or + Etc/UTC. The resulting link should lead to the + corresponding binary +diff --git a/src/basic/time-util.c b/src/basic/time-util.c +index 105584e2e7..5238f69931 100644 +--- a/src/basic/time-util.c ++++ b/src/basic/time-util.c +@@ -1217,7 +1217,7 @@ int get_timezones(char ***ret) { + n_allocated = 2; + n_zones = 1; + +- f = fopen("/usr/share/zoneinfo/zone1970.tab", "re"); ++ f = fopen("/etc/zoneinfo/zone1970.tab", "re"); + if (f) { + for (;;) { + _cleanup_free_ char *line = NULL; +@@ -1312,7 +1312,7 @@ bool timezone_is_valid(const char *name, int log_level) { + if (p - name >= PATH_MAX) + return false; + +- t = strjoina("/usr/share/zoneinfo/", name); ++ t = strjoina("/etc/zoneinfo/", name); + + fd = open(t, O_RDONLY|O_CLOEXEC); + if (fd < 0) { +@@ -1410,7 +1410,7 @@ int get_timezone(char **ret) { + if (r < 0) + return r; /* returns EINVAL if not a symlink */ + +- e = PATH_STARTSWITH_SET(t, "/usr/share/zoneinfo/", "../usr/share/zoneinfo/"); ++ e = PATH_STARTSWITH_SET(t, "/etc/zoneinfo/", "../etc/zoneinfo/"); + if (!e) + return -EINVAL; + +diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c +index 901fbf0815..b57bdd8fbe 100644 +--- a/src/firstboot/firstboot.c ++++ b/src/firstboot/firstboot.c +@@ -431,7 +431,7 @@ static int process_timezone(void) { + if (isempty(arg_timezone)) + return 0; + +- e = strjoina("../usr/share/zoneinfo/", arg_timezone); ++ e = strjoina("zoneinfo/", arg_timezone); + + (void) mkdir_parents(etc_localtime, 0755); + if (symlink(e, etc_localtime) < 0) +diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c +index a97b1a4bc9..aed60439e3 100644 +--- a/src/nspawn/nspawn.c ++++ b/src/nspawn/nspawn.c +@@ -1657,8 +1657,8 @@ static int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t u + static const char *timezone_from_path(const char *path) { + return PATH_STARTSWITH_SET( + path, +- "../usr/share/zoneinfo/", +- "/usr/share/zoneinfo/"); ++ "../etc/zoneinfo/", ++ "/etc/zoneinfo/"); + } + + static bool etc_writable(void) { +diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c +index 63865f557c..8021a8b753 100644 +--- a/src/timedate/timedated.c ++++ b/src/timedate/timedated.c +@@ -264,7 +264,7 @@ static int context_read_data(Context *c) { + + r = get_timezone(&t); + if (r == -EINVAL) +- log_warning_errno(r, "/etc/localtime should be a symbolic link to a time zone data file in /usr/share/zoneinfo/."); ++ log_warning_errno(r, "/etc/localtime should be a symbolic link to a time zone data file in /etc/zoneinfo/."); + else if (r < 0) + log_warning_errno(r, "Failed to get target of /etc/localtime: %m"); + +@@ -288,7 +288,7 @@ static int context_write_data_timezone(Context *c) { + + if (isempty(c->zone) || streq(c->zone, "UTC")) { + +- if (access("/usr/share/zoneinfo/UTC", F_OK) < 0) { ++ if (access("/etc/zoneinfo/UTC", F_OK) < 0) { + + if (unlink("/etc/localtime") < 0 && errno != ENOENT) + return -errno; +@@ -296,9 +296,9 @@ static int context_write_data_timezone(Context *c) { + return 0; + } + +- source = "../usr/share/zoneinfo/UTC"; ++ source = "../etc/zoneinfo/UTC"; + } else { +- p = path_join("../usr/share/zoneinfo", c->zone); ++ p = path_join("../etc/zoneinfo", c->zone); + if (!p) + return -ENOMEM; + +-- +2.26.2 + diff --git a/pkgs/os-specific/linux/systemd/0009-Get-rid-of-a-useless-message-in-user-sessions.patch b/pkgs/os-specific/linux/systemd/0009-Get-rid-of-a-useless-message-in-user-sessions.patch deleted file mode 100644 index c15b8a2a9e1..00000000000 --- a/pkgs/os-specific/linux/systemd/0009-Get-rid-of-a-useless-message-in-user-sessions.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 99c86daa5244d45a19f75f6ce92bd4255edef420 Mon Sep 17 00:00:00 2001 -From: Eelco Dolstra -Date: Mon, 11 May 2015 15:39:38 +0200 -Subject: [PATCH 09/27] Get rid of a useless message in user sessions - -Namely lots of variants of - - Unit nix-var-nix-db.mount is bound to inactive unit dev-disk-by\x2dlabel-nixos.device. Stopping, too. - -in containers. ---- - src/core/unit.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/core/unit.c b/src/core/unit.c -index a1dc76aa6a..07670af8e2 100644 ---- a/src/core/unit.c -+++ b/src/core/unit.c -@@ -2045,7 +2045,8 @@ static void unit_check_binds_to(Unit *u) { - } - - assert(other); -- log_unit_info(u, "Unit is bound to inactive unit %s. Stopping, too.", other->id); -+ if (u->type != UNIT_MOUNT || detect_container() <= 0) -+ log_unit_info(u, "Unit is bound to inactive unit %s. Stopping, too.", other->id); - - /* A unit we need to run is gone. Sniff. Let's stop this. */ - r = manager_add_job(u->manager, JOB_STOP, u, JOB_FAIL, NULL, &error, NULL); --- -2.24.1 - diff --git a/pkgs/os-specific/linux/systemd/0010-hostnamed-localed-timedated-disable-methods-that-cha.patch b/pkgs/os-specific/linux/systemd/0010-hostnamed-localed-timedated-disable-methods-that-cha.patch deleted file mode 100644 index 635da4634a8..00000000000 --- a/pkgs/os-specific/linux/systemd/0010-hostnamed-localed-timedated-disable-methods-that-cha.patch +++ /dev/null @@ -1,118 +0,0 @@ -From cec1430f72edfedb951fe34e87765ef422ea9843 Mon Sep 17 00:00:00 2001 -From: Gabriel Ebner -Date: Sun, 6 Dec 2015 14:26:36 +0100 -Subject: [PATCH 10/27] hostnamed, localed, timedated: disable methods that - change system settings. - ---- - src/hostname/hostnamed.c | 9 +++++++++ - src/locale/localed.c | 9 +++++++++ - src/timedate/timedated.c | 10 ++++++++++ - 3 files changed, 28 insertions(+) - -diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c -index 9e4f4fb59e..141b8acc08 100644 ---- a/src/hostname/hostnamed.c -+++ b/src/hostname/hostnamed.c -@@ -423,6 +423,9 @@ static int method_set_hostname(sd_bus_message *m, void *userdata, sd_bus_error * - if (r < 0) - return r; - -+ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, -+ "Changing system settings via systemd is not supported on NixOS."); -+ - if (isempty(name)) - name = c->data[PROP_STATIC_HOSTNAME]; - -@@ -479,6 +482,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_ - if (r < 0) - return r; - -+ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, -+ "Changing system settings via systemd is not supported on NixOS."); -+ - name = empty_to_null(name); - - if (streq_ptr(name, c->data[PROP_STATIC_HOSTNAME])) -@@ -536,6 +542,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess - if (r < 0) - return r; - -+ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, -+ "Changing system settings via systemd is not supported on NixOS."); -+ - name = empty_to_null(name); - - if (streq_ptr(name, c->data[prop])) -diff --git a/src/locale/localed.c b/src/locale/localed.c -index 8d0eec96a5..0b1c1d664e 100644 ---- a/src/locale/localed.c -+++ b/src/locale/localed.c -@@ -276,6 +276,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er - if (r < 0) - return r; - -+ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, -+ "Changing system settings via systemd is not supported on NixOS."); -+ - /* If single locale without variable name is provided, then we assume it is LANG=. */ - if (strv_length(l) == 1 && !strchr(*l, '=')) { - if (!locale_is_valid(*l)) -@@ -411,6 +414,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro - if (r < 0) - return r; - -+ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, -+ "Changing system settings via systemd is not supported on NixOS."); -+ - keymap = empty_to_null(keymap); - keymap_toggle = empty_to_null(keymap_toggle); - -@@ -587,6 +593,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err - if (r < 0) - return r; - -+ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, -+ "Changing system settings via systemd is not supported on NixOS."); -+ - layout = empty_to_null(layout); - model = empty_to_null(model); - variant = empty_to_null(variant); -diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c -index 6c94b23de4..fa20d22cde 100644 ---- a/src/timedate/timedated.c -+++ b/src/timedate/timedated.c -@@ -653,6 +653,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error * - if (r < 0) - return r; - -+ if (getenv("NIXOS_STATIC_TIMEZONE")) -+ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, -+ "Changing timezone via systemd is not supported when it is set in NixOS configuration."); -+ - if (!timezone_is_valid(z, LOG_DEBUG)) - return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid or not installed time zone '%s'", z); - -@@ -732,6 +736,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error - if (r < 0) - return r; - -+ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, -+ "Changing system settings via systemd is not supported on NixOS."); -+ - if (lrtc == c->local_rtc) - return sd_bus_reply_method_return(m, NULL); - -@@ -924,6 +931,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error - if (r < 0) - return r; - -+ return sd_bus_error_setf(error, SD_BUS_ERROR_NOT_SUPPORTED, -+ "Changing system settings via systemd is not supported on NixOS."); -+ - r = context_update_ntp_status(c, bus, m); - if (r < 0) - return r; --- -2.24.1 - diff --git a/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch b/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch new file mode 100644 index 00000000000..031d7f68009 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch @@ -0,0 +1,27 @@ +From d5637ccec3c32919e8aef2dc59b97fdbe3923ba1 Mon Sep 17 00:00:00 2001 +From: Imuli +Date: Wed, 19 Oct 2016 08:46:47 -0400 +Subject: [PATCH 10/18] localectl: use /etc/X11/xkb for list-x11-* + +NixOS has an option to link the xkb data files to /etc/X11, but not to +/usr/share/X11. +--- + src/locale/localectl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/locale/localectl.c b/src/locale/localectl.c +index 6f2d37d222..7aa2310d48 100644 +--- a/src/locale/localectl.c ++++ b/src/locale/localectl.c +@@ -286,7 +286,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) { + } state = NONE, look_for; + int r; + +- f = fopen("/usr/share/X11/xkb/rules/base.lst", "re"); ++ f = fopen("/etc/X11/xkb/rules/base.lst", "re"); + if (!f) + return log_error_errno(errno, "Failed to open keyboard mapping list. %m"); + +-- +2.26.2 + diff --git a/pkgs/os-specific/linux/systemd/0011-Fix-hwdb-paths.patch b/pkgs/os-specific/linux/systemd/0011-Fix-hwdb-paths.patch deleted file mode 100644 index 624811f5ea3..00000000000 --- a/pkgs/os-specific/linux/systemd/0011-Fix-hwdb-paths.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0f434c6baee63eff913f36aee839df3718a75d4a Mon Sep 17 00:00:00 2001 -From: Nikolay Amiantov -Date: Thu, 7 Jul 2016 02:47:13 +0300 -Subject: [PATCH 11/27] Fix hwdb paths - -Patch by vcunat. ---- - src/libsystemd/sd-hwdb/sd-hwdb.c | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/src/libsystemd/sd-hwdb/sd-hwdb.c b/src/libsystemd/sd-hwdb/sd-hwdb.c -index 58124abd21..d80e408b8c 100644 ---- a/src/libsystemd/sd-hwdb/sd-hwdb.c -+++ b/src/libsystemd/sd-hwdb/sd-hwdb.c -@@ -298,13 +298,8 @@ static int trie_search_f(sd_hwdb *hwdb, const char *search) { - } - - static const char hwdb_bin_paths[] = -- "/etc/systemd/hwdb/hwdb.bin\0" - "/etc/udev/hwdb.bin\0" -- "/usr/lib/systemd/hwdb/hwdb.bin\0" --#if HAVE_SPLIT_USR -- "/lib/systemd/hwdb/hwdb.bin\0" --#endif -- UDEVLIBEXECDIR "/hwdb.bin\0"; -+ ; - - _public_ int sd_hwdb_new(sd_hwdb **ret) { - _cleanup_(sd_hwdb_unrefp) sd_hwdb *hwdb = NULL; --- -2.24.1 - diff --git a/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch b/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch new file mode 100644 index 00000000000..f122cca5b6f --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch @@ -0,0 +1,26 @@ +From f488835c587d79ba824302a8933b47a83ddc2d57 Mon Sep 17 00:00:00 2001 +From: Franz Pletz +Date: Sun, 11 Feb 2018 04:37:44 +0100 +Subject: [PATCH 11/18] build: don't create statedir and don't touch prefixdir + +--- + meson.build | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/meson.build b/meson.build +index fc216d22da..078db3bb5d 100644 +--- a/meson.build ++++ b/meson.build +@@ -3176,9 +3176,6 @@ install_data('LICENSE.GPL2', + 'src/libsystemd/sd-bus/GVARIANT-SERIALIZATION', + install_dir : docdir) + +-meson.add_install_script('sh', '-c', mkdir_p.format(systemdstatedir)) +-meson.add_install_script('sh', '-c', 'touch $DESTDIR@0@'.format(prefixdir)) +- + ############################################################ + + meson_check_help = find_program('tools/meson-check-help.sh') +-- +2.26.2 + diff --git a/pkgs/os-specific/linux/systemd/0012-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch b/pkgs/os-specific/linux/systemd/0012-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch deleted file mode 100644 index ad76fda7d95..00000000000 --- a/pkgs/os-specific/linux/systemd/0012-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 78479b75c9f9342646223b3db6b4b0744817dc24 Mon Sep 17 00:00:00 2001 -From: Nikolay Amiantov -Date: Tue, 11 Oct 2016 13:12:08 +0300 -Subject: [PATCH] Change /usr/share/zoneinfo to /etc/zoneinfo - -NixOS uses this path. ---- - man/localtime.xml | 4 ++-- - src/basic/time-util.c | 6 +++--- - src/firstboot/firstboot.c | 2 +- - src/nspawn/nspawn.c | 4 ++-- - src/timedate/timedated.c | 8 ++++---- - 5 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/man/localtime.xml b/man/localtime.xml -index 0f1652ee2e..71c4f95c2e 100644 ---- a/man/localtime.xml -+++ b/man/localtime.xml -@@ -20,7 +20,7 @@ - - - -- /etc/localtime -> ../usr/share/zoneinfo/… -+ /etc/localtime -> zoneinfo/… - - - -@@ -30,7 +30,7 @@ - system-wide timezone of the local system that is used by - applications for presentation to the user. It should be an - absolute or relative symbolic link pointing to -- /usr/share/zoneinfo/, followed by a timezone -+ /etc/zoneinfo/, followed by a timezone - identifier such as Europe/Berlin or - Etc/UTC. The resulting link should lead to the - corresponding binary -diff --git a/src/basic/time-util.c b/src/basic/time-util.c -index 105584e2e7..5238f69931 100644 ---- a/src/basic/time-util.c -+++ b/src/basic/time-util.c -@@ -1217,7 +1217,7 @@ int get_timezones(char ***ret) { - n_allocated = 2; - n_zones = 1; - -- f = fopen("/usr/share/zoneinfo/zone1970.tab", "re"); -+ f = fopen("/etc/zoneinfo/zone1970.tab", "re"); - if (f) { - for (;;) { - _cleanup_free_ char *line = NULL; -@@ -1312,7 +1312,7 @@ bool timezone_is_valid(const char *name, int log_level) { - if (p - name >= PATH_MAX) - return false; - -- t = strjoina("/usr/share/zoneinfo/", name); -+ t = strjoina("/etc/zoneinfo/", name); - - fd = open(t, O_RDONLY|O_CLOEXEC); - if (fd < 0) { -@@ -1410,7 +1410,7 @@ int get_timezone(char **ret) { - if (r < 0) - return r; /* returns EINVAL if not a symlink */ - -- e = PATH_STARTSWITH_SET(t, "/usr/share/zoneinfo/", "../usr/share/zoneinfo/"); -+ e = PATH_STARTSWITH_SET(t, "/etc/zoneinfo/", "../etc/zoneinfo/"); - if (!e) - return -EINVAL; - -diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c -index 528e6452cf..c712ca9072 100644 ---- a/src/firstboot/firstboot.c -+++ b/src/firstboot/firstboot.c -@@ -443,7 +443,7 @@ static int process_timezone(void) { - if (isempty(arg_timezone)) - return 0; - -- e = strjoina("../usr/share/zoneinfo/", arg_timezone); -+ e = strjoina("zoneinfo/", arg_timezone); - - (void) mkdir_parents(etc_localtime, 0755); - if (symlink(e, etc_localtime) < 0) -diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 873a76596f..a024b10f32 100644 ---- a/src/nspawn/nspawn.c -+++ b/src/nspawn/nspawn.c -@@ -1642,8 +1642,8 @@ static int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t u - static const char *timezone_from_path(const char *path) { - return PATH_STARTSWITH_SET( - path, -- "../usr/share/zoneinfo/", -- "/usr/share/zoneinfo/"); -+ "../etc/zoneinfo/", -+ "/etc/zoneinfo/"); - } - - static bool etc_writable(void) { -diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c -index 5e2fb50d83..02eb2ca11d 100644 ---- a/src/timedate/timedated.c -+++ b/src/timedate/timedated.c -@@ -264,7 +264,7 @@ static int context_read_data(Context *c) { - - r = get_timezone(&t); - if (r == -EINVAL) -- log_warning_errno(r, "/etc/localtime should be a symbolic link to a time zone data file in /usr/share/zoneinfo/."); -+ log_warning_errno(r, "/etc/localtime should be a symbolic link to a time zone data file in /etc/zoneinfo/."); - else if (r < 0) - log_warning_errno(r, "Failed to get target of /etc/localtime: %m"); - -@@ -288,7 +288,7 @@ static int context_write_data_timezone(Context *c) { - - if (isempty(c->zone) || streq(c->zone, "UTC")) { - -- if (access("/usr/share/zoneinfo/UTC", F_OK) < 0) { -+ if (access("/etc/zoneinfo/UTC", F_OK) < 0) { - - if (unlink("/etc/localtime") < 0 && errno != ENOENT) - return -errno; -@@ -296,9 +296,9 @@ static int context_write_data_timezone(Context *c) { - return 0; - } - -- source = "../usr/share/zoneinfo/UTC"; -+ source = "../etc/zoneinfo/UTC"; - } else { -- p = path_join("../usr/share/zoneinfo", c->zone); -+ p = path_join("../etc/zoneinfo", c->zone); - if (!p) - return -ENOMEM; - --- -2.25.1 - diff --git a/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch b/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch new file mode 100644 index 00000000000..1b52f8ece52 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch @@ -0,0 +1,313 @@ +From be87849145bc50ab0b16c63fe2b748de13974f0e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= +Date: Mon, 26 Feb 2018 14:25:57 +0000 +Subject: [PATCH 12/18] Install default configuration into $out/share/factory + +By default systemd should read all its configuration from /etc. Therefor +we rely on -Dsysconfdir=/etc in meson as default value. Unfortunately +this would also lead to installation of systemd's own configuration +files to `/etc` whereas we are limited to /nix/store. To counter that +this commit introduces two new configuration variables `factoryconfdir` +and `factorypkgconfdir` to install systemd's own configuration into nix +store again, while having executables looking up files in /etc. +--- + hwdb.d/meson.build | 2 +- + meson.build | 11 +++++++---- + network/meson.build | 2 +- + src/core/meson.build | 10 +++++----- + src/coredump/meson.build | 2 +- + src/journal-remote/meson.build | 4 ++-- + src/journal/meson.build | 2 +- + src/kernel-install/meson.build | 2 +- + src/login/meson.build | 2 +- + src/network/meson.build | 2 +- + src/pstore/meson.build | 2 +- + src/resolve/meson.build | 2 +- + src/timesync/meson.build | 2 +- + src/udev/meson.build | 4 ++-- + sysctl.d/meson.build | 2 +- + tmpfiles.d/meson.build | 2 +- + units/meson.build | 2 +- + 17 files changed, 29 insertions(+), 26 deletions(-) + +diff --git a/hwdb.d/meson.build b/hwdb.d/meson.build +index 4df6dabf89..02d8d69095 100644 +--- a/hwdb.d/meson.build ++++ b/hwdb.d/meson.build +@@ -27,7 +27,7 @@ if conf.get('ENABLE_HWDB') == 1 + install_dir : udevhwdbdir) + + meson.add_install_script('sh', '-c', +- mkdir_p.format(join_paths(sysconfdir, 'udev/hwdb.d'))) ++ mkdir_p.format(join_paths(factoryconfdir, 'udev/hwdb.d'))) + + meson.add_install_script('sh', '-c', + 'test -n "$DESTDIR" || @0@/systemd-hwdb update' +diff --git a/meson.build b/meson.build +index 078db3bb5d..6e1a6483fc 100644 +--- a/meson.build ++++ b/meson.build +@@ -154,6 +154,9 @@ udevhwdbdir = join_paths(udevlibexecdir, 'hwdb.d') + catalogdir = join_paths(prefixdir, 'lib/systemd/catalog') + kernelinstalldir = join_paths(prefixdir, 'lib/kernel/install.d') + factorydir = join_paths(datadir, 'factory') ++factoryconfdir = join_paths(datadir, 'factory/etc') ++factorypkgconfdir = join_paths(datadir, 'factory/etc/systemd') ++factoryxinitrcdir = join_paths(datadir, 'factory/etc/X11/xinit/xinitrc.d') + bootlibdir = join_paths(prefixdir, 'lib/systemd/boot/efi') + testsdir = join_paths(prefixdir, 'lib/systemd/tests') + systemdstatedir = join_paths(localstatedir, 'lib/systemd') +@@ -2503,7 +2506,7 @@ if conf.get('ENABLE_BINFMT') == 1 + meson.add_install_script('sh', '-c', + mkdir_p.format(binfmtdir)) + meson.add_install_script('sh', '-c', +- mkdir_p.format(join_paths(sysconfdir, 'binfmt.d'))) ++ mkdir_p.format(join_paths(factoryconfdir, 'binfmt.d'))) + endif + + if conf.get('ENABLE_REPART') == 1 +@@ -2604,7 +2607,7 @@ executable('systemd-sleep', + install_dir : rootlibexecdir) + + install_data('src/sleep/sleep.conf', +- install_dir : pkgsysconfdir) ++ install_dir : factorypkgconfdir) + + exe = executable('systemd-sysctl', + 'src/sysctl/sysctl.c', +@@ -2916,7 +2919,7 @@ if conf.get('HAVE_KMOD') == 1 + meson.add_install_script('sh', '-c', + mkdir_p.format(modulesloaddir)) + meson.add_install_script('sh', '-c', +- mkdir_p.format(join_paths(sysconfdir, 'modules-load.d'))) ++ mkdir_p.format(join_paths(factoryconfdir, 'modules-load.d'))) + endif + + exe = executable('systemd-nspawn', +@@ -3159,7 +3162,7 @@ install_subdir('factory/etc', + install_dir : factorydir) + + install_data('xorg/50-systemd-user.sh', +- install_dir : xinitrcdir) ++ install_dir : factoryxinitrcdir) + install_data('modprobe.d/systemd.conf', + install_dir : modprobedir) + install_data('LICENSE.GPL2', +diff --git a/network/meson.build b/network/meson.build +index 544dcf4387..1828c50863 100644 +--- a/network/meson.build ++++ b/network/meson.build +@@ -10,7 +10,7 @@ if conf.get('ENABLE_NETWORKD') == 1 + install_dir : networkdir) + + meson.add_install_script('sh', '-c', +- mkdir_p.format(join_paths(sysconfdir, 'systemd/network'))) ++ mkdir_p.format(join_paths(factoryconfdir, 'systemd/network'))) + endif + + install_data('99-default.link', +diff --git a/src/core/meson.build b/src/core/meson.build +index 3586838f59..02ddf1a123 100644 +--- a/src/core/meson.build ++++ b/src/core/meson.build +@@ -179,8 +179,8 @@ libcore = static_library( + systemd_sources = files('main.c') + + in_files = [['macros.systemd', rpmmacrosdir], +- ['system.conf', pkgsysconfdir], +- ['user.conf', pkgsysconfdir], ++ ['system.conf', factorypkgconfdir], ++ ['user.conf', factorypkgconfdir], + ['systemd.pc', pkgconfigdatadir], + ['triggers.systemd', '']] + +@@ -212,6 +212,6 @@ meson.add_install_script('sh', '-c', mkdir_p.format(systemsleepdir)) + meson.add_install_script('sh', '-c', mkdir_p.format(systemgeneratordir)) + meson.add_install_script('sh', '-c', mkdir_p.format(usergeneratordir)) + +-meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(pkgsysconfdir, 'system'))) +-meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(pkgsysconfdir, 'user'))) +-meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(sysconfdir, 'xdg/systemd'))) ++meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(factorypkgconfdir, 'system'))) ++meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(factorypkgconfdir, 'user'))) ++meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(factorypkgconfdir, 'xdg/systemd'))) +diff --git a/src/coredump/meson.build b/src/coredump/meson.build +index 7fa5942697..34c865dfa0 100644 +--- a/src/coredump/meson.build ++++ b/src/coredump/meson.build +@@ -15,7 +15,7 @@ coredumpctl_sources = files('coredumpctl.c') + + if conf.get('ENABLE_COREDUMP') == 1 + install_data('coredump.conf', +- install_dir : pkgsysconfdir) ++ install_dir : factorypkgconfdir) + endif + + tests += [ +diff --git a/src/journal-remote/meson.build b/src/journal-remote/meson.build +index 87b8ba6495..daff8ec967 100644 +--- a/src/journal-remote/meson.build ++++ b/src/journal-remote/meson.build +@@ -49,7 +49,7 @@ if conf.get('ENABLE_REMOTE') ==1 and conf.get('HAVE_LIBCURL') == 1 + output : 'journal-upload.conf', + configuration : substs) + install_data(journal_upload_conf, +- install_dir : pkgsysconfdir) ++ install_dir : factorypkgconfdir) + endif + + if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1 +@@ -58,7 +58,7 @@ if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1 + output : 'journal-remote.conf', + configuration : substs) + install_data(journal_remote_conf, +- install_dir : pkgsysconfdir) ++ install_dir : factorypkgconfdir) + + install_data('browse.html', + install_dir : join_paths(pkgdatadir, 'gatewayd')) +diff --git a/src/journal/meson.build b/src/journal/meson.build +index 5796f77cac..75d975c260 100644 +--- a/src/journal/meson.build ++++ b/src/journal/meson.build +@@ -109,7 +109,7 @@ if conf.get('HAVE_QRENCODE') == 1 + endif + + install_data('journald.conf', +- install_dir : pkgsysconfdir) ++ install_dir : factorypkgconfdir) + + if get_option('create-log-dirs') + meson.add_install_script( +diff --git a/src/kernel-install/meson.build b/src/kernel-install/meson.build +index 261c3aaae4..dbc5e23513 100644 +--- a/src/kernel-install/meson.build ++++ b/src/kernel-install/meson.build +@@ -11,4 +11,4 @@ install_data('00-entry-directory.install', + install_dir : kernelinstalldir) + + meson.add_install_script('sh', '-c', +- mkdir_p.format(join_paths(sysconfdir, 'kernel/install.d'))) ++ mkdir_p.format(join_paths(factoryconfdir, 'kernel/install.d'))) +diff --git a/src/login/meson.build b/src/login/meson.build +index 0a7d3d5440..ff90149c1c 100644 +--- a/src/login/meson.build ++++ b/src/login/meson.build +@@ -75,7 +75,7 @@ if conf.get('ENABLE_LOGIND') == 1 + output : 'logind.conf', + configuration : substs) + install_data(logind_conf, +- install_dir : pkgsysconfdir) ++ install_dir : factorypkgconfdir) + + install_data('org.freedesktop.login1.conf', + install_dir : dbuspolicydir) +diff --git a/src/network/meson.build b/src/network/meson.build +index c1c02cfda1..1bfa79a03b 100644 +--- a/src/network/meson.build ++++ b/src/network/meson.build +@@ -201,7 +201,7 @@ if conf.get('ENABLE_NETWORKD') == 1 + endif + + install_data('networkd.conf', +- install_dir : pkgsysconfdir) ++ install_dir : factorypkgconfdir) + + fuzzers += [ + [['src/network/fuzz-netdev-parser.c', +diff --git a/src/pstore/meson.build b/src/pstore/meson.build +index adbac24b54..e9dc88dfa2 100644 +--- a/src/pstore/meson.build ++++ b/src/pstore/meson.build +@@ -6,5 +6,5 @@ systemd_pstore_sources = files(''' + + if conf.get('ENABLE_PSTORE') == 1 + install_data('pstore.conf', +- install_dir : pkgsysconfdir) ++ install_dir : factorypkgconfdir) + endif +diff --git a/src/resolve/meson.build b/src/resolve/meson.build +index c4d8d4e5d9..f550c289a5 100644 +--- a/src/resolve/meson.build ++++ b/src/resolve/meson.build +@@ -170,7 +170,7 @@ if conf.get('ENABLE_RESOLVE') == 1 + output : 'resolved.conf', + configuration : substs) + install_data(resolved_conf, +- install_dir : pkgsysconfdir) ++ install_dir : factorypkgconfdir) + + install_data('resolv.conf', + install_dir : rootlibexecdir) +diff --git a/src/timesync/meson.build b/src/timesync/meson.build +index e5c118c8db..19235df9ca 100644 +--- a/src/timesync/meson.build ++++ b/src/timesync/meson.build +@@ -27,7 +27,7 @@ if conf.get('ENABLE_TIMESYNCD') == 1 + output : 'timesyncd.conf', + configuration : substs) + install_data(timesyncd_conf, +- install_dir : pkgsysconfdir) ++ install_dir : factorypkgconfdir) + install_data('org.freedesktop.timesync1.conf', + install_dir : dbuspolicydir) + install_data('org.freedesktop.timesync1.service', +diff --git a/src/udev/meson.build b/src/udev/meson.build +index 173b10be50..82638cf5a9 100644 +--- a/src/udev/meson.build ++++ b/src/udev/meson.build +@@ -187,7 +187,7 @@ foreach prog : [['ata_id/ata_id.c'], + endforeach + + install_data('udev.conf', +- install_dir : join_paths(sysconfdir, 'udev')) ++ install_dir : join_paths(factoryconfdir, 'udev')) + + configure_file( + input : 'udev.pc.in', +@@ -196,7 +196,7 @@ configure_file( + install_dir : pkgconfigdatadir == 'no' ? '' : pkgconfigdatadir) + + meson.add_install_script('sh', '-c', +- mkdir_p.format(join_paths(sysconfdir, 'udev/rules.d'))) ++ mkdir_p.format(join_paths(factoryconfdir, 'udev/rules.d'))) + + fuzzers += [ + [['src/udev/net/fuzz-link-parser.c', +diff --git a/sysctl.d/meson.build b/sysctl.d/meson.build +index 3f072e3db7..bd9f843eba 100644 +--- a/sysctl.d/meson.build ++++ b/sysctl.d/meson.build +@@ -27,4 +27,4 @@ foreach file : in_files + endforeach + + meson.add_install_script('sh', '-c', +- mkdir_p.format(join_paths(sysconfdir, 'sysctl.d'))) ++ mkdir_p.format(join_paths(factoryconfdir, 'sysctl.d'))) +diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build +index e77f46d06b..04d2ef621d 100644 +--- a/tmpfiles.d/meson.build ++++ b/tmpfiles.d/meson.build +@@ -57,5 +57,5 @@ endforeach + if enable_tmpfiles + meson.add_install_script( + 'sh', '-c', +- mkdir_p.format(join_paths(sysconfdir, 'tmpfiles.d'))) ++ mkdir_p.format(join_paths(factoryconfdir, 'tmpfiles.d'))) + endif +diff --git a/units/meson.build b/units/meson.build +index ea91f0cc9e..8622054ca5 100644 +--- a/units/meson.build ++++ b/units/meson.build +@@ -323,7 +323,7 @@ install_data('user-.slice.d/10-defaults.conf', + + meson.add_install_script(meson_make_symlink, + join_paths(pkgsysconfdir, 'user'), +- join_paths(sysconfdir, 'xdg/systemd/user')) ++ join_paths(factorypkgconfdir, 'xdg/systemd/user')) + meson.add_install_script(meson_make_symlink, + join_paths(dbussystemservicedir, 'org.freedesktop.systemd1.service'), + join_paths(dbussessionservicedir, 'org.freedesktop.systemd1.service')) +-- +2.26.2 + diff --git a/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch b/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch new file mode 100644 index 00000000000..583aa89afff --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch @@ -0,0 +1,42 @@ +From d16a7d5580adcf5737c7be3b02d411097a498256 Mon Sep 17 00:00:00 2001 +From: Andreas Rammhold +Date: Fri, 2 Nov 2018 21:15:42 +0100 +Subject: [PATCH 13/18] inherit systemd environment when calling generators. + +Systemd generators need access to the environment configured in +stage-2-init.sh since it schedules fsck and mkfs executions based on +being able to find an appropriate binary for the target filesystem. + +With this commit I am altering the systemd behaviour since upstream +tries to gather environments with that they call +"environment-generators" and then seems to pass that on to all the other +executables that are being called from managers. +--- + src/core/manager.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/src/core/manager.c b/src/core/manager.c +index 25afdbea04..7afd5e5a37 100644 +--- a/src/core/manager.c ++++ b/src/core/manager.c +@@ -3896,9 +3896,14 @@ static int manager_run_generators(Manager *m) { + argv[4] = NULL; + + RUN_WITH_UMASK(0022) +- (void) execute_directories((const char* const*) paths, DEFAULT_TIMEOUT_USEC, NULL, NULL, +- (char**) argv, m->transient_environment, EXEC_DIR_PARALLEL | EXEC_DIR_IGNORE_ERRORS); +- ++ (void) execute_directories((const char* const*) paths, DEFAULT_TIMEOUT_USEC, ++ // On NixOS we must propagate PATH to generators so they are ++ // able to find binaries such as `fsck.${fstype}` and ++ // `mkfs.${fstype}`. That is why the last argument of the ++ // function (envp) is set to NULL. This propagates systemd's ++ // environment (e.g. PATH) that was setup ++ // before calling systemd from stage-2-init.sh. ++ NULL, NULL, (char**) argv, /* NixOS: use inherited env */ NULL, EXEC_DIR_PARALLEL | EXEC_DIR_IGNORE_ERRORS); + r = 0; + + finish: +-- +2.26.2 + diff --git a/pkgs/os-specific/linux/systemd/0013-localectl-use-etc-X11-xkb-for-list-x11.patch b/pkgs/os-specific/linux/systemd/0013-localectl-use-etc-X11-xkb-for-list-x11.patch deleted file mode 100644 index 309ae70881a..00000000000 --- a/pkgs/os-specific/linux/systemd/0013-localectl-use-etc-X11-xkb-for-list-x11.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 5365ffbfba2de03628e8bbb6cc0bc022272436a1 Mon Sep 17 00:00:00 2001 -From: Imuli -Date: Wed, 19 Oct 2016 08:46:47 -0400 -Subject: [PATCH 13/27] localectl: use /etc/X11/xkb for list-x11-* - -NixOS has an option to link the xkb data files to /etc/X11, but not to -/usr/share/X11. ---- - src/locale/localectl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/locale/localectl.c b/src/locale/localectl.c -index 9fb5152110..9554c2cf76 100644 ---- a/src/locale/localectl.c -+++ b/src/locale/localectl.c -@@ -287,7 +287,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) { - } state = NONE, look_for; - int r; - -- f = fopen("/usr/share/X11/xkb/rules/base.lst", "re"); -+ f = fopen("/etc/X11/xkb/rules/base.lst", "re"); - if (!f) - return log_error_errno(errno, "Failed to open keyboard mapping list. %m"); - --- -2.24.1 - diff --git a/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch b/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch new file mode 100644 index 00000000000..cc2972cb656 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch @@ -0,0 +1,38 @@ +From ac4a62d0be763846e244ff9032635c8041ad7881 Mon Sep 17 00:00:00 2001 +From: Andreas Rammhold +Date: Thu, 9 May 2019 11:15:22 +0200 +Subject: [PATCH 14/18] add rootprefix to lookup dir paths + +systemd does not longer use the UDEVLIBEXEC directory as root for +discovery default udev rules. By adding `$out/lib` to the lookup paths +we should again be able to discover the udev rules amongst other default +files that I might have missed. +--- + src/basic/def.h | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/basic/def.h b/src/basic/def.h +index 970654a1ad..bb261040f8 100644 +--- a/src/basic/def.h ++++ b/src/basic/def.h +@@ -39,13 +39,15 @@ + "/run/" n "\0" \ + "/usr/local/lib/" n "\0" \ + "/usr/lib/" n "\0" \ +- _CONF_PATHS_SPLIT_USR_NULSTR(n) ++ _CONF_PATHS_SPLIT_USR_NULSTR(n) \ ++ ROOTPREFIX "/lib/" n "\0" + + #define CONF_PATHS_USR(n) \ + "/etc/" n, \ + "/run/" n, \ + "/usr/local/lib/" n, \ +- "/usr/lib/" n ++ "/usr/lib/" n, \ ++ ROOTPREFIX "/lib/" n + + #define CONF_PATHS(n) \ + CONF_PATHS_USR(n) \ +-- +2.26.2 + diff --git a/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch b/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch new file mode 100644 index 00000000000..6f792934f5a --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch @@ -0,0 +1,27 @@ +From 8a5db86ace1d7729f2c8ccacddbf5ca17fe86274 Mon Sep 17 00:00:00 2001 +From: Nikolay Amiantov +Date: Thu, 25 Jul 2019 20:45:55 +0300 +Subject: [PATCH 15/18] systemd-shutdown: execute scripts in + /etc/systemd/system-shutdown + +This is needed for NixOS to use such scripts as systemd directory is immutable. +--- + src/shutdown/shutdown.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c +index 15e6c1799e..412bdefe74 100644 +--- a/src/shutdown/shutdown.c ++++ b/src/shutdown/shutdown.c +@@ -298,7 +298,7 @@ int main(int argc, char *argv[]) { + _cleanup_free_ char *cgroup = NULL; + char *arguments[3], *watchdog_device; + int cmd, r, umount_log_level = LOG_INFO; +- static const char* const dirs[] = {SYSTEM_SHUTDOWN_PATH, NULL}; ++ static const char* const dirs[] = {SYSTEM_SHUTDOWN_PATH, "/etc/systemd/system-shutdown", NULL}; + + /* The log target defaults to console, but the original systemd process will pass its log target in through a + * command line argument, which will override this default. Also, ensure we'll never log to the journal or +-- +2.26.2 + diff --git a/pkgs/os-specific/linux/systemd/0016-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch b/pkgs/os-specific/linux/systemd/0016-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch deleted file mode 100644 index ed1187473be..00000000000 --- a/pkgs/os-specific/linux/systemd/0016-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 1408762890aba25e58598d1e4dfa17ed2b75de26 Mon Sep 17 00:00:00 2001 -From: Franz Pletz -Date: Sun, 11 Feb 2018 04:37:44 +0100 -Subject: [PATCH 16/27] build: don't create statedir and don't touch prefixdir - ---- - meson.build | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/meson.build b/meson.build -index 8ccc947e37..263cc7189a 100644 ---- a/meson.build -+++ b/meson.build -@@ -2944,9 +2944,6 @@ install_data('LICENSE.GPL2', - 'src/libsystemd/sd-bus/GVARIANT-SERIALIZATION', - install_dir : docdir) - --meson.add_install_script('sh', '-c', mkdir_p.format(systemdstatedir)) --meson.add_install_script('sh', '-c', 'touch $DESTDIR@0@'.format(prefixdir)) -- - ############################################################ - - meson_check_help = find_program('tools/meson-check-help.sh') --- -2.24.1 - diff --git a/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch b/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch new file mode 100644 index 00000000000..f6809e9d58a --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch @@ -0,0 +1,26 @@ +From 858fbf641ff5cd207282f3ad9d7458b2be2dcdb8 Mon Sep 17 00:00:00 2001 +From: Nikolay Amiantov +Date: Thu, 25 Jul 2019 20:46:58 +0300 +Subject: [PATCH 16/18] systemd-sleep: execute scripts in + /etc/systemd/system-sleep + +This is needed for NixOS to use such scripts as systemd directory is immutable. +--- + src/sleep/sleep.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c +index fbfddc0262..d2530b9421 100644 +--- a/src/sleep/sleep.c ++++ b/src/sleep/sleep.c +@@ -178,6 +178,7 @@ static int execute(char **modes, char **states) { + }; + static const char* const dirs[] = { + SYSTEM_SLEEP_PATH, ++ "/etc/systemd/system-sleep", + NULL + }; + +-- +2.26.2 + diff --git a/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch b/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch new file mode 100644 index 00000000000..a3a9b936d13 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch @@ -0,0 +1,27 @@ +From da86057b6d1c0d39622977cfb85b7edaeeeb795e Mon Sep 17 00:00:00 2001 +From: Florian Klink +Date: Sat, 7 Mar 2020 22:40:27 +0100 +Subject: [PATCH 17/18] kmod-static-nodes.service: Update ConditionFileNotEmpty + +On NixOS, kernel modules of the currently booted systems are located at +/run/booted-system/kernel-modules/lib/modules/%v/, not /lib/modules/%v/. +--- + units/kmod-static-nodes.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/units/kmod-static-nodes.service.in b/units/kmod-static-nodes.service.in +index 0971edf9ec..87105a87b9 100644 +--- a/units/kmod-static-nodes.service.in ++++ b/units/kmod-static-nodes.service.in +@@ -12,7 +12,7 @@ Description=Create list of static device nodes for the current kernel + DefaultDependencies=no + Before=sysinit.target systemd-tmpfiles-setup-dev.service + ConditionCapability=CAP_SYS_MODULE +-ConditionFileNotEmpty=/lib/modules/%v/modules.devname ++ConditionFileNotEmpty=/run/booted-system/kernel-modules/lib/modules/%v/modules.devname + + [Service] + Type=oneshot +-- +2.26.2 + diff --git a/pkgs/os-specific/linux/systemd/0018-Install-default-configuration-into-out-share-factory.patch b/pkgs/os-specific/linux/systemd/0018-Install-default-configuration-into-out-share-factory.patch deleted file mode 100644 index 3911d1b0181..00000000000 --- a/pkgs/os-specific/linux/systemd/0018-Install-default-configuration-into-out-share-factory.patch +++ /dev/null @@ -1,317 +0,0 @@ -From a087cb535b2d3c7a5d989b5aabc0a257369e9f9d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= -Date: Mon, 26 Feb 2018 14:25:57 +0000 -Subject: [PATCH 18/27] Install default configuration into $out/share/factory - -By default systemd should read all its configuration from /etc. Therefor -we rely on -Dsysconfdir=/etc in meson as default value. Unfortunately -this would also lead to installation of systemd's own configuration -files to `/etc` whereas we are limited to /nix/store. To counter that -this commit introduces two new configuration variables `factoryconfdir` -and `factorypkgconfdir` to install systemd's own configuration into nix -store again, while having executables looking up files in /etc. ---- - hwdb.d/meson.build | 2 +- - meson.build | 11 +++++++---- - network/meson.build | 2 +- - src/core/meson.build | 10 +++++----- - src/coredump/meson.build | 2 +- - src/journal-remote/meson.build | 4 ++-- - src/journal/meson.build | 2 +- - src/kernel-install/meson.build | 2 +- - src/login/meson.build | 2 +- - src/network/meson.build | 2 +- - src/pstore/meson.build | 2 +- - src/resolve/meson.build | 2 +- - src/timesync/meson.build | 2 +- - src/udev/meson.build | 4 ++-- - sysctl.d/meson.build | 2 +- - tmpfiles.d/meson.build | 2 +- - units/meson.build | 3 ++- - 17 files changed, 30 insertions(+), 26 deletions(-) - -diff --git a/hwdb.d/meson.build b/hwdb.d/meson.build -index badf39f555..8fd9c7639f 100644 ---- a/hwdb.d/meson.build -+++ b/hwdb.d/meson.build -@@ -26,7 +26,7 @@ if conf.get('ENABLE_HWDB') == 1 - install_dir : udevhwdbdir) - - meson.add_install_script('sh', '-c', -- mkdir_p.format(join_paths(sysconfdir, 'udev/hwdb.d'))) -+ mkdir_p.format(join_paths(factoryconfdir, 'udev/hwdb.d'))) - - meson.add_install_script('sh', '-c', - 'test -n "$DESTDIR" || @0@/systemd-hwdb update' - .format(rootbindir)) - endif - - ############################################################ -diff --git a/meson.build b/meson.build -index 263cc7189a..7a67078208 100644 ---- a/meson.build -+++ b/meson.build -@@ -151,6 +151,9 @@ udevhwdbdir = join_paths(udevlibexecdir, 'hwdb.d') - catalogdir = join_paths(prefixdir, 'lib/systemd/catalog') - kernelinstalldir = join_paths(prefixdir, 'lib/kernel/install.d') - factorydir = join_paths(datadir, 'factory') -+factoryconfdir = join_paths(datadir, 'factory/etc') -+factorypkgconfdir = join_paths(datadir, 'factory/etc/systemd') -+factoryxinitrcdir = join_paths(datadir, 'factory/etc/X11/xinit/xinitrc.d') - bootlibdir = join_paths(prefixdir, 'lib/systemd/boot/efi') - testsdir = join_paths(prefixdir, 'lib/systemd/tests') - systemdstatedir = join_paths(localstatedir, 'lib/systemd') -@@ -2287,7 +2290,7 @@ if conf.get('ENABLE_BINFMT') == 1 - meson.add_install_script('sh', '-c', - mkdir_p.format(binfmtdir)) - meson.add_install_script('sh', '-c', -- mkdir_p.format(join_paths(sysconfdir, 'binfmt.d'))) -+ mkdir_p.format(join_paths(factoryconfdir, 'binfmt.d'))) - endif - - if conf.get('ENABLE_VCONSOLE') == 1 -@@ -2373,7 +2376,7 @@ executable('systemd-sleep', - install_dir : rootlibexecdir) - - install_data('src/sleep/sleep.conf', -- install_dir : pkgsysconfdir) -+ install_dir : factorypkgconfdir) - - exe = executable('systemd-sysctl', - 'src/sysctl/sysctl.c', -@@ -2685,7 +2688,7 @@ if conf.get('HAVE_KMOD') == 1 - meson.add_install_script('sh', '-c', - mkdir_p.format(modulesloaddir)) - meson.add_install_script('sh', '-c', -- mkdir_p.format(join_paths(sysconfdir, 'modules-load.d'))) -+ mkdir_p.format(join_paths(factoryconfdir, 'modules-load.d'))) - endif - - exe = executable('systemd-nspawn', -@@ -2927,7 +2930,7 @@ install_subdir('factory/etc', - install_dir : factorydir) - - install_data('xorg/50-systemd-user.sh', -- install_dir : xinitrcdir) -+ install_dir : factoryxinitrcdir) - install_data('modprobe.d/systemd.conf', - install_dir : modprobedir) - install_data('LICENSE.GPL2', -diff --git a/network/meson.build b/network/meson.build -index 59d4be1a17..72da2c16a2 100644 ---- a/network/meson.build -+++ b/network/meson.build -@@ -7,7 +7,7 @@ if conf.get('ENABLE_NETWORKD') == 1 - install_dir : networkdir) - - meson.add_install_script('sh', '-c', -- mkdir_p.format(join_paths(sysconfdir, 'systemd/network'))) -+ mkdir_p.format(join_paths(factoryconfdir, 'systemd/network'))) - endif - - install_data('99-default.link', -diff --git a/src/core/meson.build b/src/core/meson.build -index df3aa5c6c1..305f67a80a 100644 ---- a/src/core/meson.build -+++ b/src/core/meson.build -@@ -179,8 +179,8 @@ libcore = static_library( - systemd_sources = files('main.c') - - in_files = [['macros.systemd', rpmmacrosdir], -- ['system.conf', pkgsysconfdir], -- ['user.conf', pkgsysconfdir], -+ ['system.conf', factorypkgconfdir], -+ ['user.conf', factorypkgconfdir], - ['systemd.pc', pkgconfigdatadir], - ['triggers.systemd', '']] - -@@ -210,6 +210,6 @@ meson.add_install_script('sh', '-c', mkdir_p.format(systemsleepdir)) - meson.add_install_script('sh', '-c', mkdir_p.format(systemgeneratordir)) - meson.add_install_script('sh', '-c', mkdir_p.format(usergeneratordir)) - --meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(pkgsysconfdir, 'system'))) --meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(pkgsysconfdir, 'user'))) --meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(sysconfdir, 'xdg/systemd'))) -+meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(factorypkgconfdir, 'system'))) -+meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(factorypkgconfdir, 'user'))) -+meson.add_install_script('sh', '-c', mkdir_p.format(join_paths(factorypkgconfdir, 'xdg/systemd'))) -diff --git a/src/coredump/meson.build b/src/coredump/meson.build -index 7fa5942697..34c865dfa0 100644 ---- a/src/coredump/meson.build -+++ b/src/coredump/meson.build -@@ -15,7 +15,7 @@ coredumpctl_sources = files('coredumpctl.c') - - if conf.get('ENABLE_COREDUMP') == 1 - install_data('coredump.conf', -- install_dir : pkgsysconfdir) -+ install_dir : factorypkgconfdir) - endif - - tests += [ -diff --git a/src/journal-remote/meson.build b/src/journal-remote/meson.build -index 87b8ba6495..daff8ec967 100644 ---- a/src/journal-remote/meson.build -+++ b/src/journal-remote/meson.build -@@ -49,7 +49,7 @@ if conf.get('ENABLE_REMOTE') ==1 and conf.get('HAVE_LIBCURL') == 1 - output : 'journal-upload.conf', - configuration : substs) - install_data(journal_upload_conf, -- install_dir : pkgsysconfdir) -+ install_dir : factorypkgconfdir) - endif - - if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1 -@@ -58,7 +58,7 @@ if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1 - output : 'journal-remote.conf', - configuration : substs) - install_data(journal_remote_conf, -- install_dir : pkgsysconfdir) -+ install_dir : factorypkgconfdir) - - install_data('browse.html', - install_dir : join_paths(pkgdatadir, 'gatewayd')) -diff --git a/src/journal/meson.build b/src/journal/meson.build -index 5796f77cac..75d975c260 100644 ---- a/src/journal/meson.build -+++ b/src/journal/meson.build -@@ -109,7 +109,7 @@ if conf.get('HAVE_QRENCODE') == 1 - endif - - install_data('journald.conf', -- install_dir : pkgsysconfdir) -+ install_dir : factorypkgconfdir) - - if get_option('create-log-dirs') - meson.add_install_script( -diff --git a/src/kernel-install/meson.build b/src/kernel-install/meson.build -index 261c3aaae4..dbc5e23513 100644 ---- a/src/kernel-install/meson.build -+++ b/src/kernel-install/meson.build -@@ -11,4 +11,4 @@ install_data('00-entry-directory.install', - install_dir : kernelinstalldir) - - meson.add_install_script('sh', '-c', -- mkdir_p.format(join_paths(sysconfdir, 'kernel/install.d'))) -+ mkdir_p.format(join_paths(factoryconfdir, 'kernel/install.d'))) -diff --git a/src/login/meson.build b/src/login/meson.build -index 0a7d3d5440..ff90149c1c 100644 ---- a/src/login/meson.build -+++ b/src/login/meson.build -@@ -75,7 +75,7 @@ if conf.get('ENABLE_LOGIND') == 1 - output : 'logind.conf', - configuration : substs) - install_data(logind_conf, -- install_dir : pkgsysconfdir) -+ install_dir : factorypkgconfdir) - - install_data('org.freedesktop.login1.conf', - install_dir : dbuspolicydir) -diff --git a/src/network/meson.build b/src/network/meson.build -index 6bed37a170..35f15bcaf1 100644 ---- a/src/network/meson.build -+++ b/src/network/meson.build -@@ -168,7 +168,7 @@ if conf.get('ENABLE_NETWORKD') == 1 - endif - - install_data('networkd.conf', -- install_dir : pkgsysconfdir) -+ install_dir : factorypkgconfdir) - - fuzzers += [ - [['src/network/fuzz-netdev-parser.c', -diff --git a/src/pstore/meson.build b/src/pstore/meson.build -index adbac24b54..e9dc88dfa2 100644 ---- a/src/pstore/meson.build -+++ b/src/pstore/meson.build -@@ -6,5 +6,5 @@ systemd_pstore_sources = files(''' - - if conf.get('ENABLE_PSTORE') == 1 - install_data('pstore.conf', -- install_dir : pkgsysconfdir) -+ install_dir : factorypkgconfdir) - endif -diff --git a/src/resolve/meson.build b/src/resolve/meson.build -index 92b67b6333..ac5b9a0b0a 100644 ---- a/src/resolve/meson.build -+++ b/src/resolve/meson.build -@@ -168,7 +168,7 @@ if conf.get('ENABLE_RESOLVE') == 1 - output : 'resolved.conf', - configuration : substs) - install_data(resolved_conf, -- install_dir : pkgsysconfdir) -+ install_dir : factorypkgconfdir) - - install_data('resolv.conf', - install_dir : rootlibexecdir) -diff --git a/src/timesync/meson.build b/src/timesync/meson.build -index e5c118c8db..19235df9ca 100644 ---- a/src/timesync/meson.build -+++ b/src/timesync/meson.build -@@ -27,7 +27,7 @@ if conf.get('ENABLE_TIMESYNCD') == 1 - output : 'timesyncd.conf', - configuration : substs) - install_data(timesyncd_conf, -- install_dir : pkgsysconfdir) -+ install_dir : factorypkgconfdir) - install_data('org.freedesktop.timesync1.conf', - install_dir : dbuspolicydir) - install_data('org.freedesktop.timesync1.service', -diff --git a/src/udev/meson.build b/src/udev/meson.build -index 511fe428b9..32333efea6 100644 ---- a/src/udev/meson.build -+++ b/src/udev/meson.build -@@ -186,7 +186,7 @@ foreach prog : [['ata_id/ata_id.c'], - endforeach - - install_data('udev.conf', -- install_dir : join_paths(sysconfdir, 'udev')) -+ install_dir : join_paths(factoryconfdir, 'udev')) - - configure_file( - input : 'udev.pc.in', -@@ -195,7 +195,7 @@ configure_file( - install_dir : pkgconfigdatadir == 'no' ? '' : pkgconfigdatadir) - - meson.add_install_script('sh', '-c', -- mkdir_p.format(join_paths(sysconfdir, 'udev/rules.d'))) -+ mkdir_p.format(join_paths(factoryconfdir, 'udev/rules.d'))) - - fuzzers += [ - [['src/udev/net/fuzz-link-parser.c', -diff --git a/sysctl.d/meson.build b/sysctl.d/meson.build -index 3f072e3db7..bd9f843eba 100644 ---- a/sysctl.d/meson.build -+++ b/sysctl.d/meson.build -@@ -27,4 +27,4 @@ foreach file : in_files - endforeach - - meson.add_install_script('sh', '-c', -- mkdir_p.format(join_paths(sysconfdir, 'sysctl.d'))) -+ mkdir_p.format(join_paths(factoryconfdir, 'sysctl.d'))) -diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build -index e77f46d06b..04d2ef621d 100644 ---- a/tmpfiles.d/meson.build -+++ b/tmpfiles.d/meson.build -@@ -57,5 +57,5 @@ endforeach - if enable_tmpfiles - meson.add_install_script( - 'sh', '-c', -- mkdir_p.format(join_paths(sysconfdir, 'tmpfiles.d'))) -+ mkdir_p.format(join_paths(factoryconfdir, 'tmpfiles.d'))) - endif -diff --git a/units/meson.build b/units/meson.build -index 476991edba..3d9dc6e1c8 100644 ---- a/units/meson.build -+++ b/units/meson.build -@@ -308,7 +308,7 @@ install_data('user-.slice.d/10-defaults.conf', - - meson.add_install_script(meson_make_symlink, - join_paths(pkgsysconfdir, 'user'), -- join_paths(sysconfdir, 'xdg/systemd/user')) -+ join_paths(factorypkgconfdir, 'xdg/systemd/user')) - meson.add_install_script(meson_make_symlink, - join_paths(dbussystemservicedir, 'org.freedesktop.systemd1.service'), - join_paths(dbussessionservicedir, 'org.freedesktop.systemd1.service')) --- -2.24.1 - diff --git a/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch b/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch new file mode 100644 index 00000000000..f47a327c311 --- /dev/null +++ b/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch @@ -0,0 +1,33 @@ +From b35237652b2244397b6a4350e156e4bfe025e13a Mon Sep 17 00:00:00 2001 +From: Florian Klink +Date: Sun, 8 Mar 2020 01:05:54 +0100 +Subject: [PATCH 18/18] path-util.h: add placeholder for DEFAULT_PATH_NORMAL + +This will be the $PATH used to lookup ExecStart= etc. options, which +systemd itself uses extensively. +--- + src/basic/path-util.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/basic/path-util.h b/src/basic/path-util.h +index 30031fca8e..d97145539a 100644 +--- a/src/basic/path-util.h ++++ b/src/basic/path-util.h +@@ -24,11 +24,11 @@ + # define PATH_SBIN_BIN_NULSTR(x) PATH_NORMAL_SBIN_BIN_NULSTR(x) + #endif + +-#define DEFAULT_PATH_NORMAL PATH_SBIN_BIN("/usr/local/") ":" PATH_SBIN_BIN("/usr/") +-#define DEFAULT_PATH_NORMAL_NULSTR PATH_SBIN_BIN_NULSTR("/usr/local/") PATH_SBIN_BIN_NULSTR("/usr/") ++#define DEFAULT_PATH_NORMAL "@defaultPathNormal@" ++#define DEFAULT_PATH_NORMAL_NULSTR "@defaultPathNormal@\0" + #define DEFAULT_PATH_SPLIT_USR DEFAULT_PATH_NORMAL ":" PATH_SBIN_BIN("/") + #define DEFAULT_PATH_SPLIT_USR_NULSTR DEFAULT_PATH_NORMAL_NULSTR PATH_SBIN_BIN_NULSTR("/") +-#define DEFAULT_PATH_COMPAT PATH_SPLIT_SBIN_BIN("/usr/local/") ":" PATH_SPLIT_SBIN_BIN("/usr/") ":" PATH_SPLIT_SBIN_BIN("/") ++#define DEFAULT_PATH_COMPAT DEFAULT_PATH_NORMAL + + #if HAVE_SPLIT_USR + # define DEFAULT_PATH DEFAULT_PATH_SPLIT_USR +-- +2.26.2 + diff --git a/pkgs/os-specific/linux/systemd/0019-inherit-systemd-environment-when-calling-generators.patch b/pkgs/os-specific/linux/systemd/0019-inherit-systemd-environment-when-calling-generators.patch deleted file mode 100644 index f4f1e6d37b5..00000000000 --- a/pkgs/os-specific/linux/systemd/0019-inherit-systemd-environment-when-calling-generators.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 3eb1716dd80c245a2883da04156af79fb9097519 Mon Sep 17 00:00:00 2001 -From: Andreas Rammhold -Date: Fri, 2 Nov 2018 21:15:42 +0100 -Subject: [PATCH 19/27] inherit systemd environment when calling generators. - -Systemd generators need access to the environment configured in -stage-2-init.sh since it schedules fsck and mkfs executions based on -being able to find an appropriate binary for the target filesystem. - -With this commit I am altering the systemd behaviour since upstream -tries to gather environments with that they call -"environment-generators" and then seems to pass that on to all the other -executables that are being called from managers. ---- - src/core/manager.c | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/src/core/manager.c b/src/core/manager.c -index d9114bb0c5..22c3b6ff76 100644 ---- a/src/core/manager.c -+++ b/src/core/manager.c -@@ -3868,9 +3868,14 @@ static int manager_run_generators(Manager *m) { - argv[4] = NULL; - - RUN_WITH_UMASK(0022) -- (void) execute_directories((const char* const*) paths, DEFAULT_TIMEOUT_USEC, NULL, NULL, -- (char**) argv, m->transient_environment, EXEC_DIR_PARALLEL | EXEC_DIR_IGNORE_ERRORS); -- -+ (void) execute_directories((const char* const*) paths, DEFAULT_TIMEOUT_USEC, -+ // On NixOS we must propagate PATH to generators so they are -+ // able to find binaries such as `fsck.${fstype}` and -+ // `mkfs.${fstype}`. That is why the last argument of the -+ // function (envp) is set to NULL. This propagates systemd's -+ // environment (e.g. PATH) that was setup -+ // before calling systemd from stage-2-init.sh. -+ NULL, NULL, (char**) argv, /* NixOS: use inherited env */ NULL, EXEC_DIR_PARALLEL | EXEC_DIR_IGNORE_ERRORS); - r = 0; - - finish: --- -2.24.1 - diff --git a/pkgs/os-specific/linux/systemd/0021-add-rootprefix-to-lookup-dir-paths.patch b/pkgs/os-specific/linux/systemd/0021-add-rootprefix-to-lookup-dir-paths.patch deleted file mode 100644 index 39bbe7e9dac..00000000000 --- a/pkgs/os-specific/linux/systemd/0021-add-rootprefix-to-lookup-dir-paths.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 8d1618a97ad08078815f409f03b45aff3ae6bd0a Mon Sep 17 00:00:00 2001 -From: Andreas Rammhold -Date: Thu, 9 May 2019 11:15:22 +0200 -Subject: [PATCH 21/27] add rootprefix to lookup dir paths - -systemd does not longer use the UDEVLIBEXEC directory as root for -discovery default udev rules. By adding `$out/lib` to the lookup paths -we should again be able to discover the udev rules amongst other default -files that I might have missed. ---- - src/basic/def.h | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/basic/def.h b/src/basic/def.h -index 2af0b763f0..17959b07e8 100644 ---- a/src/basic/def.h -+++ b/src/basic/def.h -@@ -39,13 +39,15 @@ - "/run/" n "\0" \ - "/usr/local/lib/" n "\0" \ - "/usr/lib/" n "\0" \ -- _CONF_PATHS_SPLIT_USR_NULSTR(n) -+ _CONF_PATHS_SPLIT_USR_NULSTR(n) \ -+ ROOTPREFIX "/lib/" n "\0" - - #define CONF_PATHS_USR(n) \ - "/etc/" n, \ - "/run/" n, \ - "/usr/local/lib/" n, \ -- "/usr/lib/" n -+ "/usr/lib/" n, \ -+ ROOTPREFIX "/lib/" n - - #define CONF_PATHS(n) \ - CONF_PATHS_USR(n) \ --- -2.24.1 - diff --git a/pkgs/os-specific/linux/systemd/0022-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch b/pkgs/os-specific/linux/systemd/0022-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch deleted file mode 100644 index 9f0ea254890..00000000000 --- a/pkgs/os-specific/linux/systemd/0022-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 859c16c52cdd61ec99d256bf5b35637d59e5dac9 Mon Sep 17 00:00:00 2001 -From: Nikolay Amiantov -Date: Thu, 25 Jul 2019 20:45:55 +0300 -Subject: [PATCH 22/27] systemd-shutdown: execute scripts in - /etc/systemd/system-shutdown - -This is needed for NixOS to use such scripts as systemd directory is immutable. ---- - src/shutdown/shutdown.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c -index 0eb17989d0..93e619c58a 100644 ---- a/src/shutdown/shutdown.c -+++ b/src/shutdown/shutdown.c -@@ -299,7 +299,7 @@ int main(int argc, char *argv[]) { - _cleanup_free_ char *cgroup = NULL; - char *arguments[3], *watchdog_device; - int cmd, r, umount_log_level = LOG_INFO; -- static const char* const dirs[] = {SYSTEM_SHUTDOWN_PATH, NULL}; -+ static const char* const dirs[] = {SYSTEM_SHUTDOWN_PATH, "/etc/systemd/system-shutdown", NULL}; - - /* The log target defaults to console, but the original systemd process will pass its log target in through a - * command line argument, which will override this default. Also, ensure we'll never log to the journal or --- -2.24.1 - diff --git a/pkgs/os-specific/linux/systemd/0023-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch b/pkgs/os-specific/linux/systemd/0023-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch deleted file mode 100644 index e8aa5cf2271..00000000000 --- a/pkgs/os-specific/linux/systemd/0023-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 9be689d5243d0c78bec7b285774c58749da08c9c Mon Sep 17 00:00:00 2001 -From: Nikolay Amiantov -Date: Thu, 25 Jul 2019 20:46:58 +0300 -Subject: [PATCH 23/27] systemd-sleep: execute scripts in - /etc/systemd/system-sleep - -This is needed for NixOS to use such scripts as systemd directory is immutable. ---- - src/sleep/sleep.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c -index b9fe96635d..f1c3ca06a3 100644 ---- a/src/sleep/sleep.c -+++ b/src/sleep/sleep.c -@@ -191,6 +191,7 @@ static int execute(char **modes, char **states) { - }; - static const char* const dirs[] = { - SYSTEM_SLEEP_PATH, -+ "/etc/systemd/system-sleep", - NULL - }; - --- -2.24.1 - diff --git a/pkgs/os-specific/linux/systemd/0024-kmod-static-nodes.service-Update-ConditionFileNotEmpty.patch b/pkgs/os-specific/linux/systemd/0024-kmod-static-nodes.service-Update-ConditionFileNotEmpty.patch deleted file mode 100644 index df16b52660b..00000000000 --- a/pkgs/os-specific/linux/systemd/0024-kmod-static-nodes.service-Update-ConditionFileNotEmpty.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 7db89c2236158461c99fe5c5da7ddb7feab825cf Mon Sep 17 00:00:00 2001 -From: Florian Klink -Date: Sat, 7 Mar 2020 22:40:27 +0100 -Subject: [PATCH] kmod-static-nodes.service: Update ConditionFileNotEmpty - -On NixOS, kernel modules of the currently booted systems are located at -/run/booted-system/kernel-modules/lib/modules/%v/, not /lib/modules/%v/. ---- - units/kmod-static-nodes.service.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/units/kmod-static-nodes.service.in b/units/kmod-static-nodes.service.in -index 0971edf9ec..87105a87b9 100644 ---- a/units/kmod-static-nodes.service.in -+++ b/units/kmod-static-nodes.service.in -@@ -12,7 +12,7 @@ Description=Create list of static device nodes for the current kernel - DefaultDependencies=no - Before=sysinit.target systemd-tmpfiles-setup-dev.service - ConditionCapability=CAP_SYS_MODULE --ConditionFileNotEmpty=/lib/modules/%v/modules.devname -+ConditionFileNotEmpty=/run/booted-system/kernel-modules/lib/modules/%v/modules.devname - - [Service] - Type=oneshot --- -2.25.1 - diff --git a/pkgs/os-specific/linux/systemd/0025-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch b/pkgs/os-specific/linux/systemd/0025-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch deleted file mode 100644 index 10bf54708f0..00000000000 --- a/pkgs/os-specific/linux/systemd/0025-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0939ac4be7ced099670979f26adf8a579173ce4b Mon Sep 17 00:00:00 2001 -From: Florian Klink -Date: Sun, 8 Mar 2020 01:05:54 +0100 -Subject: [PATCH] path-util.h: add placeholder for DEFAULT_PATH_NORMAL - -This will be the $PATH used to lookup ExecStart= etc. options, which -systemd itself uses extensively. ---- - src/basic/path-util.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/basic/path-util.h b/src/basic/path-util.h -index 111d85d445..cfd92aeb73 100644 ---- a/src/basic/path-util.h -+++ b/src/basic/path-util.h -@@ -24,11 +24,11 @@ - # define PATH_SBIN_BIN_NULSTR(x) PATH_NORMAL_SBIN_BIN_NULSTR(x) - #endif - --#define DEFAULT_PATH_NORMAL PATH_SBIN_BIN("/usr/local/") ":" PATH_SBIN_BIN("/usr/") --#define DEFAULT_PATH_NORMAL_NULSTR PATH_SBIN_BIN_NULSTR("/usr/local/") PATH_SBIN_BIN_NULSTR("/usr/") -+#define DEFAULT_PATH_NORMAL "@defaultPathNormal@" -+#define DEFAULT_PATH_NORMAL_NULSTR "@defaultPathNormal@\0" - #define DEFAULT_PATH_SPLIT_USR DEFAULT_PATH_NORMAL ":" PATH_SBIN_BIN("/") - #define DEFAULT_PATH_SPLIT_USR_NULSTR DEFAULT_PATH_NORMAL_NULSTR PATH_SBIN_BIN_NULSTR("/") --#define DEFAULT_PATH_COMPAT PATH_SPLIT_SBIN_BIN("/usr/local/") ":" PATH_SPLIT_SBIN_BIN("/usr/") ":" PATH_SPLIT_SBIN_BIN("/") -+#define DEFAULT_PATH_COMPAT DEFAULT_PATH_NORMAL - - #if HAVE_SPLIT_USR - # define DEFAULT_PATH DEFAULT_PATH_SPLIT_USR --- -2.25.1 - diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 5728431b059..479b747ec41 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -45,23 +45,23 @@ in stdenv.mkDerivation { patches = [ ./0001-Start-device-units-for-uninitialised-encrypted-devic.patch - ./0003-Don-t-try-to-unmount-nix-or-nix-store.patch - ./0004-Fix-NixOS-containers.patch - ./0006-Look-for-fsck-in-the-right-place.patch - ./0007-Add-some-NixOS-specific-unit-directories.patch - ./0009-Get-rid-of-a-useless-message-in-user-sessions.patch - ./0010-hostnamed-localed-timedated-disable-methods-that-cha.patch - ./0011-Fix-hwdb-paths.patch - ./0012-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch - ./0013-localectl-use-etc-X11-xkb-for-list-x11.patch - ./0016-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch - ./0018-Install-default-configuration-into-out-share-factory.patch - ./0019-inherit-systemd-environment-when-calling-generators.patch - ./0021-add-rootprefix-to-lookup-dir-paths.patch - ./0022-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch - ./0023-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch - ./0024-kmod-static-nodes.service-Update-ConditionFileNotEmpty.patch - ./0025-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch + ./0002-Don-t-try-to-unmount-nix-or-nix-store.patch + ./0003-Fix-NixOS-containers.patch + ./0004-Look-for-fsck-in-the-right-place.patch + ./0005-Add-some-NixOS-specific-unit-directories.patch + ./0006-Get-rid-of-a-useless-message-in-user-sessions.patch + ./0007-hostnamed-localed-timedated-disable-methods-that-cha.patch + ./0008-Fix-hwdb-paths.patch + ./0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch + ./0010-localectl-use-etc-X11-xkb-for-list-x11.patch + ./0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch + ./0012-Install-default-configuration-into-out-share-factory.patch + ./0013-inherit-systemd-environment-when-calling-generators.patch + ./0014-add-rootprefix-to-lookup-dir-paths.patch + ./0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch + ./0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch + ./0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch + ./0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch ]; postPatch = '' -- cgit v1.2.3 From 1a3c3b819b2195e68ab6729764ab5c0347753f19 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Wed, 29 Apr 2020 19:48:57 -0400 Subject: scrcpy: 1.12.1 -> 1.13 --- pkgs/misc/scrcpy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/scrcpy/default.nix b/pkgs/misc/scrcpy/default.nix index c47825f9010..a93f7e6aeaf 100644 --- a/pkgs/misc/scrcpy/default.nix +++ b/pkgs/misc/scrcpy/default.nix @@ -10,10 +10,10 @@ }: let - version = "1.12.1"; + version = "1.13"; prebuilt_server = fetchurl { url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}"; - sha256 = "1sk6hbbnf4g6q58fspwlh8bn16j73j3i8hlcshqxzhfhl746krb3"; + sha256 = "11gqsl2x18hgwdjajag9q8qdxqvdqr9m67zka22z7hnd3k569vjz"; }; in stdenv.mkDerivation rec { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "Genymobile"; repo = pname; rev = "v${version}"; - sha256 = "16zi0d2jjm2nlrwkwvsxzfpgy45ami45wfh67wq7na2h2ywfmgcp"; + sha256 = "1zc73l5vm4hca8niaa3y76kpk7i9vj89wv4gbxmf1yjmixb71hby"; }; # postPatch: -- cgit v1.2.3 From 97d6fc89534a1d1ac858e7ba4ca2e166d75d7b93 Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Thu, 30 Apr 2020 02:06:34 +0200 Subject: python3Packages.black: update homepage The repo is now in the PSF GitHub org. --- pkgs/development/python-modules/black/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/black/default.nix b/pkgs/development/python-modules/black/default.nix index 4b4d2e4a903..997f20e137d 100644 --- a/pkgs/development/python-modules/black/default.nix +++ b/pkgs/development/python-modules/black/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "The uncompromising Python code formatter"; - homepage = "https://github.com/ambv/black"; + homepage = "https://github.com/psf/black"; license = licenses.mit; maintainers = with maintainers; [ sveitser ]; }; -- cgit v1.2.3 From eb73b71df40b7bac8c2e961b217303e6e17c4355 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 30 Apr 2020 01:08:05 +0200 Subject: systemd: 245.3 -> 245.5 Also, update 0005-Add-some-NixOS-specific-unit-directories.patch to explain how and where these paths are being used. --- ...evice-units-for-uninitialised-encrypted-devic.patch | 2 +- .../0002-Don-t-try-to-unmount-nix-or-nix-store.patch | 2 +- .../linux/systemd/0003-Fix-NixOS-containers.patch | 2 +- .../0004-Look-for-fsck-in-the-right-place.patch | 2 +- ...0005-Add-some-NixOS-specific-unit-directories.patch | 18 +++++++++--------- ...Get-rid-of-a-useless-message-in-user-sessions.patch | 4 ++-- ...ed-localed-timedated-disable-methods-that-cha.patch | 2 +- .../linux/systemd/0008-Fix-hwdb-paths.patch | 2 +- ...009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch | 2 +- .../0010-localectl-use-etc-X11-xkb-for-list-x11.patch | 2 +- ...on-t-create-statedir-and-don-t-touch-prefixdi.patch | 2 +- ...-default-configuration-into-out-share-factory.patch | 2 +- ...t-systemd-environment-when-calling-generators.patch | 2 +- .../0014-add-rootprefix-to-lookup-dir-paths.patch | 2 +- ...-shutdown-execute-scripts-in-etc-systemd-syst.patch | 2 +- ...-sleep-execute-scripts-in-etc-systemd-system-.patch | 2 +- ...atic-nodes.service-Update-ConditionFileNotEmp.patch | 2 +- ...til.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch | 2 +- pkgs/os-specific/linux/systemd/default.nix | 6 +++--- 19 files changed, 30 insertions(+), 30 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch index a7f5a15e050..c88d0eeeff2 100644 --- a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch +++ b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch @@ -1,4 +1,4 @@ -From 7900e82a60e22354ab2b1c71f4664c1e2357ab23 Mon Sep 17 00:00:00 2001 +From b873e4c0de3e24f2ec9370e5a217247217e90587 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 8 Jan 2013 15:46:30 +0100 Subject: [PATCH 01/18] Start device units for uninitialised encrypted devices diff --git a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch index c5679bb393c..4f94cb465d4 100644 --- a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch +++ b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch @@ -1,4 +1,4 @@ -From 1e2f2f80e106910bbf3fd27438b794937ff3a1a8 Mon Sep 17 00:00:00 2001 +From bdd3ff777dd8253ff5732118dd6de0fa9a9b95fe Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 12 Apr 2013 13:16:57 +0200 Subject: [PATCH 02/18] Don't try to unmount /nix or /nix/store diff --git a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch index fb038c369f8..73aab8dd91c 100644 --- a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch +++ b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch @@ -1,4 +1,4 @@ -From 1ff6f3a4250240e1ba56861e31819fe3c5516844 Mon Sep 17 00:00:00 2001 +From c28b3b2e254433e93549ee6fe8c93b43ce455776 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 16 Apr 2014 10:59:28 +0200 Subject: [PATCH 03/18] Fix NixOS containers diff --git a/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch b/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch index 3f102bd4d9b..e10726a2cb1 100644 --- a/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch +++ b/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch @@ -1,4 +1,4 @@ -From 9cc4c2f4fd5d082aa039073a3620df536261100a Mon Sep 17 00:00:00 2001 +From baf52609ad18785aa1d2cd043185ae9438d59411 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 May 2014 14:10:10 +0200 Subject: [PATCH 04/18] Look for fsck in the right place diff --git a/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch b/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch index af7d227eda2..23aa893362b 100644 --- a/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch +++ b/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch @@ -1,12 +1,12 @@ -From a036a1754104df9b9f7d9b3787840a83b06d0c18 Mon Sep 17 00:00:00 2001 +From 45f80155b7c2edb1e73c233283f1ab1582e1cfbe Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 19 Dec 2014 14:46:17 +0100 Subject: [PATCH 05/18] Add some NixOS-specific unit directories -Look in /nix/var/nix/profiles/default/lib/systemd for units provided -by packages in the default (system-wide) profile, and in -/etc/systemd-mutable/system for persistent, mutable units (not -recommended). +Look in `/nix/var/nix/profiles/default/lib/systemd` for units provided +by packages installed into the default profile via +`nix-env -iA nixos.$package`, and into `/etc/systemd-mutable/system` for +persistent, mutable units (used for Dysnomia). Also, remove /usr and /lib as these don't exist on NixOS. --- @@ -30,7 +30,7 @@ index 8331832c7a..bedb97115d 100644 systemdusergeneratordir=${prefix}/lib/systemd/user-generators systemdsystemgeneratorpath=/run/systemd/system-generators:/etc/systemd/system-generators:/usr/local/lib/systemd/system-generators:${systemdsystemgeneratordir} diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c -index 5b16209745..13c0a57637 100644 +index 48e0eec09a..a9d38f16d0 100644 --- a/src/shared/path-lookup.c +++ b/src/shared/path-lookup.c @@ -98,17 +98,14 @@ int xdg_user_data_dir(char **ret, const char *suffix) { @@ -52,7 +52,7 @@ index 5b16209745..13c0a57637 100644 NULL }; -@@ -603,15 +600,14 @@ int lookup_paths_init( +@@ -604,15 +601,14 @@ int lookup_paths_init( persistent_config, SYSTEM_CONFIG_UNIT_PATH, "/etc/systemd/system", @@ -70,7 +70,7 @@ index 5b16209745..13c0a57637 100644 STRV_IFNOTNULL(generator_late)); break; -@@ -627,14 +623,12 @@ int lookup_paths_init( +@@ -628,14 +624,12 @@ int lookup_paths_init( persistent_config, USER_CONFIG_UNIT_PATH, "/etc/systemd/user", @@ -87,7 +87,7 @@ index 5b16209745..13c0a57637 100644 STRV_IFNOTNULL(generator_late)); break; -@@ -823,14 +817,12 @@ char **generator_binary_paths(UnitFileScope scope) { +@@ -824,14 +818,12 @@ char **generator_binary_paths(UnitFileScope scope) { case UNIT_FILE_SYSTEM: return strv_new("/run/systemd/system-generators", "/etc/systemd/system-generators", diff --git a/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch b/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch index 9e93b1497ef..0b57dc1f9c8 100644 --- a/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch +++ b/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch @@ -1,4 +1,4 @@ -From d96e5224001ea437549eae7b00173b61d459209e Mon Sep 17 00:00:00 2001 +From d52058070c0c12bb05f82460f0b4b55678b724e9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 11 May 2015 15:39:38 +0200 Subject: [PATCH 06/18] Get rid of a useless message in user sessions @@ -13,7 +13,7 @@ in containers. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/unit.c b/src/core/unit.c -index 2816bcef55..0e5102a28c 100644 +index 97e1b0004c..d3cc2ba9ec 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -2043,7 +2043,8 @@ static void unit_check_binds_to(Unit *u) { diff --git a/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch b/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch index a14178a3610..5703c4f43fd 100644 --- a/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch +++ b/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch @@ -1,4 +1,4 @@ -From 23d17b5f60d9b494ee8b7399350478d24e91e460 Mon Sep 17 00:00:00 2001 +From 409fc808794942ad1736c2cc74853d9792e4ad02 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 6 Dec 2015 14:26:36 +0100 Subject: [PATCH 07/18] hostnamed, localed, timedated: disable methods that diff --git a/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch b/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch index d857be55890..a9bf9abee52 100644 --- a/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch +++ b/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch @@ -1,4 +1,4 @@ -From e827145cf4390cf926897f591f0105b43e6fc3e2 Mon Sep 17 00:00:00 2001 +From b56fc7b6ae8014eb2f71924c89498f395a1a81bd Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 7 Jul 2016 02:47:13 +0300 Subject: [PATCH 08/18] Fix hwdb paths diff --git a/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch b/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch index 8d7c1eb8e7a..12a9dd5a77f 100644 --- a/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch +++ b/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch @@ -1,4 +1,4 @@ -From 5da944d33a915222509ecd73c69fe7ae8917334f Mon Sep 17 00:00:00 2001 +From 4d304a321796db4de827aa39a149bea23d039214 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Tue, 11 Oct 2016 13:12:08 +0300 Subject: [PATCH 09/18] Change /usr/share/zoneinfo to /etc/zoneinfo diff --git a/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch b/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch index 031d7f68009..7e6453f2ddd 100644 --- a/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch +++ b/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch @@ -1,4 +1,4 @@ -From d5637ccec3c32919e8aef2dc59b97fdbe3923ba1 Mon Sep 17 00:00:00 2001 +From cb3f1ec1793cbf74c4b5663e038bd49ff4576192 Mon Sep 17 00:00:00 2001 From: Imuli Date: Wed, 19 Oct 2016 08:46:47 -0400 Subject: [PATCH 10/18] localectl: use /etc/X11/xkb for list-x11-* diff --git a/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch b/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch index f122cca5b6f..080cd4670e6 100644 --- a/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch +++ b/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch @@ -1,4 +1,4 @@ -From f488835c587d79ba824302a8933b47a83ddc2d57 Mon Sep 17 00:00:00 2001 +From 0ffb786d0e12a61899af448b1e4dd32a53ea5a8e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 11 Feb 2018 04:37:44 +0100 Subject: [PATCH 11/18] build: don't create statedir and don't touch prefixdir diff --git a/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch b/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch index 1b52f8ece52..2961a2ebe56 100644 --- a/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch +++ b/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch @@ -1,4 +1,4 @@ -From be87849145bc50ab0b16c63fe2b748de13974f0e Mon Sep 17 00:00:00 2001 +From 3dbcdab1ba22c4eeca6d61718c09bcb9b5551764 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 26 Feb 2018 14:25:57 +0000 Subject: [PATCH 12/18] Install default configuration into $out/share/factory diff --git a/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch b/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch index 583aa89afff..5aa397afe8e 100644 --- a/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch +++ b/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch @@ -1,4 +1,4 @@ -From d16a7d5580adcf5737c7be3b02d411097a498256 Mon Sep 17 00:00:00 2001 +From 0b0510aa72cf8026f34f300efa3f150f45971404 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Fri, 2 Nov 2018 21:15:42 +0100 Subject: [PATCH 13/18] inherit systemd environment when calling generators. diff --git a/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch b/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch index cc2972cb656..91c091baa9e 100644 --- a/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch +++ b/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch @@ -1,4 +1,4 @@ -From ac4a62d0be763846e244ff9032635c8041ad7881 Mon Sep 17 00:00:00 2001 +From 4bd20cf0450455e2f9831b09ba91811ba3d58961 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 9 May 2019 11:15:22 +0200 Subject: [PATCH 14/18] add rootprefix to lookup dir paths diff --git a/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch b/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch index 6f792934f5a..2bc75e27928 100644 --- a/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch +++ b/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch @@ -1,4 +1,4 @@ -From 8a5db86ace1d7729f2c8ccacddbf5ca17fe86274 Mon Sep 17 00:00:00 2001 +From f23a1e00de028048a2a21d322493039cce7ee214 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 25 Jul 2019 20:45:55 +0300 Subject: [PATCH 15/18] systemd-shutdown: execute scripts in diff --git a/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch b/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch index f6809e9d58a..97f63c02c38 100644 --- a/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch +++ b/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch @@ -1,4 +1,4 @@ -From 858fbf641ff5cd207282f3ad9d7458b2be2dcdb8 Mon Sep 17 00:00:00 2001 +From 758b8211e6e76524d62a2e0ffcf37dcf55e3be87 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Thu, 25 Jul 2019 20:46:58 +0300 Subject: [PATCH 16/18] systemd-sleep: execute scripts in diff --git a/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch b/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch index a3a9b936d13..2a0bb0103f5 100644 --- a/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch +++ b/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch @@ -1,4 +1,4 @@ -From da86057b6d1c0d39622977cfb85b7edaeeeb795e Mon Sep 17 00:00:00 2001 +From ce9fe2249c91fdfb224eaffce63e3dbdb4a5c25d Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 7 Mar 2020 22:40:27 +0100 Subject: [PATCH 17/18] kmod-static-nodes.service: Update ConditionFileNotEmpty diff --git a/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch b/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch index f47a327c311..08b2fa056f8 100644 --- a/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch +++ b/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch @@ -1,4 +1,4 @@ -From b35237652b2244397b6a4350e156e4bfe025e13a Mon Sep 17 00:00:00 2001 +From 55b69fc1b5441e3aff8f1ab684ba8eed3718a32d Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 8 Mar 2020 01:05:54 +0100 Subject: [PATCH 18/18] path-util.h: add placeholder for DEFAULT_PATH_NORMAL diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 479b747ec41..00a545ed3f5 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -31,7 +31,7 @@ let gnupg-minimal = gnupg.override { bzip2 = null; }; in stdenv.mkDerivation { - version = "245.3"; + version = "245.5"; pname = "systemd"; # When updating, use https://github.com/systemd/systemd-stable tree, not the development one! @@ -39,8 +39,8 @@ in stdenv.mkDerivation { src = fetchFromGitHub { owner = "systemd"; repo = "systemd-stable"; - rev = "0f5047b7d393cfba37f91e25cae559a0bc910582"; - sha256 = "0wyh14gbvvpgdmk1mjgpxr9i4pv1i9n7pnwpa0gvjh6hq948fyn2"; + rev = "9a506b7e9291d997a920af9ac299e7b834368119"; + sha256 = "19qd92hjlsljr6x5mbw1l2vdzz5y9hy7y7g0dwgpfifb0lwkxqbr"; }; patches = [ -- cgit v1.2.3 From 59b5e9211767cd1cbd6bfd3d5ed90c3a72d32e2e Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 30 Apr 2020 09:57:48 +0300 Subject: mtxclient: format inputs and arguments --- pkgs/development/libraries/mtxclient/default.nix | 27 ++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index c4d86220081..0c6134e204f 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -1,5 +1,15 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig -, boost, openssl, zlib, libsodium, olm, nlohmann_json }: +{ stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, pkgconfig +, boost +, openssl +, zlib +, libsodium +, olm +, nlohmann_json +}: stdenv.mkDerivation rec { pname = "mtxclient"; @@ -18,8 +28,17 @@ stdenv.mkDerivation rec { "-Dnlohmann_json_DIR=${nlohmann_json}/lib/cmake/nlohmann_json" ]; - nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ boost openssl zlib libsodium olm ]; + nativeBuildInputs = [ + cmake + pkgconfig + ]; + buildInputs = [ + boost + openssl + zlib + libsodium + olm + ]; meta = with stdenv.lib; { description = "Client API library for Matrix, built on top of Boost.Asio"; -- cgit v1.2.3 From 6584d4fdb903f79d274dd2f3178a1a630c409063 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 24 Apr 2020 11:09:33 +0300 Subject: mtxclient: 0.2.1 -> 0.3.0 --- pkgs/development/libraries/mtxclient/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index 0c6134e204f..a8aa0062483 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -3,23 +3,24 @@ , fetchpatch , cmake , pkgconfig -, boost +, boost17x , openssl , zlib , libsodium , olm +, spdlog , nlohmann_json }: stdenv.mkDerivation rec { pname = "mtxclient"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "mtxclient"; rev = "v${version}"; - sha256 = "0pycznrvj57ff6gbwfn1xj943d2dr4vadl79hii1z16gn0nzxpmj"; + sha256 = "0vf5xmn6yfi5lvskfgrdmnalvclzrapcrml92bj9qaa8vq8mfsf2"; }; cmakeFlags = [ @@ -33,7 +34,8 @@ stdenv.mkDerivation rec { pkgconfig ]; buildInputs = [ - boost + spdlog + boost17x openssl zlib libsodium -- cgit v1.2.3 From 875cdcff4ab8c6e2593273b62151d23a2d59c4fa Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 30 Apr 2020 10:05:16 +0300 Subject: mtxclient: mention why tests are disabled --- pkgs/development/libraries/mtxclient/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index a8aa0062483..79ded7f43ef 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -24,6 +24,8 @@ stdenv.mkDerivation rec { }; cmakeFlags = [ + # Network requiring tests can't be disabled individually: + # https://github.com/Nheko-Reborn/mtxclient/issues/22 "-DBUILD_LIB_TESTS=OFF" "-DBUILD_LIB_EXAMPLES=OFF" "-Dnlohmann_json_DIR=${nlohmann_json}/lib/cmake/nlohmann_json" -- cgit v1.2.3 From a88741ac15fb15cbb253305ffc8ecc8f7ffe7c42 Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Thu, 30 Apr 2020 08:22:20 +0100 Subject: gnuchess: 6.2.5 -> 6.2.6 --- pkgs/games/gnuchess/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/games/gnuchess/default.nix b/pkgs/games/gnuchess/default.nix index 43c60c66730..478da6dc32a 100644 --- a/pkgs/games/gnuchess/default.nix +++ b/pkgs/games/gnuchess/default.nix @@ -1,12 +1,12 @@ -{stdenv, fetchurl, flex}: +{stdenv, fetchurl, flex, makeWrapper}: let s = # Generated upstream information rec { baseName="gnuchess"; - version="6.2.5"; + version="6.2.6"; name="${baseName}-${version}"; url="mirror://gnu/chess/${name}.tar.gz"; - sha256="00j8s0npgfdi41a0mr5w9qbdxagdk2v41lcr42rwl1jp6miyk6cs"; + sha256="0kxhdv01ia91v2y0cmzbll391ns2vbmn65jjrv37h4s1srszh5yn"; }; buildInputs = [ flex @@ -18,6 +18,13 @@ stdenv.mkDerivation { inherit (s) url sha256; }; inherit buildInputs; + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/gnuchessx --set PATH "$out/bin" + wrapProgram $out/bin/gnuchessu --set PATH "$out/bin" + ''; + meta = { inherit (s) version; description = "GNU Chess engine"; -- cgit v1.2.3 From 5c39300463618b12b53548172583c9ed1b271a02 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 17 Apr 2020 13:18:19 +0300 Subject: tweeny: init at 3.1.0 --- pkgs/development/libraries/tweeny/default.nix | 30 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/libraries/tweeny/default.nix diff --git a/pkgs/development/libraries/tweeny/default.nix b/pkgs/development/libraries/tweeny/default.nix new file mode 100644 index 00000000000..d3c30028ba4 --- /dev/null +++ b/pkgs/development/libraries/tweeny/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "tweeny"; + version = "3.1.0"; + + src = fetchFromGitHub { + owner = "mobius3"; + repo = "tweeny"; + rev = "v${version}"; + sha256 = "0qvby57g9a2m4afd1mgard3k7nm4ynbvali7nzm1qn3ygdmqid7n"; + }; + + nativeBuildInputs = [ + cmake + ]; + + doCheck = true; + + meta = with stdenv.lib; { + description = "A modern C++ tweening library"; + license = licenses.mit; + homepage = "http://mobius3.github.io/tweeny"; + maintainers = [ maintainers.doronbehar ]; + platforms = with platforms; darwin ++ linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f182b6d250c..262adcee5d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7438,6 +7438,8 @@ in tweet-hs = haskell.lib.justStaticExecutables haskellPackages.tweet-hs; + tweeny = callPackage ../development/libraries/tweeny { }; + qfsm = callPackage ../applications/science/electronics/qfsm { }; tkgate = callPackage ../applications/science/electronics/tkgate/1.x.nix { }; -- cgit v1.2.3 From 13aa8b58ca57a29a982acda64c3f2d9b39071858 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 30 Apr 2020 10:08:47 +0300 Subject: nheko: format inputs and arguments --- .../instant-messengers/nheko/default.nix | 35 ++++++++++++++++++---- 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 1938bae4f74..34d60dff97a 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -1,6 +1,19 @@ -{ lib, stdenv, fetchFromGitHub -, cmake, cmark, lmdb, mkDerivation, qtbase, qtmacextras -, qtmultimedia, qttools, mtxclient, boost, spdlog, olm, pkgconfig +{ lib +, stdenv +, fetchFromGitHub +, cmake +, cmark +, lmdb +, mkDerivation +, qtbase +, qtmacextras +, qtmultimedia +, qttools +, mtxclient +, boost +, spdlog +, olm +, pkgconfig , nlohmann_json }: @@ -60,11 +73,21 @@ mkDerivation rec { "-Dnlohmann_json_DIR=${nlohmann_json}/lib/cmake/nlohmann_json" ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ + cmake + pkgconfig + ]; buildInputs = [ - mtxclient olm boost lmdb spdlog cmark - qtbase qtmultimedia qttools + mtxclient + olm + boost + lmdb + spdlog + cmark + qtbase + qtmultimedia + qttools ] ++ lib.optional stdenv.isDarwin qtmacextras; enableParallelBuilding = true; -- cgit v1.2.3 From e6cf5d3d1661175abc8609739a8b012ccb00b14f Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 17 Apr 2020 13:19:45 +0300 Subject: nheko: use nixpkgs' versions of libraries --- .../instant-messengers/nheko/default.nix | 34 ++++------------------ 1 file changed, 5 insertions(+), 29 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 34d60dff97a..2175ec5330f 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -4,6 +4,8 @@ , cmake , cmark , lmdb +, lmdbxx +, tweeny , mkDerivation , qtbase , qtmacextras @@ -17,23 +19,6 @@ , nlohmann_json }: -# These hashes and revisions are based on those from here: -# https://github.com/Nheko-Reborn/nheko/blob/v0.6.4/deps/CMakeLists.txt#L52 -let - tweeny = fetchFromGitHub { - owner = "mobius3"; - repo = "tweeny"; - rev = "b94ce07cfb02a0eb8ac8aaf66137dabdaea857cf"; - sha256 = "1wyyq0j7dhjd6qgvnh3knr70li47hmf5394yznkv9b1indqjx4mi"; - }; - - lmdbxx = fetchFromGitHub { - owner = "bendiken"; - repo = "lmdbxx"; - rev = "0b43ca87d8cfabba392dfe884eb1edb83874de02"; - sha256 = "1whsc5cybf9rmgyaj6qjji03fv5jbgcgygp956s3835b9f9cjg1n"; - }; -in mkDerivation rec { pname = "nheko"; version = "0.6.4"; @@ -61,24 +46,15 @@ mkDerivation rec { # export CFLAGS=-Wno-error=gnu-zero-variadic-macro-arguments #''; - postPatch = '' - mkdir -p .deps/include/ - ln -s ${tweeny}/include .deps/include/tweeny - ln -s ${spdlog} .deps/spdlog - ''; - - cmakeFlags = [ - "-DTWEENY_INCLUDE_DIR=.deps/include" - "-DLMDBXX_INCLUDE_DIR=${lmdbxx}" - "-Dnlohmann_json_DIR=${nlohmann_json}/lib/cmake/nlohmann_json" - ]; - nativeBuildInputs = [ + lmdbxx cmake pkgconfig ]; buildInputs = [ + nlohmann_json + tweeny mtxclient olm boost -- cgit v1.2.3 From 6d4c381838dceb888872861f863672175ef909ea Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 24 Apr 2020 11:07:28 +0300 Subject: nheko: 0.6.4 -> 0.7.1 --- .../networking/instant-messengers/nheko/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 2175ec5330f..67b8cd6fa41 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -11,8 +11,10 @@ , qtmacextras , qtmultimedia , qttools +, qtquickcontrols2 +, qtgraphicaleffects , mtxclient -, boost +, boost17x , spdlog , olm , pkgconfig @@ -21,13 +23,13 @@ mkDerivation rec { pname = "nheko"; - version = "0.6.4"; + version = "0.7.1"; src = fetchFromGitHub { owner = "Nheko-Reborn"; repo = "nheko"; rev = "v${version}"; - sha256 = "19dkc98l1q4070v6mli4ybqn0ip0za607w39hjf0x8rqdxq45iwm"; + sha256 = "12sxibbrn79sxkf9jrm7jrlj7l5vz15claxrrll7pkv9mv44wady"; }; # If, on Darwin, you encounter the error @@ -57,13 +59,15 @@ mkDerivation rec { tweeny mtxclient olm - boost + boost17x lmdb spdlog cmark qtbase qtmultimedia qttools + qtquickcontrols2 + qtgraphicaleffects ] ++ lib.optional stdenv.isDarwin qtmacextras; enableParallelBuilding = true; -- cgit v1.2.3 From 648712b7bfbf0c607515e32840b439e28ac177c6 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 25 Apr 2020 01:37:22 +0300 Subject: nheko: fix boost make issue --- pkgs/applications/networking/instant-messengers/nheko/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 67b8cd6fa41..0de96c10d59 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -53,6 +53,11 @@ mkDerivation rec { cmake pkgconfig ]; + cmakeFlags = [ + # Can be removed once either https://github.com/NixOS/nixpkgs/pull/85254 or + # https://github.com/NixOS/nixpkgs/pull/73940 are merged + "-DBoost_NO_BOOST_CMAKE=TRUE" + ]; buildInputs = [ nlohmann_json -- cgit v1.2.3 From 2abd30cb8701e73c2cfe86439fabfd4c364bbcb8 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 25 Apr 2020 01:37:30 +0300 Subject: mtxclient: fix boost make issue --- pkgs/development/libraries/mtxclient/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index 79ded7f43ef..3f5f338f5af 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -29,6 +29,9 @@ stdenv.mkDerivation rec { "-DBUILD_LIB_TESTS=OFF" "-DBUILD_LIB_EXAMPLES=OFF" "-Dnlohmann_json_DIR=${nlohmann_json}/lib/cmake/nlohmann_json" + # Can be removed once either https://github.com/NixOS/nixpkgs/pull/85254 or + # https://github.com/NixOS/nixpkgs/pull/73940 are merged + "-DBoost_NO_BOOST_CMAKE=TRUE" ]; nativeBuildInputs = [ -- cgit v1.2.3 From 67d0c4f130986e4e2a6d9b7b094786a8769d6d95 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 25 Apr 2020 02:05:38 +0300 Subject: nheko: apply patch recommended by upstream --- .../networking/instant-messengers/nheko/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 0de96c10d59..c106305856f 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , cmark , lmdb @@ -58,6 +59,15 @@ mkDerivation rec { # https://github.com/NixOS/nixpkgs/pull/73940 are merged "-DBoost_NO_BOOST_CMAKE=TRUE" ]; + # commit missing from latest release and recommended by upstream: + # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619263903 + patches = [ + (fetchpatch { + name = "room-ids-escape-patch"; + url = "https://github.com/Nheko-Reborn/nheko/commit/d94ac86816f9f325cba11f71344a3ca99591130d.patch"; + sha256 = "1p0kj4a60l3jf0rfakc88adld7ccg3vfjhzia5rf2i03h35cxw8c"; + }) + ]; buildInputs = [ nlohmann_json -- cgit v1.2.3 From 0577b994afe04a188319acc9319d6794224ba415 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 25 Apr 2020 12:55:09 +0300 Subject: nheko: remove redundent parallel building flag --- pkgs/applications/networking/instant-messengers/nheko/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index c106305856f..cab4889c231 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -85,8 +85,6 @@ mkDerivation rec { qtgraphicaleffects ] ++ lib.optional stdenv.isDarwin qtmacextras; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "Desktop client for the Matrix protocol"; homepage = "https://github.com/Nheko-Reborn/nheko"; -- cgit v1.2.3 From bdcbfc77c9bda30964d00b41b4c906aa9d489967 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 30 Apr 2020 10:25:38 +0300 Subject: nheko && mtxclient: enable for Darwin but mark as broken --- .../networking/instant-messengers/nheko/default.nix | 21 ++++----------------- pkgs/development/libraries/mtxclient/default.nix | 9 ++++----- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index cab4889c231..f3b304564cb 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -33,22 +33,6 @@ mkDerivation rec { sha256 = "12sxibbrn79sxkf9jrm7jrlj7l5vz15claxrrll7pkv9mv44wady"; }; - # If, on Darwin, you encounter the error - # error: must specify at least one argument for '...' parameter of variadic - # macro [-Werror,-Wgnu-zero-variadic-macro-arguments] - # Then adding this parameter is likely the fix you want. - # - # However, it looks like either cmake doesn't honor this CFLAGS variable, or - # darwin's compiler doesn't have the same syntax as gcc for turning off - # -Werror selectively. - # - # Anyway, this is something that will have to be debugged with access to a - # darwin-based OS. Sorry about that! - # - #preConfigure = lib.optionalString stdenv.isDarwin '' - # export CFLAGS=-Wno-error=gnu-zero-variadic-macro-arguments - #''; - nativeBuildInputs = [ lmdbxx cmake @@ -89,7 +73,10 @@ mkDerivation rec { description = "Desktop client for the Matrix protocol"; homepage = "https://github.com/Nheko-Reborn/nheko"; maintainers = with maintainers; [ ekleog fpletz ]; - platforms = platforms.unix; + platforms = platforms.all; + # Should be fixable if a higher clang version is used, see: + # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177 + broken = stdenv.targetPlatform.isDarwin; license = licenses.gpl3Plus; }; } diff --git a/pkgs/development/libraries/mtxclient/default.nix b/pkgs/development/libraries/mtxclient/default.nix index 3f5f338f5af..22b66442305 100644 --- a/pkgs/development/libraries/mtxclient/default.nix +++ b/pkgs/development/libraries/mtxclient/default.nix @@ -52,10 +52,9 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Nheko-Reborn/mtxclient"; license = licenses.mit; maintainers = with maintainers; [ fpletz ]; - platforms = platforms.unix; - - # As of 2019-06-30, all of the dependencies are available on macOS but the - # package itself does not build. - broken = stdenv.isDarwin; + platforms = platforms.all; + # Should be fixable if a higher clang version is used, see: + # https://github.com/NixOS/nixpkgs/pull/85922#issuecomment-619287177 + broken = stdenv.targetPlatform.isDarwin; }; } -- cgit v1.2.3 From 852ae7ef2e9abae79a0df3e987428c15a0cbb4ee Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Thu, 30 Apr 2020 12:40:41 +0300 Subject: scc: 2.11.0 -> 2.12.0 --- pkgs/development/tools/misc/scc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/scc/default.nix b/pkgs/development/tools/misc/scc/default.nix index 7a6a060464e..47596789de7 100644 --- a/pkgs/development/tools/misc/scc/default.nix +++ b/pkgs/development/tools/misc/scc/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "scc"; - version = "2.11.0"; + version = "2.12.0"; src = fetchFromGitHub { owner = "boyter"; repo = "scc"; rev = "v${version}"; - sha256 = "1wk6s9ga9rkywgqys960s6fz4agwzh3ac2l6cpcr7kca4379s28k"; + sha256 = "0hbcq5qn97kr9d4q9m2p1mj3ijn8zmwycrs5bgf1kfiwr09wg2yh"; }; goPackagePath = "github.com/boyter/scc"; -- cgit v1.2.3 From 8df55ef0c72958ee469b389e428b3b7e012d3626 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Thu, 30 Apr 2020 12:54:27 +0300 Subject: cargo-deb: 1.23.2 -> 1.24.0 --- pkgs/tools/package-management/cargo-deb/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/package-management/cargo-deb/default.nix b/pkgs/tools/package-management/cargo-deb/default.nix index 623c8e2065c..c6e8b4803cc 100644 --- a/pkgs/tools/package-management/cargo-deb/default.nix +++ b/pkgs/tools/package-management/cargo-deb/default.nix @@ -6,18 +6,18 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deb"; - version = "1.23.2"; + version = "1.24.0"; src = fetchFromGitHub { owner = "mmstick"; repo = pname; - rev = "367910e0020de93f45c175c92a37a53ee401978f"; - sha256 = "1s0xv818rlafdzpb70c1ldv5iq3hh2jxj7g3l6p7v20q1wx0nnvv"; + rev = "b49351f6770aa7aeb053dd1d4a02d6b086caad2a"; + sha256 = "1hs96yv0awgi7ggpxp7k3n21jpv642sm0529b21hs9ib6kp4vs8s"; }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "0ffzq2gm0f56vyfkmdzxfs5z1xsdj2kcsyc1fdrk4k1cylqn2f47"; + cargoSha256 = "1vqnnqn6rzkdi239bh3lk7gaxr7w6v3c4ws4ya1ah04g6v9hkzlw"; meta = with lib; { description = "Generate Debian packages from information in Cargo.toml"; -- cgit v1.2.3 From 731eecbacb8698d8034410b19a74d46fd6629fb4 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Thu, 30 Apr 2020 11:58:45 +0200 Subject: cargo-deny: init at 0.6.6 Signed-off-by: Matthias Beyer --- pkgs/development/tools/rust/cargo-deny/default.nix | 34 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/tools/rust/cargo-deny/default.nix diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix new file mode 100644 index 00000000000..727a789c42f --- /dev/null +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, lib +, rustPlatform +, fetchFromGitHub +, perl, pkgconfig, openssl, Security, libiconv, curl +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-deny"; + version = "0.6.6"; + + src = fetchFromGitHub { + owner = "EmbarkStudios"; + repo = pname; + rev = version; + sha256 = "0pmh6x7rb0v1g087xgyicw9mm4ayppgh7vzvq3hs8vip2zvy7r56"; + }; + + cargoSha256 = "00lh6nxc17dyl8z2l70gzc7l1vpn448lzi1c69wxxcqnk8y0ka9w"; + + nativeBuildInputs = [ perl pkgconfig ]; + + buildInputs = [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv curl ]; + + meta = with lib; { + description = "Cargo plugin to generate list of all licenses for a crate"; + homepage = "https://github.com/EmbarkStudios/cargo-deny"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ matthiasbeyer ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 882bea9b826..2bbb9db5a11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9036,6 +9036,9 @@ in cargo-crev = callPackage ../development/tools/rust/cargo-crev { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-deny = callPackage ../development/tools/rust/cargo-deny { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-expand = callPackage ../development/tools/rust/cargo-expand { }; cargo-fuzz = callPackage ../development/tools/rust/cargo-fuzz { }; cargo-geiger = callPackage ../development/tools/rust/cargo-geiger { -- cgit v1.2.3 From 8aee17466bf01bab9aec900bd6fc44683305d446 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Thu, 30 Apr 2020 00:09:49 -0300 Subject: havoc: init at 2019-12-08 --- pkgs/applications/misc/havoc/default.nix | 35 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/applications/misc/havoc/default.nix diff --git a/pkgs/applications/misc/havoc/default.nix b/pkgs/applications/misc/havoc/default.nix new file mode 100644 index 00000000000..fc4cc680ca4 --- /dev/null +++ b/pkgs/applications/misc/havoc/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub +, pkgconfig, libxkbcommon, wayland, wayland-protocols }: + +stdenv.mkDerivation rec { + + pname = "havoc"; + version = "2019-12-08"; + + src = fetchFromGitHub { + owner = "ii8"; + repo = pname; + rev = "507446c92ed7bf8380a58c5ba2b14aba5cdf412c"; + sha256 = "13nfnan1gmy4cqxmqv0rc8a4mcb1g62v73d56hy7z2psv4am7a09"; + }; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libxkbcommon wayland wayland-protocols ]; + + dontConfigure = true; + + installFlags = [ "PREFIX=$$out" ]; + + postInstall = '' + install -D -m 644 havoc.cfg -t $out/etc/${pname}/ + install -D -m 644 README.md -t $out/share/doc/${pname}-${version}/ + ''; + + meta = with stdenv.lib; { + description = "A minimal terminal emulator for Wayland"; + homepage = "https://github.com/ii8/havoc"; + license = with licenses; [ mit publicDomain ]; + platforms = with platforms; unix; + maintainers = with maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6bcca103db4..66599002d5f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19548,6 +19548,8 @@ in gcalcli = callPackage ../applications/misc/gcalcli { }; + havoc = callPackage ../applications/misc/havoc { }; + vcal = callPackage ../applications/misc/vcal { }; gcolor2 = callPackage ../applications/graphics/gcolor2 { }; -- cgit v1.2.3 From 56562a30367d13e7cd71e174d71e3fa9b1cd3fff Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Thu, 30 Apr 2020 13:20:27 +0200 Subject: php.extensions: Add descriptions, homepage and license to all upstream extensions --- pkgs/top-level/php-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index a15ca794cac..11e0ade21f0 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -829,7 +829,10 @@ in . $dev/include/ ''; - meta.maintainers = lib.teams.php.members; + meta = { + description = "PHP upstream extension: ${name}"; + inherit (php.meta) maintainers homepage license; + }; }); # This list contains build instructions for different modules that one may -- cgit v1.2.3 From 4d6ea7350cb252f06590d38e57bdf00aa636e3b7 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Thu, 30 Apr 2020 13:28:19 +0200 Subject: php.packages.composer: 1.9.3 -> 1.10.5 Changelogs: - https://github.com/composer/composer/releases/tag/1.10.0 - https://github.com/composer/composer/releases/tag/1.10.1 - https://github.com/composer/composer/releases/tag/1.10.2 - https://github.com/composer/composer/releases/tag/1.10.3 - https://github.com/composer/composer/releases/tag/1.10.4 - https://github.com/composer/composer/releases/tag/1.10.5 --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index a15ca794cac..9fc52be6899 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -57,12 +57,12 @@ in }; composer = mkDerivation rec { - version = "1.9.3"; + version = "1.10.5"; pname = "composer"; src = pkgs.fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "VRZVwvyB9BBlCPQrvEsk6r00sCKxO8Hn2WQr9IPQp9Q="; + sha256 = "0a9iwhd7ijm8gkp3zadxza0xb6xwa5ps0d16pz4mz2p21gfzvwym"; }; dontUnpack = true; -- cgit v1.2.3 From 3a2173b5140137f56fd4f0a15ee4956e5788bff7 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Thu, 30 Apr 2020 13:29:36 +0200 Subject: php.packages.php-cs-fixer: 2.16.1 -> 2.16.3 Changelogs: - https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/tag/v2.16.2 - https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/tag/v2.16.3 --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 9fc52be6899..ce39cf12849 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -86,12 +86,12 @@ in }; php-cs-fixer = mkDerivation rec { - version = "2.16.1"; + version = "2.16.3"; pname = "php-cs-fixer"; src = pkgs.fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "1dq1nhy666zg6d4fkfsjwhj1vwh1ncap2c9ljplxv98a9mm6fk68"; + sha256 = "195j61qbgbdn5xi0l6030mklji8m7fan2kf3446a1m2n4df3f5hb"; }; phases = [ "installPhase" ]; -- cgit v1.2.3 From 4610b24fd750bf0c443e477e6d9a0d943b3123b5 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Thu, 30 Apr 2020 13:31:56 +0200 Subject: php.packages.phpcbf: 3.5.4 -> 3.5.5 Changelog: https://github.com/squizlabs/PHP_CodeSniffer/releases/tag/3.5.5 --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index ce39cf12849..c1062ba9497 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -150,12 +150,12 @@ in }; phpcbf = mkDerivation rec { - version = "3.5.4"; + version = "3.5.5"; pname = "phpcbf"; src = pkgs.fetchurl { url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcbf.phar"; - sha256 = "18x7fk59l821pivw1i2r868y78qgs0qk47b9il1smwi6plwyyflr"; + sha256 = "0hgagn70gl46migm6zpwcr39dxal07f5cdpnasrafgz5vq0gwr3g"; }; phases = [ "installPhase" ]; -- cgit v1.2.3 From 9c161f0ea2cfca04aef49782fee4239bb286dee8 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Thu, 30 Apr 2020 13:33:20 +0200 Subject: php.packages.phpcs: 3.5.4 -> 3.5.5 Changelog: https://github.com/squizlabs/PHP_CodeSniffer/releases/tag/3.5.5 --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index c1062ba9497..b65a2d79dca 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -177,12 +177,12 @@ in }; phpcs = mkDerivation rec { - version = "3.5.4"; + version = "3.5.5"; pname = "phpcs"; src = pkgs.fetchurl { url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcs.phar"; - sha256 = "1lrybdxxig3yqd3i3nwji5jjn377p50sbpm4s4852dlsxz9qnlgs"; + sha256 = "0jl038l55cmzn5ml61qkv4z1w4ri0h3v7h00pcb04xhz3gznlbsa"; }; phases = [ "installPhase" ]; -- cgit v1.2.3 From 88f94e8ba9d62aceaca57bc42a91401f584d0884 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Thu, 30 Apr 2020 13:34:17 +0200 Subject: php.packages.phpstan: 0.12.18 -> 0.12.19 Changelog: https://github.com/phpstan/phpstan/releases/tag/0.12.19 --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index b65a2d79dca..3a0ed3c58d7 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -204,12 +204,12 @@ in }; phpstan = mkDerivation rec { - version = "0.12.18"; + version = "0.12.19"; pname = "phpstan"; src = pkgs.fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "0xf0q2z6rhpnbys53si05mddfyjn3wx5wc8zx5y6dv5fzw6z7rch"; + sha256 = "15fz7rixi9s46qqxpj26349aky7wxqnzmfsnwlh1f2p4jsfd85ki"; }; phases = [ "installPhase" ]; -- cgit v1.2.3 From c8b773b25d58b83d52f1c5239590645a6aca08c1 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Thu, 30 Apr 2020 13:36:15 +0200 Subject: php.packages.psalm: 3.9.3 -> 3.11.2 Changelogs: - https://github.com/vimeo/psalm/releases/tag/3.9.4 - https://github.com/vimeo/psalm/releases/tag/3.9.5 - https://github.com/vimeo/psalm/releases/tag/3.10.0 - https://github.com/vimeo/psalm/releases/tag/3.10.1 - https://github.com/vimeo/psalm/releases/tag/3.11.1 - https://github.com/vimeo/psalm/releases/tag/3.11.2 --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 3a0ed3c58d7..3dce829c541 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -238,12 +238,12 @@ in }; psalm = mkDerivation rec { - version = "3.9.3"; + version = "3.11.2"; pname = "psalm"; src = pkgs.fetchurl { url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar"; - sha256 = "KHm2n06y/yxN5B2rCVxT5ja7HxkyxAMsjZ5HLb3xr4M="; + sha256 = "1ani0907whqy2ycr01sjlvrmwps4dg5igim8z1qyv8grhwvw6gb0"; }; phases = [ "installPhase" ]; -- cgit v1.2.3 From 0482656c4a8a5e8a0bce12e8b22dd176b778aa74 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Thu, 30 Apr 2020 13:39:41 +0200 Subject: php.packages.psysh: 0.9.12 -> 0.10.3 Changelogs: - https://github.com/bobthecow/psysh/releases/tag/v0.10.0 - https://github.com/bobthecow/psysh/releases/tag/v0.10.1 - https://github.com/bobthecow/psysh/releases/tag/v0.10.2 - https://github.com/bobthecow/psysh/releases/tag/v0.10.3 --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 3dce829c541..14f21d1bd33 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -265,12 +265,12 @@ in }; psysh = mkDerivation rec { - version = "0.9.12"; + version = "0.10.3"; pname = "psysh"; src = pkgs.fetchurl { url = "https://github.com/bobthecow/psysh/releases/download/v${version}/psysh-v${version}.tar.gz"; - sha256 = "0bzmc94li481xk81gv460ipq9zl03skbnq8m3rnw34i2c04hxczc"; + sha256 = "0glply451fy0g7zbasyp350qvmk2aglrlcrcdd7w0igylgwfkg71"; }; phases = [ "installPhase" ]; -- cgit v1.2.3 From edba1d79d1a707bb0d024bd810f48195531e1366 Mon Sep 17 00:00:00 2001 From: "Tristan Helmich (omniIT)" Date: Thu, 30 Apr 2020 11:43:02 +0000 Subject: uftp: 4.10.2 -> 5.0 --- pkgs/servers/uftp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/uftp/default.nix b/pkgs/servers/uftp/default.nix index 13efb08ec6a..02607155d48 100644 --- a/pkgs/servers/uftp/default.nix +++ b/pkgs/servers/uftp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "uftp"; - version = "4.10.2"; + version = "5.0"; src = fetchurl { url = "mirror://sourceforge/uftp-multicast/source-tar/uftp-${version}.tar.gz"; - sha256 = "01c54mqz37157dfq47zjqvfy7v98vbi9zn9mzrxszsz0gyq6mazc"; + sha256 = "1q08schd765fsm9647ac4ic2x70ys2x48mqz97mibdi4bbm72bsn"; }; buildInputs = [ openssl ]; -- cgit v1.2.3 From c549e9f9d69c7e3a1730e836c14bd4c55edd86a7 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Thu, 30 Apr 2020 13:48:05 +0200 Subject: doc: Add PHP section --- doc/languages-frameworks/index.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index 9364c764bbf..a6f56d791c5 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -21,6 +21,7 @@ + -- cgit v1.2.3 From 88f42237d8b771e0a4753890275c96d6e21ff2a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Thu, 30 Apr 2020 02:01:11 +0200 Subject: gnome3.gnome-shell: 3.36.1 -> 3.36.2 --- pkgs/desktops/gnome-3/core/gnome-shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 46a50c34556..d3fb419aabc 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -17,11 +17,11 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0696qw6bmbga30qlvh1k6bkiajl7877j8yis4bwmi1wxkcmkh854"; + sha256 = "0lqpxhvn073bshnzarnisym3da3k3awsi3h906hm85hz3wm9n4iv"; }; LANG = "en_US.UTF-8"; -- cgit v1.2.3 From a59590a48483da681b8b6564776b0d648ecd189e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Thu, 30 Apr 2020 02:01:37 +0200 Subject: gnome3.mutter: 3.36.1 -> 3.36.2 --- pkgs/desktops/gnome-3/core/mutter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/mutter/default.nix b/pkgs/desktops/gnome-3/core/mutter/default.nix index 9edb36156d1..3274044bde9 100644 --- a/pkgs/desktops/gnome-3/core/mutter/default.nix +++ b/pkgs/desktops/gnome-3/core/mutter/default.nix @@ -44,13 +44,13 @@ stdenv.mkDerivation rec { pname = "mutter"; - version = "3.36.1"; + version = "3.36.2"; outputs = [ "out" "dev" "man" ]; src = fetchurl { url = "mirror://gnome/sources/mutter/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "09fqs9805d07c60a2ibskqffsb5wn72l8grwzb9fic5sl574b0im"; + sha256 = "1x6svmd1k6w6a2m6ssq4hi997nxyq6z64fjjaid97z2rn177dcvm"; }; mesonFlags = [ -- cgit v1.2.3 From 62377802efabc814dc4fa65fd9356525b825ab8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Thu, 30 Apr 2020 02:01:50 +0200 Subject: gnome3.gnome-shell-extensions: 3.36.1 -> 3.36.2 --- pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix index c298d8b337f..a501f912277 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell-extensions/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extensions"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0fah7cc22g55w6w7ia3kr2wpdrc45h83xw4pimi54mhggmx9466y"; + sha256 = "0gq0z0k02b5cfaqrikk2hzbqzjkb6qwcanaqi2jh7nswa7g050lp"; }; passthru = { -- cgit v1.2.3 From 53ea32be28f268d276351e9c1d48c517632a70e9 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 30 Apr 2020 10:05:50 -0400 Subject: linux/hardened-patches/5.6: 5.6.7.a -> 5.6.8.a --- pkgs/os-specific/linux/kernel/hardened-patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened-patches.json b/pkgs/os-specific/linux/kernel/hardened-patches.json index a87628dd769..a57999edcfa 100644 --- a/pkgs/os-specific/linux/kernel/hardened-patches.json +++ b/pkgs/os-specific/linux/kernel/hardened-patches.json @@ -20,8 +20,8 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.5.19.a/linux-hardened-5.5.19.a.patch" }, "5.6": { - "name": "linux-hardened-5.6.7.a.patch", - "sha256": "1dnk9df4v2iw05vpn0s8q6b0ci2rzl2wiq77vhr40mpbg6p18fap", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.7.a/linux-hardened-5.6.7.a.patch" + "name": "linux-hardened-5.6.8.a.patch", + "sha256": "06nrjv1v3m3phgcahpmf228jcgr496n9rlvvmbklc307q6w0g8f6", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.8.a/linux-hardened-5.6.8.a.patch" } } -- cgit v1.2.3 From 22c0c49d611a555df1212687e5a025b1482c8958 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 30 Apr 2020 10:05:56 -0400 Subject: linux/hardened-patches/5.4: 5.4.35.a -> 5.4.36.a --- pkgs/os-specific/linux/kernel/hardened-patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened-patches.json b/pkgs/os-specific/linux/kernel/hardened-patches.json index a57999edcfa..0dad3902214 100644 --- a/pkgs/os-specific/linux/kernel/hardened-patches.json +++ b/pkgs/os-specific/linux/kernel/hardened-patches.json @@ -10,9 +10,9 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.118.a/linux-hardened-4.19.118.a.patch" }, "5.4": { - "name": "linux-hardened-5.4.35.a.patch", - "sha256": "0vcqgrzns4d3z93mn8mv0sxkmj7ylbr8prff72c4ssvb0kd7agy9", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.35.a/linux-hardened-5.4.35.a.patch" + "name": "linux-hardened-5.4.36.a.patch", + "sha256": "00bmpzrma0nrgwwari6072g11cwhdk2riqmphlnkpxbarh7dwf4z", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.36.a/linux-hardened-5.4.36.a.patch" }, "5.5": { "name": "linux-hardened-5.5.19.a.patch", -- cgit v1.2.3 From 5fa90ed9e2166f6184f64aed53fedabc9a21bd7f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 30 Apr 2020 10:05:58 -0400 Subject: linux/hardened-patches/4.19: 4.19.118.a -> 4.19.119.a --- pkgs/os-specific/linux/kernel/hardened-patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened-patches.json b/pkgs/os-specific/linux/kernel/hardened-patches.json index 0dad3902214..aa0650138cc 100644 --- a/pkgs/os-specific/linux/kernel/hardened-patches.json +++ b/pkgs/os-specific/linux/kernel/hardened-patches.json @@ -5,9 +5,9 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.177.a/linux-hardened-4.14.177.a.patch" }, "4.19": { - "name": "linux-hardened-4.19.118.a.patch", - "sha256": "120lnn9j9zsx1kcq4frcjmj2vj39x0g1yxrrx9nax2yjrzp4wfdw", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.118.a/linux-hardened-4.19.118.a.patch" + "name": "linux-hardened-4.19.119.a.patch", + "sha256": "1arm4833lkgsd27fhgrxbdxisvn20fsk6250x5yh6c8svjr759jx", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.119.a/linux-hardened-4.19.119.a.patch" }, "5.4": { "name": "linux-hardened-5.4.36.a.patch", -- cgit v1.2.3 From c56c72b4f88f50da1d52592c9eace05a12e4e69b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 30 Apr 2020 10:07:49 -0400 Subject: zoom-us: 5.0.398100.0427 -> 5.0.399860.0429 --- pkgs/applications/networking/instant-messengers/zoom-us/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 84f334be06f..360d8b4e1c9 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -15,11 +15,11 @@ assert pulseaudioSupport -> libpulseaudio != null; let inherit (stdenv.lib) concatStringsSep makeBinPath optional; - version = "5.0.398100.0427"; + version = "5.0.399860.0429"; srcs = { x86_64-linux = fetchurl { url = "https://zoom.us/client/${version}/zoom_x86_64.tar.xz"; - sha256 = "0b9jdicr783wagp2j79106bbk68974j3v8zg8nvky5fydl6ngjvi"; + sha256 = "1jid8rs403b709scz8vpqsi1dxdmssn5426wa3d16p45blnxk16k"; }; }; -- cgit v1.2.3 From 61396047dc3165a7c39cdb2fe565266d5ae9c2fe Mon Sep 17 00:00:00 2001 From: Serg Nesterov Date: Wed, 29 Apr 2020 19:21:40 +0300 Subject: tmuxinator: 1.1.4 -> 2.0.0 --- pkgs/tools/misc/tmuxinator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix index d19b9cd5dbf..abfa19b376c 100644 --- a/pkgs/tools/misc/tmuxinator/default.nix +++ b/pkgs/tools/misc/tmuxinator/default.nix @@ -8,8 +8,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "tmuxinator"; - version = "1.1.4"; - source.sha256 = "06ajfvsmq2040b7nk2ifih3sqxgwzih5j1d25nh4ilgjlrfmha98"; + version = "2.0.0"; + source.sha256 = "1q5z6f548138792mc7aksxdgngfgdsyf8s117b4flyb2hqgmv24b"; erubis = buildRubyGem rec { inherit ruby; -- cgit v1.2.3 From 11a9fbe5283987ae740dfde14df885d84e088445 Mon Sep 17 00:00:00 2001 From: Paul TREHIOU Date: Thu, 30 Apr 2020 16:49:48 +0200 Subject: ledger-live-desktop: 2.2.4 -> 2.3.2 Co-authored-by: Felix Tenley --- pkgs/applications/blockchains/ledger-live-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index d3224f8a706..1c76ef8df28 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.2.4"; + version = "2.3.2"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "0ymn7jp14jaj3v4yj32kyxic47qa87rbngkdld1p977g7zg2pc86"; + sha256 = "0xd3w564zij614ajg57n1qlvz0hd9l7219qxx81ai6b02b9a5g9h"; }; appimageContents = appimageTools.extractType2 { -- cgit v1.2.3 From b929551f2a44d861694f15c13666ee8433a9c224 Mon Sep 17 00:00:00 2001 From: Claudio Bley Date: Thu, 30 Apr 2020 17:00:48 +0200 Subject: colorls: 1.2.0 -> 1.3.3 --- pkgs/tools/system/colorls/Gemfile.lock | 2 +- pkgs/tools/system/colorls/default.nix | 2 +- pkgs/tools/system/colorls/gemset.nix | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/system/colorls/Gemfile.lock b/pkgs/tools/system/colorls/Gemfile.lock index ebbcd0fdb03..1b84a550e48 100644 --- a/pkgs/tools/system/colorls/Gemfile.lock +++ b/pkgs/tools/system/colorls/Gemfile.lock @@ -2,7 +2,7 @@ GEM remote: https://rubygems.org/ specs: clocale (0.0.4) - colorls (1.2.0) + colorls (1.3.3) clocale (~> 0) filesize (~> 0) manpages (~> 0) diff --git a/pkgs/tools/system/colorls/default.nix b/pkgs/tools/system/colorls/default.nix index 4401d841ff6..8243590cd7d 100644 --- a/pkgs/tools/system/colorls/default.nix +++ b/pkgs/tools/system/colorls/default.nix @@ -12,7 +12,7 @@ bundlerApp { description = "Prettified LS"; homepage = "https://github.com/athityakumar/colorls"; license = with licenses; mit; - maintainers = with maintainers; [ lukebfox nicknovitski ]; + maintainers = with maintainers; [ lukebfox nicknovitski cbley ]; platforms = ruby.meta.platforms; }; } diff --git a/pkgs/tools/system/colorls/gemset.nix b/pkgs/tools/system/colorls/gemset.nix index e7264a895a2..c16f87f457f 100644 --- a/pkgs/tools/system/colorls/gemset.nix +++ b/pkgs/tools/system/colorls/gemset.nix @@ -15,10 +15,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bcrig88ipzj43lnkrb5qmimdrml4lx15rcrhr6m2hxb0pks8932"; + sha256 = "07rvm3g65slnqzal718qwfmgsjnkysx00jn8dnv96317yx0mxfx6"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.3"; }; filesize = { groups = ["default"]; -- cgit v1.2.3 From 4b71b6f8fa5f7b06ea5d0dd37d44a73757c7f142 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 30 Apr 2020 17:51:13 +0200 Subject: nixos/google-oslogin: Move nsswitch config into the module Motivation: #86350 --- nixos/modules/config/nsswitch.nix | 5 +---- nixos/modules/security/google_oslogin.nix | 1 + 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix index 0acd8900e7b..77e47a350ec 100644 --- a/nixos/modules/config/nsswitch.nix +++ b/nixos/modules/config/nsswitch.nix @@ -15,7 +15,6 @@ let nsswins = canLoadExternalModules && config.services.samba.nsswins; ldap = canLoadExternalModules && (config.users.ldap.enable && config.users.ldap.nsswitch); resolved = canLoadExternalModules && config.services.resolved.enable; - googleOsLogin = canLoadExternalModules && config.security.googleOsLogin.enable; hostArray = mkMerge [ (mkBefore [ "files" ]) @@ -32,7 +31,6 @@ let (mkBefore [ "files" ]) (mkIf ldap [ "ldap" ]) (mkIf mymachines [ "mymachines" ]) - (mkIf googleOsLogin [ "cache_oslogin oslogin" ]) (mkIf canLoadExternalModules (mkAfter [ "systemd" ])) ]; @@ -172,7 +170,6 @@ in { # configured IP addresses, or ::1 and 127.0.0.2 as # fallbacks. Systemd also provides nss-mymachines to return IP # addresses of local containers. - system.nssModules = (optionals canLoadExternalModules [ config.systemd.package.out ]) - ++ optional googleOsLogin pkgs.google-compute-engine-oslogin.out; + system.nssModules = (optionals canLoadExternalModules [ config.systemd.package.out ]); }; } diff --git a/nixos/modules/security/google_oslogin.nix b/nixos/modules/security/google_oslogin.nix index 6f9962e1d62..78c2089baeb 100644 --- a/nixos/modules/security/google_oslogin.nix +++ b/nixos/modules/security/google_oslogin.nix @@ -49,6 +49,7 @@ in # enable the nss module, so user lookups etc. work system.nssModules = [ package ]; + system.nssDatabases.passwd = [ "cache_oslogin" "oslogin" ]; # Ugly: sshd refuses to start if a store path is given because /nix/store is group-writable. # So indirect by a symlink. -- cgit v1.2.3 From b4a268911707d49caf3e3317b9a87bbc54973550 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 29 Apr 2020 20:26:21 +0200 Subject: liberation_ttf_v2: 2.00.4 -> 2.1.0 --- pkgs/data/fonts/liberation-fonts/default.nix | 67 +++++++++++++++++++++ .../data/fonts/redhat-liberation-fonts/default.nix | 70 ---------------------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 68 insertions(+), 71 deletions(-) create mode 100644 pkgs/data/fonts/liberation-fonts/default.nix delete mode 100644 pkgs/data/fonts/redhat-liberation-fonts/default.nix diff --git a/pkgs/data/fonts/liberation-fonts/default.nix b/pkgs/data/fonts/liberation-fonts/default.nix new file mode 100644 index 00000000000..838a8d4c769 --- /dev/null +++ b/pkgs/data/fonts/liberation-fonts/default.nix @@ -0,0 +1,67 @@ +{ stdenv, fetchFromGitHub, fontforge, python3 }: +let + inherit (python3.pkgs) fonttools; + + common = + { version, repo, sha256, nativeBuildInputs, postPatch ? null }: + stdenv.mkDerivation rec { + pname = "liberation-fonts"; + inherit version; + + src = fetchFromGitHub { + owner = "liberationfonts"; + rev = version; + inherit repo sha256; + }; + + inherit nativeBuildInputs postPatch; + + installPhase = '' + find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \; + + install -m444 -Dt $out/share/doc/${pname}-${version} AUTHORS || true + install -m444 -Dt $out/share/doc/${pname}-${version} ChangeLog || true + install -m444 -Dt $out/share/doc/${pname}-${version} COPYING || true + install -m444 -Dt $out/share/doc/${pname}-${version} License.txt || true + install -m444 -Dt $out/share/doc/${pname}-${version} README || true + ''; + + meta = with stdenv.lib; { + description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New"; + longDescription = '' + The Liberation Fonts are intended to be replacements for the three most + commonly used fonts on Microsoft systems: Times New Roman, Arial, and + Courier New. Since 2012 they are based on croscore fonts. + + There are three sets: Sans (a substitute for Arial, Albany, Helvetica, + Nimbus Sans L, and Bitstream Vera Sans), Serif (a substitute for Times + New Roman, Thorndale, Nimbus Roman, and Bitstream Vera Serif) and Mono + (a substitute for Courier New, Cumberland, Courier, Nimbus Mono L, and + Bitstream Vera Sans Mono). + ''; + + license = licenses.ofl; + homepage = "https://github.com/liberationfonts"; + maintainers = with maintainers; [ raskin ]; + }; + }; +in +{ + liberation_ttf_v1 = common { + repo = "liberation-1.7-fonts"; + version = "1.07.5"; + nativeBuildInputs = [ fontforge ]; + sha256 = "1ffl10mf78hx598sy9qr5m6q2b8n3mpnsj73bwixnd4985gsz56v"; + }; + liberation_ttf_v2 = common { + repo = "liberation-fonts"; + version = "2.1.0"; + nativeBuildInputs = [ fontforge fonttools ]; + postPatch = '' + substituteInPlace scripts/setisFixedPitch-fonttools.py --replace \ + 'font = ttLib.TTFont(fontfile)' \ + 'font = ttLib.TTFont(fontfile, recalcTimestamp=False)' + ''; + sha256 = "03xpzaas264x5n6qisxkhc68pkpn32m7y78qdm3rdkxdwi8mv8mz"; + }; +} diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix deleted file mode 100644 index 1cb0eb349e4..00000000000 --- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ stdenv, fetchFromGitHub, fontforge, python3 }: - -let - inherit (python3.pkgs) fonttools; - - common = - { version, repo, sha256, nativeBuildInputs, postPatch ? null }: - stdenv.mkDerivation rec { - pname = "liberation-fonts"; - inherit version; - - src = fetchFromGitHub { - owner = "liberationfonts"; - rev = version; - inherit repo sha256; - }; - - inherit nativeBuildInputs postPatch; - - installPhase = '' - find . -name '*.ttf' -exec install -m444 -Dt $out/share/fonts/truetype {} \; - - install -m444 -Dt $out/share/doc/${pname}-${version} AUTHORS || true - install -m444 -Dt $out/share/doc/${pname}-${version} ChangeLog || true - install -m444 -Dt $out/share/doc/${pname}-${version} COPYING || true - install -m444 -Dt $out/share/doc/${pname}-${version} License.txt || true - install -m444 -Dt $out/share/doc/${pname}-${version} README || true - ''; - - meta = with stdenv.lib; { - description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New"; - longDescription = '' - The Liberation Fonts are intended to be replacements for the three most - commonly used fonts on Microsoft systems: Times New Roman, Arial, and - Courier New. Since 2012 they are based on croscore fonts. - - There are three sets: Sans (a substitute for Arial, Albany, Helvetica, - Nimbus Sans L, and Bitstream Vera Sans), Serif (a substitute for Times - New Roman, Thorndale, Nimbus Roman, and Bitstream Vera Serif) and Mono - (a substitute for Courier New, Cumberland, Courier, Nimbus Mono L, and - Bitstream Vera Sans Mono). - ''; - - license = licenses.ofl; - homepage = "https://github.com/liberationfonts"; - maintainers = [ - maintainers.raskin - ]; - }; - }; - -in { - liberation_ttf_v1 = common { - repo = "liberation-1.7-fonts"; - version = "1.07.5"; - nativeBuildInputs = [ fontforge ]; - sha256 = "1ffl10mf78hx598sy9qr5m6q2b8n3mpnsj73bwixnd4985gsz56v"; - }; - liberation_ttf_v2 = common { - repo = "liberation-fonts"; - version = "2.00.4"; - nativeBuildInputs = [ fontforge fonttools ]; - postPatch = '' - substituteInPlace scripts/setisFixedPitch-fonttools.py --replace \ - 'font = ttLib.TTFont(fontfile)' \ - 'font = ttLib.TTFont(fontfile, recalcTimestamp=False)' - ''; - sha256 = "14bn1zlhyr4qaz5z2sx4h115pnbd41ix1vky8fxm2lx76xrjjiaa"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e87f3e2ca0..160626492df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17867,7 +17867,7 @@ in ledger-udev-rules = callPackage ../os-specific/linux/ledger-udev-rules {}; - inherit (callPackages ../data/fonts/redhat-liberation-fonts { }) + inherit (callPackages ../data/fonts/liberation-fonts { }) liberation_ttf_v1 liberation_ttf_v2 ; -- cgit v1.2.3 From 7e23a6021d7bcab107d826e2241e268de519fcfa Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 8 Apr 2020 21:29:11 +0200 Subject: pjsip: enable and fix darwin build --- pkgs/applications/networking/pjsip/default.nix | 21 ++++++++++++++------- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 6ac2e89cf40..7319dd4a44f 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl, libsamplerate, alsaLib }: +{ stdenv, fetchFromGitHub, openssl, libsamplerate, alsaLib, AppKit }: stdenv.mkDerivation rec { pname = "pjsip"; @@ -11,12 +11,19 @@ stdenv.mkDerivation rec { sha256 = "1aklicpgwc88578k03i5d5cm5h8mfm7hmx8vfprchbmaa2p8f4z0"; }; - patches = [ ./fix-aarch64.patch ]; + patches = [ + ./fix-aarch64.patch + ]; - buildInputs = [ openssl libsamplerate alsaLib ]; + buildInputs = [ openssl libsamplerate ] + ++ stdenv.lib.optional stdenv.isLinux alsaLib + ++ stdenv.lib.optional stdenv.isDarwin AppKit; preConfigure = '' export LD=$CC + '' # Fixed on master, remove with 2.11 + + stdenv.lib.optionalString stdenv.isDarwin '' + NIX_CFLAGS_COMPILE+=" -framework Security" ''; postInstall = '' @@ -29,11 +36,11 @@ stdenv.mkDerivation rec { # We need the libgcc_s.so.1 loadable (for pthread_cancel to work) dontPatchELF = true; - meta = { + meta = with stdenv.lib; { description = "A multimedia communication library written in C, implementing standard based protocols such as SIP, SDP, RTP, STUN, TURN, and ICE"; homepage = "https://pjsip.org/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = with stdenv.lib.maintainers; [olynch]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ olynch ]; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4ed07788904..f07162a0e1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25764,7 +25764,9 @@ in physlock = callPackage ../misc/screensavers/physlock { }; - pjsip = callPackage ../applications/networking/pjsip { }; + pjsip = callPackage ../applications/networking/pjsip { + inherit (darwin.apple_sdk.frameworks) AppKit; + }; pounce = callPackage ../servers/pounce { }; -- cgit v1.2.3 From ae0bd90db19324f721f7633a313f91fee60f56e0 Mon Sep 17 00:00:00 2001 From: Kaz Wesley Date: Mon, 27 Apr 2020 11:58:25 -0700 Subject: ConvertBencode: init at 1.03 --- pkgs/top-level/perl-packages.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 2f933eeff1f..daec9dacbe6 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3224,6 +3224,19 @@ let }; }; + ConvertBencode = buildPerlPackage rec { + pname = "Convert-Bencode"; + version = "1.03"; + src = fetchurl { + url = "mirror://cpan/authors/id/O/OR/ORCLEV/${pname}-${version}.tar.gz"; + sha256 = "0v2ywj18px67mg97xnrdq9mnlzgqvj92pr2g47g9c9b9cpw3v7r6"; + }; + meta = { + description = "Functions for converting to/from bencoded strings"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + }; + }; + ConvertColor = buildPerlModule { pname = "Convert-Color"; version = "0.11"; -- cgit v1.2.3 From 94b4848636ecdd398ddf1e0c9dd351eda352752f Mon Sep 17 00:00:00 2001 From: cmacrae Date: Thu, 30 Apr 2020 17:52:16 +0100 Subject: maintainers: add cmacrae --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 35dd144796e..595d3c332c3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1480,6 +1480,12 @@ githubId = 848609; name = "Michael Bishop"; }; + cmacrae = { + email = "hi@cmacr.ae"; + github = "cmacrae"; + githubId = 3392199; + name = "Calum MacRae"; + }; cmcdragonkai = { email = "roger.qiu@matrix.ai"; github = "cmcdragonkai"; -- cgit v1.2.3 From c9f14d5814720ef5ce776e718870d63943373b0d Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Thu, 30 Apr 2020 18:01:50 +0000 Subject: googler: 4.0 -> 4.1 --- pkgs/applications/misc/googler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/googler/default.nix b/pkgs/applications/misc/googler/default.nix index 3e4c9828ede..fba36f5e8ac 100644 --- a/pkgs/applications/misc/googler/default.nix +++ b/pkgs/applications/misc/googler/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "googler"; - version = "4.0"; + version = "4.1"; src = fetchFromGitHub { owner = "jarun"; repo = pname; rev = "v${version}"; - sha256 = "13jj15ph0vmbyxjslzl6z4h5b7wyllvhwgsrb6zf7qlkcmkd4vwy"; + sha256 = "04d7n2l159s7c9xzvyvbnbii1k3zdbajagpx09x1l692cwjbvpxw"; }; propagatedBuildInputs = [ python ]; -- cgit v1.2.3 From 8f7387f2195da33dd0886a7b7dbcae0518725542 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 30 Apr 2020 20:12:30 +0200 Subject: gobject-introspection: Ensure the giDiscoverSelf is run before gappsWrapperArgsHook gappsWrapperArgsHook tries to collect GI_TYPELIB_PATH environment variable so if we want it to see the path giDiscoverSelf adds, we need to force the order. --- pkgs/development/libraries/gobject-introspection/setup-hook.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gobject-introspection/setup-hook.sh b/pkgs/development/libraries/gobject-introspection/setup-hook.sh index a68d544cfbe..6bee47aeb09 100644 --- a/pkgs/development/libraries/gobject-introspection/setup-hook.sh +++ b/pkgs/development/libraries/gobject-introspection/setup-hook.sh @@ -18,7 +18,14 @@ giDiscoverSelf() { fi } -preFixupHooks+=(giDiscoverSelf) +# gappsWrapperArgsHook expects GI_TYPELIB_PATH variable to be set by this. +# Until we have dependency mechanism in generic builder, we need to use this ugly hack. +if [[ " ${preFixupPhases:-} " =~ " gappsWrapperArgsHook " ]]; then + preFixupPhases+=" " + preFixupPhases="${preFixupPhases/ gappsWrapperArgsHook / giDiscoverSelf gappsWrapperArgsHook }" +else + preFixupPhases+=" giDiscoverSelf" +fi _multioutMoveGlibGir() { moveToOutput share/gir-1.0 "${!outputDev}" -- cgit v1.2.3 From 8aea5288725688f7f71bf12c8ee1bb83147b22c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= Date: Mon, 20 Apr 2020 20:27:53 +0200 Subject: nixos/prosody: make defaults comply with XEP-0423 Setting up a XMPP chat server is a pretty deep rabbit whole to jump in when you're not familiar with this whole universe. Your experience with this environment will greatly depends on whether or not your server implements the right set of XEPs. To tackle this problem, the XMPP community came with the idea of creating a meta-XEP in charge of listing the desirable XEPs to comply with. This meta-XMP is issued every year under an new XEP number. The 2020 one being XEP-0423[1]. This prosody nixos module refactoring makes complying with XEP-0423 easier. All the necessary extensions are enabled by default. For some extensions (MUC and HTTP_UPLOAD), we need some input from the user and cannot provide a sensible default nixpkgs-wide. For those, we guide the user using a couple of assertions explaining the remaining manual steps to perform. We took advantage of this substential refactoring to refresh the associated nixos test. Changelog: - Update the prosody package to provide the necessary community modules in order to comply with XEP-0423. This is a tradeoff, as depending on their configuration, the user might end up not using them and wasting some disk space. That being said, adding those will allow the XEP-0423 users, which I expect to be the majority of users, to leverage a bit more the binary cache. - Add a muc submodule populated with the prosody muc defaults. - Add a http_upload submodule in charge of setting up a basic http server handling the user uploads. This submodule is in is spinning up an HTTP(s) server in charge of receiving and serving the user's attachments. - Advertise both the MUCs and the http_upload endpoints using mod disco. - Use the slixmpp library in place of the now defunct sleekxmpp for the prosody NixOS test. - Update the nixos test to setup and test the MUC and http upload features. - Add a couple of assertions triggered if the setup is not xep-0423 compliant. [1] https://xmpp.org/extensions/xep-0423.html --- nixos/modules/services/networking/prosody.nix | 372 ++++++++++++++++++++++++-- nixos/tests/xmpp/prosody.nix | 85 ++++-- nixos/tests/xmpp/xmpp-sendmessage.nix | 105 ++++---- pkgs/servers/xmpp/prosody/default.nix | 15 +- 4 files changed, 490 insertions(+), 87 deletions(-) diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index 7a503e71166..8058172cb08 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -1,9 +1,7 @@ { config, lib, pkgs, ... }: with lib; - let - cfg = config.services.prosody; sslOpts = { ... }: { @@ -30,8 +28,21 @@ let }; }; + discoOpts = { + options = { + url = mkOption { + type = types.str; + description = "URL of the endpoint you want to make discoverable"; + }; + description = mkOption { + type = types.str; + description = "A short description of the endpoint you want to advertise"; + }; + }; + }; + moduleOpts = { - # Generally required + # Required for compliance with https://compliance.conversations.im/about/ roster = mkOption { type = types.bool; default = true; @@ -69,6 +80,18 @@ let description = "Keep multiple clients in sync"; }; + csi = mkOption { + type = types.bool; + default = true; + description = "Implements the CSI protocol that allows clients to report their active/inactive state to the server"; + }; + + cloud_notify = mkOption { + type = types.bool; + default = true; + description = "Push notifications to inform users of new messages or other pertinent information even when they have no XMPP clients online"; + }; + pep = mkOption { type = types.bool; default = true; @@ -89,10 +112,22 @@ let vcard = mkOption { type = types.bool; - default = true; + default = false; description = "Allow users to set vCards"; }; + vcard_legacy = mkOption { + type = types.bool; + default = true; + description = "Converts users profiles and Avatars between old and new formats"; + }; + + bookmarks = mkOption { + type = types.bool; + default = true; + description = "Allows interop between older clients that use XEP-0048: Bookmarks in its 1.0 version and recent clients which use it in PEP"; + }; + # Nice to have version = mkOption { type = types.bool; @@ -126,10 +161,16 @@ let mam = mkOption { type = types.bool; - default = false; + default = true; description = "Store messages in an archive and allow users to access it"; }; + smacks = mkOption { + type = types.bool; + default = true; + description = "Allow a client to resume a disconnected session, and prevent message loss"; + }; + # Admin interfaces admin_adhoc = mkOption { type = types.bool; @@ -137,6 +178,18 @@ let description = "Allows administration via an XMPP client that supports ad-hoc commands"; }; + http_files = mkOption { + type = types.bool; + default = true; + description = "Serve static files from a directory over HTTP"; + }; + + proxy65 = mkOption { + type = types.bool; + default = true; + description = "Enables a file transfer proxy service which clients behind NAT can use"; + }; + admin_telnet = mkOption { type = types.bool; default = false; @@ -156,12 +209,6 @@ let description = "Enable WebSocket support"; }; - http_files = mkOption { - type = types.bool; - default = false; - description = "Serve static files from a directory over HTTP"; - }; - # Other specific functionality limits = mkOption { type = types.bool; @@ -210,13 +257,6 @@ let default = false; description = "Legacy authentication. Only used by some old clients and bots"; }; - - proxy65 = mkOption { - type = types.bool; - default = false; - description = "Enables a file transfer proxy service which clients behind NAT can use"; - }; - }; toLua = x: @@ -235,6 +275,153 @@ let }; ''; + mucOpts = { ... }: { + options = { + domain = mkOption { + type = types.str; + description = "Domain name of the MUC"; + }; + name = mkOption { + type = types.str; + description = "The name to return in service discovery responses for the MUC service itself"; + default = "Prosody Chatrooms"; + }; + restrictRoomCreation = mkOption { + type = types.enum [ true false "admin" "local" ]; + default = false; + description = "Restrict room creation to server admins"; + }; + maxHistoryMessages = mkOption { + type = types.int; + default = 20; + description = "Specifies a limit on what each room can be configured to keep"; + }; + roomLocking = mkOption { + type = types.bool; + default = true; + description = '' + Enables room locking, which means that a room must be + configured before it can be used. Locked rooms are invisible + and cannot be entered by anyone but the creator + ''; + }; + roomLockTimeout = mkOption { + type = types.int; + default = 300; + description = '' + Timout after which the room is destroyed or unlocked if not + configured, in seconds + ''; + }; + tombstones = mkOption { + type = types.bool; + default = true; + description = '' + When a room is destroyed, it leaves behind a tombstone which + prevents the room being entered or recreated. It also allows + anyone who was not in the room at the time it was destroyed + to learn about it, and to update their bookmarks. Tombstones + prevents the case where someone could recreate a previously + semi-anonymous room in order to learn the real JIDs of those + who often join there. + ''; + }; + tombstoneExpiry = mkOption { + type = types.int; + default = 2678400; + description = '' + This settings controls how long a tombstone is considered + valid. It defaults to 31 days. After this time, the room in + question can be created again. + ''; + }; + + vcard_muc = mkOption { + type = types.bool; + default = true; + description = "Adds the ability to set vCard for Multi User Chat rooms"; + }; + + # Extra parameters. Defaulting to prosody default values. + # Adding them explicitly to make them visible from the options + # documentation. + # + # See https://prosody.im/doc/modules/mod_muc for more details. + roomDefaultPublic = mkOption { + type = types.bool; + default = true; + description = "If set, the MUC rooms will be public by default."; + }; + roomDefaultMembersOnly = mkOption { + type = types.bool; + default = false; + description = "If set, the MUC rooms will only be accessible to the members by default."; + }; + roomDefaultModerated = mkOption { + type = types.bool; + default = false; + description = "If set, the MUC rooms will be moderated by default."; + }; + roomDefaultPublicJids = mkOption { + type = types.bool; + default = false; + description = "If set, the MUC rooms will display the public JIDs by default."; + }; + roomDefaultChangeSubject = mkOption { + type = types.bool; + default = false; + description = "If set, the rooms will display the public JIDs by default."; + }; + roomDefaultHistoryLength = mkOption { + type = types.int; + default = 20; + description = "Number of history message sent to participants by default."; + }; + roomDefaultLanguage = mkOption { + type = types.str; + default = "en"; + description = "Default room language."; + }; + }; + }; + + uploadHttpOpts = { ... }: { + options = { + domain = mkOption { + type = types.nullOr types.str; + description = "Domain name for the http-upload service"; + }; + uploadFileSizeLimit = mkOption { + type = types.str; + default = "50 * 1024 * 1024"; + description = "Maximum file size, in bytes. Defaults to 50MB."; + }; + uploadExpireAfter = mkOption { + type = types.str; + default = "60 * 60 * 24 * 7"; + description = "Max age of a file before it gets deleted, in seconds."; + }; + userQuota = mkOption { + type = types.nullOr types.int; + default = null; + example = 1234; + description = '' + Maximum size of all uploaded files per user, in bytes. There + will be no quota if this option is set to null. + ''; + }; + httpUploadPath = mkOption { + type = types.str; + description = '' + Directory where the uploaded files will be stored. By + default, uploaded files are put in a sub-directory of the + default Prosody storage path (usually /var/lib/prosody). + ''; + default = "/var/lib/prosody"; + }; + }; + }; + vHostOpts = { ... }: { options = { @@ -283,6 +470,27 @@ in description = "Whether to enable the prosody server"; }; + xmppComplianceSuite = mkOption { + type = types.bool; + default = true; + description = '' + The XEP-0423 defines a set of recommended XEPs to implement + for a server. It's generally a good idea to implement this + set of extensions if you want to provide your users with a + good XMPP experience. + + This NixOS module aims to provide a "advanced server" + experience as per defined in the XEP-0423[1] specification. + + Setting this option to true will prevent you from building a + NixOS configuration which won't comply with this standard. + You can explicitely decide to ignore this standard if you + know what you are doing by setting this option to false. + + [1] https://xmpp.org/extensions/xep-0423.html + ''; + }; + package = mkOption { type = types.package; description = "Prosody package to use"; @@ -302,6 +510,12 @@ in default = "/var/lib/prosody"; }; + disco_items = mkOption { + type = types.listOf (types.submodule discoOpts); + default = []; + description = "List of discoverable items you want to advertise."; + }; + user = mkOption { type = types.str; default = "prosody"; @@ -320,6 +534,31 @@ in description = "Allow account creation"; }; + # HTTP server-related options + httpPorts = mkOption { + type = types.listOf types.int; + description = "Listening HTTP ports list for this service."; + default = [ 5280 ]; + }; + + httpInterfaces = mkOption { + type = types.listOf types.str; + default = [ "*" "::" ]; + description = "Interfaces on which the HTTP server will listen on."; + }; + + httpsPorts = mkOption { + type = types.listOf types.int; + description = "Listening HTTPS ports list for this service."; + default = [ 5281 ]; + }; + + httpsInterfaces = mkOption { + type = types.listOf types.str; + default = [ "*" "::" ]; + description = "Interfaces on which the HTTPS server will listen on."; + }; + c2sRequireEncryption = mkOption { type = types.bool; default = true; @@ -387,6 +626,26 @@ in description = "Addtional path in which to look find plugins/modules"; }; + uploadHttp = mkOption { + description = '' + Configures the Prosody builtin HTTP server to handle user uploads. + ''; + type = types.nullOr (types.submodule uploadHttpOpts); + default = null; + example = { + domain = "uploads.my-xmpp-example-host.org"; + }; + }; + + muc = mkOption { + type = types.listOf (types.submodule mucOpts); + default = [ ]; + example = [ { + domain = "conference.my-xmpp-example-host.org"; + } ]; + description = "Multi User Chat (MUC) configuration"; + }; + virtualHosts = mkOption { description = "Define the virtual hosts"; @@ -443,9 +702,44 @@ in config = mkIf cfg.enable { + assertions = let + genericErrMsg = '' + + Having a server not XEP-0423-compliant might make your XMPP + experience terrible. See the NixOS manual for further + informations. + + If you know what you're doing, you can disable this warning by + setting config.services.prosody.xmppComplianceSuite to false. + ''; + errors = [ + { assertion = (builtins.length cfg.muc > 0) || !cfg.xmppComplianceSuite; + message = '' + You need to setup at least a MUC domain to comply with + XEP-0423. + '' + genericErrMsg;} + { assertion = cfg.uploadHttp != null || !cfg.xmppComplianceSuite; + message = '' + You need to setup the uploadHttp module through + config.services.prosody.uploadHttp to comply with + XEP-0423. + '' + genericErrMsg;} + ]; + in errors; + environment.systemPackages = [ cfg.package ]; - environment.etc."prosody/prosody.cfg.lua".text = '' + environment.etc."prosody/prosody.cfg.lua".text = + let + httpDiscoItems = if (cfg.uploadHttp != null) + then [{ url = cfg.uploadHttp.domain; description = "HTTP upload endpoint";}] + else []; + mucDiscoItems = builtins.foldl' + (acc: muc: [{ url = muc.domain; description = "${muc.domain} MUC endpoint";}] ++ acc) + [] + cfg.muc; + discoItems = cfg.disco_items ++ httpDiscoItems ++ mucDiscoItems; + in '' pidfile = "/run/prosody/prosody.pid" @@ -472,6 +766,10 @@ in ${ lib.concatStringsSep "\n" (map (x: "${toLua x};") cfg.extraModules)} }; + disco_items = { + ${ lib.concatStringsSep "\n" (builtins.map (x: ''{ "${x.url}", "${x.description}"};'') discoItems)} + }; + allow_registration = ${toLua cfg.allowRegistration} c2s_require_encryption = ${toLua cfg.c2sRequireEncryption} @@ -486,6 +784,42 @@ in authentication = ${toLua cfg.authentication} + http_interfaces = ${toLua cfg.httpInterfaces} + + https_interfaces = ${toLua cfg.httpsInterfaces} + + http_ports = ${toLua cfg.httpPorts} + + https_ports = ${toLua cfg.httpsPorts} + + ${lib.concatMapStrings (muc: '' + Component ${toLua muc.domain} "muc" + modules_enabled = { "muc_mam"; ${optionalString muc.vcard_muc ''"vcard_muc";'' } } + name = ${toLua muc.name} + restrict_room_creation = ${toLua muc.restrictRoomCreation} + max_history_messages = ${toLua muc.maxHistoryMessages} + muc_room_locking = ${toLua muc.roomLocking} + muc_room_lock_timeout = ${toLua muc.roomLockTimeout} + muc_tombstones = ${toLua muc.tombstones} + muc_tombstone_expiry = ${toLua muc.tombstoneExpiry} + muc_room_default_public = ${toLua muc.roomDefaultPublic} + muc_room_default_members_only = ${toLua muc.roomDefaultMembersOnly} + muc_room_default_moderated = ${toLua muc.roomDefaultModerated} + muc_room_default_public_jids = ${toLua muc.roomDefaultPublicJids} + muc_room_default_change_subject = ${toLua muc.roomDefaultChangeSubject} + muc_room_default_history_length = ${toLua muc.roomDefaultHistoryLength} + muc_room_default_language = ${toLua muc.roomDefaultLanguage} + + '') cfg.muc} + + ${ lib.optionalString (cfg.uploadHttp != null) '' + Component ${toLua cfg.uploadHttp.domain} "http_upload" + http_upload_file_size_limit = ${cfg.uploadHttp.uploadFileSizeLimit} + http_upload_expire_after = ${cfg.uploadHttp.uploadExpireAfter} + ${lib.optionalString (cfg.uploadHttp.userQuota != null) "http_upload_quota = ${toLua cfg.uploadHttp.userQuota}"} + http_upload_path = ${toLua cfg.uploadHttp.httpUploadPath} + ''} + ${ cfg.extraConfig } ${ lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: '' diff --git a/nixos/tests/xmpp/prosody.nix b/nixos/tests/xmpp/prosody.nix index 9d1374bff6b..e7755e24bab 100644 --- a/nixos/tests/xmpp/prosody.nix +++ b/nixos/tests/xmpp/prosody.nix @@ -1,27 +1,80 @@ -import ../make-test-python.nix { - name = "prosody"; +let + cert = pkgs: pkgs.runCommandNoCC "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } '' + openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=example.com/CN=uploads.example.com/CN=conference.example.com' + mkdir -p $out + cp key.pem cert.pem $out + ''; + createUsers = pkgs: pkgs.writeScriptBin "create-prosody-users" '' + #!${pkgs.bash}/bin/bash + set -e + + # Creates and set password for the 2 xmpp test users. + # + # Doing that in a bash script instead of doing that in the test + # script allow us to easily provision the users when running that + # test interactively. + + prosodyctl register cthon98 example.com nothunter2 + prosodyctl register azurediamond example.com hunter2 + ''; + delUsers = pkgs: pkgs.writeScriptBin "delete-prosody-users" '' + #!${pkgs.bash}/bin/bash + set -e + + # Deletes the test users. + # + # Doing that in a bash script instead of doing that in the test + # script allow us to easily provision the users when running that + # test interactively. + prosodyctl deluser cthon98@example.com + prosodyctl deluser azurediamond@example.com + ''; +in import ../make-test-python.nix { + name = "prosody"; nodes = { - client = { nodes, pkgs, ... }: { + client = { nodes, pkgs, config, ... }: { + security.pki.certificateFiles = [ "${cert pkgs}/cert.pem" ]; + console.keyMap = "fr-bepo"; + networking.extraHosts = '' + ${nodes.server.config.networking.primaryIPAddress} example.com + ${nodes.server.config.networking.primaryIPAddress} conference.example.com + ${nodes.server.config.networking.primaryIPAddress} uploads.example.com + ''; environment.systemPackages = [ (pkgs.callPackage ./xmpp-sendmessage.nix { connectTo = nodes.server.config.networking.primaryIPAddress; }) ]; }; server = { config, pkgs, ... }: { + security.pki.certificateFiles = [ "${cert pkgs}/cert.pem" ]; + console.keyMap = "fr-bepo"; networking.extraHosts = '' ${config.networking.primaryIPAddress} example.com + ${config.networking.primaryIPAddress} conference.example.com + ${config.networking.primaryIPAddress} uploads.example.com ''; networking.firewall.enable = false; + environment.systemPackages = [ + (createUsers pkgs) + (delUsers pkgs) + ]; services.prosody = { enable = true; - # TODO: use a self-signed certificate - c2sRequireEncryption = false; - extraConfig = '' - storage = "sql" - ''; - virtualHosts.test = { + ssl.cert = "${cert pkgs}/cert.pem"; + ssl.key = "${cert pkgs}/key.pem"; + virtualHosts.example = { domain = "example.com"; enabled = true; + ssl.cert = "${cert pkgs}/cert.pem"; + ssl.key = "${cert pkgs}/key.pem"; + }; + muc = [ + { + domain = "conference.example.com"; + } + ]; + uploadHttp = { + domain = "uploads.example.com"; }; }; }; @@ -31,16 +84,8 @@ import ../make-test-python.nix { server.wait_for_unit("prosody.service") server.succeed('prosodyctl status | grep "Prosody is running"') - # set password to 'nothunter2' (it's asked twice) - server.succeed("yes nothunter2 | prosodyctl adduser cthon98@example.com") - # set password to 'y' - server.succeed("yes | prosodyctl adduser azurediamond@example.com") - # correct password to "hunter2" - server.succeed("yes hunter2 | prosodyctl passwd azurediamond@example.com") - - client.succeed("send-message") - - server.succeed("prosodyctl deluser cthon98@example.com") - server.succeed("prosodyctl deluser azurediamond@example.com") + server.succeed("create-prosody-users") + client.succeed('send-message 2>&1 | grep "XMPP SCRIPT TEST SUCCESS"') + server.succeed("delete-prosody-users") ''; } diff --git a/nixos/tests/xmpp/xmpp-sendmessage.nix b/nixos/tests/xmpp/xmpp-sendmessage.nix index 2a075a01813..349b9c6f38e 100644 --- a/nixos/tests/xmpp/xmpp-sendmessage.nix +++ b/nixos/tests/xmpp/xmpp-sendmessage.nix @@ -1,46 +1,61 @@ -{ writeScriptBin, python3, connectTo ? "localhost" }: -writeScriptBin "send-message" '' - #!${(python3.withPackages (ps: [ ps.sleekxmpp ])).interpreter} - # Based on the sleekxmpp send_client example, look there for more details: - # https://github.com/fritzy/SleekXMPP/blob/develop/examples/send_client.py - import sleekxmpp - - class SendMsgBot(sleekxmpp.ClientXMPP): - """ - A basic SleekXMPP bot that will log in, send a message, - and then log out. - """ - def __init__(self, jid, password, recipient, message): - sleekxmpp.ClientXMPP.__init__(self, jid, password) - - self.recipient = recipient - self.msg = message - - self.add_event_handler("session_start", self.start, threaded=True) - - def start(self, event): - self.send_presence() - self.get_roster() - - self.send_message(mto=self.recipient, - mbody=self.msg, - mtype='chat') - - self.disconnect(wait=True) - - - if __name__ == '__main__': - xmpp = SendMsgBot("cthon98@example.com", "nothunter2", "azurediamond@example.com", "hey, if you type in your pw, it will show as stars") - xmpp.register_plugin('xep_0030') # Service Discovery - xmpp.register_plugin('xep_0199') # XMPP Ping - - # TODO: verify certificate - # If you want to verify the SSL certificates offered by a server: - # xmpp.ca_certs = "path/to/ca/cert" - - if xmpp.connect(('${connectTo}', 5222)): - xmpp.process(block=True) - else: - print("Unable to connect.") - sys.exit(1) +{ writeScriptBin, writeText, python3, connectTo ? "localhost" }: +let + dummyFile = writeText "dummy-file" '' + Dear dog, + + Please find this *really* important attachment. + + Yours truly, + John + ''; +in writeScriptBin "send-message" '' +#!${(python3.withPackages (ps: [ ps.slixmpp ])).interpreter} +import logging +import sys +from types import MethodType + +from slixmpp import ClientXMPP +from slixmpp.exceptions import IqError, IqTimeout + + +class CthonTest(ClientXMPP): + + def __init__(self, jid, password): + ClientXMPP.__init__(self, jid, password) + self.add_event_handler("session_start", self.session_start) + + async def session_start(self, event): + log = logging.getLogger(__name__) + self.send_presence() + self.get_roster() + # Sending a test message + self.send_message(mto="azurediamond@example.com", mbody="Hello, this is dog.", mtype="chat") + log.info('Message sent') + + # Test http upload (XEP_0363) + def timeout_callback(arg): + log.error("ERROR: Cannot upload file. XEP_0363 seems broken") + sys.exit(1) + url = await self['xep_0363'].upload_file("${dummyFile}",timeout=10, timeout_callback=timeout_callback) + log.info('Upload success!') + # Test MUC + self.plugin['xep_0045'].join_muc('testMucRoom', 'cthon98', wait=True) + log.info('MUC join success!') + log.info('XMPP SCRIPT TEST SUCCESS') + self.disconnect(wait=True) + + +if __name__ == '__main__': + logging.basicConfig(level=logging.DEBUG, + format='%(levelname)-8s %(message)s') + + ct = CthonTest('cthon98@example.com', 'nothunter2') + ct.register_plugin('xep_0071') + ct.register_plugin('xep_0128') + # HTTP Upload + ct.register_plugin('xep_0363') + # MUC + ct.register_plugin('xep_0045') + ct.connect(("server", 5222)) + ct.process(forever=False) '' diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix index 0d552e9e112..702da004b42 100644 --- a/pkgs/servers/xmpp/prosody/default.nix +++ b/pkgs/servers/xmpp/prosody/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libidn, openssl, makeWrapper, fetchhg +{ stdenv, fetchurl, lib, libidn, openssl, makeWrapper, fetchhg , lua5, luasocket, luasec, luaexpat, luafilesystem, luabitop , withLibevent ? true, luaevent ? null , withDBI ? true, luadbi ? null @@ -16,7 +16,16 @@ with stdenv.lib; stdenv.mkDerivation rec { version = "0.11.5"; # also update communityModules pname = "prosody"; - + # The following community modules are necessary for the nixos module + # prosody module to comply with XEP-0423 and provide a working + # default setup. + nixosModuleDeps = [ + "bookmarks" + "cloud_notify" + "vcard_muc" + "smacks" + "http_upload" + ]; src = fetchurl { url = "https://prosody.im/downloads/source/${pname}-${version}.tar.gz"; sha256 = "12s0hn6hvjbi61cdw3165l6iw0878971dmlvfg663byjsmjvvy2m"; @@ -52,7 +61,7 @@ stdenv.mkDerivation rec { postInstall = '' ${concatMapStringsSep "\n" (module: '' cp -r $communityModules/mod_${module} $out/lib/prosody/modules/ - '') (withCommunityModules ++ withOnlyInstalledCommunityModules)} + '') (lib.lists.unique(nixosModuleDeps ++ withCommunityModules ++ withOnlyInstalledCommunityModules))} wrapProgram $out/bin/prosody \ --prefix LUA_PATH ';' "$LUA_PATH" \ --prefix LUA_CPATH ';' "$LUA_CPATH" -- cgit v1.2.3 From 353a8b58e6b12daf2977870743a6dd85ee080448 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= Date: Sun, 26 Apr 2020 15:18:49 +0200 Subject: nixos/prosody: leverage systemd sandbox features to harden service We are leveraging the systemd sandboxing features to prevent the service accessing locations it shouldn't do. Most notably, we are here preventing the prosody service from accessing /home and providing it with a private /dev and /tmp. Please consult man systemd.exec for further informations. --- nixos/modules/services/networking/prosody.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index 8058172cb08..83e397e50fa 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -856,6 +856,19 @@ in PIDFile = "/run/prosody/prosody.pid"; ExecStart = "${cfg.package}/bin/prosodyctl start"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + + MemoryDenyWriteExecute = true; + PrivateDevices = true; + PrivateMounts = true; + PrivateTmp = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; }; }; -- cgit v1.2.3 From 4a704c653b06b423b771f92af4f5c069df7dd682 Mon Sep 17 00:00:00 2001 From: Michael Lingelbach Date: Sun, 26 Apr 2020 19:18:00 -0700 Subject: libnvidia-container: 1.0.0 -> 1.0.6 --- .../nvidia-docker/libnvc-ldconfig-and-path-fixes.patch | 12 ++++++------ pkgs/applications/virtualization/nvidia-docker/libnvc.nix | 8 +++++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch b/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch index 043c1efade8..9ae8d6b5e75 100644 --- a/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch +++ b/pkgs/applications/virtualization/nvidia-docker/libnvc-ldconfig-and-path-fixes.patch @@ -71,10 +71,10 @@ index 33d78dd..2b087db 100644 #endif /* HEADER_LDCACHE_H */ diff --git a/src/nvc_info.c b/src/nvc_info.c -index cc96542..3fe7612 100644 +index 30e3cfd..6d12a50 100644 --- a/src/nvc_info.c +++ b/src/nvc_info.c -@@ -163,15 +163,13 @@ find_library_paths(struct error *err, struct nvc_driver_info *info, const char * +@@ -167,15 +167,13 @@ find_library_paths(struct error *err, struct nvc_driver_info *info, const char * if (path_resolve_full(err, path, root, ldcache) < 0) return (-1); ldcache_init(&ld, err, path); @@ -91,7 +91,7 @@ index cc96542..3fe7612 100644 goto fail; info->nlibs32 = size; -@@ -179,13 +177,11 @@ find_library_paths(struct error *err, struct nvc_driver_info *info, const char * +@@ -183,13 +181,11 @@ find_library_paths(struct error *err, struct nvc_driver_info *info, const char * if (info->libs32 == NULL) goto fail; if (ldcache_resolve(&ld, LIB32_ARCH, root, libs, @@ -106,7 +106,7 @@ index cc96542..3fe7612 100644 return (rv); } -@@ -199,7 +195,7 @@ find_binary_paths(struct error *err, struct nvc_driver_info *info, const char *r +@@ -203,7 +199,7 @@ find_binary_paths(struct error *err, struct nvc_driver_info *info, const char *r char path[PATH_MAX]; int rv = -1; @@ -116,10 +116,10 @@ index cc96542..3fe7612 100644 return (-1); } diff --git a/src/nvc_ldcache.c b/src/nvc_ldcache.c -index d41a24d..65b7878 100644 +index 6ff380f..cbe6a69 100644 --- a/src/nvc_ldcache.c +++ b/src/nvc_ldcache.c -@@ -331,7 +331,7 @@ nvc_ldcache_update(struct nvc_context *ctx, const struct nvc_container *cnt) +@@ -340,7 +340,7 @@ nvc_ldcache_update(struct nvc_context *ctx, const struct nvc_container *cnt) if (validate_args(ctx, cnt != NULL) < 0) return (-1); diff --git a/pkgs/applications/virtualization/nvidia-docker/libnvc.nix b/pkgs/applications/virtualization/nvidia-docker/libnvc.nix index f2c9eda75fc..5b97d7fffa2 100644 --- a/pkgs/applications/virtualization/nvidia-docker/libnvc.nix +++ b/pkgs/applications/virtualization/nvidia-docker/libnvc.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, libelf, libcap, libseccomp }: +{ stdenv, lib, fetchFromGitHub, pkgconfig, libelf, libcap, libseccomp }: with lib; let @@ -13,13 +13,13 @@ with lib; let in stdenv.mkDerivation rec { pname = "libnvidia-container"; - version = "1.0.0"; + version = "1.0.6"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "libnvidia-container"; rev = "v${version}"; - sha256 = "1ws6mfsbgxhzlb5w1r8qqg2arvxkr21n59i4cqsyz3h5jsqsflbw"; + sha256 = "1pnpc9knwh8d1zqb28zc3spkjc00w0z10vd3jna8ksvpl35jl7w3"; }; # locations of nvidia-driver libraries are not resolved via ldconfig which @@ -42,6 +42,8 @@ in stdenv.mkDerivation rec { touch deps/src/nvidia-modprobe-${modp-ver}/.download_stamp ''; + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libelf libcap libseccomp ]; meta = { -- cgit v1.2.3 From d74e044888f61b2e3aa9b880b04e96a4ed6f37f5 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 30 Apr 2020 23:14:00 +0200 Subject: flatpak-builder: remove p7zip dependency 7zip is unmaintained and full of holes. In the worst case, it can be still picked up from PATH. https://discourse.nixos.org/t/p7zip-and-possible-rces/6951 --- pkgs/development/tools/flatpak-builder/default.nix | 2 -- pkgs/development/tools/flatpak-builder/fix-paths.patch | 9 --------- 2 files changed, 11 deletions(-) diff --git a/pkgs/development/tools/flatpak-builder/default.nix b/pkgs/development/tools/flatpak-builder/default.nix index e400051e2c6..32519594e4f 100644 --- a/pkgs/development/tools/flatpak-builder/default.nix +++ b/pkgs/development/tools/flatpak-builder/default.nix @@ -29,7 +29,6 @@ , gnumake , gnupg , gnutar -, p7zip , json-glib , libcap , libdwarf @@ -99,7 +98,6 @@ in stdenv.mkDerivation rec { cpio = "${cpio}/bin/cpio"; git = "${gitMinimal}/bin/git"; rofilesfuse = "${ostree}/bin/rofiles-fuse"; - sevenz = "${p7zip}/bin/7z"; strip = "${binutils}/bin/strip"; eustrip = "${elfutils}/bin/eu-strip"; euelfcompress = "${elfutils}/bin/eu-elfcompress"; diff --git a/pkgs/development/tools/flatpak-builder/fix-paths.patch b/pkgs/development/tools/flatpak-builder/fix-paths.patch index cc7d9e82b0a..e24fade6866 100644 --- a/pkgs/development/tools/flatpak-builder/fix-paths.patch +++ b/pkgs/development/tools/flatpak-builder/fix-paths.patch @@ -49,15 +49,6 @@ va_end (ap); return res; -@@ -470,7 +470,7 @@ un7z (GFile *dir, - GError **error) - { - gboolean res; -- const gchar *argv[] = { "7z", "x", sevenz_path, NULL }; -+ const gchar *argv[] = { "@sevenz@", "x", sevenz_path, NULL }; - - res = flatpak_spawnv (dir, NULL, 0, error, argv); - @@ -483,7 +483,7 @@ unrpm (GFile *dir, GError **error) { -- cgit v1.2.3 From 9eb6dc762f67d09e4598ee2e35070821590e68dc Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 30 Apr 2020 23:15:15 +0200 Subject: gitaly: 12.8.9 -> 12.8.10 --- pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock | 4 ++-- pkgs/applications/version-management/gitlab/gitaly/default.nix | 4 ++-- pkgs/applications/version-management/gitlab/gitaly/gemset.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock index e3f7865226a..0c125f5a0bf 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock +++ b/pkgs/applications/version-management/gitlab/gitaly/Gemfile.lock @@ -114,7 +114,7 @@ GEM minitest (5.14.0) msgpack (1.3.1) multipart-post (2.0.0) - nokogiri (1.10.7) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) nokogumbo (1.5.0) nokogiri @@ -242,4 +242,4 @@ DEPENDENCIES webmock (~> 3.4.0) BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 968b26632c7..5e3eac19df3 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -28,14 +28,14 @@ let }; }); in buildGoPackage rec { - version = "12.8.9"; + version = "12.8.10"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "06q1km2pigpl4yxl8pkzdy2yxzvsfm6n5r3kmd8h19j3sc6imbmh"; + sha256 = "1vhnpyggh2ch93i75np11rjzvq8d6pwv2kzvwh7ak3fa02w9qdfs"; }; # Fix a check which assumes that hook files are writeable by their diff --git a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix index d91c84b1fa2..7719a90abb5 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/gemset.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/gemset.nix @@ -515,10 +515,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r0qpgf80h764k176yr63gqbs2z0xbsp8vlvs2a79d5r9vs83kln"; + sha256 = "12j76d0bp608932xkzmfi638c7aqah57l437q8494znzbj610qnm"; type = "gem"; }; - version = "1.10.7"; + version = "1.10.9"; }; nokogumbo = { dependencies = ["nokogiri"]; -- cgit v1.2.3 From fdd0d0de1f0cc35937296ccee4bc6c99f63f657b Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 30 Apr 2020 23:16:50 +0200 Subject: gitlab: 12.8.9 -> 12.8.10 --- pkgs/applications/version-management/gitlab/data.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index c651e8bab92..d3f2db5e5ad 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,11 +1,11 @@ { - "version": "12.8.9", - "repo_hash": "07vayjy3020hapbdx2wiv91g9xrfmvngbyj05hs2p0p3gwj6g2a4", + "version": "12.8.10", + "repo_hash": "1njkihj66d8fnk1l0r5pys38akf5srqlrgj2hzc68l5m8d51dk15", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v12.8.9-ee", + "rev": "v12.8.10-ee", "passthru": { - "GITALY_SERVER_VERSION": "12.8.9", + "GITALY_SERVER_VERSION": "12.8.10", "GITLAB_PAGES_VERSION": "1.16.0", "GITLAB_SHELL_VERSION": "11.0.0", "GITLAB_WORKHORSE_VERSION": "8.21.2" -- cgit v1.2.3 From cd8a60fd3b420c6df57564aa6da9d0032c7ec1c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 30 Apr 2020 18:53:28 -0300 Subject: xfce.xfce4-panel: 4.14.3 -> 4.14.4 --- pkgs/desktops/xfce/core/xfce4-panel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/xfce4-panel/default.nix b/pkgs/desktops/xfce/core/xfce4-panel/default.nix index ffd42e4a2c5..b7bede9e27b 100644 --- a/pkgs/desktops/xfce/core/xfce4-panel/default.nix +++ b/pkgs/desktops/xfce/core/xfce4-panel/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfce4-panel"; - version = "4.14.3"; + version = "4.14.4"; - sha256 = "0h8cqs2bghmyp0jihjm2wc7j14k271j178vllin271xrl7kzmvzv"; + sha256 = "1srzgb9vsvfrbhym74zkz9hdhxcrvbffxpfgv5vprhlwxw3vk3fq"; nativeBuildInputs = [ gobject-introspection ]; buildInputs = [ exo garcon gtk2 gtk3 glib glib-networking libxfce4ui libxfce4util libwnck3 xfconf ]; -- cgit v1.2.3 From fc64bca95b27cf82e7c185b3a1723b326b0c20e7 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 30 Apr 2020 23:50:28 +0200 Subject: gitlab: update.py: use the /refs endpoint It seems the atom feed now needs authentication. Use the /refs endpoint, which is used for the switch branch/tag dropdown. It doesn't show all records, but has some pagination, but works well enough for now. --- pkgs/applications/version-management/gitlab/update.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/gitlab/update.py b/pkgs/applications/version-management/gitlab/update.py index a128fd5bc40..4c7bcefacb0 100755 --- a/pkgs/applications/version-management/gitlab/update.py +++ b/pkgs/applications/version-management/gitlab/update.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i python3 -p bundix bundler common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.lxml python3Packages.click python3Packages.click-log vgo2nix yarn2nix +#! nix-shell -i python3 -p bundix bundler common-updater-scripts nix nix-prefetch-git python3 python3Packages.requests python3Packages.click python3Packages.click-log vgo2nix yarn2nix import click import click_log @@ -13,7 +13,6 @@ from distutils.version import LooseVersion from typing import Iterable import requests -from xml.etree import ElementTree logger = logging.getLogger(__name__) @@ -30,12 +29,11 @@ class GitLabRepo: @property def tags(self) -> Iterable[str]: - r = requests.get(self.url + "/tags?format=atom", stream=True) + r = requests.get(self.url + "/refs?sort=updated_desc&ref=master").json() + tags = r.get("Tags", []) - tree = ElementTree.fromstring(r.content) - versions = [e.text for e in tree.findall('{http://www.w3.org/2005/Atom}entry/{http://www.w3.org/2005/Atom}title')] # filter out versions not matching version_regex - versions = list(filter(self.version_regex.match, versions)) + versions = list(filter(self.version_regex.match, tags)) # sort, but ignore v and -ee for sorting comparisons versions.sort(key=lambda x: LooseVersion(x.replace("v", "").replace("-ee", "")), reverse=True) -- cgit v1.2.3 From b139bc0d87cb4f13ab5a156bf1b6fb941f09488b Mon Sep 17 00:00:00 2001 From: Jacek Galowicz Date: Thu, 6 Feb 2020 11:34:57 +0100 Subject: nixosTests: Reraise exception in subtests --- nixos/lib/test-driver/test-driver.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index 07f27515990..4f145507a8b 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -905,10 +905,8 @@ def subtest(name: str) -> Iterator[None]: yield return True except Exception as e: - failed_tests.append( - 'Test "{}" failed with error: "{}"'.format(name, str(e)) - ) - log.log("error: {}".format(str(e))) + log.log(f'Test "{name}" failed with error: "{e}"') + raise e return False -- cgit v1.2.3 From 3cdd558a6f785fb3a934c7c1820b3576c9e8b5b6 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 1 May 2020 01:15:39 +0200 Subject: nixosTests: drop nr_tests and failed_tests variables With the tests now bailing out early on a failing subtest, we don't need to keep a list of failed tests, or the number of total tests --- nixos/lib/test-driver/test-driver.py | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index 4f145507a8b..d96600b3c99 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -85,8 +85,6 @@ CHAR_TO_KEY = { } # Forward references -nr_tests: int -failed_tests: list log: "Logger" machines: "List[Machine]" @@ -882,25 +880,10 @@ def run_tests() -> None: if machine.is_up(): machine.execute("sync") - if nr_tests != 0: - nr_succeeded = nr_tests - len(failed_tests) - eprint("{} out of {} tests succeeded".format(nr_succeeded, nr_tests)) - if len(failed_tests) > 0: - eprint( - "The following tests have failed:\n - {}".format( - "\n - ".join(failed_tests) - ) - ) - sys.exit(1) - @contextmanager def subtest(name: str) -> Iterator[None]: - global nr_tests - global failed_tests - with log.nested(name): - nr_tests += 1 try: yield return True @@ -926,9 +909,6 @@ if __name__ == "__main__": ] exec("\n".join(machine_eval)) - nr_tests = 0 - failed_tests = [] - @atexit.register def clean_up() -> None: with log.nested("cleaning up"): -- cgit v1.2.3 From e523407d80067e99ca3db94335732e882eb81b2e Mon Sep 17 00:00:00 2001 From: Roman Firment Date: Thu, 30 Apr 2020 01:04:25 +0200 Subject: gnomeExtensions.window-is-ready-remover: init at unstable-2020-03-25 Removes window is ready Notification. --- .../extensions/window-is-ready-remover/default.nix | 26 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 27 insertions(+) create mode 100644 pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix diff --git a/pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix b/pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix new file mode 100644 index 00000000000..3ddd5c10283 --- /dev/null +++ b/pkgs/desktops/gnome-3/extensions/window-is-ready-remover/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-window-is-ready-remover"; + version = "unstable-2020-03-25"; + + src = fetchFromGitHub { + owner = "nunofarruca"; + repo = "WindowIsReady_Remover"; + rev = "a9f9b3a060a6ba8eec71332f39dc2569b6e93761"; + sha256 = "0l6cg9kz2plbvsqhgwfajknzw9yv3mg9gxdbsk147gbh2arnp6v3"; + }; + + uuid = "windowIsReady_Remover@nunofarruca@gmail.com"; + + installPhase = '' + mkdir -p $out/share/gnome-shell/extensions/ + cp -r ${uuid} $out/share/gnome-shell/extensions/${uuid} + ''; + + meta = with stdenv.lib; { + description = "GNOME Shell extension removing window is ready notification"; + homepage = "https://github.com/nunofarruca/WindowIsReady_Remover"; + license = licenses.unfree; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 882bea9b826..942f28f1cf6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24093,6 +24093,7 @@ in timepp = callPackage ../desktops/gnome-3/extensions/timepp { }; topicons-plus = callPackage ../desktops/gnome-3/extensions/topicons-plus { }; window-corner-preview = callPackage ../desktops/gnome-3/extensions/window-corner-preview { }; + window-is-ready-remover = callPackage ../desktops/gnome-3/extensions/window-is-ready-remover { }; workspace-matrix = callPackage ../desktops/gnome-3/extensions/workspace-matrix { }; nohotcorner = throw "gnomeExtensions.nohotcorner removed since 2019-10-09: Since 3.34, it is a part of GNOME Shell configurable through GNOME Tweaks."; -- cgit v1.2.3 From 7b596ae198c442eb6876d2017888c9a98e8f3454 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 1 May 2020 02:11:24 +0200 Subject: jameica: fix .desktop file /nix/store/5cqxx71wam21ayzpc32m8irvsdnxdwla-jameica.desktop/share/applications/jameica.desktop: warning: value "Application;Office;" for key "Categories" in group "Desktop Entry" contains a deprecated value "Application" --- pkgs/applications/office/jameica/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix index be630920268..5d5727e3516 100644 --- a/pkgs/applications/office/jameica/default.nix +++ b/pkgs/applications/office/jameica/default.nix @@ -17,7 +17,7 @@ let comment = "Free Runtime Environment for Java Applications."; desktopName = "Jameica"; genericName = "Jameica"; - categories = "Application;Office;"; + categories = "Office;"; }; in stdenv.mkDerivation rec { -- cgit v1.2.3 From 5ff089db9b4678255db6c29cd5f6319aba70979f Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 1 May 2020 02:12:28 +0200 Subject: jameica: 2.8.4 -> 2.8.6 --- pkgs/applications/office/jameica/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/jameica/default.nix b/pkgs/applications/office/jameica/default.nix index 5d5727e3516..6dc124c6a20 100644 --- a/pkgs/applications/office/jameica/default.nix +++ b/pkgs/applications/office/jameica/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, ant, jdk, jre, gtk2, glib, xorg, Cocoa }: let - _version = "2.8.4"; - _build = "453"; + _version = "2.8.6"; + _build = "455"; version = "${_version}-${_build}"; name = "jameica-${version}"; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "willuhn"; repo = "jameica"; rev = "V_${builtins.replaceStrings ["."] ["_"] _version}_BUILD_${_build}"; - sha256 = "1imm3wpdrgh2sr2wh9vgaf2mp1ixs845vgzk5ib82mak7lg9m1zl"; + sha256 = "1pndklxsvixy6zyblqr62ki3pqaq8lfrzgasrvhclqxxh76gjlss"; }; # there is also a build.gradle, but it only seems to be used to vendor 3rd party libraries -- cgit v1.2.3 From 21821de828bc1e8af653930c43700da29d7399f9 Mon Sep 17 00:00:00 2001 From: John Mercier Date: Sat, 14 Mar 2020 22:39:56 -0400 Subject: spring-boot-cli: 2.1.9->2.2.5 --- pkgs/development/tools/spring-boot-cli/default.nix | 47 ++++++++++++++++++++++ pkgs/development/tools/spring-boot/default.nix | 46 --------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 49 insertions(+), 47 deletions(-) create mode 100644 pkgs/development/tools/spring-boot-cli/default.nix delete mode 100644 pkgs/development/tools/spring-boot/default.nix diff --git a/pkgs/development/tools/spring-boot-cli/default.nix b/pkgs/development/tools/spring-boot-cli/default.nix new file mode 100644 index 00000000000..865c655e67f --- /dev/null +++ b/pkgs/development/tools/spring-boot-cli/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchzip, jdk, makeWrapper, installShellFiles, coreutils }: + +stdenv.mkDerivation rec { + pname = "spring-boot-cli"; + version = "2.2.6"; + + src = fetchzip { + url = "https://repo.spring.io/release/org/springframework/boot/${pname}/${version}.RELEASE/${pname}-${version}.RELEASE-bin.zip"; + sha256 = "1rb21a8nr4mcdsfv3c3xh45kcpdwllhjfb26w9xsdgfh1j4mhb81"; + }; + + nativeBuildInputs = [ makeWrapper installShellFiles ]; + + installPhase = '' + runHook preInstall + rm bin/spring.bat + installShellCompletion --bash shell-completion/bash/spring + installShellCompletion --zsh shell-completion/zsh/_spring + rm -r shell-completion + cp -r . $out + wrapProgram $out/bin/spring \ + --set JAVA_HOME ${jdk} \ + --set PATH /bin:${coreutils}/bin:${jdk}/bin + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = '' + CLI which makes it easy to create spring-based applications + ''; + longDescription = '' + Spring Boot makes it easy to create stand-alone, production-grade + Spring-based Applications that you can run. We take an opinionated view + of the Spring platform and third-party libraries, so that you can get + started with minimum fuss. Most Spring Boot applications need very + little Spring configuration. + + You can use Spring Boot to create Java applications that can be started + by using java -jar or more traditional war deployments. We also provide + a command line tool that runs “spring scripts”. + ''; + homepage = "https://spring.io/projects/spring-boot"; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ moaxcp ]; + }; +} diff --git a/pkgs/development/tools/spring-boot/default.nix b/pkgs/development/tools/spring-boot/default.nix deleted file mode 100644 index 4f8c17caeee..00000000000 --- a/pkgs/development/tools/spring-boot/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv, fetchzip, jdk, makeWrapper, installShellFiles }: - -stdenv.mkDerivation rec { - pname = "spring-boot"; - version = "2.1.9"; - - src = fetchzip { - url = "https://repo.spring.io/release/org/springframework/boot/${pname}-cli/${version}.RELEASE/${pname}-cli-${version}.RELEASE-bin.zip"; - sha256 = "03iphh5l9w9sizksidkv217qnqx3nh1zpw6kdjnn40j3mlabfb7j"; - }; - - nativeBuildInputs = [ makeWrapper installShellFiles ]; - - installPhase = '' - runHook preInstall - rm bin/spring.bat - installShellCompletion --bash shell-completion/bash/spring - installShellCompletion --zsh shell-completion/zsh/_spring - rm -r shell-completion - cp -r . $out - wrapProgram $out/bin/spring \ - --prefix JAVA_HOME : ${jdk} - runHook postInstall - ''; - - meta = with stdenv.lib; { - description = '' - CLI which makes it easy to create spring-based applications - ''; - longDescription = '' - Spring Boot makes it easy to create stand-alone, production-grade - Spring-based Applications that you can run. We take an opinionated view - of the Spring platform and third-party libraries, so that you can get - started with minimum fuss. Most Spring Boot applications need very - little Spring configuration. - - You can use Spring Boot to create Java applications that can be started - by using java -jar or more traditional war deployments. We also provide - a command line tool that runs “spring scripts”. - ''; - homepage = "https://spring.io/projects/spring-boot"; - license = licenses.asl20; - platforms = platforms.all; - maintainers = with maintainers; [ moaxcp ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 4837995d11a..66a2e36fa15 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -532,6 +532,7 @@ mapAliases ({ spice_gtk = spice-gtk; # added 2018-02-25 spice_protocol = spice-protocol; # added 2018-02-25 spidermonkey_52 = throw "spidermonkey_52 has been removed. Please use spidermonkey_60 instead."; # added 2019-10-16 + spring-boot = spring-boot-cli; # added 2020-04-24 sqlite3_analyzer = sqlite-analyzer; # added 2018-05-22 sqliteInteractive = sqlite-interactive; # added 2014-12-06 squid4 = squid; # added 2019-08-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e5c9d3d0f68..8af1e473bff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16094,7 +16094,7 @@ in spawn_fcgi = callPackage ../servers/http/spawn-fcgi { }; - spring-boot = callPackage ../development/tools/spring-boot { }; + spring-boot-cli = callPackage ../development/tools/spring-boot-cli { }; squid = callPackage ../servers/squid { }; -- cgit v1.2.3 From 65f85b6efbe03cd02ff7771707d6b3eb6889e7e2 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Thu, 30 Apr 2020 21:18:07 -0700 Subject: asmfmt: do not include gofmt/goimports/goreturns --- pkgs/development/tools/asmfmt/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/asmfmt/default.nix b/pkgs/development/tools/asmfmt/default.nix index 9794180eec1..db628e6b902 100644 --- a/pkgs/development/tools/asmfmt/default.nix +++ b/pkgs/development/tools/asmfmt/default.nix @@ -27,6 +27,10 @@ buildGoPackage rec { goDeps = ./deps.nix; + # This package comes with its own version of goimports, gofmt and goreturns + # but these binaries are outdated and are offered by other packages. + subPackages = [ "cmd/asmfmt" ]; + meta = with lib; { description = "Go Assembler Formatter"; homepage = "https://github.com/klauspost/asmfmt"; -- cgit v1.2.3 From cb91e0c667b67390aa307c6e157a3f33bfb7a886 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Thu, 30 Apr 2020 21:24:02 -0700 Subject: asmfmt: 1.1 -> 1.2.1 --- pkgs/development/tools/asmfmt/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/tools/asmfmt/default.nix b/pkgs/development/tools/asmfmt/default.nix index db628e6b902..c93b864b70f 100644 --- a/pkgs/development/tools/asmfmt/default.nix +++ b/pkgs/development/tools/asmfmt/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "asmfmt"; - version = "1.1"; + version = "1.2.1"; goPackagePath = "github.com/klauspost/asmfmt"; @@ -14,17 +14,9 @@ buildGoPackage rec { owner = "klauspost"; repo = "asmfmt"; rev = "v${version}"; - sha256 = "08mybfizcvck460axakycz9ndzcgwqilp5mmgm4bl8hfrn36mskw"; + sha256 = "0qwxb4yx12yl817vgbhs7acaj98lgk27dh50mb8sm9ccw1f43h9i"; }; - patches = [ - (fetchpatch { - excludes = ["README.md"]; - url = "https://github.com/klauspost/asmfmt/commit/39a37c8aed8095e0fdfb07f78fc8acbd465d9627.patch"; - sha256 = "18bc77l87mf0yvqc3adlakxz6wflyqfsc2wrmh9q0nlqghlmnw5k"; - }) - ]; - goDeps = ./deps.nix; # This package comes with its own version of goimports, gofmt and goreturns -- cgit v1.2.3 From 013501676c3e14d807d58df7dcfe3f34b059e4b1 Mon Sep 17 00:00:00 2001 From: Steve Purcell Date: Thu, 30 Apr 2020 16:43:11 +1200 Subject: jackett: build selectively for aarch64 The previous derivation would use the upstream x86_64 binary on ARM64, causing binary format compatibility issues at runtime. --- pkgs/servers/jackett/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 1b01ffe5d69..7e268316db6 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -4,10 +4,16 @@ stdenv.mkDerivation rec { pname = "jackett"; version = "0.14.365"; - src = fetchurl { - url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.LinuxAMDx64.tar.gz"; - sha256 = "0xvlknjhc75km12d8li50ifqpfyl6whymb6gd7ccwyd9lv9xxm27"; - }; + src = { + x86_64-linux = fetchurl { + url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.LinuxAMDx64.tar.gz"; + sha512 = "28dgaap4aj1ldcfr0lzgz2aq1lbk8vlgbmjwfg4m4s4rlmiadw6wkxy9w7h4fq7gqbj51q8xxqz6y50jfzn124bs9wgi8br4lk3hsw3"; + }; + aarch64-linux = fetchurl { + url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.LinuxARM64.tar.gz"; + sha512 = "0kv95yg775lq7lgc4b75rdqfsyzfcj2a1bj0cmhzpjk4sbsg3jayqgjzbhl5h79r9si1y8b7lg8ffl2j83rwap8wyq1dqdjls4savfb"; + }; + }."${stdenv.targetPlatform.system}" or (throw "Missing hash for host system: ${stdenv.targetPlatform.system}"); buildInputs = [ makeWrapper ]; @@ -35,6 +41,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Jackett/Jackett/"; license = licenses.gpl2; maintainers = with maintainers; [ edwtjo nyanloutre ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } -- cgit v1.2.3 From c10f382b097c7d1b38450c12b79850d099a21cb2 Mon Sep 17 00:00:00 2001 From: Steve Purcell Date: Thu, 30 Apr 2020 22:30:17 +1200 Subject: jackett: 0.14.365 -> 0.16.175 --- pkgs/servers/jackett/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 7e268316db6..aaa762836bd 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.14.365"; + version = "0.16.175"; src = { x86_64-linux = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.LinuxAMDx64.tar.gz"; - sha512 = "28dgaap4aj1ldcfr0lzgz2aq1lbk8vlgbmjwfg4m4s4rlmiadw6wkxy9w7h4fq7gqbj51q8xxqz6y50jfzn124bs9wgi8br4lk3hsw3"; + sha512 = "269n84qc8sfrmnidgrjywanbqr65mhkmk24dlqfi17pi0l27wi4fc4qmnjj683xwprz5hqjsmkqf963pbx4k3jaz0rp0jnizan91wij"; }; aarch64-linux = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.LinuxARM64.tar.gz"; - sha512 = "0kv95yg775lq7lgc4b75rdqfsyzfcj2a1bj0cmhzpjk4sbsg3jayqgjzbhl5h79r9si1y8b7lg8ffl2j83rwap8wyq1dqdjls4savfb"; + sha512 = "0dmyhprd2vi2z9q5g79psqgsc3w0zdac4s6k20rngi8jxm5jgphzrzcic4rgdijyryap99my619k447w701a08vh9sfcfk0fjg9pgwb"; }; }."${stdenv.targetPlatform.system}" or (throw "Missing hash for host system: ${stdenv.targetPlatform.system}"); -- cgit v1.2.3 From f44cb4697bbe4b39559a2c5997d64d5e3524310f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 1 May 2020 00:00:00 -0500 Subject: vault: 1.4.0 -> 1.4.1 --- pkgs/tools/security/vault/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index ae46bbae40a..0520db1ff8c 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "vault"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "13ycg9shara4ycbi79wj28z6nimnsqgisbf35ca3q9w066ac0ja2"; + sha256 = "0fbbvihvlzh95rrk65bwxfcam6y57q0yffq8dzvcbm3i0ap7ndar"; }; goPackagePath = "github.com/hashicorp/vault"; -- cgit v1.2.3 From 170f301990294be54b88ba88bf11e7ad852946eb Mon Sep 17 00:00:00 2001 From: Dmitry Olyenyov Date: Fri, 1 May 2020 09:15:46 +0300 Subject: emacspeak: init at 51.0 (#73957) --- .../editors/emacs-modes/emacspeak/default.nix | 43 ++++++++++++++++++++++ .../editors/emacs-modes/manual-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/emacspeak/default.nix diff --git a/pkgs/applications/editors/emacs-modes/emacspeak/default.nix b/pkgs/applications/editors/emacs-modes/emacspeak/default.nix new file mode 100644 index 00000000000..5bc8bbc6a90 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/emacspeak/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, makeWrapper, emacs, tcl, tclx, espeak-ng }: + +stdenv.mkDerivation rec { + pname = "emacspeak"; + version = "51.0"; + + + src = fetchurl { + url = "https://github.com/tvraman/emacspeak/releases/download/${version}/${pname}-${version}.tar.bz2"; + sha256 = "09a0ywxlqa8jmc0wmvhaf7bdydnkyhy9nqfsdqcpbsgdzj6qpg90"; + }; + + nativeBuildInputs = [ makeWrapper emacs ]; + buildInputs = [ tcl tclx espeak-ng ]; + + preConfigure = '' + make config + ''; + + postBuild = '' + make -C servers/native-espeak PREFIX=$out "TCL_INCLUDE=${tcl}/include" + ''; + + postInstall = '' + make -C servers/native-espeak PREFIX=$out install + local d=$out/share/emacs/site-lisp/emacspeak/ + install -d -- "$d" + cp -a . "$d" + find "$d" \( -type d -or \( -type f -executable \) \) -execdir chmod 755 {} + + find "$d" -type f -not -executable -execdir chmod 644 {} + + makeWrapper ${emacs}/bin/emacs $out/bin/emacspeak \ + --set DTK_PROGRAM "${espeak-ng}/bin/espeak" \ + --add-flags '-l "${placeholder "out"}/share/emacs/site-lisp/emacspeak/lisp/emacspeak-setup.elc"' + ''; + + meta = with stdenv.lib; { + homepage = https://github.com/tvraman/emacspeak/; + description = "Emacs extension that provides spoken output"; + license = licenses.gpl2; + maintainers = [ dema ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/manual-packages.nix b/pkgs/applications/editors/emacs-modes/manual-packages.nix index 4ca2d736e65..313a21995e0 100644 --- a/pkgs/applications/editors/emacs-modes/manual-packages.nix +++ b/pkgs/applications/editors/emacs-modes/manual-packages.nix @@ -65,6 +65,8 @@ }; }; + emacspeak = callPackage ./emacspeak {}; + ess-R-object-popup = callPackage ./ess-R-object-popup { }; -- cgit v1.2.3 From 4ea28e76c23d0d7ebbdb3196a8cbd9089bef02de Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Thu, 30 Apr 2020 21:50:14 +0200 Subject: cups: 2.3.1 -> 2.3.3 https://github.com/apple/cups/releases/tag/v2.3.3 Fixes: https://nvd.nist.gov/vuln/detail/CVE-2019-8842 https://nvd.nist.gov/vuln/detail/CVE-2020-3898 --- pkgs/misc/cups/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index b16c0645cda..8736edd0e61 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { pname = "cups"; # After 2.2.6, CUPS requires headers only available in macOS 10.12+ - version = if stdenv.isDarwin then "2.2.6" else "2.3.1"; + version = if stdenv.isDarwin then "2.2.6" else "2.3.3"; passthru = { inherit version; }; @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { url = "https://github.com/apple/cups/releases/download/v${version}/cups-${version}-source.tar.gz"; sha256 = if version == "2.2.6" then "16qn41b84xz6khrr2pa2wdwlqxr29rrrkjfi618gbgdkq9w5ff20" - else "1kkpmj17205j8w9hdff2bfpk6lwdmr3gx0j4r35nhgvya24rvjhv"; + else "1vpk0b2vq830f8fvf9z8qjsm5k141i7pi8djbinpnr78pi4dj7r6"; }; outputs = [ "out" "lib" "dev" "man" ]; -- cgit v1.2.3 From fc6a4600f83bd1d3988a1d85d5b054bb023affdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Sun, 26 Apr 2020 17:17:39 +0200 Subject: llvm_6: mark as big-parallel LLVM builds frequently time out on hydra at least on AArch64. Marking big-parallel gives them more resources to finish quicker. --- pkgs/development/compilers/llvm/6/llvm.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/llvm/6/llvm.nix b/pkgs/development/compilers/llvm/6/llvm.nix index 9f3b5e5ba0d..22dbb75d2d5 100644 --- a/pkgs/development/compilers/llvm/6/llvm.nix +++ b/pkgs/development/compilers/llvm/6/llvm.nix @@ -147,6 +147,7 @@ stdenv.mkDerivation ({ enableParallelBuilding = true; + requiredSystemFeatures = [ "big-parallel" ]; meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = "https://llvm.org/"; -- cgit v1.2.3 From 8c880d943410e203985dbc05d0dbe19d494a684d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Sun, 26 Apr 2020 17:18:55 +0200 Subject: llvm_7: mark as big-parallel LLVM builds frequently time out on hydra at least on AArch64. Marking big-parallel gives them more resources to finish quicker. --- pkgs/development/compilers/llvm/7/llvm.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix index 55485418e4f..0a85d862f20 100644 --- a/pkgs/development/compilers/llvm/7/llvm.nix +++ b/pkgs/development/compilers/llvm/7/llvm.nix @@ -168,6 +168,7 @@ in stdenv.mkDerivation ({ enableParallelBuilding = true; + requiredSystemFeatures = [ "big-parallel" ]; meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = "https://llvm.org/"; -- cgit v1.2.3 From 4b3c3e10a6245e551bf0862eaf7d0543367807c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Sun, 26 Apr 2020 17:19:12 +0200 Subject: llvm_8: mark as big-parallel LLVM builds frequently time out on hydra at least on AArch64. Marking big-parallel gives them more resources to finish quicker. --- pkgs/development/compilers/llvm/8/llvm.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/llvm/8/llvm.nix b/pkgs/development/compilers/llvm/8/llvm.nix index 43615fc675d..61ed24ba842 100644 --- a/pkgs/development/compilers/llvm/8/llvm.nix +++ b/pkgs/development/compilers/llvm/8/llvm.nix @@ -143,6 +143,7 @@ in stdenv.mkDerivation ({ enableParallelBuilding = true; + requiredSystemFeatures = [ "big-parallel" ]; meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = "https://llvm.org/"; -- cgit v1.2.3 From 7c27e8749d193061f95befc15def3d766a6ff484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Sun, 26 Apr 2020 17:19:31 +0200 Subject: llvm_9: mark as big-parallel LLVM builds frequently time out on hydra at least on AArch64. Marking big-parallel gives them more resources to finish quicker. --- pkgs/development/compilers/llvm/9/llvm.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/llvm/9/llvm.nix b/pkgs/development/compilers/llvm/9/llvm.nix index f69f45b858b..0344caa5e8a 100644 --- a/pkgs/development/compilers/llvm/9/llvm.nix +++ b/pkgs/development/compilers/llvm/9/llvm.nix @@ -160,6 +160,7 @@ in stdenv.mkDerivation (rec { enableParallelBuilding = true; + requiredSystemFeatures = [ "big-parallel" ]; meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = "https://llvm.org/"; -- cgit v1.2.3 From ed2ac0dcfaa5ed5028bce88d7ff47c4e1af4345b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Tue, 28 Apr 2020 10:51:04 +0200 Subject: llvm_10: mark as big-parallel LLVM builds frequently time out on hydra at least on AArch64. Marking big-parallel gives them more resources to finish quicker. --- pkgs/development/compilers/llvm/10/llvm.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/llvm/10/llvm.nix b/pkgs/development/compilers/llvm/10/llvm.nix index 648c9fdefc3..82e4605a2f5 100644 --- a/pkgs/development/compilers/llvm/10/llvm.nix +++ b/pkgs/development/compilers/llvm/10/llvm.nix @@ -159,6 +159,7 @@ in stdenv.mkDerivation (rec { enableParallelBuilding = true; + requiredSystemFeatures = [ "big-parallel" ]; meta = { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = "https://llvm.org/"; -- cgit v1.2.3 From 90c503237a242aaa043cd1b3ddbb81c92a36a9ae Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Thu, 30 Apr 2020 18:21:03 -0700 Subject: libvorbis: fix 404'ing patch Also use full commit for the other patch, just in case there's ever a collision, as unlikely as that may be. --- pkgs/development/libraries/libvorbis/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix index c867b73c317..28c5536d626 100644 --- a/pkgs/development/libraries/libvorbis/default.nix +++ b/pkgs/development/libraries/libvorbis/default.nix @@ -12,12 +12,12 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { - url = "https://gitlab.xiph.org/xiph/vorbis/uploads/a68cf70fa10c8081a633f77b5c6576b7/0001-CVE-2017-14160-make-sure-we-don-t-overflow.patch"; - sha256 = "0v21p59cb3z77ch1v6q5dcrd733h91f3m8ifnd7kkkr8gzn17d5x"; + url = "https://gitlab.xiph.org/xiph/vorbis/commit/018ca26dece618457dd13585cad52941193c4a25.patch"; + sha256 = "18k4vp0nmrxxpis641ylnw6dgwxrymh5bf74njr6v8dizmmz1bkj"; name = "CVE-2017-14160+CVE-2018-10393.patch"; }) (fetchpatch { - url = "https://gitlab.xiph.org/xiph/vorbis/commit/112d3bd0aaa.diff"; + url = "https://gitlab.xiph.org/xiph/vorbis/commit/112d3bd0aaacad51305e1464d4b381dabad0e88b.diff"; sha256 = "1k77y3q36npy8mkkz40f6cb46l2ldrwyrd191m29s8rnbhnafdf7"; name = "CVE-2018-10392.patch"; }) -- cgit v1.2.3 From 2e9c802cee80e28c1c582cc870a64ad7c389532d Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Thu, 30 Apr 2020 19:57:49 +0200 Subject: re2c: 1.2.1 -> 1.3 --- pkgs/development/tools/parsing/re2c/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix index dddd407d0da..11c46e781d0 100644 --- a/pkgs/development/tools/parsing/re2c/default.nix +++ b/pkgs/development/tools/parsing/re2c/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "re2c"; - version = "1.2.1"; + version = "1.3"; src = fetchFromGitHub { owner = "skvadrik"; repo = "re2c"; rev = version; - sha256 = "1qj0ck9msb9h8g9qb1lr57jmlj8x68ini3y3ccdifjjahhhr0hd4"; + sha256 = "0aqlf2h6i2m3dq11dkq89p4w4c9kp4x66s5rhp84gmpz5xqv1x5h"; }; nativeBuildInputs = [ autoreconfHook ]; -- cgit v1.2.3 From 7263c895edaa502348eb645bf3c339ea0de185f5 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Thu, 30 Apr 2020 19:57:55 +0200 Subject: re2c: add patch for CVE-2020-11958 https://nvd.nist.gov/vuln/detail/CVE-2020-11958 --- pkgs/development/tools/parsing/re2c/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/parsing/re2c/default.nix b/pkgs/development/tools/parsing/re2c/default.nix index 11c46e781d0..482beeff122 100644 --- a/pkgs/development/tools/parsing/re2c/default.nix +++ b/pkgs/development/tools/parsing/re2c/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook }: +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }: stdenv.mkDerivation rec { pname = "re2c"; @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { sha256 = "0aqlf2h6i2m3dq11dkq89p4w4c9kp4x66s5rhp84gmpz5xqv1x5h"; }; + patches = [ + (fetchpatch { + name = "CVE-2020-11958.patch"; + url = "https://github.com/skvadrik/re2c/commit/c4603ba5ce229db83a2a4fb93e6d4b4e3ec3776a.patch"; + sha256 = "1d95ahxk92g7k87sda9gxgmr3blyfzwd2y7h9jxj8zkd74knd9zh"; + }) + ]; + nativeBuildInputs = [ autoreconfHook ]; doCheck = true; -- cgit v1.2.3 From b6474577b04a86a27a555dafa676670fb3902ec8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 29 Apr 2020 15:43:45 +0100 Subject: python3.pkgs.certifi: 2019.11.28 -> 2020.4.5.1 --- pkgs/development/python-modules/certifi/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix index 04ae5a78bdb..94619956cff 100644 --- a/pkgs/development/python-modules/certifi/default.nix +++ b/pkgs/development/python-modules/certifi/default.nix @@ -5,13 +5,17 @@ buildPythonPackage rec { pname = "certifi"; - version = "2019.11.28"; + version = "2020.4.5.1"; src = fetchPypi { inherit pname version; - sha256 = "25b64c7da4cd7479594d035c08c2d809eb4aab3a26e5a990ea98cc450c320f1f"; + sha256 = "06b5gfs7wmmipln8f3z928d2mmx2j4b3x7pnqmj6cvmyfh8v7z2i"; }; + pythonImportsCheck = [ "certifi" ]; + + dontUseSetuptoolsCheck = true; + meta = { homepage = "https://certifi.io/"; description = "Python package for providing Mozilla's CA Bundle"; -- cgit v1.2.3 From 3fd0b28f55e71c00138b65f5c64b108e31c176f6 Mon Sep 17 00:00:00 2001 From: Chuck Date: Fri, 24 Apr 2020 17:09:48 -0700 Subject: gawk: 5.0.1 -> 5.1.0 --- pkgs/tools/text/gawk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix index 58dea610c39..73e2b8a6de4 100644 --- a/pkgs/tools/text/gawk/default.nix +++ b/pkgs/tools/text/gawk/default.nix @@ -19,11 +19,11 @@ let inherit (stdenv.lib) optional; in stdenv.mkDerivation rec { - name = "gawk-5.0.1"; + name = "gawk-5.1.0"; src = fetchurl { url = "mirror://gnu/gawk/${name}.tar.xz"; - sha256 = "15570p7g2x54asvr2fsc56sxzmm08fbk4mzpcs5n92fp9vq8cklf"; + sha256 = "1gc2cccqy1x1bf6rhwlmd8q7dz7gnam6nwgl38bxapv6qm5flpyg"; }; # When we do build separate interactive version, it makes sense to always include man. -- cgit v1.2.3 From 15cd0bd993a46dfca8223876735cd3fe1228956e Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 28 Apr 2020 16:17:32 +0200 Subject: openblas: 0.3.8 -> 0.3.9 --- pkgs/development/libraries/science/math/openblas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index f6a40204587..53c98046993 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -96,12 +96,12 @@ let in stdenv.mkDerivation rec { pname = "openblas"; - version = "0.3.8"; + version = "0.3.9"; src = fetchFromGitHub { owner = "xianyi"; repo = "OpenBLAS"; rev = "v${version}"; - sha256 = "0s017qqi4n6jzrxl9cyx625wj26smnyn5g8s699s7h8v1srlrw6p"; + sha256 = "0nq51j45shb32n6086xff3x374kx5qhr2cwjzvppx4s2z0ahflal"; }; inherit blas64; -- cgit v1.2.3 From 56de5bed5f1e8af8db7893fb3b456184bf1b63a2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Apr 2020 16:16:00 +0000 Subject: glew: 2.1.0 -> 2.2.0 --- pkgs/development/libraries/glew/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 8f237199a65..80a7759c574 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "glew-2.1.0"; + name = "glew-2.2.0"; src = fetchurl { url = "mirror://sourceforge/glew/${name}.tgz"; - sha256 = "159wk5dc0ykjbxvag5i1m2mhp23zkk6ra04l26y3jc3nwvkr3ph4"; + sha256 = "1qak8f7g1iswgswrgkzc7idk7jmqgwrs58fhg2ai007v7j4q5z6l"; }; outputs = [ "bin" "out" "dev" "doc" ]; -- cgit v1.2.3 From 92e1aeae573fa71fc3ae299e8905067eecdb9f06 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Apr 2020 12:00:53 +0000 Subject: felix: 5.6.1 -> 6.0.3 --- pkgs/servers/felix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/felix/default.nix b/pkgs/servers/felix/default.nix index 38dad5e6fe8..486474a46b0 100644 --- a/pkgs/servers/felix/default.nix +++ b/pkgs/servers/felix/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "apache-felix"; - version = "5.6.1"; + version = "6.0.3"; src = fetchurl { url = "mirror://apache/felix/org.apache.felix.main.distribution-${version}.tar.gz"; - sha256 = "0kis26iajzdid162j4i7g558q09x4hn9z7pqqys6ipb0fj84hz1x"; + sha256 = "1yk04q8rfbbabacbhmrsw5ywr96496x1cz4icdqimb1cfxixv1q0"; }; buildCommand = '' -- cgit v1.2.3 From 5e587fc8e817908a86d5ca0cf68c5b44188d3199 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 15 Apr 2020 10:27:55 +0000 Subject: vertcoind: 0.14.0 -> 0.15.0.1 --- pkgs/applications/blockchains/vertcoin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/vertcoin.nix b/pkgs/applications/blockchains/vertcoin.nix index 1b8b0376331..21104012f4d 100644 --- a/pkgs/applications/blockchains/vertcoin.nix +++ b/pkgs/applications/blockchains/vertcoin.nix @@ -19,7 +19,7 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "vertcoin"; - version = "0.14.0"; + version = "0.15.0.1"; name = pname + toString (optional (!withGui) "d") + "-" + version; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = pname + "-project"; repo = pname + "-core"; rev = version; - sha256 = "00vnmrhn5mad58dyiz8rxgsrn0663ii6fdbcqm20mv1l313k4882"; + sha256 = "09q7qicw52gv225hq6wlpsf4zr4hjc8miyim5cygi5nxxrlw7kd3"; }; nativeBuildInputs = [ -- cgit v1.2.3 From d092232a91a5012d3353f921c9a600afe34a46e1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 7 Apr 2020 11:54:43 +0000 Subject: qmidinet: 0.6.1 -> 0.6.2 --- pkgs/applications/audio/qmidinet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix index 10cbcb5d5b1..479a8a2bb04 100644 --- a/pkgs/applications/audio/qmidinet/default.nix +++ b/pkgs/applications/audio/qmidinet/default.nix @@ -1,12 +1,12 @@ { mkDerivation, lib, fetchurl, pkgconfig, qtbase, qttools, alsaLib, libjack2 }: mkDerivation rec { - version = "0.6.1"; + version = "0.6.2"; pname = "qmidinet"; src = fetchurl { url = "mirror://sourceforge/qmidinet/${pname}-${version}.tar.gz"; - sha256 = "1nvbvx3wg2s6s7r4x6m2pm9nx7pdz00ghw9h10wfqi2s474mwip0"; + sha256 = "0siqzyhwg3l9av7jbca3bqdww7xspjlpi9ya4mkj211xc3a3a1d6"; }; hardeningDisable = [ "format" ]; -- cgit v1.2.3 From 40886adad8f3509dac6098b75fe4ec851a1c4d6d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Apr 2020 12:39:05 +0000 Subject: eventstore: 5.0.7 -> 5.0.8 --- pkgs/servers/nosql/eventstore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix index d1f4938197c..239c6875c34 100644 --- a/pkgs/servers/nosql/eventstore/default.nix +++ b/pkgs/servers/nosql/eventstore/default.nix @@ -16,13 +16,13 @@ in stdenv.mkDerivation rec { pname = "EventStore"; - version = "5.0.7"; + version = "5.0.8"; src = fetchFromGitHub { owner = "EventStore"; repo = "EventStore"; rev = "oss-v${version}"; - sha256 = "0yvprql73g4lc88b6kp1kk8h64az2hn4am5hc4gyiaxfavaww3ci"; + sha256 = "021m610gzmrp2drywl1q3y6xxpy4qayn580d855ag952z9s6w9nj"; }; buildInputs = [ -- cgit v1.2.3 From 51b1533b378b724f2c6f14c1a220ecd2c497b38a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Apr 2020 06:21:39 +0000 Subject: suitesparse-graphblas: 3.2.1 -> 3.2.2 --- .../libraries/science/math/suitesparse-graphblas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix index 599c1be6646..5a2c28d3c02 100644 --- a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "suitesparse-graphblas"; - version = "3.2.1"; + version = "3.2.2"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "GraphBLAS"; rev = "v${version}"; - sha256 = "AAwwzrpKFHy40Ldm6hTO6L0FWPYwi3kJj3zrshFwYas="; + sha256 = "04hprrgj0f44ml2f0w4jfwgrvy8l2s6ya0c9xc8gwlbmkc7a4c62"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 73772f37c57011fa8972ec379c4c0ddcaed486a2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Apr 2020 11:40:55 +0000 Subject: collectd: 5.10.0 -> 5.11.0 --- pkgs/tools/system/collectd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index 9118fc55ea9..f625a441ba3 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -8,12 +8,12 @@ let plugins = callPackage ./plugins.nix args; in stdenv.mkDerivation rec { - version = "5.10.0"; + version = "5.11.0"; pname = "collectd"; src = fetchurl { url = "https://collectd.org/files/${pname}-${version}.tar.bz2"; - sha256 = "0nrpq09q6vbbv0hjc1vfa36z8j5802500hy75m678gh2cgsmjcx0"; + sha256 = "1cjxksxdqcqdccz1nbnc2fp6yy84qq361ynaq5q8bailds00mc9p"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; -- cgit v1.2.3 From 2bd71ff7211731333951b66330bf5a27c24e33d5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Apr 2020 12:31:53 +0000 Subject: duplicity: 0.8.11.1596 -> 0.8.12.1612 --- pkgs/tools/backup/duplicity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index e49d87c697c..8e4014eea9d 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -19,11 +19,11 @@ let in pythonPackages.buildPythonApplication rec { pname = "duplicity"; - version = "0.8.11.1596"; + version = "0.8.12.1612"; src = fetchurl { url = "https://code.launchpad.net/duplicity/${majorMinor version}-series/${majorMinorPatch version}/+download/duplicity-${version}.tar.gz"; - sha256 = "1qdaaybwdc13nfwnwrqij4lc23iwy73lyqn5lb4iznq6axp6m0h9"; + sha256 = "06n58pwqg6kfigckjlslz2kx1lsykz1kn9a0r1cl8r3kn93zhk07"; }; patches = [ -- cgit v1.2.3 From b385b215fab483ecf9c62f4ad827630910c810df Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 Apr 2020 19:25:43 +0000 Subject: libtirpc: 1.2.5 -> 1.2.6 --- pkgs/development/libraries/ti-rpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix index 8bc3c0a6e09..db434a5e62e 100644 --- a/pkgs/development/libraries/ti-rpc/default.nix +++ b/pkgs/development/libraries/ti-rpc/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, autoreconfHook, libkrb5 }: stdenv.mkDerivation rec { - name = "libtirpc-1.2.5"; + name = "libtirpc-1.2.6"; src = fetchurl { url = "mirror://sourceforge/libtirpc/${name}.tar.bz2"; - sha256 = "1jl6a5kkw2vrp4gb6pmvf72rqimywvwfb9f7iz2xjg4wgq63bdpk"; + sha256 = "1k6i6wma3xs7gmp54z587nd4yi5wrvg2ycl5g36zjnhx32jyjy22"; }; outputs = [ "out" "dev" ]; -- cgit v1.2.3 From 7333b8cd6d2f3d42fd6f8403add7a311459611ab Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 Apr 2020 09:01:13 +0000 Subject: eagle: 9.6.0 -> 9.6.1 --- pkgs/applications/science/electronics/eagle/eagle.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/eagle/eagle.nix b/pkgs/applications/science/electronics/eagle/eagle.nix index 7c5942d825a..58bdd5c722d 100644 --- a/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/pkgs/applications/science/electronics/eagle/eagle.nix @@ -13,11 +13,11 @@ let in mkDerivation rec { pname = "eagle"; - version = "9.6.0"; + version = "9.6.1"; src = fetchurl { url = "https://eagle-updates.circuits.io/downloads/${builtins.replaceStrings ["."] ["_"] version}/Autodesk_EAGLE_${version}_English_Linux_64bit.tar.gz"; - sha256 = "1crkyc7ws2zz5dfs00h6rj4z2hyqb97kp6r4hxhmcgg5647ij4z8"; + sha256 = "1iq4aahrh4g3549vbr7gka5y2h7f17n3yafzl21njc2mkqb12jdw"; }; desktopItem = makeDesktopItem { -- cgit v1.2.3 From 1825ecc5ede0b5e3caeec9a61e9bdfab7b4ec769 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 Apr 2020 09:14:15 +0000 Subject: c-blosc: 1.17.1 -> 1.18.1 --- pkgs/development/libraries/c-blosc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/c-blosc/default.nix b/pkgs/development/libraries/c-blosc/default.nix index d3bb3479911..85905778e80 100644 --- a/pkgs/development/libraries/c-blosc/default.nix +++ b/pkgs/development/libraries/c-blosc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "c-blosc"; - version = "1.17.1"; + version = "1.18.1"; src = fetchFromGitHub { owner = "Blosc"; repo = "c-blosc"; rev = "v${version}"; - sha256 = "1asp3xmbvdnz1mj1pl1ykzz61cybvkxz3cdn43zh1z0x1qlgwm80"; + sha256 = "1ywq8j70149859vvs19wgjq89d6xsvvmvm2n1dmkzpchxgrvnw70"; }; buildInputs = [ cmake ]; -- cgit v1.2.3 From 7ad2de54d7248d7d27f716dbb03aa283a9690a88 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 22 Mar 2020 20:37:18 +0000 Subject: libmwaw: 0.3.15 -> 0.3.16 --- pkgs/development/libraries/libmwaw/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libmwaw/default.nix b/pkgs/development/libraries/libmwaw/default.nix index a7e52376e3f..fbba02fcd0c 100644 --- a/pkgs/development/libraries/libmwaw/default.nix +++ b/pkgs/development/libraries/libmwaw/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="libmwaw"; - version="0.3.15"; + version="0.3.16"; name="${baseName}-${version}"; - hash="1cdhm9yhanyv3w4vr73zhgyynmkhhkp3dyld7m11jd2yy04vnh04"; - url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.15/libmwaw-0.3.15.tar.xz"; - sha256="1cdhm9yhanyv3w4vr73zhgyynmkhhkp3dyld7m11jd2yy04vnh04"; + hash="0s0qvrmxzs8wv4304p7zx9mrasglyaszafqrfmaxwyr9lpdrwqqc"; + url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.16/libmwaw-0.3.16.tar.xz"; + sha256="0s0qvrmxzs8wv4304p7zx9mrasglyaszafqrfmaxwyr9lpdrwqqc"; }; nativeBuildInputs = [ pkgconfig ]; -- cgit v1.2.3 From ea18da4bc431240aaef756635688f4bfc30a1619 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 6 Mar 2020 22:25:59 +0000 Subject: mercurial: 5.3 -> 5.3.1 --- pkgs/applications/version-management/mercurial/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 85c54614748..ffbd9879135 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -8,11 +8,11 @@ let in python3Packages.buildPythonApplication rec { pname = "mercurial"; - version = "5.3"; + version = "5.3.1"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "1fgr8k2ra7hs2dm8048pw01anmd41as246a5vm4m2sb7dcfzczz5"; + sha256 = "1nbjpzjrzgql4hrvslpxwbcgn885ikq6ba1yb4w6p78rw9nzkhgp"; }; format = "other"; -- cgit v1.2.3 From a3f27a2720feab66b37c6b7ee0f23517cde544b6 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Thu, 30 Apr 2020 17:54:40 -0700 Subject: qimgv: 0.8.9 -> 0.9 https://github.com/easymodo/qimgv/compare/v0.8.9...v0.9 --- pkgs/applications/graphics/qimgv/default.nix | 17 +++++++++++++++-- pkgs/applications/graphics/qimgv/qt5-12-compat.diff | 13 +++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/graphics/qimgv/qt5-12-compat.diff diff --git a/pkgs/applications/graphics/qimgv/default.nix b/pkgs/applications/graphics/qimgv/default.nix index 2756d659edf..4bbf6aa31d3 100644 --- a/pkgs/applications/graphics/qimgv/default.nix +++ b/pkgs/applications/graphics/qimgv/default.nix @@ -1,12 +1,14 @@ { mkDerivation , lib , fetchFromGitHub +, fetchpatch , cmake , pkgconfig , exiv2 , mpv +, opencv4 , qtbase , qtimageformats , qtsvg @@ -14,15 +16,25 @@ mkDerivation rec { pname = "qimgv"; - version = "0.8.9"; + version = "0.9"; src = fetchFromGitHub { owner = "easymodo"; repo = pname; rev = "v${version}"; - sha256 = "0cmya06j466v0pirhxbzbj1vbz0346y7rbc1gbv4n9xcp6c6bln6"; + sha256 = "1yynjk47gjf2kjfb0ak4blxpb5irgqc1k59z726lwjd6gvg689fl"; }; + patches = [ + # QtAtomicInt's `storeRelaxed` was introduced in Qt 5.14, while nixpkgs only + # has Qt 5.12. This appears to be the only instance of Qt 5.12 + # incompatibility, and will be fixed in the next release. + (fetchpatch { + url = "https://github.com/easymodo/qimgv/commit/a39d6086ceb9445d2c16943e0719096a99920bf8.patch"; + sha256 = "1z3ngv6i316hrdcdzig4jg6bcdbgfxjaxvm2jcfcw2dnfbfiq47s"; + }) + ]; + nativeBuildInputs = [ cmake pkgconfig @@ -31,6 +43,7 @@ mkDerivation rec { buildInputs = [ exiv2 mpv + opencv4 qtbase qtimageformats qtsvg diff --git a/pkgs/applications/graphics/qimgv/qt5-12-compat.diff b/pkgs/applications/graphics/qimgv/qt5-12-compat.diff new file mode 100644 index 00000000000..da64759e22d --- /dev/null +++ b/pkgs/applications/graphics/qimgv/qt5-12-compat.diff @@ -0,0 +1,13 @@ +diff --git a/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp b/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp +index 96ec9d3..6d95d08 100644 +--- a/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp ++++ b/qimgv/components/directorymanager/watchers/linux/linuxworker.cpp +@@ -21,7 +21,7 @@ void LinuxWorker::setDescriptor(int desc) { + + void LinuxWorker::run() { + emit started(); +- isRunning.storeRelaxed(true); ++ isRunning.store(true); + + if (fd == -1) { + qDebug() << TAG << "File descriptor isn't set! Stopping"; -- cgit v1.2.3 From 95b6a6d5fd3139d65a04fc22b693dc53e29e54ba Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Fri, 1 May 2020 00:20:52 +0200 Subject: clipit: 1.4.4 -> 1.4.5 --- pkgs/applications/misc/clipit/default.nix | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix index 82d6272aadc..02207fb9580 100644 --- a/pkgs/applications/misc/clipit/default.nix +++ b/pkgs/applications/misc/clipit/default.nix @@ -4,23 +4,15 @@ stdenv.mkDerivation rec { pname = "clipit"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { - owner = "shantzu"; + owner = "CristianHenzel"; repo = "ClipIt"; - rev = "v${version}"; - sha256 = "05xi29v2y0rvb33fmvrz7r9j4l858qj7ngwd7dp4pzpkkaybjln0"; + rev = "45e2ea386d04dbfc411ea370299502450d589d0c"; + sha256 = "0byqz9hanwmdc7i55xszdby2iqrk93lws7hmjda2kv17g34apwl7"; }; - patches = [ - # gtk3 support, can be removed in the next release - (fetchpatch { - url = "https://github.com/CristianHenzel/ClipIt/commit/22e012c7d406436e1785b6dd3c4c138b25f68431.patch"; - sha256 = "0la4gc324dzxpx6nk2lqg5fmjgjpm2pyvzwddmfz1il8hqvrqg3j"; - }) - ]; - preConfigure = '' intltoolize --copy --force --automake ''; @@ -38,5 +30,6 @@ stdenv.mkDerivation rec { inherit (src.meta) homepage; license = licenses.gpl3; platforms = platforms.linux; + maintainers = with maintainers; [ kamilchm ]; }; } -- cgit v1.2.3 From 21708823ffb4461fe9f831340ba38fcea1f9de1d Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Wed, 29 Apr 2020 13:34:26 +0300 Subject: tuir: 1.28.3 -> 1.29.0 --- pkgs/applications/misc/tuir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/tuir/default.nix b/pkgs/applications/misc/tuir/default.nix index e479dc26f17..11bf70cb56b 100644 --- a/pkgs/applications/misc/tuir/default.nix +++ b/pkgs/applications/misc/tuir/default.nix @@ -3,13 +3,13 @@ with python3Packages; buildPythonApplication rec { pname = "tuir"; - version = "1.28.3"; + version = "1.29.0"; src = fetchFromGitLab { owner = "ajak"; repo = pname; rev = "v${version}"; - sha256 = "0nhpbb0vdngwb0fhlimjgm3wq2s67m4rb3vv920zyllnmfplk0lk"; + sha256 = "1fqp6bvq8kzdsf3nna4mn1phdcixpx76bya43xrivxjbzsfl59ib"; }; # Tests try to access network -- cgit v1.2.3 From ced27b2a587c92d6a1fd9b2be2aa8ecfde9dbc34 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Wed, 29 Apr 2020 13:14:05 +0300 Subject: fselect: 0.6.9 -> 0.6.10 --- pkgs/tools/misc/fselect/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fselect/default.nix b/pkgs/tools/misc/fselect/default.nix index e508eb02ad0..d979e1e1a00 100644 --- a/pkgs/tools/misc/fselect/default.nix +++ b/pkgs/tools/misc/fselect/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fselect"; - version = "0.6.9"; + version = "0.6.10"; src = fetchFromGitHub { owner = "jhspetersson"; repo = "fselect"; rev = version; - sha256 = "0cgzvzdsy8vbiapgk1l5dp48c3kq0xmx53yfi486mx8nwvz3ksc0"; + sha256 = "17dz0qj2981plvzp72yisyrjnyz1sy3pqyvhx76ws2754vjgq4ra"; }; - cargoSha256 = "0mjd9nmaggsszf0kx68yrvy3fqbn35v34c7q3584fv50ipqn6drb"; + cargoSha256 = "19b05gx717xjg4arn4zgrqh7ckzgzx0ygg9gkfzsg7phz7f01626"; nativeBuildInputs = [ installShellFiles ]; -- cgit v1.2.3 From ae5c4ed886e13daec7f8ee90cd1d3a72102c4d8a Mon Sep 17 00:00:00 2001 From: squalus Date: Tue, 28 Apr 2020 15:40:08 -0700 Subject: ungoogled-chromium: 81.0.4044.92-2 -> 81.0.4044.122-2 --- .../browsers/ungoogled-chromium/common.nix | 17 +++-- .../browsers/ungoogled-chromium/default.nix | 24 +++++-- .../patches/enable-vdpau-support-for-nvidia.patch | 74 ++++++++++++++++++++++ .../enable-video-acceleration-on-linux.patch | 48 ++++++++++++++ .../ungoogled-chromium/patches/vaapi-fix.patch | 74 ---------------------- .../browsers/ungoogled-chromium/plugins.nix | 4 +- .../browsers/ungoogled-chromium/ungoogled-src.nix | 6 +- .../browsers/ungoogled-chromium/upstream-info.nix | 18 +++--- 8 files changed, 164 insertions(+), 101 deletions(-) create mode 100644 pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-vdpau-support-for-nvidia.patch create mode 100644 pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-video-acceleration-on-linux.patch delete mode 100644 pkgs/applications/networking/browsers/ungoogled-chromium/patches/vaapi-fix.patch diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix index d07da2b3b07..25ee5462b29 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix @@ -24,8 +24,13 @@ , libdrm ? null, wayland ? null, mesa_drivers ? null, libxkbcommon ? null # useOzone # package customization -, useVaapi ? false , useOzone ? false +, useVaapi ? !(useOzone || stdenv.isAarch64) # Built if supported, but disabled in the wrapper +# VA-API TODOs: +# - Ozone: M81 fails to build due to "ozone_platform_gbm = false" +# - Possible solutions: Write a patch to fix the build (wrong gn dependencies) +# or build with minigbm +# - AArch64: Causes serious regressions (https://github.com/NixOS/nixpkgs/pull/85253#issuecomment-614405879) , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false, libgnome-keyring3 ? null , proprietaryCodecs ? true @@ -134,10 +139,10 @@ let libXScrnSaver libXcursor libXtst libGLU libGL pciutils protobuf speechd libXdamage at-spi2-core jre - ] ++ optional gnomeKeyringSupport libgnome-keyring3 + ] ++ optional useVaapi libva + ++ optional gnomeKeyringSupport libgnome-keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optionals cupsSupport [ libgcrypt cups ] - ++ optional useVaapi libva ++ optional pulseSupport libpulseaudio ++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ]; @@ -156,9 +161,9 @@ let # # ++ optionals (channel == "dev") [ ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" ) ] # ++ optional (versionRange "68" "72") ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" ) - ] ++ optionals (useVaapi) ([ - # source: https://aur.archlinux.org/cgit/aur.git/tree/vaapi-fix.patch?h=chromium-vaapi - ./patches/vaapi-fix.patch + ] ++ optionals (useVaapi) ([ # Fixes for the VA-API build: + ./patches/enable-vdpau-support-for-nvidia.patch # https://aur.archlinux.org/cgit/aur.git/tree/vdpau-support.patch?h=chromium-vaapi + ./patches/enable-video-acceleration-on-linux.patch # Can be controlled at runtime (i.e. without rebuilding Chromium) ] ++ optionals (versionRange "81" "82") [ (githubPatch "5b2ff215473e0526b5b24aeff4ad90d369b21c75" "0n00vh8wfpn2ay5fqsxcsx0zadnv7mihm72bcvnrfzh75nzbg902") (githubPatch "98e343ab369e4262511b5fce547728e3e5eefba8" "00wwp653jk0k0yvix00vr7ymgck9dj7fxjwx4nc67ynn84dh6064") diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix index f172e7c09ce..9d6c7fada70 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix @@ -6,14 +6,16 @@ , lib # package customization +# Note: enable* flags should not require full rebuilds (i.e. only affect the wrapper) , channel ? "stable" , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false , proprietaryCodecs ? true , enablePepperFlash ? false , enableWideVine ? false +, useVaapi ? false # Deprecated, use enableVaapi instead! +, enableVaapi ? false # Disabled by default due to unofficial support and issues on radeon , ungoogled ? true -, useVaapi ? false # test video on radeon, before enabling this , useOzone ? false , cupsSupport ? true , pulseSupport ? config.pulseaudio or stdenv.isLinux @@ -21,7 +23,7 @@ }: let - llvmPackages = if channel == "dev" + llvmPackages = if channel != "stable" then llvmPackages_10 else llvmPackages_9; stdenv = llvmPackages.stdenv; @@ -34,9 +36,10 @@ let upstream-info = (callPackage ./update.nix {}).getChannel channel; mkChromiumDerivation = callPackage ./common.nix ({ - inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useVaapi useOzone ungoogled; + inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useOzone; + inherit ungoogled; gnChromium = gn; - } // lib.optionalAttrs (channel == "dev") { + } // lib.optionalAttrs (channel != "stable") { # TODO: Remove after we can update gn for the stable channel (backward incompatible changes): gnChromium = gn.overrideAttrs (oldAttrs: { version = "2020-03-23"; @@ -130,6 +133,14 @@ let cp -a ${widevineCdm}/WidevineCdm $out/libexec/chromium/ '' else browser; + + optionalVaapiFlags = if useVaapi # TODO: Remove after 20.09: + then throw '' + Chromium's useVaapi was replaced by enableVaapi and you don't need to pass + "--ignore-gpu-blacklist" anymore (also no rebuilds are required anymore). + '' else lib.optionalString + (!enableVaapi) + "--add-flags --disable-accelerated-video-decode --add-flags --disable-accelerated-video-encode"; in stdenv.mkDerivation { name = "chromium${suffix}-${version}"; inherit version; @@ -149,15 +160,14 @@ in stdenv.mkDerivation { buildCommand = let browserBinary = "${chromiumWV}/libexec/chromium/chromium"; getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")"; - libPath = stdenv.lib.makeLibraryPath ([] - ++ stdenv.lib.optional useVaapi libva - ); + libPath = stdenv.lib.makeLibraryPath [ libva ]; in with stdenv.lib; '' mkdir -p "$out/bin" eval makeWrapper "${browserBinary}" "$out/bin/chromium" \ --add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} \ + ${optionalVaapiFlags} \ ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled} ed -v -s "$out/bin/chromium" << EOF diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-vdpau-support-for-nvidia.patch b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-vdpau-support-for-nvidia.patch new file mode 100644 index 00000000000..b5372d1a255 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-vdpau-support-for-nvidia.patch @@ -0,0 +1,74 @@ +--- a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc ++++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc +@@ -641,6 +641,7 @@ void VaapiVideoDecodeAccelerator::AssignPictureBuffers( + // |vpp_vaapi_wrapper_| for VaapiPicture to DownloadFromSurface() the VA's + // internal decoded frame. + if (buffer_allocation_mode_ != BufferAllocationMode::kNone && ++ buffer_allocation_mode_ != BufferAllocationMode::kWrapVdpau && + !vpp_vaapi_wrapper_) { + vpp_vaapi_wrapper_ = VaapiWrapper::Create( + VaapiWrapper::kVideoProcess, VAProfileNone, +@@ -665,7 +666,8 @@ void VaapiVideoDecodeAccelerator::AssignPictureBuffers( + PictureBuffer buffer = buffers[i]; + buffer.set_size(requested_pic_size_); + std::unique_ptr picture = vaapi_picture_factory_->Create( +- (buffer_allocation_mode_ == BufferAllocationMode::kNone) ++ ((buffer_allocation_mode_ == BufferAllocationMode::kNone) || ++ (buffer_allocation_mode_ == BufferAllocationMode::kWrapVdpau)) + ? vaapi_wrapper_ + : vpp_vaapi_wrapper_, + make_context_current_cb_, bind_image_cb_, buffer); +@@ -1093,6 +1095,12 @@ VaapiVideoDecodeAccelerator::GetSupportedProfiles() { + + VaapiVideoDecodeAccelerator::BufferAllocationMode + VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() { ++ // NVIDIA blobs use VDPAU ++ if (VaapiWrapper::GetImplementationType() == VAImplementation::kNVIDIAVDPAU) { ++ LOG(INFO) << "VA-API driver on VDPAU backend"; ++ return BufferAllocationMode::kWrapVdpau; ++ } ++ + // TODO(crbug.com/912295): Enable a better BufferAllocationMode for IMPORT + // |output_mode_| as well. + if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT) +@@ -1105,7 +1113,7 @@ VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() { + // depends on the bitstream and sometimes it's not enough to cover the amount + // of frames needed by the client pipeline (see b/133733739). + // TODO(crbug.com/911754): Enable for VP9 Profile 2. +- if (IsGeminiLakeOrLater() && ++ if (false && IsGeminiLakeOrLater() && + (profile_ == VP9PROFILE_PROFILE0 || profile_ == VP8PROFILE_ANY)) { + // Add one to the reference frames for the one being currently egressed, and + // an extra allocation for both |client_| and |decoder_|, see +--- a/media/gpu/vaapi/vaapi_video_decode_accelerator.h ++++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.h +@@ -204,6 +204,7 @@ class MEDIA_GPU_EXPORT VaapiVideoDecodeAccelerator + // Using |client_|s provided PictureBuffers and as many internally + // allocated. + kNormal, ++ kWrapVdpau, + }; + + // Decides the concrete buffer allocation mode, depending on the hardware +--- a/media/gpu/vaapi/vaapi_wrapper.cc ++++ b/media/gpu/vaapi/vaapi_wrapper.cc +@@ -131,6 +131,9 @@ media::VAImplementation VendorStringToImplementationType( + } else if (base::StartsWith(va_vendor_string, "Intel iHD driver", + base::CompareCase::SENSITIVE)) { + return media::VAImplementation::kIntelIHD; ++ } else if (base::StartsWith(va_vendor_string, "Splitted-Desktop Systems VDPAU", ++ base::CompareCase::SENSITIVE)) { ++ return media::VAImplementation::kNVIDIAVDPAU; + } + return media::VAImplementation::kOther; + } +--- a/media/gpu/vaapi/vaapi_wrapper.h ++++ b/media/gpu/vaapi/vaapi_wrapper.h +@@ -79,6 +79,7 @@ enum class VAImplementation { + kIntelIHD, + kOther, + kInvalid, ++ kNVIDIAVDPAU, + }; + + // This class handles VA-API calls and ensures proper locking of VA-API calls diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-video-acceleration-on-linux.patch b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-video-acceleration-on-linux.patch new file mode 100644 index 00000000000..bd278633f67 --- /dev/null +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-video-acceleration-on-linux.patch @@ -0,0 +1,48 @@ +From b2144fd28e09cd52e7a88a62a9d9b54cf9922f9f Mon Sep 17 00:00:00 2001 +From: Michael Weiss +Date: Tue, 14 Apr 2020 14:16:10 +0200 +Subject: [PATCH] Enable accelerated video decode on Linux + +This will enable accelerated video decode on Linux by default (i.e. +without "--ignore-gpu-blacklist"), but on NixOS we'll provide +"--disable-accelerated-video-decode" and +"--disable-accelerated-video-encode" by default to avoid regressions +(e.g. VA-API doesn't work properly for some radeon drivers). + +Video acceleration can then be enabled via: +chromium.override { enableVaapi = true; } +without rebuilding Chromium. +--- + gpu/config/software_rendering_list.json | 16 ---------------- + 1 file changed, 16 deletions(-) + +diff --git a/gpu/config/software_rendering_list.json b/gpu/config/software_rendering_list.json +index 22712bdbf38f..a06dd19a50e4 100644 +--- a/gpu/config/software_rendering_list.json ++++ b/gpu/config/software_rendering_list.json +@@ -336,22 +336,6 @@ + ] + }, + { +- "id": 48, +- "description": "Accelerated video decode is unavailable on Linux", +- "cr_bugs": [137247, 1032907], +- "os": { +- "type": "linux" +- }, +- "exceptions": [ +- { +- "machine_model_name": ["Chromecast"] +- } +- ], +- "features": [ +- "accelerated_video_decode" +- ] +- }, +- { + "id": 50, + "description": "Disable VMware software renderer on older Mesa", + "cr_bugs": [145531, 332596, 571899, 629434], +-- +2.11.0 + diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/vaapi-fix.patch b/pkgs/applications/networking/browsers/ungoogled-chromium/patches/vaapi-fix.patch deleted file mode 100644 index b5372d1a255..00000000000 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/patches/vaapi-fix.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc -+++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc -@@ -641,6 +641,7 @@ void VaapiVideoDecodeAccelerator::AssignPictureBuffers( - // |vpp_vaapi_wrapper_| for VaapiPicture to DownloadFromSurface() the VA's - // internal decoded frame. - if (buffer_allocation_mode_ != BufferAllocationMode::kNone && -+ buffer_allocation_mode_ != BufferAllocationMode::kWrapVdpau && - !vpp_vaapi_wrapper_) { - vpp_vaapi_wrapper_ = VaapiWrapper::Create( - VaapiWrapper::kVideoProcess, VAProfileNone, -@@ -665,7 +666,8 @@ void VaapiVideoDecodeAccelerator::AssignPictureBuffers( - PictureBuffer buffer = buffers[i]; - buffer.set_size(requested_pic_size_); - std::unique_ptr picture = vaapi_picture_factory_->Create( -- (buffer_allocation_mode_ == BufferAllocationMode::kNone) -+ ((buffer_allocation_mode_ == BufferAllocationMode::kNone) || -+ (buffer_allocation_mode_ == BufferAllocationMode::kWrapVdpau)) - ? vaapi_wrapper_ - : vpp_vaapi_wrapper_, - make_context_current_cb_, bind_image_cb_, buffer); -@@ -1093,6 +1095,12 @@ VaapiVideoDecodeAccelerator::GetSupportedProfiles() { - - VaapiVideoDecodeAccelerator::BufferAllocationMode - VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() { -+ // NVIDIA blobs use VDPAU -+ if (VaapiWrapper::GetImplementationType() == VAImplementation::kNVIDIAVDPAU) { -+ LOG(INFO) << "VA-API driver on VDPAU backend"; -+ return BufferAllocationMode::kWrapVdpau; -+ } -+ - // TODO(crbug.com/912295): Enable a better BufferAllocationMode for IMPORT - // |output_mode_| as well. - if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT) -@@ -1105,7 +1113,7 @@ VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() { - // depends on the bitstream and sometimes it's not enough to cover the amount - // of frames needed by the client pipeline (see b/133733739). - // TODO(crbug.com/911754): Enable for VP9 Profile 2. -- if (IsGeminiLakeOrLater() && -+ if (false && IsGeminiLakeOrLater() && - (profile_ == VP9PROFILE_PROFILE0 || profile_ == VP8PROFILE_ANY)) { - // Add one to the reference frames for the one being currently egressed, and - // an extra allocation for both |client_| and |decoder_|, see ---- a/media/gpu/vaapi/vaapi_video_decode_accelerator.h -+++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.h -@@ -204,6 +204,7 @@ class MEDIA_GPU_EXPORT VaapiVideoDecodeAccelerator - // Using |client_|s provided PictureBuffers and as many internally - // allocated. - kNormal, -+ kWrapVdpau, - }; - - // Decides the concrete buffer allocation mode, depending on the hardware ---- a/media/gpu/vaapi/vaapi_wrapper.cc -+++ b/media/gpu/vaapi/vaapi_wrapper.cc -@@ -131,6 +131,9 @@ media::VAImplementation VendorStringToImplementationType( - } else if (base::StartsWith(va_vendor_string, "Intel iHD driver", - base::CompareCase::SENSITIVE)) { - return media::VAImplementation::kIntelIHD; -+ } else if (base::StartsWith(va_vendor_string, "Splitted-Desktop Systems VDPAU", -+ base::CompareCase::SENSITIVE)) { -+ return media::VAImplementation::kNVIDIAVDPAU; - } - return media::VAImplementation::kOther; - } ---- a/media/gpu/vaapi/vaapi_wrapper.h -+++ b/media/gpu/vaapi/vaapi_wrapper.h -@@ -79,6 +79,7 @@ enum class VAImplementation { - kIntelIHD, - kOther, - kInvalid, -+ kNVIDIAVDPAU, - }; - - // This class handles VA-API calls and ensures proper locking of VA-API calls diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix index 434bd77b6d1..1dd9baa628a 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/plugins.nix @@ -45,11 +45,11 @@ let flash = stdenv.mkDerivation rec { pname = "flashplayer-ppapi"; - version = "32.0.0.344"; + version = "32.0.0.363"; src = fetchzip { url = "https://fpdownload.adobe.com/pub/flashplayer/pdc/${version}/flash_player_ppapi_linux.x86_64.tar.gz"; - sha256 = "05ijlgsby9zxx0qs6f3vav1z0p6xr1cg6idl4akxvfmsl6hn6hkq"; + sha256 = "0znk8an892mykgbz56hyv3gz65vc9mhb3vn96c6bsvicwl1fn460"; stripRoot = false; }; diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix index 9b5c76f5342..f6f3c06e937 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix @@ -1,6 +1,6 @@ { - "81.0.4044.92" = { - rev = "81.0.4044.92-2"; - sha256 = "071a33idn2zcix6z8skn7y85mhb9w5s0bh0fvrjm269y7cmjrh3l"; + "81.0.4044.122" = { + rev = "81.0.4044.122-2"; + sha256 = "0bbr4a2gkgm3ykdgpj8x58sd3dwam6qkifhzfs2997681g7b2v2q"; }; } diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.nix index c5f9d60122d..77505b47d85 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "0i0szd749ihb08rxnsmsbxq75b6x952wpk94jwc0ncv6gb83zkx2"; - sha256bin64 = "1y70kmfz9nv507b0zdda7zfk2ac9qh9m2gq00aphdmzd0al7skj8"; - version = "81.0.4044.92"; + sha256 = "1s16wl101yabq0l7w0q50lxkr2gn090pcaj6l5sj6g5xvi9lhgbf"; + sha256bin64 = "0k6fsqlpiwp9vds83hb3cg9xf74hqgbfdm3ijyad2rmwc5rqk0ax"; + version = "83.0.4103.14"; }; dev = { - sha256 = "1rydvjmv62zj95sf0fgsyipqz2hphbxm60y8q0813wq9ym35d4yy"; - sha256bin64 = "1m6740lw7xjjp1lplwp9ii4d3l7dfa9jrv5bysm4ar5pb9kywrai"; - version = "83.0.4100.3"; + sha256 = "0djppzwzpfyyfjb1mhy5wws2379m3wpzyk2x3kw5nd0mdz35hbny"; + sha256bin64 = "1wg55qhfvd5zvigjl6496za81mh9b2c5da53zy07bk8wj91ly8pf"; + version = "84.0.4115.5"; }; stable = { - sha256 = "0i0szd749ihb08rxnsmsbxq75b6x952wpk94jwc0ncv6gb83zkx2"; - sha256bin64 = "1ig899cpahw1xfhdff5xj6w4k8jja5smxvrcbw6b0jcjmawdrf72"; - version = "81.0.4044.92"; + sha256 = "0ahqh3vmzbpai4xwn7qybgw9phc8ssjdvfc7384mxqk9swqgv7qg"; + sha256bin64 = "0gpgim244594m35qwf625blwdqgjbp4qr846wq75a9a9zqwqs05w"; + version = "81.0.4044.122"; }; } -- cgit v1.2.3 From 7e48da8d72d5511fbcb96df5a5fd75e3dd09d0da Mon Sep 17 00:00:00 2001 From: Mat Marini Date: Tue, 28 Apr 2020 12:53:19 -0400 Subject: kubie: 0.7.3 -> 0.8.4 --- pkgs/development/tools/kubie/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix index c1fc313fbc1..2d7460b59af 100644 --- a/pkgs/development/tools/kubie/default.nix +++ b/pkgs/development/tools/kubie/default.nix @@ -4,16 +4,16 @@ with rustPlatform; buildRustPackage rec { pname = "kubie"; - version = "0.7.3"; + version = "0.8.4"; src = fetchFromGitHub { rev = "v${version}"; owner = "sbstp"; repo = "kubie"; - sha256 = "186h5fng16gwqhsy2nxswbrrxsx0ysqrb4pqznyygbiz5cd9bgxp"; + sha256 = "1f82xlhhxbjadjw609kr1kdm4n69c9mqjia4b3k505wjh7cc55n0"; }; - cargoSha256 = "1yllpi8dp1fy39z4zmhyf1hdjpl62vwh8b8qlj0g778qsdrm9p98"; + cargoSha256 = "0mish7wqwq5ynl98n6swdn5i6mg62aih5rfykbl3wx39b468n481"; meta = with stdenv.lib; { description = -- cgit v1.2.3 From 4b43216acc4833fde1e53f3c3372e935976233a5 Mon Sep 17 00:00:00 2001 From: Mat Marini Date: Tue, 28 Apr 2020 12:53:55 -0400 Subject: kubie: add bash completion --- pkgs/development/tools/kubie/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/tools/kubie/default.nix b/pkgs/development/tools/kubie/default.nix index 2d7460b59af..de45ff50c03 100644 --- a/pkgs/development/tools/kubie/default.nix +++ b/pkgs/development/tools/kubie/default.nix @@ -15,6 +15,11 @@ buildRustPackage rec { cargoSha256 = "0mish7wqwq5ynl98n6swdn5i6mg62aih5rfykbl3wx39b468n481"; + installPhase = '' + mkdir -p $out/share/bash-completion/completions + cp -v ${src}/completion/kubie.bash $out/share/bash-completion/completions/kubie + ''; + meta = with stdenv.lib; { description = "Shell independent context and namespace switcher for kubectl"; -- cgit v1.2.3 From 2cde8af5f51b5b26fa42c7208966974312bbfce4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 28 Apr 2020 11:09:59 +0200 Subject: sentencepiece: 0.1.85 -> 0.1.86 Changelog: https://github.com/google/sentencepiece/releases/tag/v0.1.86 --- pkgs/development/libraries/sentencepiece/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sentencepiece/default.nix b/pkgs/development/libraries/sentencepiece/default.nix index 1c74ced309d..52b39ddc25b 100644 --- a/pkgs/development/libraries/sentencepiece/default.nix +++ b/pkgs/development/libraries/sentencepiece/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sentencepiece"; - version = "0.1.85"; + version = "0.1.86"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "1ncvyw9ar0z7nd47cysxg5xrjm01y1shdlhp8l2pdpx059p3yx3w"; + sha256 = "0r4z5n3dx0bg1pm2kgfllyj65s7ljn2ny7i7c5bz618r7h8bax9p"; }; nativeBuildInputs = [ cmake ] ++ lib.optional withGPerfTools gperftools; -- cgit v1.2.3 From 839e958f14c00e0a89db8a57d1cd56ef83590989 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Tue, 28 Apr 2020 10:38:57 +0800 Subject: eksctl: 0.17.0 -> 0.18.0 --- pkgs/tools/admin/eksctl/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 6bdcedd97ae..9fec8ec9047 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,23 +2,22 @@ buildGoModule rec { pname = "eksctl"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "0ck096qfj4wp166bymvync8qyb0q2az86hckjk3hrzqdj8vwhrza"; + sha256 = "15dzivnndzsiw7g6qzccpk1hqb5amfn0zba1rzkvcslhl1y9gsfi"; }; - modSha256 = "024fqknv6f1zzcpxfl3c12d7ya7ynsyy7hf7zsnmpsnrksvbkfvc"; + modSha256 = "13gqvr1y1b2yi2iar0p8y9hpajgy5w9xp4az5n6b5xhzcbn19f2k"; subPackages = [ "cmd/eksctl" ]; buildFlags = [ "-tags netgo" "-tags release" ]; - postInstall = - '' + postInstall = '' mkdir -p "$out/share/"{bash-completion/completions,zsh/site-functions} $out/bin/eksctl completion bash > "$out/share/bash-completion/completions/eksctl" -- cgit v1.2.3 From 229cdf3d9948b58eee79d1cee81d14eedb3a157b Mon Sep 17 00:00:00 2001 From: Nathan van Doorn Date: Tue, 28 Apr 2020 00:03:56 +0100 Subject: metamath: 0.181 -> 0.182 Also includes a fix to the makefile that lets the autoconf stuff Just Work(tm) --- pkgs/development/interpreters/metamath/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/development/interpreters/metamath/default.nix index 680e4106695..66352cfdda4 100644 --- a/pkgs/development/interpreters/metamath/default.nix +++ b/pkgs/development/interpreters/metamath/default.nix @@ -2,23 +2,17 @@ stdenv.mkDerivation { pname = "metamath"; - version = "0.181"; + version = "0.182"; buildInputs = [ autoreconfHook ]; src = fetchFromGitHub { owner = "metamath"; repo = "metamath-exe"; - rev = "67cbfa8468deb6f8ad5bedafc6399bee59064764"; - sha256 = "1mk3g41qz26j38j68i9qmnl8khkd8jwrzj4vxkb855h4b819s000"; + rev = "5df616efe4119ff88daf77e7041d45b6fa39c578"; + sha256 = "0amjdgy42c7jypf6sz98iczlxcyl9bqx67ws1q8w2zdqk2izsyjp"; }; - # the files necessary to build the DATA target are not in this distribution - # luckily, they're not really needed so we don't build it. - makeFlags = [ "DATA=" ]; - - installTargets = [ "install-exec" ]; - meta = with stdenv.lib; { description = "Interpreter for the metamath proof language"; longDescription = '' -- cgit v1.2.3 From e16494a7db324d54eb3534d061a11a97ff2f6279 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 23 Apr 2020 07:40:46 +0300 Subject: gjo: 1.0.2 -> 1.0.3 --- pkgs/tools/text/gjo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/gjo/default.nix b/pkgs/tools/text/gjo/default.nix index fd9a150feee..fd06129acfa 100644 --- a/pkgs/tools/text/gjo/default.nix +++ b/pkgs/tools/text/gjo/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gjo"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "skanehira"; repo = "gjo"; rev = version; - sha256 = "1m5nkv42ri150fgj590nrl24wp90p7ygg9xdh9zblibmnqrvbz4z"; + sha256 = "07halr0jzds4rya6hlvp45bjf7vg4yf49w5q60mch05hk8qkjjdw"; }; doCheck = true; -- cgit v1.2.3 From 861a342a328e0038182a2e2eb3d008f60cfb4e1b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 21 Apr 2020 18:00:00 -0500 Subject: nushell: 0.12.0 -> 0.13.0 Release notes: https://www.nushell.sh/blog/2020/04/21/nushell_0_13_0.html --- pkgs/shells/nushell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 43e0d2cb56a..9dbce58d093 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -15,16 +15,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0cy3rm0yr4ay4hcgw202w5k1sqw09kd75a0yyk0s0v0cxpmssf5n"; + sha256 = "1n92wcd3f6p38iwp9sc4bfhmaxb61ff6vvn0zvy3h4q8wmvxpiky"; }; - cargoSha256 = "0q89841jwbsvl4c90sl8wgnjjl8q0bb3kw7sl7k9dpnfmj5j144x"; + cargoSha256 = "0dyszvy0nmbjill3wfyqprqkh911r070rvkxc1ls9s3yhxhwlhzq"; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withStableFeatures && stdenv.isLinux) [ python3 ]; -- cgit v1.2.3 From 45c0523b77144e4378f659e1093562e448704bd5 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Tue, 21 Apr 2020 14:06:25 -0400 Subject: rtl8812au: 5.2.20.2_28373.20190903 -> 5.6.4.2_35491.20200318 --- pkgs/os-specific/linux/rtl8812au/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix index 99afd575eee..cb93c635afe 100644 --- a/pkgs/os-specific/linux/rtl8812au/default.nix +++ b/pkgs/os-specific/linux/rtl8812au/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "rtl8812au-${kernel.version}-${version}"; - version = "5.2.20.2_28373.20190903"; + version = "5.6.4.2_35491.20200318"; src = fetchFromGitHub { - owner = "zebulon2"; - repo = "rtl8812au-driver-5.2.20"; - rev = "30d47a0a3f43ccb19e8fd59fe93d74a955147bf2"; - sha256 = "1fy0f8ihxd0i5kr8gmky8v8xl0ns6bhxfdn64c97c5irzdvg37sr"; + owner = "gordboy"; + repo = "rtl8812au-5.6.4.2"; + rev = "49e98ff9bfdbe2ddce843808713de383132002e0"; + sha256 = "0f4isqasm9rli5v6a7xpphyh509wdxs1zcfvgdsnyhnv8amhqxgs"; }; nativeBuildInputs = [ bc nukeReferences ]; -- cgit v1.2.3 From 8762b2aca4436524a46fdc5b69a59b144044f2db Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Thu, 16 Apr 2020 17:05:46 -0400 Subject: pythonPackages.pep8-naming: 0.9.1 -> 0.10.0 --- pkgs/development/python-modules/pep8-naming/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pep8-naming/default.nix b/pkgs/development/python-modules/pep8-naming/default.nix index 1c972b00275..4b85ba47ab3 100644 --- a/pkgs/development/python-modules/pep8-naming/default.nix +++ b/pkgs/development/python-modules/pep8-naming/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pep8-naming"; - version = "0.9.1"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "a33d38177056321a167decd6ba70b890856ba5025f0a8eca6a3eda607da93caf"; + sha256 = "0fmzccbmr0jn9ynamdb9ly2ai8qs5qfk8alfgnzr3fbjvpwsbd7k"; }; propagatedBuildInputs = [ -- cgit v1.2.3 From ebb63137ad245d0b9851d8a4de3be49f645b099c Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Thu, 16 Apr 2020 17:06:02 -0400 Subject: pythonPackages.sqlalchemy-utils: 0.36.0 -> 0.36.3 --- pkgs/development/python-modules/sqlalchemy-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy-utils/default.nix b/pkgs/development/python-modules/sqlalchemy-utils/default.nix index 3ca0423bd1d..db23e2ab7db 100644 --- a/pkgs/development/python-modules/sqlalchemy-utils/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-utils/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "sqlalchemy-utils"; - version = "0.36.0"; + version = "0.36.3"; src = fetchPypi { inherit version; pname = "SQLAlchemy-Utils"; - sha256 = "1wkk6jj0jkp2hi3ziqw95q0b19zabpvzm6v5kixgnssj027hq0yv"; + sha256 = "0fj9qiz5hq8gf9pnir077sl58chry7jz63fnj1vgx5rmq1dsys7j"; }; propagatedBuildInputs = [ -- cgit v1.2.3 From dca8b1bdd0714449cc29010b15aff0d3f4739485 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 29 Apr 2020 11:55:58 -0400 Subject: python3Packages.transforms3d: init at unstable-2019-12-17 --- .../python-modules/transforms3d/default.nix | 36 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/transforms3d/default.nix diff --git a/pkgs/development/python-modules/transforms3d/default.nix b/pkgs/development/python-modules/transforms3d/default.nix new file mode 100644 index 00000000000..8b21e64e9a7 --- /dev/null +++ b/pkgs/development/python-modules/transforms3d/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, pytest +, numpy +, scipy +, sympy +}: + +buildPythonPackage rec { + pname = "transforms3d"; + version = "unstable-2019-12-17"; + + disabled = isPy27; + + # no Git tag or PyPI release in some time + src = fetchFromGitHub { + owner = "matthew-brett"; + repo = pname; + rev = "6b20250c610249914ca5e3a3a2964c36ca35c19a"; + sha256 = "1z789hgk71a6rj6mqp9srpzamg06g58hs2p1l1p344cfnkj5a4kc"; + }; + + propagatedBuildInputs = [ numpy sympy ]; + + checkInputs = [ pytest scipy ]; + checkPhase = "pytest transforms3d"; + + meta = with lib; { + homepage = "https://matthew-brett.github.io/transforms3d"; + description = "Convert between various geometric transformations"; + license = licenses.bsd2; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 755c724e275..88c41dacdfa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1467,6 +1467,8 @@ in { transformers = callPackage ../development/python-modules/transformers { }; + transforms3d = callPackage ../development/python-modules/transforms3d { }; + sentinel = callPackage ../development/python-modules/sentinel { }; sentry-sdk = callPackage ../development/python-modules/sentry-sdk {}; -- cgit v1.2.3 From 5a0a47050b900581dd7ad8243bfadb14d9ce8f27 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 1 May 2020 10:05:25 +0200 Subject: nixos/release.nix: closures.lapp: use enablePHP, fixes metrics job #86439 Still building but this should fix the metrics job. --- nixos/release.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/release.nix b/nixos/release.nix index d31fbd11e5c..cf16986b213 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -314,9 +314,9 @@ in rec { lapp = makeClosure ({ pkgs, ... }: { services.httpd.enable = true; services.httpd.adminAddr = "foo@example.org"; + services.httpd.enablePHP = true; services.postgresql.enable = true; services.postgresql.package = pkgs.postgresql; - environment.systemPackages = [ pkgs.php ]; }); }; } -- cgit v1.2.3 From 927fcf37933ddd24a0e16c6a45b9c0a687a40607 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 24 Apr 2020 07:28:35 +0200 Subject: ocamlPackages.uri: remove at 1.9.{1,2} MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These are legacy versions for OCaml ≤ 4.02 --- pkgs/development/ocaml-modules/uri/default.nix | 1 + pkgs/development/ocaml-modules/uri/legacy.nix | 51 -------------------------- pkgs/top-level/ocaml-packages.nix | 9 +---- 3 files changed, 2 insertions(+), 59 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/uri/legacy.nix diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix index cfbcc27ba9c..6a7c03b9bb6 100644 --- a/pkgs/development/ocaml-modules/uri/default.nix +++ b/pkgs/development/ocaml-modules/uri/default.nix @@ -3,6 +3,7 @@ }: buildDunePackage rec { + minimumOCamlVersion = "4.03"; pname = "uri"; version = "3.1.0"; diff --git a/pkgs/development/ocaml-modules/uri/legacy.nix b/pkgs/development/ocaml-modules/uri/legacy.nix deleted file mode 100644 index 474ab927885..00000000000 --- a/pkgs/development/ocaml-modules/uri/legacy.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ stdenv, fetchzip, ocaml, findlib, ocamlbuild, re, stringext, ounit -, sexplib, ppx_sexp_conv -, legacyVersion ? false -, sexplib_p4 -}: - -if !stdenv.lib.versionAtLeast ocaml.version "4" -|| legacyVersion && stdenv.lib.versionAtLeast ocaml.version "4.03" -then throw "uri${stdenv.lib.optionalString legacyVersion "_p4"} is not available for OCaml ${ocaml.version}" else - -with - if legacyVersion - then { - version = "1.9.1"; - sha256 = "0v3jxqgyi4kj92r3x83rszfpnvvzy9lyb913basch4q64yka3w85"; - } else { - version = "1.9.2"; - sha256 = "137pg8j654x7r0d1664iy2zp3l82nki1kkh921lwdrwc5qqdl6jx"; - }; - -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-uri-${version}"; - - src = fetchzip { - url = "https://github.com/mirage/ocaml-uri/archive/v${version}.tar.gz"; - inherit sha256; - }; - - buildInputs = [ ocaml findlib ocamlbuild ounit ] - ++ stdenv.lib.optional (!legacyVersion) ppx_sexp_conv; - propagatedBuildInputs = [ re (if legacyVersion then sexplib_p4 else sexplib) stringext ]; - - configurePhase = "ocaml setup.ml -configure --prefix $out --enable-tests"; - buildPhase = '' - ocaml setup.ml -build - ocaml setup.ml -doc - ''; - doCheck = true; - checkPhase = "ocaml setup.ml -test"; - installPhase = "ocaml setup.ml -install"; - - createFindlibDestdir = true; - - meta = { - homepage = "https://github.com/mirage/ocaml-uri"; - platforms = ocaml.meta.platforms or []; - description = "RFC3986 URI parsing library for OCaml"; - license = stdenv.lib.licenses.isc; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index d75b8bc6a2a..dd92168e408 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -926,17 +926,10 @@ let uucp = callPackage ../development/ocaml-modules/uucp { }; uunf = callPackage ../development/ocaml-modules/uunf { }; - uri = - if lib.versionAtLeast ocaml.version "4.3" - then callPackage ../development/ocaml-modules/uri { } - else callPackage ../development/ocaml-modules/uri/legacy.nix { }; + uri = callPackage ../development/ocaml-modules/uri { }; uri-sexp = callPackage ../development/ocaml-modules/uri/sexp.nix { }; - uri_p4 = callPackage ../development/ocaml-modules/uri/legacy.nix { - legacyVersion = true; - }; - uuseg = callPackage ../development/ocaml-modules/uuseg { }; uutf = callPackage ../development/ocaml-modules/uutf { }; -- cgit v1.2.3 From b815de00f7aa3e8c33b0792395091fdf47f8b2ec Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 1 May 2020 18:24:09 +1000 Subject: podman: use $out instead of $bin with buildGoPackage --- nixos/modules/virtualisation/podman.nix | 8 +++----- pkgs/applications/virtualization/podman/wrapper.nix | 10 +++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix index 1dc79272ccb..e3ae7296766 100644 --- a/nixos/modules/virtualisation/podman.nix +++ b/nixos/modules/virtualisation/podman.nix @@ -8,13 +8,11 @@ let # Provides a fake "docker" binary mapping to podman dockerCompat = pkgs.runCommandNoCC "${podmanPackage.pname}-docker-compat-${podmanPackage.version}" { - outputs = [ "out" "bin" "man" ]; + outputs = [ "out" "man" ]; inherit (podmanPackage) meta; } '' - mkdir $out - - mkdir -p $bin/bin - ln -s ${podmanPackage.bin}/bin/podman $bin/bin/docker + mkdir -p $out/bin + ln -s ${podmanPackage}/bin/podman $out/bin/docker mkdir -p $man/share/man/man1 for f in ${podmanPackage.man}/share/man/man1/*; do diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix index 0b905c0c709..551f134478b 100644 --- a/pkgs/applications/virtualization/podman/wrapper.nix +++ b/pkgs/applications/virtualization/podman/wrapper.nix @@ -34,15 +34,15 @@ in runCommand podman.name { ]; } '' - # Symlink everything but $bin from podman-unwrapped + # Symlink everything but $out from podman-unwrapped ${ lib.concatMapStringsSep "\n" (o: "ln -s ${podman.${o}} ${placeholder o}") - (builtins.filter (o: o != "bin") + (builtins.filter (o: o != "out") podman.outputs)} - mkdir -p $bin/bin - ln -s ${podman-unwrapped}/share $bin/share - makeWrapper ${podman-unwrapped}/bin/podman $bin/bin/podman \ + mkdir -p $out/bin + ln -s ${podman-unwrapped}/share $out/share + makeWrapper ${podman-unwrapped}/bin/podman $out/bin/podman \ --prefix PATH : ${binPath} '' -- cgit v1.2.3 From 258e3287a504e1cc1790c03546cb38f8354b2ece Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 1 May 2020 10:28:55 +0200 Subject: ocamlPackages.core_extended: remove at 112.24.00 This is a legacy version for OCaml 4.02 --- .../ocaml-modules/core_extended/default.nix | 33 ---------------------- .../ocaml-modules/janestreet/core-extended.nix | 28 ------------------ pkgs/top-level/ocaml-packages.nix | 9 ------ 3 files changed, 70 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/core_extended/default.nix delete mode 100644 pkgs/development/ocaml-modules/janestreet/core-extended.nix diff --git a/pkgs/development/ocaml-modules/core_extended/default.nix b/pkgs/development/ocaml-modules/core_extended/default.nix deleted file mode 100644 index b657e812fdf..00000000000 --- a/pkgs/development/ocaml-modules/core_extended/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{stdenv, buildOcaml, fetchurl, bin_prot_p4, comparelib, core_p4, custom_printf, - fieldslib_p4, pa_bench, pa_ounit, pipebang, pa_test, textutils_p4, re2_p4, sexplib_p4}: - -buildOcaml rec { - name = "core_extended"; - version = "112.24.00"; - - minimumSupportedOcamlVersion = "4.02"; - - src = fetchurl { - url = "https://github.com/janestreet/core_extended/archive/${version}.tar.gz"; - sha256 = "f87b0661b6c2cfb545ec61d1cb2ab1b9c4967b6ac14e651de41d3a6fb7f0f1e3"; - }; - - preConfigure = stdenv.lib.optionalString stdenv.isLinux '' - patch lib/extended_unix_stubs.c < #define _LINUX_QUOTA_VERSION 2 - EOF - ''; - - hasSharedObjects = true; - buildInputs = [ pa_bench pa_test pa_ounit ]; - propagatedBuildInputs = [bin_prot_p4 comparelib core_p4 custom_printf fieldslib_p4 - pipebang textutils_p4 re2_p4 sexplib_p4 ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/janestreet/core_extended"; - description = "Jane Street Capital's standard library overlay"; - license = licenses.asl20; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/core-extended.nix b/pkgs/development/ocaml-modules/janestreet/core-extended.nix deleted file mode 100644 index 19550a82327..00000000000 --- a/pkgs/development/ocaml-modules/janestreet/core-extended.nix +++ /dev/null @@ -1,28 +0,0 @@ -{stdenv, buildOcamlJane, - core, - bin_prot, fieldslib, sexplib, typerep, variantslib, - ppx_assert, ppx_bench, ppx_driver, ppx_expect, ppx_inline_test, ppx_jane, - re2, textutils}: - -buildOcamlJane { - name = "core_extended"; - hash = "1j4ipcn741j8w3h4gpv5sygjzg6b5g6gc2jcrr4n0jyn5dq8b0p5"; - propagatedBuildInputs = - [ core bin_prot fieldslib sexplib typerep variantslib - ppx_assert ppx_bench ppx_driver ppx_expect ppx_inline_test ppx_jane - re2 textutils ]; - - patchPhase = stdenv.lib.optionalString stdenv.isLinux '' - patch src/extended_unix_stubs.c < #define _LINUX_QUOTA_VERSION 2 -EOF - ''; - - meta = with stdenv.lib; { - homepage = "https://github.com/janestreet/core_extended"; - description = "Jane Street Capital's standard library overlay"; - license = licenses.asl20; - maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index dd92168e408..9517769f7b3 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -593,8 +593,6 @@ let comparelib = callPackage ../development/ocaml-modules/comparelib { }; - core_extended_p4 = callPackage ../development/ocaml-modules/core_extended { }; - core_kernel_p4 = callPackage ../development/ocaml-modules/core_kernel { }; core_p4 = callPackage ../development/ocaml-modules/core { }; @@ -1194,13 +1192,6 @@ let then callPackage ../development/ocaml-modules/janestreet/textutils.nix {} else textutils_p4; - core_extended = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.core_extended - else if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/core-extended.nix {} - else core_extended_p4; - async_kernel = if lib.versionOlder "4.03" ocaml.version then janeStreet.async_kernel -- cgit v1.2.3 From 0a2faff305291bde4661741b0ad69983fa9078e1 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 28 Apr 2020 22:46:22 +0800 Subject: libfilezilla: 0.19.3 -> 0.21.0 --- pkgs/development/libraries/libfilezilla/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index 0fa5c3a7db0..10f46a67e89 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -9,16 +9,19 @@ stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.19.3"; + version = "0.21.0"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0fml6whdbfcwc8nfjhvrnidkscv6q2x988zf3alfjl2mdpw4jgd4"; + sha256 = "1wjvxi3spkp58lay590bs5s2i8fn94lqkc7qvq4q7ns4l9k9z3av"; }; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ gettext gnutls nettle ]; + enableParallelBuilding = true; + meta = with stdenv.lib; { homepage = "https://lib.filezilla-project.org/"; description = "A modern C++ library, offering some basic functionality to build high-performing, platform-independent programs"; -- cgit v1.2.3 From 78cc33197ccb2df2652964599ba818cc592d64da Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 28 Apr 2020 22:46:36 +0800 Subject: filezilla: 3.46.3 -> 3.48.0 --- .../networking/ftp/filezilla/default.nix | 23 ++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix index 8bb38230d5c..780385b28f3 100644 --- a/pkgs/applications/networking/ftp/filezilla/default.nix +++ b/pkgs/applications/networking/ftp/filezilla/default.nix @@ -1,10 +1,8 @@ { stdenv , fetchurl - , dbus , gettext , gnutls -, gtk2 , libfilezilla , libidn , nettle @@ -16,33 +14,46 @@ , xdg_utils }: +let + # we can drop this when wxgtk is built with gtk3 by default + # see: https://github.com/NixOS/nixpkgs/pull/73145 + wxgtk' = wxGTK30.override { compat26 = false; withGtk2 = false; }; + +in stdenv.mkDerivation rec { pname = "filezilla"; - version = "3.46.3"; + version = "3.48.0"; src = fetchurl { url = "https://download.filezilla-project.org/client/FileZilla_${version}_src.tar.bz2"; - sha256 = "15bkg9qs07h4pzkxba1gymp8f264dk0zrzd9brx48fcwm7qbzigi"; + sha256 = "0msxl8ihbycd56hmn1q8sl1gzmsxc7j8ar9k4zsryd0ayyz7wv05"; }; + # https://www.linuxquestions.org/questions/slackware-14/trouble-building-filezilla-3-47-2-1-current-4175671182/#post6099769 + postPatch = '' + sed -i src/interface/Mainfrm.h \ + -e '/^#define/a #include ' + ''; + configureFlags = [ "--disable-manualupdatecheck" "--disable-autoupdatecheck" ]; nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ dbus gettext gnutls - gtk2 libfilezilla libidn nettle pugixml sqlite tinyxml - wxGTK30 + wxgtk' + wxgtk'.gtk xdg_utils ]; -- cgit v1.2.3 From 671d1ed636d643a583df5514312af93400eb94df Mon Sep 17 00:00:00 2001 From: gnidorah Date: Fri, 1 May 2020 11:45:00 +0300 Subject: cpu-x: init at 3.2.4 --- pkgs/applications/misc/cpu-x/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/misc/cpu-x/default.nix diff --git a/pkgs/applications/misc/cpu-x/default.nix b/pkgs/applications/misc/cpu-x/default.nix new file mode 100644 index 00000000000..c058e6d5a98 --- /dev/null +++ b/pkgs/applications/misc/cpu-x/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, cmake, pkgconfig, gtk3, ncurses, curl +, json_c, libcpuid, pciutils, procps, wrapGAppsHook, nasm }: + +stdenv.mkDerivation rec { + pname = "cpu-x"; + version = "3.2.4"; + + src = fetchFromGitHub { + owner = "X0rg"; + repo = "CPU-X"; + rev = "v${version}"; + sha256 = "03y49wh9v7x6brmavj5a2clihn0z4f01pypl7m8ymarv4y3a6xkl"; + }; + + nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook nasm ]; + buildInputs = [ + gtk3 ncurses curl json_c libcpuid pciutils procps + ]; + + meta = with stdenv.lib; { + description = "Free software that gathers information on CPU, motherboard and more"; + homepage = src.meta.homepage; + license = licenses.gpl3; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ gnidorah ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7dd8d50444..1303fb5bbb8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -173,6 +173,8 @@ in colorz = callPackage ../tools/misc/colorz { }; + cpu-x = callPackage ../applications/misc/cpu-x { }; + dhallToNix = callPackage ../build-support/dhall-to-nix.nix { inherit dhall-nix; }; -- cgit v1.2.3 From ae04f8efae4ca978253dc251ec26d31dab34d86a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 1 May 2020 04:20:00 -0500 Subject: git-lfs: install man pages --- .../version-management/git-lfs/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index eca841350de..86d9ac90d8f 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, ronn, installShellFiles }: -buildGoModule rec { +buildGoPackage rec { pname = "git-lfs"; version = "2.10.0"; @@ -11,10 +11,22 @@ buildGoModule rec { sha256 = "1y5ryk0iz5g5sqaw79ml6fr5kvjgzcah481pk5qmnb2ipb1xlng9"; }; - modSha256 = "1rvvgyg4gqbli4pwfnmyz59gf14k7925mdqj6ykp542gwnsjgjp2"; + goPackagePath = "github.com/git-lfs/git-lfs"; + + nativeBuildInputs = [ ronn installShellFiles ]; + + buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/config.Vendor=${version} -X ${goPackagePath}/config.GitCommit=${src.rev}" ]; subPackages = [ "." ]; + postBuild = '' + make -C go/src/${goPackagePath} man + ''; + + postInstall = '' + installManPage man/*.1 man/*.5 + ''; + meta = with stdenv.lib; { description = "Git extension for versioning large files"; homepage = "https://git-lfs.github.com/"; -- cgit v1.2.3 From 7156ab6d858fdece45174ef449594ee508a55b43 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 1 May 2020 04:20:00 -0500 Subject: git-lfs: add marsam to maintainers --- pkgs/applications/version-management/git-lfs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index 86d9ac90d8f..f5b844d0ce7 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -31,6 +31,6 @@ buildGoPackage rec { description = "Git extension for versioning large files"; homepage = "https://git-lfs.github.com/"; license = [ licenses.mit ]; - maintainers = [ maintainers.twey ]; + maintainers = [ maintainers.twey maintainers.marsam ]; }; } -- cgit v1.2.3 From 92205ad660404b41b6a3d389e1a1dc213ca5952e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 1 May 2020 04:20:00 -0500 Subject: _1password: 0.9.4 -> 0.10.0 --- pkgs/applications/misc/1password/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index b27569a8a30..010e9ae7a50 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -2,24 +2,24 @@ stdenv.mkDerivation rec { pname = "1password"; - version = "0.9.4"; + version = "0.10.0"; src = if stdenv.hostPlatform.system == "i686-linux" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_386_v${version}.zip"; - sha256 = "0hgvcm42035fs2qhhvycppcrqgya98rmkk347j3hyj1m6kqxi99c"; + sha256 = "07j11ikd0rzsj4d8rv74rfy497svq6l2q94ndf3b0a0mr8riyazj"; stripRoot = false; } else if stdenv.hostPlatform.system == "x86_64-linux" then fetchzip { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_linux_amd64_v${version}.zip"; - sha256 = "1fvl078kgpvzjr3jfp8zbajzsiwrcm33b7lqksxgcy30paqw6737"; + sha256 = "177cl4x7rj3d74kzrpmiwps5n31axmlhqdwrdpkmay2gk9inswbs"; stripRoot = false; } else if stdenv.hostPlatform.system == "x86_64-darwin" then fetchurl { url = "https://cache.agilebits.com/dist/1P/op/pkg/v${version}/op_darwin_amd64_v${version}.pkg"; - sha256 = "0fzbfxsgf0s93kg647zla9n9k5adnfb57dcwwnibs6lq5k63h8mj"; + sha256 = "13yxmnh77g6zvl2gqf77m5i3v5706p2plgbgsn5hqrrf3g8ql63b"; } else throw "Architecture not supported"; -- cgit v1.2.3 From 3853c2711126d2c1518514222d19be631b609bac Mon Sep 17 00:00:00 2001 From: misuzu Date: Thu, 2 Apr 2020 23:25:03 +0300 Subject: nixos/gitlab-runner: support multiple services --- .../continuous-integration/gitlab-runner.nix | 540 +++++++++++++++++---- 1 file changed, 437 insertions(+), 103 deletions(-) diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix index bd4cf6a37ba..84f04a27641 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -1,160 +1,494 @@ { config, lib, pkgs, ... }: - with lib; - let cfg = config.services.gitlab-runner; - configFile = - if (cfg.configFile == null) then - (pkgs.runCommand "config.toml" { - buildInputs = [ pkgs.remarshal ]; - preferLocalBuild = true; - } '' - remarshal -if json -of toml \ - < ${pkgs.writeText "config.json" (builtins.toJSON cfg.configOptions)} \ - > $out - '') - else - cfg.configFile; hasDocker = config.virtualisation.docker.enable; + hashedServices = with builtins; (mapAttrs' (name: service: nameValuePair + "${name}_${config.networking.hostName}_${ + substring 0 12 + (hashString "md5" (unsafeDiscardStringContext (toJSON service)))}" + service) + cfg.services); + configPath = "$HOME/.gitlab-runner/config.toml"; + configureScript = pkgs.writeShellScriptBin "gitlab-runner-configure" ( + if (cfg.configFile != null) then '' + mkdir -p $(dirname ${configPath}) + cp ${cfg.configFile} ${configPath} + # make config file readable by service + chown -R --reference=$HOME $(dirname ${configPath}) + '' else '' + export CONFIG_FILE=${configPath} + + mkdir -p $(dirname ${configPath}) + + # remove no longer existing services + gitlab-runner verify --delete + + # current and desired state + NEEDED_SERVICES=$(echo ${concatStringsSep " " (attrNames hashedServices)} | tr " " "\n") + REGISTERED_SERVICES=$(gitlab-runner list 2>&1 | grep 'Executor' | awk '{ print $1 }') + + # difference between current and desired state + NEW_SERVICES=$(grep -vxF -f <(echo "$REGISTERED_SERVICES") <(echo "$NEEDED_SERVICES") || true) + OLD_SERVICES=$(grep -vxF -f <(echo "$NEEDED_SERVICES") <(echo "$REGISTERED_SERVICES") || true) + + # register new services + ${concatStringsSep "\n" (mapAttrsToList (name: service: '' + if echo "$NEW_SERVICES" | grep -xq ${name}; then + bash -c ${escapeShellArg (concatStringsSep " \\\n " ([ + "set -a && source ${service.registrationConfigFile} &&" + "gitlab-runner register" + "--non-interactive" + "--name ${name}" + "--executor ${service.executor}" + "--limit ${toString service.limit}" + "--request-concurrency ${toString service.requestConcurrency}" + "--maximum-timeout ${toString service.maximumTimeout}" + ] ++ service.registrationFlags + ++ optional (service.buildsDir != null) + "--builds-dir ${service.buildsDir}" + ++ optional (service.preCloneScript != null) + "--pre-clone-script ${service.preCloneScript}" + ++ optional (service.preBuildScript != null) + "--pre-build-script ${service.preBuildScript}" + ++ optional (service.postBuildScript != null) + "--post-build-script ${service.postBuildScript}" + ++ optional (service.tagList != [ ]) + "--tag-list ${concatStringsSep "," service.tagList}" + ++ optional service.runUntagged + "--run-untagged" + ++ optional service.protected + "--access-level ref_protected" + ++ optional service.debugTraceDisabled + "--debug-trace-disabled" + ++ map (e: "--env ${escapeShellArg e}") (mapAttrsToList (name: value: "${name}=${value}") service.environmentVariables) + ++ optionals (service.executor == "docker") ( + assert ( + assertMsg (service.dockerImage != null) + "dockerImage option is required for docker executor (${name})"); + [ "--docker-image ${service.dockerImage}" ] + ++ optional service.dockerDisableCache + "--docker-disable-cache" + ++ optional service.dockerPrivileged + "--docker-privileged" + ++ map (v: "--docker-volumes ${escapeShellArg v}") service.dockerVolumes + ++ map (v: "--docker-extra-hosts ${escapeShellArg v}") service.dockerExtraHosts + ++ map (v: "--docker-allowed-images ${escapeShellArg v}") service.dockerAllowedImages + ++ map (v: "--docker-allowed-services ${escapeShellArg v}") service.dockerAllowedServices + ) + ))} && sleep 1 + fi + '') hashedServices)} + + # unregister old services + for NAME in $(echo "$OLD_SERVICES") + do + [ ! -z "$NAME" ] && gitlab-runner unregister \ + --name "$NAME" && sleep 1 + done + + # update global options + remarshal --if toml --of json ${configPath} \ + | jq -cM '.check_interval = ${toString cfg.checkInterval} | + .concurrent = ${toString cfg.concurrent}' \ + | remarshal --if json --of toml \ + | sponge ${configPath} + + # make config file readable by service + chown -R --reference=$HOME $(dirname ${configPath}) + ''); + startScript = pkgs.writeShellScriptBin "gitlab-runner-start" '' + export CONFIG_FILE=${configPath} + exec gitlab-runner run --working-directory $HOME + ''; in { options.services.gitlab-runner = { enable = mkEnableOption "Gitlab Runner"; - configFile = mkOption { + type = types.nullOr types.path; default = null; description = '' Configuration file for gitlab-runner. - Use this option in favor of configOptions to avoid placing CI tokens in the nix store. - takes precedence over . + takes precedence over . + and will be ignored too. - Warning: Not using will potentially result in secrets - leaking into the WORLD-READABLE nix store. + This option is deprecated, please use instead. + You can use and + + for settings not covered by this module. ''; - type = types.nullOr types.path; }; - - configOptions = mkOption { + checkInterval = mkOption { + type = types.int; + default = 0; + example = literalExample "with lib; (length (attrNames config.services.gitlab-runner.services)) * 3"; description = '' - Configuration for gitlab-runner - will take precedence over this option. - - Warning: all Configuration, especially CI token, will be stored in a - WORLD-READABLE file in the Nix Store. - - If you want to protect your CI token use instead. + Defines the interval length, in seconds, between new jobs check. + The default value is 3; + if set to 0 or lower, the default value will be used. + See runner documentation for more information. + ''; + }; + concurrent = mkOption { + type = types.int; + default = 1; + example = literalExample "config.nix.maxJobs"; + description = '' + Limits how many jobs globally can be run concurrently. + The most upper limit of jobs using all defined runners. + 0 does not mean unlimited. ''; - type = types.attrs; - example = { - concurrent = 2; - runners = [{ - name = "docker-nix-1.11"; - url = "https://CI/"; - token = "TOKEN"; - executor = "docker"; - builds_dir = ""; - docker = { - host = ""; - image = "nixos/nix:1.11"; - privileged = true; - disable_cache = true; - cache_dir = ""; - }; - }]; - }; }; - gracefulTermination = mkOption { - default = false; type = types.bool; + default = false; description = '' - Finish all remaining jobs before stopping, restarting or reconfiguring. - If not set gitlab-runner will stop immediatly without waiting for jobs to finish, - which will lead to failed builds. + Finish all remaining jobs before stopping. + If not set gitlab-runner will stop immediatly without waiting + for jobs to finish, which will lead to failed builds. ''; }; - gracefulTimeout = mkOption { - default = "infinity"; type = types.str; + default = "infinity"; example = "5min 20s"; - description = ''Time to wait until a graceful shutdown is turned into a forceful one.''; - }; - - workDir = mkOption { - default = "/var/lib/gitlab-runner"; - type = types.path; - description = "The working directory used"; + description = '' + Time to wait until a graceful shutdown is turned into a forceful one. + ''; }; - package = mkOption { - description = "Gitlab Runner package to use"; + type = types.package; default = pkgs.gitlab-runner; defaultText = "pkgs.gitlab-runner"; - type = types.package; example = literalExample "pkgs.gitlab-runner_1_11"; + description = "Gitlab Runner package to use."; }; - - packages = mkOption { - default = [ pkgs.bash pkgs.docker-machine ]; - defaultText = "[ pkgs.bash pkgs.docker-machine ]"; + extraPackages = mkOption { type = types.listOf types.package; + default = [ ]; description = '' - Packages to add to PATH for the gitlab-runner process. + Extra packages to add to PATH for the gitlab-runner process. ''; }; + services = mkOption { + description = "GitLab Runner services."; + default = { }; + example = literalExample '' + { + # runner for building in docker via host's nix-daemon + # nix store will be readable in runner, might be insecure + nix = { + # File should contain at least these two variables: + # `CI_SERVER_URL` + # `REGISTRATION_TOKEN` + registrationConfigFile = "/run/secrets/gitlab-runner-registration"; + dockerImage = "alpine"; + dockerVolumes = [ + "/nix/store:/nix/store:ro" + "/nix/var/nix/db:/nix/var/nix/db:ro" + "/nix/var/nix/daemon-socket:/nix/var/nix/daemon-socket:ro" + ]; + dockerDisableCache = true; + preBuildScript = pkgs.writeScript "setup-container" ''' + mkdir -p -m 0755 /nix/var/log/nix/drvs + mkdir -p -m 0755 /nix/var/nix/gcroots + mkdir -p -m 0755 /nix/var/nix/profiles + mkdir -p -m 0755 /nix/var/nix/temproots + mkdir -p -m 0755 /nix/var/nix/userpool + mkdir -p -m 1777 /nix/var/nix/gcroots/per-user + mkdir -p -m 1777 /nix/var/nix/profiles/per-user + mkdir -p -m 0755 /nix/var/nix/profiles/per-user/root + mkdir -p -m 0700 "$HOME/.nix-defexpr" - }; + . ''${pkgs.nix}/etc/profile.d/nix.sh + ''${pkgs.nix}/bin/nix-env -i ''${concatStringsSep " " (with pkgs; [ nix cacert git openssh ])} + + ''${pkgs.nix}/bin/nix-channel --add https://nixos.org/channels/nixpkgs-unstable + ''${pkgs.nix}/bin/nix-channel --update nixpkgs + '''; + environmentVariables = { + ENV = "/etc/profile"; + USER = "root"; + NIX_REMOTE = "daemon"; + PATH = "/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/bin:/sbin:/usr/bin:/usr/sbin"; + NIX_SSL_CERT_FILE = "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt"; + }; + tagList = [ "nix" ]; + }; + # runner for building docker images + docker-images = { + # File should contain at least these two variables: + # `CI_SERVER_URL` + # `REGISTRATION_TOKEN` + registrationConfigFile = "/run/secrets/gitlab-runner-registration"; + dockerImage = "docker:stable"; + dockerVolumes = [ + "/var/run/docker.sock:/var/run/docker.sock" + ]; + tagList = [ "docker-images" ]; + }; + # runner for executing stuff on host system (very insecure!) + # make sure to add required packages (including git!) + # to `environment.systemPackages` + shell = { + # File should contain at least these two variables: + # `CI_SERVER_URL` + # `REGISTRATION_TOKEN` + registrationConfigFile = "/run/secrets/gitlab-runner-registration"; + executor = "shell"; + tagList = [ "shell" ]; + }; + # runner for everything else + default = { + # File should contain at least these two variables: + # `CI_SERVER_URL` + # `REGISTRATION_TOKEN` + registrationConfigFile = "/run/secrets/gitlab-runner-registration"; + dockerImage = "debian:stable"; + }; + } + ''; + type = types.attrsOf (types.submodule { + options = { + registrationConfigFile = mkOption { + type = types.path; + description = '' + Absolute path to a file with environment variables + used for gitlab-runner registration. + A list of all supported environment variables can be found in + gitlab-runner register --help. + + Ones that you probably want to set is + + CI_SERVER_URL=<CI server URL> + + REGISTRATION_TOKEN=<registration secret> + ''; + }; + registrationFlags = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "--docker-helper-image my/gitlab-runner-helper" ]; + description = '' + Extra command-line flags passed to + gitlab-runner register. + Execute gitlab-runner register --help + for a list of supported flags. + ''; + }; + environmentVariables = mkOption { + type = types.attrsOf types.str; + default = { }; + example = { NAME = "value"; }; + description = '' + Custom environment variables injected to build environment. + For secrets you can use + with RUNNER_ENV variable set. + ''; + }; + executor = mkOption { + type = types.str; + default = "docker"; + description = '' + Select executor, eg. shell, docker, etc. + See runner documentation for more information. + ''; + }; + buildsDir = mkOption { + type = types.nullOr types.path; + default = null; + example = "/var/lib/gitlab-runner/builds"; + description = '' + Absolute path to a directory where builds will be stored + in context of selected executor (Locally, Docker, SSH). + ''; + }; + dockerImage = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Docker image to be used. + ''; + }; + dockerVolumes = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "/var/run/docker.sock:/var/run/docker.sock" ]; + description = '' + Bind-mount a volume and create it + if it doesn't exist prior to mounting. + ''; + }; + dockerDisableCache = mkOption { + type = types.bool; + default = false; + description = '' + Disable all container caching. + ''; + }; + dockerPrivileged = mkOption { + type = types.bool; + default = false; + description = '' + Give extended privileges to container. + ''; + }; + dockerExtraHosts = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "other-host:127.0.0.1" ]; + description = '' + Add a custom host-to-IP mapping. + ''; + }; + dockerAllowedImages = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "ruby:*" "python:*" "php:*" "my.registry.tld:5000/*:*" ]; + description = '' + Whitelist allowed images. + ''; + }; + dockerAllowedServices = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "postgres:9" "redis:*" "mysql:*" ]; + description = '' + Whitelist allowed services. + ''; + }; + preCloneScript = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Runner-specific command script executed before code is pulled. + ''; + }; + preBuildScript = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Runner-specific command script executed after code is pulled, + just before build executes. + ''; + }; + postBuildScript = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Runner-specific command script executed after code is pulled + and just after build executes. + ''; + }; + tagList = mkOption { + type = types.listOf types.str; + default = [ ]; + description = '' + Tag list. + ''; + }; + runUntagged = mkOption { + type = types.bool; + default = false; + description = '' + Register to run untagged builds; defaults to + true when is empty. + ''; + }; + limit = mkOption { + type = types.int; + default = 0; + description = '' + Limit how many jobs can be handled concurrently by this service. + 0 (default) simply means don't limit. + ''; + }; + requestConcurrency = mkOption { + type = types.int; + default = 0; + description = '' + Limit number of concurrent requests for new jobs from GitLab. + ''; + }; + maximumTimeout = mkOption { + type = types.int; + default = 0; + description = '' + What is the maximum timeout (in seconds) that will be set for + job when using this Runner. 0 (default) simply means don't limit. + ''; + }; + protected = mkOption { + type = types.bool; + default = false; + description = '' + When set to true Runner will only run on pipelines + triggered on protected branches. + ''; + }; + debugTraceDisabled = mkOption { + type = types.bool; + default = false; + description = '' + When set to true Runner will disable the possibility of + using the CI_DEBUG_TRACE feature. + ''; + }; + }; + }); + }; + }; config = mkIf cfg.enable { + warnings = optional (cfg.configFile != null) "services.gitlab-runner.`configFile` is deprecated, please use services.gitlab-runner.`services`."; + environment.systemPackages = [ cfg.package ]; systemd.services.gitlab-runner = { - path = cfg.packages; - environment = config.networking.proxy.envVars // { - # Gitlab runner will not start if the HOME variable is not set - HOME = cfg.workDir; - }; description = "Gitlab Runner"; + documentation = [ "https://docs.gitlab.com/runner/" ]; after = [ "network.target" ] ++ optional hasDocker "docker.service"; requires = optional hasDocker "docker.service"; wantedBy = [ "multi-user.target" ]; + environment = config.networking.proxy.envVars // { + HOME = "/var/lib/gitlab-runner"; + }; + path = with pkgs; [ + bash + gawk + jq + moreutils + remarshal + utillinux + cfg.package.bin + ] ++ cfg.extraPackages; reloadIfChanged = true; - restartTriggers = [ - config.environment.etc."gitlab-runner/config.toml".source - ]; serviceConfig = { + # Set `DynamicUser` under `systemd.services.gitlab-runner.serviceConfig` + # to `lib.mkForce false` in your configuration to run this service as root. + # You can also set `User` and `Group` options to run this service as desired user. + # Make sure to restart service or changes won't apply. + DynamicUser = true; StateDirectory = "gitlab-runner"; - ExecReload= "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - ExecStart = ''${cfg.package.bin}/bin/gitlab-runner run \ - --working-directory ${cfg.workDir} \ - --config /etc/gitlab-runner/config.toml \ - --service gitlab-runner \ - --user gitlab-runner \ - ''; - - } // optionalAttrs (cfg.gracefulTermination) { + SupplementaryGroups = optional hasDocker "docker"; + ExecStartPre = "!${configureScript}/bin/gitlab-runner-configure"; + ExecStart = "${startScript}/bin/gitlab-runner-start"; + ExecReload = "!${configureScript}/bin/gitlab-runner-configure"; + } // optionalAttrs (cfg.gracefulTermination) { TimeoutStopSec = "${cfg.gracefulTimeout}"; KillSignal = "SIGQUIT"; KillMode = "process"; }; }; - - # Make the gitlab-runner command availabe so users can query the runner - environment.systemPackages = [ cfg.package ]; - - # Make sure the config can be reloaded on change - environment.etc."gitlab-runner/config.toml".source = configFile; - - users.users.gitlab-runner = { - group = "gitlab-runner"; - extraGroups = optional hasDocker "docker"; - uid = config.ids.uids.gitlab-runner; - home = cfg.workDir; - createHome = true; - }; - - users.groups.gitlab-runner.gid = config.ids.gids.gitlab-runner; + # Enable docker if `docker` executor is used in any service + virtualisation.docker.enable = mkIf ( + any (s: s.executor == "docker") (attrValues cfg.services) + ) (mkDefault true); }; + imports = [ + (mkRenamedOptionModule [ "services" "gitlab-runner" "packages" ] [ "services" "gitlab-runner" "extraPackages" ] ) + (mkRemovedOptionModule [ "services" "gitlab-runner" "configOptions" ] "Use services.gitlab-runner.services option instead" ) + (mkRemovedOptionModule [ "services" "gitlab-runner" "workDir" ] "You should move contents of workDir (if any) to /var/lib/gitlab-runner" ) + ]; } -- cgit v1.2.3 From 00834655e6d9a7ae78a8807a4dedd287869df89b Mon Sep 17 00:00:00 2001 From: Kevin Rauscher Date: Fri, 1 May 2020 12:01:39 +0200 Subject: scalafmt: 2.4.2 -> 2.5.0 --- pkgs/development/tools/scalafmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix index 76091926a23..ec9de0610ea 100644 --- a/pkgs/development/tools/scalafmt/default.nix +++ b/pkgs/development/tools/scalafmt/default.nix @@ -2,7 +2,7 @@ let baseName = "scalafmt"; - version = "2.4.2"; + version = "2.5.0"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -13,7 +13,7 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "0axinxfyycnmxg561n80s90swr6d0pgsw669gvpsk557nhmcclja"; + outputHash = "1m7jdgndbjynhl98an6g9gxxpp9bd6p3xqgzfilak8pamjkdwdp4"; }; in stdenv.mkDerivation { -- cgit v1.2.3 From 4d7bd77f75b8afcae16b6f5efb0060e004f3b936 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 1 May 2020 12:47:57 +0200 Subject: kops: fix hash As seen on https://hydra.nixos.org/build/118009308 --- pkgs/applications/networking/cluster/kops/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 3e1f63531bb..b4983a602e6 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -58,6 +58,6 @@ in rec { kops_1_16 = mkKops { version = "1.16.1"; - sha256 = "08vy57ln0qar961sf9vbrh29f04qj5siqsfim1kqwvj5xrvwa39i"; + sha256 = "04ji1703z6b3rd4wmccah68api0jj2bndzkgdzqi855gccqbmi5g"; }; } -- cgit v1.2.3 From 91b71a7b603d1c2893f4cd9a641f00e9dd67b55e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 1 May 2020 11:50:03 +0100 Subject: radare2: 4.3.1 -> 4.4.0 --- pkgs/development/tools/analysis/radare2/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2/default.nix b/pkgs/development/tools/analysis/radare2/default.nix index 48a1f20cfd9..32d23597e52 100644 --- a/pkgs/development/tools/analysis/radare2/default.nix +++ b/pkgs/development/tools/analysis/radare2/default.nix @@ -110,17 +110,17 @@ in { # # DO NOT EDIT! Automatically generated by ./update.py radare2 = generic { - version_commit = "24088"; - gittap = "4.3.1"; - gittip = "e7f940d27b3b4eb2738afef78a6ea09ed770318c"; - rev = "4.3.1"; - version = "4.3.1"; - sha256 = "0fiy6aj8xf9anpkk2vpkx8x0m2f26rhjb92nmg61xj13dmhchh30"; + version_commit = "24545"; + gittap = "4.4.0"; + gittip = "9ea0b7ce566cfdcfb3513f407c4056915204294a"; + rev = "4.4.0"; + version = "4.4.0"; + sha256 = "0gwdnrnk7wdgkajp2qwg4fyplh7nsbmf01bzx07px6xmiscd9z2s"; cs_ver = "4.0.1"; cs_sha256 = "0ijwxxk71nr9z91yxw20zfj4bbsbrgvixps5c7cpj163xlzlwba6"; }; r2-for-cutter = generic { - version_commit = "24088"; + version_commit = "24545"; gittap = "4.3.1"; gittip = "e7f940d27b3b4eb2738afef78a6ea09ed770318c"; rev = "e7f940d27b3b4eb2738afef78a6ea09ed770318c"; -- cgit v1.2.3 From 8e8459921a4e2531abe3e86bbd3810b7e71a4735 Mon Sep 17 00:00:00 2001 From: cmacrae Date: Thu, 30 Apr 2020 17:55:35 +0100 Subject: yabai: init at 2.4.3 --- pkgs/os-specific/darwin/yabai/default.nix | 32 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/os-specific/darwin/yabai/default.nix diff --git a/pkgs/os-specific/darwin/yabai/default.nix b/pkgs/os-specific/darwin/yabai/default.nix new file mode 100644 index 00000000000..aa10a3a20f7 --- /dev/null +++ b/pkgs/os-specific/darwin/yabai/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, Carbon, Cocoa, ScriptingBridge }: + +stdenv.mkDerivation rec { + pname = "yabai"; + version = "2.4.3"; + + src = fetchFromGitHub { + owner = "koekeishiya"; + repo = pname; + rev = "v${version}"; + sha256 = "1a6pqms5kwdsvr9vcshfa000xf2f5a2qbp5qapx0b3wzclnchjbn"; + }; + + buildInputs = [ Carbon Cocoa ScriptingBridge ]; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/man/man1/ + cp ./bin/yabai $out/bin/yabai + cp ./doc/yabai.1 $out/share/man/man1/yabai.1 + ''; + + meta = with stdenv.lib; { + description = '' + A tiling window manager for macOS based on binary space partitioning + ''; + homepage = https://github.com/koekeishiya/yabai; + platforms = platforms.darwin; + maintainers = [ maintainers.cmacrae ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 66599002d5f..e9b894a039a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26111,6 +26111,11 @@ in xzoom = callPackage ../tools/X11/xzoom {}; + yabai = callPackage ../os-specific/darwin/yabai { + inherit (darwin.apple_sdk.frameworks) + Carbon Cocoa ScriptingBridge; + }; + yabause = libsForQt5.callPackage ../misc/emulators/yabause { freeglut = null; openal = null; -- cgit v1.2.3 From 7b78f0f098aebdeb6316fc066a4cdeaf62e37abd Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 8 Jan 2020 19:36:00 +0100 Subject: nixos/networkd: remove CriticalConnection= fields in favor of KeepConnection Systemd upstream has deprecated CriticalConnection with v244 in favor of KeepConnection as that seems to be more flexible: The CriticalConnection= setting in .network files is now deprecated, and replaced by a new KeepConfiguration= setting which allows more detailed configuration of the IP configuration to keep in place. --- nixos/doc/manual/release-notes/rl-2009.xml | 10 ++++++++++ nixos/modules/system/boot/networkd.nix | 6 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 1cf7c977eeb..1b40a84be55 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -290,6 +290,16 @@ environment.systemPackages = [ has been set to true. + + + The systemd-networkd option + systemd.network.networks.<name>.dhcp.CriticalConnection + has been removed following upstream systemd's deprecation of the same. It is recommended to use + systemd.network.networks.<name>.networkConfig.KeepConfiguration instead. + See systemd.network + 5 for details. + +
diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 80c8428c63f..7b55126b1cf 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -205,7 +205,7 @@ let "IPv6HopLimit" "IPv4ProxyARP" "IPv6ProxyNDP" "IPv6ProxyNDPAddress" "IPv6PrefixDelegation" "IPv6MTUBytes" "Bridge" "Bond" "VRF" "VLAN" "IPVLAN" "MACVLAN" "VXLAN" "Tunnel" "ActiveSlave" "PrimarySlave" - "ConfigureWithoutCarrier" "Xfrm" + "ConfigureWithoutCarrier" "Xfrm" "KeepConfiguration" ]) # Note: For DHCP the values both, none, v4, v6 are deprecated (assertValueOneOf "DHCP" ["yes" "no" "ipv4" "ipv6" "both" "none" "v4" "v6"]) @@ -228,6 +228,7 @@ let (assertValueOneOf "ActiveSlave" boolValues) (assertValueOneOf "PrimarySlave" boolValues) (assertValueOneOf "ConfigureWithoutCarrier" boolValues) + (assertValueOneOf "KeepConfiguration" (boolValues ++ ["static" "dhcp-on-stop" "dhcp"])) ]; checkAddress = checkUnitConfig "Address" [ @@ -277,7 +278,7 @@ let checkDhcp = checkUnitConfig "DHCP" [ (assertOnlyFields [ "UseDNS" "RoutesToDNS" "UseNTP" "UseMTU" "Anonymize" "SendHostname" "UseHostname" - "Hostname" "UseDomains" "UseRoutes" "UseTimezone" "CriticalConnection" + "Hostname" "UseDomains" "UseRoutes" "UseTimezone" "ClientIdentifier" "VendorClassIdentifier" "UserClass" "DUIDType" "DUIDRawData" "IAID" "RequestBroadcast" "RouteMetric" "RouteTable" "ListenPort" "RapidCommit" @@ -292,7 +293,6 @@ let (assertValueOneOf "UseDomains" ["yes" "no" "route"]) (assertValueOneOf "UseRoutes" boolValues) (assertValueOneOf "UseTimezone" boolValues) - (assertValueOneOf "CriticalConnection" boolValues) (assertValueOneOf "RequestBroadcast" boolValues) (assertInt "RouteTable") (assertMinimum "RouteTable" 0) -- cgit v1.2.3 From fc960a012397fac681c87a20f9321b38832b2ed2 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 8 Jan 2020 20:05:41 +0100 Subject: nixos/networkd: add MaxAttempts and SendRelease to the DHCP options --- nixos/modules/system/boot/networkd.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 7b55126b1cf..d355d7ad9bd 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -279,9 +279,9 @@ let (assertOnlyFields [ "UseDNS" "RoutesToDNS" "UseNTP" "UseMTU" "Anonymize" "SendHostname" "UseHostname" "Hostname" "UseDomains" "UseRoutes" "UseTimezone" - "ClientIdentifier" "VendorClassIdentifier" "UserClass" "DUIDType" - "DUIDRawData" "IAID" "RequestBroadcast" "RouteMetric" "RouteTable" - "ListenPort" "RapidCommit" + "ClientIdentifier" "VendorClassIdentifier" "UserClass" "MaxAttempts" + "DUIDType" "DUIDRawData" "IAID" "RequestBroadcast" "RouteMetric" "RouteTable" + "ListenPort" "SendRelease" "RapidCommit" ]) (assertValueOneOf "UseDNS" boolValues) (assertValueOneOf "RoutesToDNS" boolValues) @@ -293,9 +293,11 @@ let (assertValueOneOf "UseDomains" ["yes" "no" "route"]) (assertValueOneOf "UseRoutes" boolValues) (assertValueOneOf "UseTimezone" boolValues) + (assertMinimum "MaxAttempts" 0) (assertValueOneOf "RequestBroadcast" boolValues) (assertInt "RouteTable") (assertMinimum "RouteTable" 0) + (assertValueOneOf "SendRelease" boolValues) (assertValueOneOf "RapidCommit" boolValues) ]; -- cgit v1.2.3 From bb9b61e2b7d1dd14d9685bb188d13f45cdf21ad5 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 8 Jan 2020 20:15:09 +0100 Subject: nixos/networkd: introduce the DHCPv6 network section eqivalent MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit You can now specify option for the `[DHCPv6]` section with `systemd.network..dhcpV6Config.…`. Previously you could only use the combined legacy DHCP configuration. --- nixos/modules/system/boot/networkd.nix | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index d355d7ad9bd..c4790f59dff 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -301,6 +301,16 @@ let (assertValueOneOf "RapidCommit" boolValues) ]; + checkDhcpV6 = checkUnitConfig "DHCPv6" [ + (assertOnlyFields [ + "UseDns" "UseNTP" "RapidCommit" "ForceDHCPv6PDOtherInformation" + ]) + (assertValueOneOf "UseDNS" boolValues) + (assertValueOneOf "UseNTP" boolValues) + (assertValueOneOf "RapidCommit" boolValues) + (assertValueOneOf "ForceDHCPv6PDOtherInformation" boolValues) + ]; + checkDhcpServer = checkUnitConfig "DHCPServer" [ (assertOnlyFields [ "PoolOffset" "PoolSize" "DefaultLeaseTimeSec" "MaxLeaseTimeSec" @@ -651,6 +661,18 @@ let ''; }; + dhcpV6Config = mkOption { + default = {}; + example = { UseDNS = true; UseRoutes = true; }; + type = types.addCheck (types.attrsOf unitOption) checkDhcpV6; + description = '' + Each attribute in this set specifies an option in the + [DHCPv6] section of the unit. See + systemd.network + 5 for details. + ''; + }; + dhcpServerConfig = mkOption { default = {}; example = { PoolOffset = 50; EmitDNS = false; }; @@ -980,6 +1002,11 @@ let [DHCP] ${attrsToSection def.dhcpConfig} + ''} + ${optionalString (def.dhcpV6Config != {}) '' + [DHCPv6] + ${attrsToSection def.dhcpV6Config} + ''} ${optionalString (def.dhcpServerConfig != { }) '' [DHCPServer] -- cgit v1.2.3 From 819e8bb35f4a8371ee6af77dba9b8860041956b6 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Wed, 8 Jan 2020 20:18:26 +0100 Subject: nixos/networkd: rename the networkd dhcpConfig option to dhcpV4Config This follows upstreams change in documentation. While the `[DHCP]` section might still work it is undocumented and we should probably not be using it anymore. Users can just upgrade to the new option without much hassle. I had to create a bit of custom module deprecation code since the usual approach doesn't support wildcards in the path. --- nixos/doc/manual/release-notes/rl-2009.xml | 11 +++++++++++ nixos/modules/system/boot/networkd.nix | 23 +++++++++++++++-------- nixos/modules/virtualisation/nixos-containers.nix | 2 +- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 1b40a84be55..54136ad55cd 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -300,6 +300,17 @@ environment.systemPackages = [ 5 for details. + + + The systemd-networkd option + systemd.network.networks._name_.dhcpConfig + has been renamed to + + following upstream systemd's documentation change. + See systemd.network + 5 for details. + +
diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index c4790f59dff..887d1de95ff 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -275,13 +275,13 @@ let ]) ]; - checkDhcp = checkUnitConfig "DHCP" [ + checkDhcpV4 = checkUnitConfig "DHCPv4" [ (assertOnlyFields [ "UseDNS" "RoutesToDNS" "UseNTP" "UseMTU" "Anonymize" "SendHostname" "UseHostname" "Hostname" "UseDomains" "UseRoutes" "UseTimezone" "ClientIdentifier" "VendorClassIdentifier" "UserClass" "MaxAttempts" "DUIDType" "DUIDRawData" "IAID" "RequestBroadcast" "RouteMetric" "RouteTable" - "ListenPort" "SendRelease" "RapidCommit" + "ListenPort" "SendRelease" ]) (assertValueOneOf "UseDNS" boolValues) (assertValueOneOf "RoutesToDNS" boolValues) @@ -298,7 +298,6 @@ let (assertInt "RouteTable") (assertMinimum "RouteTable" 0) (assertValueOneOf "SendRelease" boolValues) - (assertValueOneOf "RapidCommit" boolValues) ]; checkDhcpV6 = checkUnitConfig "DHCPv6" [ @@ -649,13 +648,20 @@ let ''; }; + # systemd.network.networks.*.dhcpConfig has been deprecated in favor of ….dhcpV4Config + # Produce a nice warning message so users know it is gone. dhcpConfig = mkOption { + visible = false; + apply = _: throw "The option `systemd.network.networks.*.dhcpConfig` can no longer be used since it's been removed. Please use `systemd.network.networks.*.dhcpV4Config` instead."; + }; + + dhcpV4Config = mkOption { default = {}; example = { UseDNS = true; UseRoutes = true; }; - type = types.addCheck (types.attrsOf unitOption) checkDhcp; + type = types.addCheck (types.attrsOf unitOption) checkDhcpV4; description = '' Each attribute in this set specifies an option in the - [DHCP] section of the unit. See + [DHCPv4] section of the unit. See systemd.network 5 for details. ''; @@ -998,9 +1004,9 @@ let ${concatStringsSep "\n" (map (s: "Tunnel=${s}") def.tunnel)} ${concatStringsSep "\n" (map (s: "Xfrm=${s}") def.xfrm)} - ${optionalString (def.dhcpConfig != { }) '' - [DHCP] - ${attrsToSection def.dhcpConfig} + ${optionalString (def.dhcpV4Config != { }) '' + [DHCPv4] + ${attrsToSection def.dhcpV4Config} ''} ${optionalString (def.dhcpV6Config != {}) '' @@ -1084,6 +1090,7 @@ in }; config = mkMerge [ + # .link units are honored by udev, no matter if systemd-networkd is enabled or not. { systemd.network.units = mapAttrs' (n: v: nameValuePair "${n}.link" (linkToUnit n v)) cfg.links; diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index 016d68ea301..b0fa03917c8 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -546,7 +546,7 @@ in Note that this option might require to do some adjustments to the container configuration, e.g. you might want to set - systemd.network.networks.$interface.dhcpConfig.ClientIdentifier to "mac" + systemd.network.networks.$interface.dhcpV4Config.ClientIdentifier to "mac" if you use macvlans option. This way dhcp client identifier will be stable between the container restarts. -- cgit v1.2.3 From 5abd9a74fc493c2e8be869bfb28a2f5d60ae0d6b Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sat, 7 Mar 2020 14:44:46 +0100 Subject: nixos/networkd: add ipv6PrefixDelegationConfig to networkd --- nixos/modules/system/boot/networkd.nix | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 887d1de95ff..ea86762db12 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -310,6 +310,20 @@ let (assertValueOneOf "ForceDHCPv6PDOtherInformation" boolValues) ]; + checkIpv6PrefixDelegation = checkUnitConfig "IPv6PrefixDelegation" [ + (assertOnlyFields [ + "Managed" "OtherInformation" "RouterLifetimeSec" + "RouterPreference" "EmitDNS" "DNS" "EmitDomains" "Domains" + "DNSLifetimeSec" + ]) + (assertValueOneOf "Managed" boolValues) + (assertValueOneOf "OtherInformation" boolValues) + (assertValueOneOf "RouterPreference" ["high" "medium" "low" "normal" "default"]) + (assertValueOneOf "EmitDNS" boolValues) + (assertValueOneOf "EmitDomains" boolValues) + (assertMinimum "DNSLifetimeSec" 0) + ]; + checkDhcpServer = checkUnitConfig "DHCPServer" [ (assertOnlyFields [ "PoolOffset" "PoolSize" "DefaultLeaseTimeSec" "MaxLeaseTimeSec" @@ -679,6 +693,18 @@ let ''; }; + ipv6PrefixDelegationConfig = mkOption { + default = {}; + example = { EmitDNS = true; Managed = true; OtherInformation = true; }; + type = types.addCheck (types.attrsOf unitOption) checkIpv6PrefixDelegation; + description = '' + Each attribute in this set specifies an option in the + [IPv6PrefixDelegation] section of the unit. See + systemd.network + 5 for details. + ''; + }; + dhcpServerConfig = mkOption { default = {}; example = { PoolOffset = 50; EmitDNS = false; }; @@ -1013,6 +1039,11 @@ let [DHCPv6] ${attrsToSection def.dhcpV6Config} + ''} + ${optionalString (def.ipv6PrefixDelegationConfig != {}) '' + [IPv6PrefixDelegation] + ${attrsToSection def.ipv6PrefixDelegationConfig} + ''} ${optionalString (def.dhcpServerConfig != { }) '' [DHCPServer] -- cgit v1.2.3 From 10ad353d8bb256339a30b48da3747c809f2ad0ab Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sat, 7 Mar 2020 15:06:58 +0100 Subject: nixos/networkd: add ipv6Prefix --- nixos/modules/system/boot/networkd.nix | 44 ++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index ea86762db12..b06808fd64a 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -324,6 +324,18 @@ let (assertMinimum "DNSLifetimeSec" 0) ]; + checkIpv6Prefix = checkUnitConfig "IPv6Prefix" [ + (assertOnlyFields [ + "AddressAutoconfiguration" "OnLink" "Prefix" + "PreferredLifetimeSec" "ValidLifetimeSec" + ]) + (assertValueOneOf "AddressAutoconfiguration" boolValues) + (assertValueOneOf "OnLink" boolValues) + (assertMinimum "PreferredLifetimeSec" 0) + (assertMinimum "ValidLifetimeSec" 0) + ]; + + checkDhcpServer = checkUnitConfig "DHCPServer" [ (assertOnlyFields [ "PoolOffset" "PoolSize" "DefaultLeaseTimeSec" "MaxLeaseTimeSec" @@ -647,6 +659,22 @@ let }; }; + ipv6PrefixOptions = { + options = { + ipv6PrefixConfig = mkOption { + default = {}; + example = { Prefix = "fd00::/64"; }; + type = types.addCheck (types.attrsOf unitOption) checkIpv6Prefix; + description = '' + Each attribute in this set specifies an option in the + [IPv6Prefix] section of the unit. See + systemd.network + 5 for details. + ''; + }; + }; + }; + networkOptions = commonNetworkOptions // { @@ -705,6 +733,17 @@ let ''; }; + ipv6Prefixes = mkOption { + default = []; + example = { AddressAutoconfiguration = true; OnLink = true; }; + type = with types; listOf (submodule ipv6PrefixOptions); + description = '' + A list of ipv6Prefix sections to be added to the unit. See + systemd.network + 5 for details. + ''; + }; + dhcpServerConfig = mkOption { default = {}; example = { PoolOffset = 50; EmitDNS = false; }; @@ -1045,6 +1084,11 @@ let ${attrsToSection def.ipv6PrefixDelegationConfig} ''} + ${flip concatMapStrings def.ipv6Prefixes (x: '' + [IPv6Prefix] + ${attrsToSection x.ipv6PrefixConfig} + + '')} ${optionalString (def.dhcpServerConfig != { }) '' [DHCPServer] ${attrsToSection def.dhcpServerConfig} -- cgit v1.2.3 From 00215e5bc0f046b0da8af5f5955b13ee8d915d51 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Sat, 7 Mar 2020 23:29:37 +0100 Subject: nixos/networkd: support PrefixDelegationHint in DHCPv6 section With sytemd v244 we will have support for this option. --- nixos/modules/system/boot/networkd.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index b06808fd64a..9b34b12e73a 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -303,6 +303,7 @@ let checkDhcpV6 = checkUnitConfig "DHCPv6" [ (assertOnlyFields [ "UseDns" "UseNTP" "RapidCommit" "ForceDHCPv6PDOtherInformation" + "PrefixDelegationHint" ]) (assertValueOneOf "UseDNS" boolValues) (assertValueOneOf "UseNTP" boolValues) -- cgit v1.2.3 From d67098ec2e0d895461456bd97c5b7be463f474f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 1 May 2020 12:36:18 +0100 Subject: appimage: fix r2 commands with newer radare2 version --- pkgs/build-support/appimage/appimage-exec.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/appimage/appimage-exec.sh b/pkgs/build-support/appimage/appimage-exec.sh index 1273effe5fe..15eafc58a1e 100755 --- a/pkgs/build-support/appimage/appimage-exec.sh +++ b/pkgs/build-support/appimage/appimage-exec.sh @@ -17,7 +17,7 @@ unpack() { local appimageType=0 # https://github.com/AppImage/libappimage/blob/ca8d4b53bed5cbc0f3d0398e30806e0d3adeaaab/src/libappimage/utils/MagicBytesChecker.cpp#L45-L63 - eval "$(r2 "$src" -nn -Nqc "p8j 3 @ 8" | + eval "$(r2 -nn -Nqc "p8j 3 @ 8" "$src"| jq -r '{appimageSignature: (.[:-1]|implode), appimageType: .[-1]}| @sh "appimageSignature=\(.appimageSignature) appimageType=\(.appimageType)"')" @@ -38,7 +38,7 @@ unpack() { # multiarch offset one-liner using same method as AppImage # see https://gist.github.com/probonopd/a490ba3401b5ef7b881d5e603fa20c93 - offset=$(r2 "$src" -nn -Nqc "pfj.elf_header @ 0" |\ + offset=$(r2 -nn -Nqc "pfj.elf_header @ 0" "$src"|\ jq 'map({(.name): .value}) | add | .shoff + (.shnum * .shentsize)') echo "Uncompress $(basename "$src") of type $appimageType @ offset $offset." -- cgit v1.2.3 From 5569860b1fe5c13be80febeb98a14d2f73884fe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 1 May 2020 12:45:13 +0100 Subject: unityhub: ? -> 2.3.1 Fix future breakages by mirroring the source --- pkgs/development/tools/unityhub/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/unityhub/default.nix b/pkgs/development/tools/unityhub/default.nix index 2939df0ba20..bb84584e836 100644 --- a/pkgs/development/tools/unityhub/default.nix +++ b/pkgs/development/tools/unityhub/default.nix @@ -1,6 +1,8 @@ { stdenv, fetchurl, appimageTools, gsettings-desktop-schemas, gtk3 }: -appimageTools.wrapType2 rec { +let + version = "2.3.1"; +in appimageTools.wrapType2 rec { name = "unityhub"; extraPkgs = (pkgs: with pkgs; with xorg; [ gtk2 gdk_pixbuf glib libGL libGLU nss nspr @@ -16,8 +18,9 @@ appimageTools.wrapType2 rec { ''; src = fetchurl { - url = "https://public-cdn.cloud.unity3d.com/hub/prod/UnityHub.AppImage"; - sha256 = "05p5kqbwgqyk2aw2lix5dk1ql16aj6iczxrc63a1l0vj8wrha7z4"; + # mirror of https://public-cdn.cloud.unity3d.com/hub/prod/UnityHub.AppImage + url = "https://archive.org/download/unity-hub-${version}/UnityHub.AppImage"; + sha256 = "09nrgjlknl3hgrrl7rc79bmbrq6r6sl49dw0cmvs37vjqnvlr8ny"; }; meta = with stdenv.lib; { -- cgit v1.2.3 From dd16c3944c062ec7617981cd9a54d51925c73d19 Mon Sep 17 00:00:00 2001 From: Daniel Frank Date: Fri, 1 May 2020 14:25:42 +0200 Subject: p7zip: fix two CVEs --- pkgs/tools/archivers/p7zip/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 3f0c2487c91..7e384902098 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, enableUnfree ? false }: +{ stdenv, fetchurl, fetchpatch, lib, enableUnfree ? false }: stdenv.mkDerivation rec { pname = "p7zip"; @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { patches = [ ./12-CVE-2016-9296.patch ./13-CVE-2017-17969.patch + (fetchpatch { + url = "https://raw.githubusercontent.com/termux/termux-packages/master/packages/p7zip/3-CVE-2018-5996.patch"; + sha256 = "1zivvkazmza0653i498ccp3zbpbpc7dvxl3zxwllbx41b6n589yp"; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/termux/termux-packages/master/packages/p7zip/4-CVE-2018-10115.patch"; + sha256 = "1cr7q8gnrk9yp6dcvxaqi1yhdbgp964nkv65ls41mw1kdfm44zn6"; + }) ]; # Default makefile is full of impurities on Darwin. The patch doesn't hurt Linux so I'm leaving it unconditional -- cgit v1.2.3 From aa80b4780d849a00d86c28d6b3c78a777dd02e9a Mon Sep 17 00:00:00 2001 From: Daniel Frank Date: Thu, 30 Apr 2020 20:18:40 +0200 Subject: p7zip: mark as insecure --- pkgs/tools/archivers/p7zip/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 7e384902098..b7a97b3766b 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -57,6 +57,11 @@ stdenv.mkDerivation rec { description = "A port of the 7-zip archiver"; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.raskin ]; + knownVulnerabilities = [ + # p7zip is abandoned, according to this thread on its forums: + # https://sourceforge.net/p/p7zip/discussion/383043/thread/fa143cf2/#1817 + "p7zip is abandoned and may not receive important security fixes" + ]; # RAR code is under non-free UnRAR license, but we remove it license = if enableUnfree then lib.licenses.unfree else lib.licenses.lgpl2Plus; }; -- cgit v1.2.3 From ac8066c144c76dfbc99a866049b61acaaccb470f Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 30 Apr 2020 02:29:10 +0200 Subject: memtest86-efi: replace p7zip with mtools and dd --- pkgs/tools/misc/memtest86-efi/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/memtest86-efi/default.nix b/pkgs/tools/misc/memtest86-efi/default.nix index 9f029ee5ded..f2adadc0840 100644 --- a/pkgs/tools/misc/memtest86-efi/default.nix +++ b/pkgs/tools/misc/memtest86-efi/default.nix @@ -1,4 +1,4 @@ -{ fetchzip, lib, p7zip, stdenv }: +{ fetchzip, lib, stdenv, mtools }: stdenv.mkDerivation rec { pname = "memtest86-efi"; @@ -22,19 +22,19 @@ stdenv.mkDerivation rec { stripRoot = false; }; - nativeBuildInputs = [ p7zip ]; + nativeBuildInputs = [ mtools ]; installPhase = '' - mkdir -p $out + mkdir -p $out $TEMP/memtest86-files # memtest86 is distributed as a bootable USB image. It contains the actual # memtest86 EFI app. # - # The following command uses p7zip to extract the actual EFI app from the + # The following uses dd and mcopy to extract the actual EFI app from the # usb image so that it can be installed directly on the hard drive. - 7z x -o$TEMP/temp-efi-dirs $src/memtest86-usb.img - 7z x -o$TEMP/memtest86-files $TEMP/temp-efi-dirs/EFI\ System\ Partition.img - cp -r $TEMP/memtest86-files/EFI/BOOT/* $out/ + dd if=$src/memtest86-usb.img of=$TEMP/ESP.img skip=2048 + mcopy -i $TEMP/ESP.img ::/EFI/BOOT/ $TEMP/memtest86-files/ + mv $TEMP/memtest86-files/BOOT/* $out/ ''; meta = with lib; { -- cgit v1.2.3 From ac1f36ca1683a01d09ee5754fb96a160201362ad Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 1 May 2020 09:33:21 -0400 Subject: oh-my-zsh: 2020-04-26 -> 2020-04-30 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index f6c3425f285..6e679f16e30 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2020-04-26"; + version = "2020-04-30"; pname = "oh-my-zsh"; - rev = "c686aa3dbb30704b2f8f52bf1aae19a7e41c23c1"; + rev = "06b0276675e978d80535259915fbb44011e10101"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "022ddr8p0kjin2374z5icvcrbw9q77gm5jxqvvgkrhqg8lp6n14l"; + sha256 = "1y1c8v2akxwffrmcq8lmxvdnirqkxbxbrhcws76dlcgp2m3drvgq"; }; pathsToLink = [ "/share/oh-my-zsh" ]; -- cgit v1.2.3 From df2f8d915051d3d494ba7cb572c66c84bef84dcf Mon Sep 17 00:00:00 2001 From: Ed Cragg Date: Fri, 1 May 2020 11:43:56 +0100 Subject: thelounge: write out default path for thelounge The output file is found and handled by thelounge itself [1], leaving the user free to override THELOUNGE_HOME in the environment if they choose, but having a sensible default to make `thelounge` generally usable in most cases. This solution follows discussion on #70318. [1] https://github.com/thelounge/thelounge/blob/9ef5c6c67e463c1f401e33b21dfb5641636e5ed1/src/command-line/utils.js#L56 --- nixos/modules/services/networking/thelounge.nix | 1 - pkgs/development/node-packages/default-v10.nix | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/thelounge.nix b/nixos/modules/services/networking/thelounge.nix index 875d8f66169..a1b06703484 100644 --- a/nixos/modules/services/networking/thelounge.nix +++ b/nixos/modules/services/networking/thelounge.nix @@ -62,7 +62,6 @@ in { systemd.services.thelounge = { description = "The Lounge web IRC client"; wantedBy = [ "multi-user.target" ]; - environment = { THELOUNGE_HOME = dataDir; }; preStart = "ln -sf ${pkgs.writeText "config.js" configJsData} ${dataDir}/config.js"; serviceConfig = { User = "thelounge"; diff --git a/pkgs/development/node-packages/default-v10.nix b/pkgs/development/node-packages/default-v10.nix index 5d7e2c7668f..9e9d8894f0d 100644 --- a/pkgs/development/node-packages/default-v10.nix +++ b/pkgs/development/node-packages/default-v10.nix @@ -125,5 +125,8 @@ nodePackages // { thelounge = nodePackages.thelounge.override { buildInputs = [ nodePackages.node-pre-gyp ]; + postInstall = '' + echo /var/lib/thelounge > $out/lib/node_modules/thelounge/.thelounge_home + ''; }; } -- cgit v1.2.3 From b76765516f55c811041d12867d6b2b9e448eaebe Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Fri, 1 May 2020 13:50:16 +0000 Subject: procs: 0.10.0 -> 0.10.1 --- pkgs/tools/admin/procs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/procs/default.nix b/pkgs/tools/admin/procs/default.nix index 180764bd8c9..a4998d8546b 100644 --- a/pkgs/tools/admin/procs/default.nix +++ b/pkgs/tools/admin/procs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "1bgsxvb9wxi4sz8jfamhdwaq9f2q2k7c3cdkk60k86mkmas8ibxz"; + sha256 = "0waqkb1l66yk2gbqzybrh3yzf72gvyjsrvv3zyxpxzsgawrcx85g"; }; - cargoSha256 = "0zf41clf3rqxmal894gqp9fn9bnas99wna13fc43fxdlvh92v4yh"; + cargoSha256 = "0z4m7aslgwvbfm6af03d8ql6c4w83h0kwgbgy6sfsx1gf7kv6q6z"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; -- cgit v1.2.3 From 2aebb2375c7ee6ff3552e31e2f17c1788af7ec81 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Sun, 23 Feb 2020 18:34:56 -0500 Subject: programs/chromium: allow extensions outside chrome web store --- nixos/modules/programs/chromium.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/modules/programs/chromium.nix b/nixos/modules/programs/chromium.nix index 41c49db8c71..16c063ebc89 100644 --- a/nixos/modules/programs/chromium.nix +++ b/nixos/modules/programs/chromium.nix @@ -9,9 +9,7 @@ let HomepageLocation = cfg.homepageLocation; DefaultSearchProviderSearchURL = cfg.defaultSearchProviderSearchURL; DefaultSearchProviderSuggestURL = cfg.defaultSearchProviderSuggestURL; - ExtensionInstallForcelist = map (extension: - "${extension};https://clients2.google.com/service/update2/crx" - ) cfg.extensions; + ExtensionInstallForcelist = cfg.extensions; }; in @@ -28,7 +26,11 @@ in List of chromium extensions to install. For list of plugins ids see id in url of extensions on chrome web store - page. + page. To install a chromium extension not included in the chrome web + store, append to the extension id a semicolon ";" followed by a URL + pointing to an Update Manifest XML file. See + ExtensionInstallForcelist + for additional details. ''; default = []; example = literalExample '' -- cgit v1.2.3 From 8855c3a1c728a16b4a9e5e4071d7fc63ef63973a Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 1 May 2020 13:23:15 +0200 Subject: terminator: 1.91 -> 1.92 --- pkgs/applications/misc/terminator/default.nix | 54 +++++++++++++++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 44 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/misc/terminator/default.nix b/pkgs/applications/misc/terminator/default.nix index ea73d5cbb68..f59b534a9c6 100644 --- a/pkgs/applications/misc/terminator/default.nix +++ b/pkgs/applications/misc/terminator/default.nix @@ -1,24 +1,56 @@ -{ stdenv, fetchurl, python2, keybinder3, intltool, file, gtk3, gobject-introspection -, libnotify, wrapGAppsHook, vte +{ stdenv +, fetchFromGitHub +, python +, keybinder3 +, intltool +, file +, gtk3 +, gobject-introspection +, libnotify +, wrapGAppsHook +, vte }: -python2.pkgs.buildPythonApplication rec { +python.pkgs.buildPythonApplication rec { name = "terminator-${version}"; - version = "1.91"; + version = "1.92"; - src = fetchurl { - url = "https://launchpad.net/terminator/gtk3/${version}/+download/${name}.tar.gz"; - sha256 = "95f76e3c0253956d19ceab2f8da709a496f1b9cf9b1c5b8d3cd0b6da3cc7be69"; + src = fetchFromGitHub { + owner = "gnome-terminator"; + repo = "terminator"; + rev = "bb24273eb40dc5eac97de74064488701fa40a743"; + sha256 = "105f660wzf9cpn24xzwaaa09igg5h3qhchafv190v5nqck6g1ssh"; }; - nativeBuildInputs = [ file intltool wrapGAppsHook gobject-introspection ]; - buildInputs = [ gtk3 vte libnotify keybinder3 + nativeBuildInputs = [ + file + intltool + gobject-introspection + wrapGAppsHook + ]; + + buildInputs = [ + gtk3 gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 + keybinder3 + libnotify + python + vte + ]; + + propagatedBuildInputs = with python.pkgs; [ + configobj + dbus-python + pygobject3 + psutil + pycairo ]; - propagatedBuildInputs = with python2.pkgs; [ pygobject3 psutil pycairo ]; postPatch = '' patchShebangs . + # dbus-python is correctly passed in propagatedBuildInputs, but for some reason setup.py complains. + # The wrapped terminator has the correct path added, so ignore this. + substituteInPlace setup.py --replace "'dbus-python'," "" ''; checkPhase = '' @@ -33,7 +65,7 @@ python2.pkgs.buildPythonApplication rec { quadkonsole, etc. in that the main focus is arranging terminals in grids (tabs is the most common default method, which Terminator also supports). ''; - homepage = "https://gnometerminator.blogspot.no/p/introduction.html"; + homepage = "https://github.com/gnome-terminator/terminator"; license = licenses.gpl2; maintainers = with maintainers; [ bjornfor ]; platforms = platforms.linux; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e7dd8d50444..59922f5ff98 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22034,7 +22034,7 @@ in terminal-notifier = callPackage ../applications/misc/terminal-notifier {}; - terminator = callPackage ../applications/misc/terminator { }; + terminator = callPackage ../applications/misc/terminator { python = python3; }; terminus = callPackage ../applications/misc/terminus { }; -- cgit v1.2.3 From a3ddfec8e034c24dfc81da118749819e958c1516 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Fri, 1 May 2020 14:16:25 +0000 Subject: wormhole: init at 0.1.5 --- pkgs/tools/networking/wormhole/default.nix | 33 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/tools/networking/wormhole/default.nix diff --git a/pkgs/tools/networking/wormhole/default.nix b/pkgs/tools/networking/wormhole/default.nix new file mode 100644 index 00000000000..2b826224f42 --- /dev/null +++ b/pkgs/tools/networking/wormhole/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, rustPlatform +, fetchFromGitHub +, openssl +, pkg-config +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "wormhole"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "agrinman"; + repo = pname; + rev = version; + sha256 = "0aq2myzqd9xqz4zdl03jhdd7f22y9k39xdhiark6ymhwcxijsq8y"; + }; + + cargoSha256 = "1gjqiv8sgdab0i461v72zcvh91cpqmmpcc3qyx3svq0391rwzp46"; + + nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + buildInputs = [ ] + ++ stdenv.lib.optionals stdenv.isLinux [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; + + meta = with stdenv.lib; { + description = "Expose your local web server to the internet with a public URL"; + homepage = "https://tunnelto.dev"; + license = licenses.mit; + maintainers = with maintainers; [ filalex77 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 045eee89052..aa4fd86b437 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7367,6 +7367,10 @@ in wootility = callPackage ../tools/misc/wootility { }; + wormhole = callPackage ../tools/networking/wormhole { + inherit (darwin.apple_sdk.frameworks) Security; + }; + wpscan = callPackage ../tools/security/wpscan { }; wsmancli = callPackage ../tools/system/wsmancli {}; -- cgit v1.2.3 From b503187046faf8bb5f96d4c1ca5ece36e4ff08e6 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Fri, 1 May 2020 14:28:35 +0000 Subject: gitAndTools.gitui: init at 0.2.0 --- .../version-management/git-and-tools/default.nix | 4 ++++ .../git-and-tools/gitui/default.nix | 24 ++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/gitui/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 4d6b0511a2a..c591ef554ee 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -173,6 +173,10 @@ let gitstatus = callPackage ./gitstatus { }; + gitui = callPackage ./gitui { + inherit (darwin.apple_sdk.frameworks) Security; + }; + grv = callPackage ./grv { }; hub = callPackage ./hub { }; diff --git a/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/pkgs/applications/version-management/git-and-tools/gitui/default.nix new file mode 100644 index 00000000000..f215b7986f8 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -0,0 +1,24 @@ +{ stdenv, rustPlatform, fetchFromGitHub, libiconv, Security }: + +rustPlatform.buildRustPackage rec { + pname = "gitui"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "extrawurst"; + repo = pname; + rev = "v${version}"; + sha256 = "06x4a7ynq6vznjwdm0dhzlj9353skxz65xabwr5xxa85zp2a7vcm"; + }; + + cargoSha256 = "08z3z1m0ik62gzj146a4imk4xx5n8sbvjs0w7gkclvlsvm9dp8q4"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + + meta = with stdenv.lib; { + description = "Blazing fast terminal-ui for git written in rust"; + homepage = "https://github.com/extrawurst/gitui"; + license = licenses.mit; + maintainers = with maintainers; [ filalex77 ]; + }; +} -- cgit v1.2.3 From 4a5b85364e8ef155445643e89c8e04e0d010bd0d Mon Sep 17 00:00:00 2001 From: paumr Date: Fri, 1 May 2020 16:44:31 +0200 Subject: qutebrowser: 1.10.1 -> 1.11.0 --- pkgs/applications/networking/browsers/qutebrowser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 537bb0ebf2e..d75be65c196 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -21,12 +21,12 @@ let in mkDerivationWith python3Packages.buildPythonApplication rec { pname = "qutebrowser"; - version = "1.10.1"; + version = "1.11.0"; # the release tarballs are different from the git checkout! src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "06bcnsfb4kz92bh8xjxwaghhy9x2mmcb76wk3fv868jb1ga75vd8"; + sha256 = "0b0qlki9bp9mm41lrh6rc6qqvm4nsz8da63sby3a1f2xm9b9vvg2"; }; # Needs tox -- cgit v1.2.3 From 7259b4ce12112dc23dbd3d742ff3e547dc6fd8f9 Mon Sep 17 00:00:00 2001 From: Serg Nesterov Date: Fri, 1 May 2020 17:46:05 +0300 Subject: Install shell completions --- pkgs/tools/misc/tmuxinator/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix index abfa19b376c..ae8e7926eb9 100644 --- a/pkgs/tools/misc/tmuxinator/default.nix +++ b/pkgs/tools/misc/tmuxinator/default.nix @@ -1,4 +1,4 @@ -{ lib, buildRubyGem, ruby }: +{ lib, buildRubyGem, ruby, installShellFiles }: # Cannot use bundleEnv because bundleEnv create stub with # BUNDLE_FROZEN='1' environment variable set, which broke everything @@ -37,6 +37,12 @@ buildRubyGem rec { propagatedBuildInputs = [ erubis thor xdg ]; + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion $GEM_HOME/gems/${gemName}-${version}/completion/tmuxinator.{bash,zsh,fish} + ''; + meta = with lib; { description = "Manage complex tmux sessions easily"; homepage = "https://github.com/tmuxinator/tmuxinator"; -- cgit v1.2.3 From 2bfeadace746639004ccaecd8562cd3b0d51d98d Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Fri, 1 May 2020 14:50:04 +0000 Subject: intermodal: init at 0.1.7 --- pkgs/tools/misc/intermodal/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/misc/intermodal/default.nix diff --git a/pkgs/tools/misc/intermodal/default.nix b/pkgs/tools/misc/intermodal/default.nix new file mode 100644 index 00000000000..8a2412f86ef --- /dev/null +++ b/pkgs/tools/misc/intermodal/default.nix @@ -0,0 +1,25 @@ +{ stdenv, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "intermodal"; + version = "0.1.7"; + + src = fetchFromGitHub { + owner = "casey"; + repo = pname; + rev = "v${version}"; + sha256 = "05wjzx1ibd7cyl5lgmmn5y8dhsk71wz2bnimbmq7z51ds6cbyw5i"; + }; + + cargoSha256 = "04xqk1mmbrz8bjn36nxabwla3y62wfdly5bckkya6y2dhf1vkdjq"; + + # include_hidden test tries to use `chflags` on darwin + checkFlagsArray = stdenv.lib.optionals stdenv.isDarwin [ "--skip=subcommand::torrent::create::tests::include_hidden" ]; + + meta = with stdenv.lib; { + description = "User-friendly and featureful command-line BitTorrent metainfo utility"; + homepage = "https://github.com/casey/intermodal"; + license = licenses.cc0; + maintainers = with maintainers; [ filalex77 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa4fd86b437..831aa2e45f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4289,6 +4289,8 @@ in intel-media-sdk = callPackage ../development/libraries/intel-media-sdk { }; + intermodal = callPackage ../tools/misc/intermodal { }; + invoice2data = callPackage ../tools/text/invoice2data { }; inxi = callPackage ../tools/system/inxi { }; -- cgit v1.2.3 From 47529bcf7ffed09f7ab97a3b8287cae77b3c1fec Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Fri, 1 May 2020 15:12:19 +0200 Subject: nixos/tests: add systemd-networkd-ipv6-prefix-delegation This is a follow-up to the PR #82026 that contains the promised tests. In this test I am testing if we can properly propagate prefixes received via DHCPv6 PD with the networkd options in our module system. The comments in the test should be sufficient to follow the idea and what is going on. --- nixos/tests/all-tests.nix | 1 + .../systemd-networkd-ipv6-prefix-delegation.nix | 295 +++++++++++++++++++++ 2 files changed, 296 insertions(+) create mode 100644 nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 38e8980b748..eff1752bbbf 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -302,6 +302,7 @@ in systemd-networkd-vrf = handleTest ./systemd-networkd-vrf.nix {}; systemd-networkd = handleTest ./systemd-networkd.nix {}; systemd-networkd-dhcpserver = handleTest ./systemd-networkd-dhcpserver.nix {}; + systemd-networkd-ipv6-prefix-delegation = handleTest ./systemd-networkd-ipv6-prefix-delegation.nix {}; systemd-nspawn = handleTest ./systemd-nspawn.nix {}; pdns-recursor = handleTest ./pdns-recursor.nix {}; taskserver = handleTest ./taskserver.nix {}; diff --git a/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix b/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix new file mode 100644 index 00000000000..99cd341eec1 --- /dev/null +++ b/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix @@ -0,0 +1,295 @@ +# This test verifies that we can request and assign IPv6 prefixes from upstream +# (e.g. ISP) routers. +# The setup consits of three VMs. One for the ISP, as your residential router +# and the third as a client machine in the residential network. +# +# There are two VLANs in this test: +# - VLAN 1 is the connection between the ISP and the router +# - VLAN 2 is the connection between the router and the client + +import ./make-test-python.nix ({pkgs, ...}: { + name = "systemd-networkd-ipv6-prefix-delegation"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ andir ]; + }; + nodes = { + + # The ISP's routers job is to delegate IPv6 prefixes via DHCPv6. Like with + # regular IPv6 auto-configuration it will also emit IPv6 router + # advertisements (RAs). Those RA's will not carry a prefix but in contrast + # just set the "Other" flag to indicate to the receiving nodes that they + # should attempt DHCPv6. + # + # Note: On the ISPs device we don't really care if we are using networkd in + # this example. That being said we can't use it (yet) as networkd doesn't + # implement the serving side of DHCPv6. We will use ISC's well aged dhcpd6 + # for that task. + isp = { lib, pkgs, ... }: { + virtualisation.vlans = [ 1 ]; + networking = { + useDHCP = false; + firewall.enable = false; + interfaces.eth1.ipv4.addresses = lib.mkForce []; # no need for legacy IP + interfaces.eth1.ipv6.addresses = lib.mkForce [ + { address = "2001:DB8::"; prefixLength = 64; } + ]; + }; + + # Since we want to program the routes that we delegate to the "customer" + # into our routing table we must have a way to gain the required privs. + # This security wrapper will do in our test setup. + # + # DO NOT COPY THIS TO PRODUCTION AS IS. Think about it at least twice. + # Everyone on the "isp" machine will be able to add routes to the kernel. + security.wrappers.add-dhcpd-lease = { + source = pkgs.writeShellScript "add-dhcpd-lease" '' + exec ${pkgs.iproute}/bin/ip -6 route replace "$1" via "$2" + ''; + capabilities = "cap_net_admin+ep"; + }; + services = { + # Configure the DHCPv6 server + # + # We will hand out /48 prefixes from the subnet 2001:DB8:F000::/36. + # That gives us ~8k prefixes. That should be enough for this test. + # + # Since (usually) you will not receive a prefix with the router + # advertisements we also hand out /128 leases from the range + # 2001:DB8:0000:0000:FFFF::/112. + dhcpd6 = { + enable = true; + interfaces = [ "eth1" ]; + extraConfig = '' + subnet6 2001:DB8::/36 { + range6 2001:DB8:0000:0000:FFFF:: 2001:DB8:0000:0000:FFFF::FFFF; + prefix6 2001:DB8:F000:: 2001:DB8:FFFF:: /48; + } + + # This is the secret sauce. We have to extract the prefix and the + # next hop when commiting the lease to the database. dhcpd6 + # (rightfully) has not concept of adding routes to the systems + # routing table. It really depends on the setup. + # + # In a production environment your DHCPv6 server is likely not the + # router. You might want to consider BGP, custom NetConf calls, … + # in those cases. + on commit { + set IP = pick-first-value(binary-to-ascii(16, 16, ":", substring(option dhcp6.ia-na, 16, 16)), "n/a"); + set Prefix = pick-first-value(binary-to-ascii(16, 16, ":", suffix(option dhcp6.ia-pd, 16)), "n/a"); + set PrefixLength = pick-first-value(binary-to-ascii(10, 8, ":", substring(suffix(option dhcp6.ia-pd, 17), 0, 1)), "n/a"); + log(concat(IP, " ", Prefix, " ", PrefixLength)); + execute("/run/wrappers/bin/add-dhcpd-lease", concat(Prefix,"/",PrefixLength), IP); + } + ''; + }; + + # Finally we have to set up the router advertisements. While we could be + # using networkd or bird for this task `radvd` is probably the most + # venerable of them all. It was made explicitly for this purpose and + # the configuration is much more straightforward than what networkd + # requires. + # As outlined above we will have to set the `Managed` flag as otherwise + # the clients will not know if they should do DHCPv6. (Some do + # anyway/always) + radvd = { + enable = true; + config = '' + interface eth1 { + AdvSendAdvert on; + AdvManagedFlag on; + AdvOtherConfigFlag off; # we don't really have DNS or NTP or anything like that to distribute + prefix ::/64 { + AdvOnLink on; + AdvAutonomous on; + }; + }; + ''; + }; + + }; + }; + + # This will be our (residential) router that receives the IPv6 prefix (IA_PD) + # and /128 (IA_NA) allocation. + # + # Here we will actually start using networkd. + router = { + virtualisation.vlans = [ 1 2 ]; + systemd.services.systemd-networkd.environment.SYSTEMD_LOG_LEVEL = "debug"; + + boot.kernel.sysctl = { + # we want to forward packets from the ISP to the client and back. + "net.ipv6.conf.all.forwarding" = 1; + }; + + networking = { + useNetworkd = true; + useDHCP = false; + # Consider enabling this in production and generating firewall rules + # for fowarding/input from the configured interfaces so you do not have + # to manage multiple places + firewall.enable = false; + }; + + systemd.network = { + networks = { + # systemd-networkd will load the first network unit file + # that matches, ordered lexiographically by filename. + # /etc/systemd/network/{40-eth1,99-main}.network already + # exists. This network unit must be loaded for the test, + # however, hence why this network is named such. + + # Configuration of the interface to the ISP. + # We must request accept RAs and request the PD prefix. + "01-eth1" = { + name = "eth1"; + networkConfig = { + Description = "ISP interface"; + IPv6AcceptRA = true; + #DHCP = false; # no need for legacy IP + }; + linkConfig = { + # We care about this interface when talking about being "online". + # If this interface is in the `routable` state we can reach + # others and they should be able to reach us. + RequiredForOnline = "routable"; + }; + # This configures the DHCPv6 client part towards the ISPs DHCPv6 server. + dhcpV6Config = { + # We have to include a request for a prefix in our DHCPv6 client + # request packets. + # Otherwise the upstream DHCPv6 server wouldn't know if we want a + # prefix or not. Note: On some installation it makes sense to + # always force that option on the DHPCv6 server since there are + # certain CPEs that are just not setting this field but happily + # accept the delegated prefix. + PrefixDelegationHint = "::/48"; + }; + ipv6PrefixDelegationConfig = { + # Let networkd know that we would very much like to use DHCPv6 + # to obtain the "managed" information. Not sure why they can't + # just take that from the upstream RAs. + Managed = true; + }; + }; + + # Interface to the client. Here we should redistribute a /64 from + # the prefix we received from the ISP. + "01-eth2" = { + name = "eth2"; + networkConfig = { + Description = "Client interface"; + # the client shouldn't be allowed to send us RAs, that would be weird. + IPv6AcceptRA = false; + + # Just delegate prefixes from the DHCPv6 PD pool. + # If you also want to distribute a local ULA prefix you want to + # set this to `yes` as that includes both static prefixes as well + # as PD prefixes. + IPv6PrefixDelegation = "dhcpv6"; + }; + # finally "act as router" (according to systemd.network(5)) + ipv6PrefixDelegationConfig = { + RouterLifetimeSec = 300; # required as otherwise no RA's are being emitted + + # In a production environment you should consider setting these as well: + #EmitDNS = true; + #EmitDomains = true; + #DNS= = "fe80::1"; # or whatever "well known" IP your router will have on the inside. + }; + + # This adds a "random" ULA prefix to the interface that is being + # advertised to the clients. + # Not used in this test. + # ipv6Prefixes = [ + # { + # ipv6PrefixConfig = { + # AddressAutoconfiguration = true; + # PreferredLifetimeSec = 1800; + # ValidLifetimeSec = 1800; + # }; + # } + # ]; + }; + + # finally we are going to add a static IPv6 unique local address to + # the "lo" interface. This will serve as ICMPv6 echo target to + # verify connectivity from the client to the router. + "01-lo" = { + name = "lo"; + addresses = [ + { addressConfig.Address = "FD42::1/128"; } + ]; + }; + }; + }; + + # make the network-online target a requirement, we wait for it in our test script + systemd.targets.network-online.wantedBy = [ "multi-user.target" ]; + }; + + # This is the client behind the router. We should be receving router + # advertisements for both the ULA and the delegated prefix. + # All we have to do is boot with the default (networkd) configuration. + client = { + virtualisation.vlans = [ 2 ]; + systemd.services.systemd-networkd.environment.SYSTEMD_LOG_LEVEL = "debug"; + networking = { + useNetworkd = true; + useDHCP = false; + }; + + # make the network-online target a requirement, we wait for it in our test script + systemd.targets.network-online.wantedBy = [ "multi-user.target" ]; + }; + }; + + testScript = '' + # First start the router and wait for it it reach a state where we are + # certain networkd is up and it is able to send out RAs + router.start() + router.wait_for_unit("systemd-networkd.service") + + # After that we can boot the client and wait for the network online target. + # Since we only care about IPv6 that should not involve waiting for legacy + # IP leases. + client.start() + client.wait_for_unit("network-online.target") + + # the static address on the router should not be reachable + client.wait_until_succeeds("ping -6 -c 1 FD42::1") + + # the global IP of the ISP router should still not be a reachable + router.fail("ping -6 -c 1 2001:DB8::") + + # Once we have internal connectivity boot up the ISP + isp.start() + + # Since for the ISP "being online" should have no real meaning we just + # wait for the target where all the units have been started. + # It probably still takes a few more seconds for all the RA timers to be + # fired etc.. + isp.wait_for_unit("multi-user.target") + + # wait until the uplink interface has a good status + router.wait_for_unit("network-online.target") + router.wait_until_succeeds("ping -6 -c1 2001:DB8::") + + # shortly after that the client should have received it's global IPv6 + # address and thus be able to ping the ISP + client.wait_until_succeeds("ping -6 -c1 2001:DB8::") + + # verify that we got a globally scoped address in eth1 from the + # documentation prefix + ip_output = client.succeed("ip --json -6 address show dev eth1") + + import json + + ip_json = json.loads(ip_output)[0] + assert any( + addr["local"].upper().startswith("2001:DB8:") + for addr in ip_json["addr_info"] + if addr["scope"] == "global" + ) + ''; +}) -- cgit v1.2.3 From 260be737080605eff59664d74665d6230523d7ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Sun, 26 Apr 2020 17:14:14 +0200 Subject: ghostscript: apply patch to fix parallel build The build process of ghostscript has missing dependencies, causing failures in parallel builds (see hydra build https://hydra.nixos.org/build/117095669/, reported as ghostscript bug https://bugs.ghostscript.com/show_bug.cgi?id=702364 here) --- ...ug-702364-Fix-missing-echogs-dependencies.patch | 862 +++++++++++++++++++++ pkgs/misc/ghostscript/default.nix | 3 + 2 files changed, 865 insertions(+) create mode 100644 pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch diff --git a/pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch b/pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch new file mode 100644 index 00000000000..c914634f579 --- /dev/null +++ b/pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch @@ -0,0 +1,862 @@ +From 9f56e78d111d726ca95a59b2d64e5c3298451505 Mon Sep 17 00:00:00 2001 +From: Chris Liddell +Date: Mon, 27 Apr 2020 11:04:57 +0100 +Subject: [PATCH] Bug 702364: Fix missing echogs dependencies + +Rebased version of http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=1b4c3669a20c +to fix parallel build +--- + contrib/contrib.mak | 281 ++++++++++++++++++++++---------------------- + 1 file changed, 143 insertions(+), 138 deletions(-) + +diff --git a/contrib/contrib.mak b/contrib/contrib.mak +index 5411ae902..7dd9822a9 100644 +--- a/contrib/contrib.mak ++++ b/contrib/contrib.mak +@@ -22,6 +22,10 @@ + CONTRIB_MAK=$(CONTRIBDIR)$(D)contrib.mak $(TOP_MAKEFILES) + CONTRIBSRC=$(CONTRIBDIR)$(D) + ++# Almost all device drivers depend on the following: ++CONTDEVH=$(gserrors_h) $(gx_h) $(gxdevice_h) ++CONTDEV=$(AK) $(ECHOGS_XE) $(GDEVH) ++ + ###### --------------------------- Catalog -------------------------- ###### + + # The following drivers are user-contributed, and maintained (if at all) by +@@ -161,19 +165,19 @@ $(DEVOBJ)gdevbjca.$(OBJ) : $(CONTRIBSRC)gdevbjca.c $(PDEVH) $(bjc_h) \ + $(DEVCC) $(DEVO_)gdevbjca.$(OBJ) $(C_) $(CONTRIBSRC)gdevbjca.c + + $(DD)bjcmono.dev : $(bjc_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)bjcmono $(bjc_) + + $(DD)bjcgray.dev : $(bjc_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)bjcgray $(bjc_) + + $(DD)bjccmyk.dev : $(bjc_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)bjccmyk $(bjc_) + + $(DD)bjccolor.dev : $(bjc_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)bjccolor $(bjc_) + + +@@ -184,25 +188,25 @@ cdeskjet8_=$(DEVOBJ)gdevcd8.$(OBJ) $(HPPCL) + # Author: Uli Wortmann (uliw@erdw.ethz.ch), Martin Gerbershagen (ger@ulm.temic.de) + # Printer: HP 670 + $(DD)cdj670.dev : $(cdeskjet8_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV2) $(DD)cdj670 $(cdeskjet8_) + + # Author: Uli Wortmann (uliw@erdw.ethz.ch) + # Printer: HP 850 + $(DD)cdj850.dev : $(cdeskjet8_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV2) $(DD)cdj850 $(cdeskjet8_) + + # Author: Uli Wortmann (uliw@erdw.ethz.ch), Martin Gerbershagen (ger@ulm.temic.de) + # Printer: HP 890 + $(DD)cdj890.dev : $(cdeskjet8_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV2) $(DD)cdj890 $(cdeskjet8_) + + # Author: Uli Wortmann (uliw@erdw.ethz.ch), Martin Gerbershagen (ger@ulm.temic.de) + # Printer: HP 1600 + $(DD)cdj1600.dev : $(cdeskjet8_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV2) $(DD)cdj1600 $(cdeskjet8_) + + $(DEVOBJ)gdevcd8.$(OBJ) : $(CONTRIBSRC)gdevcd8.c $(PDEVH) $(math__h)\ +@@ -220,7 +224,8 @@ $(DEVOBJ)gdevcd8.$(OBJ) : $(CONTRIBSRC)gdevcd8.c $(PDEVH) $(math__h)\ + + # Author: Matthew Gelhaus (mgelhaus@proaxis.com) + # Printer: HP 880c +-$(DD)cdj880.dev : $(cdeskjet8_) $(DD)page.dev ++$(DD)cdj880.dev : $(cdeskjet8_) $(DD)page.dev $(CONTDEV) \ ++ $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV2) $(DD)cdj880 $(cdeskjet8_) + + +@@ -231,7 +236,7 @@ cdeskjet9_=$(DEVOBJ)gdevdj9.$(OBJ) $(HPPCL) + # Author: Rene Harsch (rene@harsch.net) + # Printer: HP 970Cxi + $(DD)cdj970.dev : $(cdeskjet9_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV2) $(DD)cdj970 $(cdeskjet9_) + + $(DEVOBJ)gdevdj9.$(OBJ) : $(CONTRIBSRC)gdevdj9.c $(PDEVH) $(math__h) $(string__h)\ +@@ -244,7 +249,7 @@ $(DEVOBJ)gdevdj9.$(OBJ) : $(CONTRIBSRC)gdevdj9.c $(PDEVH) $(math__h) $(string__h + ### NOTE: Same as chp2200 (some PJL and CRD changes). + + $(DD)cdnj500.dev : $(cdeskjet8_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV2) $(DD)cdnj500 $(cdeskjet8_) + + +@@ -253,7 +258,7 @@ $(DD)cdnj500.dev : $(cdeskjet8_) $(DD)page.dev \ + ### NOTE: Depends on the presence of the cdj850 section. + + $(DD)chp2200.dev : $(cdeskjet8_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV2) $(DD)chp2200 $(cdeskjet8_) + + +@@ -264,11 +269,11 @@ $(DD)chp2200.dev : $(cdeskjet8_) $(DD)page.dev \ + GDIMONO=$(DEVOBJ)gdevgdi.$(OBJ) $(HPPCL) + + $(DD)gdi.dev : $(GDIMONO) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)gdi $(GDIMONO) + + $(DD)samsunggdi.dev : $(GDIMONO) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)samsunggdi $(GDIMONO) + + $(DEVOBJ)gdevgdi.$(OBJ) : $(CONTRIBSRC)gdevgdi.c $(PDEVH) $(gdevpcl_h) \ +@@ -282,17 +287,17 @@ $(DEVOBJ)gdevgdi.$(OBJ) : $(CONTRIBSRC)gdevgdi.c $(PDEVH) $(gdevpcl_h) \ + + hl1250_=$(DEVOBJ)gdevhl12.$(OBJ) $(HPDLJM) + $(DD)hl1250.dev : $(hl1250_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hl1250 $(hl1250_) + + $(DD)hl1240.dev : $(hl1250_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hl1240 $(hl1250_) + + # Author: Marek Michalkiewicz + # Printer: Brother HL-1250 (may work with some other models too) + $(DEVOBJ)gdevhl12.$(OBJ) : $(CONTRIBSRC)gdevhl12.c $(PDEVH) $(gdevdljm_h) \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(DEVCC) $(DEVO_)gdevhl12.$(OBJ) $(C_) $(CONTRIBSRC)gdevhl12.c + + +@@ -303,37 +308,37 @@ ln03_=$(DEVOBJ)gdevln03.$(OBJ) + # Author: Ulrich Mueller (ulm@vsnhd1.cern.ch) + # Printer: DEC LN03 + $(DD)ln03.dev : $(ln03_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)ln03 $(ln03_) + + # Author: Nick Brown (nick.brown@coe.int) + # Printer: DEClaser 2100 + $(DD)dl2100.dev : $(ln03_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)dl2100 $(ln03_) + + # Author: Ian MacPhedran (macphed@dvinci.USask.CA) + # Printer: DEC LA50 + $(DD)la50.dev : $(ln03_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)la50 $(ln03_) + + # Author: Bruce Lowekamp (lowekamp@csugrad.cs.vt.edu) + # Printer: DEC LA70 + $(DD)la70.dev : $(ln03_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)la70 $(ln03_) + + # Author: Ian MacPhedran (macphed@dvinci.USask.CA) + # Printer: DEC LA75 + $(DD)la75.dev : $(ln03_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)la75 $(ln03_) + + # Author: Andre' Beck (Andre_Beck@IRS.Inf.TU-Dresden.de) + # Printer: DEC LA75plus + $(DD)la75plus.dev : $(ln03_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)la75plus $(ln03_) + + $(DEVOBJ)gdevln03.$(OBJ) : $(CONTRIBSRC)gdevln03.c $(PDEVH) \ +@@ -356,27 +361,27 @@ $(DEVOBJ)gdevescv.$(OBJ) : $(ESCV_SRC)gdevescv.c $(ESCV_SRC)gdevescv.h $(PDEVH) + $(DEVCC) -DA4 $(DEVO_)gdevescv.$(OBJ) $(C_) $(escv_opts) $(ESCV_SRC)gdevescv.c + + $(DD)alc1900.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)alc1900 $(escv_) + + $(DD)alc2000.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)alc2000 $(escv_) + + $(DD)alc4000.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)alc4000 $(escv_) + + $(DD)alc4100.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)alc4100 $(escv_) + + $(DD)alc8500.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)alc8500 $(escv_) + + $(DD)alc8600.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)alc8600 $(escv_) + + $(DD)alc9100.dev : $(escv_) $(DD)page.dev \ +@@ -384,11 +389,11 @@ $(DD)alc9100.dev : $(escv_) $(DD)page.dev \ + $(SETPDEV) $(DD)alc9100 $(escv_) + + $(DD)lp3000c.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp3000c $(escv_) + + $(DD)lp8000c.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8000c $(escv_) + + $(DD)lp8200c.dev : $(escv_) $(DD)page.dev \ +@@ -396,15 +401,15 @@ $(DD)lp8200c.dev : $(escv_) $(DD)page.dev \ + $(SETPDEV) $(DD)lp8200c $(escv_) + + $(DD)lp8300c.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8300c $(escv_) + + $(DD)lp8500c.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8500c $(escv_) + + $(DD)lp8800c.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8800c $(escv_) + + $(DD)lp9000c.dev : $(escv_) $(DD)page.dev \ +@@ -412,177 +417,177 @@ $(DD)lp9000c.dev : $(escv_) $(DD)page.dev \ + $(SETPDEV) $(DD)lp9000c $(escv_) + + $(DD)lp9200c.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9200c $(escv_) + + $(DD)lp9500c.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9500c $(escv_) + + $(DD)lp9800c.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9800c $(escv_) + + $(DD)lps6500.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lps6500 $(escv_) + + $(DD)epl2050.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)epl2050 $(escv_) + + $(DD)epl2050p.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)epl2050p $(escv_) + + $(DD)epl2120.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)epl2120 $(escv_) + + $(DD)epl2500.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)epl2500 $(escv_) + + $(DD)epl2750.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)epl2750 $(escv_) + + $(DD)epl5800.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)epl5800 $(escv_) + + $(DD)epl5900.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)epl5900 $(escv_) + + $(DD)epl6100.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)epl6100 $(escv_) + + $(DD)epl6200.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)epl6200 $(escv_) + + $(DD)lp1800.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp1800 $(escv_) + + $(DD)lp1900.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp1900 $(escv_) + + $(DD)lp2200.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp2200 $(escv_) + + $(DD)lp2400.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp2400 $(escv_) + + $(DD)lp2500.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp2500 $(escv_) + + $(DD)lp7500.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp7500 $(escv_) + + $(DD)lp7700.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp7700 $(escv_) + + $(DD)lp7900.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp7900 $(escv_) + + $(DD)lp8100.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8100 $(escv_) + + $(DD)lp8300f.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8300f $(escv_) + + $(DD)lp8400f.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8400f $(escv_) + + $(DD)lp8600.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8600 $(escv_) + + $(DD)lp8600f.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8600f $(escv_) + + $(DD)lp8700.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8700 $(escv_) + + $(DD)lp8900.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp8900 $(escv_) + + $(DD)lp9000b.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9000b $(escv_) + + $(DD)lp9100.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9100 $(escv_) + + $(DD)lp9200b.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9200b $(escv_) + + $(DD)lp9300.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9300 $(escv_) + + $(DD)lp9400.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9400 $(escv_) + + $(DD)lp9600.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9600 $(escv_) + + $(DD)lp9600s.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp9600s $(escv_) + + $(DD)lps4500.dev : $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lps4500 $(escv_) + + $(DD)eplcolor.dev: $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)eplcolor $(escv_) + + $(DD)eplmono.dev: $(escv_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)eplmono $(escv_) + + # ------ The Lexmark 5700 and 7000 devices ------ # + + lex7000_=$(DEVOBJ)gdevlx7.$(OBJ) + $(DD)lex7000.dev : $(lex7000_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lex7000 $(lex7000_) + + lex5700_=$(DEVOBJ)gdevlx7.$(OBJ) + $(DD)lex5700.dev : $(lex5700_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lex5700 $(lex5700_) + + lex3200_=$(DEVOBJ)gdevlx7.$(OBJ) + $(DD)lex3200.dev : $(lex3200_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lex3200 $(lex3200_) + + lex2050_=$(DEVOBJ)gdevlx7.$(OBJ) + $(DD)lex2050.dev : $(lex2050_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lex2050 $(lex2050_) + + $(DEVOBJ)gdevlx7.$(OBJ) : $(CONTRIBSRC)gdevlx7.c $(PDEVH) \ +@@ -599,7 +604,7 @@ $(DEVOBJ)gdevlx32.$(OBJ) : $(CONTRIBSRC)gdevlx32.c $(PDEVH) $(gsparam_h) \ + $(DEVCC) $(DEVO_)gdevlx32.$(OBJ) $(C_) $(CONTRIBSRC)gdevlx32.c + + $(DD)lxm3200.dev : $(lxm3200_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lxm3200 $(lxm3200_) + + +@@ -625,13 +630,13 @@ $(DEVOBJ)gdevlips.$(OBJ) : $(GX) $(LIPS_SRC)gdevlips.c $(std_h) \ + $(DEVCC) $(DEVO_)gdevlips.$(OBJ) $(LIPS_OPT) $(C_) $(LIPS_SRC)gdevlips.c + + $(DD)lips4.dev : $(lipsr_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lips4 $(lipsr_) + + lipsv_=$(DEVOBJ)gdevl4v.$(OBJ) $(DEVOBJ)gdevlips.$(OBJ) + + $(DD)lips4v.dev : $(ECHOGS_XE) $(lipsv_) $(DD)vector.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETDEV) $(DD)lips4v $(lipsv_) + $(ADDMOD) $(DD)lips4v -include $(GLD)vector + +@@ -644,11 +649,11 @@ $(DEVOBJ)gdevl4v.$(OBJ) : $(LIPS_SRC)gdevl4v.c $(LIPS_SRC)gdevlips.h $(GDEV)\ + ### --------------- Some extra devices: lips2p, bjc880j ---------------- ### + + $(DD)lips2p.dev : $(lipsr_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lips2p $(lipsr_) + + $(DD)bjc880j.dev : $(lipsr_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)bjc880j $(lipsr_) + + +@@ -657,15 +662,15 @@ $(DD)bjc880j.dev : $(lipsr_) $(DD)page.dev \ + md2k_=$(DEVOBJ)gdevmd2k.$(OBJ) + + $(DD)md2k.dev : $(md2k_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)md2k $(md2k_) + + $(DD)md5k.dev : $(md2k_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)md5k $(md2k_) + + $(DEVOBJ)gdevmd2k.$(OBJ) : $(CONTRIBSRC)gdevmd2k.c $(PDEVH) $(gsparam_h) \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(DEVCC) $(DEVO_)gdevmd2k.$(OBJ) $(C_) $(CONTRIBSRC)gdevmd2k.c + + +@@ -673,7 +678,7 @@ $(DEVOBJ)gdevmd2k.$(OBJ) : $(CONTRIBSRC)gdevmd2k.c $(PDEVH) $(gsparam_h) \ + + oki4w_=$(DEVOBJ)gdevop4w.$(OBJ) + $(DD)oki4w.dev : $(oki4w_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)oki4w $(oki4w_) + + # Author: Ivan Schreter (ivan@shadow.sk) +@@ -696,11 +701,11 @@ $(DEVOBJ)gdevopvp.$(OBJ) : $(OPVP_SRC)gdevopvp.c $(OPVP_SRC)opvp_common.h\ + $(DEVCC) $(DEVO_)gdevopvp.$(OBJ) $(OPVP_OPT) $(C_) $(OPVP_SRC)gdevopvp.c + + $(DD)opvp.dev : $(opvp_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)opvp $(opvp_) + + $(DD)oprp.dev : $(opvp_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)oprp $(opvp_) + + +@@ -877,78 +882,78 @@ $(DEVOBJ)pclcomp.$(OBJ) : $(pcl3_src)pclcomp.c $(pcl3_src)pclgen.h \ + + # The generic pcl3 device with selectable subdevices + $(DD)pcl3.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)pcl3 $(pcl3_) + + # Fixed devices for specific printers + $(DD)hpdjplus.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdjplus $(pcl3_) + $(DD)hpdjportable.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdjportable $(pcl3_) + $(DD)hpdj310.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj310 $(pcl3_) + $(DD)hpdj320.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj320 $(pcl3_) + $(DD)hpdj340.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj340 $(pcl3_) + $(DD)hpdj400.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj400 $(pcl3_) + $(DD)hpdj500.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj500 $(pcl3_) + $(DD)hpdj500c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj500c $(pcl3_) + $(DD)hpdj510.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj510 $(pcl3_) + $(DD)hpdj520.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj520 $(pcl3_) + $(DD)hpdj540.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj540 $(pcl3_) + $(DD)hpdj550c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj550c $(pcl3_) + $(DD)hpdj560c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj560c $(pcl3_) + $(DD)hpdj600.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj600 $(pcl3_) + $(DD)hpdj660c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj660c $(pcl3_) + $(DD)hpdj670c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj670c $(pcl3_) + $(DD)hpdj680c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj680c $(pcl3_) + $(DD)hpdj690c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj690c $(pcl3_) + $(DD)hpdj850c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj850c $(pcl3_) + $(DD)hpdj855c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj855c $(pcl3_) + $(DD)hpdj870c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj870c $(pcl3_) + $(DD)hpdj890c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj890c $(pcl3_) + $(DD)hpdj1120c.dev : $(pcl3_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)hpdj1120c $(pcl3_) + + #------------------------------------------------------------------------------ +@@ -985,7 +990,7 @@ pcl3-install: + + xes_=$(DEVOBJ)gdevxes.$(OBJ) + $(DD)xes.dev : $(xes_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)xes $(xes_) + + # Author: Peter Flass (flass@lbdrscs.bitnet) +@@ -1005,16 +1010,16 @@ JAPSRC=$(JAPDIR)$(D) + + pr201_=$(DEVOBJ)gdevp201.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) + +-$(DD)pr201.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS) ++$(DD)pr201.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)pr201 $(pr201_) + +-$(DD)pr150.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS) ++$(DD)pr150.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)pr150 $(pr201_) + +-$(DD)pr1000.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS) ++$(DD)pr1000.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)pr1000 $(pr201_) + +-$(DD)pr1000_4.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS) ++$(DD)pr1000_4.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)pr1000_4 $(pr201_) + + $(DEVOBJ)gdevp201.$(OBJ) : $(JAPSRC)gdevp201.c $(PDEVH) \ +@@ -1025,7 +1030,7 @@ $(DEVOBJ)gdevp201.$(OBJ) : $(JAPSRC)gdevp201.c $(PDEVH) \ + + jj100_=$(DEVOBJ)gdevj100.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) + +-$(DD)jj100.dev : $(jj100_) $(CONTRIB_MAK) $(MAKEDIRS) ++$(DD)jj100.dev : $(jj100_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)jj100 $(jj100_) + + $(DEVOBJ)gdevj100.$(OBJ) : $(JAPSRC)gdevj100.c $(PDEVH) \ +@@ -1037,11 +1042,11 @@ $(DEVOBJ)gdevj100.$(OBJ) : $(JAPSRC)gdevj100.c $(PDEVH) \ + bj10v_=$(DEVOBJ)gdev10v.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) + + $(DD)bj10v.dev : $(bj10v_) \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)bj10v $(bj10v_) + + $(DD)bj10vh.dev : $(bj10v_) \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)bj10vh $(bj10v_) + + # Uncomment the following line if you are using MS-DOS on PC9801 series. +@@ -1056,7 +1061,7 @@ $(DEVOBJ)gdev10v.$(OBJ) : $(JAPSRC)gdev10v.c $(PDEVH) \ + dmprt_=$(DEVOBJ)gdevdmpr.$(OBJ) $(DEVOBJ)dviprlib.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) + + $(DD)dmprt.dev : $(dmprt_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETDEV) $(DD)dmprt $(dmprt_) + $(ADDMOD) $(DD)dmprt -ps dmp_init + +@@ -1086,19 +1091,19 @@ $(DEVOBJ)gdevmjc.$(OBJ) : $(JAPSRC)gdevmjc.c $(JAPSRC)gdevmjc.h $(PDEVH) $(gdevp + $(DEVCC) -DA4 $(DEVO_)gdevmjc.$(OBJ) $(C_) $(JAPSRC)gdevmjc.c + + $(DD)mj700v2c.dev : $(mj700v2c_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)mj700v2c $(mj700v2c_) + + $(DD)mj500c.dev : $(mj700v2c_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)mj500c $(mj700v2c_) + + $(DD)mj6000c.dev : $(mj700v2c_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)mj6000c $(mj700v2c_) + + $(DD)mj8000c.dev : $(mj700v2c_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)mj8000c $(mj700v2c_) + + ### ----------------- The Fujitsu FMPR printer device ----------------- ### +@@ -1106,7 +1111,7 @@ $(DD)mj8000c.dev : $(mj700v2c_) $(DD)page.dev \ + fmpr_=$(DEVOBJ)gdevfmpr.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) + + $(DD)fmpr.dev : $(fmpr_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)fmpr $(fmpr_) + + $(DEVOBJ)gdevfmpr.$(OBJ) : $(JAPSRC)gdevfmpr.c $(PDEVH) \ +@@ -1118,7 +1123,7 @@ $(DEVOBJ)gdevfmpr.$(OBJ) : $(JAPSRC)gdevfmpr.c $(PDEVH) \ + fmlbp_=$(DEVOBJ)gdevfmlbp.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) + + $(DD)fmlbp.dev : $(fmlbp_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)fmlbp $(fmlbp_) + + $(DEVOBJ)gdevfmlbp.$(OBJ) : $(JAPSRC)gdevfmlbp.c $(PDEVH) \ +@@ -1135,7 +1140,7 @@ $(DEVOBJ)gdevfmlbp.$(OBJ) : $(JAPSRC)gdevfmlbp.c $(PDEVH) \ + ml6_=$(DEVOBJ)gdevml6.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) + + $(DD)ml600.dev : $(ml6_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)ml600 $(ml6_) + + $(DEVOBJ)gdevml6.$(OBJ) : $(JAPSRC)gdevml6.c $(PDEVH) \ +@@ -1148,11 +1153,11 @@ $(DEVOBJ)gdevml6.$(OBJ) : $(JAPSRC)gdevml6.c $(PDEVH) \ + lbp3x0_=$(DEVOBJ)gdevlbp3.$(OBJ) + + $(DD)lbp310.dev :$(lbp3x0_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lbp310 $(lbp3x0_) + + $(DD)lbp320.dev :$(lbp3x0_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lbp320 $(lbp3x0_) + + $(DEVOBJ)gdevlbp3.$(OBJ) : $(JAPSRC)gdevlbp3.c $(PDEVH) +@@ -1167,7 +1172,7 @@ $(DEVOBJ)gdevnpdl.$(OBJ) : $(JAPSRC)gdevnpdl.c $(LIPS_SRC)gdevlprn.h $(PDEVH) \ + $(DEVCC) -DA4 $(DEVO_)gdevnpdl.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevnpdl.c + + $(DD)npdl.dev : $(npdl_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)npdl $(npdl_) + + ### ------- EPSON ESC/Page printer device ----------------- ### +@@ -1179,11 +1184,11 @@ $(DEVOBJ)gdevespg.$(OBJ) : $(JAPSRC)gdevespg.c $(LIPS_SRC)gdevlprn.h $(PDEVH) \ + $(DEVCC) -DA4 $(DEVO_)gdevespg.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevespg.c + + $(DD)escpage.dev : $(escpage_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)escpage $(escpage_) + + $(DD)lp2000.dev : $(escpage_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)lp2000 $(escpage_) + + ### --- The RICOH RPDL language printer device ------ ### +@@ -1194,7 +1199,7 @@ $(DEVOBJ)gdevrpdl.$(OBJ) : $(JAPSRC)gdevrpdl.c $(LIPS_SRC)gdevlprn.h $(PDEVH) \ + $(DEVCC) $(DEVO_)gdevrpdl.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevrpdl.c + + $(DD)rpdl.dev : $(rpdl_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)rpdl $(rpdl_) + + ### ---------- RICOH RPDL IV(600dpi) printer devices ---------- ### +@@ -1204,11 +1209,11 @@ $(DD)rpdl.dev : $(rpdl_) $(DD)page.dev \ + # $(DEVCC) $(DEVO_)gdevrpdl.$(OBJ) $(C_) $(JAPSRC)gdevrpdl.c + # + #$(DD)nx100f.dev : $(rpdl_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + # $(SETPDEV2) $(DD)nx100f $(rpdl_) + # + #$(DD)nx100v.dev : $(rpdl_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + # $(SETPDEV2) $(DD)nx100v $(rpdl_) + + ### ------------ The ALPS Micro Dry printer devices ------------ ### +@@ -1216,15 +1221,15 @@ $(DD)rpdl.dev : $(rpdl_) $(DD)page.dev \ + alps_=$(DEVOBJ)gdevalps.$(OBJ) + + $(DD)md50Mono.dev : $(alps_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)md50Mono $(alps_) + + $(DD)md50Eco.dev : $(alps_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)md50Eco $(alps_) + + $(DD)md1xMono.dev : $(alps_) $(DD)page.dev \ +- $(CONTRIB_MAK) $(MAKEDIRS) ++ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) + $(SETPDEV) $(DD)md1xMono $(alps_) + + $(DEVOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH) \ +-- +2.26.2 + diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 161ee8471bc..7f6766cf462 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -52,6 +52,9 @@ stdenv.mkDerivation rec { url = "https://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=485904772c5f0aa1140032746e5a0abfc40f4cef"; sha256 = "0z5gnvgpp0dlzgvpw9a1yan7qyycv3mf88l93fvb1kyay893rshp"; }) + # rebased version of upstream http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=1b4c3669a20c, + # Remove on update to version > 9.52 + ./0001-Bug-702364-Fix-missing-echogs-dependencies.patch ]; outputs = [ "out" "man" "doc" ]; -- cgit v1.2.3 From 15d761a525a025de0680b62e8ab79a9d183f313d Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 1 May 2020 17:12:05 +0200 Subject: =?UTF-8?q?Revert=20"nixos/systemd.nix:=20don=E2=80=99t=20require?= =?UTF-8?q?=20online=20for=20multi-user.target"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 764c8203b833176d546395a5c1adf193a9ca73f8. While this is desireable in principle, some of our modules and services fail during service startup if no network is available don't currently properly set Wants=network-online.target. If nothing pulls in this target anymore, systemd won't try to reach it. We have many VM tests waiting for `network-online.target`, and after 764c8203b833176d546395a5c1adf193a9ca73f8 fail with the following error message: ``` error: unit "network-online.target" is inactive and there are no pending jobs ``` Most likely, test scripts shouldn't wait for `network-online.target` in first place (as `network-online.target` says nothing about whether a service has been started), but instead, the script should wait for the network ports of the corresponding service to be open. Let's revert this for now, and re-apply in a draft PR, fixing the tests before merging it back in. --- nixos/modules/system/boot/systemd.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 58e2f9d3bfc..2167df60bc9 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -1033,6 +1033,7 @@ in systemd.services.systemd-journald.stopIfChanged = false; systemd.targets.local-fs.unitConfig.X-StopOnReconfiguration = true; systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true; + systemd.targets.network-online.wantedBy = [ "multi-user.target" ]; systemd.services.systemd-binfmt.wants = [ "proc-sys-fs-binfmt_misc.mount" ]; # Don't bother with certain units in containers. -- cgit v1.2.3 From 0620bb7ebc8393e308b9edd4a091a66a7ab5108b Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 1 May 2020 17:18:17 +0200 Subject: pyprof2calltree: 1.4.4 -> 1.4.5 --- pkgs/development/python-modules/pyprof2calltree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyprof2calltree/default.nix b/pkgs/development/python-modules/pyprof2calltree/default.nix index f86d830635f..7244438c6e0 100644 --- a/pkgs/development/python-modules/pyprof2calltree/default.nix +++ b/pkgs/development/python-modules/pyprof2calltree/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pyprof2calltree"; - version = "1.4.4"; + version = "1.4.5"; # Fetch from GitHub because the PyPi packaged version does not # include all test files. @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "pwaller"; repo = "pyprof2calltree"; rev = "v" + version; - sha256 = "1vrip41ib7nmkwa8rjny1na1wyp7nvvgvm0h9bd21i262kbm4nqx"; + sha256 = "0akighssiswfhi5285rrj37am6flg3ip17c34bayq3r8yyk1iciy"; }; meta = with lib; { -- cgit v1.2.3 From 61b97c17d659b345f4c45fb12376b348dd531d8b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 1 May 2020 11:43:22 -0400 Subject: linux: 5.7-rc2 -> 5.7-rc3 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 9e2ccaeae2b..05617f86917 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.7-rc2"; + version = "5.7-rc3"; extraMeta.branch = "5.7"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "06h7lrif84gyzblrdgg4cirsr2v69sdbymwkk89nr3gc87hnjlvs"; + sha256 = "0gq4bdzz2px85l3fa9dq3jh3lp4c9kgph4njq6yxf9g3h0ifq7c6"; }; # Should the testing kernels ever be built on Hydra? -- cgit v1.2.3 From 6ec01c7dac726ca46fe180aa50f00dc0d3a8ccb2 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Fri, 1 May 2020 17:45:40 +0200 Subject: nixos/release-combined: add systemd-networkd-ipv6-prefix-delegation test --- nixos/release-combined.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 2753fd6d638..ece2d091f5a 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -111,6 +111,7 @@ in rec { (onFullSupported "nixos.tests.networking.scripted.sit") (onFullSupported "nixos.tests.networking.scripted.static") (onFullSupported "nixos.tests.networking.scripted.vlan") + (onFullSupported "nixos.tests.systemd-networkd-ipv6-prefix-delegation") (onFullSupported "nixos.tests.nfs3.simple") (onFullSupported "nixos.tests.nfs4.simple") (onFullSupported "nixos.tests.openssh") -- cgit v1.2.3 From c0bd938e5ca4b5c2f789c3d937c9ce344e5cf7ae Mon Sep 17 00:00:00 2001 From: samlich <1349989+samlich@users.noreply.github.com> Date: Fri, 1 May 2020 16:04:23 +0000 Subject: sage: fix doctest matrix_double_dense is_unitary --- pkgs/applications/science/math/sage/sage-src.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index cd465a8c413..4791d12450a 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -29,6 +29,14 @@ stdenv.mkDerivation rec { url = "https://git.sagemath.org/sage.git/patch?id2=8bdc326ba57d1bb9664f63cf165a9e9920cc1afc&id=dc673c17555efca611f68398d5013b66e9825463"; sha256 = "1hhannz7xzprijakn2w2d0rhd5zv2zikik9p51i87bas3nc658f7"; }) + + # `is_unitary` test in `matrix_double_dense.pyx` fails with some BLAS implementations + # https://trac.sagemath.org/ticket/29297 should be included in 9.1 + (fetchpatch { + name = "is_unitary-special-case.patch"; + url = "https://git.sagemath.org/sage.git/patch?id=cc3eb9ffa991e328b09028d32aab7e7cc2ddbb6a"; + sha256 = "0jq4w8hnp5c9q99011ldr4n3knvm1rx2g85z0hidv3i9x868p0ay"; + }) # Unfortunately inclusion in upstream sage was rejected. Instead the bug was # fixed in python, but of course not backported to 2.7. So we'll probably -- cgit v1.2.3 From c9f6e5f161f64701bce0527c80628eb637eae0ac Mon Sep 17 00:00:00 2001 From: Lucas Savva Date: Fri, 1 May 2020 18:23:16 +0100 Subject: nixos/acme: indicate support for other providers --- nixos/modules/security/acme.xml | 37 ++++++++++++++++++++++--------------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/nixos/modules/security/acme.xml b/nixos/modules/security/acme.xml index d8de26109bb..f802faee974 100644 --- a/nixos/modules/security/acme.xml +++ b/nixos/modules/security/acme.xml @@ -6,9 +6,9 @@ SSL/TLS Certificates with ACME NixOS supports automatic domain validation & certificate retrieval and - renewal using the ACME protocol. This is currently only implemented by and - for Let's Encrypt. The alternative ACME client lego is - used under the hood. + renewal using the ACME protocol. Any provider can be used, but by default + NixOS uses Let's Encrypt. The alternative ACME client lego + is used under the hood. Automatic cert validation and configuration for Apache and Nginx virtual @@ -36,6 +36,13 @@ and cannot be used to administer the certificates in any way. + + Alternatively, you can use a different ACME server by changing the + option + to a provider of your choosing, or just change the server for one cert with + . + + You will need an HTTP server or DNS server for verification. For HTTP, the server must have a webroot defined that can serve @@ -60,7 +67,7 @@ = true; = "admin+acme@example.com"; services.nginx = { - enable = true; + enable = true; virtualHosts = { "foo.example.com" = { forceSSL = true; @@ -109,7 +116,7 @@ services.nginx = { = true; = "admin+acme@example.com"; services.nginx = { - enable = true; + enable = true; virtualHosts = { "acmechallenge.example.com" = { # Catchall vhost, will redirect users to HTTPS for all vhosts @@ -179,7 +186,7 @@ services.httpd = { This is useful if you want to generate a wildcard certificate, since - Let's Encrypt will only hand out wildcard certs over DNS validation. + ACME servers will only hand out wildcard certs over DNS validation. There a number of supported DNS providers and servers you can utilise, see the lego docs for provider/server specific configuration values. For the sake of these @@ -190,7 +197,7 @@ services.httpd = { services.bind = { enable = true; extraConfig = '' - include "/var/secrets/dnskeys.conf"; + include "/var/lib/secrets/dnskeys.conf"; ''; zones = [ rec { @@ -208,7 +215,7 @@ services.bind = { ."example.com" = { domain = "*.example.com"; dnsProvider = "rfc2136"; - credentialsFile = "/var/secrets/certs.secret"; + credentialsFile = "/var/lib/secrets/certs.secret"; # We don't need to wait for propagation since this is a local DNS server dnsPropagationCheck = false; }; @@ -221,27 +228,27 @@ services.bind = { -mkdir -p /var/secrets -tsig-keygen rfc2136key.example.com > /var/secrets/dnskeys.conf -chown named:root /var/secrets/dnskeys.conf -chmod 400 /var/secrets/dnskeys.conf +mkdir -p /var/lib/secrets +tsig-keygen rfc2136key.example.com > /var/lib/secrets/dnskeys.conf +chown named:root /var/lib/secrets/dnskeys.conf +chmod 400 /var/lib/secrets/dnskeys.conf # Copy the secret value from the dnskeys.conf, and put it in # RFC2136_TSIG_SECRET below -cat > /var/secrets/certs.secret << EOF +cat > /var/lib/secrets/certs.secret << EOF RFC2136_NAMESERVER='127.0.0.1:53' RFC2136_TSIG_ALGORITHM='hmac-sha256.' RFC2136_TSIG_KEY='rfc2136key.example.com' RFC2136_TSIG_SECRET='your secret key' EOF -chmod 400 /var/secrets/certs.secret +chmod 400 /var/lib/secrets/certs.secret Now you're all set to generate certs! You should monitor the first invokation by running systemctl start acme-example.com.service & - journalctl -fu acme-example.com.service and watching for errors. + journalctl -fu acme-example.com.service and watching its log output. -- cgit v1.2.3 From 64c09a3d5c130ca346ac3bbc3fd122a3a4372c14 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 1 May 2020 19:43:01 +0200 Subject: terminator: clean up --- pkgs/applications/misc/terminator/default.nix | 18 +++++++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/terminator/default.nix b/pkgs/applications/misc/terminator/default.nix index f59b534a9c6..5de8109e3a4 100644 --- a/pkgs/applications/misc/terminator/default.nix +++ b/pkgs/applications/misc/terminator/default.nix @@ -1,6 +1,6 @@ { stdenv , fetchFromGitHub -, python +, python3 , keybinder3 , intltool , file @@ -11,14 +11,14 @@ , vte }: -python.pkgs.buildPythonApplication rec { - name = "terminator-${version}"; +python3.pkgs.buildPythonApplication rec { + pname = "terminator"; version = "1.92"; src = fetchFromGitHub { owner = "gnome-terminator"; repo = "terminator"; - rev = "bb24273eb40dc5eac97de74064488701fa40a743"; + rev = "v${version}"; sha256 = "105f660wzf9cpn24xzwaaa09igg5h3qhchafv190v5nqck6g1ssh"; }; @@ -34,11 +34,11 @@ python.pkgs.buildPythonApplication rec { gobject-introspection # Temporary fix, see https://github.com/NixOS/nixpkgs/issues/56943 keybinder3 libnotify - python + python3 vte ]; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ configobj dbus-python pygobject3 @@ -47,14 +47,18 @@ python.pkgs.buildPythonApplication rec { ]; postPatch = '' - patchShebangs . + patchShebangs run_tests tests po # dbus-python is correctly passed in propagatedBuildInputs, but for some reason setup.py complains. # The wrapped terminator has the correct path added, so ignore this. substituteInPlace setup.py --replace "'dbus-python'," "" ''; checkPhase = '' + runHook preCheck + ./run_tests + + runHook postCheck ''; meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8263d85a2f2..37cf58decab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22034,7 +22034,7 @@ in terminal-notifier = callPackage ../applications/misc/terminal-notifier {}; - terminator = callPackage ../applications/misc/terminator { python = python3; }; + terminator = callPackage ../applications/misc/terminator { }; terminus = callPackage ../applications/misc/terminus { }; -- cgit v1.2.3 From 5da309c9619774ff3a38ad789029e76937c2ef3b Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 1 May 2020 14:37:13 +0200 Subject: bwidget: fix hash as seen on https://hydra.nixos.org/build/116886094/nixlog/2 --- pkgs/development/libraries/bwidget/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix index 154b8634551..ff9e6aa038f 100644 --- a/pkgs/development/libraries/bwidget/default.nix +++ b/pkgs/development/libraries/bwidget/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/tcllib/bwidget-${version}.tar.gz"; - sha256 = "0knlnpmwam74v0qa1h9gg4f32vzzz7ays2wbslflf51ilg7nw6jk"; + sha256 = "0wm6hk3rnqhnn2cyw24drqwbfnysp6jyfi8lc1vih5k704a955lf"; }; dontBuild = true; -- cgit v1.2.3 From cfdd91c6fbdda90cd3725cb3aa2ffb5e8d8cbfd6 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 1 May 2020 19:54:51 +0200 Subject: fmt: fix pkg-config paths --- pkgs/development/libraries/fmt/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index 42e1a252a76..4741a3d156a 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -4,6 +4,8 @@ stdenv.mkDerivation rec { pname = "fmt"; version = "6.2.0"; + outputs = [ "out" "dev" ]; + src = fetchFromGitHub { owner = "fmtlib"; repo = "fmt"; @@ -19,9 +21,14 @@ stdenv.mkDerivation rec { url = "https://github.com/fmtlib/fmt/commit/7d01859ef16e6b65bc023ad8bebfedecb088bf81.patch"; sha256 = "vdttRGgdltabeRAs4/z0BNtW2dLOhCxtXQFGVFKpEG0="; }) - ]; - outputs = [ "out" "dev" ]; + # Fix paths in pkg-config file + # https://github.com/fmtlib/fmt/pull/1657 + (fetchpatch { + url = "https://github.com/fmtlib/fmt/commit/78f041ab5b40a1145ba686aeb8013e8788b08cd2.patch"; + sha256 = "hjE6Q/ubA4UhvuJXgcsA3wiGoDK031P19njQRL9JF8M="; + }) + ]; nativeBuildInputs = [ cmake ]; -- cgit v1.2.3 From f5b1e6bc215bf82d4a294891e7c4a2b178122731 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Baylac-Jacqu=C3=A9?= Date: Fri, 1 May 2020 19:11:24 +0200 Subject: nixos/prosody: add NixOS manual entry We add a Prosody entry to the NixOS manual showing how to setup a basic XEP-0423 compliant Prosody service. This example also showcase how to generate the associated ACME certificates. Note: The body might look poorly indented, but trust me, it's necessary. If we try to increase their indentation level, the HTML output will end up containing a lot of unecesseray heading spaces breaking the formatting... --- nixos/modules/services/networking/prosody.nix | 2 +- nixos/modules/services/networking/prosody.xml | 88 +++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/services/networking/prosody.xml diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index 83e397e50fa..9825613d809 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -873,5 +873,5 @@ in }; }; - + meta.doc = ./prosody.xml; } diff --git a/nixos/modules/services/networking/prosody.xml b/nixos/modules/services/networking/prosody.xml new file mode 100644 index 00000000000..7859cb1578b --- /dev/null +++ b/nixos/modules/services/networking/prosody.xml @@ -0,0 +1,88 @@ + + Prosody + + Prosody is an open-source, modern XMPP server. + +
+ Basic usage + + + A common struggle for most XMPP newcomers is to find the right set + of XMPP Extensions (XEPs) to setup. Forget to activate a few of + those and your XMPP experience might turn into a nightmare! + + + + The XMPP community tackles this problem by creating a meta-XEP + listing a decent set of XEPs you should implement. This meta-XEP + is issued every year, the 2020 edition being + XEP-0423. + + + The NixOS Prosody module will implement most of these recommendend XEPs out of + the box. That being said, two components still require some + manual configuration: the + Multi User Chat (MUC) + and the HTTP File Upload ones. + You'll need to create a DNS subdomain for each of those. The current convention is to name your + MUC endpoint conference.example.org and your HTTP upload domain upload.example.org. + + + A good configuration to start with, including a + Multi User Chat (MUC) + endpoint as well as a HTTP File Upload + endpoint will look like this: + +services.prosody = { + enable = true; + admins = [ "root@example.org" ]; + ssl.cert = "/var/lib/acme/example.org/fullchain.pem"; + ssl.key = "/var/lib/acme/example.org/key.pem"; + virtualHosts."example.org" = { + enabled = true; + domain = "example.org"; + ssl.cert = "/var/lib/acme/example.org/fullchain.pem"; + ssl.key = "/var/lib/acme/example.org/key.pem"; + }; + muc = [ { + domain = "conference.example.org"; + } ]; + uploadHttp = { + domain = "upload.example.org"; + }; +}; + +
+
+ Let's Encrypt Configuration + + As you can see in the code snippet from the + previous section, + you'll need a single TLS certificate covering your main endpoint, + the MUC one as well as the HTTP Upload one. We can generate such a + certificate by leveraging the ACME + extraDomains module option. + + + Provided the setup detailed in the previous section, you'll need the following acme configuration to generate + a TLS certificate for the three endponits: + +security.acme = { + email = "root@example.org"; + acceptTerms = true; + certs = { + "example.org" = { + webroot = "/var/www/example.org"; + email = "root@example.org"; + extraDomains."conference.example.org" = null; + extraDomains."upload.example.org" = null; + }; + }; +}; + +
+ -- cgit v1.2.3 From 0d49162aa0c4799cc508c06620bd7816a30f8a60 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sat, 2 May 2020 00:16:52 +0530 Subject: nixos/yggdrasil: add group option Allow users to access the Yggdrasil control socket by group. --- nixos/modules/services/networking/yggdrasil.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/yggdrasil.nix b/nixos/modules/services/networking/yggdrasil.nix index 9e675ecd6f4..ecd1406b483 100644 --- a/nixos/modules/services/networking/yggdrasil.nix +++ b/nixos/modules/services/networking/yggdrasil.nix @@ -83,6 +83,14 @@ in { ''; }; + group = mkOption { + type = types.str; + default = "root"; + example = "wheel"; + description = + "Group to grant acces to the Yggdrasil control socket."; + }; + openMulticastPort = mkOption { type = bool; default = false; @@ -144,8 +152,9 @@ in { ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; Restart = "always"; + Group = cfg.group; RuntimeDirectory = "yggdrasil"; - RuntimeDirectoryMode = "0700"; + RuntimeDirectoryMode = "0750"; BindReadOnlyPaths = mkIf configFileProvided [ "${cfg.configFile}" ]; -- cgit v1.2.3 From f9b8d17c100681fde8dde58fa794527f0159c9ee Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Apr 2020 11:44:24 +0200 Subject: LTS Haskell 15.10 --- .../haskell-modules/configuration-hackage2nix.yaml | 51 ++++++++++++---------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index d57c49554c4..9519501656f 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -72,7 +72,7 @@ default-package-overrides: # gi-gdkx11-4.x requires gtk-4.x, which is still under development and # not yet available in Nixpkgs - gi-gdkx11 < 4 - # LTS Haskell 15.9 + # LTS Haskell 15.10 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -319,7 +319,7 @@ default-package-overrides: - blaze-bootstrap ==0.1.0.1 - blaze-builder ==0.4.1.0 - blaze-html ==0.9.1.2 - - blaze-markup ==0.8.2.4 + - blaze-markup ==0.8.2.5 - blaze-svg ==0.3.6.1 - blaze-textual ==0.2.1.0 - bmp ==1.2.6.3 @@ -437,9 +437,9 @@ default-package-overrides: - codec-rpm ==0.2.2 - code-page ==0.2 - coercible-utils ==0.1.0 - - co-log ==0.4.0.0 - - co-log-core ==0.2.1.0 - - co-log-polysemy ==0.0.1.1 + - co-log ==0.4.0.1 + - co-log-core ==0.2.1.1 + - co-log-polysemy ==0.0.1.2 - Color ==0.1.4 - colorful-monoids ==0.2.1.2 - colorize-haskell ==1.0.1 @@ -859,7 +859,7 @@ default-package-overrides: - gi-glib ==2.0.23 - gi-gobject ==2.0.22 - gi-graphene ==1.0.1 - - gi-gtk ==3.0.32 + - gi-gtk ==3.0.33 - gi-gtk-hs ==0.3.8.1 - gingersnap ==0.3.1.0 - gi-pango ==1.0.22 @@ -889,7 +889,7 @@ default-package-overrides: - graphviz ==2999.20.0.4 - graph-wrapper ==0.2.6.0 - gravatar ==0.8.0 - - greskell ==1.0.0.1 + - greskell ==1.0.1.0 - greskell-core ==0.1.3.2 - greskell-websocket ==0.1.2.1 - groom ==0.1.2.1 @@ -932,6 +932,8 @@ default-package-overrides: - HaXml ==1.25.5 - haxr ==3000.11.4 - hdaemonize ==0.5.6 + - HDBC ==2.4.0.3 + - HDBC-session ==0.1.2.0 - headroom ==0.1.3.0 - heap ==1.0.4 - heaps ==0.3.6.1 @@ -958,7 +960,7 @@ default-package-overrides: - highlighting-kate ==0.6.4 - hinfo ==0.0.3.0 - hinotify ==0.4 - - hint ==0.9.0.2 + - hint ==0.9.0.3 - hjsmin ==0.2.0.4 - hkgr ==0.2.5.2 - hlibcpuid ==0.2.0 @@ -1471,7 +1473,7 @@ default-package-overrides: - OneTuple ==0.2.2.1 - Only ==0.1 - oo-prototypes ==0.1.0.0 - - opaleye ==0.6.7004.1 + - opaleye ==0.6.7004.2 - OpenAL ==1.7.0.5 - open-browser ==0.2.1.0 - openexr-write ==0.1.0.2 @@ -1541,6 +1543,7 @@ default-package-overrides: - perfect-vector-shuffle ==0.1.1.1 - persist ==0.1.1.4 - persistable-record ==0.6.0.4 + - persistable-types-HDBC-pg ==0.0.3.5 - persistent ==2.10.5.2 - persistent-mysql ==2.10.2.3 - persistent-pagination ==0.1.1.1 @@ -1625,7 +1628,7 @@ default-package-overrides: - print-console-colors ==0.1.0.0 - process-extras ==0.7.4 - product-isomorphic ==0.0.3.3 - - product-profunctors ==0.10.0.0 + - product-profunctors ==0.10.0.1 - profiterole ==0.1 - profunctors ==5.5.2 - projectroot ==0.2.0.1 @@ -1727,6 +1730,8 @@ default-package-overrides: - reinterpret-cast ==0.1.0 - relapse ==1.0.0.0 - relational-query ==0.12.2.2 + - relational-query-HDBC ==0.7.2.0 + - relational-record ==0.2.2.0 - relational-schemas ==0.1.8.0 - relude ==0.6.0.0 - renderable ==0.2.0.1 @@ -1738,10 +1743,10 @@ default-package-overrides: - rerebase ==1.4.1 - resolv ==0.1.2.0 - resource-pool ==0.2.3.2 - - resourcet ==1.2.3 + - resourcet ==1.2.4 - result ==0.2.6.0 - rethinkdb-client-driver ==0.0.25 - - retry ==0.8.1.1 + - retry ==0.8.1.2 - rev-state ==0.1.2 - rfc1751 ==0.1.2 - rfc5051 ==0.1.0.4 @@ -1779,8 +1784,8 @@ default-package-overrides: - sampling ==0.3.3 - say ==0.1.0.1 - sbp ==2.6.3 - - scalpel ==0.6.1 - - scalpel-core ==0.6.1 + - scalpel ==0.6.2 + - scalpel-core ==0.6.2 - scanf ==0.1.0.0 - scanner ==0.3.1 - scheduler ==1.4.2.2 @@ -1844,7 +1849,7 @@ default-package-overrides: - servant-swagger-ui-redoc ==0.3.3.1.22.3 - servant-websockets ==2.0.0 - servant-yaml ==0.1.0.1 - - serverless-haskell ==0.10.2 + - serverless-haskell ==0.10.5 - serversession ==1.0.1 - serversession-frontend-wai ==1.0 - ses-html ==0.4.0.0 @@ -1889,7 +1894,7 @@ default-package-overrides: - skip-var ==0.1.1.0 - skylighting ==0.8.3.4 - skylighting-core ==0.8.3.4 - - slist ==0.1.0.0 + - slist ==0.1.1.0 - small-bytearray-builder ==0.3.4.0 - smallcheck ==1.1.5 - smoothie ==0.4.2.10 @@ -1946,7 +1951,7 @@ default-package-overrides: - streaming ==0.2.3.0 - streaming-bytestring ==0.1.6 - streaming-commons ==0.2.1.2 - - streamly ==0.7.1 + - streamly ==0.7.2 - streams ==3.3 - strict ==0.3.2 - strict-base-types ==0.6.1 @@ -1960,8 +1965,8 @@ default-package-overrides: - string-qq ==0.0.4 - stringsearch ==0.3.6.6 - string-transform ==1.1.1 - - stripe-concepts ==1.0.2.0 - - stripe-signature ==1.0.0.1 + - stripe-concepts ==1.0.2.2 + - stripe-signature ==1.0.0.2 - strive ==5.0.10 - structs ==0.1.3 - structured-cli ==2.5.2.0 @@ -2035,7 +2040,7 @@ default-package-overrides: - test-framework-th ==0.2.4 - testing-feat ==1.1.0.0 - testing-type-modifiers ==0.1.0.1 - - texmath ==0.12.0.1 + - texmath ==0.12.0.2 - text-binary ==0.2.1.1 - text-builder ==0.6.6.1 - text-conversions ==0.3.0 @@ -2131,7 +2136,7 @@ default-package-overrides: - typed-uuid ==0.0.0.2 - type-equality ==1 - type-errors ==0.2.0.0 - - type-errors-pretty ==0.0.1.0 + - type-errors-pretty ==0.0.1.1 - type-fun ==0.1.1 - type-hint ==0.1 - type-level-integers ==0.0.1 @@ -2143,7 +2148,7 @@ default-package-overrides: - type-of-html ==1.5.1.0 - type-of-html-static ==0.1.0.2 - type-operators ==0.2.0.0 - - typerep-map ==0.3.2 + - typerep-map ==0.3.3.0 - type-spec ==0.4.0.0 - tzdata ==0.1.20190911.0 - ua-parser ==0.7.5.1 @@ -2201,7 +2206,7 @@ default-package-overrides: - validity ==0.9.0.3 - validity-aeson ==0.2.0.3 - validity-bytestring ==0.4.1.1 - - validity-containers ==0.5.0.1 + - validity-containers ==0.5.0.3 - validity-path ==0.4.0.1 - validity-primitive ==0.0.0.1 - validity-scientific ==0.2.0.3 -- cgit v1.2.3 From b20870870fbdcfea1ef204f8ffbfae250d5be055 Mon Sep 17 00:00:00 2001 From: Christoph Bauer Date: Thu, 23 Apr 2020 08:22:44 +0200 Subject: fix haskellPackages.headed-megaparsec --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++++ pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4b898972ded..6bbff47b645 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1516,4 +1516,8 @@ self: super: { sha256 = "sha256:0xbfhzhzg94b4r5qy5dg1c40liswwpqarrc2chcwgfbfnrmwkfc2"; }); + # Depends on selective >= 0.4, but the default of selective is 0.3 + headed-megaparsec = super.headed-megaparsec.override { + selective = self.selective_0_4_1; + }; } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 9519501656f..f17069e8d70 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5713,7 +5713,6 @@ broken-packages: - hdph-closure - hdr-histogram - HDRUtils - - headed-megaparsec - headergen - heapsort - heart-app -- cgit v1.2.3 From 278589f290a51033533844c8570e8e6aca4a9723 Mon Sep 17 00:00:00 2001 From: Christoph Bauer Date: Mon, 27 Apr 2020 18:33:41 +0200 Subject: hasql-th isn't broken because headed-megaparsec was repaired --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index f17069e8d70..1f090fd7b45 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5631,7 +5631,6 @@ broken-packages: - hasql-postgres - hasql-postgres-options - hasql-simple - - hasql-th - hastache - hastache-aeson - haste -- cgit v1.2.3 From e689b329c3ac130304132ccb9a4be120593f4254 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 28 Apr 2020 11:09:30 +1000 Subject: haskellPackages.hadolint: mark unbroken, remove override --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 - pkgs/development/haskell-modules/configuration-nix.nix | 5 ----- 2 files changed, 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 1f090fd7b45..ee234efb376 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -5338,7 +5338,6 @@ broken-packages: - haddock-leksah - haddock-test - haddocset - - hadolint - hadoop-formats - hadoop-rpc - hadoop-tools diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 817037e1e43..78e44a5ec87 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -628,11 +628,6 @@ self: super: builtins.intersectAttrs super { http-download = dontCheck super.http-download; pantry = dontCheck super.pantry; - # Hadolint wants to build a statically linked binary by default. - hadolint = overrideCabal super.hadolint (drv: { - preConfigure = "sed -i -e /ld-options:/d hadolint.cabal"; - }); - # gtk2hs-buildtools is listed in setupHaskellDepends, but we # need it during the build itself, too. cairo = addBuildTool super.cairo self.buildHaskellPackages.gtk2hs-buildtools; -- cgit v1.2.3 From 766b79b935a2b47c681e3de64a2b33b0af1cdf83 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 1 May 2020 20:16:14 +0200 Subject: hackage2nix: update list of broken builds to fix evaluation --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index ee234efb376..ca05752930b 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -4424,6 +4424,8 @@ broken-packages: - elision - elm-street - elm-websocket + - elynx + - elynx-markov - elynx-seq - elynx-tools - elynx-tree @@ -8660,6 +8662,7 @@ broken-packages: - reflex-basic-host - reflex-dom-retractable - reflex-dom-svg + - reflex-dynamic-containers - reflex-fsnotify - reflex-ghci - reflex-gloss @@ -8668,6 +8671,7 @@ broken-packages: - reflex-orphans - reflex-process - reflex-sdl2 + - reflex-test-host - reflex-transformers - reflex-vty - reformat @@ -9153,6 +9157,7 @@ broken-packages: - shake-pack - shake-path - shake-persist + - shakebook - shaker - shakespeare-babel - shakespeare-sass -- cgit v1.2.3 From 4abd2ae8a20ce85e64513ed2932cfc7c2b54bd54 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 25 Apr 2020 02:31:01 +0200 Subject: hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.2-4-gfa7a2c9 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/9d50cd974714cdcfdaabd089923b571a66bae55a. --- .../haskell-modules/hackage-packages.nix | 2413 +++++++++++++------- 1 file changed, 1535 insertions(+), 878 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 2eca7e4ec58..f3b7392e1d7 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1528,7 +1528,7 @@ self: { base colour diagrams-cairo diagrams-lib directory either-unwrap filepath parsec ParsecTools StockholmAlignment SVGFonts text vector ]; - description = "Libary for Hidden Markov Models in HMMER3 format"; + description = "Libary for Hidden Markov Models in HMMER3 format."; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -2511,7 +2511,7 @@ self: { version = "0.3.1.0"; sha256 = "0dlb761kj33v9p53fw44gg4r7j8kcl4jxvvgi7rz0pv8v7nh6255"; libraryHaskellDepends = [ base ]; - description = "Definition of a CSP core-language"; + description = "Definition of a CSP core-language."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -2912,7 +2912,7 @@ self: { version = "0.3"; sha256 = "10m7l701p3a2w0kxi2b93g2ii6s4s71zyjypqk3mi79siv8yilif"; libraryHaskellDepends = [ base mtl ]; - description = "A monad for complex manipulation of a stream"; + description = "A monad for complex manipulation of a stream."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -3639,7 +3639,7 @@ self: { version = "0.1"; sha256 = "027dv53jrfk46dmiidnnrrdvhyin60i862znp414213w72yjrbhh"; libraryHaskellDepends = [ base template-haskell ]; - description = "Practical typed lazy contracts"; + description = "Practical typed lazy contracts."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -5621,7 +5621,7 @@ self: { isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base containers haskell98 ]; - description = "A set of computational morphology tools for Swedish diachronic lexicons"; + description = "A set of computational morphology tools for Swedish diachronic lexicons."; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -6354,8 +6354,8 @@ self: { }: mkDerivation { pname = "Frames"; - version = "0.6.2"; - sha256 = "1pbwrjcd8fm56hnxw6q42adn9n7maj96j3a2qyb6a668pc8q8jyx"; + version = "0.6.3"; + sha256 = "1iqzsx33312m75bprp9i9dr11f9dpa8x02296vgmjskmcblh9as5"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -6393,7 +6393,7 @@ self: { base beam-core beam-migrate beam-postgres bytestring conduit Frames generics-sop hspec hspec-core QuickCheck text vinyl ]; - description = "A library for accessing Postgres tables as in-memory data structures"; + description = "A library for accessing Postgres tables as in-memory data structures."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -9149,7 +9149,7 @@ self: { base bytestring DebugTraceHelpers directory filepath HSH HStringTemplateHelpers MissingH mtl regex-pcre unix ]; - description = "Convenience functions that use HSH, instances for HSH"; + description = "Convenience functions that use HSH, instances for HSH."; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -19083,7 +19083,7 @@ self: { version = "0.1.4"; sha256 = "0rpjd93lsqg3dqfjndm9l1nzyrbfs5nnvc61lmbmbhg0bcy0jms8"; libraryHaskellDepends = [ base template-haskell ]; - description = "TH implementation of effects"; + description = "TH implementation of effects."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -22480,6 +22480,8 @@ self: { pname = "acme-circular-containers"; version = "0.1.0.0"; sha256 = "1xngqlx0avn84qx696hjm8cdqqs9p0ls90kklkz5rs48fbcma3pr"; + revision = "2"; + editedCabalFile = "0zshb422bmcjisa1hq2mfvmijcsgk9lyi3f5wai62ydablxqdhbm"; libraryHaskellDepends = [ base containers graph-wrapper ]; testHaskellDepends = [ base containers doctest doctest-discover graph-wrapper @@ -34402,6 +34404,8 @@ self: { pname = "authenticate-oauth"; version = "1.6.0.1"; sha256 = "1hry1zbi7gbyfi94w9cyg6m7ii7xm68jnsph63zxdj2s4ns0ylp0"; + revision = "1"; + editedCabalFile = "0pyivmsmlzhpnzpi3jcmqyjjx5a1p7cl1grjyw8571pmxz6735w3"; libraryHaskellDepends = [ base base64-bytestring blaze-builder bytestring crypto-pubkey-types data-default http-client http-types random RSA SHA time @@ -34473,6 +34477,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "autoapply" = callPackage + ({ mkDerivation, base, Cabal, cabal-doctest, doctest, logict, mtl + , template-haskell, th-desugar, transformers, unification-fd + }: + mkDerivation { + pname = "autoapply"; + version = "0.2.0.0"; + sha256 = "0dcndh1rjxyx7889d8n52hngariq6lnidwpjxyhsxd30xb4lwij2"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base logict mtl template-haskell th-desugar transformers + unification-fd + ]; + testHaskellDepends = [ base doctest ]; + description = "Template Haskell to automatically pass values to functions"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "autoexporter" = callPackage ({ mkDerivation, base, Cabal, directory, filepath }: mkDerivation { @@ -36434,16 +36456,16 @@ self: { }) {}; "barbies" = callPackage - ({ mkDerivation, base, QuickCheck, tasty, tasty-hunit + ({ mkDerivation, base, distributive, QuickCheck, tasty, tasty-hunit , tasty-quickcheck, transformers }: mkDerivation { pname = "barbies"; - version = "2.0.0.0"; - sha256 = "0rbwdx9s940wfrlkay772i0q11rbywnhzigh5wy8sppx19pgfq9z"; - libraryHaskellDepends = [ base transformers ]; + version = "2.0.1.0"; + sha256 = "0d2a1d9w8xlviarlrrnlrfs82zf6gzxv09i6sa4ci1bl8df64wmj"; + libraryHaskellDepends = [ base distributive transformers ]; testHaskellDepends = [ - base QuickCheck tasty tasty-hunit tasty-quickcheck + base distributive QuickCheck tasty tasty-hunit tasty-quickcheck ]; description = "Classes for working with types that can change clothes"; license = stdenv.lib.licenses.bsd3; @@ -36656,10 +36678,8 @@ self: { }: mkDerivation { pname = "base-encoding"; - version = "0.1.0.0"; - sha256 = "1chmx5qvglf91i0c9ih9xydzb37v8j4bykvmb2g6pyg7wdq0s8si"; - revision = "2"; - editedCabalFile = "0flfvs03zs7k04x7yhsc3jiw3zpnx7n3637jyy10flpqv90fy6sx"; + version = "0.2.0.0"; + sha256 = "028b7pbpbnph2k4jzvp9kyn2s7d0zd62panh21digwn4nnc3hbp1"; libraryHaskellDepends = [ base base16-bytestring base64-bytestring bytestring text ]; @@ -36758,13 +36778,15 @@ self: { "base16" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, criterion , deepseq, memory, primitive, random-bytestring, tasty, tasty-hunit - , text + , text, text-short }: mkDerivation { pname = "base16"; - version = "0.2.0.1"; - sha256 = "1y7ighqi1id57kh04ks8bg8b2vvzmy25p4qgdq26y0ydfz33gmsh"; - libraryHaskellDepends = [ base bytestring primitive text ]; + version = "0.2.1.0"; + sha256 = "192wnfqb97qhpjrjlq2da5jrjz9zjqjp57rgh1xdvdrnp7900r0s"; + libraryHaskellDepends = [ + base bytestring primitive text text-short + ]; testHaskellDepends = [ base base16-bytestring bytestring memory random-bytestring tasty tasty-hunit text @@ -37566,6 +37588,21 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "bazel-runfiles_0_12" = callPackage + ({ mkDerivation, base, directory, filepath, transformers }: + mkDerivation { + pname = "bazel-runfiles"; + version = "0.12"; + sha256 = "1x9w6j5yb0rxaaymzvv2hr5g00cy4zhkv79xgb8ns9frnv2bx2km"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory filepath transformers ]; + executableHaskellDepends = [ base filepath ]; + description = "Locate Bazel runfiles location"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bbdb" = callPackage ({ mkDerivation, base, hspec, parsec }: mkDerivation { @@ -38330,7 +38367,7 @@ self: { ghc-paths haskeline haskell-src-exts language-python monads-tf parseargs process transformers ]; - description = "An implementation of Python 3"; + description = "An implementation of Python 3."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -39474,6 +39511,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "binaryen" = callPackage + ({ mkDerivation, base, binaryen }: + mkDerivation { + pname = "binaryen"; + version = "0.0.1.0"; + sha256 = "01fiq7q9iw6lipvwpr7bfsqw337ncxagd04g62h8qgvlgysh7vvh"; + libraryHaskellDepends = [ base ]; + librarySystemDepends = [ binaryen ]; + description = "Haskell bindings to binaryen"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs) binaryen;}; + "bind-marshal" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, ghc-prim , monads-tf, mtl, numeric-prelude, random, stm, strict @@ -39948,7 +39997,7 @@ self: { license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {inherit (pkgs) libftdi; inherit (pkgs) libusb;}; + }) {inherit (pkgs) libftdi; libusb = null;}; "bindings-libg15" = callPackage ({ mkDerivation, base, bindings-DSL, g15 }: @@ -40006,7 +40055,7 @@ self: { libraryPkgconfigDepends = [ libusb ]; description = "Low level bindings to libusb"; license = stdenv.lib.licenses.bsd3; - }) {inherit (pkgs) libusb;}; + }) {libusb = null;}; "bindings-libv4l2" = callPackage ({ mkDerivation, base, bindings-DSL, v4l2 }: @@ -40232,7 +40281,7 @@ self: { libraryHaskellDepends = [ base ]; librarySystemDepends = [ sipc ]; executableHaskellDepends = [ base ]; - description = "Low level bindings to SIPC"; + description = "Low level bindings to SIPC."; license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -41510,8 +41559,8 @@ self: { }: mkDerivation { pname = "bitwise-enum"; - version = "1.0.0"; - sha256 = "11klr2qxbly9ppcv7b1pcrvqfw6h0l3qqwy0wzlv05jqhaywjxwc"; + version = "1.0.0.1"; + sha256 = "0y7x2yyvbdvwg5g5rrl9dbh2syvl1y74pwlccq2w2v5rhr8ql2cb"; libraryHaskellDepends = [ aeson array base deepseq mono-traversable vector ]; @@ -42115,23 +42164,6 @@ self: { }) {}; "blaze-markup" = callPackage - ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit - , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text - }: - mkDerivation { - pname = "blaze-markup"; - version = "0.8.2.4"; - sha256 = "0xb2hd5n6ymax6yw5hyi05lgllq5ldw28mgfxjpljrws9m8i078w"; - libraryHaskellDepends = [ base blaze-builder bytestring text ]; - testHaskellDepends = [ - base blaze-builder bytestring containers HUnit QuickCheck tasty - tasty-hunit tasty-quickcheck text - ]; - description = "A blazingly fast markup combinator library for Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "blaze-markup_0_8_2_5" = callPackage ({ mkDerivation, base, blaze-builder, bytestring, containers, HUnit , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text }: @@ -42146,7 +42178,6 @@ self: { ]; description = "A blazingly fast markup combinator library for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "blaze-shields" = callPackage @@ -43636,8 +43667,8 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "box-tuples"; - version = "0.1.1.0"; - sha256 = "1j0s7pb9milrz5spqsxwwhva1zwa7ywwd8nbb5y0z97p84wvyy7k"; + version = "0.2.0.3"; + sha256 = "12a3jj3z1gni8925n16ipqyah8vg244lx88v289f2rldiyvh3bvf"; libraryHaskellDepends = [ base ghc-prim ]; description = "A hack to use GHC.Prim primitives in GHCi"; license = stdenv.lib.licenses.mit; @@ -43853,6 +43884,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "brick_0_53" = callPackage + ({ mkDerivation, base, bytestring, config-ini, containers + , contravariant, data-clist, deepseq, directory, dlist, exceptions + , filepath, microlens, microlens-mtl, microlens-th, QuickCheck, stm + , template-haskell, text, text-zipper, transformers, unix, vector + , vty, word-wrap + }: + mkDerivation { + pname = "brick"; + version = "0.53"; + sha256 = "15k9sc5y3xcjd3kfjs0rnsqxbiy9k34khncbi7jyyl3khq7rhw5n"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring config-ini containers contravariant data-clist + deepseq directory dlist exceptions filepath microlens microlens-mtl + microlens-th stm template-haskell text text-zipper transformers + unix vector vty word-wrap + ]; + testHaskellDepends = [ + base containers microlens QuickCheck vector + ]; + description = "A declarative terminal user interface library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "brick-dropdownmenu" = callPackage ({ mkDerivation, base, brick, containers, microlens, microlens-ghc , microlens-th, pointedlist, vector, vty @@ -44321,8 +44379,8 @@ self: { pname = "brotli-streams"; version = "0.0.0.0"; sha256 = "14jc1nhm50razsl99d95amdf4njf75dnzx8vqkihgrgp7qisyz3z"; - revision = "1"; - editedCabalFile = "1mpd5wf027g1f46a9a2g1wvsaxhr1asyj5f3k69vq3226dfisnn7"; + revision = "2"; + editedCabalFile = "0xp1raxz3ddaq4hvpsw9yqwdfy51wwjiirh51nnxdgxqcwpy5w8s"; libraryHaskellDepends = [ base brotli bytestring io-streams ]; testHaskellDepends = [ base bytestring HUnit io-streams QuickCheck test-framework @@ -45436,6 +45494,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bytebuild_0_3_5_0" = callPackage + ({ mkDerivation, base, byteslice, bytestring, gauge + , integer-logarithms, natural-arithmetic, primitive + , primitive-offset, primitive-unlifted, QuickCheck + , quickcheck-classes, quickcheck-instances, run-st, tasty + , tasty-hunit, tasty-quickcheck, text, text-short, vector + , wide-word + }: + mkDerivation { + pname = "bytebuild"; + version = "0.3.5.0"; + sha256 = "15ccfbhrvb6pj9py99qpbdrrfla83797ywmxjry2c7raaz3kpr73"; + libraryHaskellDepends = [ + base byteslice bytestring integer-logarithms natural-arithmetic + primitive primitive-offset primitive-unlifted run-st text-short + wide-word + ]; + testHaskellDepends = [ + base byteslice bytestring natural-arithmetic primitive + primitive-unlifted QuickCheck quickcheck-classes + quickcheck-instances tasty tasty-hunit tasty-quickcheck text vector + wide-word + ]; + benchmarkHaskellDepends = [ + base byteslice gauge natural-arithmetic primitive text-short + ]; + description = "Serialize to a small byte arrays"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bytedump" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -45450,6 +45539,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bytehash" = callPackage + ({ mkDerivation, base, byte-order, byteslice, bytesmith, bytestring + , entropy, gauge, hedgehog, primitive, primitive-checked + , primitive-unlifted, split, tasty, tasty-hedgehog, tasty-hunit + , transformers, unordered-containers + }: + mkDerivation { + pname = "bytehash"; + version = "0.1.0.0"; + sha256 = "1jc8fz8rv7072is0srcp730ff37xkb68xl6s6yssba4anxc8s5nm"; + libraryHaskellDepends = [ + base byte-order byteslice bytestring entropy primitive + primitive-unlifted transformers + ]; + testHaskellDepends = [ + base byteslice entropy hedgehog primitive-checked tasty + tasty-hedgehog tasty-hunit + ]; + benchmarkHaskellDepends = [ + base byteslice bytesmith bytestring entropy gauge primitive + primitive-unlifted split unordered-containers + ]; + description = "Universal hashing of bytes"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "bytelog" = callPackage ({ mkDerivation, base, bytebuild, byteslice, natural-arithmetic , posix-api, primitive @@ -45533,6 +45648,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "byteslice_0_2_3_0" = callPackage + ({ mkDerivation, base, bytestring, gauge, primitive, primitive-addr + , primitive-unlifted, quickcheck-classes, run-st, tasty + , tasty-hunit, tasty-quickcheck, tuples, vector + }: + mkDerivation { + pname = "byteslice"; + version = "0.2.3.0"; + sha256 = "1xbsnlryx9ggvp46kv6m0f4hf9vs0bc2ia13jym9aji5rd7qvyfp"; + libraryHaskellDepends = [ + base primitive primitive-addr primitive-unlifted run-st tuples + vector + ]; + testHaskellDepends = [ + base bytestring primitive quickcheck-classes tasty tasty-hunit + tasty-quickcheck + ]; + benchmarkHaskellDepends = [ base gauge primitive ]; + description = "Slicing managed and unmanaged memory"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bytesmith" = callPackage ({ mkDerivation, base, byte-order, byteslice, bytestring , contiguous, gauge, primitive, run-st, tasty, tasty-hunit @@ -46531,6 +46669,8 @@ self: { pname = "cabal-cache"; version = "1.0.1.8"; sha256 = "0yxq73bdw1ai0yv54prcxpm1ygkpa8m0jnznwm975b82qlmplynw"; + revision = "1"; + editedCabalFile = "1rikn1g6v8yga0cs031ckxywfcf9g21ww9s5rkjf6lr4xvfqps2s"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -47481,8 +47621,8 @@ self: { }: mkDerivation { pname = "cabal2nix"; - version = "2.15.1"; - sha256 = "1gdwri0x7kw96y0c6j9rdqa68arrxkpisq43ld58applxcvr1cs7"; + version = "2.15.3"; + sha256 = "1l4jhl842g5jmwhmi1gqljkxa8ia80xbk2vmlhg6hlw1nkl9wfrz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -48115,8 +48255,8 @@ self: { "calamity" = callPackage ({ mkDerivation, aeson, async, base, bytestring, concurrent-extra - , data-default-class, deepseq, deque, df1, di-polysemy, exceptions - , fmt, focus, generic-lens, generic-override + , containers, data-default-class, deepseq, deque, df1, di-polysemy + , exceptions, fmt, focus, generic-lens, generic-override , generic-override-aeson, hashable, http-date, http-types, lens , lens-aeson, mtl, polysemy, polysemy-plugin, reflection , scientific, stm, stm-chans, stm-containers, text, text-show, time @@ -48125,16 +48265,16 @@ self: { }: mkDerivation { pname = "calamity"; - version = "0.1.0.0"; - sha256 = "0cpx7v210gyh3r5qzh704wx4fgrb913b5g4rys76jhnmp77a79wc"; + version = "0.1.4.1"; + sha256 = "1acaqiaws9g65kiznqrgng0fxnlglanz44psl0syrpmw7jmvdwmq"; libraryHaskellDepends = [ - aeson async base bytestring concurrent-extra data-default-class - deepseq deque df1 di-polysemy exceptions fmt focus generic-lens - generic-override generic-override-aeson hashable http-date - http-types lens lens-aeson mtl polysemy polysemy-plugin reflection - scientific stm stm-chans stm-containers text text-show time - typerep-map unordered-containers vector websockets wreq-patchable - wuss + aeson async base bytestring concurrent-extra containers + data-default-class deepseq deque df1 di-polysemy exceptions fmt + focus generic-lens generic-override generic-override-aeson hashable + http-date http-types lens lens-aeson mtl polysemy polysemy-plugin + reflection scientific stm stm-chans stm-containers text text-show + time typerep-map unordered-containers vector websockets + wreq-patchable wuss ]; description = "A library for writing discord bots"; license = stdenv.lib.licenses.mit; @@ -48846,6 +48986,27 @@ self: { broken = true; }) {}; + "cardano-coin-selection" = callPackage + ({ mkDerivation, base, bytestring, containers, cryptonite, deepseq + , fmt, hspec, memory, QuickCheck, quiet, random, text, transformers + , vector + }: + mkDerivation { + pname = "cardano-coin-selection"; + version = "1.0.0"; + sha256 = "0s0b2bbczsjq31h3xpyvingwpgpzgh3x2sw6bvryyn13wy717hbk"; + libraryHaskellDepends = [ + base bytestring containers cryptonite deepseq quiet text + transformers + ]; + testHaskellDepends = [ + base bytestring containers cryptonite deepseq fmt hspec memory + QuickCheck quiet random text transformers vector + ]; + description = "Algorithms for coin selection and fee balancing"; + license = stdenv.lib.licenses.asl20; + }) {}; + "cardano-transactions" = callPackage ({ mkDerivation, ansi-terminal, base, base58-bytestring, bytestring , cardano-binary, cardano-crypto, cardano-crypto-wrapper @@ -50874,7 +51035,7 @@ self: { array base binary bytestring Codec-Image-DevIL containers data-reify directory GLUT OpenGLRaw process time ]; - description = "Combinators for building and processing 2D images"; + description = "Combinators for building and processing 2D images."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -50887,7 +51048,7 @@ self: { version = "0.1"; sha256 = "1gvnp176j8gd0s6wzq10zpiqkn3wma99pwn3f78wgxm9rh588gh2"; libraryHaskellDepends = [ array base chalkboard GLUT OpenGL time ]; - description = "OpenGL based viewer for chalkboard rendered images"; + description = "OpenGL based viewer for chalkboard rendered images."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -54886,34 +55047,6 @@ self: { }) {}; "co-log" = callPackage - ({ mkDerivation, ansi-terminal, base, bytestring, chronos - , co-log-core, containers, contravariant, directory, filepath - , hedgehog, markdown-unlit, mtl, stm, text, transformers - , typerep-map, vector - }: - mkDerivation { - pname = "co-log"; - version = "0.4.0.0"; - sha256 = "1ayxsxw96yy72h6bsy6vwi4xwdawcq1hgsyc0s626bp84is7fm5c"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - ansi-terminal base bytestring chronos co-log-core containers - contravariant directory filepath mtl stm text transformers - typerep-map vector - ]; - executableHaskellDepends = [ - base bytestring co-log-core mtl text typerep-map - ]; - executableToolDepends = [ markdown-unlit ]; - testHaskellDepends = [ base co-log-core hedgehog ]; - description = "Composable Contravariant Comonadic Logging Library"; - license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "co-log_0_4_0_1" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, chronos , co-log-core, containers, contravariant, directory, filepath , hedgehog, markdown-unlit, mtl, stm, text, transformers @@ -54945,26 +55078,14 @@ self: { ({ mkDerivation, base, co-log-core, stm }: mkDerivation { pname = "co-log-concurrent"; - version = "0.4.0.0"; - sha256 = "1gnfqg6c290ain7v06clxga6jj46bdry6vvsrk1dhcdqv1rvkfwz"; + version = "0.5.0.0"; + sha256 = "07z4aklk7dc2fhbc30kd9hbdvq71sa4ip6r2pyifcpn3p2pr3mna"; libraryHaskellDepends = [ base co-log-core stm ]; description = "Asynchronous backend for co-log library"; license = stdenv.lib.licenses.mpl20; }) {}; "co-log-core" = callPackage - ({ mkDerivation, base, doctest, Glob }: - mkDerivation { - pname = "co-log-core"; - version = "0.2.1.0"; - sha256 = "1jfdjcbhd4mjj00fr2xk7g220kxz4jzbv84j32sqkjnrx49cziz0"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest Glob ]; - description = "Composable Contravariant Comonadic Logging Library"; - license = stdenv.lib.licenses.mpl20; - }) {}; - - "co-log-core_0_2_1_1" = callPackage ({ mkDerivation, base, doctest, Glob }: mkDerivation { pname = "co-log-core"; @@ -54974,24 +55095,9 @@ self: { testHaskellDepends = [ base doctest Glob ]; description = "Composable Contravariant Comonadic Logging Library"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "co-log-polysemy" = callPackage - ({ mkDerivation, base, co-log-core, polysemy }: - mkDerivation { - pname = "co-log-polysemy"; - version = "0.0.1.1"; - sha256 = "0wm5zcn3df4hc5rbbj1mlm9y1fs5pkpvvm1c98r5dnvs7lfmnzpd"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base co-log-core polysemy ]; - executableHaskellDepends = [ base co-log-core polysemy ]; - description = "Composable Contravariant Comonadic Logging Library"; - license = stdenv.lib.licenses.mpl20; - }) {}; - - "co-log-polysemy_0_0_1_2" = callPackage ({ mkDerivation, base, co-log-core, polysemy }: mkDerivation { pname = "co-log-polysemy"; @@ -55003,7 +55109,6 @@ self: { executableHaskellDepends = [ base co-log-core polysemy ]; description = "Composable Contravariant Comonadic Logging Library"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "co-log-sys" = callPackage @@ -55055,8 +55160,8 @@ self: { }: mkDerivation { pname = "cobot"; - version = "0.1.1.2"; - sha256 = "0454y6hlf32c8x6rjzjp0594ikgnvamngz7k6cgfsyssx1fkz2sk"; + version = "0.1.1.4"; + sha256 = "0sskb87cjq6b6splwyl4dc11vwyx4jqp4xwdsgk78awfl1zcqhxd"; libraryHaskellDepends = [ array base bytestring containers deepseq lens linear megaparsec mtl split template-haskell text @@ -57343,8 +57448,8 @@ self: { ({ mkDerivation, base, base-prelude }: mkDerivation { pname = "compound-types"; - version = "0.1.4"; - sha256 = "1lnmlql90v66vs2dr5lqg2lzfvf7m3z8naazfzj7zdyqjf9jnpkc"; + version = "0.1.4.1"; + sha256 = "0rlmpyx6h8mhzlr6falqh8kd6nm5nqgkhb9vh1znnqwrb3lzzi0x"; libraryHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base-prelude ]; description = "Sum and Product types and such"; @@ -58069,8 +58174,8 @@ self: { pname = "concurrent-utilities"; version = "0.2.0.2"; sha256 = "1phc9a90nvx6dk741hmg3w5m9y8ra5a7zsgmzw173ibaapr2yhqi"; - revision = "1"; - editedCabalFile = "1phqnmgq7mj7751d4g599jy3brz4fmlm1z7qd88gkyr94mn5pm23"; + revision = "2"; + editedCabalFile = "1jf0sx6yq557aspa3wm12hkc64pmfnc39kbc5wsa2k7ksash3k15"; libraryHaskellDepends = [ base ]; description = "More utilities and broad-used datastructures for concurrency"; license = stdenv.lib.licenses.bsd3; @@ -59589,7 +59694,7 @@ self: { version = "0.1.0.1"; sha256 = "16s8y035f30gyla620diwnsqi8lbmmfyxjpj4dlq24d45k5wfnsd"; libraryHaskellDepends = [ attoparsec base bytestring vector ]; - description = "Parse ByteStrings of a prescribed length"; + description = "Parse ByteStrings of a prescribed length."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -59690,7 +59795,7 @@ self: { base containers criterion deepseq nat-sized-numbers QuickCheck smallcheck transformers vector ]; - description = "Typeclasses and instances for monads with constraints"; + description = "Typeclasses and instances for monads with constraints."; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -61599,8 +61704,8 @@ self: { }: mkDerivation { pname = "cpkg"; - version = "0.2.5.2"; - sha256 = "1njjbvpnkjwxgsrjr3fihyvgr194mc94g2qxdq5yb1ai3sms7zsd"; + version = "0.2.5.3"; + sha256 = "0fdwjpkjwdixcb3r265z3dnrsrzcfh513lv6wxmgd63507j29njf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -62963,6 +63068,8 @@ self: { pname = "crypto-enigma"; version = "0.1.1.6"; sha256 = "07qxrpwg9r2w2l0d2nrvn703vzsfhchznly93bnr2pfpbwj4iv2z"; + revision = "1"; + editedCabalFile = "15n8jb3g89x1cj5vk9a3x3g55c3agdz611sjlp5ixvqzf1kz5jiq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers split text ]; @@ -62970,7 +63077,7 @@ self: { ansi-terminal base containers optparse-applicative split text ]; testHaskellDepends = [ base HUnit QuickCheck ]; - description = "An Enigma machine simulator with display"; + description = "An Enigma machine simulator with display."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -63862,8 +63969,8 @@ self: { pname = "css-syntax"; version = "0.1.0.0"; sha256 = "02f000nzc0dhjhlp1z82q4far8ablvzalpk918lg54f63lbqdwsh"; - revision = "4"; - editedCabalFile = "0n3wf9yjpn29nl0f9jk3izp7d2iq00j6bp1y1v1k5vc1ycskhn5y"; + revision = "5"; + editedCabalFile = "1i3svb2zy7i3g2xrv8hki5dn6fd5rh2pwjxv72rbmbgl1adp3w3s"; libraryHaskellDepends = [ base scientific text ]; testHaskellDepends = [ base directory hspec QuickCheck scientific text @@ -63939,7 +64046,7 @@ self: { attoparsec attoparsec-enumerator base bytestring containers directory enumerator safe transformers unix-compat ]; - description = "A flexible, fast, enumerator-based CSV parser library for Haskell"; + description = "A flexible, fast, enumerator-based CSV parser library for Haskell."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -65115,10 +65222,8 @@ self: { }: mkDerivation { pname = "darcs"; - version = "2.14.2"; - sha256 = "0zm2486gyhiga1amclbg92cd09bvki6vgh0ll75hv5kl72j61lb5"; - revision = "1"; - editedCabalFile = "0xl7j5cm704pbl2ms0dkydh7jvrz0ym76d725ifpg4h902m1zkhg"; + version = "2.14.4"; + sha256 = "0qk70a2i5p69lai0vzrckjql3rz8sfiq5vnpafmscmq8018i2wp7"; configureFlags = [ "-fforce-char8-encoding" "-flibrary" ]; isLibrary = true; isExecutable = true; @@ -65136,7 +65241,8 @@ self: { testHaskellDepends = [ array base bytestring cmdargs containers directory filepath FindBin HUnit mtl QuickCheck shelly split test-framework - test-framework-hunit test-framework-quickcheck2 text zip-archive + test-framework-hunit test-framework-quickcheck2 text transformers + zip-archive ]; doCheck = false; postInstall = '' @@ -65694,8 +65800,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "data-category"; - version = "0.8.1"; - sha256 = "06m5yb7ycxr1drvv67cyb01mhghhfac9y8wf7lpmq2z55h4hflb2"; + version = "0.9"; + sha256 = "1crp5mg9paf29gkl2nfpnx303p958kx3ap8zzbhq6gzvhklvyam0"; description = "Category theory"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -66310,7 +66416,7 @@ self: { version = "0.0.2"; sha256 = "1xn6qnir5dss23y8d71dsy78sdk7hczwprxir8v6la15c43rf9p2"; libraryHaskellDepends = [ base containers data-fix transformers ]; - description = "Common subexpression elimination for the fixploint types"; + description = "Common subexpression elimination for the fixploint types."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -67917,6 +68023,34 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "dbus_1_2_14" = callPackage + ({ mkDerivation, base, bytestring, cereal, conduit, containers + , criterion, deepseq, directory, exceptions, extra, filepath, lens + , network, parsec, process, QuickCheck, random, resourcet, split + , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text + , th-lift, transformers, unix, vector, xml-conduit, xml-types + }: + mkDerivation { + pname = "dbus"; + version = "1.2.14"; + sha256 = "0w304j28vc90dmyz6zqsijjdjj2967grdc8f3zf5jiq50rzgmrr8"; + libraryHaskellDepends = [ + base bytestring cereal conduit containers deepseq exceptions + filepath lens network parsec random split template-haskell text + th-lift transformers unix vector xml-conduit xml-types + ]; + testHaskellDepends = [ + base bytestring cereal containers directory extra filepath network + parsec process QuickCheck random resourcet tasty tasty-hunit + tasty-quickcheck text transformers unix vector + ]; + benchmarkHaskellDepends = [ base criterion ]; + doCheck = false; + description = "A client library for the D-Bus IPC system"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dbus-client" = callPackage ({ mkDerivation, base, containers, dbus-core, monads-tf, text , transformers @@ -68104,7 +68238,7 @@ self: { libraryHaskellDepends = [ base containers deepseq parsec transformers wl-pprint ]; - description = "Disciplined Disciple Compiler common utilities"; + description = "Disciplined Disciple Compiler common utilities."; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -70976,8 +71110,8 @@ self: { ({ mkDerivation, base, df1, di-core, di-df1, di-handle, polysemy }: mkDerivation { pname = "di-polysemy"; - version = "0.1.1.0"; - sha256 = "08n98ivdvfb77slzbxvysy4cgvnf6jcxf0zqj1rr40rjfxaw2xcn"; + version = "0.1.1.2"; + sha256 = "0qglcvz628si1kg5djgh9j7ppvgfsc3gphal05hvlc4xziywf55y"; libraryHaskellDepends = [ base df1 di-core di-df1 di-handle polysemy ]; @@ -71578,8 +71712,8 @@ self: { }: mkDerivation { pname = "dialogflow-fulfillment"; - version = "0.1.0.0"; - sha256 = "0pz5qyz6sf00c5155mrraya7jr8sp99hmfm1642hv4zhj08ky0j7"; + version = "0.1.1.1"; + sha256 = "1fha1raifdzkv3g52wl9cx6xpan3jsv11ysd3cz4sffylygcyg71"; libraryHaskellDepends = [ aeson base bytestring containers text unordered-containers ]; @@ -71644,7 +71778,7 @@ self: { testHaskellDepends = [ base QuickCheck test-framework test-framework-quickcheck2 ]; - description = "Cryptographically secure n-sided dice via rejection sampling"; + description = "Cryptographically secure n-sided dice via rejection sampling."; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -72752,8 +72886,8 @@ self: { }: mkDerivation { pname = "dirtree"; - version = "0.1.1"; - sha256 = "18iahbw6hzjxsnmr3yi80w0xvf6iphdxb2yg5kpnww26lmlgk6dc"; + version = "0.1.3"; + sha256 = "1x2wff1iqjwdygb6yn7v63bplig4ad4qh6brqaj66y1qpnhb5vja"; libraryHaskellDepends = [ base bytestring containers deepseq directory filepath lens unix zip-archive @@ -72843,8 +72977,8 @@ self: { }: mkDerivation { pname = "discord-haskell"; - version = "1.5.0"; - sha256 = "1449ap68c917z1318wg67cv7yk7cmfr61m0ikbf132gzsfyx69kv"; + version = "1.5.2"; + sha256 = "1xpgbxmf70jlgm2mfnyb3mylvp0xzgp501iybbf3s12b7d0kk17b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74369,8 +74503,8 @@ self: { }: mkDerivation { pname = "dobutokO2"; - version = "0.35.2.0"; - sha256 = "1hr4l8flfjinvbdwxf3xmq3xknd19kbf3d2k23dy7y1fghd6vflh"; + version = "0.37.1.0"; + sha256 = "16mbd89mpzcvyrzrn6sbwfnwsay2a9h0jn227py95r68pn2c2rn0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74969,6 +75103,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "dom-events" = callPackage + ({ mkDerivation, base, text, unordered-containers }: + mkDerivation { + pname = "dom-events"; + version = "0.0.0.4"; + sha256 = "1yyhinrv6pm275fi9kg8hdi3vzv33i8nm785fih402fw0a9g8r35"; + libraryHaskellDepends = [ base text unordered-containers ]; + testHaskellDepends = [ base ]; + description = "DOM Events expressed as Haskell types"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dom-lt" = callPackage ({ mkDerivation, array, base, containers, criterion, deepseq }: mkDerivation { @@ -76829,7 +76975,7 @@ self: { version = "0.1.1.0"; sha256 = "1agk7q556yf6v776568apvc4dgvxiqfshina12f69ky8afvjr6qz"; libraryHaskellDepends = [ base containers template-haskell unix ]; - description = "Automatically derive dynamic linking methods from a data type"; + description = "Automatically derive dynamic linking methods from a data type."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -76856,7 +77002,7 @@ self: { version = "0.1.0.5"; sha256 = "0hsy9mgnl2yf94kqxy69wgmr5hjqxpp55qvij3f53sxxywjrxdi2"; libraryHaskellDepends = [ base primitive vector ]; - description = "A wrapper around MVector that enables pushing, popping and extending"; + description = "A wrapper around MVector that enables pushing, popping and extending."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -78431,6 +78577,8 @@ self: { pname = "ekg-core"; version = "0.1.1.7"; sha256 = "04nv6iwzrb63fs97ixb0amj8p6zhabg3ggbrg4nbkq7xjhmkz0a5"; + revision = "1"; + editedCabalFile = "17rfxsns0za7jqp3069mwp0lbd433gwb7lrnla02y7hfxbpnldf4"; libraryHaskellDepends = [ base containers ghc-prim text unordered-containers ]; @@ -78499,8 +78647,8 @@ self: { pname = "ekg-json"; version = "0.1.0.6"; sha256 = "0iyx0ix4dcyhh9xg4ia1lm7x2q0iffswnr33khfg9fr81am80shy"; - revision = "5"; - editedCabalFile = "0qc3fdycamm97lhhvwgvl8kvj169qrwr5ds4vkvyclpv0s90ijva"; + revision = "6"; + editedCabalFile = "111495nizf5d9s91nbss78y3rh7vj5p1021m7pz96li37i5ps13m"; libraryHaskellDepends = [ aeson base ekg-core text unordered-containers ]; @@ -79313,29 +79461,68 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "elynx" = callPackage + ({ mkDerivation, aeson, base, bytestring, elynx-tools + , optparse-applicative, slynx, tlynx + }: + mkDerivation { + pname = "elynx"; + version = "0.2.2"; + sha256 = "19fj65klv8pyan6n6i0mzcwpsprkhvxirh82hdmr3b3y2zaw10h6"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base bytestring elynx-tools optparse-applicative slynx tlynx + ]; + description = "Validate and (optionally) redo ELynx analyses"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "elynx-markov" = callPackage + ({ mkDerivation, base, bytestring, containers, elynx-seq + , elynx-tools, elynx-tree, hmatrix, hspec, hspec-megaparsec + , integration, math-functions, megaparsec, mwc-random, parallel + , primitive, statistics, vector + }: + mkDerivation { + pname = "elynx-markov"; + version = "0.2.2"; + sha256 = "1w7wxha82xaanfnzyn8ygfpxmk7lalfvzwr157crz8nm59ai4c05"; + libraryHaskellDepends = [ + base bytestring containers elynx-seq elynx-tools elynx-tree hmatrix + integration math-functions megaparsec mwc-random parallel primitive + statistics vector + ]; + testHaskellDepends = [ + base bytestring containers elynx-tools elynx-tree hmatrix hspec + hspec-megaparsec integration math-functions megaparsec mwc-random + parallel primitive statistics vector + ]; + description = "Simulate molecular sequences along trees"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "elynx-seq" = callPackage - ({ mkDerivation, async, base, bytestring, containers - , data-memocombinators, elynx-tools, elynx-tree, hmatrix, hspec - , hspec-megaparsec, integration, math-functions, matrices - , megaparsec, mwc-random, optparse-applicative, parallel, primitive - , statistics, transformers, vector, vector-th-unbox, word8 + ({ mkDerivation, aeson, base, bytestring, containers, elynx-tools + , hspec, hspec-megaparsec, matrices, megaparsec, mwc-random + , parallel, primitive, vector, vector-th-unbox, word8 }: mkDerivation { pname = "elynx-seq"; - version = "0.1.0"; - sha256 = "07kykql8i5msy2n091bwbawagbfpw8q553k5s89j3y5bi6d4aahg"; + version = "0.2.2"; + sha256 = "1m09indy34zgx16m2rnmwjf9fvrhi8qcdxpfz7myjl2hxbp8hz1j"; libraryHaskellDepends = [ - async base bytestring containers data-memocombinators elynx-tools - elynx-tree hmatrix integration math-functions matrices megaparsec - mwc-random optparse-applicative parallel primitive statistics - transformers vector vector-th-unbox word8 + aeson base bytestring containers elynx-tools matrices megaparsec + mwc-random parallel primitive vector vector-th-unbox word8 ]; testHaskellDepends = [ - async base bytestring containers data-memocombinators elynx-tools - elynx-tree hmatrix hspec hspec-megaparsec integration - math-functions matrices megaparsec mwc-random optparse-applicative - parallel primitive statistics transformers vector vector-th-unbox - word8 + aeson base bytestring containers elynx-tools hspec hspec-megaparsec + matrices megaparsec mwc-random parallel primitive vector + vector-th-unbox word8 ]; description = "Handle molecular sequences"; license = stdenv.lib.licenses.gpl3; @@ -79344,22 +79531,23 @@ self: { }) {}; "elynx-tools" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, containers - , cryptohash-sha256, deepseq, fast-logger, hmatrix, lifted-base - , matrices, megaparsec, monad-control, monad-logger, mwc-random - , optparse-applicative, parallel, primitive, template-haskell, text - , time, transformers, transformers-base, vector, zlib + ({ mkDerivation, aeson, async, base, base16-bytestring, bytestring + , containers, cryptohash-sha256, deepseq, directory, fast-logger + , hmatrix, matrices, megaparsec, monad-control, monad-logger + , mwc-random, optparse-applicative, parallel, primitive + , template-haskell, text, time, transformers, transformers-base + , vector, zlib }: mkDerivation { pname = "elynx-tools"; - version = "0.1.0"; - sha256 = "0dhri3chyyqq8svw1lkl89hdrjb7b2bin50gqv3d6hrxs9813yz3"; + version = "0.2.2"; + sha256 = "0gdnfyag704yfvrakc7d0adh3mb9r1kf1v8cpdrspaxxr77brw9q"; libraryHaskellDepends = [ - aeson async base bytestring containers cryptohash-sha256 deepseq - fast-logger hmatrix lifted-base matrices megaparsec monad-control - monad-logger mwc-random optparse-applicative parallel primitive - template-haskell text time transformers transformers-base vector - zlib + aeson async base base16-bytestring bytestring containers + cryptohash-sha256 deepseq directory fast-logger hmatrix matrices + megaparsec monad-control monad-logger mwc-random + optparse-applicative parallel primitive template-haskell text time + transformers transformers-base vector zlib ]; description = "Tools for ELynx"; license = stdenv.lib.licenses.gpl3; @@ -79369,31 +79557,26 @@ self: { "elynx-tree" = callPackage ({ mkDerivation, base, bytestring, containers, criterion - , elynx-tools, hspec, hspec-megaparsec, lifted-async - , math-functions, megaparsec, mwc-random, optparse-applicative - , parallel, primitive, QuickCheck, quickcheck-instances, statistics - , transformers, vector + , elynx-tools, hspec, hspec-megaparsec, math-functions, megaparsec + , mwc-random, primitive, QuickCheck, quickcheck-instances + , statistics }: mkDerivation { pname = "elynx-tree"; - version = "0.1.0"; - sha256 = "1mg4k03xx1zmsn54ip5q27p3qll13dcfk2gh2xyfy097b4mlwrzp"; + version = "0.2.2"; + sha256 = "00c7rli9vfi1crz9plpc5xgh960ba245kisxihbx54vqlc94b5hj"; libraryHaskellDepends = [ - base bytestring containers elynx-tools lifted-async math-functions - megaparsec mwc-random optparse-applicative parallel primitive - QuickCheck quickcheck-instances statistics transformers vector + base bytestring containers elynx-tools math-functions megaparsec + mwc-random primitive statistics ]; testHaskellDepends = [ base bytestring containers elynx-tools hspec hspec-megaparsec - lifted-async math-functions megaparsec mwc-random - optparse-applicative parallel primitive QuickCheck - quickcheck-instances statistics transformers vector + math-functions megaparsec mwc-random primitive QuickCheck + quickcheck-instances statistics ]; benchmarkHaskellDepends = [ - base bytestring containers criterion elynx-tools lifted-async - math-functions megaparsec mwc-random optparse-applicative parallel - primitive QuickCheck quickcheck-instances statistics transformers - vector + base bytestring containers criterion elynx-tools math-functions + megaparsec mwc-random primitive statistics ]; description = "Handle phylogenetic trees"; license = stdenv.lib.licenses.gpl3; @@ -82203,6 +82386,8 @@ self: { pname = "eventloop"; version = "0.8.2.8"; sha256 = "1k10f8mihxb9xsvjkmzxphin4l49f5pwbfxfan1ar7wzxyv85vjj"; + revision = "1"; + editedCabalFile = "0qzrfk1riyf33b7kyjpdzzi8c40wh559wr0m0rjziykzxy0s92m2"; libraryHaskellDepends = [ aeson base bytestring concurrent-utilities deepseq network stm suspend text timers websockets @@ -83548,6 +83733,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "extended-containers-lens" = callPackage + ({ mkDerivation, base, extended-containers, lens }: + mkDerivation { + pname = "extended-containers-lens"; + version = "0.1.0.0"; + sha256 = "107nfyrp62h6qwc3ra08cd9vyaanc7442wcbfmm83aw05fav3p43"; + libraryHaskellDepends = [ base extended-containers lens ]; + description = "lens instances for extended-containers"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "extended-reals" = callPackage ({ mkDerivation, base, deepseq, hashable, HUnit, QuickCheck, tasty , tasty-hunit, tasty-quickcheck, tasty-th @@ -91192,8 +91388,8 @@ self: { }: mkDerivation { pname = "front"; - version = "0.0.0.7"; - sha256 = "07vzic8r0w7krnhpsq674g7zjk3gbzmf59gff25qk2qpj3rn4w9f"; + version = "0.0.0.8"; + sha256 = "07hx4a4hkg8ch29zax67ja099p7npgsaci45h5002cqp91il1khv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -95706,8 +95902,8 @@ self: { }: mkDerivation { pname = "ghc-check"; - version = "0.3.0.0"; - sha256 = "19fgfkv68q1l93ql6g4xpa27pcv1v04vpfpq0rcvspp09xmcv1i4"; + version = "0.3.0.1"; + sha256 = "180xqs4g90v9sdjb0b3baqk62gbnw1xkv76wdq5ap49q0730s3vz"; libraryHaskellDepends = [ base filepath ghc ghc-paths process template-haskell transformers ]; @@ -98063,8 +98259,8 @@ self: { }: mkDerivation { pname = "gi-gtk"; - version = "3.0.32"; - sha256 = "0div9lqmirys1f3dy6bskvai72hb82g6rvcg0kwg1im974xp5m8l"; + version = "3.0.33"; + sha256 = "03fvazdkg1m9svp39bn4gz7cfy23pp01yfcf6ambkdrq9msqsjak"; setupHaskellDepends = [ base Cabal gi-atk gi-cairo gi-gdk gi-gdkpixbuf gi-gio gi-glib gi-gobject gi-pango haskell-gi @@ -98359,8 +98555,8 @@ self: { }: mkDerivation { pname = "gi-poppler"; - version = "0.18.21"; - sha256 = "1mfi3yn7yrwg2cdpqp0av4cabmmqpmm2hywsrm5d78cxix4z1s7f"; + version = "0.18.22"; + sha256 = "0bqmkijnmxi4k30nbn8zsx03i9y7mlp06ikmd2dbxj22lyazqjz4"; setupHaskellDepends = [ base Cabal gi-cairo gi-gio gi-glib gi-gobject haskell-gi ]; @@ -99436,18 +99632,15 @@ self: { }: mkDerivation { pname = "github-release"; - version = "1.2.6"; - sha256 = "0959lmq1w1vh9cj3jnq2bg4jndcqg7d4ha531bvp4bg88z00q1zv"; + version = "1.3.0"; + sha256 = "08nr6a763zc0zszbw1lci4d86z3rpcyr1444a10q3a0dj64krwab"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base burrito bytestring http-client http-client-tls http-types mime-types optparse-generic text unordered-containers ]; - executableHaskellDepends = [ - aeson base burrito bytestring http-client http-client-tls - http-types mime-types optparse-generic text unordered-containers - ]; + executableHaskellDepends = [ base ]; description = "Upload files to GitHub releases"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -99577,8 +99770,8 @@ self: { }: mkDerivation { pname = "github-webhooks"; - version = "0.12.0"; - sha256 = "0p029a2pl77arldqllr84gnizhi3fib2mxf4cfggvykhdcrc856h"; + version = "0.13.0"; + sha256 = "08yqkxgmd9mqv75wzqi0mxhnb9jv1wawxkikgf6nzqwpdfml967y"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring cryptonite deepseq deepseq-generics memory text time vector @@ -103926,8 +104119,8 @@ self: { }: mkDerivation { pname = "gopro-plus"; - version = "0.3.1.0"; - sha256 = "06wggkl9p69xm75f3kkajacqr54fq7vqbmyldgapfqglbzs43z7g"; + version = "0.3.1.1"; + sha256 = "0gjdz5c165hk4nbynp3s633kzivq62y3riz45w0l0k2qrirpkd14"; libraryHaskellDepends = [ aeson base bytestring containers exceptions filepath generic-deriving lens lens-aeson mtl random retry text time @@ -105230,7 +105423,7 @@ self: { ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ base ]; - description = "GRASP implementation for the AMMM project"; + description = "GRASP implementation for the AMMM project."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -105446,8 +105639,8 @@ self: { }: mkDerivation { pname = "greskell"; - version = "1.0.0.1"; - sha256 = "070qqvp4dp7zng6yr1dipcranqhgccnps6k767ag6nh6cprz09qw"; + version = "1.0.1.0"; + sha256 = "0gknzbaldmziy7lj23g3l8q3ymxdr5vbis109j6r7zbjap1jy0in"; libraryHaskellDepends = [ aeson base exceptions greskell-core hashable semigroups text transformers unordered-containers vector @@ -105460,15 +105653,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "greskell_1_0_1_0" = callPackage + "greskell_1_1_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover , exceptions, greskell-core, hashable, hint, hspec, semigroups , text, transformers, unordered-containers, vector }: mkDerivation { pname = "greskell"; - version = "1.0.1.0"; - sha256 = "0gknzbaldmziy7lj23g3l8q3ymxdr5vbis109j6r7zbjap1jy0in"; + version = "1.1.0.0"; + sha256 = "10zvz33pd5h2zslmvhilsiqzg6j91azrh8dixc0z75dwrrwyhaa2"; libraryHaskellDepends = [ aeson base exceptions greskell-core hashable semigroups text transformers unordered-containers vector @@ -108246,34 +108439,6 @@ self: { broken = true; }) {}; - "hackage-security_0_5_3_0" = callPackage - ({ mkDerivation, base, base16-bytestring, base64-bytestring - , bytestring, Cabal, containers, cryptohash-sha256, directory - , ed25519, filepath, ghc-prim, mtl, network, network-uri, parsec - , pretty, QuickCheck, tar, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, temporary, time, transformers, zlib - }: - mkDerivation { - pname = "hackage-security"; - version = "0.5.3.0"; - sha256 = "08bwawc7ramgdh54vcly2m9pvfchp0ahhs8117jajni6x4bnx66v"; - revision = "6"; - editedCabalFile = "1xs2nkzlvkdz8g27yzfxbjdbdadfmgiydnlpn5dm77cg18r495ay"; - libraryHaskellDepends = [ - base base16-bytestring base64-bytestring bytestring Cabal - containers cryptohash-sha256 directory ed25519 filepath ghc-prim - mtl network network-uri parsec pretty tar template-haskell time - transformers zlib - ]; - testHaskellDepends = [ - base bytestring Cabal containers network-uri QuickCheck tar tasty - tasty-hunit tasty-quickcheck temporary time zlib - ]; - description = "Hackage security library"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - }) {}; - "hackage-security" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring , bytestring, Cabal, containers, cryptohash-sha256, directory @@ -108824,8 +108989,8 @@ self: { }: mkDerivation { pname = "hadolint"; - version = "1.17.3"; - sha256 = "00lyf2m6q866383q79b705xhn987504wz3fp3zh7m8580v8phy5p"; + version = "1.17.6"; + sha256 = "02xfkssxpyi7q7d1aj1gna8m4374pajqilbcgq0ii0hfrxiilc1k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -108842,8 +109007,6 @@ self: { ]; description = "Dockerfile Linter JavaScript API"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hadoop-formats" = callPackage @@ -109549,7 +109712,7 @@ self: { libraryHaskellDepends = [ base containers data-default filepath hakyll ]; - description = "Allow Hakyll to create hierarchical menues from directories"; + description = "Allow Hakyll to create hierarchical menues from directories."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -110951,7 +111114,7 @@ self: { base containers happstack-data happstack-util mtl syb syb-with-class template-haskell ]; - description = "Efficient relational queries on Haskell sets"; + description = "Efficient relational queries on Haskell sets."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -112501,8 +112664,8 @@ self: { pname = "haskell-awk"; version = "1.1.1"; sha256 = "0s6vzfsqh2wwsp98l8zpg6cvh7jwz5wha44idz3yavhmy6z08zgd"; - revision = "1"; - editedCabalFile = "1rrplmf2n4vkwisi367gi4a6yyh0ri2sdjqmdix7xyvfdad7m9cb"; + revision = "2"; + editedCabalFile = "1nq69vqp5dphhkq3h94c1gw2hpgyn2snnsig6kjwm4z60ww87viw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -114767,7 +114930,7 @@ self: { version = "1.0.0"; sha256 = "0j1aqix21pqcsw7skl897pd1ir6hg836g4zb2h5338h4gih6blx0"; libraryHaskellDepends = [ base haskelldb hsql mtl old-time ]; - description = "HaskellDB support for HSQL"; + description = "HaskellDB support for HSQL."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -115413,8 +115576,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.22.2"; - sha256 = "0h073f67rhp4w78lnn7vgg0v2i5p6cv1af16b80g3a55bd6mwkla"; + version = "0.23.14"; + sha256 = "0gvcjmyisnjml6mv43xgpq3hb2047lsk84vjr4hv4zf9h23gwb14"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -116457,16 +116620,16 @@ self: { "hasql-migration" = callPackage ({ mkDerivation, base, bytestring, contravariant, cryptonite - , data-default-class, directory, hasql, hasql-transaction, hspec - , memory, text, time, transformers + , directory, hasql, hasql-transaction, hspec, memory, text, time + , transformers }: mkDerivation { pname = "hasql-migration"; - version = "0.2.0"; - sha256 = "03dd0m2ggsv094nga0d8yaqcqb0r9ngdh3zvvr8127n9ka6805l1"; + version = "0.3.0"; + sha256 = "0qk9cds6crdbjrn0niv6dfaj2pa3qpmwh1l96rl2hvqyq2dz148q"; libraryHaskellDepends = [ - base bytestring contravariant cryptonite data-default-class - directory hasql hasql-transaction memory text time + base bytestring contravariant cryptonite directory hasql + hasql-transaction memory text time ]; testHaskellDepends = [ base bytestring hasql hasql-transaction hspec transformers @@ -116610,8 +116773,8 @@ self: { }: mkDerivation { pname = "hasql-th"; - version = "0.4.0.6"; - sha256 = "0s9c2aa0mpxiqsvpaf3l5k2gqchrjv4x9jpjmw7v3ywnv9pcxpkf"; + version = "0.4.0.7"; + sha256 = "0hs62wzp2phlq00jkz6qas1i3gyx3krnzn5hzvpa8zl4q0fggjvz"; libraryHaskellDepends = [ base bytestring case-insensitive containers contravariant fast-builder foldl hashable hasql headed-megaparsec megaparsec @@ -116627,8 +116790,6 @@ self: { ]; description = "Template Haskell utilities for Hasql"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "hasql-transaction" = callPackage @@ -117832,7 +117993,7 @@ self: { executableHaskellDepends = [ base directory HaskellForMaths QuickCheck text ]; - description = "Virtual Rubik's cube of arbitrary size"; + description = "Virtual Rubik's cube of arbitrary size."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -118353,8 +118514,6 @@ self: { ]; description = "More informative parser"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "headergen" = callPackage @@ -118402,6 +118561,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "headroom_0_2_1_1" = callPackage + ({ mkDerivation, aeson, base, doctest, either, file-embed, hspec + , mustache, optparse-applicative, pcre-light, QuickCheck, rio + , template-haskell, time, yaml + }: + mkDerivation { + pname = "headroom"; + version = "0.2.1.1"; + sha256 = "101zvngl2p89g2ivcnyrb6mbxmv88jcrz7n7lvapsxicqr0nppb4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base either file-embed mustache optparse-applicative + pcre-light rio template-haskell time yaml + ]; + executableHaskellDepends = [ base optparse-applicative rio ]; + testHaskellDepends = [ + aeson base doctest hspec optparse-applicative pcre-light QuickCheck + rio + ]; + description = "License Header Manager"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "heap" = callPackage ({ mkDerivation, base, QuickCheck }: mkDerivation { @@ -118789,6 +118973,8 @@ self: { pname = "hedgehog-classes"; version = "0.2.4.1"; sha256 = "0qa938cy1bm3shq0l4rfdq5cmb54jjy0qpp6cmx1xjd6yrdqrkxc"; + revision = "1"; + editedCabalFile = "1kxlq8x947wlpm6y80s25hhw074skzhpm7sbl87bvgcc6p7j7gc5"; libraryHaskellDepends = [ aeson base binary comonad containers hedgehog pretty-show primitive semirings silently transformers wl-pprint-annotated @@ -119714,8 +119900,8 @@ self: { ({ mkDerivation, base, doctest, time }: mkDerivation { pname = "herf-time"; - version = "0.3.0"; - sha256 = "00ar1kb29gjvna7rcdg6wj3f22dil2pzbzy8zblvyc452zjy03y2"; + version = "0.3.1"; + sha256 = "06ai2f2l2g4lxvvly5wrr0yrz7fq3ljzympywcxqvyg7dbf6k6hc"; libraryHaskellDepends = [ base time ]; testHaskellDepends = [ base doctest ]; description = "haskell time manipulation in a 'kerf like' style"; @@ -120453,6 +120639,29 @@ self: { broken = true; }) {}; + "hextream" = callPackage + ({ mkDerivation, attoparsec, base, base-compat, Cabal + , cabal-doctest, containers, data-default, doctest, filepath + , parsers, pretty-simple, resourcet, streaming-attoparsec + , streaming-bytestring, tasty, tasty-golden, tasty-hunit, text + }: + mkDerivation { + pname = "hextream"; + version = "0.1.0.1"; + sha256 = "0dc38zszqgbpmj7hlsd3w09i8rdpzd7jpr4vm2zv9y2y6bgcdpdr"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + base base-compat containers parsers text + ]; + testHaskellDepends = [ + attoparsec base base-compat data-default doctest filepath parsers + pretty-simple resourcet streaming-attoparsec streaming-bytestring + tasty tasty-golden tasty-hunit text + ]; + description = "Streaming-friendly XML parsers"; + license = stdenv.lib.licenses.cc0; + }) {}; + "heyefi" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, configurator , directory, exceptions, filepath, HandsomeSoup, hspec, hspec-wai @@ -122192,21 +122401,20 @@ self: { }) {}; "hint" = callPackage - ({ mkDerivation, base, containers, directory, exceptions - , extensible-exceptions, filepath, ghc, ghc-boot, ghc-paths, HUnit - , mtl, random, temporary, unix + ({ mkDerivation, base, containers, directory, exceptions, filepath + , ghc, ghc-boot, ghc-paths, HUnit, random, stm, temporary + , transformers, unix }: mkDerivation { pname = "hint"; - version = "0.9.0.2"; - sha256 = "06xnlfpf9h7i4fvm3p69accm18h7hblh7173040vlk5qvjywblhf"; + version = "0.9.0.3"; + sha256 = "0kp2hngmk2sf4ariv02rgrrd190zzb7nlk0pj8fq7rsckcxc87ra"; libraryHaskellDepends = [ - base directory exceptions filepath ghc ghc-boot ghc-paths mtl - random temporary unix + base directory exceptions filepath ghc ghc-boot ghc-paths random + temporary transformers unix ]; testHaskellDepends = [ - base containers directory exceptions extensible-exceptions filepath - HUnit unix + base containers directory exceptions filepath HUnit stm unix ]; description = "Runtime Haskell interpreter (GHC API wrapper)"; license = stdenv.lib.licenses.bsd3; @@ -124688,6 +124896,27 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hoauth2_1_12_0" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, exceptions + , http-conduit, http-types, microlens, text, unordered-containers + , uri-bytestring, uri-bytestring-aeson + }: + mkDerivation { + pname = "hoauth2"; + version = "1.12.0"; + sha256 = "0v3brbwq07qa7fszdlxaf1q2nfxvr273qq7zg0x5nqvaa63ghdlc"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base binary bytestring exceptions http-conduit http-types + microlens text unordered-containers uri-bytestring + uri-bytestring-aeson + ]; + description = "Haskell OAuth2 authentication client"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hob" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , glib, gtk-largeTreeStore, gtk3, gtksourceview3, hspec, mtl, pango @@ -129539,6 +129768,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hsendxmpp" = callPackage + ({ mkDerivation, base, hslogger, pontarius-xmpp + , pontarius-xmpp-extras, string-class + }: + mkDerivation { + pname = "hsendxmpp"; + version = "0.1.2.0"; + sha256 = "16mjcxkd706kfv9ifs1vn1gqry0wq8zqfwl8mig6vvav18n79l6q"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base hslogger pontarius-xmpp pontarius-xmpp-extras string-class + ]; + description = "sendxmpp clone, sending XMPP messages via CLI"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hsenv" = callPackage ({ mkDerivation, base, bytestring, Cabal, directory, file-embed , filepath, http-streams, io-streams, mtl, process, safe, split @@ -131102,6 +131349,18 @@ self: { broken = true; }) {}; + "hspec-tables" = callPackage + ({ mkDerivation, base, hspec, hspec-core }: + mkDerivation { + pname = "hspec-tables"; + version = "0.0.1"; + sha256 = "07z85920dr85kc763hfqd6rrzl81cc39cjgc0ymy95ycgpdz2w1q"; + libraryHaskellDepends = [ base hspec-core ]; + testHaskellDepends = [ base hspec hspec-core ]; + description = "Table-driven (by-example) HSpec tests"; + license = stdenv.lib.licenses.mit; + }) {}; + "hspec-test-framework" = callPackage ({ mkDerivation, base, hspec, hspec-contrib, hspec-core, HUnit , QuickCheck @@ -131362,7 +131621,7 @@ self: { sha256 = "0lz9zjy1xgjjbabbi2hcrvsnfid6c78y2cb2703qjwr93xy54f1f"; libraryHaskellDepends = [ base hsql old-time ]; librarySystemDepends = [ unixODBC ]; - description = "A Haskell Interface to ODBC"; + description = "A Haskell Interface to ODBC."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -131376,7 +131635,7 @@ self: { sha256 = "0yj0jalpapjvpxmc79yd6bn93ax13pp87dipbg2c9mxf3p38jc9z"; libraryHaskellDepends = [ base hsql old-time ]; librarySystemDepends = [ postgresql ]; - description = "A Haskell Interface to PostgreSQL via the PQ library"; + description = "A Haskell Interface to PostgreSQL via the PQ library."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -131695,18 +131954,19 @@ self: { "hstar" = callPackage ({ mkDerivation, archive-libarchive, archive-sig, base, brotli - , bytestring, bz2, cpphs, lz4-hs, lzlib, lzma, optparse-applicative - , zlib, zstd + , bytestring, bz2, cpphs, lz4-hs, lzlib, lzma, lzo + , optparse-applicative, zlib, zstd }: mkDerivation { pname = "hstar"; - version = "0.1.0.2"; - sha256 = "0npc8ykz9d5j0ghxfpyjvgzsk4nsgrcgl0jqb437rp2641j119j1"; + version = "0.1.0.4"; + sha256 = "1c28xbcg8lmh7zkpl8xpg30niv6adjk8zggwcxi72ylb9z2y3fqr"; isLibrary = false; isExecutable = true; + enableSeparateDataOutput = true; executableHaskellDepends = [ archive-libarchive archive-sig base brotli bytestring bz2 lz4-hs - lzlib lzma optparse-applicative zlib zstd + lzlib lzma lzo optparse-applicative zlib zstd ]; executableToolDepends = [ cpphs ]; description = "Haskell version of tar CLI utility"; @@ -133383,8 +133643,8 @@ self: { }: mkDerivation { pname = "http-io-streams"; - version = "0.1.2.0"; - sha256 = "1xn3lbpxsbl79qgaq9qmhlr78g44h0qpx0jyyb3z8q28z5p39wcy"; + version = "0.1.3.0"; + sha256 = "1m8nj92v21mgrb2mxlvc6smkpvd01664ng4kwikadb4j8bfpb15r"; libraryHaskellDepends = [ attoparsec base base64-bytestring blaze-builder brotli-streams bytestring case-insensitive containers directory HsOpenSSL @@ -134600,7 +134860,7 @@ self: { executableHaskellDepends = [ array base bytestring containers kangaroo ]; - description = "Extract function names from Windows DLLs"; + description = "Extract function names from Windows DLLs."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -134897,6 +135157,43 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-balancedparens_0_4_0_0" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, doctest + , doctest-discover, generic-lens, hedgehog, hspec, hspec-discover + , hw-bits, hw-excess, hw-fingertree, hw-hspec-hedgehog, hw-prim + , hw-rankselect-base, lens, mmap, optparse-applicative + , transformers, vector + }: + mkDerivation { + pname = "hw-balancedparens"; + version = "0.4.0.0"; + sha256 = "02yb90i256avjkn7kfqiv55x8jpsiavr7swy1lh9bhga2zhgxnd5"; + revision = "1"; + editedCabalFile = "04s9n77xq5wr2n9zhj85dycxyvnbz0832m7sajrhl6kif4b0rsfv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base deepseq hedgehog hspec hw-bits hw-excess hw-fingertree hw-prim + hw-rankselect-base vector + ]; + executableHaskellDepends = [ + base bytestring generic-lens hw-bits hw-prim lens mmap + optparse-applicative vector + ]; + testHaskellDepends = [ + base doctest doctest-discover hedgehog hspec hw-bits + hw-hspec-hedgehog hw-prim hw-rankselect-base transformers vector + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + benchmarkHaskellDepends = [ + base criterion hedgehog hw-bits hw-prim vector + ]; + doHaddock = false; + description = "Balanced parentheses"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-bits" = callPackage ({ mkDerivation, base, bitvec, bytestring, criterion, deepseq , doctest, doctest-discover, hedgehog, hspec, hspec-discover @@ -135010,6 +135307,8 @@ self: { pname = "hw-dsv"; version = "0.4.1.0"; sha256 = "1wv0yg662c3bq4kpgfqfjks59v17i5h3v3mils1qpxn4c57jr3s8"; + revision = "1"; + editedCabalFile = "1xhdvqmqm44ky8mbwi64fj3bawqswf58ghlbj2bvk136yflvz2c7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135047,6 +135346,8 @@ self: { pname = "hw-dump"; version = "0.1.1.0"; sha256 = "14ya18i3xvay5xn8j20b06msqyd49h34w526k1x1fxdp0i2l3rwr"; + revision = "1"; + editedCabalFile = "0v310296cxsv92k2rjrc9zrwh7yb7lkjwivndpbh5hv5p8ll0zm6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135080,6 +135381,8 @@ self: { pname = "hw-eliasfano"; version = "0.1.2.0"; sha256 = "1wqpzznmz6bl88wzhrfcbgi49dw7w7i0p92hyc0m58nanqm1zgnj"; + revision = "1"; + editedCabalFile = "0qqshcj482x0yfmb76fj6ng57sf3i0r8daz93kzab8lscarh31j9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135219,6 +135522,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-int_0_0_2_0" = callPackage + ({ mkDerivation, base, doctest, doctest-discover, hedgehog, hspec + , hspec-discover, hw-hedgehog, hw-hspec-hedgehog + }: + mkDerivation { + pname = "hw-int"; + version = "0.0.2.0"; + sha256 = "13ifa28b12hiibhmwas5hn3dmmiz2rihlc837hhii0z1ng03s360"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base doctest doctest-discover hedgehog hspec hw-hedgehog + hw-hspec-hedgehog + ]; + testToolDepends = [ doctest-discover hspec-discover ]; + description = "Additional facilities for Integers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-ip" = callPackage ({ mkDerivation, appar, base, binary, bytestring, containers , doctest, doctest-discover, generic-lens, hedgehog, hspec @@ -135262,6 +135584,8 @@ self: { pname = "hw-json"; version = "1.3.2.0"; sha256 = "00pdd813phgfi9g9xs6r7iw03iifwmlzfb0b424q1cq6d9z37v2f"; + revision = "2"; + editedCabalFile = "1lg2l399fnx7vg2bxf6chcwpl9q3pblzrmwzzijxczvyfrsy5m41"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135301,6 +135625,8 @@ self: { pname = "hw-json-lens"; version = "0.2.1.0"; sha256 = "1v3ws69pyrw5ja00r326kqlq6hd7r5np119fk2la7f74aqhajjf6"; + revision = "1"; + editedCabalFile = "1gxqds8889dzkfncnlncjb7avw4zm7dzj3063mq4rsb05gyrplhz"; libraryHaskellDepends = [ aeson base bytestring containers hw-json lens scientific text word8 ]; @@ -135352,6 +135678,8 @@ self: { pname = "hw-json-simple-cursor"; version = "0.1.1.0"; sha256 = "1kwxnqsa2mkw5sa8rc9rixjm6f75lyjdaz7f67yyhwls5v4315bl"; + revision = "2"; + editedCabalFile = "144afi48rm613gcb8gccfyw5ybx9mzsfzsfq1nvsmlyijl8rgc1x"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135388,6 +135716,8 @@ self: { pname = "hw-json-standard-cursor"; version = "0.2.2.0"; sha256 = "0rj0p3p2b5ghyyfkzvaivzcdsmnjxvqm16n94qpwacaszyca8hny"; + revision = "2"; + editedCabalFile = "07cspws24pxh9i98zylw73fknw6gcvna8qq9r3lcnh455wr3c9m1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135521,6 +135851,8 @@ self: { pname = "hw-packed-vector"; version = "0.2.1.0"; sha256 = "13hly2yzx6kx4j56iksgj4i3wmvg7rmxq57d0g87lmybzhha9q38"; + revision = "1"; + editedCabalFile = "070ac32s0azzhnqwrvhnfa18sxn60ayhmlikr6zk4vl1v03y0xbc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135621,6 +135953,8 @@ self: { pname = "hw-rankselect"; version = "0.13.4.0"; sha256 = "0chk3n4vb55px943w0l3q7pxhgbvqm64vn7lkhi7k0l2dpybycp7"; + revision = "1"; + editedCabalFile = "03p711rvs3qn9x5rfc90yxrbyp5fqsi9i2wbiwrs3vq6if66vc5z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135774,6 +136108,8 @@ self: { pname = "hw-uri"; version = "0.2.1.0"; sha256 = "1bwdzvms0n86k7gbkhk0jj3m1pcc9vbjk13kgpchqxpxm971srbs"; + revision = "1"; + editedCabalFile = "0bbsv8dj0z6wvgn0ldgvbrhji8mw5514pqwrp4ih8i2mjnfcdh2a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -135822,6 +136158,8 @@ self: { pname = "hw-xml"; version = "0.5.1.0"; sha256 = "0g81kknllbc6v5wx7kgzhh78409njfzr3h7lfdx7ip0nkhhnpmw4"; + revision = "2"; + editedCabalFile = "1zi0ma6fmzghlc65dxpznsyiyp4ij7cwz1yw35i0jjm314mhi4va"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -136243,7 +136581,7 @@ self: { base containers directory filepath haskell98 HTTP HUnit hxt network parsec process ]; - description = "A collection of tools for processing XML with Haskell (Filter variant)"; + description = "A collection of tools for processing XML with Haskell (Filter variant)."; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -137196,8 +137534,8 @@ self: { }: mkDerivation { pname = "i3blocks-hs-contrib"; - version = "2.0.1"; - sha256 = "0dl50c3c9483p6345a8918gika3flrph97xwplrr9i4a55dprcxg"; + version = "2.1.0"; + sha256 = "191jrmid5q3pfamyhlmyh7ypws5slr1x95ajaxijcnsqnivb4sac"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base text turtle ]; @@ -137212,16 +137550,16 @@ self: { }) {}; "i3ipc" = callPackage - ({ mkDerivation, aeson, base, binary, bytestring, containers, hspec - , network, text, typed-process, vector + ({ mkDerivation, aeson, base, binary, bytestring, containers + , exceptions, hspec, network, text, typed-process, vector }: mkDerivation { pname = "i3ipc"; - version = "0.1.0.1"; - sha256 = "128dixb0nad1h2gf302r84kng2lw9g6vrnyjs61sqipbn6bn4ygd"; + version = "0.2.0.0"; + sha256 = "1h4vj027h0n3pvwxq4ipzdxpw03skbpi1qc6griwlkslk1qwyv8w"; libraryHaskellDepends = [ - aeson base binary bytestring containers network text typed-process - vector + aeson base binary bytestring containers exceptions network text + typed-process vector ]; testHaskellDepends = [ aeson base bytestring hspec ]; description = "A type-safe wrapper around i3's IPC"; @@ -138418,7 +138756,7 @@ self: { libraryToolDepends = [ alex ]; executableHaskellDepends = [ array base containers html xhtml ]; executableToolDepends = [ alex ]; - description = "A fast syntax highlighting library built with alex"; + description = "A fast syntax highlighting library built with alex."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -138433,7 +138771,7 @@ self: { revision = "1"; editedCabalFile = "1wl2sv2g7iwxldk582h1z6a2b3ks4wzk8rx8bflcxwlh6s4kq0s7"; libraryHaskellDepends = [ base bytestring ]; - description = "Determine the type of an image by reading the first bytes"; + description = "Determine the type of an image by reading the first bytes."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -139477,6 +139815,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "indexed-list-literals_0_2_1_3" = callPackage + ({ mkDerivation, base, hspec, Only }: + mkDerivation { + pname = "indexed-list-literals"; + version = "0.2.1.3"; + sha256 = "179z0df99ixaplr1qv7dawj3h8fq5qhgfn8mg0i4ix6xhpi9kqr6"; + libraryHaskellDepends = [ base Only ]; + testHaskellDepends = [ base hspec ]; + description = "Type safe indexed list literals"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "indexed-profunctors" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -139565,7 +139916,7 @@ self: { sha256 = "08fjmza05wlj11mvdjwfcp3fn6k5zi1hsld84805clipd55sbp0r"; libraryHaskellDepends = [ array base deepseq vector ]; testHaskellDepends = [ array base deepseq QuickCheck text vector ]; - description = "Non-contiguous interval data types with potentially infinite ranges"; + description = "Non-contiguous interval data types with potentially infinite ranges."; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -141912,6 +142263,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ipynb_0_1_0_1" = callPackage + ({ mkDerivation, aeson, aeson-diff, base, base64-bytestring + , bytestring, containers, directory, filepath, microlens + , microlens-aeson, tasty, tasty-hunit, text, unordered-containers + , vector + }: + mkDerivation { + pname = "ipynb"; + version = "0.1.0.1"; + sha256 = "0lwpz0ip7r1rxkirqb6p48ql19fzamqkrnf3khx7bfl5wsxi6yrb"; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring containers text + unordered-containers + ]; + testHaskellDepends = [ + aeson aeson-diff base base64-bytestring bytestring directory + filepath microlens microlens-aeson tasty tasty-hunit text + unordered-containers vector + ]; + description = "Data structure for working with Jupyter notebooks (ipynb)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ipython-kernel" = callPackage ({ mkDerivation, aeson, base, bytestring, cereal, cereal-text , containers, cryptonite, directory, filepath, memory, mtl, process @@ -144297,6 +144672,37 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "jose_0_8_2_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , bytestring, concise, containers, cryptonite, hspec, lens, memory + , monad-time, mtl, network-uri, QuickCheck, quickcheck-instances + , safe, semigroups, tasty, tasty-hspec, tasty-quickcheck + , template-haskell, text, time, unordered-containers, vector, x509 + }: + mkDerivation { + pname = "jose"; + version = "0.8.2.1"; + sha256 = "1mfnxfzgcxlsjfwzg4syih6wasi7mq25j3dawar9aihvdkpwqlfh"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring bytestring concise + containers cryptonite lens memory monad-time mtl network-uri + QuickCheck quickcheck-instances safe semigroups template-haskell + text time unordered-containers vector x509 + ]; + testHaskellDepends = [ + aeson attoparsec base base64-bytestring bytestring concise + containers cryptonite hspec lens memory monad-time mtl network-uri + QuickCheck quickcheck-instances safe semigroups tasty tasty-hspec + tasty-quickcheck template-haskell text time unordered-containers + vector x509 + ]; + description = "Javascript Object Signing and Encryption and JSON Web Token library"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "jose-jwt" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal , containers, criterion, cryptonite, doctest, either, hspec, HUnit @@ -145284,29 +145690,29 @@ self: { "json-syntax" = callPackage ({ mkDerivation, aeson, array-builder, array-chunks, base - , byteslice, bytesmith, bytestring, gauge, neat-interpolation - , primitive, scientific, scientific-notation - , small-bytearray-builder, tasty, tasty-hunit, text, text-short - , unordered-containers, vector + , bytebuild, byteslice, bytesmith, bytestring, gauge + , neat-interpolation, primitive, scientific, scientific-notation + , tasty, tasty-hunit, text, text-short, unordered-containers + , vector }: mkDerivation { pname = "json-syntax"; - version = "0.1.0.0"; - sha256 = "1z997wqg233nrbhzimqvlmq62ywa4abk0fygbwb79h1agq67jhc1"; + version = "0.1.1.0"; + sha256 = "08an68dh7ci5a84p25qzyfijhqbqsmsps0cyv8j5s3jfisaggbp5"; libraryHaskellDepends = [ - array-builder array-chunks base byteslice bytesmith bytestring - primitive scientific-notation text-short + array-builder array-chunks base bytebuild byteslice bytesmith + bytestring primitive scientific-notation text-short ]; testHaskellDepends = [ - aeson array-chunks base byteslice bytestring neat-interpolation - primitive scientific scientific-notation small-bytearray-builder - tasty tasty-hunit text text-short unordered-containers vector + aeson array-chunks base bytebuild byteslice bytestring + neat-interpolation primitive scientific scientific-notation tasty + tasty-hunit text text-short unordered-containers vector ]; benchmarkHaskellDepends = [ aeson base byteslice bytestring gauge neat-interpolation primitive scientific-notation text ]; - description = "High-performance JSON parser"; + description = "High-performance JSON parser and encoder"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -145425,7 +145831,7 @@ self: { base blaze-builder bytestring containers json2-types mtl old-locale parsec pretty time utf8-string ]; - description = "Library provides support for JSON"; + description = "Library provides support for JSON."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -145972,22 +146378,23 @@ self: { "jvm-binary" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring, containers , criterion, data-binary-ieee754, deepseq, deriving-compat - , directory, filepath, generic-random, hspec, hspec-discover - , hspec-expectations-pretty-diff, mtl, QuickCheck, template-haskell - , text, vector, zip-archive + , directory, doctest, filepath, generic-random, hspec + , hspec-discover, hspec-expectations-pretty-diff, mtl, QuickCheck + , template-haskell, text, vector, zip-archive }: mkDerivation { pname = "jvm-binary"; - version = "0.8.0"; - sha256 = "0mzzfdsxh6r8blx447c25bdzv3y8gqb984p48y5cfpvrn2dwhs41"; + version = "0.9.0"; + sha256 = "1ks5mbp1anrgm100sf3ycv1prwm3vj1vyag7l0ihs4cr2sqzq3a2"; + enableSeparateDataOutput = true; libraryHaskellDepends = [ attoparsec base binary bytestring containers data-binary-ieee754 deepseq deriving-compat mtl template-haskell text vector ]; testHaskellDepends = [ attoparsec base binary bytestring containers data-binary-ieee754 - deepseq deriving-compat directory filepath generic-random hspec - hspec-discover hspec-expectations-pretty-diff mtl QuickCheck + deepseq deriving-compat directory doctest filepath generic-random + hspec hspec-discover hspec-expectations-pretty-diff mtl QuickCheck template-haskell text vector zip-archive ]; testToolDepends = [ hspec-discover ]; @@ -148171,8 +148578,8 @@ self: { pname = "kraken"; version = "0.1.0"; sha256 = "12l24z6alscbdicp11nfc8fwmlhk5mjdjyh6xdqyvlzphp5yfp1k"; - revision = "2"; - editedCabalFile = "141qx2fb3dimv20qsl2q1bagwcn9i0r72z2ha1w7191m557in319"; + revision = "3"; + editedCabalFile = "1l4i9nhwvy958ka6l6gb5w5cxgjhdm1h7ycvcc2nrqlw2iwk16v1"; libraryHaskellDepends = [ aeson base bytestring http-client http-client-tls mtl ]; @@ -148380,6 +148787,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "kubernetes-webhook-haskell_0_2_0_1" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring + , text, unordered-containers + }: + mkDerivation { + pname = "kubernetes-webhook-haskell"; + version = "0.2.0.1"; + sha256 = "10qf41gx4631793d19wibyhc2nm8wv3qjb53rhlgpxbjy547y2rr"; + libraryHaskellDepends = [ + aeson base base64-bytestring binary bytestring text + unordered-containers + ]; + description = "Create Kubernetes Admission Webhooks in Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "kuifje" = callPackage ({ mkDerivation, base, boxes, containers, lens }: mkDerivation { @@ -150001,7 +150425,7 @@ self: { libraryHaskellDepends = [ base containers language-ecmascript parsec uniplate ]; - description = "JavaScript static analysis library"; + description = "JavaScript static analysis library."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -150021,7 +150445,7 @@ self: { hashable lens mtl parsec pretty text unordered-containers ]; libraryToolDepends = [ alex ]; - description = "Parser and pretty printer for the Eiffel language"; + description = "Parser and pretty printer for the Eiffel language."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -150055,7 +150479,7 @@ self: { sha256 = "16kzdvhxpmfiia68c4y36fv1sjymy7sblba4iz77qqnwfqz3zka4"; libraryHaskellDepends = [ array base haskell-src parsec syb ]; libraryToolDepends = [ alex happy ]; - description = "Fortran lexer and parser, language support, and extensions"; + description = "Fortran lexer and parser, language support, and extensions."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -150569,6 +150993,50 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "language-puppet_1_4_6_3" = callPackage + ({ mkDerivation, aeson, ansi-wl-pprint, async, attoparsec, base + , base16-bytestring, bytestring, case-insensitive, containers + , cryptonite, directory, filecache, filepath, formatting, Glob + , hashable, hruby, hslogger, hspec, hspec-megaparsec, http-api-data + , http-client, lens, lens-aeson, megaparsec, memory, mtl + , operational, optparse-applicative, parsec, parser-combinators + , pcre-utils, protolude, random, regex-pcre-builtin, scientific + , servant, servant-client, split, stm, strict-base-types, temporary + , text, time, transformers, unix, unordered-containers, vector + , yaml + }: + mkDerivation { + pname = "language-puppet"; + version = "1.4.6.3"; + sha256 = "0g84x311hivlchz23kw0lwqcml3r0wkwh24bqvpgkb2m7rmi8mwx"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring + case-insensitive containers cryptonite directory filecache filepath + formatting hashable hruby hslogger http-api-data http-client lens + lens-aeson megaparsec memory mtl operational parsec + parser-combinators pcre-utils protolude random regex-pcre-builtin + scientific servant servant-client split stm strict-base-types text + time transformers unix unordered-containers vector yaml + ]; + executableHaskellDepends = [ + aeson ansi-wl-pprint async base bytestring containers Glob hslogger + http-client lens mtl optparse-applicative regex-pcre-builtin + strict-base-types text transformers unordered-containers vector + yaml + ]; + testHaskellDepends = [ + base Glob hslogger hspec hspec-megaparsec lens megaparsec mtl + pcre-utils scientific strict-base-types temporary text transformers + unordered-containers vector + ]; + description = "Tools to parse and evaluate the Puppet DSL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "language-python" = callPackage ({ mkDerivation, alex, array, base, containers, happy, monads-tf , pretty, transformers, utf8-string @@ -150583,7 +151051,7 @@ self: { array base containers monads-tf pretty transformers utf8-string ]; libraryToolDepends = [ alex happy ]; - description = "Parsing and pretty printing of Python code"; + description = "Parsing and pretty printing of Python code."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -150600,7 +151068,7 @@ self: { executableHaskellDepends = [ base haskell98 language-python xhtml ]; - description = "Generate coloured XHTML for Python code"; + description = "Generate coloured XHTML for Python code."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -151156,8 +151624,8 @@ self: { }: mkDerivation { pname = "latex-svg-hakyll"; - version = "0.1"; - sha256 = "119mln1k2qlzddz7fwjpvqzkd9gwi9ijmrlzlcxly63a8ffvylcn"; + version = "0.2"; + sha256 = "0brpnsd96r5q01mdaamny74mwphhjyhnz1zjy620i13d2cswl1rw"; libraryHaskellDepends = [ base hakyll latex-svg-image latex-svg-pandoc lrucache pandoc-types ]; @@ -151172,8 +151640,8 @@ self: { }: mkDerivation { pname = "latex-svg-image"; - version = "0.1"; - sha256 = "0g27rg4ip5rg2dkfwxv3khnfn8bjpgwrr3sakxvsrhvsxgb6lwf3"; + version = "0.2"; + sha256 = "1vr66sk1g4g8rhm78ply1mfk0ybcmpg420z26nniw51zr79lvnvn"; libraryHaskellDepends = [ base base64-bytestring bytestring cryptohash-sha256 deepseq directory filepath parsec process temporary transformers @@ -151188,8 +151656,8 @@ self: { }: mkDerivation { pname = "latex-svg-pandoc"; - version = "0.1"; - sha256 = "17n5gfdl7vdy06pph32yii9sww0mby10mdki6lh9k8wlvm15khv8"; + version = "0.2"; + sha256 = "1qzp5y7slklq8p1m6bspzyx7iypd5mq3q0hmxdysivisw776f0aq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -153283,8 +153751,8 @@ self: { }: mkDerivation { pname = "lhs2tex"; - version = "1.23"; - sha256 = "1i55ssw6kzmc2ybqczpns3fpsd3043w6w42dni0kq7rkh87s1xc6"; + version = "1.24"; + sha256 = "09mkcklm9aixn4xwdcmy8z4x5myh4f5ky0nnadj1wgfjcychbmzc"; isLibrary = false; isExecutable = true; setupHaskellDepends = [ @@ -155114,8 +155582,8 @@ self: { }: mkDerivation { pname = "linearmap-category"; - version = "0.4.0.0"; - sha256 = "18fk6fj98w660mid7sadq8algmm5a5gz5150ac62kdp4rrk6igjk"; + version = "0.4.0.1"; + sha256 = "1zc7zns49d832wm22dsbv5xvh5x6s4zg6ky1vr941rs1z9jskmyj"; libraryHaskellDepends = [ base call-stack constrained-categories containers free-vector-spaces ieee754 lens linear manifolds-core QuickCheck @@ -156765,7 +157233,7 @@ self: { base directory filepath llvm-hs llvm-hs-pure mtl tasty tasty-golden tasty-hspec tasty-hunit text transformers ]; - description = "A pretty printer for LLVM IR"; + description = "A pretty printer for LLVM IR."; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -157120,7 +157588,7 @@ self: { libraryHaskellDepends = [ base combinatorial-problems containers erf random ]; - description = "Generalised local search within Haskell, for applications in combinatorial optimisation"; + description = "Generalised local search within Haskell, for applications in combinatorial optimisation."; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -159519,6 +159987,20 @@ self: { broken = true; }) {}; + "lzo" = callPackage + ({ mkDerivation, base, binary, bytestring, digest-pure, tasty + , tasty-hunit + }: + mkDerivation { + pname = "lzo"; + version = "0.1.1.0"; + sha256 = "0w10f9a5kpx5j9wiq8cvshn6fr1vbh03njdhadas5sy77qd2r1i7"; + libraryHaskellDepends = [ base binary bytestring digest-pure ]; + testHaskellDepends = [ base bytestring tasty tasty-hunit ]; + description = "minilzo bundled for Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "mDNSResponder-client" = callPackage ({ mkDerivation, base, bytestring, Cabal, ctrie, data-endian , network, network-msg, transformers @@ -160969,8 +161451,8 @@ self: { }: mkDerivation { pname = "manifold-random"; - version = "0.5.0.4"; - sha256 = "0wf0ya7w73ikd0ivg7m8q4nnc3mv7426l5xlf04zs5gh982x33gl"; + version = "0.5.1.0"; + sha256 = "0zip7ni06zljhj94d5vdf6sb6fbsm9iidcsrl85bdh7i7dkb3avr"; libraryHaskellDepends = [ base constrained-categories linearmap-category manifolds random-fu semigroups vector-space @@ -160992,8 +161474,8 @@ self: { }: mkDerivation { pname = "manifolds"; - version = "0.5.0.4"; - sha256 = "0cng3sp2lg8bfi8g9w4p7ccmg5b177svljl5cki286kdjqsvl320"; + version = "0.5.1.0"; + sha256 = "12w1whsr8zbsvv06iwdd27hjnvs8s041hrsp5c85chl4xqxwkl5h"; libraryHaskellDepends = [ array base binary call-stack comonad constrained-categories containers deepseq free free-vector-spaces ieee754 lens linear @@ -161016,8 +161498,8 @@ self: { ({ mkDerivation, base, call-stack, tagged, vector-space }: mkDerivation { pname = "manifolds-core"; - version = "0.5.0.4"; - sha256 = "0b1acwmmjcgq6bb0qijh227wq49vl295gd0d4iz8lpk1g1pwb2v2"; + version = "0.5.1.0"; + sha256 = "1bvmr0gcfj7zd0rff0qjlzjy8hqdbh52ljiiazrmqmb9abdsciq3"; libraryHaskellDepends = [ base call-stack tagged vector-space ]; description = "The basic classes for the manifolds hierarchy"; license = stdenv.lib.licenses.gpl3; @@ -162217,18 +162699,20 @@ self: { }) {}; "matrix-sized" = callPackage - ({ mkDerivation, base, conduit, data-ordlist, ieee754, primitive - , singletons, tasty, tasty-quickcheck, vector + ({ mkDerivation, base, bytestring, bytestring-lexing, conduit + , conduit-extra, data-ordlist, ieee754, primitive, singletons + , store, tasty, tasty-quickcheck, vector }: mkDerivation { pname = "matrix-sized"; - version = "0.0.4"; - sha256 = "09k6qrscgdbyimk67s7sx5gzz1xnpkz83lkadh0vbm4lwbbp8jlf"; + version = "0.1.0"; + sha256 = "0qmbckk1bmmg8lszdnd8lcgplniqzd53iq1aqv9jky96zdmmrna6"; libraryHaskellDepends = [ - base conduit primitive singletons vector + base bytestring bytestring-lexing conduit conduit-extra primitive + singletons store vector ]; testHaskellDepends = [ - base conduit data-ordlist ieee754 primitive singletons tasty + base conduit data-ordlist ieee754 singletons store tasty tasty-quickcheck vector ]; description = "Haskell matrix library with interface to C++ linear algebra libraries"; @@ -164007,7 +164491,7 @@ self: { version = "0.0.8"; sha256 = "0rdw0laqx9kypfwzqb4ir18r07sjxgm4pwfs82bjpwq0gf58nzas"; libraryHaskellDepends = [ arrows base random Stream ]; - description = "Generalised local search within Haskell, for applications in combinatorial optimisation"; + description = "Generalised local search within Haskell, for applications in combinatorial optimisation."; license = "GPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -164309,8 +164793,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "microbase"; - version = "4.14.0.0.4"; - sha256 = "103gi70hzz1mvr2rzvsq77kzl2sfyf9kx6iaivg0shks8yslp5zq"; + version = "4.14.0.0.6"; + sha256 = "1wnng6ik7p4id5p7crbk9gwy0c4rg2rggkphc4wqfmc2zgpl1ywq"; libraryHaskellDepends = [ base ]; doHaddock = false; description = "A minimal base to work around GHC bugs"; @@ -165476,7 +165960,7 @@ self: { base containers directory filepath monads-tf parsec pretty transformers xhtml ]; - description = "an interpreter for an operational semantics for the STG machine"; + description = "an interpreter for an operational semantics for the STG machine."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -165759,15 +166243,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "miso_1_5_0_0" = callPackage + "miso_1_5_1_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, http-api-data , http-types, lucid, network-uri, servant, servant-lucid, text , transformers, vector }: mkDerivation { pname = "miso"; - version = "1.5.0.0"; - sha256 = "08843wyd41hs38vrixcfdnmar9vkvayk11323kav4qq85s3yhsd3"; + version = "1.5.1.0"; + sha256 = "1vnpfqnkg89ax5znkppqnnp2dgmps2hwdyc05rph2xqvyg5wq9qd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165796,8 +166280,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "miso-examples"; - version = "1.5.0.0"; - sha256 = "0k0rf7kb65nqckmz8gc27rssnn3ja0nswmrbslfmm0nz7293jaiw"; + version = "1.5.1.0"; + sha256 = "14zbzrh3rvqhpn0gd02wd1jdd40inlpy8v4a1qv1aq1c39ip2csb"; isLibrary = false; isExecutable = true; description = "A tasty Haskell front-end framework"; @@ -168319,7 +168803,7 @@ self: { revision = "1"; editedCabalFile = "11v5zdsb9mp1rxvgcrxcr2xnc610xi16krwa9r4i5d6njmphfbdp"; libraryHaskellDepends = [ base ]; - description = "Haskell98 partial maps and filters over MonadPlus"; + description = "Haskell98 partial maps and filters over MonadPlus."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -169057,7 +169541,7 @@ self: { }) {morfeusz = null;}; "morley" = callPackage - ({ mkDerivation, aeson, aeson-options, aeson-pretty, base-noprelude + ({ mkDerivation, aeson, aeson-casing, aeson-pretty, base-noprelude , base16-bytestring, base58-bytestring, binary, bytestring , constraints, containers, cryptonite, data-default, directory , filepath, first-class-families, fmt, formatting, gauge, ghc-prim @@ -169073,12 +169557,12 @@ self: { }: mkDerivation { pname = "morley"; - version = "1.1.0"; - sha256 = "0y8i03pa5i7d1afhh7ihb7wicwmjvajqs38brp8614n825jzng9c"; + version = "1.2.0"; + sha256 = "1id9sqh105p9b35g7rnk6x43h3h2d4v71bg13mz4gk5ny186d512"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson aeson-options aeson-pretty base-noprelude base16-bytestring + aeson aeson-casing aeson-pretty base-noprelude base16-bytestring base58-bytestring binary bytestring constraints containers cryptonite data-default first-class-families fmt formatting ghc-prim gitrev hex-text hspec hspec-expectations HUnit interpolate @@ -169166,6 +169650,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "morpheus-graphql_0_11_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, megaparsec + , mtl, scientific, tasty, tasty-hunit, template-haskell, text + , th-lift-instances, transformers, unliftio-core + , unordered-containers, uuid, vector, websockets + }: + mkDerivation { + pname = "morpheus-graphql"; + version = "0.11.0"; + sha256 = "1cwq1wa43df8d681x409ra9cnv9qfxb2wpbf6mm3fcbnkkaza351"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring containers megaparsec mtl scientific + template-haskell text th-lift-instances transformers unliftio-core + unordered-containers uuid vector websockets + ]; + testHaskellDepends = [ + aeson base bytestring containers megaparsec mtl scientific tasty + tasty-hunit template-haskell text th-lift-instances transformers + unliftio-core unordered-containers uuid vector websockets + ]; + description = "Morpheus GraphQL"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "morpheus-graphql-cli" = callPackage ({ mkDerivation, base, bytestring, filepath, morpheus-graphql , optparse-applicative @@ -170375,8 +170885,8 @@ self: { }: mkDerivation { pname = "mu-avro"; - version = "0.2.0.0"; - sha256 = "12cjq2pfaksa8s93j731p6i572xlnpl7p42lz1kvyyn4bg5r222y"; + version = "0.3.0.0"; + sha256 = "0p5j3pzx2b8hj7zn7gdj7xg2n99yhzvbkhbr5cv6jwcd5gpz3pkn"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -170390,8 +170900,39 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "mu-graphql" = callPackage + ({ mkDerivation, aeson, async, attoparsec, base, bytestring + , conduit, graphql-parser, http-types, list-t, mtl, mu-rpc + , mu-schema, parsers, regex-tdfa, scientific, sop-core, stm + , stm-chans, stm-conduit, stm-containers, template-haskell, text + , unordered-containers, uuid, wai, wai-extra, wai-websockets, warp + , warp-tls, websockets + }: + mkDerivation { + pname = "mu-graphql"; + version = "0.3.0.0"; + sha256 = "1371h6w3v10qcmp8zp3mjxfhvknk39qgcn9laslssci4yrrr5a09"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson async attoparsec base bytestring conduit graphql-parser + http-types list-t mtl mu-rpc mu-schema parsers scientific sop-core + stm stm-chans stm-conduit stm-containers template-haskell text + unordered-containers uuid wai wai-websockets warp warp-tls + websockets + ]; + executableHaskellDepends = [ + base conduit mu-rpc mu-schema regex-tdfa text wai-extra warp + ]; + description = "GraphQL support for Mu"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {graphql-parser = null;}; + "mu-grpc-client" = callPackage - ({ mkDerivation, async, base, bytestring, conduit, http2 + ({ mkDerivation, async, avro, base, bytestring, conduit, http2 , http2-client, http2-client-grpc, http2-grpc-types, mu-grpc-common , mu-optics, mu-protobuf, mu-rpc, mu-schema, optics-core, sop-core , stm, stm-chans, stm-conduit, template-haskell, text @@ -170399,13 +170940,13 @@ self: { }: mkDerivation { pname = "mu-grpc-client"; - version = "0.2.0.0"; - sha256 = "0dy9nfzyls5410dh7crgk03bfwcrxgcwryqhplsg25x5rxplkcfb"; + version = "0.3.0.0"; + sha256 = "08z92rm1dcr02qwmd92inplzb1hgari0bsmw19xlmkdlsjldj5v0"; libraryHaskellDepends = [ - async base bytestring conduit http2 http2-client http2-client-grpc - http2-grpc-types mu-grpc-common mu-optics mu-protobuf mu-rpc - mu-schema optics-core sop-core stm stm-chans stm-conduit - template-haskell text th-abstraction + async avro base bytestring conduit http2 http2-client + http2-client-grpc http2-grpc-types mu-grpc-common mu-optics + mu-protobuf mu-rpc mu-schema optics-core sop-core stm stm-chans + stm-conduit template-haskell text th-abstraction ]; description = "gRPC clients from Mu definitions"; license = stdenv.lib.licenses.asl20; @@ -170420,8 +170961,8 @@ self: { }: mkDerivation { pname = "mu-grpc-common"; - version = "0.2.0.0"; - sha256 = "04984ibj6ma880jchibmr1z696mrik29gc2qnaf0vsp0nxwqr9vv"; + version = "0.3.0.0"; + sha256 = "1ipqzg799lfy2apl3galhgnqqpf5z9nr0dvb9gp9cmv0y9bn3iv6"; libraryHaskellDepends = [ avro base binary bytestring http2-grpc-proto3-wire http2-grpc-types mu-avro mu-protobuf mu-rpc mu-schema @@ -170433,24 +170974,24 @@ self: { }) {}; "mu-grpc-server" = callPackage - ({ mkDerivation, async, base, binary, bytestring, conduit + ({ mkDerivation, async, avro, base, binary, bytestring, conduit , http2-grpc-types, mtl, mu-grpc-common, mu-protobuf, mu-rpc , mu-schema, sop-core, stm, stm-conduit, wai, warp, warp-grpc , warp-tls }: mkDerivation { pname = "mu-grpc-server"; - version = "0.2.0.0"; - sha256 = "1g3dr66b6915ci53lhygahw8ganqivd42a918amv1xcxq7li1m76"; + version = "0.3.0.0"; + sha256 = "1z8mhychrr5y6zrxg3xx398x221cwyyw7yss8gfn0f5c7j64r693"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base binary bytestring conduit http2-grpc-types mtl + async avro base binary bytestring conduit http2-grpc-types mtl mu-grpc-common mu-protobuf mu-rpc mu-schema sop-core stm stm-conduit wai warp warp-grpc warp-tls ]; executableHaskellDepends = [ - async base binary bytestring conduit http2-grpc-types mtl + async avro base binary bytestring conduit http2-grpc-types mtl mu-grpc-common mu-protobuf mu-rpc mu-schema sop-core stm stm-conduit wai warp warp-grpc warp-tls ]; @@ -170460,13 +171001,29 @@ self: { broken = true; }) {}; + "mu-kafka" = callPackage + ({ mkDerivation, avro, base, bytestring, conduit, hw-kafka-client + , hw-kafka-conduit, mu-avro, mu-schema, resourcet + }: + mkDerivation { + pname = "mu-kafka"; + version = "0.3.0.0"; + sha256 = "0flz0567rgky7ckl0nzinfd93bb7x0w1dz031y7hk3wcpp98y5i3"; + libraryHaskellDepends = [ + avro base bytestring conduit hw-kafka-client hw-kafka-conduit + mu-avro mu-schema resourcet + ]; + description = "Utilities for interoperation between Mu and Kafka"; + license = stdenv.lib.licenses.asl20; + }) {}; + "mu-optics" = callPackage ({ mkDerivation, base, containers, mu-schema, optics-core, sop-core }: mkDerivation { pname = "mu-optics"; - version = "0.2.0.0"; - sha256 = "1b3954pq7iia4vq2bnl1gw2qakdrwkh647qpb1sl1dmrpi0mc77m"; + version = "0.3.0.0"; + sha256 = "0263nd5xwyn2jb99d6vn7fk8lzmkgarfx9n6lrc4dpa5immfypnq"; libraryHaskellDepends = [ base containers mu-schema optics-core sop-core ]; @@ -170480,8 +171037,8 @@ self: { }: mkDerivation { pname = "mu-persistent"; - version = "0.2.0.0"; - sha256 = "1n81dpayp0q0i19w1pchgwwblxz0jd510q01r8mvwpf099gb27pa"; + version = "0.3.0.0"; + sha256 = "1jd0h2cqr4nbwk2vyaq3wamrgwi1dkzmyhqg6b7002wdvm1h822j"; libraryHaskellDepends = [ base monad-logger mu-schema persistent resourcet transformers ]; @@ -170497,8 +171054,8 @@ self: { }: mkDerivation { pname = "mu-protobuf"; - version = "0.2.0.0"; - sha256 = "10yxb4dfdm9bm41gpd2jbb7jz79gk7s5yzqf3d994zqcq0d5k5fh"; + version = "0.3.0.0"; + sha256 = "02wk2bhx6lflgri9fm4dq09yz07xsm82fbxgm130zs7s6015chxf"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -170522,8 +171079,8 @@ self: { }: mkDerivation { pname = "mu-rpc"; - version = "0.2.0.0"; - sha256 = "1rw4gci0m5isij0bgngbm7zjxafnkibmg3qsxs6dym19mxgqs9nk"; + version = "0.3.0.0"; + sha256 = "02m19ddp8q3khp8j6cgax24srf6dlpakq2wkjpqsa31vawn06a9g"; libraryHaskellDepends = [ base conduit mtl mu-schema sop-core template-haskell text ]; @@ -170538,8 +171095,8 @@ self: { }: mkDerivation { pname = "mu-schema"; - version = "0.2.0.0"; - sha256 = "1rdv2mvp66xy41l0g8v03szn5ndg8wji4mzpnqdd90z2xzim4z0w"; + version = "0.3.0.0"; + sha256 = "0b943w2mfrgrc2cgq4vjg1wgyb5ijdqfq9argv0k6i6b3hj97kqg"; libraryHaskellDepends = [ aeson base bytestring containers sop-core template-haskell text th-abstraction unordered-containers vector @@ -171751,7 +172308,7 @@ self: { ]; executableHaskellDepends = [ base ]; executablePkgconfigDepends = [ gtk3 ]; - description = "Supply your tunes info without leaving your music player"; + description = "Supply your tunes info without leaving your music player."; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -174112,8 +174669,8 @@ self: { }: mkDerivation { pname = "net-spider"; - version = "0.4.3.0"; - sha256 = "19cvghyj6val79bsq3sh9gpr1f94dmmikmgsdasf6a26vcxr1q4y"; + version = "0.4.3.1"; + sha256 = "0r0l078ljhvpacay1pwql4zccwpj8646zdzdz0gazh0yj2zs8g01"; libraryHaskellDepends = [ aeson base containers data-interval extended-reals greskell greskell-websocket hashable monad-logger regex-applicative @@ -174157,8 +174714,8 @@ self: { }: mkDerivation { pname = "net-spider-pangraph"; - version = "0.2.0.0"; - sha256 = "1ijaa4zsbm583s0bmhrc475p6q1gkx1wz3sg6698aciw0ip14kjs"; + version = "0.2.0.1"; + sha256 = "0n19hlyzb2r9kkkw1ivaify0msjv4iq69rv14cdak8x50dmvn4wq"; libraryHaskellDepends = [ base bytestring greskell net-spider pangraph text time ]; @@ -174178,8 +174735,8 @@ self: { }: mkDerivation { pname = "net-spider-rpl"; - version = "0.4.1.0"; - sha256 = "0j0w1sgr1b0vn5249agz94vlz1az9pfi8fswd72s84lpcn9jyw89"; + version = "0.4.1.1"; + sha256 = "09iwz5yrzcfb5rmlhskhzilyqbvf1al8j8qv7ag5jn6kq3pgipw3"; libraryHaskellDepends = [ aeson base conduit conduit-parse greskell hashable ip monad-logger mtl net-spider regex-applicative safe-exceptions text time @@ -174202,8 +174759,8 @@ self: { }: mkDerivation { pname = "net-spider-rpl-cli"; - version = "0.1.3.0"; - sha256 = "1hgzrl3fq1vp4dh4c0jf9kndclcrzapd124b4c9xd20xgidy01fd"; + version = "0.1.3.1"; + sha256 = "0y1bagnlazd7pj240ka1lf970qclf569qbsdxas27pj1pi91jb0r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -174548,7 +175105,7 @@ self: { libraryHaskellDepends = [ base containers directory filepath mtl nettle-openflow unix ]; - description = "DSL for describing OpenFlow networks, and a compiler generating NetKit labs"; + description = "DSL for describing OpenFlow networks, and a compiler generating NetKit labs."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -174566,7 +175123,7 @@ self: { array base bimap binary binary-strict bytestring containers HList mtl network parsec syb ]; - description = "OpenFlow protocol messages, binary formats, and servers"; + description = "OpenFlow protocol messages, binary formats, and servers."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -176527,7 +177084,7 @@ self: { revision = "1"; editedCabalFile = "08hgvqbb13n2scs4shqjdyzm7kblgllndk0429pdiwdx21k5391q"; libraryHaskellDepends = [ base bytestring http-conduit xml ]; - description = "Haskell interface to the nist random beacon"; + description = "Haskell interface to the nist random beacon."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -176623,20 +177180,20 @@ self: { "nix-derivation" = callPackage ({ mkDerivation, attoparsec, base, containers, criterion, deepseq - , pretty-show, QuickCheck, system-filepath, text, vector + , filepath, pretty-show, QuickCheck, text, vector }: mkDerivation { pname = "nix-derivation"; - version = "1.0.2"; - sha256 = "16xx4817ncgqvhmydbfr35lhgiw34js2n5liyfing3qvbfprmscw"; + version = "1.1.0"; + sha256 = "09r1818j838a6mzgsqsvf7a98l3h0v7vqrnmimvycaaxri3rxmhz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base containers deepseq system-filepath text vector + attoparsec base containers deepseq filepath text vector ]; executableHaskellDepends = [ attoparsec base pretty-show text ]; testHaskellDepends = [ - attoparsec base QuickCheck system-filepath text vector + attoparsec base filepath QuickCheck text vector ]; benchmarkHaskellDepends = [ attoparsec base criterion text ]; description = "Parse and render *.drv files"; @@ -176709,6 +177266,25 @@ self: { broken = true; }) {}; + "nix-narinfo" = callPackage + ({ mkDerivation, attoparsec, base, containers, filepath, hspec + , QuickCheck, text + }: + mkDerivation { + pname = "nix-narinfo"; + version = "0.1.0.0"; + sha256 = "1jv7bwjfp2b2c63gfnlznmc1r4bnf6mvlkngcipvyhnxr0mwpxfy"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ attoparsec base containers text ]; + executableHaskellDepends = [ attoparsec base text ]; + testHaskellDepends = [ + attoparsec base filepath hspec QuickCheck text + ]; + description = "Parse and render .narinfo files"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "nix-paths" = callPackage ({ mkDerivation, base, nix, process }: mkDerivation { @@ -177326,6 +177902,8 @@ self: { pname = "nonce"; version = "1.0.7"; sha256 = "1q9ph0aq51mvdvydnriqd12sfin36pfb8f588zgac1ybn8r64ksb"; + revision = "1"; + editedCabalFile = "1i6f4nwp4xn31as6plqrf6wp6gn3ylwdi77h99572jy7p3985aw1"; libraryHaskellDepends = [ base base64-bytestring bytestring entropy text transformers unliftio unliftio-core @@ -177611,7 +178189,7 @@ self: { version = "0.1.1"; sha256 = "1mm1j0l3h8qxpk0bis4g1f6zp5407rkq2z5ldyr036frbvfwqaj5"; libraryHaskellDepends = [ base ]; - description = "Useful utility functions that only depend on base"; + description = "Useful utility functions that only depend on base."; license = "unknown"; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -179283,6 +179861,54 @@ self: { broken = true; }) {inherit (pkgs) unixODBC;}; + "odd-jobs" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers + , direct-daemonize, directory, either, fast-logger, filepath + , foreign-store, friendly-time, hedgehog, hostname, lifted-async + , lifted-base, lucid, mmorph, monad-control, monad-logger, mtl + , optparse-applicative, postgresql-simple, random, resource-pool + , safe, servant, servant-lucid, servant-server, string-conv, tasty + , tasty-discover, tasty-hedgehog, tasty-hunit, text + , text-conversions, time, timing-convenience, unix, unliftio + , unliftio-core, unordered-containers, warp + }: + mkDerivation { + pname = "odd-jobs"; + version = "0.1.0"; + sha256 = "0l1b63j76a8rbhligj7s282bzrw2dgb7jv8cki1a7ss0v58k3c4s"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring direct-daemonize directory either fast-logger + filepath friendly-time hostname lucid monad-control monad-logger + mtl optparse-applicative postgresql-simple resource-pool safe + servant servant-lucid servant-server string-conv text + text-conversions time timing-convenience unix unliftio + unliftio-core unordered-containers warp + ]; + executableHaskellDepends = [ + aeson base bytestring direct-daemonize directory either fast-logger + filepath foreign-store friendly-time hostname lucid monad-control + monad-logger mtl optparse-applicative postgresql-simple + resource-pool safe servant servant-lucid servant-server string-conv + text text-conversions time timing-convenience unix unliftio + unliftio-core unordered-containers warp + ]; + testHaskellDepends = [ + aeson base bytestring containers direct-daemonize directory either + fast-logger filepath friendly-time hedgehog hostname lifted-async + lifted-base lucid mmorph monad-control monad-logger mtl + optparse-applicative postgresql-simple random resource-pool safe + servant servant-lucid servant-server string-conv tasty + tasty-discover tasty-hedgehog tasty-hunit text text-conversions + time timing-convenience unix unliftio unliftio-core + unordered-containers warp + ]; + testToolDepends = [ tasty-discover ]; + description = "A full-featured PostgreSQL-backed job queue (with an admin UI)"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "oden-go-packages" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, text , unordered-containers @@ -179977,8 +180603,8 @@ self: { }: mkDerivation { pname = "opaleye"; - version = "0.6.7004.1"; - sha256 = "09jgdqkw8hp82b3x0fg9906gyxwl9gz3hifv2dvrj915fvgiybg1"; + version = "0.6.7004.2"; + sha256 = "0lmfpbrfy6l7nlkjn26smmv3n992b54xnplwm67jjpryaz7psdz1"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring case-insensitive contravariant postgresql-simple pretty product-profunctors @@ -180755,12 +181381,12 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "opentelemetry_0_3_0" = callPackage + "opentelemetry_0_3_1" = callPackage ({ mkDerivation, base, bytestring, exceptions }: mkDerivation { pname = "opentelemetry"; - version = "0.3.0"; - sha256 = "1mgq84ixi8hxhgim5d5mx6v1zc1sqrp8cffzw14rly3sfhdi1k0m"; + version = "0.3.1"; + sha256 = "1yfhdh1pbilxmi0zjckyh60mrj1j8m10bwb3pbm1cb32rwashj45"; libraryHaskellDepends = [ base bytestring exceptions ]; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -180775,8 +181401,8 @@ self: { }: mkDerivation { pname = "opentelemetry-extra"; - version = "0.3.0"; - sha256 = "00998jr520qmr9ii96r04bspfh8cdxwk951y02ic01higqjkx6xp"; + version = "0.3.1"; + sha256 = "0jlbrsnk1h9cnrgkxln5qz3rxf235z8sy0sm10cw5hwi1y9kzs5a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -180820,8 +181446,8 @@ self: { }: mkDerivation { pname = "opentelemetry-lightstep"; - version = "0.3.0"; - sha256 = "0kfvls8alc8wq0habl4snvhvd3a808z07san1sbvwp215frxycy9"; + version = "0.3.1"; + sha256 = "0p1dl9m82sgcjdv13jbkjk50466yw6228kyy2jvw3fpb4lyfg38n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -180845,8 +181471,8 @@ self: { }: mkDerivation { pname = "opentelemetry-wai"; - version = "0.3.0"; - sha256 = "0x2a3s1xdc66ww8p8nkpwblvhv9hng64baij3wvbcbn2n1lls531"; + version = "0.3.1"; + sha256 = "1399xmmphh3ph7m0fn6yx81p7wvk3s10wg4a0fp0pdmpc7hmyxgi"; libraryHaskellDepends = [ base bytestring http-types opentelemetry text wai ]; @@ -181946,6 +182572,8 @@ self: { pname = "orders"; version = "0.1.0.0"; sha256 = "1ry6flg5sh3hl1xpkqk67ayd4y0xx3j2pwcz26q1pgqn6m84plzr"; + revision = "1"; + editedCabalFile = "1ilyg95l97xp4ym402g499ysfbwqsw413kpk4gvi5hd861xx2laj"; libraryHaskellDepends = [ base containers ]; description = "basic orders"; license = stdenv.lib.licenses.bsd3; @@ -182731,7 +183359,7 @@ self: { base binary criterion deepseq mtl unordered-containers vector vector-binary-instances ]; - description = "Generation and traversal of highly compressed directed acyclic word graphs"; + description = "Generation and traversal of highly compressed directed acyclic word graphs."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -183048,8 +183676,8 @@ self: { }: mkDerivation { pname = "pairing"; - version = "1.0.0"; - sha256 = "0mcjd463ffgq2ghvbi2h02dxy0p40ilhazznn2zqzqp7gksrhvfd"; + version = "1.1.0"; + sha256 = "1k19bmdnc9dlm62b6hvjnc4k7j3yi5hsc0m8yvw33qb63ci36mmk"; libraryHaskellDepends = [ base bytestring elliptic-curve errors galois-field groups MonadRandom protolude tasty-quickcheck @@ -183813,8 +184441,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "pandora"; - version = "0.2.6"; - sha256 = "018y7c5w9q1dp9n975jclbcir91zay3r6m6fc2xcf1dyamds3ca9"; + version = "0.2.7"; + sha256 = "1fagym17jg4df445d8jr2lc52rx9irmnz7kv4g236py311z7bmbq"; description = "A box of patterns and paradigms"; license = stdenv.lib.licenses.mit; }) {}; @@ -185146,10 +185774,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "parsec1"; - version = "1.0.0.6"; - sha256 = "0wwmghla8cqmmpwx9wwcmh39d9np9cgc1d0w3xf18k4adb1sg636"; - revision = "1"; - editedCabalFile = "0wnyg8blygix98w8gwqrm8z8r774zr9y2qvhkfb336zgdvdlif9x"; + version = "1.0.0.7"; + sha256 = "1v9kq4g378v8pkj8ldpqwh9dwlng5idbxqqb8ywmzdjnglih34rf"; libraryHaskellDepends = [ base ]; description = "Portable monadic parser combinators"; license = stdenv.lib.licenses.bsd3; @@ -188101,7 +188727,7 @@ self: { version = "0.3.0.0"; sha256 = "05h7wlw82ljjic50qhzlldhidz344id1fpf0yaxrhqvx7wkgyi2m"; libraryHaskellDepends = [ base time yesod ]; - description = "A library for rate limiting activities with a persistent backend"; + description = "A library for rate limiting activities with a persistent backend."; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -192850,6 +193476,22 @@ self: { broken = true; }) {}; + "pontarius-xmpp-extras" = callPackage + ({ mkDerivation, base, data-default, pontarius-xmpp, text, time + , xml-types + }: + mkDerivation { + pname = "pontarius-xmpp-extras"; + version = "0.1.0.1"; + sha256 = "04qaq8m2c8l8my89n0p6x2r3hqw9nmivk1mjkip0wgw2cj3ia7h6"; + libraryHaskellDepends = [ + base data-default pontarius-xmpp text time xml-types + ]; + description = "XEPs implementation on top of pontarius-xmpp"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pontarius-xpmn" = callPackage ({ mkDerivation, base, containers, pontarius-xmpp, random, text , xml-types @@ -195860,8 +196502,8 @@ self: { ({ mkDerivation, ghc-prim }: mkDerivation { pname = "prim"; - version = "0.1.0.6"; - sha256 = "187pzlgkyg64azwrr2q896wy4i5zrryjbp9ldg9hm5lgyv782vr2"; + version = "0.1.0.9"; + sha256 = "15igqxb77ycl9lfs1bl1l9x3cynsg4kqzkr54q46ly4l315bsrq4"; libraryHaskellDepends = [ ghc-prim ]; description = "An ergonomic but conservative interface to ghc-prim"; license = stdenv.lib.licenses.mit; @@ -196713,7 +197355,7 @@ self: { semigroups tasty tasty-hunit text transformers transformers-compat void ]; - description = "Streaming interface to system processes"; + description = "Streaming interface to system processes."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -196751,7 +197393,7 @@ self: { base data-default GLUT hsnoise NumInstances OpenGL random time transformers utf8-string vector-space ]; - description = "Computer graphics for kids and artists with Processing implemented in Haskell"; + description = "Computer graphics for kids and artists with Processing implemented in Haskell."; license = stdenv.lib.licenses.bsd3; }) {}; @@ -196876,10 +197518,8 @@ self: { }: mkDerivation { pname = "product-profunctors"; - version = "0.10.0.0"; - sha256 = "0s0ssl2900r16992mgl0idkryg3l7psp8nljyg9brr7fqa3pd3dd"; - revision = "4"; - editedCabalFile = "0vf9w949qfi6p1nqr0cxb9shxdz15mmrd8r0w4gxid56fjc2kaia"; + version = "0.10.0.1"; + sha256 = "15q6mgn42in4df61251q8h2d7hgvflik93xngc7jyyxj4ymaz5yh"; libraryHaskellDepends = [ base bifunctors contravariant profunctors tagged template-haskell ]; @@ -198563,6 +199203,8 @@ self: { pname = "pseudo-boolean"; version = "0.1.9.0"; sha256 = "00n5mf7abprhr9xvh3k1mw40jn4l94wwxpc2h0546h0n9v7srb1b"; + revision = "1"; + editedCabalFile = "14lgfxazr83nmbcdprygx2add8233hsq1hpdsiffx5zprgvr78vv"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-builder containers deepseq dlist hashable megaparsec parsec void @@ -199216,8 +199858,8 @@ self: { }: mkDerivation { pname = "purebred-email"; - version = "0.4"; - sha256 = "14spyllq10hkscbrhdsqr7k4rl8q17kvh2n9nmhjiikgjlp066cz"; + version = "0.4.1"; + sha256 = "0fkdmd0glp8p2dyzfpm3ah6nbfw4jqfzx7ai6yl2f9yrssb0ckp9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -200233,6 +200875,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "qrcode-core_0_9_3" = callPackage + ({ mkDerivation, base, binary, bytestring, case-insensitive + , containers, dlist, primitive, text, vector + }: + mkDerivation { + pname = "qrcode-core"; + version = "0.9.3"; + sha256 = "08kp0qp7kvld99kk2iwr6cxpxji2w9vjydivqc3nwxbk5ay2mpjg"; + libraryHaskellDepends = [ + base binary bytestring case-insensitive containers dlist primitive + text vector + ]; + description = "QR code library in pure Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "qrcode-juicypixels" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, JuicyPixels , qrcode-core, text, vector @@ -200249,6 +200908,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "qrcode-juicypixels_0_8_1" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, JuicyPixels + , qrcode-core, text, vector + }: + mkDerivation { + pname = "qrcode-juicypixels"; + version = "0.8.1"; + sha256 = "0yd22dygh2z8i0yhgdgr1m25ag9bdkpmd1ciq4iq42k0yhk6iqx9"; + libraryHaskellDepends = [ + base base64-bytestring bytestring JuicyPixels qrcode-core text + vector + ]; + description = "Converts a qrcode-core image to JuicyPixels"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "qsem" = callPackage ({ mkDerivation, base, ghc-prim }: mkDerivation { @@ -202395,7 +203071,7 @@ self: { sha256 = "14fnk2q702qm0mh30r9kznbh4ikpv4fsd5mrnwphm5d06vmq6hq9"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base haskell98 ]; - description = "'$' in reverse"; + description = "'$' in reverse."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -202422,8 +203098,8 @@ self: { ({ mkDerivation, base, criterion, hspec }: mkDerivation { pname = "rampart"; - version = "1.0.0.3"; - sha256 = "0y7nd9nbrmmb74cqmcwwq15xrd9b3wqjqvlw29jzlayard3c2hfj"; + version = "1.1.0.0"; + sha256 = "1bzgc5pij7i1c47b1jbyfsx7b3lk961fh5817qfmwlwx096g462f"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base hspec ]; benchmarkHaskellDepends = [ base criterion ]; @@ -205802,6 +206478,30 @@ self: { broken = true; }) {}; + "reflex-dynamic-containers" = callPackage + ({ mkDerivation, base, binary, containers, deepseq, dependent-map + , dependent-sum, hashable, hspec, hspec-contrib, HUnit, ilist + , reflex, reflex-test-host, relude, these + }: + mkDerivation { + pname = "reflex-dynamic-containers"; + version = "0.1.0.0"; + sha256 = "161klhbz4528rljv4fhkzf4yad3xxiflignbc46il1j9lw99bh0k"; + libraryHaskellDepends = [ + base binary containers deepseq dependent-map dependent-sum hashable + ilist reflex reflex-test-host relude these + ]; + testHaskellDepends = [ + base binary containers deepseq dependent-map dependent-sum hashable + hspec hspec-contrib HUnit ilist reflex reflex-test-host relude + these + ]; + description = "various dynamic containers for Reflex"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "reflex-fsnotify" = callPackage ({ mkDerivation, base, containers, directory, filepath, fsnotify , reflex @@ -205991,6 +206691,24 @@ self: { broken = true; }) {}; + "reflex-test-host" = callPackage + ({ mkDerivation, base, dependent-sum, hspec, hspec-contrib, HUnit + , ref-tf, reflex, these + }: + mkDerivation { + pname = "reflex-test-host"; + version = "0.1.0.0"; + sha256 = "0yg1lg68xr5rs8l68i0znj5zp0z6rq7b515sfz3qvnmyv7qah946"; + libraryHaskellDepends = [ base dependent-sum ref-tf reflex these ]; + testHaskellDepends = [ + base dependent-sum hspec hspec-contrib HUnit ref-tf reflex these + ]; + description = "reflex host methods for testing without external events"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "reflex-transformers" = callPackage ({ mkDerivation, base, containers, lens, mtl, reflex, semigroups , stateWriter, transformers @@ -208935,22 +209653,6 @@ self: { }) {}; "resourcet" = callPackage - ({ mkDerivation, base, containers, exceptions, hspec, mtl - , primitive, transformers, unliftio-core - }: - mkDerivation { - pname = "resourcet"; - version = "1.2.3"; - sha256 = "1ig7a22i5hn0ya7d4bg3xq0yy9mqgwawx4sv88db0fvdsnzg868s"; - libraryHaskellDepends = [ - base containers exceptions mtl primitive transformers unliftio-core - ]; - testHaskellDepends = [ base exceptions hspec transformers ]; - description = "Deterministic allocation and freeing of scarce resources"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "resourcet_1_2_4" = callPackage ({ mkDerivation, base, containers, exceptions, hspec, mtl , primitive, transformers, unliftio-core }: @@ -208964,7 +209666,6 @@ self: { testHaskellDepends = [ base exceptions hspec transformers ]; description = "Deterministic allocation and freeing of scarce resources"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "respond" = callPackage @@ -209430,8 +210131,8 @@ self: { }: mkDerivation { pname = "retry"; - version = "0.8.1.1"; - sha256 = "0bvy7wh1x5r8c12rwcyf3ca0spw2bc82v42c7by0w053zfi3i4w9"; + version = "0.8.1.2"; + sha256 = "0nwyis42xpmxfw8nz8qn59r3v7q0dkfzkzkhllgn30cdjbbmwhf5"; libraryHaskellDepends = [ base exceptions ghc-prim random transformers ]; @@ -210317,6 +211018,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rio_0_1_15_1" = 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.15.1"; + sha256 = "05mkxjwy9vp6ldzj5wci1frd2chvbg3l4vw1q8bpjdsj8svr2g5i"; + 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 @@ -213066,18 +213793,18 @@ self: { "sak" = callPackage ({ mkDerivation, base, brotli, bytestring, bz2, cpphs, directory - , filepath, lz4-hs, lzlib, lzma, optparse-applicative, parallel-io - , snappy-lazy, zlib, zstd + , filepath, lz4-hs, lzlib, lzma, lzo, optparse-applicative + , parallel-io, snappy-lazy, zlib, zstd }: mkDerivation { pname = "sak"; - version = "0.1.2.4"; - sha256 = "0gj0w8c4j43586k474ncjk4ldgjx5rbw36g5lacbn13lf3fid2ck"; + version = "0.1.2.5"; + sha256 = "1xz3g7ksq1v8239xq2cddprlq4g8imid002w7wak15kv8aqvil1l"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; executableHaskellDepends = [ - base brotli bytestring bz2 directory filepath lz4-hs lzlib lzma + base brotli bytestring bz2 directory filepath lz4-hs lzlib lzma lzo optparse-applicative parallel-io snappy-lazy zlib zstd ]; executableToolDepends = [ cpphs ]; @@ -214063,22 +214790,6 @@ self: { }) {}; "scalpel" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, data-default - , http-client, http-client-tls, scalpel-core, tagsoup, text - }: - mkDerivation { - pname = "scalpel"; - version = "0.6.1"; - sha256 = "0cq9zslaqcs1vq85xznc11vis5bkvmhjsnwxrc2p01bsxbvwxsh6"; - libraryHaskellDepends = [ - base bytestring case-insensitive data-default http-client - http-client-tls scalpel-core tagsoup text - ]; - description = "A high level web scraping library for Haskell"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "scalpel_0_6_2" = callPackage ({ mkDerivation, base, bytestring, case-insensitive, data-default , http-client, http-client-tls, scalpel-core, tagsoup, text }: @@ -214092,29 +214803,9 @@ self: { ]; description = "A high level web scraping library for Haskell"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scalpel-core" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion - , data-default, fail, HUnit, pointedlist, regex-base, regex-tdfa - , tagsoup, text, vector - }: - mkDerivation { - pname = "scalpel-core"; - version = "0.6.1"; - sha256 = "199g005ps5grjj3y7mxajck3ybyc60fs72p8jk859ji3svpqdfyn"; - libraryHaskellDepends = [ - base bytestring containers data-default fail pointedlist regex-base - regex-tdfa tagsoup text vector - ]; - testHaskellDepends = [ base HUnit regex-base regex-tdfa tagsoup ]; - benchmarkHaskellDepends = [ base criterion tagsoup text ]; - description = "A high level web scraping library for Haskell"; - license = stdenv.lib.licenses.asl20; - }) {}; - - "scalpel-core_0_6_2" = callPackage ({ mkDerivation, base, bytestring, containers, criterion , data-default, fail, HUnit, mtl, pointedlist, regex-base , regex-tdfa, tagsoup, text, transformers, vector @@ -214131,7 +214822,6 @@ self: { benchmarkHaskellDepends = [ base criterion tagsoup text ]; description = "A high level web scraping library for Haskell"; license = stdenv.lib.licenses.asl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "scan" = callPackage @@ -214432,12 +215122,12 @@ self: { ({ mkDerivation, aeson, aeson-pretty, base, bifunctors, bytestring , free, generic-lens, generics-sop, hashable, hspec, lens , lens-aeson, mtl, pretty-simple, profunctors, QuickCheck - , scientific, text, transformers, unordered-containers, vector + , scientific, syb, text, transformers, unordered-containers, vector }: mkDerivation { pname = "schemas"; - version = "0.4.0.1"; - sha256 = "13i7q7krahvmirb6ryqsygcckmjdkmnk8qxh1pxsnihkkn6dj22k"; + version = "0.4.0.2"; + sha256 = "0b05xjkpwx4a9hwxjaxk28v47d4c3xyy7wagc5nblqppxpvb9zqr"; libraryHaskellDepends = [ aeson base bifunctors bytestring free generics-sop hashable lens lens-aeson mtl profunctors scientific text transformers @@ -214445,7 +215135,7 @@ self: { ]; testHaskellDepends = [ aeson aeson-pretty base bytestring generic-lens generics-sop hspec - lens mtl pretty-simple QuickCheck text transformers + lens mtl pretty-simple QuickCheck syb text transformers unordered-containers ]; description = "schema guided serialization"; @@ -214713,18 +215403,21 @@ self: { }) {}; "scientific-notation" = callPackage - ({ mkDerivation, aeson, attoparsec, base, byteslice, bytesmith - , bytestring, gauge, primitive, QuickCheck, run-st, scientific - , tasty, tasty-hunit, tasty-quickcheck + ({ mkDerivation, aeson, attoparsec, base, bytebuild, byteslice + , bytesmith, bytestring, gauge, natural-arithmetic, primitive + , QuickCheck, run-st, scientific, tasty, tasty-hunit + , tasty-quickcheck }: mkDerivation { pname = "scientific-notation"; - version = "0.1.1.0"; - sha256 = "1s0iyj6dn0nbn8s31b5wwwlyfx5jcnwa3i9gp45idcwfsz5hmdvq"; - libraryHaskellDepends = [ base bytesmith ]; + version = "0.1.2.0"; + sha256 = "19yfg032ppiy70y28fbildxp4h6y4krs9ayh7a8sdbxibpqb82cx"; + libraryHaskellDepends = [ + base bytebuild bytesmith natural-arithmetic + ]; testHaskellDepends = [ - base byteslice bytesmith bytestring primitive QuickCheck tasty - tasty-hunit tasty-quickcheck + base bytebuild byteslice bytesmith bytestring primitive QuickCheck + tasty tasty-hunit tasty-quickcheck ]; benchmarkHaskellDepends = [ aeson attoparsec base byteslice bytesmith bytestring gauge @@ -220197,33 +220890,6 @@ self: { }) {}; "serverless-haskell" = callPackage - ({ mkDerivation, aeson, aeson-casing, amazonka-core - , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive - , hspec, hspec-discover, http-types, iproute, lens, network - , network-simple, raw-strings-qq, text, time, unix - , unordered-containers - }: - mkDerivation { - pname = "serverless-haskell"; - version = "0.10.2"; - sha256 = "1iy69394dqv38dlh71m8sarcfps9gaaq90zpc4f169vnhpr59wak"; - libraryHaskellDepends = [ - aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base - bytestring case-insensitive http-types iproute lens network - network-simple text time unix unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-casing amazonka-core amazonka-kinesis amazonka-s3 base - bytestring case-insensitive hspec hspec-discover http-types iproute - lens network network-simple raw-strings-qq text time unix - unordered-containers - ]; - testToolDepends = [ hspec-discover ]; - description = "Deploying Haskell code onto AWS Lambda using Serverless"; - license = stdenv.lib.licenses.mit; - }) {}; - - "serverless-haskell_0_10_5" = callPackage ({ mkDerivation, aeson, aeson-casing, amazonka-core , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive , hspec, hspec-discover, http-types, iproute, lens, network @@ -220248,7 +220914,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Deploying Haskell code onto AWS Lambda using Serverless"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "serversession" = callPackage @@ -221495,6 +222160,39 @@ self: { broken = true; }) {}; + "shakebook" = callPackage + ({ mkDerivation, aeson, base, comonad, comonad-extras, doctemplates + , extra, feed, free, lens, lens-aeson, optparse-applicative, pandoc + , pandoc-types, relude, rio, shake, slick, split, tasty + , tasty-golden, text-time + }: + mkDerivation { + pname = "shakebook"; + version = "0.2.0.4"; + sha256 = "1h36pm81fwzsyjannsbxc27h03mb5k47byq1xc23gfj5i1gs1vhv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base comonad comonad-extras doctemplates extra feed free lens + lens-aeson pandoc pandoc-types relude rio shake slick split + text-time + ]; + executableHaskellDepends = [ + aeson base comonad comonad-extras doctemplates extra feed free lens + lens-aeson optparse-applicative pandoc pandoc-types relude rio + shake slick split text-time + ]; + testHaskellDepends = [ + aeson base comonad comonad-extras doctemplates extra feed free lens + lens-aeson pandoc pandoc-types relude rio shake slick split tasty + tasty-golden text-time + ]; + description = "Shake-based technical documentation generator; HTML & PDF"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "shaker" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, directory , filepath, ghc, ghc-paths, haskeline, haskell-src, HUnit, mtl @@ -222714,7 +223412,7 @@ self: { version = "0.1.0.1"; sha256 = "19zjwzh3i8ql5xz9rvmbz7n2l3z7dcq683ikrpvqx3wxnc06058m"; libraryHaskellDepends = [ base ]; - description = "Sieve is an implementation of the Sieve abstract data type"; + description = "Sieve is an implementation of the Sieve abstract data type."; license = stdenv.lib.licenses.gpl2; }) {}; @@ -223003,6 +223701,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "simple-affine-space_0_1_1" = callPackage + ({ mkDerivation, base, deepseq, directory, filepath, hlint, process + , regex-posix + }: + mkDerivation { + pname = "simple-affine-space"; + version = "0.1.1"; + sha256 = "172yn8kispqbn6zrdn610mh3l728ffb6lwa1zk5qgwm0lfpx3849"; + libraryHaskellDepends = [ base deepseq ]; + testHaskellDepends = [ + base directory filepath hlint process regex-posix + ]; + description = "A simple library for affine and vector spaces"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "simple-atom" = callPackage ({ mkDerivation, base, containers, deepseq }: mkDerivation { @@ -225201,18 +225916,6 @@ self: { }) {}; "slist" = callPackage - ({ mkDerivation, base, doctest, Glob }: - mkDerivation { - pname = "slist"; - version = "0.1.0.0"; - sha256 = "0yvcy8v9qpg517njy3sr5vqr4jgpynii7lw8gqh9pwjk40q628wf"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest Glob ]; - description = "Sized list"; - license = stdenv.lib.licenses.mpl20; - }) {}; - - "slist_0_1_1_0" = callPackage ({ mkDerivation, base, doctest, Glob }: mkDerivation { pname = "slist"; @@ -225222,7 +225925,6 @@ self: { testHaskellDepends = [ base doctest Glob ]; description = "Sized list"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "sloane" = callPackage @@ -225333,29 +226035,26 @@ self: { }) {}; "slynx" = callPackage - ({ mkDerivation, async, base, bytestring, containers - , data-memocombinators, elynx-seq, elynx-tools, elynx-tree, hmatrix - , integration, math-functions, matrices, megaparsec, monad-logger - , mwc-random, optparse-applicative, parallel, primitive, statistics - , text, transformers, vector, vector-th-unbox, word8 + ({ mkDerivation, async, base, bytestring, containers, elynx-markov + , elynx-seq, elynx-tools, elynx-tree, hmatrix, megaparsec + , monad-logger, mwc-random, optparse-applicative, scientific, text + , transformers, vector }: mkDerivation { pname = "slynx"; - version = "0.1.0"; - sha256 = "0bxdjwwxzpl437a2fzjb8vazbsz16jk2szxhbr63y12hckgjpzrj"; + version = "0.2.2"; + sha256 = "0jja57dcalxd1qp7fj338jwbpaxm1l3ika2zyd9rv3dk2k1xn6rj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base bytestring containers data-memocombinators elynx-seq - elynx-tools elynx-tree hmatrix integration math-functions matrices - megaparsec monad-logger mwc-random optparse-applicative parallel - primitive statistics text transformers vector vector-th-unbox word8 + async base bytestring containers elynx-markov elynx-seq elynx-tools + elynx-tree hmatrix megaparsec monad-logger mwc-random + optparse-applicative scientific text transformers vector ]; executableHaskellDepends = [ - async base bytestring containers data-memocombinators elynx-seq - elynx-tools hmatrix integration math-functions matrices megaparsec - monad-logger mwc-random optparse-applicative parallel primitive - statistics text transformers vector vector-th-unbox word8 + async base bytestring containers elynx-seq elynx-tools hmatrix + megaparsec monad-logger mwc-random optparse-applicative scientific + text transformers vector ]; description = "Handle molecular sequences"; license = stdenv.lib.licenses.gpl3; @@ -228375,22 +229074,22 @@ self: { }) {}; "souffle-haskell" = callPackage - ({ mkDerivation, base, deepseq, directory, filepath, free, hspec - , mtl, process, souffle, template-haskell, temporary, text + ({ mkDerivation, base, deepseq, directory, filepath, hspec, mtl + , process, souffle, template-haskell, temporary, text , type-errors-pretty, vector }: mkDerivation { pname = "souffle-haskell"; - version = "0.2.0"; - sha256 = "0c67z5wrfi3pp5fyvl8k4j1r8h7ziy6hj5zrwrpf550p3a04chrm"; + version = "0.2.2"; + sha256 = "1835yq0prh42x9yakfx963hv1lzkhizz02ba344z099rx4fx9fji"; libraryHaskellDepends = [ - base deepseq directory filepath free mtl process template-haskell + base deepseq directory filepath mtl process template-haskell temporary text type-errors-pretty vector ]; libraryToolDepends = [ souffle ]; testHaskellDepends = [ - base deepseq directory filepath free hspec mtl process - template-haskell temporary text type-errors-pretty vector + base deepseq directory filepath hspec mtl process template-haskell + temporary text type-errors-pretty vector ]; testToolDepends = [ souffle ]; description = "Souffle Datalog bindings for Haskell"; @@ -229042,7 +229741,7 @@ self: { aeson base blaze-markup bytestring cereal deepseq hashable mwc-random path-pieces primitive safecopy text uuid ]; - description = "Simple data types that help me here and there"; + description = "Simple data types that help me here and there."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -229116,8 +229815,8 @@ self: { }: mkDerivation { pname = "spectral-clustering"; - version = "0.3.1.3"; - sha256 = "0izf0lvk989y4d04240hbnsr5lc5lbl9200c5km0p72lv1v07mgf"; + version = "0.3.2.1"; + sha256 = "1n6yd2is628wsrfj149cdr8k06anncbk92d39r1w4dmsmdp7hchk"; libraryHaskellDepends = [ base clustering containers hmatrix hmatrix-svdlibc mwc-random safe sparse-linear-algebra statistics vector @@ -230652,28 +231351,27 @@ self: { "stack" = callPackage ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, array , async, attoparsec, base, base64-bytestring, bytestring, Cabal - , colour, conduit, conduit-extra, containers, cryptonite - , cryptonite-conduit, deepseq, directory, echo, exceptions, extra - , file-embed, filelock, filepath, fsnotify, generic-deriving - , hackage-security, hashable, hi-file-parser, hpack, hpc, hspec - , http-client, http-client-tls, http-conduit, http-download - , http-types, memory, microlens, mintty, mono-traversable, mtl - , mustache, neat-interpolation, network-uri, open-browser - , optparse-applicative, pantry, path, path-io, persistent - , persistent-sqlite, persistent-template, pretty, primitive - , process, project-template, QuickCheck, raw-strings-qq - , regex-applicative-text, resource-pool, resourcet, retry, rio - , rio-prettyprint, semigroups, smallcheck, split, stm - , streaming-commons, tar, template-haskell, temporary - , terminal-size, text, text-metrics, th-reify-many, time, tls + , casa-client, casa-types, colour, conduit, conduit-extra + , containers, cryptonite, cryptonite-conduit, deepseq, directory + , echo, exceptions, extra, file-embed, filelock, filepath, fsnotify + , generic-deriving, hackage-security, hashable, hi-file-parser + , hpack, hpc, hspec, http-client, http-client-tls, http-conduit + , http-download, http-types, memory, microlens, mintty + , mono-traversable, mtl, mustache, neat-interpolation, network-uri + , open-browser, optparse-applicative, pantry, path, path-io + , persistent, persistent-sqlite, persistent-template, pretty + , primitive, process, project-template, QuickCheck, raw-strings-qq + , regex-applicative-text, retry, rio, rio-prettyprint, semigroups + , smallcheck, split, stm, streaming-commons, tar, template-haskell + , temporary, text, text-metrics, th-reify-many, time, tls , transformers, typed-process, unicode-transforms, unix , unix-compat, unliftio, unordered-containers, vector, yaml , zip-archive, zlib }: mkDerivation { pname = "stack"; - version = "2.1.3.1"; - sha256 = "1q2nagnc24fvyj3hwnpgyp3rqhxswhscyw4pw2dazqx34ad3d0zr"; + version = "2.3.1"; + sha256 = "1l17jdkr6ca3hwm4v8bshq2zbadqhb35hk2gfjy2dri1mdibcsdr"; configureFlags = [ "-fdisable-git-info" "-fhide-dependency-versions" "-fsupported-build" @@ -230683,55 +231381,53 @@ self: { setupHaskellDepends = [ base Cabal filepath ]; libraryHaskellDepends = [ aeson annotated-wl-pprint ansi-terminal array async attoparsec base - base64-bytestring bytestring Cabal colour conduit conduit-extra - containers cryptonite cryptonite-conduit deepseq directory echo - exceptions extra file-embed filelock filepath fsnotify - generic-deriving hackage-security hashable hi-file-parser hpack hpc - http-client http-client-tls http-conduit http-download http-types - memory microlens mintty mono-traversable mtl mustache - neat-interpolation network-uri open-browser optparse-applicative - pantry path path-io persistent persistent-sqlite - persistent-template pretty primitive process project-template - regex-applicative-text resource-pool resourcet retry rio - rio-prettyprint semigroups split stm streaming-commons tar - template-haskell temporary terminal-size text text-metrics - th-reify-many time tls transformers typed-process - unicode-transforms unix unix-compat unliftio unordered-containers - vector yaml zip-archive zlib + base64-bytestring bytestring Cabal casa-client casa-types colour + conduit conduit-extra containers cryptonite cryptonite-conduit + deepseq directory echo exceptions extra file-embed filelock + filepath fsnotify generic-deriving hackage-security hashable + hi-file-parser hpack hpc http-client http-client-tls http-conduit + http-download http-types memory microlens mintty mono-traversable + mtl mustache neat-interpolation network-uri open-browser + optparse-applicative pantry path path-io persistent + persistent-sqlite persistent-template pretty primitive process + project-template regex-applicative-text retry rio rio-prettyprint + semigroups split stm streaming-commons tar template-haskell + temporary text text-metrics th-reify-many time tls transformers + typed-process unicode-transforms unix unix-compat unliftio + unordered-containers vector yaml zip-archive zlib ]; executableHaskellDepends = [ aeson annotated-wl-pprint ansi-terminal array async attoparsec base - base64-bytestring bytestring Cabal colour conduit conduit-extra - containers cryptonite cryptonite-conduit deepseq directory echo - exceptions extra file-embed filelock filepath fsnotify - generic-deriving hackage-security hashable hi-file-parser hpack hpc - http-client http-client-tls http-conduit http-download http-types - memory microlens mintty mono-traversable mtl mustache - neat-interpolation network-uri open-browser optparse-applicative - pantry path path-io persistent persistent-sqlite - persistent-template pretty primitive process project-template - regex-applicative-text resource-pool resourcet retry rio - rio-prettyprint semigroups split stm streaming-commons tar - template-haskell temporary terminal-size text text-metrics - th-reify-many time tls transformers typed-process - unicode-transforms unix unix-compat unliftio unordered-containers - vector yaml zip-archive zlib + base64-bytestring bytestring Cabal casa-client casa-types colour + conduit conduit-extra containers cryptonite cryptonite-conduit + deepseq directory echo exceptions extra file-embed filelock + filepath fsnotify generic-deriving hackage-security hashable + hi-file-parser hpack hpc http-client http-client-tls http-conduit + http-download http-types memory microlens mintty mono-traversable + mtl mustache neat-interpolation network-uri open-browser + optparse-applicative pantry path path-io persistent + persistent-sqlite persistent-template pretty primitive process + project-template regex-applicative-text retry rio rio-prettyprint + semigroups split stm streaming-commons tar template-haskell + temporary text text-metrics th-reify-many time tls transformers + typed-process unicode-transforms unix unix-compat unliftio + unordered-containers vector yaml zip-archive zlib ]; testHaskellDepends = [ aeson annotated-wl-pprint ansi-terminal array async attoparsec base - base64-bytestring bytestring Cabal colour conduit conduit-extra - containers cryptonite cryptonite-conduit deepseq directory echo - exceptions extra file-embed filelock filepath fsnotify - generic-deriving hackage-security hashable hi-file-parser hpack hpc - hspec http-client http-client-tls http-conduit http-download - http-types memory microlens mintty mono-traversable mtl mustache - neat-interpolation network-uri open-browser optparse-applicative - pantry path path-io persistent persistent-sqlite - persistent-template pretty primitive process project-template - QuickCheck raw-strings-qq regex-applicative-text resource-pool - resourcet retry rio rio-prettyprint semigroups smallcheck split stm - streaming-commons tar template-haskell temporary terminal-size text - text-metrics th-reify-many time tls transformers typed-process + base64-bytestring bytestring Cabal casa-client casa-types colour + conduit conduit-extra containers cryptonite cryptonite-conduit + deepseq directory echo exceptions extra file-embed filelock + filepath fsnotify generic-deriving hackage-security hashable + hi-file-parser hpack hpc hspec http-client http-client-tls + http-conduit http-download http-types memory microlens mintty + mono-traversable mtl mustache neat-interpolation network-uri + open-browser optparse-applicative pantry path path-io persistent + persistent-sqlite persistent-template pretty primitive process + project-template QuickCheck raw-strings-qq regex-applicative-text + retry rio rio-prettyprint semigroups smallcheck split stm + streaming-commons tar template-haskell temporary text text-metrics + th-reify-many time tls transformers typed-process unicode-transforms unix unix-compat unliftio unordered-containers vector yaml zip-archive zlib ]; @@ -232160,8 +232856,8 @@ self: { }: mkDerivation { pname = "staversion"; - version = "0.2.3.4"; - sha256 = "0b3hkk6m2wpcyj1zkl3az4v2m9cb7djxk7iz00rxz5j13ngxgfci"; + version = "0.2.3.5"; + sha256 = "1jm6cyql0zinw1bfs30986jpmb7ws4jmzfyxwmdfkdcz73bf1867"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -233577,7 +234273,7 @@ self: { base containers directory doctest filepath streaming streaming-commons tasty tasty-hunit ]; - description = "A resource management decorator for \"streaming\""; + description = "A resource management decorator for \"streaming\"."; license = stdenv.lib.licenses.mit; }) {}; @@ -233986,35 +234682,6 @@ self: { }) {}; "streamly" = callPackage - ({ mkDerivation, atomic-primops, base, containers, deepseq - , directory, exceptions, fusion-plugin-types, gauge, ghc, ghc-prim - , heaps, hspec, lockfree-queue, monad-control, mtl, network - , primitive, QuickCheck, random, transformers, transformers-base - , typed-process - }: - mkDerivation { - pname = "streamly"; - version = "0.7.1"; - sha256 = "0jzs2jaznjqrnzwqnjyg0zxggsrid3q8r5v4cnlzvkcn053yam3m"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - atomic-primops base containers deepseq directory exceptions - fusion-plugin-types ghc-prim heaps lockfree-queue monad-control mtl - network primitive transformers transformers-base - ]; - testHaskellDepends = [ - base containers exceptions ghc hspec mtl QuickCheck random - transformers - ]; - benchmarkHaskellDepends = [ - base deepseq gauge mtl random typed-process - ]; - description = "Beautiful Streaming, Concurrent and Reactive Composition"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "streamly_0_7_2" = callPackage ({ mkDerivation, atomic-primops, base, containers, deepseq , directory, exceptions, fusion-plugin-types, ghc, ghc-prim, heaps , hspec, lockfree-queue, monad-control, mtl, network, primitive @@ -234037,7 +234704,6 @@ self: { ]; description = "Beautiful Streaming, Concurrent and Reactive Composition"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "streamly-bytestring" = callPackage @@ -234496,7 +235162,7 @@ self: { "string-interpolate" = callPackage ({ mkDerivation, base, bytestring, criterion, formatting - , haskell-src-meta, hspec, interpolate, interpolatedstring-perl6 + , haskell-src-exts, haskell-src-meta, hspec, interpolate , neat-interpolation, QuickCheck, quickcheck-instances , quickcheck-text, quickcheck-unicode, random-shuffle , template-haskell, text, text-conversions, unordered-containers @@ -234504,11 +235170,11 @@ self: { }: mkDerivation { pname = "string-interpolate"; - version = "0.2.0.1"; - sha256 = "08izbllwik00iaxmakr5dhm2x0nsc1n5q2naa10awr2vz391x6v4"; + version = "0.2.0.3"; + sha256 = "0xmanjs8sgk3cm6f25wbpxsmzpgznf73pvviw0ig71mn2y2kx6bi"; libraryHaskellDepends = [ - base bytestring haskell-src-meta template-haskell text - text-conversions utf8-string + base bytestring haskell-src-exts haskell-src-meta template-haskell + text text-conversions utf8-string ]; testHaskellDepends = [ base bytestring hspec QuickCheck quickcheck-instances @@ -234516,8 +235182,8 @@ self: { unordered-containers ]; benchmarkHaskellDepends = [ - base bytestring criterion formatting interpolate - interpolatedstring-perl6 neat-interpolation QuickCheck text + base bytestring criterion formatting interpolate neat-interpolation + QuickCheck text ]; description = "Haskell string/text/bytestring interpolation that just works"; license = stdenv.lib.licenses.bsd3; @@ -234792,17 +235458,6 @@ self: { }) {}; "stripe-concepts" = callPackage - ({ mkDerivation, base, bytestring, text }: - mkDerivation { - pname = "stripe-concepts"; - version = "1.0.2.0"; - sha256 = "0a8p4pm8v83kcgxm3jpmpl4811pdjjn2rmdl0mkq649rfnm3cg2k"; - libraryHaskellDepends = [ base bytestring text ]; - description = "Types for the Stripe API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "stripe-concepts_1_0_2_2" = callPackage ({ mkDerivation, base, bytestring, text }: mkDerivation { pname = "stripe-concepts"; @@ -234811,7 +235466,6 @@ self: { libraryHaskellDepends = [ base bytestring text ]; description = "Types for the Stripe API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stripe-core" = callPackage @@ -234905,23 +235559,6 @@ self: { }) {}; "stripe-signature" = callPackage - ({ mkDerivation, base, base16-bytestring, bytestring, cryptonite - , memory, stripe-concepts, text - }: - mkDerivation { - pname = "stripe-signature"; - version = "1.0.0.1"; - sha256 = "1l5gw1lv63mpi8f2z70wv4b5809ljsi2zzdgj2mwc2zrdqfnharn"; - libraryHaskellDepends = [ - base base16-bytestring bytestring cryptonite memory stripe-concepts - text - ]; - testHaskellDepends = [ base bytestring text ]; - description = "Verification of Stripe webhook signatures"; - license = stdenv.lib.licenses.mit; - }) {}; - - "stripe-signature_1_0_0_2" = callPackage ({ mkDerivation, base, base16-bytestring, bytestring, cryptonite , memory, stripe-concepts, text }: @@ -234936,7 +235573,6 @@ self: { testHaskellDepends = [ base bytestring text ]; description = "Verification of Stripe webhook signatures"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "stripe-tests" = callPackage @@ -236269,10 +236905,8 @@ self: { }: mkDerivation { pname = "sv"; - version = "1.4"; - sha256 = "02ymnnknfppx59b922y62grkmarwsyy77iv6bmyp2bzm8vbvnvd5"; - revision = "2"; - editedCabalFile = "0kacp654mmj9h038mrxnq69ln5ipbbp2ifvyzqixgjask2bf9f41"; + version = "1.4.0.1"; + sha256 = "1ak58rqg9f8xh43sgflcqnvpc62580y3ip1sxdg9w2scr8fqc6y2"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring contravariant hw-dsv semigroupoids sv-core transformers utf8-string validation @@ -236324,8 +236958,8 @@ self: { pname = "sv-core"; version = "0.5"; sha256 = "1x5gmv2pbn3hx1dhpkigivjkbg6n6xy7lc36wmccsw2qqn9r5qxa"; - revision = "2"; - editedCabalFile = "066kpnyvpzl6bvc11ng6xq4mdd84lxjiif83i265mkjc8hq21xd4"; + revision = "3"; + editedCabalFile = "0z077qfw5v6ar1jmlfgzjjj35zqpc77xzjqwihk5v5h6hifanp9d"; libraryHaskellDepends = [ attoparsec base bifunctors bytestring containers contravariant deepseq double-conversion lens mtl parsec profunctors readable @@ -236348,8 +236982,8 @@ self: { pname = "sv-svfactor"; version = "0.2"; sha256 = "1fjgryypq6i4r3w9zdb282aq5lqp4577mzzycafklphc0d2ancgb"; - revision = "2"; - editedCabalFile = "1igmg66d7zs8pcia4j7nhr7iivnbanqz34wcpfx967823vc2whpw"; + revision = "3"; + editedCabalFile = "1qvpbc5qhljmfaxlbfjddiq51dymd9zlp66ya99sypb0anydc5n2"; libraryHaskellDepends = [ base bytestring lens profunctors sv-core svfactor validation ]; @@ -236787,7 +237421,7 @@ self: { base containers hashable HUnit network-uri old-locale semigroups test-framework test-framework-hunit text time ]; - description = "A semantic web toolkit"; + description = "A semantic web toolkit."; license = stdenv.lib.licenses.lgpl21; }) {}; @@ -238353,7 +238987,7 @@ self: { libraryHaskellDepends = [ base containers ghc-prim mtl Takusen template-haskell time ]; - description = "Transito Abierto: convenience library when using Takusen and Oracle"; + description = "Transito Abierto: convenience library when using Takusen and Oracle."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -239612,8 +240246,8 @@ self: { }: mkDerivation { pname = "taskwarrior"; - version = "0.2.0.0"; - sha256 = "1sljpsafyh2kxga7p9dz0nsvqlsmbd399xlgmncnyfh0z9cii7pw"; + version = "0.2.1.0"; + sha256 = "1ladijvlvr6w35y1qlxbp0y34bby58a9bfyhqiynn0s4m5bj55c6"; libraryHaskellDepends = [ aeson base bytestring process random text time unordered-containers uuid @@ -239773,6 +240407,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-golden_2_3_3_2" = callPackage + ({ mkDerivation, async, base, bytestring, containers, deepseq + , directory, filepath, mtl, optparse-applicative, process, tagged + , tasty, tasty-hunit, temporary, text + }: + mkDerivation { + pname = "tasty-golden"; + version = "2.3.3.2"; + sha256 = "19dif84p71hks8czmaff6nlylsz34bqy0nki7mclr4ysawz1hdm9"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring containers deepseq directory filepath mtl + optparse-applicative process tagged tasty temporary text + ]; + testHaskellDepends = [ + base directory filepath process tasty tasty-hunit temporary + ]; + description = "Golden tests support for tasty"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-groundhog-converters" = callPackage ({ mkDerivation, aeson, base, bimap, bytestring, containers , groundhog, groundhog-converters, groundhog-sqlite, groundhog-th @@ -239957,6 +240614,21 @@ self: { broken = true; }) {}; + "tasty-json" = callPackage + ({ mkDerivation, base, bytestring, containers, stm, tagged, tasty + , text + }: + mkDerivation { + pname = "tasty-json"; + version = "0.1.0.0"; + sha256 = "0k6zzi2w675pghxfv5y6m67n2cv8bb22dq9zgb5yfwycfj3va4bp"; + libraryHaskellDepends = [ + base bytestring containers stm tagged tasty text + ]; + description = "JSON reporter for the tasty testing framework"; + license = stdenv.lib.licenses.mit; + }) {}; + "tasty-kat" = callPackage ({ mkDerivation, base, bytestring, mtl, tasty, tasty-hunit , tasty-quickcheck @@ -240093,6 +240765,8 @@ self: { pname = "tasty-rerun"; version = "1.1.17"; sha256 = "0hiafrknk700gi8rm675akz8q6abk8iwlmygwnlx1fy3znalkqad"; + revision = "1"; + editedCabalFile = "1j08802psflkj3wb5jhh4z5w1i852hw5fm9k5aczbvfx9873zyhc"; libraryHaskellDepends = [ base containers mtl optparse-applicative split stm tagged tasty transformers @@ -240858,8 +241532,8 @@ self: { ({ mkDerivation, base, time }: mkDerivation { pname = "tempi"; - version = "1.0.1.1"; - sha256 = "126j3bph2b7wsn7gvckx7b6sj69djcr57m4yzbdc895mq5zga88j"; + version = "1.0.2.0"; + sha256 = "08hjgs32cx3vcm6sga4xc7ijcj3lbjlg133vkri06xfi0v3hjgnp"; libraryHaskellDepends = [ base time ]; description = "For representing musical tempi"; license = stdenv.lib.licenses.bsd3; @@ -241826,22 +242500,24 @@ self: { "tesla" = callPackage ({ mkDerivation, aeson, base, bytestring, casing, containers - , generic-deriving, HUnit, lens, lens-aeson, mtl, tasty - , tasty-hunit, tasty-quickcheck, template-haskell, text, time - , vector, wreq + , exceptions, generic-deriving, HUnit, lens, lens-aeson + , monad-logger, mtl, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, text, time, unliftio-core, vector, wreq }: mkDerivation { pname = "tesla"; - version = "0.1.0.1"; - sha256 = "0rk1i9pl6x6f58hbij287aaab7ac3iy3ngs2bqb2990zqfh12ir4"; + version = "0.2.0.0"; + sha256 = "0gpzkrh5238n42h158np1k14a28y11kgicwbv6w4br6h0rnbr9d3"; libraryHaskellDepends = [ - aeson base bytestring casing containers generic-deriving lens - lens-aeson mtl template-haskell text time vector wreq + aeson base bytestring casing containers exceptions generic-deriving + lens lens-aeson monad-logger mtl template-haskell text time + unliftio-core vector wreq ]; testHaskellDepends = [ - aeson base bytestring casing containers generic-deriving HUnit lens - lens-aeson mtl tasty tasty-hunit tasty-quickcheck template-haskell - text time vector wreq + aeson base bytestring casing containers exceptions generic-deriving + HUnit lens lens-aeson monad-logger mtl tasty tasty-hunit + tasty-quickcheck template-haskell text time unliftio-core vector + wreq ]; description = "Tesla API client"; license = stdenv.lib.licenses.bsd3; @@ -242536,28 +243212,6 @@ self: { }) {}; "texmath" = callPackage - ({ mkDerivation, base, bytestring, containers, directory, filepath - , mtl, pandoc-types, parsec, process, syb, temporary, text - , utf8-string, xml - }: - mkDerivation { - pname = "texmath"; - version = "0.12.0.1"; - sha256 = "1halp1vn2334ym3j3fxfbrpkr15nc201c7vfwmzimya6vnyknsxs"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base containers mtl pandoc-types parsec syb text xml - ]; - testHaskellDepends = [ - base bytestring directory filepath process temporary text - utf8-string xml - ]; - description = "Conversion between formats used to represent mathematics"; - license = stdenv.lib.licenses.gpl2; - }) {}; - - "texmath_0_12_0_2" = callPackage ({ mkDerivation, base, bytestring, containers, directory, filepath , mtl, pandoc-types, parsec, process, syb, temporary, text , utf8-string, xml @@ -242577,7 +243231,6 @@ self: { ]; description = "Conversion between formats used to represent mathematics"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "texrunner" = callPackage @@ -246591,7 +247244,7 @@ self: { sha256 = "1snw5cdkyqyninqqqwa6qfndfmwfr4lkdg0v94267g7xbwcqjj8h"; libraryHaskellDepends = [ base containers network-uri text ]; testHaskellDepends = [ base HUnit network-uri text ]; - description = "This project separates subdomains, domains, and top-level-domains from URLs"; + description = "This project separates subdomains, domains, and top-level-domains from URLs."; license = stdenv.lib.licenses.mit; }) {}; @@ -246703,29 +247356,29 @@ self: { }) {}; "tlynx" = callPackage - ({ mkDerivation, array, base, bytestring, containers, elynx-seq - , elynx-tools, elynx-tree, lifted-async, math-functions, megaparsec - , monad-logger, MonadRandom, mwc-random, optparse-applicative - , parallel, primitive, QuickCheck, quickcheck-instances, statistics - , text, transformers, vector + ({ mkDerivation, aeson, array, base, bytestring, comonad + , containers, elynx-tools, elynx-tree, gnuplot, lifted-async + , megaparsec, monad-logger, mwc-random, optparse-applicative + , parallel, primitive, scientific, statistics, text, transformers + , vector }: mkDerivation { pname = "tlynx"; - version = "0.1.0"; - sha256 = "0l4i4hyyw0m8kj2fqy4arcfyn9vnl4zdsbicz191hlc1nx935byn"; + version = "0.2.2"; + sha256 = "0hf70zvcndjmlwbd2n2ncbl89xi2xmkr7ymq48hmdlg3vp0bdz62"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base bytestring containers elynx-seq elynx-tools elynx-tree - lifted-async math-functions megaparsec monad-logger MonadRandom - mwc-random optparse-applicative parallel primitive QuickCheck - quickcheck-instances statistics text transformers vector + aeson array base bytestring comonad containers elynx-tools + elynx-tree gnuplot lifted-async megaparsec monad-logger mwc-random + optparse-applicative parallel primitive scientific statistics text + transformers vector ]; executableHaskellDepends = [ - array base bytestring containers elynx-tools elynx-tree - lifted-async math-functions megaparsec monad-logger MonadRandom - mwc-random optparse-applicative parallel primitive QuickCheck - quickcheck-instances statistics text transformers vector + aeson array base bytestring comonad containers elynx-tools gnuplot + lifted-async megaparsec monad-logger mwc-random + optparse-applicative parallel primitive scientific statistics text + transformers vector ]; description = "Handle phylogenetic trees"; license = stdenv.lib.licenses.gpl3; @@ -250592,7 +251245,7 @@ self: { libraryHaskellDepends = [ base twentefp-eventloop-graphics twentefp-number ]; - description = "RoseTree type and show functions for lab assignment of University of Twente"; + description = "RoseTree type and show functions for lab assignment of University of Twente."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -250916,31 +251569,28 @@ self: { "twitter-conduit" = callPackage ({ mkDerivation, aeson, attoparsec, authenticate-oauth, base - , bytestring, Cabal, cabal-doctest, case-insensitive, conduit - , conduit-extra, containers, data-default, doctest, exceptions - , hlint, hspec, hspec-discover, http-client, http-conduit - , http-types, lens, lens-aeson, network-uri, resourcet - , template-haskell, text, time, transformers, transformers-base + , bytestring, Cabal, cabal-doctest, conduit, conduit-extra + , containers, data-default, doctest, exceptions, ghc-prim, hlint + , hspec, hspec-discover, http-client, http-conduit, http-types + , lens, lens-aeson, resourcet, text, time, transformers , twitter-types, twitter-types-lens }: mkDerivation { pname = "twitter-conduit"; - version = "0.4.0"; - sha256 = "1i1ppwha497vhbj0z9gdspg9anqsikrix3j9vzpz0pcn9ij5rwrg"; + version = "0.5.0"; + sha256 = "1rh68ll9dv0axql5npvk547ykqbarak3frpwdflblfm3hrfnwfgf"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson attoparsec authenticate-oauth base bytestring conduit - conduit-extra containers data-default exceptions http-client - http-conduit http-types lens lens-aeson resourcet template-haskell - text time transformers transformers-base twitter-types - twitter-types-lens + conduit-extra containers data-default exceptions ghc-prim + http-client http-conduit http-types lens lens-aeson resourcet text + time transformers twitter-types twitter-types-lens ]; testHaskellDepends = [ - aeson attoparsec authenticate-oauth base bytestring - case-insensitive conduit conduit-extra containers data-default - doctest hlint hspec http-client http-conduit http-types lens - lens-aeson network-uri resourcet template-haskell text time - twitter-types twitter-types-lens + aeson attoparsec authenticate-oauth base bytestring conduit + conduit-extra containers data-default doctest hlint hspec + http-client http-conduit http-types lens lens-aeson resourcet text + time twitter-types twitter-types-lens ]; testToolDepends = [ hspec-discover ]; description = "Twitter API package with conduit interface and Streaming API support"; @@ -251348,18 +251998,6 @@ self: { }) {}; "type-errors-pretty" = callPackage - ({ mkDerivation, base, doctest, Glob }: - mkDerivation { - pname = "type-errors-pretty"; - version = "0.0.1.0"; - sha256 = "1xp72vsmqamgg9k8w7pimy6q3dn73ammg7zda98a0hb4q9pdcrml"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest Glob ]; - description = "Combinators for writing pretty type errors easily"; - license = stdenv.lib.licenses.mpl20; - }) {}; - - "type-errors-pretty_0_0_1_1" = callPackage ({ mkDerivation, base, doctest, Glob }: mkDerivation { pname = "type-errors-pretty"; @@ -251369,7 +252007,6 @@ self: { testHaskellDepends = [ base doctest Glob ]; description = "Combinators for writing pretty type errors easily"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "type-fun" = callPackage @@ -251955,6 +252592,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "typed-encoding" = callPackage + ({ mkDerivation, base, base64-bytestring, bytestring, doctest + , doctest-discover, QuickCheck, quickcheck-instances, text + }: + mkDerivation { + pname = "typed-encoding"; + version = "0.1.0.0"; + sha256 = "182qw95s60nnicl74hhijj4d9rk5rhpyibxw1awcwhks2a3c89r6"; + libraryHaskellDepends = [ base base64-bytestring bytestring text ]; + testHaskellDepends = [ + base base64-bytestring bytestring doctest doctest-discover + QuickCheck quickcheck-instances text + ]; + description = "Type safe string transformations"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "typed-process" = callPackage ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec , process, stm, temporary, transformers, unliftio-core @@ -252146,6 +252800,8 @@ self: { pname = "typelevel-rewrite-rules"; version = "0.1"; sha256 = "1gm3xbsi90dgppwhhhlmq1rwwnx9bxhm7zv9x4yr0952fwxrm8x8"; + revision = "1"; + editedCabalFile = "0wgryhys24671j46s58prbh7agrlxdcbains6qv37kp6xly726nj"; libraryHaskellDepends = [ base ghc ghc-prim ghc-tcplugins-extra term-rewriting transformers ]; @@ -252239,37 +252895,6 @@ self: { }) {}; "typerep-map" = callPackage - ({ mkDerivation, base, containers, criterion, deepseq - , dependent-map, dependent-sum, ghc-prim, ghc-typelits-knownnat - , hedgehog, primitive, QuickCheck, tasty, tasty-discover - , tasty-hedgehog, tasty-hspec, vector - }: - mkDerivation { - pname = "typerep-map"; - version = "0.3.2"; - sha256 = "0s77hj0m9jiqgybccdfl1x88j05fx7grkg16q6kldd1lgqrvrgb0"; - revision = "3"; - editedCabalFile = "032y3parcz7ffmsqichmshczk7zxkg66dciwvr5d7fznqvy3sg1s"; - libraryHaskellDepends = [ - base containers deepseq ghc-prim primitive vector - ]; - testHaskellDepends = [ - base ghc-typelits-knownnat hedgehog QuickCheck tasty tasty-discover - tasty-hedgehog tasty-hspec - ]; - testToolDepends = [ tasty-discover ]; - benchmarkHaskellDepends = [ - base criterion deepseq dependent-map dependent-sum - ghc-typelits-knownnat - ]; - doHaddock = false; - description = "Efficient implementation of a dependent map with types as keys"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "typerep-map_0_3_3_0" = callPackage ({ mkDerivation, base, containers, criterion, deepseq , dependent-map, dependent-sum, ghc-prim, ghc-typelits-knownnat , hedgehog, hspec, hspec-hedgehog, primitive, vector @@ -256819,17 +257444,6 @@ self: { }) {}; "validity-containers" = callPackage - ({ mkDerivation, base, containers, validity }: - mkDerivation { - pname = "validity-containers"; - version = "0.5.0.1"; - sha256 = "1rhr3ibxj94gipdqq2ar1qkklpavs2yj53n3qrnfawhs2sih9kpd"; - libraryHaskellDepends = [ base containers validity ]; - description = "Validity instances for containers"; - license = stdenv.lib.licenses.mit; - }) {}; - - "validity-containers_0_5_0_3" = callPackage ({ mkDerivation, base, containers, validity }: mkDerivation { pname = "validity-containers"; @@ -256838,7 +257452,6 @@ self: { libraryHaskellDepends = [ base containers validity ]; description = "Validity instances for containers"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validity-path" = callPackage @@ -258492,7 +259105,7 @@ self: { version = "1.0"; sha256 = "0kzwp58lki3jvx09n6w8rc97idhy947xqik72p2fqjyigkymv04h"; libraryHaskellDepends = [ base mtl ]; - description = "Views allow you to run a State monad on part of a state"; + description = "Views allow you to run a State monad on part of a state."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -265199,7 +265812,7 @@ self: { revision = "1"; editedCabalFile = "1jszf2hdipr9iry6pcdhhk42aglcq6m3zvg9rgmnickfdzd4k71h"; libraryHaskellDepends = [ base containers time vector-space ]; - description = "Pure Haskell PostScript and SVG generation"; + description = "Pure Haskell PostScript and SVG generation."; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -266461,8 +267074,8 @@ self: { }: mkDerivation { pname = "xml-conduit-stylist"; - version = "1.2.0.0"; - sha256 = "140ydh4yzafdiksh149jxvbjsd4r7bvfdh620bawqwnnc5dpk01q"; + version = "2.1.0.0"; + sha256 = "0x33v7nc6swnizdmqmf2gxwr9afyrnra5kyywzp34hbawimd4apr"; libraryHaskellDepends = [ base containers css-syntax network-uri stylist text unordered-containers xml-conduit @@ -272411,6 +273024,30 @@ self: { broken = true; }) {}; + "zeolite-lang" = callPackage + ({ mkDerivation, base, containers, directory, filepath, hashable + , mtl, parsec, regex-tdfa, transformers, unix + }: + mkDerivation { + pname = "zeolite-lang"; + version = "0.1.2.9"; + sha256 = "1jyy54cpvcaarsxhglbcq9yjz24l6qfcfkinwj1lngz824mr0qgq"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base containers directory filepath hashable mtl parsec regex-tdfa + transformers unix + ]; + executableHaskellDepends = [ + base containers directory filepath unix + ]; + testHaskellDepends = [ base directory filepath ]; + doHaddock = false; + description = "Zeolite is a statically-typed, general-purpose programming language"; + license = stdenv.lib.licenses.asl20; + }) {}; + "zephyr" = callPackage ({ mkDerivation, aeson, ansi-terminal, ansi-wl-pprint, base , base-compat, boxes, bytestring, containers, directory, filepath @@ -273418,35 +274055,55 @@ self: { }) {}; "zre" = callPackage - ({ mkDerivation, async, attoparsec, base, binary, binary-strict - , bytestring, config-ini, containers, data-default, lifted-async - , monad-control, mtl, network, network-info, network-multicast - , optparse-applicative, process, random, repline, sockaddr, stm + ({ mkDerivation, async, attoparsec, base, binary, bytestring + , config-ini, containers, data-default, directory, filepath + , lifted-async, monad-control, mtl, network, network-bsd + , network-info, network-multicast, optparse-applicative, process + , QuickCheck, quickcheck-instances, random, repline, sockaddr, stm , text, time, transformers-base, uuid, zeromq4-haskell }: mkDerivation { pname = "zre"; - version = "0.1.0.1"; - sha256 = "0ddd7ppx8ivgrcvaj1d74vxjrgly8y5k5yr181dmi0z0jfkkkfx4"; + version = "0.1.0.2"; + sha256 = "09h1vsnm9p4yds8k4k7c5ixn8q6cikwkiw6wxf7srl9bbrwxhj9l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async attoparsec base binary binary-strict bytestring config-ini - containers data-default monad-control mtl network network-info - network-multicast optparse-applicative process random sockaddr stm - text time transformers-base uuid zeromq4-haskell + async attoparsec base binary bytestring config-ini containers + data-default directory filepath monad-control mtl network + network-bsd network-info network-multicast optparse-applicative + process random sockaddr stm text time transformers-base uuid + zeromq4-haskell ]; executableHaskellDepends = [ async base bytestring lifted-async monad-control mtl repline stm time ]; - testHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring QuickCheck quickcheck-instances uuid + ]; description = "ZRE protocol implementation"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; + "zsdd" = callPackage + ({ mkDerivation, base, containers, hashable, mtl, random + , unordered-containers + }: + mkDerivation { + pname = "zsdd"; + version = "0.1.0.0"; + sha256 = "0r6b1azxbkvnqa1ksw9hrk37cglv1lkhqaq16zkjnigzvgfilw8g"; + libraryHaskellDepends = [ + base containers hashable mtl unordered-containers + ]; + testHaskellDepends = [ base mtl random ]; + description = "Zero-suppressed decision diagrams"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "zsh-battery" = callPackage ({ mkDerivation, base, directory, filepath, mtl }: mkDerivation { -- cgit v1.2.3 From 89acd1a9d006e37ea92c40388c1e913cb1e36d51 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Apr 2020 13:39:53 +0200 Subject: haskell-email-validate: jailbreak for ghc-8.10.x to fix the build --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index f0d88415616..0e9f0c2b05e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -48,6 +48,7 @@ self: super: { # Jailbreak to fix the build. async = doJailbreak super.async; ChasingBottoms = doJailbreak super.ChasingBottoms; + email-validate = doJailbreak super.email-validate; # https://github.com/Porges/email-validate-hs/issues/51 hashable = doJailbreak super.hashable; pandoc = doJailbreak super.pandoc; parallel = doJailbreak super.parallel; -- cgit v1.2.3 From 8dd2b73d4d3b2b7b82f05a169397352c70f34d98 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Apr 2020 13:40:29 +0200 Subject: haskell-feed: jailbreak for ghc-8.10.x to fix the build --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 0e9f0c2b05e..34f1ee81ca2 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -49,6 +49,7 @@ self: super: { async = doJailbreak super.async; ChasingBottoms = doJailbreak super.ChasingBottoms; email-validate = doJailbreak super.email-validate; # https://github.com/Porges/email-validate-hs/issues/51 + feed = doJailbreak super.feed; # https://github.com/bergmark/feed/issues/48 hashable = doJailbreak super.hashable; pandoc = doJailbreak super.pandoc; parallel = doJailbreak super.parallel; -- cgit v1.2.3 From 60f6da9ae1e20ef22961fab2f5c8f5578d62ebb8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 27 Apr 2020 13:41:35 +0200 Subject: haskell-tasty-rerun: jailbreak for ghc-8.10.x to fix the build --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 34f1ee81ca2..e58ebf2a528 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -62,6 +62,7 @@ self: super: { system-fileio = doJailbreak super.system-fileio; tar = doJailbreak super.tar; tasty-expected-failure = doJailbreak super.tasty-expected-failure; + tasty-rerun = doJailbreak super.tasty-rerun; # https://github.com/ocharles/tasty-rerun/issues/18 unliftio-core = doJailbreak super.unliftio-core; vector = doJailbreak super.vector; zlib = doJailbreak super.zlib; -- cgit v1.2.3 From 402b437c4ad106e6e9c32d93ebe7fef79ecface7 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Mon, 27 Apr 2020 19:12:05 +0200 Subject: darcs: patches integrated upstream (in 2.14.3) See http://bugs.darcs.net/issue2642. --- pkgs/development/haskell-modules/configuration-common.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 6bbff47b645..4f2e5c2327e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -45,12 +45,6 @@ self: super: { # Needs older QuickCheck version attoparsec-varword = dontCheck super.attoparsec-varword; - # http://bugs.darcs.net/issue2642 - darcs = doJailbreak (appendPatches super.darcs [ - ./patches/darcs-setup.patch - ./patches/darcs-2.14.2-Compile-against-GHC-8.8.patch - ]); - # Tests are failing # https://github.com/bos/statistics/issues/123 statistics = dontCheck super.statistics; -- cgit v1.2.3 From b0c0ba6f816a65f34449a3ed013ea380e609c324 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 1 May 2020 21:04:02 +0200 Subject: haskell-ed25519: jailbreak to fix build with ghc-8.10.1 --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index e58ebf2a528..206577e3e8e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -48,6 +48,7 @@ self: super: { # Jailbreak to fix the build. async = doJailbreak super.async; ChasingBottoms = doJailbreak super.ChasingBottoms; + ed25519 = doJailbreak super.ed25519; email-validate = doJailbreak super.email-validate; # https://github.com/Porges/email-validate-hs/issues/51 feed = doJailbreak super.feed; # https://github.com/bergmark/feed/issues/48 hashable = doJailbreak super.hashable; -- cgit v1.2.3 From c752d37efe1755bffc19d09fdf82d3c98a12e76e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 1 May 2020 21:22:22 +0200 Subject: cabal-install: patch the ghc-8.10.x build to succeed --- .../haskell-modules/configuration-ghc-8.10.x.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 206577e3e8e..61919055eb0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -42,6 +42,21 @@ self: super: { unix = null; xhtml = null; + # The proper 3.2.0.0 release does not compile with ghc-8.10.1, so we take the + # hitherto unreleased next version from the '3.2' branch of the upstream git + # repository for the time being. + cabal-install = assert super.cabal-install.version == "3.2.0.0"; + overrideCabal super.cabal-install (drv: { + postUnpack = "sourceRoot+=/cabal-install; echo source root reset to $sourceRoot"; + version = "3.2.0.0-git"; + editedCabalFile = null; + src = pkgs.fetchgit { + url = "git://github.com/haskell/cabal.git"; + rev = "9bd4cc0591616aeae78e17167338371a2542a475"; + sha256 = "005q1shh7vqgykkp72hhmswmrfpz761x0q0jqfnl3wqim4xd9dg0"; + }; + }); + # Deviate from Stackage LTS-15.x to fix the build. haddock-library = self.haddock-library_1_9_0; -- cgit v1.2.3 From 0c6e37e57cadd483595b558d2a56315b3dfe0495 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 1 May 2020 21:26:12 +0200 Subject: configuration-common.nix: cosmetic --- pkgs/development/haskell-modules/configuration-common.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4f2e5c2327e..2898cb0ce4d 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1511,7 +1511,8 @@ self: super: { }); # Depends on selective >= 0.4, but the default of selective is 0.3 - headed-megaparsec = super.headed-megaparsec.override { + headed-megaparsec = super.headed-megaparsec.override { selective = self.selective_0_4_1; }; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super -- cgit v1.2.3 From ff61b07bb1f50023e8634a172456b08e9f5d407d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 1 May 2020 21:34:09 +0200 Subject: all-cabal-hashes: update to Hackage at 2020-04-28T23:45:54Z --- pkgs/data/misc/hackage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index ca54d972ea1..3c1b436fe32 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/3e87a900a11faa97a8a068874c932f3172d0aa76.tar.gz"; - sha256 = "0cf35vics1211pr1g8a804zm3w4lsdacqkgw3hqk7wdrrbasb8ip"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/9d50cd974714cdcfdaabd089923b571a66bae55a.tar.gz"; + sha256 = "1hv4pxp47850l36ci2ywmc75c95fvdqr3swz9qymy25gd6rbfs9f"; } -- cgit v1.2.3 From 1d4449ccd58bfa74d11c706632c937dea950da4e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 1 May 2020 21:50:18 +0200 Subject: haskell-stack: update overrides for the new 2.3.1 version --- .../haskell-modules/configuration-common.nix | 31 +----- .../patches/stack-ghc882-support.patch | 104 --------------------- 2 files changed, 2 insertions(+), 133 deletions(-) delete mode 100644 pkgs/development/haskell-modules/patches/stack-ghc882-support.patch diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 2898cb0ce4d..b14c26c6947 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1067,35 +1067,8 @@ self: super: { # Generate shell completion. cabal2nix = generateOptparseApplicativeCompletion "cabal2nix" super.cabal2nix; - - stack = - let - stackWithOverrides = - super.stack.override { - # stack-2.1.3.1 requires pantry-0.2.0.0. - pantry = self.pantry_0_2_0_0; - }; - in - generateOptparseApplicativeCompletion - "stack" - (appendPatches stackWithOverrides [ - # This PR fixes stack up to be able to build with Cabal-3. This patch - # can probably be dropped when the next stack release is made after - # 2.1.3.1. - (pkgs.fetchpatch { - url = "https://github.com/commercialhaskell/stack/pull/5156.diff"; - sha256 = "0knk6f9fh1b4fxkhvx5gfrwclal4vi2va4zy34gpmwnjr7knf42y"; - excludes = [ - "snapshot-lts-12.yaml" - "snapshot-nightly.yaml" - "snapshot.yaml" - ]; - }) - # This patch fixes stack up to be able to build various GHC-8.8 changes. - # This can hopefully be dropped when the next stack release is made - # after 2.1.3.1 (assuming the next stack release uses GHC-8.8). - ./patches/stack-ghc882-support.patch - ]); + stack = generateOptparseApplicativeCompletion "stack" (super.stack.overrideScope (self: super: { http-download = self.http-download_0_2_0_0; })); + http-download_0_2_0_0 = dontCheck super.http-download_0_2_0_0; # musl fixes # dontCheck: use of non-standard strptime "%s" which musl doesn't support; only used in test diff --git a/pkgs/development/haskell-modules/patches/stack-ghc882-support.patch b/pkgs/development/haskell-modules/patches/stack-ghc882-support.patch deleted file mode 100644 index 0d906638e7f..00000000000 --- a/pkgs/development/haskell-modules/patches/stack-ghc882-support.patch +++ /dev/null @@ -1,104 +0,0 @@ -diff --git a/src/Stack/Coverage.hs b/src/Stack/Coverage.hs -index d95fa332..f80e121a 100644 ---- a/src/Stack/Coverage.hs -+++ b/src/Stack/Coverage.hs -@@ -235,7 +235,7 @@ generateHpcReportForTargets opts tixFiles targetNames = do - case nc of - CTest testName -> - liftM (pkgPath ) $ parseRelFile (T.unpack testName ++ "/" ++ T.unpack testName ++ ".tix") -- _ -> fail $ -+ _ -> liftIO $ fail $ - "Can't specify anything except test-suites as hpc report targets (" ++ - packageNameString name ++ - " is used with a non test-suite target)" -diff --git a/src/Stack/Package.hs b/src/Stack/Package.hs -index b69337ce..08eb9b9f 100644 ---- a/src/Stack/Package.hs -+++ b/src/Stack/Package.hs -@@ -463,7 +463,7 @@ makeObjectFilePathFromC - makeObjectFilePathFromC cabalDir namedComponent distDir cFilePath = do - relCFilePath <- stripProperPrefix cabalDir cFilePath - relOFilePath <- -- parseRelFile (replaceExtension (toFilePath relCFilePath) "o") -+ parseRelFile (System.FilePath.replaceExtension (toFilePath relCFilePath) "o") - return (componentOutputDir namedComponent distDir relOFilePath) - - -- | Make the global autogen dir if Cabal version is new enough. -diff --git a/src/Stack/Script.hs b/src/Stack/Script.hs -index c63c9f62..70257be1 100644 ---- a/src/Stack/Script.hs -+++ b/src/Stack/Script.hs -@@ -172,8 +172,8 @@ scriptCmd opts = do - - toExeName fp = - if osIsWindows -- then replaceExtension fp "exe" -- else dropExtension fp -+ then System.FilePath.replaceExtension fp "exe" -+ else System.FilePath.dropExtension fp - - getPackagesFromImports - :: FilePath -- ^ script filename -diff --git a/src/Stack/Setup.hs b/src/Stack/Setup.hs -index 8bbfc45c..5c5b028c 100644 ---- a/src/Stack/Setup.hs -+++ b/src/Stack/Setup.hs -@@ -876,7 +876,7 @@ buildGhcFromSource getSetupInfo' installed (CompilerRepository url) commitId fla - (_,files) <- listDir (cwd bindistPath) - let - isBindist p = "ghc-" `isPrefixOf` (toFilePath (filename p)) -- && fileExtension (filename p) == ".xz" -+ && (maybe "" id (fileExtension (filename p))) == ".xz" - mbindist = filter isBindist files - case mbindist of - [bindist] -> do -diff --git a/src/Stack/Storage/Project.hs b/src/Stack/Storage/Project.hs -index dc5318d8..984e6259 100644 ---- a/src/Stack/Storage/Project.hs -+++ b/src/Stack/Storage/Project.hs -@@ -12,6 +12,9 @@ - {-# LANGUAGE UndecidableInstances #-} - {-# OPTIONS_GHC -Wno-unused-top-binds -Wno-identities #-} - -+{-# LANGUAGE DerivingStrategies #-} -+{-# LANGUAGE StandaloneDeriving #-} -+ - -- | Work with SQLite database used for caches across a single project. - module Stack.Storage.Project - ( initProjectStorage -diff --git a/src/Stack/Storage/User.hs b/src/Stack/Storage/User.hs -index 3845b094..09695344 100644 ---- a/src/Stack/Storage/User.hs -+++ b/src/Stack/Storage/User.hs -@@ -12,6 +12,9 @@ - {-# LANGUAGE UndecidableInstances #-} - {-# OPTIONS_GHC -Wno-unused-top-binds -Wno-identities #-} - -+{-# LANGUAGE DerivingStrategies #-} -+{-# LANGUAGE StandaloneDeriving #-} -+ - -- | Work with SQLite database used for caches across an entire user account. - module Stack.Storage.User - ( initUserStorage -diff --git a/src/Stack/Types/Config.hs b/src/Stack/Types/Config.hs -index a5cc22b5..a329d353 100644 ---- a/src/Stack/Types/Config.hs -+++ b/src/Stack/Types/Config.hs -@@ -406,7 +406,7 @@ instance FromJSON CabalConfigKey where - instance FromJSONKey CabalConfigKey where - fromJSONKey = FromJSONKeyTextParser parseCabalConfigKey - --parseCabalConfigKey :: Monad m => Text -> m CabalConfigKey -+parseCabalConfigKey :: MonadFail m => Text -> m CabalConfigKey - parseCabalConfigKey "$targets" = pure CCKTargets - parseCabalConfigKey "$locals" = pure CCKLocals - parseCabalConfigKey "$everything" = pure CCKEverything -@@ -974,7 +974,7 @@ parseConfigMonoidObject rootDir obj = do - - return ConfigMonoid {..} - where -- handleExplicitSetupDep :: Monad m => (Text, Bool) -> m (Maybe PackageName, Bool) -+ handleExplicitSetupDep :: MonadFail m => (Text, Bool) -> m (Maybe PackageName, Bool) - handleExplicitSetupDep (name', b) = do - name <- - if name' == "*" -- cgit v1.2.3 From 3b0717166262bfca73f84cb18dac15b7f1d03e76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 1 May 2020 15:24:50 -0500 Subject: Patchwork: 3.17.6 -> 3.17.7 --- pkgs/applications/networking/ssb/patchwork/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/ssb/patchwork/default.nix b/pkgs/applications/networking/ssb/patchwork/default.nix index c7766889f50..db33e7e6bb2 100644 --- a/pkgs/applications/networking/ssb/patchwork/default.nix +++ b/pkgs/applications/networking/ssb/patchwork/default.nix @@ -2,12 +2,12 @@ let pname = "ssb-patchwork"; - version = "3.17.6"; + version = "3.17.7"; name = "Patchwork-${version}"; src = fetchurl { url = "https://github.com/ssbc/patchwork/releases/download/v${version}/${name}.AppImage"; - sha256 = "0bq4pi0rmfsyiiapnhkkhikg2a2jzqlna4gvk6gw7wl0r8a111cs"; + sha256 = "1xj2aqy7daf4r3ypch6hkvk1s0jnx70qwh0p63c7rzm16vh8kb2f"; }; binary = appimageTools.wrapType2 { -- cgit v1.2.3 From d2cb49c248daad8decb0caa77a76aa09aec2d9de Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Fri, 1 May 2020 09:15:47 +0200 Subject: doc/php: Fix headline conflicts --- doc/languages-frameworks/php.section.md | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/doc/languages-frameworks/php.section.md b/doc/languages-frameworks/php.section.md index 101f7b043ff..30c05b3b614 100644 --- a/doc/languages-frameworks/php.section.md +++ b/doc/languages-frameworks/php.section.md @@ -1,10 +1,8 @@ -# PHP +# PHP {#sec-php} -## User Guide +## User Guide {#ssec-php-user-guide} -### Using PHP - -#### Overview +### Overview {#ssec-php-user-guide-overview} Several versions of PHP are available on Nix, each of which having a wide variety of extensions and libraries available. @@ -36,7 +34,7 @@ opcache extension shipped with PHP is available at `php.extensions.opcache` and the third-party ImageMagick extension at `php.extensions.imagick`. -#### Installing PHP with extensions +### Installing PHP with extensions {#ssec-php-user-guide-installing-with-extensions} A PHP package with specific extensions enabled can be built using `php.withExtensions`. This is a function which accepts an anonymous @@ -89,7 +87,7 @@ php.buildEnv { } ``` -##### Example setup for `phpfpm` +#### Example setup for `phpfpm` {#ssec-php-user-guide-installing-with-extensions-phpfpm} You can use the previous examples in a `phpfpm` pool called `foo` as follows: @@ -113,7 +111,7 @@ in { }; ``` -##### Example usage with `nix-shell` +#### Example usage with `nix-shell` {#ssec-php-user-guide-installing-with-extensions-nix-shell} This brings up a temporary environment that contains a PHP interpreter with the extensions `imagick` and `opcache` enabled: -- cgit v1.2.3 From e31a68ddba141e11f1569ae4d2cd0fb1a87fd5e4 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Fri, 1 May 2020 09:33:04 +0200 Subject: doc/php: Add example for installing composer with extra extensions --- doc/languages-frameworks/php.section.md | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/doc/languages-frameworks/php.section.md b/doc/languages-frameworks/php.section.md index 30c05b3b614..763beeb5935 100644 --- a/doc/languages-frameworks/php.section.md +++ b/doc/languages-frameworks/php.section.md @@ -62,7 +62,7 @@ To build your list of extensions from the ground up, you can simply ignore `enabled`: ```nix -php.withExtensions ({ all, ... }: with all; [ opcache imagick ]) +php.withExtensions ({ all, ... }: with all; [ imagick opcache ]) ``` `php.withExtensions` provides extensions by wrapping a minimal php @@ -94,7 +94,7 @@ follows: ```nix let - myPhp = php.withExtensions ({ all, ... }: with all; [ opcache imagick ]); + myPhp = php.withExtensions ({ all, ... }: with all; [ imagick opcache ]); in { services.phpfpm.pools."foo".phpPackage = myPhp; }; @@ -119,3 +119,19 @@ with the extensions `imagick` and `opcache` enabled: ```sh nix-shell -p 'php.withExtensions ({ all, ... }: with all; [ imagick opcache ])' ``` + +### Installing PHP packages with extensions {#ssec-php-user-guide-installing-packages-with-extensions} + +All interactive tools use the PHP package you get them from, so all +packages at `php.packages.*` use the `php` package with its default +extensions. Sometimes this default set of extensions isn't enough and +you may want to extend it. A common case of this is the `composer` +package: a project may depend on certain extensions and `composer` +won't work with that project unless those extensions are loaded. + +Example of building `composer` with additional extensions: +```nix +(php.withExtensions ({ all, enabled }: + enabled ++ (with all; [ imagick redis ])) +).packages.composer +``` -- cgit v1.2.3 From 47b57c4605bb9d81d65ecd34eabbe6b15198aff8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 1 May 2020 16:20:00 -0500 Subject: gopass: 1.8.6 -> 1.9.0 Changelog: https://github.com/gopasspw/gopass/releases/tag/v1.9.0 --- pkgs/tools/security/gopass/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index cb640fb1639..410b63ec7d7 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -1,10 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, git, gnupg, xclip, wl-clipboard, installShellFiles, makeWrapper }: +{ stdenv, buildGoModule, fetchFromGitHub, git, gnupg, xclip, wl-clipboard, installShellFiles, makeWrapper }: -buildGoPackage rec { +buildGoModule rec { pname = "gopass"; - version = "1.8.6"; - - goPackagePath = "github.com/gopasspw/gopass"; + version = "1.9.0"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -12,9 +10,13 @@ buildGoPackage rec { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "0v3sx9hb03bdn4rvsv2r0jzif6p1rx47hrkpsbnwva31k396mck2"; + sha256 = "1cssiglhxnrk1wl8phqkhmljqig5ms5a23sdzf8lywk5f6w2gayh"; }; + modSha256 = "01p3zv6dq1l68in1qqvlsh7i3ydhhanf54dyf7288x35js8wnmqa"; + + buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev}" ]; + wrapperPath = stdenv.lib.makeBinPath ([ git gnupg @@ -23,13 +25,13 @@ buildGoPackage rec { postInstall = '' for shell in bash fish zsh; do - $bin/bin/gopass completion $shell > gopass.$shell + $out/bin/gopass completion $shell > gopass.$shell installShellCompletion gopass.$shell done ''; postFixup = '' - wrapProgram $bin/bin/gopass \ + wrapProgram $out/bin/gopass \ --prefix PATH : "${wrapperPath}" ''; -- cgit v1.2.3 From 2af9e07c08504304e56df2b3a8852b3dc4d6bd62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 1 May 2020 23:44:15 +0100 Subject: herbstluftwm: remove glib no longer required, since it's C++ now. --- pkgs/applications/window-managers/herbstluftwm/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index 9ef7ab24e5e..47541a3fdb5 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional withDoc asciidoc; buildInputs = [ - glib libX11 libXext libXinerama -- cgit v1.2.3 From 3699d2d1dd38608f6efee5056d6800983b7ff693 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 1 May 2020 17:50:00 -0500 Subject: minio: 2020-03-25T07-03-04Z -> 2020-05-01T22-19-14Z --- pkgs/servers/minio/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 953cc9fb77c..237193692d7 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -2,21 +2,21 @@ buildGoModule rec { pname = "minio"; - version = "2020-03-25T07-03-04Z"; + version = "2020-05-01T22-19-14Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "0xdflc7pfx1misbh695x8kmqpysi5iydsarr9mwmjragf5b1kbl5"; + sha256 = "0yyq5j82rcl8yhn2jg8sjfxii6kzbrbmxvb05yiwv7p0q42ag5rn"; }; - modSha256 = "09kbibsfa7qq55paqr7wcs4gpwk6g5pknc5fjssmd12nm2cji96k"; + modSha256 = "1g5vwllxpiy4qlfhn3v5k6sn4g4qpbv0hpg32y1vi2q342lag116"; subPackages = [ "." ]; buildFlagsArray = [''-ldflags= - -X github.com/minio/minio/cmd.Version=${version} + -s -w -X github.com/minio/minio/cmd.Version=${version} '']; meta = with stdenv.lib; { -- cgit v1.2.3 From 8ab6aee3fc4fa3d4f7e3041b7c2b0e9d49acba16 Mon Sep 17 00:00:00 2001 From: Marek Fajkus Date: Sat, 2 May 2020 01:06:25 +0200 Subject: elmPackages.elm-format: fix build Resolves issue from 7d30b4d1b57fc6fb11b0b34aea9fd313d40447d4 commit --- pkgs/development/compilers/elm/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix index 069769dbd5e..625d7adab41 100644 --- a/pkgs/development/compilers/elm/default.nix +++ b/pkgs/development/compilers/elm/default.nix @@ -39,7 +39,7 @@ let # Tests are failing after upgrade to ghc881. # Cause is probably just a minor change in stdout output # see https://github.com/avh4/elm-format/pull/640 - # doCheck = false; + doCheck = false; jailbreak = true; })); -- cgit v1.2.3 From 037ef70d5cbacc9850f5c52d19b16cc41cd5efae Mon Sep 17 00:00:00 2001 From: Lucas Savva Date: Sat, 2 May 2020 00:07:50 +0100 Subject: nixos/acme: fix incorrect example --- nixos/modules/security/acme.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 6c3b5fc50b6..a7411e5b184 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -250,7 +250,7 @@ in "example.com" = { webroot = "/var/www/challenges/"; email = "foo@example.com"; - extraDomains = { "www.example.com" = null; "foo.example.com" = "/var/www/foo/"; }; + extraDomains = { "www.example.com" = null; "foo.example.com" = null; }; }; "bar.example.com" = { webroot = "/var/www/challenges/"; -- cgit v1.2.3 From 33b36a08f9671f5f72c113e6a20300372a4b335b Mon Sep 17 00:00:00 2001 From: Poscat Date: Fri, 1 May 2020 22:08:46 +0800 Subject: vscode-extensions.justusadam.language-haskell: 2.6.0 -> 3.0.3 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 433371e079e..475d18e3ac7 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -76,8 +76,8 @@ in mktplcRef = { name = "language-haskell"; publisher = "justusadam"; - version = "2.6.0"; # see the note above - sha256 = "1891pg4x5qkh151pylvn93c4plqw6vgasa4g40jbma5xzq8pygr4"; + version = "3.0.3"; + sha256 = "1sg4g8h1gww4y67zix5f33v2gf121k2fcm6l1m7lygpkn40a8dsj"; }; meta = { license = stdenv.lib.licenses.bsd3; -- cgit v1.2.3 From bec1b62449d711a57966eef27486f76c426ebf4a Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 22 Apr 2020 14:58:31 -0700 Subject: python3Packages.azure: 4.0.0 -> 5.0.0 --- pkgs/development/python-modules/azure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure/default.nix b/pkgs/development/python-modules/azure/default.nix index 0a2e733ea1a..c7e71d52528 100644 --- a/pkgs/development/python-modules/azure/default.nix +++ b/pkgs/development/python-modules/azure/default.nix @@ -9,13 +9,13 @@ }: buildPythonPackage rec { - version = "4.0.0"; + version = "5.0.0"; pname = "azure"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "7d6afa332fccffe1a9390bcfac5122317eec657c6029f144d794603a81cd0e50"; + sha256 = "f56d22acaba0ce74b821fd3d012d18854f9d0b3662d5a3a9240b1bd587c96b23"; }; propagatedBuildInputs = [ dateutil pyopenssl requests ] -- cgit v1.2.3 From b95f11c1329e2a67e72c868d85e1a8d8c3fb3fbe Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 22 Apr 2020 14:58:35 -0700 Subject: python3Packages.azure-identity: 1.3.0 -> 1.3.1 --- pkgs/development/python-modules/azure-identity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-identity/default.nix b/pkgs/development/python-modules/azure-identity/default.nix index 78fd7402098..d1baeb38032 100644 --- a/pkgs/development/python-modules/azure-identity/default.nix +++ b/pkgs/development/python-modules/azure-identity/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "azure-identity"; - version = "1.3.0"; + version = "1.3.1"; disabled = isPy38; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "17fa904e0447fd2a2dc19909379edb769b05656dbaf4863b8c4fdfb2bb54350c"; + sha256 = "5a59c36b4b05bdaec455c390feda71b6495fc828246593404351b9a41c2e877a"; }; propagatedBuildInputs = [ -- cgit v1.2.3 From a189cf3c063d2f8c54abac58b82d57616b1bea34 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 22 Apr 2020 17:22:38 -0700 Subject: azure-keyvault-certificates: init at 4.1.0 --- .../azure-keyvault-certificates/default.nix | 39 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/azure-keyvault-certificates/default.nix diff --git a/pkgs/development/python-modules/azure-keyvault-certificates/default.nix b/pkgs/development/python-modules/azure-keyvault-certificates/default.nix new file mode 100644 index 00000000000..1e4b8f09c55 --- /dev/null +++ b/pkgs/development/python-modules/azure-keyvault-certificates/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +, isPy3k +, azure-core +, msrest +, msrestazure +}: + +buildPythonPackage rec { + pname = "azure-keyvault-certificates"; + version = "4.1.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "069l6m80rq4smyqbrmjb2w18wxxg49xi2yrf1wsxpq8r0r45cksl"; + }; + + propagatedBuildInputs = [ + azure-core + msrest + msrestazure + ]; + + pythonNamespaces = [ "azure.keyvault" ]; + + # has no tests + doCheck = false; + pythonImportsCheck = [ "azure.keyvault.certificates" ]; + + meta = with lib; { + description = "Microsoft Azure Key Vault Certificates Client Library for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 88c41dacdfa..bde827aae27 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -310,6 +310,8 @@ in { azure-keyvault = callPackage ../development/python-modules/azure-keyvault { }; + azure-keyvault-certificates = callPackage ../development/python-modules/azure-keyvault-certificates { }; + azure-keyvault-keys = callPackage ../development/python-modules/azure-keyvault-keys { }; azure-keyvault-nspkg = callPackage ../development/python-modules/azure-keyvault-nspkg { }; -- cgit v1.2.3 From 5555b51a94b91f008c02ecc8427909a2b2ea5b6b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 22 Apr 2020 14:58:35 -0700 Subject: python3Packages.azure-keyvault: 4.0.0 -> 4.1.0 --- pkgs/development/python-modules/azure-keyvault/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-keyvault/default.nix b/pkgs/development/python-modules/azure-keyvault/default.nix index 035871ab937..f5b83df2664 100644 --- a/pkgs/development/python-modules/azure-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-keyvault/default.nix @@ -1,20 +1,22 @@ { lib, buildPythonPackage, isPy27, fetchPypi +, azure-keyvault-certificates , azure-keyvault-keys , azure-keyvault-secrets }: buildPythonPackage rec { pname = "azure-keyvault"; - version = "4.0.0"; + version = "4.1.0"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e85f5bd6cb4f10b3248b99bbf02e3acc6371d366846897027d4153f18025a2d7"; + sha256 = "69002a546921a8290eb54d9a3805cfc515c321bc1d4c0bfcfb463620245eca40"; }; propagatedBuildInputs = [ + azure-keyvault-certificates azure-keyvault-keys azure-keyvault-secrets ]; -- cgit v1.2.3 From eca49da84df3b4053f1d37ea7f26f4486ea873b8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 22 Apr 2020 14:58:36 -0700 Subject: python3Packages.azure-mgmt-advisor: 3.0.0 -> 4.0.0 --- pkgs/development/python-modules/azure-mgmt-advisor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-advisor/default.nix b/pkgs/development/python-modules/azure-mgmt-advisor/default.nix index 83ca8809fc2..f801d2a0593 100644 --- a/pkgs/development/python-modules/azure-mgmt-advisor/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-advisor/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-advisor"; - version = "3.0.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c52a4cf91d736c0ecdcb4d555e3b7713ff892343f610e7d65c63549edb98c221"; + sha256 = "1ecea7a9dc48c099c06aab68aace7fdbded91a5522932882b1707c29fa055054"; }; propagatedBuildInputs = [ -- cgit v1.2.3 From 761dbda8a0baf9dd23f82183a311a428bef3dde7 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 22 Apr 2020 14:58:36 -0700 Subject: python3Packages.azure-mgmt-apimanagement: 0.1.0 -> 0.2.0 --- pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix b/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix index 9f5c04adb26..759467aa902 100644 --- a/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.1.0"; + version = "0.2.0"; pname = "azure-mgmt-apimanagement"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "06bqqkn5mx127x1z7ycm6rl8ajxlrmrm2kcdpgkbl4baii1x6iax"; + sha256 = "790f01c0b32583706b8b8c59667c0f5a51cd70444eee76474e23a598911e1d72"; extension = "zip"; }; -- cgit v1.2.3 From acd84ec83a97e05f4f921e2dae60688a2dc82239 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 22 Apr 2020 14:58:36 -0700 Subject: python3Packages.azure-mgmt-applicationinsights: 0.2.0 -> 0.3.0 --- .../python-modules/azure-mgmt-applicationinsights/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix index 76a0d71b151..0208d082284 100644 --- a/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-applicationinsights/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-applicationinsights"; - version = "0.2.0"; + version = "0.3.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1hm6s7vym1y072jqypjgbhps8lza1d5kb8qcpyxnw4zsmsvshdp5"; + sha256 = "3c788a54db4fbca1a8850151462ec1471ff59c86b3a10d6082952bbdaa7e6651"; }; propagatedBuildInputs = [ -- cgit v1.2.3 From 84c1569aec17705acbd54ccd0205140229379330 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 22 Apr 2020 14:58:36 -0700 Subject: python3Packages.azure-mgmt-cognitiveservices: 6.0.0 -> 6.1.0 --- .../python-modules/azure-mgmt-cognitiveservices/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix index 2dadb1d2cb8..c1681476098 100644 --- a/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cognitiveservices"; - version = "6.0.0"; + version = "6.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "d03641336f4b2ec561112655c93ee80bc28d8e8daa45a57abc36169bd19c07a0"; + sha256 = "e0c4bbe656ababb942d708ee04f3f3305a2023e322a8b3fb1d8503aa682f59c4"; }; propagatedBuildInputs = [ -- cgit v1.2.3 From 43a1cb296c7141e7e45d9462130cba3c0c2a6d37 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 22 Apr 2020 14:58:36 -0700 Subject: python3Packages.azure-mgmt-containerservice: 9.0.0 -> 9.0.1 --- .../python-modules/azure-mgmt-containerservice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 20861a9efe3..d77d28479a1 100644 --- a/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "9.0.0"; + version = "9.0.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "6f05948bbd19ceb894f46f037b77c54116183364a671e180c007b5737c8d4590"; + sha256 = "7e4459679bdba4aa67a4b5848e63d94e965a304a7418ef7607eb7a9ce295d886"; }; propagatedBuildInputs = [ -- cgit v1.2.3 From d37e771f95070ba7aa5fc00fa4e1903025d4ffde Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 22 Apr 2020 14:58:37 -0700 Subject: python3Packages.azure-mgmt-cosmosdb: 0.12.0 -> 0.13.0 --- pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix index d3605e3929e..66c4e52e23b 100644 --- a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cosmosdb"; - version = "0.12.0"; + version = "0.13.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "07c0hr7nha9789x1wz0ndca0sr0zscq63m9vd8pm1c6y0ss4iyn5"; + sha256 = "e83d21462f9d5b02e90f5590c4247ab73e0ff85fc4ac1fba32be119a15b10c98"; }; propagatedBuildInputs = [ -- cgit v1.2.3 From 21c45cc7ff812e5ff66d9344f111d4cfaad1d6f3 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 22 Apr 2020 14:58:37 -0700 Subject: python3Packages.azure-mgmt-loganalytics: 0.2.0 -> 0.5.0 --- pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix index c149d5ef6fa..eb4772ce543 100644 --- a/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-loganalytics"; - version = "0.2.0"; + version = "0.5.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "c7315ff0ee4d618fb38dca68548ef4023a7a20ce00efe27eb2105a5426237d86"; + sha256 = "16f4c4f676ea718b7e1c59bd9a516fcfc796f1aff844b183a7ce9afe69fb214d"; }; propagatedBuildInputs = [ -- cgit v1.2.3 From 0e52e4194880cd35ebba02883a17ecfbc98bf39b Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 22 Apr 2020 14:58:37 -0700 Subject: python3Packages.azure-mgmt-netapp: 0.8.0 -> 0.10.0 --- pkgs/development/python-modules/azure-mgmt-netapp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix index 6bf207c6e4c..42ebac80e67 100644 --- a/pkgs/development/python-modules/azure-mgmt-netapp/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-netapp/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.8.0"; + version = "0.10.0"; pname = "azure-mgmt-netapp"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0vbg5mpahrnnnbj80flgzxxiffic94wsc9srm4ir85y2j5rprpv7"; + sha256 = "380b2153c52a861ae9069fcd601cbaeb9a6f91c49cba823443a9b5fe461c3998"; extension = "zip"; }; -- cgit v1.2.3 From 2fe106247c9ee7e074d017330c5435bf3b11cbcd Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 22 Apr 2020 14:58:37 -0700 Subject: python3Packages.azure-mgmt-network: 10.0.0 -> 10.1.0 --- pkgs/development/python-modules/azure-mgmt-network/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index 00480ac38bc..82aa1d6fa01 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "10.0.0"; + version = "10.1.0"; pname = "azure-mgmt-network"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "3978da4641b3396d4a00c7ddd53d87ece7e7d45b5bc41a157639bdd2f2c5b9b3"; + sha256 = "e5ac0ee14b71ab57035c45bef15d3698b0b6026ecafb8320a7c704eb3f6fba3a"; }; postInstall = if isPy3k then "" else '' -- cgit v1.2.3 From 655c8c6d31baf7ccaf2928d58d38f7a61035575d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 22 Apr 2020 14:58:37 -0700 Subject: python3Packages.azure-mgmt-recoveryservices: 0.4.0 -> 0.5.0 --- .../python-modules/azure-mgmt-recoveryservices/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix index 5747881fd4e..224f7971b35 100644 --- a/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-recoveryservices/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-recoveryservices"; - version = "0.4.0"; + version = "0.5.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e1e794760232239f8a9328d5de1740565ff70d1612a2921c9609746ba5671e6c"; + sha256 = "3c90e6b2e358dbe6d5c6d7204955bdf52c3e977c6f8b727cbbb8811427d7fd52"; }; propagatedBuildInputs = [ -- cgit v1.2.3 From 8ba7429ccd062d2d5d9aef16bbfdd8ed3fbe3ace Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 22 Apr 2020 14:58:37 -0700 Subject: python3Packages.azure-mgmt-web: 0.45.0 -> 0.46.0 --- pkgs/development/python-modules/azure-mgmt-web/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-web/default.nix b/pkgs/development/python-modules/azure-mgmt-web/default.nix index 3b25c93a1bd..48f7296d999 100644 --- a/pkgs/development/python-modules/azure-mgmt-web/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-web/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-web"; - version = "0.45.0"; + version = "0.46.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "04wdb7vksjhcvv0gkjjr37lmb5ads5pr00cjac8r3szimr64zspr"; + sha256 = "e1988aa2b91e6b5aa84e48ac02d5546945bdc2d8331744869e923ba15066c4a6"; }; propagatedBuildInputs = [ -- cgit v1.2.3 From 2209ef8be4e557e592f0d4730fdd1da8859e15b4 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 22 Apr 2020 15:51:43 -0700 Subject: python3Packages.msrestazure: 0.6.2 -> 0.6.3 --- pkgs/development/python-modules/msrestazure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msrestazure/default.nix b/pkgs/development/python-modules/msrestazure/default.nix index 04f7428e6b6..a97469e8073 100644 --- a/pkgs/development/python-modules/msrestazure/default.nix +++ b/pkgs/development/python-modules/msrestazure/default.nix @@ -12,7 +12,7 @@ }: buildPythonPackage rec { - version = "0.6.2"; + version = "0.6.3"; pname = "msrestazure"; # Pypi tarball doesnt include tests @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Azure"; repo = "msrestazure-for-python"; rev = "v${version}"; - sha256 = "09qwdg4la4jwp5ibypdwsn7h8m2sh8c1kdxvffyxcjan50h14s04"; + sha256 = "0pd3qw96c9fz4qgimnc0qf0pz7m9rr1wzhxj8m792swaf3pb18z8"; }; propagatedBuildInputs = [ adal msrest ]; -- cgit v1.2.3 From d17be33ecb28136907f180a9722a74e095bc5104 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 22 Apr 2020 15:52:11 -0700 Subject: python3Packages.msrest: 0.6.11 -> 0.6.13 --- pkgs/development/python-modules/msrest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/msrest/default.nix b/pkgs/development/python-modules/msrest/default.nix index 6f53314bd28..b415537106e 100644 --- a/pkgs/development/python-modules/msrest/default.nix +++ b/pkgs/development/python-modules/msrest/default.nix @@ -18,7 +18,7 @@ }: buildPythonPackage rec { - version = "0.6.11"; + version = "0.6.13"; pname = "msrest"; # no tests in PyPI tarball @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "Azure"; repo = "msrest-for-python"; rev = "v${version}"; - sha256 = "1lq3bf7kzs9h9sk6ahpf0vidklv0ahx3bm4wpv3qka3jb64yqdmi"; + sha256 = "1s34xp6wgas17mbg6ysciqlgb3qc2p2d5bs9brwr05ys62l6y8cz"; }; propagatedBuildInputs = [ -- cgit v1.2.3 From 5a89480b814421ba75c32678aed3beb7a974ef46 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 22 Apr 2020 16:02:15 -0700 Subject: python3Packages.azure-mgmt-core: init at 1.0.0 --- .../python-modules/azure-mgmt-core/default.nix | 36 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-core/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-core/default.nix b/pkgs/development/python-modules/azure-mgmt-core/default.nix new file mode 100644 index 00000000000..54b48427475 --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-core/default.nix @@ -0,0 +1,36 @@ +{ pkgs +, buildPythonPackage +, fetchPypi +, python +, azure-core +, isPy3k +}: + +buildPythonPackage rec { + version = "1.0.0"; + pname = "azure-mgmt-core"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "0pm565v05480f672l0n8z2sg6zk6iqyi91n0dhscibhdl54sy3si"; + }; + + propagatedBuildInputs = [ + azure-core + ]; + + pythonNamespaces = "azure.mgmt"; + + # not included + doCheck = false; + + pythonImportsCheck = [ "azure.mgmt.core" "azure.core" ]; + + meta = with pkgs.lib; { + description = "Microsoft Azure Management Core Library for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bde827aae27..4f23e9c4e90 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -378,6 +378,8 @@ in { azure-mgmt-containerservice = callPackage ../development/python-modules/azure-mgmt-containerservice { }; + azure-mgmt-core = callPackage ../development/python-modules/azure-mgmt-core { }; + azure-mgmt-cosmosdb = callPackage ../development/python-modules/azure-mgmt-cosmosdb { }; azure-mgmt-datafactory = callPackage ../development/python-modules/azure-mgmt-datafactory { }; -- cgit v1.2.3 From c33d81135ec049735b292b546a2e21ed65abb4fb Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 22 Apr 2020 17:01:31 -0700 Subject: python3Packages.azure-mgmt-redhatopenshift: init at 0.1.0 --- .../azure-mgmt-redhatopenshift/default.nix | 41 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix diff --git a/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix b/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix new file mode 100644 index 00000000000..323aa26472c --- /dev/null +++ b/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, python +, msrest +, msrestazure +, azure-common +, isPy27 +}: + +buildPythonPackage rec { + version = "0.1.0"; + pname = "azure-mgmt-redhatopenshift"; + disabled = isPy27; # don't feel like fixing namespace issues on python2 + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "1g65lbia1i1jw6qkyjz2ldyl3p90rbr78l8kfryg70sj7z3gnnjn"; + }; + + propagatedBuildInputs = [ + msrest + msrestazure + azure-common + ]; + + pythonNamespaces = "azure.mgmt"; + + # no included + doCheck = false; + + pythonImportsCheck = [ "azure.mgmt.redhatopenshift" ]; + + meta = with lib; { + description = "Microsoft Azure Red Hat Openshift Management Client Library for Python"; + homepage = "https://github.com/Azure/azure-sdk-for-python"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4f23e9c4e90..1fbdeadaf2a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -460,6 +460,8 @@ in { azure-mgmt-recoveryservicesbackup = callPackage ../development/python-modules/azure-mgmt-recoveryservicesbackup { }; + azure-mgmt-redhatopenshift = callPackage ../development/python-modules/azure-mgmt-redhatopenshift { }; + azure-mgmt-redis = callPackage ../development/python-modules/azure-mgmt-redis { }; azure-mgmt-relay = callPackage ../development/python-modules/azure-mgmt-relay { }; -- cgit v1.2.3 From 8083f705588517e7fb8a8a40aa8fd9f17e1f4040 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 22 Apr 2020 17:01:49 -0700 Subject: azure-cli: 2.2.0 -> 2.4.0 --- pkgs/tools/admin/azure-cli/default.nix | 8 +-- pkgs/tools/admin/azure-cli/python-packages.nix | 84 +++++++++++++++++--------- 2 files changed, 58 insertions(+), 34 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index 13fdf6dcd0d..f226a042420 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, python, fetchFromGitHub, installShellFiles }: let - version = "2.2.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "0bqkvx1gp4bhpjn5nrjc08lq8wldl1icrz6q1llaxgvqqmc8hcgp"; + sha256 = "1j0h75cxrxa5yrijr7jfip7q5qrddaaqapd90f0qp2r4k9qb0y41"; }; # put packages that needs to be overriden in the py package scope @@ -23,8 +23,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { substituteInPlace setup.py \ --replace "javaproperties==0.5.1" "javaproperties" \ --replace "pytz==2019.1" "pytz" \ - --replace "mock~=2.0" "mock" \ - --replace "azure-mgmt-reservations==0.3.1" "azure-mgmt-reservations~=0.3.1" + --replace "mock~=4.0" "mock" # remove namespace hacks # remove urllib3 because it was added as 'urllib3[secure]', which doesn't get handled well @@ -93,6 +92,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { azure-mgmt-rdbms azure-mgmt-recoveryservices azure-mgmt-recoveryservicesbackup + azure-mgmt-redhatopenshift azure-mgmt-redis azure-mgmt-relay azure-mgmt-reservations diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 3c598e67a71..b43b9bd2cb0 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -55,6 +55,7 @@ let argcomplete azure-common azure-cli-telemetry + azure-mgmt-core azure-mgmt-resource colorama humanfriendly @@ -63,6 +64,7 @@ let msrest msrestazure paramiko + pkginfo psutil pygments pyjwt @@ -111,20 +113,26 @@ let ''; }; - azure-batch = overrideAzureMgmtPackage super.azure-batch "8.0.0" "zip" - "1j8nibnics9vakhqiwnjv7bwril7mfyz1svcvvsrb9a4wbdd12wi"; + azure-batch = overrideAzureMgmtPackage super.azure-batch "9.0.0" "zip" + "112d73gxjqng348mcvi36ska6pxyg8qc3qswvhf5x4a0lr86zjj7"; + + azure-mgmt-apimanagement = overrideAzureMgmtPackage super.azure-mgmt-apimanagement "0.1.0" "zip" + "06bqqkn5mx127x1z7ycm6rl8ajxlrmrm2kcdpgkbl4baii1x6iax"; azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "0.4.0" "zip" "1b69rz9wm0jvc54vx3b7h633x8gags51xwxrkp6myar40jggxw6g"; - azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "2.0.0" "zip" - "19z0lpq6bpidlflwa263y51549xgcg4m040k872m7fmy7jm2xcbb"; + azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "2.2.0" "zip" + "1iz1pf28ajrzbq8nab1jbjbgfbv0g6ni036xayy6xylvga4l8czr"; + + azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "0.4.0" "zip" + "0v0ycyjnnx09jqf958hj2q6zfpsn80bxxm98jf59y8rj09v99rz1"; azure-mgmt-recoveryservicesbackup = overrideAzureMgmtPackage super.azure-mgmt-recoveryservicesbackup "0.6.0" "zip" "13s2k4jl8570bj6jkqzm0w29z29rl7h5i7czd3kr6vqar5wj9xjd"; - azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "8.0.1" "zip" - "0gngm7w17r5922ji11pnpa6gp5vh5z6la025v9cda6smsnx0fxx7"; + azure-mgmt-resource = overrideAzureMgmtPackage super.azure-mgmt-resource "9.0.0" "zip" + "00bmdbr7hdwb3ibr9sfbgbmmr6626qlz19cdi84d87rcisczf4nw"; azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "0.4.0" "zip" "1dn5585nsizszjivx6lp677ka0mrg0ayqgag4yzfdz9ml8mj1xl5"; @@ -132,14 +140,14 @@ let azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "5.0.0" "zip" "1m7v3rfkvmdgghrpz15fm8pvmmhi40lcwfxdm2kxh7mx01r5l906"; - azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "11.0.0" "zip" - "1dnlql4z9wawf8gc1v4rr386pifwcnx3ycr4gdccqwkgimgpsdg4"; + azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "12.0.0" "zip" + "0vzq93g2fpnij4rykkk3391xq2knhlbz87vhim4zvj8s45sx6z8q"; azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip" "12ai4qps73ivawh0yzvgb148ksx02r30pqlvfihx497j62gsi1cs"; - azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "8.1.0" "zip" - "07vpzhvi2946v5dn9cb2hkd1b9vj5c6zl32958bg2bxsjg9vvyi1"; + azure-mgmt-containerservice = overrideAzureMgmtPackage super.azure-mgmt-containerservice "9.0.1" "zip" + "11nqjpi9qypb0xvfy63l98q5m5jfv5iqx15mliksm96vkdkmji3y"; azure-mgmt-cosmosdb = overrideAzureMgmtPackage super.azure-mgmt-cosmosdb "0.12.0" "zip" "07c0hr7nha9789x1wz0ndca0sr0zscq63m9vd8pm1c6y0ss4iyn5"; @@ -150,11 +158,11 @@ let azure-mgmt-imagebuilder = overrideAzureMgmtPackage super.azure-mgmt-imagebuilder "0.2.1" "zip" "0mwlvy4x5nr3hsz7wdpdhpzwarzzwz4225bfpd68hr0pcjgzspky"; - azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "0.8.2" "zip" - "0w3w1d156rnkwjdarv3qvycklxr3z2j7lry7a3jfgj3ykzny12rq"; + azure-mgmt-iothub = overrideAzureMgmtPackage super.azure-mgmt-iothub "0.11.0" "zip" + "11887zf61ji1dh62czrsgxwz8idybw93m6iwahjy777jkdyviyzn"; - azure-mgmt-iotcentral = overrideAzureMgmtPackage super.azure-mgmt-iotcentral "2.0.0" "zip" - "1fql0j28d2r6slgabb7b438gdga513iskqh4al6c7dsmj1yzdzwa"; + azure-mgmt-iotcentral = overrideAzureMgmtPackage super.azure-mgmt-iotcentral "3.0.0" "zip" + "0iq04hvivq3fvg2lhax95gx0x35avk5hps42227z3qna5i2cznpn"; azure-mgmt-kusto = overrideAzureMgmtPackage super.azure-mgmt-kusto "0.3.0" "zip" "1pmcdgimd66h964a3d5m2j2fbydshcwhrk87wblhwhfl3xwbgf4y"; @@ -162,14 +170,17 @@ let azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "2.2.0" "zip" "15lpyv9z8ss47rjmg1wx5akh22p9br2vckaj7jk3639vi38ac5nl"; - azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.7.0" "zip" - "0cf4pknb5y2yz4jqwg7xm626zkfx8i8hqcr3dkvq21lrx7fz96r3"; + azure-mgmt-netapp = overrideAzureMgmtPackage super.azure-mgmt-netapp "0.8.0" "zip" + "0vbg5mpahrnnnbj80flgzxxiffic94wsc9srm4ir85y2j5rprpv7"; azure-mgmt-dns = overrideAzureMgmtPackage super.azure-mgmt-dns "2.1.0" "zip" "1l55py4fzzwhxlmnwa41gpmqk9v2ncc79w7zq11sm9a5ynrv2c1p"; - azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "9.0.0" "zip" - "12bsdbh37xiz42hvrp8ghszyqkiali3pk50x44f3aip12pgx6kix"; + azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "0.2.0" "zip" + "11kx4ck58nhhn9zf5vq0rqh7lfh2yj758s6ainrqyqadxvq5ycf7"; + + azure-mgmt-network = overrideAzureMgmtPackage super.azure-mgmt-network "10.1.0" "zip" + "0fmsdwzyn167lwh87yyadq1bdc4q6rfz3gj5bh1mgavi9ghhxb75"; azure-mgmt-media = overrideAzureMgmtPackage super.azure-mgmt-media "1.1.1" "zip" "16wk0ksycrscsn3n14qk4vvf7i567vq6f96lwf5dwbc81wx6n32x"; @@ -180,6 +191,9 @@ let azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "0.44.0" "zip" "05dqakhfi301k2jnvccxdkigqvwnf9xz858pqg9vsri3dq69f1rw"; + azure-mgmt-redhatopenshift = overrideAzureMgmtPackage super.azure-mgmt-redhatopenshift "0.1.0" "zip" + "1g65lbia1i1jw6qkyjz2ldyl3p90rbr78l8kfryg70sj7z3gnnjn"; + azure-mgmt-redis = overrideAzureMgmtPackage super.azure-mgmt-redis "7.0.0rc1" "zip" "086wk31wsl8dx14qpd0g1bly8i9a8fix007djlj9cybva2f2bk6k"; @@ -189,8 +203,8 @@ let azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "0.1.0" "zip" "1cb466722bs0ribrirb32kc299716pl0pwivz3jyn40dd78cwhhx"; - azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "0.17.0" "zip" - "1kp1wzcydgyc2mzkxigfv6rqzwzf3d0cnbqc6w7h907qbb4lw2r0"; + azure-mgmt-sql = overrideAzureMgmtPackage super.azure-mgmt-sql "0.18.0" "zip" + "0i9lnhcx85xccddvz1wdz5j0idm6sw2cn3066dww5993nmg0ijlr"; azure-mgmt-sqlvirtualmachine = overrideAzureMgmtPackage super.azure-mgmt-sqlvirtualmachine "0.5.0" "zip" "1b9am8raa17hxnz7d5pk2ix0309wsnhnchq1mi22icd728sl5adm"; @@ -204,17 +218,17 @@ let azure-mgmt-eventhub = overrideAzureMgmtPackage super.azure-mgmt-eventhub "3.0.0" "zip" "05c6isg13dslds94kv28v6navxj4bp4c5lsd9df0g3ndsxvpdrxp"; - azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "2.1.0" "zip" - "1ikv8b2h1r91fa0srz95ymn54qpqgb5a4faxwp4hf92r5h85c8j9"; + azure-mgmt-keyvault = overrideAzureMgmtPackage super.azure-mgmt-keyvault "2.2.0" "zip" + "1r5ww9ndya6sifafrbp4cr5iyyaww2ns7wrbqm6hc6aqxcpf30qq"; azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "4.1.0rc1" "zip" "00q5723gvc57kg2w1iyhfchp018skwd89ibrw23p7ngm2bb76g45"; - azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc9" "zip" - "060m4hqi1h5h53imj0vmpbzhqkwis7h91nwinpcvjs422figcv0i"; + azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc11" "zip" + "1ixh2wmrbm1v2xlrnmy1l513jpqch6b5vyh9x77flm649x1cff2q"; - azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "0.7.0" "zip" - "1pprvk5255b6brbw73g0g13zygwa7a2px5x08wy3153rqlzan5l2"; + azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "0.9.0" "zip" + "170jyr1qzwhv5ihyrsg5d8qzjylqmg31dscd31jzi4i7bwqf3sb8"; azure-mgmt-advisor = overrideAzureMgmtPackage super.azure-mgmt-advisor "2.0.1" "zip" "1wsfkprdrn22mwm24y2zlcms8ppp7jwq3s86r3ymbl29pbaxca8r"; @@ -225,14 +239,14 @@ let azure-mgmt-authorization = overrideAzureMgmtPackage super.azure-mgmt-authorization "0.52.0" "zip" "0357laxgldb7lvvws81r8xb6mrq9dwwnr1bnwdnyj4bw6p21i9hn"; - azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "8.0.0" "zip" - "0cxcdyy974ya1yi7s14sw54rwpc8qjngxr0jqb8vxki3528phrv3"; + azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "9.0.0" "zip" + "198r51av2rd1mr3q9j8jibhd14w0v8k59ipc3czsm4g1n44adgkl"; azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "0.4.0" "zip" "1x18grkjf2p2r1ihlwv607sna9yjvsr2jwnkjc55askrgrwx5jx2"; - azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "1.3.0" "zip" - "1r7isr7hzq2dv1idwwa9xxxgk8wh0ncka45r4rdcsl1p7kd2kqam"; + azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "1.4.0" "zip" + "0zmmfj7z1zrayjqwqybcn3bwm47d2ngyxm1g6fh2iw5c2f9czycv"; azure-graphrbac = super.azure-graphrbac.overrideAttrs(oldAttrs: rec { version = "0.60.0"; @@ -297,6 +311,16 @@ let ''; }); + knack = super.knack.overridePythonAttrs(oldAttrs: rec { + version = "0.7.0rc3"; + + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "1mazy5a3505wqa68fxq7h55m0vbmjygv2wbgmxmrrrgw3w84q5r7"; + }; + }); + }; }; in -- cgit v1.2.3 From 9d6d4f848be4d8f750647b7b1a765e13dc75216c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Tue, 28 Apr 2020 18:22:24 -0700 Subject: python3Packages.azure: remove, deprecated upstream https://github.com/Azure/azure-sdk-for-python/issues/10646 --- pkgs/development/python-modules/azure/default.nix | 39 ----------------------- pkgs/top-level/python-packages.nix | 2 -- 2 files changed, 41 deletions(-) delete mode 100644 pkgs/development/python-modules/azure/default.nix diff --git a/pkgs/development/python-modules/azure/default.nix b/pkgs/development/python-modules/azure/default.nix deleted file mode 100644 index c7e71d52528..00000000000 --- a/pkgs/development/python-modules/azure/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ pkgs -, buildPythonPackage -, fetchPypi -, dateutil -, futures -, pyopenssl -, requests -, isPy3k -}: - -buildPythonPackage rec { - version = "5.0.0"; - pname = "azure"; - - src = fetchPypi { - inherit pname version; - extension = "zip"; - sha256 = "f56d22acaba0ce74b821fd3d012d18854f9d0b3662d5a3a9240b1bd587c96b23"; - }; - - propagatedBuildInputs = [ dateutil pyopenssl requests ] - ++ pkgs.lib.optionals (!isPy3k) [ futures ]; - - # depends on futures for python 3 (not necissary) - patchPhase = if (!isPy3k) then "" else '' - sed -i -e "s/'futures'//" setup.py - ''; - - # tests are not packaged in pypi release - doCheck = false; - - meta = with pkgs.lib; { - description = "Microsoft Azure SDK for Python"; - homepage = "https://azure.microsoft.com/en-us/develop/python/"; - license = licenses.asl20; - maintainers = with maintainers; [ olcai ]; - broken = true; # this should propagate over 70 azure packages, many of which are not added yet - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1fbdeadaf2a..5548f8c75a7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -280,8 +280,6 @@ in { withPython = true; }); - azure = callPackage ../development/python-modules/azure { }; - azure-nspkg = callPackage ../development/python-modules/azure-nspkg { }; azure-common = callPackage ../development/python-modules/azure-common { }; -- cgit v1.2.3 From 5d24a598989918f03b11296899e17288e03222ad Mon Sep 17 00:00:00 2001 From: Roman Firment Date: Wed, 29 Apr 2020 23:32:04 +0200 Subject: vscode-extensions.ms-vscode.cpptools: 0.27.0 -> 0.27.1 Extension is now fetched from the Microsoft repository (instead of the marketplace). It also contains platform-specific binary dependencies. In the previous version they were fetched from the Microsoft website and additionally inserted to the final extension. Package supports Linux, but there is probably a way no make it work on OSX. --- pkgs/misc/vscode-extensions/cpptools/default.nix | 69 ++++++++---------------- 1 file changed, 23 insertions(+), 46 deletions(-) diff --git a/pkgs/misc/vscode-extensions/cpptools/default.nix b/pkgs/misc/vscode-extensions/cpptools/default.nix index 77cf28c552e..84919e07c5e 100644 --- a/pkgs/misc/vscode-extensions/cpptools/default.nix +++ b/pkgs/misc/vscode-extensions/cpptools/default.nix @@ -33,39 +33,6 @@ assert gdbUseFixed -> null != gdb; let gdbDefaultsTo = if gdbUseFixed then "${gdb}/bin/gdb" else "gdb"; - langComponentBinaries = stdenv.mkDerivation rec { - name = "cpptools-language-component-binaries"; - - src = fetchurl { - # Follow https://go.microsoft.com/fwlink/?linkid=2037608 - url = "https://download.visualstudio.microsoft.com/download/pr/fd05d7fd-b771-4746-9c54-b5b30afcd82e/1f443716d6156a265bf50cb6e53fa999/bin_linux.zip"; - sha256 = "198xnq709clibjmd8rrv0haniy2m3qvhn89hg9hpj6lvg9lsr7a4"; - }; - - sourceRoot = name; - - nativeBuildInputs = [ unzip ]; - - unpackPhase = '' - runHook preUnpack - unzip -d $name $src || true - runHook postUnpack - ''; - - installPhase = '' - runHook preInstall - mkdir -p "$out/bin" - cp -a -t "$out/bin" ./bin/* - runHook postInstall - ''; - - postFixup = '' - elfInterpreter="$(cat $NIX_CC/nix-support/dynamic-linker)" - patchelf --set-interpreter "$elfInterpreter" $out/bin/Microsoft.VSCode.CPP.Extension.linux - patchelf --set-interpreter "$elfInterpreter" $out/bin/Microsoft.VSCode.CPP.IntelliSense.Msvc.linux - chmod a+x $out/bin/Microsoft.VSCode.CPP.Extension.linux $out/bin/Microsoft.VSCode.CPP.IntelliSense.Msvc.linux - ''; - }; openDebugAD7Script = writeScript "OpenDebugAD7" '' #!${runtimeShell} @@ -79,24 +46,33 @@ let ''; in -vscode-utils.buildVscodeMarketplaceExtension { +vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "cpptools"; publisher = "ms-vscode"; - version = "0.27.0"; - sha256 = "06l25fjlcj0m7f7883afbh0x2ikgkqi768kv8y4qi1jc1gxndpm0"; + version = "0.27.1"; + }; + + vsix = fetchurl { + url = "https://github.com/microsoft/vscode-cpptools/releases/download/${mktplcRef.version}/cpptools-linux.vsix"; + sha256 = "1if43zis2cy32c6y1zsh0ih0y2kpdag0flkb795b3m5iwm38rjsq"; }; + unpackPhase = '' + unzip $src + cd extension + ''; + buildInputs = [ jq ]; postPatch = '' - mv ./package.json ./package_ori.json + mv ./package.json ./package_orig.json # 1. Add activation events so that the extension is functional. This listing is empty when unpacking the extension but is filled at runtime. # 2. Patch `package.json` so that nix's *gdb* is used as default value for `miDebuggerPath`. - cat ./package_ori.json | \ + cat ./package_orig.json | \ jq --slurpfile actEvts ${./package-activation-events.json} '(.activationEvents) = $actEvts[0]' | \ jq '(.contributes.debuggers[].configurationAttributes | .attach , .launch | .properties.miDebuggerPath | select(. != null) | select(.default == "/usr/bin/gdb") | .default) = "${gdbDefaultsTo}"' > \ ./package.json @@ -104,19 +80,20 @@ vscode-utils.buildVscodeMarketplaceExtension { # Prevent download/install of extensions touch "./install.lock" - # Move unused files out of the way. - mv ./debugAdapters/bin/OpenDebugAD7.exe.config ./debugAdapters/bin/OpenDebugAD7.exe.config.unused - - # Combining the language component binaries as part of our package. - find "${langComponentBinaries}/bin" -mindepth 1 -maxdepth 1 | xargs cp -p -t "./bin" - # Mono runtimes from nix package (used by generated `OpenDebugAD7`). - rm "./debugAdapters/OpenDebugAD7" + mv ./debugAdapters/OpenDebugAD7 ./debugAdapters/OpenDebugAD7_orig cp -p "${openDebugAD7Script}" "./debugAdapters/OpenDebugAD7" # Clang-format from nix package. - mkdir -p "./LLVM" + mv ./LLVM/ ./LLVM_orig + mkdir "./LLVM/" find "${clang-tools}" -mindepth 1 -maxdepth 1 | xargs ln -s -t "./LLVM" + + # Patching cpptools and cpptools-srv + elfInterpreter="$(cat $NIX_CC/nix-support/dynamic-linker)" + patchelf --set-interpreter "$elfInterpreter" ./bin/cpptools + patchelf --set-interpreter "$elfInterpreter" ./bin/cpptools-srv + chmod a+x ./bin/cpptools{-srv,} ''; meta = with stdenv.lib; { -- cgit v1.2.3 From 98762e7f5af1c4b87532619e92c2868afd484217 Mon Sep 17 00:00:00 2001 From: Pamplemousse Date: Wed, 22 Apr 2020 10:19:54 -0700 Subject: crowbar: init at unstable-2020-04-23 --- pkgs/tools/security/crowbar/default.nix | 42 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 44 insertions(+) create mode 100644 pkgs/tools/security/crowbar/default.nix diff --git a/pkgs/tools/security/crowbar/default.nix b/pkgs/tools/security/crowbar/default.nix new file mode 100644 index 00000000000..cd4e7db8718 --- /dev/null +++ b/pkgs/tools/security/crowbar/default.nix @@ -0,0 +1,42 @@ +{ fetchFromGitHub +, freerdp +, nmap +, openvpn +, python3Packages +, stdenv +, tigervnc +}: + +python3Packages.buildPythonApplication rec { + pname = "crowbar"; + version = "unstable-2020-04-23"; + + src = fetchFromGitHub { + owner = "galkan"; + repo = pname; + rev = "500d633ff5ddfcbc70eb6d0b4d2181e5b8d3c535"; + sha256 = "05m9vywr9976pc7il0ak8nl26mklzxlcqx0p8rlfyx1q766myqzf"; + }; + + propagatedBuildInputs = [ python3Packages.paramiko ]; + + patchPhase = '' + sed -i 's,/usr/bin/xfreerdp,${freerdp}/bin/xfreerdp,g' lib/main.py + sed -i 's,/usr/bin/vncviewer,${tigervnc}/bin/vncviewer,g' lib/main.py + sed -i 's,/usr/sbin/openvpn,${openvpn}/bin/openvpn,g' lib/main.py + + sed -i 's,/usr/bin/nmap,${nmap}/bin/nmap,g' lib/nmap.py + ''; + + # Sanity check + checkPhase = '' + $out/bin/crowbar --help > /dev/null + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/galkan/crowbar"; + description = "A brute forcing tool that can be used during penetration tests"; + license = licenses.mit; + maintainers = with maintainers; [ pamplemousse ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9dfec26c8b2..41f84902b3b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -873,6 +873,8 @@ in ctrtool = callPackage ../tools/archivers/ctrtool { }; + crowbar = callPackage ../tools/security/crowbar { }; + crumbs = callPackage ../applications/misc/crumbs { }; crc32c = callPackage ../development/libraries/crc32c { }; -- cgit v1.2.3 From 32341633786403a48138df03f6b8ebc2938366c0 Mon Sep 17 00:00:00 2001 From: Wulfsta Date: Sat, 25 Apr 2020 16:07:24 -0400 Subject: maintainers: add wulfsta --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 595d3c332c3..02114a9f004 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8269,6 +8269,12 @@ githubId = 483465; name = "Mateusz Wykurz"; }; + wulfsta = { + email = "wulfstawulfsta@gmail.com"; + github = "Wulfsta"; + githubId = 13378502; + name = "Wulfsta"; + }; wyvie = { email = "elijahrum@gmail.com"; github = "wyvie"; -- cgit v1.2.3 From 5dbc4f7fda6609d14a871e5dabb4c81c25cc9d91 Mon Sep 17 00:00:00 2001 From: Wulfsta Date: Sat, 25 Apr 2020 16:16:15 -0400 Subject: elmerfem: init at release-8.4 --- .../science/physics/elmerfem/default.nix | 49 ++++++++++++++++++++++ .../science/physics/elmerfem/fix-cmake.patch | 13 ++++++ pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/science/physics/elmerfem/default.nix create mode 100644 pkgs/applications/science/physics/elmerfem/fix-cmake.patch diff --git a/pkgs/applications/science/physics/elmerfem/default.nix b/pkgs/applications/science/physics/elmerfem/default.nix new file mode 100644 index 00000000000..642982830f7 --- /dev/null +++ b/pkgs/applications/science/physics/elmerfem/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchFromGitHub, cmake, git, gfortran, openmpi, blas, liblapack, qt4, qwt6_qt4, pkg-config }: + +stdenv.mkDerivation rec { + pname = "elmerfem"; + version = "8.4"; + + src = fetchFromGitHub { + owner = "elmercsc"; + repo = "elmerfem"; + rev = "release-${version}"; + sha256 = "0vk31lplxlng173q8jjcpbyj1gaf98jvkqjvi9077d1nslya7vpm"; + }; + + hardeningDisable = [ "format" ]; + + nativeBuildInputs = [ cmake pkg-config git ]; + buildInputs = [ gfortran openmpi blas liblapack qt4 qwt6_qt4 ]; + + preConfigure = '' + patchShebangs ./ + ''; + + storepath = placeholder "out"; + + cmakeFlags = [ + "-DELMER_INSTALL_LIB_DIR=${storepath}/lib" + "-DWITH_OpenMP:BOOLEAN=TRUE" + "-DWITH_MPI:BOOLEAN=TRUE" + "-DWITH_ELMERGUI:BOOLEAN=TRUE" + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_OpenGL_GL_PREFERENCE=GLVND" + ]; + + patches = [ + ./fix-cmake.patch + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://www.elmerfem.org/; + description = "A finite element software for multiphysical problems."; + platforms = platforms.unix; + maintainers = [ maintainers.wulfsta ]; + license = licenses.lgpl21; + }; + +} diff --git a/pkgs/applications/science/physics/elmerfem/fix-cmake.patch b/pkgs/applications/science/physics/elmerfem/fix-cmake.patch new file mode 100644 index 00000000000..098f6520733 --- /dev/null +++ b/pkgs/applications/science/physics/elmerfem/fix-cmake.patch @@ -0,0 +1,13 @@ +diff --exclude '*~' -ruN A/torch/CMakeLists.txt B/torch/CMakeLists.txt +--- A/fem/tests/CMakeLists.txt 2020-04-23 02:35:03.243388917 -0400 ++++ B/fem/tests/CMakeLists.txt 2018-12-19 20:18:40.671857320 -0400 +@@ -14,7 +14,7 @@ + SET(MESH2D_BIN "${CMAKE_BINARY_DIR}/meshgen2d/src/Mesh2D") + + MACRO(SUBDIRLIST result curdir depth) + set(glob_pattern "*") +- FOREACH(D RANGE 1 depth) ++ FOREACH(D RANGE 1 ${depth}) + FILE(GLOB children RELATIVE ${curdir} ${glob_pattern}) + FOREACH(child ${children}) + IF(IS_DIRECTORY ${curdir}/${child}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41f84902b3b..045eee89052 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24603,7 +24603,9 @@ in dcmtk = callPackage ../applications/science/medicine/dcmtk { }; - ### PHYSICS + ### SCIENCE/PHYSICS + + elmerfem = callPackage ../applications/science/physics/elmerfem {}; sacrifice = callPackage ../applications/science/physics/sacrifice {}; -- cgit v1.2.3 From 87dda35d90f34fdc72c82f2167aef96ad317e7eb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 02:11:25 +0000 Subject: atlantis: 0.11.1 -> 0.12.0 --- pkgs/applications/networking/cluster/atlantis/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/atlantis/default.nix b/pkgs/applications/networking/cluster/atlantis/default.nix index cb846060a3d..7d04595d3fe 100644 --- a/pkgs/applications/networking/cluster/atlantis/default.nix +++ b/pkgs/applications/networking/cluster/atlantis/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "atlantis"; - version = "0.11.1"; + version = "0.12.0"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; rev = "v${version}"; - sha256 = "1ylk6n13ln6yaq4nc4n7fm00wfiyqi2x33sca5avzsvd1b387kk6"; + sha256 = "16zz4xwpqipdmszbz93xxw31hbh7s8pfa9dm64ybyni7wc4lvdy6"; }; - modSha256 = "1bhplk3p780llpj9l0fwcyli74879968d6j582mvjwvf2winbqzq"; + modSha256 = "18f7cf61yn5jkji5a4v6xw6c7xl40nj32n5w34xmcmszzf64cwkn"; subPackages = [ "." ]; -- cgit v1.2.3 From e15186cba77ac3e361542bb737f12701fe62bbb4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 02:26:19 +0000 Subject: azure-storage-azcopy: 10.3.4 -> 10.4.3 --- pkgs/development/tools/azcopy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix index 328092feafc..87e732e8dc7 100644 --- a/pkgs/development/tools/azcopy/default.nix +++ b/pkgs/development/tools/azcopy/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "azure-storage-azcopy"; - version = "10.3.4"; + version = "10.4.3"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-storage-azcopy"; rev = version; - sha256 = "16pdvcgy1d5dfqk3as23j45rkwfrv232n384cj5wfz9qwijkcy5g"; + sha256 = "0yl7iznjyng1i3d994qrryllni702gga7h45sx8i3sgpy8544yjf"; }; subPackages = [ "." ]; - modSha256 = "07cy2zi7m2pkbfdcy659x4k5j2w60cmjy8kxv1dcii3dc6ls4bvb"; + modSha256 = "02c668bp1pfrd994lhg6z3hm1qg3530nk9aw1cahiwj549vxxfhm"; postInstall = '' ln -rs "$out/bin/azure-storage-azcopy" "$out/bin/azcopy" -- cgit v1.2.3 From a0aae69936742b5998ad4be9341675a18de7ac06 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 02:31:25 +0000 Subject: bats: 1.1.0 -> 1.2.0 --- pkgs/development/interpreters/bats/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix index 35672116ca0..07b84247ef2 100644 --- a/pkgs/development/interpreters/bats/default.nix +++ b/pkgs/development/interpreters/bats/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bats"; - version = "1.1.0"; + version = "1.2.0"; src = fetchzip { url = "https://github.com/bats-core/bats-core/archive/v${version}.tar.gz"; - sha256 = "1kkh0j2alql3xiyhw9wsvcc3xclv52g0ivgyk8h85q9fn3qdqakz"; + sha256 = "0f59zh4d4pa1a7ybs5zl6h0csbqqv11lbnq0jl1dgwm1s6p49bsq"; }; patchPhase = '' -- cgit v1.2.3 From a31a645f20d33abbecc5a02645c78a4914a4420a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 02:45:54 +0000 Subject: bfs: 1.6 -> 1.7 --- pkgs/tools/system/bfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix index 50146f0aad3..78e92e01c6e 100644 --- a/pkgs/tools/system/bfs/default.nix +++ b/pkgs/tools/system/bfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bfs"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { repo = "bfs"; owner = "tavianator"; rev = version; - sha256 = "0qrxd1vdz2crk7jf7cdda5bhm1f841hjvin7fn497wymwr5qyjah"; + sha256 = "1jkz99i10y6dwc4dyh2vp3p549jscgwjdp6x17mcw561bnam2287"; }; buildInputs = stdenv.lib.optionals stdenv.isLinux [ libcap acl ]; -- cgit v1.2.3 From 2869edcb51d177978a25a3bbe1f58cc53a6a8234 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 02:50:12 +0000 Subject: binaryen: 91 -> 93 --- pkgs/development/compilers/binaryen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index 023c567638f..3a03f633ff0 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -1,11 +1,11 @@ { stdenv, cmake, python3, fetchFromGitHub, emscriptenRev ? null, substituteAll }: let - defaultVersion = "91"; + defaultVersion = "93"; # Map from git revs to SHA256 hashes sha256s = { - version_91 = "1qsjqnzc5w9ny9v01bxkdvhh4kgbsia01x5vvac72m075v4mpgs4"; + version_93 = "15y3703ha6mxcq168br0wlydas5rq66msrcsd650zrjz0ndxwsfx"; "1.39.1" = "0ygm9m5322h4vfpf3j63q32qxk2l26yk62hh7dkb49j51zwl1y3y"; }; in -- cgit v1.2.3 From d7e1e8467ae7434b3362655ae5261408df6723bd Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 1 May 2020 22:22:22 -0500 Subject: minio-client: 2020-04-04T05-28-55Z -> 2020-04-25T00-43-23Z --- pkgs/tools/networking/minio-client/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 3bd03f38564..0649eb02172 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -2,22 +2,20 @@ buildGoModule rec { pname = "minio-client"; - version = "2020-04-04T05-28-55Z"; + version = "2020-04-25T00-43-23Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "09z28fq492d4l0089d1knq4zah9p2b212pkz777vznw9lzfqqip8"; + sha256 = "0ff2fyr3787zp0lpgbph064am33py2wzjikzmxd3zwp3y0dic770"; }; - modSha256 = "0cv824ar5ifsg93sylrfjmax6zqm5073y95hqqfcc1dfp0mv2ki3"; + modSha256 = "1bcz7jchfnglypr2md9hhqbvcbghic2yp6njdrx3m5nqhylypzfx"; subPackages = [ "." ]; - preBuild = '' - buildFlagsArray+=("-ldflags=-X github.com/minio/mc/cmd.Version=${version}") - ''; + buildFlagsArray = [ "-ldflags=-s -w -X github.com/minio/mc/cmd.Version=${version}" ]; meta = with stdenv.lib; { homepage = "https://github.com/minio/mc"; -- cgit v1.2.3 From ee69291cb422d678a59e84f04133813680b453b9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 04:01:19 +0000 Subject: broot: 0.13.5b -> 0.13.6 --- pkgs/tools/misc/broot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index 7ec0d533c0d..bf5d569bab4 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "0.13.5b"; + version = "0.13.6"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "0gcv9w79r9q3rzrdqiq9xgh68ya653sq84vzgf0fb154zmzjkxfv"; + sha256 = "08d0zddqqymxj1qcp8c78r7mpii1piy6awaf135jxhzwi775sqqv"; }; - cargoSha256 = "0534jykfnqs1gfnmijkpcf91ddpbggw7p25h4arci14lgd2wrmgd"; + cargoSha256 = "1cxvx51zkmhszmgwsi0aj469xz98v5nk79zvqfyma27gsnh8jczr"; nativeBuildInputs = [ installShellFiles ]; -- cgit v1.2.3 From 45f542970d2c596d60ae0054a31a9c9a1e253744 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 04:14:06 +0000 Subject: cargo-udeps: 0.1.10 -> 0.1.11 --- pkgs/development/tools/rust/cargo-udeps/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index ca347ca22de..a6089ffeac2 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.10"; + version = "0.1.11"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "1xmlpn4j5lhbzd9icb3nga5irfknmxfml9sn677d9z6fwfjfpa0l"; + sha256 = "1drz0slv33p4spm52sb5lnmpb83q8l7k3cvp0zcsinbjv8glvvnv"; }; - cargoSha256 = "1si95pdhbi6pa94gh9vip95n37im6kcfsgslpnibck2157pg4la6"; + cargoSha256 = "13ynab3s563n2xwkls7nmksis0ngx5klw9wc9bpnxgc5na9k84ll"; nativeBuildInputs = [ pkgconfig ]; -- cgit v1.2.3 From dd394109ba61d390c5bfbb932eefa2da30b8816e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 04:30:05 +0000 Subject: catcli: 0.5.13 -> 0.6.0 --- pkgs/tools/filesystems/catcli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/catcli/default.nix b/pkgs/tools/filesystems/catcli/default.nix index 4ac6c1d5b21..25de04467ef 100644 --- a/pkgs/tools/filesystems/catcli/default.nix +++ b/pkgs/tools/filesystems/catcli/default.nix @@ -7,13 +7,13 @@ buildPythonApplication rec { pname = "catcli"; - version = "0.5.13"; + version = "0.6.0"; src = fetchFromGitHub { owner = "deadc0de6"; repo = pname; rev = "v${version}"; - sha256 = "04mrkqmm2c8fhi1h1hddc4yh3dqhcvkmcwzhj0ggn34v7wavgb5i"; + sha256 = "0myhvflph4fayl2bg8m9a7prh5pcnvnb75p0jb4jpmbx7jyn7ihp"; }; propagatedBuildInputs = [ docopt anytree ]; -- cgit v1.2.3 From 0a07e153a084201cb55f5c08c03d812c20639789 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 04:35:55 +0000 Subject: ccls: 0.20190823.5 -> 0.20190823.6 --- pkgs/development/tools/misc/ccls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/ccls/default.nix b/pkgs/development/tools/misc/ccls/default.nix index cb5653583fd..ba57ef561f3 100644 --- a/pkgs/development/tools/misc/ccls/default.nix +++ b/pkgs/development/tools/misc/ccls/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "ccls"; - version = "0.20190823.5"; + version = "0.20190823.6"; src = fetchFromGitHub { owner = "MaskRay"; repo = "ccls"; rev = version; - sha256 = "0b2pkpzn576b92zcxpwchpkyw2fww6s69818rx4g9z34kzm35zy5"; + sha256 = "11h5nwk4qqshf3i8yr4bxpnvmidrhkzd0zxhf1xqv8cv6r08k47f"; }; nativeBuildInputs = [ cmake ]; -- cgit v1.2.3 From f45ff2a7f0c8649bf76b54134804a42f5058cd2a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 04:42:23 +0000 Subject: chafa: 1.4.0 -> 1.4.1 --- pkgs/tools/misc/chafa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/chafa/default.nix b/pkgs/tools/misc/chafa/default.nix index e63ad0e42af..9e1671aec9d 100644 --- a/pkgs/tools/misc/chafa/default.nix +++ b/pkgs/tools/misc/chafa/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec{ - version = "1.4.0"; + version = "1.4.1"; pname = "chafa"; src = fetchFromGitHub { owner = "hpjansson"; repo = "chafa"; rev = version; - sha256 = "0vf658dd9sb2d3yh65c8nals9z0z7rykqqigmxq2h92x2ysjbg6x"; + sha256 = "13vv2xmfh0dr949bh75448lidvzwxks6f1mjawdg1q8qwzxhzry4"; }; nativeBuildInputs = [ autoconf -- cgit v1.2.3 From e6691a40182ed21fbdcdd53a448f347cff58da8d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 04:51:58 +0000 Subject: checkstyle: 8.31 -> 8.32 --- pkgs/development/tools/analysis/checkstyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 539c2f7d191..3367588bb3b 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "8.31"; + version = "8.32"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "03dn07lissr2dkhi44wlkrbsby4zfvwai8gykc3xjgs46jy05rf8"; + sha256 = "18ahdphxfcfi2vghl11kmj089hyh9iawll3cwxrqsdqak0748ijs"; }; nativeBuildInputs = [ makeWrapper ]; -- cgit v1.2.3 From e7d3d3b51f0a476c630890511c46abca6e67f08a Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Thu, 30 Apr 2020 13:26:42 +0000 Subject: gst-plugins-bad: fix compilation with opencv 4.3 --- pkgs/development/libraries/gstreamer/bad/default.nix | 2 ++ pkgs/development/libraries/gstreamer/bad/opencv-4.3.patch | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 pkgs/development/libraries/gstreamer/bad/opencv-4.3.patch diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index d9bf86e0cf3..903ca661486 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -104,6 +104,8 @@ in stdenv.mkDerivation rec { sha256 = "0l1f6kqcl04q7w12a2b4qibcvjz6gqhs0csdv2wbvfd6zndpjm6p"; }) ./fix_pkgconfig_includedir.patch + # https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1235 + ./opencv-4.3.patch ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/bad/opencv-4.3.patch b/pkgs/development/libraries/gstreamer/bad/opencv-4.3.patch new file mode 100644 index 00000000000..55155d5c5e7 --- /dev/null +++ b/pkgs/development/libraries/gstreamer/bad/opencv-4.3.patch @@ -0,0 +1,13 @@ +diff --git a/ext/opencv/meson.build b/ext/opencv/meson.build +index f38b55d..05b142e 100644 +--- a/ext/opencv/meson.build ++++ b/ext/opencv/meson.build +@@ -65,7 +65,7 @@ if opencv_found + endif + endforeach + else +- opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.2.0'], required : false) ++ opencv_dep = dependency('opencv4', version : ['>= 4.0.0', '< 4.4.0'], required : false) + opencv_found = opencv_dep.found() + if opencv_found + foreach h : libopencv4_headers -- cgit v1.2.3 From 516d984343c64ed648290b7122b423c7f838743c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 05:03:06 +0000 Subject: circleci-cli: 0.1.6949 -> 0.1.7179 --- pkgs/development/tools/misc/circleci-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index fde1c68d34d..5b3b728ea98 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.6949"; + version = "0.1.7179"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "0r64m4lcm9w0rzi61rsi3sm719ydwiv5axxnikwhzmvkdz0rd7dq"; + sha256 = "0md6y2rnzhkpxc2pm3c46jrhwicrswy9qlr6a4mmvpjq1imj1hjq"; }; - modSha256 = "199ai38knp50mjjhddjd70qfwx63c69rf7ddw4hpzgx5cm5a04q2"; + modSha256 = "169d0mm52l6w6jln5ak6zkh97q65m9jpg3bm8qll6sfrmrnfncfi"; buildFlagsArray = [ "-ldflags=-s -w -X github.com/CircleCI-Public/circleci-cli/version.Version=${version}" ]; -- cgit v1.2.3 From 922a4c630ce74ec136218ddaa505033985d84bbc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 05:36:24 +0000 Subject: clightning: 0.8.1 -> 0.8.2 --- pkgs/applications/blockchains/clightning.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/clightning.nix b/pkgs/applications/blockchains/clightning.nix index 61765913464..371bf11064d 100644 --- a/pkgs/applications/blockchains/clightning.nix +++ b/pkgs/applications/blockchains/clightning.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "clightning"; - version = "0.8.1"; + version = "0.8.2"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "079d3yx7yr7qrilqgaayvn18lxl8h6a1gwwbsgm5xsyxj4vdlz7r"; + sha256 = "1w5l3r3pnhnwz3x7mjgd69cw9a18fpyjwj7kmfka7cf9hdgcwp9x"; }; enableParallelBuilding = true; -- cgit v1.2.3 From 9e94dd69d91fd5c2816194b3328cf92818b51ff5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 05:40:44 +0000 Subject: clojure-lsp: 20200412T033138 -> 20200413T141742 --- pkgs/development/tools/misc/clojure-lsp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/clojure-lsp/default.nix b/pkgs/development/tools/misc/clojure-lsp/default.nix index cd805069df5..a29af8b60eb 100644 --- a/pkgs/development/tools/misc/clojure-lsp/default.nix +++ b/pkgs/development/tools/misc/clojure-lsp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "clojure-lsp"; - version = "20200412T033138"; + version = "20200413T141742"; src = fetchurl { url = "https://github.com/snoe/clojure-lsp/releases/download/release-${version}/${pname}"; - sha256 = "19i6sikg5x5qzcbakzbiqbcy5q2srqk6ihpmb3l90n1p4jn4605c"; + sha256 = "0bgyl791l8qaja9p22p77llis39kgdm8x1djz1dm8iy6qn22hm1y"; }; dontUnpack = true; -- cgit v1.2.3 From 285bd2642bf66662c919e6d9fd91c28f82cb2a75 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Sat, 2 May 2020 13:14:14 +0900 Subject: directfb: fix build on 32-bit arm with glibc >= 2.28 --- pkgs/development/libraries/directfb/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/directfb/default.nix b/pkgs/development/libraries/directfb/default.nix index f7545bb03d5..d333b786665 100644 --- a/pkgs/development/libraries/directfb/default.nix +++ b/pkgs/development/libraries/directfb/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, perl, pkgconfig, flux, zlib +{ stdenv, lib, fetchFromGitHub, fetchpatch +, autoreconfHook, perl, pkgconfig, flux, zlib , libjpeg, freetype, libpng, giflib , enableX11 ? true, xorg , enableSDL ? true, SDL }: @@ -14,6 +15,16 @@ stdenv.mkDerivation rec { sha256 = "0bs3yzb7hy3mgydrj8ycg7pllrd2b6j0gxj596inyr7ihssr3i0y"; }; + patches = [ + # Fixes build in "davinci" with glibc >= 2.28 + # The "davinci" module is only enabled on 32-bit arm. + # https://github.com/deniskropp/DirectFB/pull/17 + (fetchpatch { + url = "https://github.com/deniskropp/DirectFB/commit/3a236241bbec3f15b012b6f0dbe94353d8094557.patch"; + sha256 = "0rj3gv0zlb225sqjz04p4yagy4xacf3210aa8vra8i1f0fv0w4kw"; + }) + ]; + nativeBuildInputs = [ autoreconfHook perl pkgconfig flux ]; buildInputs = [ zlib libjpeg freetype giflib libpng ] -- cgit v1.2.3 From 9669e54eecadbbfa969f209ee71a8ff6de25db7a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 05:45:34 +0000 Subject: cmake-format: 0.6.9 -> 0.6.10 --- pkgs/development/tools/cmake-format/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/cmake-format/default.nix b/pkgs/development/tools/cmake-format/default.nix index cdf15f3ad70..394dc7b2f51 100644 --- a/pkgs/development/tools/cmake-format/default.nix +++ b/pkgs/development/tools/cmake-format/default.nix @@ -10,12 +10,12 @@ buildPythonApplication rec { pname = "cmake-format"; - version = "0.6.9"; + version = "0.6.10"; src = fetchPypi { inherit version; pname = "cmake_format"; - sha256 = "082d7949gsk5v72ap7k4p3vgmc126a0bfm195xpi4lb6khpbzy5j"; + sha256 = "14ypplkjah4hcb1ad8978xip4vvzxy1nkysvyi1wn9b24cbfzw42"; }; propagatedBuildInputs = [ autopep8 flake8 jinja2 pylint pyyaml ]; -- cgit v1.2.3 From 6bee8a11e1511448f85333e747ec393ff1d46342 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 05:55:58 +0000 Subject: codeql: 2.1.0 -> 2.1.1 --- pkgs/development/tools/analysis/codeql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/codeql/default.nix b/pkgs/development/tools/analysis/codeql/default.nix index f722a155086..c6b97f21bde 100644 --- a/pkgs/development/tools/analysis/codeql/default.nix +++ b/pkgs/development/tools/analysis/codeql/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "codeql"; - version = "2.1.0"; + version = "2.1.1"; dontConfigure = true; dontBuild = true; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchzip { url = "https://github.com/github/codeql-cli-binaries/releases/download/v${version}/codeql.zip"; - sha256 = "1vp4f5kwmxc4j59cdzwj0jh0n4c05hkvssvv9ii6w88phzblzpjk"; + sha256 = "0yaxv89p5pdj1qymc5bnz0mphrypil9dnijvp3ml9hk1vxw6lfvb"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 970b146895a6288c42395b517b1d3dd04e533e14 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 06:01:53 +0000 Subject: conftest: 0.18.1 -> 0.18.2 --- pkgs/development/tools/conftest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index 133526c569a..2d7c2c03cea 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "conftest"; - version = "0.18.1"; + version = "0.18.2"; src = fetchFromGitHub { owner = "instrumenta"; repo = "conftest"; rev = "v${version}"; - sha256 = "0ial1zs5aqcwza813ny6zqn9ybq6ibrqjmaccwbbam1k9f5rplqv"; + sha256 = "15xzldcmnpfg1hd5zr5i7x2zjrgkwnp4nylxbn9kfic2dpjp1a38"; }; - modSha256 = "17j5fhgwfpyg9r7a5g9rmvkaz510xx9s4mbl1cmyzysvddc6f5wp"; + modSha256 = "0nwmxmh1pmism5r9zzghfrzizr1fbyc8d4jljrbzjjq1l449r2ja"; buildFlagsArray = '' -ldflags= -- cgit v1.2.3 From aeb1d0151874a25ef35bc230a7cebe1db8144b05 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 06:17:25 +0000 Subject: croc: 8.0.7 -> 8.0.9 --- pkgs/tools/networking/croc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index b4a74b62003..a0ee3803139 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "8.0.7"; + version = "8.0.9"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "06iwb2wm9wwcwl88rqhwbrky2ab0kbcyzmcv89vw533glknycw04"; + sha256 = "0kwpn1nv93f8swzc70j8srddqz7qb33pxc9nhqrd92jhcl4cc7iv"; }; - modSha256 = "1gjigbc9511h3qd12j9ypdnmb5ia4x9f2mk7mxasy9p2xkcfyhpg"; + modSha256 = "1wcnf3sd4hkfm38q2z03ixys1hbscay5rsac49ng4kabqjh7rxhg"; subPackages = [ "." ]; -- cgit v1.2.3 From d06395585fe8f9729600323f3976919f0ea072b6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 06:38:24 +0000 Subject: dbmate: 1.7.0 -> 1.8.0 --- pkgs/development/tools/database/dbmate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index 14673cb40c8..c710aeaa516 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dbmate"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "v${version}"; - sha256 = "0jvizj616rsh3aw9z3bijk7ixpbnqmm3xqmdxznjzqd46avr54c3"; + sha256 = "16grd03r41n0vj5fs7j6jk395zs2q0i878p9nh1ycicy64nzmxky"; }; - modSha256 = "12x3m5bjyx3blh5i51pd99phv73m96pmm6i3ir4vf2kms3viif9i"; + modSha256 = "1ky6cxpmw93nrk26vyrxz8kqa7247axzaxilm6ciypxf30ad0vdq"; meta = with stdenv.lib; { description = "Database migration tool"; -- cgit v1.2.3 From c5afe415a7365e1a56b82fd1ba7b9689c8923b9e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 06:42:59 +0000 Subject: ddgr: 1.8 -> 1.8.1 --- pkgs/applications/misc/ddgr/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/ddgr/default.nix b/pkgs/applications/misc/ddgr/default.nix index c4639150dd4..82730842bac 100644 --- a/pkgs/applications/misc/ddgr/default.nix +++ b/pkgs/applications/misc/ddgr/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, python3, installShellFiles }: stdenv.mkDerivation rec { - version = "1.8"; + version = "1.8.1"; pname = "ddgr"; src = fetchFromGitHub { owner = "jarun"; repo = "ddgr"; rev = "v${version}"; - sha256 = "1cyaindcg2vc3ij0p6b35inr01c6ys04izxsn1h70ixhsz46qg8z"; + sha256 = "0668wzh1gqin0xscy3fly9hz370n2ny175f3kya9bsld0x0jkd5p"; }; nativeBuildInputs = [ installShellFiles ]; @@ -17,11 +17,6 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" ]; - # Version 1.8 was released as 1.7 - postPatch = '' - substituteInPlace ddgr --replace "_VERSION_ = '1.7'" "_VERSION_ = '${version}'" - ''; - postInstall = '' installShellCompletion --bash --name ddgr.bash auto-completion/bash/ddgr-completion.bash installShellCompletion --fish auto-completion/fish/ddgr.fish -- cgit v1.2.3 From cc5d9976157c4e3df6ed6be49f07388770c1be36 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 06:54:35 +0000 Subject: dnsproxy: 0.24.0 -> 0.27.1 --- pkgs/tools/networking/dnsproxy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 6f57e981239..3877e6f0e1a 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.24.0"; + version = "0.27.1"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "1jwy2qi99ks6zcas6h1n0zq3b0k47036ayas0mprdips60azw0hg"; + sha256 = "0nsj75aw5dym1pzn18p6fzh17vcryz1xs4xly6ga79dkpyijr9j8"; }; - modSha256 = "0kba3jay6m9ir1pc7i833p7ylbs610g0lkp8kc3gm47xnxy7j4gz"; + modSha256 = "1m8565hkn981b6xld8jyrbxay48ww8lzr94kgakx0rg5548kd7v5"; meta = with stdenv.lib; { description = "Simple DNS proxy with DoH, DoT, and DNSCrypt support"; -- cgit v1.2.3 From 52ea351426d6b4230e0ec7575b5ce957c52692d6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 07:00:23 +0000 Subject: dolt: 0.15.2 -> 0.16.3 --- pkgs/servers/sql/dolt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index 6f7f81f2378..4015e2097ee 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "0.15.2"; + version = "0.16.3"; src = fetchFromGitHub { owner = "liquidata-inc"; repo = "dolt"; rev = "v${version}"; - sha256 = "0av21czfxpwy4y7n9x6hy6m2fliqcazjx7ww0rwm6kdwxipq1xsz"; + sha256 = "141wv5av7hms4wa3s4md7mnb77bbyn3854d7gj7fy6f6jvzghdny"; }; modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - modSha256 = "0c120gkkswg0cqvvhjkxvalr4fsjv81khwg0x0fm8fr6lipkfksn"; + modSha256 = "1fx830dif9cq2rvigdbqbc3vmmq01ywj9b095adbrwddvay8m8si"; meta = with lib; { description = "Relational database with version control and CLI a-la Git."; -- cgit v1.2.3 From 44dd05c5f9554cacc07887f5359010bbf6a48ca4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 07:05:39 +0000 Subject: drawio: 12.9.9 -> 13.0.3 --- pkgs/applications/graphics/drawio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index aa1ac0f2620..8281596374c 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "12.9.9"; + version = "13.0.3"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; - sha256 = "07lx99fd4vkgdhagshzawrh8ncbv19hvxjpzgd3yjdj0nalvmxin"; + sha256 = "104pfwipm8ch9xqlsz1gh18icr1p6i3n4c77bbdjakxcy4s5n7sg"; }; nativeBuildInputs = [ -- cgit v1.2.3 From f855e591929018eb7ad2e3532960b52d122a7f77 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 May 2020 09:33:06 +0200 Subject: Revert "openexr, imlbase: unbreak on macOS" To avoid merge conflict. This reverts commit 8532d16e3dd0d84bfa7bb9147eb42fa9dbbc6342. --- pkgs/development/libraries/ilmbase/default.nix | 3 --- pkgs/development/libraries/openexr/default.nix | 3 --- 2 files changed, 6 deletions(-) diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index 0244725177e..4ea16a59e8b 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -18,9 +18,6 @@ stdenv.mkDerivation rec { ./bootstrap ''; - # otherwise, the pkgconfig info for the libraries will not match the filenames - configureFlags = stdenv.lib.optionalString stdenv.isDarwin "--enable-namespaceversioning=no"; - depsBuildBuild = [ buildPackages.stdenv.cc ]; nativeBuildInputs = [ automake autoconf libtool which ]; diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index 81a5ab1db99..da8fb429465 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -42,9 +42,6 @@ stdenv.mkDerivation rec { ./bootstrap ''; - # otherwise, the pkgconfig info for the libraries will not match the filenames - configureFlags = stdenv.lib.optionalString stdenv.isDarwin "--enable-namespaceversioning=no"; - nativeBuildInputs = [ pkgconfig autoconf automake libtool ]; propagatedBuildInputs = [ ilmbase zlib ]; -- cgit v1.2.3 From 309711c4b4b665f47876f2a113d3872237467784 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 2 May 2020 09:38:08 +0200 Subject: Revert "nixos/gitlab-runner: support multiple services" Reverting because of merge conflict. Rebase the fix and submit again. This reverts commit 3853c2711126d2c1518514222d19be631b609bac. --- .../continuous-integration/gitlab-runner.nix | 540 ++++----------------- 1 file changed, 103 insertions(+), 437 deletions(-) diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix index 84f04a27641..bd4cf6a37ba 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -1,494 +1,160 @@ { config, lib, pkgs, ... }: + with lib; + let cfg = config.services.gitlab-runner; + configFile = + if (cfg.configFile == null) then + (pkgs.runCommand "config.toml" { + buildInputs = [ pkgs.remarshal ]; + preferLocalBuild = true; + } '' + remarshal -if json -of toml \ + < ${pkgs.writeText "config.json" (builtins.toJSON cfg.configOptions)} \ + > $out + '') + else + cfg.configFile; hasDocker = config.virtualisation.docker.enable; - hashedServices = with builtins; (mapAttrs' (name: service: nameValuePair - "${name}_${config.networking.hostName}_${ - substring 0 12 - (hashString "md5" (unsafeDiscardStringContext (toJSON service)))}" - service) - cfg.services); - configPath = "$HOME/.gitlab-runner/config.toml"; - configureScript = pkgs.writeShellScriptBin "gitlab-runner-configure" ( - if (cfg.configFile != null) then '' - mkdir -p $(dirname ${configPath}) - cp ${cfg.configFile} ${configPath} - # make config file readable by service - chown -R --reference=$HOME $(dirname ${configPath}) - '' else '' - export CONFIG_FILE=${configPath} - - mkdir -p $(dirname ${configPath}) - - # remove no longer existing services - gitlab-runner verify --delete - - # current and desired state - NEEDED_SERVICES=$(echo ${concatStringsSep " " (attrNames hashedServices)} | tr " " "\n") - REGISTERED_SERVICES=$(gitlab-runner list 2>&1 | grep 'Executor' | awk '{ print $1 }') - - # difference between current and desired state - NEW_SERVICES=$(grep -vxF -f <(echo "$REGISTERED_SERVICES") <(echo "$NEEDED_SERVICES") || true) - OLD_SERVICES=$(grep -vxF -f <(echo "$NEEDED_SERVICES") <(echo "$REGISTERED_SERVICES") || true) - - # register new services - ${concatStringsSep "\n" (mapAttrsToList (name: service: '' - if echo "$NEW_SERVICES" | grep -xq ${name}; then - bash -c ${escapeShellArg (concatStringsSep " \\\n " ([ - "set -a && source ${service.registrationConfigFile} &&" - "gitlab-runner register" - "--non-interactive" - "--name ${name}" - "--executor ${service.executor}" - "--limit ${toString service.limit}" - "--request-concurrency ${toString service.requestConcurrency}" - "--maximum-timeout ${toString service.maximumTimeout}" - ] ++ service.registrationFlags - ++ optional (service.buildsDir != null) - "--builds-dir ${service.buildsDir}" - ++ optional (service.preCloneScript != null) - "--pre-clone-script ${service.preCloneScript}" - ++ optional (service.preBuildScript != null) - "--pre-build-script ${service.preBuildScript}" - ++ optional (service.postBuildScript != null) - "--post-build-script ${service.postBuildScript}" - ++ optional (service.tagList != [ ]) - "--tag-list ${concatStringsSep "," service.tagList}" - ++ optional service.runUntagged - "--run-untagged" - ++ optional service.protected - "--access-level ref_protected" - ++ optional service.debugTraceDisabled - "--debug-trace-disabled" - ++ map (e: "--env ${escapeShellArg e}") (mapAttrsToList (name: value: "${name}=${value}") service.environmentVariables) - ++ optionals (service.executor == "docker") ( - assert ( - assertMsg (service.dockerImage != null) - "dockerImage option is required for docker executor (${name})"); - [ "--docker-image ${service.dockerImage}" ] - ++ optional service.dockerDisableCache - "--docker-disable-cache" - ++ optional service.dockerPrivileged - "--docker-privileged" - ++ map (v: "--docker-volumes ${escapeShellArg v}") service.dockerVolumes - ++ map (v: "--docker-extra-hosts ${escapeShellArg v}") service.dockerExtraHosts - ++ map (v: "--docker-allowed-images ${escapeShellArg v}") service.dockerAllowedImages - ++ map (v: "--docker-allowed-services ${escapeShellArg v}") service.dockerAllowedServices - ) - ))} && sleep 1 - fi - '') hashedServices)} - - # unregister old services - for NAME in $(echo "$OLD_SERVICES") - do - [ ! -z "$NAME" ] && gitlab-runner unregister \ - --name "$NAME" && sleep 1 - done - - # update global options - remarshal --if toml --of json ${configPath} \ - | jq -cM '.check_interval = ${toString cfg.checkInterval} | - .concurrent = ${toString cfg.concurrent}' \ - | remarshal --if json --of toml \ - | sponge ${configPath} - - # make config file readable by service - chown -R --reference=$HOME $(dirname ${configPath}) - ''); - startScript = pkgs.writeShellScriptBin "gitlab-runner-start" '' - export CONFIG_FILE=${configPath} - exec gitlab-runner run --working-directory $HOME - ''; in { options.services.gitlab-runner = { enable = mkEnableOption "Gitlab Runner"; + configFile = mkOption { - type = types.nullOr types.path; default = null; description = '' Configuration file for gitlab-runner. + Use this option in favor of configOptions to avoid placing CI tokens in the nix store. - takes precedence over . - and will be ignored too. + takes precedence over . - This option is deprecated, please use instead. - You can use and - - for settings not covered by this module. - ''; - }; - checkInterval = mkOption { - type = types.int; - default = 0; - example = literalExample "with lib; (length (attrNames config.services.gitlab-runner.services)) * 3"; - description = '' - Defines the interval length, in seconds, between new jobs check. - The default value is 3; - if set to 0 or lower, the default value will be used. - See runner documentation for more information. + Warning: Not using will potentially result in secrets + leaking into the WORLD-READABLE nix store. ''; + type = types.nullOr types.path; }; - concurrent = mkOption { - type = types.int; - default = 1; - example = literalExample "config.nix.maxJobs"; + + configOptions = mkOption { description = '' - Limits how many jobs globally can be run concurrently. - The most upper limit of jobs using all defined runners. - 0 does not mean unlimited. + Configuration for gitlab-runner + will take precedence over this option. + + Warning: all Configuration, especially CI token, will be stored in a + WORLD-READABLE file in the Nix Store. + + If you want to protect your CI token use instead. ''; + type = types.attrs; + example = { + concurrent = 2; + runners = [{ + name = "docker-nix-1.11"; + url = "https://CI/"; + token = "TOKEN"; + executor = "docker"; + builds_dir = ""; + docker = { + host = ""; + image = "nixos/nix:1.11"; + privileged = true; + disable_cache = true; + cache_dir = ""; + }; + }]; + }; }; + gracefulTermination = mkOption { - type = types.bool; default = false; + type = types.bool; description = '' - Finish all remaining jobs before stopping. - If not set gitlab-runner will stop immediatly without waiting - for jobs to finish, which will lead to failed builds. + Finish all remaining jobs before stopping, restarting or reconfiguring. + If not set gitlab-runner will stop immediatly without waiting for jobs to finish, + which will lead to failed builds. ''; }; + gracefulTimeout = mkOption { - type = types.str; default = "infinity"; + type = types.str; example = "5min 20s"; - description = '' - Time to wait until a graceful shutdown is turned into a forceful one. - ''; + description = ''Time to wait until a graceful shutdown is turned into a forceful one.''; + }; + + workDir = mkOption { + default = "/var/lib/gitlab-runner"; + type = types.path; + description = "The working directory used"; }; + package = mkOption { - type = types.package; + description = "Gitlab Runner package to use"; default = pkgs.gitlab-runner; defaultText = "pkgs.gitlab-runner"; + type = types.package; example = literalExample "pkgs.gitlab-runner_1_11"; - description = "Gitlab Runner package to use."; }; - extraPackages = mkOption { + + packages = mkOption { + default = [ pkgs.bash pkgs.docker-machine ]; + defaultText = "[ pkgs.bash pkgs.docker-machine ]"; type = types.listOf types.package; - default = [ ]; description = '' - Extra packages to add to PATH for the gitlab-runner process. + Packages to add to PATH for the gitlab-runner process. ''; }; - services = mkOption { - description = "GitLab Runner services."; - default = { }; - example = literalExample '' - { - # runner for building in docker via host's nix-daemon - # nix store will be readable in runner, might be insecure - nix = { - # File should contain at least these two variables: - # `CI_SERVER_URL` - # `REGISTRATION_TOKEN` - registrationConfigFile = "/run/secrets/gitlab-runner-registration"; - dockerImage = "alpine"; - dockerVolumes = [ - "/nix/store:/nix/store:ro" - "/nix/var/nix/db:/nix/var/nix/db:ro" - "/nix/var/nix/daemon-socket:/nix/var/nix/daemon-socket:ro" - ]; - dockerDisableCache = true; - preBuildScript = pkgs.writeScript "setup-container" ''' - mkdir -p -m 0755 /nix/var/log/nix/drvs - mkdir -p -m 0755 /nix/var/nix/gcroots - mkdir -p -m 0755 /nix/var/nix/profiles - mkdir -p -m 0755 /nix/var/nix/temproots - mkdir -p -m 0755 /nix/var/nix/userpool - mkdir -p -m 1777 /nix/var/nix/gcroots/per-user - mkdir -p -m 1777 /nix/var/nix/profiles/per-user - mkdir -p -m 0755 /nix/var/nix/profiles/per-user/root - mkdir -p -m 0700 "$HOME/.nix-defexpr" - - . ''${pkgs.nix}/etc/profile.d/nix.sh - ''${pkgs.nix}/bin/nix-env -i ''${concatStringsSep " " (with pkgs; [ nix cacert git openssh ])} - - ''${pkgs.nix}/bin/nix-channel --add https://nixos.org/channels/nixpkgs-unstable - ''${pkgs.nix}/bin/nix-channel --update nixpkgs - '''; - environmentVariables = { - ENV = "/etc/profile"; - USER = "root"; - NIX_REMOTE = "daemon"; - PATH = "/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/bin:/sbin:/usr/bin:/usr/sbin"; - NIX_SSL_CERT_FILE = "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt"; - }; - tagList = [ "nix" ]; - }; - # runner for building docker images - docker-images = { - # File should contain at least these two variables: - # `CI_SERVER_URL` - # `REGISTRATION_TOKEN` - registrationConfigFile = "/run/secrets/gitlab-runner-registration"; - dockerImage = "docker:stable"; - dockerVolumes = [ - "/var/run/docker.sock:/var/run/docker.sock" - ]; - tagList = [ "docker-images" ]; - }; - # runner for executing stuff on host system (very insecure!) - # make sure to add required packages (including git!) - # to `environment.systemPackages` - shell = { - # File should contain at least these two variables: - # `CI_SERVER_URL` - # `REGISTRATION_TOKEN` - registrationConfigFile = "/run/secrets/gitlab-runner-registration"; - executor = "shell"; - tagList = [ "shell" ]; - }; - # runner for everything else - default = { - # File should contain at least these two variables: - # `CI_SERVER_URL` - # `REGISTRATION_TOKEN` - registrationConfigFile = "/run/secrets/gitlab-runner-registration"; - dockerImage = "debian:stable"; - }; - } - ''; - type = types.attrsOf (types.submodule { - options = { - registrationConfigFile = mkOption { - type = types.path; - description = '' - Absolute path to a file with environment variables - used for gitlab-runner registration. - A list of all supported environment variables can be found in - gitlab-runner register --help. - - Ones that you probably want to set is - - CI_SERVER_URL=<CI server URL> - - REGISTRATION_TOKEN=<registration secret> - ''; - }; - registrationFlags = mkOption { - type = types.listOf types.str; - default = [ ]; - example = [ "--docker-helper-image my/gitlab-runner-helper" ]; - description = '' - Extra command-line flags passed to - gitlab-runner register. - Execute gitlab-runner register --help - for a list of supported flags. - ''; - }; - environmentVariables = mkOption { - type = types.attrsOf types.str; - default = { }; - example = { NAME = "value"; }; - description = '' - Custom environment variables injected to build environment. - For secrets you can use - with RUNNER_ENV variable set. - ''; - }; - executor = mkOption { - type = types.str; - default = "docker"; - description = '' - Select executor, eg. shell, docker, etc. - See runner documentation for more information. - ''; - }; - buildsDir = mkOption { - type = types.nullOr types.path; - default = null; - example = "/var/lib/gitlab-runner/builds"; - description = '' - Absolute path to a directory where builds will be stored - in context of selected executor (Locally, Docker, SSH). - ''; - }; - dockerImage = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Docker image to be used. - ''; - }; - dockerVolumes = mkOption { - type = types.listOf types.str; - default = [ ]; - example = [ "/var/run/docker.sock:/var/run/docker.sock" ]; - description = '' - Bind-mount a volume and create it - if it doesn't exist prior to mounting. - ''; - }; - dockerDisableCache = mkOption { - type = types.bool; - default = false; - description = '' - Disable all container caching. - ''; - }; - dockerPrivileged = mkOption { - type = types.bool; - default = false; - description = '' - Give extended privileges to container. - ''; - }; - dockerExtraHosts = mkOption { - type = types.listOf types.str; - default = [ ]; - example = [ "other-host:127.0.0.1" ]; - description = '' - Add a custom host-to-IP mapping. - ''; - }; - dockerAllowedImages = mkOption { - type = types.listOf types.str; - default = [ ]; - example = [ "ruby:*" "python:*" "php:*" "my.registry.tld:5000/*:*" ]; - description = '' - Whitelist allowed images. - ''; - }; - dockerAllowedServices = mkOption { - type = types.listOf types.str; - default = [ ]; - example = [ "postgres:9" "redis:*" "mysql:*" ]; - description = '' - Whitelist allowed services. - ''; - }; - preCloneScript = mkOption { - type = types.nullOr types.path; - default = null; - description = '' - Runner-specific command script executed before code is pulled. - ''; - }; - preBuildScript = mkOption { - type = types.nullOr types.path; - default = null; - description = '' - Runner-specific command script executed after code is pulled, - just before build executes. - ''; - }; - postBuildScript = mkOption { - type = types.nullOr types.path; - default = null; - description = '' - Runner-specific command script executed after code is pulled - and just after build executes. - ''; - }; - tagList = mkOption { - type = types.listOf types.str; - default = [ ]; - description = '' - Tag list. - ''; - }; - runUntagged = mkOption { - type = types.bool; - default = false; - description = '' - Register to run untagged builds; defaults to - true when is empty. - ''; - }; - limit = mkOption { - type = types.int; - default = 0; - description = '' - Limit how many jobs can be handled concurrently by this service. - 0 (default) simply means don't limit. - ''; - }; - requestConcurrency = mkOption { - type = types.int; - default = 0; - description = '' - Limit number of concurrent requests for new jobs from GitLab. - ''; - }; - maximumTimeout = mkOption { - type = types.int; - default = 0; - description = '' - What is the maximum timeout (in seconds) that will be set for - job when using this Runner. 0 (default) simply means don't limit. - ''; - }; - protected = mkOption { - type = types.bool; - default = false; - description = '' - When set to true Runner will only run on pipelines - triggered on protected branches. - ''; - }; - debugTraceDisabled = mkOption { - type = types.bool; - default = false; - description = '' - When set to true Runner will disable the possibility of - using the CI_DEBUG_TRACE feature. - ''; - }; - }; - }); - }; }; + config = mkIf cfg.enable { - warnings = optional (cfg.configFile != null) "services.gitlab-runner.`configFile` is deprecated, please use services.gitlab-runner.`services`."; - environment.systemPackages = [ cfg.package ]; systemd.services.gitlab-runner = { + path = cfg.packages; + environment = config.networking.proxy.envVars // { + # Gitlab runner will not start if the HOME variable is not set + HOME = cfg.workDir; + }; description = "Gitlab Runner"; - documentation = [ "https://docs.gitlab.com/runner/" ]; after = [ "network.target" ] ++ optional hasDocker "docker.service"; requires = optional hasDocker "docker.service"; wantedBy = [ "multi-user.target" ]; - environment = config.networking.proxy.envVars // { - HOME = "/var/lib/gitlab-runner"; - }; - path = with pkgs; [ - bash - gawk - jq - moreutils - remarshal - utillinux - cfg.package.bin - ] ++ cfg.extraPackages; reloadIfChanged = true; + restartTriggers = [ + config.environment.etc."gitlab-runner/config.toml".source + ]; serviceConfig = { - # Set `DynamicUser` under `systemd.services.gitlab-runner.serviceConfig` - # to `lib.mkForce false` in your configuration to run this service as root. - # You can also set `User` and `Group` options to run this service as desired user. - # Make sure to restart service or changes won't apply. - DynamicUser = true; StateDirectory = "gitlab-runner"; - SupplementaryGroups = optional hasDocker "docker"; - ExecStartPre = "!${configureScript}/bin/gitlab-runner-configure"; - ExecStart = "${startScript}/bin/gitlab-runner-start"; - ExecReload = "!${configureScript}/bin/gitlab-runner-configure"; - } // optionalAttrs (cfg.gracefulTermination) { + ExecReload= "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + ExecStart = ''${cfg.package.bin}/bin/gitlab-runner run \ + --working-directory ${cfg.workDir} \ + --config /etc/gitlab-runner/config.toml \ + --service gitlab-runner \ + --user gitlab-runner \ + ''; + + } // optionalAttrs (cfg.gracefulTermination) { TimeoutStopSec = "${cfg.gracefulTimeout}"; KillSignal = "SIGQUIT"; KillMode = "process"; }; }; - # Enable docker if `docker` executor is used in any service - virtualisation.docker.enable = mkIf ( - any (s: s.executor == "docker") (attrValues cfg.services) - ) (mkDefault true); + + # Make the gitlab-runner command availabe so users can query the runner + environment.systemPackages = [ cfg.package ]; + + # Make sure the config can be reloaded on change + environment.etc."gitlab-runner/config.toml".source = configFile; + + users.users.gitlab-runner = { + group = "gitlab-runner"; + extraGroups = optional hasDocker "docker"; + uid = config.ids.uids.gitlab-runner; + home = cfg.workDir; + createHome = true; + }; + + users.groups.gitlab-runner.gid = config.ids.gids.gitlab-runner; }; - imports = [ - (mkRenamedOptionModule [ "services" "gitlab-runner" "packages" ] [ "services" "gitlab-runner" "extraPackages" ] ) - (mkRemovedOptionModule [ "services" "gitlab-runner" "configOptions" ] "Use services.gitlab-runner.services option instead" ) - (mkRemovedOptionModule [ "services" "gitlab-runner" "workDir" ] "You should move contents of workDir (if any) to /var/lib/gitlab-runner" ) - ]; } -- cgit v1.2.3 From 68a53ade9da45beadf66ac53a222cad0913185af Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 2 May 2020 10:00:18 +0200 Subject: ndi: update from version 4.1.6 to 4.5.1 Related to https://github.com/NixOS/nixpkgs/issues/82617. --- pkgs/development/libraries/ndi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ndi/default.nix b/pkgs/development/libraries/ndi/default.nix index 7a4407a17f0..ec39bbd6593 100644 --- a/pkgs/development/libraries/ndi/default.nix +++ b/pkgs/development/libraries/ndi/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "ndi"; - fullVersion = "4.1.6"; + fullVersion = "4.5.1"; version = builtins.head (builtins.splitVersion fullVersion); src = requireFile rec { name = "InstallNDISDK_v${version}_Linux.tar.gz"; - sha256 = "0hki805j3hlci6w5ca2cajm5q0y9yihgvpsykkn8dzx8chw4pmsk"; + sha256 = "04l57cfc88cdqa9015h5g1csr7xfjxp75x8qz8bsqk1dizp9ir6r"; message = '' In order to use NDI SDK version ${fullVersion}, you need to comply with NewTek's license and download the appropriate Linux tarball from: -- cgit v1.2.3 From d3427273e954ac2ba4e0d9f2b2e67ae47d18b227 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 08:05:50 +0000 Subject: endless-sky: 0.9.11 -> 0.9.12 --- pkgs/games/endless-sky/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/games/endless-sky/default.nix index f0950cf4d34..76ab6542a7f 100644 --- a/pkgs/games/endless-sky/default.nix +++ b/pkgs/games/endless-sky/default.nix @@ -3,7 +3,7 @@ }: let - version = "0.9.11"; + version = "0.9.12"; in stdenv.mkDerivation { @@ -14,7 +14,7 @@ stdenv.mkDerivation { owner = "endless-sky"; repo = "endless-sky"; rev = "v${version}"; - sha256 = "0f4svg448bg8qx49f8fr8l4yzks7an6673jwgva15p3zzfxy6w03"; + sha256 = "1hly68ljm7yv01jfxyr7g6jivhj0igg6xx7vi92zqymick0hlh7a"; }; enableParallelBuilding = true; -- cgit v1.2.3 From 9f2ecb211d89a2d470c07845c1848ce04ab48cca Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Apr 2020 05:37:20 +0000 Subject: setools: 4.2.2 -> 4.3.0 --- pkgs/os-specific/linux/setools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/setools/default.nix b/pkgs/os-specific/linux/setools/default.nix index ae632c072cb..c0ed4102aaf 100644 --- a/pkgs/os-specific/linux/setools/default.nix +++ b/pkgs/os-specific/linux/setools/default.nix @@ -8,13 +8,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "setools"; - version = "4.2.2"; + version = "4.3.0"; src = fetchFromGitHub { owner = "SELinuxProject"; repo = pname; rev = version; - sha256 = "18kklv26dwm2fdjjzfflvxsq83b2svnwf4g18xq7wsfsri121a90"; + sha256 = "0vr20bi8w147z5lclqz1l0j1b34137zg2r04pkafkgqqk7qbyjk6"; }; nativeBuildInputs = [ cython ]; -- cgit v1.2.3 From 05fe7f36471e79fcd4e38b02de3589f7fe10205d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 Apr 2020 13:14:11 +0000 Subject: inadyn: 2.6 -> 2.7 --- pkgs/tools/networking/inadyn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index 9f7d79bdd88..2a551c56768 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "inadyn"; - version = "2.6"; + version = "2.7"; src = fetchFromGitHub { owner = "troglobit"; repo = "inadyn"; rev = "v${version}"; - sha256 = "013kxlglxliajv3lrsix4w88w40g709rvycajb6ad6gbh8giqv47"; + sha256 = "00jhayx0hfl9dw78d58bdxa5390bvxq73lz26q9h1gg1xw76adan"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; -- cgit v1.2.3 From bc74bdedaea4963f96c65a9e7110e6fe8376a89a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 8 Feb 2020 11:32:05 +0000 Subject: jetty: 9.4.25.v20191220 -> 9.4.26.v20200117 --- pkgs/servers/http/jetty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index 4a3a3f2da01..49c11bf462e 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jetty"; - version = "9.4.25.v20191220"; + version = "9.4.26.v20200117"; src = fetchurl { url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz"; name = "jetty-distribution-${version}.tar.gz"; - sha256 = "1jnx4hnvd2krsdisqwpws1qd1r0f8gm9a4sx4a8c7zqrmfd2zx1a"; + sha256 = "0wgh7vap0h6gkz6pk8iycvhwmybyxv25ssinwxxrnzk8jg25g89i"; }; phases = [ "unpackPhase" "installPhase" ]; -- cgit v1.2.3 From d0afae42987d159e950f96e35d71c23db406f845 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 Apr 2020 10:35:45 +0000 Subject: dcm2niix: 1.0.20190902 -> 1.0.20200331 --- pkgs/applications/science/biology/dcm2niix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/dcm2niix/default.nix b/pkgs/applications/science/biology/dcm2niix/default.nix index 8ea3588fa8c..59b173ac98c 100644 --- a/pkgs/applications/science/biology/dcm2niix/default.nix +++ b/pkgs/applications/science/biology/dcm2niix/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation rec { - version = "1.0.20190902"; + version = "1.0.20200331"; pname = "dcm2niix"; src = fetchFromGitHub { owner = "rordenlab"; repo = "dcm2niix"; rev = "v${version}"; - sha256 = "0h8jsadgv831lqb0jhnaxm7lldirmnp5agrhgg5bcxvn860fl15b"; + sha256 = "1cncfwhyhmg18n970lkn6yvp0i74ajznsl8dqz00asqfzmg681n1"; }; enableParallelBuilding = true; -- cgit v1.2.3 From 91a69a7345fd5ebc92ce72dce044c6beb37aa2b0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Mar 2020 12:13:22 +0000 Subject: openh264: 2.0.0 -> 2.1.0 --- pkgs/development/libraries/openh264/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openh264/default.nix b/pkgs/development/libraries/openh264/default.nix index fe46d25421a..e038bb7f66d 100644 --- a/pkgs/development/libraries/openh264/default.nix +++ b/pkgs/development/libraries/openh264/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openh264"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "cisco"; repo = pname; rev = "v${version}"; - sha256 = "0sa4n4xshmiiv6h767jjq9qxapxxjwwwm3bpcignkxv5xn5sls5r"; + sha256 = "1wba260n1932vafd5ni2jqv9kzc7lj6a1asm1cqk8jv690m6zvpi"; }; nativeBuildInputs = [ nasm ]; -- cgit v1.2.3 From 2099ca6782608074718789d418e4463c5d7d4449 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 26 Mar 2020 10:45:50 +0000 Subject: libndctl: 67 -> 68 --- pkgs/development/libraries/libndctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libndctl/default.nix b/pkgs/development/libraries/libndctl/default.nix index d4469d79f56..7a8d1877bc7 100644 --- a/pkgs/development/libraries/libndctl/default.nix +++ b/pkgs/development/libraries/libndctl/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libndctl"; - version = "67"; + version = "68"; src = fetchFromGitHub { owner = "pmem"; repo = "ndctl"; rev = "v${version}"; - sha256 = "076jgw1g2aafqgnq705in0wnabysqk46dq5yxdv1qzgjmyhka39n"; + sha256 = "0xmim7z4qp6x2ggndnbwd940c73pa1qlf3hxyn3qh5pyr69nh9y8"; }; outputs = [ "out" "lib" "man" "dev" ]; -- cgit v1.2.3 From a930faab93788702b70c72b9d1549844d8861c72 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 1 Apr 2020 15:46:17 +0000 Subject: mxnet: 1.4.1 -> 1.6.0 --- pkgs/applications/science/math/mxnet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/mxnet/default.nix b/pkgs/applications/science/math/mxnet/default.nix index 87d46850f14..b006a9dd18d 100644 --- a/pkgs/applications/science/math/mxnet/default.nix +++ b/pkgs/applications/science/math/mxnet/default.nix @@ -8,11 +8,11 @@ assert cudnnSupport -> cudaSupport; stdenv.mkDerivation rec { pname = "mxnet"; - version = "1.4.1"; + version = "1.6.0"; src = fetchurl { url = "https://github.com/apache/incubator-mxnet/releases/download/${version}/apache-mxnet-src-${version}-incubating.tar.gz"; - sha256 = "1d0lhlpdaxycjzpwwrpgjd3v2q2ka89v5rr13ddxayy7ld2hxiaj"; + sha256 = "1vvdb7pfh63kb9fzs6gqp95q550a3ck4cj9mqxlk9wwhkh30dsq1"; }; nativeBuildInputs = [ cmake perl ]; -- cgit v1.2.3 From 8007b2e4449aa757046aa9d163e210875b0cdb87 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 02:04:35 +0000 Subject: apulse: 0.1.12 -> 0.1.13 --- pkgs/misc/apulse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/apulse/default.nix b/pkgs/misc/apulse/default.nix index 273e358184d..33ba0bf8676 100644 --- a/pkgs/misc/apulse/default.nix +++ b/pkgs/misc/apulse/default.nix @@ -5,13 +5,13 @@ let oz = x: if x then "1" else "0"; in stdenv.mkDerivation rec { pname = "apulse"; - version = "0.1.12"; + version = "0.1.13"; src = fetchFromGitHub { owner = "i-rinat"; repo = pname; rev = "v${version}"; - sha256 = "0yk9vgb4aws8xnkhdhgpxp5c0rri8yq61yxk85j99j8ax806i3r8"; + sha256 = "1p6fh6ah5v3qz7dxhcsixx38bxg44ypbim4m03bxk3ls5i9xslmn"; }; enableParallelBuilding = true; -- cgit v1.2.3 From 2a962aecd60188b2c5095615ba01572e2542258d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 01:54:58 +0000 Subject: amass: 3.5.4 -> 3.5.5 --- pkgs/tools/networking/amass/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index 6398c4b91f1..be6d05ef426 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "amass"; - version = "3.5.4"; + version = "3.5.5"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "0sxcyrlgqajmlsicr4j2b8hq2fzw8ai1xsq176bz0f33q9m9wvhf"; + sha256 = "1w93ia9jr2afgkbaklx2rj0ccd0ghg1qbdg363aqqvyw40ccya1r"; }; - modSha256 = "1yjvwkm2zaf017lai5xl088x1z1ifwsbw56dagyf8z9jk9lhkcj7"; + modSha256 = "051fxfh7lwrj3hzsgr2c2ga6hksz56673lg35y36sz4d93yldj6f"; outputs = [ "out" "wordlists" ]; -- cgit v1.2.3 From b45e6f22f36115624b6b8661de00c6a96724a32f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 03:00:55 +0000 Subject: bitcoin-abc: 0.21.3 -> 0.21.5 --- pkgs/applications/blockchains/bitcoin-abc.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix index afc5b40f9db..aee73cecdfc 100644 --- a/pkgs/applications/blockchains/bitcoin-abc.nix +++ b/pkgs/applications/blockchains/bitcoin-abc.nix @@ -7,13 +7,13 @@ with stdenv.lib; mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version; - version = "0.21.3"; + version = "0.21.5"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - sha256 = "1pzdgghbsss2qjfgl42lvkbs5yc5q6jnzqnp24lljmrh341g2zn4"; + sha256 = "1jx33n8dhn16iaxvmc56cxw0i5qk0ga5nf7qf9frwwq6zkglknga"; }; patches = [ ./fix-bitcoin-qt-build.patch ]; -- cgit v1.2.3 From 1e16e652d85d9a6189fa2c824780e93d538d873c Mon Sep 17 00:00:00 2001 From: cmacrae Date: Sat, 2 May 2020 09:58:41 +0100 Subject: skhd: 0.3.0 -> 0.3.5 --- pkgs/os-specific/darwin/skhd/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/darwin/skhd/default.nix b/pkgs/os-specific/darwin/skhd/default.nix index f4a9991f8ee..d145c0d75d0 100644 --- a/pkgs/os-specific/darwin/skhd/default.nix +++ b/pkgs/os-specific/darwin/skhd/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "skhd"; - version = "0.3.0"; + version = "0.3.5"; src = fetchFromGitHub { owner = "koekeishiya"; - repo = "skhd"; + repo = pname; rev = "v${version}"; - sha256 = "13pqnassmzppy2ipv995rh8lzw9rraxvi0ph6zgy63cbsdfzbhgl"; + sha256 = "0x099979kgpim18r0vi9vd821qnv0rl3rkj0nd1nx3wljxgf7mrg"; }; buildInputs = [ Carbon ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "Simple hotkey daemon for macOS"; homepage = "https://github.com/koekeishiya/skhd"; platforms = platforms.darwin; - maintainers = with maintainers; [ lnl7 periklis ]; + maintainers = with maintainers; [ cmacrae lnl7 periklis ]; license = licenses.mit; }; } -- cgit v1.2.3 From fe9938ebd41dd486ca16a874a3bb9d4f2f4083aa Mon Sep 17 00:00:00 2001 From: cmacrae Date: Sat, 2 May 2020 09:36:09 +0100 Subject: yabai: 2.4.3 -> 3.0.0 --- pkgs/os-specific/darwin/yabai/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/yabai/default.nix b/pkgs/os-specific/darwin/yabai/default.nix index aa10a3a20f7..7103c7825cc 100644 --- a/pkgs/os-specific/darwin/yabai/default.nix +++ b/pkgs/os-specific/darwin/yabai/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "yabai"; - version = "2.4.3"; + version = "3.0.0"; src = fetchFromGitHub { owner = "koekeishiya"; repo = pname; rev = "v${version}"; - sha256 = "1a6pqms5kwdsvr9vcshfa000xf2f5a2qbp5qapx0b3wzclnchjbn"; + sha256 = "0ajsh85p2vx18h3s4nicasyhdbh82zg97b1ryhi6l5lkbjpdl4ah"; }; buildInputs = [ Carbon Cocoa ScriptingBridge ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = '' A tiling window manager for macOS based on binary space partitioning ''; - homepage = https://github.com/koekeishiya/yabai; + homepage = "https://github.com/koekeishiya/yabai"; platforms = platforms.darwin; maintainers = [ maintainers.cmacrae ]; license = licenses.mit; -- cgit v1.2.3 From c57532cf4ec4311bfde4014b1e1ac738e5fdb5f6 Mon Sep 17 00:00:00 2001 From: cmacrae Date: Sat, 2 May 2020 09:29:52 +0100 Subject: spacebar: init at v0.5.0 --- pkgs/os-specific/darwin/spacebar/default.nix | 30 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/os-specific/darwin/spacebar/default.nix diff --git a/pkgs/os-specific/darwin/spacebar/default.nix b/pkgs/os-specific/darwin/spacebar/default.nix new file mode 100644 index 00000000000..9cbd6e62c7a --- /dev/null +++ b/pkgs/os-specific/darwin/spacebar/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, Carbon, Cocoa, ScriptingBridge }: + +stdenv.mkDerivation rec { + pname = "spacebar"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "somdoron"; + repo = pname; + rev = "v${version}"; + sha256 = "0v8v4xsc67qpzm859r93ggq7rr7hmaj6dahdlg6g3ppj81cq0khz"; + }; + + buildInputs = [ Carbon Cocoa ScriptingBridge ]; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/share/man/man1/ + cp ./bin/spacebar $out/bin/spacebar + cp ./doc/spacebar.1 $out/share/man/man1/spacebar.1 + ''; + + meta = with stdenv.lib; { + description = "A status bar for yabai tiling window management"; + homepage = "https://github.com/somdoron/spacebar"; + platforms = platforms.darwin; + maintainers = [ maintainers.cmacrae ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 831aa2e45f0..99f20c4f23b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6702,6 +6702,11 @@ in sourceHighlight = callPackage ../tools/text/source-highlight { }; + spacebar = callPackage ../os-specific/darwin/spacebar { + inherit (darwin.apple_sdk.frameworks) + Carbon Cocoa ScriptingBridge; + }; + spaceFM = callPackage ../applications/misc/spacefm { }; speech-denoiser = callPackage ../applications/audio/speech-denoiser {}; -- cgit v1.2.3 From 163e5a8d0c9f07fe4b357533fccbdcf26cb97fa4 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 2 May 2020 14:30:56 -0400 Subject: linux: 4.14.177 -> 4.14.178 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 6c5d86a0e69..013893c1cdd 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.177"; + version = "4.14.178"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "04hq0i06mg2yc09jj2xk0vhf5q9yigzjzm55a5bvfy2a6j43r9rk"; + sha256 = "1pcqxmq9ir4f963aiw5bab9w2mp4vfiwaq2bk7nksbl2bs3k6b7x"; }; } // (args.argsOverride or {})) -- cgit v1.2.3 From 92c2abe85f027ce56ce999b5e7e4702f05b5d264 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 2 May 2020 14:31:42 -0400 Subject: linux: 4.19.119 -> 4.19.120 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index b3073ac1779..4edc8359c51 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.119"; + version = "4.19.120"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1klvdzz8sndg2zsr1anfy9p5fc1aapjqvc249myrbndyf55bk91b"; + sha256 = "03mjng5ws9y56id99619ysarz73qqyylgc3mlknga1yphbhh16qb"; }; } // (args.argsOverride or {})) -- cgit v1.2.3 From 7e200a0177a0d18dfe3d69a2f28bf1bdc78216a7 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 2 May 2020 14:32:18 -0400 Subject: linux: 4.4.220 -> 4.4.221 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index d846a015477..09b34e26a47 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.220"; + version = "4.4.221"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1knj3qsl7x3fysdz1h0s980ddbafs3658z2y67w6sn79wp7d8blg"; + sha256 = "06rpjnvrdp71flz948mfmx7jv8x2vmdg54zz1xpkb2458mwh5hbq"; }; } // (args.argsOverride or {})) -- cgit v1.2.3 From 13e51bb636f822d91e55e7af0b4328af8a556816 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 2 May 2020 14:32:45 -0400 Subject: linux: 4.9.220 -> 4.9.221 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index b05a3685c27..0db1d2908e3 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.220"; + version = "4.9.221"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0bhbkybzbdsbmrjmb5m7hxxl8b3v6n79zhh86cbr95kzg1hcgnfs"; + sha256 = "1gh1x73xblxkb927igc3shrqnn49lcscwrq2fixmk9n7jb7q2hp6"; }; } // (args.argsOverride or {})) -- cgit v1.2.3 From ba19c248b7b113bf72a5b5be130e1f655db5cc80 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 2 May 2020 14:33:35 -0400 Subject: linux: 5.4.36 -> 5.4.38 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 2672a239e3b..31d485877b7 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.36"; + version = "5.4.38"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "13avfvimjyg4lhj9micgib9bb5qpx11cja5liypid0rf2acfmymr"; + sha256 = "03pks3jx5kk0wnhjkm92wxdbgw8qbdg93sfwchnx88m2wfj9yaz7"; }; } // (args.argsOverride or {})) -- cgit v1.2.3 From c46b55e640054c889a17bd7528f9b9e419b8da87 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 2 May 2020 14:34:16 -0400 Subject: linux: 5.6.8 -> 5.6.10 --- pkgs/os-specific/linux/kernel/linux-5.6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.6.nix b/pkgs/os-specific/linux/kernel/linux-5.6.nix index c5bd84abf16..eb60cfd9497 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.6.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.6.8"; + version = "5.6.10"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1pw2q9509jzp84b6qasaais2ws25v2wrjh072q0x3j520zzl5q8r"; + sha256 = "1f81b0icn0r9gww95rckyxs5d4g8bwf4mmqkrmwxxf4xga19dp3v"; }; } // (args.argsOverride or {})) -- cgit v1.2.3 From 8a020156df480a4d155096f9a86c416b0df1936d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 2 May 2020 04:20:00 -0500 Subject: notmuch: fix info output --- pkgs/applications/networking/mailreaders/notmuch/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index d9ed62bb94d..f6bf60166ca 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--zshcompletiondir=${placeholder "out"}/share/zsh/site-functions" "--bashcompletiondir=${placeholder "out"}/share/bash-completion/completions" - "--infodir=${placeholder "info"}" + "--infodir=${placeholder "info"}/share/info" ] ++ optional (!withEmacs) "--without-emacs" ++ optional (withEmacs) "--emacslispdir=${placeholder "emacs"}/share/emacs/site-lisp" ++ optional (isNull ruby) "--without-ruby"; -- cgit v1.2.3 From 3253c03d2e6a38bfd35518b3273c99dccf41bc8a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 2 May 2020 04:20:00 -0500 Subject: lean: 3.9.0 -> 3.10.0 --- pkgs/applications/science/logic/lean/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 36df6ae0658..c80c163562b 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.9.0"; + version = "3.10.0"; src = fetchFromGitHub { owner = "leanprover-community"; repo = "lean"; rev = "v${version}"; - sha256 = "0sklw211cmqp4y0c6nycfavpdxdpfwhq9a4sbwdlqd5agyf85h1j"; + sha256 = "0nmh09x3scfqg0bg1qf8b7z67s11hbfd7kr1h6k1zw94fyn2mg8q"; }; nativeBuildInputs = [ cmake ]; -- cgit v1.2.3 From 1c54d144ce23275195e6a1da34ee9b8efa780dc5 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 2 May 2020 04:20:00 -0500 Subject: fluent-bit: 1.4.1 -> 1.4.3 --- pkgs/tools/misc/fluent-bit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 0933e6eae90..38f2145df44 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.4.1"; + version = "1.4.3"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "1xfbghaylzsh48ag4aw77nmzm1cds4nx53m4s1fiy0r31sm8vqwl"; + sha256 = "1x5izsm0b3514i2vl1b3x40chjlzidr5zssn5cpgrw9a8w4jpv6h"; }; nativeBuildInputs = [ cmake flex bison ]; -- cgit v1.2.3 From bb7b63ac0b45a8314fd752c6876ba6294fc67bc4 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 2 May 2020 04:20:00 -0500 Subject: nixosTests.minio: update minio-client command --- nixos/tests/minio.nix | 2 +- pkgs/servers/minio/default.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/tests/minio.nix b/nixos/tests/minio.nix index 3b061974267..02d1f7aa6c2 100644 --- a/nixos/tests/minio.nix +++ b/nixos/tests/minio.nix @@ -44,7 +44,7 @@ in { # Create a test bucket on the server machine.succeed( - "mc config host add minio http://localhost:9000 ${accessKey} ${secretKey} S3v4" + "mc config host add minio http://localhost:9000 ${accessKey} ${secretKey} --api s3v4" ) machine.succeed("mc mb minio/test-bucket") machine.succeed("${minioPythonScript}") diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 237193692d7..8b30d7dbbc8 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "minio"; @@ -19,6 +19,8 @@ buildGoModule rec { -s -w -X github.com/minio/minio/cmd.Version=${version} '']; + passthru.tests.minio = nixosTests.minio; + meta = with stdenv.lib; { homepage = "https://www.minio.io/"; description = "An S3-compatible object storage server"; -- cgit v1.2.3 From 727d9317fb465b2a9eb275a996bd449d118f2946 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 2 May 2020 11:46:37 +0200 Subject: bats: fixup readlink reference Using `readlink -f` requires coreutils, on platforms like darwin where this isn't the GNU variant by default it would fail outide of a nix-shell. --- pkgs/development/interpreters/bats/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix index 07b84247ef2..bbc38e51542 100644 --- a/pkgs/development/interpreters/bats/default.nix +++ b/pkgs/development/interpreters/bats/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, gnugrep }: +{ stdenv, fetchzip, coreutils, gnugrep }: stdenv.mkDerivation rec { pname = "bats"; @@ -11,7 +11,11 @@ stdenv.mkDerivation rec { patchPhase = '' patchShebangs ./install.sh - substituteInPlace ./libexec/bats-core/bats-format-tap-stream --replace grep ${gnugrep}/bin/grep + + substituteInPlace ./libexec/bats-core/bats \ + --replace 'type -p greadlink readlink' 'type -p ${coreutils}/bin/readlink' + substituteInPlace ./libexec/bats-core/bats-format-tap-stream \ + --replace grep ${gnugrep}/bin/grep ''; installPhase = "./install.sh $out"; -- cgit v1.2.3 From 0b0afcae166bb82a40eda3a95dc22239f7e68601 Mon Sep 17 00:00:00 2001 From: misuzu Date: Sat, 2 May 2020 12:14:18 +0300 Subject: nixos/gitlab-runner: support multiple services --- .../continuous-integration/gitlab-runner.nix | 540 +++++++++++++++++---- 1 file changed, 437 insertions(+), 103 deletions(-) diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix index cce4797e13f..eacfed85ddf 100644 --- a/nixos/modules/services/continuous-integration/gitlab-runner.nix +++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix @@ -1,160 +1,494 @@ { config, lib, pkgs, ... }: - with lib; - let cfg = config.services.gitlab-runner; - configFile = - if (cfg.configFile == null) then - (pkgs.runCommand "config.toml" { - buildInputs = [ pkgs.remarshal ]; - preferLocalBuild = true; - } '' - remarshal -if json -of toml \ - < ${pkgs.writeText "config.json" (builtins.toJSON cfg.configOptions)} \ - > $out - '') - else - cfg.configFile; hasDocker = config.virtualisation.docker.enable; + hashedServices = with builtins; (mapAttrs' (name: service: nameValuePair + "${name}_${config.networking.hostName}_${ + substring 0 12 + (hashString "md5" (unsafeDiscardStringContext (toJSON service)))}" + service) + cfg.services); + configPath = "$HOME/.gitlab-runner/config.toml"; + configureScript = pkgs.writeShellScriptBin "gitlab-runner-configure" ( + if (cfg.configFile != null) then '' + mkdir -p $(dirname ${configPath}) + cp ${cfg.configFile} ${configPath} + # make config file readable by service + chown -R --reference=$HOME $(dirname ${configPath}) + '' else '' + export CONFIG_FILE=${configPath} + + mkdir -p $(dirname ${configPath}) + + # remove no longer existing services + gitlab-runner verify --delete + + # current and desired state + NEEDED_SERVICES=$(echo ${concatStringsSep " " (attrNames hashedServices)} | tr " " "\n") + REGISTERED_SERVICES=$(gitlab-runner list 2>&1 | grep 'Executor' | awk '{ print $1 }') + + # difference between current and desired state + NEW_SERVICES=$(grep -vxF -f <(echo "$REGISTERED_SERVICES") <(echo "$NEEDED_SERVICES") || true) + OLD_SERVICES=$(grep -vxF -f <(echo "$NEEDED_SERVICES") <(echo "$REGISTERED_SERVICES") || true) + + # register new services + ${concatStringsSep "\n" (mapAttrsToList (name: service: '' + if echo "$NEW_SERVICES" | grep -xq ${name}; then + bash -c ${escapeShellArg (concatStringsSep " \\\n " ([ + "set -a && source ${service.registrationConfigFile} &&" + "gitlab-runner register" + "--non-interactive" + "--name ${name}" + "--executor ${service.executor}" + "--limit ${toString service.limit}" + "--request-concurrency ${toString service.requestConcurrency}" + "--maximum-timeout ${toString service.maximumTimeout}" + ] ++ service.registrationFlags + ++ optional (service.buildsDir != null) + "--builds-dir ${service.buildsDir}" + ++ optional (service.preCloneScript != null) + "--pre-clone-script ${service.preCloneScript}" + ++ optional (service.preBuildScript != null) + "--pre-build-script ${service.preBuildScript}" + ++ optional (service.postBuildScript != null) + "--post-build-script ${service.postBuildScript}" + ++ optional (service.tagList != [ ]) + "--tag-list ${concatStringsSep "," service.tagList}" + ++ optional service.runUntagged + "--run-untagged" + ++ optional service.protected + "--access-level ref_protected" + ++ optional service.debugTraceDisabled + "--debug-trace-disabled" + ++ map (e: "--env ${escapeShellArg e}") (mapAttrsToList (name: value: "${name}=${value}") service.environmentVariables) + ++ optionals (service.executor == "docker") ( + assert ( + assertMsg (service.dockerImage != null) + "dockerImage option is required for docker executor (${name})"); + [ "--docker-image ${service.dockerImage}" ] + ++ optional service.dockerDisableCache + "--docker-disable-cache" + ++ optional service.dockerPrivileged + "--docker-privileged" + ++ map (v: "--docker-volumes ${escapeShellArg v}") service.dockerVolumes + ++ map (v: "--docker-extra-hosts ${escapeShellArg v}") service.dockerExtraHosts + ++ map (v: "--docker-allowed-images ${escapeShellArg v}") service.dockerAllowedImages + ++ map (v: "--docker-allowed-services ${escapeShellArg v}") service.dockerAllowedServices + ) + ))} && sleep 1 + fi + '') hashedServices)} + + # unregister old services + for NAME in $(echo "$OLD_SERVICES") + do + [ ! -z "$NAME" ] && gitlab-runner unregister \ + --name "$NAME" && sleep 1 + done + + # update global options + remarshal --if toml --of json ${configPath} \ + | jq -cM '.check_interval = ${toString cfg.checkInterval} | + .concurrent = ${toString cfg.concurrent}' \ + | remarshal --if json --of toml \ + | sponge ${configPath} + + # make config file readable by service + chown -R --reference=$HOME $(dirname ${configPath}) + ''); + startScript = pkgs.writeShellScriptBin "gitlab-runner-start" '' + export CONFIG_FILE=${configPath} + exec gitlab-runner run --working-directory $HOME + ''; in { options.services.gitlab-runner = { enable = mkEnableOption "Gitlab Runner"; - configFile = mkOption { + type = types.nullOr types.path; default = null; description = '' Configuration file for gitlab-runner. - Use this option in favor of configOptions to avoid placing CI tokens in the nix store. - takes precedence over . + takes precedence over . + and will be ignored too. - Warning: Not using will potentially result in secrets - leaking into the WORLD-READABLE nix store. + This option is deprecated, please use instead. + You can use and + + for settings not covered by this module. ''; - type = types.nullOr types.path; }; - - configOptions = mkOption { + checkInterval = mkOption { + type = types.int; + default = 0; + example = literalExample "with lib; (length (attrNames config.services.gitlab-runner.services)) * 3"; description = '' - Configuration for gitlab-runner - will take precedence over this option. - - Warning: all Configuration, especially CI token, will be stored in a - WORLD-READABLE file in the Nix Store. - - If you want to protect your CI token use instead. + Defines the interval length, in seconds, between new jobs check. + The default value is 3; + if set to 0 or lower, the default value will be used. + See runner documentation for more information. + ''; + }; + concurrent = mkOption { + type = types.int; + default = 1; + example = literalExample "config.nix.maxJobs"; + description = '' + Limits how many jobs globally can be run concurrently. + The most upper limit of jobs using all defined runners. + 0 does not mean unlimited. ''; - type = types.attrs; - example = { - concurrent = 2; - runners = [{ - name = "docker-nix-1.11"; - url = "https://CI/"; - token = "TOKEN"; - executor = "docker"; - builds_dir = ""; - docker = { - host = ""; - image = "nixos/nix:1.11"; - privileged = true; - disable_cache = true; - cache_dir = ""; - }; - }]; - }; }; - gracefulTermination = mkOption { - default = false; type = types.bool; + default = false; description = '' - Finish all remaining jobs before stopping, restarting or reconfiguring. - If not set gitlab-runner will stop immediatly without waiting for jobs to finish, - which will lead to failed builds. + Finish all remaining jobs before stopping. + If not set gitlab-runner will stop immediatly without waiting + for jobs to finish, which will lead to failed builds. ''; }; - gracefulTimeout = mkOption { - default = "infinity"; type = types.str; + default = "infinity"; example = "5min 20s"; - description = ''Time to wait until a graceful shutdown is turned into a forceful one.''; - }; - - workDir = mkOption { - default = "/var/lib/gitlab-runner"; - type = types.path; - description = "The working directory used"; + description = '' + Time to wait until a graceful shutdown is turned into a forceful one. + ''; }; - package = mkOption { - description = "Gitlab Runner package to use"; + type = types.package; default = pkgs.gitlab-runner; defaultText = "pkgs.gitlab-runner"; - type = types.package; example = literalExample "pkgs.gitlab-runner_1_11"; + description = "Gitlab Runner package to use."; }; - - packages = mkOption { - default = [ pkgs.bash pkgs.docker-machine ]; - defaultText = "[ pkgs.bash pkgs.docker-machine ]"; + extraPackages = mkOption { type = types.listOf types.package; + default = [ ]; description = '' - Packages to add to PATH for the gitlab-runner process. + Extra packages to add to PATH for the gitlab-runner process. ''; }; + services = mkOption { + description = "GitLab Runner services."; + default = { }; + example = literalExample '' + { + # runner for building in docker via host's nix-daemon + # nix store will be readable in runner, might be insecure + nix = { + # File should contain at least these two variables: + # `CI_SERVER_URL` + # `REGISTRATION_TOKEN` + registrationConfigFile = "/run/secrets/gitlab-runner-registration"; + dockerImage = "alpine"; + dockerVolumes = [ + "/nix/store:/nix/store:ro" + "/nix/var/nix/db:/nix/var/nix/db:ro" + "/nix/var/nix/daemon-socket:/nix/var/nix/daemon-socket:ro" + ]; + dockerDisableCache = true; + preBuildScript = pkgs.writeScript "setup-container" ''' + mkdir -p -m 0755 /nix/var/log/nix/drvs + mkdir -p -m 0755 /nix/var/nix/gcroots + mkdir -p -m 0755 /nix/var/nix/profiles + mkdir -p -m 0755 /nix/var/nix/temproots + mkdir -p -m 0755 /nix/var/nix/userpool + mkdir -p -m 1777 /nix/var/nix/gcroots/per-user + mkdir -p -m 1777 /nix/var/nix/profiles/per-user + mkdir -p -m 0755 /nix/var/nix/profiles/per-user/root + mkdir -p -m 0700 "$HOME/.nix-defexpr" - }; + . ''${pkgs.nix}/etc/profile.d/nix.sh + ''${pkgs.nix}/bin/nix-env -i ''${concatStringsSep " " (with pkgs; [ nix cacert git openssh ])} + + ''${pkgs.nix}/bin/nix-channel --add https://nixos.org/channels/nixpkgs-unstable + ''${pkgs.nix}/bin/nix-channel --update nixpkgs + '''; + environmentVariables = { + ENV = "/etc/profile"; + USER = "root"; + NIX_REMOTE = "daemon"; + PATH = "/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/bin:/sbin:/usr/bin:/usr/sbin"; + NIX_SSL_CERT_FILE = "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt"; + }; + tagList = [ "nix" ]; + }; + # runner for building docker images + docker-images = { + # File should contain at least these two variables: + # `CI_SERVER_URL` + # `REGISTRATION_TOKEN` + registrationConfigFile = "/run/secrets/gitlab-runner-registration"; + dockerImage = "docker:stable"; + dockerVolumes = [ + "/var/run/docker.sock:/var/run/docker.sock" + ]; + tagList = [ "docker-images" ]; + }; + # runner for executing stuff on host system (very insecure!) + # make sure to add required packages (including git!) + # to `environment.systemPackages` + shell = { + # File should contain at least these two variables: + # `CI_SERVER_URL` + # `REGISTRATION_TOKEN` + registrationConfigFile = "/run/secrets/gitlab-runner-registration"; + executor = "shell"; + tagList = [ "shell" ]; + }; + # runner for everything else + default = { + # File should contain at least these two variables: + # `CI_SERVER_URL` + # `REGISTRATION_TOKEN` + registrationConfigFile = "/run/secrets/gitlab-runner-registration"; + dockerImage = "debian:stable"; + }; + } + ''; + type = types.attrsOf (types.submodule { + options = { + registrationConfigFile = mkOption { + type = types.path; + description = '' + Absolute path to a file with environment variables + used for gitlab-runner registration. + A list of all supported environment variables can be found in + gitlab-runner register --help. + + Ones that you probably want to set is + + CI_SERVER_URL=<CI server URL> + + REGISTRATION_TOKEN=<registration secret> + ''; + }; + registrationFlags = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "--docker-helper-image my/gitlab-runner-helper" ]; + description = '' + Extra command-line flags passed to + gitlab-runner register. + Execute gitlab-runner register --help + for a list of supported flags. + ''; + }; + environmentVariables = mkOption { + type = types.attrsOf types.str; + default = { }; + example = { NAME = "value"; }; + description = '' + Custom environment variables injected to build environment. + For secrets you can use + with RUNNER_ENV variable set. + ''; + }; + executor = mkOption { + type = types.str; + default = "docker"; + description = '' + Select executor, eg. shell, docker, etc. + See runner documentation for more information. + ''; + }; + buildsDir = mkOption { + type = types.nullOr types.path; + default = null; + example = "/var/lib/gitlab-runner/builds"; + description = '' + Absolute path to a directory where builds will be stored + in context of selected executor (Locally, Docker, SSH). + ''; + }; + dockerImage = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Docker image to be used. + ''; + }; + dockerVolumes = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "/var/run/docker.sock:/var/run/docker.sock" ]; + description = '' + Bind-mount a volume and create it + if it doesn't exist prior to mounting. + ''; + }; + dockerDisableCache = mkOption { + type = types.bool; + default = false; + description = '' + Disable all container caching. + ''; + }; + dockerPrivileged = mkOption { + type = types.bool; + default = false; + description = '' + Give extended privileges to container. + ''; + }; + dockerExtraHosts = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "other-host:127.0.0.1" ]; + description = '' + Add a custom host-to-IP mapping. + ''; + }; + dockerAllowedImages = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "ruby:*" "python:*" "php:*" "my.registry.tld:5000/*:*" ]; + description = '' + Whitelist allowed images. + ''; + }; + dockerAllowedServices = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "postgres:9" "redis:*" "mysql:*" ]; + description = '' + Whitelist allowed services. + ''; + }; + preCloneScript = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Runner-specific command script executed before code is pulled. + ''; + }; + preBuildScript = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Runner-specific command script executed after code is pulled, + just before build executes. + ''; + }; + postBuildScript = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Runner-specific command script executed after code is pulled + and just after build executes. + ''; + }; + tagList = mkOption { + type = types.listOf types.str; + default = [ ]; + description = '' + Tag list. + ''; + }; + runUntagged = mkOption { + type = types.bool; + default = false; + description = '' + Register to run untagged builds; defaults to + true when is empty. + ''; + }; + limit = mkOption { + type = types.int; + default = 0; + description = '' + Limit how many jobs can be handled concurrently by this service. + 0 (default) simply means don't limit. + ''; + }; + requestConcurrency = mkOption { + type = types.int; + default = 0; + description = '' + Limit number of concurrent requests for new jobs from GitLab. + ''; + }; + maximumTimeout = mkOption { + type = types.int; + default = 0; + description = '' + What is the maximum timeout (in seconds) that will be set for + job when using this Runner. 0 (default) simply means don't limit. + ''; + }; + protected = mkOption { + type = types.bool; + default = false; + description = '' + When set to true Runner will only run on pipelines + triggered on protected branches. + ''; + }; + debugTraceDisabled = mkOption { + type = types.bool; + default = false; + description = '' + When set to true Runner will disable the possibility of + using the CI_DEBUG_TRACE feature. + ''; + }; + }; + }); + }; + }; config = mkIf cfg.enable { + warnings = optional (cfg.configFile != null) "services.gitlab-runner.`configFile` is deprecated, please use services.gitlab-runner.`services`."; + environment.systemPackages = [ cfg.package ]; systemd.services.gitlab-runner = { - path = cfg.packages; - environment = config.networking.proxy.envVars // { - # Gitlab runner will not start if the HOME variable is not set - HOME = cfg.workDir; - }; description = "Gitlab Runner"; + documentation = [ "https://docs.gitlab.com/runner/" ]; after = [ "network.target" ] ++ optional hasDocker "docker.service"; requires = optional hasDocker "docker.service"; wantedBy = [ "multi-user.target" ]; + environment = config.networking.proxy.envVars // { + HOME = "/var/lib/gitlab-runner"; + }; + path = with pkgs; [ + bash + gawk + jq + moreutils + remarshal + utillinux + cfg.package + ] ++ cfg.extraPackages; reloadIfChanged = true; - restartTriggers = [ - config.environment.etc."gitlab-runner/config.toml".source - ]; serviceConfig = { + # Set `DynamicUser` under `systemd.services.gitlab-runner.serviceConfig` + # to `lib.mkForce false` in your configuration to run this service as root. + # You can also set `User` and `Group` options to run this service as desired user. + # Make sure to restart service or changes won't apply. + DynamicUser = true; StateDirectory = "gitlab-runner"; - ExecReload= "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - ExecStart = ''${cfg.package}/bin/gitlab-runner run \ - --working-directory ${cfg.workDir} \ - --config /etc/gitlab-runner/config.toml \ - --service gitlab-runner \ - --user gitlab-runner \ - ''; - - } // optionalAttrs (cfg.gracefulTermination) { + SupplementaryGroups = optional hasDocker "docker"; + ExecStartPre = "!${configureScript}/bin/gitlab-runner-configure"; + ExecStart = "${startScript}/bin/gitlab-runner-start"; + ExecReload = "!${configureScript}/bin/gitlab-runner-configure"; + } // optionalAttrs (cfg.gracefulTermination) { TimeoutStopSec = "${cfg.gracefulTimeout}"; KillSignal = "SIGQUIT"; KillMode = "process"; }; }; - - # Make the gitlab-runner command availabe so users can query the runner - environment.systemPackages = [ cfg.package ]; - - # Make sure the config can be reloaded on change - environment.etc."gitlab-runner/config.toml".source = configFile; - - users.users.gitlab-runner = { - group = "gitlab-runner"; - extraGroups = optional hasDocker "docker"; - uid = config.ids.uids.gitlab-runner; - home = cfg.workDir; - createHome = true; - }; - - users.groups.gitlab-runner.gid = config.ids.gids.gitlab-runner; + # Enable docker if `docker` executor is used in any service + virtualisation.docker.enable = mkIf ( + any (s: s.executor == "docker") (attrValues cfg.services) + ) (mkDefault true); }; + imports = [ + (mkRenamedOptionModule [ "services" "gitlab-runner" "packages" ] [ "services" "gitlab-runner" "extraPackages" ] ) + (mkRemovedOptionModule [ "services" "gitlab-runner" "configOptions" ] "Use services.gitlab-runner.services option instead" ) + (mkRemovedOptionModule [ "services" "gitlab-runner" "workDir" ] "You should move contents of workDir (if any) to /var/lib/gitlab-runner" ) + ]; } -- cgit v1.2.3 From 747e78d010654e294ad7a6e1ae37fd9e4a19643d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 10:03:21 +0000 Subject: flyctl: 0.0.110 -> 0.0.117 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 965a53dcdbd..22da8cd7518 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.110"; + version = "0.0.117"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "1fvvanyzrai41fq98msjwzgwsidxbaly6f6knma6lwmicv4f9svg"; + sha256 = "0i9azvhlwp5g699yagfbd5rnsr5kdnbw6lsz28nz1dzvmrj9xp7w"; }; preBuild = '' @@ -20,7 +20,7 @@ buildGoModule rec { rm $out/bin/helpgen ''; - modSha256 = "0lnk2g5msqhhshh99s32sqd793rdlzmp7vhqdb1fd6qafrrrxm5w"; + modSha256 = "0d0hfmdk81apha3r7zspam8wqadpy6qmqkgbq0sbiwrji4155hrh"; meta = with lib; { description = "Command line tools for fly.io services"; -- cgit v1.2.3 From 8beea3f8cee71886f283276f47afffd8628666af Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 10:15:25 +0000 Subject: fstl: 0.9.3 -> 0.9.4 --- pkgs/applications/graphics/fstl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/fstl/default.nix b/pkgs/applications/graphics/fstl/default.nix index 1d712a63fbd..c96ea765d43 100644 --- a/pkgs/applications/graphics/fstl/default.nix +++ b/pkgs/applications/graphics/fstl/default.nix @@ -2,7 +2,7 @@ mkDerivation rec { pname = "fstl"; - version = "0.9.3"; + version = "0.9.4"; buildInputs = [qtbase mesa_glu]; @@ -23,7 +23,7 @@ mkDerivation rec { owner = "mkeeter"; repo = "fstl"; rev = "v" + version; - sha256 = "1j0y9xbf0ybrrnsmfzgpyyz6bi98xgzn9ivani424j01vffns892"; + sha256 = "028hzdv11hgvcpc36q5scf4nw1256qswh37xhfn5a0iv7wycmnif"; }; meta = with stdenv.lib; { -- cgit v1.2.3 From f643a51abe3442dee6f4cf7e73d225166c5896c3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 10:19:36 +0000 Subject: ft2-clone: 1.15 -> 1.23 --- pkgs/applications/audio/ft2-clone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ft2-clone/default.nix b/pkgs/applications/audio/ft2-clone/default.nix index e80239553f1..3acf8ea1c0c 100644 --- a/pkgs/applications/audio/ft2-clone/default.nix +++ b/pkgs/applications/audio/ft2-clone/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.15"; + version = "1.23"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "19xgdaij71gpvq216zjlp60zmfdl2a8kf8sc3bpk8a4d4xh4n151"; + sha256 = "03prdifc2nz7smmzdy19flp33m927vb7j5bhdc46gak753pikw7d"; }; nativeBuildInputs = [ cmake ]; -- cgit v1.2.3 From cf9a8bcc995d185dd2ff9dff4b55eb39c2962a7f Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Sun, 9 Feb 2020 18:10:24 -0800 Subject: doas: 6.0 -> 6.6.1 https://github.com/Duncaen/OpenDoas/compare/v6.0...v6.6.1 There are a decent chunk of changes in there. I'm mostly interested in 5debef098b7ebba67da5db9fbb020a7cd0f90a7f, which fixes the parsing of /proc/$pid/stat that is used to implement timestamping. --- pkgs/tools/security/doas/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/doas/default.nix b/pkgs/tools/security/doas/default.nix index ce8b5825647..58ada1086bc 100644 --- a/pkgs/tools/security/doas/default.nix +++ b/pkgs/tools/security/doas/default.nix @@ -1,15 +1,19 @@ -{ stdenv, lib, fetchFromGitHub, bison, pam }: +{ stdenv +, lib +, fetchFromGitHub +, bison +, pam +}: stdenv.mkDerivation rec { pname = "doas"; - - version = "6.0"; + version = "6.6.1"; src = fetchFromGitHub { owner = "Duncaen"; repo = "OpenDoas"; rev = "v${version}"; - sha256 = "1j50l3jvbgvg8vmp1nx6vrjxkbj5bvfh3m01bymzfn25lkwwhz1x"; + sha256 = "07kkc5729p654jrgfsc8zyhiwicgmq38yacmwfvay2b3gmy728zn"; }; # otherwise confuses ./configure @@ -26,6 +30,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Duncaen/OpenDoas"; license = licenses.isc; platforms = platforms.linux; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ cole-h cstrahan ]; }; } -- cgit v1.2.3 From e9066a6d118ae2802f2b6d3f5e5b0f044051557e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 10:34:27 +0000 Subject: git-quick-stats: 2.0.15 -> 2.0.16 --- pkgs/development/tools/git-quick-stats/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/git-quick-stats/default.nix b/pkgs/development/tools/git-quick-stats/default.nix index 2681b2705ef..1532f64c246 100644 --- a/pkgs/development/tools/git-quick-stats/default.nix +++ b/pkgs/development/tools/git-quick-stats/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "git-quick-stats"; - version = "2.0.15"; + version = "2.0.16"; src = fetchFromGitHub { repo = "git-quick-stats"; owner = "arzzen"; rev = version; - sha256 = "1m8b0bskhpwjbs0qjp0rdzrjj613639pn92isv1cg0srj8grjcai"; + sha256 = "03v06r6gbn8bhya1ig9wdc92hh2ip7072syxkam3sjv150ld80cn"; }; PREFIX = builtins.placeholder "out"; meta = with stdenv.lib; { -- cgit v1.2.3 From 6fcc3c8d3d01bbe6ffa06fb896530391bb7a4388 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 10:44:59 +0000 Subject: gmailctl: 0.6.0 -> 0.7.0 --- pkgs/applications/networking/gmailctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/gmailctl/default.nix b/pkgs/applications/networking/gmailctl/default.nix index ea387dad424..a7dc6fe1550 100644 --- a/pkgs/applications/networking/gmailctl/default.nix +++ b/pkgs/applications/networking/gmailctl/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gmailctl"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "mbrt"; repo = "gmailctl"; rev = "v${version}"; - sha256 = "0g581gdkib7bj86blpm8skjvbnivmzh9ddikxai9hr5qq231j1pb"; + sha256 = "08q4yjfbwlldirf3j5db18l8kn6sf288wd364s50jlcx2ka8w50j"; }; - modSha256 = "0pv3lhzl96ygzh9y01hi9klrrk403ii92imr9yrbimaf7rsvyvjp"; + modSha256 = "1c7dk6l8lkq2j04cp5g97hwkwfmmyn5r0vpr5zpavvalxgjidsf4"; meta = with stdenv.lib; { description = "Declarative configuration for Gmail filters"; -- cgit v1.2.3 From e9fa3d7e63621e6db05901f0213fcea44464a759 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 11:00:21 +0000 Subject: gotestsum: 0.4.1 -> 0.4.2 --- pkgs/development/tools/gotestsum/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gotestsum/default.nix b/pkgs/development/tools/gotestsum/default.nix index 45629338d9e..3dd7fb9e352 100644 --- a/pkgs/development/tools/gotestsum/default.nix +++ b/pkgs/development/tools/gotestsum/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gotestsum"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "gotestyourself"; repo = "gotestsum"; rev = "v${version}"; - sha256 = "1wllcmc2c8ch2ggknhxwgdm6g70ppmxr492kbxvlbwif9p6ms0ci"; + sha256 = "0zifha3mj7386q2accrdmd8qniingadxz1v8vg4mciwi723msr44"; }; - modSha256 = "08vil1jb7dpkld59b6qhsfh9cx450vbgfaji7777immzsd1azf4m"; + modSha256 = "10zkk4zqla5yqs5sq2qc7x1vhadfyd1l7s29xyjmg4grs8iimk2j"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; -- cgit v1.2.3 From 4d13fd46253fef975e02db5f7e308fb54dc4cc39 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 11:21:48 +0000 Subject: hcxtools: 6.0.1 -> 6.0.2 --- pkgs/tools/security/hcxtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/hcxtools/default.nix b/pkgs/tools/security/hcxtools/default.nix index 84517ce2bd8..5634ee6cff0 100644 --- a/pkgs/tools/security/hcxtools/default.nix +++ b/pkgs/tools/security/hcxtools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hcxtools"; - version = "6.0.1"; + version = "6.0.2"; src = fetchFromGitHub { owner = "ZerBea"; repo = pname; rev = version; - sha256 = "0r7pjz89chgb7zl2pqgw3zb1z8cgwp0nxmqvmkv0jn1m9dw3f44f"; + sha256 = "0a36184igdgs2h83zr4zihc5acps91ipmgph37jakvzwrsn64ma6"; }; buildInputs = [ curl openssl zlib ]; -- cgit v1.2.3 From a9ce47ad8f881fff31cfe10fb5a15e839019bd6d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 11:31:34 +0000 Subject: helmfile: 0.106.3 -> 0.114.0 --- pkgs/applications/networking/cluster/helmfile/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index 1318ff003de..628ae10f11b 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -1,6 +1,6 @@ { lib, buildGoModule, fetchFromGitHub, makeWrapper, kubernetes-helm, ... }: -let version = "0.106.3"; in +let version = "0.114.0"; in buildGoModule { pname = "helmfile"; @@ -10,12 +10,12 @@ buildGoModule { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "0pwkkgdcj9vx6nk574iaqwn074qfpgqd1c44d3kr3xdbac89yfyf"; + sha256 = "0486wcfizi8xljr29mznc4p11ggz4rvk5n53qvb30f7ry4ncc8n5"; }; goPackagePath = "github.com/roboll/helmfile"; - modSha256 = "1yv2b44qac0rms66v0qg13wsga0di6hwxa4dh2l0b1xvaf75ysay"; + modSha256 = "0j7w12rrnsv2h5v0bqh6sjq9anm51zs0p3nzlhwsksw9c98r9avk"; nativeBuildInputs = [ makeWrapper ]; -- cgit v1.2.3 From bec1852552651f0d61321c3102a4e9f576fa4ba8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 11:59:03 +0000 Subject: i3-gaps: 4.18 -> 4.18.1 --- pkgs/applications/window-managers/i3/gaps.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/i3/gaps.nix b/pkgs/applications/window-managers/i3/gaps.nix index 731555ce9f8..b124ba0ea0c 100644 --- a/pkgs/applications/window-managers/i3/gaps.nix +++ b/pkgs/applications/window-managers/i3/gaps.nix @@ -3,12 +3,12 @@ i3.overrideAttrs (oldAttrs : rec { name = "i3-gaps-${version}"; - version = "4.18"; + version = "4.18.1"; releaseDate = "2019-01-27"; src = fetchurl { url = "https://github.com/Airblader/i3/archive/${version}.tar.gz"; - sha256 = "04sq2sik7j09kgnn1k87yg3vzy56pk4688bmxh49l6drl0wr1m2v"; + sha256 = "07gk5m90v0ih7c18vcwx7p7innsccd09j2vkr99a33wk71xrww1z"; }; nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ autoreconfHook ]; -- cgit v1.2.3 From 45cd0c24d9e9025694e5d259c65dd8f9082d3afb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 12:10:26 +0000 Subject: imgproxy: 2.11.0 -> 2.13.0 --- pkgs/servers/imgproxy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index faaad1ac7a7..21caebec0f3 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "imgproxy"; - version = "2.11.0"; + version = "2.13.0"; src = fetchFromGitHub { owner = pname; repo = pname; - sha256 = "1n91snf5sxsiy2r8y2nksw4ah70f70nxamy7k0ylgkpfxp4dxwb8"; + sha256 = "0lzk9nv7fbyc0jbsigw54310pvpwfrvji58z7a08j03vypc0v3x4"; rev = "v${version}"; }; - modSha256 = "1fm3s1ksah0w86xv8xjhrbf5ia0ynfg2qgajnldy3dpdbxa3yh7s"; + modSha256 = "02pj8ryis89dl4wjp2mvx6h5d0xdvskxdxiwarg7q0x23m9r7kpg"; nativeBuildInputs = [ pkg-config ]; -- cgit v1.2.3 From bab472ba3922013ef6db5ff48dca1a78bede5fba Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 12:37:14 +0000 Subject: k9s: 0.18.1 -> 0.19.4 --- pkgs/applications/networking/cluster/k9s/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 1cf76e1cff3..a51d1afb367 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.18.1"; + version = "0.19.4"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "0a5x4yamvx2qlwngfvainbhplwp0hqwgvdqlj2jbrbz4hfhr1l59"; + sha256 = "1ya3lrw31pxd1rxzf88l5hzilaxwrng1a3ibawgn57my333hrmf6"; }; buildFlagsArray = '' @@ -18,7 +18,7 @@ buildGoModule rec { -X github.com/derailed/k9s/cmd.commit=${src.rev} ''; - modSha256 = "0wpf6iyq6p3a8azdkn17gdp01wq9khyzr1bab6qgvsnsnhnjzcky"; + modSha256 = "11jxyzajlk6b5j19sg1kjr7qdzpxkwjwrvyhx9mwy6jb5sgqbzv8"; meta = with stdenv.lib; { description = "Kubernetes CLI To Manage Your Clusters In Style."; -- cgit v1.2.3 From 08e3ceb52ddede74648e54aae1142ad1feec57b6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 12:42:06 +0000 Subject: kak-lsp: 7.0.0 -> 8.0.0 --- pkgs/tools/misc/kak-lsp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/kak-lsp/default.nix b/pkgs/tools/misc/kak-lsp/default.nix index 3048b4c9396..2f63eaf4380 100644 --- a/pkgs/tools/misc/kak-lsp/default.nix +++ b/pkgs/tools/misc/kak-lsp/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kak-lsp"; - version = "7.0.0"; + version = "8.0.0"; src = fetchFromGitHub { owner = "ul"; repo = pname; rev = "v${version}"; - sha256 = "1b9v417g0z9q1sqgnms5vy740xggg4fcz0fdwbc4hfvfj6jkyaad"; + sha256 = "0nka51szivwhlfkimjiyzj67nxh75m784c28ass6ihlfax631w9m"; }; - cargoSha256 = "1cmms8kvh24sjb0w77i1bwl09wkx3x65p49pkg1j0lipwic3apm3"; + cargoSha256 = "174qy50m9487vv151vm8q6sby79dq3gbqjbz6h4326jwsc9wwi8c"; buildInputs = lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; -- cgit v1.2.3 From a1c5acff565370d2691358fa83d3a89b1e907bc7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 13:16:07 +0000 Subject: kotlin: 1.3.71 -> 1.3.72 --- pkgs/development/compilers/kotlin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index d4f37d4f5cc..4e2810fa893 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: let - version = "1.3.71"; + version = "1.3.72"; in stdenv.mkDerivation { inherit version; pname = "kotlin"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "0jp7z2lys02d0wmycdlfg9c08ji4qvjaz2wzvrxjyvcwv7d7gnvs"; + sha256 = "0v6c4vjiflwbjjc1lmiyzrilxwbqcz5ll6ls40zhw70zk23xpl6c"; }; propagatedBuildInputs = [ jre ] ; -- cgit v1.2.3 From 8bd07d5041d67979b038ade38a28245aaa2ab6aa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 13:30:24 +0000 Subject: leatherman: 1.11.0 -> 1.12.0 --- pkgs/development/libraries/leatherman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/leatherman/default.nix b/pkgs/development/libraries/leatherman/default.nix index 1fab7ee28a8..8a34f05f6cf 100644 --- a/pkgs/development/libraries/leatherman/default.nix +++ b/pkgs/development/libraries/leatherman/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "leatherman"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { - sha256 = "1kp35gnph9myqxdxzyj1871ay19nfajxglzwai1gvsnh5840xnxy"; + sha256 = "00qigglp67a14ki4dhjxd3j540a80rkmzhysx7hra8v2rgbsqgj8"; rev = version; repo = "leatherman"; owner = "puppetlabs"; -- cgit v1.2.3 From a027934ceb66f1f85aa7f2e46f0a8f4b9c481b8c Mon Sep 17 00:00:00 2001 From: Aldwin Vlasblom Date: Tue, 28 Apr 2020 10:41:58 +0200 Subject: keybase,kbfs,keybase-gui: 5.3.1 -> 5.4.2 --- pkgs/tools/security/keybase/default.nix | 4 ++-- pkgs/tools/security/keybase/gui.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index 2d8957a9d54..16075cd81a3 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "keybase"; - version = "5.3.1"; + version = "5.4.2"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/kbnm" "go/keybase" ]; @@ -17,7 +17,7 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "1a1h2c8jr4r20w4gyvyrpsslmh69bl8syl3jbr0fcr2kka7vqnzg"; + sha256 = "08lw5aw962f75xi42bwbgba94hiql2n2jnsxrkx84czi0ijs1wlr"; }; patches = [ diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 9c34d78aee8..92e143efd70 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -4,16 +4,16 @@ , runtimeShell, gsettings-desktop-schemas }: let - versionSuffix = "20200320154633.3e235215b3"; + versionSuffix = "20200424214931.7b0bbf1e3c"; in stdenv.mkDerivation rec { pname = "keybase-gui"; - version = "5.3.1"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages + version = "5.4.2"; # Find latest version from https://prerelease.keybase.io/deb/dists/stable/main/binary-amd64/Packages src = fetchurl { url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version + "-" + versionSuffix}_amd64.deb"; - sha256 = "00k1xg27arbqpa836c55fhkxjvjbhjgkf6jqzprjzz76zksfdcx4"; + sha256 = "06iksmrr959mlzxc3nwd70apmvhij1xarxvvflys5qa31vravizs"; }; nativeBuildInputs = [ -- cgit v1.2.3 From ab2d16ad654968db5328c9e476a09b8a47e39bd7 Mon Sep 17 00:00:00 2001 From: Aldwin Vlasblom Date: Tue, 28 Apr 2020 10:58:42 +0200 Subject: Add myself (avaq) to the keybase package maintainers --- pkgs/tools/security/keybase/default.nix | 2 +- pkgs/tools/security/keybase/gui.nix | 2 +- pkgs/tools/security/keybase/kbfs.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index 16075cd81a3..bbc99c2ac41 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -35,7 +35,7 @@ buildGoPackage rec { homepage = "https://www.keybase.io/"; description = "The Keybase official command-line utility and service."; platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ carlsverre np rvolosatovs filalex77 ]; + maintainers = with maintainers; [ avaq carlsverre np rvolosatovs filalex77 ]; license = licenses.bsd3; }; } diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index 92e143efd70..05490784390 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { homepage = "https://www.keybase.io/"; description = "The Keybase official GUI"; platforms = platforms.linux; - maintainers = with maintainers; [ rvolosatovs puffnfresh np filalex77 ]; + maintainers = with maintainers; [ avaq rvolosatovs puffnfresh np filalex77 ]; license = licenses.bsd3; }; } diff --git a/pkgs/tools/security/keybase/kbfs.nix b/pkgs/tools/security/keybase/kbfs.nix index 20fadee6a40..e9284e7230f 100644 --- a/pkgs/tools/security/keybase/kbfs.nix +++ b/pkgs/tools/security/keybase/kbfs.nix @@ -16,7 +16,7 @@ buildGoPackage { homepage = "https://keybase.io/docs/kbfs"; description = "The Keybase filesystem"; platforms = platforms.unix; - maintainers = with maintainers; [ rvolosatovs bennofs np ]; + maintainers = with maintainers; [ avaq rvolosatovs bennofs np ]; license = licenses.bsd3; }; } -- cgit v1.2.3 From d51792f3ccf16069abbd7e2c717da88b925a4f43 Mon Sep 17 00:00:00 2001 From: Aldwin Vlasblom Date: Tue, 28 Apr 2020 11:01:16 +0200 Subject: Update my (avaq) maintainer email address --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 02114a9f004..e8b30c6cba3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -758,7 +758,7 @@ name = "Jonathan Glines"; }; avaq = { - email = "avaq+nixos@xs4all.nl"; + email = "nixpkgs@account.avaq.it"; github = "avaq"; githubId = 1217745; name = "Aldwin Vlasblom"; -- cgit v1.2.3 From fafb1279470026be3fbef5ff0a5f8413cc4aa9d1 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 2 May 2020 15:30:43 +0100 Subject: dockertools: Add a buildLayeredImageWithNixDb function This is analogous to buildImageWithNixDb but instead uses buildLayeredImage under the hood. --- pkgs/build-support/docker/default.nix | 55 ++++++++++++++++++++++------------- 1 file changed, 34 insertions(+), 21 deletions(-) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 28c0d2dfcae..bee6e37cccb 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -32,7 +32,29 @@ }: # WARNING: this API is unstable and may be subject to backwards-incompatible changes in the future. +let + + mkDbExtraCommand = contents: let + contentsList = if builtins.isList contents then contents else [ contents ]; + in '' + echo "Generating the nix database..." + echo "Warning: only the database of the deepest Nix layer is loaded." + echo " If you want to use nix commands in the container, it would" + echo " be better to only have one layer that contains a nix store." + + export NIX_REMOTE=local?root=$PWD + # A user is required by nix + # https://github.com/NixOS/nix/blob/9348f9291e5d9e4ba3c4347ea1b235640f54fd79/src/libutil/util.cc#L478 + export USER=nobody + ${nix}/bin/nix-store --load-db < ${closureInfo {rootPaths = contentsList;}}/registration + + mkdir -p nix/var/nix/gcroots/docker/ + for i in ${lib.concatStringsSep " " contentsList}; do + ln -s $i nix/var/nix/gcroots/docker/$(basename $i) + done; + ''; +in rec { examples = callPackage ./examples.nix { @@ -874,25 +896,16 @@ rec { # contents. The main purpose is to be able to use nix commands in # the container. # Be careful since this doesn't work well with multilayer. - buildImageWithNixDb = args@{ contents ? null, extraCommands ? "", ... }: - let contentsList = if builtins.isList contents then contents else [ contents ]; - in buildImage (args // { - extraCommands = '' - echo "Generating the nix database..." - echo "Warning: only the database of the deepest Nix layer is loaded." - echo " If you want to use nix commands in the container, it would" - echo " be better to only have one layer that contains a nix store." - - export NIX_REMOTE=local?root=$PWD - # A user is required by nix - # https://github.com/NixOS/nix/blob/9348f9291e5d9e4ba3c4347ea1b235640f54fd79/src/libutil/util.cc#L478 - export USER=nobody - ${nix}/bin/nix-store --load-db < ${closureInfo {rootPaths = contentsList;}}/registration - - mkdir -p nix/var/nix/gcroots/docker/ - for i in ${lib.concatStringsSep " " contentsList}; do - ln -s $i nix/var/nix/gcroots/docker/$(basename $i) - done; - '' + extraCommands; - }); + buildImageWithNixDb = args@{ contents ? null, extraCommands ? "", ... }: ( + buildImage (args // { + extraCommands = (mkDbExtraCommand contents) + extraCommands; + }) + ); + + buildLayeredImageWithNixDb = args@{ contents ? null, extraCommands ? "", ... }: ( + buildLayeredImage (args // { + extraCommands = (mkDbExtraCommand contents) + extraCommands; + }) + ); + } -- cgit v1.2.3 From bcebd1969ae4314ea53184855f7676409407f1de Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 15:23:02 +0000 Subject: libosmium: 2.15.4 -> 2.15.5 --- pkgs/development/libraries/libosmium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libosmium/default.nix b/pkgs/development/libraries/libosmium/default.nix index e6abe620aaf..29edf37d80e 100644 --- a/pkgs/development/libraries/libosmium/default.nix +++ b/pkgs/development/libraries/libosmium/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libosmium"; - version = "2.15.4"; + version = "2.15.5"; src = fetchFromGitHub { owner = "osmcode"; repo = "libosmium"; rev = "v${version}"; - sha256 = "0mlcvqrhp40bzj5r5j9nfc5vbis8hmzcq9xi8jylkciyydaynhz4"; + sha256 = "1f21dzzkxzi74hv17fs9kb2w6indqvvm4lkxclz4j4x98k8q3n59"; }; nativeBuildInputs = [ cmake ]; -- cgit v1.2.3 From bdd2d3ccb29b5369b71eeef955842240cf6b6108 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Sat, 2 May 2020 14:06:43 +0200 Subject: linux: CONFIG_HIDRAW=y --- pkgs/os-specific/linux/kernel/common-config.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 0a58ed87e6c..e254891b001 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -609,6 +609,9 @@ let misc = { HID_BATTERY_STRENGTH = yes; + # enabled by default in x86_64 but not arm64, so we do that here + HIDRAW = yes; + MODULE_COMPRESS = yes; MODULE_COMPRESS_XZ = yes; KERNEL_XZ = yes; -- cgit v1.2.3 From 06bed53569019c2feda939f6214b2f2ba22b3f6b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 2 May 2020 11:24:15 -0500 Subject: git-lfs: fix manpage install --- pkgs/applications/version-management/git-lfs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index f5b844d0ce7..cdd7cd01d06 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -24,7 +24,7 @@ buildGoPackage rec { ''; postInstall = '' - installManPage man/*.1 man/*.5 + installManPage go/src/${goPackagePath}/man/*.{1,5} ''; meta = with stdenv.lib; { -- cgit v1.2.3 From 81916c7444212112879aad30f7260cad58591011 Mon Sep 17 00:00:00 2001 From: Matt Huszagh Date: Sat, 2 May 2020 10:08:57 -0700 Subject: pylibftdi: point to correct libusb library --- pkgs/development/python-modules/pylibftdi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pylibftdi/default.nix b/pkgs/development/python-modules/pylibftdi/default.nix index 9e8f96665d0..e8aebbe4a14 100644 --- a/pkgs/development/python-modules/pylibftdi/default.nix +++ b/pkgs/development/python-modules/pylibftdi/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pylibftdi/driver.py \ - --replace "self._load_library('libusb')" "cdll.LoadLibrary('${libusb1.out}/lib/libusb1.so')" \ + --replace "self._load_library('libusb')" "cdll.LoadLibrary('${libusb1.out}/lib/libusb-1.0.so')" \ --replace "self._load_library('libftdi')" "cdll.LoadLibrary('${libftdi1.out}/lib/libftdi1.so')" ''; -- cgit v1.2.3 From a54f3744139e239ddd08a249b1d72ff66d324938 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sat, 2 May 2020 19:32:47 +0200 Subject: youtube-dl: 2020.03.24 -> 2020.05.03 https://github.com/ytdl-org/youtube-dl/releases/tag/2020.05.03 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 7b58ccfa853..0a45c27a7a8 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { # The websites youtube-dl deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2020.03.24"; + version = "2020.05.03"; src = fetchurl { url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz"; - sha256 = "05l4asakakxn53wrvxn6c03fd80zdizdbj6r2cj8c1ja3sj9i8s5"; + sha256 = "0qigk1bml6vkck4rs0wnmr46j5gkz04zn30jvnw1r4czjs7vnpal"; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; -- cgit v1.2.3 From 495ac69605a08b8b5f60c25a459e4d22376e4031 Mon Sep 17 00:00:00 2001 From: Matt Huszagh Date: Sat, 2 May 2020 10:34:03 -0700 Subject: pylibftdi: remove httpserver dependency httpserver is only used in an example, and prevents python2 builds from working. --- pkgs/development/python-modules/pylibftdi/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/pylibftdi/default.nix b/pkgs/development/python-modules/pylibftdi/default.nix index e8aebbe4a14..54058ae1982 100644 --- a/pkgs/development/python-modules/pylibftdi/default.nix +++ b/pkgs/development/python-modules/pylibftdi/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, httpserver , libftdi1 , libusb1 }: @@ -16,7 +15,6 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - httpserver libftdi1 libusb1 ]; -- cgit v1.2.3 From 566cd87deefcca2d18170fd0b7ba390fcceb3cd3 Mon Sep 17 00:00:00 2001 From: Joachim Breitner Date: Mon, 20 Apr 2020 09:32:39 +0200 Subject: wasmtime : 0.12.0 -> 0.15.0 and enable tests again, now that upstream fixed stuff. --- pkgs/development/interpreters/wasmtime/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 79222749dc4..fc1227f9e99 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,24 +2,24 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "0.12.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "${pname}"; rev = "v${version}"; - sha256 = "08dhk5s8rv41mjqbwfqwqmp6p6p9y7qc5yc76ljjd9l7j1phl7mr"; + sha256 = "1df99iak0psydlg9m8f8qq4zyh4wbi5l4qgsdjr2lm74ci3483xy"; fetchSubmodules = true; }; - cargoSha256 = "0vyxp74jlnrisk0kblsbj9d9a54wcgzbyjm7iqav1k4ns3syrnmh"; + cargoSha256 = "170bz48jrc1k2ylfmd3bcry0xpcxx8p3rzzv9mprlfmrfpb0b28r"; nativeBuildInputs = [ python cmake clang ]; buildInputs = [ llvmPackages.libclang ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; - doCheck = false; # https://github.com/bytecodealliance/wasmtime/issues/1197 + doCheck = true; meta = with lib; { description = "Standalone JIT-style runtime for WebAssembly, using Cranelift"; -- cgit v1.2.3 From 38f65abc4699bec802a355d72a4147682ac7730b Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sat, 2 May 2020 14:22:39 -0400 Subject: libcec: 4.0.4 -> 4.0.5 --- pkgs/development/libraries/libcec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix index 09ebac93869..a1c2967dde7 100644 --- a/pkgs/development/libraries/libcec/default.nix +++ b/pkgs/development/libraries/libcec/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, pkgconfig, udev, libcec_platform, libraspberrypi ? null }: -let version = "4.0.4"; in +let version = "4.0.5"; in stdenv.mkDerivation { pname = "libcec"; @@ -8,7 +8,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz"; - sha256 = "02j09y06csaic4m0fyb4dr9l3hl15nxbbniwq0i1qlccpxjak0j3"; + sha256 = "0hvp33mq0kg544hw20aq3vy5lxf5zid6gxm3qdga7wxw1r1lkmz4"; }; nativeBuildInputs = [ pkgconfig cmake ]; -- cgit v1.2.3 From 662ecb74aa75a71e74dbddbf48036e9f286f3cca Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sat, 2 May 2020 21:11:23 +0200 Subject: vpsfree-client: init at 0.11.0 (#86046) --- pkgs/tools/virtualization/vpsfree-client/Gemfile | 5 + .../virtualization/vpsfree-client/Gemfile.lock | 75 +++++ .../virtualization/vpsfree-client/default.nix | 17 ++ .../tools/virtualization/vpsfree-client/gemset.nix | 316 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 + 5 files changed, 416 insertions(+) create mode 100644 pkgs/tools/virtualization/vpsfree-client/Gemfile create mode 100644 pkgs/tools/virtualization/vpsfree-client/Gemfile.lock create mode 100644 pkgs/tools/virtualization/vpsfree-client/default.nix create mode 100644 pkgs/tools/virtualization/vpsfree-client/gemset.nix diff --git a/pkgs/tools/virtualization/vpsfree-client/Gemfile b/pkgs/tools/virtualization/vpsfree-client/Gemfile new file mode 100644 index 00000000000..87c9aeebb90 --- /dev/null +++ b/pkgs/tools/virtualization/vpsfree-client/Gemfile @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +source "https://rubygems.org" + +gem "vpsfree-client" diff --git a/pkgs/tools/virtualization/vpsfree-client/Gemfile.lock b/pkgs/tools/virtualization/vpsfree-client/Gemfile.lock new file mode 100644 index 00000000000..9b8fd4b918a --- /dev/null +++ b/pkgs/tools/virtualization/vpsfree-client/Gemfile.lock @@ -0,0 +1,75 @@ +GEM + remote: https://rubygems.org/ + specs: + activesupport (6.0.2.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + zeitwerk (~> 2.2) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) + concurrent-ruby (1.1.6) + cookiejar (0.3.3) + curses (1.3.2) + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) + em-http-request (1.1.5) + addressable (>= 2.3.4) + cookiejar (!= 0.3.1) + em-socksify (>= 0.3) + eventmachine (>= 1.0.3) + http_parser.rb (>= 0.6.0) + em-socksify (0.3.2) + eventmachine (>= 1.0.0.beta.4) + eventmachine (1.0.9.1) + haveapi-client (0.13.2) + activesupport (>= 4.0) + highline (~> 1.7.8) + json + require_all (~> 2.0.0) + rest-client (~> 2.0.2) + ruby-progressbar (~> 1.7.5) + highline (1.7.10) + http-cookie (1.0.3) + domain_name (~> 0.5) + http_parser.rb (0.6.0) + i18n (1.8.2) + concurrent-ruby (~> 1.0) + json (2.3.0) + mime-types (3.3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2020.0425) + minitest (5.14.0) + netrc (0.11.0) + public_suffix (4.0.4) + require_all (2.0.0) + rest-client (2.0.2) + http-cookie (>= 1.0.2, < 2.0) + mime-types (>= 1.16, < 4.0) + netrc (~> 0.8) + ruby-progressbar (1.7.5) + thread_safe (0.3.6) + tzinfo (1.2.7) + thread_safe (~> 0.1) + unf (0.1.4) + unf_ext + unf_ext (0.0.7.7) + vpsadmin-client (3.0.0.master.20190517.pre.0.3ab5ddfe) + curses + em-http-request (~> 1.1.3) + eventmachine (~> 1.0.3) + haveapi-client (~> 0.13.0) + json + vpsfree-client (0.11.0) + vpsadmin-client (= 3.0.0.master.20190517.pre.0.3ab5ddfe) + zeitwerk (2.3.0) + +PLATFORMS + ruby + +DEPENDENCIES + vpsfree-client + +BUNDLED WITH + 2.1.4 diff --git a/pkgs/tools/virtualization/vpsfree-client/default.nix b/pkgs/tools/virtualization/vpsfree-client/default.nix new file mode 100644 index 00000000000..17d57041488 --- /dev/null +++ b/pkgs/tools/virtualization/vpsfree-client/default.nix @@ -0,0 +1,17 @@ +{ lib, bundlerApp, bundlerUpdateScript }: + +bundlerApp { + pname = "vpsfree-client"; + gemdir = ./.; + exes = [ "vpsfreectl" ]; + + passthru.updateScript = bundlerUpdateScript "vpsfree-client"; + + meta = with lib; { + description = "Ruby API and CLI for the vpsFree.cz API"; + homepage = "https://github.com/vpsfreecz/vpsfree-client"; + maintainers = with maintainers; [ zimbatm ]; + license = licenses.gpl3; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/virtualization/vpsfree-client/gemset.nix b/pkgs/tools/virtualization/vpsfree-client/gemset.nix new file mode 100644 index 00000000000..366c5836bd3 --- /dev/null +++ b/pkgs/tools/virtualization/vpsfree-client/gemset.nix @@ -0,0 +1,316 @@ +{ + activesupport = { + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1md98dkbirc8mq5nbz1vqq3hwqjiv7b54q7180w8wyxgd4k1awwb"; + type = "gem"; + }; + version = "6.0.2.2"; + }; + addressable = { + dependencies = ["public_suffix"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fvchp2rhp2rmigx7qglf69xvjqvzq7x0g49naliw29r2bz656sy"; + type = "gem"; + }; + version = "2.7.0"; + }; + concurrent-ruby = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl"; + type = "gem"; + }; + version = "1.1.6"; + }; + cookiejar = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0q0kmbks9l3hl0wdq744hzy97ssq9dvlzywyqv9k9y1p3qc9va2a"; + type = "gem"; + }; + version = "0.3.3"; + }; + curses = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hic9kq09dhh8jqjx3k1991rnqhlj3glz82w0g7ndcri52m1hgqg"; + type = "gem"; + }; + version = "1.3.2"; + }; + domain_name = { + dependencies = ["unf"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0"; + type = "gem"; + }; + version = "0.5.20190701"; + }; + em-http-request = { + dependencies = ["addressable" "cookiejar" "em-socksify" "eventmachine" "http_parser.rb"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13rxmbi0fv91n4sg300v3i9iiwd0jxv0i6xd0sp81dx3jlx7kasx"; + type = "gem"; + }; + version = "1.1.5"; + }; + em-socksify = { + dependencies = ["eventmachine"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rk43ywaanfrd8180d98287xv2pxyl7llj291cwy87g1s735d5nk"; + type = "gem"; + }; + version = "0.3.2"; + }; + eventmachine = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17jr1caa3ggg696dd02g2zqzdjqj9x9q2nl7va82l36f7c5v6k4z"; + type = "gem"; + }; + version = "1.0.9.1"; + }; + haveapi-client = { + dependencies = ["activesupport" "highline" "json" "require_all" "rest-client" "ruby-progressbar"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wn5zvyy3w3q74m2fsb4jwxfdbdnpyyzxdf9iklpggcdmjhb78z0"; + type = "gem"; + }; + version = "0.13.2"; + }; + highline = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "01ib7jp85xjc4gh4jg0wyzllm46hwv8p0w1m4c75pbgi41fps50y"; + type = "gem"; + }; + version = "1.7.10"; + }; + http-cookie = { + dependencies = ["domain_name"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g"; + type = "gem"; + }; + version = "1.0.3"; + }; + "http_parser.rb" = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15nidriy0v5yqfjsgsra51wmknxci2n2grliz78sf9pga3n0l7gi"; + type = "gem"; + }; + version = "0.6.0"; + }; + i18n = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jwrd1l4mxz06iyx6053lr6hz2zy7ah2k3ranfzisvych5q19kwm"; + type = "gem"; + }; + version = "1.8.2"; + }; + json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nrmw2r4nfxlfgprfgki3hjifgrcrs3l5zvm3ca3gb4743yr25mn"; + type = "gem"; + }; + version = "2.3.0"; + }; + mime-types = { + dependencies = ["mime-types-data"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh"; + type = "gem"; + }; + version = "3.3.1"; + }; + mime-types-data = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zin0q26wc5p7zb7glpwary7ms60s676vcq987yv22jgm6hnlwlh"; + type = "gem"; + }; + version = "3.2020.0425"; + }; + minitest = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g73x65hmjph8dg1h3rkzfg7ys3ffxm35hj35grw75fixmq53qyz"; + type = "gem"; + }; + version = "5.14.0"; + }; + netrc = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y"; + type = "gem"; + }; + version = "0.11.0"; + }; + public_suffix = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1l1kqw75asziwmzrig8rywxswxz8l91sc3pvns02ffsqac1a3wiz"; + type = "gem"; + }; + version = "4.0.4"; + }; + require_all = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0sjf2vigdg4wq7z0xlw14zyhcz4992s05wgr2s58kjgin12bkmv8"; + type = "gem"; + }; + version = "2.0.0"; + }; + rest-client = { + dependencies = ["http-cookie" "mime-types" "netrc"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hzcs2r7b5bjkf2x2z3n8z6082maz0j8vqjiciwgg3hzb63f958j"; + type = "gem"; + }; + version = "2.0.2"; + }; + ruby-progressbar = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hynaavnqzld17qdx9r7hfw00y16ybldwq730zrqfszjwgi59ivi"; + type = "gem"; + }; + version = "1.7.5"; + }; + thread_safe = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; + type = "gem"; + }; + version = "0.3.6"; + }; + tzinfo = { + dependencies = ["thread_safe"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; + type = "gem"; + }; + version = "1.2.7"; + }; + unf = { + dependencies = ["unf_ext"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; + type = "gem"; + }; + version = "0.1.4"; + }; + unf_ext = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4"; + type = "gem"; + }; + version = "0.0.7.7"; + }; + vpsadmin-client = { + dependencies = ["curses" "em-http-request" "eventmachine" "haveapi-client" "json"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ki3204pkg3f9wk9plbq5n9lrnsmc364smfxyrbq32gi8ag2y2s8"; + type = "gem"; + }; + version = "3.0.0.master.20190517.pre.0.3ab5ddfe"; + }; + vpsfree-client = { + dependencies = ["vpsadmin-client"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cs2ibl9kl39hnpzyhyczaqv4i58pn106vx2m6lds9p3av5mcbxs"; + type = "gem"; + }; + version = "0.11.0"; + }; + zeitwerk = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1akpm3pwvyiack2zk6giv9yn3cqb8pw6g40p4394pdc3xmy3s4k0"; + type = "gem"; + }; + version = "2.3.0"; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1495f6212ff..7860d08dede 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26459,4 +26459,7 @@ in jitsi-meet-electron = callPackage ../applications/networking/instant-messengers/jitsi-meet-electron { }; zenstates = callPackage ../os-specific/linux/zenstates {}; + + vpsfree-client = callPackage ../tools/virtualization/vpsfree-client {}; + } -- cgit v1.2.3 From e9e2f81590b1f1d306af328d03e6ab209ccb2a89 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 2 May 2020 20:57:07 +0200 Subject: tdesktop: 2.1.0 -> 2.1.1 Regarding microsoft_gsl: The CMake scripts from Telegram-Desktop did not find it anymore (I didn't investigate this) and Arch already made this change during the last update. It's probably best to do the same here especially since Telegram-Desktop is currently based on GSL 3.0.1 while our version is still at 2.1.0. --- .../networking/instant-messengers/telegram/tdesktop/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 6f4099c1d8d..319f400d95d 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -2,7 +2,7 @@ , pkgconfig, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook , qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash , dee, ffmpeg_4, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 -, tl-expected, microsoft_gsl, hunspell +, tl-expected, hunspell # TODO: Shouldn't be required: , pcre, xorg, utillinux, libselinux, libsepol, epoxy, at-spi2-core, libXtst , xdg_utils @@ -19,12 +19,12 @@ with lib; mkDerivation rec { pname = "telegram-desktop"; - version = "2.1.0"; + version = "2.1.1"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "0l5917w90z9pg1al1hzcycb4yxv03vc88jg958ifl9nlvz1arll6"; + sha256 = "0032csgzwfby5a8q8w9iks7ggv1dcqli3qyhksbzly2xzxmfzqaj"; }; postPatch = '' @@ -43,7 +43,7 @@ mkDerivation rec { buildInputs = [ qtbase qtimageformats gtk3 libsForQt5.libdbusmenu enchant2 lz4 xxHash dee ffmpeg_4 openalSoft minizip libopus alsaLib libpulseaudio range-v3 - tl-expected microsoft_gsl hunspell + tl-expected hunspell # TODO: Shouldn't be required: pcre xorg.libpthreadstubs xorg.libXdmcp utillinux libselinux libsepol epoxy at-spi2-core libXtst ]; @@ -57,6 +57,7 @@ mkDerivation rec { "-DTDESKTOP_API_TEST=ON" "-DDESKTOP_APP_USE_PACKAGED_RLOTTIE=OFF" "-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF" + "-DDESKTOP_APP_USE_PACKAGED_GSL=OFF" "-DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=ON" "-DTDESKTOP_USE_PACKAGED_TGVOIP=OFF" #"-DDESKTOP_APP_SPECIAL_TARGET=\"\"" # TODO: Error when set to "": Bad special target '""' -- cgit v1.2.3 From 62faf787894a764da6f7b384e417833f47e12aa2 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 2 May 2020 21:44:46 +0200 Subject: sooperlooper: unstable-2016-07-19 -> unstable-2019-09-30 added alsaLib and fftw dependencies --- pkgs/applications/audio/sooperlooper/default.nix | 53 +++++++++++++++++------- 1 file changed, 38 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/audio/sooperlooper/default.nix b/pkgs/applications/audio/sooperlooper/default.nix index 3fb111db851..e7a43ad8a59 100644 --- a/pkgs/applications/audio/sooperlooper/default.nix +++ b/pkgs/applications/audio/sooperlooper/default.nix @@ -1,17 +1,32 @@ -{ stdenv, fetchFromGitHub, liblo, libxml2, libjack2, libsndfile, wxGTK, libsigcxx -, libsamplerate, rubberband, pkgconfig, libtool, gettext, ncurses, which +{ stdenv +, fetchFromGitHub , autoreconfHook +, pkgconfig +, which +, libtool +, liblo +, libxml2 +, libjack2 +, libsndfile +, wxGTK30 +, libsigcxx +, libsamplerate +, rubberband +, gettext +, ncurses +, alsaLib +, fftw }: stdenv.mkDerivation rec { - pname = "sooperlooper-git"; - version = "2016-07-19"; + pname = "sooperlooper"; + version = "unstable-2019-09-30"; src = fetchFromGitHub { owner = "essej"; repo = "sooperlooper"; - rev = "3bdfe184cd59b51c757b8048536abc1146fb0de4"; - sha256 = "0qz25h4idv79m97ici2kzx72fwzks3lysyksk3p3rx72lsijhf3g"; + rev = "4d1da14176e16b0f56b727bb1e6c2e8957515625"; + sha256 = "1gsgqa7hdymzw2al1ymzv0f33y161dyhh3fmy88lpjwv3bfchamg"; }; autoreconfPhase = '' @@ -22,11 +37,21 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig which libtool ]; buildInputs = [ - liblo libxml2 libjack2 libsndfile wxGTK libsigcxx - libsamplerate rubberband gettext ncurses + liblo + libxml2 + libjack2 + libsndfile + wxGTK30 + libsigcxx + libsamplerate + rubberband + gettext + ncurses + alsaLib + fftw ]; - meta = { + meta = with stdenv.lib; { description = "A live looping sampler capable of immediate loop recording, overdubbing, multiplying, reversing and more"; longDescription = '' It allows for multiple simultaneous multi-channel loops limited only by your computer's available memory. @@ -35,11 +60,9 @@ stdenv.mkDerivation rec { However, this kind of live performance looping tool is most effectively used via hardware (midi footpedals, etc) and the engine can be run standalone on a computer without a monitor. ''; - - version = version; - homepage = "http://essej.net/sooperlooper/index.html"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.magnetophon ]; - platforms = stdenv.lib.platforms.linux; + homepage = "http://essej.net/sooperlooper/"; # https is broken + license = licenses.gpl2; + maintainers = with maintainers; [ magnetophon ]; + platforms = platforms.linux; }; } -- cgit v1.2.3 From 5e52a39c95e12a3a51b67d0dad02643fccf16919 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Fri, 1 May 2020 16:02:22 -0400 Subject: woeusb: remove p7zip --- pkgs/tools/misc/woeusb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix index 4c235b4866f..991ab622490 100644 --- a/pkgs/tools/misc/woeusb/default.nix +++ b/pkgs/tools/misc/woeusb/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, makeWrapper -, coreutils, dosfstools, findutils, gawk, gnugrep, grub2_light, ncurses, ntfs3g, parted, p7zip, utillinux, wget +, coreutils, dosfstools, findutils, gawk, gnugrep, grub2_light, ncurses, ntfs3g, parted, utillinux, wget , wxGTK30 }: stdenv.mkDerivation rec { @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { # should be patched with a less useless default PATH, but for now # we add everything we need manually. wrapProgram "$out/bin/woeusb" \ - --set PATH '${stdenv.lib.makeBinPath [ coreutils dosfstools findutils gawk gnugrep grub2_light ncurses ntfs3g parted utillinux wget p7zip ]}' + --set PATH '${stdenv.lib.makeBinPath [ coreutils dosfstools findutils gawk gnugrep grub2_light ncurses ntfs3g parted utillinux wget ]}' ''; doInstallCheck = true; -- cgit v1.2.3 From d9fc843f95df84512f06ffaf1223cb6edf305843 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Fri, 1 May 2020 16:03:30 -0400 Subject: jetbrains: remove p7zip from nativeBuildInputs --- pkgs/applications/editors/jetbrains/common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix index cb732d076f2..07776bebe42 100644 --- a/pkgs/applications/editors/jetbrains/common.nix +++ b/pkgs/applications/editors/jetbrains/common.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, makeDesktopItem, makeWrapper, patchelf, p7zip +{ stdenv, lib, makeDesktopItem, makeWrapper, patchelf , coreutils, gnugrep, which, git, unzip, libsecret, libnotify }: @@ -26,7 +26,7 @@ with stdenv; lib.makeOverridable mkDerivation rec { ''; }; - nativeBuildInputs = [ makeWrapper patchelf p7zip unzip ]; + nativeBuildInputs = [ makeWrapper patchelf unzip ]; patchPhase = lib.optionalString (!stdenv.isDarwin) '' get_file_size() { -- cgit v1.2.3 From 06fa14fd7d1b1a3a82644bd2a8d735ec6150d750 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Fri, 1 May 2020 16:03:36 -0400 Subject: ark: remove p7zip --- pkgs/applications/kde/ark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix index 76cc423f546..dbbfcf80c6b 100644 --- a/pkgs/applications/kde/ark/default.nix +++ b/pkgs/applications/kde/ark/default.nix @@ -9,14 +9,14 @@ libarchive, libzip, # Archive tools - p7zip, lrzip, + lrzip, # Unfree tools unfreeEnableUnrar ? false, unrar, }: let - extraTools = [ p7zip lrzip ] ++ lib.optional unfreeEnableUnrar unrar; + extraTools = [ lrzip ] ++ lib.optional unfreeEnableUnrar unrar; in mkDerivation { -- cgit v1.2.3 From d6fcf36e47839eea3acb854c2831b49b6aa03d98 Mon Sep 17 00:00:00 2001 From: Christoph Neidahl Date: Sat, 2 May 2020 22:09:13 +0200 Subject: schismtracker: 20120105 -> 20190805 (#76725) --- pkgs/applications/audio/schismtracker/default.nix | 29 +++++++++++------------ 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix index b50dd78ff1a..36125489e3a 100644 --- a/pkgs/applications/audio/schismtracker/default.nix +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -1,30 +1,29 @@ -{ stdenv, fetchurl, alsaLib, python, SDL }: +{ stdenv, fetchFromGitHub +, autoreconfHook +, alsaLib, python, SDL }: stdenv.mkDerivation rec { - version = "20120105"; pname = "schismtracker"; + version = "20190805"; - src = fetchurl { - url = "http://schismtracker.org/dl/${pname}-${version}.tar.bz2"; - sha256 = "1ny7wv2wxm1av299wvpskall6438wjjpadphmqc7c0h6d0zg5kii"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "0qqps20vvn3rgpg8174bjrrm38gqcci2z5z4c1r1vhbccclahgsd"; }; - preConfigure = '' - # Build fails on Linux with windres. - export ac_cv_prog_ac_ct_WINDRES= - ''; - configureFlags = [ "--enable-dependency-tracking" ]; - buildInputs = [ alsaLib python SDL ]; + nativeBuildInputs = [ autoreconfHook python ]; - enableParallelBuilding = true; + buildInputs = [ alsaLib SDL ]; - meta = { + meta = with stdenv.lib; { description = "Music tracker application, free reimplementation of Impulse Tracker"; homepage = "http://schismtracker.org/"; - license = stdenv.lib.licenses.gpl2; + license = licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; - maintainers = [ stdenv.lib.maintainers.ftrvxmtrx ]; + maintainers = with maintainers; [ ftrvxmtrx ]; }; } -- cgit v1.2.3 From 70b4e2640302b85dfa7ac711b86a2589e0f7411a Mon Sep 17 00:00:00 2001 From: Keshav Kini Date: Sat, 2 May 2020 13:36:21 -0700 Subject: afio: package has moved to GitHub The old homepage and src URLs no longer exist. The author of the package confirms on GitHub that GitHub is now the official homepage (see kholtman/afio#12). --- pkgs/tools/archivers/afio/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/archivers/afio/default.nix b/pkgs/tools/archivers/afio/default.nix index e2fe3d90ee6..3b4eb6a5ea5 100644 --- a/pkgs/tools/archivers/afio/default.nix +++ b/pkgs/tools/archivers/afio/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl } : +{ stdenv, fetchFromGitHub } : stdenv.mkDerivation rec { version = "2.5.2"; pname = "afio"; - src = fetchurl { - url = "http://members.chello.nl/~k.holtman/${pname}-${version}.tgz"; - sha256 = "1fa29wlqv76hzf8bxp1qpza1r23pm2f3m7rcf0jpwm6z150s2k66"; + src = fetchFromGitHub { + owner = "kholtman"; + repo = "afio"; + rev = "v${version}"; + sha256 = "1vbxl66r5rp5a1qssjrkfsjqjjgld1cq57c871gd0m4qiq9rmcfy"; }; /* @@ -18,7 +20,7 @@ stdenv.mkDerivation rec { installFlags = [ "DESTDIR=$(out)" ]; meta = { - homepage = "http://members.chello.nl/~k.holtman/afio.html"; + homepage = "https://github.com/kholtman/afio"; description = "Fault tolerant cpio archiver targeting backups"; platforms = stdenv.lib.platforms.all; /* -- cgit v1.2.3 From aa0574e394136b2e154438b64b3019c8338de757 Mon Sep 17 00:00:00 2001 From: Eugene Shatsky Date: Sun, 3 May 2020 00:14:28 +0300 Subject: plasma5.kwin: add mesa dependency mesa provides libgbm required to build kwin_wayland drm backend with hw accel (compositing&clients) --- pkgs/desktops/plasma-5/kwin/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index 0e1709d8245..c3e9e2b9c24 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -11,11 +11,10 @@ kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n, kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage, kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem, kxmlgui, - plasma-framework, qtsensors, libcap, libdrm + plasma-framework, qtsensors, libcap, libdrm, mesa }: # TODO (ttuegel): investigate qmlplugindump failure -# TODO (ttuegel): investigate gbm dependency mkDerivation { name = "kwin"; @@ -30,7 +29,7 @@ mkDerivation { kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice kwayland kwidgetsaddons kwindowsystem kxmlgui plasma-framework - libcap libdrm + libcap libdrm mesa ]; outputs = [ "bin" "dev" "out" ]; patches = [ -- cgit v1.2.3 From 1cfe6aeca60cd8e04a6fac6a7977a76a91ff7eb7 Mon Sep 17 00:00:00 2001 From: Lana Black Date: Sat, 2 May 2020 22:18:00 +0000 Subject: latte-dock: 0.9.10 -> 0.9.11 --- pkgs/applications/misc/latte-dock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix index 3fc5099acc2..424da3ad360 100644 --- a/pkgs/applications/misc/latte-dock/default.nix +++ b/pkgs/applications/misc/latte-dock/default.nix @@ -3,11 +3,11 @@ mkDerivation rec { pname = "latte-dock"; - version = "0.9.10"; + version = "0.9.11"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${pname}-${version}.tar.xz"; - sha256 = "11s9fslr33h3ic14ifr43jphf68jpny8jmhvmrrwcz6w0p3falzw"; + sha256 = "0x7a93a7axsa0fzpbkkv1z722k9za4p51xcpzdpnh5ih1zij0csi"; name = "${pname}-${version}.tar.xz"; }; -- cgit v1.2.3 From f2d1041b6b5ba35662d1ffd53d2cdfd89951807e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Sun, 3 May 2020 00:45:00 +0200 Subject: nixos/deluge: remove p7zip from extraPackages defaults --- nixos/modules/services/torrent/deluge.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/torrent/deluge.nix b/nixos/modules/services/torrent/deluge.nix index 2f1e7300ca3..45398cb2613 100644 --- a/nixos/modules/services/torrent/deluge.nix +++ b/nixos/modules/services/torrent/deluge.nix @@ -142,7 +142,7 @@ in { description = '' Extra packages available at runtime to enable Deluge's plugins. For example, extraction utilities are required for the built-in "Extractor" plugin. - This always contains unzip, gnutar, xz, p7zip and bzip2. + This always contains unzip, gnutar, xz and bzip2. ''; }; @@ -187,7 +187,7 @@ in { ); # Provide a default set of `extraPackages`. - services.deluge.extraPackages = with pkgs; [ unzip gnutar xz p7zip bzip2 ]; + services.deluge.extraPackages = with pkgs; [ unzip gnutar xz bzip2 ]; systemd.tmpfiles.rules = [ "d '${cfg.dataDir}' 0770 ${cfg.user} ${cfg.group}" -- cgit v1.2.3 From 440110b83ffe8391e726dfa8efa83c229372a779 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Sat, 2 May 2020 16:36:49 -0700 Subject: nixpkgs-fmt: fix erroneous debug output (#86335) Prior to this, when used in conjunction with e.g. `format-all-mode`, garbage like node: NODE_STRING@[8934; 9139), indent: IndentLevel { level: 3, alignment: 0 } would be written to the file. --- pkgs/tools/nix/nixpkgs-fmt/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/nix/nixpkgs-fmt/default.nix b/pkgs/tools/nix/nixpkgs-fmt/default.nix index b95bb46a844..b55ac647b35 100644 --- a/pkgs/tools/nix/nixpkgs-fmt/default.nix +++ b/pkgs/tools/nix/nixpkgs-fmt/default.nix @@ -1,4 +1,4 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub, fetchpatch }: rustPlatform.buildRustPackage rec { pname = "nixpkgs-fmt"; version = "0.8.0"; @@ -10,6 +10,15 @@ rustPlatform.buildRustPackage rec { sha256 = "09lhi8aidw9qf94n07mgs2nfac32a96wkx50glj35dhn06iwzwqr"; }; + patches = [ + # Fixes debug output on stdout mangling some files. Fixed in next release. + # https://github.com/nix-community/nixpkgs-fmt/issues/201 + (fetchpatch { + url = "https://github.com/nix-community/nixpkgs-fmt/commit/648f46e1d5507592b246311618f467da282bf1b5.patch"; + sha256 = "18n4criyl0lydxmjqfkcmwx0pniyqzfgfxcjwz6czqwmx5y7b4rb"; + }) + ]; + cargoSha256 = "15m40d9354412h51zn806pxsqjai48xiw8chf8slbi0cjxd268j9"; meta = with lib; { -- cgit v1.2.3 From 9a2ec56ad4587b3aa3777e6fd480980c4d51b292 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 3 May 2020 01:29:24 +0200 Subject: python.pkgs.binwalk: remove p7zip from propagatedBuildInputs p7zip is abandoned and may not receive important security fixes. It was marked as insecure in aa80b4780d849a00d86c28d6b3c78a777dd02e9a `binwalk` might loose the possibility to extract some binary formats, but it's better than running it on untrusted imput. --- pkgs/development/python-modules/binwalk/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index 97c6b957a43..e8a20b6df47 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -7,7 +7,6 @@ , gzip , bzip2 , gnutar -, p7zip , cabextract , lzma , nose @@ -29,7 +28,7 @@ buildPythonPackage { sha256 = "1bxgj569fzwv6jhcbl864nmlsi9x1k1r20aywjxc8b9b1zgqrlvc"; }; - propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract lzma pycrypto ] + propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar cabextract lzma pycrypto ] ++ stdenv.lib.optional visualizationSupport pyqtgraph; # setup.py only installs version.py during install, not test -- cgit v1.2.3 From a09878c2056867fea2fa74914d6af8570cdfd870 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sun, 12 Apr 2020 20:32:05 +0200 Subject: syslinux: fix UEFI support --- pkgs/os-specific/linux/syslinux/default.nix | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index 94df0649ad4..06b31302eb8 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchFromRepoOrCz, fetchurl, nasm, perl, python3, libuuid, mtools, makeWrapper }: +{ stdenv, fetchgit, fetchurl, fetchpatch, nasm, perl, python3, libuuid, mtools, makeWrapper }: stdenv.mkDerivation { - name = "syslinux-2019-02-07"; + pname = "syslinux"; + version = "unstable-20190207"; # This is syslinux-6.04-pre3^1; syslinux-6.04-pre3 fails to run. # Same issue here https://www.syslinux.org/archives/2019-February/026330.html - src = fetchFromRepoOrCz { - repo = "syslinux"; + src = fetchgit { + url = "https://repo.or.cz/syslinux"; rev = "b40487005223a78c3bb4c300ef6c436b3f6ec1f7"; - sha256 = "1qrxl1114sr2i2791z9rf8v53g200aq30f08808d7i8qnmgvxl2w"; + sha256 = "1acf6byx7i6vz8hq6mra526g8mf7fmfhid211y8nq0v6px7d3aqs"; + fetchSubmodules = true; }; patches = let @@ -20,9 +22,9 @@ stdenv.mkDerivation { url = mkURL "fa1349f1" "0002-gfxboot-menu-label.patch"; sha256 = "06ifgzbpjj4picpj17zgprsfi501zf4pp85qjjgn29i5rs291zni"; }) - (fetchurl { - url = mkURL "477e56d2" "0005-gnu-efi-version-compatibility.patch"; - sha256 = "041568b4abb79wynyps1n04lg4fr26rc3sbjncz99pp0mbz0ajlm"; + (fetchpatch { + url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/0005-gnu-efi-version-compatibility.patch?h=packages/syslinux"; + sha256 = "0fbqz56hj8az8ws26m39hyp3l5fvcbzvzdddqz3x6n56hzdpz1p6"; }) (fetchurl { # mbr.bin: too big (452 > 440) @@ -48,6 +50,10 @@ stdenv.mkDerivation { # fix tests substituteInPlace tests/unittest/include/unittest/unittest.h \ --replace /usr/include/ "" + + # Hack to get `gcc -m32' to work without having 32-bit Glibc headers. + mkdir gnu-efi/inc/ia32/gnu + touch gnu-efi/inc/ia32/gnu/stubs-32.h ''; nativeBuildInputs = [ nasm perl python3 ]; @@ -61,12 +67,9 @@ stdenv.mkDerivation { makeFlags = [ "BINDIR=$(out)/bin" "SBINDIR=$(out)/sbin" - "LIBDIR=$(out)/lib" - "INCDIR=$(out)/include" "DATADIR=$(out)/share" "MANDIR=$(out)/share/man" "PERL=perl" - "bios" ]; doCheck = false; # fails. some fail in a sandbox, others require qemu -- cgit v1.2.3 From 4b44fd73c9c132af809dcc10e250be5a1bb8d8bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 30 Apr 2020 19:14:19 -0300 Subject: enlightenment.efl: format with nixpkgs-fmt --- pkgs/desktops/enlightenment/efl.nix | 62 ++++++++++++++++++++++++++++++++----- 1 file changed, 54 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index d3b0e43e476..831eb6ce1ca 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -1,11 +1,57 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, SDL, SDL2, alsaLib, - avahi, bullet, check, curl, dbus, doxygen, expat, fontconfig, - freetype, fribidi, ghostscript, giflib, glib, gst_all_1, gtk3, - harfbuzz, hicolor-icon-theme, ibus, jbig2dec, libGL, libdrm, - libinput, libjpeg, libpng, libpulseaudio, libraw, librsvg, - libsndfile, libspectre, libtiff, libwebp, libxkbcommon, luajit, lz4, - mesa, openjpeg, openssl, poppler, python27Packages, systemd, udev, - utillinux, writeText, xorg, zlib }: +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, SDL +, SDL2 +, alsaLib +, avahi +, bullet +, check +, curl +, dbus +, doxygen +, expat +, fontconfig +, freetype +, fribidi +, ghostscript +, giflib +, glib +, gst_all_1 +, gtk3 +, harfbuzz +, hicolor-icon-theme +, ibus +, jbig2dec +, libGL +, libdrm +, libinput +, libjpeg +, libpng +, libpulseaudio +, libraw +, librsvg +, libsndfile +, libspectre +, libtiff +, libwebp +, libxkbcommon +, luajit +, lz4 +, mesa +, openjpeg +, openssl +, poppler +, python27Packages +, systemd +, udev +, utillinux +, writeText +, xorg +, zlib +}: stdenv.mkDerivation rec { pname = "efl"; -- cgit v1.2.3 From a8bd3ec9ce5e94a6f778e6a9fff7d2158aeb25fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 30 Apr 2020 21:23:05 -0300 Subject: enlightenment.efl: 1.23.3 -> 1.24.0 --- pkgs/desktops/enlightenment/efl.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index 831eb6ce1ca..4b151c3f559 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -55,11 +55,11 @@ stdenv.mkDerivation rec { pname = "efl"; - version = "1.23.3"; + version = "1.24.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "00b9lp3h65254kdb1ys15fv7p3ln7qsvf15jkw4kli5ymagadkjk"; + sha256 = "1yhck2g4rwlzgnzqa4wjxw3lf6k6rd730hz4bwzajdjy7i26xfdk"; }; nativeBuildInputs = [ @@ -148,6 +148,7 @@ stdenv.mkDerivation rec { "-D build-tests=false" # disable build tests, which are not working "-D drm=true" "-D embedded-lz4=false" + "-D ecore-imf-loaders-disabler=ibus,scim" # ibus is disalbed by default, scim is not availabe in nixpkgs "-D evas-loaders-disabler=json" "-D fb=true" "-D opengl=full" -- cgit v1.2.3 From 58d1eb1a6c1eca5ea05929218b1c44ce4ec7a075 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 2 May 2020 00:21:38 -0300 Subject: enlightenment.efl: migrate to python3 --- pkgs/desktops/enlightenment/efl.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index 4b151c3f559..bd6c0529925 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -44,7 +44,7 @@ , openjpeg , openssl , poppler -, python27Packages +, python3Packages , systemd , udev , utillinux @@ -123,7 +123,7 @@ stdenv.mkDerivation rec { luajit openjpeg poppler - python27Packages.dbus-python + python3Packages.dbus-python utillinux xorg.libXScrnSaver xorg.libXcomposite -- cgit v1.2.3 From 5efa6f0c91ff464d96c360845b8fffbebfb8ad72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 2 May 2020 00:22:16 -0300 Subject: enlightenment.econnman: migrate to python3 --- pkgs/desktops/enlightenment/econnman.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/enlightenment/econnman.nix b/pkgs/desktops/enlightenment/econnman.nix index dfe294ef5c6..1979b4518a7 100644 --- a/pkgs/desktops/enlightenment/econnman.nix +++ b/pkgs/desktops/enlightenment/econnman.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, efl, python2Packages, dbus, makeWrapper }: +{ stdenv, fetchurl, pkgconfig, efl, python3Packages, dbus, makeWrapper }: stdenv.mkDerivation rec { pname = "econnman"; @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { sha256 = "057pwwavlvrrq26bncqnfrf449zzaim0zq717xv86av4n940gwv0"; }; - nativeBuildInputs = [ makeWrapper pkgconfig python2Packages.wrapPython ]; + nativeBuildInputs = [ makeWrapper pkgconfig python3Packages.wrapPython ]; - buildInputs = [ efl python2Packages.python dbus ]; + buildInputs = [ efl python3Packages.python dbus ]; - pythonPath = [ python2Packages.pythonefl python2Packages.dbus-python ]; + pythonPath = [ python3Packages.pythonefl python3Packages.dbus-python ]; postInstall = '' wrapPythonPrograms -- cgit v1.2.3 From 5374042779fe2d4b767bdee21d8d5bce4660d4e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 1 May 2020 23:02:02 -0300 Subject: pythonPackages.pythonefl: format --- pkgs/development/python-modules/python-efl/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix index 0657c627770..ce5057a4f25 100644 --- a/pkgs/development/python-modules/python-efl/default.nix +++ b/pkgs/development/python-modules/python-efl/default.nix @@ -1,4 +1,10 @@ -{ stdenv, fetchurl, buildPythonPackage, pkgconfig, python, enlightenment }: +{ stdenv +, fetchurl +, buildPythonPackage +, pkgconfig +, python +, enlightenment +}: # Should be bumped along with EFL! @@ -18,12 +24,16 @@ buildPythonPackage rec { propagatedBuildInputs = [ python.pkgs.dbus-python ]; preConfigure = '' - export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${stdenv.lib.getDev python.pkgs.dbus-python}/include/dbus-1.0 $NIX_CFLAGS_COMPILE" + 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"; + preBuild = '' + ${python.interpreter} setup.py build_ext + ''; - installPhase= "${python.interpreter} setup.py install --prefix=$out"; + installPhase = '' + ${python.interpreter} setup.py install --prefix=$out + ''; doCheck = false; -- cgit v1.2.3 From 3ae05b64b6b25ef6bdefa085ec485a9ed16afb44 Mon Sep 17 00:00:00 2001 From: Emily Date: Sun, 3 May 2020 01:49:30 +0100 Subject: memtest86-efi: compute ESP offset from partitions --- pkgs/tools/misc/memtest86-efi/default.nix | 33 ++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/memtest86-efi/default.nix b/pkgs/tools/misc/memtest86-efi/default.nix index f2adadc0840..c33aa074404 100644 --- a/pkgs/tools/misc/memtest86-efi/default.nix +++ b/pkgs/tools/misc/memtest86-efi/default.nix @@ -1,4 +1,10 @@ -{ fetchzip, lib, stdenv, mtools }: +{ stdenv +, lib +, fetchzip +, utillinux +, jq +, mtools +}: stdenv.mkDerivation rec { pname = "memtest86-efi"; @@ -22,19 +28,28 @@ stdenv.mkDerivation rec { stripRoot = false; }; - nativeBuildInputs = [ mtools ]; + nativeBuildInputs = [ + utillinux + jq + mtools + ]; installPhase = '' - mkdir -p $out $TEMP/memtest86-files - # memtest86 is distributed as a bootable USB image. It contains the actual # memtest86 EFI app. # - # The following uses dd and mcopy to extract the actual EFI app from the - # usb image so that it can be installed directly on the hard drive. - dd if=$src/memtest86-usb.img of=$TEMP/ESP.img skip=2048 - mcopy -i $TEMP/ESP.img ::/EFI/BOOT/ $TEMP/memtest86-files/ - mv $TEMP/memtest86-files/BOOT/* $out/ + # The following uses sfdisk to calculate the offset of the FAT EFI System + # Partition in the disk image, and mcopy to extract the actual EFI app from + # the filesystem so that it can be installed directly on the hard drive. + IMG=$src/memtest86-usb.img + ESP_OFFSET=$(sfdisk --json $IMG | jq -r ' + # Partition type GUID identifying EFI System Partitions + def ESP_GUID: "C12A7328-F81F-11D2-BA4B-00A0C93EC93B"; + .partitiontable | + .sectorsize * (.partitions[] | select(.type == ESP_GUID) | .start) + ') + mkdir $out + mcopy -vsi $IMG@@$ESP_OFFSET ::'/EFI/BOOT/*' $out/ ''; meta = with lib; { -- cgit v1.2.3 From 991c4d48db1d0917434633d28e13d54199abaea5 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 3 May 2020 09:05:42 +0800 Subject: unar: 1.10.1 -> 1.10.7 --- pkgs/tools/archivers/unar/default.nix | 59 ++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/pkgs/tools/archivers/unar/default.nix b/pkgs/tools/archivers/unar/default.nix index 259238cdec5..9fdbada9ab8 100644 --- a/pkgs/tools/archivers/unar/default.nix +++ b/pkgs/tools/archivers/unar/default.nix @@ -1,52 +1,54 @@ -{ stdenv, fetchurl, gnustep, unzip, bzip2, zlib, icu, openssl }: +{ stdenv, fetchFromGitHub, installShellFiles, gnustep, bzip2, zlib, icu, openssl, wavpack }: -let +stdenv.mkDerivation rec { pname = "unar"; + version = "1.10.7"; -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; - version = "1.10.1"; - - src = fetchurl { - url = "http://unarchiver.c3.cx/downloads/${pname}${version}_src.zip"; - sha256 = "0aq9zlar5vzr5qxphws8dm7ax60bsfsw77f4ciwa5dq5lla715j0"; + src = fetchFromGitHub { + owner = "MacPaw"; + # the unar repo contains a shallow clone of both XADMaster and universal-detector + repo = "unar"; + rev = "v${version}"; + sha256 = "0p846q1l66k3rnd512sncp26zpv411b8ahi145sghfcsz9w8abc4"; }; - buildInputs = [ gnustep.base bzip2 icu openssl zlib ]; - - nativeBuildInputs = [ gnustep.make unzip ]; - - enableParallelBuilding = true; - postPatch = '' for f in Makefile.linux ../UniversalDetector/Makefile.linux ; do substituteInPlace $f \ - --replace "CC = gcc" "CC=cc" \ - --replace "CXX = g++" "CXX=c++" \ - --replace "OBJCC = gcc" "OBJCC=cc" \ - --replace "OBJCXX = g++" "OBJCXX=c++" + --replace "= gcc" "=cc" \ + --replace "= g++" "=c++" done + + # we need to build inside this directory as well, so we have to make it writeable + chmod +w ../UniversalDetector -R ''; + buildInputs = [ gnustep.base bzip2 icu openssl wavpack zlib ]; + + nativeBuildInputs = [ gnustep.make installShellFiles ]; + + enableParallelBuilding = true; + + dontConfigure = true; + makefile = "Makefile.linux"; - sourceRoot = "./The Unarchiver/XADMaster"; + sourceRoot = "./source/XADMaster"; installPhase = '' runHook preInstall - install -Dm755 -t $out/bin lsar unar - install -Dm644 -t $out/share/man/man1 ../Extra/{lsar,unar}.1 - - mkdir -p $out/etc/bash_completion.d - cp ../Extra/lsar.bash_completion $out/etc/bash_completion.d/lsar - cp ../Extra/unar.bash_completion $out/etc/bash_completion.d/unar + install -Dm555 -t $out/bin lsar unar + for f in lsar unar; do + installManPage ./Extra/$f.? + installShellCompletion --bash --name $f ./Extra/$f.bash_completion + done runHook postInstall ''; meta = with stdenv.lib; { - homepage = "http://unarchiver.c3.cx/unarchiver"; + homepage = "https://theunarchiver.com"; description = "An archive unpacker program"; longDescription = '' The Unarchiver is an archive unpacker program with support for the popular \ @@ -55,7 +57,8 @@ in stdenv.mkDerivation rec { Compact Pro, Packit, cpio, compress (.Z), ARJ, ARC, PAK, ACE, ZOO, LZH, \ ADF, DMS, LZX, PowerPacker, LBR, Squeeze, Crunch, and other old formats. ''; - license = with licenses; [ lgpl21Plus ]; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ peterhoeg ]; platforms = with platforms; linux; }; } -- cgit v1.2.3 From 00f35a4397c39c5e7f5f0c3ec3eb9e9c7001a668 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sat, 2 May 2020 08:21:23 +0200 Subject: llvm_7,8,9: disable libpfm on aarch32 The armv7l builder has has the same issue some of the aarch64 ones have (#56245) See: https://hydra.nixos.org/eval/1583749?filter=llvm_&compare=1583176&full=#tabs-still-fail https://nix-cache.s3.amazonaws.com/log/3ppqyssyqj5d6sh257zfb5rb6km4m6sa-llvm-7.1.0.drv https://nix-cache.s3.amazonaws.com/log/rmacd5xwkw3lyb6zknc3sgdcb3cvk6k1-llvm-8.0.1.drv https://nix-cache.s3.amazonaws.com/log/6s8pasqwkrzzv5lgw1l22zy7mrpzx2p3-llvm-9.0.1.drv --- pkgs/development/compilers/llvm/7/llvm.nix | 1 + pkgs/development/compilers/llvm/8/llvm.nix | 1 + pkgs/development/compilers/llvm/9/llvm.nix | 1 + 3 files changed, 3 insertions(+) diff --git a/pkgs/development/compilers/llvm/7/llvm.nix b/pkgs/development/compilers/llvm/7/llvm.nix index 55485418e4f..702a0edb663 100644 --- a/pkgs/development/compilers/llvm/7/llvm.nix +++ b/pkgs/development/compilers/llvm/7/llvm.nix @@ -17,6 +17,7 @@ , enableSharedLibraries ? true , enablePFM ? !(stdenv.isDarwin || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 + || stdenv.isAarch32 # broken for the armv7l builder ) , enablePolly ? false }: diff --git a/pkgs/development/compilers/llvm/8/llvm.nix b/pkgs/development/compilers/llvm/8/llvm.nix index 43615fc675d..2d996f0dd4c 100644 --- a/pkgs/development/compilers/llvm/8/llvm.nix +++ b/pkgs/development/compilers/llvm/8/llvm.nix @@ -16,6 +16,7 @@ , enableSharedLibraries ? true , enablePFM ? !(stdenv.isDarwin || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 + || stdenv.isAarch32 # broken for the armv7l builder ) , enablePolly ? false }: diff --git a/pkgs/development/compilers/llvm/9/llvm.nix b/pkgs/development/compilers/llvm/9/llvm.nix index f69f45b858b..aa58503a77f 100644 --- a/pkgs/development/compilers/llvm/9/llvm.nix +++ b/pkgs/development/compilers/llvm/9/llvm.nix @@ -16,6 +16,7 @@ , enableSharedLibraries ? true , enablePFM ? !(stdenv.isDarwin || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 + || stdenv.isAarch32 # broken for the armv7l builder ) , enablePolly ? false }: -- cgit v1.2.3 From 896e2f4ba738fe3cb0492f3ad6e134f2ba25a68a Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 3 May 2020 07:54:24 +0200 Subject: llvm_10: disable libpfm on aarch32 This is a speculative fix since the llvm_10 build runs OOM currently but it should also be affected. See parent commit for more info. --- pkgs/development/compilers/llvm/10/llvm.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/llvm/10/llvm.nix b/pkgs/development/compilers/llvm/10/llvm.nix index 648c9fdefc3..18c25f51815 100644 --- a/pkgs/development/compilers/llvm/10/llvm.nix +++ b/pkgs/development/compilers/llvm/10/llvm.nix @@ -16,6 +16,7 @@ , enableSharedLibraries ? true , enablePFM ? !(stdenv.isDarwin || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 + || stdenv.isAarch32 # broken for the armv7l builder ) , enablePolly ? true }: -- cgit v1.2.3 From a44b3b6afc32849533052528c976c8e23ea7ed92 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 3 May 2020 17:09:33 +1000 Subject: nixos/cri-o: copy upstream config --- nixos/modules/virtualisation/cri-o.nix | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix index 89ba9c3c663..2af4214302d 100644 --- a/nixos/modules/virtualisation/cri-o.nix +++ b/nixos/modules/virtualisation/cri-o.nix @@ -4,6 +4,11 @@ with lib; let cfg = config.virtualisation.cri-o; + + # Copy configuration files to avoid having the entire sources in the system closure + copyFile = filePath: pkgs.runCommandNoCC (builtins.unsafeDiscardStringContext (builtins.baseNameOf filePath)) {} '' + cp ${filePath} $out + ''; in { imports = [ @@ -45,9 +50,9 @@ in config = mkIf cfg.enable { environment.systemPackages = with pkgs; [ cri-o cri-tools conmon iptables runc utillinux ]; - environment.etc."crictl.yaml".text = '' - runtime-endpoint: unix:///var/run/crio/crio.sock - ''; + + environment.etc."crictl.yaml".source = copyFile "${pkgs.cri-o.src}/crictl.yaml"; + environment.etc."crio/crio.conf".text = '' [crio] storage_driver = "${cfg.storageDriver}" @@ -66,23 +71,7 @@ in manage_network_ns_lifecycle = true ''; - environment.etc."cni/net.d/20-cri-o-bridge.conf".text = '' - { - "cniVersion": "0.3.1", - "name": "crio-bridge", - "type": "bridge", - "bridge": "cni0", - "isGateway": true, - "ipMasq": true, - "ipam": { - "type": "host-local", - "subnet": "10.88.0.0/16", - "routes": [ - { "dst": "0.0.0.0/0" } - ] - } - } - ''; + environment.etc."cni/net.d/10-crio-bridge.conf".source = copyFile "${pkgs.cri-o.src}/contrib/cni/10-crio-bridge.conf"; # Enable common /etc/containers configuration virtualisation.containers.enable = true; -- cgit v1.2.3 From e2aa2f50f6d94ba97b513e627e1c4ed98181fdce Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 3 May 2020 11:06:53 +0200 Subject: mutt: 1.13.5 -> 1.14.0 Signed-off-by: Matthias Beyer --- pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 81b2fcf62bc..e1eb8863a08 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "1.13.5"; + version = "1.14.0"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "0lx65a44b03rbvcrz0y9syrik67fx3hvblxyyvz5l9bb7rdipmvc"; + sha256 = "1y7racrhz06k9mwxw5qspfjfyvbj5fmwai3gsfgrm36k7al84bnz"; }; patches = optional smimeSupport (fetchpatch { -- cgit v1.2.3 From 5735af6cbccb51a2ad8d380acf4b978b4e7b3909 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 3 May 2020 04:20:00 -0500 Subject: drill: 0.5.0 -> 0.6.0 --- pkgs/tools/networking/drill/default.nix | 13 ++++++++----- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/drill/default.nix b/pkgs/tools/networking/drill/default.nix index 7636bd44d2d..572dc0d8384 100644 --- a/pkgs/tools/networking/drill/default.nix +++ b/pkgs/tools/networking/drill/default.nix @@ -3,23 +3,26 @@ , fetchFromGitHub , pkg-config , openssl +, Security }: rustPlatform.buildRustPackage rec { pname = "drill"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "fcsonline"; repo = pname; rev = version; - sha256 = "0aqd709fg0ha0lzri2p4pgraxvif7z8zcm8rx7sk6s2n605sc4gn"; + sha256 = "0pcc91nk68z7hlhj7xvh6v3rybxpy6bzv3pzjcyaq7l0szjljrpw"; }; - cargoSha256 = "1c8vmyf388kbbs56h8b62nxgxvgy9yj9cnmvax6ycnslkcwmvld0"; + cargoSha256 = "1611w8b60d3x16ik8v96za0mkr5p0f9gdpz0awprfgj6c3r6s16m"; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; + buildInputs = [ ] + ++ stdenv.lib.optionals stdenv.isLinux [ openssl ] + ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; meta = with stdenv.lib; { description = "HTTP load testing application inspired by Ansible syntax"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3bf311ea591..d01c4cfe287 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2974,7 +2974,9 @@ in driftnet = callPackage ../tools/networking/driftnet {}; - drill = callPackage ../tools/networking/drill { }; + drill = callPackage ../tools/networking/drill { + inherit (darwin.apple_sdk.frameworks) Security; + }; drone = callPackage ../development/tools/continuous-integration/drone { }; -- cgit v1.2.3 From eafd5b4d1ba8d59d4b3c64ef3e648283e4a4d536 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 3 May 2020 04:20:00 -0500 Subject: racket: 7.6 -> 7.7 --- pkgs/development/interpreters/racket/default.nix | 9 +++------ pkgs/development/interpreters/racket/minimal.nix | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index 725b1d5106d..1db01c0d775 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { pname = "racket"; - version = "7.6"; # always change at once with ./minimal.nix + version = "7.7"; # always change at once with ./minimal.nix src = (stdenv.lib.makeOverridable ({ name, sha256 }: fetchurl { @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { } )) { name = "${pname}-${version}"; - sha256 = "0yagy7qrnz96gwafnj3whh2vs54788k1ci3vkm100h68gsw638b8"; + sha256 = "0cx5h3k0n58cb442qzp3jlc7n1b9dbaxv9blg2rjil2rn119yrb2"; }; FONTCONFIG_FILE = fontsConf; @@ -82,10 +82,7 @@ stdenv.mkDerivation rec { ''; shared = if stdenv.isDarwin then "dylib" else "shared"; - configureFlags = [ "--enable-${shared}" "--enable-lt=${libtool}/bin/libtool" - # The following flag is a temporary workaround for an upstream bug: - # https://github.com/racket/racket/issues/3046 - "--enable-useprefix" ] + configureFlags = [ "--enable-${shared}" "--enable-lt=${libtool}/bin/libtool" ] ++ stdenv.lib.optional disableDocs [ "--disable-docs" ] ++ stdenv.lib.optional stdenv.isDarwin [ "--enable-xonx" ]; diff --git a/pkgs/development/interpreters/racket/minimal.nix b/pkgs/development/interpreters/racket/minimal.nix index 9e817b76000..a4a7a5c12cd 100644 --- a/pkgs/development/interpreters/racket/minimal.nix +++ b/pkgs/development/interpreters/racket/minimal.nix @@ -5,7 +5,7 @@ racket.overrideAttrs (oldAttrs: rec { name = "racket-minimal-${oldAttrs.version}"; src = oldAttrs.src.override { inherit name; - sha256 = "0id094q9024hj2n3907l7dblp3iix1v5289xzskmh5c26xfygp9y"; + sha256 = "1lxcd4ix8q3089xql48hwccxvcpkinfxwxnc6fhcjdgzqcyxh3ln"; }; meta = oldAttrs.meta // { -- cgit v1.2.3 From a89c50fc9b88f6596a1a3d494a97cbfabd6581ac Mon Sep 17 00:00:00 2001 From: Peter Kolloch Date: Sun, 3 May 2020 11:43:19 +0200 Subject: maintainers: add kolloch --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e8b30c6cba3..9c98d743ee5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4084,6 +4084,12 @@ githubId = 6346418; name = "Kolby Crouch"; }; + kolloch = { + email = "info@eigenvalue.net"; + github = "kolloch"; + githubId = 339354; + name = "Peter Kolloch"; + }; konimex = { email = "herdiansyah@netc.eu"; github = "konimex"; -- cgit v1.2.3 From 2869cd03d3218c2c3df9f07ea722f635820d276e Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 3 May 2020 11:45:36 +0200 Subject: octoprint: fix build --- pkgs/applications/misc/octoprint/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index a03e7ee0c7f..377c8544f66 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -17,6 +17,7 @@ let self = py; packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ (mkOverride "flask" "0.12.5" "fac2b9d443e49f7e7358a444a3db5950bdd0324674d92ba67f8f1f15f876b14f") + (mkOverride "flaskbabel" "0.12.2" "11jwp8vvq1gnm31qh6ihy2h393hy18yn9yjp569g60r0wj1x2sii") (mkOverride "tornado" "4.5.3" "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d") (mkOverride "psutil" "5.6.7" "ffad8eb2ac614518bbe3c0b8eb9dffdb3a8d2e3a7d5da51c5b974fb723a5c5aa") @@ -50,7 +51,7 @@ let owner = "foosel"; repo = "OctoPrint"; rev = version; - sha256 = "1zla1ayr62lkvkr828dh3y287rzj3rv1hpij9kws44ynn4i582ga"; + sha256 = "0387228544v28d69dcdg2zr5gp6qavkfr6dydpjgj5awxv3w25d5"; }; propagatedBuildInputs = with super; [ -- cgit v1.2.3 From 3188961af1fdfda368bff36691bc0ae1c1610a99 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 3 May 2020 11:48:20 +0200 Subject: Update pkgs/top-level/all-packages.nix --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0fffea2fbf1..c988b561150 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21060,7 +21060,7 @@ in octoprint = callPackage ../applications/misc/octoprint { }; - octoprint-plugins = throw ''octoprint-plugins are now part of the octoprint package set.''; + octoprint-plugins = throw ''octoprint-plugins are now part of the octoprint.python.pkgs package set.''; ocrad = callPackage ../applications/graphics/ocrad { }; -- cgit v1.2.3 From 1e38e7bec9fd502781465230fdd45e07023e0f26 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 3 May 2020 11:53:03 +0200 Subject: Revert "buildPythonPackage: always add interpreter to passthru" This reverts commit 40c012bc855b1e9f96df8cc2186a91332be2d3e6. --- pkgs/top-level/python-packages.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1660e890e15..5548f8c75a7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -78,7 +78,6 @@ let # Use passthru in order to prevent rebuilds when possible. passthru = (oldAttrs.passthru or {})// { pythonModule = python; - inherit python; pythonPath = [ ]; # Deprecated, for compatibility. requiredPythonModules = requiredPythonModules drv.propagatedBuildInputs; }; @@ -93,7 +92,6 @@ let # used by `nix-env`. name = removePythonPrefix oldAttrs.name; pythonModule = false; - inherit python; }; }); -- cgit v1.2.3 From d5fb3b4e28ca3ef4222a87996fddef97521c7318 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Sun, 3 May 2020 11:59:18 +0200 Subject: octoprint: add passthru.python --- pkgs/applications/misc/octoprint/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 377c8544f66..3c192c124cb 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -90,6 +90,8 @@ let "test_set_external_modification" ]; + passthru.python = self.python; + meta = with stdenv.lib; { homepage = "https://octoprint.org/"; description = "The snappy web interface for your 3D printer"; -- cgit v1.2.3 From 4e55ea04e8d86c62f5b8d94916a9a3ad5b371bac Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Wed, 15 Apr 2020 14:06:45 -0400 Subject: php.extensions.sqlsrv: 5.8.0 -> 5.8.1 --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 43c4e5fc90d..1b6d3dcc6d9 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -691,10 +691,10 @@ in }; sqlsrv = buildPecl { - version = "5.8.0"; + version = "5.8.1"; pname = "sqlsrv"; - sha256 = "1kv4krk1w4hri99b0sdgwgy9c4y0yh217wx2y3irhkfi46kdrjnw"; + sha256 = "0c9a6ghch2537vi0274vx0mn6nb1xg2qv7nprnf3xdfqi5ww1i9r"; buildInputs = [ pkgs.unixODBC ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ]; -- cgit v1.2.3 From 88979ff3aa31e6e997981fb953ad0c02c078e3a2 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Wed, 15 Apr 2020 14:09:04 -0400 Subject: php.extensions.pdo_sqlsrv: 5.8.0 -> 5.8.1 --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 1b6d3dcc6d9..9532f113ae3 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -580,10 +580,10 @@ in }; pdo_sqlsrv = buildPecl { - version = "5.8.0"; + version = "5.8.1"; pname = "pdo_sqlsrv"; - sha256 = "0z4vbyd851b4jr6p69l2ylk91iihndsm2qjb429pxcv8g6dqzqll"; + sha256 = "06ba4x34fgs092qq9w62y2afsm1nyasqiprirk4951ax9v5vcir0"; internalDeps = [ php.extensions.pdo ]; -- cgit v1.2.3 From 3f58552956740e1fd9589cfdd33f191e0dd9a55e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 3 May 2020 13:33:05 +0100 Subject: dmg2img: fix build against openssl 1.1 --- pkgs/tools/misc/dmg2img/default.nix | 17 +++++++++++++---- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/dmg2img/default.nix b/pkgs/tools/misc/dmg2img/default.nix index df084579b79..267983dd432 100644 --- a/pkgs/tools/misc/dmg2img/default.nix +++ b/pkgs/tools/misc/dmg2img/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, bzip2, openssl }: +{ stdenv, fetchurl, zlib, bzip2, openssl, fetchpatch }: stdenv.mkDerivation rec { name = "dmg2img-1.6.7"; @@ -8,11 +8,20 @@ stdenv.mkDerivation rec { sha256 = "066hqhg7k90xcw5aq86pgr4l7apzvnb4559vj5s010avbk8adbh2"; }; - buildInputs = [zlib bzip2 openssl]; + buildInputs = [ zlib bzip2 openssl ]; + + patches = [ + (fetchpatch { + url = "https://raw.githubusercontent.com/Homebrew/formula-patches/85fa66a9/dmg2img/openssl-1.1.diff"; + sha256 = "076sz69hf3ryylplg025vl8sj991cb81g3yazsmrf8anrd7ffmxx"; + }) + ]; + + patchFlags = [ "-p0" ]; installPhase = '' - mkdir -p $out/bin - cp dmg2img $out/bin + install -D dmg2img $out/bin/dmg2img + install -D vfdecrypt $out/bin/vfdecrypt ''; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c988b561150..4685296a8d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2929,9 +2929,7 @@ in dmd = callPackage ../development/compilers/dmd { }; - dmg2img = callPackage ../tools/misc/dmg2img { - openssl = openssl_1_0_2; - }; + dmg2img = callPackage ../tools/misc/dmg2img { }; docbook2odf = callPackage ../tools/typesetting/docbook2odf { }; -- cgit v1.2.3 From 42b7f86b6f91d91bdb37430ecd6bcf3a9fe9de26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 3 May 2020 11:41:16 -0300 Subject: xfce.xfwm4: 4.14.0 -> 4.14.2 --- pkgs/desktops/xfce/core/xfwm4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/core/xfwm4/default.nix b/pkgs/desktops/xfce/core/xfwm4/default.nix index ed77699f191..1d119014cab 100644 --- a/pkgs/desktops/xfce/core/xfwm4/default.nix +++ b/pkgs/desktops/xfce/core/xfwm4/default.nix @@ -5,9 +5,9 @@ mkXfceDerivation { category = "xfce"; pname = "xfwm4"; - version = "4.14.0"; # TODO: remove xfce4-14 alias when this gets bumped + version = "4.14.2"; - sha256 = "1z5aqij2d8n9wnha88b0qzkvss54jvqs8w1w5m3mzjl4c9mn9n8m"; + sha256 = "1zzc4q1j55hjljksmlyghk58bx7kxyq3scihsr9zgyqc24ww1ks3"; nativeBuildInputs = [ exo librsvg ]; -- cgit v1.2.3 From 80921de46cc181de80cdd9ead693ce50bae65fa4 Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Sun, 3 May 2020 14:50:42 +0000 Subject: lnd: 0.9.2 -> 0.10.0 --- pkgs/applications/blockchains/lnd.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/lnd.nix b/pkgs/applications/blockchains/lnd.nix index 0aa087e20af..aff38e242f8 100644 --- a/pkgs/applications/blockchains/lnd.nix +++ b/pkgs/applications/blockchains/lnd.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lnd"; - version = "0.9.2-beta"; + version = "0.10.0-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - sha256 = "0gm33z89fiqv231ks2mkpsblskcsijipq8fcmip6m6jy8g06b1gb"; + sha256 = "1amciz924s2h6qhy7w34jpv1jc25p5ayfxzvjph6hhx0bccrm88w"; }; - modSha256 = "1khxplvyaqgaddrx1nna1fw0nb1xz9bmqpxpfifif4f5nmx90gbr"; + modSha256 = "15i4h3pkvyav9qsbfinzifram0knkylg24j6j0mxs4bnj80j4ycm"; subPackages = ["cmd/lncli" "cmd/lnd"]; -- cgit v1.2.3 From fb7e28ebbec02cdf6f3a6ba474c86ffdce87975e Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Sun, 3 May 2020 07:53:41 -0700 Subject: zoxide: 0.3.1 -> 0.4.0 https://github.com/ajeetdsouza/zoxide/compare/v0.3.1...v0.4.0 Most notable changes, IMHO: - `zoxide init` now uses PWD hooks by default - `fish` no longer `cd`s to the user's home when no match is found - Interactive mode in `zoxide` no longer throws an error if `fzf` exits gracefully --- pkgs/tools/misc/zoxide/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/zoxide/default.nix b/pkgs/tools/misc/zoxide/default.nix index a43d41637b1..d2abd143ce4 100644 --- a/pkgs/tools/misc/zoxide/default.nix +++ b/pkgs/tools/misc/zoxide/default.nix @@ -6,20 +6,20 @@ rustPlatform.buildRustPackage rec { pname = "zoxide"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "ajeetdsouza"; repo = "zoxide"; rev = "v${version}"; - sha256 = "1sad18d0pxfdy9gvjmixzgdskg1l7djvzp0aipx7pz0lyi6gs23z"; + sha256 = "1qkvmjrkcivfzbm6swl5lgvpqz9av9jxcn9i8ms3wz4vfsibmlxv"; }; buildInputs = [ fzf ]; - cargoSha256 = "1sx3s1jnfxylbjr3x6v6j8a6zkl7hfyj4alzlyrsw36b1b64pwqm"; + cargoSha256 = "1w921f7b6kzc1mjzff1bcs3mg4cp9h48698w2zlv5jzjs7nwgb8n"; meta = with lib; { description = "A fast cd command that learns your habits"; -- cgit v1.2.3 From 693e0fa0850424ddff5bee1981dfd3d184dbd9e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 May 2020 15:13:01 +0200 Subject: orca: 3.36.1 -> 3.36.2 --- pkgs/applications/misc/orca/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index c9fc0ff30fc..0ca4f11e548 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -35,13 +35,13 @@ buildPythonApplication rec { pname = "orca"; - version = "3.36.1"; + version = "3.36.2"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "07w3k0f791zd1pj9j6d27k7gk7c6hx112ngrdz18h573df5n9b61"; + sha256 = "0hxz8wlyjn6w3zqg1p56pwdj0p23d6vynzczklyc6n91dyvma06g"; }; patches = [ -- cgit v1.2.3 From 713bef763bee5206772fd3139d06527dc6078927 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 May 2020 15:13:29 +0200 Subject: gnome-user-docs: 3.36.1 -> 3.36.2 --- pkgs/data/documentation/gnome-user-docs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/documentation/gnome-user-docs/default.nix b/pkgs/data/documentation/gnome-user-docs/default.nix index 36735ff99ae..294f210c21f 100644 --- a/pkgs/data/documentation/gnome-user-docs/default.nix +++ b/pkgs/data/documentation/gnome-user-docs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "gnome-user-docs"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0vnwya5g7fg0jhdrg9drxnx83lhk8qa2nvcrmd1sdfanlz4qfhjf"; + sha256 = "0n4rbrq5zww6gjjmicyw5hlvzi8azc6m4sisak15snkp6v4f93qr"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 06fc4f2a33035c220c797252631c028a40e01468 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 May 2020 15:13:52 +0200 Subject: gnome3.accerciser: 3.36.1 -> 3.36.2 --- pkgs/desktops/gnome-3/apps/accerciser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/apps/accerciser/default.nix index f068d1994ec..192c179a93f 100644 --- a/pkgs/desktops/gnome-3/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/apps/accerciser/default.nix @@ -17,13 +17,13 @@ python3.pkgs.buildPythonApplication rec { name = "accerciser-${version}"; - version = "3.36.0"; + version = "3.36.1"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/accerciser/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1iwi7mnayw1f90s439flh0zkgmj4qx10dzgj38nd5f3wvqmhabk3"; + sha256 = "1ig9zcg8z7yv2c28q0a4q57ckkpmzjsbnancx01rjihrrjbg9ib2"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 688587cd8f1b2b70b63418f9be519d2d4387c577 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 May 2020 15:18:14 +0200 Subject: evolution-data-server: 3.36.1 -> 3.36.2 --- pkgs/desktops/gnome-3/core/evolution-data-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix index f5d60ee917c..0d3c786690d 100644 --- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix +++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "evolution-data-server"; - version = "3.36.1"; + version = "3.36.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "15k7k225jfv5a45hmjk94xq90np2r9f5v8yj0xi3166vvlp2n4hk"; + sha256 = "0yz9fsnbnnlj2iidd81i9w7d0dhidrzqkixrnfjfdkhnxk7p9qlq"; }; patches = [ -- cgit v1.2.3 From 842a344fa0875cca5cd72919ccaec61cb384687a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 May 2020 15:14:10 +0200 Subject: gnome3.evolution: 3.36.1 -> 3.36.2 --- pkgs/desktops/gnome-3/apps/evolution/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix index c1901110b58..467971b2dba 100644 --- a/pkgs/desktops/gnome-3/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix @@ -43,11 +43,11 @@ stdenv.mkDerivation rec { pname = "evolution"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/evolution/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1f3cwc05gw75yqficcxns95r96lv7an4aih6d7hng3n3pqfwyfl7"; + sha256 = "12ii8crp4v4bpdxrc2rkxwdxqz3qjizyfgfrmir9pcyxlg0lh2f5"; }; nativeBuildInputs = [ -- cgit v1.2.3 From b086a157df5fe803c864e31ec54e243f4083bc62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 May 2020 15:14:30 +0200 Subject: gnome3.gedit: 3.36.1 -> 3.36.2 --- pkgs/desktops/gnome-3/apps/gedit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gedit/default.nix b/pkgs/desktops/gnome-3/apps/gedit/default.nix index c6b28e86ab8..ea33bc29324 100644 --- a/pkgs/desktops/gnome-3/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/apps/gedit/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "gedit"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/gedit/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "11z3lhc5i3z0gqw0qmprsm4rmvhbbm4gz6wy0f73c73x4bd8xhvd"; + sha256 = "15s1almlhjlgl3m8lxg6jpzln8jhgdxxjr635a3b7cf58d35b1v8"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 4cf05b434c5e49b6969911de8d3d3d0c4ade2876 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 May 2020 15:14:46 +0200 Subject: gnome3.gnome-boxes: 3.36.2 -> 3.36.3 --- pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix index 3d6832316cd..e2ac4cb4b89 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-boxes/default.nix @@ -51,11 +51,11 @@ stdenv.mkDerivation rec { pname = "gnome-boxes"; - version = "3.36.2"; + version = "3.36.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-boxes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "01hjlz9hljk2skrwfqxpy3934wjs6figs71sw8bm8g2vnyaqwq7a"; + sha256 = "18imxv1859gr53z4yay02611p5f1rd2pwnbaq093gmn77l0j9292"; }; doCheck = true; -- cgit v1.2.3 From 2e3d6ad3b68759893ad194c404a61fb74a21c778 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 May 2020 15:15:12 +0200 Subject: gnome3.gnome-calendar: 3.36.0 -> 3.36.1 --- pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix index 213b4f61672..88284c540e3 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-calendar/default.nix @@ -4,13 +4,13 @@ let pname = "gnome-calendar"; - version = "3.36.0"; + version = "3.36.1"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1cxy4qf83s8w1ys94rcc4ksf7ywi0hkkpfs0szkkip2v8g3j6kq2"; + sha256 = "0ql3f509bj17riqs0jfpp434s97dzjgkjcd978i4m4y80nq2131v"; }; passthru = { -- cgit v1.2.3 From 56211aa07fe0570e842908c6fe8c302424d8bfb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 May 2020 15:15:32 +0200 Subject: gnome3.gnome-getting-started-docs: 3.36.1 -> 3.36.2 --- pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix index 5d31a42301e..bd02a5f0cc6 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-getting-started-docs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gnome-getting-started-docs"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-getting-started-docs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "09bf9r6brmll14z87ljgivw0nr0nggcgjpbx6lg2835zq36vfmi9"; + sha256 = "1ihxa9g687rbb4s2gxd2pf726adx98ahq4kfad868swl7a8vi504"; }; passthru = { -- cgit v1.2.3 From 1363cdc116b1217e1383727bd7b0d3300a134b38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 May 2020 15:15:45 +0200 Subject: gnome3.gnome-maps: 3.36.1 -> 3.36.2 --- pkgs/desktops/gnome-3/apps/gnome-maps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix index b00c6f5dd4e..a722ab9616e 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix @@ -5,13 +5,13 @@ let pname = "gnome-maps"; - version = "3.36.1"; + version = "3.36.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1yajq2pxd4fbzngwhn92h55rn02psxih8bbdcdxgg66qdbcyychs"; + sha256 = "114pia3nd8k7j6ll7za7qzv0ggcdvcw6b3w4lppqqrwqvswik8jv"; }; doCheck = true; -- cgit v1.2.3 From 248c0c999c9a66d5f1cf01aa0db04a6d3cbdd715 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 May 2020 15:16:03 +0200 Subject: gnome3.gnome-music: 3.36.1 -> 3.36.2 --- pkgs/desktops/gnome-3/apps/gnome-music/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix index 9de452404ce..26cebe076ea 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix @@ -30,13 +30,13 @@ python3.pkgs.buildPythonApplication rec { pname = "gnome-music"; - version = "3.36.1"; + version = "3.36.2"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0cn33r9v2raizq1b8s7s0kb506y91iarc0knm0sljcsqs4qgd03v"; + sha256 = "19c2x7h9gq4kh4995y1qcn5pyry4x04lh5n7md0q33zsxcx43bdb"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 8838812ef5dc73596d08b505286985b829cb2f04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 May 2020 15:16:25 +0200 Subject: gnome3.gnome-weather: 3.36.0 -> 3.36.1 --- pkgs/desktops/gnome-3/apps/gnome-weather/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix index 407f2516532..84be3f52743 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-weather/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnome-weather"; - version = "3.36.0"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-weather/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "15ahfgqj0rz16y2bdxb7sa4b3b3larg8hn3b41pc5ddnwf9x63zi"; + sha256 = "11z75ky6xp9hx7lm24xng7ydr20bzh4d6p9sbi9c8ccz2m3fdrk8"; }; nativeBuildInputs = [ pkgconfig meson ninja wrapGAppsHook python3 ]; -- cgit v1.2.3 From 983a7eac4f088c0b5ccdc8a60166f1cdd3ec3659 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 May 2020 15:16:38 +0200 Subject: gnome3.polari: 3.36.1 -> 3.36.2 --- pkgs/desktops/gnome-3/apps/polari/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix index 394ee86d15a..363d3c49af8 100644 --- a/pkgs/desktops/gnome-3/apps/polari/default.nix +++ b/pkgs/desktops/gnome-3/apps/polari/default.nix @@ -5,13 +5,13 @@ let pname = "polari"; - version = "3.36.1"; + version = "3.36.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1rmmq74g22qrmsg0mjvpzk5403kkpfw0iznvnwxfqbi0dfkamhn4"; + sha256 = "12i0gp2kwp0b7af135q32qygkhh2025f74dqbaylfbmzacbdpz5c"; }; patches = [ -- cgit v1.2.3 From e11decf5f0a5043cb99bb42d7280c346f30585b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 May 2020 15:16:55 +0200 Subject: gnome3.dconf-editor: 3.36.0 -> 3.36.2 --- pkgs/desktops/gnome-3/core/dconf-editor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix index ba8a85352fd..860b7b957b9 100644 --- a/pkgs/desktops/gnome-3/core/dconf-editor/default.nix +++ b/pkgs/desktops/gnome-3/core/dconf-editor/default.nix @@ -3,13 +3,13 @@ let pname = "dconf-editor"; - version = "3.36.0"; + version = "3.36.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "14q678bwgmhzmi7565xhhw51y8b0pv3cqh0f411qwzwif1bd1vkj"; + sha256 = "1iz1ngb26llhqnm2s4p55ysvnav41iv0fx0pbw98k181gy3cikpd"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 15f68ad5c86845c9442767ef18d9723795fe333d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 May 2020 15:17:11 +0200 Subject: gnome3.eog: 3.36.1 -> 3.36.2 --- pkgs/desktops/gnome-3/core/eog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix index d7a4b32f785..db15cf2555c 100644 --- a/pkgs/desktops/gnome-3/core/eog/default.nix +++ b/pkgs/desktops/gnome-3/core/eog/default.nix @@ -4,13 +4,13 @@ let pname = "eog"; - version = "3.36.1"; + version = "3.36.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "15cwghcbx9x1xmv1dwmwcdxplnhf25w6f4dhx8hk6fjymaks2m74"; + sha256 = "135pw7ifr585grz1rbmynyyrmhd8w880pilg7c4nvq58jl16n1aw"; }; nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobject-introspection python3 ]; -- cgit v1.2.3 From 74a92c3732e096ddfbc49b5c8c2ff999ab756730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 May 2020 15:18:29 +0200 Subject: gnome3.gnome-contacts: 3.36 -> 3.36.1 --- pkgs/desktops/gnome-3/core/gnome-contacts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix index 97abd746e1b..6e933e7b9af 100644 --- a/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-contacts/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "gnome-contacts"; - version = "3.36"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-contacts/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0yvgsfmqm8dxbhay12m20xp6qi9v31wwyv1gz4fx7j4kklhd5jzf"; + sha256 = "0qb2kgyk6f6wr129a0gzhvpy5wdjpwjbksxyfs6zxv183jl9s73z"; }; propagatedUserEnvPkgs = [ evolution-data-server ]; -- cgit v1.2.3 From 747799f7d1b810c754476d07712d7b999be1f55d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 May 2020 15:18:45 +0200 Subject: gnome3.gnome-control-center: 3.36.1 -> 3.36.2 --- pkgs/desktops/gnome-3/core/gnome-control-center/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix index e4efcae889a..79d28ae8ced 100644 --- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix @@ -68,11 +68,11 @@ stdenv.mkDerivation rec { pname = "gnome-control-center"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1466swjyw5vjym001qda94x6sisd4xhpyb6vq91grhkyzwf2vqzk"; + sha256 = "05vqhj5z4w4vaphp541zxxkx6x781m371l2gqnq2vhnnqvqfz9g0"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 391aceceda3670959e43a893a198aa88af4ce1f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 May 2020 15:20:13 +0200 Subject: gnome3.gnome-initial-setup: 3.36.1 -> 3.36.2 --- pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix index e5277b07ad5..fb801ca19a6 100644 --- a/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-initial-setup/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "gnome-initial-setup"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1sfn6bdz8snc2qmi3nzb07vlkdhy9s1ipwxxj0v2i36a7n0gv6ci"; + sha256 = "0mjp2j4smikmr4fa0y8wrw2srlfjahiixzphz3dmc30hx8df92sg"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 7d058165de7a9d4235a1ef850ece86a331818697 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 May 2020 15:20:48 +0200 Subject: gnome3.gnome-settings-daemon: 3.36.0 -> 3.36.1 --- pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix index 6ff33660dc2..2ee07fb09aa 100644 --- a/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-settings-daemon/default.nix @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { pname = "gnome-settings-daemon"; - version = "3.36.0"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-settings-daemon/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0jddz8f2j4ps7csgq9b694h9hjxsyhlimik6rb2f8nbcxhrg0bzs"; + sha256 = "0jzf2nznpcrjqq7fjwk66kw8a6x87kgbdjidc2msaqmm379xncry"; }; patches = [ -- cgit v1.2.3 From 4e7cc56090d1af32d901e1c1fa59823cd1ea014b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 May 2020 15:21:44 +0200 Subject: gnome3.gnome-terminal: 3.36.1.1 -> 3.36.2 --- pkgs/desktops/gnome-3/core/gnome-terminal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix index 6a90bb7657a..821d5707c7c 100644 --- a/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-terminal/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "gnome-terminal"; - version = "3.36.1.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-terminal/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xm3g3kanfhs1q3xh3x58r55v8906806wvqjbg4c2xvdwyhhimzk"; + sha256 = "0inzmkmxv8xw4px2zjfw7236d08yjcv7znxcjki6dh4pvjivdla1"; }; buildInputs = [ -- cgit v1.2.3 From 3228ddbfec821d23e6c9859ac94a88cbf269e223 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 May 2020 15:22:20 +0200 Subject: gnome3.nautilus: 3.36.1.1 -> 3.36.2 --- pkgs/desktops/gnome-3/core/nautilus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix index 9914489ad25..b926f9b627f 100644 --- a/pkgs/desktops/gnome-3/core/nautilus/default.nix +++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation rec { pname = "nautilus"; - version = "3.36.1.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1pkvxyfm2fl06fpyq2jr147hhpc91y4rgdlxlilg7n8ih982y9gr"; + sha256 = "1yknaz8n0l949sr8j3b7kdm0cm5mx2dp4n4k577m492hk6akqrr6"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 4c27db1f882a604423dba4384d576f58b96e5f3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 May 2020 15:22:38 +0200 Subject: simple-scan: 3.36.1 -> 3.36.2 --- pkgs/desktops/gnome-3/core/simple-scan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index 99e5975eb5d..d38339425ce 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "simple-scan"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0bprm9gfnlrs0k8jvy9pqm1rjq47z5pgahqjjj1i7q2k4a8g09vl"; + sha256 = "1ya4k63q75w8xwv3vrk1gvbvbpxq876dvnkn3ym1wxzfd29pznxf"; }; buildInputs = [ -- cgit v1.2.3 From 2d67c6397c72e6e05be4345cb8d518d520fe410f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 May 2020 15:23:01 +0200 Subject: gnome3.devhelp: 3.36.1 -> 3.36.2 --- pkgs/desktops/gnome-3/devtools/devhelp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix index fa53b05c44b..11bad7b89d1 100644 --- a/pkgs/desktops/gnome-3/devtools/devhelp/default.nix +++ b/pkgs/desktops/gnome-3/devtools/devhelp/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "devhelp"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/devhelp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0gcakbq2fci6cf5z8lakydqnynasp74djfy53bh7jjmw0a9yry2c"; + sha256 = "0phcjdxnwgg0a0z9kyidp977jy365pny6bh2qhdyzcpvkqqq8nlb"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 2d9e779c9e161fa643ce6110577c5f18268c69c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 May 2020 15:23:14 +0200 Subject: gnome3.geary: 3.36.1 -> 3.36.2 --- pkgs/desktops/gnome-3/misc/geary/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/geary/default.nix b/pkgs/desktops/gnome-3/misc/geary/default.nix index bbde1fa3679..0326e38aba7 100644 --- a/pkgs/desktops/gnome-3/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/misc/geary/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "geary"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "07rhmzznfa4asx5gbmvnfpybd5czy7xmzk75xrk4r1qcnr24ml03"; + sha256 = "09l2lbcn3ar3scw6iylmdqi1lhpb408iqs6056d0wzx2l9nkmqis"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 14cf400ed9bd48f705327553eb646b0bf8cff432 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 May 2020 15:23:36 +0200 Subject: vte: 0.60.1 -> 0.60.2 --- pkgs/development/libraries/vte/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vte/default.nix b/pkgs/development/libraries/vte/default.nix index 897d3433f19..811921df3e7 100644 --- a/pkgs/development/libraries/vte/default.nix +++ b/pkgs/development/libraries/vte/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "vte"; - version = "0.60.1"; + version = "0.60.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1i7h1jvsg115l5djn29n06xsqvygpfagczxy0i9f39zq6dr809ay"; + sha256 = "19ccbw0yca78h5qcnm8claj4fg1pj68nj1fsjqqfpzhj7w72i81m"; }; passthru = { -- cgit v1.2.3 From 66d2cb34ef11cd17c61b03dac345d8907215e306 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 May 2020 15:23:59 +0200 Subject: gjs: 1.64.1 -> 1.64.2 --- pkgs/development/libraries/gjs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index 1f25abd2cf3..ee29c6a97a4 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -28,11 +28,11 @@ let ]; in stdenv.mkDerivation rec { pname = "gjs"; - version = "1.64.1"; + version = "1.64.2"; src = fetchurl { url = "mirror://gnome/sources/gjs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0z4qx4s3174b1w5b0slnn6jwpy2c18s4fvx4xii2kflr7s4q7bsm"; + sha256 = "0ywrsfmkxaw11z83dnmb9yqkn6k3c1mkxw2mv6arbwad6x6q7zqm"; }; outputs = [ "out" "dev" "installedTests" ]; -- cgit v1.2.3 From 42e6acdd55af9d9efbd71f16e5e4c0d8a96756dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 May 2020 15:24:44 +0200 Subject: gnome3.four-in-a-row: 3.36.0 -> 3.36.2 --- pkgs/desktops/gnome-3/games/four-in-a-row/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix index 0d73e3b3744..1523da990e3 100644 --- a/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix +++ b/pkgs/desktops/gnome-3/games/four-in-a-row/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "four-in-a-row"; - version = "3.36.0"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/four-in-a-row/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1bl63npcbr5ymka2y06wps612qynxa4hsqlzn7bvwpz2v53pai1z"; + sha256 = "1pjwaly0f36gn8ashf19b6w1yldmqpa8grdxcyb6h7b0k3bd54z6"; }; nativeBuildInputs = [ -- cgit v1.2.3 From a446ee2424f4f2acfeea9ae56ca5b6bf6de7a870 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 May 2020 15:25:04 +0200 Subject: gnome3.gnome-klotski: 3.36.0 -> 3.36.2 --- pkgs/desktops/gnome-3/games/gnome-klotski/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix index 372c12022de..ac15ebadce9 100644 --- a/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-klotski/default.nix @@ -5,13 +5,13 @@ let pname = "gnome-klotski"; - version = "3.36.0"; + version = "3.36.2"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "06gsg3s8hyhhsk11f1ld2anzv1czg1429483gbv9lr2p7fnq7pyy"; + sha256 = "1w7fp79hc2v98r7ffg57d6na3wwr355gg9jrdd7w2ad362dfg1kw"; }; nativeBuildInputs = [ -- cgit v1.2.3 From a8e6db6d3e4bf5315ecfcdf5580a72c74b840356 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 May 2020 15:25:50 +0200 Subject: gnome3.gnome-mahjongg: 3.36.1 -> 3.36.2 --- pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix index 701008f0c36..fc706b89f1d 100644 --- a/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-mahjongg/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnome-mahjongg"; - version = "3.36.1"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-mahjongg/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1a5h55amr0pab36y2iqm6ynv6mmb8al1b92rfk18wzfcfz7mhxzd"; + sha256 = "15xfp2acqdnn0pcwg5d77dpv758jjyclwb042wm12gg07rbg3s6j"; }; passthru = { -- cgit v1.2.3 From 98a13130dbcfe920515c1e9e95b30ffd7d27805b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 May 2020 15:26:02 +0200 Subject: gnome3.gnome-taquin: 3.36.0 -> 3.36.2 --- pkgs/desktops/gnome-3/games/gnome-taquin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix index f50969eb52e..ad549a7c682 100644 --- a/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-taquin/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnome-taquin"; - version = "3.36.0"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-taquin/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "16ss2d8s6glb3k0wnb5ihmbqvk9i1yi18wv9hzgxfyhs1rvk496f"; + sha256 = "0pi8kxici7p3jys8673ib0kigpif4mfkq0zlq48rsibhdqfhrlij"; }; passthru = { -- cgit v1.2.3 From f3ed2277adbc8455f7ab4bbc0ff0bd890a53237a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 May 2020 15:26:17 +0200 Subject: gnome3.gnome-tetravex: 3.36.0 -> 3.36.2 --- pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix index 4fe68a4f8a7..7061610ced1 100644 --- a/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix +++ b/pkgs/desktops/gnome-3/games/gnome-tetravex/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "gnome-tetravex"; - version = "3.36.0"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-tetravex/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1xbd0flh77v3x0dh4dsfspykwb6rwvga7kqwn1fq7gk421mq6n52"; + sha256 = "0qf6s3gl5qrs5rwsgx0191b0xyknhz2n9whx5i6ma5yw5ikslmq4"; }; passthru = { -- cgit v1.2.3 From 76533cdb3f13069ac0f430b989e25da30dea5053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 May 2020 15:26:41 +0200 Subject: gnome3.iagno: 3.36.0 -> 3.36.2 --- pkgs/desktops/gnome-3/games/iagno/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix index 5db02c8dfa4..c3df9bd1099 100644 --- a/pkgs/desktops/gnome-3/games/iagno/default.nix +++ b/pkgs/desktops/gnome-3/games/iagno/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "iagno"; - version = "3.36.0"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/iagno/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0ysb021mf5sy1ywicys35rn5c9v355rffjrlhxmr3z6yplrljm5b"; + sha256 = "0hgn2iqvnfiiwm57bir28dz61b1kkp1zh6av8f342q153rxx10g6"; }; nativeBuildInputs = [ -- cgit v1.2.3 From fb62f5c024d07edbb3587acd8ecf4375d9f7210d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 May 2020 15:26:59 +0200 Subject: gnome3.gnome-flashback: 3.36.1 -> 3.36.3 --- pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix index 1fea28d24de..cde21551a8a 100644 --- a/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix +++ b/pkgs/desktops/gnome-3/misc/gnome-flashback/default.nix @@ -30,7 +30,7 @@ let pname = "gnome-flashback"; - version = "3.36.1"; + version = "3.36.3"; # From data/sessions/Makefile.am requiredComponentsCommon = [ @@ -61,7 +61,7 @@ let src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "16gknn5mj29i8svlncarj92qi0swdlziggxpg9rryqslsy896a2x"; + sha256 = "19y1a4kq6db6a19basss76l4rypiz0lwr32ajli1ra1d1yj9xfid"; }; # make .desktop Execs absolute -- cgit v1.2.3 From 8f5f7c82b5444b72a81f8201dbc7d04448246538 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 3 May 2020 15:27:19 +0200 Subject: gnome3.quadrapassel: 3.36.00 -> 3.36.02 --- pkgs/desktops/gnome-3/games/quadrapassel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix index 474ee5823a7..a4c139f0671 100644 --- a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix +++ b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "quadrapassel"; - version = "3.36.00"; + version = "3.36.02"; src = fetchurl { url = "mirror://gnome/sources/quadrapassel/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1xk9x1pp71armj47vxja7fsj6gs116kcjkd8xgwf8wi4zr4kgx7g"; + sha256 = "0c80pzipxricyh4wydffsc94wj6ymnanqr9bg6wdx51hz1mmmilb"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 2860973217fd73c9553d46f794a6720fcf81777e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 15:03:19 +0000 Subject: libmypaint: 1.5.1 -> 1.6.0 --- pkgs/development/libraries/libmypaint/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libmypaint/default.nix b/pkgs/development/libraries/libmypaint/default.nix index 409867695fc..5cb971f5db8 100644 --- a/pkgs/development/libraries/libmypaint/default.nix +++ b/pkgs/development/libraries/libmypaint/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { pname = "libmypaint"; - version = "1.5.1"; + version = "1.6.0"; outputs = [ "out" "dev" ]; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { owner = "mypaint"; repo = "libmypaint"; rev = "v${version}"; - sha256 = "1pxx8fjdabcindxhzgbhg4p7yanl4ihbd8kq71y2nyi9dqsjr2fw"; + sha256 = "1fdyywm915mmilfmzp7lz4rnmm05kkw0adrdqpqi4n8icp4d530g"; }; nativeBuildInputs = [ @@ -43,10 +43,6 @@ stdenv.mkDerivation rec { doCheck = true; - postPatch = '' - sed 's|python2|python|' -i autogen.sh - ''; - preConfigure = "./autogen.sh"; meta = with stdenv.lib; { -- cgit v1.2.3 From e008d5fc98592405bd1110e8aaa68d5dd0a4f2e7 Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Sat, 2 May 2020 19:52:03 +0200 Subject: wireguard-compat: 1.0.20200426 -> 1.0.20200429 --- pkgs/os-specific/linux/wireguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/wireguard/default.nix b/pkgs/os-specific/linux/wireguard/default.nix index 8c3f489753d..63487733605 100644 --- a/pkgs/os-specific/linux/wireguard/default.nix +++ b/pkgs/os-specific/linux/wireguard/default.nix @@ -7,11 +7,11 @@ assert stdenv.lib.versionOlder kernel.version "5.6"; stdenv.mkDerivation rec { pname = "wireguard"; - version = "1.0.20200426"; + version = "1.0.20200429"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-compat-${version}.tar.xz"; - sha256 = "0j343xk9qgmzn0j6kgvydfqjqslf2rv6r4ikfc59982xxny6f6l5"; + sha256 = "161srq06qa6ag2lycqz19mfms4ha2pmwn778jhvi96729rmivjkd"; }; hardeningDisable = [ "pic" ]; -- cgit v1.2.3 From d203d553b964f115a91143d72a7869d87a72cce2 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 1 May 2020 23:54:46 +0200 Subject: neomutt: 20200424 -> 20200501 https://github.com/neomutt/neomutt/releases/tag/20200501 --- pkgs/applications/networking/mailreaders/neomutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 73aef9d17c7..ad7b4debd3f 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation rec { - version = "20200424"; + version = "20200501"; pname = "neomutt"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; rev = version; - sha256 = "055hxlfrpn5a50vnh31faskcdkcjyzzr02gj5x2dizpf7vd67162"; + sha256 = "1xrs2bagrcg489zp7g39l3rrpgz8n1ji9cbr21wrnasfbhqcsmnx"; }; buildInputs = [ -- cgit v1.2.3 From beb291e1acae4ab1ed8ab7d86a4988ca9df11212 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 1 May 2020 23:55:10 +0200 Subject: wasm-bindgen-cli: 0.2.61 -> 0.2.62 https://github.com/rustwasm/wasm-bindgen/releases/tag/0.2.62 --- .../wasm-bindgen-cli/0001-Add-cargo.lock.patch | 72 +++++++++++----------- .../development/tools/wasm-bindgen-cli/default.nix | 6 +- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch b/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch index b4fa5a8353c..86fbb81de05 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch +++ b/pkgs/development/tools/wasm-bindgen-cli/0001-Add-cargo.lock.patch @@ -1,6 +1,6 @@ -From b0d7b8b348adba8131b12f99be7a9a30a1cca867 Mon Sep 17 00:00:00 2001 +From a13aff157f899a6388b3c9e621680049f329a028 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch -Date: Thu, 30 Apr 2020 00:24:57 +0200 +Date: Fri, 1 May 2020 23:44:08 +0200 Subject: [PATCH] Add cargo.lock --- @@ -10,7 +10,7 @@ Subject: [PATCH] Add cargo.lock diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 -index 00000000..8ae15438 +index 00000000..4822cea1 --- /dev/null +++ b/Cargo.lock @@ -0,0 +1,2527 @@ @@ -605,7 +605,7 @@ index 00000000..8ae15438 +dependencies = [ + "proc-macro-hack", + "proc-macro2 1.0.10", -+ "quote 1.0.3", ++ "quote 1.0.4", + "syn 1.0.18", +] + @@ -782,7 +782,7 @@ index 00000000..8ae15438 + +[[package]] +name = "js-sys" -+version = "0.3.38" ++version = "0.3.39" +dependencies = [ + "wasm-bindgen", + "wasm-bindgen-futures", @@ -1173,7 +1173,7 @@ index 00000000..8ae15438 +dependencies = [ + "proc-macro-error-attr", + "proc-macro2 1.0.10", -+ "quote 1.0.3", ++ "quote 1.0.4", + "syn 1.0.18", + "version_check 0.9.1", +] @@ -1185,7 +1185,7 @@ index 00000000..8ae15438 +checksum = "4f5444ead4e9935abd7f27dc51f7e852a0569ac888096d5ec2499470794e2e53" +dependencies = [ + "proc-macro2 1.0.10", -+ "quote 1.0.3", ++ "quote 1.0.4", + "syn 1.0.18", + "syn-mid", + "version_check 0.9.1", @@ -1238,9 +1238,9 @@ index 00000000..8ae15438 + +[[package]] +name = "quote" -+version = "1.0.3" ++version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2bdc6c187c65bca4260c9011c9e3132efe4909da44726bad24cf7572ae338d7f" ++checksum = "4c1f4b0efa5fc5e8ceb705136bfee52cfdb6a4e3509f770b478cd6ed434232a7" +dependencies = [ + "proc-macro2 1.0.10", +] @@ -1642,7 +1642,7 @@ index 00000000..8ae15438 +checksum = "9e549e3abf4fb8621bd1609f11dfc9f5e50320802273b12f3811a67e6716ea6c" +dependencies = [ + "proc-macro2 1.0.10", -+ "quote 1.0.3", ++ "quote 1.0.4", + "syn 1.0.18", +] + @@ -1731,7 +1731,7 @@ index 00000000..8ae15438 + "heck", + "proc-macro-error", + "proc-macro2 1.0.10", -+ "quote 1.0.3", ++ "quote 1.0.4", + "syn 1.0.18", +] + @@ -1753,7 +1753,7 @@ index 00000000..8ae15438 +checksum = "410a7488c0a728c7ceb4ad59b9567eb4053d02e8cc7f5c0e0eeeb39518369213" +dependencies = [ + "proc-macro2 1.0.10", -+ "quote 1.0.3", ++ "quote 1.0.4", + "unicode-xid 0.2.0", +] + @@ -1764,7 +1764,7 @@ index 00000000..8ae15438 +checksum = "7be3539f6c128a931cf19dcee741c1af532c7fd387baa739c03dd2e96479338a" +dependencies = [ + "proc-macro2 1.0.10", -+ "quote 1.0.3", ++ "quote 1.0.4", + "syn 1.0.18", +] + @@ -2038,7 +2038,7 @@ index 00000000..8ae15438 +dependencies = [ + "heck", + "proc-macro2 1.0.10", -+ "quote 1.0.3", ++ "quote 1.0.4", + "syn 1.0.18", +] + @@ -2050,7 +2050,7 @@ index 00000000..8ae15438 + +[[package]] +name = "wasm-bindgen" -+version = "0.2.61" ++version = "0.2.62" +dependencies = [ + "cfg-if", + "js-sys", @@ -2066,7 +2066,7 @@ index 00000000..8ae15438 + +[[package]] +name = "wasm-bindgen-anyref-xform" -+version = "0.2.61" ++version = "0.2.62" +dependencies = [ + "anyhow", + "rayon", @@ -2078,13 +2078,13 @@ index 00000000..8ae15438 + +[[package]] +name = "wasm-bindgen-backend" -+version = "0.2.61" ++version = "0.2.62" +dependencies = [ + "bumpalo", + "lazy_static", + "log 0.4.8", + "proc-macro2 1.0.10", -+ "quote 1.0.3", ++ "quote 1.0.4", + "syn 1.0.18", + "wasm-bindgen-shared", +] @@ -2099,7 +2099,7 @@ index 00000000..8ae15438 + +[[package]] +name = "wasm-bindgen-cli" -+version = "0.2.61" ++version = "0.2.62" +dependencies = [ + "anyhow", + "assert_cmd", @@ -2127,7 +2127,7 @@ index 00000000..8ae15438 + +[[package]] +name = "wasm-bindgen-cli-support" -+version = "0.2.61" ++version = "0.2.62" +dependencies = [ + "anyhow", + "base64 0.9.3", @@ -2149,7 +2149,7 @@ index 00000000..8ae15438 + +[[package]] +name = "wasm-bindgen-futures" -+version = "0.4.11" ++version = "0.4.12" +dependencies = [ + "cfg-if", + "futures-channel-preview", @@ -2161,9 +2161,9 @@ index 00000000..8ae15438 + +[[package]] +name = "wasm-bindgen-macro" -+version = "0.2.61" ++version = "0.2.62" +dependencies = [ -+ "quote 1.0.3", ++ "quote 1.0.4", + "trybuild", + "wasm-bindgen", + "wasm-bindgen-futures", @@ -2172,10 +2172,10 @@ index 00000000..8ae15438 + +[[package]] +name = "wasm-bindgen-macro-support" -+version = "0.2.61" ++version = "0.2.62" +dependencies = [ + "proc-macro2 1.0.10", -+ "quote 1.0.3", ++ "quote 1.0.4", + "syn 1.0.18", + "wasm-bindgen-backend", + "wasm-bindgen-shared", @@ -2183,7 +2183,7 @@ index 00000000..8ae15438 + +[[package]] +name = "wasm-bindgen-multi-value-xform" -+version = "0.2.61" ++version = "0.2.62" +dependencies = [ + "anyhow", + "rayon", @@ -2204,11 +2204,11 @@ index 00000000..8ae15438 + +[[package]] +name = "wasm-bindgen-shared" -+version = "0.2.61" ++version = "0.2.62" + +[[package]] +name = "wasm-bindgen-test" -+version = "0.3.11" ++version = "0.3.12" +dependencies = [ + "console_error_panic_hook", + "js-sys", @@ -2234,15 +2234,15 @@ index 00000000..8ae15438 + +[[package]] +name = "wasm-bindgen-test-macro" -+version = "0.3.11" ++version = "0.3.12" +dependencies = [ + "proc-macro2 1.0.10", -+ "quote 1.0.3", ++ "quote 1.0.4", +] + +[[package]] +name = "wasm-bindgen-threads-xform" -+version = "0.2.61" ++version = "0.2.62" +dependencies = [ + "anyhow", + "walrus", @@ -2251,7 +2251,7 @@ index 00000000..8ae15438 + +[[package]] +name = "wasm-bindgen-wasm-conventions" -+version = "0.2.61" ++version = "0.2.62" +dependencies = [ + "anyhow", + "walrus", @@ -2259,7 +2259,7 @@ index 00000000..8ae15438 + +[[package]] +name = "wasm-bindgen-wasm-interpreter" -+version = "0.2.61" ++version = "0.2.62" +dependencies = [ + "anyhow", + "log 0.4.8", @@ -2270,7 +2270,7 @@ index 00000000..8ae15438 + +[[package]] +name = "wasm-bindgen-webidl" -+version = "0.2.61" ++version = "0.2.62" +dependencies = [ + "anyhow", + "env_logger", @@ -2278,7 +2278,7 @@ index 00000000..8ae15438 + "lazy_static", + "log 0.4.8", + "proc-macro2 1.0.10", -+ "quote 1.0.3", ++ "quote 1.0.4", + "sourcefile", + "structopt", + "syn 1.0.18", @@ -2353,7 +2353,7 @@ index 00000000..8ae15438 + +[[package]] +name = "web-sys" -+version = "0.3.38" ++version = "0.3.39" +dependencies = [ + "js-sys", + "wasm-bindgen", diff --git a/pkgs/development/tools/wasm-bindgen-cli/default.nix b/pkgs/development/tools/wasm-bindgen-cli/default.nix index 0385ba79d7f..9adabeb573f 100644 --- a/pkgs/development/tools/wasm-bindgen-cli/default.nix +++ b/pkgs/development/tools/wasm-bindgen-cli/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "wasm-bindgen-cli"; - version = "0.2.61"; + version = "0.2.62"; src = fetchFromGitHub { owner = "rustwasm"; repo = "wasm-bindgen"; rev = version; - sha256 = "1lz4yscs17vix96isqpwwjhjcgj46zh2ljiwvfsk44wky8vwkyb7"; + sha256 = "0d3ph3g220nvzwxa71rch03j5c0w06v8z4lmlyp5kky6p86r37hz"; }; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ]; nativeBuildInputs = [ pkgconfig ]; - cargoSha256 = "1vblvajhx5gn08rinv6bnw61zah62il015rzm0d4vs2b9p0iaann"; + cargoSha256 = "13lj2yx2bcwac1b4gpwcgiwqvy178zis6r1pidn4pgwqv7zxa7p2"; cargoPatches = [ ./0001-Add-cargo.lock.patch ]; cargoBuildFlags = [ "-p" pname ]; -- cgit v1.2.3 From e678dadd0779bbe0b91bec3cc4237ccc294a79d4 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 1 May 2020 23:56:38 +0200 Subject: cargo-xbuild: 0.5.28 -> 0.5.29 https://github.com/rust-osdev/cargo-xbuild/releases/tag/v0.5.29 --- pkgs/development/tools/rust/cargo-xbuild/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-xbuild/default.nix b/pkgs/development/tools/rust/cargo-xbuild/default.nix index 4ae2b55f015..6af944e9c5d 100644 --- a/pkgs/development/tools/rust/cargo-xbuild/default.nix +++ b/pkgs/development/tools/rust/cargo-xbuild/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-xbuild"; - version = "0.5.28"; + version = "0.5.29"; src = fetchFromGitHub { owner = "rust-osdev"; repo = pname; rev = "v${version}"; - sha256 = "1rczflf6fllxkag5nah195shwqvqmlna9a1gkcwp9ljlgxlr9zvq"; + sha256 = "05wg1xx2mcwb9cplmrpg13jimddlzmv7hf5g3vjppjp8kz2gb7zj"; }; - cargoSha256 = "0xr8wpcw3x0343hm6clygsbikhrp6gcqb8vh7g7h9nijjrbnzxxb"; + cargoSha256 = "1s2xsfld29shvjzyp16y263hnbqxrq8i2557y0g09xmfm5x0jhix"; meta = with stdenv.lib; { description = "Automatically cross-compiles the sysroot crates core, compiler_builtins, and alloc"; -- cgit v1.2.3 From 6fd3426230875fac44aa5fc4d6d03a70e5534971 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 3 May 2020 17:05:57 +0200 Subject: packer: 1.5.5 -> 1.5.6 https://github.com/hashicorp/packer/releases/tag/v1.5.6 --- pkgs/development/tools/packer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index d158f3bf155..32ac95cff6a 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "packer"; - version = "1.5.5"; + version = "1.5.6"; goPackagePath = "github.com/hashicorp/packer"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "1l5n6s4fg6rgb7k845hsxgrs44y9bs2hmdxqzfbayiv8nz1qg286"; + sha256 = "0pwygrh6pjmx8a1jc12929x0slj7w3b8p3pzswnbk7klyhj4jkp8"; }; meta = with stdenv.lib; { -- cgit v1.2.3 From 4e6204bed04d236cc5d5b969814b63819604d242 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 3 May 2020 17:08:28 +0200 Subject: clipman: 1.4.0 -> 1.5.0 https://github.com/yory8/clipman/releases/tag/v1.5.0 --- pkgs/tools/misc/clipman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/clipman/default.nix b/pkgs/tools/misc/clipman/default.nix index 15eeb8b7b86..e75ddaa5bab 100644 --- a/pkgs/tools/misc/clipman/default.nix +++ b/pkgs/tools/misc/clipman/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "clipman"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "yory8"; repo = pname; rev = "v${version}"; - sha256 = "0d5w94cylrzhwyb4zfgidh6rr1h82dx5y7cxfa37wx5xxcjyyja1"; + sha256 = "15s7np57pvh7mqmq016mvhz34f189wd1vrfiamzmps37mdz2nq9i"; }; modSha256 = "1sim3x794kj3wdw0g432zbgh1cimdmmg1hjgynh9jgm3y8w9q7ij"; -- cgit v1.2.3 From e7b54c19dee630bd538239a5d0389a3e5387b095 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 3 May 2020 13:16:49 -0400 Subject: linux/hardened-patches/5.6: 5.6.8.a -> 5.6.10.a --- pkgs/os-specific/linux/kernel/hardened-patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened-patches.json b/pkgs/os-specific/linux/kernel/hardened-patches.json index aa0650138cc..f7df85b568c 100644 --- a/pkgs/os-specific/linux/kernel/hardened-patches.json +++ b/pkgs/os-specific/linux/kernel/hardened-patches.json @@ -20,8 +20,8 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.5.19.a/linux-hardened-5.5.19.a.patch" }, "5.6": { - "name": "linux-hardened-5.6.8.a.patch", - "sha256": "06nrjv1v3m3phgcahpmf228jcgr496n9rlvvmbklc307q6w0g8f6", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.8.a/linux-hardened-5.6.8.a.patch" + "name": "linux-hardened-5.6.10.a.patch", + "sha256": "0jmyk7pl9ddbyhskzadd1z9svhm18v8gdv6kgb0ca6dbhf6ggsgy", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.10.a/linux-hardened-5.6.10.a.patch" } } -- cgit v1.2.3 From c5d56b179082541c49481f1b88efdc5eefbab817 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 3 May 2020 13:16:59 -0400 Subject: linux/hardened-patches/5.4: 5.4.36.a -> 5.4.38.a --- pkgs/os-specific/linux/kernel/hardened-patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened-patches.json b/pkgs/os-specific/linux/kernel/hardened-patches.json index f7df85b568c..427a6dae2f7 100644 --- a/pkgs/os-specific/linux/kernel/hardened-patches.json +++ b/pkgs/os-specific/linux/kernel/hardened-patches.json @@ -10,9 +10,9 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.119.a/linux-hardened-4.19.119.a.patch" }, "5.4": { - "name": "linux-hardened-5.4.36.a.patch", - "sha256": "00bmpzrma0nrgwwari6072g11cwhdk2riqmphlnkpxbarh7dwf4z", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.36.a/linux-hardened-5.4.36.a.patch" + "name": "linux-hardened-5.4.38.a.patch", + "sha256": "1aaky36azfagk0nf5k92glil3f7ymijcvx03g8rnlinlsm3i2614", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.38.a/linux-hardened-5.4.38.a.patch" }, "5.5": { "name": "linux-hardened-5.5.19.a.patch", -- cgit v1.2.3 From 4df77514e74735ca0261d235a178742577d181bf Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 3 May 2020 13:17:03 -0400 Subject: linux/hardened-patches/4.19: 4.19.119.a -> 4.19.120.a --- pkgs/os-specific/linux/kernel/hardened-patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened-patches.json b/pkgs/os-specific/linux/kernel/hardened-patches.json index 427a6dae2f7..623ce291710 100644 --- a/pkgs/os-specific/linux/kernel/hardened-patches.json +++ b/pkgs/os-specific/linux/kernel/hardened-patches.json @@ -5,9 +5,9 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.177.a/linux-hardened-4.14.177.a.patch" }, "4.19": { - "name": "linux-hardened-4.19.119.a.patch", - "sha256": "1arm4833lkgsd27fhgrxbdxisvn20fsk6250x5yh6c8svjr759jx", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.119.a/linux-hardened-4.19.119.a.patch" + "name": "linux-hardened-4.19.120.a.patch", + "sha256": "14l30127nd8d2q72k51alwmh8h57fyam0q6sggdljh16qlqilirl", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.120.a/linux-hardened-4.19.120.a.patch" }, "5.4": { "name": "linux-hardened-5.4.38.a.patch", -- cgit v1.2.3 From d51998798fb92bdb475210b8a41f805cced58082 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 3 May 2020 13:17:07 -0400 Subject: linux/hardened-patches/4.14: 4.14.177.a -> 4.14.178.a --- pkgs/os-specific/linux/kernel/hardened-patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened-patches.json b/pkgs/os-specific/linux/kernel/hardened-patches.json index 623ce291710..d2f6f4b3e83 100644 --- a/pkgs/os-specific/linux/kernel/hardened-patches.json +++ b/pkgs/os-specific/linux/kernel/hardened-patches.json @@ -1,8 +1,8 @@ { "4.14": { - "name": "linux-hardened-4.14.177.a.patch", - "sha256": "0wiapq4nj16m5ywnz0k7k0fr5hpw2gjy68mjlk6x866rf8vhndrq", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.177.a/linux-hardened-4.14.177.a.patch" + "name": "linux-hardened-4.14.178.a.patch", + "sha256": "1klwymsd19y2sifbny5ikgry9rx9q2cbb13h1xqy42573add6q8c", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.178.a/linux-hardened-4.14.178.a.patch" }, "4.19": { "name": "linux-hardened-4.19.120.a.patch", -- cgit v1.2.3 From 35639c65f9655b0cb21ec88e6bb4a37628a45130 Mon Sep 17 00:00:00 2001 From: Ivar Date: Mon, 6 Apr 2020 18:56:37 +0200 Subject: hactool: init at 1.3.3 --- pkgs/tools/compression/hactool/default.nix | 30 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/compression/hactool/default.nix diff --git a/pkgs/tools/compression/hactool/default.nix b/pkgs/tools/compression/hactool/default.nix new file mode 100644 index 00000000000..77382d980e5 --- /dev/null +++ b/pkgs/tools/compression/hactool/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + pname = "hactool"; + version = "1.3.3"; + + src = fetchFromGitHub { + owner = "SciresM"; + repo = "hactool"; + rev = "1.3.3"; + sha256 = "1qb51fck7liqc1ridms8wdlzgbdbvp6iv4an8jvmzhcj5p5xq631"; + }; + + preBuild = '' + mv config.mk.template config.mk + ''; + + installPhase = '' + install -D hactool $out/bin/hactool + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/SciresM/hactool"; + description = "A tool to manipulate common file formats for the Nintendo Switch"; + longDescription = "A tool to view information about, decrypt, and extract common file formats for the Nintendo Switch, especially Nintendo Content Archives"; + license = licenses.isc; + maintainers = with maintainers; [ ivar ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1adb4e0eb2..d128be80c81 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19800,6 +19800,8 @@ in hashit = callPackage ../tools/misc/hashit { }; + hactool = callPackage ../tools/compression/hactool { }; + heimer = libsForQt5.callPackage ../applications/misc/heimer { }; hello = callPackage ../applications/misc/hello { }; -- cgit v1.2.3 From d09c84aa00996fef4f281d05829fdaf40bb84616 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Sat, 2 May 2020 13:33:29 +0900 Subject: exiv2: fix build on 32-bit arm --- pkgs/development/libraries/exiv2/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index a192a4c2cab..8a6dfd1983e 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -79,8 +79,9 @@ stdenv.mkDerivation rec { mkdir ../test/tmp export LD_LIBRARY_PATH="$(realpath ../build/lib)" - # Fix tests on Aarch64 - ${stdenv.lib.optionalString stdenv.isAarch64 '' + ${stdenv.lib.optionalString (stdenv.isAarch64 || stdenv.isAarch32) '' + # Fix tests on arm + # https://github.com/Exiv2/exiv2/issues/933 rm -f ../tests/bugfixes/github/test_CVE_2018_12265.py ''} -- cgit v1.2.3 From 65d4935c0d0cc67e2c22911150bfda8fb597c12d Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Thu, 30 Apr 2020 06:57:25 +0900 Subject: jsoncpp: fix build on 32-bit arm --- pkgs/development/libraries/jsoncpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/jsoncpp/default.nix b/pkgs/development/libraries/jsoncpp/default.nix index aa72aeb0d36..155103af3c4 100644 --- a/pkgs/development/libraries/jsoncpp/default.nix +++ b/pkgs/development/libraries/jsoncpp/default.nix @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake python ]; - # fix inverted sense in isAnyCharRequiredQuoting on aarch64. See: https://github.com/open-source-parsers/jsoncpp/pull/1120 - patches = stdenv.lib.optionals stdenv.isAarch64 [ + # fix inverted sense in isAnyCharRequiredQuoting on arm. See: https://github.com/open-source-parsers/jsoncpp/pull/1120 + patches = stdenv.lib.optionals (stdenv.isAarch64 || stdenv.isAarch32) [ (fetchpatch { url = "https://github.com/open-source-parsers/jsoncpp/commit/9093358efae9e5981aa60013487fc7215f040a59.patch"; sha256 = "1wiqp70sck2md14sfc0zdkblqk9750cl55ykf9d6b9vs1ifzzzq5"; -- cgit v1.2.3 From daa0dfe4f44fb6dbd489b2c9ba4f6936cad5f704 Mon Sep 17 00:00:00 2001 From: Finn Behrens Date: Mon, 27 Apr 2020 15:07:25 +0200 Subject: nixos/initrd-ssh: add extraConfig Options --- nixos/modules/system/boot/initrd-ssh.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix index 60760487a1d..f7ef2610370 100644 --- a/nixos/modules/system/boot/initrd-ssh.nix +++ b/nixos/modules/system/boot/initrd-ssh.nix @@ -83,6 +83,12 @@ in Authorized keys for the root user on initrd. ''; }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = "Verbatim contents of sshd_config."; + }; }; imports = @@ -126,6 +132,8 @@ in '' else '' UseDNS no ''} + + ${cfg.extraConfig} ''; in mkIf (config.boot.initrd.network.enable && cfg.enable) { assertions = [ -- cgit v1.2.3 From a60552ad942f5e8960dc043c12cc69fc1d659ba1 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 27 Apr 2020 15:22:38 +0300 Subject: mpvScripts.mpris: 0.4 -> 0.5 --- pkgs/applications/video/mpv/scripts/mpris.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/mpris.nix b/pkgs/applications/video/mpv/scripts/mpris.nix index e318c7afa67..318c59a1af9 100644 --- a/pkgs/applications/video/mpv/scripts/mpris.nix +++ b/pkgs/applications/video/mpv/scripts/mpris.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "mpv-mpris-${version}.so"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "hoyon"; repo = "mpv-mpris"; rev = version; - sha256 = "1fr3jvja8s2gdpx8qyk9r17977flms3qpm8zci62nd9r5wjdvr5i"; + sha256 = "07p6li5z38pkfd40029ag2jqx917vyl3ng5p2i4v5a0af14slcnk"; }; nativeBuildInputs = [ pkgconfig ]; -- cgit v1.2.3 From d961a508edb73a052e5f10055e2feb51b033ce07 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 3 May 2020 11:09:54 -0700 Subject: python3Packages.langcodes: 1.4.1 -> 2.0.0 --- pkgs/development/python-modules/langcodes/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/langcodes/default.nix b/pkgs/development/python-modules/langcodes/default.nix index 4426e9cb9a8..f5686c1afb4 100644 --- a/pkgs/development/python-modules/langcodes/default.nix +++ b/pkgs/development/python-modules/langcodes/default.nix @@ -8,17 +8,16 @@ buildPythonPackage rec { pname = "langcodes"; - version = "1.4.1"; + version = "2.0.0"; + disabled = pythonOlder "3.3"; src = fetchPypi { inherit pname version; - sha256 = "1axdiva2qglsjmnx2ak7i6hm0yhp6kbc4lcsgn8ckwy0nq1z3kr2"; + sha256 = "0xszgmydymzhb0dhx5qvdn3x5z477ld0paw17lwwhlrxffkq5jxz"; }; propagatedBuildInputs = [ marisa-trie ]; - disabled = pythonOlder "3.3"; - checkInputs = [ nose ]; checkPhase = '' -- cgit v1.2.3 From 132664e8fb1c27beb31b4071af5705b5e1b2cd67 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 3 May 2020 11:10:27 -0700 Subject: python3Packages.wordfreq: 2.2.0 -> 2.3.2 --- .../python-modules/wordfreq/default.nix | 27 +++++++++++----------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/wordfreq/default.nix b/pkgs/development/python-modules/wordfreq/default.nix index 0dab5234860..d687ffd2d0b 100644 --- a/pkgs/development/python-modules/wordfreq/default.nix +++ b/pkgs/development/python-modules/wordfreq/default.nix @@ -11,34 +11,33 @@ , fetchFromGitHub }: -buildPythonPackage { +buildPythonPackage rec { pname = "wordfreq"; - version = "2.2.0"; + version = "2.3.2"; + disabled = pythonOlder "3"; src = fetchFromGitHub { owner = "LuminosoInsight"; repo = "wordfreq"; # upstream don't tag by version - rev = "bc12599010c8181a725ec97d0b3990758a48da36"; - sha256 = "195794vkzq5wsq3mg1dgfhlnz2f7vi1xajlifq6wkg4lzwyq262m"; + rev = "v${version}"; + sha256 = "078657iiksrqzcc2wvwhiilf3xxq5vlinsv0kz03qzqr1qyvbmas"; }; - checkInputs = [ pytest ]; - - checkPhase = '' - # These languages require additional dictionaries - pytest tests -k 'not test_japanese and not test_korean and not test_languages and not test_french_and_related' - ''; - propagatedBuildInputs = [ regex langcodes ftfy msgpack mecab-python3 jieba ]; - + # patch to relax version requirements for regex # dependency to prevent break in upgrade postPatch = '' substituteInPlace setup.py --replace "regex ==" "regex >=" ''; - - disabled = pythonOlder "3"; + + checkInputs = [ pytest ]; + + checkPhase = '' + # These languages require additional dictionaries + pytest tests -k 'not test_japanese and not test_korean and not test_languages and not test_french_and_related' + ''; meta = with lib; { description = "A library for looking up the frequencies of words in many languages, based on many sources of data"; -- cgit v1.2.3 From 69ebdd78bedd1162a73d23010e404facd5f6c9ab Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 3 May 2020 11:17:49 -0700 Subject: pythonPackages.secure: disable for python2, not supported Processing ./secure-0.2.1-py2-none-any.whl ERROR: Package 'secure' requires a different Python: 2.7.18 not in '>=3' --- pkgs/development/python-modules/secure/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/secure/default.nix b/pkgs/development/python-modules/secure/default.nix index 6d2f2871ec2..49fcb52a154 100644 --- a/pkgs/development/python-modules/secure/default.nix +++ b/pkgs/development/python-modules/secure/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub +{ lib, buildPythonPackage, fetchFromGitHub, isPy27 , maya , requests }: @@ -6,6 +6,7 @@ buildPythonPackage rec { version = "0.2.1"; pname = "secure"; + disabled = isPy27; src = fetchFromGitHub { owner = "typeerror"; -- cgit v1.2.3 From 5b4994672317eb8b5b8d1c47196bddfb31cafda3 Mon Sep 17 00:00:00 2001 From: Jelle Besseling Date: Sun, 3 May 2020 20:51:49 +0200 Subject: python3Packages.python-telegram-bot: 12.3.0 -> 12.7 (#86652) * python3Packages.python-telegram-bot: 12.3.0 -> 12.7 * Update pkgs/development/python-modules/python-telegram-bot/default.nix Co-authored-by: Jon Co-authored-by: Dmitry Kalinkin Co-authored-by: Jon --- .../python-modules/python-telegram-bot/default.nix | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index 5b921e32667..28541372c5e 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -2,6 +2,7 @@ , fetchPypi , buildPythonPackage , certifi +, decorator , future , urllib3 , tornado @@ -10,30 +11,21 @@ buildPythonPackage rec { pname = "python-telegram-bot"; - version = "12.3.0"; + version = "12.7"; src = fetchPypi { inherit pname version; - sha256 = "0yrg5342zz0hpf2pc85ffwx57msa6jpcmvvjfkzh8nh2lc98aq21"; + sha256 = "1vwf4pgjrg9a6w51ds9wmzq31bmi3f7xs79gdzzfxfmqmy1hb2r1"; }; - prePatch = '' - rm -rf telegram/vendor - substituteInPlace telegram/utils/request.py \ - --replace "import telegram.vendor.ptb_urllib3.urllib3 as urllib3" "import urllib3 as urllib3" \ - --replace "import telegram.vendor.ptb_urllib3.urllib3.contrib.appengine as appengine" "import urllib3.contrib.appengine as appengine" \ - --replace "from telegram.vendor.ptb_urllib3.urllib3.connection import HTTPConnection" "from urllib3.connection import HTTPConnection" \ - --replace "from telegram.vendor.ptb_urllib3.urllib3.util.timeout import Timeout" "from urllib3.util.timeout import Timeout" \ - --replace "from telegram.vendor.ptb_urllib3.urllib3.fields import RequestField" "from urllib3.fields import RequestField" - - touch LICENSE.dual - ''; - checkInputs = [ pytest ]; - propagatedBuildInputs = [ certifi future urllib3 tornado ]; + propagatedBuildInputs = [ certifi future urllib3 tornado decorator ]; + + pipInstallFlags = "--install-option '--with-upstream-urllib3'"; # tests not included with release doCheck = false; + pythonImportsCheck = [ "telegram" ]; meta = with stdenv.lib; { description = "This library provides a pure Python interface for the Telegram Bot API."; -- cgit v1.2.3 From 31c42bb05b0c458016506b3a03f39c7492f4a239 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Boros?= Date: Sun, 3 May 2020 21:54:20 +0300 Subject: makeDotElm: fix Some elm packages (eg. https://github.com/NoRedInk/elm-simple-fuzzy/ ) have a Makefile which the standard builder tries to build and fails because of missing dependencies. This change forces a no-op configure and build phase to avoid such a situation. --- pkgs/development/compilers/elm/makeDotElm.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/compilers/elm/makeDotElm.nix b/pkgs/development/compilers/elm/makeDotElm.nix index 0831d382c4b..b8076d72e48 100644 --- a/pkgs/development/compilers/elm/makeDotElm.nix +++ b/pkgs/development/compilers/elm/makeDotElm.nix @@ -11,6 +11,14 @@ ver: deps: inherit (info) sha256; }; + configurePhase = '' + true + ''; + + buildPhase = '' + true + ''; + installPhase = '' mkdir -p $out cp -r * $out -- cgit v1.2.3 From af62dc53559c419d570df5bf9367a2e5d0c2a1d4 Mon Sep 17 00:00:00 2001 From: snicket2100 <57048005+snicket2100@users.noreply.github.com> Date: Sun, 3 May 2020 15:19:19 +0200 Subject: kismet: 2016-07-R1 -> 2020-04-R2 --- .../networking/sniffers/kismet/default.nix | 31 +++++++++++++++++++--- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/sniffers/kismet/default.nix b/pkgs/applications/networking/sniffers/kismet/default.nix index 9775486c156..93ccf254a3a 100644 --- a/pkgs/applications/networking/sniffers/kismet/default.nix +++ b/pkgs/applications/networking/sniffers/kismet/default.nix @@ -1,16 +1,37 @@ -{ stdenv, fetchurl, pkgconfig, libpcap, ncurses, expat, pcre, libnl }: +{ stdenv, fetchurl, pkgconfig, libpcap, pcre, libnl, zlib, libmicrohttpd +, sqlite, protobuf, protobufc, libusb1, libcap, binutils, elfutils +, withNetworkManager ? false, glib, networkmanager +, withPython ? false, python3 +, withSensors ? false, lm_sensors}: + +# couldn't get python modules to build correctly, +# waiting for some other volunteer to fix it +assert !withPython; stdenv.mkDerivation rec { pname = "kismet"; - version = "2016-07-R1"; + version = "2020-04-R2"; src = fetchurl { url = "https://www.kismetwireless.net/code/${pname}-${version}.tar.xz"; - sha256 = "0dz28y4ay4lskhl0lawqy2dkcrhgfkbg06v22qxzzw8i6caizcmx"; + sha256 = "0hxmaln0y6bk9m1rshr4swmg0sqy3ic693vfk8haj7f5gnph96cm"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libpcap ncurses expat pcre libnl ]; + + buildInputs = [ + libpcap pcre libmicrohttpd libnl zlib sqlite protobuf protobufc + libusb1 libcap binutils elfutils + ] ++ stdenv.lib.optionals withNetworkManager [ networkmanager glib ] + ++ stdenv.lib.optional withSensors lm_sensors + ++ stdenv.lib.optional withPython (python3.withPackages(ps: [ ps.setuptools ps.protobuf + ps.numpy ps.pyserial ])); + + configureFlags = [] + ++ stdenv.lib.optional (!withNetworkManager) "--disable-libnm" + ++ stdenv.lib.optional (!withPython) "--disable-python-tools" + ++ stdenv.lib.optional (!withSensors) "--disable-lmsensors"; + postConfigure = '' sed -e 's/-o $(INSTUSR)//' \ -e 's/-g $(INSTGRP)//' \ @@ -19,6 +40,8 @@ stdenv.mkDerivation rec { -i Makefile ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Wireless network sniffer"; homepage = "https://www.kismetwireless.net/"; -- cgit v1.2.3 From 5cb3501a37c2a89c2f0ce30ddb882bbc9b1da8da Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 3 May 2020 15:26:54 -0400 Subject: python3Packages.python-telegram-bot: mark python2 as unsupported --- pkgs/development/python-modules/python-telegram-bot/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index 28541372c5e..30caa0f3d6a 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -7,11 +7,13 @@ , urllib3 , tornado , pytest +, isPy3k }: buildPythonPackage rec { pname = "python-telegram-bot"; version = "12.7"; + disabled = !isPy3k; src = fetchPypi { inherit pname version; -- cgit v1.2.3 From cc97e9d7f0d89aaf75d6d9e1394d8d7dc18f9b83 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sun, 3 May 2020 15:27:29 -0400 Subject: python3Packages.python-telegram-bot: set --with-upstream-urllib3 properly, add workaround --- pkgs/development/python-modules/python-telegram-bot/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index 30caa0f3d6a..f36f8239568 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -23,7 +23,11 @@ buildPythonPackage rec { checkInputs = [ pytest ]; propagatedBuildInputs = [ certifi future urllib3 tornado decorator ]; - pipInstallFlags = "--install-option '--with-upstream-urllib3'"; + # --with-upstream-urllib3 is not working properly + postPatch = '' + rm -rf telegram/vendor + ''; + setupPyGlobalFlags = "--with-upstream-urllib3"; # tests not included with release doCheck = false; -- cgit v1.2.3 From c788a8596a09016a0347c63878f7d99739814b1b Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Sun, 3 May 2020 22:50:15 +0300 Subject: bandwhich: 0.13.0 -> 0.14.0 --- pkgs/tools/networking/bandwhich/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/bandwhich/default.nix b/pkgs/tools/networking/bandwhich/default.nix index 7522b1629cc..1a52a7f8987 100644 --- a/pkgs/tools/networking/bandwhich/default.nix +++ b/pkgs/tools/networking/bandwhich/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "bandwhich"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "imsnif"; repo = pname; rev = version; - sha256 = "0xcn65j2q2pmbvrd5dkjg8anw1r12vizazr1wz4cinhrpsxx8p1p"; + sha256 = "09lyl9cpb5li7kyh0y78lhgvvb24ssfjmkz65xzbgm5jyrz8rmr4"; }; - cargoSha256 = "16nkmmkla3dlz40qhy04sknm3p2f5qik0ijczcw5ibg5w1jsydfr"; + cargoSha256 = "0m57cdbghzzjyxr6c0diyrfsjqip1dnqsh0zlapv8myizxy4rrzy"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; -- cgit v1.2.3 From 780b1713010c397bf06ee7d719a4606505d14197 Mon Sep 17 00:00:00 2001 From: Ivar Date: Sun, 3 May 2020 20:32:32 +0200 Subject: xp-pen-g430: rename to pentablet-driver --- pkgs/misc/drivers/pentablet-driver/default.nix | 37 ++++++++++++++++++++++++++ pkgs/misc/drivers/xp-pen-g430/default.nix | 37 -------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 39 insertions(+), 38 deletions(-) create mode 100644 pkgs/misc/drivers/pentablet-driver/default.nix delete mode 100644 pkgs/misc/drivers/xp-pen-g430/default.nix diff --git a/pkgs/misc/drivers/pentablet-driver/default.nix b/pkgs/misc/drivers/pentablet-driver/default.nix new file mode 100644 index 00000000000..99c00bf0f2d --- /dev/null +++ b/pkgs/misc/drivers/pentablet-driver/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchzip, autoPatchelfHook, libusb1, libX11, libXtst, qtbase, wrapQtAppsHook, libglvnd }: +stdenv.mkDerivation rec { + pname = "pentablet-driver"; + version = "20190820"; + + src = fetchzip { + url = "https://download01.xp-pen.com/file/2019/08/Linux%20Beta%20Driver(${version}).zip"; + sha256 = "091kfqxxj90pdmwncgfl8ldi70pdhwryh3cls30654983m8cgnby"; + } + /Linux_Pentablet_V1.3.0.0.tar.gz; + + nativeBuildInputs = [ + autoPatchelfHook + wrapQtAppsHook + ]; + + buildInputs = [ + libusb1 + libX11 + libXtst + qtbase + libglvnd + stdenv.cc.cc.lib + ]; + + installPhase = '' + mkdir -p $out/bin + cp {Pentablet_Driver,config.xml} "$out"/bin + ''; + + meta = with stdenv.lib; { + homepage = "https://www.xp-pen.com/download-46.html"; + description = "Driver for XP-PEN Pentablet drawing tablets"; + license = licenses.unfree; + platforms = platforms.linux; + maintainers = with maintainers; [ ivar ]; + }; +} diff --git a/pkgs/misc/drivers/xp-pen-g430/default.nix b/pkgs/misc/drivers/xp-pen-g430/default.nix deleted file mode 100644 index c382239f26a..00000000000 --- a/pkgs/misc/drivers/xp-pen-g430/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, fetchzip, autoPatchelfHook, libusb1, libX11, libXtst, qtbase, wrapQtAppsHook, libglvnd }: -stdenv.mkDerivation rec { - pname = "xp-pen-G430"; - version = "20190820"; - - src = fetchzip { - url = "https://download01.xp-pen.com/file/2019/08/Linux%20Beta%20Driver(${version}).zip"; - sha256 = "091kfqxxj90pdmwncgfl8ldi70pdhwryh3cls30654983m8cgnby"; - } + /Linux_Pentablet_V1.3.0.0.tar.gz; - - nativeBuildInputs = [ - autoPatchelfHook - wrapQtAppsHook - ]; - - buildInputs = [ - libusb1 - libX11 - libXtst - qtbase - libglvnd - stdenv.cc.cc.lib - ]; - - installPhase = '' - mkdir -p $out/bin - cp {Pentablet_Driver,config.xml} "$out"/bin - ''; - - meta = with stdenv.lib; { - homepage = "https://www.xp-pen.com/download-46.html"; - description = "Driver for the XP-PEN G430 drawing tablet"; - license = licenses.unfree; - platforms = platforms.linux; - maintainers = with maintainers; [ ivar ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 88e7d4d9e84..1b691c4f869 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -535,6 +535,7 @@ mapAliases ({ winswitch = throw "winswitch has been removed from nixpkgs."; # added 2019-12-10 wireguard = wireguard-tools; # added 2018-05-19 morituri = whipper; # added 2018-09-13 + xp-pen-g430 = pentablet-driver; # added 2020-05-03 xfceUnstable = xfce4-14; # added 2019-09-17 xfce4-14 = xfce; xfce4-12 = throw "xfce4-12 has been replaced by xfce4-14"; # added 2020-03-14 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf92cae7a6a..abcba8f5ccb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26346,7 +26346,7 @@ in bcompare = libsForQt5.callPackage ../applications/version-management/bcompare {}; - xp-pen-g430 = libsForQt5.callPackage ../misc/drivers/xp-pen-g430 {}; + pentablet-driver = libsForQt5.callPackage ../misc/drivers/pentablet-driver { }; qmk_firmware = callPackage ../development/misc/qmk_firmware { avrgcc = pkgsCross.avr.buildPackages.gcc; -- cgit v1.2.3 From daf860d9fe9d10a2f7e3f86037f9472b30626ed1 Mon Sep 17 00:00:00 2001 From: Ivar Date: Sun, 3 May 2020 20:34:21 +0200 Subject: pentablet-driver: 20190820 -> 1.2.13.1 --- pkgs/misc/drivers/pentablet-driver/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/misc/drivers/pentablet-driver/default.nix b/pkgs/misc/drivers/pentablet-driver/default.nix index 99c00bf0f2d..2f46d950d58 100644 --- a/pkgs/misc/drivers/pentablet-driver/default.nix +++ b/pkgs/misc/drivers/pentablet-driver/default.nix @@ -1,16 +1,16 @@ -{ stdenv, fetchzip, autoPatchelfHook, libusb1, libX11, libXtst, qtbase, wrapQtAppsHook, libglvnd }: -stdenv.mkDerivation rec { +{ stdenv, mkDerivation, fetchzip, autoPatchelfHook, libusb1, libX11, libXtst, qtbase, libglvnd }: + +mkDerivation rec { pname = "pentablet-driver"; - version = "20190820"; + version = "1.2.13.1"; src = fetchzip { - url = "https://download01.xp-pen.com/file/2019/08/Linux%20Beta%20Driver(${version}).zip"; - sha256 = "091kfqxxj90pdmwncgfl8ldi70pdhwryh3cls30654983m8cgnby"; - } + /Linux_Pentablet_V1.3.0.0.tar.gz; + url = "https://download01.xp-pen.com/file/2020/04/Linux_Pentablet_V${version}.tar.gz(20200428).zip"; + sha256 = "1r423hcpi26v82pzl59br1zw5vablikclqsy6mcqi0v5p84hfrdd"; + } + /Linux_Pentablet_V1.2.13.1.tar.gz; nativeBuildInputs = [ autoPatchelfHook - wrapQtAppsHook ]; buildInputs = [ @@ -24,14 +24,15 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - cp {Pentablet_Driver,config.xml} "$out"/bin + cp Pentablet_Driver $out/bin/pentablet-driver + cp config.xml $out/bin/config.xml ''; meta = with stdenv.lib; { homepage = "https://www.xp-pen.com/download-46.html"; description = "Driver for XP-PEN Pentablet drawing tablets"; license = licenses.unfree; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ ivar ]; }; } -- cgit v1.2.3 From 01cb649bce30f0edf1a344bb7650f55df413a664 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Sun, 3 May 2020 22:54:03 +0300 Subject: gitAndTools.git-workspace: 0.5.0 -> 0.6.0 --- .../version-management/git-and-tools/git-workspace/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix index b93163e239a..8894c4f0f7a 100644 --- a/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-workspace/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "git-workspace"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "orf"; repo = pname; rev = "v${version}"; - sha256 = "0pl5z0gx2ypkrgq7vj1cxj5iwj06vcd06x3b3nh0g7w7q7nl8pr4"; + sha256 = "0n025bnisg724d9pjcindxagj1ry63sxr0pplpkh2f2qffzm78pi"; }; - cargoSha256 = "1z4cb7rcb7ldj16xxynrjh4hg872rj39rbbp0vy15kdp3ifyi466"; + cargoSha256 = "0ikyp6pdlw2c1gr1n1snjbdmblm0fs5swx5awy36jskii99q6kr1"; buildInputs = with stdenv; lib.optional isDarwin Security; -- cgit v1.2.3 From 020d0bfe1aec36a170f31e1239493946fe216735 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Sun, 3 May 2020 21:59:17 +0200 Subject: aria2: add libaria2 support This changes the derivation to be a multi output derivation and at the same time builds the binary against the shared libaria2. --- pkgs/tools/networking/aria2/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 6c596e77af8..5ede0db598c 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -20,7 +20,12 @@ stdenv.mkDerivation rec { buildInputs = [ openssl c-ares libxml2 sqlite zlib libssh2 ] ++ stdenv.lib.optional stdenv.isDarwin Security; - configureFlags = [ "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" ]; + outputs = [ "bin" "dev" "out" "doc" "man" ]; + + configureFlags = [ + "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt" + "--enable-libaria2" + ]; prePatch = '' patchShebangs doc/manual-src/en/mkapiref.py -- cgit v1.2.3 From 91d23d848cd415816730d0e51de82e157f3345e0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 3 May 2020 20:18:06 +0000 Subject: freewheeling: 0.6.5 -> 0.6.6 --- pkgs/applications/audio/freewheeling/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix index 6ee120f3d1a..071a4a9caab 100644 --- a/pkgs/applications/audio/freewheeling/default.nix +++ b/pkgs/applications/audio/freewheeling/default.nix @@ -8,13 +8,13 @@ in stdenv.mkDerivation rec { pname = "freewheeling"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "free-wheeling"; repo = "freewheeling"; rev = "v${version}"; - sha256 = "1gjii2kndffj9iqici4vb9zrkrdqj1hs9q43x7jv48wv9872z78r"; + sha256 = "1xff5whr02cixihgd257dc70hnyf22j3zamvhsvg4lp7zq9l2in4"; }; nativeBuildInputs = [ pkgconfig autoreconfHook libtool ]; -- cgit v1.2.3 From 40241e09095db530cf5f533fb2294a2791035eb8 Mon Sep 17 00:00:00 2001 From: snicket2100 <57048005+snicket2100@users.noreply.github.com> Date: Sun, 26 Apr 2020 13:09:07 +0200 Subject: maintainers: add snicket2100 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9c98d743ee5..e9a472d332a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7136,6 +7136,12 @@ githubId = 602439; name = "Serguei Narojnyi"; }; + snicket2100 = { + email = "57048005+snicket2100@users.noreply.github.com"; + github = "snicket2100"; + githubId = 57048005; + name = "snicket2100"; + }; snyh = { email = "snyh@snyh.org"; github = "snyh"; -- cgit v1.2.3 From e91183d98de9d7680ccc6addd193d2878c3a7871 Mon Sep 17 00:00:00 2001 From: snicket2100 <57048005+snicket2100@users.noreply.github.com> Date: Sun, 26 Apr 2020 13:09:39 +0200 Subject: whsniff: init at 1.3 --- .../networking/sniffers/whsniff/default.nix | 25 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/networking/sniffers/whsniff/default.nix diff --git a/pkgs/applications/networking/sniffers/whsniff/default.nix b/pkgs/applications/networking/sniffers/whsniff/default.nix new file mode 100644 index 00000000000..d2e5803d58a --- /dev/null +++ b/pkgs/applications/networking/sniffers/whsniff/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, libusb1 }: + +stdenv.mkDerivation rec { + pname = "whsniff"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "homewsn"; + repo = pname; + rev = "v${version}"; + sha256 = "000l5vk9c0332m35lndk8892ivdr445lgg25hmq1lajn24cash5w"; + }; + + buildInputs = [ libusb1 ]; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/homewsn/whsniff"; + description = "Packet sniffer for 802.15.4 wireless networks"; + maintainers = with maintainers; [ snicket2100 ]; + platforms = platforms.linux; + license = licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d128be80c81..954b8eb60c7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7593,6 +7593,8 @@ in which = callPackage ../tools/system/which { }; + whsniff = callPackage ../applications/networking/sniffers/whsniff { }; + woeusb = callPackage ../tools/misc/woeusb { }; chase = callPackage ../tools/system/chase { }; -- cgit v1.2.3 From 9739d7e34a96762679a7cb2f3cb0cd7ad4f4b06d Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Sun, 3 May 2020 23:53:21 +0300 Subject: caddy2: 2.0.0-rc.1 -> 2.0.0-rc.3 --- pkgs/servers/caddy/v2.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/caddy/v2.nix b/pkgs/servers/caddy/v2.nix index 35c1f497850..599e2e8c906 100644 --- a/pkgs/servers/caddy/v2.nix +++ b/pkgs/servers/caddy/v2.nix @@ -1,10 +1,8 @@ -{ stdenv, callPackage, buildGoModule, fetchFromGitHub }: +{ stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "caddy"; - version = "2.0.0-rc.1"; - - goPackagePath = "github.com/caddyserver/caddy"; + version = "2.0.0-rc.3"; subPackages = [ "cmd/caddy" ]; @@ -12,9 +10,10 @@ buildGoModule rec { owner = "caddyserver"; repo = pname; rev = "v${version}"; - sha256 = "0ir394nmdrqvslghqky4d2py65ff77fqsp0nmxdlsdps49szwh7h"; + sha256 = "1jsjh8q5wsnp7j7r1rlnw0w4alihpcmpmlpqncmhik10f6v7xm3y"; }; - modSha256 = "0sqnw81l73gssnpd4dsl3vd10584riq0417z4dvbhjnc8b3z4xwv"; + + modSha256 = "0n0k0w9y2z87z6m6j3sxsgqn9sm82rdcqpdck236fxj23k4akyp6"; meta = with stdenv.lib; { homepage = "https://caddyserver.com"; -- cgit v1.2.3 From bc7421e2b43a15dc216168d64021b01dd75e4f5b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 3 May 2020 21:03:15 +0000 Subject: gpodder: 3.10.13 -> 3.10.15 --- pkgs/applications/audio/gpodder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index 1905699e516..933c9ac0203 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "gpodder"; - version = "3.10.13"; + version = "3.10.15"; format = "other"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1h542syaxsx1hslfzlk3fx1nbp190zjw35kigw7a1kx1jwvfwapg"; + sha256 = "0ghbanj142n0hgydzfjmnkdgri2kswsjal3mn10c723kih4ir4yr"; }; patches = [ -- cgit v1.2.3 From ce0c39be0b40c38e8f7927d0fb0cfabac378ea93 Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Mon, 4 May 2020 00:10:33 +0200 Subject: nixos/prosody: add MUC extraConfig, fix extraConfig order Add extraConfig option for the muc submodule. Also move the global extraConfig before all components and virtualhosts, because the manual states: The configuration is divided into two parts. The first part is known as the "global" section. All settings here apply to the whole server, and are the default for all virtual hosts. The second half of the file is a series of VirtualHost and Component definitions. Settings under each VirtualHost or Component line apply only to that host. Before, if at least one muc was defined, or uploadHttp enabled, the global extraConfig would end up after "muc" or "http_upload" component making it apply to that component only and not globally. --- nixos/modules/services/networking/prosody.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index 9825613d809..cdd341c9fb6 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -382,6 +382,11 @@ let default = "en"; description = "Default room language."; }; + extraConfig = mkOption { + type = types.lines; + default = ""; + description = "Additional MUC specific configuration"; + }; }; }; @@ -792,6 +797,8 @@ in https_ports = ${toLua cfg.httpsPorts} + ${ cfg.extraConfig } + ${lib.concatMapStrings (muc: '' Component ${toLua muc.domain} "muc" modules_enabled = { "muc_mam"; ${optionalString muc.vcard_muc ''"vcard_muc";'' } } @@ -809,8 +816,8 @@ in muc_room_default_change_subject = ${toLua muc.roomDefaultChangeSubject} muc_room_default_history_length = ${toLua muc.roomDefaultHistoryLength} muc_room_default_language = ${toLua muc.roomDefaultLanguage} - - '') cfg.muc} + ${ muc.extraConfig } + '') cfg.muc} ${ lib.optionalString (cfg.uploadHttp != null) '' Component ${toLua cfg.uploadHttp.domain} "http_upload" @@ -820,8 +827,6 @@ in http_upload_path = ${toLua cfg.uploadHttp.httpUploadPath} ''} - ${ cfg.extraConfig } - ${ lib.concatStringsSep "\n" (lib.mapAttrsToList (n: v: '' VirtualHost "${v.domain}" enabled = ${boolToString v.enabled}; -- cgit v1.2.3 From 96146a947678aaef6ba1ec5b8887cc79a70603ca Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Mon, 4 May 2020 00:14:42 +0200 Subject: nixosTests.prosodyMysql: fix Since 8aea5288 xmpp-sendmessage.nix tests MUC and HTTP upload, change the test to reflect this. --- nixos/tests/xmpp/prosody-mysql.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/nixos/tests/xmpp/prosody-mysql.nix b/nixos/tests/xmpp/prosody-mysql.nix index 0507227021b..9a00bcabf38 100644 --- a/nixos/tests/xmpp/prosody-mysql.nix +++ b/nixos/tests/xmpp/prosody-mysql.nix @@ -6,6 +6,11 @@ import ../make-test-python.nix { environment.systemPackages = [ (pkgs.callPackage ./xmpp-sendmessage.nix { connectTo = nodes.server.config.networking.primaryIPAddress; }) ]; + networking.extraHosts = '' + ${nodes.server.config.networking.primaryIPAddress} example.com + ${nodes.server.config.networking.primaryIPAddress} conference.example.com + ${nodes.server.config.networking.primaryIPAddress} uploads.example.com + ''; }; server = { config, pkgs, ... }: { nixpkgs.overlays = [ @@ -18,6 +23,8 @@ import ../make-test-python.nix { ]; networking.extraHosts = '' ${config.networking.primaryIPAddress} example.com + ${config.networking.primaryIPAddress} conference.example.com + ${config.networking.primaryIPAddress} uploads.example.com ''; networking.firewall.enable = false; services.prosody = { @@ -39,6 +46,14 @@ import ../make-test-python.nix { domain = "example.com"; enabled = true; }; + muc = [ + { + domain = "conference.example.com"; + } + ]; + uploadHttp = { + domain = "uploads.example.com"; + }; }; }; mysql = { config, pkgs, ... }: { -- cgit v1.2.3 From 4dd6ea02714ae3927100957ddb9a2163f4ccb7be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 3 May 2020 19:53:35 -0300 Subject: lxqt.libqtxdg: fix include and lib install directories This issue was introduce in PR #86079 commit d1460ad71fa96d4ada3b1fbce115726af1ee87d2 --- pkgs/desktops/lxqt/libqtxdg/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix index 526da0d84a4..f5da7a4b235 100644 --- a/pkgs/desktops/lxqt/libqtxdg/default.nix +++ b/pkgs/desktops/lxqt/libqtxdg/default.nix @@ -32,6 +32,8 @@ mkDerivation rec { preConfigure = '' cmakeFlagsArray+=( "-DQTXDGX_ICONENGINEPLUGIN_INSTALL_PATH=$out/$qtPluginPrefix/iconengines" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_LIBDIR=lib" ) ''; -- cgit v1.2.3 From 11cad6cf2ee1d4f25f0dee6526604d0cdf84f1e9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 3 May 2020 22:56:33 +0000 Subject: liquibase: 3.8.8 -> 3.8.9 --- pkgs/development/tools/database/liquibase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index d66d54ef45b..f246a0a806d 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -10,11 +10,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "3.8.8"; + version = "3.8.9"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "1pl9wgnwykvbnis0ndym0lbsj6a7lvpghrc98cw2hdnp5dglxjjl"; + sha256 = "13qpva81y98gp84zbcx6b4wsfgpsbv18aj5ihkw6l9ndbxfcrxdl"; }; buildInputs = [ jre makeWrapper ]; -- cgit v1.2.3 From 9bb1997f72cabfa71b845ef71a6754441d3395f8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 3 May 2020 23:01:21 +0000 Subject: luigi: 2.8.12 -> 2.8.13 --- pkgs/applications/networking/cluster/luigi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix index 010d8cf4d21..ced4c45d059 100644 --- a/pkgs/applications/networking/cluster/luigi/default.nix +++ b/pkgs/applications/networking/cluster/luigi/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "luigi"; - version = "2.8.12"; + version = "2.8.13"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1p83mxqs7w5v27a58ps7wji5mlyfz66cpkbyrndix0pv9hdyzpxn"; + sha256 = "0x14549iwj7r1knc0hmic9ny9hp960yjjqi4mxl78jb69gd3bhmf"; }; propagatedBuildInputs = with python3Packages; [ dateutil tornado_4 python-daemon boto3 ]; -- cgit v1.2.3 From 32934a673f4668a1784ed8bb14a982ac414a730c Mon Sep 17 00:00:00 2001 From: Benjamin Asbach Date: Sun, 3 May 2020 14:34:25 +0200 Subject: lxd: fixing path `/usr/share/misc/usb.ids` see #86650 --- pkgs/tools/admin/lxd/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 6051c16e91e..11929b33763 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgconfig, lxc, buildGoPackage, fetchurl +{ stdenv, hwdata, pkgconfig, lxc, buildGoPackage, fetchurl , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq , squashfsTools, iproute, iptables, ebtables, libcap, libco-canonical, dqlite , raft-canonical, sqlite-replication, udev @@ -19,6 +19,11 @@ buildGoPackage rec { sha256 = "0sxkyjayn7yyiy9kvbdlpkl58lwsl2rhlxnncg628f2kad2zgkdx"; }; + postPatch = '' + substituteInPlace shared/usbid/load.go \ + --replace "/usr/share/misc/usb.ids" "${hwdata}/share/hwdata/usb.ids" + ''; + preBuild = '' # unpack vendor pushd go/src/github.com/lxc/lxd -- cgit v1.2.3 From bce5268a216924820a486d09bc3aec7e8d6b8fa7 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Mon, 4 May 2020 01:39:35 +0200 Subject: niss: 3.51 -> 3.52 --- pkgs/development/libraries/nss/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 8dbef28804a..d48b5a6ba73 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -5,7 +5,7 @@ let url = "http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz"; sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; }; - version = "3.51"; + version = "3.52"; underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; - sha256 = "1725d0idf5zzqafdqfdn9vprc7ys2ywhv23sqn328di968xqnd3m"; + sha256 = "0q8m9jf6zgkbhx71myjb7y0gcl5ib3gj6qkl9yvdqpd6vl6fn2ha"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -27,8 +27,12 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ nspr ]; prePatch = '' - # strip the trailing whitespace from the patch line… - xz -d < ${nssPEM} | sed -e '/^-DIRS = builtins $/ s/ $//' | patch -p1 + # strip the trailing whitespace from the patch line and the renamed CKO_NETSCAPE_ enum to CKO_NSS_ + xz -d < ${nssPEM} | sed \ + -e '/^-DIRS = builtins $/ s/ $//' \ + -e 's/CKO_NETSCAPE_/CKO_NSS_/g' \ + -e 's/CKT_NETSCAPE_/CKT_NSS_/g' \ + | patch -p1 ''; patches = -- cgit v1.2.3 From 8ecc768d4c21f894b1c8e9c77a37b685f7f48c9e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 00:04:16 +0000 Subject: mod: 0.3.0 -> 0.4.0 --- pkgs/development/tools/mod/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/mod/default.nix b/pkgs/development/tools/mod/default.nix index 3261c8af202..5237d131af0 100644 --- a/pkgs/development/tools/mod/default.nix +++ b/pkgs/development/tools/mod/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mod"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "marwan-at-work"; repo = "mod"; rev = "v${version}"; - sha256 = "1kcsdi9qls9kgklj96ycyrq5fsz5m2qj3ij63d2rwqjggqk0cab6"; + sha256 = "1n0pipbq4fjban8hsxhyl5w8xrl4ai1pvgd02i1j1awmm2l3ykzl"; }; - modSha256 = "0famjypv5qg9lgzw4pz2kz70l50cn6n6nbjyk7jrzmd6bjzd0ypl"; + modSha256 = "1nl7d00prw1663xrl1nvj1xbs7wzkbqn75i92al821pz12dybdif"; subPackages = [ "cmd/mod" ]; -- cgit v1.2.3 From 9218a3599a0e4ba0899d04055897a449d444f22d Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Sun, 3 May 2020 20:49:02 -0400 Subject: tomcat-native: 1.2.23 -> 1.2.24 --- pkgs/servers/http/tomcat/tomcat-native.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/tomcat/tomcat-native.nix b/pkgs/servers/http/tomcat/tomcat-native.nix index 57ab2a96b4d..17c4367866f 100644 --- a/pkgs/servers/http/tomcat/tomcat-native.nix +++ b/pkgs/servers/http/tomcat/tomcat-native.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tomcat-native"; - version = "1.2.23"; + version = "1.2.24"; src = fetchurl { url = "mirror://apache/tomcat/tomcat-connectors/native/${version}/source/${pname}-${version}-src.tar.gz"; - sha512 = "89a0363961d322a87f4e752f4727f54f28ac6e4ad10fa21b6b7390c62b041d4068672d95495d9233c1cad7d6c1dc3c85fbd0186894085b3b94e476876af160ee"; + sha512 = "5dae151a60f8bd5a9a29d63eca838c77174426025ee65a826f0698943494dd3656d50bcd417e220a926b9ce111ea167043d4b806264030e951873d06767b3d6f"; }; sourceRoot = "${pname}-${version}-src/native"; -- cgit v1.2.3 From 667d0a414ef82de9e0943258ae3d52bce42a2e91 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Sun, 3 May 2020 18:39:37 -0700 Subject: alacritty: improve robustness of installPhase (again) I missed this one. Oops. --- pkgs/applications/misc/alacritty/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 19f0790fea3..3135c1f8831 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -100,7 +100,7 @@ rustPlatform.buildRustPackage rec { '' + ( if stdenv.isDarwin then '' mkdir $out/Applications - cp -r target/release/osx/Alacritty.app $out/Applications/Alacritty.app + cp -r $releaseDir/osx/Alacritty.app $out/Applications/Alacritty.app '' else '' 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 -- cgit v1.2.3 From 586e230d8b91825c9f7ebe76329976597c6f706e Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Sun, 3 May 2020 18:45:39 -0700 Subject: cached-nix-shell: improve robustness of postInstall --- pkgs/tools/nix/cached-nix-shell/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/nix/cached-nix-shell/default.nix b/pkgs/tools/nix/cached-nix-shell/default.nix index dc69d3f030d..03f6bc2b117 100644 --- a/pkgs/tools/nix/cached-nix-shell/default.nix +++ b/pkgs/tools/nix/cached-nix-shell/default.nix @@ -34,7 +34,7 @@ in rustPlatform.buildRustPackage rec { postInstall = '' mkdir -p $out/lib $out/share/cached-nix-shell $out/share/man/man1 $out/var/empty - cp target/release/build/cached-nix-shell-*/out/trace-nix.so $out/lib + cp $releaseDir/build/cached-nix-shell-*/out/trace-nix.so $out/lib cp rcfile.sh $out/share/cached-nix-shell/rcfile.sh cp cached-nix-shell.1 $out/share/man/man1 ''; -- cgit v1.2.3 From 7f5eee6a110b588c686c9341945487314aebbff9 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Sun, 3 May 2020 19:10:40 -0700 Subject: plex-mpv-shim: 1.7.14 -> 1.7.16 --- pkgs/applications/video/plex-mpv-shim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/plex-mpv-shim/default.nix b/pkgs/applications/video/plex-mpv-shim/default.nix index df72e200e62..268905e3a4c 100644 --- a/pkgs/applications/video/plex-mpv-shim/default.nix +++ b/pkgs/applications/video/plex-mpv-shim/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "plex-mpv-shim"; - version = "1.7.14"; + version = "1.7.16"; src = fetchFromGitHub { owner = "iwalton3"; repo = pname; rev = "v${version}"; - sha256 = "1rjifqvs59w2aacfird02myqfd34qadhacj9zpy5xjz25x410zza"; + sha256 = "1pnbdxaqnliwqfvv08gi7gdcvflg5vcbgk4g0fw75prgw54vnd9a"; }; propagatedBuildInputs = [ mpv requests python-mpv-jsonipc ]; -- cgit v1.2.3 From 151d32d22c14447bccbc5c81f3d06a6689b2f593 Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Sun, 3 May 2020 20:42:18 -0300 Subject: nixos/hostapd: use CRDA Needed for regulatory compliance and unlocking some channels. --- nixos/modules/services/networking/hostapd.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index 2915b54f05b..fc6e4c77a9a 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -164,6 +164,8 @@ in environment.systemPackages = [ pkgs.hostapd ]; + services.udev.packages = [ pkgs.crda ]; + systemd.services.hostapd = { description = "hostapd wireless AP"; -- cgit v1.2.3 From c241a4c58fb795cfa103cc58f8a71a7f4a593b9e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 03:09:54 +0000 Subject: osmium-tool: 1.11.1 -> 1.12.0 --- pkgs/applications/misc/osmium-tool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/osmium-tool/default.nix b/pkgs/applications/misc/osmium-tool/default.nix index 82144e9689f..c0d20c14f7c 100644 --- a/pkgs/applications/misc/osmium-tool/default.nix +++ b/pkgs/applications/misc/osmium-tool/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "osmium-tool"; - version = "1.11.1"; + version = "1.12.0"; src = fetchFromGitHub { owner = "osmcode"; repo = "osmium-tool"; rev = "v${version}"; - sha256 = "199dvajik5d56nybk2061vdjyxwakngfd7frxj99wr2vsrp4aw2b"; + sha256 = "18afn5qzdjpip176kk5pr04mj0p7dv70dbz1n36qmqnq3gyms10q"; }; nativeBuildInputs = [ cmake ]; -- cgit v1.2.3 From d8f4f65ef95b8bcfb28ec00d60f5e75ea04dfd6d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 03:22:31 +0000 Subject: papirus-icon-theme: 20200405 -> 20200430 --- pkgs/data/icons/papirus-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index b47c01d973e..a39a8720635 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20200405"; + version = "20200430"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "0qv4340avm5s0640r8aznbfwjzvm6k64840qggyg9jfcy6223pdy"; + sha256 = "1dgxf3fi4x5iy504xncj1jba8cd51axkn2j1cfb220rpc6mzv25l"; }; nativeBuildInputs = [ -- cgit v1.2.3 From c09c0542311b5f31dc22364192565721d33c6db8 Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Sun, 3 May 2020 22:38:43 -0300 Subject: nixos/hostapd: add countryCode option --- nixos/modules/services/networking/hostapd.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index fc6e4c77a9a..f2434be2462 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -20,6 +20,7 @@ let ssid=${cfg.ssid} hw_mode=${cfg.hwMode} channel=${toString cfg.channel} + ${optionalString (cfg.countryCode != null) ''country_code=${cfg.countryCode}''} # logging (debug level) logger_syslog=-1 @@ -144,6 +145,19 @@ in ''; }; + countryCode = mkOption { + default = null; + example = "US"; + type = with types; nullOr str; + description = '' + Country code (ISO/IEC 3166-1). Used to set regulatory domain. + Set as needed to indicate country in which device is operating. + This can limit available channels and transmit power. + These two octets are used as the first two octets of the Country String + (dot11CountryString) + ''; + }; + extraConfig = mkOption { default = ""; example = '' @@ -164,7 +178,7 @@ in environment.systemPackages = [ pkgs.hostapd ]; - services.udev.packages = [ pkgs.crda ]; + services.udev.packages = optional (cfg.countryCode != null) [ pkgs.crda ]; systemd.services.hostapd = { description = "hostapd wireless AP"; -- cgit v1.2.3 From d6d04422433dc031be0f6271fc594d68f4b01405 Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Sun, 3 May 2020 22:39:14 -0300 Subject: nixos/hostapd: add logLevel option --- nixos/modules/services/networking/hostapd.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index f2434be2462..c11f5bab3d5 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -24,9 +24,9 @@ let # logging (debug level) logger_syslog=-1 - logger_syslog_level=2 + logger_syslog_level=${toString cfg.logLevel} logger_stdout=-1 - logger_stdout_level=2 + logger_stdout_level=${toString cfg.logLevel} ctrl_interface=/run/hostapd ctrl_interface_group=${cfg.group} @@ -145,6 +145,19 @@ in ''; }; + logLevel = mkOption { + default = 2; + type = types.int; + description = '' + Levels (minimum value for logged events): + 0 = verbose debugging + 1 = debugging + 2 = informational messages + 3 = notification + 4 = warning + ''; + }; + countryCode = mkOption { default = null; example = "US"; -- cgit v1.2.3 From c683beeaa19a9ae4b6176881cbb228b19b14ec0e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 03:48:21 +0000 Subject: particl-core: 0.17.1.2 -> 0.19.1.1 --- pkgs/applications/blockchains/particl/particl-core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/particl/particl-core.nix b/pkgs/applications/blockchains/particl/particl-core.nix index 5cb94b8bd54..f30e9a60980 100644 --- a/pkgs/applications/blockchains/particl/particl-core.nix +++ b/pkgs/applications/blockchains/particl/particl-core.nix @@ -17,11 +17,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "particl-core"; - version = "0.17.1.2"; + version = "0.19.1.1"; src = fetchurl { url = "https://github.com/particl/particl-core/archive/v${version}.tar.gz"; - sha256 = "16hcyxwp6yrypwvxz6i2987z3jmpk47xcgnsgh9klih8baqg64p5"; + sha256 = "11y5q2srkh6r2samppjb5mg6hl79y16j2lj1r23p0968vb9c45kl"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; -- cgit v1.2.3 From 83a0ca9aee57b1977a392a9d884c082a2a593274 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 03:57:17 +0000 Subject: pdfarranger: 1.4.2 -> 1.5.1 --- pkgs/applications/misc/pdfarranger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/pdfarranger/default.nix b/pkgs/applications/misc/pdfarranger/default.nix index 58d889484d6..4d2576aaadc 100644 --- a/pkgs/applications/misc/pdfarranger/default.nix +++ b/pkgs/applications/misc/pdfarranger/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "pdfarranger"; - version = "1.4.2"; + version = "1.5.1"; src = fetchFromGitHub { owner = "jeromerobert"; repo = pname; rev = version; - sha256 = "11q14pxyp5z4y3gabjnis3ip3xss6n94zjl42akwf27dxgxlpcjk"; + sha256 = "0n4jw0dsqw929a34ff077kz8w89vkjkqf8dy4c356zh6gf23cdxr"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 206d7a1310ba6fcdada33539d1c1cdb4d861e9bb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 04:02:29 +0000 Subject: pdfsam-basic: 4.1.2 -> 4.1.3 --- pkgs/applications/misc/pdfsam-basic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix index abf49f93684..d1892352785 100644 --- a/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/pkgs/applications/misc/pdfsam-basic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pdfsam-basic"; - version = "4.1.2"; + version = "4.1.3"; src = fetchurl { url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb"; - sha256 = "1k1azxz92vkb4hylk4ki0szfn47ids0lwg01zfs54yc89j0c6142"; + sha256 = "1rhv6mf6pr9aaa8516i3b7v6h622qb1p8c4jsy3j0s5wrdry5l9l"; }; unpackPhase = '' -- cgit v1.2.3 From 877b1cdad74500320afe7e1b06b525d21c1a0741 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 04:07:44 +0000 Subject: picard-tools: 2.22.2 -> 2.22.4 --- pkgs/applications/science/biology/picard-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix index 246c9876810..5073d0f0f32 100644 --- a/pkgs/applications/science/biology/picard-tools/default.nix +++ b/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "2.22.2"; + version = "2.22.4"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "11mzz483f89pb2s8jmwhl12d0m6k41kmi4xh0i6hq69rxrqi8l4s"; + sha256 = "0gzna5df8nk42l7mc0qbp9h73gwr1030jnw10fawjp6ql6213kdd"; }; nativeBuildInputs = [ makeWrapper ]; -- cgit v1.2.3 From c849739bcc18597194c2a44febb15fb712696721 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 04:55:37 +0000 Subject: pspg: 2.7.1 -> 3.0.7 --- pkgs/tools/misc/pspg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index 1bd2fc259ee..1bb7f9582c4 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "2.7.1"; + version = "3.0.7"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "1fq8n5naicfv0lsyzfb52c84w40zrsks0x9rrvyyzih4vkhic4vm"; + sha256 = "10w47hbi6y92imzh1rlwkh5bfj1pnlkfxhbi8lhmy6ggxa62xmf7"; }; nativeBuildInputs = [ pkgconfig ]; -- cgit v1.2.3 From 8c9263e118ccb3ce2e760f52312d36eefb210a19 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 04:59:47 +0000 Subject: pt2-clone: 1.07 -> 1.12 --- pkgs/applications/audio/pt2-clone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index 2f21e3ea56b..5284c8af682 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.07"; + version = "1.12"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "0g2bp9n05ng2fvqw86pb941zamcqnfz1l066wvh5j3av1w22khi8"; + sha256 = "1y7kv889rm3nvaigcda4bglvwm799f3gp0zrivkvrg1lrlygs89f"; }; nativeBuildInputs = [ cmake ]; -- cgit v1.2.3 From aefa6aeb9e8e10091a72639917e7c3ea7f278eda Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 05:07:01 +0000 Subject: pueue: 0.3.0 -> 0.3.1 --- pkgs/applications/misc/pueue/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index e90a86f225b..0498419910f 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "Nukesor"; repo = pname; rev = "v${version}"; - sha256 = "11x4y3ah9f7mv9jssws95sw7rd20fxwdh11mrhcb4vwk59cmqsjz"; + sha256 = "1v3fphx71hyv7fq09slhyzchw362swzhmhn7wmbazfdrj6fjhcki"; }; - cargoSha256 = "06zv3li14sg4a8bgj38zzx576ggm32ss0djmys1g0h5a0nxaaqfx"; + cargoSha256 = "04vi9la17pabz1spfw1fzgy4c2ifnis6am5m4ck3lhccnn6j8bd3"; checkPhase = "cargo test -- --skip test_single_huge_payload"; -- cgit v1.2.3 From fe7b497c83b6307f16a51160fead19c38e069680 Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Wed, 29 Apr 2020 00:12:27 +0200 Subject: python3Packages.python-gitlab: re-format with nixfmt --- pkgs/development/python-modules/python-gitlab/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index d2b1a6570b1..0fd4c3b8e01 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -1,7 +1,7 @@ { stdenv, buildPythonPackage, fetchPypi, requests, six, mock, httmock }: buildPythonPackage rec { - pname = "python-gitlab"; + pname = "python-gitlab"; version = "1.15.0"; src = fetchPypi { @@ -15,8 +15,8 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Interact with GitLab API"; - homepage = "https://github.com/python-gitlab/python-gitlab"; - license = licenses.lgpl3; + homepage = "https://github.com/python-gitlab/python-gitlab"; + license = licenses.lgpl3; maintainers = with maintainers; [ nyanloutre ]; }; } -- cgit v1.2.3 From de9f8c36c90af622911d38c3ff0f214693ca1ad9 Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Wed, 29 Apr 2020 00:52:44 +0200 Subject: python3Packages.python-gitlab: 1.15.0 -> 2.2.0 --- pkgs/development/python-modules/python-gitlab/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 0fd4c3b8e01..0c1f7c67e3d 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -1,18 +1,20 @@ -{ stdenv, buildPythonPackage, fetchPypi, requests, six, mock, httmock }: +{ stdenv, buildPythonPackage, fetchPypi, requests, mock, httmock, pythonOlder }: buildPythonPackage rec { pname = "python-gitlab"; - version = "1.15.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "45125a0ed4d0027d4317bdbd71ca02fc52b0ac160b9d2c3c5be131b4d19f867e"; + sha256 = "4c4ea60c8303f4214522b18038df017cae35afda7474efa0b4e19c2e73bc3ae2"; }; - propagatedBuildInputs = [ requests six ]; + propagatedBuildInputs = [ requests ]; checkInputs = [ mock httmock ]; + disabled = pythonOlder "3.6"; + meta = with stdenv.lib; { description = "Interact with GitLab API"; homepage = "https://github.com/python-gitlab/python-gitlab"; -- cgit v1.2.3 From 7b0167204d1db7f65cc0c21e3f2c65ff9b65a738 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sat, 18 Apr 2020 22:51:19 +0200 Subject: treewide: use https for nixos.org and hydra.nixos.org tarballs.nixos.org is omitted from the change because urls from there are always hashed and checked --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- doc/contributing/quick-start.xml | 2 +- doc/languages-frameworks/android.section.md | 2 +- doc/languages-frameworks/ios.section.md | 2 +- doc/preface.chapter.md | 2 +- doc/release-notes.xml | 4 ++-- maintainers/scripts/hydra-eval-failures.py | 2 +- nixos/README | 2 +- nixos/doc/manual/configuration/adding-custom-packages.xml | 2 +- nixos/doc/manual/configuration/config-syntax.xml | 2 +- nixos/doc/manual/configuration/summary.xml | 2 +- nixos/doc/manual/development/releases.xml | 2 +- nixos/doc/manual/development/replace-modules.xml | 2 +- nixos/doc/manual/installation/obtaining.xml | 4 ++-- nixos/doc/manual/release-notes/rl-1404.xml | 2 +- nixos/doc/manual/release-notes/rl-1509.xml | 4 ++-- nixos/doc/manual/release-notes/rl-1603.xml | 2 +- nixos/modules/programs/venus.nix | 2 +- nixos/modules/services/editors/emacs.xml | 2 +- nixos/modules/services/misc/nix-daemon.nix | 2 +- nixos/tests/chromium.nix | 2 +- nixos/tests/ec2.nix | 2 +- nixos/tests/udisks2.nix | 2 +- pkgs/applications/networking/cluster/chronos/default.nix | 2 +- pkgs/applications/networking/instant-messengers/vacuum/default.nix | 2 +- pkgs/build-support/fetchurl/default.nix | 2 +- pkgs/development/haskell-modules/configuration-common.nix | 2 +- pkgs/development/interpreters/picoc/default.nix | 2 +- pkgs/development/libraries/check/default.nix | 2 +- pkgs/development/libraries/gmp/5.1.x.nix | 2 +- pkgs/development/libraries/gmp/6.x.nix | 2 +- pkgs/development/libraries/gnutls-kdh/generic.nix | 2 +- pkgs/development/libraries/gnutls/default.nix | 2 +- pkgs/development/libraries/libgpg-error/default.nix | 2 +- pkgs/development/python-modules/eggdeps/default.nix | 2 +- pkgs/development/python-modules/pyopenssl/default.nix | 2 +- pkgs/games/dwarf-fortress/df_permission | 2 +- pkgs/tools/package-management/nix/default.nix | 2 +- pkgs/tools/package-management/nixops/nixops-v1_6_1.nix | 2 +- pkgs/tools/typesetting/tex/texlive/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 41 files changed, 44 insertions(+), 44 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index f4433807809..48b84f8c36c 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -15,7 +15,7 @@ Reviewing guidelines: https://hydra.nixos.org/job/nixpkgs/trunk/manual/latest/do -- [ ] Tested using sandboxing ([nix.useSandbox](http://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](http://nixos.org/nix/manual/#sec-conf-file) on non-NixOS linux) +- [ ] Tested using sandboxing ([nix.useSandbox](https://nixos.org/nixos/manual/options.html#opt-nix.useSandbox) on NixOS, or option `sandbox` in [`nix.conf`](https://nixos.org/nix/manual/#sec-conf-file) on non-NixOS linux) - Built on platform(s) - [ ] NixOS - [ ] macOS diff --git a/doc/contributing/quick-start.xml b/doc/contributing/quick-start.xml index 8e4e914d451..09d60834ec2 100644 --- a/doc/contributing/quick-start.xml +++ b/doc/contributing/quick-start.xml @@ -111,7 +111,7 @@ The exact syntax and semantics of the Nix expression language, including the built-in function, are described in the Nix manual in the chapter on writing Nix expressions. + xlink:href="https://hydra.nixos.org/job/nix/trunk/tarball/latest/download-by-type/doc/manual/#chap-writing-nix-expressions">chapter on writing Nix expressions. diff --git a/doc/languages-frameworks/android.section.md b/doc/languages-frameworks/android.section.md index 6ee450eeb59..1a8924082bf 100644 --- a/doc/languages-frameworks/android.section.md +++ b/doc/languages-frameworks/android.section.md @@ -167,7 +167,7 @@ parameters that the SDK composition function (the function shown in the previous section) supports. This build function is particularly useful when it is desired to use -[Hydra](http://nixos.org/hydra): the Nix-based continuous integration solution +[Hydra](https://nixos.org/hydra): the Nix-based continuous integration solution to build Android apps. An Android APK gets exposed as a build product and can be installed on any Android device with a web browser by navigating to the build result page. diff --git a/doc/languages-frameworks/ios.section.md b/doc/languages-frameworks/ios.section.md index 5a81795c004..768e0690b96 100644 --- a/doc/languages-frameworks/ios.section.md +++ b/doc/languages-frameworks/ios.section.md @@ -18,7 +18,7 @@ The primary objective of this project is to use the Nix expression language to specify how iOS apps can be built from source code, and to automatically spawn iOS simulator instances for testing. -This component also makes it possible to use [Hydra](http://nixos.org/hydra), +This component also makes it possible to use [Hydra](https://nixos.org/hydra), the Nix-based continuous integration server to regularly build iOS apps and to do wireless ad-hoc installations of enterprise IPAs on iOS devices through Hydra. diff --git a/doc/preface.chapter.md b/doc/preface.chapter.md index 7fa65ab1102..549e42de7aa 100644 --- a/doc/preface.chapter.md +++ b/doc/preface.chapter.md @@ -42,7 +42,7 @@ distributed as soon as all tests for that channel pass, e.g. [this table](https://hydra.nixos.org/job/nixpkgs/trunk/unstable#tabs-constituents) shows the status of tests for the `nixpkgs` channel. -The tests are conducted by a cluster called [Hydra](http://nixos.org/hydra/), +The tests are conducted by a cluster called [Hydra](https://nixos.org/hydra/), which also builds binary packages from the Nix expressions in Nixpkgs for `x86_64-linux`, `i686-linux` and `x86_64-darwin`. The binaries are made available via a [binary cache](https://cache.nixos.org). diff --git a/doc/release-notes.xml b/doc/release-notes.xml index 7575289e755..a15f5466729 100644 --- a/doc/release-notes.xml +++ b/doc/release-notes.xml @@ -286,7 +286,7 @@ export NIX_MIRRORS_sourceforge=http://osdn.dl.sourceforge.net/sourceforge/ This release of Nixpkgs requires Nix 0.10 or higher. +xlink:href='https://nixos.org/releases/nix/nix-0.10/'>Nix 0.10 or higher. @@ -436,7 +436,7 @@ stdenv.mkDerivation { Distribution files have been moved to . + xlink:href="https://nixos.org/" />. diff --git a/maintainers/scripts/hydra-eval-failures.py b/maintainers/scripts/hydra-eval-failures.py index 6e7ec2dbc00..0f738c5427b 100755 --- a/maintainers/scripts/hydra-eval-failures.py +++ b/maintainers/scripts/hydra-eval-failures.py @@ -79,7 +79,7 @@ def cli(jobset): and print a summary of failed builds """ - url = "http://hydra.nixos.org/jobset/{}".format(jobset) + url = "https://hydra.nixos.org/jobset/{}".format(jobset) # get the last evaluation click.echo(click.style( diff --git a/nixos/README b/nixos/README index 4ecf648a930..ce4dd1988d2 100644 --- a/nixos/README +++ b/nixos/README @@ -2,4 +2,4 @@ NixOS is a Linux distribution based on the purely functional package management system Nix. More information can be found at -http://nixos.org/nixos and in the manual in doc/manual. +https://nixos.org/nixos and in the manual in doc/manual. diff --git a/nixos/doc/manual/configuration/adding-custom-packages.xml b/nixos/doc/manual/configuration/adding-custom-packages.xml index 182641055e4..02cb78f47e8 100644 --- a/nixos/doc/manual/configuration/adding-custom-packages.xml +++ b/nixos/doc/manual/configuration/adding-custom-packages.xml @@ -11,7 +11,7 @@ the package to your clone, and (optionally) submit a patch or pull request to have it accepted into the main Nixpkgs repository. This is described in detail in the Nixpkgs +xlink:href="https://nixos.org/nixpkgs/manual">Nixpkgs manual. In short, you clone Nixpkgs: $ git clone https://github.com/NixOS/nixpkgs diff --git a/nixos/doc/manual/configuration/config-syntax.xml b/nixos/doc/manual/configuration/config-syntax.xml index 5ef498cf9ae..5526dea247c 100644 --- a/nixos/doc/manual/configuration/config-syntax.xml +++ b/nixos/doc/manual/configuration/config-syntax.xml @@ -14,7 +14,7 @@ when managing complex systems. The syntax and semantics of the Nix language are fully described in the Nix +xlink:href="https://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix manual, but here we give a short overview of the most important constructs useful in NixOS configuration files. diff --git a/nixos/doc/manual/configuration/summary.xml b/nixos/doc/manual/configuration/summary.xml index ea980254a8f..289face16de 100644 --- a/nixos/doc/manual/configuration/summary.xml +++ b/nixos/doc/manual/configuration/summary.xml @@ -10,7 +10,7 @@ expression language. It’s not complete. In particular, there are many other built-in functions. See the Nix +xlink:href="https://nixos.org/nix/manual/#chap-writing-nix-expressions">Nix manual for the rest. diff --git a/nixos/doc/manual/development/releases.xml b/nixos/doc/manual/development/releases.xml index cc0ec78cc74..8abc66dfec1 100755 --- a/nixos/doc/manual/development/releases.xml +++ b/nixos/doc/manual/development/releases.xml @@ -57,7 +57,7 @@ - Make sure a channel is created at http://nixos.org/channels/. + Make sure a channel is created at https://nixos.org/channels/. diff --git a/nixos/doc/manual/development/replace-modules.xml b/nixos/doc/manual/development/replace-modules.xml index b4a466e2294..9fc5678ca1b 100644 --- a/nixos/doc/manual/development/replace-modules.xml +++ b/nixos/doc/manual/development/replace-modules.xml @@ -37,7 +37,7 @@ imports = [ # Use postgresql service from nixos-unstable channel. - # sudo nix-channel --add http://nixos.org/channels/nixos-unstable nixos-unstable + # sudo nix-channel --add https://nixos.org/channels/nixos-unstable nixos-unstable <nixos-unstable/nixos/modules/services/databases/postgresql.nix> ]; diff --git a/nixos/doc/manual/installation/obtaining.xml b/nixos/doc/manual/installation/obtaining.xml index 56af5c0e25a..3b8671782de 100644 --- a/nixos/doc/manual/installation/obtaining.xml +++ b/nixos/doc/manual/installation/obtaining.xml @@ -7,7 +7,7 @@ NixOS ISO images can be downloaded from the NixOS download +xlink:href="https://nixos.org/nixos/download.html">NixOS download page. There are a number of installation options. If you happen to have an optical drive and a spare CD, burning the image to CD and booting from that is probably the easiest option. Most people will need to prepare a @@ -26,7 +26,7 @@ xlink:href="https://nixos.wiki/wiki/NixOS_Installation_Guide#Making_the_installa Using virtual appliances in Open Virtualization Format (OVF) that can be imported into VirtualBox. These are available from the - NixOS download + NixOS download page. diff --git a/nixos/doc/manual/release-notes/rl-1404.xml b/nixos/doc/manual/release-notes/rl-1404.xml index 8d8cea4303a..56dbb74a71d 100644 --- a/nixos/doc/manual/release-notes/rl-1404.xml +++ b/nixos/doc/manual/release-notes/rl-1404.xml @@ -49,7 +49,7 @@ Nix has been updated to 1.7 (details). + xlink:href="https://nixos.org/nix/manual/#ssec-relnotes-1.7">details). diff --git a/nixos/doc/manual/release-notes/rl-1509.xml b/nixos/doc/manual/release-notes/rl-1509.xml index 5c4d9970178..098c8c5095b 100644 --- a/nixos/doc/manual/release-notes/rl-1509.xml +++ b/nixos/doc/manual/release-notes/rl-1509.xml @@ -22,7 +22,7 @@ in excess of 8,000 Haskell packages. Detailed instructions on how to use that infrastructure can be found in the User's + xlink:href="https://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure">User's Guide to the Haskell Infrastructure. Users migrating from an earlier release may find helpful information below, in the list of backwards-incompatible changes. Furthermore, we distribute 51(!) additional @@ -555,7 +555,7 @@ nix-env -f "<nixpkgs>" -iA haskellPackages.pandoc the compiler now is the haskellPackages.ghcWithPackages function. The User's + xlink:href="https://nixos.org/nixpkgs/manual/#users-guide-to-the-haskell-infrastructure">User's Guide to the Haskell Infrastructure provides more information about this subject. diff --git a/nixos/doc/manual/release-notes/rl-1603.xml b/nixos/doc/manual/release-notes/rl-1603.xml index 9b512c4b1e5..6d4b28825fa 100644 --- a/nixos/doc/manual/release-notes/rl-1603.xml +++ b/nixos/doc/manual/release-notes/rl-1603.xml @@ -54,7 +54,7 @@ xlink:href="https://reproducible-builds.org/specs/source-date-epoch/">SOURCE_DATE_EPOCH to a deterministic value, and Nix has gained + xlink:href="https://nixos.org/nix/manual/#ssec-relnotes-1.11">gained an option to repeat a build a number of times to test determinism. An ongoing project, the goal of exact reproducibility is to allow binaries to be verified independently (e.g., a user might only trust binaries that diff --git a/nixos/modules/programs/venus.nix b/nixos/modules/programs/venus.nix index 110570ac3f0..58faf38777d 100644 --- a/nixos/modules/programs/venus.nix +++ b/nixos/modules/programs/venus.nix @@ -75,7 +75,7 @@ in }; link = mkOption { - default = "http://planet.nixos.org"; + default = "https://planet.nixos.org"; type = types.str; description = '' Link to the main page. diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml index 03483f69fa2..74c60014dce 100644 --- a/nixos/modules/services/editors/emacs.xml +++ b/nixos/modules/services/editors/emacs.xml @@ -294,7 +294,7 @@ https://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides If you are not on NixOS or want to install this particular Emacs only for yourself, you can do so by adding it to your ~/.config/nixpkgs/config.nix (see - Nixpkgs + Nixpkgs manual): Custom Emacs in <filename>~/.config/nixpkgs/config.nix</filename> diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 0c2407e1dd2..b28e3679d1c 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -283,7 +283,7 @@ in trustedBinaryCaches = mkOption { type = types.listOf types.str; default = [ ]; - example = [ "http://hydra.nixos.org/" ]; + example = [ "https://hydra.nixos.org/" ]; description = '' List of binary cache URLs that non-root users can use (in addition to those specified using diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index fc5d3a5c52f..795b93f6f54 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -37,7 +37,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec { diff --git a/nixos/tests/ec2.nix b/nixos/tests/ec2.nix index 6aeeb17ba31..5a59d65e602 100644 --- a/nixos/tests/ec2.nix +++ b/nixos/tests/ec2.nix @@ -108,7 +108,7 @@ in { inherit image; sshPublicKey = snakeOilPublicKey; - # ### http://nixos.org/channels/nixos-unstable nixos + # ### https://nixos.org/channels/nixos-unstable nixos userData = '' { pkgs, ... }: diff --git a/nixos/tests/udisks2.nix b/nixos/tests/udisks2.nix index 64f5b6c40d2..50a02396891 100644 --- a/nixos/tests/udisks2.nix +++ b/nixos/tests/udisks2.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, ... }: let stick = pkgs.fetchurl { - url = "http://nixos.org/~eelco/nix/udisks-test.img.xz"; + url = "https://nixos.org/~eelco/nix/udisks-test.img.xz"; sha256 = "0was1xgjkjad91nipzclaz5biv3m4b2nk029ga6nk7iklwi19l8b"; }; diff --git a/pkgs/applications/networking/cluster/chronos/default.nix b/pkgs/applications/networking/cluster/chronos/default.nix index e2452b2b441..e0cc780841b 100644 --- a/pkgs/applications/networking/cluster/chronos/default.nix +++ b/pkgs/applications/networking/cluster/chronos/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { description = "Fault tolerant job scheduler for Mesos which handles dependencies and ISO8601 based schedules"; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; - broken = true; # doesn't build http://hydra.nixos.org/build/25768319 + broken = true; # doesn't build https://hydra.nixos.org/build/25768319 }; } diff --git a/pkgs/applications/networking/instant-messengers/vacuum/default.nix b/pkgs/applications/networking/instant-messengers/vacuum/default.nix index cbd32347c4e..ed320d9679d 100644 --- a/pkgs/applications/networking/instant-messengers/vacuum/default.nix +++ b/pkgs/applications/networking/instant-messengers/vacuum/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { ]; # hack: needed to fix build issues in - # http://hydra.nixos.org/build/38322959/nixlog/1 + # https://hydra.nixos.org/build/38322959/nixlog/1 # should be an upstream issue but it's easy to fix NIX_LDFLAGS = "-lz"; diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index 7d23a3a7f8f..a0c48468dfa 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -65,7 +65,7 @@ in , # Shell code to build a netrc file for BASIC auth netrcPhase ? null -, # Impure env vars (http://nixos.org/nix/manual/#sec-advanced-attributes) +, # Impure env vars (https://nixos.org/nix/manual/#sec-advanced-attributes) # needed for netrcPhase netrcImpureEnvVars ? [] diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index b14c26c6947..8638c32262e 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -371,7 +371,7 @@ self: super: { static-resources = dontCheck super.static-resources; strive = dontCheck super.strive; # fails its own hlint test with tons of warnings svndump = dontCheck super.svndump; - tar = dontCheck super.tar; #http://hydra.nixos.org/build/25088435/nixlog/2 (fails only on 32-bit) + tar = dontCheck super.tar; #https://hydra.nixos.org/build/25088435/nixlog/2 (fails only on 32-bit) th-printf = dontCheck super.th-printf; thumbnail-plus = dontCheck super.thumbnail-plus; tickle = dontCheck super.tickle; diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/development/interpreters/picoc/default.nix index 00e77033575..f7343f6e4d6 100644 --- a/pkgs/development/interpreters/picoc/default.nix +++ b/pkgs/development/interpreters/picoc/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # Tests are currently broken on i686 see - # http://hydra.nixos.org/build/24003763/nixlog/1 + # https://hydra.nixos.org/build/24003763/nixlog/1 doCheck = if stdenv.isi686 then false else true; checkTarget = "test"; diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index 193bdda3445..0a51e7e592b 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "02zkfiyklckmivrfvdsrlzvzphkdsgjrz3igncw05dv5pshhq3xx"; }; - # Test can randomly fail: http://hydra.nixos.org/build/7243912 + # Test can randomly fail: https://hydra.nixos.org/build/7243912 doCheck = false; buildInputs = stdenv.lib.optional stdenv.isDarwin CoreServices; diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index 78cfa40d196..a027d58de39 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -25,7 +25,7 @@ let self = stdenv.mkDerivation rec { (stdenv.lib.enableFeature cxx "cxx") # Build a "fat binary", with routines for several sub-architectures # (x86), except on Solaris where some tests crash with "Memory fault". - # See , for instance. + # See , for instance. # # no darwin because gmp uses ASM that clang doesn't like (stdenv.lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat") diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix index cca0f8d68e1..c5fffa09bf0 100644 --- a/pkgs/development/libraries/gmp/6.x.nix +++ b/pkgs/development/libraries/gmp/6.x.nix @@ -27,7 +27,7 @@ let self = stdenv.mkDerivation rec { (stdenv.lib.enableFeature cxx "cxx") # Build a "fat binary", with routines for several sub-architectures # (x86), except on Solaris where some tests crash with "Memory fault". - # See , for instance. + # See , for instance. # # no darwin because gmp uses ASM that clang doesn't like (stdenv.lib.enableFeature (!stdenv.isSunOS && stdenv.hostPlatform.isx86) "fat") diff --git a/pkgs/development/libraries/gnutls-kdh/generic.nix b/pkgs/development/libraries/gnutls-kdh/generic.nix index 90e863760e9..c6d35b68236 100644 --- a/pkgs/development/libraries/gnutls-kdh/generic.nix +++ b/pkgs/development/libraries/gnutls-kdh/generic.nix @@ -11,7 +11,7 @@ assert guileBindings -> guile != null; let # XXX: Gnulib's `test-select' fails on FreeBSD: - # http://hydra.nixos.org/build/2962084/nixlog/1/raw . + # https://hydra.nixos.org/build/2962084/nixlog/1/raw . doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin && lib.versionAtLeast version "3.4"; in stdenv.mkDerivation { diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index 4e7e19d9ff0..cffd5459b3a 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -11,7 +11,7 @@ let version = "3.6.13"; # XXX: Gnulib's `test-select' fails on FreeBSD: - # http://hydra.nixos.org/build/2962084/nixlog/1/raw . + # https://hydra.nixos.org/build/2962084/nixlog/1/raw . doCheck = !stdenv.isFreeBSD && !stdenv.isDarwin && lib.versionAtLeast version "3.4" && stdenv.buildPlatform == stdenv.hostPlatform; diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix index 0b2e7341513..e170e4931b8 100644 --- a/pkgs/development/libraries/libgpg-error/default.nix +++ b/pkgs/development/libraries/libgpg-error/default.nix @@ -60,7 +60,7 @@ in stdenv.mkDerivation (rec { # For some reason, /bin/sh on OpenIndiana leads to this at the end of the # `config.status' run: # ./config.status[1401]: shift: (null): bad number - # (See .) + # (See .) # Thus, re-run it with Bash. "${stdenv.shell} config.status"; diff --git a/pkgs/development/python-modules/eggdeps/default.nix b/pkgs/development/python-modules/eggdeps/default.nix index d10c1a0be65..8c7d7679005 100644 --- a/pkgs/development/python-modules/eggdeps/default.nix +++ b/pkgs/development/python-modules/eggdeps/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ zope_interface zope_testing ]; - # tests fail, see http://hydra.nixos.org/build/4316603/log/raw + # tests fail, see https://hydra.nixos.org/build/4316603/log/raw doCheck = false; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix index 4305487b656..33fd3c6e10d 100644 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ b/pkgs/development/python-modules/pyopenssl/default.nix @@ -102,7 +102,7 @@ buildPythonPackage rec { }) ]; - # Seems to fail unpredictably on Darwin. See http://hydra.nixos.org/build/49877419/nixlog/1 + # Seems to fail unpredictably on Darwin. See https://hydra.nixos.org/build/49877419/nixlog/1 # for one example, but I've also seen ContextTests.test_set_verify_callback_exception fail. doCheck = !stdenv.isDarwin; diff --git a/pkgs/games/dwarf-fortress/df_permission b/pkgs/games/dwarf-fortress/df_permission index b0121bb3fa3..dc1c0c151e0 100644 --- a/pkgs/games/dwarf-fortress/df_permission +++ b/pkgs/games/dwarf-fortress/df_permission @@ -12,7 +12,7 @@ Tarn On Fri, Oct 29, 2010 at 6:56 AM, wrote: > I'd like to distribute a *slightly* modified version of Dwarf Fortress which > is needed to run it under the NixOS distribution of Linux (see -> +> > > Modification: The interpreter location /lib/ld-linux.so.2 in > lib/Dwarf_Fortress is replaced with the location of ld-linux.so.2 under the diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 96fd1bebdd4..baeae0ef52b 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -177,7 +177,7 @@ in rec { nixStable = callPackage common (rec { name = "nix-2.3.4"; src = fetchurl { - url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; + url = "https://nixos.org/releases/nix/${name}/${name}.tar.xz"; sha256 = "1c626a0de0acc69830b1891ec4d3c96aabe673b2a9fd04cef84f2304d05ad00d"; }; diff --git a/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix b/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix index e6e30b26240..dc0c733ca7b 100644 --- a/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix +++ b/pkgs/tools/package-management/nixops/nixops-v1_6_1.nix @@ -3,7 +3,7 @@ callPackage ./generic.nix (rec { version = "1.6.1"; src = fetchurl { - url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; + url = "https://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; sha256 = "0lfx5fhyg3z6725ydsk0ibg5qqzp5s0x9nbdww02k8s307axiah3"; }; nixopsAzurePackages = with python2Packages; [ diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index 52a10711875..bb6432fc3e6 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -1,6 +1,6 @@ /* TeX Live user docs - source: ../../../../../doc/languages-frameworks/texlive.xml - - current html: http://nixos.org/nixpkgs/manual/#sec-language-texlive + - current html: https://nixos.org/nixpkgs/manual/#sec-language-texlive */ { stdenv, lib, fetchurl, runCommand, writeText, buildEnv , callPackage, ghostscriptX, harfbuzz, poppler_min diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3bf311ea591..e03841d1aa7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25948,7 +25948,7 @@ in texFunctions = callPackage ../tools/typesetting/tex/nix pkgs; - # TeX Live; see http://nixos.org/nixpkgs/manual/#sec-language-texlive + # TeX Live; see https://nixos.org/nixpkgs/manual/#sec-language-texlive texlive = recurseIntoAttrs (callPackage ../tools/typesetting/tex/texlive { }); -- cgit v1.2.3 From f8737b8426662c040acd74d6fc9b6938e2f3387b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 05:25:40 +0000 Subject: qtox: 1.16.3 -> 1.17.2 --- pkgs/applications/networking/instant-messengers/qtox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index e3fc384f0f0..58d6230f26a 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -7,7 +7,7 @@ , AVFoundation ? null }: let - version = "1.16.3"; + version = "1.17.2"; rev = "v${version}"; in mkDerivation { @@ -17,7 +17,7 @@ in mkDerivation { src = fetchFromGitHub { owner = "qTox"; repo = "qTox"; - sha256 = "0qd4nvbrjnnfnk8ghsxq3cd1n1qf1ck5zg6ib11ij2pg03s146pa"; + sha256 = "04pbv1zsxy8dph2v0r9xc8lcm5g6604pwnppi3la5w46ihbwxlb9"; inherit rev; }; -- cgit v1.2.3 From 1087a4038034b9aeee9085a5ab82a4557fa930b9 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Sun, 3 May 2020 13:53:44 +0800 Subject: fuseiso: cleanups, allow building from checkout and add basic docs --- pkgs/tools/filesystems/fuseiso/default.nix | 65 ++++++++++++++++++------------ 1 file changed, 40 insertions(+), 25 deletions(-) diff --git a/pkgs/tools/filesystems/fuseiso/default.nix b/pkgs/tools/filesystems/fuseiso/default.nix index 2d24cb71bbe..ded1fac65f8 100644 --- a/pkgs/tools/filesystems/fuseiso/default.nix +++ b/pkgs/tools/filesystems/fuseiso/default.nix @@ -1,40 +1,55 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, fuse, zlib, glib }: +{ stdenv, fetchurl, fetchpatch, autoreconfHook, pkgconfig, fuse, glib, zlib }: -stdenv.mkDerivation { - name = "fuseiso-20070708"; +stdenv.mkDerivation rec { + pname = "fuseiso"; + version = "20070708"; src = fetchurl { - url = "mirror://sourceforge/project/fuseiso/fuseiso/20070708/fuseiso-20070708.tar.bz2"; + url = "mirror://sourceforge/project/fuseiso/fuseiso/${version}/fuseiso-${version}.tar.bz2"; sha256 = "127xql52dcdhmh7s5m9xc6q39jdlj3zhbjar1j821kb6gl3jw94b"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fuse zlib glib ]; - - patches = let fetchPatchFromDebian = { patch, sha256 }: + patches = map (p: fetchpatch { - inherit sha256; - url = "https://sources.debian.net/data/main/f/fuseiso/20070708-3.2/debian/patches/${patch}"; - }; - in [ - (fetchPatchFromDebian { - patch = "00-support_large_iso.patch"; + inherit (p) name sha256; + url = "https://sources.debian.net/data/main/f/fuseiso/${version}-3.2/debian/patches/${p.name}"; + }) [ + { + name = "00-support_large_iso.patch"; sha256 = "1lmclb1qwzz5f4wlq693g83bblwnjjl73qhgfxbsaac5hnn2shjw"; - }) - (fetchPatchFromDebian { # CVE-2015-8837 - patch = "02-prevent-buffer-overflow.patch"; + } + { + name = "01-fix_typo.patch"; + sha256 = "14rpxp0yylzsgqv0r19l4wx1h5hvqp617gpv1yg0w48amr9drasa"; + } + { # CVE-2015-8837 + name = "02-prevent-buffer-overflow.patch"; sha256 = "1ls2pp3mh91pdb51qz1fsd8pwhbky6988bpd156bn7wgfxqzh8ig"; - }) - (fetchPatchFromDebian { # CVE-2015-8836 - patch = "03-prevent-integer-overflow.patch"; + } + { # CVE-2015-8836 + name = "03-prevent-integer-overflow.patch"; sha256 = "100cw07fk4sa3hl7a1gk2hgz4qsxdw99y20r7wpidwwwzy463zcv"; - }) + } ]; - meta = { - homepage = "https://sourceforge.net/projects/fuseiso"; + nativeBuildInputs = [ autoreconfHook pkgconfig ]; + + buildInputs = [ fuse glib zlib ]; + + # after autoreconfHook, glib and zlib are not found, so force link against + # them + NIX_LDFLAGS = "-lglib-2.0 -lz"; + + enableParallelBuilding = true; + + postInstall = '' + install -Dm444 -t $out/share/doc/${pname} NEWS README + ''; + + meta = with stdenv.lib; { description = "FUSE module to mount ISO filesystem images"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; + homepage = "https://sourceforge.net/projects/fuseiso"; + license = licenses.gpl2; + platforms = platforms.linux; }; } -- cgit v1.2.3 From fbf6332846a1473b0821f0f88ef242c625f31d17 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 06:17:13 +0000 Subject: rssguard: 3.5.9 -> 3.6.0 --- pkgs/applications/networking/feedreaders/rssguard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix index d0825404f01..5ee80250dde 100644 --- a/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rssguard"; - version = "3.5.9"; + version = "3.6.0"; src = fetchFromGitHub { owner = "martinrotter"; repo = pname; rev = version; - sha256 = "0dvjcazvrgxfxg1gvznxj8kx569v4ivns0brq00cn2yxyd4wx43s"; + sha256 = "0nlvhcvd3bbvd3dapqix7h29pchbd9gv5n3hmrig9yi98yv8q53r"; }; buildInputs = [ qtwebengine qttools ]; -- cgit v1.2.3 From d3531ea03d50a80c9d5ec71a55f79e962c780f1e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 06:27:22 +0000 Subject: rust-cbindgen: 0.13.2 -> 0.14.2 --- pkgs/development/tools/rust/cbindgen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index 87e8e081a93..bc0ae5d33fe 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-cbindgen"; - version = "0.13.2"; + version = "0.14.2"; src = fetchFromGitHub { owner = "eqrion"; repo = "cbindgen"; rev = "v${version}"; - sha256 = "100ls8p8w6jwcjh3ligly5alg8fzp21aj7b1qbndn9fm0y1nmjam"; + sha256 = "15mk7q89rs723c7i9wwq4rrvakwh834wvrsmsnayji5k1kwaj351"; }; - cargoSha256 = "0d9sz46yzh01dx973q10xzw4k7r7ylvg82s5pkp3zpwcin8smaiw"; + cargoSha256 = "03irndd48ck62chm4vmlcnfm98gwd86xm1ssq9glw3b3y0n6x845"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; -- cgit v1.2.3 From 1b9f81ca0dc2c9634dce035b48515978c4d6f421 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sat, 2 May 2020 19:04:50 +0200 Subject: nixos/picom: cleanup - Use floating points instead of strings, which Nix now supports - Make the type of picom.settings option recursive - Add a meaningful description of both the option and its type --- nixos/modules/services/x11/picom.nix | 187 ++++++++++++++++++++--------------- 1 file changed, 105 insertions(+), 82 deletions(-) diff --git a/nixos/modules/services/x11/picom.nix b/nixos/modules/services/x11/picom.nix index e3bd21be73e..1289edd2904 100644 --- a/nixos/modules/services/x11/picom.nix +++ b/nixos/modules/services/x11/picom.nix @@ -1,39 +1,48 @@ { config, lib, pkgs, ... }: with lib; -with builtins; let cfg = config.services.picom; - pairOf = x: with types; addCheck (listOf x) (y: length y == 2); - - floatBetween = a: b: with lib; with types; - addCheck str (x: versionAtLeast x a && versionOlder x b); - - toConf = attrs: concatStringsSep "\n" - (mapAttrsToList - (k: v: let - sep = if isAttrs v then ":" else "="; - # Basically a tinkered lib.generators.mkKeyValueDefault - mkValueString = v: - if isBool v then boolToString v - else if isInt v then toString v - else if isFloat v then toString v - else if isString v then ''"${escape [ ''"'' ] v}"'' - else if isList v then "[ " - + concatMapStringsSep " , " mkValueString v - + " ]" - else if isAttrs v then "{ " - + concatStringsSep " " - (mapAttrsToList - (key: value: "${toString key}=${mkValueString value};") - v) - + " }" - else abort "picom.mkValueString: unexpected type (v = ${v})"; - in "${escape [ sep ] k}${sep}${mkValueString v};") - attrs); + pairOf = x: with types; + addCheck (listOf x) (y: length y == 2) + // { description = "pair of ${x.description}"; }; + + floatBetween = a: b: with types; + let + # toString prints floats with hardcoded high precision + floatToString = f: builtins.toJSON f; + in + addCheck float (x: x <= b && x >= a) + // { description = "a floating point number in " + + "range [${floatToString a}, ${floatToString b}]"; }; + + mkDefaultAttrs = mapAttrs (n: v: mkDefault v); + + # Basically a tinkered lib.generators.mkKeyValueDefault + # It either serializes a top-level definition "key: { values };" + # or an expression "key = { values };" + mkAttrsString = top: + mapAttrsToList (k: v: + let sep = if (top && isAttrs v) then ":" else "="; + in "${escape [ sep ] k}${sep}${mkValueString v};"); + + # This serializes a Nix expression to the libconfig format. + mkValueString = v: + if types.bool.check v then boolToString v + else if types.int.check v then toString v + else if types.float.check v then toString v + else if types.str.check v then "\"${escape [ "\"" ] v}\"" + else if builtins.isList v then "[ ${concatMapStringsSep " , " mkValueString v} ]" + else if types.attrs.check v then "{ ${concatStringsSep " " (mkAttrsString false v) } }" + else throw '' + invalid expression used in option services.picom.settings: + ${v} + ''; + + toConf = attrs: concatStringsSep "\n" (mkAttrsString true cfg.settings); configFile = pkgs.writeText "picom.conf" (toConf cfg.settings); @@ -61,7 +70,7 @@ in { }; fadeDelta = mkOption { - type = types.addCheck types.int (x: x > 0); + type = types.ints.positive; default = 10; example = 5; description = '' @@ -70,12 +79,11 @@ in { }; fadeSteps = mkOption { - type = pairOf (floatBetween "0.01" "1.01"); - default = [ "0.028" "0.03" ]; - example = [ "0.04" "0.04" ]; + type = pairOf (floatBetween 0.01 1); + default = [ 0.028 0.03 ]; + example = [ 0.04 0.04 ]; description = '' Opacity change between fade steps (in and out). - (numbers in range 0.01 - 1.0) ''; }; @@ -111,11 +119,11 @@ in { }; shadowOpacity = mkOption { - type = floatBetween "0.0" "1.01"; - default = "0.75"; - example = "0.8"; + type = floatBetween 0 1; + default = 0.75; + example = 0.8; description = '' - Window shadows opacity (number in range 0.0 - 1.0). + Window shadows opacity. ''; }; @@ -134,29 +142,29 @@ in { }; activeOpacity = mkOption { - type = floatBetween "0.0" "1.01"; - default = "1.0"; - example = "0.8"; + type = floatBetween 0 1; + default = 1.0; + example = 0.8; description = '' - Opacity of active windows (number in range 0.0 - 1.0). + Opacity of active windows. ''; }; inactiveOpacity = mkOption { - type = floatBetween "0.1" "1.01"; - default = "1.0"; - example = "0.8"; + type = floatBetween 0.1 1; + default = 1.0; + example = 0.8; description = '' - Opacity of inactive windows (number in range 0.1 - 1.0). + Opacity of inactive windows. ''; }; menuOpacity = mkOption { - type = floatBetween "0.0" "1.01"; - default = "1.0"; - example = "0.8"; + type = floatBetween 0 1; + default = 1.0; + example = 0.8; description = '' - Opacity of dropdown and popup menu (number in range 0.0 - 1.0). + Opacity of dropdown and popup menu. ''; }; @@ -210,7 +218,7 @@ in { }; refreshRate = mkOption { - type = types.addCheck types.int (x: x >= 0); + type = types.ints.unsigned; default = 0; example = 60; description = '' @@ -218,54 +226,69 @@ in { ''; }; - settings = let - configTypes = with types; oneOf [ bool int float str ]; - # types.loaOf converts lists to sets - loaOf = t: with types; either (listOf t) (attrsOf t); + settings = with types; + let + scalar = oneOf [ bool int float str ] + // { description = "scalar types"; }; + + libConfig = oneOf [ scalar (listOf libConfig) (attrsOf libConfig) ] + // { description = "libconfig type"; }; + + topLevel = attrsOf libConfig + // { description = '' + libconfig configuration. The format consists of an attributes + set (called a group) of settings. Each setting can be a scalar type + (boolean, integer, floating point number or string), a list of + scalars or a group itself + ''; + }; + in mkOption { - type = loaOf (types.either configTypes (loaOf (types.either configTypes (loaOf configTypes)))); - default = {}; + type = topLevel; + default = { }; + example = literalExample '' + blur = + { method = "gaussian"; + size = 10; + deviation = 5.0; + }; + ''; description = '' - Additional Picom configuration. + Picom settings. Use this option to configure Picom settings not exposed + in a NixOS option or to bypass one. For the available options see the + CONFIGURATION FILES section at picom(1). ''; }; }; config = mkIf cfg.enable { - services.picom.settings = let - # Hard conversion to float, literally lib.toInt but toFloat - toFloat = str: let - may_be_float = builtins.fromJSON str; - in if builtins.isFloat may_be_float - then may_be_float - else throw "Could not convert ${str} to float."; - in { + services.picom.settings = mkDefaultAttrs { # fading - fading = mkDefault cfg.fade; - fade-delta = mkDefault cfg.fadeDelta; - fade-in-step = mkDefault (toFloat (elemAt cfg.fadeSteps 0)); - fade-out-step = mkDefault (toFloat (elemAt cfg.fadeSteps 1)); - fade-exclude = mkDefault cfg.fadeExclude; + fading = cfg.fade; + fade-delta = cfg.fadeDelta; + fade-in-step = elemAt cfg.fadeSteps 0; + fade-out-step = elemAt cfg.fadeSteps 1; + fade-exclude = cfg.fadeExclude; # shadows - shadow = mkDefault cfg.shadow; - shadow-offset-x = mkDefault (elemAt cfg.shadowOffsets 0); - shadow-offset-y = mkDefault (elemAt cfg.shadowOffsets 1); - shadow-opacity = mkDefault (toFloat cfg.shadowOpacity); - shadow-exclude = mkDefault cfg.shadowExclude; + shadow = cfg.shadow; + shadow-offset-x = elemAt cfg.shadowOffsets 0; + shadow-offset-y = elemAt cfg.shadowOffsets 1; + shadow-opacity = cfg.shadowOpacity; + shadow-exclude = cfg.shadowExclude; # opacity - active-opacity = mkDefault (toFloat cfg.activeOpacity); - inactive-opacity = mkDefault (toFloat cfg.inactiveOpacity); + active-opacity = cfg.activeOpacity; + inactive-opacity = cfg.inactiveOpacity; - wintypes = mkDefault cfg.wintypes; + wintypes = cfg.wintypes; - opacity-rule = mkDefault cfg.opacityRules; + opacity-rule = cfg.opacityRules; # other options - backend = mkDefault cfg.backend; - vsync = mkDefault cfg.vSync; - refresh-rate = mkDefault cfg.refreshRate; + backend = cfg.backend; + vsync = cfg.vSync; + refresh-rate = cfg.refreshRate; }; systemd.user.services.picom = { -- cgit v1.2.3 From 027d4e639a665a13827852bc4b1b80f706b274b2 Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Sun, 3 May 2020 23:54:29 +0200 Subject: nixos/picom: document breaking change in release notes --- nixos/doc/manual/configuration/xfce.xml | 10 +++++----- nixos/doc/manual/release-notes/rl-2009.xml | 9 +++++++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/nixos/doc/manual/configuration/xfce.xml b/nixos/doc/manual/configuration/xfce.xml index ebf1f493c5c..abcf5f648a4 100644 --- a/nixos/doc/manual/configuration/xfce.xml +++ b/nixos/doc/manual/configuration/xfce.xml @@ -16,11 +16,11 @@ effects, some example settings: services.picom = { - enable = true; - fade = true; - inactiveOpacity = "0.9"; - shadow = true; - fadeDelta = 4; + enable = true; + fade = true; + inactiveOpacity = 0.9; + shadow = true; + fadeDelta = 4; }; diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 78b8eee47ef..ff5c55000e3 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -311,6 +311,15 @@ php.override { 5 for details. + + + In the picom module, several options that accepted + floating point numbers encoded as strings (for example + ) have been changed + to the (relatively) new native float type. To migrate + your configuration simply remove the quotes around the numbers. + + -- cgit v1.2.3 From f388ca8ac842a757fc4223aa3ef6743f84a82e41 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 3 May 2020 21:13:15 +0300 Subject: mpvScripts.mpris: set platforms to Linux --- pkgs/applications/video/mpv/scripts/mpris.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/video/mpv/scripts/mpris.nix b/pkgs/applications/video/mpv/scripts/mpris.nix index 318c59a1af9..06d8e0c2222 100644 --- a/pkgs/applications/video/mpv/scripts/mpris.nix +++ b/pkgs/applications/video/mpv/scripts/mpris.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { description = "MPRIS plugin for mpv"; homepage = "https://github.com/hoyon/mpv-mpris"; license = licenses.mit; + platforms = platforms.linux; maintainers = with maintainers; [ jfrankenau ]; }; } -- cgit v1.2.3 From 63dde7f8b0669aa1ae461c9cb5b2fe32db8c08f8 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 17 Apr 2020 19:10:10 +0300 Subject: pistol: 0.0.5 -> 0.1.1 --- pkgs/tools/misc/pistol/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/pistol/default.nix b/pkgs/tools/misc/pistol/default.nix index 17e9dcbc33a..1a244cd4103 100644 --- a/pkgs/tools/misc/pistol/default.nix +++ b/pkgs/tools/misc/pistol/default.nix @@ -6,16 +6,17 @@ buildGoModule rec { pname = "pistol"; - version = "0.0.5"; + version = "0.1.1"; src = fetchFromGitHub { owner = "doronbehar"; repo = pname; rev = "v${version}"; - sha256 = "1zxvpmy6c26dhg5wpk5cgaqipw5372crkhm1vaghm8jkiw7sjwvw"; + sha256 = "1d9c1bhidh781dis4427wramfrla4avqw9y2bmpjp81cqq3nc27d"; }; - modSha256 = "13yxcfd29ziprjsjl2ji7w5i2506hwwl3y0ycaphj2wlcd75rdxs"; + modSha256 = "0r062nka72ah2nb2gf8dfrrj4sxadkykcqjzkp4c9vwk93mhw41k"; + buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; subPackages = [ "cmd/pistol" ]; -- cgit v1.2.3 From 136ff07f95b422dbe03db4e50482c261233748b0 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Mon, 4 May 2020 07:40:32 +0000 Subject: emplace: 0.2.19 -> 0.2.21 --- pkgs/tools/package-management/emplace/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix index 389d1feb346..8041264341c 100644 --- a/pkgs/tools/package-management/emplace/default.nix +++ b/pkgs/tools/package-management/emplace/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "emplace"; - version = "0.2.19"; + version = "0.2.21"; src = fetchFromGitHub { owner = "tversteeg"; repo = pname; rev = "v${version}"; - sha256 = "0vw0axnb7gil6lr72rixp4v3pspi0jq99x8h954mdcff2jr031x5"; + sha256 = "07h4ngn0ypjfhipb13lw56can6zcpiglzaqii1yy1avqwc4rjsln"; }; - cargoSha256 = "118rxiwvi9k6jq5y0k7yn4w9zlb0fd6xdcyrv38ipr8qrj16cjrq"; + cargoSha256 = "12znw98jf1sy3iz6lrwdxya9rvwskc3yjkqir3xjfxw99w2jsiqb"; meta = with lib; { description = "Mirror installed software on multiple machines"; -- cgit v1.2.3 From 638a998c008ae1cf882485a72d980f130b6da420 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 07:41:06 +0000 Subject: sbt: 1.3.9 -> 1.3.10 --- pkgs/development/tools/build-managers/sbt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 2336900bf85..64a2cedd1c9 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "sbt"; - version = "1.3.9"; + version = "1.3.10"; src = fetchurl { urls = [ "https://piccolo.link/sbt-${version}.tgz" "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz" ]; - sha256 = "06k4dyb5gjnqx70akjfb65hiafh683800bncbq33kmq77arfkm7c"; + sha256 = "1023qcbdbwl40l7mgyd3j0ggr6paz1zs2q787ym52dhrcibhcq1h"; }; patchPhase = '' -- cgit v1.2.3 From 8de2754ad22e091415bb4edbca287365ffcfd67d Mon Sep 17 00:00:00 2001 From: Atemu Date: Mon, 4 May 2020 09:55:16 +0200 Subject: jc: fix formatting --- pkgs/development/python-modules/jc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index 9ade29bece1..ce43eb8206f 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -1,7 +1,7 @@ { stdenv , buildPythonPackage -, fetchPypi, - ruamel_yaml +, fetchPypi +, ruamel_yaml , ifconfig-parser , xmltodict , isPy27 -- cgit v1.2.3 From 583463ce5388058d48d016b84e2d3f2d1381df50 Mon Sep 17 00:00:00 2001 From: Atemu Date: Mon, 4 May 2020 10:01:00 +0200 Subject: jc: 1.9.3 -> 1.10.7 It now needs pygments for color output and ifconfig-parser was vendorised --- pkgs/development/python-modules/jc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index ce43eb8206f..190d469f836 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -2,22 +2,22 @@ , buildPythonPackage , fetchPypi , ruamel_yaml -, ifconfig-parser , xmltodict +, pygments , isPy27 }: buildPythonPackage rec { pname = "jc"; - version = "1.9.3"; + version = "1.10.7"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1hg6h3ag4pbilpmqylnj7dflz7avk3w8ngmk6psfqrizizwx0hnj"; + sha256 = "198vsnh6j0nv9d7msnvw6qr1bzf0nffjsz7clm11bs7fh3ri3qxp"; }; - propagatedBuildInputs = [ ruamel_yaml ifconfig-parser xmltodict ]; + propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ]; meta = with stdenv.lib; { description = "This tool serializes the output of popular command line tools and filetypes to structured JSON output."; -- cgit v1.2.3 From 99bb215b5a542ba846b3890b0fc0c9dbfdb18aa8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 08:03:45 +0000 Subject: shotcut: 20.04.01 -> 20.04.12 --- pkgs/applications/video/shotcut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index b3c05818638..9c0435a351c 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -8,13 +8,13 @@ assert stdenv.lib.versionAtLeast mlt.version "6.18.0"; mkDerivation rec { pname = "shotcut"; - version = "20.04.01"; + version = "20.04.12"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "10svbhsd5q8z1k055kcfibil97qifwzn3xmnf5b9sxa7ky4bkmqr"; + sha256 = "05yyv9192f722j8fhfjrphxadgp3crvbq4pi23ln560zh9s1m8r4"; }; patches = [ ./0001-encodedock.cpp-connect-to-VAAPI-via-DRM-not-X11.patch ]; -- cgit v1.2.3 From c7dc5c064909dd4b88ceb9aca29256807fc9c2e9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 08:16:47 +0000 Subject: signal-cli: 0.6.6 -> 0.6.7 --- .../applications/networking/instant-messengers/signal-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index a062d679f7f..a4594a20caf 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.6.6"; + version = "0.6.7"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz"; - sha256 = "1r0w9knxa2kx5my9xgmcnhq14287ixwbqxqip5ispj78d27g4zfq"; + sha256 = "13wz2c0n89aglqjfqlma1z4jr5xnp2qlg8cqng3v9axpkkynk996"; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; -- cgit v1.2.3 From 67bdcb5aeb6624e783d77621cf6c11fd88c227fa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 03:37:55 +0000 Subject: bitwarden_rs-vault: 2.13.2 -> 2.13.2b --- pkgs/tools/security/bitwarden_rs/vault.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/bitwarden_rs/vault.nix b/pkgs/tools/security/bitwarden_rs/vault.nix index 43d8d3a9b11..0c60ab62106 100644 --- a/pkgs/tools/security/bitwarden_rs/vault.nix +++ b/pkgs/tools/security/bitwarden_rs/vault.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bitwarden_rs-vault"; - version = "2.13.2"; + version = "2.13.2b"; src = fetchurl { url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"; - sha256 = "1000iqjr670imm1dlw9r003d8psp5sq0m0p62sjnll7wnycd805r"; + sha256 = "1pba3d04gfnviv8r98anpv7m8r9r417s352r5fz8qzg8lr070540"; }; buildCommand = '' -- cgit v1.2.3 From 11894914e4c0b75f54fd47e4924b9db3164add40 Mon Sep 17 00:00:00 2001 From: Joachim Breitner Date: Mon, 4 May 2020 10:19:23 +0200 Subject: Disable test suite on darwin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit no regression over `master` where the test suite didn’t run at all --- pkgs/development/interpreters/wasmtime/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index fc1227f9e99..67d54af7bb2 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -19,7 +19,9 @@ rustPlatform.buildRustPackage rec { lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; - doCheck = true; + # no test on darwin due to + # https://github.com/bytecodealliance/wasmtime/issues/1556 + doCheck = !stdenv.isDarwin; meta = with lib; { description = "Standalone JIT-style runtime for WebAssembly, using Cranelift"; -- cgit v1.2.3 From 34bf96a11e88494019444c6295031a83d607ee8b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 03:22:41 +0000 Subject: bitwarden_rs: 1.14.1 -> 1.14.2 --- pkgs/tools/security/bitwarden_rs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/bitwarden_rs/default.nix b/pkgs/tools/security/bitwarden_rs/default.nix index 6accefa58a4..6d3c4bccef9 100644 --- a/pkgs/tools/security/bitwarden_rs/default.nix +++ b/pkgs/tools/security/bitwarden_rs/default.nix @@ -8,13 +8,13 @@ let in rustPlatform.buildRustPackage rec { pname = "bitwarden_rs"; - version = "1.14.1"; + version = "1.14.2"; src = fetchFromGitHub { owner = "dani-garcia"; repo = pname; rev = version; - sha256 = "10fi5vvckmdbjvlg6mlaqh2dsm33sbkq1z1b6gmz8qjbijc8i7gw"; + sha256 = "0413yjbnj4k917x48h1gnj64kygbr6c1n55f23qkvj0hgbxpgssz"; }; nativeBuildInputs = [ pkgconfig ]; @@ -25,7 +25,7 @@ in rustPlatform.buildRustPackage rec { RUSTC_BOOTSTRAP = 1; - cargoSha256 = "1p8wpndj1aydhcjl15z3xhjf52a0l5rh5cy9qs6w4776crya2jjr"; + cargoSha256 = "09747f9g7yyq9c8wbfdb3hwxii5xq23ynhba0vc01nhjpjyn0ksd"; cargoBuildFlags = [ featuresFlag ]; checkPhase = '' -- cgit v1.2.3 From d5c7ba352ef19dbc3cf183b35934f9d587012f98 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 04:25:43 +0000 Subject: catch2: 2.11.3 -> 2.12.1 --- pkgs/development/libraries/catch2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/catch2/default.nix b/pkgs/development/libraries/catch2/default.nix index a2b65c9bbb4..960c07e29df 100644 --- a/pkgs/development/libraries/catch2/default.nix +++ b/pkgs/development/libraries/catch2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "catch2"; - version = "2.11.3"; + version = "2.12.1"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; rev = "v${version}"; - sha256="012j7fnlsdyvg6d7gwdab7yzllkv4wqb164lfg4ixahx9l9schmp"; + sha256="163198lizcr84ify34xjj1955rcgsqhwn87dwifiwyamnggn445f"; }; nativeBuildInputs = [ cmake ]; -- cgit v1.2.3 From 0cf8e5feebd20c475f350a9da682b467c7fce759 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 01:44:00 +0000 Subject: airsonic: 10.5.0 -> 10.6.1 --- pkgs/servers/misc/airsonic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/misc/airsonic/default.nix b/pkgs/servers/misc/airsonic/default.nix index 2c529ef7b32..be748035430 100644 --- a/pkgs/servers/misc/airsonic/default.nix +++ b/pkgs/servers/misc/airsonic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "airsonic"; - version = "10.5.0"; + version = "10.6.1"; src = fetchurl { url = "https://github.com/airsonic/airsonic/releases/download/v${version}/airsonic.war"; - sha256 = "0nja33x3qh8zylqc7dn6x8j1wyxf7pzf9vdg9rzaq1hl6mi573jq"; + sha256 = "0dgk9i7981wydp44zax21y48psybcsd4i68cmlp9izl8aa5gk2vb"; }; buildCommand = '' -- cgit v1.2.3 From 9343c3ea434d7c32b8af33662dfbd4e68d7afd26 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 08:25:40 +0000 Subject: silicon: 0.3.0 -> 0.3.1 --- pkgs/tools/misc/silicon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/silicon/default.nix b/pkgs/tools/misc/silicon/default.nix index 7fc1a63c5ab..a59a14d4b90 100644 --- a/pkgs/tools/misc/silicon/default.nix +++ b/pkgs/tools/misc/silicon/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "silicon"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "Aloxaf"; repo = "silicon"; rev = "v${version}"; - sha256 = "0j211qrkwgll7rm15dk4fcazmxkcqk2zah0qg2s3y0k7cx65bcxy"; + sha256 = "1avdzs3v6k4jhkadm8i8dlwg0iffqd99xqpi53smd0zgwks744l5"; }; - cargoSha256 = "1i0y3x5rmg27gxrr2lv04sqq7qyiv1bnazfy24l5zgb4akvdg3r5"; + cargoSha256 = "0bdb4nadrms5jq3s8pby2qfky7112ynd7vd6mw720mshqklk5zyb"; buildInputs = [ llvmPackages.libclang expat freetype ] ++ lib.optionals stdenv.isLinux [ libxcb ] -- cgit v1.2.3 From d1c784b26677f8a3dd434d4a85e91b2214161770 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 01:37:48 +0000 Subject: aesop: 1.2.4 -> 1.2.5 --- pkgs/applications/office/aesop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/aesop/default.nix b/pkgs/applications/office/aesop/default.nix index 1e1f686ab19..4f8c115600a 100644 --- a/pkgs/applications/office/aesop/default.nix +++ b/pkgs/applications/office/aesop/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "aesop"; - version = "1.2.4"; + version = "1.2.5"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "1bqykr1mwanfm55w1v9ipqcqgzj8kbjvlm4d5b2swvhng77gnf3d"; + sha256 = "1zxyyxl959rqhyz871dyyccqga2ydybkfcpyjq4vmvdn2g9mvmb0"; }; nativeBuildInputs = [ -- cgit v1.2.3 From e2ec1416e05ffb192ec2c4b74236231f474a1e97 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 13:39:37 +0000 Subject: lego: 3.5.0 -> 3.6.0 --- pkgs/tools/admin/lego/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index ce250d33e94..b2d3ebfa582 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lego"; - version = "3.5.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "go-acme"; repo = pname; rev = "v${version}"; - sha256 = "08mh2q426gmhcaz578lw08jbxfqb7qm37cd00ap937dymi1zs9qw"; + sha256 = "0jqq1ricy8971a27zcc6qm61cv6pjk4984dab1cgz86qzama7nil"; }; - modSha256 = "10n8pcbmzlnk63gzsjb1xnmjwxfhxsqx8ffpcbwdzq9fc5yvjiii"; + modSha256 = "0a3d7snnchxk5n4m0v725689pwqjgwz7g94yzh9akc55nwy33sfj"; subPackages = [ "cmd/lego" ]; buildFlagsArray = [ -- cgit v1.2.3 From 333daadc924b564b68ebb1cf8d3e9cd04e0c8c41 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 08:25:07 +0000 Subject: ezquake: 3.1 -> 3.2 --- pkgs/games/ezquake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/ezquake/default.nix b/pkgs/games/ezquake/default.nix index 86db4a3209e..83dadb7192c 100644 --- a/pkgs/games/ezquake/default.nix +++ b/pkgs/games/ezquake/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "ezquake"; - version = "3.1"; + version = "3.2"; src = fetchFromGitHub { owner = "ezQuake"; repo = pname + "-source"; rev = version; - sha256 = "0375jndynhkl59m80fhmq12v5g24zy16c7ly08h004cmjzqsikn4"; + sha256 = "11kyrqpc8w393kvfz2p2h2m7k8rm4w644m86w733b8w157f2fsk0"; }; nativeBuildInputs = [ pkgconfig ]; -- cgit v1.2.3 From 5be4c3418582097509cfb9feffffc996d4b6f1ff Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 08:10:39 +0000 Subject: ephemeral: 6.3.3 -> 6.4.1 --- pkgs/applications/networking/browsers/ephemeral/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix index 53d0ffb4c19..ead9555c3a6 100644 --- a/pkgs/applications/networking/browsers/ephemeral/default.nix +++ b/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "ephemeral"; - version = "6.3.3"; + version = "6.4.1"; src = fetchFromGitHub { owner = "cassidyjames"; repo = "ephemeral"; rev = version; - sha256 = "093bqc40p4s8jc1s5rg49363x24vnwwjayvgzmi4xag28f1x6kn8"; + sha256 = "1lzcwaczh601kwbx7fzg32nrzlg67asby7p86qy10qz86xf4g608"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 197b48bc8d6c75966b0edc26769a617038bb7a78 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 07:31:51 +0000 Subject: elementary-planner: 2.3.3 -> 2.3.5 --- pkgs/applications/office/elementary-planner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/elementary-planner/default.nix b/pkgs/applications/office/elementary-planner/default.nix index 3e3765ca77f..28a470162ce 100644 --- a/pkgs/applications/office/elementary-planner/default.nix +++ b/pkgs/applications/office/elementary-planner/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "elementary-planner"; - version = "2.3.3"; + version = "2.3.5"; src = fetchFromGitHub { owner = "alainm23"; repo = "planner"; rev = version; - sha256 = "1jc668hg26vb1q50abm6k566v9qimgs9skkwmlgi5h37vxm3ai1x"; + sha256 = "15d51sqb3k59jjishsw1fq5ib50jmhlk194y3nga329damfv8bmy"; }; nativeBuildInputs = [ -- cgit v1.2.3 From ccff0849d3ab8628cb09f235efdc0aff0693dcc4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 11:52:13 +0000 Subject: hyperrogue: 11.3f -> 11.3l --- pkgs/games/hyperrogue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/hyperrogue/default.nix b/pkgs/games/hyperrogue/default.nix index 24ea0e8c5c0..1ef0fd147d8 100644 --- a/pkgs/games/hyperrogue/default.nix +++ b/pkgs/games/hyperrogue/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "hyperrogue"; - version = "11.3f"; + version = "11.3l"; src = fetchFromGitHub { owner = "zenorogue"; repo = "hyperrogue"; rev = "v${version}"; - sha256 = "0i6dksxx33xga4pq41qsfllqras1hzk14ffqhnk11aj5lrfg98rm"; + sha256 = "0fniyaf9mgg99s03wbdc36zg909kshpdfk9pn8pkai0x99lghkwb"; }; CPPFLAGS = "-I${SDL.dev}/include/SDL"; -- cgit v1.2.3 From 0a115f808755ad6eec5eb7742c71d02e4d0f9d9f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 06:21:31 +0000 Subject: cryptominisat: 5.6.8 -> 5.7.0 --- pkgs/applications/science/logic/cryptominisat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/applications/science/logic/cryptominisat/default.nix index 113c6307c40..8c1b3bd0369 100644 --- a/pkgs/applications/science/logic/cryptominisat/default.nix +++ b/pkgs/applications/science/logic/cryptominisat/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cryptominisat"; - version = "5.6.8"; + version = "5.7.0"; src = fetchFromGitHub { owner = "msoos"; repo = "cryptominisat"; rev = version; - sha256 = "0csimmy1nvkfcsxjra9bm4mlcyxa3ac8zarm88zfb7640ca0d0wv"; + sha256 = "0ny5ln8fc0irprs04qw01c9mppps8q27lkx01a549zazwhj4b5rm"; }; buildInputs = [ python3 boost ]; -- cgit v1.2.3 From 6f0289ef9631017aad311a12abf63a8133ef6323 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Mon, 4 May 2020 10:55:04 +0200 Subject: tmux: 3.1a -> 3.1b From the changelog: * Fix build on systems without sys/queue.h. * Fix crash when allow-rename is on and an empty name is set. Signed-off-by: Matthias Beyer --- pkgs/tools/misc/tmux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 4d17768b8dc..12ea456b9f7 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -21,7 +21,7 @@ in stdenv.mkDerivation rec { pname = "tmux"; - version = "3.1a"; + version = "3.1b"; outputs = [ "out" "man" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { owner = "tmux"; repo = "tmux"; rev = version; - sha256 = "1j85d5mj7zf3k17wsrm45m79ygc6dljc4as3crvp12r45k8xg9k6"; + sha256 = "0jvyq4r691bn0wsr8i6c0q0lzss25vm9nx8sv3fhw9cs63ncq04y"; }; nativeBuildInputs = [ -- cgit v1.2.3 From d33679a0b8bd6c3e504650d4e73424fc7a17ae3e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 08:56:19 +0000 Subject: stella: 6.1.1 -> 6.1.2 --- pkgs/misc/emulators/stella/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix index 72dc48c1f4d..14189e5b387 100644 --- a/pkgs/misc/emulators/stella/default.nix +++ b/pkgs/misc/emulators/stella/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "stella"; - version = "6.1.1"; + version = "6.1.2"; src = fetchFromGitHub { owner = "stella-emu"; repo = "stella"; rev = version; - sha256 = "1iwhslrkq887v035j68lhblybww8r792515rp2m5qzmdgnjzsvbb"; + sha256 = "0m4vdgn7gqhga7hamy4djnlkfgz78gfkmg8by3mai5lw0cps7hr1"; }; nativeBuildInputs = [ pkgconfig ]; -- cgit v1.2.3 From e0f21e16914539da4be7719fb9eba7c10c84d986 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 09:03:16 +0000 Subject: strawberry: 0.6.9 -> 0.6.10 --- pkgs/applications/audio/strawberry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix index 6c565911eb4..dce73c38670 100644 --- a/pkgs/applications/audio/strawberry/default.nix +++ b/pkgs/applications/audio/strawberry/default.nix @@ -35,13 +35,13 @@ mkDerivation rec { pname = "strawberry"; - version = "0.6.9"; + version = "0.6.10"; src = fetchFromGitHub { owner = "jonaski"; repo = pname; rev = version; - sha256 = "0ssyqa14j54sja2dzhzrznbf1bbl0nc62p4jh2pd6fhinpw8y6dk"; + sha256 = "0qf510hlxbndqzwq62mdzfclqxr3caf1a34kd770k84x8vrb4pld"; }; buildInputs = [ -- cgit v1.2.3 From 7a35da8111a9297149a0f94e208c559d88ec0fef Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 09:07:57 +0000 Subject: streamlink: 1.3.1 -> 1.4.1 --- pkgs/applications/video/streamlink/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/streamlink/default.nix b/pkgs/applications/video/streamlink/default.nix index a12d0845890..782b81cc238 100644 --- a/pkgs/applications/video/streamlink/default.nix +++ b/pkgs/applications/video/streamlink/default.nix @@ -1,14 +1,14 @@ { stdenv, pythonPackages, fetchFromGitHub, rtmpdump, ffmpeg }: pythonPackages.buildPythonApplication rec { - version = "1.3.1"; + version = "1.4.1"; pname = "streamlink"; src = fetchFromGitHub { owner = "streamlink"; repo = "streamlink"; rev = version; - sha256 = "0scc0mzvy56b1l6iyvrzb28l8vzrxpfkn4lcwr8nnyjb7ams2xms"; + sha256 = "1q3h48qwf7vs2wnbkwv0xnm6s65mkcyqdz7z6z3vrsmif2sb19l2"; }; checkInputs = with pythonPackages; [ pytest mock requests-mock freezegun ]; -- cgit v1.2.3 From 8e598425f6255d00506a38af1154a153327aa32c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 09:17:21 +0000 Subject: sysbench: 1.0.19 -> 1.0.20 --- pkgs/development/tools/misc/sysbench/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/sysbench/default.nix b/pkgs/development/tools/misc/sysbench/default.nix index 10748d75159..616a1cbc3fb 100644 --- a/pkgs/development/tools/misc/sysbench/default.nix +++ b/pkgs/development/tools/misc/sysbench/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "sysbench"; - version = "1.0.19"; + version = "1.0.20"; nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libmysqlclient libaio ]; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "akopytov"; repo = pname; rev = version; - sha256 = "1zgqb9cr7ld3vw4a3jhq1mlszhcyjlpr0c8q1jcp1d27l9dcvd1w"; + sha256 = "1sanvl2a52ff4shj62nw395zzgdgywplqvwip74ky8q7s6qjf5qy"; }; enableParallelBuilding = true; -- cgit v1.2.3 From 683e7634980ce646617d34b2ad1257de67babf4d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 09:24:55 +0000 Subject: tendermint: 0.32.10 -> 0.32.11 --- pkgs/tools/networking/tendermint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix index 2bf907380e0..90b16e37ed7 100644 --- a/pkgs/tools/networking/tendermint/default.nix +++ b/pkgs/tools/networking/tendermint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tendermint"; - version = "0.32.10"; + version = "0.32.11"; src = fetchFromGitHub { owner = "tendermint"; repo = pname; rev = "v${version}"; - sha256 = "0rf00fqbf8xvxbxnhki93knwdp4bqjvv548ia8c0w6cryj07plyg"; + sha256 = "17p7khfiv5aflpl4imbqp8v7gignd6v6a7g80xlnzgix5ismh84l"; }; - modSha256 = "08f03haxzpi57gaxymsbzs0nbbgnf6z4gmpal476xy3gvc0dyi3r"; + modSha256 = "1sdjzj52gkqk51ml29hijzv64clmi38km5z7j7paf28dla2brfxq"; meta = with stdenv.lib; { description = "Byzantine-Fault Tolerant State Machines. Or Blockchain, for short."; -- cgit v1.2.3 From 866a4b017f58c7742a5c307d15fa095f5b6e6a99 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 09:32:20 +0000 Subject: thanos: 0.11.0 -> 0.12.2 --- pkgs/servers/monitoring/thanos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index f307032f414..a6122b31753 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -1,16 +1,16 @@ { stdenv, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "thanos"; - version = "0.11.0"; + version = "0.12.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "thanos-io"; repo = "thanos"; - sha256 = "152ic9pga0wjg4r7b66hdnbsj9wrzfzbbps7wjas3rcbcv1f2i90"; + sha256 = "10xscm9h2krha66v96v2q85fynnxfizjcc47h7yz4xhjwvb5dgz2"; }; - modSha256 = "1pdypyyy352l6wy5lr94fv8j890lh863h8zg2hxchiymrs5pgq1c"; + modSha256 = "0c8gc4qzdazxxnabfms63df8vlf2iy6iy0jrm710x76m4vm6mrbj"; subPackages = "cmd/thanos"; -- cgit v1.2.3 From 169f2b05e8ae8a97ad4d962f2137c0f9a55be6e2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 09:49:49 +0000 Subject: tini: 0.18.0 -> 0.19.0 --- pkgs/applications/virtualization/tini/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix index e3e6bae6cfe..db3fb1c96eb 100644 --- a/pkgs/applications/virtualization/tini/default.nix +++ b/pkgs/applications/virtualization/tini/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, glibc }: stdenv.mkDerivation rec { - version = "0.18.0"; + version = "0.19.0"; pname = "tini"; src = fetchFromGitHub { owner = "krallin"; repo = "tini"; rev = "v${version}"; - sha256 ="1h20i3wwlbd8x4jr2gz68hgklh0lb0jj7y5xk1wvr8y58fip1rdn"; + sha256 ="1hnnvjydg7gi5gx6nibjjdnfipblh84qcpajc08nvr44rkzswck4"; }; patchPhase = "sed -i /tini-static/d CMakeLists.txt"; -- cgit v1.2.3 From 6356c0458d84c7ba90cd16d484cdaceeec6dbcca Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Mon, 4 May 2020 03:11:55 -0700 Subject: abseil-cpp: 20191119 -> 20200225.2 Signed-off-by: Anders Kaseorg --- pkgs/development/libraries/abseil-cpp/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/abseil-cpp/default.nix b/pkgs/development/libraries/abseil-cpp/default.nix index 6b7739b322d..45e73410d28 100644 --- a/pkgs/development/libraries/abseil-cpp/default.nix +++ b/pkgs/development/libraries/abseil-cpp/default.nix @@ -2,15 +2,13 @@ stdenv.mkDerivation rec { pname = "abseil-cpp"; - date = "20191119"; - rev = "8ba96a8244bbe334d09542e92d566673a65c1f78"; - version = "${date}-${rev}"; + version = "20200225.2"; src = fetchFromGitHub { owner = "abseil"; repo = "abseil-cpp"; - rev = rev; - sha256 = "089bvlspgdgi40fham20qy1m97gr1jh5k5czz49dincpd18j6inb"; + rev = version; + sha256 = "0dwxg54pv6ihphbia0iw65r64whd7v8nm4wwhcz219642cgpv54y"; }; nativeBuildInputs = [ cmake ]; @@ -19,6 +17,7 @@ stdenv.mkDerivation rec { description = "An open-source collection of C++ code designed to augment the C++ standard library"; homepage = "https://abseil.io/"; license = licenses.asl20; + platforms = platforms.all; maintainers = [ maintainers.andersk ]; }; } -- cgit v1.2.3 From 7a17b13b48e16c98aeac071db8f304ea5b0fe595 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 02:32:15 +0000 Subject: or-tools: 7.5 -> 7.6 --- pkgs/development/libraries/science/math/or-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/or-tools/default.nix b/pkgs/development/libraries/science/math/or-tools/default.nix index ce6780f0046..a69ae5af15f 100644 --- a/pkgs/development/libraries/science/math/or-tools/default.nix +++ b/pkgs/development/libraries/science/math/or-tools/default.nix @@ -8,13 +8,13 @@ let in stdenv.mkDerivation rec { pname = "or-tools"; - version = "7.5"; + version = "7.6"; src = fetchFromGitHub { owner = "google"; repo = "or-tools"; rev = "v${version}"; - sha256 = "1p9jwdwzcsaa58ap912hdf2w27vna3xl9g4lh6kjskddwi8l3wac"; + sha256 = "0605q3y7vh7x7m9azrbkx44blq12zrab6v28b9wmpcn1lmykbw1b"; }; # The original build system uses cmake which does things like pull -- cgit v1.2.3 From 39b1bf1c9bcd2cfe715e0dbb7212c43daa0b33e9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 10:17:29 +0000 Subject: traefik: 2.2.0 -> 2.2.1 --- pkgs/servers/traefik/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 0487ed177d0..40b85fc949e 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "traefik"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "containous"; repo = "traefik"; rev = "v${version}"; - sha256 = "1dcazssabqxr9wv3dds3z7ks3y628qa07vgnn3hpdwxzm2b2ma92"; + sha256 = "0byi2h1lma95l77sdj8jkidmwb12ryjqwxa0zz6vwjg07p5ps3k4"; }; - modSha256 = "0w3ssxvsmq8i6hbfmn4ig2x13i2nlqy5q1khcblf9pq5vhk202qx"; + modSha256 = "17imp24abfgh75g8161daknzqzk2m19q9d1mij6487046lk75hqz"; subPackages = [ "cmd/traefik" ]; nativeBuildInputs = [ go-bindata ]; -- cgit v1.2.3 From 06d5edf7edfd872d693332a7da6b6c922276fbfa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 06:11:24 +0000 Subject: rofi-mpd: 2.2.0 -> 2.2.1 --- pkgs/applications/audio/rofi-mpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/rofi-mpd/default.nix b/pkgs/applications/audio/rofi-mpd/default.nix index ef57466ec84..8f9819bd913 100644 --- a/pkgs/applications/audio/rofi-mpd/default.nix +++ b/pkgs/applications/audio/rofi-mpd/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "rofi-mpd"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "JakeStanger"; repo = "Rofi_MPD"; rev = "v${version}"; - sha256 = "1b0y8706mmrxhiyz8g6znisllc35j8g7sz8gfjll9svysjmvb6lc"; + sha256 = "0jabyn6gqh8ychn2a06xws3avz0lqdnx3qvqkavfd2xr6sp2q7lg"; }; propagatedBuildInputs = with python3Packages; [ mutagen mpd2 toml appdirs ]; -- cgit v1.2.3 From b278f47c982ff6626afb84a439a63d29c154c412 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 07:51:53 +0000 Subject: scrot: 1.2 -> 1.3 --- pkgs/tools/graphics/scrot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/tools/graphics/scrot/default.nix index 56df615e575..f9042645be0 100644 --- a/pkgs/tools/graphics/scrot/default.nix +++ b/pkgs/tools/graphics/scrot/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "scrot"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "resurrecting-open-source-projects"; repo = pname; rev = version; - sha256 = "08gkdby0ysx2mki57z81zlm7vfnq9c1gq692xw67cg5vv2p3320w"; + sha256 = "0x70hd59ik37kqd8xqpwrz46np01jv324iz28x2s0kk36d7sblsj"; }; nativeBuildInputs = [ autoreconfHook autoconf-archive ]; -- cgit v1.2.3 From 59ef445fce2b22fb4635a65161f5d3e10367220e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 10:05:26 +0000 Subject: toot: 0.25.2 -> 0.26.0 --- pkgs/applications/misc/toot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/toot/default.nix b/pkgs/applications/misc/toot/default.nix index 7f1c3648f24..5ce35f3292b 100644 --- a/pkgs/applications/misc/toot/default.nix +++ b/pkgs/applications/misc/toot/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { - version = "0.25.2"; + version = "0.26.0"; name = "toot-${version}"; src = fetchFromGitHub { owner = "ihabunek"; repo = "toot"; rev = version; - sha256 = "0g18x8pbwhk2d3aphah6dqqbhz62k48pwx63flsnqd4brccd0jkh"; + sha256 = "146jj83jixahgxwh12bbkfvci2wrz398h5x01kgppdy59m4pa4pl"; }; checkInputs = with python3Packages; [ pytest ]; -- cgit v1.2.3 From 5f96bbf67b575477c1bf7414bc71ab2c2900262e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 11:31:05 +0000 Subject: zef: 0.8.3 -> 0.8.4 --- pkgs/development/interpreters/rakudo/zef.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/zef.nix b/pkgs/development/interpreters/rakudo/zef.nix index 9a8c11324a2..5c8fe16408b 100644 --- a/pkgs/development/interpreters/rakudo/zef.nix +++ b/pkgs/development/interpreters/rakudo/zef.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zef"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "ugexe"; repo = "zef"; rev = "v${version}"; - sha256 = "1fscv8fbaa5l8dcwclmq3hvg3c59l4dvyjqb316mgnc5anxpzy2f"; + sha256 = "02a3awnjr1mgb9275xvp3xms80vcxkq55ffi8sbjzxpwyadj5y5k"; }; buildInputs = [ rakudo makeWrapper ]; -- cgit v1.2.3 From d59cc0f9cd18de2b0407b5071e6a16b38aabaef9 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Fri, 1 May 2020 10:23:41 +0200 Subject: jellyfin: 10.5.4 -> 10.5.5 --- pkgs/servers/jellyfin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index 932081ad22f..35476db9215 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -18,12 +18,12 @@ let in stdenv.mkDerivation rec { pname = "jellyfin"; - version = "10.5.4"; + version = "10.5.5"; # Impossible to build anything offline with dotnet src = fetchurl { url = "https://github.com/jellyfin/jellyfin/releases/download/v${version}/jellyfin_${version}_portable.tar.gz"; - sha256 = "0jfqkbr5n5l7k3dpmjsy0bhvy4y1s6sccwcmcx239r6dhc7x0f9y"; + sha256 = "1s3hva1j5w74qc9wyqnmr5clk4smzfi7wvx8qrzrwy81mx7r5w27"; }; buildInputs = [ -- cgit v1.2.3 From 54425a50ce7863bb62e331ef74e6c07c0a72ffff Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Tue, 21 Apr 2020 22:57:48 +0200 Subject: onionshare: init at 2.2 --- .../applications/networking/onionshare/default.nix | 112 +++++++++++++++++ .../networking/onionshare/fix-paths.patch | 134 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 248 insertions(+) create mode 100644 pkgs/applications/networking/onionshare/default.nix create mode 100644 pkgs/applications/networking/onionshare/fix-paths.patch diff --git a/pkgs/applications/networking/onionshare/default.nix b/pkgs/applications/networking/onionshare/default.nix new file mode 100644 index 00000000000..a151f3fb97d --- /dev/null +++ b/pkgs/applications/networking/onionshare/default.nix @@ -0,0 +1,112 @@ +{ + lib, + buildPythonApplication, + stdenv, + substituteAll, + fetchFromGitHub, + isPy3k, + flask, + flask-httpauth, + stem, + pyqt5, + pycrypto, + pysocks, + pytest, + qt5, + requests, + tor, + obfs4, +}: + +let + version = "2.2"; + src = fetchFromGitHub { + owner = "micahflee"; + repo = "onionshare"; + rev = "v${version}"; + sha256 = "0m8ygxcyp3nfzzhxs2dfnpqwh1vx0aws44lszpnnczz4fks3a5j4"; + }; + meta = with lib; { + description = "Securely and anonymously send and receive files"; + longDescription = '' + OnionShare is an open source tool for securely and anonymously sending + and receiving files using Tor onion services. It works by starting a web + server directly on your computer and making it accessible as an + unguessable Tor web address that others can load in Tor Browser to + download files from you, or upload files to you. It doesn't require + setting up a separate server, using a third party file-sharing service, + or even logging into an account. + + Unlike services like email, Google Drive, DropBox, WeTransfer, or nearly + any other way people typically send files to each other, when you use + OnionShare you don't give any companies access to the files that you're + sharing. So long as you share the unguessable web address in a secure way + (like pasting it in an encrypted messaging app), no one but you and the + person you're sharing with can access the files. + ''; + + homepage = "https://onionshare.org/"; + + license = licenses.gpl3Plus; + }; + + common = buildPythonApplication { + pname = "onionshare-common"; + inherit version meta src; + + disable = !isPy3k; + propagatedBuildInputs = [ + flask + flask-httpauth + stem + pyqt5 + pycrypto + pysocks + requests + ]; + buildInputs = [ + tor + obfs4 + ]; + + patches = [ + (substituteAll { + src = ./fix-paths.patch; + inherit tor obfs4; + inherit (tor) geoip; + }) + ]; + postPatch = "substituteInPlace onionshare/common.py --subst-var-by common $out"; + + doCheck = false; + }; +in +{ + onionshare = stdenv.mkDerivation { + pname = "onionshare"; + inherit version meta; + + dontUnpack = true; + + inherit common; + installPhase = '' + mkdir -p $out/bin + cp $common/bin/onionshare -t $out/bin + ''; + }; + onionshare-gui = stdenv.mkDerivation { + pname = "onionshare-gui"; + inherit version meta; + + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + + dontUnpack = true; + + inherit common; + installPhase = '' + mkdir -p $out/bin + cp $common/bin/onionshare-gui -t $out/bin + wrapQtApp $out/bin/onionshare-gui + ''; + }; +} diff --git a/pkgs/applications/networking/onionshare/fix-paths.patch b/pkgs/applications/networking/onionshare/fix-paths.patch new file mode 100644 index 00000000000..ddd0c75334b --- /dev/null +++ b/pkgs/applications/networking/onionshare/fix-paths.patch @@ -0,0 +1,134 @@ +diff --git a/onionshare/common.py b/onionshare/common.py +index 3373462..7fd245b 100644 +--- a/onionshare/common.py ++++ b/onionshare/common.py +@@ -87,66 +87,16 @@ class Common(object): + ), + "share", + ) +- if not os.path.exists(prefix): +- # While running tests during stdeb bdist_deb, look 3 directories up for the share folder +- prefix = os.path.join( +- os.path.dirname( +- os.path.dirname(os.path.dirname(os.path.dirname(prefix))) +- ), +- "share", +- ) +- +- elif self.platform == "BSD" or self.platform == "Linux": +- # Assume OnionShare is installed systemwide in Linux, since we're not running in dev mode +- prefix = os.path.join(sys.prefix, "share/onionshare") +- +- elif getattr(sys, "frozen", False): +- # Check if app is "frozen" +- # https://pythonhosted.org/PyInstaller/#run-time-information +- if self.platform == "Darwin": +- prefix = os.path.join(sys._MEIPASS, "share") +- elif self.platform == "Windows": +- prefix = os.path.join(os.path.dirname(sys.executable), "share") ++ else: ++ prefix = "@common@/share/onionshare" + + return os.path.join(prefix, filename) + + def get_tor_paths(self): +- if self.platform == "Linux": +- tor_path = "/usr/bin/tor" +- tor_geo_ip_file_path = "/usr/share/tor/geoip" +- tor_geo_ipv6_file_path = "/usr/share/tor/geoip6" +- obfs4proxy_file_path = "/usr/bin/obfs4proxy" +- elif self.platform == "Windows": +- base_path = os.path.join( +- os.path.dirname(os.path.dirname(self.get_resource_path(""))), "tor" +- ) +- tor_path = os.path.join(os.path.join(base_path, "Tor"), "tor.exe") +- obfs4proxy_file_path = os.path.join( +- os.path.join(base_path, "Tor"), "obfs4proxy.exe" +- ) +- tor_geo_ip_file_path = os.path.join( +- os.path.join(os.path.join(base_path, "Data"), "Tor"), "geoip" +- ) +- tor_geo_ipv6_file_path = os.path.join( +- os.path.join(os.path.join(base_path, "Data"), "Tor"), "geoip6" +- ) +- elif self.platform == "Darwin": +- base_path = os.path.dirname( +- os.path.dirname(os.path.dirname(self.get_resource_path(""))) +- ) +- tor_path = os.path.join(base_path, "Resources", "Tor", "tor") +- tor_geo_ip_file_path = os.path.join(base_path, "Resources", "Tor", "geoip") +- tor_geo_ipv6_file_path = os.path.join( +- base_path, "Resources", "Tor", "geoip6" +- ) +- obfs4proxy_file_path = os.path.join( +- base_path, "Resources", "Tor", "obfs4proxy" +- ) +- elif self.platform == "BSD": +- tor_path = "/usr/local/bin/tor" +- tor_geo_ip_file_path = "/usr/local/share/tor/geoip" +- tor_geo_ipv6_file_path = "/usr/local/share/tor/geoip6" +- obfs4proxy_file_path = "/usr/local/bin/obfs4proxy" ++ tor_path = "@tor@/bin/tor" ++ tor_geo_ip_file_path = "@geoip@/share/tor/geoip" ++ tor_geo_ipv6_file_path = "@geoip@/share/tor/geoip6" ++ obfs4proxy_file_path = "@obfs4@/bin/obfs4proxy" + + return ( + tor_path, +diff --git a/setup.py b/setup.py +index 9af72fc..53ca47b 100644 +--- a/setup.py ++++ b/setup.py +@@ -70,41 +70,41 @@ classifiers = [ + ] + data_files = [ + ( +- os.path.join(sys.prefix, "share/applications"), ++ "share/applications", + ["install/org.onionshare.OnionShare.desktop"], + ), + ( +- os.path.join(sys.prefix, "share/icons/hicolor/scalable/apps"), ++ "share/icons/hicolor/scalable/apps", + ["install/org.onionshare.OnionShare.svg"], + ), + ( +- os.path.join(sys.prefix, "share/metainfo"), ++ "share/metainfo", + ["install/org.onionshare.OnionShare.appdata.xml"], + ), +- (os.path.join(sys.prefix, "share/onionshare"), file_list("share")), +- (os.path.join(sys.prefix, "share/onionshare/images"), file_list("share/images")), +- (os.path.join(sys.prefix, "share/onionshare/locale"), file_list("share/locale")), ++ ( "share/onionshare", file_list("share")), ++ ( "share/onionshare/images", file_list("share/images")), ++ ( "share/onionshare/locale", file_list("share/locale")), + ( +- os.path.join(sys.prefix, "share/onionshare/templates"), ++ "share/onionshare/templates", + file_list("share/templates"), + ), + ( +- os.path.join(sys.prefix, "share/onionshare/static/css"), ++ "share/onionshare/static/css", + file_list("share/static/css"), + ), + ( +- os.path.join(sys.prefix, "share/onionshare/static/img"), ++ "share/onionshare/static/img", + file_list("share/static/img"), + ), + ( +- os.path.join(sys.prefix, "share/onionshare/static/js"), ++ "share/onionshare/static/js", + file_list("share/static/js"), + ), + ] + if not platform.system().endswith("BSD") and platform.system() != "DragonFly": + data_files.append( + ( +- "/usr/share/nautilus-python/extensions/", ++ "share/nautilus-python/extensions/", + ["install/scripts/onionshare-nautilus.py"], + ) + ) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e03841d1aa7..f01b63d40a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21078,6 +21078,8 @@ in omxplayer = callPackage ../applications/video/omxplayer { }; + inherit (python3Packages.callPackage ../applications/networking/onionshare { }) onionshare onionshare-gui; + openbox = callPackage ../applications/window-managers/openbox { }; openbox-menu = callPackage ../applications/misc/openbox-menu { -- cgit v1.2.3 From dd5d696bb42aae0fc7c8b2e4678d089695615462 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Wed, 22 Apr 2020 11:14:38 +0200 Subject: maintainers: add lourkeur --- maintainers/maintainer-list.nix | 10 ++++++++++ pkgs/applications/networking/onionshare/default.nix | 1 + 2 files changed, 11 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e9a472d332a..b4552bd874f 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4429,6 +4429,16 @@ fingerprint = "74F5 E5CC 19D3 B5CB 608F 6124 68FF 81E6 A785 0F49"; }]; }; + lourkeur = { + name = "Louis Bettens"; + email = "louis@bettens.info"; + github = "lourkeur"; + githubId = 15657735; + keys = [{ + longkeyid = "ed25519/0xDFE1D4A017337E2A"; + fingerprint = "5B93 9CFA E8FC 4D8F E07A 3AEA DFE1 D4A0 1733 7E2A"; + }]; + }; luis = { email = "luis.nixos@gmail.com"; github = "Luis-Hebendanz"; diff --git a/pkgs/applications/networking/onionshare/default.nix b/pkgs/applications/networking/onionshare/default.nix index a151f3fb97d..77d08692f62 100644 --- a/pkgs/applications/networking/onionshare/default.nix +++ b/pkgs/applications/networking/onionshare/default.nix @@ -48,6 +48,7 @@ let homepage = "https://onionshare.org/"; license = licenses.gpl3Plus; + maintainers = with maintainers; [ lourkeur ]; }; common = buildPythonApplication { -- cgit v1.2.3 From 2fb5dac372fedd482ef3c65b608810bb7dd45083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 18 Apr 2020 20:13:07 +0100 Subject: nix-prefetch-git: also add store path to json output --- pkgs/build-support/fetchgit/nix-prefetch-git | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index abba76bd1ac..43f7c5acd5a 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -373,6 +373,7 @@ print_results() { "url": "$(json_escape "$url")", "rev": "$(json_escape "$fullRev")", "date": "$(json_escape "$commitDateStrict8601")", + "path": "$(json_escape "$finalPath")", "$(json_escape "$hashType")": "$(json_escape "$hash")", "fetchSubmodules": $([[ -n "$fetchSubmodules" ]] && echo true || echo false), "deepClone": $([[ -n "$deepClone" ]] && echo true || echo false), -- cgit v1.2.3 From 8aab081504b8671067c0a70330e279176d787952 Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Mon, 4 May 2020 14:22:33 +0200 Subject: tor: fix cross compiling --- pkgs/tools/security/tor/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 215ab63328f..e6cd74eda4b 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -30,6 +30,10 @@ stdenv.mkDerivation rec { patches = [ ./disable-monotonic-timer-tests.patch ]; + # cross compiles correctly but needs the following + configureFlags = stdenv.lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) + "--disable-tool-name-check"; + NIX_CFLAGS_LINK = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s"; postPatch = '' -- cgit v1.2.3 From b3c18fe2be0e0078c7b8de9f331357227ccddc39 Mon Sep 17 00:00:00 2001 From: Guillaume Bouchard Date: Mon, 4 May 2020 14:39:44 +0200 Subject: apitrace: fix OpenGL library path and Qt GUI (#86475) For unknown reasons, Apitrace breaks the runpath of the traced program. OpenGL programs on nix are looking at /run/opengl-driver/lib to find the system OpenGL driver. This change: - add path /run/opengl-driver{-32} to the RPATH of the wrapper libraries. This fixs tracing with `apitrace trace`. - add rpath to `libglnvd` and `libGL` to the `{e}glretrace` binaries. These libraries are loaded at runtime, but does not appears as NEEDED in the binaries, hence the need for the explicit rpath addition. This fix `{e}glretrace`. - Explicitly add Qt wrapper to `qapitrace`. It fixs the GUI. Co-authored-by: Florian Klink Co-authored-by: Florian Klink --- pkgs/applications/graphics/apitrace/default.nix | 45 +++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix index f6f9cb281a7..e6865d2d8f0 100644 --- a/pkgs/applications/graphics/apitrace/default.nix +++ b/pkgs/applications/graphics/apitrace/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libX11, procps, python2, libdwarf, qtbase, qtwebkit }: +{ stdenv, fetchFromGitHub, cmake, libX11, procps, python2, libdwarf, qtbase, qtwebkit, wrapQtAppsHook, libglvnd }: stdenv.mkDerivation rec { pname = "apitrace"; @@ -15,7 +15,48 @@ stdenv.mkDerivation rec { # of games -- so it's fine to use e.g. bundled snappy. buildInputs = [ libX11 procps python2 libdwarf qtbase qtwebkit ]; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake wrapQtAppsHook ]; + + # Don't automatically wrap all binaries, I prefer to explicitly only wrap + # `qapitrace`. + dontWrapQtApps = true; + + postFixup = '' + + # Since https://github.com/NixOS/nixpkgs/pull/60985, we add `/run-opengl-driver[-32]` + # to the `RUNPATH` of dispatcher libraries `dlopen()` ing OpenGL drivers. + # `RUNPATH` doesn't propagate throughout the whole application, but only + # from the module performing the `dlopen()`. + # + # Apitrace wraps programs by running them with `LD_PRELOAD` pointing to `.so` + # files in $out/lib/apitrace/wrappers. + # + # Theses wrappers effectively wrap the `dlopen()` calls from `libglvnd` + # and other dispatcher libraries, and run `dlopen()` by themselves. + # + # As `RUNPATH` doesn't propagate through the whole library, and they're now the + # library doing the real `dlopen()`, they also need to have + # `/run-opengl-driver[-32]` added to their `RUNPATH`. + # + # To stay simple, we add paths for 32 and 64 bits unconditionally. + # This doesn't have an impact on closure size, and if the 32 bit drivers + # are not available, that folder is ignored. + for i in $out/lib/apitrace/wrappers/*.so + do + echo "Patching OpenGL driver path for $i" + patchelf --set-rpath "/run/opengl-driver/lib:/run/opengl-driver-32/lib:$(patchelf --print-rpath $i)" $i + done + + # Theses open the OpenGL driver at runtime, but it is not listed as NEEDED libraries. They need + # a reference to libglvnd. + for i in $out/bin/eglretrace $out/bin/glretrace + do + echo "Patching RPath for $i" + patchelf --set-rpath "${stdenv.lib.makeLibraryPath [libglvnd]}:$(patchelf --print-rpath $i)" $i + done + + wrapQtApp $out/bin/qapitrace + ''; meta = with stdenv.lib; { homepage = "https://apitrace.github.io"; -- cgit v1.2.3 From b6456e528e60dcd5f30d127ee4e043a991c7d49a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 4 May 2020 08:41:50 -0400 Subject: linux: 5.7-rc3 -> 5.7-rc4 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 05617f86917..8b5f1e58d14 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.7-rc3"; + version = "5.7-rc4"; extraMeta.branch = "5.7"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "0gq4bdzz2px85l3fa9dq3jh3lp4c9kgph4njq6yxf9g3h0ifq7c6"; + sha256 = "1mnknjiax24iaj9n5k0s55vp6fvmb40s931qxj24v5p1lc5fznvb"; }; # Should the testing kernels ever be built on Hydra? -- cgit v1.2.3 From ff6765d4352b01c2ea9fe1ce411d022ce6407c34 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Mon, 4 May 2020 08:43:02 -0400 Subject: oh-my-zsh: 2020-04-30 -> 2020-05-01 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 6e679f16e30..fe30a6f9e9a 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2020-04-30"; + version = "2020-05-01"; pname = "oh-my-zsh"; - rev = "06b0276675e978d80535259915fbb44011e10101"; + rev = "173d4ca68f1ff4b04e9f3fd783244c309d848092"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "1y1c8v2akxwffrmcq8lmxvdnirqkxbxbrhcws76dlcgp2m3drvgq"; + sha256 = "0k8w5cf5fyz69bji947i1yd7pd49bpkg82k2wlx9964lgl21bip5"; }; pathsToLink = [ "/share/oh-my-zsh" ]; -- cgit v1.2.3 From 2f7747526cc80844a506c4aa14706429324be157 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 20 Apr 2020 12:31:07 +0100 Subject: nixos/docker-containers: Rename to virtualisation.oci-containers.containers. And allow the runtime to be configurable via the `virtualisation.oci-containers.backend` option. Valid choices are "podman" and "docker". --- nixos/doc/manual/release-notes/rl-2009.xml | 6 + nixos/modules/module-list.nix | 2 +- nixos/modules/virtualisation/docker-containers.nix | 281 ------------------ nixos/modules/virtualisation/oci-containers.nix | 323 +++++++++++++++++++++ nixos/modules/virtualisation/podman.nix | 12 +- nixos/tests/all-tests.nix | 2 +- nixos/tests/docker-containers.nix | 27 -- nixos/tests/oci-containers.nix | 43 +++ 8 files changed, 385 insertions(+), 311 deletions(-) delete mode 100644 nixos/modules/virtualisation/docker-containers.nix create mode 100644 nixos/modules/virtualisation/oci-containers.nix delete mode 100644 nixos/tests/docker-containers.nix create mode 100644 nixos/tests/oci-containers.nix diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 78b8eee47ef..c6a766cc045 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -55,6 +55,12 @@ The new virtualisation.containers module manages configuration shared by the CRI-O and Podman modules. + + + Declarative Docker containers are renamed from docker-containers to virtualisation.oci-containers.containers. + This is to make it possible to use podman instead of docker. + + diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 0cd17775e51..28f536056bf 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -984,9 +984,9 @@ ./virtualisation/container-config.nix ./virtualisation/containers.nix ./virtualisation/nixos-containers.nix + ./virtualisation/oci-containers.nix ./virtualisation/cri-o.nix ./virtualisation/docker.nix - ./virtualisation/docker-containers.nix ./virtualisation/ecs-agent.nix ./virtualisation/libvirtd.nix ./virtualisation/lxc.nix diff --git a/nixos/modules/virtualisation/docker-containers.nix b/nixos/modules/virtualisation/docker-containers.nix deleted file mode 100644 index 5ab990a3d7c..00000000000 --- a/nixos/modules/virtualisation/docker-containers.nix +++ /dev/null @@ -1,281 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; -let - cfg = config.docker-containers; - - dockerContainer = - { ... }: { - - options = { - - image = mkOption { - type = with types; str; - description = "Docker image to run."; - example = "library/hello-world"; - }; - - imageFile = mkOption { - type = with types; nullOr package; - default = null; - description = '' - Path to an image file to load instead of pulling from a registry. - If defined, do not pull from registry. - - You still need to set the image attribute, as it - will be used as the image name for docker to start a container. - ''; - example = literalExample "pkgs.dockerTools.buildDockerImage {...};"; - }; - - cmd = mkOption { - type = with types; listOf str; - default = []; - description = "Commandline arguments to pass to the image's entrypoint."; - example = literalExample '' - ["--port=9000"] - ''; - }; - - entrypoint = mkOption { - type = with types; nullOr str; - description = "Override the default entrypoint of the image."; - default = null; - example = "/bin/my-app"; - }; - - environment = mkOption { - type = with types; attrsOf str; - default = {}; - description = "Environment variables to set for this container."; - example = literalExample '' - { - DATABASE_HOST = "db.example.com"; - DATABASE_PORT = "3306"; - } - ''; - }; - - log-driver = mkOption { - type = types.str; - default = "none"; - description = '' - Logging driver for the container. The default of - "none" means that the container's logs will be - handled as part of the systemd unit. Setting this to - "journald" will result in duplicate logging, but - the container's logs will be visible to the docker - logs command. - - For more details and a full list of logging drivers, refer to the - - Docker engine documentation - ''; - }; - - ports = mkOption { - type = with types; listOf str; - default = []; - description = '' - Network ports to publish from the container to the outer host. - - Valid formats: - - - - - <ip>:<hostPort>:<containerPort> - - - - - <ip>::<containerPort> - - - - - <hostPort>:<containerPort> - - - - - <containerPort> - - - - - Both hostPort and - containerPort can be specified as a range of - ports. When specifying ranges for both, the number of container - ports in the range must match the number of host ports in the - range. Example: 1234-1236:1234-1236/tcp - - When specifying a range for hostPort only, the - containerPort must not be a - range. In this case, the container port is published somewhere - within the specified hostPort range. Example: - 1234-1236:1234/tcp - - Refer to the - - Docker engine documentation for full details. - ''; - example = literalExample '' - [ - "8080:9000" - ] - ''; - }; - - user = mkOption { - type = with types; nullOr str; - default = null; - description = '' - Override the username or UID (and optionally groupname or GID) used - in the container. - ''; - example = "nobody:nogroup"; - }; - - volumes = mkOption { - type = with types; listOf str; - default = []; - description = '' - List of volumes to attach to this container. - - Note that this is a list of "src:dst" strings to - allow for src to refer to - /nix/store paths, which would be difficult with an - attribute set. There are also a variety of mount options available - as a third field; please refer to the - - docker engine documentation for details. - ''; - example = literalExample '' - [ - "volume_name:/path/inside/container" - "/path/on/host:/path/inside/container" - ] - ''; - }; - - workdir = mkOption { - type = with types; nullOr str; - default = null; - description = "Override the default working directory for the container."; - example = "/var/lib/hello_world"; - }; - - dependsOn = mkOption { - type = with types; listOf str; - default = []; - description = '' - Define which other containers this one depends on. They will be added to both After and Requires for the unit. - - Use the same name as the attribute under services.docker-containers. - ''; - example = literalExample '' - services.docker-containers = { - node1 = {}; - node2 = { - dependsOn = [ "node1" ]; - } - } - ''; - }; - - extraDockerOptions = mkOption { - type = with types; listOf str; - default = []; - description = "Extra options for docker run."; - example = literalExample '' - ["--network=host"] - ''; - }; - - autoStart = mkOption { - type = types.bool; - default = true; - description = '' - When enabled, the container is automatically started on boot. - If this option is set to false, the container has to be started on-demand via its service. - ''; - }; - }; - }; - - mkService = name: container: let - mkAfter = map (x: "docker-${x}.service") container.dependsOn; - in rec { - wantedBy = [] ++ optional (container.autoStart) "multi-user.target"; - after = [ "docker.service" "docker.socket" ] ++ mkAfter; - requires = after; - path = [ pkgs.docker ]; - - preStart = '' - docker rm -f ${name} || true - ${optionalString (container.imageFile != null) '' - docker load -i ${container.imageFile} - ''} - ''; - postStop = "docker rm -f ${name} || true"; - - serviceConfig = { - ExecStart = concatStringsSep " \\\n " ([ - "${pkgs.docker}/bin/docker run" - "--rm" - "--name=${name}" - "--log-driver=${container.log-driver}" - ] ++ optional (container.entrypoint != null) - "--entrypoint=${escapeShellArg container.entrypoint}" - ++ (mapAttrsToList (k: v: "-e ${escapeShellArg k}=${escapeShellArg v}") container.environment) - ++ map (p: "-p ${escapeShellArg p}") container.ports - ++ optional (container.user != null) "-u ${escapeShellArg container.user}" - ++ map (v: "-v ${escapeShellArg v}") container.volumes - ++ optional (container.workdir != null) "-w ${escapeShellArg container.workdir}" - ++ map escapeShellArg container.extraDockerOptions - ++ [container.image] - ++ map escapeShellArg container.cmd - ); - - ExecStop = ''${pkgs.bash}/bin/sh -c "[ $SERVICE_RESULT = success ] || docker stop ${name}"''; - - ### There is no generalized way of supporting `reload` for docker - ### containers. Some containers may respond well to SIGHUP sent to their - ### init process, but it is not guaranteed; some apps have other reload - ### mechanisms, some don't have a reload signal at all, and some docker - ### images just have broken signal handling. The best compromise in this - ### case is probably to leave ExecReload undefined, so `systemctl reload` - ### will at least result in an error instead of potentially undefined - ### behaviour. - ### - ### Advanced users can still override this part of the unit to implement - ### a custom reload handler, since the result of all this is a normal - ### systemd service from the perspective of the NixOS module system. - ### - # ExecReload = ...; - ### - - TimeoutStartSec = 0; - TimeoutStopSec = 120; - Restart = "always"; - }; - }; - -in { - - options.docker-containers = mkOption { - default = {}; - type = types.attrsOf (types.submodule dockerContainer); - description = "Docker containers to run as systemd services."; - }; - - config = mkIf (cfg != {}) { - - systemd.services = mapAttrs' (n: v: nameValuePair "docker-${n}" (mkService n v)) cfg; - - virtualisation.docker.enable = true; - - }; - -} diff --git a/nixos/modules/virtualisation/oci-containers.nix b/nixos/modules/virtualisation/oci-containers.nix new file mode 100644 index 00000000000..a46dd65eb49 --- /dev/null +++ b/nixos/modules/virtualisation/oci-containers.nix @@ -0,0 +1,323 @@ +{ config, options, lib, pkgs, ... }: + +with lib; +let + cfg = config.virtualisation.oci-containers; + proxy_env = config.networking.proxy.envVars; + + defaultBackend = options.virtualisation.oci-containers.backend.default; + + containerOptions = + { ... }: { + + options = { + + image = mkOption { + type = with types; str; + description = "OCI image to run."; + example = "library/hello-world"; + }; + + imageFile = mkOption { + type = with types; nullOr package; + default = null; + description = '' + Path to an image file to load instead of pulling from a registry. + If defined, do not pull from registry. + + You still need to set the image attribute, as it + will be used as the image name for docker to start a container. + ''; + example = literalExample "pkgs.dockerTools.buildDockerImage {...};"; + }; + + cmd = mkOption { + type = with types; listOf str; + default = []; + description = "Commandline arguments to pass to the image's entrypoint."; + example = literalExample '' + ["--port=9000"] + ''; + }; + + entrypoint = mkOption { + type = with types; nullOr str; + description = "Override the default entrypoint of the image."; + default = null; + example = "/bin/my-app"; + }; + + environment = mkOption { + type = with types; attrsOf str; + default = {}; + description = "Environment variables to set for this container."; + example = literalExample '' + { + DATABASE_HOST = "db.example.com"; + DATABASE_PORT = "3306"; + } + ''; + }; + + log-driver = mkOption { + type = types.str; + default = "journald"; + description = '' + Logging driver for the container. The default of + "journald" means that the container's logs will be + handled as part of the systemd unit. + + For more details and a full list of logging drivers, refer to respective backends documentation. + + For Docker: + Docker engine documentation + + For Podman: + Refer to the docker-run(1) man page. + ''; + }; + + ports = mkOption { + type = with types; listOf str; + default = []; + description = '' + Network ports to publish from the container to the outer host. + + Valid formats: + + + + + <ip>:<hostPort>:<containerPort> + + + + + <ip>::<containerPort> + + + + + <hostPort>:<containerPort> + + + + + <containerPort> + + + + + Both hostPort and + containerPort can be specified as a range of + ports. When specifying ranges for both, the number of container + ports in the range must match the number of host ports in the + range. Example: 1234-1236:1234-1236/tcp + + When specifying a range for hostPort only, the + containerPort must not be a + range. In this case, the container port is published somewhere + within the specified hostPort range. Example: + 1234-1236:1234/tcp + + Refer to the + + Docker engine documentation for full details. + ''; + example = literalExample '' + [ + "8080:9000" + ] + ''; + }; + + user = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Override the username or UID (and optionally groupname or GID) used + in the container. + ''; + example = "nobody:nogroup"; + }; + + volumes = mkOption { + type = with types; listOf str; + default = []; + description = '' + List of volumes to attach to this container. + + Note that this is a list of "src:dst" strings to + allow for src to refer to + /nix/store paths, which would be difficult with an + attribute set. There are also a variety of mount options available + as a third field; please refer to the + + docker engine documentation for details. + ''; + example = literalExample '' + [ + "volume_name:/path/inside/container" + "/path/on/host:/path/inside/container" + ] + ''; + }; + + workdir = mkOption { + type = with types; nullOr str; + default = null; + description = "Override the default working directory for the container."; + example = "/var/lib/hello_world"; + }; + + dependsOn = mkOption { + type = with types; listOf str; + default = []; + description = '' + Define which other containers this one depends on. They will be added to both After and Requires for the unit. + + Use the same name as the attribute under virtualisation.oci-containers. + ''; + example = literalExample '' + virtualisation.oci-containers = { + node1 = {}; + node2 = { + dependsOn = [ "node1" ]; + } + } + ''; + }; + + extraOptions = mkOption { + type = with types; listOf str; + default = []; + description = "Extra options for ${defaultBackend} run."; + example = literalExample '' + ["--network=host"] + ''; + }; + + autoStart = mkOption { + type = types.bool; + default = true; + description = '' + When enabled, the container is automatically started on boot. + If this option is set to false, the container has to be started on-demand via its service. + ''; + }; + }; + }; + + mkService = name: container: let + dependsOn = map (x: "${cfg.backend}-${x}.service") container.dependsOn; + in { + wantedBy = [] ++ optional (container.autoStart) "multi-user.target"; + after = lib.optionals (cfg.backend == "docker") [ "docker.service" "docker.socket" ] ++ dependsOn; + requires = dependsOn; + environment = proxy_env; + + path = + if cfg.backend == "docker" then [ pkgs.docker ] + else if cfg.backend == "podman" then [ config.virtualisation.podman.package ] + else throw "Unhandled backend: ${cfg.backend}"; + + preStart = '' + ${cfg.backend} rm -f ${name} || true + ${optionalString (container.imageFile != null) '' + ${cfg.backend} load -i ${container.imageFile} + ''} + ''; + postStop = "${cfg.backend} rm -f ${name} || true"; + + serviceConfig = { + StandardOutput = "null"; + StandardError = "null"; + ExecStart = concatStringsSep " \\\n " ([ + "${config.system.path}/bin/${cfg.backend} run" + "--rm" + "--name=${name}" + "--log-driver=${container.log-driver}" + ] ++ optional (container.entrypoint != null) + "--entrypoint=${escapeShellArg container.entrypoint}" + ++ (mapAttrsToList (k: v: "-e ${escapeShellArg k}=${escapeShellArg v}") container.environment) + ++ map (p: "-p ${escapeShellArg p}") container.ports + ++ optional (container.user != null) "-u ${escapeShellArg container.user}" + ++ map (v: "-v ${escapeShellArg v}") container.volumes + ++ optional (container.workdir != null) "-w ${escapeShellArg container.workdir}" + ++ map escapeShellArg container.extraOptions + ++ [container.image] + ++ map escapeShellArg container.cmd + ); + + ExecStop = ''${pkgs.bash}/bin/sh -c "[ $SERVICE_RESULT = success ] || ${cfg.backend} stop ${name}"''; + + ### There is no generalized way of supporting `reload` for docker + ### containers. Some containers may respond well to SIGHUP sent to their + ### init process, but it is not guaranteed; some apps have other reload + ### mechanisms, some don't have a reload signal at all, and some docker + ### images just have broken signal handling. The best compromise in this + ### case is probably to leave ExecReload undefined, so `systemctl reload` + ### will at least result in an error instead of potentially undefined + ### behaviour. + ### + ### Advanced users can still override this part of the unit to implement + ### a custom reload handler, since the result of all this is a normal + ### systemd service from the perspective of the NixOS module system. + ### + # ExecReload = ...; + ### + + TimeoutStartSec = 0; + TimeoutStopSec = 120; + Restart = "always"; + }; + }; + +in { + imports = [ + ( + lib.mkChangedOptionModule + [ "docker-containers" ] + [ "virtualisation" "oci-containers" ] + (oldcfg: { + backend = "docker"; + containers = lib.mapAttrs (n: v: builtins.removeAttrs (v // { + extraOptions = v.extraDockerOptions or []; + }) [ "extraDockerOptions" ]) oldcfg.docker-containers; + }) + ) + ]; + + options.virtualisation.oci-containers = { + + backend = mkOption { + type = types.enum [ "podman" "docker" ]; + default = + # TODO: Once https://github.com/NixOS/nixpkgs/issues/77925 is resolved default to podman + # if versionAtLeast config.system.stateVersion "20.09" then "podman" + # else "docker"; + "docker"; + description = "The underlying Docker implementation to use."; + }; + + containers = mkOption { + default = {}; + type = types.attrsOf (types.submodule containerOptions); + description = "OCI (Docker) containers to run as systemd services."; + }; + + }; + + config = lib.mkIf (cfg.containers != {}) (lib.mkMerge [ + { + systemd.services = mapAttrs' (n: v: nameValuePair "${cfg.backend}-${n}" (mkService n v)) cfg.containers; + } + (lib.mkIf (cfg.backend == "podman") { + virtualisation.podman.enable = true; + }) + (lib.mkIf (cfg.backend == "docker") { + virtualisation.docker.enable = true; + }) + ]); + +} diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix index 1dc79272ccb..9f98c2086d1 100644 --- a/nixos/modules/virtualisation/podman.nix +++ b/nixos/modules/virtualisation/podman.nix @@ -88,11 +88,21 @@ in }; }; + package = lib.mkOption { + type = types.package; + default = podmanPackage; + internal = true; + description = '' + The final Podman package (including extra packages). + ''; + }; + + }; config = lib.mkIf cfg.enable { - environment.systemPackages = [ podmanPackage ] + environment.systemPackages = [ cfg.package ] ++ lib.optional cfg.dockerCompat dockerCompat; environment.etc."containers/libpod.conf".text = '' diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index eff1752bbbf..ebb0dfef15a 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -70,7 +70,7 @@ in dhparams = handleTest ./dhparams.nix {}; dnscrypt-proxy2 = handleTestOn ["x86_64-linux"] ./dnscrypt-proxy2.nix {}; docker = handleTestOn ["x86_64-linux"] ./docker.nix {}; - docker-containers = handleTestOn ["x86_64-linux"] ./docker-containers.nix {}; + oci-containers = handleTestOn ["x86_64-linux"] ./oci-containers.nix {}; docker-edge = handleTestOn ["x86_64-linux"] ./docker-edge.nix {}; docker-preloader = handleTestOn ["x86_64-linux"] ./docker-preloader.nix {}; docker-registry = handleTest ./docker-registry.nix {}; diff --git a/nixos/tests/docker-containers.nix b/nixos/tests/docker-containers.nix deleted file mode 100644 index 0e318a52d9f..00000000000 --- a/nixos/tests/docker-containers.nix +++ /dev/null @@ -1,27 +0,0 @@ -# Test Docker containers as systemd units - -import ./make-test-python.nix ({ pkgs, lib, ... }: { - name = "docker-containers"; - meta = { - maintainers = with lib.maintainers; [ benley mkaito ]; - }; - - nodes = { - docker = { pkgs, ... }: { - virtualisation.docker.enable = true; - - docker-containers.nginx = { - image = "nginx-container"; - imageFile = pkgs.dockerTools.examples.nginx; - ports = ["8181:80"]; - }; - }; - }; - - testScript = '' - start_all() - docker.wait_for_unit("docker-nginx.service") - docker.wait_for_open_port(8181) - docker.wait_until_succeeds("curl http://localhost:8181 | grep Hello") - ''; -}) diff --git a/nixos/tests/oci-containers.nix b/nixos/tests/oci-containers.nix new file mode 100644 index 00000000000..bb6c019f07c --- /dev/null +++ b/nixos/tests/oci-containers.nix @@ -0,0 +1,43 @@ +{ system ? builtins.currentSystem +, config ? {} +, pkgs ? import ../.. { inherit system config; } +, lib ? pkgs.lib +}: + +let + + inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest; + + mkOCITest = backend: makeTest { + name = "oci-containers-${backend}"; + + meta = { + maintainers = with lib.maintainers; [ adisbladis benley mkaito ]; + }; + + nodes = { + ${backend} = { pkgs, ... }: { + virtualisation.oci-containers = { + inherit backend; + containers.nginx = { + image = "nginx-container"; + imageFile = pkgs.dockerTools.examples.nginx; + ports = ["8181:80"]; + }; + }; + }; + }; + + testScript = '' + start_all() + ${backend}.wait_for_unit("${backend}-nginx.service") + ${backend}.wait_for_open_port(8181) + ${backend}.wait_until_succeeds("curl http://localhost:8181 | grep Hello") + ''; + }; + +in +lib.foldl' (attrs: backend: attrs // { ${backend} = mkOCITest backend; }) {} [ + "docker" + "podman" +] -- cgit v1.2.3 From 00a5e1e76f9d87e4c22eac1bd8e6b36c4594e1c8 Mon Sep 17 00:00:00 2001 From: mehlon Date: Mon, 16 Mar 2020 21:37:41 +0100 Subject: tribler: add desktop file, icons and manpages --- pkgs/applications/networking/p2p/tribler/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/applications/networking/p2p/tribler/default.nix b/pkgs/applications/networking/p2p/tribler/default.nix index e9c5f274143..ed1129b238a 100644 --- a/pkgs/applications/networking/p2p/tribler/default.nix +++ b/pkgs/applications/networking/p2p/tribler/default.nix @@ -71,6 +71,11 @@ stdenv.mkDerivation rec { ${stdenv.lib.optionalString enablePlayer '' --prefix LD_LIBRARY_PATH : ${vlc}/lib ''} + + mkdir -p $out/share/applications $out/share/icons $out/share/man/man1 + cp $out/Tribler/Main/Build/Ubuntu/tribler.desktop $out/share/applications/tribler.desktop + cp $out/Tribler/Main/Build/Ubuntu/tribler_big.xpm $out/share/icons/tribler.xpm + cp $out/Tribler/Main/Build/Ubuntu/tribler.1 $out/share/man/man1/tribler.1 ''; meta = with stdenv.lib; { -- cgit v1.2.3 From 7493a7eb91e9cc8225c4ab639f716273cbdb6250 Mon Sep 17 00:00:00 2001 From: tckmn Date: Mon, 4 May 2020 08:01:03 -0500 Subject: jelly: init at 0.1.31 (#82178) --- pkgs/development/interpreters/jelly/default.nix | 28 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/interpreters/jelly/default.nix diff --git a/pkgs/development/interpreters/jelly/default.nix b/pkgs/development/interpreters/jelly/default.nix new file mode 100644 index 00000000000..a317f35d2a7 --- /dev/null +++ b/pkgs/development/interpreters/jelly/default.nix @@ -0,0 +1,28 @@ +{ lib, python3Packages, fetchFromGitHub }: + +python3Packages.buildPythonApplication { + pname = "jelly"; + version = "0.1.31"; + + src = fetchFromGitHub { + owner = "DennisMitchell"; + repo = "jellylanguage"; + rev = "70c9fd93ab009c05dc396f8cc091f72b212fb188"; + sha256 = "1rpclqagvigp5qhvgnjavvy463f1drshnc1mfxm6z7ygzs0l0yz6"; + }; + + propagatedBuildInputs = [ python3Packages.sympy ]; + + # checks are disabled because jelly has no tests, and the default is to run + # the output binary with no arguments, which exits with status 1 and causes + # the build to fail + doCheck = false; + + meta = with lib; { + description = "A recreational programming language inspired by J"; + homepage = https://github.com/DennisMitchell/jellylanguage; + license = licenses.mit; + maintainers = [ maintainers.tckmn ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f01b63d40a6..178ee548545 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9358,6 +9358,8 @@ in janet = callPackage ../development/interpreters/janet {}; + jelly = callPackage ../development/interpreters/jelly {}; + jimtcl = callPackage ../development/interpreters/jimtcl {}; jmeter = callPackage ../applications/networking/jmeter {}; -- cgit v1.2.3 From b0b0d3d5179e812f67422b5df6fe7fcb61513bb2 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sun, 23 Feb 2020 19:20:21 +0100 Subject: redshift-wlr: 2019-04-17 -> 2019-08-24 --- pkgs/applications/misc/redshift/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 81fbcc8b483..43393478ec4 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -101,12 +101,13 @@ rec { redshift-wlr = mkRedshift { pname = "redshift-wlr"; - version = "2019-04-17"; + # upstream rebases so this is the push date + version = "2019-08-24"; src = fetchFromGitHub { owner = "minus7"; repo = "redshift"; - rev = "eecbfedac48f827e96ad5e151de8f41f6cd3af66"; + rev = "7da875d34854a6a34612d5ce4bd8718c32bec804"; sha256 = "0rs9bxxrw4wscf4a8yl776a8g880m5gcm75q06yx2cn3lw2b7v22"; }; -- cgit v1.2.3 From 89b673b9e6500be9995b1eef7095ea6a6b184aa7 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Wed, 8 Apr 2020 16:42:16 +0200 Subject: boringssl: 2017-02-23 -> 2019-12-04 --- pkgs/development/libraries/boringssl/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix index 67e2794c8a2..20524cf179c 100644 --- a/pkgs/development/libraries/boringssl/default.nix +++ b/pkgs/development/libraries/boringssl/default.nix @@ -3,24 +3,23 @@ # reference: https://boringssl.googlesource.com/boringssl/+/2661/BUILDING.md stdenv.mkDerivation { pname = "boringssl"; - version = "2017-02-23"; + version = "2019-12-04"; src = fetchgit { url = "https://boringssl.googlesource.com/boringssl"; - rev = "be2ee342d3781ddb954f91f8a7e660c6f59e87e5"; - sha256 = "022zq7wlkhrg6al7drr3555lam3zw5bb10ylf9mznp83s854f975"; + rev = "243b5cc9e33979ae2afa79eaa4e4c8d59db161d4"; + sha256 = "1ak27dln0zqy2vj4llqsb99g03sk0sg25wlp09b58cymrh3gccvl"; }; - buildInputs = [ cmake perl go ]; + nativeBuildInputs = [ cmake perl go ]; enableParallelBuilding = true; - NIX_CFLAGS_COMPILE = "-Wno-error"; makeFlags = [ "GOCACHE=$(TMPDIR)/go-cache" ]; installPhase = '' - mkdir -p $out/bin $out/include $out/lib + mkdir -p $bin/bin $out/include $out/lib - mv tool/bssl $out/bin + mv tool/bssl $bin/bin mv ssl/libssl.a $out/lib mv crypto/libcrypto.a $out/lib @@ -29,6 +28,8 @@ stdenv.mkDerivation { mv ../include/openssl $out/include ''; + outputs = [ "out" "bin" ]; + meta = with stdenv.lib; { description = "Free TLS/SSL implementation"; homepage = "https://boringssl.googlesource.com"; -- cgit v1.2.3 From 52b2fa943a42e9ccfe025ded9518d6fe33fd9d6f Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 4 May 2020 15:01:51 +0200 Subject: coturn: 4.5.1.1 -> 4.5.1.2 --- pkgs/servers/coturn/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix index 51502c3fd97..f50a5afa81e 100644 --- a/pkgs/servers/coturn/default.nix +++ b/pkgs/servers/coturn/default.nix @@ -2,24 +2,19 @@ stdenv.mkDerivation rec { pname = "coturn"; - version = "4.5.1.1"; + version = "4.5.1.2"; src = fetchFromGitHub { owner = "coturn"; repo = "coturn"; rev = version; - sha256 = "12x604lgva1d3g4wvl3f66rdj6lkjk5cqr0l3xas33xgzgm13pwr"; + sha256 = "01y65az8qyv2kjnb4fj7rgl4zq5pc2b286gfn727x3hfhksx9zp2"; }; buildInputs = [ openssl libevent ]; patches = [ ./pure-configure.patch - (fetchpatch { - name = "CVE-2020-6061+6062.patch"; - url = "https://sources.debian.org/data/main/c/coturn/4.5.1.1-1.2/debian/patches/CVE-2020-6061+6062.patch"; - sha256 = "0fcy1wp91bb4hlhnp96sf9bs0d9hf3pwx5f7b1r9cfvr3l5c1bk2"; - }) ]; meta = with stdenv.lib; { -- cgit v1.2.3 From bd1846f7f4070383a2480da0f2b60e4fef119f25 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 13:33:51 +0000 Subject: linuxPackages_hardened.bcc: 0.13.0 -> 0.14.0 --- pkgs/os-specific/linux/bcc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 79e32a05f46..7f95ef47ee9 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -5,11 +5,11 @@ python.pkgs.buildPythonApplication rec { pname = "bcc"; - version = "0.13.0"; + version = "0.14.0"; src = fetchurl { url = "https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"; - sha256 = "15xpwf17x2j1c1wcb84cgfs35dp5w0rjd9mllmddmdjvn303wffx"; + sha256 = "1hw02bib06fjyw61as5pmhf0qxy0wv0nw8fff2i8a9d1zcd8xf3p"; }; format = "other"; -- cgit v1.2.3 From 4d988ff0d0fa772f0297b5227c343a62391cbe1c Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 25 Apr 2020 16:54:33 +0300 Subject: nixos/nginx: change log and cache directories --- .../modules/services/web-servers/nginx/default.nix | 28 +++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 8d49dc66eb1..1e9cda7e478 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -187,7 +187,7 @@ let then "/etc/nginx/nginx.conf" else configFile; - execCommand = "${cfg.package}/bin/nginx -c '${configPath}' -p '${cfg.stateDir}'"; + execCommand = "${cfg.package}/bin/nginx -c '${configPath}'"; vhosts = concatStringsSep "\n" (mapAttrsToList (vhostName: vhost: let @@ -463,13 +463,6 @@ in ''; }; - stateDir = mkOption { - default = "/var/spool/nginx"; - description = " - Directory holding all state for nginx to run. - "; - }; - user = mkOption { type = types.str; default = "nginx"; @@ -636,6 +629,13 @@ in }; }; + imports = [ + (mkRemovedOptionModule [ "services" "nginx" "stateDir" ] '' + The Nginx log directory has been moved to /var/log/nginx, the cache directory + to /var/cache/nginx. The option services.nginx.stateDir has been removed. + '') + ]; + config = mkIf cfg.enable { # TODO: test user supplied config file pases syntax test @@ -680,12 +680,6 @@ in } ]; - systemd.tmpfiles.rules = [ - "d '${cfg.stateDir}' 0750 ${cfg.user} ${cfg.group} - -" - "d '${cfg.stateDir}/logs' 0750 ${cfg.user} ${cfg.group} - -" - "Z '${cfg.stateDir}' - ${cfg.user} ${cfg.group} - -" - ]; - systemd.services.nginx = { description = "Nginx Web Server"; wantedBy = [ "multi-user.target" ]; @@ -708,6 +702,12 @@ in # Runtime directory and mode RuntimeDirectory = "nginx"; RuntimeDirectoryMode = "0750"; + # Cache directory and mode + CacheDirectory = "nginx"; + CacheDirectoryMode = "0750"; + # Logs directory and mode + LogsDirectory = "nginx"; + LogsDirectoryMode = "0750"; # Capabilities AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" "CAP_SYS_RESOURCE" ]; }; -- cgit v1.2.3 From a19800fb48b52079c55d88c9f6137f58e8d97918 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 25 Apr 2020 17:02:23 +0300 Subject: nginx: change logs path --- pkgs/servers/http/nginx/generic.nix | 42 +++++++++++++--------- .../http/nginx/nix-skip-check-logs-path.patch | 27 ++++++++++++++ pkgs/servers/http/openresty/default.nix | 7 ++-- 3 files changed, 57 insertions(+), 19 deletions(-) create mode 100644 pkgs/servers/http/nginx/nix-skip-check-logs-path.patch diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 67a914b6a98..80bc1458ad7 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -68,6 +68,14 @@ stdenv.mkDerivation { "--with-http_stub_status_module" "--with-threads" "--with-pcre-jit" + "--http-log-path=/var/log/nginx/access.log" + "--error-log-path=/var/log/nginx/error.log" + "--pid-path=/var/log/nginx/nginx.pid" + "--http-client-body-temp-path=/var/cache/nginx/client_body" + "--http-proxy-temp-path=/var/cache/nginx/proxy" + "--http-fastcgi-temp-path=/var/cache/nginx/fastcgi" + "--http-uwsgi-temp-path=/var/cache/nginx/uwsgi" + "--http-scgi-temp-path=/var/cache/nginx/scgi" ] ++ optionals withDebug [ "--with-debug" ] ++ optionals withStream [ @@ -99,26 +107,28 @@ stdenv.mkDerivation { preConfigure = preConfigure + concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules; - patches = map fixPatch - (singleton (substituteAll { + patches = map fixPatch ([ + (substituteAll { src = ./nix-etag-1.15.4.patch; preInstall = '' export nixStoreDir="$NIX_STORE" nixStoreDirLen="''${#NIX_STORE}" ''; - }) ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ - (fetchpatch { - url = "https://raw.githubusercontent.com/openwrt/packages/master/net/nginx/patches/102-sizeof_test_fix.patch"; - sha256 = "0i2k30ac8d7inj9l6bl0684kjglam2f68z8lf3xggcc2i5wzhh8a"; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/openwrt/packages/master/net/nginx/patches/101-feature_test_fix.patch"; - sha256 = "0v6890a85aqmw60pgj3mm7g8nkaphgq65dj4v9c6h58wdsrc6f0y"; - }) - (fetchpatch { - url = "https://raw.githubusercontent.com/openwrt/packages/master/net/nginx/patches/103-sys_nerr.patch"; - sha256 = "0s497x6mkz947aw29wdy073k8dyjq8j99lax1a1mzpikzr4rxlmd"; - }) - ] ++ mapModules "patches"); + }) + ./nix-skip-check-logs-path.patch + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + (fetchpatch { + url = "https://raw.githubusercontent.com/openwrt/packages/master/net/nginx/patches/102-sizeof_test_fix.patch"; + sha256 = "0i2k30ac8d7inj9l6bl0684kjglam2f68z8lf3xggcc2i5wzhh8a"; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/openwrt/packages/master/net/nginx/patches/101-feature_test_fix.patch"; + sha256 = "0v6890a85aqmw60pgj3mm7g8nkaphgq65dj4v9c6h58wdsrc6f0y"; + }) + (fetchpatch { + url = "https://raw.githubusercontent.com/openwrt/packages/master/net/nginx/patches/103-sys_nerr.patch"; + sha256 = "0s497x6mkz947aw29wdy073k8dyjq8j99lax1a1mzpikzr4rxlmd"; + }) + ] ++ mapModules "patches"); hardeningEnable = optional (!stdenv.isDarwin) "pie"; diff --git a/pkgs/servers/http/nginx/nix-skip-check-logs-path.patch b/pkgs/servers/http/nginx/nix-skip-check-logs-path.patch new file mode 100644 index 00000000000..a823660cc32 --- /dev/null +++ b/pkgs/servers/http/nginx/nix-skip-check-logs-path.patch @@ -0,0 +1,27 @@ +diff --git a/auto/install b/auto/install +index d884487..dccc411 100644 +--- a/auto/install ++++ b/auto/install +@@ -148,12 +148,6 @@ install: build $NGX_INSTALL_PERL_MODULES + || cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PATH' + cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX/nginx.conf.default' + +- test -d '\$(DESTDIR)`dirname "$NGX_PID_PATH"`' \\ +- || mkdir -p '\$(DESTDIR)`dirname "$NGX_PID_PATH"`' +- +- test -d '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`' \\ +- || mkdir -p '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`' +- + test -d '\$(DESTDIR)$NGX_PREFIX/html' \\ + || cp -R $NGX_HTML '\$(DESTDIR)$NGX_PREFIX' + END +@@ -161,9 +155,6 @@ END + + if test -n "$NGX_ERROR_LOG_PATH"; then + cat << END >> $NGX_MAKEFILE +- +- test -d '\$(DESTDIR)`dirname "$NGX_ERROR_LOG_PATH"`' \\ +- || mkdir -p '\$(DESTDIR)`dirname "$NGX_ERROR_LOG_PATH"`' + END + + fi diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 0e87b971985..9c01cfb19e1 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -16,10 +16,11 @@ callPackage ../nginx/generic.nix args rec { sha256 = "1a1la7vszv1parsnhphydblz64ffhycazncn3ividnvqg2mg735n"; }; - fixPatch = patch: - runCommand "openresty-${patch.name}" { src = patch; } '' + fixPatch = patch: let name = patch.name or (builtins.baseNameOf patch); in + runCommand "openresty-${name}" { src = patch; } '' substitute $src $out \ - --replace "src/" "bundle/nginx-${nginxVersion}/src/" + --replace "a/" "a/bundle/nginx-${nginxVersion}/" \ + --replace "b/" "b/bundle/nginx-${nginxVersion}/" ''; buildInputs = [ postgresql ]; -- cgit v1.2.3 From 1d71150c73bd3ee3a427950b4c8f29b5a7be060f Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 25 Apr 2020 17:02:57 +0300 Subject: tengine: add ETag patch --- pkgs/servers/http/tengine/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix index 1593ad0c06f..41a913bd61e 100644 --- a/pkgs/servers/http/tengine/default.nix +++ b/pkgs/servers/http/tengine/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt -, gd, geoip, gperftools, jemalloc +, substituteAll, gd, geoip, gperftools, jemalloc , withDebug ? false , withMail ? false , withStream ? false @@ -24,7 +24,12 @@ stdenv.mkDerivation rec { [ openssl zlib pcre libxml2 libxslt gd geoip gperftools jemalloc ] ++ concatMap (mod: mod.inputs or []) modules; - patches = [ + patches = singleton (substituteAll { + src = ../nginx/nix-etag-1.15.4.patch; + preInstall = '' + export nixStoreDir="$NIX_STORE" nixStoreDirLen="''${#NIX_STORE}" + ''; + }) ++ [ ./check-resolv-conf.patch ]; -- cgit v1.2.3 From 98e0cba4690d8034e4846ee5f36d2ddf68bb4ea3 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sat, 25 Apr 2020 17:05:01 +0300 Subject: tengine: change logs path --- pkgs/servers/http/tengine/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix index 41a913bd61e..f3cae597ef9 100644 --- a/pkgs/servers/http/tengine/default.nix +++ b/pkgs/servers/http/tengine/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { ''; }) ++ [ ./check-resolv-conf.patch + ../nginx/nix-skip-check-logs-path.patch ]; configureFlags = [ @@ -58,6 +59,14 @@ stdenv.mkDerivation rec { "--with-poll_module" "--with-google_perftools_module" "--with-jemalloc" + "--http-log-path=/var/log/nginx/access.log" + "--error-log-path=/var/log/nginx/error.log" + "--pid-path=/var/log/nginx/nginx.pid" + "--http-client-body-temp-path=/var/cache/nginx/client_body" + "--http-proxy-temp-path=/var/cache/nginx/proxy" + "--http-fastcgi-temp-path=/var/cache/nginx/fastcgi" + "--http-uwsgi-temp-path=/var/cache/nginx/uwsgi" + "--http-scgi-temp-path=/var/cache/nginx/scgi" ] ++ optionals withDebug [ "--with-debug" ] ++ optionals withMail [ -- cgit v1.2.3 From 9f099143bc025ec962c64bda651f85728643f0a2 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 27 Apr 2020 21:54:20 +0300 Subject: nixos/awstats: change path to nginx logs --- nixos/modules/services/logging/awstats.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/logging/awstats.nix b/nixos/modules/services/logging/awstats.nix index 5939d7808f7..896f52302ff 100644 --- a/nixos/modules/services/logging/awstats.nix +++ b/nixos/modules/services/logging/awstats.nix @@ -24,7 +24,7 @@ let logFile = mkOption { type = types.str; - example = "/var/spool/nginx/logs/access.log"; + example = "/var/log/nginx/access.log"; description = '' The log file to be scanned. @@ -110,7 +110,7 @@ in { "mysite" = { domain = "example.com"; - logFile = "/var/spool/nginx/logs/access.log"; + logFile = "/var/log/nginx/access.log"; }; } ''; -- cgit v1.2.3 From 7b368b30727d3970bc26f1d598eda8261f962d83 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 27 Apr 2020 22:07:13 +0300 Subject: nixos/tests/service-runner: change paths to nginx logs and cache --- nixos/tests/service-runner.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/service-runner.nix b/nixos/tests/service-runner.nix index adb3fcd36d7..39ae66fe111 100644 --- a/nixos/tests/service-runner.nix +++ b/nixos/tests/service-runner.nix @@ -23,7 +23,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { machine.fail(f"curl {url}") machine.succeed( """ - mkdir -p /run/nginx /var/spool/nginx/logs + mkdir -p /run/nginx /var/log/nginx /var/cache/nginx ${nodes.machine.config.systemd.services.nginx.runner} & echo $!>my-nginx.pid """ -- cgit v1.2.3 From 2d8d8415c0c780307bcff62d1ba63f7ada46d1cb Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 27 Apr 2020 22:16:14 +0300 Subject: nixos/nginx: add release notes --- nixos/doc/manual/release-notes/rl-2009.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index c6a766cc045..d9f26f668f8 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -277,6 +277,13 @@ php.override { + + + The Nginx log directory has been moved to /var/log/nginx, the cache directory + to /var/cache/nginx. The option services.nginx.stateDir has + been removed. + + The httpd web server previously started its main process as root -- cgit v1.2.3 From be75fae603eaf65f8dd7c14d79fee57988dea355 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Mon, 4 May 2020 15:45:21 +0200 Subject: perlPackages.StringSimilarity: init at 1.04 --- pkgs/top-level/perl-packages.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index daec9dacbe6..17d60574215 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -17055,6 +17055,20 @@ let }; }; + StringSimilarity = buildPerlPackage { + pname = "String-Similarity"; + version = "1.04"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/String-Similarity-1.04.tar.gz"; + sha256 = "0i9j3hljxw7j6yiii9nsscfj009vw6zv1q8cxwd75jxvj0idm3hz"; + }; + doCheck = true; + meta = { + license = with stdenv.lib.licenses; [ gpl2 ]; + description = "Calculate the similarity of two strings"; + }; + }; + ShellCommand = buildPerlPackage { pname = "Shell-Command"; version = "0.06"; -- cgit v1.2.3 From 24bc2b8be3dcc1d5b8b0deade50b0a8946a09cb4 Mon Sep 17 00:00:00 2001 From: Sohalt Date: Mon, 4 May 2020 15:53:34 +0200 Subject: orca-c: init at git-2020-05-01 --- pkgs/applications/audio/orca-c/default.nix | 31 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/audio/orca-c/default.nix diff --git a/pkgs/applications/audio/orca-c/default.nix b/pkgs/applications/audio/orca-c/default.nix new file mode 100644 index 00000000000..3a4f4b2ce2b --- /dev/null +++ b/pkgs/applications/audio/orca-c/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, ncurses, portmidi }: +stdenv.mkDerivation { + pname = "orca-c"; + + version = "git-2020-05-01"; + + src = fetchFromGitHub { + owner = "hundredrabbits"; + repo = "Orca-c"; + rev = "d7a3b169c5ed0b06a9ad0fdb3057704da9a0b6ce"; + sha256 = "101y617a295hzwr98ykvza1sycxlk29kzxn2ybjwc718r0alkbzz"; + }; + + buildInputs = [ ncurses portmidi ]; + + patchPhase = '' + patchShebangs tool + ''; + + installPhase = '' + mkdir -p $out/bin + install build/orca $out/bin/orca + ''; + + meta = with stdenv.lib; { + description = "An esoteric programming language designed to quickly create procedural sequencers."; + homepage = "https://github.com/hundredrabbits/Orca-c"; + license = licenses.mit; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 178ee548545..cfea73736d6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21114,6 +21114,8 @@ in inherit (pkgs) pkgconfig; }; + orca-c = callPackage ../applications/audio/orca-c {}; + osm2xmap = callPackage ../applications/misc/osm2xmap { libyamlcpp = libyamlcpp_0_3; }; -- cgit v1.2.3 From faf984d12de03cba018fe3099a1de1d607c038da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Partheym=C3=BCller?= Date: Mon, 4 May 2020 16:00:37 +0200 Subject: ed2k/OVMF: Put URLs in quotes --- pkgs/applications/virtualization/OVMF/default.nix | 2 +- pkgs/development/compilers/edk2/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index cd30be88991..19ba8ced497 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -55,7 +55,7 @@ edk2.mkDerivation projectDscPath { meta = { description = "Sample UEFI firmware for QEMU and KVM"; - homepage = https://github.com/tianocore/tianocore.github.io/wiki/OVMF; + homepage = "https://github.com/tianocore/tianocore.github.io/wiki/OVMF"; license = stdenv.lib.licenses.bsd2; platforms = ["x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin"]; }; diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 1050119be53..8a18b6306c2 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -65,7 +65,7 @@ edk2 = buildStdenv.mkDerivation { meta = with lib; { description = "Intel EFI development kit"; - homepage = https://sourceforge.net/projects/edk2/; + homepage = "https://sourceforge.net/projects/edk2/"; license = licenses.bsd2; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "x86_64-darwin" ]; }; -- cgit v1.2.3 From 89d3a605e31b5e4efbe1b28b08206da4e75fd689 Mon Sep 17 00:00:00 2001 From: Kai Wohlfahrt Date: Wed, 29 Apr 2020 23:10:03 +0100 Subject: gpio-tools: init in kernel 5.4 Linux provides some tools to interact with the gpiochip interface (which replaces the deprecated sysfs GPIO interface). Expose these as a package. The tool has not changed much recently, so there is no need to package a version for each kernel. --- pkgs/os-specific/linux/kernel/gpio-utils.nix | 24 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 25 insertions(+) create mode 100644 pkgs/os-specific/linux/kernel/gpio-utils.nix diff --git a/pkgs/os-specific/linux/kernel/gpio-utils.nix b/pkgs/os-specific/linux/kernel/gpio-utils.nix new file mode 100644 index 00000000000..447704eedc8 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/gpio-utils.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, linux }: + +with lib; + +assert versionAtLeast linux.version "4.6"; + +stdenv.mkDerivation { + name = "gpio-utils-${linux.version}"; + + inherit (linux) src makeFlags; + + preConfigure = '' + cd tools/gpio + ''; + + separateDebugInfo = true; + installFlags = [ "install" "DESTDIR=$(out)" "bindir=/bin" ]; + + meta = { + description = "Linux tools to inspect the gpiochip interface"; + maintainers = with stdenv.lib.maintainers; [ kwohlfahrt ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e03841d1aa7..d516a1ceee5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26468,4 +26468,5 @@ in vpsfree-client = callPackage ../tools/virtualization/vpsfree-client {}; + gpio-utils = callPackage ../os-specific/linux/kernel/gpio-utils.nix { }; } -- cgit v1.2.3 From 4916562eeba37291fe4e43e36951782fd37a3d33 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 14:19:12 +0000 Subject: armadillo: 9.860.1 -> 9.870.2 --- pkgs/development/libraries/armadillo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix index 3251b1c9e0d..9b32d46b3b2 100644 --- a/pkgs/development/libraries/armadillo/default.nix +++ b/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "9.860.1"; + version = "9.870.2"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "1ab5y4ll6js2w4p9dabj2dmzzc3f8dja8dqsvy40azrvny58h0qn"; + sha256 = "0mpp1iq4ws9yhcv0bnn0czzyim7whcan34c7a052sh8w9kp5y6sl"; }; nativeBuildInputs = [ cmake ]; -- cgit v1.2.3 From f45c1dc89e93a6aef05e029733fc2e596e6b4d04 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 14:30:48 +0000 Subject: avocode: 4.4.3 -> 4.6.2 --- pkgs/applications/graphics/avocode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index 8b1811c645f..9981e8a439e 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "avocode"; - version = "4.4.3"; + version = "4.6.2"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "03pq55mdgbaf6c2q57ww2990wr6qz8hk1r6xs1irqy8990m4afvk"; + sha256 = "1ldvscxfvwpsir8vr1ca9ra0841m6xy331ys31dngcp77nwncjqc"; }; libPath = stdenv.lib.makeLibraryPath (with xorg; [ -- cgit v1.2.3 From 740ce88c16f1f004d72060ddac0f4d8c5d4e9614 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Mon, 4 May 2020 01:39:35 +0200 Subject: nss: 3.51 -> 3.52 (cherry picked from commit bce5268a216924820a486d09bc3aec7e8d6b8fa7) --- pkgs/development/libraries/nss/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index 8dbef28804a..d48b5a6ba73 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -5,7 +5,7 @@ let url = "http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz"; sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; }; - version = "3.51"; + version = "3.52"; underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; - sha256 = "1725d0idf5zzqafdqfdn9vprc7ys2ywhv23sqn328di968xqnd3m"; + sha256 = "0q8m9jf6zgkbhx71myjb7y0gcl5ib3gj6qkl9yvdqpd6vl6fn2ha"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -27,8 +27,12 @@ in stdenv.mkDerivation rec { propagatedBuildInputs = [ nspr ]; prePatch = '' - # strip the trailing whitespace from the patch line… - xz -d < ${nssPEM} | sed -e '/^-DIRS = builtins $/ s/ $//' | patch -p1 + # strip the trailing whitespace from the patch line and the renamed CKO_NETSCAPE_ enum to CKO_NSS_ + xz -d < ${nssPEM} | sed \ + -e '/^-DIRS = builtins $/ s/ $//' \ + -e 's/CKO_NETSCAPE_/CKO_NSS_/g' \ + -e 's/CKT_NETSCAPE_/CKT_NSS_/g' \ + | patch -p1 ''; patches = -- cgit v1.2.3 From 324e40f0f4a80f63d9c84e117f2dbb3ce2113f26 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Mon, 4 May 2020 16:31:27 +0200 Subject: firefox: 75.0 -> 76.0 --- .../browsers/firefox/no-buildconfig-ffx76.patch | 23 ++++++++++++++++++++++ .../networking/browsers/firefox/packages.nix | 6 +++--- 2 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx76.patch diff --git a/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx76.patch b/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx76.patch new file mode 100644 index 00000000000..2fe30980a35 --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/no-buildconfig-ffx76.patch @@ -0,0 +1,23 @@ +diff -ur firefox-65.0-orig/docshell/base/nsAboutRedirector.cpp firefox-65.0/docshell/base/nsAboutRedirector.cpp +--- firefox-76.0.orig/docshell/base/nsAboutRedirector.cpp 2020-05-03 19:01:29.926544735 +0200 ++++ firefox-76.0/docshell/base/nsAboutRedirector.cpp 2020-05-03 19:12:00.845035570 +0200 +@@ -62,8 +62,6 @@ + {"about", "chrome://global/content/aboutAbout.html", 0}, + {"addons", "chrome://mozapps/content/extensions/extensions.xhtml", + nsIAboutModule::ALLOW_SCRIPT}, +- {"buildconfig", "chrome://global/content/buildconfig.html", +- nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT}, + {"checkerboard", "chrome://global/content/aboutCheckerboard.html", + nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | + nsIAboutModule::ALLOW_SCRIPT}, +diff -ur firefox-65.0-orig/toolkit/content/jar.mn firefox-65.0/toolkit/content/jar.mn +--- firefox-65.0-orig/toolkit/content/jar.mn 2019-01-23 00:48:35.033372506 +0100 ++++ firefox-65.0/toolkit/content/jar.mn 2019-01-23 00:50:45.126565924 +0100 +@@ -36,7 +36,6 @@ + content/global/plugins.css + content/global/browser-child.js + content/global/browser-content.js +-* content/global/buildconfig.html + content/global/buildconfig.css + content/global/contentAreaUtils.js + content/global/datepicker.xhtml diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index e419137c4e9..ee023e16ac5 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,14 +7,14 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "75.0"; + ffversion = "76.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "0m3ibm6dy9cpvsxkzkzwj7na5rm5qz7sm3bpx604ibay9pccvgv59jxapisvmswzmlz2nv02l6p2gxlz3b0lbcg7rd5zasia92y7j99"; + sha512 = "3dq9h84w1qqidabbrl34jgyjr8bbmbf5wddjazpr7znfm49fn2xyg8fmm5lx9dakghk3wp8yhfi36gmk08fzlrm47v6h17dm9hkh0hz"; }; patches = [ - ./no-buildconfig-ffx65.patch + ./no-buildconfig-ffx76.patch ]; meta = { -- cgit v1.2.3 From e72b2beab026f1e9908cab53f2773a61256e4a72 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 27 Apr 2020 18:23:44 -0400 Subject: vtk: unbreak on OS X --- pkgs/development/libraries/vtk/default.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index 6a7e26c753c..1cc706f4eb7 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { ++ optional enablePython [ "-DVTK_WRAP_PYTHON:BOOL=ON" ]; postPatch = stdenv.lib.optionalString stdenv.isDarwin '' - sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-7.0|' ./Parallel/Core/CMakeLists.txt + sed -i 's|COMMAND vtkHashSource|COMMAND "DYLD_LIBRARY_PATH=''${VTK_BINARY_DIR}/lib" ''${VTK_BINARY_DIR}/bin/vtkHashSource-${majorVersion}|' ./Parallel/Core/CMakeLists.txt sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/' ./ThirdParty/libxml2/vtklibxml2/xmlschemas.c sed -i 's/fprintf(output, shift)/fprintf(output, "%s", shift)/g' ./ThirdParty/libxml2/vtklibxml2/xpath.c ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cfea73736d6..f6782e37699 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14844,7 +14844,7 @@ in vte_290 = callPackage ../development/libraries/vte/2.90.nix { }; vtk = callPackage ../development/libraries/vtk { - stdenv = gcc8Stdenv; + stdenv = if stdenv.isDarwin then stdenv else gcc8Stdenv; inherit (darwin) libobjc; inherit (darwin.apple_sdk.libs) xpc; inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices DiskArbitration -- cgit v1.2.3 From 3911336cc64828e1d2638c4e3fa437b888b0d238 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Mon, 4 May 2020 17:22:59 +0200 Subject: firefox-bin: 75.0 -> 76.0 --- .../browsers/firefox-bin/release_sources.nix | 770 ++++++++++----------- 1 file changed, 385 insertions(+), 385 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 997d6d98405..28a3c085a2f 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,965 +1,965 @@ { - version = "75.0"; + version = "76.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ach/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ach/firefox-76.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "654ce2cccf5b123e25509f71f4526f42052b3cd6eb79694de47f94363af4ab2b98b60d73020bf45c11d5aee9d0b3e246f72a7795cdf770f34a34f8c097d3cb5b"; + sha512 = "d1bd187497c76c624e010ec50a43e68bd91cdfded37f85e02047acdb53027c79c8071632f1a31f35f0a2b52eacf94c905984f2edb7b83e0a74fb0a0565eb18a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/af/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/af/firefox-76.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "615b948a59066bf7503d66a3fd574fa6523f85765f7e7f84d3929a78ef82b4833be6e810eeb95e266e3609e943703e1c84a0f7a26a542fb5e8a8bb0fcf379065"; + sha512 = "bd9e45046cb566cd3fc94eec9d5587b0270417d68091da1b29eca40645b2aff4f081c2a5b0292a0e06da410a64fd1f617543bf0702852a6fe424680fdf3ec39a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/an/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/an/firefox-76.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "070d250a2a22ae6b97efc618fb65fe93efe209b82aab53f9c13d20c3c8bf3fb9b84e209661d0322759a0dbed68e17c69ce6ef24a53d9dfd3186f1fd987e7c60c"; + sha512 = "d5df04a513a349291d629941e519617cdcdee1c004ec8bcc3c02bf02ad310dad2dc33878268d8a4a6b115b3b02bd558159a8eaddda48e83aca29f2a377225396"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ar/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ar/firefox-76.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "36f7e51b0a1b7eb1c5df858cd0e90c301c162bb0413882dc3e64ed1240b4c81fde26eb0d9f7d813ce92c8bbae1e87a98e97d4a6360d765fb32ffdd84298f7f37"; + sha512 = "753550131ee986f7a770f95959a26b24b17e0a6a5f2e12ec1b7d42b31886e32b9c93a559b7824cd5348f34f1fe26901f5198fca57ab2c9f412ce032882cf7b5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ast/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ast/firefox-76.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "693cc4eedc5ec9a058ecb618ef70b322bc55b5a6159f480b219807940061ec22c92843fd288252ef30341dc1e42d0ad63586f5b9f438011726dc5fe88ad6037e"; + sha512 = "8561ba0236a9524672c7ebacde935d4c3761fe2c5fc0125951d28f53c3d27388d48c108a6fa71064cbfa54cca57a72f6fb49b3b8314d28b875e250b218be4d55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/az/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/az/firefox-76.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "9d78aa451a95f5c26685b6065c93c77c7b3f14db6cbc57ceb0b868a30ce2a023d28063d4a14b5617f65c2ebcb6eab7d2ec6ba2eab0909e44ab3f25b2b69471df"; + sha512 = "53b7a939d02ccc0a809079070afd4db528a4cb617a4fbfaa58cca573450be764e3894caf3a40477903151f8116460dc574749f0edf9bfae6981616772b649703"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/be/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/be/firefox-76.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "6b898118e72cb2311d6230a2a151505c1927a35060bf703da6ce97a5d0735b06e56b163d5e5d4542931453923cf5e0afb9b527d2392e324a509da5185f2a2720"; + sha512 = "36658c05c6b7b1f64ffe14ded709dbc08f0236f99f9457964c15a36a4ebf8d73bf482ac2f8518927b2d66fc9a1ba19289db1855a6dbc7b9502c2a3c0137bd7ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/bg/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/bg/firefox-76.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "b9a12097e8312c099622c3f506c09507a9f3cb25e36f25967001c37f3840916f58c6693f272725ef3a35b22be916c3f4eea78b3bd0ea4a110647a0db53484cfd"; + sha512 = "890066ff182d6ce79cf0adf307a92a26ced29f633cbaaacd02eb5c1c3f0e2bc2de336a7b22fbb530ec85561d26dc44f93f2ce1f58843e1d87322badbdc92e8fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/bn/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/bn/firefox-76.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "b396e1e57c0e1cb7d554eb32ff4cd92db5458c5c232855bce42765aa2ab0d387ccd817f8a06624f84122f74dc1d5818992e9ca18138085a2f164ae3095485e14"; + sha512 = "c6f9bda8a95351d79ecfe1e138ace440aecee6c1dc5ad2d7c6d249e5277b75b27797cdcbfa1b8d3ec2a899974f555b8b20f7c38f03a7979ca917ab050feb6cfa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/br/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/br/firefox-76.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "3aa6fb9dc3300b38038873e5fb06e40f4e9adbf30aa6fc4f3cfa7ebc399bd94d3464081f304843e83d4478989874283a8ae1be5704d34f4e43b2a699aab31466"; + sha512 = "b15b1cd34dc4799836d67ce4ed8b166b54e21076313a2f726c7b872aeabbcc40a35c7f859cf78e0f17825fcad38b6d4dfaadf5d27ef89ebea8da0ce427492311"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/bs/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/bs/firefox-76.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "baf9e2909320fa15c70fc4a37e4e15a89726079d49d2a7edb72dcc4908b59cd8a8ae4917c1f4338063f5b85b119dfdd9c8d0480d71dd4fc45cca77ce465a3170"; + sha512 = "fee05346fed30422b79af7c0626a7763f404f8a3a2617bddd17b95434060bd1c47b47409a0147c130b51d08d98de2232abe8fc7ade9bc58cc1eeccaf0987aee7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ca-valencia/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ca-valencia/firefox-76.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "a3e16f4ef89e8ffa65981cee1ed53817dc2ed235f2f3f7b9ba035db92ccc58893b10f5719fa7c37a400bfb9da07309f788c142e36e5f7a91e286d7f0d9ec3092"; + sha512 = "beb5d44cabc7a80a0ceb4573e4e6fc2b554c6cc0ae38c9a5699d0d87d5f36aee892c4bee8ca1d103001b3305ef814f9a96a8fd63dc5b495363443f9abb4edc91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ca/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ca/firefox-76.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "a68a75844cf22ecccd407f0478bd38b3ed6f19cf8e6b32cef2c9e5e6d03eaa621b60be924a649c729b6cca3dbdeaf518f56676cb0bc295cb50ebb1038571e31b"; + sha512 = "1b8cc942602134a48e0d16a3244e97edafa133c74651ed4545f5e3eb515ad1881276cd2adc204e5c9cfd677dacec79030311483469174415199b9eb679729442"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/cak/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/cak/firefox-76.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "5759039f87134d0a1653d8175c53a0aa8a71379cc4aad75831282956711e4fe485e62040c3325f24684e2d676fe4208ec4319aa959cb29c9682847b35906589d"; + sha512 = "2738e924257a81bb1ff956a6717e6ef4769e96f5940bb0fad58030e3d2ce65e84ecb2807e6e04ca820eeba61bd386c85716112535cc28d2bd3c9e7a364c734b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/cs/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/cs/firefox-76.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "dcb7a5c9b89c524e61f7a99a2926099cb7ba088c7fbce82f3e8450b00554efc587dd7c4b757b6567519f0ec928edf50fcfd438367c37b48a3bff7d1ef66b4d51"; + sha512 = "3d58acd8bafbd11307ca58894992fcf8325a5679585d5c5e09e397b941019a8a8f7bc9b63997bcad2722e8cbba88715b789683b0428632e4ec4b728a36b54099"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/cy/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/cy/firefox-76.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "e788954f6ce821cc68afe9428c02823870533164b36123d7f7a9bce7a4d82392606d397713e8cf28b5360dc5897ca35bd3ff6aaaafbabb7fe5106462e8f687f2"; + sha512 = "aa7aa1b06c1a28e30b532d41b4cf3bbae26c42a24a63afb1999f421577afac4e4591b465b3e659ed5c9278b2c5d2c4c449a84fcfa69b451804d2a0470524ab04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/da/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/da/firefox-76.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "4a2da0b04a3f6cd6a5dff9c4d575d83b8ac195d815d4bc64e1bf59f5993c4b7e26fd56b81d7f0c5f6e5d084365b4d21477f7d554ab06a4f73400b8c484ad0fcc"; + sha512 = "48160d3a437dee94c1070e2742c6bde4a36811e8d2eae87d7c8450476b30b912bc9cbef8a5f7d917ad4be771eeede9d7fa9315e27b154f50049ce80f4911024d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/de/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/de/firefox-76.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "6dd27ff5b7eab20c2548cb0dded8e677334b58040ee4e15a0d1095cafaa209bdde069d03b87ea7133899093375d425621bce7a9a3816f62aa603e20304be56af"; + sha512 = "fc4d0ddd9649dd555b4abd4d90f9d6cff8fe7e702bcf5d2931565c469842f51ee215286f68802304868848f043e54c8224358c8f4060435a4674401d19bd6989"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/dsb/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/dsb/firefox-76.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "abff1c0ab591a1c2572e88c25c785f218bfb7b9d86c415f4390830f4d0e2ae97f9ba44d2f0a552356fcdc2d6ef9a238b6d00f1287132df60348728b63fa322bd"; + sha512 = "3cab1a498db5900b055a8bc6398e4dc9770657c41ba9bb6bf0f196566e9c535db99f02e5c51750e7c7185f2f0b1a26e84da51403775c33ef34915b43e3a8b27c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/el/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/el/firefox-76.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "9bfa5257fbefdc079f5d372d7feb3f52f52a33137367676e141a3aa57b5fde64a1e6d218a6cf9d81941a89fb3917edb5f1c4883796148fc63a32c55554538796"; + sha512 = "d099758283e38566a4d9db744590f42b5fd28de8e985c2f240096e158995da00711e97d6feb3979bac40a2ad57cf7876da37c4ba69f3467930415d87a2d10c50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/en-CA/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/en-CA/firefox-76.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "5b6ff6a0b422bd399a5ac2893e187e4f46c6afc106aed7177d3f3a6a9f72c5cf283a589ec589625deed0ce4e3d7d1d45cd9d8a6c7015c48b7187edeb1c07b129"; + sha512 = "442e60f0d132d96c58364e0d5f70e43ade8e6508f5d0a76b3d7e5c61bed0bffa5f9bc2096c89879dcb1681bc394699e39d3c31f2d02fa790dd8e38f1b406154c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/en-GB/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/en-GB/firefox-76.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "03e20bb7811ba53b2ae3f051279c478b4a240ad9ce0381e9a15daa8d04f15b11446456b05c84f41c3f628e3c7166ab2d19b8074c77b7f3190795cc4219be9be6"; + sha512 = "8c0d31a9123d8d8baf94f73505233786f7fd2ce721f8792f4cc1db337a1659badf08393a22159dcb9d8256e43f24661c3975e6a1f801e30d21bc54083f4da041"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/en-US/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/en-US/firefox-76.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "7cbe8df35f61d82115ca1e4db4dd2e17cc96ba74cdf4e5e48aa4c1f5bdadf4e8b612b6ab58a09ce1352129ccfa68043ae92836b175fc5c328c3696f1f3426107"; + sha512 = "993e5410a946f802a47d8167c83e767fa9973754cfc1365e4cc2698a25524dc27c83f3b202990744dd654d68226c601ad9608ecc49d2c3952e50967e20ece34a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/eo/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/eo/firefox-76.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "933a872f25c6377abe21e33fe56a3184e605e299369cf11b84c0fcf420336f119abdc9568eb81b1e51bb58228616cab4c7171cfb8f8e40329bffb377a455c832"; + sha512 = "c2021ecd345cc45fd26ccd8a75ee66cd1eeb506a8e0f6b9811b4149b6bb15121edcdc9a0825703db52beea61f7249f45d23fa3822a9f47701adbc2e86c7ccaa3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/es-AR/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/es-AR/firefox-76.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "5da5004a2985fce3a6dff5461f2c0fe174d3ad58e3dd37c4535edcd0883fad6f5a449f9f898c5bde5de3aebd9911e87e82c99bd48a06e9d953e38666e3f8fdee"; + sha512 = "c397cdeebd4527189b898db2640c1a5b8b5bd4fc1664ef384662136232b5dc21f7033686d2624ec421542d1140f46cc95c8364d47e1c89a8653d541fab52e28c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/es-CL/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/es-CL/firefox-76.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "c2acae33bbf335d871ef14e27d197f4378e8ad1a94b9ba2df28497e4a72fd554a1d9428692cbd7cd5e3147f575d7517dbca07b3edb5eaa66c390000e7cbf5a7d"; + sha512 = "86940cd36df65d0515634c7abe6c7c81157a8bd3576acd9844784041c2239d25aa455da2fc33ba9b8cac0e5a840546dda0cc04765589dab0608ebe9b3cd53967"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/es-ES/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/es-ES/firefox-76.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "ce8ca7ce217bde7b42c9ce6d64874d37306754ccfd61f0b61c898e22f84feba6e30a33468b9766ad96f5ae8e6e674eab93881f36ded52f010216d8efa5f77907"; + sha512 = "9a1404626e2b9716567e0c1b0a7d681acfc47bd488fcc585172fb40c4d18dc1bdd4356244c74d042ad085e0300aff73ff7619d651658655bdf7d668f64e72a3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/es-MX/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/es-MX/firefox-76.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "fe32f01fcc01ccefaf7207fdc56da4450fd17928185382cd738d7a22425b5c3761ef60d0a9f7d35d314d0b7884859d614f08903eb20fb0a679f27dd1f4b136b2"; + sha512 = "870b2b135ffe3ece3ef4d16abc74d469421742bb32fe8b0add3a39dbd580aa07e251df4137f3a2950d6992cefcf0eaff162959ad5eeeb7e493c016769ad2751d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/et/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/et/firefox-76.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "fc1855e6c7bc19f181c7e87909a79e1a5d08ce1fd38f52d65e20331daec8af8b54c1bb7f90eb1c3e53c900f141ae264f55895f6fdd3690a83945a26707eec27d"; + sha512 = "d20a3c1cb0649406d9cfcc22bffb4dacdee124b68c210ff25b1316be76a1ec26b7b9f21ee8d208cb7a6f1f733ae71b70af3fe084b92640cce03989f4d45cc375"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/eu/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/eu/firefox-76.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "a285ac60590113e41f04a85183038ad02f0d7e24fb42fe1a7b313eb6d3fb5b747ac5f90364278f7c8cc3f35d0ddc86c0bfbc7f7fa7ed2adc56ef6c77c5b25ad8"; + sha512 = "fcc4a18ab042f31153e1f5a4d090c920e687687ae8be4259394a771c839e8af167efdf9b0a3cd8ae80f15e70300d24ca894ec1381bd91738b7a5c1160dcf8eac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/fa/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/fa/firefox-76.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "84ee3198ca0cd8a3b20f4c696f6c08b94d35f9346e4443e1d6d6ef447d94a20fa1d58488a12124440290c4ae00ae827ee59c0cbdb7905210bdfca0c012f7e01c"; + sha512 = "7ce0bce00836d4497a440f3c66421cbab38f5b856a8b0e3dea13b88c167b689a061be7261d9daed1ddebd23f21eb806fbe72c7cf08a2f49c31ea1486287404b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ff/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ff/firefox-76.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "f3b615fc63b12ade11fad5b5532d81741147156ae84d08b1bc3c0f43f2c204993601e1bb363ce7e3ed7ed3a5d790428ca51e3cb5decf56f159bf7a25e2e43a83"; + sha512 = "41c0639955bb82c8042e0cd9e76c6c6b30c5baf8f94206f1932e8a56cbc21a2de53fc9b31b6dec656822e215d11259a7b2dc158e58d1edce48dbe41f2cda4098"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/fi/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/fi/firefox-76.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "b629b55fe05c53ef814b091ff5222704afb3802630a5f44047bcaa17f8140c834725eff9e51786e55336910c462ac07b956878b551a5a48190b1ccd2904e57dd"; + sha512 = "540f26080c0b85b71e40bb0eb5acd92d8b71cd9ad8dbe72121225afc2b9821519ed6a2d2bc58cc77b445c3fa42ac6e39647c1da8c8a8935617995dcb0376b9d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/fr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/fr/firefox-76.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "1794f58a31e91916492319091437ad9e5bbed95b3925854f744e6e635e9fb4c06abe73f9fed429fd04027c12cc29b63363e60a0c099640226a5a626a428b3002"; + sha512 = "ccf845aec06d7274acc7a850702e2dbfe69db8198a44537f7f0eef6b65bdf0cb71682b2a443f0e6a5e8ff310922bd29c39229813cd12ba54f70c0fa3418ff23a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/fy-NL/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/fy-NL/firefox-76.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "3aa9f95eeeadd81d0ecfa93b1df9b1b455425f430968395bfe65e60a65c6aed3d9316f842673c2638acffedfbf1d93940086f6b7a113496c7d8e580aecd8f25d"; + sha512 = "5eca2e853a3458f5adf0a960cc7ec4f21db344e67e7e419ca19d34b807809bd0c954ae4011b5ee73b02d9ef88686ac57f2a0d1d3af43e6a4def2031b698cd656"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ga-IE/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ga-IE/firefox-76.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "43bb9830e38dddcc59480a7e162214e37ca3516cfa0d773c4851ec60f098837ea2849917eb460ae7e388612619b13cf29d26d9b1908a8734b6fde1add36c65bc"; + sha512 = "4ceee43db5cbd6ef5b18442cba0c7c74998129280e14b20ad41de041b3053b518fe77767a7aed9c62fa2467b2d6ac36a680e276d79edbc959313b260950f7c8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/gd/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/gd/firefox-76.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "8cf151995af5ebfaf9f713dc7373b9ff3d12ce582c4fd062741eb99e291aec68fe636d871709ee0a0bd628af0e9f1a412a12289c539334783c7a5d6b6b0d4822"; + sha512 = "9a5115acf49a15e10a530041029081eff7bd7a6877dac1331391d5321533083162be0dbc5dcede2bb708d8a54d47af3773c89e498d8c7d99c28f7229747c0721"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/gl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/gl/firefox-76.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "da133c0af8546ab62c335faded8b35f917af2cc7fafac8cd22db1e3a867b390de60a2bc15adc7687044702907a675eee42b049cde335d41a55894537dd137fd0"; + sha512 = "435de08a8d536491b645d630e81bd9190b61e0073c3b170977a995f9599b0ebd0fe4a18279f0ef40ca242e854fd43ea36dab41a86a73c515a691b621f8b74ae2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/gn/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/gn/firefox-76.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "a1f6063560d70f81cab8d40f1f0e28ea866f284ec94a0093fe874c96795ad3e823c202e82dee2de7578f3ffc1231ac0e8bdcc1a21c44107cb1d4ab56cb56effe"; + sha512 = "e4e4d05239306cbc0f91cf6d1eb890af45c40fff8ac53fa47c6dde6dbaa583d31b6e5e51bfac91d2fddba9f89e51125235b11f766ebc39ec5e55da65e1ba732d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/gu-IN/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/gu-IN/firefox-76.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "60123058d668641a6c48a7a6a4247337515493267b3489a16e9f7fa2d0ab1ed8a5382974705a156fc041501560b8f6a2be3a97b47ebfdb5f6f527e63ac5acbcd"; + sha512 = "727b7db843fc1722cb5d837e02388170d06f8c6ef42aba22dde9e237808e5404820c8b14dd43ec5cf2ddfcdf4883bd678d5c9aeb2845e428c096382d8a805afa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/he/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/he/firefox-76.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "7693bad7f6505cfd1718e8268611133d26826adc49003eeb6d30bf38ddc1908c39ec270b80e20463c016e4b367ea8035dc8c9707b410299581e1b09df7a08df0"; + sha512 = "c151a281f8aaaf82a0021c20af2d12332674b27f2e5ac9c0ffea070c5c350f96de978a1662b5886f1d3b1d514061747f247ae3ebbd965e3ce940a2494c164243"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/hi-IN/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/hi-IN/firefox-76.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "f5b58f3507852cb2d900d1398c934bb8de725b3578d1037d424f5b81d7cf2e0a247e6be50037e027649dece8cae55c579f81205259c93f22eefb2d67af8b0d57"; + sha512 = "5048f072162e3b2cbfbcc24885aec83599a7c47bad212fbae741fa15b903014a9e29b362f1492b42341498398b009e5d929de0801a22b4333093f9057c47b42c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/hr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/hr/firefox-76.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "6504e82cb541bcc9a893c5adcc063a8de3b85e68329d3e5dee0a461a0c614b330d7b59b6f3fa0195a01d69ee011017bdf999f95fbb19ad25136b291feef1ccb3"; + sha512 = "ebd9c280598ebec64a230f6711d4d7839feb005d790c0660fe789e129a1acba78e170686eff21e0bad558dc7e9b0dc98a9139b7fff2426d9050ec0b3ed3e815b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/hsb/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/hsb/firefox-76.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "6d0828ce7c721aecdc66a1df441cd7ad43a1e96487797a414a5a9843bbee6edc1ad2aa23d82edac7b2bb1264a0880b1852bf2cbab184ac1f5f91da99fb4bb06d"; + sha512 = "197ea2000df14ad17191e2e7eaf54bf7bd1df21fbd25c0e18b200d2c43686c4e256be329f57254422a8e156917ea3bf312a38e332b72596b5b93b97f61319be2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/hu/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/hu/firefox-76.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "a252051af8e299e6b21e9d601e54cbb0413d73eebce693403b522354cb0b6ceb240ef70b50c99ab55379d2a99a0f268483e2b0a02da3f9684a5b7a958b732cd1"; + sha512 = "ce3b86d39f27f1a5f2287cb88bb45be0b70ca8adf7e814e3fd5191fd41ab7e33c427d8ee0d4f5c7c5b279e2079e318239aa3485771bd2f211c9f1ae2e654fc5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/hy-AM/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/hy-AM/firefox-76.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "aca7eb55987d98d69f024ac41414fc9394c8f05949bde1880d191c3b09bdea4798baedb4a92119faf923e5a36c760360d87ecfadc771a57f6425302483b6dd08"; + sha512 = "022053cf588d2f7aebb564342068d4bf3763dde50f3bbcf433dd2d7e5d90ecb134f9302b44f5bdcc84f56e74c7c965555e931ac7b6d85ce58dafe838026a91b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ia/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ia/firefox-76.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "e23d26cd4f7cd40610ca841fd2b8be72f199eb2102560002c419fb6f00b1f2fffcf5fad6fd06c6e7a0146d2b7525c006e6dc696271f4bd4f5bb3bcefb8980e9a"; + sha512 = "bd57679165653b1557569d20eaa3ca83011e5704b76e3f29730e91d2c7a5fb553ab3563a1f26d38100ff8330d7efbbd133e959c4ae5c534da2e0888dac12ca5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/id/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/id/firefox-76.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "f8ecfe334dbcf6598cc2241c56d6496ccf0755494d11c26e2624803d3f1a6001944d8c9b78c62bd8bdac85fc3d1e60b90212b8bd8b2842e0faf6824a1651a31d"; + sha512 = "72a391de2d665db794e5624f341245a85a85c45d8d2f3c71bcf526b273bbf1a06cdfca5e9d45ec05627570ee496e0899fd7756066f6f40a86df088c4e5025ac2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/is/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/is/firefox-76.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "9ce50d9746bcf6384627a83538a0e023091b7f264c6364e88de2bd8ebed0e081e1d31681ae0679d2a88f462bf9e04d7e9cd07826822cff3db1a1d338816875ac"; + sha512 = "8707e9ea8665b0f2f773c98b7c457c00c99528676afaebd56570fea1460b11ac016ca257f10397e447581a3a8966db671bf33634255c015104c8435c067fbce3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/it/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/it/firefox-76.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "9284d8657a4097696523cc07217908449102f46dba9564f98b2e4889707082be4cf285f889f650ceaa92e06f564daa19691dfcfe95b0b4a865987b767665b837"; + sha512 = "10d74b74ca47e406919ac9589937ecadc55b637678f895d6bb3700aa072c261416591378845fcc2f032755da08a4e996c726fa1694b18883feb9fb90a36ab71e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ja/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ja/firefox-76.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "68bfe86b27d5d5d71121735a627e29964b2c3dd70e33e12f8ce3a9d380d253c33bede8d33eb7f0185acc68deb388b731ae6b40c7d71ac49c6fb5ee60e44e787c"; + sha512 = "9d7d45b0e1ef893145bce37a137e648b6292febbb08e66a0f0e8b6e9765e19ed3e864483c3892d327f3c75a4f73592a5cb2957ff6c17b20d19bf18179df5b083"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ka/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ka/firefox-76.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "b784f5fcc063c98481ee3eae767eb3df60c9ba4464fbb612cd10bbdf1abf54f5b2098700345f2494358de1ced339f1fade979ab6603f036e4a2f76b25c46a33e"; + sha512 = "22730ebd0eec5fe1c9f993c8964c81b31d2bce1b1b7ba901c3a7911d9544659e459fdd19024bb551169d17c9430e15a92c039969379da28a49db2f0b04d799c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/kab/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/kab/firefox-76.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "ac26df50c827efe7fecac013ae417a4b68d2a49062ec9fd443f5ff6d47646333ccbf6a98e92e0c8c2d5aa293b170336752c92d33999e41e3ed163292a6bf3d0b"; + sha512 = "e7455deffe566f95239e6b1b6eb5a4b20d849ff9f0fa26518d993581b5e76975e41a5bdb54f69be7ff182437ceca868779b67c6a6c118155569dd8792793979e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/kk/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/kk/firefox-76.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "47e516fc9fbba8e5b57fa3172df29fccf8d318fe1431233c2d70c5c657d40f2a8af1b20daf5e3d6b3978ee093b1d100dbf7ef8838385791b58ce5463d6899946"; + sha512 = "56e36532e5babf3682edf5f278b971897cbd4854b0864dde5aedffa6a7828048557dee5992f9eabdfdb67c2054abc0dc2e5d0df8ec5882b07d8b266183177e06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/km/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/km/firefox-76.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "ae0baee8e59fc4d44ebf57d7f708d3f30126989e4bd32309d8daa4478facfa4a929a96972acfb248eab0a1e04597b2dd521a4fee40f748fb0a4f6108220464de"; + sha512 = "6d1ef5fb7b555d667bc1ced25b7ef49f8832b9c077b113db79ff8509d845d693af33bcccf4039805fc0c69293139a22f24ea3294706097ebde859cd0f9aae8bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/kn/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/kn/firefox-76.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "c0c37e1b36408b0d8a4d34fbba254a6d6b37c80287ddc4abce88a623ba3fd5b92108509bee27bbee500abfc08d364886ce8ed5b816b9450aacd127aeba39df94"; + sha512 = "04626f922214d666f1da224b2ba52960f1697ff76a0b40f92718c536eb07de6b319700566a9c3d702e50b137d54b7a75af474bdf56d39bf80165b8430b636944"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ko/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ko/firefox-76.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "8867aa119becc3e88c63096c5ebfb2bea3a396cbbbc18f35725d5983df098543827bf6c069292322507b871263f744ffb411a59437687780a9dcafd276d04410"; + sha512 = "e83f42c7c24b5a0536510ee736114d8e8ab6c6393ce63ca9e2f9d0e0216831b192781d0617e9793c6a8b687429275eafa6f84a8839900858412abff751256a4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/lij/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/lij/firefox-76.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "c10c9dbcbd911c3ce324aef23629f37df959797128fcea7373f3d77fb8b3d538850aed797e754bd15edf59e666412158bcee2c1a9ce8d040d1b457de9ee007f1"; + sha512 = "524261eaf2fd311f92d85df46459bba17b06ca4e1a61a14453c9edbf37c31b1de2d781d466812c250353546bbde2044c79626840297c76a3986fc6ef869db863"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/lt/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/lt/firefox-76.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "58517b58ac3c51c5aa2fddc0b5a458d100d3eec44e51c6d188a85c2e7538caf37cabb1440f4ebdc97d54d3677697a5fe07235d67ddc5c4287bcef10f9b7dc3bc"; + sha512 = "f9c0665c4f4fa6f4a8f0fcc02b92c88d0c9eefcc7b018dd54c605c6b0f024282e25645ddf14cb2bc82827f7c4c8191a83c38d4d749af45db07bb81df99ec6d44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/lv/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/lv/firefox-76.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "9e07357febaa5b67eafa435d30a2a8f75f2ad25d1e87968cf71b8a265a647ea0020169d6f2cd77c4779dff905774664f84ad26fbcc8b9d4c986dfad52000e175"; + sha512 = "b89f91a5223a2431ea272115b18fba29491d60ab5e0a69af4a1152644596b477876a7c8109ba08c5210b782ad11ddd2b65c775a4fe8cba1126b21cf31e31d1e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/mk/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/mk/firefox-76.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "249c45bf3f1b22e355bcfb4f5afa829163d8d1d72a8f192111eff2158b10585152c9c2dcb2fbc9ce66d8351d83d83236a04b42da4607fad92d2b4e25acdd39a4"; + sha512 = "f10771c9b2f8634259b7252488e4fd3f9b249b33ab59ce9a02c77d0c4cdc5c567222a91271d4cf3949decd86602613e9fcf9e5e8a403f91255ad8a69bf2351dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/mr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/mr/firefox-76.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "b5860b41a310cddc4dc81074f01deffdbd10ec3f682aaf3d27881f8c190cf5ba39c428b7bae688301f8fb40ca12b3cfdd9377501a3e750ce8995e1331fc015ed"; + sha512 = "49bf1846a330c4d43d554f048bc1c5061c1059d62c57ffa224d19b3b4b2fdc806be73e6bea8409763be182b37ab6a1243652c62f5f3e48a36c3443f509a06c56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ms/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ms/firefox-76.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "a1b88f527ce9e4d9f69d4b727313a68432db2d989d360fe5716f896d61e7dc098667720a2c60e33612b43157566f95abe6f1b149f7aa507a9738753e6c3213bd"; + sha512 = "018622ef6cec81de014191bf94f88aa1a7ce732324f70a1524e3866e5500ee93dc6ac48dff4603b2f86b909301ebd2440ab87bf976cf041f6f8ecc4bc7da25fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/my/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/my/firefox-76.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "74efc375475884fb9bfa9fa4d944dde0f6c734d1c73676d37b80a909618773147f12faa94ed6570a6aab6652c4c5c32cf386ac096acc025ba6c8440d8d345026"; + sha512 = "24685648158e9da5e74bba611884c3d260e7bad4eb3b6b2e70cf57f15d505b87a7886868e88bfaf440f03f37f7da04fb6fcaa5947ac6ecb62a987b24e0be5759"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/nb-NO/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/nb-NO/firefox-76.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "c1d4eafece0ba52022c96fd939651ad047e942fd9128dd8c6bada79f2d0eba01311b4829c805eafbbcc53ec4dee34d14e015742a86ec67de07d84d6950fff41e"; + sha512 = "4fd040d08c704cbcade0a290020d591fc265bcbf63467f93c58603a3f96af06cb3b38d03aae5a32b4b78fe2c4f89ef81112a69bf539fa052b721f549423b42d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ne-NP/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ne-NP/firefox-76.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "a97b467bd40e1564973b18ad6acb10412da67184daaad25c34b84ec2a8f3a840f01fe4b9720f4774a546a7e035338d9ce297eeb882a3df2b50f6a9cffa2bee13"; + sha512 = "0708208411de209aad6a692dc1b867011d589f2fe1e60dbb5c8448f96735d811aca6a444f7a3ae2d93a2953965b57a728e3af1b2a31ff8c86d1941a21ac2147a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/nl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/nl/firefox-76.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "2d84393b851618e1742616ab6f3b1fb21b7f00cd65a98438cf3a1250275b7b184f6eb0cdb1d1425293d1ecbcf4591fba392283596146a5b18f29166111cd8844"; + sha512 = "2c6df617fe9e4c3ba1940aa86e313fa4a5e64db98f4df9abdcef2a5e7832e8586e939646e435c9725e5b97ec80da0f987b620a78faaf445c374a46cdda862f23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/nn-NO/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/nn-NO/firefox-76.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "c5782ddf73e00481ed338ccc989b2c2760f15e2b2960457cd3cf6403d6d3ad5d1b5d34cc6194b3a1ddc83df8d376796802d4e945b8ab47b7b7e1a4d5a4387a6e"; + sha512 = "5f02a673edacd9e9e9171c7324b3b45974bc5374fc5a05835a450b6aad1219dc76ee50dd4084243523fc3e10e7b65a51f33e33009f4393f790a9a8430442d87f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/oc/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/oc/firefox-76.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "cd3a3fde21ab21e08467ebbb45d0a2d32cb901c2b6807edd6298eb75bc089684f9fd26c0741295f2ea82c2e25cb375bcd1e45e26c267c59d12d285a00f0d0b74"; + sha512 = "cf24d386d8ad5a927e86929d053eebaf03be667bee4a4d0a85a76b6030e85f254b8e9b14091cb17ce3082890affa2c75ae2c1c0da8e007fed5189c9c2fb3b95a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/pa-IN/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/pa-IN/firefox-76.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "546e36c717f8a0c216c32f53cb56d2fb709702052bd52ac1184860c7cd755f9f0d657b8955c3f6347c37d382600ff9cf5add261dd066e8881e6a3e410fea151d"; + sha512 = "1a8f07e70425bc65552fa82a16eb4009e036de60a6b84aacf7a4d47c2763b00b116f61fb87aa2a5dc28d2e09a82dc3621470b5589b3fba449e2eadf2996686aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/pl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/pl/firefox-76.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "837bde42f6b9c1aaca794be4fcf819fcee3e3456a883743882ed6983e71f98ba25e02292bb01811958a9f21cedac55586deb8066f52939971c348e21ef5ab75d"; + sha512 = "ba8dcd5ad68f8506d4c637be831365fe230209ef58640da8bfec20cde9447daab678229e0a82931c022aa0c6fecdd0e405e92a4bfd51d7627235b689aa78c555"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/pt-BR/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/pt-BR/firefox-76.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "81a2620aee0f210782aba431e7e9e15ab2a0db49489aa61cf7a6af5944e59c62f38b65aafb198355d5d49aa5c52e1052ba60c03b1772916a972ed06aad616f25"; + sha512 = "fa1f67341221a907f24ce2953fd75a0003c04540a7673173fdc333081c82c24e68c0fcaa85e10264435a9540e356e94f0b4d5b38d892821bd307530ee10f9b7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/pt-PT/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/pt-PT/firefox-76.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "c6b317d17a14c5d5d428410f7e86c7b9089442bcbefdf1a44875373390d649b2f7eff26c09c5cb32fd2f8f42293d289044a7007dae4b075bb1fc522b63f4b18a"; + sha512 = "c282b71b30ee4f2f67d98551eaeb1700d2867e8ae1f19dad417f8774b8a91db63ecc14c37712910b7476e837c4c23f4871a20d2afe37f61ba4ba0ca4b1684569"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/rm/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/rm/firefox-76.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "12e6c10fcc9419a66aef11e50969fc6adc7084db46d2cc6202a08e1a7225b797fdcdebbfb9dff6a441e3fcc782cb33753361ef37767e5ccff35af2efefd82256"; + sha512 = "70cd918ccbeade126f36dee76600f7c6e78ec3291a12e6d60f684dbf5fba322bb7ab847cda9f101af5b48d9b0374573e8f6295dd8683ff3acf9a89512117d054"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ro/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ro/firefox-76.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "c03df00b865bec9765d28bf0171a5eb6a57e3c8cd64a9002f17bf67d4d0c118414d6b25a782aa3eaca50d5997203c40e376562f64a252aac4b26fd8419872feb"; + sha512 = "acf9a4914255bdde374ecdd77b39190c945621c51ab13b2d9e1e8b1655df593c6c7e174113d89e8b1afd223e6a0f63560ef4d991706d5f23db35a939ddf793da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ru/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ru/firefox-76.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "418b70ec07a966a51c101e9ae341b0c949476452b75ed00677ee87b032d592fef65e6ce746004deb0d89b94cf9e2d18ffaf1d388026bb5024dff0994dc2fb058"; + sha512 = "9457048e428958b55ae221471cfb2874ca16ea9c1e34a33d538b9964e6ed77711283207106814f6d18ab73f8c690e6c20b2c84d361242b228cc92c7ddb675a27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/si/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/si/firefox-76.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "5adc26e616a8116fcd5b9579acccbb402fc5c88ac334cbbaca2da48e246c7e44868b6454c75bea355f5cbf6a182346efeb50f7a49b2c3f92c8fa988d50e19e52"; + sha512 = "897b488d3ba0592b902f2cdc4eeb2f454b9b6f67fb5e4c583f5f49fb062483ce1d30e64f6273894c698406f8be7dd8a2af02a67e8d9bf47f8d30a572fb18e7c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/sk/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/sk/firefox-76.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "d173c26b5ba44a98070fff9996efc5a35a3ad90de128c5345a996c83d4a68ca7d09e588bd75530c31abedd9f20f38561e22484a45e20fdf66f1cce682dfbc31a"; + sha512 = "2847545533829f45c22b85368c5fe262e2a43cef0e5d480a540ca47f0dacc8003b8e155b11098944c7012b03feb8ddca216649f645c46da0975183f42580e285"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/sl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/sl/firefox-76.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "1b16278f2f6e4df7cd437a7bb6a17b950540dfed646e948585cf0bdeba45630b4d5bdfc249d4fb49bf37dcde8a415053ef4ac3384c2534592ba189264bcf4e0b"; + sha512 = "9b0223b409774a62216c97e522696700dd95b65e1755d889d58137602fe4302d8f5280464636d94c97cfdde8c56e49492005e487730b591d19bc947271754e1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/son/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/son/firefox-76.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "7e9c5c578d9669f47f3871a4d47e211d2ec9215633163605239603c0fc51cce1d1d4b5c3c5a06a9c29c16f82c3ff2583fef1b78652c8afbf093557375e912430"; + sha512 = "097ff1df64b7ef62eee3a29672447c42c46dc23741ebe87365c4d41159052ba3560f7a10956dbae6b67daaf80607600d2241dd997573b8ef8c54fa94f064e629"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/sq/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/sq/firefox-76.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "09dd8df3e07b2bcc59e77c55ff4f9b607c5c2cd343d784a3bfe172cc09fe0fa31ea519bdf671206a16ae73fa9550f08b77cfda0e030dac455de4be16750ce431"; + sha512 = "8a76a933f261708504fb637a93bf4d600514558f08832ceae8db23a404e5d911ef23803436e5513a4b7e4cb85f536e64c5ed801457ad2e1f9c559dfd1f8be807"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/sr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/sr/firefox-76.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "5a4dc12d716185ea86a8f31018198dc4eae0f791b04a247d2f2807d88747fd52fa39904bcd440c9da2e0225e64445c20da7cd7df75198c173a39aba59326e613"; + sha512 = "bf7d631608e91989a8cb63cc07b8e253cc2c764e9f712eb113c7b735bbe2da04ddcc91d43fc418eb208a75f4027256cfb10d15c21e82b7e3eea096ce6fce9a5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/sv-SE/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/sv-SE/firefox-76.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "7082fcd2db01626e90e6850230b0a2b51c0eb394d47604a76de5d03e30997366f7331a7247e7610dbddb16f50c2a3259a842be248614fd3725f0063138e18d49"; + sha512 = "cfec4b5942c193b37e881569de1d40907d44b7ffdd6a08fdc3dc44ad27151427de0e368a08e4888d9248e07fda8de54f1b7d1eb3e106f0cb41c7fa1a8e4acb10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ta/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ta/firefox-76.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "a85ff07912d369b915d543f9d06cf383a180bd14fd9355fce6d918506d8191da6f89c32fade5a9146700a95dbaa4a181fb513df1b8f28aeb7a09641baeece0ec"; + sha512 = "8f487289fff43075239d79d1d4b8b0e9e7a645a8dca26eff58ec32e534a870b5b67232ea6d43dc58b1b4bae9be8af65793f185e4b5747d9c374fe7802b92c9b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/te/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/te/firefox-76.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "5313549c22fba2a3bad6550a000e59c15595dc0bd684a14ba025fe2c4de9097a1dd47566b8f256f569b74a21d20538ae89182d5278af01c674f50e00d49c873a"; + sha512 = "a3ed83d4c34fe6d24c2d33c490d6d2de6fe56382bb87807f530bef967c25bfb9a00a1958ca13f2936357e3f1d75b029dd2bb89a13171574bc022f7da8b4f49f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/th/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/th/firefox-76.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "3f2b038b17553c962d2d964d342bb0884dc4acb4204fddfa90f8ed3dceba1aac40d537745aa32629402a7077a97cb01efd1225009ccef5412e14fd08d2aefeee"; + sha512 = "54c9f36ff4f00f1bfa3f947930988ce6985bf4e2682613a8368ab60d07abd02d3171cd2457987b2bcdd7d0929003580af9e4683b7e0f529b1ff3661004aafff7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/tl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/tl/firefox-76.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "1bd4ac5a59a06a71fc5bdf976e76da9535d0adb74da0aad922ce5ff6101bc48a7e6727c3f2d37161e1ae48be2ec47c2b7f6cb614a883739a8fa843fc5a5602b4"; + sha512 = "6dd5f5908e9ca66b7ab9e132dd6db3c5c2ea2e28eb9de211ceb6d2736746fcd50408cd327f098ffe1beb57199af6b60827bc11614c4c781d109ff315ccf9d7c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/tr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/tr/firefox-76.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "817d6e54c256d72469f5e1c6f6ffd8d95669193c3506a36d9cf06756847e074be018ad6dac9ff8e91c7720cc70811df2768124e4df85f34f2963a6a64e9f7d26"; + sha512 = "0222ab139a87a195fcc4489a2d2b1024e95b4b76d4ffd8c63408ab3f4c9ea0e4be019a57e31ef3eee3216fb0217c01cd92cbab9ea33b2d7f0a4660326dd0b8ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/trs/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/trs/firefox-76.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "f3d691e6f04658aa09b4f864f0adabc9c8dd6a2fc135065126ef124f025a5ce6768ac9792470d60fb436f8d21229a92e1acb6abc848b3b84a2026179c15ae1cd"; + sha512 = "a50634af2bb7d9cdd8ae8fd268b2bd5f24bbe68e7bfcb810e51921a56db7f831e84e73f93001a12f83a269a27df956df03e70aaf6231925b08399bc54aa71de7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/uk/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/uk/firefox-76.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "679b75df8c1d2d84a7cf9950a65869484cdd20b0a1c016007280d08782c2ae2ef393bc553fa5c3c85177bbf922e62158fd57bab43b222327048753934aff5bfa"; + sha512 = "9e32876027449c3b145cf7088b5b9bf7d941d3086f6d1da1dd13f3f06138b1c7c375dd7561d9342dd7a1aad1adae6da3a2f354927be1318eb79703753dbb0d00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ur/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ur/firefox-76.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "e4408eb34923ec1f668b7313ade263d1cdfacf1a748b32a6aa54c3c38886c8e1ea750179b0fb6dd41dc92fb419c9307aa2f32a7acce7248e460fe136af7f175b"; + sha512 = "f4331e2c47373a612083697f4a693d7c05edda3f08518642617aa274e735f7a64ac49f28a0c1681addfe488107367377757b12dedae49a14a4752ca726d0fe02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/uz/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/uz/firefox-76.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "30a9c63cab66e47ba4b7f8bad3b798e720d3668f44f230581c564e8887b6674d2df90b8534a1d9b28684b07f1b928585a4c4b46edf1e740e3541b60b5607758c"; + sha512 = "ba7a39e9f8537bb5fff9253d01b3fb2a0c815c3d93fda024d1da6dffcaf313e7c75068c302887355b0e1b498157917be5f290fe81a2c30f8303c33ae2f23d9fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/vi/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/vi/firefox-76.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "dea4cc3161f0d1a79f91b8eaa426a6fd8ee045d843261e7a2191bbe7addc9fa131b2d9455925381957f90e91145711be13fdc3957ec4bd8fddb8252b6f8bba3e"; + sha512 = "4382a78302dac11f2ec626627c65c528d756364b8332c0124cbfd45ce9ae226d4b42eddf723e306a1b1e0b7bb3fe70c9efd3019f91993ac2e140492900fc0ab0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/xh/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/xh/firefox-76.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "d1fa435a17e23f3228a767733e54d24ba000599822fdb507d3a6dc35d92485bb87a3a398c12750080f79ea7e81dcf74dc73cc1747f923c0015f4875bdf3e75c3"; + sha512 = "b23a1f3b7fa906fd6dc25638d8cafdf3adfe63346fdcdcf878b9f0f98c8803631fa608fd75086aa7808fa0d4730ea7a89998e2d695b2d1f140a178f14294d318"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/zh-CN/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/zh-CN/firefox-76.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "5e236fd89a0c099da13c65c00526e93d152258049f9b7c8ff0387ce0ed6b843504163ef82cc205b01e0a0f265602b2d6ca64aa04c811cc0a6e94d1a8dc952e9b"; + sha512 = "b73405a8872f079f5f69cbd9fd69aa60e614a0e22f1f933be9a8a9e7312fca362549f57af17629548694e92679c763786978fb572faf4f9f6cb72d64b2661d60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/zh-TW/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/zh-TW/firefox-76.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "5b6b876f3dc8c2bd22ebb183cd4ee16a9157e14d93951e840d14a11a4067f85975c72873b82e49d797f7e67c00df6898e423a70360558838e8a18d95377af4ce"; + sha512 = "0069f82c583d88e9630fcb70c481969ada68a7ce919c4f5ab12ee442ca77f69d15179a46e5f2e7850a6686bcd6cd896f2e03163ddaa7e88affe6d62856d1fde6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ach/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ach/firefox-76.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "33ab7bae767308f01bb5d0a5bf7ad73fee8eec71d8393246b704702b81b46240cdbf02c041753e1910bd8171e36f380c77a21afa2f71926f25dcadcb2d6c2b2b"; + sha512 = "1e81c77813d8f489ca2d2d75dcf74ef1085ddb367df885c2d25cc7051d759f26685da89860f67920a49ae4331762be74fbd2293bc2a6e0549187ed8fde643d4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/af/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/af/firefox-76.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "83842f5ca120205597b6eaa5f03e2f1d720a91cf3323fd44723c79c9aa3bb73e2c31054665fb32300f6ce707363a32d5d34859d7407015d3b4456c831b290ecc"; + sha512 = "a753254f0e302af7aea86499c1b03cec34a83691eff48231840a20c0afff1c595fab893d804b83aa0964eb5e570185102a701d31c668764d58c4715b3d0feeea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/an/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/an/firefox-76.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "2d53551b4918ce86842645492072db26fdc50fd4eaa4edffaecf04fbd83bc597c469a5d795c62aaffba4abfd3d130752d96739fdeeb82970c35826d005af16cd"; + sha512 = "e1fa38d89cdc7d7c9a01f8de5ee19316b1ddbdce1f4f868e8ce1bbbf22e68b8f741246a5ba4f2a4e67c959b9575c73acd7b88e918e3be5fa285dc5ed42e9af61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ar/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ar/firefox-76.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "1e42d930aa9903adf8385b695bd1a3aa051d51ad494d1dffc5d2bc04ba95574472daba608c182332195d7d60069b045f2a5c5762b7505e14ed7a639086fef264"; + sha512 = "10270f9783b09b09fd7f43b8f3c4196d332644820796b097ca219819e81bd5fe23ffcd4df988d3f2f3d59fd005e38feece57b7dedb84a78aac6af7965e73421c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ast/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ast/firefox-76.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "d52c316d21089535252ca626b6774b65e5994a62732203200a39605d7a5bace9c681d1f120e1425936be212a9ac871c24f739dd7d91c0f371029083e3d3afde8"; + sha512 = "1df6b8b479fe391bd128cd9b175ddc233b19b61b3f538ee75ba7728a4b59e4cf1ec09bd9576f82df66e89048b62ebd9cd2206038a0387492cf7b1994c36d84b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/az/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/az/firefox-76.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "121c1e51d5b58f9ac912d0737c23ec34471a4c8fe99287606a350e70890edf23b28c9c145d8aa0d29d567753d047d484a0156c1f004228682a347145c1bd85af"; + sha512 = "81305694cb1601b45d09aedb7bf6c0ecdda500c95209abaa00feb2cd2aaa1f5d86f5bb18933f00cbb5a6b676710db4e96495b17141cc62dea06c26483d90976f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/be/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/be/firefox-76.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "f7c3039db50db23a43575e5ecda63643214731703179a42007b2ae44ea20649dc9629bce1f9738f35a882841666b1c3a0ff4bcfc38ed0e5005bb2b6b058b44a5"; + sha512 = "13e5c72791ccc0ee12844d8a9ffdb5ac60a2a9d79bb3f25818f4f1b3b606137b5eb3c8911f81d654028cef48a00d9cf10841465c7fe0304000357c62d964ec44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/bg/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/bg/firefox-76.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "d9853f385468a9644684f3accd7572f081395071ab62b4bb8adaebc9213cb8bad8772ba613a404f9a2f0e75469a6d224264ce5d00ea97fe2f16f8d0a044b3104"; + sha512 = "06a1ba2fc944a15375029ff12ed9f566ccf6a795ea8e63743be8084c7e11004d72693c65b8a330cf945a530fde5298c69c83a0f549edca8fa50d85a904ee744f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/bn/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/bn/firefox-76.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "1bff545fa7dfc083f07c8546b5d2c18d1bab3ce4844fb1bb667d151c081c639b3fdbc2122e45230ab45bd5251364b45d937d24a7b285b69139f4dc544e525c7f"; + sha512 = "4b4c8871d5da372ddd15ac410ecfae08385a74b68e142b64e4e463d58b1e60583025f3855375b5adffb8a218839f86cf538a96dd285dabde96f8695af2ed1a4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/br/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/br/firefox-76.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "cd724a5c402333792e5d739ba274c87cef983d3c29f6371cc1788a6b285031c5150b21cab235b603b240da3551c044abbc283f8313c8dd8b0082677b65406fd8"; + sha512 = "e33d927f88d4e0a67b28f27ed32696cadba6241fd3bb48800e68248173bcd7085adfd3dd3700c8d4ddf5be3df93403e20e9c0d57db9ff5d6a141ed58b74c26b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/bs/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/bs/firefox-76.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "47770c4421d2ec0035b0b3c6158462042f792f4ac87887c6704be2f3d34c8409c3e0570c6827f87e72c4697f89e5f0e0c574b9e90704798e9fbeb80c20968aa8"; + sha512 = "680587ff748248a665751f004b02d0b0d4e28f90f672141961d47cff6239823431b863e8ba702cad8f43fa70b295ad69b47954d2abe2fcec423e68f704fddc6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ca-valencia/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ca-valencia/firefox-76.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "9d23f45405e98eb5d6534d19e09237f7488cd9a6310acf85935c0f40132a91ba2f355a15a46742796d1f397d65e4f17d599aa81ccba57f2acb76da80c2d95af1"; + sha512 = "3f740ce2af373a3154372796edc4e85f8bf87b83cf4895328dcdb357aa4214e7711cdacbed596c4d7a1ce1ccc16bfba32fdf2d38749f3144faf747d05e76e208"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ca/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ca/firefox-76.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "4f27d129114a4db3f597fc253447c6f27bcfb566fb197dc4dc26a984f1abbd868242b1c0d077e6d514efe1e2e083378304ff490eaba26f669ccfb5a744d3899d"; + sha512 = "ea9b71eee4f6e967753acf4e9f0a4014eeadadc6d1bcc5fad11a5975b778f92cade729338636d86a783ca08b0363942d7d9b7e4ad65fc3186760189ead9bf0ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/cak/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/cak/firefox-76.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "522852f4ced9302068b6251a33735846cbec73bbbe9ab0371e8456d3665bcddfc81bc4c258ecf4f0e5bc8f6f15ed27d3e4f88ffe471e9e8af4beeae85aabc949"; + sha512 = "bab4ceb14749b67877a99b96f47aa7a9d6d65281e78fc416d3bc3e5296ba2133d7548ccfd4ab32637c976d178fc911f55b6acc60dc6658b4193e1c6146bb641d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/cs/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/cs/firefox-76.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "1192630fffc7bbc3232c8328e066f8392f967da5a2254ba726243ed7a681c321747a39397dec8b11c5ddc4d725445712ffbb238677856b2ad2ddea41c8db090f"; + sha512 = "e33adfe91886dc66f09cce26dc33ea26cdf432915674541a8fbde09cb41d2b14c0ebb3c41683cb1c29908dd652c83c92bacea3b8cab9bb3e8d9d6010a19f9646"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/cy/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/cy/firefox-76.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "3a327e31faf8eae17c60f7787bd53249957e5177d38ac2138cade1454ec4bd870c429215f1e0a5b9cd124aa660cf4d77a091ee579d865470c5cdae0703086b02"; + sha512 = "1c5b5d518914fb69b6a978fbb8530589c0aa117da1f2f7398696fe29c6177f0ee932f88bfabeab049bdc80d6e457835a492853ee9095b10f12b68172004a2b73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/da/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/da/firefox-76.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "297291ed06c290fbd9ad6172afb790e8f8a619ff0330337f5e777d1e4ef17ef52ff1cb94b2966161639a28221dbc9ce2eb28bd9ad14029ebcb878f79053386f0"; + sha512 = "90d385bf3faaea5ec6884c4042a72e6a23c68f1454309bc933670d0fed7a5aac2210ab4c6b23755d883fed385ae0f11639a932c2540687b219aa009067a3ab89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/de/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/de/firefox-76.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "7dec33f42715250c9a765c7f3f4f177101c69f7150661fc844c4742434a8d063fe1bc9149adf81c2729e848584fd6f68d1cd3d697159a1d5b4ed46d8dd9ae9ed"; + sha512 = "7fbc20a9cef66a6760fa314f2d074d2c597b420fee45fbc8c61a85f963130564e18d47a97833299283faf5c959d12f70e4f99089dabcbc3d83f3bfbefaec0f63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/dsb/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/dsb/firefox-76.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "b5d8c78df21e8f8f1d96ddb042dcbae44b4d622d6d39a0a3d7967e89004e5e229aee84842b6fbacc90ae3c65bbc252a9a879b552a2546ae168d7f07cc312d207"; + sha512 = "2dc3dde5159c64b61a4599a0ee2aaf3e4d9e71d7a3913e086c0c187cca48e8bbaebf7d4253dab7a3cb4fbce55a1119e3f4c30026671b92b70059b8b3256e72db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/el/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/el/firefox-76.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "8888a897dec9005edb469d27f40ce9ba3446c4ba713401f40955483f329114271c34a832afb93b48e0e41adfc1910e4813f79fd619a085ea15443743a72eeba6"; + sha512 = "73bfdcc5482d5793c0c5673738ae08cb6a2187e61d8ee057ef89f4ceb801bfeec48b8c0a9f48bdd996bca8ae4a232afc61c6539a1c22c7bf96d06180364cecc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/en-CA/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/en-CA/firefox-76.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "713522e5c5305d111bd1eb55bba42cf201da74641593506b191ed1ab3eace55c1ac9c9a86182d667d7eae2bb4cf6fc9ddfa1ce4c8d31dcfdb0f2fab587fa6a8f"; + sha512 = "baf1441e6f6ce7a31ce5ff12b600b61068bdbb9beebfe74f6c9b97ed2533ec734bc34b702caa9e9c59bb4563bfdd64c2612151793067cef3ffa1fb0ada312e28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/en-GB/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/en-GB/firefox-76.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "021b66ac6720deb68e45b1bdca86d8aa7db2e74cfa7391daee108cd002dbabc3f6302f380e6c029c7b56781dfd9bd34f8cdc1135851297e4dac9dc56f762eb69"; + sha512 = "60b276043c2ec3456b6b06acd2edf6f3df5149824d20c33974f3ac77fa0ef81a03f99f337add0209bb88b390fbf4dec08a30da207ad72ef91c9a89cd36e4452d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/en-US/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/en-US/firefox-76.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "feef8046d08aba827f6dd2510cadea53a89983a4889c9c2baad3d88123639b90c8052b552e2bcfb03b6e9fb43ebda29815825ef7fd4d9ca867f238cfaa0ad1da"; + sha512 = "26eae1d8a6f9e988695d59d418749fde988e48514d7c183039ee998b400f480dae16e9d5a590ff4364954e57a4008e7104cece212fa81fe73666d2bf3f0c0020"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/eo/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/eo/firefox-76.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "49b0adb7c5dc8e1b7ecc121f65e8a6853f497a9cc151b4eb9ff6631af33b12f7b00186ac2d13390cfcadd9fbd1b361a597ec1d9da62b1a0466d85d8e313be4fa"; + sha512 = "55aee2c68a1cb6b7e374f2622c8aa30a8f26e14ea0f0119d97bbe6e807c15c7df94ec74c0f31ef071ea7b112c3bd8ee501c7d7b33ab5eae9a8126b2fc9673047"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/es-AR/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/es-AR/firefox-76.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "a74988338fec99d50f5a16ab6c59630ec1e535338da3f23f05c7967bdeff41cb058c238ab2e873f96cab93db821ab066e6222397761578a12fa73b42c0ffe3e9"; + sha512 = "dbd5aa229d0123a26290330df078967bff4d0484bcdcc3eb499a7cdc82176b49a2362a0ab08e2b55286141b25c8cd4970308cf48a1143a5af788eced5b84b83b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/es-CL/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/es-CL/firefox-76.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "b4abd3f7abf1869bf360f5987e13c37b142b4c8afde51c790feb2563351a4754f385e0880ed51a1cd7aa3a5ed907e3cc22ff3c707d2923c47459c977cfedeb08"; + sha512 = "5082bef600a311f560daa09b31945961766a0ec63ebf9f38a0f0e76560fca2a99594c1f26fd0b57a2dca0c94d1991a91501ee3e931740e59010c93d46d3e8a67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/es-ES/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/es-ES/firefox-76.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "8a9c61dd9329c983c394c33c97c962c703fcf51a283dce09bb781d96879450adae5d8d78ca9d0d1892380fcac7ab95651e37133a0f836865a13946e2cb8a7e39"; + sha512 = "87ef420353069862cd539aa8e53f93f50330e0c68bfa4a56913e9245bd4a972bcd271a7c159218f9ffb78c9d9be3046206f20fad4faae3d76e4e9687530ea6b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/es-MX/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/es-MX/firefox-76.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "a1b7dc0eab0d4a8c713e27620235617a244ecadd62a125de8b1b60de7811a4d7e65051569ad4391b2a312107cb750c74d4c541c580f3af86b88b2fb84d93ce67"; + sha512 = "d02362e93a290f34063fdfa7af8fea71a6cb92b964b872bfac8f5b5665dc6ce9cde7a38a445de1074fa8673cc2c0243af69e2663542c5c2fb8e53f2c41518cbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/et/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/et/firefox-76.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "181aaa954ff9024a4efc211bba348461c28b892b1cc04eb50989cc8da78d88a350341de520b4a60da096ae399c28ad05802aeb73cf133171e8a4ea2693cce5f9"; + sha512 = "0064c56cf6cfc38a5eff201f16df5c9037da8089655df5c88a348ffbeaf933941d5ce99b3618293d2154774b483298b4c28616c6e175fe0f6c9124ce00bb16f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/eu/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/eu/firefox-76.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "893fa9700ca874b2a460d830f2e10f7999a6b521a351a88bf480232ca0270581f4ab334ac2d4721e3f5fbaec0105497afd5ef09b13f3b96a1e84556db79d0ef9"; + sha512 = "bf5cd434f45bd057de94bdc219f25e4da878a0be58c4a864a22961ac5677d0a679204a069220cdfb353d319d493e10d3423888999de6701e33227b1dde16e43b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/fa/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/fa/firefox-76.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "fbe8cefe9e626d07f360b1ab30fd04c8628669f5164d5dbfd12cca72e17e6454de367e170565e0d7f1c30e300d315f54d7c6cc06c8367e6d0c428a994e9ba067"; + sha512 = "402f980bbffd145e9f6f832ad4bff8c6dbb0db9a77a303ffe16c44b449668e621c2edf75e41686cc69684069efa10b7853d57ed5ee928298bad5ed27c253eed0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ff/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ff/firefox-76.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "7ea337b8f3cf536749cca253e063ab326e66a0a33ee0bb7863ba7c46d7d9ceef443bfec0551770346701f23f5adc2750225e8961d6fbbb48492afe7ec39a1272"; + sha512 = "baae62b09a0a7fef88f64b43b854dc8c4ff583765338c4dd1e00db9c7717adfb3d8817c776cfc88f88ae6865d490a08bf4d0c97824ae3280835769ca04fd8c71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/fi/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/fi/firefox-76.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "c97d9ceb5a98acf54bf37c1397973c2872a039812bc591979b44497e7f2db1cf7bb5fab75b4a0cb70df2d48eee4cf5fc55def69c22da9a0b5964e2af81bd0457"; + sha512 = "161da9aa8cd66a9f691b218f5d11cdae19fbfb04f44a77e266731afdb7202af98f165e33107af15ee6ced477b0ae07d78f91f57d14fec0e9a6de24847cc73976"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/fr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/fr/firefox-76.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "15081d21ed77c376257e23cec42ba26023792cceb634b0d0b928471e1abeba17d9245ba5454452b17e786e576e19e8e47f20478002a3df2e15c56e8cb19faaf0"; + sha512 = "150677eb9c0aafb0486dce2c846e0997f6eb1ccfb022a9ec2914628fa2affc32801fc34f0397fdade3cbe3afd1897ead515bc240043dd1cc7b879d92566a47c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/fy-NL/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/fy-NL/firefox-76.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "c352989e6ed3eeda8ce724ff110bb09c2ad3ce4a5b1f45bd9335c1186dcc1c310efdd24c9a2adf7a0f31278b3989d79a683f7f770670c8b1419967ccc2e0704a"; + sha512 = "b03e12ebeed5af0150715176e32a7da3ce20a57d227f3ef6da369f6fa27059cb23a8af0b4e165027598894c572d02e4d58e8fdb9a48b86d3bdc35385a249287f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ga-IE/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ga-IE/firefox-76.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "ba27396ca8f76533033bc78066074c3aebcd687f1621b14db92a4952b226bebec0bd399f697dac92b71e14e91fefedfa6d4188dc067bbd575e07317182408510"; + sha512 = "7122e4f914f5e8d42393a86e61baeecbcdf6fff646ddb38cbb2d7324a0be90d60bf609824f2dcc696c107f856a867e0ac9717fc098b1db3571bf60fb6d3b8a28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/gd/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/gd/firefox-76.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "f18b4acc47fcb9135ac28206011b6fb3fef5dd6640fab3e88d8e8f9dc23b19d427fcd461f70a00750c1739b3e3f6874c171dacd9c54b213eb9076dbb9a511b5b"; + sha512 = "f35b295657bbceb293cf1bb88a140d629f0b1fc654cf3f1ebcb5d9de84f40b17a9a7bc8973dc6699c4c6609e5cfbb858df52c0153ed4dcde6eff2e25c38f7ad0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/gl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/gl/firefox-76.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "e4bec63583908fd225b903e45007e29f357e00fe7901524d5fa15bfea04211f55d2557c1ccc1fba28eff1f2dfc5b364cb7c52d438428c26f09aed3592f817c50"; + sha512 = "4a4a37fdce02108118cca5fddc2f2ebfeddb8a4fad97ef0584fb85748e09d43abe79b0d3f7b5250deeaec8ec0b2e698771100dca486831fdde09f41d8d77b093"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/gn/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/gn/firefox-76.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "dca1a1062e47b8644a7e1a772f6abec1ff615d8857d74d576baf9a515fbef814f6d2e89878a3ea2aa4a7efb6931caecb3845f6eefec91c70299c463c2141689c"; + sha512 = "6c4969572ce922eca81344f1b05747d3935f88486082bdc64c814825af2cfdf27eac7f8f0c25edfd4d249b9f469ada0b062abd0aff02b9849c7055e40bec5b67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/gu-IN/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/gu-IN/firefox-76.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "efa6f443a092585defac47cb75d8ce85faec76c2624ecbf4cec3b4e8ffe4e582de0fb55f4901bcebedb0d991d709338bba212117fe59b3c6496fc5f35c1a7694"; + sha512 = "a5d1daf151be8d23dde730945343bfd507ba29314ab8acb71e4d5e71b534eadc573eb4eec1bcae0ab0bd72735cd891b72d8d931b634680881bf65f63a4a7abab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/he/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/he/firefox-76.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "ea76707fa795234f36088749cdc5a139482577d4488d476856cba926e40ce24d020f76a526efeebfd8a5840b9ebb2a93d71ce9be9fa8cd9255e6940074f22a8b"; + sha512 = "87b6c4a1dfdb49bc9430d9740612d24ec9f61d74bd379caebef6d19fb3492cfd1a4c8112126ab509af1f35e3f6e10062a786a0e5397b424e057e9d13c924fd7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/hi-IN/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/hi-IN/firefox-76.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "73bde105b324df05adbc581e59c1b723b1dc0ecd2b35b9029ececdb83acbd5cb9946382f78c9bd02a480635c58c9578ec982d61793ae7e64e5cf940c09c5a508"; + sha512 = "e2b96ab462227f70f4208b52b144d852e657edd3fc9885ba6b4217461a414a6aac6dedc206b4fc82d269c768662ce94ccc6cb3e0f096250d074b3d91ffa98c9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/hr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/hr/firefox-76.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "e237486d9cc6418d213a006e07c23ecaa3732496d169f7a24a568866e1ec1276aa9096c16aa696baffe689096b8321c83e9d47a119257effd77c3b1b938323bd"; + sha512 = "1fcaff37d60936b68a6f2e368c414c69718e114bcdcf8f71114f5e3dfea1eb2fbfc8b5e237406576daae74f8c4371d8a824d2542dcdd36221c931a86c9ea7175"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/hsb/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/hsb/firefox-76.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "be2a1bd69573ae49b011f266402a5f185a4eb8eb3e9b506a606b1444ef54091b36023e6d2dea2d118fa4ca5cc58dcd1afdf2e5dcbc3d38a7ceb776e6e06756b3"; + sha512 = "5146346331ed881f0f85f42bb43f4b4884cdeb659b392db28f7a534c685a579405fa482ad14c6c4e20422e8e22b07f2fc35ead1f3756539dcee797fb0df8c1dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/hu/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/hu/firefox-76.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "405ce0eb8c7694ed2d9bb5548f8e56d63c14e59025cda561bd49f0deda1bf0b280c344138d154510ac8ed124e4ec95528f84212fe1634bf16477615971148f17"; + sha512 = "eb043d50e735f1b99eab7cedef601aa302dce2b0270f08a9e93c1b1fa9b85da87305aa94e8db638e81dd8f6d9bed96b6c22f87928026cb042964bbb51420fff2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/hy-AM/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/hy-AM/firefox-76.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "21d7c5343f62cb8a841872470013d9b836eecb0f780794108f56120c4bf26ddfe923400e630f6d981913d06875e7473dedaa3d4cbc2f9173db80ef34c3a6e0f4"; + sha512 = "eb0553646d6b53a41bff160379845b0a21c28815ea523ab0de21230ce6c519b7ee07c9d97ce26f2078f3c66448dcd1c09e978bb1f748e548d1b5c2e0fe4e7f7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ia/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ia/firefox-76.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "a8c070f164ebda582055628b324e03971602f15741314ce26024eec0539a92341020b7fee16cfd849189c5c106a0b3dc1fcb04d3177d7a4b06bd0cd2db74b614"; + sha512 = "b43efaa2e45de94e9be8b8b9bea50966b0fa089dff9e25671577c724f45d0dba502044c2da7de32cf1431a38aaa92c2e5856659fb7f1ee557e38616beb4a9c96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/id/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/id/firefox-76.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "4bc7b360f3fb9a8115541da54f867c693e7c8c98bf24685ae9ac1c052c4cf54126ccfaa3aa2c714a0450ffee0b6198370b1092ac99ba13c289bc46a202ac1189"; + sha512 = "5fd68752ab6309af0bbc6d523e2e251c8378ac0a6c2ba0627b37ddf7dbb1efc444901a254944f4384a6fc10ccd1909f6312c0fd7c9e700ba5f223ccdf76d30d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/is/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/is/firefox-76.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "c9a1c9b03d3e7089a12f2ccceaa525b5c9ce62dc1e602a3899914e8adae571bfe12dfe7b2b5e54a4b2de01c869c33fa1f7478d1bc6d54e4dcb284ce1da7b32bc"; + sha512 = "1c128e7fffc103347329cbd65037e798292d5b0e843f878ffc44d9d53c32f1d9a917acd694cb3662ba0089e79063421705f30d39e9736c88b9c439660147b949"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/it/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/it/firefox-76.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "0adc5cb03da1e36650c90de0cd82065a014bd944da4ba29f80f2fe74eee91fbff13378011c938bd79c110bacd0e04fcb5ad6ee7995fd76bd5ee98cacf32c2c98"; + sha512 = "890812041bb3ab8cb0ddc6a54222fec9f4e342f9734f3c92f9d0452122cceff739eb46d92ebef5d2571509e4c7821704a64da1ec3dfe8150193a6dc5b4aa8477"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ja/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ja/firefox-76.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "fe743972968881f327812dd0a81ffb8564e0fa7a6f739a3a59dd039f560078827ddd36ba057b80792347b1cb19e262f34c276f6ce788453089ca0d8cf8d69a55"; + sha512 = "13703e62dd8d6728553524723828cf7bd8db672febeff63324c93e300a9ed6c2f3b1919d6f4bf8f1f74164df278a0c95ac98c348531581b717ab09e921490a91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ka/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ka/firefox-76.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "0715da694820f26550e0becaa151c19d366954fcfc2af7084b880cd12b2f031b6508e69b3ff687941f71c0b3467f5d118ec3f79be2cea6cdff22d2b5e4f050ff"; + sha512 = "929b2e3ca70c8d9ee11405b1366faf957cde5075dec5631a49ebc724d4912291b1f3826ee01e5c90e2d68c09b2664599ed73e4f597298ffb066ff8419a8056d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/kab/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/kab/firefox-76.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "2de6d3cea7077ddc896cdb95104a122b85f001013c0f59902b049423fdb370d5090a8630501009803592935fd5f90ade7625ef64b3b0bfecc712141b10f2366f"; + sha512 = "83900bd13db0731508e516bfafb5bb540a43f6b8ba9c9e2e9c0878d67e9cd8f9b6b496e5b77ccf314346ea3089f6d95c1902b9280741ac3325638e972794872a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/kk/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/kk/firefox-76.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "a0a1a9e7c2fda1bc92bce084472d432d4007fdc96707d7a926e884521c4ba8993374ef55179b7da7267d14699f079f5722974edf2713d449a59b76f01fb897cf"; + sha512 = "a62767e00ba2c0d522f503331c2b6eb4cc82d3abb4879711c2d9f611c8454f2cbfa5e76707e6ec6ce54df8d40f64da6ad8af2e15079ea75b3b8ec55e6273ef2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/km/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/km/firefox-76.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "4008860591482c70b0194e565f3f1fbb30b1607b486c8a3afc3e3d9465e24c3cc0da2c889905a7cad349484a386d7a2082e86e29f41fba84073cabcd75c5e358"; + sha512 = "03a47578e51da36b51bbaa98e36927a1a5b3f216ff6ed60c337d905f414902c7638cdd361b5d8f4c29960dc93b19343b18567c7b40106f0e7e95fa941c0dae88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/kn/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/kn/firefox-76.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "2628e52d65223c5a1941d94435398041cdbc7d5588a2227a9f17227800576a56975d5db2283d295e82e63e10c4ce6d3bc7999329fa26dd3c8d44dea025f96640"; + sha512 = "c4cb00f4383f73c65930ff3626342cb53695ca4aaa29ec5f80400ed4d18e4dc87dc44445069c62265112980ac7a061d0839f542a792aa5d294561b201445b677"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ko/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ko/firefox-76.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "9b78d17bec3f243154cca1ae1d955282e8700dac9bd93890be6fe92852af67a1f81eaa5dc2465e2881398508af90f67fcb2c90d54edb1fe874f9717bd25dbe2b"; + sha512 = "72fc61f2429fbef846eec40e53f50bd95d3b6b728d78e2199408b052b0d85ea66fbd6d2a114cd046311f88b419eeb7447b062cc9c5824cbae572debe872656db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/lij/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/lij/firefox-76.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "01e4dbb561a962b4332cde78df74a229d6aae4cfe56bd471262fedd9fc16a948415e6f993724ed53eb878a999020b22f761f4ee3e6f006ae8447513201ed27d1"; + sha512 = "9192d46b8b16129243ee2f5af47cd0f8fdf9af3ac953ae6481452cdd1f4da9ad9b75aa9c1b96416cba47dc16ca867db3135da810f32df5a33bed233a3b68f447"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/lt/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/lt/firefox-76.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "c17fff73a4f72378dc3173ea0ecde0492937a6fcee4108935126256f0ab085eb934be830907f1f4464205673023ed3cb21794cd540533f4e8defb42325b3bc93"; + sha512 = "89a5c07f1c1b7b389bf7074feb6b7c29470bfb143b720503783c35cabb36fbd0e5c3fe31349e1004728f128db36148ad6dd07f389099fab17c8a6d078c37675d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/lv/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/lv/firefox-76.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "22c90601b8162512ac045ffcc3d186dcf4e0d9d2330885e07f7df72224a840073415de0100419b981c08b73ba4c92da01edb49d1dcc9efb1abc0ce47b94da012"; + sha512 = "1bc60805513cfd6ab6d563108fecb176766e77bf10203c942ada3878d062e6a75c54129505fa63f16aeb72f4a1c6b360f7e65e8f23433d20fe134692e53f4210"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/mk/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/mk/firefox-76.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "a185e91441e302b9111d558c3ea0d7601347e843393e00adda74a903ad0f93a23ded2c8e61c5eb628996c0ef5b0fd63209fa9fd98f3a0040a9a8d419214e5df6"; + sha512 = "811449cc14b5bc3185c56a8ea2b640a3fdfcb60b309ae9ccb5498196677e1431719897e3e239dec4ee964575187430c1a0a1b4fa48fbd29dc874a1edceb7fd00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/mr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/mr/firefox-76.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "e8d5066dcaa0c7168f804d1f1047435bb188c6daaf3f8aa472654b617c7d4471f7469ac2560782b6463c315ccd9ad60efacc8582110bec9279cdd16dc7da7d09"; + sha512 = "940563e7a93a08372790ea3f0403c4facc900a6ec680c0e7d71fa10978fbe484c448f1e7bdc8096e26528a969178273223592daba724296f423b1293b79aa5fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ms/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ms/firefox-76.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "dcdb08020fca5a43581b1900316cf7acba285a87b9cc0532ecaca8f85d1ac3b188eeb9d65ba68557d4350b7f2e0fee478dd5a9ababfd3c40ef1f7b4c57f08a39"; + sha512 = "ab8d456745a815934736ae25cf597dd6eec2dc25320dfe99c6af804823ad71b482b19eae071be08763c82678e7c966bd86ab1bc285925945b6800ab725dbebe5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/my/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/my/firefox-76.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "d7005ab40feaa6053af8624130ba4e5d60e54978452b6e63a658afc8321c9f4a7eed5406f07a16961f6051e794943c6ac6582e1723cb8a518332557a94dedcc4"; + sha512 = "a8b4532eda52b3543767a28fb9550b21324c72976b71fd2101665e0ca89c63c4b1d8272a9f425feacb3bef188b43edacf603ac87fa1a3dd19c374d22877ac02f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/nb-NO/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/nb-NO/firefox-76.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "b6e0894cae9d257ce4d0becdcb65f9fe3693a947cfadfc88eb51ee93a4ade9924895a7f252317d145304d5bdc866294c437a5f03c15982fef8a970145678aa0e"; + sha512 = "a68193718025329d73e07b7199fc6a11e4834cf3f0ca327efbc182d0b33bff342e8a3012ae180fec2167f842781ae9c6d63d29e312e2385ee06e4ef25c851fbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ne-NP/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ne-NP/firefox-76.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "fc7a97902679402185813d666ea65cfa059e4121c126a4b82f2fc70ac04790b7e73441c4a3e7c49ea6292e049792368f7abb9924c74b52ca342d832231e80c51"; + sha512 = "5ba2c7da5741d45b376de87c9d3abd65de5a74885cac25ba0c7c8a81d681c0dd0fb870764208b62aecbc93122daea5cd7dba1fec41a1d97eda0dc674f16dd6cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/nl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/nl/firefox-76.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "c96cfd08d2b3bcfc3380cfa4e7945c92ad6c1a1ca1f47db6977769792752a4f64ee99f90f6f904811ff3f1b7b2d07ba570ad1b80337d22e34c6bbb6ed0e511cd"; + sha512 = "941cbc8f65b1b307f998c853010bd373541aa8043f1fc97e261453f7d49ed7ad9880e0cd85fd1bdb5b4b038272e210d9eeb7a5a24f27f1212ffbfde494c87b04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/nn-NO/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/nn-NO/firefox-76.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "7e10f521aa2ea9900d03a2874861f079171a62860f3508edd7dc51c39db88cef7a603ba0c6ca69469c2593182b027d354b6a8c13209beabd51a8690717d11eb4"; + sha512 = "0c0dd5ce17626e96c3e88a9771272f60e93c7ad4f1f40710d8b70d4f40a58010933de89a2b381dac94831db786621a35ef6894f46f1b19026c0eb7ce0b172459"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/oc/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/oc/firefox-76.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "43413c027b618cd5ddd36fa42fa26f99a294ce2f6f33937a299b55d698b64b6e85d04954101ef27e7a739c00407d7457322e3b32d38a90df87529372c19e1b67"; + sha512 = "169b6a1a48b2711ecdccdd6a685ee10b5f602d0300cac13b56feb331901be88edf6e8386ce6e4bfc108f419de305a5603445f5b7561b37358a75adb8e8d418e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/pa-IN/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/pa-IN/firefox-76.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "fb59faad43d729eeff12e1eeab15c0712f2429892574c526c1f59326518c9c652475177c9aba14aa591e4c449b133a6a8fcbef7bbc8d0c89b2b4d5dffd053abe"; + sha512 = "96dda02dda90aaa1de2bd31e04d87b37a179773d1f3f8094d33fcdfa6ffc78616f9d7539b4405911a6dfd31382cba91ce34ca6680c36e7aec22493d3bf6f15fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/pl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/pl/firefox-76.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "406097bb810d60a16a88b675f6a893af84e0de905c222534b0e09802ae5b57912d000188920b06c4ffba198af0d096e42f9984222a94f53d45db64f41a4f3f9b"; + sha512 = "326b8b65388b6e7d8215a665fd6acd9ad9fd5a03edfd6ee428dc53b217df7b108a351094530621c5b78f3cfaed90092c17e1d1c9656a37a10c108aa441ae0e47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/pt-BR/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/pt-BR/firefox-76.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "519f9777303a5dc6eca8933406ff0ffbf7654c75305c16e13f1600550d924569ded9dc6ba606050c9bacc31ecbc0d6e43dd91dbe8cb3b587ab71d20467564cd5"; + sha512 = "70a56009e39e06b701de62c7df02d3d648e04ffe94d2718f2f2cc4ee24f19e832decf0371425ab9791ed5db6a5b56d5f221163d3bd67bcbf6cd48617114353c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/pt-PT/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/pt-PT/firefox-76.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "92500d0b49090382e261baa0fdd4620e5d9e4a047c9c7098ad3f7ce34a5e97bde419a87019517125239144d21589b428c11138aec691328530fd41d5a78cc5db"; + sha512 = "33a770a0ea0c177c1d839056f4045e41e8e2102e840c99c48abd2cb49733d44af2753f040696e859eb724dfbb6dddc3357bf505620f74c0c29b92211d8ab9572"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/rm/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/rm/firefox-76.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "6b8f3655d962612a047bb7d961ba74b362da0bcf740362e8f31a2263b0898da90e051951cf5894bd8a493f40d2d89fd50d6060eecc78908518f8611218a27eb3"; + sha512 = "233af09f6a4ebb88aa678362c85244f1465d5da57e193b26d676543d0d1df9e673b25096da705178d1784cf3682fb6a1d12564525b77723eca0924bad7ecb0e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ro/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ro/firefox-76.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "4f2e2012136c9821792241f2189550843320b52c44905d9902c7ef3f2be21f26dd79f930b719f752d3d4b5e7ab6ca8429d12ba6120f6bc365bf9e2f496ea85e2"; + sha512 = "6be29acfa925e3524c83ccd6915523cb8a37143855361b46fbd71465002f8791426ea9985d34486db17edffcf53d6197b7115cc0dd38a2be16502d07d3b26cf9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ru/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ru/firefox-76.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "7ce2ab97b3483b9632d24a979bbe051d8db539329359f91dc9df4446db0b4c1201dcbc6422e1406400dd3df007e5c3af6bcc8279966cf7448671608cc05a4231"; + sha512 = "46b2a7b8370fc173101dd1e78ce12e363f80a852d55b2e6be9f5b31232888750e07937afa60bee2571e0b3b18ca2987ffbbad8c6065d4bb71064c34acc46c3a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/si/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/si/firefox-76.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "65edb310b0c94dbaa2f5ece2eb6593a4fa7d89b2fc9e4d3bd8c77bd43dd4517d09895a7a325b9d6a1b5fda965e9d6e3c10f7e4b889b582ad4aacc2061db6a443"; + sha512 = "934144d99326a139d994518e5aa763cf32035a7d310fa94eba7b4a2b7cf40eaff732dc20100f7bba35dbf415b7a5fc22c5122ef40a65732566063d4517321ffb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/sk/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/sk/firefox-76.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "4e29357906cafb6df7dfddb4c668479d8e52722a4771e043a1d9e0c254e434251768a716f7791c6969e34c5004f276d1b3ae8b8c77176bb1ba76409295126671"; + sha512 = "a892ced0d9c5dac7cda65cd67abc1232d5be3ba8ebc2c98181f504b68d43018fc392e0e5b4b12ed22f1ca1b6469be83f68b12e60fad28fd42eba18d9b8d4d7b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/sl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/sl/firefox-76.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "c84cdabcb498c6a387a08b7ead1cdadfb68c173a955e34f4118a4d56417918649b7ffab2eeb88ddfa276656367f8429e17ddad4b909b1f39e120e41d1caca56c"; + sha512 = "229175292f435f3cb1db7ba671933508ba7b4daba1aa5db0ed9f03fe8bb83778a0b951b0248a27b4e4a7beaa374f9bc4eef3b2762596b22bd45045efc3038be3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/son/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/son/firefox-76.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "3fdf243217a00baef75aa36b9bcc257e1741fadc8070f5e50a4573c3c4b6b86eeb4405fab327b057e5d92543a0643429fc1159d3b77fe30ad918d8757d8970b1"; + sha512 = "44d585391132de3c4df67bdec4a5062bf71af4ae32084e0602de93d75c279e8ee76a022aa19926eee03a31022b4d7eb9feab8e349c2a6547b85f8a42f5b122d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/sq/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/sq/firefox-76.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "f8c32ef45297c86935bc8b99a9d6b8e4804320f76e085e70f988def0ec003f221666e8f7e34e1866c52c38dc45a3b6a39397ac1e81a7033a74652a1d42d32355"; + sha512 = "f0b04a81888f8cac58e311f9f4fe16111a414f541bd1a5b3dc2fda028cf85b3a701ae5b91d223a3d6542580c1bec5459dd4dfe90cac517d3f974c1084ed6be1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/sr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/sr/firefox-76.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "10dfc0655723a00be5b5e32a280ffc660cf464df0be0686601b2bb502730ea5ee6f7c23c3f40616e9df3c5eb17638b841cc70e8b2271b442cc8b95927191dd62"; + sha512 = "c3fae910a582dbcb5b8609dbfce0d759d776667e34c737755968f1a531e83b58b098b8a88bd948ee820ab76328210631b7d85ff65a88be630f795522831a7014"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/sv-SE/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/sv-SE/firefox-76.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "57e77414cd484560716ef659271e28c14a8f02f7189bc858b4293a72ac07cb0acc77a6e719c25b7a9b76cd4da6b3b56df8a75236b6ddef0ace9f87113f4f8d72"; + sha512 = "fd5feca0a4a107b018329ab2fc1d7eab9c0e51d2660d8356cba4792cf73f1176fd19411580f98a469f47eb6bacb2c311134194ee612caa7ad8a5a0021b062420"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ta/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ta/firefox-76.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "396fe91815427866908619b33df4fcc503e0b30f03c567a9d4baa51bfae19d91de816cfbca4bd94a48447c7abdfb56d52a294ad0b8fff8134d935db9d6a81221"; + sha512 = "c54d20862ec7c09e4ceaca3afb120938beb7ec0bf1c38e651355fad1247c61e75acbd0fe6b96a17fc19136720ba55755a8bb04726c714c812a333c9e300b9463"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/te/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/te/firefox-76.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "87237a320372b1c34c583335335b5b8e85eaf0dd774883b0b0c74e883854c1cd14d459cc8b84db2dade7dc92b36d176c8f30bd17658f6e5660660b0f167fc715"; + sha512 = "a594904a68ccd42f5e6c0a829100fb99e37732a29775273ac202fbb65785549bbdf638e8ddbcf6b7269161cafd229354b5b350be8e2f2360892bcf17ef777e07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/th/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/th/firefox-76.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "ca5ca4be8242e1fe9a9714b117965b67ebe86b578381ea4339f378dfe74e08f268b63346b5d3bcf30cf1c108a933609d8cbb393caa7f7646557d265c2b40decb"; + sha512 = "45b5fca122f7900da176ff3d55dd70a1a2d594fd9119b75760dc094b7a254e21aa6455c8370650f1b17d69ec1e81749881635d176dc72a45eec8f632d3a2e0f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/tl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/tl/firefox-76.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "99322a06d7122438715b92f176b07203246c1e15a0a42dae4349f424232778f3d2b9bcd17a7b239b8eb6273a6ada8e259480601258275f16c567d9cee51fd16f"; + sha512 = "06b3fd1f4cf030377854ea39bfe0818322123d53299a3f5d7308db32683f3992240099491422858c3104079b566958dfa60b58248c0c6adcd0153d584429fca2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/tr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/tr/firefox-76.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "95a86989879b65c85032e9b8ffa9290d9a6fa1be409786b9782b284e4c0fb894719fc464ef7e6b96554e2cb852a3276a8e042bbff02a17bdb44aaf9ddc170361"; + sha512 = "2cb1d03ced3d88344e24bda60687e9a0c34aade38fd635a63ffea3f072188bf6f5ab76cc7c54188280932c225f1e5c9b7c6cea4d2ee0b1798335e84b7826c886"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/trs/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/trs/firefox-76.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "aae0652f74e82b0cdd752cb8f0747fd4f36f04fcdc50c3cd9d084c6418694cd3015e8de87d851605f5cac0b0159ddd8f9521755d81adbee0e561926b2ea1d393"; + sha512 = "6fa6eb60bef978b82e6805c3a083ee40418125416f139bfae2695c2a4b28e34081a984e8c8e092e449e28fae28d812ac2c76b808da83f79c2be4e7f5361f4536"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/uk/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/uk/firefox-76.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "df038e62ba6284245212f23c5458b2df14547ed532ba66adfed2297041ae7acf693a6e01a6af9c16f4a2e141806d9baf3c4fce91bf3316e635da7211ba9b057f"; + sha512 = "e412938a9ff5bca8b770a83a2f7b9a03f92fc155df9088f60d758aa41c47bb348e331e34c8b04b1b2b5c796ec34261aebedc697c058bc5457265ee7b87d2d773"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ur/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ur/firefox-76.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "1bcc2f2e8f5e389c29fd0e7f4a5a376d91268e326758b396c9d829e59d1315a52df0449fe49e81170713f1161946c2ed224560dc96329f30a5d13c8413f26823"; + sha512 = "8a4d50ceae88d1ccb354135fa10df40a2427bc0e704dca5b7ceafafbfcb3970eb57d4d6eb427330a2198894e67e2da2532adcdf5f900f5e8ed15727e1dc4fa84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/uz/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/uz/firefox-76.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "d957e4942ead1634d792555f57c6dbe54972fd9a97071e63901b422ed6b723426b27fe85afc8c33d75087a502112a4b4b2e0dc3f3a04a9d44a48ec867dc78cb2"; + sha512 = "cb1be90d64caa7ac445cc7a6b3549350eaf8859e7a4e662e602eee4218de98944360bcd828b62bdcf18a5a602b153a1e4cfb0bdac92a802a8b071f349c88262a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/vi/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/vi/firefox-76.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "e3209382cf01d827f3e68230c46c6eda837798f92812c93ac19e81a77a0d72f3a5b53681320b71d886d8d4339fb2eb51d056bb4bc41466116aa51ffd50ff05d1"; + sha512 = "69fc97339bd8fddedf12ac5f545c2f768cb071c4786f08c43fe61775e43b2dcf065d84d23ef9b9fb3f09c6df6364413f61fec0fa1cdeea2b4b769e3ef0bf124f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/xh/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/xh/firefox-76.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "8719acd4bca1136668c6a90b3f7caaf29bd773acaab2776f2b7daca3c9028c33e73dc2c15c82d44064e92b61def23ca889a2ad09043c5bc5ad91db3214af1919"; + sha512 = "b8013f7c0e1cfad11ef950015444105b1e8512d778fe4b2a7567e0613a1191a7a929c5fdca9c15ab846da05f189fea1b0c137784ca1061b43f7ebada27376a06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/zh-CN/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/zh-CN/firefox-76.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "681e276d7ff6a6f91be59994e53f9f6f082e16f9d22ec7e1d1b65813e91c6c2661f28989b0331100b6f0d4cdbbb0589204b0ed80bf5f0bc0d18016e905a71148"; + sha512 = "154bfde5424cca1af2e624596755fe95a1504be0ce977162117e937b6ab6ec6b03b1cdb470ef62c710129d19a16c42fac334477f8638de6472b742ab2395b262"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/zh-TW/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/zh-TW/firefox-76.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "71ee272a7d02758187a9ef2d0a722760d04d9bf0fe11c90e841e15dc9019f44ba22483b6698e3f8eba9620e34d2678db2dbc2974c1ab5c7f0f79934aa4142432"; + sha512 = "6c3d36ba9e4682600c2a99d6837dfe76032d6d1618c0ddb8dab5633c2961d413959e9fe0a9c0fc7ef4bbbc41af469a92fab566d24458c43c1671cd3288dcaae8"; } ]; } -- cgit v1.2.3 From c186bc893fe9841f1dbd00c7aec96f1ba1b0272b Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Mon, 4 May 2020 17:29:14 +0200 Subject: firefox-beta-bin: 76.0b4 -> 76.0b8 --- .../browsers/firefox-bin/beta_sources.nix | 770 ++++++++++----------- 1 file changed, 385 insertions(+), 385 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 0737bac48c7..a0a0b7003be 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,965 +1,965 @@ { - version = "76.0b4"; + version = "76.0b8"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/ach/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ach/firefox-76.0b8.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "069dab2a91793ac9cdaa128473f706e194cf763df66ae448217cd7e5297857bb2d21ad198f9592bbe4831a2bbe9b76ec1ef96c288c4d8a85e35733ef0f75462f"; + sha512 = "f4b15745610d97f3919b644ed47b515eadfeb654eb81c5a890a2d225f1223f2f554612a5df14c4514f0f835b25f44649a923d09fdd199db4b052384075df89ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/af/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/af/firefox-76.0b8.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "bf1c4da2b03f95f241497e646d77ce5675f09dd8947def93983814c5bad257e38acc5c918faf7b758bf7293c09594baeac43ffaad814a47d3cbebcd5a49b4f4f"; + sha512 = "a39343493647a46579ea6f37e5da14ed59ab5ef91a4e47b9b7f43cd3f469110b9544ef660b214b7a5f3df6373a9f6bf9b55656586a96a7f2991b4fb9a66abe42"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/an/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/an/firefox-76.0b8.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "04bf37a16a65d453d1c9406196d095acd0087a0bfad0ffbb466afc2c99249f7a82899434a47343399db63c95d9c827a9a49b5c9eede2ad7bb7bcd91d82770fcf"; + sha512 = "ff0655c7fb043f01c8c4cbde006a7835a6f0271133a9dd07b90b3e0bf369233f9dc0ed0caf38421ea9b1870f1daaa598508865a239f5f2391eccfa6c0341c94e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/ar/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ar/firefox-76.0b8.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "71bcef558731031d1e38b370494be88dcd82299918a98c45be7fbec61ba5122ffcf3bbf4f2705c2e81cc133a888289c118511d8713ed722d99638a530d5d4da2"; + sha512 = "b89d38b6a44ebe00806cf7b16a29264c324d6afecf4d83e20ae4b35c502b13ee04a052a879d1c68e084e99ebd9850a9b597b6d4ea19350e0005c8d006d5cfbc3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/ast/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ast/firefox-76.0b8.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "9f73a427c5a520fefd777d84aea6dfe50f2bd65f29e9acd16f0238ba5869e2c129872073c04769afab3ee973bfbcc6b50e204a53a8ca380a0e5d578557d59599"; + sha512 = "34a6db5926e8bc90e47e8ed8c413e3c47fe35d119aa3c2315c01b0ea38a04a8acb44551e689b798dc030902b9d3dba3f62971b2d927ed4cdc0f965657a189af6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/az/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/az/firefox-76.0b8.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "8717b342a6c49356017674c516b58415a21aa2a84fdf986c427f0dfc6af3944dae822728aca93184a10f5517202cf5e6ee49221485c64526edc0e083b0caae52"; + sha512 = "3a1bd479e251ad695dd397d019b3f492915f8051984ba399fd93035455070eb9a2b05bc43d87506e671ff80c4b2e4f17808f37e959d94dcb6a3067f8761f617f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/be/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/be/firefox-76.0b8.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "0bf61f3952c7b40e4950bfd294f5382da877eecc265bd9a1ea78135471b5802b69bc90361c6e286e2a2c7f5151a44c711c45f3d9b053324213ade49c79907b8b"; + sha512 = "0c53c0abf67079d254b5da7c3d7edee506678bc3be55d24b61865e18f8e81b9e26f8ec98d08e7e8aacfb47a231460cafa52e065a4d216cadfaae70ae0a9202f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/bg/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/bg/firefox-76.0b8.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "de46cf916c7289f04590beab6ca3aecbcecb6ac65b7377206244e9cd41d0df8e68e6006ca49ae477ecabbb9b13c9b1df11c4cd732967b13aef3e9d0d708d2e3d"; + sha512 = "b608676213c5ce9cae42d18af0f6a836586d990d58042ac8bdd0112590f3aed30abd4272d4581a0cbb633043b4f0cadca7a90ac40777e5fdb7afe807fff1c2ac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/bn/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/bn/firefox-76.0b8.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "46ae6e3ef632317f2f449223d64ebdea050c21f72a37fb27e5cff10d60f87cdb5d8b58de0e0d63e1a6f55ed0559eb5ef40a0768615a52dd5e2f2dee1e0bcf08c"; + sha512 = "44fc7a158689424b3c781812e46b38efefae4f49098bce533c1abfcf9cae78a6be2369fe21f6be12c96fd85afab875b8a6f77af399348f82a1cce3ad4b0279f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/br/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/br/firefox-76.0b8.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "f0652632fe303db805cc422ee010f968493377014865a3a80af13ea308c3eca7c9793172106064dc2f36ec2f8f3aa3e679f285975a431fc7de6aeca4373db67d"; + sha512 = "f9f3bc634fe7c21e1cf9800f8875979e9f77764f71861926b67e9addd604e88b22f90cf31da5dc93b3ebb2dfac8c04ad423b9b21416732c9000e9747ab588a11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/bs/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/bs/firefox-76.0b8.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "31efa7360e56508f2b249d2789387bb8130a3db14843b87463dfb600ba3f37328fb86113c263dca3ceb30c620e889810194bd408220941ce9700dddea908e1f5"; + sha512 = "3558b3eb7da562ba50f1273ae461f753a95d42eca3714eb1e044bbca3e63de16ce1f040f5b34709c8a0e86fc59ac6c9d65f1dccf3a0fdc30e96c0f7490867d7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/ca-valencia/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ca-valencia/firefox-76.0b8.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "f6ddaa4f75bf434474da6f441c8caedaa77a53ecfef92532135a27c8e76f8acad7afc26b3549a2f753676533c0352227cdd875d952c1a720332cf9cf4dfbfbf4"; + sha512 = "b79f0e814ce7df9de0f2a488a3a798ce9a33c840c7a39efc6a749a07e568ba881bd2e42b4a49fbe7ccee0ddbb3e7768382181ce16379a6b24551ad555685a792"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/ca/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ca/firefox-76.0b8.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "4d58cd473798b52dfaa5fb4424f9ec57eb4e667c884808dd4fdceb851161ef3f3f72354588ce25eec24ff7ee671e7bdc1dfa7ef18c262540549ba34d8471ca42"; + sha512 = "69a6c978b4c896091f6118b55783988fc505c819d74cd455ec6274d54fb6994a012f41d09d9b574be90bc10e47b8d186b8021421d86d05db6945ecda1e51d127"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/cak/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/cak/firefox-76.0b8.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "5aa6d504cf97e0d446e8699bbc34b9e69632455b97c0427c1081d9083c200ef3a83472b95ee3804612e36d93f0d5992bcc4f8bade7eb132a30c313d2efd7a75a"; + sha512 = "8253f68114e9bb035edb0d718439f0d28f04e6afa7ea33d1001a1457723c4cbcd17362c0b517a23ca78a53ad2dfc847be396e28beb3a302f2380a6dad5eedee5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/cs/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/cs/firefox-76.0b8.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "c8ee077240afe3df4052f093e6a5f13ec2449f84863063483edd11b8c76ccd42a45cce2c627ef57d5b4e337f71a88e510efdea1fb1f0065fddc1390d4753ce12"; + sha512 = "1413cbd3345770ce7597ef139242b72fcc9b7c53bca4b7cbfa707f00bc3d2778305f617047ba24fa22f808c0168524166a6fe7cc7db6ea0c5cd30b609e80d404"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/cy/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/cy/firefox-76.0b8.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "b0352034fcfc9e2acbb546343ec2e8103f08b3c802289486611d694c07bd154d9bab7509e8a09134b44929ffb54a806ea4cf44a8d4b1ea506c23b84adee123ef"; + sha512 = "1628a73872c268d4aa8ac78bffe6ab49341735c6abd5c8f805c86129ca0fcf5d03251e962fcd4c9ecdda6af125b8d4f9d095e42b2ff5c185267cd41f3090acd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/da/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/da/firefox-76.0b8.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "57bfa4d27ab78cdf9da4d04a4bd6a38873918bb800ccc1e49259c5d6753e9fdee0620795c96193c84938c126a94423d21ae12a3c998274474ff7b71b3da9e701"; + sha512 = "f51f300911731acd439068bcbbab712ce4920345b481b8db80b3f6ca1c1cf18fd201a9e639abc78db97933d4872c7241324591a9c045bc1c6d71898e2a2fca93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/de/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/de/firefox-76.0b8.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "61cfd12448a01a71c98ef855ea9c54d105bde516d97e8e1d70e5008a3633c0a45c194a751f2a7884e0632c56d7ee830bfd1a0d9a07bcfd54606f7c37bf2b4b92"; + sha512 = "196ce93a18112d7e0df8a8c1e444d503d3b0a2d11e70907963197760c2127c4f827ae9a0eb79fa7745190c92be10c7828a42414d33ec9ccea1f0b7194ffcc325"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/dsb/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/dsb/firefox-76.0b8.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "d6d3f08595f1675f181b40cc55f03009ccc212bfa733c341e51151e24089372a357a3a2851806eee708cc143a75a1d1a8d8a078fffa5988683945183f927f801"; + sha512 = "da6f0afd218345ffa1bc0b037ca20c9aa6b18597471d35d5cc8f4fcbd4f39f91e2839fe35f186577ed4445d34e76d4c8175f2df24f7bc0795f606cc6ab47db7f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/el/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/el/firefox-76.0b8.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "559c34cd79cb820f674d0aff9aec9e9cccc51ff7b1fcbd17ef95b9066e35880c5c980155d2ec6913e1d9ad3f9e25ff8757ce84e0b22beb21e893ab0bf30ddd5b"; + sha512 = "4ea4754aa0b337e94f3fec5b108c703ac80827d514e64e3e6c890e050107249367c4167b58f21177c3071c11301c37de08703136f03edc0aa901a22e2126b279"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/en-CA/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/en-CA/firefox-76.0b8.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "9f850ab71ab61eff4d2c9630cedbe42773982e1a8086a59723db64a01852a9ebf5ec90be7e315b9b7e142bc040eb2523b805eeab13b47a01ccd0978786d77fa4"; + sha512 = "f6f59d13148c7e5510a03e93644b38a788911ed904e088be48cd1bde071ac372b4b047f988714ed44d1f64ca6a32502564f01780be80f6c49373119ff7021454"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/en-GB/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/en-GB/firefox-76.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "134740c2c4efb9f014f42eb5002a4eddf8da67c62798f8c733623ec3f28a2ce7c2caad0e3b0f05fc5474148714c7394c53ba77953d4f5c56d1ad4aa8fd35c19d"; + sha512 = "fa42017d8111e96c4d81ce515577e1307e187493866c04f3687746647904f2f89a3f0df822ffdc2004bb0fa06aeba102e29b660e250737b2264b5015010ab869"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/en-US/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/en-US/firefox-76.0b8.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "4401f8e0efe0ff589ae496ea959dec86834c331af0108cdae4a4380fc48e989068d12d33faca0cedbc4e5fb78460b6495a29022c42bbbcc94731cccede9927d3"; + sha512 = "5f47dbf433ab20c2db027542eb0a3dcff7fb0b526ec93908f182e1dadde112da327f84edbaf44ccb26d36c120a414d64ebb9b10a77501644d9f1c9c3d34b7346"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/eo/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/eo/firefox-76.0b8.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "93a79dd6fc6acfc8829bd520139e6ba4075f67a091701c1a877212e495c4b530e35cc21bdf5d15526c27aacf2e25a87375f3a4aa555453677348f0442378ad37"; + sha512 = "3cd5e9e99b73694aeded24d9acc7c594bcc582eafca5867a7123c5067e34f7e96781164fd7db2b53366bd0d0d66fc495931cad42b1e3d56726c8e5f82c8aea4b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/es-AR/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/es-AR/firefox-76.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "ac7d84178ac2b315007cd5a0ec632dad6172117378f3a4afe6ad0099b45ca6d50534230e93c3045d1d89a18e742541514f6600f1b581547931e75769d361954e"; + sha512 = "ae43f7147a3ce843488623c4558d9088690fe6ecf7153ff30da09051e9e9fe90df28bf6529a469b8d799554c8ee3ef92006e73a2cb9e68a5b71ab392a977e849"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/es-CL/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/es-CL/firefox-76.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "cba6f234b9e7f4612cffb24fb648dc715730b0128bcf070b3e4f44ff2026610be4f8e36c9ff122688d47930a2d22a96942df6cce8d2c40ed443a8fb7204f3e49"; + sha512 = "6ccde441b5c44514da5bf7cb9aa959f818d5c499fa8d33487102cb1a1cb98a501b1575ecc28f8288cbc4b69dc70bc76f365e9b52d4329b685f25a1ba9d1ff063"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/es-ES/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/es-ES/firefox-76.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "e65aec8d339144b3acc24867da6e7832658bb625277934320ed428c21af537df3eaae6922102d43b8b4742e5e33b789836865e64f3ceba08e7a752781e2ad8fa"; + sha512 = "3800ba267d51d9046999c931b5bd9a743d2a3481486a7ee713f76c003c863b8579d44ca53ea56f5b32c8022ffd9ee0184b7c734e5671b412f60d04653ca2c8fb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/es-MX/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/es-MX/firefox-76.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "13c0a83ad36749003d96b8e56471d632cf7006cde3c4b89ce2ff98bc42ddfa76b1afa4f3437e87009182cf7677931c5a307a4a2ac0e0250346da3f12dc723f64"; + sha512 = "600a1aa9a0b97fe66947107ee9018740e2f7c07bd3ac51b03c0c6d52728d72f93062c9dfebb97042c9a23a85631c88502feaa6a8cee395953ef23c2addf6a99f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/et/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/et/firefox-76.0b8.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "004eff52a5c6e4d8d60c488a52e894b0cfe8471f1c9258c319bf2e023c231c3bf282ef3d03d3a8045fcc8ef53e6e1173ea580dd71f73dd0bb2aea198f96eccb1"; + sha512 = "498f59dc3a6faf067c8c3d23eb5754dc8cf0478b50379359122b7a8e6ead6d7c6c39856cb34f3510f7fe1a11af3e0533a3805821ba49cb7cbf1d40b1caf36b3f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/eu/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/eu/firefox-76.0b8.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "3633383291f77632882744592c09be7a808897ed02809f0fff84ee4f16a58bf0ca6a82c0efc82b6c7291bf8ed48b0fe8eded288affdae9b0b55137b4dbce40dd"; + sha512 = "a5d58868468f9ccf22afe78734121e1f81961efc9c7add2a065ec9b9d5d68d8fe96b5f563a85b960ea7ff94c70e1c3aa3a9f0f1bb23cd175df549375c1479072"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/fa/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/fa/firefox-76.0b8.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "683984fd0b388d69206a5d9ac1cf174b513aec52ca19eb6644209818a0cbe54124428adccd15e1ad9e7d41c6016c34a70ad77b721440655b593ad95aa66290bd"; + sha512 = "02a5d946542aff81bea82ec73fe30919fe4a1d1acbd18ef194a7c8879d9b70e319abaee2e4d8b3a2671cecd28fffaa37a182f7dfa06884f83d765b8701c60a9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/ff/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ff/firefox-76.0b8.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "7c12dc3450e511915494757ebcaa6b0a5a0f3ed1bd349ce1c28b4cce1b931844408daf59e27486eb044b669fd7bd1ca4cb9512eb2332e7a7d360e20dccdae260"; + sha512 = "4ab405c47fbdb83eace54b0db61c734941d5ae6c5735d50dc6800271dc59cd82de9df9e1e98f238c4726ff9319c31a8879b2f0330792289db5e4b01cd3caf3da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/fi/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/fi/firefox-76.0b8.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "ffb87a2702b7f3e8fc80038670a3cf45bf64b11442b129751e7e80cd0b328d6009190b2658b8a28562f8ecabed52a64f327fd263a0d93540f8f5f09250d4a882"; + sha512 = "82f95d6462097fb2975285326ef6b35a572b4c25bf07517f3ad680a978aea95f5cd4ab946275dd74cd6aa98566d1a4288761c985c39e1cb3d9e963b892a37544"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/fr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/fr/firefox-76.0b8.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "aacb42dde2e18082ce80cf3e1201c73aa9985d711ccdb4b227efb6619a010fc108315a5dbfe23a666c9d851ba397f117dbaa53e5b4b3d0730c85a53ed4b0512d"; + sha512 = "a6df8eea8918292c18b281f5118a0373bc69aabc585d3a711ff77355a1aa95f5049d31df3bdb72087931dfc347050f4ccd791a9729f7bd3d95cab20c78da8a59"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/fy-NL/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/fy-NL/firefox-76.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "ba06e4276fedbc7212bcbf62ee1b0a1dcb7005a449778de5e70d8b99e86d83ed48d9408fbf016bf33dde135ad049c80011d00b5c72b0965ec6be7f91b759471f"; + sha512 = "d5cbb68867369a82d84ade5a847d8574ff687c0cada8714c8a072291aa02eef748dc109b42f1b246980f1ca14060b799098885bff2d7e4c55e7ff644ccc01e9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/ga-IE/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ga-IE/firefox-76.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "9318d21491ab5ab6f2ef1c437ac12f92bd755a4857d873231920f5d67a36b81b4bc415baa8da92aed1b060aebd31013aa58e8cf845bd7cdc7d0f778526875b80"; + sha512 = "8d9a299c49949609f162f9bba7db369fe7c34f2b29d3075c607afd3c3bdb5ffa0ae0d9bb9d5ff5a5f0cd28556eeea5265b8f9809a2db36ae11209b9cbcb5b8c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/gd/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/gd/firefox-76.0b8.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "7f323988df0077354e5c391138468af9a331fe4430a2e70b039fd599e92b7f0cca770fb1da21c192f96342d6a7430502ddacce7ed026bbdc2b2685c5baab64a9"; + sha512 = "4431eeb86c0e3920bd08db00c10185941bc7fb3f5b055b8ba114e63bdfd7b64ccb8cdffcb754453557bec011d08d87e08b6a2ce022c77fe32add49269f3ac6d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/gl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/gl/firefox-76.0b8.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "b68fc3c3323ac5683ab9c168e870917a93120a0fa94ee6d427b384031764018c055ddc3ef7b9de6a1803057db2eaeb5581c45d4c52d6c532b380144148270411"; + sha512 = "0963628808ab6f6ce65f70e09c12ca38c524992c82446a2654eb42917ee2d32dc1dae94b15578ac5209e12e0fc4cbd2f56265ae8c259336415d4a56b560be96e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/gn/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/gn/firefox-76.0b8.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "f326eff5f21e139e2e7f7f618997e4a9edf9b3fd0dbccd610eea731a5f7fc8e75711007c10b39a277cb1de353870bd0e0cf96b3239034be427422ab575d03e78"; + sha512 = "1b19d9ca238eb05709007ddf00ff40596b49ec771839f6b1ac21162796101701fb523c0b8ff18dc6d3428eca3ed2ac0fd3bf17c5ea91efac998ebe4b8ece6c9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/gu-IN/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/gu-IN/firefox-76.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "49407bb72ff464ea85719b074b07c7495398d6a8900b64a4b5df267c9a51158248d416c8eff83984a3ff801769c069975500dd08b20abc2b6af461a2323bf9a8"; + sha512 = "c0d2fa00166926927e1985ce112a035980ad24771d4ede83143c4bb9012006c811aed2612fb1f2c4b1bfc852a7c7799309f4b579aaf86fc5b11ab216239911b5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/he/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/he/firefox-76.0b8.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "c5ae0b8b5f05770c7318a3b50ca4808ff4553521c10a1f71f385f25a133213aac84cc73eaa2016b3f9878bd890b4896b9814b9dc3624a26420e1596132682103"; + sha512 = "b2a5440b57ef85a3e3ee607e9e497e6b70e3652c7f258a2c7e98e18b5a95c8d34de908d64e464be9ad224aac7869efde785e38462fad3c284649bb9c524574b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/hi-IN/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/hi-IN/firefox-76.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "7471dc2b1f24b6fb34d8af5bfd5043d80a6c1720d0a843d20911dbfec9dcf60f0a8aa9dd8cbb80b460325763dc3cb4334a451d39218e3c3d4190a69eb1122dc3"; + sha512 = "2ffeeb8d559097e9d67f7603c34585d8b4d1571a23ef5a9d04c47407b03c4db2d4633637e8352ad96989facbacf6796aa48eb94ad81b70b0be3f0955b8a0e32a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/hr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/hr/firefox-76.0b8.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "f8e3d737b9563edcd3423851eedc401529fb67baa4f82b4dd4924e789b60144032c675c461350fc0fd86410accc89c3fb6324a3cc2524cc4fc74ddc24362f602"; + sha512 = "91ef9459edcf44b88e9bb6c5bdf1a1d5689c99e5a44f14f4700d0821e0274e9f8c3f79388c7a97e0aa235b8ffe1099ac80a523b4d62420eba5163a608d48aae6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/hsb/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/hsb/firefox-76.0b8.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "8e36e7885f185d43c46abd2fbeb54dbbfc73ce2562874a6ecdf91dcaca9d6516884014e5b0640eed287ac578ab0283b045b6d2d5fb49cb6aa07a2ebafe620da8"; + sha512 = "8173f8c47566f7aa486266b8c0e83eadc11c484f597334aa48eebd3ed353f5910eef527bde508e98f082240d01804006ca4771aa7992290b254601d2eec6a206"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/hu/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/hu/firefox-76.0b8.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "fbf5014981544ef8dc0301aa92a9e809d02a2e861b0f1890d227f980fdd8967db28d092ffec3d8e3d3eab70eea955c0d7cf6cff7aedad3ec73fb3c4d34c5d9c5"; + sha512 = "7ceb26c11204ce6b1e6c3596d9dc3e6146422cc3eb0d1ef9c06251430e32f2353ee42b4363204852d6374cc845f8b84997958d2e66af3e770aad679d0ad3e66b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/hy-AM/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/hy-AM/firefox-76.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "d3e4b26d3f6555041311c226aa3e6dceb18d7867075bcaa22469ff4f1a880ccd2d688eeff20bd2096aec8296327aa43757a2077f2d62eca9453ad5f5946fb54f"; + sha512 = "cbc66db54c574aca15f8e2726ff68910d19a67cbbed9e2b63518976e3f614b4f5f6928bb7cdfd5c357d7152ef04ffe1a311656125ff5cb62e471ae59213b79e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/ia/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ia/firefox-76.0b8.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "34799d3a4b84f46df4ca28c62c57ccb131b43a4a7264b0c6ba1503a153534bb9b2bffed6ab581be3fa86df50cceb4103818b7a5baee8a3dc9af15b8205e85539"; + sha512 = "19325c8a1aa3067fa8df803b93f124427519020903ace8cf12585711634f8d546662166f11b3944880dca5eb79ae87a9e2d0e4e273d95543a4641e9cf4324ebd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/id/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/id/firefox-76.0b8.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "82758675bbba9d27115f3b9eee456f2559e81cefb8261d94966f2a65d17ca452c684112e5d4a1c4fde2366f797cd9bb3e98e4fca05a4f4929cf3cd0b5dfd1ead"; + sha512 = "b74338470d7eb1aecfc75ead675e2408df33fd4841ab4953cadadfb9a7f6169f8a10c4896d4d48fe86113d3f1ff312c4298976ef8b997c26d6406f8598b19a5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/is/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/is/firefox-76.0b8.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "e9dc6cff8cff9963c6bf9987a459c943d694c4dc672ad817c87cf5b1620bf6f9680d9154e36d34c36e21f76b19312ecc7f8e90992d55541fa00abc623eeddc19"; + sha512 = "cb3cae07b27f0d485f9eb70805671ae50325491d622dacace2a39606efd7a72e46220e4981ff012f115183641b8e00271ab06c5ab2e8bcf3baeda040546c8b12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/it/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/it/firefox-76.0b8.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "0b341c669e25f728928425ce782af1e723631f4db4d76b628a79afcf239e8c6269f900a50c515b6e81a960de4408496b3d4217a544294712e4692146b0c52aa5"; + sha512 = "83b7175ff91bad6733db2cd095172ef943867aa2dd911c6ec857dbeaad8cf4cd906278f3b8fd488e8905cd5d5574f727066ae73e92948d22804dabe16b4a11cf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/ja/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ja/firefox-76.0b8.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "86957c5b4a95b9fe948b6db1cc97d4ec0110852e921e3dc2819724afac89b5b7a237892669845a039a860d779cfb4116926eda6030d1627f6dd16821e2c81b5e"; + sha512 = "b97a3c637b1632b6a6285af946eb0a2c178d8fd901cb3a9b0fa5b62d14e3bc314acedd504153ae111557b78a2edbb056bd4a255f5971e1ebad3e335879dec40b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/ka/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ka/firefox-76.0b8.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "bf412ae236b800497b528303cb3f1e34b051c3e3fe235b780700f044bf61e68a7c7f112b72347ab8c27ff3dacd6cf6209a3e0acde3a931b29be53dce2f580ab6"; + sha512 = "2f5ae830c52bcdef8fb47880c6941d5aaf4830139b77c59c8e188e82036d315f57732633ea785c54a950d086ea02423e97ea2ac01105b5d2990821c7a15036be"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/kab/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/kab/firefox-76.0b8.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "4bebea8af04166fc6dcf87c2f2ba96dc752adf9121e01e5edd9dfae25829fede3ea7bc1e5245ab4a4a98af78d4211e8f1600a25b52ce97537c809169f5c7602b"; + sha512 = "4be9c49a6b6203f2f3b3aa3b5ee2c3246d77409da5a7b7cde2c14a3fa592eba87715199447df96688e95d9905d6f1eadaf867ffe1d01be9a12feb03255848c84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/kk/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/kk/firefox-76.0b8.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "1c04e195889e0b1e936e3cd3d0829c06963270353f4ff4b4e7dbd494436107848c07c8c2753270f2db596d32140e90f28e17188266e97bd600212a6aec708cd9"; + sha512 = "d15c5f6fbbe9b16510e94d1cf49f36fb758a97af5e75069f38b33aab8be007812d88babdb8aa365fe3e4c17a822be234111885a2d71ff335bd7ec6703e81434b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/km/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/km/firefox-76.0b8.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "2b10e6d123c6158c250fbe3b5509c69937576d4b8db6e6c36fe44b25309c099e46bc807d7039608c5610bbcdba84d4e7a37f25371d741690c62308b26a6f3997"; + sha512 = "351facfee64d07ffedd0e5509e8b796d0432c7b44ad29d109c50668adb8fb13f408026166a49f37a92f99bdbf7e032929a22088d4bc42c14169449234841dc90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/kn/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/kn/firefox-76.0b8.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "10d9af4c6d6983c521db9fddeca2f8cf3b975e57772ebc7c6ef9af92a0436137ea277405bd1a2fefa1e8fea05cfd933582556d8f7cfc629fb21ae0336b7b7ba1"; + sha512 = "dab3f1437cea072c466c9407fdf647f368838bbb7c30177642bc1247a8002874f832d0661e8a3aa32df8c0017f8c664caf6125b6989a113cd08f9c874753dfa2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/ko/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ko/firefox-76.0b8.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "00ad6c4a883e7de44eca52f1ff79b5c7fab992fdeac271dd341e18c9d2a9060efa33c5425a8cb81248e11377426888b66373eb35f2d8a5ffd7fb6d942f83b5c7"; + sha512 = "b62dde501b06b4d825d9ffa8008b45a40bbfc93123df07136128f22c7f6e1f1cc42a0ea7e97c1a962a7b1a1a23bccd5eb66785a246781769b22bb43b8ef451e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/lij/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/lij/firefox-76.0b8.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "46b3475e7f24773799140517e53d14a02d00e2bb2e09543fbbed3797d0b098a93ba226b146864c83a3945815b859ee124b7e2b5cdd484ab6e72157787fc8d232"; + sha512 = "9fe6488ed61c360ec1ba0d784409938159637c96abff94ebe18f198a8c0a72b052b5b0e6b5946339cdc5b5b3288c8e76811704366a4e9f9c498a9041955f7df8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/lt/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/lt/firefox-76.0b8.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "f1088be15822fca949331c2977aed82c3db214a2d0c97bd2494890d427efa5fde0846d2ab552c254ef804f0cfc8623bb6fdf9275d396abe354c73dbd9d138eec"; + sha512 = "804c3639ec0275d844f9ea37b1ccf5f259c50301cd5ee719b6be07a5097218937b5337a25d375c0d534d59143af3fdb338809fd9490a898d226e9cbddf39b6c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/lv/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/lv/firefox-76.0b8.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "3516bb6d83b565bc05afb340d35923e32265202c203f498519c632731fde4a6d1fa1d1189f79e50b315f8f135c383c4d07d5ff44861130146c3167e7d899a416"; + sha512 = "14b263e7abfdad1ce738d58bc30f054f80099a7513ae443d32aa8dcde6b12f2daac56aefe9d3cbc2db9f9cab573a5ef2b046b8e8df9d5417cffea44d109d1403"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/mk/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/mk/firefox-76.0b8.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "7b217348ff5e7618f6907f2d434e55b0a3f7a442771bd4eeb00964563d601b73254274fdfe1280c86ab3fd397ead7ee7cdd0366cf12486dba208ae08225b38b6"; + sha512 = "068eae194df8e756a668b8e372a0790ab8fdcbd5c54b823c82106230a9cba32b5b6e530de7a981273c67af25e5d329da2c543c8a5c96c91f010d19b6ecb25bb9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/mr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/mr/firefox-76.0b8.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "fa059e39ea57570763a96c4732e4ecce3cdd7afb9486669a209f1bebe4b65a4fd22a179f893a05bfb20de97ec8f7c22b6106b5456e752ae7093fb37f36789750"; + sha512 = "6775e61398e028c2a6dcf9171ffb3d8fd4746653beb58e8c012f3256685e545abf4a62d53d67aaed3a2f04f216dedbb14a09920f24c2b6bc288fd29caa1ce2f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/ms/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ms/firefox-76.0b8.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "0ceabb970350d20d5189dca2c57224f5c0e09ab7aaa90ddaee4289df038ad647f04a3476275582b3168f553998d452e8c5a04e099e34567dc03be1d62681c696"; + sha512 = "b66a91988d816963731c823f16d001b89ce14928caa129ef90dfd1f01e3c54cea2ddcf0e5f7fe34ffe23b265c0a64715c3877fe0c5c8365f80b859d3e06e84ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/my/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/my/firefox-76.0b8.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "1540e1335b36c46574b1abb80900ba622d8f2e59b0ac5e91809fef3ec16c1dfacde14be967449a62ba2f2f2bbc65fd3fc750be121da6d2b6fe5de7e30eaa01dd"; + sha512 = "29796ba9076ab6c46f16fc06119a267861b34652322397e77872a7570e8375e3efe88c3c08731cc8909d817d3eb71e269f7d245e691b8ba4778bb653a766914b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/nb-NO/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/nb-NO/firefox-76.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "02d16488ad3e575a87038143c77287216290e355c1fa274233099b15878ac10ae0ef4d95651145684fd2896c09399099ffcf329922f093803741efc8f028be65"; + sha512 = "d7fe426dcbd53043a94d143a038fd901875630627e98547997be62b3319d5f2c2172ccf9315886d97d30c4a041a099e0ad8a229e840a0f4061faa9d6d3c64361"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/ne-NP/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ne-NP/firefox-76.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "9fd9caa037156164fac2a9c1b4bc556a8d8bacda7fd2fd051cf71f8614e7a5a032b5e60168821c72f2b0c17b261f1ead1fc16218afeb022751ad39437686976d"; + sha512 = "093ee3c1d513adaff69bf84f5b9236c245c4580ae25f7caa642be239a591ad9242b329f15e2dde0969d12223cb6ab8decfc657ca440e344a87e42dd880450adb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/nl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/nl/firefox-76.0b8.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "ebee59e46e8a6982d939c8e20c7586e0c273b9c3febc51eb69ab95e36b47060a4c340d321e935b2812bc7431fabd586b7cd88d2bb4f03a3dae167cb2f9b382e3"; + sha512 = "e912de72ee10ac764cccf1243c0c1f8fcf159d6ade88c7ff575a5f7a5175efe8086d8b4ad4c9a72cd65d59186665d0e11abc4399b0692428bb8c93d025de2f9f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/nn-NO/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/nn-NO/firefox-76.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "57c77cb4b877ecc1cc0cf37064c0c19aed334db2cb3d16460157941baea6d67c9459e68057f75f9108b227777e724caa7cf15e9eea5a9003544a864ff5a0f5e0"; + sha512 = "52c57e140593211af5abdf729d4dd45be242539aaad4688ab081d311804d56afe05ac6ae3e21c439a560f5213e49abd1ae0e5650f091215948ca514ad3eb7e20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/oc/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/oc/firefox-76.0b8.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "8b184fcee7e71be29ba02e615fbd9b050d8bcd2578639b08ff013a29e3240bd2f2be72ba9647edff2f80e23cf9723f14bcbf3d35b589d4f340f14888cb7daa06"; + sha512 = "d249ab86026370ce7f417ddb7d7cc0a4fc58563a1c12388a4e1628938e3af8a1428f2e43cf7ace0c9e455e4b4999942221fc3d96723bd927c50f7e45c7bc1a1d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/pa-IN/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/pa-IN/firefox-76.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "6a56a3ba86d28fe28d488ba2c5f3daa1e994b3b5f801e505ce5006cf78d40462d96ba4c9793c68cc23c687dee7aa936c5746a8838d54e80255e9aed9b244dc5a"; + sha512 = "7d5d1861559627f9a77160106dd5c527d09656be5586791c2bf2a61292b1cb1150c545ff1f39a6744453af58bd44777b9668993a10e654ed4c8edddddec12467"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/pl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/pl/firefox-76.0b8.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "cecef84e1c88e19e4c5881d07b842b9d6ef77b1293e304df4eddc68a9533061929582df8d2842ca9594072c29e0d564122ceb1ce9670afa7ede0f33cdf32da62"; + sha512 = "24a419ca7b8c82112bac80aa9d956f3198cb324991492f9f66bcf0d64fcbe5618a2e654849dcb5794399dad32de91bf48bd3bba70003e02b9bf28634b8d4b267"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/pt-BR/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/pt-BR/firefox-76.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "80dbe662dd616c6b1e5e10be423f906463dea4e6a7c894ed14a21ce26ce544c0fe258cb6a7c9227335d18f11284bf082988a746b66243b44cef6b34d10cb0f56"; + sha512 = "cf33be7018dfffc891e4cac9950ead0274957b9a44e27bd7924abd62f93e69b575dbaab1a663ebf829a05283f957dae0a7442abe76e8e1a8a6e35e12be6e2821"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/pt-PT/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/pt-PT/firefox-76.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "5c30b271b67ff97687e833c083d789ac86a79da984b3ed7ca3f9330f2b4412797edf5dbea0601d6af9cb0775cd571a55451d4fe2f2ec48c1738c08c3c93feaf4"; + sha512 = "c368498ffa8eb48801634fa6b50a74a563a28d4fcd23e4634eea52fb6ecf2872e4cd91aef5799afd8dcbf6020c7f694dd3eeff1197c3cfdac63bd72acfa7d7cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/rm/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/rm/firefox-76.0b8.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "d7e06efb84135db959d28c59d6b258b658bbe2f0961b1b3e0da796d3dd8ce4f2e726c1d719a8b111c2388285ec88528e6ee2d11fbbd6fe07ea01606984ab25f9"; + sha512 = "d2064ab0dba1c122a599954efb01e4a68f189a1ce1d5059d60373e8c4b89c860d6b6a68c1e58afebe65107c3f8c5c5f87e771cad61efe7449e86f8ce25bacc5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/ro/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ro/firefox-76.0b8.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "fe9aee440439e425a99780033da20ebd8a0928b30d862444ffa3d8d8a0cee012af0fb998de4eb20604e260d4d0b0726c20646d3bd3064131f32ee7b748e11562"; + sha512 = "64d566ac3acb823cc062dddaa33e1ae321edd3a4e54b02e317a04595bbc145ee4cd06f3f84b20d1853ad6d0eb4cb7b13bb10bfc8383799264342a409e2254dd3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/ru/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ru/firefox-76.0b8.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "dc89313d47f0ca64de20fdd81afe30d797852333040f72243d8ff7f6713333dea6264bbb81cd5082ad3184ae463348816737a327ee2de2f7c446b32fb6bc4e80"; + sha512 = "2240c612c9d746774fba47019068391d6e08fc4933b082670269cab1416ce538b2bf9b948aac994e81a31a52b91a11df6968b847ce0e843615a75b8841443c23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/si/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/si/firefox-76.0b8.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "45719657f156ce045666b8f2b3a3809d37eb9175b8f4750ee97ff6a2196236de4af8d3d1b47c2b67bedaf0e053111487a5682ea04230fc566dd2ec28540c29c4"; + sha512 = "f579d1d21cb45d91394b9a08e1b960a43ddadd7040e417c20e66e1dd4d3f7ea3a8963ab8334e49cb22ad6eb2ef81ba98eae1298acab3abfa512fffb6024da622"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/sk/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/sk/firefox-76.0b8.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "af8f67818559137004954538f9b977516095abe7c2203ff0fcb3e942bcb14294e3e87db6a3b623b2f711eaa7c30fe98019f4c674fe6e735bee5c1d5341b05eb9"; + sha512 = "6d2436ef789404b6d7247ca222cda81ccf518b91bb854d7f53b6c2c1c68b96cf5785bf6b768e49a0b0a4db02fc899c72969ac0c1441ad6bfb8ddb944e2388d8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/sl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/sl/firefox-76.0b8.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "2bf61fd712342493e47c134cb97cd7b174658551d22319face8e3d9df3c89081fa5326feac3d78604bed23f2a334000ce6e08967f36d4494fc98551bc2113754"; + sha512 = "4ed452c03a08506498ec2663b6fab477b2aa52c9505085b493d799b19e5215ac72a90ab642ab2ba3520c609909b93a5b176d5f13c79066598492e7babd94ecaa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/son/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/son/firefox-76.0b8.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "33d57aa16bfa5851ae02887f845ea442ddfb78135f1af37f503503b3ef1057b74e631aea2fa8ba96629e5f13d3fb26df32626a11b78f589f39db5901e4a17623"; + sha512 = "d3c77c8a85dbb280f75068ca49891de95fc081b4074cfbd569c773fcfd4d0b017e2b734a6531dabc41dfb3e3f7accb51d47e7cfcff2bae6f230fed8d69db2073"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/sq/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/sq/firefox-76.0b8.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "813e08a3c6eb60b352ac4b62e7ebcfd9581650b911facfd301f6bf716ca8031283e7fcef9b9a10b2ef4ec52d19cfb2870b24fc0cfbe69fc87bb4457d8b696323"; + sha512 = "94aa56c2d731533105c9e1c7d20862ca9cfd5729fd474b2ca784e2528f798915e9dc177e5966e2b5bb77d6eebc7962e6564f1494ecc284a91175565d25451cdf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/sr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/sr/firefox-76.0b8.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "a7c93cdc4e45d826e4ee4dd62f6767192616f8b8efc5200137d8290d5bc6cd54cf391390e2ed831195187a0be14f539f8156548b86f4fbbca3c1951a3c1961eb"; + sha512 = "3785e6ba189c2ec41f56282ca8925c8eb14d68157c5c035e90fab09f27941e67c9286298c07c31ab0792488f2cba86bce166adf76259d10cc3007f5047847392"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/sv-SE/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/sv-SE/firefox-76.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "ae6ce8e076ccbfa89a653d7458fa395cb43c8bb4926eee153cef0f7b2eae0843d3c54358206d9dcdd2ab8deb4f5416f22641c71c7665ac66f9bd5559a1ce3bce"; + sha512 = "a98ea8c31d5e6ecf3d3c4b0def2d2921aacd901d095ab53aed1da202937022c073834fcb1d3ced826c294c18660d2e4888473b2f8f9e91083bbfd0e040fa6ae5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/ta/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ta/firefox-76.0b8.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "853517617c258d3c441cda468fb3d78a122cd75a369265ce2b290721e08daa1b681c8c84793339883bf701b0e7c5a24744c3382e2bcaa67de92b40162e420b9f"; + sha512 = "5c64882b2fe34cbff29ebe7668ba96526abfe29cc599881331e048da2655ec735f8425d98f64475073e86508626b464364e3a7212b44ac297e6a50c7fdb5b4f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/te/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/te/firefox-76.0b8.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "e5e511d2c19a5c289d337e5630c1a1d3aeb8edc5c6c5192fa8ee36c041c5ba1a344cefd5331c605335325b34d68609c08ac57816d33590c6f9416f50d0a60a4d"; + sha512 = "1506161ae00a4fa203cce5b31779a38f0e7df94021123cbd57197cff807a4a6ab2ee9907240b70b55e6795574b4074a83bd692d2b4ae208438a12357d6a898d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/th/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/th/firefox-76.0b8.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "498f18339722286b024b968e0db485edd8d16cd944a1a84c95698695f4b0afda99faf5aa23e9dd893ffe0cf89fbd69f0ef34d9c7080cb3aea06178a38a1bb2c1"; + sha512 = "97950bd4c56df1defdcc7f6f1693dd6fd0065805d63145aca80242e2d5a83186585dc1a165e7fe9a0dde52a8f60fa6b32ee097fe0febdbac5937a410e654b20a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/tl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/tl/firefox-76.0b8.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "d04963a4247e8c53d748b9d32d0787beea159f1da8e31164a162de4090fa521d6a7c5a598a4874bf8b2be64733d922748a615d08871c90ba693bf4cd82d1398f"; + sha512 = "994980dc3ad618140b0b422db46cf19cdaeb99c4d3202c426c415494812b5cac525b43c4b290fcb58ea66ab9330680c4add11e8ed92a5e36b7daeab19c96b4bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/tr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/tr/firefox-76.0b8.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "302a68064154f22e5bcff55da98dea6fc94abedb839f572db61e9542bda47021c740b51baf57741368a9e616e9a3620dcdba96f55f5010d783da1cf1e9acf37a"; + sha512 = "65558235961baf87812242607d8b77f6e843bc5828e79002d55dce462bb2d40a00ccc97a9e83de56777d1e0ca35991a2c577ce40217964c481930a4081955289"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/trs/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/trs/firefox-76.0b8.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "26ad41f597dc9addebdafa5632e0fe930e6b704e65b8b8058773de3954e1877f9b5be4856a53635417d7027364ce4c70025140caf53605c18ddac59447007099"; + sha512 = "cbc3c626919406af47ea8a00e01fc8146838042a8b7a04fde88f39e8b21bb3ec8c15b9ed2b327f5df1bae621427c8c2917837a29c95f27b1bade9d82e4eb93ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/uk/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/uk/firefox-76.0b8.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "d5d63e51c3cc11ee58ee0ee2c9190a66d4cf136af6aff31e2db28107e8f3af5d492d92e5e869b3bca570f7ba9f4fb513df6b21d064d75d5d246671dadd050e59"; + sha512 = "70ac4bcb16191992de317cc6dbe2f3e8d6ccd0b7bee0568d7a2272429bf164610621f53d6d3817ab6b3c7643d63db243273f6e99dfc5c5133dab4645f9824174"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/ur/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ur/firefox-76.0b8.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "e7a3492d0802acc3d3db2410fc57282334d16405ecc6ff3420c29c6eb35ba313f3e46dcb7f0fe830e0869b355138f07ef51b33caeccceada7ac7e95d69cc4304"; + sha512 = "e66011a9db9ff2512dd3b2a338440ecf268141200754b0dc09c484d1504534b109aeb83364181b3bee7b534ea078c879ebca1860af63c388689517397055f670"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/uz/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/uz/firefox-76.0b8.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "397adc911b685b261cfb38f50ef9f107db83c3e21c5d0f3435c47b345ea007c9f6cd98f8b0353c804071874e3d5bd715d5942c484f1062ad8341a9a781b1ce93"; + sha512 = "e09d595c56d8fb54592a046a6e4f9868a1bcb2bb638cbecbb87f94000127d0f3acedca67ea7f8db15445cd2142052873bf73ddf4df2fcea16373c614d6501728"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/vi/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/vi/firefox-76.0b8.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "049675506e157ec2d3b7af91a6bce93566c990eae6334620de4fc1c9aeeb9bca01cc16b00c79d0396ec49470759855b690fbbfcd3b4b1c5ee90df70efb9eacd9"; + sha512 = "04d5647b360d52ddb714c25443b55558b3d54fdb31a385513832fba336e7db28a8dc27653ceef32e72a4dac7cb771e82178b6161b55917c07da839e80523a8bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/xh/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/xh/firefox-76.0b8.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "08cae5e6d2b4a826e4e4c6485a793ba2a991c1759498641c63f4ffb8334c68efa6190bc7d33fc8ec83e8cad8299ca81825dfffa7e20cff6179e3fac023a9d3c9"; + sha512 = "bc564788b8fa57981b7963b584a445d69e4c198ae83d8d6ae1a5e4402796492bc2cf92d0119a9db067f75577240b0e9d6afb2f38fa94e3e101ce6481b8406fe2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/zh-CN/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/zh-CN/firefox-76.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "c989ef3602539795503af56d6ebbd426d4985db0c35be60eb911b1f46ac20b317ea15df3d915fcff361a22cc6ec654c5378c615e5b5271b3f436a2f4713af59c"; + sha512 = "38fc3b4eef5cc6ffe867665d82dae4156ea2676749a9dd0b15bfbd9e01798829570bba75e0023ffdcf9b104ebe85911586eaba95868ab0773b22e121fc75679e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-x86_64/zh-TW/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/zh-TW/firefox-76.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "8c3479944dad80dc70ebb285731ee8df051fe63f8d0a5bdfccdce5315ed07e54bd66e4b2d0c7b75b575ff63dd2dd80117166382e389c21a581bd848570805c70"; + sha512 = "73477a782280c18dd42d7d62e26cfc5674201d3904d155c2ac712251ef8b65f422b522804104d7374865cd7e8286a8ea9291cbf7da37d412a1cdf8d24d18a3ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/ach/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ach/firefox-76.0b8.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "547a8dc40bea2ed9cd47acd06c1f6a0e12a0d4631adea0193d8f0ef8baa41bf4cac9e53b7954ade543ceb85cd22cf0798b7212b2a91d795782af5f2575b4c729"; + sha512 = "a35694c831c424eda7b6e5069c1b03d1e6b2fba051b3a29a7e8ebbded9b3b12fc1fbd39131d86f1c0d28a728a9ef2b7c8f903f6ba792d522c5e96490cf68563f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/af/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/af/firefox-76.0b8.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "cb853435e91129651532055c5c5293dbfc758e806a316ade7023ed0f8e646594834ee18d470fec2372f954e1dfad3aa8ebe7f9457cb885ba8758d55e1027e8c0"; + sha512 = "9fdc8e1e39d2fb69d3afb64f676fa85fd674b45eb86d4d4735df403bca27eb499be9e7a6f5f9e67cd3e588352adb29ee805b403f35a859c3226507684a69ecc2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/an/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/an/firefox-76.0b8.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "6be613e6d99cf74fe7f08c109805b8847fc8a4e6ef3c972baf6bf2ea730f4eb6666eaec2606560f2d14db649d2148b718d4882af9aad894becdf436b08f6112f"; + sha512 = "1da6aa658841d59069bf57960f9c5888e879056777e4c227037c1745648417356bd87bf062de6afe41058a290998e7e080ea7fec895cbc86619d0466ab0bf64a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/ar/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ar/firefox-76.0b8.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "28d5fb36ecc45d3ce09087ed2aa2da7431334f66a6b183187d36ac9309f9785d32e1d59f0bb14ae281f1a66795f546507269919fb001ebbb72fadeb79c26df69"; + sha512 = "8cfc1c08b728727053277a60c19e289f0d0407e01cb2da5632cbbfe5ab48f751298f4f83930dfd5907d4be8973a4aeec3f3a719dae16827f48f0eb0d4151cd03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/ast/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ast/firefox-76.0b8.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "8384154a51d40037a39cd4fb4bb21cd9c7174ec75c9ddd36d79f35bea00380b1ec74eba449b240bf0cd66ffebd014c9a948d60bdcde7efd67e5136d047b75bb0"; + sha512 = "96c7451450e0d6e133a6576b098b37dfab5059240a6107fb95be17a82e9600ffc4003b60918f4ccd8907d8aef814d55a79a61107504f41fe086fe3d6c83232b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/az/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/az/firefox-76.0b8.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "84d902069d997ea001efe7f836f25d78fe921f40ad1c383f3d510c34f12219c0ed372a1aabb27c5b43465dec2647babfbfcb3e3d4e2916fe4641063df4547f46"; + sha512 = "0211b3ff84eb9e7e9f6a0c81a141273009a2afc7ff237bdad751bcd68a24b60c9e9c896a836068d3373f0a0e6469fc77ce8f502197cdf9701ba033ab63eb5e03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/be/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/be/firefox-76.0b8.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "b973756f954d83a87e2bf9b114c5b5631b42819abb1f586c6ab9fe49b2599fb9dd5bffc995453113499db2bee449e2755db61cd4957bdc6f5be7514d62d7eb74"; + sha512 = "e268741abb735b0425d42fb21a1a70b7035f915122c64e45418f2e61a3fb5f9c123b53e93979c96e7a183b8511cfeea4c3c6e3af87756622f4f8d049657a7a4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/bg/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/bg/firefox-76.0b8.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "a5ae19c797b3c32f20db99777cc8b35d586f9cf2e5714213cf4322df140c6fc87ff2cb03c0de88f9e48395d808196d54a1102b659f9d574f0c9698da5a7ca7a4"; + sha512 = "3de7753956fcee2d2697f2c8a3cde18719621ae4c728b190d43b7e936c39543d6d6dae3ca593698931fb17b0270a19840377ec9392d1eb8bc591dcc7fc915404"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/bn/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/bn/firefox-76.0b8.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "63d6f402dd97e0728fe77428b13a3532770e13d7f8099b853d370d0db45aa9c1c753b2523c25a764cf810cde0c50f1db932e26416b9ea38eac56dbe89e7ea697"; + sha512 = "ff9b2217e043c7cbba98f9993c729d23dea838e6f120c6adcbb4d03ff127484111ac2be2426de2134dc914aa765550ae62a464822ed31b24231fdfb50d295610"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/br/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/br/firefox-76.0b8.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "7fbdeb3a3c1f5adb723dfbeba22390091483155b30fcfb3f80d58b47e181f7b88bb0870c5e2a82b638baa3771ba93f776c47f5e98f66dc40ae9ca58933ba311c"; + sha512 = "805d85cad7af9264c1e8e3534b6c6248573ae445410616a8d74402cda2273b68dfeae4d47240e0247fb29b56bcf6f2d627f4a872afa8eda3d8156f14bf8851af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/bs/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/bs/firefox-76.0b8.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "7fac00f114f2f792bcc4c42febd5b8a5a1a7952a7acf2d596c4ee4125e82e510d956a7de575405c98c0fc776eee4b27ab24291bb4f5db6d5a955be5c0d6c8dd0"; + sha512 = "40f56cc3fa11d85b7e9e8d770ac5bec91ba5b8203e11a0cf898ef6bc94d58ddc73d6919e5c56a2e79a846393f28922233211784e693f3da63ae9315f3befc80d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/ca-valencia/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ca-valencia/firefox-76.0b8.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "75b7d3222b5d3efba3d97ebe44b1b28e82cbfc441689776386516a84d42075f1ced4b80856c1a8c87d3cd8101376cf747a4a5eec0f442608fc303862b34a7193"; + sha512 = "00dafbfb3095d7b76d1bf08bdbe5e99cfd207b39ae2a787eacb39ca412f1b2ea7c4fade4c99715f44cdd774823c4929d0efb65b40757f1b86faec738d4f11493"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/ca/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ca/firefox-76.0b8.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "23e050317e92745044a0a5af3b9455a8f112884fbdf9e9d701ae5e8c614cc3d97a4de06ab10e2ffe22344c38108e575eb8d8ae6a1f3095ac1ba15bc6a37b104f"; + sha512 = "24c21262e498e8840cba3f8411d8f46108f736f10bba2a0c37ad9fab6e0bc773f38ac086334d3d572e19223309e9d106035d3458e05c9b7b8db237b7bb1e1984"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/cak/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/cak/firefox-76.0b8.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "58179bf33afda4d10fd6dbb9143f6724ca8ae5bb6122b292eb48773c84458cbcb85120c2ea87c6a3f4f4878004fdb997354b571223a35ef9cdee23902292296f"; + sha512 = "fa849173b8af4d6be6a499734042763d2ac532e213cb863a611e66e405acb5df7a51649bb1f9509ec637e15c055fdaac63e380128290623b6d3818e528a9c532"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/cs/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/cs/firefox-76.0b8.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "41557936332f5c966a1b51d8791699783a162eac46b14e22fd0f79abe6175a31fe0f6252270b51c816c88ec15f2982df17babec0101a0eecd6cb25a8ae900dbb"; + sha512 = "5b718c2dc82230343e35b8d45725e9f7c331cdf5716d973d671b7465e06d50e92e0a353c73c7c31c33cec1115b9332e2457f17f6e5fcf8f033bcf7e222802267"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/cy/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/cy/firefox-76.0b8.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "1603e2dd3cfd417b12c0a6c933708835505cc8f5e0e827fb5072af0f440a0dd0dab5d961d58fd712776d58e803d1ff3dab179c7ab45a30e08be6c895fa1c1c06"; + sha512 = "7b037bdbe658d26c2ea75b8da80b4040b9a0c4cefc00784bb94512481de435463605c565eda38f0e958725adea11f09a9ec5a37d9513c16118214d0486db9031"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/da/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/da/firefox-76.0b8.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "4ba2198d4224c3b2b609c8471a1b8d6bd47d51cb42caf81e7f1a4e7ee0220ba459b4d2a4d6270d5ad25806d8ab0b9012cfbd9e3b242b4f4be54f0c5f7885ff67"; + sha512 = "9752b73c59784ea54a95b0bbf63123ebbbfdfb7d2742e3418a872982c0d8198fc0450b3c33f4fc569fcd43a633cead3ea1893057b6d7e8c6ab78632fad3555cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/de/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/de/firefox-76.0b8.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "1a3e1997151a4a74a6e2a35037564c2189f4d0c90359084aa387212177ac3df08e8114b514bccbeb9b7b63dee5eb8028614c08d680cae0529784cb471864b380"; + sha512 = "067ad7a8a5a4c6120c1f1be2f9b4066f1ef830e3cb49ba850478d18693c8e4ab12d54a07036d23ddf3e138837320728f1fd6bbfffed760b530d8ab6addba6b20"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/dsb/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/dsb/firefox-76.0b8.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "6e40f39108d5f00faf81793852de22623574fb3f201080a2f9d8e3c31de80373eccda582cc0d63adf6e86c67748ece5b5405e880e6db8636428c3139aafe156b"; + sha512 = "9f4b6f73a3966a7aa60c168c16d88382dcfb278f934f3fa485e691a6b6af43a14f49395a3f8177b4ca9802275706b2cf701aba2310262149b0bb42cf6d096c25"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/el/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/el/firefox-76.0b8.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "f08984d8fbe3b5c585e7e361c1f21b7d6374ee3e58a12aee599444788f89bb570d277fb178a76e773917ae4445904e3d3cdae99096d8e1b8a188720a161d436b"; + sha512 = "43a0710f463542a1389e98b5993d1d1b35f443f0a0ccabca65ec5505d19c28311d91cdddee4f9c102b6f4a25a87e4c2c6ad7be89252f60a724c7af935e30f675"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/en-CA/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/en-CA/firefox-76.0b8.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "6fecccf3fef10d99fcdbec8674ebca50b4d2a5708bf423778266a440fcd5f7fd4ea0255808d86567fa26542c229bd4ba06448e40ee0faa3a5dcb2b36d694f1ee"; + sha512 = "6717d9c590e5f06d3b02f643ad4eb27f48499ca759c41144aa5e0351e478bacc54163378faedd731042ce56ff5e8f55b2c6b6bde7768d3576b70a0abaf4c91bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/en-GB/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/en-GB/firefox-76.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "d9336c9eeb6678923c53a21873760ecea096262bf4b3cab6afe69c1cf30d57fa95c8cd496508a80bf1538dff3cfd4e68ca864ba8bc9d58906b4155011c5adc38"; + sha512 = "320a50b2461d617962093c1d7eea94517c56a93d6857a4d4efc4183e76f24dc9320619f9c3143c9dda017ec5e8e3d71c730a27d532bd7141c750598edbcb0121"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/en-US/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/en-US/firefox-76.0b8.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "fb405ed1f6c6429c98a7be7046e8a4e39b594febf7ef11fa163c863c3daacc887142cc77d7da30f709ffc6384c2092896f8ad4dc69665701b0c83013374f8a8c"; + sha512 = "ea7f210807e2306d3578c39d1d58ce12525c47cb9dff3198dc9153683f8e49229e19dfd9fcfd3d76e109cda4f92392e4f9f1fac2cffbd59e6430105ebfc705f5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/eo/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/eo/firefox-76.0b8.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "804001240e8a6809312634de4afc2b8a055051e9c8d399dd25cb96f9bfeefdf6b9526c8cbee670616a63420ff848873b6d8d1cedd8496fee38752408bdae21e8"; + sha512 = "bd1dbf20cbd4aadef8bafa74f308f097b5dce955ba7f2299cddcb1cc9cc9d8805e399684cbca1af750535ba0ddc939757f4d38331035e4a708ffe1c252da9c82"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/es-AR/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/es-AR/firefox-76.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "b98d387cc62b3c87acde8336843c2111f67f2ec425ad78ad1033a150efc253561d9f12a42a61c8b2db5a926e9ec18dd466ab81df93fd12cf8342de2f2baca21c"; + sha512 = "1e7a48ba49c4f96ff0d16efa3798e4254b7f38f0da8f51e62a4bb71c13e3f066a64c2c6d778da18b5db83da52684dc39067f6c765987d95921df2b3118de2c6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/es-CL/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/es-CL/firefox-76.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "cb5b8275ef7d62647b623506ac73b87e4552ab7d946838a4bfb7e690c8976d4acf7862a7bcd6642994d0c42c510e6aee5f3177a6a7d3c566678d5f0897b53368"; + sha512 = "9c7e6456459a4e2b6c7aba254afb145ca3c8efa4023f7e023c3cf326b0e0afd88149888265856e9f28179b686e1a458d453acace73f635a5fc8c90419e6fa043"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/es-ES/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/es-ES/firefox-76.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "8c0bd3e0901696be921b440b03c919bd77cbd15f22e3022e0ac077db4b8bd9df34ca8f321f8bc27d459b71f89e19ca5549b140a7cba27014f4b6fd68cff5d214"; + sha512 = "95e2d89e0f94f9ac95489f8a084d0857aa5339c8257fc1bbe7c7ecba31694963831917461537cb12199fda05372e1304e6820683802efc0b4ec02324194ec2de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/es-MX/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/es-MX/firefox-76.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "a580888df34b1062e6dcfd55112a61de1f6c031eb9dedfa4e8150f3b02f907b222e8f8ec570ffe1f21cba29a561f2ffe51701a509249ea3ccd6f2b01b6c00563"; + sha512 = "5fc41cbecc716fb024df2d13e9fffb2b656e18f47adcb496d3f8f3d61580f97fe801435240576f1403805151c7183c208425e83a2ac56373051f0e82031115ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/et/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/et/firefox-76.0b8.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "03ce56316a24ff43f9070205eb154254f139d1791c46dc7d37879208ac59234494cf0e584f43e2c483d1a1516de5c3d8b8d0debe551f377df2ef9d7ef382e6c0"; + sha512 = "16c5eb3e9739e100dbce0eb93f209fecb11b5b024ed62f18a47b00927452d8823b77a14fac1788d9c4bca9062e85e724a78c39630694b0d692b3867e4f62f7fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/eu/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/eu/firefox-76.0b8.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "eeca8dafce55e70b17ae42e8f3c807207ebfc2eabec44934f0f2984214426230fc498f3a683d2e4841787352ba8e52e37f5c70a0e5e78217e9a5516371a35a9d"; + sha512 = "0352971bb2d43782052f20341f8fff0f6e919ced7909e6a860648e9772101e5f79bfdf0f912647d3593a0f6dc9dbe84fc193519c3b24ddcd13742f01ec59d1af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/fa/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/fa/firefox-76.0b8.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "d16ae96bf3c7f4f31861814194f348737f4b02746de6acf0eb377eba8c3d66e36cc53b0cd1a0606d88d9604989bfa984d1897b504c38b06ee562a326224216aa"; + sha512 = "4856a0b482dd0676cdb5d46de7bcd96a4c9aa61bd976f3b46205019493b8933c78d7b253c41f4c2178e2f79b000dea8a9cf13e1fc7a31a5242432e1c9205d445"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/ff/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ff/firefox-76.0b8.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "9aca0543d152c6886d706e759b174a490a52ff897d0a4a455b40c7eb9f9e6cad72c720fce6f63991e995e3b50f4517a5c3640aca81f12ad6e0d4e55c84d78773"; + sha512 = "e85757478feafe009085ff55492913944d5d8490426f93cfca481cbd97842bc3c6dbf709e17c372b5b51b14fea3b057415120b6fe145de928a108c7464de9af4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/fi/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/fi/firefox-76.0b8.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "40cf4a38094db6df21bd188e7ddd008488af74d502d2a151e0761c37ec8c31040863f152419902b38ce28b3e70033795b7499374e38ec354f690489a18e45316"; + sha512 = "f479d48fd6176baf30b0d648120669ba47ae2ec5d681ac6b610d6f0b0a617a0f259db863966625376b63a6b871d56049adc500ce8e8e0e27da3520a953bf1736"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/fr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/fr/firefox-76.0b8.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "b0bdfc5be5c95338b235eea81d9de384268d05af2d501735fe4de3a8b525b6a08f98a40dfbbe60a6adbfcd92e806072a5baec8f2692a0823e686c124bc308b61"; + sha512 = "4caa574275e5c0756ae787e73398f73a2702b36d4d3f49d3a3dfad8cda8393cef24ec0375d65d0cee4f41be8fc94b5419a3b613dda287d884f8e7b6317e3fe13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/fy-NL/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/fy-NL/firefox-76.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "0952e195b01c4a42db08b1ea6afdc4eaa4806f3fa98a35a7f7e55789de6902a255a2a5ea6bacb47c5e3b9439b83548ee81b85fe5c6520629ae8cf2e9b803eead"; + sha512 = "28d31bc60979c84d874f444555e6157b906b9d34399cb87608099e67127dc7480d6789b855c38615b075f5b07f8a6b222f04dd99e5690ae36d56490953135149"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/ga-IE/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ga-IE/firefox-76.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "02d735bc251be237efc86ff7642af066819b59c0c890b9a8c8525306537d52a603301fb81e4f2628a9f8d2af062425022b01db35b19fcc705b8de6d888c2bb6f"; + sha512 = "b83c50b728bb1e4febc53ceb3a4fb8a6589751b5ef77ef81f03941ff33d3e289c8986b501d95afeb56feb8f94be7d9a7b38e5330ca359543948d762e71402f75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/gd/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/gd/firefox-76.0b8.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "404d9aaa382f9d641486dc1339b55f113c6c67f5b7523fb7b2c07c8114b4732e6e4882538d5dc2c57ec871b41bcd2e7248326db84baf4970a0ca451b785c711d"; + sha512 = "e1b2535e07364a29cedf36047b99dffeec8937b775a247b605532376b3a43a8c0037e2cc9a6a461a9b68e00eb67ac1d337bd40ee7110ce9890cf862dde3cfb60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/gl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/gl/firefox-76.0b8.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "fca768b0d97af4c14d71ee0963da7861bebf77d6c67378091842b184360f2ed7a54cb5e9d80918ba21fc34a77f36e2e1402c773b5e551f20b9ab9cd92e4f91b1"; + sha512 = "776e2fb5cd75a8f5dd1e6340af21356141a24be87eeb6968ca926cb3d3aec1b48adde0881a7e4413a83fdf45f5caa3e829c0ca1754cf7176eebf2b9e3ccbb02f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/gn/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/gn/firefox-76.0b8.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "e8925de0b33c779c0f26974a1f7f4f1586b7ff7ed969eab7e2721307aec67ac447dd85ac9c838d5cb9c799fd3f85e0f4e7236fc94111cad341aeb2b8a616c45d"; + sha512 = "bd3bb0d416557c94a57c8b364ad08ddcc1885bf55a2435f5a2f74f5af1607a828795fc68027a470cc95bf46d553d84eed1c0af3de1ae9d72546587b486a1bafa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/gu-IN/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/gu-IN/firefox-76.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "11e8e2d7c434861e4119e5e2a6db9e1dbebcbfb318a9f707f3a09418889c4998faf280a63aa54f1a4d7f970ac657950e558004a019148e77ef539fea38072f54"; + sha512 = "b789f7adc37302354f797988e052957fd95f270dce838352636a367e03475ea92a740ab5ed49c9561eb5e90b106e38a767d6d3b4e8f1b3f07db7dada400b6aa6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/he/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/he/firefox-76.0b8.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "a72b2da8c97f0517c8a1410114adbaaf8d3cb6ad76ad96cea967f6e73e934280e9af3a25b5c4457ba929b91db9f07b6ab740dcd19b0b4eb8093ce943a889e354"; + sha512 = "afbb11407ee19f4d3846673c451848ebd4efaf5795d1f864871c57f7e5d36d26e38c7107e326c5843109f89a315cbc38f25df1622f97d6c355f824d06986341b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/hi-IN/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/hi-IN/firefox-76.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "07f298aa7f1ea9a484dfd918b61c2373b7114e0440759c91ff77d2f1f9712294a55bcd941f689431496fca05aed17d4e8a167e7e9b2afda6da2d5896e49c7818"; + sha512 = "03c32d07601cf4b98d02495baf97b70a38a8e82abc8685ed507f0c9abb907468b1e8b8403b2272c9c06ea8b0cb020bb330f70f8abe5b5fe0c757fed710c912ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/hr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/hr/firefox-76.0b8.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "02f1a630873af11a48fb4a2e56653a4e13b363dcbe49979b56f7049f14f6154b26cda2ac2311940a88be97e055e3e19b54db02044b8829ab833fdf76c2e6156e"; + sha512 = "47c923096c22e509063298e9229f3b74df60142aec4296d7008b5e49c69ee9542915e639b52ef8aa65a7ab9f118d1d23117874a3b717b37930d8a988386b6ae7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/hsb/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/hsb/firefox-76.0b8.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "0983f9e86b860b3070092d2a6f6478ea5d3e73ae46d3c0b2da20c03290d24fdc7dbdf14f0df78ec0d187c37410319c0c7e4ff1a1e8152646780fff0015e33ae9"; + sha512 = "2e2b3c390ad20fef9860c4e3516a32a66b091e1f60a0dc71916172de3a667cdeab3d712f8f2a5baef8857da3d9211fb7bea808b975cf3cce1920e8ef2d73614d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/hu/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/hu/firefox-76.0b8.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "ec77cede3cd23c70f0a8ac5e3ea46c3cf8771df271e91df5e2d0e35edd1c08e0e3151282e9a14c82df18cb907393428f38f58619dd198bbf57ff8f062222317a"; + sha512 = "4c5e5fc5e859751cfdbe1eea6217b92dcd3bf2a30b4967965d0242de72deb6d497823b0d17c170be1e7113a15f9d607a6890a5283c47c254ef2c94022397b977"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/hy-AM/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/hy-AM/firefox-76.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "590562000f4aa0a8a6a4ebcb95ac01f38f8bd1f42e3dbadeeb8f03c4f6fcf62d5dd81fd8841ebbd8716a702526276bad17a6e767d4b6c483102ce0c9ba686ca0"; + sha512 = "6953bf0ef7dfb0b703d4aa1ab9c26b85fc049c12a04d669121e9e98005ae870d92df9ce16bd567aa1586d02162ee94fd01800d4d291f5a0c1b6e0cfdafd89c8f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/ia/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ia/firefox-76.0b8.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "098497d2dbb70a702b0c804a22734b2dfaecec0cdc325ed8f63f2a4d03b295442363c6d9214d21a3b96d63221123b43a3ad27f1335b38eb4198e7cc1c5eff5ff"; + sha512 = "e7bb763c2049dfb8081384059313e977ca44eb3d147caa2fbba755e288e45d6ee5e47b6aef1267e23d4e8c6a625f9dbdda7b938a9183a7012b3d943b857645af"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/id/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/id/firefox-76.0b8.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "38ecd79e96d54887ab8358d848cabfcc638d2f6e66e73349f92f3ef2f4f7f5ed3f6be00e84b4062cf7cca082ebd851fccdb7c398f10c7a56b2f2587d5da7a9c7"; + sha512 = "a4139cd488a85cd70e595bcbd3f8fce96fdebcce2c61c04c06b70ea0f2a99348ab69590f1ccabbf803798952fd436a30bf6c103beb3006ecbd14f70d6c3ecf93"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/is/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/is/firefox-76.0b8.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "18def001b8dbf3e70f424990cb78b54e9700dbe4ac6285acc402c1c28e4ad2c5e4fdd74d703bffa296381d89798bbbc12b9cb929cc26137dfebee683bf4a692e"; + sha512 = "e485e4b6f5a8ae5fda9be8ebcdfa102bad2c55ccee6d9dfbaf2778f92c68e68133a26a599998e134314186b296df68fc0dba7c849a109f699d3198a2c5a31001"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/it/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/it/firefox-76.0b8.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "06084de26c5266892d6da49ee126aa53a96b515ff66669d369334d02cf8c25b553bd3d00899f655f8ac09aa9c1891c247021241bf7ce8600f5e9d4d1bf9304de"; + sha512 = "032e3e3b854a0be7ace835d71dfa864c0c84004c87ff09314615e633d64011f8676118ea73797b725bcb1c1e079fe632e16c15eeedf78602201c7ed371222e2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/ja/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ja/firefox-76.0b8.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "5e2742f4030a941ea741bff0d363ce39c115a83988149ef682c30554ddabd3b94a7d72d9bbb4172ad1faae893fce35efa30b01b9cabf1eefa89c69199ddee7ac"; + sha512 = "dbdf163abdde2bfc22f5574d2be4e3daea52c7cca394a9b0f1f1b8af19c65593383a112a2fc7dc55e224ea6f5d63537f03be8d2cf02fd3d3566963bd0d51d204"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/ka/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ka/firefox-76.0b8.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "f8f2d3b22d4fddbf25348eef1527c7e9bf0733572093c1fed1831feaa2c53b2559380bac3198fd79a51fddf5ebdcbaccf09e27c4d69317081aef52f37abacb7e"; + sha512 = "2cd1446890227f1ba4d7f50ef778731b350f694646b6cf33e1407325784b071db4bc2fe43eeefef2ed98ffc5353538d42df48ff8e546f4495a366d5acbc2aace"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/kab/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/kab/firefox-76.0b8.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "1600fa39c920554bb733009cfd6de7c0cd2ccfe53e91e8f3c770fcce29843dd89c488d733fb0beb81c868d26a74fa7b770fd64ec92459ff9f6a8ff9d98d42d02"; + sha512 = "87c131e32ad46194175e8ca8061cc1399813b2259c9c3e83e612c74bac27c9364cbbc63860c283eeb8416e3b108297ced4a1d9755c0a273c9143cc6b468f5cbc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/kk/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/kk/firefox-76.0b8.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "a2701ef2fa5f2127808c17a4136e4ec291225f613318ec04c0ad812d75356fe90b0ce94c0de5fedb17e16462f46c480e89e1a0ce92ad113430dff04756675b59"; + sha512 = "6977a2478623dd8963121a1cb3da0a8669d1cf17357ed85475f61384a9e1ffc2c1b4286b3d7150386031786e365c33c188cded495036012a63dcf2db44e19d50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/km/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/km/firefox-76.0b8.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "373caab422978dfa5629f4f6152a72e6e8f16f5add1f341528b98a617672c9dec3db41bc3021c561808b2c65124bebc0b2dd39163f3961e46204f9bd1aafe04a"; + sha512 = "4893ae9bb4695b227a6906db91c1df7997c866953ae3960a334856f9a1c99e05937518ecea2e59c5bdf12a4ccd3e644ce328e99294dae53d7a9d9a9f5e2e483a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/kn/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/kn/firefox-76.0b8.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "203b7f9ea3ef8520cd9e614451275bad69b477deba0a26956b633545ba203a9a2ca88743c619aa311ea3f4f3acabfe96c2ea9463e2cd5b988951738073766c60"; + sha512 = "eb78a32ea736f139fe1c5cf0a1ae59df33272c6078e643a571968d0a5e4f3801c280aade938a5a714a7695700dbd2db84116f6e5ccbb7362d394ee929a2d9efe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/ko/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ko/firefox-76.0b8.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "0dbe6bdee022274aca34cf8f480b7733f62bb38486c3c449805f636f9bb7439435e9e9af0442b4c4fa6c266cb97ab678eb46ac3a1b42376cc025ce5131c32c54"; + sha512 = "3bc572b109fe9c5b14cb94d7705ab7fa972a99e914eabddfbef4901e5be9f058ee6412c59b2173fa0620166612c982ed6bccb1f4fd684189845a5446c93364ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/lij/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/lij/firefox-76.0b8.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "e98b22e33ce330a8f3da068d13086a48740e4c8de43f0fc0851cfad3cf519e5fb29eae3c30fc93e9c8d341842079655a921dad762c1014d408763de695300876"; + sha512 = "9364ab431f931727157b0722ed021736bb8a2771a01fd8e12e616c02d7ff8a2ad23add11ea720b1d462e727df51c985b5fcad908307af04ffb57af5d25674c24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/lt/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/lt/firefox-76.0b8.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "b9205df8b26104adb8f7c699317d972ba8f1e7de95580e916cd7ff9c019745ee5b60bb6650aadee54c48da773c65679b9427a3d8b3efaeb70a345e71ff8de837"; + sha512 = "c2ebacf0d93c38d51d16cda493aa1152f8a682aa41b7f6626422596f21038ae16d3419873dd253f60f59971486568f3a71420df4d2c503a79aef80ec413adbc8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/lv/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/lv/firefox-76.0b8.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "52df48db54bf4c2029366836708324940890d6387cf0ad21b918c420e9388b8f6cd29ed88e4eb230d162df0702fa5c6ad3d674a56d6d4c0b8e273f1776b2f6c8"; + sha512 = "a1e0962bd4a10f1c1336650e97ce79fccfba6e752e2929156f60ae10a9b3a9e74b9e2cb8c265d7b1c242b2a34ec52f2368d07777bf7c687dbdd7914daae55c6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/mk/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/mk/firefox-76.0b8.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "610086ca01b542ac23e6b162aad833931354729df4b90949f2db3a22ee6fe6193cb3bce1472a859bdf5d0e718c4c72d06b0427df2001a984cfa2ac6d275c3e51"; + sha512 = "e6b4cc5658ffdcc1a52979845abda4870917f8d036588daf1c1db93645696c85cbddc8a8dfcdb6f6166c43276ff52069c3c4289db38e9e98e7592b0d83fe3d08"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/mr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/mr/firefox-76.0b8.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "725e696800f68a6ef7c9af9542d830a38872b4ca0aa864d1d415ee05f1d287d88d7dc19346f472fcab8f64094ff592575787dfbe2c62e14c97d69e82b8205bfd"; + sha512 = "9d4cad2c1b192b199ac9a7c0ba233c0096546de7be31a21c4ee5789c82fa8fbaa5b9c5a37ac4001ef9bd774b62f57d33aa5760fbb0ee6ce60000f256e91f7054"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/ms/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ms/firefox-76.0b8.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "d6cee082a677b0f97f9f2792a4bbdb1b50d96b09693ce72b9de855eed006b6da6e89f9c6e671aef06ee9b7c166d1136ca86b9c977ba4eaf57790537917b0f0dd"; + sha512 = "56d8a03ac84fab825c387ce84a45efd656abae43f9ea965ee45a09b417bb2634ed1f7fde0874294cb09ff3e3789782df7db19b6fce4598073a81854a91a6f800"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/my/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/my/firefox-76.0b8.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "af5c543a13b1deb82fbe7596349a883c61bfff3fbbf029a117e8194e27d16d587b721c317d96f6c76eeb54a9a4483fbbb416a5f46290de64d7048245c0d000c0"; + sha512 = "a9768618490611f5073438986de4265bbc7bf3a2613f4314b78533430d1f830f83b7929c74d431d8bfaa2ee9d5ef64b189695ac838c52c5ee6dadde88d3a3606"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/nb-NO/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/nb-NO/firefox-76.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "e4e6e9d1bf9eb930fee48b2ffb29da791fec545a835e034799bd88423c7cb207d3a24d68e8da2bfd18a20529b1d03d818fd0d4331ab91099d7c01ccce44a289c"; + sha512 = "4a413a17a3796f4ba4b0b783c4226419f7fb800ce4965288129cae2f1f087a11226376764afe51e09c57a23a85df762bbe833d167a13b6c93c22fa378f0ae47d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/ne-NP/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ne-NP/firefox-76.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "ea5b7bcb45fb54509f2d11d261c1c1672e1a2664e310f291c7022bd11e69e0686c2a1da9f8b42d7c6c152b3e1213fee221ce44576d7c370bb09cb128c62a04e9"; + sha512 = "899e26c0ab61e7dcd4ba97b4df082b13fd93d07c22e849a02dcbd887f870df0a6de4b05517b200a4917fda6f7cc83d7ff603d8e0bbd96a39ff016adacb669c32"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/nl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/nl/firefox-76.0b8.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "bb0c66623c439b0a274d98498dfbb9aa9ee620bd02fa0f4f41556a020975522799800f23872cbcdf47fbd8592afffd578d10da87d0469ec43c4f28564f8d93ed"; + sha512 = "59b6885bce4c6cb95288e1338d6df199e8710313bd569dcbfa2cd2029b02bdfee9e28d4aa11f561765ef9e51d982a999d689935e18fbdd0d60d8ec25cf4544e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/nn-NO/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/nn-NO/firefox-76.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "e58160d3ca153065e82216d3773c15947d66ed7cc9c646d1990c66fdad869a8717cfb1cef9a2239996b625894cf4214712c36b54852eb955848da270a269982e"; + sha512 = "40e62963d39f0b23498a438c3ad184d0367cdceff9a2674e565153c70bc450992d11145e5f651bbb53f389d5a74eb3d7413968c608b7d7650e9d553ee26d5cb7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/oc/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/oc/firefox-76.0b8.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "d2174ee3a3288bc424d41f0e51626a217dff28f1f8b8f153e9ff5d51f867f2bfbd9c81bfb6ab004053f5bffffa390264c72a9af522ed13523e04e74f03d7c6c5"; + sha512 = "3ea480ff19ffafa1812069ef7dd1ff1852b10abf2ec4cc094912173937b82c744f29f1480de2e95dc65ee1062a766f0ec33d234e3e3d714f49972458a09705f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/pa-IN/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/pa-IN/firefox-76.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "ef26bdbf4c4e602dbfd84c64ac4c91960d648123ceda5039aee40e40c9df360d690d0490c18362f3d29b355578eb56b05fd5e2c8cb10304ca368db6b2133b414"; + sha512 = "8a13731a6072abb0c34241f206898fb59d91dc26eb3f4c0627d2aee2e6a53fba8b3735d8f5f2b36dddca9609ff4c1d9c5d441c350e9164aecc2ce9a69b1f0c5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/pl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/pl/firefox-76.0b8.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "35c8c303987fc6226678c02ed5eca9e36377f20c44a22513aaabbc1a86a661a4ef295a393d86e65707e714df13a877cdb2b1d52819c12382bf063f14e32044f0"; + sha512 = "853bd27d468111e512907ca3226f399ba0be48c3332836342ff15b4a8bc4e3253e31fe91a31f462863f9a6559273ad6693f1bf65a1763178aa3488185779da91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/pt-BR/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/pt-BR/firefox-76.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "9c04bd4dfcb38b887fef24a784fd3c7aec9a76b52675023f89c9d2cd9e83a0bff7a8c00fd91c7ba309112ffdbad1e2e9776ee2eeba9736438dffe0bd7f7a07a9"; + sha512 = "d70bde7178c6ce76eedbd8a8e33617ddc7e7271aff41afae4d190e5f28bddec2094c1450c3782ae7dfe8ea7a6b844d50602e27294454946ab5c65a44b3553f9b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/pt-PT/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/pt-PT/firefox-76.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "a056d933c16581e0b78df43c419fb6eb0fddbd970ad00ad13ace6076a19f21289722b6cecbe859761dbce0c3042a6d00cff4d04de7c4d594619a14cdf8daf5d2"; + sha512 = "6e8e2f7519e88809dd38d694f5a293379af1529afe7fdfd6f19e09e240bfd184291720ac48db382308c8d79c38c955916c57bf88d85ec2d220de7bd872954f43"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/rm/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/rm/firefox-76.0b8.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "6c808501f9bf72bee900665a689ca27fa0017ee23e08ddaf3fc969fd37bf113e189f57aa5ba8cbe3073e08993515120cf9907ef3981a2f18ad3bb4b5a8ac99c2"; + sha512 = "928018a321f1c0b86d13c092a5390652fe5d13bc63ee19274b6d3a107e2c5157fc969683e59055a13798c5982c75e02ae0e5cb40f5c94203a052c7898d1ad607"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/ro/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ro/firefox-76.0b8.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "e21c30b888b9a5cd8a1276abadf1cb7b61ef16aea1a2d14570649b887e6d4130e0e4d42bcbdb0e9f48760338c0cb2a8f52081cf6ed5163a4b7339923e5e13acf"; + sha512 = "b2fe56c56cb25471fd7cd40d9fbdaad10d25438b94fdffbbd81ab93a7340befd1678d904a3629a28c8db6fa10d969243c27b003817ef3c9b38030d6f43f39f9c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/ru/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ru/firefox-76.0b8.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "6e8ebb45f4d0dc3b73c692db8e07032c62948d5a8ca6799d09087206a071db61c98cb883c85db0dfe1423f99383ef7efb613d5092fb0b295b9c3a24d29b60f6a"; + sha512 = "bb4745d61f87f6e7acae842be9068a7f7b9d9da3c44d2d32a45c4d4a0dcd127e4c98bf5c7cc9ce03c9dd1782e4d9d03f8c1c82a6008a2b9b93b5ce380020d98c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/si/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/si/firefox-76.0b8.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "0d588d2befab1e7b23591f373b76083bfedca1ecc269c72f8d63a35e30d71db2a98c6b1ea18ed298909628800acd274ebc281c4d5e5399bec3f359f1f66e9bcd"; + sha512 = "efa44e8a4e69d10feb35385ee01b171d08c46feffea0d74ea8ee9b7cf21a839b2cc43ff138752c50ad43db1923b264495b63a0d46b5b2e579c3ba61b6bdf3acb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/sk/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/sk/firefox-76.0b8.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "f4fd28a6f9397290f7db17ad30078b51e743f7093351493eaa117b526893f5a8f8ef36f255b50503d2b48c4bb3fbb3071ed0b25ea687cab01b01379b6ad64e6d"; + sha512 = "3f9e63ad4c1e8a4f6bfac97925e189c9b3888c2e952c1801e4fcf935a246a294f9b088eaad6c18bf7dd93c136579529605bad6bcd95fa7b68c89a0fb087a44f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/sl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/sl/firefox-76.0b8.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "8d6218ee90b9a767e03acb9f6bce4602bb948377cf91cc81b0dbe2020b5dac0750f1e283913940c59e0ee1cc14a0ce1928338ea90695948e5ddc854244b62c47"; + sha512 = "79d4a1aed3c9afab1c1847ed4365ab7e99d0982fdaf09d6d9652b9f95ce3c32b123b2389a1a9d6486e6141953d25c06fac0a06156bff8c2eff6e295c8f79c28e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/son/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/son/firefox-76.0b8.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "4818470e713cb9b7209cf9b6b73fd2682ec9b017516f56570b83d1123e69921f7bf2f8c2ff8de36d622f0f93e1191e8671b00357864e1aa862ffeb7b88a90dc5"; + sha512 = "5faec58c78ab2acb1fb5f3aa3aabdb9d5ad9df6168215f818967bc2b3575aeee1428ee8354aabfb36b37ed66137f8ca6b2ce9ce5fee0075562c618fc3cfba9e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/sq/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/sq/firefox-76.0b8.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "0ef59e995790814ca0ed50c2b510a1971ae802a1f362d2bb5a90e35687fae26aed9ba925c8e08bb68a7a0279a832132e2d66adb5dc1471a4a8e426cd4731d7aa"; + sha512 = "32c67a6ace809219fbd51775c421fa6a68e29bef9e908678b43b53e1bffc85d8bf773e2a5b9a00861b0a437d56ee3ad5ff1cd1e84504a48816cf74a69240b851"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/sr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/sr/firefox-76.0b8.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "5387f446bb9a4e3edb89a3aa8f19bff7972c932cfba97b386bc07875354ed6585fe39873a3e9f74aa68ae13ca4d7a1e765e3185517c5a266072167069b037786"; + sha512 = "ea3aff47c7e428a445aea0ebd7fa98e8de3a41dad208cea39adcad84327d2181b862ecd977e9c7a6aa8fb21cc99ada9698be67c86c5a931b1b41edafb744450b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/sv-SE/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/sv-SE/firefox-76.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "067f132d49fedf4e8dcc1401b39445b88a11aa5a7796ee24a06233540dd2b1ace5042dc06218f28bb6472716747dafedfa183b1db1e87d22ca5b865fa6f972eb"; + sha512 = "dcef09b5dee93167dbe6bc87d1fbb6f0e472db6471b99815d38532f6d223ac7a12183b323b5e979fa7943e4db1fc25b48760caf4540afa111f9dfd0958568767"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/ta/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ta/firefox-76.0b8.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "4016a1677a62dc4877dad75c0ec2f4d8dd5ed3aaaf625c73175fadae527d54f628bd29db2044f90c8be36e72b89422280e8030a231cda9db0f98c18d3fc037da"; + sha512 = "598e3169673ad39832fea1afe0c141070795d54636846b18fd7ccb4a9e66575f779789553550552f9a9786ebe691afb10b81f0d0ba127242827e2d11f941c115"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/te/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/te/firefox-76.0b8.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "bd4a683f30e92fe9631506bfb2aaf726c6765044db65adb8d85795e60365684c7a9d2d351b7ae5b02125546dea8ffea6ec637a39e417bcd61acc57b8560068ee"; + sha512 = "a1501c3fe46adc0d29ea098aba2800c71f6eb14b33e44a367e33f5f9c705357cad8445e0980cc758102eb7c01c18a79f3007cfbd8d1b9c1ae9766e0e793ec3b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/th/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/th/firefox-76.0b8.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "1b10aa327fdb46c322af0848a66ca03ecff38fc29ada50fce6e44e9056a874275407bcc3959cc7668493a6de599e71644e6c4f57f83e031b18d4a88505b35f9f"; + sha512 = "1bf0876237e5c8eea321970f86c3878770a3c54c7cbacf67bfb75904fd270ce88252d9844450086e00758cb2b1a0e1db40394246cb9ef8a7018c76bba03e3850"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/tl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/tl/firefox-76.0b8.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "febcf3fc454d7079bece7a9da0a9d158c15d0cd7a61058befb411d921e35f7d180773b2063c2084552cb6f7fda552430778f75875b474312878f72014ae9913a"; + sha512 = "5a0f3514e196803d7d6062cac1ec75342ffb49155624a0035eb49ddcaf829dfeaf37f7e26997b31cb85b9e43ee21fca9f7129ab6bf4a065fdade9bdb06573628"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/tr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/tr/firefox-76.0b8.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "a23a443245eadeb943858bde3cb5d824277b47365cab047904268f783ffe3e0f42c0809b0b083a428b1d16038ae24cfc873b545d9513e1449661b511d17313d2"; + sha512 = "8b81e0479b60cad9b97f2108745445f584986fef5521c9ab88bb6ecd48dbc9a989b906122fad29c755dfbff859719c1c9da34452383dbf027d69288a32ea7af4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/trs/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/trs/firefox-76.0b8.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "c614aae0b803329d05aec5f60aec633d31353bed9822d9b8b7c5dff5d08fcbbc551aae480c02021abf0bdad1059b665e4ef627dc00ac5cab0380fa30111cb15d"; + sha512 = "9b3d99608d163d860d0b123eddd794a2d3b44866e6b92bfc0f06c05fbdb59ebd1ade970850e5b1974332424886edfde04861abd1d47868e60970826846fc5b31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/uk/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/uk/firefox-76.0b8.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "80bce7f860ed4d8921e9826d25f6d877879c3e4e3e3bf7bd8bf9ed4de4cc10cf72e42cb6323240f799a53ac6fc366ee7e1e6deb4b1c697f2444e97ab090ab9db"; + sha512 = "f056c542bd5b83bdfc7b2a8d7234d40b64e88063208ee4b0b1b7b27017ede66b8acbbaa9d835a6d2667a321d6b965002bb87b68e5aae0eeae27aba8dfc87164a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/ur/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ur/firefox-76.0b8.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "ac2d7c2ab3d26157feb78283a16e8d2195f78eabeeecb4ded60352fd423d8ff57f5e8a5fde72feaf32c3fece3a4e90c49d18d672ccff5775bc497e1c89b3fbea"; + sha512 = "a36a8c25ebe88fcf086fd476619a657b1ff26364133d05b32bdc13cca81b61009c4f1afb760bae961942ed1396b178c2eb3cda9add8c6b502353a2ce8c486cd0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/uz/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/uz/firefox-76.0b8.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "a3cde7db978a3876b3ea596ae5b3e1aa1e77064f49686eb39bb083e4344cdda8366f01d37ceee4a007c1a36b4fd18499b2c46b2233f58b7efa8be4e59cc9e347"; + sha512 = "d07515f921caedca18f7661fad83ac772369a2f7f99d65fb827a0236818fd8eff211dbab90aa9525a6318374b1a2f84d8099667d1957f21c30e9dca35f97a111"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/vi/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/vi/firefox-76.0b8.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "b76c01da5b4be1e39a3080ed2088bf6cad5e6f08364edae08a74c6b5ec07c35a214c47ef80b8bf5e3f4c53db6789e8eff1d6be22a1a75d408570fd9a9bf5140c"; + sha512 = "de51d63ce79c249496222658ebbf53fa656916a753e6305d36047a99879b25e17a4ea4ebce1ccd07141cb507a7501362d0bb556aae97d115686d0d38db7742ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/xh/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/xh/firefox-76.0b8.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "9175fe7659d000ed22cbbd8968146e57e0d8b39a112ce22f1bc18f553bca36c94c374f0f89d7b4743a521f654f2689e50ea4a4cf13ff320752c498e038abdbdf"; + sha512 = "b01037ce68d8147dc79aeb0d540fe22a06d89ba5cf804951d16af3a896f592a00be7519b184de2f3aca7531d3026f78283b9f6b409c24031faf4859e92bfd1bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/zh-CN/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/zh-CN/firefox-76.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "0ffaffd4a316c36aeb75242902cf05bfd99143b6bbd67eed7bc6070ca4eb4328dcc7903f706fcf7e93e980d916b24d2041ecd5f7324b0bbe5e7ca2fb7b755574"; + sha512 = "0e6088a9b32ec76410fc45fc1433c514b1deb9fdab7f5249bd7ab3e1db9e0e5ad4294bffbfabf2f665bcfbedf8234ab64192ee50b34259e4133d7d035f6f4ff6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b4/linux-i686/zh-TW/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/zh-TW/firefox-76.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "ca46afa28f7e756718aa45e7d84fc5a14773671aa18edcc33b4c3e5ca68017a14a6f0d7b737ccfd098875c333c6d65b271a3521eecd3d4c64f535620f8c66346"; + sha512 = "82042857b33d2dd642c8d6404bb864c79c2ffd91d2f8b342f39d9389e63ca59738b0083f192b607a391cf2fadac056760fd07c2b76a74172118eb44ed5724a1b"; } ]; } -- cgit v1.2.3 From f3cc8dc6fa253c585c24410ef4bb3f13fe13802c Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Mon, 4 May 2020 17:29:37 +0200 Subject: firefox-esr-68: 68.7.0esr -> 68.8.0esr --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index ee023e16ac5..d33535da376 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -35,10 +35,10 @@ rec { firefox-esr-68 = common rec { pname = "firefox-esr"; - ffversion = "68.7.0esr"; + ffversion = "68.8.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "29qbcc78hz1rsnz735a5miwfj0c3r1c5qm2043vyd9qz879vsh4ab82k7wncm3xa04kqdff26zh1rpbbjmdr7gwn4q8nmjzzs7wzpd3"; + sha512 = "2rl5irkamxi8caa8krj0wng93lb82kk9mf09mgci87mj9hy6fxzcrlmiiffp14s03rv0raagrn4w54pbx1336mylq6saxmfhpf676hk"; }; patches = [ -- cgit v1.2.3 From 59944f57826893861d0ef45e3e86c0fc64460bc8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 15:44:31 +0000 Subject: autorandr: 1.9 -> 1.10 --- pkgs/tools/misc/autorandr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/autorandr/default.nix b/pkgs/tools/misc/autorandr/default.nix index c6f664a1008..9588d0ae948 100644 --- a/pkgs/tools/misc/autorandr/default.nix +++ b/pkgs/tools/misc/autorandr/default.nix @@ -6,7 +6,7 @@ let python = python3Packages.python; - version = "1.9"; + version = "1.10"; in stdenv.mkDerivation { pname = "autorandr"; @@ -49,7 +49,7 @@ in owner = "phillipberndt"; repo = "autorandr"; rev = version; - sha256 = "1bb0l7fcm5lcx9y02zdxv7pfdqf4v4gsc5br3v1x9gzjvqj64l7n"; + sha256 = "0rcgs1n09p0p16lr5y239s0yrw7bch0x2cqwgc2dyh7rz7d9qmwn"; }; meta = with stdenv.lib; { -- cgit v1.2.3 From 8996273bee5a0585a1cd8ef927d1fc00bbed253d Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Mon, 4 May 2020 17:46:12 +0200 Subject: firefox-devedition-bin: 76.0b4 -> 76.0b8 --- .../browsers/firefox-bin/devedition_sources.nix | 770 ++++++++++----------- 1 file changed, 385 insertions(+), 385 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index f10bd8e9f39..c2f92dc1e3d 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,965 +1,965 @@ { - version = "76.0b4"; + version = "76.0b8"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/ach/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ach/firefox-76.0b8.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "9d76b71a20b9079513af70a082d6ab7373378e01b126cac5111437a040b08aaf3c78ad6d944cb27943043917be5d00ad90dd428ac3f2107754e2c96d5ec5c7cc"; + sha512 = "0c2e0175eb3950098d7e13352d037f00b46edd7094e2978ed568d4bfe7c046b533d4c5473be6e28f84baa6eb3aaa6658b174da23409eaf34841ab7ac4aa244d9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/af/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/af/firefox-76.0b8.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "b498c1f6b56a65b66765173ac6c4568066facbf67b945d8e863a0d046cfdfda5e792acffaaffd1e7e5e5e5753b4a85ece8d19aa97d743340028346686a65cc7a"; + sha512 = "3a10b739bb0ace8331190a9bd045cd4de78fa81fd18d271903db6a29828da814454751ff56dde9181786c81ecfc373a1bae05701f4982f5889dd6007ab2bde59"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/an/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/an/firefox-76.0b8.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "115e952394389af064117dc837d1f2ec157ced9aa35affc1d490e0a4860f36309c445a0e4781d0020420e2f4f3bdad18d078321b6bb760aaf2900273f5601e5b"; + sha512 = "3a4d769aa9b123fcc5080bc877b6d29444926c5c7f45665e058bf7c4c9a7c87cd3c604eb56fb2a25b4a62a84360a3b6df51d123435f23b921b03e1bfdd65ef5a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/ar/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ar/firefox-76.0b8.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "cdebc4f71f304c930ee06c2048a142a1b610965059a3c2167882f6859446eb8af661c5d64011de3639144702b3b1936c1ef6af7eccaf7944fbbd7eda7161f569"; + sha512 = "7febbf4429c33bdca13b978610e1f996d99e8db90290fa4c4ae5dded909d8fd60e416de328eb4b68b07af6af48b079232f9f85f64f30c751c2f877d7756d0c67"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/ast/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ast/firefox-76.0b8.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "6a96535466e06326f0577f045bdaf310d05a7f3878db940521bef58f60abef196cca038912145f25bd6879b55a693b6c98933d0045bfd5da58ff436cdcd1de6d"; + sha512 = "6e6989857228793a3e3492a6f42b6c073c7ea58a9999daa5d88b465ecef5a0123d7607ede7c7297038747f4f0ea1c5fee70c2ff6436c6b7b642abe3f9a72be19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/az/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/az/firefox-76.0b8.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "327cf4ba8de32044426d6ced1e250e03972e9a24705373a0c15e46c2f6c4994fc83cd1c67aacf09c2d11d9b665e63dba6176e845ef8c037241c55e9c536caa8a"; + sha512 = "391becbf14940922f7a290840519af8ea5149058ae420738bb2bfa80ee057c16c04910f54660ee5eb3bc6067d6fd3b61053464eae4439eef708379bc220e4416"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/be/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/be/firefox-76.0b8.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "9fa7311bf0425d7314298751553b49597b6eee71f9d251e52318f13e1d38d86adbfe1a1b6d599319d6f61de47652a5cfd33ef3f3ae9a2ee3f16af53629f0b85a"; + sha512 = "c87ec6c520c9b47541e0b6ea2bd6a6916dc5a41e03affdf3caaee7247a8ad51925fbc7208725033518f03cab72a159cc5a75076bb9089ecf85210686cc704a60"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/bg/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/bg/firefox-76.0b8.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "084fffbd48bad4fd38c649dd7ef5aaacfd5c86be4482a87f25c8e19ac6469e28897cf1ceeaed14cda55f40c77b08425a75ae3679d9866c255eaa8927a3c4e7e1"; + sha512 = "f50f02c10d5c14756670aac99ccc909bcfc62d30ad7ab4ffdfa2870ded4b97ada7d21a78fe94610e01a448231d5a4b1decee47caf467978b667cd65b31d53dc5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/bn/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/bn/firefox-76.0b8.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "bd6d179e2ebc392bd8a2b5fc2b67d486150b00a4d881aa23c4d49ec2bbb7e8b8e9d70247bd704f608972af5ea3ffc5f53f949096a33455bb1fcb018acd4a0987"; + sha512 = "f81e4f057defb28b57e218b74d115b140f595f17b40af00cacd4b46db1f45790e34a222c61551e8f9387c5dc505423f451904fc82adb2e18908786ca0e4a2ffd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/br/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/br/firefox-76.0b8.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "55d293e4f510229cc6545e41631db06987779f094020edf70093a38d1612d755334b59fc492f6b77ad3bb5e9996883231c0896d99ab83ffa418ea55b61cb76ee"; + sha512 = "2834602a86796ca65d278ad7e13d7e1722ef6d375d294d6623256c427eaa60691211244bc10a22b48c9831f832a9d2e948e814962464beaa430962e862000c78"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/bs/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/bs/firefox-76.0b8.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "b69e81c5b10411e7b391de4f9a3d3df4d183e4870b81ee3963bb663b85da2b955d2ea71ffa6246790a77cd2f512a1797bbe90f35d9da75b5d4bfe0c4e4209621"; + sha512 = "f4efa6b86bb314f850466d81e8fcffdd6b1fe4f8a372750edeecfda2fd5feb172251227ae8ead7d79bae3f3757b948e45200d779d8368fabc980ae73ef8c7b68"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/ca-valencia/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ca-valencia/firefox-76.0b8.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "047cb7e2135ad93aa4d1378e9d48e8baaeac711aed823ae603f6d9431b90a8e46096948712f4fbaa6a80ae519ae7d75dcc5704305323c7eaa9c307cc688194fb"; + sha512 = "ec51ece975fa6e3fd4b3fe508c5ccacc62dc340562aefa8e22a74f2c818bbc81982ebb5d9b0f85a460ebf75030e3d25e084a554ff3ad8ea142a4bfd9b020ad96"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/ca/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ca/firefox-76.0b8.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "417dfb9a91902fd3bf7245accf6c48ce0dc1b9944376d5c73d38816e5b8c05ce214c1327f31773d5a72470a4b565b17f2469ed2f9d3fd6a7739699e19ac9bbd9"; + sha512 = "84cb922c3b7c61185fee0f08d6c6123efad63730a8be960b2087fd6074ed3486c1ead7081dba0a6cb0ea1799e14cd9a32f3690c31017e5ce2a3d2875d0368750"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/cak/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/cak/firefox-76.0b8.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "823f2cb33b41a6a4ad870515f5f443213df254bc6306cda23ce2b2b8a435f6a6bfa0884ea504645791a15c76934bdb92460674fb628b517f9d4e1f2263347fdd"; + sha512 = "7245add38d451e6dbad55140d9b2aee182df94b4285645ded8713f3c2c3aa4bf4c602a3f9a0a5f39ca091561cabde58aea18be3fe4247c53c742d03dc43c9858"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/cs/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/cs/firefox-76.0b8.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "618e4e48246192c6103757ef151ec192e41ac1011786478d631169d934569610d2e280cf20de2db54a57e1e794fd66c685427d69d2a6cf185508234066f71d34"; + sha512 = "883a2c0ddd7cd826e6bfe6835c8ff33c135a9bc77962d9f1f67d49a0928ad9172c07974f0681769cb874ae7db4f6a1a96fbc78af3275262cffadb744ec6527fe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/cy/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/cy/firefox-76.0b8.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "000d6c8434ef716a63fe4885d2b4ee2f6d025b58ec0de6ae2957a9d8807d9ed1c740fe37b679a66a1ca63a7f5690aa9a3ceb3aca6011dbb13071a66d329caab8"; + sha512 = "93b8379294b7a6ca49aa8b454f64de1f2df3db75f47c4bfe6e11e9317cbcea41da1ad8b73564a273c9343b4317329ee96f1f1ae7dee4a61f52b3a26e5790fc0c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/da/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/da/firefox-76.0b8.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "b49a8f64bb4a5625bd7b4d8046fb819296ea56aac468d4ea3220a73730c8d512a5ecc0d3798cffdb27afdc13b584830ce2c800a912976467a4b7851712fae481"; + sha512 = "6233c7a642883903c1e8054c6508dbc5cee01a5ee08baadc12ff388cf3353d879968a6cad59ea7458e93df9e1520e2a938a30c04b0f2e3c903857275bab801f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/de/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/de/firefox-76.0b8.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "fb82402e6e65bb87878b036f54518cd04b078564a14ebd8ef25dd60a006fe9f12c5e34b7f4bc10858228982dd0eaf05ada0a9f099059a9d71fe3933b49b3b2ca"; + sha512 = "41febc39a7ade5843b45a02950ddb1485fca32abd0a0bd8f8e017cf8f1503d4b4b20e7dfaf89e8833900aefad44f5119ec9c8d73f5f5fc7641dd3ae1e5d794ab"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/dsb/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/dsb/firefox-76.0b8.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "c447e017eb5df8ba8ece0ff51a62b3ec7b8c7cd12f55b1b41cfcfccb1a7f936e8efb12792b9075c8eb6995802dc24d17d43b395805b03476196103fcbc1a2faf"; + sha512 = "3e4f96d7653f0cc4bec4de6c3eafea64c309f8dd88d54dc9fa27eca90c877d1f026b552fa755c0742a8537bc65a2ca831fd57adccda0c3f5573df95afbdf368f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/el/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/el/firefox-76.0b8.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "d3e17c8c3a6f6f1290c64b19f6f2184f0cfc80c087ef3c02684c16c6e9b1b1e311feb9a134bfb7bf577d6995c8fd45365154935a25aa5f40e37ad198e41de62d"; + sha512 = "3fe9b14954d3774a389deccbe7d7b1e81c3f50f1e7b7b2e92f8c5bd55c3f4623f99f518e3fc8acf92473dc4c05e2ce316c370aa19d8d39e970a1f99bb9d221c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/en-CA/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/en-CA/firefox-76.0b8.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "7175f58d6d81c34647e6c021cb0cf7c9d3a30c4a3d732d931821219c649e89f693529177d4bf037c56b37c330f8b29d3dce9038a7d2cb24590445b387b64801d"; + sha512 = "d57062e3ca388a52485fb28eed924376f6decb324ba0cb9e9af2583f10447a24d129b1c0ae17dbeb9bcac829a4da09870eac22fd8aa378ffa2ca9dd2090292d4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/en-GB/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/en-GB/firefox-76.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "0a003523e3e254f631834dba70784af7fdde9d0e912e17e2a92e8e0cb9d6973ada3670f1f83927d53afbe4b90be9de6e456cbe8b32c7bfbf2aba54bfa6c3dad0"; + sha512 = "62d571af76baad53a699a7e80dcc7c7e60ba87aa3d6325cadbac7230b710180dcdd7ba058b7b502303067ee7fd590247d08278583e188394a1873ba9f5f23b2c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/en-US/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/en-US/firefox-76.0b8.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "4ea639262102238e209a7164d5be46bb88d38e275f265340b109a7477ad8d5c3833772c44cf37ac9dda96dd859b3b07a86ed0942ba0e1c4a4b58b767c218c8a1"; + sha512 = "b934ff6b86c84600fae27cd006606b26cea62a42c8c21bdc5472b776f95faaa8604acc9c7072a8ea5aa6bc7fee6a62375b75ca4b34ae7ad83d16e074445ed327"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/eo/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/eo/firefox-76.0b8.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "083063dcf61db9d69ca39756c9fe697af133dbf87f455ce3590b2d336e629c67566ec1f3a8973f2d28122e283a8e718ef84bdadbbae3844b00e7e6aac2978454"; + sha512 = "7135b45b7424650933d579778130484b877766ddc7db83a5c4bf2f7faa662b127d475126d5fd67fffa3406f637128ced63693946e9ddfa4d33d57fe1396f3fe4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/es-AR/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/es-AR/firefox-76.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "c43aed8aab29941423a292734525a2f5c8594ce3ae62cec91fe4f5ad6f04908e14a13c409b4ffc47ab9049c4c9194c388097bff307edf632fcfd06d363619085"; + sha512 = "0e66427df853ba3ba45880e45f466349bd4805812a879e6f654b2a02d4bcca71de27578140e4ae301b3bb329335453ddf3a756be6f49b1e92ca06abc58ff1654"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/es-CL/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/es-CL/firefox-76.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "b7ae67f8943841f254650820b4d36b164e95dee1bf8c425cfb9c878f4efcf4c4f0892a84ec5ed7ee2ccc7f03ec43a5f67374f3e1e268ccb753db4bb2f5b6474a"; + sha512 = "36ed5cedcf9a2a75b19de328c5a5d89f07c09e9da728fb3431a31781a5c522b5a53a03fa5dfdcb079ce140f5bab3d7bedc79c0e3c79e3aaf672b5cce3eee2b1b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/es-ES/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/es-ES/firefox-76.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "b298d239fcef24f2e34e5672329779db55032f500a08e2b2e8e0663bddfdf3925a1eb16eb08a1729898a8cc122d2ca923d26c0be3e147172e4b869305df05b31"; + sha512 = "616477226b52076c86371cf1f1a548c2c95112685ab0e4b9835bef7b8bcf6c0ebb839ed3cee2f348cf26d990bd88b2dff46e20e38938421a6670cf66a82ee3b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/es-MX/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/es-MX/firefox-76.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "e9a107d459a4a7eb90b38edbb33a67c6f03d7851fca8be00c5f981849cdf9c88b92e283d094d3a13ff1b3f37da417c09e0d0379828eddebcb984e9684b000385"; + sha512 = "87dcfd61c3e02515f772e02b182fdd465d34c79dea55d5fc125ad6f32e504c22aa3d7cc6f23a7b2905dc4f2fb73106ecd7c662758d218349fd6419ab889a98f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/et/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/et/firefox-76.0b8.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "3f859bfcd75718abf816668a1fd15b26bff4b70fcbddd330e69180476d7ad40be13447c533e49ba24bbfe5667dede1fd0024b7aa976df5e4c739ffe75b0ed31d"; + sha512 = "81221fd364e6ba5e6300e93402dc727f9640b73015060d5a3fcb3d0d60f8fd031bcad94c9a5b35157bdb0ee2671fb2020656916fa2f5218d6e5cc1745d47629e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/eu/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/eu/firefox-76.0b8.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "6081be920d434127391e4946429e677f421b381f371fc0539ebc92e29963aeabe07116dc9c81d2430ca0cbbdd52bea69157ade801f076cc8b192e3eaa2f5e427"; + sha512 = "58b0849c7df2d8d4cd5bc1e076728678b85adadcd504978356e6ac2810a4b1b9d2318e2ad9e056fd9598d3ddc829c16a1ab89102a11d17a8742021d9c8b5e293"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/fa/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/fa/firefox-76.0b8.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "abc53c13aae0ced9217532e92a9e9b4a9f9d95d76ec8ae0395d77447804d24aa503caf644a030acc29e69feb6f89569b53b9036589f454a1e9e72eb900403ef7"; + sha512 = "9f8db5e7054f377e4672333c3f775dbec755e6096660d1d642080bd5e9bcd0c8d50a05bcc92bbb357555f60f8aceb21fbffacb019f8b3c901b1390ff3dcee034"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/ff/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ff/firefox-76.0b8.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "ba30dc08436d48280298efcf85f509a56c903e5bff1909332b792449032178764bdd7ca77ae81d02047f439da93cac45486a2a8fcce0d1dc1c876c01b3468066"; + sha512 = "4fcad8469fc5c742e4b4c4dc838da969ec3ee4af5c8c856aeb2afce85e2de7927713acc1ab9c422814d51c1114917e131af7c1a9efb6b91b1e68a5c5b36a3c92"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/fi/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/fi/firefox-76.0b8.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "5e6833e0d4cc404a9224ecf5ae6cd1e5efb4a5776cefc19f7b1eca9aafde6b3b6a3eac8a34b2cf33b16c60b68f2940fa206ee8f34b3a1acbb13aa468dd5f1457"; + sha512 = "a86ca2d70706f2c3aa8601372986525eddd8a268e47fdc7613223cc322fbfae68b86e8041c244366969cc1d5f09db7aa9c6cde9dccbd007fadcffc27b9310cc1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/fr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/fr/firefox-76.0b8.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "c33412dce69592c1b92b42e982a7a7392f46142036a250ad39f4e1a0de741017081b6730fe1ef93a3b8015abee13a8e4f3ffab652d1b7a86be04d469b910fd85"; + sha512 = "ec1c210cb0bafaaf14a6f8d79c81d2777d228ed31a7a4b1516227ce9c505574a2ad9a15bf72150439ddf32e5e2200f07471c92540d25bff31c6b9b3e123e8091"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/fy-NL/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/fy-NL/firefox-76.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "f1dacff746fc0695c9e3576da48a6d1dc485398b5468659fadc03f7ec24a2b9ca1e530f4c1c8a8556d80f682d36fc977438cdb8bb2397a01dab54f8e09ff41fd"; + sha512 = "530c2e803501a91433401445badf6528ccb51b0459028c098d3708a33369e566f679702fbcb50190fc5236acc3aaf4ebb4acfabb529b86a47dceecedeea9e45b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/ga-IE/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ga-IE/firefox-76.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "423ccf14bc5a31a332428c023784f33ae35106fb282591d161194504f9c3b4f647dedc6af919720b718925250d1bf2a4c3595aaeaee0502d0bff85025bcaa441"; + sha512 = "a81f82c5b4623afc3344eeded3d786f4e666627fbd40f64390dc21b728452cdca9f3510e21572d62e550c4e3b9230503eb771b615c3d4ef77e1a0211d79a5f08"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/gd/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/gd/firefox-76.0b8.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "004b52581644e3263aa8212048c48e163e48bac6172cbf17da9de686a6265299f96f72ebb7b2d3e8aa60fb1e71e1459b4ee717a8d74557c576edd79cd5c581dc"; + sha512 = "633b05aed902b9a655d22f45e5cb62d8978596e4d9b63f403a3f7f2a7db63b0dd2b9a1e5a82f7c9f5e8231edd15eda1ede415a80d9debfb96fc98058ed48472c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/gl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/gl/firefox-76.0b8.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "206fe47aaf14c3c054d1371d84a1adfba8853ed0e5622c871566bc4540f6f099530ad62d0e719f1731816a014fc9310db5dff5881a8bf48ef3807b143d42a2ff"; + sha512 = "052141759e0bfebedc42a7c9209b122e4ef4bb15f83ea42b8559d7b2894544e26167a6935e854541082a60dde2b301e17f2fd3a5c659642f6a4c83828ea55273"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/gn/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/gn/firefox-76.0b8.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "f5089e9300d10b3e51f29d90821c6e9117bacec194d37c89d9c26d28a00f1bf694b5399f51bb7a314dc42e30b2693e8507af8eb5edab6d9edbd509e0c0e11761"; + sha512 = "74977e4afb2d61c01834cc63f0d4440012752254ee475f28e80d33c63148b7c43520e141f043d90e611be4268da89103ec6432af8beb96ae243b8acdf4f4e934"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/gu-IN/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/gu-IN/firefox-76.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "38756c6000aa8032a6f182f3267e738cb100ceb7762900d718e996a9b538a92bee3acc9d2368cae1a675647031c4f05218745111828031587e0d29195f56eb04"; + sha512 = "bbe4e976026c98c7f32b83941841c3da8992495122e96954d550fc8263e989539372f120d8b359423ae9fce043e79421c096d8dbdea921ac7bea8133485ad62b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/he/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/he/firefox-76.0b8.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "bba86d7a1fc6746b1f14e1df5720d5cfd688140779ed0117eb0b7966d3d1500537a3caac19968c7c272f9061bb6d57dd068543456cf87d939ce567c99974a014"; + sha512 = "cd7b957a983efe5cf9c4760f0dbfe35a06e6a7dd01702d94474eccc19b91fe136a3c14c5eb5d5a1dccbf02bece9535f059179afce15c42567a918c40cceba1aa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/hi-IN/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/hi-IN/firefox-76.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "90ad90dae1a6864e1df05b174105e145d0a2395e465f5e517e6a4b240e157bd3710b6a44c6c016fd49fec3756d9f59e2122d1ec6279fd7717881f40f17eeca13"; + sha512 = "0a12a9cadbaaab40db835e5986d9211527d175a4724207af1e3ec6a22879a16054f4e9d7d5deb2c428f0b59b72b6f2d2d1c2d8ea5aaf10e20c0f4be1aaebc174"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/hr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/hr/firefox-76.0b8.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "b0ff873b157d62f227a0855cea5a14651a42533c6eacfd4a278a3c28ee9cc87aef79c459dcb28c90f2554c65f5974b03378cfb764b54a0d1d89fe45d6572147f"; + sha512 = "0d219e5bea0ac4d75fd7b6d1ec2819e6bae95ebdb6766a09e34eeae2f8de3a330b58f6292c3a00e9d1b255e8286858db39ecbffdedf7af588ef393bfc7cddb02"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/hsb/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/hsb/firefox-76.0b8.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "742a1ade2fb13ede18024c8d24268012ff00cd9dec283a7ca93dca80d6f3ad4eb0835cc151cdbc70327a2da0d53b34c366239a9da625d4b6a6b19951a32168af"; + sha512 = "ee2325e90ff0e3fa5128e9a13938afa532fedc7565cb9d26c016a37227dd9417bb78eca928c9c33bd2526cca0b2c3a6f469a76ac5d7685755aac29f06ef6c506"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/hu/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/hu/firefox-76.0b8.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "d8635bffa34c824f15b8328ffc5a3334321470a9f2f4a9d16a534fe2548f4e438a612ccea108ad5165b6e87b9cd837c478e8fbe42c89fbba36202dcf49896ca8"; + sha512 = "df602af7bc01521ff5c37876db7deb0d25414cdeabf34346c7cdf61e9083a12784ff94ee647fb75fcc9bb33e7458371b137cf3400b4d07dad4064b32a7cab11c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/hy-AM/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/hy-AM/firefox-76.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "ff885e94eadc4734a640b97c85e540a662737bc68ba26ac6dc4a467b30c96a5d29a08a635542981d60e38754123d843c5f9722a9e94928a7b408ca252823089d"; + sha512 = "774ed56ff51c7ea363c81fc11dddf8e6d54fa7242d9c7dcfc6cc3678dfe032cbd70ca93f014299690ff461da6c8013b946fa9ed170ca755a33fb95a85eb726f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/ia/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ia/firefox-76.0b8.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "65e62703b9ea3b10d3134956c56e3ea6c44a1ea4c4d36c1a6c1cdff46fccd25baf43500108ff34a8a8c5b8328c478600b3cf7d33ce865884302aad407b46e89c"; + sha512 = "c2513985cd2d6f1d874eb4f28eee05f7f42e639f8dcbc4d2a39d331507cf6681dbaae35e400a1f8e876598e8a633d67cd51b133391db30e36db46f65ede1cca2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/id/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/id/firefox-76.0b8.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "02656928185eab47e08787fc1ff267447c3b5cd4997b4a1d954d31c26c36fc78445f28e85250c3d0bd94244900e7bd9a962e3a93e8eb4046ae8979e407b07ce3"; + sha512 = "3bcad2477cfc42e2f01f5ef1bf3e907f80d96649fb5b2f143f58f6478939694fdfbab33bcd35b1f95023ad39ff807cf532faf43e1dac8aa66ca1e8d95c44ebbe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/is/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/is/firefox-76.0b8.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "597a29fdefc3ac3746eb1b898a51f1294cdce2fc7edfb958a8967c624291275d46b382e103fb3f3e39c08684b1bc4a90235e62256b16c37bdd230e4eb2b65e7e"; + sha512 = "f01ce9358446ed8ed4b01297fc175e2fc36804262905f2d5e6732827ffcccf2897d5daaa6464a4ca146fe46d9a1487164de3febb6a222343277cb26492e5a787"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/it/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/it/firefox-76.0b8.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "6eb5658a073a1ee84803ed669794bf307cbd615c220d8e95596f4c27811f20afa4f2b67bfaed94553dfb2cf3c4f5a09f0a5b4ab61f517794200a8ac11e00262f"; + sha512 = "52f23996de3c4cd409cff547348757f48e421555c965a58dc43fa82c99b51260b1ec24a97a04b046f29455955d62bc28a41d67d8087e23b9c490032cc28402c4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/ja/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ja/firefox-76.0b8.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "0292e5eb4fe8a11f13a8a824cc1f996133abf49968956887847a9556f2f418fd4146629d806a8364e103ab62542abac4c405e32800567b140a51036b5a99eede"; + sha512 = "490a950113acbc895226749335d8fbda813708ed916fb79719c0980920401871c632150bd2d88749cffd26bc7d3e7352b6706f379b37d11df6a8519d6a6642e4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/ka/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ka/firefox-76.0b8.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "19d98eeca2ad2198b928f9c28c2ccf27328b3fa47b56a9f6aa1878299d582d1a18209625dca3e00285219b2fa8c08ae6e4ef581db80611af699304b8072a56f4"; + sha512 = "12191f6adf723389595e7b9b3ff1ae20c3873b511a021205046c51f29e960db1faf45e74c055edfeaee506e6c8dcdadca7967da4b4421f892a88bc337c6b5046"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/kab/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/kab/firefox-76.0b8.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "f47d60eec573dfe2234cd166270c078aa649e0af0b5c85b6a439ed83535b497185bce6be633a923a557a845f6a66f441c42b7a8e8b76118eab5a545f6dafd512"; + sha512 = "a21ab0cff70609b3aebc28ce34ab2e6404b53638135667c330915491d8cb5c5ed7f292385e118e03e1bf2b4cfd197ad114f98b41371f5641c02d8372a7682286"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/kk/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/kk/firefox-76.0b8.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "d25c996f6255d6df234504f7a0cd6de5e231ad00ee1baad4d09ca15543bb7fdca6ee94c9e06a61090360377245d367dcbb8686fc94997722cf3d2b75ddbe2e1e"; + sha512 = "93b2d1d091f9c14619d575eab5fa41ebe5a36f3278fa537f8143bd9fade793859d2d94e14d809e82fe037ecf2a05d0f84ef49c70970d00274d51beb2bc14fdc2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/km/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/km/firefox-76.0b8.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "24b64f1d5f8b5f26d213390559f1cf3145a845d0bc5d27bd53fd9311a3110f0bfdb54f03962daeed0c456fd59e9db26c400af67df783e9f76546e3a9bc689615"; + sha512 = "184185ab33f3d73ea0a5f38b5e9931201ce3018e5060b72b0344211d11f8ebe9ee685e77c2160ce58a60b61e1377ba28f4bbdc2732f0a3ccef2190ce55072065"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/kn/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/kn/firefox-76.0b8.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "6305fc10709819a454b475a6828fa309aa23634de6704a2edc46ff41e05cb899c96189ec8698b72d375a3d33da47eab654d26e4987ba86c97edda4184fe33e96"; + sha512 = "b0917c696844114ccfeb854d13e75d48038404e1221b13629dcd981b1272f7765cfc85a0843d85957a1f3ead2a98288ae28739da47d1186b762058213681eae3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/ko/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ko/firefox-76.0b8.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "2359b56d7262c17689f5c1b1609f08c36312b5f01a1aeba482b8e2f274d3bfa6142d936867c01656abdb9502d688a94d39924c422883918e74bb55f365decee6"; + sha512 = "4ce9e202f6d794585294d6bf664c999b88674d74d2b085109ad48f7f16737e26c89980c76e9d6ab34800e841bce9074fdde6c574b228116056922799369fa04e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/lij/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/lij/firefox-76.0b8.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "d0e6bafc119c5e5d466420b5713ba0720871cd2f51c19c7c71c60cc5676c21bbde865d94d118747377dd0ea73a572dd50fa43c853ca5df13523549f4b6979be4"; + sha512 = "3138f5abddc0f49355c768fa84ec475bb3c013fad94bb4c87a2eae616b590244339236b112f03fe16dfd0b10ccb6d106cc1db0f73a5eb95df7e0dab9a247b496"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/lt/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/lt/firefox-76.0b8.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "95c0ccfbf994ca172eb1e69edaf896b2c471f6eb1da2884e28273f91b8ee7617b29e0f713228f5c6f4a39a13baac39e6ec760ed33961264bbf915cdb4641cba1"; + sha512 = "7080f9e7838c5ac076bcfd0e1192f1435b623c81144f53b1ee935aaa07c941ca8afb0cf399f161496bce02052d069033f6990bc9da16a1ab23f228417935d8ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/lv/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/lv/firefox-76.0b8.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "7c4951a58394c510499d8d0350cb5ae5124f26c926129471ec2b3067cfa69416855f49cab8cd32b86d1b003f2ed13e672635cfb46389b45fc59c0308a638c6e5"; + sha512 = "c058a8c6b4ea8c48991ecba72cc4c5645410da2d9a8ef9175475fbe906f5bbb2fe82f2c4bcdd86aed73cc75aaa0fd5a2e00a6a780f394b843ce075fdd031f8be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/mk/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/mk/firefox-76.0b8.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "7694100e1894b91632393c9662e376a9884cb5c69298dab112daf47123f16509ff020c3f52f790c2173b5bf8b1316e893def1c9fa8b2d4643e0db6c5da7ab475"; + sha512 = "f64a6373a56c7ee37ccca43708ab33b3e001b477d2ce25870553eb96fd3c42f20206171f46c93513cb328203c4454461d808b6f888260b0c2df76450ba676fb8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/mr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/mr/firefox-76.0b8.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "ff15aeed5144f65978b28e7fdf3679ebb3de83f696b7bc7ec3a390dbd9375c85e7d793a157ebffd958eea271a69ae054b4bf7112488ef42cdbee5b7a72d16783"; + sha512 = "14f58b3f59e68b9692a6fc562888e7868becf95b53aa6be0de0d3ba6c883cfde4b56496fe017b5e6e38a89b0248794408402657a34a0db45eecae74d9ce7f9ef"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/ms/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ms/firefox-76.0b8.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "1c0b206705a8fe0dd4b7adf155feb4ba1e8dabd176f891754f5b3ff7cc2279d17cf5ca3b23e85fc6033092cc0bce4cfb62d433a4905d42940028c4075704cdc0"; + sha512 = "238d2c63d4ffe36db493ef153c30a6e4b33e1403e456d2c02275786d3c13c8b2e0467a80916cb08f4676ed68c94b2127ee9876614909e4bece2577609f027ef3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/my/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/my/firefox-76.0b8.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "a3fb6b26e2ef26b681240d3bc3b9e46ee164260e0d3b14d9541a041a8c0c3e8129e6b2f6c7995825462b3f9c423611fc3c7327725aee8aa3dccf571d5f178be2"; + sha512 = "843d4d67ed852b2d0f54dee78cbe3e27ef052537270357e71f3ee0643904c2d370d5e0d25cc2e1dcc150d5f999f2841b963df41c7a98493a5101132dc6ef9a77"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/nb-NO/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/nb-NO/firefox-76.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "8f0a43f17490354a6f3a800e069dcaccdf3c8acd99a2133e5cc65c0fd8ee62637967ab528dc0fe7b992e35a69e508db95b30c42375c5b8d5268de153169caa81"; + sha512 = "e8eff86060d9f6bc6fd0f13c6f1840c77b9282f8be07177cd6ffd5472ded9b55c3d4e7641a67c655c94fd72a21a100648ff1ccbdcf90b5e7543ac1ffeb604dae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/ne-NP/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ne-NP/firefox-76.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "c7379020b8800e44e18a3beb98729a716159d8a4e9b19556aaee935bce39a99ec629056c5a9fc40deced93d2947a1d360498c87fb6e9060545ac359774589912"; + sha512 = "bb62e672ea5aabe57ab78dd37081922a67ea6471558c8a412bc5f6718b88439afb87debd23bc8e8076b7f0ca20083b79745ab0e85cfedbed024d82fee7a79986"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/nl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/nl/firefox-76.0b8.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "88b24713707ab9991dc189973a9077dba86833580edab2ef5c40641a55a34306fc27c68dc56baa0d84b30051f170aab2db89a4433daf5b14a3dc29d58c01f691"; + sha512 = "9e0ffb62fc391ffc0bee82e67c26fd24f22be3c9ab0d14d929cc0ddaaced27facebe49b55bbcb53dad9e27466d22a4edbcc1358cf38c4beb1f846278574fcf76"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/nn-NO/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/nn-NO/firefox-76.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "55c9b1ad3b7f452de4357b423240ccffdeeb37ed8c1bf5b428f36e12337ce81de9c53f3a3fc7c5db1171080d07d8b62dd8cbc3c984730dfb39d7deef70dba46a"; + sha512 = "ea71229a06a26c13d436662336e5a9b52b290c2094561c3626bdda069930c3a5b4dd61a25f76d147fb152eaefa07fd1e032b7a739b5a2038a2c4360827322144"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/oc/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/oc/firefox-76.0b8.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "fda67181ce402948b53b37975e85803d34be4269e8668bd1446f814f644c2c6adaa1c01f097efaa68f6c1ed90e183fef85a838248102c5b2858039575363eff0"; + sha512 = "f0ca79deb5450984e1f70bafddb2002f81adba022ffd2ae9c68c009fa559253f47a5fd66bb232afc5ed685721c78d7c81335e4e5e898e4a469019f98330bc602"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/pa-IN/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/pa-IN/firefox-76.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "dc29b7e1d0fe74cf8d5ddcee4b201e34e538e7ed0e9b1a6271957183c40aa07a978cc02dcd71eae546c4894f7d869938c312e896d84b9c966bbd8765bf407567"; + sha512 = "6e730c323889c7d889bac2cf7d4d2fe13347c4c9ed6251ce9e3f3825e99248c896740ee24557e9238e8fe4f5b29702f6344ba4a3210279a6e6432ab94774d990"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/pl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/pl/firefox-76.0b8.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "e6730cd1d34b13a26f6e6e7ecd6c893ae49d3158a9173b4870a913a35c8ac743f26e7220a4c4b3a7e10209e2bf3593416da74b9b07ef27e91bd46ac9df833010"; + sha512 = "e48f82f35d338852abe3ddb1abcd1c06c5d401f464bed702b7b649fe29e1a8a3ae25f4a2d0b4d30615340021cc71784777eed114b1dde4a34928159b8d616ed9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/pt-BR/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/pt-BR/firefox-76.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "4d7f7598095164a8784157f7fbf5e9a7e08be8cc66492dd2bb083002546675c725819281b1d46f3095b9d5735ad8375b083b90936b301c2b90bbd2db0f7ccf35"; + sha512 = "cd84947d36f334740d2bc590ceaf8b052ef90c7b261712eef9c85580ee9d703e0b362ddd5d51ae24ae7bf56e2bddaf32f36081df2717e673c016ec91874f6b53"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/pt-PT/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/pt-PT/firefox-76.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "6c929036a8acaa3bcc0e7fe824b6d899abe06cfcfecc0a382db722ec139969f78789dda53432d14640d538648237fe3c93e532c035d81c3ca72023a6800f0ede"; + sha512 = "6c59d46bb4b740098ec69c7a573233cf871d88ec1f9a9ecfbbf5f38a4ec1977cc7d8c7b9a6ed78dde2a795d6d078a2e505646704e91ad37b09fff564585b170d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/rm/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/rm/firefox-76.0b8.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "f21aefb4ca321533b46c550421db84094a5df593f6d77a6e036d25284dde0394c317bca12ac1ec45f04b6d16cd94cf12e0c5a3f6f43b3336e16f6ec0f6317e2b"; + sha512 = "f700e667bb8bec958501dffb33bba8cffd4bbb84cdcc9f00ddee78d43676db9afddbdf6a3d9b2ab9e58c10d2b1a2727c47224e6e824f36bcf018f7bf53b45b43"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/ro/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ro/firefox-76.0b8.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "598376640d64d6a882653adb0a77164267ca694dcdb1a87024591393e209df516df891e5fc548edb2cb045901846f898c203bc6d08e56792341498fdae64a0a7"; + sha512 = "e40a8935b7ad0b0656783023c622dc357921eda21583b1ed46c85a7ad2de8972167196764e98f75ee0c15ef046ebf09c99a2fa4613106c5302de8a9ce6429b97"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/ru/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ru/firefox-76.0b8.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "d3d45abfe074d85c992bd74b622387d738d8d19bb4e994669aef9b63b15e9de0a9ffdd0349ff9684380a8797dc23934e2ddfd7d54438b5fbd9c310a1a421ac6d"; + sha512 = "780f5df88cd75c306e725a48aaeae2b45ab5b30342ad74f5ce521f10dcf6b96affc92693fbc0dd1e95c927a21ec26e2fb9cfc74774040656459f2a7477520d61"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/si/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/si/firefox-76.0b8.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "c7cdd65c9f7404146101c265e79ccd33554b398595506acea531beaa022e8f64a8ab62feca77c94a355cc86ade99d6d470818b84c9dac80ca143390ec3617873"; + sha512 = "59a20ec7a102830976fefad4f87fa4a59ce723541b069204c03728e4c7f19cddfd74e604844da72969439542bb67e404cf5d6a649372f85250cba4fb8fb42d7c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/sk/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/sk/firefox-76.0b8.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "6e7040a36cccebee23671247a150fe3be0a0b7c831615c7c65d5aa615ddf740c94cc2c27418e7aac8eee136c9e829b3724c767e7be1c88d001d44dcc7ad9ba06"; + sha512 = "56c540f1a5d46f7e67cfcf8c6197febb7e7c4761bdbd0d4250a0c79671f84ff87c3f146f549c8dab85392c7ee94d59a4fa2101d5d8b9c7379b0f39a24d37b5e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/sl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/sl/firefox-76.0b8.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "bac64f281f57da938e1acfecdfcfa69dbcca2b1b5f923e92a5a01aa0f706a40db34dd563dfc19b2f2cf4eb3d3216c78eb1af9001beac4d3f387401f442bbe6a3"; + sha512 = "af3c4e96ca34c177fdfad0203daf1a85819e731b4137bd7685ca95d33583a04fbaf54097777c571fdc0ffafc4748f57b683cdf6773177ceef1e6ffe764f780ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/son/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/son/firefox-76.0b8.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "1f0a557c16baef46717b448e84b5e5cc249e706a8ab9f4fdfc1b0ead85334beed931fcb19484f0eb796946638c09342bad52b8c0b93c8a9f6eeb71e7d96d0a2f"; + sha512 = "045767b189c1f8ba26bfbec61f841ae2c66c7e1b35569edb26ddbfc9169e1cb6122237d83808a87e3bb3ce4a6b1f080a9bd77bd6f8d7f731a87a894a559cab1d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/sq/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/sq/firefox-76.0b8.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "7e996dccbaf10e76939b018c1fb656a42691d2f9b70bd8d018b2767cad55bd34c1241e0dd4a738b7ab503efebbb17b8ae9353a70fae296f0fbe3549b4071a9e8"; + sha512 = "4126eedaa46dca25e491e74ad788af4ded93127061219dade8be09cd18d807b4df549178c4e1d525ba1530ddd50dc4c6e35586e7762f550cc0381bb7d9c2d7ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/sr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/sr/firefox-76.0b8.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "6cfb8e0e55a61bbf5b74153503ee71fb2851bff5905c68e61adbe2501d7898f45014e7b20073beffd2b02c0f51d861b5be8473522a42acedcac463e55998c959"; + sha512 = "60ef4c3830baf02481d7371d4a55ad8da7b7cb059c1e7171b3aca0be159baeb287b2aeac15e0ef0936f452a12c8e6d2570f50a846af7b87f5d8e1779fcf8c8b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/sv-SE/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/sv-SE/firefox-76.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "88aeb01a8983a482a0e984d95c40d737f1fa89e39d37f7d5feb5e246c25a39f42e0cb99a8d3b8f7da001854d60cc370cc3f62ade04498e6d2f9817ccb869f312"; + sha512 = "354e699c53e9b9e0a803824a4f5d00fc991adc3822a21f5842a1268e6d028c89951c943aa2461402d39b7345487bf74c73bcf1cb49ea2acbce5a24a49ace8b9c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/ta/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ta/firefox-76.0b8.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "8e8dfd8a3a0fab2528ffd237d6ca83c3fa41551be79e2d85fbee9766731ff53345f912af6689b336db7dc8467a57b92664c0981f5c660217a8deacdb2b350408"; + sha512 = "ada3a7ee976f82841096b9cd80fc1af79000833cf65971b3c141f70cb9ede5a523c6e7e8f6be36d6a175c7b1e8415f95a84553d21b35bed90bf1865861ed9d19"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/te/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/te/firefox-76.0b8.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "43af76e66b26af3736c373a54b2bd03571257aa819e33b7ba40659dd7e5f9e7815116ccb80bad66ce5a2bcea4d9130a07830cb72b70624e567d1b9650dd31c4c"; + sha512 = "ec9d5f601856bdedfa4f005692911e4e9a5afc88d8c0a5551e507ccebe28f2280b2ee3f842df5255e1cca5b1e35308354827d8c6006c593366a08e917622366c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/th/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/th/firefox-76.0b8.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "c8ff860ceb0176dead8663f5043ff68865a38ff008a8a110bb37212afecc57042afd150c35c0b39a56fadc04479b95494e95f966c79a789adefb295269420222"; + sha512 = "e939d4888cb59e0a1f066c641c213bdf33ad56c60e73eb7b97983026249b223f2465703bf8df931b6b844ced18a8703b77310ac61c847be054eb83b8196dea6e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/tl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/tl/firefox-76.0b8.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "b6d313bae860d3d7449eec5527be23a8cd148a580b416bdb2bb8760c2c5996863a31b175291cc4682d574635d3dfd35e70230cd0fc7933be78a217092ebc0c64"; + sha512 = "4f269b9ce6f25e236f00374e68438d09cb30107babbe3fcaf88312b7abdcf8d4a5b619860e3e4010f367b341646cc9de027ee094f175cb144a00bef47f427806"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/tr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/tr/firefox-76.0b8.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "42b3895f52de7c7f332f337ed0dd3ad108c3d41cbce8a6c3bfc64d4041266bcdb240d0960519e6157a5ee1537f3fb50fac8aec3bbf89aff0cf1a4d99fde9ccf8"; + sha512 = "9275209304112ead1c200f9f62386de665922bedfe8501f5975a7598a6ab19ec6941fa61cec4904fabf75d76c42105f7abcf86d91c746b609bcbc6957b8c40b5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/trs/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/trs/firefox-76.0b8.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "f4982e28dbe0f5ffb9cdb5038d230f7401c77c368e6a1427018ea4e085bce534c8deee81b30a8b4f1b93d48baa0298d6d74720cfc0667f0c9555eb18a6746e26"; + sha512 = "4b06342ca02d40b6bf9de58e50d29ff2ffd3ffba60e79b6aafc7e59a1ff8bc28e1d32ef6fed7ab5d90d5224fb98ea11aee57c758938ae84015c52202be97a300"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/uk/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/uk/firefox-76.0b8.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "d82258a4aa12e64e13e5e22948f9a80be1482fb59585e31ac5caffa80d0886af98cf14c122394f0978b5706e66e34b1158a0e19da213c49037b3f65683a39984"; + sha512 = "02189417dac9ad1371fedf3a2909d3a1cb612566d653255a58402dd79656a56fdd859b23aa7b9872a928d2ac088e96bc9d24d97504ac183d6e3c7baec8c072a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/ur/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ur/firefox-76.0b8.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "527296db4c495f09b66b4898e6b04f496ae202ad23243de7259715043ac026863ce8a1c849493226e935dc04d04f528ba9a7bd4e9498ac36b2215eba118dace7"; + sha512 = "6a629c7c06883c0cb3d62f69d996c6778a0929802bfa086fded6f7b5d3572e615f6280a68b3343c43a111c02ff6b18f77ed411029ce9c6084c98f418f9cf5fa9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/uz/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/uz/firefox-76.0b8.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "4a211cd2c988c7bfaa0ee28b2703d084ac17331263231847c23e210630162e8347539c5103fad19638a8abfc2bd2c4d0b08dd3d81be24d248d685dc80831f761"; + sha512 = "f890c9c046244c476250ec89821f5de5a2e0a2acf12be2ece12b192276163dd9c86c046e8d22280592fc0b22e799b3681a3138a624564f45e3ce3e17dab20119"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/vi/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/vi/firefox-76.0b8.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "1d445fb767d74fe9d242722346e0475e6ed18c0d7110cab12596265e68916dc7f09017da7a2fca79b249c3da7eb140a13377ae4fb6c69a7f2f0f55198f705f23"; + sha512 = "360cb88f79705ac8b6e50a52ef23b10923a15c952795f1bc885cff09d99e23f200b7e67ca8637fad0447abfdb07ee9526f26ffbc424cc6c9bda399da0e4ef0b6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/xh/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/xh/firefox-76.0b8.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "2bd07a9e4e4f4bc17765a06616f0c5449968c111430d82f2b506c316305b1ad417d17c9812642f0651cba5f32b4b3ea4330254ddfa2ea9b08f2e980348f4bc39"; + sha512 = "03cf616b1bcf80c2dda6a6eba15f28b9e5c8741aa37c383c3b16b6f1ddc834d51fd144ce3484709335e06119769bc021da6d1006cb385929451d6db1f1480a4e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/zh-CN/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/zh-CN/firefox-76.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "f0274b0bddf3ab7b69071482aa3be4b7ab712ed78c3f5f4aa51b64f1ba8c93408b64223c73139a4c4fe186d7bc0b69169d98c9ebd859c1c8881aeaf8050a1eb2"; + sha512 = "de16b1013dba1726a146c3212310da5e51f6dc706ae1e5fbda60e1181ab19510a485908bad50b6a4d87ed1e56027627777bb005bfc2a5e104df9f7d1e95cd7db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-x86_64/zh-TW/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/zh-TW/firefox-76.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "973c4d852d71cbae5430afedf33adb1cd143d2e333e06cbe697400c1ee2ae30c6e8361f78c99e131917150152b2fc30acc2b5cb274147ec5badc466c7d3ad67e"; + sha512 = "15826e8a03c1c0496a7d9ffcec580f283b789c594f6dfa64de2ac8bc86398d2cd267a84a274a94063d980cbf984741f1754c644451dcb1e56d06c1c8393d1294"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/ach/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ach/firefox-76.0b8.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "7ce4970144e5f1d09daf747629b737567bf9fdacc21f5477ecd176dce714a7b9a8a22e195d772f47ea9bfe97c4c8b1bfb515aa785786c47c2c070f58ab02376c"; + sha512 = "619cef2ed7c9a8fa67723548aa826926f0dbe34996a1c6132571173a15c15dc7a8f9165296f4a94e1b8beebf67cdf79c388fdc898a013cf25985b4fdb4a5c200"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/af/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/af/firefox-76.0b8.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "33d364d036646bcac7e6ab694fe180a548bfe6de420fe1a7ca684177da8086d70e1264720e508251163819e9bb59a54e2027431056e4c75688a0b587ca5fc010"; + sha512 = "3815642e4bab2ffeab6208d9c6901c80c89a42dc8453a97ff288da7847f033402bd48c0eba8a8e62f0c696fba75f95e7dc9795089894e99c70306cf4e40d37fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/an/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/an/firefox-76.0b8.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "46b8645a1148b0a8d2c8c2dd5baa36459fc9ba4504b875c2f0252cff8202dd0a1c45cbc13422a2d36650db3e07e5f8ecb214d74b14dea728f76d721c53bf1486"; + sha512 = "b6a740e7273be146958a99a5a4e16f7c1c7e21b8df76d22473c6ca16e510d7f37fd9fdcb672c2d6ad29aa354a20ee3a7c5a9aaa03b9332ea3f5b460e7d271565"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/ar/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ar/firefox-76.0b8.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "cee1cd38ea9fbb4151ef7a2f5df2f67a6feac721ae6bc2ca580f933685f71cc25062c9f00a9d25402ba63249170c1357047248488d0aaf65acd685715f97c011"; + sha512 = "e3fab302b21d5f6de8b41faec14cfd842def6f2a65259cd8d5b0b481fca33bece3e7fa4610c60013153b676dc9e53d790734d27837e4701b393e322c5eb0f602"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/ast/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ast/firefox-76.0b8.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "4d34d3f28d1ac26e940b8f335469aee541358c19ada123dca3b87d420d7bcef8ba430d02b2445834cf495660faa4dae3bd66e0330f15c43170bdadb63c87be13"; + sha512 = "28f62c0a906283c1ebfd47e598918349c066c33512d3fff2daa44885faadbfa8b00309254b754d758d86acf23bd4ebde9142e56302c23ffcdbbe2baac6fd6e47"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/az/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/az/firefox-76.0b8.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "ceba1c862b0610e67053c1671907d1a1f80eb381648349340c18169c0ef6d7d6d4f65a7476dda42329f7a681b1d3b3924d0cd9addb7c5117a414e492392c208b"; + sha512 = "c9e00425a869501867f20b22c85e72dce9798437ee8afe718eb21c06acadd9d618d614e25463f84d0a31901261d92603374f9b2b91879e19973d50942ae6774a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/be/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/be/firefox-76.0b8.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "7a6fb8b6ad17fb89796d93164c39e8e446af972dfe14153a75495dd9aaff329dac58d708ff4f7c85ddf8a65cc441b71d07482e0eb0e240552c7b50f03f3ad463"; + sha512 = "58811c55d4a5f41e3ef8b378c00a9a08adfbb48294eb20c32dbaffd972e1df1ae55191a8ad5c4705002f07d3b7d3eda90ec759b805995c14c29fdb8707517378"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/bg/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/bg/firefox-76.0b8.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "d846ed4044aaacf02e02078d00f5ecefa59f4f91ff174526e96597aa73a46f4ea4d2595f39e5ea17583ffbe9ebc046265c73a5dca7155ea72814ae4ca7c697ce"; + sha512 = "428b34c8dd2c926dbbbd2a8ccd72ea7f023e5fb0e9cb664810d29df1008ab744eeefdd34f6f6de1596f3fd7da9d2e3b23d5c216c8a9ac94b96aefe5fe987828e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/bn/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/bn/firefox-76.0b8.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "1deeb8bd99d8e3c86ea16b08583dd6467cdc8b255f99c0782268d5319e9013910eecd121f0ec770b53189c488a239966eb5850790e5c0264351fad8ba9a587b1"; + sha512 = "5f1d54165939ef8448a5abb734f8bb914626964493e9ace1a483f5d6003c0fb087e6cc1d76afdc15c1fe563ec64f022233204be92a5705d8456a6cf75219cb4a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/br/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/br/firefox-76.0b8.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "8f8553f1eac30e497f124e5407b1658691e8456ca0d2307e4e8244024c6ec6ef4695644e169d840f832b4bbfe2ffa7dd0b178bb2b9500ceb7a7b515dc8d68af8"; + sha512 = "4eed64845ca603e21de1e60632b7d75e4bff5a5a2af792131de4141a2454fc8922109f67c13c9cd97032e3cb2cfa4d5a0ca3cb3e64faf2754fe44d8a161c464e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/bs/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/bs/firefox-76.0b8.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "129207de0d362fccb2dcb82ec62c0802fd8fcdc5fbda638c7f8c2d3bcf38c43a25640b20bd118efaa9dde93a2b305eb8b194b38da5c97b42bb272b732a1b1597"; + sha512 = "7525926461a5e89d4aad85bf3176ff36c39fa18131ead378ddce015688830051dcabb4eb3dd05922d84ea2fdb666dc8a2f8751c6bb3405b4c6e1f7a5241dcfed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/ca-valencia/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ca-valencia/firefox-76.0b8.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "08e733d738d1e4a48eb8493d7fbfeb14a4fcd3db41bc0d39d7440a3751b9bfa9ef2b1c517efa88af649902464fbb04a77375d8eb1cedf325aa781710c704a1bd"; + sha512 = "3ccda6fade937406e9ad8c609e1cbecc2ebc064d0793e9facf3910569ad5f8997d8e9165a60d59de645d29bf1411a439904af504a5daf519774bcd76a371b567"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/ca/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ca/firefox-76.0b8.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "f9ebb1e5c03bf7a2e51e5f4228df588ef17f5d3aa406a1d1d307e49235a2b45100fa62d183878db4c217593f4d92dba3454be89cc80bd615bb3b8fc6dd471cfe"; + sha512 = "d1a6c8a42fb947547d460d8d244f0b091f609aa3590fab7a785a5a9aebffcbb96fd6254797b19ea3b0bacc8ba086db210ead35260cac69d980432fc0a7a7b9e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/cak/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/cak/firefox-76.0b8.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "1d8aedf181de567499aa9455a819d31e657da1d5d437f67df0eafb02d7f846a79bbd7e030c59a3f2c1c5766f668149f97881d0bfe3a98394796fe21b628df374"; + sha512 = "b0052bbd85357bf6bd3d550021013d3f97cde943be85c08835e9d51b829f9fa66fb3a34937f806552373bcce2f36d949ea872f0eae115e7b1d13382502fd2c3b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/cs/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/cs/firefox-76.0b8.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "748901b2df6a1ab54dec6f5236fb4fcc2f762b5522dabc87b0e59890cfa895c9ad4e8d81662a9fbcf720549c88d4b792200ba1ae2a2f2e0819e9f183fb83a8e4"; + sha512 = "8f8f91ee726b3526b0d375f6075e466781fae463e55f8e7140b859e4418466c3653a3a39ef69c5395393840e8d09188d1be503ef7ac9cd2f34bce7fb6fc8719d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/cy/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/cy/firefox-76.0b8.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "8143fe0b4fa7a26296b77eee23015df6eadc48bdae8ecd69fa1f731fed9ea7d2d544093c928641b55628c54e72ac48b974f6d2002bb56a613c745992297b577a"; + sha512 = "895f1e28b998d27c99ae8cfd8f6bdb94dc526d5dfe39d537e5ece92a76b8ea3a9905197c40967e7e90bed60567628dfb23219843dcb313bc65b8dc1300dca51d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/da/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/da/firefox-76.0b8.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "2f9edd32302639e730ea4e28749ead3aedfee8716ec06ba4283e4401e1f6608870e26886b957aa758efc1fff52ac92087e95230fdfc024a062a0813c2a941e63"; + sha512 = "3b206e9d0b2fea0fc445617fce9c9908d0d4ca15e68ac04fbab74dbb7239c986de7f5e0a5ab601f25b3481a20eb9fe1f39aaa535ba24fd6e1c76fefe81e26474"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/de/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/de/firefox-76.0b8.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "a725ad54dc31276d7f58d122218d381fbbc3642853958315c04abdb4ed5eab917a81c903b6a72f324896442c87608296e98a12892c81774e53d674862ebb380d"; + sha512 = "8a9293278b5a426aeb3f1da45fc5c8d8508297a81534c33ed3d032fcb0a0c67eb4cac72b591f4fed9b159934b1e3f84a6996f665ec7955f37b6acef78886ac3c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/dsb/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/dsb/firefox-76.0b8.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "a5d06b692b11f42da8465f787eace49d2ab1c5c9b575f3471042f2db1c499cebe1b3929cf131a6451cfa388cba4cb995fc51f3a30059a76879db9f78e8e1bde7"; + sha512 = "edc302624c544c455f1799b271b0c6590131f0e01e4cf1691fb8f6fa3b470ff9a5b4db301ca87ae97ede4482782d802e24233d20d84dc8adc2b18deb25b249e5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/el/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/el/firefox-76.0b8.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "92fbea5af2bdb838af9c13d6938eb4f977fbe867dd90dfd5328f947917503feaeaef63d66cb7297aa049f486056481cc2525e47d7e5fd994908041924b1d88df"; + sha512 = "98259fefb0d9a3ff9d5e80afe251cb001c767736887d6c342d857536a031d013442a271b3aeb1c227c789a5695e134b31a81777ca7d13249451bce4325bc9a8e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/en-CA/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/en-CA/firefox-76.0b8.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "03ee4474802ee0971d4d1bad6814be66a5e0bd8adb0f9fd1c7fcf748915cfc0f2b14694135db6011216a114b388cdffa3c7109e66b834bacc7e28aafc0d79a2c"; + sha512 = "f0f8d81d0700d8539a9697001a9bdbfc75a36e3f4a1786d46e5dbdb77f61d69df10097040ea8e5aaf722b7eb578a58300c2feb32bc010443fdbd2e5eeef1eff5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/en-GB/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/en-GB/firefox-76.0b8.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "e62f4de36b5ff1ec5d934d514c5257b2614e890efcc8e6e924116494a029c2fdc40ad90924920dfebdf286a63cb61d0bb64ba5fca3e45b4852b0633f3f74bd67"; + sha512 = "97994f92d574726cf0553378f3a0a90d32cf92b8810b33a4c422355ae5dd5ce7f411352f8f45311c24caea005b727a2886bc60589231608604f97dd684e5e3db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/en-US/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/en-US/firefox-76.0b8.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "bcf2a75d906ad5e42cb2a77c210cc78afd4c722ecb686fe256dc14daeaf9794e7ecae9668171c6d028aeab0e34ddd41fc65648d87e796e57a9b3ecfd33397361"; + sha512 = "8e212c9b394d887ec8a27e47fab45f15e4d179b82332605360a951fc4bed5693be1136bddd8821ecbd31aca926a1277cf9f1fdcd07e365ada5ad35e19c64e213"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/eo/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/eo/firefox-76.0b8.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "64093337bf69f005ed5db33d1e06e0c65011c53e1f392026990744e9393f6cfed0a602004eaec16b3e5841f87614a7323ac64b12f0099177f793c2fa9e1fe53c"; + sha512 = "f8ef36d7d4cb44a170fe575d6bf94854549eb311422ea5c6ce9220f6852d76c7d1d9b65f8f959526b6d91e88b1dc34bff6f30d8534fe565574b78b045a652662"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/es-AR/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/es-AR/firefox-76.0b8.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "820e8ca43a53d5224b8f61e47725b775cc2ad4c15d816802bf16609ddba1374d15f1826d67872db16ce071454589b1dfa224a9cfdbaf44722baa5c8fb4c7c07a"; + sha512 = "6a6a67453a7b48f635b2ec0b6fd34ded5d1624a375ff526ec1693affb77d7c503215d91a29c0a266228f2f1780f0f5e6b8ab215e810faa8eb5bed5a36c998975"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/es-CL/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/es-CL/firefox-76.0b8.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "93cdf71a41b7c7d615199d4111892a467afdb861ff9bb374cafaa7f802a026d7b2618beaed80e5f078a0751a1ba0716bd866c683d8720f243228e976c816b865"; + sha512 = "7755a4cd53704f28a137d8588a969475df4ae444e1a15591941cb409528deda93b45bcd4cc0d8a10321402f01ca8439db6ee0d634a1a50f964d824e61cdc789c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/es-ES/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/es-ES/firefox-76.0b8.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "d06a02148f2f87cb3f4b961a9d3389b2ae3cc6efd1d78a7132e8258dc4c86ffcad47055950768322a85dda62baced3516666330ce584be89e9562d1b306736da"; + sha512 = "88b173d9b150f4973fb59d3bc51c3cb5f9e2580805310a73f2de993f6cb053c2c8a09d97c6979a7a501610d924a97ed6cd848325ba5142680c2e7e83ed026c37"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/es-MX/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/es-MX/firefox-76.0b8.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "d7dd2306ff4b79910f1aa09bbd28e7b7e37e64d7e99fd1293e37a76ad6135edeb247fcb57102cf002bdd43361451327d576a1b58def5c99fd09a6e68a26e369e"; + sha512 = "e84b113f5c8a4d5a242c174fb5752e23be54bdd79d19926ac46f29ffd7d0d5d2d35a7f2aba68967c0cf0a352a8bc8f5e7ff50883a1423a99d811a260323475af"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/et/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/et/firefox-76.0b8.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "4258156d27a720cd68bc74b70618e88014faa00360e055ea6a254154b5929860f27223b89c460674feeb1e1542dc4baae1b81369e9382c455d8bffee8bbe0585"; + sha512 = "6618cdd88ff48e3ab9b1d5f301d668c5ed1e659c3777cf1d87f7fb33c8698659766291b821f1fda11d13a72e50321a48afdc42438f96a8e827b2cb6712a60e66"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/eu/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/eu/firefox-76.0b8.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "822401e47e96a232a411655367299a9b64aeca133c0eaf18a0d9771a0a8f5f15c761c7889b815339cba391027a807a490f2eb8866e8f81883935249fe1907d36"; + sha512 = "56488e4dc90422b1df30265dedfbb2d0ed9e2569b989d642e83d68f71be8e5c45caa9e7df0849993b7763ed91dba937a66231288cc821cc753e9631ee1cc6118"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/fa/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/fa/firefox-76.0b8.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "fb498b47f79337f55835a343a6141556ae3119095aded17611b315e0ac4206d92774737d0a149b71c62c1e0712110a8eccd18b23e024d9aeda4a2540a0dbf9d4"; + sha512 = "87c044f5b2e86c65f03b164b4875805c01fdbeb8cc1f1a431c3e8dc1c5f7cfe5e836e2c32cf4a6a26621c3a9f06a831edca828b5a343d8547e69684c6da23924"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/ff/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ff/firefox-76.0b8.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "d03acc6ef34f1476fbfc5f398a21cabbd47c5c5d17c4d2ad83e0efaf2262deefe413032d6780303ce908b7707cb4f3053480c1f880a28cf15f105e7bec89f552"; + sha512 = "22722fb25b81ae05faad99a81af7aa21489c0fc031ce039c7f917f0d329160748f7ee6378c53e26846c466a472b19f88fb0a71080b37f16fc036f4199b75f67e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/fi/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/fi/firefox-76.0b8.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "9a4f97c1d41b256e5dcda088de88066c3f2db91c5d2c5bbd676c3f1081ef87873d68aa4cdaaf55f12b7fcfab85649aded56fad65a7a05322be794f463da152a2"; + sha512 = "680e8889e1b4b162118dd781cc43a928ab07359d31d61f0e2053223d5eb858d24a12a81dffa3ba562428d958940019b0a775867553cdc5156d2c380f1ff98d13"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/fr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/fr/firefox-76.0b8.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "e8eb90ad95e9fbea466d448abc4454bc6ab68b5f60d84cc74d1a7a8da8f6bb9a8837b2542194722ac85589f81bd6da43f683416b9bcf78fcd8511f9274a88e10"; + sha512 = "45d39ff9ef3de3229e1a6799fbbfe8ea9e773041c9f98998aaf07a41146cf8a034a46927df8003d953ecc10ce50b375b311fef5b3cd532952761b6d05c4316db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/fy-NL/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/fy-NL/firefox-76.0b8.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "7eadae35b7f45d91031a7c2984fa0f9e6dfc72ea3a5e53d6c0b2481106ff095c4fcc3e9398a06fe5c2f1a036074b03bdeefef57df32393a39209cd9aff8d5ebd"; + sha512 = "5b6b196fcd7c1a23664e10a0351a5f13e2168ede27627a1aa66a6c6e586095c47de071e917b82092f6df72540e50a93fa95e0c81e0e06687517622ffcb9b8a6b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/ga-IE/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ga-IE/firefox-76.0b8.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "c9ab2805f65cdfbf5ef5ad441c675f3ab6eb7bdcbfb7575b3ca374a6e9409f35be63ceadf495557e29bac58fe368d4410b8ea2ad5d5a26c21a60bfe1f69b9f60"; + sha512 = "44d1554d851e650f2121183059625f3c8f633c50b309cfbad2cd0dd3b3c7cfcda33c8a14ab74fbb3481725c530c5140363dca573a4e686d6921974c191da093a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/gd/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/gd/firefox-76.0b8.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "7111c65eb5904a33128b6046c76b7936d11c09842b288f234203973c5f129e110fc58d1271482d719afc57479c8283010a285b890d80795cce2ea969272283db"; + sha512 = "b8210e2afd5f13522dd367baf6724a0982ab0a98b548b1f2e6fc3af93d704a4e5929ed4e235f292ed666b6064beb5e1e463d715c8c14bfb47cf9b2687e321b1d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/gl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/gl/firefox-76.0b8.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "0e19ad36251623f60f5d6bb8cd745339cff6231f2bda3f8ac5d87fb0de6b27b4da5fdaa727c34c058d93bc06b3ea335de6dafaf247cbb7bcafa2f483acb7a337"; + sha512 = "96349751178a2cf264e1ec27c74ba725d2c3a9b54641bc4964e5d8237d3d6b6f98c116d44b883aad132ba7c4962c3c1b471fec08394e969dcff42598fdea6841"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/gn/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/gn/firefox-76.0b8.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "9328e140e98f3e24057436e6e14eddb0d50dcd55aa1713d22f7ea4f9c8384ce077a61bb2fc9191c948a78cc38e9e8b08188bcc792e9725ecfcc91a5651fac290"; + sha512 = "61b270273fae12b485d93707d358e5a3d7a9198ad147e31c2fac2465f65c9d6a803326fb042ec0a6de2d46cfc61e505b09f6093a7f62e3dd69b8e44e017d7b26"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/gu-IN/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/gu-IN/firefox-76.0b8.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "64cbdd669d1641ec365d4c1aced98d067cbd3a21124ec10472b3db2105db2774c283919652e5fa6c35c5548d8b8c1db055dbb7ec1c83ff05ad369923a37d45da"; + sha512 = "52e497831de58f7abb221b4906f0fb64182a04a93e8d7ee83d42a1391f029e4873dbe977b4e8a405d0acff537d98504f659971075b9b76e33c09a46607a6106a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/he/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/he/firefox-76.0b8.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "16c90f8125882063f4b6429ec810d23375632be9a34a5ec4a3f7d95866ea79d5c59f454a294a4ec78da2eb1a4d8a9dd9c34fcf17f0407aefc9cb8f25a2c8204c"; + sha512 = "8212b67f9447128a4cb9ee0864c50d07fd3595de15d8e3c6bf4a8f3b19bd2288ea1f55b7fe003f75249db6de0a8aa4ad6962b2913657bbdfbbf282cbc14a77e0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/hi-IN/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/hi-IN/firefox-76.0b8.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "31084eac35a7d579efad4ccd8b269c04990065a4a93686d7acaa65d6d3733183229598c173a8372ad6f78907c57a7b65f63a27187817bb9144483c237cb06de5"; + sha512 = "61e8954d14b9b7f06919c23d60eba00213c57709a5013c4a9b3376f7823f5eec262ed891a24857fe5e5efcd0245bcfe474c3838f1463dfa38427c4335ce7f1e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/hr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/hr/firefox-76.0b8.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "de1b69cd8b3fcc52275f6ae8a1b2fe85cab48c940ec62c8b667ff9c6ce4d4f32ff51d2aa46d3769a421355832e165b88f3abb4ef89329ae797c0abef4fed130f"; + sha512 = "a58c582cf0a9dd154ab53819197eb4c84fdacb2133e59b367df5111a5807c4ac63d1ca0b2567fa218a64f570b19dda9b70b13a2c15d2359cdf962f241d4ea275"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/hsb/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/hsb/firefox-76.0b8.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "7ecaa9b96d492165a155821b34401e218a507fa91ca3e9f72ebdb6fabcaaeeaade4c4ea2e0cc2e0f59a217575d63931a9290c03644cc89fc7c217262e13a1935"; + sha512 = "fdd4d7618fda5b950fcdfba0c47c27311881bdd62d1ba2028ba13adabb4beda99351c97a3ac0d3e7c1d9b9fdbe5e32bd04c4863f24e76144f6b21725a5d5d8d2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/hu/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/hu/firefox-76.0b8.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "4f80a18eef58ab3acea954a48f48575b9a152f6204db85bb30e423a0b73013f1a10c71a76b2f3add3c03fcbbd87beac7fa510fc6075e23a5ec773db67e8358e3"; + sha512 = "2d6455843faa19b8fcd401a897eb03b76bcb5da784b6aa8598e88d1b3d44ffbccbcd01d9480fdfd61039197f8e6dba86353e400cfa9537568d81debd31428c50"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/hy-AM/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/hy-AM/firefox-76.0b8.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "7c09f13f31226705f63cbac2fd15d00d87dc16ad43839e0593d19ea7d69a40b22abf0d7297576b5574a7844d390c35af951fde2e33d80caec626b5370dff7300"; + sha512 = "6ea49a50bf8e22e6caffc95936cadf3e6373b131b10a5a96faffe786a9a9a4ca8737600cec76c071bab4a20f7c05003f25d3f573af6450a5c995e08e3b939acb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/ia/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ia/firefox-76.0b8.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "b7af42a5925188a25c5f3e77991c7cad73e36a01e5948d02666cae405a7ba1c30fc59fc62bd5e799725584a7714b4cae97a335bed677ce957bbf6fa92c8f5864"; + sha512 = "7f5bfb9d4c7debcfb8a19c59f464a47af4f729d780b3940420326303d129f93363a6b9d606285d6d1e87b51d538b8573911356be2318b72e9544adaa0c64cc83"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/id/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/id/firefox-76.0b8.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "2dcf6f549b08b4e705c4f7048225e1ca9c8b1ff8869a42482e78bbc58b0bf58bc7df8207d93229dbc8fcd5864a1d84c10af244f3d49a6651c514adfd30f933c6"; + sha512 = "f98fa51506a9c5f8da4ce090778eb675ab922970a94f7fcc93b2f0af20b08889238188f8def9f001ca757b68cc321f7f023023b53c2d2c1f87dc645d9a9489a8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/is/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/is/firefox-76.0b8.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "9500b5068ae3f72f21765cb1cb8ba35bc07d813fa6301bccdee917c00daa9f5cf2be70eb3cb2faa3d363ad3fddcefbaecbce1b7118251a9e06abe80bf9a30cf5"; + sha512 = "54a2ec07da6259d6fcbf38a9bda6636fda9a15dad5188c3a8cf5a80bd813ce5c399d44daba0ba49281a7d503ee38542753560ca322324d86bc528c509b34d3c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/it/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/it/firefox-76.0b8.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "fb8e9abf309a8396edb81ae87ca4cdf2d84f5a9370b565f1b509ee64740f7f6fa1afc1a0eece273131ced6bc22996ff1a72e84a7d5aa09d2f607398cf03bfd39"; + sha512 = "944dabeff41606eff6a49ff87142aab2934cbc658015a8ef05a8416252b8c8c64fd446f5f88516dbea67e269a6514ba7a59038b39b2bb21b909f5342e90b9fd6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/ja/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ja/firefox-76.0b8.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "35be6d50c17780ac8174302c9b400ade8e7f7ff9e08d8d716ee9d879593c39c2aada3f49dac898d5004d7e5d9538b2e545db265011b1a11c06e1bbfa756badcd"; + sha512 = "22bf40ed5c37609dce3ed3ea4e88ab8bbbea31a2610697ca72446c201f874c7a4fde8c3f0f859e492869a8a3421e917d6eef37f71cba58658c584f30c683e9b8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/ka/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ka/firefox-76.0b8.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "c3ff5e7047c0eaa90ba765f75bde2e7594ca8e63ad8e3688f61573740bad234906b1e20137308be05f5173b4c01d42564c1d3a70609f012593406986fd7e5bba"; + sha512 = "b746405cd39c261ca7e18193fb0714520c59f58a595be513660d609ed3373b36f07444283d8ed1a6106ef0a48de45ba61fd5c8a1798d45088ac886917e883772"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/kab/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/kab/firefox-76.0b8.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "3feaafc92c9f4760e1c87f2733127d46eed4a5986862b4b4aae8557cec6b21a95838bc5f768791a2406d8651430efacfead9ccce13ddb3e3b97529a4d17072f0"; + sha512 = "eabc8a30e4683de833a73a49e2d3d6a25d92ca6fbddbab672f13a6ed5094edacda15ee85a1a8582a05b6e3382ad8a2063a6b1f9acd02771711d43a5e43da8f4d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/kk/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/kk/firefox-76.0b8.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "96ed2598748c08571bdb79df888e5a3cd3ae0bab46e039e79b75531d8e23a9cf3dd2445ff51d1718e69d80dc54d9249c142c61640e2c202655183de4f87f63a2"; + sha512 = "938991eaea630be2ad5818f97a9f43808ce7978c07177b5eaf10bfc74d495c1bbd5d66af79c25ad66ecf6b1d35acd94b04b70c5a8efbce5e26d53e45f3db0c7b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/km/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/km/firefox-76.0b8.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "8c6a66f77a6996b12498411edbf53d27b9a16c74eb74b586f5d1658edbecc18b427309b3e1e75e66db5a6f58821b5272f81fc01703f7d9e326318fbd4bc32bd5"; + sha512 = "ae6eeef2328c92c26b6eb9c2a600162d99c58fa04bfd526f8b0d3d1b147a9f19b7976342e17415d8cca2df65ef5335c5da0a68378e900c09c941fb18a92ea8ff"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/kn/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/kn/firefox-76.0b8.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "3c3c30b44487af9bc0ceed9d200b5d6a9692c6574c29eb93cb163a0205f4833801bae94d565b1853d1186ce6709f3f10043079b802af485ce19d6614a7e7ea2e"; + sha512 = "af171a1f641c50b7f50794d6a1ea0b2d9d2230724c08774ab594b1c9d02ba0660e7f349de65dc4638191b855183b9a0a45fba1ecab5e87199522d6c36103e6f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/ko/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ko/firefox-76.0b8.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "833627797838baf083b46f93705ba5e9d1e25a562034efa9b72406b703b77fbd986ba443fe19b2204424a586e361bfecbd7af5bb25d656d34c13c31f007a6501"; + sha512 = "7a2a61748c0f79f6e65da80e013dc9cc4550253298e6abf01b431db16a3373ba4fbdabba25dec3c994435b6e6330aac58067ed95003695bfb7e49fe6af70b094"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/lij/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/lij/firefox-76.0b8.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "21b18f367619c42f637fd6705a73d41f70a64b3f129293b7af7c92f3a97c05536a2d79a23edf8d96e0ffb02715fdf6816be5dbc4c67b658202ba22a53a9c75ca"; + sha512 = "d06298f697163b89f7195393a660534080595b6630b8e2b5c67cb311001bdde4b69cf5a2bcecae4ca90a0abf275736842a33f6d57dbe021458599f0a531b5a13"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/lt/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/lt/firefox-76.0b8.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "89063af404f2d0a4c182625c387ff2455ca987c15b824f88c3a7463befa4b65b487e9da3e0d0b1b7499975d5ac1c8104e64c03f1fbe6236b6f1c429e68d4b6bc"; + sha512 = "b9ac847949d35872b0d56c41d58c26768afc1c6157d87a0e0059c4b4928e7eaeb6aa7564754b739dc757e049ed485a2c94085e8881515ebf18f250cd5c9e8ccd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/lv/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/lv/firefox-76.0b8.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "b4647fb4c7ee30bf3a1c4249779e46031681cde4ea457869bbb474aae05fef56dcf190b6e6f70399430563c000d41b6919884bc3cc44c212d12b7f763b411157"; + sha512 = "88cd61ed1bb4eb1d871d1844e83acbc932685e10993ed64e84c63fea81fd1d5f79937ca9fff154a699334a4f10942415b6cbb90312d5be508d482de064cdbba6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/mk/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/mk/firefox-76.0b8.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "d2dc5d9b2a2fb97ebc9fa1e96a0fe878f5a9dc7795e702d19e93b8af7a48a33230516fa348097b1715503c30ecd1b9f372fe24c5f3cd335d2d83f9ce4962cb53"; + sha512 = "6359356fe1c2eabb3757c6906d925b80a7a069e0dcd7a56b958f614879b942a295bb6345a84365fa21a2cd527bea48d6efe01a603d98571deb6141ae35ff59e6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/mr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/mr/firefox-76.0b8.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "6ae482acb98e30a89e4cedb2b763f8931e1b2b2f5afc98b686a24eb3fab42e4731b46dcea4428adfae08a72d1eb442058e4c297958f93b6c7ee1435090ef828e"; + sha512 = "7b57efa8b87f662a56cd202102d220fe8f5a72d2e9838528384c4e40206df75e57a26df35544f595460daf471a565c5bfc7071f9a816b11cfeb48f84437d40a6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/ms/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ms/firefox-76.0b8.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "aa18474baeb710c4322df1e1bd04e6bed566a8f53e8932ccf9abdca3b74fd33b1127e006d9997550b31e1db7d4d6bb86087208d2589a14b47614a9b49ff3002a"; + sha512 = "fbdfe0a1f4ee6831a1d09d9349ddd43d6d540877c1272484429a7ac735a9b326ca5d99fc45a305fa1a36293a4e3eba3d03c4451b0f68a011e58c055d7e89ccee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/my/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/my/firefox-76.0b8.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "8041f361adc88462f3d1f63ad4789081f6750d2d78e063be13f770174fca48c18424422a8954ec2b1fda4d7be14cba964d5d2138ddb6a85d18c0b1e47d274e85"; + sha512 = "8106d80e99497435ffb5a58c0f4002fc1286e223688ebd7c9e406d4181c621abd831819339a6ce65c7a3ebec7a7e8963bf711d7fadc5b94653d83e1fdd13ea75"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/nb-NO/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/nb-NO/firefox-76.0b8.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "9136a922d582db8871f72deaf308d6da711b931b20a491f139e4d7b4fa95de0b028814765b84632d485727fd6bb40732ae716582a38bac59d30f709a02070cb2"; + sha512 = "165c134b673a2a9cfb38db68e5020a284bb087b21ae37a70ad8ab25808c1fd68c0f6385a433d4e16bf34cf7fb07510b36edd0563078a644d6c0a44633946be23"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/ne-NP/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ne-NP/firefox-76.0b8.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "41c6d2f49c1e08f7ea647203f6d5b94f6b8b8c12edd181b5865e13234fcc47275dff9a553a2609fb107e5b0f3edf0a1fbb5cbede97716ecf48b7a83a51b5d4f0"; + sha512 = "c0450269268b5e89de324c3e5fc6a864461a4b29d1fb8646846f8ebd87f661be2a340963a5ae8282cddcca5f05a3ca14f2b155eba99f4357983b5977eac808e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/nl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/nl/firefox-76.0b8.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "3ca94e9cec360529bbde7cc8c713ce129e8cab654d2551babb91192485b04233932cac5e0256e2bcaa55fa34949116d1d207eb73acc41b1cb86a1231d939e880"; + sha512 = "6cd6dc6545e481c28f9d63e5bf97e8dbeb275821c829c729c2dacae5e16d913424bff0e2c6b3cd65a566708f6b047a6eda29793acdf45de295911596bfa49ef9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/nn-NO/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/nn-NO/firefox-76.0b8.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "2914d4488a847bccd7aa008d43a659d46cb06e377032c8d3496da32a2c13387b8dc33f21ca6345abe874a9c6c65464262ee4bbddc83dfaf6532ddbfd554e2b50"; + sha512 = "03865af4dd626a188682ce32b4e817af44cb3059bc8ed7620853234a15972556fa57a2b6c6046ae40cc9c714dc09e54c2111adacd2a0a315d347e4322233fd3a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/oc/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/oc/firefox-76.0b8.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "08e5e5b775b90684b6c275eeaf556eb4dc3e331db3f2807dca313273c4fddff37e31fa2ad36ed2dd7bd76e3ce5e7dac97a4bba85e7c4f07fce2d35bbb63e5759"; + sha512 = "9a774f343442ee10b673cc9894fb8e4adb0a02d824dce5bfa8b3c699a1deb17dfc2ebff86126f9e0743075091c37ad170ed49f0c7818b602373f9fff20240b58"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/pa-IN/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/pa-IN/firefox-76.0b8.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "10dcdcb6268a32b84ecdeaf4bed76ee78b9358e9e84f4fc8cf868f080a4425adf228116d03b440a48fd82d0808335c9632b0dc967a417bc44a5bea3edd79bbf6"; + sha512 = "6413054a66903741f6a50c8977dc61866067ea54f915f1d7eaf972dd26cba592945bda62348b3cb397d7e045cc7af36581e374deca2812a5112f0bcbd7703b43"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/pl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/pl/firefox-76.0b8.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "7057c8e9a2b0b988d275041dcee47d0c6a2d23d765340e68846c66ca545ba6ee735d8d167ccbc57d8054f46bb4c074ccc22f88d51ade9492d6f904671be88367"; + sha512 = "98c9403b1567d02c1571aed5d6b1cdae7bdddc01ef16a2df44fb8efcb728b7c16dfa27231795fcb9ac3b1cdedbb66fcdda70a8971ed08caa89f8a0bb11dea5e9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/pt-BR/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/pt-BR/firefox-76.0b8.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "e4f71f9cfcae8afb55757fb1873b5561bbfd110e9deb52b65244d5c7db48467ce035b663cf972f4fa976b52da1b945e551ced73366fb859c17beabc54b0f20c7"; + sha512 = "ac721c8b4e104285cb8eb025916da8ba1c7c0481eeaba2b60e35ceed7d26afa7eea9a83168608daff25c025f2f06208cf36c56a4ece68b66b2baacefdb8b5d9f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/pt-PT/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/pt-PT/firefox-76.0b8.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "d48c432d4c84a1288f7a98654a95731978aadfb32dbef7e3464cd468abdb4153fc929edad4d4dab9b19bce7cdb8545d5987c7ded1b600fe181f044b3675c6b5e"; + sha512 = "720d6a5c0bfeab99f4360e9e64c4bcfc49c987f1dd040eeb1ff580f1f4b1c4a29fb7a3c88a369574fd966237f817959baf9db7117bd515cd6458e13155128df1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/rm/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/rm/firefox-76.0b8.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "b6231ff9e8cc373328210dcf5389590a2608c60fed17fde5a880412614213feb5066dd9c05cc0ae813f6af1701f4469586b255930449a11cd5bdae1c5ace54b9"; + sha512 = "e06fd7a663dd341f8cc9f60de2edca6af622bbcfffb9b1d9e3b75c07fb6b27f3b0ca9eeccb6173a91f52ee8241f167c4a399160e20377b3738e4cf4b2dfb84b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/ro/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ro/firefox-76.0b8.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "919afe9f6850f39a61d825e2e7fb7ce109b3b942fbbfffcb8a9626b67dd9b5c7fbd6f43267c0b58b5fdd1f645366897ec15116eb21ddac93a48f7e3800bf0403"; + sha512 = "d7738a3039202e9cd3b30652b4c069f9b73f88e5db1429e26324ef30f87af88f79452cb5dfa687bb988b513359ae65d7319c8a3dd59207af85b618d51519f335"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/ru/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ru/firefox-76.0b8.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "75612a4126aa52560e2cdc29b7c2fa1bd35fec34c9033f0ca276fb1239fe4dd50c1c4b024895c7aa8abb28435e58961adce4bf968922669dfd1abfbccddf40eb"; + sha512 = "cd0c2ea6af241de3d382345fd783b75e15499e0d666df99bb6ec06ae9e9da233e5ebbd181bec6a3b044682456dd78f5405177e4a781160b9a3b110008782f32c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/si/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/si/firefox-76.0b8.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "e5f4c69e7656a198f831d693465ae2780d33f0692907ac4ae9781c0a307e8f7a654377af0d76eb9d63d120ac65bd147a858485b4e211f5c119bc92798bd917c6"; + sha512 = "94aff48579b1fff63decdc6640b853907abc508da23e3d7ec13ea01c2fae496e870261fc5616821bb0c2dd5279ceb1be054691f501dd183ee0ea9aae7d24d5b1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/sk/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/sk/firefox-76.0b8.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "547ee4c8ec75ad4ce583abde35a604c1b607dc7ce71cce1a955e4269fbb18dc20af756a07facb56fb194c2afda8170f4114511228dbe058c1126f932d6c94793"; + sha512 = "189f8bc5db155eb0f50d0b60d321ca0dd67e15cd30749d830a21397df0b314608393c08daf70712a6077ea5ac663d5e745a836483750fd26ec1e92dda265c061"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/sl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/sl/firefox-76.0b8.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "468cff45ebf0706887b01890431b7cbdcea6eca30fe86a2911de19160b8b068ab45a49801e28ea6413ece5fb6cad4c8bdd3601da2e237b8946bdacbd4e51b764"; + sha512 = "f6f1d2ac3270e639bea54eb04c8f292d17ec2c4e70848a4104219800af1a17f78658eebc39d3c244e351d0511d681ab66a61358523d7edf93d4b317993cdb10c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/son/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/son/firefox-76.0b8.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "7daf5b95990a2a4386b04b0d11459e64cd3b101c57e18c514a28b28d1d62d797256b049f94809e423a8102269f7934b0074b2522109b2005c7bf317a705f5763"; + sha512 = "747f109672e47a6a344a09c32b5e2694de1ba125dd29d583a5f6a31859247e659b9ea204af31337dd5a635c0d1d7662efcf37d0d708e0936b59dfe3c975e9990"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/sq/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/sq/firefox-76.0b8.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "91b0e82ca4de76a5efe2a759f8325f784441c1fc118bca51b9ccf832f4866732dfa00b40c64c3cf767787ee5fbb11b9b09bc838c933c4ccf2d8472533cc1d07c"; + sha512 = "5f6ad0ccd20bcd09783de5307a1ac2b149cf63ab922162149d8c0632698de86b78170e378dca7103374ec356bbb03b373bf573512e6b27b95550ed95178dc1f7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/sr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/sr/firefox-76.0b8.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "b41cbce7747ad6937c471f7f54d88e506a415dd6fa145979cdb88c07e1e929922b54ae9e61a674e47c120c9b53e2062d9b8c75b2cb84825fbb52dec2f2ef2751"; + sha512 = "01c8f958ff9c5e9e65459b20c7a42208bc985246445d6ed310f80fc0dae2c8bb5684e118baf1c3dc2947dfd66ca148537d94ae726e3b3d8cc01c4990e42e2f96"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/sv-SE/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/sv-SE/firefox-76.0b8.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "902273fe8c9057b7d7778ac3b21b3230735d60ed3de6b48c9bb9554825c0e8f8131e7dd4a53aa4170f44220c25d64f23bf5f464402db9797a0d30c8bd3e388f0"; + sha512 = "1fcece2f00f98e769fd7023b5cd80eeac27b8f987291bf4041dfd90538482e7184137471cff73aaaff1c307813efa26cea3f7e77082ebe08d11769b35cd21d12"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/ta/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ta/firefox-76.0b8.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "4fac2fc24242045e01bb7fcff75238d2cf4ad85da11efadc0b4a180a402deeeab4f4eaf39f32118a5668c872569e67dcd2b86793bbaa57391cf8c860a7bee345"; + sha512 = "557646065e7370bfe43fffc9a57eec3da2ec8176e2371e948f70c92e54e3cd7d194022dab508c0b384545c121587e41ef19bda7ec8b1827118adf12aa82c653f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/te/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/te/firefox-76.0b8.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "9c6eda370b7fffab80d3a4dc76f19a660f17ddd845251f99fa6bfa79ed5bd8bba601ba4bf07c108186423ade57358461756e82427e1f5db77807336d4eef62a2"; + sha512 = "d7f95cefdf312d4c3ec157208266c9eba7e394cc1deb83e4cb9baa98f99292f6d4996b4c6f663a303556769a8c6b81fa6ee127f84464fbabc8fa0f55763dced8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/th/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/th/firefox-76.0b8.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "38b01f7e48cee6ed453b48bf0924beff15755ff1b4870b625120bb82eb4a36825295b5f314ebac977b4ec1fc0be2f475ca8d288293526c856563829cfb5b52e3"; + sha512 = "9c9d80fe8157f7f844c81a99439d9e35ccd51c8cb9dd4e8c1bc16591aa2e34654440e1b926f3737790c2fe4fa1ef9720180393260adf1dc1b6d22a805ed8edf8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/tl/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/tl/firefox-76.0b8.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "a949c67154859aceacd77a2d090f1ef9e585eb11ec817f8b0ad19a5e661391fe24d33c4a996137ac5ed2c312bad833d07dd140aa8bb0cfc0d223dca8ed4b84bc"; + sha512 = "21fc8ba0d1374fe0dbdba8a0f5ac940085f89886f0eb7ae28aae5e152ce7d68518172238042fd0287ec62127489ae3c9b750334d38676ecc7b60633187311fde"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/tr/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/tr/firefox-76.0b8.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "460430a84436bbafb814c722a66e228e3a9e6fb4b1e250a8cb5955ae43e7de604bdbf374db7788b6bd26e3f6e038d1fe88f250fe37b5a4798d5d8a03f85cd3d6"; + sha512 = "b91dca298f68ef9f1a9ff17ecd58d7fd2f0d47193fb03781027be26ecc75d3391ff47dbd1d9b6796617df00b28ff8b2610858188cd03d87efcf704f2ad4cb0df"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/trs/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/trs/firefox-76.0b8.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "0ba10c70b32ec847e497d20cc8e872ea1b867a8d5c608df1568edbd15475d9eb4e53ce6e7a96e249a9e0835fbd18137d4fc69a5f29e81abd9c154acfdd0db398"; + sha512 = "ff2b2be81f48758bd52a70ec6da9cf2950fa595bd7d3a26a4929ae28a6c612aa6ca1c127318587fe4adc03257e259a1b68ea39b9b4741e7edea53c55ccb9036a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/uk/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/uk/firefox-76.0b8.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "f6fa0f31ac6007420f9e6ba01db67d98e380375aa3fd0cf12ebf94db157dc35d905b76f5ab6e0087fde825cddd8031da860a15c59f6747268b6547546f08e796"; + sha512 = "980175a00523c0ba2b4c67999e5afcc59946b45bc58d6b813e25dd0a5f1678d23d329dc70611bdb55d9ad9debe2adf0a5fb867a9d83d43ab5934ad2bcc132da0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/ur/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ur/firefox-76.0b8.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "b723e0c609705f4ddb29e3d3349b0195520b842af7ca0a1ccc427da5d0a9dfeeb1b71f2570c5c877b1351886bec5d810ae8ce38525dd771b10f9923fc076de83"; + sha512 = "9648cb55f355c68852430f9a7c5486b0fb5be65c7f258b81906d19119f437e033121f46b884d65f1f64c33f511c605d8a42737a26ff7089306ed6bde4fd5ab4d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/uz/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/uz/firefox-76.0b8.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "d0c085a5bb75e5f6d9e1950aba926d5e3b31af7ee96503fc8716091382ce9f85c9e9c6bde4c693034517299ed2a3c650026b0c811d969974de6b79db8f5e74d5"; + sha512 = "2fdc0572a32112310044936c9b81f7238172f9ef2c2e502813b82ac0f61fa96b9d1ec96d396c7baf79c27b44673a72bd9e484d6ab68087993ab44310a52d453d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/vi/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/vi/firefox-76.0b8.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "b5bb0ef8535422d83c24103e72a3fe619347f537230aa2f03b24ea8f29b726cd4fd5c94312466918a166ab8166df22403e3eb1c74a8aeea4bb3c71d4a378f755"; + sha512 = "9b6b6ccaf74e4c3699605d43d51c02f7ccd3f4f28ed93e9b800fc0adcf662f08e554f081cc51e5706c73f308cc289976e5523d0424988b5ae3d5bb1ef6260503"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/xh/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/xh/firefox-76.0b8.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "3b8b91d953a1f62402d5c8d709ba7ae9d873acdc7a49604453bf862a223453f02b34bc2857e0e3744b608c41fcc906ec2f3771fe4510c9dc0cd5b6d0763e50bc"; + sha512 = "d417c0efde71e18f8dc04f5cb8b61c6b4410579051cf3816b55a52f3165ede2921691ed67307999ba48d6b46ea2acfdf82d063ea349fd7131402155f50dec01e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/zh-CN/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/zh-CN/firefox-76.0b8.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "4446989a2531865b5266c7a5e4066a94399faba26f2349f92797bfad5fafccd658d0af57e2af4f62222b03818a8a57e7f2709d6f87dd97f9db419221c72199ef"; + sha512 = "d4da856a2b142d4a088a0a5b460eaa2466da9280890c62b178d1bcfc18e91e494d7be357915880a0369ecf578b00e087cdf47eb8591d605595e9cc2356cbd086"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b4/linux-i686/zh-TW/firefox-76.0b4.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/zh-TW/firefox-76.0b8.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "a77c23a6bc0844a43569e91b2725b580c8f542804f20d81164328e7bf84332513bca2ebf3b60f0d87f64c450e7dfc34e81d0147a449738c7b6754e0cd134790e"; + sha512 = "6a43e2db9823f0ca86628b77df193183182208c27a7c0347fb0cb324b615bae58ca9319038c4ac642428f4ab0f1bea557ca46f313256d849cb10e8da87942247"; } ]; } -- cgit v1.2.3 From d138552e95b08dda154eb64bfff96dad5ae6a03f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 16:00:44 +0000 Subject: cherrytree: 0.39.2 -> 0.39.3 --- pkgs/applications/misc/cherrytree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/cherrytree/default.nix b/pkgs/applications/misc/cherrytree/default.nix index 7c00add7797..d2ade055d6f 100644 --- a/pkgs/applications/misc/cherrytree/default.nix +++ b/pkgs/applications/misc/cherrytree/default.nix @@ -2,13 +2,13 @@ pythonPackages.buildPythonApplication rec { pname = "cherrytree"; - version = "0.39.2"; + version = "0.39.3"; src = fetchFromGitHub { owner = "giuspen"; repo = "cherrytree"; rev = version; - sha256 = "1l6wh24bhp4yhmsfmc0r4n2n10nlilkv4cmv5sfl80i250fiw7xa"; + sha256 = "1k9i7acpphx0if6ij2p9fkmj638ry6hcyr1rdr039a8zi8hq98gz"; }; -- cgit v1.2.3 From b5bd353ec160eb88c510feef1ba9d4674192ee66 Mon Sep 17 00:00:00 2001 From: S Date: Mon, 6 Apr 2020 17:10:22 +0530 Subject: powershell: 6.2.3 -> 7.0.0 Package and openssl dependency version bump and cascading changes. --- pkgs/shells/powershell/default.nix | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index d4c18f9f581..24859ef0c90 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -1,21 +1,21 @@ { stdenv, autoPatchelfHook, fetchzip, libunwind, libuuid, icu, curl -, darwin, makeWrapper, less, openssl_1_0_2, pam, lttng-ust }: +, darwin, makeWrapper, less, openssl_1_1, pam, lttng-ust }: let platformString = if stdenv.isDarwin then "osx" else if stdenv.isLinux then "linux" else throw "unsupported platform"; - platformSha = if stdenv.isDarwin then "0jb2xm79m3m14zk7v730ai1zvxcb5a13jbkkya0qy7332k6gn6bl" - else if stdenv.isLinux then "0s0jvc9ha6fw8qy7f5n0v6zf043rawsjdlm5wvqxq1q2idz7xcw1" + platformSha = if stdenv.isDarwin then "0c71w6z6sc86si07i6vy4w3069jal7476wyiizyr7qjm9m22963f" + else if stdenv.isLinux then "0m13y66a6w64s31qbi3j5x8jll6dfrin890jah8kyncsvlyisqg3" else throw "unsupported platform"; platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" else if stdenv.isLinux then "LD_LIBRARY_PATH" else throw "unsupported platform"; - libraries = [ libunwind libuuid icu curl openssl_1_0_2 ] ++ + libraries = [ libunwind libuuid icu curl openssl_1_1 ] ++ (if stdenv.isLinux then [ pam lttng-ust ] else [ darwin.Libsystem ]); in stdenv.mkDerivation rec { pname = "powershell"; - version = "6.2.3"; + version = "7.0.0"; src = fetchzip { url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-${platformString}-x64.tar.gz"; @@ -27,10 +27,20 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; installPhase = '' - mkdir -p $out/bin - mkdir -p $out/share/powershell - cp -r * $out/share/powershell - makeWrapper $out/share/powershell/pwsh $out/bin/pwsh \ + pslibs=$out/share/powershell + mkdir -p $pslibs + + cp -r * $pslibs + + rm $pslibs/libcrypto.so.1.0.0 + rm $pslibs/libssl.so.1.0.0 + + patchelf --replace-needed libcrypto.so.1.0.0 libcrypto.so.1.1 $pslibs/libmi.so + patchelf --replace-needed libssl.so.1.0.0 libssl.so.1.1 $pslibs/libmi.so + + mkdir -p $out/bin + + makeWrapper $pslibs/pwsh $out/bin/pwsh \ --prefix ${platformLdLibraryPath} : "${stdenv.lib.makeLibraryPath libraries}" \ --set TERM xterm --set POWERSHELL_TELEMETRY_OPTOUT 1 --set DOTNET_CLI_TELEMETRY_OPTOUT 1 ''; @@ -38,9 +48,9 @@ stdenv.mkDerivation rec { dontStrip = true; meta = with stdenv.lib; { - description = "Cross-platform (Windows, Linux, and macOS) automation and configuration tool/framework"; + description = "Powerful cross-platform (Windows, Linux, and macOS) shell and scripting language based on .NET"; homepage = "https://github.com/PowerShell/PowerShell"; - maintainers = [ maintainers.yrashk ]; + maintainers = with maintainers; [ yrashk srgom ]; platforms = [ "x86_64-darwin" "x86_64-linux" ]; license = with licenses; [ mit ]; }; -- cgit v1.2.3 From 5959a5b70b80b054250a9aadf4db87a225f3b961 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 30 Apr 2020 14:47:54 -0700 Subject: powershell: enable darwin install --- pkgs/shells/powershell/default.nix | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/pkgs/shells/powershell/default.nix b/pkgs/shells/powershell/default.nix index 24859ef0c90..a5c22d125af 100644 --- a/pkgs/shells/powershell/default.nix +++ b/pkgs/shells/powershell/default.nix @@ -1,4 +1,4 @@ -{ stdenv, autoPatchelfHook, fetchzip, libunwind, libuuid, icu, curl +{ stdenv, lib, autoPatchelfHook, fetchzip, libunwind, libuuid, icu, curl , darwin, makeWrapper, less, openssl_1_1, pam, lttng-ust }: let platformString = if stdenv.isDarwin then "osx" @@ -26,19 +26,25 @@ stdenv.mkDerivation rec { buildInputs = [ less ] ++ libraries; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; - installPhase = '' + installPhase = + let + ext = stdenv.hostPlatform.extensions.sharedLibrary; + in '' pslibs=$out/share/powershell mkdir -p $pslibs cp -r * $pslibs - rm $pslibs/libcrypto.so.1.0.0 - rm $pslibs/libssl.so.1.0.0 + rm -f $pslibs/libcrypto${ext}.1.0.0 + rm -f $pslibs/libssl${ext}.1.0.0 - patchelf --replace-needed libcrypto.so.1.0.0 libcrypto.so.1.1 $pslibs/libmi.so - patchelf --replace-needed libssl.so.1.0.0 libssl.so.1.1 $pslibs/libmi.so - - mkdir -p $out/bin + ls $pslibs + '' + lib.optionalString (!stdenv.isDarwin) '' + patchelf --replace-needed libcrypto${ext}.1.0.0 libcrypto${ext}.1.1 $pslibs/libmi.so + patchelf --replace-needed libssl${ext}.1.0.0 libssl${ext}.1.1 $pslibs/libmi.so + '' + '' + + mkdir -p $out/bin makeWrapper $pslibs/pwsh $out/bin/pwsh \ --prefix ${platformLdLibraryPath} : "${stdenv.lib.makeLibraryPath libraries}" \ @@ -47,7 +53,12 @@ stdenv.mkDerivation rec { dontStrip = true; - meta = with stdenv.lib; { + doInstallCheck = true; + installCheck = '' + $out/bin/pwsh --help > /dev/null + ''; + + meta = with lib; { description = "Powerful cross-platform (Windows, Linux, and macOS) shell and scripting language based on .NET"; homepage = "https://github.com/PowerShell/PowerShell"; maintainers = with maintainers; [ yrashk srgom ]; -- cgit v1.2.3 From 8a4fcfd48714fbef16068c5886288a724f5b2d06 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 16:39:18 +0000 Subject: ceph: 14.2.8 -> 14.2.9 --- pkgs/tools/filesystems/ceph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index ea610dfcc7f..c2234404d34 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -93,7 +93,7 @@ let ]); sitePackages = ceph-python-env.python.sitePackages; - version = "14.2.8"; + version = "14.2.9"; in rec { ceph = stdenv.mkDerivation { pname = "ceph"; @@ -101,7 +101,7 @@ in rec { src = fetchurl { url = "http://download.ceph.com/tarballs/ceph-${version}.tar.gz"; - sha256 = "0p7pjycqhxqg1mmix8ykx3xqq01d560p54iiidxps0rcvwfkyyki"; + sha256 = "0zkh1a23v8g1fa5flqa2d53lv08ancab3li57gybpqpnja90k7il"; }; patches = [ -- cgit v1.2.3 From ee76d628457780bcc9218425fd26e7b8e3a47de8 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Mon, 4 May 2020 17:13:49 +0000 Subject: caddy2: 2.0.0-rc.3 -> 2.0.0 --- pkgs/servers/caddy/v2.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/caddy/v2.nix b/pkgs/servers/caddy/v2.nix index 599e2e8c906..4175dfa20fc 100644 --- a/pkgs/servers/caddy/v2.nix +++ b/pkgs/servers/caddy/v2.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "caddy"; - version = "2.0.0-rc.3"; + version = "2.0.0"; subPackages = [ "cmd/caddy" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "caddyserver"; repo = pname; rev = "v${version}"; - sha256 = "1jsjh8q5wsnp7j7r1rlnw0w4alihpcmpmlpqncmhik10f6v7xm3y"; + sha256 = "1c1frfx0qkprhf4var70cncvrw8s9gjag2hygndbd9055hb52bvv"; }; - modSha256 = "0n0k0w9y2z87z6m6j3sxsgqn9sm82rdcqpdck236fxj23k4akyp6"; + modSha256 = "19sxyvfq1bpg85w8cd1yk2s6rd8759cf2zqs5b6wyny4cak2bl83"; meta = with stdenv.lib; { homepage = "https://caddyserver.com"; -- cgit v1.2.3 From 5bf449e882c0eeeb3dca24f322a5b65076f62926 Mon Sep 17 00:00:00 2001 From: Serg Nesterov Date: Mon, 4 May 2020 20:16:19 +0300 Subject: tmuxinator: 2.0.0 -> 2.0.1 --- pkgs/tools/misc/tmuxinator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix index ae8e7926eb9..e631aa9d342 100644 --- a/pkgs/tools/misc/tmuxinator/default.nix +++ b/pkgs/tools/misc/tmuxinator/default.nix @@ -8,8 +8,8 @@ buildRubyGem rec { inherit ruby; name = "${gemName}-${version}"; gemName = "tmuxinator"; - version = "2.0.0"; - source.sha256 = "1q5z6f548138792mc7aksxdgngfgdsyf8s117b4flyb2hqgmv24b"; + version = "2.0.1"; + source.sha256 = "03q1q6majci0l6kzw6kv7r395jycrl862mlqmyydxcd29y8wm3m2"; erubis = buildRubyGem rec { inherit ruby; -- cgit v1.2.3 From 8bceb7c876d843178e087ac39ce6c00763935dd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 3 May 2020 23:11:17 -0300 Subject: genericUpdater: add attribute argument to ignore some versions --- pkgs/common-updater/generic-updater.nix | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/common-updater/generic-updater.nix b/pkgs/common-updater/generic-updater.nix index e54363a1dda..8483f9bbd1d 100644 --- a/pkgs/common-updater/generic-updater.nix +++ b/pkgs/common-updater/generic-updater.nix @@ -4,6 +4,7 @@ , version , attrPath ? pname , versionLister +, ignoredVersions ? "" , rev-prefix ? "" , odd-unstable ? false , patchlevel-unstable ? false @@ -23,13 +24,19 @@ let version="$2" attr_path="$3" version_lister="$4" - rev_prefix="$5" - odd_unstable="$6" - patchlevel_unstable="$7" + ignored_versions="$5" + rev_prefix="$6" + odd_unstable="$7" + patchlevel_unstable="$8" # print header echo "# $pname-$version" >> ${fileForGitCommands} + function version_is_ignored() { + local tag="$1" + [ -n "$ignored_versions" ] && grep -E "$ignored_versions" <<< "$tag" + } + function version_is_unstable() { local tag="$1" local enforce="$2" @@ -68,7 +75,10 @@ let # find the newest tag # do not consider development versions for latest_tag in $tags; do - if version_is_unstable "$latest_tag"; then + if version_is_ignored "$latest_tag"; then + echo "# skip ignored version: $pname-$latest_tag" >> ${fileForGitCommands} + latest_tag= + elif version_is_unstable "$latest_tag"; then echo "# skip development version: $pname-$latest_tag" >> ${fileForGitCommands} latest_tag= else @@ -95,4 +105,4 @@ let ''; in -[ updateScript pname version attrPath versionLister rev-prefix odd-unstable patchlevel-unstable ] +[ updateScript pname version attrPath versionLister ignoredVersions rev-prefix odd-unstable patchlevel-unstable ] -- cgit v1.2.3 From 6783884389c3a62e6a85d5e6ae99815bb0fcbf12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 3 May 2020 16:52:19 -0300 Subject: deepin: format with nixpkgs-fmt --- pkgs/desktops/deepin/dbus-factory/default.nix | 12 +- pkgs/desktops/deepin/dde-api/default.nix | 47 +++--- pkgs/desktops/deepin/dde-calendar/default.nix | 12 +- .../desktops/deepin/dde-control-center/default.nix | 43 ++++- pkgs/desktops/deepin/dde-daemon/default.nix | 42 ++++- pkgs/desktops/deepin/dde-dock/default.nix | 178 ++++++++++++--------- pkgs/desktops/deepin/dde-dock/wrapper.nix | 6 +- pkgs/desktops/deepin/dde-file-manager/default.nix | 59 +++++-- pkgs/desktops/deepin/dde-kwin/default.nix | 4 +- pkgs/desktops/deepin/dde-launcher/default.nix | 25 ++- pkgs/desktops/deepin/dde-network-utils/default.nix | 14 +- pkgs/desktops/deepin/dde-polkit-agent/default.nix | 14 +- .../deepin/dde-qt-dbus-factory/default.nix | 7 +- pkgs/desktops/deepin/dde-session-ui/default.nix | 36 ++++- pkgs/desktops/deepin/deepin-anything/default.nix | 13 +- pkgs/desktops/deepin/deepin-calculator/default.nix | 13 +- .../deepin/deepin-desktop-base/default.nix | 14 +- .../deepin/deepin-desktop-schemas/default.nix | 17 +- pkgs/desktops/deepin/deepin-editor/default.nix | 15 +- .../deepin/deepin-gettext-tools/default.nix | 12 +- pkgs/desktops/deepin/deepin-gtk-theme/default.nix | 14 +- pkgs/desktops/deepin/deepin-icon-theme/default.nix | 14 +- .../deepin/deepin-image-viewer/default.nix | 18 ++- pkgs/desktops/deepin/deepin-menu/default.nix | 12 +- .../deepin/deepin-movie-reborn/default.nix | 23 ++- pkgs/desktops/deepin/deepin-screenshot/default.nix | 19 ++- .../deepin/deepin-shortcut-viewer/default.nix | 12 +- .../desktops/deepin/deepin-sound-theme/default.nix | 9 +- pkgs/desktops/deepin/deepin-terminal/default.nix | 43 ++++- pkgs/desktops/deepin/deepin-turbo/default.nix | 9 +- pkgs/desktops/deepin/deepin-wallpapers/default.nix | 11 +- pkgs/desktops/deepin/default.nix | 3 +- pkgs/desktops/deepin/disomaster/default.nix | 10 +- .../deepin/dpa-ext-gnomekeyring/default.nix | 11 +- pkgs/desktops/deepin/dtkcore/default.nix | 10 +- pkgs/desktops/deepin/dtkwidget/default.nix | 19 ++- pkgs/desktops/deepin/dtkwm/default.nix | 11 +- pkgs/desktops/deepin/go-dbus-factory/default.nix | 9 +- pkgs/desktops/deepin/go-dbus-generator/default.nix | 7 +- pkgs/desktops/deepin/go-gir-generator/default.nix | 11 +- pkgs/desktops/deepin/go-lib/default.nix | 11 +- pkgs/desktops/deepin/qcef/default.nix | 40 ++++- pkgs/desktops/deepin/qt5dxcb-plugin/default.nix | 14 +- pkgs/desktops/deepin/qt5integration/default.nix | 19 ++- pkgs/desktops/deepin/startdde/default.nix | 44 ++++- pkgs/desktops/deepin/udisks2-qt5/default.nix | 8 +- 46 files changed, 767 insertions(+), 227 deletions(-) diff --git a/pkgs/desktops/deepin/dbus-factory/default.nix b/pkgs/desktops/deepin/dbus-factory/default.nix index df780009152..9180127de43 100644 --- a/pkgs/desktops/deepin/dbus-factory/default.nix +++ b/pkgs/desktops/deepin/dbus-factory/default.nix @@ -1,4 +1,10 @@ -{ stdenv, fetchFromGitHub, jq, libxml2, go-dbus-generator, deepin }: +{ stdenv +, fetchFromGitHub +, jq +, libxml2 +, go-dbus-generator +, deepin +}: stdenv.mkDerivation rec { pname = "dbus-factory"; @@ -17,7 +23,9 @@ stdenv.mkDerivation rec { go-dbus-generator ]; - makeFlags = [ "GOPATH=${placeholder "out"}/share/go" ]; + makeFlags = [ + "GOPATH=${placeholder "out"}/share/go" + ]; postPatch = '' sed -i -e 's:/share/gocode:/share/go:' Makefile diff --git a/pkgs/desktops/deepin/dde-api/default.nix b/pkgs/desktops/deepin/dde-api/default.nix index 9fb18d04df8..b55497a0450 100644 --- a/pkgs/desktops/deepin/dde-api/default.nix +++ b/pkgs/desktops/deepin/dde-api/default.nix @@ -1,25 +1,28 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, - alsaLib, - bc, - blur-effect, - coreutils, - dbus-factory, - deepin, - deepin-gettext-tools, - fontconfig, - go, - go-dbus-factory, - go-gir-generator, - go-lib, - grub2, - gtk3, - libcanberra, - libgudev, - librsvg, - poppler, - pulseaudio, - rfkill, - xcur2png +{ stdenv +, buildGoPackage +, fetchFromGitHub +, pkgconfig +, alsaLib +, bc +, blur-effect +, coreutils +, dbus-factory +, deepin +, deepin-gettext-tools +, fontconfig +, go +, go-dbus-factory +, go-gir-generator +, go-lib +, grub2 +, gtk3 +, libcanberra +, libgudev +, librsvg +, poppler +, pulseaudio +, rfkill +, xcur2png }: buildGoPackage rec { diff --git a/pkgs/desktops/deepin/dde-calendar/default.nix b/pkgs/desktops/deepin/dde-calendar/default.nix index e148df51a87..5d5ab4e5913 100644 --- a/pkgs/desktops/deepin/dde-calendar/default.nix +++ b/pkgs/desktops/deepin/dde-calendar/default.nix @@ -1,5 +1,13 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, qttools, - deepin-gettext-tools, dtkcore, dtkwidget, deepin +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, cmake +, qttools +, deepin-gettext-tools +, dtkcore +, dtkwidget +, deepin }: mkDerivation rec { diff --git a/pkgs/desktops/deepin/dde-control-center/default.nix b/pkgs/desktops/deepin/dde-control-center/default.nix index adc05e1ea7e..6f3f7b991fb 100644 --- a/pkgs/desktops/deepin/dde-control-center/default.nix +++ b/pkgs/desktops/deepin/dde-control-center/default.nix @@ -1,9 +1,40 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, deepin, qttools, qtdeclarative, - networkmanager, qtsvg, qtx11extras, dtkcore, dtkwidget, geoip, gsettings-qt, - dde-network-utils, networkmanager-qt, xorg, mtdev, fontconfig, freetype, dde-api, - dde-daemon, qt5integration, deepin-desktop-base, deepin-desktop-schemas, dbus, - systemd, dde-qt-dbus-factory, qtmultimedia, qtbase, glib, gnome3, which, - substituteAll, tzdata, wrapGAppsHook +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, cmake +, deepin +, qttools +, qtdeclarative +, networkmanager +, qtsvg +, qtx11extras +, dtkcore +, dtkwidget +, geoip +, gsettings-qt +, dde-network-utils +, networkmanager-qt +, xorg +, mtdev +, fontconfig +, freetype +, dde-api +, dde-daemon +, qt5integration +, deepin-desktop-base +, deepin-desktop-schemas +, dbus +, systemd +, dde-qt-dbus-factory +, qtmultimedia +, qtbase +, glib +, gnome3 +, which +, substituteAll +, tzdata +, wrapGAppsHook }: mkDerivation rec { diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix index fdbb7856b06..cb5e4581693 100644 --- a/pkgs/desktops/deepin/dde-daemon/default.nix +++ b/pkgs/desktops/deepin/dde-daemon/default.nix @@ -1,10 +1,38 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, fetchpatch, pkgconfig, - dbus-factory, go-dbus-factory, go-gir-generator, go-lib, - deepin-gettext-tools, gettext, dde-api, deepin-desktop-schemas, - deepin-wallpapers, deepin-desktop-base, alsaLib, glib, gtk3, - libgudev, libinput, libnl, librsvg, linux-pam, networkmanager, - pulseaudio, python3, hicolor-icon-theme, glibc, tzdata, go, - deepin, makeWrapper, xkeyboard_config, wrapGAppsHook }: +{ stdenv +, buildGoPackage +, fetchFromGitHub +, fetchpatch +, pkgconfig +, dbus-factory +, go-dbus-factory +, go-gir-generator +, go-lib +, deepin-gettext-tools +, gettext +, dde-api +, deepin-desktop-schemas +, deepin-wallpapers +, deepin-desktop-base +, alsaLib +, glib +, gtk3 +, libgudev +, libinput +, libnl +, librsvg +, linux-pam +, networkmanager +, pulseaudio +, python3 +, hicolor-icon-theme +, glibc +, tzdata +, go +, deepin +, makeWrapper +, xkeyboard_config +, wrapGAppsHook +}: buildGoPackage rec { pname = "dde-daemon"; diff --git a/pkgs/desktops/deepin/dde-dock/default.nix b/pkgs/desktops/deepin/dde-dock/default.nix index f2edb83537d..b215208c7f4 100644 --- a/pkgs/desktops/deepin/dde-dock/default.nix +++ b/pkgs/desktops/deepin/dde-dock/default.nix @@ -1,94 +1,116 @@ -{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qttools, qtx11extras, - qtsvg, polkit, gsettings-qt, dtkcore, dtkwidget, - dde-qt-dbus-factory, dde-network-utils, dde-daemon, - deepin-desktop-schemas, xorg, glib, wrapGAppsHook, deepin, - plugins ? [], symlinkJoin, makeWrapper, libdbusmenu }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, qttools +, qtx11extras +, qtsvg +, polkit +, gsettings-qt +, dtkcore +, dtkwidget +, dde-qt-dbus-factory +, dde-network-utils +, dde-daemon +, deepin-desktop-schemas +, xorg +, glib +, wrapGAppsHook +, deepin +, plugins ? [ ] +, symlinkJoin +, makeWrapper +, libdbusmenu +}: let -unwrapped = mkDerivation rec { - pname = "dde-dock"; - version = "5.0.0"; + unwrapped = mkDerivation rec { + pname = "dde-dock"; + version = "5.0.0"; - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "12dshsqhzajnxm7r53qg0c84b6xlj313qnssnx2m25z4jdp5i7pr"; - }; + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "12dshsqhzajnxm7r53qg0c84b6xlj313qnssnx2m25z4jdp5i7pr"; + }; - nativeBuildInputs = [ - cmake - pkgconfig - qttools - wrapGAppsHook - deepin.setupHook - ]; + nativeBuildInputs = [ + cmake + pkgconfig + qttools + wrapGAppsHook + deepin.setupHook + ]; - buildInputs = [ - dde-daemon - dde-network-utils - dde-qt-dbus-factory - deepin-desktop-schemas - dtkcore - dtkwidget - glib - gsettings-qt - libdbusmenu - polkit - qtsvg - qtx11extras - xorg.libXdmcp - xorg.libXtst - xorg.libpthreadstubs - ]; + buildInputs = [ + dde-daemon + dde-network-utils + dde-qt-dbus-factory + deepin-desktop-schemas + dtkcore + dtkwidget + glib + gsettings-qt + libdbusmenu + polkit + qtsvg + qtx11extras + xorg.libXdmcp + xorg.libXtst + xorg.libpthreadstubs + ]; - patches = [ - ./dde-dock.plugins-dir.patch - ]; + patches = [ + ./dde-dock.plugins-dir.patch + ]; - postPatch = '' - searchHardCodedPaths - patchShebangs translate_generation.sh - fixPath $out /etc/dde-dock plugins/keyboard-layout/CMakeLists.txt - fixPath $out /usr cmake/DdeDock/DdeDockConfig.cmake - fixPath $out /usr dde-dock.pc - fixPath $out /usr/bin/dde-dock frame/com.deepin.dde.Dock.service - fixPath $out /usr/share/dbus-1 CMakeLists.txt - fixPath ${dde-daemon} /usr/lib/deepin-daemon frame/item/showdesktopitem.cpp - fixPath ${dde-network-utils} /usr/share/dde-network-utils frame/main.cpp - fixPath ${polkit} /usr/bin/pkexec plugins/overlay-warning/overlay-warning-plugin.cpp + postPatch = '' + searchHardCodedPaths + patchShebangs translate_generation.sh + fixPath $out /etc/dde-dock plugins/keyboard-layout/CMakeLists.txt + fixPath $out /usr cmake/DdeDock/DdeDockConfig.cmake + fixPath $out /usr dde-dock.pc + fixPath $out /usr/bin/dde-dock frame/com.deepin.dde.Dock.service + fixPath $out /usr/share/dbus-1 CMakeLists.txt + fixPath ${dde-daemon} /usr/lib/deepin-daemon frame/item/showdesktopitem.cpp + fixPath ${dde-network-utils} /usr/share/dde-network-utils frame/main.cpp + fixPath ${polkit} /usr/bin/pkexec plugins/overlay-warning/overlay-warning-plugin.cpp - substituteInPlace frame/controller/dockpluginscontroller.cpp --subst-var-by out $out - substituteInPlace plugins/tray/system-trays/systemtrayscontroller.cpp --subst-var-by out $out - ''; + substituteInPlace frame/controller/dockpluginscontroller.cpp --subst-var-by out $out + substituteInPlace plugins/tray/system-trays/systemtrayscontroller.cpp --subst-var-by out $out + ''; - cmakeFlags = [ "-DDOCK_TRAY_USE_NATIVE_POPUP=YES" ]; + cmakeFlags = [ "-DDOCK_TRAY_USE_NATIVE_POPUP=YES" ]; - dontWrapQtApps = true; + dontWrapQtApps = true; - preFixup = '' - gappsWrapperArgs+=( - "''${qtWrapperArgs[@]}" - ) - ''; + preFixup = '' + gappsWrapperArgs+=( + "''${qtWrapperArgs[@]}" + ) + ''; - postFixup = '' - searchHardCodedPaths $out - ''; + postFixup = '' + searchHardCodedPaths $out + ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; - meta = with stdenv.lib; { - description = "Dock for Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/dde-dock"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; + meta = with stdenv.lib; { + description = "Dock for Deepin Desktop Environment"; + homepage = "https://github.com/linuxdeepin/dde-dock"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; }; -}; -in if plugins == [] then unwrapped - else import ./wrapper.nix { - inherit makeWrapper symlinkJoin plugins; - dde-dock = unwrapped; - } +in +if plugins == [ ] +then unwrapped +else import ./wrapper.nix { + inherit makeWrapper symlinkJoin plugins; + dde-dock = unwrapped; +} diff --git a/pkgs/desktops/deepin/dde-dock/wrapper.nix b/pkgs/desktops/deepin/dde-dock/wrapper.nix index 8f6d8a67b1a..1690230a99e 100644 --- a/pkgs/desktops/deepin/dde-dock/wrapper.nix +++ b/pkgs/desktops/deepin/dde-dock/wrapper.nix @@ -1,4 +1,8 @@ -{ makeWrapper, symlinkJoin, dde-dock, plugins }: +{ makeWrapper +, symlinkJoin +, dde-dock +, plugins +}: symlinkJoin { name = "dde-dock-with-plugins-${dde-dock.version}"; diff --git a/pkgs/desktops/deepin/dde-file-manager/default.nix b/pkgs/desktops/deepin/dde-file-manager/default.nix index a952a82dfca..74b99d1e46d 100644 --- a/pkgs/desktops/deepin/dde-file-manager/default.nix +++ b/pkgs/desktops/deepin/dde-file-manager/default.nix @@ -1,13 +1,52 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, avfs, dde-daemon, - dde-dock, dde-polkit-agent, dde-qt-dbus-factory, deepin, - deepin-anything, deepin-desktop-schemas, deepin-gettext-tools, - deepin-movie-reborn, deepin-shortcut-viewer, deepin-terminal, - disomaster, dtkcore, dtkwidget, ffmpegthumbnailer, file, glib, - gnugrep, gsettings-qt, gvfs, jemalloc, kcodecs, libX11, libsecret, - polkit, polkit-qt, poppler, procps, qmake, qt5integration, - qtmultimedia, qtsvg, qttools, qtx11extras, runtimeShell, samba, - shadow, taglib, udisks2-qt5, xdg-user-dirs, xorg, zlib, - wrapGAppsHook }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, avfs +, dde-daemon +, dde-dock +, dde-polkit-agent +, dde-qt-dbus-factory +, deepin +, deepin-anything +, deepin-desktop-schemas +, deepin-gettext-tools +, deepin-movie-reborn +, deepin-shortcut-viewer +, deepin-terminal +, disomaster +, dtkcore +, dtkwidget +, ffmpegthumbnailer +, file +, glib +, gnugrep +, gsettings-qt +, gvfs +, jemalloc +, kcodecs +, libX11 +, libsecret +, polkit +, polkit-qt +, poppler +, procps +, qmake +, qt5integration +, qtmultimedia +, qtsvg +, qttools +, qtx11extras +, runtimeShell +, samba +, shadow +, taglib +, udisks2-qt5 +, xdg-user-dirs +, xorg +, zlib +, wrapGAppsHook +}: mkDerivation rec { pname = "dde-file-manager"; diff --git a/pkgs/desktops/deepin/dde-kwin/default.nix b/pkgs/desktops/deepin/dde-kwin/default.nix index 850186953f6..fe76e65250d 100644 --- a/pkgs/desktops/deepin/dde-kwin/default.nix +++ b/pkgs/desktops/deepin/dde-kwin/default.nix @@ -74,7 +74,9 @@ mkDerivation rec { # Need to add kwayland around: # * https://github.com/linuxdeepin/dde-kwin/blob/5226bb984c844129f9fa589da56e77decb7b39a1/plugins/kwineffects/blur/CMakeLists.txt#L14 - NIX_CFLAGS_COMPILE = "-I${kwayland.dev}/include/KF5"; + NIX_CFLAGS_COMPILE = [ + "-I${kwayland.dev}/include/KF5" + ]; cmakeFlags = [ "-DKWIN_VERSION=${(builtins.parseDrvName kwin.name).version}" diff --git a/pkgs/desktops/deepin/dde-launcher/default.nix b/pkgs/desktops/deepin/dde-launcher/default.nix index a1561f5c092..51c0f0bec6d 100644 --- a/pkgs/desktops/deepin/dde-launcher/default.nix +++ b/pkgs/desktops/deepin/dde-launcher/default.nix @@ -1,7 +1,24 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, dde-qt-dbus-factory, - dde-session-ui, deepin, deepin-desktop-schemas, deepin-wallpapers, - dtkcore, dtkwidget, gsettings-qt, qtsvg, qttools, qtx11extras, - which, xdg_utils, wrapGAppsHook, glib }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, cmake +, dde-qt-dbus-factory +, dde-session-ui +, deepin +, deepin-desktop-schemas +, deepin-wallpapers +, dtkcore +, dtkwidget +, gsettings-qt +, qtsvg +, qttools +, qtx11extras +, which +, xdg_utils +, wrapGAppsHook +, glib +}: mkDerivation rec { pname = "dde-launcher"; diff --git a/pkgs/desktops/deepin/dde-network-utils/default.nix b/pkgs/desktops/deepin/dde-network-utils/default.nix index 1550987cc73..a3c38fee4cc 100644 --- a/pkgs/desktops/deepin/dde-network-utils/default.nix +++ b/pkgs/desktops/deepin/dde-network-utils/default.nix @@ -1,5 +1,15 @@ -{ stdenv, mkDerivation, fetchFromGitHub, substituteAll, qmake, pkgconfig, qttools, - dde-qt-dbus-factory, proxychains, which, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, substituteAll +, qmake +, pkgconfig +, qttools +, dde-qt-dbus-factory +, proxychains +, which +, deepin +}: mkDerivation rec { pname = "dde-network-utils"; diff --git a/pkgs/desktops/deepin/dde-polkit-agent/default.nix b/pkgs/desktops/deepin/dde-polkit-agent/default.nix index e00ee30ca92..0c19a690617 100644 --- a/pkgs/desktops/deepin/dde-polkit-agent/default.nix +++ b/pkgs/desktops/deepin/dde-polkit-agent/default.nix @@ -1,5 +1,15 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qttools, polkit-qt, - dtkcore, dtkwidget, dde-qt-dbus-factory, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, qmake +, qttools +, polkit-qt +, dtkcore +, dtkwidget +, dde-qt-dbus-factory +, deepin +}: mkDerivation rec { pname = "dde-polkit-agent"; diff --git a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix index 7e645473f02..2dac25f805b 100644 --- a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix +++ b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix @@ -1,4 +1,9 @@ -{ stdenv, fetchFromGitHub, qmake, python3, deepin }: +{ stdenv +, fetchFromGitHub +, qmake +, python3 +, deepin +}: stdenv.mkDerivation rec { pname = "dde-qt-dbus-factory"; diff --git a/pkgs/desktops/deepin/dde-session-ui/default.nix b/pkgs/desktops/deepin/dde-session-ui/default.nix index ddb12511c27..16c8e8c8ccc 100644 --- a/pkgs/desktops/deepin/dde-session-ui/default.nix +++ b/pkgs/desktops/deepin/dde-session-ui/default.nix @@ -1,9 +1,33 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, dbus, dde-daemon, - dde-qt-dbus-factory, deepin, deepin-desktop-schemas, - deepin-gettext-tools, deepin-icon-theme, deepin-wallpapers, dtkcore, - dtkwidget, gnugrep, gsettings-qt, lightdm_qt, - onboard, qtsvg, qttools, qtx11extras, setxkbmap, utillinux, which, - xkeyboard_config, xorg, xrandr, wrapGAppsHook }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, qmake +, dbus +, dde-daemon +, dde-qt-dbus-factory +, deepin +, deepin-desktop-schemas +, deepin-gettext-tools +, deepin-icon-theme +, deepin-wallpapers +, dtkcore +, dtkwidget +, gnugrep +, gsettings-qt +, lightdm_qt +, onboard +, qtsvg +, qttools +, qtx11extras +, setxkbmap +, utillinux +, which +, xkeyboard_config +, xorg +, xrandr +, wrapGAppsHook +}: mkDerivation rec { pname = "dde-session-ui"; diff --git a/pkgs/desktops/deepin/deepin-anything/default.nix b/pkgs/desktops/deepin/deepin-anything/default.nix index be7fe818e5c..121f877a27f 100644 --- a/pkgs/desktops/deepin/deepin-anything/default.nix +++ b/pkgs/desktops/deepin/deepin-anything/default.nix @@ -1,5 +1,14 @@ -{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, pkgconfig, qtbase, udisks2-qt5, utillinux, - dtkcore, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, fetchpatch +, pkgconfig +, qtbase +, udisks2-qt5 +, utillinux +, dtkcore +, deepin +}: mkDerivation rec { pname = "deepin-anything"; diff --git a/pkgs/desktops/deepin/deepin-calculator/default.nix b/pkgs/desktops/deepin/deepin-calculator/default.nix index 38aed9cbe63..81668f88a45 100644 --- a/pkgs/desktops/deepin/deepin-calculator/default.nix +++ b/pkgs/desktops/deepin/deepin-calculator/default.nix @@ -1,5 +1,14 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qttools, qtsvg, dtkcore, - dtkwidget, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, qmake +, qttools +, qtsvg +, dtkcore +, dtkwidget +, deepin +}: mkDerivation rec { pname = "deepin-calculator"; diff --git a/pkgs/desktops/deepin/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/deepin-desktop-base/default.nix index 335c5727e91..0c140038ab4 100644 --- a/pkgs/desktops/deepin/deepin-desktop-base/default.nix +++ b/pkgs/desktops/deepin/deepin-desktop-base/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchFromGitHub, deepin-wallpapers, deepin }: +{ stdenv +, fetchFromGitHub +, deepin-wallpapers +, deepin +}: stdenv.mkDerivation rec { pname = "deepin-desktop-base"; @@ -11,9 +15,13 @@ stdenv.mkDerivation rec { sha256 = "0rs7bjy35k5gc5nbba1cijhdz16zny30lgmcf2ckx1pkdszk2vra"; }; - nativeBuildInputs = [ deepin.setupHook ]; + nativeBuildInputs = [ + deepin.setupHook + ]; - buildInputs = [ deepin-wallpapers ]; + buildInputs = [ + deepin-wallpapers + ]; # TODO: Fedora recommended dependencies: # deepin-wallpapers diff --git a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix index 2105926f682..4f0685089a6 100644 --- a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix +++ b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix @@ -1,5 +1,14 @@ -{ stdenv, fetchFromGitHub, python3, dconf, glib, deepin-gtk-theme, - deepin-icon-theme, deepin-sound-theme, deepin-wallpapers, deepin }: +{ stdenv +, fetchFromGitHub +, python3 +, dconf +, glib +, deepin-gtk-theme +, deepin-icon-theme +, deepin-sound-theme +, deepin-wallpapers +, deepin +}: stdenv.mkDerivation rec { pname = "deepin-desktop-schemas"; @@ -46,7 +55,9 @@ stdenv.mkDerivation rec { # /usr/share/desktop-directories ''; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; doCheck = true; checkTarget = "test"; diff --git a/pkgs/desktops/deepin/deepin-editor/default.nix b/pkgs/desktops/deepin/deepin-editor/default.nix index 9bff5b88268..36908015d3e 100644 --- a/pkgs/desktops/deepin/deepin-editor/default.nix +++ b/pkgs/desktops/deepin/deepin-editor/default.nix @@ -1,6 +1,15 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, deepin, - dtkcore, dtkwidget, kcodecs, qttools, syntax-highlighting, - wrapQtAppsHook +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, cmake +, deepin +, dtkcore +, dtkwidget +, kcodecs +, qttools +, syntax-highlighting +, wrapQtAppsHook }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix index c1aff5ed4dc..c4180dd94bc 100644 --- a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix +++ b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix @@ -1,4 +1,10 @@ -{ stdenv, fetchFromGitHub, gettext, python3Packages, perlPackages, deepin }: +{ stdenv +, fetchFromGitHub +, gettext +, python3Packages +, perlPackages +, deepin +}: stdenv.mkDerivation rec { pname = "deepin-gettext-tools"; @@ -23,7 +29,9 @@ stdenv.mkDerivation rec { python3Packages.python ]; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; postPatch = '' sed -e 's/sudo cp/cp/' -i src/generate_mo.py diff --git a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix index 53735791846..0503127995f 100644 --- a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchFromGitHub, gtk-engine-murrine, deepin }: +{ stdenv +, fetchFromGitHub +, gtk-engine-murrine +, deepin +}: stdenv.mkDerivation rec { pname = "deepin-gtk-theme"; @@ -11,9 +15,13 @@ stdenv.mkDerivation rec { sha256 = "0zs6mq70yd1k3d9zm3q6zxnw1md56r4imad5imdxwx58yxdx47fw"; }; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; diff --git a/pkgs/desktops/deepin/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/deepin-icon-theme/default.nix index b6eb3cce26d..d69a4703ef9 100644 --- a/pkgs/desktops/deepin/deepin-icon-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-icon-theme/default.nix @@ -1,4 +1,11 @@ -{ stdenv, fetchFromGitHub, gtk3, xcursorgen, papirus-icon-theme, deepin, hicolor-icon-theme }: +{ stdenv +, fetchFromGitHub +, gtk3 +, xcursorgen +, papirus-icon-theme +, deepin +, hicolor-icon-theme +}: stdenv.mkDerivation rec { pname = "deepin-icon-theme"; @@ -11,7 +18,10 @@ stdenv.mkDerivation rec { sha256 = "12rzzjp906np95ckbxrd4mb345lm198wz69kxy48f8q1zg78q8iw"; }; - nativeBuildInputs = [ gtk3 xcursorgen ]; + nativeBuildInputs = [ + gtk3 + xcursorgen + ]; propagatedBuildInputs = [ papirus-icon-theme diff --git a/pkgs/desktops/deepin/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/deepin-image-viewer/default.nix index bedc809b2f5..481c6e1a6bf 100644 --- a/pkgs/desktops/deepin/deepin-image-viewer/default.nix +++ b/pkgs/desktops/deepin/deepin-image-viewer/default.nix @@ -1,6 +1,18 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qttools, qtsvg, - qtx11extras, dtkcore, dtkwidget, qt5integration, freeimage, libraw, - libexif, deepin +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, qmake +, qttools +, qtsvg +, qtx11extras +, dtkcore +, dtkwidget +, qt5integration +, freeimage +, libraw +, libexif +, deepin }: mkDerivation rec { diff --git a/pkgs/desktops/deepin/deepin-menu/default.nix b/pkgs/desktops/deepin/deepin-menu/default.nix index 92153b84d51..ddc45cabb49 100644 --- a/pkgs/desktops/deepin/deepin-menu/default.nix +++ b/pkgs/desktops/deepin/deepin-menu/default.nix @@ -1,5 +1,13 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, dtkcore, dtkwidget, - qt5integration, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, qmake +, dtkcore +, dtkwidget +, qt5integration +, deepin +}: mkDerivation rec { pname = "deepin-menu"; diff --git a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix index b95a76a3972..1184bb79f6b 100644 --- a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix +++ b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix @@ -1,6 +1,22 @@ -{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, pkgconfig, qttools, qtx11extras, - dtkcore, dtkwidget, ffmpeg, ffmpegthumbnailer, mpv, pulseaudio, - libdvdnav, libdvdread, xorg, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, fetchpatch +, cmake +, pkgconfig +, qttools +, qtx11extras +, dtkcore +, dtkwidget +, ffmpeg +, ffmpegthumbnailer +, mpv +, pulseaudio +, libdvdnav +, libdvdread +, xorg +, deepin +}: mkDerivation rec { pname = "deepin-movie-reborn"; @@ -48,7 +64,6 @@ mkDerivation rec { NIX_LDFLAGS = "-ldvdnav"; - postPatch = '' searchHardCodedPaths # debugging diff --git a/pkgs/desktops/deepin/deepin-screenshot/default.nix b/pkgs/desktops/deepin/deepin-screenshot/default.nix index 9b5d47d8542..9f4065610ad 100644 --- a/pkgs/desktops/deepin/deepin-screenshot/default.nix +++ b/pkgs/desktops/deepin/deepin-screenshot/default.nix @@ -1,6 +1,19 @@ -{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, pkgconfig, xdg_utils, qttools, qtx11extras, - dtkcore, dtkwidget, dtkwm, deepin-turbo, deepin-shortcut-viewer, - deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, fetchpatch +, cmake +, pkgconfig +, xdg_utils +, qttools +, qtx11extras +, dtkcore +, dtkwidget +, dtkwm +, deepin-turbo +, deepin-shortcut-viewer +, deepin +}: mkDerivation rec { pname = "deepin-screenshot"; diff --git a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix index 479f2c86d30..d0203ccd1bb 100644 --- a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix +++ b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix @@ -1,5 +1,13 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, dtkcore, dtkwidget, - qt5integration, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, qmake +, dtkcore +, dtkwidget +, qt5integration +, deepin +}: mkDerivation rec { pname = "deepin-shortcut-viewer"; diff --git a/pkgs/desktops/deepin/deepin-sound-theme/default.nix b/pkgs/desktops/deepin/deepin-sound-theme/default.nix index a868b072506..9c7ec39965b 100644 --- a/pkgs/desktops/deepin/deepin-sound-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-sound-theme/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchFromGitHub, deepin }: +{ stdenv +, fetchFromGitHub +, deepin +}: stdenv.mkDerivation rec { pname = "deepin-sound-theme"; @@ -11,7 +14,9 @@ stdenv.mkDerivation rec { sha256 = "1sw4nrn7q7wk1hpicm05apyc0mihaw42iqm52wb8ib8gm1qiylr9"; }; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix index e51927142eb..7b95227a29d 100644 --- a/pkgs/desktops/deepin/deepin-terminal/default.nix +++ b/pkgs/desktops/deepin/deepin-terminal/default.nix @@ -1,8 +1,39 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, ninja, vala_0_40, fetchpatch, - gettext, at-spi2-core, dbus, epoxy, expect, gtk3, json-glib, - libXdmcp, libgee, libpthreadstubs, librsvg, libsecret, libtasn1, - libxcb, libxkbcommon, p11-kit, pcre, vte, wnck, libselinux, gnutls, pcre2, - libsepol, utillinux, deepin-menu, deepin-shortcut-viewer, deepin, wrapGAppsHook }: +{ stdenv +, fetchFromGitHub +, pkgconfig +, cmake +, ninja +, vala_0_40 +, fetchpatch +, gettext +, at-spi2-core +, dbus +, epoxy +, expect +, gtk3 +, json-glib +, libXdmcp +, libgee +, libpthreadstubs +, librsvg +, libsecret +, libtasn1 +, libxcb +, libxkbcommon +, p11-kit +, pcre +, vte +, wnck +, libselinux +, gnutls +, pcre2 +, libsepol +, utillinux +, deepin-menu +, deepin-shortcut-viewer +, deepin +, wrapGAppsHook +}: stdenv.mkDerivation rec { pname = "deepin-terminal"; @@ -77,7 +108,7 @@ stdenv.mkDerivation rec { Deepin terminal, it sharpens your focus in the world of command line! It is an advanced terminal emulator with workspace, multiple windows, remote management, quake mode and other features. - ''; + ''; homepage = "https://github.com/linuxdeepin/deepin-terminal"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/desktops/deepin/deepin-turbo/default.nix b/pkgs/desktops/deepin/deepin-turbo/default.nix index f34997f5179..af6d515055a 100644 --- a/pkgs/desktops/deepin/deepin-turbo/default.nix +++ b/pkgs/desktops/deepin/deepin-turbo/default.nix @@ -1,4 +1,11 @@ -{ stdenv, mkDerivation, fetchFromGitHub, cmake, pkgconfig, qtbase, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, cmake +, pkgconfig +, qtbase +, deepin +}: mkDerivation rec { pname = "deepin-turbo"; diff --git a/pkgs/desktops/deepin/deepin-wallpapers/default.nix b/pkgs/desktops/deepin/deepin-wallpapers/default.nix index 82f7214471f..8bc8f31b619 100644 --- a/pkgs/desktops/deepin/deepin-wallpapers/default.nix +++ b/pkgs/desktops/deepin/deepin-wallpapers/default.nix @@ -1,4 +1,8 @@ -{ stdenv, fetchFromGitHub, dde-api, deepin }: +{ stdenv +, fetchFromGitHub +, dde-api +, deepin +}: stdenv.mkDerivation rec { pname = "deepin-wallpapers"; @@ -11,7 +15,10 @@ stdenv.mkDerivation rec { sha256 = "09cfnxbpms98ibqbi4xd51181q3az5n8rmndcdr9w12kyzniz7xv"; }; - nativeBuildInputs = [ dde-api deepin.setupHook ]; + nativeBuildInputs = [ + dde-api + deepin.setupHook + ]; postPatch = '' searchHardCodedPaths # debugging diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 64dbdbfd104..bcf4e3e3add 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -1,5 +1,4 @@ { pkgs, makeScope, libsForQt5 }: - let packages = self: with self; { setupHook = ./setup-hook.sh; @@ -56,4 +55,4 @@ let }; in - makeScope libsForQt5.newScope packages +makeScope libsForQt5.newScope packages diff --git a/pkgs/desktops/deepin/disomaster/default.nix b/pkgs/desktops/deepin/disomaster/default.nix index a1db0673a46..1a4b59b4e70 100644 --- a/pkgs/desktops/deepin/disomaster/default.nix +++ b/pkgs/desktops/deepin/disomaster/default.nix @@ -1,4 +1,12 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qtbase, libisoburn, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, qmake +, qtbase +, libisoburn +, deepin +}: mkDerivation rec { pname = "disomaster"; diff --git a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix b/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix index 970e48941d4..099935e2454 100644 --- a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix +++ b/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix @@ -1,5 +1,12 @@ -{ stdenv, fetchFromGitHub, pkgconfig, qmake, qttools, gnome3, - dde-polkit-agent, deepin }: +{ stdenv +, fetchFromGitHub +, pkgconfig +, qmake +, qttools +, gnome3 +, dde-polkit-agent +, deepin +}: stdenv.mkDerivation rec { pname = "dpa-ext-gnomekeyring"; diff --git a/pkgs/desktops/deepin/dtkcore/default.nix b/pkgs/desktops/deepin/dtkcore/default.nix index 90b02a6d930..41f9776e2ec 100644 --- a/pkgs/desktops/deepin/dtkcore/default.nix +++ b/pkgs/desktops/deepin/dtkcore/default.nix @@ -1,4 +1,12 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, gsettings-qt, pythonPackages, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, qmake +, gsettings-qt +, pythonPackages +, deepin +}: mkDerivation rec { pname = "dtkcore"; diff --git a/pkgs/desktops/deepin/dtkwidget/default.nix b/pkgs/desktops/deepin/dtkwidget/default.nix index 5a3869a2db9..7ce703b24a6 100644 --- a/pkgs/desktops/deepin/dtkwidget/default.nix +++ b/pkgs/desktops/deepin/dtkwidget/default.nix @@ -1,6 +1,19 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qttools, qtmultimedia, - qtsvg, qtx11extras, librsvg, libstartup_notification, gsettings-qt, - dde-qt-dbus-factory, dtkcore, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, qmake +, qttools +, qtmultimedia +, qtsvg +, qtx11extras +, librsvg +, libstartup_notification +, gsettings-qt +, dde-qt-dbus-factory +, dtkcore +, deepin +}: mkDerivation rec { pname = "dtkwidget"; diff --git a/pkgs/desktops/deepin/dtkwm/default.nix b/pkgs/desktops/deepin/dtkwm/default.nix index ecc11feb749..3175adfc0a9 100644 --- a/pkgs/desktops/deepin/dtkwm/default.nix +++ b/pkgs/desktops/deepin/dtkwm/default.nix @@ -1,4 +1,13 @@ -{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, pkgconfig, qmake, qtx11extras, dtkcore, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, fetchpatch +, pkgconfig +, qmake +, qtx11extras +, dtkcore +, deepin +}: mkDerivation rec { pname = "dtkwm"; diff --git a/pkgs/desktops/deepin/go-dbus-factory/default.nix b/pkgs/desktops/deepin/go-dbus-factory/default.nix index 52bf8e62f1d..ec563709617 100644 --- a/pkgs/desktops/deepin/go-dbus-factory/default.nix +++ b/pkgs/desktops/deepin/go-dbus-factory/default.nix @@ -1,4 +1,7 @@ -{ stdenv, fetchFromGitHub, deepin }: +{ stdenv +, fetchFromGitHub +, deepin +}: stdenv.mkDerivation rec { pname = "go-dbus-factory"; @@ -11,7 +14,9 @@ stdenv.mkDerivation rec { sha256 = "06fqyad9f50gcjsjkh7929yyaprahdjhnd0dr4gl2797a7wysl3f"; }; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; postPatch = '' sed -i -e 's:/share/gocode:/share/go:' Makefile diff --git a/pkgs/desktops/deepin/go-dbus-generator/default.nix b/pkgs/desktops/deepin/go-dbus-generator/default.nix index 481f7eb2bc2..9b78e940b3c 100644 --- a/pkgs/desktops/deepin/go-dbus-generator/default.nix +++ b/pkgs/desktops/deepin/go-dbus-generator/default.nix @@ -1,4 +1,9 @@ -{ stdenv, fetchFromGitHub, go, go-lib, deepin }: +{ stdenv +, fetchFromGitHub +, go +, go-lib +, deepin +}: stdenv.mkDerivation rec { pname = "go-dbus-generator"; diff --git a/pkgs/desktops/deepin/go-gir-generator/default.nix b/pkgs/desktops/deepin/go-gir-generator/default.nix index f57bae89711..3a233a24971 100644 --- a/pkgs/desktops/deepin/go-gir-generator/default.nix +++ b/pkgs/desktops/deepin/go-gir-generator/default.nix @@ -1,5 +1,12 @@ -{ stdenv, fetchpatch, fetchFromGitHub, pkgconfig, go, gobject-introspection, - libgudev, deepin }: +{ stdenv +, fetchpatch +, fetchFromGitHub +, pkgconfig +, go +, gobject-introspection +, libgudev +, deepin +}: stdenv.mkDerivation rec { pname = "go-gir-generator"; diff --git a/pkgs/desktops/deepin/go-lib/default.nix b/pkgs/desktops/deepin/go-lib/default.nix index 43fddf78f11..68a66c40ef3 100644 --- a/pkgs/desktops/deepin/go-lib/default.nix +++ b/pkgs/desktops/deepin/go-lib/default.nix @@ -1,5 +1,12 @@ -{ stdenv, fetchFromGitHub, glib, xorg, gdk-pixbuf, pulseaudio, - mobile-broadband-provider-info, deepin }: +{ stdenv +, fetchFromGitHub +, glib +, xorg +, gdk-pixbuf +, pulseaudio +, mobile-broadband-provider-info +, deepin +}: stdenv.mkDerivation rec { pname = "go-lib"; diff --git a/pkgs/desktops/deepin/qcef/default.nix b/pkgs/desktops/deepin/qcef/default.nix index 3b7207379c7..68e03c30d5f 100644 --- a/pkgs/desktops/deepin/qcef/default.nix +++ b/pkgs/desktops/deepin/qcef/default.nix @@ -1,12 +1,35 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools, - qtwebchannel, qtx11extras, - gnome2, nss, nspr, alsaLib, atk, cairo, cups, dbus, - expat, fontconfig, gdk-pixbuf, glib, gtk2, - libxcb, pango, pulseaudio, xorg, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, cmake +, qtbase +, qttools +, qtwebchannel +, qtx11extras +, gnome2 +, nss +, nspr +, alsaLib +, atk +, cairo +, cups +, dbus +, expat +, fontconfig +, gdk-pixbuf +, glib +, gtk2 +, libxcb +, pango +, pulseaudio +, xorg +, deepin +}: let rpahtLibraries = [ - stdenv.cc.cc.lib # libstdc++.so.6 + stdenv.cc.cc.lib # libstdc++.so.6 alsaLib atk cairo @@ -35,9 +58,10 @@ let xorg.libXrender xorg.libXtst ]; + libPath = stdenv.lib.makeLibraryPath rpahtLibraries; -in +in mkDerivation rec { pname = "qcef"; version = "1.1.7"; @@ -97,7 +121,7 @@ mkDerivation rec { homepage = "https://github.com/linuxdeepin/qcef"; license = licenses.lgpl3; platforms = platforms.linux; - badPlatforms = [ "aarch64-linux" ]; # the cef-binary is not available + badPlatforms = [ "aarch64-linux" ]; # the cef-binary is not available maintainers = with maintainers; [ romildo ]; }; } diff --git a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix index 1bf069821f5..19cd36425f0 100644 --- a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix +++ b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix @@ -1,5 +1,15 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, qtx11extras, libSM, - mtdev, cairo, deepin, qtbase }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, qmake +, qtx11extras +, libSM +, mtdev +, cairo +, deepin +, qtbase +}: mkDerivation rec { pname = "qt5dxcb-plugin"; diff --git a/pkgs/desktops/deepin/qt5integration/default.nix b/pkgs/desktops/deepin/qt5integration/default.nix index ad89957ef1b..9cec54c98a5 100644 --- a/pkgs/desktops/deepin/qt5integration/default.nix +++ b/pkgs/desktops/deepin/qt5integration/default.nix @@ -1,6 +1,19 @@ -{ stdenv, mkDerivation, fetchFromGitHub, pkgconfig, qmake, mtdev, - lxqt, qtx11extras, qtmultimedia, qtsvg, - qt5dxcb-plugin, qtstyleplugins, dtkcore, dtkwidget, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, pkgconfig +, qmake +, mtdev +, lxqt +, qtx11extras +, qtmultimedia +, qtsvg +, qt5dxcb-plugin +, qtstyleplugins +, dtkcore +, dtkwidget +, deepin +}: mkDerivation rec { pname = "qt5integration"; diff --git a/pkgs/desktops/deepin/startdde/default.nix b/pkgs/desktops/deepin/startdde/default.nix index 3050e7b9e13..2d05a1721dd 100644 --- a/pkgs/desktops/deepin/startdde/default.nix +++ b/pkgs/desktops/deepin/startdde/default.nix @@ -1,10 +1,40 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, alsaLib, - coreutils, dbus-factory, dde-api, dde-daemon, dde-dock, - dde-file-manager, dde-polkit-agent, dde-session-ui, deepin, - deepin-desktop-base, deepin-desktop-schemas, deepin-turbo, - dde-kwin, glib, gnome3, go, go-dbus-factory, go-gir-generator, - go-lib, gtk3, jq, kmod, libX11, libXi, libcgroup, pciutils, psmisc, - pulseaudio, systemd, xorg, wrapGAppsHook }: +{ stdenv +, buildGoPackage +, fetchFromGitHub +, pkgconfig +, alsaLib +, coreutils +, dbus-factory +, dde-api +, dde-daemon +, dde-dock +, dde-file-manager +, dde-polkit-agent +, dde-session-ui +, deepin +, deepin-desktop-base +, deepin-desktop-schemas +, deepin-turbo +, dde-kwin +, glib +, gnome3 +, go +, go-dbus-factory +, go-gir-generator +, go-lib +, gtk3 +, jq +, kmod +, libX11 +, libXi +, libcgroup +, pciutils +, psmisc +, pulseaudio +, systemd +, xorg +, wrapGAppsHook +}: buildGoPackage rec { name = "${pname}-${version}"; diff --git a/pkgs/desktops/deepin/udisks2-qt5/default.nix b/pkgs/desktops/deepin/udisks2-qt5/default.nix index d13460a4bd5..38ed226b4cf 100644 --- a/pkgs/desktops/deepin/udisks2-qt5/default.nix +++ b/pkgs/desktops/deepin/udisks2-qt5/default.nix @@ -1,4 +1,10 @@ -{ stdenv, mkDerivation, fetchFromGitHub, qmake, qtbase, deepin }: +{ stdenv +, mkDerivation +, fetchFromGitHub +, qmake +, qtbase +, deepin +}: mkDerivation rec { pname = "udisks2-qt5"; -- cgit v1.2.3 From 593c6247ab9cd8d25799990aeca8057db1298522 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 3 May 2020 17:03:55 -0300 Subject: deepin: redefine updateScript to use genericUpdater --- pkgs/desktops/deepin/dbus-factory/default.nix | 2 +- pkgs/desktops/deepin/dde-api/default.nix | 2 +- pkgs/desktops/deepin/dde-calendar/default.nix | 2 +- .../desktops/deepin/dde-control-center/default.nix | 2 +- pkgs/desktops/deepin/dde-daemon/default.nix | 2 +- pkgs/desktops/deepin/dde-dock/default.nix | 2 +- pkgs/desktops/deepin/dde-file-manager/default.nix | 2 +- pkgs/desktops/deepin/dde-kwin/default.nix | 2 +- pkgs/desktops/deepin/dde-launcher/default.nix | 2 +- pkgs/desktops/deepin/dde-network-utils/default.nix | 2 +- pkgs/desktops/deepin/dde-polkit-agent/default.nix | 2 +- .../deepin/dde-qt-dbus-factory/default.nix | 2 +- pkgs/desktops/deepin/dde-session-ui/default.nix | 2 +- pkgs/desktops/deepin/deepin-anything/default.nix | 2 +- pkgs/desktops/deepin/deepin-calculator/default.nix | 2 +- .../deepin/deepin-desktop-base/default.nix | 2 +- .../deepin/deepin-desktop-schemas/default.nix | 2 +- pkgs/desktops/deepin/deepin-editor/default.nix | 3 +- .../deepin/deepin-gettext-tools/default.nix | 2 +- pkgs/desktops/deepin/deepin-gtk-theme/default.nix | 2 +- pkgs/desktops/deepin/deepin-icon-theme/default.nix | 2 +- .../deepin/deepin-image-viewer/default.nix | 2 +- pkgs/desktops/deepin/deepin-menu/default.nix | 2 +- .../deepin/deepin-movie-reborn/default.nix | 2 +- pkgs/desktops/deepin/deepin-screenshot/default.nix | 2 +- .../deepin/deepin-shortcut-viewer/default.nix | 2 +- .../desktops/deepin/deepin-sound-theme/default.nix | 2 +- pkgs/desktops/deepin/deepin-terminal/default.nix | 2 +- pkgs/desktops/deepin/deepin-turbo/default.nix | 2 +- pkgs/desktops/deepin/deepin-wallpapers/default.nix | 2 +- pkgs/desktops/deepin/default.nix | 9 ++++- pkgs/desktops/deepin/disomaster/default.nix | 2 +- .../deepin/dpa-ext-gnomekeyring/default.nix | 2 +- pkgs/desktops/deepin/dtkcore/default.nix | 2 +- pkgs/desktops/deepin/dtkwidget/default.nix | 2 +- pkgs/desktops/deepin/dtkwm/default.nix | 2 +- pkgs/desktops/deepin/go-dbus-factory/default.nix | 2 +- pkgs/desktops/deepin/go-dbus-generator/default.nix | 2 +- pkgs/desktops/deepin/go-gir-generator/default.nix | 2 +- pkgs/desktops/deepin/go-lib/default.nix | 2 +- pkgs/desktops/deepin/qcef/default.nix | 2 +- pkgs/desktops/deepin/qt5dxcb-plugin/default.nix | 2 +- pkgs/desktops/deepin/qt5integration/default.nix | 2 +- pkgs/desktops/deepin/startdde/default.nix | 3 +- pkgs/desktops/deepin/udisks2-qt5/default.nix | 2 +- pkgs/desktops/deepin/update.nix | 38 ---------------------- 46 files changed, 52 insertions(+), 85 deletions(-) delete mode 100644 pkgs/desktops/deepin/update.nix diff --git a/pkgs/desktops/deepin/dbus-factory/default.nix b/pkgs/desktops/deepin/dbus-factory/default.nix index 9180127de43..06d921cce6d 100644 --- a/pkgs/desktops/deepin/dbus-factory/default.nix +++ b/pkgs/desktops/deepin/dbus-factory/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { sed -i -e 's:/share/gocode:/share/go:' Makefile ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Generates static DBus bindings for Golang and QML at build-time"; diff --git a/pkgs/desktops/deepin/dde-api/default.nix b/pkgs/desktops/deepin/dde-api/default.nix index b55497a0450..f260295b1bc 100644 --- a/pkgs/desktops/deepin/dde-api/default.nix +++ b/pkgs/desktops/deepin/dde-api/default.nix @@ -119,7 +119,7 @@ buildGoPackage rec { searchHardCodedPaths $out # debugging ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Go-lang bindings for dde-daemon"; diff --git a/pkgs/desktops/deepin/dde-calendar/default.nix b/pkgs/desktops/deepin/dde-calendar/default.nix index 5d5ab4e5913..094f3447c6b 100644 --- a/pkgs/desktops/deepin/dde-calendar/default.nix +++ b/pkgs/desktops/deepin/dde-calendar/default.nix @@ -45,7 +45,7 @@ mkDerivation rec { -e "s,/usr/bin/deepin-desktop-ts-convert,deepin-desktop-ts-convert," ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Calendar for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/dde-control-center/default.nix b/pkgs/desktops/deepin/dde-control-center/default.nix index 6f3f7b991fb..be2846fc87e 100644 --- a/pkgs/desktops/deepin/dde-control-center/default.nix +++ b/pkgs/desktops/deepin/dde-control-center/default.nix @@ -138,7 +138,7 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Control panel of Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix index cb5e4581693..8390a19ce78 100644 --- a/pkgs/desktops/deepin/dde-daemon/default.nix +++ b/pkgs/desktops/deepin/dde-daemon/default.nix @@ -151,7 +151,7 @@ buildGoPackage rec { searchHardCodedPaths $out # debugging ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Daemon for handling Deepin Desktop Environment session settings"; diff --git a/pkgs/desktops/deepin/dde-dock/default.nix b/pkgs/desktops/deepin/dde-dock/default.nix index b215208c7f4..68f2caa6319 100644 --- a/pkgs/desktops/deepin/dde-dock/default.nix +++ b/pkgs/desktops/deepin/dde-dock/default.nix @@ -96,7 +96,7 @@ let searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Dock for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/dde-file-manager/default.nix b/pkgs/desktops/deepin/dde-file-manager/default.nix index 74b99d1e46d..4258e2aa859 100644 --- a/pkgs/desktops/deepin/dde-file-manager/default.nix +++ b/pkgs/desktops/deepin/dde-file-manager/default.nix @@ -286,7 +286,7 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "File manager and desktop module for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/dde-kwin/default.nix b/pkgs/desktops/deepin/dde-kwin/default.nix index fe76e65250d..ce1a1a8dda0 100644 --- a/pkgs/desktops/deepin/dde-kwin/default.nix +++ b/pkgs/desktops/deepin/dde-kwin/default.nix @@ -130,7 +130,7 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "KWin configuration for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/dde-launcher/default.nix b/pkgs/desktops/deepin/dde-launcher/default.nix index 51c0f0bec6d..0a50f7177ba 100644 --- a/pkgs/desktops/deepin/dde-launcher/default.nix +++ b/pkgs/desktops/deepin/dde-launcher/default.nix @@ -89,7 +89,7 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Deepin Desktop Environment launcher module"; diff --git a/pkgs/desktops/deepin/dde-network-utils/default.nix b/pkgs/desktops/deepin/dde-network-utils/default.nix index a3c38fee4cc..d54558acf08 100644 --- a/pkgs/desktops/deepin/dde-network-utils/default.nix +++ b/pkgs/desktops/deepin/dde-network-utils/default.nix @@ -51,7 +51,7 @@ mkDerivation rec { searchHardCodedPaths $out # for debugging ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Deepin network utils"; diff --git a/pkgs/desktops/deepin/dde-polkit-agent/default.nix b/pkgs/desktops/deepin/dde-polkit-agent/default.nix index 0c19a690617..1ca9a80abaf 100644 --- a/pkgs/desktops/deepin/dde-polkit-agent/default.nix +++ b/pkgs/desktops/deepin/dde-polkit-agent/default.nix @@ -48,7 +48,7 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "PolicyKit agent for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix index 2dac25f805b..c7efb0f4b04 100644 --- a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix +++ b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Qt DBus interface library for Deepin software"; diff --git a/pkgs/desktops/deepin/dde-session-ui/default.nix b/pkgs/desktops/deepin/dde-session-ui/default.nix index 16c8e8c8ccc..ff785f16c81 100644 --- a/pkgs/desktops/deepin/dde-session-ui/default.nix +++ b/pkgs/desktops/deepin/dde-session-ui/default.nix @@ -145,7 +145,7 @@ mkDerivation rec { searchHardCodedPaths $out # debugging ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Deepin desktop-environment - Session UI module"; diff --git a/pkgs/desktops/deepin/deepin-anything/default.nix b/pkgs/desktops/deepin/deepin-anything/default.nix index 121f877a27f..5fa6c93951d 100644 --- a/pkgs/desktops/deepin/deepin-anything/default.nix +++ b/pkgs/desktops/deepin/deepin-anything/default.nix @@ -70,7 +70,7 @@ mkDerivation rec { searchHardCodedPaths $modsrc # for debugging ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Deepin file search tool"; diff --git a/pkgs/desktops/deepin/deepin-calculator/default.nix b/pkgs/desktops/deepin/deepin-calculator/default.nix index 81668f88a45..67ead7d314a 100644 --- a/pkgs/desktops/deepin/deepin-calculator/default.nix +++ b/pkgs/desktops/deepin/deepin-calculator/default.nix @@ -45,7 +45,7 @@ mkDerivation rec { searchHardCodedPaths $out # debugging ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Easy to use calculator for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/deepin-desktop-base/default.nix index 0c140038ab4..74fa53b715d 100644 --- a/pkgs/desktops/deepin/deepin-desktop-base/default.nix +++ b/pkgs/desktops/deepin/deepin-desktop-base/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ln -s ../lib/deepin/desktop-version $out/etc/deepin-version ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Base assets and definitions for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix index 4f0685089a6..15f9498cf0d 100644 --- a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix +++ b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "GSettings deepin desktop-wide schemas"; diff --git a/pkgs/desktops/deepin/deepin-editor/default.nix b/pkgs/desktops/deepin/deepin-editor/default.nix index 36908015d3e..0124ca8cc9e 100644 --- a/pkgs/desktops/deepin/deepin-editor/default.nix +++ b/pkgs/desktops/deepin/deepin-editor/default.nix @@ -13,7 +13,6 @@ }: stdenv.mkDerivation rec { - name = "${pname}-${version}"; pname = "deepin-editor"; version = "1.2.9.1"; @@ -61,7 +60,7 @@ stdenv.mkDerivation rec { searchHardCodedPaths $out # debugging ''; - passthru.updateScript = deepin.updateScript { inherit name; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Simple editor for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix index c4180dd94bc..432add458de 100644 --- a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix +++ b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/deepin-desktop-ts-convert --set PERL5LIB $PERL5LIB ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Deepin Internationalization utilities"; diff --git a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix index 0503127995f..eee07470585 100644 --- a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { "PREFIX=${placeholder "out"}" ]; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Deepin GTK Theme"; diff --git a/pkgs/desktops/deepin/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/deepin-icon-theme/default.nix index d69a4703ef9..464d6f19ced 100644 --- a/pkgs/desktops/deepin/deepin-icon-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-icon-theme/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { cp -a ./Sea ./usr/share/icons/hicolor "$out"/share/icons/ ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Icons for the Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/deepin-image-viewer/default.nix index 481c6e1a6bf..43c18c85abc 100644 --- a/pkgs/desktops/deepin/deepin-image-viewer/default.nix +++ b/pkgs/desktops/deepin/deepin-image-viewer/default.nix @@ -53,7 +53,7 @@ mkDerivation rec { -e "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix," ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Image Viewer for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/deepin-menu/default.nix b/pkgs/desktops/deepin/deepin-menu/default.nix index ddc45cabb49..983fe4e1c4d 100644 --- a/pkgs/desktops/deepin/deepin-menu/default.nix +++ b/pkgs/desktops/deepin/deepin-menu/default.nix @@ -42,7 +42,7 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Deepin menu service"; diff --git a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix index 1184bb79f6b..6763292b626 100644 --- a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix +++ b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix @@ -73,7 +73,7 @@ mkDerivation rec { --replace "Exec=deepin-movie" "Exec=$out/bin/deepin-movie" ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Deepin movie player"; diff --git a/pkgs/desktops/deepin/deepin-screenshot/default.nix b/pkgs/desktops/deepin/deepin-screenshot/default.nix index 9f4065610ad..0ccc350962a 100644 --- a/pkgs/desktops/deepin/deepin-screenshot/default.nix +++ b/pkgs/desktops/deepin/deepin-screenshot/default.nix @@ -61,7 +61,7 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Easy-to-use screenshot tool for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix index d0203ccd1bb..76d8847b73f 100644 --- a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix +++ b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix @@ -33,7 +33,7 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Pop-up shortcut viewer for Deepin applications"; diff --git a/pkgs/desktops/deepin/deepin-sound-theme/default.nix b/pkgs/desktops/deepin/deepin-sound-theme/default.nix index 9c7ec39965b..e71c0cb77c5 100644 --- a/pkgs/desktops/deepin/deepin-sound-theme/default.nix +++ b/pkgs/desktops/deepin/deepin-sound-theme/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "PREFIX=${placeholder "out"}" ]; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Deepin sound theme"; diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix index 7b95227a29d..ae312137942 100644 --- a/pkgs/desktops/deepin/deepin-terminal/default.nix +++ b/pkgs/desktops/deepin/deepin-terminal/default.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation rec { "-DVERSION=${version}" ]; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Default terminal emulator for Deepin"; diff --git a/pkgs/desktops/deepin/deepin-turbo/default.nix b/pkgs/desktops/deepin/deepin-turbo/default.nix index af6d515055a..6bba51ac674 100644 --- a/pkgs/desktops/deepin/deepin-turbo/default.nix +++ b/pkgs/desktops/deepin/deepin-turbo/default.nix @@ -38,7 +38,7 @@ mkDerivation rec { searchHardCodedPaths $out # for debugging ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "A daemon that helps to launch applications faster"; diff --git a/pkgs/desktops/deepin/deepin-wallpapers/default.nix b/pkgs/desktops/deepin/deepin-wallpapers/default.nix index 8bc8f31b619..4fa3d6043d5 100644 --- a/pkgs/desktops/deepin/deepin-wallpapers/default.nix +++ b/pkgs/desktops/deepin/deepin-wallpapers/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { $out/var/cache/image-blur/$(echo -n $out/share/backgrounds/deepin/desktop.jpg | md5sum | cut -d " " -f 1).jpg ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Wallpapers for Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index bcf4e3e3add..8d33ac154af 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -3,7 +3,14 @@ let packages = self: with self; { setupHook = ./setup-hook.sh; - updateScript = callPackage ./update.nix { }; + # Update script tailored to deepin packages from git repository + updateScript = { pname, version, src }: + pkgs.genericUpdater { + inherit pname version; + attrPath = "deepin.${pname}"; + versionLister = "${pkgs.common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; + ignoredVersions = "^2014(\\.|rc)|^v[0-9]+"; + }; dbus-factory = callPackage ./dbus-factory { }; dde-api = callPackage ./dde-api { }; diff --git a/pkgs/desktops/deepin/disomaster/default.nix b/pkgs/desktops/deepin/disomaster/default.nix index 1a4b59b4e70..758c8ff76c3 100644 --- a/pkgs/desktops/deepin/disomaster/default.nix +++ b/pkgs/desktops/deepin/disomaster/default.nix @@ -37,7 +37,7 @@ mkDerivation rec { libdisomaster/libdisomaster.pro ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "A libisoburn wrapper for Qt"; diff --git a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix b/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix index 099935e2454..2caef7ce916 100644 --- a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix +++ b/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { fixPath $out /usr dpa-ext-gnomekeyring.pro gnomekeyringextention.cpp ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "GNOME keyring extension for dde-polkit-agent"; diff --git a/pkgs/desktops/deepin/dtkcore/default.nix b/pkgs/desktops/deepin/dtkcore/default.nix index 41f9776e2ec..570b0cc2c11 100644 --- a/pkgs/desktops/deepin/dtkcore/default.nix +++ b/pkgs/desktops/deepin/dtkcore/default.nix @@ -51,7 +51,7 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Deepin tool kit core library"; diff --git a/pkgs/desktops/deepin/dtkwidget/default.nix b/pkgs/desktops/deepin/dtkwidget/default.nix index 7ce703b24a6..9be222830db 100644 --- a/pkgs/desktops/deepin/dtkwidget/default.nix +++ b/pkgs/desktops/deepin/dtkwidget/default.nix @@ -53,7 +53,7 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Deepin graphical user interface library"; diff --git a/pkgs/desktops/deepin/dtkwm/default.nix b/pkgs/desktops/deepin/dtkwm/default.nix index 3175adfc0a9..56031f11492 100644 --- a/pkgs/desktops/deepin/dtkwm/default.nix +++ b/pkgs/desktops/deepin/dtkwm/default.nix @@ -46,7 +46,7 @@ mkDerivation rec { "LIB_INSTALL_DIR=${outRef}/lib" ]; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Deepin graphical user interface library"; diff --git a/pkgs/desktops/deepin/go-dbus-factory/default.nix b/pkgs/desktops/deepin/go-dbus-factory/default.nix index ec563709617..1c1afd9d099 100644 --- a/pkgs/desktops/deepin/go-dbus-factory/default.nix +++ b/pkgs/desktops/deepin/go-dbus-factory/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { sed -i -e 's:/share/gocode:/share/go:' Makefile ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "GoLang DBus factory for the Deepin Desktop Environment"; diff --git a/pkgs/desktops/deepin/go-dbus-generator/default.nix b/pkgs/desktops/deepin/go-dbus-generator/default.nix index 9b78e940b3c..d0b2d8c07e6 100644 --- a/pkgs/desktops/deepin/go-dbus-generator/default.nix +++ b/pkgs/desktops/deepin/go-dbus-generator/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { "GOCACHE=$(TMPDIR)/go-cache" ]; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Convert dbus interfaces to go-lang or qml wrapper code"; diff --git a/pkgs/desktops/deepin/go-gir-generator/default.nix b/pkgs/desktops/deepin/go-gir-generator/default.nix index 3a233a24971..0c282aaa227 100644 --- a/pkgs/desktops/deepin/go-gir-generator/default.nix +++ b/pkgs/desktops/deepin/go-gir-generator/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { "GOCACHE=$(TMPDIR)/go-cache" ]; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Generate static golang bindings for GObject"; diff --git a/pkgs/desktops/deepin/go-lib/default.nix b/pkgs/desktops/deepin/go-lib/default.nix index 68a66c40ef3..d45351fd6dc 100644 --- a/pkgs/desktops/deepin/go-lib/default.nix +++ b/pkgs/desktops/deepin/go-lib/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { rm -r $out/share/go/src/pkg.deepin.io/lib/debian ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Go bindings for Deepin Desktop Environment development"; diff --git a/pkgs/desktops/deepin/qcef/default.nix b/pkgs/desktops/deepin/qcef/default.nix index 68e03c30d5f..fb6bb89d939 100644 --- a/pkgs/desktops/deepin/qcef/default.nix +++ b/pkgs/desktops/deepin/qcef/default.nix @@ -114,7 +114,7 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version; src = (builtins.head srcs); }; meta = with stdenv.lib; { description = "Qt5 binding of Chromium Embedded Framework"; diff --git a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix index 19cd36425f0..4aa10fb1a93 100644 --- a/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix +++ b/pkgs/desktops/deepin/qt5dxcb-plugin/default.nix @@ -53,7 +53,7 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version; src = (builtins.head srcs); }; meta = with stdenv.lib; { description = "Qt platform theme integration plugin for DDE"; diff --git a/pkgs/desktops/deepin/qt5integration/default.nix b/pkgs/desktops/deepin/qt5integration/default.nix index 9cec54c98a5..cc427611c34 100644 --- a/pkgs/desktops/deepin/qt5integration/default.nix +++ b/pkgs/desktops/deepin/qt5integration/default.nix @@ -53,7 +53,7 @@ mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "Qt platform theme integration plugins for DDE"; diff --git a/pkgs/desktops/deepin/startdde/default.nix b/pkgs/desktops/deepin/startdde/default.nix index 2d05a1721dd..9c17a7031ab 100644 --- a/pkgs/desktops/deepin/startdde/default.nix +++ b/pkgs/desktops/deepin/startdde/default.nix @@ -37,7 +37,6 @@ }: buildGoPackage rec { - name = "${pname}-${version}"; pname = "startdde"; version = "5.0.1"; @@ -152,7 +151,7 @@ buildGoPackage rec { ''; passthru = { - updateScript = deepin.updateScript { inherit name; }; + updateScript = deepin.updateScript { inherit pname version src; }; providedSessions = [ "deepin" ]; }; diff --git a/pkgs/desktops/deepin/udisks2-qt5/default.nix b/pkgs/desktops/deepin/udisks2-qt5/default.nix index 38ed226b4cf..385fedfc478 100644 --- a/pkgs/desktops/deepin/udisks2-qt5/default.nix +++ b/pkgs/desktops/deepin/udisks2-qt5/default.nix @@ -34,7 +34,7 @@ mkDerivation rec { searchHardCodedPaths $out ''; - passthru.updateScript = deepin.updateScript { name = "${pname}-${version}"; }; + passthru.updateScript = deepin.updateScript { inherit pname version src; }; meta = with stdenv.lib; { description = "UDisks2 D-Bus interfaces binding for Qt5"; diff --git a/pkgs/desktops/deepin/update.nix b/pkgs/desktops/deepin/update.nix deleted file mode 100644 index 089d9289827..00000000000 --- a/pkgs/desktops/deepin/update.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ stdenv, lib, writeScript, coreutils, curl, gnugrep, gnused, jq, common-updater-scripts, nix }: -{ name, ignored-versions ? "^2014(\\.|rc)|^v[0-9]+" }: - -let - nameAndVersion = builtins.parseDrvName name; - packageVersion = nameAndVersion.version; - packageName = nameAndVersion.name; - attrPath = "deepin.${packageName}"; -in - -writeScript "update-${packageName}" '' - #!${stdenv.shell} - set -o errexit - set -x - - # search for the latest version of the package on github - PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep gnused jq ]} - tags=$(curl -s https://api.github.com/repos/linuxdeepin/${packageName}/tags) - tags=$(echo "$tags" | jq -r '.[] | .name') - echo "# ${name}" >> git-commits.txt - echo "# available tags:" >> git-commits.txt - echo "$tags" | ${gnused}/bin/sed -e 's/^/# /' >> git-commits.txt - if [ -n "${ignored-versions}" ]; then - tags=$(echo "$tags" | grep -vE "${ignored-versions}") - fi - latest_tag=$(echo "$tags" | sort --version-sort | tail -1) - - # generate commands to commit the changes - if [ "${packageVersion}" != "$latest_tag" ]; then - pfile=$(EDITOR=echo ${nix}/bin/nix edit -f. ${attrPath}) - echo " git add $pfile " >> git-commits.txt - echo " git commit -m \"${attrPath}: ${packageVersion} -> $latest_tag\"" >> git-commits.txt - fi - - # update the nix expression - update-source-version "${attrPath}" "$latest_tag" - echo "" >> git-commits.txt -'' -- cgit v1.2.3 From e31b4c313b9fcd5316a3b3d18462c1647d17863c Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 4 May 2020 20:42:46 +0300 Subject: opencv: rename and default to opencv4 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1adb4e0eb2..4dd7c0e2363 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13798,7 +13798,7 @@ in openct = callPackage ../development/libraries/openct { }; - opencv = callPackage ../development/libraries/opencv { + opencv2 = callPackage ../development/libraries/opencv { inherit (darwin.apple_sdk.frameworks) Cocoa QTKit; }; @@ -13814,6 +13814,8 @@ in inherit (darwin.apple_sdk.frameworks) AVFoundation Cocoa VideoDecodeAcceleration; }; + opencv = opencv4; + openexr = callPackage ../development/libraries/openexr { }; openexrid-unstable = callPackage ../development/libraries/openexrid-unstable { }; -- cgit v1.2.3 From 55e40ed1dbe09d272bda2e72f0e3c2b427784e89 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 18:15:39 +0000 Subject: closurecompiler: 20200315 -> 20200406 --- pkgs/development/compilers/closure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix index 5204932448b..896b3a76789 100644 --- a/pkgs/development/compilers/closure/default.nix +++ b/pkgs/development/compilers/closure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "closure-compiler"; - version = "20200315"; + version = "20200406"; src = fetchurl { url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz"; - sha256 = "0akif1wgsyyqrfkidkwhw47dsx471h3b4zsjhnh4rf6kv7by3q65"; + sha256 = "1dd6fakavnadpm8h8r4d1saf9flm7ilhknfy0q6i5i237psjf7i5"; }; sourceRoot = "."; -- cgit v1.2.3 From e13140dc75a1f826ab1afed3ba60eac9f5cd392f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 18:47:07 +0000 Subject: copyq: 3.10.0 -> 3.11.0 --- pkgs/applications/misc/copyq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix index 081acb3acb6..ec2bd6b32c0 100644 --- a/pkgs/applications/misc/copyq/default.nix +++ b/pkgs/applications/misc/copyq/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "CopyQ"; - version = "3.10.0"; + version = "3.11.0"; src = fetchFromGitHub { owner = "hluk"; repo = "CopyQ"; rev = "v${version}"; - sha256 = "05nhgndiq0sm1bvb80sf5fgnm38249dclwzmfm7hzrablmkwgv3c"; + sha256 = "1wx6nqcyzknbw71sliwq4cb5qq1gy6pr9867s6x3vpg3n8g2czkf"; }; nativeBuildInputs = [ cmake ]; -- cgit v1.2.3 From f1e3278849c95a65a61d423c9d6c95263b107319 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Mon, 4 May 2020 14:51:04 -0400 Subject: nixFlakes: 2.4pre20200403_3473b19 -> 2.4pre20200501_941f952 --- pkgs/tools/package-management/nix/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 96fd1bebdd4..4d5ce1eeed1 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -207,18 +207,18 @@ in rec { nixFlakes = lib.lowPrio (callPackage common rec { name = "nix-2.4${suffix}"; - suffix = "pre20200403_3473b19"; + suffix = "pre20200501_941f952"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "3473b1950a90d596a3baa080fdfdb080f55a5cc0"; - sha256 = "1bb7a8a5lzmb3pzq80zxd3s9y3qv757q7032s5wvp75la9wgvmvr"; + rev = "941f95284ab57e9baa317791327cf1715d8564b5"; + sha256 = "0d99jl5baxji5dmqb4fwmbffx0z04k0naanms5zzbwvxdmzn3yhs"; }; crates = fetchurl { - url = "https://hydra.nixos.org/build/115942497/download/1/nix-vendored-crates-2.4pre20200403_3473b19.tar.xz"; - sha256 = "a83785553bb4bc5b28220562153e201ec555a00171466ac08b716f0c97aee45a"; + url = "https://hydra.nixos.org/build/118093786/download/1/nix-vendored-crates-2.4pre20200501_941f952.tar.xz"; + sha256 = "060f4n5srdbb8vsj0m14aqch7im79a4h5g3nrs41p1xc602vhcdl"; }; inherit storeDir stateDir confDir boehmgc; -- cgit v1.2.3 From 1fbb3931438f8353b7753a2cd2033dcf7d75ca5f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 15:02:29 +0000 Subject: python27Packages.autopep8: 1.5.1 -> 1.5.2 --- pkgs/development/python-modules/autopep8/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/autopep8/default.nix b/pkgs/development/python-modules/autopep8/default.nix index ccefe60ea08..715e4da8f44 100644 --- a/pkgs/development/python-modules/autopep8/default.nix +++ b/pkgs/development/python-modules/autopep8/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "autopep8"; - version = "1.5.1"; + version = "1.5.2"; src = fetchPypi { inherit pname version; - sha256 = "1swr8ccm3mafcm3zpbwyn22kjs39lbqmg8w41sh7yb3gskgy2syc"; + sha256 = "0m29ndgrcgrzi3y1fsxmdl421x6n4gn02l70hsz8486h8zzdhbqm"; }; propagatedBuildInputs = [ pycodestyle ]; -- cgit v1.2.3 From 57e6799d907995242575d94bd37178c59cb3cc9a Mon Sep 17 00:00:00 2001 From: Ambroz Bizjak Date: Sun, 12 Jan 2020 23:36:15 +0100 Subject: kdegraphics-thumbnailers: Add patch for thumbnail.so hang. https://bugs.kde.org/show_bug.cgi?id=404652 https://phabricator.kde.org/D26635 --- pkgs/applications/kde/kdegraphics-thumbnailers.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/kde/kdegraphics-thumbnailers.nix b/pkgs/applications/kde/kdegraphics-thumbnailers.nix index 6ae45057f19..d98f2013339 100644 --- a/pkgs/applications/kde/kdegraphics-thumbnailers.nix +++ b/pkgs/applications/kde/kdegraphics-thumbnailers.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, lib, fetchpatch, extra-cmake-modules, karchive, kio, libkexiv2, libkdcraw }: @@ -9,6 +9,14 @@ mkDerivation { license = [ lib.licenses.lgpl21 ]; maintainers = [ lib.maintainers.ttuegel ]; }; + patches = [ + # Fix a bug with thumbnail.so processes hanging: + # https://bugs.kde.org/show_bug.cgi?id=404652 + (fetchpatch { + url = "https://phabricator.kde.org/file/data/tnk4b6roouixzifi6vre/PHID-FILE-qkkedevt7svx7lv56ea5/D26635.diff"; + sha256 = "0fq85zhymmrq8vl0y6vgh87qf4c6fhcq704p4kpkaq7y0isxj4h1"; + }) + ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ karchive kio libkexiv2 libkdcraw ]; } -- cgit v1.2.3 From a17630204ac21ec490269994531ab674d822d7a0 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Mon, 4 May 2020 10:00:21 -0700 Subject: fish: fix and enable `fishConfig` test `nix-build -A fish.tests.fishConfig` will now test that the `fish_config` tool would start up properly. Previously, this test was effectively disabled due to `withTests` being stubbed out. I don't think this test ever truly worked, because the generated temporary file would be cleaned up automatically (or maybe this "automatically" changed between versions). The solution to this is to add `delete=False` to the `NamedTemporaryFile` function call, to keep the temporary file around in order to grep its contents for the expected output. --- pkgs/shells/fish/default.nix | 68 +++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 32 deletions(-) diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix index 0f18eb79d2d..11d9e48008f 100644 --- a/pkgs/shells/fish/default.nix +++ b/pkgs/shells/fish/default.nix @@ -16,6 +16,7 @@ , python3 , cmake +, runCommand , writeText , nixosTests , useOperatingSystemEtc ? true @@ -202,38 +203,41 @@ let passthru = { shellPath = "/bin/fish"; - tests.nixos = nixosTests.fish; + tests = { + nixos = nixosTests.fish; + + # Test the fish_config tool by checking the generated splash page. + # Since the webserver requires a port to run, it is not started. + fishConfig = + let fishScript = writeText "test.fish" '' + set -x __fish_bin_dir ${fish}/bin + echo $__fish_bin_dir + cp -r ${fish}/share/fish/tools/web_config/* . + chmod -R +w * + + # if we don't set `delete=False`, the file will get cleaned up + # automatically (leading the test to fail because there's no + # tempfile to check) + sed -e "s@, mode='w'@, mode='w', delete=False@" -i webconfig.py + + # we delete everything after the fileurl is assigned + sed -e '/fileurl =/q' -i webconfig.py + echo "print(fileurl)" >> webconfig.py + + # and check whether the message appears on the page + cat (${python3}/bin/python ./webconfig.py \ + | tail -n1 | sed -ne 's|.*\(/build/.*\)|\1|p' \ + ) | grep 'a href="http://localhost.*Start the Fish Web config' + + # cannot test the http server because it needs a localhost port + ''; + in + runCommand "test-web-config" { } '' + HOME=$(mktemp -d) + ${fish}/bin/fish ${fishScript} && touch $out + ''; + }; }; }; - - tests = { - - # Test the fish_config tool by checking the generated splash page. - # Since the webserver requires a port to run, it is not started. - fishConfig = - let - fishScript = writeText "test.fish" '' - set -x __fish_bin_dir ${fish}/bin - echo $__fish_bin_dir - cp -r ${fish}/share/fish/tools/web_config/* . - chmod -R +w * - # we delete everything after the fileurl is assigned - sed -e '/fileurl =/q' -i webconfig.py - echo "print(fileurl)" >> webconfig.py - # and check whether the message appears on the page - cat (${python3}/bin/python ./webconfig.py \ - | tail -n1 | sed -ne 's|.*\(/tmp/.*\)|\1|p' \ - ) | grep 'a href="http://localhost.*Start the Fish Web config' - - # cannot test the http server because it needs a localhost port - ''; - in '' - HOME=$(mktemp -d) - ${fish}/bin/fish ${fishScript} - ''; - }; - - # FIXME(Profpatsch) replace withTests stub - withTests = with lib; flip const; in -withTests tests fish +fish -- cgit v1.2.3 From 4748748f1253b33221e4e88ab115736fad627240 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 19:43:52 +0000 Subject: bmake: 20200318 -> 20200402 --- pkgs/development/tools/build-managers/bmake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/bmake/default.nix b/pkgs/development/tools/build-managers/bmake/default.nix index 944bbd9d4bb..7550068274c 100644 --- a/pkgs/development/tools/build-managers/bmake/default.nix +++ b/pkgs/development/tools/build-managers/bmake/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "bmake"; - version = "20200318"; + version = "20200402"; src = fetchurl { url = "http://www.crufty.net/ftp/pub/sjg/${pname}-${version}.tar.gz"; - sha256 = "10rcgv0hd5axm2b41a5xaig6iqbpyqfp2q7llr7zc3mnbacwaz35"; + sha256 = "0a49pfmbqb3g1h2r2vwbcb4hdyygq1g9n5y7qab37slfml2g45fg"; }; nativeBuildInputs = [ getopt ]; -- cgit v1.2.3 From a677738a23632a1a40cb00906e739f63a5e76d99 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 1 May 2020 18:24:09 +1000 Subject: podman: use $out instead of $bin with buildGoPackage --- nixos/modules/virtualisation/podman.nix | 8 +++----- pkgs/applications/virtualization/podman/wrapper.nix | 10 +++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/nixos/modules/virtualisation/podman.nix b/nixos/modules/virtualisation/podman.nix index 9f98c2086d1..652850bf500 100644 --- a/nixos/modules/virtualisation/podman.nix +++ b/nixos/modules/virtualisation/podman.nix @@ -8,13 +8,11 @@ let # Provides a fake "docker" binary mapping to podman dockerCompat = pkgs.runCommandNoCC "${podmanPackage.pname}-docker-compat-${podmanPackage.version}" { - outputs = [ "out" "bin" "man" ]; + outputs = [ "out" "man" ]; inherit (podmanPackage) meta; } '' - mkdir $out - - mkdir -p $bin/bin - ln -s ${podmanPackage.bin}/bin/podman $bin/bin/docker + mkdir -p $out/bin + ln -s ${podmanPackage}/bin/podman $out/bin/docker mkdir -p $man/share/man/man1 for f in ${podmanPackage.man}/share/man/man1/*; do diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix index 0b905c0c709..551f134478b 100644 --- a/pkgs/applications/virtualization/podman/wrapper.nix +++ b/pkgs/applications/virtualization/podman/wrapper.nix @@ -34,15 +34,15 @@ in runCommand podman.name { ]; } '' - # Symlink everything but $bin from podman-unwrapped + # Symlink everything but $out from podman-unwrapped ${ lib.concatMapStringsSep "\n" (o: "ln -s ${podman.${o}} ${placeholder o}") - (builtins.filter (o: o != "bin") + (builtins.filter (o: o != "out") podman.outputs)} - mkdir -p $bin/bin - ln -s ${podman-unwrapped}/share $bin/share - makeWrapper ${podman-unwrapped}/bin/podman $bin/bin/podman \ + mkdir -p $out/bin + ln -s ${podman-unwrapped}/share $out/share + makeWrapper ${podman-unwrapped}/bin/podman $out/bin/podman \ --prefix PATH : ${binPath} '' -- cgit v1.2.3 From 00d4ce01de489df3cfabc2e65801fa6857ab1d07 Mon Sep 17 00:00:00 2001 From: Ramzi Ben Yahya Date: Mon, 4 May 2020 21:55:21 +0200 Subject: lisp-modules: fix missing && after test command --- pkgs/development/lisp-modules/define-package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/lisp-modules/define-package.nix b/pkgs/development/lisp-modules/define-package.nix index 67a688342b2..96ceb76f6f2 100644 --- a/pkgs/development/lisp-modules/define-package.nix +++ b/pkgs/development/lisp-modules/define-package.nix @@ -43,7 +43,7 @@ let chmod a+x "$launch_script" echo "#! ${stdenv.shell}" >> "$launch_script" echo "source '$config_script'" >> "$launch_script" - echo "test -n \"\$NIX_LISP_LD_LIBRARY_PATH\" export LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}\$LD_LIBRARY_PATH\"" >> "$launch_script" + echo "test -n \"\$NIX_LISP_LD_LIBRARY_PATH\" && export LD_LIBRARY_PATH=\"\$NIX_LISP_LD_LIBRARY_PATH\''${LD_LIBRARY_PATH:+:}\$LD_LIBRARY_PATH\"" >> "$launch_script" echo '"${clwrapper}/bin/common-lisp.sh" "$@"' >> "$launch_script" ''; moveAsdFiles = '' -- cgit v1.2.3 From 9a15100ca10c99b7eba0751334f531d745c9e95b Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Fri, 24 Apr 2020 20:18:58 +0200 Subject: maintainers: add myself to list --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b4552bd874f..778d98e3f47 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5064,6 +5064,12 @@ githubId = 3269878; name = "Miguel Madrid Mencía"; }; + mindavi = { + email = "rol3517@gmail.com"; + github = "Mindavi"; + githubId = 9799623; + name = "Rick van Schijndel"; + }; minijackson = { email = "minijackson@riseup.net"; github = "minijackson"; -- cgit v1.2.3 From 416c8914618c315863131903e6ced09f74165ad3 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Fri, 24 Apr 2020 20:22:54 +0200 Subject: aflplusplus: 2.59c -> 2.64c Updated together with maintainers.ris / @risicle. --- pkgs/tools/security/aflplusplus/default.nix | 82 +++++++++++++---------- pkgs/tools/security/aflplusplus/libdislocator.nix | 2 + pkgs/tools/security/aflplusplus/libtokencap.nix | 1 + pkgs/tools/security/aflplusplus/qemu.nix | 6 ++ 4 files changed, 54 insertions(+), 37 deletions(-) diff --git a/pkgs/tools/security/aflplusplus/default.nix b/pkgs/tools/security/aflplusplus/default.nix index a52ea88950c..f99be6d7575 100644 --- a/pkgs/tools/security/aflplusplus/default.nix +++ b/pkgs/tools/security/aflplusplus/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchFromGitHub, callPackage, makeWrapper -, clang, llvm, gcc, which, libcgroup, python, perl, gmp -, wine ? null +{ stdenv, stdenvNoCC, fetchFromGitHub, callPackage, makeWrapper +, clang_9, llvm_9, gcc, which, libcgroup, python, perl, gmp +, file, cmocka, wine ? null, fetchpatch }: # wine fuzzing is only known to work for win32 binaries, and using a mixture of @@ -15,24 +15,52 @@ let else throw "aflplusplus: no support for ${stdenv.targetPlatform.system}!"; libdislocator = callPackage ./libdislocator.nix { inherit aflplusplus; }; libtokencap = callPackage ./libtokencap.nix { inherit aflplusplus; }; - aflplusplus = stdenv.mkDerivation rec { + aflplusplus = stdenvNoCC.mkDerivation rec { pname = "aflplusplus"; - version = "2.59c"; + version = "2.64c"; src = fetchFromGitHub { - owner = "vanhauser-thc"; + owner = "AFLplusplus"; repo = "AFLplusplus"; rev = version; - sha256 = "1ik33ifk4n96762iv1h4kl4jf9yvsq2hgs097wkiy589siw44g5r"; + sha256 = "0n618pk6nlmkcbv1qm05fny4mnhcprrw0ppmra1phvk1y22iildj"; }; enableParallelBuilding = true; + # build of unsigaction32 broken in 2.64c: + # https://github.com/AFLplusplus/AFLplusplus/commit/079fdbf9bc5be1adba19e4bd08be965bd4dd79dc#commitcomment-38428357 + # The applied patch fixes it. + patches = [ + (fetchpatch { + url = "https://github.com/AFLplusplus/AFLplusplus/commit/5b9928f1a9d4b017ea04365ca8b522fde71236eb.patch"; + sha256 = "1m4w9w4jaxb2mjkwvr6r4qa2j5cdzzpchjphpwd95861h0zvb6hh"; + }) + ]; + # Note: libcgroup isn't needed for building, just for the afl-cgroup # script. - nativeBuildInputs = [ makeWrapper which ]; - buildInputs = [ llvm python gmp ] + nativeBuildInputs = [ makeWrapper which clang_9 gcc ]; + buildInputs = [ llvm_9 python gmp ] ++ stdenv.lib.optional (wine != null) python.pkgs.wrapPython; + + postPatch = '' + # Replace the CLANG_BIN variables with the correct path + substituteInPlace llvm_mode/afl-clang-fast.c \ + --replace "CLANGPP_BIN" '"${clang_9}/bin/clang++"' \ + --replace "CLANG_BIN" '"${clang_9}/bin/clang"' \ + --replace 'getenv("AFL_PATH")' "(getenv(\"AFL_PATH\") ? getenv(\"AFL_PATH\") : \"$out/lib/afl\")" + + # Replace "gcc" and friends with full paths in afl-gcc + # Prevents afl-gcc picking up any (possibly incorrect) gcc from the path + substituteInPlace src/afl-gcc.c \ + --replace '"gcc"' '"${gcc}/bin/gcc"' \ + --replace '"g++"' '"${gcc}/bin/g++"' \ + --replace '"gcj"' '"gcj-UNSUPPORTED"' \ + --replace '"clang"' '"clang-UNSUPPORTED"' \ + --replace '"clang++"' '"clang++-UNSUPPORTED"' + ''; + makeFlags = [ "PREFIX=$(out)" ]; buildPhase = '' common="$makeFlags -j$NIX_BUILD_CORES" @@ -45,6 +73,9 @@ let ''; postInstall = '' + # remove afl-clang(++) which are just symlinks to afl-clang-fast + rm $out/bin/afl-clang $out/bin/afl-clang++ + # the makefile neglects to install unsigaction cp qemu_mode/unsigaction/unsigaction*.so $out/lib/afl/ @@ -61,36 +92,15 @@ let cp ${libtokencap}/bin/get-libtokencap-so $out/bin/ # Install the cgroups wrapper for asan-based fuzzing. - cp experimental/asan_cgroups/limit_memory.sh $out/bin/afl-cgroup + cp examples/asan_cgroups/limit_memory.sh $out/bin/afl-cgroup chmod +x $out/bin/afl-cgroup substituteInPlace $out/bin/afl-cgroup \ --replace "cgcreate" "${libcgroup}/bin/cgcreate" \ --replace "cgexec" "${libcgroup}/bin/cgexec" \ --replace "cgdelete" "${libcgroup}/bin/cgdelete" - # Patch shebangs before wrapping patchShebangs $out/bin - # Wrap afl-clang-fast(++) with a *different* AFL_PATH, because it - # has totally different semantics in that case(?) - and also set a - # proper AFL_CC and AFL_CXX so we don't pick up the wrong one out - # of $PATH. - # first though we need to replace the afl-clang-fast++ symlink with - # a real copy to prevent wrapProgram skipping the symlink and confusing - # nix's cc wrapper - rm $out/bin/afl-clang-fast++ - cp $out/bin/afl-clang-fast $out/bin/afl-clang-fast++ - for x in $out/bin/afl-clang-fast $out/bin/afl-clang-fast++; do - wrapProgram $x \ - --set-default AFL_PATH "$out/lib/afl" \ - --run 'export AFL_CC=''${AFL_CC:-${clang}/bin/clang} AFL_CXX=''${AFL_CXX:-${clang}/bin/clang++}' - done - # do similar for afl-gcc and afl-gcc-fast - for x in $out/bin/afl-gcc $out/bin/afl-gcc-fast; do - wrapProgram $x \ - --set-default AFL_PATH "$out/lib/afl" \ - --run 'export AFL_CC=''${AFL_CC:-${gcc}/bin/gcc} AFL_CXX=''${AFL_CXX:-${gcc}/bin/g++}' - done '' + stdenv.lib.optionalString (wine != null) '' substitute afl-wine-trace $out/bin/afl-wine-trace \ --replace "qemu_mode/unsigaction" "$out/lib/afl" @@ -105,17 +115,15 @@ let wrapPythonProgramsIn $out/bin ${python.pkgs.pefile} ''; - installCheckInputs = [ perl ]; + installCheckInputs = [ perl file cmocka ]; doInstallCheck = true; installCheckPhase = '' # replace references to tools in build directory with references to installed locations substituteInPlace test/test.sh \ - --replace '`which gcc`' "" \ --replace '../libcompcov.so' '`$out/bin/get-afl-qemu-libcompcov-so`' \ --replace '../libdislocator.so' '`$out/bin/get-libdislocator-so`' \ --replace '../libtokencap.so' '`$out/bin/get-libtokencap-so`' - perl -pi -e 's|(?<=\s)gcc(?=\s)|${gcc}/bin/gcc|g' test/test.sh - perl -pi -e 's|(\.\./)(\S+?)(? all.patch ''; -- cgit v1.2.3 From 7d19b893d45bb3917f776d4d51796f7a25ad4831 Mon Sep 17 00:00:00 2001 From: misuzu Date: Mon, 4 May 2020 23:06:13 +0300 Subject: kmon: 1.1.0 -> 1.2.0 --- pkgs/tools/system/kmon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/kmon/default.nix b/pkgs/tools/system/kmon/default.nix index 1a4cdb9acdf..afb59b25059 100644 --- a/pkgs/tools/system/kmon/default.nix +++ b/pkgs/tools/system/kmon/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kmon"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "orhun"; repo = pname; rev = "v${version}"; - sha256 = "0lpwp5fzlf037bn03x1dldw8nfa5pyqi4qsqbscwn42idvs94mhx"; + sha256 = "1l2zdp5f9spkfx1dhxyj32791kgvc8hqjr1kk75vds4c1wgwq8gk"; }; - cargoSha256 = "1g5k6dkv0zznh8q359n7sg9wf0gcix6m36pg9ql8wi5hnlsvg1s1"; + cargoSha256 = "08a7gr70a3rh7a52gglck16qlwngb6ap723lg3b3mxmkyigdf6i6"; nativeBuildInputs = [ python3 ]; -- cgit v1.2.3 From 6967ad71850db9b79ce78c77b39e935405231b20 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 20:06:29 +0000 Subject: criu: 3.13 -> 3.14 --- pkgs/os-specific/linux/criu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix index 4f7dae930aa..462658396c8 100644 --- a/pkgs/os-specific/linux/criu/default.nix +++ b/pkgs/os-specific/linux/criu/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "criu"; - version = "3.13"; + version = "3.14"; src = fetchurl { url = "https://download.openvz.org/criu/${pname}-${version}.tar.bz2"; - sha256 = "1yn9ix9lqvqvjrs3a3g6g1wqfniyf9n7giy0mr3jvijmrcm7y0pa"; + sha256 = "1jrr3v99g18gc0hriz0avq6ccdvyya0j6wwz888sdsc4icc30gzn"; }; enableParallelBuilding = true; -- cgit v1.2.3 From 362a0a2eea14b5c754cdbdc213824101fe6c9dc5 Mon Sep 17 00:00:00 2001 From: Daniel KT Date: Mon, 4 May 2020 14:41:16 -0400 Subject: linode-cli: pin linode openapi version Pull linode openapi spec from a fixed version in github, and so the sha256 hash will not break on each new release of the api spec. Replaced the hash for the openapi spec with a working hash. Attempting to install linode-cli was failing, with the following message: hash mismatch in fixed-output derivation '/nix/store/px3cdbcb84bvw6xslr1k6hszyxpdis6j-openapi.yaml': wanted: sha256:1l2fahdcmv7sp1qkwr5nv2vls8fypvlybwylqfzhyjmn7jqkw4hq got: sha256:03ngzbq24zazfqmfd7xjmxixkcb9vv1jgamplsj633j7sjj708s0 cannot build derivation '/nix/store/49xrq47id66kwszyaqg1qapknc3i8mmx-linode-cli-2.14.1.drv': 1 dependencies couldn't be built --- pkgs/tools/virtualization/linode-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/linode-cli/default.nix b/pkgs/tools/virtualization/linode-cli/default.nix index bcb0c545d45..c16eb003d8d 100644 --- a/pkgs/tools/virtualization/linode-cli/default.nix +++ b/pkgs/tools/virtualization/linode-cli/default.nix @@ -13,8 +13,8 @@ let spec = fetchurl { - url = "https://developers.linode.com/api/docs/v4/openapi.yaml"; - sha256 = "1l2fahdcmv7sp1qkwr5nv2vls8fypvlybwylqfzhyjmn7jqkw4hq"; + url = "https://raw.githubusercontent.com/linode/linode-api-docs/v4.63.1/openapi.yaml"; + sha256 = "03ngzbq24zazfqmfd7xjmxixkcb9vv1jgamplsj633j7sjj708s0"; }; in -- cgit v1.2.3 From 0db2daa900190760e37a0d3ba1095312759de0ae Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 27 Apr 2020 18:04:05 +0200 Subject: ocamlPackages.async_find: remove at 111.28.00 This is a legacy version for OCaml 4.02 --- .../ocaml-modules/async_find/default.nix | 22 ---------------------- pkgs/top-level/ocaml-packages.nix | 5 ----- 2 files changed, 27 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/async_find/default.nix diff --git a/pkgs/development/ocaml-modules/async_find/default.nix b/pkgs/development/ocaml-modules/async_find/default.nix deleted file mode 100644 index aa797cdace3..00000000000 --- a/pkgs/development/ocaml-modules/async_find/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{stdenv, buildOcaml, fetchurl, async_p4, core_p4, sexplib_p4}: - -buildOcaml rec { - name = "async_find"; - version = "111.28.00"; - - minimumSupportedOcamlVersion = "4.02"; - - src = fetchurl { - url = "https://github.com/janestreet/async_find/archive/${version}.tar.gz"; - sha256 = "4e3fda72f50174f05d96a5a09323f236c041b1a685890c155822956f3deb8803"; - }; - - propagatedBuildInputs = [ async_p4 core_p4 sexplib_p4 ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/janestreet/async_find"; - description = "Directory traversal with Async"; - license = licenses.asl20; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 9517769f7b3..44b90219606 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -38,11 +38,6 @@ let async_extra_p4 = callPackage ../development/ocaml-modules/async_extra { }; - async_find = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.async_find - else callPackage ../development/ocaml-modules/async_find { }; - async_kernel_p4 = callPackage ../development/ocaml-modules/async_kernel { }; async_unix_p4 = callPackage ../development/ocaml-modules/async_unix { }; -- cgit v1.2.3 From a8a2337c15f1381ed85bb00153bc4e31cdaaaefa Mon Sep 17 00:00:00 2001 From: hlolli Date: Mon, 4 May 2020 22:17:10 +0200 Subject: lumo 1.10.1: fix missing npm dependency --- .../interpreters/clojurescript/lumo/package.json | 2 +- .../node-packages/node-packages-v10.nix | 3428 +++++++++++--------- 2 files changed, 1900 insertions(+), 1530 deletions(-) diff --git a/pkgs/development/interpreters/clojurescript/lumo/package.json b/pkgs/development/interpreters/clojurescript/lumo/package.json index 6ab3f9616c7..acfd5c4ed49 100644 --- a/pkgs/development/interpreters/clojurescript/lumo/package.json +++ b/pkgs/development/interpreters/clojurescript/lumo/package.json @@ -27,7 +27,7 @@ "glob": "^7.1.3", "gunzip-maybe": "^1.4.1", "insert-module-globals": "^7.2.0", - "jszip": "github:anmonteiro/jszip#patch-1", + "jszip": "2.x", "mkdirp": "^1.0.3", "ncp": "^2.0.0", "node-fetch": "^2.2.1", diff --git a/pkgs/development/node-packages/node-packages-v10.nix b/pkgs/development/node-packages/node-packages-v10.nix index 95edbef44e3..ce2c91bfac1 100644 --- a/pkgs/development/node-packages/node-packages-v10.nix +++ b/pkgs/development/node-packages/node-packages-v10.nix @@ -22,67 +22,67 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.901.3" = { + "@angular-devkit/architect-0.901.4" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.901.3"; + version = "0.901.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.901.3.tgz"; - sha512 = "CFjSj48nOJwejmFFtenIqSZWyxRe4fRQsg16l0R4sagW7YwMJSaW6Yl9hRHM8bviPRrTpGHnxeq1x506v1ARLw=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.901.4.tgz"; + sha512 = "w4RMj7eLhUSh70HUy5tW4EXjLQFXk0Lfr9WiSy5gvPGp+zzYxknI+Wn4Xid1wU/WS+4tuMv5nJIaNaH2sABESQ=="; }; }; - "@angular-devkit/core-9.1.3" = { + "@angular-devkit/core-9.1.4" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "9.1.3"; + version = "9.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.3.tgz"; - sha512 = "VRV96prPy0Kdlm6XmI7DITqSMSc1bINimnOhzQre3euDX5OQty+EUqaexHtMv/SPDZX1agP+buHr6viv9YEhzA=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.4.tgz"; + sha512 = "OPFQDmT4XabLMSRDgmnzedlOrc83DzQIgLcfoh/UhZ7aJKf/2Vq4l09p/DkMNI36vN5BRL0zDZt7TjvKNgyYgA=="; }; }; - "@angular-devkit/schematics-9.1.3" = { + "@angular-devkit/schematics-9.1.4" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "9.1.3"; + version = "9.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.3.tgz"; - sha512 = "nNRoQPqoin5jzLKmTabIPLSqVw2Zjnk78XC4AhAM7rSisWMsZ6pw5+BNDITiKfq0LkSXfOs0DoJV/Vr9mLkn/A=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.4.tgz"; + sha512 = "RAbdnUEZ3JTLmWSBiXT5trsVx8Fi72fxN9CiRaluM09Cytg6BUc1wC5XCO0YPvhI400+3Ro1nwjPXezjg7LXzQ=="; }; }; - "@antora/asciidoc-loader-2.3.0" = { + "@antora/asciidoc-loader-2.3.1" = { name = "_at_antora_slash_asciidoc-loader"; packageName = "@antora/asciidoc-loader"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-2.3.0.tgz"; - sha512 = "mncSlmkk6rYH5SGplZtHjuieG3ve5bhm4x0f9WIFE+GhqajIogDjxTBNWNr9B2dVA4bMves7Sy+c5h+f9V3iVw=="; + url = "https://registry.npmjs.org/@antora/asciidoc-loader/-/asciidoc-loader-2.3.1.tgz"; + sha512 = "YSf5oEExzrR+O7FizQAeIYyP/BAGvhGw9inACFF3Er3fzCR/sOvPadT6a/slW//tVGLF3eul0ARvw7QAvo6yHQ=="; }; }; - "@antora/content-aggregator-2.3.0" = { + "@antora/content-aggregator-2.3.1" = { name = "_at_antora_slash_content-aggregator"; packageName = "@antora/content-aggregator"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-2.3.0.tgz"; - sha512 = "LbH65Hw5uk3QCX8sCsJGnIVapQbtkxgyaDAfxYJlXnBI4jjd92391k0vitFL7f+9dzEvSdzxUHJU/lPyi9eB6g=="; + url = "https://registry.npmjs.org/@antora/content-aggregator/-/content-aggregator-2.3.1.tgz"; + sha512 = "DKrM7FtK5ivWHmQjMkPYkn3S4jQ9Sy6QiNfKYcg/EcIee5k3VPRjYHn40nPY0gS+R4zElRJhru6bHOpnkGJYVA=="; }; }; - "@antora/content-classifier-2.3.0" = { + "@antora/content-classifier-2.3.1" = { name = "_at_antora_slash_content-classifier"; packageName = "@antora/content-classifier"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/content-classifier/-/content-classifier-2.3.0.tgz"; - sha512 = "x/GUrm62+zSA8uQYaPG1y8NDALSDeKKl+um0CrxV5nt8c6vEO80KODN4YEPqoC0tOq8zdT99J6ElYblpkxrW6Q=="; + url = "https://registry.npmjs.org/@antora/content-classifier/-/content-classifier-2.3.1.tgz"; + sha512 = "d9vfhxcJY8DdU43h93cK96/Te2eKcJeA4pCljQrRUFpguZndMVrmWMxp8wzOYYSMIIukwcZVa3AISz86RNvrYA=="; }; }; - "@antora/document-converter-2.3.0" = { + "@antora/document-converter-2.3.1" = { name = "_at_antora_slash_document-converter"; packageName = "@antora/document-converter"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/document-converter/-/document-converter-2.3.0.tgz"; - sha512 = "RMvdqBIz+pXf5znuyVeR7GF8qw/zLfaRMmEzMzywYa+8Cappxy+pgs+BuAuH1TdAnsFzpPrIO211c2FE1OxXBg=="; + url = "https://registry.npmjs.org/@antora/document-converter/-/document-converter-2.3.1.tgz"; + sha512 = "5vnr3twkunAkv04NaqgLtXQTTlRNsvTo/jpVrUQ6DNQHE3l3Sr0z/6u4GWkueI95L/PFlFQ79WUNsBPLICfLrA=="; }; }; "@antora/expand-path-helper-1.0.0" = { @@ -94,67 +94,67 @@ let sha512 = "hg3y6M3OvRTb7jtLAnwwloYDxafbyKYttcf16kGCXvP7Wqosh7c+Ag+ltaZ7VSebpzpphO/umb/BXdpU7rxapw=="; }; }; - "@antora/navigation-builder-2.3.0" = { + "@antora/navigation-builder-2.3.1" = { name = "_at_antora_slash_navigation-builder"; packageName = "@antora/navigation-builder"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/navigation-builder/-/navigation-builder-2.3.0.tgz"; - sha512 = "bpdT50pUW8IbRHAwlwaRdMlqwdTCOGdh0novW2Z6uBi6KKKbl6K3BdbaVs/jwXalESWqkYHcyBpinMivsX4bBA=="; + url = "https://registry.npmjs.org/@antora/navigation-builder/-/navigation-builder-2.3.1.tgz"; + sha512 = "kWsi/wn/+IEljBdR6dSE6TFrF+KUfOlDQTnq9YmMzdUCLJRk7Cvz36zsbDFRE8cgqkuunddfsA6oOECgXLQyrw=="; }; }; - "@antora/page-composer-2.3.0" = { + "@antora/page-composer-2.3.1" = { name = "_at_antora_slash_page-composer"; packageName = "@antora/page-composer"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/page-composer/-/page-composer-2.3.0.tgz"; - sha512 = "ve4h3uColNuqGehSJ2qUw5dar1Ls3i+RBYh2HyVZZ84qjLoOjPGAALFYzRVJnYlEX6nAswNFhh5ll/hIuaxuHQ=="; + url = "https://registry.npmjs.org/@antora/page-composer/-/page-composer-2.3.1.tgz"; + sha512 = "HVZR5GgF+aA41Y0FVOmRHkI5Hn+ab4giJ5FvKwMZlqF10zd0u+rne6+0664kC08wYUIr40/OMayCRgIHPqEwuQ=="; }; }; - "@antora/playbook-builder-2.3.0" = { + "@antora/playbook-builder-2.3.1" = { name = "_at_antora_slash_playbook-builder"; packageName = "@antora/playbook-builder"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/playbook-builder/-/playbook-builder-2.3.0.tgz"; - sha512 = "zuuTqY5dDXYhu4LfmFW3qzdFXSrXSo9NCDX9eBJ6MCXsuj64PqdOljzv4rWNy3HvmKOSCupfWCashJS0vuH2Dw=="; + url = "https://registry.npmjs.org/@antora/playbook-builder/-/playbook-builder-2.3.1.tgz"; + sha512 = "/gl4H/0ey/Uc80GaomZoz10c/f8TX4bQ70SR+BlKrwjwsHCskfffVa+jvMAjnOlP0SGEPwIGkifWPGQbTHdH7A=="; }; }; - "@antora/redirect-producer-2.3.0" = { + "@antora/redirect-producer-2.3.1" = { name = "_at_antora_slash_redirect-producer"; packageName = "@antora/redirect-producer"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/redirect-producer/-/redirect-producer-2.3.0.tgz"; - sha512 = "/632VZlkpFIh5KlV3A9LqE4yGtYyQ+1vOb5A9yajYWsCnhqNfEMslMWuoLoQk4gzs3Ju+hz5MrAXp8sn1vbRvg=="; + url = "https://registry.npmjs.org/@antora/redirect-producer/-/redirect-producer-2.3.1.tgz"; + sha512 = "2iDYwygpZ5xHrSflnDIn+kzLt+9jXKOTRHXXqCQHYZuHANQVEYLI93yOXivvFZZvX/jaRzZBF7uTI3FGwg2Isw=="; }; }; - "@antora/site-mapper-2.3.0" = { + "@antora/site-mapper-2.3.1" = { name = "_at_antora_slash_site-mapper"; packageName = "@antora/site-mapper"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-2.3.0.tgz"; - sha512 = "XzIoYKJQXgOzsDeUlL/edVR9B9aaCYUHADvzYqDc1S5/czFQxpqIIgMfYCiYYc7pHk6nmj5rgx/6HfvDImv87w=="; + url = "https://registry.npmjs.org/@antora/site-mapper/-/site-mapper-2.3.1.tgz"; + sha512 = "EkHEEPz0CfLJuE8lx6s9b8+jEC8krFN29zAqK6WaOTi34Tqhv5H/W14mk7IJfy8nWjIjZgP/q/a8gJK9LegYaw=="; }; }; - "@antora/site-publisher-2.3.0" = { + "@antora/site-publisher-2.3.1" = { name = "_at_antora_slash_site-publisher"; packageName = "@antora/site-publisher"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/site-publisher/-/site-publisher-2.3.0.tgz"; - sha512 = "2qC0fDE70VKtyttPpRx9glPWL4M5x7HYVCs1K6+GmpuISmljO3c/09L+ExPsJiSVVFarnWmMu0w+76XqSRHlog=="; + url = "https://registry.npmjs.org/@antora/site-publisher/-/site-publisher-2.3.1.tgz"; + sha512 = "s42S+e3IF5qLgL7N42LpcGc2+UcsJBrY9B10fUP0WQFM51LsNWIwQmU3EheoSEUjo5JvQYi5vlQsHlb7j8TCPA=="; }; }; - "@antora/ui-loader-2.3.0" = { + "@antora/ui-loader-2.3.1" = { name = "_at_antora_slash_ui-loader"; packageName = "@antora/ui-loader"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/ui-loader/-/ui-loader-2.3.0.tgz"; - sha512 = "EcBUwd4ImWI/BH0dZpH6CfDzBnAtQ2qUPChaeqVbmfCNpBvH6t09YYRVA713no21ypAF3AwBs3FGU1+vR6T/IQ=="; + url = "https://registry.npmjs.org/@antora/ui-loader/-/ui-loader-2.3.1.tgz"; + sha512 = "0uZDixaamnMnGJvl1M5bqW2ac8+6W2KZcfOTwPBEJJCLTGiZe4GASB+zR7tXNyrUr51zLuCjxPNcEbzGEfRxAQ=="; }; }; "@apollo/federation-0.14.1" = { @@ -256,22 +256,22 @@ let sha512 = "a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g=="; }; }; - "@babel/compat-data-7.9.0" = { + "@babel/compat-data-7.9.6" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.9.0"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.9.0.tgz"; - sha512 = "zeFQrr+284Ekvd9e7KAX954LkapWiOmQtsfHirhxqfdlX6MEC32iRE+pqUGlYIBchdevaCwvzxWGSy/YBNI85g=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.9.6.tgz"; + sha512 = "5QPTrNen2bm7RBc7dsOmcA5hbrS4O2Vhmk5XOL4zWW/zD/hV0iinpefDlkm+tBBy8kDtFaaeEvmAqt+nURAV2g=="; }; }; - "@babel/core-7.9.0" = { + "@babel/core-7.9.6" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.9.0"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz"; - sha512 = "kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz"; + sha512 = "nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg=="; }; }; "@babel/generator-7.0.0-beta.38" = { @@ -292,6 +292,15 @@ let sha512 = "GbNIxVB3ZJe3tLeDm1HSn2AhuD/mVcyLDpgtLXa5tplmWrJdF/elxB56XNqCuD6szyNkDi6wuoKXln3QeBmCHQ=="; }; }; + "@babel/generator-7.9.6" = { + name = "_at_babel_slash_generator"; + packageName = "@babel/generator"; + version = "7.9.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz"; + sha512 = "+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ=="; + }; + }; "@babel/helper-annotate-as-pure-7.8.3" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; @@ -328,22 +337,22 @@ let sha512 = "HAagjAC93tk748jcXpZ7oYRZH485RCq/+yEv9SIWezHRPv9moZArTnkUNciUNzvwHUABmiWKlcxJvMcu59UwTg=="; }; }; - "@babel/helper-compilation-targets-7.8.7" = { + "@babel/helper-compilation-targets-7.9.6" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.8.7"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz"; - sha512 = "4mWm8DCK2LugIS+p1yArqvG1Pf162upsIsjE7cNBjez+NjliQpVhj20obE520nao0o14DaTnFJv+Fw5a0JpoUw=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.9.6.tgz"; + sha512 = "x2Nvu0igO0ejXzx09B/1fGBxY9NXQlBW2kZsSxCJft+KHN8t9XWzIvFxtPHnBOAXpVsdxZKZFbRUC8TsNKajMw=="; }; }; - "@babel/helper-create-class-features-plugin-7.9.5" = { + "@babel/helper-create-class-features-plugin-7.9.6" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.9.5"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.9.5.tgz"; - sha512 = "IipaxGaQmW4TfWoXdqjY0TzoXQ1HRS0kPpEgvjosb3u7Uedcq297xFqDQiCcQtRRwzIMif+N1MLVI8C5a4/PAA=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.9.6.tgz"; + sha512 = "6N9IeuyHvMBRyjNYOMJHrhwtu4WJMrYf8hVbEHD3pbbbmNOk1kmXSQs7bA4dYDUaIx4ZEzdnvo6NwC3WHd/Qow=="; }; }; "@babel/helper-create-regexp-features-plugin-7.8.8" = { @@ -463,13 +472,13 @@ let sha512 = "kgwDmw4fCg7AVgS4DukQR/roGp+jP+XluJE5hsRZwxCYGg+Rv9wSGErDWhlI90FODdYfd4xG4AQRiMDjjN0GzA=="; }; }; - "@babel/helper-replace-supers-7.8.6" = { + "@babel/helper-replace-supers-7.9.6" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.8.6"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz"; - sha512 = "PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.9.6.tgz"; + sha512 = "qX+chbxkbArLyCImk3bWV+jB5gTNU/rsze+JlcF6Nf8tVTigPJSI1o1oBow/9Resa1yehUO9lIipsmu9oG4RzA=="; }; }; "@babel/helper-simple-access-7.8.3" = { @@ -508,13 +517,13 @@ let sha512 = "LACJrbUET9cQDzb6kG7EeD7+7doC3JNvUgTEQOx2qaO1fKlzE/Bf05qs9w1oXQMmXlPO65lC3Tq9S6gZpTErEQ=="; }; }; - "@babel/helpers-7.9.2" = { + "@babel/helpers-7.9.6" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.9.2"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz"; - sha512 = "JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.6.tgz"; + sha512 = "tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw=="; }; }; "@babel/highlight-7.9.0" = { @@ -526,13 +535,13 @@ let sha512 = "lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ=="; }; }; - "@babel/parser-7.9.4" = { + "@babel/parser-7.9.6" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.9.4"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz"; - sha512 = "bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz"; + sha512 = "AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q=="; }; }; "@babel/plugin-external-helpers-7.8.3" = { @@ -598,13 +607,13 @@ let sha512 = "jWioO1s6R/R+wEHizfaScNsAx+xKgwTLNXSh7tTC4Usj3ItsPEhYkEpU4h+lpnBwq7NBVOJXfO6cRFYcX69JUQ=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.9.5" = { + "@babel/plugin-proposal-object-rest-spread-7.9.6" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.9.5"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.5.tgz"; - sha512 = "VP2oXvAf7KCYTthbUHwBlewbl1Iq059f6seJGsxMizaCdgHIeczOr7FBqELhSqfkIl04Fi8okzWzl63UKbQmmg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.6.tgz"; + sha512 = "Ga6/fhGqA9Hj+y6whNpPv8psyaK5xzrQwSPsGPloVkvmH+PqW1ixdnfJ9uIO06OjQNYol3PMnfmJ8vfZtkzF+A=="; }; }; "@babel/plugin-proposal-optional-catch-binding-7.8.3" = { @@ -904,31 +913,31 @@ let sha512 = "3Wk2EXhnw+rP+IDkK6BdtPKsUE5IeZ6QOGrPYvw52NwBStw9V1ZVzxgK6fSKSxqUvH9eQPR3tm3cOq79HlsKYA=="; }; }; - "@babel/plugin-transform-modules-amd-7.9.0" = { + "@babel/plugin-transform-modules-amd-7.9.6" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.9.0"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz"; - sha512 = "vZgDDF003B14O8zJy0XXLnPH4sg+9X5hFBBGN1V+B2rgrB+J2xIypSN6Rk9imB2hSTHQi5OHLrFWsZab1GMk+Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.6.tgz"; + sha512 = "zoT0kgC3EixAyIAU+9vfaUVKTv9IxBDSabgHoUCBP6FqEJ+iNiN7ip7NBKcYqbfUDfuC2mFCbM7vbu4qJgOnDw=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.9.0" = { + "@babel/plugin-transform-modules-commonjs-7.9.6" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.9.0"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz"; - sha512 = "qzlCrLnKqio4SlgJ6FMMLBe4bySNis8DFn1VkGmOcxG9gqEyPIOzeQrA//u0HAKrWpJlpZbZMPB1n/OPa4+n8g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.6.tgz"; + sha512 = "7H25fSlLcn+iYimmsNe3uK1at79IE6SKW9q0/QeEHTMC9MdOZ+4bA+T1VFB5fgOqBWoqlifXRzYD0JPdmIrgSQ=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.9.0" = { + "@babel/plugin-transform-modules-systemjs-7.9.6" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.9.0"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz"; - sha512 = "FsiAv/nao/ud2ZWy4wFacoLOm5uxl0ExSQ7ErvP7jpoihLR6Cq90ilOFyX9UXct3rbtKsAiZ9kFt5XGfPe/5SQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.6.tgz"; + sha512 = "NW5XQuW3N2tTHim8e1b7qGy7s0kZ2OH3m5octc49K1SdAKGxYxeIx7hiIz05kS1R2R+hOWcsr1eYwcGhrdHsrg=="; }; }; "@babel/plugin-transform-modules-umd-7.9.0" = { @@ -1012,13 +1021,13 @@ let sha512 = "mwMxcycN3omKFDjDQUl+8zyMsBfjRFr0Zn/64I41pmjv4NJuqcYlEtezwYtw9TFd9WR1vN5kiM+O0gMZzO6L0A=="; }; }; - "@babel/plugin-transform-runtime-7.9.0" = { + "@babel/plugin-transform-runtime-7.9.6" = { name = "_at_babel_slash_plugin-transform-runtime"; packageName = "@babel/plugin-transform-runtime"; - version = "7.9.0"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.0.tgz"; - sha512 = "pUu9VSf3kI1OqbWINQ7MaugnitRss1z533436waNXp+0N3ur3zfut37sXiQMxkuCF4VUjwZucen/quskCh7NHw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.9.6.tgz"; + sha512 = "qcmiECD0mYOjOIt8YHNsAP1SxPooC/rDmfmiSK9BNY72EitdSc7l44WTEklaWuFtbOEBjNhWWyph/kOImbNJ4w=="; }; }; "@babel/plugin-transform-shorthand-properties-7.8.3" = { @@ -1066,13 +1075,13 @@ let sha512 = "2QKyfjGdvuNfHsb7qnBBlKclbD4CfshH2KvDabiijLMGXPHJXGxtDzwIF7bQP+T0ysw8fYTtxPafgfs/c1Lrqg=="; }; }; - "@babel/plugin-transform-typescript-7.9.4" = { + "@babel/plugin-transform-typescript-7.9.6" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.9.4"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.4.tgz"; - sha512 = "yeWeUkKx2auDbSxRe8MusAG+n4m9BFY/v+lPjmQDgOFX5qnySkUY5oXzkp6FwPdsYqnKay6lorXYdC0n3bZO7w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.6.tgz"; + sha512 = "8OvsRdvpt3Iesf2qsAn+YdlwAJD7zJ+vhFZmDCa4b8dTp7MmHtKk5FF2mCsGxjZwuwsy/yIIay/nLmxST1ctVQ=="; }; }; "@babel/plugin-transform-unicode-regex-7.8.3" = { @@ -1093,13 +1102,13 @@ let sha512 = "/TS23MVvo34dFmf8mwCisCbWGrfhbiWZSwBo6HkADTBhUa2Q/jWltyY/tpofz/b6/RIhqaqQcquptCirqIhOaQ=="; }; }; - "@babel/preset-env-7.9.5" = { + "@babel/preset-env-7.9.6" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.9.5"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.5.tgz"; - sha512 = "eWGYeADTlPJH+wq1F0wNfPbVS1w1wtmMJiYk55Td5Yu28AsdR9AsC97sZ0Qq8fHqQuslVSIYSGJMcblr345GfQ=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.6.tgz"; + sha512 = "0gQJ9RTzO0heXOhzftog+a/WyOuqMrAIugVYxMYf83gh1CQaQDjMtsOpqOwXyDL/5JcWsrCm8l4ju8QC97O7EQ=="; }; }; "@babel/preset-flow-7.9.0" = { @@ -1165,13 +1174,22 @@ let sha512 = "NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q=="; }; }; - "@babel/runtime-corejs3-7.9.2" = { + "@babel/runtime-7.9.6" = { + name = "_at_babel_slash_runtime"; + packageName = "@babel/runtime"; + version = "7.9.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.6.tgz"; + sha512 = "64AF1xY3OAkFHqOb9s4jpgk1Mm5vDZ4L3acHvAml+53nO1XbXLuDodsVpO4OIUsmemlUHMxNdYMNJmsvOwLrvQ=="; + }; + }; + "@babel/runtime-corejs3-7.9.6" = { name = "_at_babel_slash_runtime-corejs3"; packageName = "@babel/runtime-corejs3"; - version = "7.9.2"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.9.2.tgz"; - sha512 = "HHxmgxbIzOfFlZ+tdeRKtaxWOMUoCG5Mu3wKeUmOxjYrwb3AAHgnmtCUbPPK11/raIWLIBK250t8E2BPO0p7jA=="; + url = "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.9.6.tgz"; + sha512 = "6toWAfaALQjt3KMZQc6fABqZwUDDuWzz+cAfPhqyEnzxvdWOAkjwPNxgF8xlmo7OWLsSjaKjsskpKHRLaMArOA=="; }; }; "@babel/template-7.8.6" = { @@ -1183,13 +1201,13 @@ let sha512 = "zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg=="; }; }; - "@babel/traverse-7.9.5" = { + "@babel/traverse-7.9.6" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.9.5"; + version = "7.9.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.5.tgz"; - sha512 = "c4gH3jsvSuGUezlP6rzSJ6jf8fYjLj3hsMZRx/nX0h+fmHN0w+ekubRrHPqnMec0meycA2nwCsJ7dC8IPem2FQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz"; + sha512 = "b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg=="; }; }; "@babel/types-7.0.0-beta.38" = { @@ -1210,6 +1228,15 @@ let sha512 = "XjnvNqenk818r5zMaba+sLQjnbda31UfUURv3ei0qPQw4u+j2jMyJ5b11y8ZHYTRSI3NnInQkkkRT4fLqqPdHg=="; }; }; + "@babel/types-7.9.6" = { + name = "_at_babel_slash_types"; + packageName = "@babel/types"; + version = "7.9.6"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz"; + sha512 = "qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA=="; + }; + }; "@chemzqm/neovim-5.1.9" = { name = "_at_chemzqm_slash_neovim"; packageName = "@chemzqm/neovim"; @@ -1561,22 +1588,22 @@ let sha512 = "tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw=="; }; }; - "@jest/transform-25.4.0" = { + "@jest/transform-25.5.1" = { name = "_at_jest_slash_transform"; packageName = "@jest/transform"; - version = "25.4.0"; + version = "25.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/transform/-/transform-25.4.0.tgz"; - sha512 = "t1w2S6V1sk++1HHsxboWxPEuSpN8pxEvNrZN+Ud/knkROWtf8LeUmz73A4ezE8476a5AM00IZr9a8FO9x1+j3g=="; + url = "https://registry.npmjs.org/@jest/transform/-/transform-25.5.1.tgz"; + sha512 = "Y8CEoVwXb4QwA6Y/9uDkn0Xfz0finGkieuV0xkdF9UtZGJeLukD5nLkaVrVsODB1ojRWlaoD0AJZpVHCSnJEvg=="; }; }; - "@jest/types-25.4.0" = { + "@jest/types-25.5.0" = { name = "_at_jest_slash_types"; packageName = "@jest/types"; - version = "25.4.0"; + version = "25.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/types/-/types-25.4.0.tgz"; - sha512 = "XBeaWNzw2PPnGW5aXvZt3+VO60M+34RY3XDsCK5tW7kyj3RK0XClRutCfjqcBuaR2aBQTbluEDME9b5MB9UAPw=="; + url = "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz"; + sha512 = "OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw=="; }; }; "@kbrandwijk/swagger-to-graphql-2.4.3" = { @@ -2137,58 +2164,58 @@ let sha512 = "nGwwmkdm3tuLdEkWMIwLBgFBfMFILILxcZIQY0dfqsdboN2iZdKfOYKUOKoa0wXw1FL1PL3yEYGPCXhwodQDTA=="; }; }; - "@node-red/editor-api-1.0.5" = { + "@node-red/editor-api-1.0.6" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.0.5.tgz"; - sha512 = "YYzc+EQJBSqkzip9Gm+sw8yK0HVLougiLs9xmqOxmMXQCiH56kyB1Tip+CRExsAgSqM1fLITxtBNkzAPgiP0pQ=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.0.6.tgz"; + sha512 = "9LieY6LSDtvj43IbpmCs9MmSGdPjOEmtsi+T13dXxxmil4ngedvJ7uMP1d96eKLW/b6Viuk7kx2olSGtUqgqLg=="; }; }; - "@node-red/editor-client-1.0.5" = { + "@node-red/editor-client-1.0.6" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.0.5.tgz"; - sha512 = "7SDm0JxWnME3gWgTkbZey0zaWE18ehWLxNkI+A/CSp/ubwJJf8YGDAXWzDOW/ZxQumjWI3PrMnck/p/U2F6I/w=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.0.6.tgz"; + sha512 = "V8zsj+wKY6RzOX92ePdgJtJdmOT9Whfz6CTN34/H2pZlzFA/+KE/sippkInRrx+ujTp4uI2ycAGJ7i1Qkt8ztw=="; }; }; - "@node-red/nodes-1.0.5" = { + "@node-red/nodes-1.0.6" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.0.5.tgz"; - sha512 = "rS+qVwY/I0sapyhQ695OO3GxdSfrV9FShZ8DywIwkrMq8Xzmhbi0WmOyQASok/2TPROGYRcTPq5QITtWWh7saA=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.0.6.tgz"; + sha512 = "4+wTiwhJlhLL6HV3YBLOGHSIcfygf4YxP/fJDkG+vy09pRyux/NqZ06NiqhYs+d+Ndf13LIc20KTEzN3pLW2Rw=="; }; }; - "@node-red/registry-1.0.5" = { + "@node-red/registry-1.0.6" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.0.5.tgz"; - sha512 = "UJEJp3oBVfkoy0ajQeU531GS5RRph5Gg2eDrTICYTASAwR/VuuoSBziRVSwxIYBOTqBiNc1Uc3cCzp7JSvt0rw=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.0.6.tgz"; + sha512 = "jDNfcNyphjpywHmXfNuZhM593ox9qHMYmL6ZQQiyERwiJwSkGp2zzNicNBe10ysk5ENr36xdP46BryWu/j9xIA=="; }; }; - "@node-red/runtime-1.0.5" = { + "@node-red/runtime-1.0.6" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.0.5.tgz"; - sha512 = "NWpRW9j2DGBU85zihjXz7fDj8RfwFmBmoMvzJ3XsbXJNFjK78loKqrLgzPscSECVZh/ouXRCQ7tQThzdGUYE9A=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.0.6.tgz"; + sha512 = "6eat9FZlIcydm0+VoUjlbxf9TyyLu0zTCWWANqGhu5Ab8o366WSOAxyIzJ5QL56FLQ+V6040YWmurBl+bGRGjg=="; }; }; - "@node-red/util-1.0.5" = { + "@node-red/util-1.0.6" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-1.0.5.tgz"; - sha512 = "4exRjV72vzrr62vaVz0tvviq6rimuqIFxsOMq0tdbNFyXNmdwU6VXB9WaMBhEnSgIhljo2OO2vrXIUyeCagVmA=="; + url = "https://registry.npmjs.org/@node-red/util/-/util-1.0.6.tgz"; + sha512 = "uncyHShA6strCJr1puqrpxsKcb7We2bmo/8xHk91pAQw4dr3jm4S+v/m9tYqVqtXkkW2cfJ6n3bRHJHbOZNW0Q=="; }; }; "@nodelib/fs.scandir-2.1.3" = { @@ -2236,13 +2263,13 @@ let sha512 = "JtktVH7ASBVIWsQTFlFpeOzhBJskvoBCTfeeRhhZy7ybATcUvwiwotZ8j5rkqUUyB69lIy/AvboiiiGBjYBKBA=="; }; }; - "@npmcli/git-2.0.1" = { + "@npmcli/git-2.0.2" = { name = "_at_npmcli_slash_git"; packageName = "@npmcli/git"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/git/-/git-2.0.1.tgz"; - sha512 = "hVatexiBtx71F01Ars38Hr5AFUGmJgHAfQtRlO5fJlnAawRGSXwEFgjB5i3XdUUmElZU/RXy7fefN02dZKxgPw=="; + url = "https://registry.npmjs.org/@npmcli/git/-/git-2.0.2.tgz"; + sha512 = "uv9+EuP5YWluNPgkEOL+iyB/+MVt4U5PMBCfl+I8korKluFdiSp7RxjXYzpWM/wU4wXaROAUFiOiCMmBftonjw=="; }; }; "@npmcli/installed-package-contents-1.0.5" = { @@ -2263,6 +2290,15 @@ let sha512 = "nFtqjVETliApiRdjbYwKwhlSHx2ZMagyj5b9YbNt0BWeeOVxJd47ZVE2u16vxDHyTOZvk+YLV7INwfAE9a2uow=="; }; }; + "@npmcli/run-script-1.3.1" = { + name = "_at_npmcli_slash_run-script"; + packageName = "@npmcli/run-script"; + version = "1.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.3.1.tgz"; + sha512 = "9Ea57XJjNLtBFRAaiKqqdoqRrL2QkM0vvCbMjPecljhog5IHupStPtZULbl0CoGN00N3lhLWJ4PaIEC0MGjqJw=="; + }; + }; "@oclif/color-0.0.0" = { name = "_at_oclif_slash_color"; packageName = "@oclif/color"; @@ -2461,13 +2497,13 @@ let sha512 = "gfFKwRT/wFxq5qlNjnW2dh+qh74XgTQ2B179UX5K1HYCluioWj8Ndbgqw2PVqa1NnVJkGHp2ovMpVn/DImlmkw=="; }; }; - "@octokit/types-2.12.1" = { + "@octokit/types-2.12.2" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "2.12.1"; + version = "2.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-2.12.1.tgz"; - sha512 = "LRLR1tjbcCfAmUElvTmMvLEzstpx6Xt/aQVTg2xvd+kHA2Ekp1eWl5t+gU7bcwjXHYEAzh4hH4WH+kS3vh+wRw=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-2.12.2.tgz"; + sha512 = "1GHLI/Jll3j6F0GbYyZPFTcHZMGjAiRfkTEoRUyaVVk2IWbDdwEiClAJvXzfXCDayuGSNCqAUH8lpjZtqW9GDw=="; }; }; "@parcel/fs-1.11.0" = { @@ -2632,13 +2668,13 @@ let sha512 = "RxtSL3XmdTAE2byxekYLnx+98kEUOrPHF/KRVjLH+DEIHy6kjIw7YINQzn+NXiH/NTrQLAwYs0GWB+csWygA9Q=="; }; }; - "@rollup/pluginutils-3.0.9" = { + "@rollup/pluginutils-3.0.10" = { name = "_at_rollup_slash_pluginutils"; packageName = "@rollup/pluginutils"; - version = "3.0.9"; + version = "3.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.0.9.tgz"; - sha512 = "TLZavlfPAZYI7v33wQh4mTP6zojne14yok3DNSLcjoG/Hirxfkonn6icP5rrNWRn8nZsirJBFFpijVOJzkUHDg=="; + url = "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.0.10.tgz"; + sha512 = "d44M7t+PjmMrASHbhgpSbVgtL6EFyX7J4mYxwQ/c5eoaE6N2VgCgEcWVzNnwycIloti+/MpwFr8qfw+nRw00sw=="; }; }; "@sailshq/lodash-3.10.4" = { @@ -2659,22 +2695,22 @@ let sha512 = "MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg=="; }; }; - "@schematics/angular-9.1.3" = { + "@schematics/angular-9.1.4" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "9.1.3"; + version = "9.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-9.1.3.tgz"; - sha512 = "3vxrPyvcIWvyWgbx/fpeQvMThXlmcnHTXVn2dpTcE2BzstAYdG17W3qouhvmlqd6m28orxkKKiZaJYMNTtnV/A=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-9.1.4.tgz"; + sha512 = "7nbiYBRgXc+f0sa5iXTcF6/VMy/Xq0wyKKnDFiLCb2aFYR7EXRHWF2GuwDIg2bvFugLuCBDoNnXeddLE1TXGWg=="; }; }; - "@schematics/update-0.901.3" = { + "@schematics/update-0.901.4" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.901.3"; + version = "0.901.4"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.901.3.tgz"; - sha512 = "kwfc9LMMi6ryN2oiat9vTqGMK1jKwI1c45Nm1xala35nsbQSQ12qeL3MrVmnSCeI14+cinFUbp8mWI9/3M+/Lg=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.901.4.tgz"; + sha512 = "jCtZY2Fbj502gKN5gdu1brnRy/ssyzTrWm69Ty73V+t8uL7nLr+/hny/VBJ8CiQnKQvxcgVl1xgvI1cXzpysVA=="; }; }; "@serverless/cli-1.4.0" = { @@ -2695,13 +2731,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-2.30.1" = { + "@serverless/components-2.30.5" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "2.30.1"; + version = "2.30.5"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-2.30.1.tgz"; - sha512 = "blqZP6aRg9oj1A30ip2hndcvA1g+J8g8vFbUHtAfs5mp/r4KTD63tNagscSNKTSbc6csM3Z9w6yjW4KSarl8LQ=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-2.30.5.tgz"; + sha512 = "c/d60iqzS2NlmRGgIU0S4i6EryjXVwEWcW0bzJ04CwFDQBlvi5kSk8Q59lv0pQ5MwHk+Fw2zMnmMtBQbJxu2vw=="; }; }; "@serverless/core-1.1.2" = { @@ -2713,13 +2749,13 @@ let sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ=="; }; }; - "@serverless/enterprise-plugin-3.6.6" = { + "@serverless/enterprise-plugin-3.6.9" = { name = "_at_serverless_slash_enterprise-plugin"; packageName = "@serverless/enterprise-plugin"; - version = "3.6.6"; + version = "3.6.9"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.6.6.tgz"; - sha512 = "ZkzHp8WVOQv2opdXSYES39uorZV3m61+QDPK5W2PtV6InddYlYNTVuhH8vIynNYFrK8tZ95ZjpPi0BQkQ8q2EQ=="; + url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.6.9.tgz"; + sha512 = "ZiZlRbqGerqMuR/OmrJTjDzuccfpdS6YV+VbKu+DM/9tEA9z87n7VrtjZ320C0V20wC+vFNnHl2EE26lCePyxg=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -2740,31 +2776,22 @@ let sha512 = "MpNMmV0uADfmGF8jVQ3Vmw+cdh7vAc8Ga/N9LHDhlbWh+EVHkqlpTi6bb3Xv6WsaPlWrx55Wo389IwpbhA0nPQ=="; }; }; - "@serverless/platform-client-0.24.0" = { - name = "_at_serverless_slash_platform-client"; - packageName = "@serverless/platform-client"; - version = "0.24.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-0.24.0.tgz"; - sha512 = "ppxR5wONzzxNSmt/9agfSzC0F4yrkHZWAR5IPLm4yj+dMxb+768XrbqBU6vnOfCcmjb89OX5Bk0GvyQh+T5gLw=="; - }; - }; - "@serverless/platform-client-0.25.5" = { + "@serverless/platform-client-0.25.7" = { name = "_at_serverless_slash_platform-client"; packageName = "@serverless/platform-client"; - version = "0.25.5"; + version = "0.25.7"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-0.25.5.tgz"; - sha512 = "29JV8XpJPTUSWgDwxhvZZ9fi9/5jCn1x5IeT+xEiEkpuXZU79wXlSfMfc8XtptOsDouZnOhBpKEZrItGp67CFw=="; + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-0.25.7.tgz"; + sha512 = "ZOKgT49qQPGjv0tDN46INO0gkc5syL2y5t0pau5ljQPtQpJzHrUL87xRlDj3BD+4Y9QFZV1UXXNsOQZsyCBsPw=="; }; }; - "@serverless/platform-client-china-1.0.6" = { + "@serverless/platform-client-china-1.0.9" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; - version = "1.0.6"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-1.0.6.tgz"; - sha512 = "565LsU74rDQQJAN6y8dTJpDNktqGGs2EvafXXEX021F+YlN3fIJebXRASN2Mgj4XWmzY7DbqC3v2wXF9j3LsGg=="; + url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-1.0.9.tgz"; + sha512 = "P2OXDa3S9meOOGJm2i4/d/9HlEjg8FwwfWl4Vq7jjJlA12cJaJnXy/mKgx16eA/YSYNtfW7i4NGyeADvIGNzmg=="; }; }; "@serverless/platform-sdk-2.3.0" = { @@ -2785,13 +2812,13 @@ let sha512 = "hcMiX523rkp6kHeKnM1x6/dXEY+d1UFSr901yVKeeCgpFy4u33UI9vlKaPweAZCF6Ahzqywf01IsFTuBVadCrQ=="; }; }; - "@serverless/utils-china-0.1.6" = { + "@serverless/utils-china-0.1.7" = { name = "_at_serverless_slash_utils-china"; packageName = "@serverless/utils-china"; - version = "0.1.6"; + version = "0.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-0.1.6.tgz"; - sha512 = "BPaKkRJ47yKTIqRkwF62V5Z/SGdNDmNtinu3fK4988CG1gXBVG2yb3Cq34A98B4BAwZdKzxKCV2n9q4dl1zolw=="; + url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-0.1.7.tgz"; + sha512 = "xpsokLjRK7PQtoNuA+1LxZ4whLlmAuJvtv9m9ARYtMaZhJkmlHD8cEh9Y0/uTcvzcA+pWtxRSHQ92TonpXqVow=="; }; }; "@sindresorhus/is-0.14.0" = { @@ -2839,49 +2866,58 @@ let sha512 = "+Qo+IO3YOXWgazlo+CKxOuWFLQQdaNCJ9cSfhFQd687/FuesaIxWdInaAdfpsLScq0c6M1ieZslXgiZELSzxbg=="; }; }; - "@snyk/cli-interface-2.2.0" = { + "@snyk/cli-interface-2.3.0" = { name = "_at_snyk_slash_cli-interface"; packageName = "@snyk/cli-interface"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.2.0.tgz"; - sha512 = "sA7V2JhgqJB9z5uYotgQc5iNDv//y+Mdm39rANxmFjtZMSYJZHkP80arzPjw1mB5ni/sWec7ieYUUFeySZBfVg=="; + url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.3.0.tgz"; + sha512 = "ecbylK5Ol2ySb/WbfPj0s0GuLQR+KWKFzUgVaoNHaSoN6371qRWwf2uVr+hPUP4gXqCai21Ug/RDArfOhlPwrQ=="; }; }; - "@snyk/cli-interface-2.3.0" = { + "@snyk/cli-interface-2.3.2" = { name = "_at_snyk_slash_cli-interface"; packageName = "@snyk/cli-interface"; - version = "2.3.0"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.3.0.tgz"; - sha512 = "ecbylK5Ol2ySb/WbfPj0s0GuLQR+KWKFzUgVaoNHaSoN6371qRWwf2uVr+hPUP4gXqCai21Ug/RDArfOhlPwrQ=="; + url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.3.2.tgz"; + sha512 = "jmZyxVHqzYU1GfdnWCGdd68WY/lAzpPVyqalHazPj4tFJehrSfEFc82RMTYAMgXEJuvFRFIwhsvXh3sWUhIQmg=="; }; }; - "@snyk/cli-interface-2.4.0" = { + "@snyk/cli-interface-2.5.0" = { name = "_at_snyk_slash_cli-interface"; packageName = "@snyk/cli-interface"; - version = "2.4.0"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.5.0.tgz"; + sha512 = "XMc2SCFH4RBSncZgoPb+BBlNq0NYpEpCzptKi69qyMpBy0VsRqIQqddedaazMCU1xEpXTytq6KMYpzUafZzp5Q=="; + }; + }; + "@snyk/cli-interface-2.6.0" = { + name = "_at_snyk_slash_cli-interface"; + packageName = "@snyk/cli-interface"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.4.0.tgz"; - sha512 = "FH3RpJV83SFmNWR7FXS4O4sAF7oZZxAWmN6vwhADGJNAdgJYW4Acc6677ZSMnRpIHiFBHrsxso3Au+NQuu73xA=="; + url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.6.0.tgz"; + sha512 = "jtk0gf80v4mFyDqaQNokD8GOPMTXpIUL35ewg6jtmuZw41xt56WF9kqCjiiViSRRRYA0RK+RuiVfmJA5pxvMUQ=="; }; }; - "@snyk/cocoapods-lockfile-parser-3.1.0" = { + "@snyk/cocoapods-lockfile-parser-3.2.0" = { name = "_at_snyk_slash_cocoapods-lockfile-parser"; packageName = "@snyk/cocoapods-lockfile-parser"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-3.1.0.tgz"; - sha512 = "9288PnbsBNW4Q+T8Q7qAYf0LoRXpBPzJ0ZyLKezmTaWynQ4bk4L4l5F3ENqRRPhwPKOv+eFemUggKQiBBtWD4w=="; + url = "https://registry.npmjs.org/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-3.2.0.tgz"; + sha512 = "DyFqZudOlGXHBOVneLnQnyQ97xZLq+PTF9PhWOmrEzH/tKcLyXhdW/WmDPVNJVyNvogyRZ4cXIj487xy/EeZEw=="; }; }; - "@snyk/composer-lockfile-parser-1.2.0" = { + "@snyk/composer-lockfile-parser-1.4.0" = { name = "_at_snyk_slash_composer-lockfile-parser"; packageName = "@snyk/composer-lockfile-parser"; - version = "1.2.0"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/composer-lockfile-parser/-/composer-lockfile-parser-1.2.0.tgz"; - sha512 = "kZT+HTqgNcQMeoE5NM9M3jj463M8zI7ZxqZXLw9WoyVs5JTt9g0qFWxIG1cNwZdGVI+y7tzZbNWw9BlMD1vCCQ=="; + url = "https://registry.npmjs.org/@snyk/composer-lockfile-parser/-/composer-lockfile-parser-1.4.0.tgz"; + sha512 = "ga4YTRjJUuP0Ufr+t1IucwVjEFAv66JSBB/zVHP2zy/jmfA3l3ZjlGQSjsRC6Me9P2Z0esQ83AYNZvmIf9pq2w=="; }; }; "@snyk/configstore-3.2.0-rc1" = { @@ -2893,13 +2929,13 @@ let sha512 = "CV3QggFY8BY3u8PdSSlUGLibqbqCG1zJRmGM2DhnhcxQDRRPTGTP//l7vJphOVsUP1Oe23+UQsj7KRWpRUZiqg=="; }; }; - "@snyk/dep-graph-1.16.1" = { + "@snyk/dep-graph-1.18.2" = { name = "_at_snyk_slash_dep-graph"; packageName = "@snyk/dep-graph"; - version = "1.16.1"; + version = "1.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.16.1.tgz"; - sha512 = "2RbstN/z5A3iTmgDQr0vfpWpqsjcJY54PXXP0gVXTf137QLdvgPEsZikjlofF4qoNO1io5t1VGvf69v9E8UrOw=="; + url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.18.2.tgz"; + sha512 = "v7tIiCH4LmYOSc0xGHKSxSZ2PEDv8zDlYU7ZKSH+1Hk8Qvj3YYEFvtV1iFBHUEQFUen4kQA6lWxlwF8chsNw+w=="; }; }; "@snyk/gemfile-1.2.0" = { @@ -2911,31 +2947,67 @@ let sha512 = "nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA=="; }; }; - "@snyk/java-call-graph-builder-1.3.4" = { + "@snyk/graphlib-2.1.9-patch" = { + name = "_at_snyk_slash_graphlib"; + packageName = "@snyk/graphlib"; + version = "2.1.9-patch"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/graphlib/-/graphlib-2.1.9-patch.tgz"; + sha512 = "uFO/pNMm3pN15QB+hVMU7uaQXhsBNwEA8lOET/VDcdOzLptODhXzkJqSHqt0tZlpdAz6/6Uaj8jY00UvPFgFMA=="; + }; + }; + "@snyk/inquirer-6.2.2-patch" = { + name = "_at_snyk_slash_inquirer"; + packageName = "@snyk/inquirer"; + version = "6.2.2-patch"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/inquirer/-/inquirer-6.2.2-patch.tgz"; + sha512 = "IUq5bHRL0vtVKtfvd4GOccAIaLYHbcertug2UVZzk5+yY6R/CxfYsnFUTho1h4BdkfNdin2tPjE/5jRF4SKSrw=="; + }; + }; + "@snyk/java-call-graph-builder-1.8.0" = { name = "_at_snyk_slash_java-call-graph-builder"; packageName = "@snyk/java-call-graph-builder"; - version = "1.3.4"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.8.0.tgz"; + sha512 = "dD7hVdEKMMU9CP0jQLm6Q1+l6506rjW0dqQflJ3QOVohNzptYJtTv9pHKzgRu5+q/fgEc35oYi02A0WIQwSvpw=="; + }; + }; + "@snyk/lodash-4.17.15-patch" = { + name = "_at_snyk_slash_lodash"; + packageName = "@snyk/lodash"; + version = "4.17.15-patch"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/lodash/-/lodash-4.17.15-patch.tgz"; + sha512 = "e4+t34bGyjjRnwXwI14hqye9J/nRbG9iwaqTgXWHskm5qC+iK0UrjgYdWXiHJCf3Plbpr+1rpW+4LPzZnCGMhQ=="; + }; + }; + "@snyk/rpm-parser-1.1.0" = { + name = "_at_snyk_slash_rpm-parser"; + packageName = "@snyk/rpm-parser"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.3.4.tgz"; - sha512 = "3KXA5hTqvn6EZBEyMhA5zj0QCzu1WBPVBeUbQ4sNfftbVgfy/OFc9I/NPi39ALA2+tFYl1aKVIy1ECRea4Mc1w=="; + url = "https://registry.npmjs.org/@snyk/rpm-parser/-/rpm-parser-1.1.0.tgz"; + sha512 = "+DyCagvnpyBjwYTxaPMQGLW4rkpKAw1Jrh8YbZCg7Ix172InBxdve/0zud18Lu2H6xWtDDdMvRDdfl82wlTBvA=="; }; }; - "@snyk/ruby-semver-2.1.0" = { + "@snyk/ruby-semver-2.2.0" = { name = "_at_snyk_slash_ruby-semver"; packageName = "@snyk/ruby-semver"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/ruby-semver/-/ruby-semver-2.1.0.tgz"; - sha512 = "u8ez8kWyqge+N+FxRDx/uPBmcHzY7BMfODvzEVeoTOeoD0CHPymEaVlkEKA8ZHtxzXjUzPIl2I8f2siZEzLjYg=="; + url = "https://registry.npmjs.org/@snyk/ruby-semver/-/ruby-semver-2.2.0.tgz"; + sha512 = "FqUayoVjcyCsQFYPm3DcaCKdFR4xmapUkCGY+bcNBs3jqCUw687PoP9CPQ1Jvtaw5YpfBNl/62jyntsWCeciuA=="; }; }; - "@snyk/snyk-cocoapods-plugin-2.1.1" = { + "@snyk/snyk-cocoapods-plugin-2.2.0" = { name = "_at_snyk_slash_snyk-cocoapods-plugin"; packageName = "@snyk/snyk-cocoapods-plugin"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-2.1.1.tgz"; - sha512 = "bUo69YaZfBD/vPookJjdskcnUNGNzPbqgBLzjyDqzmG9zCArW1LEU4A8pwfw1mxjp8NzBreex6K74tC8ssIN4g=="; + url = "https://registry.npmjs.org/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-2.2.0.tgz"; + sha512 = "Ux7hXKawbk30niGBToGkKqHyKzhT3E7sCl0FNkPkHaaGZwPwhFCDyNFxBd4uGgWiQ+kT+RjtH5ahna+bSP69Yg=="; }; }; "@snyk/update-notifier-2.5.1-rc2" = { @@ -3271,13 +3343,13 @@ let sha512 = "/K6zCpeW7Imzgab2bLkLEbz0+1JlFSrUMdw7KoIIu+IUdu51GWaBZpd3y1VXGVXzynvGa4DaIaxNZHiON3GXUg=="; }; }; - "@types/babel__traverse-7.0.10" = { + "@types/babel__traverse-7.0.11" = { name = "_at_types_slash_babel__traverse"; packageName = "@types/babel__traverse"; - version = "7.0.10"; + version = "7.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.10.tgz"; - sha512 = "74fNdUGrWsgIB/V9kTO5FGHPWYY6Eqn+3Z7L6Hc4e/BxjYV7puvBqp5HwsVYYfLm6iURYBNCx4Ut37OF9yitCw=="; + url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.11.tgz"; + sha512 = "ddHK5icION5U6q11+tV2f9Mo6CZVuT8GJKld2q9LqHSZbvLbH34Kcu2yFGckZut453+eQU6btIA3RihmnRgI+Q=="; }; }; "@types/babylon-6.16.5" = { @@ -3298,15 +3370,6 @@ let sha512 = "W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ=="; }; }; - "@types/bunyan-1.8.6" = { - name = "_at_types_slash_bunyan"; - packageName = "@types/bunyan"; - version = "1.8.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/bunyan/-/bunyan-1.8.6.tgz"; - sha512 = "YiozPOOsS6bIuz31ilYqR5SlLif4TBWsousN2aCWLi5233nZSX19tFbcQUPdR7xJ8ypPyxkCGNxg0CIV5n9qxQ=="; - }; - }; "@types/cacheable-request-6.0.1" = { name = "_at_types_slash_cacheable-request"; packageName = "@types/cacheable-request"; @@ -3415,13 +3478,13 @@ let sha512 = "EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g=="; }; }; - "@types/express-4.17.3" = { + "@types/express-4.17.4" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.3"; + version = "4.17.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.3.tgz"; - sha512 = "I8cGRJj3pyOLs/HndoP+25vOqhqWkAZsWMEmq1qXy/b/M3ppufecUwaK2/TVDVxcV61/iSdhykUjQQ2DLSrTdg=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.4.tgz"; + sha512 = "DO1L53rGqIDUEvOjJKmbMEQ5Z+BM2cIEPy/eV3En+s166Gz+FeuzRerxcab757u/U4v4XF4RYrZPmqKa+aY/2w=="; }; }; "@types/express-serve-static-core-4.17.5" = { @@ -3451,6 +3514,15 @@ let sha512 = "1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w=="; }; }; + "@types/graceful-fs-4.1.3" = { + name = "_at_types_slash_graceful-fs"; + packageName = "@types/graceful-fs"; + version = "4.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.3.tgz"; + sha512 = "AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ=="; + }; + }; "@types/graphql-upload-8.0.3" = { name = "_at_types_slash_graphql-upload"; packageName = "@types/graphql-upload"; @@ -3505,13 +3577,13 @@ let sha512 = "UpYjBi8xefVChsCoBpKShdxTllC9pwISirfoZsUa2AAdQg/Jd2KQGtSbw+ya7GPo7x/wAPlH6JBhKhAsXUEZNA=="; }; }; - "@types/jquery-3.3.35" = { + "@types/jquery-3.3.37" = { name = "_at_types_slash_jquery"; packageName = "@types/jquery"; - version = "3.3.35"; + version = "3.3.37"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.35.tgz"; - sha512 = "pnIELWhHXJ7RgoFylhiTxD+96QlKBJfEx8JCLj963/dh7zBOKFkZ6rlNqbaCcn2JZrsAxCI8WhgRXznBx2iDsA=="; + url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.37.tgz"; + sha512 = "4MNntGYm6xdDiz2+B92xEmWcFN9mOeMXqS854lSe7LDpBhzscUjvXjCAl6JwPBtAkqmPZq+L4I5UyXXNDZyq4Q=="; }; }; "@types/js-yaml-3.12.3" = { @@ -3631,13 +3703,13 @@ let sha512 = "4mXKoDptrXAwZErQHrLzpe0FN/0Wmf5JRniSVIdwUrtDf9wnmEV1teCNLBo/TwuXhkK/bVegoEn/wmb+x0AuPg=="; }; }; - "@types/node-13.13.2" = { + "@types/node-13.13.4" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.13.2"; + version = "13.13.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.13.2.tgz"; - sha512 = "LB2R1Oyhpg8gu4SON/mfforE525+Hi/M1ineICEDftqNVTyFg1aRIeGuTvXAoWHc4nbrFncWtJgMmoyRvuGh7A=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.13.4.tgz"; + sha512 = "x26ur3dSXgv5AwKS0lNfbjpCakGIduWU1DU91Zz58ONRWrIKGunmZBNv4P7N+e27sJkiGDsw/3fT4AtsqQBrBA=="; }; }; "@types/node-6.14.10" = { @@ -3658,6 +3730,15 @@ let sha512 = "2w0NTwMWF1d3NJMK0Uiq2UNN8htVCyOWOD0jIPjPgC5Ph/YP4dVhs9YxxcMcuLuwAslz0dVEcZQUaqkLs3IzOQ=="; }; }; + "@types/node-fetch-2.5.7" = { + name = "_at_types_slash_node-fetch"; + packageName = "@types/node-fetch"; + version = "2.5.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.5.7.tgz"; + sha512 = "o2WVNf5UhWRkxlf6eq+jMZDu7kjgpgJfl4xVNlvryc95O/6F2ld8ztKX+qu+Rjyet93WAWm5LjeX9H5FGkODvw=="; + }; + }; "@types/normalize-package-data-2.4.0" = { name = "_at_types_slash_normalize-package-data"; packageName = "@types/normalize-package-data"; @@ -3676,6 +3757,15 @@ let sha512 = "ce5d3q03Ex0sy4R14722Rmt6MT07Ua+k4FwDfdcToYJcMKNtRVQvJ6JCAPdAmAnbRb6CsX6aYb9m96NGod9uTw=="; }; }; + "@types/qs-6.9.1" = { + name = "_at_types_slash_qs"; + packageName = "@types/qs"; + version = "6.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.1.tgz"; + sha512 = "lhbQXx9HKZAPgBkISrBcmAcMpZsmpe/Cd/hY7LGZS5OfkySUBItnPZHgQPssWYUET8elF+yCFBbP1Q0RZPTdaw=="; + }; + }; "@types/range-parser-1.2.3" = { name = "_at_types_slash_range-parser"; packageName = "@types/range-parser"; @@ -3703,15 +3793,6 @@ let sha512 = "85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA=="; }; }; - "@types/restify-4.3.6" = { - name = "_at_types_slash_restify"; - packageName = "@types/restify"; - version = "4.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/restify/-/restify-4.3.6.tgz"; - sha512 = "4l4f0EXnleXQttlhRCXtTuJ8UelsKiAKIK2AAEd2epBHu41aEbM0U2z6E5tUrNwlbxz7qaNBISduGMeg+G3PaA=="; - }; - }; "@types/semver-5.5.0" = { name = "_at_types_slash_semver"; packageName = "@types/semver"; @@ -3784,22 +3865,22 @@ let sha512 = "WJZtZlinE3meRdH+I7wTsIhpz/GLhqEQwmPGeh4s1irWLwMzCeTV8WZ+pgPTwrDXoafVUWwo1LiZ9HJVHFlJSQ=="; }; }; - "@types/ws-6.0.4" = { + "@types/ws-7.2.4" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; - version = "6.0.4"; + version = "7.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-6.0.4.tgz"; - sha512 = "PpPrX7SZW9re6+Ha8ojZG4Se8AZXgf0GK6zmfqEuCsY49LFDNXO3SByp44X3dFEqtB73lkCDAdUazhAjVPiNwg=="; + url = "https://registry.npmjs.org/@types/ws/-/ws-7.2.4.tgz"; + sha512 = "9S6Ask71vujkVyeEXKxjBSUV8ZUB0mjL5la4IncBoheu04bDaYyUKErh1BQcY9+WzOUOiKqz/OnpJHYckbMfNg=="; }; }; - "@types/xml2js-0.4.3" = { + "@types/xml2js-0.4.5" = { name = "_at_types_slash_xml2js"; packageName = "@types/xml2js"; - version = "0.4.3"; + version = "0.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/xml2js/-/xml2js-0.4.3.tgz"; - sha512 = "Pv2HGRE4gWLs31In7nsyXEH4uVVsd0HNV9i2dyASvtDIlOtSTr1eczPLDpdEuyv5LWH5LT20GIXwPjkshKWI1g=="; + url = "https://registry.npmjs.org/@types/xml2js/-/xml2js-0.4.5.tgz"; + sha512 = "yohU3zMn0fkhlape1nxXG2bLEGZRc1FeqF80RoHaYXJN7uibaauXfhzhOJr1Xh36sn+/tx21QAOf07b/xYVk1w=="; }; }; "@types/yargs-15.0.4" = { @@ -3838,13 +3919,13 @@ let sha512 = "te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="; }; }; - "@typescript-eslint/eslint-plugin-2.29.0" = { + "@typescript-eslint/eslint-plugin-2.31.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "2.29.0"; + version = "2.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.29.0.tgz"; - sha512 = "X/YAY7azKirENm4QRpT7OVmzok02cSkqeIcLmdz6gXUQG4Hk0Fi9oBAynSAyNXeGdMRuZvjBa0c1Lu0dn/u6VA=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.31.0.tgz"; + sha512 = "iIC0Pb8qDaoit+m80Ln/aaeu9zKQdOLF4SHcGLarSeY1gurW6aU4JsOPMjKQwXlw70MvWKZQc6S2NamA8SJ/gg=="; }; }; "@typescript-eslint/experimental-utils-1.13.0" = { @@ -3856,13 +3937,13 @@ let sha512 = "zmpS6SyqG4ZF64ffaJ6uah6tWWWgZ8m+c54XXgwFtUv0jNz8aJAVx8chMCvnk7yl6xwn8d+d96+tWp7fXzTuDg=="; }; }; - "@typescript-eslint/experimental-utils-2.29.0" = { + "@typescript-eslint/experimental-utils-2.31.0" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "2.29.0"; + version = "2.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.29.0.tgz"; - sha512 = "H/6VJr6eWYstyqjWXBP2Nn1hQJyvJoFdDtsHxGiD+lEP7piGnGpb/ZQd+z1ZSB1F7dN+WsxUDh8+S4LwI+f3jw=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.31.0.tgz"; + sha512 = "MI6IWkutLYQYTQgZ48IVnRXmLR/0Q6oAyJgiOror74arUMh7EWjJkADfirZhRsUMHeLJ85U2iySDwHTSnNi9vA=="; }; }; "@typescript-eslint/parser-1.13.0" = { @@ -3874,13 +3955,13 @@ let sha512 = "ITMBs52PCPgLb2nGPoeT4iU3HdQZHcPaZVw+7CsFagRJHUhyeTgorEwHXhFf3e7Evzi8oujKNpHc8TONth8AdQ=="; }; }; - "@typescript-eslint/parser-2.29.0" = { + "@typescript-eslint/parser-2.31.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "2.29.0"; + version = "2.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.29.0.tgz"; - sha512 = "H78M+jcu5Tf6m/5N8iiFblUUv+HJDguMSdFfzwa6vSg9lKR8Mk9BsgeSjO8l2EshKnJKcbv0e8IDDOvSNjl0EA=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.31.0.tgz"; + sha512 = "uph+w6xUOlyV2DLSC6o+fBDzZ5i7+3/TxAsH4h3eC64tlga57oMb96vVlXoMwjR/nN+xyWlsnxtbDkB46M2EPQ=="; }; }; "@typescript-eslint/typescript-estree-1.13.0" = { @@ -3892,13 +3973,13 @@ let sha512 = "b5rCmd2e6DCC6tCTN9GSUAuxdYwCM/k/2wdjHGrIRGPSJotWMCe/dGpi66u42bhuh8q3QBzqM4TMA1GUUCJvdw=="; }; }; - "@typescript-eslint/typescript-estree-2.29.0" = { + "@typescript-eslint/typescript-estree-2.31.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "2.29.0"; + version = "2.31.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.29.0.tgz"; - sha512 = "3YGbtnWy4az16Egy5Fj5CckkVlpIh0MADtAQza+jiMADRSKkjdpzZp/5WuvwK/Qib3Z0HtzrDFeWanS99dNhnA=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.31.0.tgz"; + sha512 = "vxW149bXFXXuBrAak0eKHOzbcu9cvi6iNcJDzEtOkRwGHxJG15chiAQAwhLOsk+86p9GTr/TziYvw+H9kMaIgA=="; }; }; "@vue/cli-shared-utils-4.3.1" = { @@ -4828,13 +4909,13 @@ let sha512 = "e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ=="; }; }; - "agentkeepalive-4.1.0" = { + "agentkeepalive-4.1.2" = { name = "agentkeepalive"; packageName = "agentkeepalive"; - version = "4.1.0"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.1.0.tgz"; - sha512 = "CW/n1wxF8RpEuuiq6Vbn9S8m0VSYDMnZESqaJ6F2cWN9fY8rei2qaxweIaRgq+ek8TqfoFIsUjaGNKGGEHElSg=="; + url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.1.2.tgz"; + sha512 = "waNHE7tQBBn+2qXucI8HY0o2Y0OBPWldWOWsZwY71JcCm4SvrPnWdceFfB5NIXSqE8Ewq6VR/Qt5b1i69P6KCQ=="; }; }; "aggregate-error-3.0.1" = { @@ -5413,13 +5494,13 @@ let sha512 = "7X5aGbqaOWYG+SSkCzJNHTz2ZKDcyRwtmvW4mGVLRqdQs+HxfXS4dUS2CcwrAj449se6tZ6NLUMnjko4KMt3KA=="; }; }; - "apollo-cache-control-0.9.1" = { + "apollo-cache-control-0.10.0" = { name = "apollo-cache-control"; packageName = "apollo-cache-control"; - version = "0.9.1"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.9.1.tgz"; - sha512 = "9t2EcRevUrANuGhF5XUbKJEfnc6Jy2Rn7Y8nOIKlsEEC+AX7Ko4svWYTyyTxj0h0RXfiegY2nbz4sVry/pS3rA=="; + url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.10.0.tgz"; + sha512 = "UIcPlrPdRTOKrF7kc5/WD5i6EVkGEEqgOK/fMj92fnnxR1KnQDiN82lqaxu02eZJvWjFJjik0JVJNXKOJXVrpQ=="; }; }; "apollo-cache-inmemory-1.6.5" = { @@ -5566,22 +5647,22 @@ let sha512 = "Yja12BgNQhzuFGG/5Nw2MQe0hkuQy2+9er09HxeEyAf2rUDIPnhPrn1MDoZTB8MU7UGfjwITC+1ofzKkkrZobA=="; }; }; - "apollo-engine-reporting-1.7.1" = { + "apollo-engine-reporting-1.8.0" = { name = "apollo-engine-reporting"; packageName = "apollo-engine-reporting"; - version = "1.7.1"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.7.1.tgz"; - sha512 = "9ykddPxlC95R9CkkJaPaGriRbOGfzeKqqPXRAunyX1h4sG/8g+MJ/gGzmnNf63k6RvRUdRENCE83wPk2OeU+2A=="; + url = "https://registry.npmjs.org/apollo-engine-reporting/-/apollo-engine-reporting-1.8.0.tgz"; + sha512 = "VPVpIGW6lbYXga6sqq/fG8ZaPR70bFuxvCov6X0npuVQPXwgZrzBp50cHx9uIaBVxDDxD3leeznsQbmF37RAww=="; }; }; - "apollo-engine-reporting-protobuf-0.4.4" = { + "apollo-engine-reporting-protobuf-0.5.0" = { name = "apollo-engine-reporting-protobuf"; packageName = "apollo-engine-reporting-protobuf"; - version = "0.4.4"; + version = "0.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.4.4.tgz"; - sha512 = "SGrIkUR7Q/VjU8YG98xcvo340C4DaNUhg/TXOtGsMlfiJDzHwVau/Bv6zifAzBafp2lj0XND6Daj5kyT/eSI/w=="; + url = "https://registry.npmjs.org/apollo-engine-reporting-protobuf/-/apollo-engine-reporting-protobuf-0.5.0.tgz"; + sha512 = "OgMwtLcuL+YAaO2xgkPbnRJnISLDSNE5F11p7oq+1ws+ws71CPfHAthDCxSObCPSALdhsLAGD0v3u3soBuNmMg=="; }; }; "apollo-env-0.6.4" = { @@ -5692,13 +5773,13 @@ let sha512 = "L7LHZ3k9Ao5OSf2WStvQhxdsNVplRQi7kCAPfqf9Z3GBEnQ2uaL0EgO0hSmtVHfXTbk5CTRziMT1Pe87bXrFIw=="; }; }; - "apollo-server-core-2.12.0" = { + "apollo-server-core-2.13.0" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.12.0"; + version = "2.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.12.0.tgz"; - sha512 = "BRVdOyZrRJ1ALlmis0vaOLIHHYu5K3UVKAQKIgHkRh/YY0Av4lpeEXr49ELK04LTeh0DG0pQ5YYYhaX1wFcDEw=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.13.0.tgz"; + sha512 = "PqfsexbyObaQYb2jODs8v/XzrJcn+5mh0jA8ZfQCg5GENlua/CjeTZbRm2X0p3qpwc2E5jFAXSshrIWvhQAGZQ=="; }; }; "apollo-server-env-2.4.3" = { @@ -5719,40 +5800,40 @@ let sha512 = "7oEd6pUxqyWYUbQ9TA8tM0NU/3aGtXSEibo6+txUkuHe7QaxfZ2wHRp+pfT1LC1K3RXYjKj61/C2xEO19s3Kdg=="; }; }; - "apollo-server-express-2.12.0" = { + "apollo-server-express-2.13.0" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.12.0"; + version = "2.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.12.0.tgz"; - sha512 = "oTBKM2SsziCoFW+ta+ubJ/ypvsc+EWrbJnyZhJ5FBYzSXPstt/jvgZHgMO+kOQgHEHrbJwugNDUuLMSm608L7A=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.13.0.tgz"; + sha512 = "xDc+kRqWCXs4MeRjls37G45V6PmKYwo7OlpWCXyWDSPGgY9UD4E5A6rUBCyIhoNr7RnVYMkNuySOOqzX1QJ7EA=="; }; }; - "apollo-server-plugin-base-0.7.1" = { + "apollo-server-plugin-base-0.8.0" = { name = "apollo-server-plugin-base"; packageName = "apollo-server-plugin-base"; - version = "0.7.1"; + version = "0.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.7.1.tgz"; - sha512 = "PRavvoWq7/Xufqc+qkDQg3Aqueq4QrPBFfoCFIjhkJ4n2d2YoqE3gTGccb8YoWusfa62ASMn6R47OdNuVtEbXw=="; + url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.8.0.tgz"; + sha512 = "H8sJlOVJrF0IhYIFMv7NOgB6BFgqobXSZrj1y9ju6dq13OotsqcZC4fJOYc9oWzb/+/mqg/odtVioE71mj68yg=="; }; }; - "apollo-server-types-0.3.1" = { + "apollo-server-types-0.4.0" = { name = "apollo-server-types"; packageName = "apollo-server-types"; - version = "0.3.1"; + version = "0.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.3.1.tgz"; - sha512 = "6nX5VC3icOGf1RZIs7/SYQZff+Cl16LQu1FHUOIk9gAMN2XjlRCyJgCeMj5YHJzQ8Mhg4BO0weWuydEg+JxLzg=="; + url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.4.0.tgz"; + sha512 = "U+6qKCdrucVSMEVvLSqSwxIGr3VI6vcfbhpD86sdb8MgHHGH6egjNAcLrPVRk1AyXs8RV0Ysus+vlj8rpouBzA=="; }; }; - "apollo-tracing-0.9.1" = { + "apollo-tracing-0.10.0" = { name = "apollo-tracing"; packageName = "apollo-tracing"; - version = "0.9.1"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.9.1.tgz"; - sha512 = "4wVNM6rc70XhwWxuDWrMBLaHA8NjB9pUS2sNpddQvP36ZtQfsa08XLSUxGAZT+bej+TzW26hKNtuO31RgqC9Hg=="; + url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.10.0.tgz"; + sha512 = "yuqA1KT0FQUfzVK3ZIk0hRIE8eUKx9Oklq83AGQxLtS/oafBj/VOCZAtJNJkyEqMJxXQT9uIBtbfO1789Gczkw=="; }; }; "apollo-upload-client-11.0.0" = { @@ -6961,13 +7042,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.661.0" = { + "aws-sdk-2.669.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.661.0"; + version = "2.669.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.661.0.tgz"; - sha512 = "dfGtbRQQUmcpj6WGVhj7q2PADCvDhLf+/aRGPXcMrm0cnHavkmHPVaSvrw2lJJJ5N9MsBKoUyacrVcIQkfNsgw=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.669.0.tgz"; + sha512 = "kuVcSRpDzvkgmeSmMX6Q32eTOb8UeihhUdavMrvUOP6fzSU19cNWS9HAIkYOi/jrEDK85cCZxXjxqE3JGZIGcw=="; }; }; "aws-sign2-0.6.0" = { @@ -6997,6 +7078,15 @@ let sha512 = "wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug=="; }; }; + "axios-0.18.1" = { + name = "axios"; + packageName = "axios"; + version = "0.18.1"; + src = fetchurl { + url = "https://registry.npmjs.org/axios/-/axios-0.18.1.tgz"; + sha512 = "0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g=="; + }; + }; "axios-0.19.2" = { name = "axios"; packageName = "axios"; @@ -7105,13 +7195,13 @@ let sha512 = "m2CvfDW4+1qfDdsrtf4dwOslQC3yhbgyBFptncp4wvtdrDHqueW7slsYv4gArie056phvQFhT2nRcGS4bnm6mA=="; }; }; - "babel-jest-25.4.0" = { + "babel-jest-25.5.1" = { name = "babel-jest"; packageName = "babel-jest"; - version = "25.4.0"; + version = "25.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/babel-jest/-/babel-jest-25.4.0.tgz"; - sha512 = "p+epx4K0ypmHuCnd8BapfyOwWwosNCYhedetQey1awddtfmEX0MmdxctGl956uwUmjwXR5VSS5xJcGX9DvdIog=="; + url = "https://registry.npmjs.org/babel-jest/-/babel-jest-25.5.1.tgz"; + sha512 = "9dA9+GmMjIzgPnYtkhBg73gOo/RHqPmLruP3BaGL4KEX3Dwz6pI8auSN8G8+iuEG90+GSswyKvslN+JYSaacaQ=="; }; }; "babel-loader-8.1.0" = { @@ -7141,13 +7231,13 @@ let sha512 = "AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ=="; }; }; - "babel-plugin-jest-hoist-25.4.0" = { + "babel-plugin-jest-hoist-25.5.0" = { name = "babel-plugin-jest-hoist"; packageName = "babel-plugin-jest-hoist"; - version = "25.4.0"; + version = "25.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.4.0.tgz"; - sha512 = "M3a10JCtTyKevb0MjuH6tU+cP/NVQZ82QPADqI1RQYY1OphztsCeIeQmTsHmF/NS6m0E51Zl4QNsI3odXSQF5w=="; + url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.5.0.tgz"; + sha512 = "u+/W+WAjMlvoocYGTwthAiQSxDcJAyHpQ6oWlHdFZaaN+Rlk8Q7iiwDPg2lN/FyJtAYnKjFxbn7xus4HCFkg5g=="; }; }; "babel-plugin-minify-builtins-0.5.0" = { @@ -7375,13 +7465,13 @@ let sha512 = "u/8cS+dEiK1SFILbOC8/rUI3ml9lboKuuMvZ/4aQnQmhecQAgPw5ew066C1ObnEAUmlx7dv/s2z52psWEtLNiw=="; }; }; - "babel-preset-jest-25.4.0" = { + "babel-preset-jest-25.5.0" = { name = "babel-preset-jest"; packageName = "babel-preset-jest"; - version = "25.4.0"; + version = "25.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-25.4.0.tgz"; - sha512 = "PwFiEWflHdu3JCeTr0Pb9NcHHE34qWFnPQRVPvqQITx4CsDCzs6o05923I10XvLvn9nNsRHuiVgB72wG/90ZHQ=="; + url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-25.5.0.tgz"; + sha512 = "8ZczygctQkBU+63DtSOKGh7tFL0CeCuz+1ieud9lJ1WPQ9O6A1a/r+LGn6Y705PA6whHQ3T1XuB/PmpfNYf8Fw=="; }; }; "babel-preset-minify-0.5.1" = { @@ -8059,13 +8149,13 @@ let sha1 = "f962d687ec2c369570ae71af843256e6d0ca1129"; }; }; - "blessed-contrib-4.8.19" = { + "blessed-contrib-4.8.20" = { name = "blessed-contrib"; packageName = "blessed-contrib"; - version = "4.8.19"; + version = "4.8.20"; src = fetchurl { - url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.8.19.tgz"; - sha512 = "g2EVkuCd8r46XVI+pgGuTYK0MGKOn30slJTUlV4m/1d/THIb4lUbY2S+yAtqiJ1q3IFu5TfwURb9/eAKZtJLNQ=="; + url = "https://registry.npmjs.org/blessed-contrib/-/blessed-contrib-4.8.20.tgz"; + sha512 = "jLLXR9pjjm/T2jY0Q8OCCpuDquWiMULkPyT8YNaiLUR0j1MchTQK/Q7SiuD63jn9ekn9BrohwP1Kom/FylmeHQ=="; }; }; "blob-0.0.2" = { @@ -9112,13 +9202,13 @@ let sha512 = "a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ=="; }; }; - "cacache-15.0.0" = { + "cacache-15.0.3" = { name = "cacache"; packageName = "cacache"; - version = "15.0.0"; + version = "15.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/cacache/-/cacache-15.0.0.tgz"; - sha512 = "L0JpXHhplbJSiDGzyJJnJCTL7er7NzbBgxzVqLswEb4bO91Zbv17OUMuUeu/q0ZwKn3V+1HM4wb9tO4eVE/K8g=="; + url = "https://registry.npmjs.org/cacache/-/cacache-15.0.3.tgz"; + sha512 = "bc3jKYjqv7k4pWh7I/ixIjfcjPul4V4jme/WbjvwGS5LzoPL/GzXr4C5EgPNLO/QEZl9Oi61iGitYEdwcrwLCQ=="; }; }; "cache-base-1.0.1" = { @@ -9391,13 +9481,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001046" = { + "caniuse-lite-1.0.30001050" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001046"; + version = "1.0.30001050"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001046.tgz"; - sha512 = "CsGjBRYWG6FvgbyGy+hBbaezpwiqIOLkxQPY4A4Ea49g1eNsnQuESB+n4QM0BKii1j80MyJ26Ir5ywTQkbRE4g=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001050.tgz"; + sha512 = "OvGZqalCwmapci76ISq5q4kuAskb1ebqF3FEQBv1LE1kWht0pojlDDqzFlmk5jgYkuZN7MNZ1n+ULwe/7MaDNQ=="; }; }; "capture-exit-2.0.0" = { @@ -9859,13 +9949,13 @@ let sha512 = "dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A=="; }; }; - "chokidar-3.3.1" = { + "chokidar-3.4.0" = { name = "chokidar"; packageName = "chokidar"; - version = "3.3.1"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.3.1.tgz"; - sha512 = "4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg=="; + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz"; + sha512 = "aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ=="; }; }; "chownr-0.0.2" = { @@ -9886,6 +9976,15 @@ let sha512 = "jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="; }; }; + "chownr-2.0.0" = { + name = "chownr"; + packageName = "chownr"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz"; + sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ=="; + }; + }; "chroma-js-2.1.0" = { name = "chroma-js"; packageName = "chroma-js"; @@ -10210,13 +10309,13 @@ let sha1 = "7e673ee0dd39a611a486476e53f3c6b3941cb582"; }; }; - "cli-progress-3.8.0" = { + "cli-progress-3.8.2" = { name = "cli-progress"; packageName = "cli-progress"; - version = "3.8.0"; + version = "3.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/cli-progress/-/cli-progress-3.8.0.tgz"; - sha512 = "3e+m7ecKbVTF2yo186vrrt/5217ZwE64z61kMwhSFmgrF3qZiTUuV9Fdh2RyzSkhLRfsqFf721KiUDEAJlP5pA=="; + url = "https://registry.npmjs.org/cli-progress/-/cli-progress-3.8.2.tgz"; + sha512 = "qRwBxLldMSfxB+YGFgNRaj5vyyHe1yMpVeDL79c+7puGujdKJHQHydgqXDcrkvQgJ5U/d3lpf6vffSoVVUftVQ=="; }; }; "cli-spinner-0.2.10" = { @@ -10696,13 +10795,13 @@ let sha512 = "SPnx+ZHXVJ0qTInRXmnxuyu8PDvSzvop5MXp1BOr/urFQI3yL2n5ewE755skTklF/hKVlWj8cinGxdR2gvLvTA=="; }; }; - "codecs-2.0.0" = { + "codecs-2.1.0" = { name = "codecs"; packageName = "codecs"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/codecs/-/codecs-2.0.0.tgz"; - sha512 = "WXvpJRAgc693oqYvZte9uYEiL5YHtfrxyEq12uVny9oBJ1k37zSva5vVz7trsnt6R9Y15hEgOSC7VFZT2pfYnA=="; + url = "https://registry.npmjs.org/codecs/-/codecs-2.1.0.tgz"; + sha512 = "nSWYToViFEpZXOxhtMQ6IDs76TN9xKIkHOu1KCr/iFiBcgzKuY1AFPZktuXN8r82FbZ/TXP9fwITszLgcp3eQg=="; }; }; "codepage-1.4.0" = { @@ -11128,13 +11227,13 @@ let sha512 = "NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="; }; }; - "commander-5.0.0" = { + "commander-5.1.0" = { name = "commander"; packageName = "commander"; - version = "5.0.0"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-5.0.0.tgz"; - sha512 = "JrDGPAKjMGSP1G0DUoaceEJ3DZgAfr/q6X7FVk4+U5KxUSKviYGM2k6zWkfyyBHy5rAtzgYJFa1ro2O9PtoxwQ=="; + url = "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz"; + sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="; }; }; "commandpost-1.4.0" = { @@ -11993,6 +12092,15 @@ let sha512 = "h479g/5a0PXn//yiFuMrD5MDEbB+mtihNkWcE6uD/aCh/6z0FRZ9sWH3NfZbHDB+Bp1yGLYsjbH8LZBL8KOQ0w=="; }; }; + "core-js-2.3.0" = { + name = "core-js"; + packageName = "core-js"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/core-js/-/core-js-2.3.0.tgz"; + sha1 = "fab83fbb0b2d8dc85fa636c4b9d34c75420c6d65"; + }; + }; "core-js-2.6.11" = { name = "core-js"; packageName = "core-js"; @@ -12236,22 +12344,22 @@ let sha512 = "LuoXnCRMKEo3KR3jEbCRpP3Nu2TUhLTlb/axP9+rl+ouhBpxTaHaTTN1bdUS2x2VK3wWyCBl1OZHyHhlRBntWg=="; }; }; - "creato-1.1.1" = { + "creato-1.1.2" = { name = "creato"; packageName = "creato"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/creato/-/creato-1.1.1.tgz"; - sha512 = "FIliDIw0V3V0lWR+pVmGh45rJSemv4EBr46SNvafpxu8UJKUovEaeP5c19jSe/4m2DOEVnBeA5zcEjo1koMolg=="; + url = "https://registry.npmjs.org/creato/-/creato-1.1.2.tgz"; + sha512 = "BSna+qXnoIhNugGcUz9wnC6UtyRRKRm3QMQ/42BDw97/8eW0Y6b5Z5ecyaDbZdWMW6ipvvCbuj7H9NEkd1C0jA=="; }; }; - "cron-1.8.2" = { + "cron-1.7.2" = { name = "cron"; packageName = "cron"; - version = "1.8.2"; + version = "1.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/cron/-/cron-1.8.2.tgz"; - sha512 = "Gk2c4y6xKEO8FSAUTklqtfSr7oTq0CiPQeLBG5Fl0qoXpZyMcj1SG59YL+hqq04bu6/IuEA7lMkYDAplQNKkyg=="; + url = "https://registry.npmjs.org/cron/-/cron-1.7.2.tgz"; + sha512 = "+SaJ2OfeRvfQqwXQ2kgr0Y5pzBR/lijf5OpnnaruwWnmI799JfWr2jN2ItOV9s3A/+TFOt6mxvKzQq5F0Jp6VQ=="; }; }; "cross-env-6.0.3" = { @@ -12659,13 +12767,13 @@ let sha512 = "GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA=="; }; }; - "cssstyle-2.2.0" = { + "cssstyle-2.3.0" = { name = "cssstyle"; packageName = "cssstyle"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/cssstyle/-/cssstyle-2.2.0.tgz"; - sha512 = "sEb3XFPx3jNnCAMtqrXPDeSgQr+jojtCeNf8cvMNMh1cG970+lljssvQDzPq6lmmJu2Vhqood/gtEomBiHOGnA=="; + url = "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz"; + sha512 = "AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A=="; }; }; "csstype-2.6.10" = { @@ -13082,13 +13190,13 @@ let sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q=="; }; }; - "dayjs-1.8.25" = { + "dayjs-1.8.26" = { name = "dayjs"; packageName = "dayjs"; - version = "1.8.25"; + version = "1.8.26"; src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.25.tgz"; - sha512 = "Pk36juDfQQGDCgr0Lqd1kw15w3OS6xt21JaLPE3lCfsEf8KrERGwDNwvK1tRjrjqFC0uZBJncT4smZQ4F+uV5g=="; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.26.tgz"; + sha512 = "KqtAuIfdNfZR5sJY1Dixr2Is4ZvcCqhb0dZpCOt5dGEFiMzoIbjkTSzUb4QKTCsP+WNpGwUjAFIZrnZvUxxkhw=="; }; }; "de-indent-1.0.2" = { @@ -13100,13 +13208,13 @@ let sha1 = "b2038e846dc33baa5796128d0804b455b8c1e21d"; }; }; - "deasync-0.1.19" = { + "deasync-0.1.20" = { name = "deasync"; packageName = "deasync"; - version = "0.1.19"; + version = "0.1.20"; src = fetchurl { - url = "https://registry.npmjs.org/deasync/-/deasync-0.1.19.tgz"; - sha512 = "oh3MRktfnPlLysCPpBpKZZzb4cUC/p0aA3SyRGp15lN30juJBTo/CiD0d4fR+f1kBtUQoJj1NE9RPNWQ7BQ9Mg=="; + url = "https://registry.npmjs.org/deasync/-/deasync-0.1.20.tgz"; + sha512 = "E1GI7jMI57hL30OX6Ht/hfQU8DO4AuB9m72WFm4c38GNbUD4Q03//XZaOIHZiY+H1xUaomcot5yk2q/qIZQkGQ=="; }; }; "death-1.1.0" = { @@ -13433,13 +13541,13 @@ let sha512 = "yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g=="; }; }; - "deep-equal-2.0.2" = { + "deep-equal-2.0.3" = { name = "deep-equal"; packageName = "deep-equal"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/deep-equal/-/deep-equal-2.0.2.tgz"; - sha512 = "kX0bjV7tdMuhrhzKPEnVwqfQCuf+IEfN+4Xqv4eKd75xGRyn8yzdQ9ujPY6a221rgJKyQC4KBu1PibDTpa6m9w=="; + url = "https://registry.npmjs.org/deep-equal/-/deep-equal-2.0.3.tgz"; + sha512 = "Spqdl4H+ky45I9ByyJtXteOm9CaIrPmnIPmOhrkKGNYWeDgCvJ8jNYVCTjChxW4FqGuZnLHADc8EKRMX6+CgvA=="; }; }; "deep-extend-0.2.11" = { @@ -13469,15 +13577,6 @@ let sha512 = "LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA=="; }; }; - "deep-freeze-node-1.1.3" = { - name = "deep-freeze-node"; - packageName = "deep-freeze-node"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-freeze-node/-/deep-freeze-node-1.1.3.tgz"; - sha512 = "CrA+1BVGfs9ZrGFMYtHfFHncWivh9XPb+6g8bLOzYPJmW8FmUs1dXLjALzU1SMqOMdoD5pQJARXtzxfeLqE9HQ=="; - }; - }; "deep-is-0.1.2" = { name = "deep-is"; packageName = "deep-is"; @@ -13829,13 +13928,13 @@ let sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="; }; }; - "dependency-graph-0.8.1" = { + "dependency-graph-0.9.0" = { name = "dependency-graph"; packageName = "dependency-graph"; - version = "0.8.1"; + version = "0.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.8.1.tgz"; - sha512 = "g213uqF8fyk40W8SBjm079n3CZB4qSpCrA2ye1fLGzH/4HEgB6tzuW2CbLE7leb4t45/6h44Ud59Su1/ROTfqw=="; + url = "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.9.0.tgz"; + sha512 = "9YLIBURXj4DJMFALxXw9K3Y3rwb5Fk0X5/8ipCzaN84+gKxoHK43tVKRNakCQbiEx07E8Uwhuq21BpUagFhZ8w=="; }; }; "dependency-tree-7.2.1" = { @@ -14477,13 +14576,13 @@ let sha512 = "Yiolk/ktLUjThacBuIEqyoRYzDdGrp8rjKjcdZA/hhtIUHrU5iVrS1MIm3p3PWKpnD7va4Jlp/FV0ywP3AdKrg=="; }; }; - "dockerfile-language-service-0.0.11" = { + "dockerfile-language-service-0.0.12" = { name = "dockerfile-language-service"; packageName = "dockerfile-language-service"; - version = "0.0.11"; + version = "0.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.0.11.tgz"; - sha512 = "fTCa36gGPpveIsdNTa5GkvJzL/j78ga8kZ7pnF/OaJiuXKzphDetVVfeamgtXLsviAwIXyUDmofxaVKCT/XWSw=="; + url = "https://registry.npmjs.org/dockerfile-language-service/-/dockerfile-language-service-0.0.12.tgz"; + sha512 = "73ZEQW8LCL/SIWzWekqqLdH41pZ8+N2BYD5K16cBQCQfsZPjFoJC04tv7jlTnEPypJZs3zV0hpBLVTi7zhRFfw=="; }; }; "dockerfile-utils-0.0.11" = { @@ -14666,13 +14765,13 @@ let sha512 = "eKLdI5v9m67kbXQbJSNn1zjh0SDzvzWVWtX+qEI3eMjZw8daH9k8rlj1FZY9memPwjiskQFbe7vHVVJIAqoEhw=="; }; }; - "domino-2.1.4" = { + "domino-2.1.5" = { name = "domino"; packageName = "domino"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/domino/-/domino-2.1.4.tgz"; - sha512 = "l70mlQ7IjPKC8kT7GljQXJZmt5OqFL+RE91ik5y5WWQtsd9wP8R7gpFnNu96fK5MqAAZRXfLLsnzKtkty5fWGQ=="; + url = "https://registry.npmjs.org/domino/-/domino-2.1.5.tgz"; + sha512 = "vMDo7f6ogUV9PkzmxXLiXzJkJZqU09Le4C40mj+HmAGS/2FPmdetoNOQZXpu2kekn0GJKvtwKMAVoruTj60Xww=="; }; }; "domutils-1.4.3" = { @@ -14810,13 +14909,13 @@ let sha512 = "UGGGWfSauusaVJC+8fgV+NVvBXkCTmVv7sk6nojDZZvuOUNGUy0Zk4UpHQD6EDjS0jpBwcACvH4eofvyzBcRDw=="; }; }; - "dotnet-deps-parser-4.9.0" = { + "dotnet-deps-parser-4.10.0" = { name = "dotnet-deps-parser"; packageName = "dotnet-deps-parser"; - version = "4.9.0"; + version = "4.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/dotnet-deps-parser/-/dotnet-deps-parser-4.9.0.tgz"; - sha512 = "V0O+7pI7Ei+iL5Kgy6nYq1UTwzrpqci5K/zf8cXyP5RWBSQBUl/JOE9I67zLUkKiwOdfPhbMQgcRj/yGA+NL1A=="; + url = "https://registry.npmjs.org/dotnet-deps-parser/-/dotnet-deps-parser-4.10.0.tgz"; + sha512 = "dEO1oTvreaDCtcvhRdOmmAMubyC+MWqVr1c/1Wvasi+NW4NZeB67qGh1taqowUFh+aCXtPw3SP2eExn6aNkhwA=="; }; }; "downgrade-root-1.2.2" = { @@ -14891,6 +14990,15 @@ let sha512 = "RyOSTL7B3qzrhCOfhgzxNrcZD1klFOAJcw2YG345AIB4su1KC4WSk6fzRz3xpg1tp/plr5v8aDlvZy+LDtf6uA=="; }; }; + "download-stats-0.3.4" = { + name = "download-stats"; + packageName = "download-stats"; + version = "0.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/download-stats/-/download-stats-0.3.4.tgz"; + sha512 = "ic2BigbyUWx7/CBbsfGjf71zUNZB4edBGC3oRliSzsoNmvyVx3Ycfp1w3vp2Y78Ee0eIIkjIEO5KzW0zThDGaA=="; + }; + }; "draftlog-1.0.12" = { name = "draftlog"; packageName = "draftlog"; @@ -15170,13 +15278,13 @@ let sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="; }; }; - "electron-to-chromium-1.3.415" = { + "electron-to-chromium-1.3.427" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.415"; + version = "1.3.427"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.415.tgz"; - sha512 = "GbtYqKffx3sU8G0HxwXuJFfs58Q7+iwLa5rBwaULwET6jWW8IAQSrVnu7vEfiUIcMVfbYyFg7cw3zdm+EbBJmw=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.427.tgz"; + sha512 = "/rG5G7Opcw68/Yrb4qYkz07h3bESVRJjUl4X/FrKLXzoUJleKm6D7K7rTTz8V5LUWnd+BbTOyxJX2XprRqHD8A=="; }; }; "elegant-spinner-1.0.1" = { @@ -15639,6 +15747,15 @@ let sha512 = "jDgnJaF/Btomk+m3PZDTTCb5XIIIX3zYItnCRfF73zVgvinLoRomuhi75Y4su0PtQxWz4v66XnLLckyvyJTOIQ=="; }; }; + "envinfo-7.5.1" = { + name = "envinfo"; + packageName = "envinfo"; + version = "7.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/envinfo/-/envinfo-7.5.1.tgz"; + sha512 = "hQBkDf2iO4Nv0CNHpCuSBeaSrveU6nThVxFGTrq/eDlV716UQk09zChaJae4mZRsos1x4YLY2TaH3LHUae3ZmQ=="; + }; + }; "epidemic-broadcast-trees-7.0.0" = { name = "epidemic-broadcast-trees"; packageName = "epidemic-broadcast-trees"; @@ -15657,13 +15774,13 @@ let sha1 = "06e0116d3028f6aef4806849eb0ea6a748ae6960"; }; }; - "errlop-2.1.0" = { + "errlop-2.2.0" = { name = "errlop"; packageName = "errlop"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/errlop/-/errlop-2.1.0.tgz"; - sha512 = "sEmQX03aJkWsqTPDYaymq3ROJmKxMHhFS4UN8fWwr5ZiRtw3p61QHRk2QQj68DiaTIXWujJP+uEUS1Zx3spxlw=="; + url = "https://registry.npmjs.org/errlop/-/errlop-2.2.0.tgz"; + sha512 = "e64Qj9+4aZzjzzFpZC7p5kmm/ccCrbLhAJplhsDXQFs87XTsXwOpH4s1Io2s90Tau/8r2j9f4l/thhDevRjzxw=="; }; }; "errno-0.1.7" = { @@ -15801,6 +15918,15 @@ let sha1 = "96edb9f2fdb01995822b263dd8aadab6748181bc"; }; }; + "es6-promise-3.0.2" = { + name = "es6-promise"; + packageName = "es6-promise"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz"; + sha1 = "010d5858423a5f118979665f46486a95c6ee2bb6"; + }; + }; "es6-promise-3.3.1" = { name = "es6-promise"; packageName = "es6-promise"; @@ -15855,6 +15981,15 @@ let sha512 = "jCsk2fpfEFusVv1MDkF4Uf0hAzIKNDMgR6LyOIw6a3jwkN1sCgWzuwgnsHY9YSQ8n8P31HoncvE0LC44cpWTrw=="; }; }; + "es6-promisify-6.1.1" = { + name = "es6-promisify"; + packageName = "es6-promisify"; + version = "6.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-6.1.1.tgz"; + sha512 = "HBL8I3mIki5C1Cc9QjKUenHtnG0A5/xA8Q/AllRcfiwl2CZFXGK7ddBiCoRwAix4i2KxcQfjtIVcrVbB3vbmwg=="; + }; + }; "es6-set-0.1.5" = { name = "es6-set"; packageName = "es6-set"; @@ -17547,13 +17682,13 @@ let sha512 = "0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="; }; }; - "filelist-0.0.6" = { + "filelist-1.0.1" = { name = "filelist"; packageName = "filelist"; - version = "0.0.6"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/filelist/-/filelist-0.0.6.tgz"; - sha1 = "58a641ad1f57574a27fe87a440ef318834b55719"; + url = "https://registry.npmjs.org/filelist/-/filelist-1.0.1.tgz"; + sha512 = "8zSK6Nu0DQIC08mUC46sWGXi+q3GGpKydAG36k+JDba6VRpkevvOWUW5a/PhShij4+vHT9M+ghgG7eM+a9JDUQ=="; }; }; "filename-regex-2.0.1" = { @@ -17889,13 +18024,13 @@ let sha512 = "VoPpKScAzvZ07jtciOY0bJieJwyd/VVCuo4fn3nBLh4iBagzYED7GLQeFBpMpy7HP5edEKTDo8yxaIrYrwb7hg=="; }; }; - "fkill-7.0.0" = { + "fkill-7.0.1" = { name = "fkill"; packageName = "fkill"; - version = "7.0.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/fkill/-/fkill-7.0.0.tgz"; - sha512 = "i61SqvPdfCxl1/VQulh9SXrC+4dudCtINzTHbKaEx3Jr0kD9SvxKDeXzej7Saurnj3al/jMJwQnsUc62VrBMHQ=="; + url = "https://registry.npmjs.org/fkill/-/fkill-7.0.1.tgz"; + sha512 = "rziuWzpWErC2aGQUuvGo9dcVBDeHowK9g75u4fnkTCAqPgvUVRMtlDW6KWsWonxY1tjF+p1mIys33yNvLRlAtw=="; }; }; "flagged-respawn-1.0.1" = { @@ -18384,13 +18519,13 @@ let sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; }; }; - "fp-ts-2.5.3" = { + "fp-ts-2.5.4" = { name = "fp-ts"; packageName = "fp-ts"; - version = "2.5.3"; + version = "2.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.5.3.tgz"; - sha512 = "lQd+hahLd8cygNoXbEHDjH/cbF6XVWlEPb8h5GXXlozjCSDxWgclvkpOoTRfBA0P+r69l9VvW1nEsSGIJRQpWw=="; + url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.5.4.tgz"; + sha512 = "cZlLeEneRYypc2dOzB9h8+bd9mQhJVyt2g0Dny2gKR7uWNgA4EmLSJyguLYsTU44nJSSG9EjurUalEc0wQqeKw=="; }; }; "fraction.js-4.0.12" = { @@ -18690,13 +18825,13 @@ let sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; - "fs2-0.3.7" = { + "fs2-0.3.8" = { name = "fs2"; packageName = "fs2"; - version = "0.3.7"; + version = "0.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/fs2/-/fs2-0.3.7.tgz"; - sha512 = "fwfd9MBI/fnXtR/ClVTyeuPXJ+oI5WNyXvBQPmc4btgqLYTKOuBRTRUVjmVpDUri0C88HLwMlc5ESg48fEAGjw=="; + url = "https://registry.npmjs.org/fs2/-/fs2-0.3.8.tgz"; + sha512 = "HxOTRiFS3PqwAOmlp1mTwLA+xhQBdaP82b5aBamc/rHKFVyn4qL8YpngaAleD52PNMzBm6TsGOoU/Hq+bAfBhA=="; }; }; "fsevents-1.2.12" = { @@ -19708,6 +19843,15 @@ let sha512 = "7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg=="; }; }; + "globby-11.0.0" = { + name = "globby"; + packageName = "globby"; + version = "11.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globby/-/globby-11.0.0.tgz"; + sha512 = "iuehFnR3xu5wBBtm4xi0dMe92Ob87ufyu/dHwpDYfbcpYpIbrO5OnS8M1vWvrBhSGEJ3/Ecj7gnX76P8YxpPEg=="; + }; + }; "globby-4.1.0" = { name = "globby"; packageName = "globby"; @@ -19942,13 +20086,13 @@ let sha512 = "6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="; }; }; - "graceful-fs-4.2.3" = { + "graceful-fs-4.2.4" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.3"; + version = "4.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz"; - sha512 = "a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz"; + sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="; }; }; "graceful-readlink-1.0.1" = { @@ -20068,13 +20212,13 @@ let sha512 = "bOufkkog0cSfHJ9gVD3Wy+KHmkSTHWcFfPaV/NVpIvfJx15gU0/CzuC6lcTjioWmn+UGzYdoqmP7OrJAWT57sw=="; }; }; - "graphql-extensions-0.11.1" = { + "graphql-extensions-0.12.0" = { name = "graphql-extensions"; packageName = "graphql-extensions"; - version = "0.11.1"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.11.1.tgz"; - sha512 = "1bstq6YKaC579PTw9gchw2VlXqjPo3vn8NjRMaUqF2SxyYTjVSgXaCAbaeNa0B7xlLVigxi3DV1zh4A+ss+Lwg=="; + url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.12.0.tgz"; + sha512 = "kBRLtNeknrFl0W/UQQYebj6qnvb1E1RpQ2+C7Y8pwMc6yV8+9pWFx5RP0HzfeEuScCmK93i3H5sdPedoQWwENw=="; }; }; "graphql-import-0.4.5" = { @@ -20653,13 +20797,13 @@ let sha512 = "UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw=="; }; }; - "hash-base-3.0.4" = { + "hash-base-3.1.0" = { name = "hash-base"; packageName = "hash-base"; - version = "3.0.4"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz"; - sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918"; + url = "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz"; + sha512 = "1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA=="; }; }; "hash-sum-2.0.0" = { @@ -23345,13 +23489,13 @@ let sha1 = "207bab91638499c07b2adf240a41a87210034575"; }; }; - "is-promise-2.1.0" = { + "is-promise-2.2.2" = { name = "is-promise"; packageName = "is-promise"; - version = "2.1.0"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz"; - sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; + url = "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz"; + sha512 = "+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="; }; }; "is-property-1.0.2" = { @@ -23732,13 +23876,13 @@ let sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d"; }; }; - "is-wsl-2.1.1" = { + "is-wsl-2.2.0" = { name = "is-wsl"; packageName = "is-wsl"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-wsl/-/is-wsl-2.1.1.tgz"; - sha512 = "umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog=="; + url = "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz"; + sha512 = "fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww=="; }; }; "is-yarn-global-0.3.0" = { @@ -24047,13 +24191,13 @@ let sha1 = "7a549bbd9ffe1585b0cd0a191e203055bee574b4"; }; }; - "jest-haste-map-25.4.0" = { + "jest-haste-map-25.5.1" = { name = "jest-haste-map"; packageName = "jest-haste-map"; - version = "25.4.0"; + version = "25.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.4.0.tgz"; - sha512 = "5EoCe1gXfGC7jmXbKzqxESrgRcaO3SzWXGCnvp9BcT0CFMyrB1Q6LIsjl9RmvmJGQgW297TCfrdgiy574Rl9HQ=="; + url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.5.1.tgz"; + sha512 = "dddgh9UZjV7SCDQUrQ+5t9yy8iEgKc1AKqZR9YDww8xsVOtzPQSMVLDChc21+g29oTRexb9/B0bIlZL+sWmvAQ=="; }; }; "jest-regex-util-25.2.6" = { @@ -24065,31 +24209,31 @@ let sha512 = "KQqf7a0NrtCkYmZZzodPftn7fL1cq3GQAFVMn5Hg8uKx/fIenLEobNanUxb7abQ1sjADHBseG/2FGpsv/wr+Qw=="; }; }; - "jest-serializer-25.2.6" = { + "jest-serializer-25.5.0" = { name = "jest-serializer"; packageName = "jest-serializer"; - version = "25.2.6"; + version = "25.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-serializer/-/jest-serializer-25.2.6.tgz"; - sha512 = "RMVCfZsezQS2Ww4kB5HJTMaMJ0asmC0BHlnobQC6yEtxiFKIxohFA4QSXSabKwSggaNkqxn6Z2VwdFCjhUWuiQ=="; + url = "https://registry.npmjs.org/jest-serializer/-/jest-serializer-25.5.0.tgz"; + sha512 = "LxD8fY1lByomEPflwur9o4e2a5twSQ7TaVNLlFUuToIdoJuBt8tzHfCsZ42Ok6LkKXWzFWf3AGmheuLAA7LcCA=="; }; }; - "jest-util-25.4.0" = { + "jest-util-25.5.0" = { name = "jest-util"; packageName = "jest-util"; - version = "25.4.0"; + version = "25.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-util/-/jest-util-25.4.0.tgz"; - sha512 = "WSZD59sBtAUjLv1hMeKbNZXmMcrLRWcYqpO8Dz8b4CeCTZpfNQw2q9uwrYAD+BbJoLJlu4ezVPwtAmM/9/SlZA=="; + url = "https://registry.npmjs.org/jest-util/-/jest-util-25.5.0.tgz"; + sha512 = "KVlX+WWg1zUTB9ktvhsg2PXZVdkI1NBevOJSkTKYAyXyH4QSvh+Lay/e/v+bmaFfrkfx43xD8QTfgobzlEXdIA=="; }; }; - "jest-worker-25.4.0" = { + "jest-worker-25.5.0" = { name = "jest-worker"; packageName = "jest-worker"; - version = "25.4.0"; + version = "25.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-25.4.0.tgz"; - sha512 = "ghAs/1FtfYpMmYQ0AHqxV62XPvKdUDIBBApMZfly+E9JEmYh2K45G0R5dWxx986RN12pRCxsViwQVtGl+N4whw=="; + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-25.5.0.tgz"; + sha512 = "/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw=="; }; }; "jetpack-id-1.0.0" = { @@ -24326,13 +24470,13 @@ let sha1 = "b01307cb29b618a1ed26ec79e911f803c4da0040"; }; }; - "jscodeshift-0.7.0" = { + "jscodeshift-0.7.1" = { name = "jscodeshift"; packageName = "jscodeshift"; - version = "0.7.0"; + version = "0.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.7.0.tgz"; - sha512 = "Kt6rpTa1HVhAWagD6J0y6qxxqRmDgkFvczerLgOsDNSGoUZSmq2CO1vFRcda9OV1BaZKSHCIh+VREPts5tB/Ig=="; + url = "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.7.1.tgz"; + sha512 = "YMkZSyoc8zg5woZL23cmWlnFLPH/mHilonGA7Qbzs7H6M4v4PH0Qsn4jeDyw+CHhVoAnm9UxQyB0Yw1OT+mktA=="; }; }; "jsdom-11.12.0" = { @@ -24659,15 +24803,6 @@ let sha512 = "KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA=="; }; }; - "jsonata-1.8.2" = { - name = "jsonata"; - packageName = "jsonata"; - version = "1.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonata/-/jsonata-1.8.2.tgz"; - sha512 = "ma5F/Bs47dZfJfDZ0Dt37eIbzVBVKZIDqsZSqdCCAPNHxKn+s3+CfMA6ahVVlf8Y1hyIjXkVLFU7yv4XxRfihA=="; - }; - }; "jsonata-1.8.3" = { name = "jsonata"; packageName = "jsonata"; @@ -24875,23 +25010,22 @@ let sha1 = "b88f3a7b2e67a2a048152982c7a3756d9c4828f0"; }; }; - "jszip-3.4.0" = { + "jszip-3.1.5" = { name = "jszip"; packageName = "jszip"; - version = "3.4.0"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/jszip/-/jszip-3.4.0.tgz"; - sha512 = "gZAOYuPl4EhPTXT0GjhI3o+ZAz3su6EhLrKUoAivcKqyqC7laS5JEv4XWZND9BgcDcF83vI85yGbDmDR6UhrIg=="; + url = "https://registry.npmjs.org/jszip/-/jszip-3.1.5.tgz"; + sha512 = "5W8NUaFRFRqTOL7ZDDrx5qWHJyBXy6velVudIzQUSoqAAYqzSh2Z7/m0Rf1QbmQJccegD0r+YZxBjzqoBiEeJQ=="; }; }; - "jszip-git://github.com/anmonteiro/jszip#patch-1" = { + "jszip-3.4.0" = { name = "jszip"; packageName = "jszip"; - version = "2.6.1"; - src = fetchgit { - url = "git://github.com/anmonteiro/jszip"; - rev = "5a92e8c9153a3557daa8d3540b00c50bd8554c49"; - sha256 = "00016993634d04b6f7eea8fae529b804d5a0b7ed2636361c7546a48b866e9c5c"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jszip/-/jszip-3.4.0.tgz"; + sha512 = "gZAOYuPl4EhPTXT0GjhI3o+ZAz3su6EhLrKUoAivcKqyqC7laS5JEv4XWZND9BgcDcF83vI85yGbDmDR6UhrIg=="; }; }; "junk-3.1.0" = { @@ -25390,6 +25524,15 @@ let sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; }; }; + "lazy-cache-2.0.2" = { + name = "lazy-cache"; + packageName = "lazy-cache"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-2.0.2.tgz"; + sha1 = "b9190a4f913354694840859f8a8f7084d8822264"; + }; + }; "lazyness-1.1.1" = { name = "lazyness"; packageName = "lazyness"; @@ -25741,6 +25884,15 @@ let sha1 = "86652b0009a6d84ea79a5320bdca5f00612ee439"; }; }; + "lie-3.1.1" = { + name = "lie"; + packageName = "lie"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz"; + sha1 = "9a436b2cc7746ca59de7a41fa469b3efb76bd87e"; + }; + }; "lie-3.3.0" = { name = "lie"; packageName = "lie"; @@ -27685,13 +27837,13 @@ let sha512 = "07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag=="; }; }; - "make-fetch-happen-8.0.4" = { + "make-fetch-happen-8.0.6" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; - version = "8.0.4"; + version = "8.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.4.tgz"; - sha512 = "hIFoqGq1db0QMiy/Atr/pI1Rs4rDV+ZdGSey2SQyF3KK3u1z4aj9mS5UdNnZkdQpA+H3pGn0J3KlEwsi2x4EqA=="; + url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-8.0.6.tgz"; + sha512 = "QJ4pB5VBY9H9e+3t/o+fPjsVUlPULpAllxuKertRo/7ii47TfxeEEnneM6NCmhyn4MQPTYL+M+RkiU9bR+hAfg=="; }; }; "make-iterator-1.0.1" = { @@ -28045,13 +28197,13 @@ let sha512 = "EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw=="; }; }; - "marked-terminal-4.0.0" = { + "marked-terminal-4.1.0" = { name = "marked-terminal"; packageName = "marked-terminal"; - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/marked-terminal/-/marked-terminal-4.0.0.tgz"; - sha512 = "mzU3VD7aVz12FfGoKFAceijehA6Ocjfg3rVimvJbFAB/NOYCsuzRVtq3PSFdPmWI5mhdGeEh3/aMJ5DSxAz94Q=="; + url = "https://registry.npmjs.org/marked-terminal/-/marked-terminal-4.1.0.tgz"; + sha512 = "5KllfAOW02WS6hLRQ7cNvGOxvKW1BKuXELH4EtbWfyWgxQhROoMxEvuQ/3fTgkNjledR0J48F4HbapvYp1zWkQ=="; }; }; "marky-1.2.1" = { @@ -28495,13 +28647,13 @@ let sha512 = "CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig=="; }; }; - "meow-6.1.0" = { + "meow-6.1.1" = { name = "meow"; packageName = "meow"; - version = "6.1.0"; + version = "6.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-6.1.0.tgz"; - sha512 = "iIAoeI01v6pmSfObAAWFoITAA4GgiT45m4SmJgoxtZfvI0fyZwhV4d0lTwiUXvAKIPlma05Feb2Xngl52Mj5Cg=="; + url = "https://registry.npmjs.org/meow/-/meow-6.1.1.tgz"; + sha512 = "3YffViIt2QWgTy6Pale5QpopX/IvU3LPL03jOTqp6pGj3VjesdO/U8CuHMKpnQr4shCNCM5fd5XFFvIIl6JBHg=="; }; }; "merge-1.2.1" = { @@ -28756,6 +28908,15 @@ let sha512 = "LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA=="; }; }; + "mime-2.4.5" = { + name = "mime"; + packageName = "mime"; + version = "2.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-2.4.5.tgz"; + sha512 = "3hQhEUF027BuxZjQA3s7rIv/7VCQPa27hN9u9g87sEkWaKwQPuXOkVKtOeiyUrnWqTDiOs8Ed2rwg733mB0R5w=="; + }; + }; "mime-db-1.12.0" = { name = "mime-db"; packageName = "mime-db"; @@ -28819,6 +28980,15 @@ let sha512 = "01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ=="; }; }; + "mime-types-2.1.27" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.27"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz"; + sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w=="; + }; + }; "mimic-fn-1.2.0" = { name = "mimic-fn"; packageName = "mimic-fn"; @@ -29125,13 +29295,13 @@ let sha1 = "f98ee7b5fffd3f4dadc5733827db0aa57f861880"; }; }; - "mirror-folder-3.0.1" = { + "mirror-folder-3.1.0" = { name = "mirror-folder"; packageName = "mirror-folder"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-3.0.1.tgz"; - sha512 = "AWYvbeZbHljMuu+49wgCdLGVOekNh/vpIsIMkFZYcRAJCY9vH7+vHM/aEIY3mrbbrBkHyBDnbmoOWUTbHN4A8g=="; + url = "https://registry.npmjs.org/mirror-folder/-/mirror-folder-3.1.0.tgz"; + sha512 = "OI7i/f1OjPWyloZi8kEZFSe50V9gMdMsCOzeS6DZ8OgpJP9bCDXDJRiDWYEfYNF2sCY7TBZBbLfKuEo3vohJhw=="; }; }; "mississippi-3.0.0" = { @@ -29188,15 +29358,6 @@ let sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; }; }; - "mkdirp-0.5.3" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz"; - sha512 = "P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg=="; - }; - }; "mkdirp-0.5.5" = { name = "mkdirp"; packageName = "mkdirp"; @@ -29224,13 +29385,13 @@ let sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; }; }; - "mkdirp-classic-0.5.2" = { + "mkdirp-classic-0.5.3" = { name = "mkdirp-classic"; packageName = "mkdirp-classic"; - version = "0.5.2"; + version = "0.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.2.tgz"; - sha512 = "ejdnDQcR75gwknmMw/tx02AuRs8jCtqFoFqDZMjiNxsu85sRIJVXDKHuLYvUUPRBUtV2FpSZa9bL1BUa3BdR2g=="; + url = "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz"; + sha512 = "gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="; }; }; "mkdirp-promise-5.0.1" = { @@ -29341,6 +29502,15 @@ let sha512 = "bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="; }; }; + "moment-2.25.3" = { + name = "moment"; + packageName = "moment"; + version = "2.25.3"; + src = fetchurl { + url = "https://registry.npmjs.org/moment/-/moment-2.25.3.tgz"; + sha512 = "PuYv0PHxZvzc15Sp8ybUCoQ+xpyPWvjOuK72a5ovzp2LI32rJXOiIfyoFoYvG3s6EwwrdkMyWuRiEHSZRLJNdg=="; + }; + }; "moment-2.7.0" = { name = "moment"; packageName = "moment"; @@ -29413,6 +29583,15 @@ let sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; }; }; + "move-file-2.0.0" = { + name = "move-file"; + packageName = "move-file"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/move-file/-/move-file-2.0.0.tgz"; + sha512 = "cdkdhNCgbP5dvS4tlGxZbD+nloio9GIimP57EjqFhwLcMjnU+XJKAZzlmg/TN/AK1LuNAdTSvm3CPPP4Xkv0iQ=="; + }; + }; "mp4-box-encoding-1.4.1" = { name = "mp4-box-encoding"; packageName = "mp4-box-encoding"; @@ -29800,13 +29979,13 @@ let sha512 = "nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="; }; }; - "mutexify-1.2.0" = { + "mutexify-1.3.0" = { name = "mutexify"; packageName = "mutexify"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/mutexify/-/mutexify-1.2.0.tgz"; - sha512 = "oprzxd2zhfrJqEuB98qc1dRMMonClBQ57UPDjnbcrah4orEMTq1jq3+AcdFe5ePzdbJXI7zmdhfftIdMnhYFoQ=="; + url = "https://registry.npmjs.org/mutexify/-/mutexify-1.3.0.tgz"; + sha512 = "WNPlgZ3AHETGSa4jeRP4aW6BPQ/a++MwoMFFIgrDg80+m70mbxuNOrevANfBDmur82zxTFAY3OwvMAvqrkV2sA=="; }; }; "muxrpc-6.5.0" = { @@ -30200,13 +30379,13 @@ let sha1 = "ae603b36b134bcec347b452422b0bf98d5832ec8"; }; }; - "nearley-2.19.2" = { + "nearley-2.19.3" = { name = "nearley"; packageName = "nearley"; - version = "2.19.2"; + version = "2.19.3"; src = fetchurl { - url = "https://registry.npmjs.org/nearley/-/nearley-2.19.2.tgz"; - sha512 = "h6lygT0BWAGErDvoE2LfI+tDeY2+UUrqG5dcBPdCmjnjud9z1wE0P7ljb85iNbE93YA+xJLpoSYGMuUqhnSSSA=="; + url = "https://registry.npmjs.org/nearley/-/nearley-2.19.3.tgz"; + sha512 = "FpAy1PmTsUpOtgxr23g4jRNvJHYzZEW2PixXeSzksLR/ykPfwKhAodc2+9wQhY+JneWLcvkDw6q7FJIsIdF/aQ=="; }; }; "neat-csv-2.1.0" = { @@ -30706,6 +30885,15 @@ let sha512 = "OUTryc5bt/P8zVgNUmC6xdXiDJxLMAW8cF5tLQOT9E5sOQj+UeQxnnPy74K3CLCa/SOjjBlbuzDLR8ANwA+wmw=="; }; }; + "node-gyp-6.1.0" = { + name = "node-gyp"; + packageName = "node-gyp"; + version = "6.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-6.1.0.tgz"; + sha512 = "h4A2zDlOujeeaaTx06r4Vy+8MZ1679lU+wbCKDS4ZtvY2A37DESo37oejIw0mtmR3+rvNwts5B6Kpt1KrNYdNw=="; + }; + }; "node-gyp-build-3.7.0" = { name = "node-gyp-build"; packageName = "node-gyp-build"; @@ -30733,13 +30921,13 @@ let sha512 = "dSq1xmcPDKPZ2EED2S6zw/b9NKsqzXRE6dVr8TVQnI3FJOTteUMuqF3Qqs6LZg+mLGYJWqQzMbIjMtJqTv87nQ=="; }; }; - "node-gyp-build-4.2.1" = { + "node-gyp-build-4.2.2" = { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.1.tgz"; - sha512 = "XyCKXsqZfLqHep1hhsMncoXuUNt/cXCjg1+8CLbu69V1TKuPiOeSGbL9n+k/ByKH8UT0p4rdIX8XkTRZV0i7Sw=="; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.2.tgz"; + sha512 = "Lqh7mrByWCM8Cf9UPqpeoVBBo5Ugx+RKu885GAzmLBVYjeywScxHXPGLa4JfYNZmcNGwzR0Glu5/9GaQZMFqyA=="; }; }; "node-int64-0.4.0" = { @@ -31183,6 +31371,15 @@ let sha1 = "df7c3ed5a277c3f9d4b5d819b05311d10a200ae6"; }; }; + "npm-api-1.0.0" = { + name = "npm-api"; + packageName = "npm-api"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-api/-/npm-api-1.0.0.tgz"; + sha512 = "gtJhIhGq07g9H5sIAB9TZzTySW8MYtcYqg+e+J+5q1GmDsDLLVfyvVBL1VklzjtRsElph11GUtLBS191RDOJxQ=="; + }; + }; "npm-bundled-1.1.1" = { name = "npm-bundled"; packageName = "npm-bundled"; @@ -31390,22 +31587,22 @@ let sha512 = "Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg=="; }; }; - "npm-registry-fetch-4.0.3" = { + "npm-registry-fetch-4.0.4" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; - version = "4.0.3"; + version = "4.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.3.tgz"; - sha512 = "WGvUx0lkKFhu9MbiGFuT9nG2NpfQ+4dCJwRwwtK2HK5izJEvwDxMeUyqbuMS7N/OkpVCqDorV6rO5E4V9F8lJw=="; + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.4.tgz"; + sha512 = "6jb34hX/iYNQebqWUHtU8YF6Cjb1H6ouTFPClYsyiW6lpFkljTpdeftm53rRojtja1rKAvKNIIiTS5Sjpw4wsA=="; }; }; - "npm-registry-fetch-8.0.0" = { + "npm-registry-fetch-8.0.2" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; - version = "8.0.0"; + version = "8.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-8.0.0.tgz"; - sha512 = "975WwLvZjX97y9UWWQ8nAyr7bw02s9xKPHqvEm5T900LQsB1HXb8Gb9ebYtCBLSX+K8gSOrO5KS/9yV/naLZmQ=="; + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-8.0.2.tgz"; + sha512 = "/UteT/LQ+0eegPh96w2sVjpAJk2kuphWASp1SPBFBWtSyuPoUW5gf4utzQm5A5FLrZF3eZJGH59j4X6KBUa40g=="; }; }; "npm-run-4.1.2" = { @@ -32714,13 +32911,13 @@ let sha512 = "3cRXXn3/O0o3+eVmUroJPSj/esxoEFIm0ZOno/T+NzG/VZgPOqQ8WKmlNqubSEpZmCIngEy34unkHGg83ZIBmg=="; }; }; - "p-queue-6.3.0" = { + "p-queue-6.4.0" = { name = "p-queue"; packageName = "p-queue"; - version = "6.3.0"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-queue/-/p-queue-6.3.0.tgz"; - sha512 = "fg5dJlFpd5+3CgG3/0ogpVZUeJbjiyXFg0nu53hrOYsybqSiDyxyOpad0Rm6tAiGjgztAwkyvhlYHC53OiAJOA=="; + url = "https://registry.npmjs.org/p-queue/-/p-queue-6.4.0.tgz"; + sha512 = "X7ddxxiQ+bLR/CUt3/BVKrGcJDNxBr0pEEFKHHB6vTPWNUhgDv36GpIH18RmGM3YGPpBT+JWGjDDqsVGuF0ERw=="; }; }; "p-reduce-1.0.0" = { @@ -32876,13 +33073,13 @@ let sha1 = "79b302fc144cdfbb4ab6feba7040e6a5d99c79c7"; }; }; - "pacote-11.1.4" = { + "pacote-11.1.8" = { name = "pacote"; packageName = "pacote"; - version = "11.1.4"; + version = "11.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-11.1.4.tgz"; - sha512 = "eUGJvSSpWFZKn3z8gig/HgnBmUl6gIWByIIaHzSyEr3tOWX0w8tFEADXtpu8HGv5E0ShCeTP6enRq8iHKCHSvw=="; + url = "https://registry.npmjs.org/pacote/-/pacote-11.1.8.tgz"; + sha512 = "oBXbdsqA0pnk4lNmWDHMm20uSbZiYCjE0MHeSFG3esxw1mubhSJizVc1rKVI0KMkYTMz4M7OTEqY1h2lx+wbPw=="; }; }; "pacote-9.5.12" = { @@ -32912,6 +33109,15 @@ let sha1 = "ad1f22ce1bf0fdc0d6ddd908af17f351a404b8ac"; }; }; + "paged-request-2.0.1" = { + name = "paged-request"; + packageName = "paged-request"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/paged-request/-/paged-request-2.0.1.tgz"; + sha512 = "C0bB/PFk9rQskD1YEiz7uuchzqKDQGgdsEHN1ahify0UUWzgmMK4NDG9fhlQg2waogmNFwEvEeHfMRvJySpdVw=="; + }; + }; "pako-0.2.9" = { name = "pako"; packageName = "pako"; @@ -34226,13 +34432,13 @@ let sha1 = "11d1e12b9cb64d63e30c143a330f4c1f567da85f"; }; }; - "portfinder-1.0.25" = { + "portfinder-1.0.26" = { name = "portfinder"; packageName = "portfinder"; - version = "1.0.25"; + version = "1.0.26"; src = fetchurl { - url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.25.tgz"; - sha512 = "6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg=="; + url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.26.tgz"; + sha512 = "Xi7mKxJHHMI3rIUrnm/jjUgwhbYMkp/XKEcZX3aG4BrumLpq3nmoQMX+ClYnDZnZ/New7IatC1no5RX0zo1vXQ=="; }; }; "posix-character-classes-0.1.1" = { @@ -34290,6 +34496,15 @@ let sha512 = "WuQETPMcW9Uf1/22HWUWP9lgsIC+KEHg2kozMflKjbeUtw9ujvFX6QmIfozaErDkmLWS9WEnEdEe6Uo9/BNTdQ=="; }; }; + "postcss-7.0.29" = { + name = "postcss"; + packageName = "postcss"; + version = "7.0.29"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-7.0.29.tgz"; + sha512 = "ba0ApvR3LxGvRMMiUa9n0WR4HjzcYm7tS+ht4/2Nd0NLtHpPIH77fuB9Xh1/yJVz9O/E/95Y/dn8ygWsyffXtw=="; + }; + }; "postcss-calc-7.0.2" = { name = "postcss-calc"; packageName = "postcss-calc"; @@ -34758,13 +34973,13 @@ let sha512 = "pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="; }; }; - "postcss-value-parser-4.0.3" = { + "postcss-value-parser-4.1.0" = { name = "postcss-value-parser"; packageName = "postcss-value-parser"; - version = "4.0.3"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz"; - sha512 = "N7h4pG+Nnu5BEIzyeaaIYWs0LI5XC40OrRh5L60z0QjFsqGWcHcbkBvpe1WYpcIS9yQ8sOi/vIPt1ejQCrMVrg=="; + url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz"; + sha512 = "97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="; }; }; "postcss-values-parser-1.5.0" = { @@ -35343,13 +35558,13 @@ let sha1 = "0ee97a7fc020b1a2a55b8659eda4aa8d869094bd"; }; }; - "property-information-5.4.0" = { + "property-information-5.5.0" = { name = "property-information"; packageName = "property-information"; - version = "5.4.0"; + version = "5.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/property-information/-/property-information-5.4.0.tgz"; - sha512 = "nmMWAm/3vKFGmmOWOcdLjgq/Hlxa+hsuR/px1Lp/UGEyc5A22A6l78Shc2C0E71sPmAqglni+HrS7L7VJ7AUCA=="; + url = "https://registry.npmjs.org/property-information/-/property-information-5.5.0.tgz"; + sha512 = "RgEbCx2HLa1chNgvChcx+rrCWD0ctBmGSE0M7lVm1yyv4UbvbrWoXp/BkVLZefzjrRBGW8/Js6uh/BnlHXFyjA=="; }; }; "proto-list-1.2.4" = { @@ -36432,13 +36647,13 @@ let sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; }; }; - "qs-6.9.3" = { + "qs-6.9.4" = { name = "qs"; packageName = "qs"; - version = "6.9.3"; + version = "6.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.9.3.tgz"; - sha512 = "EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw=="; + url = "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz"; + sha512 = "A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ=="; }; }; "query-string-1.0.1" = { @@ -37152,13 +37367,13 @@ let sha512 = "crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ=="; }; }; - "readdirp-3.3.0" = { + "readdirp-3.4.0" = { name = "readdirp"; packageName = "readdirp"; - version = "3.3.0"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/readdirp/-/readdirp-3.3.0.tgz"; - sha512 = "zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ=="; + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.4.0.tgz"; + sha512 = "0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ=="; }; }; "readline2-0.1.1" = { @@ -37206,13 +37421,13 @@ let sha512 = "XNvYvkfdAN9QewbrxeTOjgINkdY/odTgTS56ZNEWL9Ml0weT4T3sFtvnTuF+Gxyu46ANcRm1ntrF6F5LAJPAaQ=="; }; }; - "recast-0.19.0" = { + "recast-0.19.1" = { name = "recast"; packageName = "recast"; - version = "0.19.0"; + version = "0.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/recast/-/recast-0.19.0.tgz"; - sha512 = "HymYANYaUFpKoAkOZ2od16SB7A/BwCZbvYIs9Rc8K+wNThQctiCJ0AjLkPbo9eWdy3w5Eemk6I4MeEYbH12PBg=="; + url = "https://registry.npmjs.org/recast/-/recast-0.19.1.tgz"; + sha512 = "8FCjrBxjeEU2O6I+2hyHyBFH1siJbMBLwIRvVr1T3FD2cL754sOaJDsJ/8h3xYltasbJ8jqWRIhMuDGBSiSbjw=="; }; }; "rechoir-0.6.2" = { @@ -37791,6 +38006,15 @@ let sha1 = "de63128373fcbf7c3ccfa4de5a480c45a67958eb"; }; }; + "replace-ext-1.0.1" = { + name = "replace-ext"; + packageName = "replace-ext"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz"; + sha512 = "yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw=="; + }; + }; "replace-homedir-1.0.0" = { name = "replace-homedir"; packageName = "replace-homedir"; @@ -38520,13 +38744,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.7.2" = { + "rollup-2.7.6" = { name = "rollup"; packageName = "rollup"; - version = "2.7.2"; + version = "2.7.6"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.7.2.tgz"; - sha512 = "SdtTZVMMVSPe7SNv4exUyPXARe5v/p3TeeG3LRA5WabLPJt4Usi3wVrvVlyAUTG40JJmqS6zbIHt2vWTss2prw=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.7.6.tgz"; + sha512 = "AdHosxHBKyBsdtbT1/AqbWNQ87O4SSxS4N9iMwEpoCDAT6e4Du3uJSy83mp3ckgmCxly5VeXGx0WHsm21Djytg=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -38664,13 +38888,13 @@ let sha1 = "c8ad4a5e110661e402a7d21b530e009f25f8e389"; }; }; - "run-async-2.4.0" = { + "run-async-2.4.1" = { name = "run-async"; packageName = "run-async"; - version = "2.4.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/run-async/-/run-async-2.4.0.tgz"; - sha512 = "xJTbh/d7Lm7SBhc1tNvTpeCHaEzoyxPrqNlvSdMfBTYwaY++UJFyXUOxAtsRUXjlqOfj8luNaR9vjCh4KeV+pg=="; + url = "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz"; + sha512 = "tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="; }; }; "run-in-dir-0.3.0" = { @@ -39555,6 +39779,15 @@ let sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; }; }; + "set-getter-0.1.0" = { + name = "set-getter"; + packageName = "set-getter"; + version = "0.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/set-getter/-/set-getter-0.1.0.tgz"; + sha1 = "d769c182c9d5a51f409145f2fba82e5e86e80376"; + }; + }; "set-immediate-shim-1.0.1" = { name = "set-immediate-shim"; packageName = "set-immediate-shim"; @@ -39753,13 +39986,13 @@ let sha1 = "decbcf874b0d1e5fb72e14b164a9683048e9acb3"; }; }; - "shelljs-0.8.3" = { + "shelljs-0.8.4" = { name = "shelljs"; packageName = "shelljs"; - version = "0.8.3"; + version = "0.8.4"; src = fetchurl { - url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.3.tgz"; - sha512 = "fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A=="; + url = "https://registry.npmjs.org/shelljs/-/shelljs-0.8.4.tgz"; + sha512 = "7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ=="; }; }; "shellsubstitute-1.2.0" = { @@ -40248,31 +40481,22 @@ let sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; }; }; - "snyk-config-2.2.3" = { - name = "snyk-config"; - packageName = "snyk-config"; - version = "2.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/snyk-config/-/snyk-config-2.2.3.tgz"; - sha512 = "9NjxHVMd1U1LFw66Lya4LXgrsFUiuRiL4opxfTFo0LmMNzUoU5Bk/p0zDdg3FE5Wg61r4fP2D8w+QTl6M8CGiw=="; - }; - }; - "snyk-config-3.0.0" = { + "snyk-config-3.1.0" = { name = "snyk-config"; packageName = "snyk-config"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-config/-/snyk-config-3.0.0.tgz"; - sha512 = "sXjd7gUqPTmgkhtLowFkFU5J4xyS7tDIRUbHmpW/dvTjgmiH0ujobJzSdaim4W6pbiIf4snkGJsvHM3/wmdR5w=="; + url = "https://registry.npmjs.org/snyk-config/-/snyk-config-3.1.0.tgz"; + sha512 = "3UlyogA67/9WOssJ7s4d7gqWQRWyO/LbgdBBNMhhmFDKa7eTUSW+A782CVHgyDSJZ2kNANcMWwMiOL+h3p6zQg=="; }; }; - "snyk-docker-plugin-2.6.1" = { + "snyk-docker-plugin-3.1.0" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "2.6.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-2.6.1.tgz"; - sha512 = "v3LIPILRL5faZ+qiIhF9on0rAxuFaQku3UwaiGumoTrfXywLkv7x8PJgdMnrsWUxDwB8EZFc1k2qvI6V6rTF5g=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-3.1.0.tgz"; + sha512 = "ggGTiiCuwLYGdlGW/UBuUXJ7omliH0EnbpLfdlTBoRKvmvgoUo1l4Menk18R1ZVXgcXTwwGK9jmuUpPH+X0VNw=="; }; }; "snyk-go-parser-1.4.0" = { @@ -40284,13 +40508,13 @@ let sha512 = "zcLA8u/WreycCjFKBblYfxszg7Fmnemuu9Ug/CE/jqF0yBXsI5DCWMteUvFkoa8DRntfGTlgf98TRl2aTSc2MQ=="; }; }; - "snyk-go-plugin-1.13.0" = { + "snyk-go-plugin-1.14.0" = { name = "snyk-go-plugin"; packageName = "snyk-go-plugin"; - version = "1.13.0"; + version = "1.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.13.0.tgz"; - sha512 = "6lN9S8uO6LE1Y6ZJMZm3EZ8kvvI/vZh8r+JJGAPfVO2C265xymEpFBJ4Nn2or0Q0LlqZ8W8lWi1HUMXXid6k+w=="; + url = "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.14.0.tgz"; + sha512 = "9L+76De8F6yXWb+O3DA8QUi7+eDF2mOzCOveEPUJGkqWIDmurIiFcVxHJoj0EStjcxb3dX367KKlDlfFx+HiyA=="; }; }; "snyk-gradle-plugin-3.2.5" = { @@ -40311,49 +40535,49 @@ let sha512 = "A+CCyBSa4IKok5uEhqT+hV/35RO6APFNLqk9DRRHg7xW2/j//nPX8wTSZUPF8QeRNEk/sX+6df7M1y6PBHGSHA=="; }; }; - "snyk-mvn-plugin-2.10.0" = { + "snyk-mvn-plugin-2.15.0" = { name = "snyk-mvn-plugin"; packageName = "snyk-mvn-plugin"; - version = "2.10.0"; + version = "2.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.10.0.tgz"; - sha512 = "npslocHJXUbdFxehMPQ8w4oX6bB6J6vHTWNRDF7u2+pIhVumQe1QOvZGjwh3up+vOCoKiEprO7gdt7vC8im1Vg=="; + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.15.0.tgz"; + sha512 = "24HWz27Hc5sw+iHtxtQFy0kltjyFZXJ3vfsPA0TTZAL0tOJXInIuZpWD6njC0Y3/sn9CH5kS2KM8GAM7FyKVig=="; }; }; - "snyk-nodejs-lockfile-parser-1.18.0" = { + "snyk-nodejs-lockfile-parser-1.22.0" = { name = "snyk-nodejs-lockfile-parser"; packageName = "snyk-nodejs-lockfile-parser"; - version = "1.18.0"; + version = "1.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.18.0.tgz"; - sha512 = "QGb6HBtnqefbVtrDyUqA3vXGo2DZJAlDxrsgIpKxFalhxmxmWQE3Fxx44V3aRq9H8iZ1eXb7s/drTsa/s9qGJQ=="; + url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.22.0.tgz"; + sha512 = "l6jLoJxqcIIkQopSdQuAstXdMw5AIgLu+uGc5CYpHyw8fYqOwna8rawwofNeGuwJAAv4nEiNiexeYaR88OCq6Q=="; }; }; - "snyk-nuget-plugin-1.16.0" = { + "snyk-nuget-plugin-1.17.0" = { name = "snyk-nuget-plugin"; packageName = "snyk-nuget-plugin"; - version = "1.16.0"; + version = "1.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.16.0.tgz"; - sha512 = "OEusK3JKKpR4Yto5KwuqjQGgb9wAhmDqBWSQomWdtKQVFrzn5B6BMzOFikUzmeMTnUGGON7gurQBLXeZZLhRqg=="; + url = "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.17.0.tgz"; + sha512 = "t7iZ87LBhCK6P2/mJsQh7Dmk3J9zd+IHL4yoSK95Iyk/gP8r++DZijoRHEXy8BlS+eOtSAj1vgCYvv2eAmG28w=="; }; }; - "snyk-paket-parser-1.5.0" = { + "snyk-paket-parser-1.6.0" = { name = "snyk-paket-parser"; packageName = "snyk-paket-parser"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-paket-parser/-/snyk-paket-parser-1.5.0.tgz"; - sha512 = "1CYMPChJ9D9LBy3NLqHyv8TY7pR/LMISSr08LhfFw/FpfRZ+gTH8W6bbxCmybAYrOFNCqZkRprqOYDqZQFHipA=="; + url = "https://registry.npmjs.org/snyk-paket-parser/-/snyk-paket-parser-1.6.0.tgz"; + sha512 = "6htFynjBe/nakclEHUZ1A3j5Eu32/0pNve5Qm4MFn3YQmJgj7UcAO8hdyK3QfzEY29/kAv/rkJQg+SKshn+N9Q=="; }; }; - "snyk-php-plugin-1.7.0" = { + "snyk-php-plugin-1.9.0" = { name = "snyk-php-plugin"; packageName = "snyk-php-plugin"; - version = "1.7.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.7.0.tgz"; - sha512 = "mDe90xkqSEVrpx1ZC7ItqCOc6fZCySbE+pHVI+dAPUmf1C1LSWZrZVmAVeo/Dw9sJzJfzmcdAFQl+jZP8/uV0A=="; + url = "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.9.0.tgz"; + sha512 = "uORrEoC47dw0ITZYu5vKqQtmXnbbQs+ZkWeo5bRHGdf10W8e4rNr1S1R4bReiLrSbSisYhVHeFMkdOAiLIPJVQ=="; }; }; "snyk-policy-1.13.5" = { @@ -40851,13 +41075,13 @@ let sha512 = "efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ=="; }; }; - "source-map-support-0.5.18" = { + "source-map-support-0.5.19" = { name = "source-map-support"; packageName = "source-map-support"; - version = "0.5.18"; + version = "0.5.19"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.18.tgz"; - sha512 = "9luZr/BZ2QeU6tO2uG8N2aZpVSli4TSAOAqFOyTO51AJcD9P99c0K1h6dD6r6qo5dyT44BR5exweOaLLeldTkQ=="; + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz"; + sha512 = "Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw=="; }; }; "source-map-url-0.4.0" = { @@ -41211,6 +41435,15 @@ let sha512 = "CvT5XY+MWnn0HkbwVKJAyWEMfzpAPwnTiB3TobA5Mri44SrTovmmh499NPQP+gatkeOipqPlBLel7rn4E/PCQg=="; }; }; + "sqlite3-4.2.0" = { + name = "sqlite3"; + packageName = "sqlite3"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sqlite3/-/sqlite3-4.2.0.tgz"; + sha512 = "roEOz41hxui2Q7uYnWsjMOTry6TcNUNmp8audCx18gF10P2NknwdpF+E+HKvz/F2NvPKGGBF4NGc+ZPQ+AABwg=="; + }; + }; "srt2vtt-1.3.1" = { name = "srt2vtt"; packageName = "srt2vtt"; @@ -43155,13 +43388,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-4.23.5" = { + "systeminformation-4.24.1" = { name = "systeminformation"; packageName = "systeminformation"; - version = "4.23.5"; + version = "4.24.1"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.23.5.tgz"; - sha512 = "Zxd1wxN8KigQsDhZupVNAyHnkl+ombejuLpNhJ+LNezMxTLn7nBx9HNAIWUJnhAnSS0ZElQLQ1muqgnwbhgOHg=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.24.1.tgz"; + sha512 = "LRksOe2mBvtbD0Y1hZMsaICHpIglhjz758K5XKUiHKcTBc6BV4O7ozbExZc+5BcCYrniMI9ka7piXFeCaymRRQ=="; }; }; "syswide-cas-5.3.0" = { @@ -43354,13 +43587,13 @@ let sha512 = "MNIgJddrV2TkuwChwcSNds/5E9VijOiw7kAc1y5hTNJoLDSuIyid2QtLYiCYNnICebpuvjhPQZsXwUL0O3l7OQ=="; }; }; - "tar-6.0.1" = { + "tar-6.0.2" = { name = "tar"; packageName = "tar"; - version = "6.0.1"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-6.0.1.tgz"; - sha512 = "bKhKrrz2FJJj5s7wynxy/fyxpE0CmCjmOQ1KV4KkgXFWOgoIT/NbTMnB1n+LFNrNk0SSBVGGxcK5AGsyC+pW5Q=="; + url = "https://registry.npmjs.org/tar/-/tar-6.0.2.tgz"; + sha512 = "Glo3jkRtPcvpDlAs/0+hozav78yoXKFr+c4wgw62NNMO3oo4AaJdCo21Uu7lcwr55h39W2XD1LMERc64wtbItg=="; }; }; "tar-fs-2.0.1" = { @@ -43426,13 +43659,13 @@ let sha1 = "9450e8768c83b416fd4d1a6a9449eeccbf496c29"; }; }; - "telegraf-3.37.0" = { + "telegraf-3.38.0" = { name = "telegraf"; packageName = "telegraf"; - version = "3.37.0"; + version = "3.38.0"; src = fetchurl { - url = "https://registry.npmjs.org/telegraf/-/telegraf-3.37.0.tgz"; - sha512 = "V3448qwfOolBqkIc87yxjW4zMvR2P6AIF24pPTlX9WhZPwA1TF/x3nQhnWPRLtGh2SJuvDcr83iTkXPXT7Opnw=="; + url = "https://registry.npmjs.org/telegraf/-/telegraf-3.38.0.tgz"; + sha512 = "va4VlrKWp64JrowFoZX/NPzzA6q38kvaIukVXOWFO1V+jR1G8+hCfgJy4TX8Z3rwLJzwaBEet1QhikHDRZWl3A=="; }; }; "telegram-typings-3.6.1" = { @@ -43579,13 +43812,13 @@ let sha512 = "/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ=="; }; }; - "terser-4.6.11" = { + "terser-4.6.13" = { name = "terser"; packageName = "terser"; - version = "4.6.11"; + version = "4.6.13"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-4.6.11.tgz"; - sha512 = "76Ynm7OXUG5xhOpblhytE7X58oeNSmC8xnNhjWVo8CksHit0U0kO4hfNbPrrYwowLWFgM2n9L176VNx2QaHmtA=="; + url = "https://registry.npmjs.org/terser/-/terser-4.6.13.tgz"; + sha512 = "wMvqukYgVpQlymbnNbabVZbtM6PN63AzqexpwJL8tbh/mRT9LE5o+ruVduAGL7D6Fpjl+Q+06U5I9Ul82odAhw=="; }; }; "terser-webpack-plugin-1.4.3" = { @@ -44056,6 +44289,15 @@ let sha512 = "J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw=="; }; }; + "tmp-0.2.1" = { + name = "tmp"; + packageName = "tmp"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz"; + sha512 = "76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ=="; + }; + }; "tmp-graphql-config-extension-openapi-1.0.7" = { name = "tmp-graphql-config-extension-openapi"; packageName = "tmp-graphql-config-extension-openapi"; @@ -44704,13 +44946,13 @@ let sha512 = "uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA=="; }; }; - "ts-node-8.9.0" = { + "ts-node-8.10.1" = { name = "ts-node"; packageName = "ts-node"; - version = "8.9.0"; + version = "8.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/ts-node/-/ts-node-8.9.0.tgz"; - sha512 = "rwkXfOs9zmoHrV8xE++dmNd6ZIS+nmHHCxcV53ekGJrxFLMbp+pizpPS07ARvhwneCIECPppOwbZHvw9sQtU4w=="; + url = "https://registry.npmjs.org/ts-node/-/ts-node-8.10.1.tgz"; + sha512 = "bdNz1L4ekHiJul6SHtZWs1ujEKERJnHs4HxN7rjTyyVOFf3HaJ6sLqe6aPG62XTzAB/63pKRh5jTSWL0D7bsvw=="; }; }; "ts-process-promises-1.0.2" = { @@ -44722,15 +44964,6 @@ let sha512 = "6qWWz2HdFbD2uAfgS5t65Dd6HQKYjfra+YXQzKzxIG+RKTpoeDi+x+TW85SEF3cWUI2UecrOXJobvD+04MiTZg=="; }; }; - "tslib-1.11.0" = { - name = "tslib"; - packageName = "tslib"; - version = "1.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.11.0.tgz"; - sha512 = "BmndXUtiTn/VDDrJzQE7Mm22Ix3PxgLltW9bSNLoeCY31gnG2OPx0QqJnuc9oMIKioYrz487i6K9o4Pdn0j+Kg=="; - }; - }; "tslib-1.11.1" = { name = "tslib"; packageName = "tslib"; @@ -45001,6 +45234,15 @@ let sha512 = "OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ=="; }; }; + "type-fest-0.13.1" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.13.1"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz"; + sha512 = "34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg=="; + }; + }; "type-fest-0.3.1" = { name = "type-fest"; packageName = "type-fest"; @@ -45226,13 +45468,13 @@ let sha512 = "W7KxyzeaQmZvUFbGj4+YFshhVrMBGSg2IbcYAjGWGvx8DHvJMclbTDMpffdxFUGPBHjIytk7KJUR/KUXstUGDw=="; }; }; - "uglify-js-3.9.1" = { + "uglify-js-3.9.2" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.9.1"; + version = "3.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.1.tgz"; - sha512 = "JUPoL1jHsc9fOjVFHdQIhqEEJsQvfKDjlubcCilu8U26uZ73qOg8VsN8O1jbuei44ZPlwL7kmbAdM4tzaUvqnA=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.2.tgz"; + sha512 = "zGVwKslUAD/EeqOrD1nQaBmXIHl1Vw371we8cvS8I6mYK9rmgX5tv8AAeJdfsQ3Kk5mGax2SVV/AizxdNGhl7Q=="; }; }; "uglify-to-browserify-1.0.2" = { @@ -46477,24 +46719,6 @@ let sha1 = "1352c340eb820e4d8ddba039a4fbfaa32ed4ef3a"; }; }; - "utilities-0.0.37" = { - name = "utilities"; - packageName = "utilities"; - version = "0.0.37"; - src = fetchurl { - url = "https://registry.npmjs.org/utilities/-/utilities-0.0.37.tgz"; - sha1 = "a3470d0a7f688142d9e8a57cee1128f12e19e196"; - }; - }; - "utilities-1.0.5" = { - name = "utilities"; - packageName = "utilities"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/utilities/-/utilities-1.0.5.tgz"; - sha1 = "f2b77a88f3510733fc7215b5c486a504a75ab245"; - }; - }; "utils-merge-1.0.0" = { name = "utils-merge"; packageName = "utils-merge"; @@ -46531,13 +46755,13 @@ let sha512 = "vRAKaS8WcYNgzbxyH2LdheqgL4sQLis8LXl7r/mN+O4mpWlUpoCsTtietxepLrft2q0TFA2gaIvSWN1iRkzW/w=="; }; }; - "utp-native-2.1.7" = { + "utp-native-2.1.10" = { name = "utp-native"; packageName = "utp-native"; - version = "2.1.7"; + version = "2.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/utp-native/-/utp-native-2.1.7.tgz"; - sha512 = "PQmXCdZOkmADtIqmhoiFEIdNlvkPouO8ktXqThFDBAt850B752bjQMF5KAJeMBJ5gzuI70ZiP9Qsr9mwCwzSyg=="; + url = "https://registry.npmjs.org/utp-native/-/utp-native-2.1.10.tgz"; + sha512 = "VTjBvb/uE9gYqx2NGVPtAWhqv9itieW+wJceJg5G6Cl/2kBCnHDaFafw3fNgCvii7meTpC4AoZfy6OG0pnuQ/Q=="; }; }; "uuid-2.0.3" = { @@ -47224,13 +47448,13 @@ let sha512 = "RWkO/c/A7iXhHEy3OuEqkCqavDjpD4NF2Ca8vjai+ZtEYNeHrm1ybTnBYLP4Ft1uXvvaaVtYA9HrDjD6+CUONg=="; }; }; - "vscode-css-languageservice-4.1.1" = { + "vscode-css-languageservice-4.1.2" = { name = "vscode-css-languageservice"; packageName = "vscode-css-languageservice"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.1.1.tgz"; - sha512 = "2r2bYbhscivRu1zqh5kNe8aYpFnfksMYC7wTpKX2HqFsSzSJYXk0sCqPaWsP5ptqz0OFBTXnzx2JlE+Nb5Edgw=="; + url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.1.2.tgz"; + sha512 = "clIjSS940NPBvtfubZokKT/YDNfE5ST9VDwsuwdCbQSkJAVZPAbmIgfmgrz/f/o8PawYQU/ooUBEuRIvIYq3ag=="; }; }; "vscode-emmet-helper-1.2.17" = { @@ -47251,13 +47475,13 @@ let sha512 = "mIb5VMXM5jI97HzCk2eadI1K//rCEZXte0wBqA7PGXsyJH4KTyJUaYk9MR+mbfpUl2vMi3HZw9GUOLGYLc6l5w=="; }; }; - "vscode-json-languageservice-3.5.2" = { + "vscode-json-languageservice-3.6.0" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; - version = "3.5.2"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.5.2.tgz"; - sha512 = "9cUvBq00O08lpWVVOx6tQ1yLxCHss79nsUdEAVYGomRyMbnPBmc0AkYPcXI9WK1EM6HBo0R9Zo3NjFhcICpy4A=="; + url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.6.0.tgz"; + sha512 = "dXzFywypUZ9T0tjr4fREZiknXDz6vAGx1zsxbQY1+9DOpjMfbz0VLP873KmcbuvL4K3nseKTxc4TKHu8kLXRMw=="; }; }; "vscode-jsonrpc-3.6.0" = { @@ -48538,6 +48762,15 @@ let sha512 = "HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ=="; }; }; + "ws-7.2.5" = { + name = "ws"; + packageName = "ws"; + version = "7.2.5"; + src = fetchurl { + url = "https://registry.npmjs.org/ws/-/ws-7.2.5.tgz"; + sha512 = "C34cIU4+DB2vMyAbmEKossWq2ZQDr6QEyuuCzWrM9zfw1sGc0mYiJ0UnG9zzNykt49C2Fi34hvr2vssFQRS6EA=="; + }; + }; "x-default-browser-0.3.1" = { name = "x-default-browser"; packageName = "x-default-browser"; @@ -49385,22 +49618,22 @@ let sha512 = "CP0fwGk5Y+jel+A0AQbyqnIFZRRpkKOeYUibiTSmlgV9PcgNFFVwn86VcUIpDLOqVjF+9v+O9FWQMo+IUcV2mA=="; }; }; - "yeoman-environment-2.9.5" = { + "yeoman-environment-2.10.0" = { name = "yeoman-environment"; packageName = "yeoman-environment"; - version = "2.9.5"; + version = "2.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.9.5.tgz"; - sha512 = "ntxV8VTZbP8QFuJZGT7vG8AsKeyGz8lXlfq2V2T5sl6SrU6UAEVgRreEGz9t+JbFGx1CSM/Ly2atG/avGuheyQ=="; + url = "https://registry.npmjs.org/yeoman-environment/-/yeoman-environment-2.10.0.tgz"; + sha512 = "dn754zZm1kTWS94V5riNLNjs9Wn6Zjl+9jgbQ37EmHEhcRR30fY1sgBnhYZyTpa+zK7ipFI6dMH9Sg0SAMW3hw=="; }; }; - "yeoman-generator-4.8.3" = { + "yeoman-generator-4.10.0" = { name = "yeoman-generator"; packageName = "yeoman-generator"; - version = "4.8.3"; + version = "4.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-4.8.3.tgz"; - sha512 = "yDPHBhfglqiyYlqBnaAmcE/wPznwSx11HCGVCpnnsqpnp45HmdsuBtiFSNDcygiFmz1HmkFWRLWHTai/b+9eiQ=="; + url = "https://registry.npmjs.org/yeoman-generator/-/yeoman-generator-4.10.0.tgz"; + sha512 = "NuY9bt7r6kvjvWjAVcujZwHux5xXy4Vdmz3uabyjioh679ry97+dl+MgtlAkgdSQ7kGI0Iz1GC92tZ33XdxaDw=="; }; }; "yn-3.1.1" = { @@ -49526,17 +49759,17 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "9.1.3"; + version = "9.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-9.1.3.tgz"; - sha512 = "/7yHOuiyMgpcoBuADPrF4Eo9VDysA57fsyrMlOH2WZmKdsjW032StS9EIOue5RNQ7y0DwrtgtnkjbpZ6nYo3Pw=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-9.1.4.tgz"; + sha512 = "H9MqoT4zyIv+Yo3cvRVkzafWGHsqt7jUvtvGwMHIDMTfEX+Q8yiYlDLL6WM3Eb6/hDmLcRGC/GI495sKS1z5qA=="; }; dependencies = [ - sources."@angular-devkit/architect-0.901.3" - sources."@angular-devkit/core-9.1.3" - sources."@angular-devkit/schematics-9.1.3" - sources."@schematics/angular-9.1.3" - sources."@schematics/update-0.901.3" + sources."@angular-devkit/architect-0.901.4" + sources."@angular-devkit/core-9.1.4" + sources."@angular-devkit/schematics-9.1.4" + sources."@schematics/angular-9.1.4" + sources."@schematics/update-0.901.4" sources."@types/color-name-1.1.1" sources."@yarnpkg/lockfile-1.1.0" sources."JSONStream-1.3.5" @@ -49622,7 +49855,7 @@ in sources."get-stream-4.1.0" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-1.0.3" @@ -49658,11 +49891,10 @@ in sources."is-docker-2.0.0" sources."is-fullwidth-code-point-3.0.0" sources."is-interactive-1.0.0" - sources."is-promise-2.1.0" sources."is-regex-1.0.5" sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" - sources."is-wsl-2.1.1" + sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isstream-0.1.2" @@ -49687,8 +49919,8 @@ in sources."lru-cache-5.1.1" sources."magic-string-0.25.7" sources."make-fetch-happen-5.0.2" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -49716,7 +49948,7 @@ in sources."npm-package-arg-8.0.1" sources."npm-packlist-1.4.8" sources."npm-pick-manifest-6.0.0" - (sources."npm-registry-fetch-4.0.3" // { + (sources."npm-registry-fetch-4.0.4" // { dependencies = [ sources."hosted-git-info-2.8.8" sources."npm-package-arg-6.1.1" @@ -49778,7 +50010,7 @@ in sources."restore-cursor-3.1.0" sources."retry-0.10.1" sources."rimraf-3.0.2" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."run-queue-1.0.3" sources."rxjs-6.5.4" sources."safe-buffer-5.2.0" @@ -49865,25 +50097,24 @@ in "@antora/cli" = nodeEnv.buildNodePackage { name = "_at_antora_slash_cli"; packageName = "@antora/cli"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/cli/-/cli-2.3.0.tgz"; - sha512 = "YiAP7Ib4zhAE+owOKg1/cJ+1AQX4BGfvaMnGkHaSf6srutoLLCRIbD0InpSNobf+ouSMqqk6fiLmBVt/cu03og=="; + url = "https://registry.npmjs.org/@antora/cli/-/cli-2.3.1.tgz"; + sha512 = "AtqlCYdlvwfRUtqaSzjR3Ji4WpCHq/AyD+rcagD3lg/WGiZdwgppiy4Oj36s7rUfR0SDl5GIIWmA5zdDSBRNvw=="; }; dependencies = [ - sources."@antora/playbook-builder-2.3.0" + sources."@antora/playbook-builder-2.3.1" sources."@iarna/toml-2.2.5" sources."argparse-1.0.10" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."commander-5.0.0" + sources."commander-5.1.0" (sources."convict-5.2.0" // { dependencies = [ sources."json5-2.1.0" ]; }) sources."decamelize-1.2.0" - sources."deep-freeze-node-1.1.3" sources."esprima-4.0.1" sources."js-yaml-3.13.1" sources."json5-2.1.3" @@ -49909,24 +50140,24 @@ in "@antora/site-generator-default" = nodeEnv.buildNodePackage { name = "_at_antora_slash_site-generator-default"; packageName = "@antora/site-generator-default"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@antora/site-generator-default/-/site-generator-default-2.3.0.tgz"; - sha512 = "swDQeAEnC/ClmhHJ50UNJppUSAneOp2cHwZiRr3zUQ9+5+mvOrDEdHbyxH7mIwkoeiIcQ/UVw00bg4MwmQ0M0g=="; + url = "https://registry.npmjs.org/@antora/site-generator-default/-/site-generator-default-2.3.1.tgz"; + sha512 = "uAt6pCfMfTs2m+IUZjcivN4fDmt2D3C2lI9dfWAkAe2P9vIY7oZuVqCuBQfAwnkJg8mOTk0J2gLEyspbRDsK7w=="; }; dependencies = [ - sources."@antora/asciidoc-loader-2.3.0" - sources."@antora/content-aggregator-2.3.0" - sources."@antora/content-classifier-2.3.0" - sources."@antora/document-converter-2.3.0" + sources."@antora/asciidoc-loader-2.3.1" + sources."@antora/content-aggregator-2.3.1" + sources."@antora/content-classifier-2.3.1" + sources."@antora/document-converter-2.3.1" sources."@antora/expand-path-helper-1.0.0" - sources."@antora/navigation-builder-2.3.0" - sources."@antora/page-composer-2.3.0" - sources."@antora/playbook-builder-2.3.0" - sources."@antora/redirect-producer-2.3.0" - sources."@antora/site-mapper-2.3.0" - sources."@antora/site-publisher-2.3.0" - sources."@antora/ui-loader-2.3.0" + sources."@antora/navigation-builder-2.3.1" + sources."@antora/page-composer-2.3.1" + sources."@antora/playbook-builder-2.3.1" + sources."@antora/redirect-producer-2.3.1" + sources."@antora/site-mapper-2.3.1" + sources."@antora/site-publisher-2.3.1" + sources."@antora/ui-loader-2.3.1" sources."@iarna/toml-2.2.5" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" @@ -49989,7 +50220,6 @@ in sources."crc-32-1.2.0" sources."decamelize-1.2.0" sources."decompress-response-4.2.1" - sources."deep-freeze-node-1.1.3" sources."defer-to-connect-1.1.3" sources."define-properties-1.1.3" sources."diff3-0.0.3" @@ -50050,7 +50280,7 @@ in sources."mimic-response-1.0.1" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" (sources."gulp-vinyl-zip-2.2.0" // { dependencies = [ sources."readable-stream-2.3.7" @@ -50098,8 +50328,8 @@ in sources."map-obj-4.1.0" sources."marky-1.2.1" sources."matcher-2.1.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-response-2.1.0" sources."minimatch-3.0.4" sources."minimatch-all-1.1.0" @@ -50155,7 +50385,7 @@ in ]; }) sources."remove-trailing-separator-1.1.0" - sources."replace-ext-1.0.0" + sources."replace-ext-1.0.1" sources."require-from-string-2.0.2" sources."resolve-options-1.1.0" sources."responselike-1.0.2" @@ -50189,7 +50419,7 @@ in ]; }) sources."to-utf8-0.0.1" - sources."uglify-js-3.9.1" + sources."uglify-js-3.9.2" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" @@ -50289,7 +50519,7 @@ in sources."forever-agent-0.6.1" sources."form-data-2.3.2" sources."getpass-0.1.7" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-flag-3.0.0" @@ -50299,7 +50529,7 @@ in 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-promise-2.2.2" sources."is-typedarray-1.0.0" sources."isstream-0.1.2" sources."jsbn-0.1.1" @@ -50313,8 +50543,8 @@ in sources."lodash.sortby-4.7.0" sources."lowdb-1.0.0" sources."lunr-2.3.3" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" sources."ms-2.1.2" sources."mute-stream-0.0.7" @@ -50338,7 +50568,7 @@ in sources."request-promise-core-1.1.3" sources."request-promise-native-1.0.8" sources."restore-cursor-2.0.0" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."rxjs-6.5.5" sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" @@ -50413,25 +50643,27 @@ in sources."@apollographql/graphql-language-service-utils-2.0.2" sources."@apollographql/graphql-playground-html-1.6.24" sources."@babel/code-frame-7.8.3" - (sources."@babel/compat-data-7.9.0" // { + (sources."@babel/compat-data-7.9.6" // { dependencies = [ sources."semver-5.7.1" ]; }) - (sources."@babel/core-7.9.0" // { + (sources."@babel/core-7.9.6" // { dependencies = [ + sources."@babel/generator-7.9.6" + sources."@babel/types-7.9.6" sources."semver-5.7.1" ]; }) sources."@babel/generator-7.9.5" sources."@babel/helper-annotate-as-pure-7.8.3" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.8.3" - (sources."@babel/helper-compilation-targets-7.8.7" // { + (sources."@babel/helper-compilation-targets-7.9.6" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/helper-create-class-features-plugin-7.9.5" + sources."@babel/helper-create-class-features-plugin-7.9.6" sources."@babel/helper-create-regexp-features-plugin-7.8.8" sources."@babel/helper-define-map-7.8.3" sources."@babel/helper-explode-assignable-expression-7.8.3" @@ -50445,21 +50677,29 @@ in sources."@babel/helper-plugin-utils-7.8.3" sources."@babel/helper-regex-7.8.3" sources."@babel/helper-remap-async-to-generator-7.8.3" - sources."@babel/helper-replace-supers-7.8.6" + (sources."@babel/helper-replace-supers-7.9.6" // { + dependencies = [ + sources."@babel/types-7.9.6" + ]; + }) sources."@babel/helper-simple-access-7.8.3" sources."@babel/helper-split-export-declaration-7.8.3" sources."@babel/helper-validator-identifier-7.9.5" sources."@babel/helper-wrap-function-7.8.3" - sources."@babel/helpers-7.9.2" + (sources."@babel/helpers-7.9.6" // { + dependencies = [ + sources."@babel/types-7.9.6" + ]; + }) sources."@babel/highlight-7.9.0" - sources."@babel/parser-7.9.4" + sources."@babel/parser-7.9.6" sources."@babel/plugin-proposal-async-generator-functions-7.8.3" sources."@babel/plugin-proposal-class-properties-7.8.3" sources."@babel/plugin-proposal-dynamic-import-7.8.3" sources."@babel/plugin-proposal-json-strings-7.8.3" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.8.3" sources."@babel/plugin-proposal-numeric-separator-7.8.3" - sources."@babel/plugin-proposal-object-rest-spread-7.9.5" + sources."@babel/plugin-proposal-object-rest-spread-7.9.6" sources."@babel/plugin-proposal-optional-catch-binding-7.8.3" sources."@babel/plugin-proposal-optional-chaining-7.9.0" sources."@babel/plugin-proposal-unicode-property-regex-7.8.8" @@ -50489,9 +50729,9 @@ in sources."@babel/plugin-transform-function-name-7.8.3" sources."@babel/plugin-transform-literals-7.8.3" sources."@babel/plugin-transform-member-expression-literals-7.8.3" - sources."@babel/plugin-transform-modules-amd-7.9.0" - sources."@babel/plugin-transform-modules-commonjs-7.9.0" - sources."@babel/plugin-transform-modules-systemjs-7.9.0" + sources."@babel/plugin-transform-modules-amd-7.9.6" + sources."@babel/plugin-transform-modules-commonjs-7.9.6" + sources."@babel/plugin-transform-modules-systemjs-7.9.6" sources."@babel/plugin-transform-modules-umd-7.9.0" sources."@babel/plugin-transform-named-capturing-groups-regex-7.8.3" sources."@babel/plugin-transform-new-target-7.8.3" @@ -50505,10 +50745,11 @@ in sources."@babel/plugin-transform-sticky-regex-7.8.3" sources."@babel/plugin-transform-template-literals-7.8.3" sources."@babel/plugin-transform-typeof-symbol-7.8.4" - sources."@babel/plugin-transform-typescript-7.9.4" + sources."@babel/plugin-transform-typescript-7.9.6" sources."@babel/plugin-transform-unicode-regex-7.8.3" - (sources."@babel/preset-env-7.9.5" // { + (sources."@babel/preset-env-7.9.6" // { dependencies = [ + sources."@babel/types-7.9.6" sources."semver-5.7.1" ]; }) @@ -50522,9 +50763,14 @@ in sources."semver-5.7.1" ]; }) - sources."@babel/runtime-7.9.2" + sources."@babel/runtime-7.9.6" sources."@babel/template-7.8.6" - sources."@babel/traverse-7.9.5" + (sources."@babel/traverse-7.9.6" // { + dependencies = [ + sources."@babel/generator-7.9.6" + sources."@babel/types-7.9.6" + ]; + }) sources."@babel/types-7.9.5" sources."@endemolshinegroup/cosmiconfig-typescript-loader-1.0.1" sources."@hapi/address-2.1.4" @@ -50612,7 +50858,7 @@ in sources."@types/cookies-0.7.4" sources."@types/cors-2.8.6" sources."@types/events-3.0.0" - sources."@types/express-4.17.3" + sources."@types/express-4.17.4" sources."@types/express-serve-static-core-4.17.5" sources."@types/fs-capacitor-2.0.0" sources."@types/glob-7.1.1" @@ -50624,16 +50870,17 @@ in sources."@types/long-4.0.1" sources."@types/mime-2.0.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.13.2" + sources."@types/node-13.13.4" (sources."@types/node-fetch-2.5.6" // { dependencies = [ sources."form-data-3.0.0" ]; }) sources."@types/normalize-package-data-2.4.0" + sources."@types/qs-6.9.1" sources."@types/range-parser-1.2.3" sources."@types/serve-static-1.13.3" - sources."@types/ws-6.0.4" + sources."@types/ws-7.2.4" sources."@types/zen-observable-0.8.0" sources."@vue/cli-shared-utils-4.3.1" (sources."@vue/cli-ui-4.3.1" // { @@ -50666,12 +50913,12 @@ in ]; }) sources."apollo-cache-1.3.4" - sources."apollo-cache-control-0.9.1" + sources."apollo-cache-control-0.10.0" sources."apollo-cache-inmemory-1.6.5" sources."apollo-client-2.6.8" (sources."apollo-codegen-core-0.36.8" // { dependencies = [ - sources."recast-0.19.0" + sources."recast-0.19.1" sources."source-map-0.6.1" ]; }) @@ -50680,8 +50927,8 @@ in sources."apollo-codegen-swift-0.36.8" sources."apollo-codegen-typescript-0.36.8" sources."apollo-datasource-0.7.0" - sources."apollo-engine-reporting-1.7.1" - sources."apollo-engine-reporting-protobuf-0.4.4" + sources."apollo-engine-reporting-1.8.0" + sources."apollo-engine-reporting-protobuf-0.5.0" sources."apollo-env-0.6.4" sources."apollo-graphql-0.4.3" sources."apollo-language-server-1.21.3" @@ -50694,13 +50941,13 @@ in sources."apollo-link-state-0.4.2" sources."apollo-link-ws-1.0.20" sources."apollo-server-caching-0.5.1" - sources."apollo-server-core-2.12.0" + sources."apollo-server-core-2.13.0" sources."apollo-server-env-2.4.3" sources."apollo-server-errors-2.4.1" - sources."apollo-server-express-2.12.0" - sources."apollo-server-plugin-base-0.7.1" - sources."apollo-server-types-0.3.1" - sources."apollo-tracing-0.9.1" + sources."apollo-server-express-2.13.0" + sources."apollo-server-plugin-base-0.8.0" + sources."apollo-server-types-0.4.0" + sources."apollo-tracing-0.10.0" sources."apollo-upload-client-11.0.0" sources."apollo-utilities-1.3.3" (sources."archive-type-4.0.0" // { @@ -50810,7 +51057,7 @@ in sources."callsites-2.0.0" sources."camel-case-3.0.0" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001046" + sources."caniuse-lite-1.0.30001050" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" sources."caseless-0.12.0" @@ -50841,7 +51088,7 @@ in sources."clean-stack-2.2.0" sources."cli-boxes-1.0.0" sources."cli-cursor-2.1.0" - (sources."cli-progress-3.8.0" // { + (sources."cli-progress-3.8.2" // { dependencies = [ sources."emoji-regex-8.0.0" sources."is-fullwidth-code-point-3.0.0" @@ -50993,14 +51240,14 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.415" + sources."electron-to-chromium-1.3.427" sources."elegant-spinner-1.0.1" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."entities-1.1.2" sources."env-ci-3.2.2" - sources."envinfo-7.5.0" + sources."envinfo-7.5.1" sources."error-ex-1.3.2" sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" @@ -51133,7 +51380,7 @@ in sources."get-stream-3.0.0" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."graceful-readlink-1.0.1" sources."graphql-14.6.0" (sources."graphql-anywhere-4.2.6" // { @@ -51141,7 +51388,7 @@ in sources."ts-invariant-0.3.3" ]; }) - sources."graphql-extensions-0.11.1" + sources."graphql-extensions-0.12.0" sources."graphql-subscriptions-1.1.0" sources."graphql-tag-2.10.3" sources."graphql-tools-4.0.8" @@ -51234,6 +51481,7 @@ in sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" sources."is-directory-0.3.1" + sources."is-docker-2.0.0" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" @@ -51253,7 +51501,7 @@ in sources."is-path-inside-1.0.1" sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" - sources."is-promise-2.1.0" + sources."is-promise-2.2.2" sources."is-property-1.0.2" sources."is-redirect-1.0.0" sources."is-regex-1.0.5" @@ -51278,7 +51526,7 @@ in sources."js-tokens-4.0.0" sources."js-yaml-3.13.1" sources."jsbn-0.1.1" - sources."jscodeshift-0.7.0" + sources."jscodeshift-0.7.1" sources."jsesc-2.5.2" sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" @@ -51370,8 +51618,8 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" @@ -51411,7 +51659,7 @@ in sources."node-modules-regexp-1.0.0" (sources."node-notifier-6.0.0" // { dependencies = [ - sources."is-wsl-2.1.1" + sources."is-wsl-2.2.0" ]; }) sources."node-releases-1.1.53" @@ -51528,7 +51776,7 @@ in ]; }) sources."pkg-up-2.0.0" - (sources."portfinder-1.0.25" // { + (sources."portfinder-1.0.26" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" @@ -51606,7 +51854,7 @@ in sources."retry-0.12.0" sources."rimraf-3.0.2" sources."rss-parser-3.7.6" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."rxjs-6.5.5" sources."safe-buffer-5.2.0" sources."safe-regex-1.1.0" @@ -51682,7 +51930,7 @@ in sources."sort-keys-length-1.0.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - (sources."source-map-support-0.5.18" // { + (sources."source-map-support-0.5.19" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -51830,7 +52078,7 @@ in sources."treeify-1.1.0" sources."trim-repeated-1.0.0" sources."ts-invariant-0.4.4" - sources."ts-node-8.9.0" + sources."ts-node-8.10.1" sources."tslib-1.11.1" sources."tty-1.0.1" sources."tunnel-agent-0.6.0" @@ -52078,12 +52326,12 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/generator-7.9.5" + sources."@babel/generator-7.9.6" sources."@babel/helper-validator-identifier-7.9.5" sources."@babel/highlight-7.9.0" - sources."@babel/parser-7.9.4" + sources."@babel/parser-7.9.6" sources."@babel/template-7.8.6" - sources."@babel/types-7.9.5" + sources."@babel/types-7.9.6" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" sources."@webassemblyjs/helper-api-error-1.9.0" @@ -52163,12 +52411,12 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - (sources."@babel/core-7.9.0" // { + (sources."@babel/core-7.9.6" // { dependencies = [ sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.9.5" // { + (sources."@babel/generator-7.9.6" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -52179,16 +52427,16 @@ in sources."@babel/helper-module-imports-7.8.3" sources."@babel/helper-module-transforms-7.9.0" sources."@babel/helper-optimise-call-expression-7.8.3" - sources."@babel/helper-replace-supers-7.8.6" + sources."@babel/helper-replace-supers-7.9.6" sources."@babel/helper-simple-access-7.8.3" sources."@babel/helper-split-export-declaration-7.8.3" sources."@babel/helper-validator-identifier-7.9.5" - sources."@babel/helpers-7.9.2" + sources."@babel/helpers-7.9.6" sources."@babel/highlight-7.9.0" - sources."@babel/parser-7.9.4" + sources."@babel/parser-7.9.6" sources."@babel/template-7.8.6" - sources."@babel/traverse-7.9.5" - sources."@babel/types-7.9.5" + sources."@babel/traverse-7.9.6" + sources."@babel/types-7.9.6" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" @@ -52222,7 +52470,7 @@ in ]; }) sources."globals-11.12.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-1.0.3" sources."has-color-0.1.7" sources."has-flag-3.0.0" @@ -52290,11 +52538,11 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.13.2" + sources."@types/node-13.13.4" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" - sources."commander-5.0.0" + sources."commander-5.1.0" sources."concat-map-0.0.1" sources."fs.realpath-1.0.0" sources."glob-7.1.6" @@ -52394,8 +52642,8 @@ in sources."levn-0.3.0" sources."lodash-4.17.15" sources."lodash.sortby-4.7.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."nwsapi-2.2.0" sources."oauth-sign-0.9.0" @@ -52504,7 +52752,7 @@ in sources."find-up-1.1.2" (sources."fs-extra-0.26.7" // { dependencies = [ - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" ]; }) sources."fs.realpath-1.0.0" @@ -52522,17 +52770,17 @@ in sources."is-utf8-0.2.1" (sources."jsonfile-2.4.0" // { dependencies = [ - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" ]; }) (sources."klaw-1.3.1" // { dependencies = [ - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" ]; }) (sources."load-json-file-1.1.0" // { dependencies = [ - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" ]; }) sources."lodash-4.2.1" @@ -52555,7 +52803,7 @@ in sources."path-parse-1.0.6" (sources."path-type-1.1.0" // { dependencies = [ - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" ]; }) sources."pify-2.3.0" @@ -52674,7 +52922,11 @@ in sources."get-assigned-identifiers-1.2.0" sources."glob-7.1.6" sources."has-1.0.3" - sources."hash-base-3.0.4" + (sources."hash-base-3.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."hash.js-1.1.7" sources."hmac-drbg-1.0.1" sources."htmlescape-1.1.1" @@ -52697,7 +52949,7 @@ in sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mkdirp-classic-0.5.2" + sources."mkdirp-classic-0.5.3" sources."module-deps-6.2.2" sources."object-assign-4.1.1" sources."once-1.4.0" @@ -52797,7 +53049,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.2" + sources."@types/node-13.13.4" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.2" @@ -52858,7 +53110,7 @@ in sources."co-3.1.0" sources."codepage-1.4.0" sources."combined-stream-1.0.8" - sources."commander-5.0.0" + sources."commander-5.1.0" sources."compact2string-1.4.1" sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { @@ -52918,7 +53170,7 @@ in sources."getpass-0.1.7" sources."glob-7.1.6" sources."got-1.2.2" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-ansi-1.0.3" @@ -52974,13 +53226,13 @@ in ]; }) sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.3.5" - sources."mkdirp-classic-0.5.2" + sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" sources."multicast-dns-4.0.1" sources."mutate.js-0.2.0" @@ -53272,10 +53524,10 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "1.7.9"; + version = "1.7.11"; src = fetchurl { - url = "https://registry.npmjs.org/coc-git/-/coc-git-1.7.9.tgz"; - sha512 = "xPHy9q9jsw3Wj9pa+SVjIPMqu9ye33CCmNWYOfGpNfiImQzecPUN619SDViQ0xxSpRgnvtqDYk9ABCWfl3hMDQ=="; + url = "https://registry.npmjs.org/coc-git/-/coc-git-1.7.11.tgz"; + sha512 = "4fifGZfy4vLhoKV1riYb3FhOuOUyd98KNCeUg2vG6f9qjbL+VXE8rJgigHMuGWBIJMbJf6NTLbPFRjuUewu0LQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -53367,10 +53619,10 @@ in coc-java = nodeEnv.buildNodePackage { name = "coc-java"; packageName = "coc-java"; - version = "1.4.9"; + version = "1.4.10"; src = fetchurl { - url = "https://registry.npmjs.org/coc-java/-/coc-java-1.4.9.tgz"; - sha512 = "Vj2K520HZRWl01Mbw3+zFBfLins+bn5s53dNgRNr+9F8f6gZvzdww4dtleU1vqqCfuwb3ly6PSU4DZBWFpU92w=="; + url = "https://registry.npmjs.org/coc-java/-/coc-java-1.4.10.tgz"; + sha512 = "WgJuqBpxWM0c1DHDl+UZyDzdD1vdcGInWOMs4bB+dVfCbXktTUEweFty2HViue6G9Clql5hu2+6VB2K3Jx+0Yg=="; }; buildInputs = globalBuildInputs; meta = { @@ -53444,7 +53696,7 @@ in sha512 = "69jOo9oD2JJUo5bMeoV5lcgaAJzMWO7KzWllckc+ZOGB46dE2Qev4MogRnwE/94GI6qc8Cx4RiMoRRLXYIWhyg=="; }; dependencies = [ - sources."@babel/runtime-7.9.2" + sources."@babel/runtime-7.9.6" sources."@chemzqm/neovim-5.1.9" sources."async-2.6.3" sources."await-semaphore-0.1.3" @@ -53463,12 +53715,12 @@ in sources."fb-watchman-2.0.1" sources."flatted-2.0.2" sources."follow-redirects-1.11.0" - sources."fp-ts-2.5.3" + sources."fp-ts-2.5.4" sources."fs-extra-8.1.0" sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."ieee754-1.1.13" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -53635,7 +53887,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001046" + sources."caniuse-lite-1.0.30001050" sources."capture-stack-trace-1.0.1" sources."ccount-1.0.5" sources."chalk-2.4.2" @@ -53721,7 +53973,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.2.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.415" + sources."electron-to-chromium-1.3.427" sources."emoji-regex-7.0.3" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -53854,7 +54106,7 @@ in sources."globjoin-0.1.4" sources."gonzales-pe-4.3.0" sources."got-6.7.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" (sources."has-ansi-2.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -53940,7 +54192,6 @@ in }) sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" - sources."is-promise-2.1.0" sources."is-redirect-1.0.0" sources."is-regexp-1.0.0" sources."is-retry-allowed-1.2.0" @@ -54205,7 +54456,7 @@ in sources."restore-cursor-2.0.0" sources."ret-0.1.15" sources."rimraf-2.6.3" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."rxjs-6.5.5" sources."safe-buffer-5.2.0" sources."safe-regex-1.1.0" @@ -54441,10 +54692,10 @@ in coc-python = nodeEnv.buildNodePackage { name = "coc-python"; packageName = "coc-python"; - version = "1.2.9"; + version = "1.2.12"; src = fetchurl { - url = "https://registry.npmjs.org/coc-python/-/coc-python-1.2.9.tgz"; - sha512 = "ouwZI3MZnCsO/sa5O1rQYzBgPjZ8h3OkJbBYm3DzaX+x49Gp3ARHpvSF4BMphOE16HUD/bHt+RnE+HSSweGFlg=="; + url = "https://registry.npmjs.org/coc-python/-/coc-python-1.2.12.tgz"; + sha512 = "cwZ/uIJT5id6zwBE6RWC/HcGy7uw2hLjC0OyvcjFzidazH73e3fQBBoEMJNtLKgPuAJfNjo4BPu+cDsCSAkCAw=="; }; buildInputs = globalBuildInputs; meta = { @@ -54476,10 +54727,10 @@ in coc-rls = nodeEnv.buildNodePackage { name = "coc-rls"; packageName = "coc-rls"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rls/-/coc-rls-1.1.4.tgz"; - sha512 = "UcQCBSp/Mzt5SR2mS4Qukvn7mBoh86cB1Fb1/oD88+sn1RHRl67eTrdlbswzdrXyd6WotQi62okCuIhyVoqAig=="; + url = "https://registry.npmjs.org/coc-rls/-/coc-rls-1.1.5.tgz"; + sha512 = "JXM7iLC1rlu7IsnGp7Rwt4sCtnaAQdQQ+brC/HhAWApOZjazPclSs+/IwPqot9fwcitjE0me7BiEyErx07qyFw=="; }; buildInputs = globalBuildInputs; meta = { @@ -54494,10 +54745,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.5.5"; + version = "0.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.5.5.tgz"; - sha512 = "l44UBTzSWkEL/uHb5GCR5m6HnheJmuJFbYqqJ+5n6Q+PJIpKSyzyNgMiC3nmsOWCT6W3Js83s1i6zTAu8Zy8LA=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.6.1.tgz"; + sha512 = "zyD0N3RBjBCx3KiBMaT3wwo3p+9VpANIXxhnSy/iByxN8UkgHlH6vawaL3hQu3sEGnhNrlql+A7qZx1qM3fjsg=="; }; buildInputs = globalBuildInputs; meta = { @@ -54530,10 +54781,10 @@ in coc-snippets = nodeEnv.buildNodePackage { name = "coc-snippets"; packageName = "coc-snippets"; - version = "2.1.25"; + version = "2.1.26"; src = fetchurl { - url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.1.25.tgz"; - sha512 = "td3vAVOoFgswef3iCO3rDQrmoizKiKw/+5cLIYYiahnxx7SwmKcNZ1AV6OSdks/l/hOJEhtLZw3BqhxaI3+Z4w=="; + url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.1.26.tgz"; + sha512 = "4/XHrxJV5kN0aCrW/Kkw6s19ORs/V26zzZzQ/jFP8BT+HWZegbqPZIP9c+xB9nwknCwa9Tovx3mzcUMq0w0KMw=="; }; buildInputs = globalBuildInputs; meta = { @@ -54571,30 +54822,30 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/core-7.9.0" - sources."@babel/generator-7.9.5" + sources."@babel/core-7.9.6" + sources."@babel/generator-7.9.6" sources."@babel/helper-function-name-7.9.5" sources."@babel/helper-get-function-arity-7.8.3" sources."@babel/helper-member-expression-to-functions-7.8.3" sources."@babel/helper-module-imports-7.8.3" sources."@babel/helper-module-transforms-7.9.0" sources."@babel/helper-optimise-call-expression-7.8.3" - sources."@babel/helper-replace-supers-7.8.6" + sources."@babel/helper-replace-supers-7.9.6" sources."@babel/helper-simple-access-7.8.3" sources."@babel/helper-split-export-declaration-7.8.3" sources."@babel/helper-validator-identifier-7.9.5" - sources."@babel/helpers-7.9.2" + sources."@babel/helpers-7.9.6" sources."@babel/highlight-7.9.0" - sources."@babel/parser-7.9.4" + sources."@babel/parser-7.9.6" sources."@babel/template-7.8.6" - sources."@babel/traverse-7.9.5" - sources."@babel/types-7.9.5" + sources."@babel/traverse-7.9.6" + sources."@babel/types-7.9.6" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.13.2" + sources."@types/node-13.13.4" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -54621,7 +54872,7 @@ in sources."atob-2.1.2" (sources."autoprefixer-9.7.6" // { dependencies = [ - sources."postcss-value-parser-4.0.3" + sources."postcss-value-parser-4.1.0" ]; }) sources."bail-1.0.5" @@ -54645,7 +54896,7 @@ in sources."callsites-2.0.0" sources."camelcase-4.1.0" sources."camelcase-keys-4.2.0" - sources."caniuse-lite-1.0.30001046" + sources."caniuse-lite-1.0.30001050" sources."ccount-1.0.5" sources."chalk-2.4.2" sources."character-entities-1.2.4" @@ -54704,7 +54955,7 @@ in sources."domhandler-2.4.2" sources."domutils-1.7.0" sources."dot-prop-5.2.0" - sources."electron-to-chromium-1.3.415" + sources."electron-to-chromium-1.3.427" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -54783,7 +55034,7 @@ in }) sources."globjoin-0.1.4" sources."gonzales-pe-4.3.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-flag-3.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -54925,7 +55176,7 @@ in sources."pify-4.0.1" sources."pkg-up-2.0.0" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.27" // { + (sources."postcss-7.0.29" // { dependencies = [ sources."source-map-0.6.1" sources."supports-color-6.1.0" @@ -55307,7 +55558,7 @@ in sources."@types/glob-7.1.1" sources."@types/json-schema-7.0.4" sources."@types/minimatch-3.0.3" - sources."@types/node-13.13.2" + sources."@types/node-13.13.4" sources."@types/normalize-package-data-2.4.0" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" @@ -55663,7 +55914,7 @@ in sources."get-stream-4.1.0" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."gridsome-helper-json-1.0.3" sources."has-1.0.3" (sources."has-ansi-2.0.0" // { @@ -55755,7 +56006,6 @@ in sources."is-plain-object-2.0.4" sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" - sources."is-promise-2.1.0" sources."is-stream-1.1.0" sources."is-utf8-0.2.1" sources."is-windows-1.0.2" @@ -55969,7 +56219,7 @@ in sources."pretty-format-23.6.0" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" - sources."property-information-5.4.0" + sources."property-information-5.5.0" sources."proto-list-1.2.4" sources."pseudomap-1.0.2" sources."pump-3.0.0" @@ -56035,7 +56285,7 @@ in sources."ret-0.1.15" sources."reusify-1.0.4" sources."rimraf-2.6.3" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."run-parallel-1.1.9" sources."rxjs-6.5.5" sources."s.color-0.0.13" @@ -56276,7 +56526,7 @@ in sources."vfile-sort-2.2.2" sources."vfile-statistics-1.1.4" sources."vls-0.2.0" - (sources."vscode-css-languageservice-4.1.1" // { + (sources."vscode-css-languageservice-4.1.2" // { dependencies = [ sources."vscode-uri-2.1.1" ]; @@ -56389,7 +56639,7 @@ in sources."prettier-1.19.1" sources."request-light-0.2.5" sources."sprintf-js-1.0.3" - sources."vscode-json-languageservice-3.5.2" + sources."vscode-json-languageservice-3.6.0" sources."vscode-jsonrpc-4.0.0" (sources."vscode-languageserver-5.2.1" // { dependencies = [ @@ -56584,7 +56834,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.13.2" + sources."@types/node-13.13.4" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."ajv-6.12.2" @@ -56805,7 +57055,7 @@ in sources."get-stream-3.0.0" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-flag-3.0.0" @@ -56859,7 +57109,6 @@ in sources."is-obj-1.0.1" sources."is-path-inside-1.0.1" sources."is-plain-object-2.0.4" - sources."is-promise-2.1.0" sources."is-redirect-1.0.0" sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" @@ -56897,8 +57146,8 @@ in sources."methods-1.1.2" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -57007,7 +57256,7 @@ in sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" sources."ret-0.1.15" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."rxjs-6.5.5" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" @@ -57183,23 +57432,28 @@ in cpy-cli = nodeEnv.buildNodePackage { name = "cpy-cli"; packageName = "cpy-cli"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/cpy-cli/-/cpy-cli-3.1.0.tgz"; - sha512 = "LJhHvFragWvIsJH1kjhzZwGSagukewJZ5nV5yjMc5TILs+Z/CbZSvX0W9t9XC26Mw32j56UHjR3co5kAXaeTwg=="; + url = "https://registry.npmjs.org/cpy-cli/-/cpy-cli-3.1.1.tgz"; + sha512 = "HCpNdBkQy3rw+uARLuIf0YurqsMXYzBa9ihhSAuxYJcNIrqrSq3BstPfr0cQN38AdMrQiO9Dp4hYy7GtGJsLPg=="; }; dependencies = [ + sources."@babel/code-frame-7.8.3" + sources."@babel/helper-validator-identifier-7.9.5" + sources."@babel/highlight-7.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.13.2" + sources."@types/minimist-1.2.0" + sources."@types/node-13.13.4" + sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.0.1" + sources."ansi-styles-3.2.1" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" - sources."array-find-index-1.0.2" sources."array-union-1.0.2" sources."array-uniq-1.0.3" sources."array-unique-0.3.2" @@ -57220,8 +57474,9 @@ in }) sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" - sources."camelcase-4.1.0" - sources."camelcase-keys-4.2.0" + sources."camelcase-5.3.1" + sources."camelcase-keys-6.2.2" + sources."chalk-2.4.2" (sources."class-utils-0.3.6" // { dependencies = [ sources."define-property-0.2.5" @@ -57241,12 +57496,13 @@ in }) sources."clean-stack-2.2.0" sources."collection-visit-1.0.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."copy-descriptor-0.1.1" sources."cp-file-7.0.0" sources."cpy-8.1.0" - sources."currently-unhandled-0.4.1" sources."debug-2.6.9" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { @@ -57258,6 +57514,7 @@ in sources."define-property-2.0.2" sources."dir-glob-2.2.2" sources."error-ex-1.3.2" + sources."escape-string-regexp-1.0.5" (sources."expand-brackets-2.1.4" // { dependencies = [ sources."define-property-0.2.5" @@ -57293,7 +57550,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."find-up-2.1.0" + sources."find-up-4.1.0" sources."for-in-1.0.2" sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" @@ -57306,7 +57563,9 @@ in }) sources."glob-to-regexp-0.3.0" sources."globby-9.2.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" + sources."hard-rejection-2.1.0" + sources."has-flag-3.0.0" (sources."has-glob-1.0.0" // { dependencies = [ sources."is-glob-3.1.0" @@ -57341,25 +57600,22 @@ in sources."is-windows-1.0.2" sources."isarray-1.0.0" sources."isobject-3.0.1" + sources."js-tokens-4.0.0" sources."json-parse-better-errors-1.0.2" sources."junk-3.1.0" sources."kind-of-6.0.3" - (sources."load-json-file-4.0.0" // { - dependencies = [ - sources."pify-3.0.0" - ]; - }) - sources."locate-path-2.0.0" - sources."loud-rejection-1.6.0" + sources."lines-and-columns-1.1.6" + sources."locate-path-5.0.0" sources."make-dir-3.1.0" sources."map-cache-0.2.2" - sources."map-obj-2.0.0" + sources."map-obj-4.1.0" sources."map-visit-1.0.0" - sources."meow-5.0.0" + sources."meow-6.1.1" sources."merge2-1.3.0" sources."micromatch-3.1.10" + sources."min-indent-1.0.0" sources."minimatch-3.0.4" - (sources."minimist-options-3.0.2" // { + (sources."minimist-options-4.0.2" // { dependencies = [ sources."arrify-1.0.1" ]; @@ -57405,15 +57661,15 @@ in ]; }) sources."p-finally-1.0.0" - sources."p-limit-1.3.0" - sources."p-locate-2.0.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" sources."p-map-3.0.0" sources."p-timeout-2.0.1" - sources."p-try-1.0.0" - sources."parse-json-4.0.0" + sources."p-try-2.2.0" + sources."parse-json-5.0.0" sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" - sources."path-exists-3.0.0" + sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" (sources."path-type-3.0.0" // { @@ -57423,14 +57679,18 @@ in }) sources."pify-4.0.1" sources."posix-character-classes-0.1.1" - sources."quick-lru-1.1.0" - sources."read-pkg-3.0.0" - sources."read-pkg-up-3.0.0" - (sources."redent-2.0.0" // { + sources."quick-lru-4.0.1" + (sources."read-pkg-5.2.0" // { dependencies = [ - sources."indent-string-3.2.0" + sources."type-fest-0.6.0" + ]; + }) + (sources."read-pkg-up-7.0.1" // { + dependencies = [ + sources."type-fest-0.8.1" ]; }) + sources."redent-3.0.0" sources."regex-not-1.0.2" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" @@ -57444,7 +57704,6 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."signal-exit-3.0.3" sources."slash-2.0.0" (sources."snapdragon-0.8.2" // { dependencies = [ @@ -57499,8 +57758,8 @@ in sources."kind-of-5.1.0" ]; }) - sources."strip-bom-3.0.0" - sources."strip-indent-2.0.0" + sources."strip-indent-3.0.0" + sources."supports-color-5.5.0" (sources."to-object-path-0.3.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -57508,7 +57767,8 @@ in }) sources."to-regex-3.0.2" sources."to-regex-range-2.1.1" - sources."trim-newlines-2.0.0" + sources."trim-newlines-3.0.0" + sources."type-fest-0.13.1" sources."union-value-1.0.1" (sources."unset-value-1.0.0" // { dependencies = [ @@ -57524,7 +57784,7 @@ in sources."use-3.1.1" sources."validate-npm-package-license-3.0.4" sources."wrappy-1.0.2" - sources."yargs-parser-10.1.0" + sources."yargs-parser-18.1.3" ]; buildInputs = globalBuildInputs; meta = { @@ -57555,7 +57815,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-13.13.2" + sources."@types/node-13.13.4" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -57616,7 +57876,6 @@ in ]; }) sources."is-fullwidth-code-point-2.0.0" - sources."is-promise-2.1.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."lodash-4.17.15" @@ -57630,8 +57889,8 @@ in sources."lru-cache-4.1.5" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" sources."minimist-1.2.5" sources."ms-2.1.2" @@ -57643,12 +57902,12 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" sources."pseudomap-1.0.2" - sources."qs-6.9.3" + sources."qs-6.9.4" sources."quicktask-1.1.0" sources."raf-3.3.2" sources."readable-stream-2.3.7" sources."restore-cursor-2.0.0" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" sources."safe-buffer-5.1.2" @@ -57738,7 +57997,7 @@ in sources."fstream-1.0.12" sources."fstream-ignore-1.0.5" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-flag-4.0.0" sources."hyperquest-2.1.3" sources."iconv-lite-0.4.24" @@ -57755,7 +58014,6 @@ in ]; }) sources."is-fullwidth-code-point-3.0.0" - sources."is-promise-2.1.0" sources."isarray-0.0.1" sources."isexe-2.0.0" sources."jsonfile-4.0.0" @@ -57775,7 +58033,7 @@ in sources."readable-stream-1.1.14" sources."restore-cursor-3.1.0" sources."rimraf-2.7.1" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."rxjs-6.5.5" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -58113,7 +58371,7 @@ in sources."global-4.3.2" sources."global-dirs-0.1.1" sources."got-6.7.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-flag-3.0.0" @@ -58127,7 +58385,7 @@ in sources."http-signature-1.2.0" (sources."hypercore-7.7.1" // { dependencies = [ - sources."codecs-2.0.0" + sources."codecs-2.1.0" sources."unordered-set-2.0.1" ]; }) @@ -58214,27 +58472,27 @@ in sources."menu-string-1.3.0" sources."merkle-tree-stream-3.0.3" sources."micromatch-3.1.10" - sources."mime-2.4.4" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-2.4.5" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-response-2.1.0" sources."min-document-2.19.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mirror-folder-3.0.1" + sources."mirror-folder-3.1.0" (sources."mixin-deep-1.3.2" // { dependencies = [ sources."is-extendable-1.0.1" ]; }) sources."mkdirp-0.5.5" - sources."mkdirp-classic-0.5.2" + sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" sources."multi-random-access-2.1.1" sources."multicast-dns-7.2.2" sources."multistream-2.1.1" sources."mute-stream-0.0.8" - sources."mutexify-1.2.0" + sources."mutexify-1.3.0" sources."nan-2.14.1" sources."nanoassert-1.1.0" sources."nanobus-4.4.0" @@ -58382,7 +58640,7 @@ in sources."sodium-javascript-0.5.6" (sources."sodium-native-2.4.9" // { dependencies = [ - sources."node-gyp-build-4.2.1" + sources."node-gyp-build-4.2.2" ]; }) sources."sodium-universal-2.0.0" @@ -58488,9 +58746,9 @@ in sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."utile-0.3.0" - (sources."utp-native-2.1.7" // { + (sources."utp-native-2.1.10" // { dependencies = [ - sources."node-gyp-build-4.2.1" + sources."node-gyp-build-4.2.2" sources."readable-stream-3.6.0" sources."unordered-set-2.0.1" ]; @@ -58617,8 +58875,8 @@ in sources."merge-descriptors-0.0.2" sources."methods-1.1.2" sources."mime-1.2.11" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimist-0.0.10" sources."ms-0.7.0" sources."nan-2.14.1" @@ -58694,14 +58952,14 @@ in dockerfile-language-server-nodejs = nodeEnv.buildNodePackage { name = "dockerfile-language-server-nodejs"; packageName = "dockerfile-language-server-nodejs"; - version = "0.0.23"; + version = "0.0.24"; src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.0.23.tgz"; - sha512 = "cOMMCsZ2hAt68NjLaBMTWHgCZvM5UfnQI25yIAAVJ6o6srqlUcDzl39CmO7OZsDVOtyG7n+T72PelVmQH2ymlw=="; + url = "https://registry.npmjs.org/dockerfile-language-server-nodejs/-/dockerfile-language-server-nodejs-0.0.24.tgz"; + sha512 = "tG0cE6yIyj80eKHMbDBMNPHc1l40GW8v7b8jeDRs0Jv42boG0s6DEsM/eDFQw92mwAtBry07mB1tM+jSwqGzJw=="; }; dependencies = [ sources."dockerfile-ast-0.0.25" - (sources."dockerfile-language-service-0.0.11" // { + (sources."dockerfile-language-service-0.0.12" // { dependencies = [ (sources."dockerfile-utils-0.0.16" // { dependencies = [ @@ -58734,10 +58992,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.27.3"; + version = "6.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.27.3.tgz"; - sha512 = "nzkJS9Z/bEXk+AOouAU2SGuhU1OSXjuhvn+48/l97YbREWk2nY1bmguTe/dHW7w8vBxg1cQW/yqTZ8o+rxTAmw=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.28.0.tgz"; + sha512 = "JVT1VyJqRdSqg9xFy7FQtdcHlWfBLiW08DUtJZaRRsU/4mEvLtUXU1y+h6n3nRtoe5HplVMsP/Dlwj0jUMSPug=="; }; dependencies = [ sources."JSONStream-1.3.5" @@ -58746,7 +59004,7 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.661.0" + sources."aws-sdk-2.669.0" sources."aws-sign2-0.7.0" sources."aws4-1.9.1" sources."base64-js-1.3.1" @@ -58795,13 +59053,13 @@ in sources."jsprim-1.4.1" sources."lodash-4.17.15" sources."lossless-json-1.0.3" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimist-1.2.5" sources."oauth-sign-0.9.0" sources."once-1.4.0" sources."p-finally-1.0.0" - sources."p-queue-6.3.0" + sources."p-queue-6.4.0" sources."p-timeout-3.2.0" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" @@ -58893,8 +59151,8 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/core-7.9.0" - sources."@babel/generator-7.9.5" + sources."@babel/core-7.9.6" + sources."@babel/generator-7.9.6" sources."@babel/helper-annotate-as-pure-7.8.3" sources."@babel/helper-builder-react-jsx-7.9.0" sources."@babel/helper-builder-react-jsx-experimental-7.9.5" @@ -58905,22 +59163,22 @@ in sources."@babel/helper-module-transforms-7.9.0" sources."@babel/helper-optimise-call-expression-7.8.3" sources."@babel/helper-plugin-utils-7.8.3" - sources."@babel/helper-replace-supers-7.8.6" + sources."@babel/helper-replace-supers-7.9.6" sources."@babel/helper-simple-access-7.8.3" sources."@babel/helper-split-export-declaration-7.8.3" sources."@babel/helper-validator-identifier-7.9.5" - sources."@babel/helpers-7.9.2" + sources."@babel/helpers-7.9.6" sources."@babel/highlight-7.9.0" - sources."@babel/parser-7.9.4" - sources."@babel/plugin-proposal-object-rest-spread-7.9.5" + sources."@babel/parser-7.9.6" + sources."@babel/plugin-proposal-object-rest-spread-7.9.6" sources."@babel/plugin-syntax-jsx-7.8.3" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-transform-destructuring-7.9.5" sources."@babel/plugin-transform-parameters-7.9.5" sources."@babel/plugin-transform-react-jsx-7.9.4" sources."@babel/template-7.8.6" - sources."@babel/traverse-7.9.5" - sources."@babel/types-7.9.5" + sources."@babel/traverse-7.9.6" + sources."@babel/types-7.9.6" sources."@sindresorhus/is-2.1.1" sources."@szmarczak/http-timer-4.0.5" sources."@types/cacheable-request-6.0.1" @@ -58928,7 +59186,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.0" - sources."@types/node-13.13.2" + sources."@types/node-13.13.4" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.1" @@ -59033,12 +59291,13 @@ in }) sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" + sources."is-docker-2.0.0" sources."is-fullwidth-code-point-3.0.0" sources."is-obj-2.0.0" sources."is-plain-obj-1.1.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" - sources."is-wsl-2.1.1" + sources."is-wsl-2.2.0" sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" @@ -59082,9 +59341,9 @@ in sources."mimic-fn-3.0.0" ]; }) - (sources."meow-6.1.0" // { + (sources."meow-6.1.1" // { dependencies = [ - sources."type-fest-0.8.1" + sources."type-fest-0.13.1" ]; }) sources."mimic-fn-2.1.0" @@ -59315,7 +59574,6 @@ in sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" - sources."is-promise-2.1.0" sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."js-yaml-3.13.1" @@ -59345,7 +59603,7 @@ in sources."resolve-from-4.0.0" sources."restore-cursor-3.1.0" sources."rimraf-2.6.3" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."rxjs-6.5.5" sources."safer-buffer-2.1.2" sources."semver-6.3.0" @@ -59494,7 +59752,6 @@ in sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" - sources."is-promise-2.1.0" sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."js-yaml-3.13.1" @@ -59527,7 +59784,7 @@ in sources."resolve-from-4.0.0" sources."restore-cursor-3.1.0" sources."rimraf-2.6.3" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."rxjs-6.5.5" sources."safer-buffer-2.1.2" sources."semver-6.3.0" @@ -59638,7 +59895,7 @@ in sources."fs-extra-1.0.0" sources."get-stdin-4.0.1" sources."getpass-0.1.7" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-ansi-2.0.0" @@ -59676,8 +59933,8 @@ in sources."loud-rejection-1.6.0" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -59820,7 +60077,7 @@ in sources."external-editor-3.1.0" sources."figures-3.2.0" sources."find-up-4.1.0" - (sources."fkill-7.0.0" // { + (sources."fkill-7.0.1" // { dependencies = [ sources."ps-list-7.0.0" ]; @@ -59848,7 +60105,6 @@ in sources."is-arrayish-0.2.1" sources."is-fullwidth-code-point-3.0.0" sources."is-plain-obj-1.1.0" - sources."is-promise-2.1.0" sources."is-stream-2.0.0" sources."isexe-2.0.0" sources."js-tokens-4.0.0" @@ -59858,9 +60114,9 @@ in sources."lodash-4.17.15" sources."lru-cache-4.1.5" sources."map-obj-4.1.0" - (sources."meow-6.1.0" // { + (sources."meow-6.1.1" // { dependencies = [ - sources."type-fest-0.8.1" + sources."type-fest-0.13.1" ]; }) sources."merge-stream-2.0.0" @@ -59918,7 +60174,7 @@ in sources."redent-3.0.0" sources."resolve-1.17.0" sources."restore-cursor-3.1.0" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."rxjs-6.5.5" sources."safer-buffer-2.1.2" sources."semver-5.7.1" @@ -60055,7 +60311,7 @@ in sources."debug-2.6.9" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" - sources."deep-equal-2.0.2" + sources."deep-equal-2.0.3" sources."define-properties-1.1.3" sources."define-property-2.0.2" sources."defined-0.0.0" @@ -60127,7 +60383,7 @@ in sources."is-glob-3.1.0" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-1.0.3" sources."has-symbols-1.0.1" sources."has-value-1.0.0" @@ -60467,11 +60723,11 @@ in sources."lodash.get-4.4.2" sources."looper-4.0.0" sources."lrucache-1.0.3" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - sources."moment-2.24.0" + sources."moment-2.25.3" sources."moo-0.5.1" sources."ms-2.1.2" sources."multicb-1.2.2" @@ -60480,8 +60736,8 @@ in sources."multiserver-scopes-1.0.0" sources."muxrpc-6.5.0" sources."nan-2.14.1" - sources."nearley-2.19.2" - sources."node-gyp-build-4.2.1" + sources."nearley-2.19.3" + sources."node-gyp-build-4.2.2" sources."node-polyglot-1.0.0" sources."non-private-ip-1.4.4" sources."options-0.0.6" @@ -60628,10 +60884,10 @@ in gitmoji-cli = nodeEnv.buildNodePackage { name = "gitmoji-cli"; packageName = "gitmoji-cli"; - version = "3.2.3"; + version = "3.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-3.2.3.tgz"; - sha512 = "xUNP+b2CUzMIURcnEVXNgQo51ShKjjjfAO1U4a0A9KzathisjtGrsrrDUnXJlqojGOBYm/z2sAq/h0GfO6DX8A=="; + url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-3.2.4.tgz"; + sha512 = "rf0NbwZobW2Kwwomf41Ooas7rm7yg1z68fyKgrKaUs/VaaNtwIYMp/J11iQxcFu5p6i73huCytzmmo/8v4usDA=="; }; dependencies = [ sources."@babel/code-frame-7.8.3" @@ -60725,7 +60981,7 @@ in sources."get-stream-4.1.0" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."hard-rejection-2.1.0" sources."has-flag-4.0.0" sources."has-yarn-2.1.0" @@ -60759,7 +61015,6 @@ in sources."is-obj-2.0.0" sources."is-path-inside-3.0.2" sources."is-plain-obj-1.1.0" - sources."is-promise-2.1.0" sources."is-stream-2.0.0" sources."is-typedarray-1.0.0" sources."is-yarn-global-0.3.0" @@ -60787,9 +61042,9 @@ in sources."lowercase-keys-1.0.1" sources."make-dir-3.1.0" sources."map-obj-4.1.0" - (sources."meow-6.1.0" // { + (sources."meow-6.1.1" // { dependencies = [ - sources."type-fest-0.8.1" + sources."type-fest-0.13.1" ]; }) sources."merge-stream-2.0.0" @@ -60847,7 +61102,7 @@ in sources."resolve-1.17.0" sources."responselike-1.0.2" sources."restore-cursor-3.1.0" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."rxjs-6.5.5" sources."safer-buffer-2.1.2" sources."semver-6.3.0" @@ -60998,7 +61253,7 @@ in sources."chalk-2.4.2" sources."change-case-3.1.0" sources."chardet-0.7.0" - sources."chownr-1.1.4" + sources."chownr-2.0.0" sources."ci-info-2.0.0" sources."cli-boxes-2.2.0" sources."cli-cursor-3.1.0" @@ -61036,7 +61291,7 @@ in sources."core-util-is-1.0.2" sources."cosmiconfig-5.2.1" sources."create-error-class-3.0.2" - (sources."creato-1.1.1" // { + (sources."creato-1.1.2" // { dependencies = [ sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" @@ -61165,7 +61420,7 @@ in sources."get-stream-4.1.0" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."graphcool-json-schema-1.2.1" (sources."graphcool-yml-0.4.15" // { dependencies = [ @@ -61258,7 +61513,6 @@ in sources."is-npm-3.0.0" sources."is-obj-1.0.1" sources."is-path-inside-1.0.1" - sources."is-promise-2.1.0" sources."is-redirect-1.0.0" sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" @@ -61336,8 +61590,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -61475,7 +61729,7 @@ in sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."rimraf-2.7.1" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."rxjs-6.5.5" sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" @@ -61502,7 +61756,7 @@ in sources."simple-errors-1.0.1" sources."snake-case-2.1.0" sources."source-map-0.5.7" - (sources."source-map-support-0.5.18" // { + (sources."source-map-support-0.5.19" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -61532,7 +61786,7 @@ in sources."supports-color-5.5.0" sources."swap-case-1.1.2" sources."sync-exec-0.6.2" - (sources."tar-6.0.1" // { + (sources."tar-6.0.2" // { dependencies = [ sources."mkdirp-1.0.4" sources."yallist-4.0.0" @@ -61543,7 +61797,11 @@ in sources."through2-2.0.5" sources."timed-out-4.0.1" sources."title-case-2.1.1" - sources."tmp-0.1.0" + (sources."tmp-0.2.1" // { + dependencies = [ + sources."rimraf-3.0.2" + ]; + }) sources."tmp-graphql-config-extension-openapi-1.0.7" sources."to-fast-properties-2.0.0" sources."to-readable-stream-1.0.0" @@ -61925,7 +62183,7 @@ in sources."ansi-term-0.0.2" sources."ansicolors-0.3.2" sources."blessed-0.1.81" - sources."blessed-contrib-4.8.19" + sources."blessed-contrib-4.8.20" sources."bresenham-0.0.3" sources."buffers-0.1.1" sources."cardinal-2.1.1" @@ -61955,10 +62213,10 @@ in sources."lodash.toarray-4.4.0" sources."map-canvas-0.1.5" sources."marked-0.7.0" - (sources."marked-terminal-4.0.0" // { + (sources."marked-terminal-4.1.0" // { dependencies = [ sources."ansi-styles-4.2.1" - sources."chalk-3.0.0" + sources."chalk-4.0.0" sources."supports-color-7.1.0" ]; }) @@ -61981,7 +62239,7 @@ in sources."supports-color-7.1.0" ]; }) - sources."systeminformation-4.23.5" + sources."systeminformation-4.24.1" sources."term-canvas-0.0.5" sources."type-fest-0.11.0" sources."wordwrap-0.0.3" @@ -62189,7 +62447,7 @@ in sources."global-modules-1.0.0" sources."global-prefix-1.0.2" sources."glogg-1.0.2" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."gulp-cli-2.2.0" sources."gulplog-1.0.0" sources."has-symbols-1.0.1" @@ -62320,7 +62578,7 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."replace-ext-1.0.0" + sources."replace-ext-1.0.1" sources."replace-homedir-1.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" @@ -62571,7 +62829,7 @@ in sources."global-modules-1.0.0" sources."global-prefix-1.0.2" sources."glogg-1.0.2" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."gulplog-1.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -62822,7 +63080,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.9.1" + sources."uglify-js-3.9.2" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -62913,8 +63171,8 @@ in sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."lodash-4.17.15" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."oauth-sign-0.9.0" sources."once-1.4.0" @@ -62960,10 +63218,10 @@ in http-server = nodeEnv.buildNodePackage { name = "http-server"; packageName = "http-server"; - version = "0.12.1"; + version = "0.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/http-server/-/http-server-0.12.1.tgz"; - sha512 = "T0jB+7J7GJ2Vo+a4/T7P7SbQ3x2GPDnqRqQXdfEuPuUOmES/9NBxPnDm7dh1HGEeUWqUmLUNtGV63ZC5Uy3tGA=="; + url = "https://registry.npmjs.org/http-server/-/http-server-0.12.3.tgz"; + sha512 = "be0dKG6pni92bRjq0kvExtj/NrrAd28/8fCXkaI/4piTwQMSDSLMhWyW0NI1V+DBI3aa1HMlQu46/HjVLfmugA=="; }; dependencies = [ sources."async-2.6.3" @@ -62982,18 +63240,12 @@ in sources."mkdirp-0.5.5" sources."ms-2.1.2" sources."opener-1.5.1" - (sources."optimist-0.6.1" // { - dependencies = [ - sources."minimist-0.0.10" - ]; - }) - sources."portfinder-1.0.25" - sources."qs-6.9.3" + sources."portfinder-1.0.26" + sources."qs-6.9.4" sources."requires-port-1.0.0" sources."secure-compare-3.0.1" sources."union-0.5.0" sources."url-join-2.0.5" - sources."wordwrap-0.0.3" ]; buildInputs = globalBuildInputs; meta = { @@ -63093,7 +63345,7 @@ in sources."minimist-1.2.5" ]; }) - sources."moment-2.24.0" + sources."moment-2.25.3" sources."mv-2.1.1" sources."nan-2.14.1" sources."ncp-2.0.0" @@ -63160,7 +63412,7 @@ in sha512 = "l4g7U75E+WgrgNGH774djfTyp5Aw+2jJokYe9iCunSAbi/w+nRGHqTJfwbODLwiJQTnbXkM42FxgPRA29Ce7Bg=="; }; dependencies = [ - sources."@types/jquery-3.3.35" + sources."@types/jquery-3.3.37" sources."@types/sizzle-2.3.2" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" @@ -63174,7 +63426,7 @@ in sources."fs.realpath-1.0.0" sources."glob-7.1.6" sources."good-listener-1.2.2" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."historic-readline-1.0.8" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -63322,7 +63574,7 @@ in ]; }) sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-flag-4.0.0" sources."http-errors-1.7.3" (sources."http-proxy-agent-2.1.0" // { @@ -63352,10 +63604,9 @@ in sources."ip-1.1.5" sources."is-docker-2.0.0" sources."is-fullwidth-code-point-2.0.0" - sources."is-promise-2.1.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" - sources."is-wsl-2.1.1" + sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."jsonfile-4.0.0" @@ -63388,9 +63639,9 @@ in sources."lru-cache-5.1.1" sources."macos-release-2.3.0" sources."methods-1.1.2" - sources."mime-2.4.4" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-2.4.5" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -63422,13 +63673,13 @@ in sources."proxy-agent-3.1.1" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."qs-6.9.3" + sources."qs-6.9.4" sources."raw-body-2.4.1" sources."readable-stream-3.6.0" sources."restore-cursor-2.0.0" sources."rimraf-3.0.2" sources."rsvp-3.6.2" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."rxjs-6.5.5" sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" @@ -63512,7 +63763,7 @@ in }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-7.2.3" + sources."ws-7.2.5" sources."xregexp-2.0.0" sources."yallist-3.1.1" ]; @@ -63667,7 +63918,7 @@ in sources."get-stream-3.0.0" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-flag-4.0.0" @@ -63703,8 +63954,8 @@ in sources."megaminx-0.9.0" sources."mem-1.1.0" sources."microbuffer-1.0.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -63942,10 +64193,10 @@ in jake = nodeEnv.buildNodePackage { name = "jake"; packageName = "jake"; - version = "10.5.2"; + version = "10.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/jake/-/jake-10.5.2.tgz"; - sha512 = "2twpudoNYV7izUgKoLoVCwLFV+x8W5PQHri4ZPSm3L2viTq+DxVPQi9WJoeDSTCKE/G3lB5e78KAbeFhYQpgKA=="; + url = "https://registry.npmjs.org/jake/-/jake-10.6.1.tgz"; + sha512 = "pHUK3+V0BjOb1XSi95rbBksrMdIqLVC9bJqDnshVyleYsET3H0XAq+3VB2E3notcYvv4wRdRHn13p7vobG+wfQ=="; }; dependencies = [ sources."ansi-styles-3.2.1" @@ -63957,15 +64208,10 @@ in sources."color-name-1.1.3" sources."concat-map-0.0.1" sources."escape-string-regexp-1.0.5" - (sources."filelist-0.0.6" // { - dependencies = [ - sources."utilities-0.0.37" - ]; - }) + sources."filelist-1.0.1" sources."has-flag-3.0.0" sources."minimatch-3.0.4" sources."supports-color-5.5.0" - sources."utilities-1.0.5" ]; buildInputs = globalBuildInputs; meta = { @@ -64200,7 +64446,7 @@ in sources."crypt-0.0.2" sources."css-2.2.4" sources."cssom-0.4.4" - (sources."cssstyle-2.2.0" // { + (sources."cssstyle-2.3.0" // { dependencies = [ sources."cssom-0.3.8" ]; @@ -64326,7 +64572,7 @@ in sources."getpass-0.1.7" sources."github-from-package-0.0.0" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-ansi-2.0.0" @@ -64490,9 +64736,9 @@ in sources."mdurl-1.0.1" sources."memory-cache-0.2.0" sources."micromatch-3.1.10" - sources."mime-2.4.4" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-2.4.5" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-response-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -64504,8 +64750,8 @@ in ]; }) sources."mkdirp-0.5.5" - sources."mkdirp-classic-0.5.2" - sources."moment-2.24.0" + sources."mkdirp-classic-0.5.3" + sources."moment-2.25.3" sources."ms-2.1.2" (sources."multiparty-4.2.1" // { dependencies = [ @@ -64704,7 +64950,7 @@ in sources."split-skip-0.0.2" sources."split-string-3.1.0" sources."sprintf-js-1.1.2" - sources."sqlite3-4.1.1" + sources."sqlite3-4.2.0" sources."sshpk-1.16.1" (sources."static-extend-0.1.2" // { dependencies = [ @@ -64848,7 +65094,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."ws-7.2.3" + sources."ws-7.2.5" sources."xml-name-validator-3.0.0" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" @@ -64945,13 +65191,13 @@ in sha512 = "3G9d37VHv7MFdheviDCjUfQoIjdv4TC5zTTf5G9VODLtOnVS6La1eoYBDlbWfsRT3/Xo+j2MIqki2EV12BZfwA=="; }; dependencies = [ - sources."@babel/parser-7.9.4" + sources."@babel/parser-7.9.6" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.8.11" sources."entities-2.0.0" sources."escape-string-regexp-2.0.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."js2xmlparser-4.0.1" sources."klaw-3.0.0" sources."linkify-it-2.2.0" @@ -65103,14 +65349,14 @@ in sources."lodash-4.17.15" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."ms-2.1.2" sources."native-promise-only-0.8.1" sources."path-loader-1.0.10" sources."process-nextick-args-2.0.1" sources."punycode-2.1.1" - sources."qs-6.9.3" + sources."qs-6.9.4" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."slash-3.0.0" @@ -65239,7 +65485,7 @@ in sources."getpass-0.1.7" sources."global-dirs-2.0.1" sources."got-9.6.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-flag-4.0.0" @@ -65259,7 +65505,7 @@ in sources."is-npm-4.0.0" sources."is-obj-2.0.0" sources."is-path-inside-3.0.2" - sources."is-promise-2.1.0" + sources."is-promise-2.2.2" sources."is-typedarray-1.0.0" sources."is-yarn-global-0.3.0" sources."isarray-0.0.1" @@ -65289,8 +65535,8 @@ in }) sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-response-1.0.1" sources."minimist-1.2.5" (sources."morgan-1.10.0" // { @@ -65440,10 +65686,10 @@ in karma = nodeEnv.buildNodePackage { name = "karma"; packageName = "karma"; - version = "5.0.2"; + version = "5.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/karma/-/karma-5.0.2.tgz"; - sha512 = "RpUuCuGJfN3WnjYPGIH+VBF8023Lfm3TQH6D1kcNL+FxtEPc2UUz/nVjbVAGXH4Pm+Q7FVOAQjdAeFUpXpQ3IA=="; + url = "https://registry.npmjs.org/karma/-/karma-5.0.4.tgz"; + sha512 = "UGqTe2LBiGQBXRN+Fygeiq63tbfOX45639SKSbPkLpARwnxROWJZg+froGkpHxr84FXCe8UGCf+1PITM6frT5w=="; }; dependencies = [ sources."@types/color-name-1.1.1" @@ -65468,7 +65714,7 @@ in sources."bytes-3.1.0" sources."callsite-1.0.0" sources."camelcase-5.3.1" - sources."chokidar-3.3.1" + sources."chokidar-3.4.0" sources."cliui-6.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -65521,7 +65767,7 @@ in sources."get-caller-file-2.0.5" sources."glob-7.1.6" sources."glob-parent-5.1.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-binary2-1.0.3" sources."has-cors-1.1.0" sources."http-errors-1.7.2" @@ -65547,9 +65793,9 @@ in ]; }) sources."media-typer-0.3.0" - sources."mime-2.4.4" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-2.4.5" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."ms-2.0.0" sources."negotiator-0.6.2" @@ -65571,7 +65817,7 @@ in sources."qs-6.7.0" sources."range-parser-1.2.1" sources."raw-body-2.4.0" - sources."readdirp-3.3.0" + sources."readdirp-3.4.0" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."requires-port-1.0.0" @@ -65669,7 +65915,7 @@ in sources."glob-7.1.6" sources."glob-parent-3.1.0" sources."glob-stream-6.1.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-symbols-1.0.1" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -65703,7 +65949,7 @@ in sources."remove-bom-buffer-3.0.0" sources."remove-bom-stream-1.2.0" sources."remove-trailing-separator-1.1.0" - sources."replace-ext-1.0.0" + sources."replace-ext-1.0.1" sources."resolve-options-1.1.0" sources."safe-buffer-5.1.2" sources."stream-shift-1.0.1" @@ -65849,13 +66095,13 @@ in sources."mimic-fn-2.1.0" ]; }) - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.24.0" + sources."moment-2.25.3" sources."mute-stream-0.0.8" (sources."nconf-0.10.0" // { dependencies = [ @@ -66114,11 +66360,11 @@ in }) sources."@octokit/request-error-1.2.1" sources."@octokit/rest-16.43.1" - sources."@octokit/types-2.12.1" + sources."@octokit/types-2.12.2" sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.13.2" + sources."@types/node-13.13.4" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" @@ -66303,7 +66549,7 @@ in sources."encoding-0.1.12" sources."end-of-stream-1.4.4" sources."env-paths-2.2.0" - sources."envinfo-7.5.0" + sources."envinfo-7.5.1" sources."err-code-1.1.2" sources."error-ex-1.3.2" sources."es-abstract-1.17.5" @@ -66438,7 +66684,7 @@ in sources."pify-4.0.1" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" (sources."handlebars-4.7.6" // { dependencies = [ sources."source-map-0.6.1" @@ -66512,7 +66758,6 @@ in sources."is-obj-1.0.1" sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" - sources."is-promise-2.1.0" sources."is-regex-1.0.5" sources."is-ssh-1.3.1" sources."is-stream-1.1.0" @@ -66567,8 +66812,8 @@ in }) sources."merge2-1.3.0" sources."micromatch-3.1.10" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -66741,7 +66986,7 @@ in sources."ret-0.1.15" sources."retry-0.10.1" sources."rimraf-2.7.1" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."run-queue-1.0.3" sources."rxjs-6.5.5" sources."safe-buffer-5.2.0" @@ -66876,7 +67121,7 @@ in sources."tweetnacl-0.14.5" sources."type-fest-0.3.1" sources."typedarray-0.0.6" - sources."uglify-js-3.9.1" + sources."uglify-js-3.9.2" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."union-value-1.0.1" @@ -66987,7 +67232,7 @@ in sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."getpass-0.1.7" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."http-signature-1.2.0" @@ -67000,8 +67245,8 @@ in sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."oauth-sign-0.9.0" @@ -67182,7 +67427,7 @@ in sources."is-glob-3.1.0" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -67221,8 +67466,8 @@ in sources."map-visit-1.0.0" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mixin-deep-1.3.2" sources."morgan-1.10.0" sources."ms-2.0.0" @@ -67536,7 +67781,7 @@ in sources."github-slugger-1.3.0" sources."glob-base-0.3.0" sources."glob-parent-2.0.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" (sources."has-binary2-1.0.3" // { @@ -67624,8 +67869,8 @@ in sources."methods-1.1.2" sources."micromatch-2.3.11" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimist-1.2.5" (sources."mixin-deep-1.3.2" // { dependencies = [ @@ -67886,7 +68131,7 @@ in sources."uuid-3.4.0" sources."vary-1.1.2" sources."verror-1.10.0" - sources."ws-7.2.3" + sources."ws-7.2.5" sources."xmlhttprequest-ssl-1.5.5" sources."yeast-0.1.2" ]; @@ -67907,13 +68152,13 @@ in src = ../interpreters/clojurescript/lumo; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/compat-data-7.9.0" - sources."@babel/core-7.9.0" - sources."@babel/generator-7.9.5" + sources."@babel/compat-data-7.9.6" + sources."@babel/core-7.9.6" + sources."@babel/generator-7.9.6" sources."@babel/helper-annotate-as-pure-7.8.3" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.8.3" - sources."@babel/helper-compilation-targets-7.8.7" - sources."@babel/helper-create-class-features-plugin-7.9.5" + sources."@babel/helper-compilation-targets-7.9.6" + sources."@babel/helper-create-class-features-plugin-7.9.6" sources."@babel/helper-create-regexp-features-plugin-7.8.8" sources."@babel/helper-define-map-7.8.3" sources."@babel/helper-explode-assignable-expression-7.8.3" @@ -67927,18 +68172,18 @@ in sources."@babel/helper-plugin-utils-7.8.3" sources."@babel/helper-regex-7.8.3" sources."@babel/helper-remap-async-to-generator-7.8.3" - sources."@babel/helper-replace-supers-7.8.6" + sources."@babel/helper-replace-supers-7.9.6" sources."@babel/helper-simple-access-7.8.3" sources."@babel/helper-split-export-declaration-7.8.3" sources."@babel/helper-validator-identifier-7.9.5" sources."@babel/helper-wrap-function-7.8.3" - sources."@babel/helpers-7.9.2" + sources."@babel/helpers-7.9.6" (sources."@babel/highlight-7.9.0" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.9.4" + sources."@babel/parser-7.9.6" sources."@babel/plugin-external-helpers-7.8.3" sources."@babel/plugin-proposal-async-generator-functions-7.8.3" sources."@babel/plugin-proposal-class-properties-7.8.3" @@ -67946,7 +68191,7 @@ in sources."@babel/plugin-proposal-json-strings-7.8.3" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.8.3" sources."@babel/plugin-proposal-numeric-separator-7.8.3" - sources."@babel/plugin-proposal-object-rest-spread-7.9.5" + sources."@babel/plugin-proposal-object-rest-spread-7.9.6" sources."@babel/plugin-proposal-optional-catch-binding-7.8.3" sources."@babel/plugin-proposal-optional-chaining-7.9.0" sources."@babel/plugin-proposal-unicode-property-regex-7.8.8" @@ -67976,9 +68221,9 @@ in sources."@babel/plugin-transform-function-name-7.8.3" sources."@babel/plugin-transform-literals-7.8.3" sources."@babel/plugin-transform-member-expression-literals-7.8.3" - sources."@babel/plugin-transform-modules-amd-7.9.0" - sources."@babel/plugin-transform-modules-commonjs-7.9.0" - sources."@babel/plugin-transform-modules-systemjs-7.9.0" + sources."@babel/plugin-transform-modules-amd-7.9.6" + sources."@babel/plugin-transform-modules-commonjs-7.9.6" + sources."@babel/plugin-transform-modules-systemjs-7.9.6" sources."@babel/plugin-transform-modules-umd-7.9.0" sources."@babel/plugin-transform-named-capturing-groups-regex-7.8.3" sources."@babel/plugin-transform-new-target-7.8.3" @@ -67987,20 +68232,20 @@ in sources."@babel/plugin-transform-property-literals-7.8.3" sources."@babel/plugin-transform-regenerator-7.8.7" sources."@babel/plugin-transform-reserved-words-7.8.3" - sources."@babel/plugin-transform-runtime-7.9.0" + sources."@babel/plugin-transform-runtime-7.9.6" sources."@babel/plugin-transform-shorthand-properties-7.8.3" sources."@babel/plugin-transform-spread-7.8.3" sources."@babel/plugin-transform-sticky-regex-7.8.3" sources."@babel/plugin-transform-template-literals-7.8.3" sources."@babel/plugin-transform-typeof-symbol-7.8.4" sources."@babel/plugin-transform-unicode-regex-7.8.3" - sources."@babel/preset-env-7.9.5" + sources."@babel/preset-env-7.9.6" sources."@babel/preset-modules-0.1.3" sources."@babel/preset-stage-2-7.8.3" - sources."@babel/runtime-7.9.2" + sources."@babel/runtime-7.9.6" sources."@babel/template-7.8.6" - sources."@babel/traverse-7.9.5" - sources."@babel/types-7.9.5" + sources."@babel/traverse-7.9.6" + sources."@babel/types-7.9.6" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" (sources."@istanbuljs/load-nyc-config-1.0.0" // { @@ -68014,22 +68259,23 @@ in ]; }) sources."@istanbuljs/schema-0.1.2" - (sources."@jest/transform-25.4.0" // { + (sources."@jest/transform-25.5.1" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@jest/types-25.4.0" + sources."@jest/types-25.5.0" sources."@types/babel__core-7.1.7" sources."@types/babel__generator-7.6.1" sources."@types/babel__template-7.0.2" - sources."@types/babel__traverse-7.0.10" + sources."@types/babel__traverse-7.0.11" sources."@types/color-name-1.1.1" sources."@types/estree-0.0.44" + sources."@types/graceful-fs-4.1.3" sources."@types/istanbul-lib-coverage-2.0.1" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.1" - sources."@types/node-13.13.2" + sources."@types/node-13.13.4" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.4" @@ -68098,7 +68344,7 @@ in sources."babel-helper-mark-eval-scopes-0.4.3" sources."babel-helper-remove-or-void-0.4.3" sources."babel-helper-to-multiple-sequence-expressions-0.5.0" - sources."babel-jest-25.4.0" + sources."babel-jest-25.5.1" (sources."babel-loader-8.1.0" // { dependencies = [ sources."mkdirp-0.5.5" @@ -68106,7 +68352,7 @@ in }) sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-istanbul-6.0.0" - sources."babel-plugin-jest-hoist-25.4.0" + sources."babel-plugin-jest-hoist-25.5.0" sources."babel-plugin-minify-builtins-0.5.0" sources."babel-plugin-minify-constant-folding-0.5.0" sources."babel-plugin-minify-dead-code-elimination-0.5.1" @@ -68132,7 +68378,7 @@ in sources."babel-plugin-transform-simplify-comparison-operators-6.9.4" sources."babel-plugin-transform-undefined-to-void-6.9.4" sources."babel-preset-current-node-syntax-0.1.2" - sources."babel-preset-jest-25.4.0" + sources."babel-preset-jest-25.5.0" sources."babel-preset-minify-0.5.1" (sources."babel-runtime-6.26.0" // { dependencies = [ @@ -68197,7 +68443,7 @@ in sources."cache-base-1.0.1" sources."cached-path-relative-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001046" + sources."caniuse-lite-1.0.30001050" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -68314,7 +68560,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.415" + sources."electron-to-chromium-1.3.427" sources."elliptic-6.5.2" sources."emoji-regex-7.0.3" sources."emojis-list-3.0.0" @@ -68431,7 +68677,7 @@ in }) sources."globals-11.12.0" sources."google-closure-compiler-js-20170910.0.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" (sources."gunzip-maybe-1.4.2" // { dependencies = [ sources."browserify-zlib-0.1.4" @@ -68449,7 +68695,12 @@ in sources."kind-of-4.0.0" ]; }) - sources."hash-base-3.0.4" + (sources."hash-base-3.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + sources."safe-buffer-5.2.0" + ]; + }) sources."hash.js-1.1.7" sources."hmac-drbg-1.0.1" sources."homedir-polyfill-1.0.3" @@ -68509,11 +68760,11 @@ in sources."semver-6.3.0" ]; }) - sources."jest-haste-map-25.4.0" + sources."jest-haste-map-25.5.1" sources."jest-regex-util-25.2.6" - sources."jest-serializer-25.2.6" - sources."jest-util-25.4.0" - (sources."jest-worker-25.4.0" // { + sources."jest-serializer-25.5.0" + sources."jest-util-25.5.0" + (sources."jest-worker-25.5.0" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-7.1.0" @@ -68532,7 +68783,7 @@ in sources."jsonify-0.0.0" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" - sources."jszip-git://github.com/anmonteiro/jszip#patch-1" + sources."jszip-2.6.1" sources."kind-of-6.0.3" sources."labeled-stream-splicer-2.0.2" sources."lcid-2.0.0" @@ -68573,8 +68824,8 @@ in ]; }) sources."miller-rabin-4.0.1" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-2.1.0" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" @@ -68587,7 +68838,7 @@ in ]; }) sources."mkdirp-1.0.4" - sources."mkdirp-classic-0.5.2" + sources."mkdirp-classic-0.5.3" sources."module-deps-6.2.2" (sources."move-concurrently-1.0.1" // { dependencies = [ @@ -68731,7 +68982,7 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."replace-ext-1.0.0" + sources."replace-ext-1.0.1" sources."request-2.88.2" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" @@ -68823,7 +69074,7 @@ in sources."source-list-map-0.1.8" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - (sources."source-map-support-0.5.18" // { + (sources."source-map-support-0.5.19" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -68882,7 +69133,7 @@ in sources."readable-stream-3.6.0" ]; }) - (sources."terser-4.6.11" // { + (sources."terser-4.6.13" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -69081,7 +69332,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."combined-stream-1.0.8" - sources."commander-5.0.0" + sources."commander-5.1.0" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" @@ -69111,8 +69362,8 @@ in sources."lodash-4.17.15" sources."markdown-link-extractor-1.2.3" sources."marked-0.8.2" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."ms-2.1.2" sources."oauth-sign-0.9.0" sources."performance-now-2.1.0" @@ -69442,7 +69693,7 @@ in sources."fragment-cache-0.2.1" (sources."fs-mkdirp-stream-1.0.0" // { dependencies = [ - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."readable-stream-2.3.7" sources."string_decoder-1.1.1" sources."through2-2.0.5" @@ -69497,7 +69748,7 @@ in }) (sources."gulp-sourcemaps-2.6.5" // { dependencies = [ - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."readable-stream-2.3.7" sources."source-map-0.6.1" sources."string_decoder-1.1.1" @@ -69514,7 +69765,7 @@ in sources."extend-shallow-1.1.4" sources."glob-7.1.6" sources."glob-stream-6.1.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."kind-of-1.1.0" sources."minimatch-3.0.4" sources."ordered-read-streams-1.0.1" @@ -69582,7 +69833,7 @@ in ]; }) sources."is-plain-object-2.0.4" - sources."is-promise-2.1.0" + sources."is-promise-2.2.2" sources."is-relative-1.0.0" sources."is-typedarray-1.0.0" sources."is-unc-path-1.0.0" @@ -69615,7 +69866,7 @@ in sources."lead-1.0.0" (sources."less-2.7.3" // { dependencies = [ - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" ]; }) sources."liftoff-2.5.0" @@ -69654,8 +69905,8 @@ in sources."memoizee-0.4.14" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-2.0.10" sources."minimist-1.2.5" (sources."mixin-deep-1.3.2" // { @@ -69742,7 +69993,7 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."replace-ext-1.0.0" + sources."replace-ext-1.0.1" sources."request-2.81.0" sources."resolve-1.17.0" sources."resolve-dir-1.0.1" @@ -69856,7 +70107,7 @@ in sources."tweetnacl-0.14.5" sources."type-1.2.0" sources."typescript-3.8.3" - sources."uglify-js-3.9.1" + sources."uglify-js-3.9.2" sources."uglify-to-browserify-1.0.2" sources."unc-path-regex-0.1.2" sources."union-value-1.0.1" @@ -69893,7 +70144,7 @@ in dependencies = [ sources."clone-2.1.2" sources."clone-stats-1.0.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."vinyl-2.2.0" ]; }) @@ -69919,10 +70170,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "7.1.1"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-7.1.1.tgz"; - sha512 = "3qQsu3ijNS3GkWcccT5Zw0hf/rWvu1fTN9sPvEd81hlwsr30GX2GcDSSoBxo24IR8FelmrAydGC6/1J5QQP4WA=="; + url = "https://registry.npmjs.org/mocha/-/mocha-7.1.2.tgz"; + sha512 = "o96kdRKMKI3E8U0bjnfqW4QMk12MwZ4mhdBTf+B5a1q9+aq2HRnj+3ZdJu0B/ZhJeK78MgYuv6L8d/rA5AeBJA=="; }; dependencies = [ sources."ansi-colors-3.2.3" @@ -69994,7 +70245,7 @@ in sources."log-symbols-3.0.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mkdirp-0.5.3" + sources."mkdirp-0.5.5" sources."ms-2.1.1" sources."node-environment-flags-1.0.6" sources."normalize-path-3.0.0" @@ -70090,14 +70341,14 @@ in sources."lodash-4.17.15" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."ms-2.1.2" sources."native-promise-only-0.8.1" sources."path-loader-1.0.10" sources."process-nextick-args-2.0.1" sources."punycode-2.1.1" - sources."qs-6.9.3" + sources."qs-6.9.4" sources."readable-stream-2.3.7" sources."safe-buffer-5.1.2" sources."slash-3.0.0" @@ -70247,7 +70498,7 @@ in sources."gauge-2.7.4" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-unicode-2.0.1" @@ -70264,8 +70515,8 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."minipass-2.9.0" @@ -70324,10 +70575,10 @@ in node-gyp-build = nodeEnv.buildNodePackage { name = "node-gyp-build"; packageName = "node-gyp-build"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.1.tgz"; - sha512 = "XyCKXsqZfLqHep1hhsMncoXuUNt/cXCjg1+8CLbu69V1TKuPiOeSGbL9n+k/ByKH8UT0p4rdIX8XkTRZV0i7Sw=="; + url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.2.2.tgz"; + sha512 = "Lqh7mrByWCM8Cf9UPqpeoVBBo5Ugx+RKu885GAzmLBVYjeywScxHXPGLa4JfYNZmcNGwzR0Glu5/9GaQZMFqyA=="; }; buildInputs = globalBuildInputs; meta = { @@ -70431,7 +70682,7 @@ in ]; }) sources."glob-5.0.15" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-1.0.5" sources."har-validator-4.2.1" sources."has-unicode-2.0.1" @@ -70476,8 +70727,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -70722,16 +70973,16 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-1.0.5.tgz"; - sha512 = "va9ovLft0HDG0//KGwLU+4r4ZtUpQ8qPmH/FasnJUURROqeTcQpAd49T/3FtJuapJQML5ulSKL6jeD57DDMiyA=="; + url = "https://registry.npmjs.org/node-red/-/node-red-1.0.6.tgz"; + sha512 = "5K7LKdy232xLSHMo3ZprAEHbLilszSD/qQkt+9PxByJnEMACeHJ7SH4Gpt/1FX+K75gHHNtlnHsWwpQ53lggEA=="; }; dependencies = [ - sources."@babel/runtime-7.9.2" - sources."@node-red/editor-api-1.0.5" - sources."@node-red/editor-client-1.0.5" - (sources."@node-red/nodes-1.0.5" // { + sources."@babel/runtime-7.9.6" + sources."@node-red/editor-api-1.0.6" + sources."@node-red/editor-client-1.0.6" + (sources."@node-red/nodes-1.0.6" // { dependencies = [ sources."http-errors-1.7.3" sources."iconv-lite-0.5.1" @@ -70744,9 +70995,9 @@ in }) ]; }) - sources."@node-red/registry-1.0.5" - sources."@node-red/runtime-1.0.5" - sources."@node-red/util-1.0.5" + sources."@node-red/registry-1.0.6" + sources."@node-red/runtime-1.0.6" + sources."@node-red/util-1.0.6" sources."abbrev-1.1.1" sources."accepts-1.3.7" (sources."agent-base-6.0.0" // { @@ -70845,7 +71096,7 @@ in sources."cookie-signature-1.0.6" sources."core-util-is-1.0.2" sources."cors-2.8.5" - sources."cron-1.8.2" + sources."cron-1.7.2" sources."css-select-1.2.0" sources."css-what-2.1.3" sources."d-1.0.1" @@ -70933,7 +71184,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-unicode-2.0.1" @@ -70973,7 +71224,7 @@ in sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json-stringify-safe-5.0.1" - sources."jsonata-1.8.2" + sources."jsonata-1.8.3" sources."jsonfile-4.0.0" sources."jsprim-1.4.1" sources."leven-2.1.0" @@ -70999,8 +71250,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-2.4.4" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."minimist-1.2.5" (sources."minipass-2.9.0" // { @@ -71010,7 +71261,7 @@ in }) sources."minizlib-1.3.3" sources."mkdirp-0.5.5" - sources."moment-2.24.0" + sources."moment-2.25.3" sources."moment-timezone-0.5.28" (sources."mqtt-2.18.8" // { dependencies = [ @@ -71228,7 +71479,7 @@ in sources."buffer-from-1.1.1" sources."builtins-1.0.3" sources."caseless-0.12.0" - sources."chownr-1.1.4" + sources."chownr-2.0.0" sources."code-point-at-1.1.0" sources."combined-stream-1.0.8" sources."concat-map-0.0.1" @@ -71264,7 +71515,7 @@ in sources."gauge-2.7.4" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."has-unicode-2.0.1" @@ -71283,8 +71534,8 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-1.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."minipass-3.1.1" @@ -71360,7 +71611,7 @@ in ]; }) sources."strip-ansi-3.0.1" - (sources."tar-6.0.1" // { + (sources."tar-6.0.2" // { dependencies = [ sources."mkdirp-1.0.4" ]; @@ -71431,7 +71682,7 @@ in sources."supports-color-7.1.0" ]; }) - sources."chokidar-3.3.1" + sources."chokidar-3.4.0" sources."ci-info-2.0.0" sources."cli-boxes-2.2.0" sources."clone-response-1.0.2" @@ -71455,7 +71706,7 @@ in sources."glob-parent-5.1.1" sources."global-dirs-2.0.1" sources."got-9.6.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-flag-3.0.0" sources."has-yarn-2.1.0" sources."http-cache-semantics-4.1.0" @@ -71504,7 +71755,7 @@ in sources."pump-3.0.0" sources."pupa-2.0.1" sources."rc-1.2.8" - sources."readdirp-3.3.0" + sources."readdirp-3.4.0" sources."registry-auth-token-4.1.1" sources."registry-url-5.1.0" sources."responselike-1.0.2" @@ -71559,10 +71810,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "6.14.4"; + version = "6.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.14.4.tgz"; - sha512 = "B8UDDbWvdkW6RgXFn8/h2cHJP/u/FPa4HWeGzW23aNEBARN3QPrRaHqPIZW2NSN3fW649gtgUDNZpaRs0zTMPw=="; + url = "https://registry.npmjs.org/npm/-/npm-6.14.5.tgz"; + sha512 = "CDwa3FJd0XJpKDbWCST484H+mCNjF26dPrU+xnREW+upR0UODjMEfXPl3bxWuAwZIX6c2ASg1plLO7jP8ehWeA=="; }; buildInputs = globalBuildInputs; meta = { @@ -71584,19 +71835,23 @@ in }; dependencies = [ sources."@npmcli/ci-detect-1.2.0" - sources."@npmcli/git-2.0.1" + sources."@npmcli/git-2.0.2" sources."@npmcli/installed-package-contents-1.0.5" sources."@npmcli/promise-spawn-1.2.0" + sources."@npmcli/run-script-1.3.1" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tootallnate/once-1.1.2" sources."@types/color-name-1.1.1" + sources."abbrev-1.1.1" sources."agent-base-6.0.0" - sources."agentkeepalive-4.1.0" + sources."agentkeepalive-4.1.2" sources."aggregate-error-3.0.1" + sources."ajv-6.12.2" (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" + sources."is-fullwidth-code-point-2.0.0" sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; @@ -71604,17 +71859,28 @@ in sources."ansi-regex-2.1.1" sources."ansi-styles-4.2.1" sources."aproba-1.2.0" + sources."are-we-there-yet-1.1.5" sources."argparse-1.0.10" 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.9.1" sources."balanced-match-1.0.0" - sources."boxen-4.2.0" - sources."brace-expansion-1.1.11" - sources."builtins-1.0.3" - (sources."cacache-15.0.0" // { + sources."bcrypt-pbkdf-1.0.2" + (sources."boxen-4.2.0" // { dependencies = [ - sources."p-map-3.0.0" + sources."ansi-regex-5.0.0" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" ]; }) + sources."brace-expansion-1.1.11" + sources."builtins-1.0.3" + sources."cacache-15.0.3" (sources."cacheable-request-6.1.0" // { dependencies = [ sources."get-stream-5.1.0" @@ -71622,65 +71888,79 @@ in ]; }) sources."camelcase-5.3.1" + sources."caseless-0.12.0" sources."chalk-3.0.0" - sources."chownr-1.1.4" + sources."chownr-2.0.0" sources."ci-info-2.0.0" sources."cint-8.2.1" sources."clean-stack-2.2.0" sources."cli-boxes-2.2.0" sources."cli-table-0.3.1" sources."clone-response-1.0.2" + sources."code-point-at-1.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."colors-1.0.3" - sources."commander-5.0.0" + sources."combined-stream-1.0.8" + sources."commander-5.1.0" sources."concat-map-0.0.1" sources."configstore-5.0.1" - (sources."copy-concurrently-1.0.5" // { - dependencies = [ - sources."mkdirp-0.5.5" - ]; - }) + sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" sources."crypto-random-string-2.0.0" + sources."dashdash-1.14.1" sources."debug-4.1.1" sources."debuglog-1.0.1" sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" + sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" sources."depd-1.1.2" sources."dezalgo-1.0.3" sources."dot-prop-5.2.0" sources."duplexer3-0.1.4" + sources."ecc-jsbn-0.1.2" sources."emoji-regex-7.0.3" sources."encoding-0.1.12" sources."end-of-stream-1.4.4" + sources."env-paths-2.2.0" sources."err-code-1.1.2" sources."escape-goat-2.1.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" + sources."extend-3.0.2" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-3.1.1" sources."fast-diff-1.2.0" + sources."fast-json-stable-stringify-2.1.0" sources."figgy-pudding-3.5.2" sources."find-up-4.1.0" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" sources."fs-minipass-2.1.0" - sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" + sources."gauge-2.7.4" sources."get-stdin-7.0.0" sources."get-stream-4.1.0" + sources."getpass-0.1.7" sources."glob-7.1.6" sources."global-dirs-2.0.1" sources."got-9.6.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" + sources."har-schema-2.0.0" + sources."har-validator-5.1.3" sources."has-ansi-2.0.0" sources."has-flag-4.0.0" + sources."has-unicode-2.0.1" sources."has-yarn-2.1.0" sources."hosted-git-info-3.0.4" sources."http-cache-semantics-4.1.0" sources."http-proxy-agent-4.0.1" + sources."http-signature-1.2.0" sources."https-proxy-agent-5.0.0" sources."humanize-ms-1.2.1" sources."iconv-lite-0.4.24" - sources."iferr-0.1.5" sources."ignore-walk-3.0.3" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" @@ -71691,7 +71971,7 @@ in sources."ini-1.3.5" sources."ip-1.1.5" sources."is-ci-2.0.0" - sources."is-fullwidth-code-point-2.0.0" + sources."is-fullwidth-code-point-1.0.0" sources."is-installed-globally-0.3.2" sources."is-lambda-1.0.1" sources."is-npm-4.0.0" @@ -71701,13 +71981,19 @@ in sources."is-yarn-global-0.3.0" sources."isarray-1.0.0" sources."isexe-2.0.0" + sources."isstream-0.1.2" sources."jju-1.4.0" sources."js-yaml-3.13.1" + sources."jsbn-0.1.1" sources."json-buffer-3.0.0" sources."json-parse-even-better-errors-2.2.0" sources."json-parse-helpfulerror-1.0.3" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" sources."json5-2.1.3" sources."jsonparse-1.3.1" + sources."jsprim-1.4.1" sources."keyv-3.1.0" sources."kleur-3.0.3" sources."latest-version-5.1.0" @@ -71728,7 +72014,9 @@ in sources."semver-6.3.0" ]; }) - sources."make-fetch-happen-8.0.4" + sources."make-fetch-happen-8.0.6" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -71738,22 +72026,23 @@ in ]; }) sources."minipass-collect-1.0.2" - sources."minipass-fetch-1.2.1" + (sources."minipass-fetch-1.2.1" // { + dependencies = [ + sources."minizlib-2.1.0" + sources."yallist-4.0.0" + ]; + }) sources."minipass-flush-1.0.5" sources."minipass-json-stream-1.0.1" sources."minipass-pipeline-1.2.2" sources."minipass-sized-1.0.3" - (sources."minizlib-2.1.0" // { + (sources."minizlib-1.3.3" // { dependencies = [ - sources."yallist-4.0.0" + sources."minipass-2.9.0" ]; }) sources."mkdirp-1.0.4" - (sources."move-concurrently-1.0.1" // { - dependencies = [ - sources."mkdirp-0.5.5" - ]; - }) + sources."move-file-2.0.0" sources."ms-2.1.2" sources."nested-error-stacks-2.0.1" (sources."node-alias-1.0.4" // { @@ -71763,6 +72052,19 @@ in sources."supports-color-2.0.0" ]; }) + (sources."node-gyp-6.1.0" // { + dependencies = [ + sources."chownr-1.1.4" + sources."fs-minipass-1.2.7" + sources."minipass-2.9.0" + sources."mkdirp-0.5.5" + sources."rimraf-2.7.1" + sources."semver-5.7.1" + sources."tar-4.4.13" + sources."which-1.3.1" + ]; + }) + sources."nopt-4.0.3" sources."normalize-url-4.5.0" sources."npm-bundled-1.1.1" sources."npm-install-checks-4.0.0" @@ -71770,8 +72072,20 @@ in sources."npm-package-arg-8.0.1" sources."npm-packlist-2.1.1" sources."npm-pick-manifest-6.1.0" - sources."npm-registry-fetch-8.0.0" + (sources."npm-registry-fetch-8.0.2" // { + dependencies = [ + sources."minizlib-2.1.0" + sources."yallist-4.0.0" + ]; + }) + sources."npmlog-4.1.2" + sources."number-is-nan-1.0.1" + sources."oauth-sign-0.9.0" + sources."object-assign-4.1.1" sources."once-1.4.0" + sources."os-homedir-1.0.2" + sources."os-tmpdir-1.0.2" + sources."osenv-0.1.5" sources."p-cancelable-1.1.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" @@ -71782,18 +72096,22 @@ in sources."semver-6.3.0" ]; }) - sources."pacote-11.1.4" + sources."pacote-11.1.8" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" + sources."performance-now-2.1.0" sources."prepend-http-2.0.0" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."promise-inflight-1.0.1" sources."promise-retry-1.1.1" sources."prompts-2.3.2" + sources."psl-1.8.0" sources."pump-3.0.0" + sources."punycode-2.1.1" sources."pupa-2.0.1" + sources."qs-6.5.2" sources."rc-1.2.8" sources."rc-config-loader-3.0.0" sources."read-package-json-fast-1.1.3" @@ -71801,13 +72119,13 @@ in sources."readdir-scoped-modules-1.1.0" sources."registry-auth-token-4.1.1" sources."registry-url-5.1.0" + sources."request-2.88.2" sources."require-from-string-2.0.2" sources."requireg-0.2.2" sources."resolve-1.7.1" sources."responselike-1.0.2" sources."retry-0.10.1" - sources."rimraf-2.7.1" - sources."run-queue-1.0.3" + sources."rimraf-3.0.2" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."semver-7.3.2" @@ -71817,6 +72135,7 @@ in ]; }) sources."semver-utils-1.1.4" + sources."set-blocking-2.0.0" sources."signal-exit-3.0.3" sources."sisteransi-1.0.5" sources."smart-buffer-4.1.0" @@ -71824,37 +72143,47 @@ in sources."socks-proxy-agent-5.0.0" sources."spawn-please-0.3.0" sources."sprintf-js-1.0.3" + sources."sshpk-1.16.1" sources."ssri-8.0.0" - (sources."string-width-4.2.0" // { - dependencies = [ - sources."ansi-regex-5.0.0" - sources."emoji-regex-8.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."strip-ansi-6.0.0" - ]; - }) + sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."supports-color-7.1.0" - (sources."tar-6.0.1" // { + (sources."tar-6.0.2" // { dependencies = [ + sources."minizlib-2.1.0" sources."yallist-4.0.0" ]; }) sources."term-size-2.2.0" sources."to-readable-stream-1.0.0" + sources."tough-cookie-2.5.0" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" sources."type-fest-0.8.1" sources."typedarray-to-buffer-3.1.5" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" sources."unique-string-2.0.0" sources."update-notifier-4.1.0" + sources."uri-js-4.2.2" sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" + sources."uuid-3.4.0" sources."validate-npm-package-name-3.0.0" + sources."verror-1.10.0" sources."which-2.0.2" - sources."widest-line-3.1.0" + sources."wide-align-1.1.3" + (sources."widest-line-3.1.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + ]; + }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" sources."xdg-basedir-4.0.0" @@ -71955,8 +72284,8 @@ in sources."json-stringify-safe-5.0.1" sources."jsonfile-1.0.1" sources."jsprim-1.4.1" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.3.5" @@ -72095,14 +72424,14 @@ in }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/compat-data-7.9.0" - (sources."@babel/core-7.9.0" // { + sources."@babel/compat-data-7.9.6" + (sources."@babel/core-7.9.6" // { dependencies = [ sources."json5-2.1.3" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.9.5" // { + (sources."@babel/generator-7.9.6" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -72111,7 +72440,7 @@ in sources."@babel/helper-builder-binary-assignment-operator-visitor-7.8.3" sources."@babel/helper-builder-react-jsx-7.9.0" sources."@babel/helper-builder-react-jsx-experimental-7.9.5" - sources."@babel/helper-compilation-targets-7.8.7" + sources."@babel/helper-compilation-targets-7.9.6" sources."@babel/helper-create-regexp-features-plugin-7.8.8" sources."@babel/helper-define-map-7.8.3" sources."@babel/helper-explode-assignable-expression-7.8.3" @@ -72125,20 +72454,20 @@ in sources."@babel/helper-plugin-utils-7.8.3" sources."@babel/helper-regex-7.8.3" sources."@babel/helper-remap-async-to-generator-7.8.3" - sources."@babel/helper-replace-supers-7.8.6" + sources."@babel/helper-replace-supers-7.9.6" sources."@babel/helper-simple-access-7.8.3" sources."@babel/helper-split-export-declaration-7.8.3" sources."@babel/helper-validator-identifier-7.9.5" sources."@babel/helper-wrap-function-7.8.3" - sources."@babel/helpers-7.9.2" + sources."@babel/helpers-7.9.6" sources."@babel/highlight-7.9.0" - sources."@babel/parser-7.9.4" + sources."@babel/parser-7.9.6" sources."@babel/plugin-proposal-async-generator-functions-7.8.3" sources."@babel/plugin-proposal-dynamic-import-7.8.3" sources."@babel/plugin-proposal-json-strings-7.8.3" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.8.3" sources."@babel/plugin-proposal-numeric-separator-7.8.3" - sources."@babel/plugin-proposal-object-rest-spread-7.9.5" + sources."@babel/plugin-proposal-object-rest-spread-7.9.6" sources."@babel/plugin-proposal-optional-catch-binding-7.8.3" sources."@babel/plugin-proposal-optional-chaining-7.9.0" sources."@babel/plugin-proposal-unicode-property-regex-7.8.8" @@ -72168,9 +72497,9 @@ in sources."@babel/plugin-transform-function-name-7.8.3" sources."@babel/plugin-transform-literals-7.8.3" sources."@babel/plugin-transform-member-expression-literals-7.8.3" - sources."@babel/plugin-transform-modules-amd-7.9.0" - sources."@babel/plugin-transform-modules-commonjs-7.9.0" - sources."@babel/plugin-transform-modules-systemjs-7.9.0" + sources."@babel/plugin-transform-modules-amd-7.9.6" + sources."@babel/plugin-transform-modules-commonjs-7.9.6" + sources."@babel/plugin-transform-modules-systemjs-7.9.6" sources."@babel/plugin-transform-modules-umd-7.9.0" sources."@babel/plugin-transform-named-capturing-groups-regex-7.8.3" sources."@babel/plugin-transform-new-target-7.8.3" @@ -72186,12 +72515,12 @@ in sources."@babel/plugin-transform-template-literals-7.8.3" sources."@babel/plugin-transform-typeof-symbol-7.8.4" sources."@babel/plugin-transform-unicode-regex-7.8.3" - sources."@babel/preset-env-7.9.5" + sources."@babel/preset-env-7.9.6" sources."@babel/preset-modules-0.1.3" - sources."@babel/runtime-7.9.2" + sources."@babel/runtime-7.9.6" sources."@babel/template-7.8.6" - sources."@babel/traverse-7.9.5" - sources."@babel/types-7.9.5" + sources."@babel/traverse-7.9.6" + sources."@babel/types-7.9.6" sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -72297,7 +72626,7 @@ in sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001046" + sources."caniuse-lite-1.0.30001050" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -72381,7 +72710,7 @@ in sources."cssstyle-1.4.0" sources."dashdash-1.14.1" sources."data-urls-1.1.0" - sources."deasync-0.1.19" + sources."deasync-0.1.20" sources."debug-4.1.1" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" @@ -72430,12 +72759,12 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.415" + sources."electron-to-chromium-1.3.427" sources."elliptic-6.5.2" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."entities-1.1.2" - sources."envinfo-7.5.0" + sources."envinfo-7.5.1" sources."error-ex-1.3.2" (sources."es-abstract-1.17.5" // { dependencies = [ @@ -72498,7 +72827,7 @@ in }) sources."glob-to-regexp-0.3.0" sources."globals-11.12.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."grapheme-breaker-0.3.2" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -72516,7 +72845,12 @@ in sources."kind-of-4.0.0" ]; }) - sources."hash-base-3.0.4" + (sources."hash-base-3.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + sources."safe-buffer-5.2.0" + ]; + }) sources."hash.js-1.1.7" sources."hex-color-regex-1.1.0" sources."hmac-drbg-1.0.1" @@ -72528,7 +72862,7 @@ in (sources."htmlnano-0.2.5" // { dependencies = [ sources."posthtml-0.12.3" - sources."terser-4.6.11" + sources."terser-4.6.13" ]; }) (sources."htmlparser2-3.10.1" // { @@ -72645,8 +72979,8 @@ in }) sources."miller-rabin-4.0.1" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" @@ -72720,14 +73054,14 @@ in sources."pkg-up-2.0.0" sources."pn-1.1.0" sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.27" // { + (sources."postcss-7.0.29" // { dependencies = [ sources."supports-color-6.1.0" ]; }) (sources."postcss-calc-7.0.2" // { dependencies = [ - sources."postcss-value-parser-4.0.3" + sources."postcss-value-parser-4.1.0" ]; }) sources."postcss-colormin-4.0.3" @@ -72892,7 +73226,7 @@ in sources."snapdragon-util-3.0.1" sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" - sources."source-map-support-0.5.18" + sources."source-map-support-0.5.19" sources."source-map-url-0.4.0" (sources."split-string-3.1.0" // { dependencies = [ @@ -73121,7 +73455,7 @@ in sources."dicer-0.3.0" sources."dnscache-1.0.2" sources."dom-storage-2.1.0" - sources."domino-2.1.4" + sources."domino-2.1.5" sources."dtrace-provider-0.8.8" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" @@ -73157,7 +73491,7 @@ in sources."get-caller-file-2.0.5" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."handlebars-4.7.6" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -73200,12 +73534,12 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - sources."moment-2.24.0" + sources."moment-2.25.3" sources."ms-2.0.0" sources."msgpack5-3.6.0" sources."mv-2.1.1" @@ -73293,7 +73627,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.9.1" + sources."uglify-js-3.9.2" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" sources."uri-js-4.2.2" @@ -73428,7 +73762,7 @@ in sources."get-browser-rtc-1.0.2" sources."get-stdin-4.0.1" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" @@ -73464,7 +73798,6 @@ in sources."is-date-object-1.0.2" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" - sources."is-promise-2.1.0" sources."is-regex-1.0.5" sources."is-symbol-1.0.3" sources."is-utf8-0.2.1" @@ -73484,13 +73817,13 @@ in sources."magnet-uri-5.2.4" sources."map-obj-1.0.1" sources."meow-3.7.0" - sources."mime-2.4.4" + sources."mime-2.4.5" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.3.5" - sources."mkdirp-classic-0.5.2" + sources."mkdirp-classic-0.5.3" sources."ms-2.0.0" sources."multicast-dns-6.2.3" sources."multicast-dns-service-types-1.1.0" @@ -73562,7 +73895,7 @@ in sources."restore-cursor-2.0.0" sources."reverse-http-1.3.0" sources."rimraf-2.7.1" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."run-parallel-1.1.9" sources."run-series-1.1.8" sources."rusha-0.8.13" @@ -73783,7 +74116,7 @@ in sources."get-browser-rtc-1.0.2" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" (sources."has-binary2-1.0.3" // { @@ -73845,13 +74178,13 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - sources."mkdirp-classic-0.5.2" + sources."mkdirp-classic-0.5.3" (sources."morgan-1.10.0" // { dependencies = [ sources."depd-2.0.0" @@ -74001,7 +74334,7 @@ in sources."verror-1.10.0" sources."which-1.3.1" sources."wrappy-1.0.2" - sources."ws-7.2.3" + sources."ws-7.2.5" sources."xmlhttprequest-ssl-1.5.5" sources."xtend-4.0.2" sources."yeast-0.1.2" @@ -74020,10 +74353,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "4.14.0"; + version = "4.14.2"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-4.14.0.tgz"; - sha512 = "O6B5OD+wiO4srzegQTs0LiOrdExLvoKgG7UFL5+Lu1DhgqhW9NFP/pPg8+zKSrOQTontH3GGSWAkinxM3tCqnw=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-4.14.2.tgz"; + sha512 = "srFTvu4mm2tzo+bt1QkahH3JJnBDXPbjboYOPSZRwocoyGcTxYgGr0aUHg6non0i8eFzbhUFqQiqG+iCJ5spbA=="; }; buildInputs = globalBuildInputs; meta = { @@ -74038,42 +74371,36 @@ in postcss-cli = nodeEnv.buildNodePackage { name = "postcss-cli"; packageName = "postcss-cli"; - version = "7.1.0"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-cli/-/postcss-cli-7.1.0.tgz"; - sha512 = "tCGK0GO2reu644dUHxks8U2SAtKnzftQTAXN1dwzFPoKXZr0b7VX4vTkQ2Pl2Lunas6+o8uHR56hlcYBm1srZg=="; + url = "https://registry.npmjs.org/postcss-cli/-/postcss-cli-7.1.1.tgz"; + sha512 = "bYQy5ydAQJKCMSpvaMg0ThPBeGYqhQXumjbFOmWnL4u65CYXQ16RfS6afGQpit0dGv/fNzxbdDtx8dkqOhhIbg=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" sources."@types/color-name-1.1.1" - sources."@types/events-3.0.0" - sources."@types/glob-7.1.1" - sources."@types/minimatch-3.0.3" - sources."@types/node-13.13.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."anymatch-3.1.1" sources."argparse-1.0.10" sources."array-union-2.1.0" - sources."balanced-match-1.0.0" + sources."at-least-node-1.0.0" sources."binary-extensions-2.0.0" - sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."camelcase-5.3.1" - sources."chalk-3.0.0" - sources."chokidar-3.3.1" + sources."chalk-4.0.0" + sources."chokidar-3.4.0" sources."cliui-6.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."concat-map-0.0.1" sources."cosmiconfig-5.2.1" sources."decamelize-1.2.0" - sources."dependency-graph-0.8.1" + sources."dependency-graph-0.9.0" sources."dir-glob-3.0.1" sources."emoji-regex-8.0.0" sources."error-ex-1.3.2" @@ -74083,22 +74410,18 @@ in sources."fastq-1.7.0" sources."fill-range-7.0.1" sources."find-up-4.1.0" - sources."fs-extra-8.1.0" - sources."fs.realpath-1.0.0" + sources."fs-extra-9.0.0" sources."fsevents-2.1.3" sources."get-caller-file-2.0.5" sources."get-stdin-7.0.0" - sources."glob-7.1.6" sources."glob-parent-5.1.1" - sources."globby-10.0.2" - sources."graceful-fs-4.2.3" + sources."globby-11.0.0" + sources."graceful-fs-4.2.4" sources."has-flag-4.0.0" sources."ignore-5.1.4" sources."import-cwd-2.1.0" sources."import-fresh-2.0.0" sources."import-from-2.1.0" - sources."inflight-1.0.6" - sources."inherits-2.0.4" sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" sources."is-directory-0.3.1" @@ -74108,7 +74431,7 @@ in sources."is-number-7.0.0" sources."js-yaml-3.13.1" sources."json-parse-better-errors-1.0.2" - sources."jsonfile-4.0.0" + sources."jsonfile-6.0.1" sources."locate-path-5.0.0" sources."lodash-4.17.15" (sources."log-symbols-2.2.0" // { @@ -74123,19 +74446,16 @@ in }) sources."merge2-1.3.0" sources."micromatch-4.0.2" - sources."minimatch-3.0.4" sources."normalize-path-3.0.0" - sources."once-1.4.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" sources."parse-json-4.0.0" sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" sources."path-type-4.0.0" sources."picomatch-2.2.2" sources."pify-2.3.0" - (sources."postcss-7.0.27" // { + (sources."postcss-7.0.29" // { dependencies = [ sources."ansi-styles-3.2.1" (sources."chalk-2.4.2" // { @@ -74162,7 +74482,7 @@ in }) sources."pretty-hrtime-1.0.3" sources."read-cache-1.0.0" - sources."readdirp-3.3.0" + sources."readdirp-3.4.0" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."resolve-from-3.0.0" @@ -74176,10 +74496,9 @@ in sources."strip-ansi-6.0.0" sources."supports-color-7.1.0" sources."to-regex-range-5.0.1" - sources."universalify-0.1.2" + sources."universalify-1.0.0" sources."which-module-2.0.0" sources."wrap-ansi-6.2.0" - sources."wrappy-1.0.2" sources."y18n-4.0.0" sources."yargs-15.3.1" sources."yargs-parser-18.1.3" @@ -74374,10 +74693,14 @@ in sources."get-stream-4.1.0" sources."glob-7.1.6" sources."globule-1.3.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."hash-base-3.0.4" + (sources."hash-base-3.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + ]; + }) sources."hash.js-1.1.7" sources."hmac-drbg-1.0.1" sources."htmlescape-1.1.1" @@ -74423,7 +74746,7 @@ in sources."minipass-2.9.0" sources."minizlib-1.3.3" sources."mkdirp-0.5.5" - sources."mkdirp-classic-0.5.2" + sources."mkdirp-classic-0.5.3" (sources."module-deps-6.2.2" // { dependencies = [ sources."concat-stream-1.6.2" @@ -74512,7 +74835,7 @@ in sources."slice-ansi-2.1.0" sources."sorcery-0.10.0" sources."source-map-0.5.7" - (sources."source-map-support-0.5.18" // { + (sources."source-map-support-0.5.19" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -74540,7 +74863,7 @@ in sources."rimraf-2.6.3" ]; }) - (sources."terser-4.6.11" // { + (sources."terser-4.6.13" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -74637,7 +74960,7 @@ in sources."colors-0.6.2" sources."concat-map-0.0.1" sources."cycle-1.0.3" - sources."deep-equal-2.0.2" + sources."deep-equal-2.0.3" sources."define-properties-1.1.3" sources."es-abstract-1.17.5" sources."es-get-iterator-1.1.0" @@ -74740,7 +75063,7 @@ in sources."esprima-3.1.3" sources."esprima-fb-13001.1001.0-dev-harmony-fb" sources."glob-5.0.15" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."iconv-lite-0.4.24" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -74800,19 +75123,19 @@ in sources."@babel/highlight-7.9.0" sources."@rollup/plugin-commonjs-11.1.0" sources."@rollup/plugin-node-resolve-7.1.3" - sources."@rollup/pluginutils-3.0.9" + sources."@rollup/pluginutils-3.0.10" sources."@types/color-name-1.1.1" sources."@types/eslint-visitor-keys-1.0.0" sources."@types/estree-0.0.39" sources."@types/json-schema-7.0.4" sources."@types/node-12.12.37" - sources."@types/node-fetch-2.5.6" + sources."@types/node-fetch-2.5.7" sources."@types/resolve-0.0.8" sources."@types/vscode-1.44.0" - sources."@typescript-eslint/eslint-plugin-2.29.0" - sources."@typescript-eslint/experimental-utils-2.29.0" - sources."@typescript-eslint/parser-2.29.0" - sources."@typescript-eslint/typescript-estree-2.29.0" + sources."@typescript-eslint/eslint-plugin-2.31.0" + sources."@typescript-eslint/experimental-utils-2.31.0" + sources."@typescript-eslint/parser-2.31.0" + sources."@typescript-eslint/typescript-estree-2.31.0" sources."acorn-7.1.1" sources."acorn-jsx-5.2.0" sources."ajv-6.12.2" @@ -74830,7 +75153,6 @@ in sources."balanced-match-1.0.0" sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" - sources."braces-3.0.2" sources."buffer-crc32-0.2.13" sources."builtin-modules-3.1.0" sources."callsites-3.1.0" @@ -74897,7 +75219,6 @@ in sources."fd-slicer-1.1.0" sources."figures-3.2.0" sources."file-entry-cache-5.0.1" - sources."fill-range-7.0.1" sources."flat-cache-2.0.1" sources."flatted-2.0.2" sources."form-data-3.0.0" @@ -74930,8 +75251,6 @@ in sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" sources."is-module-1.0.0" - sources."is-number-7.0.0" - sources."is-promise-2.1.0" sources."is-reference-1.1.4" sources."isexe-2.0.0" sources."js-tokens-4.0.0" @@ -74951,10 +75270,9 @@ in ]; }) sources."mdurl-1.0.1" - sources."micromatch-4.0.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -74995,8 +75313,8 @@ in sources."resolve-from-4.0.0" sources."restore-cursor-3.1.0" sources."rimraf-2.6.3" - sources."rollup-2.7.2" - sources."run-async-2.4.0" + sources."rollup-2.7.6" + sources."run-async-2.4.1" sources."rxjs-6.5.5" sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" @@ -75035,7 +75353,6 @@ in sources."text-table-0.2.0" sources."through-2.3.8" sources."tmp-0.0.33" - sources."to-regex-range-5.0.1" sources."tslib-1.11.1" sources."tsutils-3.17.1" sources."tunnel-0.0.4" @@ -75155,8 +75472,8 @@ in sources."keypress-0.1.0" sources."methods-0.1.0" sources."mime-1.2.11" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mkdirp-0.3.5" sources."ms-2.1.2" sources."multiparty-2.2.0" @@ -75280,8 +75597,8 @@ in sources."isexe-2.0.0" sources."json-schema-traverse-0.4.1" sources."lru-cache-4.1.5" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."ms-2.0.0" @@ -75334,14 +75651,14 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "1.68.0"; + version = "1.69.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-1.68.0.tgz"; - sha512 = "CLA8K4B/oZm1LwgUDAfCHiVYGszveDSlAUr2mIdzdcVc3CLjzlRZn7IVipy3myXOc7/+kocxOqs3VXogm9A4Wg=="; + url = "https://registry.npmjs.org/serverless/-/serverless-1.69.0.tgz"; + sha512 = "af4gBZeto9JCkObSErzSXI+UcxoGNxUP4oQq7b/+QoCFa0NYjO4lCtW66MD6ONYg0YxDEukTQwzgkbD9VmunWg=="; }; dependencies = [ sources."2-thenable-1.0.0" - sources."@babel/parser-7.9.4" + sources."@babel/parser-7.9.6" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" @@ -75351,7 +75668,7 @@ in sources."node-fetch-2.6.0" ]; }) - (sources."@serverless/components-2.30.1" // { + (sources."@serverless/components-2.30.5" // { dependencies = [ sources."fs-extra-8.1.0" sources."globby-10.0.2" @@ -75364,11 +75681,9 @@ in sources."semver-6.3.0" ]; }) - (sources."@serverless/enterprise-plugin-3.6.6" // { + (sources."@serverless/enterprise-plugin-3.6.9" // { dependencies = [ - sources."@serverless/platform-client-0.24.0" sources."fs-extra-8.1.0" - sources."https-proxy-agent-5.0.0" sources."node-fetch-2.6.0" sources."semver-6.3.0" sources."uuid-3.4.0" @@ -75383,12 +75698,12 @@ in sources."strip-ansi-6.0.0" ]; }) - (sources."@serverless/platform-client-0.25.5" // { + (sources."@serverless/platform-client-0.25.7" // { dependencies = [ sources."https-proxy-agent-5.0.0" ]; }) - (sources."@serverless/platform-client-china-1.0.6" // { + (sources."@serverless/platform-client-china-1.0.9" // { dependencies = [ sources."https-proxy-agent-5.0.0" ]; @@ -75401,7 +75716,7 @@ in ]; }) sources."@serverless/template-1.1.3" - (sources."@serverless/utils-china-0.1.6" // { + (sources."@serverless/utils-china-0.1.7" // { dependencies = [ sources."https-proxy-agent-5.0.0" ]; @@ -75414,8 +75729,8 @@ in sources."@types/glob-7.1.1" sources."@types/lodash-4.14.150" sources."@types/minimatch-3.0.3" - sources."@types/node-13.13.2" - (sources."@typescript-eslint/typescript-estree-2.29.0" // { + sources."@types/node-13.13.4" + (sources."@typescript-eslint/typescript-estree-2.31.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -75459,7 +75774,11 @@ in sources."string_decoder-1.1.1" ]; }) - sources."argparse-1.0.10" + (sources."argparse-1.0.10" // { + dependencies = [ + sources."sprintf-js-1.0.3" + ]; + }) sources."arr-diff-4.0.0" sources."arr-union-3.1.0" sources."array-union-2.1.0" @@ -75474,7 +75793,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.661.0" // { + (sources."aws-sdk-2.669.0" // { dependencies = [ sources."buffer-4.9.1" sources."isarray-1.0.0" @@ -75513,6 +75832,7 @@ in }) sources."blob-0.0.5" sources."bluebird-3.7.2" + sources."boolean-3.0.1" (sources."boxen-3.2.0" // { dependencies = [ sources."emoji-regex-7.0.3" @@ -75558,7 +75878,7 @@ in sources."cross-spawn-6.0.5" ]; }) - sources."chokidar-3.3.1" + sources."chokidar-3.4.0" sources."ci-info-1.6.0" (sources."class-utils-0.3.6" // { dependencies = [ @@ -75630,6 +75950,7 @@ in sources."cookie-0.3.1" sources."cookiejar-2.1.2" sources."copy-descriptor-0.1.1" + sources."core-js-3.6.5" sources."core-util-is-1.0.2" sources."crc-3.8.0" (sources."crc32-stream-2.0.0" // { @@ -75649,7 +75970,7 @@ in ]; }) sources."dashdash-1.14.1" - sources."dayjs-1.8.25" + sources."dayjs-1.8.26" sources."debug-4.1.1" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" @@ -75683,9 +76004,11 @@ in sources."deep-is-0.1.3" sources."defer-to-connect-1.1.3" sources."deferred-0.7.11" + sources."define-properties-1.1.3" sources."define-property-2.0.2" sources."delayed-stream-1.0.0" sources."dependency-tree-7.2.1" + sources."detect-node-2.0.4" sources."detective-amd-3.0.0" sources."detective-cjs-3.1.1" sources."detective-es6-2.1.0" @@ -75736,8 +76059,9 @@ in sources."env-variable-0.0.6" sources."errno-0.1.7" sources."es5-ext-0.10.53" + sources."es6-error-4.1.1" sources."es6-iterator-2.0.3" - sources."es6-promisify-6.1.0" + sources."es6-promisify-6.1.1" (sources."es6-set-0.1.5" // { dependencies = [ sources."es6-symbol-3.1.1" @@ -75819,11 +76143,7 @@ in ]; }) sources."fs.realpath-1.0.0" - (sources."fs2-0.3.7" // { - dependencies = [ - sources."type-1.2.0" - ]; - }) + sources."fs2-0.3.8" sources."fsevents-2.1.3" sources."get-amd-module-type-3.0.0" sources."get-own-enumerable-property-symbols-3.0.2" @@ -75834,7 +76154,13 @@ in sources."getpass-0.1.7" sources."glob-7.1.6" sources."glob-parent-5.1.1" + (sources."global-agent-2.1.8" // { + dependencies = [ + sources."semver-7.3.2" + ]; + }) sources."global-dirs-0.1.1" + sources."globalthis-1.0.1" (sources."globby-6.1.0" // { dependencies = [ sources."array-union-1.0.2" @@ -75843,7 +76169,7 @@ in }) sources."gonzales-pe-4.3.0" sources."got-9.6.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."graceful-readlink-1.0.1" sources."graphlib-2.1.8" sources."har-schema-2.0.0" @@ -75923,7 +76249,7 @@ in sources."is-path-inside-1.0.1" sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" - sources."is-promise-2.1.0" + sources."is-promise-2.2.2" sources."is-redirect-1.0.0" sources."is-regexp-1.0.0" sources."is-relative-path-1.0.2" @@ -75932,7 +76258,11 @@ in sources."is-typedarray-1.0.0" sources."is-url-1.2.4" sources."is-windows-1.0.2" - sources."is-wsl-2.1.1" + (sources."is-wsl-2.2.0" // { + dependencies = [ + sources."is-docker-2.0.0" + ]; + }) sources."isarray-2.0.1" sources."isexe-2.0.0" sources."iso8601-duration-1.2.0" @@ -76006,6 +76336,11 @@ in sources."make-dir-2.1.0" sources."map-cache-0.2.2" sources."map-visit-1.0.0" + (sources."matcher-2.1.0" // { + dependencies = [ + sources."escape-string-regexp-2.0.0" + ]; + }) sources."memoizee-0.4.14" (sources."memory-fs-0.5.0" // { dependencies = [ @@ -76019,8 +76354,8 @@ in sources."methods-1.1.2" sources."micromatch-4.0.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -76029,7 +76364,7 @@ in sources."mkdirp-0.5.5" sources."module-definition-3.3.0" sources."module-lookup-amd-6.2.0" - sources."moment-2.24.0" + sources."moment-2.25.3" sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."nanoid-2.1.11" @@ -76067,6 +76402,7 @@ in ]; }) sources."object-hash-2.0.3" + sources."object-keys-1.1.1" sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."once-1.4.0" @@ -76112,7 +76448,7 @@ in sources."pify-4.0.1" sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" - (sources."postcss-7.0.27" // { + (sources."postcss-7.0.29" // { dependencies = [ sources."has-flag-3.0.0" sources."supports-color-6.1.0" @@ -76143,7 +76479,7 @@ in }) sources."rc-1.2.8" sources."readable-stream-3.6.0" - sources."readdirp-3.3.0" + sources."readdirp-3.4.0" sources."regenerator-runtime-0.13.5" sources."regex-not-1.0.2" sources."registry-auth-token-4.1.1" @@ -76167,7 +76503,8 @@ in sources."ret-0.1.15" sources."reusify-1.0.4" sources."rimraf-2.7.1" - sources."run-async-2.4.0" + sources."roarr-2.15.3" + sources."run-async-2.4.1" sources."run-parallel-1.1.9" sources."rxjs-6.5.5" sources."safe-buffer-5.2.0" @@ -76181,8 +76518,14 @@ in ]; }) sources."semver-5.7.1" + sources."semver-compare-1.0.0" sources."semver-diff-2.1.0" sources."semver-regex-1.0.0" + (sources."serialize-error-5.0.0" // { + dependencies = [ + sources."type-fest-0.8.1" + ]; + }) sources."set-immediate-shim-1.0.1" (sources."set-value-2.0.1" // { dependencies = [ @@ -76237,11 +76580,11 @@ in sources."sort-keys-length-1.0.1" sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" - sources."source-map-support-0.5.18" + sources."source-map-support-0.5.19" sources."source-map-url-0.4.0" sources."split-string-3.1.0" sources."split2-3.1.1" - sources."sprintf-js-1.0.3" + sources."sprintf-js-1.1.2" sources."sprintf-kit-2.0.0" sources."sshpk-1.16.1" sources."stack-trace-0.0.10" @@ -76406,7 +76749,7 @@ in sources."word-wrap-1.2.3" sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" - sources."ws-7.2.3" + sources."ws-7.2.5" sources."xdg-basedir-3.0.0" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" @@ -76562,8 +76905,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimist-1.2.5" sources."mkdirp-0.5.5" sources."moment-2.7.0" @@ -76760,7 +77103,7 @@ in sources."for-in-1.0.2" sources."fragment-cache-0.2.1" sources."get-value-2.0.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."graceful-readlink-1.0.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -77064,41 +77407,42 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.309.0"; + version = "1.317.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.309.0.tgz"; - sha512 = "NVizsLhGNhgjI+wCy1TajQoko+GVjop3r10BxX12KKxj3bUE9cDhqzkXmngHzuyFhTfdhED6yOzdg+jDvm1VpA=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.317.0.tgz"; + sha512 = "zNUvvT50Ii5TpHEo9YmDo+j5tqO1b8jXQK9XygfgiuXPRUwxf6PMSqDM5hKkfzuBhaBYZ4IbZWQFQPbMkprj0w=="; }; dependencies = [ - sources."@snyk/cli-interface-2.4.0" - sources."@snyk/cocoapods-lockfile-parser-3.1.0" - sources."@snyk/composer-lockfile-parser-1.2.0" + sources."@snyk/cli-interface-2.6.0" + sources."@snyk/cocoapods-lockfile-parser-3.2.0" + sources."@snyk/composer-lockfile-parser-1.4.0" sources."@snyk/configstore-3.2.0-rc1" - sources."@snyk/dep-graph-1.16.1" + sources."@snyk/dep-graph-1.18.2" sources."@snyk/gemfile-1.2.0" - (sources."@snyk/java-call-graph-builder-1.3.4" // { + sources."@snyk/graphlib-2.1.9-patch" + sources."@snyk/inquirer-6.2.2-patch" + (sources."@snyk/java-call-graph-builder-1.8.0" // { dependencies = [ sources."ci-info-2.0.0" sources."debug-4.1.1" - sources."snyk-config-3.0.0" ]; }) - sources."@snyk/ruby-semver-2.1.0" - (sources."@snyk/snyk-cocoapods-plugin-2.1.1" // { + sources."@snyk/lodash-4.17.15-patch" + sources."@snyk/rpm-parser-1.1.0" + sources."@snyk/ruby-semver-2.2.0" + (sources."@snyk/snyk-cocoapods-plugin-2.2.0" // { dependencies = [ sources."@snyk/cli-interface-1.5.0" ]; }) sources."@snyk/update-notifier-2.5.1-rc2" sources."@types/agent-base-4.2.0" - sources."@types/bunyan-1.8.6" sources."@types/debug-4.1.5" sources."@types/events-3.0.0" sources."@types/js-yaml-3.12.3" - sources."@types/node-13.13.2" - sources."@types/restify-4.3.6" + sources."@types/node-13.13.4" sources."@types/semver-5.5.0" - sources."@types/xml2js-0.4.3" + sources."@types/xml2js-0.4.5" sources."@yarnpkg/lockfile-1.1.0" sources."abbrev-1.1.1" sources."agent-base-4.3.0" @@ -77167,11 +77511,7 @@ in sources."diff-4.0.2" sources."dockerfile-ast-0.0.19" sources."dot-prop-5.2.0" - (sources."dotnet-deps-parser-4.9.0" // { - dependencies = [ - sources."xml2js-0.4.19" - ]; - }) + sources."dotnet-deps-parser-4.10.0" sources."duplexer3-0.1.4" sources."email-validator-2.0.4" sources."emoji-regex-7.0.3" @@ -77209,8 +77549,7 @@ in sources."glob-7.1.6" sources."global-dirs-0.1.1" sources."got-6.7.1" - sources."graceful-fs-4.2.3" - sources."graphlib-2.1.8" + sources."graceful-fs-4.2.4" sources."has-flag-3.0.0" sources."hosted-git-info-2.8.8" sources."http-errors-1.7.3" @@ -77229,21 +77568,20 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" - sources."inquirer-6.5.2" sources."invert-kv-1.0.0" sources."ip-1.1.5" sources."is-ci-1.2.1" + sources."is-docker-2.0.0" sources."is-fullwidth-code-point-2.0.0" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" sources."is-obj-2.0.0" sources."is-path-inside-1.0.1" - sources."is-promise-2.1.0" sources."is-redirect-1.0.0" sources."is-retry-allowed-1.2.0" sources."is-ssh-1.3.1" sources."is-stream-1.1.0" - sources."is-wsl-1.1.0" + sources."is-wsl-2.2.0" sources."isarray-0.0.1" sources."isexe-2.0.0" sources."js-yaml-3.13.1" @@ -77252,7 +77590,6 @@ in sources."lcid-1.0.0" sources."levn-0.3.0" sources."lie-3.3.0" - sources."lodash-4.17.15" sources."lodash.assign-4.2.0" sources."lodash.assignin-4.2.0" sources."lodash.clone-4.5.0" @@ -77279,7 +77616,7 @@ in sources."object-hash-1.3.1" sources."once-1.4.0" sources."onetime-2.0.1" - sources."opn-5.5.0" + sources."open-7.0.3" sources."optionator-0.8.3" sources."os-locale-1.4.0" sources."os-name-3.1.0" @@ -77306,6 +77643,7 @@ in sources."pify-3.0.0" sources."prelude-ls-1.1.2" sources."prepend-http-1.0.4" + sources."prettier-1.19.1" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" sources."promise-7.3.1" @@ -77333,7 +77671,7 @@ in sources."registry-url-3.1.0" sources."restore-cursor-2.0.0" sources."rimraf-2.7.1" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."rxjs-6.5.5" sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" @@ -77351,14 +77689,18 @@ in sources."shebang-regex-1.0.0" sources."signal-exit-3.0.3" sources."smart-buffer-4.1.0" - sources."snyk-config-2.2.3" - (sources."snyk-docker-plugin-2.6.1" // { + (sources."snyk-config-3.1.0" // { + dependencies = [ + sources."debug-4.1.1" + ]; + }) + (sources."snyk-docker-plugin-3.1.0" // { dependencies = [ sources."debug-4.1.1" ]; }) sources."snyk-go-parser-1.4.0" - (sources."snyk-go-plugin-1.13.0" // { + (sources."snyk-go-plugin-1.14.0" // { dependencies = [ sources."debug-4.1.1" sources."tmp-0.1.0" @@ -77371,20 +77713,29 @@ in ]; }) sources."snyk-module-1.9.1" - (sources."snyk-mvn-plugin-2.10.0" // { + (sources."snyk-mvn-plugin-2.15.0" // { dependencies = [ + sources."@snyk/cli-interface-2.5.0" sources."debug-4.1.1" sources."tmp-0.1.0" - sources."tslib-1.11.0" ]; }) - sources."snyk-nodejs-lockfile-parser-1.18.0" - sources."snyk-nuget-plugin-1.16.0" - sources."snyk-paket-parser-1.5.0" - (sources."snyk-php-plugin-1.7.0" // { + sources."snyk-nodejs-lockfile-parser-1.22.0" + (sources."snyk-nuget-plugin-1.17.0" // { dependencies = [ - sources."@snyk/cli-interface-2.2.0" - sources."tslib-1.9.3" + sources."core-js-2.3.0" + sources."es6-promise-3.0.2" + sources."isarray-1.0.0" + sources."jszip-3.1.5" + sources."lie-3.1.1" + sources."process-nextick-args-1.0.7" + sources."readable-stream-2.0.6" + ]; + }) + sources."snyk-paket-parser-1.6.0" + (sources."snyk-php-plugin-1.9.0" // { + dependencies = [ + sources."@snyk/cli-interface-2.3.2" ]; }) sources."snyk-policy-1.13.5" @@ -77411,7 +77762,7 @@ in ]; }) sources."source-map-0.6.1" - sources."source-map-support-0.5.18" + sources."source-map-support-0.5.19" sources."sprintf-js-1.0.3" sources."statuses-1.5.0" (sources."string-width-2.1.1" // { @@ -77451,6 +77802,7 @@ in sources."tree-kill-1.2.2" sources."tslib-1.11.1" sources."type-check-0.3.2" + sources."typescript-3.8.3" sources."unique-string-1.0.0" sources."unpipe-1.0.0" sources."unzip-response-2.0.1" @@ -77478,12 +77830,8 @@ in sources."wrappy-1.0.2" sources."write-file-atomic-2.4.3" sources."xdg-basedir-3.0.0" - (sources."xml2js-0.4.23" // { - dependencies = [ - sources."xmlbuilder-11.0.1" - ]; - }) - sources."xmlbuilder-9.0.7" + sources."xml2js-0.4.23" + sources."xmlbuilder-11.0.1" sources."xregexp-2.0.0" sources."y18n-3.2.1" sources."yallist-2.1.2" @@ -77542,8 +77890,8 @@ in sources."has-cors-1.1.0" sources."indexof-0.0.1" sources."isarray-2.0.1" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."ms-2.1.2" sources."negotiator-0.6.2" sources."object-component-0.0.3" @@ -77562,7 +77910,7 @@ in }) sources."socket.io-parser-3.4.0" sources."to-array-0.1.4" - sources."ws-7.2.3" + sources."ws-7.2.5" sources."xmlhttprequest-ssl-1.5.5" sources."yeast-0.1.2" ]; @@ -77630,7 +77978,7 @@ in sources."get-stream-3.0.0" sources."global-dirs-0.1.1" sources."got-6.7.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-flag-3.0.0" sources."hosted-git-info-2.8.8" sources."http-proxy-agent-2.1.0" @@ -77954,7 +78302,7 @@ in sources."glob-parent-2.0.0" sources."globby-4.1.0" sources."gossip-query-2.0.2" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-network-0.0.1" @@ -78134,9 +78482,9 @@ in }) sources."napi-macros-2.0.0" sources."ncp-2.0.0" - sources."nearley-2.19.2" + sources."nearley-2.19.3" sources."nice-try-1.0.5" - sources."node-gyp-build-4.2.1" + sources."node-gyp-build-4.2.2" sources."non-private-ip-1.4.4" sources."normalize-path-2.1.1" sources."normalize-uri-1.1.3" @@ -78636,7 +78984,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.661.0" // { + (sources."aws-sdk-2.669.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -78776,7 +79124,7 @@ in dependencies = [ sources."cookie-0.3.1" sources."debug-4.1.1" - sources."ws-7.2.3" + sources."ws-7.2.5" ]; }) (sources."engine.io-client-3.4.1" // { @@ -78847,7 +79195,7 @@ in sources."debug-3.2.6" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."graphlib-2.1.8" sources."har-schema-2.0.0" sources."har-validator-2.0.6" @@ -78898,7 +79246,7 @@ in sources."is-fullwidth-code-point-1.0.0" sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.20.0" - sources."is-promise-2.1.0" + sources."is-promise-2.2.2" sources."is-property-1.0.2" sources."is-regex-1.0.5" sources."is-stream-1.1.0" @@ -78993,15 +79341,15 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-2.1.0" sources."minicap-prebuilt-2.3.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."minitouch-prebuilt-1.2.0" sources."mkdirp-0.5.5" - sources."moment-2.24.0" + sources."moment-2.25.3" sources."ms-2.1.2" sources."multer-1.4.2" sources."mustache-2.3.2" @@ -79231,7 +79579,7 @@ in dependencies = [ sources."debug-3.2.6" sources."form-data-2.5.1" - sources."qs-6.9.3" + sources."qs-6.9.4" sources."readable-stream-2.3.7" sources."string_decoder-1.1.1" ]; @@ -79244,7 +79592,7 @@ in sources."esprima-4.0.1" sources."js-yaml-3.13.1" sources."lodash-3.10.1" - sources."qs-6.9.3" + sources."qs-6.9.4" ]; }) sources."swagger-schema-official-2.0.0-bab6bed" @@ -79692,7 +80040,7 @@ in }) sources."global-dirs-0.1.1" sources."got-6.7.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" (sources."graphlib-2.1.8" // { dependencies = [ sources."lodash-4.17.15" @@ -79815,8 +80163,8 @@ in sources."methods-1.1.2" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mixin-deep-1.3.2" @@ -79882,7 +80230,7 @@ in dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" - sources."qs-6.9.3" + sources."qs-6.9.4" sources."superagent-3.8.3" ]; }) @@ -80059,7 +80407,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.9.1" + sources."uglify-js-3.9.2" sources."undefsafe-2.0.3" (sources."union-value-1.0.1" // { dependencies = [ @@ -80179,12 +80527,12 @@ in sources."jsprim-1.4.1" sources."locate-path-3.0.0" sources."long-4.0.0" - sources."mime-2.4.4" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-2.4.5" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimist-1.2.5" sources."module-alias-2.2.2" - sources."moment-2.24.0" + sources."moment-2.25.3" sources."ms-2.1.2" sources."node-fetch-2.6.0" sources."oauth-sign-0.9.0" @@ -80215,7 +80563,7 @@ in }) sources."string-width-3.1.0" sources."strip-ansi-5.2.0" - sources."telegraf-3.37.0" + sources."telegraf-3.38.0" sources."telegram-typings-3.6.1" sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" @@ -80259,7 +80607,7 @@ in sources."errno-0.1.7" sources."fs.realpath-1.0.0" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."isarray-1.0.0" @@ -80361,7 +80709,7 @@ in sources."function-bind-1.1.1" sources."get-stdin-5.0.1" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-symbols-1.0.1" @@ -80667,7 +81015,7 @@ in sources."glob-7.1.6" sources."global-dirs-0.1.1" sources."got-6.7.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-flag-3.0.0" sources."hosted-git-info-2.8.8" sources."ignore-3.3.10" @@ -81178,10 +81526,10 @@ in textlint-rule-unexpanded-acronym = nodeEnv.buildNodePackage { name = "textlint-rule-unexpanded-acronym"; packageName = "textlint-rule-unexpanded-acronym"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-unexpanded-acronym/-/textlint-rule-unexpanded-acronym-1.2.3.tgz"; - sha512 = "kkbsbUlI3Gw4VTr79E825+2wuxPG8dM8T4VjEH25zlNhh3j8vpsVDjpbXRkVFl+EvDBCtDZEDaFPwhXy85toVQ=="; + url = "https://registry.npmjs.org/textlint-rule-unexpanded-acronym/-/textlint-rule-unexpanded-acronym-1.2.4.tgz"; + sha512 = "F1kV06CdonOM2awtXjCSRYUsRJfDfZIujQQo4zEMqNqD6UwpkapxpZOiwcwbeaQz00+17ljbJEoGqIe2XeiU+w=="; }; dependencies = [ sources."array-includes-3.1.1" @@ -81272,7 +81620,7 @@ in sources."@types/debug-4.1.5" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-13.13.2" + sources."@types/node-13.13.4" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-1.0.0" @@ -81419,7 +81767,7 @@ in sources."getpass-0.1.7" sources."glob-7.1.6" sources."got-10.6.0" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."grapheme-splitter-1.0.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -81674,7 +82022,7 @@ in sources."wide-align-1.1.3" sources."with-open-file-0.1.7" sources."wrappy-1.0.2" - sources."ws-7.2.3" + sources."ws-7.2.5" sources."xmlhttprequest-ssl-1.5.5" sources."yallist-3.1.1" sources."yarn-1.22.0" @@ -81693,10 +82041,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.115.0"; + version = "0.116.1"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.115.0.tgz"; - sha512 = "mAV2Ky3RdcbdSbR9capI+tKLvRldWYxd4151PZTT/o7+U2jh9Is3a4KmnYwzyUAhB2ZA3pXSgCd2DOY4Tj5kow=="; + url = "https://registry.npmjs.org/three/-/three-0.116.1.tgz"; + sha512 = "l2JCMiA/lVZAuSrLWRYMalvpR+0j8hbIhCpfs4V6JFnw2+JQEQJ5HltNpfFr+9TDpQts1BhtcISehWf/xBGPvQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -81773,7 +82121,7 @@ in sources."fs.realpath-1.0.0" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.3" sources."http-signature-1.2.0" @@ -81790,11 +82138,11 @@ in sources."jsprim-1.4.1" sources."keypress-0.2.1" sources."lodash-4.17.15" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."minimist-0.0.10" - sources."moment-2.24.0" + sources."moment-2.25.3" (sources."node-appc-0.2.49" // { dependencies = [ sources."temp-0.8.4" @@ -81854,10 +82202,10 @@ in triton = nodeEnv.buildNodePackage { name = "triton"; packageName = "triton"; - version = "7.8.0"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/triton/-/triton-7.8.0.tgz"; - sha512 = "/f9E08NvOvOyudT1ar0ENjtJqcFuEnVMBhEpgQda8dQibxgOEbK7dOkc6T0OZ3ve1E3wXn8JVnY+l1EBZ/8/5w=="; + url = "https://registry.npmjs.org/triton/-/triton-7.9.0.tgz"; + sha512 = "PCZVVbdI90e07avgNyBJiw32Q0YIFwqgIW/HFbU5g3Hh/+P5VBJP8TBlkXM27VCM7L3hyCC3z9K8uq9mI8aIVQ=="; }; dependencies = [ sources."asn1-0.2.4" @@ -81926,7 +82274,7 @@ in sources."minimatch-3.0.4" sources."minimist-0.0.8" sources."mkdirp-0.5.1" - sources."moment-2.24.0" + sources."moment-2.25.3" sources."mooremachine-2.3.0" sources."mute-stream-0.0.8" sources."mv-2.1.1" @@ -82152,7 +82500,7 @@ in sources."commander-2.20.3" sources."crypto-random-string-1.0.0" sources."fs-extra-7.0.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."jsonfile-4.0.0" sources."p-debounce-1.0.0" sources."temp-dir-1.0.0" @@ -82178,10 +82526,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.9.1"; + version = "3.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.1.tgz"; - sha512 = "JUPoL1jHsc9fOjVFHdQIhqEEJsQvfKDjlubcCilu8U26uZ73qOg8VsN8O1jbuei44ZPlwL7kmbAdM4tzaUvqnA=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.2.tgz"; + sha512 = "zGVwKslUAD/EeqOrD1nQaBmXIHl1Vw371we8cvS8I6mYK9rmgX5tv8AAeJdfsQ3Kk5mGax2SVV/AizxdNGhl7Q=="; }; dependencies = [ sources."commander-2.20.3" @@ -82209,7 +82557,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" - sources."@types/node-13.13.2" + sources."@types/node-13.13.4" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."after-0.8.2" @@ -82351,7 +82699,7 @@ in sources."is-docker-2.0.0" sources."is-fullwidth-code-point-3.0.0" sources."is-stream-1.1.0" - sources."is-wsl-2.1.1" + sources."is-wsl-2.2.0" sources."isarray-2.0.1" sources."jquery-3.4.1" sources."jquery-ui-bundle-1.12.1" @@ -82380,8 +82728,8 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -82490,9 +82838,9 @@ in dependencies = [ sources."component-emitter-1.3.0" sources."debug-4.1.1" - sources."mime-2.4.4" + sources."mime-2.4.5" sources."ms-2.1.2" - sources."qs-6.9.3" + sources."qs-6.9.4" sources."semver-6.3.0" ]; }) @@ -82524,7 +82872,7 @@ in }) sources."wrap-ansi-6.2.0" sources."wrappy-1.0.2" - sources."ws-7.2.3" + sources."ws-7.2.5" sources."xmlhttprequest-ssl-1.5.5" sources."y18n-4.0.0" sources."yallist-2.1.2" @@ -82716,7 +83064,7 @@ in sources."git-clone-0.1.0" sources."glob-7.1.6" sources."got-6.7.1" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."graceful-readlink-1.0.1" sources."gray-matter-2.1.1" sources."handlebars-4.7.6" @@ -82743,7 +83091,6 @@ in sources."is-fullwidth-code-point-2.0.0" sources."is-natural-number-4.0.1" sources."is-object-1.0.1" - sources."is-promise-2.1.0" sources."is-redirect-1.0.0" sources."is-retry-allowed-1.2.0" sources."is-stream-1.1.0" @@ -82777,8 +83124,8 @@ in sources."supports-color-2.0.0" ]; }) - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -82820,7 +83167,7 @@ in sources."request-2.88.2" sources."restore-cursor-2.0.0" sources."rimraf-2.7.1" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."rxjs-6.5.5" sources."safe-buffer-5.2.0" sources."safer-buffer-2.1.2" @@ -82867,7 +83214,7 @@ in sources."tslib-1.11.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.9.1" + sources."uglify-js-3.9.2" sources."uid-0.0.2" sources."unbzip2-stream-1.4.2" sources."unyield-0.0.1" @@ -82926,7 +83273,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-13.13.2" + sources."@types/node-13.13.4" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -83250,7 +83597,7 @@ in sources."get-stream-4.1.0" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."gridsome-helper-json-1.0.3" sources."has-1.0.3" (sources."has-ansi-2.0.0" // { @@ -83332,7 +83679,6 @@ in sources."is-plain-object-2.0.4" sources."is-posix-bracket-0.1.1" sources."is-primitive-2.0.0" - sources."is-promise-2.1.0" sources."is-resolvable-1.1.0" sources."is-stream-1.1.0" sources."is-utf8-0.2.1" @@ -83541,7 +83887,7 @@ in sources."pretty-format-23.6.0" sources."process-nextick-args-2.0.1" sources."progress-2.0.3" - sources."property-information-5.4.0" + sources."property-information-5.5.0" sources."proto-list-1.2.4" sources."pseudomap-1.0.2" sources."pump-3.0.0" @@ -83604,7 +83950,7 @@ in sources."restore-cursor-2.0.0" sources."ret-0.1.15" sources."rimraf-2.6.3" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."rx-lite-4.0.8" sources."rx-lite-aggregates-4.0.8" sources."rxjs-6.5.5" @@ -83843,7 +84189,7 @@ in }) sources."vfile-sort-2.2.2" sources."vfile-statistics-1.1.4" - (sources."vscode-css-languageservice-4.1.1" // { + (sources."vscode-css-languageservice-4.1.2" // { dependencies = [ sources."vscode-uri-2.1.1" ]; @@ -83926,14 +84272,14 @@ in }) sources."@babel/polyfill-7.7.0" sources."@babel/runtime-7.7.7" - sources."@babel/runtime-corejs3-7.9.2" + sources."@babel/runtime-corejs3-7.9.6" sources."@cliqz-oss/firefox-client-0.3.1" sources."@cliqz-oss/node-firefox-connect-1.2.1" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.13.2" + sources."@types/node-13.13.4" sources."JSONSelect-0.2.1" sources."acorn-6.4.1" sources."acorn-jsx-5.2.0" @@ -84414,7 +84760,7 @@ in sources."get-stream-4.1.0" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."graceful-readlink-1.0.1" sources."growly-1.3.0" sources."har-schema-2.0.0" @@ -84482,6 +84828,7 @@ in sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" + sources."is-docker-2.0.0" sources."is-extendable-1.0.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -84499,7 +84846,6 @@ in sources."is-obj-2.0.0" sources."is-path-inside-3.0.2" sources."is-plain-object-2.0.4" - sources."is-promise-2.1.0" sources."is-property-1.0.2" sources."is-regex-1.0.5" sources."is-relative-0.1.3" @@ -84509,7 +84855,7 @@ in sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."is-windows-1.0.2" - sources."is-wsl-2.1.1" + sources."is-wsl-2.2.0" sources."is-yarn-global-0.3.0" sources."isarray-1.0.0" sources."isexe-2.0.0" @@ -84584,15 +84930,15 @@ in }) sources."merge-stream-2.0.0" sources."micromatch-3.1.10" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-1.2.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mixin-deep-1.3.2" sources."mkdirp-1.0.3" - sources."moment-2.24.0" + sources."moment-2.25.3" sources."ms-2.0.0" sources."multimatch-4.0.0" sources."mute-stream-0.0.7" @@ -84762,7 +85108,7 @@ in sources."restore-cursor-2.0.0" sources."ret-0.1.15" sources."rimraf-2.6.3" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."rx-lite-3.1.2" sources."rxjs-6.5.5" sources."safe-buffer-5.2.0" @@ -85222,14 +85568,19 @@ in sources."is-glob-3.1.0" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ sources."kind-of-4.0.0" ]; }) - sources."hash-base-3.0.4" + (sources."hash-base-3.1.0" // { + dependencies = [ + sources."readable-stream-3.6.0" + sources."safe-buffer-5.2.0" + ]; + }) sources."hash.js-1.1.7" sources."hmac-drbg-1.0.1" sources."https-browserify-1.0.0" @@ -85397,7 +85748,7 @@ in sources."source-list-map-2.0.1" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" - (sources."source-map-support-0.5.18" // { + (sources."source-map-support-0.5.19" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -85428,7 +85779,7 @@ in sources."stream-shift-1.0.1" sources."string_decoder-1.1.1" sources."tapable-1.1.3" - (sources."terser-4.6.11" // { + (sources."terser-4.6.13" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -85622,7 +85973,7 @@ in ]; }) sources."global-prefix-1.0.2" - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."has-flag-3.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -85843,7 +86194,7 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.13.2" + sources."@types/node-13.13.4" sources."accepts-1.3.7" sources."ajv-6.12.2" sources."ajv-errors-1.0.1" @@ -86053,7 +86404,7 @@ in sources."pify-2.3.0" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."handle-thing-2.0.1" sources."has-1.0.3" sources."has-flag-3.0.0" @@ -86132,8 +86483,8 @@ in sources."methods-1.1.2" sources."micromatch-3.1.10" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-2.1.0" sources."minimalistic-assert-1.0.1" sources."minimatch-3.0.4" @@ -86198,7 +86549,7 @@ in sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."pkg-dir-3.0.0" - (sources."portfinder-1.0.25" // { + (sources."portfinder-1.0.26" // { dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" @@ -86404,7 +86755,7 @@ in sources."wbuf-1.7.3" (sources."webpack-dev-middleware-3.7.2" // { dependencies = [ - sources."mime-2.4.4" + sources."mime-2.4.5" ]; }) sources."webpack-log-2.0.0" @@ -86486,7 +86837,7 @@ in sources."pify-3.0.0" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."iferr-0.1.5" sources."ignore-3.3.10" sources."imurmurhash-0.1.4" @@ -86587,7 +86938,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.2" + sources."@types/node-13.13.4" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.0" @@ -86696,7 +87047,7 @@ in sources."is-docker-2.0.0" sources."is-file-1.0.0" sources."is-typedarray-1.0.0" - sources."is-wsl-2.1.1" + sources."is-wsl-2.2.0" sources."isarray-1.0.0" sources."junk-3.1.0" sources."k-bucket-5.0.0" @@ -86717,12 +87068,12 @@ in sources."mdns-js-packet-0.2.0" sources."mediasource-2.3.0" sources."memory-chunk-store-1.3.0" - sources."mime-2.4.4" + sources."mime-2.4.5" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mkdirp-classic-0.5.2" - sources."moment-2.24.0" + sources."mkdirp-classic-0.5.3" + sources."moment-2.25.3" sources."mp4-box-encoding-1.4.1" sources."mp4-stream-3.1.0" sources."ms-2.0.0" @@ -86849,7 +87200,7 @@ in }) sources."winreg-1.2.4" sources."wrappy-1.0.2" - sources."ws-7.2.3" + sources."ws-7.2.5" sources."xml2js-0.4.23" sources."xmlbuilder-11.0.1" sources."xmldom-0.1.31" @@ -86932,7 +87283,7 @@ in sources."prettier-1.19.1" sources."request-light-0.2.5" sources."sprintf-js-1.0.3" - sources."vscode-json-languageservice-3.5.2" + sources."vscode-json-languageservice-3.6.0" sources."vscode-jsonrpc-4.0.0" (sources."vscode-languageserver-5.2.1" // { dependencies = [ @@ -86990,7 +87341,7 @@ in sources."@babel/code-frame-7.8.3" sources."@babel/helper-validator-identifier-7.9.5" sources."@babel/highlight-7.9.0" - sources."@babel/runtime-7.9.2" + sources."@babel/runtime-7.9.6" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@sindresorhus/is-0.7.0" @@ -86998,8 +87349,9 @@ in sources."@types/events-3.0.0" sources."@types/glob-7.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-13.13.2" + sources."@types/node-13.13.4" sources."@types/normalize-package-data-2.4.0" + sources."JSONStream-1.3.5" sources."aggregate-error-3.0.1" sources."ajv-6.12.2" sources."ansi-0.3.1" @@ -87026,6 +87378,11 @@ in sources."atob-2.1.2" sources."aws-sign2-0.7.0" sources."aws4-1.9.1" + (sources."axios-0.18.1" // { + dependencies = [ + sources."is-buffer-2.0.4" + ]; + }) sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -87093,6 +87450,7 @@ in sources."cli-width-2.2.1" sources."clone-1.0.4" sources."clone-buffer-1.0.0" + sources."clone-deep-4.0.1" sources."clone-regexp-1.0.1" sources."clone-response-1.0.2" sources."clone-stats-0.0.1" @@ -87140,6 +87498,7 @@ in }) sources."dot-prop-4.2.0" sources."downgrade-root-1.2.2" + sources."download-stats-0.3.4" sources."duplexer3-0.1.4" sources."ecc-jsbn-0.1.2" (sources."editions-2.3.0" // { @@ -87152,7 +87511,7 @@ in sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" sources."env-paths-1.0.0" - sources."errlop-2.1.0" + sources."errlop-2.2.0" sources."error-7.2.1" sources."error-ex-1.3.2" sources."es6-error-4.1.1" @@ -87206,6 +87565,11 @@ in sources."find-up-2.1.0" sources."find-versions-2.0.0" sources."first-chunk-stream-2.0.0" + (sources."follow-redirects-1.5.10" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) sources."for-in-1.0.2" sources."foreachasync-3.0.0" sources."forever-agent-0.6.1" @@ -87250,7 +87614,7 @@ in sources."p-cancelable-0.4.1" ]; }) - sources."graceful-fs-4.2.3" + sources."graceful-fs-4.2.4" sources."grouped-queue-1.1.0" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -87315,7 +87679,6 @@ in sources."is-path-inside-1.0.1" sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" - sources."is-promise-2.1.0" sources."is-redirect-1.0.0" sources."is-regexp-1.0.0" sources."is-retry-allowed-1.2.0" @@ -87341,6 +87704,7 @@ in sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" + sources."jsonparse-1.3.1" sources."jsprim-1.4.1" sources."keyv-3.0.0" sources."kind-of-6.0.3" @@ -87353,6 +87717,7 @@ in sources."url-parse-lax-1.0.0" ]; }) + sources."lazy-cache-2.0.2" sources."lines-and-columns-1.1.6" (sources."load-json-file-1.1.0" // { dependencies = [ @@ -87396,7 +87761,7 @@ in ]; }) sources."pify-4.0.1" - sources."replace-ext-1.0.0" + sources."replace-ext-1.0.1" sources."slash-2.0.0" sources."through2-3.0.1" sources."vinyl-2.2.0" @@ -87412,8 +87777,8 @@ in sources."merge-stream-2.0.0" sources."merge2-1.3.0" sources."micromatch-3.1.10" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -87424,6 +87789,7 @@ in ]; }) sources."mkdirp-0.5.5" + sources."moment-2.25.3" sources."ms-2.0.0" (sources."multimatch-4.0.0" // { dependencies = [ @@ -87436,6 +87802,7 @@ in sources."nice-try-1.0.5" sources."normalize-package-data-2.5.0" sources."normalize-url-2.0.1" + sources."npm-api-1.0.0" sources."npm-conf-1.1.3" (sources."npm-keyword-5.0.0" // { dependencies = [ @@ -87491,6 +87858,7 @@ in sources."p-try-1.0.0" sources."package-json-5.0.0" sources."pad-component-0.0.1" + sources."paged-request-2.0.1" sources."parse-help-1.0.0" sources."parse-json-2.2.0" sources."pascalcase-0.1.1" @@ -87576,7 +87944,7 @@ in sources."rimraf-2.7.1" sources."roarr-2.15.3" sources."root-check-1.0.0" - sources."run-async-2.4.0" + sources."run-async-2.4.1" sources."rx-4.1.0" sources."rxjs-6.5.5" sources."safe-buffer-5.2.0" @@ -87593,14 +87961,16 @@ in sources."type-fest-0.8.1" ]; }) + sources."set-getter-0.1.0" (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" ]; }) + sources."shallow-clone-3.0.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."shelljs-0.8.3" + sources."shelljs-0.8.4" sources."signal-exit-3.0.3" sources."slash-1.0.0" (sources."snapdragon-0.8.2" // { @@ -87811,7 +88181,7 @@ in ]; }) sources."yeoman-doctor-4.0.0" - (sources."yeoman-environment-2.9.5" // { + (sources."yeoman-environment-2.10.0" // { dependencies = [ sources."ansi-escapes-4.3.1" sources."ansi-regex-5.0.0" @@ -87857,7 +88227,7 @@ in sources."which-2.0.2" ]; }) - (sources."yeoman-generator-4.8.3" // { + (sources."yeoman-generator-4.10.0" // { dependencies = [ sources."debug-4.1.1" sources."diff-4.0.2" -- cgit v1.2.3 From f62e2b24c32bf9de26ea96a4891ab0cbe6b392f9 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Mon, 4 May 2020 22:56:39 +0200 Subject: superTuxKart: use assets directly from download This saves ~600MiB per STK build, as long as the assets remain the same. --- pkgs/games/super-tux-kart/default.nix | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index dcf1081e4d0..70c5657508b 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -1,9 +1,15 @@ -{ stdenv, fetchFromGitHub, fetchsvn, cmake, pkgconfig +{ stdenv, fetchFromGitHub, fetchsvn, cmake, pkgconfig, makeWrapper , openal, freealut, libGLU, libGL, libvorbis, libogg, gettext, curl, freetype , fribidi, libtool, bluez, libjpeg, libpng, zlib, libX11, libXrandr, enet, harfbuzz }: let dir = "stk-code"; + assets = fetchsvn { + url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets"; + rev = "18212"; + sha256 = "1dyj8r5rfifhnhayga8w8irkpa99vw57xjmy74cp8xz8g7zvdzqf"; + name = "stk-assets"; + }; in stdenv.mkDerivation rec { pname = "supertuxkart"; @@ -17,15 +23,9 @@ in stdenv.mkDerivation rec { sha256 = "01vxxl94583ixswzmi4caz8dk64r56pn3zxh7v63zml60yfvxbvp"; name = dir; }) - (fetchsvn { - url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets"; - rev = "18212"; - sha256 = "1dyj8r5rfifhnhayga8w8irkpa99vw57xjmy74cp8xz8g7zvdzqf"; - name = "stk-assets"; - }) ]; - nativeBuildInputs = [ cmake gettext libtool pkgconfig ]; + nativeBuildInputs = [ cmake gettext libtool pkgconfig makeWrapper ]; buildInputs = [ libX11 libXrandr @@ -38,8 +38,14 @@ in stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_RECORDER=OFF" # libopenglrecorder is not in nixpkgs "-DUSE_SYSTEM_ANGELSCRIPT=OFF" # doesn't work with 2.31.2 or 2.32.0 + "-DCHECK_ASSETS=OFF" ]; + # Obtain the assets directly from the fetched store path, to avoid duplicating assets across multiple engine builds + preFixup = '' + wrapProgram $out/bin/supertuxkart --set-default SUPERTUXKART_ASSETS_DIR "${assets}" + ''; + sourceRoot = dir; meta = with stdenv.lib; { -- cgit v1.2.3 From b346e1d4440570079ae75eaccd6125ab55ec8152 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 4 May 2020 20:58:31 +0100 Subject: podman: Don't symlink the $bin output If we do it propagates and ends up in $PATH inside nix-shell --- pkgs/applications/virtualization/podman/wrapper.nix | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix index 551f134478b..6a64adc88e6 100644 --- a/pkgs/applications/virtualization/podman/wrapper.nix +++ b/pkgs/applications/virtualization/podman/wrapper.nix @@ -27,8 +27,19 @@ let iptables ] ++ extraPackages); + outputs = [ + "out" + "man" + ]; + in runCommand podman.name { - inherit (podman) name pname version meta outputs; + name = "${podman.pname}-wrapper-${podman.version}"; + inherit (podman) pname version; + + meta = builtins.removeAttrs podman.meta [ "outputsToInstall" ]; + + inherit outputs; + nativeBuildInputs = [ makeWrapper ]; @@ -39,7 +50,7 @@ in runCommand podman.name { lib.concatMapStringsSep "\n" (o: "ln -s ${podman.${o}} ${placeholder o}") (builtins.filter (o: o != "out") - podman.outputs)} + outputs)} mkdir -p $out/bin ln -s ${podman-unwrapped}/share $out/share -- cgit v1.2.3 From 3ab8762b06ec1dd391ee62a1110ea148cab396c0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 21:40:16 +0000 Subject: entr: 4.4 -> 4.5 --- pkgs/tools/misc/entr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix index aeb88d0c68b..be8134a92a3 100644 --- a/pkgs/tools/misc/entr/default.nix +++ b/pkgs/tools/misc/entr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "entr"; - version = "4.4"; + version = "4.5"; src = fetchurl { url = "http://entrproject.org/code/${pname}-${version}.tar.gz"; - sha256 = "1x2hyc8vc5dz6k7b3291vxz36wllhinvqrb0d8zx9bv0ydj6qmjl"; + sha256 = "08gsd99w20fdi0apppmzsh06z29ga8y89nfcizidil2hkl8b7jyn"; }; postPatch = '' -- cgit v1.2.3 From 446fb0097af6eb479537166153cc23f2e2c7068a Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Mon, 13 Apr 2020 20:13:36 -0700 Subject: nixos/doas: init `doas` is a lighter alternative to `sudo` that "provide[s] 95% of the features of `sudo` with a fraction of the codebase" [1]. I prefer it to `sudo`, so I figured I would add a NixOS module in order for it to be easier to use. The module is based off of the existing `sudo` module. [1] https://github.com/Duncaen/OpenDoas --- nixos/modules/module-list.nix | 1 + nixos/modules/security/doas.nix | 274 ++++++++++++++++++++++++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/doas.nix | 83 ++++++++++++ 4 files changed, 359 insertions(+) create mode 100644 nixos/modules/security/doas.nix create mode 100644 nixos/tests/doas.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 28f536056bf..40904ef0c17 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -200,6 +200,7 @@ ./security/rtkit.nix ./security/wrappers/default.nix ./security/sudo.nix + ./security/doas.nix ./security/systemd-confinement.nix ./security/tpm2.nix ./services/admin/oxidized.nix diff --git a/nixos/modules/security/doas.nix b/nixos/modules/security/doas.nix new file mode 100644 index 00000000000..1991a58db60 --- /dev/null +++ b/nixos/modules/security/doas.nix @@ -0,0 +1,274 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.security.doas; + + inherit (pkgs) doas; + + mkUsrString = user: toString user; + + mkGrpString = group: ":${toString group}"; + + mkOpts = rule: concatStringsSep " " [ + (optionalString rule.noPass "nopass") + (optionalString rule.persist "persist") + (optionalString rule.keepEnv "keepenv") + "setenv { SSH_AUTH_SOCK ${concatStringsSep " " rule.setEnv} }" + ]; + + mkArgs = rule: + if (isNull rule.args) then "" + else if (length rule.args == 0) then "args" + else "args ${concatStringsSep " " rule.args}"; + + mkRule = rule: + let + opts = mkOpts rule; + + as = optionalString (!isNull rule.runAs) "as ${rule.runAs}"; + + cmd = optionalString (!isNull rule.cmd) "cmd ${rule.cmd}"; + + args = mkArgs rule; + in + optionals (length cfg.extraRules > 0) [ + ( + optionalString (length rule.users > 0) + (map (usr: "permit ${opts} ${mkUsrString usr} ${as} ${cmd} ${args}") rule.users) + ) + ( + optionalString (length rule.groups > 0) + (map (grp: "permit ${opts} ${mkGrpString grp} ${as} ${cmd} ${args}") rule.groups) + ) + ]; +in +{ + + ###### interface + + options.security.doas = { + + enable = mkOption { + type = with types; bool; + default = false; + description = '' + Whether to enable the doas command, which allows + non-root users to execute commands as root. + ''; + }; + + wheelNeedsPassword = mkOption { + type = with types; bool; + default = true; + description = '' + Whether users of the wheel group must provide a password to + run commands as super user via doas. + ''; + }; + + extraRules = mkOption { + default = []; + description = '' + Define specific rules to be set in the + /etc/doas.conf file. More specific rules should + come after more general ones in order to yield the expected behavior. + You can use mkBefore and/or mkAfter to ensure + this is the case when configuration options are merged. + ''; + example = literalExample '' + [ + # Allow execution of any command by any user in group doas, requiring + # a password and keeping any previously-defined environment variables. + { groups = [ "doas" ]; noPass = false; keepEnv = true; } + + # Allow execution of "/home/root/secret.sh" by user `backup` OR user + # `database` OR any member of the group with GID `1006`, without a + # password. + { users = [ "backup" "database" ]; groups = [ 1006 ]; + cmd = "/home/root/secret.sh"; noPass = true; } + + # Allow any member of group `bar` to run `/home/baz/cmd1.sh` as user + # `foo` with argument `hello-doas`. + { groups = [ "bar" ]; runAs = "foo"; + cmd = "/home/baz/cmd1.sh"; args = [ "hello-doas" ]; } + + # Allow any member of group `bar` to run `/home/baz/cmd2.sh` as user + # `foo` with no arguments. + { groups = [ "bar" ]; runAs = "foo"; + cmd = "/home/baz/cmd2.sh"; args = [ ]; } + + # Allow user `abusers` to execute "nano" and unset the value of + # SSH_AUTH_SOCK, override the value of ALPHA to 1, and inherit the + # value of BETA from the current environment. + { users = [ "abusers" ]; cmd = "nano"; + setEnv = [ "-SSH_AUTH_SOCK" "ALPHA=1" "BETA" ]; } + ] + ''; + type = with types; listOf ( + submodule { + options = { + + noPass = mkOption { + type = with types; bool; + default = false; + description = '' + If true, the user is not required to enter a + password. + ''; + }; + + persist = mkOption { + type = with types; bool; + default = false; + description = '' + If true, do not ask for a password again for some + time after the user successfully authenticates. + ''; + }; + + keepEnv = mkOption { + type = with types; bool; + default = false; + description = '' + If true, environment variables other than those + listed in + doas1 + are kept when creating the environment for the new process. + ''; + }; + + setEnv = mkOption { + type = with types; listOf str; + default = []; + description = '' + Keep or set the specified variables. Variables may also be + removed with a leading '-' or set using + variable=value. If the first character of + value is a '$', the value to be set is taken from + the existing environment variable of the indicated name. This + option is processed after the default environment has been + created. + + NOTE: All rules have setenv { SSH_AUTH_SOCK } by + default. To prevent SSH_AUTH_SOCK from being + inherited, add "-SSH_AUTH_SOCK" anywhere in this + list. + ''; + }; + + users = mkOption { + type = with types; listOf (either str int); + default = []; + description = "The usernames / UIDs this rule should apply for."; + }; + + groups = mkOption { + type = with types; listOf (either str int); + default = []; + description = "The groups / GIDs this rule should apply for."; + }; + + runAs = mkOption { + type = with types; nullOr str; + default = null; + description = '' + Which user or group the specified command is allowed to run as. + When set to null (the default), all users are + allowed. + + A user can be specified using just the username: + "foo". It is also possible to only allow running as + a specific group with ":bar". + ''; + }; + + cmd = mkOption { + type = with types; nullOr str; + default = null; + description = '' + The command the user is allowed to run. When set to + null (the default), all commands are allowed. + + NOTE: It is best practice to specify absolute paths. If a + relative path is specified, only a restricted PATH will be + searched. + ''; + }; + + args = mkOption { + type = with types; nullOr (listOf str); + default = null; + description = '' + Arguments that must be provided to the command. When set to + [], the command must be run without any arguments. + ''; + }; + }; + } + ); + }; + + extraConfig = mkOption { + type = with types; lines; + default = ""; + description = '' + Extra configuration text appended to doas.conf. + ''; + }; + }; + + + ###### implementation + + config = mkIf cfg.enable { + + security.doas.extraRules = [ + { + groups = [ "wheel" ]; + noPass = !cfg.wheelNeedsPassword; + } + ]; + + security.wrappers = { + doas.source = "${doas}/bin/doas"; + }; + + environment.systemPackages = [ + doas + ]; + + security.pam.services.doas = { + allowNullPassword = true; + sshAgentAuth = true; + }; + + environment.etc."doas.conf" = { + source = pkgs.runCommand "doas-conf" + { + src = pkgs.writeText "doas-conf-in" '' + # To modify this file, set the NixOS options + # `security.doas.extraRules` or `security.doas.extraConfig`. To + # completely replace the contents of this file, use + # `environment.etc."doas.conf"`. + + # "root" is allowed to do anything. + permit nopass keepenv root + + # extraRules + ${concatStringsSep "\n" (lists.flatten (map mkRule cfg.extraRules))} + + # extraConfig + ${cfg.extraConfig} + ''; + preferLocalBuild = true; + } + # Make sure that the doas.conf file is syntactically valid. + "${pkgs.buildPackages.doas}/bin/doas -C $src && cp $src $out"; + mode = "0440"; + }; + + }; + + meta.maintainers = with maintainers; [ cole-h ]; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index ebb0dfef15a..b8ff4647b9f 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -69,6 +69,7 @@ in deluge = handleTest ./deluge.nix {}; dhparams = handleTest ./dhparams.nix {}; dnscrypt-proxy2 = handleTestOn ["x86_64-linux"] ./dnscrypt-proxy2.nix {}; + doas = handleTest ./doas.nix {}; docker = handleTestOn ["x86_64-linux"] ./docker.nix {}; oci-containers = handleTestOn ["x86_64-linux"] ./oci-containers.nix {}; docker-edge = handleTestOn ["x86_64-linux"] ./docker-edge.nix {}; diff --git a/nixos/tests/doas.nix b/nixos/tests/doas.nix new file mode 100644 index 00000000000..9c0a4bdc756 --- /dev/null +++ b/nixos/tests/doas.nix @@ -0,0 +1,83 @@ +# Some tests to ensure doas is working properly. +import ./make-test-python.nix ( + { lib, ... }: { + name = "doas"; + meta = with lib.maintainers; { + maintainers = [ cole-h ]; + }; + + machine = + { ... }: + { + users.groups = { foobar = {}; barfoo = {}; baz = { gid = 1337; }; }; + users.users = { + test0 = { isNormalUser = true; extraGroups = [ "wheel" ]; }; + test1 = { isNormalUser = true; }; + test2 = { isNormalUser = true; extraGroups = [ "foobar" ]; }; + test3 = { isNormalUser = true; extraGroups = [ "barfoo" ]; }; + test4 = { isNormalUser = true; extraGroups = [ "baz" ]; }; + test5 = { isNormalUser = true; }; + test6 = { isNormalUser = true; }; + test7 = { isNormalUser = true; }; + }; + + security.doas = { + enable = true; + wheelNeedsPassword = false; + + extraRules = [ + { users = [ "test1" ]; groups = [ "foobar" ]; } + { users = [ "test2" ]; noPass = true; setEnv = [ "CORRECT" "HORSE=BATTERY" ]; } + { groups = [ "barfoo" 1337 ]; noPass = true; } + { users = [ "test5" ]; noPass = true; keepEnv = true; runAs = "test1"; } + { users = [ "test6" ]; noPass = true; keepEnv = true; setEnv = [ "-STAPLE" ]; } + { users = [ "test7" ]; noPass = true; setEnv = [ "-SSH_AUTH_SOCK" ]; } + ]; + }; + }; + + testScript = '' + with subtest("users in wheel group should have passwordless doas"): + machine.succeed('su - test0 -c "doas -u root true"') + + with subtest("test1 user should not be able to use doas without password"): + machine.fail('su - test1 -c "doas -n -u root true"') + + with subtest("test2 user should be able to keep some env"): + if "CORRECT=1" not in machine.succeed('su - test2 -c "CORRECT=1 doas env"'): + raise Exception("failed to keep CORRECT") + + if "HORSE=BATTERY" not in machine.succeed('su - test2 -c "doas env"'): + raise Exception("failed to setenv HORSE=BATTERY") + + with subtest("users in group 'barfoo' shouldn't require password"): + machine.succeed("doas -u test3 doas -n -u root true") + + with subtest("users in group 'baz' (GID 1337) shouldn't require password"): + machine.succeed("doas -u test4 doas -n -u root echo true") + + with subtest("test5 user should be able to run commands under test1"): + machine.succeed("doas -u test5 doas -n -u test1 true") + + with subtest("test5 user should not be able to run commands under root"): + machine.fail("doas -u test5 doas -n -u root true") + + with subtest("test6 user should be able to keepenv"): + envs = ["BATTERY=HORSE", "CORRECT=false"] + out = machine.succeed( + 'su - test6 -c "BATTERY=HORSE CORRECT=false STAPLE=Tr0ub4dor doas env"' + ) + + if not all(env in out for env in envs): + raise Exception("failed to keep BATTERY or CORRECT") + if "STAPLE=Tr0ub4dor" in out: + raise Exception("failed to exclude STAPLE") + + with subtest("test7 should not have access to SSH_AUTH_SOCK"): + if "SSH_AUTH_SOCK=HOLEY" in machine.succeed( + 'su - test7 -c "SSH_AUTH_SOCK=HOLEY doas env"' + ): + raise Exception("failed to exclude SSH_AUTH_SOCK") + ''; + } +) -- cgit v1.2.3 From a6582425f8fd7a62a56e266931f85f71df0bd783 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9-Patrick=20Bubel?= Date: Tue, 5 May 2020 00:56:05 +0200 Subject: joplin-desktop: 1.0.200 -> 1.0.201 https://github.com/laurent22/joplin/releases/tag/v1.0.201 --- pkgs/applications/misc/joplin-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/joplin-desktop/default.nix b/pkgs/applications/misc/joplin-desktop/default.nix index 5787836487b..3c84588530c 100644 --- a/pkgs/applications/misc/joplin-desktop/default.nix +++ b/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,7 +2,7 @@ let pname = "joplin-desktop"; - version = "1.0.200"; + version = "1.0.201"; desktopItem = makeDesktopItem { name = "Joplin"; exec = "joplin-desktop"; @@ -13,7 +13,7 @@ in appimageTools.wrapType2 rec { name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.AppImage"; - sha256 = "14gwv8i6dprvl96mifadq0zj77a82rww8xd5bmzm8ql6sidi2216"; + sha256 = "060dkgamsv59vgslqyjfh1g8wg3nldrvfb9lf0y9sxjlbsv8bc55"; }; -- cgit v1.2.3 From a7462dfa13a633912e564868a39ca4eb63a307ae Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 5 May 2020 09:35:55 +1000 Subject: shfmt: 3.1.0 -> 3.1.1 https://github.com/mvdan/sh/releases/tag/v3.1.1 --- pkgs/tools/text/shfmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix index 71f79724b9c..cad59507903 100644 --- a/pkgs/tools/text/shfmt/default.nix +++ b/pkgs/tools/text/shfmt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "shfmt"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "mvdan"; repo = "sh"; rev = "v${version}"; - sha256 = "1k0bq4b4rv6wrh24jvcnpg1mfqrzqhl90zg4zibxzv3zkhjdskzh"; + sha256 = "0zlk1jjk65jwd9cx0xarz4yg2r2h86kd5g00gcnsav6dp6rx3aw8"; }; modSha256 = "080k8d5rp8kyg0x7vjxm758b9ya9z336yd4rcqws7yhqawxiv55z"; -- cgit v1.2.3 From 7c77e6d988c45b0c637d3ff8443fda8646f7f970 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 5 May 2020 00:28:00 +0100 Subject: podman: Link directly to podman.man instead of maping over outputs This seems brittle and fails on Hydra / OfBorg but not locally. --- pkgs/applications/virtualization/podman/wrapper.nix | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix index 6a64adc88e6..99233696b3e 100644 --- a/pkgs/applications/virtualization/podman/wrapper.nix +++ b/pkgs/applications/virtualization/podman/wrapper.nix @@ -27,30 +27,23 @@ let iptables ] ++ extraPackages); - outputs = [ - "out" - "man" - ]; - in runCommand podman.name { name = "${podman.pname}-wrapper-${podman.version}"; inherit (podman) pname version; meta = builtins.removeAttrs podman.meta [ "outputsToInstall" ]; - inherit outputs; + outputs = [ + "out" + "man" + ]; nativeBuildInputs = [ makeWrapper ]; } '' - # Symlink everything but $out from podman-unwrapped - ${ - lib.concatMapStringsSep "\n" - (o: "ln -s ${podman.${o}} ${placeholder o}") - (builtins.filter (o: o != "out") - outputs)} + ln -s ${podman.man} $man mkdir -p $out/bin ln -s ${podman-unwrapped}/share $out/share -- cgit v1.2.3 From d0de28e20aec2a1d6c6ecfbcc92c5cc1884f7822 Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Mon, 4 May 2020 17:22:25 -0700 Subject: qimgv: 0.9 -> 0.9.1 https://github.com/easymodo/qimgv/compare/v0.9...v0.9.1 --- pkgs/applications/graphics/qimgv/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/graphics/qimgv/default.nix b/pkgs/applications/graphics/qimgv/default.nix index 4bbf6aa31d3..2b24a34fbc2 100644 --- a/pkgs/applications/graphics/qimgv/default.nix +++ b/pkgs/applications/graphics/qimgv/default.nix @@ -16,25 +16,15 @@ mkDerivation rec { pname = "qimgv"; - version = "0.9"; + version = "0.9.1"; src = fetchFromGitHub { owner = "easymodo"; repo = pname; rev = "v${version}"; - sha256 = "1yynjk47gjf2kjfb0ak4blxpb5irgqc1k59z726lwjd6gvg689fl"; + sha256 = "0b2hddps969gjim2r9a22zaxmnzp600av2zz6icq66ksfrx1rpac"; }; - patches = [ - # QtAtomicInt's `storeRelaxed` was introduced in Qt 5.14, while nixpkgs only - # has Qt 5.12. This appears to be the only instance of Qt 5.12 - # incompatibility, and will be fixed in the next release. - (fetchpatch { - url = "https://github.com/easymodo/qimgv/commit/a39d6086ceb9445d2c16943e0719096a99920bf8.patch"; - sha256 = "1z3ngv6i316hrdcdzig4jg6bcdbgfxjaxvm2jcfcw2dnfbfiq47s"; - }) - ]; - nativeBuildInputs = [ cmake pkgconfig -- cgit v1.2.3 From a55b736a655c1bf4dffe8ddb985aaa350e22b2dc Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Mon, 4 May 2020 21:28:56 -0300 Subject: nixos/hostapd: conditionally enable ieee80211d --- nixos/modules/services/networking/hostapd.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/hostapd.nix b/nixos/modules/services/networking/hostapd.nix index c11f5bab3d5..87e07509fef 100644 --- a/nixos/modules/services/networking/hostapd.nix +++ b/nixos/modules/services/networking/hostapd.nix @@ -21,6 +21,7 @@ let hw_mode=${cfg.hwMode} channel=${toString cfg.channel} ${optionalString (cfg.countryCode != null) ''country_code=${cfg.countryCode}''} + ${optionalString (cfg.countryCode != null) ''ieee80211d=1''} # logging (debug level) logger_syslog=-1 @@ -167,7 +168,10 @@ in Set as needed to indicate country in which device is operating. This can limit available channels and transmit power. These two octets are used as the first two octets of the Country String - (dot11CountryString) + (dot11CountryString). + If set this enables IEEE 802.11d. This advertises the countryCode and + the set of allowed channels and transmit power levels based on the + regulatory limits. ''; }; -- cgit v1.2.3 From 6e5b3c9aed64460609d92bc86d6b306bacd324d0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 00:47:07 +0000 Subject: gitAndTools.git-trim: 0.3.1 -> 0.3.2 --- .../version-management/git-and-tools/git-trim/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-trim/default.nix b/pkgs/applications/version-management/git-and-tools/git-trim/default.nix index 0a3360b33b0..d843cdc307c 100644 --- a/pkgs/applications/version-management/git-and-tools/git-trim/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-trim/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "git-trim"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "foriequal0"; repo = pname; rev = "v${version}"; - sha256 = "06wni47s8yq274bh5f7bcy0sah23938kjiw5pdxnma5kwwnrccrr"; + sha256 = "079kavm3n776wvmy25jq1g4qdvmhh3d3x1vdpb1f6pw5rkky8lyw"; }; - cargoSha256 = "06ndja8212xy4rybh1117wijsyj70w4z8h6km538a7598s49vzdk"; + cargoSha256 = "1ii5l7z9avg0gzlaav2gnfbr8wkbp008i5rz6k6bs2sfqnpnn5k6"; nativeBuildInputs = [ pkg-config ]; -- cgit v1.2.3 From c58ad04ff0fae5a531a03d328ff391442e88b43c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 00:53:47 +0000 Subject: fetchmail: 6.4.3 -> 6.4.4 --- pkgs/applications/misc/fetchmail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index 9e379009027..1b892c7f536 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, openssl }: let - version = "6.4.3"; + version = "6.4.4"; in stdenv.mkDerivation { pname = "fetchmail"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "1r6k14m40ni9114i3j1lr6zwpxky6k89mycgxxg0cpdap4a0wdmh"; + sha256 = "1smbydwfjq29a2l44g6mgj0cd412fz40gbq6vq0klm7pmgd606si"; }; buildInputs = [ openssl ]; -- cgit v1.2.3 From f6e1032f4c9dd69dcef436c4b2ea62da1ddda371 Mon Sep 17 00:00:00 2001 From: Piper McCorkle Date: Mon, 4 May 2020 20:43:12 -0500 Subject: caddy2: 2.0.0-rc.3 -> 2.0.0 --- pkgs/servers/caddy/v2.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/caddy/v2.nix b/pkgs/servers/caddy/v2.nix index 599e2e8c906..4175dfa20fc 100644 --- a/pkgs/servers/caddy/v2.nix +++ b/pkgs/servers/caddy/v2.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "caddy"; - version = "2.0.0-rc.3"; + version = "2.0.0"; subPackages = [ "cmd/caddy" ]; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "caddyserver"; repo = pname; rev = "v${version}"; - sha256 = "1jsjh8q5wsnp7j7r1rlnw0w4alihpcmpmlpqncmhik10f6v7xm3y"; + sha256 = "1c1frfx0qkprhf4var70cncvrw8s9gjag2hygndbd9055hb52bvv"; }; - modSha256 = "0n0k0w9y2z87z6m6j3sxsgqn9sm82rdcqpdck236fxj23k4akyp6"; + modSha256 = "19sxyvfq1bpg85w8cd1yk2s6rd8759cf2zqs5b6wyny4cak2bl83"; meta = with stdenv.lib; { homepage = "https://caddyserver.com"; -- cgit v1.2.3 From 420124adf879fded33ec58233e37416fd4f55720 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 4 May 2020 20:32:01 +0200 Subject: python: remove isPy33, isPy34 --- pkgs/development/interpreters/python/default.nix | 2 -- pkgs/development/python-modules/clikit/default.nix | 5 ++--- pkgs/development/python-modules/evdev/default.nix | 4 +--- pkgs/development/python-modules/livestreamer/default.nix | 4 +--- pkgs/development/python-modules/numba/default.nix | 4 ++-- pkgs/development/python-modules/poetry/default.nix | 6 +++--- pkgs/development/python-modules/pycairo/default.nix | 4 +--- pkgs/development/python-modules/rencode/default.nix | 2 -- pkgs/development/python-modules/rig/default.nix | 4 ++-- pkgs/development/python-modules/serpent/default.nix | 3 +-- pkgs/development/python-modules/tomlkit/default.nix | 4 ++-- pkgs/development/python-modules/traits/default.nix | 3 +-- pkgs/top-level/python-packages.nix | 4 ++-- 13 files changed, 18 insertions(+), 31 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 5dc3b224720..2def54de12d 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -23,8 +23,6 @@ with pkgs; }; in rec { isPy27 = pythonVersion == "2.7"; - isPy33 = pythonVersion == "3.3"; # TODO: remove - isPy34 = pythonVersion == "3.4"; # TODO: remove isPy35 = pythonVersion == "3.5"; isPy36 = pythonVersion == "3.6"; isPy37 = pythonVersion == "3.7"; diff --git a/pkgs/development/python-modules/clikit/default.nix b/pkgs/development/python-modules/clikit/default.nix index 32e9b4fcb4a..98533f95f92 100644 --- a/pkgs/development/python-modules/clikit/default.nix +++ b/pkgs/development/python-modules/clikit/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, isPy27, isPy34 +, isPy27 , pylev, pastel, typing, enum34 }: buildPythonPackage rec { @@ -13,8 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ pylev pastel - ] ++ lib.optional (isPy27 || isPy34) typing - ++ lib.optional isPy27 enum34; + ] ++ lib.optionals isPy27 [ typing enum34 ]; # The Pypi tarball doesn't include tests, and the GitHub source isn't # buildable until we bootstrap poetry, see diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix index cef6c27e59c..ab169fe679d 100644 --- a/pkgs/development/python-modules/evdev/default.nix +++ b/pkgs/development/python-modules/evdev/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, isPy34, fetchPypi, linuxHeaders }: +{ lib, buildPythonPackage, fetchPypi, linuxHeaders }: buildPythonPackage rec { pname = "evdev"; @@ -17,8 +17,6 @@ buildPythonPackage rec { doCheck = false; - disabled = isPy34; # see http://bugs.python.org/issue21121 - meta = with lib; { description = "Provides bindings to the generic input event interface in Linux"; homepage = "https://pythonhosted.org/evdev"; diff --git a/pkgs/development/python-modules/livestreamer/default.nix b/pkgs/development/python-modules/livestreamer/default.nix index da789c0f6a6..83bd4bcfb72 100644 --- a/pkgs/development/python-modules/livestreamer/default.nix +++ b/pkgs/development/python-modules/livestreamer/default.nix @@ -7,7 +7,6 @@ , singledispatch , futures , isPy27 -, isPy33 }: buildPythonPackage rec { @@ -23,8 +22,7 @@ buildPythonPackage rec { buildInputs = [ pkgs.makeWrapper ]; propagatedBuildInputs = [ pkgs.rtmpdump pycrypto requests ] - ++ stdenv.lib.optionals isPy27 [ singledispatch futures ] - ++ stdenv.lib.optionals isPy33 [ singledispatch ]; + ++ stdenv.lib.optionals isPy27 [ singledispatch futures ]; postInstall = '' wrapProgram $out/bin/livestreamer --prefix PATH : ${pkgs.rtmpdump}/bin diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index 8fbbdb677fd..71e8eec3941 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -4,7 +4,6 @@ , python , buildPythonPackage , isPy27 -, isPy33 , isPy3k , numpy , llvmlite @@ -26,7 +25,8 @@ buildPythonPackage rec { NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; - propagatedBuildInputs = [numpy llvmlite] ++ stdenv.lib.optional (!isPy3k) funcsigs ++ stdenv.lib.optional (isPy27 || isPy33) singledispatch; + propagatedBuildInputs = [numpy llvmlite] + ++ stdenv.lib.optionals isPy27 [ funcsigs singledispatch]; # Copy test script into $out and run the test suite. checkPhase = '' diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index 481fd2c5feb..46be9bc92a2 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -1,5 +1,6 @@ { lib, buildPythonPackage, fetchPypi, callPackage -, isPy27, isPy34, pythonOlder +, isPy27 +, pythonOlder , cleo , requests , cachy @@ -66,8 +67,7 @@ in buildPythonPackage rec { pexpect keyring lockfile - ] ++ lib.optionals (isPy27 || isPy34) [ typing pathlib2 glob2 ] - ++ lib.optionals isPy27 [ virtualenv functools32 subprocess32 ] + ] ++ lib.optionals isPy27 [ typing pathlib2 glob2 virtualenv functools32 subprocess32 ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; postInstall = '' diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix index fbefd7efefa..d61279e38d5 100644 --- a/pkgs/development/python-modules/pycairo/default.nix +++ b/pkgs/development/python-modules/pycairo/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, meson, ninja, buildPythonPackage, pytest, pkgconfig, cairo, xlibsWrapper, isPy33, isPy3k }: +{ lib, fetchFromGitHub, meson, ninja, buildPythonPackage, pytest, pkgconfig, cairo, xlibsWrapper, isPy3k }: buildPythonPackage rec { pname = "pycairo"; @@ -6,8 +6,6 @@ buildPythonPackage rec { format = "other"; - disabled = isPy33; - src = fetchFromGitHub { owner = "pygobject"; repo = "pycairo"; diff --git a/pkgs/development/python-modules/rencode/default.nix b/pkgs/development/python-modules/rencode/default.nix index 7769adf2219..3240c524d3b 100644 --- a/pkgs/development/python-modules/rencode/default.nix +++ b/pkgs/development/python-modules/rencode/default.nix @@ -1,6 +1,5 @@ { stdenv , buildPythonPackage -, isPy33 , fetchgit , cython }: @@ -8,7 +7,6 @@ buildPythonPackage { pname = "rencode"; version = "git20150810"; - disabled = isPy33; src = fetchgit { url = "https://github.com/aresch/rencode"; diff --git a/pkgs/development/python-modules/rig/default.nix b/pkgs/development/python-modules/rig/default.nix index d83afd7885f..bc43aac3551 100644 --- a/pkgs/development/python-modules/rig/default.nix +++ b/pkgs/development/python-modules/rig/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi -, isPy34, isPy35, isPy27 +, isPy35, isPy27 , numpy, pytz, six, enum-compat, sentinel }: @@ -16,7 +16,7 @@ buildPythonPackage rec { # This is the list of officially supported versions. Other versions may work # as well. - disabled = !(isPy35 || isPy34 || isPy27); + disabled = !(isPy27 || isPy35); # Test Phase is only supported in development sources. doCheck = false; diff --git a/pkgs/development/python-modules/serpent/default.nix b/pkgs/development/python-modules/serpent/default.nix index 353ea1cbe26..701de520046 100644 --- a/pkgs/development/python-modules/serpent/default.nix +++ b/pkgs/development/python-modules/serpent/default.nix @@ -4,7 +4,6 @@ , lib , python , isPy27 -, isPy33 , enum34 , attrs , pytz @@ -19,7 +18,7 @@ buildPythonPackage rec { sha256 = "1arnckykpkvv2qrp49l1k7q5mr5pisswl0rvdx98x8wsl1n361pk"; }; - propagatedBuildInputs = lib.optionals (isPy27 || isPy33) [ enum34 ]; + propagatedBuildInputs = lib.optionals isPy27 [ enum34 ]; checkInputs = [ attrs pytz ]; checkPhase = '' diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix index de48b3736cf..deff7769dfb 100644 --- a/pkgs/development/python-modules/tomlkit/default.nix +++ b/pkgs/development/python-modules/tomlkit/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, isPy34 +{ lib, buildPythonPackage, fetchPypi, isPy27 , enum34, functools32, typing }: @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = lib.optionals isPy27 [ enum34 functools32 ] - ++ lib.optional (isPy27 || isPy34) typing; + ++ lib.optional isPy27 typing; # The Pypi tarball doesn't include tests, and the GitHub source isn't # buildable until we bootstrap poetry, see diff --git a/pkgs/development/python-modules/traits/default.nix b/pkgs/development/python-modules/traits/default.nix index 47bbbee04e7..5bd84990835 100644 --- a/pkgs/development/python-modules/traits/default.nix +++ b/pkgs/development/python-modules/traits/default.nix @@ -4,7 +4,6 @@ , python , pytest , numpy -, isPy33 }: buildPythonPackage rec { @@ -28,7 +27,7 @@ buildPythonPackage rec { # https://github.com/enthought/traits/issues/187 # https://github.com/enthought/traits/pull/188 # Furthermore, some tests fail due to being in a chroot - doCheck = isPy33; + doCheck = false; meta = with stdenv.lib; { description = "Explicitly typed attributes for Python"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5548f8c75a7..949e6cf0afb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18,7 +18,7 @@ let packages = ( self: let - inherit (python.passthru) isPy27 isPy33 isPy34 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder; + inherit (python.passthru) isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder; callPackage = pkgs.newScope self; @@ -100,7 +100,7 @@ let in { - inherit (python.passthru) isPy27 isPy33 isPy34 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder; + inherit (python.passthru) isPy27 isPy35 isPy36 isPy37 isPy38 isPy39 isPy3k isPyPy pythonAtLeast pythonOlder; inherit python bootstrapped-pip buildPythonPackage buildPythonApplication; inherit fetchPypi callPackage; inherit hasPythonModule requiredPythonModules makePythonPath disabledIf; -- cgit v1.2.3 From e80d29221325f056f47ef4bfc0a11772b65cba54 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 02:06:04 +0000 Subject: geos: 3.8.0 -> 3.8.1 --- pkgs/development/libraries/geos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix index be0edab3155..4e7ce1d5ac8 100644 --- a/pkgs/development/libraries/geos/default.nix +++ b/pkgs/development/libraries/geos/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "geos-3.8.0"; + name = "geos-3.8.1"; src = fetchurl { url = "https://download.osgeo.org/geos/${name}.tar.bz2"; - sha256 = "1mb2v9fy1gnbjhcgv0xny11ggfb17vkzsajdyibigwsxr4ylq4cr"; + sha256 = "1xqpmr10xi0n9sj47fbwc89qb0yr9imh4ybk0jsxpffy111syn22"; }; enableParallelBuilding = true; -- cgit v1.2.3 From 0303529980bd2cc12973dbada748bd45b440cb71 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 13:00:37 +0000 Subject: bindfs: 1.14.4 -> 1.14.5 --- pkgs/tools/filesystems/bindfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix index 065a673eb03..bf6c68072aa 100644 --- a/pkgs/tools/filesystems/bindfs/default.nix +++ b/pkgs/tools/filesystems/bindfs/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, fuse, pkgconfig }: stdenv.mkDerivation rec { - version = "1.14.4"; + version = "1.14.5"; pname = "bindfs"; src = fetchurl { url = "https://bindfs.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "1vk42bq8y13gv4yvajf65qsh59lscwcaw3xv94qpjxld3786i8c7"; + sha256 = "173c5fcnfbnlw5a437r2x899ax77j3wp8gg8gffhryahcgyn1abq"; }; dontStrip = true; -- cgit v1.2.3 From 7bde9902cf1adf27b7780a2871fe8c45b24ce9a1 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 11:12:41 +0000 Subject: xmrig: 5.10.0 -> 5.11.1 --- pkgs/applications/misc/xmrig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xmrig/default.nix b/pkgs/applications/misc/xmrig/default.nix index a205b402bc8..b564c5c530f 100644 --- a/pkgs/applications/misc/xmrig/default.nix +++ b/pkgs/applications/misc/xmrig/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xmrig"; - version = "5.10.0"; + version = "5.11.1"; src = fetchFromGitHub { owner = "xmrig"; repo = "xmrig"; rev = "v${version}"; - sha256 = "06nxhrb5vnlq3sxybiyzdpbv6ah1zam7r07s1c31sv37znlb77d5"; + sha256 = "04wsz7hcmzm5dv9q1wb26nvcz5gxdcgkf00cp5bpbr3y9vc6dyz6"; }; nativeBuildInputs = [ cmake ]; -- cgit v1.2.3 From d961cd7c1b31e6197884c950f785375060c41585 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 15:33:04 +0000 Subject: anydesk: 5.5.4 -> 5.5.5 --- pkgs/applications/networking/remote/anydesk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 3e639c28349..8830881b69f 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -5,7 +5,7 @@ let sha256 = { - x86_64-linux = "1ry21zw5ghba4xjx8dvimlpprgap7n8j9lqhjsciahbvc16vx5ks"; + x86_64-linux = "09ajpsmgrgjhw7b91id76w84kwk2d678n0b81zzpwq7sgjcm0sb0"; i386-linux = "0vjxbg5hwkqkh600rr75xviwy848r1xw9mxwf6bb6l8b0isvlsgg"; }.${stdenv.hostPlatform.system} or (throw "system ${stdenv.hostPlatform.system} not supported"); @@ -28,7 +28,7 @@ let in stdenv.mkDerivation rec { pname = "anydesk"; - version = "5.5.4"; + version = "5.5.5"; src = fetchurl { urls = [ -- cgit v1.2.3 From 2d8cd45372598ad5ff17be256d2fdb012bbcfad0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 14:41:04 +0000 Subject: bluefish: 2.2.10 -> 2.2.11 --- pkgs/applications/editors/bluefish/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix index ff1daef8b80..c7ac671c15b 100644 --- a/pkgs/applications/editors/bluefish/default.nix +++ b/pkgs/applications/editors/bluefish/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "bluefish-2.2.10"; + name = "bluefish-2.2.11"; src = fetchurl { url = "mirror://sourceforge/bluefish/${name}.tar.bz2"; - sha256 = "1ciygj79q6i3ga5x1j8aivc05nh6rhhnm7hrq8q8xd9vd4ms3v5g"; + sha256 = "1zy2ppdg3nq9iy3zgfhnw93bq5zbbhyampf7bk3grpfvq5zqfk25"; }; nativeBuildInputs = [ intltool pkgconfig wrapGAppsHook ]; -- cgit v1.2.3 From 6f2983b6a70f253757f2a4cc4648e248a4d6094d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 15:51:35 +0000 Subject: abcl: 1.6.0 -> 1.6.1 --- pkgs/development/compilers/abcl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/abcl/default.nix b/pkgs/development/compilers/abcl/default.nix index 2c9de761778..005e4186b15 100644 --- a/pkgs/development/compilers/abcl/default.nix +++ b/pkgs/development/compilers/abcl/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ant, jre, jdk}: stdenv.mkDerivation rec { pname = "abcl"; - version = "1.6.0"; + version = "1.6.1"; # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) src = fetchurl { url = "https://common-lisp.net/project/armedbear/releases/${version}/${pname}-src-${version}.tar.gz"; - sha256 = "0hvbcsffr8n2xwdixc8wyw1bfl9fxn2gyy0c4nma7j9zbn0wwgw9"; + sha256 = "04myiba6g0vij2ym2dmb0156k20ki2lz13dxwp2bk9kvjn2zg88b"; }; configurePhase = '' mkdir nix-tools -- cgit v1.2.3 From 74fe0103928f51a57a6e961d2a1e5df1e014bf53 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 15:13:10 +0000 Subject: avfs: 1.1.1 -> 1.1.2 --- pkgs/tools/filesystems/avfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/avfs/default.nix b/pkgs/tools/filesystems/avfs/default.nix index 2df5043867a..eaf9ac634a1 100644 --- a/pkgs/tools/filesystems/avfs/default.nix +++ b/pkgs/tools/filesystems/avfs/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "avfs"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { url = "mirror://sourceforge/avf/${version}/${pname}-${version}.tar.bz2"; - sha256 = "0fxzigpyi08ipqz30ihjcpqmmx8g7r1kqdqq1bnnznvnhrzyygn8"; + sha256 = "035b6y49nzgswf5n70aph8pm48sbv9nqwlnp3wwbq892c39kk4xn"; }; nativeBuildInputs = [ pkgconfig ]; -- cgit v1.2.3 From 5d88b43f58286592433f0be11f0966c3bc0a14d6 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 4 May 2020 23:19:44 -0400 Subject: python3Packages.pydicom: 1.4.1 -> 1.4.2 --- pkgs/development/python-modules/pydicom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix index 339775c2f54..6f4e4c97fd1 100644 --- a/pkgs/development/python-modules/pydicom/default.nix +++ b/pkgs/development/python-modules/pydicom/default.nix @@ -8,12 +8,12 @@ }: buildPythonPackage rec { - version = "1.4.1"; + version = "1.4.2"; pname = "pydicom"; src = fetchPypi { inherit pname version; - sha256 = "0ki4736h6mp77733rsrwicl8pyig39idywzcmwvw3nzi2r1yc7w8"; + sha256 = "1483hv74fhfk4q18r4rda7yixqqdxrd1djzp3492s81ykxd4k24l"; }; propagatedBuildInputs = [ numpy pillow ]; -- cgit v1.2.3 From 11de28348d610873dddc6ba4bc0d038ff282020e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 09:58:09 +0000 Subject: tlf: 1.4.0 -> 1.4.1 --- pkgs/applications/radio/tlf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/tlf/default.nix b/pkgs/applications/radio/tlf/default.nix index e3fdb9718e4..fd9ab82b321 100644 --- a/pkgs/applications/radio/tlf/default.nix +++ b/pkgs/applications/radio/tlf/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "tlf"; - version = "1.4.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "${pname}-${version}"; - sha256 = "0f97hxiwc6blp5haik871q6zzvwy0b3p2jg8ad2dvaxg07xc76l0"; + sha256 = "1xpgs4k27pjd9mianfknknp6mf34365bcp96wrv5xh4dhph573rj"; }; nativeBuildInputs = [ autoreconfHook autoconf automake pkgconfig perl ]; -- cgit v1.2.3 From 404834334bbe8af992b8d39cf6d9d767f8cf463e Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 27 Apr 2020 13:28:48 -0400 Subject: itk: 5.0.1 -> 5.1.0 --- pkgs/development/libraries/itk/default.nix | 17 +++++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index d745ff438ce..6c0298c0f71 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchFromGitHub, cmake, libX11, libuuid, xz, vtk, darwin }: +{ stdenv, fetchFromGitHub, cmake, makeWrapper +, pkgconfig, libX11, libuuid, xz, vtk, Cocoa }: stdenv.mkDerivation rec { pname = "itk"; - version = "5.0.1"; + version = "5.1.0"; src = fetchFromGitHub { owner = "InsightSoftwareConsortium"; repo = "ITK"; rev = "v${version}"; - sha256 = "0dcjsn5frjnrphfgw8alnd2ahrvicpx2a2ngb5ixaa9anaicz9z1"; + sha256 = "0rvkp00xj1js60021jv2ydyl74wvbyb205gm9d7hf8gy2q456hgl"; }; cmakeFlags = [ @@ -23,12 +24,16 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - nativeBuildInputs = [ cmake xz ]; - buildInputs = [ libX11 libuuid vtk ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa ]; + nativeBuildInputs = [ cmake xz makeWrapper ]; + buildInputs = [ libX11 libuuid vtk ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ]; + + postInstall = '' + wrapProgram "$out/bin/h5c++" --prefix PATH ":" "${pkgconfig}/bin" + ''; meta = { description = "Insight Segmentation and Registration Toolkit"; - homepage = "http://www.itk.org/"; + homepage = "https://www.itk.org/"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [viric]; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6782e37699..7bec4f99b53 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12285,7 +12285,7 @@ in itk4 = callPackage ../development/libraries/itk/4.x.nix { stdenv = gcc8Stdenv; }; itk = callPackage ../development/libraries/itk { - stdenv = gcc8Stdenv; + inherit (darwin.apple_sdk.frameworks) Cocoa; }; jasper = callPackage ../development/libraries/jasper { }; -- cgit v1.2.3 From 20cf206a099ad7aa3ed02b0f39f53195223bf282 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 27 Apr 2020 14:42:17 -0400 Subject: simpleitk: itk -> itk4 - simpleitk 1.2.4 is incompatible with ITK 5.1, so this can be reverted when 2.x is released. --- pkgs/development/libraries/simpleitk/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/simpleitk/default.nix b/pkgs/development/libraries/simpleitk/default.nix index d6708b0dfed..445a8bc5f21 100644 --- a/pkgs/development/libraries/simpleitk/default.nix +++ b/pkgs/development/libraries/simpleitk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, git, swig, lua, itk, tcl, tk }: +{ stdenv, fetchFromGitHub, cmake, git, swig, lua, itk4, tcl, tk }: stdenv.mkDerivation rec { pname = "simpleitk"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake git swig ]; - buildInputs = [ lua itk ]; + buildInputs = [ lua itk4 ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" "-DCMAKE_CXX_FLAGS='-Wno-attributes'" ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7bec4f99b53..58f7ecf4e7a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14413,7 +14413,10 @@ in simp_le = callPackage ../tools/admin/simp_le { }; - simpleitk = callPackage ../development/libraries/simpleitk { lua = lua51Packages.lua; }; + simpleitk = callPackage ../development/libraries/simpleitk { + lua = lua51Packages.lua; + stdenv = gcc8Stdenv; + }; sfml = callPackage ../development/libraries/sfml { inherit (darwin.apple_sdk.frameworks) IOKit Foundation AppKit OpenAL; -- cgit v1.2.3 From 6f1430a8021274aa4ec4c7b52c3457e37574c094 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 27 Apr 2020 15:03:38 -0400 Subject: ezminc: switch from itk5 to itk4 branch - itk5 branch currently lacks support for itk 5.1 --- pkgs/applications/science/biology/EZminc/default.nix | 10 +++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/biology/EZminc/default.nix b/pkgs/applications/science/biology/EZminc/default.nix index 978615fa459..7502a4ffd2a 100644 --- a/pkgs/applications/science/biology/EZminc/default.nix +++ b/pkgs/applications/science/biology/EZminc/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, libminc, bicpl, itk, fftwFloat, gsl }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, libminc, bicpl, itk4, fftwFloat, gsl }: stdenv.mkDerivation rec { pname = "EZminc"; - name = "${pname}-unstable-2019-07-25"; + name = "${pname}-unstable-2019-03-12"; src = fetchFromGitHub { owner = "BIC-MNI"; repo = pname; - rev = "9591edd5389a5bda2c1f606816c7cdb35c065adf"; - sha256 = "02k87qbpx0f48l2lbcjmlqx82py684z3sfi29va5icfg3hjd6j7b"; + rev = "5e3333ee356f914d34d66d33ea8df809c7f7fa51"; + sha256 = "0wy8cppf5xpgfqvgb3mqs1cjh81n6qzkk6zxv29wvng8nar9wsy4"; }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ itk libminc bicpl fftwFloat gsl ]; + buildInputs = [ itk4 libminc bicpl fftwFloat gsl ]; cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" "-DEZMINC_BUILD_TOOLS=TRUE" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 58f7ecf4e7a..32c7c926b32 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24322,7 +24322,7 @@ in est-sfs = callPackage ../applications/science/biology/est-sfs { }; - ezminc = callPackage ../applications/science/biology/EZminc { }; + ezminc = callPackage ../applications/science/biology/EZminc { stdenv = gcc8Stdenv; }; exonerate = callPackage ../applications/science/biology/exonerate { }; -- cgit v1.2.3 From 5caa76705bd839fb6733f64740dec95d7b2fefc5 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 27 Apr 2020 15:04:43 -0400 Subject: elastix: update for ITK 5.1.0 - fetch patches to build elastix 5.0 with ITK 5.1 - update 'platforms': builds on Darwin, fails on aarch64 --- .../libraries/science/biology/elastix/default.nix | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/science/biology/elastix/default.nix b/pkgs/development/libraries/science/biology/elastix/default.nix index e5565aae29b..4d98b12928f 100644 --- a/pkgs/development/libraries/science/biology/elastix/default.nix +++ b/pkgs/development/libraries/science/biology/elastix/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, itk, python3 }: +{ stdenv, fetchFromGitHub, fetchpatch, cmake, itk, python3 }: stdenv.mkDerivation rec { pname = "elastix"; @@ -11,10 +11,24 @@ stdenv.mkDerivation rec { sha256 = "1zrl7rz4lwsx88b2shnl985f3a97lmp4ksbd437h9y0hfjq8l0lj"; }; + patches = [ + (fetchpatch { + name = "itk-5.1-compat.patch"; + url = "https://github.com/SuperElastix/elastix/commit/402e9a26f22f805b8f2db00c00e59f75fa1783ad.patch"; + sha256 = "1il6gc1lgy78i0w6gkkppr61nh6g0yjspbfk19hcz20778m5jhz9"; + }) + (fetchpatch { + name = "fix-osx-build.patch"; + url = "https://github.com/SuperElastix/elastix/commit/52e1dc3928046f9fbb85d4b2ecd0d5175fa9695d.patch"; + sha256 = "1hf7kgx1jv497pf0x5wj79sy1wncxcvhrkix9w086lcr8zwxvn9q"; + }) + ]; + + nativeBuildInputs = [ cmake python3 ]; buildInputs = [ itk ]; - doCheck = true; + doCheck = !stdenv.isDarwin; # usual dynamic linker issues preCheck = " export LD_LIBRARY_PATH=$(pwd)/bin @@ -24,7 +38,7 @@ stdenv.mkDerivation rec { homepage = "http://elastix.isi.uu.nl/"; description = "Image registration toolkit based on ITK"; maintainers = with maintainers; [ bcdarwin ]; - platforms = platforms.linux; + platforms = platforms.x86_64; # libitkpng linker issues with ITK 5.1 license = licenses.asl20; }; } -- cgit v1.2.3 From 7e5dbecac3ced8f05e57df557d0598012ba9f811 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 03:55:01 +0000 Subject: tridactyl-native: 1.17.1 -> 1.18.1 --- pkgs/tools/networking/tridactyl-native/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/tridactyl-native/default.nix b/pkgs/tools/networking/tridactyl-native/default.nix index 5efca2cb7fd..bca0fcb81c7 100644 --- a/pkgs/tools/networking/tridactyl-native/default.nix +++ b/pkgs/tools/networking/tridactyl-native/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "tridactyl-native"; # this is actually the version of tridactyl itself; the native messenger will # probably not change with every tridactyl version - version = "1.17.1"; + version = "1.18.1"; src = fetchFromGitHub { owner = "tridactyl"; repo = "tridactyl"; rev = version; - sha256 = "197vh3k9nh58djl6ph0lznkdb2schqlksxxr93xjkk4xsc7k6j1g"; + sha256 = "0f4agsh0gqpyhl3nysv4x9f74hlnch27gp3l8bpl645kbbfkg0di"; }; sourceRoot = "source/native"; -- cgit v1.2.3 From f1ff580d809c4827d26495dd018de16c2c8c9859 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 03:50:38 +0000 Subject: focuswriter: 1.7.5 -> 1.7.6 --- pkgs/applications/editors/focuswriter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix index 30e8af7facd..c30cfcb1fb9 100644 --- a/pkgs/applications/editors/focuswriter/default.nix +++ b/pkgs/applications/editors/focuswriter/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "focuswriter"; - version = "1.7.5"; + version = "1.7.6"; src = fetchurl { url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2"; - sha256 = "19fqxyas941xcqjj68qpj42ayq0vw5rbd4ms5kvx8jyspp7wysqc"; + sha256 = "0h85f6cs9zbxv118mjfxqfv41j19zkx2xq36mpnlmrlzkjj7dx9l"; }; nativeBuildInputs = [ pkgconfig qmake qttools ]; -- cgit v1.2.3 From 6b19002d95bbc92ea68abef6713edeeb20f8d9df Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 01:36:55 +0000 Subject: fasm: 1.73.23 -> 1.73.24 --- pkgs/development/compilers/fasm/bin.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/fasm/bin.nix b/pkgs/development/compilers/fasm/bin.nix index 8b5230d2e72..c595c86615b 100644 --- a/pkgs/development/compilers/fasm/bin.nix +++ b/pkgs/development/compilers/fasm/bin.nix @@ -3,11 +3,11 @@ stdenvNoCC.mkDerivation rec { pname = "fasm-bin"; - version = "1.73.23"; + version = "1.73.24"; src = fetchurl { url = "https://flatassembler.net/fasm-${version}.tgz"; - sha256 = "1p7hs4sqnfxw6axdifjbdcllvl1ycx5vf6n7nvq1gampz0yfcl6j"; + sha256 = "142vxhs8mh8isvlzq7ir0asmqda410phzxmk9gk9b43dldskkj7k"; }; installPhase = '' -- cgit v1.2.3 From 21f9524d67c1d3e97d9e59d2d7ddc4ca1dd2de5c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 00:40:32 +0000 Subject: gallery-dl: 1.13.3 -> 1.13.6 --- pkgs/applications/misc/gallery-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gallery-dl/default.nix b/pkgs/applications/misc/gallery-dl/default.nix index 791db13e423..6845cbcb59d 100644 --- a/pkgs/applications/misc/gallery-dl/default.nix +++ b/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "gallery_dl"; - version = "1.13.3"; + version = "1.13.6"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0nhbhli45i2xhkmyj9mpg8fn1l58y2zmr6nnnnms557wpdpg112x"; + sha256 = "17hgryj8qsxcx3c96ir25q0wsh5q0s6c6fb33lqfdbrfxrjcixbk"; }; doCheck = false; -- cgit v1.2.3 From 37e0f1134052245580b586fb324dd71af60a3023 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 23:39:31 +0000 Subject: datamash: 1.6 -> 1.7 --- pkgs/tools/misc/datamash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/datamash/default.nix b/pkgs/tools/misc/datamash/default.nix index f66f2b97d14..8e9782506fb 100644 --- a/pkgs/tools/misc/datamash/default.nix +++ b/pkgs/tools/misc/datamash/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "datamash"; - version = "1.6"; + version = "1.7"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1jvqxcyh0aghnqh3m2rk5av1x0038flcmfzd493vasv1k69vgfdr"; + sha256 = "1cxdlhgz3wzjqlq8bgwad93fgqymk2abbldfzw1ffnhcp4mmjjjp"; }; meta = with stdenv.lib; { -- cgit v1.2.3 From d771a55021cd7d320e628fcef18ffd36325bf9fa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 21:59:05 +0000 Subject: davix: 0.7.5 -> 0.7.6 --- pkgs/tools/networking/davix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/davix/default.nix b/pkgs/tools/networking/davix/default.nix index 9f1eff220c3..797791e1c0b 100644 --- a/pkgs/tools/networking/davix/default.nix +++ b/pkgs/tools/networking/davix/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, cmake, pkgconfig, openssl, libxml2, boost, python3, libuuid }: stdenv.mkDerivation rec { - version = "0.7.5"; + version = "0.7.6"; pname = "davix"; nativeBuildInputs = [ cmake pkgconfig python3 ]; buildInputs = [ openssl libxml2 boost libuuid ]; - # using the url below since the 0.7.5 release did carry a broken CMake file, + # using the url below since the 0.7.6 release did carry a broken CMake file, # supposedly fixed in the next release # https://github.com/cern-fts/davix/issues/40 src = fetchurl { url = "http://grid-deployment.web.cern.ch/grid-deployment/dms/lcgutil/tar/davix/${version}/davix-${version}.tar.gz"; - sha256 = "1j3gzsjhzrsk6irxalc3rwgp9cqb52chriadmy1mv1s6d2bwl86r"; + sha256 = "0wq66spnr616cns72f9dvr2xfvkdvfqqmc6d7dx29fpp57zzvrx2"; }; -- cgit v1.2.3 From b5124d35af89e82ac1314cc1d53377a95fa6ab36 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 01:24:08 +0000 Subject: freetds: 1.1.26 -> 1.1.33 --- pkgs/development/libraries/freetds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/freetds/default.nix b/pkgs/development/libraries/freetds/default.nix index 89ea40c1c65..31ce6602963 100644 --- a/pkgs/development/libraries/freetds/default.nix +++ b/pkgs/development/libraries/freetds/default.nix @@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null; stdenv.mkDerivation rec { pname = "freetds"; - version = "1.1.26"; + version = "1.1.33"; src = fetchurl { url = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2"; - sha256 = "1nqxcnf6lax7grsxhajq87h92ngm487nzzz87kkmh1nzk33r7dwd"; + sha256 = "1gq972ngpdmpb63mc6myxsd0rf3qph95qx542021xh9f2791qffi"; }; buildInputs = [ -- cgit v1.2.3 From 91ad6f176a154f765b850ac2766b991386cae941 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 4 May 2020 10:55:41 -0700 Subject: pythonPackages.softlayer: disable python2 ERROR: Package 'SoftLayer' requires a different Python: 2.7.18 not in '>=3.5' --- pkgs/development/python-modules/softlayer/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix index 93b0e309b7c..3c2a5e2a356 100644 --- a/pkgs/development/python-modules/softlayer/default.nix +++ b/pkgs/development/python-modules/softlayer/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, isPy27 , ptable , click , requests @@ -17,6 +18,7 @@ buildPythonPackage rec { pname = "softlayer-python"; version = "5.8.4"; + disabled = isPy27; propagatedBuildInputs = [ ptable click requests prompt_toolkit pygments urllib3 ]; -- cgit v1.2.3 From ea625e4039476ed1b155cf605c6a299fab726de0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 23:07:25 +0000 Subject: enet: 1.3.14 -> 1.3.15 --- pkgs/development/libraries/enet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/enet/default.nix b/pkgs/development/libraries/enet/default.nix index 90c312bb7a6..e1172870ede 100644 --- a/pkgs/development/libraries/enet/default.nix +++ b/pkgs/development/libraries/enet/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "enet-1.3.14"; + name = "enet-1.3.15"; src = fetchurl { url = "http://enet.bespin.org/download/${name}.tar.gz"; - sha256 = "0w780zc6cy8yq4cskpphx0f91lzh51vh9lwyc5ll8hhamdxgbxlq"; + sha256 = "1yxxf9bkx6dx3j8j70fj17c05likyfibb1419ls74hp58qrzdgas"; }; meta = { -- cgit v1.2.3 From ba810eabde2efaa6bf960e1ea1ac412b51700086 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 20:18:26 +0000 Subject: commonsCompress: 1.18 -> 1.20 --- pkgs/development/libraries/java/commons/compress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/development/libraries/java/commons/compress/default.nix index a9624ff243c..5307c635834 100644 --- a/pkgs/development/libraries/java/commons/compress/default.nix +++ b/pkgs/development/libraries/java/commons/compress/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "1.18"; + version = "1.20"; pname = "commons-compress"; src = fetchurl { url = "mirror://apache/commons/compress/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "0ciwzq134rqh1fp7qba091rajf2pdagfb665rarni7glb2x4lha1"; + sha256 = "0zx1sc0rw3vzjan69vxr2qw82y9b0hqdzp4plcahc3c1y0vkz3fg"; }; installPhase = '' -- cgit v1.2.3 From 1faccd5200fce5d4b1c85d91ca6de2a72b13c23d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 21:12:35 +0000 Subject: cinnamon.cinnamon-session: 4.4.0 -> 4.4.1 --- pkgs/desktops/cinnamon/cinnamon-session/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/pkgs/desktops/cinnamon/cinnamon-session/default.nix index 56ff4b106e3..96910052ac9 100644 --- a/pkgs/desktops/cinnamon/cinnamon-session/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-session/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "cinnamon-session"; - version = "4.4.0"; + version = "4.4.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "0hplck17rksfgqm2z58ajvz4p2m4zg6ksdpbc27ki20iv4fv620s"; + sha256 = "1bkhzgdinsk4ahp1b4jf50phxwv2da23rh35cmg9fbm5c88701ga"; }; patches = [ -- cgit v1.2.3 From 035393f0f762cc904737178eb8a40ce948120ead Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 19:53:17 +0000 Subject: colordiff: 1.0.18 -> 1.0.19 --- pkgs/tools/text/colordiff/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix index 1ba1db1f7cb..c3da9a60555 100644 --- a/pkgs/tools/text/colordiff/default.nix +++ b/pkgs/tools/text/colordiff/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, perl /*, xmlto */}: stdenv.mkDerivation rec { - name = "colordiff-1.0.18"; + name = "colordiff-1.0.19"; src = fetchurl { urls = [ "https://www.colordiff.org/${name}.tar.gz" "http://www.colordiff.org/archive/${name}.tar.gz" ]; - sha256 = "1q6n60n4b9fnzccxyxv04mxjsql4ddq17vl2c74ijvjdhpcfrkr9"; + sha256 = "069vzzgs7b44bmfh3ks2psrdb26s1w19gp9w4xxbgi7nhx6w3s26"; }; buildInputs = [ perl /* xmlto */ ]; -- cgit v1.2.3 From 65fdc04243451ad7c49246f51a54f845d5ab6bb8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 00:00:52 +0000 Subject: fsuae: 3.0.3 -> 3.0.5 --- pkgs/misc/emulators/fs-uae/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix index 38730ec752b..214c1e6e75b 100644 --- a/pkgs/misc/emulators/fs-uae/default.nix +++ b/pkgs/misc/emulators/fs-uae/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "fs-uae"; - version = "3.0.3"; + version = "3.0.5"; src = fetchurl { url = "https://fs-uae.net/stable/${version}/${pname}-${version}.tar.gz"; - sha256 = "0v5c8ns00bam4myj7454hpkrnm9i81jwdzrp5nl7gaa18qb60hjq"; + sha256 = "1qwzhp34wy7bnd3c0plv11rg9fs5m92rh3ffnr9pn6ng0cpc8vpj"; }; nativeBuildInputs = [ pkgconfig ]; -- cgit v1.2.3 From 1673ab2694faf8f5b6045799d38398e2072b0e8e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 21:07:41 +0000 Subject: bzflag: 2.4.18 -> 2.4.20 --- pkgs/games/bzflag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix index c1d1c38990d..1ec24e02be0 100644 --- a/pkgs/games/bzflag/default.nix +++ b/pkgs/games/bzflag/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "bzflag"; - version = "2.4.18"; + version = "2.4.20"; src = fetchurl { url = "https://download.bzflag.org/${pname}/source/${version}/${pname}-${version}.tar.bz2"; - sha256 = "1gmz31wmn3f8zq1bfilkgbf4qmi4fa0c93cs76mhg8h978pm23cx"; + sha256 = "16brxqmfiyz4j4lb8ihzjcbwqmpsms6vm3ijbp34lnw0blbwdjb2"; }; nativeBuildInputs = [ pkgconfig ]; -- cgit v1.2.3 From 760ec871bdc41d986c42d5bf9ecef4734c54db60 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 19:05:21 +0000 Subject: crispyDoom: 5.7.2 -> 5.8.0 --- pkgs/games/crispy-doom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/crispy-doom/default.nix b/pkgs/games/crispy-doom/default.nix index c10e79418be..ea7c3c6e478 100644 --- a/pkgs/games/crispy-doom/default.nix +++ b/pkgs/games/crispy-doom/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "crispy-doom"; - version = "5.7.2"; + version = "5.8.0"; src = fetchFromGitHub { owner = "fabiangreffrath"; repo = pname; rev = "${pname}-${version}"; - sha256 = "002aqbgsksrgzqridwdlkrjincaxh0dkvwlrbb8d2f3kwk7lj4fq"; + sha256 = "1b6gn0dysv631jynh769whww9xcss1gms78sz3nrn855q1dsvcb4"; }; postPatch = '' -- cgit v1.2.3 From 1b89cdddcf97cb0196dce1cb58aa959b6dbb985e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 18:51:18 +0000 Subject: clib: 1.11.2 -> 1.11.3 --- pkgs/tools/package-management/clib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/clib/default.nix b/pkgs/tools/package-management/clib/default.nix index 5fdf6d66362..c7e3c0fb665 100644 --- a/pkgs/tools/package-management/clib/default.nix +++ b/pkgs/tools/package-management/clib/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, curl }: stdenv.mkDerivation rec { - version = "1.11.2"; + version = "1.11.3"; pname = "clib"; src = fetchFromGitHub { rev = version; owner = "clibs"; repo = "clib"; - sha256 = "03q5l873zc1dm478f35ibqandypakf47hzqb5gjpnpbcyb2m2jxz"; + sha256 = "0qwds9w9y2dy39bwh2523wra5dj820cjl11ynkshh7k94fk7qgpm"; }; hardeningDisable = [ "fortify" ]; -- cgit v1.2.3 From 9f7d84506ea47bb0a75461b1bcdec87d3b23a91b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 19:10:31 +0000 Subject: chuck: 1.4.0.0 -> 1.4.0.1 --- pkgs/applications/audio/chuck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/chuck/default.nix b/pkgs/applications/audio/chuck/default.nix index 6970296cbd9..f30b5dba5b6 100644 --- a/pkgs/applications/audio/chuck/default.nix +++ b/pkgs/applications/audio/chuck/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "1.4.0.0"; + version = "1.4.0.1"; pname = "chuck"; src = fetchurl { url = "http://chuck.cs.princeton.edu/release/files/chuck-${version}.tgz"; - sha256 = "1b17rsf7bv45gfhyhfmpz9d4rkxn24c0m2hgmpfjz3nlp0rf7bic"; + sha256 = "1m0fhndbqaf0lii1asyc50c66bv55ib6mbnm8fzk5qc5ncs0r8hi"; }; nativeBuildInputs = [ flex bison which ]; -- cgit v1.2.3 From df7727398e61c7d37abecd9be06c933c77d2b48c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 18:42:11 +0000 Subject: cutemaze: 1.2.5 -> 1.2.6 --- pkgs/games/cutemaze/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/cutemaze/default.nix b/pkgs/games/cutemaze/default.nix index 32e173de2b8..a293989d5e6 100644 --- a/pkgs/games/cutemaze/default.nix +++ b/pkgs/games/cutemaze/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "cutemaze"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { url = "https://gottcode.org/cutemaze/${pname}-${version}-src.tar.bz2"; - sha256 = "1xrjv3h1bpbji1dl9hkcvmp6qk4j618saffl41455vhrzn170lrj"; + sha256 = "0pw31j2i3ifndikhz9w684ia00r8zvcgnb66ign9w4lgs1zjgcrw"; }; nativeBuildInputs = [ qmake qttools ]; -- cgit v1.2.3 From 83f5fd89584316555a91e18d75742b05b786551e Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 4 May 2020 21:36:05 -0700 Subject: python3Packages.nipype: 1.3.1 -> 1.4.2, enable python3.8 --- pkgs/development/python-modules/nipype/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/nipype/default.nix b/pkgs/development/python-modules/nipype/default.nix index 436c9fe6379..06c6f9cb0c1 100644 --- a/pkgs/development/python-modules/nipype/default.nix +++ b/pkgs/development/python-modules/nipype/default.nix @@ -31,6 +31,7 @@ , xvfbwrapper , pytestcov , codecov +, sphinx # other dependencies , which , bash @@ -49,11 +50,11 @@ in buildPythonPackage rec { pname = "nipype"; - version = "1.3.1"; + version = "1.4.2"; src = fetchPypi { inherit pname version; - sha256 = "bb190964b568d64b04b73d2aa7eae31061fdbc3051d8c27bb34b1632db07ec71"; + sha256 = "1nr0z0k4xx1vswkp03g1lf8141mr4j2fbwd7wmpay4vz46qcp786"; }; postPatch = '' @@ -61,6 +62,10 @@ buildPythonPackage rec { --replace "/usr/bin/env bash" "${bash}/bin/bash" ''; + nativeBuildInputs = [ + sphinx + ]; + propagatedBuildInputs = [ click dateutil @@ -102,15 +107,14 @@ buildPythonPackage rec { doCheck = !stdenv.isDarwin; # ignore tests which incorrect fail to detect xvfb checkPhase = '' - LC_ALL="en_US.UTF-8" pytest -v nipype -k 'not display' + LC_ALL="en_US.UTF-8" pytest nipype/tests -k 'not display' ''; + pythonImportsCheck = [ "nipype" ]; meta = with stdenv.lib; { homepage = "https://nipy.org/nipype/"; description = "Neuroimaging in Python: Pipelines and Interfaces"; license = licenses.bsd3; maintainers = with maintainers; [ ashgillman ]; - # tests hang, blocking reviews of other packages - broken = isPy38; }; } -- cgit v1.2.3 From d38bad19dd4929063e8ddd32d061cb866fceb18b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 04:24:05 +0000 Subject: facter: 3.14.9 -> 3.14.10 --- pkgs/tools/system/facter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index d6f7a782824..0d2d704ea6c 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "facter"; - version = "3.14.9"; + version = "3.14.10"; src = fetchFromGitHub { - sha256 = "1c8g4fg8c9x816xx3m33njfn9h6ksl8g4rmc20y39v1y9jn72vxk"; + sha256 = "0yblz8k30kv9jpfs6bd0hcx5nfr23l7nxyw0q7p7c4ygkx3mb1ji"; rev = version; repo = pname; owner = "puppetlabs"; -- cgit v1.2.3 From 0c2cea6073c050352da6323da400a253089a8e84 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 04:31:29 +0000 Subject: flyway: 6.3.2 -> 6.4.1 --- pkgs/development/tools/flyway/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 746d66c2dbe..2d639467910 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "6.3.2"; + version = "6.4.1"; in stdenv.mkDerivation { pname = "flyway"; inherit version; src = fetchurl { url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "1av1q7znphpsi1iz4dbh0fgh3jsx9prz980b25yk5r89h518s76q"; + sha256 = "00vm2p4xn8jnldjxcj0djpjjx2hppq0ii8367abhbswq7xfhy2d2"; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; -- cgit v1.2.3 From 03369ef156e55443f708416a9ca4b3279a260366 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 04:55:56 +0000 Subject: hwinfo: 21.69 -> 21.70 --- pkgs/tools/system/hwinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/hwinfo/default.nix b/pkgs/tools/system/hwinfo/default.nix index b8bbe09fcb7..6b6aa40a0f7 100644 --- a/pkgs/tools/system/hwinfo/default.nix +++ b/pkgs/tools/system/hwinfo/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hwinfo"; - version = "21.69"; + version = "21.70"; src = fetchFromGitHub { owner = "opensuse"; repo = "hwinfo"; rev = version; - sha256 = "01lmxyqhx092ahbls7z9gwgmsinlqcv8zb7xvklbwyhzy5c02fxx"; + sha256 = "13vvsxj06wy86m7fy6bwy63ga49a2k4chdnk8jj3klj2cnh7ql8z"; }; patchPhase = '' -- cgit v1.2.3 From 1a9c35d0514150f56c08af5d0b65c0f0b31bb572 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Tue, 5 May 2020 06:56:55 +0200 Subject: =?UTF-8?q?meson:=200.54.0=20=E2=86=92=200.54.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/mesonbuild/meson/compare/0.54.0...0.54.1 --- pkgs/development/tools/build-managers/meson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 6c882b27896..a2dc1424d65 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -8,11 +8,11 @@ python3Packages.buildPythonApplication rec { pname = "meson"; - version = "0.54.0"; + version = "0.54.1"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "3eVybXeBEqy9Sme7NjOrLuddM9HoeaYoOntKRMM2PCc="; + sha256 = "L3b7RXJ2K+E+5HkpJhAJG0UJr1eIvM6zkf4iK80Cltw="; }; postFixup = '' -- cgit v1.2.3 From ed5575071f010b949019b5e89dc5b5d2dcbbd102 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 05:59:23 +0000 Subject: gromacs: 2020.1 -> 2020.2 --- pkgs/applications/science/molecular-dynamics/gromacs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index fadd60d9ebb..d345827ed4e 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -9,11 +9,11 @@ }: stdenv.mkDerivation { - name = "gromacs-2020.1"; + name = "gromacs-2020.2"; src = fetchurl { - url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2020.1.tar.gz"; - sha256 = "1kwrk3i1dxp8abhqqsl049lh361n4910h0415g052f8shdc6arp1"; + url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2020.2.tar.gz"; + sha256 = "1wyjgcdl30wy4hy6jvi9lkq53bqs9fgfq6fri52dhnb3c76y8rbl"; }; nativeBuildInputs = [ cmake ]; -- cgit v1.2.3 From ad6277915e28d1a4d554f4a0dec18dca717e02cf Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Sat, 4 Apr 2020 19:49:36 +0200 Subject: ninjas2: init at 0.2.0 --- pkgs/applications/audio/ninjas2/default.nix | 39 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/applications/audio/ninjas2/default.nix diff --git a/pkgs/applications/audio/ninjas2/default.nix b/pkgs/applications/audio/ninjas2/default.nix new file mode 100644 index 00000000000..3a23347c1e7 --- /dev/null +++ b/pkgs/applications/audio/ninjas2/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, libjack2, libGL, pkgconfig, xorg, mesa, libsndfile, libsamplerate }: + +stdenv.mkDerivation rec { + pname = "ninjas2"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "clearly-broken-software"; + repo = pname; + rev = "v${version}"; + sha256 = "1kwp6pmnfar2ip9693gprfbcfscklgri1k1ycimxzlqr61nkd2k9"; + fetchSubmodules = true; + }; + + patchPhase = '' + patchShebangs dpf/utils/generate-ttl.sh + ''; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + libjack2 xorg.libX11 libGL mesa libsndfile libsamplerate + ]; + + installPhase = '' + install -dD bin/ninjas2.lv2 $out/lib/lv2/ninjas2.lv2 + install -D bin/ninjas2-vst.so $out/lib/vst/ninjas2-vst.so + install -D bin/ninjas2 $out/bin/ninjas2 + ''; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/clearly-broken-software/ninjas2"; + description = "sample slicer plugin for LV2, VST, and jack standalone"; + license = with licenses; [ gpl3 ]; + maintainers = [ maintainers.magnetophon ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5de0e20fe13..4e126acd23c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20860,6 +20860,8 @@ in node-problem-detector = callPackage ../applications/networking/cluster/node-problem-detector { }; + ninjas2 = callPackage ../applications/audio/ninjas2 {}; + notion = callPackage ../applications/window-managers/notion { }; nootka = qt5.callPackage ../applications/audio/nootka { }; -- cgit v1.2.3 From 22a814fc748a871af96d3ea938b30d22c5939b28 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 06:33:42 +0000 Subject: glibmm: 2.62.0 -> 2.64.2 --- pkgs/development/libraries/glibmm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 6dcb6b3296a..dff122d38d1 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "glibmm"; - version = "2.62.0"; + version = "2.64.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1ziwx6r7k7wbvg4qq1rgrv8zninapgrmhn1hs6926a3krh9ryr9n"; + sha256 = "1v6lp23fr2qh4zshcnm28sn29j3nzgsvcqj2nhmrnvamipjq4lm7"; }; outputs = [ "out" "dev" ]; -- cgit v1.2.3 From 8244a7b6827e805bc77a8e24df4d7faad54ad172 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 07:07:09 +0000 Subject: gitkraken: 6.5.4 -> 6.6.0 --- pkgs/applications/version-management/gitkraken/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix index c8b906c055a..c5ee8f39443 100644 --- a/pkgs/applications/version-management/gitkraken/default.nix +++ b/pkgs/applications/version-management/gitkraken/default.nix @@ -13,11 +13,11 @@ let in stdenv.mkDerivation rec { pname = "gitkraken"; - version = "6.5.4"; + version = "6.6.0"; src = fetchzip { url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz"; - sha256 = "0hrxkhxp6kp82jg1pkcl6vxa5mjpgncx0k353bcnm4986ysizhj4"; + sha256 = "1k94dyynsnm90mp7q9h6baq6q9zi539b1qszf3mqvd5i0id9kjcw"; }; dontBuild = true; -- cgit v1.2.3 From 2147dd0648acc81cfa29c28782369bfe474c2703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 5 May 2020 09:20:32 +0200 Subject: knot-dns: 2.9.3 -> 2.9.4 https://gitlab.labs.nic.cz/knot/knot-dns/-/tags/v2.9.4 --- pkgs/servers/dns/knot-dns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 73881ff1092..d76b51bcc66 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -8,11 +8,11 @@ let inherit (stdenv.lib) optional optionals; in # Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { pname = "knot-dns"; - version = "2.9.3"; + version = "2.9.4"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "f2adf137d70955a4a20df90c5409e10be8e1127204a98b27d626ac090531a07e"; + sha256 = "57f3c93a1b40dfa0431508203f559b7ea257afab79078c38bcddf960d5a4a501"; }; outputs = [ "bin" "out" "dev" ]; -- cgit v1.2.3 From 969ae819f943ff4300d7eb9d9831fb5998b59ddc Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Sat, 2 May 2020 16:00:09 +0900 Subject: libjpeg_turbo: fix race in tests Fixes: 12/151 Test #46: jpegtran-shared-icc ...............................***Failed 0.03 sec Premature end of JPEG file JPEG datastream contains no image 63/151 Test #47: jpegtran-shared-icc-cmp ...........................***Failed 0.12 sec Could not obtain MD5 sum: No such file or directory The following tests FAILED: 46 - jpegtran-shared-icc (Failed) 47 - jpegtran-shared-icc-cmp (Failed) Example build: https://hydra.nixos.org/build/117594627 --- pkgs/development/libraries/libjpeg-turbo/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index c7290e147c3..72d8b967749 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, nasm, enableStatic ? false }: +{ stdenv, fetchurl, fetchpatch, cmake, nasm, enableStatic ? false }: stdenv.mkDerivation rec { @@ -11,6 +11,14 @@ stdenv.mkDerivation rec { }; patches = + [ + # Fixes race in tests that causes "jpegtran-shared-icc" to fail + # https://github.com/libjpeg-turbo/libjpeg-turbo/pull/425 + (fetchpatch { + url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/a2291b252de1413a13db61b21863ae7aea0946f3.patch"; + sha256 = "0nc5vcch5h52gpi07h08zf8br58q8x81q2hv871hrn0dinb53vym"; + }) + ] ++ stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt") ./mingw-boolean.patch; -- cgit v1.2.3 From c0137489ef9c798600530b17b749d5308aff9233 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 5 May 2020 10:32:14 +0300 Subject: saga: explicitly use opencv2 --- pkgs/applications/gis/saga/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix index 05f895bdee1..388ac1ee7a7 100644 --- a/pkgs/applications/gis/saga/default.nix +++ b/pkgs/applications/gis/saga/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, gdal, wxGTK30, proj, libiodbc, lzma, - libharu, opencv, vigra, postgresql, Cocoa, + libharu, opencv2, vigra, postgresql, Cocoa, unixODBC , poppler, hdf4, hdf5, netcdf, sqlite, qhull, giflib }: stdenv.mkDerivation { @@ -8,7 +8,7 @@ stdenv.mkDerivation { # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs # for why the have additional buildInputs on darwin - buildInputs = [ gdal wxGTK30 proj libharu opencv vigra postgresql libiodbc lzma + buildInputs = [ gdal wxGTK30 proj libharu opencv2 vigra postgresql libiodbc lzma qhull giflib ] ++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa unixODBC poppler hdf4.out hdf5 netcdf sqlite ]; -- cgit v1.2.3 From 67ee391c5625fca45d8d9085afcf91f8761171ec Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 07:56:35 +0000 Subject: gthumb: 3.8.3 -> 3.10.0 --- pkgs/applications/graphics/gthumb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/gthumb/default.nix b/pkgs/applications/graphics/gthumb/default.nix index 4a6526fe9c6..27e8e00bdb3 100644 --- a/pkgs/applications/graphics/gthumb/default.nix +++ b/pkgs/applications/graphics/gthumb/default.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { pname = "gthumb"; - version = "3.8.3"; + version = "3.10.0"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1a0gss9cjcwayrcpkam5kc1giwbfy38jgqxvh33in9gfq9dgrygg"; + sha256 = "0j7cxp4hhkvkckyvll6pmqkv5rwrknlzq9j1my0grb01b8wzhw9y"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 2e00c42891c9e114b86be7b17f512ce4a7260aef Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 08:21:38 +0000 Subject: glusterfs: 7.4 -> 7.5 --- pkgs/tools/filesystems/glusterfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index 5cc6e5c156b..fa7574767d8 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -15,10 +15,10 @@ let # The command # find /nix/store/...-glusterfs-.../ -name '*.py' -executable # can help with finding new Python scripts. - version = "7.4"; + version = "7.5"; name="${baseName}-${version}"; url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz"; - sha256 = "1f7z1dacnx7pd3ri4nka6851fzhdfandbf94blds8bqfqc1263h6"; + sha256 = "1zahld2v1y920i0p25zcn15a593g3bl5sgnmhkdmn7kvk7mx4p93"; }; buildInputs = [ -- cgit v1.2.3 From 82dfd10035256585c52053172d67fbffbaa11fc9 Mon Sep 17 00:00:00 2001 From: 124 Date: Tue, 5 May 2020 10:21:56 +0200 Subject: syslinux: fix #86846: build on i686 vcunat tried tests.boot.biosCdrom.i686-linux - after small local modification to make that attribute even exist. Installed file list also looks fine in comparison with state before the breaking change; hopefully it will work just fine. --- pkgs/os-specific/linux/syslinux/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index 06b31302eb8..edb951dae3d 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -70,7 +70,8 @@ stdenv.mkDerivation { "DATADIR=$(out)/share" "MANDIR=$(out)/share/man" "PERL=perl" - ]; + ] + ++ stdenv.lib.optionals stdenv.hostPlatform.isi686 [ "bios" "efi32" ]; doCheck = false; # fails. some fail in a sandbox, others require qemu -- cgit v1.2.3 From 39321d37e30b8375babc3ee4b3d7a789b3973df6 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 5 May 2020 10:37:45 +0200 Subject: ffmpeg-normalize: 1.15.8 -> 1.19.0 --- pkgs/applications/video/ffmpeg-normalize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/ffmpeg-normalize/default.nix b/pkgs/applications/video/ffmpeg-normalize/default.nix index 4fad80c27ab..c2259ce8379 100644 --- a/pkgs/applications/video/ffmpeg-normalize/default.nix +++ b/pkgs/applications/video/ffmpeg-normalize/default.nix @@ -7,11 +7,11 @@ buildPythonApplication rec { pname = "ffmpeg-normalize"; - version = "1.15.8"; + version = "1.19.0"; src = fetchPypi { inherit pname version; - sha256 = "01lx1ki1iglg1dz6x99ciqx5zqlbj7hvfb12ga9m68ypjm0fcphl"; + sha256 = "18dpck9grnr3wgbjvdh4mjlx0zfwcxpy4rnpmc39in0yk3w7li2x"; }; propagatedBuildInputs = [ ffmpeg tqdm ]; -- cgit v1.2.3 From 141051672c40f2eead79bda7241c0577a697f0d6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 08:45:43 +0000 Subject: gmime3: 3.2.6 -> 3.2.7 --- pkgs/development/libraries/gmime/3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gmime/3.nix b/pkgs/development/libraries/gmime/3.nix index 80753823ff1..f2ba29d461e 100644 --- a/pkgs/development/libraries/gmime/3.nix +++ b/pkgs/development/libraries/gmime/3.nix @@ -2,12 +2,12 @@ , vala }: stdenv.mkDerivation rec { - version = "3.2.6"; + version = "3.2.7"; pname = "gmime"; src = fetchurl { url = "mirror://gnome/sources/gmime/3.2/${pname}-${version}.tar.xz"; - sha256 = "05s7qjrxbj010q016pmdqdq73gz8vl4hv29kwaign0j8gi61kzxb"; + sha256 = "0i3xfc84qn1z99i70q68kbnp9rmgqrnprqb418ba52s6g9j9dsia"; }; outputs = [ "out" "dev" ]; -- cgit v1.2.3 From 48b6268225afc0384caf373fefb11a169a47b583 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 5 May 2020 10:28:13 +0200 Subject: vagrant: 2.2.7 -> 2.2.8 https://github.com/hashicorp/vagrant/releases/tag/v2.2.8 --- pkgs/development/tools/vagrant/default.nix | 4 ++-- pkgs/development/tools/vagrant/gemset.nix | 37 +++++++++++++++--------------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index cc1f1c8021a..32e205a6f8d 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -5,9 +5,9 @@ let # NOTE: bumping the version and updating the hash is insufficient; # you must use bundix to generate a new gemset.nix in the Vagrant source. - version = "2.2.7"; + version = "2.2.8"; url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"; - sha256 = "1z31y1nqiyj6rml9lz8gcbr29myhs5wcap8jsvgm3pb7p9p9y8m9"; + sha256 = "0nvxda0dyhncgcl9qs34l4rj0jbdbg65a3ii5765p4899z6gzx95"; deps = bundlerEnv rec { name = "${pname}-${version}"; diff --git a/pkgs/development/tools/vagrant/gemset.nix b/pkgs/development/tools/vagrant/gemset.nix index 64f24f8270d..f5d70b912df 100644 --- a/pkgs/development/tools/vagrant/gemset.nix +++ b/pkgs/development/tools/vagrant/gemset.nix @@ -20,25 +20,24 @@ version = "3.2.4"; }; childprocess = { - dependencies = ["ffi"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p3f43scdzx9zxmy2kw5zsc3az6v46nq4brwcxmnscjy4w4racbv"; + sha256 = "1ic028k8xgm2dds9mqnvwwx3ibaz32j8455zxr9f4bcnviyahya5"; type = "gem"; }; - version = "0.6.3"; + version = "3.0.0"; }; concurrent-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1x07r23s7836cpp5z9yrlbpljcxpax14yw4fy4bnp6crhr6x24an"; + sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl"; type = "gem"; }; - version = "1.1.5"; + version = "1.1.6"; }; domain_name = { dependencies = ["unf"]; @@ -213,10 +212,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18x61fc36951vw7f74gq8cyybdpxvyg5d0azvqhrs82ddw3v16xh"; + sha256 = "1zin0q26wc5p7zb7glpwary7ms60s676vcq987yv22jgm6hnlwlh"; type = "gem"; }; - version = "3.2019.1009"; + version = "3.2020.0425"; }; multi_json = { groups = ["default"]; @@ -255,10 +254,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jglf8rxvlw6is5019r6kwsdhw38zm3z39jbghdbj449r6h7h77n"; + sha256 = "101wd2px9lady54aqmkibvy4j62zk32w0rjz4vnigyg974fsga40"; type = "gem"; }; - version = "5.1.0"; + version = "5.2.0"; }; netrc = { groups = ["default"]; @@ -285,10 +284,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8"; + sha256 = "1k9bsj7ni0g2fd7scyyy1sk9dy2pg9akniahab0iznvjmhn54h87"; type = "gem"; }; - version = "0.10.3"; + version = "0.10.4"; }; rb-inotify = { dependencies = ["ffi"]; @@ -348,10 +347,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1qxc2zxwwipm6kviiar4gfhcakpx1jdcs89v6lvzivn5hq1xk78l"; + sha256 = "0590m2pr9i209pp5z4mx0nb1961ishdiqb28995hw1nln1d1b5ji"; type = "gem"; }; - version = "1.3.0"; + version = "2.3.0"; }; unf = { dependencies = ["unf_ext"]; @@ -369,10 +368,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ll6w64ibh81qwvjx19h8nj7mngxgffg7aigjx11klvf5k2g4nxf"; + sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4"; type = "gem"; }; - version = "0.0.7.6"; + version = "0.0.7.7"; }; vagrant_cloud = { dependencies = ["rest-client"]; @@ -412,10 +411,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12fzg9liydl244xq6r7x0wy06zn1n4czdbnjavy3150c3qsnv71a"; + sha256 = "1yawwrs3pnvbbm9xn0nbzvyl92kgf1jr439qfbqx0mb8zzkyi2dv"; type = "gem"; }; - version = "1.2.0"; + version = "1.2.1"; }; winrm-fs = { dependencies = ["erubi" "logging" "rubyzip" "winrm"]; @@ -423,9 +422,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0phhzliw47hmpi3ddygs500kfxa7il5yzmp7dw4ix2dvhrxrj7s6"; + sha256 = "093f698l9b9cx6vcqwjc9hi5hbd86ynp1g5c7g9k18y6h7fxjk43"; type = "gem"; }; - version = "1.3.3"; + version = "1.3.4"; }; } \ No newline at end of file -- cgit v1.2.3 From 6898f4936b885710ad890d60bb9dbd1a1adf5370 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 5 May 2020 04:20:00 -0500 Subject: spotify-tui: 0.18.0 -> 0.19.0 --- pkgs/applications/audio/spotify-tui/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/spotify-tui/default.nix b/pkgs/applications/audio/spotify-tui/default.nix index d29e9e33568..91acab35389 100644 --- a/pkgs/applications/audio/spotify-tui/default.nix +++ b/pkgs/applications/audio/spotify-tui/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "spotify-tui"; - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "Rigellute"; repo = "spotify-tui"; rev = "v${version}"; - sha256 = "15icg332iyacdn4ydr4nivblayg4xkcnjh4f0sjnhj4q173v8fq2"; + sha256 = "1bdcfkfbvvn262p4j0nb4kvjzzgrvn3kxlif48yipqkkykzsgz6g"; }; - cargoSha256 = "0rw8pj74k88rvcr18837g356lwsn2vdq384yma9df462xd2cw823"; + cargoSha256 = "13v2ilmfs9468kavlx6wrsp0dscppxbxgygwpdd35p5hq3vnhl7k"; - nativeBuildInputs = [ pkgconfig ] ++ stdenv.lib.optionals stdenv.isLinux [ python3 ]; - buildInputs = [ openssl ] - ++ stdenv.lib.optional stdenv.isLinux libxcb + nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkgconfig python3 ]; + buildInputs = [ ] + ++ stdenv.lib.optionals stdenv.isLinux [ openssl libxcb ] ++ stdenv.lib.optionals stdenv.isDarwin [ AppKit Security ]; meta = with stdenv.lib; { -- cgit v1.2.3 From 7f306cd78f428c44538c4b181aed97f4348d0b8a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 5 May 2020 04:20:00 -0500 Subject: gitAndTools.git-subtrac: 0.01 -> 0.02 --- .../version-management/git-and-tools/git-subtrac/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix b/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix index 07c63ea0119..a5097697a86 100644 --- a/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-subtrac/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-subtrac"; - version = "0.01"; + version = "0.02"; src = fetchFromGitHub { owner = "apenwarr"; repo = pname; rev = "v${version}"; - sha256 = "1w6gd0x1902lzpqr74gsdrnxq36f6v14bv8h0vhlrfhbwbsih7n6"; + sha256 = "1nj950r38sxzrgw69m1xphm7a4km2g29iw2897gfx4wx57jl957k"; }; modSha256 = "147vzllp1gydk2156hif313vwykagrj35vaiqy1swqczxs7p9hhs"; -- cgit v1.2.3 From 07f093fb35c4b0c239a723d25a5392e872416bb6 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 5 May 2020 04:20:00 -0500 Subject: syncthing: 1.4.2 -> 1.5.0 Changelog: https://github.com/syncthing/syncthing/releases/tag/v1.5.0 --- pkgs/applications/networking/syncthing/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 94fec82fdf7..fa3290f7485 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -3,17 +3,17 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { - version = "1.4.2"; + version = "1.5.0"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "0pfzpbdir2agwsyfjh1rxlyyd225xmyrr4k2g4vlg5r12kpcjwya"; + sha256 = "0yy31rfvr9d6kidfvvy36ljxlc14x5ir3ln19zg4k02hdqn0xkpj"; }; - modSha256 = "0qjhb55nd8mlnswbk8bgl2sb9angmv8fnympmmyqj1dqa7lcs87z"; + modSha256 = "1vs7lxlqd7jr4r9xkk7w7k6gxzjmm7ic0a1scfpx8rcr5swa9cq1"; patches = [ ./add-stcli-target.patch -- cgit v1.2.3 From 53dd3921cd8710ddd613a9f3d743abdfa5d4b4b8 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 5 May 2020 04:20:00 -0500 Subject: postgresqlPackages.pg_auto_failover: 1.2 -> 1.3 Changelog: https://github.com/citusdata/pg_auto_failover/releases/tag/v1.3 --- pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix index 257af21cec9..168cee9711b 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_auto_failover.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pg_auto_failover"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "citusdata"; repo = pname; rev = "v${version}"; - sha256 = "128bfxy7aabyvlcrzdi20f51k9xxgynd76f01v6w1314wrjg2r8f"; + sha256 = "1si4k37azigp7hqibnkzr1p6zknadxm7pb33lygrxarqkifx67j4"; }; buildInputs = [ postgresql openssl zlib readline ]; -- cgit v1.2.3 From 2a652aea074d647fdbce817e3f94b7e056a0f5ae Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Tue, 5 May 2020 15:22:37 +0530 Subject: xastir: 2.1.4 -> 2.1.6 --- pkgs/applications/misc/xastir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xastir/default.nix b/pkgs/applications/misc/xastir/default.nix index 719d26c7199..e5dc92c4ad6 100644 --- a/pkgs/applications/misc/xastir/default.nix +++ b/pkgs/applications/misc/xastir/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "xastir"; - version = "2.1.4"; + version = "2.1.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "Release-${version}"; - sha256 = "14f908jy5jzvgm1h1sr47hjqjq3q2nq91byhimk84kj044fn21w9"; + sha256 = "sha256-IdlRScAy7tCyVCElCceY4PvqPXWfZZ35f+MwCo3nO3s="; }; buildInputs = [ -- cgit v1.2.3 From 8277f8a4ec8c84de2aeaf9c71e4f91fe8e8a3f43 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 5 May 2020 13:03:02 +0300 Subject: p2pvc: exlicitly use opencv2 --- pkgs/applications/video/p2pvc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/p2pvc/default.nix b/pkgs/applications/video/p2pvc/default.nix index 219954ff9f2..91468ea1ee6 100644 --- a/pkgs/applications/video/p2pvc/default.nix +++ b/pkgs/applications/video/p2pvc/default.nix @@ -1,10 +1,10 @@ -{ stdenv, pkgconfig, fetchFromGitHub, opencv, ncurses, portaudio }: +{ stdenv, pkgconfig, fetchFromGitHub, opencv2, ncurses, portaudio }: stdenv.mkDerivation { name = "p2pvc"; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ opencv ncurses portaudio ]; + buildInputs = [ opencv2 ncurses portaudio ]; enableParallelBuilding = true; -- cgit v1.2.3 From 4cd1b7a7c78f42d13033fe8cf1fd4ff18fdb6af4 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 5 May 2020 13:08:01 +0300 Subject: pfstools: use opencv2 explicitly --- pkgs/tools/graphics/pfstools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix index 051adb0742f..1c437a3f05c 100644 --- a/pkgs/tools/graphics/pfstools/default.nix +++ b/pkgs/tools/graphics/pfstools/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, pkgconfig, darwin , openexr, zlib, imagemagick, libGLU, libGL, freeglut, fftwFloat -, fftw, gsl, libexif, perl, opencv, qt5, netpbm +, fftw, gsl, libexif, perl, opencv2, qt5, netpbm }: stdenv.mkDerivation rec { @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ openexr zlib imagemagick fftwFloat - fftw gsl libexif perl opencv qt5.qtbase netpbm + fftw gsl libexif perl opencv2 qt5.qtbase netpbm ] ++ (if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [ OpenGL GLUT ]) else [ -- cgit v1.2.3 From 9cd820f0bc4e2d6665760817092def645a64652f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 08:10:44 +0000 Subject: gnome3.pomodoro: 0.16.0 -> 0.17.0 --- pkgs/desktops/gnome-3/misc/pomodoro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix index fce6b71c4c8..b9489526dd7 100644 --- a/pkgs/desktops/gnome-3/misc/pomodoro/default.nix +++ b/pkgs/desktops/gnome-3/misc/pomodoro/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-pomodoro"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "codito"; repo = "gnome-pomodoro"; rev = version; - sha256 = "1bjsjkbms9irn7nkzi0hmgr5vwcgh9xzr5vw4sk2n711wj5d96bi"; + sha256 = "0s9wzx7wbynpqgj7nlgs5wwx4w2akz7nli89sy7pxcn4xpnahqgn"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 330693c50205a398c35f45a09ff5d0bba07f489c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 29 Apr 2020 17:01:47 +0100 Subject: linuxPackages.sysdig: 0.26.6 -> 0.26.7 --- pkgs/os-specific/linux/sysdig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index b0becd82d19..59577eb8d51 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "sysdig"; - version = "0.26.6"; + version = "0.26.7"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "1rw9s5lamr02036z26vfmnp5dnn97f00hcnp4xv6gdxim6rpmbz7"; + sha256 = "09m6j2cl70jxb0k4ydsgrida381bipf0v026xz661152cy23r3ff"; }; nativeBuildInputs = [ cmake perl ]; -- cgit v1.2.3 From 21c9abc79e93729e6a83f6d3abcd7e01b3ac26ab Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 10:31:57 +0000 Subject: groonga: 10.0.0 -> 10.0.2 --- pkgs/servers/search/groonga/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix index 40d59611da2..b53a207a6c5 100644 --- a/pkgs/servers/search/groonga/default.nix +++ b/pkgs/servers/search/groonga/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "groonga"; - version = "10.0.0"; + version = "10.0.2"; src = fetchurl { url = "https://packages.groonga.org/source/groonga/${pname}-${version}.tar.gz"; - sha256 = "01wacd9rijnjydshsl7z0waasr87gxkwr0kr647chczcxlh1b9gr"; + sha256 = "0851sdzgg5krf05b1pg29gmwzvzxvawfp37ny3lrb5xcdqbr379c"; }; buildInputs = with stdenv.lib; -- cgit v1.2.3 From 499b5feac9dfad6706519b123ce201defd74b2ea Mon Sep 17 00:00:00 2001 From: leenaars Date: Tue, 5 May 2020 12:33:39 +0200 Subject: Sylk: 2.6.1 -> 2.7.0 (#86796) --- pkgs/applications/networking/Sylk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/Sylk/default.nix b/pkgs/applications/networking/Sylk/default.nix index 64e0a9dcba2..7079e3afa9a 100644 --- a/pkgs/applications/networking/Sylk/default.nix +++ b/pkgs/applications/networking/Sylk/default.nix @@ -2,7 +2,7 @@ let pname = "Sylk"; - version = "2.6.1"; + version = "2.7.0"; in appimageTools.wrapType2 rec { @@ -10,7 +10,7 @@ appimageTools.wrapType2 rec { src = fetchurl { url = "http://download.ag-projects.com/Sylk/Sylk-${version}-x86_64.AppImage"; - hash = "sha256:0417qk925k7p3fiq1zha9al86jrz6mqspda7mi3h9blpbyvlcy7w"; + hash = "sha256:0xjg9j69yj06ys8229x6mwsjlk3mvxi8gnr2kymx0vhhg1zvqi1k"; }; profile = '' -- cgit v1.2.3 From 40ddbbeceab9852e5c4c4728951b7cead9163303 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 10:38:47 +0000 Subject: gl2ps: 1.4.1 -> 1.4.2 --- pkgs/development/libraries/gl2ps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gl2ps/default.nix b/pkgs/development/libraries/gl2ps/default.nix index 2ed717a49b8..85a9944fcf7 100644 --- a/pkgs/development/libraries/gl2ps/default.nix +++ b/pkgs/development/libraries/gl2ps/default.nix @@ -2,12 +2,12 @@ , zlib, libGL, libGLU, libpng, freeglut }: stdenv.mkDerivation rec { - version = "1.4.1"; + version = "1.4.2"; pname = "gl2ps"; src = fetchurl { url = "http://geuz.org/gl2ps/src/${pname}-${version}.tgz"; - sha256 = "0fsx5lh9pz1xswr4yng24j4ngiijnanksbgz05bfzkh07m5h6qkk"; + sha256 = "1sgzv547h7hrskb9qd0x5yp45kmhvibjwj2mfswv95lg070h074d"; }; buildInputs = [ -- cgit v1.2.3 From f68a0031bbf49dde2cf4026dc6d45d7f3835dc0b Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 5 May 2020 13:44:55 +0300 Subject: faust2jack: explicitly use opencv2 --- pkgs/applications/audio/faust/faust2jack.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/faust/faust2jack.nix b/pkgs/applications/audio/faust/faust2jack.nix index f032f435a35..26478b2bb2e 100644 --- a/pkgs/applications/audio/faust/faust2jack.nix +++ b/pkgs/applications/audio/faust/faust2jack.nix @@ -2,7 +2,7 @@ , gtk2 , jack2Full , alsaLib -, opencv +, opencv2 , libsndfile }: @@ -20,7 +20,7 @@ faust.wrapWithBuildEnv { gtk2 jack2Full alsaLib - opencv + opencv2 libsndfile ]; -- cgit v1.2.3 From ce6107be9c6b89c32c84b4305f3918f003ccf623 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 5 May 2020 13:45:13 +0300 Subject: faust2jaqt: explicitly use opencv2 --- pkgs/applications/audio/faust/faust2jaqt.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/faust/faust2jaqt.nix b/pkgs/applications/audio/faust/faust2jaqt.nix index 144d19cb01e..a2f1c2139a1 100644 --- a/pkgs/applications/audio/faust/faust2jaqt.nix +++ b/pkgs/applications/audio/faust/faust2jaqt.nix @@ -1,6 +1,6 @@ { faust , jack2Full -, opencv +, opencv2 , qt4 , libsndfile , which @@ -17,7 +17,7 @@ faust.wrapWithBuildEnv { propagatedBuildInputs = [ jack2Full - opencv + opencv2 qt4 libsndfile which -- cgit v1.2.3 From 65a8e78d9974ea7af93ccb86dd70a68006de863c Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Tue, 5 May 2020 10:46:38 +0000 Subject: sd: 0.7.4 -> 0.7.5 --- pkgs/tools/text/sd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/sd/default.nix b/pkgs/tools/text/sd/default.nix index 0e905be01f2..ac948766f00 100644 --- a/pkgs/tools/text/sd/default.nix +++ b/pkgs/tools/text/sd/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "sd"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "chmln"; repo = pname; rev = "v${version}"; - sha256 = "0y1mabnp0sbvayn695x1yfw04d2bky0r69wyidld6hllq3kqn9y2"; + sha256 = "04jsni80jzhbb106283df34cdyp5p362l6m29kp30hnc6x49853q"; }; - cargoSha256 = "1ra6argxs5dmpxhrr3az21myp27fl3nkdjfqn8cam2xhld1y270l"; + cargoSha256 = "1gwb76zys7gky42clzjs5g4hhgpfvzcw63chw9mnj703c7h0cgfh"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; -- cgit v1.2.3 From d3c814b56b32ed3544cbff33f842128bca4227cd Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Tue, 5 May 2020 10:48:46 +0000 Subject: sd: add filalex77 to maintainers --- pkgs/tools/text/sd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/text/sd/default.nix b/pkgs/tools/text/sd/default.nix index ac948766f00..a540918e56d 100644 --- a/pkgs/tools/text/sd/default.nix +++ b/pkgs/tools/text/sd/default.nix @@ -21,6 +21,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/chmln/sd"; license = licenses.mit; platforms = platforms.all; - maintainers = [ maintainers.amar1729 ]; + maintainers = with maintainers; [ amar1729 filalex77 ]; }; } -- cgit v1.2.3 From 53effac04003090683768615887460026c25f5fb Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Tue, 5 May 2020 13:48:55 +0300 Subject: mathematica: explicitly use opencv2 --- pkgs/applications/science/math/mathematica/10.nix | 4 ++-- pkgs/applications/science/math/mathematica/11.nix | 4 ++-- pkgs/applications/science/math/mathematica/9.nix | 4 ++-- pkgs/applications/science/math/mathematica/default.nix | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/science/math/mathematica/10.nix b/pkgs/applications/science/math/mathematica/10.nix index c7da7b16da8..277fb1984c4 100644 --- a/pkgs/applications/science/math/mathematica/10.nix +++ b/pkgs/applications/science/math/mathematica/10.nix @@ -8,7 +8,7 @@ , gcc , glib , ncurses -, opencv +, opencv2 , openssl , unixODBC , xorg @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { gcc.libc glib ncurses - opencv + opencv2 openssl unixODBC libxml2 diff --git a/pkgs/applications/science/math/mathematica/11.nix b/pkgs/applications/science/math/mathematica/11.nix index 898d6a48635..1c698a5e542 100644 --- a/pkgs/applications/science/math/mathematica/11.nix +++ b/pkgs/applications/science/math/mathematica/11.nix @@ -10,7 +10,7 @@ , gcc , glib , ncurses -, opencv +, opencv2 , openssl , unixODBC , xkeyboard_config @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { gcc.libc glib ncurses - opencv + opencv2 openssl unixODBC xkeyboard_config diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix index 617ac865713..d0967485c01 100644 --- a/pkgs/applications/science/math/mathematica/9.nix +++ b/pkgs/applications/science/math/mathematica/9.nix @@ -8,7 +8,7 @@ , gcc , glib , ncurses -, opencv +, opencv2 , openssl , unixODBC , xorg @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { gcc.libc glib ncurses - opencv + opencv2 openssl unixODBC ] ++ (with xorg; [ diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 7831640b124..94d72eec6ae 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -11,7 +11,7 @@ , glib , libssh2 , ncurses -, opencv +, opencv2 , openssl , unixODBC , xkeyboard_config @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { glib libssh2 ncurses - opencv + opencv2 openssl stdenv.cc.cc.lib unixODBC -- cgit v1.2.3 From b69379415be0b467464ec527b8e5bf160106356f Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Tue, 5 May 2020 12:52:04 +0200 Subject: python3Packages.toggl-cli: relax click version dependency fixes build problem by substituting click==7.0 with click>=7.0. --- pkgs/development/python-modules/toggl-cli/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix index 6834876d8f8..62d3f2dde24 100644 --- a/pkgs/development/python-modules/toggl-cli/default.nix +++ b/pkgs/development/python-modules/toggl-cli/default.nix @@ -19,6 +19,7 @@ buildPythonPackage rec { substituteInPlace requirements.txt \ --replace "pendulum==2.0.4" "pendulum>=2.0.4" \ --replace "click-completion==0.5.0" "click-completion>=0.5.0" \ + --replace "click==7.0" "click>=7.0" \ --replace "pbr==5.1.2" "pbr>=5.1.2" \ --replace "inquirer==2.5.1" "inquirer>=2.5.1" ''; -- cgit v1.2.3 From 17125fd235005ddd0713754a656d89c75b09bf3e Mon Sep 17 00:00:00 2001 From: Anton-Latukha Date: Tue, 5 May 2020 02:37:27 +0300 Subject: handbrake: 1.3.1 -> 1.3.2 M pkgs/applications/video/handbrake/default.nix --- pkgs/applications/video/handbrake/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/video/handbrake/default.nix b/pkgs/applications/video/handbrake/default.nix index 9b51746b14c..a9d616912fd 100644 --- a/pkgs/applications/video/handbrake/default.nix +++ b/pkgs/applications/video/handbrake/default.nix @@ -7,9 +7,9 @@ # be nice to add the native GUI (and/or the GTK GUI) as an option too, but that # requires invoking the Xcode build system, which is non-trivial for now. -{ stdenv, lib, fetchurl, fetchpatch, +{ stdenv, lib, fetchurl, # Main build tools - python2, pkgconfig, autoconf, automake, libtool, m4, lzma, + pkgconfig, autoconf, automake, libtool, m4, lzma, python3, numactl, # Processing, video codecs, containers ffmpeg-full, nv-codec-headers, libogg, x264, x265, libvpx, libtheora, dav1d, @@ -49,15 +49,18 @@ assert stdenv.isDarwin -> AudioToolbox != null && Foundation != null stdenv.mkDerivation rec { pname = "handbrake"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { - url = ''https://download.handbrake.fr/releases/${version}/HandBrake-${version}-source.tar.bz2''; - sha256 = "09rcrq0kjs1lc1as7w3glbpbfvzldwpx3xv0pfmkn4pl7acxw1f0"; + # 2020-05-05: NOTE: Thou fetching from GitHub, still fetchurl required, + # because this tarball has their "special" packaging and so + # internal "special" version information + url = ''https://github.com/HandBrake/HandBrake/releases/download/${version}/HandBrake-${version}-source.tar.bz2''; + sha256 = "0w7jxjrccvxp7g15dv0spildg5apmqp4gwbcqmg58va2gylynvzc"; }; nativeBuildInputs = [ - python2 pkgconfig autoconf automake libtool m4 + pkgconfig autoconf automake libtool m4 python3 ] ++ lib.optionals useGtk [ intltool wrapGAppsHook ]; buildInputs = [ @@ -80,12 +83,9 @@ stdenv.mkDerivation rec { substituteInPlace libhb/module.defs \ --replace /usr/include/libxml2 ${libxml2.dev}/include/libxml2 - substituteInPlace libhb/module.defs \ - --replace '$(CONTRIB.build/)include/libxml2' ${libxml2.dev}/include/libxml2 # Force using nixpkgs dependencies sed -i '/MODULES += contrib/d' make/include/main.defs - sed -i '/PKG_CONFIG_PATH=/d' gtk/module.rules sed -e 's/^[[:space:]]*\(meson\|ninja\|nasm\)[[:space:]]*= ToolProbe.*$//g' \ -e '/ ## Additional library and tool checks/,/ ## MinGW specific library and tool checks/d' \ -i make/configure.py -- cgit v1.2.3 From c8e228f174e81f8d76d97452a60a56ec4d541402 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 1 May 2020 23:15:02 -0300 Subject: pythonPackages.python-efl: 1.23.0 -> 1.24.0 --- pkgs/development/python-modules/python-efl/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/python-efl/default.nix b/pkgs/development/python-modules/python-efl/default.nix index ce5057a4f25..419b4906487 100644 --- a/pkgs/development/python-modules/python-efl/default.nix +++ b/pkgs/development/python-modules/python-efl/default.nix @@ -3,6 +3,7 @@ , buildPythonPackage , pkgconfig , python +, dbus-python , enlightenment }: @@ -10,21 +11,21 @@ buildPythonPackage rec { pname = "python-efl"; - version = "1.23.0"; + version = "1.24.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/bindings/python/${pname}-${version}.tar.xz"; - sha256 = "16yn6a1b9167nfmryyi44ma40m20ansfpwgrvqzfvwix7qaz9pib"; + sha256 = "1vk1cdd959gia4a9qzyq56a9zw3lqf9ck66k8c9g3c631mp5cfpy"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ enlightenment.efl ]; - propagatedBuildInputs = [ python.pkgs.dbus-python ]; + propagatedBuildInputs = [ dbus-python ]; preConfigure = '' - NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${stdenv.lib.getDev python.pkgs.dbus-python}/include/dbus-1.0 $NIX_CFLAGS_COMPILE" + NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl evas) $NIX_CFLAGS_COMPILE" ''; preBuild = '' -- cgit v1.2.3 From 24b1e92d3dc5a69e039fe3b970894375c149de39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sat, 2 May 2020 11:28:50 -0300 Subject: nixos/tests: add enlightenment desktop environment --- nixos/tests/all-tests.nix | 1 + nixos/tests/enlightenment.nix | 101 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+) create mode 100644 nixos/tests/enlightenment.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index eff1752bbbf..9e33fd297ee 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -85,6 +85,7 @@ in ecryptfs = handleTest ./ecryptfs.nix {}; ejabberd = handleTest ./xmpp/ejabberd.nix {}; elk = handleTestOn ["x86_64-linux"] ./elk.nix {}; + enlightenment = handleTest ./enlightenment.nix {}; env = handleTest ./env.nix {}; etcd = handleTestOn ["x86_64-linux"] ./etcd.nix {}; etcd-cluster = handleTestOn ["x86_64-linux"] ./etcd-cluster.nix {}; diff --git a/nixos/tests/enlightenment.nix b/nixos/tests/enlightenment.nix new file mode 100644 index 00000000000..5fa8d765dd1 --- /dev/null +++ b/nixos/tests/enlightenment.nix @@ -0,0 +1,101 @@ +import ./make-test-python.nix ({ pkgs, ...} : +{ + name = "enlightenment"; + + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ romildo ]; + }; + + machine = { ... }: + { + imports = [ ./common/user-account.nix ]; + services.xserver.enable = true; + services.xserver.desktopManager.enlightenment.enable = true; + services.xserver.displayManager.lightdm = { + enable = true; + autoLogin = { + enable = true; + user = "alice"; + }; + }; + hardware.pulseaudio.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then + virtualisation.memorySize = 1024; + environment.systemPackages = [ pkgs.xdotool ]; + services.acpid.enable = true; + services.connman.enable = true; + services.connman.package = pkgs.connmanMinimal; + }; + + enableOCR = true; + + testScript = { nodes, ... }: let + user = nodes.machine.config.users.users.alice; + in '' + with subtest("Ensure x starts"): + machine.wait_for_x() + machine.wait_for_file("${user.home}/.Xauthority") + machine.succeed("xauth merge ${user.home}/.Xauthority") + + with subtest("Check that logging in has given the user ownership of devices"): + machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}") + + with subtest("First time wizard"): + machine.wait_for_text("Default") # Language + machine.succeed("xdotool mousemove 512 185 click 1") # Default Language + machine.screenshot("wizard1") + machine.succeed("xdotool mousemove 512 740 click 1") # Next + + machine.wait_for_text("English") # Keyboard (default) + machine.screenshot("wizard2") + machine.succeed("xdotool mousemove 512 740 click 1") # Next + + machine.wait_for_text("Standard") # Profile (default) + machine.screenshot("wizard3") + machine.succeed("xdotool mousemove 512 740 click 1") # Next + + machine.wait_for_text("Title") # Sizing (default) + machine.screenshot("wizard4") + machine.succeed("xdotool mousemove 512 740 click 1") # Next + + machine.wait_for_text("clicked") # Windows Phocus + machine.succeed("xdotool mousemove 512 370 click 1") # Click + machine.screenshot("wizard5") + machine.succeed("xdotool mousemove 512 740 click 1") # Next + + machine.wait_for_text("bindings") # Mouse Modifiers (default) + machine.screenshot("wizard6") + machine.succeed("xdotool mousemove 512 740 click 1") # Next + + machine.wait_for_text("Connman") # Network Management (default) + machine.screenshot("wizard7") + machine.succeed("xdotool mousemove 512 740 click 1") # Next + + machine.wait_for_text("BlusZ") # Bluetooh Management (default) + machine.screenshot("wizard8") + machine.succeed("xdotool mousemove 512 740 click 1") # Next + + machine.wait_for_text("Compositing") # Compositing (default) + machine.screenshot("wizard9") + machine.succeed("xdotool mousemove 512 740 click 1") # Next + + machine.wait_for_text("update") # Updates + machine.succeed("xdotool mousemove 512 495 click 1") # Disable + machine.screenshot("wizard10") + machine.succeed("xdotool mousemove 512 740 click 1") # Next + + machine.wait_for_text("taskbar") # Taskbar + machine.succeed("xdotool mousemove 480 410 click 1") # Enable + machine.screenshot("wizard11") + machine.succeed("xdotool mousemove 512 740 click 1") # Next + + machine.wait_for_text("Home") # The desktop + machine.screenshot("wizard12") + + with subtest("Run Terminology"): + machine.succeed("terminology &") + machine.sleep(5) + machine.send_chars("ls --color -alF\n") + machine.sleep(2) + machine.screenshot("terminology") + ''; +}) -- cgit v1.2.3 From 76386a990932e2f1539ab2e1352ffba0fed8cbef Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 11:55:26 +0000 Subject: grip: 4.1.0 -> 4.1.1 --- pkgs/applications/misc/grip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/grip/default.nix b/pkgs/applications/misc/grip/default.nix index e64ae08037a..b1985be2c94 100644 --- a/pkgs/applications/misc/grip/default.nix +++ b/pkgs/applications/misc/grip/default.nix @@ -2,11 +2,11 @@ , curl, cdparanoia, libid3tag, ncurses, libtool }: stdenv.mkDerivation rec { - name = "grip-4.1.0"; + name = "grip-4.1.1"; src = fetchurl { url = "mirror://sourceforge/grip/${name}.tar.gz"; - sha256 = "0iy7bcyrxm7zyrxah06qyxdshkgq6yqkadlw211j2qzld38a79j5"; + sha256 = "1sbjgawb7qrinixybwi0adk7mpdfb565gkffp5gxxsw8fqd068fs"; }; nativeBuildInputs = [ pkgconfig ]; -- cgit v1.2.3 From 27e9538b3e298757fdc6b6a8a148e2f2778abc5b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 5 May 2020 07:18:00 -0500 Subject: xonsh: 0.9.17 -> 0.9.18 Changelog: https://github.com/xonsh/xonsh/releases/tag/0.9.18 --- pkgs/shells/xonsh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index dc0a45c3e52..192e38b963d 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "xonsh"; - version = "0.9.17"; + version = "0.9.18"; # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { owner = "xonsh"; repo = "xonsh"; rev = version; - sha256 = "0ynfnphbp69am390m5zfzk5rzj1749vs7rzyq310f6mk7xdq6j4v"; + sha256 = "1zg5dl9qdysbaw2djy9f7f1ydp7vzjv840cjwqxlmg9615lgg7xa"; }; LC_ALL = "en_US.UTF-8"; -- cgit v1.2.3 From 28bea113858231fa98f1f1ee12bf2817eae8be72 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 12:18:09 +0000 Subject: joker: 0.15.0 -> 0.15.3 --- pkgs/development/interpreters/joker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/joker/default.nix b/pkgs/development/interpreters/joker/default.nix index b176c55cbfd..39588a0c363 100644 --- a/pkgs/development/interpreters/joker/default.nix +++ b/pkgs/development/interpreters/joker/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "joker"; - version = "0.15.0"; + version = "0.15.3"; src = fetchFromGitHub { rev = "v${version}"; owner = "candid82"; repo = "joker"; - sha256 = "03lbvxmkn0rr7yv7kj6c4dh4zayiwbhrkqbz2m22dw568rjbp8az"; + sha256 = "1pxj6flyhf522zjab1dfvxfajyx3v3rzs7l8ma7ma6b8zmwp2wdn"; }; - modSha256 = "1mylgim9nm0v5wybgzi74nqzmvzwzws0027wzl86dbj5id83ab9v"; + modSha256 = "165mjfjk4x95ckw7wg96bg9pzb3297sggnip38nz2jxxbqr0ff8b"; preBuild = '' go generate ./... -- cgit v1.2.3 From 3ee2acd99a9c22349504c5e397158813b1d0fffa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=C3=A4ssler?= Date: Tue, 5 May 2020 14:20:06 +0200 Subject: vgo2nix: unstable-2019-02-05 -> unstable-2020-05-05 --- pkgs/development/tools/vgo2nix/default.nix | 10 ++--- pkgs/development/tools/vgo2nix/deps.nix | 71 ++++++++++++++++++++++++++++-- 2 files changed, 72 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/vgo2nix/default.nix b/pkgs/development/tools/vgo2nix/default.nix index 5f2a45f7427..27860661167 100644 --- a/pkgs/development/tools/vgo2nix/default.nix +++ b/pkgs/development/tools/vgo2nix/default.nix @@ -9,16 +9,16 @@ buildGoPackage { pname = "vgo2nix"; - version = "unstable-2019-02-06"; + version = "unstable-2020-05-05"; goPackagePath = "github.com/adisbladis/vgo2nix"; nativeBuildInputs = [ makeWrapper ]; src = fetchFromGitHub { - owner = "adisbladis"; + owner = "nix-community"; repo = "vgo2nix"; - rev = "f2694cd352830f0561bc00bbcaa08cefb2e36439"; - sha256 = "10cwi67cyhqjq1pwhry2n1v8z7wybl4cawzmjmfgs5mbsvqp0h78"; + rev = "71e59bf268d5257a0f89b2f59cd20fd468c8c6ac"; + sha256 = "1pcdkknq2v7nrs0siqcvvq2x0qqz5snwdz2lpjnad8i33rwhmayh"; }; goDeps = ./deps.nix; @@ -33,7 +33,7 @@ buildGoPackage { meta = with stdenv.lib; { description = "Convert go.mod files to nixpkgs buildGoPackage compatible deps.nix files"; - homepage = "https://github.com/adisbladis/vgo2nix"; + homepage = "https://github.com/nix-community/vgo2nix"; license = licenses.mit; maintainers = with maintainers; [ adisbladis ]; }; diff --git a/pkgs/development/tools/vgo2nix/deps.nix b/pkgs/development/tools/vgo2nix/deps.nix index 4f8506794d3..2d9a130e43e 100644 --- a/pkgs/development/tools/vgo2nix/deps.nix +++ b/pkgs/development/tools/vgo2nix/deps.nix @@ -126,13 +126,67 @@ sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; }; } + { + goPackagePath = "github.com/yuin/goldmark"; + fetch = { + type = "git"; + url = "https://github.com/yuin/goldmark"; + rev = "v1.1.27"; + sha256 = "1872cqnii0kwiqcy81yin0idvjy5mdy4zlzz0csb319lcjs3b923"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "87dc89f01550"; + sha256 = "0z4i1m2yn3f31ci7wvcm2rxkx2yiv7a78mfzklncmsz2k97rlh2g"; + }; + } + { + goPackagePath = "golang.org/x/mod"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/mod"; + rev = "v0.2.0"; + sha256 = "1fp6885dclq77mh73v7i54v2b9llpv4di193zc8vmsbbkkc483cl"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "0de0cce0169b"; + sha256 = "1db7s5kbzyh2zd5lpv05n7hp8wbwdvgk0wpiwrlnig94mkr0y5aq"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "cd5d95a43a6e"; + sha256 = "1nqkyz2y1qvqcma52ijh02s8aiqmkfb95j08f6zcjhbga3ds6hds"; + }; + } { goPackagePath = "golang.org/x/sys"; fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "d99a578cf41b"; - sha256 = "10q9xx4pmnq92qn6ff4xp7n1hx766wvw2rf7pqcd6rx5plgwz8cm"; + rev = "97732733099d"; + sha256 = "118hkp01i4z1f5h6hcjm0ff2ngqhrzj1f7731n0kw8dr6hvbx0sw"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; }; } { @@ -140,8 +194,17 @@ fetch = { type = "git"; url = "https://go.googlesource.com/tools"; - rev = "ded554d0681e"; - sha256 = "04rlq9hc3ccww9sbsrl48fl6wbjprb136rqxyr7dmgfj444aml56"; + rev = "0c9eba77bc32"; + sha256 = "1xz0jyxdmibkams6vd61va5cw963l25jjf3i9r33m0i739qwg4lj"; + }; + } + { + goPackagePath = "golang.org/x/xerrors"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/xerrors"; + rev = "9bdfabe68543"; + sha256 = "1yjfi1bk9xb81lqn85nnm13zz725wazvrx3b50hx19qmwg7a4b0c"; }; } ] -- cgit v1.2.3 From b9787479e2972110bce73f99a1a620f710ea4476 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 5 May 2020 14:27:31 +0200 Subject: riot-web: 1.5.15 -> 1.6.0 https://github.com/vector-im/riot-web/releases/tag/v1.6.0 --- pkgs/applications/networking/instant-messengers/riot/riot-web.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index 78fc4b45f6b..3aeb715ac67 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "riot-web"; - version = "1.5.15"; + version = "1.6.0"; src = fetchurl { url = "https://github.com/vector-im/riot-web/releases/download/v${version}/riot-v${version}.tar.gz"; - sha256 = "09a9l1l65m2c4ldycjhnqn0mmblm3j65vc9rcjfkdxqbd6bh86h7"; + sha256 = "1mm4xk69ya1k3gz6jjhc4njx7b3rp157jmrqsxr5i382zs035ff7"; }; installPhase = '' -- cgit v1.2.3 From bc6bad222e6d52491a2c4c8c95c598bf73e7949e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 5 May 2020 14:28:15 +0200 Subject: riot-desktop: 1.5.15 -> 1.6.0 https://github.com/vector-im/riot-web/releases/tag/v1.6.0 --- .../networking/instant-messengers/riot/riot-desktop-package.json | 2 +- .../networking/instant-messengers/riot/riot-desktop-yarndeps.nix | 8 ++++---- .../networking/instant-messengers/riot/riot-desktop.nix | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json index 390b61d8d36..d036050a476 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-package.json +++ b/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.5.15", + "version": "1.6.0", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "dependencies": { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix index e1dce803b40..0db687dff0b 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop-yarndeps.nix @@ -610,11 +610,11 @@ }; } { - name = "minimist___minimist_1.2.2.tgz"; + name = "minimist___minimist_1.2.3.tgz"; path = fetchurl { - name = "minimist___minimist_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.2.tgz"; - sha1 = "b00a00230a1108c48c169e69a291aafda3aacd63"; + name = "minimist___minimist_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/minimist/-/minimist-1.2.3.tgz"; + sha1 = "3db5c0765545ab8637be71f333a104a965a9ca3f"; }; } { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index a30df623050..3b4f968c129 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -8,12 +8,12 @@ let executableName = "riot-desktop"; - version = "1.5.15"; + version = "1.6.0"; riot-web-src = fetchFromGitHub { owner = "vector-im"; repo = "riot-web"; rev = "v${version}"; - sha256 = "08yk5is6n9ci1jml0b94a3swdybx01k5klbl30i1b76biyn75m77"; + sha256 = "16zm6l4c7vkfdlxh6gdw531k5r4v3mb0h66q41h94dvmj79dz2bj"; }; electron = electron_7; -- cgit v1.2.3 From 4a86636d33176294b8b883ebb8cd980b5e3efa86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Tue, 5 May 2020 09:38:21 -0300 Subject: xfce.xfce4-notifyd: 0.6.0 -> 0.6.1 --- pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix index 40d9c188fa3..c9a61488840 100644 --- a/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix +++ b/pkgs/desktops/xfce/applications/xfce4-notifyd/default.nix @@ -4,9 +4,9 @@ mkXfceDerivation { category = "apps"; pname = "xfce4-notifyd"; - version = "0.6.0"; + version = "0.6.1"; - sha256 = "03lw7zil6pwvx537ibqrynxjz7d6iq6in7vdskrnnn16kfg6hjg2"; + sha256 = "18d2q5b54df8j2281lash8gm0826c6apn39q4igfz2zfcyqjh1if"; buildInputs = [ exo gtk3 glib libnotify libxfce4ui libxfce4util xfce4-panel xfconf ]; -- cgit v1.2.3 From ca141f7191cc382bed30127684ce508482a6dc2f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 13:05:32 +0000 Subject: jbake: 2.6.4 -> 2.6.5 --- pkgs/development/tools/jbake/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/jbake/default.nix b/pkgs/development/tools/jbake/default.nix index 79054c7f667..ad127b94960 100644 --- a/pkgs/development/tools/jbake/default.nix +++ b/pkgs/development/tools/jbake/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "2.6.4"; + version = "2.6.5"; pname = "jbake"; src = fetchzip { url = "https://dl.bintray.com/jbake/binary/${pname}-${version}-bin.zip"; - sha256 = "0zgp0wwxxmi13v5q5jvr610igx2vxg0bwck9j1imnn9ciakg1aaw"; + sha256 = "0ripayv1vf4f4ylxr7h9kad2xhy3y98ca8s4p38z7dn8l47zg0qw"; }; buildInputs = [ makeWrapper jre ]; -- cgit v1.2.3 From b33733702356d4bc69ec8b9245f2727c571eb694 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 13:15:18 +0000 Subject: khard: 0.16.0 -> 0.16.1 --- pkgs/applications/misc/khard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix index 0d3c9d0cbd0..8646b9864d9 100644 --- a/pkgs/applications/misc/khard/default.nix +++ b/pkgs/applications/misc/khard/default.nix @@ -1,12 +1,12 @@ { stdenv, glibcLocales, python3 }: python3.pkgs.buildPythonApplication rec { - version = "0.16.0"; + version = "0.16.1"; pname = "khard"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "0a1zpkq0pplmn9flxczq2wafs6zc07r9xx9qi6dqmyv9mhy9d87f"; + sha256 = "0fg4qh5gzki5wg958wlpc8a2icnk74gzg33lqxjm755cfnjng7qd"; }; propagatedBuildInputs = with python3.pkgs; [ -- cgit v1.2.3 From 5a2e2d77e1d866d0de2cebb03d5c960d4e6c7832 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 5 May 2020 09:26:28 -0400 Subject: oh-my-zsh: 2020-05-01 -> 2020-05-05 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index fe30a6f9e9a..fae5f80fbf1 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2020-05-01"; + version = "2020-05-05"; pname = "oh-my-zsh"; - rev = "173d4ca68f1ff4b04e9f3fd783244c309d848092"; + rev = "ff987384cf721e7e0812636dea8100b485968bb2"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "0k8w5cf5fyz69bji947i1yd7pd49bpkg82k2wlx9964lgl21bip5"; + sha256 = "0hc03sb2i65zrfj7r7c3p6f1g9997h74n12n4r253hrsp7az9p05"; }; pathsToLink = [ "/share/oh-my-zsh" ]; -- cgit v1.2.3 From 7426bec45ef03c55bfc5bb27cdc60d6163aeed04 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 5 May 2020 13:41:12 +0200 Subject: nixos/systemd/resolved: add resolve to nss hosts database if enabled We keep the "only add the nss module if nscd is enabled" logic for now. The assertion never was triggered, so it can be removed. --- nixos/modules/config/nsswitch.nix | 7 ------- nixos/modules/system/boot/resolved.nix | 4 ++++ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix index 77e47a350ec..b191e6feb0a 100644 --- a/nixos/modules/config/nsswitch.nix +++ b/nixos/modules/config/nsswitch.nix @@ -14,14 +14,12 @@ let nssmdns = canLoadExternalModules && config.services.avahi.nssmdns; nsswins = canLoadExternalModules && config.services.samba.nsswins; ldap = canLoadExternalModules && (config.users.ldap.enable && config.users.ldap.nsswitch); - resolved = canLoadExternalModules && config.services.resolved.enable; hostArray = mkMerge [ (mkBefore [ "files" ]) (mkIf mymachines [ "mymachines" ]) (mkIf nssmdns [ "mdns_minimal [NOTFOUND=return]" ]) (mkIf nsswins [ "wins" ]) - (mkIf resolved [ "resolve [!UNAVAIL=return]" ]) (mkAfter [ "dns" ]) (mkIf nssmdns (mkOrder 1501 [ "mdns" ])) # 1501 to ensure it's after dns (mkIf myhostname (mkOrder 1600 [ "myhostname" ])) # 1600 to ensure it's always the last @@ -134,11 +132,6 @@ in { assertion = config.system.nssModules.path != "" -> canLoadExternalModules; message = "Loading NSS modules from path ${config.system.nssModules.path} requires nscd being enabled."; } - { - # resolved does not need to add to nssModules, therefore needs an extra assertion - assertion = resolved -> canLoadExternalModules; - message = "Loading systemd-resolved's nss-resolve NSS module requires nscd being enabled."; - } ]; # Name Service Switch configuration file. Required by the C diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix index da61c64faf8..b7aaef575ac 100644 --- a/nixos/modules/system/boot/resolved.nix +++ b/nixos/modules/system/boot/resolved.nix @@ -138,6 +138,10 @@ in users.users.resolved.group = "systemd-resolve"; + # add resolve to nss hosts database if enabled and nscd enabled + # system.nssModules is configured in nixos/modules/system/boot/systemd.nix + system.nssDatabases.hosts = optional config.services.nscd.enable "resolve [!UNAVAIL=return]"; + systemd.additionalUpstreamSystemUnits = [ "systemd-resolved.service" ]; -- cgit v1.2.3 From c0995d22eed1a19ac9442c8460c18dd6a4c389b7 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 5 May 2020 15:03:14 +0200 Subject: nixos/systemd: move NSS module logic to systemd module We keep the conditional on only adding if nscd is enabled for now. --- nixos/modules/config/nsswitch.nix | 13 ------------- nixos/modules/system/boot/systemd.nix | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/nixos/modules/config/nsswitch.nix b/nixos/modules/config/nsswitch.nix index b191e6feb0a..22ddb3490c8 100644 --- a/nixos/modules/config/nsswitch.nix +++ b/nixos/modules/config/nsswitch.nix @@ -8,8 +8,6 @@ let # only with nscd up and running we can load NSS modules that are not integrated in NSS canLoadExternalModules = config.services.nscd.enable; - myhostname = canLoadExternalModules; - mymachines = canLoadExternalModules; # XXX Move these to their respective modules nssmdns = canLoadExternalModules && config.services.avahi.nssmdns; nsswins = canLoadExternalModules && config.services.samba.nsswins; @@ -17,19 +15,15 @@ let hostArray = mkMerge [ (mkBefore [ "files" ]) - (mkIf mymachines [ "mymachines" ]) (mkIf nssmdns [ "mdns_minimal [NOTFOUND=return]" ]) (mkIf nsswins [ "wins" ]) (mkAfter [ "dns" ]) (mkIf nssmdns (mkOrder 1501 [ "mdns" ])) # 1501 to ensure it's after dns - (mkIf myhostname (mkOrder 1600 [ "myhostname" ])) # 1600 to ensure it's always the last ]; passwdArray = mkMerge [ (mkBefore [ "files" ]) (mkIf ldap [ "ldap" ]) - (mkIf mymachines [ "mymachines" ]) - (mkIf canLoadExternalModules (mkAfter [ "systemd" ])) ]; shadowArray = mkMerge [ @@ -157,12 +151,5 @@ in { hosts = hostArray; services = mkBefore [ "files" ]; }; - - # Systemd provides nss-myhostname to ensure that our hostname - # always resolves to a valid IP address. It returns all locally - # configured IP addresses, or ::1 and 127.0.0.2 as - # fallbacks. Systemd also provides nss-mymachines to return IP - # addresses of local containers. - system.nssModules = (optionals canLoadExternalModules [ config.systemd.package.out ]); }; } diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 2167df60bc9..df20a433d52 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -827,6 +827,27 @@ in system.build.units = cfg.units; + # Systemd provides various NSS modules to look up dynamic users, locally + # configured IP adresses and local container hostnames. + # On NixOS, these can only be passed to the NSS system via nscd (and its + # LD_LIBRARY_PATH), which is why it's usually a very good idea to have nscd + # enabled (also see the config.nscd.enable description). + # While there is already an assertion in place complaining loudly about + # having nssModules configured and nscd disabled, for some reason we still + # check for nscd being enabled before adding to nssModules. + system.nssModules = optional config.services.nscd.enable systemd.out; + system.nssDatabases = mkIf config.services.nscd.enable { + hosts = (mkMerge [ + [ "mymachines" ] + (mkOrder 1600 [ "myhostname" ] # 1600 to ensure it's always the last + ) + ]); + passwd = (mkMerge [ + [ "mymachines" ] + (mkAfter [ "systemd" ]) + ]); + }; + environment.systemPackages = [ systemd ]; environment.etc = let -- cgit v1.2.3 From 88246c57fc15a8b26c3f368f7cb1888a1900a46a Mon Sep 17 00:00:00 2001 From: Patrick Winter Date: Thu, 23 Jan 2020 11:20:58 +0100 Subject: pxlib: init at 0.6.8 --- pkgs/development/libraries/pxlib/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/libraries/pxlib/default.nix diff --git a/pkgs/development/libraries/pxlib/default.nix b/pkgs/development/libraries/pxlib/default.nix new file mode 100644 index 00000000000..2624c718d27 --- /dev/null +++ b/pkgs/development/libraries/pxlib/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, intltool }: + +stdenv.mkDerivation rec { + pname = "pxlib"; + version = "0.6.8"; + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + sha256 = "1yafwz4z5h30hqvk51wpgbjlmq9f2z2znvfim87ydrfrqfjmi6sz"; + }; + + nativeBuildInputs = [ intltool ]; + + meta = with stdenv.lib; { + description = "Library to read and write Paradox files"; + homepage = "http://pxlib.sourceforge.net/"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.winpat ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2bbc121b7ac..e665dc3362b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25878,6 +25878,8 @@ in kcli = callPackage ../development/tools/kcli {}; + pxlib = callPackage ../development/libraries/pxlib {}; + unstick = callPackage ../os-specific/linux/unstick {}; quartus-prime-lite = callPackage ../applications/editors/quartus-prime {}; -- cgit v1.2.3 From 9356945f912dfa605ae72e908968d5fa8d7dade6 Mon Sep 17 00:00:00 2001 From: Patrick Winter Date: Thu, 23 Jan 2020 11:21:16 +0100 Subject: pxview: init at 0.2.5 --- pkgs/development/tools/pxview/default.nix | 27 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/tools/pxview/default.nix diff --git a/pkgs/development/tools/pxview/default.nix b/pkgs/development/tools/pxview/default.nix new file mode 100644 index 00000000000..6b11071b6fa --- /dev/null +++ b/pkgs/development/tools/pxview/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, pkgconfig, perl, perlPackages, pxlib }: + +stdenv.mkDerivation rec { + pname = "pxview"; + version = "0.2.5"; + src = fetchurl { + url = "mirror://sourceforge/pxlib/${pname}_${version}.orig.tar.gz"; + sha256 = "1kpdqs6lvnyj02v9fbz1s427yqhgrxp7zw63rzfgiwd4iqp75139"; + }; + + buildInputs = [ pxlib perl ] ++ (with perlPackages; [ libxml_perl ]); + nativeBuildInputs = [ pkgconfig ]; + + configureFlags = [ "--with-pxlib=${pxlib.out}" ]; + + # https://sourceforge.net/p/pxlib/bugs/12/ + LDFLAGS = "-lm"; + hardeningDisable = [ "format" ]; + + meta = with stdenv.lib; { + description = "Program to convert Paradox databases"; + homepage = "http://pxlib.sourceforge.net/pxview/"; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.winpat ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e665dc3362b..0bd81a79b75 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25880,6 +25880,8 @@ in pxlib = callPackage ../development/libraries/pxlib {}; + pxview = callPackage ../development/tools/pxview {}; + unstick = callPackage ../os-specific/linux/unstick {}; quartus-prime-lite = callPackage ../applications/editors/quartus-prime {}; -- cgit v1.2.3 From 96274c61c4aa02978122c7b697d0a196e81fe68f Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Tue, 5 May 2020 16:52:27 +0200 Subject: golangci-lint: 1.25.1 -> 1.26.0 Signed-off-by: Vincent Demeester --- pkgs/development/tools/golangci-lint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/golangci-lint/default.nix b/pkgs/development/tools/golangci-lint/default.nix index c33a4cf69f5..be582047157 100644 --- a/pkgs/development/tools/golangci-lint/default.nix +++ b/pkgs/development/tools/golangci-lint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "golangci-lint"; - version = "1.25.1"; + version = "1.26.0"; src = fetchFromGitHub { owner = "golangci"; repo = "golangci-lint"; rev = "v${version}"; - sha256 = "04r26nn72myacs6v2jq8mi4kjik82iwsh6w59h4k9yk0my3fjwia"; + sha256 = "1xw6m4ps6yw8gnkwy8v7rrz2b8c8n72cd7vkpx481dkd36vccpkc"; }; - modSha256 = "1pz5f2hv2lssiwsp60hsycg2ijyafb7r5fl2yrvflqg547k3n8x2"; + modSha256 = "0xgnimr1jydrgwhbyjaz710kx3m3505nhy5cs10p501qxbnzkjf9"; subPackages = [ "cmd/golangci-lint" ]; meta = with lib; { -- cgit v1.2.3 From 3da38dd0e995d0fa96f666b25cc900aaf4d4c3d0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 16:27:26 +0000 Subject: languagetool: 4.9 -> 4.9.1 --- pkgs/tools/text/languagetool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix index 154e099d3dd..fccd2174a6d 100644 --- a/pkgs/tools/text/languagetool/default.nix +++ b/pkgs/tools/text/languagetool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "LanguageTool"; - version = "4.9"; + version = "4.9.1"; src = fetchzip { url = "https://www.languagetool.org/download/${pname}-${version}.zip"; - sha256 = "05jqqamdvi5x35yy9bqw6wf7qagrm1r9488f7cfbbv764zfirz17"; + sha256 = "0hvzckb92yijzmp2vphjp1wgql3xqq0xd83v5x6pbhziq9yxc5yh"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ jre ]; -- cgit v1.2.3 From 3a901d247c2993ea92fac67b1a99e5e9e79e3aff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 5 May 2020 17:49:06 +0100 Subject: python3.pkgs.rl-coach: mark as broken --- pkgs/development/python-modules/rl-coach/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/rl-coach/default.nix b/pkgs/development/python-modules/rl-coach/default.nix index bee588457ff..e9efb0c02b4 100644 --- a/pkgs/development/python-modules/rl-coach/default.nix +++ b/pkgs/development/python-modules/rl-coach/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0c4f3a334ff55d534d2fc7f83d5e791f64b780391039e367f6cd9b4381838744"; + sha256 = "0i47hf0l76ydyrky6f8h760bfr0zg5g3vy675x6m6pgm9wrklkqc"; }; propagatedBuildInputs = [ @@ -94,5 +94,7 @@ buildPythonPackage rec { homepage = "https://nervanasystems.github.io/coach/"; license = licenses.asl20; maintainers = with maintainers; [ timokau ]; + # pythonPackages.gym is too new + broken = true; # since 2020-04-20 }; } -- cgit v1.2.3 From 416caeb6dbd59d5c53da542dcf3184f11141f354 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 5 May 2020 17:58:20 +0100 Subject: go: 1.14.1 -> 1.14.2 --- pkgs/development/compilers/go/1.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix index cf5c878d9c8..9ee5b6fa624 100644 --- a/pkgs/development/compilers/go/1.14.nix +++ b/pkgs/development/compilers/go/1.14.nix @@ -30,11 +30,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.14.1"; + version = "1.14.2"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "0xkna02clggcdgl5xxwani62krnf64x6p3hk9k5v9ldh2lhmglia"; + sha256 = "0z3zxsnhmsxplnwfw1l9gr6jgglwp50sr3p5njknv9i6jzk89plq"; }; # perl is used for testing go vet -- cgit v1.2.3 From 2dbc41f63726fe4f743bd271489720530c69bcc4 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 5 May 2020 19:21:12 +0200 Subject: grisbi: get rid of sha1 + package cleanup --- pkgs/applications/office/grisbi/default.nix | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/office/grisbi/default.nix b/pkgs/applications/office/grisbi/default.nix index 85b688b0c4d..d4f08b141a6 100644 --- a/pkgs/applications/office/grisbi/default.nix +++ b/pkgs/applications/office/grisbi/default.nix @@ -1,5 +1,14 @@ -{ fetchurl, stdenv, gtk, pkgconfig, libgsf, libofx, intltool, wrapGAppsHook -, libsoup, gnome3 }: +{ fetchurl +, stdenv +, gtk +, pkgconfig +, libgsf +, libofx +, intltool +, wrapGAppsHook +, libsoup +, gnome3 +}: stdenv.mkDerivation rec { pname = "grisbi"; @@ -7,12 +16,18 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/grisbi/${pname}-${version}.tar.bz2"; - sha1 = "crv3bga72v6fw07wad0nkrgdg4war66j"; + sha256 = "1piiyyxjsjbw9gcqydvknzxmmfgh8kdqal12ywrxyxih2afwnvbw"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; - buildInputs = [ gtk libgsf libofx intltool libsoup - gnome3.adwaita-icon-theme ]; + buildInputs = [ + gtk + libgsf + libofx + intltool + libsoup + gnome3.adwaita-icon-theme + ]; meta = with stdenv.lib; { description = "A personnal accounting application."; @@ -24,7 +39,7 @@ stdenv.mkDerivation rec { management and other information that make Grisbi adapted for associations. ''; - homepage = "http://grisbi.org"; + homepage = "https://grisbi.org"; license = licenses.gpl2Plus; maintainers = with maintainers; [ layus ]; platforms = platforms.linux; -- cgit v1.2.3 From bece8c0db2df4031d5e0800a56a823fd8ad91d8a Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 5 May 2020 19:41:38 +0200 Subject: wxsqlite3: 3.3.1 -> 4.5.1 --- pkgs/development/libraries/wxsqlite3/default.nix | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix index 70b650eecb1..9bea7f5e848 100644 --- a/pkgs/development/libraries/wxsqlite3/default.nix +++ b/pkgs/development/libraries/wxsqlite3/default.nix @@ -1,20 +1,23 @@ -{ stdenv, fetchFromGitHub, wxGTK, sqlite -, darwin }: +{ stdenv +, fetchFromGitHub +, autoreconfHook +, wxGTK +, sqlite +, darwin +}: stdenv.mkDerivation rec { pname = "wxsqlite3"; - version = "3.3.1"; + version = "4.5.1"; src = fetchFromGitHub { owner = "utelle"; repo = "wxsqlite3"; rev = "v${version}"; - sha1 = "bb8p58g88nkdcsj3h4acx7h925n2cy9g"; + sha256 = "0090f7r3blks18vifkna4l890fwaya58ajh9qblbw9065zj5hrm3"; }; - preBuild = stdenv.lib.optionalString stdenv.isDarwin '' - cp build28/Info.plist.in build28/wxmac.icns build/ - ''; + nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ wxGTK sqlite ] ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Cocoa darwin.stubs.setfile darwin.stubs.rez darwin.stubs.derez ]; -- cgit v1.2.3 From 271a9de2c841f7963b0e67ad562f8dea4fe10398 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 5 May 2020 19:31:20 +0200 Subject: wxsqliteplus: get rid of sha1 + package cleanup --- pkgs/development/libraries/wxsqliteplus/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/wxsqliteplus/default.nix b/pkgs/development/libraries/wxsqliteplus/default.nix index 6a2e33f9a9f..18ecea4cbe1 100644 --- a/pkgs/development/libraries/wxsqliteplus/default.nix +++ b/pkgs/development/libraries/wxsqliteplus/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { owner = "guanlisheng"; repo = "wxsqliteplus"; rev = "v${version}"; - sha1 = "yr9ysviv4hbrxn900z1wz8j32frimvx1"; + sha256 = "0mgfq813pli56mar7pdxlhwjf5k10j196rs3jd0nc8b6dkzkzlnf"; }; buildInputs = [ wxGTK wxsqlite3 sqlite ]; @@ -24,12 +24,11 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p $out/bin - cp wxsqliteplus $out/bin/ + install -D wxsqliteplus $out/bin/wxsqliteplus ''; meta = with stdenv.lib; { - homepage = "http://guanlisheng.com/"; + homepage = "https://github.com/guanlisheng/wxsqliteplus"; description = "A simple SQLite database browser built with wxWidgets"; platforms = platforms.unix; maintainers = with maintainers; [ vrthra ]; -- cgit v1.2.3 From 8085245ffff62760339d27f1892cab9871343fa9 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Mon, 4 May 2020 20:31:20 +0800 Subject: just: use installShellFiles --- pkgs/development/tools/just/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index 5ae2ee1c14d..8ba536e3b5f 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, rustPlatform, coreutils, bash, dash }: +{ stdenv, fetchFromGitHub, rustPlatform, coreutils, bash, dash +, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "just"; @@ -13,14 +14,14 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "05mrzav3aydvwac9jjckdmlxvxnlcncmkfsdb9z7zvxia4k89w1l"; - postInstall = '' - # generate completion scripts for just + nativeBuildInputs = [ installShellFiles ]; - mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions} + postInstall = '' + installManPage man/just.1 - $out/bin/just --completions bash > "$out/share/bash-completion/completions/just" - $out/bin/just --completions fish > "$out/share/fish/vendor_completions.d/just.fish" - $out/bin/just --completions zsh > "$out/share/zsh/site-functions/_just" + installShellCompletion --bash --name just.bash completions/just.bash + installShellCompletion --fish --name just.fish completions/just.fish + installShellCompletion --zsh --name _just completions/just.zsh ''; checkInputs = [ coreutils bash dash ]; -- cgit v1.2.3 From 1016169e7163c461cba682a34990591e58688419 Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 6 May 2020 03:12:19 +0900 Subject: thunderbird-bin: 68.7.0 -> 68.8.0 --- .../thunderbird-bin/release_sources.nix | 490 ++++++++++----------- 1 file changed, 245 insertions(+), 245 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 39950bd58c5..800f7ff9e62 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,615 +1,615 @@ { - version = "68.7.0"; + version = "68.8.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ar/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ar/thunderbird-68.8.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "549c2fde5a7da05f1d0da28e6e203fffef5cc7d39073baef204da5ce221fdb12da53da64b29dc84cf4518eaee7394db71cee6e22611d5d86938df1b9b3bf8e0b"; + sha512 = "a45860fc124ef1c3ce15b1c91ab1d920beff2d6f886a646b6162bc5687e8910d559de6d616a36e7bdbd99fe18aa39720b44fcd4fe14e6d5fd4872750f209a740"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ast/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ast/thunderbird-68.8.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "92fa156e6dd72d9c0a6b0b6889e7486d97922cad3d8c8a4e572b048ff5694cd4fcd7f7f91eff718417760b72a50d045e5508befb8404f9343ec73633c8c43040"; + sha512 = "21e025c3e28b46e1d6af0fa10f3ab5b6b86543bb422c2b3d4928ae733cf3387ab092a20af15f05bdcebf0108c376973982d099371a4b2c2f9a892defe144e160"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/be/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/be/thunderbird-68.8.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "1ddce136d33b7eb6065cc1fa02f3e167b76a546308a19edf51f1102e569b259cb2bbd98d720050d48669ae04610cde6c09400ae6a9f467d611f3a5d332dcf203"; + sha512 = "5cb35465afbf6ba68aab98197ab6997e925d5e34db6deaf3b047fb679f32372e0524ac03d7988898f34c493349283088a3b4c0cfff679774760916673e49b757"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/bg/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/bg/thunderbird-68.8.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "31aeab60348dcb199e3fee7c167eccb8e02e98a62c0a30ad48d2963fda56a1cf25ff71eb9f16bc186db481fa90d795191c6aa29eef33742adab6e2df0c2e5282"; + sha512 = "a06dea6a215003ef5663cea4928cf201ee71cd021565f3a2f9317f21679047adc7f6c87427d65c4f919facb30e8dfaf941e308173f23c6c0b3e92606fa0220b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/br/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/br/thunderbird-68.8.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "f1555dbb5e30ad7d9d7468473f042424e9abd159a85325af55fdda74963c54e780f76093d15a2fc23a555b22896c6a76ad4c449846611222b63d13745cb577b7"; + sha512 = "194f7332e6c67dea103bae4001b555296b2a64259060bb63329aee95f774e4f3f82c9bf133a456989b43f05682eba7e73e16235f1530012aeb7cf323bc16a381"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ca/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ca/thunderbird-68.8.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "44e0a8cb1feda921b6a3afb6ef0f72d2ad3aaf681f908673c015ef43a660914df5a8b61a6d987c3ddb0b6abc6cd778e0ddb07c56c737a74848942e26d4ee45a2"; + sha512 = "99952f59100fe127fb274df641e02185a9416c315d5b023e990ca39fe6edb014a2e6e8ae702cce4d3133635a4c8488c42a72a6b3111147fc19dafeacae396943"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/cak/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/cak/thunderbird-68.8.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "e907643f6c7065117fd131d24b452734c229fad3bace6d445de15757ffbed875fdc69dcfc535cbe7b00b38df30c0b69b378b50560382e57fabff166c71d7ea33"; + sha512 = "9e4d9dd67fa7480c2897175d08ed250a14bb2595c9a69f74db7b7723d08e6218021a0916d637bb682f7e0e3e316cafcfe9a09408e5cced018616c00a752ccb0a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/cs/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/cs/thunderbird-68.8.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "1b65fe735bb61d2dbcd2d23ede39e7770a66feb6f898ec31cb7c198fdf95796d4f42876730fdb993767026c4c315a9be9cb53229cc21a5328ff443bc463ca4c3"; + sha512 = "53d653b9eda30f7b5ce75ebd31a2bb9e5bde683ca65549cb5d67ed4173eb4f44524f2bd148a0b41368e183b2ec513b7b7c698fcdeb2679ffd6391f133db2a0c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/cy/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/cy/thunderbird-68.8.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "77a3beb1ce6e78fb1d5138a7f0021462efb96e7f1d13cae2213670016a4a89dbd4a46bbe0e588ad15957ec71d053643cbd01033d9cdcc4e91b9e0303726abc27"; + sha512 = "ba01e95181c8b0e04989681cffacbc48a57a7861ce7f60377e219823fc5c70096bdf4f0a38401a35fd442e28c62b0bbb38328e62800db82ea7d097b919f60d55"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/da/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/da/thunderbird-68.8.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "b9d12257b5b4fae31cb70edf36ff02d48dc56481b37fa3f3a65bacadc38d772e407d7c1382899179299c23d70e55652c1d05f8ada855621a9db5f300b9c983a7"; + sha512 = "5b79cff38ae706023ef74799e66fb3e47e0cc4b1986f7df9b420dc27881c91db881311da9ac8c8d45c2a1c04a2e8b16b9a1d06e724e891f8a4e6323eedfd984b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/de/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/de/thunderbird-68.8.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "c84cd6e76e18207ed02209bb333e922e3dc928c0f0ecd0243f4f8024d49c3ad1f4c3268dde921ced90a77cacffcd41eac82beab65d226dedcd07fd7a2f821a00"; + sha512 = "de71986c0fecd12358a6ce01c708b7cfc1ebbc9a3f748f301bec76c1c4b23f584de224bfb8cca0bc59f545aa29990de0175af5a3005b33b77786c8b69065427f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/dsb/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/dsb/thunderbird-68.8.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "e29bd848258aa5b04eb60391183bead511ad8bdee038994a84982d068312c97b2e490cb5abe3821825101ed313c503c5c679e42d79011aab89bd116af7807276"; + sha512 = "e18851b7c709feb8c3bde88db8d9c297174ea3a7ff512f8a5d35d515e3693717f55631b4ab60fd134f0af056257e0b21947a400d305f91c904dc0848fa9ce5ec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/el/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/el/thunderbird-68.8.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "b203b8cb46f51f5dd176aabfc720eadc41ed081094c8feed87658885025ba4aef422ac19f4b4773976c42c4f8ce38aa80b39bc75f56c42ec59f5313ce4b98111"; + sha512 = "10816787adb0d02712b1a200f0b7547d8b03ff44056690dcf41a8a74c0dd1faa86a073c5036527a34626e83f47742caa213bc953a0d80e3598b2a743bcfc4d78"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/en-GB/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/en-GB/thunderbird-68.8.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "998aaa3ea0dcc387568802f367ea1637806a1dc19929ac8875ab4823c691c84004f62c6450b3c4439b88e017774ecbd4abfa38f72661fd9ce97208fe920060e4"; + sha512 = "295a440863622a263a8c157da9ae4d39f73c83d9e9fab3e8fad792480c84a1fdf0e073398c137c359e0dc078bd755bd024f2f15bb5129218df4cf54d02b9e565"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/en-US/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/en-US/thunderbird-68.8.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "583e9a08aff1d3e4be47e5a9f31b7595109e25a4062a36e8640468a354e29a47f389062db5fa134af6c231af5fb1caaa31368584fa662105100419a64134f0ac"; + sha512 = "cce266a330866ec3368c7d3f596868a87e1e3d786ddb848402456c5d80e5dec60a93a6feeee596b1ad91492e1d07aa5cc5703b09f0703d44575db7a050d58864"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/es-AR/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/es-AR/thunderbird-68.8.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "d976f3b916430388af3a50f58253cd4ddcaa5adef935b3965c71f38e938a8e3ad28f7ea8d83d4a9e0d0c85d29a1613547a95d4c9c4917159dce06d700e3f8122"; + sha512 = "78d7897c537807068ce92d6520086f921aa6530d893c7d1b662530bfee5a5082740ba4cbbecd7e8e57f5f600e8a288b259ed3d89a97f3e88d5e5ebc47b5bd6b4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/es-ES/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/es-ES/thunderbird-68.8.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "e51afeb81b39f6f3e7c501a0d5ca839d87794ed3a7f04ce552175a7f1227fee9667dec917a0c13d509687e31d6d87516bd5580dfe0158a964b13e4c26c82fb52"; + sha512 = "df97856ec0f8cf1fd82ceeb93529d8560cfe80416db769eea290ea1c28dcdc60799822ef1cdde744dfe4fb9622d16f32b0ed992293481762cf45c44a5bd846e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/et/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/et/thunderbird-68.8.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "60872a5306f154af3e2b9e58dfecf6135927464c92a3a6cac7c44fb934cc074eefeef6bbb6242e7403aaad3e1fb850d475efb07aaa80a07043f213960b92bd3b"; + sha512 = "9028d26dc4393043b39c7c918163d50aba07d6c1c57916b7e1c607b92be0c16dd8d62ff41b0ff26991b70f63a9fc684904c266e1a18ca8fc3e5abf5c61c6d372"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/eu/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/eu/thunderbird-68.8.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "5f774a38904b5881d0a5bdf0ddad71fa7f85db82daf7879de54d337e8dae17021267b1a289676a11daf1e96572f2734f74a29327f23636e8b38aed084b874bd7"; + sha512 = "adf9c6eedb1b086fa72af21b44a55bd9d8a1b3f4c45db4c232384abd570564e62fc9068dc1391b0bbe0adda4043c7893bf1cb15a9c3019230eed6f66001bcb97"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/fi/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/fi/thunderbird-68.8.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "0d977cbd85d7f1360e985844cc8ee433414abc3d10b8a33b2fbb9a03fdddcf3a91018edc12a12d96cc680d2c119e0c020549bd40cc10db9eba4188805e40dea8"; + sha512 = "a436504ebc04f1214226a0555838fe5eda6e12dabd3b09e9c83e85cc8b6b7bfea00389202c9680bf14d147e8e0a9200de01fdb1bac2197b8d7e8a392aa3b617e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/fr/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/fr/thunderbird-68.8.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "dc6d20875579d8e788a236885859faee3ca61d83aa051a48bfe18c484afec986353c1493e7e68181a83fea7a42ee62c29d3f71cc053873743959513dddf6e8ce"; + sha512 = "16d02c3e7d6342fed0f785c0f6a65c06a04eb6915bf67c7ff7d80a59ae9f4e069c329d54a9dbc8add6b84755e18aa485db7950dd1e3231a6ac135d799b27656a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/fy-NL/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/fy-NL/thunderbird-68.8.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "add2c509cb15cebc5dc77957c44e26a80ee52eda82f395308303216ebf14d13c09338f7bee14bad46ad0ffa8187008e7f4cc101c712029ff15b3ce14904c0a69"; + sha512 = "c5ddf9105d06b2b5cb45299d88bb7b753832d54a653a62d68695c88aa9cfa0d6e12f510139e924d142b867a5b1e10f7e9704c503fcc93dcb8d97d1b071a69b7a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ga-IE/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ga-IE/thunderbird-68.8.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "d1771c8282253a80ed62dca8f49797796f202da66e2a607d27dee89a1a8fe556dda440bc03d441b8b63bf732cd9c0960ebf9b9cc047de9c07e901a1051dfc94b"; + sha512 = "6479f7692fda207c51435691cbd6281a24fc6ad47101827516bad3c2b40ca8c0bb592aacd9936a22d9305ff8ffd53c376a79479ce82dee3af1eacf47a068b130"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/gd/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/gd/thunderbird-68.8.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "ea0f6d6287ef4e771c49b4891a4d9dff8b9766e444087456448e9ebe32c17e41d5cd9c9a17747250c393e389720a6ecb3bc6df98dc5c81f26504fc9cd6ea3e03"; + sha512 = "43b94bbd76809f67078ae5248df2d25b399be35ca7d5261236b6149142083483d2871edf17eec7fd42812fa8f5d775bc141ffb8d0fd43d14f39d3d150dc83a41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/gl/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/gl/thunderbird-68.8.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "487af69af4e9844a97d72e14a9de8f8aaf8f45efee6f72ad0d5b310019d6fe73c74288b3e4c7d2a83f6e30cb5b3fbeab2d2200d406814e6e25936ccefdbb5f14"; + sha512 = "be4c49d737b2b6bc1a19c0e63df9558c04b448be44a4552fd4fe3d3d28d8cab59bc1bc05cc72acecc8e398fd75ef9785e61848c8f3e39b55b7a534dd337845ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/he/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/he/thunderbird-68.8.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "13f43a849b765ed9743947c9e03fe9cb7bffcf120446ec80e8622ae1ecc7994497617464e7597a1e883520598f5de2404e2901b8d30cc91fad78dfe58763da20"; + sha512 = "4f0a83e57ac97d3e278c727f49ffff615333812dd9708ebbdd687fc35848be8074705aca6f09b5bb868eb6535c61252272729241cfe46a96e500f7ab6604849c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/hr/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/hr/thunderbird-68.8.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "bbcb86e67a1975920a3e0fd4298b817103fbf88eea05e822eeb89f60f4690164c90940e32082cbcc19fb9222f53c30b32c39eb041a768b1f8cdf61ae866abd13"; + sha512 = "08a8f8d273b1fceec0151813439be41d6ff1b2b42b28711a782caab04800e1acf61019f0fa8c7be27036ece8184b4b7f587b58f436c0eb8c73f35aa13be8afba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/hsb/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/hsb/thunderbird-68.8.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "23c9d885024b178a37de1f968def6e338fb1e44d2414f01d6b8757e3be082ab4b5950ca6bfb0cfb93093ebcf57d061cfeb2c7c8c46ac56274ff495b83a7754e7"; + sha512 = "1f64e9193fc44201e7bae329af94f7c18e6c0c0d30edf01b66dcca43e996f12622e795890e394c207ba20fc84198836b69e2fb1c61ae83c1875b1e424b5b3b97"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/hu/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/hu/thunderbird-68.8.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "8076d47c0b15fb565ecda807c789d5eba41b1209df356fe2184d4550a115b7ea986bb51fb6e9e8a4a279ed6025b7acb8f5c7ca88e5ccd72e4556fdaaf95619fc"; + sha512 = "4e8741809e8eb3b45a7931d4f5bdbceb1e7018a4f4cef97d32d16d00eb3713d85d70a2a4987830f1480633b07fa839cc8ed73fc1fa2d4b3a2944cf03221a3240"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/hy-AM/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/hy-AM/thunderbird-68.8.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "825f0066a329fc3e35c6a2c9038a28c1e673b93767a020a6f4297dff5b769882d6550eb2cd293b232123223fbbb0f0e0d54893c98ae9f2e35072071a26171967"; + sha512 = "07f817b7c3229ea993d65861b75c21f37e53e20db2645e68c90a1fc87fd151603580a1ecc67c9007284ab21167e781581a7727a885b760524ffa7079f44986c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/id/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/id/thunderbird-68.8.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "253cc87eee92b10d9b74e7885e43d5d9b146694bed63ebbb1b5e63730b18feeef53de4581ae824ded77a5770c45fce8b46d90621212d4b0e1ab32ba5fc7df1b3"; + sha512 = "3753ae5cd20cc6a65ff1b1e5484fb596dc08d1a08e6747295904106db0f231006328e0a906d0f2d7fa98c53352cc61351eeefc32b8f35bde2ffe1b8c800d7640"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/is/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/is/thunderbird-68.8.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "0e0784865fa1f0b57f5287674c94993263a03b8876fa6a053cb9bd52cef89a93a07dace1d2425ad669656ebc86a083e37faa456ee52481844e8e8e7fe87f3c85"; + sha512 = "26b1a7169221df476224ca5e1d9e5b97e9cbb8d84bbc12fef19685916f7b8e95e784aef6a86e7fc0078f9bddcc617823f2ca2af9de4412431e878f6efbff6fb9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/it/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/it/thunderbird-68.8.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "0eca59d5adf138f2be6b9c2cd11e51252e550b711f3f6584e6971ec3564630eebb7f1774dfed4f79c6b38f3218420825300bb447b0bddd0e16379aa787edd0f8"; + sha512 = "96049256ede8fb4ad1a6f20e3bf2d8513b21536c9dfd2acfd1679c41d25cafe5f938ed7cdc2bd0b11bdcd0a13d730f1d8056e85791211561ad4b3c1017ba23b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ja/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ja/thunderbird-68.8.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "6a112e7ae24616115f6b5dadc72bd30d8dd046b8df16ebae1d609199d9467259f83b354659a1358d70d2e1ad8c52e71db9991f95aff6f2864649d539b9f0f139"; + sha512 = "df162eff6af3bad1cf1a9ac359f977410f612885f005c989e928af3464d3cebe7511712cdea4e3951bdf4a69a40fc68e2b4f5efb35f25375f04bfae79ab70eaf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ka/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ka/thunderbird-68.8.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "e2c71035f910648cc83d92af69bd96f3a7668be2ac4ddfcd40c97762a1fa4e94c7d67b9ff588b27783ff943330ee07940fe0f8bf1671dfd87dd34a23b78b55cf"; + sha512 = "74186db28403463f9bf8b41242ce7122d410106c21e369977b73d6e72aec9bdeafb3b47665b0450f5b5eaf75c515759e3d6752d0743a2b598c4c7158c47bc7c5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/kab/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/kab/thunderbird-68.8.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "4e1a72147657fc0706f3cd4c4511fc22949fdb5e90e5d17a080b5c814240451d030ccb4c287ec6901d1dfd8a7ebfd74d59e617ca73530fd20c0b4fad539f9154"; + sha512 = "933fe5f2ae31ee322c4da4c985ed775f8a15b0290f22c2e9e6ecce2f856b0d1236a78659ba3909c9ef97fd4de9634d1ed6aa452174fc987ccdc42b0b65de565b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/kk/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/kk/thunderbird-68.8.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "61cbaa5aa674a4b6a34869f271d93234d874fdf49231b0ebf3c882863b294a0e2e0447bc81c8980c7f27c5dda4e8c29ace091c7097870d4109aa1f4718379099"; + sha512 = "b7ae4f00d7c91e8609ba99592feedfe8f53d4257eacf0a6f206cf768cc4ba16abb54c86f9865416f617b1417601ce4408ba939d065a0a8d3e95aa38ae17444bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ko/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ko/thunderbird-68.8.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "b2d3be58c8af63b3a94888e8365cd7253858733686ee30776c61ccbb8e05db57882158ad3a9aa5af6e319c875e870bb52dae9dd8c834ea5643e811dd948b6fd2"; + sha512 = "6f2d017af8755980f39fefe0d78b22115f33c7397917fb713c8e4fe34e88c7f4d0d6ce58767336dfe3f99d3b4a06b34305f92e4d414fc755a885c954eea97cad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/lt/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/lt/thunderbird-68.8.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "e878eefffd3ada9d49c3a692fe1a968159d8fd23ec8660cb71ce8019034e10c905f1acb79c6122384c7b18f3da3d1e6b91e31807c9d88ae799175fae2ef18005"; + sha512 = "8fc98daf3fe5eb8844d02cb56656aabd260d309ec6ac59055ba0f10f7470292bf942be1647b038103ff99c12cb34e3e03bad2fc8dfbebef0e356ecbfbe93b354"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ms/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ms/thunderbird-68.8.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "1d6094b7ea3fbdd40d278a60684b2e2357c1608e3403037a761038460dd1c89149f3f010a9f93d795f3f408acb81c3b6fa2b5ce206f5550352db6391895fb0f3"; + sha512 = "5582840bff43eccb907187930286c47c54a10a9a2af1af3e23b61b5ad56ed3eff32e9b488f00a1e2fba7a47fd647e55f0562adf4c01b1fe843f8708e1dee859b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/nb-NO/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/nb-NO/thunderbird-68.8.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "0deb1e4fb220c9b17bd68ddec7bf4569ee8425528a6586f5cdadd17f7c1948f933070700d36d7c6cc9442c172d6bb302d2681716abac131c9777d8b57d4f0a4c"; + sha512 = "aae8ce8c919cc9621e99af620959427e732d5bab1515676b9ee7b7bd2a6d46af7163677f6601a52e2aa246f619b2206b7239663660e4bbe8dd2ab558e55c073d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/nl/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/nl/thunderbird-68.8.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "24c5100339da2ea1df96d515c1529f02b0132385e141520d7a2c94d194ca71a634310eb26f3a88ea0cd6a8ad0a56f33ce5055bce19c68e3465037afe33a85550"; + sha512 = "7d166e84b3406ee0c5caf2309aa005c22779a78e7074f4a061b9e6df50722a95be3977802fafe10bc367f90e8a4e77895b28e2b6a2650b066d2d644962ad3557"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/nn-NO/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/nn-NO/thunderbird-68.8.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "525675451d274d17d3b5dbd1d3b75d3475b3c29f32b5d0813c71d5cff6c8002f35038ee7801c245d0b2cefa596ba4288c4287a6fed66905b6497591cca96be61"; + sha512 = "ffc39e7398220dcf4deadd24aa63a0838326bf2b24c58d0507c00169b322f0e56c5d803c1b78c9bfbd8aa345122c928fe688780e6d5ef238de9e399f40998bfd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/pl/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/pl/thunderbird-68.8.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "3ef251ebd90637c11cb64f00f429611a2621fc5841e91fa51d7a3ba97d1244ddcf383c8b0011abb009935a59bab58a3bba52e3c4db05483b28c400dbd500ba42"; + sha512 = "f6f2302693af1f466733244f1cde764b0aed0b64afef085e91ba9f24c341007d8e8ab4ca58e777c307ae33bc5c1a78670317393b601d6fb2851095386d7dcb1b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/pt-BR/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/pt-BR/thunderbird-68.8.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "fe80b879e307d6ca192bae16e13df892bc837e0e216562c4a4ddf7ae3c526e2967cdf8f8291e53a450f70759025303b2195f7e2acf683cca9d8620a00d8ed69f"; + sha512 = "f14380f5b22e9743a0e3b0c390ba4ea1decbb7aa85c1bcecd42f967e5f90416f8904b28b3c5f4b8fcebf55fb07505b96d9b9d8a39d99da5f8725b6bf48e05ab7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/pt-PT/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/pt-PT/thunderbird-68.8.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "437e5390889424f126a1a229bf8c66881ac4a98d300f6308e242c5f2386d443c1977c52f78fe9e2b620952d181c14c35692718ff447d267c000e1ccc8cdafd5d"; + sha512 = "215fe20e131557f54091c80e7b2c09c07bcdfb57bbc145964ca37e66b39add37348ac0a08b6c46a6186e25a864447c8cbe2f485fa04687c4cf8e169a731bb8fa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/rm/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/rm/thunderbird-68.8.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "d76f9f0e992da2e28e69b20a1ae532c8e98415825d41ee5716c34639abd1a3bb456d8645a108d17423bfac848f8e8a340358ccfc2635794cc703764d6f8de0a9"; + sha512 = "dfb3e49c940b0332753fa9d2347ba833c8243d1f006fd7e463d514c38cd27a14069ccdcfa60847bc6bbdfac1cec95629a2ae699cd702ef1f40e4898fda4961f4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ro/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ro/thunderbird-68.8.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "0485cdcdf247ed4bd67420fe7919f7f9d845e3c369c80960d92e448c48e3ce7e55c03ddbce16aed6de84da70a5e7610d8be5f55c5f53dc4568ac712b92a7153c"; + sha512 = "57d7bc23aaf3365b1a76f1bb8006f725a620d14773886dce9aa9bb4625fc062af08bb6bbd40248601569d7aab2a31794bbb79f7b208f36507c7a919d14872a8a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/ru/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/ru/thunderbird-68.8.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "96b28866dd1e4b68846cd88adee09e4edb60af8d506f42838f3f5f1dadd59ef5339e8c331b2a8b6ed0d1ff482ed48d83861b9db174b28dce5ce90b619b3a237d"; + sha512 = "5e85808686c79ebd323990ea2957c10714281d3f0d4a9b097d2e3820769bf1406f4400ac541eccb5a817a6aa639048d1767c2cf4bfd56a3262ac83ce01516275"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/si/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/si/thunderbird-68.8.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "0ea525527ab09277fce4202f488778d838090d2d59fcb2f049b1869ff0a6d50f54eb22449dbd1063aa6b15d5e559dc119e36dbf97d8a7bbf22e9ac4971393a1e"; + sha512 = "c4b3b8d62c0369c95c7f498eb319e839688b27cb23a49d15d9a4e15251d7555be7f65ec9a7b19237921dc71ec6dd5cbec02aa4bfc6c16382f917e0f66b1032bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/sk/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/sk/thunderbird-68.8.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "26280b266d2a7956321854ec57737d8cd4ff6ecc938ca07304431e6f351f73ea43e2213e28797d0bc994e0174da41108421a957054a00adca97cc630c107e4b9"; + sha512 = "3cd7c89db92dee5ea3ce44df89749d5822659e7b83bcdf56ebcfe0ffd295393c9f5acea5bb836b5bb0a0a6a69e6ce1406efb39d2943357086e14a3802d9181f0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/sl/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/sl/thunderbird-68.8.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "3cf380bb8bab8917e3643eaa337e8382e73802d725ca6134e73fc9d991d9e137b6681fb2aaa86aa83cf6766c3f536406298a4962b97175cf63bbf81142b75618"; + sha512 = "d08549134713d50842b82d24ddc8f8fb5ff098c41d3baec30198e43435ac73cc620e7d9375a9aa9622e991c38e4e36241183a026b6aa63420038694d74833180"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/sq/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/sq/thunderbird-68.8.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "daeeb1a66f65e2da8ef2a6e3c59eb07bc341bebd19a79cce606d787d16f674e2d52decb17ae12125a7df78ecdb7c7a693644b17aa726ce1fd424fd30bb05ae43"; + sha512 = "9c6849fa77de94df39d9e2615aa3392dea0f8adf7e61b0171243fa202b6747a4208279b0c0ce4b05f57544caa69a40641a3b145726d304df549f2b4e75d939d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/sr/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/sr/thunderbird-68.8.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "01a71c036d95587adb010cdd0f0641c4559af557c3596b16e43d11accddf64290d06ed5b35ab8d0b640b9242157b04a899ded266a47ad7bf2a07e3b923bc6fb7"; + sha512 = "b52b146a4a54c4987d430eae6d7e922a0a43e57d38ef2956e84b4ab50bae2a896ad1350f98171f57b2e4cbf4a69f0b1123a540e4cc582721cda391b2ae7c7616"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/sv-SE/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/sv-SE/thunderbird-68.8.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "28abf6b95fc03abd0f8d5008a1a3ba5b46138a616750b20e8f7be08fc2307cc75ef0e1ac3b8e29e37542553de502d07c092a771cc94c9b794da6a5bd268e3c6e"; + sha512 = "73767026562ca540c6d3f77792a29b55938ba5d43bfc59d5a020809e020cc9e7c9fcedad8f0653be71e54c44b54374aa1e1d4f5a6e44a40436cf0a9b59e484cb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/tr/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/tr/thunderbird-68.8.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "a7cb235bf1db3dfc5f7bed0fb92c327fedeb2f319c602bc13727b3c452305345a053405f77895611d294578a96eb8dfe7c7e9f008c531fa2acddfc81679391b6"; + sha512 = "4ce31c5bcd8075d3f6edff2f8266c2c6546e4f19b8c00486b4dd15b68d7ea898b6e76a5745087c0c4a41b3462e4d8facb7ee0e9e988b8b76ff2374206fa3cd62"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/uk/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/uk/thunderbird-68.8.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "0fd2ea32ce4ef03150db5234561546f45724e399fb12967a4ecde42149a81f4609505bd1da5cf85ae745e71768b93738c2885c4c7ace9b7b0063d6ace566bbb5"; + sha512 = "affb8eb4049a2452a4f17a405d6228e6debc87802b77bca55848b66fe136ab0eab6bdb64817f43fc25652109fadf1dc830fd7c22339702684916d7cd95147e1a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/uz/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/uz/thunderbird-68.8.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "4394e70e02ef67428b74af0b1d35ea06964b71a23d5a0d73afa2e6fdbe8d23286abde651b17a48a2353a1ac762d5a8b169f8e699a79644f00340b05e204f05c8"; + sha512 = "e4a6abf7ee0d6c2c0c7484911b025cd40b4f2d0fb5715a6333430336047deda5721f19abb3c5bf49ad3d16b0d128a495525fbf0a23bab7b1bd8ffd8539d17054"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/vi/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/vi/thunderbird-68.8.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "e1eeb7b46a9ece66fc40d2d58d2781fea4cca320a97b6cfeddd02f3f6907b44539f4400390467a794cbadde50c8ffe350fb08d8012f207db60d36a61d205a368"; + sha512 = "f58a50ed7505be5903af948025cc2cb15cd6a3370fa6789f784c3d2cf512f7d51a03d7961ede14e6ecad87cdc207932c90741cdfa7325ba67bc44ff150f39b53"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/zh-CN/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/zh-CN/thunderbird-68.8.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "ab6839f46e41c14fbc588a59044496feb3e8a35aaaa1f0777212636e9b4dc5a6640b34a3f1e833239d5597f468960a947c0591373938306dd8bedd6c6e13283e"; + sha512 = "609d4b4cd3ff7f1501e7ca6e247ed29e8376b8bafeb140cc134565fffaf65b6051c158d8f4b90fa2e15b3aeb9bb92897f708a00d666ec2eca490c7dd856b28c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-x86_64/zh-TW/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-x86_64/zh-TW/thunderbird-68.8.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "4923f6c790335820811bad56494d24a5899c1586ab2344b3e2fc81a91651d9de5b378ec6ac0ec68597ee83a8dc0f24ef084a41bfcd98dbde128cf4831646db70"; + sha512 = "78bbba535a4cc284e7fde8c96739c29fb6998a5aa71a4ba424121cbcd0a44168412e54a0590cb6a1d7d9bfaabe0ddd343ce4cc4dbe63e4c88d99451ac6823143"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ar/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ar/thunderbird-68.8.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "91b19e61a360062d71e090d7eb8dd78b1ff73fd3e7733573ff1ce6ef4e98c13fb297c219fda8c43c9d80299625ea8bf9566e25a5546f28d010737a399488f3fd"; + sha512 = "1e5d29f706216ddcc8887e17826af397b54fbfe75d4b5c14a644e6c834eec60522ba401392977aaf40a6357713af68f274442288a01db65430acbd7549625c07"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ast/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ast/thunderbird-68.8.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "2edcc3b6d7c51c79b1539fe8fa4da53003af0379727ed658ca7523d608c96c251e8be6fea004098609d5b854ebfe6cc8b81830f8e1d359386edd2593f3eff6c7"; + sha512 = "24bab81e6d36189635ae8f0da6f0153f1ef32eaaee388dcdb9f9cb5049c586b01e8de2c79372784645ba42749e48f1d77f7a91c857df69ff72566969a68619dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/be/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/be/thunderbird-68.8.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "84a76ba8031d25f6b097f66e4b0c74359ac313f25016c3b82e547d8e973814d8398697572014590f23ea094aad7941c13cb4130b618a776f6c4973356cccb30a"; + sha512 = "70a4a9881cdb15b68c5fdcd85ce6234644119bbeb1a3dfdeb47899515303bc65013cde6fbec7d4b2997acca18abe298e9fcf7c7e236931a9f06b7f9c4a5032ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/bg/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/bg/thunderbird-68.8.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "b489ff67e47eb1d431f5b2f59f0d6b8cfcded889e167cea3a2d602057264a402769e44191ac015e15930faacf7acd9f1fccb87abbd438e3629db7b795b8fe43d"; + sha512 = "80a0c836a7809ba49d067fb76fbb639d653f0a38cd77034d3265807da06c3212eb5c7cc522793fdb22c80be65f763a25ba55775d67a6e8716f7ece9dfcd6796a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/br/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/br/thunderbird-68.8.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "3ffa33885f86bbf13f4c2a2bb15b864aec851b5558eba88e7a64e8b8b111169bf4e163e590491702465ec8436274ee72dd140a0bda2c9ba39754145de5501388"; + sha512 = "81bb47202578f138e135c7f4bc30af3a3ccbd3dbf127dfbb47bb6ff4fbb09c2fd54c68bc65d81e5c3e72cbda749bb0d69cba442e0f7a5336ffa6eb10ab9af4a1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ca/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ca/thunderbird-68.8.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "fad5eeda16877f0bfa5edfec10fd8fe5baf16a112aaf56c908c718159b0bb6b72ac314b93584536ca369d054059612fbf86c396d076158b6efc7a9d9cd2fff93"; + sha512 = "61ae36d17fbbc8f91f517992966b59a687ce6e6c72f18cc3a8e8c6d29cb4dac18a7edaea2132bb258e77a0e6690df622aa35f9f0700d713c6411ef4363ba9028"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/cak/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/cak/thunderbird-68.8.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "f4a0605533cfd5b0806c8412514de4478c520f52903a07c809df136b443ff0734be917444cec2d4c73301d0821d77e585c96bf314ab17deec4b4bd5036e83a97"; + sha512 = "eb0a3dccaae4cdc70fb3a1f5c25cde379ac3d9be65b3125428532ddd8e4ff8c7d65733a2eb101435ae14ac06d1a4ea32c1cba40d8c114b4b8025287ac7fa85c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/cs/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/cs/thunderbird-68.8.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "319f3a63a352a2f7831bb6d2d046d238db4c136cdc256934ac19fd4e8421344c98b4900c57a12f49af77d1844ffc8e8c7129c4ab9557d590affd59aaa0229ba4"; + sha512 = "8b8cdfb5f0449e48ce50ab27f75dbb9cdb05ecc9df58dca52be3b72dc523d06248c14656f4a072645e5292e8b06a82b274307b7d4dec99228de7353b539937cb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/cy/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/cy/thunderbird-68.8.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "4aa1974543b568168d06ec8c0004127cabab481fa798a67878a9bd5c1955d98d14d770383ef5e6af35dadc106fb20da46a1744a7156b3bfc582e416a32df1673"; + sha512 = "a265e96a1ba45a57999a905f21e45edb457004cc2a337d2b84e2d55d2b2a0f71d1f20d524701a2287f3038f76fd814b051d46b1f130a40713d745b701e66570f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/da/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/da/thunderbird-68.8.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "c587a13d45f5a5e94108252d8dc98548583ac7f27b35f3fc28100df0a15f696c04c68a4f786d7b9c3ee461db6120c14aef2b6ee14cfcabbe855f16ed00660861"; + sha512 = "4ff53dc463e51d14ae4cb7935f44cf2d2624e98469d7dd1285c7a8c512ee8c73aecf0067c6a695024a6e0588b9f567ef3ed12ea9c72bb6e525af348a52144ea2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/de/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/de/thunderbird-68.8.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "5c425faa2c44d30b695ce6713b59e5720bbd8294aea20d1c7431f26173da0f6ca85b1cdb9f178e54ff670e109bc6c30abf21110df0c7029b5d5a01373c8b1510"; + sha512 = "aac47bce113450818c44d4c17f05be4a57bb33a7e41fc1fbf50b9123ebaf229d673484190538c6fdb6b1a02ad42e33f1644d4ee625707bd3776eb86e023366b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/dsb/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/dsb/thunderbird-68.8.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "6ad04e1e43d0a7e4821c584a78b476262e77aa5f6c7d170806eb02d74b0d831f53e66568917837d11c11cb5ed19b796c23ba6d496573ca1da7029fb1eedbad9f"; + sha512 = "35e4a54a82175a1f214a87718800a42743f81cd39e14971da9729cdcd863dbbb70d61d60d58387951cd3e470c764df22b225a4cf9ce894b97699073ca475d46e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/el/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/el/thunderbird-68.8.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "e9c7d89bbc736527ea9918151886705fec533969582ff37fe8e1acec3b6c1938fb33da4285c02ea92c2a87df1c6700c9c2223ca391ba342eb2e4e1fad8e06f8f"; + sha512 = "b919a771034e06e8b30ba9662930d7961fab757d2d6dd4603239063127702051a29c6401a983a0d0e4b232b16cf5780f8d1cb53037a22b0b2175653eb86e893a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/en-GB/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/en-GB/thunderbird-68.8.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "ead179d699feabcf14373aa4e02ec96f52e96f8a1413294f690d70608f2cf83fdfbccd1031f0430a0f3805bb230943d8aea269195d0f092334040d0c092cf9b7"; + sha512 = "70c979be649771596478d0ec9f33398baa862e12aadb5369af42a62c732f1cf40c3e1184ddabd12ac1cb4b21759d2b00f24c59e7f89ca6e221a62837813f9785"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/en-US/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/en-US/thunderbird-68.8.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "18309ddef56d0e7e50f3b5895e1c21c206b432da141c7517f9220686ada6523f7b0181e98a6722205bfe09d9023c4d2beeeb11ad60a7b6ec4242441bd60afcd0"; + sha512 = "a0750ff269b11f52d8b001274257c7e4e35fe356e7ee0d31bf929c9336e7abef5f8670d19541f45900192ee72417d8b90a388e17896dc279e78a15c5faeae929"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/es-AR/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/es-AR/thunderbird-68.8.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "d0a1ce2264c3663a529df667f800bb7e7ae446e09a5b0b09934e00ca18e523baca3943edf1bc2e3269a1b41399a47bd989b487e8650a0ce9a66b94b8bcb37726"; + sha512 = "ad524e9198f42cc06bcd6b6ea86ba64b4faca80e9fb5df45e34d49997d131973426edde698d3e6e9fd89f133e527ba7089f1c5b753f6614e597a74b80edb5626"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/es-ES/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/es-ES/thunderbird-68.8.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "5dc04a48b1997e0291265533351818b1912d73b9b002c8978f729006f7b406c03c27edf736a99d898ad9cb8328b40d732b27ca51e3f621740146b81968f87d8d"; + sha512 = "8bba8a570e58ba7e3091af1c1cea4fe6e4cef3ef2bd0ce14ea13087c80d3c01efe43e60497977be6ece54ecfd92d0f6c30afd0d561129e7589c18bf318e415c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/et/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/et/thunderbird-68.8.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "8fdb9911b0da646fca7256fc0e004530339f6631fe3a91e1c0857b52d3d7f786a6fb8bf83cfea9e3c4e0faf6093d0b3afcd46a0dd1ce5c1357a40ff217393d6b"; + sha512 = "ad6b225169aea7b8634b57f7d1afe04b99a358a9f010915f2bf9fdf898c0f6dbbf5990e114a220584c1aa06bf750c9fd426587c07292dfc7082caeed1b5f7cc4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/eu/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/eu/thunderbird-68.8.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "788cee146a94621d373e8d815daef246d58b46ab1e935b01dee3955fe695af43e7a482f287d611e98a376b137b5bcd5b92baed5ab322a39ef30d8815abff6640"; + sha512 = "73f6ab9d2f285f1848f25af22339988b2993fb12a9e458ca7c6c67e57aaf53b660e182c4a99f6f1a424ac0336fb7c9e5e72209444dc4e99a1b74df0062e61f50"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/fi/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/fi/thunderbird-68.8.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "b65e042905882d1c7fbc88bffb512b32fc91475b99c3b1bf6a4e10ed355f9bb3223a3c709273b0ad84c30ad3c6c405c07cb3e04eeb8a4938ec22bae3af4dfbe5"; + sha512 = "10f42882594f3cb3bc02afcfdac7171139cc11915440b7888ff9edd2d9b0a0a2cbc9fa6faba0f8044d085397e6a7f4fd4b5190990e5f67592ccb85dc24f0cc9b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/fr/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/fr/thunderbird-68.8.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "a85af36139d6f7ab6028acaba61a8dd47c2fd6ef9114b5ae8783c78c85e16c606d72b05c15a299d1a0beb518301aeb65d3493d518b270bfb97f22c88d23bbc0a"; + sha512 = "bd50ba42353e3cc3b709d1f6f0f16b998dce896ac2b08df9e75eee715e90df5f84b128861af69a2587c1b288774b273d2ae2fca6337723e105fe6b42da0fdaf3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/fy-NL/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/fy-NL/thunderbird-68.8.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "60cc189b7eedc72327d3fce18809403014cc6b2c4dc53617cc8cd589dade6be25ade584416f9be18830f3c7a6060fad3e19bb930a591f17fdb3437b4597f48a6"; + sha512 = "c5200ec273a85489e3975f87e0050a2de6e2033f7e5ef1bfe7416c4cb0abab8047cbb04b6b8018adf2d9ec9c2a2c362317a92bb90c43c2dab52bb4a8bab50ede"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ga-IE/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ga-IE/thunderbird-68.8.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "95b337d681a5292c0343bb545232b666268e5fbea0afd6b96122ff00e504da0a5628126a11495ba54d4e8500615d35b34de13851ad43f180bd9b5b1f584c7ec9"; + sha512 = "cb4886d2a9f20f6deb600dd3338268b160934e42a0b73e74600c35694c83253bdcb4d77ddb5292294d38da23801fae7559dc6601fa40b873c7c71e2cc64707e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/gd/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/gd/thunderbird-68.8.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "483a1bcc1a0066a962ed91c8f4c6f948623e3555d2977c593a473c5c08e12baf05fc4c043ef5db1fc839fb9f550764abe457f2d33e23ffc748ea6aa50d675101"; + sha512 = "49fba7937ca3ab596ccd656267d7ebb5592623a1a8a9143fe25f84424fb2a9d27f72f3fafeca57e204911208671e9fad7acac97d4202a9adf89a7640ba001411"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/gl/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/gl/thunderbird-68.8.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "0a88fc59510fa06757dd1b6994be0ceb8a0ad2cd1246077838756a0d65d6c01a64f8c48fc8ac87690686bdfea8c7d0b44e5fd96feca4c3aa59d6fb43eaeed3f2"; + sha512 = "b80131b5ced22d861fd2e6682149e2fde2d3106d2b4d4f528d8620b400acda0db497500bc489b7806a942dffe5001798a05a440d0b00a56879ccdfe81390d353"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/he/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/he/thunderbird-68.8.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "9c2ae42cf2d43e4ae9d0dad829871b44321b2cf49cde1f17568f96c4d6a69793d78c9b7a72cb29b71c108718906ab749f006f7c727d6f3892efa3d56d0852449"; + sha512 = "601f99613725276d801c8d0dee9ad25f98ffe8ccba42620551f5a41e02b6abede34547857f43a265f12be01ccf4b3e4b4479e1ec6f8ab5d3b5890f230d4b43b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/hr/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/hr/thunderbird-68.8.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "9e9a949fe54c23a0f73bcb05a4fe2b212c6701cbd1d68ae10dba2b62de07fcc5dad5210de0ec3c3f684f06828f8fd1c420712396e5132da6053de42f319d6454"; + sha512 = "b9c681c4b2edf89f789cfd6bb703670aa62d8e48bd6afd8147409a1154d01f1b59933acdcd0f1f6b88ddf131031a64237958ffc25572dc818b1e06f9c8cace4c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/hsb/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/hsb/thunderbird-68.8.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "0d3c5ca3ce6a9becaad63b2d7bf3e1d4491cad18201e1ddb634ad80d4d9d9d26c95b02034888f24ce50c5390b1197fe3bbd69525bcffd5192d95ed35203515de"; + sha512 = "a512ed1d095bc1077836486aa40a6f223fc2c37cada6bd59d5ebafb8bf17d47bca0acf7ef007dc6adf8141db2b81b6a6304bc85b36b929bb2b1375898e67472e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/hu/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/hu/thunderbird-68.8.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "4519acbc2d00cb1f97d73f17b37db4625fd16f7f25e628d5309bdddee2012feb2133ce599bc69eabb22a18f015a00c8e98d6804140ea1ae41d66f59164355f32"; + sha512 = "3333452d03a2e8436bdd8e7ed0195553d0dc86e74d55903aee4484d5e920bf81f979c4a482d5e44be6dd6bbdccd85d7d50dfe5d58c6590c5ea95c8b5164c71ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/hy-AM/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/hy-AM/thunderbird-68.8.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "f60cca5cef19516a5c6e4b22962567c0c0d22035ee7583b0d93a4db0db7f625ed0cfaddc78f56621371d0a8b6341948cbf9171debe81c222d170af2c759eef36"; + sha512 = "e6a01f614533824e9d69a4feee3ff483ec57f42415a1854db4125479d38137102465050de140d113daedd6d0a4ede83f5c3aa5e9c27fb77f368c70079eb90c44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/id/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/id/thunderbird-68.8.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "75adaedcce7dae3998a063794552d3e5fd69e037422e44fafcc7871a05cabcb592c9ddb637c1f7b0639e03f6d0d99b262679087df2d6806fe2a202121cdb5563"; + sha512 = "4c505da3cd0a57cd0d24199ad3df92b5ba28f0bbc3410e05000f1fc7d93bc0228b6c16e1ed4852d84e2f8bc25c15886312bc471538ec12ad3fcfc8bc7cf1f852"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/is/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/is/thunderbird-68.8.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "b80488a594bebecaa139a2bbac76e3daa0d3a9f3257cfdc2f6954f8cbf427c3b3ec1db3d1f55b9c5e8c37242778e53904b92adff1cb7e1907142008e69607ee8"; + sha512 = "0088ca68a63d53f242e82c3d304417a3503a78301b6a4c1198671e55b5fcbcbf75b874ed783ac907dd5ed3415b955481fa699e0aeba0062de7de58e4ffa0eee1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/it/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/it/thunderbird-68.8.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "c8a0f75f6467f6428103c98e97afce1690a0d986ea6466dbfbaa2eba2853d8f7a1e65c568d10884d6d4412fcbab39e8743d3e3233ac16f69ab57a5f698c3ac5c"; + sha512 = "1f70db3fa112f208a395202b18387fafdd8abceabce2717d33b295cae441353b759400d8ea5aacce07481f841523d932004105eed61551ec6271c796fdb6aec0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ja/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ja/thunderbird-68.8.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "b1abc4fb9e7af1695ca2a4fe88d2198876212923ae10977b0caedffc96dadd891fe6068fd8d53c7cb7667854523197d1378791fb71c12eb817dd9b6e338eb3a3"; + sha512 = "3e43f8d7e52ffe9b7e7b4817756997f68171d08717020406410ffe999a55c9d4f83f1f30c7cedde4732923bf3ee3385828e6d0ec49f7e69d87cb97cd9f083d25"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ka/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ka/thunderbird-68.8.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "11e56137a0e5f9f6cc4b24e02861e6ee4c451280076e9efc46e1f28066862b3bd494ff7388f6be736be3dcf6412c5dbd141546dd37d6351aed54790deff841f9"; + sha512 = "3a1a8eb0c49bf963e9586c42128d2574dd04ef775749506e09f4d8d8256ffa5690f5c5e21d1cfa304c298388028e333ea5cb1964b6ff9b97a1f17c00e581ce3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/kab/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/kab/thunderbird-68.8.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "b930bd22990497a66cc9aff96f0c9bbfae4396fd9b4397893db9c72b59b602b45f6ab7388b8899890e151bf8dd1e0b788d668cdad607f4326794825508d36ebd"; + sha512 = "d977575e4723c643c04209a875f15e6b7a00133c938dfceacb4a896bb65846348511ea2078971eb3b8fe413c484aab035134411d615d7c153b69452139d155a8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/kk/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/kk/thunderbird-68.8.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "17b7ec790013cdbad015d3045ec8d4c5ee6d92b1ea9be18e2b9a5d7776f53c7b621193e7dec418f86be25e3d876e4a9cf9c8ceef0cac4051461afc1a51498353"; + sha512 = "5cb567862e9627b9c684045dba9342afa6f1f78064a941f19eb90e8c6ce30d102a611dae85ec3c6ca271ec57fe0fd2b7df07c1aaa8f5bc93c4501cfb0161b55f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ko/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ko/thunderbird-68.8.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "1030a289a2e0793553ec3bfa8ac1b3ff3bfac3766318f5ffd9e6eff1979481b327a90a2207a5c16ca33719675c65e20d58ea8074fbd5fe9877fd334114e9b5f2"; + sha512 = "e3e83cfffcd472b22f60c3e65b458e534c7c76d8c6b637c69b7e1a062b11e3c7461cb8f3fda21e7f0f3a9512c2d713bc0d40a84e235dc6807ed6d7e96d9a4095"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/lt/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/lt/thunderbird-68.8.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "e433d8933c1d4a41e70ae2a8bdb6f1a502d478aad1308e1f0e8489149371893deea61fe8339717eb22996d844a5a6bbef916ec6c468a57cfbb7a54751bee2408"; + sha512 = "5f1438e9c1a71dbde9abd06b34c8d384fd3923ace38ab643fb0b16352c54efa94db83d4a86573b59c7f9bb418e23a6c158f3a3744b2114f0c535cf49e90f3439"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ms/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ms/thunderbird-68.8.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "31343703e214decf4f25d724507dc706cb6c47d6247989cc2019841175099a0c328fca562fbd257f0003ec6a6fc8cdcd632c141de13e910a6a7b9c75733998bb"; + sha512 = "87e8e1fcef966a7a14700ea4113f28945bc25eb1351a67d2eaf55b9d54864de98cc86e494d3ef81a075c9bda8f6018ed3273796e422dd304abbfe1740ad4cd2a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/nb-NO/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/nb-NO/thunderbird-68.8.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "e79708c309dd16d23bba5bc0e29a4f5b426a7dcb7dcd56b86c40875abd0d7fa532d9ca8c8b5019552fa0d07e5c4686a66f0a4173e2fdbf8865d3921c8b29f327"; + sha512 = "9ce730dbf2e80c8badbd9c8f3277648deb44b00fb44d367bfc9ff8894ea7a945774aba9241300b01b04617040bcc82f7e65ae024483205a707cd1b63f585e0e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/nl/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/nl/thunderbird-68.8.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "8c268bbe04c30a3dbef069add7b6e47fc576a60d0709020d0aee03b0be634f0fbfd4928489fe7b984a8c54fb1ad9ae951b9dd0c0ba04483b35a242bbbe3bbc19"; + sha512 = "aada9422ada20cb8561da823b6a240a30c155cea774b369649f8423f6659d6bdee0d2b6ecba2dd0c64837e04e6e6a60235a588d1850fe5ca8a6b7a9d1dfa5fc8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/nn-NO/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/nn-NO/thunderbird-68.8.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "9c73e09e4680f3c258e7d25691dffaf805ca6946335c9c30ef091a739d7f87e0f36f5328875ceb2b7f0f2cee2bf16fe1401411f11f4e5e45ca86837c4e207d79"; + sha512 = "adb4a038f4cd87ba6ef425911eed240adaf23a23d8719b5401b463578f9de7ad049a76ea1b9b9460afe7b18aa86a9be4e39eccfa42d0be7609077fda9c3381fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/pl/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/pl/thunderbird-68.8.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "6dcb19a95e0bd8dd783a420c3f06e0980c5706c065397d4ee424969bd84daf783752d55153808df5811f656d28adeb15f826b1d4f2b9e356846c6b1c01b89a04"; + sha512 = "40fd0b0123f768e66f669566395e151a696a54445daf5ac30cc6e4dc42e1aa20545c12ed29bfcd0b3881928242b0d12bd7426497b7401ae6876a1a076a6d8dab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/pt-BR/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/pt-BR/thunderbird-68.8.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "99deb6fe54bf1f9bb1858f2c454e44246b34bca6aaeb5322db57d048acdea5de853d439d4f079c3e2587174364ecb05861cac461a34dfba495eb747bb8fc98ac"; + sha512 = "603f026cce3a097fc424e754393f9699f3a8639ccf8669e58ffde5eb7363071fc87ffcb2fbf1f04866cb403a0d08d3c8bfa801a0ea9e4290d63b106f657d7aba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/pt-PT/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/pt-PT/thunderbird-68.8.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "fd0fe715c0e816e6a92b9cb6a2afea50952851161cdd217f764cdafdc529f7cf0c5a6913546b81fc1d9532de74eecf13517c6eb8380ab5f920487df4c26d331b"; + sha512 = "3fed3c60cf4c77bc1336db22c65a0f84e4f2a4ca0476f016d289f5951b48e96394365c98e5025b42d51b8990a46151d2cf00eb3381ed98ac96bf3760b640f91b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/rm/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/rm/thunderbird-68.8.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "5ff0306c7c6f88976f3080d34690e4607a74730509f9f43a0ba56fb9e5b9cdea8e85a4137333c150110fa110ab6d98cbbf265ea07ca439f199841a82af500152"; + sha512 = "87ec8c6e2358df02baf3bd6a2241c4e83a4441be6c9ff465da9fb0a992d316ba1a3f2e5b41d7186769a8c8e4894c04158a4497a70a4c6c82a630954d5758c1fa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ro/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ro/thunderbird-68.8.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "9240e285135f27f82402cd0d3374f28d293a29c904a503297014802554e8257bf95c8d0cbcf18841c44d1012e0d3d8067ab24186317cb4f42f96dfeeb65255b9"; + sha512 = "0b740488109c97bf3a54d87de45f14063ba356d26da56651de7902de4264755f9837f8910a3b524ada953e6e1387d43c0f60572673af2d1cab0e6c7bdebca67c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/ru/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/ru/thunderbird-68.8.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "0c90806ecfe1e4b2e4d17ba01a5945bf5c0d3a0e7b5caaecd36456286f5a1ea597b743743acfbaef585cdc4bada86e6f194608ebe9dd2308f24d093fbba49fa5"; + sha512 = "16f07bcc8bb6f49754fe6741ce2ce0f77d44dc6641a37b9b9fef601604abbd9c44861d4540e544daf67c871955cdcf141ad1db3ac2cdcc0fc371638bb0aa8058"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/si/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/si/thunderbird-68.8.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "a10ab6a050df683057d4532c0c1ebfbed80de96f6831ae60e53f4e4fe95a342ce97b545c7a658fa092a7b9d4c2196f4bb296e4af9b0c7e4183f112ab50b464e6"; + sha512 = "cbaeb62f5ca1ac9ea731e291d5988044ab86f7c26eec99ea4741f0db200685bb88b1358c4d29f1d641d01947dfd1ce5eccd971131e49f4373fad1074f15c004c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/sk/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/sk/thunderbird-68.8.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "1aa04c5702a89099645616f7aee86a507cc5c54f3a62696eaef17d6ca161ded644285d77782ff940c2ab128d2ff9f4c5b385999da9de678837ecf91d00f88f16"; + sha512 = "933e45cb5ee1832ad27aefed0ed99077957374727b00a227ae79a004add3fc395917e351d90ae522cf98fce50aafdccc86f3a74e5b4b7ec2e3fa5a9fd498a5df"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/sl/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/sl/thunderbird-68.8.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "afacff8423baa933c6e4b2282fc112636876dd97e607e9a63675fc5232907bf7b06dc50e1377aeedd3cc56dded6f3d71b47aa774dbea12217f6243c6182a2bf8"; + sha512 = "b46ec4da60c666ad13fd31269c3e06e5b50b6f5d37ef89a4cafbcd7d30f60dc0b5de5ce318930ac0aee404c2a72eaeb97698bd2a1d077ec29dd0335256af6e40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/sq/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/sq/thunderbird-68.8.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "6036f12337b129025c34906b8df0663ae210294d3914cceb9f97be907f058e9eaeafad2aa2e2c2ee79f83be3659a242ab2135cf7f240b34eee24dcf555aef40f"; + sha512 = "fc4bfd6355fc462fbf196f326291d98659a1c0ba4a5d4d829ec9b184917e524d925b301b2e1aaf3f03b334786c4974f8e2f218c5f96d1ce71a6642c2f46a53c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/sr/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/sr/thunderbird-68.8.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "c48be7ba5b42ebd244c59a6188be08236974fabdf7cc30f3473add6b215c6c7ea80fd4ad4d739d7e62fe2f1043afb288d2a6f7e838bf0e17fcc68b5340806e45"; + sha512 = "ef76ee6b540bed79743d223e80f997eb8c6bfb92085659df72d8360c3883ac4862b990334ed9412a2fde7eda01ea0a1bfc80adaf581feb54d5031c2352dda89f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/sv-SE/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/sv-SE/thunderbird-68.8.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "c943304a7f40e715d1fb1194ba7f306538b917788306f02be10a86e1d01baf091b1bc58b417aad7775fba58cf90ddd8412a56cfbcf2f12e4f7581be34c328205"; + sha512 = "f431dbcba41510823b489a80699af68c32801b3a994ad5b596fea564f007697c26e2ce3c8cce39f9b56eb102adf6cf701ae8cbefb7bee84e37fcfb91a39a49db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/tr/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/tr/thunderbird-68.8.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "53d5c9d7db4a44ea3858c55377c0ab8f8d359440f86634a0ff5eefdaf0553dd2c7a9ca66112a2cd4fe3a8e6094cf9c1f16fe01119ab11f1a039f471fcba37609"; + sha512 = "021b6f44f576e1b35e6e74d0ca40ab8b48def0f8f0159e7864929322cea2aedaadc3c9aa5e7294c1f91898b4eefed6f1032cf26afb560629308cd2ae081c56fa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/uk/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/uk/thunderbird-68.8.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "8204e0ca96902f16b92a6e02c09a788362359af3a6566f8246055727d5a74736d0b9f8570a4671a1f69233a993e25676c730001dfef9a92d034edcb8b12a5f7f"; + sha512 = "a2a14df4f815368a798f035a6d9a917bb88ed7e954e1ada08d1dd526b0c8e93653da2cfb7568912f1416eaa2912ce394d334a3fc38da32c5dd8cc9e8db920b4b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/uz/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/uz/thunderbird-68.8.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "496d82507602cff8e48f43b9c63a696d24020b804ffda45f2027103c5f3768543db0f03051ef062e0076c16b78b31759f7d4a4878a45e7dfac1cc0e4e9d046cb"; + sha512 = "2c63ab4db77702e8e975809f71e1a64fc2acf0bbafc8d24bb407ad5d3b79a9a20041320cf1716b2555b3d6843acc12762a07db4857acd6c1009f645198290a25"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/vi/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/vi/thunderbird-68.8.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "f360794ecb21ed3f90552797269ab6e89024591903eb53dcf6216b25bb4dbcdf94c2526672b94ba979717f90cce5bfb6329efb3b5a2b9bec7c3d4d06d339ac9e"; + sha512 = "f68610e7f1df34209212d8db6620fd038b1e8f6a5ef430b8b23fb1bb9a3f51ce5da8b98e576561693d0dc125e5d428246e4cbfd38ee991e3d3695dcbeeffa05e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/zh-CN/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/zh-CN/thunderbird-68.8.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "ec7274b2870206647fd853c30db4e30b3856896ce9c89d5d825363e9d4327d23a230c899abbb740036a8e060f1532007ba5936af010feea85318bdeb18f29e0d"; + sha512 = "42bab5ba6dd11f185ed09b1826c1578b9f90caf8612558e6d4bc09038181f9559bece41eac9fb2060a21ddc11cee9522794fbfba3126b750ad1a283e3557be14"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.7.0/linux-i686/zh-TW/thunderbird-68.7.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.8.0/linux-i686/zh-TW/thunderbird-68.8.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "f0fb6deda0813516753386ae69ddb7b6dce95ce89c6dfba3ba5828d80d9fe92e3eaf014e89ab56c4548d39932bbfe12d4b9c6c8ff66b77a9ebe4f7476a9f6be9"; + sha512 = "6f6f5365976c0eae38f26e83248c9cff718433ad4d9757732d87289a876f3c0023df71907ff43434ee0dbf5ba8ee737a44f33d832979dc1e260edb003702f817"; } ]; } -- cgit v1.2.3 From e50628419327611ddfcd489772b3afcf217a2d58 Mon Sep 17 00:00:00 2001 From: cw <789@webuhu.at> Date: Mon, 27 Apr 2020 09:20:33 +0200 Subject: elixir_1_10: 1.10.2 -> 1.10.3 --- pkgs/development/interpreters/elixir/1.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/elixir/1.10.nix b/pkgs/development/interpreters/elixir/1.10.nix index afab770da35..d63a94d98d6 100644 --- a/pkgs/development/interpreters/elixir/1.10.nix +++ b/pkgs/development/interpreters/elixir/1.10.nix @@ -3,7 +3,7 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz mkDerivation { - version = "1.10.2"; - sha256 = "04yi1hljq7ii9flh6pmb5411z7q1bdq9f9sq8323k9hm1f5jwkx6"; + version = "1.10.3"; + sha256 = "18bqqqzvhr1zj491wc3d36a310mg1wcs12npp70zfmgqrc60q65a"; minimumOTPVersion = "21"; } -- cgit v1.2.3 From 0fd76196f99f8ce5b780939a61c45f08ccaed043 Mon Sep 17 00:00:00 2001 From: taku0 Date: Wed, 6 May 2020 03:16:27 +0900 Subject: thunderbird: 68.7.0 -> 68.8.0 --- pkgs/applications/networking/mailreaders/thunderbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 19c572af279..2ba2d2fca63 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -72,13 +72,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "68.7.0"; + version = "68.8.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "0glskn3djf739v2dphs663a2lfg5b0lbk1vlwwbzwfj9wfshvk7l07ijp84143bamvgb0lhhh0c9zx4gy5jj3x1j4196m3s1c1n7rzs"; + "18963ccclfvz85bkiy7dpxgzkf71yh4qjbr8hblwyha9d3h8xnm29mi1dd3a2bz05qi3ly1v3k5mrhcbivhy2can2ippsal6j8rky0s"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 37676e77cb5adab936606838d6465faafda54f61 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Sat, 11 Apr 2020 16:38:55 -0400 Subject: nixos/systemd-boot: Add basic test --- nixos/modules/virtualisation/qemu-vm.nix | 13 +++++++++++-- nixos/tests/all-tests.nix | 1 + nixos/tests/systemd-boot.nix | 31 +++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 nixos/tests/systemd-boot.nix diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 85b75ba6804..ac86330c098 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -189,9 +189,18 @@ let mkdir /boot/grub echo '(hd0) /dev/vda' > /boot/grub/device.map - # Install GRUB and generate the GRUB boot menu. - touch /etc/NIXOS + # This is needed for systemd-boot to find ESP, and udev is not available here to create this + mkdir -p /dev/block + ln -s /dev/vda2 /dev/block/254:2 + + # Set up system profile (normally done by nixos-rebuild / nix-env --set) mkdir -p /nix/var/nix/profiles + ln -s ${config.system.build.toplevel} /nix/var/nix/profiles/system-1-link + ln -s /nix/var/nix/profiles/system-1-link /nix/var/nix/profiles/system + + # Install bootloader + touch /etc/NIXOS + export NIXOS_INSTALL_BOOTLOADER=1 ${config.system.build.toplevel}/bin/switch-to-configuration boot umount /boot diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index ebb0dfef15a..46f552b26a4 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -297,6 +297,7 @@ in syncthing-relay = handleTest ./syncthing-relay.nix {}; systemd = handleTest ./systemd.nix {}; systemd-analyze = handleTest ./systemd-analyze.nix {}; + systemd-boot = handleTestOn ["x86_64-linux"] ./systemd-boot.nix {}; systemd-confinement = handleTest ./systemd-confinement.nix {}; systemd-timesyncd = handleTest ./systemd-timesyncd.nix {}; systemd-networkd-vrf = handleTest ./systemd-networkd-vrf.nix {}; diff --git a/nixos/tests/systemd-boot.nix b/nixos/tests/systemd-boot.nix new file mode 100644 index 00000000000..e911c393361 --- /dev/null +++ b/nixos/tests/systemd-boot.nix @@ -0,0 +1,31 @@ +{ system ? builtins.currentSystem, + config ? {}, + pkgs ? import ../.. { inherit system config; } +}: + +with import ../lib/testing-python.nix { inherit system pkgs; }; +with pkgs.lib; + +makeTest { + name = "systemd-boot"; + meta.maintainers = with pkgs.stdenv.lib.maintainers; [ danielfullmer ]; + + machine = { pkgs, lib, ... }: { + virtualisation.useBootLoader = true; + virtualisation.useEFIBoot = true; + boot.loader.systemd-boot.enable = true; + }; + + testScript = '' + machine.start() + machine.wait_for_unit("multi-user.target") + + machine.succeed("test -e /boot/loader/entries/nixos-generation-1.conf") + + # Ensure we actually booted using systemd-boot. + # Magic number is the vendor UUID used by systemd-boot. + machine.succeed( + "test -e /sys/firmware/efi/efivars/LoaderEntrySelected-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f" + ) + ''; +} -- cgit v1.2.3 From 06ea7091d38aa346cb799d4bc24039523725efef Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 18:25:54 +0000 Subject: libdvdread: 6.1.0 -> 6.1.1 --- pkgs/development/libraries/libdvdread/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix index c28ca339a65..997018a2970 100644 --- a/pkgs/development/libraries/libdvdread/default.nix +++ b/pkgs/development/libraries/libdvdread/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libdvdread"; - version = "6.1.0"; + version = "6.1.1"; src = fetchurl { url = "http://get.videolan.org/libdvdread/${version}/${pname}-${version}.tar.bz2"; - sha256 = "033mnhq3mx0qz3z85vw01rz5wzmx5ynadl7q1wm2spvx3ryvs6sh"; + sha256 = "15hpwbw3nm84y432l0j61w0zmqxplsyymfc52dry6nvwl44p6d9y"; }; buildInputs = [libdvdcss]; -- cgit v1.2.3 From 018f49380e62a485a162e8de47e25adcfe702d8b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 5 May 2020 14:35:33 -0400 Subject: linux: 4.14.178 -> 4.14.179 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 013893c1cdd..b3dea589cd6 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.178"; + version = "4.14.179"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1pcqxmq9ir4f963aiw5bab9w2mp4vfiwaq2bk7nksbl2bs3k6b7x"; + sha256 = "10arrj3ppbxkn15yxqpxlz4k8yp2afzbfpp2nwfy6klhjiffp9sx"; }; } // (args.argsOverride or {})) -- cgit v1.2.3 From 7f75ff0777cc82c18e6e0af295a628ad5bb351c6 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 5 May 2020 14:35:46 -0400 Subject: linux: 4.4.221 -> 4.4.222 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 09b34e26a47..81b32a932e1 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.221"; + version = "4.4.222"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "06rpjnvrdp71flz948mfmx7jv8x2vmdg54zz1xpkb2458mwh5hbq"; + sha256 = "02zxy5vjxgrqs0mkz5aj70v6pazhif7x5cm26rf8zh4idpmhk2zh"; }; } // (args.argsOverride or {})) -- cgit v1.2.3 From 32585ddcec809021947d281eaac8ebed3a83b36a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 5 May 2020 14:35:55 -0400 Subject: linux: 4.9.221 -> 4.9.222 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 0db1d2908e3..a9757aa2f10 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.221"; + version = "4.9.222"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1gh1x73xblxkb927igc3shrqnn49lcscwrq2fixmk9n7jb7q2hp6"; + sha256 = "0aajgflf96bj7chbd83rdmgcdwd025c6mz6li4cwbfx7xcb91kjc"; }; } // (args.argsOverride or {})) -- cgit v1.2.3 From 33b968049ae08ba48e333189b1f4f4e433b52199 Mon Sep 17 00:00:00 2001 From: tim put Date: Tue, 5 May 2020 12:38:28 -0600 Subject: kstars: init at 2.9.8 (#86032) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * kstars: init at 2.9.8 * Update pkgs/applications/science/astronomy/kstars/default.nix Co-authored-by: Manuel Bärenz Co-authored-by: Manuel Bärenz --- .../science/astronomy/kstars/default.nix | 48 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 50 insertions(+) create mode 100644 pkgs/applications/science/astronomy/kstars/default.nix diff --git a/pkgs/applications/science/astronomy/kstars/default.nix b/pkgs/applications/science/astronomy/kstars/default.nix new file mode 100644 index 00000000000..0b53e3e85ac --- /dev/null +++ b/pkgs/applications/science/astronomy/kstars/default.nix @@ -0,0 +1,48 @@ +{ + mkDerivation, lib, fetchgit, + extra-cmake-modules, + + kconfig, kdoctools, kguiaddons, ki18n, kinit, kiconthemes, kio, + knewstuff, kplotting, kwidgetsaddons, kxmlgui, + + qtx11extras, qtwebsockets, + + eigen, zlib, + + cfitsio, indilib, xplanet +}: + +mkDerivation { + name = "kstars"; + + src = fetchgit { + url = "https://anongit.kde.org/kstars.git"; + rev = "7acc527939280edd22823371dc4e22494c6c626a"; + sha256 = "1n1lgi7p3dj893fdnzjbnrha40p4apl0dy8zppcabxwrb1khb84v"; + }; + + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kconfig kdoctools kguiaddons ki18n kinit kiconthemes kio + knewstuff kplotting kwidgetsaddons kxmlgui + + qtx11extras qtwebsockets + + eigen zlib + + cfitsio indilib xplanet + ]; + + meta = with lib; { + description = "Virtual planetarium astronomy software"; + homepage = "https://kde.org/applications/education/org.kde.kstars"; + longDescription = '' + It provides an accurate graphical simulation of the night sky, from any location on Earth, at any date and time. + The display includes up to 100 million stars, 13.000 deep-sky objects, all 8 planets, the Sun and Moon, and thousands of comets, asteroids, supernovae, and satellites. + For students and teachers, it supports adjustable simulation speeds in order to view phenomena that happen over long timescales, the KStars Astrocalculator to predict conjunctions, and many common astronomical calculations. + ''; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ timput ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 95517f75411..3f54e675e4f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4553,6 +4553,8 @@ in kst = libsForQt5.callPackage ../tools/graphics/kst { gsl = gsl_1; }; + kstars = libsForQt5.callPackage ../applications/science/astronomy/kstars { }; + kytea = callPackage ../tools/text/kytea { }; k6 = callPackage ../development/tools/k6 { }; -- cgit v1.2.3 From 67f7f93fd67eb8acf37afe096ad330cbd7f6e505 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Sun, 5 Apr 2020 20:36:26 +0200 Subject: gopass: Support passAlias parameter in derivation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add a `passAlias` to `gopass` derivation, similarly to how there's `viAlias` parameter supported by vim/neovim derivations. Apart from convenience this is also necessary for e.g. making `docker-credential-helpers` work without patching the latter - the package uses `pass` executable from `PATH` https://github.com/docker/docker-credential-helpers/blob/f78081d1f7fef6ad74ad6b79368de6348386e591/pass/pass_linux.go#L67. By setting `passAlias` to `true` (e.g. via overlays like so: https://github.com/rvolosatovs/infrastructure/blob/94971f34db9df79b6666e626fa52840eb1fee840/nixpkgs/overlays.nix#L315-L317), secure Docker authentication via `gopass` "just works"™ --- pkgs/tools/security/gopass/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 410b63ec7d7..d7db6ea825c 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -1,4 +1,11 @@ -{ stdenv, buildGoModule, fetchFromGitHub, git, gnupg, xclip, wl-clipboard, installShellFiles, makeWrapper }: +{ stdenv, makeWrapper +, buildGoModule, fetchFromGitHub, installShellFiles +, git +, gnupg +, xclip +, wl-clipboard +, passAlias ? false +}: buildGoModule rec { pname = "gopass"; @@ -28,6 +35,8 @@ buildGoModule rec { $out/bin/gopass completion $shell > gopass.$shell installShellCompletion gopass.$shell done + '' + stdenv.lib.optionalString passAlias '' + ln -s $bin/bin/gopass $bin/bin/pass ''; postFixup = '' -- cgit v1.2.3 From ae19e155a5bfae537d8c1e4ca4bd4de82ae3c42a Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Tue, 5 May 2020 20:28:40 +0200 Subject: gopass: Add myself to maintainers --- pkgs/tools/security/gopass/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index d7db6ea825c..8d7cb5810d9 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -48,7 +48,7 @@ buildGoModule rec { description = "The slightly more awesome Standard Unix Password Manager for Teams. Written in Go."; homepage = "https://www.gopass.pw/"; license = licenses.mit; - maintainers = with maintainers; [ andir ]; + maintainers = with maintainers; [ andir rvolosatovs ]; platforms = platforms.unix; longDescription = '' -- cgit v1.2.3 From 08b198becaa59658da7dc5cd1f8a79bf336ca011 Mon Sep 17 00:00:00 2001 From: Patryk Wychowaniec Date: Thu, 16 Apr 2020 18:05:22 +0200 Subject: maintainers: add patryk27 --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b4552bd874f..4154b272117 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5862,6 +5862,16 @@ githubId = 131844; name = "Igor Pashev"; }; + patryk27 = { + email = "wychowaniec.patryk@gmail.com"; + github = "Patryk27"; + githubId = 3395477; + name = "Patryk Wychowaniec"; + keys = [{ + longkeyid = "rsa4096/0xF62547D075E09767"; + fingerprint = "196A BFEC 6A1D D1EC 7594 F8D1 F625 47D0 75E0 9767"; + }]; + }; patternspandemic = { email = "patternspandemic@live.com"; github = "patternspandemic"; -- cgit v1.2.3 From 23505114252a27e765a3148e8a05e7eb1bf6efc9 Mon Sep 17 00:00:00 2001 From: Patryk Wychowaniec Date: Thu, 16 Apr 2020 18:07:30 +0200 Subject: netris: init at 0.52 --- pkgs/games/netris/default.nix | 32 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 pkgs/games/netris/default.nix diff --git a/pkgs/games/netris/default.nix b/pkgs/games/netris/default.nix new file mode 100644 index 00000000000..994db4e67f8 --- /dev/null +++ b/pkgs/games/netris/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, ncurses }: + +stdenv.mkDerivation { + pname = "netris"; + version = "0.52"; + + src = fetchFromGitHub { + owner = "naclander"; + repo = "netris"; + rev = "6773c9b2d39a70481a5d6eb5368e9ced6229ad2b"; + sha256 = "0gmxbpn50pnffidwjchkzph9rh2jm4wfq7hj8msp5vhdq5h0z9hm"; + }; + + buildInputs = [ + ncurses + ]; + + configureScript = "./Configure"; + dontAddPrefix = true; + + installPhase = '' + mkdir -p $out/bin + cp ./netris $out/bin + ''; + + meta = with stdenv.lib; { + description = "A free networked version of T*tris"; + license = licenses.gpl2; + maintainers = with maintainers; [ patryk27 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3f54e675e4f..7238ab5cd1c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23600,7 +23600,7 @@ in lua = lua5_1; }; - n2048 = callPackage ../games/n2048 {}; + n2048 = callPackage ../games/n2048 { }; naev = callPackage ../games/naev { }; @@ -23612,6 +23612,8 @@ in }; nethack-x11 = callPackage ../games/nethack { x11Mode = true; }; + + netris = callPackage ../games/netris { }; neverball = callPackage ../games/neverball { }; -- cgit v1.2.3 From 3cb887902a926813d7b594dc9dfffc2c813d06dc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 19:15:24 +0000 Subject: lazarus: 2.0.6 -> 2.0.8 --- pkgs/development/compilers/fpc/lazarus.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index 923d8d34251..5947b572cec 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { pname = "lazarus"; - version = "2.0.6"; + version = "2.0.8"; src = fetchurl { url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}.tar.gz"; - sha256 = "0v1ax6039nm2bksh646znrkah20ak2zmhaz5p3mz2p60y2qazkc2"; + sha256 = "1iciqydb0miqdrh89aj59gy7kfcwikkycqssq9djcqsw1ql3gc4h"; }; buildInputs = [ -- cgit v1.2.3 From 93dd4b51185f7e5609aa2225ee51123eb9072853 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Tue, 5 May 2020 21:14:25 +0200 Subject: gopass: adapt to buildGoModule output naming scheme --- pkgs/tools/security/gopass/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 8d7cb5810d9..59a5e800aed 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -36,7 +36,7 @@ buildGoModule rec { installShellCompletion gopass.$shell done '' + stdenv.lib.optionalString passAlias '' - ln -s $bin/bin/gopass $bin/bin/pass + ln -s $out/bin/gopass $out/bin/pass ''; postFixup = '' -- cgit v1.2.3 From dde157780c80af9a10820c7c07794abb65b1fdbf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 5 May 2020 20:47:39 +0200 Subject: =?UTF-8?q?ansible:=20v2.9.2=20=E2=86=92=20v2.9.7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: CVE-2020-10684, CVE-2020-1733, CVE-2020-1735, CVE-2020-1739, CVE-2020-1740 --- pkgs/development/python-modules/ansible/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index bd3e5662e18..b9c710e6888 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "ansible"; - version = "2.9.2"; + version = "2.9.7"; src = fetchFromGitHub { owner = "ansible"; repo = "ansible"; rev = "v${version}"; - sha256 = "06vxvn5q13rxzndwzq3g6yxiqm361ma9zcvwbrfn630xkmsg4pd8"; + sha256 = "0miid7h720i630qljcjdmgdblflhrl2pwqjgiq5wm8jr61c3ld6s"; }; prePatch = '' -- cgit v1.2.3 From 1c181e1bba770521d905b820b2d4d0850a5a5e1f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 5 May 2020 20:50:36 +0200 Subject: =?UTF-8?q?ansible:=20v2.8.7=20=E2=86=92=20v2.8.11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: CVE-2020-10684, CVE-2020-1733, CVE-2020-1735, CVE-2020-1739, CVE-2020-1740 --- pkgs/tools/admin/ansible/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index 4af03111869..653915fd76e 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -7,11 +7,11 @@ rec { ansible_2_8 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { pname = "ansible"; - version = "2.8.7"; + version = "2.8.11"; src = fetchurl { url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "0iy90kqxs52nspfkhj1y7z4zf017jfm5qhdb01d8d4jd5g53k0l2"; + sha256 = "14f1m4jjkicadaz4d1dm8xhj53kdwksf0znmqzaz1fb0dj5slv0m"; }; })); -- cgit v1.2.3 From e829499d696b34cf06ef4085ca0319181ca88c7b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 5 May 2020 20:50:53 +0200 Subject: =?UTF-8?q?ansible:=20v2.7.15=20=E2=86=92=20v2.7.17?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: CVE-2020-10684, CVE-2020-1733, CVE-2020-1735, CVE-2020-1739, CVE-2020-1740 --- pkgs/tools/admin/ansible/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index 653915fd76e..d0cb07197cd 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -17,11 +17,11 @@ rec { ansible_2_7 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { pname = "ansible"; - version = "2.7.15"; + version = "2.7.17"; src = fetchurl { url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "1kjqr35c11njyi3f2rjab6821bhqcrdykv4285q76gwv0qynigwr"; + sha256 = "1k2cz4w3r3an37305f40vi93wqixapls9y6ggkf75nbs7z27knwz"; }; })); -- cgit v1.2.3 From c04989da245dd545bf589d4172198a746a6becd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Fi=C5=A1er?= Date: Tue, 5 May 2020 10:37:36 +0200 Subject: nixos/pantheon: mkDefault value for defaultSession Fixes #86907 --- nixos/modules/services/x11/desktop-managers/pantheon.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 01fe230b8a4..5fcc8590232 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -109,7 +109,7 @@ in # Without this, elementary LightDM greeter will pre-select non-existent `default` session # https://github.com/elementary/greeter/issues/368 - services.xserver.displayManager.defaultSession = "pantheon"; + services.xserver.displayManager.defaultSession = mkDefault "pantheon"; services.xserver.displayManager.sessionCommands = '' if test "$XDG_CURRENT_DESKTOP" = "Pantheon"; then -- cgit v1.2.3 From 36debc367e69a5e03fef7f1ec9a5d86d6fa7c3ce Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 5 May 2020 21:20:44 +0100 Subject: poetry2nix: 1.7.1 -> 1.8.0 --- .../tools/poetry2nix/poetry2nix/cli.nix | 6 +- .../tools/poetry2nix/poetry2nix/default.nix | 310 ++--- .../tools/poetry2nix/poetry2nix/fetch-wheel.sh | 24 + .../tools/poetry2nix/poetry2nix/hooks/default.nix | 33 +- .../poetry2nix/poetry2nix/hooks/pip-build-hook.sh | 50 + .../poetry2nix/hooks/pyproject-without-path.py | 9 +- .../tools/poetry2nix/poetry2nix/lib.nix | 184 ++- .../tools/poetry2nix/poetry2nix/mk-poetry-dep.nix | 173 ++- .../tools/poetry2nix/poetry2nix/overrides.nix | 1233 +++++++++++--------- .../tools/poetry2nix/poetry2nix/pep425.nix | 66 +- .../tools/poetry2nix/poetry2nix/pep508.nix | 147 ++- .../tools/poetry2nix/poetry2nix/semver.nix | 85 +- pkgs/development/tools/poetry2nix/update | 2 +- 13 files changed, 1314 insertions(+), 1008 deletions(-) create mode 100644 pkgs/development/tools/poetry2nix/poetry2nix/fetch-wheel.sh create mode 100644 pkgs/development/tools/poetry2nix/poetry2nix/hooks/pip-build-hook.sh diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix b/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix index fbcee749b7c..b96316e59d8 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/cli.nix @@ -1,4 +1,4 @@ -{ pkgs ? import {} +{ pkgs ? import { } , lib ? pkgs.lib , version }: @@ -33,8 +33,8 @@ pkgs.stdenv.mkDerivation { mv poetry2nix $out/bin wrapProgram $out/bin/poetry2nix --prefix PATH ":" ${lib.makeBinPath [ - pkgs.nix-prefetch-git - ]} + pkgs.nix-prefetch-git + ]} runHook postInstall ''; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index e7f718519a5..a7fb382c755 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -1,22 +1,20 @@ -{ pkgs ? import {} +{ pkgs ? import { } , lib ? pkgs.lib , poetry ? null , poetryLib ? import ./lib.nix { inherit lib pkgs; } }: let - inherit (poetryLib) isCompatible readTOML; + inherit (poetryLib) isCompatible readTOML moduleName; # Poetry2nix version - version = "1.7.1"; + version = "1.8.0"; /* The default list of poetry2nix override overlays */ defaultPoetryOverrides = (import ./overrides.nix { inherit pkgs lib; }); - mkEvalPep508 = import ./pep508.nix { inherit lib poetryLib; stdenv = pkgs.stdenv; }; - getFunctorFn = fn: if builtins.typeOf fn == "set" then fn.__functor else fn; # Map SPDX identifiers to license names @@ -34,95 +32,99 @@ let , overrides ? [ defaultPoetryOverrides ] , python ? pkgs.python3 , pwd ? projectDir + , preferWheels ? false }@attrs: - let - poetryPkg = poetry.override { inherit python; }; - - pyProject = readTOML pyproject; - poetryLock = readTOML poetrylock; - lockFiles = lib.getAttrFromPath [ "metadata" "files" ] poetryLock; - - specialAttrs = [ - "overrides" - "poetrylock" - "projectDir" - "pwd" - ]; - passedAttrs = builtins.removeAttrs attrs specialAttrs; - - evalPep508 = mkEvalPep508 python; - - # Filter packages by their PEP508 markers & pyproject interpreter version - partitions = let + let + poetryPkg = poetry.override { inherit python; }; + pyProject = readTOML pyproject; + poetryLock = readTOML poetrylock; + lockFiles = + let + lockfiles = lib.getAttrFromPath [ "metadata" "files" ] poetryLock; + in + lib.listToAttrs (lib.mapAttrsToList (n: v: { name = moduleName n; value = v; }) lockfiles); + specialAttrs = [ + "overrides" + "poetrylock" + "projectDir" + "pwd" + "preferWheels" + ]; + passedAttrs = builtins.removeAttrs attrs specialAttrs; + evalPep508 = mkEvalPep508 python; + + # Filter packages by their PEP508 markers & pyproject interpreter version + partitions = + let supportsPythonVersion = pkgMeta: if pkgMeta ? marker then (evalPep508 pkgMeta.marker) else true; in - lib.partition supportsPythonVersion poetryLock.package; - - compatible = partitions.right; - incompatible = partitions.wrong; - - # Create an overriden version of pythonPackages - # - # We need to avoid mixing multiple versions of pythonPackages in the same - # closure as python can only ever have one version of a dependency - baseOverlay = self: super: - let - getDep = depName: self.${depName}; - - lockPkgs = builtins.listToAttrs ( - builtins.map ( - pkgMeta: rec { - name = pkgMeta.name; - value = self.mkPoetryDep ( - pkgMeta // { - inherit pwd; - source = pkgMeta.source or null; - files = lockFiles.${name}; - pythonPackages = self; - sourceSpec = pyProject.tool.poetry.dependencies.${name} or pyProject.tool.poetry.dev-dependencies.${name}; - } - ); - } - ) compatible + lib.partition supportsPythonVersion poetryLock.package; + compatible = partitions.right; + incompatible = partitions.wrong; + + # Create an overriden version of pythonPackages + # + # We need to avoid mixing multiple versions of pythonPackages in the same + # closure as python can only ever have one version of a dependency + baseOverlay = self: super: + let + getDep = depName: self.${depName}; + lockPkgs = builtins.listToAttrs + ( + builtins.map + ( + pkgMeta: rec { + name = moduleName pkgMeta.name; + value = self.mkPoetryDep + ( + pkgMeta // { + inherit pwd preferWheels; + source = pkgMeta.source or null; + files = lockFiles.${name}; + pythonPackages = self; + sourceSpec = pyProject.tool.poetry.dependencies.${name} or pyProject.tool.poetry.dev-dependencies.${name}; + } + ); + } + ) compatible ); - in - lockPkgs; - overlays = builtins.map getFunctorFn ( + in + lockPkgs; + overlays = builtins.map getFunctorFn + ( [ ( self: super: let - hooks = self.callPackage ./hooks {}; + hooks = self.callPackage ./hooks { }; in - { - mkPoetryDep = self.callPackage ./mk-poetry-dep.nix { - inherit pkgs lib python poetryLib; - }; - poetry = poetryPkg; - # The canonical name is setuptools-scm - setuptools-scm = super.setuptools_scm; - - inherit (hooks) removePathDependenciesHook poetry2nixFixupHook; - } + { + mkPoetryDep = self.callPackage ./mk-poetry-dep.nix { + inherit pkgs lib python poetryLib; + }; + poetry = poetryPkg; + # The canonical name is setuptools-scm + setuptools-scm = super.setuptools_scm; + + inherit (hooks) pipBuildHook removePathDependenciesHook poetry2nixFixupHook; + } ) # Null out any filtered packages, we don't want python.pkgs from nixpkgs - (self: super: builtins.listToAttrs (builtins.map (x: { name = x.name; value = null; }) incompatible)) + (self: super: builtins.listToAttrs (builtins.map (x: { name = moduleName x.name; value = null; }) incompatible)) # Create poetry2nix layer baseOverlay ] ++ # User provided overrides overrides ); - - packageOverrides = lib.foldr lib.composeExtensions (self: super: {}) overlays; - - py = python.override { inherit packageOverrides; self = py; }; - in - { - python = py; - poetryPackages = map (pkg: py.pkgs.${pkg.name}) compatible; - poetryLock = poetryLock; - inherit pyProject; - }; + packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) overlays; + py = python.override { inherit packageOverrides; self = py; }; + in + { + python = py; + poetryPackages = map (pkg: py.pkgs.${moduleName pkg.name}) compatible; + poetryLock = poetryLock; + inherit pyProject; + }; /* Returns a package with a python interpreter and all packages specified in the poetry.lock lock file. @@ -136,15 +138,17 @@ let , overrides ? [ defaultPoetryOverrides ] , pwd ? projectDir , python ? pkgs.python3 + , preferWheels ? false }: - let - py = mkPoetryPackages ( + let + py = mkPoetryPackages + ( { - inherit pyproject poetrylock overrides python pwd; + inherit pyproject poetrylock overrides python pwd preferWheels; } ); - in - py.python.withPackages (_: py.poetryPackages); + in + py.python.withPackages (_: py.poetryPackages); /* Creates a Python application from pyproject.toml and poetry.lock */ mkPoetryApplication = @@ -153,79 +157,79 @@ let , pyproject ? projectDir + "/pyproject.toml" , poetrylock ? projectDir + "/poetry.lock" , overrides ? [ defaultPoetryOverrides ] - , meta ? {} + , meta ? { } , python ? pkgs.python3 , pwd ? projectDir + , preferWheels ? false , ... }@attrs: - let - poetryPython = mkPoetryPackages { - inherit pyproject poetrylock overrides python pwd; - }; - py = poetryPython.python; - - inherit (poetryPython) pyProject; - - specialAttrs = [ - "overrides" - "poetrylock" - "projectDir" - "pwd" - "pyproject" - ]; - passedAttrs = builtins.removeAttrs attrs specialAttrs; - - # Get dependencies and filter out depending on interpreter version - getDeps = depAttr: - let - compat = isCompatible py.pythonVersion; - deps = pyProject.tool.poetry.${depAttr} or {}; - depAttrs = builtins.map (d: lib.toLower d) (builtins.attrNames deps); - in - builtins.map ( - dep: - let - pkg = py.pkgs."${dep}"; - constraints = deps.${dep}.python or ""; - isCompat = compat constraints; - in - if isCompat then pkg else null - ) depAttrs; - - getInputs = attr: attrs.${attr} or []; - mkInput = attr: extraInputs: getInputs attr ++ extraInputs; - - buildSystemPkgs = poetryLib.getBuildSystemPkgs { - inherit pyProject; - pythonPackages = py.pkgs; - }; - in - py.pkgs.buildPythonApplication ( - passedAttrs // { - pname = pyProject.tool.poetry.name; - version = pyProject.tool.poetry.version; - - inherit src; - - format = "pyproject"; - - buildInputs = mkInput "buildInputs" buildSystemPkgs; - propagatedBuildInputs = mkInput "propagatedBuildInputs" (getDeps "dependencies") ++ ([ py.pkgs.setuptools ]); - nativeBuildInputs = mkInput "nativeBuildInputs" [ pkgs.yj py.pkgs.removePathDependenciesHook ]; - checkInputs = mkInput "checkInputs" (getDeps "dev-dependencies"); - - passthru = { - python = py; - }; - - meta = meta // { - inherit (pyProject.tool.poetry) description homepage; - inherit (py.meta) platforms; - license = getLicenseBySpdxId (pyProject.tool.poetry.license or "unknown"); - }; - - } - ); + let + poetryPython = mkPoetryPackages { + inherit pyproject poetrylock overrides python pwd preferWheels; + }; + py = poetryPython.python; + + inherit (poetryPython) pyProject; + specialAttrs = [ + "overrides" + "poetrylock" + "projectDir" + "pwd" + "pyproject" + "preferWheels" + ]; + passedAttrs = builtins.removeAttrs attrs specialAttrs; + + # Get dependencies and filter out depending on interpreter version + getDeps = depAttr: + let + compat = isCompatible (poetryLib.getPythonVersion py); + deps = pyProject.tool.poetry.${depAttr} or { }; + depAttrs = builtins.map (d: lib.toLower d) (builtins.attrNames deps); + in + builtins.map + ( + dep: + let + pkg = py.pkgs."${dep}"; + constraints = deps.${dep}.python or ""; + isCompat = compat constraints; + in if isCompat then pkg else null + ) depAttrs; + getInputs = attr: attrs.${attr} or [ ]; + mkInput = attr: extraInputs: getInputs attr ++ extraInputs; + buildSystemPkgs = poetryLib.getBuildSystemPkgs { + inherit pyProject; + pythonPackages = py.pkgs; + }; + in + py.pkgs.buildPythonApplication + ( + passedAttrs // { + pname = moduleName pyProject.tool.poetry.name; + version = pyProject.tool.poetry.version; + + inherit src; + + format = "pyproject"; + + buildInputs = mkInput "buildInputs" buildSystemPkgs; + propagatedBuildInputs = mkInput "propagatedBuildInputs" (getDeps "dependencies") ++ ([ py.pkgs.setuptools ]); + nativeBuildInputs = mkInput "nativeBuildInputs" [ pkgs.yj py.pkgs.removePathDependenciesHook ]; + checkInputs = mkInput "checkInputs" (getDeps "dev-dependencies"); + + passthru = { + python = py; + }; + + meta = meta // { + inherit (pyProject.tool.poetry) description homepage; + inherit (py.meta) platforms; + license = getLicenseBySpdxId (pyProject.tool.poetry.license or "unknown"); + }; + + } + ); /* Poetry2nix CLI used to supplement SHA-256 hashes for git dependencies */ cli = import ./cli.nix { inherit pkgs lib version; }; @@ -247,7 +251,7 @@ in defaultSet = defaultPoetryOverrides self super; customSet = fn self super; in - defaultSet // customSet; + defaultSet // customSet; }; /* diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/fetch-wheel.sh b/pkgs/development/tools/poetry2nix/poetry2nix/fetch-wheel.sh new file mode 100644 index 00000000000..97f54b23416 --- /dev/null +++ b/pkgs/development/tools/poetry2nix/poetry2nix/fetch-wheel.sh @@ -0,0 +1,24 @@ +source $stdenv/setup +set -euo pipefail + +curl="curl \ + --location \ + --max-redirs 20 \ + --retry 2 \ + --disable-epsv \ + --cookie-jar cookies \ + --insecure \ + --speed-time 5 \ + -# \ + --fail \ + $curlOpts \ + $NIX_CURL_FLAGS" + +echo "Trying to fetch wheel with predicted URL: $predictedURL" + +$curl $predictedURL --output $out && exit 0 + +echo "Predicted URL '$predictedURL' failed, querying pypi.org" +$curl "https://pypi.org/pypi/$pname/json" | jq -r ".releases.\"$version\"[] | select(.filename == \"$file\") | .url" > url +url=$(cat url) +$curl -k $url --output $out diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix index 12d2bc96206..ae5867b8337 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix @@ -2,31 +2,48 @@ , callPackage , makeSetupHook , yj +, wheel +, pip }: let pythonInterpreter = python.pythonForBuild.interpreter; + pythonSitePackages = python.sitePackages; in { - removePathDependenciesHook = callPackage ( - {}: + removePathDependenciesHook = callPackage + ( + {}: makeSetupHook { name = "remove-path-dependencies.sh"; - deps = []; + deps = [ ]; substitutions = { inherit pythonInterpreter; yj = "${yj}/bin/yj"; pyprojectPatchScript = "${./pyproject-without-path.py}"; }; } ./remove-path-dependencies.sh - ) {}; + ) { }; - poetry2nixFixupHook = callPackage ( - {}: + pipBuildHook = callPackage + ( + { pip, wheel }: + makeSetupHook { + name = "pip-build-hook.sh"; + deps = [ pip wheel ]; + substitutions = { + inherit pythonInterpreter pythonSitePackages; + }; + } ./pip-build-hook.sh + ) { }; + + poetry2nixFixupHook = callPackage + ( + {}: makeSetupHook { name = "fixup-hook.sh"; - deps = []; + deps = [ ]; } ./fixup-hook.sh - ) {}; + ) { }; } diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pip-build-hook.sh b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pip-build-hook.sh new file mode 100644 index 00000000000..fa7b698fb51 --- /dev/null +++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pip-build-hook.sh @@ -0,0 +1,50 @@ +# Setup hook to use for pip projects +echo "Sourcing pip-build-hook" + +pipBuildPhase() { + echo "Executing pipBuildPhase" + runHook preBuild + + # Prefer using setup.py to avoid build-system dependencies if we have a setup.py + if [ -z "${dontPreferSetupPy-}" ]; then + if test -e setup.py && test -e pyproject.toml; then + echo "Removing pyproject.toml..." + rm -f pyproject.toml + fi + fi + + mkdir -p dist + echo "Creating a wheel..." + @pythonInterpreter@ -m pip wheel --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist . + echo "Finished creating a wheel..." + + runHook postBuild + echo "Finished executing pipBuildPhase" +} + +pipShellHook() { + echo "Executing pipShellHook" + runHook preShellHook + + # Long-term setup.py should be dropped. + if [ -e pyproject.toml ]; then + tmp_path=$(mktemp -d) + export PATH="$tmp_path/bin:$PATH" + export PYTHONPATH="$tmp_path/@pythonSitePackages@:$PYTHONPATH" + mkdir -p "$tmp_path/@pythonSitePackages@" + @pythonInterpreter@ -m pip install -e . --prefix "$tmp_path" >&2 + fi + + runHook postShellHook + echo "Finished executing pipShellHook" +} + +if [ -z "${dontUsePipBuild-}" ] && [ -z "${buildPhase-}" ]; then + echo "Using pipBuildPhase" + buildPhase=pipBuildPhase +fi + +if [ -z "${shellHook-}" ]; then + echo "Using pipShellHook" + shellHook=pipShellHook +fi diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-path.py b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-path.py index bb61e4a5cb4..5d8fbcfe6b4 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-path.py +++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/pyproject-without-path.py @@ -6,7 +6,14 @@ import sys data = json.load(sys.stdin) -for dep in data['tool']['poetry']['dependencies'].values(): + +def get_deep(o, path): + for p in path.split('.'): + o = o.get(p, {}) + return o + + +for dep in get_deep(data, 'tool.poetry.dependencies').values(): if isinstance(dep, dict): try: del dep['path']; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix index f4497afb8bc..ed47837ee43 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/lib.nix @@ -8,6 +8,20 @@ let genList (i: if i == idx then value else (builtins.elemAt list i)) (length list) ); + # Do some canonicalisation of module names + moduleName = name: lib.toLower (lib.replaceStrings [ "_" "." ] [ "-" "-" ] name); + + # Get a full semver pythonVersion from a python derivation + getPythonVersion = python: + let + pyVer = lib.splitVersion python.pythonVersion ++ [ "0" ]; + ver = lib.splitVersion python.version; + major = l: lib.elemAt l 0; + minor = l: lib.elemAt l 1; + joinVersion = v: lib.concatStringsSep "." v; + in + joinVersion ( if major pyVer == major ver && minor pyVer == minor ver then ver else pyVer); + # Compare a semver expression with a version isCompatible = version: let @@ -18,41 +32,41 @@ let }; splitRe = "(" + (builtins.concatStringsSep "|" (builtins.map (x: lib.replaceStrings [ "|" ] [ "\\|" ] x) (lib.attrNames operators))) + ")"; in - expr: + expr: + let + tokens = builtins.filter (x: x != "") (builtins.split splitRe expr); + combine = acc: v: let - tokens = builtins.filter (x: x != "") (builtins.split splitRe expr); - combine = acc: v: - let - isOperator = builtins.typeOf v == "list"; - operator = if isOperator then (builtins.elemAt v 0) else acc.operator; - in - if isOperator then (acc // { inherit operator; }) else { - inherit operator; - state = operators."${operator}" acc.state (satisfiesSemver version v); - }; - initial = { operator = "&&"; state = true; }; + isOperator = builtins.typeOf v == "list"; + operator = if isOperator then (builtins.elemAt v 0) else acc.operator; in - if expr == "" then true else (builtins.foldl' combine initial tokens).state; - + if isOperator then (acc // { inherit operator; }) else { + inherit operator; + state = operators."${operator}" acc.state (satisfiesSemver version v); + }; + initial = { operator = "&&"; state = true; }; + in if expr == "" then true else (builtins.foldl' combine initial tokens).state; fromTOML = builtins.fromTOML or ( - toml: builtins.fromJSON ( - builtins.readFile ( - pkgs.runCommand "from-toml" - { - inherit toml; - allowSubstitutes = false; - preferLocalBuild = true; - } - '' - ${pkgs.remarshal}/bin/remarshal \ - -if toml \ - -i <(echo "$toml") \ - -of json \ - -o $out - '' + toml: builtins.fromJSON + ( + builtins.readFile + ( + pkgs.runCommand "from-toml" + { + inherit toml; + allowSubstitutes = false; + preferLocalBuild = true; + } + '' + ${pkgs.remarshal}/bin/remarshal \ + -if toml \ + -i <(echo "$toml") \ + -of json \ + -o $out + '' + ) ) - ) ); readTOML = path: fromTOML (builtins.readFile path); @@ -63,10 +77,61 @@ let let ml = pkgs.pythonManylinuxPackages; in - if lib.strings.hasInfix "manylinux1" f then { pkg = [ ml.manylinux1 ]; str = "1"; } - else if lib.strings.hasInfix "manylinux2010" f then { pkg = [ ml.manylinux2010 ]; str = "2010"; } - else if lib.strings.hasInfix "manylinux2014" f then { pkg = [ ml.manylinux2014 ]; str = "2014"; } - else { pkg = []; str = null; }; + if lib.strings.hasInfix "manylinux1" f then { pkg = [ ml.manylinux1 ]; str = "1"; } + else if lib.strings.hasInfix "manylinux2010" f then { pkg = [ ml.manylinux2010 ]; str = "2010"; } + else if lib.strings.hasInfix "manylinux2014" f then { pkg = [ ml.manylinux2014 ]; str = "2014"; } + else { pkg = [ ]; str = null; }; + + # Predict URL from the PyPI index. + # Args: + # pname: package name + # file: filename including extension + # hash: SRI hash + # kind: Language implementation and version tag + predictURLFromPypi = lib.makeOverridable + ( + { pname, file, hash, kind }: + "https://files.pythonhosted.org/packages/${kind}/${lib.toLower (builtins.substring 0 1 file)}/${pname}/${file}" + ); + + + # Fetch the wheels from the PyPI index. + # We need to first get the proper URL to the wheel. + # Args: + # pname: package name + # file: filename including extension + # hash: SRI hash + # kind: Language implementation and version tag + fetchWheelFromPypi = lib.makeOverridable + ( + { pname, file, hash, kind, curlOpts ? "" }: + let + version = builtins.elemAt (builtins.split "-" file) 2; + in + (pkgs.stdenvNoCC.mkDerivation { + name = file; + nativeBuildInputs = [ + pkgs.curl + pkgs.jq + ]; + isWheel = true; + system = "builtin"; + + preferLocalBuild = true; + impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ + "NIX_CURL_FLAGS" + ]; + + predictedURL = predictURLFromPypi { inherit pname file hash kind; }; + inherit pname file version curlOpts; + + builder = ./fetch-wheel.sh; + + outputHashMode = "flat"; + outputHashAlgo = "sha256"; + outputHash = hash; + }) + ); # Fetch the artifacts from the PyPI index. Since we get all # info we need from the lock file we don't use nixpkgs' fetchPyPi @@ -78,25 +143,27 @@ let # file: filename including extension # hash: SRI hash # kind: Language implementation and version tag https://www.python.org/dev/peps/pep-0427/#file-name-convention - fetchFromPypi = lib.makeOverridable ( - { pname, file, hash, kind }: - pkgs.fetchurl { - url = "https://files.pythonhosted.org/packages/${kind}/${lib.toLower (builtins.substring 0 1 file)}/${pname}/${file}"; - inherit hash; - } - ); - + fetchFromPypi = lib.makeOverridable + ( + { pname, file, hash, kind }: + if lib.strings.hasSuffix "whl" file then fetchWheelFromPypi { inherit pname file hash kind; } + else + pkgs.fetchurl { + url = predictURLFromPypi { inherit pname file hash kind; }; + inherit hash; + } + ); getBuildSystemPkgs = { pythonPackages , pyProject }: - let - buildSystem = lib.getAttrFromPath [ "build-system" "build-backend" ] pyProject; - drvAttr = builtins.elemAt (builtins.split "\\.|:" buildSystem) 0; - in - if buildSystem == "" then [] else ( - [ pythonPackages.${drvAttr} or (throw "unsupported build system ${buildSystem}") ] - ); + let + buildSystem = lib.attrByPath [ "build-system" "build-backend" ] "" pyProject; + drvAttr = moduleName (builtins.elemAt (builtins.split "\\.|:" buildSystem) 0); + in + if buildSystem == "" then [ ] else ( + [ pythonPackages.${drvAttr} or (throw "unsupported build system ${buildSystem}") ] + ); # Find gitignore files recursively in parent directory stopping with .git findGitIgnores = path: @@ -105,9 +172,9 @@ let gitIgnore = path + "/.gitignore"; isGitRoot = builtins.pathExists (path + "/.git"); hasGitIgnore = builtins.pathExists gitIgnore; - gitIgnores = if hasGitIgnore then [ gitIgnore ] else []; + gitIgnores = if hasGitIgnore then [ gitIgnore ] else [ ]; in - lib.optionals (builtins.toString path != "/" && ! isGitRoot) (findGitIgnores parent) ++ gitIgnores; + lib.optionals (builtins.toString path != "/" && ! isGitRoot) (findGitIgnores parent) ++ gitIgnores; /* Provides a source filtering mechanism that: @@ -124,22 +191,25 @@ let || (type == "regular" && ! lib.strings.hasSuffix ".pyc" name) ; in - lib.cleanSourceWith { - filter = lib.cleanSourceFilter; - src = lib.cleanSourceWith { - filter = pkgs.nix-gitignore.gitignoreFilterPure pycacheFilter gitIgnores src; - inherit src; - }; + lib.cleanSourceWith { + filter = lib.cleanSourceFilter; + src = lib.cleanSourceWith { + filter = pkgs.nix-gitignore.gitignoreFilterPure pycacheFilter gitIgnores src; + inherit src; }; + }; in { inherit fetchFromPypi + fetchWheelFromPypi getManyLinuxDeps isCompatible readTOML getBuildSystemPkgs satisfiesSemver cleanPythonSources + moduleName + getPythonVersion ; } diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix index 5e71190d28f..2467dad31e1 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix @@ -10,74 +10,68 @@ , version , files , source -, dependencies ? {} +, dependencies ? { } , pythonPackages , python-versions , pwd , sourceSpec , supportedExtensions ? lib.importJSON ./extensions.json +, preferWheels ? false , ... }: -pythonPackages.callPackage ( - { preferWheel ? false - , ... - }@args: +pythonPackages.callPackage + ( + { preferWheel ? preferWheels + , ... + }@args: let - inherit (poetryLib) isCompatible getManyLinuxDeps fetchFromPypi; + inherit (poetryLib) isCompatible getManyLinuxDeps fetchFromPypi moduleName; inherit (import ./pep425.nix { inherit lib python; inherit (pkgs) stdenv; }) selectWheel ; - - fileCandidates = let - supportedRegex = ("^.*?(" + builtins.concatStringsSep "|" supportedExtensions + ")"); - matchesVersion = fname: builtins.match ("^.*" + builtins.replaceStrings [ "." ] [ "\\." ] version + ".*$") fname != null; - hasSupportedExtension = fname: builtins.match supportedRegex fname != null; - isCompatibleEgg = fname: ! lib.strings.hasSuffix ".egg" fname || lib.strings.hasSuffix "py${python.pythonVersion}.egg" fname; - in + fileCandidates = + let + supportedRegex = ("^.*?(" + builtins.concatStringsSep "|" supportedExtensions + ")"); + matchesVersion = fname: builtins.match ("^.*" + builtins.replaceStrings [ "." ] [ "\\." ] version + ".*$") fname != null; + hasSupportedExtension = fname: builtins.match supportedRegex fname != null; + isCompatibleEgg = fname: ! lib.strings.hasSuffix ".egg" fname || lib.strings.hasSuffix "py${python.pythonVersion}.egg" fname; + in builtins.filter (f: matchesVersion f.file && hasSupportedExtension f.file && isCompatibleEgg f.file) files; - toPath = s: pwd + "/${s}"; - isSource = source != null; isGit = isSource && source.type == "git"; isLocal = isSource && source.type == "directory"; - localDepPath = toPath source.url; pyProject = poetryLib.readTOML (localDepPath + "/pyproject.toml"); - buildSystemPkgs = poetryLib.getBuildSystemPkgs { inherit pythonPackages pyProject; }; - - fileInfo = let - isBdist = f: lib.strings.hasSuffix "whl" f.file; - isSdist = f: ! isBdist f && ! isEgg f; - isEgg = f: lib.strings.hasSuffix ".egg" f.file; - - binaryDist = selectWheel fileCandidates; - sourceDist = builtins.filter isSdist fileCandidates; - eggs = builtins.filter isEgg fileCandidates; - - entries = (if preferWheel then binaryDist ++ sourceDist else sourceDist ++ binaryDist) ++ eggs; - - lockFileEntry = builtins.head entries; - - _isEgg = isEgg lockFileEntry; - in + fileInfo = + let + isBdist = f: lib.strings.hasSuffix "whl" f.file; + isSdist = f: ! isBdist f && ! isEgg f; + isEgg = f: lib.strings.hasSuffix ".egg" f.file; + binaryDist = selectWheel fileCandidates; + sourceDist = builtins.filter isSdist fileCandidates; + eggs = builtins.filter isEgg fileCandidates; + entries = ( if preferWheel then binaryDist ++ sourceDist else sourceDist ++ binaryDist) ++ eggs; + lockFileEntry = builtins.head entries; + _isEgg = isEgg lockFileEntry; + in rec { inherit (lockFileEntry) file hash; name = file; format = if _isEgg then "egg" else if lib.strings.hasSuffix ".whl" name then "wheel" - else "setuptools"; + else "pyproject"; kind = if _isEgg then python.pythonVersion - else if format == "setuptools" then "source" + else if format == "pyproject" then "source" else (builtins.elemAt (lib.strings.splitString "-" name) 2); }; @@ -88,63 +82,65 @@ pythonPackages.callPackage ( "toml" # Toml is an extra for setuptools-scm ]; baseBuildInputs = lib.optional (! lib.elem name skipSetupToolsSCM) pythonPackages.setuptools-scm; - - format = if isLocal then "pyproject" else if isGit then "setuptools" else fileInfo.format; + format = if isLocal then "pyproject" else if isGit then "pyproject" else fileInfo.format; in - - buildPythonPackage { - pname = name; - version = version; - - inherit format; - - doCheck = false; # We never get development deps - - # Stripping pre-built wheels lead to `ELF load command address/offset not properly aligned` - dontStrip = format == "wheel"; - - nativeBuildInputs = [ - pythonPackages.poetry2nixFixupHook - ] - ++ lib.optional (!isSource && (getManyLinuxDeps fileInfo.name).str != null) autoPatchelfHook - ++ lib.optional (format == "pyproject") pythonPackages.removePathDependenciesHook - ; - - buildInputs = ( - baseBuildInputs - ++ lib.optional (!isSource) (getManyLinuxDeps fileInfo.name).pkg - ++ lib.optional isLocal buildSystemPkgs - ); - - propagatedBuildInputs = let - compat = isCompatible python.pythonVersion; - deps = lib.filterAttrs (n: v: v) ( - lib.mapAttrs ( - n: v: - let - constraints = v.python or ""; - in - compat constraints - ) dependencies - ); + buildPythonPackage { + pname = moduleName name; + version = version; + + inherit format; + + doCheck = false; # We never get development deps + + # Stripping pre-built wheels lead to `ELF load command address/offset not properly aligned` + dontStrip = format == "wheel"; + + nativeBuildInputs = [ + pythonPackages.poetry2nixFixupHook + ] + ++ lib.optional (!isSource && (getManyLinuxDeps fileInfo.name).str != null) autoPatchelfHook + ++ lib.optional (format == "pyproject") pythonPackages.removePathDependenciesHook + ; + + buildInputs = ( + baseBuildInputs + ++ lib.optional (!isSource) (getManyLinuxDeps fileInfo.name).pkg + ++ lib.optional isLocal buildSystemPkgs + ); + + propagatedBuildInputs = + let + compat = isCompatible (poetryLib.getPythonVersion python); + deps = lib.filterAttrs (n: v: v) + ( + lib.mapAttrs + ( + n: v: + let + constraints = v.python or ""; + in + compat constraints + ) dependencies + ); depAttrs = lib.attrNames deps; in - builtins.map (n: pythonPackages.${lib.toLower n}) depAttrs; + builtins.map (n: pythonPackages.${moduleName n}) depAttrs; - meta = { - broken = ! isCompatible python.pythonVersion python-versions; - license = []; - inherit (python.meta) platforms; - }; + meta = { + broken = ! isCompatible (poetryLib.getPythonVersion python) python-versions; + license = [ ]; + inherit (python.meta) platforms; + }; - passthru = { - inherit args; - }; + passthru = { + inherit args; + }; - # We need to retrieve kind from the interpreter and the filename of the package - # Interpreters should declare what wheel types they're compatible with (python type + ABI) - # Here we can then choose a file based on that info. - src = if isGit then ( + # We need to retrieve kind from the interpreter and the filename of the package + # Interpreters should declare what wheel types they're compatible with (python type + ABI) + # Here we can then choose a file based on that info. + src = + if isGit then ( builtins.fetchGit { inherit (source) url; rev = source.reference; @@ -154,6 +150,5 @@ pythonPackages.callPackage ( pname = name; inherit (fileInfo) file hash kind; }; - } - -) {} + } + ) { } diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index 04340ac4e89..d18e6b8293f 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -1,4 +1,4 @@ -{ pkgs ? import {} +{ pkgs ? import { } , lib ? pkgs.lib , stdenv ? pkgs.stdenv }: @@ -6,202 +6,256 @@ self: super: { - astroid = super.astroid.overridePythonAttrs ( - old: rec { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; - doCheck = false; - } - ); + astroid = super.astroid.overridePythonAttrs + ( + old: rec { + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + doCheck = false; + } + ); - av = super.av.overridePythonAttrs ( - old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ - pkgs.pkgconfig - ]; - buildInputs = old.buildInputs ++ [ pkgs.ffmpeg_4 ]; - } - ); + av = super.av.overridePythonAttrs + ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ + pkgs.pkgconfig + ]; + buildInputs = old.buildInputs ++ [ pkgs.ffmpeg_4 ]; + } + ); - bcrypt = super.bcrypt.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ pkgs.libffi ]; - } - ); + bcrypt = super.bcrypt.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ pkgs.libffi ]; + } + ); cffi = # cffi is bundled with pypy if self.python.implementation == "pypy" then null else ( - super.cffi.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ pkgs.libffi ]; - } - ) + super.cffi.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ pkgs.libffi ]; + } + ) ); - cftime = super.cftime.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ - self.cython - ]; - } - ); + cftime = super.cftime.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ + self.cython + ]; + } + ); - cryptography = super.cryptography.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ pkgs.openssl ]; - } - ); + configparser = super.configparser.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ + self.toml + ]; - django = ( - super.django.overridePythonAttrs ( + postPatch = '' + substituteInPlace setup.py --replace 'setuptools.setup()' 'setuptools.setup(version="${old.version}")' + ''; + } + ); + + cryptography = super.cryptography.overridePythonAttrs + ( old: { - propagatedNativeBuildInputs = (old.propagatedNativeBuildInputs or []) - ++ [ pkgs.gettext ]; + buildInputs = old.buildInputs ++ [ pkgs.openssl ]; } - ) - ); + ); - django-bakery = super.django-bakery.overridePythonAttrs ( - old: { - configurePhase = '' - if ! test -e LICENSE; then - touch LICENSE - fi - '' + (old.configurePhase or ""); - } + django = ( + super.django.overridePythonAttrs + ( + old: { + propagatedNativeBuildInputs = (old.propagatedNativeBuildInputs or [ ]) + ++ [ pkgs.gettext ]; + } + ) ); - dlib = super.dlib.overridePythonAttrs ( - old: { - # Parallel building enabled - inherit (pkgs.python.pkgs.dlib) patches; + django-bakery = super.django-bakery.overridePythonAttrs + ( + old: { + configurePhase = '' + if ! test -e LICENSE; then + touch LICENSE + fi + '' + (old.configurePhase or ""); + } + ); + + dlib = super.dlib.overridePythonAttrs + ( + old: { + # Parallel building enabled + inherit (pkgs.python.pkgs.dlib) patches; - enableParallelBuilding = true; - dontUseCmakeConfigure = true; + enableParallelBuilding = true; + dontUseCmakeConfigure = true; - nativeBuildInputs = old.nativeBuildInputs ++ pkgs.dlib.nativeBuildInputs; - buildInputs = old.buildInputs ++ pkgs.dlib.buildInputs; - } - ); + nativeBuildInputs = old.nativeBuildInputs ++ pkgs.dlib.nativeBuildInputs; + buildInputs = old.buildInputs ++ pkgs.dlib.buildInputs; + } + ); # Environment markers are not always included (depending on how a dep was defined) enum34 = if self.pythonAtLeast "3.4" then null else super.enum34; - faker = super.faker.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; - doCheck = false; - } - ); + faker = super.faker.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + doCheck = false; + } + ); - fancycompleter = super.fancycompleter.overridePythonAttrs ( - old: { - postPatch = '' - substituteInPlace setup.py \ - --replace 'setup_requires="setupmeta"' 'setup_requires=[]' \ - --replace 'versioning="devcommit"' 'version="${old.version}"' - ''; - } - ); + fancycompleter = super.fancycompleter.overridePythonAttrs + ( + old: { + postPatch = '' + substituteInPlace setup.py \ + --replace 'setup_requires="setupmeta"' 'setup_requires=[]' \ + --replace 'versioning="devcommit"' 'version="${old.version}"' + ''; + } + ); - fastparquet = super.fastparquet.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; - } - ); + fastparquet = super.fastparquet.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + } + ); - grandalf = super.grandalf.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; - doCheck = false; - } - ); + grandalf = super.grandalf.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + doCheck = false; + } + ); - h5py = super.h5py.overridePythonAttrs ( - old: rec { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; - buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkgconfig self.cython ]; - configure_flags = "--hdf5=${pkgs.hdf5}"; - postConfigure = '' - ${self.python.executable} setup.py configure ${configure_flags} - ''; - } - ); + h5py = super.h5py.overridePythonAttrs + ( + old: + if old.format != "wheel" then rec { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; + buildInputs = old.buildInputs ++ [ pkgs.hdf5 self.pkgconfig self.cython ]; + configure_flags = "--hdf5=${pkgs.hdf5}"; + postConfigure = '' + ${self.python.executable} setup.py configure ${configure_flags} + ''; + } else old + ); - horovod = super.horovod.overridePythonAttrs ( - old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.openmpi ]; - } - ); + horovod = super.horovod.overridePythonAttrs + ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.openmpi ]; + } + ); # importlib-metadata has an incomplete dependency specification - importlib-metadata = super.importlib-metadata.overridePythonAttrs ( - old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ lib.optional self.python.isPy2 self.pathlib2; - } - ); + importlib-metadata = super.importlib-metadata.overridePythonAttrs + ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ lib.optional self.python.isPy2 self.pathlib2; + } + ); - jupyter = super.jupyter.overridePythonAttrs ( - old: rec { - # jupyter is a meta-package. Everything relevant comes from the - # dependencies. It does however have a jupyter.py file that conflicts - # with jupyter-core so this meta solves this conflict. - meta.priority = 100; - } - ); + isort = super.isort.overridePythonAttrs + ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.setuptools ]; + } + ); - lap = super.lap.overridePythonAttrs ( - old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ - self.numpy - ]; - } - ); + jupyter = super.jupyter.overridePythonAttrs + ( + old: rec { + # jupyter is a meta-package. Everything relevant comes from the + # dependencies. It does however have a jupyter.py file that conflicts + # with jupyter-core so this meta solves this conflict. + meta.priority = 100; + } + ); - llvmlite = super.llvmlite.overridePythonAttrs ( - old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.llvm ]; + kiwisolver = super.kiwisolver.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ + # cppy is at the time of writing not in nixpkgs + (self.cppy or null) + ]; + } + ); - # Disable static linking - # https://github.com/numba/llvmlite/issues/93 - postPatch = '' - substituteInPlace ffi/Makefile.linux --replace "-static-libstdc++" "" + lap = super.lap.overridePythonAttrs + ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + self.numpy + ]; + } + ); - substituteInPlace llvmlite/tests/test_binding.py --replace "test_linux" "nope" - ''; + llvmlite = super.llvmlite.overridePythonAttrs + ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.llvm ]; - # Set directory containing llvm-config binary - preConfigure = '' - export LLVM_CONFIG=${pkgs.llvm}/bin/llvm-config - ''; + # Disable static linking + # https://github.com/numba/llvmlite/issues/93 + postPatch = '' + substituteInPlace ffi/Makefile.linux --replace "-static-libstdc++" "" - __impureHostDeps = pkgs.stdenv.lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; + substituteInPlace llvmlite/tests/test_binding.py --replace "test_linux" "nope" + ''; - passthru = old.passthru // { llvm = pkgs.llvm; }; - } - ); + # Set directory containing llvm-config binary + preConfigure = '' + export LLVM_CONFIG=${pkgs.llvm}/bin/llvm-config + ''; - lockfile = super.lockfile.overridePythonAttrs ( - old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pbr ]; - } - ); + __impureHostDeps = pkgs.stdenv.lib.optionals pkgs.stdenv.isDarwin [ "/usr/lib/libm.dylib" ]; - lxml = super.lxml.overridePythonAttrs ( - old: { - nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ pkgconfig libxml2.dev libxslt.dev ]; - buildInputs = with pkgs; old.buildInputs ++ [ libxml2 libxslt ]; - } - ); + passthru = old.passthru // { llvm = pkgs.llvm; }; + } + ); - markupsafe = super.markupsafe.overridePythonAttrs ( - old: { - src = old.src.override { pname = builtins.replaceStrings [ "markupsafe" ] [ "MarkupSafe" ] old.pname; }; - } - ); + lockfile = super.lockfile.overridePythonAttrs + ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pbr ]; + } + ); + + lxml = super.lxml.overridePythonAttrs + ( + old: { + nativeBuildInputs = with pkgs; old.nativeBuildInputs ++ [ pkgconfig libxml2.dev libxslt.dev ]; + buildInputs = with pkgs; old.buildInputs ++ [ libxml2 libxslt ]; + } + ); + + markupsafe = super.markupsafe.overridePythonAttrs + ( + old: { + src = old.src.override { pname = builtins.replaceStrings [ "markupsafe" ] [ "MarkupSafe" ] old.pname; }; + } + ); - matplotlib = super.matplotlib.overridePythonAttrs ( - old: + matplotlib = super.matplotlib.overridePythonAttrs + ( + old: let enableGhostscript = old.passthru.enableGhostscript or false; enableGtk3 = old.passthru.enableTk or false; @@ -210,484 +264,583 @@ self: super: inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; in - { - NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${pkgs.libcxx}/include/c++/v1"; + { + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${pkgs.libcxx}/include/c++/v1"; - XDG_RUNTIME_DIR = "/tmp"; + XDG_RUNTIME_DIR = "/tmp"; - buildInputs = old.buildInputs + buildInputs = old.buildInputs ++ lib.optional enableGhostscript pkgs.ghostscript ++ lib.optional stdenv.isDarwin [ Cocoa ]; - nativeBuildInputs = old.nativeBuildInputs ++ [ - pkgs.pkgconfig - ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ + pkgs.pkgconfig + ]; - propagatedBuildInputs = old.propagatedBuildInputs ++ [ - pkgs.libpng - pkgs.freetype - ] + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + pkgs.libpng + pkgs.freetype + ] ++ stdenv.lib.optionals enableGtk3 [ pkgs.cairo self.pycairo pkgs.gtk3 pkgs.gobject-introspection self.pygobject3 ] ++ stdenv.lib.optionals enableTk [ pkgs.tcl pkgs.tk self.tkinter pkgs.libX11 ] ++ stdenv.lib.optionals enableQt [ self.pyqt5 ] - ; + ; - inherit (super.matplotlib) patches; - } - ); + inherit (super.matplotlib) patches; + } + ); # Calls Cargo at build time for source builds and is really tricky to package maturin = super.maturin.override { preferWheel = true; }; - mccabe = super.mccabe.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; - doCheck = false; - } - ); + mccabe = super.mccabe.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + doCheck = false; + } + ); - netcdf4 = super.netcdf4.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ - self.cython - ]; - - propagatedBuildInputs = old.propagatedBuildInputs ++ [ - pkgs.zlib - pkgs.netcdf - pkgs.hdf5 - pkgs.curl - pkgs.libjpeg - ]; - - # Variables used to configure the build process - USE_NCCONFIG = "0"; - HDF5_DIR = lib.getDev pkgs.hdf5; - NETCDF4_DIR = pkgs.netcdf; - CURL_DIR = pkgs.curl.dev; - JPEG_DIR = pkgs.libjpeg.dev; - } - ); + netcdf4 = super.netcdf4.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ + self.cython + ]; - numpy = super.numpy.overridePythonAttrs ( - old: + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + pkgs.zlib + pkgs.netcdf + pkgs.hdf5 + pkgs.curl + pkgs.libjpeg + ]; + + # Variables used to configure the build process + USE_NCCONFIG = "0"; + HDF5_DIR = lib.getDev pkgs.hdf5; + NETCDF4_DIR = pkgs.netcdf; + CURL_DIR = pkgs.curl.dev; + JPEG_DIR = pkgs.libjpeg.dev; + } + ); + + numpy = super.numpy.overridePythonAttrs + ( + old: let blas = old.passthru.args.blas or pkgs.openblasCompat; - lapack = old.passthru.args.lapack or pkgs.openblasCompat; + blasImplementation = lib.nameFromURL blas.name "-"; cfg = pkgs.writeTextFile { name = "site.cfg"; - text = (lib.generators.toINI {} { - ${blas.implementation} = { - include_dirs = "${blas}/include:${lapack}/include"; - library_dirs = "${blas}/lib:${lapack}/lib"; - }; - }); + text = ( + lib.generators.toINI { } { + ${blasImplementation} = { + include_dirs = "${blas}/include"; + library_dirs = "${blas}/lib"; + } // lib.optionalAttrs (blasImplementation == "mkl") { + mkl_libs = "mkl_rt"; + lapack_libs = ""; + }; + } + ); }; in - { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ]; - buildInputs = old.buildInputs ++ [ blas self.cython ]; - enableParallelBuilding = true; - preBuild = '' - ln -s ${cfg} site.cfg - ''; - passthru = old.passthru // { - blsaImplementation = blas.implementation; - inherit blas cfg; - }; - } - ); + { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ]; + buildInputs = old.buildInputs ++ [ blas self.cython ]; + enableParallelBuilding = true; + preBuild = '' + ln -s ${cfg} site.cfg + ''; + passthru = old.passthru // { + blas = blas; + inherit blasImplementation cfg; + }; + } + ); - openexr = super.openexr.overridePythonAttrs ( - old: rec { - buildInputs = old.buildInputs ++ [ pkgs.openexr pkgs.ilmbase ]; - NIX_CFLAGS_COMPILE = [ "-I${pkgs.openexr.dev}/include/OpenEXR" "-I${pkgs.ilmbase.dev}/include/OpenEXR" ]; - } - ); + openexr = super.openexr.overridePythonAttrs + ( + old: rec { + buildInputs = old.buildInputs ++ [ pkgs.openexr pkgs.ilmbase ]; + NIX_CFLAGS_COMPILE = [ "-I${pkgs.openexr.dev}/include/OpenEXR" "-I${pkgs.ilmbase.dev}/include/OpenEXR" ]; + } + ); - peewee = super.peewee.overridePythonAttrs ( - old: + peewee = super.peewee.overridePythonAttrs + ( + old: let withPostgres = old.passthru.withPostgres or false; withMysql = old.passthru.withMysql or false; in - { - buildInputs = old.buildInputs ++ [ self.cython pkgs.sqlite ]; - propagatedBuildInputs = old.propagatedBuildInputs + { + buildInputs = old.buildInputs ++ [ self.cython pkgs.sqlite ]; + propagatedBuildInputs = old.propagatedBuildInputs ++ lib.optional withPostgres self.psycopg2 ++ lib.optional withMysql self.mysql-connector; - } - ); + } + ); - pillow = super.pillow.overridePythonAttrs ( - old: { - nativeBuildInputs = [ pkgs.pkgconfig ] ++ old.nativeBuildInputs; - buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ old.buildInputs; - } - ); + pillow = super.pillow.overridePythonAttrs + ( + old: { + nativeBuildInputs = [ pkgs.pkgconfig ] ++ old.nativeBuildInputs; + buildInputs = with pkgs; [ freetype libjpeg zlib libtiff libwebp tcl lcms2 ] ++ old.buildInputs; + } + ); - psycopg2 = super.psycopg2.overridePythonAttrs ( - old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ]; - } - ); + psycopg2 = super.psycopg2.overridePythonAttrs + ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ]; + } + ); - psycopg2-binary = super.psycopg2-binary.overridePythonAttrs ( - old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ]; - } - ); + psycopg2-binary = super.psycopg2-binary.overridePythonAttrs + ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ]; + } + ); - pyarrow = super.pyarrow.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ - self.cython - ]; - } - ); + pyarrow = + if lib.versionAtLeast super.pyarrow.version "0.16.0" then super.pyarrow.overridePythonAttrs + ( + old: + let + parseMinor = drv: lib.concatStringsSep "." (lib.take 2 (lib.splitVersion drv.version)); + _arrow-cpp = pkgs.arrow-cpp.override { inherit (self) python; }; + ARROW_HOME = _arrow-cpp; + arrowCppVersion = parseMinor pkgs.arrow-cpp; + pyArrowVersion = parseMinor super.pyarrow; + errorMessage = "arrow-cpp version (${arrowCppVersion}) mismatches pyarrow version (${pyArrowVersion})"; + in + if arrowCppVersion != pyArrowVersion then throw errorMessage else { - pycairo = ( - drv: ( - drv.overridePythonAttrs ( - _: { - format = "other"; - } - ) - ).overridePythonAttrs ( - old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ + self.cython + pkgs.pkgconfig + pkgs.cmake + ]; - nativeBuildInputs = old.nativeBuildInputs ++ [ - pkgs.meson - pkgs.ninja - pkgs.pkgconfig - ]; + preBuild = '' + export PYARROW_PARALLEL=$NIX_BUILD_CORES + ''; - propagatedBuildInputs = old.propagatedBuildInputs ++ [ - pkgs.cairo - pkgs.xlibsWrapper - ]; + PARQUET_HOME = _arrow-cpp; + inherit ARROW_HOME; - mesonFlags = [ "-Dpython=${if self.isPy3k then "python3" else "python"}" ]; - } - ) - ) super.pycairo; + buildInputs = old.buildInputs ++ [ + pkgs.arrow-cpp + ]; - pycocotools = super.pycocotools.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ - self.cython - self.numpy - ]; - } - ); + PYARROW_BUILD_TYPE = "release"; + PYARROW_WITH_PARQUET = true; + PYARROW_CMAKE_OPTIONS = [ + "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib" - pygobject = super.pygobject.overridePythonAttrs ( - old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; - buildInputs = old.buildInputs ++ [ pkgs.glib pkgs.gobject-introspection ]; - } - ); + # This doesn't use setup hook to call cmake so we need to workaround #54606 + # ourselves + "-DCMAKE_POLICY_DEFAULT_CMP0025=NEW" + ]; - pylint = super.pylint.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ self.pytest-runner ]; - doCheck = false; - } - ); + dontUseCmakeConfigure = true; + } + ) else super.pyarrow.overridePythonAttrs + ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ + self.cython + ]; + } + ); - pyopenssl = super.pyopenssl.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ pkgs.openssl ]; - } - ); + pycairo = + ( + drv: ( + drv.overridePythonAttrs + ( + _: { + format = "other"; + } + ) + ).overridePythonAttrs + ( + old: { - pyqt5 = let - drv = super.pyqt5; - withConnectivity = drv.passthru.args.withConnectivity or false; - withMultimedia = drv.passthru.args.withMultimedia or false; - withWebKit = drv.passthru.args.withWebKit or false; - withWebSockets = drv.passthru.args.withWebSockets or false; - in - super.pyqt5.overridePythonAttrs ( - old: { - format = "other"; + nativeBuildInputs = old.nativeBuildInputs ++ [ + pkgs.meson + pkgs.ninja + pkgs.pkgconfig + ]; - nativeBuildInputs = old.nativeBuildInputs ++ [ - pkgs.pkgconfig - pkgs.qt5.qmake - pkgs.xorg.lndir - pkgs.qt5.qtbase - pkgs.qt5.qtsvg - pkgs.qt5.qtdeclarative - pkgs.qt5.qtwebchannel - # self.pyqt5-sip - self.sip - ] - ++ lib.optional withConnectivity pkgs.qt5.qtconnectivity - ++ lib.optional withMultimedia pkgs.qt5.qtmultimedia - ++ lib.optional withWebKit pkgs.qt5.qtwebkit - ++ lib.optional withWebSockets pkgs.qt5.qtwebsockets - ; + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + pkgs.cairo + pkgs.xlibsWrapper + ]; - buildInputs = old.buildInputs ++ [ - pkgs.dbus - pkgs.qt5.qtbase - pkgs.qt5.qtsvg - pkgs.qt5.qtdeclarative - self.sip - ] - ++ lib.optional withConnectivity pkgs.qt5.qtconnectivity - ++ lib.optional withWebKit pkgs.qt5.qtwebkit - ++ lib.optional withWebSockets pkgs.qt5.qtwebsockets - ; + mesonFlags = [ "-Dpython=${ if self.isPy3k then "python3" else "python"}" ]; + } + ) + ) super.pycairo; - # Fix dbus mainloop - patches = pkgs.python3.pkgs.pyqt5.patches or []; + pycocotools = super.pycocotools.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ + self.cython + self.numpy + ]; + } + ); - configurePhase = '' - runHook preConfigure + pygobject = super.pygobject.overridePythonAttrs + ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; + buildInputs = old.buildInputs ++ [ pkgs.glib pkgs.gobject-introspection ]; + } + ); - export PYTHONPATH=$PYTHONPATH:$out/${self.python.sitePackages} + pylint = super.pylint.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + doCheck = false; + } + ); - mkdir -p $out/${self.python.sitePackages}/dbus/mainloop - ${self.python.executable} configure.py -w \ - --confirm-license \ - --no-qml-plugin \ - --bindir=$out/bin \ - --destdir=$out/${self.python.sitePackages} \ - --stubsdir=$out/${self.python.sitePackages}/PyQt5 \ - --sipdir=$out/share/sip/PyQt5 \ - --designer-plugindir=$out/plugins/designer + pyopenssl = super.pyopenssl.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ pkgs.openssl ]; + } + ); - runHook postConfigure - ''; + pyqt5 = + let + drv = super.pyqt5; + withConnectivity = drv.passthru.args.withConnectivity or false; + withMultimedia = drv.passthru.args.withMultimedia or false; + withWebKit = drv.passthru.args.withWebKit or false; + withWebSockets = drv.passthru.args.withWebSockets or false; + in + super.pyqt5.overridePythonAttrs + ( + old: { + format = "other"; - postInstall = '' - ln -s ${self.pyqt5-sip}/${self.python.sitePackages}/PyQt5/sip.* $out/${self.python.sitePackages}/PyQt5/ - for i in $out/bin/*; do - wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH" - done - - # Let's make it a namespace package - cat << EOF > $out/${self.python.sitePackages}/PyQt5/__init__.py - from pkgutil import extend_path - __path__ = extend_path(__path__, __name__) - EOF - ''; + nativeBuildInputs = old.nativeBuildInputs ++ [ + pkgs.pkgconfig + pkgs.qt5.qmake + pkgs.xorg.lndir + pkgs.qt5.qtbase + pkgs.qt5.qtsvg + pkgs.qt5.qtdeclarative + pkgs.qt5.qtwebchannel + # self.pyqt5-sip + self.sip + ] + ++ lib.optional withConnectivity pkgs.qt5.qtconnectivity + ++ lib.optional withMultimedia pkgs.qt5.qtmultimedia + ++ lib.optional withWebKit pkgs.qt5.qtwebkit + ++ lib.optional withWebSockets pkgs.qt5.qtwebsockets + ; - installCheckPhase = let - modules = [ - "PyQt5" - "PyQt5.QtCore" - "PyQt5.QtQml" - "PyQt5.QtWidgets" - "PyQt5.QtGui" + buildInputs = old.buildInputs ++ [ + pkgs.dbus + pkgs.qt5.qtbase + pkgs.qt5.qtsvg + pkgs.qt5.qtdeclarative + self.sip ] - ++ lib.optional withWebSockets "PyQt5.QtWebSockets" - ++ lib.optional withWebKit "PyQt5.QtWebKit" - ++ lib.optional withMultimedia "PyQt5.QtMultimedia" - ++ lib.optional withConnectivity "PyQt5.QtConnectivity" + ++ lib.optional withConnectivity pkgs.qt5.qtconnectivity + ++ lib.optional withWebKit pkgs.qt5.qtwebkit + ++ lib.optional withWebSockets pkgs.qt5.qtwebsockets ; - imports = lib.concatMapStrings (module: "import ${module};") modules; - in - '' - echo "Checking whether modules can be imported..." - ${self.python.interpreter} -c "${imports}" + # Fix dbus mainloop + patches = pkgs.python3.pkgs.pyqt5.patches or [ ]; + + configurePhase = '' + runHook preConfigure + + export PYTHONPATH=$PYTHONPATH:$out/${self.python.sitePackages} + + mkdir -p $out/${self.python.sitePackages}/dbus/mainloop + ${self.python.executable} configure.py -w \ + --confirm-license \ + --no-qml-plugin \ + --bindir=$out/bin \ + --destdir=$out/${self.python.sitePackages} \ + --stubsdir=$out/${self.python.sitePackages}/PyQt5 \ + --sipdir=$out/share/sip/PyQt5 \ + --designer-plugindir=$out/plugins/designer + + runHook postConfigure ''; - doCheck = true; + postInstall = '' + ln -s ${self.pyqt5-sip}/${self.python.sitePackages}/PyQt5/sip.* $out/${self.python.sitePackages}/PyQt5/ + for i in $out/bin/*; do + wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH" + done + + # Let's make it a namespace package + cat << EOF > $out/${self.python.sitePackages}/PyQt5/__init__.py + from pkgutil import extend_path + __path__ = extend_path(__path__, __name__) + EOF + ''; - enableParallelBuilding = true; + installCheckPhase = + let + modules = [ + "PyQt5" + "PyQt5.QtCore" + "PyQt5.QtQml" + "PyQt5.QtWidgets" + "PyQt5.QtGui" + ] + ++ lib.optional withWebSockets "PyQt5.QtWebSockets" + ++ lib.optional withWebKit "PyQt5.QtWebKit" + ++ lib.optional withMultimedia "PyQt5.QtMultimedia" + ++ lib.optional withConnectivity "PyQt5.QtConnectivity" + ; + imports = lib.concatMapStrings (module: "import ${module};") modules; + in + '' + echo "Checking whether modules can be imported..." + ${self.python.interpreter} -c "${imports}" + ''; + + doCheck = true; + + enableParallelBuilding = true; + } + ); + + pytest-datadir = super.pytest-datadir.overridePythonAttrs + ( + old: { + postInstall = '' + rm -f $out/LICENSE + ''; } ); - pytest-datadir = super.pytest-datadir.overridePythonAttrs ( - old: { - postInstall = '' - rm -f $out/LICENSE - ''; - } - ); - - pytest = super.pytest.overridePythonAttrs ( - old: { - doCheck = false; - } - ); + pytest = super.pytest.overridePythonAttrs + ( + old: { + doCheck = false; + } + ); pytest-runner = super.pytest-runner or super.pytestrunner; - python-prctl = super.python-prctl.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ - pkgs.libcap - ]; - } - ); + python-jose = super.python-jose.overridePythonAttrs + ( + old: { + postPath = '' + substituteInPlace setup.py --replace "'pytest-runner'," "" + substituteInPlace setup.py --replace "'pytest-runner'" "" + ''; + } + ); - pyzmq = super.pyzmq.overridePythonAttrs ( - old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; - propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.zeromq ]; - } - ); + python-prctl = super.python-prctl.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ + pkgs.libcap + ]; + } + ); - rockset = super.rockset.overridePythonAttrs ( - old: rec { - postPatch = '' - cp ./setup_rockset.py ./setup.py - ''; - } - ); + pyzmq = super.pyzmq.overridePythonAttrs + ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; + propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.zeromq ]; + } + ); - scaleapi = super.scaleapi.overridePythonAttrs ( - old: { - postPatch = '' - substituteInPlace setup.py --replace "install_requires = ['requests>=2.4.2', 'enum34']" "install_requires = ['requests>=2.4.2']" || true - ''; - } - ); + rockset = super.rockset.overridePythonAttrs + ( + old: rec { + postPatch = '' + cp ./setup_rockset.py ./setup.py + ''; + } + ); - pandas = super.pandas.overridePythonAttrs ( - old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ self.cython ]; - } - ); + scaleapi = super.scaleapi.overridePythonAttrs + ( + old: { + postPatch = '' + substituteInPlace setup.py --replace "install_requires = ['requests>=2.4.2', 'enum34']" "install_requires = ['requests>=2.4.2']" || true + ''; + } + ); + + pandas = super.pandas.overridePythonAttrs + ( + old: { + nativeBuildInputs = old.nativeBuildInputs ++ [ self.cython ]; + } + ); # Pybind11 is an undeclared dependency of scipy that we need to pick from nixpkgs # Make it not fail with infinite recursion - pybind11 = super.pybind11.overridePythonAttrs ( - old: { - cmakeFlags = (old.cmakeFlags or []) ++ [ - "-DPYBIND11_TEST=off" - ]; - doCheck = false; # Circular test dependency - } - ); - - scipy = super.scipy.overridePythonAttrs ( - old: { - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ]; - propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pybind11 ]; - setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; - enableParallelBuilding = true; - buildInputs = old.buildInputs ++ [ self.numpy.blas ]; - preConfigure = '' - sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py - export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES - ''; - preBuild = '' - ln -s ${self.numpy.cfg} site.cfg - ''; - } - ); + pybind11 = super.pybind11.overridePythonAttrs + ( + old: { + cmakeFlags = (old.cmakeFlags or [ ]) ++ [ + "-DPYBIND11_TEST=off" + ]; + doCheck = false; # Circular test dependency + } + ); - scikit-learn = super.scikit-learn.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ - pkgs.gfortran - pkgs.glibcLocales - ] ++ lib.optionals stdenv.cc.isClang [ - pkgs.llvmPackages.openmp - ]; + scipy = super.scipy.overridePythonAttrs + ( + old: + if old.format != "wheel" then { + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.gfortran ]; + propagatedBuildInputs = old.propagatedBuildInputs ++ [ self.pybind11 ]; + setupPyBuildFlags = [ "--fcompiler='gnu95'" ]; + enableParallelBuilding = true; + buildInputs = old.buildInputs ++ [ self.numpy.blas ]; + preConfigure = '' + sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py + export NPY_NUM_BUILD_JOBS=$NIX_BUILD_CORES + ''; + preBuild = '' + ln -s ${self.numpy.cfg} site.cfg + ''; + } else old + ); - nativeBuildInputs = old.nativeBuildInputs ++ [ - self.cython - ]; + scikit-learn = super.scikit-learn.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ [ + pkgs.gfortran + pkgs.glibcLocales + ] ++ lib.optionals stdenv.cc.isClang [ + pkgs.llvmPackages.openmp + ]; - enableParallelBuilding = true; - } - ); + nativeBuildInputs = old.nativeBuildInputs ++ [ + self.cython + ]; - shapely = super.shapely.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ [ pkgs.geos self.cython ]; - inherit (pkgs.python3.pkgs.shapely) patches GEOS_LIBRARY_PATH; - } - ); + enableParallelBuilding = true; + } + ); - shellingham = if lib.versionAtLeast super.shellingham.version "1.3.2" then ( - super.shellingham.overridePythonAttrs ( + shapely = super.shapely.overridePythonAttrs + ( old: { - format = "pyproject"; + buildInputs = old.buildInputs ++ [ pkgs.geos self.cython ]; + inherit (pkgs.python3.pkgs.shapely) patches GEOS_LIBRARY_PATH; } - ) - ) else super.shellingham; + ); - tables = super.tables.overridePythonAttrs ( - old: { - HDF5_DIR = "${pkgs.hdf5}"; - nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; - propagatedBuildInputs = old.nativeBuildInputs ++ [ pkgs.hdf5 self.numpy self.numexpr ]; - } - ); + shellingham = + if lib.versionAtLeast super.shellingham.version "1.3.2" then ( + super.shellingham.overridePythonAttrs + ( + old: { + format = "pyproject"; + } + ) + ) else super.shellingham; - tensorpack = super.tensorpack.overridePythonAttrs ( - old: { - postPatch = '' - substituteInPlace setup.cfg --replace "# will call find_packages()" "" - ''; - } - ); + tables = super.tables.overridePythonAttrs + ( + old: { + HDF5_DIR = "${pkgs.hdf5}"; + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkgconfig ]; + propagatedBuildInputs = old.nativeBuildInputs ++ [ pkgs.hdf5 self.numpy self.numexpr ]; + } + ); - urwidtrees = super.urwidtrees.overridePythonAttrs ( - old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ - self.urwid - ]; - } - ); + tensorpack = super.tensorpack.overridePythonAttrs + ( + old: { + postPatch = '' + substituteInPlace setup.cfg --replace "# will call find_packages()" "" + ''; + } + ); - vose-alias-method = super.vose-alias-method.overridePythonAttrs ( - old: { - postInstall = '' - rm -f $out/LICENSE - ''; - } - ); + urwidtrees = super.urwidtrees.overridePythonAttrs + ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + self.urwid + ]; + } + ); - uvloop = super.uvloop.overridePythonAttrs ( - old: { - buildInputs = old.buildInputs ++ lib.optionals stdenv.isDarwin [ - pkgs.darwin.apple_sdk.frameworks.ApplicationServices - pkgs.darwin.apple_sdk.frameworks.CoreServices - ]; - } - ); + vose-alias-method = super.vose-alias-method.overridePythonAttrs + ( + old: { + postInstall = '' + rm -f $out/LICENSE + ''; + } + ); + + uvloop = super.uvloop.overridePythonAttrs + ( + old: { + buildInputs = old.buildInputs ++ lib.optionals stdenv.isDarwin [ + pkgs.darwin.apple_sdk.frameworks.ApplicationServices + pkgs.darwin.apple_sdk.frameworks.CoreServices + ]; + } + ); # Stop infinite recursion by using bootstrapped pkg from nixpkgs wheel = ( pkgs.python3.pkgs.override { python = self.python; } - ).wheel.overridePythonAttrs ( - _: { - inherit (super.wheel) pname name version src; - } - ); + ).wheel.overridePythonAttrs + ( + old: + if old.format == "other" then old else { + inherit (super.wheel) pname name version src; + } + ); zipp = ( if lib.versionAtLeast super.zipp.version "2.0.0" then ( - super.zipp.overridePythonAttrs ( - old: { - prePatch = '' - substituteInPlace setup.py --replace \ - 'setuptools.setup()' \ - 'setuptools.setup(version="${super.zipp.version}")' - ''; - } - ) + super.zipp.overridePythonAttrs + ( + old: { + prePatch = '' + substituteInPlace setup.py --replace \ + 'setuptools.setup()' \ + 'setuptools.setup(version="${super.zipp.version}")' + ''; + } + ) ) else super.zipp - ).overridePythonAttrs ( - old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ [ - self.toml - ]; - } - ); + ).overridePythonAttrs + ( + old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + self.toml + ]; + } + ); } diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix index cda4e8c78d4..496c4ff1581 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix @@ -12,8 +12,7 @@ let major = builtins.elemAt ver 0; minor = builtins.elemAt ver 1; in - "cp${major}${minor}"; - + "cp${major}${minor}"; abiTag = "${pythonTag}m"; # @@ -24,13 +23,13 @@ let entries = splitString "-" str; p = removeSuffix ".whl" (builtins.elemAt entries 4); in - { - pkgName = builtins.elemAt entries 0; - pkgVer = builtins.elemAt entries 1; - pyVer = builtins.elemAt entries 2; - abi = builtins.elemAt entries 3; - platform = p; - }; + { + pkgName = builtins.elemAt entries 0; + pkgVer = builtins.elemAt entries 1; + pyVer = builtins.elemAt entries 2; + abi = builtins.elemAt entries 3; + platform = p; + }; # # Builds list of acceptable osx wheel files @@ -42,9 +41,9 @@ let v = lib.lists.head versions; vs = lib.lists.tail versions; in - if (builtins.length versions == 0) - then [] - else (builtins.filter (x: hasInfix v x.file) candidates) ++ (findBestMatches vs candidates); + if (builtins.length versions == 0) + then [ ] + else (builtins.filter (x: hasInfix v x.file) candidates) ++ (findBestMatches vs candidates); # pyver = "cpXX" # x = "cpXX" | "py2" | "py3" | "py2.py3" @@ -53,7 +52,7 @@ let normalize = y: ''cp${lib.strings.removePrefix "cp" (lib.strings.removePrefix "py" y)}''; isCompat = p: x: lib.strings.hasPrefix (normalize x) p; in - lib.lists.any (isCompat pyver) (lib.strings.splitString "." x); + lib.lists.any (isCompat pyver) (lib.strings.splitString "." x); # # Selects the best matching wheel file from a list of files @@ -61,42 +60,37 @@ let selectWheel = files: let filesWithoutSources = (builtins.filter (x: hasSuffix ".whl" x.file) files); - isPyAbiCompatible = pyabi: x: x == "none" || pyabi == x; - withPython = ver: abi: x: (isPyVersionCompatible ver x.pyVer) && (isPyAbiCompatible abi x.abi); - - withPlatform = if isLinux - then ( - x: x.platform == "manylinux1_${stdenv.platform.kernelArch}" - || x.platform == "manylinux2010_${stdenv.platform.kernelArch}" - || x.platform == "manylinux2014_${stdenv.platform.kernelArch}" - || x.platform == "any" - ) - else (x: hasInfix "macosx" x.platform || x.platform == "any"); - + withPlatform = + if isLinux + then ( + x: x.platform == "manylinux1_${stdenv.platform.kernelArch}" + || x.platform == "manylinux2010_${stdenv.platform.kernelArch}" + || x.platform == "manylinux2014_${stdenv.platform.kernelArch}" + || x.platform == "any" + ) + else (x: hasInfix "macosx" x.platform || x.platform == "any"); filterWheel = x: let f = toWheelAttrs x.file; in - (withPython pythonTag abiTag f) && (withPlatform f); - + (withPython pythonTag abiTag f) && (withPlatform f); filtered = builtins.filter filterWheel filesWithoutSources; - choose = files: let osxMatches = [ "10_12" "10_11" "10_10" "10_9" "any" ]; linuxMatches = [ "manylinux1_" "manylinux2010_" "manylinux2014_" "any" ]; - chooseLinux = x: lib.singleton (builtins.head (findBestMatches linuxMatches x)); - chooseOSX = x: lib.singleton (builtins.head (findBestMatches osxMatches x)); + chooseLinux = x: lib.take 1 (findBestMatches linuxMatches x); + chooseOSX = x: lib.take 1 (findBestMatches osxMatches x); in - if isLinux - then chooseLinux files - else chooseOSX files; + if isLinux + then chooseLinux files + else chooseOSX files; in - if (builtins.length filtered == 0) - then [] - else choose (filtered); + if (builtins.length filtered == 0) + then [ ] + else choose (filtered); in { inherit selectWheel toWheelAttrs isPyVersionCompatible; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix index 67ffdddb4bd..773e0a60e09 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep508.nix @@ -7,7 +7,6 @@ let # Strip leading/trailing whitespace from string stripStr = s: lib.elemAt (builtins.split "^ *" (lib.elemAt (builtins.split " *$" s) 0)) 2; - findSubExpressionsFun = acc: c: ( if c == "(" then ( let @@ -15,23 +14,23 @@ let isOpen = acc.openP == 0; startPos = if isOpen then posNew else acc.startPos; in - acc // { - inherit startPos; - exprs = acc.exprs ++ [ (substr acc.exprPos (acc.pos - 1) acc.expr) ]; - pos = posNew; - openP = acc.openP + 1; - } + acc // { + inherit startPos; + exprs = acc.exprs ++ [ (substr acc.exprPos (acc.pos - 1) acc.expr) ]; + pos = posNew; + openP = acc.openP + 1; + } ) else if c == ")" then ( let openP = acc.openP - 1; exprs = findSubExpressions (substr acc.startPos acc.pos acc.expr); in - acc // { - inherit openP; - pos = acc.pos + 1; - exprs = if openP == 0 then acc.exprs ++ [ exprs ] else acc.exprs; - exprPos = if openP == 0 then acc.pos + 1 else acc.exprPos; - } + acc // { + inherit openP; + pos = acc.pos + 1; + exprs = if openP == 0 then acc.exprs ++ [ exprs ] else acc.exprs; + exprPos = if openP == 0 then acc.pos + 1 else acc.exprPos; + } ) else acc // { pos = acc.pos + 1; } ); @@ -39,7 +38,7 @@ let findSubExpressions = expr: let acc = builtins.foldl' findSubExpressionsFun { - exprs = []; + exprs = [ ]; expr = expr; pos = 0; openP = 0; @@ -47,18 +46,16 @@ let startPos = 0; } (lib.stringToCharacters expr); tailExpr = (substr acc.exprPos acc.pos expr); - tailExprs = if tailExpr != "" then [ tailExpr ] else []; + tailExprs = if tailExpr != "" then [ tailExpr ] else [ ]; in - acc.exprs ++ tailExprs; - + acc.exprs ++ tailExprs; parseExpressions = exprs: let splitCond = ( s: builtins.map - (x: stripStr (if builtins.typeOf x == "list" then (builtins.elemAt x 0) else x)) + (x: stripStr ( if builtins.typeOf x == "list" then (builtins.elemAt x 0) else x)) (builtins.split " (and|or) " (s + " ")) ); - mapfn = expr: ( if (builtins.match "^ ?$" expr != null) then null # Filter empty else if (builtins.elem expr [ "and" "or" ]) then { @@ -70,14 +67,12 @@ let value = expr; } ); - parse = expr: builtins.filter (x: x != null) (builtins.map mapfn (splitCond expr)); in - builtins.foldl' ( - acc: v: acc ++ ( - if builtins.typeOf v == "string" then parse v else [ (parseExpressions v) ] - ) - ) [] exprs; + builtins.foldl' + ( + acc: v: acc ++ ( if builtins.typeOf v == "string" then parse v else [ (parseExpressions v) ]) + ) [ ] exprs; # Transform individual expressions to structured expressions # This function also performs variable substitution, replacing environment markers with their explicit values @@ -94,9 +89,10 @@ let else throw "Unsupported platform" ); platform_machine = stdenv.platform.kernelArch; - platform_python_implementation = let - impl = python.passthru.implementation; - in + platform_python_implementation = + let + impl = python.passthru.implementation; + in ( if impl == "cpython" then "CPython" else if impl == "pypy" then "PyPy" @@ -115,34 +111,32 @@ let implementation_version = python.version; extra = ""; }; - substituteVar = value: if builtins.hasAttr value variables then (builtins.toJSON variables."${value}") else value; - processVar = value: builtins.foldl' (acc: v: v acc) value [ stripStr substituteVar ]; in - if builtins.typeOf exprs == "set" then ( - if exprs.type == "expr" then ( - let - mVal = ''[a-zA-Z0-9\'"_\. ]+''; - mOp = "in|[!=<>]+"; - e = stripStr exprs.value; - m = builtins.map stripStr (builtins.match ''^(${mVal}) *(${mOp}) *(${mVal})$'' e); - in - { - type = "expr"; - value = { - op = builtins.elemAt m 1; - values = [ - (processVar (builtins.elemAt m 0)) - (processVar (builtins.elemAt m 2)) - ]; - }; - } - ) else exprs - ) else builtins.map transformExpressions exprs; + if builtins.typeOf exprs == "set" then ( + if exprs.type == "expr" then ( + let + mVal = ''[a-zA-Z0-9\'"_\. ]+''; + mOp = "in|[!=<>]+"; + e = stripStr exprs.value; + m = builtins.map stripStr (builtins.match ''^(${mVal}) *(${mOp}) *(${mVal})$'' e); + in + { + type = "expr"; + value = { + op = builtins.elemAt m 1; + values = [ + (processVar (builtins.elemAt m 0)) + (processVar (builtins.elemAt m 2)) + ]; + }; + } + ) else exprs + ) else builtins.map transformExpressions exprs; # Recursively eval all expressions evalExpressions = exprs: @@ -165,32 +159,33 @@ let let parts = builtins.splitVersion c; pruned = lib.take ((builtins.length parts) - 1) parts; - upper = builtins.toString ( - (lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1 - ); + upper = builtins.toString + ( + (lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1 + ); upperConstraint = builtins.concatStringsSep "." (ireplace (builtins.length pruned - 1) upper pruned); in - op.">=" v c && op."<" v upperConstraint; + op.">=" v c && op."<" v upperConstraint; "===" = x: y: x == y; "in" = x: y: let values = builtins.filter (x: builtins.typeOf x == "string") (builtins.split " " (unmarshal y)); in - builtins.elem (unmarshal x) values; + builtins.elem (unmarshal x) values; }; in - if builtins.typeOf exprs == "set" then ( - if exprs.type == "expr" then ( - let - expr = exprs; - result = (op."${expr.value.op}") (builtins.elemAt expr.value.values 0) (builtins.elemAt expr.value.values 1); - in - { - type = "value"; - value = result; - } - ) else exprs - ) else builtins.map evalExpressions exprs; + if builtins.typeOf exprs == "set" then ( + if exprs.type == "expr" then ( + let + expr = exprs; + result = (op."${expr.value.op}") (builtins.elemAt expr.value.values 0) (builtins.elemAt expr.value.values 1); + in + { + type = "value"; + value = result; + } + ) else exprs + ) else builtins.map evalExpressions exprs; # Now that we have performed an eval all that's left to do is to concat the graph into a single bool reduceExpressions = exprs: @@ -217,18 +212,18 @@ let cond = "and"; } v; in - acc // { - value = cond."${acc.cond}" acc.value ret.value; - } + acc // { + value = cond."${acc.cond}" acc.value ret.value; + } ) else throw "Unsupported type" ); in - ( - builtins.foldl' reduceExpressionsFun { - value = true; - cond = "and"; - } exprs - ).value; + ( + builtins.foldl' reduceExpressionsFun { + value = true; + cond = "and"; + } exprs + ).value; in e: builtins.foldl' (acc: v: v acc) e [ findSubExpressions diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix b/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix index 07dcbbc5eac..e86b1d3ac66 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/semver.nix @@ -1,28 +1,28 @@ { lib, ireplace }: let inherit (builtins) elemAt match; - - operators = let - matchWildCard = s: match "([^\*])(\.[\*])" s; - mkComparison = ret: version: v: builtins.compareVersions version v == ret; - mkIdxComparison = idx: version: v: - let - ver = builtins.splitVersion v; - minor = builtins.toString (lib.toInt (elemAt ver idx) + 1); - upper = builtins.concatStringsSep "." (ireplace idx minor ver); - in + operators = + let + matchWildCard = s: match "([^\*])(\.[\*])" s; + mkComparison = ret: version: v: builtins.compareVersions version v == ret; + mkIdxComparison = idx: version: v: + let + ver = builtins.splitVersion v; + minor = builtins.toString (lib.toInt (elemAt ver idx) + 1); + upper = builtins.concatStringsSep "." (ireplace idx minor ver); + in operators.">=" version v && operators."<" version upper; - dropWildcardPrecision = f: version: constraint: - let - m = matchWildCard constraint; - hasWildcard = m != null; - c = if hasWildcard then (elemAt m 0) else constraint; - v = - if hasWildcard then (builtins.substring 0 (builtins.stringLength c) version) - else version; - in + dropWildcardPrecision = f: version: constraint: + let + m = matchWildCard constraint; + hasWildcard = m != null; + c = if hasWildcard then (elemAt m 0) else constraint; + v = + if hasWildcard then (builtins.substring 0 (builtins.stringLength c) version) + else version; + in f v c; - in + in { # Prefix operators "==" = dropWildcardPrecision (mkComparison 0); @@ -39,24 +39,23 @@ let # Prune constraint parts = builtins.splitVersion c; pruned = lib.take ((builtins.length parts) - 1) parts; - upper = builtins.toString ( - (lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1 - ); + upper = builtins.toString + ( + (lib.toInt (builtins.elemAt pruned (builtins.length pruned - 1))) + 1 + ); upperConstraint = builtins.concatStringsSep "." (ireplace (builtins.length pruned - 1) upper pruned); in - operators.">=" v c && operators."<" v upperConstraint; + operators.">=" v c && operators."<" v upperConstraint; # Infix operators "-" = version: v: operators.">=" version v.vl && operators."<=" version v.vu; # Arbitrary equality clause, just run simple comparison "===" = v: c: v == c; # }; - re = { operators = "([=> Date: Tue, 5 May 2020 20:32:26 +0000 Subject: lxcfs: 4.0.1 -> 4.0.3 --- pkgs/os-specific/linux/lxcfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix index 65615f5c240..68d05f0be65 100644 --- a/pkgs/os-specific/linux/lxcfs/default.nix +++ b/pkgs/os-specific/linux/lxcfs/default.nix @@ -3,13 +3,13 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "lxcfs-4.0.1"; + name = "lxcfs-4.0.3"; src = fetchFromGitHub { owner = "lxc"; repo = "lxcfs"; rev = name; - sha256 = "09y26ln2wxpi809kd3r352my64aal0yz2a5kin0i25gnvivl32cs"; + sha256 = "0v6c5vc3i1l4sy4iamzdqvwibj6xr1lna4w1hxkn3s6jggcbxwca"; }; nativeBuildInputs = [ pkgconfig help2man autoreconfHook ]; -- cgit v1.2.3 From 19d2c0601bfdf9aec5636c79b0ed49672c0325b3 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 5 May 2020 22:38:19 +0200 Subject: wabt: 1.0.13 -> 1.0.14 https://github.com/WebAssembly/wabt/releases/tag/1.0.14 --- pkgs/development/tools/wabt/default.nix | 13 +++---------- pkgs/development/tools/wabt/version.patch | 28 ---------------------------- 2 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 pkgs/development/tools/wabt/version.patch diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix index 281d68d27de..376593eefb8 100644 --- a/pkgs/development/tools/wabt/default.nix +++ b/pkgs/development/tools/wabt/default.nix @@ -2,25 +2,18 @@ stdenv.mkDerivation rec { pname = "wabt"; - version = "1.0.13"; + version = "1.0.14"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "wabt"; rev = version; - sha256 = "07x8m5sf4c7zjq1flypycw1d15ylqdp38l81vn961ds089ngvpgg"; + sha256 = "0zis0190zs37x1wq044qd2vyvzcrkm8kp0734byz1lpdlgl5257b"; fetchSubmodules = true; }; - patches = [ - (substituteAll { - src = ./version.patch; - inherit version; - }) - ]; - nativeBuildInputs = [ cmake ]; - cmakeFlags = [ "-DBUILD_TESTS=OFF" ]; + cmakeFlags = [ "-DBUILD_TESTS=OFF" "-DCMAKE_PROJECT_VERSION=${version}" ]; buildInputs = [ python3 ]; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/wabt/version.patch b/pkgs/development/tools/wabt/version.patch deleted file mode 100644 index a49cd0bc155..00000000000 --- a/pkgs/development/tools/wabt/version.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 363a5660..ad3300ed 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -68,22 +68,7 @@ endif () - include(CheckTypeSize) - check_type_size(ssize_t SSIZE_T) - check_type_size(size_t SIZEOF_SIZE_T) -- --FIND_PACKAGE(Git QUIET REQUIRED) --EXECUTE_PROCESS(COMMAND -- "${GIT_EXECUTABLE}" --git-dir=${CMAKE_CURRENT_SOURCE_DIR}/.git describe --tags -- RESULT_VARIABLE -- GIT_HASH_RESULT -- OUTPUT_VARIABLE -- GIT_HASH -- OUTPUT_STRIP_TRAILING_WHITESPACE) -- --IF(${GIT_HASH_RESULT} EQUAL 0) -- SET(WABT_VERSION_INFO "${GIT_HASH}") --ELSE() -- MESSAGE(WARNING "Error running git describe to determine version") -- SET(WABT_VERSION_INFO "(unable to determine version)") --ENDIF() -+SET(WABT_VERSION_INFO "@version@") - - configure_file( - ${WABT_SOURCE_DIR}/src/config.h.in -- cgit v1.2.3 From 6baa4e74bfacf406f463f7ada4132e029341b18b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 5 May 2020 22:56:31 +0200 Subject: =?UTF-8?q?wolfssl:=20v4.3.0=20=E2=86=92=20v4.4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: CVE-2020-11713 --- pkgs/development/libraries/wolfssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index 438b40d9140..2815520f517 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wolfssl"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - sha256 = "1gd613k4qh9yhl0d8yh0flqn2cvm9qb5pp2p0khk31b1fh1p4vin"; + sha256 = "1bgkxqgxwa5dvi7fkna64wpcs552f3yxvs6fh6d32v7vg88vpfx9"; }; configureFlags = [ "--enable-all" ]; -- cgit v1.2.3 From 41e53b67c323745bdc9ed20691cba4d3eea56c8c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 21:18:46 +0000 Subject: libsecret: 0.20.2 -> 0.20.3 --- pkgs/development/libraries/libsecret/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsecret/default.nix b/pkgs/development/libraries/libsecret/default.nix index 2dbff9614a7..010a74eab3c 100644 --- a/pkgs/development/libraries/libsecret/default.nix +++ b/pkgs/development/libraries/libsecret/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "libsecret"; - version = "0.20.2"; + version = "0.20.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1hzz34gmsxxf1jm1b7qin390rkwbg8sx198xdkwxqp3q6cw19sc1"; + sha256 = "1r4habxdzmn02id324m0m4mg5isf22q1z436bg3vjjmcz1b3rjsg"; }; postPatch = '' -- cgit v1.2.3 From c528e11e7f8edbe0047026f8ad529681d2d3e131 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 5 Apr 2020 04:56:02 +0000 Subject: rdkafka: 1.3.0 -> 1.4.0 --- pkgs/development/libraries/rdkafka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index f955f464d32..d8f20d74a0d 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rdkafka"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "edenhill"; repo = "librdkafka"; rev = "v${version}"; - sha256 = "1arwpvva2b1m3yd618s59v38gwsi0nnm07g6yc9dapcgxrkg5n0h"; + sha256 = "0axrzjmih1njjpxpwfb6pwjwkjy1b6s5s1sjf165m2cmd6x3vbap"; }; nativeBuildInputs = [ pkgconfig ]; -- cgit v1.2.3 From 861c3c45610eda232ab87071351f054669138d3f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 13:43:58 +0000 Subject: leo-editor: 6.2 -> 6.2.1 --- pkgs/applications/editors/leo-editor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix index f7c6d80dbf1..f09fd2ec277 100644 --- a/pkgs/applications/editors/leo-editor/default.nix +++ b/pkgs/applications/editors/leo-editor/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "leo-editor"; - version = "6.2"; + version = "6.2.1"; src = fetchFromGitHub { owner = "leo-editor"; repo = "leo-editor"; rev = version; - sha256 = "07f10qwvi3p7bskzxnx5rlhlfrh7rx8v0xdlc4vs2271438j1j2z"; + sha256 = "1s9jvxwzsl32clp78g92nq9p2byf08libr5widl1jnkv1cpkbvh9"; }; dontBuild = true; -- cgit v1.2.3 From 0efebee8a61eaa1686c922fd0fa272c808fca17a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 21:48:28 +0000 Subject: librealsense: 2.33.1 -> 2.34.0 --- pkgs/development/libraries/librealsense/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librealsense/default.nix b/pkgs/development/libraries/librealsense/default.nix index a8924ca4782..8fd90c60bda 100644 --- a/pkgs/development/libraries/librealsense/default.nix +++ b/pkgs/development/libraries/librealsense/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "librealsense"; - version = "2.33.1"; + version = "2.34.0"; outputs = [ "out" "dev" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "IntelRealSense"; repo = pname; rev = "v${version}"; - sha256 = "04macplj3k2sdpf1wdjm6gsghak5dzfhi2pmr47qldh2sy2zz0a3"; + sha256 = "0bi7pszrryz18aqna0z73mb1hzz2vqdb0m00pf93hnwc2hba7hwm"; }; buildInputs = [ -- cgit v1.2.3 From 7deafadc522f438bd74d286710a50e912c8ea0b0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 22:01:57 +0000 Subject: man-pages: 5.05 -> 5.06 --- pkgs/data/documentation/man-pages/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index b557118ddc2..a9a64fb4029 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "man-pages"; - version = "5.05"; + version = "5.06"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${pname}-${version}.tar.xz"; - sha256 = "0izb6shcczvg37cyd3kzxsfsrffqj1qw9nqhhq9mi4kd36qkbcfm"; + sha256 = "0l7ypgl36jswa077qvdh1rcsvnwr64vja6cc32bab86sm41akf3h"; }; makeFlags = [ "MANDIR=$(out)/share/man" ]; -- cgit v1.2.3 From a6cd07ceaab2067c9353c167ab9fd2a35dc20600 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 6 May 2020 00:15:03 +0200 Subject: =?UTF-8?q?libjcat:=200.1.1=20=E2=86=92=200.1.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/hughsie/libjcat/commit/1a509ac60b7446254c3bd1f45ea53e6cffba30ac --- pkgs/development/libraries/libjcat/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/libjcat/default.nix b/pkgs/development/libraries/libjcat/default.nix index dc95f919932..54ab31e2702 100644 --- a/pkgs/development/libraries/libjcat/default.nix +++ b/pkgs/development/libraries/libjcat/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchFromGitHub -, fetchpatch , docbook_xml_dtd_43 , docbook-xsl-nons , glib @@ -20,7 +19,7 @@ stdenv.mkDerivation rec { pname = "libjcat"; - version = "0.1.1"; + version = "0.1.2"; outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ]; @@ -28,18 +27,12 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libjcat"; rev = version; - sha256 = "hWJUzpQvy2V4pS8C/nW7Xrs9U9LQWMsGuTVOnm5UJc0="; + sha256 = "zb9zKEvYUOSyo/j6hXTYZlQOSLdMkkT2I+Pe/0wMrWo="; }; patches = [ # Installed tests are installed to different output ./installed-tests-path.patch - - # Fix version file generation - (fetchpatch { - url = "https://github.com/hughsie/libjcat/commit/cf2d9298a5fab7278ee040bc0b4be384a7b5538e.patch"; - sha256 = "3749qih+wfhU8ECklh5BvReJ7pS+Ao1Q7YueZ1tT0Is="; - }) ]; nativeBuildInputs = [ -- cgit v1.2.3 From 496899068e92af575ab5ce3cba2b8f93329cd017 Mon Sep 17 00:00:00 2001 From: Nathan Fish Date: Thu, 30 Apr 2020 14:38:30 +0000 Subject: ipfs: remove ipfs repo fsck https://github.com/NixOS/nixpkgs/pull/86242#issuecomment-621469759 --- nixos/modules/services/network-filesystems/ipfs.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index b6d881afd7b..880f70ae141 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -37,9 +37,7 @@ let baseService = recursiveUpdate commonEnv { wants = [ "ipfs-init.service" ]; # NB: migration must be performed prior to pre-start, else we get the failure message! - preStart = '' - ipfs repo fsck # workaround for BUG #4212 (https://github.com/ipfs/go-ipfs/issues/4214) - '' + optionalString cfg.autoMount '' + preStart = optionalString cfg.autoMount '' ipfs --local config Mounts.FuseAllowOther --json true ipfs --local config Mounts.IPFS ${cfg.ipfsMountDir} ipfs --local config Mounts.IPNS ${cfg.ipnsMountDir} -- cgit v1.2.3 From d833b20737aa78017bb8b7bb9a1c9c28cbde744e Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 5 May 2020 23:04:45 +0200 Subject: dablin: 1.12.0 -> 1.13.0 --- pkgs/applications/radio/dablin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/dablin/default.nix b/pkgs/applications/radio/dablin/default.nix index d365596b9c3..287649ddbe1 100644 --- a/pkgs/applications/radio/dablin/default.nix +++ b/pkgs/applications/radio/dablin/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "dablin"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "Opendigitalradio"; repo = "dablin"; rev = version; - sha256 = "0d514ixz062xyyh4k3laxwhn3k3a1l4jq4w7rxf8x46d3743zrf7"; + sha256 = "0143jnhwwh4din6mlrkbm8m2wm8vnrlk0yk9r5qcvj70r2314bgq"; }; nativeBuildInputs = [ cmake pkgconfig ]; -- cgit v1.2.3 From 88d15ee4eff396f8335a5a13aaa663f915a9e798 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Wed, 6 May 2020 00:30:11 +0200 Subject: =?UTF-8?q?fwupd:=201.4.0=20=E2=86=92=201.4.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/fwupd/fwupd/commit/ad113b931f0ab3c3b4d3731686ed89a57f0aacb1 --- pkgs/os-specific/linux/firmware/fwupd/default.nix | 32 ++--------------------- 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 13f4f71c3c1..2a0e52c658a 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -87,11 +87,11 @@ in stdenv.mkDerivation rec { pname = "fwupd"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { url = "https://people.freedesktop.org/~hughsient/releases/fwupd-${version}.tar.xz"; - sha256 = "V131/l05FKYFavRMXRaiW1bQkTCEn7MTyyD+bqYClU4="; + sha256 = "ga8MpbY9tTwr0jsmjEAMyFxDC+yD4LBTx5gXRXig31M="; }; # libfwupd goes to lib @@ -154,34 +154,6 @@ stdenv.mkDerivation rec { # they are not really part of the library. ./install-fwupdplugin-to-out.patch - # Make it easier to patch installed-tests directory. - # https://github.com/fwupd/fwupd/pull/2002 - (fetchpatch { - url = "https://github.com/fwupd/fwupd/commit/2f12e38e61d982dea63778736e2b71d16f0e9925.patch"; - sha256 = "goTyDj0v50FOQYCS+LhPjo0AEugubr6aBIGfO9ztZOA="; - }) - - # Install systemd files to our prefix. - # https://github.com/fwupd/fwupd/pull/2006 - (fetchpatch { - url = "https://github.com/fwupd/fwupd/commit/463db5162fe4f6fea417973ff95a44ed51ec6402.patch"; - sha256 = "I0TIfnCca83QpINABUINtl8nIB78dG8OR9MC/hP2hg8="; - }) - - # Fix installed tests. - # https://github.com/fwupd/fwupd/issues/2007 - (fetchpatch { - url = "https://github.com/fwupd/fwupd/commit/c727742df3702fc934e2d9488c883dcbdfa59e9c.patch"; - sha256 = "b9D2Xblf1VbpS5XZpHtwEJhzuq7+840l7skW5w0NMBU="; - }) - - # Fix build with bash-completion 2.10 - # https://github.com/fwupd/fwupd/pull/2014 - (fetchpatch { - url = "https://github.com/fwupd/fwupd/commit/0f035013dfb150c2c3fc7f51090103ba84bd1c06.patch"; - sha256 = "VXRf5N3inaWThudk6pc4mtp6cMEIyybkdfqKin+9XSw="; - }) - # Installed tests are installed to different output # we also cannot have fwupd-tests.conf in $out/etc since it would form a cycle. (substituteAll { -- cgit v1.2.3 From d8f894d9aef680a21f03246ddcba69788cfb930c Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Mon, 4 May 2020 21:24:05 -0700 Subject: pythonPackages.pymssql: remove has been abandoned upstream. https://github.com/pymssql/pymssql --- .../development/python-modules/pymssql/default.nix | 26 ---------------------- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 1 insertion(+), 27 deletions(-) delete mode 100644 pkgs/development/python-modules/pymssql/default.nix diff --git a/pkgs/development/python-modules/pymssql/default.nix b/pkgs/development/python-modules/pymssql/default.nix deleted file mode 100644 index 5c013efc2d1..00000000000 --- a/pkgs/development/python-modules/pymssql/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, freetds, cython, setuptools-git }: - -buildPythonPackage rec { - pname = "pymssql"; - version = "3.0.3"; - - src = fetchPypi { - inherit pname version; - sha256 = "4d0ed31c76983d723c0c979b18e2273623621e630ca4901f17a86128aca13f84"; - }; - - buildInputs = [cython setuptools-git]; - propagatedBuildInputs = [freetds]; - - # The tests require a running instance of SQLServer, so we skip them - doCheck = false; - - meta = with lib; { - homepage = "http://pymssql.org/en/stable/"; - description = "A simple database interface for Python that builds on top - of FreeTDS to provide a Python DB-API (PEP-249) interface to Microsoft - SQL Server"; - license = licenses.lgpl21; - maintainers = with maintainers; [ mredaelli ]; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 949e6cf0afb..3a6953c701a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7266,7 +7266,7 @@ in { scour = callPackage ../development/python-modules/scour { }; - pymssql = callPackage ../development/python-modules/pymssql { }; + pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 nanoleaf = callPackage ../development/python-modules/nanoleaf { }; -- cgit v1.2.3 From dec3d5f39f67dbb6254d139521005a0d5d306605 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 6 May 2020 01:07:53 +0200 Subject: chromium: 81.0.4044.129 -> 81.0.4044.138 https://chromereleases.googleblog.com/2020/05/stable-channel-update-for-desktop.html This update includes 3 security fixes. CVEs: CVE-2020-6831 CVE-2020-6464 --- .../networking/browsers/chromium/upstream-info.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 40ddafd2541..defb58822a0 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "1s3flhzp69g62285r9nwc5m9fa65ldx19inwdm4nq1m5bn63v6lj"; - sha256bin64 = "0xbbj89xx98vvw1a4l4wj7hhwjasdmkxbbkgaad2cj4zqmbb8h52"; - version = "83.0.4103.23"; + sha256 = "0z9p4v5mkinf7hbdagh4bz6ymqjxg3df3wjpvm201ilzzngmjqz1"; + sha256bin64 = "1srvlirhnynh0q2a17p8z13p7r54z0cchh1d1h07hqljnwmsf8qj"; + version = "83.0.4103.34"; }; dev = { - sha256 = "1jgx55sb3azwb2rni89yxlz94j264iilwh0br29sngcailxamrbd"; - sha256bin64 = "107yndkcdb78zxpswn9aja63n0q4q5q49183058z5jm4zlplkgad"; - version = "84.0.4122.7"; + sha256 = "178fc112bsbrgj2hss78y8rhnz8hl85fr33gawk9fz88zk5qz7xd"; + sha256bin64 = "06qra245l2bbgxc3k04aabkgq1qnzybnrjhrjb25vriv31ji36b1"; + version = "84.0.4128.3"; }; stable = { - sha256 = "1ls663s1f74p912x42qp3zcvm17kmjiv1ij6yy1c14gdhcpmjx7z"; - sha256bin64 = "0nzds27x1j3298cq5xkgikjdddymbw88gcpnlm03492b6090257y"; - version = "81.0.4044.129"; + sha256 = "19kpzmqmld0m0nflx13w9flxfal19msnxhzl3lip1jqih65z4y7l"; + sha256bin64 = "0sl4wv7npc3rhi7jgn679hi7j5ykzwpx5dahy78h87yfg4fx84wx"; + version = "81.0.4044.138"; }; } -- cgit v1.2.3 From 5d08c567d92b94076cec87c161aecccd13b81de0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 5 May 2020 18:18:18 -0500 Subject: nodejs-14_x: 14.1.0 -> 14.2.0 Changelog: https://github.com/nodejs/node/releases/tag/v14.2.0 --- pkgs/development/web/nodejs/v14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index e2f8dd7173c..1c9c353fd51 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -9,6 +9,6 @@ let in buildNodejs { inherit enableNpm; - version = "14.1.0"; - sha256 = "0pw39628y8qi2jagmmnfj0fkcbv00qcd1cqybiprf1v22hhij44n"; + version = "14.2.0"; + sha256 = "1kqnkqkv2chw9s0hazbaba5y1555h526825xqk4rr441wcxcrzcf"; } -- cgit v1.2.3 From 16eac7a2684c6f924d3cf2b31b2c8c843d84bbfa Mon Sep 17 00:00:00 2001 From: Kolby Dauler Date: Tue, 5 May 2020 17:10:57 -0700 Subject: trufflehog: 2.0.97 -> 2.1.11 --- pkgs/tools/security/trufflehog/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index a0205970366..a992d527c26 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -1,20 +1,25 @@ -{ lib, pythonPackages }: +{ lib, python3Packages }: let - truffleHogRegexes = pythonPackages.buildPythonPackage rec { + truffleHogRegexes = python3Packages.buildPythonPackage rec { pname = "truffleHogRegexes"; +<<<<<<< HEAD version = "0.0.4"; src = pythonPackages.fetchPypi { +======= + version = "0.0.7"; + src = python3Packages.fetchPypi { +>>>>>>> 2c28266fcef... trufflehog: 2.0.97 -> 2.1.11 inherit pname version; sha256 = "09vrscbb4h4w01gmamlzghxx6cvrqdscylrbdcnbjsd05xl7zh4z"; }; }; in - pythonPackages.buildPythonApplication rec { + python3Packages.buildPythonApplication rec { pname = "truffleHog"; version = "2.0.97"; - src = pythonPackages.fetchPypi { + src = python3Packages.fetchPypi { inherit pname version; sha256 = "034kpv1p4m90286slvc6d4mlrzaf0b5jbd4qaj87hj65wbpcpg8r"; }; @@ -24,7 +29,7 @@ in substituteInPlace setup.py --replace "GitPython ==" "GitPython >= " ''; - propagatedBuildInputs = [ pythonPackages.GitPython truffleHogRegexes ]; + propagatedBuildInputs = [ python3Packages.GitPython truffleHogRegexes ]; # Test cases run git clone and require network access doCheck = false; -- cgit v1.2.3 From 4153b2be5cd9ae1738788738b17da67cdd0c06d4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 22:56:54 +0000 Subject: mpd: 0.21.21 -> 0.21.23 --- pkgs/servers/mpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index d5a3b9de3c0..8d862373b99 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -103,13 +103,13 @@ let in stdenv.mkDerivation rec { pname = "mpd"; - version = "0.21.21"; + version = "0.21.23"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "0ysyjlmmfm1y5jqyv83bs9p7zqr9pgj1hmdq2b7kx9kridclbnng"; + sha256 = "0jnhjhm1ilpcwb4f58b8pgyzjq3dlr0j2xyk0zck0afwkdxyj9cb"; }; buildInputs = [ glib boost ] -- cgit v1.2.3 From 5e9fa3a83d72f3754d6a10e3e7a5f73b8528f791 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 00:40:14 +0000 Subject: mediainfo-gui: 19.09 -> 20.03 --- pkgs/applications/misc/mediainfo-gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index bd018a690d4..79dcf105361 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -2,11 +2,11 @@ , desktop-file-utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "19.09"; + version = "20.03"; pname = "mediainfo-gui"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "1a2ssklg12sjsw09y8my9kf35mizi3zj7w002nspcmw28apb1x82"; + sha256 = "1f1shnycf0f1fwka9k9s250l228xjkg0k4k73h8bpld8msighgnw"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; -- cgit v1.2.3 From d1a36a32ca61d50b728e15646e515e2ca7d07d34 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 00:56:15 +0000 Subject: mkvtoolnix: 45.0.0 -> 46.0.0 --- pkgs/applications/video/mkvtoolnix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 2e97505f3f1..7db27888782 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -13,13 +13,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mkvtoolnix"; - version = "45.0.0"; + version = "46.0.0"; src = fetchFromGitLab { owner = "mbunkus"; repo = "mkvtoolnix"; rev = "release-${version}"; - sha256 = "1m9ih6bgl3nrjgr0rxvfbvw8s9ska7ps1ypc2ynvyxba4gjkkyyf"; + sha256 = "1vyfvpsllnzhzaaz3s9lqlnkmnqchyhxj2d47bfyizs982r5kg24"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 9c17871402b8e4b242373c438c8504068f69d33f Mon Sep 17 00:00:00 2001 From: Kolby Dauler Date: Tue, 5 May 2020 18:16:57 -0700 Subject: trufflehog: 2.0.97 -> 2.1.11 --- pkgs/tools/security/trufflehog/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index a992d527c26..353590ed87c 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -3,25 +3,20 @@ let truffleHogRegexes = python3Packages.buildPythonPackage rec { pname = "truffleHogRegexes"; -<<<<<<< HEAD - version = "0.0.4"; - src = pythonPackages.fetchPypi { -======= version = "0.0.7"; src = python3Packages.fetchPypi { ->>>>>>> 2c28266fcef... trufflehog: 2.0.97 -> 2.1.11 inherit pname version; - sha256 = "09vrscbb4h4w01gmamlzghxx6cvrqdscylrbdcnbjsd05xl7zh4z"; + sha256 = "b81dfc60c86c1e353f436a0e201fd88edb72d5a574615a7858485c59edf32405"; }; }; in python3Packages.buildPythonApplication rec { pname = "truffleHog"; - version = "2.0.97"; + version = "2.1.11"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "034kpv1p4m90286slvc6d4mlrzaf0b5jbd4qaj87hj65wbpcpg8r"; + sha256 = "53619f0c5be082abd377f987291ace80bc3b88f864972b1a30494780980f769e"; }; # Relax overly restricted version constraint -- cgit v1.2.3 From 5377640490d1c02cb06a555dd0f08ab2cdee6d89 Mon Sep 17 00:00:00 2001 From: Taylor Viti Date: Tue, 5 May 2020 15:12:02 -1000 Subject: nco: Patch hardcoded paths cp and mv Commit b83ed3efe81525302469a3052982f41393a616e0 in the nco source repo, hard-coded the paths to cp and mv, so as to point to their FHS locations, which resulted in ncrename throwing a "file not found" error when invoked outside of an FHS sandbox. This nixpkgs commit patches the src/nco_fl_utl.c to instead point the associated nixpkgs.coreutils locations. The hard-coded paths actually occur in a number of other locations, but this is enough to quash the error w/ ncrename (and presumably the other CLI nco tooling, although this isn't tested). --- pkgs/development/libraries/nco/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix index 321e4e0560d..629c064404b 100644 --- a/pkgs/development/libraries/nco/default.nix +++ b/pkgs/development/libraries/nco/default.nix @@ -1,17 +1,24 @@ -{ stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex }: +{ stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex, coreutils }: stdenv.mkDerivation rec { version = "4.9.2"; pname = "nco"; nativeBuildInputs = [ flex which ]; - buildInputs = [ netcdf netcdfcxx4 gsl udunits antlr curl ]; + buildInputs = [ netcdf netcdfcxx4 gsl udunits antlr curl coreutils ]; src = fetchzip { url = "https://github.com/nco/nco/archive/${version}.tar.gz"; sha256 = "0nip9dmdx3d5nc30bz1d2w9his1dph136l53r160aa3bmb29xwqn"; }; + prePatch = '' + substituteInPlace src/nco/nco_fl_utl.c \ + --replace "/bin/cp" "${coreutils}/bin/cp" + substituteInPlace src/nco/nco_fl_utl.c \ + --replace "/bin/mv" "${coreutils}/bin/mv" + ''; + meta = { description = "NetCDF Operator toolkit"; longDescription = "The NCO (netCDF Operator) toolkit manipulates and analyzes data stored in netCDF-accessible formats, including DAP, HDF4, and HDF5"; -- cgit v1.2.3 From 8b418f717bcba80212f30d0c5e16667eadcbdf52 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 01:48:36 +0000 Subject: mksh: 58 -> 59 --- pkgs/shells/mksh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix index b2f50c62dc4..682d88dbfbd 100644 --- a/pkgs/shells/mksh/default.nix +++ b/pkgs/shells/mksh/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "mksh"; - version = "58"; + version = "59"; src = fetchurl { urls = [ "https://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz" "http://pub.allbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz" ]; - sha256 = "1337zjvzh14yncg9igdry904a3ns52l8rnm1kcq262w7f5xyp2v0"; + sha256 = "1flhsdfksvv9gmfkgjwgdia1irv53g9abmq3y22s5a5ycyx2hajr"; }; dontConfigure = true; -- cgit v1.2.3 From 42cf99e67cd24b32fc675b69deeb70c5210c2503 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 07:50:37 +0000 Subject: homebank: 5.3.2 -> 5.4.1 --- pkgs/applications/office/homebank/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 1a056e9be81..a34eadde36e 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -2,10 +2,10 @@ , libsoup, gnome3 }: stdenv.mkDerivation rec { - name = "homebank-5.3.2"; + name = "homebank-5.4.1"; src = fetchurl { url = "http://homebank.free.fr/public/${name}.tar.gz"; - sha256 = "1fr4060yqlciay98dypvifmfvr8y2kbpj89d86mcvq9gb00vij2b"; + sha256 = "1m1hpaby6zi8y0vmj2ljklp34a55l2qsr7pxw3852k2m4v5n9zsx"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; -- cgit v1.2.3 From d6437470488de7040718a7d8d004129eebb68486 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 04:17:35 +0000 Subject: gcalcli: 4.2.0 -> 4.2.1 --- pkgs/applications/misc/gcalcli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gcalcli/default.nix b/pkgs/applications/misc/gcalcli/default.nix index b8b1193058b..d7d6ad5302d 100644 --- a/pkgs/applications/misc/gcalcli/default.nix +++ b/pkgs/applications/misc/gcalcli/default.nix @@ -5,13 +5,13 @@ with python3.pkgs; buildPythonApplication rec { pname = "gcalcli"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "insanum"; repo = pname; rev = "v${version}"; - sha256 = "0746vmhfclkpkqnyaidxid2z20mlv86hv0pjxy1qglrja91vkd72"; + sha256 = "1xwrgmy2azvr99b7df92m2imj0wy4fh53bn7lvcrnghjbnh7n0l0"; }; postPatch = lib.optionalString stdenv.isLinux '' -- cgit v1.2.3 From 89aadedd323486ef128ac95946df7bb3b5982174 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 06:37:40 +0000 Subject: hopper: 4.5.22 -> 4.5.25 --- pkgs/development/tools/analysis/hopper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/hopper/default.nix b/pkgs/development/tools/analysis/hopper/default.nix index 4fbf986e41a..d854065d601 100644 --- a/pkgs/development/tools/analysis/hopper/default.nix +++ b/pkgs/development/tools/analysis/hopper/default.nix @@ -12,12 +12,12 @@ }: stdenv.mkDerivation rec { pname = "hopper"; - version = "4.5.22"; + version = "4.5.25"; rev = "v${lib.versions.major version}"; src = fetchurl { url = "https://d2ap6ypl1xbe4k.cloudfront.net/Hopper-${rev}-${version}-Linux.pkg.tar.xz"; - sha256 = "1321i9ls5k677diwfccrjinzzb5586ygdgax7ryyha3ccdj1ikda"; + sha256 = "1xv4q41kz7a4cqkkdfgwaw2kgi81z62r9l7hmm8qmsnnlbk4xd5j"; }; sourceRoot = "."; -- cgit v1.2.3 From 642694365275ad47bfff84527193a50c2d6f7c40 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 07:12:32 +0000 Subject: libgnurl: 7.69.1 -> 7.70.0 --- pkgs/development/libraries/libgnurl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgnurl/default.nix b/pkgs/development/libraries/libgnurl/default.nix index 71a4620161e..25917c44bd0 100644 --- a/pkgs/development/libraries/libgnurl/default.nix +++ b/pkgs/development/libraries/libgnurl/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "libgnurl"; - version = "7.69.1"; + version = "7.70.0"; src = fetchurl { url = "mirror://gnu/gnunet/gnurl-${version}.tar.gz"; - sha256 = "0x8m26y3klndis6a28j8i0b7ab04d38q3rmlvgaqa65bjhlfdrp0"; + sha256 = "0px9la8v4bj1dzxb95fx3yxk0rcjqjrxpj733ga27cza45wwzkqa"; }; nativeBuildInputs = [ libtool groff perl pkgconfig python2 ]; -- cgit v1.2.3 From 5ed0514b4fc273983b75b06e59d4e8aad1fab667 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 17:25:46 +0000 Subject: conntrack-tools: 1.4.5 -> 1.4.6 --- pkgs/os-specific/linux/conntrack-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/conntrack-tools/default.nix b/pkgs/os-specific/linux/conntrack-tools/default.nix index 8346fb1c73c..80785015e76 100644 --- a/pkgs/os-specific/linux/conntrack-tools/default.nix +++ b/pkgs/os-specific/linux/conntrack-tools/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "conntrack-tools"; - version = "1.4.5"; + version = "1.4.6"; src = fetchurl { url = "https://www.netfilter.org/projects/conntrack-tools/files/${pname}-${version}.tar.bz2"; - sha256 = "0qm4m78hr6a4fbmnkw5nyjm1pzzhydzx0nz7f96iv1c4fsfdkiin"; + sha256 = "0psx41bclqrh4514yzq03rvs3cq3scfpd1v4kkyxnic2hk65j22r"; }; buildInputs = [ -- cgit v1.2.3 From 0a736d883b9686d95cbd5fa341547f03cbc17f15 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 17:02:54 +0000 Subject: curaengine: 4.5.0 -> 4.6.1 --- pkgs/applications/misc/curaengine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/curaengine/default.nix b/pkgs/applications/misc/curaengine/default.nix index 2eb256935d7..0a4ec62ca78 100644 --- a/pkgs/applications/misc/curaengine/default.nix +++ b/pkgs/applications/misc/curaengine/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "curaengine"; - version = "4.5.0"; + version = "4.6.1"; src = fetchFromGitHub { owner = "Ultimaker"; repo = "CuraEngine"; rev = version; - sha256 = "1gml8f6yqmghgncl1zggs7h2hdh05wf68jw9npg0gh7n9l7yzkk4"; + sha256 = "1fr151hmdg2lhk9pbpan1hb1pafj784nijr4pz646ljmjh12vfk2"; }; nativeBuildInputs = [ cmake ]; -- cgit v1.2.3 From 81fe8b79671b70e32d1c99d9d6bada1caa89ad37 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 11:41:52 +0000 Subject: acpica-tools: 20200326 -> 20200430 --- pkgs/tools/system/acpica-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/acpica-tools/default.nix b/pkgs/tools/system/acpica-tools/default.nix index 583bbd2ebd9..62b1be61965 100644 --- a/pkgs/tools/system/acpica-tools/default.nix +++ b/pkgs/tools/system/acpica-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "acpica-tools"; - version = "20200326"; + version = "20200430"; src = fetchurl { url = "https://acpica.org/sites/acpica/files/acpica-unix-${version}.tar.gz"; - sha256 = "1zr2sziiy5jvwgmxpgy2imzsmmb6hlncfd816i7qxrixg2ag7ycr"; + sha256 = "0z19bniqsa8y0n1qrxmb6gz7m63jpwx22zgk5ablyriixhfpz07v"; }; NIX_CFLAGS_COMPILE = "-O3"; -- cgit v1.2.3 From 9920886a958918708bf2147996ea3e32c309a358 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 15:24:14 +0000 Subject: acme-sh: 2.8.5 -> 2.8.6 --- pkgs/tools/admin/acme.sh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/acme.sh/default.nix b/pkgs/tools/admin/acme.sh/default.nix index 8d4863757ad..2254f2e22d9 100644 --- a/pkgs/tools/admin/acme.sh/default.nix +++ b/pkgs/tools/admin/acme.sh/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, makeWrapper, curl, openssl, socat, iproute, unixtools, dnsutils }: stdenv.mkDerivation rec { pname = "acme.sh"; - version = "2.8.5"; + version = "2.8.6"; src = fetchFromGitHub { owner = "Neilpang"; repo = "acme.sh"; rev = version; - sha256 = "0yxhfdb0jz0wn10ka6c79qvcx07656vsaxmjls8qgcfgc472ymhs"; + sha256 = "0zbs8vzbh89wxf36h9mvhin2p85n3jrsq6l5i40q1zkzgwi3648n"; }; nativeBuildInputs = [ makeWrapper ]; -- cgit v1.2.3 From 986503155f7ac68437a13ae11266d216c33072d5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 10:40:27 +0000 Subject: urh: 2.8.5 -> 2.8.7 --- pkgs/applications/radio/urh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/urh/default.nix b/pkgs/applications/radio/urh/default.nix index 850f73c4922..d75572e5e57 100644 --- a/pkgs/applications/radio/urh/default.nix +++ b/pkgs/applications/radio/urh/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "urh"; - version = "2.8.5"; + version = "2.8.7"; src = fetchFromGitHub { owner = "jopohl"; repo = pname; rev = "v${version}"; - sha256 = "060npn0q7yrby2zj9hi8x7raivs91v9hvryvf45k1ipyqh8dgri6"; + sha256 = "1grak0vzlzqvg8bqaalyamwvkyzlmj9nbczqp6jcdf6w2vnbzhph"; }; nativeBuildInputs = [ qt5.wrapQtAppsHook ]; -- cgit v1.2.3 From b94553df071da81421a529032dee17c572400247 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 01:53:31 +0000 Subject: fldigi: 4.1.11 -> 4.1.12 --- pkgs/applications/radio/fldigi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index 20cf2cf6286..84908d304df 100644 --- a/pkgs/applications/radio/fldigi/default.nix +++ b/pkgs/applications/radio/fldigi/default.nix @@ -2,12 +2,12 @@ libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: stdenv.mkDerivation rec { - version = "4.1.11"; + version = "4.1.12"; pname = "fldigi"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1y62xn1pim38ibaf2mbl8b7aq20jdaac6lgggb9r402w9bj5b196"; + sha256 = "1yjjv2ss84xfiaidypp476mhrbpnw4zf7mb5cdqwhdh604x0svr1"; }; buildInputs = [ libXinerama gettext hamlib fltk14 libjpeg libpng portaudio -- cgit v1.2.3 From 2cea20d226ea2838935df02018b1c8b83f75bdf6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 14:35:22 +0000 Subject: asciidoctorj: 2.2.0 -> 2.3.0 --- pkgs/tools/typesetting/asciidoctorj/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/asciidoctorj/default.nix b/pkgs/tools/typesetting/asciidoctorj/default.nix index 80b99284e49..ba46d36814a 100644 --- a/pkgs/tools/typesetting/asciidoctorj/default.nix +++ b/pkgs/tools/typesetting/asciidoctorj/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "asciidoctorj"; - version = "2.2.0"; + version = "2.3.0"; src = fetchzip { url = "http://dl.bintray.com/asciidoctor/maven/org/asciidoctor/${pname}/${version}/${pname}-${version}-bin.zip"; - sha256 = "0akxzfibfa8msnardvyy9hkj2z6sqn7pnwphz6avixdcclg6yxa5"; + sha256 = "1hmra1pg79hj9kqbj6702y5b03vyvfzqf6hq65jg1vxjqlq7h3xx"; }; nativeBuildInputs = [ makeWrapper ]; -- cgit v1.2.3 From af4266ccaf562daf3226b0e1b57f3c8a7b395380 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 11:07:58 +0000 Subject: xiphos: 4.0.7 -> 4.1.0 --- pkgs/applications/misc/xiphos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix index 027ff8f264c..ae18ff72d27 100644 --- a/pkgs/applications/misc/xiphos/default.nix +++ b/pkgs/applications/misc/xiphos/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "xiphos"; - version = "4.0.7"; + version = "4.1.0"; src = fetchFromGitHub { owner = "crosswire"; repo = "xiphos"; rev = version; - sha256 = "1vwf1ps6nrajxl1qbs6v1cgykmq5wn4j09j10gbcd3b2nvrprf3g"; + sha256 = "14il9k4i58qbc78hcadw3gqy21sb9q661d75vlj6fwpczbzj7x1a"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook wafHook ]; -- cgit v1.2.3 From 90449f2fda7e899f400a47251be2020b6d679789 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 18:08:17 +0000 Subject: calibre: 4.12.0 -> 4.15.0 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index afd602f6088..869785ef82a 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -30,11 +30,11 @@ let in mkDerivation rec { pname = "calibre"; - version = "4.12.0"; + version = "4.15.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - sha256 = "144vl5p0adcywcqaarrriq5zd8q5i934yfjg9himiq1vdp9vy4fi"; + sha256 = "0m8mvyw5c1khd54jx896w6nfwaydmpi3cb6wi5p2a0hxdksqgrkm"; }; patches = [ -- cgit v1.2.3 From 78038dc5cbbcaeff015859737c6a814613b0986a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 08:08:29 +0000 Subject: sickgear: 0.21.22 -> 0.21.30 --- pkgs/servers/sickbeard/sickgear.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sickbeard/sickgear.nix b/pkgs/servers/sickbeard/sickgear.nix index cd98af51e08..3bf72043ec5 100644 --- a/pkgs/servers/sickbeard/sickgear.nix +++ b/pkgs/servers/sickbeard/sickgear.nix @@ -4,13 +4,13 @@ let pythonEnv = python2.withPackages(ps: with ps; [ cheetah ]); in stdenv.mkDerivation rec { pname = "sickgear"; - version = "0.21.22"; + version = "0.21.30"; src = fetchFromGitHub { owner = "SickGear"; repo = "SickGear"; rev = "release_${version}"; - sha256 = "16jwvg9mcv0yr94ldncfs6bczyv4n3q9v7g7v0ssrkrnkxh722zx"; + sha256 = "19j0hm2d2q279kzmdjbjgfhjwcp7071a2mmvsnb0167wdyaq4bcf"; }; dontBuild = true; -- cgit v1.2.3 From a8a986d439740f108831d0460e92b7f6a11c1bb9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 09:38:13 +0000 Subject: tiled: 1.3.3 -> 1.3.4 --- pkgs/applications/editors/tiled/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix index 0e73dffb20a..bee9934a9ca 100644 --- a/pkgs/applications/editors/tiled/default.nix +++ b/pkgs/applications/editors/tiled/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "tiled"; - version = "1.3.3"; + version = "1.3.4"; src = fetchFromGitHub { owner = "bjorn"; repo = pname; rev = "v${version}"; - sha256 = "0v8imw6zdygs9ymsgk41jclsfr1jwbracjc5balydh15r57rvwjd"; + sha256 = "0q3x1v88szxm8177qcnynfiyc7w8sn07ig6c7fjd164q7w30y24m"; }; nativeBuildInputs = [ pkgconfig qmake ]; -- cgit v1.2.3 From 989787210f0cb3cc6d75f90788d09da6df79eb3e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 3 May 2020 23:37:29 +0000 Subject: mill: 0.6.1 -> 0.6.2 --- pkgs/development/tools/build-managers/mill/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index 84444261132..0e7a4f3d979 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mill"; - version = "0.6.1"; + version = "0.6.2"; src = fetchurl { url = "https://github.com/lihaoyi/mill/releases/download/${version}/${version}"; - sha256 = "1blar5dxhmxlwxhmq8wv0xvhy200qks6xj12n54qx9d5qp300ncw"; + sha256 = "1s2ndry0mpjs8hy8rrxnyarkzqjz7zzh5h541v3fkzgc9rsd6ifb"; }; nativeBuildInputs = [ makeWrapper ]; -- cgit v1.2.3 From 0d53bfed341136cc613cdce7b9a4b29880d3f926 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 02:07:28 +0000 Subject: omnisharp-roslyn: 1.34.15 -> 1.35.0 --- pkgs/development/tools/omnisharp-roslyn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/omnisharp-roslyn/default.nix b/pkgs/development/tools/omnisharp-roslyn/default.nix index 5daeb384cc5..a81b7133e92 100644 --- a/pkgs/development/tools/omnisharp-roslyn/default.nix +++ b/pkgs/development/tools/omnisharp-roslyn/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "omnisharp-roslyn"; - version = "1.34.15"; + version = "1.35.0"; src = fetchurl { url = "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v${version}/omnisharp-mono.tar.gz"; - sha256 = "16wjp89lzg33cap99jv1vgqvdx0y0xvb892fpihwg62iafh10b8m"; + sha256 = "191jiyw6kx1rw241bg9nv5splfpz6ny90g9yf28cd0xwpx978p83"; }; nativeBuildInputs = [ makeWrapper ]; -- cgit v1.2.3 From 518879a09831ccc14fd5045d24f6267356a1b8b6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Mon, 4 May 2020 00:14:13 +0000 Subject: moolticute: 0.43.3 -> 0.43.16 --- pkgs/applications/misc/moolticute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/moolticute/default.nix b/pkgs/applications/misc/moolticute/default.nix index 0a54bc98bb9..6a152176415 100644 --- a/pkgs/applications/misc/moolticute/default.nix +++ b/pkgs/applications/misc/moolticute/default.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "moolticute"; - version = "0.43.3"; + version = "0.43.16"; src = fetchFromGitHub { owner = "mooltipass"; repo = pname; rev = "v${version}"; - sha256 = "0kl7wksiqmy0hqbg6xwmzqfn3l17if2hiw7xc9x067x9rviyxrl3"; + sha256 = "1gx1hbxiilggwfw0jspyk2cw92r6qs9a8yqa8x1d2ndf493mjx9y"; }; outputs = [ "out" "udev" ]; -- cgit v1.2.3 From 6ef15b946b74a896f0e29c713d98070937f45dd0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 3 May 2020 23:45:18 +0000 Subject: minder: 1.7.2 -> 1.7.3 --- pkgs/applications/misc/minder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/minder/default.nix b/pkgs/applications/misc/minder/default.nix index fd1aa050fe7..0b3d65e21e3 100644 --- a/pkgs/applications/misc/minder/default.nix +++ b/pkgs/applications/misc/minder/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "minder"; - version = "1.7.2"; + version = "1.7.3"; src = fetchFromGitHub { owner = "phase1geo"; repo = pname; rev = version; - sha256 = "0pfp0dglj2ig2p1h000137dxw777mjvzzqj3gcnbxjxqz3m6fzc0"; + sha256 = "00lkb1w536jyhka2znxmgbyss13j4h75yvl42z4hlgz31wljcin4"; }; nativeBuildInputs = [ pkgconfig meson ninja python3 wrapGAppsHook vala shared-mime-info ]; -- cgit v1.2.3 From 51472a96069e13b26827a4223498303fc13bfc4e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 13:22:53 +0000 Subject: kubectx: 0.8.0 -> 0.9.0 --- pkgs/development/tools/kubectx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/kubectx/default.nix b/pkgs/development/tools/kubectx/default.nix index fd5bdc64dd6..8b980dc7e31 100644 --- a/pkgs/development/tools/kubectx/default.nix +++ b/pkgs/development/tools/kubectx/default.nix @@ -4,13 +4,13 @@ with lib; stdenv.mkDerivation rec { pname = "kubectx"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "ahmetb"; repo = pname; rev = "v${version}"; - sha256 = "1wkvmic29mkzfs6619wjs3mya8ffigwv9n1w9y7zkfvpi8gxa0a6"; + sha256 = "1b22jk8zl944w5zn3s7ybkkbmzp9519x32pfqwd1malfly7dzf55"; }; buildInputs = [ makeWrapper ]; -- cgit v1.2.3 From 840b5bf6bad35874e5182b87c98ab95ee9adbbc4 Mon Sep 17 00:00:00 2001 From: Justin Gerhardt Date: Tue, 5 May 2020 03:50:15 +0000 Subject: pythonPackages.powerline: Added file binding --- pkgs/development/python-modules/powerline/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/powerline/default.nix b/pkgs/development/python-modules/powerline/default.nix index 098ad530084..3c4c6ae4ec7 100644 --- a/pkgs/development/python-modules/powerline/default.nix +++ b/pkgs/development/python-modules/powerline/default.nix @@ -37,6 +37,10 @@ buildPythonPackage rec { install -dm755 "$out/share/tmux" install -m644 "powerline/bindings/tmux/powerline.conf" "$out/share/tmux/powerline.conf" + + install -dm755 "$out/share/fish/vendor_functions.d" + install -m644 "powerline/bindings/fish/powerline-setup.fish" "$out/share/fish/vendor_functions.d/powerline-setup.fish" + ''; meta = { -- cgit v1.2.3 From e8de9134bbe14bc9617b76be3b01eb2afe7cdb00 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 13:08:58 +0000 Subject: klayout: 0.26.2 -> 0.26.4 --- pkgs/applications/misc/klayout/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix index 78b32f7fca1..73b51e4adbc 100644 --- a/pkgs/applications/misc/klayout/default.nix +++ b/pkgs/applications/misc/klayout/default.nix @@ -5,13 +5,13 @@ mkDerivation rec { pname = "klayout"; - version = "0.26.2"; + version = "0.26.4"; src = fetchFromGitHub { owner = "KLayout"; repo = "klayout"; rev = "v${version}"; - sha256 = "0svyqayvr45snqw0dhx6jpnjhg4qb097pz28s8k1crx5i31nnd94"; + sha256 = "0hqc11vz24b6nfpfzsjwwmaq0sznwwqpzmd48q5wpdl0kz1309gj"; }; postPatch = '' -- cgit v1.2.3 From defdda6f93daf4c1bf9f1b104c0d503f90099506 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 2 May 2020 08:30:11 +0000 Subject: faudio: 20.04 -> 20.05 --- pkgs/development/libraries/faudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index f6a7f6c12fb..8973eda5d82 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "20.04"; + version = "20.05"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "0ykc2y1w0wh6s3g9xzk3zqscvdjnf59923zxh2x0whxlcvndab2d"; + sha256 = "14i0s0m1n57wjwzy54v1czq0w38xplcdsfn4nz5v6fryaxzr5z60"; }; nativeBuildInputs = [cmake]; -- cgit v1.2.3 From f798f07619b373a04c5cde895dd9b590cdb8ee5a Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Mon, 4 May 2020 14:52:45 -0700 Subject: rl-2009: document new module security.doas --- nixos/doc/manual/release-notes/rl-2009.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index c6a766cc045..3181e473d82 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -77,7 +77,9 @@ - + + There is a new module that provides doas, a lighter alternative to sudo with many of the same features. + -- cgit v1.2.3 From 834eb1729b396fefa2af3d08406c82e2fc72ec6f Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Wed, 6 May 2020 01:08:27 -0300 Subject: haskellPackages.network_2_6_3_1: enable dontCheck --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4cf9770c7a2..f9cdab48b32 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -333,6 +333,7 @@ self: super: { nats-queue = dontCheck super.nats-queue; netpbm = dontCheck super.netpbm; network = dontCheck super.network; + network_2_6_3_1 = dontCheck super.network_2_6_3_1; network-dbus = dontCheck super.network-dbus; notcpp = dontCheck super.notcpp; ntp-control = dontCheck super.ntp-control; -- cgit v1.2.3 From ae77b8f42db25c783dc0434f20f8455e67cfcbc2 Mon Sep 17 00:00:00 2001 From: Ricardo Ardissone Date: Wed, 6 May 2020 01:09:54 -0300 Subject: hedgewars: use haskellPackages.network_2_6_3_1 gameServer/hedgewars-server.cabal indicates network version needs to be < 3.0. --- pkgs/games/hedgewars/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix index dffeb2ac556..771554192d8 100644 --- a/pkgs/games/hedgewars/default.nix +++ b/pkgs/games/hedgewars/default.nix @@ -6,8 +6,9 @@ }: let + # gameServer/hedgewars-server.cabal depends on network < 3 ghc = ghcWithPackages (pkgs: with pkgs; [ - SHA bytestring entropy hslogger network pkgs.zlib random + SHA bytestring entropy hslogger network_2_6_3_1 pkgs.zlib random regex-tdfa sandi utf8-string vector ]); @@ -40,6 +41,15 @@ mkDerivation rec { "-DNOSERVER=${if withServer then "OFF" else "ON"}" ]; + + # hslogger brings network-3 and network-bsd which conflict with + # network-2.6.3.1 + preConfigure = '' + substituteInPlace gameServer/CMakeLists.txt \ + --replace "haskell_flags}" \ + "haskell_flags} -package network-2.6.3.1 -hide-package network-bsd" + ''; + NIX_LDFLAGS = lib.concatMapStringsSep " " (e: "-rpath ${e}/lib") [ SDL2.out SDL2_image -- cgit v1.2.3 From 5f14d99efed32721172a819b6e78a5520bab4bc6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 14:15:24 +0000 Subject: intel-media-sdk: 20.1.0 -> 20.1.1 --- pkgs/development/libraries/intel-media-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix index cbfb943d375..411cc227b30 100644 --- a/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/pkgs/development/libraries/intel-media-sdk/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "intel-media-sdk"; - version = "20.1.0"; + version = "20.1.1"; src = fetchurl { url = "https://github.com/Intel-Media-SDK/MediaSDK/archive/intel-mediasdk-${version}.tar.gz"; - sha256 = "1afck8wgxb23jy1jd5sn9aiyd7nj3yi3q08hw180wwnpbvmiaicn"; + sha256 = "1p13b4abslq31pbgqf0bzs2ixns85yfdsm94326h2vcg0q7hqc24"; }; # patchelf is needed for binaries in $out/share/samples -- cgit v1.2.3 From f642bebe780d9d1a55abee8eeca6c2a4468adbfe Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 05:23:39 +0000 Subject: openfortivpn: 1.13.1 -> 1.13.3 --- pkgs/tools/networking/openfortivpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index 6e6e8fbf23c..b0be2ab5e6d 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let repo = "openfortivpn"; - version = "1.13.1"; + version = "1.13.3"; in stdenv.mkDerivation { name = "${repo}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "adrienverge"; inherit repo; rev = "v${version}"; - sha256 = "1sfqi169xf0wmlpzri9frkgsh99fgjvcpbdkd42vsm10qa1dnpk5"; + sha256 = "1y3b3zwzig520nyky7xnr0l0zf68i4w698bysyngpkada14d8dv3"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; -- cgit v1.2.3 From 1906fc5bd10a7bbab35136325fa3251a043361b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 6 May 2020 07:39:10 +0200 Subject: gst_all_1.gst-plugins-bad: fix build after opencv4 update /cc #85879 --- pkgs/development/libraries/gstreamer/bad/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index d9bf86e0cf3..5bf3e0261e4 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -106,6 +106,10 @@ in stdenv.mkDerivation rec { ./fix_pkgconfig_includedir.patch ]; + # https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/950 + # https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1235 + postPatch = "sed '/^ opencv_dep =/s/< 4\.2\.0/< 4.4.0/' -i ext/opencv/meson.build"; + nativeBuildInputs = [ meson ninja -- cgit v1.2.3 From 82f63e8728a0a1ce1c321060d20bee44dc773748 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Wed, 6 May 2020 07:58:13 +0200 Subject: buildkit: 0.6.3 -> 0.7.1 Signed-off-by: Vincent Demeester --- pkgs/development/tools/buildkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index 042929e750a..2626ae71942 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "buildkit"; - version = "0.6.3"; + version = "0.7.1"; goPackagePath = "github.com/moby/buildkit"; subPackages = [ "cmd/buildctl" ] ++ stdenv.lib.optionals stdenv.isLinux [ "cmd/buildkitd" ]; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - sha256 = "032jq74n9mkw22s4ba9blfmi0hqvk587m5v23xz3sxx2rkg0wlbn"; + sha256 = "048h69ffgmpir2ix9ldi6zrzlwxa5yz3idg5ajspz2dihmzmnwws"; }; buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/version.Version=${version}" ]; -- cgit v1.2.3 From 2ba59c0f8eed5fa23f5582ab50436aa8946c3bde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 6 May 2020 08:40:19 +0200 Subject: Revert "gst_all_1.gst-plugins-bad: fix build after opencv4 update" This reverts commit 1906fc5bd10a7bbab35136325fa3251a043361b2. After 18a6a778 it isn't needed anymore. --- pkgs/development/libraries/gstreamer/bad/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index f08718b970c..903ca661486 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -108,10 +108,6 @@ in stdenv.mkDerivation rec { ./opencv-4.3.patch ]; - # https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/950 - # https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1235 - postPatch = "sed '/^ opencv_dep =/s/< 4\.2\.0/< 4.4.0/' -i ext/opencv/meson.build"; - nativeBuildInputs = [ meson ninja -- cgit v1.2.3 From 848a8c1b37c6376f40d8d4674500e57bacadad95 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 2 May 2020 22:35:37 +1000 Subject: cri-o: install completion/manpages --- pkgs/applications/virtualization/cri-o/default.nix | 46 ++++++++++++++++------ 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 2fd3a0b39dd..4c3d9ffc937 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -3,25 +3,24 @@ , btrfs-progs , buildGoPackage , fetchFromGitHub -, git , glibc , gpgme +, installShellFiles , libapparmor , libassuan , libgpgerror , libseccomp , libselinux , lvm2 -, pkgconfig -, which +, pkg-config }: buildGoPackage rec { - project = "cri-o"; + pname = "cri-o"; version = "1.18.0"; - name = "${project}-${version}${flavor}"; + name = "${pname}-${version}${flavor}"; - goPackagePath = "github.com/${project}/${project}"; + goPackagePath = "github.com/cri-o/cri-o"; src = fetchFromGitHub { owner = "cri-o"; @@ -30,27 +29,48 @@ buildGoPackage rec { sha256 = "142flmv54pj48rjqkd26fbxrcbx2cv6pdmrc33jgyvn6r99zliah"; }; - nativeBuildInputs = [ git pkgconfig which ]; - buildInputs = [ btrfs-progs gpgme libapparmor libassuan libgpgerror - libseccomp libselinux lvm2 ] - ++ stdenv.lib.optionals (glibc != null) [ glibc glibc.static ]; + outputs = [ "out" "man" ]; + + nativeBuildInputs = [ installShellFiles pkg-config ]; + + buildInputs = [ + btrfs-progs + gpgme + libapparmor + libassuan + libgpgerror + libseccomp + libselinux + lvm2 + ] ++ stdenv.lib.optionals (glibc != null) [ glibc glibc.static ]; BUILDTAGS = "apparmor seccomp selinux containers_image_ostree_stub"; buildPhase = '' pushd go/src/${goPackagePath} - make binaries BUILDTAGS="$BUILDTAGS" + sed -i '/version.buildDate/d' Makefile + + make binaries docs BUILDTAGS="$BUILDTAGS" ''; + installPhase = '' install -Dm755 bin/crio $out/bin/crio${flavor} install -Dm755 bin/crio-status $out/bin/crio-status${flavor} install -Dm755 bin/pinns $out/bin/pinns${flavor} + + for shell in bash fish zsh; do + installShellCompletion --$shell completions/$shell/* + done + + installManPage docs/*.[1-9] ''; meta = with stdenv.lib; { homepage = "https://cri-o.io"; - description = ''Open Container Initiative-based implementation of the - Kubernetes Container Runtime Interface''; + description = '' + Open Container Initiative-based implementation of the + Kubernetes Container Runtime Interface + ''; license = licenses.asl20; maintainers = with maintainers; [ ] ++ teams.podman.members; platforms = platforms.linux; -- cgit v1.2.3 From f8d9d72f0eb9b327e7bffeb3bcab90e5f58917a3 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 28 Apr 2020 22:44:22 +1000 Subject: cri-tools: install completion --- pkgs/tools/virtualization/cri-tools/default.nix | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/tools/virtualization/cri-tools/default.nix index 65a7f7d1980..7254b3d63d9 100644 --- a/pkgs/tools/virtualization/cri-tools/default.nix +++ b/pkgs/tools/virtualization/cri-tools/default.nix @@ -1,8 +1,13 @@ -{ buildGoPackage, fetchFromGitHub, lib }: +{ lib +, buildGoPackage +, fetchFromGitHub +, installShellFiles +}: buildGoPackage rec { pname = "cri-tools"; version = "1.18.0"; + src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; @@ -12,15 +17,26 @@ buildGoPackage rec { goPackagePath = "github.com/kubernetes-sigs/cri-tools"; + nativeBuildInputs = [ installShellFiles ]; + buildPhase = '' pushd go/src/${goPackagePath} - make all install BINDIR=$out/bin + make binaries VERSION=${version} + ''; + + installPhase = '' + make install BINDIR=$out/bin + + for shell in bash fish zsh; do + $out/bin/crictl completion $shell > crictl.$shell + installShellCompletion crictl.$shell + done ''; meta = with lib; { description = "CLI and validation tools for Kubelet Container Runtime Interface (CRI)"; homepage = "https://github.com/kubernetes-sigs/cri-tools"; - license = lib.licenses.asl20; + license = licenses.asl20; maintainers = with maintainers; [ ] ++ teams.podman.members; }; } -- cgit v1.2.3 From d737f310ff2e7a592d9710f0e628a68630e54290 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Thu, 30 Apr 2020 18:15:08 -0400 Subject: ocamlPackages.owl: unbreak by reversing previous edits - package was broken by 1c8aba83 (#83888) - fixes #85915 --- pkgs/development/ocaml-modules/owl/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/owl/default.nix b/pkgs/development/ocaml-modules/owl/default.nix index b306ee9ce6d..7dd1d525a46 100644 --- a/pkgs/development/ocaml-modules/owl/default.nix +++ b/pkgs/development/ocaml-modules/owl/default.nix @@ -6,13 +6,11 @@ , eigen , stdio , stdlib-shims -, openblas, blas, lapack +, openblasCompat , owl-base , npy }: -assert (!blas.isILP64) && (!lapack.isILP64); -assert blas.implementation == "openblas" && lapack.implementation == "openblas"; buildDunePackage rec { pname = "owl"; @@ -22,7 +20,7 @@ buildDunePackage rec { checkInputs = [ alcotest ]; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ - eigen stdio stdlib-shims openblas owl-base npy + eigen stdio stdlib-shims openblasCompat owl-base npy ]; doCheck = !stdenv.isDarwin; # https://github.com/owlbarn/owl/issues/462 -- cgit v1.2.3 From b0ac6a009b5e8e121178a5e4eaf6cc964c38f61a Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 3 May 2020 21:05:15 +0300 Subject: mpvScripts.mpris: use patch sent upstream for make DESTDIR= Make sure mpris.so is stripped. mpv-with-scripts: use a standard location for scripts in $out. mpvScripts.convert: install to the new location of mpv scripts. Replaced gobject-introspection dependency with glib. --- pkgs/applications/video/mpv/scripts/convert.nix | 7 +++++-- pkgs/applications/video/mpv/scripts/mpris.nix | 22 ++++++++++++++++------ pkgs/applications/video/mpv/wrapper.nix | 2 +- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/convert.nix b/pkgs/applications/video/mpv/scripts/convert.nix index a89b4ec0889..ce069520332 100644 --- a/pkgs/applications/video/mpv/scripts/convert.nix +++ b/pkgs/applications/video/mpv/scripts/convert.nix @@ -2,7 +2,8 @@ , yad, mkvtoolnix-cli, libnotify }: stdenv.mkDerivation { - name = "mpv-convert-script-2016-03-18.lua"; + pname = "mpv-convert-script"; + version = "2016-03-18"; src = fetchgit { url = "https://gist.github.com/Zehkul/25ea7ae77b30af959be0"; rev = "f95cee43e390e843a47e8ec9d1711a12a8cd343d"; @@ -24,8 +25,10 @@ stdenv.mkDerivation { dontBuild = true; installPhase = '' - cp convert_script.lua $out + mkdir -p $out/share/mpv/scripts + cp convert_script.lua $out/share/mpv/scripts ''; + passthru.scriptName = "convert_script.lua"; meta = { description = "Convert parts of a video while you are watching it in mpv"; diff --git a/pkgs/applications/video/mpv/scripts/mpris.nix b/pkgs/applications/video/mpv/scripts/mpris.nix index 06d8e0c2222..f19db554d04 100644 --- a/pkgs/applications/video/mpv/scripts/mpris.nix +++ b/pkgs/applications/video/mpv/scripts/mpris.nix @@ -1,7 +1,7 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gobject-introspection, mpv }: +{ stdenv, fetchpatch, fetchFromGitHub, pkgconfig, glib, mpv }: stdenv.mkDerivation rec { - name = "mpv-mpris-${version}.so"; + pname = "mpv-mpris"; version = "0.5"; src = fetchFromGitHub { @@ -10,14 +10,24 @@ stdenv.mkDerivation rec { rev = version; sha256 = "07p6li5z38pkfd40029ag2jqx917vyl3ng5p2i4v5a0af14slcnk"; }; + patches = [ + # Enables to "make SCRIPTS_DIR=... install" https://github.com/hoyon/mpv-mpris/pull/38 + (fetchpatch { + url = "https://github.com/hoyon/mpv-mpris/commit/f1482350868bf20e4575f923943ec998469b255e.patch"; + sha256 = "1lqy867wpmj6hv3zgi6g679a7x3dv5skpw24hwd05b28galnyd4l"; + }) + ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gobject-introspection mpv ]; + buildInputs = [ glib mpv ]; - installPhase = '' - cp mpris.so $out - ''; + installFlags = [ "SCRIPTS_DIR=$(out)/share/mpv/scripts" ]; + + # Otherwise, the shared object isn't `strip`ped. See: + # https://discourse.nixos.org/t/debug-why-a-derivation-has-a-reference-to-gcc/7009 + stripDebugList = [ "share/mpv/scripts" ]; + passthru.scriptName = "mpris.so"; meta = with stdenv.lib; { description = "MPRIS plugin for mpv"; diff --git a/pkgs/applications/video/mpv/wrapper.nix b/pkgs/applications/video/mpv/wrapper.nix index 624c06414fd..53def80e7da 100644 --- a/pkgs/applications/video/mpv/wrapper.nix +++ b/pkgs/applications/video/mpv/wrapper.nix @@ -9,6 +9,6 @@ symlinkJoin { postBuild = '' wrapProgram $out/bin/mpv \ - --add-flags "${stdenv.lib.concatMapStringsSep " " (x: "--script=" + x) scripts}" + --add-flags "${stdenv.lib.concatMapStringsSep " " (x: "--script=${x}/share/mpv/scripts/${x.scriptName}") scripts}" ''; } -- cgit v1.2.3 From 8bcf7f6e41e0c93a6821946521c5d2b29080cab8 Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Wed, 6 May 2020 09:34:35 +0200 Subject: kops_1_15: 1.15.2 -> 1.15.3 --- pkgs/applications/networking/cluster/kops/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 5270163736d..70d971bd580 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -52,8 +52,8 @@ in rec { mkKops = generic; kops_1_15 = mkKops { - version = "1.15.2"; - sha256 = "1sjfd7pfi81ccq1dkgkh9xx6y94bqzlp727pvyf7l01x3d14z2b3"; + version = "1.15.3"; + sha256 = "0pzgrsl61nw8pm3s032lj020fw13x3fpzlj7lknsnd581f0gg4df"; }; kops_1_16 = mkKops { -- cgit v1.2.3 From 7d2a50a418da45a759f079856931c3cf251baf3a Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Wed, 6 May 2020 09:46:36 +0200 Subject: kops_1_16: 1.16.1 -> 1.16.2 --- pkgs/applications/networking/cluster/kops/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 70d971bd580..027809c61e5 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -57,7 +57,7 @@ in rec { }; kops_1_16 = mkKops { - version = "1.16.1"; - sha256 = "04ji1703z6b3rd4wmccah68api0jj2bndzkgdzqi855gccqbmi5g"; + version = "1.16.2"; + sha256 = "1vhkjhx1n3f6ggw5cy1avs3sbqb2da6khck9zqd4s7almjbpc2h2"; }; } -- cgit v1.2.3 From facbf402ac3e9230e796fb54f7431851c1182aa1 Mon Sep 17 00:00:00 2001 From: sjau Date: Thu, 23 Apr 2020 11:56:52 +0200 Subject: vdagent: fixing 90s timeout on shutdown --- .../virtualization/spice-vdagent/default.nix | 3 + .../virtualization/spice-vdagent/timeout.diff | 84 ++++++++++++++++++++++ 2 files changed, 87 insertions(+) create mode 100644 pkgs/applications/virtualization/spice-vdagent/timeout.diff diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix index 22aa31a6dea..f577ded70ba 100644 --- a/pkgs/applications/virtualization/spice-vdagent/default.nix +++ b/pkgs/applications/virtualization/spice-vdagent/default.nix @@ -8,6 +8,9 @@ stdenv.mkDerivation rec { sha256 = "0n9k2kna2gd1zi6jv45zsp2jlv439nz5l5jjijirxqaycwi74srf"; }; NIX_CFLAGS_COMPILE = [ "-Wno-error=address-of-packed-member" ]; + patchFlags = [ "-uNp1" ]; + # included in the next release. + patches = [ ./timeout.diff ]; postPatch = '' substituteInPlace data/spice-vdagent.desktop --replace /usr $out ''; diff --git a/pkgs/applications/virtualization/spice-vdagent/timeout.diff b/pkgs/applications/virtualization/spice-vdagent/timeout.diff new file mode 100644 index 00000000000..2021e98e41f --- /dev/null +++ b/pkgs/applications/virtualization/spice-vdagent/timeout.diff @@ -0,0 +1,84 @@ +diff --git a/src/udscs.c b/src/udscs.c +index 4de75f8..7c99eed 100644 +--- a/src/udscs.c ++++ b/src/udscs.c +@@ -186,6 +186,7 @@ struct udscs_server *udscs_server_new( + server->read_callback = read_callback; + server->error_cb = error_cb; + server->service = g_socket_service_new(); ++ g_socket_service_stop(server->service); + + g_signal_connect(server->service, "incoming", + G_CALLBACK(udscs_server_accept_cb), server); +@@ -223,6 +224,11 @@ void udscs_server_listen_to_address(struct udscs_server *server, + g_object_unref(sock_addr); + } + ++void udscs_server_start(struct udscs_server *server) ++{ ++ g_socket_service_start(server->service); ++} ++ + void udscs_server_destroy_connection(struct udscs_server *server, + UdscsConnection *conn) + { +diff --git a/src/udscs.h b/src/udscs.h +index 45ebd3f..4f7ea36 100644 +--- a/src/udscs.h ++++ b/src/udscs.h +@@ -98,6 +98,8 @@ void udscs_server_listen_to_address(struct udscs_server *server, + const gchar *addr, + GError **err); + ++void udscs_server_start(struct udscs_server *server); ++ + void udscs_server_destroy_connection(struct udscs_server *server, + UdscsConnection *conn); + +diff --git a/src/vdagentd/vdagentd.c b/src/vdagentd/vdagentd.c +index cfd0a51..753c9bf 100644 +--- a/src/vdagentd/vdagentd.c ++++ b/src/vdagentd/vdagentd.c +@@ -1184,10 +1184,6 @@ int main(int argc, char *argv[]) + uinput_device = g_strdup(DEFAULT_UINPUT_DEVICE); + } + +- g_unix_signal_add(SIGINT, signal_handler, NULL); +- g_unix_signal_add(SIGHUP, signal_handler, NULL); +- g_unix_signal_add(SIGTERM, signal_handler, NULL); +- + openlog("spice-vdagentd", do_daemonize ? 0 : LOG_PERROR, LOG_USER); + + /* Setup communication with vdagent process(es) */ +@@ -1228,9 +1224,6 @@ int main(int argc, char *argv[]) + } + } + +- if (do_daemonize) +- daemonize(); +- + #ifdef WITH_STATIC_UINPUT + uinput = vdagentd_uinput_create(uinput_device, 1024, 768, NULL, 0, + debug > 1, uinput_fake); +@@ -1240,6 +1233,13 @@ int main(int argc, char *argv[]) + } + #endif + ++ if (do_daemonize) ++ daemonize(); ++ ++ g_unix_signal_add(SIGINT, signal_handler, NULL); ++ g_unix_signal_add(SIGHUP, signal_handler, NULL); ++ g_unix_signal_add(SIGTERM, signal_handler, NULL); ++ + if (want_session_info) + session_info = session_info_create(debug); + if (session_info) { +@@ -1252,6 +1252,7 @@ int main(int argc, char *argv[]) + + active_xfers = g_hash_table_new(g_direct_hash, g_direct_equal); + ++ udscs_server_start(server); + loop = g_main_loop_new(NULL, FALSE); + g_main_loop_run(loop); + -- cgit v1.2.3 From 1a6a810d26ccb0821b0c3000eb771583603d2646 Mon Sep 17 00:00:00 2001 From: Sebastian Krohn Date: Tue, 5 May 2020 23:04:19 +0200 Subject: maintainers: add dramaturg --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4154b272117..ab57dead599 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2038,6 +2038,12 @@ githubId = 108501; name = "David Pflug"; }; + dramaturg = { + email = "seb@ds.ag"; + github = "dramaturg"; + githubId = 472846; + name = "Sebastian Krohn"; + }; drets = { email = "dmitryrets@gmail.com"; github = "drets"; -- cgit v1.2.3 From 91a7f33b640183c6e665932ad14ff5b9972226f8 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 14 Apr 2020 14:04:04 +0300 Subject: nixos/unit: fix starting service --- nixos/modules/services/web-servers/unit/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/web-servers/unit/default.nix b/nixos/modules/services/web-servers/unit/default.nix index f8a18954fc9..9620d2b67b2 100644 --- a/nixos/modules/services/web-servers/unit/default.nix +++ b/nixos/modules/services/web-servers/unit/default.nix @@ -91,19 +91,23 @@ in { description = "Unit App Server"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - path = with pkgs; [ curl ]; preStart = '' - test -f '${cfg.stateDir}/conf.json' || rm -f '${cfg.stateDir}/conf.json' + [ ! -e '${cfg.stateDir}/conf.json' ] || rm -f '${cfg.stateDir}/conf.json' ''; postStart = '' - curl -X PUT --data-binary '@${configFile}' --unix-socket '/run/unit/control.unit.sock' 'http://localhost/config' + ${pkgs.curl}/bin/curl -X PUT --data-binary '@${configFile}' --unix-socket '/run/unit/control.unit.sock' 'http://localhost/config' ''; serviceConfig = { + Type = "forking"; + PIDFile = "/run/unit/unit.pid"; ExecStart = '' ${cfg.package}/bin/unitd --control 'unix:/run/unit/control.unit.sock' --pid '/run/unit/unit.pid' \ - --log '${cfg.logDir}/unit.log' --state '${cfg.stateDir}' --no-daemon \ + --log '${cfg.logDir}/unit.log' --state '${cfg.stateDir}' \ --user ${cfg.user} --group ${cfg.group} ''; + ExecStop = '' + ${pkgs.curl}/bin/curl -X DELETE --unix-socket '/run/unit/control.unit.sock' 'http://localhost/config' + ''; # User and group User = cfg.user; Group = cfg.group; -- cgit v1.2.3 From 3eb6012b64bc8ef243168ea8edce6c417cb8ad03 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 14 Apr 2020 16:07:30 +0300 Subject: nixos/unit: update sandboxing mode --- nixos/modules/services/web-servers/unit/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/web-servers/unit/default.nix b/nixos/modules/services/web-servers/unit/default.nix index 9620d2b67b2..59f03c923e6 100644 --- a/nixos/modules/services/web-servers/unit/default.nix +++ b/nixos/modules/services/web-servers/unit/default.nix @@ -113,23 +113,30 @@ in { Group = cfg.group; # Capabilities AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" "CAP_SETGID" "CAP_SETUID" ]; + # Runtime directory and mode + RuntimeDirectory = "unit"; + RuntimeDirectoryMode = "0750"; + # Access write directories + ReadWritePaths = [ cfg.stateDir cfg.logDir ]; # Security NoNewPrivileges = true; # Sandboxing - ProtectSystem = "full"; + ProtectSystem = "strict"; ProtectHome = true; - RuntimeDirectory = "unit"; - RuntimeDirectoryMode = "0750"; PrivateTmp = true; PrivateDevices = true; ProtectHostname = true; ProtectKernelTunables = true; ProtectKernelModules = true; ProtectControlGroups = true; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; LockPersonality = true; MemoryDenyWriteExecute = true; RestrictRealtime = true; + RestrictSUIDSGID = true; PrivateMounts = true; + # System Call Filtering + SystemCallArchitectures = "native"; }; }; -- cgit v1.2.3 From cfad151ac56248dd6b74c298a4f864546ac78a3e Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 14 Apr 2020 23:33:33 +0300 Subject: nixos/unit: run Unit as root In latest release recommended not set ambient capabilities. --- nixos/modules/services/web-servers/unit/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/nixos/modules/services/web-servers/unit/default.nix b/nixos/modules/services/web-servers/unit/default.nix index 59f03c923e6..989866144e1 100644 --- a/nixos/modules/services/web-servers/unit/default.nix +++ b/nixos/modules/services/web-servers/unit/default.nix @@ -108,11 +108,6 @@ in { ExecStop = '' ${pkgs.curl}/bin/curl -X DELETE --unix-socket '/run/unit/control.unit.sock' 'http://localhost/config' ''; - # User and group - User = cfg.user; - Group = cfg.group; - # Capabilities - AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" "CAP_SETGID" "CAP_SETUID" ]; # Runtime directory and mode RuntimeDirectory = "unit"; RuntimeDirectoryMode = "0750"; -- cgit v1.2.3 From f87bc139309991449031678217ab472810dcaa93 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Wed, 15 Apr 2020 08:48:09 +0300 Subject: unit: remove drop capabilites patch --- pkgs/servers/http/unit/default.nix | 5 --- pkgs/servers/http/unit/drop_cap.patch | 79 ----------------------------------- 2 files changed, 84 deletions(-) delete mode 100644 pkgs/servers/http/unit/drop_cap.patch diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index 0779a31f106..f90395b3cec 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -39,11 +39,6 @@ in stdenv.mkDerivation rec { sha256 = "19gclqhwccpi7y4386ap33ycwhylv4s4kwfc6ik8scmc4pw3sj9l"; }; - patches = [ - # https://github.com/nginx/unit/issues/357 - ./drop_cap.patch - ]; - nativeBuildInputs = [ which ]; buildInputs = [ ] diff --git a/pkgs/servers/http/unit/drop_cap.patch b/pkgs/servers/http/unit/drop_cap.patch deleted file mode 100644 index 87caf77904e..00000000000 --- a/pkgs/servers/http/unit/drop_cap.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff -r ed17ce89119f src/nxt_capability.c ---- a/src/nxt_capability.c Fri Dec 06 17:02:23 2019 +0000 -+++ b/src/nxt_capability.c Mon Dec 09 23:23:00 2019 +0000 -@@ -93,6 +93,26 @@ nxt_capability_specific_set(nxt_task_t * - return NXT_OK; - } - -+ -+nxt_int_t -+nxt_capability_drop_all(nxt_task_t *task) -+{ -+ struct __user_cap_header_struct hdr; -+ struct __user_cap_data_struct data[2]; -+ -+ hdr.version = nxt_capability_linux_get_version(); -+ hdr.pid = nxt_pid; -+ -+ nxt_memset(data, 0, sizeof(data)); -+ -+ if (nxt_slow_path(nxt_capset(&hdr, data) == -1)) { -+ nxt_alert(task, "failed to drop capabilities %E", nxt_errno); -+ return NXT_ERROR; -+ } -+ -+ return NXT_OK; -+} -+ - #else - - static nxt_int_t -diff -r ed17ce89119f src/nxt_capability.h ---- a/src/nxt_capability.h Fri Dec 06 17:02:23 2019 +0000 -+++ b/src/nxt_capability.h Mon Dec 09 23:23:00 2019 +0000 -@@ -14,4 +14,6 @@ typedef struct { - NXT_EXPORT nxt_int_t nxt_capability_set(nxt_task_t *task, - nxt_capabilities_t *cap); - -+NXT_EXPORT nxt_int_t nxt_capability_drop_all(nxt_task_t *task); -+ - #endif /* _NXT_CAPABILITY_INCLUDED_ */ -diff -r ed17ce89119f src/nxt_process.c ---- a/src/nxt_process.c Fri Dec 06 17:02:23 2019 +0000 -+++ b/src/nxt_process.c Mon Dec 09 23:23:00 2019 +0000 -@@ -264,7 +264,7 @@ cleanup: - static void - nxt_process_start(nxt_task_t *task, nxt_process_t *process) - { -- nxt_int_t ret, cap_setid; -+ nxt_int_t ret, cap_setid, drop_caps; - nxt_port_t *port, *main_port; - nxt_thread_t *thread; - nxt_runtime_t *rt; -@@ -285,9 +285,12 @@ nxt_process_start(nxt_task_t *task, nxt_ - - cap_setid = rt->capabilities.setid; - -+ drop_caps = cap_setid; -+ - #if (NXT_HAVE_CLONE_NEWUSER) -- if (!cap_setid && NXT_CLONE_USER(init->isolation.clone.flags)) { -+ if (NXT_CLONE_USER(init->isolation.clone.flags)) { - cap_setid = 1; -+ drop_caps = 0; - } - #endif - -@@ -301,6 +304,12 @@ nxt_process_start(nxt_task_t *task, nxt_ - if (nxt_slow_path(ret != NXT_OK)) { - goto fail; - } -+ -+#if (NXT_HAVE_LINUX_CAPABILITY) -+ if (drop_caps && nxt_capability_drop_all(task) != NXT_OK) { -+ goto fail; -+ } -+#endif - } - - rt->type = init->type; \ No newline at end of file -- cgit v1.2.3 From 866f6dd677ac8aa2c32f90d1b989a8444882dc9e Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 16 Apr 2020 22:52:16 +0300 Subject: unit: 1.16.0 -> 1.17.0 --- pkgs/servers/http/unit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index f90395b3cec..950dd0c9b19 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -29,14 +29,14 @@ let php72-unit = php72.override phpConfig; php73-unit = php73.override phpConfig; in stdenv.mkDerivation rec { - version = "1.16.0"; + version = "1.17.0"; pname = "unit"; src = fetchFromGitHub { owner = "nginx"; repo = "unit"; rev = version; - sha256 = "19gclqhwccpi7y4386ap33ycwhylv4s4kwfc6ik8scmc4pw3sj9l"; + sha256 = "1q3659vw8rxv4fk7ljkjav8ga72sb3arljfxcqw8b080f9hvi7hh"; }; nativeBuildInputs = [ which ]; -- cgit v1.2.3 From dc0260f7dabf55814b1ca3c37a40ace237ad1fde Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 16 Apr 2020 22:54:57 +0300 Subject: unit: add php 7.4 --- pkgs/servers/http/unit/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix index 950dd0c9b19..407882f176e 100644 --- a/pkgs/servers/http/unit/default.nix +++ b/pkgs/servers/http/unit/default.nix @@ -2,7 +2,8 @@ , withPython2 ? false, python2 , withPython3 ? true, python3, ncurses , withPHP72 ? false, php72 -, withPHP73 ? true, php73 +, withPHP73 ? false, php73 +, withPHP74 ? true, php74 , withPerl528 ? false, perl528 , withPerl530 ? true, perl530 , withPerldevel ? false, perldevel @@ -28,6 +29,8 @@ let php72-unit = php72.override phpConfig; php73-unit = php73.override phpConfig; + php74-unit = php74.override phpConfig; + in stdenv.mkDerivation rec { version = "1.17.0"; pname = "unit"; @@ -46,6 +49,7 @@ in stdenv.mkDerivation rec { ++ optionals withPython3 [ python3 ncurses ] ++ optional withPHP72 php72-unit ++ optional withPHP73 php73-unit + ++ optional withPHP73 php74-unit ++ optional withPerl528 perl528 ++ optional withPerl530 perl530 ++ optional withPerldevel perldevel @@ -68,6 +72,7 @@ in stdenv.mkDerivation rec { ${optionalString withPython3 "./configure python --module=python3 --config=${python3}/bin/python3-config --lib-path=${python3}/lib"} ${optionalString withPHP72 "./configure php --module=php72 --config=${php72-unit.unwrapped.dev}/bin/php-config --lib-path=${php72-unit}/lib"} ${optionalString withPHP73 "./configure php --module=php73 --config=${php73-unit.unwrapped.dev}/bin/php-config --lib-path=${php73-unit}/lib"} + ${optionalString withPHP74 "./configure php --module=php74 --config=${php74-unit.unwrapped.dev}/bin/php-config --lib-path=${php74-unit}/lib"} ${optionalString withPerl528 "./configure perl --module=perl528 --perl=${perl528}/bin/perl"} ${optionalString withPerl530 "./configure perl --module=perl530 --perl=${perl530}/bin/perl"} ${optionalString withPerldevel "./configure perl --module=perldev --perl=${perldevel}/bin/perl"} -- cgit v1.2.3 From 7915dc737ca769b0b25e59702a520aff7080b650 Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Wed, 11 Dec 2019 09:34:35 +0100 Subject: nixos/systemd: use global proxy config in systemd-importd --- nixos/modules/system/boot/systemd.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index df20a433d52..ffc5387e810 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -405,6 +405,8 @@ let "hibernate" "hybrid-sleep" "suspend-then-hibernate" "lock" ]; + proxy_env = config.networking.proxy.envVars; + in { @@ -1056,6 +1058,7 @@ in systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true; systemd.targets.network-online.wantedBy = [ "multi-user.target" ]; systemd.services.systemd-binfmt.wants = [ "proc-sys-fs-binfmt_misc.mount" ]; + systemd.services.systemd-importd.environment = proxy_env; # Don't bother with certain units in containers. systemd.services.systemd-remount-fs.unitConfig.ConditionVirtualization = "!container"; -- cgit v1.2.3 From 49f60b93bce02f1bf2aeefb7a7896223517cb4e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 6 May 2020 10:33:00 +0100 Subject: mpvScripts: build on hydra --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1adb4e0eb2..0182d9a7a4e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20738,7 +20738,7 @@ in mpv-with-scripts = callPackage ../applications/video/mpv/wrapper.nix { }; - mpvScripts = { + mpvScripts = recurseIntoAttrs { convert = callPackage ../applications/video/mpv/scripts/convert.nix {}; mpris = callPackage ../applications/video/mpv/scripts/mpris.nix {}; }; -- cgit v1.2.3 From 5bac4f0213f4a4fb07bf518f1dbd126f2dcc2631 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Mon, 4 May 2020 17:29:37 +0200 Subject: firefox-esr-68: 68.7.0esr -> 68.8.0esr Discussion: https://github.com/NixOS/nixpkgs/pull/86788 --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index e419137c4e9..a8150534cbc 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -35,10 +35,10 @@ rec { firefox-esr-68 = common rec { pname = "firefox-esr"; - ffversion = "68.7.0esr"; + ffversion = "68.8.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "29qbcc78hz1rsnz735a5miwfj0c3r1c5qm2043vyd9qz879vsh4ab82k7wncm3xa04kqdff26zh1rpbbjmdr7gwn4q8nmjzzs7wzpd3"; + sha512 = "2rl5irkamxi8caa8krj0wng93lb82kk9mf09mgci87mj9hy6fxzcrlmiiffp14s03rv0raagrn4w54pbx1336mylq6saxmfhpf676hk"; }; patches = [ -- cgit v1.2.3 From 50401929137cdd1f681c59615602d4118f0b1eb4 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Mon, 4 May 2020 17:22:59 +0200 Subject: firefox-bin: 75.0 -> 76.0 Discussion: https://github.com/NixOS/nixpkgs/pull/86788 --- .../browsers/firefox-bin/release_sources.nix | 770 ++++++++++----------- 1 file changed, 385 insertions(+), 385 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 997d6d98405..28a3c085a2f 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,965 +1,965 @@ { - version = "75.0"; + version = "76.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ach/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ach/firefox-76.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "654ce2cccf5b123e25509f71f4526f42052b3cd6eb79694de47f94363af4ab2b98b60d73020bf45c11d5aee9d0b3e246f72a7795cdf770f34a34f8c097d3cb5b"; + sha512 = "d1bd187497c76c624e010ec50a43e68bd91cdfded37f85e02047acdb53027c79c8071632f1a31f35f0a2b52eacf94c905984f2edb7b83e0a74fb0a0565eb18a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/af/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/af/firefox-76.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "615b948a59066bf7503d66a3fd574fa6523f85765f7e7f84d3929a78ef82b4833be6e810eeb95e266e3609e943703e1c84a0f7a26a542fb5e8a8bb0fcf379065"; + sha512 = "bd9e45046cb566cd3fc94eec9d5587b0270417d68091da1b29eca40645b2aff4f081c2a5b0292a0e06da410a64fd1f617543bf0702852a6fe424680fdf3ec39a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/an/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/an/firefox-76.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "070d250a2a22ae6b97efc618fb65fe93efe209b82aab53f9c13d20c3c8bf3fb9b84e209661d0322759a0dbed68e17c69ce6ef24a53d9dfd3186f1fd987e7c60c"; + sha512 = "d5df04a513a349291d629941e519617cdcdee1c004ec8bcc3c02bf02ad310dad2dc33878268d8a4a6b115b3b02bd558159a8eaddda48e83aca29f2a377225396"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ar/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ar/firefox-76.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "36f7e51b0a1b7eb1c5df858cd0e90c301c162bb0413882dc3e64ed1240b4c81fde26eb0d9f7d813ce92c8bbae1e87a98e97d4a6360d765fb32ffdd84298f7f37"; + sha512 = "753550131ee986f7a770f95959a26b24b17e0a6a5f2e12ec1b7d42b31886e32b9c93a559b7824cd5348f34f1fe26901f5198fca57ab2c9f412ce032882cf7b5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ast/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ast/firefox-76.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "693cc4eedc5ec9a058ecb618ef70b322bc55b5a6159f480b219807940061ec22c92843fd288252ef30341dc1e42d0ad63586f5b9f438011726dc5fe88ad6037e"; + sha512 = "8561ba0236a9524672c7ebacde935d4c3761fe2c5fc0125951d28f53c3d27388d48c108a6fa71064cbfa54cca57a72f6fb49b3b8314d28b875e250b218be4d55"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/az/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/az/firefox-76.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "9d78aa451a95f5c26685b6065c93c77c7b3f14db6cbc57ceb0b868a30ce2a023d28063d4a14b5617f65c2ebcb6eab7d2ec6ba2eab0909e44ab3f25b2b69471df"; + sha512 = "53b7a939d02ccc0a809079070afd4db528a4cb617a4fbfaa58cca573450be764e3894caf3a40477903151f8116460dc574749f0edf9bfae6981616772b649703"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/be/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/be/firefox-76.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "6b898118e72cb2311d6230a2a151505c1927a35060bf703da6ce97a5d0735b06e56b163d5e5d4542931453923cf5e0afb9b527d2392e324a509da5185f2a2720"; + sha512 = "36658c05c6b7b1f64ffe14ded709dbc08f0236f99f9457964c15a36a4ebf8d73bf482ac2f8518927b2d66fc9a1ba19289db1855a6dbc7b9502c2a3c0137bd7ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/bg/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/bg/firefox-76.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "b9a12097e8312c099622c3f506c09507a9f3cb25e36f25967001c37f3840916f58c6693f272725ef3a35b22be916c3f4eea78b3bd0ea4a110647a0db53484cfd"; + sha512 = "890066ff182d6ce79cf0adf307a92a26ced29f633cbaaacd02eb5c1c3f0e2bc2de336a7b22fbb530ec85561d26dc44f93f2ce1f58843e1d87322badbdc92e8fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/bn/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/bn/firefox-76.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "b396e1e57c0e1cb7d554eb32ff4cd92db5458c5c232855bce42765aa2ab0d387ccd817f8a06624f84122f74dc1d5818992e9ca18138085a2f164ae3095485e14"; + sha512 = "c6f9bda8a95351d79ecfe1e138ace440aecee6c1dc5ad2d7c6d249e5277b75b27797cdcbfa1b8d3ec2a899974f555b8b20f7c38f03a7979ca917ab050feb6cfa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/br/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/br/firefox-76.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "3aa6fb9dc3300b38038873e5fb06e40f4e9adbf30aa6fc4f3cfa7ebc399bd94d3464081f304843e83d4478989874283a8ae1be5704d34f4e43b2a699aab31466"; + sha512 = "b15b1cd34dc4799836d67ce4ed8b166b54e21076313a2f726c7b872aeabbcc40a35c7f859cf78e0f17825fcad38b6d4dfaadf5d27ef89ebea8da0ce427492311"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/bs/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/bs/firefox-76.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "baf9e2909320fa15c70fc4a37e4e15a89726079d49d2a7edb72dcc4908b59cd8a8ae4917c1f4338063f5b85b119dfdd9c8d0480d71dd4fc45cca77ce465a3170"; + sha512 = "fee05346fed30422b79af7c0626a7763f404f8a3a2617bddd17b95434060bd1c47b47409a0147c130b51d08d98de2232abe8fc7ade9bc58cc1eeccaf0987aee7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ca-valencia/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ca-valencia/firefox-76.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "a3e16f4ef89e8ffa65981cee1ed53817dc2ed235f2f3f7b9ba035db92ccc58893b10f5719fa7c37a400bfb9da07309f788c142e36e5f7a91e286d7f0d9ec3092"; + sha512 = "beb5d44cabc7a80a0ceb4573e4e6fc2b554c6cc0ae38c9a5699d0d87d5f36aee892c4bee8ca1d103001b3305ef814f9a96a8fd63dc5b495363443f9abb4edc91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ca/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ca/firefox-76.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "a68a75844cf22ecccd407f0478bd38b3ed6f19cf8e6b32cef2c9e5e6d03eaa621b60be924a649c729b6cca3dbdeaf518f56676cb0bc295cb50ebb1038571e31b"; + sha512 = "1b8cc942602134a48e0d16a3244e97edafa133c74651ed4545f5e3eb515ad1881276cd2adc204e5c9cfd677dacec79030311483469174415199b9eb679729442"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/cak/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/cak/firefox-76.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "5759039f87134d0a1653d8175c53a0aa8a71379cc4aad75831282956711e4fe485e62040c3325f24684e2d676fe4208ec4319aa959cb29c9682847b35906589d"; + sha512 = "2738e924257a81bb1ff956a6717e6ef4769e96f5940bb0fad58030e3d2ce65e84ecb2807e6e04ca820eeba61bd386c85716112535cc28d2bd3c9e7a364c734b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/cs/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/cs/firefox-76.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "dcb7a5c9b89c524e61f7a99a2926099cb7ba088c7fbce82f3e8450b00554efc587dd7c4b757b6567519f0ec928edf50fcfd438367c37b48a3bff7d1ef66b4d51"; + sha512 = "3d58acd8bafbd11307ca58894992fcf8325a5679585d5c5e09e397b941019a8a8f7bc9b63997bcad2722e8cbba88715b789683b0428632e4ec4b728a36b54099"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/cy/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/cy/firefox-76.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "e788954f6ce821cc68afe9428c02823870533164b36123d7f7a9bce7a4d82392606d397713e8cf28b5360dc5897ca35bd3ff6aaaafbabb7fe5106462e8f687f2"; + sha512 = "aa7aa1b06c1a28e30b532d41b4cf3bbae26c42a24a63afb1999f421577afac4e4591b465b3e659ed5c9278b2c5d2c4c449a84fcfa69b451804d2a0470524ab04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/da/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/da/firefox-76.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "4a2da0b04a3f6cd6a5dff9c4d575d83b8ac195d815d4bc64e1bf59f5993c4b7e26fd56b81d7f0c5f6e5d084365b4d21477f7d554ab06a4f73400b8c484ad0fcc"; + sha512 = "48160d3a437dee94c1070e2742c6bde4a36811e8d2eae87d7c8450476b30b912bc9cbef8a5f7d917ad4be771eeede9d7fa9315e27b154f50049ce80f4911024d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/de/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/de/firefox-76.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "6dd27ff5b7eab20c2548cb0dded8e677334b58040ee4e15a0d1095cafaa209bdde069d03b87ea7133899093375d425621bce7a9a3816f62aa603e20304be56af"; + sha512 = "fc4d0ddd9649dd555b4abd4d90f9d6cff8fe7e702bcf5d2931565c469842f51ee215286f68802304868848f043e54c8224358c8f4060435a4674401d19bd6989"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/dsb/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/dsb/firefox-76.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "abff1c0ab591a1c2572e88c25c785f218bfb7b9d86c415f4390830f4d0e2ae97f9ba44d2f0a552356fcdc2d6ef9a238b6d00f1287132df60348728b63fa322bd"; + sha512 = "3cab1a498db5900b055a8bc6398e4dc9770657c41ba9bb6bf0f196566e9c535db99f02e5c51750e7c7185f2f0b1a26e84da51403775c33ef34915b43e3a8b27c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/el/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/el/firefox-76.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "9bfa5257fbefdc079f5d372d7feb3f52f52a33137367676e141a3aa57b5fde64a1e6d218a6cf9d81941a89fb3917edb5f1c4883796148fc63a32c55554538796"; + sha512 = "d099758283e38566a4d9db744590f42b5fd28de8e985c2f240096e158995da00711e97d6feb3979bac40a2ad57cf7876da37c4ba69f3467930415d87a2d10c50"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/en-CA/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/en-CA/firefox-76.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "5b6ff6a0b422bd399a5ac2893e187e4f46c6afc106aed7177d3f3a6a9f72c5cf283a589ec589625deed0ce4e3d7d1d45cd9d8a6c7015c48b7187edeb1c07b129"; + sha512 = "442e60f0d132d96c58364e0d5f70e43ade8e6508f5d0a76b3d7e5c61bed0bffa5f9bc2096c89879dcb1681bc394699e39d3c31f2d02fa790dd8e38f1b406154c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/en-GB/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/en-GB/firefox-76.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "03e20bb7811ba53b2ae3f051279c478b4a240ad9ce0381e9a15daa8d04f15b11446456b05c84f41c3f628e3c7166ab2d19b8074c77b7f3190795cc4219be9be6"; + sha512 = "8c0d31a9123d8d8baf94f73505233786f7fd2ce721f8792f4cc1db337a1659badf08393a22159dcb9d8256e43f24661c3975e6a1f801e30d21bc54083f4da041"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/en-US/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/en-US/firefox-76.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "7cbe8df35f61d82115ca1e4db4dd2e17cc96ba74cdf4e5e48aa4c1f5bdadf4e8b612b6ab58a09ce1352129ccfa68043ae92836b175fc5c328c3696f1f3426107"; + sha512 = "993e5410a946f802a47d8167c83e767fa9973754cfc1365e4cc2698a25524dc27c83f3b202990744dd654d68226c601ad9608ecc49d2c3952e50967e20ece34a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/eo/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/eo/firefox-76.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "933a872f25c6377abe21e33fe56a3184e605e299369cf11b84c0fcf420336f119abdc9568eb81b1e51bb58228616cab4c7171cfb8f8e40329bffb377a455c832"; + sha512 = "c2021ecd345cc45fd26ccd8a75ee66cd1eeb506a8e0f6b9811b4149b6bb15121edcdc9a0825703db52beea61f7249f45d23fa3822a9f47701adbc2e86c7ccaa3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/es-AR/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/es-AR/firefox-76.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "5da5004a2985fce3a6dff5461f2c0fe174d3ad58e3dd37c4535edcd0883fad6f5a449f9f898c5bde5de3aebd9911e87e82c99bd48a06e9d953e38666e3f8fdee"; + sha512 = "c397cdeebd4527189b898db2640c1a5b8b5bd4fc1664ef384662136232b5dc21f7033686d2624ec421542d1140f46cc95c8364d47e1c89a8653d541fab52e28c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/es-CL/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/es-CL/firefox-76.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "c2acae33bbf335d871ef14e27d197f4378e8ad1a94b9ba2df28497e4a72fd554a1d9428692cbd7cd5e3147f575d7517dbca07b3edb5eaa66c390000e7cbf5a7d"; + sha512 = "86940cd36df65d0515634c7abe6c7c81157a8bd3576acd9844784041c2239d25aa455da2fc33ba9b8cac0e5a840546dda0cc04765589dab0608ebe9b3cd53967"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/es-ES/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/es-ES/firefox-76.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "ce8ca7ce217bde7b42c9ce6d64874d37306754ccfd61f0b61c898e22f84feba6e30a33468b9766ad96f5ae8e6e674eab93881f36ded52f010216d8efa5f77907"; + sha512 = "9a1404626e2b9716567e0c1b0a7d681acfc47bd488fcc585172fb40c4d18dc1bdd4356244c74d042ad085e0300aff73ff7619d651658655bdf7d668f64e72a3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/es-MX/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/es-MX/firefox-76.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "fe32f01fcc01ccefaf7207fdc56da4450fd17928185382cd738d7a22425b5c3761ef60d0a9f7d35d314d0b7884859d614f08903eb20fb0a679f27dd1f4b136b2"; + sha512 = "870b2b135ffe3ece3ef4d16abc74d469421742bb32fe8b0add3a39dbd580aa07e251df4137f3a2950d6992cefcf0eaff162959ad5eeeb7e493c016769ad2751d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/et/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/et/firefox-76.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "fc1855e6c7bc19f181c7e87909a79e1a5d08ce1fd38f52d65e20331daec8af8b54c1bb7f90eb1c3e53c900f141ae264f55895f6fdd3690a83945a26707eec27d"; + sha512 = "d20a3c1cb0649406d9cfcc22bffb4dacdee124b68c210ff25b1316be76a1ec26b7b9f21ee8d208cb7a6f1f733ae71b70af3fe084b92640cce03989f4d45cc375"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/eu/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/eu/firefox-76.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "a285ac60590113e41f04a85183038ad02f0d7e24fb42fe1a7b313eb6d3fb5b747ac5f90364278f7c8cc3f35d0ddc86c0bfbc7f7fa7ed2adc56ef6c77c5b25ad8"; + sha512 = "fcc4a18ab042f31153e1f5a4d090c920e687687ae8be4259394a771c839e8af167efdf9b0a3cd8ae80f15e70300d24ca894ec1381bd91738b7a5c1160dcf8eac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/fa/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/fa/firefox-76.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "84ee3198ca0cd8a3b20f4c696f6c08b94d35f9346e4443e1d6d6ef447d94a20fa1d58488a12124440290c4ae00ae827ee59c0cbdb7905210bdfca0c012f7e01c"; + sha512 = "7ce0bce00836d4497a440f3c66421cbab38f5b856a8b0e3dea13b88c167b689a061be7261d9daed1ddebd23f21eb806fbe72c7cf08a2f49c31ea1486287404b7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ff/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ff/firefox-76.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "f3b615fc63b12ade11fad5b5532d81741147156ae84d08b1bc3c0f43f2c204993601e1bb363ce7e3ed7ed3a5d790428ca51e3cb5decf56f159bf7a25e2e43a83"; + sha512 = "41c0639955bb82c8042e0cd9e76c6c6b30c5baf8f94206f1932e8a56cbc21a2de53fc9b31b6dec656822e215d11259a7b2dc158e58d1edce48dbe41f2cda4098"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/fi/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/fi/firefox-76.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "b629b55fe05c53ef814b091ff5222704afb3802630a5f44047bcaa17f8140c834725eff9e51786e55336910c462ac07b956878b551a5a48190b1ccd2904e57dd"; + sha512 = "540f26080c0b85b71e40bb0eb5acd92d8b71cd9ad8dbe72121225afc2b9821519ed6a2d2bc58cc77b445c3fa42ac6e39647c1da8c8a8935617995dcb0376b9d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/fr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/fr/firefox-76.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "1794f58a31e91916492319091437ad9e5bbed95b3925854f744e6e635e9fb4c06abe73f9fed429fd04027c12cc29b63363e60a0c099640226a5a626a428b3002"; + sha512 = "ccf845aec06d7274acc7a850702e2dbfe69db8198a44537f7f0eef6b65bdf0cb71682b2a443f0e6a5e8ff310922bd29c39229813cd12ba54f70c0fa3418ff23a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/fy-NL/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/fy-NL/firefox-76.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "3aa9f95eeeadd81d0ecfa93b1df9b1b455425f430968395bfe65e60a65c6aed3d9316f842673c2638acffedfbf1d93940086f6b7a113496c7d8e580aecd8f25d"; + sha512 = "5eca2e853a3458f5adf0a960cc7ec4f21db344e67e7e419ca19d34b807809bd0c954ae4011b5ee73b02d9ef88686ac57f2a0d1d3af43e6a4def2031b698cd656"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ga-IE/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ga-IE/firefox-76.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "43bb9830e38dddcc59480a7e162214e37ca3516cfa0d773c4851ec60f098837ea2849917eb460ae7e388612619b13cf29d26d9b1908a8734b6fde1add36c65bc"; + sha512 = "4ceee43db5cbd6ef5b18442cba0c7c74998129280e14b20ad41de041b3053b518fe77767a7aed9c62fa2467b2d6ac36a680e276d79edbc959313b260950f7c8a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/gd/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/gd/firefox-76.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "8cf151995af5ebfaf9f713dc7373b9ff3d12ce582c4fd062741eb99e291aec68fe636d871709ee0a0bd628af0e9f1a412a12289c539334783c7a5d6b6b0d4822"; + sha512 = "9a5115acf49a15e10a530041029081eff7bd7a6877dac1331391d5321533083162be0dbc5dcede2bb708d8a54d47af3773c89e498d8c7d99c28f7229747c0721"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/gl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/gl/firefox-76.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "da133c0af8546ab62c335faded8b35f917af2cc7fafac8cd22db1e3a867b390de60a2bc15adc7687044702907a675eee42b049cde335d41a55894537dd137fd0"; + sha512 = "435de08a8d536491b645d630e81bd9190b61e0073c3b170977a995f9599b0ebd0fe4a18279f0ef40ca242e854fd43ea36dab41a86a73c515a691b621f8b74ae2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/gn/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/gn/firefox-76.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "a1f6063560d70f81cab8d40f1f0e28ea866f284ec94a0093fe874c96795ad3e823c202e82dee2de7578f3ffc1231ac0e8bdcc1a21c44107cb1d4ab56cb56effe"; + sha512 = "e4e4d05239306cbc0f91cf6d1eb890af45c40fff8ac53fa47c6dde6dbaa583d31b6e5e51bfac91d2fddba9f89e51125235b11f766ebc39ec5e55da65e1ba732d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/gu-IN/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/gu-IN/firefox-76.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "60123058d668641a6c48a7a6a4247337515493267b3489a16e9f7fa2d0ab1ed8a5382974705a156fc041501560b8f6a2be3a97b47ebfdb5f6f527e63ac5acbcd"; + sha512 = "727b7db843fc1722cb5d837e02388170d06f8c6ef42aba22dde9e237808e5404820c8b14dd43ec5cf2ddfcdf4883bd678d5c9aeb2845e428c096382d8a805afa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/he/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/he/firefox-76.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "7693bad7f6505cfd1718e8268611133d26826adc49003eeb6d30bf38ddc1908c39ec270b80e20463c016e4b367ea8035dc8c9707b410299581e1b09df7a08df0"; + sha512 = "c151a281f8aaaf82a0021c20af2d12332674b27f2e5ac9c0ffea070c5c350f96de978a1662b5886f1d3b1d514061747f247ae3ebbd965e3ce940a2494c164243"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/hi-IN/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/hi-IN/firefox-76.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "f5b58f3507852cb2d900d1398c934bb8de725b3578d1037d424f5b81d7cf2e0a247e6be50037e027649dece8cae55c579f81205259c93f22eefb2d67af8b0d57"; + sha512 = "5048f072162e3b2cbfbcc24885aec83599a7c47bad212fbae741fa15b903014a9e29b362f1492b42341498398b009e5d929de0801a22b4333093f9057c47b42c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/hr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/hr/firefox-76.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "6504e82cb541bcc9a893c5adcc063a8de3b85e68329d3e5dee0a461a0c614b330d7b59b6f3fa0195a01d69ee011017bdf999f95fbb19ad25136b291feef1ccb3"; + sha512 = "ebd9c280598ebec64a230f6711d4d7839feb005d790c0660fe789e129a1acba78e170686eff21e0bad558dc7e9b0dc98a9139b7fff2426d9050ec0b3ed3e815b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/hsb/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/hsb/firefox-76.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "6d0828ce7c721aecdc66a1df441cd7ad43a1e96487797a414a5a9843bbee6edc1ad2aa23d82edac7b2bb1264a0880b1852bf2cbab184ac1f5f91da99fb4bb06d"; + sha512 = "197ea2000df14ad17191e2e7eaf54bf7bd1df21fbd25c0e18b200d2c43686c4e256be329f57254422a8e156917ea3bf312a38e332b72596b5b93b97f61319be2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/hu/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/hu/firefox-76.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "a252051af8e299e6b21e9d601e54cbb0413d73eebce693403b522354cb0b6ceb240ef70b50c99ab55379d2a99a0f268483e2b0a02da3f9684a5b7a958b732cd1"; + sha512 = "ce3b86d39f27f1a5f2287cb88bb45be0b70ca8adf7e814e3fd5191fd41ab7e33c427d8ee0d4f5c7c5b279e2079e318239aa3485771bd2f211c9f1ae2e654fc5f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/hy-AM/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/hy-AM/firefox-76.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "aca7eb55987d98d69f024ac41414fc9394c8f05949bde1880d191c3b09bdea4798baedb4a92119faf923e5a36c760360d87ecfadc771a57f6425302483b6dd08"; + sha512 = "022053cf588d2f7aebb564342068d4bf3763dde50f3bbcf433dd2d7e5d90ecb134f9302b44f5bdcc84f56e74c7c965555e931ac7b6d85ce58dafe838026a91b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ia/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ia/firefox-76.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "e23d26cd4f7cd40610ca841fd2b8be72f199eb2102560002c419fb6f00b1f2fffcf5fad6fd06c6e7a0146d2b7525c006e6dc696271f4bd4f5bb3bcefb8980e9a"; + sha512 = "bd57679165653b1557569d20eaa3ca83011e5704b76e3f29730e91d2c7a5fb553ab3563a1f26d38100ff8330d7efbbd133e959c4ae5c534da2e0888dac12ca5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/id/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/id/firefox-76.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "f8ecfe334dbcf6598cc2241c56d6496ccf0755494d11c26e2624803d3f1a6001944d8c9b78c62bd8bdac85fc3d1e60b90212b8bd8b2842e0faf6824a1651a31d"; + sha512 = "72a391de2d665db794e5624f341245a85a85c45d8d2f3c71bcf526b273bbf1a06cdfca5e9d45ec05627570ee496e0899fd7756066f6f40a86df088c4e5025ac2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/is/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/is/firefox-76.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "9ce50d9746bcf6384627a83538a0e023091b7f264c6364e88de2bd8ebed0e081e1d31681ae0679d2a88f462bf9e04d7e9cd07826822cff3db1a1d338816875ac"; + sha512 = "8707e9ea8665b0f2f773c98b7c457c00c99528676afaebd56570fea1460b11ac016ca257f10397e447581a3a8966db671bf33634255c015104c8435c067fbce3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/it/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/it/firefox-76.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "9284d8657a4097696523cc07217908449102f46dba9564f98b2e4889707082be4cf285f889f650ceaa92e06f564daa19691dfcfe95b0b4a865987b767665b837"; + sha512 = "10d74b74ca47e406919ac9589937ecadc55b637678f895d6bb3700aa072c261416591378845fcc2f032755da08a4e996c726fa1694b18883feb9fb90a36ab71e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ja/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ja/firefox-76.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "68bfe86b27d5d5d71121735a627e29964b2c3dd70e33e12f8ce3a9d380d253c33bede8d33eb7f0185acc68deb388b731ae6b40c7d71ac49c6fb5ee60e44e787c"; + sha512 = "9d7d45b0e1ef893145bce37a137e648b6292febbb08e66a0f0e8b6e9765e19ed3e864483c3892d327f3c75a4f73592a5cb2957ff6c17b20d19bf18179df5b083"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ka/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ka/firefox-76.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "b784f5fcc063c98481ee3eae767eb3df60c9ba4464fbb612cd10bbdf1abf54f5b2098700345f2494358de1ced339f1fade979ab6603f036e4a2f76b25c46a33e"; + sha512 = "22730ebd0eec5fe1c9f993c8964c81b31d2bce1b1b7ba901c3a7911d9544659e459fdd19024bb551169d17c9430e15a92c039969379da28a49db2f0b04d799c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/kab/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/kab/firefox-76.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "ac26df50c827efe7fecac013ae417a4b68d2a49062ec9fd443f5ff6d47646333ccbf6a98e92e0c8c2d5aa293b170336752c92d33999e41e3ed163292a6bf3d0b"; + sha512 = "e7455deffe566f95239e6b1b6eb5a4b20d849ff9f0fa26518d993581b5e76975e41a5bdb54f69be7ff182437ceca868779b67c6a6c118155569dd8792793979e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/kk/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/kk/firefox-76.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "47e516fc9fbba8e5b57fa3172df29fccf8d318fe1431233c2d70c5c657d40f2a8af1b20daf5e3d6b3978ee093b1d100dbf7ef8838385791b58ce5463d6899946"; + sha512 = "56e36532e5babf3682edf5f278b971897cbd4854b0864dde5aedffa6a7828048557dee5992f9eabdfdb67c2054abc0dc2e5d0df8ec5882b07d8b266183177e06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/km/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/km/firefox-76.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "ae0baee8e59fc4d44ebf57d7f708d3f30126989e4bd32309d8daa4478facfa4a929a96972acfb248eab0a1e04597b2dd521a4fee40f748fb0a4f6108220464de"; + sha512 = "6d1ef5fb7b555d667bc1ced25b7ef49f8832b9c077b113db79ff8509d845d693af33bcccf4039805fc0c69293139a22f24ea3294706097ebde859cd0f9aae8bb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/kn/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/kn/firefox-76.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "c0c37e1b36408b0d8a4d34fbba254a6d6b37c80287ddc4abce88a623ba3fd5b92108509bee27bbee500abfc08d364886ce8ed5b816b9450aacd127aeba39df94"; + sha512 = "04626f922214d666f1da224b2ba52960f1697ff76a0b40f92718c536eb07de6b319700566a9c3d702e50b137d54b7a75af474bdf56d39bf80165b8430b636944"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ko/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ko/firefox-76.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "8867aa119becc3e88c63096c5ebfb2bea3a396cbbbc18f35725d5983df098543827bf6c069292322507b871263f744ffb411a59437687780a9dcafd276d04410"; + sha512 = "e83f42c7c24b5a0536510ee736114d8e8ab6c6393ce63ca9e2f9d0e0216831b192781d0617e9793c6a8b687429275eafa6f84a8839900858412abff751256a4f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/lij/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/lij/firefox-76.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "c10c9dbcbd911c3ce324aef23629f37df959797128fcea7373f3d77fb8b3d538850aed797e754bd15edf59e666412158bcee2c1a9ce8d040d1b457de9ee007f1"; + sha512 = "524261eaf2fd311f92d85df46459bba17b06ca4e1a61a14453c9edbf37c31b1de2d781d466812c250353546bbde2044c79626840297c76a3986fc6ef869db863"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/lt/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/lt/firefox-76.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "58517b58ac3c51c5aa2fddc0b5a458d100d3eec44e51c6d188a85c2e7538caf37cabb1440f4ebdc97d54d3677697a5fe07235d67ddc5c4287bcef10f9b7dc3bc"; + sha512 = "f9c0665c4f4fa6f4a8f0fcc02b92c88d0c9eefcc7b018dd54c605c6b0f024282e25645ddf14cb2bc82827f7c4c8191a83c38d4d749af45db07bb81df99ec6d44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/lv/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/lv/firefox-76.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "9e07357febaa5b67eafa435d30a2a8f75f2ad25d1e87968cf71b8a265a647ea0020169d6f2cd77c4779dff905774664f84ad26fbcc8b9d4c986dfad52000e175"; + sha512 = "b89f91a5223a2431ea272115b18fba29491d60ab5e0a69af4a1152644596b477876a7c8109ba08c5210b782ad11ddd2b65c775a4fe8cba1126b21cf31e31d1e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/mk/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/mk/firefox-76.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "249c45bf3f1b22e355bcfb4f5afa829163d8d1d72a8f192111eff2158b10585152c9c2dcb2fbc9ce66d8351d83d83236a04b42da4607fad92d2b4e25acdd39a4"; + sha512 = "f10771c9b2f8634259b7252488e4fd3f9b249b33ab59ce9a02c77d0c4cdc5c567222a91271d4cf3949decd86602613e9fcf9e5e8a403f91255ad8a69bf2351dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/mr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/mr/firefox-76.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "b5860b41a310cddc4dc81074f01deffdbd10ec3f682aaf3d27881f8c190cf5ba39c428b7bae688301f8fb40ca12b3cfdd9377501a3e750ce8995e1331fc015ed"; + sha512 = "49bf1846a330c4d43d554f048bc1c5061c1059d62c57ffa224d19b3b4b2fdc806be73e6bea8409763be182b37ab6a1243652c62f5f3e48a36c3443f509a06c56"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ms/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ms/firefox-76.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "a1b88f527ce9e4d9f69d4b727313a68432db2d989d360fe5716f896d61e7dc098667720a2c60e33612b43157566f95abe6f1b149f7aa507a9738753e6c3213bd"; + sha512 = "018622ef6cec81de014191bf94f88aa1a7ce732324f70a1524e3866e5500ee93dc6ac48dff4603b2f86b909301ebd2440ab87bf976cf041f6f8ecc4bc7da25fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/my/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/my/firefox-76.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "74efc375475884fb9bfa9fa4d944dde0f6c734d1c73676d37b80a909618773147f12faa94ed6570a6aab6652c4c5c32cf386ac096acc025ba6c8440d8d345026"; + sha512 = "24685648158e9da5e74bba611884c3d260e7bad4eb3b6b2e70cf57f15d505b87a7886868e88bfaf440f03f37f7da04fb6fcaa5947ac6ecb62a987b24e0be5759"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/nb-NO/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/nb-NO/firefox-76.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "c1d4eafece0ba52022c96fd939651ad047e942fd9128dd8c6bada79f2d0eba01311b4829c805eafbbcc53ec4dee34d14e015742a86ec67de07d84d6950fff41e"; + sha512 = "4fd040d08c704cbcade0a290020d591fc265bcbf63467f93c58603a3f96af06cb3b38d03aae5a32b4b78fe2c4f89ef81112a69bf539fa052b721f549423b42d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ne-NP/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ne-NP/firefox-76.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "a97b467bd40e1564973b18ad6acb10412da67184daaad25c34b84ec2a8f3a840f01fe4b9720f4774a546a7e035338d9ce297eeb882a3df2b50f6a9cffa2bee13"; + sha512 = "0708208411de209aad6a692dc1b867011d589f2fe1e60dbb5c8448f96735d811aca6a444f7a3ae2d93a2953965b57a728e3af1b2a31ff8c86d1941a21ac2147a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/nl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/nl/firefox-76.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "2d84393b851618e1742616ab6f3b1fb21b7f00cd65a98438cf3a1250275b7b184f6eb0cdb1d1425293d1ecbcf4591fba392283596146a5b18f29166111cd8844"; + sha512 = "2c6df617fe9e4c3ba1940aa86e313fa4a5e64db98f4df9abdcef2a5e7832e8586e939646e435c9725e5b97ec80da0f987b620a78faaf445c374a46cdda862f23"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/nn-NO/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/nn-NO/firefox-76.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "c5782ddf73e00481ed338ccc989b2c2760f15e2b2960457cd3cf6403d6d3ad5d1b5d34cc6194b3a1ddc83df8d376796802d4e945b8ab47b7b7e1a4d5a4387a6e"; + sha512 = "5f02a673edacd9e9e9171c7324b3b45974bc5374fc5a05835a450b6aad1219dc76ee50dd4084243523fc3e10e7b65a51f33e33009f4393f790a9a8430442d87f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/oc/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/oc/firefox-76.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "cd3a3fde21ab21e08467ebbb45d0a2d32cb901c2b6807edd6298eb75bc089684f9fd26c0741295f2ea82c2e25cb375bcd1e45e26c267c59d12d285a00f0d0b74"; + sha512 = "cf24d386d8ad5a927e86929d053eebaf03be667bee4a4d0a85a76b6030e85f254b8e9b14091cb17ce3082890affa2c75ae2c1c0da8e007fed5189c9c2fb3b95a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/pa-IN/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/pa-IN/firefox-76.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "546e36c717f8a0c216c32f53cb56d2fb709702052bd52ac1184860c7cd755f9f0d657b8955c3f6347c37d382600ff9cf5add261dd066e8881e6a3e410fea151d"; + sha512 = "1a8f07e70425bc65552fa82a16eb4009e036de60a6b84aacf7a4d47c2763b00b116f61fb87aa2a5dc28d2e09a82dc3621470b5589b3fba449e2eadf2996686aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/pl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/pl/firefox-76.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "837bde42f6b9c1aaca794be4fcf819fcee3e3456a883743882ed6983e71f98ba25e02292bb01811958a9f21cedac55586deb8066f52939971c348e21ef5ab75d"; + sha512 = "ba8dcd5ad68f8506d4c637be831365fe230209ef58640da8bfec20cde9447daab678229e0a82931c022aa0c6fecdd0e405e92a4bfd51d7627235b689aa78c555"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/pt-BR/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/pt-BR/firefox-76.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "81a2620aee0f210782aba431e7e9e15ab2a0db49489aa61cf7a6af5944e59c62f38b65aafb198355d5d49aa5c52e1052ba60c03b1772916a972ed06aad616f25"; + sha512 = "fa1f67341221a907f24ce2953fd75a0003c04540a7673173fdc333081c82c24e68c0fcaa85e10264435a9540e356e94f0b4d5b38d892821bd307530ee10f9b7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/pt-PT/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/pt-PT/firefox-76.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "c6b317d17a14c5d5d428410f7e86c7b9089442bcbefdf1a44875373390d649b2f7eff26c09c5cb32fd2f8f42293d289044a7007dae4b075bb1fc522b63f4b18a"; + sha512 = "c282b71b30ee4f2f67d98551eaeb1700d2867e8ae1f19dad417f8774b8a91db63ecc14c37712910b7476e837c4c23f4871a20d2afe37f61ba4ba0ca4b1684569"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/rm/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/rm/firefox-76.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "12e6c10fcc9419a66aef11e50969fc6adc7084db46d2cc6202a08e1a7225b797fdcdebbfb9dff6a441e3fcc782cb33753361ef37767e5ccff35af2efefd82256"; + sha512 = "70cd918ccbeade126f36dee76600f7c6e78ec3291a12e6d60f684dbf5fba322bb7ab847cda9f101af5b48d9b0374573e8f6295dd8683ff3acf9a89512117d054"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ro/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ro/firefox-76.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "c03df00b865bec9765d28bf0171a5eb6a57e3c8cd64a9002f17bf67d4d0c118414d6b25a782aa3eaca50d5997203c40e376562f64a252aac4b26fd8419872feb"; + sha512 = "acf9a4914255bdde374ecdd77b39190c945621c51ab13b2d9e1e8b1655df593c6c7e174113d89e8b1afd223e6a0f63560ef4d991706d5f23db35a939ddf793da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ru/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ru/firefox-76.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "418b70ec07a966a51c101e9ae341b0c949476452b75ed00677ee87b032d592fef65e6ce746004deb0d89b94cf9e2d18ffaf1d388026bb5024dff0994dc2fb058"; + sha512 = "9457048e428958b55ae221471cfb2874ca16ea9c1e34a33d538b9964e6ed77711283207106814f6d18ab73f8c690e6c20b2c84d361242b228cc92c7ddb675a27"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/si/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/si/firefox-76.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "5adc26e616a8116fcd5b9579acccbb402fc5c88ac334cbbaca2da48e246c7e44868b6454c75bea355f5cbf6a182346efeb50f7a49b2c3f92c8fa988d50e19e52"; + sha512 = "897b488d3ba0592b902f2cdc4eeb2f454b9b6f67fb5e4c583f5f49fb062483ce1d30e64f6273894c698406f8be7dd8a2af02a67e8d9bf47f8d30a572fb18e7c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/sk/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/sk/firefox-76.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "d173c26b5ba44a98070fff9996efc5a35a3ad90de128c5345a996c83d4a68ca7d09e588bd75530c31abedd9f20f38561e22484a45e20fdf66f1cce682dfbc31a"; + sha512 = "2847545533829f45c22b85368c5fe262e2a43cef0e5d480a540ca47f0dacc8003b8e155b11098944c7012b03feb8ddca216649f645c46da0975183f42580e285"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/sl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/sl/firefox-76.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "1b16278f2f6e4df7cd437a7bb6a17b950540dfed646e948585cf0bdeba45630b4d5bdfc249d4fb49bf37dcde8a415053ef4ac3384c2534592ba189264bcf4e0b"; + sha512 = "9b0223b409774a62216c97e522696700dd95b65e1755d889d58137602fe4302d8f5280464636d94c97cfdde8c56e49492005e487730b591d19bc947271754e1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/son/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/son/firefox-76.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "7e9c5c578d9669f47f3871a4d47e211d2ec9215633163605239603c0fc51cce1d1d4b5c3c5a06a9c29c16f82c3ff2583fef1b78652c8afbf093557375e912430"; + sha512 = "097ff1df64b7ef62eee3a29672447c42c46dc23741ebe87365c4d41159052ba3560f7a10956dbae6b67daaf80607600d2241dd997573b8ef8c54fa94f064e629"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/sq/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/sq/firefox-76.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "09dd8df3e07b2bcc59e77c55ff4f9b607c5c2cd343d784a3bfe172cc09fe0fa31ea519bdf671206a16ae73fa9550f08b77cfda0e030dac455de4be16750ce431"; + sha512 = "8a76a933f261708504fb637a93bf4d600514558f08832ceae8db23a404e5d911ef23803436e5513a4b7e4cb85f536e64c5ed801457ad2e1f9c559dfd1f8be807"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/sr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/sr/firefox-76.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "5a4dc12d716185ea86a8f31018198dc4eae0f791b04a247d2f2807d88747fd52fa39904bcd440c9da2e0225e64445c20da7cd7df75198c173a39aba59326e613"; + sha512 = "bf7d631608e91989a8cb63cc07b8e253cc2c764e9f712eb113c7b735bbe2da04ddcc91d43fc418eb208a75f4027256cfb10d15c21e82b7e3eea096ce6fce9a5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/sv-SE/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/sv-SE/firefox-76.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "7082fcd2db01626e90e6850230b0a2b51c0eb394d47604a76de5d03e30997366f7331a7247e7610dbddb16f50c2a3259a842be248614fd3725f0063138e18d49"; + sha512 = "cfec4b5942c193b37e881569de1d40907d44b7ffdd6a08fdc3dc44ad27151427de0e368a08e4888d9248e07fda8de54f1b7d1eb3e106f0cb41c7fa1a8e4acb10"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ta/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ta/firefox-76.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "a85ff07912d369b915d543f9d06cf383a180bd14fd9355fce6d918506d8191da6f89c32fade5a9146700a95dbaa4a181fb513df1b8f28aeb7a09641baeece0ec"; + sha512 = "8f487289fff43075239d79d1d4b8b0e9e7a645a8dca26eff58ec32e534a870b5b67232ea6d43dc58b1b4bae9be8af65793f185e4b5747d9c374fe7802b92c9b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/te/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/te/firefox-76.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "5313549c22fba2a3bad6550a000e59c15595dc0bd684a14ba025fe2c4de9097a1dd47566b8f256f569b74a21d20538ae89182d5278af01c674f50e00d49c873a"; + sha512 = "a3ed83d4c34fe6d24c2d33c490d6d2de6fe56382bb87807f530bef967c25bfb9a00a1958ca13f2936357e3f1d75b029dd2bb89a13171574bc022f7da8b4f49f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/th/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/th/firefox-76.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "3f2b038b17553c962d2d964d342bb0884dc4acb4204fddfa90f8ed3dceba1aac40d537745aa32629402a7077a97cb01efd1225009ccef5412e14fd08d2aefeee"; + sha512 = "54c9f36ff4f00f1bfa3f947930988ce6985bf4e2682613a8368ab60d07abd02d3171cd2457987b2bcdd7d0929003580af9e4683b7e0f529b1ff3661004aafff7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/tl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/tl/firefox-76.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "1bd4ac5a59a06a71fc5bdf976e76da9535d0adb74da0aad922ce5ff6101bc48a7e6727c3f2d37161e1ae48be2ec47c2b7f6cb614a883739a8fa843fc5a5602b4"; + sha512 = "6dd5f5908e9ca66b7ab9e132dd6db3c5c2ea2e28eb9de211ceb6d2736746fcd50408cd327f098ffe1beb57199af6b60827bc11614c4c781d109ff315ccf9d7c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/tr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/tr/firefox-76.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "817d6e54c256d72469f5e1c6f6ffd8d95669193c3506a36d9cf06756847e074be018ad6dac9ff8e91c7720cc70811df2768124e4df85f34f2963a6a64e9f7d26"; + sha512 = "0222ab139a87a195fcc4489a2d2b1024e95b4b76d4ffd8c63408ab3f4c9ea0e4be019a57e31ef3eee3216fb0217c01cd92cbab9ea33b2d7f0a4660326dd0b8ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/trs/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/trs/firefox-76.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "f3d691e6f04658aa09b4f864f0adabc9c8dd6a2fc135065126ef124f025a5ce6768ac9792470d60fb436f8d21229a92e1acb6abc848b3b84a2026179c15ae1cd"; + sha512 = "a50634af2bb7d9cdd8ae8fd268b2bd5f24bbe68e7bfcb810e51921a56db7f831e84e73f93001a12f83a269a27df956df03e70aaf6231925b08399bc54aa71de7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/uk/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/uk/firefox-76.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "679b75df8c1d2d84a7cf9950a65869484cdd20b0a1c016007280d08782c2ae2ef393bc553fa5c3c85177bbf922e62158fd57bab43b222327048753934aff5bfa"; + sha512 = "9e32876027449c3b145cf7088b5b9bf7d941d3086f6d1da1dd13f3f06138b1c7c375dd7561d9342dd7a1aad1adae6da3a2f354927be1318eb79703753dbb0d00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/ur/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/ur/firefox-76.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "e4408eb34923ec1f668b7313ade263d1cdfacf1a748b32a6aa54c3c38886c8e1ea750179b0fb6dd41dc92fb419c9307aa2f32a7acce7248e460fe136af7f175b"; + sha512 = "f4331e2c47373a612083697f4a693d7c05edda3f08518642617aa274e735f7a64ac49f28a0c1681addfe488107367377757b12dedae49a14a4752ca726d0fe02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/uz/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/uz/firefox-76.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "30a9c63cab66e47ba4b7f8bad3b798e720d3668f44f230581c564e8887b6674d2df90b8534a1d9b28684b07f1b928585a4c4b46edf1e740e3541b60b5607758c"; + sha512 = "ba7a39e9f8537bb5fff9253d01b3fb2a0c815c3d93fda024d1da6dffcaf313e7c75068c302887355b0e1b498157917be5f290fe81a2c30f8303c33ae2f23d9fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/vi/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/vi/firefox-76.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "dea4cc3161f0d1a79f91b8eaa426a6fd8ee045d843261e7a2191bbe7addc9fa131b2d9455925381957f90e91145711be13fdc3957ec4bd8fddb8252b6f8bba3e"; + sha512 = "4382a78302dac11f2ec626627c65c528d756364b8332c0124cbfd45ce9ae226d4b42eddf723e306a1b1e0b7bb3fe70c9efd3019f91993ac2e140492900fc0ab0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/xh/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/xh/firefox-76.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "d1fa435a17e23f3228a767733e54d24ba000599822fdb507d3a6dc35d92485bb87a3a398c12750080f79ea7e81dcf74dc73cc1747f923c0015f4875bdf3e75c3"; + sha512 = "b23a1f3b7fa906fd6dc25638d8cafdf3adfe63346fdcdcf878b9f0f98c8803631fa608fd75086aa7808fa0d4730ea7a89998e2d695b2d1f140a178f14294d318"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/zh-CN/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/zh-CN/firefox-76.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "5e236fd89a0c099da13c65c00526e93d152258049f9b7c8ff0387ce0ed6b843504163ef82cc205b01e0a0f265602b2d6ca64aa04c811cc0a6e94d1a8dc952e9b"; + sha512 = "b73405a8872f079f5f69cbd9fd69aa60e614a0e22f1f933be9a8a9e7312fca362549f57af17629548694e92679c763786978fb572faf4f9f6cb72d64b2661d60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-x86_64/zh-TW/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-x86_64/zh-TW/firefox-76.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "5b6b876f3dc8c2bd22ebb183cd4ee16a9157e14d93951e840d14a11a4067f85975c72873b82e49d797f7e67c00df6898e423a70360558838e8a18d95377af4ce"; + sha512 = "0069f82c583d88e9630fcb70c481969ada68a7ce919c4f5ab12ee442ca77f69d15179a46e5f2e7850a6686bcd6cd896f2e03163ddaa7e88affe6d62856d1fde6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ach/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ach/firefox-76.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "33ab7bae767308f01bb5d0a5bf7ad73fee8eec71d8393246b704702b81b46240cdbf02c041753e1910bd8171e36f380c77a21afa2f71926f25dcadcb2d6c2b2b"; + sha512 = "1e81c77813d8f489ca2d2d75dcf74ef1085ddb367df885c2d25cc7051d759f26685da89860f67920a49ae4331762be74fbd2293bc2a6e0549187ed8fde643d4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/af/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/af/firefox-76.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "83842f5ca120205597b6eaa5f03e2f1d720a91cf3323fd44723c79c9aa3bb73e2c31054665fb32300f6ce707363a32d5d34859d7407015d3b4456c831b290ecc"; + sha512 = "a753254f0e302af7aea86499c1b03cec34a83691eff48231840a20c0afff1c595fab893d804b83aa0964eb5e570185102a701d31c668764d58c4715b3d0feeea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/an/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/an/firefox-76.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "2d53551b4918ce86842645492072db26fdc50fd4eaa4edffaecf04fbd83bc597c469a5d795c62aaffba4abfd3d130752d96739fdeeb82970c35826d005af16cd"; + sha512 = "e1fa38d89cdc7d7c9a01f8de5ee19316b1ddbdce1f4f868e8ce1bbbf22e68b8f741246a5ba4f2a4e67c959b9575c73acd7b88e918e3be5fa285dc5ed42e9af61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ar/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ar/firefox-76.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "1e42d930aa9903adf8385b695bd1a3aa051d51ad494d1dffc5d2bc04ba95574472daba608c182332195d7d60069b045f2a5c5762b7505e14ed7a639086fef264"; + sha512 = "10270f9783b09b09fd7f43b8f3c4196d332644820796b097ca219819e81bd5fe23ffcd4df988d3f2f3d59fd005e38feece57b7dedb84a78aac6af7965e73421c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ast/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ast/firefox-76.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "d52c316d21089535252ca626b6774b65e5994a62732203200a39605d7a5bace9c681d1f120e1425936be212a9ac871c24f739dd7d91c0f371029083e3d3afde8"; + sha512 = "1df6b8b479fe391bd128cd9b175ddc233b19b61b3f538ee75ba7728a4b59e4cf1ec09bd9576f82df66e89048b62ebd9cd2206038a0387492cf7b1994c36d84b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/az/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/az/firefox-76.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "121c1e51d5b58f9ac912d0737c23ec34471a4c8fe99287606a350e70890edf23b28c9c145d8aa0d29d567753d047d484a0156c1f004228682a347145c1bd85af"; + sha512 = "81305694cb1601b45d09aedb7bf6c0ecdda500c95209abaa00feb2cd2aaa1f5d86f5bb18933f00cbb5a6b676710db4e96495b17141cc62dea06c26483d90976f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/be/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/be/firefox-76.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "f7c3039db50db23a43575e5ecda63643214731703179a42007b2ae44ea20649dc9629bce1f9738f35a882841666b1c3a0ff4bcfc38ed0e5005bb2b6b058b44a5"; + sha512 = "13e5c72791ccc0ee12844d8a9ffdb5ac60a2a9d79bb3f25818f4f1b3b606137b5eb3c8911f81d654028cef48a00d9cf10841465c7fe0304000357c62d964ec44"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/bg/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/bg/firefox-76.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "d9853f385468a9644684f3accd7572f081395071ab62b4bb8adaebc9213cb8bad8772ba613a404f9a2f0e75469a6d224264ce5d00ea97fe2f16f8d0a044b3104"; + sha512 = "06a1ba2fc944a15375029ff12ed9f566ccf6a795ea8e63743be8084c7e11004d72693c65b8a330cf945a530fde5298c69c83a0f549edca8fa50d85a904ee744f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/bn/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/bn/firefox-76.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "1bff545fa7dfc083f07c8546b5d2c18d1bab3ce4844fb1bb667d151c081c639b3fdbc2122e45230ab45bd5251364b45d937d24a7b285b69139f4dc544e525c7f"; + sha512 = "4b4c8871d5da372ddd15ac410ecfae08385a74b68e142b64e4e463d58b1e60583025f3855375b5adffb8a218839f86cf538a96dd285dabde96f8695af2ed1a4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/br/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/br/firefox-76.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "cd724a5c402333792e5d739ba274c87cef983d3c29f6371cc1788a6b285031c5150b21cab235b603b240da3551c044abbc283f8313c8dd8b0082677b65406fd8"; + sha512 = "e33d927f88d4e0a67b28f27ed32696cadba6241fd3bb48800e68248173bcd7085adfd3dd3700c8d4ddf5be3df93403e20e9c0d57db9ff5d6a141ed58b74c26b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/bs/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/bs/firefox-76.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "47770c4421d2ec0035b0b3c6158462042f792f4ac87887c6704be2f3d34c8409c3e0570c6827f87e72c4697f89e5f0e0c574b9e90704798e9fbeb80c20968aa8"; + sha512 = "680587ff748248a665751f004b02d0b0d4e28f90f672141961d47cff6239823431b863e8ba702cad8f43fa70b295ad69b47954d2abe2fcec423e68f704fddc6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ca-valencia/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ca-valencia/firefox-76.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "9d23f45405e98eb5d6534d19e09237f7488cd9a6310acf85935c0f40132a91ba2f355a15a46742796d1f397d65e4f17d599aa81ccba57f2acb76da80c2d95af1"; + sha512 = "3f740ce2af373a3154372796edc4e85f8bf87b83cf4895328dcdb357aa4214e7711cdacbed596c4d7a1ce1ccc16bfba32fdf2d38749f3144faf747d05e76e208"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ca/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ca/firefox-76.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "4f27d129114a4db3f597fc253447c6f27bcfb566fb197dc4dc26a984f1abbd868242b1c0d077e6d514efe1e2e083378304ff490eaba26f669ccfb5a744d3899d"; + sha512 = "ea9b71eee4f6e967753acf4e9f0a4014eeadadc6d1bcc5fad11a5975b778f92cade729338636d86a783ca08b0363942d7d9b7e4ad65fc3186760189ead9bf0ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/cak/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/cak/firefox-76.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "522852f4ced9302068b6251a33735846cbec73bbbe9ab0371e8456d3665bcddfc81bc4c258ecf4f0e5bc8f6f15ed27d3e4f88ffe471e9e8af4beeae85aabc949"; + sha512 = "bab4ceb14749b67877a99b96f47aa7a9d6d65281e78fc416d3bc3e5296ba2133d7548ccfd4ab32637c976d178fc911f55b6acc60dc6658b4193e1c6146bb641d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/cs/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/cs/firefox-76.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "1192630fffc7bbc3232c8328e066f8392f967da5a2254ba726243ed7a681c321747a39397dec8b11c5ddc4d725445712ffbb238677856b2ad2ddea41c8db090f"; + sha512 = "e33adfe91886dc66f09cce26dc33ea26cdf432915674541a8fbde09cb41d2b14c0ebb3c41683cb1c29908dd652c83c92bacea3b8cab9bb3e8d9d6010a19f9646"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/cy/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/cy/firefox-76.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "3a327e31faf8eae17c60f7787bd53249957e5177d38ac2138cade1454ec4bd870c429215f1e0a5b9cd124aa660cf4d77a091ee579d865470c5cdae0703086b02"; + sha512 = "1c5b5d518914fb69b6a978fbb8530589c0aa117da1f2f7398696fe29c6177f0ee932f88bfabeab049bdc80d6e457835a492853ee9095b10f12b68172004a2b73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/da/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/da/firefox-76.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "297291ed06c290fbd9ad6172afb790e8f8a619ff0330337f5e777d1e4ef17ef52ff1cb94b2966161639a28221dbc9ce2eb28bd9ad14029ebcb878f79053386f0"; + sha512 = "90d385bf3faaea5ec6884c4042a72e6a23c68f1454309bc933670d0fed7a5aac2210ab4c6b23755d883fed385ae0f11639a932c2540687b219aa009067a3ab89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/de/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/de/firefox-76.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "7dec33f42715250c9a765c7f3f4f177101c69f7150661fc844c4742434a8d063fe1bc9149adf81c2729e848584fd6f68d1cd3d697159a1d5b4ed46d8dd9ae9ed"; + sha512 = "7fbc20a9cef66a6760fa314f2d074d2c597b420fee45fbc8c61a85f963130564e18d47a97833299283faf5c959d12f70e4f99089dabcbc3d83f3bfbefaec0f63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/dsb/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/dsb/firefox-76.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "b5d8c78df21e8f8f1d96ddb042dcbae44b4d622d6d39a0a3d7967e89004e5e229aee84842b6fbacc90ae3c65bbc252a9a879b552a2546ae168d7f07cc312d207"; + sha512 = "2dc3dde5159c64b61a4599a0ee2aaf3e4d9e71d7a3913e086c0c187cca48e8bbaebf7d4253dab7a3cb4fbce55a1119e3f4c30026671b92b70059b8b3256e72db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/el/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/el/firefox-76.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "8888a897dec9005edb469d27f40ce9ba3446c4ba713401f40955483f329114271c34a832afb93b48e0e41adfc1910e4813f79fd619a085ea15443743a72eeba6"; + sha512 = "73bfdcc5482d5793c0c5673738ae08cb6a2187e61d8ee057ef89f4ceb801bfeec48b8c0a9f48bdd996bca8ae4a232afc61c6539a1c22c7bf96d06180364cecc6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/en-CA/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/en-CA/firefox-76.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "713522e5c5305d111bd1eb55bba42cf201da74641593506b191ed1ab3eace55c1ac9c9a86182d667d7eae2bb4cf6fc9ddfa1ce4c8d31dcfdb0f2fab587fa6a8f"; + sha512 = "baf1441e6f6ce7a31ce5ff12b600b61068bdbb9beebfe74f6c9b97ed2533ec734bc34b702caa9e9c59bb4563bfdd64c2612151793067cef3ffa1fb0ada312e28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/en-GB/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/en-GB/firefox-76.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "021b66ac6720deb68e45b1bdca86d8aa7db2e74cfa7391daee108cd002dbabc3f6302f380e6c029c7b56781dfd9bd34f8cdc1135851297e4dac9dc56f762eb69"; + sha512 = "60b276043c2ec3456b6b06acd2edf6f3df5149824d20c33974f3ac77fa0ef81a03f99f337add0209bb88b390fbf4dec08a30da207ad72ef91c9a89cd36e4452d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/en-US/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/en-US/firefox-76.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "feef8046d08aba827f6dd2510cadea53a89983a4889c9c2baad3d88123639b90c8052b552e2bcfb03b6e9fb43ebda29815825ef7fd4d9ca867f238cfaa0ad1da"; + sha512 = "26eae1d8a6f9e988695d59d418749fde988e48514d7c183039ee998b400f480dae16e9d5a590ff4364954e57a4008e7104cece212fa81fe73666d2bf3f0c0020"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/eo/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/eo/firefox-76.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "49b0adb7c5dc8e1b7ecc121f65e8a6853f497a9cc151b4eb9ff6631af33b12f7b00186ac2d13390cfcadd9fbd1b361a597ec1d9da62b1a0466d85d8e313be4fa"; + sha512 = "55aee2c68a1cb6b7e374f2622c8aa30a8f26e14ea0f0119d97bbe6e807c15c7df94ec74c0f31ef071ea7b112c3bd8ee501c7d7b33ab5eae9a8126b2fc9673047"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/es-AR/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/es-AR/firefox-76.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "a74988338fec99d50f5a16ab6c59630ec1e535338da3f23f05c7967bdeff41cb058c238ab2e873f96cab93db821ab066e6222397761578a12fa73b42c0ffe3e9"; + sha512 = "dbd5aa229d0123a26290330df078967bff4d0484bcdcc3eb499a7cdc82176b49a2362a0ab08e2b55286141b25c8cd4970308cf48a1143a5af788eced5b84b83b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/es-CL/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/es-CL/firefox-76.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "b4abd3f7abf1869bf360f5987e13c37b142b4c8afde51c790feb2563351a4754f385e0880ed51a1cd7aa3a5ed907e3cc22ff3c707d2923c47459c977cfedeb08"; + sha512 = "5082bef600a311f560daa09b31945961766a0ec63ebf9f38a0f0e76560fca2a99594c1f26fd0b57a2dca0c94d1991a91501ee3e931740e59010c93d46d3e8a67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/es-ES/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/es-ES/firefox-76.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "8a9c61dd9329c983c394c33c97c962c703fcf51a283dce09bb781d96879450adae5d8d78ca9d0d1892380fcac7ab95651e37133a0f836865a13946e2cb8a7e39"; + sha512 = "87ef420353069862cd539aa8e53f93f50330e0c68bfa4a56913e9245bd4a972bcd271a7c159218f9ffb78c9d9be3046206f20fad4faae3d76e4e9687530ea6b8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/es-MX/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/es-MX/firefox-76.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "a1b7dc0eab0d4a8c713e27620235617a244ecadd62a125de8b1b60de7811a4d7e65051569ad4391b2a312107cb750c74d4c541c580f3af86b88b2fb84d93ce67"; + sha512 = "d02362e93a290f34063fdfa7af8fea71a6cb92b964b872bfac8f5b5665dc6ce9cde7a38a445de1074fa8673cc2c0243af69e2663542c5c2fb8e53f2c41518cbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/et/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/et/firefox-76.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "181aaa954ff9024a4efc211bba348461c28b892b1cc04eb50989cc8da78d88a350341de520b4a60da096ae399c28ad05802aeb73cf133171e8a4ea2693cce5f9"; + sha512 = "0064c56cf6cfc38a5eff201f16df5c9037da8089655df5c88a348ffbeaf933941d5ce99b3618293d2154774b483298b4c28616c6e175fe0f6c9124ce00bb16f9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/eu/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/eu/firefox-76.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "893fa9700ca874b2a460d830f2e10f7999a6b521a351a88bf480232ca0270581f4ab334ac2d4721e3f5fbaec0105497afd5ef09b13f3b96a1e84556db79d0ef9"; + sha512 = "bf5cd434f45bd057de94bdc219f25e4da878a0be58c4a864a22961ac5677d0a679204a069220cdfb353d319d493e10d3423888999de6701e33227b1dde16e43b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/fa/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/fa/firefox-76.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "fbe8cefe9e626d07f360b1ab30fd04c8628669f5164d5dbfd12cca72e17e6454de367e170565e0d7f1c30e300d315f54d7c6cc06c8367e6d0c428a994e9ba067"; + sha512 = "402f980bbffd145e9f6f832ad4bff8c6dbb0db9a77a303ffe16c44b449668e621c2edf75e41686cc69684069efa10b7853d57ed5ee928298bad5ed27c253eed0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ff/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ff/firefox-76.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "7ea337b8f3cf536749cca253e063ab326e66a0a33ee0bb7863ba7c46d7d9ceef443bfec0551770346701f23f5adc2750225e8961d6fbbb48492afe7ec39a1272"; + sha512 = "baae62b09a0a7fef88f64b43b854dc8c4ff583765338c4dd1e00db9c7717adfb3d8817c776cfc88f88ae6865d490a08bf4d0c97824ae3280835769ca04fd8c71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/fi/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/fi/firefox-76.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "c97d9ceb5a98acf54bf37c1397973c2872a039812bc591979b44497e7f2db1cf7bb5fab75b4a0cb70df2d48eee4cf5fc55def69c22da9a0b5964e2af81bd0457"; + sha512 = "161da9aa8cd66a9f691b218f5d11cdae19fbfb04f44a77e266731afdb7202af98f165e33107af15ee6ced477b0ae07d78f91f57d14fec0e9a6de24847cc73976"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/fr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/fr/firefox-76.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "15081d21ed77c376257e23cec42ba26023792cceb634b0d0b928471e1abeba17d9245ba5454452b17e786e576e19e8e47f20478002a3df2e15c56e8cb19faaf0"; + sha512 = "150677eb9c0aafb0486dce2c846e0997f6eb1ccfb022a9ec2914628fa2affc32801fc34f0397fdade3cbe3afd1897ead515bc240043dd1cc7b879d92566a47c5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/fy-NL/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/fy-NL/firefox-76.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "c352989e6ed3eeda8ce724ff110bb09c2ad3ce4a5b1f45bd9335c1186dcc1c310efdd24c9a2adf7a0f31278b3989d79a683f7f770670c8b1419967ccc2e0704a"; + sha512 = "b03e12ebeed5af0150715176e32a7da3ce20a57d227f3ef6da369f6fa27059cb23a8af0b4e165027598894c572d02e4d58e8fdb9a48b86d3bdc35385a249287f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ga-IE/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ga-IE/firefox-76.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "ba27396ca8f76533033bc78066074c3aebcd687f1621b14db92a4952b226bebec0bd399f697dac92b71e14e91fefedfa6d4188dc067bbd575e07317182408510"; + sha512 = "7122e4f914f5e8d42393a86e61baeecbcdf6fff646ddb38cbb2d7324a0be90d60bf609824f2dcc696c107f856a867e0ac9717fc098b1db3571bf60fb6d3b8a28"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/gd/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/gd/firefox-76.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "f18b4acc47fcb9135ac28206011b6fb3fef5dd6640fab3e88d8e8f9dc23b19d427fcd461f70a00750c1739b3e3f6874c171dacd9c54b213eb9076dbb9a511b5b"; + sha512 = "f35b295657bbceb293cf1bb88a140d629f0b1fc654cf3f1ebcb5d9de84f40b17a9a7bc8973dc6699c4c6609e5cfbb858df52c0153ed4dcde6eff2e25c38f7ad0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/gl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/gl/firefox-76.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "e4bec63583908fd225b903e45007e29f357e00fe7901524d5fa15bfea04211f55d2557c1ccc1fba28eff1f2dfc5b364cb7c52d438428c26f09aed3592f817c50"; + sha512 = "4a4a37fdce02108118cca5fddc2f2ebfeddb8a4fad97ef0584fb85748e09d43abe79b0d3f7b5250deeaec8ec0b2e698771100dca486831fdde09f41d8d77b093"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/gn/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/gn/firefox-76.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "dca1a1062e47b8644a7e1a772f6abec1ff615d8857d74d576baf9a515fbef814f6d2e89878a3ea2aa4a7efb6931caecb3845f6eefec91c70299c463c2141689c"; + sha512 = "6c4969572ce922eca81344f1b05747d3935f88486082bdc64c814825af2cfdf27eac7f8f0c25edfd4d249b9f469ada0b062abd0aff02b9849c7055e40bec5b67"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/gu-IN/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/gu-IN/firefox-76.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "efa6f443a092585defac47cb75d8ce85faec76c2624ecbf4cec3b4e8ffe4e582de0fb55f4901bcebedb0d991d709338bba212117fe59b3c6496fc5f35c1a7694"; + sha512 = "a5d1daf151be8d23dde730945343bfd507ba29314ab8acb71e4d5e71b534eadc573eb4eec1bcae0ab0bd72735cd891b72d8d931b634680881bf65f63a4a7abab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/he/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/he/firefox-76.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "ea76707fa795234f36088749cdc5a139482577d4488d476856cba926e40ce24d020f76a526efeebfd8a5840b9ebb2a93d71ce9be9fa8cd9255e6940074f22a8b"; + sha512 = "87b6c4a1dfdb49bc9430d9740612d24ec9f61d74bd379caebef6d19fb3492cfd1a4c8112126ab509af1f35e3f6e10062a786a0e5397b424e057e9d13c924fd7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/hi-IN/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/hi-IN/firefox-76.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "73bde105b324df05adbc581e59c1b723b1dc0ecd2b35b9029ececdb83acbd5cb9946382f78c9bd02a480635c58c9578ec982d61793ae7e64e5cf940c09c5a508"; + sha512 = "e2b96ab462227f70f4208b52b144d852e657edd3fc9885ba6b4217461a414a6aac6dedc206b4fc82d269c768662ce94ccc6cb3e0f096250d074b3d91ffa98c9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/hr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/hr/firefox-76.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "e237486d9cc6418d213a006e07c23ecaa3732496d169f7a24a568866e1ec1276aa9096c16aa696baffe689096b8321c83e9d47a119257effd77c3b1b938323bd"; + sha512 = "1fcaff37d60936b68a6f2e368c414c69718e114bcdcf8f71114f5e3dfea1eb2fbfc8b5e237406576daae74f8c4371d8a824d2542dcdd36221c931a86c9ea7175"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/hsb/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/hsb/firefox-76.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "be2a1bd69573ae49b011f266402a5f185a4eb8eb3e9b506a606b1444ef54091b36023e6d2dea2d118fa4ca5cc58dcd1afdf2e5dcbc3d38a7ceb776e6e06756b3"; + sha512 = "5146346331ed881f0f85f42bb43f4b4884cdeb659b392db28f7a534c685a579405fa482ad14c6c4e20422e8e22b07f2fc35ead1f3756539dcee797fb0df8c1dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/hu/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/hu/firefox-76.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "405ce0eb8c7694ed2d9bb5548f8e56d63c14e59025cda561bd49f0deda1bf0b280c344138d154510ac8ed124e4ec95528f84212fe1634bf16477615971148f17"; + sha512 = "eb043d50e735f1b99eab7cedef601aa302dce2b0270f08a9e93c1b1fa9b85da87305aa94e8db638e81dd8f6d9bed96b6c22f87928026cb042964bbb51420fff2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/hy-AM/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/hy-AM/firefox-76.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "21d7c5343f62cb8a841872470013d9b836eecb0f780794108f56120c4bf26ddfe923400e630f6d981913d06875e7473dedaa3d4cbc2f9173db80ef34c3a6e0f4"; + sha512 = "eb0553646d6b53a41bff160379845b0a21c28815ea523ab0de21230ce6c519b7ee07c9d97ce26f2078f3c66448dcd1c09e978bb1f748e548d1b5c2e0fe4e7f7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ia/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ia/firefox-76.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "a8c070f164ebda582055628b324e03971602f15741314ce26024eec0539a92341020b7fee16cfd849189c5c106a0b3dc1fcb04d3177d7a4b06bd0cd2db74b614"; + sha512 = "b43efaa2e45de94e9be8b8b9bea50966b0fa089dff9e25671577c724f45d0dba502044c2da7de32cf1431a38aaa92c2e5856659fb7f1ee557e38616beb4a9c96"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/id/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/id/firefox-76.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "4bc7b360f3fb9a8115541da54f867c693e7c8c98bf24685ae9ac1c052c4cf54126ccfaa3aa2c714a0450ffee0b6198370b1092ac99ba13c289bc46a202ac1189"; + sha512 = "5fd68752ab6309af0bbc6d523e2e251c8378ac0a6c2ba0627b37ddf7dbb1efc444901a254944f4384a6fc10ccd1909f6312c0fd7c9e700ba5f223ccdf76d30d5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/is/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/is/firefox-76.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "c9a1c9b03d3e7089a12f2ccceaa525b5c9ce62dc1e602a3899914e8adae571bfe12dfe7b2b5e54a4b2de01c869c33fa1f7478d1bc6d54e4dcb284ce1da7b32bc"; + sha512 = "1c128e7fffc103347329cbd65037e798292d5b0e843f878ffc44d9d53c32f1d9a917acd694cb3662ba0089e79063421705f30d39e9736c88b9c439660147b949"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/it/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/it/firefox-76.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "0adc5cb03da1e36650c90de0cd82065a014bd944da4ba29f80f2fe74eee91fbff13378011c938bd79c110bacd0e04fcb5ad6ee7995fd76bd5ee98cacf32c2c98"; + sha512 = "890812041bb3ab8cb0ddc6a54222fec9f4e342f9734f3c92f9d0452122cceff739eb46d92ebef5d2571509e4c7821704a64da1ec3dfe8150193a6dc5b4aa8477"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ja/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ja/firefox-76.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "fe743972968881f327812dd0a81ffb8564e0fa7a6f739a3a59dd039f560078827ddd36ba057b80792347b1cb19e262f34c276f6ce788453089ca0d8cf8d69a55"; + sha512 = "13703e62dd8d6728553524723828cf7bd8db672febeff63324c93e300a9ed6c2f3b1919d6f4bf8f1f74164df278a0c95ac98c348531581b717ab09e921490a91"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ka/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ka/firefox-76.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "0715da694820f26550e0becaa151c19d366954fcfc2af7084b880cd12b2f031b6508e69b3ff687941f71c0b3467f5d118ec3f79be2cea6cdff22d2b5e4f050ff"; + sha512 = "929b2e3ca70c8d9ee11405b1366faf957cde5075dec5631a49ebc724d4912291b1f3826ee01e5c90e2d68c09b2664599ed73e4f597298ffb066ff8419a8056d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/kab/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/kab/firefox-76.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "2de6d3cea7077ddc896cdb95104a122b85f001013c0f59902b049423fdb370d5090a8630501009803592935fd5f90ade7625ef64b3b0bfecc712141b10f2366f"; + sha512 = "83900bd13db0731508e516bfafb5bb540a43f6b8ba9c9e2e9c0878d67e9cd8f9b6b496e5b77ccf314346ea3089f6d95c1902b9280741ac3325638e972794872a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/kk/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/kk/firefox-76.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "a0a1a9e7c2fda1bc92bce084472d432d4007fdc96707d7a926e884521c4ba8993374ef55179b7da7267d14699f079f5722974edf2713d449a59b76f01fb897cf"; + sha512 = "a62767e00ba2c0d522f503331c2b6eb4cc82d3abb4879711c2d9f611c8454f2cbfa5e76707e6ec6ce54df8d40f64da6ad8af2e15079ea75b3b8ec55e6273ef2f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/km/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/km/firefox-76.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "4008860591482c70b0194e565f3f1fbb30b1607b486c8a3afc3e3d9465e24c3cc0da2c889905a7cad349484a386d7a2082e86e29f41fba84073cabcd75c5e358"; + sha512 = "03a47578e51da36b51bbaa98e36927a1a5b3f216ff6ed60c337d905f414902c7638cdd361b5d8f4c29960dc93b19343b18567c7b40106f0e7e95fa941c0dae88"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/kn/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/kn/firefox-76.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "2628e52d65223c5a1941d94435398041cdbc7d5588a2227a9f17227800576a56975d5db2283d295e82e63e10c4ce6d3bc7999329fa26dd3c8d44dea025f96640"; + sha512 = "c4cb00f4383f73c65930ff3626342cb53695ca4aaa29ec5f80400ed4d18e4dc87dc44445069c62265112980ac7a061d0839f542a792aa5d294561b201445b677"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ko/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ko/firefox-76.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "9b78d17bec3f243154cca1ae1d955282e8700dac9bd93890be6fe92852af67a1f81eaa5dc2465e2881398508af90f67fcb2c90d54edb1fe874f9717bd25dbe2b"; + sha512 = "72fc61f2429fbef846eec40e53f50bd95d3b6b728d78e2199408b052b0d85ea66fbd6d2a114cd046311f88b419eeb7447b062cc9c5824cbae572debe872656db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/lij/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/lij/firefox-76.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "01e4dbb561a962b4332cde78df74a229d6aae4cfe56bd471262fedd9fc16a948415e6f993724ed53eb878a999020b22f761f4ee3e6f006ae8447513201ed27d1"; + sha512 = "9192d46b8b16129243ee2f5af47cd0f8fdf9af3ac953ae6481452cdd1f4da9ad9b75aa9c1b96416cba47dc16ca867db3135da810f32df5a33bed233a3b68f447"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/lt/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/lt/firefox-76.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "c17fff73a4f72378dc3173ea0ecde0492937a6fcee4108935126256f0ab085eb934be830907f1f4464205673023ed3cb21794cd540533f4e8defb42325b3bc93"; + sha512 = "89a5c07f1c1b7b389bf7074feb6b7c29470bfb143b720503783c35cabb36fbd0e5c3fe31349e1004728f128db36148ad6dd07f389099fab17c8a6d078c37675d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/lv/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/lv/firefox-76.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "22c90601b8162512ac045ffcc3d186dcf4e0d9d2330885e07f7df72224a840073415de0100419b981c08b73ba4c92da01edb49d1dcc9efb1abc0ce47b94da012"; + sha512 = "1bc60805513cfd6ab6d563108fecb176766e77bf10203c942ada3878d062e6a75c54129505fa63f16aeb72f4a1c6b360f7e65e8f23433d20fe134692e53f4210"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/mk/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/mk/firefox-76.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "a185e91441e302b9111d558c3ea0d7601347e843393e00adda74a903ad0f93a23ded2c8e61c5eb628996c0ef5b0fd63209fa9fd98f3a0040a9a8d419214e5df6"; + sha512 = "811449cc14b5bc3185c56a8ea2b640a3fdfcb60b309ae9ccb5498196677e1431719897e3e239dec4ee964575187430c1a0a1b4fa48fbd29dc874a1edceb7fd00"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/mr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/mr/firefox-76.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "e8d5066dcaa0c7168f804d1f1047435bb188c6daaf3f8aa472654b617c7d4471f7469ac2560782b6463c315ccd9ad60efacc8582110bec9279cdd16dc7da7d09"; + sha512 = "940563e7a93a08372790ea3f0403c4facc900a6ec680c0e7d71fa10978fbe484c448f1e7bdc8096e26528a969178273223592daba724296f423b1293b79aa5fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ms/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ms/firefox-76.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "dcdb08020fca5a43581b1900316cf7acba285a87b9cc0532ecaca8f85d1ac3b188eeb9d65ba68557d4350b7f2e0fee478dd5a9ababfd3c40ef1f7b4c57f08a39"; + sha512 = "ab8d456745a815934736ae25cf597dd6eec2dc25320dfe99c6af804823ad71b482b19eae071be08763c82678e7c966bd86ab1bc285925945b6800ab725dbebe5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/my/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/my/firefox-76.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "d7005ab40feaa6053af8624130ba4e5d60e54978452b6e63a658afc8321c9f4a7eed5406f07a16961f6051e794943c6ac6582e1723cb8a518332557a94dedcc4"; + sha512 = "a8b4532eda52b3543767a28fb9550b21324c72976b71fd2101665e0ca89c63c4b1d8272a9f425feacb3bef188b43edacf603ac87fa1a3dd19c374d22877ac02f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/nb-NO/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/nb-NO/firefox-76.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "b6e0894cae9d257ce4d0becdcb65f9fe3693a947cfadfc88eb51ee93a4ade9924895a7f252317d145304d5bdc866294c437a5f03c15982fef8a970145678aa0e"; + sha512 = "a68193718025329d73e07b7199fc6a11e4834cf3f0ca327efbc182d0b33bff342e8a3012ae180fec2167f842781ae9c6d63d29e312e2385ee06e4ef25c851fbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ne-NP/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ne-NP/firefox-76.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "fc7a97902679402185813d666ea65cfa059e4121c126a4b82f2fc70ac04790b7e73441c4a3e7c49ea6292e049792368f7abb9924c74b52ca342d832231e80c51"; + sha512 = "5ba2c7da5741d45b376de87c9d3abd65de5a74885cac25ba0c7c8a81d681c0dd0fb870764208b62aecbc93122daea5cd7dba1fec41a1d97eda0dc674f16dd6cd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/nl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/nl/firefox-76.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "c96cfd08d2b3bcfc3380cfa4e7945c92ad6c1a1ca1f47db6977769792752a4f64ee99f90f6f904811ff3f1b7b2d07ba570ad1b80337d22e34c6bbb6ed0e511cd"; + sha512 = "941cbc8f65b1b307f998c853010bd373541aa8043f1fc97e261453f7d49ed7ad9880e0cd85fd1bdb5b4b038272e210d9eeb7a5a24f27f1212ffbfde494c87b04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/nn-NO/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/nn-NO/firefox-76.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "7e10f521aa2ea9900d03a2874861f079171a62860f3508edd7dc51c39db88cef7a603ba0c6ca69469c2593182b027d354b6a8c13209beabd51a8690717d11eb4"; + sha512 = "0c0dd5ce17626e96c3e88a9771272f60e93c7ad4f1f40710d8b70d4f40a58010933de89a2b381dac94831db786621a35ef6894f46f1b19026c0eb7ce0b172459"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/oc/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/oc/firefox-76.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "43413c027b618cd5ddd36fa42fa26f99a294ce2f6f33937a299b55d698b64b6e85d04954101ef27e7a739c00407d7457322e3b32d38a90df87529372c19e1b67"; + sha512 = "169b6a1a48b2711ecdccdd6a685ee10b5f602d0300cac13b56feb331901be88edf6e8386ce6e4bfc108f419de305a5603445f5b7561b37358a75adb8e8d418e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/pa-IN/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/pa-IN/firefox-76.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "fb59faad43d729eeff12e1eeab15c0712f2429892574c526c1f59326518c9c652475177c9aba14aa591e4c449b133a6a8fcbef7bbc8d0c89b2b4d5dffd053abe"; + sha512 = "96dda02dda90aaa1de2bd31e04d87b37a179773d1f3f8094d33fcdfa6ffc78616f9d7539b4405911a6dfd31382cba91ce34ca6680c36e7aec22493d3bf6f15fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/pl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/pl/firefox-76.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "406097bb810d60a16a88b675f6a893af84e0de905c222534b0e09802ae5b57912d000188920b06c4ffba198af0d096e42f9984222a94f53d45db64f41a4f3f9b"; + sha512 = "326b8b65388b6e7d8215a665fd6acd9ad9fd5a03edfd6ee428dc53b217df7b108a351094530621c5b78f3cfaed90092c17e1d1c9656a37a10c108aa441ae0e47"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/pt-BR/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/pt-BR/firefox-76.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "519f9777303a5dc6eca8933406ff0ffbf7654c75305c16e13f1600550d924569ded9dc6ba606050c9bacc31ecbc0d6e43dd91dbe8cb3b587ab71d20467564cd5"; + sha512 = "70a56009e39e06b701de62c7df02d3d648e04ffe94d2718f2f2cc4ee24f19e832decf0371425ab9791ed5db6a5b56d5f221163d3bd67bcbf6cd48617114353c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/pt-PT/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/pt-PT/firefox-76.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "92500d0b49090382e261baa0fdd4620e5d9e4a047c9c7098ad3f7ce34a5e97bde419a87019517125239144d21589b428c11138aec691328530fd41d5a78cc5db"; + sha512 = "33a770a0ea0c177c1d839056f4045e41e8e2102e840c99c48abd2cb49733d44af2753f040696e859eb724dfbb6dddc3357bf505620f74c0c29b92211d8ab9572"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/rm/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/rm/firefox-76.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "6b8f3655d962612a047bb7d961ba74b362da0bcf740362e8f31a2263b0898da90e051951cf5894bd8a493f40d2d89fd50d6060eecc78908518f8611218a27eb3"; + sha512 = "233af09f6a4ebb88aa678362c85244f1465d5da57e193b26d676543d0d1df9e673b25096da705178d1784cf3682fb6a1d12564525b77723eca0924bad7ecb0e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ro/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ro/firefox-76.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "4f2e2012136c9821792241f2189550843320b52c44905d9902c7ef3f2be21f26dd79f930b719f752d3d4b5e7ab6ca8429d12ba6120f6bc365bf9e2f496ea85e2"; + sha512 = "6be29acfa925e3524c83ccd6915523cb8a37143855361b46fbd71465002f8791426ea9985d34486db17edffcf53d6197b7115cc0dd38a2be16502d07d3b26cf9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ru/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ru/firefox-76.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "7ce2ab97b3483b9632d24a979bbe051d8db539329359f91dc9df4446db0b4c1201dcbc6422e1406400dd3df007e5c3af6bcc8279966cf7448671608cc05a4231"; + sha512 = "46b2a7b8370fc173101dd1e78ce12e363f80a852d55b2e6be9f5b31232888750e07937afa60bee2571e0b3b18ca2987ffbbad8c6065d4bb71064c34acc46c3a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/si/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/si/firefox-76.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "65edb310b0c94dbaa2f5ece2eb6593a4fa7d89b2fc9e4d3bd8c77bd43dd4517d09895a7a325b9d6a1b5fda965e9d6e3c10f7e4b889b582ad4aacc2061db6a443"; + sha512 = "934144d99326a139d994518e5aa763cf32035a7d310fa94eba7b4a2b7cf40eaff732dc20100f7bba35dbf415b7a5fc22c5122ef40a65732566063d4517321ffb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/sk/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/sk/firefox-76.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "4e29357906cafb6df7dfddb4c668479d8e52722a4771e043a1d9e0c254e434251768a716f7791c6969e34c5004f276d1b3ae8b8c77176bb1ba76409295126671"; + sha512 = "a892ced0d9c5dac7cda65cd67abc1232d5be3ba8ebc2c98181f504b68d43018fc392e0e5b4b12ed22f1ca1b6469be83f68b12e60fad28fd42eba18d9b8d4d7b0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/sl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/sl/firefox-76.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "c84cdabcb498c6a387a08b7ead1cdadfb68c173a955e34f4118a4d56417918649b7ffab2eeb88ddfa276656367f8429e17ddad4b909b1f39e120e41d1caca56c"; + sha512 = "229175292f435f3cb1db7ba671933508ba7b4daba1aa5db0ed9f03fe8bb83778a0b951b0248a27b4e4a7beaa374f9bc4eef3b2762596b22bd45045efc3038be3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/son/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/son/firefox-76.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "3fdf243217a00baef75aa36b9bcc257e1741fadc8070f5e50a4573c3c4b6b86eeb4405fab327b057e5d92543a0643429fc1159d3b77fe30ad918d8757d8970b1"; + sha512 = "44d585391132de3c4df67bdec4a5062bf71af4ae32084e0602de93d75c279e8ee76a022aa19926eee03a31022b4d7eb9feab8e349c2a6547b85f8a42f5b122d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/sq/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/sq/firefox-76.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "f8c32ef45297c86935bc8b99a9d6b8e4804320f76e085e70f988def0ec003f221666e8f7e34e1866c52c38dc45a3b6a39397ac1e81a7033a74652a1d42d32355"; + sha512 = "f0b04a81888f8cac58e311f9f4fe16111a414f541bd1a5b3dc2fda028cf85b3a701ae5b91d223a3d6542580c1bec5459dd4dfe90cac517d3f974c1084ed6be1f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/sr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/sr/firefox-76.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "10dfc0655723a00be5b5e32a280ffc660cf464df0be0686601b2bb502730ea5ee6f7c23c3f40616e9df3c5eb17638b841cc70e8b2271b442cc8b95927191dd62"; + sha512 = "c3fae910a582dbcb5b8609dbfce0d759d776667e34c737755968f1a531e83b58b098b8a88bd948ee820ab76328210631b7d85ff65a88be630f795522831a7014"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/sv-SE/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/sv-SE/firefox-76.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "57e77414cd484560716ef659271e28c14a8f02f7189bc858b4293a72ac07cb0acc77a6e719c25b7a9b76cd4da6b3b56df8a75236b6ddef0ace9f87113f4f8d72"; + sha512 = "fd5feca0a4a107b018329ab2fc1d7eab9c0e51d2660d8356cba4792cf73f1176fd19411580f98a469f47eb6bacb2c311134194ee612caa7ad8a5a0021b062420"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ta/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ta/firefox-76.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "396fe91815427866908619b33df4fcc503e0b30f03c567a9d4baa51bfae19d91de816cfbca4bd94a48447c7abdfb56d52a294ad0b8fff8134d935db9d6a81221"; + sha512 = "c54d20862ec7c09e4ceaca3afb120938beb7ec0bf1c38e651355fad1247c61e75acbd0fe6b96a17fc19136720ba55755a8bb04726c714c812a333c9e300b9463"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/te/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/te/firefox-76.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "87237a320372b1c34c583335335b5b8e85eaf0dd774883b0b0c74e883854c1cd14d459cc8b84db2dade7dc92b36d176c8f30bd17658f6e5660660b0f167fc715"; + sha512 = "a594904a68ccd42f5e6c0a829100fb99e37732a29775273ac202fbb65785549bbdf638e8ddbcf6b7269161cafd229354b5b350be8e2f2360892bcf17ef777e07"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/th/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/th/firefox-76.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "ca5ca4be8242e1fe9a9714b117965b67ebe86b578381ea4339f378dfe74e08f268b63346b5d3bcf30cf1c108a933609d8cbb393caa7f7646557d265c2b40decb"; + sha512 = "45b5fca122f7900da176ff3d55dd70a1a2d594fd9119b75760dc094b7a254e21aa6455c8370650f1b17d69ec1e81749881635d176dc72a45eec8f632d3a2e0f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/tl/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/tl/firefox-76.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "99322a06d7122438715b92f176b07203246c1e15a0a42dae4349f424232778f3d2b9bcd17a7b239b8eb6273a6ada8e259480601258275f16c567d9cee51fd16f"; + sha512 = "06b3fd1f4cf030377854ea39bfe0818322123d53299a3f5d7308db32683f3992240099491422858c3104079b566958dfa60b58248c0c6adcd0153d584429fca2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/tr/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/tr/firefox-76.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "95a86989879b65c85032e9b8ffa9290d9a6fa1be409786b9782b284e4c0fb894719fc464ef7e6b96554e2cb852a3276a8e042bbff02a17bdb44aaf9ddc170361"; + sha512 = "2cb1d03ced3d88344e24bda60687e9a0c34aade38fd635a63ffea3f072188bf6f5ab76cc7c54188280932c225f1e5c9b7c6cea4d2ee0b1798335e84b7826c886"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/trs/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/trs/firefox-76.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "aae0652f74e82b0cdd752cb8f0747fd4f36f04fcdc50c3cd9d084c6418694cd3015e8de87d851605f5cac0b0159ddd8f9521755d81adbee0e561926b2ea1d393"; + sha512 = "6fa6eb60bef978b82e6805c3a083ee40418125416f139bfae2695c2a4b28e34081a984e8c8e092e449e28fae28d812ac2c76b808da83f79c2be4e7f5361f4536"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/uk/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/uk/firefox-76.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "df038e62ba6284245212f23c5458b2df14547ed532ba66adfed2297041ae7acf693a6e01a6af9c16f4a2e141806d9baf3c4fce91bf3316e635da7211ba9b057f"; + sha512 = "e412938a9ff5bca8b770a83a2f7b9a03f92fc155df9088f60d758aa41c47bb348e331e34c8b04b1b2b5c796ec34261aebedc697c058bc5457265ee7b87d2d773"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/ur/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/ur/firefox-76.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "1bcc2f2e8f5e389c29fd0e7f4a5a376d91268e326758b396c9d829e59d1315a52df0449fe49e81170713f1161946c2ed224560dc96329f30a5d13c8413f26823"; + sha512 = "8a4d50ceae88d1ccb354135fa10df40a2427bc0e704dca5b7ceafafbfcb3970eb57d4d6eb427330a2198894e67e2da2532adcdf5f900f5e8ed15727e1dc4fa84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/uz/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/uz/firefox-76.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "d957e4942ead1634d792555f57c6dbe54972fd9a97071e63901b422ed6b723426b27fe85afc8c33d75087a502112a4b4b2e0dc3f3a04a9d44a48ec867dc78cb2"; + sha512 = "cb1be90d64caa7ac445cc7a6b3549350eaf8859e7a4e662e602eee4218de98944360bcd828b62bdcf18a5a602b153a1e4cfb0bdac92a802a8b071f349c88262a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/vi/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/vi/firefox-76.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "e3209382cf01d827f3e68230c46c6eda837798f92812c93ac19e81a77a0d72f3a5b53681320b71d886d8d4339fb2eb51d056bb4bc41466116aa51ffd50ff05d1"; + sha512 = "69fc97339bd8fddedf12ac5f545c2f768cb071c4786f08c43fe61775e43b2dcf065d84d23ef9b9fb3f09c6df6364413f61fec0fa1cdeea2b4b769e3ef0bf124f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/xh/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/xh/firefox-76.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "8719acd4bca1136668c6a90b3f7caaf29bd773acaab2776f2b7daca3c9028c33e73dc2c15c82d44064e92b61def23ca889a2ad09043c5bc5ad91db3214af1919"; + sha512 = "b8013f7c0e1cfad11ef950015444105b1e8512d778fe4b2a7567e0613a1191a7a929c5fdca9c15ab846da05f189fea1b0c137784ca1061b43f7ebada27376a06"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/zh-CN/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/zh-CN/firefox-76.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "681e276d7ff6a6f91be59994e53f9f6f082e16f9d22ec7e1d1b65813e91c6c2661f28989b0331100b6f0d4cdbbb0589204b0ed80bf5f0bc0d18016e905a71148"; + sha512 = "154bfde5424cca1af2e624596755fe95a1504be0ce977162117e937b6ab6ec6b03b1cdb470ef62c710129d19a16c42fac334477f8638de6472b742ab2395b262"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/75.0/linux-i686/zh-TW/firefox-75.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/76.0/linux-i686/zh-TW/firefox-76.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "71ee272a7d02758187a9ef2d0a722760d04d9bf0fe11c90e841e15dc9019f44ba22483b6698e3f8eba9620e34d2678db2dbc2974c1ab5c7f0f79934aa4142432"; + sha512 = "6c3d36ba9e4682600c2a99d6837dfe76032d6d1618c0ddb8dab5633c2961d413959e9fe0a9c0fc7ef4bbbc41af469a92fab566d24458c43c1671cd3288dcaae8"; } ]; } -- cgit v1.2.3 From 650f1fff156ec617a10a2a1df6c1600c593f8e0f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 09:41:53 +0000 Subject: parallel: 20200322 -> 20200422 --- pkgs/tools/misc/parallel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index d55b2cd6f24..0720ca76f25 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20200322"; + name = "parallel-20200422"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "0kg95glnfg25i1w7qg2vr5v4671vigsazmz4qdf223l64khq8x10"; + sha256 = "0c2mr2rzsz0y24q4mbm2zmc2fz6bcda4gbc4qgg59sirrj8vzpjb"; }; outputs = [ "out" "man" ]; -- cgit v1.2.3 From e076d4ab19709e9c5af290698f35540c7afa872e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 09:59:51 +0000 Subject: pdfcrack: 0.18 -> 0.19 --- pkgs/tools/security/pdfcrack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/pdfcrack/default.nix b/pkgs/tools/security/pdfcrack/default.nix index 9d05304cf2f..afef0d4c472 100644 --- a/pkgs/tools/security/pdfcrack/default.nix +++ b/pkgs/tools/security/pdfcrack/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pdfcrack"; - version = "0.18"; + version = "0.19"; src = fetchurl { url = "mirror://sourceforge/pdfcrack/pdfcrack/pdfcrack-${version}.tar.gz"; - sha256 = "035s3jzrs3ci0i53x04dzpqp9225c4s52cd722d6zqra5b2sw8w2"; + sha256 = "1vf0l83xk627fg0a3b10wabgqxy08q4vbm0xjw9xzkdpk1lj059i"; }; installPhase = '' -- cgit v1.2.3 From 89c0f86b9fcc3408db5e14642128fa729c2050e6 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 10:05:28 +0000 Subject: pangomm: 2.42.0 -> 2.42.1 --- pkgs/development/libraries/pangomm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pangomm/default.nix b/pkgs/development/libraries/pangomm/default.nix index 5651f552dfa..b0488435ded 100644 --- a/pkgs/development/libraries/pangomm/default.nix +++ b/pkgs/development/libraries/pangomm/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "pangomm"; - version= "2.42.0"; + version= "2.42.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0mmzxp3wniaafkxr30sb22mq9x44xckb5d60h1bl99lkzxks0vfa"; + sha256 = "03zli5amizhv9bfklwfq7xyf0b5dagchx1lnz9f0v1rhk69h9gql"; }; outputs = [ "out" "dev" ]; -- cgit v1.2.3 From ca2145bdfc83382ba7ec83a275734040a2a7fddc Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 16 Apr 2020 23:08:00 +0300 Subject: nixos/tests: add unit-php test --- nixos/tests/all-tests.nix | 1 + nixos/tests/web-servers/unit-php.nix | 47 ++++++++++++++++++++++++++++++++++++ pkgs/servers/http/unit/default.nix | 4 ++- 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/web-servers/unit-php.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 46f552b26a4..d1b1acc292d 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -321,6 +321,7 @@ in trickster = handleTest ./trickster.nix {}; tuptime = handleTest ./tuptime.nix {}; udisks2 = handleTest ./udisks2.nix {}; + unit-php = handleTest ./web-servers/unit-php.nix {}; upnp = handleTest ./upnp.nix {}; uwsgi = handleTest ./uwsgi.nix {}; vault = handleTest ./vault.nix {}; diff --git a/nixos/tests/web-servers/unit-php.nix b/nixos/tests/web-servers/unit-php.nix new file mode 100644 index 00000000000..c6327a1f825 --- /dev/null +++ b/nixos/tests/web-servers/unit-php.nix @@ -0,0 +1,47 @@ +import ../make-test-python.nix ({pkgs, ...}: + let + testdir = pkgs.writeTextDir "www/info.php" " Date: Tue, 5 May 2020 00:28:00 +0100 Subject: podman: Link directly to podman.man instead of maping over outputs This seems brittle and fails on Hydra / OfBorg but not locally. --- pkgs/applications/virtualization/podman/wrapper.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/applications/virtualization/podman/wrapper.nix b/pkgs/applications/virtualization/podman/wrapper.nix index 3b9b76c03ee..99233696b3e 100644 --- a/pkgs/applications/virtualization/podman/wrapper.nix +++ b/pkgs/applications/virtualization/podman/wrapper.nix @@ -43,12 +43,7 @@ in runCommand podman.name { ]; } '' - # Symlink everything but $out from podman-unwrapped - ${ - lib.concatMapStringsSep "\n" - (o: "ln -s ${podman.${o}} ${placeholder o}") - (builtins.filter (o: o != "out") - podman.outputs)} + ln -s ${podman.man} $man mkdir -p $out/bin ln -s ${podman-unwrapped}/share $out/share -- cgit v1.2.3 From d547e06ff0be2eba3a2ffe8d0bcf164119bb1538 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 6 May 2020 13:10:04 +0200 Subject: androidStudioPackages.{dev,canary}: 4.1.0.7 -> 4.1.0.8 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 8869f8a0f62..cd6b46880b4 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -18,9 +18,9 @@ let sha256Hash = "11fmpf58z44i78ldkapzivz6md65744vqczzbwv8mkjkv9nz95rs"; }; latestVersion = { # canary & dev - version = "4.1.0.7"; # "Android Studio 4.1 Canary 7" - build = "193.6401718"; - sha256Hash = "1xa61rhi7dgxm0y6yl5dxd09x530mzyxvx9bp1jprzfwvc7s0byh"; + version = "4.1.0.8"; # "Android Studio 4.1 Canary 8" + build = "193.6423924"; + sha256Hash = "0ksgmhz9vhkw2mxzjapli0w6203ssd8ddgb0dq06rck8v7ysy8bp"; }; in { # Attributes are named by their corresponding release channels -- cgit v1.2.3 From 8b8e91647cd24545678db2f17d676a77d09b38f7 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 6 May 2020 13:13:48 +0200 Subject: nixos/tests/partition.nix: remove This is still written in perl, wasn't part of all-tests.nix, and fails even to build its dependencies (blivet, nixpart). --- nixos/tests/partition.nix | 247 ---------------------------------------------- 1 file changed, 247 deletions(-) delete mode 100644 nixos/tests/partition.nix diff --git a/nixos/tests/partition.nix b/nixos/tests/partition.nix deleted file mode 100644 index 01a08995950..00000000000 --- a/nixos/tests/partition.nix +++ /dev/null @@ -1,247 +0,0 @@ -import ./make-test.nix ({ pkgs, ... }: - -with pkgs.lib; - -let - ksExt = pkgs.writeText "ks-ext4" '' - clearpart --all --initlabel --drives=vdb - - part /boot --recommended --label=boot --fstype=ext2 --ondisk=vdb - part swap --recommended --label=swap --fstype=swap --ondisk=vdb - part /nix --size=500 --label=nix --fstype=ext3 --ondisk=vdb - part / --recommended --label=root --fstype=ext4 --ondisk=vdb - ''; - - ksBtrfs = pkgs.writeText "ks-btrfs" '' - clearpart --all --initlabel --drives=vdb,vdc - - part swap1 --recommended --label=swap1 --fstype=swap --ondisk=vdb - part swap2 --recommended --label=swap2 --fstype=swap --ondisk=vdc - - part btrfs.1 --grow --ondisk=vdb - part btrfs.2 --grow --ondisk=vdc - - btrfs / --data=0 --metadata=1 --label=root btrfs.1 btrfs.2 - ''; - - ksF2fs = pkgs.writeText "ks-f2fs" '' - clearpart --all --initlabel --drives=vdb - - part swap --recommended --label=swap --fstype=swap --ondisk=vdb - part /boot --recommended --label=boot --fstype=f2fs --ondisk=vdb - part / --recommended --label=root --fstype=f2fs --ondisk=vdb - ''; - - ksRaid = pkgs.writeText "ks-raid" '' - clearpart --all --initlabel --drives=vdb,vdc - - part raid.01 --size=200 --ondisk=vdb - part raid.02 --size=200 --ondisk=vdc - - part swap1 --size=500 --label=swap1 --fstype=swap --ondisk=vdb - part swap2 --size=500 --label=swap2 --fstype=swap --ondisk=vdc - - part raid.11 --grow --ondisk=vdb - part raid.12 --grow --ondisk=vdc - - raid /boot --level=1 --fstype=ext3 --device=md0 raid.01 raid.02 - raid / --level=1 --fstype=xfs --device=md1 raid.11 raid.12 - ''; - - ksRaidLvmCrypt = pkgs.writeText "ks-lvm-crypt" '' - clearpart --all --initlabel --drives=vdb,vdc - - part raid.1 --grow --ondisk=vdb - part raid.2 --grow --ondisk=vdc - - raid pv.0 --level=1 --encrypted --passphrase=x --device=md0 raid.1 raid.2 - - volgroup nixos pv.0 - - logvol /boot --size=200 --fstype=ext3 --name=boot --vgname=nixos - logvol swap --size=500 --fstype=swap --name=swap --vgname=nixos - logvol / --size=1000 --grow --fstype=ext4 --name=root --vgname=nixos - ''; -in { - name = "partitiion"; - - machine = { pkgs, ... }: { - environment.systemPackages = [ - pkgs.pythonPackages.nixpart0 - pkgs.file pkgs.btrfs-progs pkgs.xfsprogs pkgs.lvm2 - ]; - virtualisation.emptyDiskImages = [ 4096 4096 ]; - }; - - testScript = '' - my $diskStart; - my @mtab; - - sub getMtab { - my $mounts = $machine->succeed("cat /proc/mounts"); - chomp $mounts; - return map [split], split /\n/, $mounts; - } - - sub parttest { - my ($desc, $code) = @_; - $machine->start; - $machine->waitForUnit("default.target"); - - # Gather mounts and superblock - @mtab = getMtab; - $diskStart = $machine->succeed("dd if=/dev/vda bs=512 count=1"); - - subtest($desc, $code); - $machine->shutdown; - } - - sub ensureSanity { - # Check whether the filesystem in /dev/vda is still intact - my $newDiskStart = $machine->succeed("dd if=/dev/vda bs=512 count=1"); - if ($diskStart ne $newDiskStart) { - $machine->log("Something went wrong, the partitioner wrote " . - "something into the first 512 bytes of /dev/vda!"); - die; - } - - # Check whether nixpart has unmounted anything - my @currentMtab = getMtab; - for my $mount (@mtab) { - my $path = $mount->[1]; - unless (grep { $_->[1] eq $path } @currentMtab) { - $machine->log("The partitioner seems to have unmounted $path."); - die; - } - } - } - - sub checkMount { - my $mounts = $machine->succeed("cat /proc/mounts"); - - } - - sub kickstart { - $machine->copyFileFromHost($_[0], "/kickstart"); - $machine->succeed("nixpart -v /kickstart"); - ensureSanity; - } - - sub ensurePartition { - my ($name, $match) = @_; - my $path = $name =~ /^\// ? $name : "/dev/disk/by-label/$name"; - my $out = $machine->succeed("file -Ls $path"); - my @matches = grep(/^$path: .*$match/i, $out); - if (!@matches) { - $machine->log("Partition on $path was expected to have a " . - "file system that matches $match, but instead has: $out"); - die; - } - } - - sub ensureNoPartition { - $machine->succeed("test ! -e /dev/$_[0]"); - } - - sub ensureMountPoint { - $machine->succeed("mountpoint $_[0]"); - } - - sub remountAndCheck { - $machine->nest("Remounting partitions:", sub { - # XXX: "findmnt -ARunl -oTARGET /mnt" seems to NOT print all mounts! - my $getmounts_cmd = "cat /proc/mounts | cut -d' ' -f2 | grep '^/mnt'"; - # Insert canaries first - my $canaries = $machine->succeed($getmounts_cmd . " | while read p;" . - " do touch \"\$p/canary\";" . - " echo \"\$p/canary\"; done"); - # Now unmount manually - $machine->succeed($getmounts_cmd . " | tac | xargs -r umount"); - # /mnt should be empty or non-existing - my $found = $machine->succeed("find /mnt -mindepth 1"); - chomp $found; - if ($found) { - $machine->log("Cruft found in /mnt:\n$found"); - die; - } - # Try to remount with nixpart - $machine->succeed("nixpart -vm /kickstart"); - ensureMountPoint("/mnt"); - # Check if our beloved canaries are dead - chomp $canaries; - $machine->nest("Checking canaries:", sub { - for my $canary (split /\n/, $canaries) { - $machine->succeed("test -e '$canary'"); - } - }); - }); - } - - parttest "ext2, ext3 and ext4 filesystems", sub { - kickstart("${ksExt}"); - ensurePartition("boot", "ext2"); - ensurePartition("swap", "swap"); - ensurePartition("nix", "ext3"); - ensurePartition("root", "ext4"); - ensurePartition("/dev/vdb4", "boot sector"); - ensureNoPartition("vdb6"); - ensureNoPartition("vdc1"); - remountAndCheck; - ensureMountPoint("/mnt/boot"); - ensureMountPoint("/mnt/nix"); - }; - - parttest "btrfs filesystem", sub { - $machine->succeed("modprobe btrfs"); - kickstart("${ksBtrfs}"); - ensurePartition("swap1", "swap"); - ensurePartition("swap2", "swap"); - ensurePartition("/dev/vdb2", "btrfs"); - ensurePartition("/dev/vdc2", "btrfs"); - ensureNoPartition("vdb3"); - ensureNoPartition("vdc3"); - remountAndCheck; - }; - - parttest "f2fs filesystem", sub { - $machine->succeed("modprobe f2fs"); - kickstart("${ksF2fs}"); - ensurePartition("swap", "swap"); - ensurePartition("boot", "f2fs"); - ensurePartition("root", "f2fs"); - remountAndCheck; - ensureMountPoint("/mnt/boot", "f2fs"); - }; - - parttest "RAID1 with XFS", sub { - kickstart("${ksRaid}"); - ensurePartition("swap1", "swap"); - ensurePartition("swap2", "swap"); - ensurePartition("/dev/md0", "ext3"); - ensurePartition("/dev/md1", "xfs"); - ensureNoPartition("vdb4"); - ensureNoPartition("vdc4"); - ensureNoPartition("md2"); - remountAndCheck; - ensureMountPoint("/mnt/boot"); - }; - - parttest "RAID1 with LUKS and LVM", sub { - kickstart("${ksRaidLvmCrypt}"); - ensurePartition("/dev/vdb1", "data"); - ensureNoPartition("vdb2"); - ensurePartition("/dev/vdc1", "data"); - ensureNoPartition("vdc2"); - - ensurePartition("/dev/md0", "luks"); - ensureNoPartition("md1"); - - ensurePartition("/dev/nixos/boot", "ext3"); - ensurePartition("/dev/nixos/swap", "swap"); - ensurePartition("/dev/nixos/root", "ext4"); - - remountAndCheck; - ensureMountPoint("/mnt/boot"); - }; - ''; -}) -- cgit v1.2.3 From ca5fa22a38170f1a29c4ecaa6b78d29da10b8967 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 6 May 2020 13:26:39 +0200 Subject: gitRepo: 2.6 -> 2.7 --- pkgs/applications/version-management/git-repo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index e85d1f037d7..9488bb8ff78 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.6"; + version = "2.7"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "16c30nwlgm0xcma9q34ygjsk6m33izmfgn7a0mzhfzyakymdi45g"; + sha256 = "19wn16m9sy8fv31zl90av5la60l5hsf5fvvfpgiy0470rkagvz6j"; }; patches = [ ./import-ssl-module.patch ]; -- cgit v1.2.3 From 69dc7e64ad9fbe0a6ee928f4f033350110c39cd9 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 6 May 2020 13:12:25 +0200 Subject: tdesktop: 2.1.1 -> 2.1.2 --- .../networking/instant-messengers/telegram/tdesktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 319f400d95d..59e2fefb455 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -19,12 +19,12 @@ with lib; mkDerivation rec { pname = "telegram-desktop"; - version = "2.1.1"; + version = "2.1.2"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "0032csgzwfby5a8q8w9iks7ggv1dcqli3qyhksbzly2xzxmfzqaj"; + sha256 = "0n387scs5kmc5jrypyxkc9cj4c7nb5761bdb8qxw8j342sm5ai24"; }; postPatch = '' -- cgit v1.2.3 From 410c9edbeccb0d851a3a151b2825caf8a2e7edf3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 11:33:23 +0000 Subject: poppler: 0.87.0 -> 0.88.0 --- pkgs/development/libraries/poppler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index 7f7a115f877..93b49524dc1 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "poppler-${suffix}-${version}"; - version = "0.87.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! + version = "0.88.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! src = fetchurl { url = "${meta.homepage}/poppler-${version}.tar.xz"; - sha256 = "b2ArnCTC0FeAvpPnMGIBAS5BRZ8om4J5onp5QxrUFQ4="; + sha256 = "1isns9s484irq9ir4hbhpyqf6af2xzswh2pfrvk1k9d5x423hidl"; }; outputs = [ "out" "dev" ]; -- cgit v1.2.3 From 10a1a3782f142c547c2b73171ee405171be2da35 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Wed, 6 May 2020 14:45:32 +0300 Subject: emplace: 0.2.21 -> 0.3.1 --- pkgs/tools/package-management/emplace/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix index 8041264341c..4c591777691 100644 --- a/pkgs/tools/package-management/emplace/default.nix +++ b/pkgs/tools/package-management/emplace/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "emplace"; - version = "0.2.21"; + version = "0.3.1"; src = fetchFromGitHub { owner = "tversteeg"; repo = pname; rev = "v${version}"; - sha256 = "07h4ngn0ypjfhipb13lw56can6zcpiglzaqii1yy1avqwc4rjsln"; + sha256 = "0wg8wavbs063dnpjia7wd60nf97v7pl4lm6s9xndpai1r1c99c2d"; }; - cargoSha256 = "12znw98jf1sy3iz6lrwdxya9rvwskc3yjkqir3xjfxw99w2jsiqb"; + cargoSha256 = "0igq8aml22c26w43zgk2gii8yl8mhs8ikfh0bn32ajwigqfk4vaq"; meta = with lib; { description = "Mirror installed software on multiple machines"; -- cgit v1.2.3 From 2be192a99cb498c4dacf580185b346ad48524480 Mon Sep 17 00:00:00 2001 From: 0x4A6F <0x4A6F@users.noreply.github.com> Date: Mon, 4 May 2020 23:21:49 +0200 Subject: routinator: 0.6.4 -> 0.7.0 --- pkgs/servers/routinator/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/routinator/default.nix b/pkgs/servers/routinator/default.nix index 9c99faca484..46416c98276 100644 --- a/pkgs/servers/routinator/default.nix +++ b/pkgs/servers/routinator/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "routinator"; - version = "0.6.4"; + version = "0.7.0"; src = fetchFromGitHub { owner = "NLnetLabs"; repo = pname; rev = "v${version}"; - sha256 = "1hbqvjv9h1aghpyrl03w5f4j8gjy6n9lx83rmpsh5p7yd9ahwmf9"; + sha256 = "1qbaibmbiw3pffi0cm6d06k1gra4acgxr97gj7f1ckvql5rni4h0"; }; - cargoSha256 = "1chf1l9jlnhi9cyqpmcz8yfzwzmkn4lfxqhdhclvl8j4b2zvbcgc"; + cargoSha256 = "138h99l3vv34higbqj59fa88w7c63c80g3rw07n9j2f834cvr901"; meta = with stdenv.lib; { description = "An RPKI Validator written in Rust"; -- cgit v1.2.3 From 0eebdafed39ea99dacaa963bec3a4e2cafa5ff33 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Wed, 6 May 2020 14:00:41 +0200 Subject: dbeaver: 7.0.3 -> 7.0.4 --- pkgs/applications/misc/dbeaver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/dbeaver/default.nix b/pkgs/applications/misc/dbeaver/default.nix index 163cb5ed54e..8aaa7faa54d 100644 --- a/pkgs/applications/misc/dbeaver/default.nix +++ b/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "dbeaver-ce"; - version = "7.0.3"; + version = "7.0.4"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "189rsavmaa7480r61qhpzagia3c8jr3dfcl01ks3nfyq53j08hml"; + sha256 = "1d36d2rzsr8c048w0jyacvmgh46jamr9nzs22rmpm7xbzlnvdg4k"; }; installPhase = '' -- cgit v1.2.3 From ffb71c7746a3af9dca1dbb61cdbc43802cbec55f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 12:06:47 +0000 Subject: psi-plus: 1.4.1086 -> 1.4.1159 --- pkgs/applications/networking/instant-messengers/psi-plus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix index bd9d706d4e3..e5862769882 100644 --- a/pkgs/applications/networking/instant-messengers/psi-plus/default.nix +++ b/pkgs/applications/networking/instant-messengers/psi-plus/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "psi-plus"; - version = "1.4.1086"; + version = "1.4.1159"; src = fetchFromGitHub { owner = "psi-plus"; repo = "psi-plus-snapshots"; rev = version; - sha256 = "0war4hbjs1m7ll6rvpl3lj44lb0p5fi0g2siinnxpjffz2ydi97p"; + sha256 = "1k4ip2glkjsbb28gzffahi81kz90qkf213j89gsmcvbdjf4kp687"; }; cmakeFlags = [ -- cgit v1.2.3 From 5012fc268b27cd6cddecfc530edcc12fc60fc874 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 6 May 2020 22:26:19 +1000 Subject: podman: disable on darwin --- pkgs/applications/virtualization/podman/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index feed5cadce3..4a9fa078752 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -54,5 +54,6 @@ buildGoPackage rec { license = licenses.asl20; maintainers = with maintainers; [ marsam ] ++ teams.podman.members; platforms = platforms.unix; + broken = stdenv.isDarwin; }; } -- cgit v1.2.3 From 927e51066d18baa139e183b682e2421ad215d2c8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 01:31:46 +0000 Subject: ncmpc: 0.37 -> 0.38 --- pkgs/applications/audio/ncmpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index c08e4f7f4ff..aea50d71d75 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -10,13 +10,13 @@ assert pcreSupport -> pcre != null; stdenv.mkDerivation rec { pname = "ncmpc"; - version = "0.37"; + version = "0.38"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "ncmpc"; rev = "v${version}"; - sha256 = "1b0vd0h49kjg4nxjfjrcg8gzplz93ryr6xyfha2pvhlrzdd2d1lj"; + sha256 = "1kidpd1xrfax3v31q93r9g9b7jd841476q47wgd94h1a86b70gs9"; }; buildInputs = [ glib ncurses mpd_clientlib boost ] -- cgit v1.2.3 From 026073e57ebcc3d9b314339bd8b5a847013f795c Mon Sep 17 00:00:00 2001 From: Marcus Boyd Date: Wed, 6 May 2020 16:01:17 +0930 Subject: python3Packages.spyder_3: remove broken application Previously this had makeDesktopItem defined in it. Some recent tests enabled for this option made it fail. It's no longer used as an application (see the main spyder attribute for that), so all application aspects have been removed. --- pkgs/development/python-modules/spyder/3.nix | 52 ++++++++-------------------- 1 file changed, 14 insertions(+), 38 deletions(-) diff --git a/pkgs/development/python-modules/spyder/3.nix b/pkgs/development/python-modules/spyder/3.nix index 7987775cee1..e5c5683f5dc 100644 --- a/pkgs/development/python-modules/spyder/3.nix +++ b/pkgs/development/python-modules/spyder/3.nix @@ -1,62 +1,38 @@ -{ stdenv, buildPythonPackage, fetchPypi, makeDesktopItem, jedi, pycodestyle, - psutil, pyflakes, rope, numpy, scipy, matplotlib, pylint, keyring, numpydoc, +{ stdenv, buildPythonPackage, fetchFromGitHub, jedi, pycodestyle, + psutil, pyflakes, rope, pylint, keyring, numpydoc, qtconsole, qtawesome, nbconvert, mccabe, pyopengl, cloudpickle, pygments, - spyder-kernels_0_5, qtpy, pyzmq, chardet -, pyqtwebengine + spyder-kernels_0_5, qtpy, pyzmq, chardet, pyqtwebengine }: buildPythonPackage rec { pname = "spyder"; version = "3.3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "1z7qw1h3rhca12ycv8xrzw6z2gf81v0j6lfq9kpwh472w4vk75v1"; + src = fetchFromGitHub { + owner = "spyder-ide"; + repo = "spyder"; + rev = "v3.3.6"; + sha256 = "1sk9xajhzpklk5bcbdhpfhx3gxhyrahsmj9bv2m6kvbqxdlx6bq6"; }; - nativeBuildInputs = [ pyqtwebengine.wrapQtAppsHook ]; - propagatedBuildInputs = [ - jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint keyring - numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels_0_5 + jedi pycodestyle psutil pyflakes rope pylint keyring numpydoc + qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels_0_5 pygments qtpy pyzmq chardet pyqtwebengine ]; - # There is no test for spyder + # tests fail with a segfault doCheck = false; - desktopItem = makeDesktopItem { - name = "Spyder"; - exec = "spyder"; - icon = "spyder"; - comment = "Scientific Python Development Environment"; - desktopName = "Spyder"; - genericName = "Python IDE"; - categories = "Application;Development;Editor;IDE;"; - }; - postPatch = '' # remove dependency on pyqtwebengine - # this is still part of the pyqt 5.11 version we have in nixpkgs + # this is still part of the pyqt 5.13 version we have in nixpkgs sed -i /pyqtwebengine/d setup.py substituteInPlace setup.py --replace "pyqt5<5.13" "pyqt5" ''; - # Create desktop item - postInstall = '' - mkdir -p $out/share/icons - cp spyder/images/spyder.svg $out/share/icons - cp -r $desktopItem/share/applications/ $out/share - ''; - - dontWrapQtApps = true; - - preFixup = '' - makeWrapperArgs+=("''${qtWrapperArgs[@]}") - ''; - meta = with stdenv.lib; { - description = "Scientific python development environment"; + description = "Library providing a scientific python development environment"; longDescription = '' Spyder (previously known as Pydee) is a powerful interactive development environment for the Python language with advanced editing, interactive @@ -65,6 +41,6 @@ buildPythonPackage rec { homepage = "https://github.com/spyder-ide/spyder/"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ gebner ]; + maintainers = with maintainers; [ gebner marcus7070 ]; }; } -- cgit v1.2.3 From b96db456f5f662ede17d4ec9301f2e174cde0876 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Wed, 6 May 2020 13:27:04 +0800 Subject: mu: allow configuring the BatchSize --- pkgs/tools/networking/mu/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index c103637c685..79c314f9860 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchFromGitHub, sqlite, pkgconfig, autoreconfHook, pmccabe , xapian, glib, gmime3, texinfo , emacs, guile , gtk3, webkitgtk, libsoup, icu -, withMug ? false }: +, withMug ? false +, batchSize ? null }: stdenv.mkDerivation rec { pname = "mu"; @@ -14,6 +15,11 @@ stdenv.mkDerivation rec { sha256 = "1i9chd8ks1q4g5pyscsir6pw4kahkx3k8ckzbi8j3gr6jz1qzzsg"; }; + postPatch = stdenv.lib.optionalString (batchSize != null) '' + sed -i lib/mu-store.cc --regexp-extended \ + -e 's@(constexpr auto BatchSize).*@\1 = ${toString batchSize};@' + ''; + buildInputs = [ sqlite xapian glib gmime3 texinfo emacs guile libsoup icu ] ++ stdenv.lib.optionals withMug [ gtk3 webkitgtk ]; -- cgit v1.2.3 From 75503db6f35ead759aea389e521f2a58e014721b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 12:54:01 +0000 Subject: postgresql11Packages.pg_partman: 4.3.0 -> 4.3.1 --- pkgs/servers/sql/postgresql/ext/pg_partman.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix index ee59e683ce8..314e9275c8c 100644 --- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix +++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_partman"; - version = "4.3.0"; + version = "4.3.1"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "pgpartman"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "1zkjz4hkjqzg0j7i7bjxgdcv2kfcgqwahirh06yag6hvm4qf9y9w"; + sha256 = "12mfydlva05dczjhrw14xq9zr0hqqyszlwivvq2zj9h1p9agm7fn"; }; installPhase = '' -- cgit v1.2.3 From d617416e1330e839d908907cd009e8c822cb1d36 Mon Sep 17 00:00:00 2001 From: Herman Fries Date: Wed, 6 May 2020 14:56:09 +0200 Subject: robo3t: Remove unrecognized category from desktop item --- pkgs/applications/misc/robo3t/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/robo3t/default.nix b/pkgs/applications/misc/robo3t/default.nix index f42a58e0057..d1e31b4077f 100644 --- a/pkgs/applications/misc/robo3t/default.nix +++ b/pkgs/applications/misc/robo3t/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { comment = "Query GUI for mongodb"; desktopName = "Robo3T"; genericName = "MongoDB management tool"; - categories = "Development;IDE;mongodb;"; + categories = "Development;IDE;"; }; nativeBuildInputs = [makeWrapper]; -- cgit v1.2.3 From 450f8a44f9bbfdea26fa4f4c26a62a5e7ac8fe4d Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 5 May 2020 22:58:50 +0200 Subject: nixosTests.ldap: remove This seems to have worked in 15f105d41fb83bc93692702af96848e8887fc03c (5 months ago) but broke somewhere in the meantime. The current module doesn't seem to be underdocumented and might need a serious refactor. It requires quite some hacks to get it to work (see https://github.com/NixOS/nixpkgs/issues/86305#issuecomment-621129942), or how the ldap.nix test used systemd.services.openldap.preStart and made quite some assumptions on internals. Mic92 agreed on being added as a maintainer for the module, as he uses it a lot and can possibly fix eventual breakages. For the most basic startup breakages, the remaining openldap.nix test might suffice. --- nixos/modules/services/databases/openldap.nix | 4 + nixos/tests/all-tests.nix | 1 - nixos/tests/ldap.nix | 405 -------------------------- 3 files changed, 4 insertions(+), 406 deletions(-) delete mode 100644 nixos/tests/ldap.nix diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index 809f61cfa81..8c2851c37ac 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -231,6 +231,10 @@ in }; + meta = { + maintainers = lib.maintainers.mic92; + }; + ###### implementation diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 46f552b26a4..06db744580f 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -164,7 +164,6 @@ in kubernetes.rbac = handleTestOn ["x86_64-linux"] ./kubernetes/rbac.nix {}; latestKernel.hardened = handleTest ./hardened.nix { latestKernel = true; }; latestKernel.login = handleTest ./login.nix { latestKernel = true; }; - ldap = handleTest ./ldap.nix {}; leaps = handleTest ./leaps.nix {}; lidarr = handleTest ./lidarr.nix {}; lightdm = handleTest ./lightdm.nix {}; diff --git a/nixos/tests/ldap.nix b/nixos/tests/ldap.nix deleted file mode 100644 index 74b002fc00e..00000000000 --- a/nixos/tests/ldap.nix +++ /dev/null @@ -1,405 +0,0 @@ -import ./make-test-python.nix ({ pkgs, lib, ...} : - -let - unlines = lib.concatStringsSep "\n"; - unlinesAttrs = f: as: unlines (lib.mapAttrsToList f as); - - dbDomain = "example.com"; - dbSuffix = "dc=example,dc=com"; - dbAdminDn = "cn=admin,${dbSuffix}"; - dbAdminPwd = "admin-password"; - # NOTE: slappasswd -h "{SSHA}" -s '${dbAdminPwd}' - dbAdminPwdHash = "{SSHA}i7FopSzkFQMrHzDMB1vrtkI0rBnwouP8"; - ldapUser = "test-ldap-user"; - ldapUserId = 10000; - ldapUserPwd = "user-password"; - # NOTE: slappasswd -h "{SSHA}" -s '${ldapUserPwd}' - ldapUserPwdHash = "{SSHA}v12XICMZNGT6r2KJ26rIkN8Vvvp4QX6i"; - ldapGroup = "test-ldap-group"; - ldapGroupId = 10000; - - mkClient = useDaemon: - { lib, ... }: - { - virtualisation.memorySize = 256; - virtualisation.vlans = [ 1 ]; - security.pam.services.su.rootOK = lib.mkForce false; - users.ldap.enable = true; - users.ldap.daemon = { - enable = useDaemon; - rootpwmoddn = "cn=admin,${dbSuffix}"; - rootpwmodpwFile = "/etc/nslcd.rootpwmodpw"; - }; - users.ldap.loginPam = true; - users.ldap.nsswitch = true; - users.ldap.server = "ldap://server"; - users.ldap.base = "ou=posix,${dbSuffix}"; - users.ldap.bind = { - distinguishedName = "cn=admin,${dbSuffix}"; - passwordFile = "/etc/ldap/bind.password"; - }; - # NOTE: passwords stored in clear in Nix's store, but this is a test. - environment.etc."ldap/bind.password".source = pkgs.writeText "password" dbAdminPwd; - environment.etc."nslcd.rootpwmodpw".source = pkgs.writeText "rootpwmodpw" dbAdminPwd; - }; -in - -{ - name = "ldap"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ montag451 ]; - }; - - nodes = { - - server = - { pkgs, config, ... }: - let - inherit (config.services) openldap; - - slapdConfig = pkgs.writeText "cn=config.ldif" ('' - dn: cn=config - objectClass: olcGlobal - #olcPidFile: /run/slapd/slapd.pid - # List of arguments that were passed to the server - #olcArgsFile: /run/slapd/slapd.args - # Read slapd-config(5) for possible values - olcLogLevel: none - # The tool-threads parameter sets the actual amount of CPU's - # that is used for indexing. - olcToolThreads: 1 - - dn: olcDatabase={-1}frontend,cn=config - objectClass: olcDatabaseConfig - objectClass: olcFrontendConfig - # The maximum number of entries that is returned for a search operation - olcSizeLimit: 500 - # Allow unlimited access to local connection from the local root user - olcAccess: to * - by dn.exact=gidNumber=0+uidNumber=0,cn=peercred,cn=external,cn=auth manage - by * break - # Allow unauthenticated read access for schema and base DN autodiscovery - olcAccess: to dn.exact="" - by * read - olcAccess: to dn.base="cn=Subschema" - by * read - - dn: olcDatabase=config,cn=config - objectClass: olcDatabaseConfig - olcRootDN: cn=admin,cn=config - #olcRootPW: - # NOTE: access to cn=config, system root can be manager - # with SASL mechanism (-Y EXTERNAL) over unix socket (-H ldapi://) - olcAccess: to * - by dn.exact="gidNumber=0+uidNumber=0,cn=peercred,cn=external,cn=auth" manage - by * break - - dn: cn=schema,cn=config - objectClass: olcSchemaConfig - - include: file://${pkgs.openldap}/etc/schema/core.ldif - include: file://${pkgs.openldap}/etc/schema/cosine.ldif - include: file://${pkgs.openldap}/etc/schema/nis.ldif - include: file://${pkgs.openldap}/etc/schema/inetorgperson.ldif - - dn: cn=module{0},cn=config - objectClass: olcModuleList - # Where the dynamically loaded modules are stored - #olcModulePath: /usr/lib/ldap - olcModuleLoad: back_mdb - - '' - + unlinesAttrs (olcSuffix: {conf, ...}: - "include: file://" + pkgs.writeText "config.ldif" conf - ) slapdDatabases - ); - - slapdDatabases = { - ${dbSuffix} = { - conf = '' - dn: olcBackend={1}mdb,cn=config - objectClass: olcBackendConfig - - dn: olcDatabase={1}mdb,cn=config - olcSuffix: ${dbSuffix} - olcDbDirectory: ${openldap.dataDir}/${dbSuffix} - objectClass: olcDatabaseConfig - objectClass: olcMdbConfig - # NOTE: checkpoint the database periodically in case of system failure - # and to speed up slapd shutdown. - olcDbCheckpoint: 512 30 - # Database max size is 1G - olcDbMaxSize: 1073741824 - olcLastMod: TRUE - # NOTE: database superuser. Needed for syncrepl, - # and used to auth as admin through a TCP connection. - olcRootDN: cn=admin,${dbSuffix} - olcRootPW: ${dbAdminPwdHash} - # - olcDbIndex: objectClass eq - olcDbIndex: cn,uid eq - olcDbIndex: uidNumber,gidNumber eq - olcDbIndex: member,memberUid eq - # - olcAccess: to attrs=userPassword - by self write - by anonymous auth - by dn="cn=admin,${dbSuffix}" write - by dn="gidNumber=0+uidNumber=0,cn=peercred,cn=external,cn=auth" write - by * none - olcAccess: to attrs=shadowLastChange - by self write - by dn="cn=admin,${dbSuffix}" write - by dn="gidNumber=0+uidNumber=0,cn=peercred,cn=external,cn=auth" write - by * none - olcAccess: to dn.sub="ou=posix,${dbSuffix}" - by self read - by dn="cn=admin,${dbSuffix}" read - by dn="gidNumber=0+uidNumber=0,cn=peercred,cn=external,cn=auth" read - olcAccess: to * - by self read - by * none - ''; - data = '' - dn: ${dbSuffix} - objectClass: top - objectClass: dcObject - objectClass: organization - o: ${dbDomain} - - dn: cn=admin,${dbSuffix} - objectClass: simpleSecurityObject - objectClass: organizationalRole - description: ${dbDomain} LDAP administrator - roleOccupant: ${dbSuffix} - userPassword: ${ldapUserPwdHash} - - dn: ou=posix,${dbSuffix} - objectClass: top - objectClass: organizationalUnit - - dn: ou=accounts,ou=posix,${dbSuffix} - objectClass: top - objectClass: organizationalUnit - - dn: ou=groups,ou=posix,${dbSuffix} - objectClass: top - objectClass: organizationalUnit - '' - + lib.concatMapStrings posixAccount [ - { uid=ldapUser; uidNumber=ldapUserId; gidNumber=ldapGroupId; userPassword=ldapUserPwdHash; } - ] - + lib.concatMapStrings posixGroup [ - { gid=ldapGroup; gidNumber=ldapGroupId; members=[]; } - ]; - }; - }; - - # NOTE: create a user account using the posixAccount objectClass. - posixAccount = - { uid - , uidNumber ? null - , gidNumber ? null - , cn ? "" - , sn ? "" - , userPassword ? "" - , loginShell ? "/bin/sh" - }: '' - - dn: uid=${uid},ou=accounts,ou=posix,${dbSuffix} - objectClass: person - objectClass: posixAccount - objectClass: shadowAccount - cn: ${cn} - gecos: - ${if gidNumber == null then "#" else "gidNumber: ${toString gidNumber}"} - homeDirectory: /home/${uid} - loginShell: ${loginShell} - sn: ${sn} - ${if uidNumber == null then "#" else "uidNumber: ${toString uidNumber}"} - ${if userPassword == "" then "#" else "userPassword: ${userPassword}"} - ''; - - # NOTE: create a group using the posixGroup objectClass. - posixGroup = - { gid - , gidNumber - , members - }: '' - - dn: cn=${gid},ou=groups,ou=posix,${dbSuffix} - objectClass: top - objectClass: posixGroup - gidNumber: ${toString gidNumber} - ${lib.concatMapStrings (member: "memberUid: ${member}\n") members} - ''; - in - { - virtualisation.memorySize = 256; - virtualisation.vlans = [ 1 ]; - networking.firewall.allowedTCPPorts = [ 389 ]; - services.openldap.enable = true; - services.openldap.dataDir = "/var/db/openldap"; - services.openldap.configDir = "/var/db/slapd"; - services.openldap.urlList = [ - "ldap:///" - "ldapi:///" - ]; - systemd.services.openldap = { - preStart = '' - set -e - # NOTE: slapd's config is always re-initialized. - rm -rf "${openldap.configDir}"/cn=config \ - "${openldap.configDir}"/cn=config.ldif - install -D -d -m 0700 -o "${openldap.user}" -g "${openldap.group}" "${openldap.configDir}" - # NOTE: olcDbDirectory must be created before adding the config. - '' + - unlinesAttrs (olcSuffix: {data, ...}: '' - # NOTE: database is always re-initialized. - rm -rf "${openldap.dataDir}/${olcSuffix}" - install -D -d -m 0700 -o "${openldap.user}" -g "${openldap.group}" \ - "${openldap.dataDir}/${olcSuffix}" - '') slapdDatabases - + '' - # NOTE: slapd is supposed to be stopped while in preStart, - # hence slap* commands can safely be used. - umask 0077 - ${pkgs.openldap}/bin/slapadd -n 0 \ - -F "${openldap.configDir}" \ - -l ${slapdConfig} - chown -R "${openldap.user}:${openldap.group}" "${openldap.configDir}" - # NOTE: slapadd(8): To populate the config database slapd-config(5), - # use -n 0 as it is always the first database. - # It must physically exist on the filesystem prior to this, however. - '' + - unlinesAttrs (olcSuffix: {data, ...}: '' - # NOTE: load database ${olcSuffix} - # (as root to avoid depending on sudo or chpst) - ${pkgs.openldap}/bin/slapadd \ - -F "${openldap.configDir}" \ - -l ${pkgs.writeText "data.ldif" data} - '' + '' - # NOTE: redundant with default openldap's preStart, but do not harm. - chown -R "${openldap.user}:${openldap.group}" \ - "${openldap.dataDir}/${olcSuffix}" - '') slapdDatabases; - }; - }; - - client1 = mkClient true; # use nss_pam_ldapd - client2 = mkClient false; # use nss_ldap and pam_ldap - }; - - testScript = '' - def expect_script(*commands): - script = ";".join(commands) - return f"${pkgs.expect}/bin/expect -c '{script}'" - - - server.start() - server.wait_for_unit("default.target") - - with subtest("slapd: auth as database admin with SASL and check a POSIX account"): - server.succeed( - 'test "$(ldapsearch -LLL -H ldapi:// -Y EXTERNAL ' - + "-b 'uid=${ldapUser},ou=accounts,ou=posix,${dbSuffix}' " - + "-s base uidNumber | " - + "sed -ne 's/^uidNumber: \\(.*\\)/\\1/p')\" -eq ${toString ldapUserId}" - ) - - with subtest("slapd: auth as database admin with password and check a POSIX account"): - server.succeed( - "test \"$(ldapsearch -LLL -H ldap://server -D 'cn=admin,${dbSuffix}' " - + "-w '${dbAdminPwd}' -b 'uid=${ldapUser},ou=accounts,ou=posix,${dbSuffix}' " - + "-s base uidNumber | " - + "sed -ne 's/^uidNumber: \\(.*\\)/\\1/p')\" -eq ${toString ldapUserId}" - ) - - client1.start() - client1.wait_for_unit("default.target") - - with subtest("password: su with password to a POSIX account"): - client1.succeed( - expect_script( - 'spawn su "${ldapUser}"', - 'expect "Password:"', - 'send "${ldapUserPwd}\n"', - 'expect "*"', - 'send "whoami\n"', - 'expect -ex "${ldapUser}" {exit}', - "exit 1", - ) - ) - - with subtest("password: change password of a POSIX account as root"): - client1.succeed( - "chpasswd <<<'${ldapUser}:new-password'", - expect_script( - 'spawn su "${ldapUser}"', - 'expect "Password:"', - 'send "new-password\n"', - 'expect "*"', - 'send "whoami\n"', - 'expect -ex "${ldapUser}" {exit}', - "exit 1", - ), - "chpasswd <<<'${ldapUser}:${ldapUserPwd}'", - ) - - with subtest("password: change password of a POSIX account from itself"): - client1.succeed( - "chpasswd <<<'${ldapUser}:${ldapUserPwd}' ", - expect_script( - "spawn su --login ${ldapUser} -c passwd", - 'expect "Password: "', - 'send "${ldapUserPwd}\n"', - 'expect "(current) UNIX password: "', - 'send "${ldapUserPwd}\n"', - 'expect "New password: "', - 'send "new-password\n"', - 'expect "Retype new password: "', - 'send "new-password\n"', - 'expect "passwd: password updated successfully" {exit}', - "exit 1", - ), - expect_script( - 'spawn su "${ldapUser}"', - 'expect "Password:"', - 'send "${ldapUserPwd}\n"', - 'expect "su: Authentication failure" {exit}', - "exit 1", - ), - expect_script( - 'spawn su "${ldapUser}"', - 'expect "Password:"', - 'send "new-password\n"', - 'expect "*"', - 'send "whoami\n"', - 'expect -ex "${ldapUser}" {exit}', - "exit 1", - ), - "chpasswd <<<'${ldapUser}:${ldapUserPwd}'", - ) - - client2.start() - client2.wait_for_unit("default.target") - - with subtest("NSS"): - client1.succeed( - "test \"$(id -u '${ldapUser}')\" -eq ${toString ldapUserId}", - "test \"$(id -u -n '${ldapUser}')\" = '${ldapUser}'", - "test \"$(id -g '${ldapUser}')\" -eq ${toString ldapGroupId}", - "test \"$(id -g -n '${ldapUser}')\" = '${ldapGroup}'", - "test \"$(id -u '${ldapUser}')\" -eq ${toString ldapUserId}", - "test \"$(id -u -n '${ldapUser}')\" = '${ldapUser}'", - "test \"$(id -g '${ldapUser}')\" -eq ${toString ldapGroupId}", - "test \"$(id -g -n '${ldapUser}')\" = '${ldapGroup}'", - ) - - with subtest("PAM"): - client1.succeed( - "echo ${ldapUserPwd} | su -l '${ldapUser}' -c true", - "echo ${ldapUserPwd} | su -l '${ldapUser}' -c true", - ) - ''; -}) -- cgit v1.2.3 From 3bc4b4d843fc22ba5bad1c5cc0879f6accb58493 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 May 2020 15:08:17 +0200 Subject: =?UTF-8?q?wordpress:=205.4=20=E2=86=92=205.4.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: CVE-2020-11030, CVE-2020-11029, CVE-2020-11028, CVE-2020-11027, CVE-2020-11026, CVE-2020-11025 --- pkgs/servers/web-apps/wordpress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix index 9cab8c4a9ba..ca4b5d832a6 100644 --- a/pkgs/servers/web-apps/wordpress/default.nix +++ b/pkgs/servers/web-apps/wordpress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wordpress"; - version = "5.4"; + version = "5.4.1"; src = fetchurl { url = "https://wordpress.org/${pname}-${version}.tar.gz"; - sha256 = "10zjgbr96ri87r5v7860vg5ndbnjfhjhily4m9nyl60f1lbjdhrr"; + sha256 = "0i9ndfhm9iwilqwbqs3dngmzzjmazw4vwbyccjabs3zmzliis6vv"; }; installPhase = '' -- cgit v1.2.3 From cc1a17145e53c12b846b6d3735ba9663fc965c46 Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Wed, 6 May 2020 15:20:57 +0200 Subject: rakudo: 2020.02.1 -> 2020.05 dependencies: moarvm: 2020.02.1 -> 2020.05 nqp: 2020.02.1 -> 2020.05 --- pkgs/development/interpreters/rakudo/default.nix | 4 ++-- pkgs/development/interpreters/rakudo/moarvm.nix | 4 ++-- pkgs/development/interpreters/rakudo/nqp.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index 37abbd97746..e4501d85238 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rakudo"; - version = "2020.02.1"; + version = "2020.05"; src = fetchurl { url = "https://www.rakudo.org/dl/rakudo/rakudo-${version}.tar.gz"; - sha256 = "1qfaiqfclqd6zz04xl90yiqkvmm610r905nnbd6gszgyq1k77ckv"; + sha256 = "08d1591k8lhyw3kmxq53lf24wg6d61lg2xc81zzcglask9n9ilc6"; }; buildInputs = [ icu zlib gmp perl ]; diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index ade97b56a64..a7b57c9287a 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "moarvm"; - version = "2020.02.1"; + version = "2020.05"; src = fetchurl { url = "https://www.moarvm.org/releases/MoarVM-${version}.tar.gz"; - sha256 = "0cnnyjyci24pbws2cic80xdr7a5g3qvrsi221c6bpbnpkar81jw2"; + sha256 = "0jw29846nky7gz129knjcx58qr7nbn8j7hs8k92i11zaj73d4s4k"; }; buildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix index f12e60b14f0..40133287f9e 100644 --- a/pkgs/development/interpreters/rakudo/nqp.nix +++ b/pkgs/development/interpreters/rakudo/nqp.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nqp"; - version = "2020.02.1"; + version = "2020.05"; src = fetchurl { url = "https://github.com/perl6/nqp/releases/download/${version}/nqp-${version}.tar.gz"; - sha256 = "0zw3g7viyq4n4qwy0laww2mzz6wrzkfcq4fm82scy1mh65r7bdgj"; + sha256 = "0xxm0vlra1g467cxc5v65p8pc46w7r9wkcddjl8nk2lnvgcr46r9"; }; buildInputs = [ perl ]; -- cgit v1.2.3 From 8af9c97c0d6ee8e5f5fe3e61479ebc56c5ffb761 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 2 Apr 2020 23:40:55 +0300 Subject: nixos/tests: move mysql tests to subfolder --- nixos/tests/all-tests.nix | 8 +- nixos/tests/automysqlbackup.nix | 38 --------- nixos/tests/mysql-backup.nix | 56 ------------- nixos/tests/mysql-replication.nix | 89 -------------------- nixos/tests/mysql.nix | 143 -------------------------------- nixos/tests/mysql/mysql-autobackup.nix | 38 +++++++++ nixos/tests/mysql/mysql-backup.nix | 56 +++++++++++++ nixos/tests/mysql/mysql-replication.nix | 89 ++++++++++++++++++++ nixos/tests/mysql/mysql.nix | 143 ++++++++++++++++++++++++++++++++ nixos/tests/mysql/testdb.sql | 11 +++ nixos/tests/testdb.sql | 11 --- 11 files changed, 341 insertions(+), 341 deletions(-) delete mode 100644 nixos/tests/automysqlbackup.nix delete mode 100644 nixos/tests/mysql-backup.nix delete mode 100644 nixos/tests/mysql-replication.nix delete mode 100644 nixos/tests/mysql.nix create mode 100644 nixos/tests/mysql/mysql-autobackup.nix create mode 100644 nixos/tests/mysql/mysql-backup.nix create mode 100644 nixos/tests/mysql/mysql-replication.nix create mode 100644 nixos/tests/mysql/mysql.nix create mode 100644 nixos/tests/mysql/testdb.sql delete mode 100644 nixos/tests/testdb.sql diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index d1b1acc292d..8857d191a49 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -24,7 +24,6 @@ in _3proxy = handleTest ./3proxy.nix {}; acme = handleTest ./acme.nix {}; atd = handleTest ./atd.nix {}; - automysqlbackup = handleTest ./automysqlbackup.nix {}; avahi = handleTest ./avahi.nix {}; babeld = handleTest ./babeld.nix {}; bcachefs = handleTestOn ["x86_64-linux"] ./bcachefs.nix {}; # linux-4.18.2018.10.12 is unsupported on aarch64 @@ -197,9 +196,10 @@ in munin = handleTest ./munin.nix {}; mutableUsers = handleTest ./mutable-users.nix {}; mxisd = handleTest ./mxisd.nix {}; - mysql = handleTest ./mysql.nix {}; - mysqlBackup = handleTest ./mysql-backup.nix {}; - mysqlReplication = handleTest ./mysql-replication.nix {}; + mysql = handleTest ./mysql/mysql.nix {}; + mysql-autobackup = handleTest ./mysql/mysql-autobackup.nix {}; + mysql-backup = handleTest ./mysql/mysql-backup.nix {}; + mysql-replication = handleTest ./mysql/mysql-replication.nix {}; nagios = handleTest ./nagios.nix {}; nat.firewall = handleTest ./nat.nix { withFirewall = true; }; nat.firewall-conntrack = handleTest ./nat.nix { withFirewall = true; withConntrackHelpers = true; }; diff --git a/nixos/tests/automysqlbackup.nix b/nixos/tests/automysqlbackup.nix deleted file mode 100644 index 224b93862fb..00000000000 --- a/nixos/tests/automysqlbackup.nix +++ /dev/null @@ -1,38 +0,0 @@ -import ./make-test-python.nix ({ pkgs, lib, ... }: - -{ - name = "automysqlbackup"; - meta.maintainers = [ lib.maintainers.aanderse ]; - - machine = - { pkgs, ... }: - { - services.mysql.enable = true; - services.mysql.package = pkgs.mysql; - services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ]; - - services.automysqlbackup.enable = true; - }; - - testScript = '' - start_all() - - # Need to have mysql started so that it can be populated with data. - machine.wait_for_unit("mysql.service") - - with subtest("Wait for testdb to be fully populated (5 rows)."): - machine.wait_until_succeeds( - "mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5" - ) - - with subtest("Do a backup and wait for it to start"): - machine.start_job("automysqlbackup.service") - machine.wait_for_job("automysqlbackup.service") - - with subtest("wait for backup file and check that data appears in backup"): - machine.wait_for_file("/var/backup/mysql/daily/testdb") - machine.succeed( - "${pkgs.gzip}/bin/zcat /var/backup/mysql/daily/testdb/daily_testdb_*.sql.gz | grep hello" - ) - ''; -}) diff --git a/nixos/tests/mysql-backup.nix b/nixos/tests/mysql-backup.nix deleted file mode 100644 index a0595e4d553..00000000000 --- a/nixos/tests/mysql-backup.nix +++ /dev/null @@ -1,56 +0,0 @@ -# Test whether mysqlBackup option works -import ./make-test-python.nix ({ pkgs, ... } : { - name = "mysql-backup"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ rvl ]; - }; - - nodes = { - master = { pkgs, ... }: { - services.mysql = { - enable = true; - initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ]; - package = pkgs.mysql; - }; - - services.mysqlBackup = { - enable = true; - databases = [ "doesnotexist" "testdb" ]; - }; - }; - }; - - testScript = '' - start_all() - - # Delete backup file that may be left over from a previous test run. - # This is not needed on Hydra but useful for repeated local test runs. - master.execute("rm -f /var/backup/mysql/testdb.gz") - - # Need to have mysql started so that it can be populated with data. - master.wait_for_unit("mysql.service") - - # Wait for testdb to be fully populated (5 rows). - master.wait_until_succeeds( - "mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5" - ) - - # Do a backup and wait for it to start - master.start_job("mysql-backup.service") - master.wait_for_unit("mysql-backup.service") - - # wait for backup to fail, because of database 'doesnotexist' - master.wait_until_fails("systemctl is-active -q mysql-backup.service") - - # wait for backup file and check that data appears in backup - master.wait_for_file("/var/backup/mysql/testdb.gz") - master.succeed( - "${pkgs.gzip}/bin/zcat /var/backup/mysql/testdb.gz | grep hello" - ) - - # Check that a failed backup is logged - master.succeed( - "journalctl -u mysql-backup.service | grep 'fail.*doesnotexist' > /dev/null" - ) - ''; -}) diff --git a/nixos/tests/mysql-replication.nix b/nixos/tests/mysql-replication.nix deleted file mode 100644 index a2654f041ad..00000000000 --- a/nixos/tests/mysql-replication.nix +++ /dev/null @@ -1,89 +0,0 @@ -import ./make-test-python.nix ({ pkgs, ...} : - -let - replicateUser = "replicate"; - replicatePassword = "secret"; -in - -{ - name = "mysql-replication"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco shlevy ]; - }; - - nodes = { - master = - { pkgs, ... }: - - { - services.mysql.enable = true; - services.mysql.package = pkgs.mysql; - services.mysql.replication.role = "master"; - services.mysql.replication.slaveHost = "%"; - services.mysql.replication.masterUser = replicateUser; - services.mysql.replication.masterPassword = replicatePassword; - services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ]; - networking.firewall.allowedTCPPorts = [ 3306 ]; - }; - - slave1 = - { pkgs, nodes, ... }: - - { - services.mysql.enable = true; - services.mysql.package = pkgs.mysql; - services.mysql.replication.role = "slave"; - services.mysql.replication.serverId = 2; - services.mysql.replication.masterHost = nodes.master.config.networking.hostName; - services.mysql.replication.masterUser = replicateUser; - services.mysql.replication.masterPassword = replicatePassword; - }; - - slave2 = - { pkgs, nodes, ... }: - - { - services.mysql.enable = true; - services.mysql.package = pkgs.mysql; - services.mysql.replication.role = "slave"; - services.mysql.replication.serverId = 3; - services.mysql.replication.masterHost = nodes.master.config.networking.hostName; - services.mysql.replication.masterUser = replicateUser; - services.mysql.replication.masterPassword = replicatePassword; - }; - }; - - testScript = '' - master.start() - master.wait_for_unit("mysql") - master.wait_for_open_port(3306) - # Wait for testdb to be fully populated (5 rows). - master.wait_until_succeeds( - "mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5" - ) - - slave1.start() - slave2.start() - slave1.wait_for_unit("mysql") - slave1.wait_for_open_port(3306) - slave2.wait_for_unit("mysql") - slave2.wait_for_open_port(3306) - - # wait for replications to finish - slave1.wait_until_succeeds( - "mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5" - ) - slave2.wait_until_succeeds( - "mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5" - ) - - slave2.succeed("systemctl stop mysql") - master.succeed("echo 'insert into testdb.tests values (123, 456);' | mysql -u root -N") - slave2.succeed("systemctl start mysql") - slave2.wait_for_unit("mysql") - slave2.wait_for_open_port(3306) - slave2.wait_until_succeeds( - "echo 'select * from testdb.tests where Id = 123;' | mysql -u root -N | grep 456" - ) - ''; -}) diff --git a/nixos/tests/mysql.nix b/nixos/tests/mysql.nix deleted file mode 100644 index 11c1dabf936..00000000000 --- a/nixos/tests/mysql.nix +++ /dev/null @@ -1,143 +0,0 @@ -import ./make-test-python.nix ({ pkgs, ...} : { - name = "mysql"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ eelco shlevy ]; - }; - - nodes = { - mysql = - { pkgs, ... }: - - { - services.mysql.enable = true; - services.mysql.initialDatabases = [ - { name = "testdb"; schema = ./testdb.sql; } - { name = "empty_testdb"; } - ]; - # note that using pkgs.writeText here is generally not a good idea, - # as it will store the password in world-readable /nix/store ;) - services.mysql.initialScript = pkgs.writeText "mysql-init.sql" '' - CREATE USER 'passworduser'@'localhost' IDENTIFIED BY 'password123'; - ''; - services.mysql.package = pkgs.mysql57; - }; - - mysql80 = - { pkgs, ... }: - - { - # prevent oom: - # Kernel panic - not syncing: Out of memory: compulsory panic_on_oom is enabled - virtualisation.memorySize = 1024; - - services.mysql.enable = true; - services.mysql.initialDatabases = [ - { name = "testdb"; schema = ./testdb.sql; } - { name = "empty_testdb"; } - ]; - # note that using pkgs.writeText here is generally not a good idea, - # as it will store the password in world-readable /nix/store ;) - services.mysql.initialScript = pkgs.writeText "mysql-init.sql" '' - CREATE USER 'passworduser'@'localhost' IDENTIFIED BY 'password123'; - ''; - services.mysql.package = pkgs.mysql80; - }; - - mariadb = - { pkgs, ... }: - - { - users.users.testuser = { }; - users.users.testuser2 = { }; - services.mysql.enable = true; - services.mysql.initialScript = pkgs.writeText "mariadb-init.sql" '' - ALTER USER root@localhost IDENTIFIED WITH unix_socket; - DELETE FROM mysql.user WHERE password = ''' AND plugin = '''; - DELETE FROM mysql.user WHERE user = '''; - FLUSH PRIVILEGES; - ''; - services.mysql.ensureDatabases = [ "testdb" "testdb2" ]; - services.mysql.ensureUsers = [{ - name = "testuser"; - ensurePermissions = { - "testdb.*" = "ALL PRIVILEGES"; - }; - } { - name = "testuser2"; - ensurePermissions = { - "testdb2.*" = "ALL PRIVILEGES"; - }; - }]; - services.mysql.settings = { - mysqld = { - plugin-load-add = [ "ha_tokudb.so" "ha_rocksdb.so" ]; - }; - }; - services.mysql.package = pkgs.mariadb; - }; - - }; - - testScript = '' - start_all() - - mysql.wait_for_unit("mysql") - mysql.succeed("echo 'use empty_testdb;' | mysql -u root") - mysql.succeed("echo 'use testdb; select * from tests;' | mysql -u root -N | grep 4") - # ';' acts as no-op, just check whether login succeeds with the user created from the initialScript - mysql.succeed("echo ';' | mysql -u passworduser --password=password123") - - mysql80.wait_for_unit("mysql") - mysql80.succeed("echo 'use empty_testdb;' | mysql -u root") - mysql80.succeed("echo 'use testdb; select * from tests;' | mysql -u root -N | grep 4") - # ';' acts as no-op, just check whether login succeeds with the user created from the initialScript - mysql80.succeed("echo ';' | mysql -u passworduser --password=password123") - - mariadb.wait_for_unit("mysql") - mariadb.succeed( - "echo 'use testdb; create table tests (test_id INT, PRIMARY KEY (test_id));' | sudo -u testuser mysql -u testuser" - ) - mariadb.succeed( - "echo 'use testdb; insert into tests values (42);' | sudo -u testuser mysql -u testuser" - ) - # Ensure testuser2 is not able to insert into testdb as mysql testuser2 - mariadb.fail( - "echo 'use testdb; insert into tests values (23);' | sudo -u testuser2 mysql -u testuser2" - ) - # Ensure testuser2 is not able to authenticate as mysql testuser - mariadb.fail( - "echo 'use testdb; insert into tests values (23);' | sudo -u testuser2 mysql -u testuser" - ) - mariadb.succeed( - "echo 'use testdb; select test_id from tests;' | sudo -u testuser mysql -u testuser -N | grep 42" - ) - - # Check if TokuDB plugin works - mariadb.succeed( - "echo 'use testdb; create table tokudb (test_id INT, PRIMARY KEY (test_id)) ENGINE = TokuDB;' | sudo -u testuser mysql -u testuser" - ) - mariadb.succeed( - "echo 'use testdb; insert into tokudb values (25);' | sudo -u testuser mysql -u testuser" - ) - mariadb.succeed( - "echo 'use testdb; select test_id from tokudb;' | sudo -u testuser mysql -u testuser -N | grep 25" - ) - mariadb.succeed( - "echo 'use testdb; drop table tokudb;' | sudo -u testuser mysql -u testuser" - ) - - # Check if RocksDB plugin works - mariadb.succeed( - "echo 'use testdb; create table rocksdb (test_id INT, PRIMARY KEY (test_id)) ENGINE = RocksDB;' | sudo -u testuser mysql -u testuser" - ) - mariadb.succeed( - "echo 'use testdb; insert into rocksdb values (28);' | sudo -u testuser mysql -u testuser" - ) - mariadb.succeed( - "echo 'use testdb; select test_id from rocksdb;' | sudo -u testuser mysql -u testuser -N | grep 28" - ) - mariadb.succeed( - "echo 'use testdb; drop table rocksdb;' | sudo -u testuser mysql -u testuser" - ) - ''; -}) diff --git a/nixos/tests/mysql/mysql-autobackup.nix b/nixos/tests/mysql/mysql-autobackup.nix new file mode 100644 index 00000000000..65576e52a53 --- /dev/null +++ b/nixos/tests/mysql/mysql-autobackup.nix @@ -0,0 +1,38 @@ +import ./../make-test-python.nix ({ pkgs, lib, ... }: + +{ + name = "automysqlbackup"; + meta.maintainers = [ lib.maintainers.aanderse ]; + + machine = + { pkgs, ... }: + { + services.mysql.enable = true; + services.mysql.package = pkgs.mysql; + services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ]; + + services.automysqlbackup.enable = true; + }; + + testScript = '' + start_all() + + # Need to have mysql started so that it can be populated with data. + machine.wait_for_unit("mysql.service") + + with subtest("Wait for testdb to be fully populated (5 rows)."): + machine.wait_until_succeeds( + "mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5" + ) + + with subtest("Do a backup and wait for it to start"): + machine.start_job("automysqlbackup.service") + machine.wait_for_job("automysqlbackup.service") + + with subtest("wait for backup file and check that data appears in backup"): + machine.wait_for_file("/var/backup/mysql/daily/testdb") + machine.succeed( + "${pkgs.gzip}/bin/zcat /var/backup/mysql/daily/testdb/daily_testdb_*.sql.gz | grep hello" + ) + ''; +}) diff --git a/nixos/tests/mysql/mysql-backup.nix b/nixos/tests/mysql/mysql-backup.nix new file mode 100644 index 00000000000..c4c1079a8a6 --- /dev/null +++ b/nixos/tests/mysql/mysql-backup.nix @@ -0,0 +1,56 @@ +# Test whether mysqlBackup option works +import ./../make-test-python.nix ({ pkgs, ... } : { + name = "mysql-backup"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ rvl ]; + }; + + nodes = { + master = { pkgs, ... }: { + services.mysql = { + enable = true; + initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ]; + package = pkgs.mysql; + }; + + services.mysqlBackup = { + enable = true; + databases = [ "doesnotexist" "testdb" ]; + }; + }; + }; + + testScript = '' + start_all() + + # Delete backup file that may be left over from a previous test run. + # This is not needed on Hydra but useful for repeated local test runs. + master.execute("rm -f /var/backup/mysql/testdb.gz") + + # Need to have mysql started so that it can be populated with data. + master.wait_for_unit("mysql.service") + + # Wait for testdb to be fully populated (5 rows). + master.wait_until_succeeds( + "mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5" + ) + + # Do a backup and wait for it to start + master.start_job("mysql-backup.service") + master.wait_for_unit("mysql-backup.service") + + # wait for backup to fail, because of database 'doesnotexist' + master.wait_until_fails("systemctl is-active -q mysql-backup.service") + + # wait for backup file and check that data appears in backup + master.wait_for_file("/var/backup/mysql/testdb.gz") + master.succeed( + "${pkgs.gzip}/bin/zcat /var/backup/mysql/testdb.gz | grep hello" + ) + + # Check that a failed backup is logged + master.succeed( + "journalctl -u mysql-backup.service | grep 'fail.*doesnotexist' > /dev/null" + ) + ''; +}) diff --git a/nixos/tests/mysql/mysql-replication.nix b/nixos/tests/mysql/mysql-replication.nix new file mode 100644 index 00000000000..81038dccd94 --- /dev/null +++ b/nixos/tests/mysql/mysql-replication.nix @@ -0,0 +1,89 @@ +import ./../make-test-python.nix ({ pkgs, ...} : + +let + replicateUser = "replicate"; + replicatePassword = "secret"; +in + +{ + name = "mysql-replication"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ eelco shlevy ]; + }; + + nodes = { + master = + { pkgs, ... }: + + { + services.mysql.enable = true; + services.mysql.package = pkgs.mysql; + services.mysql.replication.role = "master"; + services.mysql.replication.slaveHost = "%"; + services.mysql.replication.masterUser = replicateUser; + services.mysql.replication.masterPassword = replicatePassword; + services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ]; + networking.firewall.allowedTCPPorts = [ 3306 ]; + }; + + slave1 = + { pkgs, nodes, ... }: + + { + services.mysql.enable = true; + services.mysql.package = pkgs.mysql; + services.mysql.replication.role = "slave"; + services.mysql.replication.serverId = 2; + services.mysql.replication.masterHost = nodes.master.config.networking.hostName; + services.mysql.replication.masterUser = replicateUser; + services.mysql.replication.masterPassword = replicatePassword; + }; + + slave2 = + { pkgs, nodes, ... }: + + { + services.mysql.enable = true; + services.mysql.package = pkgs.mysql; + services.mysql.replication.role = "slave"; + services.mysql.replication.serverId = 3; + services.mysql.replication.masterHost = nodes.master.config.networking.hostName; + services.mysql.replication.masterUser = replicateUser; + services.mysql.replication.masterPassword = replicatePassword; + }; + }; + + testScript = '' + master.start() + master.wait_for_unit("mysql") + master.wait_for_open_port(3306) + # Wait for testdb to be fully populated (5 rows). + master.wait_until_succeeds( + "mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5" + ) + + slave1.start() + slave2.start() + slave1.wait_for_unit("mysql") + slave1.wait_for_open_port(3306) + slave2.wait_for_unit("mysql") + slave2.wait_for_open_port(3306) + + # wait for replications to finish + slave1.wait_until_succeeds( + "mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5" + ) + slave2.wait_until_succeeds( + "mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5" + ) + + slave2.succeed("systemctl stop mysql") + master.succeed("echo 'insert into testdb.tests values (123, 456);' | mysql -u root -N") + slave2.succeed("systemctl start mysql") + slave2.wait_for_unit("mysql") + slave2.wait_for_open_port(3306) + slave2.wait_until_succeeds( + "echo 'select * from testdb.tests where Id = 123;' | mysql -u root -N | grep 456" + ) + ''; +}) diff --git a/nixos/tests/mysql/mysql.nix b/nixos/tests/mysql/mysql.nix new file mode 100644 index 00000000000..d236ce94632 --- /dev/null +++ b/nixos/tests/mysql/mysql.nix @@ -0,0 +1,143 @@ +import ./../make-test-python.nix ({ pkgs, ...} : { + name = "mysql"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ eelco shlevy ]; + }; + + nodes = { + mysql = + { pkgs, ... }: + + { + services.mysql.enable = true; + services.mysql.initialDatabases = [ + { name = "testdb"; schema = ./testdb.sql; } + { name = "empty_testdb"; } + ]; + # note that using pkgs.writeText here is generally not a good idea, + # as it will store the password in world-readable /nix/store ;) + services.mysql.initialScript = pkgs.writeText "mysql-init.sql" '' + CREATE USER 'passworduser'@'localhost' IDENTIFIED BY 'password123'; + ''; + services.mysql.package = pkgs.mysql57; + }; + + mysql80 = + { pkgs, ... }: + + { + # prevent oom: + # Kernel panic - not syncing: Out of memory: compulsory panic_on_oom is enabled + virtualisation.memorySize = 1024; + + services.mysql.enable = true; + services.mysql.initialDatabases = [ + { name = "testdb"; schema = ./testdb.sql; } + { name = "empty_testdb"; } + ]; + # note that using pkgs.writeText here is generally not a good idea, + # as it will store the password in world-readable /nix/store ;) + services.mysql.initialScript = pkgs.writeText "mysql-init.sql" '' + CREATE USER 'passworduser'@'localhost' IDENTIFIED BY 'password123'; + ''; + services.mysql.package = pkgs.mysql80; + }; + + mariadb = + { pkgs, ... }: + + { + users.users.testuser = { }; + users.users.testuser2 = { }; + services.mysql.enable = true; + services.mysql.initialScript = pkgs.writeText "mariadb-init.sql" '' + ALTER USER root@localhost IDENTIFIED WITH unix_socket; + DELETE FROM mysql.user WHERE password = ''' AND plugin = '''; + DELETE FROM mysql.user WHERE user = '''; + FLUSH PRIVILEGES; + ''; + services.mysql.ensureDatabases = [ "testdb" "testdb2" ]; + services.mysql.ensureUsers = [{ + name = "testuser"; + ensurePermissions = { + "testdb.*" = "ALL PRIVILEGES"; + }; + } { + name = "testuser2"; + ensurePermissions = { + "testdb2.*" = "ALL PRIVILEGES"; + }; + }]; + services.mysql.settings = { + mysqld = { + plugin-load-add = [ "ha_tokudb.so" "ha_rocksdb.so" ]; + }; + }; + services.mysql.package = pkgs.mariadb; + }; + + }; + + testScript = '' + start_all() + + mysql.wait_for_unit("mysql") + mysql.succeed("echo 'use empty_testdb;' | mysql -u root") + mysql.succeed("echo 'use testdb; select * from tests;' | mysql -u root -N | grep 4") + # ';' acts as no-op, just check whether login succeeds with the user created from the initialScript + mysql.succeed("echo ';' | mysql -u passworduser --password=password123") + + mysql80.wait_for_unit("mysql") + mysql80.succeed("echo 'use empty_testdb;' | mysql -u root") + mysql80.succeed("echo 'use testdb; select * from tests;' | mysql -u root -N | grep 4") + # ';' acts as no-op, just check whether login succeeds with the user created from the initialScript + mysql80.succeed("echo ';' | mysql -u passworduser --password=password123") + + mariadb.wait_for_unit("mysql") + mariadb.succeed( + "echo 'use testdb; create table tests (test_id INT, PRIMARY KEY (test_id));' | sudo -u testuser mysql -u testuser" + ) + mariadb.succeed( + "echo 'use testdb; insert into tests values (42);' | sudo -u testuser mysql -u testuser" + ) + # Ensure testuser2 is not able to insert into testdb as mysql testuser2 + mariadb.fail( + "echo 'use testdb; insert into tests values (23);' | sudo -u testuser2 mysql -u testuser2" + ) + # Ensure testuser2 is not able to authenticate as mysql testuser + mariadb.fail( + "echo 'use testdb; insert into tests values (23);' | sudo -u testuser2 mysql -u testuser" + ) + mariadb.succeed( + "echo 'use testdb; select test_id from tests;' | sudo -u testuser mysql -u testuser -N | grep 42" + ) + + # Check if TokuDB plugin works + mariadb.succeed( + "echo 'use testdb; create table tokudb (test_id INT, PRIMARY KEY (test_id)) ENGINE = TokuDB;' | sudo -u testuser mysql -u testuser" + ) + mariadb.succeed( + "echo 'use testdb; insert into tokudb values (25);' | sudo -u testuser mysql -u testuser" + ) + mariadb.succeed( + "echo 'use testdb; select test_id from tokudb;' | sudo -u testuser mysql -u testuser -N | grep 25" + ) + mariadb.succeed( + "echo 'use testdb; drop table tokudb;' | sudo -u testuser mysql -u testuser" + ) + + # Check if RocksDB plugin works + mariadb.succeed( + "echo 'use testdb; create table rocksdb (test_id INT, PRIMARY KEY (test_id)) ENGINE = RocksDB;' | sudo -u testuser mysql -u testuser" + ) + mariadb.succeed( + "echo 'use testdb; insert into rocksdb values (28);' | sudo -u testuser mysql -u testuser" + ) + mariadb.succeed( + "echo 'use testdb; select test_id from rocksdb;' | sudo -u testuser mysql -u testuser -N | grep 28" + ) + mariadb.succeed( + "echo 'use testdb; drop table rocksdb;' | sudo -u testuser mysql -u testuser" + ) + ''; +}) diff --git a/nixos/tests/mysql/testdb.sql b/nixos/tests/mysql/testdb.sql new file mode 100644 index 00000000000..3c68c49ae82 --- /dev/null +++ b/nixos/tests/mysql/testdb.sql @@ -0,0 +1,11 @@ +create table tests +( Id INTEGER NOT NULL, + Name VARCHAR(255) NOT NULL, + primary key(Id) +); + +insert into tests values (1, 'a'); +insert into tests values (2, 'b'); +insert into tests values (3, 'c'); +insert into tests values (4, 'd'); +insert into tests values (5, 'hello'); diff --git a/nixos/tests/testdb.sql b/nixos/tests/testdb.sql deleted file mode 100644 index 3c68c49ae82..00000000000 --- a/nixos/tests/testdb.sql +++ /dev/null @@ -1,11 +0,0 @@ -create table tests -( Id INTEGER NOT NULL, - Name VARCHAR(255) NOT NULL, - primary key(Id) -); - -insert into tests values (1, 'a'); -insert into tests values (2, 'b'); -insert into tests values (3, 'c'); -insert into tests values (4, 'd'); -insert into tests values (5, 'hello'); -- cgit v1.2.3 From db71f2e306fc2f98e2ed1b6a772a18f31bc3f1c8 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 5 Apr 2020 21:39:35 +0300 Subject: nixos/tests: add check mariadb galera cluster with mariabackup-based SST --- nixos/tests/all-tests.nix | 1 + nixos/tests/mysql/mariadb-galera-mariabackup.nix | 223 +++++++++++++++++++++++ 2 files changed, 224 insertions(+) create mode 100644 nixos/tests/mysql/mariadb-galera-mariabackup.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 8857d191a49..978679e31f5 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -175,6 +175,7 @@ in magnetico = handleTest ./magnetico.nix {}; magic-wormhole-mailbox-server = handleTest ./magic-wormhole-mailbox-server.nix {}; mailcatcher = handleTest ./mailcatcher.nix {}; + mariadb-galera-mariabackup = handleTest ./mysql/mariadb-galera-mariabackup.nix {}; mathics = handleTest ./mathics.nix {}; matomo = handleTest ./matomo.nix {}; matrix-synapse = handleTest ./matrix-synapse.nix {}; diff --git a/nixos/tests/mysql/mariadb-galera-mariabackup.nix b/nixos/tests/mysql/mariadb-galera-mariabackup.nix new file mode 100644 index 00000000000..73abf6c555f --- /dev/null +++ b/nixos/tests/mysql/mariadb-galera-mariabackup.nix @@ -0,0 +1,223 @@ +import ./../make-test-python.nix ({ pkgs, ...} : + +let + mysqlenv-common = pkgs.buildEnv { name = "mysql-path-env-common"; pathsToLink = [ "/bin" ]; paths = with pkgs; [ bash gawk gnutar inetutils which ]; }; + mysqlenv-mariabackup = pkgs.buildEnv { name = "mysql-path-env-mariabackup"; pathsToLink = [ "/bin" ]; paths = with pkgs; [ gzip iproute netcat procps pv socat ]; }; + +in { + name = "mariadb-galera-mariabackup"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ izorkin ]; + }; + + # The test creates a Galera cluster with 3 nodes and is checking if mariabackup-based SST works. The cluster is tested by creating a DB and an empty table on one node, + # and checking the table's presence on the other node. + + nodes = { + galera_01 = + { pkgs, ... }: + { + networking = { + interfaces.eth1 = { + ipv4.addresses = [ + { address = "192.168.1.1"; prefixLength = 24; } + ]; + }; + extraHosts = '' + 192.168.1.1 galera_01 + 192.168.1.2 galera_02 + 192.168.1.3 galera_03 + ''; + firewall.allowedTCPPorts = [ 3306 4444 4567 4568 ]; + firewall.allowedUDPPorts = [ 4567 ]; + }; + users.users.testuser = { }; + systemd.services.mysql = with pkgs; { + path = [ mysqlenv-common mysqlenv-mariabackup ]; + }; + services.mysql = { + enable = true; + package = pkgs.mariadb; + ensureDatabases = [ "testdb" ]; + ensureUsers = [{ + name = "testuser"; + ensurePermissions = { + "testdb.*" = "ALL PRIVILEGES"; + }; + }]; + initialScript = pkgs.writeText "mariadb-init.sql" '' + GRANT ALL PRIVILEGES ON *.* TO 'check_repl'@'localhost' IDENTIFIED BY 'check_pass' WITH GRANT OPTION; + FLUSH PRIVILEGES; + ''; + settings = { + mysqld = { + bind_address = "0.0.0.0"; + }; + galera = { + wsrep_on = "ON"; + wsrep_debug = "OFF"; + wsrep_retry_autocommit = "3"; + wsrep_provider = "${pkgs.mariadb-galera_25}/lib/galera/libgalera_smm.so"; + wsrep_cluster_address = "gcomm://"; + wsrep_cluster_name = "galera"; + wsrep_node_address = "192.168.1.1"; + wsrep_node_name = "galera_01"; + wsrep_sst_method = "mariabackup"; + wsrep_sst_auth = "check_repl:check_pass"; + binlog_format = "ROW"; + enforce_storage_engine = "InnoDB"; + innodb_autoinc_lock_mode = "2"; + }; + }; + }; + }; + + galera_02 = + { pkgs, ... }: + { + networking = { + interfaces.eth1 = { + ipv4.addresses = [ + { address = "192.168.1.2"; prefixLength = 24; } + ]; + }; + extraHosts = '' + 192.168.1.1 galera_01 + 192.168.1.2 galera_02 + 192.168.1.3 galera_03 + ''; + firewall.allowedTCPPorts = [ 3306 4444 4567 4568 ]; + firewall.allowedUDPPorts = [ 4567 ]; + }; + users.users.testuser = { }; + systemd.services.mysql = with pkgs; { + path = [ mysqlenv-common mysqlenv-mariabackup ]; + }; + services.mysql = { + enable = true; + package = pkgs.mariadb; + settings = { + mysqld = { + bind_address = "0.0.0.0"; + }; + galera = { + wsrep_on = "ON"; + wsrep_debug = "OFF"; + wsrep_retry_autocommit = "3"; + wsrep_provider = "${pkgs.mariadb-galera_25}/lib/galera/libgalera_smm.so"; + wsrep_cluster_address = "gcomm://galera_01,galera_02,galera_03"; + wsrep_cluster_name = "galera"; + wsrep_node_address = "192.168.1.2"; + wsrep_node_name = "galera_02"; + wsrep_sst_method = "mariabackup"; + wsrep_sst_auth = "check_repl:check_pass"; + binlog_format = "ROW"; + enforce_storage_engine = "InnoDB"; + innodb_autoinc_lock_mode = "2"; + }; + }; + }; + }; + + galera_03 = + { pkgs, ... }: + { + networking = { + interfaces.eth1 = { + ipv4.addresses = [ + { address = "192.168.1.3"; prefixLength = 24; } + ]; + }; + extraHosts = '' + 192.168.1.1 galera_01 + 192.168.1.2 galera_02 + 192.168.1.3 galera_03 + ''; + firewall.allowedTCPPorts = [ 3306 4444 4567 4568 ]; + firewall.allowedUDPPorts = [ 4567 ]; + }; + users.users.testuser = { }; + systemd.services.mysql = with pkgs; { + path = [ mysqlenv-common mysqlenv-mariabackup ]; + }; + services.mysql = { + enable = true; + package = pkgs.mariadb; + settings = { + mysqld = { + bind_address = "0.0.0.0"; + }; + galera = { + wsrep_on = "ON"; + wsrep_debug = "OFF"; + wsrep_retry_autocommit = "3"; + wsrep_provider = "${pkgs.mariadb-galera_25}/lib/galera/libgalera_smm.so"; + wsrep_cluster_address = "gcomm://galera_01,galera_02,galera_03"; + wsrep_cluster_name = "galera"; + wsrep_node_address = "192.168.1.3"; + wsrep_node_name = "galera_03"; + wsrep_sst_method = "mariabackup"; + wsrep_sst_auth = "check_repl:check_pass"; + binlog_format = "ROW"; + enforce_storage_engine = "InnoDB"; + innodb_autoinc_lock_mode = "2"; + }; + }; + }; + }; + }; + + testScript = '' + galera_01.start() + galera_01.wait_for_unit("mysql") + galera_01.wait_for_open_port(3306) + galera_01.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; create table db1 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" + ) + galera_01.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db1 values (37);'" + ) + galera_02.start() + galera_02.wait_for_unit("mysql") + galera_02.wait_for_open_port(3306) + galera_03.start() + galera_03.wait_for_unit("mysql") + galera_03.wait_for_open_port(3306) + galera_02.succeed( + "sudo -u testuser mysql -u root -e 'use testdb; select test_id from db1;' -N | grep 37" + ) + galera_02.succeed( + "sudo -u testuser mysql -u root -e 'use testdb; create table db2 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" + ) + galera_02.succeed("systemctl stop mysql") + galera_01.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db2 values (38);'" + ) + galera_03.succeed( + "sudo -u testuser mysql -u root -e 'use testdb; create table db3 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" + ) + galera_01.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db3 values (39);'" + ) + galera_02.succeed("systemctl start mysql") + galera_02.wait_for_open_port(3306) + galera_02.succeed( + "sudo -u testuser mysql -u root -e 'show status' -N | grep 'wsrep_cluster_size.*3'" + ) + galera_03.succeed( + "sudo -u testuser mysql -u root -e 'show status' -N | grep 'wsrep_local_state_comment.*Synced'" + ) + galera_01.succeed( + "sudo -u testuser mysql -u root -e 'use testdb; select test_id from db3;' -N | grep 39" + ) + galera_02.succeed( + "sudo -u testuser mysql -u root -e 'use testdb; select test_id from db2;' -N | grep 38" + ) + galera_03.succeed( + "sudo -u testuser mysql -u root -e 'use testdb; select test_id from db1;' -N | grep 37" + ) + galera_01.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db3;'") + galera_02.succeed("sudo -u testuser mysql -u root -e 'use testdb; drop table db2;'") + galera_03.succeed("sudo -u testuser mysql -u root -e 'use testdb; drop table db1;'") + ''; +}) -- cgit v1.2.3 From 300c3f99905a19708cc297dca6e972530dffc1f9 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Sun, 5 Apr 2020 21:58:27 +0300 Subject: nixos/tests: add check mariadb galera cluster with rsync-based SST --- nixos/tests/all-tests.nix | 1 + nixos/tests/mysql/mariadb-galera-rsync.nix | 216 +++++++++++++++++++++++++++++ pkgs/servers/sql/mariadb/default.nix | 7 +- 3 files changed, 223 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/mysql/mariadb-galera-rsync.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 978679e31f5..3aa33bbe2e6 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -176,6 +176,7 @@ in magic-wormhole-mailbox-server = handleTest ./magic-wormhole-mailbox-server.nix {}; mailcatcher = handleTest ./mailcatcher.nix {}; mariadb-galera-mariabackup = handleTest ./mysql/mariadb-galera-mariabackup.nix {}; + mariadb-galera-rsync = handleTest ./mysql/mariadb-galera-rsync.nix {}; mathics = handleTest ./mathics.nix {}; matomo = handleTest ./matomo.nix {}; matrix-synapse = handleTest ./matrix-synapse.nix {}; diff --git a/nixos/tests/mysql/mariadb-galera-rsync.nix b/nixos/tests/mysql/mariadb-galera-rsync.nix new file mode 100644 index 00000000000..cacae4569b5 --- /dev/null +++ b/nixos/tests/mysql/mariadb-galera-rsync.nix @@ -0,0 +1,216 @@ +import ./../make-test-python.nix ({ pkgs, ...} : + +let + mysqlenv-common = pkgs.buildEnv { name = "mysql-path-env-common"; pathsToLink = [ "/bin" ]; paths = with pkgs; [ bash gawk gnutar inetutils which ]; }; + mysqlenv-rsync = pkgs.buildEnv { name = "mysql-path-env-rsync"; pathsToLink = [ "/bin" ]; paths = with pkgs; [ lsof procps rsync stunnel ]; }; + +in { + name = "mariadb-galera-rsync"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ izorkin ]; + }; + + # The test creates a Galera cluster with 3 nodes and is checking if rsync-based SST works. The cluster is tested by creating a DB and an empty table on one node, + # and checking the table's presence on the other node. + + nodes = { + galera_04 = + { pkgs, ... }: + { + networking = { + interfaces.eth1 = { + ipv4.addresses = [ + { address = "192.168.2.1"; prefixLength = 24; } + ]; + }; + extraHosts = '' + 192.168.2.1 galera_04 + 192.168.2.2 galera_05 + 192.168.2.3 galera_06 + ''; + firewall.allowedTCPPorts = [ 3306 4444 4567 4568 ]; + firewall.allowedUDPPorts = [ 4567 ]; + }; + users.users.testuser = { }; + systemd.services.mysql = with pkgs; { + path = [ mysqlenv-common mysqlenv-rsync ]; + }; + services.mysql = { + enable = true; + package = pkgs.mariadb; + ensureDatabases = [ "testdb" ]; + ensureUsers = [{ + name = "testuser"; + ensurePermissions = { + "testdb.*" = "ALL PRIVILEGES"; + }; + }]; + settings = { + mysqld = { + bind_address = "0.0.0.0"; + }; + galera = { + wsrep_on = "ON"; + wsrep_debug = "OFF"; + wsrep_retry_autocommit = "3"; + wsrep_provider = "${pkgs.mariadb-galera_25}/lib/galera/libgalera_smm.so"; + wsrep_cluster_address = "gcomm://"; + wsrep_cluster_name = "galera-rsync"; + wsrep_node_address = "192.168.2.1"; + wsrep_node_name = "galera_04"; + wsrep_sst_method = "rsync"; + binlog_format = "ROW"; + enforce_storage_engine = "InnoDB"; + innodb_autoinc_lock_mode = "2"; + }; + }; + }; + }; + + galera_05 = + { pkgs, ... }: + { + networking = { + interfaces.eth1 = { + ipv4.addresses = [ + { address = "192.168.2.2"; prefixLength = 24; } + ]; + }; + extraHosts = '' + 192.168.2.1 galera_04 + 192.168.2.2 galera_05 + 192.168.2.3 galera_06 + ''; + firewall.allowedTCPPorts = [ 3306 4444 4567 4568 ]; + firewall.allowedUDPPorts = [ 4567 ]; + }; + users.users.testuser = { }; + systemd.services.mysql = with pkgs; { + path = [ mysqlenv-common mysqlenv-rsync ]; + }; + services.mysql = { + enable = true; + package = pkgs.mariadb; + settings = { + mysqld = { + bind_address = "0.0.0.0"; + }; + galera = { + wsrep_on = "ON"; + wsrep_debug = "OFF"; + wsrep_retry_autocommit = "3"; + wsrep_provider = "${pkgs.mariadb-galera_25}/lib/galera/libgalera_smm.so"; + wsrep_cluster_address = "gcomm://galera_04,galera_05,galera_06"; + wsrep_cluster_name = "galera-rsync"; + wsrep_node_address = "192.168.2.2"; + wsrep_node_name = "galera_05"; + wsrep_sst_method = "rsync"; + binlog_format = "ROW"; + enforce_storage_engine = "InnoDB"; + innodb_autoinc_lock_mode = "2"; + }; + }; + }; + }; + + galera_06 = + { pkgs, ... }: + { + networking = { + interfaces.eth1 = { + ipv4.addresses = [ + { address = "192.168.2.3"; prefixLength = 24; } + ]; + }; + extraHosts = '' + 192.168.2.1 galera_04 + 192.168.2.2 galera_05 + 192.168.2.3 galera_06 + ''; + firewall.allowedTCPPorts = [ 3306 4444 4567 4568 ]; + firewall.allowedUDPPorts = [ 4567 ]; + }; + users.users.testuser = { }; + systemd.services.mysql = with pkgs; { + path = [ mysqlenv-common mysqlenv-rsync ]; + }; + services.mysql = { + enable = true; + package = pkgs.mariadb; + settings = { + mysqld = { + bind_address = "0.0.0.0"; + }; + galera = { + wsrep_on = "ON"; + wsrep_debug = "OFF"; + wsrep_retry_autocommit = "3"; + wsrep_provider = "${pkgs.mariadb-galera_25}/lib/galera/libgalera_smm.so"; + wsrep_cluster_address = "gcomm://galera_04,galera_05,galera_06"; + wsrep_cluster_name = "galera-rsync"; + wsrep_node_address = "192.168.2.3"; + wsrep_node_name = "galera_06"; + wsrep_sst_method = "rsync"; + binlog_format = "ROW"; + enforce_storage_engine = "InnoDB"; + innodb_autoinc_lock_mode = "2"; + }; + }; + }; + }; + }; + + testScript = '' + galera_04.start() + galera_04.wait_for_unit("mysql") + galera_04.wait_for_open_port(3306) + galera_04.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; create table db1 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" + ) + galera_04.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db1 values (41);'" + ) + galera_05.start() + galera_05.wait_for_unit("mysql") + galera_05.wait_for_open_port(3306) + galera_06.start() + galera_06.wait_for_unit("mysql") + galera_06.wait_for_open_port(3306) + galera_05.succeed( + "sudo -u testuser mysql -u root -e 'use testdb; select test_id from db1;' -N | grep 41" + ) + galera_05.succeed( + "sudo -u testuser mysql -u root -e 'use testdb; create table db2 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" + ) + galera_05.succeed("systemctl stop mysql") + galera_04.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db2 values (42);'" + ) + galera_06.succeed( + "sudo -u testuser mysql -u root -e 'use testdb; create table db3 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" + ) + galera_04.succeed( + "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db3 values (43);'" + ) + galera_05.succeed("systemctl start mysql") + galera_05.wait_for_open_port(3306) + galera_05.succeed( + "sudo -u testuser mysql -u root -e 'show status' -N | grep 'wsrep_cluster_size.*3'" + ) + galera_06.succeed( + "sudo -u testuser mysql -u root -e 'show status' -N | grep 'wsrep_local_state_comment.*Synced'" + ) + galera_04.succeed( + "sudo -u testuser mysql -u root -e 'use testdb; select test_id from db3;' -N | grep 43" + ) + galera_05.succeed( + "sudo -u testuser mysql -u root -e 'use testdb; select test_id from db2;' -N | grep 42" + ) + galera_06.succeed( + "sudo -u testuser mysql -u root -e 'use testdb; select test_id from db1;' -N | grep 41" + ) + galera_04.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db3;'") + galera_05.succeed("sudo -u testuser mysql -u root -e 'use testdb; drop table db2;'") + galera_06.succeed("sudo -u testuser mysql -u root -e 'use testdb; drop table db1;'") + ''; +}) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index ea11faf1efc..ad9397a8bc3 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses +{ stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses, nixosTests , libiconv, openssl, pcre, boost, judy, bison, libxml2, libkrb5, linux-pam, curl , libaio, libevent, jemalloc450, jemalloc, cracklib, systemd, perl , bzip2, lz4, lzo, snappy, xz, zlib, zstd @@ -101,6 +101,11 @@ common = rec { # attributes common to both builds passthru.mysqlVersion = "5.7"; + passthru.tests = { + mariadb-galera-mariabackup = nixosTests.mariadb-galera-mariabackup; + mariadb-galera-rsync = nixosTests.mariadb-galera-rsync; + }; + meta = { description = "An enhanced, drop-in replacement for MySQL"; -- cgit v1.2.3 From 585bbc598c1787090fd8e144339dff77d10d02cf Mon Sep 17 00:00:00 2001 From: Izorkin Date: Wed, 6 May 2020 14:02:41 +0300 Subject: mariadb: add link to all mysql tests --- pkgs/servers/sql/mariadb/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index ad9397a8bc3..9b5118eacc3 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -104,6 +104,10 @@ common = rec { # attributes common to both builds passthru.tests = { mariadb-galera-mariabackup = nixosTests.mariadb-galera-mariabackup; mariadb-galera-rsync = nixosTests.mariadb-galera-rsync; + mysql = nixosTests.mysql; + mysql-autobackup = nixosTests.mysql-autobackup; + mysql-backup = nixosTests.mysql-backup; + mysql-replication = nixosTests.mysql-replication; }; meta = { -- cgit v1.2.3 From 3b6e220303e32c9aa9b0d9ea7ce6500634d7216b Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Wed, 6 May 2020 12:51:18 +0000 Subject: hugo: 0.69.2 -> 0.70.0 --- pkgs/applications/misc/hugo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index e58c933b84b..f0e191097d5 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "hugo"; - version = "0.69.2"; + version = "0.70.0"; goPackagePath = "github.com/gohugoio/hugo"; @@ -10,10 +10,10 @@ buildGoModule rec { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "0bw31264q8w2r3fm3g2qjh9531nmbn942vl5rjf2cjff25c0d4ji"; + sha256 = "14g1x95jh91z9xm3xkv2psw2jn7z6bv2009miyv727df4d58nh6m"; }; - modSha256 = "1i1mw8jcklmnsqawc1jkgw4h1dxjxb9zaf2p8pgfzxzpy5cp6qkl"; + modSha256 = "015ha8pjz1fv8qg558xa6hl52fp2qd486ir9m01dvxw63xqx76ss"; buildFlags = [ "-tags" "extended" ]; -- cgit v1.2.3 From 22c5473ff099af876f806821a48c4bba41682e74 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Wed, 6 May 2020 13:52:10 +0000 Subject: tokei: 11.1.0 -> 11.1.1 --- pkgs/development/tools/misc/tokei/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/tokei/default.nix b/pkgs/development/tools/misc/tokei/default.nix index 9b84a713af5..ca625a28c94 100644 --- a/pkgs/development/tools/misc/tokei/default.nix +++ b/pkgs/development/tools/misc/tokei/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tokei"; - version = "11.1.0"; + version = "11.1.1"; src = fetchFromGitHub { owner = "XAMPPRocky"; repo = pname; rev = "v${version}"; - sha256 = "11nmh2b7pal67nhcygp5gpzf3n158671fjjxw0vwjgrb87hkdry9"; + sha256 = "1sribqcyalgl66im92pmla0hnp07zvg3pbxxakm7jk5l6p13wiw3"; }; - cargoSha256 = "1axfkyghf6gzv24is4n6kgc28nx0d6laqpdv7j1xzkf6hdixkch7"; + cargoSha256 = "0jcy3p896ykc6s3m21pnh4jv4lhpvhzlrrl1y67ink2lqkamdhvv"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Security -- cgit v1.2.3 From 6b889a6e5252facfb41d72a697b1837af9757142 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Wed, 6 May 2020 16:41:49 +0200 Subject: python3Packages.mortgage: init at 1.0.5 --- .../python-modules/mortgage/default.nix | 30 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/mortgage/default.nix diff --git a/pkgs/development/python-modules/mortgage/default.nix b/pkgs/development/python-modules/mortgage/default.nix new file mode 100644 index 00000000000..8861a19811f --- /dev/null +++ b/pkgs/development/python-modules/mortgage/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "mortgage"; + version = "1.0.5"; + + src = fetchPypi { + inherit version pname; + hash = "sha256:18fcb356c631e9cc27fa7019f6ff6021707e34b9ce3a3b7dc815661288709921"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + doCheck = false; # No tests in sdist + + disabled = pythonOlder "3.5"; + + meta = { + description = "Mortgage calculator"; + license = lib.licenses.mit; + }; + +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3a6953c701a..43892166543 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -941,6 +941,8 @@ in { python-mpv-jsonipc = callPackage ../development/python-modules/python-mpv-jsonipc { }; + mortgage = callPackage ../development/python-modules/mortgage { }; + msal = callPackage ../development/python-modules/msal { }; msal-extensions = callPackage ../development/python-modules/msal-extensions { }; -- cgit v1.2.3 From 0665c8776a5328f6cfe67ee554452dde5f4f9385 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Wed, 6 May 2020 16:58:58 +0200 Subject: gnutls: fix musl build `musl` produces a different output than `glibc` during some tests, which let's them fail. Using `getpass(3)` under `musl` when `stdin` is not a tty omits the prompt, which the `certtool` test expects to find. See https://gitlab.com/gnutls/gnutls/-/issues/945 --- pkgs/development/libraries/gnutls/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/gnutls/default.nix b/pkgs/development/libraries/gnutls/default.nix index cffd5459b3a..257e56cc18f 100644 --- a/pkgs/development/libraries/gnutls/default.nix +++ b/pkgs/development/libraries/gnutls/default.nix @@ -48,6 +48,8 @@ stdenv.mkDerivation { sed '2iexit 77' -i tests/{pkgconfig,fastopen}.sh sed '/^void doit(void)/,/^{/ s/{/{ exit(77);/' -i tests/{trust-store,psk-file}.c sed 's:/usr/lib64/pkcs11/ /usr/lib/pkcs11/ /usr/lib/x86_64-linux-gnu/pkcs11/:`pkg-config --variable=p11_module_path p11-kit-1`:' -i tests/p11-kit-trust.sh + '' + lib.optionalString stdenv.hostPlatform.isMusl '' # See https://gitlab.com/gnutls/gnutls/-/issues/945 + sed '2iecho "certtool tests skipped in musl build"\nexit 0' -i tests/cert-tests/certtool ''; preConfigure = "patchShebangs ."; -- cgit v1.2.3 From b87b654bdfb2576a5209c36acacb7e2b8c8c5d7b Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Wed, 6 May 2020 12:13:33 -0400 Subject: pythonPackages.deprecation: 2.0.7 -> 2.1.0 --- pkgs/development/python-modules/deprecation/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deprecation/default.nix b/pkgs/development/python-modules/deprecation/default.nix index 7478c18b2c0..fb5698062f7 100644 --- a/pkgs/development/python-modules/deprecation/default.nix +++ b/pkgs/development/python-modules/deprecation/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "deprecation"; - version = "2.0.7"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "1vcjy6flqbzgjh4zhcs0sl83b946wxrlsx5miliz0ik1d9kjyff0"; + sha256 = "1zqqjlgmhgkpzg9ss5ki8wamxl83xn51fs6gn2a8cxsx9vkbvcvj"; }; propagatedBuildInputs = [ packaging ]; -- cgit v1.2.3 From cae48ccad33cbde6675896c10e46db440e80d123 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Wed, 6 May 2020 12:14:13 -0400 Subject: conan: unbreak with deprecation>=2.1 --- pkgs/development/tools/build-managers/conan/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index cc44ac1a220..d9b89cde768 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -90,7 +90,8 @@ in newPython.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace conans/requirements.txt \ - --replace "PyYAML>=3.11, <3.14.0" "PyYAML" + --replace "PyYAML>=3.11, <3.14.0" "PyYAML" \ + --replace "deprecation>=2.0, <2.1" "deprecation" ''; meta = with lib; { -- cgit v1.2.3 From 2e519d1c684f52b04cc66371f7352faf4413e13a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 14:31:16 +0000 Subject: python37Packages.ezdxf: 0.11 -> 0.12 --- pkgs/development/python-modules/ezdxf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ezdxf/default.nix b/pkgs/development/python-modules/ezdxf/default.nix index 0184ae9ffd7..a745566a645 100644 --- a/pkgs/development/python-modules/ezdxf/default.nix +++ b/pkgs/development/python-modules/ezdxf/default.nix @@ -1,7 +1,7 @@ { stdenv, buildPythonPackage, pythonOlder, fetchFromGitHub, pyparsing, pytest }: buildPythonPackage rec { - version = "0.11"; + version = "0.12"; pname = "ezdxf"; disabled = pythonOlder "3.5"; @@ -10,7 +10,7 @@ buildPythonPackage rec { owner = "mozman"; repo = "ezdxf"; rev = "v${version}"; - sha256 = "167iw1j1c6195bwv6i8z1m7s0i27r0y0acxd2w76hvnq3a72jbsd"; + sha256 = "1flcq96ljk5wqrmgsb4acflqzkg7rhlaxz0j5jxky9za0mj1x6dq"; }; checkInputs = [ pytest ]; -- cgit v1.2.3 From 4e2322ae7a243228180471f9bc1cfcf21b829e14 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Fri, 17 Apr 2020 00:03:23 -0400 Subject: python3Packages.neo: init at 0.8.0 --- pkgs/development/python-modules/neo/default.nix | 32 +++++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/neo/default.nix diff --git a/pkgs/development/python-modules/neo/default.nix b/pkgs/development/python-modules/neo/default.nix new file mode 100644 index 00000000000..631beabea8a --- /dev/null +++ b/pkgs/development/python-modules/neo/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, numpy +, quantities +}: + +buildPythonPackage rec { + pname = "neo"; + version = "0.8.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0n74miad4dadavnzi1hqlyzyk795x7qq2adp71i011534ixs70ik"; + }; + + propagatedBuildInputs = [ numpy quantities ]; + + checkInputs = [ nose ]; + + checkPhase = '' + nosetests --exclude=iotest + ''; + + meta = with lib; { + homepage = "https://neuralensemble.org/neo/"; + description = "Package for representing electrophysiology data in Python"; + license = licenses.bsd3; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 43892166543..1f7ae558a50 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -969,6 +969,8 @@ in { ndtypes = callPackage ../development/python-modules/ndtypes { }; + neo = callPackage ../development/python-modules/neo { }; + nest-asyncio = callPackage ../development/python-modules/nest-asyncio { }; neuron = pkgs.neuron.override { -- cgit v1.2.3 From e76a81f19c6654657465fc5b339694e77ff7b0a9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 14:19:29 +0000 Subject: python37Packages.aiohttp-socks: 0.3.7 -> 0.3.9 --- pkgs/development/python-modules/aiohttp-socks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp-socks/default.nix b/pkgs/development/python-modules/aiohttp-socks/default.nix index 392c77036ca..7b0bfe80684 100644 --- a/pkgs/development/python-modules/aiohttp-socks/default.nix +++ b/pkgs/development/python-modules/aiohttp-socks/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "aiohttp-socks"; - version = "0.3.7"; + version = "0.3.9"; src = fetchPypi { inherit version; pname = "aiohttp_socks"; - sha256 = "00zqlkhfrp1jczgjppaksriidyfshnj0jvrcryn1x77dmy73m023"; + sha256 = "1mn2ng66951mri49f99zh3660j83kvqhr6dpx90s9fkjwk83hmjy"; }; propagatedBuildInputs = [ aiohttp attrs ]; -- cgit v1.2.3 From d90344dacbe2cd45498ef64484339b1facf0e0e5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 14:50:29 +0000 Subject: python27Packages.filetype: 1.0.6 -> 1.0.7 --- pkgs/development/python-modules/filetype/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/filetype/default.nix b/pkgs/development/python-modules/filetype/default.nix index 40bbc688e20..4bbb6c41f54 100644 --- a/pkgs/development/python-modules/filetype/default.nix +++ b/pkgs/development/python-modules/filetype/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "filetype"; - version = "1.0.6"; + version = "1.0.7"; src = fetchPypi { inherit pname version; - sha256 = "10985zfx90m527binx3fxvm4nsqmlwf0jj8j8mpbxb8wj8ivkllr"; + sha256 = "19vav4w8vvcnrps1mirjkrv4pr1khwn5ma6m5pgpxd4qip73wffs"; }; checkPhase = '' -- cgit v1.2.3 From 0663a984e75e38f953825b282cbe8dd11cbabb9d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 13:59:52 +0000 Subject: python27Packages.EasyProcess: 0.2.8 -> 0.2.10 --- pkgs/development/python-modules/easyprocess/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/easyprocess/default.nix b/pkgs/development/python-modules/easyprocess/default.nix index 41a4c1a7a2a..878b882810f 100644 --- a/pkgs/development/python-modules/easyprocess/default.nix +++ b/pkgs/development/python-modules/easyprocess/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "EasyProcess"; - version = "0.2.8"; + version = "0.2.10"; src = fetchPypi { inherit pname version; - sha256 = "da7f67a006e2eb63d86a8f3f4baa9d6752dab9676009a67193a4e433f2f41c2a"; + sha256 = "06zaxydyqvb5mk5kxs6y3pjbq5nm6lmi3h5g3y41xpic48q5wsv3"; }; # No tests -- cgit v1.2.3 From abd57f28bfa03da8c32c148069803b5adf744334 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 13:34:52 +0000 Subject: python27Packages.bitstruct: 8.8.1 -> 8.10.0 --- pkgs/development/python-modules/bitstruct/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bitstruct/default.nix b/pkgs/development/python-modules/bitstruct/default.nix index 7c58aab85c4..aff3f70cb88 100644 --- a/pkgs/development/python-modules/bitstruct/default.nix +++ b/pkgs/development/python-modules/bitstruct/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bitstruct"; - version = "8.8.1"; + version = "8.10.0"; src = fetchPypi { inherit pname version; - sha256 = "84893f90eb78f8179af24a87622ef964ede5c7e785562022917033987d6ce198"; + sha256 = "0dncll29a0lx8hn1xlhr32abkvj1rh8xa6gc0aas8wnqzh7bvqqm"; }; meta = with lib; { -- cgit v1.2.3 From 1c7ad58742da72334aebaa339dfa06b247002535 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 May 2020 19:09:31 +0200 Subject: =?UTF-8?q?apt-cacher-ng:=203.2=20=E2=86=92=203.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: CVE-2017-7443, CVE-2020-5202 --- pkgs/servers/http/apt-cacher-ng/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/apt-cacher-ng/default.nix b/pkgs/servers/http/apt-cacher-ng/default.nix index 99dd63c7ce6..f8c4b800204 100644 --- a/pkgs/servers/http/apt-cacher-ng/default.nix +++ b/pkgs/servers/http/apt-cacher-ng/default.nix @@ -4,6 +4,7 @@ , doxygen , fetchurl , fuse +, libevent , lzma , openssl , pkgconfig @@ -14,15 +15,15 @@ stdenv.mkDerivation rec { pname = "apt-cacher-ng"; - version = "3.2"; + version = "3.5"; src = fetchurl { url = "http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_${version}.orig.tar.xz"; - sha256 = "1kas5xq44rx33pczhrz05dsdhjaavxdmcs5h1ygfi76bpqvyhpa0"; + sha256 = "0h76n02nnpg7ir9247qrxb8p4d4p282nh13zrv5bb9sfm12pril2"; }; nativeBuildInputs = [ cmake doxygen pkgconfig ]; - buildInputs = [ bzip2 fuse lzma openssl systemd tcp_wrappers zlib ]; + buildInputs = [ bzip2 fuse libevent lzma openssl systemd tcp_wrappers zlib ]; meta = with stdenv.lib; { description = "A caching proxy specialized for linux distribution files"; -- cgit v1.2.3 From 446af47e7f639824f08c204cc68029a1167a20eb Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 13:24:16 +0000 Subject: python27Packages.cftime: 1.0.4.2 -> 1.1.2 --- pkgs/development/python-modules/cftime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix index 5046017a94d..60946d23a1e 100644 --- a/pkgs/development/python-modules/cftime/default.nix +++ b/pkgs/development/python-modules/cftime/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "cftime"; - version = "1.0.4.2"; + version = "1.1.2"; src = fetchPypi { inherit pname version; - sha256 = "1ac64f8f9066ea756ea27d67cedaf064e7c866275218fa7c84684066a5890f70"; + sha256 = "17w9myl8mg4isv4lb1nv64zim53ishi32f6m5m0s00q9a6v5qfb0"; }; checkInputs = [ pytest coveralls pytestcov ]; -- cgit v1.2.3 From f6eb78110e3c8be49f27b2ad3cfffc3a1f4bc5aa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 13:46:39 +0000 Subject: python37Packages.cmd2: 1.0.1 -> 1.0.2 --- pkgs/development/python-modules/cmd2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index 13f68d6a392..9d58c130582 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "cmd2"; - version = "1.0.1"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "0fjwc095y97n3a7jxl9pk4h1i5hghas7y6zhgprl5lv5ixnicffk"; + sha256 = "1f18plbc9yyvhn0js3d2bii9yld8zfl775gxsaw9jza5pmlg9ss2"; }; LC_ALL="en_US.UTF-8"; -- cgit v1.2.3 From 0a169d1fd189bee5d5559e298b87e16d91415000 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sun, 3 May 2020 00:26:10 -0400 Subject: python27Packages.watchdog: 0.9.0 -> 0.10.2 --- pkgs/development/python-modules/watchdog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/watchdog/default.nix b/pkgs/development/python-modules/watchdog/default.nix index 1e5ab9a9f2f..5347c696cc2 100644 --- a/pkgs/development/python-modules/watchdog/default.nix +++ b/pkgs/development/python-modules/watchdog/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "watchdog"; - version = "0.9.0"; + version = "0.10.2"; src = fetchPypi { inherit pname version; - sha256 = "965f658d0732de3188211932aeb0bb457587f04f63ab4c1e33eab878e9de961d"; + sha256 = "0ss58k33l5vah894lykid6ar6kw7z1f29cl4hzr5xvgs8fvfyq65"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin -- cgit v1.2.3 From 720b590281daed048dc972da35c1c3258fcf0eed Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 00:34:55 +0000 Subject: mpop: 1.4.7 -> 1.4.9 --- pkgs/applications/networking/mpop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mpop/default.nix b/pkgs/applications/networking/mpop/default.nix index b0f6859e69c..8a0980286df 100644 --- a/pkgs/applications/networking/mpop/default.nix +++ b/pkgs/applications/networking/mpop/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mpop"; - version = "1.4.7"; + version = "1.4.9"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "0c6n5afn9pr4p7gxkv462lysrw52w9fhvavzm99c78dcp9dj5xnk"; + sha256 = "0hinmyd4lipy9wi3grwm72vv6xrpf4m08i9g9nlxzxnwfanw885q"; }; nativeBuildInputs = [ pkgconfig ]; -- cgit v1.2.3 From 7311e5ba39edefc670cf51a3f8a0e10717665e62 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 00:21:07 +0000 Subject: mopidy-iris: 3.46.0 -> 3.47.0 --- pkgs/applications/audio/mopidy/iris.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 2badfd6a0b1..742c63b3d83 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "Mopidy-Iris"; - version = "3.46.0"; + version = "3.47.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "0c7b6zbcj4bq5qsxvhjwqclrl1k2hs3wb50pfjbw7gs7m3gm2b7d"; + sha256 = "1lvq5qsnn2djwkgbadzr7rr6ik2xh8yyj0p3y3hck9pl96ms7lfv"; }; propagatedBuildInputs = [ -- cgit v1.2.3 From 1d54df95175ac7826064747702167b610aed0dbd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 01:13:56 +0000 Subject: munin: 2.0.59 -> 2.0.61 --- pkgs/servers/monitoring/munin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 02a81bfe33c..ecbed520bbd 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "2.0.59"; + version = "2.0.61"; pname = "munin"; src = fetchFromGitHub { owner = "munin-monitoring"; repo = "munin"; rev = version; - sha256 = "1i28ba53gh9z0mb3fk0y3cb88wh73qdlbg7rl5g9mc6iwqrbvg97"; + sha256 = "0gjbz8zdj1rdx2azgpdh64isna0l77wm42gr1jhwb5an3lf6sgxs"; }; buildInputs = [ -- cgit v1.2.3 From f03e686f01a3494d3f2e901ada97dcc216807ae8 Mon Sep 17 00:00:00 2001 From: Cody Allen Date: Tue, 5 May 2020 16:47:37 -0700 Subject: metals: 0.8.4 -> 0.9.0 --- pkgs/development/tools/metals/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index 4cd87480070..cf9ce2bd265 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ let baseName = "metals"; - version = "0.8.4"; + version = "0.9.0"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -15,7 +15,7 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1r8aff082m3kh6wy5diyvq8bzg5x4dp1da9sfz223ii0kc1yp6w5"; + outputHash = "116q2jzqlmdhkqvjg31b9ib8w1k7rlr8gmjcr7z32idpn16hqg59"; }; in stdenv.mkDerivation rec { -- cgit v1.2.3 From c911f56354e92096e70fde4dc62f9848a78c6e15 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 00:03:00 +0000 Subject: metabase: 0.35.1 -> 0.35.3 --- pkgs/servers/metabase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index b2e040748ab..5d50f8c9b0c 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.35.1"; + version = "0.35.3"; src = fetchurl { url = "http://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "1c8mxadf8siakhgdkbw5d8r6ph9lqxrw5wlrrc8a5ycp43h0z226"; + sha256 = "1iax99id47a8mkdyr5wp2dwvl0d1lfh9gsamd1m0qpxw9mbvpkbq"; }; nativeBuildInputs = [ makeWrapper ]; -- cgit v1.2.3 From bf707710af3ce32e1206412b60056ec7f6bfc7ee Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 01:20:24 +0000 Subject: nsd: 4.3.0 -> 4.3.1 --- pkgs/servers/dns/nsd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix index d815771c66c..43c2900443e 100644 --- a/pkgs/servers/dns/nsd/default.nix +++ b/pkgs/servers/dns/nsd/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "nsd"; - version = "4.3.0"; + version = "4.3.1"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/${pname}/${pname}-${version}.tar.gz"; - sha256 = "15qy25210j9nq2i3pm8rwphnc6b5gq83js10078fvw9hbmjps03s"; + sha256 = "11w9kl99fs888f3zwx2j92i8lcp78vq91jac8s317a2icv74mczl"; }; prePatch = '' -- cgit v1.2.3 From 09409dcfc233943eb1bf0d86b960496f4dd701b4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 17:44:03 +0000 Subject: cargo-outdated: 0.9.9 -> 0.9.10 --- pkgs/tools/package-management/cargo-outdated/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/cargo-outdated/default.nix b/pkgs/tools/package-management/cargo-outdated/default.nix index 41b6d26d02d..1a20c6b9ab6 100644 --- a/pkgs/tools/package-management/cargo-outdated/default.nix +++ b/pkgs/tools/package-management/cargo-outdated/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-outdated"; - version = "0.9.9"; + version = "0.9.10"; src = fetchFromGitHub { owner = "kbknapp"; repo = pname; rev = "v${version}"; - sha256 = "01yvkfclrynv7gpvdckzbcv03xr28yb4v6333a6nv6gy05p26g3a"; + sha256 = "1aj76wwpnvniv5xdygfv17kj74rxxkvngkvw2019qinm2nv81c3p"; }; - cargoSha256 = "152f2f16d5vlww51aldvh1r2r4kx8ad5d48dc30xsfj669zzw24h"; + cargoSha256 = "0nzxx31nlmrcrcs67z1wci0d4n6kdq83z2ld4bq8xgp6p916f4sl"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] -- cgit v1.2.3 From 8aef7382a3a7c8d7ef93e61f254ff2e82a176560 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Wed, 6 May 2020 14:21:13 -0300 Subject: emacs2nix: update to fix org elpa update script --- pkgs/applications/editors/emacs-modes/emacs2nix.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/emacs2nix.nix b/pkgs/applications/editors/emacs-modes/emacs2nix.nix index cedc56e97ce..852f395c4a2 100644 --- a/pkgs/applications/editors/emacs-modes/emacs2nix.nix +++ b/pkgs/applications/editors/emacs-modes/emacs2nix.nix @@ -4,8 +4,8 @@ let src = pkgs.fetchgit { url = "https://github.com/ttuegel/emacs2nix.git"; fetchSubmodules = true; - rev = "752fe1bd891425cb7a4a53cd7b98c194c1fe4518"; - sha256 = "0asfdswh8sbnapbqhbz539zzxmv72f1iviha95iys34sgnd5k1nk"; + rev = "d4c52a7b22b0622aecf0b0d59941a4a2b250617c"; + sha256 = "133m0bmm8ahy0jbappgcdjqppkpxf5s9wg4gg254afx3f7yfqzbh"; }; in pkgs.mkShell { -- cgit v1.2.3 From 135ea5fe08171d04a89640662276811dc2144cf0 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Wed, 6 May 2020 15:01:13 -0300 Subject: org-packages 2020-05-06 -- org-generated.nix --- pkgs/applications/editors/emacs-modes/org-generated.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index 302f5adcfb1..4ff1db1c743 100644 --- a/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -4,10 +4,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "20191203"; + version = "20200504"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20191203.tar"; - sha256 = "1fcgiswjnqmfzx3xkmlqyyhc4a8ms07vdsv7nkizgxqdh9hwfm2q"; + url = "https://orgmode.org/elpa/org-20200504.tar"; + sha256 = "1nalr2jafhzfkaf4bn8kscxd7nm1wz7dbw2629j2msxknw76dwk1"; }; packageRequires = []; meta = { @@ -19,10 +19,10 @@ elpaBuild { pname = "org-plus-contrib"; ename = "org-plus-contrib"; - version = "20191203"; + version = "20200504"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20191203.tar"; - sha256 = "1kvw95492acb7gqn8gxbp1vg4fyw80w43yvflxnfxdf6jnnw2wah"; + url = "https://orgmode.org/elpa/org-plus-contrib-20200504.tar"; + sha256 = "1ykw3qspz18jgf3ngsvk2ys282489fcjrbk7pbv3ppxzjha4rmhb"; }; packageRequires = []; meta = { @@ -30,4 +30,4 @@ license = lib.licenses.free; }; }) {}; - } + } \ No newline at end of file -- cgit v1.2.3 From 4454ca488c505570c059e45dd3f34033a019db1e Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Wed, 6 May 2020 12:15:07 -0400 Subject: conan: 1.24.0 -> 1.25.0 --- pkgs/development/tools/build-managers/conan/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/conan/default.nix b/pkgs/development/tools/build-managers/conan/default.nix index d9b89cde768..d7aec3527b3 100644 --- a/pkgs/development/tools/build-managers/conan/default.nix +++ b/pkgs/development/tools/build-managers/conan/default.nix @@ -1,7 +1,7 @@ { lib, python3, git, pkgconfig }: # Note: -# Conan has specific dependency demanands; check +# Conan has specific dependency demands; check # https://github.com/conan-io/conan/blob/master/conans/requirements.txt # https://github.com/conan-io/conan/blob/master/conans/requirements_server.txt # on the release branch/commit we're packaging. @@ -39,12 +39,12 @@ let newPython = python3.override { }; in newPython.pkgs.buildPythonApplication rec { - version = "1.24.0"; + version = "1.25.0"; pname = "conan"; src = newPython.pkgs.fetchPypi { inherit pname version; - sha256 = "0nkh4f6plamijwcfw536ydm0i04y74qmkh5l1nanyb8p0c3z3x0y"; + sha256 = "1wgmx6s4h5m6zixb3wlaicy56rsqcy2srzmvii80xdx9g5wvi9pv"; }; propagatedBuildInputs = with newPython.pkgs; [ -- cgit v1.2.3 From 21c87a919083d34185b2c1d486f5cb3c970ab310 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 02:18:05 +0000 Subject: memcached: 1.6.3 -> 1.6.5 --- pkgs/servers/memcached/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index 89d3220aa69..fb284970af0 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }: stdenv.mkDerivation rec { - version = "1.6.3"; + version = "1.6.5"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "0h0mlg3xz1y889xj6lcsb4sz9bar1birc2wzjf7x4ig31qib6r0w"; + sha256 = "1pr7igk7ic9wc2yax26wy3ar223vilf2qyzrknz36g61dxqa6k8z"; }; configureFlags = [ -- cgit v1.2.3 From fb9053332b0a333054b2d638115b8441a26d8208 Mon Sep 17 00:00:00 2001 From: David Izquierdo Date: Wed, 6 May 2020 01:52:20 +0200 Subject: jftui: 0.2.2 -> 0.3.0 --- pkgs/applications/video/jftui/default.nix | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/video/jftui/default.nix b/pkgs/applications/video/jftui/default.nix index 82774ada09e..eb572bac4e3 100644 --- a/pkgs/applications/video/jftui/default.nix +++ b/pkgs/applications/video/jftui/default.nix @@ -1,32 +1,27 @@ -{ stdenv, fetchFromGitHub, fetchpatch, clang, - pkg-config, curl, mpv, yajl }: +{ stdenv +, fetchFromGitHub +, pkg-config +, curl +, mpv +, yajl +}: stdenv.mkDerivation rec { pname = "jftui"; - version = "0.2.2"; + version = "0.3.0"; src = fetchFromGitHub { owner = "Aanok"; repo = pname; rev = "v${version}"; - sha256 = "0g93w8ahyh2v0cv2fyj5a7v6qyznavwk0dcxx1qw4kczdgmlxnkx"; + sha256 = "1az737q5i24ylvkx4g3xlq8k48ni91nz5hhbif97g4nlhwl5cqb6"; }; - patches = [ - # Remove this patch with next version - (fetchpatch { - name = "curl-capability-check-fix"; - url = "https://github.com/Aanok/jftui/commit/d63996b8bc0d2ac4b04c5de4169bc7f8ec9b2a30.patch"; - sha256 = "1d595mkzgx3carq2cykxpvmf5klgdlyaq94fk9wj8812yswqlsr7"; - }) - ]; - nativeBuildInputs = [ pkg-config ]; buildInputs = [ - clang curl mpv yajl -- cgit v1.2.3 From 111553b01e8f28faddd056f34c76eb5d8c16614d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 02:10:49 +0000 Subject: nagios: 4.4.5 -> 4.4.6 --- pkgs/servers/monitoring/nagios/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/nagios/default.nix b/pkgs/servers/monitoring/nagios/default.nix index dc0ad6ae2cf..b8246c27b47 100644 --- a/pkgs/servers/monitoring/nagios/default.nix +++ b/pkgs/servers/monitoring/nagios/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nagios"; - version = "4.4.5"; + version = "4.4.6"; src = fetchurl { url = "mirror://sourceforge/nagios/nagios-4.x/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "079rgi3dqdg6h511c96hrch62rxsap9p4x37hm2nj672zb9f4sdz"; + sha256 = "1x5hb97zbvkm73q53ydp1gwj8nnznm72q9c4rm6ny7phr995l3db"; }; patches = [ ./nagios.patch ]; -- cgit v1.2.3 From be1594bf7a4eb458a2d81b6a679ddabce3dbc8d6 Mon Sep 17 00:00:00 2001 From: Isaac W Hanson Date: Wed, 6 May 2020 14:18:44 -0400 Subject: vim-utils: restore `beforePlugins` option some plugins require configuration before their plugin definition --- pkgs/misc/vim-plugins/vim-utils.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index d745198e6a4..5e1703c8cc3 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -188,6 +188,7 @@ let vam ? null, pathogen ? null, plug ? null, + beforePlugins ? "", customRC ? "" }: @@ -341,6 +342,8 @@ let " configuration generated by NIX set nocompatible + ${beforePlugins} + ${vamImpl} ${pathogenImpl} ${plugImpl} -- cgit v1.2.3 From e5840049e1c745fa777532e8357501b02574a1aa Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 02:32:15 +0000 Subject: libmysqlconnectorcpp: 8.0.19 -> 8.0.20 --- pkgs/development/libraries/libmysqlconnectorcpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index 898c659d0f7..71fbda7b471 100644 --- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libmysqlconnectorcpp"; - version = "8.0.19"; + version = "8.0.20"; src = fetchurl { url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}-src.tar.gz"; - sha256 = "fDvXTOZKkwDn1IG3aziK2VAXpSSAxpi3VVea7GLUoh4="; + sha256 = "1jrrbfy6sw4pni72c1hgvchx1zzfpnamp34sjnv82mlvsp8ypsjh"; }; nativeBuildInputs = [ -- cgit v1.2.3 From abdeb15bafe0cba62ff37442820a3c3fbd69e6bf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 02:02:19 +0000 Subject: meteor: 1.9.3 -> 1.10.1 --- pkgs/servers/meteor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix index b6abec241a5..0a0d3aa7bd8 100644 --- a/pkgs/servers/meteor/default.nix +++ b/pkgs/servers/meteor/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, zlib, patchelf, runtimeShell }: let - version = "1.9.3"; + version = "1.10.1"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { pname = "meteor"; src = fetchurl { url = "https://static-meteor.netdna-ssl.com/packages-bootstrap/${version}/meteor-bootstrap-os.linux.x86_64.tar.gz"; - sha256 = "1njp2db939w3ah5k943bkgm62k969fj47qwmlzvhmmg87xwnq3fb"; + sha256 = "1xck7pi7rhkgssic7adbg1slypjjkqxa18wlf3jffbgj0zzr87nx"; }; #dontStrip = true; -- cgit v1.2.3 From 10b04f5b1f5978f0d851518fe4696dd33cb8f9cc Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 22:39:09 +0000 Subject: libtorrentRasterbar: 1.2.5 -> 1.2.6 --- pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix index 8b9992ec66d..91e5a54bab1 100644 --- a/pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix +++ b/pkgs/development/libraries/libtorrent-rasterbar/1.2/default.nix @@ -3,7 +3,7 @@ }: let - version = "1.2.5"; + version = "1.2.6"; formattedVersion = lib.replaceChars ["."] ["_"] version; # Make sure we override python, so the correct version is chosen @@ -18,7 +18,7 @@ in stdenv.mkDerivation { owner = "arvidn"; repo = "libtorrent"; rev = "libtorrent-${formattedVersion}"; - sha256 = "0y2fzqbvb1bxvf93d7sphwzxih6j40p5p3fay943k26w0nrq802w"; + sha256 = "140gc9j6lymy5kr0gviqznpg4hl57rz2q6vpb9sjkkimr19lrvdr"; }; enableParallelBuilding = true; -- cgit v1.2.3 From f2b13598481b8ebd00be14a638d685a583e3b20b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Thu, 30 Apr 2020 12:25:37 +0200 Subject: jshon: 20160111.2 -> 20170302 --- pkgs/development/tools/parsing/jshon/default.nix | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/pkgs/development/tools/parsing/jshon/default.nix b/pkgs/development/tools/parsing/jshon/default.nix index cff36d2cb52..8f06a32c667 100644 --- a/pkgs/development/tools/parsing/jshon/default.nix +++ b/pkgs/development/tools/parsing/jshon/default.nix @@ -1,26 +1,16 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, jansson }: +{ stdenv, lib, fetchFromGitHub, jansson }: stdenv.mkDerivation rec { - name = "jshon-20160111.2"; - - rev = "a61d7f2f85f4627bc3facdf951746f0fd62334b7"; - sha256 = "1053w7jbl90q3p5y34pi4i8an1ddsjzwaib5cfji75ivamc5wdmh"; + pname = "jshon"; + version = "20170302"; src = fetchFromGitHub { - inherit rev sha256; owner = "keenerd"; repo = "jshon"; + rev = "d919aeaece37962251dbe6c1ee50f0028a5c90e4"; + sha256 = "1x4zfmsjq0l2y994bxkhx3mn5vzjxxr39iib213zjchi9h6yxvnc"; }; - patches = [ - # Fix null termination in read_stream. - # https://github.com/keenerd/jshon/issues/53 - (fetchpatch { - url = "https://github.com/mbrock/jshon/commit/32288dd186573ceb58164f30be1782d4580466d8.patch"; - sha256 = "04rss2nprl9nqblc7smq0477n54hm801xgnnmvyzni313i1n6vhl"; - }) - ]; - buildInputs = [ jansson ]; patchPhase = -- cgit v1.2.3 From e71e2c630fa552c1c580f18e44134e73076383cf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 10:54:01 +0000 Subject: plantuml: 1.2020.5 -> 1.2020.8 --- pkgs/tools/misc/plantuml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index fec1bee160f..df76ddf2662 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2020.5"; + version = "1.2020.8"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "1cn1bjah9qvhh3hixa92v804crkgz69mg30k8229a551x3alykhd"; + sha256 = "0xkv8d31dc0dchr40zzgmjw2wyh4i5vxwdk3fhqpw0pk2frxwc1w"; }; nativeBuildInputs = [ makeWrapper ]; -- cgit v1.2.3 From 77d21a4abb08b3908c27852720ee42b920243932 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 23:46:00 +0000 Subject: mednafen: 1.24.1 -> 1.24.2 --- pkgs/misc/emulators/mednafen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix index ea860af1fdf..a8ab7e908f2 100644 --- a/pkgs/misc/emulators/mednafen/default.nix +++ b/pkgs/misc/emulators/mednafen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "mednafen"; - version = "1.24.1"; + version = "1.24.2"; src = fetchurl { url = "https://mednafen.github.io/releases/files/${pname}-${version}.tar.xz"; - sha256 = "1rszcy5lgfrw0f9b62sd69kgz1xziki3d55vpqh6k9jdmwzxyym4"; + sha256 = "0v3w0miyz86ihcir7ab82zjfklp550pk6g9xjxcx6mmvhp9dws8i"; }; nativeBuildInputs = [ pkgconfig ]; -- cgit v1.2.3 From 51f517ea6ca294bd5ab9133af0f5508bbcb20e78 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 18:57:14 +0000 Subject: dua: 2.5.0 -> 2.6.0 --- pkgs/tools/misc/dua/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/dua/default.nix b/pkgs/tools/misc/dua/default.nix index 2dea0f179a1..cb000b29472 100644 --- a/pkgs/tools/misc/dua/default.nix +++ b/pkgs/tools/misc/dua/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "1r94fcygp9mmg457dkksx3mjdxfddzfzl6n0rmxasiinsz0hak4c"; + sha256 = "1697z9j0xd4il01bcvz1xwzkcg5mbkpp207mshb9csdhwi9a50wg"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "15a4hari3my59xvmkll2jlvb1jyf8gg8alp91nvh3bagpajpvdx6"; + cargoSha256 = "1rczq41jpds7kfyf31nxj4v8rk9rccijjixpznhlriam6xhgm90b"; doCheck = false; -- cgit v1.2.3 From fc11d3beaa26ae55673c49e75275c8950be8dc3c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 12:00:50 -0700 Subject: librsvg: 2.48.2 -> 2.48.4 (#86996) --- pkgs/development/libraries/librsvg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix index ba8ef8e6a85..afd1df51e5b 100644 --- a/pkgs/development/libraries/librsvg/default.nix +++ b/pkgs/development/libraries/librsvg/default.nix @@ -4,14 +4,14 @@ let pname = "librsvg"; - version = "2.48.2"; + version = "2.48.4"; in stdenv.mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "1jmxd03fs8vkwycxpmx69kdfmgq52g64bhv82gmj3kjgw2h5h9i7"; + sha256 = "0vlmgisf87dz4vcl1ypcw7g211wkyvhydv6ksf1p6mgdbkw3mdi8"; }; outputs = [ "out" "dev" "installedTests" ]; -- cgit v1.2.3 From 895b3bdef84b643471a90b57be91fbfef82234f2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 12:05:35 -0700 Subject: gnome3.gucharmap: 13.0.0 -> 13.0.2 (#86885) --- pkgs/desktops/gnome-3/core/gucharmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/core/gucharmap/default.nix index 927d70345e7..fe24ac8708a 100644 --- a/pkgs/desktops/gnome-3/core/gucharmap/default.nix +++ b/pkgs/desktops/gnome-3/core/gucharmap/default.nix @@ -44,7 +44,7 @@ let }; in stdenv.mkDerivation rec { pname = "gucharmap"; - version = "13.0.0"; + version = "13.0.2"; outputs = [ "out" "lib" "dev" "devdoc" ]; @@ -53,7 +53,7 @@ in stdenv.mkDerivation rec { owner = "GNOME"; repo = pname; rev = version; - sha256 = "17arjigs1lw1h428s9g171n0idrpf9ks23sndldsik1zvvwzlldh"; + sha256 = "099za9mc6qdq9pwcbjp3d7hxjbaa43vk2w9qw4yiyswl1xq3jw62"; }; nativeBuildInputs = [ -- cgit v1.2.3 From eed197540c60581035778d8834596116b9b336b4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 12:08:23 -0700 Subject: gnome3.adwaita-icon-theme: 3.36.0 -> 3.36.1 (#86766) --- pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix index 827fd1cd96a..68c09cc9180 100644 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "adwaita-icon-theme"; - version = "3.36.0"; + version = "3.36.1"; src = fetchurl { url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "066m3vd6k6xf3ap1ahrbw5hnx2322wf0qsnywcxjsj6snq9225qs"; + sha256 = "0kgiq712lfidd81yzx0yk7qwlj3q8cymp6npnxyzsk844y353674"; }; # For convenience, we can specify adwaita-icon-theme only in packages -- cgit v1.2.3 From a8b040329dd0c06e3019a33408f18b2985ee7098 Mon Sep 17 00:00:00 2001 From: Michael Lingelbach Date: Wed, 6 May 2020 12:13:41 -0700 Subject: Alacritty: change icon to compat svg --- pkgs/applications/misc/alacritty/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix index 3135c1f8831..518ec310ffb 100644 --- a/pkgs/applications/misc/alacritty/default.nix +++ b/pkgs/applications/misc/alacritty/default.nix @@ -103,7 +103,7 @@ rustPlatform.buildRustPackage rec { cp -r $releaseDir/osx/Alacritty.app $out/Applications/Alacritty.app '' else '' 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 + install -D extra/logo/compat/alacritty-term.svg $out/share/icons/hicolor/scalable/apps/Alacritty.svg # patchelf generates an ELF that binutils' "strip" doesn't like: # strip: not enough room for program headers, try linking with -N -- cgit v1.2.3 From c73875ea1e745349a0451b92a1e6b0c5faee8b82 Mon Sep 17 00:00:00 2001 From: Yurii Rashkovskii Date: Wed, 6 May 2020 12:26:10 -0700 Subject: tlaplus: 1.5.6 -> 1.7.0 --- pkgs/applications/science/logic/tlaplus/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/science/logic/tlaplus/default.nix b/pkgs/applications/science/logic/tlaplus/default.nix index 3476b5ea9d9..14944f5e19b 100644 --- a/pkgs/applications/science/logic/tlaplus/default.nix +++ b/pkgs/applications/science/logic/tlaplus/default.nix @@ -1,24 +1,24 @@ { stdenv, fetchFromGitHub, makeWrapper -, jdk, jre, ant +, adoptopenjdk-bin, jre, ant }: stdenv.mkDerivation rec { pname = "tlaplus"; - version = "1.5.6"; + version = "1.7.0"; src = fetchFromGitHub { owner = "tlaplus"; repo = "tlaplus"; rev = "refs/tags/v${version}"; - sha256 = "0966mvgxamknj4hsp980qbxwda886w1dv309kn7isxn0420lfv4f"; + sha256 = "1mm6r9bq79zks50yk0agcpdkw9yy994m38ibmgpb3bi3wkpq9891"; }; - buildInputs = [ makeWrapper jdk ant ]; + buildInputs = [ makeWrapper adoptopenjdk-bin ant ]; - buildPhase = "ant -f tlatools/customBuild.xml compile dist"; + buildPhase = "ant -f tlatools/org.lamport.tlatools/customBuild.xml compile dist"; installPhase = '' mkdir -p $out/share/java $out/bin - cp tlatools/dist/*.jar $out/share/java + cp tlatools/org.lamport.tlatools/dist/*.jar $out/share/java makeWrapper ${jre}/bin/java $out/bin/tlc2 \ --add-flags "-cp $out/share/java/tla2tools.jar tlc2.TLC" -- cgit v1.2.3 From bc983a2bdb88acc784d3d5ec206e6854e4a1222d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 19:47:10 +0000 Subject: flow: 0.123.0 -> 0.124.0 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 29ea3993b1c..c9c5dd873de 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.123.0"; + version = "0.124.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "0dsp8q3v9smjli2bkldkhzh2z032zjmqbzzchb5j18r4vz4hif16"; + sha256 = "1isy67fx0lrszvkf3bw3pp8mzvcyab4qnssmv4kvvz32vls8gh25"; }; installPhase = '' -- cgit v1.2.3 From 897a1e639380e0178ed457c2e3f03745ab4522c7 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 27 Apr 2020 22:22:56 +0200 Subject: etcher: 1.5.60 -> 1.5.86 --- pkgs/tools/misc/etcher/default.nix | 66 ++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 38 deletions(-) diff --git a/pkgs/tools/misc/etcher/default.nix b/pkgs/tools/misc/etcher/default.nix index 4944600108a..0d2029fa314 100644 --- a/pkgs/tools/misc/etcher/default.nix +++ b/pkgs/tools/misc/etcher/default.nix @@ -1,25 +1,19 @@ -{ lib -, stdenv +{ stdenv , fetchurl , gcc-unwrapped , dpkg , polkit +, utillinux , bash , nodePackages -, electron_3 -, gtk3 -, wrapGAppsHook +, makeWrapper +, electron_7 }: let - libPath = lib.makeLibraryPath [ - # for libstdc++.so.6 - gcc-unwrapped.lib - ]; - sha256 = { - "x86_64-linux" = "0zb9j34dz7ybjix018bm8g0b6kilw9300q4ahcm22p0ggg528dh7"; - "i686-linux" = "0wsv4mvwrvsaz1pwiqs94b3854h5l8ff2dbb1ybxmvwjbfrkdcqc"; + "x86_64-linux" = "1yvqi86bw0kym401zwknhwq9041fxg047sbj3aydnfcqf11vrrmk"; + "i686-linux" = "12lghzhsl16h3jvzm3vw4hrly32fz99z6rdmybl8viralrxy8mb8"; }."${stdenv.system}"; arch = { @@ -27,26 +21,22 @@ let "i686-linux" = "i386"; }."${stdenv.system}"; -in stdenv.mkDerivation rec { +in + +stdenv.mkDerivation rec { pname = "etcher"; - version = "1.5.60"; + version = "1.5.86"; src = fetchurl { url = "https://github.com/balena-io/etcher/releases/download/v${version}/balena-etcher-electron_${version}_${arch}.deb"; inherit sha256; }; - buildInputs = [ - gtk3 - ]; - - nativeBuildInputs = [ - wrapGAppsHook - ]; - dontBuild = true; dontConfigure = true; + nativeBuildInputs = [ makeWrapper ]; + unpackPhase = '' ${dpkg}/bin/dpkg-deb -x $src . ''; @@ -55,33 +45,33 @@ in stdenv.mkDerivation rec { # along with some other paths patchPhase = '' ${nodePackages.asar}/bin/asar extract opt/balenaEtcher/resources/app.asar tmp - # Use Nix(OS) paths + # use Nix(OS) paths sed -i "s|/usr/bin/pkexec|/usr/bin/pkexec', '/run/wrappers/bin/pkexec|" tmp/node_modules/sudo-prompt/index.js sed -i 's|/bin/bash|${bash}/bin/bash|' tmp/node_modules/sudo-prompt/index.js - sed -i "s|process.resourcesPath|'$out/opt/balenaEtcher/resources/'|" tmp/generated/gui.js + sed -i "s|'lsblk'|'${utillinux}/bin/lsblk'|" tmp/node_modules/drivelist/js/lsblk/index.js + sed -i "s|process.resourcesPath|'$out/share/${pname}/resources/'|" tmp/generated/gui.js ${nodePackages.asar}/bin/asar pack tmp opt/balenaEtcher/resources/app.asar rm -rf tmp - # Fix up .desktop file - substituteInPlace usr/share/applications/balena-etcher-electron.desktop \ - --replace "/opt/balenaEtcher/balena-etcher-electron" "$out/bin/balena-etcher-electron" ''; installPhase = '' - mkdir -p $out/bin - cp -r opt $out/ - cp -r usr/share $out/ + runHook preInstall + + mkdir -p $out/bin $out/share/${pname} + + cp -a usr/share/* $out/share + cp -a opt/balenaEtcher/{locales,resources} $out/share/${pname} - # We'll use our Nixpkgs electron_3 instead - rm $out/opt/balenaEtcher/balena-etcher-electron + substituteInPlace $out/share/applications/balena-etcher-electron.desktop \ + --replace 'Exec=/opt/balenaEtcher/balena-etcher-electron' 'Exec=${pname}' - ln -s ${electron_3}/bin/electron $out/bin/balena-etcher-electron + runHook postInstall ''; - preFixup = '' - gappsWrapperArgs+=( - --add-flags $out/opt/balenaEtcher/resources/app.asar - --prefix LD_LIBRARY_PATH : ${libPath} - ) + postFixup = '' + makeWrapper ${electron_7}/bin/electron $out/bin/${pname} \ + --add-flags $out/share/${pname}/resources/app.asar \ + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ gcc-unwrapped.lib ]}" ''; meta = with stdenv.lib; { -- cgit v1.2.3 From ac287ce319fe7a52ba0e7d0a2556dff63b84e10b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 6 May 2020 15:56:35 -0400 Subject: linux: 4.19.120 -> 4.19.121 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 4edc8359c51..450c44f0aa0 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.120"; + version = "4.19.121"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "03mjng5ws9y56id99619ysarz73qqyylgc3mlknga1yphbhh16qb"; + sha256 = "11bhjdaihhc42xhf4qxdkkjznc0i6igh0ahjbzr3fb8bmq9sirgv"; }; } // (args.argsOverride or {})) -- cgit v1.2.3 From bcbc50714359392d283cb8b86a21986bb701dc6e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 6 May 2020 15:57:20 -0400 Subject: linux: 5.4.38 -> 5.4.39 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 31d485877b7..5ca72d8a6a5 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.38"; + version = "5.4.39"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "03pks3jx5kk0wnhjkm92wxdbgw8qbdg93sfwchnx88m2wfj9yaz7"; + sha256 = "1j35yf1nilb9z7lw8w2drpww7q2zy8zfr0ip8hwcbcd7c5d9chai"; }; } // (args.argsOverride or {})) -- cgit v1.2.3 From f82e836e1da9f034d79eb9e73a58181c0ae070e9 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Wed, 6 May 2020 15:58:09 -0400 Subject: linux: 5.6.10 -> 5.6.11 --- pkgs/os-specific/linux/kernel/linux-5.6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.6.nix b/pkgs/os-specific/linux/kernel/linux-5.6.nix index eb60cfd9497..7cd3987f87c 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.6.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.6.10"; + version = "5.6.11"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1f81b0icn0r9gww95rckyxs5d4g8bwf4mmqkrmwxxf4xga19dp3v"; + sha256 = "1ahv4a3mnszqs3qcnwmhbvjgis1jg37anj5jvn70i7s2k6z6rpfn"; }; } // (args.argsOverride or {})) -- cgit v1.2.3 From 8335fe7dbbf0636fe4d8c8aa311ad3a9aa44aa86 Mon Sep 17 00:00:00 2001 From: Raphael Borun Das Gupta Date: Wed, 6 May 2020 22:29:12 +0200 Subject: home-manager: add meta.homepage --- pkgs/tools/package-management/home-manager/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix index 8c70a5a4724..d82664ff903 100644 --- a/pkgs/tools/package-management/home-manager/default.nix +++ b/pkgs/tools/package-management/home-manager/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A user environment configurator"; + homepage = "https://rycee.gitlab.io/home-manager/"; maintainers = with maintainers; [ rycee ]; platforms = platforms.unix; license = licenses.mit; -- cgit v1.2.3 From 34807336e85fa10efd163a5bee6472dba3572950 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 4 May 2020 23:16:45 -0400 Subject: python3Packages.dicom2nifti: init at 2.2.8 --- .../python-modules/dicom2nifti/default.nix | 37 ++++++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/python-modules/dicom2nifti/default.nix diff --git a/pkgs/development/python-modules/dicom2nifti/default.nix b/pkgs/development/python-modules/dicom2nifti/default.nix new file mode 100644 index 00000000000..abc07346efd --- /dev/null +++ b/pkgs/development/python-modules/dicom2nifti/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, gdcm +, nose +, nibabel +, numpy +, pydicom +, scipy +}: + +buildPythonPackage rec { + pname = "dicom2nifti"; + version = "2.2.8"; + disabled = isPy27; + + # no tests in PyPI dist + src = fetchFromGitHub { + owner = "icometrix"; + repo = pname; + rev = version; + sha256 = "1qi2map6f4pa1l8wsif7ff7rhja6ynrjlm7w306dzvi9l25mia34"; + }; + + propagatedBuildInputs = [ gdcm nibabel numpy pydicom scipy ]; + + checkInputs = [ nose gdcm ]; + checkPhase = "nosetests tests"; + + meta = with lib; { + homepage = "https://github.com/icometrix/dicom2nifti"; + description = "Library for converting dicom files to nifti"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1f7ae558a50..6f07d73493f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -676,6 +676,8 @@ in { dftfit = callPackage ../development/python-modules/dftfit { }; + dicom2nifti = callPackage ../development/python-modules/dicom2nifti { }; + discid = callPackage ../development/python-modules/discid { }; discordpy = callPackage ../development/python-modules/discordpy { }; -- cgit v1.2.3 From c13df548a3d962d9810134c2d2f940a241de1418 Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Wed, 6 May 2020 21:34:19 +0100 Subject: php: override outputsToInstall when using withExtensions At the moment, using .withExtensions on a PHP derivation will produce something which can't be used inside an environment.systemPackages array, because outputsToInstall refers to an output which doesn't exist on the final derivation. Instead, override it back to just containing the single output "out". --- pkgs/development/interpreters/php/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index e0aea60e293..ac0ab2196af 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -113,7 +113,9 @@ let unwrapped = php; tests = nixosTests.php; inherit (php-packages) packages extensions; - inherit (php) meta; + meta = php.meta // { + outputsToInstall = [ "out" ]; + }; }; paths = [ php ]; postBuild = '' -- cgit v1.2.3 From e24f5eab66a004fcbd770888aba9cd94fcda17c5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 May 2020 23:18:09 +0200 Subject: treewide: add CVE identifiers to patches This allows tools like broken.sh to correctly identify the patched status. --- .../10_fix_buffer_overflow_wordole_c.patch | 18 ---- ...x_buffer_overflow_wordole_c_CVE-2014-8123.patch | 18 ++++ pkgs/applications/office/antiword/default.nix | 2 +- pkgs/misc/drivers/foomatic-filters/default.nix | 2 +- pkgs/os-specific/linux/libcgroup/default.nix | 1 + pkgs/tools/archivers/p7zip/default.nix | 2 + pkgs/tools/filesystems/fuseiso/default.nix | 30 +++--- pkgs/tools/misc/mcrypt/default.nix | 7 +- pkgs/tools/misc/mcrypt/format-string.patch | 31 ------ .../misc/mcrypt/format-string_CVE-2012-4426.patch | 31 ++++++ pkgs/tools/misc/mcrypt/overflow.patch | 24 ----- .../tools/misc/mcrypt/overflow_CVE-2012-4409.patch | 24 +++++ pkgs/tools/misc/mcrypt/sprintf.patch | 108 --------------------- pkgs/tools/misc/mcrypt/sprintf_CVE-2012-4527.patch | 108 +++++++++++++++++++++ pkgs/tools/security/super/default.nix | 8 +- pkgs/tools/text/a2ps/default.nix | 1 + 16 files changed, 213 insertions(+), 202 deletions(-) delete mode 100644 pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c.patch create mode 100644 pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c_CVE-2014-8123.patch delete mode 100644 pkgs/tools/misc/mcrypt/format-string.patch create mode 100644 pkgs/tools/misc/mcrypt/format-string_CVE-2012-4426.patch delete mode 100644 pkgs/tools/misc/mcrypt/overflow.patch create mode 100644 pkgs/tools/misc/mcrypt/overflow_CVE-2012-4409.patch delete mode 100644 pkgs/tools/misc/mcrypt/sprintf.patch create mode 100644 pkgs/tools/misc/mcrypt/sprintf_CVE-2012-4527.patch diff --git a/pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c.patch b/pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c.patch deleted file mode 100644 index ebf2f0900d9..00000000000 --- a/pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Add check for buffer overflow with malformed input files -Author: -Bug-Debian: http://bugs.debian.org/407015 -Last-Update: 2009-06-03 - ---- antiword-0.37~/wordole.c 2005-08-26 21:49:57.000000000 +0200 -+++ antiword-0.37/wordole.c 2009-06-03 22:31:15.948014682 +0200 -@@ -259,6 +259,10 @@ - } - tNameSize = (size_t)usGetWord(0x40, aucBytes); - tNameSize = (tNameSize + 1) / 2; -+ if ( tNameSize > sizeof(atPPSlist[iIndex].szName)) { -+ werr(0, "Name Size of PPS %d is too large", iIndex); -+ tNameSize = sizeof(atPPSlist[iIndex].szName); -+ } - vName2String(atPPSlist[iIndex].szName, aucBytes, tNameSize); - atPPSlist[iIndex].ucType = ucGetByte(0x42, aucBytes); - if (atPPSlist[iIndex].ucType == 5) { diff --git a/pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c_CVE-2014-8123.patch b/pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c_CVE-2014-8123.patch new file mode 100644 index 00000000000..ebf2f0900d9 --- /dev/null +++ b/pkgs/applications/office/antiword/10_fix_buffer_overflow_wordole_c_CVE-2014-8123.patch @@ -0,0 +1,18 @@ +Description: Add check for buffer overflow with malformed input files +Author: +Bug-Debian: http://bugs.debian.org/407015 +Last-Update: 2009-06-03 + +--- antiword-0.37~/wordole.c 2005-08-26 21:49:57.000000000 +0200 ++++ antiword-0.37/wordole.c 2009-06-03 22:31:15.948014682 +0200 +@@ -259,6 +259,10 @@ + } + tNameSize = (size_t)usGetWord(0x40, aucBytes); + tNameSize = (tNameSize + 1) / 2; ++ if ( tNameSize > sizeof(atPPSlist[iIndex].szName)) { ++ werr(0, "Name Size of PPS %d is too large", iIndex); ++ tNameSize = sizeof(atPPSlist[iIndex].szName); ++ } + vName2String(atPPSlist[iIndex].szName, aucBytes, tNameSize); + atPPSlist[iIndex].ucType = ucGetByte(0x42, aucBytes); + if (atPPSlist[iIndex].ucType == 5) { diff --git a/pkgs/applications/office/antiword/default.nix b/pkgs/applications/office/antiword/default.nix index 0154e21b374..c8cb294b0dc 100644 --- a/pkgs/applications/office/antiword/default.nix +++ b/pkgs/applications/office/antiword/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { substituteInPlace Makefile --replace "gcc" "cc" ''; - patches = [ ./10_fix_buffer_overflow_wordole_c.patch ]; + patches = [ ./10_fix_buffer_overflow_wordole_c_CVE-2014-8123.patch ]; installTargets = [ "global_install" ]; diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix index 9bee05bfb25..3ca64e0e8f8 100644 --- a/pkgs/misc/drivers/foomatic-filters/default.nix +++ b/pkgs/misc/drivers/foomatic-filters/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ perl cups dbus enscript ]; patches = [ - # for CVE-2015-8327 & CVE-2015-8560 (fetchpatch { + name = "CVE-2015-8327+CVE-2015-8560.patch"; url = "https://salsa.debian.org/debian/foomatic-filters/raw/a3abbef2d2f8c7e62d2fe64f64afe294563fdf8f/debian/patches/0500-r7406_also_consider_the_back_tick_as_an_illegal_shell_escape_character.patch"; sha256 = "055nwi3sjf578nk40bqsch3wx8m2h65hdih0wmxflb6l0hwkq4p4"; }) diff --git a/pkgs/os-specific/linux/libcgroup/default.nix b/pkgs/os-specific/linux/libcgroup/default.nix index 026b43fc615..4d93c3bb4fe 100644 --- a/pkgs/os-specific/linux/libcgroup/default.nix +++ b/pkgs/os-specific/linux/libcgroup/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { + name = "CVE-2018-14348.patch"; url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/libcgroup/files/libcgroup-0.41-remove-umask.patch?id=33e9f4c81de754bbf76b893ea1133ed023f2a0e5"; sha256 = "1x0x29ld0cgmfwq4qy13s6d5c8sym1frfh1j2q47d8gfw6qaxka5"; }) diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index b7a97b3766b..d6ad699eaa8 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -13,10 +13,12 @@ stdenv.mkDerivation rec { ./12-CVE-2016-9296.patch ./13-CVE-2017-17969.patch (fetchpatch { + name = "3-CVE-2018-5996.patch"; url = "https://raw.githubusercontent.com/termux/termux-packages/master/packages/p7zip/3-CVE-2018-5996.patch"; sha256 = "1zivvkazmza0653i498ccp3zbpbpc7dvxl3zxwllbx41b6n589yp"; }) (fetchpatch { + name = "4-CVE-2018-10115.patch"; url = "https://raw.githubusercontent.com/termux/termux-packages/master/packages/p7zip/4-CVE-2018-10115.patch"; sha256 = "1cr7q8gnrk9yp6dcvxaqi1yhdbgp964nkv65ls41mw1kdfm44zn6"; }) diff --git a/pkgs/tools/filesystems/fuseiso/default.nix b/pkgs/tools/filesystems/fuseiso/default.nix index ded1fac65f8..0a4472d7123 100644 --- a/pkgs/tools/filesystems/fuseiso/default.nix +++ b/pkgs/tools/filesystems/fuseiso/default.nix @@ -9,27 +9,27 @@ stdenv.mkDerivation rec { sha256 = "127xql52dcdhmh7s5m9xc6q39jdlj3zhbjar1j821kb6gl3jw94b"; }; - patches = map (p: - fetchpatch { - inherit (p) name sha256; - url = "https://sources.debian.net/data/main/f/fuseiso/${version}-3.2/debian/patches/${p.name}"; - }) [ - { + patches = [ + (fetchpatch { name = "00-support_large_iso.patch"; + url = "https://sources.debian.net/data/main/f/fuseiso/${version}-3.2/debian/patches/00-support_large_iso.patch"; sha256 = "1lmclb1qwzz5f4wlq693g83bblwnjjl73qhgfxbsaac5hnn2shjw"; - } - { + }) + (fetchpatch { name = "01-fix_typo.patch"; + url = "https://sources.debian.net/data/main/f/fuseiso/${version}-3.2/debian/patches/01-fix_typo.patch"; sha256 = "14rpxp0yylzsgqv0r19l4wx1h5hvqp617gpv1yg0w48amr9drasa"; - } - { # CVE-2015-8837 - name = "02-prevent-buffer-overflow.patch"; + }) + (fetchpatch { + name = "02-prevent-buffer-overflow_CVE-2015-8837.patch"; + url = "https://sources.debian.net/data/main/f/fuseiso/${version}-3.2/debian/patches/02-prevent-buffer-overflow.patch"; sha256 = "1ls2pp3mh91pdb51qz1fsd8pwhbky6988bpd156bn7wgfxqzh8ig"; - } - { # CVE-2015-8836 - name = "03-prevent-integer-overflow.patch"; + }) + (fetchpatch { + name = "03-prevent-integer-overflow_CVE-2015-8836.patch"; + url = "https://sources.debian.net/data/main/f/fuseiso/${version}-3.2/debian/patches/03-prevent-integer-overflow.patch"; sha256 = "100cw07fk4sa3hl7a1gk2hgz4qsxdw99y20r7wpidwwwzy463zcv"; - } + }) ]; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/tools/misc/mcrypt/default.nix b/pkgs/tools/misc/mcrypt/default.nix index 9969148e223..afbe811e7f2 100644 --- a/pkgs/tools/misc/mcrypt/default.nix +++ b/pkgs/tools/misc/mcrypt/default.nix @@ -9,7 +9,12 @@ stdenv.mkDerivation rec { sha256 = "5145aa844e54cca89ddab6fb7dd9e5952811d8d787c4f4bf27eb261e6c182098"; }; - patches = [ ./format-string.patch ./overflow.patch ./segv.patch ./sprintf.patch ]; + patches = [ + ./format-string_CVE-2012-4426.patch + ./overflow_CVE-2012-4409.patch + ./segv.patch + ./sprintf_CVE-2012-4527.patch + ]; buildInputs = [ libmcrypt libmhash ]; diff --git a/pkgs/tools/misc/mcrypt/format-string.patch b/pkgs/tools/misc/mcrypt/format-string.patch deleted file mode 100644 index 322ab473811..00000000000 --- a/pkgs/tools/misc/mcrypt/format-string.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- mcrypt-2.6.8/src/errors.c -+++ mcrypt-2.6.8/src/errors.c -@@ -25,24 +25,24 @@ - - void err_quit(char *errmsg) - { -- fprintf(stderr, errmsg); -+ fprintf(stderr, "%s", errmsg); - exit(-1); - } - - void err_warn(char *errmsg) - { - if (quiet <= 1) -- fprintf(stderr, errmsg); -+ fprintf(stderr, "%s", errmsg); - } - - void err_info(char *errmsg) - { - if (quiet == 0) -- fprintf(stderr, errmsg); -+ fprintf(stderr, "%s", errmsg); - } - - void err_crit(char *errmsg) - { - if (quiet <= 2) -- fprintf(stderr, errmsg); -+ fprintf(stderr, "%s", errmsg); - } diff --git a/pkgs/tools/misc/mcrypt/format-string_CVE-2012-4426.patch b/pkgs/tools/misc/mcrypt/format-string_CVE-2012-4426.patch new file mode 100644 index 00000000000..322ab473811 --- /dev/null +++ b/pkgs/tools/misc/mcrypt/format-string_CVE-2012-4426.patch @@ -0,0 +1,31 @@ +--- mcrypt-2.6.8/src/errors.c ++++ mcrypt-2.6.8/src/errors.c +@@ -25,24 +25,24 @@ + + void err_quit(char *errmsg) + { +- fprintf(stderr, errmsg); ++ fprintf(stderr, "%s", errmsg); + exit(-1); + } + + void err_warn(char *errmsg) + { + if (quiet <= 1) +- fprintf(stderr, errmsg); ++ fprintf(stderr, "%s", errmsg); + } + + void err_info(char *errmsg) + { + if (quiet == 0) +- fprintf(stderr, errmsg); ++ fprintf(stderr, "%s", errmsg); + } + + void err_crit(char *errmsg) + { + if (quiet <= 2) +- fprintf(stderr, errmsg); ++ fprintf(stderr, "%s", errmsg); + } diff --git a/pkgs/tools/misc/mcrypt/overflow.patch b/pkgs/tools/misc/mcrypt/overflow.patch deleted file mode 100644 index bf747a58266..00000000000 --- a/pkgs/tools/misc/mcrypt/overflow.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 3efb40e17ce4f76717ae17a1ce1e1f747ddf59fd Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev -Date: Sat, 22 Dec 2012 22:37:06 +0200 -Subject: [PATCH] cleanup: buffer overflow - ---- - mcrypt-2.6.8/src/extra.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/mcrypt-2.6.8/src/extra.c b/mcrypt-2.6.8/src/extra.c -index 3082f82..c7a1ac0 100644 ---- a/src/extra.c -+++ b/src/extra.c -@@ -241,6 +241,8 @@ int check_file_head(FILE * fstream, char *algorithm, char *mode, - if (m_getbit(6, flags) == 1) { /* if the salt bit is set */ - if (m_getbit(0, sflag) != 0) { /* if the first bit is set */ - *salt_size = m_setbit(0, sflag, 0); -+ if (*salt_size > sizeof(tmp_buf)) -+ err_quit(_("Salt is too long\n")); - if (*salt_size > 0) { - fread(tmp_buf, 1, *salt_size, - fstream); --- -1.7.8.6 diff --git a/pkgs/tools/misc/mcrypt/overflow_CVE-2012-4409.patch b/pkgs/tools/misc/mcrypt/overflow_CVE-2012-4409.patch new file mode 100644 index 00000000000..bf747a58266 --- /dev/null +++ b/pkgs/tools/misc/mcrypt/overflow_CVE-2012-4409.patch @@ -0,0 +1,24 @@ +From 3efb40e17ce4f76717ae17a1ce1e1f747ddf59fd Mon Sep 17 00:00:00 2001 +From: Alon Bar-Lev +Date: Sat, 22 Dec 2012 22:37:06 +0200 +Subject: [PATCH] cleanup: buffer overflow + +--- + mcrypt-2.6.8/src/extra.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/mcrypt-2.6.8/src/extra.c b/mcrypt-2.6.8/src/extra.c +index 3082f82..c7a1ac0 100644 +--- a/src/extra.c ++++ b/src/extra.c +@@ -241,6 +241,8 @@ int check_file_head(FILE * fstream, char *algorithm, char *mode, + if (m_getbit(6, flags) == 1) { /* if the salt bit is set */ + if (m_getbit(0, sflag) != 0) { /* if the first bit is set */ + *salt_size = m_setbit(0, sflag, 0); ++ if (*salt_size > sizeof(tmp_buf)) ++ err_quit(_("Salt is too long\n")); + if (*salt_size > 0) { + fread(tmp_buf, 1, *salt_size, + fstream); +-- +1.7.8.6 diff --git a/pkgs/tools/misc/mcrypt/sprintf.patch b/pkgs/tools/misc/mcrypt/sprintf.patch deleted file mode 100644 index 1c9ade80777..00000000000 --- a/pkgs/tools/misc/mcrypt/sprintf.patch +++ /dev/null @@ -1,108 +0,0 @@ -Description: [CVE-2012-4527] Stack-based buffer overflow with long file names - . - A buffer overflow in mcrypt version 2.6.8 and earlier due to long filenames. - If a user were tricked into attempting to encrypt/decrypt specially crafted - long filename(s), this flaw would cause a stack-based buffer overflow that - could potentially lead to arbitrary code execution. - . - Note that this is caught by FORTIFY_SOURCE, which makes this a crash-only - bug on wheezy. -Author: Attila Bogar, Jean-Michel Vourgère -Origin: https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2012-4527 -Bug: CVE-2012-4527 -Bug-Debian: http://bugs.debian.org/690924 -Forwarded: no -Last-Update: 2012-11-01 -Index: mcrypt-2.6.8/src/mcrypt.c -=================================================================== ---- mcrypt-2.6.8.orig/src/mcrypt.c -+++ mcrypt-2.6.8/src/mcrypt.c -@@ -41,4 +41,6 @@ - -+/* Temporary error message can contain one file name and 1k of text */ -+#define ERRWIDTH ((PATH_MAX)+1024) --char tmperr[128]; -+char tmperr[ERRWIDTH]; - unsigned int stream_flag = FALSE; - char *keymode = NULL; - char *mode = NULL; -@@ -482,7 +485,7 @@ - #ifdef HAVE_STAT - if (stream_flag == FALSE) { - if (is_normal_file(file[i]) == FALSE) { -- sprintf(tmperr, -+ snprintf(tmperr, ERRWIDTH, - _ - ("%s: %s is not a regular file. Skipping...\n"), - program_name, file[i]); -@@ -501,7 +504,7 @@ - dinfile = file[i]; - if ((isatty(fileno((FILE *) (stdin))) == 1) - && (stream_flag == TRUE) && (force == 0)) { /* not a tty */ -- sprintf(tmperr, -+ snprintf(tmperr, ERRWIDTH, - _ - ("%s: Encrypted data will not be read from a terminal.\n"), - program_name); -@@ -520,7 +523,7 @@ - einfile = file[i]; - if ((isatty(fileno((FILE *) (stdout))) == 1) - && (stream_flag == TRUE) && (force == 0)) { /* not a tty */ -- sprintf(tmperr, -+ snprintf(tmperr, ERRWIDTH, - _ - ("%s: Encrypted data will not be written to a terminal.\n"), - program_name); -@@ -544,7 +547,7 @@ - strcpy(outfile, einfile); - /* if file has already the .nc ignore it */ - if (strstr(outfile, ".nc") != NULL) { -- sprintf(tmperr, -+ snprintf(tmperr, ERRWIDTH, - _ - ("%s: file %s has the .nc suffix... skipping...\n"), - program_name, outfile); -@@ -590,10 +593,10 @@ - - if (x == 0) { - if (stream_flag == FALSE) { -- sprintf(tmperr, _("File %s was decrypted.\n"), dinfile); -+ snprintf(tmperr, ERRWIDTH, _("File %s was decrypted.\n"), dinfile); - err_warn(tmperr); - } else { -- sprintf(tmperr, _("Stdin was decrypted.\n")); -+ snprintf(tmperr, ERRWIDTH, _("Stdin was decrypted.\n")); - err_warn(tmperr); - } - #ifdef HAVE_STAT -@@ -610,7 +613,7 @@ - - } else { - if (stream_flag == FALSE) { -- sprintf(tmperr, -+ snprintf(tmperr, ERRWIDTH, - _ - ("File %s was NOT decrypted successfully.\n"), - dinfile); -@@ -636,10 +639,10 @@ - - if (x == 0) { - if (stream_flag == FALSE) { -- sprintf(tmperr, _("File %s was encrypted.\n"), einfile); -+ snprintf(tmperr, ERRWIDTH, _("File %s was encrypted.\n"), einfile); - err_warn(tmperr); - } else { -- sprintf(tmperr, _("Stdin was encrypted.\n")); -+ snprintf(tmperr, ERRWIDTH, _("Stdin was encrypted.\n")); - err_warn(tmperr); - } - #ifdef HAVE_STAT -@@ -655,7 +658,7 @@ - - } else { - if (stream_flag == FALSE) { -- sprintf(tmperr, -+ snprintf(tmperr, ERRWIDTH, - _ - ("File %s was NOT encrypted successfully.\n"), - einfile); diff --git a/pkgs/tools/misc/mcrypt/sprintf_CVE-2012-4527.patch b/pkgs/tools/misc/mcrypt/sprintf_CVE-2012-4527.patch new file mode 100644 index 00000000000..1c9ade80777 --- /dev/null +++ b/pkgs/tools/misc/mcrypt/sprintf_CVE-2012-4527.patch @@ -0,0 +1,108 @@ +Description: [CVE-2012-4527] Stack-based buffer overflow with long file names + . + A buffer overflow in mcrypt version 2.6.8 and earlier due to long filenames. + If a user were tricked into attempting to encrypt/decrypt specially crafted + long filename(s), this flaw would cause a stack-based buffer overflow that + could potentially lead to arbitrary code execution. + . + Note that this is caught by FORTIFY_SOURCE, which makes this a crash-only + bug on wheezy. +Author: Attila Bogar, Jean-Michel Vourgère +Origin: https://bugzilla.redhat.com/show_bug.cgi?id=CVE-2012-4527 +Bug: CVE-2012-4527 +Bug-Debian: http://bugs.debian.org/690924 +Forwarded: no +Last-Update: 2012-11-01 +Index: mcrypt-2.6.8/src/mcrypt.c +=================================================================== +--- mcrypt-2.6.8.orig/src/mcrypt.c ++++ mcrypt-2.6.8/src/mcrypt.c +@@ -41,4 +41,6 @@ + ++/* Temporary error message can contain one file name and 1k of text */ ++#define ERRWIDTH ((PATH_MAX)+1024) +-char tmperr[128]; ++char tmperr[ERRWIDTH]; + unsigned int stream_flag = FALSE; + char *keymode = NULL; + char *mode = NULL; +@@ -482,7 +485,7 @@ + #ifdef HAVE_STAT + if (stream_flag == FALSE) { + if (is_normal_file(file[i]) == FALSE) { +- sprintf(tmperr, ++ snprintf(tmperr, ERRWIDTH, + _ + ("%s: %s is not a regular file. Skipping...\n"), + program_name, file[i]); +@@ -501,7 +504,7 @@ + dinfile = file[i]; + if ((isatty(fileno((FILE *) (stdin))) == 1) + && (stream_flag == TRUE) && (force == 0)) { /* not a tty */ +- sprintf(tmperr, ++ snprintf(tmperr, ERRWIDTH, + _ + ("%s: Encrypted data will not be read from a terminal.\n"), + program_name); +@@ -520,7 +523,7 @@ + einfile = file[i]; + if ((isatty(fileno((FILE *) (stdout))) == 1) + && (stream_flag == TRUE) && (force == 0)) { /* not a tty */ +- sprintf(tmperr, ++ snprintf(tmperr, ERRWIDTH, + _ + ("%s: Encrypted data will not be written to a terminal.\n"), + program_name); +@@ -544,7 +547,7 @@ + strcpy(outfile, einfile); + /* if file has already the .nc ignore it */ + if (strstr(outfile, ".nc") != NULL) { +- sprintf(tmperr, ++ snprintf(tmperr, ERRWIDTH, + _ + ("%s: file %s has the .nc suffix... skipping...\n"), + program_name, outfile); +@@ -590,10 +593,10 @@ + + if (x == 0) { + if (stream_flag == FALSE) { +- sprintf(tmperr, _("File %s was decrypted.\n"), dinfile); ++ snprintf(tmperr, ERRWIDTH, _("File %s was decrypted.\n"), dinfile); + err_warn(tmperr); + } else { +- sprintf(tmperr, _("Stdin was decrypted.\n")); ++ snprintf(tmperr, ERRWIDTH, _("Stdin was decrypted.\n")); + err_warn(tmperr); + } + #ifdef HAVE_STAT +@@ -610,7 +613,7 @@ + + } else { + if (stream_flag == FALSE) { +- sprintf(tmperr, ++ snprintf(tmperr, ERRWIDTH, + _ + ("File %s was NOT decrypted successfully.\n"), + dinfile); +@@ -636,10 +639,10 @@ + + if (x == 0) { + if (stream_flag == FALSE) { +- sprintf(tmperr, _("File %s was encrypted.\n"), einfile); ++ snprintf(tmperr, ERRWIDTH, _("File %s was encrypted.\n"), einfile); + err_warn(tmperr); + } else { +- sprintf(tmperr, _("Stdin was encrypted.\n")); ++ snprintf(tmperr, ERRWIDTH, _("Stdin was encrypted.\n")); + err_warn(tmperr); + } + #ifdef HAVE_STAT +@@ -655,7 +658,7 @@ + + } else { + if (stream_flag == FALSE) { +- sprintf(tmperr, ++ snprintf(tmperr, ERRWIDTH, + _ + ("File %s was NOT encrypted successfully.\n"), + einfile); diff --git a/pkgs/tools/security/super/default.nix b/pkgs/tools/security/super/default.nix index 73321fd618e..07051731069 100644 --- a/pkgs/tools/security/super/default.nix +++ b/pkgs/tools/security/super/default.nix @@ -17,9 +17,11 @@ stdenv.mkDerivation rec { ''; patches = [ - (fetchpatch { url = "https://salsa.debian.org/debian/super/raw/debian/3.30.0-7/debian/patches/14-Fix-unchecked-setuid-call.patch"; - sha256 = "08m9hw4kyfjv0kqns1cqha4v5hkgp4s4z0q1rgif1fnk14xh7wqh"; - }) + (fetchpatch { + name = "CVE-2014-0470.patch"; + url = "https://salsa.debian.org/debian/super/raw/debian/3.30.0-7/debian/patches/14-Fix-unchecked-setuid-call.patch"; + sha256 = "08m9hw4kyfjv0kqns1cqha4v5hkgp4s4z0q1rgif1fnk14xh7wqh"; + }) ]; NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE"; diff --git a/pkgs/tools/text/a2ps/default.nix b/pkgs/tools/text/a2ps/default.nix index 39f1b7e5bc2..c29060cb82f 100644 --- a/pkgs/tools/text/a2ps/default.nix +++ b/pkgs/tools/text/a2ps/default.nix @@ -17,6 +17,7 @@ stdenv.mkDerivation rec { sha256 = "0grqqsc3m45niac56m19m5gx7gc0m8zvia5iman1l4rlq31shf8s"; }) (fetchpatch { + name = "CVE-2015-8107.patch"; url = "https://sources.debian.net/data/main/a/a2ps/1:4.14-1.3/debian/patches/fix-format-security.diff"; sha256 = "0pq7zl41gf2kc6ahwyjnzn93vbxb4jc2c5g8j20isp4vw6dqrnwv"; }) -- cgit v1.2.3 From ad5f2d248341259406183845bac18c9324931a63 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 21:44:02 +0000 Subject: lexicon: 3.3.17 -> 3.3.22 --- pkgs/tools/admin/lexicon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/lexicon/default.nix b/pkgs/tools/admin/lexicon/default.nix index 31705d1e79c..de967578d5c 100644 --- a/pkgs/tools/admin/lexicon/default.nix +++ b/pkgs/tools/admin/lexicon/default.nix @@ -5,7 +5,7 @@ python3Packages.buildPythonApplication rec { pname = "lexicon"; - version = "3.3.17"; + version = "3.3.22"; propagatedBuildInputs = with python3Packages; [ requests tldextract future cryptography pyyaml boto3 zeep xmltodict beautifulsoup4 dnspython pynamecheap softlayer transip localzone ]; @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { owner = "AnalogJ"; repo = pname; rev = "v${version}"; - sha256 = "1wrsw759am6yp2m9b34iv82m371df3ssp2vhdjr18ys3xk7dvj89"; + sha256 = "1adwqglh3lrx04y0f6slp1l97xzbsqgw0v5i4jll3a54aqyzfz0a"; }; meta = with lib; { -- cgit v1.2.3 From 01539e6f9a7d61b33ad04cc0a03acda736684379 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 6 May 2020 23:47:38 +0200 Subject: cargo-deny: 0.6.6 -> 0.6.7 https://github.com/EmbarkStudios/cargo-deny/releases/tag/0.6.7 --- pkgs/development/tools/rust/cargo-deny/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index 727a789c42f..deba6cc674c 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.6.6"; + version = "0.6.7"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = pname; rev = version; - sha256 = "0pmh6x7rb0v1g087xgyicw9mm4ayppgh7vzvq3hs8vip2zvy7r56"; + sha256 = "1d7zd2wpvfz1vq5ik67m6s1mscivh8b3kz4bfckw3cazk68vn9q1"; }; - cargoSha256 = "00lh6nxc17dyl8z2l70gzc7l1vpn448lzi1c69wxxcqnk8y0ka9w"; + cargoSha256 = "0jy10yfd9d5r0ildyxszs1ppzyd4ninl7lihdnwjqm6qifr1m5rp"; nativeBuildInputs = [ perl pkgconfig ]; -- cgit v1.2.3 From b89d52ee5265073577b7de4f8777533a75a3c091 Mon Sep 17 00:00:00 2001 From: Georg Haas Date: Wed, 6 May 2020 23:49:36 +0200 Subject: teeworlds: 0.7.4 -> 0.7.5 fixes CVE-2020-12066 --- pkgs/games/teeworlds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index 13918d2f7a5..3035c02e262 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "teeworlds"; - version = "0.7.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "teeworlds"; repo = "teeworlds"; rev = version; - sha256 = "1llrzcc9p8pswk58rj4qh4g67nlji8q2kw3hxh3qpli85jvkdmyx"; + sha256 = "1l19ksmimg6b8zzjy0skyhh7z11ql7n5gvilkv7ay5x2b9ndbqwz"; fetchSubmodules = true; }; -- cgit v1.2.3 From 96908213c098404336046a1af3d9402538212d5e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 22:16:22 +0000 Subject: libspiro: 20190731 -> 20200505 --- pkgs/development/libraries/libspiro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libspiro/default.nix b/pkgs/development/libraries/libspiro/default.nix index 0922d3c1730..a77e209119b 100644 --- a/pkgs/development/libraries/libspiro/default.nix +++ b/pkgs/development/libraries/libspiro/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libspiro"; - version = "20190731"; + version = "20200505"; src = fetchFromGitHub { owner = "fontforge"; repo = pname; rev = version; - sha256 = "sha256:1wc6ikjrvcq05jki0ligmxyplgb4nzx6qb5va277qiin8vad9b1v"; + sha256 = "1b5bw5qxqlral96y1n5f3sh9yxm2yij3zkqjmlgd8r1k4j0d3nqw"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; -- cgit v1.2.3 From e5c8250c3e2f032de32a6fb9a747ac8cfd2524ce Mon Sep 17 00:00:00 2001 From: snicket2100 <57048005+snicket2100@users.noreply.github.com> Date: Thu, 7 May 2020 00:17:17 +0200 Subject: ums: 9.1.0 -> 9.4.2 --- pkgs/servers/ums/default.nix | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/ums/default.nix b/pkgs/servers/ums/default.nix index 503ff16caee..3cfa79ca4d3 100644 --- a/pkgs/servers/ums/default.nix +++ b/pkgs/servers/ums/default.nix @@ -4,13 +4,18 @@ stdenv.mkDerivation rec { pname = "ums"; - version = "9.1.0"; - - src = fetchurl { - url = "mirror://sourceforge/project/unimediaserver/Official%20Releases/Linux/" + stdenv.lib.toUpper "${pname}-${version}" + ".tgz"; - sha256 = "07wprjpwqids96v5q5fhwcxqlg8jp1vy585vl2nqbfi1vf5v294s"; - name = "${pname}-${version}.tgz"; - }; + version = "9.4.2"; + + src = { + i686-linux = fetchurl { + url = "mirror://sourceforge/project/unimediaserver/${version}/" + stdenv.lib.toUpper "${pname}-${version}" + "-x86.tgz"; + sha256 = "0i319g2c3z9j131nwh5m92clgnxxxs3izplzhjb30bx4lldmjs1j"; + }; + x86_64-linux = fetchurl { + url = "mirror://sourceforge/project/unimediaserver/${version}/" + stdenv.lib.toUpper "${pname}-${version}" + "-x86_64.tgz"; + sha256 = "07wc0is86fdfyz4as3f17q8pfzl8x55ci65zvpls0a9rfyyvjjw3"; + }; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); buildInputs = [ makeWrapper ]; @@ -21,7 +26,7 @@ stdenv.mkDerivation rec { # ums >= 9.0.0 ships its own JRE in the package. if we remove it, the `UMS.sh` # script will correctly fall back to the JRE specified by JAVA_HOME - rm -rf $out/linux/jre-x64 $out/linux/jre-x86 + rm -rf $out/jre makeWrapper "$out/UMS.sh" "$out/bin/ums" \ --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [ libzen libmediainfo] }" \ -- cgit v1.2.3 From 8b652d31877d55c8724a6ad78916c1bf63bec166 Mon Sep 17 00:00:00 2001 From: snicket2100 <57048005+snicket2100@users.noreply.github.com> Date: Thu, 7 May 2020 00:20:15 +0200 Subject: ums: added snicket2100 as maintainer --- pkgs/servers/ums/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/ums/default.nix b/pkgs/servers/ums/default.nix index 503ff16caee..4256ff6dc2d 100644 --- a/pkgs/servers/ums/default.nix +++ b/pkgs/servers/ums/default.nix @@ -32,6 +32,6 @@ stdenv.mkDerivation rec { description = "Universal Media Server: a DLNA-compliant UPnP Media Server"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.thall ]; + maintainers = with stdenv.lib.maintainers; [ thall snicket2100 ]; }; } -- cgit v1.2.3 From 18a1b153ac9039b3cad1b69b5b437ffd56478b30 Mon Sep 17 00:00:00 2001 From: Evils Date: Mon, 30 Mar 2020 06:13:59 +0200 Subject: kicad: expose base and libraries attributes --- .../science/electronics/kicad/base.nix | 13 ++++++------ .../science/electronics/kicad/default.nix | 23 +++++++++++----------- 2 files changed, 17 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index 6bc66596229..b3e4bf92f7b 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -2,7 +2,6 @@ , libX11, gettext, glew, glm, cairo, curl, openssl, boost, pkgconfig , doxygen, pcre, libpthreadstubs, libXdmcp, fetchpatch, lndir, callPackages -, pname ? "kicad" , stable ? true , baseName ? "kicad" , versions ? { } @@ -20,26 +19,26 @@ with lib; let versionConfig = versions.${baseName}; - baseVersion = "${versions.${baseName}.kicadVersion.version}"; # oce on aarch64 fails a test withOCE = oceSupport && !stdenv.isAarch64; withOCC = (withOCCT && !withOCE) || (oceSupport && stdenv.isAarch64); - kicad-libraries = callPackages ./libraries.nix versionConfig.libVersion; + libraries = callPackages ./libraries.nix versionConfig.libVersion; in stdenv.mkDerivation rec { - inherit pname; - version = "base-${baseVersion}"; + i18n = libraries.i18n; + + pname = "kicad-base"; + version = "${versions.${baseName}.kicadVersion.version}"; src = fetchFromGitLab ( { group = "kicad"; owner = "code"; repo = "kicad"; - rev = baseVersion; } // versionConfig.kicadVersion.src ); @@ -113,7 +112,7 @@ stdenv.mkDerivation rec { postInstall = optional (withI18n) '' mkdir -p $out/share - lndir ${kicad-libraries.i18n}/share $out/share + lndir ${i18n}/share $out/share ''; meta = { diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index f03a0a0ccef..221dbaf9287 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -35,17 +35,16 @@ let python = python3; wxPython = python3Packages.wxPython_4_0; - libraries = callPackages ./libraries.nix versionConfig.libVersion; +in +stdenv.mkDerivation rec { + + passthru.libraries = callPackages ./libraries.nix versionConfig.libVersion; base = callPackage ./base.nix { - pname = baseName; inherit versions stable baseName; inherit wxGTK python wxPython; inherit debug withI18n withOCCT oceSupport ngspiceSupport scriptingSupport; }; -in -stdenv.mkDerivation rec { - inherit pname; version = versions.${baseName}.kicadVersion.version; @@ -63,7 +62,7 @@ stdenv.mkDerivation rec { # wrapGAppsHook added the equivalent to ${base}/share # though i noticed no difference without it - makeWrapperArgs = [ + makeWrapperArgs = with passthru.libraries; [ "--prefix XDG_DATA_DIRS : ${base}/share" "--prefix XDG_DATA_DIRS : ${hicolor-icon-theme}/share" "--prefix XDG_DATA_DIRS : ${gnome3.defaultIconTheme}/share" @@ -73,13 +72,13 @@ stdenv.mkDerivation rec { "--prefix XDG_DATA_DIRS : ${cups}/share" "--prefix GIO_EXTRA_MODULES : ${gnome3.dconf}/lib/gio/modules" - "--set KISYSMOD ${libraries.footprints}/share/kicad/modules" - "--set KICAD_SYMBOL_DIR ${libraries.symbols}/share/kicad/library" - "--set KICAD_TEMPLATE_DIR ${libraries.templates}/share/kicad/template" - "--prefix KICAD_TEMPLATE_DIR : ${libraries.symbols}/share/kicad/template" - "--prefix KICAD_TEMPLATE_DIR : ${libraries.footprints}/share/kicad/template" + "--set KISYSMOD ${footprints}/share/kicad/modules" + "--set KICAD_SYMBOL_DIR ${symbols}/share/kicad/library" + "--set KICAD_TEMPLATE_DIR ${templates}/share/kicad/template" + "--prefix KICAD_TEMPLATE_DIR : ${symbols}/share/kicad/template" + "--prefix KICAD_TEMPLATE_DIR : ${footprints}/share/kicad/template" ] - ++ optionals (with3d) [ "--set KISYS3DMOD ${libraries.packages3d}/share/kicad/modules/packages3d" ] + ++ optionals (with3d) [ "--set KISYS3DMOD ${packages3d}/share/kicad/modules/packages3d" ] ++ optionals (ngspiceSupport) [ "--prefix LD_LIBRARY_PATH : ${libngspice}/lib" ] # infinisil's workaround for #39493 -- cgit v1.2.3 From 95e4e33bdfd03adce366f09b5cd7db4ee9e86a91 Mon Sep 17 00:00:00 2001 From: Evils Date: Sat, 28 Mar 2020 01:39:57 +0100 Subject: kicad-unstable-small: init to make kicad-unstable the -small packages depend on all hydra buildable dependencies the non-small ones depend on packages3d which exceeds hydra's limit set platforms to all (kicad is cross-platform) clarify package differences in the description set maintainers on just the top level derivation switch -unstable to not save debug symbols indicate patch in version string note broken dependencies --- .../science/electronics/kicad/base.nix | 7 ++-- .../science/electronics/kicad/default.nix | 33 +++++++++++------- .../science/electronics/kicad/libraries.nix | 39 +++++++++++++--------- pkgs/top-level/all-packages.nix | 9 ++++- 4 files changed, 57 insertions(+), 31 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index b3e4bf92f7b..9fc1111c7b9 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -56,9 +56,11 @@ stdenv.mkDerivation rec { # tagged releases don't have "unknown" # kicad nightlies use git describe --dirty # nix removes .git, so its approximated here + # "-1" appended to indicate we're adding a patch postPatch = '' substituteInPlace CMakeModules/KiCadVersion.cmake \ - --replace "unknown" ${builtins.substring 0 10 src.rev} + --replace "unknown" "${builtins.substring 0 10 src.rev}-1" \ + --replace "${version}" "${version}-1" ''; makeFlags = optional (debug) [ "CFLAGS+=-Og" "CFLAGS+=-ggdb" ]; @@ -123,7 +125,6 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.kicad-pcb.org/"; license = licenses.agpl3; - maintainers = with maintainers; [ evils kiwi berce ]; - platforms = with platforms; linux; + platforms = platforms.all; }; } diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 221dbaf9287..51ec1dad8aa 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -4,6 +4,7 @@ , librsvg, cups , pname ? "kicad" +, stable ? true , oceSupport ? false, opencascade , withOCCT ? true, opencascade-occt , ngspiceSupport ? true, libngspice @@ -18,7 +19,6 @@ assert ngspiceSupport -> libngspice != null; with lib; let - stable = pname != "kicad-unstable"; baseName = if (stable) then "kicad" else "kicad-unstable"; versions = import ./versions.nix; @@ -122,10 +122,11 @@ stdenv.mkDerivation rec { # and can't git commit if this could be running in parallel with other scripts passthru.updateScript = [ ./update.sh "all" ]; - meta = { - description = if (stable) - then "Open Source Electronics Design Automation Suite" - else "Open Source EDA Suite, Development Build"; + meta = rec { + description = (if (stable) + then "Open Source Electronics Design Automation suite" + else "Open Source EDA suite, development build") + + (if (!with3d) then ", without 3D models" else ""); homepage = "https://www.kicad-pcb.org/"; longDescription = '' KiCad is an open source software suite for Electronic Design Automation. @@ -133,12 +134,20 @@ stdenv.mkDerivation rec { ''; license = licenses.agpl3; # berce seems inactive... - maintainers = with maintainers; [ evils kiwi berce ]; - # kicad's cross-platform, not sure what to fill in here - platforms = with platforms; linux; - } // optionalAttrs with3d { - # We can't download the 3d models on Hydra - they are a ~1 GiB download and - # they occupy ~5 GiB in store. - hydraPlatforms = []; + maintainers = with stdenv.lib.maintainers; [ evils kiwi berce ]; + # kicad is cross platform + platforms = stdenv.lib.platforms.all; + # despite that, nipkgs' wxGTK for darwin is "wxmac" + # and wxPython_4_0 does not account for this + # adjusting this package to downgrade to python2Packages.wxPython (wxPython 3), + # seems like more trouble than fixing wxPython_4_0 would be + # additionally, libngspice is marked as linux only, though it should support darwin + + hydraPlatforms = if (with3d) then [ ] else platforms; + # We can't download the 3d models on Hydra, + # they are a ~1 GiB download and they occupy ~5 GiB in store. + # as long as the base and libraries (minus 3d) are build, + # this wrapper does not need to get built + # the kicad-*small "packages" cause this to happen }; } diff --git a/pkgs/applications/science/electronics/kicad/libraries.nix b/pkgs/applications/science/electronics/kicad/libraries.nix index 7cdf9373e08..4dde2a0a122 100644 --- a/pkgs/applications/science/electronics/kicad/libraries.nix +++ b/pkgs/applications/science/electronics/kicad/libraries.nix @@ -13,21 +13,27 @@ with lib; let mkLib = name: - stdenv.mkDerivation - { - pname = "kicad-${name}"; - version = "${version}"; - src = fetchFromGitHub ( - { - owner = "KiCad"; - repo = "kicad-${name}"; - rev = version; - inherit name; - } // (libSources.${name} or { }) - ); - nativeBuildInputs = [ cmake ]; - meta.license = licenses.cc-by-sa-40; + stdenv.mkDerivation { + pname = "kicad-${name}"; + version = "${version}"; + src = fetchFromGitHub ( + { + owner = "KiCad"; + repo = "kicad-${name}"; + rev = version; + inherit name; + } // (libSources.${name} or { }) + ); + nativeBuildInputs = [ cmake ]; + + meta = rec { + license = licenses.cc-by-sa-40; + platforms = stdenv.lib.platforms.all; + # the 3d models are a ~1 GiB download and occupy ~5 GiB in store. + # this would exceed the hydra output limit + hydraPlatforms = if (name == "packages3d" ) then [ ] else platforms; }; + }; in { symbols = mkLib "symbols"; @@ -56,6 +62,9 @@ in ); buildInputs = [ gettext ]; nativeBuildInputs = [ cmake ]; - meta.license = licenses.gpl2; # https://github.com/KiCad/kicad-i18n/issues/3 + meta = { + license = licenses.gpl2; # https://github.com/KiCad/kicad-i18n/issues/3 + platforms = stdenv.lib.platforms.all; + }; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e8eb8461ee..269d5b577ab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24894,9 +24894,16 @@ in fped = callPackage ../applications/science/electronics/fped { }; + # this is a wrapper for kicad.base and kicad.libraries kicad = callPackage ../applications/science/electronics/kicad { }; kicad-small = kicad.override { pname = "kicad-small"; with3d = false; }; - kicad-unstable = kicad.override { pname = "kicad-unstable"; debug = true; }; + kicad-unstable = kicad.override { pname = "kicad-unstable"; stable = false; }; + # mostly here so the kicad-unstable components (except packages3d) get built + kicad-unstable-small = kicad.override { + pname = "kicad-unstable-small"; + stable = false; + with3d = false; + }; librepcb = libsForQt5.callPackage ../applications/science/electronics/librepcb { }; -- cgit v1.2.3 From 1059fdf1433bc4964faaa2010bfde54d8c8c687f Mon Sep 17 00:00:00 2001 From: Evils Date: Sun, 5 Apr 2020 21:23:36 +0200 Subject: kicad: link utils; clean up wrapper installPhase --- .../science/electronics/kicad/default.nix | 47 +++++++++------------- 1 file changed, 20 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index 51ec1dad8aa..2aa2686a29a 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -85,34 +85,27 @@ stdenv.mkDerivation rec { ++ [ "--set GDK_PIXBUF_MODULE_FILE ${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" ] ; - # dunno why i have to add $makeWrapperArgs manually... + # why does $makeWrapperArgs have to be added explicitly? # $out and $program_PYTHONPATH don't exist when makeWrapperArgs gets set? - # not sure if anything has to be done with the other stuff in base/bin - # dxf2idf, idf2vrml, idfcyl, idfrect, kicad2step, kicad-ogltest - installPhase = - optionalString (scriptingSupport) '' buildPythonPath "${base} $pythonPath" - '' + - '' makeWrapper ${base}/bin/kicad $out/bin/kicad $makeWrapperArgs '' - + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" - '' + - '' makeWrapper ${base}/bin/pcbnew $out/bin/pcbnew $makeWrapperArgs '' - + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" - '' + - '' makeWrapper ${base}/bin/eeschema $out/bin/eeschema $makeWrapperArgs '' - + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" - '' + - '' makeWrapper ${base}/bin/gerbview $out/bin/gerbview $makeWrapperArgs '' - + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" - '' + - '' makeWrapper ${base}/bin/pcb_calculator $out/bin/pcb_calculator $makeWrapperArgs '' - + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" - '' + - '' makeWrapper ${base}/bin/pl_editor $out/bin/pl_editor $makeWrapperArgs '' - + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" - '' + - '' makeWrapper ${base}/bin/bitmap2component $out/bin/bitmap2component $makeWrapperArgs '' - + optionalString (scriptingSupport) '' --set PYTHONPATH "$program_PYTHONPATH" - '' + # kicad-ogltest's source seems to indicate that crashing is expected behaviour... + installPhase = with lib; + let + tools = [ "kicad" "pcbnew" "eeschema" "gerbview" "pcb_calculator" "pl_editor" "bitmap2component" ]; + utils = [ "dxf2idf" "idf2vrml" "idfcyl" "idfrect" "kicad2step" "kicad-ogltest" ]; + in + ( concatStringsSep "\n" + ( flatten [ + ( optionalString (scriptingSupport) "buildPythonPath \"${base} $pythonPath\" \n" ) + + # wrap each of the directly usable tools + ( map ( tool: "makeWrapper ${base}/bin/${tool} $out/bin/${tool} $makeWrapperArgs" + + optionalString (scriptingSupport) " --set PYTHONPATH \"$program_PYTHONPATH\"" + ) tools ) + + # link in the CLI utils + ( map ( util: "ln -s ${base}/bin/${util} $out/bin/${util}" ) utils ) + ]) + ) ; # can't run this for each pname -- cgit v1.2.3 From 2d3d8c4d6676e353d73d0028ec52217a01070e88 Mon Sep 17 00:00:00 2001 From: Evils Date: Sat, 2 May 2020 13:22:57 +0200 Subject: kicad-unstable: 2020-04-25 -> 2020-05-06 --- .../science/electronics/kicad/versions.nix | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 174532d6962..2b7c91751e5 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -27,25 +27,25 @@ }; "kicad-unstable" = { kicadVersion = { - version = "2020-04-25"; + version = "2020-05-06"; src = { - rev = "3759799d1e03b2da6a0dcd72273e4978880fc8f1"; - sha256 = "0ba14fla8m5zli68wfjkfc4ymvj4j8z92y3jigxs8hys0450bybi"; + rev = "c92181621e2e51dc8aae1bd9f4483bb3301ffaa5"; + sha256 = "0s50xn5gbjy7yxnp9yiynxvxi2mkcrp6yghgdzclpm40rnfyi0v5"; }; }; libVersion = { - version = "2020-04-25"; + version = "2020-05-06"; libSources = { - i18n.rev = "fc14baa52ca56a58b0048ab860bf31887d3cf8eb"; - i18n.sha256 = "05nayab7dkjyq7g3i9q7k55hcckpc0cmq4bbklmxx16rx4rbhzc6"; - symbols.rev = "0f9ff2d17237f90bb649bf0a52b6d454f68197e8"; - symbols.sha256 = "1a54428syn2xksc00n2bvh1alrx2vrqmp7cg7d2rn8nlq8yk4qd5"; + i18n.rev = "f29cab831eb823165fa2c5efab5d9c9b443e62e2"; + i18n.sha256 = "0cc0zvpml75yxphay3281f762ls08fzvv538cd5hmkr8xqlj3vbi"; + symbols.rev = "d4245ae8cf633095a0994ab01492bd56cd124112"; + symbols.sha256 = "11pynjgji3skw42q5mryz98f8z418k43jy6s2k90w6jv638z3cb0"; templates.rev = "7db8d4d0ea0711f1961d117853547fb3edbc3857"; templates.sha256 = "1hppcsrkn4dk6ggby6ckh0q65qxkywrbyxa4lwpaf7pxjyv498xg"; - footprints.rev = "61df6d8853b4c68cca0ac87784c0a33cff9394d3"; - footprints.sha256 = "0blmhk8pwd4mi6rlsr4lf4lq7j01h6xbpbvr3pm8pmw8zylhi54v"; - packages3d.rev = "88bcf2e817fe000bb2c05e14489afc3b1a4e10ed"; - packages3d.sha256 = "0z9p1fn5xbz940kr5jz2ibzf09hpdi1c9izmabkffvrnfy6408x6"; + footprints.rev = "3bff23ee339bc48490bb39deba5d8b2f1f42733e"; + footprints.sha256 = "0430r8k49ib6w1sjr8fx42szbz960yhlzg4w80jl5bwasq67nqwd"; + packages3d.rev = "889a3dd550233ec51baed4a04a01d4cc64a8d747"; + packages3d.sha256 = "152zv4j51v8skqlvrabblpcqpbn5yf3grisjj8vnwf7kdd41chb2"; }; }; }; -- cgit v1.2.3 From 7f845578afda02eea00f75ffd10bd00fe78b9fa3 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Wed, 6 May 2020 21:03:41 -0400 Subject: rustPlatform: fix bug with ambiguous diff tool If a user provides `nativeBuildInputs = [ llvmPackages.bintools ]` or any other package containing a `${prefix}/bin/diff`, the builder could use it instead of the standard unix `diff`, causing a build failure. This updates the call to specify an abspath to `diff` and avoid reliance on `PATH`. Resolves #87081 --- pkgs/build-support/rust/default.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index 93770d71a10..a6b47930c27 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -1,4 +1,14 @@ -{ stdenv, cacert, git, rust, cargo, rustc, fetchCargoTarball, buildPackages, windows }: +{ stdenv +, buildPackages +, cacert +, cargo +, diffutils +, fetchCargoTarball +, git +, rust +, rustc +, windows +}: { name ? "${args.pname}-${args.version}" , cargoSha256 ? "unset" @@ -58,6 +68,10 @@ let cxxForHost="${stdenv.cc}/bin/${stdenv.cc.targetPrefix}c++"; releaseDir = "target/${rustTarget}/${buildType}"; + # Specify the stdenv's `diff` by abspath to ensure that the user's build + # inputs do not cause us to find the wrong `diff`. + diff = "${diffutils}/bin/diff"; + in stdenv.mkDerivation (args // { @@ -110,7 +124,7 @@ stdenv.mkDerivation (args // { srcLockfile=$NIX_BUILD_TOP/$sourceRoot/Cargo.lock echo "Validating consistency between $srcLockfile and $cargoDepsLockfile" - if ! diff $srcLockfile $cargoDepsLockfile; then + if ! ${diff} $srcLockfile $cargoDepsLockfile; then # If the diff failed, first double-check that the file exists, so we can # give a friendlier error msg. -- cgit v1.2.3 From 15b922f4e34be260a058f4f8adf5e2efb07b724d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 7 May 2020 03:40:43 +0000 Subject: vapoursynth-mvtools: 21 -> 22 --- pkgs/development/libraries/vapoursynth-mvtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vapoursynth-mvtools/default.nix b/pkgs/development/libraries/vapoursynth-mvtools/default.nix index dc2869f3723..5fa35751e24 100644 --- a/pkgs/development/libraries/vapoursynth-mvtools/default.nix +++ b/pkgs/development/libraries/vapoursynth-mvtools/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "vapoursynth-mvtools"; - version = "21"; + version = "22"; src = fetchFromGitHub { owner = "dubhater"; repo = "vapoursynth-mvtools"; rev = "v${version}"; - sha256 = "0vjxpp4jmmjhcp8z81idsbgq6jyx0l4r4i32b8alnp6c9fahjh6p"; + sha256 = "11al56liaahkr3819iynq83k8n42wvijfv2ja5fsjdl6j4zfzpbr"; }; nativeBuildInputs = [ pkgconfig ]; -- cgit v1.2.3 From 4dd83ab6012cfd3a6e2fd094a3febbd4d688500b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 6 May 2020 07:27:19 +0100 Subject: home-assistant: limit tests to Linux --- pkgs/servers/home-assistant/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 03805344ae6..95fe900c223 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, fetchFromGitHub, fetchpatch, python3, protobuf3_6 +{ stdenv, lib, fetchurl, fetchFromGitHub, fetchpatch, python3, protobuf3_6 # Look up dependencies of specified components in component-packages.nix , extraComponents ? [ ] @@ -98,6 +98,9 @@ in with py.pkgs; buildPythonApplication rec { sqlalchemy aiohttp-cors hass-frontend pyotp pyqrcode ciso8601 ] ++ componentBuildInputs ++ extraBuildInputs; + # upstream only tests on Linux, so do we. + doCheck = stdenv.isLinux; + checkInputs = [ asynctest pytest pytest-aiohttp requests-mock hass-nabucasa netdisco pydispatcher ]; -- cgit v1.2.3 From 004b30e592a212a390ad1e6576bc5c87d0e4766e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 23:32:24 +0000 Subject: nuspell: 3.1.0 -> 3.1.1 --- pkgs/development/libraries/nuspell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nuspell/default.nix b/pkgs/development/libraries/nuspell/default.nix index 0cda3d6ac9a..57c47c79f84 100644 --- a/pkgs/development/libraries/nuspell/default.nix +++ b/pkgs/development/libraries/nuspell/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "nuspell"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "nuspell"; repo = "nuspell"; rev = "v${version}"; - sha256 = "19mwjg5mz645i4ijhx93rqbcim14ca6nczymr20p0z0pn5mx5p18"; + sha256 = "18zz3rdzlb3knzsd98vw8cfyb3iq0ilipnlz7rz10zgb5ail73s2"; }; nativeBuildInputs = [ cmake pkgconfig ronn ]; -- cgit v1.2.3 From 1d70df32ae00274654b79c498954f67f7f1ca298 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 17:23:07 +0000 Subject: brotab: 1.2.1 -> 1.2.2 --- pkgs/tools/misc/brotab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/brotab/default.nix b/pkgs/tools/misc/brotab/default.nix index 7e827f007eb..854958dc8a3 100644 --- a/pkgs/tools/misc/brotab/default.nix +++ b/pkgs/tools/misc/brotab/default.nix @@ -1,14 +1,14 @@ { lib, fetchFromGitHub, glibcLocales, python }: python.pkgs.buildPythonApplication rec { - version = "1.2.1"; + version = "1.2.2"; pname = "brotab"; src = fetchFromGitHub { owner = "balta2ar"; repo = pname; rev = version; - sha256 = "14yz0szwzdjvwkw24rma34y6iiwnw9qzsm89gkglc0xxa6msg6j3"; + sha256 = "1c6npyws705qf9rv70mmh7d0almmpxz87a0n65lhw08lms1h3dl2"; }; propagatedBuildInputs = with python.pkgs; [ -- cgit v1.2.3 From cface1035450a05d438fe0ef8c73365d83a5da96 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 23:22:58 +0000 Subject: netsniff-ng: 0.6.6 -> 0.6.7 --- pkgs/tools/networking/netsniff-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix index c0c7b6782df..9eb9afcb0e7 100644 --- a/pkgs/tools/networking/netsniff-ng/default.nix +++ b/pkgs/tools/networking/netsniff-ng/default.nix @@ -4,14 +4,14 @@ stdenv.mkDerivation rec { pname = "netsniff-ng"; - version = "0.6.6"; + version = "0.6.7"; # Upstream recommends and supports git src = fetchFromGitHub { repo = pname; owner = pname; rev = "v${version}"; - sha256 = "0spp8dl4i5xcqfbqxxcpdf3gwcmyf4ywl1dd79w6gzbr07p894p5"; + sha256 = "1jvihq30cwlpjqwny0lcrciysn40wscq6xik3s9b81nw2s7wiyqr"; }; nativeBuildInputs = [ pkgconfig makeWrapper bison flex ]; -- cgit v1.2.3 From 2bbfc9b8d69772a4b1e41d885a0b929021354cd7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 12:15:47 +0000 Subject: pgbouncer: 1.12.0 -> 1.13.0 --- pkgs/servers/sql/pgbouncer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/pgbouncer/default.nix b/pkgs/servers/sql/pgbouncer/default.nix index f71afc2b674..0a6d1a8cf61 100644 --- a/pkgs/servers/sql/pgbouncer/default.nix +++ b/pkgs/servers/sql/pgbouncer/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pgbouncer"; - version = "1.12.0"; + version = "1.13.0"; src = fetchurl { url = "https://pgbouncer.github.io/downloads/files/${version}/${pname}-${version}.tar.gz"; - sha256 = "0gi7ggmyjqd4kxdwm5csmzmjmfrjx7q20dfzk3da1bvc6xj6ag0v"; + sha256 = "0ccxr0hbj9h5pwsj2712mxif197j770qkfjv6na5aqh5bz4j3f2c"; }; nativeBuildInputs = [ pkg-config ]; -- cgit v1.2.3 From 59cb7350727f844ac85436c5901734a4bd872e4e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 7 May 2020 02:21:42 +0000 Subject: simplenote: 1.15.1 -> 1.16.0 --- pkgs/applications/misc/simplenote/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index 195437250a1..46b80dc98f0 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -16,10 +16,10 @@ let pname = "simplenote"; - version = "1.15.1"; + version = "1.16.0"; sha256 = { - x86_64-linux = "1q1y5favj2ny0l2iq53vq39ns68zfr2z1plskxdg2d93jarvcr8x"; + x86_64-linux = "01nk3dbyhs0p7f6b4bkrng95i29g0x7vxj0rx1qb7sm3n11yi091"; }.${system} or throwSystem; meta = with stdenv.lib; { -- cgit v1.2.3 From c558a735fa2136a0393c56c773ec1e68194c1820 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Wed, 6 May 2020 19:21:34 +0200 Subject: vscode.extensions.scalameta.metals: 1.6.3 -> 1.9.0 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 475d18e3ac7..cb145ade054 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -158,8 +158,8 @@ in mktplcRef = { name = "metals"; publisher = "scalameta"; - version = "1.6.3"; - sha256 = "1mc3awybzd2ql1b86inirhsw3j2c7cs0b0nvbjp38jjpq674bmj7"; + version = "1.9.0"; + sha256 = "0p2wbnw98zmjbfiz4mi1mh131s78r01kjnja339lwdigqxg88gi6"; }; meta = { license = stdenv.lib.licenses.asl20; -- cgit v1.2.3 From 3d59ba956935191c7843b3f9aee081920c684c4a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 11:07:03 +0000 Subject: profile-sync-daemon: 6.36 -> 6.38 --- pkgs/tools/misc/profile-sync-daemon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix index fd17de60f20..790bf73a44d 100644 --- a/pkgs/tools/misc/profile-sync-daemon/default.nix +++ b/pkgs/tools/misc/profile-sync-daemon/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, utillinux, coreutils}: stdenv.mkDerivation rec { - version = "6.36"; + version = "6.38"; pname = "profile-sync-daemon"; src = fetchurl { url = "https://github.com/graysky2/profile-sync-daemon/archive/v${version}.tar.gz"; - sha256 = "0zw9fqpfiz1ld443cw2vp54y86maksmq4mnjs73nlp00nn5z2047"; + sha256 = "0mhjgd2b3grdaad64b72m8i5rm9k58yx7kpiqmhmd3kl5qlgxagy"; }; installPhase = '' -- cgit v1.2.3 From 8fb5360fa5196ab064b67d59641ab8c593f9cc35 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 04:48:36 +0000 Subject: opensmtpd-extras: 6.4.0 -> 6.7.1 --- pkgs/servers/mail/opensmtpd/extras.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/opensmtpd/extras.nix b/pkgs/servers/mail/opensmtpd/extras.nix index 803ba0ee6c7..6c29de8cddb 100644 --- a/pkgs/servers/mail/opensmtpd/extras.nix +++ b/pkgs/servers/mail/opensmtpd/extras.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "opensmtpd-extras"; - version = "6.4.0"; + version = "6.7.1"; src = fetchurl { url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz"; - sha256 = "09k25l7zy5ch3fk6qphni2h0rxdp8wacmfag1whi608dgimrhrnb"; + sha256 = "1b1mx71bvmv92lbm08wr2p60g3qhikvv3n15zsr6dcwbk9aqahzq"; }; nativeBuildInputs = [ pkgconfig ]; -- cgit v1.2.3 From 2979b2ac27fcd7db9bbe12e1374cc8458e4b5bda Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 05:05:47 +0000 Subject: ocrmypdf: 9.6.1 -> 9.8.0 --- pkgs/tools/text/ocrmypdf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix index 83d0bdd92c7..19690e270af 100644 --- a/pkgs/tools/text/ocrmypdf/default.nix +++ b/pkgs/tools/text/ocrmypdf/default.nix @@ -29,14 +29,14 @@ let in buildPythonApplication rec { pname = "ocrmypdf"; - version = "9.6.1"; + version = "9.8.0"; disabled = ! python3Packages.isPy3k; src = fetchFromGitHub { owner = "jbarlow83"; repo = "OCRmyPDF"; rev = "v${version}"; - sha256 = "0lbld11r8zds79183hh5y2f5fi7cacl7bx9f7f2g58j38y1c65vj"; + sha256 = "1l4bwnbd3g0wmdx8yv8hi5wm2z2q67y9mwrvrc4xxmkdrb5y8jcd"; }; nativeBuildInputs = with python3Packages; [ -- cgit v1.2.3 From 103d50e39d332c0dc38dcde92c47c37412c9a77a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 01:41:27 +0000 Subject: networkmanager_strongswan: 1.4.5 -> 1.5.0 --- pkgs/tools/networking/network-manager/strongswan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/network-manager/strongswan/default.nix b/pkgs/tools/networking/network-manager/strongswan/default.nix index 4f0a516b420..a1c6962d3f9 100644 --- a/pkgs/tools/networking/network-manager/strongswan/default.nix +++ b/pkgs/tools/networking/network-manager/strongswan/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "NetworkManager-strongswan"; - version = "1.4.5"; + version = "1.5.0"; src = fetchurl { url = "https://download.strongswan.org/NetworkManager/${pname}-${version}.tar.bz2"; - sha256 = "015xcj42pd84apa0j0n9r3fhldp42mj72dqvl2xf4r9gwg5nhfrl"; + sha256 = "1x6hivr1v76fxy1dn82xrj9rj8k3r097kf4yiblqq16y631hxzy4"; }; buildInputs = [ networkmanager strongswanNM libsecret gtk3 libnma ]; -- cgit v1.2.3 From 044b8c51c9aae433fd60948abc52f0a98fa2a35b Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 09:37:24 +0000 Subject: pax-utils: 1.2.5 -> 1.2.6 --- pkgs/os-specific/linux/pax-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index f8c75b1913b..f69b2bd7fce 100644 --- a/pkgs/os-specific/linux/pax-utils/default.nix +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pax-utils"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { url = "http://distfiles.gentoo.org/distfiles/${pname}-${version}.tar.xz"; - sha256 = "1v4jwbda25w07qhlx5xc5i0hwsv3pjy8hfy0r93vnmfjxq61grvw"; + sha256 = "08bzvgv1z3371sqf7zlm9i0b1y3wdymj2dqdvzvf192k3nix4hlp"; }; makeFlags = [ "PREFIX=$(out)" ]; -- cgit v1.2.3 From bdcefc1053c898f88b6f8fb58979a5d7034a4779 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 20:38:41 +0000 Subject: marvin: 20.9.0 -> 20.10.0 --- pkgs/applications/science/chemistry/marvin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix index c54fb3444bb..9512a288d80 100644 --- a/pkgs/applications/science/chemistry/marvin/default.nix +++ b/pkgs/applications/science/chemistry/marvin/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "marvin"; - version = "20.9.0"; + version = "20.10.0"; src = fetchurl { name = "marvin-${version}.deb"; url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; - sha256 = "1c6q1vb96jsb37g5qbhzcnasd5pdqjyc190yg3caw3gwrd97889q"; + sha256 = "042ndlns48pa6mn6wyrp4q9c1v0a2vzcnhw5l766zdnxdjyv0acx"; }; nativeBuildInputs = [ dpkg makeWrapper ]; -- cgit v1.2.3 From 5bc190048a05858d1eca069e81d89ba8312bfb40 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 02:57:35 +0000 Subject: mlterm: 3.8.9 -> 3.9.0 --- pkgs/applications/misc/mlterm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix index da6250fadf3..f58fb13e61f 100644 --- a/pkgs/applications/misc/mlterm/default.nix +++ b/pkgs/applications/misc/mlterm/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "mlterm"; - version = "3.8.9"; + version = "3.9.0"; src = fetchurl { url = "mirror://sourceforge/project/mlterm/01release/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "1iy7wq953gcnygr1d04h5ddvhpmy8l575n5is2w0rj3ck31ihpqd"; + sha256 = "17h6j4nmbyvsx2shm8mqm7smzq9i7mbqxjw19c2m0rhf5yzqhr3k"; }; nativeBuildInputs = [ pkgconfig autoconf ]; -- cgit v1.2.3 From 12372adc21aed6267576d0fcf5602ebcaa618101 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 21:02:34 +0000 Subject: librelp: 1.5.0 -> 1.6.0 --- pkgs/development/libraries/librelp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/librelp/default.nix b/pkgs/development/libraries/librelp/default.nix index 17f9537e418..7d0eb7f67dd 100644 --- a/pkgs/development/libraries/librelp/default.nix +++ b/pkgs/development/libraries/librelp/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "librelp"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "rsyslog"; repo = "librelp"; rev = "v${version}"; - sha256 = "1il8dany6y981ficrwnxjlc13v5lj6gqia5678p5pj6bcbq7l7lb"; + sha256 = "132i1b1m7c7hkbxsnpa7n07cbghxjxmcbb8zhgwziaxg4nzxsa6l"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; -- cgit v1.2.3 From 00f66e1bf418429637047bea73d023be4185830f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 21:27:18 +0000 Subject: libsolv: 0.7.11 -> 0.7.13 --- pkgs/development/libraries/libsolv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index b4dd8ccbfb5..9443846acf1 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: stdenv.mkDerivation rec { - version = "0.7.11"; + version = "0.7.13"; pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = version; - sha256 = "1jq08qgj05cr9zk5paj3qvma7y2ixvkqlvbszcgmfvx0yq4gl1af"; + sha256 = "1hjk7r7047i451xjgw72in62pya1h1436fvx945vxlvswl5s6iw8"; }; cmakeFlags = [ -- cgit v1.2.3 From 9ffd5507e1d530459aee19cfc7c40c77bc078400 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 19:23:12 +0000 Subject: ldb: 2.1.1 -> 2.1.2 --- pkgs/development/libraries/ldb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index a0cb8a7762b..702738fdfc0 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "ldb"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { url = "mirror://samba/ldb/${pname}-${version}.tar.gz"; - sha256 = "jO+y8l/KkT+hinktDvsDrwf4f1uVGkze0DD1uY8lx7A="; + sha256 = "0x6yr14znp42b92i7br4wxfjri6i689dsifzz9kbyzvn558a16b4"; }; outputs = [ "out" "dev" ]; -- cgit v1.2.3 From 9be92a964aadd2bc863a0351207e666a2f4755a9 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Tue, 5 May 2020 23:09:43 +0000 Subject: mujs: 1.0.6 -> 1.0.7 --- pkgs/development/interpreters/mujs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix index 2abcec68c86..692aed3e4ee 100644 --- a/pkgs/development/interpreters/mujs/default.nix +++ b/pkgs/development/interpreters/mujs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mujs"; - version = "1.0.6"; + version = "1.0.7"; src = fetchurl { url = "https://mujs.com/downloads/mujs-${version}.tar.xz"; - sha256 = "1q9w2dcspfp580pzx7sw7x9gbn8j0ak6dvj75wd1ml3f3q3i43df"; + sha256 = "1ilhay15z4k7mlzs6g2d00snivin7vp72dfw5wwpmc0x70jr31l2"; }; buildInputs = [ readline ]; -- cgit v1.2.3 From 8ccf1943707e7ef475c86cb4234c4099e5a5a326 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 May 2020 07:15:44 +0000 Subject: openfst: 1.7.4 -> 1.7.6 --- pkgs/development/libraries/openfst/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openfst/default.nix b/pkgs/development/libraries/openfst/default.nix index 49c3c2629c5..a8e65aebc45 100644 --- a/pkgs/development/libraries/openfst/default.nix +++ b/pkgs/development/libraries/openfst/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "openfst"; - version = "1.7.4"; + version = "1.7.6"; src = fetchurl { url = "http://www.openfst.org/twiki/pub/FST/FstDownload/${pname}-${version}.tar.gz"; - sha256 = "0drhq5348vbaccpa0z3jvd5hyv5bm2i9xrak1wb4yvl2mx77dbmh"; + sha256 = "03hs0196qbjfbviqn6nnb7igvv3cnpxyizlwlzmx88a6fhiq97bm"; }; meta = { description = "Library for working with finite-state transducers"; -- cgit v1.2.3 From f150c2bd229aeed78ebd4f57f75ecedc79c27fbc Mon Sep 17 00:00:00 2001 From: Johan Thomsen Date: Thu, 7 May 2020 09:10:35 +0200 Subject: kubeval: 0.14.0 -> 0.15.0 Also, add myself as maintainer --- pkgs/applications/networking/cluster/kubeval/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubeval/default.nix b/pkgs/applications/networking/cluster/kubeval/default.nix index 569baf6000a..3d3674dbe0f 100644 --- a/pkgs/applications/networking/cluster/kubeval/default.nix +++ b/pkgs/applications/networking/cluster/kubeval/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeval"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "instrumenta"; repo = "kubeval"; rev = "${version}"; - sha256 = "0kpwk7bv36m3i8vavm1pqc8l611c6l9qbagcc64v6r85qig4w5xv"; + sha256 = "05li0qv4q7fy2lr50r6c1r8dhx00jb1g01qmgc72a9zqp378yiq0"; }; modSha256 = "0y9x44y3bchi8xg0a6jmp2rmi8dybkl6qlywb6nj1viab1s8dd4y"; @@ -17,7 +17,7 @@ buildGoModule rec { description = "Validate your Kubernetes configuration files"; homepage = "https://github.com/instrumenta/kubeval"; license = licenses.asl20; - maintainers = with maintainers; [ nicknovitski ]; + maintainers = with maintainers; [ johanot nicknovitski ]; platforms = platforms.all; }; } -- cgit v1.2.3 From 465302dad015ed909aad9a78004be55b283e1d1e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 7 May 2020 07:12:08 +0000 Subject: consul: 1.7.2 -> 1.7.3 --- pkgs/servers/consul/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 299ad0bdbcb..6f3ea4262e5 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.7.2"; + version = "1.7.3"; rev = "v${version}"; # Note: Currently only release tags are supported, because they have the Consul UI @@ -17,14 +17,14 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "1q587d8aqfkwg4fymr56fnf038vkxbdqz5yilz96dzny27dhspj4"; + sha256 = "05p893mfdrlf5fy9ywwnqb7blw1ffidgviyyh6a3bp82wk49f8ph"; }; # This corresponds to paths with package main - normally unneeded but consul # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - modSha256 = "164834gr8a7qvp72ccjpkbbg4h8idrcxvcp1fl7yi59iqsswfr7b"; + modSha256 = "01vyamfy9lcljzy99jmr48x0ypb12wab66n9kmj71mrvl50v8rzr"; preBuild = '' buildFlagsArray+=("-ldflags" "-X github.com/hashicorp/consul/version.GitDescribe=v${version} -X github.com/hashicorp/consul/version.Version=${version} -X github.com/hashicorp/consul/version.VersionPrerelease=") -- cgit v1.2.3 From be619f063920d1721073189a641ac611a7d93b01 Mon Sep 17 00:00:00 2001 From: Kevin Rauscher Date: Thu, 7 May 2020 09:35:40 +0200 Subject: metals: 0.8.4 -> 0.9.0 --- pkgs/development/tools/metals/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/metals/default.nix b/pkgs/development/tools/metals/default.nix index 4cd87480070..cf9ce2bd265 100644 --- a/pkgs/development/tools/metals/default.nix +++ b/pkgs/development/tools/metals/default.nix @@ -2,7 +2,7 @@ let baseName = "metals"; - version = "0.8.4"; + version = "0.9.0"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -15,7 +15,7 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1r8aff082m3kh6wy5diyvq8bzg5x4dp1da9sfz223ii0kc1yp6w5"; + outputHash = "116q2jzqlmdhkqvjg31b9ib8w1k7rlr8gmjcr7z32idpn16hqg59"; }; in stdenv.mkDerivation rec { -- cgit v1.2.3 From 3cd69706585585328376fd4a237bcb9b5a105ab2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Wed, 6 May 2020 21:17:59 +0200 Subject: jshon: fix musl build --- pkgs/development/tools/parsing/jshon/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/jshon/default.nix b/pkgs/development/tools/parsing/jshon/default.nix index 8f06a32c667..04a1a637207 100644 --- a/pkgs/development/tools/parsing/jshon/default.nix +++ b/pkgs/development/tools/parsing/jshon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, jansson }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, jansson }: stdenv.mkDerivation rec { pname = "jshon"; @@ -13,7 +13,15 @@ stdenv.mkDerivation rec { buildInputs = [ jansson ]; - patchPhase = + patches = [ + (fetchpatch { + # https://github.com/keenerd/jshon/pull/62 + url = "https://github.com/keenerd/jshon/commit/96b4e9dbf578be7b31f29740b608aa7b34df3318.patch"; + sha256 = "0kwbn3xb37iqb5y1n8vhzjiwlbg5jmki3f38pzakc24kzc5ksmaa"; + }) + ]; + + postPatch = '' substituteInPlace Makefile --replace "/usr/" "/" ''; -- cgit v1.2.3 From e7d5b48e215bc30d56409123eb4aace7ef719583 Mon Sep 17 00:00:00 2001 From: Kevin Rauscher Date: Thu, 7 May 2020 09:57:06 +0200 Subject: scalafmt: 2.5.0 -> 2.5.1 --- pkgs/development/tools/scalafmt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/scalafmt/default.nix b/pkgs/development/tools/scalafmt/default.nix index ec9de0610ea..89970c7dc98 100644 --- a/pkgs/development/tools/scalafmt/default.nix +++ b/pkgs/development/tools/scalafmt/default.nix @@ -2,7 +2,7 @@ let baseName = "scalafmt"; - version = "2.5.0"; + version = "2.5.1"; deps = stdenv.mkDerivation { name = "${baseName}-deps-${version}"; buildCommand = '' @@ -13,7 +13,7 @@ let ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "1m7jdgndbjynhl98an6g9gxxpp9bd6p3xqgzfilak8pamjkdwdp4"; + outputHash = "113dn10y0q8d2agr0g4cnx5fzdxjcz67i9089j86nn5i76wilm5s"; }; in stdenv.mkDerivation { -- cgit v1.2.3 From fa4968b7231eaef6d40d1811d28634976f7e448f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 7 May 2020 08:13:35 +0000 Subject: cargo-audit: 0.11.2 -> 0.12.0 --- pkgs/tools/package-management/cargo-audit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/cargo-audit/default.nix b/pkgs/tools/package-management/cargo-audit/default.nix index fba2b82ff32..01acc2ed6ed 100644 --- a/pkgs/tools/package-management/cargo-audit/default.nix +++ b/pkgs/tools/package-management/cargo-audit/default.nix @@ -1,16 +1,16 @@ { stdenv, lib, rustPlatform, fetchFromGitHub, openssl, pkg-config, Security, libiconv }: rustPlatform.buildRustPackage rec { pname = "cargo-audit"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "RustSec"; repo = "cargo-audit"; rev = "v${version}"; - sha256 = "0py4z50ld4vs0g7vh8ga6v5h11nz2yfcpr3xqzpihf4p7sg1mdf4"; + sha256 = "0zby9bd64bmrkb229ic7ckn2ycf9bpwsisx2a7z0id0j4mjaca4k"; }; - cargoSha256 = "0n4q8767aby6fgq0z7wj966zgqydlwirrzgyahf234dz6arsxw2l"; + cargoSha256 = "1w4618w5yj1205d7s2hq273fb35qfcd7cnxdwxn4pq8x3ahgy4kx"; buildInputs = [ openssl libiconv ] ++ lib.optionals stdenv.isDarwin [ Security ]; nativeBuildInputs = [ pkg-config ]; -- cgit v1.2.3 From 3ed9beca2b97ea399c4ad62999db536a9d15f287 Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Wed, 29 Apr 2020 09:39:22 +0200 Subject: trilium: Mark trilium package alias as deprecated in favor of trilium-desktop --- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 1bcdef164d3..8c4e6f9d423 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -577,6 +577,7 @@ mapAliases ({ transmission_gtk = transmission-gtk; # added 2018-01-06 transmission_remote_gtk = transmission-remote-gtk; # added 2018-01-06 transporter = throw "transporter has been removed. It was archived upstream, so it's considered abandoned."; + trilium = throw "trilium has been removed. Please use trilium-desktop instead."; # added 2020-04-29 truecrypt = veracrypt; # added 2018-10-24 tshark = wireshark-cli; # added 2018-04-25 uberwriter = apostrophe; # added 2020-04-23 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e8eb8461ee..a99751d4abd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7099,7 +7099,6 @@ in trilium-desktop trilium-server ; - trilium = trilium-desktop; trousers = callPackage ../tools/security/trousers { }; -- cgit v1.2.3 From fb4cff356759230a3c0ada01dc73ed724b9ba881 Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Wed, 29 Apr 2020 09:40:12 +0200 Subject: trilium: 0.40.7 -> 0.42.1 --- pkgs/applications/office/trilium/default.nix | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 967f91d962e..fb7f88829f6 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -19,7 +19,17 @@ let maintainers = with maintainers; [ emmanuelrosa dtzWill kampka ]; }; - version = "0.40.7"; + version = "0.42.1"; + + desktopSource = { + url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; + sha256 = "0xcbkm6z1a0jh3qywlwcjk6l302cxgdfcq8sw30vbnz99cyarpvz"; + }; + + serverSource = { + url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; + sha256 = "012l36z0n3fcdajj3v4w2bcb1619sdhg6cvy3y89b6rxl0h2wdiw"; + }; in { @@ -28,10 +38,7 @@ in { inherit version; inherit meta; - src = fetchurl { - url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "0xi3bb0kbphbgpk2wlsad509g0hwwb259q2vkv0kgyr4i4wcyc1f"; - }; + src = fetchurl desktopSource; # Fetch from source repo, no longer included in release. # (they did special-case icon.png but we want the scalable svg) @@ -76,10 +83,7 @@ in { inherit version; inherit meta; - src = fetchurl { - url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - sha256 = "15bspngnnbq6mhp1f82j9hccg0ymhm6i4rddpgz3n7dw5wxdj0sm"; - }; + src = fetchurl serverSource; nativeBuildInputs = [ autoPatchelfHook -- cgit v1.2.3 From 5705b968c94d15bb24bf06d599c6b09ecf1da311 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 7 May 2020 08:27:35 +0000 Subject: ccid: 1.4.31 -> 1.4.32 --- pkgs/tools/security/ccid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/ccid/default.nix b/pkgs/tools/security/ccid/default.nix index b9cffc7f769..e74e1b61438 100644 --- a/pkgs/tools/security/ccid/default.nix +++ b/pkgs/tools/security/ccid/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ccid"; - version = "1.4.31"; + version = "1.4.32"; src = fetchurl { url = "https://ccid.apdu.fr/files/${pname}-${version}.tar.bz2"; - sha256 = "1xz8ikr6vk73w3xnwb931yq8lqc1zrj8c3v34n6h63irwjvdfj3b"; + sha256 = "0f8nzk7379ip4x2ii5vn6h67jyx733pq0ywnnsj2llbxi2vllpsl"; }; postPatch = '' -- cgit v1.2.3 From 06b89b345f18c87d8011e51e8bd51aafcc15d995 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 7 May 2020 08:54:33 +0000 Subject: chezmoi: 1.8.0 -> 1.8.1 --- pkgs/tools/misc/chezmoi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index c42e8cacc73..96e33e0de24 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "1ww8xcf57csazj3q2569irxg5il29jrx43mq5cif8dvn8xjm00nn"; + sha256 = "1b8y0wq3myhvjdnwl0i4x85iil7i7kmsjajvbw1a47afm83jkbaw"; }; - modSha256 = "1zmvav19nyqv6yp71mk3lx6szc5vwyf81m8kvcjj9rlzlygmcl8g"; + modSha256 = "147bbhbcf81i6vyiv9q8abx5qw44fx3qw5v5f6zjnkfajdqlvbsx"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.builtBy=nixpkgs" -- cgit v1.2.3 From dc78d14d65ef538edfae5c890d6e9ae2b919f70e Mon Sep 17 00:00:00 2001 From: joachimschmidt557 Date: Thu, 7 May 2020 10:59:07 +0200 Subject: nixos/postgresql: refactor enable option More consistency with other modules (mkEnableOption) --- nixos/modules/services/databases/postgresql.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 0b79a996dc7..93f5c1ca5f5 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -34,13 +34,7 @@ in services.postgresql = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to run PostgreSQL. - ''; - }; + enable = mkEnableOption "PostgreSQL Server"; package = mkOption { type = types.package; -- cgit v1.2.3 From 1c35bcbfaa83f9009e9f83e3ddd55fe90542d03a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 7 May 2020 09:02:17 +0000 Subject: bsequencer: 1.2.0 -> 1.4.0 --- pkgs/applications/audio/bsequencer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/bsequencer/default.nix b/pkgs/applications/audio/bsequencer/default.nix index e63124e8547..674795dca20 100644 --- a/pkgs/applications/audio/bsequencer/default.nix +++ b/pkgs/applications/audio/bsequencer/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "BSEQuencer"; - version = "1.2.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = "${version}"; - sha256 = "08xwz5v8wrar0rx7qdr9pkpjz2k9sw6bn5glhpn6sp6453fabf8q"; + sha256 = "1zz1cirmx4wm4im4gjdp691f2042c8d1i8np1ns71f6kqdj9ps3k"; }; nativeBuildInputs = [ pkgconfig ]; -- cgit v1.2.3 From 6fc0c1dee13a49c45e6f3d5d4ca1553cbce79ba4 Mon Sep 17 00:00:00 2001 From: Andika Demas Riyandi Date: Thu, 7 May 2020 16:28:04 +0700 Subject: nixpkgs-fmt: 0.8.0 -> 0.9.0 (#87175) --- pkgs/tools/nix/nixpkgs-fmt/default.nix | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/nix/nixpkgs-fmt/default.nix b/pkgs/tools/nix/nixpkgs-fmt/default.nix index b55ac647b35..53e70ad7bd7 100644 --- a/pkgs/tools/nix/nixpkgs-fmt/default.nix +++ b/pkgs/tools/nix/nixpkgs-fmt/default.nix @@ -1,25 +1,16 @@ { lib, rustPlatform, fetchFromGitHub, fetchpatch }: rustPlatform.buildRustPackage rec { pname = "nixpkgs-fmt"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "nix-community"; repo = pname; rev = "v${version}"; - sha256 = "09lhi8aidw9qf94n07mgs2nfac32a96wkx50glj35dhn06iwzwqr"; + sha256 = "1kkw87c63nx5pqsxcwn6iw27k02j9ls21zyhb5dvf0zaqd9sz7ad"; }; - - patches = [ - # Fixes debug output on stdout mangling some files. Fixed in next release. - # https://github.com/nix-community/nixpkgs-fmt/issues/201 - (fetchpatch { - url = "https://github.com/nix-community/nixpkgs-fmt/commit/648f46e1d5507592b246311618f467da282bf1b5.patch"; - sha256 = "18n4criyl0lydxmjqfkcmwx0pniyqzfgfxcjwz6czqwmx5y7b4rb"; - }) - ]; - - cargoSha256 = "15m40d9354412h51zn806pxsqjai48xiw8chf8slbi0cjxd268j9"; + + cargoSha256 = "1wybvm9qckx9cd656gx9zrbszmaj66ihh2kk6qqdb6maixcq5k0x"; meta = with lib; { description = "Nix code formatter for nixpkgs"; -- cgit v1.2.3 From f36cbdcbdc4d153a3efec1d0cd3a25f34484e514 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferry=20J=C3=A9r=C3=A9mie?= Date: Sun, 3 May 2020 11:06:20 +0200 Subject: gspeech: init at 0.9.2 --- pkgs/applications/audio/gspeech/default.nix | 73 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 75 insertions(+) create mode 100644 pkgs/applications/audio/gspeech/default.nix diff --git a/pkgs/applications/audio/gspeech/default.nix b/pkgs/applications/audio/gspeech/default.nix new file mode 100644 index 00000000000..f51eb338d28 --- /dev/null +++ b/pkgs/applications/audio/gspeech/default.nix @@ -0,0 +1,73 @@ +{ lib +, fetchFromGitHub +, python3 +, gtk3 +, wrapGAppsHook +, glibcLocales +, gobject-introspection +, gettext +, pango +, gdk-pixbuf +, librsvg +, atk +, libnotify +, libappindicator-gtk3 +, gst_all_1 +, makeWrapper +, picotts +, sox +}: + +python3.pkgs.buildPythonApplication rec { + pname = "gSpeech"; + version = "0.9.2"; + + src = fetchFromGitHub { + owner = "mothsart"; + repo = pname; + rev = version; + sha256 = "11pvdpb9jjssp8nmlj21gs7ncgfm89kw26mfc8c2x8w2q4h92ja3"; + }; + + nativeBuildInputs = [ + wrapGAppsHook + gobject-introspection + pango + gdk-pixbuf + atk + gettext + libnotify + libappindicator-gtk3 + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + makeWrapper + ]; + + buildInputs = [ + glibcLocales + gtk3 + python3 + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pygobject3 + librsvg + ]; + + postFixup = '' + wrapProgram $out/bin/gspeech --prefix PATH : ${lib.makeBinPath [ picotts ]} + wrapProgram $out/bin/gspeech-cli --prefix PATH : ${lib.makeBinPath [ picotts ]} + ''; + + strictDeps = false; + + meta = with lib; { + description = "A minimal GUI for the Text To Speech 'Svox Pico'. Read clipboard or selected text in different languages and manage it : pause, stop, replay."; + homepage = "https://github.com/mothsART/gSpeech"; + maintainers = with maintainers; [ mothsart ]; + license = licenses.gpl3; + platforms = platforms.unix; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7860d08dede..0bfc21ef30a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19211,6 +19211,8 @@ in gpg-mdp = callPackage ../applications/misc/gpg-mdp { }; + gspeech = callPackage ../applications/audio/gspeech { }; + icesl = callPackage ../applications/misc/icesl { }; keepassx = callPackage ../applications/misc/keepassx { }; -- cgit v1.2.3 From 9bf75a27f46f6b330b02ce25ac34d4d2ede3ba4a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 7 May 2020 12:38:12 +0200 Subject: Revert "nix-daemon.nix: Use 'nix ping-store' to initialize directories" This reverts commits 9d0de0dc57ce97ab9cc3d73a66e914d718e4af3b, 27d2857a9927aa197b9679b9a2dcf59b97c06907. 'nix ping-store' is an experimental command so it doesn't work in Nix 2.4 unless you set 'experimental-features = nix-command' in nix.conf. --- nixos/modules/services/misc/nix-daemon.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index b28e3679d1c..2577cb78e96 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -510,8 +510,7 @@ in system.activationScripts.nix = stringAfter [ "etc" "users" ] '' - # Create directories in /nix. - ${nix}/bin/nix ping-store --no-net + install -m 0755 -d /nix/var/nix/{gcroots,profiles}/per-user # Subscribe the root user to the NixOS channel by default. if [ ! -e "/root/.nix-channels" ]; then -- cgit v1.2.3 From ecdb5c4320c6897484f6f11ee05b2eaca3382cd2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 7 May 2020 13:12:29 +0200 Subject: nixos-install: 'nix build' -> nix-build 'nix build' is an experimental command so we shouldn't use it yet. (nixos-rebuild also uses 'nix', but only when using flakes, which are themselves an experimental feature.) --- nixos/doc/manual/man-nixos-install.xml | 16 ---------------- nixos/modules/installer/tools/nixos-install.sh | 8 ++------ 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml index 9255ce763ef..84849282e9a 100644 --- a/nixos/doc/manual/man-nixos-install.xml +++ b/nixos/doc/manual/man-nixos-install.xml @@ -24,16 +24,6 @@ - - - - - - - - - - @@ -178,12 +168,6 @@ Please note that this option may be specified repeatedly. - - / - - Print the full build logs of nix build to stderr. - - diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index a3ff3fe2c0c..6e1d56af2ae 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -15,7 +15,6 @@ mountPoint=/mnt channelPath= system= verbosity=() -buildLogs= while [ "$#" -gt 0 ]; do i="$1"; shift 1 @@ -60,9 +59,6 @@ while [ "$#" -gt 0 ]; do -v*|--verbose) verbosity+=("$i") ;; - -L|--print-build-logs) - buildLogs="$i" - ;; *) echo "$0: unknown option \`$i'" exit 1 @@ -100,9 +96,9 @@ sub="auto?trusted=1" if [[ -z $system ]]; then echo "building the configuration in $NIXOS_CONFIG..." outLink="$tmpdir/system" - nix build --out-link "$outLink" --store "$mountPoint" "${extraBuildFlags[@]}" \ + nix-build --out-link "$outLink" --store "$mountPoint" "${extraBuildFlags[@]}" \ --extra-substituters "$sub" \ - -f '' system -I "nixos-config=$NIXOS_CONFIG" ${verbosity[@]} ${buildLogs} + '' -A system -I "nixos-config=$NIXOS_CONFIG" ${verbosity[@]} system=$(readlink -f $outLink) fi -- cgit v1.2.3 From f6f7f5024f6af92f2b16d676ff0fde7d016392c0 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 7 May 2020 11:46:48 +0000 Subject: drumkv1: 0.9.13 -> 0.9.14 --- pkgs/applications/audio/drumkv1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/applications/audio/drumkv1/default.nix index ae32a5f41a3..04277badfbe 100644 --- a/pkgs/applications/audio/drumkv1/default.nix +++ b/pkgs/applications/audio/drumkv1/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "drumkv1"; - version = "0.9.13"; + version = "0.9.14"; src = fetchurl { url = "mirror://sourceforge/drumkv1/${pname}-${version}.tar.gz"; - sha256 = "1h88sakxs0b20k8v2sh14y05fin1zqmhnid6h9mk9c37ixxg58ia"; + sha256 = "0fr7pkp55zvjxf7p22drs93fsjgvqhbd55vxi0srhp2s2wzz5qak"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools ]; -- cgit v1.2.3 From 9a8454a7a9e10a6e5d789b4049faa3876c1db3df Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Wed, 11 Dec 2019 20:41:31 +0000 Subject: hasura: init at 1.2.1 --- pkgs/servers/hasura/ci-info.nix | 22 +++++++++++ pkgs/servers/hasura/cli.nix | 33 ++++++++++++++++ pkgs/servers/hasura/default.nix | 63 ++++++++++++++++++++++++++++++ pkgs/servers/hasura/dependent-map.nix | 13 +++++++ pkgs/servers/hasura/dependent-sum.nix | 10 +++++ pkgs/servers/hasura/ghc-heap-view.nix | 18 +++++++++ pkgs/servers/hasura/graphql-engine.nix | 71 ++++++++++++++++++++++++++++++++++ pkgs/servers/hasura/graphql-parser.nix | 35 +++++++++++++++++ pkgs/servers/hasura/immortal.nix | 17 ++++++++ pkgs/servers/hasura/network-uri.nix | 18 +++++++++ pkgs/servers/hasura/pg-client.nix | 30 ++++++++++++++ pkgs/servers/hasura/these.nix | 25 ++++++++++++ pkgs/top-level/all-packages.nix | 6 ++- 13 files changed, 360 insertions(+), 1 deletion(-) create mode 100644 pkgs/servers/hasura/ci-info.nix create mode 100644 pkgs/servers/hasura/cli.nix create mode 100644 pkgs/servers/hasura/default.nix create mode 100644 pkgs/servers/hasura/dependent-map.nix create mode 100644 pkgs/servers/hasura/dependent-sum.nix create mode 100644 pkgs/servers/hasura/ghc-heap-view.nix create mode 100644 pkgs/servers/hasura/graphql-engine.nix create mode 100644 pkgs/servers/hasura/graphql-parser.nix create mode 100644 pkgs/servers/hasura/immortal.nix create mode 100644 pkgs/servers/hasura/network-uri.nix create mode 100644 pkgs/servers/hasura/pg-client.nix create mode 100644 pkgs/servers/hasura/these.nix diff --git a/pkgs/servers/hasura/ci-info.nix b/pkgs/servers/hasura/ci-info.nix new file mode 100644 index 00000000000..53c85a2e5ba --- /dev/null +++ b/pkgs/servers/hasura/ci-info.nix @@ -0,0 +1,22 @@ +{ mkDerivation, aeson, aeson-casing, base, fetchgit, hashable +, hpack, stdenv, template-haskell, text, th-lift-instances +, unordered-containers +}: +mkDerivation { + pname = "ci-info"; + version = "0.1.0.0"; + src = fetchgit { + url = "https://github.com/hasura/ci-info-hs.git"; + sha256 = "0rn1799z4y7z1c6ijrr0gscarg25zmnfq0z9rrmk4ad727vf1ppc"; + rev = "6af5a68450347a02295a9cd050d05a8b2f5c06ab"; + fetchSubmodules = true; + }; + libraryHaskellDepends = [ + aeson aeson-casing base hashable template-haskell text + th-lift-instances unordered-containers + ]; + libraryToolDepends = [ hpack ]; + prePatch = "hpack"; + homepage = "https://github.com/hasura/ci-info-hs#readme"; + license = stdenv.lib.licenses.mit; +} diff --git a/pkgs/servers/hasura/cli.nix b/pkgs/servers/hasura/cli.nix new file mode 100644 index 00000000000..f19ffe12f5d --- /dev/null +++ b/pkgs/servers/hasura/cli.nix @@ -0,0 +1,33 @@ +{ buildGoModule, hasura-graphql-engine }: + +buildGoModule rec { + name = "hasura-${version}"; + version = hasura-graphql-engine.version; + + src = hasura-graphql-engine.src; + modRoot = "./cli"; + + goPackagePath = "github.com/hasura/graphql-engine/cli"; + subPackages = [ "cmd/hasura" ]; + + modSha256 = "0bpb9r0n8n8c1p8sas3qanhvqw45rq8kygb4dmkfhj3d9vlgn6d2"; + + buildFlagsArray = [''-ldflags= + -X github.com/hasura/graphql-engine/cli/version.BuildVersion=${version} + -s + -w + '']; + + postInstall = '' + mkdir -p $out/share/{bash-completion/completions,zsh/site-functions} + + export HOME=$PWD + $out/bin/hasura completion bash > $out/share/bash-completion/completions/hasura + $out/bin/hasura completion zsh > $out/share/zsh/site-functions/_hasura + ''; + + meta = { + inherit (hasura-graphql-engine.meta) license homepage maintainers; + description = "Hasura GraphQL Engine CLI"; + }; +} diff --git a/pkgs/servers/hasura/default.nix b/pkgs/servers/hasura/default.nix new file mode 100644 index 00000000000..08527466035 --- /dev/null +++ b/pkgs/servers/hasura/default.nix @@ -0,0 +1,63 @@ +{ haskell }: + +with haskell.lib; + +let + # version in cabal file is invalid + version = "1.2.1"; + + pkgs = haskell.packages.ghc865.override { + overrides = self: super: { + # cabal2nix --subpath server --maintainer offline --no-check --revision 1.2.1 https://github.com/hasura/graphql-engine.git + hasura-graphql-engine = justStaticExecutables + ((self.callPackage ./graphql-engine.nix { }).overrideDerivation (d: { + name = "graphql-engine-${version}"; + + inherit version; + + # hasura needs VERSION env exported during build + preBuild = "export VERSION=${version}"; + })); + + hasura-cli = self.callPackage ./cli.nix { + hasura-graphql-engine = self.hasura-graphql-engine // { + inherit version; + }; + }; + + # internal dependencies, non published on hackage (find revisions in cabal.project file) + # cabal2nix --revision https://github.com/hasura/ci-info-hs.git + ci-info = self.callPackage ./ci-info.nix { }; + # cabal2nix --revision https://github.com/hasura/graphql-parser-hs.git + graphql-parser = self.callPackage ./graphql-parser.nix { }; + # cabal2nix --revision https://github.com/hasura/pg-client-hs.git + pg-client = self.callPackage ./pg-client.nix { }; + + # version constrained dependencies, without these hasura will not build, + # find versions in graphql-engine.cabal + # cabal2nix cabal://dependent-map-0.2.4.0 + dependent-map = self.callPackage ./dependent-map.nix { }; + # cabal2nix cabal://dependent-sum-0.4 + dependent-sum = self.callPackage ./dependent-sum.nix { }; + # cabal2nix cabal://these-0.7.6 + these = doJailbreak (self.callPackage ./these.nix { }); + # cabal2nix cabal://immortal-0.2.2.1 + immortal = self.callPackage ./immortal.nix { }; + # cabal2nix cabal://network-uri-2.6.1.0 + network-uri = self.callPackage ./network-uri.nix { }; + # cabal2nix cabal://ghc-heap-view-0.6.0 + ghc-heap-view = disableLibraryProfiling (self.callPackage ./ghc-heap-view.nix { }); + + # unmark broewn packages and do required modifications + stm-hamt = doJailbreak (unmarkBroken super.stm-hamt); + superbuffer = dontCheck (doJailbreak (unmarkBroken super.superbuffer)); + Spock-core = dontCheck (unmarkBroken super.Spock-core); + stm-containers = dontCheck (unmarkBroken super.stm-containers); + ekg-json = unmarkBroken super.ekg-json; + list-t = dontCheck (unmarkBroken super.list-t); + primitive-extras = unmarkBroken super.primitive-extras; + }; + }; +in { + inherit (pkgs) hasura-graphql-engine hasura-cli; +} diff --git a/pkgs/servers/hasura/dependent-map.nix b/pkgs/servers/hasura/dependent-map.nix new file mode 100644 index 00000000000..68ebb616b5f --- /dev/null +++ b/pkgs/servers/hasura/dependent-map.nix @@ -0,0 +1,13 @@ +{ mkDerivation, base, containers, dependent-sum, stdenv }: +mkDerivation { + pname = "dependent-map"; + version = "0.2.4.0"; + sha256 = "5db396bdb5d156434af920c074316c3b84b4d39ba8e1cd349c7bb6679cb28246"; + revision = "1"; + editedCabalFile = "0a5f35d1sgfq1cl1r5bgb5pwfjniiycxiif4ycxglaizp8g5rlr1"; + libraryHaskellDepends = [ base containers dependent-sum ]; + homepage = "https://github.com/mokus0/dependent-map"; + description = "Dependent finite maps (partial dependent products)"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; +} diff --git a/pkgs/servers/hasura/dependent-sum.nix b/pkgs/servers/hasura/dependent-sum.nix new file mode 100644 index 00000000000..90717b87366 --- /dev/null +++ b/pkgs/servers/hasura/dependent-sum.nix @@ -0,0 +1,10 @@ +{ mkDerivation, base, stdenv }: +mkDerivation { + pname = "dependent-sum"; + version = "0.4"; + sha256 = "a8deecb4153a1878173f8d0a18de0378ab068bc15e5035b9e4cb478e8e4e1a1e"; + libraryHaskellDepends = [ base ]; + homepage = "https://github.com/mokus0/dependent-sum"; + description = "Dependent sum type"; + license = stdenv.lib.licenses.publicDomain; +} diff --git a/pkgs/servers/hasura/ghc-heap-view.nix b/pkgs/servers/hasura/ghc-heap-view.nix new file mode 100644 index 00000000000..54c873baee4 --- /dev/null +++ b/pkgs/servers/hasura/ghc-heap-view.nix @@ -0,0 +1,18 @@ +{ mkDerivation, base, binary, bytestring, Cabal, containers +, deepseq, filepath, ghc-heap, stdenv, template-haskell +, transformers +}: +mkDerivation { + pname = "ghc-heap-view"; + version = "0.6.0"; + sha256 = "99ed6034d02a7a942e1b6ed970e9f7028dcdfd5b5d29fd8a0fb89f1a5e7c5ec8"; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal filepath ]; + libraryHaskellDepends = [ + base binary bytestring containers ghc-heap template-haskell + transformers + ]; + testHaskellDepends = [ base deepseq ]; + description = "Extract the heap representation of Haskell values and thunks"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/pkgs/servers/hasura/graphql-engine.nix b/pkgs/servers/hasura/graphql-engine.nix new file mode 100644 index 00000000000..05ba895be08 --- /dev/null +++ b/pkgs/servers/hasura/graphql-engine.nix @@ -0,0 +1,71 @@ +{ mkDerivation, aeson, aeson-casing, ansi-wl-pprint, asn1-encoding +, asn1-types, async, attoparsec, attoparsec-iso8601, auto-update +, base, base64-bytestring, byteorder, bytestring, case-insensitive +, ci-info, containers, criterion, cryptonite, data-has, deepseq +, dependent-map, dependent-sum, directory, ekg-core, ekg-json +, fast-logger, fetchgit, file-embed, filepath, generic-arbitrary +, ghc-heap-view, graphql-parser, hashable, hspec, hspec-core +, hspec-expectations-lifted, http-client, http-client-tls +, http-types, immortal, insert-ordered-containers, jose, lens +, lifted-async, lifted-base, list-t, mime-types, monad-control +, monad-time, monad-validate, mtl, mustache, mwc-probability +, mwc-random, natural-transformation, network, network-uri +, optparse-applicative, pem, pg-client, postgresql-binary +, postgresql-libpq, process, profunctors, psqueues, QuickCheck +, regex-tdfa, safe, scientific, semver, shakespeare, split +, Spock-core, stdenv, stm, stm-containers, template-haskell, text +, text-builder, text-conversions, th-lift-instances, these, time +, transformers, transformers-base, unix, unordered-containers +, uri-encode, uuid, vector, wai, wai-websockets, warp, websockets +, wreq, x509, yaml, zlib +}: +mkDerivation { + pname = "graphql-engine"; + version = "1.0.0"; + src = fetchgit { + url = "https://github.com/hasura/graphql-engine.git"; + sha256 = "0hg44zl3gqa8lq7kggwgmgbsgdc7zrv5cxs507vilg11xklsbz4l"; + rev = "27b0b59361cebecd074bd59123f602e7b013bac1"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/server; echo source root reset to $sourceRoot"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-casing ansi-wl-pprint asn1-encoding asn1-types async + attoparsec attoparsec-iso8601 auto-update base base64-bytestring + byteorder bytestring case-insensitive ci-info containers cryptonite + data-has deepseq dependent-map dependent-sum directory ekg-core + ekg-json fast-logger file-embed filepath generic-arbitrary + ghc-heap-view graphql-parser hashable http-client http-client-tls + http-types immortal insert-ordered-containers jose lens + lifted-async lifted-base list-t mime-types monad-control monad-time + monad-validate mtl mustache network network-uri + optparse-applicative pem pg-client postgresql-binary + postgresql-libpq process profunctors psqueues QuickCheck regex-tdfa + scientific semver shakespeare split Spock-core stm stm-containers + template-haskell text text-builder text-conversions + th-lift-instances these time transformers transformers-base unix + unordered-containers uri-encode uuid vector wai wai-websockets warp + websockets wreq x509 yaml zlib + ]; + executableHaskellDepends = [ + base bytestring pg-client text text-conversions + ]; + testHaskellDepends = [ + aeson base bytestring hspec hspec-core hspec-expectations-lifted + http-client http-client-tls lifted-base monad-control mtl + natural-transformation optparse-applicative pg-client process + QuickCheck safe split text time transformers-base + unordered-containers + ]; + benchmarkHaskellDepends = [ + async base bytestring criterion deepseq mwc-probability mwc-random + split text vector + ]; + doCheck = false; + homepage = "https://www.hasura.io"; + description = "GraphQL API over Postgres"; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ offline ]; +} diff --git a/pkgs/servers/hasura/graphql-parser.nix b/pkgs/servers/hasura/graphql-parser.nix new file mode 100644 index 00000000000..8066bb83dd0 --- /dev/null +++ b/pkgs/servers/hasura/graphql-parser.nix @@ -0,0 +1,35 @@ +{ mkDerivation, aeson, attoparsec, base, bytestring, containers +, criterion, fetchgit, filepath, hedgehog, hpack, prettyprinter +, protolude, regex-tdfa, scientific, stdenv, template-haskell, text +, text-builder, th-lift-instances, unordered-containers, vector +}: +mkDerivation { + pname = "graphql-parser"; + version = "0.1.0.0"; + src = fetchgit { + url = "https://github.com/hasura/graphql-parser-hs.git"; + sha256 = "0vz0sqqmr1l02d3f1pc5k7rm7vpxmg5d5ijvdcwdm34yw6x5lz1v"; + rev = "623ad78aa46e7ba2ef1aa58134ad6136b0a85071"; + fetchSubmodules = true; + }; + libraryHaskellDepends = [ + aeson attoparsec base bytestring containers filepath hedgehog + prettyprinter protolude regex-tdfa scientific template-haskell text + text-builder th-lift-instances unordered-containers vector + ]; + libraryToolDepends = [ hpack ]; + testHaskellDepends = [ + aeson attoparsec base bytestring containers filepath hedgehog + prettyprinter protolude regex-tdfa scientific template-haskell text + text-builder th-lift-instances unordered-containers vector + ]; + benchmarkHaskellDepends = [ + aeson attoparsec base bytestring containers criterion filepath + hedgehog prettyprinter protolude regex-tdfa scientific + template-haskell text text-builder th-lift-instances + unordered-containers vector + ]; + prePatch = "hpack"; + homepage = "https://github.com/hasura/graphql-parser-hs#readme"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/pkgs/servers/hasura/immortal.nix b/pkgs/servers/hasura/immortal.nix new file mode 100644 index 00000000000..c53f0f18709 --- /dev/null +++ b/pkgs/servers/hasura/immortal.nix @@ -0,0 +1,17 @@ +{ mkDerivation, base, lifted-base, monad-control, stdenv, stm +, tasty, tasty-hunit, transformers, transformers-base +}: +mkDerivation { + pname = "immortal"; + version = "0.2.2.1"; + sha256 = "ed4aa1a2883a693a73fec47c8c2d5332d61a0626a2013403e1a8fb25cc6c8d8e"; + libraryHaskellDepends = [ + base lifted-base monad-control stm transformers-base + ]; + testHaskellDepends = [ + base lifted-base stm tasty tasty-hunit transformers + ]; + homepage = "https://github.com/feuerbach/immortal"; + description = "Spawn threads that never die (unless told to do so)"; + license = stdenv.lib.licenses.mit; +} diff --git a/pkgs/servers/hasura/network-uri.nix b/pkgs/servers/hasura/network-uri.nix new file mode 100644 index 00000000000..45016d470a8 --- /dev/null +++ b/pkgs/servers/hasura/network-uri.nix @@ -0,0 +1,18 @@ +{ mkDerivation, base, deepseq, HUnit, parsec, stdenv +, test-framework, test-framework-hunit, test-framework-quickcheck2 +}: +mkDerivation { + pname = "network-uri"; + version = "2.6.1.0"; + sha256 = "423e0a2351236f3fcfd24e39cdbc38050ec2910f82245e69ca72a661f7fc47f0"; + revision = "1"; + editedCabalFile = "141nj7q0p9wkn5gr41ayc63cgaanr9m59yym47wpxqr3c334bk32"; + libraryHaskellDepends = [ base deepseq parsec ]; + testHaskellDepends = [ + base HUnit test-framework test-framework-hunit + test-framework-quickcheck2 + ]; + homepage = "https://github.com/haskell/network-uri"; + description = "URI manipulation"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/pkgs/servers/hasura/pg-client.nix b/pkgs/servers/hasura/pg-client.nix new file mode 100644 index 00000000000..725e5e7f640 --- /dev/null +++ b/pkgs/servers/hasura/pg-client.nix @@ -0,0 +1,30 @@ +{ mkDerivation, aeson, aeson-casing, attoparsec, base, bytestring +, criterion, fetchgit, file-embed, hashable, hashtables, hasql +, hasql-pool, hasql-transaction, monad-control, mtl +, postgresql-binary, postgresql-libpq, resource-pool, retry +, scientific, stdenv, template-haskell, text, text-builder, th-lift +, th-lift-instances, time, transformers-base, uuid, vector +}: +mkDerivation { + pname = "pg-client"; + version = "0.1.0"; + src = fetchgit { + url = "https://github.com/hasura/pg-client-hs.git"; + sha256 = "1941gj5yp24kx0xb1nd774nwp5vnpsp6m83isqkwpyz9spl4sq7l"; + rev = "70a849d09bea9461e72c5a5bbde06df65aab61c0"; + fetchSubmodules = true; + }; + libraryHaskellDepends = [ + aeson aeson-casing attoparsec base bytestring hashable hashtables + monad-control mtl postgresql-binary postgresql-libpq resource-pool + retry scientific template-haskell text text-builder th-lift + th-lift-instances time transformers-base uuid vector + ]; + testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ + base bytestring criterion file-embed hashable hasql hasql-pool + hasql-transaction mtl postgresql-libpq text text-builder + ]; + homepage = "https://github.com/hasura/platform"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/pkgs/servers/hasura/these.nix b/pkgs/servers/hasura/these.nix new file mode 100644 index 00000000000..396f9e2a282 --- /dev/null +++ b/pkgs/servers/hasura/these.nix @@ -0,0 +1,25 @@ +{ mkDerivation, aeson, base, base-compat, bifunctors, binary +, containers, data-default-class, deepseq, hashable, keys, lens +, mtl, QuickCheck, quickcheck-instances, semigroupoids, stdenv +, tasty, tasty-quickcheck, transformers, transformers-compat +, unordered-containers, vector, vector-instances +}: +mkDerivation { + pname = "these"; + version = "0.7.6"; + sha256 = "9464b83d98e626360a8ad9836ba77e5201cd1e9c89b95b1b11a28ef3c23ac746"; + libraryHaskellDepends = [ + aeson base base-compat bifunctors binary containers + data-default-class deepseq hashable keys lens mtl QuickCheck + semigroupoids transformers transformers-compat unordered-containers + vector vector-instances + ]; + testHaskellDepends = [ + aeson base base-compat bifunctors binary containers hashable lens + QuickCheck quickcheck-instances tasty tasty-quickcheck transformers + unordered-containers vector + ]; + homepage = "https://github.com/isomorphism/these"; + description = "An either-or-both data type & a generalized 'zip with padding' typeclass"; + license = stdenv.lib.licenses.bsd3; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a99751d4abd..ce4f478b70d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15532,6 +15532,10 @@ in hashi-ui = callPackage ../servers/hashi-ui {}; + inherit (callPackage ../servers/hasura { }) + hasura-cli + hasura-graphql-engine; + heapster = callPackage ../servers/monitoring/heapster { }; hbase = callPackage ../servers/hbase {}; @@ -23619,7 +23623,7 @@ in }; nethack-x11 = callPackage ../games/nethack { x11Mode = true; }; - + netris = callPackage ../games/netris { }; neverball = callPackage ../games/neverball { }; -- cgit v1.2.3 From 28e1e370be085107feb4624ca8d17b932fe0ea8f Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 7 May 2020 08:18:37 -0400 Subject: oh-my-zsh: 2020-05-05 -> 2020-05-07 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index fae5f80fbf1..87ef5ecbde5 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2020-05-05"; + version = "2020-05-07"; pname = "oh-my-zsh"; - rev = "ff987384cf721e7e0812636dea8100b485968bb2"; + rev = "b876198575cbf23d589ddc8da6b22254d3d5358b"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "0hc03sb2i65zrfj7r7c3p6f1g9997h74n12n4r253hrsp7az9p05"; + sha256 = "0vx3pi9wk9crmwgkpd3nwp88ci6ly0savj6v2md7qazmimgffsfi"; }; pathsToLink = [ "/share/oh-my-zsh" ]; -- cgit v1.2.3 From 9bc0b630ab82804cdff12b919ad982773f7ffbed Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 7 May 2020 08:24:29 -0400 Subject: zabbix: replace download source from sourceforge to zabbix.com --- pkgs/servers/monitoring/zabbix/agent.nix | 2 +- pkgs/servers/monitoring/zabbix/proxy.nix | 2 +- pkgs/servers/monitoring/zabbix/server.nix | 2 +- pkgs/servers/monitoring/zabbix/web.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/agent.nix b/pkgs/servers/monitoring/zabbix/agent.nix index 09f43c755f1..f112598da6a 100644 --- a/pkgs/servers/monitoring/zabbix/agent.nix +++ b/pkgs/servers/monitoring/zabbix/agent.nix @@ -6,7 +6,7 @@ import ./versions.nix ({ version, sha256 }: inherit version; src = fetchurl { - url = "mirror://sourceforge/zabbix/ZABBIX%20Latest%20Stable/${version}/zabbix-${version}.tar.gz"; + url = "https://cdn.zabbix.com/stable/${version}/zabbix-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/servers/monitoring/zabbix/proxy.nix b/pkgs/servers/monitoring/zabbix/proxy.nix index 697492d9627..b8f8ca33b0e 100644 --- a/pkgs/servers/monitoring/zabbix/proxy.nix +++ b/pkgs/servers/monitoring/zabbix/proxy.nix @@ -21,7 +21,7 @@ in inherit version; src = fetchurl { - url = "mirror://sourceforge/zabbix/ZABBIX%20Latest%20Stable/${version}/zabbix-${version}.tar.gz"; + url = "https://cdn.zabbix.com/stable/${version}/zabbix-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/servers/monitoring/zabbix/server.nix b/pkgs/servers/monitoring/zabbix/server.nix index 4046cc7d8bb..25b7325bba2 100644 --- a/pkgs/servers/monitoring/zabbix/server.nix +++ b/pkgs/servers/monitoring/zabbix/server.nix @@ -21,7 +21,7 @@ in inherit version; src = fetchurl { - url = "mirror://sourceforge/zabbix/ZABBIX%20Latest%20Stable/${version}/zabbix-${version}.tar.gz"; + url = "https://cdn.zabbix.com/stable/${version}/zabbix-${version}.tar.gz"; inherit sha256; }; diff --git a/pkgs/servers/monitoring/zabbix/web.nix b/pkgs/servers/monitoring/zabbix/web.nix index c4cf5d044da..ca48a72d9fe 100644 --- a/pkgs/servers/monitoring/zabbix/web.nix +++ b/pkgs/servers/monitoring/zabbix/web.nix @@ -6,7 +6,7 @@ import ./versions.nix ({ version, sha256 }: inherit version; src = fetchurl { - url = "mirror://sourceforge/zabbix/ZABBIX%20Latest%20Stable/${version}/zabbix-${version}.tar.gz"; + url = "https://cdn.zabbix.com/stable/${version}/zabbix-${version}.tar.gz"; inherit sha256; }; -- cgit v1.2.3 From c2d3f26d1fdf782495627fe89321125c16b3036d Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 7 May 2020 08:25:38 -0400 Subject: zabbix: 3.0.30 -> 3.0.31 --- pkgs/servers/monitoring/zabbix/versions.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index 2b7fb972c90..360bc249572 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -10,7 +10,7 @@ generic: { }; v30 = generic { - version = "3.0.30"; - sha256 = "0g2qw4ff02gsnmqza1cv9dq6bqyg7w9cdli6hsln07irf0hyrb07"; + version = "3.0.31"; + sha256 = "0a2jznpmg24lqdqbc9p8i2q6jkz0hx53hh6q12xsvvmq48vi3snm"; }; } -- cgit v1.2.3 From 99b63a7784f8f89324b62b6575dd98f50464fcc9 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 7 May 2020 08:26:11 -0400 Subject: zabbix: 4.0.19 -> 4.0.20 --- pkgs/servers/monitoring/zabbix/versions.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index 360bc249572..50b85d9927d 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -5,8 +5,8 @@ generic: { }; v40 = generic { - version = "4.0.19"; - sha256 = "0csiva0iddzdf18lii7vwlvp91kh3vfl8r90jpcsnsivaqwfnkbr"; + version = "4.0.20"; + sha256 = "0h6qx4imrf5inmmczxir81a9xhra8a1dxxv538mqhxhbpqn1yh3w"; }; v30 = generic { -- cgit v1.2.3 From b828ef33aeab79dc70ab9d07304c792ba2880aec Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 7 May 2020 08:26:47 -0400 Subject: zabbix: 4.4.7 -> 4.4.8 --- pkgs/servers/monitoring/zabbix/versions.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index 50b85d9927d..c75df46cf04 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -1,7 +1,7 @@ generic: { v44 = generic { - version = "4.4.7"; - sha256 = "13gckz5ysmqr257mcmbbbf8l43f1jdk4iyn6a3ad8xjmj3kqyys9"; + version = "4.4.8"; + sha256 = "0l9n4l5179lf90krv1kb0lraipj7q4hyba6r48n6rj2zqx2j4mn0"; }; v40 = generic { -- cgit v1.2.3 From 56ebdc683a920e5c4234aefdc05f2841bdf8e584 Mon Sep 17 00:00:00 2001 From: Christian Kampka Date: Thu, 7 May 2020 14:51:02 +0200 Subject: matrix-appservice-slack: 1.1.0 -> 1.2.0 --- .../matrix-appservice-slack/node-packages.nix | 692 +++++++++++++-------- .../matrix-appservice-slack/package.json | 2 +- 2 files changed, 427 insertions(+), 267 deletions(-) diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix index 9af470f8310..7de8cd858a3 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/node-packages.nix @@ -13,13 +13,22 @@ let sha512 = "a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g=="; }; }; - "@babel/highlight-7.8.3" = { + "@babel/helper-validator-identifier-7.9.5" = { + name = "_at_babel_slash_helper-validator-identifier"; + packageName = "@babel/helper-validator-identifier"; + version = "7.9.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz"; + sha512 = "/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g=="; + }; + }; + "@babel/highlight-7.9.0" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.8.3"; + version = "7.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz"; - sha512 = "PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz"; + sha512 = "lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ=="; }; }; "@slack/logger-1.1.1" = { @@ -31,31 +40,31 @@ let sha512 = "PAC5CMnNAv/FPtJ0le+YD2wUV+tZ7n3Bnjj9dBI+deIcHsExCnQkQmZE79cLvfuYXbz3PWyv5coti30MJQhEjA=="; }; }; - "@slack/rtm-api-5.0.3" = { + "@slack/rtm-api-5.0.4" = { name = "_at_slack_slash_rtm-api"; packageName = "@slack/rtm-api"; - version = "5.0.3"; + version = "5.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/@slack/rtm-api/-/rtm-api-5.0.3.tgz"; - sha512 = "rzNIFst8iuVYyHdE7e3KSrbAtIA7sfS4Pth9ObKUm5KDemX0zyI7YfAijO1kgr1EMriQkjlpKBhlNq9Y+aQr6g=="; + url = "https://registry.npmjs.org/@slack/rtm-api/-/rtm-api-5.0.4.tgz"; + sha512 = "5xXOjLPb4H8a+URLrCjnFXA62Kf4IrvSfp9KtuOxv6vTtFVvxNW4WqhWgAcxwXolD43xRuB/pikxLu76vLDTfw=="; }; }; - "@slack/types-1.5.0" = { + "@slack/types-1.6.0" = { name = "_at_slack_slash_types"; packageName = "@slack/types"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@slack/types/-/types-1.5.0.tgz"; - sha512 = "oCYgatJYxHf9wE3tKXzOLeeTsF0ghX1TIcguNfVmO2V6NDe+cHAzZRglEOmJLdRINDS5gscAgSkeZpDhpKBeUA=="; + url = "https://registry.npmjs.org/@slack/types/-/types-1.6.0.tgz"; + sha512 = "SrrAD/ZxDN4szQ35V/mY2TvKSyGsUWP8def1C8NMg9AvdYG0VyaL5f+Dd6jw8STosMFXd3zqjekMowT9LB9/IQ=="; }; }; - "@slack/web-api-5.8.0" = { + "@slack/web-api-5.8.1" = { name = "_at_slack_slash_web-api"; packageName = "@slack/web-api"; - version = "5.8.0"; + version = "5.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/@slack/web-api/-/web-api-5.8.0.tgz"; - sha512 = "lUMFM9jtdn+9Q0kHLegf5RjIgQlmb1PGWwWdTsc9mQ8PJu2BogI5ZttG8/tA6r2bX/C4bgXhd0JJ4syUR0AAhQ=="; + url = "https://registry.npmjs.org/@slack/web-api/-/web-api-5.8.1.tgz"; + sha512 = "MONzkjWOXV39Dejo8B9WSl/F0dxcVh9wyeW6R0jf6T6BhwN4f24iErYtTh19g+MRhb0oiyeKfnFsJTSKQulfDA=="; }; }; "@types/body-parser-1.19.0" = { @@ -103,22 +112,22 @@ let sha512 = "EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g=="; }; }; - "@types/express-4.17.3" = { + "@types/express-4.17.6" = { name = "_at_types_slash_express"; packageName = "@types/express"; - version = "4.17.3"; + version = "4.17.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express/-/express-4.17.3.tgz"; - sha512 = "I8cGRJj3pyOLs/HndoP+25vOqhqWkAZsWMEmq1qXy/b/M3ppufecUwaK2/TVDVxcV61/iSdhykUjQQ2DLSrTdg=="; + url = "https://registry.npmjs.org/@types/express/-/express-4.17.6.tgz"; + sha512 = "n/mr9tZI83kd4azlPG5y997C/M4DNABK9yErhFM6hKdym4kkmd9j0vtsJyjFIwfRBxtrxZtAfGZCNRIBMFLK5w=="; }; }; - "@types/express-serve-static-core-4.17.2" = { + "@types/express-serve-static-core-4.17.6" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; - version = "4.17.2"; + version = "4.17.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.2.tgz"; - sha512 = "El9yMpctM6tORDAiBwZVLMcxoTMcqqRO9dVyYcn7ycLWbvR8klrDn8CAOwRfZujZtWD7yS/mshTdz43jMOejbg=="; + url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.6.tgz"; + sha512 = "U2oynuRIB17GIbEdvjFrrEACOy7GQkzsX7bPEBz1H41vZYEU4j0fLL97sawmHDwHUXpUQDBMHIyM9vejqP9o1A=="; }; }; "@types/is-stream-1.1.0" = { @@ -139,13 +148,13 @@ let sha512 = "FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw=="; }; }; - "@types/mocha-5.2.7" = { + "@types/mocha-7.0.2" = { name = "_at_types_slash_mocha"; packageName = "@types/mocha"; - version = "5.2.7"; + version = "7.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mocha/-/mocha-5.2.7.tgz"; - sha512 = "NYrtPht0wGzhwe9+/idPaBB+TqkY9AhTvOLMkThm0IoEfLaiVQZwBwyJ5puCkO3AUCWrmcoePjp2mbFocKy4SQ=="; + url = "https://registry.npmjs.org/@types/mocha/-/mocha-7.0.2.tgz"; + sha512 = "ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w=="; }; }; "@types/nedb-1.8.9" = { @@ -157,13 +166,13 @@ let sha512 = "w9Tl3DQCkdT0Ghes+PKhe+3/pZppBXuFFpSCjPJbb2KE3DjYmUpEyCYzjrAYlT9Y1TndnbbnChzkax2h/JorVQ=="; }; }; - "@types/node-12.12.30" = { + "@types/node-13.9.3" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "12.12.30"; + version = "13.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-12.12.30.tgz"; - sha512 = "sz9MF/zk6qVr3pAnM0BSQvYIBK44tS75QC5N+VbWSE4DjCV/pJ+UzCW/F+vVnl7TkOPcuwQureKNtSSwjBTaMg=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.9.3.tgz"; + sha512 = "28ci34pqk99zkrqa473xlzfms3j6nj4nl2i69ghpbjvw2mh68bd0nd2shb78i09gng4d0fj65l2njrqbdjzmhqix4fvqyiarrlkwnyk"; }; }; "@types/node-emoji-1.8.1" = { @@ -184,6 +193,15 @@ let sha512 = "eKAv5Ql6k78dh3ULCsSBxX6bFNuGjTmof5Q/T6PiECDq0Yf8IIn46jCyp3RJvCi8owaEmm3DZH1PEImjBMd/vQ=="; }; }; + "@types/qs-6.9.2" = { + name = "_at_types_slash_qs"; + packageName = "@types/qs"; + version = "6.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.2.tgz"; + sha512 = "a9bDi4Z3zCZf4Lv1X/vwnvbbDYSNz59h3i3KdyuYYN+YrLjSeJD0dnphdULDfySvUv6Exy/O0K6wX/kQpnPQ+A=="; + }; + }; "@types/randomstring-1.1.6" = { name = "_at_types_slash_randomstring"; packageName = "@types/randomstring"; @@ -238,22 +256,22 @@ let sha512 = "oprSwp094zOglVrXdlo/4bAHtKTAxX6VT8FOZlBKrmyLbNvE1zxZyJ6yikMVtHIvwP45+ZQGJn+FdXGKTozq0g=="; }; }; - "@types/tough-cookie-2.3.6" = { + "@types/tough-cookie-4.0.0" = { name = "_at_types_slash_tough-cookie"; packageName = "@types/tough-cookie"; - version = "2.3.6"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.6.tgz"; - sha512 = "wHNBMnkoEBiRAd3s8KTKwIuO9biFtTf0LehITzBhSco+HQI0xkXZbLOD55SW3Aqw3oUkHstkm5SPv58yaAdFPQ=="; + url = "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.0.tgz"; + sha512 = "I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A=="; }; }; - "@types/uuid-3.4.8" = { + "@types/uuid-7.0.3" = { name = "_at_types_slash_uuid"; packageName = "@types/uuid"; - version = "3.4.8"; + version = "7.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uuid/-/uuid-3.4.8.tgz"; - sha512 = "zHWce3allXWSmRx6/AGXKCtSOA7JjeWd2L3t4aHfysNk8mouQnWCocveaT7a4IEIlPVHp81jzlnknqTgCjCLXA=="; + url = "https://registry.npmjs.org/@types/uuid/-/uuid-7.0.3.tgz"; + sha512 = "PUdqTZVrNYTNcIhLHkiaYzoOIaUi5LFg/XLerAdgvwQrUCx+oSbtoBze1AMyvYbcwzUSNC+Isl58SM4Sm/6COw=="; }; }; "@types/ws-5.1.2" = { @@ -311,13 +329,13 @@ let sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; }; }; - "ajv-6.12.0" = { + "ajv-6.12.2" = { name = "ajv"; packageName = "ajv"; - version = "6.12.0"; + version = "6.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz"; - sha512 = "D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz"; + sha512 = "k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ=="; }; }; "another-json-0.2.0" = { @@ -365,6 +383,15 @@ let sha512 = "VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA=="; }; }; + "anymatch-3.1.1" = { + name = "anymatch"; + packageName = "anymatch"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz"; + sha512 = "mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg=="; + }; + }; "arg-4.1.3" = { name = "arg"; packageName = "arg"; @@ -410,13 +437,13 @@ let sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; }; }; - "assert-options-0.6.0" = { + "assert-options-0.6.2" = { name = "assert-options"; packageName = "assert-options"; - version = "0.6.0"; + version = "0.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/assert-options/-/assert-options-0.6.0.tgz"; - sha512 = "xmBFb5sY0AO8SNihIfavR6uMhOyzq6D7RoFKJxxAditMQc876szBBQ9RQVwLi6Bm3zUoG0nexZK11Gy5TBX69A=="; + url = "https://registry.npmjs.org/assert-options/-/assert-options-0.6.2.tgz"; + sha512 = "KP9S549XptFAPGYmLRnIjQBL4/Ry8Jx5YNLQZ/l+eejqbTidBMnw4uZSAsUrzBq/lgyqDYqxcTF7cOxZb9gyEw=="; }; }; "assert-plus-1.0.0" = { @@ -545,6 +572,15 @@ let sha1 = "a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"; }; }; + "binary-extensions-2.0.0" = { + name = "binary-extensions"; + packageName = "binary-extensions"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz"; + sha512 = "Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow=="; + }; + }; "binary-search-tree-0.2.5" = { name = "binary-search-tree"; packageName = "binary-search-tree"; @@ -599,6 +635,15 @@ let sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; }; }; + "braces-3.0.2" = { + name = "braces"; + packageName = "braces"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"; + sha512 = "b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A=="; + }; + }; "browser-request-0.3.3" = { name = "browser-request"; packageName = "browser-request"; @@ -707,6 +752,15 @@ let sha1 = "574d312edd88bb5dd8912e9286dd6c0aed4aac82"; }; }; + "chokidar-3.3.0" = { + name = "chokidar"; + packageName = "chokidar"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.3.0.tgz"; + sha512 = "dGmKLDdT3Gdl7fBUe8XK+gAtGmzy5Fn0XkkWQuYxGIgWVPPse2CxFA5mtrlD0TOHaHjEUqkWNyP1XdHoJES/4A=="; + }; + }; "cliui-5.0.0" = { name = "cliui"; packageName = "cliui"; @@ -950,6 +1004,15 @@ let sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; }; }; + "depd-2.0.0" = { + name = "depd"; + packageName = "depd"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz"; + sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="; + }; + }; "destroy-1.0.4" = { name = "destroy"; packageName = "destroy"; @@ -1040,13 +1103,13 @@ let sha512 = "bHz59NlBbtS0NhftmR8+ExBEekE7br0e01jw+kk0NDro7TtZzBYZ5ScGPs3OmwnpyfHTHOtr1Y6uedCdrIldtg=="; }; }; - "es-abstract-1.17.4" = { + "es-abstract-1.17.5" = { name = "es-abstract"; packageName = "es-abstract"; - version = "1.17.4"; + version = "1.17.5"; src = fetchurl { - url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz"; - sha512 = "Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ=="; + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz"; + sha512 = "BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg=="; }; }; "es-to-primitive-1.2.1" = { @@ -1094,15 +1157,6 @@ let sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="; }; }; - "esutils-2.0.3" = { - name = "esutils"; - packageName = "esutils"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"; - sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="; - }; - }; "etag-1.8.1" = { name = "etag"; packageName = "etag"; @@ -1202,6 +1256,15 @@ let sha512 = "W3aa3QJEc8BS2MmdVpQiYLKHj3ijpto1gMDlsgCRSKfIUe6MwkcpODGPQ3vZfb0XvCeCqlu9CBQTN7oQri2TZQ=="; }; }; + "fill-range-7.0.1" = { + name = "fill-range"; + packageName = "fill-range"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"; + sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; + }; + }; "finalhandler-1.1.2" = { name = "finalhandler"; packageName = "finalhandler"; @@ -1301,6 +1364,15 @@ let sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; }; + "fsevents-2.1.3" = { + name = "fsevents"; + packageName = "fsevents"; + version = "2.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz"; + sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ=="; + }; + }; "function-bind-1.1.1" = { name = "function-bind"; packageName = "function-bind"; @@ -1364,6 +1436,15 @@ let sha512 = "vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ=="; }; }; + "glob-parent-5.1.1" = { + name = "glob-parent"; + packageName = "glob-parent"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz"; + sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ=="; + }; + }; "growl-1.10.5" = { name = "growl"; packageName = "growl"; @@ -1499,6 +1580,15 @@ let sha512 = "eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="; }; }; + "is-binary-path-2.1.0" = { + name = "is-binary-path"; + packageName = "is-binary-path"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz"; + sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; + }; + }; "is-buffer-2.0.4" = { name = "is-buffer"; packageName = "is-buffer"; @@ -1526,6 +1616,15 @@ let sha512 = "USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g=="; }; }; + "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-2.0.0" = { name = "is-fullwidth-code-point"; packageName = "is-fullwidth-code-point"; @@ -1535,6 +1634,15 @@ let sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; }; }; + "is-glob-4.0.1" = { + name = "is-glob"; + packageName = "is-glob"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz"; + sha512 = "5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg=="; + }; + }; "is-my-ip-valid-1.0.0" = { name = "is-my-ip-valid"; packageName = "is-my-ip-valid"; @@ -1553,6 +1661,15 @@ let sha512 = "XTHBZSIIxNsIsZXg7XB5l8z/OBFosl1Wao4tXLpeC7eKU4Vm/kdop2azkPqULwnfGQjmeDIyey9g7afMMtdWAA=="; }; }; + "is-number-7.0.0" = { + name = "is-number"; + packageName = "is-number"; + version = "7.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"; + sha512 = "41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="; + }; + }; "is-property-1.0.2" = { name = "is-property"; packageName = "is-property"; @@ -1751,13 +1868,13 @@ let sha1 = "24c4bfcd6b2fba38bfd0594db1179d8e9b656561"; }; }; - "log-symbols-2.2.0" = { + "log-symbols-3.0.0" = { name = "log-symbols"; packageName = "log-symbols"; - version = "2.2.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz"; - sha512 = "VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg=="; + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz"; + sha512 = "dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ=="; }; }; "logform-1.10.0" = { @@ -1778,13 +1895,13 @@ let sha512 = "+lZh4OpERDBLqjiwDLpAWNQu6KMjnlXH2ByZwCuSqVPJletw0kTWJf5CgSNAUKn1KUkv3m2cUz/LK8zyEy7wzQ=="; }; }; - "loglevel-1.6.7" = { + "loglevel-1.6.8" = { name = "loglevel"; packageName = "loglevel"; - version = "1.6.7"; + version = "1.6.8"; src = fetchurl { - url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.7.tgz"; - sha512 = "cY2eLFrQSAfVPhCgH1s7JI73tMbg9YC3v3+ZHVW67sBS7UxWzNEk/ZBbSfLykBWHp33dqqtOv82gjhKEi81T/A=="; + url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.8.tgz"; + sha512 = "bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA=="; }; }; "make-error-1.3.6" = { @@ -1796,15 +1913,6 @@ let sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="; }; }; - "manakin-0.5.2" = { - name = "manakin"; - packageName = "manakin"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/manakin/-/manakin-0.5.2.tgz"; - sha512 = "pfDSB7QYoVg0Io4KMV9hhPoXpj6p0uBscgtyUSKCOFZe8bqgbpStfgnKIbF/ulnr6U3ICu4OqdyxAqBgOhZwBQ=="; - }; - }; "matrix-appservice-0.4.1" = { name = "matrix-appservice"; packageName = "matrix-appservice"; @@ -1814,13 +1922,13 @@ let sha512 = "mxHr9XDOvN/p6OFrfb4kkcEjCPftnXNzMS8Lg9Cz/pDy1arfRWq11vl9pL9bjzBaAouBGLpW1JzmCR2MsW+VKA=="; }; }; - "matrix-appservice-bridge-1.11.1" = { + "matrix-appservice-bridge-1.12.2" = { name = "matrix-appservice-bridge"; packageName = "matrix-appservice-bridge"; - version = "1.11.1"; + version = "1.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/matrix-appservice-bridge/-/matrix-appservice-bridge-1.11.1.tgz"; - sha512 = "xrtjxScBIx33HRkiK/5G6wkUxZ9jxF9GqTiKzM/Fn7CgMZoHVDIms3sTc7ybZKA6RHAqH68bg4Eg4JbGCtUrhw=="; + url = "https://registry.npmjs.org/matrix-appservice-bridge/-/matrix-appservice-bridge-1.12.2.tgz"; + sha512 = "cGD31MLi4ARnx4DIyJndIhHIsNjaWUoBMXeAbnHhvkwkdVgZ9pgA6IKKmcBCFfsNX1r/I04KjcjlKpVdmZu4VQ=="; }; }; "matrix-js-sdk-2.4.6" = { @@ -1868,22 +1976,22 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; - "mime-db-1.43.0" = { + "mime-db-1.44.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.43.0"; + version = "1.44.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz"; - sha512 = "+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz"; + sha512 = "/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="; }; }; - "mime-types-2.1.26" = { + "mime-types-2.1.27" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.26"; + version = "2.1.27"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz"; - sha512 = "01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz"; + sha512 = "JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w=="; }; }; "minimatch-3.0.4" = { @@ -1895,15 +2003,6 @@ let sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; }; }; - "minimist-0.0.8" = { - name = "minimist"; - packageName = "minimist"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; - }; - }; "minimist-1.2.5" = { name = "minimist"; packageName = "minimist"; @@ -1913,49 +2012,40 @@ let sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; }; }; - "mkdirp-0.5.1" = { + "mkdirp-0.5.5" = { name = "mkdirp"; packageName = "mkdirp"; - version = "0.5.1"; + version = "0.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; + url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"; + sha512 = "NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ=="; }; }; - "mkdirp-0.5.3" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz"; - sha512 = "P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg=="; - }; - }; - "mocha-6.2.2" = { + "mocha-7.1.2" = { name = "mocha"; packageName = "mocha"; - version = "6.2.2"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-6.2.2.tgz"; - sha512 = "FgDS9Re79yU1xz5d+C4rv1G7QagNGHZ+iXF81hO8zY35YZZcLEsJVfFolfsqKFWunATEvNzMK0r/CwWd/szO9A=="; + url = "https://registry.npmjs.org/mocha/-/mocha-7.1.2.tgz"; + sha512 = "o96kdRKMKI3E8U0bjnfqW4QMk12MwZ4mhdBTf+B5a1q9+aq2HRnj+3ZdJu0B/ZhJeK78MgYuv6L8d/rA5AeBJA=="; }; }; - "moment-2.24.0" = { + "moment-2.25.3" = { name = "moment"; packageName = "moment"; - version = "2.24.0"; + version = "2.25.3"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz"; - sha512 = "bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="; + url = "https://registry.npmjs.org/moment/-/moment-2.25.3.tgz"; + sha512 = "PuYv0PHxZvzc15Sp8ybUCoQ+xpyPWvjOuK72a5ovzp2LI32rJXOiIfyoFoYvG3s6EwwrdkMyWuRiEHSZRLJNdg=="; }; }; - "morgan-1.9.1" = { + "morgan-1.10.0" = { name = "morgan"; packageName = "morgan"; - version = "1.9.1"; + version = "1.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/morgan/-/morgan-1.9.1.tgz"; - sha512 = "HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA=="; + url = "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz"; + sha512 = "AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ=="; }; }; "ms-2.0.0" = { @@ -2012,13 +2102,13 @@ let sha512 = "Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw=="; }; }; - "node-environment-flags-1.0.5" = { + "node-environment-flags-1.0.6" = { name = "node-environment-flags"; packageName = "node-environment-flags"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.5.tgz"; - sha512 = "VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ=="; + url = "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz"; + sha512 = "5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw=="; }; }; "nopt-3.0.6" = { @@ -2030,6 +2120,15 @@ let sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9"; }; }; + "normalize-path-3.0.0" = { + name = "normalize-path"; + packageName = "normalize-path"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"; + sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; + }; + }; "oauth-sign-0.9.0" = { name = "oauth-sign"; packageName = "oauth-sign"; @@ -2138,13 +2237,13 @@ let sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; }; }; - "p-limit-2.2.2" = { + "p-limit-2.3.0" = { name = "p-limit"; packageName = "p-limit"; - version = "2.2.2"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz"; - sha512 = "WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ=="; + url = "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"; + sha512 = "//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w=="; }; }; "p-locate-3.0.0" = { @@ -2165,13 +2264,13 @@ let sha512 = "n8/y+yDJwBjoLQe1GSJbbaYQLTI7QHNZI2+rpmCDbe++WLf9HC3gf6iqj5yfPAV71W4UF3ql5W1+UBPXoXTxng=="; }; }; - "p-queue-6.3.0" = { + "p-queue-6.4.0" = { name = "p-queue"; packageName = "p-queue"; - version = "6.3.0"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/p-queue/-/p-queue-6.3.0.tgz"; - sha512 = "fg5dJlFpd5+3CgG3/0ogpVZUeJbjiyXFg0nu53hrOYsybqSiDyxyOpad0Rm6tAiGjgztAwkyvhlYHC53OiAJOA=="; + url = "https://registry.npmjs.org/p-queue/-/p-queue-6.4.0.tgz"; + sha512 = "X7ddxxiQ+bLR/CUt3/BVKrGcJDNxBr0pEEFKHHB6vTPWNUhgDv36GpIH18RmGM3YGPpBT+JWGjDDqsVGuF0ERw=="; }; }; "p-retry-4.2.0" = { @@ -2273,13 +2372,13 @@ let sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; - "pg-7.12.1" = { + "pg-8.0.3" = { name = "pg"; packageName = "pg"; - version = "7.12.1"; + version = "8.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/pg/-/pg-7.12.1.tgz"; - sha512 = "l1UuyfEvoswYfcUe6k+JaxiN+5vkOgYcVSbSuw3FvdLqDbaoa2RJo1zfJKfPsSYPFVERd4GHvX3s2PjG1asSDA=="; + url = "https://registry.npmjs.org/pg/-/pg-8.0.3.tgz"; + sha512 = "fvcNXn4o/iq4jKq15Ix/e58q3jPSmzOp6/8C3CaHoSR/bsxdg+1FXfDRePdtE/zBb3++TytvOrS1hNef3WC/Kg=="; }; }; "pg-connection-string-0.1.3" = { @@ -2300,31 +2399,40 @@ let sha512 = "WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="; }; }; - "pg-minify-1.5.1" = { + "pg-minify-1.5.2" = { name = "pg-minify"; packageName = "pg-minify"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/pg-minify/-/pg-minify-1.5.1.tgz"; - sha512 = "nqUTo8y9T0VhiJoWC0sK0+2S8hYDiu7CdH0Z9ijPi2iikiQ44mfcAFxEJxfvF8H3h/bDBvXthtOQPIB3pLWIow=="; + url = "https://registry.npmjs.org/pg-minify/-/pg-minify-1.5.2.tgz"; + sha512 = "uZn/gXkGmO5JBdopxNLSpFMS1lXr+KJqynI8Di1Qyr8ZVXt67ruh+XNfzLMVdLzYv+MQRdNYQdVwWPSs0qM7xQ=="; }; }; - "pg-pool-2.0.10" = { + "pg-pool-3.1.1" = { name = "pg-pool"; packageName = "pg-pool"; - version = "2.0.10"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/pg-pool/-/pg-pool-2.0.10.tgz"; - sha512 = "qdwzY92bHf3nwzIUcj+zJ0Qo5lpG/YxchahxIN8+ZVmXqkahKXsnl2aiJPHLYN9o5mB/leG+Xh6XKxtP7e0sjg=="; + url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.1.1.tgz"; + sha512 = "kYH6S0mcZF1TPg1F9boFee2JlCSm2oqnlR2Mz2Wgn1psQbEBNVeNTJCw2wCK48QsctwvGUzbxLMg/lYV6hL/3A=="; }; }; - "pg-promise-9.3.6" = { + "pg-promise-10.5.3" = { name = "pg-promise"; packageName = "pg-promise"; - version = "9.3.6"; + version = "10.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/pg-promise/-/pg-promise-10.5.3.tgz"; + sha512 = "cfHgFpcqOc0IIRDABre//k1eda7s94Wys67P9r3q590nmvO0AzZucqWTVmgRUzNTIrDChUwY4hVOMBTIsU/ZiA=="; + }; + }; + "pg-protocol-1.2.2" = { + name = "pg-protocol"; + packageName = "pg-protocol"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/pg-promise/-/pg-promise-9.3.6.tgz"; - sha512 = "b64UalKAkUImn01z7LeG2NtTTsp0TYfqMzo1vXjO2bDAshL+kXJ2HvCyHstJ4Nj8hLeqtCe0Tar5TbB4QGUHfw=="; + url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.2.2.tgz"; + sha512 = "r8hGxHOk3ccMjjmhFJ/QOSVW5A+PP84TeRlEwB/cQ9Zu+bvtZg8Z59Cx3AMfVQc9S0Z+EG+HKhicF1W1GN5Eqg=="; }; }; "pg-types-2.2.0" = { @@ -2345,6 +2453,15 @@ let sha1 = "2a7bb41b6065b67907e91da1b07c1847c877b306"; }; }; + "picomatch-2.2.2" = { + name = "picomatch"; + packageName = "picomatch"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz"; + sha512 = "q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="; + }; + }; "postgres-array-2.0.0" = { name = "postgres-array"; packageName = "postgres-array"; @@ -2363,13 +2480,13 @@ let sha1 = "027b533c0aa890e26d172d47cf9ccecc521acd35"; }; }; - "postgres-date-1.0.4" = { + "postgres-date-1.0.5" = { name = "postgres-date"; packageName = "postgres-date"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.4.tgz"; - sha512 = "bESRvKVuTrjoBluEcpv2346+6kgB7UlnqWZsnbnCccTNq/pqfj1j6oBaN5+b/NrDXepYUT/HKadqv3iS9lJuVA=="; + url = "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.5.tgz"; + sha512 = "pdau6GRPERdAYUQwkBnGKxEfPyhVZXG/JiS44iZWiNdSOWE09N2lUgN6yshuq6fVSon4Pm0VMXd1srUUkLe9iA=="; }; }; "postgres-interval-1.2.0" = { @@ -2408,13 +2525,13 @@ let sha512 = "dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw=="; }; }; - "psl-1.7.0" = { + "psl-1.8.0" = { name = "psl"; packageName = "psl"; - version = "1.7.0"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz"; - sha512 = "5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ=="; + url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz"; + sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="; }; }; "punycode-2.1.1" = { @@ -2444,13 +2561,13 @@ let sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; }; }; - "quick-lru-4.0.1" = { + "quick-lru-5.1.0" = { name = "quick-lru"; packageName = "quick-lru"; - version = "4.0.1"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz"; - sha512 = "ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g=="; + url = "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.0.tgz"; + sha512 = "WjAKQ9ORzvqjLijJXiXWqc3Gcs1ivoxCj6KJmEjoWBE6OtHwuaDLSAUqGHALUiid7A1KqGqsSHZs8prxF5xxAQ=="; }; }; "randomstring-1.1.5" = { @@ -2498,6 +2615,15 @@ let sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; }; }; + "readdirp-3.2.0" = { + name = "readdirp"; + packageName = "readdirp"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz"; + sha512 = "crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ=="; + }; + }; "regenerator-runtime-0.11.1" = { name = "regenerator-runtime"; packageName = "regenerator-runtime"; @@ -2552,13 +2678,13 @@ let sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; }; }; - "resolve-1.15.1" = { + "resolve-1.17.0" = { name = "resolve"; packageName = "resolve"; - version = "1.15.1"; + version = "1.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz"; - sha512 = "84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz"; + sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w=="; }; }; "retry-0.12.0" = { @@ -2678,22 +2804,22 @@ let sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; }; - "source-map-support-0.5.16" = { + "source-map-support-0.5.19" = { name = "source-map-support"; packageName = "source-map-support"; - version = "0.5.16"; + version = "0.5.19"; src = fetchurl { - url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz"; - sha512 = "efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ=="; + url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz"; + sha512 = "Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw=="; }; }; - "spex-3.0.0" = { + "spex-3.0.1" = { name = "spex"; packageName = "spex"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/spex/-/spex-3.0.0.tgz"; - sha512 = "JoMfgbrJcEPn53JCLkSNH1o7fZ9rzkb24UKEt5LTcsp0YsaN+yxtb5MEmibbMRltj9CdXDNGitPrYi11JY2hog=="; + url = "https://registry.npmjs.org/spex/-/spex-3.0.1.tgz"; + sha512 = "priWZUrXBmVPHTOmtUeS7gZzCOUwRK87OHJw5K8bTC6MLOq93mQocx+vWccNyKPT2EY+goZvKGguGn2lx8TBDA=="; }; }; "split-1.0.1" = { @@ -2768,22 +2894,40 @@ let sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w=="; }; }; - "string.prototype.trimleft-2.1.1" = { + "string.prototype.trimend-1.0.1" = { + name = "string.prototype.trimend"; + packageName = "string.prototype.trimend"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz"; + sha512 = "LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g=="; + }; + }; + "string.prototype.trimleft-2.1.2" = { name = "string.prototype.trimleft"; packageName = "string.prototype.trimleft"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz"; - sha512 = "iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag=="; + url = "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz"; + sha512 = "gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw=="; }; }; - "string.prototype.trimright-2.1.1" = { + "string.prototype.trimright-2.1.2" = { name = "string.prototype.trimright"; packageName = "string.prototype.trimright"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz"; - sha512 = "qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g=="; + url = "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz"; + sha512 = "ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg=="; + }; + }; + "string.prototype.trimstart-1.0.1" = { + name = "string.prototype.trimstart"; + packageName = "string.prototype.trimstart"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz"; + sha512 = "XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw=="; }; }; "string_decoder-1.1.1" = { @@ -2876,6 +3020,15 @@ let sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; }; }; + "to-regex-range-5.0.1" = { + name = "to-regex-range"; + packageName = "to-regex-range"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"; + sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ=="; + }; + }; "toidentifier-1.0.0" = { name = "toidentifier"; packageName = "toidentifier"; @@ -2903,31 +3056,31 @@ let sha512 = "XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw=="; }; }; - "ts-node-8.7.0" = { + "ts-node-8.10.1" = { name = "ts-node"; packageName = "ts-node"; - version = "8.7.0"; + version = "8.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/ts-node/-/ts-node-8.7.0.tgz"; - sha512 = "s659CsHrsxaRVDEleuOkGvbsA0rWHtszUNEt1r0CgAFN5ZZTQtDzpsluS7W5pOGJIa1xZE8R/zK4dEs+ldFezg=="; + url = "https://registry.npmjs.org/ts-node/-/ts-node-8.10.1.tgz"; + sha512 = "bdNz1L4ekHiJul6SHtZWs1ujEKERJnHs4HxN7rjTyyVOFf3HaJ6sLqe6aPG62XTzAB/63pKRh5jTSWL0D7bsvw=="; }; }; - "tslib-1.11.1" = { + "tslib-1.11.2" = { name = "tslib"; packageName = "tslib"; - version = "1.11.1"; + version = "1.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-1.11.1.tgz"; - sha512 = "aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA=="; + url = "https://registry.npmjs.org/tslib/-/tslib-1.11.2.tgz"; + sha512 = "tTSkux6IGPnUGUd1XAZHcpu85MOkIl5zX49pO+jfsie3eP0B6pyhOlLXm3cAC6T7s+euSDDUUV+Acop5WmtkVg=="; }; }; - "tslint-5.20.1" = { + "tslint-6.1.2" = { name = "tslint"; packageName = "tslint"; - version = "5.20.1"; + version = "6.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/tslint/-/tslint-5.20.1.tgz"; - sha512 = "EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg=="; + url = "https://registry.npmjs.org/tslint/-/tslint-6.1.2.tgz"; + sha512 = "UyNrLdK3E0fQG/xWNqAFAC5ugtFyPO4JJR1KyyfQAyzR8W0fTRrC91A8Wej4BntFzcvETdCSDa/4PnNYJQLYiA=="; }; }; "tsutils-2.29.0" = { @@ -3047,6 +3200,15 @@ let sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; }; }; + "uuid-7.0.3" = { + name = "uuid"; + packageName = "uuid"; + version = "7.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz"; + sha512 = "DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg=="; + }; + }; "vary-1.1.2" = { name = "vary"; packageName = "vary"; @@ -3173,15 +3335,6 @@ let sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="; }; }; - "yargs-13.3.0" = { - name = "yargs"; - packageName = "yargs"; - version = "13.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz"; - sha512 = "2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA=="; - }; - }; "yargs-13.3.2" = { name = "yargs"; packageName = "yargs"; @@ -3191,15 +3344,6 @@ let sha512 = "AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw=="; }; }; - "yargs-parser-13.1.1" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "13.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz"; - sha512 = "oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ=="; - }; - }; "yargs-parser-13.1.2" = { name = "yargs-parser"; packageName = "yargs-parser"; @@ -3230,26 +3374,27 @@ let }; in { - "matrix-appservice-slack-git+https://github.com/matrix-org/matrix-appservice-slack.git#1.1.0" = nodeEnv.buildNodePackage { + "matrix-appservice-slack-git+https://github.com/matrix-org/matrix-appservice-slack.git#1.2.0" = nodeEnv.buildNodePackage { name = "matrix-appservice-slack"; packageName = "matrix-appservice-slack"; - version = "1.1.0"; + version = "1.2.0"; src = fetchgit { url = "https://github.com/matrix-org/matrix-appservice-slack.git"; - rev = "62b2a05c99bbefb0b268adc8b0fedfe91a4f76bd"; - sha256 = "64e930cecb11de9df3cb03367a22ff7dc78d44b7f992d9379fae8b692bf35157"; + rev = "2967f02484a3cdb386336b328438ec65fa8be382"; + sha256 = "bc7f87744046561d8dcd5b75d2469950f11ceac9d6d69a49eac4e05354f34834"; }; dependencies = [ sources."@babel/code-frame-7.8.3" - sources."@babel/highlight-7.8.3" + sources."@babel/helper-validator-identifier-7.9.5" + sources."@babel/highlight-7.9.0" sources."@slack/logger-1.1.1" - (sources."@slack/rtm-api-5.0.3" // { + (sources."@slack/rtm-api-5.0.4" // { dependencies = [ sources."p-queue-2.4.2" ]; }) - sources."@slack/types-1.5.0" - (sources."@slack/web-api-5.8.0" // { + sources."@slack/types-1.6.0" + (sources."@slack/web-api-5.8.1" // { dependencies = [ sources."p-queue-2.4.2" ]; @@ -3259,40 +3404,42 @@ in sources."@types/chai-4.2.11" sources."@types/connect-3.4.33" sources."@types/events-3.0.0" - sources."@types/express-4.17.3" - sources."@types/express-serve-static-core-4.17.2" + sources."@types/express-4.17.6" + sources."@types/express-serve-static-core-4.17.6" sources."@types/is-stream-1.1.0" sources."@types/mime-2.0.1" - sources."@types/mocha-5.2.7" + sources."@types/mocha-7.0.2" sources."@types/nedb-1.8.9" - sources."@types/node-12.12.30" + sources."@types/node-13.9.3" sources."@types/node-emoji-1.8.1" sources."@types/p-queue-2.3.2" + sources."@types/qs-6.9.2" sources."@types/randomstring-1.1.6" sources."@types/range-parser-1.2.3" sources."@types/request-2.48.4" sources."@types/request-promise-native-1.0.17" sources."@types/retry-0.12.0" sources."@types/serve-static-1.13.3" - sources."@types/tough-cookie-2.3.6" - sources."@types/uuid-3.4.8" + sources."@types/tough-cookie-4.0.0" + sources."@types/uuid-7.0.3" sources."@types/ws-5.1.2" sources."@types/yargs-13.0.8" sources."@types/yargs-parser-13.1.0" sources."Slackdown-git://github.com/Half-Shot/slackdown#efd8934a3d9c3bf0064c0b217c5cf6b62ee697e4" sources."abbrev-1.1.1" sources."accepts-1.3.7" - sources."ajv-6.12.0" + sources."ajv-6.12.2" sources."another-json-0.2.0" sources."ansi-colors-3.2.3" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" + sources."anymatch-3.1.1" sources."arg-4.1.3" sources."argparse-1.0.10" sources."array-flatten-1.1.1" sources."array-uniq-1.0.2" sources."asn1-0.2.4" - sources."assert-options-0.6.0" + sources."assert-options-0.6.2" sources."assert-plus-1.0.0" sources."assertion-error-1.1.0" sources."async-0.2.10" @@ -3306,6 +3453,7 @@ in sources."base-x-3.0.8" sources."basic-auth-2.0.1" sources."bcrypt-pbkdf-1.0.2" + sources."binary-extensions-2.0.0" sources."binary-search-tree-0.2.5" sources."bintrees-1.0.1" sources."bluebird-2.11.0" @@ -3315,6 +3463,7 @@ in ]; }) sources."brace-expansion-1.1.11" + sources."braces-3.0.2" sources."browser-request-0.3.3" sources."browser-stdout-1.3.1" sources."bs58-4.0.1" @@ -3331,6 +3480,7 @@ in ]; }) sources."check-error-1.0.2" + sources."chokidar-3.3.0" sources."cliui-5.0.0" sources."color-3.0.0" sources."color-convert-1.9.3" @@ -3365,12 +3515,11 @@ in sources."enabled-1.0.2" sources."encodeurl-1.0.2" sources."env-variable-0.0.6" - sources."es-abstract-1.17.4" + sources."es-abstract-1.17.5" sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."escape-string-regexp-2.0.0" sources."esprima-4.0.1" - sources."esutils-2.0.3" sources."etag-1.8.1" sources."eventemitter3-3.1.2" (sources."express-4.17.1" // { @@ -3385,6 +3534,7 @@ in sources."fast-safe-stringify-2.0.7" sources."fecha-2.3.3" sources."file-stream-rotator-0.4.1" + sources."fill-range-7.0.1" (sources."finalhandler-1.1.2" // { dependencies = [ sources."debug-2.6.9" @@ -3399,6 +3549,7 @@ in sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" + sources."fsevents-2.1.3" sources."function-bind-1.1.1" sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" @@ -3406,6 +3557,7 @@ in sources."get-func-name-2.0.0" sources."getpass-0.1.7" sources."glob-7.1.3" + sources."glob-parent-5.1.1" sources."growl-1.10.5" sources."har-schema-2.0.0" sources."har-validator-5.1.3" @@ -3421,12 +3573,16 @@ in sources."inherits-2.0.3" sources."ipaddr.js-1.9.1" sources."is-arrayish-0.3.2" + sources."is-binary-path-2.1.0" sources."is-buffer-2.0.4" sources."is-callable-1.1.5" sources."is-date-object-1.0.2" + sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" + sources."is-glob-4.0.1" sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.20.0" + sources."is-number-7.0.0" sources."is-property-1.0.2" sources."is-regex-1.0.5" sources."is-stream-1.1.0" @@ -3449,17 +3605,16 @@ in sources."locate-path-3.0.0" sources."lodash-4.17.15" sources."lodash.toarray-4.4.0" - sources."log-symbols-2.2.0" + sources."log-symbols-3.0.0" (sources."logform-2.1.2" // { dependencies = [ sources."ms-2.1.2" ]; }) - sources."loglevel-1.6.7" + sources."loglevel-1.6.8" sources."make-error-1.3.6" - sources."manakin-0.5.2" sources."matrix-appservice-0.4.1" - sources."matrix-appservice-bridge-1.11.1" + sources."matrix-appservice-bridge-1.12.2" (sources."matrix-js-sdk-2.4.6" // { dependencies = [ sources."bluebird-3.5.5" @@ -3469,39 +3624,37 @@ in sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."mkdirp-0.5.3" - (sources."mocha-6.2.2" // { + sources."mkdirp-0.5.5" + (sources."mocha-7.1.2" // { dependencies = [ sources."debug-3.2.6" sources."escape-string-regexp-1.0.5" - sources."minimist-0.0.8" - sources."mkdirp-0.5.1" sources."ms-2.1.1" sources."supports-color-6.0.0" - sources."yargs-13.3.0" - sources."yargs-parser-13.1.1" ]; }) - sources."moment-2.24.0" - (sources."morgan-1.9.1" // { + sources."moment-2.25.3" + (sources."morgan-1.10.0" // { dependencies = [ sources."debug-2.6.9" + sources."depd-2.0.0" ]; }) sources."ms-2.0.0" sources."nedb-1.8.0" sources."negotiator-0.6.2" sources."node-emoji-1.10.0" - (sources."node-environment-flags-1.0.5" // { + (sources."node-environment-flags-1.0.6" // { dependencies = [ sources."semver-5.7.1" ]; }) sources."nopt-3.0.6" + sources."normalize-path-3.0.0" sources."oauth-sign-0.9.0" sources."object-hash-1.3.1" sources."object-inspect-1.7.0" @@ -3514,9 +3667,9 @@ in sources."one-time-0.0.4" sources."p-cancelable-1.1.0" sources."p-finally-1.0.0" - sources."p-limit-2.2.2" + sources."p-limit-2.3.0" sources."p-locate-3.0.0" - (sources."p-queue-6.3.0" // { + (sources."p-queue-6.4.0" // { dependencies = [ sources."eventemitter3-4.0.0" ]; @@ -3532,41 +3685,45 @@ in sources."path-to-regexp-0.1.7" sources."pathval-1.1.0" sources."performance-now-2.1.0" - sources."pg-7.12.1" + sources."pg-8.0.3" sources."pg-connection-string-0.1.3" sources."pg-int8-1.0.1" - sources."pg-minify-1.5.1" - sources."pg-pool-2.0.10" - sources."pg-promise-9.3.6" + sources."pg-minify-1.5.2" + sources."pg-pool-3.1.1" + sources."pg-promise-10.5.3" + sources."pg-protocol-1.2.2" sources."pg-types-2.2.0" sources."pgpass-1.0.2" + sources."picomatch-2.2.2" sources."postgres-array-2.0.0" sources."postgres-bytea-1.0.0" - sources."postgres-date-1.0.4" + sources."postgres-date-1.0.5" sources."postgres-interval-1.2.0" sources."process-nextick-args-2.0.1" sources."prom-client-11.5.3" sources."proxy-addr-2.0.6" - sources."psl-1.7.0" + sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.7.0" - sources."quick-lru-4.0.1" + sources."quick-lru-5.1.0" sources."randomstring-1.1.5" sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."readable-stream-3.6.0" + sources."readdirp-3.2.0" sources."regenerator-runtime-0.11.1" (sources."request-2.88.2" // { dependencies = [ sources."form-data-2.3.3" sources."qs-6.5.2" + sources."uuid-3.4.0" ]; }) sources."request-promise-core-1.1.3" sources."request-promise-native-1.0.8" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.15.1" + sources."resolve-1.17.0" sources."retry-0.12.0" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -3586,8 +3743,8 @@ in sources."setprototypeof-1.1.1" sources."simple-swizzle-0.2.2" sources."source-map-0.6.1" - sources."source-map-support-0.5.16" - sources."spex-3.0.0" + sources."source-map-support-0.5.19" + sources."spex-3.0.1" sources."split-1.0.1" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" @@ -3595,8 +3752,10 @@ in sources."statuses-1.5.0" sources."stealthy-require-1.1.1" sources."string-width-3.1.0" - sources."string.prototype.trimleft-2.1.1" - sources."string.prototype.trimright-2.1.1" + sources."string.prototype.trimend-1.0.1" + sources."string.prototype.trimleft-2.1.2" + sources."string.prototype.trimright-2.1.2" + sources."string.prototype.trimstart-1.0.1" (sources."string_decoder-1.3.0" // { dependencies = [ sources."safe-buffer-5.2.0" @@ -3608,16 +3767,17 @@ in sources."tdigest-0.1.1" sources."text-hex-1.0.0" sources."through-2.3.8" + sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."tough-cookie-2.5.0" sources."triple-beam-1.3.0" - (sources."ts-node-8.7.0" // { + (sources."ts-node-8.10.1" // { dependencies = [ sources."diff-4.0.2" ]; }) - sources."tslib-1.11.1" - (sources."tslint-5.20.1" // { + sources."tslib-1.11.2" + (sources."tslint-6.1.2" // { dependencies = [ sources."diff-4.0.2" sources."semver-5.7.1" @@ -3635,7 +3795,7 @@ in sources."uri-js-4.2.2" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-3.4.0" + sources."uuid-7.0.3" sources."vary-1.1.2" sources."verror-1.10.0" sources."which-1.3.1" @@ -3689,4 +3849,4 @@ in bypassCache = true; reconstructLock = true; }; -} \ No newline at end of file +} diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json b/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json index 8fb44891dd4..a197abdda2e 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json +++ b/pkgs/servers/matrix-synapse/matrix-appservice-slack/package.json @@ -1,3 +1,3 @@ [ - {"matrix-appservice-slack": "git+https://github.com/matrix-org/matrix-appservice-slack.git#1.1.0" } + {"matrix-appservice-slack": "git+https://github.com/matrix-org/matrix-appservice-slack.git#1.2.0" } ] -- cgit v1.2.3 From 78f2a830291eb19af6306476b186b585f4d9cd37 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 7 May 2020 15:20:34 +0200 Subject: test-driver.py: Fix deadlock when the log queue gets full If a program (e.g. nixos-install) writes more than 1000 lines to stderr during execute(), then process_serial_output() deadlocks waiting for the queue to be processed. So use an unbounded queue instead. We should probably get rid of the structured log output (log.xml), since then we don't need the log queue anymore. --- nixos/lib/test-driver/test-driver.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index d96600b3c99..84661a4a758 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -143,7 +143,7 @@ class Logger: self.logfile = os.environ.get("LOGFILE", "/dev/null") self.logfile_handle = codecs.open(self.logfile, "wb") self.xml = XMLGenerator(self.logfile_handle, encoding="utf-8") - self.queue: "Queue[Dict[str, str]]" = Queue(1000) + self.queue: "Queue[Dict[str, str]]" = Queue() self.xml.startDocument() self.xml.startElement("logfile", attrs={}) @@ -391,11 +391,11 @@ class Machine: def execute(self, command: str) -> Tuple[int, str]: self.connect() - out_command = "( {} ); echo '|!EOF' $?\n".format(command) + out_command = "( {} ); echo '|!=EOF' $?\n".format(command) self.shell.send(out_command.encode()) output = "" - status_code_pattern = re.compile(r"(.*)\|\!EOF\s+(\d+)") + status_code_pattern = re.compile(r"(.*)\|\!=EOF\s+(\d+)") while True: chunk = self.shell.recv(4096).decode(errors="ignore") -- cgit v1.2.3 From f6f5f6a30f42eab06d431b64a2cfcf67b7d62863 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 7 May 2020 15:35:13 +0200 Subject: elan: 0.8.0 -> 0.9.0 --- pkgs/applications/science/logic/elan/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/logic/elan/default.nix b/pkgs/applications/science/logic/elan/default.nix index ea3b0585099..cafd6eef23f 100644 --- a/pkgs/applications/science/logic/elan/default.nix +++ b/pkgs/applications/science/logic/elan/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "elan"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "kha"; repo = "elan"; rev = "v${version}"; - sha256 = "0n2ncssjcmp3x5kbnci7xbq5fgcihlr3vaglyhhwzrxkjy2vpmpd"; + sha256 = "17i8sn53hk03fsawpwfinm1w0nb6lcmdbk8ar2mxyhkxczd45vag"; }; - cargoSha256 = "1pkg0n7kxckr0zhr8dr12b9fxg5q185kj3r9k2rmnkj2dpa2mxh3"; + cargoSha256 = "1b2b200wci1lirnkbhfmravz85v8ly918qkr0nwg7dlmhvg9gjb0"; nativeBuildInputs = [ pkgconfig ]; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { postInstall = '' pushd $out/bin mv elan-init elan - for link in lean leanpkg leanchecker leanc; do + for link in lean leanpkg leanchecker leanc leanmake; do ln -s elan $link done popd -- cgit v1.2.3 From 7c6da82c3858ad82ec48d0bc9d8c009b97513cb8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 7 May 2020 13:53:16 +0000 Subject: fanficfare: 3.17.0 -> 3.19.0 --- pkgs/tools/text/fanficfare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix index ac90b4d7792..6fc27bdf00c 100644 --- a/pkgs/tools/text/fanficfare/default.nix +++ b/pkgs/tools/text/fanficfare/default.nix @@ -2,11 +2,11 @@ python3Packages.buildPythonApplication rec { pname = "FanFicFare"; - version = "3.17.0"; + version = "3.19.0"; src = python3Packages.fetchPypi { inherit pname version; - sha256 = "1h7kzlw516w9qk5vcn0rqibxbhvzbmxgnf9l6yjxj30x53ynrvzj"; + sha256 = "01cr4941sg6is6k6sajlbr6hs5s47aq9xhp7gadhq4h3x6dilj40"; }; propagatedBuildInputs = with python3Packages; [ -- cgit v1.2.3 From 3f80fadec412ff6fb9fbe77d893c3156f955703b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 7 May 2020 15:56:30 +0200 Subject: testing{-python}.nix: Remove log pretty-printing cruft This completes the removal of the nested log feature, which previously got removed from Nix, Hydra, stdenv and GNU Make. In particular, this means that the output of VM builds no longer contains a copy of jQuery. --- nixos/lib/test-driver/log2html.xsl | 135 ------------------------------------- nixos/lib/test-driver/logfile.css | 129 ----------------------------------- nixos/lib/test-driver/treebits.js | 30 --------- nixos/lib/testing-python.nix | 18 +---- nixos/lib/testing.nix | 16 +---- 5 files changed, 4 insertions(+), 324 deletions(-) delete mode 100644 nixos/lib/test-driver/log2html.xsl delete mode 100644 nixos/lib/test-driver/logfile.css delete mode 100644 nixos/lib/test-driver/treebits.js diff --git a/nixos/lib/test-driver/log2html.xsl b/nixos/lib/test-driver/log2html.xsl deleted file mode 100644 index 0485412b4c8..00000000000 --- a/nixos/lib/test-driver/log2html.xsl +++ /dev/null @@ -1,135 +0,0 @@ - - - - - - - - - - - - tag. ++func (p *Policy) addDefaultSkipElementContent() { ++ p.init() ++ ++ p.setOfElementsToSkipContent["frame"] = struct{}{} ++ p.setOfElementsToSkipContent["frameset"] = struct{}{} ++ p.setOfElementsToSkipContent["iframe"] = struct{}{} ++ p.setOfElementsToSkipContent["noembed"] = struct{}{} ++ p.setOfElementsToSkipContent["noframes"] = struct{}{} ++ p.setOfElementsToSkipContent["noscript"] = struct{}{} ++ p.setOfElementsToSkipContent["nostyle"] = struct{}{} ++ p.setOfElementsToSkipContent["object"] = struct{}{} ++ p.setOfElementsToSkipContent["script"] = struct{}{} ++ p.setOfElementsToSkipContent["style"] = struct{}{} ++ p.setOfElementsToSkipContent["title"] = struct{}{} ++} +diff --git a/vendor/github.com/microcosm-cc/bluemonday/sanitize.go b/vendor/github.com/microcosm-cc/bluemonday/sanitize.go +new file mode 100644 +index 00000000..65ed89b7 +--- /dev/null ++++ b/vendor/github.com/microcosm-cc/bluemonday/sanitize.go +@@ -0,0 +1,581 @@ ++// Copyright (c) 2014, David Kitchen ++// ++// All rights reserved. ++// ++// Redistribution and use in source and binary forms, with or without ++// modification, are permitted provided that the following conditions are met: ++// ++// * Redistributions of source code must retain the above copyright notice, this ++// list of conditions and the following disclaimer. ++// ++// * Redistributions in binary form must reproduce the above copyright notice, ++// this list of conditions and the following disclaimer in the documentation ++// and/or other materials provided with the distribution. ++// ++// * Neither the name of the organisation (Microcosm) nor the names of its ++// contributors may be used to endorse or promote products derived from ++// this software without specific prior written permission. ++// ++// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" ++// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ++// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE ++// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR ++// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER ++// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, ++// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ++// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ ++package bluemonday ++ ++import ( ++ "bytes" ++ "io" ++ "net/url" ++ "regexp" ++ "strings" ++ ++ "golang.org/x/net/html" ++) ++ ++var ( ++ dataAttribute = regexp.MustCompile("^data-.+") ++ dataAttributeXMLPrefix = regexp.MustCompile("^xml.+") ++ dataAttributeInvalidChars = regexp.MustCompile("[A-Z;]+") ++) ++ ++// Sanitize takes a string that contains a HTML fragment or document and applies ++// the given policy whitelist. ++// ++// It returns a HTML string that has been sanitized by the policy or an empty ++// string if an error has occurred (most likely as a consequence of extremely ++// malformed input) ++func (p *Policy) Sanitize(s string) string { ++ if strings.TrimSpace(s) == "" { ++ return s ++ } ++ ++ return p.sanitize(strings.NewReader(s)).String() ++} ++ ++// SanitizeBytes takes a []byte that contains a HTML fragment or document and applies ++// the given policy whitelist. ++// ++// It returns a []byte containing the HTML that has been sanitized by the policy ++// or an empty []byte if an error has occurred (most likely as a consequence of ++// extremely malformed input) ++func (p *Policy) SanitizeBytes(b []byte) []byte { ++ if len(bytes.TrimSpace(b)) == 0 { ++ return b ++ } ++ ++ return p.sanitize(bytes.NewReader(b)).Bytes() ++} ++ ++// SanitizeReader takes an io.Reader that contains a HTML fragment or document ++// and applies the given policy whitelist. ++// ++// It returns a bytes.Buffer containing the HTML that has been sanitized by the ++// policy. Errors during sanitization will merely return an empty result. ++func (p *Policy) SanitizeReader(r io.Reader) *bytes.Buffer { ++ return p.sanitize(r) ++} ++ ++// Performs the actual sanitization process. ++func (p *Policy) sanitize(r io.Reader) *bytes.Buffer { ++ ++ // It is possible that the developer has created the policy via: ++ // p := bluemonday.Policy{} ++ // rather than: ++ // p := bluemonday.NewPolicy() ++ // If this is the case, and if they haven't yet triggered an action that ++ // would initiliaze the maps, then we need to do that. ++ p.init() ++ ++ var ( ++ buff bytes.Buffer ++ skipElementContent bool ++ skippingElementsCount int64 ++ skipClosingTag bool ++ closingTagToSkipStack []string ++ mostRecentlyStartedToken string ++ ) ++ ++ tokenizer := html.NewTokenizer(r) ++ for { ++ if tokenizer.Next() == html.ErrorToken { ++ err := tokenizer.Err() ++ if err == io.EOF { ++ // End of input means end of processing ++ return &buff ++ } ++ ++ // Raw tokenizer error ++ return &bytes.Buffer{} ++ } ++ ++ token := tokenizer.Token() ++ switch token.Type { ++ case html.DoctypeToken: ++ ++ // DocType is not handled as there is no safe parsing mechanism ++ // provided by golang.org/x/net/html for the content, and this can ++ // be misused to insert HTML tags that are not then sanitized ++ // ++ // One might wish to recursively sanitize here using the same policy ++ // but I will need to do some further testing before considering ++ // this. ++ ++ case html.CommentToken: ++ ++ // Comments are ignored by default ++ ++ case html.StartTagToken: ++ ++ mostRecentlyStartedToken = token.Data ++ ++ aps, ok := p.elsAndAttrs[token.Data] ++ if !ok { ++ if _, ok := p.setOfElementsToSkipContent[token.Data]; ok { ++ skipElementContent = true ++ skippingElementsCount++ ++ } ++ if p.addSpaces { ++ buff.WriteString(" ") ++ } ++ break ++ } ++ ++ if len(token.Attr) != 0 { ++ token.Attr = p.sanitizeAttrs(token.Data, token.Attr, aps) ++ } ++ ++ if len(token.Attr) == 0 { ++ if !p.allowNoAttrs(token.Data) { ++ skipClosingTag = true ++ closingTagToSkipStack = append(closingTagToSkipStack, token.Data) ++ if p.addSpaces { ++ buff.WriteString(" ") ++ } ++ break ++ } ++ } ++ ++ if !skipElementContent { ++ buff.WriteString(token.String()) ++ } ++ ++ case html.EndTagToken: ++ ++ if mostRecentlyStartedToken == token.Data { ++ mostRecentlyStartedToken = "" ++ } ++ ++ if skipClosingTag && closingTagToSkipStack[len(closingTagToSkipStack)-1] == token.Data { ++ closingTagToSkipStack = closingTagToSkipStack[:len(closingTagToSkipStack)-1] ++ if len(closingTagToSkipStack) == 0 { ++ skipClosingTag = false ++ } ++ if p.addSpaces { ++ buff.WriteString(" ") ++ } ++ break ++ } ++ ++ if _, ok := p.elsAndAttrs[token.Data]; !ok { ++ if _, ok := p.setOfElementsToSkipContent[token.Data]; ok { ++ skippingElementsCount-- ++ if skippingElementsCount == 0 { ++ skipElementContent = false ++ } ++ } ++ if p.addSpaces { ++ buff.WriteString(" ") ++ } ++ break ++ } ++ ++ if !skipElementContent { ++ buff.WriteString(token.String()) ++ } ++ ++ case html.SelfClosingTagToken: ++ ++ aps, ok := p.elsAndAttrs[token.Data] ++ if !ok { ++ if p.addSpaces { ++ buff.WriteString(" ") ++ } ++ break ++ } ++ ++ if len(token.Attr) != 0 { ++ token.Attr = p.sanitizeAttrs(token.Data, token.Attr, aps) ++ } ++ ++ if len(token.Attr) == 0 && !p.allowNoAttrs(token.Data) { ++ if p.addSpaces { ++ buff.WriteString(" ") ++ } ++ break ++ } ++ ++ if !skipElementContent { ++ buff.WriteString(token.String()) ++ } ++ ++ case html.TextToken: ++ ++ if !skipElementContent { ++ switch mostRecentlyStartedToken { ++ case "script": ++ // not encouraged, but if a policy allows JavaScript we ++ // should not HTML escape it as that would break the output ++ buff.WriteString(token.Data) ++ case "style": ++ // not encouraged, but if a policy allows CSS styles we ++ // should not HTML escape it as that would break the output ++ buff.WriteString(token.Data) ++ default: ++ // HTML escape the text ++ buff.WriteString(token.String()) ++ } ++ } ++ default: ++ // A token that didn't exist in the html package when we wrote this ++ return &bytes.Buffer{} ++ } ++ } ++} ++ ++// sanitizeAttrs takes a set of element attribute policies and the global ++// attribute policies and applies them to the []html.Attribute returning a set ++// of html.Attributes that match the policies ++func (p *Policy) sanitizeAttrs( ++ elementName string, ++ attrs []html.Attribute, ++ aps map[string]attrPolicy, ++) []html.Attribute { ++ ++ if len(attrs) == 0 { ++ return attrs ++ } ++ ++ // Builds a new attribute slice based on the whether the attribute has been ++ // whitelisted explicitly or globally. ++ cleanAttrs := []html.Attribute{} ++ for _, htmlAttr := range attrs { ++ if p.allowDataAttributes { ++ // If we see a data attribute, let it through. ++ if isDataAttribute(htmlAttr.Key) { ++ cleanAttrs = append(cleanAttrs, htmlAttr) ++ continue ++ } ++ } ++ // Is there an element specific attribute policy that applies? ++ if ap, ok := aps[htmlAttr.Key]; ok { ++ if ap.regexp != nil { ++ if ap.regexp.MatchString(htmlAttr.Val) { ++ cleanAttrs = append(cleanAttrs, htmlAttr) ++ continue ++ } ++ } else { ++ cleanAttrs = append(cleanAttrs, htmlAttr) ++ continue ++ } ++ } ++ ++ // Is there a global attribute policy that applies? ++ if ap, ok := p.globalAttrs[htmlAttr.Key]; ok { ++ ++ if ap.regexp != nil { ++ if ap.regexp.MatchString(htmlAttr.Val) { ++ cleanAttrs = append(cleanAttrs, htmlAttr) ++ } ++ } else { ++ cleanAttrs = append(cleanAttrs, htmlAttr) ++ } ++ } ++ } ++ ++ if len(cleanAttrs) == 0 { ++ // If nothing was allowed, let's get out of here ++ return cleanAttrs ++ } ++ // cleanAttrs now contains the attributes that are permitted ++ ++ if linkable(elementName) { ++ if p.requireParseableURLs { ++ // Ensure URLs are parseable: ++ // - a.href ++ // - area.href ++ // - link.href ++ // - blockquote.cite ++ // - q.cite ++ // - img.src ++ // - script.src ++ tmpAttrs := []html.Attribute{} ++ for _, htmlAttr := range cleanAttrs { ++ switch elementName { ++ case "a", "area", "link": ++ if htmlAttr.Key == "href" { ++ if u, ok := p.validURL(htmlAttr.Val); ok { ++ htmlAttr.Val = u ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ } ++ break ++ } ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ case "blockquote", "q": ++ if htmlAttr.Key == "cite" { ++ if u, ok := p.validURL(htmlAttr.Val); ok { ++ htmlAttr.Val = u ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ } ++ break ++ } ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ case "img", "script": ++ if htmlAttr.Key == "src" { ++ if u, ok := p.validURL(htmlAttr.Val); ok { ++ htmlAttr.Val = u ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ } ++ break ++ } ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ default: ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ } ++ } ++ cleanAttrs = tmpAttrs ++ } ++ ++ if (p.requireNoFollow || ++ p.requireNoFollowFullyQualifiedLinks || ++ p.addTargetBlankToFullyQualifiedLinks) && ++ len(cleanAttrs) > 0 { ++ ++ // Add rel="nofollow" if a "href" exists ++ switch elementName { ++ case "a", "area", "link": ++ var hrefFound bool ++ var externalLink bool ++ for _, htmlAttr := range cleanAttrs { ++ if htmlAttr.Key == "href" { ++ hrefFound = true ++ ++ u, err := url.Parse(htmlAttr.Val) ++ if err != nil { ++ continue ++ } ++ if u.Host != "" { ++ externalLink = true ++ } ++ ++ continue ++ } ++ } ++ ++ if hrefFound { ++ var ( ++ noFollowFound bool ++ targetBlankFound bool ++ ) ++ ++ addNoFollow := (p.requireNoFollow || ++ externalLink && p.requireNoFollowFullyQualifiedLinks) ++ ++ addTargetBlank := (externalLink && ++ p.addTargetBlankToFullyQualifiedLinks) ++ ++ tmpAttrs := []html.Attribute{} ++ for _, htmlAttr := range cleanAttrs { ++ ++ var appended bool ++ if htmlAttr.Key == "rel" && addNoFollow { ++ ++ if strings.Contains(htmlAttr.Val, "nofollow") { ++ noFollowFound = true ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ appended = true ++ } else { ++ htmlAttr.Val += " nofollow" ++ noFollowFound = true ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ appended = true ++ } ++ } ++ ++ if elementName == "a" && htmlAttr.Key == "target" { ++ if htmlAttr.Val == "_blank" { ++ targetBlankFound = true ++ } ++ if addTargetBlank && !targetBlankFound { ++ htmlAttr.Val = "_blank" ++ targetBlankFound = true ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ appended = true ++ } ++ } ++ ++ if !appended { ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ } ++ } ++ if noFollowFound || targetBlankFound { ++ cleanAttrs = tmpAttrs ++ } ++ ++ if addNoFollow && !noFollowFound { ++ rel := html.Attribute{} ++ rel.Key = "rel" ++ rel.Val = "nofollow" ++ cleanAttrs = append(cleanAttrs, rel) ++ } ++ ++ if elementName == "a" && addTargetBlank && !targetBlankFound { ++ rel := html.Attribute{} ++ rel.Key = "target" ++ rel.Val = "_blank" ++ targetBlankFound = true ++ cleanAttrs = append(cleanAttrs, rel) ++ } ++ ++ if targetBlankFound { ++ // target="_blank" has a security risk that allows the ++ // opened window/tab to issue JavaScript calls against ++ // window.opener, which in effect allow the destination ++ // of the link to control the source: ++ // https://dev.to/ben/the-targetblank-vulnerability-by-example ++ // ++ // To mitigate this risk, we need to add a specific rel ++ // attribute if it is not already present. ++ // rel="noopener" ++ // ++ // Unfortunately this is processing the rel twice (we ++ // already looked at it earlier ^^) as we cannot be sure ++ // of the ordering of the href and rel, and whether we ++ // have fully satisfied that we need to do this. This ++ // double processing only happens *if* target="_blank" ++ // is true. ++ var noOpenerAdded bool ++ tmpAttrs := []html.Attribute{} ++ for _, htmlAttr := range cleanAttrs { ++ var appended bool ++ if htmlAttr.Key == "rel" { ++ if strings.Contains(htmlAttr.Val, "noopener") { ++ noOpenerAdded = true ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ } else { ++ htmlAttr.Val += " noopener" ++ noOpenerAdded = true ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ } ++ ++ appended = true ++ } ++ if !appended { ++ tmpAttrs = append(tmpAttrs, htmlAttr) ++ } ++ } ++ if noOpenerAdded { ++ cleanAttrs = tmpAttrs ++ } else { ++ // rel attr was not found, or else noopener would ++ // have been added already ++ rel := html.Attribute{} ++ rel.Key = "rel" ++ rel.Val = "noopener" ++ cleanAttrs = append(cleanAttrs, rel) ++ } ++ ++ } ++ } ++ default: ++ } ++ } ++ } ++ ++ return cleanAttrs ++} ++ ++func (p *Policy) allowNoAttrs(elementName string) bool { ++ _, ok := p.setOfElementsAllowedWithoutAttrs[elementName] ++ return ok ++} ++ ++func (p *Policy) validURL(rawurl string) (string, bool) { ++ if p.requireParseableURLs { ++ // URLs are valid if when space is trimmed the URL is valid ++ rawurl = strings.TrimSpace(rawurl) ++ ++ // URLs cannot contain whitespace, unless it is a data-uri ++ if (strings.Contains(rawurl, " ") || ++ strings.Contains(rawurl, "\t") || ++ strings.Contains(rawurl, "\n")) && ++ !strings.HasPrefix(rawurl, `data:`) { ++ return "", false ++ } ++ ++ // URLs are valid if they parse ++ u, err := url.Parse(rawurl) ++ if err != nil { ++ return "", false ++ } ++ ++ if u.Scheme != "" { ++ ++ urlPolicy, ok := p.allowURLSchemes[u.Scheme] ++ if !ok { ++ return "", false ++ ++ } ++ ++ if urlPolicy == nil || urlPolicy(u) == true { ++ return u.String(), true ++ } ++ ++ return "", false ++ } ++ ++ if p.allowRelativeURLs { ++ if u.String() != "" { ++ return u.String(), true ++ } ++ } ++ ++ return "", false ++ } ++ ++ return rawurl, true ++} ++ ++func linkable(elementName string) bool { ++ switch elementName { ++ case "a", "area", "blockquote", "img", "link", "script": ++ return true ++ default: ++ return false ++ } ++} ++ ++func isDataAttribute(val string) bool { ++ if !dataAttribute.MatchString(val) { ++ return false ++ } ++ rest := strings.Split(val, "data-") ++ if len(rest) == 1 { ++ return false ++ } ++ // data-xml* is invalid. ++ if dataAttributeXMLPrefix.MatchString(rest[1]) { ++ return false ++ } ++ // no uppercase or semi-colons allowed. ++ if dataAttributeInvalidChars.MatchString(rest[1]) { ++ return false ++ } ++ return true ++} +diff --git a/vendor/modules.txt b/vendor/modules.txt +index 0bae0d5d..ff6a5d78 100644 +--- a/vendor/modules.txt ++++ b/vendor/modules.txt +@@ -49,6 +49,8 @@ github.com/lib/pq/oid + github.com/lib/pq/scram + # github.com/mb0/diff v0.0.0-20131118162322-d8d9a906c24d + github.com/mb0/diff ++# github.com/microcosm-cc/bluemonday v1.0.2 ++github.com/microcosm-cc/bluemonday + # github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d + github.com/nu7hatch/gouuid + # github.com/pkg/errors v0.8.0 diff --git a/pkgs/servers/echoip/default.nix b/pkgs/servers/echoip/default.nix index a8f9ad8a912..18952d01c91 100644 --- a/pkgs/servers/echoip/default.nix +++ b/pkgs/servers/echoip/default.nix @@ -11,7 +11,7 @@ buildGoModule { sha256 = "17gkh1qfxasvxy25lmjdwk5fsjkcp7lmw9si3xzf01m7qnj5zi4b"; }; - modSha256 = "025p891klwpid5fw4z39fimgfkwgkcwqpn5276hflzdp1hfv35ly"; + vendorSha256 = "0vvs717pl5gzggxpbn2vkyxmpiw5zjdfnpbh8i81xidbqvlnm22h"; outputs = [ "out" "index" ]; @@ -25,4 +25,4 @@ buildGoModule { license = licenses.bsd3; maintainers = with maintainers; [ rvolosatovs ]; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/gobetween/default.nix b/pkgs/servers/gobetween/default.nix index ff59ad53ed1..2b474d818ad 100644 --- a/pkgs/servers/gobetween/default.nix +++ b/pkgs/servers/gobetween/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib, enableStatic ? false }: +{ rsync, buildGoModule, fetchFromGitHub, lib, runCommand, enableStatic ? false }: buildGoModule rec { pname = "gobetween"; @@ -10,14 +10,30 @@ buildGoModule rec { rev = version; sha256 = "f01593509ccece063acd47002c4fc52261fbbbcdbf14b088d813b7d8e38fcca8"; }; + patches = [ ./gomod.patch ]; - modSha256 = - "dd91838d20c99c73447590e43edd13c87755276f17ef3e53f24c5df3d0908f78"; + deleteVendor = true; buildPhase = '' - make build${lib.optionalString enableStatic "-static"} + make -e build${lib.optionalString enableStatic "-static"} ''; + lxd = fetchFromGitHub { + owner = "lxc"; + repo = "lxd"; + rev = "41efd98813f3b42f1752ff6c2c7569a054924623"; + sha256 = "02vnvjjkzl7b0i2cn03f1lb3jgj5rd3wdkii4pqi9bvmhzszg0l2"; + }; + + overrideModAttrs = (_: { + postBuild = '' + rm -r vendor/github.com/lxc/lxd + cp -r --reflink=auto ${lxd} vendor/github.com/lxc/lxd + ''; + }); + + vendorSha256 = "1pd0zrjwpw6yv2s86a818yy2ma2fkazd3sb2h6zfp9mvyixgxgri"; + installPhase = '' mkdir -p $out/bin cp bin/gobetween $out/bin diff --git a/pkgs/servers/gobetween/gomod.patch b/pkgs/servers/gobetween/gomod.patch new file mode 100644 index 00000000000..98181e3fe79 --- /dev/null +++ b/pkgs/servers/gobetween/gomod.patch @@ -0,0 +1,21 @@ +diff --git a/go.mod b/go.mod +index 536631a..f91e862 100644 +--- a/go.mod ++++ b/go.mod +@@ -7,7 +7,7 @@ require ( + github.com/burntsushi/toml v0.3.1 + github.com/elgs/gojq v0.0.0-20160421194050-81fa9a608a13 + github.com/elgs/gosplitargs v0.0.0-20161028071935-a491c5eeb3c8 // indirect +- github.com/flosch/pongo2 v0.0.0-20181225140029-79872a7b2769 // indirect ++ github.com/flosch/pongo2 v0.0.0-20190707114632-bbf5a6c351f4 // indirect + github.com/fsouza/go-dockerclient v1.3.6 + github.com/gin-contrib/cors v0.0.0-20190301062745-f9e10995c85a + github.com/gin-gonic/gin v1.3.0 +@@ -20,7 +20,6 @@ require ( + github.com/juju/go4 v0.0.0-20160222163258-40d72ab9641a // indirect + github.com/juju/persistent-cookiejar v0.0.0-20171026135701-d5e5a8405ef9 // indirect + github.com/juju/schema v0.0.0-20181210140654-64a6158e9071 // indirect +- github.com/juju/utils v0.0.0-20180820210520-bf9cc5bdd62d // indirect + github.com/juju/webbrowser v0.0.0-20180907093207-efb9432b2bcb // indirect + github.com/julienschmidt/httprouter v1.2.0 // indirect + github.com/lxc/lxd v0.0.0-20190314233831-41efd98813f3 diff --git a/pkgs/servers/gortr/default.nix b/pkgs/servers/gortr/default.nix index 35c6e145243..3b9ed15a849 100644 --- a/pkgs/servers/gortr/default.nix +++ b/pkgs/servers/gortr/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { rev = "v${version}"; sha256 = "03wxlras2akk2ig8sxzs89nvbc6zr2kbcmjlqldjdfhs1rcg82ra"; }; - modSha256 = "157dpalfz3z1s3mxq63xy6lrkwzyy9xzmvn7wsxkwznjq4djv1a1"; + vendorSha256 = "1nwrzbpqycr4ixk8a90pgaxcwakv5nlfnql6hmcc518qrva198wp"; meta = with lib; { description = "The RPKI-to-Router server used at Cloudflare"; @@ -19,4 +19,4 @@ buildGoModule rec { maintainers = with maintainers; [ petabyteboy ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix index 8c358154e8c..47f5925edfc 100644 --- a/pkgs/servers/gotify/default.nix +++ b/pkgs/servers/gotify/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { sha256 = import ./source-sha.nix; }; - modSha256 = import ./mod-sha.nix; + vendorSha256 = "1ha0zgz1n07sd3if6823fi83j7yajysjdzfbwqk9rpsi6zv3cfh3"; postPatch = '' substituteInPlace app.go \ diff --git a/pkgs/servers/gotify/mod-sha.nix b/pkgs/servers/gotify/mod-sha.nix deleted file mode 100644 index f115be8e1a7..00000000000 --- a/pkgs/servers/gotify/mod-sha.nix +++ /dev/null @@ -1 +0,0 @@ -"0zpdbj8a0akhzi1ian8zs6y7ymhlpcfy13q64xdlwc5w0286554r" \ No newline at end of file diff --git a/pkgs/servers/hasura/cli.nix b/pkgs/servers/hasura/cli.nix index f19ffe12f5d..a4d8d147fda 100644 --- a/pkgs/servers/hasura/cli.nix +++ b/pkgs/servers/hasura/cli.nix @@ -10,7 +10,7 @@ buildGoModule rec { goPackagePath = "github.com/hasura/graphql-engine/cli"; subPackages = [ "cmd/hasura" ]; - modSha256 = "0bpb9r0n8n8c1p8sas3qanhvqw45rq8kygb4dmkfhj3d9vlgn6d2"; + vendorSha256 = "0a3mlkl00r680v8x3hy24ykggq5qm7k3101krlyfrb5y4karp75a"; buildFlagsArray = [''-ldflags= -X github.com/hasura/graphql-engine/cli/version.BuildVersion=${version} @@ -30,4 +30,4 @@ buildGoModule rec { inherit (hasura-graphql-engine.meta) license homepage maintainers; description = "Hasura GraphQL Engine CLI"; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index 21caebec0f3..9203f405a75 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { rev = "v${version}"; }; - modSha256 = "02pj8ryis89dl4wjp2mvx6h5d0xdvskxdxiwarg7q0x23m9r7kpg"; + vendorSha256 = "069if1ifsmdn5hrwybiifhnq6xzmdccq85mzi9v98iii18pzfwqx"; nativeBuildInputs = [ pkg-config ]; @@ -27,4 +27,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ paluh ]; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/matterbridge/default.nix b/pkgs/servers/matterbridge/default.nix index 1f39278de62..7f1868af4c3 100644 --- a/pkgs/servers/matterbridge/default.nix +++ b/pkgs/servers/matterbridge/default.nix @@ -5,7 +5,7 @@ buildGoModule rec { version = "1.17.1"; goPackagePath = "github.com/42wim/matterbridge"; - modSha256 = "1mqp8dlwa4p70iv9ksq3pxx5zbxdh56xyksvd98zk0vkrz4f1rij"; + vendorSha256 = null; src = fetchurl { url = "https://github.com/42wim/matterbridge/archive/v${version}.tar.gz"; @@ -19,4 +19,4 @@ buildGoModule rec { maintainers = with maintainers; [ ryantm ]; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index c0d01855be0..dea3d7b1b23 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -1,5 +1,13 @@ { stdenv, buildGoModule, fetchFromGitHub }: +let +webp = fetchFromGitHub { + owner = "chai2010"; + repo = "webp"; + rev = "19c584e49a98c31e2138c82fd0108435cd80d182"; + sha256 = "1bqf1ifsfw5dwvnc9vl3dhp775qv5hgl34219lvnja0bj6pq5zks"; +}; +in buildGoModule { pname = "mautrix-whatsapp-unstable"; version = "2020-04-21-1"; @@ -11,7 +19,14 @@ buildGoModule { sha256 = "1gayjyh0x0axc1xak38zkdhvx6fy8pwlniqsirqy2mwcgkkll9i5"; }; - modSha256 = "1pddabyyz6q1snx9j7yv7dchasqa1y8nbpb5zrwmrpnwpns8kxl7"; + vendorSha256 = "0j397zyjs7v5q2jjd3l0wz4lh1fh45whgxjp7cwgc332ch9j2010"; + + overrideModAttrs = (_: { + postBuild = '' + rm -r vendor/github.com/chai2010/webp + cp -r --reflink=auto ${webp} vendor/github.com/chai2010/webp + ''; + }); meta = with stdenv.lib; { homepage = "https://github.com/tulir/mautrix-whatsapp"; @@ -19,4 +34,4 @@ buildGoModule { license = licenses.agpl3; maintainers = with maintainers; [ vskilet ma27 ]; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index 8b30d7dbbc8..9f9796b3a5e 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0yyq5j82rcl8yhn2jg8sjfxii6kzbrbmxvb05yiwv7p0q42ag5rn"; }; - modSha256 = "1g5vwllxpiy4qlfhn3v5k6sn4g4qpbv0hpg32y1vi2q342lag116"; + vendorSha256 = "15yx5nkyf424v42glg3cx0gkqckdfv1xn25570s9cwf8zid0zlxd"; subPackages = [ "." ]; @@ -28,4 +28,4 @@ buildGoModule rec { platforms = platforms.unix; license = licenses.asl20; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/monitoring/do-agent/default.nix b/pkgs/servers/monitoring/do-agent/default.nix index b738e36cf89..1d6bb7198e5 100644 --- a/pkgs/servers/monitoring/do-agent/default.nix +++ b/pkgs/servers/monitoring/do-agent/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { -X main.version=${version} ''; - modSha256 = "164bwqg996097db399j7lar6gj9xpshjdmyapvzg7zh655xlkf3d"; + vendorSha256 = null; meta = with lib; { description = "DigitalOcean droplet system metrics agent"; @@ -30,4 +30,4 @@ buildGoModule rec { maintainers = with maintainers; [ yvt ]; platforms = platforms.linux; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/monitoring/mtail/default.nix b/pkgs/servers/monitoring/mtail/default.nix index 64966e183fe..d701a7ca001 100644 --- a/pkgs/servers/monitoring/mtail/default.nix +++ b/pkgs/servers/monitoring/mtail/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "04hzr0cw0dq7hmqvp1lhm5wl239yrxmcpsl25sqk74wy06cgrrqd"; }; - modSha256 = "0h3q1qd9a01wlfkk0yv74a4bk5nilpsppq522cv7kl8ysnrjh5yi"; + vendorSha256 = "1km3ldqz35lpkglp9n332vxr38xxfqyij1fi2qq0agyyydbvakj5"; subPackages = [ "cmd/mtail" ]; preBuild = '' @@ -27,4 +27,4 @@ buildGoModule rec { homepage = "https://github.com/google/mtail"; description = "Tool for extracting metrics from application logs"; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix index c8013e6bc15..43c63e24dfc 100644 --- a/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/dnsmasq-exporter.nix @@ -11,7 +11,7 @@ buildGoModule rec { rev = "v${version}"; }; - modSha256 = "1ag1k0z35zkazaxj8hh2wxfj73xg63xdybfm1565il2vxs5986dh"; + vendorSha256 = "1dqpa180pbdi2gcmp991d4cry560mx5rm5l9x065s9n9gnd38hvl"; meta = with stdenv.lib; { inherit (src.meta) homepage; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ willibutz globin ma27 ]; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix index 12341eee911..0c357a768b5 100644 --- a/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mikrotik-exporter.nix @@ -11,7 +11,7 @@ buildGoModule rec { rev = "3b33400d24abcfdc07dc31c15ca5ba7b82de444f"; }; - modSha256 = "1cqjn6j3dfq51ssjx0qrajprlac1h0lb1r4af44lfpigzmrfyi07"; + vendorSha256 = "0i5x4d3ra0s41knmybbg8gnjxgraxkid6y3gfkjwa65xcbp7hr7q"; meta = with stdenv.lib; { inherit (src.meta) homepage; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.bsd3; maintainers = with maintainers; [ mmilata ]; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix index 03656470b92..640730e3ca0 100644 --- a/pkgs/servers/monitoring/prometheus/varnish-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/varnish-exporter.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1viiiyvhpr7cnf8ykaaq4fzgg9xvn4hnlhv7cagy3jkjlmz60947"; }; - modSha256 = "1vb720axjziiqcba4bdi528r6mc97ci0pfsk0ny50isrkh0s3jzz"; + vendorSha256 = "1h9iz3sbz02hb8827hcssqlfg2ag3ymq38siffw9wzajslzhp9sx"; nativeBuildInputs = [ makeWrapper ]; @@ -28,4 +28,4 @@ buildGoModule rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ MostAwesomeDude willibutz ]; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix index cef5367159e..d7a1296a7da 100644 --- a/pkgs/servers/monitoring/sensu-go/default.nix +++ b/pkgs/servers/monitoring/sensu-go/default.nix @@ -18,7 +18,7 @@ let inherit subPackages postInstall; - modSha256 = "02h4cav6ivzs3z0qakwxzf5lfy6hzax5c0i2icp0qymqc2789npw"; + vendorSha256 = "03lkra5vf07zicd2aipvmkrda56ys5swwj6lq5hnp324ndajfcya"; buildFlagsArray = let versionPkg = "github.com/sensu/sensu-go/version"; @@ -66,4 +66,4 @@ in pname = "sensu-go-agent"; subPackages = [ "cmd/sensu-agent" ]; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/monitoring/telegraf/default.nix b/pkgs/servers/monitoring/telegraf/default.nix index ab94971aa3c..b12ad4dd467 100644 --- a/pkgs/servers/monitoring/telegraf/default.nix +++ b/pkgs/servers/monitoring/telegraf/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { sha256 = "17lzz0f9vzyfwr3kgwg6i6361hqzq54jnaaw9rdc132xppdx03nr"; }; - modSha256 = "1q7il1x1pfyz15z23cs0kk7zyacn6b3y28b1q52bqi30l1x8bdbp"; + vendorSha256 = "05nj99hl5f5l0a2aswy19wmbm94hd1h03r227gmn419dkzc5hpah"; buildFlagsArray = [ ''-ldflags= -w -s -X main.version=${version} @@ -31,4 +31,4 @@ buildGoModule rec { homepage = "https://www.influxdata.com/time-series-platform/telegraf/"; maintainers = with maintainers; [ mic92 roblabla foxit64 ]; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index a6122b31753..22708518429 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { sha256 = "10xscm9h2krha66v96v2q85fynnxfizjcc47h7yz4xhjwvb5dgz2"; }; - modSha256 = "0c8gc4qzdazxxnabfms63df8vlf2iy6iy0jrm710x76m4vm6mrbj"; + vendorSha256 = "126rghnyjpykvjg9sr4kwpskc13qqafxgfn9ffykwc4jjz8vc07q"; subPackages = "cmd/thanos"; @@ -30,4 +30,4 @@ buildGoModule rec { maintainers = with maintainers; [ basvandijk ]; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index aa04bcaed9f..4bddd77248a 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "111n36xifmd644xp80imqxx61nlap6fdwx1di2qphlqb43z99jrq"; }; - modSha256 = "07v4ijblvl2zq049fdz5vdfhk6d3phrsajhnhwl46x02dbdzgj13"; + vendorSha256 = "097x3z1fhdl5s3ni2qzbqxqr60l6lqcrbikq20fs052dp287q0sp"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -23,4 +23,4 @@ buildGoModule rec { homepage = "https://influxdata.com/"; maintainers = with maintainers; [ offline zimbatm ]; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index 4015e2097ee..2af0f149e7d 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - modSha256 = "1fx830dif9cq2rvigdbqbc3vmmq01ywj9b095adbrwddvay8m8si"; + vendorSha256 = "1kjh252p91yxq5mi0igamkwlsr50lij24wsp2ilgz6ksv3ijzfr1"; meta = with lib; { description = "Relational database with version control and CLI a-la Git."; @@ -22,4 +22,4 @@ buildGoModule rec { maintainers = with maintainers; [ danbst ]; platforms = platforms.linux ++ platforms.darwin; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 24a8aa66151..9f0a8de4ef6 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -18,7 +18,14 @@ buildGoModule rec { CGO_ENABLED = 0; goPackagePath = "tailscale.com"; - modSha256 = "1xgdhbck3pkix10lfshzdszrv6d3p0hbx8jdjvswz7jjd0vzm4x1"; + overrideModAttrs = (_: { + preBuild = '' + rm ipn/e2e_test.go + rm control/controlclient/auto_test.go + rm control/controlclient/direct_test.go + ''; + }); + vendorSha256 = "1v90lbwgrc2m4kvpglf2jykrm8rry3pbhqqbc3mcysrzmqlw84yl"; subPackages = [ "cmd/tailscale" "cmd/tailscaled" ]; postInstall = '' @@ -34,4 +41,4 @@ buildGoModule rec { license = licenses.bsd3; maintainers = with maintainers; [ danderson mbaillie ]; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index 40b85fc949e..db310061927 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0byi2h1lma95l77sdj8jkidmwb12ryjqwxa0zz6vwjg07p5ps3k4"; }; - modSha256 = "17imp24abfgh75g8161daknzqzk2m19q9d1mij6487046lk75hqz"; + vendorSha256 = "0rbwp0cxqfv4v5sii6kavdj73a0q0l4fnvxincvyy698qzx716kf"; subPackages = [ "cmd/traefik" ]; nativeBuildInputs = [ go-bindata ]; @@ -34,4 +34,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ vdemeester ]; }; -} +} \ No newline at end of file diff --git a/pkgs/servers/web-apps/shiori/default.nix b/pkgs/servers/web-apps/shiori/default.nix index dd4cdc08287..dbea567b7e1 100644 --- a/pkgs/servers/web-apps/shiori/default.nix +++ b/pkgs/servers/web-apps/shiori/default.nix @@ -4,7 +4,7 @@ buildGoModule rec { pname = "shiori"; version = "1.5.0"; - modSha256 = "1z6q5lv0j433p8lc3nxlw1rds5x1kvs1vzl63jf3disxw7ppyai3"; + vendorSha256 = "1ik5faysc880kz7nymvbmjj006l1fsqfy76036szwzg314v78643"; src = fetchFromGitHub { owner = "go-shiori"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ minijackson ]; }; -} +} \ No newline at end of file diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index 4b9e4817ee8..2aa23cd063e 100644 --- a/pkgs/shells/elvish/default.nix +++ b/pkgs/shells/elvish/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { sha256 = "0lz9lf1swrn67kymcp2wh67lh3c0ifqm9035gpkd3zynlq3wzqfm"; }; - modSha256 = "13x4wbfj8049ygm3zbgzyr2bm4sq4x6xddrxx6shr8fydlcf1g8v"; + vendorSha256 = null; meta = with stdenv.lib; { description = "A friendly and expressive command shell"; @@ -36,4 +36,4 @@ buildGoModule rec { passthru = { shellPath = "/bin/elvish"; }; -} +} \ No newline at end of file diff --git a/pkgs/shells/zsh/antibody/default.nix b/pkgs/shells/zsh/antibody/default.nix index cc4726a3cb4..385fb97b913 100644 --- a/pkgs/shells/zsh/antibody/default.nix +++ b/pkgs/shells/zsh/antibody/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0m7c879b3f402av20jsybq2dhhckbknlvn2n1csp7xmcz4zcyn1n"; }; - modSha256 = "0yny1p8vll1wdqdlwyxf9m4kd5njdm7nq527blqqa680zf2k4h8b"; + vendorSha256 = "072kxr68p9f58w2q98fjcn4wzd5szy5l5sz8sh4ssapljvic2lam"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ filalex77 worldofpeace ]; }; -} +} \ No newline at end of file diff --git a/pkgs/shells/zsh/zsh-history/default.nix b/pkgs/shells/zsh/zsh-history/default.nix index f839cf7cf2e..47f590a78f2 100644 --- a/pkgs/shells/zsh/zsh-history/default.nix +++ b/pkgs/shells/zsh/zsh-history/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - modSha256 = "0f10b86gyn7m7lw43c8y1m30mdg0i092a319v3cb2qj05jb9vn42"; + vendorSha256 = "13rc1afds5xg30faqz35haha4kxg73b5nvjirbrkc6kna0vhb54z"; goPackagePath = "github.com/b4b4r07/history"; postInstall = '' @@ -33,4 +33,4 @@ buildGoModule rec { passthru.tests = { zsh-history-shell-integration = nixosTests.zsh-history; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix index 48a1de61cd8..3163ab4dfcd 100644 --- a/pkgs/tools/admin/aws-vault/default.nix +++ b/pkgs/tools/admin/aws-vault/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { sha256 = "04dyibcaijv5011laycf39m4gvprvvsn5zkxslyih1kqd170w3wg"; }; - modSha256 = "1d3hjfmfmlpw2scfyn597zkzz864w97p0wrsxjp49m9mi0pgmhq9"; + vendorSha256 = "0jlraq480llamns6yw8yjkzxsndyqiyzy120djni8sw5h0bz65j7"; subPackages = [ "." ]; # set the version. see: aws-vault's Makefile @@ -26,4 +26,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ zimbatm ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/admin/awsweeper/default.nix b/pkgs/tools/admin/awsweeper/default.nix index fda773b48cd..372d287cbd2 100644 --- a/pkgs/tools/admin/awsweeper/default.nix +++ b/pkgs/tools/admin/awsweeper/default.nix @@ -1,9 +1,15 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchurl, fetchFromGitHub }: buildGoModule rec { pname = "awsweeper"; version = "0.7.0"; + # Requires go generate to be run with mockgen, but doesn't check in the results. + patches = fetchurl { + url = "https://raw.githubusercontent.com/c00w/patches/master/awskeeper.patch"; + sha256 = "0dz553ffxc37m2iwygrbhxf7pm91hxdriic8a1gjf8q3nyn13npl"; + }; + src = fetchFromGitHub { owner = "cloudetc"; repo = pname; @@ -11,7 +17,7 @@ buildGoModule rec { sha256 = "1ybrrpnp6rh7rcwihww43cvhfhzzyy51rdk1hwy9ljpkg37k4y28"; }; - modSha256 = "07zz6wf9cq3wylihi9fx0rd85iybnq5z5c9gqw1lhpvqcrad4491"; + vendorSha256 = "0hnpb1xp135z2qpn1b6xad59739hffhs8dfpr3n5drmrvajpn4xp"; meta = with lib; { description = "A tool to clean out your AWS account"; diff --git a/pkgs/tools/admin/berglas/default.nix b/pkgs/tools/admin/berglas/default.nix index c1c46da41b7..ecafb139782 100644 --- a/pkgs/tools/admin/berglas/default.nix +++ b/pkgs/tools/admin/berglas/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0y393g36h35zzqyf5b10j6qq2jhvz83j17cmasnv6wbyrb3vnn0n"; }; - modSha256 = "0m2bqx102lf6nihdjbl8a08xcwi80rawvh91j1cav0njm9w5vmmm"; + vendorSha256 = null; meta = with stdenv.lib; { description = "A tool for managing secrets on Google Cloud"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.asl20; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/admin/certigo/default.nix b/pkgs/tools/admin/certigo/default.nix index 5474cb25429..86873d90514 100644 --- a/pkgs/tools/admin/certigo/default.nix +++ b/pkgs/tools/admin/certigo/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0siwbxxzknmbsjy23d0lvh591ngabqhr2g8mip0siwa7c1y7ivv4"; }; - modSha256 = "1i5n5yh6nvv2i2nm60vqy1gngj8p5w6ma5fcwmp7bl4jxjrzbi83"; + vendorSha256 = "1l6ajfl04rfbssvijgd5jrppmqc5svfrswdx01x007lr8rvdfd94"; meta = with stdenv.lib; { description = "A utility to examine and validate certificates in a variety of formats"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = [ maintainers.marsam ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/admin/clair/default.nix b/pkgs/tools/admin/clair/default.nix index 3f4d00736ad..2562dc45fa8 100644 --- a/pkgs/tools/admin/clair/default.nix +++ b/pkgs/tools/admin/clair/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "14dh9iv2g138rivvfk135m3l90kk6c1ln1iqxhbi7s99h1jixbqw"; }; - modSha256 = "0rgkrid58kji39nlmiii95r8shbzr6dwalj5m7qwxy5w1rcaljr5"; + vendorSha256 = "0x31n50vd8660z816as6kms5dkv87b0mhblccpkvd9cbvcv2n37a"; nativeBuildInputs = [ makeWrapper ]; @@ -26,4 +26,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ marsam ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 233538083e9..18fb37aa41c 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0xlr7hsncih4nzydi6sphp7j7k82cbhmi7jb0sd954i8kzl3sc1q"; }; - modSha256 = "0iw5za1fc9hsbc3fhhj3l276064vfdjqsad9c3c54y7b9rjgcqrv"; + vendorSha256 = "14d9hl01z7ixp1wa8kp1zs0z1p3pvz6hkp49z582nqllpb2xjmkx"; subPackages = [ "cmd/eksctl" ]; diff --git a/pkgs/tools/admin/iamy/default.nix b/pkgs/tools/admin/iamy/default.nix index 96c49b58d0b..8e79959ba37 100644 --- a/pkgs/tools/admin/iamy/default.nix +++ b/pkgs/tools/admin/iamy/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { sha256 = "1fypc6yjnhlpk7zhb2lvah2ikh2zji9sll55rqjbr3i4j02h484z"; }; - modSha256 = "0akak573zvz3xg5d7vf0ch2mrmj1jkzcdc29v3kn43f7944c2wcl"; + vendorSha256 = "0c4g1zr0wl118g41hqri0vwvfin39yvgs214w3spw8ggjcj6bzph"; buildFlagsArray = [''-ldflags= -X main.Version=v${version} -s -w @@ -25,4 +25,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ suvash ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index 05cab814ecf..025afe25e87 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { hash = "sha256-hjH1TBw6GHYNI9JSBOzdyEtJmp8NhlwNYydGZwsjAg0="; }; - modSha256 = "sha256-+PJRaDdZqVO6D9SXojlr8JXn++pL18HOHFdaiUEalw8="; + vendorSha256 = "14453iiya6algkympyvwm03qgjcwk79z8bbrij7qhnp52qfrbmrp"; subPackages = [ "cmd/lego" ]; buildFlagsArray = [ diff --git a/pkgs/tools/audio/mpd-mpris/default.nix b/pkgs/tools/audio/mpd-mpris/default.nix index 37766a90721..3c736258cbb 100644 --- a/pkgs/tools/audio/mpd-mpris/default.nix +++ b/pkgs/tools/audio/mpd-mpris/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1cr5j2z2ynj1hwkjzi5amcg59vmgazsci41v6vpsj119g7psjmzm"; }; - modSha256 = "1a95kfy8w952269x4llbl0afyxr5fjkg30mxsn81zdh5wr8gabwh"; + vendorSha256 = "108yjymp64iqx1b2wqjbkmbm2w199wq46g7hrmqhcziv6f4aqljp"; subPackages = [ "cmd/${pname}" ]; @@ -29,5 +29,4 @@ buildGoModule rec { maintainers = with maintainers; [ doronbehar ]; platforms = platforms.linux; }; -} - +} \ No newline at end of file diff --git a/pkgs/tools/backup/wal-g/default.nix b/pkgs/tools/backup/wal-g/default.nix index ad67f7ce880..2f2541c41cb 100644 --- a/pkgs/tools/backup/wal-g/default.nix +++ b/pkgs/tools/backup/wal-g/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1hslhs9i4wib6c74gdq9yail958ff1y11pymjww2xr84wkwd9v7i"; }; - modSha256 = "0kwl5gwc5gc0cq2gldg13nvswp9wd90xiv1qb3g8yxcczywkpmrm"; + vendorSha256 = "0jjr33k27k6h27sa01ipz0aydch3i9klknqb3yq8f048zkb54gv8"; buildInputs = [ brotli ]; @@ -31,4 +31,4 @@ buildGoModule rec { description = "An archival restoration tool for PostgreSQL"; maintainers = [ stdenv.lib.maintainers.ocharles ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/3mux/default.nix b/pkgs/tools/misc/3mux/default.nix index 3371b795623..81ca4d94628 100644 --- a/pkgs/tools/misc/3mux/default.nix +++ b/pkgs/tools/misc/3mux/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "02ry066psvlqdyhimci7nskw4sfb70dw5z7ag7s7rz36gmx1vnmr"; }; - modSha256 = "1ag9lx8xcp2z9lrg404914zin45n8f4s08365yk71q5vyiwxjj3i"; + vendorSha256 = "1hjzpg3q4znvgzk0wbl8rq6cq877xxdsf950bcsks92cs8386847"; meta = with stdenv.lib; { description = "Terminal multiplexer inspired by i3"; @@ -21,4 +21,4 @@ buildGoModule rec { # TODO: fix modules build on darwin broken = stdenv.isDarwin; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index 96e33e0de24..75b10bc32ca 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1b8y0wq3myhvjdnwl0i4x85iil7i7kmsjajvbw1a47afm83jkbaw"; }; - modSha256 = "147bbhbcf81i6vyiv9q8abx5qw44fx3qw5v5f6zjnkfajdqlvbsx"; + vendorSha256 = "1za47n08iamhfl4ky928rixgadflmz86vnmnwbczd167bdndh5rq"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.builtBy=nixpkgs" @@ -34,4 +34,4 @@ buildGoModule rec { maintainers = with maintainers; [ jhillyerd ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/clipman/default.nix b/pkgs/tools/misc/clipman/default.nix index 8d84adbddad..5146e25da50 100644 --- a/pkgs/tools/misc/clipman/default.nix +++ b/pkgs/tools/misc/clipman/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1lf5fbzplyc1mpdqgfwbrn8m5568vhjf48580fvvfgbhz6zcil8n"; }; - modSha256 = "1sim3x794kj3wdw0g432zbgh1cimdmmg1hjgynh9jgm3y8w9q7ij"; + vendorSha256 = "18jw4z0lcrh00yjr3qdkgvlrpfwqbsm0ncz7fp1h72pzkh41byv7"; nativeBuildInputs = [ makeWrapper ]; @@ -27,4 +27,4 @@ buildGoModule rec { description = "A simple clipboard manager for Wayland"; platforms = platforms.linux; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/docui/default.nix b/pkgs/tools/misc/docui/default.nix index 0329c1bc4a6..f3f89d0a667 100644 --- a/pkgs/tools/misc/docui/default.nix +++ b/pkgs/tools/misc/docui/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0jya0wdp8scjmsr44krdbbb8q4gplf44gsng1nyn12a6ldqzayxl"; }; - modSha256 = "1wyx05kk4f41mgvwnvfc9xk7vd3x96cbn5xb5ph7p443f70ydnak"; + vendorSha256 = "1ggdczvv03lj0g6cq26vrk1rba6pk0805n85w9hkbjx9c4r3j577"; meta = with stdenv.lib; { description = "TUI Client for Docker"; @@ -20,4 +20,4 @@ buildGoModule rec { platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ aethelz ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index d5c75a1e8a7..e875dd77b02 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0piz1dzczcw1nsff775zicvpm6iy0iw0v0ba7rj7i0xqv9ni1prw"; }; - modSha256 = "16bb0a9z49jqhh9lmq8rvl7x9vh79mi4ygkb9sm04g41g5z6ag1s"; + vendorSha256 = "1c2iz28hjrw9rig9a6r27wd8clycdhi8fgs3da91c63w4qi140zm"; outputs = [ "out" "man" ]; @@ -63,4 +63,4 @@ buildGoModule rec { maintainers = with maintainers; [ filalex77 ma27 ]; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/gotify-cli/default.nix b/pkgs/tools/misc/gotify-cli/default.nix index d4daa64facb..cd50271a2e6 100644 --- a/pkgs/tools/misc/gotify-cli/default.nix +++ b/pkgs/tools/misc/gotify-cli/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "131gs6xzfggnrzq5jgyky23zvcmhx3q3hd17xvqxd02s2i9x1mg4"; }; - modSha256 = "1lrsg33zd7m24za2gv407hz02n3lmz9qljfk82whlj44hx7kim1z"; + vendorSha256 = "1lhhsf944gm1p6qxn05g2s3hdnra5dggj7pdrdq6qr6r2xg7f5qh"; postInstall = '' mv $out/bin/cli $out/bin/gotify @@ -23,4 +23,4 @@ buildGoModule rec { description = "A command line interface for pushing messages to gotify/server."; maintainers = with maintainers; [ ma27 ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/kepubify/default.nix b/pkgs/tools/misc/kepubify/default.nix index 0a8f10fa85d..46d75e5086e 100644 --- a/pkgs/tools/misc/kepubify/default.nix +++ b/pkgs/tools/misc/kepubify/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "13d3fl53v9pqlm555ly1dm9vc58xwkyik0qmsg173q78ysy2p4q5"; }; - modSha256 = "0jz8v4rnwm5zbxxp49kv96wm4lack6prwyhcrqwsrm79dr9yjcxf"; + vendorSha256 = "04qpxl4j6v6w25i7r6wghd9xi7jzpy7dynhs9ni35wflq0rlczax"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -23,4 +23,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ zowoq ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix index b1edabad684..8627003db5f 100644 --- a/pkgs/tools/misc/lf/default.nix +++ b/pkgs/tools/misc/lf/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0kl9yrgph1i0jbxhlg3k0411436w80xw1s8dzd7v7h2raygkb4is"; }; - modSha256 = "1c6c6qg8yrhdhqsnqj3jw3x2hi8vrhfm47cp9xlkfnjfrz3nk6jp"; + vendorSha256 = "1zb2z3c2w4gnq9cjczg1y7r7jg4mlrm2hsb12dqd9w8mh44rvr37"; nativeBuildInputs = [ installShellFiles ]; @@ -47,4 +47,4 @@ buildGoModule rec { platforms = platforms.unix; maintainers = with maintainers; [ primeos ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/libgen-cli/default.nix b/pkgs/tools/misc/libgen-cli/default.nix index c34e934fba4..c92b4ad42e1 100644 --- a/pkgs/tools/misc/libgen-cli/default.nix +++ b/pkgs/tools/misc/libgen-cli/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { sha256 = "1lfsnyzin2dqhwhz6phms6yipli88sqiw55ls18dfv7bvx30sqlp"; }; - modSha256 = "1k16zjb7p65g72hr9vsk38jhpsy1yclm7fjgq47qy6jwjd44w1bi"; + vendorSha256 = "1j45h8p13xfz0qy1nrddlx1xzbr5vqxd3q76hbb0v60636izfk0r"; subPackages = [ "." ]; @@ -27,4 +27,4 @@ buildGoModule rec { platforms = platforms.all; maintainers = with maintainers; [ zaninime ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/mutagen/default.nix b/pkgs/tools/misc/mutagen/default.nix index 8940fef2a0d..d1716d95caf 100644 --- a/pkgs/tools/misc/mutagen/default.nix +++ b/pkgs/tools/misc/mutagen/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0ykzrxlllip4wvhd9rja5bcr2m72695fjj2q1scwn8ri6jcgfa19"; }; - modSha256 = "1r6b4y6civk75if6nljl66pgv5qm7x05qqby1anf7s7cz7d1rc3g"; + vendorSha256 = "0szs9yc49fyh55ra1wf8zj76kdah0x49d45cgivk3gqh2hl17j6l"; subPackages = [ "cmd/mutagen" "cmd/mutagen-agent" ]; @@ -22,4 +22,4 @@ buildGoModule rec { maintainers = [ maintainers.marsam ]; license = licenses.mit; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/neo-cowsay/default.nix b/pkgs/tools/misc/neo-cowsay/default.nix index a4fe58fb107..e50960d063c 100644 --- a/pkgs/tools/misc/neo-cowsay/default.nix +++ b/pkgs/tools/misc/neo-cowsay/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0c6lygdqi26mczij41sn8ckc3g6qaakkkh3iasf10a4d07amxci1"; }; - modSha256 = "063ds35dzv8m4bjk7v1q3f6jwyp7j5jrkrhrl41z1c1mbzzkagkq"; + vendorSha256 = "1clar59x2dvn7yj4fbylby9nrzy8kdixi48hkbmrv8g5l8n0wdl2"; subPackages = [ "cmd/cowsay" "cmd/cowthink" ]; @@ -21,4 +21,4 @@ buildGoModule rec { license = with licenses; [artistic1 /* or */ gpl3]; maintainers = with maintainers; [ filalex77 ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/pg_flame/default.nix b/pkgs/tools/misc/pg_flame/default.nix index fbeba0ff1bd..6fe2e814fa4 100644 --- a/pkgs/tools/misc/pg_flame/default.nix +++ b/pkgs/tools/misc/pg_flame/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1a03vxqnga83mhjp7pkl0klhkyfaby7ncbwm45xbl8c7s6zwhnw2"; }; - modSha256 = "0j7qpvji546z0cfjijdd66l0vsl0jmny6i1n9fsjqjgjpwg26naq"; + vendorSha256 = "1rkx20winh66y2m7i7q13jpr83044i2d1pfd5p5l5kkpsix5mra5"; meta = with lib; { description = "Flamegraph generator for Postgres EXPLAIN ANALYZE output"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ filalex77 ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/pgcenter/default.nix b/pkgs/tools/misc/pgcenter/default.nix index fbd32cf876d..edcc2cfc2bf 100644 --- a/pkgs/tools/misc/pgcenter/default.nix +++ b/pkgs/tools/misc/pgcenter/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0p8ck4s5jj53nc638darhwbylcsslfmfz72bwy6wxby9iqi9kq6b"; }; - modSha256 = "0kassq52v07zmffs6l066g0d3kfv6wmrh9g5cgk79bmyq13clqjj"; + vendorSha256 = "1mzvpr12qh9668iz97p62zl4zhlrcyfgwr4a9zg9irj585pkb5x2"; meta = with stdenv.lib; { homepage = "https://pgcenter.org/"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.bsd3; maintainers = [ maintainers.marsam ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/pgmetrics/default.nix b/pkgs/tools/misc/pgmetrics/default.nix index 632ba452ff9..c78aa6a5315 100644 --- a/pkgs/tools/misc/pgmetrics/default.nix +++ b/pkgs/tools/misc/pgmetrics/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0f7pjagr3zcqmbhmk446j6n7nanyhvyq4rn68f5wljl9g68ni7sj"; }; - modSha256 = "13a969yki47gw4b3mwhsgl0x53xylmflsykcs63f8pmigckw7jac"; + vendorSha256 = "16x33fmh4q993rw0jr65337yimska4fwgyyw3kmq84q0x28a3zg5"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = [ maintainers.marsam ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/pistol/default.nix b/pkgs/tools/misc/pistol/default.nix index 1a244cd4103..eeb392606ed 100644 --- a/pkgs/tools/misc/pistol/default.nix +++ b/pkgs/tools/misc/pistol/default.nix @@ -15,8 +15,7 @@ buildGoModule rec { sha256 = "1d9c1bhidh781dis4427wramfrla4avqw9y2bmpjp81cqq3nc27d"; }; - modSha256 = "0r062nka72ah2nb2gf8dfrrj4sxadkykcqjzkp4c9vwk93mhw41k"; - buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; + vendorSha256 = "1f780vhxw0brvnr8hhah4sf6ms8spar29rqmy1kcqf9m75n94g56"; subPackages = [ "cmd/pistol" ]; @@ -30,4 +29,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ doronbehar ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/powerline-go/default.nix b/pkgs/tools/misc/powerline-go/default.nix index 077116767c3..33ab2bbc729 100644 --- a/pkgs/tools/misc/powerline-go/default.nix +++ b/pkgs/tools/misc/powerline-go/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "135j18d53nhg6adjd2hax067c5f1py9fyprzfcr3plsxnaki2hrx"; }; - modSha256 = "0mz1qrwar9cgrhrgw4z3gwhjj62bnfnn59ji31zkyvwlc1mqh9an"; + vendorSha256 = "0dkgp9vlb76la0j439w0rb548qg5v8648zryk3rqgfhd4qywlk11"; meta = with stdenv.lib; { description = "A Powerline like prompt for Bash, ZSH and Fish"; @@ -19,4 +19,4 @@ buildGoModule rec { platforms = platforms.unix; maintainers = with maintainers; [ sifmelcara ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/up/default.nix b/pkgs/tools/misc/up/default.nix index 1e3378305d9..f0f9cf4cee8 100644 --- a/pkgs/tools/misc/up/default.nix +++ b/pkgs/tools/misc/up/default.nix @@ -4,6 +4,8 @@ buildGoModule rec { pname = "up"; version = "0.3.2"; + patches = [ ./gomod.patch ]; + src = fetchFromGitHub { owner = "akavel"; repo = "up"; @@ -11,7 +13,7 @@ buildGoModule rec { sha256 = "1psixyymk98z52yy92lwb75yfins45dw6rif9cxwd7yiascwg2if"; }; - modSha256 = "0nfs190rzabphhhyacypz3ic5c4ajlqpx9jiiincs0vxfkmfwnjd"; + vendorSha256 = "1h3w4i7dyh6yagqmdclvflfq6fx0z880jdnpf28assv7fxd9rjsx"; meta = with lib; { description = "Ultimate Plumber is a tool for writing Linux pipes with instant live preview"; @@ -19,4 +21,4 @@ buildGoModule rec { maintainers = with maintainers; [ ma27 ]; license = licenses.asl20; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/misc/up/gomod.patch b/pkgs/tools/misc/up/gomod.patch new file mode 100644 index 00000000000..f894f14d21f --- /dev/null +++ b/pkgs/tools/misc/up/gomod.patch @@ -0,0 +1,23 @@ +diff --git a/go.mod b/go.mod +index ecbfe90..56a1409 100644 +--- a/go.mod ++++ b/go.mod +@@ -1,11 +1,14 @@ + module github.com/akavel/up + ++go 1.14 ++ + require ( +- github.com/gdamore/encoding v0.0.0-20151215212835-b23993cbb635 ++ github.com/gdamore/encoding v0.0.0-20151215212835-b23993cbb635 // indirect + github.com/gdamore/tcell v0.0.0-20180924055237-493f3b46b3c2 +- github.com/lucasb-eyer/go-colorful v0.0.0-20170903184257-231272389856 ++ github.com/lucasb-eyer/go-colorful v0.0.0-20170903184257-231272389856 // indirect + github.com/mattn/go-isatty v0.0.3 +- github.com/mattn/go-runewidth v0.0.2 ++ github.com/mattn/go-runewidth v0.0.2 // indirect + github.com/spf13/pflag v1.0.3 +- golang.org/x/text v0.0.0-20171214130843-f21a4dfb5e38 ++ golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3 // indirect ++ golang.org/x/text v0.0.0-20171214130843-f21a4dfb5e38 // indirect + ) diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index 116b0b25306..1a2cf502651 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "05rh61dx4f9kv5p8sahhwwiyivwq438fl30j9d97i4sagvb5jvvm"; }; - modSha256 = "1k7yd2lh6hwz3qm6ywrlr1qw0asqwdgrpj594v1gvav426yqyr6s"; + vendorSha256 = "1f8za3z5pv1pznbd91fk5j4y8qg93qk5zvnchjl7inyirciawdf6"; outputs = [ "out" "wordlists" ]; diff --git a/pkgs/tools/networking/cassowary/default.nix b/pkgs/tools/networking/cassowary/default.nix index 6156f43b04b..be1df339439 100644 --- a/pkgs/tools/networking/cassowary/default.nix +++ b/pkgs/tools/networking/cassowary/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0p5vcs25h5nj36dm9yjmdjymcq0zldm3zlqfppxcjx862h48k8zj"; }; - modSha256 = "1iylnnmj5slji89pkb3shp4xqar1zbpl7bzwddbzpp8y52fmsv1c"; + vendorSha256 = "1m5jaqf5jrib415k0i7w6rf5bjjwfn572wk94jwfpwjcbbvh8fck"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -22,4 +22,4 @@ buildGoModule rec { maintainers = with maintainers; [ hugoreeves ]; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/clash/default.nix b/pkgs/tools/networking/clash/default.nix index f9c1ee4bc31..af21e9d4fef 100644 --- a/pkgs/tools/networking/clash/default.nix +++ b/pkgs/tools/networking/clash/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { }; goPackagePath = "github.com/Dreamacro/clash"; - modSha256 = "113ynl1f01ihmbc376rb421rrjlxxbc8p9fhxrvpxcsm10rjky8w"; + vendorSha256 = "0nh3cn31p7yhnhjzqp84dnhzy3hag253bjp70w8q03lw7mkhdgz3"; buildFlagsArray = [ "-ldflags=" @@ -26,4 +26,4 @@ buildGoModule rec { maintainers = with maintainers; [ contrun filalex77 ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/corerad/default.nix b/pkgs/tools/networking/corerad/default.nix index 2fb2cb79ff4..eef345c8db6 100644 --- a/pkgs/tools/networking/corerad/default.nix +++ b/pkgs/tools/networking/corerad/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1r9kvz1ylrnfc7y5c4knqhx6xngh1p8j1axb8bd7h7p51c4i7jz2"; }; - modSha256 = "00xisa4l90f0digb1jfd2w616r080m7yp01y1rb83r8k147z5d2v"; + vendorSha256 = "0ncwf197dx6mqzg69mnyp0iyad585izmydm0yj8ikd0y8ngpx7a3"; buildFlagsArray = '' -ldflags= @@ -19,6 +19,8 @@ buildGoModule rec { -X github.com/mdlayher/corerad/internal/build.linkVersion=v${version} ''; + deleteVendor = true; + meta = with stdenv.lib; { homepage = "https://github.com/mdlayher/corerad"; description = "CoreRAD extensible and observable IPv6 NDP RA daemon"; diff --git a/pkgs/tools/networking/croc/default.nix b/pkgs/tools/networking/croc/default.nix index a0ee3803139..ba31e13c892 100644 --- a/pkgs/tools/networking/croc/default.nix +++ b/pkgs/tools/networking/croc/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0kwpn1nv93f8swzc70j8srddqz7qb33pxc9nhqrd92jhcl4cc7iv"; }; - modSha256 = "1wcnf3sd4hkfm38q2z03ixys1hbscay5rsac49ng4kabqjh7rxhg"; + vendorSha256 = "1vl5yz3z5z30rxnnxy74g2m5025vbisqyv31nc21kxdfrdqrwp6c"; subPackages = [ "." ]; @@ -34,4 +34,4 @@ buildGoModule rec { - Does not require a server or port-forwarding ''; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/curlie/default.nix b/pkgs/tools/networking/curlie/default.nix index 179181fc49c..cb1cf8d97fa 100644 --- a/pkgs/tools/networking/curlie/default.nix +++ b/pkgs/tools/networking/curlie/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "09v8alrbw6qva3q3bcqxnyjm7svagfxqvhdff7cqf5pbmkxnhln9"; }; - modSha256 = "18nwq99vv3nbdwfilfn8v64mn58jviwybi93li0lcg7779nxab3d"; + vendorSha256 = "1mxgf004czf65a2mv99gfp27g98xhllmfcz4ynfv66nfkbfz6a8n"; meta = with lib; { description = "Curlie is a frontend to curl that adds the ease of use of httpie, without compromising on features and performance"; @@ -19,4 +19,4 @@ buildGoModule rec { maintainers = with maintainers; [ ma27 ]; license = licenses.mit; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/dnsproxy/default.nix b/pkgs/tools/networking/dnsproxy/default.nix index 3877e6f0e1a..a2b4f40f5a2 100644 --- a/pkgs/tools/networking/dnsproxy/default.nix +++ b/pkgs/tools/networking/dnsproxy/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0nsj75aw5dym1pzn18p6fzh17vcryz1xs4xly6ga79dkpyijr9j8"; }; - modSha256 = "1m8565hkn981b6xld8jyrbxay48ww8lzr94kgakx0rg5548kd7v5"; + vendorSha256 = null; meta = with stdenv.lib; { description = "Simple DNS proxy with DoH, DoT, and DNSCrypt support"; @@ -20,4 +20,4 @@ buildGoModule rec { maintainers = with maintainers; [ contrun ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/frp/default.nix b/pkgs/tools/networking/frp/default.nix index 438740600c7..588f8a8c1cb 100644 --- a/pkgs/tools/networking/frp/default.nix +++ b/pkgs/tools/networking/frp/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1z914p20n3i1bf4hx5iq2fylx1s49knb70cbg53ji2n7nrm1q33r"; }; - modSha256 = "1v90w5grc0vjpcp0m56d73zi0qnbswgz1rcvcwrjfa3rwqhigbal"; + vendorSha256 = "0pi661mb5vwj16wwxnyx9b0ic7gzby6qfs3y4w00agn6sn5nahx2"; subPackages = [ "cmd/frpc" "cmd/frps" ]; @@ -28,4 +28,4 @@ buildGoModule rec { maintainers = with maintainers; [ filalex77 ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/grpcui/default.nix b/pkgs/tools/networking/grpcui/default.nix index 58e698ed708..6bae95298fe 100644 --- a/pkgs/tools/networking/grpcui/default.nix +++ b/pkgs/tools/networking/grpcui/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0dcah6bamjqyp9354qrd1cykdr5k5l93hh7qcy5b4nkag9531gl0"; }; - modSha256 = "1yq8484cjxad72nqsrim3zppr8hmn7dc6f8rgkw8fg952lqy5jjb"; + vendorSha256 = "0m9nn8x0ji0n9v3d5w5z3grwv0zh8ijvh92jqjpcfv4bcjr5vsjr"; meta = with lib; { description = "An interactive web UI for gRPC, along the lines of postman"; @@ -20,4 +20,4 @@ buildGoModule rec { maintainers = with maintainers; [ pradyuman ]; platforms = platforms.linux ++ platforms.darwin; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/hey/default.nix b/pkgs/tools/networking/hey/default.nix index d65d5c9e323..8ed6ecbbf26 100644 --- a/pkgs/tools/networking/hey/default.nix +++ b/pkgs/tools/networking/hey/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "06w5hf0np0ayvjnfy8zgy605yrs5j326nk2gm0fy7amhwx1fzkwv"; }; - modSha256 = "0a00kcyagqczw0vhl8qs2xs1y8myw080y9kjs4qrcmj6kibdy55q"; + vendorSha256 = null; meta = with lib; { description = "HTTP load generator, ApacheBench (ab) replacement"; @@ -19,4 +19,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ filalex77 ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/minio-client/default.nix b/pkgs/tools/networking/minio-client/default.nix index 0649eb02172..4e81321dc62 100644 --- a/pkgs/tools/networking/minio-client/default.nix +++ b/pkgs/tools/networking/minio-client/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0ff2fyr3787zp0lpgbph064am33py2wzjikzmxd3zwp3y0dic770"; }; - modSha256 = "1bcz7jchfnglypr2md9hhqbvcbghic2yp6njdrx3m5nqhylypzfx"; + vendorSha256 = "0nfcxz47v5gl0wih59xarhz82nd8wy61c3ijvg2v08ipk29zivcc"; subPackages = [ "." ]; @@ -24,4 +24,4 @@ buildGoModule rec { platforms = platforms.unix; license = licenses.asl20; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/nebula/default.nix b/pkgs/tools/networking/nebula/default.nix index ec94fc97997..69fc3e7a8b0 100644 --- a/pkgs/tools/networking/nebula/default.nix +++ b/pkgs/tools/networking/nebula/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0xrki9w83b4b3l5adq1rxz374f124wf388sdyvy7ngc3b04k7qlb"; }; - modSha256 = "0v45ikw0bl00412krg4v6sr9bggvsrvl0h6clihkh4mdfz6kwa47"; + vendorSha256 = "094mn1r69c40w7k3lsggjh0dpws9l0j7mgiyjy1lpblkvkyk2azm"; subPackages = [ "cmd/nebula" "cmd/nebula-cert" ]; @@ -40,4 +40,4 @@ buildGoModule rec { platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/obfs4/default.nix b/pkgs/tools/networking/obfs4/default.nix index 02820c0a74f..784c6d5c638 100644 --- a/pkgs/tools/networking/obfs4/default.nix +++ b/pkgs/tools/networking/obfs4/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { sha256 = "05aqmw8x8s0yqyqmdj5zcsq06gsbcmrlcd52gaqm20m1pg9503ad"; }; - modSha256 = "150kg22kznrdj5icjxk3qd70g7wpq8zd2zklw1y2fgvrggw8zvyv"; + vendorSha256 = "0h3gjxv26pc6cysvy1hny2f4abw6i847dk8fx0m113ixx9qghk87"; meta = with lib; { description = "A pluggable transport proxy"; @@ -18,4 +18,4 @@ buildGoModule rec { repositories.git = "https://git.torproject.org/pluggable-transports/obfs4.git"; maintainers = with maintainers; [ phreedom thoughtpolice ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/pixiecore/default.nix b/pkgs/tools/networking/pixiecore/default.nix index bc8ec7da169..60d2a0986b1 100644 --- a/pkgs/tools/networking/pixiecore/default.nix +++ b/pkgs/tools/networking/pixiecore/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { sha256 = "14dslmx3gk08h9gqfjw5y27x7d2c6r8ir7mjd7l9ybysagpzr02a"; }; - modSha256 = "1waqaglm6f9zy5296z309ppkck2vmydhk9gjnxrgzmhqld5lcq4f"; + vendorSha256 = "08n3m6fkwh8jmmzky3ygij4gxlcqidqk5ywi8ki8bkyzzs2lqaw7"; subPackages = [ "cmd/pixiecore" ]; meta = { @@ -22,4 +22,4 @@ buildGoModule rec { maintainers = with stdenv.lib.maintainers; [ bbigras danderson ]; platforms = stdenv.lib.platforms.linux; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/shadowfox/default.nix b/pkgs/tools/networking/shadowfox/default.nix index f2ae143e1b9..f4cc57c9c8b 100644 --- a/pkgs/tools/networking/shadowfox/default.nix +++ b/pkgs/tools/networking/shadowfox/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { goPackagePath = "github.com/SrKomodo/shadowfox-updater"; - modSha256 = "0hcc87mzacqwbw10l49kx0sxl4mivdr88c40wh6hdfvrbam2w86r"; + vendorSha256 = "06ar9ivry9b01609izjbl6hqgg0cy7aqd8n2cqpyq0g7my0l0lbj"; buildFlags = [ "--tags" "release" ]; @@ -27,4 +27,4 @@ buildGoModule rec { platforms = platforms.all; maintainers = with maintainers; [ infinisil ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/tendermint/default.nix b/pkgs/tools/networking/tendermint/default.nix index 90b16e37ed7..97f9b141767 100644 --- a/pkgs/tools/networking/tendermint/default.nix +++ b/pkgs/tools/networking/tendermint/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "17p7khfiv5aflpl4imbqp8v7gignd6v6a7g80xlnzgix5ismh84l"; }; - modSha256 = "1sdjzj52gkqk51ml29hijzv64clmi38km5z7j7paf28dla2brfxq"; + vendorSha256 = "1vhd3s6yxfhirgipxcy0rh8sk55cdzirr8n8r31sijgyak92mq0l"; meta = with stdenv.lib; { description = "Byzantine-Fault Tolerant State Machines. Or Blockchain, for short."; @@ -20,4 +20,4 @@ buildGoModule rec { maintainers = with maintainers; [ alexfmpe ]; platforms = platforms.linux ++ platforms.darwin; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/termshark/default.nix b/pkgs/tools/networking/termshark/default.nix index ea1ef86f979..7933cad687a 100644 --- a/pkgs/tools/networking/termshark/default.nix +++ b/pkgs/tools/networking/termshark/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ wireshark-cli ]; - modSha256 = "0lp4gky76di7as78421p3lsirfr7mic3z204ildvj6gf6d15svpr"; + vendorSha256 = "14apff3vcbndr30765lzi4qswakavb4396bjixxvpxv6i5c04dq7"; postFixup = '' wrapProgram $out/bin/termshark --prefix PATH : ${stdenv.lib.makeBinPath [ wireshark-cli ]} @@ -31,4 +31,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ winpat elseym ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/networking/v2ray/generic.nix b/pkgs/tools/networking/v2ray/generic.nix index bf6e6cd55ae..e4831f5dced 100644 --- a/pkgs/tools/networking/v2ray/generic.nix +++ b/pkgs/tools/networking/v2ray/generic.nix @@ -13,7 +13,7 @@ let pname = "v2ray-core"; inherit version src; - modSha256 = "11gsncy3449a7y6w6pr7acqabyj2q2a1q52f8fcl5cdz1vjbmmxi"; + vendorSha256 = "1lh8382gyss01frq4gxyx9p26p5m8f158qfw55sy5wb7ddrafcc2"; buildPhase = '' runHook preBuild @@ -47,4 +47,4 @@ in runCommand "v2ray-${version}" { makeWrapper "$file" "$out/bin/$(basename "$file")" \ --set-default V2RAY_LOCATION_ASSET ${assetsDrv} done -'' +'' \ No newline at end of file diff --git a/pkgs/tools/networking/yggdrasil/default.nix b/pkgs/tools/networking/yggdrasil/default.nix index d8c8c429ef9..438d620d2b5 100644 --- a/pkgs/tools/networking/yggdrasil/default.nix +++ b/pkgs/tools/networking/yggdrasil/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "147kl2kvv1rn3yk0mlvd998a2yayjl07csxxkjvs6264j6csb860"; }; - modSha256 = "1ffp7q7kbkm1312sz6xnpc7342iczy9vj3m76lflirr1ljmw0dnb"; + vendorSha256 = "09xv2p9rydnsb185x61fxhyjqx41wz285c1gdd47ad3s08ay1qc7"; # Change the default location of the management socket on Linux # systems so that the yggdrasil system service unit does not have to @@ -37,4 +37,4 @@ buildGoModule rec { platforms = platforms.all; maintainers = with maintainers; [ ehmry gazally lassulus ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/package-management/mynewt-newt/default.nix b/pkgs/tools/package-management/mynewt-newt/default.nix index 54435b76947..ce155b72fc3 100644 --- a/pkgs/tools/package-management/mynewt-newt/default.nix +++ b/pkgs/tools/package-management/mynewt-newt/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { }) ]; - modSha256 = "068r8wa2pgd68jv50x0l1w8n96f97b3mgv7z6f85280ahgywaasq"; + vendorSha256 = "1sh9mx3lc28fzvc1yrhz58rlbaac7aq1dqyvxwj98vld3kigpv1z"; meta = with stdenv.lib; { homepage = "https://mynewt.apache.org/"; @@ -36,4 +36,4 @@ buildGoModule rec { maintainers = with maintainers; [ pjones ]; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index 0b5f5edf399..b1a44d7458b 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0zl8xf74k5is8rxbirrqb5cnfgrlppr1gchfqm31305mnpicr92s"; }; - modSha256 = "14izjwadl4ify0wrz0yinqvayar79h0pxxqj5n69a5dgbx09fp0l"; + vendorSha256 = "07xg8cm7pqpnb96drcmzk7rj2dhfn4pd8vr2a7nxqizd3qk6d5bf"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -21,4 +21,4 @@ buildGoModule rec { maintainers = [ maintainers.marsam ]; license = licenses.mit; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/security/age/default.nix b/pkgs/tools/security/age/default.nix index c8b4f069f79..c3756b545e3 100644 --- a/pkgs/tools/security/age/default.nix +++ b/pkgs/tools/security/age/default.nix @@ -4,7 +4,7 @@ buildGoModule rec { pname = "age"; version = "unstable-2020-03-25"; goPackagePath = "github.com/FiloSottile/age"; - modSha256 = "00yhn1894ni8bvkqm1vr0rqkky52pkhvdzbi2sqx3czlgb5ibw3h"; + vendorSha256 = "0km7a2826j3fk2nrkmgc990chrkcfz006wfw14yilsa4p2hmfl7m"; subPackages = [ "cmd/age" @@ -24,4 +24,4 @@ buildGoModule rec { license = licenses.bsd3; maintainers = with maintainers; [ tazjin ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/security/bettercap/default.nix b/pkgs/tools/security/bettercap/default.nix index 0560f91b22b..8acb5fb9f83 100644 --- a/pkgs/tools/security/bettercap/default.nix +++ b/pkgs/tools/security/bettercap/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { sha256 = "18hwz9m16pxlb7wp78iqmdi0kimrx3h05fs0zhzm8qhzancq8alf"; }; - modSha256 = "1qhmrjb3fvw6maxrl7hb3bizrw6szhwx6s2g59p5pj3dz4x8jajn"; + vendorSha256 = "1j272w0zdndcz4fmh9fzbk2q8wmyfi70vn0p6d8cg0r0l231sbyx"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libpcap libnfnetlink libnetfilter_queue libusb1 ]; @@ -34,4 +34,4 @@ buildGoModule rec { maintainers = with maintainers; [ y0no ]; platforms = platforms.all; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/security/browserpass/default.nix b/pkgs/tools/security/browserpass/default.nix index a02d04e1333..2dd03bc465d 100644 --- a/pkgs/tools/security/browserpass/default.nix +++ b/pkgs/tools/security/browserpass/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper ]; - modSha256 = "13yw7idgw8l48yvm4jjha0kbx6q22m2zp13y006mikavynqsr5kj"; + vendorSha256 = "1wcbn0ip596f2dp68y6jmxgv20l0dgrcxg5cwclkawigj05416zj"; postPatch = '' # Because this Makefile will be installed to be used by the user, patch @@ -51,4 +51,4 @@ buildGoModule rec { platforms = platforms.all; maintainers = with maintainers; [ rvolosatovs infinisil ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/security/gobuster/default.nix b/pkgs/tools/security/gobuster/default.nix index c3426bee965..8b808551149 100644 --- a/pkgs/tools/security/gobuster/default.nix +++ b/pkgs/tools/security/gobuster/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { sha256 = "0q8ighqykh8qyvidnm6az6dc9mp32bbmhkmkqzl1ybbw6paa8pym"; }; - modSha256 = "0jq0z5s05vqdvq7v1gdjwlqqwbl1j2rv9f16k52idl50vdiqviql"; + vendorSha256 = "0kr9i2nm5csf3070hwaiss137pfa3088xbw2zigp7aqb2naky036"; meta = with lib; { description = "Tool used to brute-force URIs, DNS subdomains, Virtual Host names on target web servers"; @@ -22,4 +22,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ pamplemousse ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index a16701f48ea..7eec1b5e4bc 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -20,7 +20,7 @@ buildGoModule rec { sha256 = "19xhyyd76r17rwn6s8xgfjnyi7kywagy0i4anqws40w79j3qb1p0"; }; - modSha256 = "0zr4ihpcclw5pfhcdrd4n4qb3i3djcwyvwr4m2kpn99icp55bml8"; + vendorSha256 = "1wn20bh7ma4pblsf6qnlbz5bx4p9apig3d1yz7cpsqv4z3w07baw"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev}" ]; @@ -61,4 +61,4 @@ buildGoModule rec { well, providing a stellar user experience and a sane, simple interface. ''; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 4373abdb9a4..42845705ff6 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -11,7 +11,20 @@ buildGoModule rec { sha256 = "12aidylamrq4rvy2cfdz669lr1p20yqrshigcc5x1hrlhh9y64xc"; }; - modSha256 = "1kcj5065yy52p1jy4fad5lsz3y4spqc40k1qsirm53qqixhrhvag"; + hid = fetchFromGitHub { + owner = "karalabe"; + repo = "hid"; + rev = "9c14560f9ee858c43f40b5cd01392b167aacf4e8"; + sha256 = "0xc7b8mwha64j7l2fr2g5zy8pz7cqi0vrxx60gii52b6ii31xncx"; + }; + + vendorSha256 = "0mns5clykvj33krf29yjh8lkf05nih42ka5ji7miq0iaikqyyc78"; + overrideModAttrs = (_: { + postBuild = '' + cp -r --reflink=auto ${hid}/libusb vendor/github.com/karalabe/hid + cp -r --reflink=auto ${hid}/hidapi vendor/github.com/karalabe/hid + ''; + }); subPackages = [ "." "cmd/saml2aws" ]; @@ -26,4 +39,4 @@ buildGoModule rec { platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.pmyjavec ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/security/sops/default.nix b/pkgs/tools/security/sops/default.nix index 8aa2e219e7d..55dde8438c8 100644 --- a/pkgs/tools/security/sops/default.nix +++ b/pkgs/tools/security/sops/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "1515bk0fl0pvdkp402l51gdg63bmqlh89sglss6prc1qqvv5v2xy"; }; - modSha256 = "0vhxd3dschj5i9sig6vpxzbl59cas1qa843akzmjnfjrrafb916y"; + vendorSha256 = "0yryc799k4563wy53z7amraj89cyprklj0lfv207530hwv5i5gm6"; meta = with stdenv.lib; { homepage = "https://github.com/mozilla/sops"; @@ -19,4 +19,4 @@ buildGoModule rec { maintainers = [ maintainers.marsam ]; license = licenses.mpl20; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/system/ctop/default.nix b/pkgs/tools/system/ctop/default.nix index 4f492def162..1c46caaf932 100644 --- a/pkgs/tools/system/ctop/default.nix +++ b/pkgs/tools/system/ctop/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0y72l65xgfqrgghzbm1zcy776l5m31z0gn6vfr689zyi3k3f4kh8"; }; - modSha256 = "0wxv6yzlgki7047qszx9p9xpph95bg097jkgaa0b3wbpx8vg7qml"; + vendorSha256 = "1x4li44vg0l1x205v9a971cgphplxhsrn59q97gmj9cfy4m7jdfw"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.build=v${version}" ]; @@ -21,4 +21,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ apeyroux marsam ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/system/gotop/default.nix b/pkgs/tools/system/gotop/default.nix index 44ef60c70f3..2964efd067d 100644 --- a/pkgs/tools/system/gotop/default.nix +++ b/pkgs/tools/system/gotop/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "01a2y2604dh2zfy5f2fxr306id0fbq0df91fpz2m8w7rpaszd6xr"; }; - modSha256 = "1gbpxq2vyshln97gij5y9qsjyf3mkwfqwwhikc0cck3mnwiv87dd"; + vendorSha256 = "1ais548gii4q7xzysnw2ykjxyzb7azszsqdlp9hgiwp0bax9nj2n"; meta = with stdenv.lib; { description = "A terminal based graphical activity monitor inspired by gtop and vtop"; @@ -20,4 +20,4 @@ buildGoModule rec { maintainers = [ maintainers.magnetophon ]; platforms = platforms.unix; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/system/jump/default.nix b/pkgs/tools/system/jump/default.nix index bc2adb22c4f..fe0138783d3 100644 --- a/pkgs/tools/system/jump/default.nix +++ b/pkgs/tools/system/jump/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0mph3bqfjnw3yf0a6ml3ccmkr1shviwvvq4d04ky4gppfy6z51jy"; }; - modSha256 = "1fzsm85c31vkdw80kijxmjhk8jyhjz8b21npgks2qrnizhm6iaf8"; + vendorSha256 = "1500vim2lmkkls758pwhlx3piqbw6ap0nnhdwz9pcxih4s4as2nk"; outputs = [ "out" "man"]; postInstall = '' @@ -37,4 +37,4 @@ buildGoModule rec { platforms = platforms.all; maintainers = with maintainers; [ sondr3 ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/system/netdata/go.d.plugin.nix b/pkgs/tools/system/netdata/go.d.plugin.nix index cada1eb65c3..2e397da8a81 100644 --- a/pkgs/tools/system/netdata/go.d.plugin.nix +++ b/pkgs/tools/system/netdata/go.d.plugin.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "15h4075lwqh58ssdgyq34jj8r4dga0sz7h18dzy4nir75p8a0s7b"; }; - modSha256 = "1386qhk1yr47h7qv15k0abc8mfif96pqapw0v4wrf3pl1z9mzl2n"; + vendorSha256 = "1pw9pb3rdjzf2dx1p1jiqxs7qhlpjki7fy74nyxza5wzrv4317sj"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -26,4 +26,4 @@ buildGoModule rec { license = licenses.gpl3; maintainers = [ maintainers.lethalman ]; }; -} +} \ No newline at end of file diff --git a/pkgs/tools/text/gjo/default.nix b/pkgs/tools/text/gjo/default.nix index fd06129acfa..74a5c87a760 100644 --- a/pkgs/tools/text/gjo/default.nix +++ b/pkgs/tools/text/gjo/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { doCheck = true; - modSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; meta = with stdenv.lib; { description = "Small utility to create JSON objects"; @@ -24,5 +24,4 @@ buildGoModule rec { license = licenses.mit; maintainers = with maintainers; [ doronbehar ]; }; -} - +} \ No newline at end of file diff --git a/pkgs/tools/text/shfmt/default.nix b/pkgs/tools/text/shfmt/default.nix index cad59507903..ab96392a95d 100644 --- a/pkgs/tools/text/shfmt/default.nix +++ b/pkgs/tools/text/shfmt/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0zlk1jjk65jwd9cx0xarz4yg2r2h86kd5g00gcnsav6dp6rx3aw8"; }; - modSha256 = "080k8d5rp8kyg0x7vjxm758b9ya9z336yd4rcqws7yhqawxiv55z"; + vendorSha256 = "1jq2x4yxshsy4ahp7nrry8dc9cyjj46mljs447rq57sgix4ndpq8"; subPackages = ["cmd/shfmt"]; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; @@ -25,4 +25,4 @@ buildGoModule rec { ''; license = licenses.bsd3; }; -} +} \ No newline at end of file -- cgit v1.2.3 From cdb8539006c57050f546971250d38c837c6f8ebe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 11 May 2020 07:04:58 +0100 Subject: jx: 2.1.31 -> 2.1.31 --- .../cluster/jx/3321-fix-location-of-thrift.patch | 36 ---- .../applications/networking/cluster/jx/default.nix | 13 +- .../applications/networking/cluster/jx/gomod.patch | 186 --------------------- 3 files changed, 4 insertions(+), 231 deletions(-) delete mode 100644 pkgs/applications/networking/cluster/jx/3321-fix-location-of-thrift.patch delete mode 100644 pkgs/applications/networking/cluster/jx/gomod.patch diff --git a/pkgs/applications/networking/cluster/jx/3321-fix-location-of-thrift.patch b/pkgs/applications/networking/cluster/jx/3321-fix-location-of-thrift.patch deleted file mode 100644 index 223d6c6c247..00000000000 --- a/pkgs/applications/networking/cluster/jx/3321-fix-location-of-thrift.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 40b8eaacb3a24c466c17c8a65938330d5805b112 Mon Sep 17 00:00:00 2001 -From: "Wael M. Nasreddine" -Date: Fri, 8 Mar 2019 14:10:11 -0800 -Subject: [PATCH] chore: fix the location of thrift - -Thrift is no longer available at the git.apache.org and it's now -distributed on GitHub at github.com/apache/thrift. - -fixes #3320 ---- - go.mod | 2 ++ - go.sum | 1 + - 2 files changed, 3 insertions(+) - -diff --git a/go.mod b/go.mod -index 04bcc84cc..e26c4cf1d 100644 ---- a/go.mod -+++ b/go.mod -@@ -184,3 +184,5 @@ replace k8s.io/metrics => k8s.io/metrics v0.0.0-20181128195641-3954d62a524d - replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190122181752-bebe27e40fb7 - - replace k8s.io/client-go => k8s.io/client-go v2.0.0-alpha.0.0.20190115164855-701b91367003+incompatible -+ -+replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999 -diff --git a/go.sum b/go.sum -index c9fdf8768..6ed69e69d 100644 ---- a/go.sum -+++ b/go.sum -@@ -87,6 +87,7 @@ github.com/antham/chyle v1.4.0/go.mod h1:D94Z4aE/ECudyNoTHwkhqu77mjGPZtfPG8dNoeI - github.com/antham/envh v1.2.0/go.mod h1:ocIRPHuwwjyBVBtuUJOJc2TYzGg+d23xSAZexl4y9hQ= - github.com/antham/strumt v0.0.0-20171215230529-6776189777d3/go.mod h1:sE7EYIUE0nQzPiv5zQAmw2aVkei0j2xmb4gTIIqSFSI= - github.com/aokoli/goutils v1.0.1/go.mod h1:SijmP0QR8LtwsmDs8Yii5Z/S4trXFGFC2oO5g9DP+DQ= -+github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= - github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= - github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= - github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da h1:8GUt8eRujhVEGZFFEjBj46YV4rDjvGrNxb0KMWYkL2I= diff --git a/pkgs/applications/networking/cluster/jx/default.nix b/pkgs/applications/networking/cluster/jx/default.nix index e2c0b663bef..df39e5d8676 100644 --- a/pkgs/applications/networking/cluster/jx/default.nix +++ b/pkgs/applications/networking/cluster/jx/default.nix @@ -1,22 +1,17 @@ { buildGoModule, fetchFromGitHub, lib }: buildGoModule rec { - name = "jx"; - version = "1.3.967"; + pname = "jx"; + version = "2.1.31"; src = fetchFromGitHub { owner = "jenkins-x"; repo = "jx"; rev = "v${version}"; - sha256 = "0a25m7sz134kch21bg6l86kvwl4cg6babqf57kqidq6kid1zgdaq"; + sha256 = "1rbdmqi6m042jxd3hhqw821l567s9zzzgp0cvx8467yfi449qipn"; }; - patches = [ - # https://github.com/jenkins-x/jx/pull/3321 - ./3321-fix-location-of-thrift.patch - ]; - - modSha256 = "0ljf0c0c3pc12nmhdbrwflcaj6hs8igzjw5hi6fyhi6n9cy87vac"; + vendorSha256 = "1jn636sv6ak6hngw4fpgxqm6gfay2ip6g3gafjb3m4adcc5n9f8s"; subPackages = [ "cmd/jx" ]; diff --git a/pkgs/applications/networking/cluster/jx/gomod.patch b/pkgs/applications/networking/cluster/jx/gomod.patch deleted file mode 100644 index 0116d45955d..00000000000 --- a/pkgs/applications/networking/cluster/jx/gomod.patch +++ /dev/null @@ -1,186 +0,0 @@ -diff --git a/go.mod b/go.mod -index cd54a606e..a78b23286 100644 ---- a/go.mod -+++ b/go.mod -@@ -1,5 +1,7 @@ - module github.com/jenkins-x/jx - -+go 1.14 -+ - require ( - code.gitea.io/sdk v0.0.0-20180702024448-79a281c4e34a - github.com/Azure/draft v0.15.0 -@@ -7,7 +9,6 @@ require ( - github.com/IBM-Cloud/bluemix-go v0.0.0-20181008063305-d718d474c7c2 - github.com/Jeffail/gabs v1.1.1 - github.com/MakeNowJust/heredoc v0.0.0-20171113091838-e9091a26100e -- github.com/Masterminds/semver v1.4.2 // indirect - github.com/Netflix/go-expect v0.0.0-20180814212900-124a37274874 - github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect - github.com/Pallinder/go-randomdata v0.0.0-20180616180521-15df0648130a -@@ -20,7 +21,7 @@ require ( - github.com/andygrunwald/go-gerrit v0.0.0-20181026193842-43cfd7a94eb4 - github.com/andygrunwald/go-jira v1.5.0 - github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 // indirect -- github.com/antham/chyle v1.4.0 -+ github.com/antham/chyle v1.9.0 - github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da // indirect - github.com/armon/go-radix v1.0.0 // indirect - github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf // indirect -@@ -36,21 +37,18 @@ require ( - github.com/cloudflare/cfssl v0.0.0-20190409034051-768cd563887f - github.com/codeship/codeship-go v0.0.0-20180717142545-7793ca823354 - github.com/containerd/continuity v0.0.0-20181203112020-004b46473808 // indirect -- github.com/cpuguy83/go-md2man v1.0.8 // indirect - github.com/danwakefield/fnmatch v0.0.0-20160403171240-cbb64ac3d964 // indirect - github.com/denormal/go-gitignore v0.0.0-20180713143441-75ce8f3e513c - github.com/dsnet/compress v0.0.0-20171208185109-cc9eb1d7ad76 // indirect - github.com/duosecurity/duo_api_golang v0.0.0-20190107154727-539434bf0d45 // indirect - github.com/elazarl/go-bindata-assetfs v1.0.0 // indirect - github.com/elazarl/goproxy v0.0.0-20181111060418-2ce16c963a8a // indirect -- github.com/emicklei/go-restful v2.8.0+incompatible -- github.com/emirpasic/gods v1.9.0 // indirect -- github.com/fatih/color v1.7.0 -+ github.com/emicklei/go-restful v2.8.0+incompatible // indirect -+ github.com/fatih/color v1.9.0 - github.com/fatih/structs v1.0.0 - github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 // indirect - github.com/gfleury/go-bitbucket-v1 v0.0.0-20190216152406-3a732135aa4d - github.com/ghodss/yaml v1.0.0 -- github.com/gliderlabs/ssh v0.1.1 // indirect - github.com/go-ldap/ldap v3.0.1+incompatible // indirect - github.com/go-ole/go-ole v1.2.1 // indirect - github.com/go-openapi/jsonreference v0.17.0 -@@ -59,9 +57,9 @@ require ( - github.com/gobwas/glob v0.2.3 // indirect - github.com/gocql/gocql v0.0.0-20190126123547-8516aabb0f99 // indirect - github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b -- github.com/golang/protobuf v1.2.0 -+ github.com/golang/protobuf v1.3.1 - github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db // indirect -- github.com/google/go-cmp v0.2.0 -+ github.com/google/go-cmp v0.3.0 - github.com/google/go-containerregistry v0.0.0-20190317040536-ebbba8469d06 // indirect - github.com/google/go-github v17.0.0+incompatible - github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135 // indirect -@@ -79,15 +77,15 @@ require ( - github.com/hashicorp/go-sockaddr v1.0.0 // indirect - github.com/hashicorp/go-uuid v1.0.1 // indirect - github.com/hashicorp/go-version v0.0.0-20180716215031-270f2f71b1ee -- github.com/hashicorp/hcl v0.0.0-20180404174102-ef8a98b0bbce -+ github.com/hashicorp/hcl v1.0.0 - github.com/hashicorp/vault v0.11.4 - github.com/hashicorp/vault-plugin-secrets-kv v0.0.0-20190115203747-edbfe287c5d9 // indirect -- github.com/heptio/sonobuoy v0.12.0 -+ github.com/heptio/sonobuoy v0.18.1 - github.com/hinshun/vt10x v0.0.0-20180809195222-d55458df857c - github.com/hpcloud/tail v1.0.0 - github.com/iancoleman/orderedmap v0.0.0-20181121102841-22c6ecc9fe13 - github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6 // indirect -- github.com/imdario/mergo v0.3.6 -+ github.com/imdario/mergo v0.3.8 - github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect - github.com/jbrukh/bayesian v0.0.0-20161210175230-bf3f261f9a9c // indirect - github.com/jefferai/jsonx v1.0.0 // indirect -@@ -95,14 +93,12 @@ require ( - github.com/jenkins-x/golang-jenkins v0.0.0-20180919102630-65b83ad42314 - github.com/jetstack/cert-manager v0.5.2 - github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect -- github.com/kevinburke/ssh_config v0.0.0-20180317175531-9fc7bb800b55 // indirect - github.com/keybase/go-crypto v0.0.0-20181127160227-255a5089e85a // indirect - github.com/knative/build v0.5.0 - github.com/knative/build-pipeline v0.1.0 // indirect - github.com/knative/pkg v0.0.0-20190402181056-ff46edef0ae5 - github.com/knative/serving v0.5.0 - github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect -- github.com/kr/pty v1.1.2 // indirect - github.com/kubernetes/code-generator v0.0.0-20180904193909-8c97d6ab64da // indirect - github.com/kubernetes/kube-openapi v0.0.0-20190320154901-5e45bb682580 // indirect - github.com/lusis/go-slackbot v0.0.0-20180109053408-401027ccfef5 // indirect -@@ -114,9 +110,8 @@ require ( - github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect - github.com/mholt/archiver v3.1.1+incompatible - github.com/mitchellh/copystructure v1.0.0 // indirect -- github.com/mitchellh/go-homedir v0.0.0-20180523094522-3864e76763d9 // indirect - github.com/mitchellh/go-testing-interface v1.0.0 // indirect -- github.com/mitchellh/mapstructure v0.0.0-20180715050151-f15292f7a699 -+ github.com/mitchellh/mapstructure v1.1.2 - github.com/nlopes/slack v0.0.0-20180721202243-347a74b1ea30 - github.com/nwaples/rardecode v1.0.0 // indirect - github.com/onsi/ginkgo v1.6.0 -@@ -130,55 +125,48 @@ require ( - github.com/petergtz/pegomock v2.2.0+incompatible - github.com/pierrec/lz4 v2.0.5+incompatible // indirect - github.com/pkg/browser v0.0.0-20170505125900-c90ca0c84f15 -- github.com/pkg/errors v0.8.0 -- github.com/prometheus/common v0.2.0 // indirect -+ github.com/pkg/errors v0.8.1 - github.com/rodaine/hclencoder v0.0.0-20180926060551-0680c4321930 -- github.com/russross/blackfriday v1.5.1 -- github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735 -+ github.com/russross/blackfriday v1.5.2 -+ github.com/ryanuber/go-glob v0.0.0-20170128012129-256dc444b735 // indirect - github.com/satori/go.uuid v1.2.1-0.20180103174451-36e9d2ebbde5 - github.com/sergi/go-diff v1.0.0 // indirect - github.com/sethvargo/go-password v0.1.2 - github.com/shirou/gopsutil v0.0.0-20180901134234-eb1f1ab16f2e - github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 // indirect -- github.com/sirupsen/logrus v1.4.1 -- github.com/spf13/cobra v0.0.3 -- github.com/spf13/pflag v1.0.3 -- github.com/src-d/gcfg v1.3.0 // indirect -+ github.com/sirupsen/logrus v1.4.2 -+ github.com/spf13/cobra v0.0.7 -+ github.com/spf13/pflag v1.0.5 - github.com/stoewer/go-strcase v1.0.1 - github.com/stretchr/objx v0.2.0 // indirect -- github.com/stretchr/testify v1.3.0 -+ github.com/stretchr/testify v1.4.0 - github.com/tektoncd/pipeline v0.0.0-20190327171839-7c43fbae2816 - github.com/trivago/tgo v1.0.1 // indirect - github.com/ulikunitz/xz v0.5.6 // indirect - github.com/wbrefvem/go-bitbucket v0.0.0-20190128183802-fc08fd046abb - github.com/xanzy/go-gitlab v0.0.0-20180814191223-f3bc634ab936 -- github.com/xanzy/ssh-agent v0.2.0 // indirect - github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect - gocloud.dev v0.9.0 - golang.org/x/arch v0.0.0-20190312162104-788fe5ffcd8c // indirect -- golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9 // indirect - golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81 // indirect -- golang.org/x/net v0.0.0-20181201002055-351d144fa1fc // indirect - golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890 -- golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 -- golang.org/x/sys v0.0.0-20190411185658-b44545bcd369 -+ golang.org/x/sync v0.0.0-20190423024810-112230192c58 -+ golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e - google.golang.org/api v0.1.0 // indirect - google.golang.org/genproto v0.0.0-20190219182410-082222b4a5c5 // indirect - gopkg.in/AlecAivazis/survey.v1 v1.6.2 - gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect - gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce // indirect -- gopkg.in/src-d/go-billy.v4 v4.2.0 // indirect -- gopkg.in/src-d/go-git-fixtures.v3 v3.3.0 // indirect -- gopkg.in/src-d/go-git.v4 v4.5.0 -+ gopkg.in/src-d/go-git.v4 v4.13.1 - gopkg.in/warnings.v0 v0.1.2 // indirect -- gopkg.in/yaml.v2 v2.2.1 -+ gopkg.in/yaml.v2 v2.2.2 - gotest.tools v2.2.0+incompatible // indirect - k8s.io/api v0.0.0-20190126160303-ccdd560a045f - k8s.io/apiextensions-apiserver v0.0.0-20181128195303-1f84094d7e8e - k8s.io/apimachinery v0.0.0-20190122181752-bebe27e40fb7 - k8s.io/client-go v9.0.0+incompatible -- k8s.io/code-generator v0.0.0-20180904193909-8c97d6ab64da -- k8s.io/gengo v0.0.0-20180718083919-906d99f89cd6 -+ k8s.io/code-generator v0.0.0-20180904193909-8c97d6ab64da // indirect -+ k8s.io/gengo v0.0.0-20180718083919-906d99f89cd6 // indirect - k8s.io/helm v2.7.2+incompatible - k8s.io/klog v0.2.0 // indirect - k8s.io/kube-openapi v0.0.0-20180719232738-d8ea2fe547a4 -@@ -197,6 +185,4 @@ replace k8s.io/metrics => k8s.io/metrics v0.0.0-20181128195641-3954d62a524d - - replace k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190122181752-bebe27e40fb7 - --replace k8s.io/client-go => k8s.io/client-go v2.0.0-alpha.0.0.20190115164855-701b91367003+incompatible -- - replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999 -- cgit v1.2.3 From e6907df0618b496c844c190e0fccdb55462f1a93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 11 May 2020 08:03:30 +0100 Subject: ipfs: switch to vendored tarball --- pkgs/applications/networking/ipfs/default.nix | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/ipfs/default.nix b/pkgs/applications/networking/ipfs/default.nix index 1f8838e4c29..5aa270aa8f0 100644 --- a/pkgs/applications/networking/ipfs/default.nix +++ b/pkgs/applications/networking/ipfs/default.nix @@ -1,29 +1,30 @@ -{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: +{ stdenv, buildGoModule, fetchurl, nixosTests }: buildGoModule rec { pname = "ipfs"; version = "0.5.1"; rev = "v${version}"; - src = fetchFromGitHub { - owner = "ipfs"; - repo = "go-ipfs"; - inherit rev; - sha256 = "11l55hlbixv1i25d3n216pkrwgcgac99fa88lyy3dailvminqxw7"; + # go-ipfs makes changes to it's source tarball that don't match the git source. + src = fetchurl { + url = "https://github.com/ipfs/go-ipfs/releases/download/${rev}/go-ipfs-source.tar.gz"; + sha256 = "0lpilycjbc1g9adp4d5kryfprixj18hg3235fnivakmv7fy2akkm"; }; - postPatch = '' - rm -rf test/dependencies - patchShebangs plugin/loader/preload.sh + # tarball contains multiple files/directories + postUnpack = '' + mkdir ipfs-src + mv * ipfs-src || true + cd ipfs-src ''; - buildPhase = '' - make install - ''; + sourceRoot = "."; + + subPackages = [ "cmd/ipfs" ]; passthru.tests.ipfs = nixosTests.ipfs; - modSha256 = "13mpva3r6r2amw08g0bdggbxn933jjimngkvzgq1q5dksp4mivfk"; + vendorSha256 = null; meta = with stdenv.lib; { description = "A global, versioned, peer-to-peer filesystem"; -- cgit v1.2.3 From 81b7c9368c2381d40b0f6967f2ab633c3e4fc014 Mon Sep 17 00:00:00 2001 From: Hugo Reeves Date: Thu, 14 May 2020 18:41:49 +1200 Subject: cargo-tarpaulin: init at 0.12.4 --- .../tools/analysis/cargo-tarpaulin/default.nix | 30 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/tools/analysis/cargo-tarpaulin/default.nix diff --git a/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix new file mode 100644 index 00000000000..1d880f04dd3 --- /dev/null +++ b/pkgs/development/tools/analysis/cargo-tarpaulin/default.nix @@ -0,0 +1,30 @@ +{ lib, pkgconfig, rustPlatform, fetchFromGitHub, openssl }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-tarpaulin"; + version = "0.12.4"; + + src = fetchFromGitHub { + owner = "xd009642"; + repo = "tarpaulin"; + rev = "${version}"; + sha256 = "0y58800n61s8wmpcpgw5vpywznwwbp0d30fz2z0kjx4mpwmva4g4"; + }; + + nativeBuildInputs = [ + pkgconfig + ]; + buildInputs = [ openssl ]; + + cargoSha256 = "12hkzq2xn4g5k94kjirjnnz4dddqg7akxnp3qyfkz092vvp25k9z"; + #checkFlags = [ "--test-threads" "1" ]; + doCheck = false; + + meta = with lib; { + description = "A code coverage tool for Rust projects"; + homepage = "https://github.com/xd009642/tarpaulin"; + license = with licenses; [ mit /* or */ asl20 ]; + maintainers = with maintainers; [ hugoreeves ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d04e68dc733..2dd647e6295 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9115,6 +9115,7 @@ in cargo-release = callPackage ../tools/package-management/cargo-release { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-tarpaulin = callPackage ../development/tools/analysis/cargo-tarpaulin { }; cargo-tree = callPackage ../tools/package-management/cargo-tree { }; cargo-update = callPackage ../tools/package-management/cargo-update { }; -- cgit v1.2.3 From c167fbb3eaa36a080fdfcb1cae6adbf4b72e6721 Mon Sep 17 00:00:00 2001 From: Enno Lohmeier Date: Tue, 28 Apr 2020 16:04:41 +0200 Subject: obs-studio: use addOpenGLRunpath to enable nvenc --- pkgs/applications/video/obs-studio/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index be2a323943d..ceee3d022be 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -1,6 +1,7 @@ { config, stdenv , mkDerivation , fetchFromGitHub +, addOpenGLRunpath , cmake , fdk_aac , ffmpeg @@ -46,7 +47,7 @@ in mkDerivation rec { sha256 = "11hl3lxvbsm7ackl7qhzgy2x0jsz2dfpi2qxsf8pkp908lrh3b3r"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ addOpenGLRunpath cmake pkgconfig ]; buildInputs = [ curl fdk_aac @@ -80,6 +81,10 @@ in mkDerivation rec { --prefix "LD_LIBRARY_PATH" : "${xorg.libX11.out}/lib:${vlc}/lib" ''; + postFixup = stdenv.lib.optionalString stdenv.isLinux '' + addOpenGLRunpath $out/lib/lib*.so + ''; + meta = with stdenv.lib; { description = "Free and open source software for video recording and live streaming"; longDescription = '' -- cgit v1.2.3 From 006e6b052f04b36d79651397725bb3359ac61198 Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Thu, 30 Apr 2020 09:09:40 +0200 Subject: cri-o: switch to buildGoModule This is just a cleanup to switch from buildGoPackage to buildGoModule. Signed-off-by: Sascha Grunert --- pkgs/applications/virtualization/cri-o/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 0851f1f716b..14cac153399 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -1,6 +1,6 @@ { stdenv , btrfs-progs -, buildGoPackage +, buildGoModule , fetchFromGitHub , glibc , gpgme @@ -14,21 +14,18 @@ , pkg-config }: -buildGoPackage rec { +buildGoModule rec { pname = "cri-o"; version = "1.18.0"; - goPackagePath = "github.com/cri-o/cri-o"; - src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; sha256 = "142flmv54pj48rjqkd26fbxrcbx2cv6pdmrc33jgyvn6r99zliah"; }; - + vendorSha256 = null; outputs = [ "out" "man" ]; - nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ @@ -44,8 +41,6 @@ buildGoPackage rec { BUILDTAGS = "apparmor seccomp selinux containers_image_ostree_stub"; buildPhase = '' - pushd go/src/${goPackagePath} - sed -i '/version.buildDate/d' Makefile make binaries docs BUILDTAGS="$BUILDTAGS" -- cgit v1.2.3 From aade6fc7b002e74629b977f7f44572f6622dc279 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 14 May 2020 17:36:00 +1000 Subject: cni-plugins: switch to buildGoModule --- pkgs/applications/networking/cluster/cni/plugins.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index 34eb6a8ee28..6aaf67bd1d1 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -1,6 +1,6 @@ -{ lib, fetchFromGitHub, buildGoPackage }: +{ lib, fetchFromGitHub, buildGoModule }: -buildGoPackage rec { +buildGoModule rec { pname = "cni-plugins"; version = "0.8.6"; @@ -11,10 +11,10 @@ buildGoPackage rec { sha256 = "0f1cqxjf26sy1c4aw6y7pyd9lrz0vknby4q5j6xj77a1pab9073m"; }; - goPackagePath = "github.com/containernetworking/plugins"; + vendorSha256 = null; buildFlagsArray = [ - "-ldflags=-X ${goPackagePath}/pkg/utils/buildversion.BuildVersion=${version}" + "-ldflags=-X github.com/containernetworking/plugins/pkg/utils/buildversion.BuildVersion=${version}" ]; subPackages = [ -- cgit v1.2.3 From 1ad3b685f4c82a4d830b57e493d2247898b5f685 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 14 May 2020 17:36:01 +1000 Subject: podman: switch to buildGoModule --- pkgs/applications/virtualization/podman/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index d5c52a8dfe8..995d571a192 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -2,7 +2,7 @@ , fetchFromGitHub , pkg-config , installShellFiles -, buildGoPackage +, buildGoModule , gpgme , lvm2 , btrfs-progs @@ -12,7 +12,7 @@ , nixosTests }: -buildGoPackage rec { +buildGoModule rec { pname = "podman"; version = "1.9.2"; @@ -23,7 +23,7 @@ buildGoPackage rec { sha256 = "0jvqzn1q52z6aka98d2i3dyn2i8xld7xvmi2zfxgm9g53wdgi2g2"; }; - goPackagePath = "github.com/containers/libpod"; + vendorSha256 = null; outputs = [ "out" "man" ]; @@ -32,7 +32,6 @@ buildGoPackage rec { buildInputs = stdenv.lib.optionals stdenv.isLinux [ btrfs-progs libseccomp gpgme lvm2 systemd ]; buildPhase = '' - pushd go/src/${goPackagePath} patchShebangs . ${if stdenv.isDarwin then "make CGO_ENABLED=0 BUILDTAGS='remoteclient containers_image_openpgp exclude_graphdriver_devicemapper' varlink_generate all" -- cgit v1.2.3 From fbdc10572dd5054b4ce9f5315ccd623a83807acc Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 14 May 2020 17:36:02 +1000 Subject: buildah: switch to buildGoModule --- pkgs/development/tools/buildah/default.nix | 9 ++---- .../tools/buildah/disable-go-module-mode.patch | 32 ---------------------- 2 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 pkgs/development/tools/buildah/disable-go-module-mode.patch diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 3aab8f24da1..0171dfc0543 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -1,5 +1,5 @@ { stdenv -, buildGoPackage +, buildGoModule , fetchFromGitHub , installShellFiles , pkg-config @@ -11,7 +11,7 @@ , libseccomp }: -buildGoPackage rec { +buildGoModule rec { pname = "buildah"; version = "1.14.9"; @@ -24,15 +24,12 @@ buildGoPackage rec { outputs = [ "out" "man" ]; - goPackagePath = "github.com/containers/buildah"; + vendorSha256 = null; nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs libselinux libseccomp ]; - patches = [ ./disable-go-module-mode.patch ]; - buildPhase = '' - pushd go/src/${goPackagePath} make GIT_COMMIT="unknown" make -C docs ''; diff --git a/pkgs/development/tools/buildah/disable-go-module-mode.patch b/pkgs/development/tools/buildah/disable-go-module-mode.patch deleted file mode 100644 index 86ca9132529..00000000000 --- a/pkgs/development/tools/buildah/disable-go-module-mode.patch +++ /dev/null @@ -1,32 +0,0 @@ -From e2d12e52b3638a320a8d69ea4b392b60f44ea57f Mon Sep 17 00:00:00 2001 -From: Mario Rodas -Date: Wed, 4 Dec 2019 21:07:33 -0500 -Subject: [PATCH] Do not check Go module-mode availability - -Since buildah vendorizes its dependencies we use buildGoPackage which -does not uses Go module-mode. The module-mode check will be true -because nixpkgs uses Go 1.13 by default, and building go modules with -buildGoPackage may lead to inconsistencies. ---- - Makefile | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/Makefile b/Makefile -index 07724ce4..6383646e 100644 ---- a/Makefile -+++ b/Makefile -@@ -15,14 +15,8 @@ BUILDAH := buildah - GO := go - GO110 := 1.10 - GOVERSION := $(findstring $(GO110),$(shell go version)) --# test for go module support --ifeq ($(shell go help mod >/dev/null 2>&1 && echo true), true) --export GO_BUILD=GO111MODULE=on $(GO) build -mod=vendor --export GO_TEST=GO111MODULE=on $(GO) test -mod=vendor --else - export GO_BUILD=$(GO) build - export GO_TEST=$(GO) test --endif - - GIT_COMMIT ?= $(if $(shell git rev-parse --short HEAD),$(shell git rev-parse --short HEAD),$(error "git failed")) - SOURCE_DATE_EPOCH ?= $(if $(shell date +%s),$(shell date +%s),$(error "date failed")) -- cgit v1.2.3 From e56116f752f355ca9dead8983f053783f2516bba Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 14 May 2020 17:36:03 +1000 Subject: skopeo: switch to buildGoModule --- pkgs/development/tools/skopeo/default.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 1d4afc0a4ec..e9fc9a969a7 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -1,5 +1,5 @@ { stdenv -, buildGoPackage +, buildGoModule , fetchFromGitHub , runCommand , gpgme @@ -26,18 +26,18 @@ let defaultPolicyFile = runCommand "skopeo-default-policy.json" {} "cp ${src}/default-policy.json $out"; - goPackagePath = "github.com/containers/skopeo"; - - vendorPath = "${goPackagePath}/vendor/github.com/containers/image/v5"; + vendorPath = "github.com/containers/skopeo/vendor/github.com/containers/image/v5"; in -buildGoPackage { +buildGoModule { pname = "skopeo"; inherit version; - inherit src goPackagePath; + inherit src; outputs = [ "out" "man" ]; + vendorSha256 = null; + excludedPackages = [ "integration" ]; nativeBuildInputs = [ pkg-config go-md2man installShellFiles makeWrapper ]; @@ -51,11 +51,8 @@ buildGoPackage { ''; postBuild = '' - # depends on buildGoPackage not changing … - pushd ./go/src/${goPackagePath} make install-docs MANINSTALLDIR="$man/share/man" installShellCompletion --bash completions/bash/skopeo - popd ''; postInstall = stdenv.lib.optionals stdenv.isLinux '' -- cgit v1.2.3 From 64ce60e2b36623286f0bf8bb43aec37e527228f4 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 14 May 2020 17:36:04 +1000 Subject: cri-tools: switch to buildGoModule --- pkgs/tools/virtualization/cri-tools/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/tools/virtualization/cri-tools/default.nix index 7254b3d63d9..ef622f055ee 100644 --- a/pkgs/tools/virtualization/cri-tools/default.nix +++ b/pkgs/tools/virtualization/cri-tools/default.nix @@ -1,10 +1,10 @@ { lib -, buildGoPackage +, buildGoModule , fetchFromGitHub , installShellFiles }: -buildGoPackage rec { +buildGoModule rec { pname = "cri-tools"; version = "1.18.0"; @@ -15,12 +15,11 @@ buildGoPackage rec { sha256 = "06sxjhjpd893fn945c1s4adri2bf7s50ddvcw5pnwb6qndzfljw6"; }; - goPackagePath = "github.com/kubernetes-sigs/cri-tools"; + vendorSha256 = null; nativeBuildInputs = [ installShellFiles ]; buildPhase = '' - pushd go/src/${goPackagePath} make binaries VERSION=${version} ''; -- cgit v1.2.3 From e02ec912c599d9edd8fdf8f49236ffd06825c84f Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Thu, 14 May 2020 07:49:17 +0000 Subject: topgrade: 4.4.0 -> 4.5.0 --- pkgs/tools/misc/topgrade/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 20979a467c0..529252901a4 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "1n9zcz6arbp3gmn360gv0gs703ii59pfgw5gvvwvbm492g2csj3h"; + sha256 = "0df79vlbclv1qx4zwir728c6ggqfawxh2x1py16m5q0ga1hd799j"; }; - cargoSha256 = "08xswkwy6npmx9z8d27l83flq0haj0rnmwkcsz68mlrndz8yymlh"; + cargoSha256 = "0wwxh71i94h68sryckbvrr43gd19qjcs0cgcpycnimkhdcdy8nlj"; buildInputs = lib.optional stdenv.isDarwin Foundation; -- cgit v1.2.3 From 46213cf4d652bf5a5cda7ff996bf6ead3ae5ed79 Mon Sep 17 00:00:00 2001 From: Meghea Iulian Date: Thu, 14 May 2020 11:09:17 +0300 Subject: nomachine-client: 6.9.2 -> 6.10.12 --- pkgs/tools/admin/nomachine-client/default.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/admin/nomachine-client/default.nix b/pkgs/tools/admin/nomachine-client/default.nix index b999c65f6f6..a0369ecfea6 100644 --- a/pkgs/tools/admin/nomachine-client/default.nix +++ b/pkgs/tools/admin/nomachine-client/default.nix @@ -1,29 +1,29 @@ { stdenv, file, fetchurl, makeWrapper, autoPatchelfHook, jsoncpp, libpulseaudio }: let - versionMajor = "6.9"; - versionMinor = "2"; + versionMajor = "6.10"; + versionMinor = "12"; versionBuild_x86_64 = "1"; versionBuild_i686 = "1"; in stdenv.mkDerivation rec { pname = "nomachine-client"; version = "${versionMajor}.${versionMinor}"; - + src = 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 = "1z2pcfkzicjma4lxrj4qx43xyml993v7qyjd7k8xy8hw85fwnzii"; + sha256 = "17yb377ry7i7cmkb72xmhyqkfggv1ygqlz55ymvmrs7psbh7ql01"; } 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 = "03421s0k91c02ga9k6bdvixw71brlgi13q82cinnfayg3fhb0rb6"; + sha256 = "0k6dspmwdkm0zf0c2zqlqy0jya8qgsg90wwv9wa12fn4chp66gqg"; } else throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}"; - + postUnpack = '' mv $(find . -type f -name nxclient.tar.gz) . mv $(find . -type f -name nxplayer.tar.gz) . @@ -32,7 +32,7 @@ in tar xf nxplayer.tar.gz rm $(find . -maxdepth 1 -type f) ''; - + nativeBuildInputs = [ file makeWrapper autoPatchelfHook ]; buildInputs = [ jsoncpp libpulseaudio ]; @@ -50,7 +50,7 @@ in cp "$i"/* "$out/share/icons/hicolor/$(basename $i)/apps/" fi done - + mkdir $out/share/applications cp share/applnk/player/xdg/*.desktop $out/share/applications/ cp share/applnk/client/xdg-mime/*.desktop $out/share/applications/ @@ -62,7 +62,7 @@ in substituteInPlace "$i" --replace /usr/NX/bin $out/bin done ''; - + postFixup = '' makeWrapper $out/bin/nxplayer.bin $out/bin/nxplayer --set NX_SYSTEM $out/NX makeWrapper $out/bin/nxclient.bin $out/bin/nxclient --set NX_SYSTEM $out/NX @@ -71,7 +71,7 @@ in # have a DT_NEEDED entry for it. patchelf --add-needed libpulse.so.0 $out/NX/lib/libnxcau.so ''; - + dontBuild = true; dontStrip = true; @@ -87,4 +87,4 @@ in platforms = [ "x86_64-linux" "i686-linux" ]; }; } - + -- cgit v1.2.3 From 91f58ec9ccdc07165e35902748cb60b40492e3ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Thu, 14 May 2020 10:13:25 +0200 Subject: vscodium: Fix .desktop file --- pkgs/applications/editors/vscode/vscodium.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index 63e6cc920bf..8cb21ec4aca 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -32,7 +32,7 @@ in executableName = "codium"; longName = "VSCodium"; - shortName = "Codium"; + shortName = "vscodium"; src = fetchurl { url = "https://github.com/VSCodium/vscodium/releases/download/${version}/VSCodium-${plat}-${version}.${archive_fmt}"; -- cgit v1.2.3 From b381e9a5046491c1917140fb793148fbebb5f882 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 14 May 2020 10:15:11 +0200 Subject: =?UTF-8?q?apostrophe:=202.2.0.2=20=E2=86=92=202.2.0.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/editors/apostrophe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/apostrophe/default.nix b/pkgs/applications/editors/apostrophe/default.nix index 391a8734563..b3902293718 100644 --- a/pkgs/applications/editors/apostrophe/default.nix +++ b/pkgs/applications/editors/apostrophe/default.nix @@ -11,14 +11,14 @@ let in stdenv.mkDerivation rec { pname = "apostrophe"; - version = "2.2.0.2"; + version = "2.2.0.3"; src = fetchFromGitLab { owner = "somas"; repo = pname; domain = "gitlab.gnome.org"; rev = "v${version}"; - sha256 = "13wvfkg0jw9mayd9ifzkqnhf8fmfjgr1lsj4niqbyrw130y9r9f6"; + sha256 = "06bl1hc69ixk2vcb2ig74mwid14sl5zq6rfna7lx9na6j3l04879"; }; nativeBuildInputs = [ meson ninja cmake pkgconfig desktop-file-utils -- cgit v1.2.3 From 9d55751754345d4fcf52e417b4304722e89ea27b Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 13 May 2020 22:04:09 +0200 Subject: =?UTF-8?q?ocamlPackages.jingoo:=201.2.18=20=E2=86=92=201.3.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/jingoo/default.nix | 24 +++++++++++------------ pkgs/top-level/ocaml-packages.nix | 4 +--- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/pkgs/development/ocaml-modules/jingoo/default.nix b/pkgs/development/ocaml-modules/jingoo/default.nix index bf1e59c2f22..7e693c4bf02 100644 --- a/pkgs/development/ocaml-modules/jingoo/default.nix +++ b/pkgs/development/ocaml-modules/jingoo/default.nix @@ -1,26 +1,26 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib, pcre, uutf }: +{ lib, buildDunePackage, fetchFromGitHub +, menhir, ppx_deriving, re, uutf, uucp, ounit2 }: -if !stdenv.lib.versionAtLeast ocaml.version "4.02" -then throw "jingoo is not available for OCaml ${ocaml.version}" -else +buildDunePackage rec { + pname = "jingoo"; + version = "1.3.4"; -stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-jingoo-${version}"; - version = "1.2.18"; + minimumOCamlVersion = "4.04"; src = fetchFromGitHub { owner = "tategakibunko"; repo = "jingoo"; rev = "v${version}"; - sha256 = "0gciiysrjy5r4yiisc41k4h0p530yawzqnr364xg8fdkk444fgkn"; + sha256 = "0fsmm6wxa3axwbcgwdidik3drg754wyh2vxri2w12d662221m98s"; }; - buildInputs = [ ocaml findlib ]; - propagatedBuildInputs = [ pcre uutf ]; + buildInputs = [ menhir ]; + propagatedBuildInputs = [ ppx_deriving re uutf uucp ]; + checkInputs = [ ounit2 ]; + doCheck = true; - createFindlibDestdir = true; - meta = with stdenv.lib; { + meta = with lib; { homepage = "https://github.com/tategakibunko/jingoo"; description = "OCaml template engine almost compatible with jinja2"; license = licenses.mit; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 071d1612b6c..eb607e305a5 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -393,9 +393,7 @@ let irmin-watcher = callPackage ../development/ocaml-modules/irmin-watcher { }; - jingoo = callPackage ../development/ocaml-modules/jingoo { - pcre = ocaml_pcre; - }; + jingoo = callPackage ../development/ocaml-modules/jingoo { }; js_of_ocaml = if lib.versionOlder "4.02" ocaml.version -- cgit v1.2.3 From 794a08ca8ed50bc1189f5996c51891a3a50af98a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 14 May 2020 08:37:26 +0200 Subject: sublime3{,-dev}: fix updateScript The HTML page changed and the update script was no longer finding the latest version. I changed it to query for the latest version using dedicated URL: https://forum.sublimetext.com/t/fixed-download-url-for-latest-version/23763/7 Also terminated the update sooner if we detect no update available. update-source-version handles that normally but we are cleaning the version so that we can update both platforms at the same time. --- pkgs/applications/editors/sublime/3/common.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/sublime/3/common.nix b/pkgs/applications/editors/sublime/3/common.nix index a75233fcf35..22c23280d17 100644 --- a/pkgs/applications/editors/sublime/3/common.nix +++ b/pkgs/applications/editors/sublime/3/common.nix @@ -13,7 +13,7 @@ let primaryBinary = "sublime_text"; primaryBinaryAliases = [ "subl" "sublime" "sublime3" ]; downloadUrl = "https://download.sublimetext.com/sublime_text_3_build_${buildVersion}_${arch}.tar.bz2"; - versionUrl = "https://www.sublimetext.com/${if dev then "3dev" else "3"}"; + versionUrl = "https://download.sublimetext.com/latest/${if dev then "dev" else "stable"}"; versionFile = builtins.toString ./packages.nix; archSha256 = if stdenv.hostPlatform.system == "i686-linux" then @@ -133,7 +133,12 @@ in stdenv.mkDerivation (rec { set -o errexit PATH=${stdenv.lib.makeBinPath [ common-updater-scripts curl gnugrep ]} - latestVersion=$(curl -s ${versionUrl} | grep -Po '(?<=

Version: Build )([0-9]+)') + latestVersion=$(curl -s ${versionUrl}) + + if [[ "${buildVersion}" = "$latestVersion" ]]; then + echo "The new version same as the old version." + exit 0 + fi for platform in ${stdenv.lib.concatStringsSep " " meta.platforms}; do # The script will not perform an update when the version attribute is up to date from previous platform run -- cgit v1.2.3 From 0df3c2dfe257428e5e9edb6c37d644d0520800c0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 14 May 2020 09:02:22 +0200 Subject: gnome-keysign: remove broken updateScript It is not hosted on GNOME mirrors so GNOME updateScript will not work. --- pkgs/tools/security/gnome-keysign/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/tools/security/gnome-keysign/default.nix b/pkgs/tools/security/gnome-keysign/default.nix index d430a689524..4b9a6fb0e32 100644 --- a/pkgs/tools/security/gnome-keysign/default.nix +++ b/pkgs/tools/security/gnome-keysign/default.nix @@ -6,7 +6,6 @@ , gobject-introspection , gtk3 , glib -, gnome3 , gst_all_1 }: @@ -68,12 +67,6 @@ python3.pkgs.buildPythonApplication rec { twisted ]; - passthru = { - updateScript = gnome3.updateScript { - packageName = pname; - }; - }; - # https://github.com/NixOS/nixpkgs/issues/56943 strictDeps = false; -- cgit v1.2.3 From f22083106882352d9edc2428c45f749403ddaf6a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 14 May 2020 11:35:36 +0200 Subject: tracker: format with nixpkgs-fmt --- pkgs/development/libraries/tracker/default.nix | 78 ++++++++++++++++++++------ 1 file changed, 62 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index 50eb56ce2d1..c7f71ead9c0 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -1,8 +1,34 @@ -{ stdenv, fetchurl, gettext, 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, systemd, dbus -, substituteAll }: +{ stdenv +, fetchurl +, gettext +, 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 +, systemd +, dbus +, substituteAll +}: stdenv.mkDerivation rec { pname = "tracker"; @@ -15,16 +41,43 @@ stdenv.mkDerivation rec { sha256 = "V3lSJEq5d8eLC4ji9jxBl+q6FuTWa/9pK39YmT4GUW0="; }; + patches = [ + (substituteAll { + src = ./fix-paths.patch; + gdbus = "${glib.bin}/bin/gdbus"; + }) + ]; + nativeBuildInputs = [ - meson ninja vala pkgconfig gettext libxslt wrapGAppsHook gobject-introspection - gtk-doc docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_43 glibcLocales + meson + ninja + vala + pkgconfig + gettext + libxslt + wrapGAppsHook + gobject-introspection + gtk-doc + docbook_xsl + docbook_xml_dtd_412 + docbook_xml_dtd_43 + glibcLocales python3 # for data-generators systemd # used for checks to install systemd user service dbus # used for checks and pkgconfig to install dbus service/s ]; buildInputs = [ - glib libxml2 sqlite upower icu networkmanager libsoup libuuid json-glib libstemmer + glib + libxml2 + sqlite + upower + icu + networkmanager + libsoup + libuuid + json-glib + libstemmer ]; mesonFlags = [ @@ -33,13 +86,6 @@ stdenv.mkDerivation rec { "-Ddocs=true" ]; - patches = [ - (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 @@ -60,7 +106,7 @@ stdenv.mkDerivation rec { homepage = "https://wiki.gnome.org/Projects/Tracker"; description = "Desktop-neutral user information store, search tool and indexer"; maintainers = teams.gnome.members; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; }; } -- cgit v1.2.3 From 39b92f6e45534658b49e79c78154df6333af8472 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 14 May 2020 12:06:48 +0200 Subject: tracker: enable tests Also remove glibcLocales which are no longer needed for tests and add DocBook 4.5 schemas which are needed for something. --- pkgs/development/libraries/tracker/default.nix | 33 +++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index c7f71ead9c0..b3681b7a8b6 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -10,7 +10,7 @@ , docbook_xsl , docbook_xml_dtd_412 , docbook_xml_dtd_43 -, glibcLocales +, docbook_xml_dtd_45 , libxml2 , upower , glib @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { docbook_xsl docbook_xml_dtd_412 docbook_xml_dtd_43 - glibcLocales + docbook_xml_dtd_45 python3 # for data-generators systemd # used for checks to install systemd user service dbus # used for checks and pkgconfig to install dbus service/s @@ -80,15 +80,42 @@ stdenv.mkDerivation rec { libstemmer ]; + checkInputs = [ + python3.pkgs.pygobject3 + ]; + mesonFlags = [ # TODO: figure out wrapping unit tests, some of them fail on missing gsettings-desktop-schemas - "-Dfunctional_tests=false" + # "-Dfunctional_tests=true" "-Ddocs=true" ]; + doCheck = true; + postPatch = '' patchShebangs utils/g-ir-merge/g-ir-merge patchShebangs utils/data-generators/cc/generate + patchShebangs tests/functional-tests/test-runner.sh.in + patchShebangs tests/functional-tests/*.py + ''; + + preCheck = '' + # (tracker-store:6194): Tracker-CRITICAL **: 09:34:07.722: Cannot initialize database: Could not open sqlite3 database:'/homeless-shelter/.cache/tracker/meta.db': unable to open database file + export HOME=$(mktemp -d) + + # Our gobject-introspection patches make the shared library paths absolute + # in the GIR files. When running functional tests, the library is not yet installed, + # though, so we need to replace the absolute path with a local one during build. + # We are using a symlink that will be overridden during installation. + mkdir -p $out/lib + ln -s $PWD/src/libtracker-sparql-backend/libtracker-sparql-2.0.so $out/lib/libtracker-sparql-2.0.so.0 + ln -s $PWD/src/libtracker-miner/libtracker-miner-2.0.so $out/lib/libtracker-miner-2.0.so.0 + ln -s $PWD/src/libtracker-data/libtracker-data.so $out/lib/libtracker-data.so + ''; + + postCheck = '' + # Clean up out symlinks + rm -r $out/lib ''; postInstall = '' -- cgit v1.2.3 From 7a642881c971d581cd165c05476dc39d312c772c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 13 May 2020 20:20:20 -0500 Subject: gopass: 1.9.1 -> 1.9.2 Changelog: https://github.com/gopasspw/gopass/releases/tag/v1.9.2 --- pkgs/tools/security/gopass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 7eec1b5e4bc..6b9042e5691 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -9,7 +9,7 @@ buildGoModule rec { pname = "gopass"; - version = "1.9.1"; + version = "1.9.2"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -17,7 +17,7 @@ buildGoModule rec { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "19xhyyd76r17rwn6s8xgfjnyi7kywagy0i4anqws40w79j3qb1p0"; + sha256 = "066dphw8xq0g72kj64sdai2yyllnr6ca27bfy5sxhk8x69j97rvz"; }; vendorSha256 = "1wn20bh7ma4pblsf6qnlbz5bx4p9apig3d1yz7cpsqv4z3w07baw"; -- cgit v1.2.3 From b70435e43c540527e7650b652a5ec2690b2fc89b Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Thu, 14 May 2020 12:50:34 +0200 Subject: firefox: 76.0 -> 76.0.1 --- pkgs/applications/networking/browsers/firefox/packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index d33535da376..092f4342e15 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "76.0"; + ffversion = "76.0.1"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "3dq9h84w1qqidabbrl34jgyjr8bbmbf5wddjazpr7znfm49fn2xyg8fmm5lx9dakghk3wp8yhfi36gmk08fzlrm47v6h17dm9hkh0hz"; + sha512 = "0gnhfcgrz6022xf3vqia3s3639xa5pjp13h343d3c09mn8r919cmm6s38vzj1v3734fm25zb68acyarsp72xqq8z1420rh02b2pv38q"; }; patches = [ -- cgit v1.2.3 From 3116788c9bab3ad999fdecd310bf9f020cf7686e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Thu, 14 May 2020 14:16:48 +0200 Subject: tracker: remove unnecessary dependency upower handling was moved to tracker miners a while ago. --- pkgs/development/libraries/tracker/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/libraries/tracker/default.nix b/pkgs/development/libraries/tracker/default.nix index b3681b7a8b6..2224addf02a 100644 --- a/pkgs/development/libraries/tracker/default.nix +++ b/pkgs/development/libraries/tracker/default.nix @@ -12,7 +12,6 @@ , docbook_xml_dtd_43 , docbook_xml_dtd_45 , libxml2 -, upower , glib , wrapGAppsHook , vala @@ -71,7 +70,6 @@ stdenv.mkDerivation rec { glib libxml2 sqlite - upower icu networkmanager libsoup -- cgit v1.2.3 From 0ffc85d64b081f0210787435122ef7f42b81d791 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 14 May 2020 14:34:50 +0200 Subject: Remove unused files --- nixos/lib/testing-python.nix | 6 +----- nixos/lib/testing.nix | 6 +----- nixos/lib/testing/jquery-ui.nix | 24 ------------------------ nixos/lib/testing/jquery.nix | 36 ------------------------------------ 4 files changed, 2 insertions(+), 70 deletions(-) delete mode 100644 nixos/lib/testing/jquery-ui.nix delete mode 100644 nixos/lib/testing/jquery.nix diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index 88801f20517..123323711a7 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -10,11 +10,7 @@ with import ./build-vms.nix { inherit system pkgs minimal extraConfigurations; }; with pkgs; -let - jquery-ui = callPackage ./testing/jquery-ui.nix { }; - jquery = callPackage ./testing/jquery.nix { }; - -in rec { +rec { inherit pkgs; diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index cbb7faf039e..5c784c2f0ab 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -10,11 +10,7 @@ with import ./build-vms.nix { inherit system pkgs minimal extraConfigurations; }; with pkgs; -let - jquery-ui = callPackage ./testing/jquery-ui.nix { }; - jquery = callPackage ./testing/jquery.nix { }; - -in rec { +rec { inherit pkgs; diff --git a/nixos/lib/testing/jquery-ui.nix b/nixos/lib/testing/jquery-ui.nix deleted file mode 100644 index 05bd8dc2f94..00000000000 --- a/nixos/lib/testing/jquery-ui.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, unzip }: - -stdenv.mkDerivation rec { - name = "jquery-ui-1.11.4"; - - src = fetchurl { - url = "https://jqueryui.com/resources/download/${name}.zip"; - sha256 = "0ciyaj1acg08g8hpzqx6whayq206fvf4whksz2pjgxlv207lqgjh"; - }; - - buildInputs = [ unzip ]; - - installPhase = - '' - mkdir -p "$out/js" - cp -rv . "$out/js" - ''; - - meta = { - homepage = "https://jqueryui.com/"; - description = "A library of JavaScript widgets and effects"; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/nixos/lib/testing/jquery.nix b/nixos/lib/testing/jquery.nix deleted file mode 100644 index 732fdb3ba87..00000000000 --- a/nixos/lib/testing/jquery.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ stdenv, fetchurl, compressed ? true }: - -with stdenv.lib; - -stdenv.mkDerivation rec { - name = "jquery-1.11.3"; - - src = if compressed then - fetchurl { - url = "http://code.jquery.com/${name}.min.js"; - sha256 = "1f4glgxxn3jnvry3dpzmazj3207baacnap5w20gr2xlk789idfgc"; - } - else - fetchurl { - url = "http://code.jquery.com/${name}.js"; - sha256 = "1v956yf5spw0156rni5z77hzqwmby7ajwdcd6mkhb6zvl36awr90"; - }; - - dontUnpack = true; - - installPhase = - '' - mkdir -p "$out/js" - cp -v "$src" "$out/js/jquery.js" - ${optionalString compressed '' - (cd "$out/js" && ln -s jquery.js jquery.min.js) - ''} - ''; - - meta = with stdenv.lib; { - description = "JavaScript library designed to simplify the client-side scripting of HTML"; - homepage = "http://jquery.com/"; - license = licenses.mit; - platforms = platforms.all; - }; -} -- cgit v1.2.3 From 399f5ea75edae655527781a62f6907974cd07625 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 13 May 2020 22:11:32 +1000 Subject: cri-o: remove propagated inputs, update buildtags --- pkgs/applications/virtualization/cri-o/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 14cac153399..3796b8857b7 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -6,8 +6,6 @@ , gpgme , installShellFiles , libapparmor -, libassuan -, libgpgerror , libseccomp , libselinux , lvm2 @@ -32,15 +30,15 @@ buildGoModule rec { btrfs-progs gpgme libapparmor - libassuan - libgpgerror libseccomp libselinux lvm2 ] ++ stdenv.lib.optionals (glibc != null) [ glibc glibc.static ]; - BUILDTAGS = "apparmor seccomp selinux containers_image_ostree_stub"; + BUILDTAGS = "apparmor seccomp selinux containers_image_openpgp containers_image_ostree_stub"; buildPhase = '' + patchShebangs . + sed -i '/version.buildDate/d' Makefile make binaries docs BUILDTAGS="$BUILDTAGS" -- cgit v1.2.3 From e142fbb3f7545863268b82440cb16bf1266add86 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 13 May 2020 21:37:47 +1000 Subject: podman: add libapparmor, libselinux --- pkgs/applications/virtualization/podman/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index 995d571a192..e88e0a60c5e 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -6,7 +6,9 @@ , gpgme , lvm2 , btrfs-progs +, libapparmor , libseccomp +, libselinux , systemd , go-md2man , nixosTests @@ -29,7 +31,15 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config go-md2man installShellFiles ]; - buildInputs = stdenv.lib.optionals stdenv.isLinux [ btrfs-progs libseccomp gpgme lvm2 systemd ]; + buildInputs = stdenv.lib.optionals stdenv.isLinux [ + btrfs-progs + gpgme + libapparmor + libseccomp + libselinux + lvm2 + systemd + ]; buildPhase = '' patchShebangs . -- cgit v1.2.3 From b57ae988643eed4d05e5b2671e42abb054edee0a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 13 May 2020 21:37:48 +1000 Subject: runc: add libselinux, update buildtags --- pkgs/applications/virtualization/runc/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index 95db2a1d9e9..1bf6b3d574a 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -8,6 +8,7 @@ , libapparmor , apparmor-parser , libseccomp +, libselinux }: buildGoPackage rec { @@ -25,9 +26,11 @@ buildGoPackage rec { outputs = [ "out" "man" ]; nativeBuildInputs = [ go-md2man installShellFiles pkg-config which ]; - buildInputs = [ libseccomp libapparmor apparmor-parser ]; - makeFlags = [ "BUILDTAGS+=seccomp" "BUILDTAGS+=apparmor" ]; + buildInputs = [ libselinux libseccomp libapparmor apparmor-parser ]; + + # these will be the default in the next release + makeFlags = [ "BUILDTAGS+=seccomp" "BUILDTAGS+=apparmor" "BUILDTAGS+=selinux" ]; buildPhase = '' cd go/src/${goPackagePath} -- cgit v1.2.3 From 65be068b0b4ea88f9636a28a472fd2f28dfcc967 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 13 May 2020 21:37:48 +1000 Subject: buildah: remove propagated input, add libapparmor --- pkgs/development/tools/buildah/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 0171dfc0543..d033fe52e6c 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -4,9 +4,9 @@ , installShellFiles , pkg-config , gpgme -, libgpgerror , lvm2 , btrfs-progs +, libapparmor , libselinux , libseccomp }: @@ -27,9 +27,18 @@ buildGoModule rec { vendorSha256 = null; nativeBuildInputs = [ installShellFiles pkg-config ]; - buildInputs = [ gpgme libgpgerror lvm2 btrfs-progs libselinux libseccomp ]; + + buildInputs = [ + btrfs-progs + gpgme + libapparmor + libseccomp + libselinux + lvm2 + ]; buildPhase = '' + patchShebangs . make GIT_COMMIT="unknown" make -C docs ''; -- cgit v1.2.3 From f28b0d64ad4567bd0968f025cc7dd13fa6b32230 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 13 May 2020 22:11:34 +1000 Subject: skopeo: remove outdated/propagated inputs --- pkgs/development/tools/skopeo/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index e9fc9a969a7..5532c3088e0 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -3,11 +3,9 @@ , fetchFromGitHub , runCommand , gpgme -, libgpgerror , lvm2 , btrfs-progs , pkg-config -, libselinux , go-md2man , installShellFiles , makeWrapper @@ -41,8 +39,9 @@ buildGoModule { excludedPackages = [ "integration" ]; nativeBuildInputs = [ pkg-config go-md2man installShellFiles makeWrapper ]; + buildInputs = [ gpgme ] - ++ stdenv.lib.optionals stdenv.isLinux [ libgpgerror lvm2 btrfs-progs libselinux ]; + ++ stdenv.lib.optionals stdenv.isLinux [ lvm2 btrfs-progs ]; buildFlagsArray = '' -ldflags= -- cgit v1.2.3 From 496bd1c706edcf3f1e757b059a015ab2be71460c Mon Sep 17 00:00:00 2001 From: Nikolaj Hey Hinnerskov Date: Thu, 14 May 2020 15:14:02 +0200 Subject: nixosTests.kubernetes: port tests to python --- nixos/tests/kubernetes/base.nix | 8 ++-- nixos/tests/kubernetes/dns.nix | 74 +++++++++++++++++++++++------------ nixos/tests/kubernetes/rbac.nix | 86 ++++++++++++++++++++++++++--------------- 3 files changed, 107 insertions(+), 61 deletions(-) diff --git a/nixos/tests/kubernetes/base.nix b/nixos/tests/kubernetes/base.nix index adb73650689..86de9455e73 100644 --- a/nixos/tests/kubernetes/base.nix +++ b/nixos/tests/kubernetes/base.nix @@ -3,7 +3,7 @@ pkgs ? import ../../.. { inherit system config; } }: -with import ../../lib/testing.nix { inherit system pkgs; }; +with import ../../lib/testing-python.nix { inherit system pkgs; }; with pkgs.lib; let @@ -75,10 +75,8 @@ let ) machines; testScript = '' - startAll; - - ${test} - ''; + start_all() + '' + test; }; mkKubernetesMultiNodeTest = attrs: mkKubernetesBaseTest ({ diff --git a/nixos/tests/kubernetes/dns.nix b/nixos/tests/kubernetes/dns.nix index 638942e1540..890499a0fb8 100644 --- a/nixos/tests/kubernetes/dns.nix +++ b/nixos/tests/kubernetes/dns.nix @@ -75,51 +75,75 @@ let singleNodeTest = { test = '' # prepare machine1 for test - $machine1->waitUntilSucceeds("kubectl get node machine1.${domain} | grep -w Ready"); - $machine1->waitUntilSucceeds("docker load < ${redisImage}"); - $machine1->waitUntilSucceeds("kubectl create -f ${redisPod}"); - $machine1->waitUntilSucceeds("kubectl create -f ${redisService}"); - $machine1->waitUntilSucceeds("docker load < ${probeImage}"); - $machine1->waitUntilSucceeds("kubectl create -f ${probePod}"); + machine1.wait_until_succeeds("kubectl get node machine1.${domain} | grep -w Ready") + machine1.wait_until_succeeds( + "docker load < ${redisImage}" + ) + machine1.wait_until_succeeds( + "kubectl create -f ${redisPod}" + ) + machine1.wait_until_succeeds( + "kubectl create -f ${redisService}" + ) + machine1.wait_until_succeeds( + "docker load < ${probeImage}" + ) + machine1.wait_until_succeeds( + "kubectl create -f ${probePod}" + ) # check if pods are running - $machine1->waitUntilSucceeds("kubectl get pod redis | grep Running"); - $machine1->waitUntilSucceeds("kubectl get pod probe | grep Running"); - $machine1->waitUntilSucceeds("kubectl get pods -n kube-system | grep 'coredns.*1/1'"); + machine1.wait_until_succeeds("kubectl get pod redis | grep Running") + machine1.wait_until_succeeds("kubectl get pod probe | grep Running") + machine1.wait_until_succeeds("kubectl get pods -n kube-system | grep 'coredns.*1/1'") # check dns on host (dnsmasq) - $machine1->succeed("host redis.default.svc.cluster.local"); + machine1.succeed("host redis.default.svc.cluster.local") # check dns inside the container - $machine1->succeed("kubectl exec -ti probe -- /bin/host redis.default.svc.cluster.local"); + machine1.succeed("kubectl exec -ti probe -- /bin/host redis.default.svc.cluster.local") ''; }; multiNodeTest = { test = '' # Node token exchange - $machine1->waitUntilSucceeds("cp -f /var/lib/cfssl/apitoken.secret /tmp/shared/apitoken.secret"); - $machine2->waitUntilSucceeds("cat /tmp/shared/apitoken.secret | nixos-kubernetes-node-join"); + machine1.wait_until_succeeds( + "cp -f /var/lib/cfssl/apitoken.secret /tmp/shared/apitoken.secret" + ) + machine2.wait_until_succeeds( + "cat /tmp/shared/apitoken.secret | nixos-kubernetes-node-join" + ) # prepare machines for test - $machine1->waitUntilSucceeds("kubectl get node machine2.${domain} | grep -w Ready"); - $machine2->waitUntilSucceeds("docker load < ${redisImage}"); - $machine1->waitUntilSucceeds("kubectl create -f ${redisPod}"); - $machine1->waitUntilSucceeds("kubectl create -f ${redisService}"); - $machine2->waitUntilSucceeds("docker load < ${probeImage}"); - $machine1->waitUntilSucceeds("kubectl create -f ${probePod}"); + machine1.wait_until_succeeds("kubectl get node machine2.${domain} | grep -w Ready") + machine2.wait_until_succeeds( + "docker load < ${redisImage}" + ) + machine1.wait_until_succeeds( + "kubectl create -f ${redisPod}" + ) + machine1.wait_until_succeeds( + "kubectl create -f ${redisService}" + ) + machine2.wait_until_succeeds( + "docker load < ${probeImage}" + ) + machine1.wait_until_succeeds( + "kubectl create -f ${probePod}" + ) # check if pods are running - $machine1->waitUntilSucceeds("kubectl get pod redis | grep Running"); - $machine1->waitUntilSucceeds("kubectl get pod probe | grep Running"); - $machine1->waitUntilSucceeds("kubectl get pods -n kube-system | grep 'coredns.*1/1'"); + machine1.wait_until_succeeds("kubectl get pod redis | grep Running") + machine1.wait_until_succeeds("kubectl get pod probe | grep Running") + machine1.wait_until_succeeds("kubectl get pods -n kube-system | grep 'coredns.*1/1'") # check dns on hosts (dnsmasq) - $machine1->succeed("host redis.default.svc.cluster.local"); - $machine2->succeed("host redis.default.svc.cluster.local"); + machine1.succeed("host redis.default.svc.cluster.local") + machine2.succeed("host redis.default.svc.cluster.local") # check dns inside the container - $machine1->succeed("kubectl exec -ti probe -- /bin/host redis.default.svc.cluster.local"); + machine1.succeed("kubectl exec -ti probe -- /bin/host redis.default.svc.cluster.local") ''; }; in { diff --git a/nixos/tests/kubernetes/rbac.nix b/nixos/tests/kubernetes/rbac.nix index 3ce7adcd0d7..c922da515d9 100644 --- a/nixos/tests/kubernetes/rbac.nix +++ b/nixos/tests/kubernetes/rbac.nix @@ -94,43 +94,67 @@ let singlenode = base // { test = '' - $machine1->waitUntilSucceeds("kubectl get node machine1.my.zyx | grep -w Ready"); - - $machine1->waitUntilSucceeds("docker load < ${kubectlImage}"); - - $machine1->waitUntilSucceeds("kubectl apply -f ${roServiceAccount}"); - $machine1->waitUntilSucceeds("kubectl apply -f ${roRole}"); - $machine1->waitUntilSucceeds("kubectl apply -f ${roRoleBinding}"); - $machine1->waitUntilSucceeds("kubectl create -f ${kubectlPod}"); - - $machine1->waitUntilSucceeds("kubectl get pod kubectl | grep Running"); - - $machine1->waitUntilSucceeds("kubectl exec -ti kubectl -- kubectl get pods"); - $machine1->fail("kubectl exec -ti kubectl -- kubectl create -f /kubectl-pod-2.json"); - $machine1->fail("kubectl exec -ti kubectl -- kubectl delete pods -l name=kubectl"); + machine1.wait_until_succeeds("kubectl get node machine1.my.zyx | grep -w Ready") + + machine1.wait_until_succeeds( + "docker load < ${kubectlImage}" + ) + + machine1.wait_until_succeeds( + "kubectl apply -f ${roServiceAccount}" + ) + machine1.wait_until_succeeds( + "kubectl apply -f ${roRole}" + ) + machine1.wait_until_succeeds( + "kubectl apply -f ${roRoleBinding}" + ) + machine1.wait_until_succeeds( + "kubectl create -f ${kubectlPod}" + ) + + machine1.wait_until_succeeds("kubectl get pod kubectl | grep Running") + + machine1.wait_until_succeeds("kubectl exec -ti kubectl -- kubectl get pods") + machine1.fail("kubectl exec -ti kubectl -- kubectl create -f /kubectl-pod-2.json") + machine1.fail("kubectl exec -ti kubectl -- kubectl delete pods -l name=kubectl") ''; }; multinode = base // { test = '' # Node token exchange - $machine1->waitUntilSucceeds("cp -f /var/lib/cfssl/apitoken.secret /tmp/shared/apitoken.secret"); - $machine2->waitUntilSucceeds("cat /tmp/shared/apitoken.secret | nixos-kubernetes-node-join"); - - $machine1->waitUntilSucceeds("kubectl get node machine2.my.zyx | grep -w Ready"); - - $machine2->waitUntilSucceeds("docker load < ${kubectlImage}"); - - $machine1->waitUntilSucceeds("kubectl apply -f ${roServiceAccount}"); - $machine1->waitUntilSucceeds("kubectl apply -f ${roRole}"); - $machine1->waitUntilSucceeds("kubectl apply -f ${roRoleBinding}"); - $machine1->waitUntilSucceeds("kubectl create -f ${kubectlPod}"); - - $machine1->waitUntilSucceeds("kubectl get pod kubectl | grep Running"); - - $machine1->waitUntilSucceeds("kubectl exec -ti kubectl -- kubectl get pods"); - $machine1->fail("kubectl exec -ti kubectl -- kubectl create -f /kubectl-pod-2.json"); - $machine1->fail("kubectl exec -ti kubectl -- kubectl delete pods -l name=kubectl"); + machine1.wait_until_succeeds( + "cp -f /var/lib/cfssl/apitoken.secret /tmp/shared/apitoken.secret" + ) + machine2.wait_until_succeeds( + "cat /tmp/shared/apitoken.secret | nixos-kubernetes-node-join" + ) + + machine1.wait_until_succeeds("kubectl get node machine2.my.zyx | grep -w Ready") + + machine2.wait_until_succeeds( + "docker load < ${kubectlImage}" + ) + + machine1.wait_until_succeeds( + "kubectl apply -f ${roServiceAccount}" + ) + machine1.wait_until_succeeds( + "kubectl apply -f ${roRole}" + ) + machine1.wait_until_succeeds( + "kubectl apply -f ${roRoleBinding}" + ) + machine1.wait_until_succeeds( + "kubectl create -f ${kubectlPod}" + ) + + machine1.wait_until_succeeds("kubectl get pod kubectl | grep Running") + + machine1.wait_until_succeeds("kubectl exec -ti kubectl -- kubectl get pods") + machine1.fail("kubectl exec -ti kubectl -- kubectl create -f /kubectl-pod-2.json") + machine1.fail("kubectl exec -ti kubectl -- kubectl delete pods -l name=kubectl") ''; }; -- cgit v1.2.3 From e9dbf2e508860eac8f627228b956ab318e472a5b Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 14 May 2020 09:18:52 -0400 Subject: linux: 4.19.122 -> 4.19.123 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 577138542b3..4cb90abc29f 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.122"; + version = "4.19.123"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1980vza1vf6cl772dynn4m0rgdjazbn125kd6sb3s06gqn72cl2h"; + sha256 = "0gwrkbbfy85ajxpg7q6j9mn8mzhmsr1v3wmh5c76p34d3b9i96d7"; }; } // (args.argsOverride or {})) -- cgit v1.2.3 From e3ba43b82638ed09e711f5f634c6a450dc7ccd53 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 14 May 2020 09:19:02 -0400 Subject: linux: 5.4.40 -> 5.4.41 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index ffe59480915..e2554cf91b4 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.40"; + version = "5.4.41"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1ar001rljlr15rcl77la5y1cj3plaqhdblnh87xsmv47fq13yml3"; + sha256 = "0mxhz3f0ayz0nggndbikp44kx307yxf16qzsv46hni6p8z1ffr0y"; }; } // (args.argsOverride or {})) -- cgit v1.2.3 From 7ef8639163a6e27ed3c218c2a5db6da75dba88a6 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 14 May 2020 09:19:09 -0400 Subject: linux: 5.6.12 -> 5.6.13 --- pkgs/os-specific/linux/kernel/linux-5.6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.6.nix b/pkgs/os-specific/linux/kernel/linux-5.6.nix index 844fb18c21a..e3eb296d6dd 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.6.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.6.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.6.12"; + version = "5.6.13"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0892ar2irfhd612sb8jpx85w0wwh4n76jgsv8wb92fp6mim37sns"; + sha256 = "11zriz0jwqizv0pq0laql0svsnspdfnxqykq70v22x39iyfdf9gi"; }; } // (args.argsOverride or {})) -- cgit v1.2.3 From a40a811b1742365e463f3bd45a56b09608c4ccd3 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 5 May 2020 09:30:54 +0300 Subject: mariadb-galera: 25.3.27 -> 26.4.3 --- nixos/tests/mysql/mariadb-galera-mariabackup.nix | 6 +++--- nixos/tests/mysql/mariadb-galera-rsync.nix | 6 +++--- pkgs/servers/sql/mariadb/galera/25.nix | 6 ------ pkgs/servers/sql/mariadb/galera/default.nix | 12 +++++------- pkgs/top-level/all-packages.nix | 3 +-- 5 files changed, 12 insertions(+), 21 deletions(-) delete mode 100644 pkgs/servers/sql/mariadb/galera/25.nix diff --git a/nixos/tests/mysql/mariadb-galera-mariabackup.nix b/nixos/tests/mysql/mariadb-galera-mariabackup.nix index 73abf6c555f..9b94ae7048c 100644 --- a/nixos/tests/mysql/mariadb-galera-mariabackup.nix +++ b/nixos/tests/mysql/mariadb-galera-mariabackup.nix @@ -57,7 +57,7 @@ in { wsrep_on = "ON"; wsrep_debug = "OFF"; wsrep_retry_autocommit = "3"; - wsrep_provider = "${pkgs.mariadb-galera_25}/lib/galera/libgalera_smm.so"; + wsrep_provider = "${pkgs.mariadb-galera}/lib/galera/libgalera_smm.so"; wsrep_cluster_address = "gcomm://"; wsrep_cluster_name = "galera"; wsrep_node_address = "192.168.1.1"; @@ -104,7 +104,7 @@ in { wsrep_on = "ON"; wsrep_debug = "OFF"; wsrep_retry_autocommit = "3"; - wsrep_provider = "${pkgs.mariadb-galera_25}/lib/galera/libgalera_smm.so"; + wsrep_provider = "${pkgs.mariadb-galera}/lib/galera/libgalera_smm.so"; wsrep_cluster_address = "gcomm://galera_01,galera_02,galera_03"; wsrep_cluster_name = "galera"; wsrep_node_address = "192.168.1.2"; @@ -151,7 +151,7 @@ in { wsrep_on = "ON"; wsrep_debug = "OFF"; wsrep_retry_autocommit = "3"; - wsrep_provider = "${pkgs.mariadb-galera_25}/lib/galera/libgalera_smm.so"; + wsrep_provider = "${pkgs.mariadb-galera}/lib/galera/libgalera_smm.so"; wsrep_cluster_address = "gcomm://galera_01,galera_02,galera_03"; wsrep_cluster_name = "galera"; wsrep_node_address = "192.168.1.3"; diff --git a/nixos/tests/mysql/mariadb-galera-rsync.nix b/nixos/tests/mysql/mariadb-galera-rsync.nix index cacae4569b5..a35a67e31d7 100644 --- a/nixos/tests/mysql/mariadb-galera-rsync.nix +++ b/nixos/tests/mysql/mariadb-galera-rsync.nix @@ -53,7 +53,7 @@ in { wsrep_on = "ON"; wsrep_debug = "OFF"; wsrep_retry_autocommit = "3"; - wsrep_provider = "${pkgs.mariadb-galera_25}/lib/galera/libgalera_smm.so"; + wsrep_provider = "${pkgs.mariadb-galera}/lib/galera/libgalera_smm.so"; wsrep_cluster_address = "gcomm://"; wsrep_cluster_name = "galera-rsync"; wsrep_node_address = "192.168.2.1"; @@ -99,7 +99,7 @@ in { wsrep_on = "ON"; wsrep_debug = "OFF"; wsrep_retry_autocommit = "3"; - wsrep_provider = "${pkgs.mariadb-galera_25}/lib/galera/libgalera_smm.so"; + wsrep_provider = "${pkgs.mariadb-galera}/lib/galera/libgalera_smm.so"; wsrep_cluster_address = "gcomm://galera_04,galera_05,galera_06"; wsrep_cluster_name = "galera-rsync"; wsrep_node_address = "192.168.2.2"; @@ -145,7 +145,7 @@ in { wsrep_on = "ON"; wsrep_debug = "OFF"; wsrep_retry_autocommit = "3"; - wsrep_provider = "${pkgs.mariadb-galera_25}/lib/galera/libgalera_smm.so"; + wsrep_provider = "${pkgs.mariadb-galera}/lib/galera/libgalera_smm.so"; wsrep_cluster_address = "gcomm://galera_04,galera_05,galera_06"; wsrep_cluster_name = "galera-rsync"; wsrep_node_address = "192.168.2.3"; diff --git a/pkgs/servers/sql/mariadb/galera/25.nix b/pkgs/servers/sql/mariadb/galera/25.nix deleted file mode 100644 index 2772d60e398..00000000000 --- a/pkgs/servers/sql/mariadb/galera/25.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./. (args // { - version = "25.3.27"; - sha256 = "143kzj0fmak1gdww4qkqmmliw8klxm6mwk5531748swlwm6gqr5q"; -}) diff --git a/pkgs/servers/sql/mariadb/galera/default.nix b/pkgs/servers/sql/mariadb/galera/default.nix index a6ce8f4b047..6c3a1af907d 100644 --- a/pkgs/servers/sql/mariadb/galera/default.nix +++ b/pkgs/servers/sql/mariadb/galera/default.nix @@ -1,24 +1,22 @@ { stdenv, fetchFromGitHub, buildEnv , asio, boost, check, openssl, scons -, version, sha256, ... }: let - pname = "mariadb-galera"; galeraLibs = buildEnv { name = "galera-lib-inputs-united"; paths = [ openssl.out boost check ]; }; -in stdenv.mkDerivation { - inherit pname; - inherit version; +in stdenv.mkDerivation rec { + pname = "mariadb-galera"; + version = "26.4.3"; src = fetchFromGitHub { owner = "codership"; repo = "galera"; rev = "release_${version}"; - inherit sha256; + sha256 = "1r0b4kxgqrivnwm4hprnpscb16v6l6j8cnvk4i8c64fig1ly8g3j"; fetchSubmodules = true; }; @@ -40,7 +38,7 @@ in stdenv.mkDerivation { installPhase = '' # copied with modifications from scripts/packages/freebsd.sh - GALERA_LICENSE_DIR="$share/licenses/${pname}" + GALERA_LICENSE_DIR="$share/licenses/${pname}-${version}" install -d $out/{bin,lib/galera,share/doc/galera,$GALERA_LICENSE_DIR} install -m 555 "garb/garbd" "$out/bin/garbd" install -m 444 "libgalera_smm.so" "$out/lib/galera/libgalera_smm.so" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2dd647e6295..12b47de766b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15865,8 +15865,7 @@ in mariadb-connector-c = mariadb-connector-c_3_1; mariadb-connector-c_3_1 = callPackage ../servers/sql/mariadb/connector-c/3_1.nix { }; - mariadb-galera = mariadb-galera_25; - mariadb-galera_25 = callPackage ../servers/sql/mariadb/galera/25.nix { + mariadb-galera = callPackage ../servers/sql/mariadb/galera { asio = asio_1_10; }; -- cgit v1.2.3 From 6ac9a9fcb48374362907039354533518788cf480 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 5 May 2020 09:59:07 +0300 Subject: mariadb: 10.3.22 -> 10.4.12 --- .../servers/sql/mariadb/cmake-disable-auth-pam-testing.patch | 12 ++++++++++++ pkgs/servers/sql/mariadb/default.nix | 12 +++++++----- 2 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 pkgs/servers/sql/mariadb/cmake-disable-auth-pam-testing.patch diff --git a/pkgs/servers/sql/mariadb/cmake-disable-auth-pam-testing.patch b/pkgs/servers/sql/mariadb/cmake-disable-auth-pam-testing.patch new file mode 100644 index 00000000000..864ee818d3c --- /dev/null +++ b/pkgs/servers/sql/mariadb/cmake-disable-auth-pam-testing.patch @@ -0,0 +1,12 @@ +diff --git a/plugin/auth_pam/CMakeLists.txt b/plugin/auth_pam/CMakeLists.txt +index a556b870..918a26f9 100644 +--- a/plugin/auth_pam/CMakeLists.txt ++++ b/plugin/auth_pam/CMakeLists.txt +@@ -22,7 +22,6 @@ IF(HAVE_PAM_APPL_H) + COMPONENT Server) + ENDIF() + IF(TARGET auth_pam OR TARGET auth_pam_v1) +- ADD_SUBDIRECTORY(testing) + ADD_LIBRARY(pam_user_map MODULE mapper/pam_user_map.c) + TARGET_LINK_LIBRARIES(pam_user_map pam) + SET_TARGET_PROPERTIES (pam_user_map PROPERTIES PREFIX "") diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 9b5118eacc3..ac9772922ec 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -23,14 +23,14 @@ mariadb = server // { }; common = rec { # attributes common to both builds - version = "10.3.22"; + version = "10.4.12"; src = fetchurl { urls = [ "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz" "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz" ]; - sha256 = "1iyf1hl82nqsci5h327a537rvdrc5qcbrd1v3fc4cxy2pmfha01j"; + sha256 = "0252b9rxxz1ljjv6ni0wwgy14j8qmmdd2sq0a65dslx2ib9y3wgy"; name = "mariadb-${version}.tar.gz"; }; @@ -111,7 +111,6 @@ common = rec { # attributes common to both builds }; meta = { - description = "An enhanced, drop-in replacement for MySQL"; homepage = "https://mariadb.org/"; license = licenses.gpl2; @@ -161,7 +160,10 @@ server = stdenv.mkDerivation (common // { ++ optional stdenv.hostPlatform.isLinux linux-pam ++ optional (!stdenv.hostPlatform.isDarwin) mytopEnv; - patches = common.patches ++ optionals stdenv.hostPlatform.isDarwin [ + patches = common.patches ++ [ + # Disable build unused plugin pam_mariadb_mtr.so. See https://jira.mariadb.org/browse/MDEV-21654 + ./cmake-disable-auth-pam-testing.patch + ] ++ optionals stdenv.hostPlatform.isDarwin [ ./cmake-without-plugin-auth-pam.patch ]; @@ -198,7 +200,7 @@ server = stdenv.mkDerivation (common // { postInstall = common.postInstall + '' chmod +x "$out"/bin/wsrep_sst_common - rm "$out"/bin/{mysql_client_test,mysqltest} + rm "$out"/bin/{mariadb-client-test,mariadb-test,mysql_client_test,mysqltest} rm -r "$out"/data # Don't need testing data '' + optionalString withStorageMroonga '' mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql -- cgit v1.2.3 From b8c8e810aa330798cc458f412fd6282632e80073 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 5 May 2020 10:22:52 +0300 Subject: nixos/mysql: disable load pluginx auth_socket in mariadb --- nixos/modules/services/databases/mysql.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index f9e657f5774..71b7afa3d39 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -87,7 +87,6 @@ in datadir = /var/lib/mysql bind-address = 127.0.0.1 port = 3336 - plugin-load-add = auth_socket.so !includedir /etc/mysql/conf.d/ '''; @@ -315,7 +314,6 @@ in datadir = cfg.dataDir; bind-address = mkIf (cfg.bind != null) cfg.bind; port = cfg.port; - plugin-load-add = optional (cfg.ensureUsers != []) "auth_socket.so"; } (mkIf (cfg.replication.role == "master" || cfg.replication.role == "slave") { log-bin = "mysql-bin-${toString cfg.replication.serverId}"; @@ -323,6 +321,9 @@ in relay-log = "mysql-relay-bin"; server-id = cfg.replication.serverId; }) + (mkIf (!isMariaDB) { + plugin-load-add = optional (cfg.ensureUsers != []) "auth_socket.so"; + }) ]; users.users.mysql = { -- cgit v1.2.3 From a4c7e0f502be64f326339d9ed609d24e99b594ff Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 5 May 2020 10:51:17 +0300 Subject: nixos/mysql: add release notes --- nixos/doc/manual/release-notes/rl-2009.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 315a2eaeacb..c52fbdfebe9 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -61,6 +61,28 @@ This is to make it possible to use podman instead of docker. + + + MariaDB has been updated to 10.4, MariaDB Galera to 26.4. + Before you upgrade, it would be best to take a backup of your database. + For MariaDB Galera Cluster, see Upgrading + from MariaDB 10.3 to MariaDB 10.4 with Galera Cluster instead. + Before doing the upgrade read Incompatible + Changes Between 10.3 and 10.4. + After the upgrade you will need to run mysql_upgrade. + MariaDB 10.4 introduces a number of changes to the authentication process, intended to make things easier and more + intuitive. See Authentication from MariaDB 10.4. + unix_socket auth plugin does not use a password, and uses the connecting user's UID instead. When a new MariaDB data directory is initialized, two MariaDB users are + created and can be used with new unix_socket auth plugin, as well as traditional mysql_native_password plugin: root@localhost and mysql@localhost. To actually use + the traditional mysql_native_password plugin method, one must run the following: + +services.mysql.initialScript = pkgs.writeText "mariadb-init.sql" '' + ALTER USER root@localhost IDENTIFIED VIA mysql_native_password USING PASSWORD("verysecret"); +''; + + When MariaDB data directory is just upgraded (not initialized), the users are not created or modified. + + -- cgit v1.2.3 From 963259d4ed340c00a0494de29a20d0da4185f0fa Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 7 May 2020 21:27:02 +0300 Subject: nixos/tests/mariadb-galera-mariabackup: fix test script MariaDB 10.4 introduces a number of changes to the authentication process, intended to make things easier and more intuitive. --- nixos/tests/mysql/mariadb-galera-mariabackup.nix | 26 ++++++++++++------------ 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/nixos/tests/mysql/mariadb-galera-mariabackup.nix b/nixos/tests/mysql/mariadb-galera-mariabackup.nix index 9b94ae7048c..cae55878060 100644 --- a/nixos/tests/mysql/mariadb-galera-mariabackup.nix +++ b/nixos/tests/mysql/mariadb-galera-mariabackup.nix @@ -55,7 +55,7 @@ in { }; galera = { wsrep_on = "ON"; - wsrep_debug = "OFF"; + wsrep_debug = "NONE"; wsrep_retry_autocommit = "3"; wsrep_provider = "${pkgs.mariadb-galera}/lib/galera/libgalera_smm.so"; wsrep_cluster_address = "gcomm://"; @@ -102,7 +102,7 @@ in { }; galera = { wsrep_on = "ON"; - wsrep_debug = "OFF"; + wsrep_debug = "NONE"; wsrep_retry_autocommit = "3"; wsrep_provider = "${pkgs.mariadb-galera}/lib/galera/libgalera_smm.so"; wsrep_cluster_address = "gcomm://galera_01,galera_02,galera_03"; @@ -149,7 +149,7 @@ in { }; galera = { wsrep_on = "ON"; - wsrep_debug = "OFF"; + wsrep_debug = "NONE"; wsrep_retry_autocommit = "3"; wsrep_provider = "${pkgs.mariadb-galera}/lib/galera/libgalera_smm.so"; wsrep_cluster_address = "gcomm://galera_01,galera_02,galera_03"; @@ -184,17 +184,17 @@ in { galera_03.wait_for_unit("mysql") galera_03.wait_for_open_port(3306) galera_02.succeed( - "sudo -u testuser mysql -u root -e 'use testdb; select test_id from db1;' -N | grep 37" + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db1;' -N | grep 37" ) galera_02.succeed( - "sudo -u testuser mysql -u root -e 'use testdb; create table db2 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" + "sudo -u testuser mysql -u testuser -e 'use testdb; create table db2 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" ) galera_02.succeed("systemctl stop mysql") galera_01.succeed( "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db2 values (38);'" ) galera_03.succeed( - "sudo -u testuser mysql -u root -e 'use testdb; create table db3 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" + "sudo -u testuser mysql -u testuser -e 'use testdb; create table db3 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" ) galera_01.succeed( "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db3 values (39);'" @@ -202,22 +202,22 @@ in { galera_02.succeed("systemctl start mysql") galera_02.wait_for_open_port(3306) galera_02.succeed( - "sudo -u testuser mysql -u root -e 'show status' -N | grep 'wsrep_cluster_size.*3'" + "sudo -u testuser mysql -u testuser -e 'show status' -N | grep 'wsrep_cluster_size.*3'" ) galera_03.succeed( - "sudo -u testuser mysql -u root -e 'show status' -N | grep 'wsrep_local_state_comment.*Synced'" + "sudo -u testuser mysql -u testuser -e 'show status' -N | grep 'wsrep_local_state_comment.*Synced'" ) galera_01.succeed( - "sudo -u testuser mysql -u root -e 'use testdb; select test_id from db3;' -N | grep 39" + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db3;' -N | grep 39" ) galera_02.succeed( - "sudo -u testuser mysql -u root -e 'use testdb; select test_id from db2;' -N | grep 38" + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db2;' -N | grep 38" ) galera_03.succeed( - "sudo -u testuser mysql -u root -e 'use testdb; select test_id from db1;' -N | grep 37" + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db1;' -N | grep 37" ) galera_01.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db3;'") - galera_02.succeed("sudo -u testuser mysql -u root -e 'use testdb; drop table db2;'") - galera_03.succeed("sudo -u testuser mysql -u root -e 'use testdb; drop table db1;'") + galera_02.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db2;'") + galera_03.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db1;'") ''; }) -- cgit v1.2.3 From 90f30032f3a8349fced2b29614562477cc6f33c9 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 7 May 2020 21:30:25 +0300 Subject: nixos/tests/mariadb-galera-rsync: fix test script MariaDB 10.4 introduces a number of changes to the authentication process, intended to make things easier and more intuitive. --- nixos/tests/mysql/mariadb-galera-rsync.nix | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/nixos/tests/mysql/mariadb-galera-rsync.nix b/nixos/tests/mysql/mariadb-galera-rsync.nix index a35a67e31d7..4318efae8a9 100644 --- a/nixos/tests/mysql/mariadb-galera-rsync.nix +++ b/nixos/tests/mysql/mariadb-galera-rsync.nix @@ -51,7 +51,7 @@ in { }; galera = { wsrep_on = "ON"; - wsrep_debug = "OFF"; + wsrep_debug = "NONE"; wsrep_retry_autocommit = "3"; wsrep_provider = "${pkgs.mariadb-galera}/lib/galera/libgalera_smm.so"; wsrep_cluster_address = "gcomm://"; @@ -97,7 +97,7 @@ in { }; galera = { wsrep_on = "ON"; - wsrep_debug = "OFF"; + wsrep_debug = "NONE"; wsrep_retry_autocommit = "3"; wsrep_provider = "${pkgs.mariadb-galera}/lib/galera/libgalera_smm.so"; wsrep_cluster_address = "gcomm://galera_04,galera_05,galera_06"; @@ -143,7 +143,7 @@ in { }; galera = { wsrep_on = "ON"; - wsrep_debug = "OFF"; + wsrep_debug = "NONE"; wsrep_retry_autocommit = "3"; wsrep_provider = "${pkgs.mariadb-galera}/lib/galera/libgalera_smm.so"; wsrep_cluster_address = "gcomm://galera_04,galera_05,galera_06"; @@ -177,17 +177,17 @@ in { galera_06.wait_for_unit("mysql") galera_06.wait_for_open_port(3306) galera_05.succeed( - "sudo -u testuser mysql -u root -e 'use testdb; select test_id from db1;' -N | grep 41" + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db1;' -N | grep 41" ) galera_05.succeed( - "sudo -u testuser mysql -u root -e 'use testdb; create table db2 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" + "sudo -u testuser mysql -u testuser -e 'use testdb; create table db2 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" ) galera_05.succeed("systemctl stop mysql") galera_04.succeed( "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db2 values (42);'" ) galera_06.succeed( - "sudo -u testuser mysql -u root -e 'use testdb; create table db3 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" + "sudo -u testuser mysql -u testuser -e 'use testdb; create table db3 (test_id INT, PRIMARY KEY (test_id)) ENGINE = InnoDB;'" ) galera_04.succeed( "sudo -u testuser mysql -u testuser -e 'use testdb; insert into db3 values (43);'" @@ -195,22 +195,22 @@ in { galera_05.succeed("systemctl start mysql") galera_05.wait_for_open_port(3306) galera_05.succeed( - "sudo -u testuser mysql -u root -e 'show status' -N | grep 'wsrep_cluster_size.*3'" + "sudo -u testuser mysql -u testuser -e 'show status' -N | grep 'wsrep_cluster_size.*3'" ) galera_06.succeed( - "sudo -u testuser mysql -u root -e 'show status' -N | grep 'wsrep_local_state_comment.*Synced'" + "sudo -u testuser mysql -u testuser -e 'show status' -N | grep 'wsrep_local_state_comment.*Synced'" ) galera_04.succeed( - "sudo -u testuser mysql -u root -e 'use testdb; select test_id from db3;' -N | grep 43" + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db3;' -N | grep 43" ) galera_05.succeed( - "sudo -u testuser mysql -u root -e 'use testdb; select test_id from db2;' -N | grep 42" + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db2;' -N | grep 42" ) galera_06.succeed( - "sudo -u testuser mysql -u root -e 'use testdb; select test_id from db1;' -N | grep 41" + "sudo -u testuser mysql -u testuser -e 'use testdb; select test_id from db1;' -N | grep 41" ) galera_04.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db3;'") - galera_05.succeed("sudo -u testuser mysql -u root -e 'use testdb; drop table db2;'") - galera_06.succeed("sudo -u testuser mysql -u root -e 'use testdb; drop table db1;'") + galera_05.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db2;'") + galera_06.succeed("sudo -u testuser mysql -u testuser -e 'use testdb; drop table db1;'") ''; }) -- cgit v1.2.3 From f52700fc146493fc185848200901b561e266cbda Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 7 May 2020 21:53:10 +0300 Subject: nixos/tests/mysql-replication: fix test script MariaDB 10.4 introduces a number of changes to the authentication process, intended to make things easier and more intuitive. --- nixos/tests/mysql/mysql-replication.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/nixos/tests/mysql/mysql-replication.nix b/nixos/tests/mysql/mysql-replication.nix index 81038dccd94..b5e00325019 100644 --- a/nixos/tests/mysql/mysql-replication.nix +++ b/nixos/tests/mysql/mysql-replication.nix @@ -59,7 +59,7 @@ in master.wait_for_open_port(3306) # Wait for testdb to be fully populated (5 rows). master.wait_until_succeeds( - "mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5" + "sudo -u mysql mysql -u mysql -D testdb -N -B -e 'select count(id) from tests' | grep -q 5" ) slave1.start() @@ -71,19 +71,21 @@ in # wait for replications to finish slave1.wait_until_succeeds( - "mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5" + "sudo -u mysql mysql -u mysql -D testdb -N -B -e 'select count(id) from tests' | grep -q 5" ) slave2.wait_until_succeeds( - "mysql -u root -D testdb -N -B -e 'select count(id) from tests' | grep -q 5" + "sudo -u mysql mysql -u mysql -D testdb -N -B -e 'select count(id) from tests' | grep -q 5" ) slave2.succeed("systemctl stop mysql") - master.succeed("echo 'insert into testdb.tests values (123, 456);' | mysql -u root -N") + master.succeed( + "echo 'insert into testdb.tests values (123, 456);' | sudo -u mysql mysql -u mysql -N" + ) slave2.succeed("systemctl start mysql") slave2.wait_for_unit("mysql") slave2.wait_for_open_port(3306) slave2.wait_until_succeeds( - "echo 'select * from testdb.tests where Id = 123;' | mysql -u root -N | grep 456" + "echo 'select * from testdb.tests where Id = 123;' | sudo -u mysql mysql -u mysql -N | grep 456" ) ''; }) -- cgit v1.2.3 From da08b22e1aa4687f5e74f9bab2aedaf4fb018bdc Mon Sep 17 00:00:00 2001 From: Izorkin Date: Thu, 7 May 2020 22:47:56 +0300 Subject: nixos/mysql-replication: ignore system databases in binary log --- nixos/modules/services/databases/mysql.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 71b7afa3d39..44183788d93 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -320,6 +320,7 @@ in log-bin-index = "mysql-bin-${toString cfg.replication.serverId}.index"; relay-log = "mysql-relay-bin"; server-id = cfg.replication.serverId; + binlog-ignore-db = [ "information_schema" "performance_schema" "mysql" ]; }) (mkIf (!isMariaDB) { plugin-load-add = optional (cfg.ensureUsers != []) "auth_socket.so"; @@ -445,7 +446,6 @@ in ( echo "stop slave;" echo "change master to master_host='${cfg.replication.masterHost}', master_user='${cfg.replication.masterUser}', master_password='${cfg.replication.masterPassword}';" - echo "set global slave_exec_mode='IDEMPOTENT';" echo "start slave;" ) | ${mysql}/bin/mysql -u root -N ''} -- cgit v1.2.3 From dde9810bd895e3016200c7ec915b41e03c07db99 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Tue, 12 May 2020 14:30:52 +0300 Subject: mysql57, mysql80: build with protobuf 3.7 They fail to build with protobuf 3.8: In file included from /build/mysql-5.7.27/rapid/plugin/x/ngs/include/ngs/protocol/message.h:24, from /build/mysql-5.7.27/rapid/plugin/x/ngs/include/ngs/protocol_encoder.h:23, from /build/mysql-5.7.27/rapid/plugin/x/ngs/include/ngs/client_session.h:24, from /build/mysql-5.7.27/rapid/plugin/x/src/xpl_session.h:25, from /build/mysql-5.7.27/rapid/plugin/x/src/xpl_plugin.cc:23: /build/mysql-5.7.27/rapid/plugin/x/ngs/include/ngs_common/protocol_protobuf.h:32:10: fatal error: google/protobuf/wire_format_lite_inl.h: No such file or directory 32 | #include | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. make[2]: *** [rapid/plugin/x/CMakeFiles/mysqlx.dir/build.make:203: rapid/plugin/x/CMakeFiles/mysqlx.dir/src/xpl_plugin.cc.o] Error 1 make[2]: *** Waiting for unfinished jobs.... --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 12b47de766b..c3104b53eab 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15926,12 +15926,14 @@ in inherit (darwin) cctools developer_cmds; inherit (darwin.apple_sdk.frameworks) CoreServices; boost = boost159; + protobuf = protobuf3_7; }; mysql80 = callPackage ../servers/sql/mysql/8.0.x.nix { inherit (darwin) cctools developer_cmds; inherit (darwin.apple_sdk.frameworks) CoreServices; boost = boost169; # Configure checks for specific version. + protobuf = protobuf3_7; }; mysql_jdbc = callPackage ../servers/sql/mysql/jdbc { }; -- cgit v1.2.3 From b59b7414c35e5c4026c53453329a25e4260b958b Mon Sep 17 00:00:00 2001 From: Ethan Glasser-Camp Date: Thu, 14 May 2020 12:00:01 -0400 Subject: nixos/manual: document use of systemd to mount filesystems (#87684) * nixos/manual: document use of systemd to mount filesystems --- nixos/doc/manual/configuration/file-systems.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/nixos/doc/manual/configuration/file-systems.xml b/nixos/doc/manual/configuration/file-systems.xml index e4c03de71b7..3ac02a975eb 100644 --- a/nixos/doc/manual/configuration/file-systems.xml +++ b/nixos/doc/manual/configuration/file-systems.xml @@ -16,6 +16,17 @@ fsType = "ext4"; }; + This will create an entry in /etc/fstab, which will + generate a corresponding + systemd.mount + unit via + systemd-fstab-generator. + The filesystem will be mounted automatically unless + "noauto" is present in options. + "noauto" filesystems can be mounted explicitly using + systemctl e.g. systemctl start + data.mount. Mount points are created automatically if they don’t already exist. For , it’s best to use the topology-independent device aliases in -- cgit v1.2.3 From 9ec8205e78314abd912e0ca4a2e2f22d0bffd59a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 7 May 2020 21:42:08 +0200 Subject: =?UTF-8?q?ocamlPackages.tyxml:=204.3.0=20=E2=86=92=204.4.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ocamlPackages.eliom: 6.10.1 → 6.12.0 --- pkgs/development/ocaml-modules/eliom/default.nix | 4 ++-- pkgs/development/ocaml-modules/tyxml/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 559c21cecac..4ce502af19f 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -14,11 +14,11 @@ else stdenv.mkDerivation rec { pname = "eliom"; - version = "6.10.1"; + version = "6.12.0"; src = fetchzip { url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz"; - sha256 = "006722wcmhsfhyzv3qbgrrn53fbv9v4i31z52a0pznb6cll45nkm"; + sha256 = "015jh72v6ch9h9czd8sn5kjz3pv6lsnvvnhdjgrplwj443dn1xp8"; }; buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json opaline diff --git a/pkgs/development/ocaml-modules/tyxml/default.nix b/pkgs/development/ocaml-modules/tyxml/default.nix index 0d0d43229f8..5d5e7dedd23 100644 --- a/pkgs/development/ocaml-modules/tyxml/default.nix +++ b/pkgs/development/ocaml-modules/tyxml/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "tyxml"; - version = "4.3.0"; + version = "4.4.0"; src = fetchurl { url = "https://github.com/ocsigen/tyxml/releases/download/${version}/tyxml-${version}.tbz"; - sha256 = "1hxzppfvsdls2y8qiwvz31hmffzh2hgglf01am1vzf2f31mxf6vf"; + sha256 = "0c150h2f4c4id73ickkdqkir3jya66m6c7f5jxlp4caw9bfr8qsi"; }; propagatedBuildInputs = [ uutf re ]; -- cgit v1.2.3 From 6f4f37d655d994340cd2f15ebbcb0205dadb9678 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Thu, 14 May 2020 18:17:50 +0200 Subject: nixos/manual: fix build This broke in https://github.com/NixOS/nixpkgs/pull/86376 Also, fix some stray trailing whitespaces --- nixos/doc/manual/release-notes/rl-2009.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index c52fbdfebe9..341b304cb9e 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -73,7 +73,7 @@ MariaDB 10.4 introduces a number of changes to the authentication process, intended to make things easier and more intuitive. See Authentication from MariaDB 10.4. unix_socket auth plugin does not use a password, and uses the connecting user's UID instead. When a new MariaDB data directory is initialized, two MariaDB users are - created and can be used with new unix_socket auth plugin, as well as traditional mysql_native_password plugin: root@localhost and mysql@localhost. To actually use + created and can be used with new unix_socket auth plugin, as well as traditional mysql_native_password plugin: root@localhost and mysql@localhost. To actually use the traditional mysql_native_password plugin method, one must run the following: services.mysql.initialScript = pkgs.writeText "mariadb-init.sql" '' @@ -124,7 +124,6 @@ services.mysql.initialScript = pkgs.writeText "mariadb-init.sql" '' The go-modules builder now uses vendorSha256 instead of modSha256 to pin fetched version data. This is currently a warning, but will be removed in the next release. - @@ -218,13 +217,13 @@ environment.systemPackages = [ customizable to your liking by using php.withExtensions or php.buildEnv instead of writing config files - or changing configure flags. + or changing configure flags. The remaining configuration flags can now be set directly on - the php attribute. For example, instead of + the php attribute. For example, instead of php.override { -- cgit v1.2.3 From 131663718e97f26583d8f80d068888f8dc0591d8 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Thu, 14 May 2020 18:28:24 +0300 Subject: newsboat: fix on darwin --- pkgs/applications/networking/feedreaders/newsboat/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index 5b97859304c..74a43f00ca8 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -16,6 +16,7 @@ rustPlatform.buildRustPackage rec { postPatch = '' substituteInPlace Makefile --replace "|| true" "" + '' + stdenv.lib.optionalString stdenv.isDarwin '' # Allow other ncurses versions on Darwin substituteInPlace config.sh \ --replace "ncurses5.4" "ncurses" @@ -25,13 +26,13 @@ rustPlatform.buildRustPackage rec { pkgconfig asciidoctor gettext - ] ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper libiconv ]; + ] ++ stdenv.lib.optionals stdenv.isDarwin [ makeWrapper ncurses ]; buildInputs = [ stfl sqlite curl libxml2 json_c ncurses ] - ++ stdenv.lib.optional stdenv.isDarwin Security; + ++ stdenv.lib.optionals stdenv.isDarwin [ Security libiconv gettext ]; postBuild = '' - make + make prefix="$out" ''; # TODO: Check if that's still needed -- cgit v1.2.3 From 9cc24aa9f0dd9f2d65fd56fd0fdac31555eaa23c Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Mon, 17 Feb 2020 17:54:16 +0800 Subject: kdeFrameworks.qqc2-desktop-style: init at 5.68 --- pkgs/development/libraries/kde-frameworks/default.nix | 5 +++-- .../libraries/kde-frameworks/qqc2-desktop-style.nix | 15 +++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 3d618f09e38..1db37bc7879 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -105,8 +105,10 @@ let kdbusaddons = callPackage ./kdbusaddons.nix {}; kdnssd = callPackage ./kdnssd.nix {}; kguiaddons = callPackage ./kguiaddons.nix {}; + kholidays = callPackage ./kholidays.nix {}; ki18n = callPackage ./ki18n.nix {}; kidletime = callPackage ./kidletime.nix {}; + kirigami2 = callPackage ./kirigami2.nix {}; kitemmodels = callPackage ./kitemmodels.nix {}; kitemviews = callPackage ./kitemviews.nix {}; kplotting = callPackage ./kplotting.nix {}; @@ -117,12 +119,11 @@ let networkmanager-qt = callPackage ./networkmanager-qt.nix {}; oxygen-icons5 = callPackage ./oxygen-icons5.nix {}; prison = callPackage ./prison.nix {}; + qqc2-desktop-style = callPackage ./qqc2-desktop-style.nix {}; solid = callPackage ./solid.nix {}; sonnet = callPackage ./sonnet.nix {}; syntax-highlighting = callPackage ./syntax-highlighting.nix {}; threadweaver = callPackage ./threadweaver.nix {}; - kirigami2 = callPackage ./kirigami2.nix {}; - kholidays = callPackage ./kholidays.nix {}; # TIER 2 kactivities = callPackage ./kactivities.nix {}; diff --git a/pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix b/pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix new file mode 100644 index 00000000000..ed372e01aeb --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/qqc2-desktop-style.nix @@ -0,0 +1,15 @@ +{ mkDerivation, lib +, extra-cmake-modules +, qtquickcontrols2 +, qtx11extras +, kconfig +, kiconthemes +, kirigami2 +}: + +mkDerivation { + name = "qqc2-desktop-style"; + meta = { maintainers = with lib.maintainers; [ ttuegel ]; }; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtx11extras qtquickcontrols2 kconfig kiconthemes kirigami2 ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d04e68dc733..f72a6defec5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14179,7 +14179,7 @@ in knotifyconfig kpackage kparts kpeople kplotting kpty kross krunner kservice ktexteditor ktextwidgets kunitconversion kwallet kwayland kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt - networkmanager-qt plasma-framework prison solid sonnet syntax-highlighting + networkmanager-qt plasma-framework prison qqc2-desktop-style solid sonnet syntax-highlighting syndication threadweaver kirigami2 kholidays kpurpose kcontacts; ### KDE PLASMA 5 -- cgit v1.2.3 From e88673aa27dea719295bcb6ec1ae6a67eca3d683 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Thu, 14 May 2020 06:52:32 +0200 Subject: mkl: fix expectation of MKLROOT being set in pkg-config files The Intel MKL pkg-config files did not work, because they expect that the MKLROOT environment variable is set. This change replaces occurences by the actual path of MKL in the Nix store. Since the pkg-config files seem to break quite frequently after upgrades, add a post-install check to validate the pkg-config files. --- .../libraries/science/math/mkl/default.nix | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/mkl/default.nix b/pkgs/development/libraries/science/math/mkl/default.nix index 2df39b330c4..016864abed8 100644 --- a/pkgs/development/libraries/science/math/mkl/default.nix +++ b/pkgs/development/libraries/science/math/mkl/default.nix @@ -1,4 +1,12 @@ -{ stdenvNoCC, fetchurl, rpmextract, undmg, darwin, enableStatic ? false }: +{ stdenvNoCC +, fetchurl +, pkgconfig +, rpmextract +, undmg +, darwin +, enableStatic ? false +}: + /* For details on using mkl as a blas provider for python packages such as numpy, numexpr, scipy, etc., see the Python section of the NixPkgs manual. @@ -44,6 +52,10 @@ in stdenvNoCC.mkDerivation { else [ rpmextract ]; + installCheckInputs = [ pkgconfig ]; + + doInstallCheck = true; + buildPhase = if stdenvNoCC.isDarwin then '' for f in Contents/Resources/pkg/*.tgz; do tar xzvf $f @@ -77,6 +89,7 @@ in stdenvNoCC.mkDerivation { bn=$(basename $f) substituteInPlace $f \ --replace "prefix=/mkl" "prefix=$out" \ + --replace $\{MKLROOT} "$out" \ --replace "lib/intel64_lin" "lib" done @@ -139,6 +152,11 @@ in stdenvNoCC.mkDerivation { install_name_tool -change @rpath/libtbbmalloc.dylib $out/lib/libtbbmalloc.dylib $out/lib/libtbbmalloc_proxy.dylib ''; + # Validate pkgconfig files, since they break often on updates. + installCheckPhase = '' + pkg-config --validate $out/lib/pkgconfig/*.pc + ''; + # Per license agreement, do not modify the binary dontStrip = true; dontPatchELF = true; -- cgit v1.2.3 From 04a4941379e42708669eb6b4eeee779cc0858f10 Mon Sep 17 00:00:00 2001 From: Antoine Roy-Gobeil Date: Thu, 14 May 2020 11:07:08 -0400 Subject: pythonPackages.dash-core-components: 1.9.1 -> 1.10.1 --- pkgs/development/python-modules/dash-core-components/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dash-core-components/default.nix b/pkgs/development/python-modules/dash-core-components/default.nix index b4af53cb296..e88591aba9a 100644 --- a/pkgs/development/python-modules/dash-core-components/default.nix +++ b/pkgs/development/python-modules/dash-core-components/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_core_components"; - version = "1.9.1"; + version = "1.10.0"; src = fetchPypi { inherit pname version; - sha256 = "0mi608d4q4clx5ikblqni5v67k051k894q0w5asa3jj1v0agawpa"; + sha256 = "1bqvxm7h3b0wah32jrsn919hp4xr1zlkxclbs261mvd57ps0rf9h"; }; # No tests in archive -- cgit v1.2.3 From d7e620c39652fc33514b27d43d95b15b11877da8 Mon Sep 17 00:00:00 2001 From: Antoine Roy-Gobeil Date: Thu, 14 May 2020 11:07:40 -0400 Subject: pythonPackages.dash-renderer: 1.3.0 -> 1.4.1 --- pkgs/development/python-modules/dash-renderer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dash-renderer/default.nix b/pkgs/development/python-modules/dash-renderer/default.nix index 348deba7123..a92f6617abe 100644 --- a/pkgs/development/python-modules/dash-renderer/default.nix +++ b/pkgs/development/python-modules/dash-renderer/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_renderer"; - version = "1.3.0"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - sha256 = "07nyajjc3209ha2nbvk43sh5bnslwb2hs9wn8q5dpfngsc96wr9g"; + sha256 = "11fl7756zshlrfiqcr6rcg1m0c4434vdg1bkrcjl54hl02k3pcmv"; }; # No tests in archive -- cgit v1.2.3 From 4bdb7d2ab6f68dbba83e532eee7693c5ccf44e20 Mon Sep 17 00:00:00 2001 From: Antoine Roy-Gobeil Date: Thu, 14 May 2020 11:08:00 -0400 Subject: pythonPackages.dash-table: 4.6.2 -> 4.7.0 --- pkgs/development/python-modules/dash-table/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dash-table/default.nix b/pkgs/development/python-modules/dash-table/default.nix index 3ea04666249..9c323c6fa33 100644 --- a/pkgs/development/python-modules/dash-table/default.nix +++ b/pkgs/development/python-modules/dash-table/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "dash_table"; - version = "4.6.2"; + version = "4.7.0"; src = fetchPypi { inherit pname version; - sha256 = "1hn1yjz5ig2kzkk0wkr75q3l4lrfbnsh0kxzlld9sfn69d1vvsjw"; + sha256 = "0md7qqjpsarc8ymfccvsqgj6mgq8gxl09im5v5yxhv8hv24yy4jm"; }; # No tests in archive -- cgit v1.2.3 From c8727a324edf91d4f6dea5f9e3eb3ec37fe434d3 Mon Sep 17 00:00:00 2001 From: Antoine Roy-Gobeil Date: Thu, 14 May 2020 11:08:31 -0400 Subject: pythonPackages.dash: 1.10.0 -> 1.12.0 --- pkgs/development/python-modules/dash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dash/default.nix b/pkgs/development/python-modules/dash/default.nix index 83632ff6db6..4a9a9a60af8 100644 --- a/pkgs/development/python-modules/dash/default.nix +++ b/pkgs/development/python-modules/dash/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "dash"; - version = "1.10.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "plotly"; repo = pname; rev = "v${version}"; - sha256 = "18rrysfhmjfzb5b3n8fjbwk755p4slbb8fh9myq4qp76v00lfpnh"; + sha256 = "0nr5ppjbfmay0d3bah26i4k8xj6xyp24gq0cqlv9lzdrbdd3j9wy"; }; propagatedBuildInputs = [ -- cgit v1.2.3 From d13fc39d84590658cc82c68e8902a8bbf2ebb65a Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Thu, 14 May 2020 12:16:08 -0700 Subject: starship: 0.41.0 -> 0.41.1 --- pkgs/tools/misc/starship/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 6e720bf1034..8016c73cd3f 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -3,13 +3,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.41.0"; + version = "0.41.1"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "1m5pi49g3pj2qr5slyasda5xp9lz3xhz3qb9k0pa6fvcn9581r9q"; + sha256 = "0q41f1zj27vz5sg7harmk9zvmyc37w8hr5f74ipws438wz27qwm3"; }; nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { --replace "/bin/echo" "echo" ''; - cargoSha256 = "18z1p8xj1v9w6amc52gc2vcn5f4z8k71ig20zmj005v24si9pfwf"; + cargoSha256 = "1i6d2vsgcjclk0r6j5lmynk5m0my2yphn0q9rm53s43n1vyf2g2v"; checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; meta = with stdenv.lib; { -- cgit v1.2.3 From 2ed4bfd7eb6b08966a24698d727f75431d002935 Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Thu, 14 May 2020 12:16:37 -0700 Subject: starship: add Frostman to maintainers --- pkgs/tools/misc/starship/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index 8016c73cd3f..c1fd2fedde7 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { description = "A minimal, blazing fast, and extremely customizable prompt for any shell"; homepage = "https://starship.rs"; license = licenses.isc; - maintainers = with maintainers; [ bbigras davidtwco filalex77 ]; + maintainers = with maintainers; [ bbigras davidtwco filalex77 Frostman ]; platforms = platforms.all; }; } -- cgit v1.2.3 From d00c84b5bd90d4fe348f836191f7e6228a0e752e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 8 May 2020 08:25:10 +0200 Subject: ocamlPackages.lablgtkmathview: remove at 0.7.2 --- .../ocaml-modules/lablgtkmathview/default.nix | 40 ---------------------- pkgs/top-level/ocaml-packages.nix | 4 --- 2 files changed, 44 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/lablgtkmathview/default.nix diff --git a/pkgs/development/ocaml-modules/lablgtkmathview/default.nix b/pkgs/development/ocaml-modules/lablgtkmathview/default.nix deleted file mode 100644 index b91e9268475..00000000000 --- a/pkgs/development/ocaml-modules/lablgtkmathview/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{stdenv, fetchurl, pkgconfig, ocaml, findlib, gmetadom, gtkmathview, lablgtk }: - -let - pname = "lablgtkmathview"; -in - -stdenv.mkDerivation rec { - name = "${pname}-${version}"; - version = "0.7.2"; - - src = fetchurl { - url = "http://helm.cs.unibo.it/mml-widget/sources/${pname}-${version}.tar.gz"; - sha256 = "0rgrpgwrgphw106l1xawxir002b7rmzc23rcxhv8ib6rymp1divx"; - }; - - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ocaml findlib gmetadom gtkmathview lablgtk]; - - createFindlibDestdir = true; - - propagatedBuildInputs = [gtkmathview]; - - prePatch = '' - substituteInPlace Makefile.in --replace "PROPCC = @OCAML_LIB_DIR@" "PROPCC = ${lablgtk}/lib/ocaml/${ocaml.version}/site-lib" - ''; - - buildPhase = '' - mkdir -p .test - make - make opt - ''; - - meta = { - homepage = "http://helm.cs.unibo.it/mml-widget/"; - description = "OCaml bindings for gtkmathview"; - license = stdenv.lib.licenses.lgpl2Plus; - maintainers = [ stdenv.lib.maintainers.roconnor ]; - broken = true; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index eb607e305a5..f21f3ca9cbe 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -447,10 +447,6 @@ let then callPackage ../development/ocaml-modules/lablgtk-extras { } else callPackage ../development/ocaml-modules/lablgtk-extras/1.4.nix { }; - lablgtkmathview = callPackage ../development/ocaml-modules/lablgtkmathview { - gtkmathview = callPackage ../development/libraries/gtkmathview { }; - }; - labltk = callPackage ../development/ocaml-modules/labltk { }; lacaml = callPackage ../development/ocaml-modules/lacaml { }; -- cgit v1.2.3 From 608dbf662c52e29db0143d8b9c4c3e31c8f6e1a8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 8 May 2020 08:25:16 +0200 Subject: =?UTF-8?q?ocamlPackages.lablgtk:=202.18.8=20=E2=86=92=202.18.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This ensures compatibility with OCaml 4.10 --- pkgs/development/ocaml-modules/lablgtk/default.nix | 26 ++++++++++++---------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix index e9ad3104d3f..2b6c3028fd6 100644 --- a/pkgs/development/ocaml-modules/lablgtk/default.nix +++ b/pkgs/development/ocaml-modules/lablgtk/default.nix @@ -1,25 +1,27 @@ -{ stdenv, fetchurl, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview }: +{ stdenv, fetchurl, fetchFromGitHub, ocaml, findlib, pkgconfig, gtk2, libgnomecanvas, libglade, gtksourceview }: let param = let check = stdenv.lib.versionAtLeast ocaml.version; in - if check "4.06" then { - version = "2.18.8"; - url = "https://github.com/garrigue/lablgtk/releases/download/lablgtk2188/lablgtk-2.18.8.tar.gz"; - sha256 = "1qsd9nv96fxddc8zayqiqxw9hcyf29axckqg100fm2brs2prpxci"; + if check "4.06" then rec { + version = "2.18.10"; + src = fetchFromGitHub { + owner = "garrigue"; + repo = "lablgtk"; + rev = version; + sha256 = "0w8cdfcv2wc19sd3qzj3qq77qc6rbnbynsz02gzbl15kgrvgrfxi"; + }; } else if check "3.12" then { version = "2.18.5"; - url = "https://forge.ocamlcore.org/frs/download.php/1627/lablgtk-2.18.5.tar.gz"; - sha256 = "0cyj6sfdvzx8hw7553lhgwc0krlgvlza0ph3dk9gsxy047dm3wib"; + src = fetchurl { + url = "https://forge.ocamlcore.org/frs/download.php/1627/lablgtk-2.18.5.tar.gz"; + sha256 = "0cyj6sfdvzx8hw7553lhgwc0krlgvlza0ph3dk9gsxy047dm3wib"; + }; } else throw "lablgtk is not available for OCaml ${ocaml.version}"; in stdenv.mkDerivation { pname = "lablgtk"; - inherit (param) version; - - src = fetchurl { - inherit (param) url sha256; - }; + inherit (param) version src; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ocaml findlib gtk2 libgnomecanvas libglade gtksourceview ]; -- cgit v1.2.3 From d30e2468e0c7875d3d4d47404f52647ccea76fcf Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Sun, 29 Dec 2019 12:14:16 +0000 Subject: agda: rework builder --- doc/languages-frameworks/agda.section.md | 96 ++++++++++++++ doc/languages-frameworks/index.xml | 1 + pkgs/build-support/agda/default.nix | 145 +++++++++------------ .../libraries/agda/agda-iowa-stdlib/default.nix | 27 ---- .../libraries/agda/agda-prelude/default.nix | 16 +-- .../libraries/agda/agda-stdlib/default.nix | 28 ---- .../libraries/agda/iowa-stdlib/default.nix | 29 +++++ .../libraries/agda/standard-library/default.nix | 26 ++++ pkgs/top-level/agda-packages.nix | 24 ++++ pkgs/top-level/all-packages.nix | 13 +- pkgs/top-level/release.nix | 1 + 11 files changed, 250 insertions(+), 156 deletions(-) create mode 100644 doc/languages-frameworks/agda.section.md delete mode 100644 pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix delete mode 100644 pkgs/development/libraries/agda/agda-stdlib/default.nix create mode 100644 pkgs/development/libraries/agda/iowa-stdlib/default.nix create mode 100644 pkgs/development/libraries/agda/standard-library/default.nix create mode 100644 pkgs/top-level/agda-packages.nix diff --git a/doc/languages-frameworks/agda.section.md b/doc/languages-frameworks/agda.section.md new file mode 100644 index 00000000000..7a5dc767b7c --- /dev/null +++ b/doc/languages-frameworks/agda.section.md @@ -0,0 +1,96 @@ +--- +title: Agda +author: Alex Rice (alexarice) +date: 2020-01-06 +--- +# Agda + +## How to use Agda + +Agda can be installed from `agda`: +``` +$ nix-env -iA agda +``` + +To use agda with libraries, the `agda.withPackages` function can be used. This function either takes: ++ A list of packages, ++ or a function which returns a list of packages when given the `agdaPackages` attribute set, ++ or an attribute set containing a list of packages and a GHC derivation for compilation (see below). + +For example, suppose we wanted a version of agda which has access to the standard library. This can be obtained with the expressions: + +``` +agda.withPackages [ agdaPackages.standard-library ] +``` + +or + +``` +agda.withPackages (p: [ p.standard-library ]) +``` + +or can be called as in the [Compiling Agda](#compiling-agda) section. + +If you want to use a library in your home directory (for instance if it is a development version) then typecheck it manually (using `agda.withPackages` if necessary) and then override the `src` attribute of the package to point to your local repository. + +Agda will not by default use these libraries. To tell agda to use the library we have some options: +- Call `agda` with the library flag: +``` +$ agda -l standard-library -i . MyFile.agda +``` +- Write a `my-library.agda-lib` file for the project you are working on which may look like: +``` +name: my-library +include: . +depends: standard-library +``` +- Create the file `~/.agda/defaults` and add any libraries you want to use by default. + +More information can be found in the [official Agda documentation on library management](https://agda.readthedocs.io/en/v2.6.1/tools/package-system.html). + +## Compiling Agda +Agda modules can be compiled with the `--compile` flag. A version of `ghc` with `ieee` is made available to the Agda program via the `--with-compiler` flag. +This can be overridden by a different version of `ghc` as follows: + +``` +agda.withPackages { + pkgs = [ ... ]; + ghc = haskell.compiler.ghcHEAD; +} +``` + +## Writing Agda packages +To write a nix derivation for an agda library, first check that the library has a `*.agda-lib` file. + +A derivation can then be written using `agdaPackages.mkDerivation`. This has similar arguments to `stdenv.mkDerivation` with the following additions: ++ `everythingFile` can be used to specify the location of the `Everything.agda` file, defaulting to `./Everything.agda`. If this file does not exist then either it should be patched in or the `buildPhase` should be overridden (see below). ++ `libraryName` should be the name that appears in the `*.agda-lib` file, defaulting to `pname`. ++ `libraryFile` should be the file name of the `*.agda-lib` file, defaulting to `${libraryName}.agda-lib`. + +The build phase for `agdaPackages.mkDerivation` simply runs `agda` on the `Everything.agda` file. If something else is needed to build the package (e.g. `make`) then the `buildPhase` should be overridden (or a `preBuild` or `configurePhase` can be used if there are steps that need to be done prior to checking the `Everything.agda` file). `agda` and the Agda libraries contained in `buildInputs` are made available during the build phase. The install phase simply copies all `.agda`, `.agdai` and `.agda-lib` files to the output directory. Again, this can be overridden. + +To add an agda package to `nixpkgs`, the derivation should be written to `pkgs/development/libraries/agda/${library-name}/` and an entry should be added to `pkgs/top-level/agda-packages.nix`. Here it is called in a scope with access to all other agda libraries, so the top line of the `default.nix` can look like: +``` +{ mkDerivation, standard-library, fetchFromGitHub }: +``` +and `mkDerivation` should be called instead of `agdaPackages.mkDerivation`. Here is an example skeleton derivation for iowa-stdlib: + +``` +mkDerivation { + version = "1.5.0"; + pname = "iowa-stdlib"; + + src = ... + + libraryFile = ""; + libraryName = "IAL-1.3"; + + buildPhase = '' + patchShebangs find-deps.sh + make + ''; +} +``` +This library has a file called `.agda-lib`, and so we give an empty string to `libraryFile` as nothing precedes `.agda-lib` in the filename. This file contains `name: IAL-1.3`, and so we let `libraryName = "IAL-1.3"`. This library does not use an `Everything.agda` file and instead has a Makefile, so there is no need to set `everythingFile` and we set a custom `buildPhase`. + +When writing an agda package it is essential to make sure that no `.agda-lib` file gets added to the store as a single file (for example by using `writeText`). This causes agda to think that the nix store is a agda library and it will attempt to write to it whenever it typechecks something. See [https://github.com/agda/agda/issues/4613](https://github.com/agda/agda/issues/4613). diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml index 9364c764bbf..97202751f7d 100644 --- a/doc/languages-frameworks/index.xml +++ b/doc/languages-frameworks/index.xml @@ -5,6 +5,7 @@ The standard build environment makes it easy to build typical Autotools-based packages with very little code. Any other kind of package can be accomodated by overriding the appropriate phases of stdenv. However, there are specialised functions in Nixpkgs to easily build packages for other programming languages, such as Perl or Haskell. These are described in this chapter. + diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix index 0d054eaa546..205aff55573 100644 --- a/pkgs/build-support/agda/default.nix +++ b/pkgs/build-support/agda/default.nix @@ -1,90 +1,71 @@ -# Builder for Agda packages. Mostly inspired by the cabal builder. +# Builder for Agda packages. -{ stdenv, Agda, glibcLocales -, writeShellScriptBin -, extension ? (self: super: {}) -}: +{ stdenv, lib, self, Agda, runCommandNoCC, makeWrapper, writeText, mkShell, ghcWithPackages }: -with stdenv.lib.strings; +with lib.strings; let - defaults = self : { - # There is no Hackage for Agda so we require src. - inherit (self) src name; - - isAgdaPackage = true; - - buildInputs = [ Agda ] ++ self.buildDepends; - buildDepends = []; - - buildDependsAgda = stdenv.lib.filter - (dep: dep ? isAgdaPackage && dep.isAgdaPackage) - self.buildDepends; - buildDependsAgdaShareAgda = map (x: x + "/share/agda") self.buildDependsAgda; - - # Not much choice here ;) - LANG = "en_US.UTF-8"; - LOCALE_ARCHIVE = stdenv.lib.optionalString - stdenv.isLinux - "${glibcLocales}/lib/locale/locale-archive"; - - everythingFile = "Everything.agda"; - - propagatedBuildInputs = self.buildDependsAgda; - propagatedUserEnvPkgs = self.buildDependsAgda; - - # Immediate source directories under which modules can be found. - sourceDirectories = [ ]; - - # This is used if we have a top-level element that only serves - # as the container for the source and we only care about its - # contents. The directories put here will have their - # *contents* copied over as opposed to sourceDirectories which - # would make a direct copy of the whole thing. - topSourceDirectories = [ "src" ]; - - # FIXME: `dirOf self.everythingFile` is what we really want, not hardcoded "./" - includeDirs = self.buildDependsAgdaShareAgda - ++ self.sourceDirectories ++ self.topSourceDirectories - ++ [ "." ]; - buildFlags = stdenv.lib.concatMap (x: ["-i" x]) self.includeDirs; - - agdaWithArgs = "${Agda}/bin/agda ${toString self.buildFlags}"; - - buildPhase = '' - runHook preBuild - ${self.agdaWithArgs} ${self.everythingFile} - runHook postBuild + withPackages' = { + pkgs, + ghc ? ghcWithPackages (p: with p; [ ieee ]) + }: let + pkgs' = if builtins.isList pkgs then pkgs else pkgs self; + library-file = writeText "libraries" '' + ${(concatMapStringsSep "\n" (p: "${p}/${p.libraryFile}") pkgs')} ''; - - installPhase = let - srcFiles = self.sourceDirectories - ++ map (x: x + "/*") self.topSourceDirectories; - in '' - runHook preInstall - mkdir -p $out/share/agda - cp -pR ${concatStringsSep " " srcFiles} $out/share/agda - runHook postInstall - ''; - - passthru = { - env = stdenv.mkDerivation { - name = "interactive-${self.name}"; - inherit (self) LANG LOCALE_ARCHIVE; - AGDA_PACKAGE_PATH = concatMapStrings (x: x + ":") self.buildDependsAgdaShareAgda; - buildInputs = let - # Makes a wrapper available to the user. Very useful in - # nix-shell where all dependencies are -i'd. - agdaWrapper = writeShellScriptBin "agda" '' - exec ${self.agdaWithArgs} "$@" - ''; - in [agdaWrapper] ++ self.buildDepends; + pname = "agdaWithPackages"; + version = Agda.version; + in runCommandNoCC "${pname}-${version}" { + inherit pname version; + nativeBuildInputs = [ makeWrapper ]; + passthru.unwrapped = Agda; + } '' + mkdir -p $out/bin + makeWrapper ${Agda}/bin/agda $out/bin/agda \ + --add-flags "--with-compiler=${ghc}/bin/ghc" \ + --add-flags "--library-file=${library-file}" \ + --add-flags "--local-interfaces" + makeWrapper ${Agda}/bin/agda-mode $out/bin/agda-mode + ''; # Local interfaces has been added for now: See https://github.com/agda/agda/issues/4526 + + withPackages = arg: if builtins.isAttrs arg then withPackages' arg else withPackages' { pkgs = arg; }; + + + defaults = + { pname + , buildInputs ? [] + , everythingFile ? "./Everything.agda" + , libraryName ? pname + , libraryFile ? "${libraryName}.agda-lib" + , buildPhase ? null + , installPhase ? null + , ... + }: let + agdaWithArgs = withPackages (builtins.filter (p: p ? isAgdaDerivation) buildInputs); + in + { + inherit libraryName libraryFile; + + isAgdaDerivation = true; + + buildInputs = buildInputs ++ [ agdaWithArgs ]; + + buildPhase = if buildPhase != null then buildPhase else '' + runHook preBuild + agda -i ${dirOf everythingFile} ${everythingFile} + runHook postBuild + ''; + + installPhase = if installPhase != null then installPhase else '' + runHook preInstall + mkdir -p $out + find \( -name '*.agda' -or -name '*.agdai' -or -name '*.agda-lib' \) -exec cp -p --parents -t "$out" {} + + runHook postInstall + ''; }; - }; - }; in -{ mkDerivation = args: let - super = defaults self // args self; - self = super // extension self super; - in stdenv.mkDerivation self; +{ + mkDerivation = args: stdenv.mkDerivation (args // defaults args); + + inherit withPackages withPackages'; } diff --git a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix deleted file mode 100644 index 23013bfbc32..00000000000 --- a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ stdenv, agda, fetchFromGitHub }: - -agda.mkDerivation (self: rec { - version = "1.5.0"; - name = "agda-iowa-stdlib-${version}"; - - src = fetchFromGitHub { - owner = "cedille"; - repo = "ial"; - rev = "v${version}"; - sha256 = "0dlis6v6nzbscf713cmwlx8h9n2gxghci8y21qak3hp18gkxdp0g"; - }; - - sourceDirectories = [ "./." ]; - buildPhase = '' - patchShebangs find-deps.sh - make - ''; - - meta = { - homepage = "https://svn.divms.uiowa.edu/repos/clc/projects/agda/lib/"; - description = "Agda standard library developed at Iowa"; - license = stdenv.lib.licenses.free; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ ]; - }; -}) diff --git a/pkgs/development/libraries/agda/agda-prelude/default.nix b/pkgs/development/libraries/agda/agda-prelude/default.nix index 86f21ad9b19..1709ce314d9 100644 --- a/pkgs/development/libraries/agda/agda-prelude/default.nix +++ b/pkgs/development/libraries/agda/agda-prelude/default.nix @@ -1,16 +1,16 @@ -{ stdenv, agda, fetchgit }: +{ stdenv, mkDerivation, fetchFromGitHub }: -agda.mkDerivation (self: rec { +mkDerivation rec { version = "eacc961c2c312b7443109a7872f99d55557df317"; - name = "agda-prelude-${version}"; + pname = "agda-prelude"; - src = fetchgit { - url = "https://github.com/UlfNorell/agda-prelude.git"; + src = fetchFromGitHub { + owner = "UlfNorell"; + repo = "agda-prelude"; rev = version; sha256 = "0iql67hb1q0fn8dwkcx07brkdkxqfqrsbwjy71ndir0k7qzw7qv2"; }; - topSourceDirectories = [ "src" ]; everythingFile = "src/Prelude.agda"; meta = with stdenv.lib; { @@ -18,6 +18,6 @@ agda.mkDerivation (self: rec { description = "Programming library for Agda"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; - maintainers = with maintainers; [ mudri ]; + maintainers = with maintainers; [ mudri alexarice ]; }; -}) +} diff --git a/pkgs/development/libraries/agda/agda-stdlib/default.nix b/pkgs/development/libraries/agda/agda-stdlib/default.nix deleted file mode 100644 index 6647677f71c..00000000000 --- a/pkgs/development/libraries/agda/agda-stdlib/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, agda, fetchFromGitHub, ghcWithPackages }: - -agda.mkDerivation (self: rec { - version = "1.1"; - name = "agda-stdlib-${version}"; - - src = fetchFromGitHub { - repo = "agda-stdlib"; - owner = "agda"; - rev = "v${version}"; - sha256 = "190bxsy92ffmvwpmyyg3lxs91vyss2z25rqz1w79gkj56484cy64"; - }; - - nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; - preConfigure = '' - runhaskell GenerateEverything.hs - ''; - - topSourceDirectories = [ "src" ]; - - meta = with stdenv.lib; { - homepage = "https://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary"; - description = "A standard library for use with the Agda compiler"; - license = stdenv.lib.licenses.mit; - platforms = stdenv.lib.platforms.unix; - maintainers = with maintainers; [ jwiegley mudri ]; - }; -}) diff --git a/pkgs/development/libraries/agda/iowa-stdlib/default.nix b/pkgs/development/libraries/agda/iowa-stdlib/default.nix new file mode 100644 index 00000000000..9cda6ceec13 --- /dev/null +++ b/pkgs/development/libraries/agda/iowa-stdlib/default.nix @@ -0,0 +1,29 @@ +{ stdenv, mkDerivation, fetchFromGitHub }: + +mkDerivation (rec { + version = "1.5.0"; + pname = "iowa-stdlib"; + + src = fetchFromGitHub { + owner = "cedille"; + repo = "ial"; + rev = "v${version}"; + sha256 = "0dlis6v6nzbscf713cmwlx8h9n2gxghci8y21qak3hp18gkxdp0g"; + }; + + libraryFile = ""; + libraryName = "IAL-1.3"; + + buildPhase = '' + patchShebangs find-deps.sh + make + ''; + + meta = { + homepage = "https://svn.divms.uiowa.edu/repos/clc/projects/agda/lib/"; + description = "Agda standard library developed at Iowa"; + license = stdenv.lib.licenses.free; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ alexarice ]; + }; +}) diff --git a/pkgs/development/libraries/agda/standard-library/default.nix b/pkgs/development/libraries/agda/standard-library/default.nix new file mode 100644 index 00000000000..6d85d560a9b --- /dev/null +++ b/pkgs/development/libraries/agda/standard-library/default.nix @@ -0,0 +1,26 @@ +{ stdenv, mkDerivation, fetchFromGitHub, ghcWithPackages }: + +mkDerivation rec { + pname = "standard-library"; + version = "1.1"; + + src = fetchFromGitHub { + repo = "agda-stdlib"; + owner = "agda"; + rev = "v${version}"; + sha256 = "190bxsy92ffmvwpmyyg3lxs91vyss2z25rqz1w79gkj56484cy64"; + }; + + nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; + preConfigure = '' + runhaskell GenerateEverything.hs + ''; + + meta = with stdenv.lib; { + homepage = "https://wiki.portal.chalmers.se/agda/pmwiki.php?n=Libraries.StandardLibrary"; + description = "A standard library for use with the Agda compiler"; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.unix; + maintainers = with maintainers; [ jwiegley mudri alexarice ]; + }; +} diff --git a/pkgs/top-level/agda-packages.nix b/pkgs/top-level/agda-packages.nix new file mode 100644 index 00000000000..5bd57b5dec8 --- /dev/null +++ b/pkgs/top-level/agda-packages.nix @@ -0,0 +1,24 @@ +{ pkgs, lib, callPackage, newScope, Agda }: + +let + mkAgdaPackages = Agda: lib.makeScope newScope (mkAgdaPackages' Agda); + mkAgdaPackages' = Agda: self: let + callPackage = self.callPackage; + inherit (callPackage ../build-support/agda { + inherit Agda self; + inherit (pkgs.haskellPackages) ghcWithPackages; + }) withPackages mkDerivation; + in { + inherit mkDerivation; + + agda = withPackages [] // { inherit withPackages; }; + + standard-library = callPackage ../development/libraries/agda/standard-library { + inherit (pkgs.haskellPackages) ghcWithPackages; + }; + + iowa-stdlib = callPackage ../development/libraries/agda/iowa-stdlib { }; + + agda-prelude = callPackage ../development/libraries/agda/agda-prelude { }; + }; +in mkAgdaPackages Agda diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea1a0791762..8c1414803ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15128,19 +15128,10 @@ in ### DEVELOPMENT / LIBRARIES / AGDA - agda = callPackage ../build-support/agda { - glibcLocales = if pkgs.stdenv.isLinux then pkgs.glibcLocales else null; - extension = self : super : { }; + agdaPackages = callPackage ./agda-packages.nix { inherit (haskellPackages) Agda; }; - - agdaIowaStdlib = callPackage ../development/libraries/agda/agda-iowa-stdlib { }; - - agdaPrelude = callPackage ../development/libraries/agda/agda-prelude { }; - - AgdaStdlib = callPackage ../development/libraries/agda/agda-stdlib { - inherit (haskellPackages) ghcWithPackages; - }; + agda = agdaPackages.agda; ### DEVELOPMENT / LIBRARIES / JAVA diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index e0723523f4e..60a4a679f16 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -181,6 +181,7 @@ let haskell.compiler = packagePlatforms pkgs.haskell.compiler; haskellPackages = packagePlatforms pkgs.haskellPackages; idrisPackages = packagePlatforms pkgs.idrisPackages; + agdaPackages = packagePlatforms pkgs.agdaPackages; tests = packagePlatforms pkgs.tests; -- cgit v1.2.3 From c2814be3a329288a391c9436493ab6dcaa36f3ce Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Sun, 29 Dec 2019 13:20:59 +0000 Subject: agda-prelude: update --- pkgs/development/libraries/agda/agda-prelude/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/agda/agda-prelude/default.nix b/pkgs/development/libraries/agda/agda-prelude/default.nix index 1709ce314d9..bdc1b27cef4 100644 --- a/pkgs/development/libraries/agda/agda-prelude/default.nix +++ b/pkgs/development/libraries/agda/agda-prelude/default.nix @@ -1,23 +1,32 @@ { stdenv, mkDerivation, fetchFromGitHub }: mkDerivation rec { - version = "eacc961c2c312b7443109a7872f99d55557df317"; + version = "compat-2.6.0"; pname = "agda-prelude"; src = fetchFromGitHub { owner = "UlfNorell"; repo = "agda-prelude"; rev = version; - sha256 = "0iql67hb1q0fn8dwkcx07brkdkxqfqrsbwjy71ndir0k7qzw7qv2"; + sha256 = "0brg61qrf8izqav80qpx77dbdxvlnsxyy0v7hmlrmhg68b5lp38y"; }; - everythingFile = "src/Prelude.agda"; + preConfigure = '' + cd test + make everything + mv Everything.agda .. + cd .. + ''; + + everythingFile = "./Everything.agda"; meta = with stdenv.lib; { homepage = "https://github.com/UlfNorell/agda-prelude"; description = "Programming library for Agda"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; + # broken since Agda 2.6.1 + broken = true; maintainers = with maintainers; [ mudri alexarice ]; }; } -- cgit v1.2.3 From 6c1cdedb6d6203aff485422c1b84cde6df7add57 Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Sun, 29 Dec 2019 17:22:00 +0000 Subject: agda-categories: init at 0.1 --- .../libraries/agda/agda-categories/default.nix | 28 ++++++++++++++++++++++ pkgs/top-level/agda-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/libraries/agda/agda-categories/default.nix diff --git a/pkgs/development/libraries/agda/agda-categories/default.nix b/pkgs/development/libraries/agda/agda-categories/default.nix new file mode 100644 index 00000000000..11f8d71f1cd --- /dev/null +++ b/pkgs/development/libraries/agda/agda-categories/default.nix @@ -0,0 +1,28 @@ +{ lib, mkDerivation, fetchFromGitHub, standard-library }: + +mkDerivation rec { + version = "0.1"; + pname = "agda-categories"; + + src = fetchFromGitHub { + owner = "agda"; + repo = "agda-categories"; + rev = "release/v${version}"; + sha256 = "0m4pjy92jg6zfziyv0bxv5if03g8k4413ld8c3ii2xa8bzfn04m2"; + }; + + buildInputs = [ standard-library ]; + + meta = with lib; { + inherit (src.meta) homepage; + description = "A new Categories library"; + license = licenses.bsd3; + platforms = platforms.unix; + # agda categories takes a lot of memory to build. + # This can be removed if this is eventually fixed upstream. + hydraPlatforms = []; + # Waiting for release 0.2 for this to work + broken = true; + maintainers = with maintainers; [ alexarice ]; + }; +} diff --git a/pkgs/top-level/agda-packages.nix b/pkgs/top-level/agda-packages.nix index 5bd57b5dec8..3f4d7db0c7c 100644 --- a/pkgs/top-level/agda-packages.nix +++ b/pkgs/top-level/agda-packages.nix @@ -20,5 +20,7 @@ let iowa-stdlib = callPackage ../development/libraries/agda/iowa-stdlib { }; agda-prelude = callPackage ../development/libraries/agda/agda-prelude { }; + + agda-categories = callPackage ../development/libraries/agda/agda-categories { }; }; in mkAgdaPackages Agda -- cgit v1.2.3 From a7cd372a3e913bf526e4f72847ad1bbda23cc811 Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Sun, 5 Jan 2020 23:34:35 +0000 Subject: agda.standard-library: 1.1 -> 1.3 --- pkgs/development/libraries/agda/standard-library/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/agda/standard-library/default.nix b/pkgs/development/libraries/agda/standard-library/default.nix index 6d85d560a9b..1b76aefe6fc 100644 --- a/pkgs/development/libraries/agda/standard-library/default.nix +++ b/pkgs/development/libraries/agda/standard-library/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "standard-library"; - version = "1.1"; + version = "1.3"; src = fetchFromGitHub { repo = "agda-stdlib"; owner = "agda"; rev = "v${version}"; - sha256 = "190bxsy92ffmvwpmyyg3lxs91vyss2z25rqz1w79gkj56484cy64"; + sha256 = "18kl20z3bjfgx5m3nvrdj5776qmpi7jl2p12pqybsls2lf86m0d5"; }; nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ]; -- cgit v1.2.3 From 11750651110696c4da6357adeea62d452ef6837c Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Sat, 21 Mar 2020 11:58:44 +0000 Subject: agda.iowa-stdlib: mark broken --- pkgs/development/libraries/agda/iowa-stdlib/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/agda/iowa-stdlib/default.nix b/pkgs/development/libraries/agda/iowa-stdlib/default.nix index 9cda6ceec13..6fa45f58e78 100644 --- a/pkgs/development/libraries/agda/iowa-stdlib/default.nix +++ b/pkgs/development/libraries/agda/iowa-stdlib/default.nix @@ -24,6 +24,8 @@ mkDerivation (rec { description = "Agda standard library developed at Iowa"; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.unix; + # broken since Agda 2.6.1 + broken = true; maintainers = with stdenv.lib.maintainers; [ alexarice ]; }; }) -- cgit v1.2.3 From b78a5a0e79808550e450d8c5aba142309fe15fa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20B=C3=A4renz?= Date: Sun, 19 Apr 2020 20:01:37 +0200 Subject: agda: Added test --- nixos/tests/agda.nix | 41 +++++++++++++++++++++++++++++++++++++++++ nixos/tests/all-tests.nix | 1 + 2 files changed, 42 insertions(+) create mode 100644 nixos/tests/agda.nix diff --git a/nixos/tests/agda.nix b/nixos/tests/agda.nix new file mode 100644 index 00000000000..e158999e57d --- /dev/null +++ b/nixos/tests/agda.nix @@ -0,0 +1,41 @@ +import ./make-test-python.nix ({ pkgs, ... }: + +let + hello-world = pkgs.writeText "hello-world" '' + open import IO + + main = run(putStrLn "Hello World!") + ''; +in +{ + name = "agda"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ alexarice turion ]; + }; + + machine = { pkgs, ... }: { + environment.systemPackages = [ + (pkgs.agda.withPackages { + pkgs = p: [ p.standard-library ]; + }) + ]; + virtualisation.memorySize = 2000; # Agda uses a lot of memory + }; + + testScript = '' + # Minimal script that typechecks + machine.succeed("touch TestEmpty.agda") + machine.succeed("agda TestEmpty.agda") + + # Minimal script that actually uses the standard library + machine.succeed('echo "import IO" > TestIO.agda') + machine.succeed("agda -l standard-library -i . TestIO.agda") + + # # Hello world + machine.succeed( + "cp ${hello-world} HelloWorld.agda" + ) + machine.succeed("agda -l standard-library -i . -c HelloWorld.agda") + ''; +} +) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index cbfdf3ad9c2..c4d7e38f54e 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -23,6 +23,7 @@ in { _3proxy = handleTest ./3proxy.nix {}; acme = handleTest ./acme.nix {}; + agda = handleTest ./agda.nix {}; atd = handleTest ./atd.nix {}; automysqlbackup = handleTest ./automysqlbackup.nix {}; avahi = handleTest ./avahi.nix {}; -- cgit v1.2.3 From 43fb96efe89c2215a58b576ee70e8b8ca0413897 Mon Sep 17 00:00:00 2001 From: Keshav Kini Date: Sat, 2 May 2020 13:25:18 -0700 Subject: iowa-stdlib: update homepage URL The old homepage URL, which was hosted inside the old SVN server, isn't publicly accessible anymore. Since the project has officially moved to github, it seems better to set the github repo as the homepage. --- pkgs/development/libraries/agda/iowa-stdlib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/agda/iowa-stdlib/default.nix b/pkgs/development/libraries/agda/iowa-stdlib/default.nix index 6fa45f58e78..3cd1921be2d 100644 --- a/pkgs/development/libraries/agda/iowa-stdlib/default.nix +++ b/pkgs/development/libraries/agda/iowa-stdlib/default.nix @@ -20,7 +20,7 @@ mkDerivation (rec { ''; meta = { - homepage = "https://svn.divms.uiowa.edu/repos/clc/projects/agda/lib/"; + homepage = "https://github.com/cedille/ial"; description = "Agda standard library developed at Iowa"; license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.unix; -- cgit v1.2.3 From 8ee4c3698c573e76cdb6617356ef21a3013a18ae Mon Sep 17 00:00:00 2001 From: Alex Rice Date: Thu, 14 May 2020 20:50:00 +0100 Subject: Agda: Add turion as maintainer --- pkgs/development/libraries/agda/agda-categories/default.nix | 2 +- pkgs/development/libraries/agda/agda-prelude/default.nix | 2 +- pkgs/development/libraries/agda/iowa-stdlib/default.nix | 2 +- pkgs/development/libraries/agda/standard-library/default.nix | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/agda/agda-categories/default.nix b/pkgs/development/libraries/agda/agda-categories/default.nix index 11f8d71f1cd..9eb68b5a64a 100644 --- a/pkgs/development/libraries/agda/agda-categories/default.nix +++ b/pkgs/development/libraries/agda/agda-categories/default.nix @@ -23,6 +23,6 @@ mkDerivation rec { hydraPlatforms = []; # Waiting for release 0.2 for this to work broken = true; - maintainers = with maintainers; [ alexarice ]; + maintainers = with maintainers; [ alexarice turion ]; }; } diff --git a/pkgs/development/libraries/agda/agda-prelude/default.nix b/pkgs/development/libraries/agda/agda-prelude/default.nix index bdc1b27cef4..2bec10c02dd 100644 --- a/pkgs/development/libraries/agda/agda-prelude/default.nix +++ b/pkgs/development/libraries/agda/agda-prelude/default.nix @@ -27,6 +27,6 @@ mkDerivation rec { platforms = stdenv.lib.platforms.unix; # broken since Agda 2.6.1 broken = true; - maintainers = with maintainers; [ mudri alexarice ]; + maintainers = with maintainers; [ mudri alexarice turion ]; }; } diff --git a/pkgs/development/libraries/agda/iowa-stdlib/default.nix b/pkgs/development/libraries/agda/iowa-stdlib/default.nix index 3cd1921be2d..55cd6a742e5 100644 --- a/pkgs/development/libraries/agda/iowa-stdlib/default.nix +++ b/pkgs/development/libraries/agda/iowa-stdlib/default.nix @@ -26,6 +26,6 @@ mkDerivation (rec { platforms = stdenv.lib.platforms.unix; # broken since Agda 2.6.1 broken = true; - maintainers = with stdenv.lib.maintainers; [ alexarice ]; + maintainers = with stdenv.lib.maintainers; [ alexarice turion ]; }; }) diff --git a/pkgs/development/libraries/agda/standard-library/default.nix b/pkgs/development/libraries/agda/standard-library/default.nix index 1b76aefe6fc..4bff585ac3a 100644 --- a/pkgs/development/libraries/agda/standard-library/default.nix +++ b/pkgs/development/libraries/agda/standard-library/default.nix @@ -21,6 +21,6 @@ mkDerivation rec { description = "A standard library for use with the Agda compiler"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; - maintainers = with maintainers; [ jwiegley mudri alexarice ]; + maintainers = with maintainers; [ jwiegley mudri alexarice turion ]; }; } -- cgit v1.2.3 From 9a0b7457d304b85444ac07cbb0c0aa45cf453d63 Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Thu, 14 May 2020 06:42:05 -0700 Subject: =?UTF-8?q?ocamlPackages.x509:=200.11.1=20=E2=86=92=200.11.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/x509/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix index eae40d4dfae..289a3891c78 100644 --- a/pkgs/development/ocaml-modules/x509/default.nix +++ b/pkgs/development/ocaml-modules/x509/default.nix @@ -8,11 +8,11 @@ buildDunePackage rec { minimumOCamlVersion = "4.07"; pname = "x509"; - version = "0.11.1"; + version = "0.11.2"; src = fetchurl { url = "https://github.com/mirleft/ocaml-x509/releases/download/v${version}/x509-v${version}.tbz"; - sha256 = "1vmjqwmxf7zz157rlp3wp3zp88kw62m4f22i0xmxhinssd0dvr9c"; + sha256 = "1b4lcphmlyjhdgqi0brakgjp3diwmrj1y9hx87svi5xklw3zik22"; }; useDune2 = true; -- cgit v1.2.3 From 1d3fbaac004f30478c8784ffc21adce941219d13 Mon Sep 17 00:00:00 2001 From: Jim Garrison Date: Thu, 14 May 2020 05:03:49 -0400 Subject: bibtool: 2.67 -> 2.68 cf. https://github.com/ge-ne/bibtool/issues/76 --- pkgs/tools/misc/bibtool/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/bibtool/default.nix b/pkgs/tools/misc/bibtool/default.nix index 2f90745785a..041dabeee77 100644 --- a/pkgs/tools/misc/bibtool/default.nix +++ b/pkgs/tools/misc/bibtool/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bibtool"; - version = "2.67"; + version = "2.68"; src = fetchurl { url = "http://www.gerd-neugebauer.de/software/TeX/BibTool/BibTool-${version}.tar.gz"; - sha256 = "116pv532mz0q954y5b7c6zipnamc05f0x7g5x1b674jsjxh42v2v"; + sha256 = "1ymq901ckaysq2n1bplk1064rb2njq9n30pii15w157y0lxcwd3i"; }; # Perl for running test suite. @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { installTargets = [ "install" "install.man" ]; doCheck = true; + checkTarget = "test"; meta = with stdenv.lib; { description = "Tool for manipulating BibTeX bibliographies"; -- cgit v1.2.3 From 022f2cc02f75ea44f96d1a7174e6da3d612a4b01 Mon Sep 17 00:00:00 2001 From: talyz Date: Thu, 14 May 2020 23:03:09 +0200 Subject: nomachine-client: Add archive.org to source urls NoMachine removes each old release as soon as a new one is available, resulting in failed downloads. Thankfully, the Internet Archive provides backups of old downloads, so we can use it as a fallback. --- pkgs/tools/admin/nomachine-client/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/nomachine-client/default.nix b/pkgs/tools/admin/nomachine-client/default.nix index a0369ecfea6..a4d201fd4c4 100644 --- a/pkgs/tools/admin/nomachine-client/default.nix +++ b/pkgs/tools/admin/nomachine-client/default.nix @@ -13,12 +13,18 @@ in src = 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"; + urls = [ + "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz" + "https://web.archive.org/web/https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz" + ]; sha256 = "17yb377ry7i7cmkb72xmhyqkfggv1ygqlz55ymvmrs7psbh7ql01"; } else if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz"; + urls = [ + "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz" + "https://web.archive.org/web/https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz" + ]; sha256 = "0k6dspmwdkm0zf0c2zqlqy0jya8qgsg90wwv9wa12fn4chp66gqg"; } else -- cgit v1.2.3 From b7ddd316f1ba041c0d9f79973996f097708681fb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 15 May 2020 00:23:28 +0200 Subject: postgresql: Use runuser instead of sudo Currently, sudo doesn't work in a NixOS container running inside a Nix build, because Nix's seccomp filter doesn't allow setuid programs. In any case, runuser is a bit lower-overhead than sudo. --- nixos/modules/services/databases/postgresql.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 982480fbd99..579b6a4d9c6 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -343,7 +343,7 @@ in # Wait for PostgreSQL to be ready to accept connections. postStart = '' - PSQL="${pkgs.sudo}/bin/sudo -u ${cfg.superUser} psql --port=${toString cfg.port}" + PSQL="${pkgs.utillinux}/bin/runuser -u ${cfg.superUser} -- psql --port=${toString cfg.port}" while ! $PSQL -d postgres -c "" 2> /dev/null; do if ! kill -0 "$MAINPID"; then exit 1; fi -- cgit v1.2.3 From 5746259af694fc791743c322f2cf0d47e3d0d9bd Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Fri, 15 May 2020 01:39:42 +0300 Subject: gotify: adapt update script to use vendor sha --- pkgs/servers/gotify/default.nix | 2 +- pkgs/servers/gotify/update.sh | 12 ++++++------ pkgs/servers/gotify/vendor-sha.nix | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 pkgs/servers/gotify/vendor-sha.nix diff --git a/pkgs/servers/gotify/default.nix b/pkgs/servers/gotify/default.nix index 47f5925edfc..5d305c1e412 100644 --- a/pkgs/servers/gotify/default.nix +++ b/pkgs/servers/gotify/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { sha256 = import ./source-sha.nix; }; - vendorSha256 = "1ha0zgz1n07sd3if6823fi83j7yajysjdzfbwqk9rpsi6zv3cfh3"; + vendorSha256 = import ./vendor-sha.nix; postPatch = '' substituteInPlace app.go \ diff --git a/pkgs/servers/gotify/update.sh b/pkgs/servers/gotify/update.sh index e26ffbde62e..dc39a15be73 100755 --- a/pkgs/servers/gotify/update.sh +++ b/pkgs/servers/gotify/update.sh @@ -11,9 +11,9 @@ echo got version $version echo \""${version#v}"\" > "$dirname/version.nix" printf '%s' $(nix-prefetch-git --quiet --rev ${version} https://github.com/gotify/server | jq .sha256) > $dirname/source-sha.nix tput setaf 1 -echo zeroing modSha256 in $dirname/mod-sha.nix +echo zeroing vendorSha256 in $dirname/vendor-sha.nix tput sgr0 -printf '"%s"' "0000000000000000000000000000000000000000000000000000" > $dirname/mod-sha.nix +printf '"%s"' "0000000000000000000000000000000000000000000000000000" > $dirname/vendor-sha.nix GOTIFY_WEB_SRC="https://raw.githubusercontent.com/gotify/server/$version" @@ -28,13 +28,13 @@ echo removed yarn.lock echo running nix-build for ui nix-build -A gotify-server.ui -echo running nix-build for gotify itself in order to get modSha256 +echo running nix-build for gotify itself in order to get vendorSha256 set +e -modSha256="$(nix-build -A gotify-server 2>&1 | grep "got:" | cut -d':' -f3)" +vendorSha256="$(nix-build -A gotify-server 2>&1 | grep "got:" | cut -d':' -f3)" set -e -printf '"%s"' "$modSha256" > $dirname/mod-sha.nix +printf '"%s"' "$vendorSha256" > $dirname/vendor-sha.nix tput setaf 2 -echo got modSha256 of: $modSha256 +echo got vendorSha256 of: $vendorSha256 tput sgr0 echo running nix-build -A gotify-server which should build gotify-server normally nix-build -A gotify-server diff --git a/pkgs/servers/gotify/vendor-sha.nix b/pkgs/servers/gotify/vendor-sha.nix new file mode 100644 index 00000000000..0705f436316 --- /dev/null +++ b/pkgs/servers/gotify/vendor-sha.nix @@ -0,0 +1 @@ +"1ha0zgz1n07sd3if6823fi83j7yajysjdzfbwqk9rpsi6zv3cfh3" \ No newline at end of file -- cgit v1.2.3 From ec7dbdb74c0e74c8985836684dde836e6c5ea916 Mon Sep 17 00:00:00 2001 From: Drew Risinger Date: Mon, 11 May 2020 19:00:17 -0400 Subject: python3Packages.cirq: 0.6.1 -> 0.8.0 --- pkgs/development/python-modules/cirq/default.nix | 46 +++++++++++++++--------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/cirq/default.nix b/pkgs/development/python-modules/cirq/default.nix index 18c1e7f8c0d..98fc3b9ff05 100644 --- a/pkgs/development/python-modules/cirq/default.nix +++ b/pkgs/development/python-modules/cirq/default.nix @@ -3,7 +3,9 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub -, google_api_python_client +, fetchpatch +, freezegun +, google_api_core , matplotlib , networkx , numpy @@ -16,6 +18,7 @@ , typing-extensions # test inputs , pytestCheckHook +, pytest-asyncio , pytest-benchmark , ply , pydot @@ -25,7 +28,7 @@ buildPythonPackage rec { pname = "cirq"; - version = "0.6.1"; + version = "0.8.0"; disabled = pythonOlder "3.5"; @@ -33,25 +36,29 @@ buildPythonPackage rec { owner = "quantumlib"; repo = "cirq"; rev = "v${version}"; - sha256 = "0lhr2dka7vpz9xd6akxphrcv2b3ni2cgjywpc1r7qpqa5mrq1q7f"; + sha256 = "01nnv7r595sp60wvp7750lfdjwdsi4q0r4lmaj6li09zsdw0r4b3"; }; - # Cirq 0.6 requires networkx==2.3 only for optional qiskit dependency/test, disable this to avoid networkx version conflicts. https://github.com/quantumlib/Cirq/issues/2368 + patches = [ + (fetchpatch { + # Fixes serialization issues on certain versions of protobuf & numpy. + name = "cirq-pr-2986-protobuf-bools.patch"; + url = "https://github.com/quantumlib/Cirq/commit/78ddfb574c0f3936f713613bf4ba102163efb7b3.patch"; + sha256 = "0hmad9ndsqf5ci7shvd924d2rv4k9pzx2r2cl1bm5w91arzz9m18"; + }) + ]; + # Cirq locks protobuf==3.8.0, but tested working with default pythonPackages.protobuf (3.7). This avoids overrides/pythonPackages.protobuf conflicts postPatch = '' - substituteInPlace requirements.txt --replace "networkx==2.3" "networkx" \ - --replace "protobuf==3.8.0" "protobuf" - - # Fix sympy 1.5 test failures. Should be fixed in v0.7 - substituteInPlace cirq/optimizers/eject_phased_paulis_test.py --replace "phase_exponent=0.125 + x / 8" "phase_exponent=0.125 + x * 0.125" - substituteInPlace cirq/contrib/quirk/cells/parse_test.py --replace "parse_formula('5t') == 5 * t" "parse_formula('5t') == 5.0 * t" - - # Fix pandas >= 1.0 error, #2886 - substituteInPlace cirq/experiments/t1_decay_experiment.py --replace "del tab.columns.name" 'tab.rename_axis(None, axis="columns", inplace=True)' + substituteInPlace requirements.txt \ + --replace "networkx~=2.4" "networkx" \ + --replace "protobuf==3.8.0" "protobuf" \ + --replace "freezegun~=0.3.15" "freezegun" ''; propagatedBuildInputs = [ - google_api_python_client + freezegun + google_api_core numpy matplotlib networkx @@ -69,19 +76,26 @@ buildPythonPackage rec { dontUseSetuptoolsCheck = true; checkInputs = [ pytestCheckHook + pytest-asyncio pytest-benchmark ply pydot pyyaml pygraphviz ]; - # TODO: enable op_serializer_test. Error is type checking, for some reason wants bool instead of numpy.bool_. Not sure if protobuf or internal issue + pytestFlagsArray = [ "--ignore=dev_tools" # Only needed when developing new code, which is out-of-scope - "--ignore=cirq/google/op_serializer_test.py" # investigating in https://github.com/quantumlib/Cirq/issues/2727 ]; disabledTests = [ + "test_serialize_sympy_constants" # fails due to small error in pi (~10e-7) "test_convert_to_ion_gates" # fails due to rounding error, 0.75 != 0.750...2 + + # Newly disabled tests on cirq 0.8 + # TODO: test & figure out why failing + "engine_job_test" + "test_health" + "test_run_delegation" ] ++ lib.optionals stdenv.isAarch64 [ # Seem to fail due to math issues on aarch64? "expectation_from_wavefunction" -- cgit v1.2.3 From 8fc9d7fe6ae1a3dc77f979f217ca27003e8f1d68 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 15 May 2020 10:08:48 +1000 Subject: miniserve: 0.6.0 -> 0.7.0 https://github.com/svenstaro/miniserve/blob/master/CHANGELOG.md#070---2020-05-14 --- pkgs/tools/misc/miniserve/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix index ea3afdab098..dab44e1eea5 100644 --- a/pkgs/tools/misc/miniserve/default.nix +++ b/pkgs/tools/misc/miniserve/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "miniserve"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; rev = "v${version}"; - sha256 = "0ybxnxjg0vqm4q60z4zjl3hfls0s2rvy44m6jgyhlj1p6cr3dbyw"; + sha256 = "06nrb84xfvx02yc4bjn1szfq3bjy8mqgxwwrjghl7vpcw51qhlk5"; }; - cargoSha256 = "0ypxv9wqcnjxjdrvdparddpssrarnifr43dq7kcr4l3fd1anl40a"; + cargoSha256 = "0mk8hvhjqggfr410yka9ygb41l1bnsizs8py3100xf685yxy5mhl"; RUSTC_BOOTSTRAP = 1; -- cgit v1.2.3 From 5b3f0c4f4af71ef702b3f2cdd5ebb8a4d442ac00 Mon Sep 17 00:00:00 2001 From: Matt Wittmann Date: Thu, 14 May 2020 20:00:58 -0700 Subject: r-statmod: Add libiconv to buildInputs --- pkgs/development/r-modules/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 9ebd0e2b1d7..da42a5dd820 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -445,6 +445,7 @@ let ucminf = [ pkgs.libiconv ]; glmnet = [ pkgs.libiconv ]; mvtnorm = [ pkgs.libiconv ]; + statmod = [ pkgs.libiconv ]; }; packagesRequireingX = [ -- cgit v1.2.3 From 90e5b2a44eb9c6bde33abaa6322b65fa78e45482 Mon Sep 17 00:00:00 2001 From: Antonio Nuno Monteiro Date: Thu, 14 May 2020 21:00:31 -0700 Subject: bs-platform: 7.3.1 -> 7.3.2 --- pkgs/development/compilers/bs-platform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/bs-platform/default.nix b/pkgs/development/compilers/bs-platform/default.nix index ee4123a23c1..0fd696c69f0 100644 --- a/pkgs/development/compilers/bs-platform/default.nix +++ b/pkgs/development/compilers/bs-platform/default.nix @@ -4,14 +4,14 @@ let in (build-bs-platform rec { inherit stdenv runCommand fetchFromGitHub ninja nodejs python3; - version = "7.3.1"; + version = "7.3.2"; ocaml-version = "4.06.1"; src = fetchFromGitHub { owner = "BuckleScript"; repo = "bucklescript"; rev = version; - sha256 = "14vp6cl5ml7xb3pd0paqajb50qv62l8j5m8hi3b6fh0pm68j1yxd"; + sha256 = "1nvp7wiiv149r4qf9bgc84bm4w7s44sjq9i7j103v24wllzz218s"; fetchSubmodules = true; }; }).overrideAttrs (attrs: { -- cgit v1.2.3 From aa35d565ffdfffbfa8159a3aab649959b5e86cdb Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 1 Apr 2020 13:08:19 +0200 Subject: meteor: 1.10.1 -> 1.10.2 --- pkgs/servers/meteor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix index 0a0d3aa7bd8..ddf7a972c2e 100644 --- a/pkgs/servers/meteor/default.nix +++ b/pkgs/servers/meteor/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, zlib, patchelf, runtimeShell }: let - version = "1.10.1"; + version = "1.10.2"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { pname = "meteor"; src = fetchurl { url = "https://static-meteor.netdna-ssl.com/packages-bootstrap/${version}/meteor-bootstrap-os.linux.x86_64.tar.gz"; - sha256 = "1xck7pi7rhkgssic7adbg1slypjjkqxa18wlf3jffbgj0zzr87nx"; + sha256 = "17s1n92nznasaaprvxg289a1fcizq2nj51xqw7akgw5f77q19vmw"; }; #dontStrip = true; -- cgit v1.2.3 From 5ecd99b2bd4e0e04e6c1b2566bb6b287e1288ba1 Mon Sep 17 00:00:00 2001 From: Henk Kalkwater Date: Wed, 13 May 2020 17:55:22 +0200 Subject: qt5.qtgamepad: init at 5.12.7 --- pkgs/development/libraries/qt-5/5.12/default.nix | 3 ++- pkgs/development/libraries/qt-5/modules/qtgamepad.nix | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/qt-5/modules/qtgamepad.nix diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index 78d711e969b..afca6c7969b 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -139,6 +139,7 @@ let qtconnectivity = callPackage ../modules/qtconnectivity.nix {}; qtdeclarative = callPackage ../modules/qtdeclarative.nix {}; qtdoc = callPackage ../modules/qtdoc.nix {}; + qtgamepad = callPackage ../modules/qtgamepad.nix {}; qtgraphicaleffects = callPackage ../modules/qtgraphicaleffects.nix {}; qtimageformats = callPackage ../modules/qtimageformats.nix {}; qtlocation = callPackage ../modules/qtlocation.nix {}; @@ -171,7 +172,7 @@ let env = callPackage ../qt-env.nix {}; full = env "qt-full-${qtbase.version}" ([ - qtcharts qtconnectivity qtdeclarative qtdoc qtgraphicaleffects + qtcharts qtconnectivity qtdeclarative qtdoc qtgamepad qtgraphicaleffects qtimageformats qtlocation qtmultimedia qtquickcontrols qtquickcontrols2 qtscript qtsensors qtserialport qtsvg qttools qttranslations qtvirtualkeyboard qtwebchannel qtwebengine qtwebkit qtwebsockets diff --git a/pkgs/development/libraries/qt-5/modules/qtgamepad.nix b/pkgs/development/libraries/qt-5/modules/qtgamepad.nix new file mode 100644 index 00000000000..281f6e0b8ec --- /dev/null +++ b/pkgs/development/libraries/qt-5/modules/qtgamepad.nix @@ -0,0 +1,9 @@ +{ qtModule, qtbase, qtdeclarative, pkgconfig }: + +qtModule { + name = "qtgamepad"; + qtInputs = [ qtbase qtdeclarative ]; + buildInputs = [ ]; + nativeBuildInputs = [ pkgconfig ]; + outputs = [ "out" "dev" "bin" ]; +} -- cgit v1.2.3 From 415e3ec512edabe1d71b818f3d2a49b1888fa6c7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 15 May 2020 00:00:00 -0500 Subject: gitAndTools.git-absorb: 0.5.0 -> 0.6.0 --- .../git-and-tools/git-absorb/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix index 3f5cbad4c12..d476b896601 100644 --- a/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix @@ -1,19 +1,25 @@ -{ stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }: +{ stdenv, fetchFromGitHub, rustPlatform, installShellFiles, libiconv, Security }: rustPlatform.buildRustPackage rec { pname = "git-absorb"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "tummychow"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "0lggv3knh6iglkh8x2zqvqcs3dlwfsdiclg7pmdrycny72la4k2j"; + sha256 = "1da6h9hf98dnnqw9jpnj1x2gr7psmsa8219gpamylfg1ifk28rkr"; }; + nativeBuildInputs = [ installShellFiles ]; + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; - cargoSha256 = "13gikjswbb0kkpvb5zhj88qq5l667624gkfb7hd3zygh4qyhsy05"; + cargoSha256 = "1ba43m5ndyj4hwwfyg0c2hwv3ad7kzhrr7cvymsgaj2dxl7bif4w"; + + postInstall = '' + installManPage Documentation/git-absorb.1 + ''; meta = with stdenv.lib; { homepage = "https://github.com/tummychow/git-absorb"; -- cgit v1.2.3 From 762efd1987653472e4b087c97cf47ca93c1c1af3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 9 May 2020 11:33:58 +0000 Subject: python27Packages.plexapi: 3.2.0 -> 3.4.0 --- pkgs/development/python-modules/plexapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plexapi/default.nix b/pkgs/development/python-modules/plexapi/default.nix index ed95de9ffde..a387bc06114 100644 --- a/pkgs/development/python-modules/plexapi/default.nix +++ b/pkgs/development/python-modules/plexapi/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "PlexAPI"; - version = "3.2.0"; + version = "3.4.0"; src = fetchFromGitHub { owner = "pkkid"; repo = "python-plexapi"; rev = version; - sha256 = "1rzy018zcsws56mcghnphhzwj650pwj7qg6nh9z1kjvgwwjfmghf"; + sha256 = "1y6mynsvkm9n2n927x8az9ch4blrjja7im9x7iyfrxahqgz0km77"; }; propagatedBuildInputs = [ requests tqdm websocket_client ]; -- cgit v1.2.3 From 23be01d6abcd979a2e24b1f34e4227b1c8442b39 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 9 May 2020 03:23:46 +0000 Subject: python27Packages.kafka-python: 1.4.7 -> 2.0.1 --- pkgs/development/python-modules/kafka-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/kafka-python/default.nix b/pkgs/development/python-modules/kafka-python/default.nix index 953a5895034..1c85fbd29af 100644 --- a/pkgs/development/python-modules/kafka-python/default.nix +++ b/pkgs/development/python-modules/kafka-python/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, pytest, six, mock }: buildPythonPackage rec { - version = "1.4.7"; + version = "2.0.1"; pname = "kafka-python"; src = fetchPypi { inherit pname version; - sha256 = "2f29baad4b3efe05a2bb81ac268855aa01cbc68397f15bac77b494ffd7e2cada"; + sha256 = "1y7ny81rihnhc8lj921d76ir4kf4aj5iy35szgim8zccxhnx96p5"; }; checkInputs = [ pytest six mock ]; -- cgit v1.2.3 From f89cfee2309c43b77ce0e85a00776b074fbcea6e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 9 May 2020 06:28:31 +0000 Subject: python27Packages.evdev: 1.2.0 -> 1.3.0 --- pkgs/development/python-modules/evdev/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/evdev/default.nix b/pkgs/development/python-modules/evdev/default.nix index ab169fe679d..305ada89552 100644 --- a/pkgs/development/python-modules/evdev/default.nix +++ b/pkgs/development/python-modules/evdev/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "evdev"; - version = "1.2.0"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "b03f5e1be5b4a5327494a981b831d251a142b09e8778eda1a8b53eba91100166"; + sha256 = "0kb3636yaw9l8xi8s184w0r0n9ic5dw3b8hx048jf9fpzss4kimi"; }; buildInputs = [ linuxHeaders ]; -- cgit v1.2.3 From f6bfb371cba2b5a02f200c2747c1fe2c72bd782f Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 8 May 2020 18:56:11 +0000 Subject: python27Packages.bids-validator: 1.3.12 -> 1.5.1 --- pkgs/development/python-modules/bids-validator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bids-validator/default.nix b/pkgs/development/python-modules/bids-validator/default.nix index 6b7bad58bc4..56a941e60e0 100644 --- a/pkgs/development/python-modules/bids-validator/default.nix +++ b/pkgs/development/python-modules/bids-validator/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.3.12"; + version = "1.5.1"; pname = "bids-validator"; src = fetchPypi { inherit pname version; - sha256 = "7a244b09adfd083292ed1f7ff335676a1e2effbbffe62b02a4abaf377d33ef86"; + sha256 = "1fy8w56m0x546zjk3is1xp83jm19fkn4y15g5jgmq29sfzc8n3y3"; }; propagatedBuildInputs = [ ]; -- cgit v1.2.3 From b96a4dcc6079e9c7ea94f9f06b7399a4e10a9e05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 9 May 2020 17:24:59 +0100 Subject: uwsgi: make instance configuration deeply mergeable allows to specify independent uwsgi instances in two modules. --- nixos/modules/services/web-servers/uwsgi.nix | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/uwsgi.nix b/nixos/modules/services/web-servers/uwsgi.nix index 4b74c329e3d..936e211ec71 100644 --- a/nixos/modules/services/web-servers/uwsgi.nix +++ b/nixos/modules/services/web-servers/uwsgi.nix @@ -79,7 +79,25 @@ in { }; instance = mkOption { - type = types.attrs; + type = with lib.types; let + valueType = nullOr (oneOf [ + bool + int + float + str + (lazyAttrsOf valueType) + (listOf valueType) + (mkOptionType { + name = "function"; + description = "function"; + check = x: isFunction x; + merge = mergeOneOption; + }) + ]) // { + description = "Json value or lambda"; + emptyValue.value = {}; + }; + in valueType; default = { type = "normal"; }; -- cgit v1.2.3 From 0a4f1bc7f7549e1fd148afc17003507d15c40dc2 Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Fri, 15 May 2020 10:39:50 +0200 Subject: Sylk: 2.7.0 -> 2.7.2 --- pkgs/applications/networking/Sylk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/Sylk/default.nix b/pkgs/applications/networking/Sylk/default.nix index 7079e3afa9a..425f4fcf2ff 100644 --- a/pkgs/applications/networking/Sylk/default.nix +++ b/pkgs/applications/networking/Sylk/default.nix @@ -2,7 +2,7 @@ let pname = "Sylk"; - version = "2.7.0"; + version = "2.7.2"; in appimageTools.wrapType2 rec { @@ -10,7 +10,7 @@ appimageTools.wrapType2 rec { src = fetchurl { url = "http://download.ag-projects.com/Sylk/Sylk-${version}-x86_64.AppImage"; - hash = "sha256:0xjg9j69yj06ys8229x6mwsjlk3mvxi8gnr2kymx0vhhg1zvqi1k"; + hash = "sha256:1hz41jan8hw56ahpaajlb1yy5zjkyxrclzmqhklm5x59b76pd0zx"; }; profile = '' -- cgit v1.2.3 From ad17c01f932d20e01248a0473ca58b4b32d6f802 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Fri, 15 May 2020 01:32:27 -0400 Subject: go-ethereum: 1.9.13 -> 1.9.14 --- pkgs/applications/blockchains/go-ethereum.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index 15583d0a1ef..690731fa120 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-ethereum"; - version = "1.9.13"; + version = "1.9.14"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "1yqqflp73yvjy6bp05xd1nv5fc6p1nx7g4spbssxf3ws96pdh425"; + sha256 = "0vqsx4q7jn6vhmrm9kkk810d5nvnmyb6bni38ynkxcwlrp3qs6v2"; }; usb = fetchFromGitHub { @@ -18,7 +18,7 @@ buildGoModule rec { sha256 = "0asd5fz2rhzkjmd8wjgmla5qmqyz4jaa6qf0n2ycia16jsck6wc2"; }; - vendorSha256 = "12aw8b8ci7nssidh1yz8d2hk43csdacq5jca9y70rjakpl3zndsz"; + vendorSha256 = "01mbmc8qlp08127dlmcqz0viasmg7mrzqzmyw21an69sabcr112n"; overrideModAttrs = (_: { postBuild = '' -- cgit v1.2.3 From 3c4b40300bb38c9994f640f24d8cb421a9236d1b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 15 May 2020 04:20:00 -0500 Subject: shadowsocks-rust: 1.7.2 -> 1.8.11 --- pkgs/tools/networking/shadowsocks-rust/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index 36f6b584959..ba90a7cacb7 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -2,24 +2,23 @@ rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.7.2"; + version = "1.8.11"; src = fetchFromGitHub { rev = "v${version}"; owner = "shadowsocks"; repo = pname; - sha256 = "0w7ysha46ml3j1i1knvll4pmqg291z8a2ypcy650m61dhrvkh2ng"; + sha256 = "0imnvx3v0msk9qf72zy1qg5q52dmc8xfs9iwdwa2q13scjslgmwn"; }; - cargoSha256 = "0srmn8ndy7vdvcysyb7a5pjly0m3jchq0zrqzhrwicynm291w56h"; + cargoSha256 = "1aqqx0pdq3vp5c06pjwsrbrqfkz5dhxnpvv3vnr3pqfm62xrffgg"; + + SODIUM_USE_PKG_CONFIG = 1; buildInputs = [ openssl libsodium ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; nativeBuildInputs = [ pkgconfig ]; - # tries to read /etc/resolv.conf, hence fails in sandbox - doCheck = false; - meta = with stdenv.lib; { homepage = "https://github.com/shadowsocks/shadowsocks-rust"; description = "A Rust port of shadowsocks"; -- cgit v1.2.3 From 24a6c81291769b5e218cd9c9f07f2e16ca16bcc1 Mon Sep 17 00:00:00 2001 From: Henry Date: Fri, 15 May 2020 11:33:55 +0200 Subject: gopls: 0.4.0 -> 0.4.1 --- pkgs/development/tools/gopls/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/gopls/default.nix b/pkgs/development/tools/gopls/default.nix index 9591c641516..a77f9fa8ddd 100644 --- a/pkgs/development/tools/gopls/default.nix +++ b/pkgs/development/tools/gopls/default.nix @@ -2,17 +2,16 @@ buildGoModule rec { pname = "gopls"; - version = "0.4.0"; - rev = "72e4a01eba4315301fd9ce00c8c2f492580ded8a"; + version = "0.4.1"; src = fetchgit { rev = "gopls/v${version}"; url = "https://go.googlesource.com/tools"; - sha256 = "1sn6f638hgqpyd8rfyal3y6i6p21x4340jnhsvmgcd8lph49pplb"; + sha256 = "18migk7arxm8ysfzidl7mdr069fxym9bfi6zisj7dliczw0qnkzv"; }; modRoot = "gopls"; - vendorSha256 = "1zj0zpyl9wq23vks426vqg5xjwjcaj1079rkc67489h0p7y0aqv5"; + vendorSha256 = "1jaav6c5vybgks5hc164is0i7h097c5l75s7w3wi5a3zyzkbiyny"; meta = with stdenv.lib; { description = "Official language server for the Go language"; -- cgit v1.2.3 From 730133e130a03f074b489b13ee2a3f3df8197b2f Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 15 May 2020 10:15:14 +0100 Subject: darktable: Remove doc directory from output It puts very generic file names in the store like `$out/share/doc/README.md` which has a high risk of collisions. --- pkgs/applications/graphics/darktable/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index 948b4ddd54d..b021c186b5c 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { "-DUSE_KWALLET=OFF" ]; + # Reduce the risk of collisions + postInstall = "rm -r $out/share/doc"; # darktable changed its rpath handling in commit # 83c70b876af6484506901e6b381304ae0d073d3c and as a result the -- cgit v1.2.3 From 8f475b0470dbf4f84a7a1598e6640c761495ed6c Mon Sep 17 00:00:00 2001 From: Pascal Winkelmann Date: Fri, 15 May 2020 10:42:45 +0200 Subject: jugglinglab: init at 1.2 --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/tools/misc/jugglinglab/default.nix | 30 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 38 insertions(+) create mode 100644 pkgs/tools/misc/jugglinglab/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index cc2ea541d69..fda8fd8d204 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8301,6 +8301,12 @@ githubId = 54934; name = "Wout Mertens"; }; + wnklmnn = { + email = "pascal@wnklmnn.de"; + github = "wnklmnn"; + githubId = 9423014; + name = "Pascal Winkelmann"; + }; woffs = { email = "github@woffs.de"; github = "woffs"; diff --git a/pkgs/tools/misc/jugglinglab/default.nix b/pkgs/tools/misc/jugglinglab/default.nix new file mode 100644 index 00000000000..6ef3a39353d --- /dev/null +++ b/pkgs/tools/misc/jugglinglab/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchgit, jre, makeWrapper, ant, jdk }: +stdenv.mkDerivation rec { + major= "1"; + minor = "2"; + version = "${major}.${minor}"; + name = "jugglinglab"; + src = fetchgit { + url = "https://github.com/jkboyce/jugglinglab"; + rev = "v${major}.${minor}"; + sha256 = "1p62kb9hfch7pi4way18c5mgky4xbxcrfgrw0hd25sd6cpr88z92"; + }; + buildInputs = [ jre ]; + nativeBuildInputs = [ ant jdk makeWrapper ]; + buildPhase = "ant"; + + installPhase = '' + mkdir -p "$out/bin" + mkdir -p "$out/lib" + cp bin/JugglingLab.jar $out/lib/ + + makeWrapper ${jre}/bin/java $out/bin/jugglinglab \ + --add-flags "-jar $out/lib/JugglingLab.jar" + ''; + + meta = with stdenv.lib; { + description = "A program to visualize different juggling pattens"; + license = licenses.gpl2; + maintainers = with maintainers; [ wnklmnn ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0db4b476682..21b192ff3f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7204,6 +7204,8 @@ in umlet = callPackage ../tools/misc/umlet { }; + jugglinglab = callPackage ../tools/misc/jugglinglab { }; + unetbootin = callPackage ../tools/cd-dvd/unetbootin { }; unfs3 = callPackage ../servers/unfs3 { }; -- cgit v1.2.3 From 9774e87ef152857aa7aad95f31879abab9082782 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 15 May 2020 12:21:38 +0200 Subject: python.pkgs.latexcodec: run tests --- pkgs/development/python-modules/latexcodec/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/latexcodec/default.nix b/pkgs/development/python-modules/latexcodec/default.nix index 25a266b3dc2..3514d5da9a2 100644 --- a/pkgs/development/python-modules/latexcodec/default.nix +++ b/pkgs/development/python-modules/latexcodec/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, six }: +{ stdenv, buildPythonPackage, fetchPypi, six, pytest }: buildPythonPackage rec { pname = "latexcodec"; @@ -11,6 +11,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ six ]; + checkInputs = [ pytest ]; + + checkPhase = '' + pytest + ''; + meta = { homepage = "https://github.com/mcmtroffaes/latexcodec"; description = "Lexer and codec to work with LaTeX code in Python"; -- cgit v1.2.3 From 5d362c2335eee327aab027625b0095bf2d87468c Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 15 May 2020 13:47:00 +0200 Subject: fly: use completion generator There's no need to ship the pre-generated completions in the nixpkgs tree anymore. --- .../development/tools/continuous-integration/fly/default.nix | 12 +++++------- pkgs/development/tools/continuous-integration/fly/fly.bash | 10 ---------- 2 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 pkgs/development/tools/continuous-integration/fly/fly.bash diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index 216121c8bd3..bea8c490851 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -1,4 +1,4 @@ -{ buildGoModule, fetchFromGitHub, lib, writeText }: +{ buildGoModule, fetchFromGitHub, stdenv, lib, writeText }: buildGoModule rec { pname = "fly"; @@ -20,12 +20,10 @@ buildGoModule rec { -X github.com/concourse/concourse.Version=${version} ''; - # The fly.bash file included with this derivation can be replaced by a - # call to `fly completion bash` once the `completion` subcommand has - # made it into a release. Similarly, `fly completion zsh` will provide - # zsh completions. https://github.com/concourse/concourse/pull/4012 - postInstall = '' - install -D -m 444 ${./fly.bash} $out/share/bash-completion/completions/fly + postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' + mkdir -p $out/share/{bash-completion/completions,zsh/site-functions} + $out/bin/fly completion --shell bash > $out/share/bash-completion/completions/fly + $out/bin/fly completion --shell zsh > $out/share/zsh/site-functions/_fly ''; meta = with lib; { diff --git a/pkgs/development/tools/continuous-integration/fly/fly.bash b/pkgs/development/tools/continuous-integration/fly/fly.bash deleted file mode 100644 index a9acc5f70a4..00000000000 --- a/pkgs/development/tools/continuous-integration/fly/fly.bash +++ /dev/null @@ -1,10 +0,0 @@ -# credits: -# https://godoc.org/github.com/jessevdk/go-flags#hdr-Completion -# https://github.com/concourse/concourse/issues/1309#issuecomment-452893900 -_fly_compl() { - args=("${COMP_WORDS[@]:1:$COMP_CWORD}") - local IFS=$'\n' - COMPREPLY=($(GO_FLAGS_COMPLETION=1 ${COMP_WORDS[0]} "${args[@]}")) - return 0 -} -complete -F _fly_compl fly -- cgit v1.2.3 From 0682ec40c68bf86fc002b56395e68dd5fe754738 Mon Sep 17 00:00:00 2001 From: Eduard Bopp Date: Thu, 14 May 2020 11:23:36 +0200 Subject: =?UTF-8?q?alot:=200.9=20=E2=86=92=200.9.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dropped the patch, as it is included in the point release. Switched the hash representation to regular base32. --- pkgs/development/python-modules/alot/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix index d15d1ea0110..71ad0c85fcb 100644 --- a/pkgs/development/python-modules/alot/default.nix +++ b/pkgs/development/python-modules/alot/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "alot"; - version = "0.9"; + version = "0.9.1"; outputs = [ "out" ] ++ lib.optional withManpage "man"; disabled = !isPy3k; @@ -16,18 +16,9 @@ buildPythonPackage rec { owner = "pazz"; repo = "alot"; rev = version; - sha256 = "sha256-WUwOJcq8JE7YO8sFeZwYikCRhpufO0pL6MKu54ZYsHI="; + sha256 = "0s94m17yph1gq9f2svipb3bbwbw1s4j3zf2xkg5h91006v8286r6"; }; - patches = [ - # can't compose email if signature is set: https://github.com/pazz/alot/issues/1468 - (fetchpatch { - name = "envelope-body.patch"; - url = "https://github.com/pazz/alot/commit/28a4296c7f556c251d71d9502681980d46d9fa55.patch"; - sha256 = "1iwvmjyz4mh1g08vr85ywhah2xarcqg8dazagygk19icgsn45w06"; - }) - ]; - nativeBuildInputs = lib.optional withManpage sphinx; propagatedBuildInputs = [ -- cgit v1.2.3 From 136aebc2e17d3fdc0d373b1265b9907b2e21f710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 15 May 2020 12:39:39 +0200 Subject: python.pkgs.sphinxcontrib-bibtex: disable python2 Support dropped in https://github.com/mcmtroffaes/sphinxcontrib-bibtex/commit/efa4e66b5a7e4c760ce37b00296c21a41f31eca1. --- pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix index 36fb29fde59..bc9a90efcf2 100644 --- a/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi +{ stdenv, buildPythonPackage, fetchPypi, isPy3k , oset, pybtex, pybtex-docutils, sphinx }: @@ -6,6 +6,8 @@ buildPythonPackage rec { version = "1.0.0"; pname = "sphinxcontrib-bibtex"; + disabled = !isPy3k; + src = fetchPypi { inherit pname version; sha256 = "629612b001f86784669d65e662377a482052decfd9a0a17c46860878eef7b9e0"; -- cgit v1.2.3 From c5629543267254aa0f6489566256d89b4aaa6078 Mon Sep 17 00:00:00 2001 From: Eduard Bopp Date: Fri, 15 May 2020 14:05:03 +0200 Subject: alot: replace geistesk as maintainer As requested by geistesk here: https://github.com/NixOS/nixpkgs/pull/87803#issuecomment-628711513 --- pkgs/development/python-modules/alot/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/alot/default.nix b/pkgs/development/python-modules/alot/default.nix index 71ad0c85fcb..a2012132024 100644 --- a/pkgs/development/python-modules/alot/default.nix +++ b/pkgs/development/python-modules/alot/default.nix @@ -61,6 +61,6 @@ buildPythonPackage rec { description = "Terminal MUA using notmuch mail"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ geistesk ]; + maintainers = with maintainers; [ aepsil0n ]; }; } -- cgit v1.2.3 From b0df5a6816b644c2e0b6ebcde6ad0784b07205e0 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 15 May 2020 14:00:58 +0200 Subject: signal-desktop: 1.33.4 -> 1.34.0 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 4a751bac4ac..be9cdbecc0b 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -23,7 +23,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.33.4"; # Please backport all updates to the stable channel. + version = "1.34.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0mcxia2zaflaazfdl1ngpab0dyhwwzbhad7brc6kwhjxydbnmwcd"; + sha256 = "175iir85qlign5ns8wk4x4mf7xw8sriq8jyj61n76is79jjk7b3d"; }; nativeBuildInputs = [ -- cgit v1.2.3 From 44c053349758fff67f67dbc61f2bb27968c1135e Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 15 May 2020 13:51:31 +0200 Subject: fly: 6.0.0 -> 6.1.0 --- pkgs/development/tools/continuous-integration/fly/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index bea8c490851..3bf48084bbd 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fly"; - version = "6.0.0"; + version = "6.1.0"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "0chavwymyh5kv4fkvdjvf3p5jjx4yn9aavq66333xnsl5pn7q9dq"; + sha256 = "14sm3xwhm6pfln18i9f9dyj7s2wcri43rxj4s1cja7nwqr5sqb3x"; }; - vendorSha256 = "127mc1wzqhn0l4ni6qxcx06qfdb1cgahzypjrs4vgr6i4sipjxck"; + vendorSha256 = "1c099sn5rrvj805va1lyjlbv7i2g1z5bxyaisv5l9365z0lv1cwm"; subPackages = [ "fly" ]; @@ -32,4 +32,4 @@ buildGoModule rec { license = licenses.asl20; maintainers = with maintainers; [ ivanbrennan ]; }; -} \ No newline at end of file +} -- cgit v1.2.3 From b94e8cc448e1c834b42bf0704748981833ef1a72 Mon Sep 17 00:00:00 2001 From: Pascal Winkelmann Date: Fri, 15 May 2020 16:03:26 +0200 Subject: incorporate suggested changes from pull request --- pkgs/tools/misc/jugglinglab/default.nix | 16 ++++++++-------- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/misc/jugglinglab/default.nix b/pkgs/tools/misc/jugglinglab/default.nix index 6ef3a39353d..32c45b31a17 100644 --- a/pkgs/tools/misc/jugglinglab/default.nix +++ b/pkgs/tools/misc/jugglinglab/default.nix @@ -1,13 +1,12 @@ -{ stdenv, fetchgit, jre, makeWrapper, ant, jdk }: +{ stdenv, fetchFromGitHub, jre, makeWrapper, ant, jdk }: stdenv.mkDerivation rec { - major= "1"; - minor = "2"; - version = "${major}.${minor}"; + version = "1.2.1"; name = "jugglinglab"; - src = fetchgit { - url = "https://github.com/jkboyce/jugglinglab"; - rev = "v${major}.${minor}"; - sha256 = "1p62kb9hfch7pi4way18c5mgky4xbxcrfgrw0hd25sd6cpr88z92"; + src = fetchFromGitHub { + owner = "jkboyce"; + repo = "jugglinglab"; + rev = "1908012682d8c39a9b92248a20f285455104c510"; # v1.2.1 does not have a tag on Github + sha256 = "0dvcyjwynvapqbjchrln59vdskrm3w6kh0knxcn4bx61vcz3171z"; }; buildInputs = [ jre ]; nativeBuildInputs = [ ant jdk makeWrapper ]; @@ -26,5 +25,6 @@ stdenv.mkDerivation rec { description = "A program to visualize different juggling pattens"; license = licenses.gpl2; maintainers = with maintainers; [ wnklmnn ]; + platforms = platforms.all; }; } \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 21b192ff3f9..3331594eeb0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4468,6 +4468,8 @@ in jucipp = callPackage ../applications/editors/jucipp { }; + jugglinglab = callPackage ../tools/misc/jugglinglab { }; + jupp = callPackage ../applications/editors/jupp { }; jupyter = callPackage ../applications/editors/jupyter { }; @@ -7204,8 +7206,6 @@ in umlet = callPackage ../tools/misc/umlet { }; - jugglinglab = callPackage ../tools/misc/jugglinglab { }; - unetbootin = callPackage ../tools/cd-dvd/unetbootin { }; unfs3 = callPackage ../servers/unfs3 { }; -- cgit v1.2.3 From 7ac738273dc7f112c80c7faa9638d7494cc88338 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 15 May 2020 16:13:34 +0200 Subject: lsp-plugins: Fix build /build/source/include/metadata/modules.h:122:1: note: in expansion of macro 'MOD_PLUGIN' 122 | MOD_PLUGIN(slap_delay_mono, plugin_ui) | ^~~~~~~~~~ lv2.cpp:414:43: error: invalid conversion from 'void* (*)(const lsp::_LV2UI_Descriptor*, const char*, const char*, LV2UI_Write_Function, LV2UI_Controller, void**, const LV2_Feature* const*)' {aka 'void* (*)(const lsp::_LV2UI_Descriptor*, const char*, const char*, void (*)(void*, unsigned int, unsigned int, unsigned int, const void*), void*, void**, const LV2_Feature* const*)'} to 'void* (*)(const LV2UI_Descriptor*, const char*, const char*, LV2UI_Write_Function, LV2UI_Controller, void**, const LV2_Feature* const*)' {aka 'void* (*)(const LV2UI_Descriptor*, const char*, const char*, void (*)(void*, unsigned int, unsigned int, unsigned int, const void*), void*, void**, const LV2_Feature* const*)'} [-fpermissive] 414 | d->instantiate = lv2ui_instantiate; \ | ^~~~~~~~~~~~~~~~~ | | | void* (*)(const lsp::_LV2UI_Descriptor*, const char*, const char*, LV2UI_Write_Function, LV2UI_Controller, void**, const LV2_Feature* const*) {aka void* (*)(const lsp::_LV2UI_Descriptor*, const char*, const char*, void (*)(void*, unsigned int, unsigned int, unsigned int, const void*), void*, void**, const LV2_Feature* const*)} --- pkgs/applications/audio/lsp-plugins/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index d530aff9faa..218c2bdac74 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, makeWrapper +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, makeWrapper , libsndfile, jack2Full , libGLU, libGL, lv2, cairo , ladspaH, php }: @@ -14,6 +14,16 @@ stdenv.mkDerivation rec { sha256 = "1wiph3vxhydc6mr9hn2c6crd4cx592l2zv0wrzgmpnlm1lflzpbg"; }; + patches = [ + # Fix build + # https://github.com/sadko4u/lsp-plugins/issues/104 + (fetchpatch { + url = "https://github.com/sadko4u/lsp-plugins/commit/4d901135fb82fa95e668b4d55d05e405f5e620d2.patch"; + excludes = [ "TODO.txt" ]; + sha256 = "wR2B6XnDXT2BGwmrsL72PH/BM1e9d9JvqHxDtfFDAug="; + }) + ]; + nativeBuildInputs = [ pkgconfig php makeWrapper ]; buildInputs = [ jack2Full libsndfile libGLU libGL lv2 cairo ladspaH ]; -- cgit v1.2.3 From 48c4f434fa3b05331ac4fe6f43941d9025df512c Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Fri, 15 May 2020 11:22:25 -0400 Subject: starship: 0.41.1 -> 0.41.3 --- pkgs/tools/misc/starship/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/starship/default.nix b/pkgs/tools/misc/starship/default.nix index c1fd2fedde7..d6ff65adb4c 100644 --- a/pkgs/tools/misc/starship/default.nix +++ b/pkgs/tools/misc/starship/default.nix @@ -3,13 +3,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.41.1"; + version = "0.41.3"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "0q41f1zj27vz5sg7harmk9zvmyc37w8hr5f74ipws438wz27qwm3"; + sha256 = "0f3d95abivbmjqdzw9pbdbis96sfds26xv3k8k9skxml8iqzq29c"; }; nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { --replace "/bin/echo" "echo" ''; - cargoSha256 = "1i6d2vsgcjclk0r6j5lmynk5m0my2yphn0q9rm53s43n1vyf2g2v"; + cargoSha256 = "10h0arvl3gf5hg530d24ypj4yzk3zhm8mgkhz0v61y0jcdy2zdrm"; checkPhase = "cargo test -- --skip directory::home_directory --skip directory::directory_in_root"; meta = with stdenv.lib; { -- cgit v1.2.3 From 751729914624e57888e85e6e178fc258db004d9a Mon Sep 17 00:00:00 2001 From: Lila Date: Fri, 15 May 2020 17:58:27 +0200 Subject: treewide: fix broken AlpineLinux repo links (#87892) --- pkgs/applications/misc/xterm/default.nix | 2 +- pkgs/development/libraries/gamin/default.nix | 2 +- pkgs/development/libraries/libexecinfo/default.nix | 6 +++--- pkgs/os-specific/linux/apparmor/default.nix | 4 ++-- pkgs/os-specific/linux/lvm2/default.nix | 6 +++--- pkgs/os-specific/linux/musl/default.nix | 4 ++-- pkgs/os-specific/linux/pam/default.nix | 4 ++-- pkgs/os-specific/linux/powertop/default.nix | 2 +- pkgs/servers/monitoring/net-snmp/default.nix | 2 +- pkgs/shells/tcsh/default.nix | 2 +- pkgs/tools/misc/figlet/default.nix | 2 +- pkgs/tools/networking/vde2/default.nix | 2 +- 12 files changed, 19 insertions(+), 19 deletions(-) diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix index f6837b692b1..109444fc518 100644 --- a/pkgs/applications/misc/xterm/default.nix +++ b/pkgs/applications/misc/xterm/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { name = "posix-ptys.patch"; - url = "https://git.alpinelinux.org/cgit/aports/plain/community/xterm/posix-ptys.patch?id=3aa532e77875fa1db18c7fcb938b16647031bcc1"; + url = "https://git.alpinelinux.org/aports/plain/community/xterm/posix-ptys.patch?id=3aa532e77875fa1db18c7fcb938b16647031bcc1"; sha256 = "0czgnsxkkmkrk1idw69qxbprh0jb4sw3c24zpnqq2v76jkl7zvlr"; }); diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix index b1be17abf37..38451571d8b 100644 --- a/pkgs/development/libraries/gamin/default.nix +++ b/pkgs/development/libraries/gamin/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (rec { ++ stdenv.lib.optional stdenv.cc.isClang ./returnval.patch ++ stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { name = "fix-pthread-mutex.patch"; - url = "https://git.alpinelinux.org/cgit/aports/plain/main/gamin/fix-pthread-mutex.patch?h=3.4-stable&id=a1a836b089573752c1b0da7d144c0948b04e8ea8"; + url = "https://git.alpinelinux.org/aports/plain/main/gamin/fix-pthread-mutex.patch?h=3.4-stable&id=a1a836b089573752c1b0da7d144c0948b04e8ea8"; sha256 = "13igdbqsxb3sz0h417k6ifmq2n4siwqspj6slhc7fdl5wd1fxmdz"; }); diff --git a/pkgs/development/libraries/libexecinfo/default.nix b/pkgs/development/libraries/libexecinfo/default.nix index cc1c4b48e78..147b213735d 100644 --- a/pkgs/development/libraries/libexecinfo/default.nix +++ b/pkgs/development/libraries/libexecinfo/default.nix @@ -12,17 +12,17 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { name = "10-execinfo.patch"; - url = "https://git.alpinelinux.org/cgit/aports/plain/main/libexecinfo/10-execinfo.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1"; + url = "https://git.alpinelinux.org/aports/plain/main/libexecinfo/10-execinfo.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1"; sha256 = "0lnphrad4vspyljnvmm62dyxj98vgp3wabj4w3vfzfph7j8piw7g"; }) (fetchpatch { name = "20-define-gnu-source.patch"; - url = "https://git.alpinelinux.org/cgit/aports/plain/main/libexecinfo/20-define-gnu-source.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1"; + url = "https://git.alpinelinux.org/aports/plain/main/libexecinfo/20-define-gnu-source.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1"; sha256 = "1mp8mc639b0h2s69m5z6s2h3q3n1zl298j9j0plzj7f979j76302"; }) (fetchpatch { name = "30-linux-makefile.patch"; - url = "https://git.alpinelinux.org/cgit/aports/plain/main/libexecinfo/30-linux-makefile.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1"; + url = "https://git.alpinelinux.org/aports/plain/main/libexecinfo/30-linux-makefile.patch?id=730cdcef6901750f4029d4c3b8639ce02ee3ead1"; sha256 = "1jwjz22z5cjy5h2bfghn62yl9ar8jiqhdvbwrcfavv17ihbhwcaf"; }) ]; diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index d661b2172b3..afb6799fbaf 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -39,12 +39,12 @@ let patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ (fetchpatch { - url = "https://git.alpinelinux.org/cgit/aports/plain/testing/apparmor/0003-Added-missing-typedef-definitions-on-parser.patch?id=74b8427cc21f04e32030d047ae92caa618105b53"; + url = "https://git.alpinelinux.org/aports/plain/testing/apparmor/0003-Added-missing-typedef-definitions-on-parser.patch?id=74b8427cc21f04e32030d047ae92caa618105b53"; name = "0003-Added-missing-typedef-definitions-on-parser.patch"; sha256 = "0yyaqz8jlmn1bm37arggprqz0njb4lhjni2d9c8qfqj0kll0bam0"; }) (fetchpatch { - url = "https://git.alpinelinux.org/cgit/aports/plain/testing/apparmor/0007-Do-not-build-install-vim-file-with-utils-package.patch?id=74b8427cc21f04e32030d047ae92caa618105b53"; + url = "https://git.alpinelinux.org/aports/plain/testing/apparmor/0007-Do-not-build-install-vim-file-with-utils-package.patch?id=74b8427cc21f04e32030d047ae92caa618105b53"; name = "0007-Do-not-build-install-vim-file-with-utils-package.patch"; sha256 = "1m4dx901biqgnr4w4wz8a2z9r9dxyw7wv6m6mqglqwf2lxinqmp4"; }) diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index c7925bae558..8db4be94e4e 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -47,17 +47,17 @@ stdenv.mkDerivation { patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ (fetchpatch { name = "fix-stdio-usage.patch"; - url = "https://git.alpinelinux.org/cgit/aports/plain/main/lvm2/fix-stdio-usage.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; + url = "https://git.alpinelinux.org/aports/plain/main/lvm2/fix-stdio-usage.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; sha256 = "0m6wr6qrvxqi2d2h054cnv974jq1v65lqxy05g1znz946ga73k3p"; }) (fetchpatch { name = "mallinfo.patch"; - url = "https://git.alpinelinux.org/cgit/aports/plain/main/lvm2/mallinfo.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; + url = "https://git.alpinelinux.org/aports/plain/main/lvm2/mallinfo.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; sha256 = "0g6wlqi215i5s30bnbkn8w7axrs27y3bnygbpbnf64wwx7rxxlj0"; }) (fetchpatch { name = "mlockall-default-config.patch"; - url = "https://git.alpinelinux.org/cgit/aports/plain/main/lvm2/mlockall-default-config.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; + url = "https://git.alpinelinux.org/aports/plain/main/lvm2/mlockall-default-config.patch?h=3.7-stable&id=31bd4a8c2dc00ae79a821f6fe0ad2f23e1534f50"; sha256 = "1ivbj3sphgf8n1ykfiv5rbw7s8dgnj5jcr9jl2v8cwf28lkacw5l"; }) ]; diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix index d31a75fbba0..51dcf4cfca3 100644 --- a/pkgs/os-specific/linux/musl/default.nix +++ b/pkgs/os-specific/linux/musl/default.nix @@ -19,10 +19,10 @@ let # iconv tool, implemented by musl author. # Original: http://git.etalabs.net/cgit/noxcuse/plain/src/iconv.c?id=02d288d89683e99fd18fe9f54d4e731a6c474a4f # We use copy from Alpine which fixes error messages, see: - # https://git.alpinelinux.org/cgit/aports/commit/main/musl/iconv.c?id=a3d97e95f766c9c378194ee49361b375f093b26f + # https://git.alpinelinux.org/aports/commit/main/musl/iconv.c?id=a3d97e95f766c9c378194ee49361b375f093b26f iconv_c = fetchurl { name = "iconv.c"; - url = "https://git.alpinelinux.org/cgit/aports/plain/main/musl/iconv.c?id=a3d97e95f766c9c378194ee49361b375f093b26f"; + url = "https://git.alpinelinux.org/aports/plain/main/musl/iconv.c?id=a3d97e95f766c9c378194ee49361b375f093b26f"; sha256 = "1mzxnc2ncq8lw9x6n7p00fvfklc9p3wfv28m68j0dfz5l8q2k6pp"; }; diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 2e44a887d69..fb969d7574a 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optionals (stdenv.hostPlatform.libc == "musl") [ (fetchpatch { - url = "https://git.alpinelinux.org/cgit/aports/plain/main/linux-pam/fix-compat.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc"; + url = "https://git.alpinelinux.org/aports/plain/main/linux-pam/fix-compat.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc"; sha256 = "1h5yp5h2mqp1fcwiwwklyfpa69a3i03ya32pivs60fd7g5bqa7sf"; }) (fetchpatch { - url = "https://git.alpinelinux.org/cgit/aports/plain/main/linux-pam/libpam-fix-build-with-eglibc-2.16.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc"; + url = "https://git.alpinelinux.org/aports/plain/main/linux-pam/libpam-fix-build-with-eglibc-2.16.patch?id=05a62bda8ec255d7049a2bd4cf0fdc4b32bdb2cc"; sha256 = "1ib6shhvgzinjsc603k2x1lxh9dic6qq449fnk110gc359m23j81"; }) # From adelie's package repo, using local copy since it seems to be currently offline. diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index d57b511af34..bcac7ab63c0 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ( fetchpatch { name = "strerror_r.patch"; - url = "https://git.alpinelinux.org/cgit/aports/plain/main/powertop/strerror_r.patch?id=3b9214d436f1611f297b01f72469d66bfe729d6e"; + url = "https://git.alpinelinux.org/aports/plain/main/powertop/strerror_r.patch?id=3b9214d436f1611f297b01f72469d66bfe729d6e"; sha256 = "1kzddhcrb0n2iah4lhgxwwy4mkhq09ch25jjngyq6pdj6pmfkpfw"; } ) ++ [ diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix index 3c8005a16df..160907d58fa 100644 --- a/pkgs/servers/monitoring/net-snmp/default.nix +++ b/pkgs/servers/monitoring/net-snmp/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patches = let fetchAlpinePatch = name: sha256: fetchpatch { - url = "https://git.alpinelinux.org/cgit/aports/plain/main/net-snmp/${name}?id=f25d3fb08341b60b6ccef424399f060dfcf3f1a5"; + url = "https://git.alpinelinux.org/aports/plain/main/net-snmp/${name}?id=f25d3fb08341b60b6ccef424399f060dfcf3f1a5"; inherit name sha256; }; in [ diff --git a/pkgs/shells/tcsh/default.nix b/pkgs/shells/tcsh/default.nix index e22811828fc..87cbf8c59f3 100644 --- a/pkgs/shells/tcsh/default.nix +++ b/pkgs/shells/tcsh/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { patches = stdenv.lib.optional stdenv.hostPlatform.isMusl (fetchpatch { name = "sysmalloc.patch"; - url = "https://git.alpinelinux.org/cgit/aports/plain/community/tcsh/001-sysmalloc.patch?id=184585c046cdd56512f1a76e426dd799b368f8cf"; + url = "https://git.alpinelinux.org/aports/plain/community/tcsh/001-sysmalloc.patch?id=184585c046cdd56512f1a76e426dd799b368f8cf"; sha256 = "1qc6ydxhdfizsbkaxhpn3wib8sfphrw10xnnsxx2prvzg9g2zp67"; }); diff --git a/pkgs/tools/misc/figlet/default.nix b/pkgs/tools/misc/figlet/default.nix index 7f7fc6f4e08..90fb0981fbd 100644 --- a/pkgs/tools/misc/figlet/default.nix +++ b/pkgs/tools/misc/figlet/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { patches = [ (fetchpatch { - url = "https://git.alpinelinux.org/cgit/aports/plain/main/figlet/musl-fix-cplusplus-decls.patch?h=3.4-stable&id=71776c73a6f04b6f671430f702bcd40b29d48399"; + url = "https://git.alpinelinux.org/aports/plain/main/figlet/musl-fix-cplusplus-decls.patch?h=3.4-stable&id=71776c73a6f04b6f671430f702bcd40b29d48399"; name = "musl-fix-cplusplus-decls.patch"; sha256 = "1720zgrfk9makznqkbjrnlxm7nnhk6zx7g458fv53337n3g3zn7j"; }) diff --git a/pkgs/tools/networking/vde2/default.nix b/pkgs/tools/networking/vde2/default.nix index be3d1267861..b10ec5c1695 100644 --- a/pkgs/tools/networking/vde2/default.nix +++ b/pkgs/tools/networking/vde2/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }) ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl [ (fetchpatch { - url = "https://git.alpinelinux.org/cgit/aports/plain/main/vde2/musl-build-fix.patch?id=ddee2f86a48e087867d4a2c12849b2e3baccc238"; + url = "https://git.alpinelinux.org/aports/plain/main/vde2/musl-build-fix.patch?id=ddee2f86a48e087867d4a2c12849b2e3baccc238"; sha256 = "0b5382v541bkxhqylilcy34bh83ag96g71f39m070jzvi84kx8af"; }) ]; -- cgit v1.2.3 From 4621fe7889e0f81eba5d91367a5d796ca6e08001 Mon Sep 17 00:00:00 2001 From: jakobrs Date: Fri, 15 May 2020 18:21:34 +0200 Subject: schismtracker: Add x86_64-darwin support --- pkgs/applications/audio/schismtracker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix index 36125489e3a..59f8c82ba02 100644 --- a/pkgs/applications/audio/schismtracker/default.nix +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook python ]; - buildInputs = [ alsaLib SDL ]; + buildInputs = [ SDL ] ++ stdenv.lib.optional stdenv.isLinux alsaLib; meta = with stdenv.lib; { description = "Music tracker application, free reimplementation of Impulse Tracker"; homepage = "http://schismtracker.org/"; license = licenses.gpl2; - platforms = [ "x86_64-linux" "i686-linux" ]; + platforms = [ "x86_64-linux" "i686-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ ftrvxmtrx ]; }; } -- cgit v1.2.3 From 6bbdcdbf129ea07fc65ecde5cf2d68107b9c5af1 Mon Sep 17 00:00:00 2001 From: jakobrs Date: Fri, 15 May 2020 18:23:16 +0200 Subject: schismtracker: 20190805 -> 20200412 --- pkgs/applications/audio/schismtracker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix index 36125489e3a..169d6477cdd 100644 --- a/pkgs/applications/audio/schismtracker/default.nix +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "schismtracker"; - version = "20190805"; + version = "20200412"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0qqps20vvn3rgpg8174bjrrm38gqcci2z5z4c1r1vhbccclahgsd"; + sha256 = "1n6cgjiw3vkv7a1h1nki5syyjxjb6icknr9s049w2jrag10bxssn"; }; configureFlags = [ "--enable-dependency-tracking" ]; -- cgit v1.2.3 From e8215cd634fc47b9d8b9ac254fe47467de87f691 Mon Sep 17 00:00:00 2001 From: Matt Huszagh Date: Tue, 12 May 2020 22:24:00 -0700 Subject: colmap: update boost to 1.72 to fix build --- pkgs/applications/science/misc/colmap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/colmap/default.nix b/pkgs/applications/science/misc/colmap/default.nix index 02adb689e20..83dff3e08f1 100644 --- a/pkgs/applications/science/misc/colmap/default.nix +++ b/pkgs/applications/science/misc/colmap/default.nix @@ -1,10 +1,10 @@ -{ mkDerivation, lib, fetchpatch, fetchFromGitHub, cmake, boost, ceres-solver, eigen, +{ mkDerivation, lib, fetchpatch, fetchFromGitHub, cmake, boost17x, ceres-solver, eigen, freeimage, glog, libGLU, glew, qtbase, cudaSupport ? false, cudatoolkit ? null }: assert !cudaSupport || cudatoolkit != null; -let boost_static = boost.override { enableStatic = true; }; +let boost_static = boost17x.override { enableStatic = true; }; in mkDerivation rec { version = "3.5"; -- cgit v1.2.3 From 0666f6277bd0845aae4f4210389b545d59a65b8e Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Fri, 15 May 2020 10:48:14 -0400 Subject: govc: 0.21.0 -> 0.22.1 --- pkgs/tools/virtualization/govc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/govc/default.nix b/pkgs/tools/virtualization/govc/default.nix index 1595af84770..e3329ea13f1 100644 --- a/pkgs/tools/virtualization/govc/default.nix +++ b/pkgs/tools/virtualization/govc/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "govc"; - version = "0.21.0"; + version = "0.22.1"; goPackagePath = "github.com/vmware/govmomi"; @@ -12,7 +12,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "vmware"; repo = "govmomi"; - sha256 = "0mig8w0szxqcii3gihrsm8n8hzziq9l6axc5z32nw9kiy9bi4130"; + sha256 = "1z4am6143jrrls0023flnqgadm1z9p60w09cp1j5pnslm60vvw78"; }; meta = { -- cgit v1.2.3 From 55242c1d67733fed23bc221b4efb38e940a2df34 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Fri, 15 May 2020 07:51:46 +0000 Subject: polybar: 3.4.2 -> 3.4.3 --- pkgs/applications/misc/polybar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/polybar/default.nix b/pkgs/applications/misc/polybar/default.nix index 1fc0162f8d0..a793ee88724 100644 --- a/pkgs/applications/misc/polybar/default.nix +++ b/pkgs/applications/misc/polybar/default.nix @@ -26,13 +26,13 @@ assert i3GapsSupport -> ! i3Support && jsoncpp != null && i3-gaps != null; stdenv.mkDerivation rec { pname = "polybar"; - version = "3.4.2"; + version = "3.4.3"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "1ss4wzy68dpqr5a4m090nn36v8wsp4a7pj6whcxxdrrimgww5r88"; + sha256 = "0fsfh3xv0c0hz10xqzvd01c0p0wvzcnanbyczi45zhaxfrisb39w"; fetchSubmodules = true; }; -- cgit v1.2.3 From 202ded0110b3adbe99f871a462446f0b43203e57 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 14 May 2020 21:21:21 -0500 Subject: go-tools: 2020.1.3 -> 2020.1.4 --- pkgs/development/tools/go-tools/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/go-tools/default.nix b/pkgs/development/tools/go-tools/default.nix index faf2e9938d0..8362d1db02c 100644 --- a/pkgs/development/tools/go-tools/default.nix +++ b/pkgs/development/tools/go-tools/default.nix @@ -5,15 +5,13 @@ buildGoModule rec { pname = "go-tools"; - version = "2020.1.3"; - - excludedPackages = ''\(simple\|ssa\|ssa/ssautil\|lint\|staticcheck\|stylecheck\|unused\)/testdata''; + version = "2020.1.4"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-tools"; rev = version; - sha256 = "0pvi1mzhy6zgx4zfgdypbl4zhvgg11hl5qv7blf2qs0a96j2djhf"; + sha256 = "182j3zzx1bj4j4jiamqn49v9nd3vcrx727f7i9zgcrgmiscvw3mh"; }; vendorSha256 = "0nbbngsphklzhcmqafrw1im2l1vnfcma9sb4vskdpdrsadv5ss5r"; -- cgit v1.2.3 From 6b17638dc6c052a3b2e132959a0f0e2b38f4310c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 15 May 2020 17:29:00 +0200 Subject: glade: rename from gnome3.glade --- .../applications/editors/gnome-builder/default.nix | 3 +- pkgs/desktops/gnome-3/apps/glade/default.nix | 37 ---------------------- pkgs/desktops/gnome-3/default.nix | 4 +-- pkgs/development/libraries/libhandy/default.nix | 4 +-- pkgs/development/tools/glade/default.nix | 37 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 6 files changed, 45 insertions(+), 42 deletions(-) delete mode 100644 pkgs/desktops/gnome-3/apps/glade/default.nix create mode 100644 pkgs/development/tools/glade/default.nix diff --git a/pkgs/applications/editors/gnome-builder/default.nix b/pkgs/applications/editors/gnome-builder/default.nix index c58d12a58f8..3db4e5649a5 100644 --- a/pkgs/applications/editors/gnome-builder/default.nix +++ b/pkgs/applications/editors/gnome-builder/default.nix @@ -9,6 +9,7 @@ , gnome3 , libgit2-glib , gobject-introspection +, glade , gspell , gtk-doc , gtk3 @@ -65,7 +66,7 @@ stdenv.mkDerivation rec { ctags flatpak gnome3.devhelp - gnome3.glade + glade libgit2-glib libpeas libportal diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix deleted file mode 100644 index 23f5410e1ea..00000000000 --- a/pkgs/desktops/gnome-3/apps/glade/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ stdenv, intltool, fetchurl, python3 -, pkgconfig, gtk3, glib, gobject-introspection -, wrapGAppsHook, itstool, libxml2, docbook_xsl -, gnome3, gdk-pixbuf, libxslt, gsettings-desktop-schemas }: - -stdenv.mkDerivation rec { - pname = "glade"; - version = "3.22.2"; - - src = fetchurl { - url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "08bayb1rrpblxf6jhhbw2n3c425w170is4l94pampldl4kmsdvzd"; - }; - - passthru = { - updateScript = gnome3.updateScript { packageName = "glade"; attrPath = "gnome3.glade"; }; - }; - - nativeBuildInputs = [ - pkgconfig intltool itstool wrapGAppsHook docbook_xsl libxslt libxml2 gobject-introspection - ]; - buildInputs = [ - gtk3 glib libxml2 python3 python3.pkgs.pygobject3 - gsettings-desktop-schemas - gdk-pixbuf gnome3.adwaita-icon-theme - ]; - - enableParallelBuilding = true; - - meta = with stdenv.lib; { - homepage = "https://wiki.gnome.org/Apps/Glade"; - description = "User interface designer for GTK applications"; - maintainers = teams.gnome.members; - license = licenses.lgpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix index 9d34fc0f40c..846eefa9fa9 100644 --- a/pkgs/desktops/gnome-3/default.nix +++ b/pkgs/desktops/gnome-3/default.nix @@ -164,8 +164,6 @@ lib.makeScope pkgs.newScope (self: with self; { ghex = callPackage ./apps/ghex { }; - glade = callPackage ./apps/glade { }; - gnome-books = callPackage ./apps/gnome-books { }; gnome-boxes = callPackage ./apps/gnome-boxes { }; @@ -352,6 +350,8 @@ lib.makeScope pkgs.newScope (self: with self; { inherit (pkgs) networkmanagerapplet; # added 2019-12-12 + inherit (pkgs) glade; # added 2020-05-15 + vino = throw "vino is deprecated, use gnome-remote-desktop instead."; # added 2020-03-13 gnome-screensaver = throw "gnome-screensaver is deprecated. If you are using GNOME Flashback, it now has a built-in lock screen. If you are using it elsewhere, you can try xscreenlock or other alternatives."; # added 2020-03-19 diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 2a5ad06455d..25186abb3aa 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitLab, meson, ninja, pkgconfig, gobject-introspection, vala , gtk-doc, docbook_xsl, docbook_xml_dtd_43 -, gtk3, gnome3 +, gtk3, gnome3, glade , dbus, xvfb_run, libxml2 , hicolor-icon-theme }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meson ninja pkgconfig gobject-introspection vala libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 ]; - buildInputs = [ gnome3.gnome-desktop gtk3 gnome3.glade libxml2 ]; + buildInputs = [ gnome3.gnome-desktop gtk3 glade libxml2 ]; checkInputs = [ dbus xvfb_run hicolor-icon-theme ]; mesonFlags = [ diff --git a/pkgs/development/tools/glade/default.nix b/pkgs/development/tools/glade/default.nix new file mode 100644 index 00000000000..504f781f168 --- /dev/null +++ b/pkgs/development/tools/glade/default.nix @@ -0,0 +1,37 @@ +{ stdenv, intltool, fetchurl, python3 +, pkgconfig, gtk3, glib, gobject-introspection +, wrapGAppsHook, itstool, libxml2, docbook_xsl +, gnome3, gdk-pixbuf, libxslt, gsettings-desktop-schemas }: + +stdenv.mkDerivation rec { + pname = "glade"; + version = "3.22.2"; + + src = fetchurl { + url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "08bayb1rrpblxf6jhhbw2n3c425w170is4l94pampldl4kmsdvzd"; + }; + + passthru = { + updateScript = gnome3.updateScript { packageName = "glade"; }; + }; + + nativeBuildInputs = [ + pkgconfig intltool itstool wrapGAppsHook docbook_xsl libxslt libxml2 gobject-introspection + ]; + buildInputs = [ + gtk3 glib libxml2 python3 python3.pkgs.pygobject3 + gsettings-desktop-schemas + gdk-pixbuf gnome3.adwaita-icon-theme + ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "https://wiki.gnome.org/Apps/Glade"; + description = "User interface designer for GTK applications"; + maintainers = teams.gnome.members; + license = licenses.lgpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0db4b476682..3ca119668f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -181,6 +181,8 @@ in deadcode = callPackage ../development/tools/deadcode { }; + glade = callPackage ../development/tools/glade { }; + hobbes = callPackage ../development/tools/hobbes { stdenv = gcc6Stdenv; }; # GCC 6 is latest currently supported. See https://git.io/JvK6M. proto-contrib = callPackage ../development/tools/proto-contrib {}; -- cgit v1.2.3 From fe7e564467acbc1e8b3009fab41c62c4de9f8a04 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 15 May 2020 17:30:40 +0200 Subject: glade: format with nixpkgs-fmt also switch away from dependency aliases and reorder the attributes a bit --- pkgs/development/tools/glade/default.nix | 50 +++++++++++++++++++++++++------- 1 file changed, 39 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/glade/default.nix b/pkgs/development/tools/glade/default.nix index 504f781f168..13b3d8c2362 100644 --- a/pkgs/development/tools/glade/default.nix +++ b/pkgs/development/tools/glade/default.nix @@ -1,7 +1,20 @@ -{ stdenv, intltool, fetchurl, python3 -, pkgconfig, gtk3, glib, gobject-introspection -, wrapGAppsHook, itstool, libxml2, docbook_xsl -, gnome3, gdk-pixbuf, libxslt, gsettings-desktop-schemas }: +{ stdenv +, intltool +, fetchurl +, python3 +, pkg-config +, gtk3 +, glib +, gobject-introspection +, wrapGAppsHook +, itstool +, libxml2 +, docbook-xsl-nons +, gnome3 +, gdk-pixbuf +, libxslt +, gsettings-desktop-schemas +}: stdenv.mkDerivation rec { pname = "glade"; @@ -12,21 +25,36 @@ stdenv.mkDerivation rec { sha256 = "08bayb1rrpblxf6jhhbw2n3c425w170is4l94pampldl4kmsdvzd"; }; - passthru = { - updateScript = gnome3.updateScript { packageName = "glade"; }; - }; - nativeBuildInputs = [ - pkgconfig intltool itstool wrapGAppsHook docbook_xsl libxslt libxml2 gobject-introspection + pkg-config + intltool + itstool + wrapGAppsHook + docbook-xsl-nons + libxslt + libxml2 + gobject-introspection ]; + buildInputs = [ - gtk3 glib libxml2 python3 python3.pkgs.pygobject3 + gtk3 + glib + libxml2 + python3 + python3.pkgs.pygobject3 gsettings-desktop-schemas - gdk-pixbuf gnome3.adwaita-icon-theme + gdk-pixbuf + gnome3.adwaita-icon-theme ]; enableParallelBuilding = true; + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + }; + }; + meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Glade"; description = "User interface designer for GTK applications"; -- cgit v1.2.3 From e20c3296a459b3607de38976e536bac875a5bca7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 15 May 2020 18:29:11 +0200 Subject: =?UTF-8?q?glade:=203.32.2=20=E2=86=92=203.36.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://ftp.gnome.org/pub/GNOME/sources/glade/3.36/glade-3.36.0.news --- pkgs/development/libraries/libhandy/default.nix | 12 +++++++++++- pkgs/development/tools/glade/default.nix | 8 ++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libhandy/default.nix b/pkgs/development/libraries/libhandy/default.nix index 25186abb3aa..28816ab1307 100644 --- a/pkgs/development/libraries/libhandy/default.nix +++ b/pkgs/development/libraries/libhandy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitLab, meson, ninja, pkgconfig, gobject-introspection, vala +{ stdenv, fetchFromGitLab, fetchpatch, meson, ninja, pkgconfig, gobject-introspection, vala , gtk-doc, docbook_xsl, docbook_xml_dtd_43 , gtk3, gnome3, glade , dbus, xvfb_run, libxml2 @@ -20,6 +20,16 @@ stdenv.mkDerivation rec { sha256 = "1y23k623sjkldfrdiwfarpchg5mg58smcy1pkgnwfwca15wm1ra5"; }; + patches = [ + # Fix build with Glade 3.36.0 + # https://source.puri.sm/Librem5/libhandy/merge_requests/451 + (fetchpatch { + url = "https://source.puri.sm/Librem5/libhandy/commit/887beedb467984ab5c7b91830181645fadef7849.patch"; + sha256 = "ZW6qCtHhXMsLsxgcOjVAukgPAhOdvFhxx0iAQEEk8GE="; + excludes = [ "glade/glade-hdy-header-bar.c" ]; + }) + ]; + nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala libxml2 gtk-doc docbook_xsl docbook_xml_dtd_43 diff --git a/pkgs/development/tools/glade/default.nix b/pkgs/development/tools/glade/default.nix index 13b3d8c2362..4d86fc2acd0 100644 --- a/pkgs/development/tools/glade/default.nix +++ b/pkgs/development/tools/glade/default.nix @@ -1,5 +1,5 @@ { stdenv -, intltool +, gettext , fetchurl , python3 , pkg-config @@ -18,16 +18,16 @@ stdenv.mkDerivation rec { pname = "glade"; - version = "3.22.2"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/glade/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "08bayb1rrpblxf6jhhbw2n3c425w170is4l94pampldl4kmsdvzd"; + sha256 = "GbVGtSfMRiE8z8gCLUnsV+YY/iyqmqUdstKGIjPqbwg="; }; nativeBuildInputs = [ pkg-config - intltool + gettext itstool wrapGAppsHook docbook-xsl-nons -- cgit v1.2.3 From 99efa7c85c8835127c1c65d69665f74f5aaf1a03 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Fri, 15 May 2020 19:26:53 +0200 Subject: Revert "Get rid of go 1.13 (#86036)" This partially reverts commit 3e0aa4af2da4e4010cd9011aaa125fed7ca220e6. See the discussion in the PR. --- pkgs/development/compilers/go/1.13.nix | 244 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 13 ++ 2 files changed, 257 insertions(+) create mode 100644 pkgs/development/compilers/go/1.13.nix diff --git a/pkgs/development/compilers/go/1.13.nix b/pkgs/development/compilers/go/1.13.nix new file mode 100644 index 00000000000..8fee93cc4ab --- /dev/null +++ b/pkgs/development/compilers/go/1.13.nix @@ -0,0 +1,244 @@ +{ stdenv, fetchurl, tzdata, iana-etc, runCommand +, perl, which, pkgconfig, patch, procps, pcre, cacert, Security, Foundation +, mailcap, runtimeShell +, buildPackages, pkgsTargetTarget +}: + +let + + inherit (stdenv.lib) optionals optionalString; + + goBootstrap = runCommand "go-bootstrap" {} '' + mkdir $out + cp -rf ${buildPackages.go_bootstrap}/* $out/ + chmod -R u+w $out + find $out -name "*.c" -delete + cp -rf $out/bin/* $out/share/go/bin/ + ''; + + goarch = platform: { + "i686" = "386"; + "x86_64" = "amd64"; + "aarch64" = "arm64"; + "arm" = "arm"; + "armv5tel" = "arm"; + "armv6l" = "arm"; + "armv7l" = "arm"; + }.${platform.parsed.cpu.name} or (throw "Unsupported system"); + +in + +stdenv.mkDerivation rec { + pname = "go"; + version = "1.13.8"; + + src = fetchurl { + url = "https://dl.google.com/go/go${version}.src.tar.gz"; + sha256 = "0d7cxffk72568h46srzswrxd0bsdip7amgkf499wzn6l6d3g0fxi"; + }; + + # perl is used for testing go vet + nativeBuildInputs = [ perl which pkgconfig patch procps ]; + buildInputs = [ cacert pcre ] + ++ optionals stdenv.isLinux [ stdenv.cc.libc.out ] + ++ optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ]; + + depsTargetTargetPropagated = optionals stdenv.isDarwin [ Security Foundation ]; + + hardeningDisable = [ "all" ]; + + prePatch = '' + patchShebangs ./ # replace /bin/bash + + # This source produces shell script at run time, + # and thus it is not corrected by patchShebangs. + substituteInPlace misc/cgo/testcarchive/carchive_test.go \ + --replace '#!/usr/bin/env bash' '#!${runtimeShell}' + + # Patch the mimetype database location which is missing on NixOS. + # but also allow static binaries built with NixOS to run outside nix + sed -i 's,\"/etc/mime.types,"${mailcap}/etc/mime.types\"\,\n\t&,' src/mime/type_unix.go + + # Disabling the 'os/http/net' tests (they want files not available in + # chroot builds) + rm src/net/{listen,parse}_test.go + rm src/syscall/exec_linux_test.go + + # !!! substituteInPlace does not seems to be effective. + # The os test wants to read files in an existing path. Just don't let it be /usr/bin. + sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go + sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go + # Disable the unix socket test + sed -i '/TestShutdownUnix/aif true \{ return\; \}' src/net/net_test.go + # Disable the hostname test + sed -i '/TestHostname/aif true \{ return\; \}' src/os/os_test.go + # ParseInLocation fails the test + sed -i '/TestParseInSydney/aif true \{ return\; \}' src/time/format_test.go + # Remove the api check as it never worked + sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go + # Remove the coverage test as we have removed this utility + sed -i '/TestCoverageWithCgo/aif true \{ return\; \}' src/cmd/go/go_test.go + # Remove the timezone naming test + sed -i '/TestLoadFixed/aif true \{ return\; \}' src/time/time_test.go + # Remove disable setgid test + sed -i '/TestRespectSetgidDir/aif true \{ return\; \}' src/cmd/go/internal/work/build_test.go + # Remove cert tests that conflict with NixOS's cert resolution + sed -i '/TestEnvVars/aif true \{ return\; \}' src/crypto/x509/root_unix_test.go + # TestWritevError hangs sometimes + sed -i '/TestWritevError/aif true \{ return\; \}' src/net/writev_test.go + # TestVariousDeadlines fails sometimes + sed -i '/TestVariousDeadlines/aif true \{ return\; \}' src/net/timeout_test.go + + sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go + sed -i 's,/etc/services,${iana-etc}/etc/services,' src/net/port_unix.go + + # Disable cgo lookup tests not works, they depend on resolver + rm src/net/cgo_unix_test.go + + '' + optionalString stdenv.isLinux '' + # prepend the nix path to the zoneinfo files but also leave the original value for static binaries + # that run outside a nix server + sed -i 's,\"/usr/share/zoneinfo/,"${tzdata}/share/zoneinfo/\"\,\n\t&,' src/time/zoneinfo_unix.go + + '' + optionalString stdenv.isAarch32 '' + echo '#!${runtimeShell}' > misc/cgo/testplugin/test.bash + '' + optionalString stdenv.isDarwin '' + substituteInPlace src/race.bash --replace \ + "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true + sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go + sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go + sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go + + sed -i '/TestChdirAndGetwd/aif true \{ return\; \}' src/os/os_test.go + sed -i '/TestCredentialNoSetGroups/aif true \{ return\; \}' src/os/exec/exec_posix_test.go + sed -i '/TestRead0/aif true \{ return\; \}' src/os/os_test.go + sed -i '/TestSystemRoots/aif true \{ return\; \}' src/crypto/x509/root_darwin_test.go + + sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/aif true \{ return\; \}' src/cmd/go/go_test.go + sed -i '/TestBuildDashIInstallsDependencies/aif true \{ return\; \}' src/cmd/go/go_test.go + + sed -i '/TestDisasmExtld/aif true \{ return\; \}' src/cmd/objdump/objdump_test.go + + sed -i 's/unrecognized/unknown/' src/cmd/link/internal/ld/lib.go + + # TestCurrent fails because Current is not implemented on Darwin + sed -i 's/TestCurrent/testCurrent/g' src/os/user/user_test.go + sed -i 's/TestLookup/testLookup/g' src/os/user/user_test.go + + touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd + ''; + + patches = [ + ./remove-tools-1.11.patch + ./ssl-cert-file-1.13.patch + ./remove-test-pie-1.13.patch + ./creds-test.patch + ./go-1.9-skip-flaky-19608.patch + ./go-1.9-skip-flaky-20072.patch + ./skip-external-network-tests.patch + ./skip-nohup-tests.patch + ] ++ [ + # breaks under load: https://github.com/golang/go/issues/25628 + (if stdenv.isAarch32 + then ./skip-test-extra-files-on-aarch32.patch + else ./skip-test-extra-files-on-386.patch) + ]; + + postPatch = '' + find . -name '*.orig' -exec rm {} ';' + ''; + + GOOS = stdenv.targetPlatform.parsed.kernel.name; + GOARCH = goarch stdenv.targetPlatform; + # GOHOSTOS/GOHOSTARCH must match the building system, not the host system. + # Go will nevertheless build a for host system that we will copy over in + # the install phase. + GOHOSTOS = stdenv.buildPlatform.parsed.kernel.name; + GOHOSTARCH = goarch stdenv.buildPlatform; + + # {CC,CXX}_FOR_TARGET must be only set for cross compilation case as go expect those + # to be different from CC/CXX + CC_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then + "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}cc" + else + null; + CXX_FOR_TARGET = if (stdenv.buildPlatform != stdenv.targetPlatform) then + "${pkgsTargetTarget.stdenv.cc}/bin/${pkgsTargetTarget.stdenv.cc.targetPrefix}c++" + else + null; + + GOARM = toString (stdenv.lib.intersectLists [(stdenv.hostPlatform.parsed.cpu.version or "")] ["5" "6" "7"]); + GO386 = 387; # from Arch: don't assume sse2 on i686 + CGO_ENABLED = 1; + # Hopefully avoids test timeouts on Hydra + GO_TEST_TIMEOUT_SCALE = 3; + + # Indicate that we are running on build infrastructure + # Some tests assume things like home directories and users exists + GO_BUILDER_NAME = "nix"; + + GOROOT_BOOTSTRAP="${goBootstrap}/share/go"; + + postConfigure = '' + export GOCACHE=$TMPDIR/go-cache + # this is compiled into the binary + export GOROOT_FINAL=$out/share/go + + export PATH=$(pwd)/bin:$PATH + + # Independent from host/target, CC should produce code for the building system. + export CC=${buildPackages.stdenv.cc}/bin/cc + ulimit -a + ''; + + postBuild = '' + (cd src && ./make.bash) + ''; + + doCheck = stdenv.hostPlatform == stdenv.targetPlatform && !stdenv.isDarwin; + + checkPhase = '' + runHook preCheck + (cd src && HOME=$TMPDIR GOCACHE=$TMPDIR/go-cache ./run.bash --no-rebuild) + runHook postCheck + ''; + + preInstall = '' + rm -r pkg/obj + # Contains the wrong perl shebang when cross compiling, + # since it is not used for anything we can deleted as well. + rm src/regexp/syntax/make_perl_groups.pl + '' + (if (stdenv.buildPlatform != stdenv.hostPlatform) then '' + mv bin/*_*/* bin + rmdir bin/*_* + ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' + rm -rf pkg/${GOHOSTOS}_${GOHOSTARCH} pkg/tool/${GOHOSTOS}_${GOHOSTARCH} + ''} + '' else if (stdenv.hostPlatform != stdenv.targetPlatform) then '' + rm -rf bin/*_* + ${optionalString (!(GOHOSTARCH == GOARCH && GOOS == GOHOSTOS)) '' + rm -rf pkg/${GOOS}_${GOARCH} pkg/tool/${GOOS}_${GOARCH} + ''} + '' else ""); + + installPhase = '' + runHook preInstall + mkdir -p $GOROOT_FINAL + cp -a bin pkg src lib misc api doc $GOROOT_FINAL + ln -s $GOROOT_FINAL/bin $out/bin + runHook postInstall + ''; + + setupHook = ./setup-hook.sh; + + disallowedReferences = [ goBootstrap ]; + + meta = with stdenv.lib; { + branch = "1.13"; + homepage = "http://golang.org/"; + description = "The Go Programming language"; + license = licenses.bsd3; + maintainers = with maintainers; [ cstrahan orivej mic92 rvolosatovs kalbasit Frostman ]; + platforms = platforms.linux ++ platforms.darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0db4b476682..aa84e8aa8e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8638,6 +8638,13 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + go_1_13 = callPackage ../development/compilers/go/1.13.nix ({ + inherit (darwin.apple_sdk.frameworks) Security Foundation; + } // lib.optionalAttrs stdenv.isAarch64 { + stdenv = gcc8Stdenv; + buildPackages = buildPackages // { stdenv = gcc8Stdenv; }; + }); + go_1_14 = callPackage ../development/compilers/go/1.14.nix ({ inherit (darwin.apple_sdk.frameworks) Security Foundation; } // lib.optionalAttrs stdenv.isAarch64 { @@ -15252,12 +15259,18 @@ in ### DEVELOPMENT / GO MODULES + buildGo113Package = callPackage ../development/go-packages/generic { + go = buildPackages.go_1_13; + }; buildGo114Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_14; }; buildGoPackage = buildGo114Package; + buildGo113Module = callPackage ../development/go-modules/generic { + go = buildPackages.go_1_13; + }; buildGo114Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_14; }; -- cgit v1.2.3 From cf8bd2cd22d60f8e5022311b6e3cc419cdd265ac Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 13 May 2020 08:20:41 +0200 Subject: LTS Haskell 15.12 --- .../haskell-modules/configuration-hackage2nix.yaml | 48 +++++++++++----------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 008a3b50291..03ad7f06340 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -72,7 +72,7 @@ default-package-overrides: # gi-gdkx11-4.x requires gtk-4.x, which is still under development and # not yet available in Nixpkgs - gi-gdkx11 < 4 - # LTS Haskell 15.11 + # LTS Haskell 15.12 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -390,7 +390,7 @@ default-package-overrides: - cast ==0.1.0.2 - category ==0.2.5.0 - cayley-client ==0.4.12 - - cborg ==0.2.2.1 + - cborg ==0.2.3.0 - cborg-json ==0.2.2.0 - cereal ==0.5.8.1 - cereal-conduit ==0.8.0 @@ -601,7 +601,7 @@ default-package-overrides: - diagrams-lib ==1.4.3 - diagrams-postscript ==1.5 - diagrams-rasterific ==1.4.2 - - diagrams-solve ==0.1.1 + - diagrams-solve ==0.1.2 - diagrams-svg ==1.4.3 - di-core ==1.0.4 - dictionary-sharing ==0.1.0.0 @@ -893,7 +893,7 @@ default-package-overrides: - gravatar ==0.8.0 - greskell ==1.0.1.0 - greskell-core ==0.1.3.2 - - greskell-websocket ==0.1.2.1 + - greskell-websocket ==0.1.2.2 - groom ==0.1.2.1 - group-by-date ==0.1.0.3 - groups ==0.4.1.0 @@ -1060,7 +1060,7 @@ default-package-overrides: - human-readable-duration ==0.2.1.4 - HUnit ==1.6.0.0 - HUnit-approx ==1.1.1.1 - - hunit-dejafu ==2.0.0.1 + - hunit-dejafu ==2.0.0.2 - hvect ==0.4.0.0 - hvega ==0.5.0.0 - hw-balancedparens ==0.3.1.0 @@ -1081,7 +1081,7 @@ default-package-overrides: - hw-json ==1.3.2.0 - hw-json-simd ==0.1.1.0 - hw-json-simple-cursor ==0.1.1.0 - - hw-json-standard-cursor ==0.2.2.0 + - hw-json-standard-cursor ==0.2.3.1 - hw-mquery ==0.2.1.0 - hw-packed-vector ==0.2.1.0 - hw-parser ==0.1.1.0 @@ -1111,7 +1111,7 @@ default-package-overrides: - if ==0.1.0.0 - iff ==0.0.6 - ihs ==0.1.0.3 - - ilist ==0.4.0.0 + - ilist ==0.4.0.1 - imagesize-conduit ==1.1 - Imlib ==0.1.2 - immortal ==0.3 @@ -1157,7 +1157,7 @@ default-package-overrides: - iproute ==1.7.9 - IPv6Addr ==1.1.3 - ipynb ==0.1.0.1 - - ipython-kernel ==0.10.1.0 + - ipython-kernel ==0.10.2.0 - irc ==0.6.1.0 - irc-client ==1.1.1.1 - irc-conduit ==0.3.0.4 @@ -1195,8 +1195,8 @@ default-package-overrides: - keycode ==0.2.2 - keys ==3.12.3 - kind-apply ==0.3.2.0 - - kind-generics ==0.4.0.0 - - kind-generics-th ==0.2.1.0 + - kind-generics ==0.4.1.0 + - kind-generics-th ==0.2.2.0 - kmeans ==0.1.3 - koofr-client ==1.0.0.3 - kubernetes-webhook-haskell ==0.2.0.1 @@ -1265,7 +1265,7 @@ default-package-overrides: - load-env ==0.2.1.0 - loch-th ==0.2.2 - lockfree-queue ==0.2.3.1 - - log-base ==0.8.0.0 + - log-base ==0.8.0.1 - log-domain ==0.13 - logfloat ==0.13.3.3 - logging-effect ==1.3.9 @@ -1712,7 +1712,7 @@ default-package-overrides: - read-env-var ==1.0.0.0 - reanimate-svg ==0.9.8.0 - rebase ==1.4.1 - - record-dot-preprocessor ==0.2.3 + - record-dot-preprocessor ==0.2.5 - record-hasfield ==1.0 - records-sop ==0.1.0.3 - recursion-schemes ==5.1.3 @@ -1823,7 +1823,7 @@ default-package-overrides: - sequence-formats ==1.4.1 - sequenceTools ==1.4.0.5 - serf ==0.1.1.0 - - serialise ==0.2.2.0 + - serialise ==0.2.3.0 - servant ==0.16.2 - servant-auth ==0.3.2.0 - servant-auth-server ==0.4.5.1 @@ -1867,7 +1867,7 @@ default-package-overrides: - shared-memory ==0.2.0.0 - shell-conduit ==4.7.0 - shell-escape ==0.2.0 - - shellmet ==0.0.3.0 + - shellmet ==0.0.3.1 - shelltestrunner ==1.9 - shell-utility ==0.0 - shelly ==1.9.0 @@ -1898,8 +1898,8 @@ default-package-overrides: - sized ==0.4.0.0 - skein ==1.0.9.4 - skip-var ==0.1.1.0 - - skylighting ==0.8.3.4 - - skylighting-core ==0.8.3.4 + - skylighting ==0.8.4 + - skylighting-core ==0.8.4 - slist ==0.1.1.0 - small-bytearray-builder ==0.3.4.0 - smallcheck ==1.1.5 @@ -1968,7 +1968,7 @@ default-package-overrides: - string-combinators ==0.6.0.5 - string-conv ==0.1.2 - string-conversions ==0.4.0.1 - - string-interpolate ==0.2.0.3 + - string-interpolate ==0.2.1.0 - string-qq ==0.0.4 - stringsearch ==0.3.6.6 - string-transform ==1.1.1 @@ -2010,7 +2010,7 @@ default-package-overrides: - tardis ==0.4.1.0 - tasty ==1.2.3 - tasty-ant-xml ==1.1.6 - - tasty-dejafu ==2.0.0.1 + - tasty-dejafu ==2.0.0.3 - tasty-discover ==4.2.1 - tasty-expected-failure ==0.11.1.2 - tasty-golden ==2.3.3.2 @@ -2130,14 +2130,14 @@ default-package-overrides: - triplesec ==0.2.2.1 - trivial-constraint ==0.6.0.0 - tsv2csv ==0.1.0.2 - - ttc ==0.2.0.0 + - ttc ==0.2.1.0 - ttl-hashtables ==1.4.1.0 - ttrie ==0.1.2.1 - tuple ==0.3.0.2 - tuples-homogenous-h98 ==0.1.1.0 - tuple-sop ==0.3.1.0 - tuple-th ==0.2.5 - - turtle ==1.5.18 + - turtle ==1.5.19 - TypeCompose ==0.9.14 - typed-process ==0.2.6.0 - typed-uuid ==0.0.0.2 @@ -2211,7 +2211,7 @@ default-package-overrides: - uuid-types ==1.0.3 - validation ==1.1 - validity ==0.9.0.3 - - validity-aeson ==0.2.0.3 + - validity-aeson ==0.2.0.4 - validity-bytestring ==0.4.1.1 - validity-containers ==0.5.0.3 - validity-path ==0.4.0.1 @@ -2234,7 +2234,7 @@ default-package-overrides: - vector-instances ==3.4 - vector-mmap ==0.0.3 - vector-rotcev ==0.1.0.0 - - vector-sized ==1.4.0.0 + - vector-sized ==1.4.1.0 - vector-space ==0.16 - vector-split ==1.0.0.2 - vector-th-unbox ==0.2.1.7 @@ -2270,7 +2270,7 @@ default-package-overrides: - webex-teams-conduit ==0.2.0.0 - webex-teams-pipes ==0.2.0.0 - webrtc-vad ==0.1.0.3 - - websockets ==0.12.7.0 + - websockets ==0.12.7.1 - websockets-snap ==0.10.3.1 - weigh ==0.0.16 - wide-word ==0.1.1.1 @@ -2330,7 +2330,7 @@ default-package-overrides: - xss-sanitize ==0.3.6 - xturtle ==0.2.0.0 - xxhash-ffi ==0.2.0.0 - - yaml ==0.11.3.0 + - yaml ==0.11.4.0 - yesod ==1.6.0.1 - yesod-auth ==1.6.10 - yesod-auth-hashdb ==1.7.1.2 -- cgit v1.2.3 From ca8cb6044efd50866cdd4d251413d56cb42da542 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 May 2020 11:59:44 +0200 Subject: hackage2nix: update list of broken packages --- pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 03ad7f06340..2cbe100fa40 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2708,6 +2708,7 @@ broken-packages: - adaptive-containers - adaptive-tuple - adb + - addy - adhoc-network - adict - adobe-swatch-exchange @@ -7432,6 +7433,7 @@ broken-packages: - miniforth - minilens - minilight + - minilight-lua - minimung - minions - minioperational @@ -9282,6 +9284,13 @@ broken-packages: - ShortestPathProblems - show-prettyprint - showdown + - Shpadoinkle + - Shpadoinkle-backend-pardiff + - Shpadoinkle-backend-snabbdom + - Shpadoinkle-backend-static + - Shpadoinkle-html + - Shpadoinkle-router + - Shpadoinkle-widgets - shpider - shuffle - si-clock -- cgit v1.2.3 From 730024fcaad303c30d879b2e70e532369398088d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 9 May 2020 02:30:22 +0200 Subject: hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.3-1-gb7c82db from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/4c409c7b8e5c77d052a2fa16ce922b014f9539b0. --- .../haskell-modules/hackage-packages.nix | 2362 +++++++++++++------- 1 file changed, 1510 insertions(+), 852 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 4fe3aac0121..a03d6a9b33d 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -9347,8 +9347,8 @@ self: { }: mkDerivation { pname = "HTab"; - version = "1.7.2"; - sha256 = "1xn2ljw97j625l5q7a9chqscdbi4cj29zg1yy4jz4mcivzwbjqii"; + version = "1.7.3"; + sha256 = "0w5zjd9q87a79vaslxs4r7xllq37vyg546ramgfnw43l1cmkica6"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -18097,6 +18097,164 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Shpadoinkle" = callPackage + ({ mkDerivation, base, jsaddle, jsaddle-warp, text, unliftio }: + mkDerivation { + pname = "Shpadoinkle"; + version = "0.1.0.0"; + sha256 = "0527rd9dh5sjh3y7sir9bpydad05rx43nr6ba20sa4ha8zvvl583"; + libraryHaskellDepends = [ + base jsaddle jsaddle-warp text unliftio + ]; + description = "A programming model for declarative, high performance user interface"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "Shpadoinkle-backend-pardiff" = callPackage + ({ mkDerivation, base, compactable, containers, file-embed, jsaddle + , lens, mtl, neat-interpolation, random, semialign, Shpadoinkle + , text, these, unliftio, uuid + }: + mkDerivation { + pname = "Shpadoinkle-backend-pardiff"; + version = "0.1.0.1"; + sha256 = "1b1ab062fm1qz0pnp4jws7wmhsb2hfvj5mb6jrrgbm9yjv7k725v"; + libraryHaskellDepends = [ + base compactable containers file-embed jsaddle lens mtl + neat-interpolation random semialign Shpadoinkle text these unliftio + uuid + ]; + description = "A Virtual Dom in pure Haskell, based on Html as an Alignable Functor"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "Shpadoinkle-backend-snabbdom" = callPackage + ({ mkDerivation, base, file-embed, jsaddle, mtl, Shpadoinkle, text + }: + mkDerivation { + pname = "Shpadoinkle-backend-snabbdom"; + version = "0.1.0.0"; + sha256 = "1j00ivjlmpb55h4ygldlads9135qnx3q0k0w946xqqlbyca1qzir"; + libraryHaskellDepends = [ + base file-embed jsaddle mtl Shpadoinkle text + ]; + description = "Use the high-performance Snabbdom virtual dom library written in JavaScript"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "Shpadoinkle-backend-static" = callPackage + ({ mkDerivation, base, compactable, Shpadoinkle, text }: + mkDerivation { + pname = "Shpadoinkle-backend-static"; + version = "0.1.0.0"; + sha256 = "1mpia2qzv8cmd3ss20sj0bc15zjjkdj1g0byvnb3yakpbjky44j5"; + libraryHaskellDepends = [ base compactable Shpadoinkle text ]; + description = "A backend for rendering Shpadoinkle as Text"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "Shpadoinkle-examples" = callPackage + ({ mkDerivation, aeson, base, beam-core, beam-sqlite, bytestring + , containers, exceptions, file-embed, lens, mtl + , optparse-applicative, servant, servant-client, servant-server + , Shpadoinkle, Shpadoinkle-backend-pardiff + , Shpadoinkle-backend-snabbdom, Shpadoinkle-backend-static + , Shpadoinkle-html, Shpadoinkle-lens, Shpadoinkle-router + , Shpadoinkle-widgets, sqlite-simple, stm, text, unliftio, wai + , wai-app-static, warp + }: + mkDerivation { + pname = "Shpadoinkle-examples"; + version = "0.0.0.1"; + sha256 = "19iq8yw2m14y8j67slry1x30fnayx1d4sjwg2cafbgz9g7l1g7f1"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base beam-core beam-sqlite bytestring containers exceptions + file-embed lens mtl optparse-applicative servant servant-client + servant-server Shpadoinkle Shpadoinkle-backend-pardiff + Shpadoinkle-backend-snabbdom Shpadoinkle-backend-static + Shpadoinkle-html Shpadoinkle-lens Shpadoinkle-router + Shpadoinkle-widgets sqlite-simple stm text unliftio wai + wai-app-static warp + ]; + description = "Example usages of Shpadoinkle"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {Shpadoinkle-lens = null;}; + + "Shpadoinkle-html" = callPackage + ({ mkDerivation, base, containers, ghcjs-dom, jsaddle, jsaddle-dom + , Shpadoinkle, stm, template-haskell, text, unliftio + }: + mkDerivation { + pname = "Shpadoinkle-html"; + version = "0.1.0.0"; + sha256 = "1v5dxg7axg2a508rcphchihr5krrwagxx1a41660r7js7wba9bk8"; + libraryHaskellDepends = [ + base containers ghcjs-dom jsaddle jsaddle-dom Shpadoinkle stm + template-haskell text unliftio + ]; + description = "A typed, template generated Html DSL, and helpers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "Shpadoinkle-router" = callPackage + ({ mkDerivation, aeson, base, bytestring, compactable, exceptions + , ghcjs-dom, http-api-data, jsaddle, jsaddle-dom, lens, network-uri + , servant, servant-client, servant-server, Shpadoinkle + , Shpadoinkle-backend-static, text, unliftio, wai, wai-app-static + , warp + }: + mkDerivation { + pname = "Shpadoinkle-router"; + version = "0.1.0.1"; + sha256 = "08kv5gbs2kkkspnmkzv0q5y3hnvv69yliwc4815wsyh8hdrn3ks6"; + libraryHaskellDepends = [ + aeson base bytestring compactable exceptions ghcjs-dom + http-api-data jsaddle jsaddle-dom lens network-uri servant + servant-client servant-server Shpadoinkle + Shpadoinkle-backend-static text unliftio wai wai-app-static warp + ]; + description = "A single page application rounter for Shpadoinkle based on Servant"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "Shpadoinkle-widgets" = callPackage + ({ mkDerivation, aeson, base, compactable, containers + , edit-distance, email-validate, hspec, jsaddle, mtl, QuickCheck + , Shpadoinkle, Shpadoinkle-html, stm, template-haskell, text + , unliftio + }: + mkDerivation { + pname = "Shpadoinkle-widgets"; + version = "0.0.0.2"; + sha256 = "1n85pjzkn1rjhl9rqswm7cra631qqabqf42wimfq2v17l8ymrlky"; + libraryHaskellDepends = [ + aeson base compactable containers edit-distance email-validate + jsaddle mtl Shpadoinkle Shpadoinkle-html stm template-haskell text + unliftio + ]; + testHaskellDepends = [ base containers hspec QuickCheck ]; + description = "A collection of common reusable types and components"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "Shrub" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -23296,6 +23454,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "addy" = callPackage + ({ mkDerivation, aeson, attoparsec, base, bytestring, hedgehog + , http-types, ip, lens, relude, tasty, tasty-hedgehog, tasty-hunit + , text, text-icu, validation-selective + }: + mkDerivation { + pname = "addy"; + version = "0.1.0.0"; + sha256 = "10p7q0infa1bawhg7hxw8rqjqdj3w737j5s3g41hy4in2nfp5ji0"; + libraryHaskellDepends = [ + attoparsec base bytestring ip lens relude text text-icu + validation-selective + ]; + testHaskellDepends = [ + aeson attoparsec base bytestring hedgehog http-types ip lens relude + tasty tasty-hedgehog tasty-hunit text text-icu validation-selective + ]; + description = "A full-featured library for parsing, validating, and rendering email addresses"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "adhoc-network" = callPackage ({ mkDerivation, base, bytestring, containers, Crypto, dataenc , HaXml, hsgnutls, network, old-locale, parsec, pkcs1, random, time @@ -23930,8 +24111,6 @@ self: { ]; description = "Derivation of Aeson instances for GADTs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "aeson-generic-compat" = callPackage @@ -24281,6 +24460,8 @@ self: { pname = "aeson-schemas"; version = "1.1.0"; sha256 = "1w01mdixja6f8176ra0lrkhbrr68hcsiib7sq8sdfh1rsx3hsn62"; + revision = "1"; + editedCabalFile = "1z74b2barkaq4hmx29i39lgbq925z2ws226ad9cyicz8nlgrghbv"; libraryHaskellDepends = [ aeson base bytestring first-class-families megaparsec template-haskell text unordered-containers @@ -24454,6 +24635,36 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "aeson-via" = callPackage + ({ mkDerivation, aeson, aeson-casing, base, newtype-generics, text + }: + mkDerivation { + pname = "aeson-via"; + version = "0.1.0"; + sha256 = "0zlx4pxfh3qll8ymfya0rfqx3gd7ag0wag86fa8fvni6h07ynryf"; + libraryHaskellDepends = [ + aeson aeson-casing base newtype-generics text + ]; + description = "Wrappers to derive-via Aeson ToJSON/FromJSON typeclasses"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "aeson-with" = callPackage + ({ mkDerivation, aeson, base, hashmap, lens, lens-aeson, scientific + , text, unordered-containers, vector + }: + mkDerivation { + pname = "aeson-with"; + version = "0.0.1.0"; + sha256 = "05xhbcfym586qb0giwr9rayqgyp25bc026kwbn7x5ln4nmzp2x9n"; + libraryHaskellDepends = [ + aeson base hashmap lens lens-aeson scientific text + unordered-containers vector + ]; + description = "withXField combinators for aeson"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "aeson-yak" = callPackage ({ mkDerivation, aeson, base }: mkDerivation { @@ -34355,14 +34566,14 @@ self: { broken = true; }) {}; - "aur_7_0_0" = callPackage + "aur_7_0_1" = callPackage ({ mkDerivation, aeson, base, bytestring, http-client , http-client-tls, http-types, tasty, tasty-hunit, text }: mkDerivation { pname = "aur"; - version = "7.0.0"; - sha256 = "1x355bd8xdg0xm4y89ciqz861chj0b6dkwq8ma7nc46acl25a18z"; + version = "7.0.1"; + sha256 = "17gizmkbclgxsllsy4lcvxyw09bz5l51l40j74y8bzxzryvwdrq8"; libraryHaskellDepends = [ aeson base bytestring http-client http-types text ]; @@ -36555,8 +36766,8 @@ self: { ({ mkDerivation, barbies, base, template-haskell }: mkDerivation { pname = "barbies-th"; - version = "0.1.1"; - sha256 = "0b8g8q1ddbsfwf1v3063wv3abpa3f90mbiwa4wgsgizflj7s1ik9"; + version = "0.1.2"; + sha256 = "1zirafvm8x1badsh478hy8hh8zwqxkzcn3bscsvcp0vpyl8xxcma"; libraryHaskellDepends = [ barbies base template-haskell ]; testHaskellDepends = [ barbies base ]; description = "Create strippable HKD via TH"; @@ -41836,6 +42047,18 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "blake3" = callPackage + ({ mkDerivation, base, memory, tasty, tasty-hunit }: + mkDerivation { + pname = "blake3"; + version = "0.1"; + sha256 = "005d7zqxbr0yc18c15llpd3mqwhvvc3nqgv9djmlf8xhzbmll4ar"; + libraryHaskellDepends = [ base memory ]; + testHaskellDepends = [ base memory tasty tasty-hunit ]; + description = "BLAKE3 hashing algorithm"; + license = stdenv.lib.licenses.asl20; + }) {}; + "blakesum" = callPackage ({ mkDerivation, base, bytestring, text, vector }: mkDerivation { @@ -43285,8 +43508,8 @@ self: { ({ mkDerivation, base, mtl, semigroups, template-haskell, text }: mkDerivation { pname = "boomerang"; - version = "1.4.5.7"; - sha256 = "11ycghpgngnw0ks47h3wmp0xdfl3qw1wnwdil1vmr1b5a4gngzi1"; + version = "1.4.6"; + sha256 = "09angcdqf75f03rh7m02rsqz5rr304dw4c5cszj9alpq4qxlsyqc"; libraryHaskellDepends = [ base mtl semigroups template-haskell text ]; @@ -44942,6 +45165,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bugsnag-hs_0_1_0_1" = callPackage + ({ mkDerivation, aeson, auto-update, base, bytestring, hedgehog + , http-client, stm, text, time, unordered-containers + }: + mkDerivation { + pname = "bugsnag-hs"; + version = "0.1.0.1"; + sha256 = "1b9ps0yhqvph9ax767xfq1v9v6pggm66ngsv96kww9lj8isg0y5d"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson auto-update base bytestring http-client stm text time + unordered-containers + ]; + testHaskellDepends = [ aeson base bytestring hedgehog stm ]; + description = "A Bugsnag client for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "bugzilla" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, connection , containers, data-default, http-conduit, http-types, iso8601-time @@ -45218,13 +45460,18 @@ self: { }) {}; "burrito" = callPackage - ({ mkDerivation, base, hspec, QuickCheck, template-haskell }: + ({ mkDerivation, base, bytestring, containers, hspec, parsec + , QuickCheck, template-haskell, text, transformers + }: mkDerivation { pname = "burrito"; - version = "1.0.2.0"; - sha256 = "1zmwzdihys8kh9idcpzvg1p4hcpzbfji8pdzixpvz9hya8cc44vf"; - libraryHaskellDepends = [ base template-haskell ]; - testHaskellDepends = [ base hspec QuickCheck ]; + version = "1.1.0.0"; + sha256 = "16kw74sn3i6mfn0wakxyn2p71f8j924xqirzqrkdb6x9rr5y94di"; + libraryHaskellDepends = [ + base bytestring containers parsec template-haskell text + transformers + ]; + testHaskellDepends = [ base containers hspec QuickCheck text ]; description = "Parse and render URI templates"; license = stdenv.lib.licenses.isc; }) {}; @@ -45463,21 +45710,20 @@ self: { }) {}; "bv-sized" = callPackage - ({ mkDerivation, base, containers, lens, mtl, parameterized-utils - , pretty, QuickCheck, random + ({ mkDerivation, base, bitwise, bytestring, hedgehog, panic + , parameterized-utils, tasty, tasty-hedgehog, th-lift }: mkDerivation { pname = "bv-sized"; - version = "0.7.0"; - sha256 = "04fiqpd5kcq7lyas40axqn6mcngr1yymi1aiqgzip519qmdg73vl"; + version = "1.0.1"; + sha256 = "12l69p95z1ihwbfhlm0wyr1bdhs52ng4fvdsqxhgn0bpx9skzw73"; libraryHaskellDepends = [ - base containers lens mtl parameterized-utils pretty QuickCheck - random + base bitwise bytestring panic parameterized-utils th-lift ]; testHaskellDepends = [ - base lens parameterized-utils pretty QuickCheck random + base bytestring hedgehog parameterized-utils tasty tasty-hedgehog ]; - description = "a BitVector datatype that is parameterized by the vector width"; + description = "a bitvector datatype that is parameterized by the vector width"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -46320,16 +46566,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "bz2_1_0_0_2" = callPackage - ({ mkDerivation, base, bytestring, bzlib, bzlib-conduit, c2hs - , conduit, cpphs, criterion, deepseq, directory, filepath, pipes - , pipes-bytestring, pipes-bzip, pipes-safe, tasty, tasty-golden - , tasty-hunit, temporary + "bz2_1_0_1_0" = callPackage + ({ mkDerivation, base, bytestring, bzlib, c2hs, cpphs, criterion + , deepseq, directory, filepath, tasty, tasty-golden, tasty-hunit + , temporary }: mkDerivation { pname = "bz2"; - version = "1.0.0.2"; - sha256 = "12w3rz137g45cw3s5n0ajk9pvilfvh3fszjrnn07fsjck0r5mnyx"; + version = "1.0.1.0"; + sha256 = "1kskfgdfjpg2nn807298m605lc7jafnsi1phz3bp6jds48zwrfhq"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring ]; libraryToolDepends = [ c2hs ]; @@ -46338,8 +46583,7 @@ self: { tasty-hunit ]; benchmarkHaskellDepends = [ - base bytestring bzlib bzlib-conduit conduit criterion filepath - pipes pipes-bytestring pipes-bzip pipes-safe temporary + base bytestring bzlib criterion filepath temporary ]; benchmarkToolDepends = [ cpphs ]; description = "Bindings to libbz2"; @@ -48343,22 +48587,22 @@ self: { , exceptions, fmt, focus, generic-lens, generic-override , generic-override-aeson, hashable, http-date, http-types, lens , lens-aeson, mtl, polysemy, polysemy-plugin, reflection - , scientific, stm, stm-chans, stm-containers, text, text-show, time - , typerep-map, unordered-containers, vector, websockets - , wreq-patchable, wuss + , safe-exceptions, scientific, stm, stm-chans, stm-containers, text + , text-show, time, typerep-map, unagi-chan, unordered-containers + , vector, websockets, wreq-patchable, wuss }: mkDerivation { pname = "calamity"; - version = "0.1.5.1"; - sha256 = "1bbdxhv5gl61qwf65gsrdc5zkwx2a1aar83l2ndmanayjbh6n8cs"; + version = "0.1.8.0"; + sha256 = "1fn2nq1hzcn3lpk3y7i8s3xlbp68h6ikxmi0hvcp9mx9xhlw8yk0"; libraryHaskellDepends = [ aeson async base bytestring concurrent-extra containers data-default-class deepseq deque df1 di-polysemy exceptions fmt focus generic-lens generic-override generic-override-aeson hashable http-date http-types lens lens-aeson mtl polysemy polysemy-plugin - reflection scientific stm stm-chans stm-containers text text-show - time typerep-map unordered-containers vector websockets - wreq-patchable wuss + reflection safe-exceptions scientific stm stm-chans stm-containers + text text-show time typerep-map unagi-chan unordered-containers + vector websockets wreq-patchable wuss ]; description = "A library for writing discord bots"; license = stdenv.lib.licenses.mit; @@ -49077,10 +49321,8 @@ self: { }: mkDerivation { pname = "cardano-coin-selection"; - version = "1.0.0"; - sha256 = "0s0b2bbczsjq31h3xpyvingwpgpzgh3x2sw6bvryyn13wy717hbk"; - revision = "1"; - editedCabalFile = "1cdm1sq8qnna83lxr9s5jsaxwgzd2363fni3xyirldmxnn20j3l1"; + version = "1.0.1"; + sha256 = "1nvnkd5g0vq4vqj1w55hd1b1v7rwzhb3anhavablw9wy3w230qja"; libraryHaskellDepends = [ base bytestring containers cryptonite deepseq quiet text transformers @@ -50350,8 +50592,8 @@ self: { }: mkDerivation { pname = "cborg"; - version = "0.2.2.1"; - sha256 = "10v1dip11zlpbj69k95n1zm1msp41hkw8snd93h19zlji0v0v4ms"; + version = "0.2.3.0"; + sha256 = "14y7yckj1xzldadyq8g84dgsdaygf9ss0gd38vjfw62smdjq1in8"; libraryHaskellDepends = [ array base bytestring containers deepseq ghc-prim half integer-gmp primitive text @@ -55274,8 +55516,8 @@ self: { }: mkDerivation { pname = "cobot-io"; - version = "0.1.3.3"; - sha256 = "0b4ihkghgzln8rz2czbmagcnzsi3gdsx99d29s74izbib4laxqqm"; + version = "0.1.3.4"; + sha256 = "059lijjlf31xw94fqp8ylzmvdf99v43vwa35q8an7qg5df81yc1j"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-msgpack deepseq http-conduit hyraxAbif lens linear mtl split text vector @@ -57995,14 +58237,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "concurrency_1_9_0_0" = callPackage + "concurrency_1_11_0_0" = callPackage ({ mkDerivation, array, atomic-primops, base, exceptions , monad-control, mtl, stm, transformers }: mkDerivation { pname = "concurrency"; - version = "1.9.0.0"; - sha256 = "1bmj1g9dnjj6390ky1xkddb1azff1ibphaiyyy2dix351m9dhc3s"; + version = "1.11.0.0"; + sha256 = "19a4za0c65gi2a5n882nyi26cgxrsry64rkd3qiqhvzf7m34cjxd"; libraryHaskellDepends = [ array atomic-primops base exceptions monad-control mtl stm transformers @@ -60179,6 +60421,8 @@ self: { pname = "consumers"; version = "2.2.0.2"; sha256 = "0nml5hn6n95ngy1qvj6w4rkwa8r6qax0nc2vgimk68bawv4z97qd"; + revision = "1"; + editedCabalFile = "150f62zfb5kpa8iwp08fq9gdmv142swfldkjrrjyx0jpvf6qcjxc"; libraryHaskellDepends = [ base containers exceptions extra hpqtypes lifted-base lifted-threads log-base monad-control monad-time mtl stm time @@ -61802,8 +62046,8 @@ self: { }: mkDerivation { pname = "cpkg"; - version = "0.2.5.3"; - sha256 = "0fdwjpkjwdixcb3r265z3dnrsrzcfh513lv6wxmgd63507j29njf"; + version = "0.2.5.4"; + sha256 = "1269zgvcvd18zdmg4rf73mh89a3gcph91fqm46p5h05wz500179w"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -62748,6 +62992,8 @@ self: { pname = "criterion-compare"; version = "0.1.0.0"; sha256 = "034cm3hap9x6cwp44hrd03b09mifcm076a9pn3lgql5ardx91yl7"; + revision = "1"; + editedCabalFile = "0nzwqk0mrchrymbmim2542s37i3dvvs5ks25839z9x0fp6gpxiq6"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -64454,7 +64700,7 @@ self: { license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {cudd = null;}; + }) {inherit (pkgs) cudd;}; "cue-sheet" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, hspec @@ -65918,8 +66164,8 @@ self: { ({ mkDerivation }: mkDerivation { pname = "data-category"; - version = "0.9"; - sha256 = "1crp5mg9paf29gkl2nfpnx303p958kx3ap8zzbhq6gzvhklvyam0"; + version = "0.10"; + sha256 = "1mb72r17982w2sslmvi5nzpf7i702iikc7j4h68gzlfnm426jk9q"; description = "Category theory"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -67670,6 +67916,23 @@ self: { broken = true; }) {}; + "dataflower" = callPackage + ({ mkDerivation, base, criterion, hashable, hspec, mtl, pretty-show + , QuickCheck, stm, time, transformers, vector + }: + mkDerivation { + pname = "dataflower"; + version = "0.1.4.0"; + sha256 = "1ncm6rw8f0zcg7mnqkk027l48zqvg1xi27qjhxq00dhgbsnz42rp"; + libraryHaskellDepends = [ + base hashable mtl pretty-show stm time transformers vector + ]; + testHaskellDepends = [ base hspec QuickCheck stm ]; + benchmarkHaskellDepends = [ base criterion stm ]; + description = "A Pure-Haskell Timely Dataflow System"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "datalog" = callPackage ({ mkDerivation, base, containers, exceptions, hashable, haskeline , HUnit, parsec, pretty, test-framework, test-framework-hunit, text @@ -68141,6 +68404,34 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "dbus_1_2_15_1" = callPackage + ({ mkDerivation, base, bytestring, cereal, conduit, containers + , criterion, deepseq, directory, exceptions, extra, filepath, lens + , network, parsec, process, QuickCheck, random, resourcet, split + , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text + , th-lift, transformers, unix, vector, xml-conduit, xml-types + }: + mkDerivation { + pname = "dbus"; + version = "1.2.15.1"; + sha256 = "1fq1ds5lkgysi5cpbwh97233vil6w9djxn6dcp5sjj7r5gb76vj7"; + libraryHaskellDepends = [ + base bytestring cereal conduit containers deepseq exceptions + filepath lens network parsec random split template-haskell text + th-lift transformers unix vector xml-conduit xml-types + ]; + testHaskellDepends = [ + base bytestring cereal containers directory extra filepath network + parsec process QuickCheck random resourcet tasty tasty-hunit + tasty-quickcheck text transformers unix vector + ]; + benchmarkHaskellDepends = [ base criterion ]; + doCheck = false; + description = "A client library for the D-Bus IPC system"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dbus-client" = callPackage ({ mkDerivation, base, containers, dbus-core, monads-tf, text , transformers @@ -69408,6 +69699,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "dejafu_2_3_0_0" = callPackage + ({ mkDerivation, base, concurrency, containers, contravariant + , deepseq, exceptions, leancheck, profunctors, random, transformers + }: + mkDerivation { + pname = "dejafu"; + version = "2.3.0.0"; + sha256 = "09lqniw3gacyykmk23vl4icyhiixdyjps50cwvcmlwd8k4941gwa"; + libraryHaskellDepends = [ + base concurrency containers contravariant deepseq exceptions + leancheck profunctors random transformers + ]; + description = "A library for unit-testing concurrent programs"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "deka" = callPackage ({ mkDerivation, base, bytestring, mpdec, parsec, transformers }: mkDerivation { @@ -70137,8 +70445,8 @@ self: { ({ mkDerivation, aeson, base, bytestring }: mkDerivation { pname = "deriving-aeson"; - version = "0.2.4"; - sha256 = "1wswirjqpmmzyag5y2jhys9pswl3fdrzjv69csvd655qg8iyybpb"; + version = "0.2.5"; + sha256 = "1pvrc139af0sh657ygj0lw1wi1rk3nr4y906l7l00iz5sa52j0cc"; libraryHaskellDepends = [ aeson base ]; testHaskellDepends = [ aeson base bytestring ]; description = "Type driven generic aeson instance customisation"; @@ -70672,34 +70980,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall_1_31_1" = callPackage + "dhall_1_32_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write , base, bytestring, case-insensitive, cborg, cborg-json, containers , contravariant, cryptonite, data-fix, deepseq, Diff, directory , doctest, dotgen, either, exceptions, filepath, foldl, gauge - , generic-random, hashable, haskeline, http-client, http-client-tls - , http-types, lens-family-core, megaparsec, memory, mockery, mtl - , network-uri, optparse-applicative, parser-combinators, parsers - , pretty-simple, prettyprinter, prettyprinter-ansi-terminal - , profunctors, QuickCheck, quickcheck-instances, repline - , scientific, semigroups, serialise, special-values, spoon, tasty - , tasty-expected-failure, tasty-hunit, tasty-quickcheck - , template-haskell, text, text-manipulate, th-lift-instances - , transformers, transformers-compat, turtle, unordered-containers - , uri-encode, vector + , generic-random, half, hashable, haskeline, http-client + , http-client-tls, http-types, lens-family-core, megaparsec, memory + , mockery, mtl, network-uri, optparse-applicative + , parser-combinators, parsers, pretty-simple, prettyprinter + , prettyprinter-ansi-terminal, profunctors, QuickCheck + , quickcheck-instances, repline, scientific, semigroups, serialise + , special-values, spoon, tasty, tasty-expected-failure, tasty-hunit + , tasty-quickcheck, template-haskell, text, text-manipulate + , th-lift-instances, transformers, transformers-compat, turtle + , unordered-containers, uri-encode, vector }: mkDerivation { pname = "dhall"; - version = "1.31.1"; - sha256 = "18v7vvcbcm9s7slh6h43rj9yakkkxwnwgj6kv84i6qzd2j7d80mc"; + version = "1.32.0"; + sha256 = "1imj0bh5365pdizvjbw2wqz0g9hakigf1zm4fr6379qdchxpp90p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal atomic-write base bytestring case-insensitive cborg cborg-json containers contravariant cryptonite data-fix deepseq Diff directory dotgen either exceptions - filepath hashable haskeline http-client http-client-tls http-types - lens-family-core megaparsec memory mtl network-uri + filepath half hashable haskeline http-client http-client-tls + http-types lens-family-core megaparsec memory mtl network-uri optparse-applicative parser-combinators parsers pretty-simple prettyprinter prettyprinter-ansi-terminal profunctors repline scientific serialise template-haskell text text-manipulate @@ -70745,14 +71053,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall-bash_1_0_29" = callPackage + "dhall-bash_1_0_30" = callPackage ({ mkDerivation, base, bytestring, containers, dhall , neat-interpolation, optparse-generic, shell-escape, text }: mkDerivation { pname = "dhall-bash"; - version = "1.0.29"; - sha256 = "0hmhk2lmqr1szrjx1kqa3zlylcblwigi6lqmkqnh0z1dh3kc1a1w"; + version = "1.0.30"; + sha256 = "1r2xr8c8kzmrxrb8m6f9dzjn81sqxzx97w0406kwrx9vzfj7ci1q"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70851,7 +71159,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall-json_1_6_3" = callPackage + "dhall-json_1_6_4" = callPackage ({ mkDerivation, aeson, aeson-pretty, aeson-yaml, ansi-terminal , base, bytestring, containers, dhall, exceptions, filepath , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal @@ -70860,8 +71168,10 @@ self: { }: mkDerivation { pname = "dhall-json"; - version = "1.6.3"; - sha256 = "1dm6lrn8nd29c8d1sp1l3jnxfxkhhqpvinrgn1hm0lcp3jgzchbb"; + version = "1.6.4"; + sha256 = "0vr6a02frfk5bh0qj0m4qlc5pp08m29gxp8ixqihrqakkna6409z"; + revision = "1"; + editedCabalFile = "1cnm3jww2cfw0fsrykcijrsixmci2j309k7f7kbplp7iy08dk5h0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70910,8 +71220,10 @@ self: { }: mkDerivation { pname = "dhall-lsp-server"; - version = "1.0.6"; - sha256 = "1pbxzs9axnbwqfgdz44cbaabq9v10jsk752ix8i0cz1vmwyrcnlv"; + version = "1.0.7"; + sha256 = "08nyai9y7s8facdjyfxc1z8dp8qd150y5554vxpvfr98xxj5kf41"; + revision = "1"; + editedCabalFile = "12gsy624cg1v98npanwmmmj4i37193lkqngjrrxj3z2ifr6s327i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -70933,16 +71245,17 @@ self: { "dhall-nix" = callPackage ({ mkDerivation, base, containers, data-fix, dhall, hnix - , neat-interpolation, optparse-generic, text + , lens-family-core, neat-interpolation, optparse-generic, text }: mkDerivation { pname = "dhall-nix"; - version = "1.1.13"; - sha256 = "0sdnrhr9f29ds4zdj2qs123k44vg15r8kn8w2zwkmdabilzlgg9k"; + version = "1.1.14"; + sha256 = "1sm7n8539y9944jlc6xk6qx0xssjwz0jjv1505swgi5qcrhdwsij"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers data-fix dhall hnix neat-interpolation text + base containers data-fix dhall hnix lens-family-core + neat-interpolation text ]; executableHaskellDepends = [ base dhall hnix optparse-generic text @@ -71032,7 +71345,7 @@ self: { broken = true; }) {}; - "dhall-yaml_1_0_3" = callPackage + "dhall-yaml_1_1_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, dhall , dhall-json, exceptions, HsYAML, HsYAML-aeson , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal @@ -71040,8 +71353,8 @@ self: { }: mkDerivation { pname = "dhall-yaml"; - version = "1.0.3"; - sha256 = "1lnxp2wqbgzg5f2kadhnbd8i5zgwy3g1nz17mmbdqwlx30p4scdn"; + version = "1.1.0"; + sha256 = "06lwzis9jjfis6rv4r9gd0iq1da5ymcd6jl8x3rbcimg87k9r4bj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -71202,8 +71515,8 @@ self: { ({ mkDerivation, base, df1, di-core, di-df1, di-handle, polysemy }: mkDerivation { pname = "di-polysemy"; - version = "0.1.1.2"; - sha256 = "0qglcvz628si1kg5djgh9j7ppvgfsc3gphal05hvlc4xziywf55y"; + version = "0.1.3.0"; + sha256 = "0fxm9m6cz687ihdh1nsms5cbxpngb9h6v62wdr82g83srvwgcflf"; libraryHaskellDepends = [ base df1 di-core di-df1 di-handle polysemy ]; @@ -71710,24 +72023,6 @@ self: { }) {}; "diagrams-solve" = callPackage - ({ mkDerivation, base, deepseq, tasty, tasty-hunit - , tasty-quickcheck - }: - mkDerivation { - pname = "diagrams-solve"; - version = "0.1.1"; - sha256 = "17agchqkmj14b17sw50kzxq4hm056g5d8yy0wnqn5w8h1d0my7x4"; - revision = "5"; - editedCabalFile = "1yl8cs05fzqcz49p601am1ij66m9pa70yamhfxgcvya2pf8nimlf"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ - base deepseq tasty tasty-hunit tasty-quickcheck - ]; - description = "Pure Haskell solver routines used by diagrams"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "diagrams-solve_0_1_2" = callPackage ({ mkDerivation, base, deepseq, tasty, tasty-hunit , tasty-quickcheck }: @@ -71741,7 +72036,6 @@ self: { ]; description = "Pure Haskell solver routines used by diagrams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "diagrams-svg" = callPackage @@ -71883,15 +72177,16 @@ self: { }: mkDerivation { pname = "dice-entropy-conduit"; - version = "1.0.0.1"; - sha256 = "01xwxajwyvv6ac48j9if6xsv05aqg1p02i7d25ivk1k56ky41l1s"; + version = "1.0.0.3"; + sha256 = "0pk1mhmy9683rbr2c589jqq1ra4w154nqcyvy3krw043hzd5y90n"; libraryHaskellDepends = [ base bytestring conduit entropy transformers ]; testHaskellDepends = [ - base QuickCheck test-framework test-framework-quickcheck2 + base bytestring conduit entropy QuickCheck test-framework + test-framework-quickcheck2 transformers ]; - description = "Cryptographically secure n-sided dice via rejection sampling."; + description = "Cryptographically secure n-sided dice via rejection sampling"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -72295,10 +72590,8 @@ self: { }: mkDerivation { pname = "digestive-functors"; - version = "0.8.4.0"; - sha256 = "17l70z0bn5aahjaydg3qcwyip6jk0q4vkar5abhrhls59j5hk6z0"; - revision = "2"; - editedCabalFile = "1a8z8fmjvwab222ayc04xd3wxqagfq6nwf68ynljcbwdbbjyjb7b"; + version = "0.8.4.2"; + sha256 = "0x0mh43rli77vqs9bpqd85w5wwr68qchfl5086nn137358583lrn"; libraryHaskellDepends = [ base bytestring containers mtl old-locale semigroups text time ]; @@ -72355,8 +72648,8 @@ self: { }: mkDerivation { pname = "digestive-functors-happstack"; - version = "0.6.1.2"; - sha256 = "18i4hb39rkgj2jz2ii697gayxi02dqpfbx5arv6zyjvmp1ydynvz"; + version = "0.6.1.3"; + sha256 = "1kjmjxmlaaawfkk96wzlzd0kbcb5j0pvqssh3ynjm074cy6h89fd"; libraryHaskellDepends = [ base bytestring digestive-functors happstack-server text ]; @@ -74619,8 +74912,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "dobutokO"; - version = "0.3.1.0"; - sha256 = "0vsh9ygxaqy9qv193hbvk4fx4bj34m95qnqfippv76l0f4lpa8bz"; + version = "0.3.2.0"; + sha256 = "1qps4zvk3qn2d93778cs2b6kf1k9fjgw5248hyx9v0n05crfw2i8"; libraryHaskellDepends = [ base ]; description = "The library is intended to print updated messages on the terminal screen"; license = stdenv.lib.licenses.mit; @@ -74632,8 +74925,8 @@ self: { }: mkDerivation { pname = "dobutokO2"; - version = "0.39.0.0"; - sha256 = "0xxdlxz3hmrsp57p3zdxwbd0wz366x5d9mkfld3i0v4by80x1a1m"; + version = "0.39.1.0"; + sha256 = "0nlgw32a5fbfpikdg8cs2ivc5gn4dcdqhmzgjl1qx07lhl0v8cyq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -77442,8 +77735,8 @@ self: { ({ mkDerivation, base, vector }: mkDerivation { pname = "earcut"; - version = "0.1.0.1"; - sha256 = "0zinq40b549avzgw1s8dbhn7cjsbsg72smr6iaj5aap8cccx6mr7"; + version = "0.1.0.2"; + sha256 = "080picb31ihv0gzxg0nnxx90g0n08l0hz9y57k2jihsibmkszwsi"; libraryHaskellDepends = [ base vector ]; description = "Binding to C++ earcut library"; license = stdenv.lib.licenses.isc; @@ -80144,8 +80437,8 @@ self: { }: mkDerivation { pname = "encoding"; - version = "0.8.3"; - sha256 = "07flh8rmdbi8rhgg2jzv70yb91kkjkiidc8ww5mxjdk8av70wbj3"; + version = "0.8.5"; + sha256 = "1kqi6ic5sa8y01ya99v7r5j9rl68vgy2lsixhbnavi8fx2200hcs"; setupHaskellDepends = [ base Cabal containers filepath ghc-prim HaXml ]; @@ -83176,8 +83469,8 @@ self: { }: mkDerivation { pname = "exinst"; - version = "0.7"; - sha256 = "01m50pixmrw6mrd04nxw6qwx0z5k857pn3nqfiybpmp4zbc3bwac"; + version = "0.8"; + sha256 = "08axj8yqnqbmxq4yi0fy2rffnkn7lcab2j13b9qlwl5ykc2jrhfh"; libraryHaskellDepends = [ base binary constraints deepseq hashable profunctors QuickCheck singletons @@ -83198,8 +83491,8 @@ self: { }: mkDerivation { pname = "exinst-aeson"; - version = "0.7"; - sha256 = "1dn08xqcfp3bsgvrhcv491kdfmky6925wa33zry8aijwxkchva67"; + version = "0.7.1"; + sha256 = "1rl9sg6bqac944dh4v6xish6fw6x5mr6a937nyq0yrjmg8d3gswp"; libraryHaskellDepends = [ aeson base constraints exinst singletons ]; @@ -83219,8 +83512,8 @@ self: { }: mkDerivation { pname = "exinst-bytes"; - version = "0.7"; - sha256 = "05k2jzlz6aj5wwy3bnysszr6kw85n0j73wkda5vwcrsha4prmf9r"; + version = "0.7.1"; + sha256 = "0carx1qbs97pxj9bq6splar46myfjz8l0imqmy2nr868sf7an7q5"; libraryHaskellDepends = [ base bytes constraints exinst singletons ]; @@ -83240,8 +83533,8 @@ self: { }: mkDerivation { pname = "exinst-cereal"; - version = "0.7"; - sha256 = "1qdz4a4qzi3fbkigvng36hz5j322zbbwya2vrs0shja8ry6rvi74"; + version = "0.7.1"; + sha256 = "1ffya75sjy1b60a2c10zymshc8qi1b79rzgpa2mpvlr0glf5i32d"; libraryHaskellDepends = [ base cereal constraints exinst singletons ]; @@ -83289,8 +83582,8 @@ self: { }: mkDerivation { pname = "exinst-serialise"; - version = "0.7"; - sha256 = "0a51534sifdhq764qa9hrhwnv48f1y08a7f11mhhx3r23pxh4588"; + version = "0.7.1"; + sha256 = "06fqhxcqwam7160i2m0hsmbdkb0q21kv0vy5azilrbphhz4ycfvp"; libraryHaskellDepends = [ base constraints exinst serialise singletons ]; @@ -84052,8 +84345,8 @@ self: { }: mkDerivation { pname = "extensions"; - version = "0.0.0.0"; - sha256 = "0abvqqzcmfrwla3i7zx09wm74dw50s2rzhxnfs1gx4rs7c9rn4kb"; + version = "0.0.0.1"; + sha256 = "0wxkkdvsq8pqirw5w8ss20iyblw9197q420cpwnqzbl2xb0cjk6n"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -84653,8 +84946,8 @@ self: { }: mkDerivation { pname = "faktory"; - version = "1.0.1.1"; - sha256 = "1wz7f1ai73xc5n06db8mjbmbdyf5r9p78ysx3q1yiq32h2mvjd3m"; + version = "1.0.1.2"; + sha256 = "12pabsmy21il88qmdbg91152y9nzqci9y2cn9ljizlcndnsy7s5l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -86709,6 +87002,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "file-embed_0_0_12_0" = callPackage + ({ mkDerivation, base, bytestring, directory, filepath + , template-haskell + }: + mkDerivation { + pname = "file-embed"; + version = "0.0.12.0"; + sha256 = "13b2bcyifyrs1i9yk0qkj5md68ysnwma7zb1xrb1x2i4z3lk342p"; + libraryHaskellDepends = [ + base bytestring directory filepath template-haskell + ]; + testHaskellDepends = [ base filepath ]; + description = "Use Template Haskell to embed file contents directly"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "file-embed-lzma" = callPackage ({ mkDerivation, base, base-compat, bytestring, directory, filepath , lzma, template-haskell, text, th-lift-instances, transformers @@ -93601,6 +93911,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "gather" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "gather"; + version = "0.1.0.0"; + sha256 = "0ajh8ygks61knc17vgsm5dsnqhkcrz2s0gaw6xyppq415wijgv0m"; + libraryHaskellDepends = [ base ]; + description = "An applicative for parsing unordered things, heterogenous sorting"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "gauge" = callPackage ({ mkDerivation, base, basement, bytestring, deepseq, directory , foundation, process, vector @@ -96068,6 +96389,19 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "ghc-byteorder" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "ghc-byteorder"; + version = "4.11.0.0.10"; + sha256 = "1dhzd7ygwm7b3hsrlm48iq4p634laby4hf7c8i7xp0c1g64hmrc6"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + doHaddock = false; + description = "\"GHC.ByteOrder\" API Compatibility Layer"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ghc-call-stack-extras" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -96594,14 +96928,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "ghc-lib-parser-ex_8_10_0_6" = callPackage + "ghc-lib-parser-ex_8_10_0_8" = callPackage ({ mkDerivation, base, bytestring, containers, directory, extra , filepath, ghc-lib-parser, tasty, tasty-hunit, uniplate }: mkDerivation { pname = "ghc-lib-parser-ex"; - version = "8.10.0.6"; - sha256 = "0l416d7zxfpb3dvz5mh8fxg6z9gr56mhv9agkg3r9cgz0k7nfk1a"; + version = "8.10.0.8"; + sha256 = "0y5yxrgmmb69jq5z7b90hm1ialik1b4x1rmankh7kbynfmhl0h3q"; libraryHaskellDepends = [ base bytestring containers ghc-lib-parser uniplate ]; @@ -105431,21 +105765,22 @@ self: { "graphql" = callPackage ({ mkDerivation, aeson, base, containers, hspec, hspec-expectations - , hspec-megaparsec, megaparsec, raw-strings-qq, text, transformers - , unordered-containers + , hspec-megaparsec, megaparsec, parser-combinators, QuickCheck + , raw-strings-qq, text, transformers, unordered-containers }: mkDerivation { pname = "graphql"; - version = "0.6.1.0"; - sha256 = "0x0526kb29ndrhb9dy9iwxj9r3qij7sy4zjhjqfx3hc7334rdpda"; + version = "0.7.0.0"; + sha256 = "03bfg4whf7blf91x0h4qk6q7f1j7nfvhmqh4ggpnbyxdbyzx9sk4"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base containers megaparsec text transformers - unordered-containers + aeson base containers megaparsec parser-combinators text + transformers unordered-containers ]; testHaskellDepends = [ aeson base containers hspec hspec-expectations hspec-megaparsec - megaparsec raw-strings-qq text transformers unordered-containers + megaparsec parser-combinators QuickCheck raw-strings-qq text + transformers unordered-containers ]; description = "Haskell GraphQL implementation"; license = stdenv.lib.licenses.bsd3; @@ -105883,28 +106218,6 @@ self: { }) {}; "greskell-websocket" = callPackage - ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring - , greskell-core, hashtables, hspec, safe-exceptions, stm, text - , unordered-containers, uuid, vector, websockets - }: - mkDerivation { - pname = "greskell-websocket"; - version = "0.1.2.1"; - sha256 = "0wz4x7n64cwdjsmyziy9v76aa7p3kxjmbd9bfxc4rpqdjyfk34px"; - libraryHaskellDepends = [ - aeson async base base64-bytestring bytestring greskell-core - hashtables safe-exceptions stm text unordered-containers uuid - vector websockets - ]; - testHaskellDepends = [ - aeson base bytestring greskell-core hspec unordered-containers uuid - vector - ]; - description = "Haskell client for Gremlin Server using WebSocket serializer"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "greskell-websocket_0_1_2_2" = callPackage ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring , greskell-core, hashtables, hspec, safe-exceptions, stm, text , unordered-containers, uuid, vector, websockets @@ -105924,7 +106237,6 @@ self: { ]; description = "Haskell client for Gremlin Server using WebSocket serializer"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "grid" = callPackage @@ -107557,7 +107869,7 @@ self: { license = "LGPL"; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {cudd = null; epd = null; inherit (pkgs) mtr; + }) {inherit (pkgs) cudd; epd = null; inherit (pkgs) mtr; inherit (pkgs) st; util = null;}; "hCM" = callPackage @@ -115694,7 +116006,7 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "haskoin-core_0_13_3" = callPackage + "haskoin-core_0_13_4" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, bytestring , cereal, conduit, containers, cryptonite, deepseq, entropy , hashable, hspec, hspec-discover, HUnit, memory, mtl, murmur3 @@ -115704,8 +116016,8 @@ self: { }: mkDerivation { pname = "haskoin-core"; - version = "0.13.3"; - sha256 = "0lm2zsndiz9id7kmv4mxhakg7jzkz88g0f278bap78z5n9flh8sj"; + version = "0.13.4"; + sha256 = "0bxn1jfb2s308gpdiwwnvar606qc3fqnvf6k0hdz2x43pqkc15lb"; libraryHaskellDepends = [ aeson array base base16-bytestring bytestring cereal conduit containers cryptonite deepseq entropy hashable memory mtl murmur3 @@ -115781,7 +116093,7 @@ self: { broken = true; }) {}; - "haskoin-node_0_12_0" = callPackage + "haskoin-node_0_13_0" = callPackage ({ mkDerivation, base, base64, bytestring, cereal, conduit , conduit-extra, containers, data-default, hashable, haskoin-core , hspec, hspec-discover, HUnit, monad-logger, mtl, network, nqe @@ -115791,10 +116103,10 @@ self: { }: mkDerivation { pname = "haskoin-node"; - version = "0.12.0"; - sha256 = "1x1z0k7n95mzgnlb3vcyp7gbqi727mniavdjijcrzw5vnvlzxnc6"; + version = "0.13.0"; + sha256 = "0s6l25n9w4g5r2xafb6x1gdqaghfmrnzh9i3nn64c3g26xzk3vnp"; libraryHaskellDepends = [ - base base64 bytestring cereal conduit conduit-extra containers + base bytestring cereal conduit conduit-extra containers data-default hashable haskoin-core monad-logger mtl network nqe random resourcet rocksdb-haskell rocksdb-query string-conversions text time transformers unliftio unordered-containers @@ -115862,37 +116174,38 @@ self: { "haskoin-store" = callPackage ({ mkDerivation, aeson, base, base64, bytestring, cereal, conduit , containers, data-default, deepseq, filepath, hashable - , haskoin-core, haskoin-node, hedis, hspec, hspec-discover - , http-types, monad-logger, mtl, network, nqe, optparse-applicative - , QuickCheck, random, rocksdb-haskell, rocksdb-query, scotty - , string-conversions, text, time, transformers, unliftio - , unordered-containers, wai, warp + , haskoin-core, haskoin-node, haskoin-store-data, hedis, hspec + , hspec-discover, http-types, monad-logger, mtl, network, nqe + , optparse-applicative, QuickCheck, random, rocksdb-haskell + , rocksdb-query, scotty, string-conversions, text, time + , transformers, unliftio, unordered-containers, wai, warp }: mkDerivation { pname = "haskoin-store"; - version = "0.24.0"; - sha256 = "12ci8vgdd4xh9r8xl4j3b1f63majy8vgvxd2cxw221amhjcsvfvw"; + version = "0.29.3"; + sha256 = "1h28zn5fmps5jc2x2rx32z9yn7mz7j50ai4xs8mqzacsszj3sz95"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring cereal conduit containers data-default - deepseq hashable haskoin-core haskoin-node hedis http-types - monad-logger mtl network nqe random rocksdb-haskell rocksdb-query - scotty string-conversions text time transformers unliftio - unordered-containers wai warp + deepseq hashable haskoin-core haskoin-node haskoin-store-data hedis + http-types monad-logger mtl network nqe random rocksdb-haskell + rocksdb-query scotty string-conversions text time transformers + unliftio unordered-containers wai warp ]; executableHaskellDepends = [ aeson base bytestring cereal conduit containers data-default - deepseq filepath hashable haskoin-core haskoin-node monad-logger - mtl nqe optparse-applicative random string-conversions text time - transformers unliftio unordered-containers + deepseq filepath hashable haskoin-core haskoin-node + haskoin-store-data monad-logger mtl nqe optparse-applicative random + string-conversions text time transformers unliftio + unordered-containers ]; testHaskellDepends = [ aeson base base64 bytestring cereal conduit containers data-default - deepseq hashable haskoin-core haskoin-node hedis hspec http-types - monad-logger mtl network nqe QuickCheck random rocksdb-haskell - rocksdb-query scotty string-conversions text time transformers - unliftio unordered-containers wai warp + deepseq hashable haskoin-core haskoin-node haskoin-store-data hedis + hspec http-types monad-logger mtl network nqe QuickCheck random + rocksdb-haskell rocksdb-query scotty string-conversions text time + transformers unliftio unordered-containers wai warp ]; testToolDepends = [ hspec-discover ]; description = "Storage and index for Bitcoin and Bitcoin Cash"; @@ -115901,6 +116214,29 @@ self: { broken = true; }) {}; + "haskoin-store-data" = callPackage + ({ mkDerivation, aeson, base, bytestring, cereal, containers + , deepseq, hashable, haskoin-core, hspec, hspec-discover, network + , QuickCheck, scotty, string-conversions, text + }: + mkDerivation { + pname = "haskoin-store-data"; + version = "0.29.3"; + sha256 = "04ndllkxw3ly67d8irgjq8dhjvqh37qfcliz3978saa1i8bz3nav"; + libraryHaskellDepends = [ + aeson base bytestring cereal containers deepseq hashable + haskoin-core network scotty string-conversions text + ]; + testHaskellDepends = [ + aeson base bytestring cereal containers deepseq hashable + haskoin-core hspec network QuickCheck scotty string-conversions + text + ]; + testToolDepends = [ hspec-discover ]; + description = "Data for Haskoin Store"; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "haskoin-util" = callPackage ({ mkDerivation, base, binary, bytestring, containers, either , HUnit, mtl, QuickCheck, test-framework, test-framework-hunit @@ -116987,6 +117323,19 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hasql-pool_0_5_2" = callPackage + ({ mkDerivation, base-prelude, hasql, hspec, resource-pool, time }: + mkDerivation { + pname = "hasql-pool"; + version = "0.5.2"; + sha256 = "0l870d58a53akwbzgrcxfmz8mqc598qh1786d5ks937q0w219wlz"; + libraryHaskellDepends = [ base-prelude hasql resource-pool time ]; + testHaskellDepends = [ base-prelude hasql hspec ]; + description = "A pool of connections for Hasql"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hasql-postgres" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring , criterion-plus, deepseq, directory, doctest, either, filepath @@ -117059,28 +117408,18 @@ self: { }) {}; "hasql-th" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , contravariant, fast-builder, foldl, hashable, hasql - , headed-megaparsec, hedgehog, megaparsec, parser-combinators - , selective, template-haskell, template-haskell-compat-v0208, text - , text-builder, tuple-th, unordered-containers, uuid, vector + ({ mkDerivation, base, bytestring, containers, contravariant, foldl + , hasql, postgresql-syntax, template-haskell + , template-haskell-compat-v0208, text, uuid, vector }: mkDerivation { pname = "hasql-th"; - version = "0.4.0.7"; - sha256 = "0hs62wzp2phlq00jkz6qas1i3gyx3krnzn5hzvpa8zl4q0fggjvz"; + version = "0.4.0.8"; + sha256 = "14h71s7dha1g0zfi3vsg5y6lsn09x8c9nqv1nqiqmw2m19adx7gi"; libraryHaskellDepends = [ - base bytestring case-insensitive containers contravariant - fast-builder foldl hashable hasql headed-megaparsec megaparsec - parser-combinators selective template-haskell - template-haskell-compat-v0208 text text-builder - unordered-containers uuid vector - ]; - testHaskellDepends = [ - base bytestring case-insensitive containers contravariant - fast-builder foldl hashable hasql headed-megaparsec hedgehog - megaparsec parser-combinators selective template-haskell text - text-builder tuple-th unordered-containers uuid vector + base bytestring containers contravariant foldl hasql + postgresql-syntax template-haskell template-haskell-compat-v0208 + text uuid vector ]; description = "Template Haskell utilities for Hasql"; license = stdenv.lib.licenses.mit; @@ -118855,20 +119194,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "headroom_0_2_2_0" = callPackage + "headroom_0_2_2_1" = callPackage ({ mkDerivation, aeson, base, doctest, either, file-embed, hspec - , mustache, optparse-applicative, pcre-light, QuickCheck, rio - , template-haskell, time, yaml + , mustache, optparse-applicative, pcre-light, QuickCheck, rio, time + , yaml }: mkDerivation { pname = "headroom"; - version = "0.2.2.0"; - sha256 = "13kmzfh8r7y7cin93c0dhbcvgr66dcxfwjsylp41xyzq2w1g2aqb"; + version = "0.2.2.1"; + sha256 = "02s1s6v0fsn5a2anpi91za3dqafcp50lckr4xpir270l66lzdc2g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base either file-embed mustache optparse-applicative - pcre-light rio template-haskell time yaml + pcre-light rio time yaml ]; executableHaskellDepends = [ base optparse-applicative rio ]; testHaskellDepends = [ @@ -119267,8 +119606,8 @@ self: { pname = "hedgehog-classes"; version = "0.2.4.1"; sha256 = "0qa938cy1bm3shq0l4rfdq5cmb54jjy0qpp6cmx1xjd6yrdqrkxc"; - revision = "1"; - editedCabalFile = "1kxlq8x947wlpm6y80s25hhw074skzhpm7sbl87bvgcc6p7j7gc5"; + revision = "2"; + editedCabalFile = "0fs236sygw068v7l70myv23r3wpy961jjfiwvfd3l93ifsjrxm79"; libraryHaskellDepends = [ aeson base binary comonad containers hedgehog pretty-show primitive semirings silently transformers wl-pprint-annotated @@ -120941,8 +121280,8 @@ self: { }: mkDerivation { pname = "hextream"; - version = "0.1.0.1"; - sha256 = "0dc38zszqgbpmj7hlsd3w09i8rdpzd7jpr4vm2zv9y2y6bgcdpdr"; + version = "0.2.0.0"; + sha256 = "045q4glzqdl79w4baq4yvqjiqaih48p2iixkb3dv96nwmgr8xl8r"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base-compat containers parsers text @@ -121914,6 +122253,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hie-bios_0_5_0" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , conduit, conduit-extra, containers, cryptohash-sha1, deepseq + , directory, extra, file-embed, filepath, ghc, hslogger, process + , tasty, tasty-hunit, temporary, text, time, transformers + , unix-compat, unordered-containers, vector, yaml + }: + mkDerivation { + pname = "hie-bios"; + version = "0.5.0"; + sha256 = "1096d9i4xx1ca9csm2gqi4wnm8q8wya4a5k37qc5ihwix531wx02"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring conduit conduit-extra + containers cryptohash-sha1 deepseq directory extra file-embed + filepath ghc hslogger process temporary text time transformers + unix-compat unordered-containers vector yaml + ]; + executableHaskellDepends = [ base directory filepath ghc ]; + testHaskellDepends = [ + base directory extra filepath ghc tasty tasty-hunit text + unordered-containers yaml + ]; + description = "Set up a GHC API session"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hie-core" = callPackage ({ mkDerivation, aeson, async, base, binary, bytestring, containers , data-default, deepseq, directory, extra, filepath, ghc, ghc-boot @@ -122761,8 +123129,8 @@ self: { }: mkDerivation { pname = "hinterface"; - version = "1.0.0"; - sha256 = "18vhpmhpfam1nbh5fgbcfjnmsnsbkzq9qmr64alldlvwf6brs0kp"; + version = "2.0.0"; + sha256 = "1n1mp34s0ks7hkd2ddhfva9pbjwkciy1jjmqznmca244xg095yia"; libraryHaskellDepends = [ array async base binary bytestring containers cryptonite deepseq exceptions lifted-async lifted-base memory monad-control @@ -124048,8 +124416,8 @@ self: { }: mkDerivation { pname = "hlint"; - version = "3.1"; - sha256 = "1c17bcfddajkww05afjzbsdzx9xxxq4dnrb266jlb1zad1saf8ah"; + version = "3.1.1"; + sha256 = "1q3c7xjhzs0m1spd443nzpy7pxx6kjqklxvxkagfnjckxck8cpvv"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -126928,6 +127296,45 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hpack_0_34_1" = callPackage + ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal + , containers, cryptonite, deepseq, directory, filepath, Glob, hspec + , hspec-discover, http-client, http-client-tls, http-types, HUnit + , infer-license, interpolate, mockery, pretty, QuickCheck + , scientific, template-haskell, temporary, text, transformers + , unordered-containers, vector, yaml + }: + mkDerivation { + pname = "hpack"; + version = "0.34.1"; + sha256 = "0c0nnhg6yjcr6rmw2ffminjivjj8hd00cbimfkm6blxzmmxsv46i"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob http-client http-client-tls + http-types infer-license pretty scientific text transformers + unordered-containers vector yaml + ]; + executableHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob http-client http-client-tls + http-types infer-license pretty scientific text transformers + unordered-containers vector yaml + ]; + testHaskellDepends = [ + aeson base bifunctors bytestring Cabal containers cryptonite + deepseq directory filepath Glob hspec http-client http-client-tls + http-types HUnit infer-license interpolate mockery pretty + QuickCheck scientific template-haskell temporary text transformers + unordered-containers vector yaml + ]; + testToolDepends = [ hspec-discover ]; + description = "A modern format for Haskell packages"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hpack-convert" = callPackage ({ mkDerivation, aeson, aeson-qq, base, base-compat, bytestring , Cabal, containers, deepseq, directory, filepath, Glob, hspec @@ -127137,17 +127544,17 @@ self: { "hpath-directory" = callPackage ({ mkDerivation, base, bytestring, exceptions, hpath-filepath , hpath-posix, hspec, HUnit, IfElse, process, safe-exceptions - , streamly, streamly-bytestring, time, unix, unix-bytestring - , utf8-string + , streamly, streamly-bytestring, streamly-posix, time, transformers + , unix, unix-bytestring, utf8-string }: mkDerivation { pname = "hpath-directory"; - version = "0.13.3"; - sha256 = "1cvqag2gincqdc0zmfs227qh0cqc6hvg26aaznis6q57jiyk0ja2"; + version = "0.13.4"; + sha256 = "0cg80zsh0cwkaq4hd6y41afvn340a4byrk6h4dspiksgym5i8ny0"; libraryHaskellDepends = [ base bytestring exceptions hpath-filepath hpath-posix IfElse - safe-exceptions streamly streamly-bytestring time unix - unix-bytestring utf8-string + safe-exceptions streamly streamly-bytestring streamly-posix time + transformers unix unix-bytestring utf8-string ]; testHaskellDepends = [ base bytestring hpath-filepath hpath-posix hspec HUnit IfElse @@ -127175,8 +127582,8 @@ self: { }: mkDerivation { pname = "hpath-io"; - version = "0.13.1"; - sha256 = "0bpjr4hqwz7hlj81ndi2lyi95halm822mmpyw91pimq6k2m635wk"; + version = "0.13.2"; + sha256 = "10dph69qsl73k5rjvr5mvcplwgcmq7qylaxmr2yx7hzcjzsdgg4z"; libraryHaskellDepends = [ base bytestring exceptions hpath hpath-directory hpath-posix safe-exceptions streamly time unix @@ -127233,6 +127640,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hpc-codecov_0_2_0_0" = callPackage + ({ mkDerivation, array, base, bytestring, directory, filepath, hpc + , tar, tasty, tasty-hunit + }: + mkDerivation { + pname = "hpc-codecov"; + version = "0.2.0.0"; + sha256 = "0ha97zldwbsx86ji4sjaw9jf7kzgrk41zabzdd1b6sdlf20p883k"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bytestring directory filepath hpc + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base directory filepath tar tasty tasty-hunit + ]; + description = "Generate codecov report from hpc data"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hpc-coveralls" = callPackage ({ mkDerivation, aeson, async, base, bytestring, Cabal, cmdargs , containers, curl, directory, directory-tree, hpc, HUnit, process @@ -133525,6 +133954,26 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "http-client-openssl_0_3_1_0" = callPackage + ({ mkDerivation, base, bytestring, HsOpenSSL, hspec, http-client + , http-types, network + }: + mkDerivation { + pname = "http-client-openssl"; + version = "0.3.1.0"; + sha256 = "16h2f4ap35g63mdg66iihp10p1s4nwsrb06hplwm9i4akdr9gws2"; + libraryHaskellDepends = [ + base bytestring HsOpenSSL http-client network + ]; + testHaskellDepends = [ + base HsOpenSSL hspec http-client http-types + ]; + doCheck = false; + description = "http-client backend using the OpenSSL library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-client-overrides" = callPackage ({ mkDerivation, aeson, base, bytestring, http-client , http-client-tls, http-types, network-uri, tasty, tasty-hunit @@ -134943,11 +135392,23 @@ self: { ({ mkDerivation, base, dejafu, exceptions, HUnit }: mkDerivation { pname = "hunit-dejafu"; - version = "2.0.0.1"; - sha256 = "0n7npk8ksp14f2ib47navmc50rlnqrcsgdnxmd5qylg431h15sfz"; + version = "2.0.0.2"; + sha256 = "07bsf9wv1i1mzhbj216n0k22k9mwpkcvnh4gin8z4zldpj0vyqm4"; + libraryHaskellDepends = [ base dejafu exceptions HUnit ]; + description = "Deja Fu support for the HUnit test framework"; + license = stdenv.lib.licenses.mit; + }) {}; + + "hunit-dejafu_2_0_0_3" = callPackage + ({ mkDerivation, base, dejafu, exceptions, HUnit }: + mkDerivation { + pname = "hunit-dejafu"; + version = "2.0.0.3"; + sha256 = "03kjpc26bpym06ccz0kvbid2n38xdq5j0nd1cywfjbii8zyjmgzg"; libraryHaskellDepends = [ base dejafu exceptions HUnit ]; description = "Deja Fu support for the HUnit test framework"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hunit-gui" = callPackage @@ -135347,14 +135808,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hvega_0_7_0_1" = callPackage + "hvega_0_8_0_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , filepath, tasty, tasty-golden, text, unordered-containers }: mkDerivation { pname = "hvega"; - version = "0.7.0.1"; - sha256 = "16s58m7kk72hr52k9gci17ac5k38r1zy08wll2frzjxissgza4cj"; + version = "0.8.0.0"; + sha256 = "1pz4wha9xg58zgxbfahgjz01s0frdk9mlns0m3bwcdgn26n5np68"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base text unordered-containers ]; @@ -135453,36 +135914,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hw-balancedparens_0_4_0_0" = callPackage - ({ mkDerivation, base, bytestring, criterion, deepseq, doctest - , doctest-discover, generic-lens, hedgehog, hspec, hspec-discover - , hw-bits, hw-excess, hw-fingertree, hw-hspec-hedgehog, hw-prim - , hw-rankselect-base, lens, mmap, optparse-applicative - , transformers, vector + "hw-balancedparens_0_4_1_0" = callPackage + ({ mkDerivation, base, bytestring, criterion, deepseq, directory + , doctest, doctest-discover, generic-lens, hedgehog, hspec + , hspec-discover, hw-bits, hw-excess, hw-fingertree + , hw-hspec-hedgehog, hw-int, hw-prim, hw-rankselect-base, lens + , mmap, optparse-applicative, transformers, vector }: mkDerivation { pname = "hw-balancedparens"; - version = "0.4.0.0"; - sha256 = "02yb90i256avjkn7kfqiv55x8jpsiavr7swy1lh9bhga2zhgxnd5"; - revision = "1"; - editedCabalFile = "04s9n77xq5wr2n9zhj85dycxyvnbz0832m7sajrhl6kif4b0rsfv"; + version = "0.4.1.0"; + sha256 = "1ddxg00pwjvlrd4zdx9b9y7hm8rgxsxkvzzvwc34p2y75rivp21l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base deepseq hedgehog hspec hw-bits hw-excess hw-fingertree hw-prim - hw-rankselect-base vector + base deepseq hedgehog hspec hw-bits hw-excess hw-fingertree hw-int + hw-prim hw-rankselect-base vector ]; executableHaskellDepends = [ base bytestring generic-lens hw-bits hw-prim lens mmap optparse-applicative vector ]; testHaskellDepends = [ - base doctest doctest-discover hedgehog hspec hw-bits - hw-hspec-hedgehog hw-prim hw-rankselect-base transformers vector + base directory doctest doctest-discover hedgehog hspec hw-bits + hw-hspec-hedgehog hw-int hw-prim hw-rankselect-base transformers + vector ]; testToolDepends = [ doctest-discover hspec-discover ]; benchmarkHaskellDepends = [ - base criterion hedgehog hw-bits hw-prim vector + base criterion deepseq directory generic-lens hedgehog hw-bits + hw-prim lens vector ]; doHaddock = false; description = "Balanced parentheses"; @@ -135992,47 +136453,6 @@ self: { }) {}; "hw-json-standard-cursor" = callPackage - ({ mkDerivation, array, base, bits-extra, bytestring, criterion - , directory, doctest, doctest-discover, generic-lens, hedgehog - , hspec, hspec-discover, hw-balancedparens, hw-bits - , hw-hspec-hedgehog, hw-json-simd, hw-prim, hw-rankselect - , hw-rankselect-base, lens, mmap, optparse-applicative, text - , vector, word8 - }: - mkDerivation { - pname = "hw-json-standard-cursor"; - version = "0.2.2.0"; - sha256 = "0rj0p3p2b5ghyyfkzvaivzcdsmnjxvqm16n94qpwacaszyca8hny"; - revision = "2"; - editedCabalFile = "07cspws24pxh9i98zylw73fknw6gcvna8qq9r3lcnh455wr3c9m1"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base bits-extra bytestring hw-balancedparens hw-bits - hw-json-simd hw-prim hw-rankselect hw-rankselect-base mmap vector - word8 - ]; - executableHaskellDepends = [ - base bytestring generic-lens hw-balancedparens hw-json-simd hw-prim - hw-rankselect hw-rankselect-base lens mmap optparse-applicative - text vector - ]; - testHaskellDepends = [ - base bits-extra bytestring doctest doctest-discover hedgehog hspec - hw-balancedparens hw-bits hw-hspec-hedgehog hw-prim hw-rankselect - hw-rankselect-base vector - ]; - testToolDepends = [ doctest-discover hspec-discover ]; - benchmarkHaskellDepends = [ - base bytestring criterion directory mmap - ]; - description = "Memory efficient JSON parser"; - license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "hw-json-standard-cursor_0_2_3_1" = callPackage ({ mkDerivation, array, base, bits-extra, bytestring, criterion , directory, doctest, doctest-discover, generic-lens, hedgehog , hspec, hspec-discover, hw-balancedparens, hw-bits @@ -138751,8 +139171,8 @@ self: { }: mkDerivation { pname = "ihaskell"; - version = "0.10.1.0"; - sha256 = "0vbi0cnw0hxm69h90v9rbjaqqfilg4mcrv0rdvmc11jxdiv3qlvw"; + version = "0.10.1.1"; + sha256 = "10rsdcc2l0gkhapvi5vzjc7m2bwv67k4iy3vjkx8i92jk6023y64"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -139076,23 +139496,6 @@ self: { }) {}; "ilist" = callPackage - ({ mkDerivation, base, criterion, hspec, lens, loop, transformers - , vector - }: - mkDerivation { - pname = "ilist"; - version = "0.4.0.0"; - sha256 = "105qz5x03fa713ghxvmivawsaq3l9zf5ab4n09j7i7ryj3dwp4nv"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec transformers ]; - benchmarkHaskellDepends = [ - base criterion lens loop transformers vector - ]; - description = "Optimised list functions for doing index-related things"; - license = stdenv.lib.licenses.mpl20; - }) {}; - - "ilist_0_4_0_1" = callPackage ({ mkDerivation, base, criterion, hspec, lens, loop, transformers , vector }: @@ -139107,7 +139510,6 @@ self: { ]; description = "Optimised list functions for doing index-related things"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "illuminate" = callPackage @@ -139937,6 +140339,29 @@ self: { license = stdenv.lib.licenses.gpl3; }) {}; + "incremental-parser_0_4_0_2" = callPackage + ({ mkDerivation, base, bytestring, checkers, criterion, deepseq + , monoid-subclasses, parsers, QuickCheck, rank2classes, tasty + , tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "incremental-parser"; + version = "0.4.0.2"; + sha256 = "11vip6qxw0y5yza4dcq4iah4kw3lyjsbxgbq1j17p1gr3c3xiafa"; + libraryHaskellDepends = [ + base monoid-subclasses parsers rank2classes transformers + ]; + testHaskellDepends = [ + base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck + ]; + benchmarkHaskellDepends = [ + base bytestring criterion deepseq monoid-subclasses text + ]; + description = "Generic parser library capable of providing partial results from partial input"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "incremental-sat-solver" = callPackage ({ mkDerivation, base, containers, mtl }: mkDerivation { @@ -142644,28 +143069,6 @@ self: { }) {}; "ipython-kernel" = callPackage - ({ mkDerivation, aeson, base, bytestring, cereal, cereal-text - , containers, cryptonite, directory, filepath, memory, mtl, process - , temporary, text, transformers, unordered-containers, uuid - , zeromq4-haskell - }: - mkDerivation { - pname = "ipython-kernel"; - version = "0.10.1.0"; - sha256 = "03sygh5jvigfjg3il49wy41p6ac1wh2gx8wj3hg2rvsh91p9f4dw"; - isLibrary = true; - isExecutable = true; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson base bytestring cereal cereal-text containers cryptonite - directory filepath memory mtl process temporary text transformers - unordered-containers uuid zeromq4-haskell - ]; - description = "A library for creating kernels for IPython frontends"; - license = stdenv.lib.licenses.mit; - }) {}; - - "ipython-kernel_0_10_2_0" = callPackage ({ mkDerivation, aeson, base, bytestring, cereal, cereal-text , containers, cryptonite, directory, filepath, memory, mtl, parsec , process, temporary, text, transformers, unordered-containers @@ -142685,7 +143088,6 @@ self: { ]; description = "A library for creating kernels for IPython frontends"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "irc" = callPackage @@ -142915,8 +143317,8 @@ self: { }: mkDerivation { pname = "ircbot"; - version = "0.6.5.3"; - sha256 = "0i9wrnlwf51wp3xgksj451nw6rxf2qghyhcjz7ihdxmqivbc6167"; + version = "0.6.6"; + sha256 = "1nmqgimmmxry4pj1y5mfsp662hkivn0vr9n8rx1yn0aldlzrxdm8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -143338,6 +143740,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "it-has" = callPackage + ({ mkDerivation, base, generic-lens, QuickCheck }: + mkDerivation { + pname = "it-has"; + version = "0.1.0.0"; + sha256 = "11vfh01hwxg2jg2qwignvnjlms2issm94sqqvqy4mnm1vgphdbyx"; + libraryHaskellDepends = [ base generic-lens ]; + testHaskellDepends = [ base generic-lens QuickCheck ]; + description = "Automatically derivable Has instances"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "itanium-abi" = callPackage ({ mkDerivation, base, boomerang, HUnit, process, test-framework , test-framework-hunit, text, transformers, unordered-containers @@ -145051,6 +145465,38 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "jose_0_8_3" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , bytestring, concise, containers, cryptonite, hspec, lens, memory + , monad-time, mtl, network-uri, pem, QuickCheck + , quickcheck-instances, safe, semigroups, tasty, tasty-hspec + , tasty-quickcheck, template-haskell, text, time + , unordered-containers, vector, x509 + }: + mkDerivation { + pname = "jose"; + version = "0.8.3"; + sha256 = "0izrbjcmsiv67d2vmiqgmnzn27pvs0kvka3rw5x33fwjgq0b3jyv"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring bytestring concise + containers cryptonite lens memory monad-time mtl network-uri + QuickCheck quickcheck-instances safe semigroups template-haskell + text time unordered-containers vector x509 + ]; + testHaskellDepends = [ + aeson attoparsec base base64-bytestring bytestring concise + containers cryptonite hspec lens memory monad-time mtl network-uri + pem QuickCheck quickcheck-instances safe semigroups tasty + tasty-hspec tasty-quickcheck template-haskell text time + unordered-containers vector x509 + ]; + description = "Javascript Object Signing and Encryption and JSON Web Token library"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "jose-jwt" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal , containers, criterion, cryptonite, doctest, either, hspec, HUnit @@ -146557,8 +147003,8 @@ self: { }: mkDerivation { pname = "juicy-gcode"; - version = "0.1.0.5.2"; - sha256 = "14pd0gl2an4mkxkhcx2ybvzdfx2izcnm05p7p7kncf5wdgmkn0px"; + version = "0.1.0.7"; + sha256 = "000qbmbm4gm9wv0q1vgn6y17g6ah0cx5jhcv311mwdfiq70k6ga4"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -146631,6 +147077,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "junit-xml_0_1_0_1" = callPackage + ({ mkDerivation, base, tasty, tasty-golden, text, xml-conduit }: + mkDerivation { + pname = "junit-xml"; + version = "0.1.0.1"; + sha256 = "1r75ncsmr5yj7xbgrw4sipjii7l3v7hj6nfi1lidc26n4m7r8ib1"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ base text xml-conduit ]; + testHaskellDepends = [ base tasty tasty-golden ]; + description = "Producing JUnit-style XML test reports"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "jupyter" = callPackage ({ mkDerivation, aeson, async, base, bytestring, cereal, containers , directory, exceptions, extra, filepath, monad-control, mtl @@ -148543,17 +149003,6 @@ self: { }) {}; "kind-generics" = callPackage - ({ mkDerivation, base, kind-apply }: - mkDerivation { - pname = "kind-generics"; - version = "0.4.0.0"; - sha256 = "1w3rpvdvgfczsc86y00qbr9s9r8vmv442m4x975f3zcqs4algfhp"; - libraryHaskellDepends = [ base kind-apply ]; - description = "Generic programming in GHC style for arbitrary kinds and GADTs"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "kind-generics_0_4_1_0" = callPackage ({ mkDerivation, base, kind-apply }: mkDerivation { pname = "kind-generics"; @@ -148562,26 +149011,9 @@ self: { libraryHaskellDepends = [ base kind-apply ]; description = "Generic programming in GHC style for arbitrary kinds and GADTs"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kind-generics-th" = callPackage - ({ mkDerivation, base, ghc-prim, kind-generics, template-haskell - , th-abstraction - }: - mkDerivation { - pname = "kind-generics-th"; - version = "0.2.1.0"; - sha256 = "08mswzwm1byxx2hfc8h2b90pnn2p4y83kdrvl4mlcn6v488k2lkb"; - libraryHaskellDepends = [ - base ghc-prim kind-generics template-haskell th-abstraction - ]; - testHaskellDepends = [ base kind-generics template-haskell ]; - description = "Template Haskell support for generating `GenericK` instances"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "kind-generics-th_0_2_2_0" = callPackage ({ mkDerivation, base, ghc-prim, kind-generics, template-haskell , th-abstraction }: @@ -148595,7 +149027,6 @@ self: { testHaskellDepends = [ base kind-generics template-haskell ]; description = "Template Haskell support for generating `GenericK` instances"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "kinds" = callPackage @@ -148773,6 +149204,23 @@ self: { broken = true; }) {}; + "knit" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, hashtables + , vector + }: + mkDerivation { + pname = "knit"; + version = "0.1.0.0"; + sha256 = "0ypa7bj89zbkgyryms6nzwhqpp15hs52ynjvisdsng1xpgmf65dy"; + libraryHaskellDepends = [ + base bytestring containers deepseq hashtables vector + ]; + testHaskellDepends = [ base ]; + doHaddock = false; + description = "Ties the knot on data structures that reference each other by unique keys"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "knit-haskell" = callPackage ({ mkDerivation, aeson-pretty, base, base64-bytestring , blaze-colonnade, blaze-html, bytestring, case-insensitive @@ -150670,8 +151118,8 @@ self: { ({ mkDerivation, base, pretty }: mkDerivation { pname = "language-css"; - version = "0.0.3"; - sha256 = "1g0mh08rz44533473isrqbfn6hp12np9dxm85cn5xpx68jl9ni9g"; + version = "0.0.3.1"; + sha256 = "0gwsa9i9jxlnp60z3dh1rkk2zds74llxwjxzrsnhbmi71rmmiggx"; libraryHaskellDepends = [ base pretty ]; description = "CSS 2.1 syntax"; license = stdenv.lib.licenses.bsd3; @@ -151989,8 +152437,8 @@ self: { }: mkDerivation { pname = "latex-svg-pandoc"; - version = "0.2"; - sha256 = "1qzp5y7slklq8p1m6bspzyx7iypd5mq3q0hmxdysivisw776f0aq"; + version = "0.2.1"; + sha256 = "12rwapjx4whsw4id4rijwcqksfblp0mnvf0xrvj6pf17pgg4qh52"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -154796,6 +155244,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "libsodium" = callPackage + ({ mkDerivation, base, hedgehog, libsodium, tasty, tasty-hedgehog + , tasty-hunit + }: + mkDerivation { + pname = "libsodium"; + version = "1.0.18.0"; + sha256 = "1qp3ca673d71fiz48pgnc0ywgchar9j62wzayqgdvjkpbwq731am"; + libraryHaskellDepends = [ base ]; + libraryPkgconfigDepends = [ libsodium ]; + testHaskellDepends = [ + base hedgehog tasty tasty-hedgehog tasty-hunit + ]; + testPkgconfigDepends = [ libsodium ]; + description = "Low-level bindings to the libsodium C library"; + license = stdenv.lib.licenses.isc; + }) {inherit (pkgs) libsodium;}; + "libssh2" = callPackage ({ mkDerivation, base, bytestring, c2hs, libssh2, network, syb , time, unix @@ -155900,8 +156366,8 @@ self: { ({ mkDerivation, base, sbv }: mkDerivation { pname = "linearEqSolver"; - version = "2.0"; - sha256 = "0dianwg8r4b6x6z17d994kmhjmqwdx083vlm9rzakfkn7p773l8w"; + version = "2.3"; + sha256 = "0lrrgix4m2sbfw9ydcqnx45lka0grl8ndiiy3cs1xg4xpcy2fkjw"; libraryHaskellDepends = [ base sbv ]; description = "Use SMT solvers to solve linear systems over integers and rationals"; license = stdenv.lib.licenses.bsd3; @@ -156956,8 +157422,8 @@ self: { }: mkDerivation { pname = "list-tries"; - version = "0.6.6"; - sha256 = "0n837h2ffgqgram5kvnshlqk5jc87bw49z4pxa94qdmc323z51ak"; + version = "0.6.7"; + sha256 = "110y66kkbi6m55b3ba7p1r25xnf6n59yz2kdp4qf6s8c7a5i0wzh"; libraryHaskellDepends = [ base binary containers dlist ]; testHaskellDepends = [ base binary ChasingBottoms HUnit QuickCheck template-haskell @@ -157189,8 +157655,8 @@ self: { }: mkDerivation { pname = "little-rio"; - version = "0.1.0"; - sha256 = "0i0z0rc1wc46rsfn1i11xp5r2sxd5i11vcjzdmbkqadp6ms8ahv0"; + version = "0.1.1"; + sha256 = "0yxxmad9709h1gpxzjhvqmjhn3m8dcishd9gs6bakc2hrapw2ss2"; libraryHaskellDepends = [ base exceptions microlens microlens-mtl mtl unliftio-core ]; @@ -158218,10 +158684,8 @@ self: { }: mkDerivation { pname = "log-base"; - version = "0.8.0.0"; - sha256 = "15539v6y6s46kgb86ns13rh17c1qnidwdajk26yaxyqky58yx2m6"; - revision = "1"; - editedCabalFile = "0kdkvyw39ywly1qv1l0sq5qzr1akigl8410vr647hy2cn46anva0"; + version = "0.8.0.1"; + sha256 = "0s8w464yalbcgq3vq819mw9fsgj6a9rfbf00843311kqryml2a49"; libraryHaskellDepends = [ aeson aeson-pretty base bytestring deepseq exceptions mmorph monad-control monad-time mtl semigroups stm text time @@ -158321,10 +158785,8 @@ self: { }: mkDerivation { pname = "log-postgres"; - version = "0.7.1.1"; - sha256 = "1mx43qbv9rbzzkxz7qgwgp26aq00a97rwka7a823l5hm5hamx74k"; - revision = "1"; - editedCabalFile = "012vyqrw0ncwxdrlbcb97x9lcmaizxspfc9dd5jxq8dfmqw5xgq7"; + version = "0.7.1.3"; + sha256 = "132q4cx0a2malzncm7bscjikpqaaz6fwzz6n8mhqianbpq02s0v1"; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bytestring deepseq hpqtypes http-client lifted-base log-base mtl semigroups split text @@ -159553,26 +160015,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "lsp-test_0_10_3_0" = callPackage + "lsp-test_0_11_0_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default - , Diff, directory, filepath, haskell-lsp, hspec, lens, mtl + , Diff, directory, filepath, Glob, haskell-lsp, hspec, lens, mtl , parser-combinators, process, text, transformers, unix , unordered-containers }: mkDerivation { pname = "lsp-test"; - version = "0.10.3.0"; - sha256 = "1gj6f99k3kd0flh2nbpj5wnhi1ql5rlijw0vf4l53zwxy203r7k8"; + version = "0.11.0.1"; + sha256 = "0s2sabykaaklw32z6j9z1m7l22ayc736sih39fhlq83iwgpv1917"; + revision = "1"; + editedCabalFile = "08lqzsw41vps1z8zihhsja95h5k73g5gpf689x2ryxn6ch13052v"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal async base bytestring conduit - conduit-parse containers data-default Diff directory filepath + conduit-parse containers data-default Diff directory filepath Glob haskell-lsp lens mtl parser-combinators process text transformers unix unordered-containers ]; testHaskellDepends = [ - aeson base data-default haskell-lsp hspec lens text - unordered-containers + aeson base data-default directory filepath haskell-lsp hspec lens + text unordered-containers ]; description = "Functional test framework for LSP servers"; license = stdenv.lib.licenses.bsd3; @@ -161018,10 +161484,10 @@ self: { ({ mkDerivation, base, deepseq, profunctors, semigroups }: mkDerivation { pname = "magma"; - version = "0.4.0.0"; - sha256 = "18s93ap84cd74sl89fy89dpj89j6qxayc1v771n0zhshbp7g9gkz"; + version = "0.5.0.0"; + sha256 = "17ca22bs44whr597p7shv4fnpngbrb8vdxs6zbglfhb69bgjljyy"; libraryHaskellDepends = [ base deepseq profunctors semigroups ]; - description = "magma is an algebraic structure consisting a set together with an binary operation"; + description = "magma is an algebraic structure"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -162585,7 +163051,7 @@ self: { broken = true; }) {}; - "massiv_0_5_1_0" = callPackage + "massiv_0_5_2_0" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-doctest , data-default-class, deepseq, doctest, exceptions , mersenne-random-pure64, primitive, QuickCheck, random, scheduler @@ -162593,8 +163059,8 @@ self: { }: mkDerivation { pname = "massiv"; - version = "0.5.1.0"; - sha256 = "062b9mg1nqsg7lfv4a85s994jg1fipikpvxdb9w6ci3dqiq41dx0"; + version = "0.5.2.0"; + sha256 = "0j44as40bgzjixiga4l06gr3fpgk8vifmz2y12asczxwfv6k0xp1"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring data-default-class deepseq exceptions primitive @@ -164284,6 +164750,21 @@ self: { license = stdenv.lib.licenses.mpl20; }) {}; + "membrain_0_0_0_2" = callPackage + ({ mkDerivation, base, doctest, Glob, hedgehog, hspec, type-spec }: + mkDerivation { + pname = "membrain"; + version = "0.0.0.2"; + sha256 = "1nizjkiggm2ws8kkjw6v96a611kim4yjg4kdrk0rd83fa1zcf7cc"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ + base doctest Glob hedgehog hspec type-spec + ]; + description = "Type-safe memory units"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "memcache" = callPackage ({ mkDerivation, base, binary, blaze-builder, bytestring, criterion , data-default-class, hashable, network, resource-pool, time @@ -166211,6 +166692,28 @@ self: { broken = true; }) {}; + "minilight-lua" = callPackage + ({ mkDerivation, base, bytestring, containers, exceptions, hslua + , lens, linear, minilight, mtl, sdl2, sdl2-ttf, text, unix-time + }: + mkDerivation { + pname = "minilight-lua"; + version = "0.2.0.0"; + sha256 = "0q3w90rk7rlsy3p0iz91f3p7fsrbdsvirxq7xsb87hdbqxdwsavh"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers exceptions hslua linear minilight mtl + sdl2 sdl2-ttf text unix-time + ]; + executableHaskellDepends = [ base lens minilight mtl ]; + description = "A binding library of minilight for Lua langauge"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "minimal-configuration" = callPackage ({ mkDerivation, base, containers, directory, filepath }: mkDerivation { @@ -167129,8 +167632,8 @@ self: { ({ mkDerivation, base, vector }: mkDerivation { pname = "mmsyn2"; - version = "0.1.7.0"; - sha256 = "1laskxwmylmg7mzm4h6z013s7rhfxf9y1mrvy4dp1cc80kq3scg0"; + version = "0.1.8.0"; + sha256 = "1qdbf89i5yx6ag9k4a9scc6wbm765b8zhq0gi12zx0bq75jjz3qz"; libraryHaskellDepends = [ base vector ]; description = "The library that can be used for multiple (Ord a) => a -> b transformations"; license = stdenv.lib.licenses.mit; @@ -167140,8 +167643,8 @@ self: { ({ mkDerivation, base, directory }: mkDerivation { pname = "mmsyn3"; - version = "0.1.4.0"; - sha256 = "1i93744jprkg94lwcas2hvb341m6j08ncn1lzlz6d8z2blpd5z4w"; + version = "0.1.5.0"; + sha256 = "0fpn0lzr93aaha9741spc7vmlg5c4x5wb3p4qvxzp57w85zqdwm3"; libraryHaskellDepends = [ base directory ]; description = "A small library to deal with executable endings"; license = stdenv.lib.licenses.mit; @@ -167152,10 +167655,13 @@ self: { }: mkDerivation { pname = "mmsyn4"; - version = "0.1.6.0"; - sha256 = "0kz7wpfpvfayb6jgd0wwrb3dljcigmqdiixb7b86vyh36nzxhcfj"; - isLibrary = false; + version = "0.2.0.0"; + sha256 = "0915a1kh0sl9maq0i5hp6d87n19wihncx6sgm7wznfmzlvgs36qw"; + isLibrary = true; isExecutable = true; + libraryHaskellDepends = [ + base directory mmsyn2 mmsyn3 process vector + ]; executableHaskellDepends = [ base directory mmsyn2 mmsyn3 process vector ]; @@ -167167,8 +167673,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "mmsyn5"; - version = "0.4.3.0"; - sha256 = "02ndmx1ndm87i2xlnaarw8yljjki1k7ak0jyb5s0c7hkvlrl7qax"; + version = "0.4.4.0"; + sha256 = "1yvsx82x7m5y2swxllhb7zzgspb3lfdhrbw6n5v3xsa9vxhwa35l"; libraryHaskellDepends = [ base ]; description = "Various additional operations on lists (some with intermediate Monads)"; license = stdenv.lib.licenses.mit; @@ -167180,8 +167686,8 @@ self: { }: mkDerivation { pname = "mmsyn6ukr"; - version = "0.6.3.1"; - sha256 = "0iyyw02w4mw2g66dqs2ihd5qs4qrs4dcaql7y8gd3gc26mhn7svq"; + version = "0.7.2.0"; + sha256 = "03h2rcv8214jbbfw5wb4f1icv9lwn6jwvjp3a2cjpli425ira7kj"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -167201,8 +167707,8 @@ self: { }: mkDerivation { pname = "mmsyn7h"; - version = "0.7.5.0"; - sha256 = "17haan991lzs5qs4gzywhk4vpn9dvgasdm9ff8hzs5h6a0604sfn"; + version = "0.7.6.0"; + sha256 = "0z8r6d7my2hbp8g2l3258461f53kx8zm3fzyq605vk4y9z6k6icb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -167221,8 +167727,8 @@ self: { ({ mkDerivation, base, directory, mmsyn2, mmsyn7ukr, vector }: mkDerivation { pname = "mmsyn7l"; - version = "0.4.2.0"; - sha256 = "1dpilwaffrkihfgbpq7p1095qpx9qgcpzbs8q3kld948hliihix7"; + version = "0.4.3.0"; + sha256 = "0kr5aig2zgps846bx9psrci7hm35zdnaxbd5pm3ir1c7pxqf4csx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory mmsyn2 mmsyn7ukr vector ]; @@ -167237,8 +167743,8 @@ self: { ({ mkDerivation, base, mmsyn2, mmsyn5, mmsyn6ukr, vector }: mkDerivation { pname = "mmsyn7s"; - version = "0.6.6.0"; - sha256 = "0hmsf7l3p2b2zj5ydjzxzkgqsj53yjwn71vgw8qzhbxjihk5x6l2"; + version = "0.6.7.0"; + sha256 = "14siy618rby0x9s94cqlpn4ymx6d589vb9f3mnqly7ykf53rwbi3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mmsyn2 mmsyn5 mmsyn6ukr vector ]; @@ -167253,8 +167759,8 @@ self: { }: mkDerivation { pname = "mmsyn7ukr"; - version = "0.15.3.0"; - sha256 = "02556sgfwi0fzlwj0x22hmyi9pgq0j7w4yfpjy2ni1px8vanwq5j"; + version = "0.15.4.0"; + sha256 = "0qiv2bc5aizpizmrjcsr2j6pi427xbk9pbgjyv4fr8mf7q3vcdjv"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -169110,6 +169616,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monadic-recursion-schemes" = callPackage + ({ mkDerivation, base, comonad, containers, free, mtl + , recursion-schemes, transformers + }: + mkDerivation { + pname = "monadic-recursion-schemes"; + version = "0.1.7.0"; + sha256 = "16smzgbachi31xr9pmps7habwfb5577i3s0c9x2a81zl5wg23p30"; + libraryHaskellDepends = [ + base comonad containers free mtl recursion-schemes transformers + ]; + testHaskellDepends = [ base ]; + description = "Recursion Schemes for Monadic version"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "monadiccp" = callPackage ({ mkDerivation, base, containers, mtl, parsec, pretty, random , semigroups @@ -170274,19 +170796,19 @@ self: { "moto" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , cryptohash-sha1, df1, di, di-core, di-df1, directory, filepath - , mtl, optparse-applicative, pipes, pipes-attoparsec + , mtl, optparse-applicative, pipes, pipes-aeson, pipes-attoparsec , pipes-bytestring, random, safe-exceptions, tasty, tasty-hunit , tasty-quickcheck, text, time, transformers }: mkDerivation { pname = "moto"; - version = "0.0.3"; - sha256 = "1grvw5dlg6gjf83rhz45hnh73p74v85kmyn9yfi2gwbxcs7fsmvx"; + version = "0.0.4"; + sha256 = "04i85y0h5dqaz6iy7wrirgrm4bncygnmjjb5ncjzdf9c0lvmnab9"; libraryHaskellDepends = [ aeson attoparsec base bytestring containers cryptohash-sha1 df1 di-core di-df1 directory filepath mtl optparse-applicative pipes - pipes-attoparsec pipes-bytestring safe-exceptions text time - transformers + pipes-aeson pipes-attoparsec pipes-bytestring safe-exceptions text + time transformers ]; testHaskellDepends = [ base bytestring containers di di-core directory filepath random @@ -170299,15 +170821,16 @@ self: { }) {}; "moto-postgresql" = callPackage - ({ mkDerivation, base, bytestring, moto, postgresql-simple - , safe-exceptions + ({ mkDerivation, base, bytestring, df1, di-df1, moto + , postgresql-simple, safe-exceptions, text }: mkDerivation { pname = "moto-postgresql"; - version = "0.0.1"; - sha256 = "0z5kxphsgywmnv33lf95by9gxlgr6i8y8lq7sqy495f87b1jv62d"; + version = "0.0.2"; + sha256 = "1n6xzcg6iqh9l4jkhq03hl11kh0614z41kv2pvw26bsknv4rp0cx"; libraryHaskellDepends = [ - base bytestring moto postgresql-simple safe-exceptions + base bytestring df1 di-df1 moto postgresql-simple safe-exceptions + text ]; description = "PostgreSQL-based migrations registry for moto"; license = stdenv.lib.licenses.asl20; @@ -174545,8 +175068,8 @@ self: { pname = "natural-transformation"; version = "0.4"; sha256 = "1by8xwjc23l6pa9l4iv7zp82dykpll3vc3hgxk0pgva724n8xhma"; - revision = "7"; - editedCabalFile = "03nkhdrwki9j81clgfck4yl7ylv6dwa7gi77kknzq3s3nqlp728v"; + revision = "8"; + editedCabalFile = "007vgw2zaf2z9fyi9f0spmqn6fd8j438r3vnkgmazzvb43szmi0n"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base containers quickcheck-instances tasty tasty-quickcheck @@ -175942,6 +176465,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network-byte-order_0_1_5" = callPackage + ({ mkDerivation, base, bytestring, doctest }: + mkDerivation { + pname = "network-byte-order"; + version = "0.1.5"; + sha256 = "0480asy7acf1bdc4n0761rax7dijbkjkyrqfl9rdwqvmbr3viy6c"; + libraryHaskellDepends = [ base bytestring ]; + testHaskellDepends = [ base bytestring doctest ]; + description = "Network byte order utilities"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-bytestring" = callPackage ({ mkDerivation, base, bytestring, network, unix }: mkDerivation { @@ -176395,8 +176931,8 @@ self: { ({ mkDerivation, base, bytestring, network }: mkDerivation { pname = "network-run"; - version = "0.2.2"; - sha256 = "1znf2pafcg1gcrb3yyc69h6y5mb8hilibr5khcwil09i5djsjyxx"; + version = "0.2.3"; + sha256 = "026l8j1nfgvs3lknn3fvsjj4x4niykhn99h5kywc47347b91xl3n"; libraryHaskellDepends = [ base bytestring network ]; description = "Simple network runner library"; license = stdenv.lib.licenses.bsd3; @@ -176941,40 +177477,43 @@ self: { }) {inherit (pkgs) blas;}; "neuron" = callPackage - ({ mkDerivation, aeson, algebraic-graphs, base, clay, containers + ({ mkDerivation, aeson, aeson-gadt-th, algebraic-graphs, base, clay + , containers, data-default, dependent-sum, dependent-sum-template , dhall, directory, exceptions, file-embed, filepath, filepattern - , foldl, gitrev, hspec, lucid, mmark, mmark-ext, modern-uri - , optparse-applicative, pandoc, path, path-io, QuickCheck, relude - , rib, shake, text, time, unix, which, with-utf8 + , foldl, gitrev, hspec, lucid, megaparsec, mmark, mmark-ext + , modern-uri, mtl, optparse-applicative, pandoc, parser-combinators + , QuickCheck, relude, rib, shake, text, time, unix, uuid, which + , with-utf8 }: mkDerivation { pname = "neuron"; - version = "0.2.0.0"; - sha256 = "0f58yas3wmi2rv33lsxrj68yq3vvx8wl8gz5p93fd94zk7xgd46q"; + version = "0.4.0.0"; + sha256 = "1iw63qnq484zhi2fil050hswz1hl9cvygpqalhbbhnvry3f9bqkf"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson algebraic-graphs base clay containers dhall directory - exceptions file-embed filepath filepattern foldl gitrev lucid mmark - mmark-ext modern-uri optparse-applicative pandoc path path-io - relude rib shake text time unix which + aeson algebraic-graphs base containers filepath filepattern + megaparsec mmark mtl parser-combinators relude text time ]; executableHaskellDepends = [ - aeson algebraic-graphs base clay containers dhall directory - exceptions file-embed filepath filepattern foldl gitrev lucid mmark - mmark-ext modern-uri optparse-applicative pandoc path path-io - relude rib shake text time unix which with-utf8 + aeson aeson-gadt-th algebraic-graphs base clay containers + data-default dependent-sum dependent-sum-template dhall directory + exceptions file-embed filepath filepattern foldl gitrev lucid + megaparsec mmark mmark-ext modern-uri mtl optparse-applicative + pandoc parser-combinators relude rib shake text time unix uuid + which with-utf8 ]; testHaskellDepends = [ - aeson algebraic-graphs base clay containers dhall directory + aeson aeson-gadt-th algebraic-graphs base clay containers + data-default dependent-sum dependent-sum-template dhall directory exceptions file-embed filepath filepattern foldl gitrev hspec lucid - mmark mmark-ext modern-uri optparse-applicative pandoc path path-io - QuickCheck relude rib shake text time unix which + megaparsec mmark mmark-ext modern-uri mtl optparse-applicative + pandoc parser-combinators QuickCheck relude rib shake text time + unix uuid which with-utf8 ]; description = "Haskell meets Zettelkasten, for your plain-text delight"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "newhope" = callPackage @@ -181856,12 +182395,12 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "opentelemetry_0_3_2" = callPackage + "opentelemetry_0_4_0" = callPackage ({ mkDerivation, base, bytestring, exceptions }: mkDerivation { pname = "opentelemetry"; - version = "0.3.2"; - sha256 = "0km45i5zv6v977ivv0rh7273nsnlqlwci79r5qnr9lhxwy8c0xsv"; + version = "0.4.0"; + sha256 = "1wp6r6625qangiw3lk2nj64khbb0jnp7rxb8s78q37icpdax9ck8"; libraryHaskellDepends = [ base bytestring exceptions ]; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -181870,29 +182409,31 @@ self: { "opentelemetry-extra" = callPackage ({ mkDerivation, aeson, async, base, bytestring, clock, containers , directory, exceptions, filepath, ghc-events, hashable - , http-client, http-client-tls, http-types, opentelemetry, random - , scientific, splitmix, stm, tasty, tasty-discover, tasty-hunit - , tasty-quickcheck, text, unordered-containers + , http-client, http-client-tls, http-types, opentelemetry + , QuickCheck, random, scientific, splitmix, stm, tasty + , tasty-discover, tasty-hunit, tasty-quickcheck, text, text-show + , typed-process, unordered-containers }: mkDerivation { pname = "opentelemetry-extra"; - version = "0.3.2"; - sha256 = "1kkzi5cxv1mdb1i22bzrhr2vq4xb3kkkqs8smc6dps3pqswbxpyg"; + version = "0.4.0"; + sha256 = "07bzs9nz6hmy2cqa84wi3vbhfz0l6da5w5ihzmajxi7b2w940h0r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async base bytestring clock containers directory exceptions filepath ghc-events hashable http-client http-client-tls http-types - opentelemetry random scientific splitmix stm text + opentelemetry random scientific splitmix stm text text-show unordered-containers ]; executableHaskellDepends = [ async base clock exceptions filepath http-client http-client-tls - opentelemetry text + opentelemetry text typed-process ]; testHaskellDepends = [ - base bytestring opentelemetry tasty tasty-discover tasty-hunit - tasty-quickcheck + base bytestring ghc-events hashable opentelemetry QuickCheck tasty + tasty-discover tasty-hunit tasty-quickcheck text text-show + unordered-containers ]; testToolDepends = [ tasty-discover ]; license = stdenv.lib.licenses.asl20; @@ -181919,12 +182460,13 @@ self: { ({ mkDerivation, aeson, async, base, bytestring, clock, containers , exceptions, filepath, ghc-events, http-client, http-client-tls , http-types, network, opentelemetry, opentelemetry-extra - , scientific, splitmix, stm, text, unordered-containers + , scientific, splitmix, stm, text, typed-process + , unordered-containers }: mkDerivation { pname = "opentelemetry-lightstep"; - version = "0.3.2"; - sha256 = "0zpp17dgblx8gl6xlban5gcs2y8qfy39k8c3spaif4gbw9qc21yv"; + version = "0.4.0"; + sha256 = "13glzxw93nx7gxqyisn7ikg2g9gl19mapl75p13binhip5ygcvpd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -181935,7 +182477,7 @@ self: { executableHaskellDepends = [ async base bytestring clock containers exceptions filepath ghc-events http-client http-types opentelemetry opentelemetry-extra - splitmix text unordered-containers + splitmix text typed-process unordered-containers ]; license = stdenv.lib.licenses.asl20; hydraPlatforms = stdenv.lib.platforms.none; @@ -181948,8 +182490,8 @@ self: { }: mkDerivation { pname = "opentelemetry-wai"; - version = "0.3.2"; - sha256 = "0l10bwrzpsn74l9xk6sdbdpjf49kf4ak9s3z95ib56vrhs0nrkz0"; + version = "0.4.0"; + sha256 = "00nvclimx6jh8sa3hfdrfag8sa29yqqknfqh3sg37sh0fbcqghjg"; libraryHaskellDepends = [ base bytestring http-types opentelemetry text wai ]; @@ -186898,7 +187440,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "password_2_0_0_1" = callPackage + "password_2_0_1_0" = callPackage ({ mkDerivation, base, base-compat, base64, bytestring, Cabal , cabal-doctest, cryptonite, doctest, memory, QuickCheck , quickcheck-instances, scrypt, tasty, tasty-quickcheck @@ -186906,8 +187448,8 @@ self: { }: mkDerivation { pname = "password"; - version = "2.0.0.1"; - sha256 = "1qxmmp0r8pkp6334213qai5y3wcg7w0jw9qp3m66mxaspjnfkpmw"; + version = "2.0.1.0"; + sha256 = "1f4bzjhpvxp3ms0nnh04g91wd77l09hvp1m7l6clc51frflh3j04"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base base64 bytestring cryptonite memory text @@ -188263,17 +188805,18 @@ self: { "penntreebank-megaparsec" = callPackage ({ mkDerivation, base, containers, hspec, hspec-discover - , megaparsec, mtl, text, transformers + , megaparsec, mtl, template-haskell, text, transformers }: mkDerivation { pname = "penntreebank-megaparsec"; - version = "0.1.0"; - sha256 = "1wjwwpb1i10kasqxn9gkn34cpyjs83znmr6ps5sjr0zhqyg3dk3j"; + version = "0.2.0"; + sha256 = "1238y2wya0ryas58n0b0l4gjmsrzl0dwns0f4gx5m8q6aq4d33c9"; libraryHaskellDepends = [ - base containers megaparsec mtl transformers + base containers megaparsec mtl template-haskell transformers ]; testHaskellDepends = [ - base containers hspec megaparsec mtl text transformers + base containers hspec megaparsec mtl template-haskell text + transformers ]; testToolDepends = [ hspec-discover ]; description = "Parser combinators for trees in the Penn Treebank format"; @@ -188769,6 +189312,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "persist_0_1_1_5" = callPackage + ({ mkDerivation, base, bytestring, containers, QuickCheck + , test-framework, test-framework-quickcheck2, text + }: + mkDerivation { + pname = "persist"; + version = "0.1.1.5"; + sha256 = "19s0jpbcas6c64lzl9plhp1b3qk89g3jrqhj2ljxvkzk81dbr2r3"; + libraryHaskellDepends = [ base bytestring containers text ]; + testHaskellDepends = [ + base bytestring QuickCheck test-framework + test-framework-quickcheck2 text + ]; + description = "Minimal serialization library with focus on performance"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persist2er" = callPackage ({ mkDerivation, base, optparse-applicative, persistent, text }: mkDerivation { @@ -193062,23 +193623,18 @@ self: { "plzwrk" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, hashable - , haskell-src-meta, hspec, mtl, neat-interpolation, parsec, split - , template-haskell, text, transformers, unordered-containers + , haskell-src-meta, hspec, mtl, parsec, split, template-haskell + , text, transformers, unordered-containers }: mkDerivation { pname = "plzwrk"; - version = "0.0.0.7"; - sha256 = "0llag2lgdb5d61961b6sjvl2v0mxbyvnz84ikzs87bf5gjm4v32j"; - isLibrary = true; - isExecutable = true; + version = "0.0.0.9"; + sha256 = "0wszr36ypaig8bijhn7v0d487vas423whrkxsv5q5l2xganr05cp"; libraryHaskellDepends = [ aeson base bytestring containers hashable haskell-src-meta mtl parsec split template-haskell text transformers unordered-containers ]; - executableHaskellDepends = [ - base containers neat-interpolation text unordered-containers - ]; testHaskellDepends = [ base hspec mtl text unordered-containers ]; description = "A front-end framework"; license = stdenv.lib.licenses.bsd3; @@ -195450,22 +196006,20 @@ self: { }) {}; "postgresql-syntax" = callPackage - ({ mkDerivation, base, bytestring, case-insensitive, containers - , contravariant, fast-builder, foldl, hashable, headed-megaparsec - , hedgehog, megaparsec, parser-combinators, QuickCheck - , quickcheck-instances, rerebase, selective, tasty, tasty-hunit - , tasty-quickcheck, text, text-builder, unordered-containers, uuid - , vector + ({ mkDerivation, base, bytestring, case-insensitive, fast-builder + , hashable, headed-megaparsec, hedgehog, megaparsec + , parser-combinators, QuickCheck, quickcheck-instances, rerebase + , tasty, tasty-hunit, tasty-quickcheck, text, text-builder + , unordered-containers }: mkDerivation { pname = "postgresql-syntax"; - version = "0.2.0.1"; - sha256 = "0qp108cz7ch193hpfl03xffaxpn32zaaxhsv2fj5rbpvvyny3rx1"; + version = "0.3.0.2"; + sha256 = "1gl0k3idcgpnahh8mv01mjzhc4yx6i3f7shfa7mqhcgs6r1ccdhz"; libraryHaskellDepends = [ - base bytestring case-insensitive containers contravariant - fast-builder foldl hashable headed-megaparsec megaparsec - parser-combinators selective text text-builder unordered-containers - uuid vector + base bytestring case-insensitive fast-builder hashable + headed-megaparsec megaparsec parser-combinators text text-builder + unordered-containers ]; testHaskellDepends = [ hedgehog QuickCheck quickcheck-instances rerebase tasty tasty-hunit @@ -197860,14 +198414,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "process_1_6_8_2" = callPackage + "process_1_6_9_0" = callPackage ({ mkDerivation, base, bytestring, deepseq, directory, filepath , unix }: mkDerivation { pname = "process"; - version = "1.6.8.2"; - sha256 = "1gdz227gmpax92xmwrvj9nrylybh4kk7m4yqr8qwa9i34dg1jzqx"; + version = "1.6.9.0"; + sha256 = "1shxwl392swdqffxdg2940y3yiml24iww9cy2pk89pv8r89x7yzy"; libraryHaskellDepends = [ base deepseq directory filepath unix ]; testHaskellDepends = [ base bytestring directory ]; description = "Process libraries"; @@ -204974,6 +205528,28 @@ self: { broken = true; }) {}; + "rbst" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, doctest + , gauge, Glob, hspec, hspec-core, hspec-expectations + , mersenne-random-pure64, mwc-random, QuickCheck, text + , transformers + }: + mkDerivation { + pname = "rbst"; + version = "0.0.0.1"; + sha256 = "0f2pp1vqrwcn0lh0261acmhbwlcmc6sh2dkqhcl67xk2h62d9ipj"; + libraryHaskellDepends = [ + base bytestring containers deepseq mersenne-random-pure64 text + transformers + ]; + testHaskellDepends = [ + base doctest Glob hspec hspec-core hspec-expectations QuickCheck + ]; + benchmarkHaskellDepends = [ base gauge mwc-random ]; + description = "Randomized Binary Search Trees"; + license = stdenv.lib.licenses.mit; + }) {}; + "rc" = callPackage ({ mkDerivation, base, dde, hmatrix, Learning, linear, random , vector @@ -205832,8 +206408,8 @@ self: { }: mkDerivation { pname = "reanimate"; - version = "0.2.0.2"; - sha256 = "14912rzn8bgrz92q7nv3yjxyfdjcznfgs2x1rnw1mc6q8imrfppy"; + version = "0.3.1.0"; + sha256 = "02fvr4smzmgksi8cvxz8yms0qzyxxzypcl3fzl0lsfsm9sdwmcaz"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-wl-pprint attoparsec base base64-bytestring bytestring @@ -206015,23 +206591,6 @@ self: { }) {}; "record-dot-preprocessor" = callPackage - ({ mkDerivation, base, extra, filepath, ghc, record-hasfield - , uniplate - }: - mkDerivation { - pname = "record-dot-preprocessor"; - version = "0.2.3"; - sha256 = "0pmy59xihjsn31ahq76cjsla779b4vidzf7m9g4j8z88pk65rk7z"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base extra ghc uniplate ]; - executableHaskellDepends = [ base extra ]; - testHaskellDepends = [ base extra filepath record-hasfield ]; - description = "Preprocessor to allow record.field syntax"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "record-dot-preprocessor_0_2_5" = callPackage ({ mkDerivation, base, extra, filepath, ghc, record-hasfield , uniplate }: @@ -206046,7 +206605,6 @@ self: { testHaskellDepends = [ base extra filepath record-hasfield ]; description = "Preprocessor to allow record.field syntax"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "record-encode" = callPackage @@ -206628,6 +207186,22 @@ self: { broken = true; }) {}; + "ref-extras" = callPackage + ({ mkDerivation, base, hashable, little-rio, microlens, stm + , unliftio, unliftio-core, unordered-containers + }: + mkDerivation { + pname = "ref-extras"; + version = "0.1.1"; + sha256 = "0cv8h2v7vp6gv2lslzc7rpagaa871bi5drzml3090wna1kqnd0nq"; + libraryHaskellDepends = [ + base hashable little-rio microlens stm unliftio unliftio-core + unordered-containers + ]; + description = "Extra stuff for mutable references"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "ref-fd" = callPackage ({ mkDerivation, base, stm, transformers }: mkDerivation { @@ -206976,8 +207550,8 @@ self: { }: mkDerivation { pname = "reflex-dom"; - version = "0.5.3"; - sha256 = "04xnalhrckz5idnx1d4d93nz8fnxnjsd03kciln36wwd895bcmrk"; + version = "0.6.0.0"; + sha256 = "1iimsk89akb7v2i1k1gaa6a6bhdyf2rsggac9k1xizxkylara5k4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -207025,32 +207599,33 @@ self: { }) {}; "reflex-dom-core" = callPackage - ({ mkDerivation, aeson, base, bifunctors, bimap, blaze-builder - , bytestring, chrome-test-utils, constraints, constraints-extras - , containers, contravariant, data-default, dependent-map - , dependent-sum, dependent-sum-template, directory - , exception-transformers, exceptions, filepath, ghcjs-dom, hlint - , hspec, hspec-core, hspec-webdriver, http-types, HUnit, jsaddle - , jsaddle-warp, keycode, lens, lifted-base, monad-control, mtl - , network, network-uri, primitive, process, random, ref-tf, reflex + ({ mkDerivation, aeson, async, base, bifunctors, bimap + , blaze-builder, bytestring, case-insensitive, chrome-test-utils + , constraints, constraints-extras, containers, contravariant + , data-default, dependent-map, dependent-sum + , dependent-sum-template, directory, exception-transformers + , exceptions, filepath, ghcjs-dom, hlint, hspec, hspec-core + , hspec-webdriver, http-types, HUnit, jsaddle, jsaddle-warp + , keycode, lens, lifted-base, monad-control, mtl, network + , network-uri, primitive, process, random, ref-tf, reflex , semialign, semigroups, silently, stm, template-haskell, temporary , text, these, transformers, unix, wai, wai-websockets, warp , webdriver, websockets, which, zenc }: mkDerivation { pname = "reflex-dom-core"; - version = "0.5.3"; - sha256 = "0znymqld4d6fp8l14y0gn86nbffaw8b0ql0y7bj3vnx80crjc32j"; + version = "0.6.0.0"; + sha256 = "0819858z5p6847ac1rb1hsfr5ikn7x5xii8vgqbih4fg39mqfy14"; libraryHaskellDepends = [ - aeson base bifunctors bimap blaze-builder bytestring constraints - containers contravariant data-default dependent-map dependent-sum - dependent-sum-template directory exception-transformers ghcjs-dom - jsaddle keycode lens monad-control mtl network-uri primitive random - ref-tf reflex semialign semigroups stm template-haskell text these - transformers unix zenc + aeson base bifunctors bimap blaze-builder bytestring + case-insensitive constraints containers contravariant data-default + dependent-map dependent-sum dependent-sum-template directory + exception-transformers ghcjs-dom jsaddle keycode lens monad-control + mtl network-uri primitive random ref-tf reflex semialign semigroups + stm template-haskell text these transformers unix zenc ]; testHaskellDepends = [ - aeson base bytestring chrome-test-utils constraints + aeson async base bytestring chrome-test-utils constraints constraints-extras containers dependent-map dependent-sum dependent-sum-template directory exceptions filepath ghcjs-dom hlint hspec hspec-core hspec-webdriver http-types HUnit jsaddle @@ -207165,8 +207740,8 @@ self: { }: mkDerivation { pname = "reflex-fsnotify"; - version = "0.2.1.0"; - sha256 = "1ym220myy521j4lm0wrjydg18ya5fw71j0mv3md35vmn18n6r0d4"; + version = "0.2.1.1"; + sha256 = "0r7fv01dgg5l45yspgj3n2gh6yq0qkjv19hj9vq6284x04vldnqj"; libraryHaskellDepends = [ base containers directory filepath fsnotify reflex ]; @@ -207391,8 +207966,8 @@ self: { }: mkDerivation { pname = "reflex-vty"; - version = "0.1.3.0"; - sha256 = "1200svlgpy4zqdfarx1b8n64vgskb9jl00p548ya4pwi0bsv95y7"; + version = "0.1.4.0"; + sha256 = "0z4yca6hh5rwgybsf6ssklhvpl34ikvi9j6wq99df5y0hpy9185f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -208935,6 +209510,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "relude_0_7_0_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, doctest + , gauge, ghc-prim, Glob, hashable, hedgehog, mtl, stm, text + , transformers, unordered-containers + }: + mkDerivation { + pname = "relude"; + version = "0.7.0.0"; + sha256 = "1gx1h3656wz80v72acqky88iv7a2shinfv6apzzyjxii8lc22jf7"; + libraryHaskellDepends = [ + base bytestring containers deepseq ghc-prim hashable mtl stm text + transformers unordered-containers + ]; + testHaskellDepends = [ + base bytestring containers doctest Glob hedgehog text + ]; + benchmarkHaskellDepends = [ base gauge unordered-containers ]; + description = "Safe, performant, user-friendly and lightweight Haskell Standard Library"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "remark" = callPackage ({ mkDerivation, base, GenericPretty, tasty, tasty-golden , tasty-hunit @@ -210773,8 +211370,8 @@ self: { }: mkDerivation { pname = "retrie"; - version = "0.1.0.1"; - sha256 = "01giwrn6cxkpcjflarpphyvbz6japjq6xjilpg29wfq40c64nzyn"; + version = "0.1.1.0"; + sha256 = "1nzanirprfhyrh4g2miin89z3vmqsk3zacsfylns1ihdpcnpva4b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -211369,26 +211966,31 @@ self: { "rib" = callPackage ({ mkDerivation, aeson, async, base-noprelude, binary, clay , cmdargs, containers, dhall, directory, exceptions, filepath - , foldl, fsnotify, lucid, megaparsec, mmark, mmark-ext, modern-uri - , mtl, optparse-applicative, pandoc, pandoc-include-code - , pandoc-types, path, path-io, relude, safe-exceptions, shake, text - , time, wai, wai-app-static, warp + , foldl, fsnotify, hspec, lucid, megaparsec, mmark, mmark-ext + , modern-uri, mtl, optparse-applicative, pandoc + , pandoc-include-code, pandoc-types, QuickCheck, relude + , safe-exceptions, shake, text, time, wai, wai-app-static, warp }: mkDerivation { pname = "rib"; - version = "0.8.0.0"; - sha256 = "0chiqb2qg4wc37wby8srakr6yaja9hdrjy9jf13bxc91q2z9k82z"; + version = "0.10.0.0"; + sha256 = "129riz7843x9h2c9iz9wdcngj74x3rrvlbmd9y7ymmrh5d2kq1qv"; libraryHaskellDepends = [ aeson async base-noprelude binary clay cmdargs containers dhall directory exceptions filepath foldl fsnotify lucid megaparsec mmark mmark-ext modern-uri mtl optparse-applicative pandoc - pandoc-include-code pandoc-types path path-io relude - safe-exceptions shake text time wai wai-app-static warp + pandoc-include-code pandoc-types relude safe-exceptions shake text + time wai wai-app-static warp + ]; + testHaskellDepends = [ + aeson async base-noprelude binary clay cmdargs containers dhall + directory exceptions filepath foldl fsnotify hspec lucid megaparsec + mmark mmark-ext modern-uri mtl optparse-applicative pandoc + pandoc-include-code pandoc-types QuickCheck relude safe-exceptions + shake text time wai wai-app-static warp ]; - description = "Static site generator using Shake"; + description = "Static site generator based on Shake"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "ribbit" = callPackage @@ -214016,6 +214618,8 @@ self: { pname = "safe-json"; version = "1.1.0"; sha256 = "18zsf2dccgf755a8g4ar3zc7ilmampsrvqa6f9p27zrayl7j87hw"; + revision = "1"; + editedCabalFile = "04bwgnv53acmiw50wj3k5lb791b4702mdzhsphshlwk2bc34ybqg"; libraryHaskellDepends = [ aeson base bytestring containers dlist hashable scientific tasty tasty-hunit tasty-quickcheck text time unordered-containers @@ -214773,6 +215377,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "sampling_0_3_4" = callPackage + ({ mkDerivation, base, containers, criterion, foldl, mwc-random + , primitive, vector + }: + mkDerivation { + pname = "sampling"; + version = "0.3.4"; + sha256 = "1cwx64llg6x6dnsld6lx6bmb4cljz8abqp0d6vmh4wk11vzjsly0"; + libraryHaskellDepends = [ + base containers foldl mwc-random primitive vector + ]; + testHaskellDepends = [ base ]; + benchmarkHaskellDepends = [ base criterion ]; + description = "Sample values from collections"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "samtools" = callPackage ({ mkDerivation, base, bytestring, c2hs, seqloc, vector, zlib }: mkDerivation { @@ -217388,14 +218010,14 @@ self: { }: mkDerivation { pname = "secret-sharing"; - version = "1.0.1.0"; - sha256 = "16j4xz4kkcicqfl9r8831il310ns02kxwj7mga8pvssfnhzv9zpv"; + version = "1.0.1.2"; + sha256 = "0965nbzaiia0jbx1r149liyg8fsix7z5nlxybpavrkkn0b4ncn89"; libraryHaskellDepends = [ base binary bytestring dice-entropy-conduit finite-field vector ]; testHaskellDepends = [ - base bytestring QuickCheck test-framework - test-framework-quickcheck2 + base binary bytestring dice-entropy-conduit finite-field QuickCheck + test-framework test-framework-quickcheck2 vector ]; description = "Information-theoretic secure secret sharing"; license = stdenv.lib.licenses.lgpl21; @@ -218616,8 +219238,8 @@ self: { }: mkDerivation { pname = "serialise"; - version = "0.2.2.0"; - sha256 = "17m1xs3hdvbkba1b8qjcv58drhl2wgvjkp7a2m38mkwn6xxvpg1k"; + version = "0.2.3.0"; + sha256 = "0vp4wyxpximpx10pssfgdsir1pc23zb62fg3kj3iblpzqfrryy69"; libraryHaskellDepends = [ array base bytestring cborg containers ghc-prim half hashable primitive text time unordered-containers vector @@ -222849,12 +223471,16 @@ self: { }) {}; "shake-plus" = callPackage - ({ mkDerivation, base, extra, path, rio, shake, within }: + ({ mkDerivation, base, comonad, extra, hashable, path, rio, shake + , within + }: mkDerivation { pname = "shake-plus"; - version = "0.0.2.2"; - sha256 = "0yvwp3wzyzm8v2qihs96nsqlglhp7w1ndig04nzd13nqa726m6nd"; - libraryHaskellDepends = [ base extra path rio shake within ]; + version = "0.1.3.0"; + sha256 = "1s7mx4xsl31y8j4cm0hv7xwj6hf4smfby86d38fxw3mw3pcjw385"; + libraryHaskellDepends = [ + base comonad extra hashable path rio shake within + ]; description = "Re-export of Shake using well-typed paths and ReaderT"; license = stdenv.lib.licenses.mit; }) {}; @@ -223438,23 +224064,6 @@ self: { }) {}; "shellmet" = callPackage - ({ mkDerivation, base, doctest, Glob, markdown-unlit, process, text - }: - mkDerivation { - pname = "shellmet"; - version = "0.0.3.0"; - sha256 = "1i39zl8khsriadi7k28rn0w2y8wf6jmnz5x3nlkdd9spkdy1qz49"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base process text ]; - executableHaskellDepends = [ base text ]; - executableToolDepends = [ markdown-unlit ]; - testHaskellDepends = [ base doctest Glob ]; - description = "Out of the shell solution for scripting in Haskell"; - license = stdenv.lib.licenses.mpl20; - }) {}; - - "shellmet_0_0_3_1" = callPackage ({ mkDerivation, base, doctest, Glob, markdown-unlit, process, text }: mkDerivation { @@ -223469,7 +224078,6 @@ self: { testHaskellDepends = [ base doctest Glob ]; description = "Out of the shell solution for scripting in Haskell"; license = stdenv.lib.licenses.mpl20; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "shellout" = callPackage @@ -226245,8 +226853,8 @@ self: { }: mkDerivation { pname = "skylighting"; - version = "0.8.3.4"; - sha256 = "1fqjz2s8i9i235mrp4364ycidax2zl7xrgcahsqpbr4cx7vgy9qz"; + version = "0.8.4"; + sha256 = "08fy9c3ms6xwzxispgksf1cji9mvcyy8swaj3dwvc2dc66h06xky"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -226266,8 +226874,8 @@ self: { }: mkDerivation { pname = "skylighting-core"; - version = "0.8.3.4"; - sha256 = "0jcryl83873jjn6lximl1pnshf84nlln1hdvrdcybhrpjyd56qdc"; + version = "0.8.4"; + sha256 = "0wyhiark5d1r1hi04xiq14ykikr9yd4dmzqbr7qswl05b0bk7gam"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -228524,6 +229132,8 @@ self: { pname = "snaplet-postgresql-simple"; version = "1.2.0.0"; sha256 = "0an9b72vfnb562k49bz5wh72s637r3vrbm4x9brwf483rrmlmvrf"; + revision = "1"; + editedCabalFile = "1zzidcr5j6i6xnzrlzxlmpj6fs60knkbkjbagawa3y1v1wg3vmq7"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -230051,8 +230661,8 @@ self: { }: mkDerivation { pname = "spacecookie"; - version = "0.2.1.1"; - sha256 = "0l3knzsqab58yyk6kafpxxh465ncgqr2gi388k89gxwrlcqkl8wr"; + version = "0.2.1.2"; + sha256 = "0cb51kji78vfg17mcnz3a5jlfbnyavh880x09b18y9syqwx4in7l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -232017,8 +232627,8 @@ self: { ({ mkDerivation, base, ghc-prim }: mkDerivation { pname = "stable-marriage"; - version = "0.1.2.0"; - sha256 = "1xm99zdgzdlaz48njpyl0ji9hmyxcf9zxjs0dg46si4lj64qavmz"; + version = "0.1.3.0"; + sha256 = "04nd7c34gsx6njiwqzzx14ff745naam1cxc0cr4s7yyr9h7ikdai"; libraryHaskellDepends = [ base ghc-prim ]; description = "algorithms around stable marriage"; license = stdenv.lib.licenses.bsd3; @@ -235520,15 +236130,15 @@ self: { "streamly-posix" = callPackage ({ mkDerivation, base, bytestring, filepath, hpath-posix, hspec , hspec-discover, safe-exceptions, streamly, streamly-bytestring - , temporary, unix, word8 + , temporary, transformers, unix, word8 }: mkDerivation { pname = "streamly-posix"; - version = "0.1.0.0"; - sha256 = "0pjrmpsm0925jhxnhqka3rlwllcww9xinyh1dg0k2g6b4pxr9gbx"; + version = "0.1.0.1"; + sha256 = "1z6hmnhgglr5zwsaakn7c6d0cgq32pwcdds8fkn28y9p3yc89bvv"; libraryHaskellDepends = [ base bytestring hpath-posix safe-exceptions streamly - streamly-bytestring unix word8 + streamly-bytestring transformers unix word8 ]; testHaskellDepends = [ base filepath hpath-posix hspec hspec-discover temporary unix @@ -235758,12 +236368,27 @@ self: { pname = "strict-tuple"; version = "0.1.3"; sha256 = "0dyiwgkbr1d97jbri7a2q4by7g0wiszpw3hgfgqv4rfp25lsv39j"; + revision = "1"; + editedCabalFile = "1bkizfki8v5p0n8sy59s4zqjmv1mnv3s45327cig9cr081ibv9yy"; libraryHaskellDepends = [ base bifunctors deepseq hashable ]; testHaskellDepends = [ base ]; description = "Strict tuples"; license = stdenv.lib.licenses.bsd3; }) {}; + "strict-tuple-lens" = callPackage + ({ mkDerivation, base, lens, strict-tuple }: + mkDerivation { + pname = "strict-tuple-lens"; + version = "0.1.0.1"; + sha256 = "1vvhbzbyfvkx76scygg8gwfp01cw6ks38hk0gb70xdl2lyzi80wg"; + revision = "1"; + editedCabalFile = "0875r7kva6ym17fdklh18vm4s04sd9pj0w55km8jv2kmbkmfja8k"; + libraryHaskellDepends = [ base lens strict-tuple ]; + description = "Optics for the `strict-tuple` library"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "strict-types" = callPackage ({ mkDerivation, array, base, bytestring, containers, deepseq , hashable, text, unordered-containers, vector @@ -235909,35 +236534,6 @@ self: { }) {}; "string-interpolate" = callPackage - ({ mkDerivation, base, bytestring, criterion, formatting - , haskell-src-exts, haskell-src-meta, hspec, interpolate - , neat-interpolation, QuickCheck, quickcheck-instances - , quickcheck-text, quickcheck-unicode, random-shuffle - , template-haskell, text, text-conversions, unordered-containers - , utf8-string - }: - mkDerivation { - pname = "string-interpolate"; - version = "0.2.0.3"; - sha256 = "0xmanjs8sgk3cm6f25wbpxsmzpgznf73pvviw0ig71mn2y2kx6bi"; - libraryHaskellDepends = [ - base bytestring haskell-src-exts haskell-src-meta template-haskell - text text-conversions utf8-string - ]; - testHaskellDepends = [ - base bytestring hspec QuickCheck quickcheck-instances - quickcheck-text quickcheck-unicode random-shuffle text - unordered-containers - ]; - benchmarkHaskellDepends = [ - base bytestring criterion formatting interpolate neat-interpolation - QuickCheck text - ]; - description = "Haskell string/text/bytestring interpolation that just works"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "string-interpolate_0_2_1_0" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, formatting , haskell-src-exts, haskell-src-meta, hspec, interpolate , neat-interpolation, QuickCheck, quickcheck-instances @@ -235963,7 +236559,6 @@ self: { ]; description = "Haskell string/text/bytestring interpolation that just works"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "string-isos" = callPackage @@ -236828,8 +237423,8 @@ self: { }: mkDerivation { pname = "stylist"; - version = "2.0.0.0"; - sha256 = "1xb2vl4xjbgd52nqm378r43z4xlgzscfy9a7mqp522av3b4v61x7"; + version = "2.2.0.0"; + sha256 = "0pmyjxdg7m0fh9m0nrimi02q4lqk47kfbws65mb22rj7ckm7gw68"; libraryHaskellDepends = [ async base css-syntax hashable network-uri text unordered-containers @@ -240891,14 +241486,12 @@ self: { }: mkDerivation { pname = "tart"; - version = "0.1.2"; - sha256 = "1ik86xbai9513gr9k60m55xf5pj5bdw3wbjc0gd260j9k9j4p73k"; - revision = "1"; - editedCabalFile = "04xkrc0xfbx2kk6f8b41zf611s4k848ahczbbs85pd9lqqpkbhzj"; + version = "0.2"; + sha256 = "03pi46lr5b9qcc35ffwxwzv9ll51cyv526kjcvaags3ky917rxxn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base binary bytestring microlens-platform mtl vty + array base binary bytestring microlens-platform mtl text vty ]; executableHaskellDepends = [ base brick containers directory microlens-platform microlens-th mtl @@ -241057,6 +241650,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty_1_3" = callPackage + ({ mkDerivation, ansi-terminal, async, base, clock, containers, mtl + , optparse-applicative, stm, tagged, unbounded-delays, unix + , wcwidth + }: + mkDerivation { + pname = "tasty"; + version = "1.3"; + sha256 = "0c9vmy31z6i4ligrsk0lcn8ir9qajc2yp3zdn8nnjd0myzddzf3b"; + libraryHaskellDepends = [ + ansi-terminal async base clock containers mtl optparse-applicative + stm tagged unbounded-delays unix wcwidth + ]; + description = "Modern and extensible testing framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-ant-xml" = callPackage ({ mkDerivation, base, containers, directory, filepath , generic-deriving, ghc-prim, mtl, stm, tagged, tasty, transformers @@ -241100,11 +241711,23 @@ self: { ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { pname = "tasty-dejafu"; - version = "2.0.0.1"; - sha256 = "19cgzr1gcy1khvw2a6bfd620zmrc4szkdwyf3rfyacxgbgqy1b1z"; + version = "2.0.0.3"; + sha256 = "02qzyrn33ylfbk2mgwj08lphprxvzh85c0dz2540qp1j6xa5zxpn"; + libraryHaskellDepends = [ base dejafu random tagged tasty ]; + description = "Deja Fu support for the Tasty test framework"; + license = stdenv.lib.licenses.mit; + }) {}; + + "tasty-dejafu_2_0_0_4" = callPackage + ({ mkDerivation, base, dejafu, random, tagged, tasty }: + mkDerivation { + pname = "tasty-dejafu"; + version = "2.0.0.4"; + sha256 = "0jryp6kndaaxfjd4vsws18igx9ivd36iqyqdbjpxmxbx34d1h6kn"; libraryHaskellDepends = [ base dejafu random tagged tasty ]; description = "Deja Fu support for the Tasty test framework"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; }) {}; "tasty-discover" = callPackage @@ -241186,6 +241809,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tasty-golden_2_3_3_3" = callPackage + ({ mkDerivation, async, base, bytestring, containers, deepseq + , directory, filepath, mtl, optparse-applicative, process, tagged + , tasty, tasty-hunit, temporary, text, unix-compat + }: + mkDerivation { + pname = "tasty-golden"; + version = "2.3.3.3"; + sha256 = "1h0nz276fxhdxjiqnrkpmsndrsfvbd13r7i6i8arxgldl1n86h24"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring containers deepseq directory filepath mtl + optparse-applicative process tagged tasty temporary text + unix-compat + ]; + testHaskellDepends = [ + base directory filepath process tasty tasty-hunit temporary + ]; + description = "Golden tests support for tasty"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tasty-groundhog-converters" = callPackage ({ mkDerivation, aeson, base, bimap, bytestring, containers , groundhog, groundhog-converters, groundhog-sqlite, groundhog-th @@ -241214,8 +241861,8 @@ self: { pname = "tasty-hedgehog"; version = "1.0.0.2"; sha256 = "1vsv3m6brhshpqm8qixz97m7h0nx67cj6ira4cngbk7mf5rqylv5"; - revision = "1"; - editedCabalFile = "0r4mijgy1z9rdi3as2a1a02xykwyqalhg5vahsjzgdgmf7bmmc6h"; + revision = "2"; + editedCabalFile = "1v4jp3xk5ikik638vkyf2jxkhaf2n6fsw8zxqxxjv65x60082kl7"; libraryHaskellDepends = [ base hedgehog tagged tasty ]; testHaskellDepends = [ base hedgehog tasty tasty-expected-failure @@ -241256,8 +241903,8 @@ self: { pname = "tasty-hspec"; version = "1.1.5.1"; sha256 = "0i9kdzjpk750sa078jj3iyhp72k0177zk7vxl131r6dkyz09x27y"; - revision = "5"; - editedCabalFile = "1ramy5jn7a6xvxc6s8bvn34m1vzniks05277s3i80cp4qprwx8ri"; + revision = "6"; + editedCabalFile = "0xa7h0p5r41m2a3l5r9ggmm4bc2a6wzgb4qvcqfl0dd2yb922bkz"; libraryHaskellDepends = [ base hspec hspec-core QuickCheck tasty tasty-quickcheck tasty-smallcheck @@ -241521,8 +242168,8 @@ self: { pname = "tasty-rerun"; version = "1.1.17"; sha256 = "0hiafrknk700gi8rm675akz8q6abk8iwlmygwnlx1fy3znalkqad"; - revision = "1"; - editedCabalFile = "1j08802psflkj3wb5jhh4z5w1i852hw5fm9k5aczbvfx9873zyhc"; + revision = "2"; + editedCabalFile = "0jkkydcq8fx3ia92pn9dnbfhx18wz70366y7xlv9yj9zysqcr8yl"; libraryHaskellDepends = [ base containers mtl optparse-applicative split stm tagged tasty transformers @@ -241683,8 +242330,8 @@ self: { pname = "tasty-wai"; version = "0.1.1.0"; sha256 = "1ix1ksibdkqrycrcnyi6vablp17kg3ajw5kghff1ia7wd2nb9fbk"; - revision = "1"; - editedCabalFile = "1zwfdad5kp3l1lysz9x5hxwp0yphsdbhgbp33yczw8c8sai3l7xb"; + revision = "2"; + editedCabalFile = "18p5lk4p1ppq5ascykf7b89sc8c8g013w5j5i4q74iwxmah1va2g"; libraryHaskellDepends = [ base bytestring http-types tasty wai wai-extra ]; @@ -245609,6 +246256,8 @@ self: { pname = "th-test-utils"; version = "1.0.1"; sha256 = "1qbxj4zarw1nm0c2shrr4wrrkmqlxx2qdh9q3q9arkic4lwgsxcx"; + revision = "1"; + editedCabalFile = "0x4kwp1lj663dd4nfr348y2z5qq1hkly5r289wmqhy5dxlx7cb9n"; libraryHaskellDepends = [ base template-haskell transformers ]; testHaskellDepends = [ base tasty tasty-hunit template-haskell transformers @@ -248887,8 +249536,8 @@ self: { }: mkDerivation { pname = "too-many-cells"; - version = "0.2.2.1"; - sha256 = "17g9pr25jhki9r3jfvgbx8avpjikcglb9hg45rfkvk9y50wxrk15"; + version = "0.2.2.2"; + sha256 = "091hqg4wxki8v7xkrzmnh1hpm81pif936pbmrzvr5p84sbbyyj91"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -249086,8 +249735,8 @@ self: { ({ mkDerivation, base, void }: mkDerivation { pname = "total"; - version = "1.0.5"; - sha256 = "0kv9jb2d8mh4p9b91jg5367ar4p837xclzlwgjrjgvxl62z7h84j"; + version = "1.0.6"; + sha256 = "0zr3b83pwjbarxsl9kva6va3cp9b4npfp77yp0nh9q1za00344vk"; libraryHaskellDepends = [ base void ]; description = "Exhaustive pattern matching using lenses, traversals, and prisms"; license = stdenv.lib.licenses.bsd3; @@ -251372,8 +252021,8 @@ self: { }: mkDerivation { pname = "ttc"; - version = "0.2.0.0"; - sha256 = "1vl3fp0d9v674gg6zbmafvrb97zqxcjlpp5j77msjn1kl7ki6xs7"; + version = "0.2.1.0"; + sha256 = "1cx2v2rjb3d3qifa6ssnvxwd70cm3qacsr0i1ndrm1mrl8j1ffqp"; libraryHaskellDepends = [ base bytestring template-haskell text ]; testHaskellDepends = [ base bytestring tasty tasty-hunit template-haskell text @@ -251812,33 +252461,6 @@ self: { }) {}; "turtle" = callPackage - ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock - , containers, criterion, directory, doctest, exceptions, fail - , foldl, hostname, managed, optional-args, optparse-applicative - , process, semigroups, stm, streaming-commons, system-fileio - , system-filepath, temporary, text, time, transformers, unix - , unix-compat - }: - mkDerivation { - pname = "turtle"; - version = "1.5.18"; - sha256 = "0xdkn6vhmir7sxazi5sxrgvwsi8zqyqbcyvjnqvckz0ac5d8zj68"; - libraryHaskellDepends = [ - ansi-wl-pprint async base bytestring clock containers directory - exceptions foldl hostname managed optional-args - optparse-applicative process semigroups stm streaming-commons - system-fileio system-filepath temporary text time transformers unix - unix-compat - ]; - testHaskellDepends = [ - base doctest fail system-filepath temporary - ]; - benchmarkHaskellDepends = [ base criterion text ]; - description = "Shell programming, Haskell-style"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "turtle_1_5_19" = callPackage ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock , containers, criterion, directory, doctest, exceptions, fail , foldl, hostname, managed, optional-args, optparse-applicative @@ -251863,7 +252485,6 @@ self: { benchmarkHaskellDepends = [ base criterion text ]; description = "Shell programming, Haskell-style"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "turtle-options" = callPackage @@ -253398,16 +254019,19 @@ self: { "typed-encoding" = callPackage ({ mkDerivation, base, base64-bytestring, bytestring, doctest - , doctest-discover, QuickCheck, quickcheck-instances, text + , doctest-discover, hspec, QuickCheck, quickcheck-instances + , symbols, text }: mkDerivation { pname = "typed-encoding"; - version = "0.2.0.0"; - sha256 = "1h1bnvw9j72mw2r4qjxsq4hvq1p8jkax4fhnhglcyskngmaa7ri5"; - libraryHaskellDepends = [ base base64-bytestring bytestring text ]; + version = "0.2.1.0"; + sha256 = "0z5wp666293d5nsajqa3c8b03n1s85kr3v5hrkvsqv9lq3s49jnp"; + libraryHaskellDepends = [ + base base64-bytestring bytestring symbols text + ]; testHaskellDepends = [ - base base64-bytestring bytestring doctest doctest-discover - QuickCheck quickcheck-instances text + base base64-bytestring bytestring doctest doctest-discover hspec + QuickCheck quickcheck-instances symbols text ]; description = "Type safe string transformations"; license = stdenv.lib.licenses.bsd3; @@ -253492,6 +254116,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "typed-uuid_0_1_0_0" = callPackage + ({ mkDerivation, aeson, base, binary, bytestring, deepseq, hashable + , http-api-data, random, text, uuid, validity, validity-uuid + , yamlparse-applicative + }: + mkDerivation { + pname = "typed-uuid"; + version = "0.1.0.0"; + sha256 = "1smwrjn63wsvy7lickdapgfqbvndypvy1qlnfrn5iymi2mg1kyxi"; + libraryHaskellDepends = [ + aeson base binary bytestring deepseq hashable http-api-data random + text uuid validity validity-uuid yamlparse-applicative + ]; + description = "Phantom-Typed version of UUID"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "typed-wire" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, directory , filepath, gitrev, HTF, http-types, mtl, optparse-applicative @@ -254515,8 +255157,8 @@ self: { }: mkDerivation { pname = "unbound-generics"; - version = "0.4.0"; - sha256 = "04amv54wrabzdmlig1mxi51ikq1lmfcm504184y0nm0xjahfssmx"; + version = "0.4.1"; + sha256 = "02wwn78fccb37lx95jvr0v2n55kv35nilllb0gj75y8bplya5blb"; libraryHaskellDepends = [ ansi-wl-pprint base containers contravariant deepseq exceptions mtl profunctors template-haskell transformers transformers-compat @@ -254714,8 +255356,8 @@ self: { }: mkDerivation { pname = "unexceptionalio"; - version = "0.5.0"; - sha256 = "04jrmv075cas6qs58m3j0q9h4w14kd4b87bp42k3x3v6hcl62xi9"; + version = "0.5.1"; + sha256 = "07py2nffdgxpz8sryvqcghzb2kiiagpdf5ja1dia4z0rpwi79smh"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base HUnit test-framework test-framework-hunit @@ -254731,6 +255373,8 @@ self: { pname = "unexceptionalio-trans"; version = "0.5.1"; sha256 = "100sfbrpaldz37a176qpfkk1nx5acyh8pchjmb8g5vhzbhyrqniz"; + revision = "1"; + editedCabalFile = "0f15n8hqqczwjrcqxwjp2mrd9iycv53sylv407c95nb6d4hw93ci"; libraryHaskellDepends = [ base transformers unexceptionalio ]; description = "A wrapper around UnexceptionalIO using monad transformers"; license = "unknown"; @@ -255390,8 +256034,8 @@ self: { ({ mkDerivation, base, template-haskell, units }: mkDerivation { pname = "units-defs"; - version = "2.1.0.1"; - sha256 = "1ck50r8mhcvjyfx3wdkn8s89rrzjkxpn439zarg5s2vqmqji7gyy"; + version = "2.2"; + sha256 = "1g55hnhd9bgqp649jgmq41s5i5j0gfpn3iwqaxvmikwaasyr69ki"; libraryHaskellDepends = [ base template-haskell units ]; description = "Definitions for use with the units package"; license = stdenv.lib.licenses.bsd3; @@ -255699,8 +256343,8 @@ self: { pname = "unix"; version = "2.7.2.2"; sha256 = "1b6ygkasn5bvmdci8g3zjkahl34kfqhf5jrayibvnrcdnaqlxpcq"; - revision = "3"; - editedCabalFile = "1bbn41bx46b9h8hbri50rw69996h75nfhm9zgyvnr8lzgfhnk4p6"; + revision = "4"; + editedCabalFile = "092d2qzfk4wm7xaa5wjyxgb97knilsh86vhk420j8rd0qlygk4wy"; libraryHaskellDepends = [ base bytestring time ]; description = "POSIX functionality"; license = stdenv.lib.licenses.bsd3; @@ -257249,6 +257893,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "utf8-conversions" = callPackage + ({ mkDerivation, base, bytestring, charsetdetect-ae, hspec, text + , text-short, utf8-string + }: + mkDerivation { + pname = "utf8-conversions"; + version = "0.1.0.4"; + sha256 = "0j5jskj35njz5c9yqs3sc0a8zmmjmnil8996pwr8akghj282b4wz"; + libraryHaskellDepends = [ + base bytestring text text-short utf8-string + ]; + testHaskellDepends = [ + base bytestring charsetdetect-ae hspec text text-short utf8-string + ]; + description = "A string conversion library that assumes utf8"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "utf8-env" = callPackage ({ mkDerivation, base, mtl, utf8-string }: mkDerivation { @@ -258227,22 +258889,6 @@ self: { }) {}; "validity-aeson" = callPackage - ({ mkDerivation, aeson, base, validity, validity-scientific - , validity-text, validity-unordered-containers, validity-vector - }: - mkDerivation { - pname = "validity-aeson"; - version = "0.2.0.3"; - sha256 = "0rvhlbnm27yfywavp46iyhvkbwxzcnwl8p82k8xpncy4gc2493b7"; - libraryHaskellDepends = [ - aeson base validity validity-scientific validity-text - validity-unordered-containers validity-vector - ]; - description = "Validity instances for aeson"; - license = stdenv.lib.licenses.mit; - }) {}; - - "validity-aeson_0_2_0_4" = callPackage ({ mkDerivation, aeson, base, hspec, validity, validity-scientific , validity-text, validity-unordered-containers, validity-vector }: @@ -258257,7 +258903,6 @@ self: { testHaskellDepends = [ aeson base hspec validity ]; description = "Validity instances for aeson"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "validity-bytestring" = callPackage @@ -259263,23 +259908,6 @@ self: { }) {}; "vector-sized" = callPackage - ({ mkDerivation, adjunctions, base, binary, comonad, deepseq - , distributive, finite-typelits, hashable, indexed-list-literals - , primitive, vector - }: - mkDerivation { - pname = "vector-sized"; - version = "1.4.0.0"; - sha256 = "1rh8jjbpw8c6mprwqzd8x7n1kcm5kld3ajrrsahnm91aaw9z1cy6"; - libraryHaskellDepends = [ - adjunctions base binary comonad deepseq distributive - finite-typelits hashable indexed-list-literals primitive vector - ]; - description = "Size tagged vectors"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vector-sized_1_4_1_0" = callPackage ({ mkDerivation, adjunctions, base, binary, comonad, deepseq , distributive, finite-typelits, hashable, indexed-list-literals , primitive, vector @@ -259294,7 +259922,6 @@ self: { ]; description = "Size tagged vectors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-space" = callPackage @@ -259735,6 +260362,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "versions_3_5_4" = callPackage + ({ mkDerivation, base, deepseq, hashable, megaparsec, microlens + , QuickCheck, tasty, tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "versions"; + version = "3.5.4"; + sha256 = "1n6mayi2qinlv12bf83qskiazwzgl37d4nxvglmwmddb7lpyxbrw"; + libraryHaskellDepends = [ base deepseq hashable megaparsec text ]; + testHaskellDepends = [ + base megaparsec microlens QuickCheck tasty tasty-hunit + tasty-quickcheck text + ]; + description = "Types and parsers for software version numbers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "vflow-types" = callPackage ({ mkDerivation, aeson, base, bytestring, ip, json-alt , json-autotype, neat-interpolation, QuickCheck, quickcheck-classes @@ -261593,31 +262238,32 @@ self: { , blaze-builder, blaze-html, bytestring, case-insensitive, cereal , clientsession, cookie, exceptions, hedgehog, hoauth2, http-client , http-client-tls, http-conduit, http-reverse-proxy, http-types - , optparse-simple, regex-posix, safe-exceptions, shakespeare, text - , time, unix-compat, unordered-containers, uri-bytestring, vault - , wai, wai-app-static, wai-extra, warp, yaml + , jose, microlens, mtl, optparse-simple, regex-posix + , safe-exceptions, shakespeare, tasty, tasty-hedgehog, tasty-hunit + , text, time, unix-compat, unordered-containers, uri-bytestring + , vault, wai, wai-app-static, wai-extra, warp, yaml }: mkDerivation { pname = "wai-middleware-auth"; - version = "0.2.1.0"; - sha256 = "16gm0r4jlmzx5qd4s03whqlc8siy139fwrb6q26a053c85n5lw0f"; - revision = "1"; - editedCabalFile = "14aicx9vvp5p77hxmx0zqmqmz4qgv7adr7rsvxy76k0rszz8s8d6"; + version = "0.2.3.0"; + sha256 = "0cah1g4j8vzncp00x0im5clhq198z8k4bq2q4hxcz9n7libz7l3r"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base base64-bytestring binary blaze-builder blaze-html bytestring case-insensitive cereal clientsession cookie exceptions hoauth2 http-client http-client-tls http-conduit http-reverse-proxy - http-types regex-posix safe-exceptions shakespeare text time - unix-compat unordered-containers uri-bytestring vault wai - wai-app-static wai-extra yaml + http-types jose microlens mtl regex-posix safe-exceptions + shakespeare text time unix-compat unordered-containers + uri-bytestring vault wai wai-app-static wai-extra yaml ]; executableHaskellDepends = [ - base bytestring cereal clientsession optparse-simple warp + base bytestring cereal clientsession optparse-simple wai-extra warp ]; testHaskellDepends = [ - base binary bytestring hedgehog hoauth2 text + aeson base binary bytestring clientsession cookie hedgehog hoauth2 + http-types jose microlens mtl tasty tasty-hedgehog tasty-hunit text + time uri-bytestring wai wai-extra warp ]; description = "Authentication middleware that secures WAI application"; license = stdenv.lib.licenses.mit; @@ -262855,6 +263501,40 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "warp_3_3_11" = callPackage + ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked + , bytestring, case-insensitive, containers, directory, gauge + , ghc-prim, hashable, hspec, http-client, http-date, http-types + , http2, HUnit, iproute, lifted-base, network, process, QuickCheck + , simple-sendfile, stm, streaming-commons, text, time, time-manager + , unix, unix-compat, vault, wai, word8, x509 + }: + mkDerivation { + pname = "warp"; + version = "3.3.11"; + sha256 = "09jqdgxpgkch3i9b8mqjp10dljidgmgyg5as72r9c908m75n7a21"; + libraryHaskellDepends = [ + array async auto-update base bsb-http-chunked bytestring + case-insensitive containers ghc-prim hashable http-date http-types + http2 iproute network simple-sendfile stm streaming-commons text + time-manager unix unix-compat vault wai word8 x509 + ]; + testHaskellDepends = [ + array async auto-update base bsb-http-chunked bytestring + case-insensitive containers directory ghc-prim hashable hspec + http-client http-date http-types http2 HUnit iproute lifted-base + network process QuickCheck simple-sendfile stm streaming-commons + text time time-manager unix unix-compat vault wai word8 x509 + ]; + benchmarkHaskellDepends = [ + auto-update base bytestring containers gauge hashable http-date + http-types network time-manager unix unix-compat x509 + ]; + description = "A fast, light-weight web server for WAI applications"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "warp-dynamic" = callPackage ({ mkDerivation, base, data-default, dyre, http-types, wai, warp }: mkDerivation { @@ -264214,40 +264894,6 @@ self: { }) {}; "websockets" = callPackage - ({ mkDerivation, async, attoparsec, base, base64-bytestring, binary - , bytestring, bytestring-builder, case-insensitive, clock - , containers, criterion, entropy, HUnit, network, QuickCheck - , random, SHA, streaming-commons, test-framework - , test-framework-hunit, test-framework-quickcheck2, text - }: - mkDerivation { - pname = "websockets"; - version = "0.12.7.0"; - sha256 = "11jz0d7hgbl449dvz789gyf85gdwm6h0klq05vilmplpdx61h4az"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - async attoparsec base base64-bytestring binary bytestring - bytestring-builder case-insensitive clock containers entropy - network random SHA streaming-commons text - ]; - testHaskellDepends = [ - async attoparsec base base64-bytestring binary bytestring - bytestring-builder case-insensitive clock containers entropy HUnit - network QuickCheck random SHA streaming-commons test-framework - test-framework-hunit test-framework-quickcheck2 text - ]; - benchmarkHaskellDepends = [ - async attoparsec base base64-bytestring binary bytestring - bytestring-builder case-insensitive clock containers criterion - entropy network random SHA text - ]; - doCheck = false; - description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "websockets_0_12_7_1" = callPackage ({ mkDerivation, async, attoparsec, base, base64-bytestring, binary , bytestring, bytestring-builder, case-insensitive, clock , containers, criterion, entropy, HUnit, network, QuickCheck @@ -264279,7 +264925,6 @@ self: { doCheck = false; description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "websockets-rpc" = callPackage @@ -264656,8 +265301,6 @@ self: { libraryHaskellDepends = [ base shelly template-haskell text ]; description = "Determine the full path to an executable"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "while-lang-parser" = callPackage @@ -265161,18 +265804,20 @@ self: { }) {}; "with-utf8" = callPackage - ({ mkDerivation, base, deepseq, directory, hedgehog, HUnit - , safe-exceptions, tasty, tasty-discover, tasty-hedgehog - , tasty-hunit, temporary, text, unix + ({ mkDerivation, base, deepseq, directory, filepath, hedgehog + , HUnit, process, safe-exceptions, tasty, tasty-discover + , tasty-hedgehog, tasty-hunit, temporary, text, th-env, unix }: mkDerivation { pname = "with-utf8"; - version = "1.0.1.0"; - sha256 = "07b3zpdnaqvp7ipbjnq17is5a70l2bncjqxlnhixpq91bbsczlrp"; + version = "1.0.2.0"; + sha256 = "0zb2xrxf1as38iykljm62kdq6in02miw8xvckh86sfn79csggjvg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base safe-exceptions text ]; - executableHaskellDepends = [ base directory ]; + executableHaskellDepends = [ + base directory filepath process safe-exceptions th-env + ]; testHaskellDepends = [ base deepseq hedgehog HUnit safe-exceptions tasty tasty-hedgehog tasty-hunit temporary text unix @@ -265233,13 +265878,15 @@ self: { }) {}; "within" = callPackage - ({ mkDerivation, base, exceptions, hashable, path }: + ({ mkDerivation, base, comonad, exceptions, free, hashable, path }: mkDerivation { pname = "within"; - version = "0.0.2.0"; - sha256 = "08ddmh9zfb435q8ljsisszvd5hgjpsnxcv57kzadwcicy2wkj32b"; - libraryHaskellDepends = [ base exceptions hashable path ]; - description = "A path within another path"; + version = "0.1.1.0"; + sha256 = "107gi32zsp7srb2lgmbmrdzry2irgshnznkf81sw3f1n07qhci40"; + libraryHaskellDepends = [ + base comonad exceptions free hashable path + ]; + description = "A value within another path"; license = stdenv.lib.licenses.mit; }) {}; @@ -267992,8 +268639,10 @@ self: { }: mkDerivation { pname = "xml-conduit-stylist"; - version = "2.1.0.0"; - sha256 = "0x33v7nc6swnizdmqmf2gxwr9afyrnra5kyywzp34hbawimd4apr"; + version = "2.2.0.0"; + sha256 = "0zd7irwy8fl9zkpzj85lg9xv4m01cr4dzvlxyz8nh6l1rwvhqang"; + revision = "2"; + editedCabalFile = "0h20v462sfq4cli5b9d574qjhxs1vgzh5yb2spgj6w9pmf7ydf61"; libraryHaskellDepends = [ base containers css-syntax network-uri stylist text unordered-containers xml-conduit @@ -269811,35 +270460,6 @@ self: { }) {}; "yaml" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring - , conduit, containers, directory, filepath, hspec, HUnit, libyaml - , mockery, mtl, raw-strings-qq, resourcet, scientific - , template-haskell, temporary, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "yaml"; - version = "0.11.3.0"; - sha256 = "01lafh83rp0v49f052vyv4gcbdgzcf42cmg0iqlykk6c586ksvh4"; - configureFlags = [ "-fsystem-libyaml" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring conduit containers directory - filepath libyaml mtl resourcet scientific template-haskell text - transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson attoparsec base base-compat bytestring conduit containers - directory filepath hspec HUnit libyaml mockery mtl raw-strings-qq - resourcet scientific template-haskell temporary text transformers - unordered-containers vector - ]; - description = "Support for parsing and rendering YAML documents"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "yaml_0_11_4_0" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring , conduit, containers, directory, filepath, hspec, HUnit, libyaml , mockery, mtl, raw-strings-qq, resourcet, scientific @@ -269866,7 +270486,6 @@ self: { ]; description = "Support for parsing and rendering YAML documents"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yaml-combinators" = callPackage @@ -270069,26 +270688,29 @@ self: { }) {}; "yamlparse-applicative" = callPackage - ({ mkDerivation, aeson, base, bytestring, genvalidity-aeson - , genvalidity-hspec, genvalidity-scientific, genvalidity-text - , hspec, optparse-applicative, path, path-io, prettyprinter - , QuickCheck, scientific, text, unordered-containers, validity - , validity-text, vector, yaml + ({ mkDerivation, aeson, base, bytestring, containers + , genvalidity-aeson, genvalidity-containers, genvalidity-hspec + , genvalidity-scientific, genvalidity-text + , genvalidity-unordered-containers, hspec, optparse-applicative + , path, path-io, prettyprinter, QuickCheck, scientific, text + , unordered-containers, validity, validity-text, vector, yaml }: mkDerivation { pname = "yamlparse-applicative"; - version = "0.0.0.0"; - sha256 = "1n2mm542zl4mji8la5xpyjj6cab3rqihlwm1x4d0xgn7xzmng02g"; + version = "0.1.0.1"; + sha256 = "089s5f3i3yz833g7q2rd55v9hn93cdzprhniymw37qdmhv5jw960"; libraryHaskellDepends = [ - aeson base bytestring optparse-applicative path path-io + aeson base bytestring containers optparse-applicative path path-io prettyprinter scientific text unordered-containers validity validity-text vector yaml ]; testHaskellDepends = [ - aeson base genvalidity-aeson genvalidity-hspec - genvalidity-scientific genvalidity-text hspec QuickCheck scientific - text + aeson base containers genvalidity-aeson genvalidity-containers + genvalidity-hspec genvalidity-scientific genvalidity-text + genvalidity-unordered-containers hspec QuickCheck scientific text + unordered-containers ]; + description = "Declaritive configuration parsing with free docs"; license = stdenv.lib.licenses.mit; }) {}; @@ -270401,8 +271023,8 @@ self: { }: mkDerivation { pname = "yaya"; - version = "0.2.1.2"; - sha256 = "179mq32b5gjlwfpldm4msqnxv316gb2gj3s0kzhkcyk0l3i3y8fi"; + version = "0.3.0.0"; + sha256 = "0jwk4pym5rclgk080lwc3ww1wa42xpzlnf31i8clwg1b9h05c8f2"; libraryHaskellDepends = [ base bifunctors comonad constraints containers distributive either errors free kan-extensions lens profunctors template-haskell @@ -270416,21 +271038,38 @@ self: { ({ mkDerivation, base, deriving-compat, hedgehog, yaya }: mkDerivation { pname = "yaya-hedgehog"; - version = "0.1.2.1"; - sha256 = "18lyhb7fqdbp2p71y5jydcb8xzbahqzy1jmsnsb4hym8v8ax71cv"; + version = "0.2.0.0"; + sha256 = "1pc87r0angyg8mym450hwkswnkf3jv8gmxmyalrxwrf5dwh0029y"; libraryHaskellDepends = [ base deriving-compat hedgehog yaya ]; description = "Hedgehog testing support for the Yaya recursion scheme library"; license = stdenv.lib.licenses.agpl3; }) {}; + "yaya-test" = callPackage + ({ mkDerivation, base, deriving-compat, hedgehog, yaya + , yaya-hedgehog + }: + mkDerivation { + pname = "yaya-test"; + version = "0.3.0.0"; + sha256 = "1jbj9z5bxf1r5c8sdsyrc66rwlf1pgw2xs7iy4bxs5h37l74bqg6"; + isLibrary = false; + isExecutable = false; + testHaskellDepends = [ + base deriving-compat hedgehog yaya yaya-hedgehog + ]; + description = "Test suites for `yaya`"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "yaya-unsafe" = callPackage ({ mkDerivation, base, bifunctors, comonad, either, free, lens , yaya }: mkDerivation { pname = "yaya-unsafe"; - version = "0.1.1.2"; - sha256 = "0cvfrzqx5d56nld60p1n5qmwn4j4gbsvy7jf5lk4ar5da4w8a90c"; + version = "0.2.0.0"; + sha256 = "0j4cf7v5pzp4cck2mvs56xpsim7z3z9b8hgpivhp64g529wnzszr"; libraryHaskellDepends = [ base bifunctors comonad either free lens yaya ]; @@ -270438,6 +271077,22 @@ self: { license = stdenv.lib.licenses.agpl3; }) {}; + "yaya-unsafe-test" = callPackage + ({ mkDerivation, base, hedgehog, yaya, yaya-hedgehog, yaya-unsafe + }: + mkDerivation { + pname = "yaya-unsafe-test"; + version = "0.1.1.2"; + sha256 = "0qfhgb3mzm6s04y4rxlba9yz2yr37z5qmqwp1p6hkdbr38z5z9p5"; + isLibrary = false; + isExecutable = false; + testHaskellDepends = [ + base hedgehog yaya yaya-hedgehog yaya-unsafe + ]; + description = "Test suites for `yaya-unsafe`"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "ycextra" = callPackage ({ mkDerivation, base, containers, csv, mtl, uniplate, yhccore }: mkDerivation { @@ -274002,8 +274657,8 @@ self: { }: mkDerivation { pname = "zeolite-lang"; - version = "0.4.1.1"; - sha256 = "0vhxlznprjmaf910j99s7yc0mjyk4jw6gdh49106v83xv3b5ak1m"; + version = "0.6.0.0"; + sha256 = "12g5dsyvc47r236yr4lqa9dzkjqcn646xszw92559w9j555a74lf"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -274655,12 +275310,15 @@ self: { }) {}; "zipper-extra" = callPackage - ({ mkDerivation, base, comonad, comonad-extras, split }: + ({ mkDerivation, base, comonad, comonad-extras, exceptions, split + }: mkDerivation { pname = "zipper-extra"; - version = "0.1.0.1"; - sha256 = "07bhmqjd743x2zjay0q29jfms8xlhk2awc38x75h0cym3agi1m5d"; - libraryHaskellDepends = [ base comonad comonad-extras split ]; + version = "0.1.1.0"; + sha256 = "1hmbn4vs1k4w24szq8m1qkvsa042d19xvvxiaj4chj39w2wc9gjr"; + libraryHaskellDepends = [ + base comonad comonad-extras exceptions split + ]; description = "Zipper utils that weren't in Control.Comonad.Store.Zipper"; license = stdenv.lib.licenses.mit; }) {}; -- cgit v1.2.3 From a61cf82b6d836797398043a1ccd2fdc0be67f893 Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Thu, 7 May 2020 19:43:28 +0200 Subject: hackagePackages.neuron: Fix build --- .../haskell-modules/configuration-common.nix | 4 ++++ .../haskell-modules/configuration-hackage2nix.yaml | 4 ---- .../haskell-modules/configuration-nix.nix | 20 ++++++++++++++++++++ 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 55934862c94..aed4a2d9403 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1515,4 +1515,8 @@ self: super: { }; }; + # hasn‘t bumped upper bounds + # upstream: https://github.com/obsidiansystems/which/pull/6 + which = doJailbreak super.which; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 2cbe100fa40..a30e4d93e6a 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2733,7 +2733,6 @@ broken-packages: - aeson-diff-generic - aeson-filthy - aeson-flowtyped - - aeson-gadt-th - aeson-injector - aeson-iproute - aeson-native @@ -7801,7 +7800,6 @@ broken-packages: - neural - neural-network-blashs - neural-network-hmatrix - - neuron - newhope - newports - newsletter @@ -8895,7 +8893,6 @@ broken-packages: - rhine - rhine-gloss - rhythm-game-tutorial - - rib - ribbit - RichConditional - ridley @@ -10608,7 +10605,6 @@ broken-packages: - wheb-mongo - wheb-redis - wheb-strapped - - which - while-lang-parser - whim - whiskers diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index e05f82bf04d..6d0c93e85a5 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -730,4 +730,24 @@ self: super: builtins.intersectAttrs super { # Tests access homeless-shelter. hie-bios = dontCheck super.hie-bios; + + # Compiling the readme throws errors and has no purpose in nixpkgs + aeson-gadt-th = + disableCabalFlag (doJailbreak (super.aeson-gadt-th)) "build-readme"; + + neuron = overrideCabal (super.neuron) (drv: { + # neuron expects the neuron-search script to be in PATH at built-time. + buildTools = [ pkgs.makeWrapper ]; + preConfigure = '' + mkdir -p $out/bin + cp src-bash/neuron-search $out/bin/neuron-search + chmod +x $out/bin/neuron-search + wrapProgram $out/bin/neuron-search --prefix 'PATH' ':' ${ + with pkgs; + lib.makeBinPath [ fzf ripgrep gawk bat findutils envsubst ] + } + PATH=$PATH:$out/bin + ''; + }); + } -- cgit v1.2.3 From dcbcd742e06b8b7f2915dfa6f0450eb647bc89d8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 13 May 2020 08:27:24 +0200 Subject: haskell-dhall: update override for the latest version on ghc-8.10.x --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 9053d2d9e0d..54e3557736b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -84,7 +84,7 @@ self: super: { zlib = doJailbreak super.zlib; # Use the latest version to fix the build. - dhall = self.dhall_1_31_1; + dhall = self.dhall_1_32_0; ghc-lib-parser-ex = self.ghc-lib-parser-ex_8_10_0_4; lens = self.lens_4_19_2; optics-core = self.optics-core_0_3; -- cgit v1.2.3 From 4ed93cc494f123643aad5d0c394cee92e4fd73de Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 14 May 2020 11:55:02 +0200 Subject: haskell-ghc-lib-parser-ex: update overrides for the update 8.10.x version --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index aed4a2d9403..6ce71eb4731 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1502,13 +1502,13 @@ self: super: { }); # stackage right now is not new enough for hlint-3.0 - ghc-lib-parser-ex_8_10_0_6 = super.ghc-lib-parser-ex_8_10_0_6.override { + ghc-lib-parser-ex_8_10_0_8 = super.ghc-lib-parser-ex_8_10_0_8.override { ghc-lib-parser = self.ghc-lib-parser_8_10_1_20200412; }; hlint = super.hlint.override { ghc-lib-parser = self.ghc-lib-parser_8_10_1_20200412; - ghc-lib-parser-ex = self.ghc-lib-parser-ex_8_10_0_6; + ghc-lib-parser-ex = self.ghc-lib-parser-ex_8_10_0_8; extra = self.extra_1_7_1; filepattern = self.filepattern.override { extra = self.extra_1_7_1; -- cgit v1.2.3 From 4353027d0b535b9c22c3c5d0de58718590483a28 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 14 May 2020 15:26:01 +0200 Subject: haskell/generic-builder.nix: Fix C lib multiple inclusions Allow the darwin links code to overwrite libs that were already copied, because C dependencies can occur multiple times. Solves errors like ln: failed to create symbolic link '/nix/store/higpc9xavwcjjzdipz7m9ly03bh7iy2z-hercules-ci-agent-source-0.7.0/lib/links/libboost_context.dylib': File exists --- pkgs/development/haskell-modules/generic-builder.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 49cbe02b71e..de5bf631bf0 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -383,7 +383,8 @@ stdenv.mkDerivation ({ for d in $(grep '^dynamic-library-dirs:' "$packageConfDir"/* | cut -d' ' -f2- | tr ' ' '\n' | sort -u); do for lib in "$d/"*.{dylib,so}; do - ln -s "$lib" "$dynamicLinksDir" + # Allow overwriting because C libs can be pulled in multiple times. + ln -sf "$lib" "$dynamicLinksDir" done done # Edit the local package DB to reference the links directory. -- cgit v1.2.3 From e037eb4046df34520780af723a33bee3ee15032d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 15 May 2020 20:12:23 +0200 Subject: ghcjs: mark build as broken ghcjs hasn't compiled for several weeks. --- pkgs/development/compilers/ghcjs-ng/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix index 7b6fbc460a9..6d56c410aab 100644 --- a/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -102,6 +102,7 @@ in stdenv.mkDerivation { inherit passthru; - meta.platforms = passthru.bootPkgs.ghc.meta.platforms; + meta.broken = true; # build does not succeed + meta.platforms = lib.platforms.none; # passthru.bootPkgs.ghc.meta.platforms; meta.maintainers = [lib.maintainers.elvishjerricco]; } -- cgit v1.2.3 From a4282b6dc1475cf51ddf296ae398d0f54dc570b5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 15 May 2020 20:55:06 +0200 Subject: all-cabal-hashes: update to Hackage at 2020-05-15T17:34:35Z --- pkgs/data/misc/hackage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index e937f3a0f70..932e400946e 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/a734b1438c8379ed3945412538ff4ec49823564c.tar.gz"; - sha256 = "0y1y818n10fh0qq7cg67p9l293js78fyahk5f6s9w3c21xn9wn8r"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/6515ef12bbcf8fbac87e12b4cb30b7eefa9ce9ce.tar.gz"; + sha256 = "0plf0kk0wj1lbmks09afyqrl70z0miwxzfk3zh7y2qiw3g5l1v0x"; } -- cgit v1.2.3 From a91007dbc43774853d3e6dc2f0c48396d8a4b14c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 9 May 2020 06:33:29 +0200 Subject: ocamlPackages.ipaddr: remove at 2.6.1 This is a legacy version for OCaml 4.02 --- pkgs/development/ocaml-modules/ipaddr/2.6.1.nix | 32 ------------------------- pkgs/top-level/ocaml-packages.nix | 7 +----- 2 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/ipaddr/2.6.1.nix diff --git a/pkgs/development/ocaml-modules/ipaddr/2.6.1.nix b/pkgs/development/ocaml-modules/ipaddr/2.6.1.nix deleted file mode 100644 index a602393e920..00000000000 --- a/pkgs/development/ocaml-modules/ipaddr/2.6.1.nix +++ /dev/null @@ -1,32 +0,0 @@ -{stdenv, buildOcaml, fetchurl, sexplib_p4}: - -buildOcaml rec { - name = "ipaddr"; - version = "2.6.1"; - - src = fetchurl { - url = "https://github.com/mirage/ocaml-ipaddr/archive/${version}.tar.gz"; - sha256 = "7051013d8f58abff433187d70cd7ddd7a6b49a6fbe6cad1893f571f65b8ed3d0"; - }; - - propagatedBuildInputs = [ sexplib_p4 ]; - - configurePhase = '' - ocaml setup.ml -configure --prefix $out - ''; - - buildPhase = '' - make build - ''; - - installPhase = '' - make install - ''; - - meta = with stdenv.lib; { - homepage = "https://github.com/mirage/ocaml-ipaddr"; - description = "A library for manipulation of IP (and MAC) address representations "; - license = licenses.mit; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index f21f3ca9cbe..80d49ca1f58 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -317,12 +317,7 @@ let io-page = callPackage ../development/ocaml-modules/io-page { }; - ipaddr_p4 = callPackage ../development/ocaml-modules/ipaddr/2.6.1.nix { }; - - ipaddr = - if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/ipaddr { } - else ipaddr_p4; + ipaddr = callPackage ../development/ocaml-modules/ipaddr { }; irmin_1 = callPackage ../development/ocaml-modules/irmin/1.4.nix { }; -- cgit v1.2.3 From 52d2e991826d94ac8ca5fc424f12848b9b3e5927 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Wed, 15 Apr 2020 07:58:04 +0200 Subject: php74: 7.4.4 -> 7.4.5 Changelog: https://www.php.net/ChangeLog-7.php#7.4.5 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 8ccb0e54641..142e8ea43b8 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -272,8 +272,8 @@ let }); php74base = callPackage generic (_args // { - version = "7.4.4"; - sha256 = "17w2m4phhpj76x5fx67vgjrlkcczqvky3f5in1kjg2pch90qz3ih"; + version = "7.4.5"; + sha256 = "0vrxy5ymfkpi2sxbnh6967nc4xnxcwlc27bivaa36g5nslrsbnir"; }); defaultPhpExtensions = { all, ... }: with all; ([ -- cgit v1.2.3 From c88290789c06e19453375ad85f3cd1d417b07ae9 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Sat, 9 May 2020 19:11:09 -0400 Subject: doc: Rewrite python onboarding tutorials in manual Based on some feedback in #87094 and discussion with @fridh, this re-organizes the onboarding tutorial in the Nixpkgs manual's python section, so that we start with the simplest, most ad-hoc examples and work our way up. This progresses from: 1. How to create an temporary python env at the cmdline, then 2. How to create a specific python env for a single script, then 3. How to create a specific python env for a project in a shell.nix, then 4. How to install a specific python env globally on the system or in a user profile. Additionally, I've tried to standardize on some of the "best practice" ways of doing things: 1. Instead of saying that this command style is "supported but strongly not discouraged", I've just deleted it to avoid confusion. Bad: nix-shell -p python38Packages.numpy python38Packages.toolz Good: nix-shell -p 'python38.withPackages(ps: with ps; [ numpy toolz ])' 2. In the portion where we show how to add stuff to the user's `XDG_CONFIG_HOME`, use overlays instead of `config.nix`. The former can do everything the latter can do, but is also much more generic and powerful, because it can compose with other files, compose with other envs, compose with overlays that do things like swap whether tensorflow and pytorch are built openblas/mkl/cuda stacks, and so on. The user is eventually going to see the overlay, so to avoid confusion let's standardize on it. --- doc/languages-frameworks/python.section.md | 392 +++++++++++++++++++---------- 1 file changed, 254 insertions(+), 138 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 00d5d0ff04c..35ea480e6b9 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -36,121 +36,191 @@ The Nix and NixOS manuals explain how packages are generally installed. In the case of Python and Nix, it is important to make a distinction between whether the package is considered an application or a library. -Applications on Nix are typically installed into your user -profile imperatively using `nix-env -i`, and on NixOS declaratively by adding the -package name to `environment.systemPackages` in `/etc/nixos/configuration.nix`. -Dependencies such as libraries are automatically installed and should not be -installed explicitly. - -The same goes for Python applications and libraries. Python applications can be -installed in your profile. But Python libraries you would like to use for -development cannot be installed, at least not individually, because they won't -be able to find each other resulting in import errors. Instead, it is possible -to create an environment with `python.buildEnv` or `python.withPackages` where -the interpreter and other executables are able to find each other and all of the -modules. - -In the following examples we create an environment with Python 3.8, `numpy` and -`toolz`. As you may imagine, there is one limitation here, and that's that -you can install only one environment at a time. You will notice the complaints -about collisions when you try to install a second environment. - -##### Environment defined in separate `.nix` file - -Create a file, e.g. `build.nix`, with the following expression -```nix -with import {}; +Applications on Nix are typically installed into your user profile imperatively +using `nix-env -i`, and on NixOS declaratively by adding the package name to +`environment.systemPackages` in `/etc/nixos/configuration.nix`. Dependencies +such as libraries are automatically installed and should not be installed +explicitly. -python38.withPackages (ps: with ps; [ numpy toolz ]) -``` -and install it in your profile with -```shell -nix-env -if build.nix -``` -Now you can use the Python interpreter, as well as the extra packages (`numpy`, -`toolz`) that you added to the environment. +The same goes for Python applications. Python applications can be installed in +your profile, and will be wrapped to find their exact library dependencies, +without impacting other applications or polluting your user environment. -##### Environment defined in `~/.config/nixpkgs/config.nix` +But Python libraries you would like to use for development cannot be installed, +at least not individually, because they won't be able to find each other +resulting in import errors. Instead, it is possible to create an environment +with `python.buildEnv` or `python.withPackages` where the interpreter and other +executables are wrapped to be able to find each other and all of the modules. -If you prefer you could also add the environment as a package override to the -Nixpkgs set, e.g. using `config.nix`, +In the following examples we will start by creating a simple, ad-hoc environment +with a nix-shell that has `numpy` and `toolz` in Python 3.8; then we will create +a re-usable environment in a single-file Python script; then we will create a +full Python environment for development with this same environment. -```nix -{ # ... +Philosphically, this should be familiar to users who are used to a `venv` style +of development: individual projects create their own Python environments without +impacting the global environment or each other. - packageOverrides = pkgs: with pkgs; { - myEnv = python38.withPackages (ps: with ps; [ numpy toolz ]); - }; -} -``` -and install it in your profile with - -```shell -nix-env -iA nixpkgs.myEnv -``` +#### Ad-hoc temporary Python environment with `nix-shell` -The environment is is installed by referring to the attribute, and considering -the `nixpkgs` channel was used. +The simplest way to start playing with the way nix wraps and sets up Python +environments is with `nix-shell` at the cmdline. These environments create a +temporary shell session with a Python and a *precise* list of packages (plus +their runtime dependencies), with no other Python packages in the Python +interpreter's scope. -##### Environment defined in `/etc/nixos/configuration.nix` +To create a Python 3.8 session with `numpy` and `toolz` available, run: -For the sake of completeness, here's another example how to install the -environment system-wide. +```sh +$ nix-shell -p 'python38.withPackages(ps: with ps; [ numpy toolz ])' +``` -```nix -{ # ... +By default `nix-shell` will start a `bash` session with this interpreter in our +`PATH`, so if we then run: - environment.systemPackages = with pkgs; [ - (python38.withPackages(ps: with ps; [ numpy toolz ])) - ]; -} +``` +[nix-shell:~/src/nixpkgs]$ python3 +Python 3.8.1 (default, Dec 18 2019, 19:06:26) +[GCC 9.2.0] on linux +Type "help", "copyright", "credits" or "license" for more information. +>>> import numpy; import toolz ``` -#### Temporary Python environment with `nix-shell` +Note that no other modules are in scope, even if they were imperatively +installed into our user environment as a dependency of a Python application: -The examples in the previous section showed how to install a Python environment -into a profile. For development you may need to use multiple environments. -`nix-shell` gives the possibility to temporarily load another environment, akin -to `virtualenv`. +``` +>>> import requests +Traceback (most recent call last): + File "", line 1, in +ModuleNotFoundError: No module named 'requests' +``` -There are two methods for loading a shell with Python packages. The first and -recommended method is to create an environment with `python.buildEnv` or -`python.withPackages` and load that. E.g. +We can add as many additional modules onto the `nix-shell` as we need, and we +will still get 1 wrapped Python interpreter. We can start the interpreter +directly like so: ```sh -$ nix-shell -p 'python38.withPackages(ps: with ps; [ numpy toolz ])' +$ nix-shell -p 'python38.withPackages(ps: with ps; [ numpy toolz requests ])' --run python3 +these derivations will be built: + /nix/store/xbdsrqrsfa1yva5s7pzsra8k08gxlbz1-python3-3.8.1-env.drv +building '/nix/store/xbdsrqrsfa1yva5s7pzsra8k08gxlbz1-python3-3.8.1-env.drv'... +created 277 symlinks in user environment +Python 3.8.1 (default, Dec 18 2019, 19:06:26) +[GCC 9.2.0] on linux +Type "help", "copyright", "credits" or "license" for more information. +>>> import requests +>>> +``` + +Notice that this time it built a new Python environment, which now includes +`requests`. Building an environment just creates wrapper scripts that expose the +selected dependencies to the interpreter while re-using the actual modules. This +means if any other env has installed `requests` or `numpy` in a different +context, we don't need to recompile them -- we just recompile the wrapper script +that sets up an interpreter pointing to them. This matters much more for "big" +modules like `pytorch` or `tensorflow`. + +Module names usually match their names on [pypi.org](https://pypi.org/), but +you can use the [Nixpkgs search website](https://nixos.org/nixos/packages.html) +to find them as well (along with non-python packages). + +At this point we can create throwaway experimental Python environments with +arbitrary dependencies. This is a good way to get a feel for how the Python +interpreter and dependencies work in Nix and NixOS, but to do some actual +development, we'll want to make it a bit more persistent. + +##### Running Python scripts and using `nix-shell` as shebang + +Sometimes, we have a script whose header looks like this: + +```python +#!/usr/bin/env python3 +import numpy as np +a = np.array([1,2]) +b = np.array([3,4]) +print(f"The dot product of {a} and {b} is: {np.dot(a, b)}") ``` -opens a shell from which you can launch the interpreter +Executing this script requires a `python3` that has `numpy`. Using what we learned +in the previous section, we could startup a shell and just run it like so: -```sh -[nix-shell:~] python3 +``` +nix-shell -p 'python38.withPackages(ps: with ps; [ numpy ])' --run 'python3 foo.py' +The dot product of [1 2] and [3 4] is: 11 +``` + +But if we maintain the script ourselves, and if there are more dependencies, it +may be nice to encode those dependencies in source to make the script re-usable +without that bit of knowledge. That can be done by using `nix-shell` as a +[shebang](https://en.wikipedia.org/wiki/Shebang_(Unix), like so: + +```python +#!/usr/bin/env nix-shell +#!nix-shell -i python3 -p "python3.withPackages(ps: [ ps.numpy ])" +import numpy as np +a = np.array([1,2]) +b = np.array([3,4]) +print(f"The dot product of {a} and {b} is: {np.dot(a, b)}") ``` -The other method, which is not recommended, does not create an environment and -requires you to list the packages directly, +Then we simply execute it, without requiring any environment setup at all! ```sh -$ nix-shell -p python38.pkgs.numpy python38.pkgs.toolz +$ ./foo.py +The dot product of [1 2] and [3 4] is: 11 ``` -Again, it is possible to launch the interpreter from the shell. The Python -interpreter has the attribute `pkgs` which contains all Python libraries for -that specific interpreter. +If the dependencies are not available on the host where `foo.py` is executed, it +will build or download them from a Nix binary cache prior to starting up, prior +that it is executed on a machine with a multi-user nix installation. + +This provides a way to ship a self bootstrapping Python script, akin to a +statically linked binary, where it can be run on any machine (provided nix is +installed) without having to assume that `numpy` is installed globally on the +system. + +By default it is pulling the import checkout of Nixpkgs itself from our nix +channel, which is nice as it cache aligns with our other package builds, but we +can make it fully reproducible by pinning the `nixpkgs` import: + +```python +#!/usr/bin/env nix-shell +#!nix-shell -i python3 -p "python3.withPackages(ps: [ ps.numpy ])" +#!nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/d373d80b1207d52621961b16aa4a3438e4f98167.tar.gz +import numpy as np +a = np.array([1,2]) +b = np.array([3,4]) +print(f"The dot product of {a} and {b} is: {np.dot(a, b)}") +``` + +This will execute with the exact same versions of Python 3.8, numpy, and system +dependencies a year from now as it does today, because it will always use +exactly git commit `d373d80b1207d52621961b16aa4a3438e4f98167` of Nixpkgs for all +of the package versions. + +This is also a great way to ensure the script executes identically on different +servers. ##### Load environment from `.nix` expression -As explained in the Nix manual, `nix-shell` can also load an -expression from a `.nix` file. Say we want to have Python 3.8, `numpy` -and `toolz`, like before, in an environment. Consider a `shell.nix` file -with + +We've now seen how to create an ad-hoc temporary shell session, and how to +create a single script with Python dependencies, but in the course of normal +development we're usually working in an entire package repository. + +As explained in the Nix manual, `nix-shell` can also load an expression from a +`.nix` file. Say we want to have Python 3.8, `numpy` and `toolz`, like before, +in an environment. We can add a `shell.nix` file describing our dependencies: ```nix with import {}; - (python38.withPackages (ps: [ps.numpy ps.toolz])).env ``` -Executing `nix-shell` gives you again a Nix shell from which you can run Python. +And then at the command line, just typing `nix-shell` produces the same +environment as before. In a normal project, we'll likely have many more +dependencies; this can provide a way for developers to share the environments +with each other and with CI builders. What's happening here? @@ -158,9 +228,9 @@ What's happening here? imports the `` function, `{}` calls it and the `with` statement brings all attributes of `nixpkgs` in the local scope. These attributes form the main package set. -2. Then we create a Python 3.8 environment with the `withPackages` function. +2. Then we create a Python 3.8 environment with the `withPackages` function, as before. 3. The `withPackages` function expects us to provide a function as an argument - that takes the set of all python packages and returns a list of packages to + that takes the set of all Python packages and returns a list of packages to include in the environment. Here, we select the packages `numpy` and `toolz` from the package set. @@ -168,7 +238,6 @@ To combine this with `mkShell` you can: ```nix with import {}; - let pythonEnv = python38.withPackages (ps: [ ps.numpy @@ -177,50 +246,98 @@ let in mkShell { buildInputs = [ pythonEnv - hello + + black + mypy + + libffi + openssl ]; } ``` -##### Execute command with `--run` -A convenient option with `nix-shell` is the `--run` -option, with which you can execute a command in the `nix-shell`. We can -e.g. directly open a Python shell +This will create a unified environment that has not just our Python interpreter +and its Python dependencies, but also tools like `black` or `mypy` and libraries +like `libffi` the `openssl` in scope. This is generic and can span any number of +tools or languages across the Nixpkgs ecosystem. -```sh -$ nix-shell -p python38Packages.numpy python38Packages.toolz --run "python3" +##### Installing environments globally on the system + +Up to now, we've been creating environments scoped to an ad-hoc shell session, +or a single script, or a single project. This is generally advisable, as it +avoids pollution across contexts. + +However, sometimes we know we will often want a Python with some basic packages, +and want this available without having to enter into a shell or build context. +This can be useful to have things like vim/emacs editors and plugins or shell +tools "just work" without having to set them up, or when running other software +that expects packages to be installed globally. + +To create your own custom environment, create a file in `~/.config/nixpkgs/overlays/` +that looks like this: + +```nix +# ~/.config/nixpkgs/overlays/myEnv.nix +self: super: { + myEnv = super.buildEnv { + name = "myEnv"; + paths = [ + # A Python 3 interpreter with some packages + (self.python3.withPackages ( + ps: with ps; [ + pyflakes + pytest + python-language-server + ] + )) + + # Some other packages we'd like as part of this env + self.mypy + self.black + self.ripgrep + self.tmux + ]; + }; +} ``` -or run a script +You can then build and install this to your profile with: ```sh -$ nix-shell -p python38Packages.numpy python38Packages.toolz --run "python3 myscript.py" +nix-env -iA myEnv ``` -##### `nix-shell` as shebang -In fact, for the second use case, there is a more convenient method. You can add -a [shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)) to your script -specifying which dependencies `nix-shell` needs. With the following shebang, you -can just execute `./myscript.py`, and it will make available all dependencies -and run the script in the `python3` shell. +One limitation of this is that you can only have 1 Python env installed +globally, since they conflict on the `python` to load out of your `PATH`. + +If you get a conflict or prefer to keep the setup clean, you can have `nix-env` +atomically *uninstall* all other imperatively installed packages and replace +your profile with just `myEnv` by using the `--replace` flag. + +##### Environment defined in `/etc/nixos/configuration.nix` -```py -#! /usr/bin/env nix-shell -#! nix-shell -i python3 -p "python3.withPackages(ps: [ps.numpy])" +For the sake of completeness, here's how to install the environment system-wide +on NixOS. -import numpy +```nix +{ # ... -print(numpy.__version__) + environment.systemPackages = with pkgs; [ + (python38.withPackages(ps: with ps; [ numpy toolz ])) + ]; +} ``` ### Developing with Python -Now that you know how to get a working Python environment with Nix, it is time -to go forward and start actually developing with Python. We will first have a -look at how Python packages are packaged on Nix. Then, we will look at how you -can use development mode with your code. +Above, we were mostly just focused on use cases and what to do to get started +creating working Python environments in nix. -#### Packaging a library +Now that you know the basics to be up and running, it is time to take a step +back and take a deeper look at at how Python packages are packaged on Nix. Then, +we will look at how you can use development mode with your code. + +#### Python library packages in Nixpkgs With Nix all packages are built by functions. The main function in Nix for building Python libraries is `buildPythonPackage`. Let's see how we can build the @@ -262,6 +379,7 @@ An expression for `toolz` can be found in the Nixpkgs repository. As explained in the introduction of this Python section, a derivation of `toolz` is available for each interpreter version, e.g. `python38.pkgs.toolz` refers to the `toolz` derivation corresponding to the CPython 3.8 interpreter. + The above example works when you're directly working on `pkgs/top-level/python-packages.nix` in the Nixpkgs repository. Often though, you will want to test a Nix expression outside of the Nixpkgs tree. @@ -312,7 +430,7 @@ Our example, `toolz`, does not have any dependencies on other Python packages or system libraries. According to the manual, `buildPythonPackage` uses the arguments `buildInputs` and `propagatedBuildInputs` to specify dependencies. If something is exclusively a build-time dependency, then the dependency should be -included as a `buildInput`, but if it is (also) a runtime dependency, then it +included in `buildInputs`, but if it is (also) a runtime dependency, then it should be added to `propagatedBuildInputs`. Test dependencies are considered build-time dependencies and passed to `checkInputs`. @@ -423,10 +541,11 @@ Note also the line `doCheck = false;`, we explicitly disabled running the test-s #### Develop local package -As a Python developer you're likely aware of [development mode](http://setuptools.readthedocs.io/en/latest/setuptools.html#development-mode) (`python setup.py develop`); -instead of installing the package this command creates a special link to the project code. -That way, you can run updated code without having to reinstall after each and every change you make. -Development mode is also available. Let's see how you can use it. +As a Python developer you're likely aware of [development mode](http://setuptools.readthedocs.io/en/latest/setuptools.html#development-mode) +(`python setup.py develop`); instead of installing the package this command +creates a special link to the project code. That way, you can run updated code +without having to reinstall after each and every change you make. Development +mode is also available. Let's see how you can use it. In the previous Nix expression the source was fetched from an url. We can also refer to a local source instead using `src = ./path/to/source/tree;` @@ -455,7 +574,6 @@ buildPythonPackage rec { It is important to note that due to how development mode is implemented on Nix it is not possible to have multiple packages simultaneously in development mode. - ### Organising your packages So far we discussed how you can use Python on Nix, and how you can develop with @@ -481,11 +599,11 @@ We first create a function that builds `toolz` in `~/path/to/toolz/release.nix` buildPythonPackage rec { pname = "toolz"; - version = "0.7.4"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd"; + sha256 = "08fdd5ef7c96480ad11c12d472de21acd32359996f69a5259299b540feba4560"; }; meta = with lib; { @@ -497,8 +615,8 @@ buildPythonPackage rec { } ``` -It takes an argument `buildPythonPackage`. -We now call this function using `callPackage` in the definition of our environment +It takes an argument `buildPythonPackage`. We now call this function using +`callPackage` in the definition of our environment ```nix with import {}; @@ -548,7 +666,7 @@ Each interpreter has the following attributes: - `buildEnv`. Function to build python interpreter environments with extra packages bundled together. See section *python.buildEnv function* for usage and documentation. - `withPackages`. Simpler interface to `buildEnv`. See section *python.withPackages function* for usage and documentation. - `sitePackages`. Alias for `lib/${libPrefix}/site-packages`. -- `executable`. Name of the interpreter executable, e.g. `python3.7`. +- `executable`. Name of the interpreter executable, e.g. `python3.8`. - `pkgs`. Set of Python packages for that specific interpreter. The package set can be modified by overriding the interpreter and passing `packageOverrides`. ### Building packages and applications @@ -643,7 +761,7 @@ following are specific to `buildPythonPackage`: appears more than once in dependency tree. Default is `true`. * `disabled` ? false: If `true`, package is not built for the particular Python interpreter version. -* `dontWrapPythonPrograms ? false`: Skip wrapping of python programs. +* `dontWrapPythonPrograms ? false`: Skip wrapping of Python programs. * `permitUserSite ? false`: Skip setting the `PYTHONNOUSERSITE` environment variable in wrapped programs. * `installFlags ? []`: A list of strings. Arguments to be passed to `pip @@ -730,7 +848,7 @@ Another difference is that `buildPythonPackage` by default prefixes the names of the packages with the version of the interpreter. Because this is irrelevant for applications, the prefix is omitted. -When packaging a python application with `buildPythonApplication`, it should be +When packaging a Python application with `buildPythonApplication`, it should be called with `callPackage` and passed `python` or `pythonPackages` (possibly specifying an interpreter version), like this: @@ -761,7 +879,7 @@ luigi = callPackage ../applications/networking/cluster/luigi { }; ``` Since the package is an application, a consumer doesn't need to care about -python versions or modules, which is why they don't go in `pythonPackages`. +Python versions or modules, which is why they don't go in `pythonPackages`. #### `toPythonApplication` function @@ -875,7 +993,7 @@ thus be also written like this: ```nix with import {}; -(python36.withPackages (ps: [ps.numpy ps.requests])).env +(python38.withPackages (ps: [ps.numpy ps.requests])).env ``` In contrast to `python.buildEnv`, `python.withPackages` does not support the @@ -932,7 +1050,7 @@ pythonPackages.buildPythonPackage { Running `nix-shell` with no arguments should give you the environment in which the package would be built with `nix-build`. -Shortcut to setup environments with C headers/libraries and python packages: +Shortcut to setup environments with C headers/libraries and Python packages: ```shell nix-shell -p pythonPackages.pyramid zlib libjpeg git @@ -963,7 +1081,6 @@ have timestamp 1. The `buildPythonPackage` function sets `DETERMINISTIC_BUILD=1` and [PYTHONHASHSEED=0](https://docs.python.org/3.8/using/cmdline.html#envvar-PYTHONHASHSEED). Both are also exported in `nix-shell`. - ### Automatic tests It is recommended to test packages as part of the build process. @@ -976,7 +1093,7 @@ example of such a situation is when `py.test` is used. #### Common issues * Non-working tests can often be deselected. By default `buildPythonPackage` - runs `python setup.py test`. Most python modules follows the standard test + runs `python setup.py test`. Most Python modules follows the standard test protocol where the pytest runner can be used instead. `py.test` supports a `-k` parameter to ignore test methods or classes: @@ -1052,7 +1169,7 @@ let newpkgs = import pkgs.path { overlays = [ (self: super: { python38 = let packageOverrides = python-self: python-super: { - numpy = python-super.numpy_1_18.3; + numpy = python-super.numpy_1_18; }; in super.python38.override {inherit packageOverrides;}; } ) ]; }; @@ -1127,14 +1244,14 @@ If you want to create a Python environment for development, then the recommended method is to use `nix-shell`, either with or without the `python.buildEnv` function. -### How to consume python modules using pip in a virtual environment like I am used to on other Operating Systems? +### How to consume Python modules using pip in a virtual environment like I am used to on other Operating Systems? While this approach is not very idiomatic from Nix perspective, it can still be useful when dealing with pre-existing projects or in situations where it's not feasible or desired to write derivations for all required dependencies. This is an example of a `default.nix` for a `nix-shell`, which allows to consume -a virtual environment created by `venv`, and install python modules through +a virtual environment created by `venv`, and install Python modules through `pip` the traditional way. Create this `default.nix` file, together with a `requirements.txt` and simply @@ -1149,7 +1266,7 @@ in pkgs.mkShell rec { name = "impurePythonEnv"; venvDir = "./.venv"; buildInputs = [ - # A python interpreter including the 'venv' module is required to bootstrap + # A Python interpreter including the 'venv' module is required to bootstrap # the environment. pythonPackages.python @@ -1163,7 +1280,7 @@ in pkgs.mkShell rec { pythonPackages.requests # In this particular example, in order to compile any binary extensions they may - # require, the python modules listed in the hypothetical requirements.txt need + # require, the Python modules listed in the hypothetical requirements.txt need # the following packages to be installed locally: taglib openssl @@ -1183,7 +1300,7 @@ in pkgs.mkShell rec { } ``` -In case the supplied venvShellHook is insufficient, or when python 2 support is +In case the supplied venvShellHook is insufficient, or when Python 2 support is needed, you can define your own shell hook and adapt to your needs like in the following example: @@ -1229,7 +1346,7 @@ in pkgs.mkShell rec { ``` Note that the `pip install` is an imperative action. So every time `nix-shell` -is executed it will attempt to download the python modules listed in +is executed it will attempt to download the Python modules listed in requirements.txt. However these will be cached locally within the `virtualenv` folder and not downloaded again. @@ -1290,9 +1407,8 @@ self: super: { ### How to use Intel's MKL with numpy and scipy? -MKL can be configured using an overlay. See the section “[Using -overlays to configure -alternatives](#sec-overlays-alternatives-blas-lapack)”. +MKL can be configured using an overlay. See the section "[Using overlays to +configure alternatives](#sec-overlays-alternatives-blas-lapack)". ### What inputs do `setup_requires`, `install_requires` and `tests_require` map to? -- cgit v1.2.3 From 46b3eca5fd3f1fbfa00a344d59e992da228edf1e Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Fri, 15 May 2020 04:36:26 -0400 Subject: solc: 0.5.15 -> 0.6.8 --- pkgs/development/compilers/solc/default.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/development/compilers/solc/default.nix b/pkgs/development/compilers/solc/default.nix index a1cf5b2debd..ac4bc324868 100644 --- a/pkgs/development/compilers/solc/default.nix +++ b/pkgs/development/compilers/solc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, boost, cmake, ncurses, python2 +{ stdenv, fetchzip, boost, cmake, ncurses, python3, coreutils , z3Support ? true, z3 ? null, cvc4Support ? true, cvc4 ? null , cln ? null, gmp ? null }: @@ -16,12 +16,12 @@ in stdenv.mkDerivation rec { pname = "solc"; - version = "0.5.15"; + version = "0.6.8"; # upstream suggests avoid using archive generated by github src = fetchzip { url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz"; - sha256 = "1nfvsaci5ja5ss603z04197wndwkvcq9nm5mdab1kpdr91djxh2y"; + sha256 = "1nxds6c10hjqjjk893qw2yljws57li0xigbf3ih85y8y6d587ph0"; }; postPatch = '' @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost ] ++ stdenv.lib.optionals z3Support [ z3 ] ++ stdenv.lib.optionals cvc4Support [ cvc4 cln gmp ]; - checkInputs = [ ncurses python2 ]; + checkInputs = [ ncurses python3 ]; # Test fails on darwin for unclear reason doCheck = stdenv.hostPlatform.isLinux; @@ -56,13 +56,7 @@ stdenv.mkDerivation rec { pushd .. # IPC tests need aleth avaliable, so we disable it sed -i "s/IPC_ENABLED=true/IPC_ENABLED=false\nIPC_FLAGS=\"--no-ipc\"/" ./scripts/tests.sh - for i in ./scripts/*.sh; do - patchShebangs "$i" - done - for i in ./scripts/*.py; do - patchShebangs "$i" - done - for i in ./test/*.sh; do + for i in ./scripts/*.sh ./scripts/*.py ./test/*.sh; do patchShebangs "$i" done TERM=xterm ./scripts/tests.sh -- cgit v1.2.3 From 5195aed6171249a830c95401a88687bac4eb7193 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 6 Mar 2020 12:01:39 +1000 Subject: rkt: remove --- nixos/doc/manual/release-notes/rl-2009.xml | 5 ++ nixos/modules/module-list.nix | 1 - nixos/modules/rename.nix | 1 + nixos/modules/virtualisation/rkt.nix | 64 ------------------- pkgs/applications/virtualization/rkt/default.nix | 78 ------------------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 7 files changed, 7 insertions(+), 145 deletions(-) delete mode 100644 nixos/modules/virtualisation/rkt.nix delete mode 100644 pkgs/applications/virtualization/rkt/default.nix diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 341b304cb9e..1d24553b08d 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -381,6 +381,11 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; will have changed. + + + The rkt module has been removed, it was archived by upstream. + + diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 5adbc26522c..89677970dd9 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1002,7 +1002,6 @@ ./virtualisation/podman.nix ./virtualisation/qemu-guest-agent.nix ./virtualisation/railcar.nix - ./virtualisation/rkt.nix ./virtualisation/virtualbox-guest.nix ./virtualisation/virtualbox-host.nix ./virtualisation/vmware-guest.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index a946268494e..7776c648af8 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -48,6 +48,7 @@ with lib; systemd-logind API). Instead of using the module you can now simply add the brightnessctl package to environment.systemPackages. '') + (mkRemovedOptionModule [ "virtualisation" "rkt" ] "The rkt module has been removed, it was archived by upstream") (mkRemovedOptionModule ["services" "prey" ] '' prey-bash-client is deprecated upstream diff --git a/nixos/modules/virtualisation/rkt.nix b/nixos/modules/virtualisation/rkt.nix deleted file mode 100644 index fd662b52df5..00000000000 --- a/nixos/modules/virtualisation/rkt.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.virtualisation.rkt; -in -{ - options.virtualisation.rkt = { - enable = mkEnableOption "rkt metadata service"; - - gc = { - automatic = mkOption { - default = true; - type = types.bool; - description = "Automatically run the garbage collector at a specific time."; - }; - - dates = mkOption { - default = "03:15"; - type = types.str; - description = '' - Specification (in the format described by - systemd.time - 7) of the time at - which the garbage collector will run. - ''; - }; - - options = mkOption { - default = "--grace-period=24h"; - type = types.str; - description = '' - Options given to rkt gc when the - garbage collector is run automatically. - ''; - }; - }; - }; - - config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.rkt ]; - - systemd.services.rkt = { - description = "rkt metadata service"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - serviceConfig = { - ExecStart = "${pkgs.rkt}/bin/rkt metadata-service"; - }; - }; - - systemd.services.rkt-gc = { - description = "rkt garbage collection"; - startAt = optionalString cfg.gc.automatic cfg.gc.dates; - serviceConfig = { - Type = "oneshot"; - ExecStart = "${pkgs.rkt}/bin/rkt gc ${cfg.gc.options}"; - }; - }; - - users.groups.rkt = {}; - }; -} diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix deleted file mode 100644 index f3b68e5c227..00000000000 --- a/pkgs/applications/virtualization/rkt/default.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ stdenv, lib, autoreconfHook, acl, go, file, git, wget, gnupg, trousers, squashfsTools, - cpio, fetchurl, fetchFromGitHub, iptables, systemd, makeWrapper, glibc }: - -let - # Always get the information from - # https://github.com/coreos/rkt/blob/v${VERSION}/stage1/usr_from_coreos/coreos-common.mk - coreosImageRelease = "1478.0.0"; - coreosImageSystemdVersion = "233"; - - # TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor. - stage1Flavours = [ "coreos" "fly" ]; - stage1Dir = "lib/rkt/stage1-images"; - -in stdenv.mkDerivation rec { - version = "1.30.0"; - pname = "rkt"; - BUILDDIR="build-${pname}-${version}"; - - src = fetchFromGitHub { - owner = "coreos"; - repo = "rkt"; - rev = "v${version}"; - sha256 = "0dqf83b7iin1np8k8k1m8i99ybga8vx932q7n2q64yghkw7p6i00"; - }; - - stage1BaseImage = fetchurl { - url = "http://alpha.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz"; - sha256 = "0s4qdkkfp0iirfnm5ds3b3hxq0249kvpygyhflma8z90ivkzk5wq"; - }; - - buildInputs = [ - glibc.out glibc.static - autoreconfHook go file git wget gnupg trousers squashfsTools cpio acl systemd - makeWrapper - ]; - - preConfigure = '' - ./autogen.sh - configureFlagsArray=( - --with-stage1-flavors=${builtins.concatStringsSep "," stage1Flavours} - ${if lib.findFirst (p: p == "coreos") null stage1Flavours != null then " - --with-coreos-local-pxe-image-path=${stage1BaseImage} - --with-coreos-local-pxe-image-systemd-version=v${coreosImageSystemdVersion} - " else "" } - --with-stage1-default-location=$out/${stage1Dir}/stage1-${builtins.elemAt stage1Flavours 0}.aci - ); - ''; - - preBuild = '' - export BUILDDIR - export GOCACHE="$TMPDIR/go-cache" - ''; - - installPhase = '' - mkdir -p $out/bin - cp -Rv $BUILDDIR/target/bin/rkt $out/bin - - mkdir -p $out/lib/rkt/stage1-images/ - cp -Rv $BUILDDIR/target/bin/stage1-*.aci $out/${stage1Dir}/ - - wrapProgram $out/bin/rkt \ - --prefix LD_LIBRARY_PATH : "${systemd.lib}/lib:${acl.out}/lib" \ - --prefix PATH : ${iptables}/bin - ''; - - meta = with lib; { - description = "A fast, composable, and secure App Container runtime for Linux"; - homepage = "https://github.com/coreos/rkt"; - license = licenses.asl20; - maintainers = with maintainers; [ ragge steveej ]; - platforms = [ "x86_64-linux" ]; - knownVulnerabilities = [ - "CVE-2019-10144: processes run with `rkt enter` are given all capabilities during stage 2" - "CVE-2019-10145: processes run with `rkt enter` do not have seccomp filtering during stage 2" - "CVE-2019-10147: processes run with `rkt enter` are not limited by cgroups during stage 2" - ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 5767878dc65..7bba5fb630b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -453,6 +453,7 @@ mapAliases ({ recordmydesktop = throw "recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10 gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10 qt-recordmydesktop = throw "qt-recordmydesktop has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10 + rkt = throw "rkt was archived by upstream"; # added 2020-05-16 ruby_2_0_0 = throw "deprecated 2018-0213: use a newer version of ruby"; ruby_2_1_0 = throw "deprecated 2018-0213: use a newer version of ruby"; ruby_2_2_9 = throw "deprecated 2018-0213: use a newer version of ruby"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e87f34a0284..44e4bf59979 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21691,8 +21691,6 @@ in ripser = callPackage ../applications/science/math/ripser { }; - rkt = callPackage ../applications/virtualization/rkt { }; - rkdeveloptool = callPackage ../misc/rkdeveloptool { }; rofi-unwrapped = callPackage ../applications/misc/rofi { }; -- cgit v1.2.3 From d18d18a45d175e97380ed5f64c9b01e27ca6b2a1 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 15 May 2020 20:23:09 -0400 Subject: linux/hardened/patches/4.19: 4.19.122.a -> 4.19.123.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 76d27e29508..80010cc61d4 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -5,9 +5,9 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.180.a/linux-hardened-4.14.180.a.patch" }, "4.19": { - "name": "linux-hardened-4.19.122.a.patch", - "sha256": "0jh5wyrwrmm9rqqi8fn6d6bd8lzkhj1aylnphsajyyx5v28hn1b2", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.122.a/linux-hardened-4.19.122.a.patch" + "name": "linux-hardened-4.19.123.a.patch", + "sha256": "12z4f0nph23110dpk0c8av9bjr8q9qhmyzzj2chrscfwybmld76h", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.123.a/linux-hardened-4.19.123.a.patch" }, "5.4": { "name": "linux-hardened-5.4.40.a.patch", -- cgit v1.2.3 From 6fd700adf1ca2c5904773feb9a682c340232ce08 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 15 May 2020 20:23:15 -0400 Subject: linux/hardened/patches/5.4: 5.4.40.a -> 5.4.41.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 80010cc61d4..9c56f633664 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -10,9 +10,9 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.123.a/linux-hardened-4.19.123.a.patch" }, "5.4": { - "name": "linux-hardened-5.4.40.a.patch", - "sha256": "1w9yc0j8vshjyvb2qgxjvrdgwiy5lmjn3s1rmlch649vqp97j9w7", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.40.a/linux-hardened-5.4.40.a.patch" + "name": "linux-hardened-5.4.41.a.patch", + "sha256": "0rbp0radqcs2bqapp9k0hvafxn3wlzkc50wnw1145w76mkvpc91y", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.41.a/linux-hardened-5.4.41.a.patch" }, "5.5": { "name": "linux-hardened-5.5.19.a.patch", -- cgit v1.2.3 From 2c74af6d977125add18c64c1826a8e0f2bd033a8 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 15 May 2020 20:23:17 -0400 Subject: linux/hardened/patches/5.6: 5.6.12.a -> 5.6.13.a --- pkgs/os-specific/linux/kernel/hardened/patches.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 9c56f633664..19517fd9ea3 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -20,8 +20,8 @@ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.5.19.a/linux-hardened-5.5.19.a.patch" }, "5.6": { - "name": "linux-hardened-5.6.12.a.patch", - "sha256": "1b6cwffb2b21h9xh2acm9q9j55cay87zbv9jjayv69znry4mzsx3", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.12.a/linux-hardened-5.6.12.a.patch" + "name": "linux-hardened-5.6.13.a.patch", + "sha256": "1z1f15h0wpajkiaqagnx8r25vmabkpc69rzn2h0p3k6z72l6iri5", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.13.a/linux-hardened-5.6.13.a.patch" } } -- cgit v1.2.3 From 469f14ceecf94dd13527c9153c25984d674768a7 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 16 May 2020 10:21:58 +1000 Subject: go_1_13: stop setting GOPATH a1e13f6140a568b73c1c36bb9ef79d7876ccaae3 --- pkgs/development/compilers/go/1.13.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.13.nix b/pkgs/development/compilers/go/1.13.nix index 8fee93cc4ab..57be5672bf6 100644 --- a/pkgs/development/compilers/go/1.13.nix +++ b/pkgs/development/compilers/go/1.13.nix @@ -229,8 +229,6 @@ stdenv.mkDerivation rec { runHook postInstall ''; - setupHook = ./setup-hook.sh; - disallowedReferences = [ goBootstrap ]; meta = with stdenv.lib; { -- cgit v1.2.3 From d1e7b0049ca5bfb48a3fd597278acdc5b97b700f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 16 May 2020 10:23:00 +1000 Subject: go_1_13: 1.13.8 -> 1.13.11 --- pkgs/development/compilers/go/1.13.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.13.nix b/pkgs/development/compilers/go/1.13.nix index 57be5672bf6..b524d3d6b09 100644 --- a/pkgs/development/compilers/go/1.13.nix +++ b/pkgs/development/compilers/go/1.13.nix @@ -30,11 +30,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.13.8"; + version = "1.13.11"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "0d7cxffk72568h46srzswrxd0bsdip7amgkf499wzn6l6d3g0fxi"; + sha256 = "0y86q2k00lh8c7wj3lha43g804iwr61nap8j3i907l2sway1mvc9"; }; # perl is used for testing go vet -- cgit v1.2.3 From b39717abffae28c363ba5440fa38fd59fd601c1e Mon Sep 17 00:00:00 2001 From: Gabor Greif Date: Sat, 16 May 2020 04:34:01 +0200 Subject: wasmtime: 0.15.0 -> 0.16.0 --- pkgs/development/interpreters/wasmtime/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 67d54af7bb2..00b0fc6f9d8 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "${pname}"; rev = "v${version}"; - sha256 = "1df99iak0psydlg9m8f8qq4zyh4wbi5l4qgsdjr2lm74ci3483xy"; + sha256 = "1zlljqkkcw8h94ff1w47sqn9pn0zal06s06i8nciv5i2d1xaqg5n"; fetchSubmodules = true; }; - cargoSha256 = "170bz48jrc1k2ylfmd3bcry0xpcxx8p3rzzv9mprlfmrfpb0b28r"; + cargoSha256 = "1hb7l7a76lgbji0qm9qd80m35cp346hyi4rphfk6p80v142cw8hh"; nativeBuildInputs = [ python cmake clang ]; buildInputs = [ llvmPackages.libclang ] ++ -- cgit v1.2.3 From d89ae377d4b57415b1b00f2aa8e5a1655a1724b9 Mon Sep 17 00:00:00 2001 From: Gabor Greif Date: Sat, 16 May 2020 04:56:26 +0200 Subject: wasmtime-0.16.0: re-enable tests on Darwin The issue https://github.com/bytecodealliance/wasmtime/issues/1556 appears to be fixed. --- pkgs/development/interpreters/wasmtime/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 00b0fc6f9d8..dd6e3eb4a7f 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -19,9 +19,7 @@ rustPlatform.buildRustPackage rec { lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; LIBCLANG_PATH = "${llvmPackages.libclang}/lib"; - # no test on darwin due to - # https://github.com/bytecodealliance/wasmtime/issues/1556 - doCheck = !stdenv.isDarwin; + doCheck = true; meta = with lib; { description = "Standalone JIT-style runtime for WebAssembly, using Cranelift"; -- cgit v1.2.3 From adb9f60c13ecdf857216b25801fe8ee051ee1eff Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 16 May 2020 13:12:50 +1000 Subject: doctl: 1.40.0 -> 1.43.0, switch to buildGoModule https://github.com/digitalocean/doctl/releases/tag/v1.41.0 https://github.com/digitalocean/doctl/releases/tag/v1.42.0 https://github.com/digitalocean/doctl/releases/tag/v1.43.0 --- pkgs/development/tools/doctl/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index f9c55555536..9bbeb3c24a3 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -1,19 +1,19 @@ -{ lib, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: -buildGoPackage rec { +buildGoModule rec { pname = "doctl"; - version = "1.40.0"; + version = "1.43.0"; - goPackagePath = "github.com/digitalocean/doctl"; + vendorSha256 = null; subPackages = [ "cmd/doctl" ]; - buildFlagsArray = '' + buildFlagsArray = let t = "github.com/digitalocean/doctl"; in '' -ldflags= - -X ${goPackagePath}.Major=${lib.versions.major version} - -X ${goPackagePath}.Minor=${lib.versions.minor version} - -X ${goPackagePath}.Patch=${lib.versions.patch version} - -X ${goPackagePath}.Label=release + -X ${t}.Major=${lib.versions.major version} + -X ${t}.Minor=${lib.versions.minor version} + -X ${t}.Patch=${lib.versions.patch version} + -X ${t}.Label=release ''; nativeBuildInputs = [ installShellFiles ]; -- cgit v1.2.3 From f0fbd9deec95a6f71a31f4516374c006a16d18ad Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 16 May 2020 13:37:01 +1000 Subject: umoci: install manpages, switch to buildGoModule --- pkgs/applications/virtualization/umoci/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/umoci/default.nix b/pkgs/applications/virtualization/umoci/default.nix index f07bb0fc164..d8a1f36dd5d 100644 --- a/pkgs/applications/virtualization/umoci/default.nix +++ b/pkgs/applications/virtualization/umoci/default.nix @@ -1,6 +1,11 @@ -{ lib, fetchFromGitHub, buildGoPackage }: +{ lib +, fetchFromGitHub +, buildGoModule +, go-md2man +, installShellFiles +}: -buildGoPackage rec { +buildGoModule rec { pname = "umoci"; version = "0.4.5"; @@ -11,10 +16,18 @@ buildGoPackage rec { sha256 = "1gzj4nnys73wajdwjn5jsskvnhzh8s2vmyl76ax8drpvw19bd5g3"; }; - goPackagePath = "github.com/openSUSE/umoci"; + vendorSha256 = null; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + nativeBuildInputs = [ go-md2man installShellFiles ]; + + postInstall = '' + sed -i '/SHELL =/d' Makefile + make local-doc + installManPage doc/man/*.[1-9] + ''; + meta = with lib; { description = "umoci modifies Open Container images"; homepage = "https://umo.ci"; -- cgit v1.2.3 From 89b6d5f175e276acdacfdaee2b0bb2e141076ab9 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 16 May 2020 14:03:51 +1000 Subject: .github/CODEOWNERS: add podman team --- .github/CODEOWNERS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 211779a470e..93688a326fe 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -187,3 +187,9 @@ /pkgs/build-support/build-pecl.nix @etu /pkgs/development/interpreters/php @etu /pkgs/top-level/php-packages.nix @etu + +# Podman, CRI-O modules and related +/nixos/modules/virtualisation/containers.nix @NixOS/podman +/nixos/modules/virtualisation/cri-o.nix @NixOS/podman +/nixos/modules/virtualisation/podman.nix @NixOS/podman +/nixos/tests/podman.nix @NixOS/podman -- cgit v1.2.3 From 2434754d1c0ab7876f0495c6d422c7639fd637e0 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 16 May 2020 09:00:30 +0200 Subject: simple-scan: format with nixpkgs-fmt --- pkgs/desktops/gnome-3/core/simple-scan/default.nix | 56 ++++++++++++++++++---- 1 file changed, 46 insertions(+), 10 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index d38339425ce..b96b0f4a205 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -1,6 +1,26 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, python3, wrapGAppsHook -, cairo, gdk-pixbuf, colord, glib, gtk3, gusb, packagekit, libwebp -, libxml2, sane-backends, vala, gnome3, gobject-introspection }: +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, gettext +, itstool +, python3 +, wrapGAppsHook +, cairo +, gdk-pixbuf +, colord +, glib +, gtk3 +, gusb +, packagekit +, libwebp +, libxml2 +, sane-backends +, vala +, gnome3 +, gobject-introspection +}: stdenv.mkDerivation rec { pname = "simple-scan"; @@ -11,14 +31,30 @@ stdenv.mkDerivation rec { sha256 = "1ya4k63q75w8xwv3vrk1gvbvbpxq876dvnkn3ym1wxzfd29pznxf"; }; - buildInputs = [ - cairo gdk-pixbuf colord glib gnome3.adwaita-icon-theme gusb - gtk3 libwebp packagekit sane-backends vala - ]; nativeBuildInputs = [ - meson ninja gettext itstool pkgconfig python3 wrapGAppsHook libxml2 - # For setup hook - gobject-introspection + meson + ninja + gettext + itstool + pkgconfig + python3 + wrapGAppsHook + libxml2 + gobject-introspection # For setup hook + ]; + + buildInputs = [ + cairo + gdk-pixbuf + colord + glib + gnome3.adwaita-icon-theme + gusb + gtk3 + libwebp + packagekit + sane-backends + vala ]; postPatch = '' -- cgit v1.2.3 From 15b3d9d2773b6ff919b324d756e23f0f8bf9fc3f Mon Sep 17 00:00:00 2001 From: Jon Date: Sat, 16 May 2020 00:34:11 -0700 Subject: python3Packages.venvShellHook: add postVenvCreation (#87850) * python3Packages.venvShellHook: add postVenvCreation * python: docs: add postVenvCreation explaination --- doc/languages-frameworks/python.section.md | 12 ++++++++++-- .../development/interpreters/python/hooks/venv-shell-hook.sh | 6 ++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 35ea480e6b9..838426afa04 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -1023,7 +1023,8 @@ are used in `buildPythonPackage`. - `setuptoolsBuildHook` to build a wheel using `setuptools`. - `setuptoolsCheckHook` to run tests with `python setup.py test`. - `venvShellHook` to source a Python 3 `venv` at the `venvDir` location. A - `venv` is created if it does not yet exist. + `venv` is created if it does not yet exist. `postVenvCreation` can be used to + to run commands only after venv is first created. - `wheelUnpackHook` to move a wheel to the correct folder so it can be installed with the `pipInstallHook`. @@ -1291,10 +1292,17 @@ in pkgs.mkShell rec { zlib ]; + # Run this command, only after creating the virtual environment + postVenvCreation = '' + unset SOURCE_DATE_EPOCH + pip install -r requirements.txt + ''; + # Now we can execute any commands within the virtual environment. # This is optional and can be left out to run pip manually. postShellHook = '' - pip install -r requirements.txt + # allow pip to install wheels + unset SOURCE_DATE_EPOCH ''; } diff --git a/pkgs/development/interpreters/python/hooks/venv-shell-hook.sh b/pkgs/development/interpreters/python/hooks/venv-shell-hook.sh index 3185b1f9fae..1fcc0bbd4b1 100644 --- a/pkgs/development/interpreters/python/hooks/venv-shell-hook.sh +++ b/pkgs/development/interpreters/python/hooks/venv-shell-hook.sh @@ -4,12 +4,14 @@ venvShellHook() { if [ -d "${venvDir}" ]; then echo "Skipping venv creation, '${venvDir}' already exists" + source "${venvDir}/bin/activate" else echo "Creating new venv environment in path: '${venvDir}'" @pythonInterpreter@ -m venv "${venvDir}" - fi - source "${venvDir}/bin/activate" + source "${venvDir}/bin/activate" + runHook postVenvCreation + fi runHook postShellHook echo "Finished executing venvShellHook" -- cgit v1.2.3 From 21351cfccf5e6ab0b67c2353d5683e7c3602a3d9 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 15 May 2020 21:31:48 +0100 Subject: emacsPackages.ocaml-mode: Remove broken package --- .../editors/emacs-modes/manual-packages.nix | 2 -- .../editors/emacs-modes/ocaml/default.nix | 32 ---------------------- 2 files changed, 34 deletions(-) delete mode 100644 pkgs/applications/editors/emacs-modes/ocaml/default.nix diff --git a/pkgs/applications/editors/emacs-modes/manual-packages.nix b/pkgs/applications/editors/emacs-modes/manual-packages.nix index 2f0112fd922..d2e17f1ed96 100644 --- a/pkgs/applications/editors/emacs-modes/manual-packages.nix +++ b/pkgs/applications/editors/emacs-modes/manual-packages.nix @@ -136,7 +136,6 @@ emacsSessionManagement = callPackage ./session-management-for-emacs { }; hsc3-mode = callPackage ./hsc3 { }; ido-ubiquitous = callPackage ./ido-ubiquitous { }; - ocaml-mode = callPackage ./ocaml { }; prolog-mode = callPackage ./prolog { }; rectMark = callPackage ./rect-mark { }; sunriseCommander = callPackage ./sunrise-commander { }; @@ -146,7 +145,6 @@ # # Ideally this should be dropped some time during/after 20.03 bbdb3 = self.melpaStablePackages.bbdb; - ocamlMode = self.ocaml-mode; jade = self.jade-mode; # scalaMode2 = null; # No clear mapping as of now flymakeCursor = self.melpaStablePackages.flymake-cursor; diff --git a/pkgs/applications/editors/emacs-modes/ocaml/default.nix b/pkgs/applications/editors/emacs-modes/ocaml/default.nix deleted file mode 100644 index 4240263dd0b..00000000000 --- a/pkgs/applications/editors/emacs-modes/ocaml/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, emacs, ocaml }: - -# this package installs the emacs-mode which -# resides in the ocaml compiler sources. - -let version = stdenv.lib.removePrefix "ocaml-" ocaml.name; -in stdenv.mkDerivation { - pname = "ocaml-mode"; - inherit version; - inherit (ocaml) prefixKey src; - - # a quick configure to get the Makefile generated. Since - # we do not build the ocaml itself, we don't really - # need it to support any features. - configureFlags = (with stdenv.lib; optional (!(versionAtLeast version "4.02")) "-no-tk") ++ - [ "-no-curses" "-no-pthread" ]; - - buildInputs = [ emacs ]; - dontBuild = true; - - installPhase = '' - cd emacs; - mkdir -p "$out/share/emacs/site-lisp" "$out/bin" - EMACSDIR=$out/share/emacs/site-lisp make simple-install install-ocamltags - ''; - - meta = { - homepage = "http://caml.inria.fr"; - description = "OCaml mode package for Emacs"; - platforms = stdenv.lib.platforms.unix; - }; -} -- cgit v1.2.3 From 2cbfe21649a10cc838b91b749b88aa59aff4fcc6 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 15 May 2020 21:34:35 +0100 Subject: emacsPackages.haskell-unicode-input-method: Fix build --- pkgs/applications/editors/emacs-modes/manual-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs-modes/manual-packages.nix b/pkgs/applications/editors/emacs-modes/manual-packages.nix index d2e17f1ed96..dfe287a7f40 100644 --- a/pkgs/applications/editors/emacs-modes/manual-packages.nix +++ b/pkgs/applications/editors/emacs-modes/manual-packages.nix @@ -98,7 +98,7 @@ sha256 = "09b7bg2s9aa4s8f2kdqs4xps3jxkq5wsvbi87ih8b6id38blhf78"; }; recipe = pkgs.writeText "recipe" '' - (haskell-unicode-input-method + (emacs-haskell-unicode-input-method :repo "roelvandijk/emacs-haskell-unicode-input-method" :fetcher github) ''; -- cgit v1.2.3 From df70dcb6fb506bfca51f509700b2e7378f8eadcb Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 9 May 2020 08:28:14 +0200 Subject: =?UTF-8?q?ocaml-ng.ocamlPackages=5F4=5F11.ocaml:=20init=20at=204.?= =?UTF-8?q?11.0+=CE=B11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/ocaml/4.11.nix | 6 ++++++ pkgs/top-level/ocaml-packages.nix | 2 ++ 2 files changed, 8 insertions(+) create mode 100644 pkgs/development/compilers/ocaml/4.11.nix diff --git a/pkgs/development/compilers/ocaml/4.11.nix b/pkgs/development/compilers/ocaml/4.11.nix new file mode 100644 index 00000000000..db77d989c1d --- /dev/null +++ b/pkgs/development/compilers/ocaml/4.11.nix @@ -0,0 +1,6 @@ +import ./generic.nix { + major_version = "4"; + minor_version = "11"; + patch_version = "0+alpha1"; + sha256 = "02sbwm00h2zxzyq5q90lg2a6m93zr797azshkb2qcwcf1kr7ddqg"; +} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 80d49ca1f58..033e9239d3b 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1231,6 +1231,8 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages_4_10 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.10.nix { }); + ocamlPackages_4_11 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.11.nix { }); + ocamlPackages_latest = ocamlPackages_4_10; ocamlPackages = ocamlPackages_4_09; -- cgit v1.2.3 From e534efaae8061c0f3ba0b989d6b83c8b6bd77c10 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 16 May 2020 04:20:00 -0500 Subject: protobuf3_12: init at 3.12.0 Changelog: https://github.com/protocolbuffers/protobuf/releases/tag/v3.12.0 --- pkgs/development/libraries/protobuf/3.12.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 7 insertions(+) create mode 100644 pkgs/development/libraries/protobuf/3.12.nix diff --git a/pkgs/development/libraries/protobuf/3.12.nix b/pkgs/development/libraries/protobuf/3.12.nix new file mode 100644 index 00000000000..00d9ec7f96f --- /dev/null +++ b/pkgs/development/libraries/protobuf/3.12.nix @@ -0,0 +1,6 @@ +{ callPackage, ... }: + +callPackage ./generic-v3.nix { + version = "3.12.0"; + sha256 = "0ac0v7mx2sf4hwf61074bgh2m1q0rs88c7gc6v910sd7cw7gql3a"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51dec492b21..7e32522158c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14075,6 +14075,7 @@ in protobuf = protobuf3_8; + protobuf3_12 = callPackage ../development/libraries/protobuf/3.12.nix { }; protobuf3_11 = callPackage ../development/libraries/protobuf/3.11.nix { }; protobuf3_10 = callPackage ../development/libraries/protobuf/3.10.nix { }; protobuf3_9 = callPackage ../development/libraries/protobuf/3.9.nix { }; -- cgit v1.2.3 From 6f71eaeb8c3080bd55080b83e114dc116105a346 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 16 May 2020 04:20:00 -0500 Subject: tflint: 0.15.5 -> 0.16.0 Changelog: https://github.com/terraform-linters/tflint/releases/tag/v0.16.0 --- pkgs/development/tools/analysis/tflint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index bcd4f7daec8..2873c49447d 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.15.5"; + version = "0.16.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "0mdxs019vzpfxaqkw4nb79p3rydril0ihbn55n4yyh0fznv6zzxi"; + sha256 = "1yqssc5rzxzrlzms3mn9djcvjcx6m7xblpwdl05pmym617v3xaxc"; }; - vendorSha256 = "0kjz9v7r7g4cg11w77ijfmvwnbbkrvrfwwsfsmyxrlhznmb3v0wi"; + vendorSha256 = "016k067sqqncgddam63p3jvp9g1ayjsc8v0w8hfzxc7jvn4jf9fb"; subPackages = [ "." ]; -- cgit v1.2.3 From a52a066524e518c8706a780f1289f9cbc8a864d9 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 16 May 2020 04:20:00 -0500 Subject: pueue: 0.4.0 -> 0.5.0 --- pkgs/applications/misc/pueue/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/pueue/default.nix b/pkgs/applications/misc/pueue/default.nix index 52a47954776..3882debd998 100644 --- a/pkgs/applications/misc/pueue/default.nix +++ b/pkgs/applications/misc/pueue/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pueue"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "Nukesor"; repo = pname; rev = "v${version}"; - sha256 = "050cx9ncs1hfb14llly0wm3h5s4377s3sinmkjc52xm2z2gc7m5f"; + sha256 = "17v760mh5k5vb1h3xvaph5rfc5wdl6q42isil2k9n6y8bxr3yw84"; }; - cargoSha256 = "1hw0y6c1ypp470cca3yw6fc7xvligy3av8hsa9bhdm5can46hyzi"; + cargoSha256 = "1m659i3v3b5hfn5vb5126izcy690bkmlyihz2w90h2d02ig7170p"; nativeBuildInputs = [ installShellFiles ]; -- cgit v1.2.3 From b022ecbf5dbe02089dddb4dafa9e46a518026d02 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 16 May 2020 04:20:00 -0500 Subject: lean: 3.10.0 -> 3.13.1 --- pkgs/applications/science/logic/lean/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index c80c163562b..ed077b03908 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchFromGitHub, cmake, gmp }: +{ stdenv, fetchFromGitHub, cmake, gmp, coreutils }: stdenv.mkDerivation rec { pname = "lean"; - version = "3.10.0"; + version = "3.13.1"; src = fetchFromGitHub { owner = "leanprover-community"; repo = "lean"; rev = "v${version}"; - sha256 = "0nmh09x3scfqg0bg1qf8b7z67s11hbfd7kr1h6k1zw94fyn2mg8q"; + sha256 = "1ak5l40h5yjlbzz92l724l6bm5q341cg6k1yk13sbwn42l8szsar"; }; nativeBuildInputs = [ cmake ]; @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { cd src ''; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace $out/bin/leanpkg \ + --replace "greadlink" "${coreutils}/bin/readlink" + ''; + meta = with stdenv.lib; { description = "Automatic and interactive theorem prover"; homepage = "https://leanprover.github.io/"; -- cgit v1.2.3 From d028c74c3c07a9108379d123644b6b8ef5847075 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Sat, 16 May 2020 09:22:24 +0000 Subject: androidndkPkgs: expose libc in cc.lib (#87737) Fixes cross compiling gdb that uses targetPackages.stdenv.cc.cc.lib. --- pkgs/development/androidndk-pkgs/androidndk-pkgs.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix index f8be40eecab..04420370ff1 100644 --- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix +++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix @@ -82,7 +82,10 @@ rec { }; clang = wrapCCWith { - cc = binaries; + cc = binaries // { + # for packages expecting libcompiler-rt, etc. to come from here (stdenv.cc.cc.lib) + lib = targetAndroidndkPkgs.libraries; + }; bintools = binutils; libc = targetAndroidndkPkgs.libraries; extraBuildCommands = '' -- cgit v1.2.3 From 554d5228f0d79c41f5bbbe16c7dfc2b612330713 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 16 May 2020 09:01:49 +0200 Subject: =?UTF-8?q?simple-scan:=203.36.2=20=E2=86=92=203.36.2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://ftp.gnome.org/pub/GNOME/sources/simple-scan/3.36/simple-scan-3.36.2.1.news --- pkgs/desktops/gnome-3/core/simple-scan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix index b96b0f4a205..1fefa7dd393 100644 --- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix +++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation rec { pname = "simple-scan"; - version = "3.36.2"; + version = "3.36.2.1"; src = fetchurl { url = "mirror://gnome/sources/simple-scan/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1ya4k63q75w8xwv3vrk1gvbvbpxq876dvnkn3ym1wxzfd29pznxf"; + sha256 = "u4zldQzQQF4U5KyLCfSlh8L6OkGGFK1CWmaUyYG7ASs="; }; nativeBuildInputs = [ -- cgit v1.2.3 From dc610562e00ab70430bad1859757790797e0ea2d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 16 May 2020 11:35:53 +0200 Subject: =?UTF-8?q?gnome3.gnome-logs:=203.34.0=20=E2=86=92=203.36.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://ftp.gnome.org/pub/GNOME/sources/gnome-logs/3.36/gnome-logs-3.36.0.news --- pkgs/desktops/gnome-3/apps/gnome-logs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index 7eda4a706ca..3c35f6fce37 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gnome-logs"; - version = "3.34.0"; + version = "3.36.0"; src = fetchurl { url = "mirror://gnome/sources/gnome-logs/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "16jfwg912asirrdmipf6wh7zr5zrww3nyhf99mi230y8hmqazx0m"; + sha256 = "RHZrYaaJnhtMUe16iEBgjmuSd/NB+Fah5cCNvXpzNnA="; }; mesonFlags = [ -- cgit v1.2.3 From 4007543e660a0d3de1dcaf470da1047e066f910f Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Sat, 16 May 2020 12:01:27 +0200 Subject: nomacs: 3.12 -> 3.14.2 --- pkgs/applications/graphics/nomacs/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index f0d9329bc5a..a6bda01ebb6 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -18,25 +18,15 @@ mkDerivation rec { pname = "nomacs"; - version = "3.12"; + version = "3.14.2"; src = fetchFromGitHub { owner = "nomacs"; repo = "nomacs"; rev = version; - sha256 = "12582i5v85da7vwjxj8grj99hxg34ij5cn3b1578wspdfw1xfy1i"; + sha256 = "1vms13kyg7cpqi2hxvrrhlnl7cq92ijr7dm1kl5ryglpcagqv811"; }; - patches = [ - ./nomacs-iostream.patch - (fetchpatch { - name = "darwin-less-restrictive-opencv.patch"; - url = "https://github.com/nomacs/nomacs/commit/d182fce4bcd9a25bd15e3de065ca67849a32458c.patch"; - sha256 = "0j6sviwrjn69nqf59hjn30c4j838h8az7rnlwcx8ymlb21vd9x2h"; - stripLen = 1; - }) - ]; - enableParallelBuilding = true; setSourceRoot = '' -- cgit v1.2.3 From 3871cee01c75510dce7152f7c1e55de80471e63f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 16 May 2020 20:10:39 +1000 Subject: direnv: switch to buildGoModule (#87932) --- pkgs/tools/misc/direnv/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/direnv/default.nix b/pkgs/tools/misc/direnv/default.nix index e261b95fde5..1b6b87984c6 100644 --- a/pkgs/tools/misc/direnv/default.nix +++ b/pkgs/tools/misc/direnv/default.nix @@ -1,9 +1,10 @@ -{ stdenv, fetchFromGitHub, buildGoPackage, bash }: +{ stdenv, fetchFromGitHub, buildGoModule, bash }: -buildGoPackage rec { +buildGoModule rec { pname = "direnv"; version = "2.21.3"; - goPackagePath = "github.com/direnv/direnv"; + + vendorSha256 = null; src = fetchFromGitHub { owner = "direnv"; @@ -12,17 +13,12 @@ buildGoPackage rec { sha256 = "1adi6ld9g4zgz0f6q0kkzrywclqrmikyp7yh22zm9lfdvd5hs8wp"; }; - postConfigure = '' - cd $NIX_BUILD_TOP/go/src/$goPackagePath - ''; - # we have no bash at the moment for windows makeFlags = stdenv.lib.optional (!stdenv.hostPlatform.isWindows) [ "BASH_PATH=${bash}/bin/bash" ]; installPhase = '' - mkdir -p $out make install DESTDIR=$out mkdir -p $out/share/fish/vendor_conf.d echo "eval ($out/bin/direnv hook fish)" > $out/share/fish/vendor_conf.d/direnv.fish -- cgit v1.2.3 From 692d924a7835da57e1602d7b8acec58ee78cb35b Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 16 May 2020 11:02:23 +0100 Subject: emacsPackages.rtags-xref: Fix build --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 681ade367e5..81039a5ff99 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -308,6 +308,8 @@ instantenous and formats commits for you. rtags = dontConfigure (externalSrc super.rtags external.rtags); + rtags-xref = dontConfigure super.rtags; + shm = super.shm.overrideAttrs (attrs: { propagatedUserEnvPkgs = [ external.structured-haskell-mode ]; }); -- cgit v1.2.3 From b17e80a4f1510de7af86a8cd8e959e61425aa78f Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 16 May 2020 11:07:57 +0100 Subject: emacsPackages.treemacs-magit: Fix build --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 81039a5ff99..560e69d1ce1 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -330,6 +330,12 @@ instantenous and formats commits for you. ''; }); + treemacs-magit = super.treemacs-magit.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + vdiff-magit = super.vdiff-magit.overrideAttrs (attrs: { nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [ external.git ]; @@ -540,12 +546,6 @@ instantenous and formats commits for you. inherit (self.melpaPackages) powerline; }; - treemacs-magit = super.treemacs-magit.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); - vterm = super.vterm.overrideAttrs(old: { buildInputs = old.buildInputs ++ [ self.emacs pkgs.cmake pkgs.libvterm-neovim ]; cmakeFlags = [ -- cgit v1.2.3 From ae2a2be11d648e5ac6aaf91b37e31f0d0e2a41e8 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 16 May 2020 11:11:46 +0100 Subject: emacsPackages.dune: Fix build --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 560e69d1ce1..45348e954c8 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -85,6 +85,8 @@ instantenous and formats commits for you. inherit (self.melpaPackages) easy-kill; }; + dune = dontConfigure super.dune; + emacsql-sqlite = super.emacsql-sqlite.overrideAttrs(old: { buildInputs = old.buildInputs ++ [ pkgs.sqlite ]; -- cgit v1.2.3 From a779efcaa068ae3d4f76f95299afdbb6c1c40dda Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 16 May 2020 13:23:23 +0200 Subject: php74: 7.4.5 -> 7.4.6 Changelog: https://www.php.net/ChangeLog-7.php#7.4.6 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 142e8ea43b8..4b112de1f0e 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -272,8 +272,8 @@ let }); php74base = callPackage generic (_args // { - version = "7.4.5"; - sha256 = "0vrxy5ymfkpi2sxbnh6967nc4xnxcwlc27bivaa36g5nslrsbnir"; + version = "7.4.6"; + sha256 = "0j133pfwa823d4jhx2hkrrzjl4hswvz00b1z58r5c82xd5sr9vd6"; }); defaultPhpExtensions = { all, ... }: with all; ([ -- cgit v1.2.3 From f99e02946b4c2c61d8d1fcbaddb2d2f11927536a Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 16 May 2020 13:30:39 +0200 Subject: gnome3.gnome-logs: format with nixpkgs-fmt --- pkgs/desktops/gnome-3/apps/gnome-logs/default.nix | 50 +++++++++++++++++++---- 1 file changed, 41 insertions(+), 9 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix index 3c35f6fce37..acd4386d2e7 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-logs/default.nix @@ -1,5 +1,22 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, gnome3, glib, gtk3, wrapGAppsHook -, gettext, itstool, libxml2, libxslt, docbook_xsl, docbook_xml_dtd_43, systemd, python3, gsettings-desktop-schemas }: +{ stdenv +, fetchurl +, meson +, ninja +, pkgconfig +, gnome3 +, glib +, gtk3 +, wrapGAppsHook +, gettext +, itstool +, libxml2 +, libxslt +, docbook_xsl +, docbook_xml_dtd_43 +, systemd +, python3 +, gsettings-desktop-schemas +}: stdenv.mkDerivation rec { pname = "gnome-logs"; @@ -10,16 +27,31 @@ stdenv.mkDerivation rec { sha256 = "RHZrYaaJnhtMUe16iEBgjmuSd/NB+Fah5cCNvXpzNnA="; }; - mesonFlags = [ - "-Dman=true" - ]; - nativeBuildInputs = [ python3 - meson ninja pkgconfig wrapGAppsHook gettext itstool - libxml2 libxslt docbook_xsl docbook_xml_dtd_43 + meson + ninja + pkgconfig + wrapGAppsHook + gettext + itstool + libxml2 + libxslt + docbook_xsl + docbook_xml_dtd_43 + ]; + + buildInputs = [ + glib + gtk3 + systemd + gsettings-desktop-schemas + gnome3.adwaita-icon-theme + ]; + + mesonFlags = [ + "-Dman=true" ]; - buildInputs = [ glib gtk3 systemd gsettings-desktop-schemas gnome3.adwaita-icon-theme ]; postPatch = '' chmod +x meson_post_install.py -- cgit v1.2.3 From f1bd1b9fdd074a32b1a83d70acb4992b32cb686c Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 16 May 2020 11:17:59 +0100 Subject: emacsPackages.forge: Fix build --- pkgs/applications/editors/emacs-modes/melpa-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index 45348e954c8..ed1550de768 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -128,6 +128,12 @@ instantenous and formats commits for you. inherit (self.melpaPackages) ess ctable popup; }; + forge = super.forge.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or []) ++ [ external.git ]; + }); + flycheck-rtags = fix-rtags super.flycheck-rtags; gnuplot = super.gnuplot.overrideAttrs (old: { @@ -449,12 +455,6 @@ instantenous and formats commits for you. (attrs.nativeBuildInputs or []) ++ [ external.git ]; }); - forge = super.forge.overrideAttrs (attrs: { - # searches for Git at build time - nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - }); - gerrit = super.gerrit.overrideAttrs (attrs: { nativeBuildInputs = (attrs.nativeBuildInputs or []) ++ [ external.git ]; -- cgit v1.2.3 From 9da932fc0d1dd7b9b513fdcb47d2a67967b69687 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 16 May 2020 13:33:49 +0200 Subject: =?UTF-8?q?gnome3.gnome-clocks:=203.36.0=20=E2=86=92=203.36.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-clocks/-/commit/48f29ab8230bfcd15ea5dfb682192d8e1c33cd39 --- .../desktops/gnome-3/apps/gnome-clocks/default.nix | 23 +++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix index 7494d66cc0d..b64094002bb 100644 --- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix +++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix @@ -27,22 +27,13 @@ stdenv.mkDerivation rec { pname = "gnome-clocks"; - version = "3.36.0"; + version = "3.36.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-clocks/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1ij9xwp3c96gsnnlhkqkiw3y45a4lpw7a09d4yysx7bvgw68p5sc"; + sha256 = "8RsbIuwfKF5QmINoTAsfSlFJauoQVZEjnlsm+JhnUeY="; }; - passthru = { - updateScript = gnome3.updateScript { - packageName = "gnome-clocks"; - attrPath = "gnome3.gnome-clocks"; - }; - }; - - doCheck = true; - nativeBuildInputs = [ vala meson @@ -55,6 +46,7 @@ stdenv.mkDerivation rec { libxml2 gobject-introspection # for finding vapi files ]; + buildInputs = [ gtk3 glib @@ -76,6 +68,15 @@ stdenv.mkDerivation rec { ) ''; + doCheck = true; + + passthru = { + updateScript = gnome3.updateScript { + packageName = "gnome-clocks"; + attrPath = "gnome3.gnome-clocks"; + }; + }; + meta = with stdenv.lib; { homepage = "https://wiki.gnome.org/Apps/Clocks"; description = "Clock application designed for GNOME 3"; -- cgit v1.2.3 From d42a58ffaa0cf5a56792bfbb7abb51accc4d0288 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 16 May 2020 14:43:23 +0200 Subject: php.packages.composer: 1.10.5 -> 1.10.6 Changelog: https://github.com/composer/composer/releases/tag/1.10.6 --- pkgs/top-level/php-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 0fecf30e736..41a8472db8b 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -57,12 +57,12 @@ in }; composer = mkDerivation rec { - version = "1.10.5"; + version = "1.10.6"; pname = "composer"; src = pkgs.fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "0a9iwhd7ijm8gkp3zadxza0xb6xwa5ps0d16pz4mz2p21gfzvwym"; + sha256 = "0yzfzgg9qlc388g91bdg7y7rp1q8vqb5hkwykwmr1n1lv8dsrg99"; }; dontUnpack = true; @@ -202,7 +202,7 @@ in maintainers = with maintainers; [ javaguirre ] ++ teams.php.members; }; }; - + phpmd = mkDerivation rec { version = "2.8.2"; pname = "phpmd"; @@ -230,7 +230,7 @@ in broken = !isPhp74; }; }; - + phpstan = mkDerivation rec { version = "0.12.19"; pname = "phpstan"; -- cgit v1.2.3 From 294ce528e27694d858022f08735ef5be5cfdbefb Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sat, 16 May 2020 14:56:08 +0200 Subject: zulip: 5.0.0 -> 5.2.0 --- pkgs/applications/networking/instant-messengers/zulip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zulip/default.nix b/pkgs/applications/networking/instant-messengers/zulip/default.nix index 8245f5febc4..1adfb71dd9b 100644 --- a/pkgs/applications/networking/instant-messengers/zulip/default.nix +++ b/pkgs/applications/networking/instant-messengers/zulip/default.nix @@ -5,12 +5,12 @@ let pname = "zulip"; - version = "5.0.0"; + version = "5.2.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/zulip/zulip-desktop/releases/download/v${version}/Zulip-${version}-x86_64.AppImage"; - sha256 = "0qwlhkzb3lbzk3piyfx8nn827kcafrl3j1nxrn18f8px9gwasinz"; + sha256 = "0rgvllm1pzg6smyjrhh8v1ial0dvav0h2zccxp4p5nqmq6zdvs3h"; name="${pname}-${version}.AppImage"; }; -- cgit v1.2.3 From 51de3203532bd5c9d34a2575397f6c6101190182 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sat, 16 May 2020 15:05:45 +0200 Subject: palp: add meta.changelog --- pkgs/applications/science/math/palp/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/science/math/palp/default.nix b/pkgs/applications/science/math/palp/default.nix index 4912b82d158..409324d4abb 100644 --- a/pkgs/applications/science/math/palp/default.nix +++ b/pkgs/applications/science/math/palp/default.nix @@ -78,6 +78,9 @@ stdenv.mkDerivation rec { facet enumeration compares well with existing packages. ''; homepage = "http://hep.itp.tuwien.ac.at/~kreuzer/CY/CYpalp.html"; + # Not really a changelog, but a one-line summary of each update that should + # be reviewed on update. + changelog = "http://hep.itp.tuwien.ac.at/~kreuzer/CY/CYpalp.html"; # Just a link on the website pointing to gpl -- now gplv3. When the last # version was released that pointed to gplv2 however, so thats probably # the right license. -- cgit v1.2.3 From 198653e57e919854bf1d3716d4b6bbb13f57dbac Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 16 May 2020 14:07:56 +0100 Subject: firefox-beta-bin: 76.0b8 -> 77.0b6 --- .../browsers/firefox-bin/beta_sources.nix | 770 ++++++++++----------- 1 file changed, 385 insertions(+), 385 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index a0a0b7003be..272133beedc 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,965 +1,965 @@ { - version = "76.0b8"; + version = "77.0b6"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ach/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/ach/firefox-77.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "f4b15745610d97f3919b644ed47b515eadfeb654eb81c5a890a2d225f1223f2f554612a5df14c4514f0f835b25f44649a923d09fdd199db4b052384075df89ad"; + sha512 = "84dccf5a3120dc7ddab9d44c5418bda90ebd1dc7ef2bfb56bcfb6d0921fa482c858fa8a147f24f9e88d881575962cff9d39efdabea2d3867f71b75834fb1f04c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/af/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/af/firefox-77.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "a39343493647a46579ea6f37e5da14ed59ab5ef91a4e47b9b7f43cd3f469110b9544ef660b214b7a5f3df6373a9f6bf9b55656586a96a7f2991b4fb9a66abe42"; + sha512 = "f0c7b86ed71b45df8abe85b6d4f168f1749a08a5018b1b524edfa793e386ac43c116a6af88e27410638db1d2ad54970507c67b303fb38c18c314ed2aa08fa7ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/an/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/an/firefox-77.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "ff0655c7fb043f01c8c4cbde006a7835a6f0271133a9dd07b90b3e0bf369233f9dc0ed0caf38421ea9b1870f1daaa598508865a239f5f2391eccfa6c0341c94e"; + sha512 = "73307a457a19f983741683bf5c6dd94b101c177d93392285bae81e40f8013e6d1ef4ea6b939a986b8f319c84368ed71bfdf223ff319bad1dfaebd71dff933d37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ar/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/ar/firefox-77.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "b89d38b6a44ebe00806cf7b16a29264c324d6afecf4d83e20ae4b35c502b13ee04a052a879d1c68e084e99ebd9850a9b597b6d4ea19350e0005c8d006d5cfbc3"; + sha512 = "55e91f31d725f6b1c9dfe92b226a36b8e4afc9456fbaa3bad770cc7fb9f59556485fa9d287feb7e80bb25864a2d0821f282812673b2c835b90a426e007e5981d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ast/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/ast/firefox-77.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "34a6db5926e8bc90e47e8ed8c413e3c47fe35d119aa3c2315c01b0ea38a04a8acb44551e689b798dc030902b9d3dba3f62971b2d927ed4cdc0f965657a189af6"; + sha512 = "c2ebcd341901ac3412c4bdd3b8e9be1372ac8bf082f1d42c5127f99a33f71506db88254bf8cf815ea0256cb96411eb985e13a17003f28011988d2c39b0174017"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/az/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/az/firefox-77.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "3a1bd479e251ad695dd397d019b3f492915f8051984ba399fd93035455070eb9a2b05bc43d87506e671ff80c4b2e4f17808f37e959d94dcb6a3067f8761f617f"; + sha512 = "48b5183cfa70cb271733d88930b1e0412b8f52d0ae7a46dc2931c1cd56774e004372fd999198fe5ffc6d8d29c22a0701b39af87b3b06e84ad03811e6c06fd6da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/be/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/be/firefox-77.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "0c53c0abf67079d254b5da7c3d7edee506678bc3be55d24b61865e18f8e81b9e26f8ec98d08e7e8aacfb47a231460cafa52e065a4d216cadfaae70ae0a9202f5"; + sha512 = "0f1ba7cf56a316124fef51ffbf408268abc453c5c37023f009d9b3feae9dd05491392e696f415e78e2304d7b12939d4ee88ecb96b191f3567532a8ce686b4d14"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/bg/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/bg/firefox-77.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "b608676213c5ce9cae42d18af0f6a836586d990d58042ac8bdd0112590f3aed30abd4272d4581a0cbb633043b4f0cadca7a90ac40777e5fdb7afe807fff1c2ac"; + sha512 = "842f182e3d3199fe3904097816657a6ebc113da578fb91f25d36ba9eee526a7e5b514e5aafaffed31c153464d75a238a413f264e4310861d26de1971eabf2b05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/bn/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/bn/firefox-77.0b6.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "44fc7a158689424b3c781812e46b38efefae4f49098bce533c1abfcf9cae78a6be2369fe21f6be12c96fd85afab875b8a6f77af399348f82a1cce3ad4b0279f0"; + sha512 = "98e3916f29e5a1201ff607535f19127d2a180efe19b7d58db2782e7328b6c96e5c502d80ed24a0b13a62beabcd5f36dd32321765adeee78c894b8a9652a4b7db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/br/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/br/firefox-77.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "f9f3bc634fe7c21e1cf9800f8875979e9f77764f71861926b67e9addd604e88b22f90cf31da5dc93b3ebb2dfac8c04ad423b9b21416732c9000e9747ab588a11"; + sha512 = "40d3b7ff553759c6bd8bccc1ab3454bec51d8e2a422d01b2ba8d10385f0cbd913dabac2c816c3aed68e0f22e2820b2aeb54058554baf3ad1b1a2a4a37f8bda6e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/bs/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/bs/firefox-77.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "3558b3eb7da562ba50f1273ae461f753a95d42eca3714eb1e044bbca3e63de16ce1f040f5b34709c8a0e86fc59ac6c9d65f1dccf3a0fdc30e96c0f7490867d7d"; + sha512 = "0bcfc38ee18b7b5db82705c858f8e65d96ba68857ae5562e488c6259e3d22f6983147d833e29eb2d3b5bdd085dfee9c2a200bf0dd5b2ad00365146e90e13ac16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ca-valencia/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/ca-valencia/firefox-77.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "b79f0e814ce7df9de0f2a488a3a798ce9a33c840c7a39efc6a749a07e568ba881bd2e42b4a49fbe7ccee0ddbb3e7768382181ce16379a6b24551ad555685a792"; + sha512 = "3081b3d5bae4490a047bd429642d2ba7128c30b3d1c39bb65d8809d6cc17d814584e9ee12a6b3d95c7be945073db1f640c96269b6be6675912f7783e1f7d565f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ca/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/ca/firefox-77.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "69a6c978b4c896091f6118b55783988fc505c819d74cd455ec6274d54fb6994a012f41d09d9b574be90bc10e47b8d186b8021421d86d05db6945ecda1e51d127"; + sha512 = "e7d6d89e84f3f719590b12cf3dc4fd60219523e79155d1a0d396d877b62ea1e48d0b2510ec67877d40ef66c278ca3ff32136cae1d823336c0b0d820fc9cda566"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/cak/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/cak/firefox-77.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "8253f68114e9bb035edb0d718439f0d28f04e6afa7ea33d1001a1457723c4cbcd17362c0b517a23ca78a53ad2dfc847be396e28beb3a302f2380a6dad5eedee5"; + sha512 = "c345754fc6cc4b242d0c620fd4a0ebfcdf86a294b09cc040c016582bbbb3eb62e66e20d3358ad9f368e618d3b7e63c1609b459e33dafc4e2bfa007b2d9909bb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/cs/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/cs/firefox-77.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "1413cbd3345770ce7597ef139242b72fcc9b7c53bca4b7cbfa707f00bc3d2778305f617047ba24fa22f808c0168524166a6fe7cc7db6ea0c5cd30b609e80d404"; + sha512 = "f352152581ccc9f78cd4c87a9be7497e1bdebb1ee5f2668520743a413f5ff57ffe619df34b27f737c56f6b50a06f9911dbc03cd7695ba1ce355a0595ef5d38e0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/cy/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/cy/firefox-77.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "1628a73872c268d4aa8ac78bffe6ab49341735c6abd5c8f805c86129ca0fcf5d03251e962fcd4c9ecdda6af125b8d4f9d095e42b2ff5c185267cd41f3090acd0"; + sha512 = "48ceb246d3cf3aaed596d7a30ec8e835b6254b31189bad350e6fcd1badd9a77f677b84591d74a41baf9c16859e5963bdfa5383f7eb9bc9e12b63ffbe5427b620"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/da/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/da/firefox-77.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "f51f300911731acd439068bcbbab712ce4920345b481b8db80b3f6ca1c1cf18fd201a9e639abc78db97933d4872c7241324591a9c045bc1c6d71898e2a2fca93"; + sha512 = "d632a8b6361c2338a7b821483b7bf3dc3a5489c6c9fb5aaa8ad92d5954b1c7345ca3409e9d20a8284d090a0215c4c6266c91bb18f0bd78cc6e08cd6fab6bef69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/de/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/de/firefox-77.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "196ce93a18112d7e0df8a8c1e444d503d3b0a2d11e70907963197760c2127c4f827ae9a0eb79fa7745190c92be10c7828a42414d33ec9ccea1f0b7194ffcc325"; + sha512 = "cf966d92801eede8f2abcf34425b286b9a2feaf5c11dd4470de3519ed6bad2df9356e4cfb3b1d4fc7e05fae2a3daf81d605a926e70bb65dbd44254450eb77999"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/dsb/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/dsb/firefox-77.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "da6f0afd218345ffa1bc0b037ca20c9aa6b18597471d35d5cc8f4fcbd4f39f91e2839fe35f186577ed4445d34e76d4c8175f2df24f7bc0795f606cc6ab47db7f"; + sha512 = "c7070844a604d6d615b182049b01a33ed68ba2492c91e1081a2934d8b3f329897961eafb22dd5116180272d4ece0b26f841ec306978bf40123e6d0e9aa1165e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/el/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/el/firefox-77.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "4ea4754aa0b337e94f3fec5b108c703ac80827d514e64e3e6c890e050107249367c4167b58f21177c3071c11301c37de08703136f03edc0aa901a22e2126b279"; + sha512 = "7c37cb5564b5cbcb71b1e675d1ab33fb4fe629fabade62f574c4fe4bd2a11e21d04e9284c518d4505e74be4d2e4b26e17cf5cf33562ad3485325dea045ba8c63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/en-CA/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/en-CA/firefox-77.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "f6f59d13148c7e5510a03e93644b38a788911ed904e088be48cd1bde071ac372b4b047f988714ed44d1f64ca6a32502564f01780be80f6c49373119ff7021454"; + sha512 = "fff6a172d9d54fff9bc88b6c87e2b9228e3e1e75c0f99f1c0eb59282c1731c0371f539df5032b814e7b7753f562268571bd7e527cb306f69cc52cc027aba62a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/en-GB/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/en-GB/firefox-77.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "fa42017d8111e96c4d81ce515577e1307e187493866c04f3687746647904f2f89a3f0df822ffdc2004bb0fa06aeba102e29b660e250737b2264b5015010ab869"; + sha512 = "82242c259944277127104c34b970d8af5a1cdc4ff87ae4cd9b2e63be216021aa8f00a9d5c7d115a8bac3da0a33f6d23291858b78729accb518ac8ebe460fbd21"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/en-US/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/en-US/firefox-77.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "5f47dbf433ab20c2db027542eb0a3dcff7fb0b526ec93908f182e1dadde112da327f84edbaf44ccb26d36c120a414d64ebb9b10a77501644d9f1c9c3d34b7346"; + sha512 = "dd5004e65d581cd54d311a9fdaa02bc16f9bdf6e969d4791dacbc70f790b19080183d675c8f66ffb67632bd87348510fc9a1ad132504a7d74df2ecf962b84dde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/eo/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/eo/firefox-77.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "3cd5e9e99b73694aeded24d9acc7c594bcc582eafca5867a7123c5067e34f7e96781164fd7db2b53366bd0d0d66fc495931cad42b1e3d56726c8e5f82c8aea4b"; + sha512 = "5a8b036be51fd8fe7bf1f2fa52fb9d6e6e3353ad7caf25c1bd83ac25fca4e2733d17be87c2468726c1ad8b3b845cbe6881b27e06d54005fcb7eaacbbd2d6e7da"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/es-AR/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/es-AR/firefox-77.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "ae43f7147a3ce843488623c4558d9088690fe6ecf7153ff30da09051e9e9fe90df28bf6529a469b8d799554c8ee3ef92006e73a2cb9e68a5b71ab392a977e849"; + sha512 = "43d4638a1cbfd46c51324c5215132e63086f4034bc710916a5d11ecce9be4b7595c7d988b82bb4ec6994e074387ddd70aa1930d90b0392e162e28f0ce68c18dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/es-CL/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/es-CL/firefox-77.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "6ccde441b5c44514da5bf7cb9aa959f818d5c499fa8d33487102cb1a1cb98a501b1575ecc28f8288cbc4b69dc70bc76f365e9b52d4329b685f25a1ba9d1ff063"; + sha512 = "e8621d14b4afca14b0c745f37cc178162ca5149c83c9b6a30b708ae27cddd2778801e2810fe2ba2fd235f243baf26a9ab98f62abf286ec736d2a0581cb42d07b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/es-ES/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/es-ES/firefox-77.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "3800ba267d51d9046999c931b5bd9a743d2a3481486a7ee713f76c003c863b8579d44ca53ea56f5b32c8022ffd9ee0184b7c734e5671b412f60d04653ca2c8fb"; + sha512 = "ba70399b202c6b7206ca96819848fab9118e5961bc72bb91c7b15319ee8a13b8b93575b67e025908b5a8610e031030b9ad3d0c671c087c8e02c672db321d1104"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/es-MX/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/es-MX/firefox-77.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "600a1aa9a0b97fe66947107ee9018740e2f7c07bd3ac51b03c0c6d52728d72f93062c9dfebb97042c9a23a85631c88502feaa6a8cee395953ef23c2addf6a99f"; + sha512 = "9a8e417e04bc8e1a111e45b16512fe92bce2479d544a2a93101f88c6188d8d56a59fa03712245425b17662dd5198cc516ac88e197491e531e9d6d0fe0b1de00d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/et/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/et/firefox-77.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "498f59dc3a6faf067c8c3d23eb5754dc8cf0478b50379359122b7a8e6ead6d7c6c39856cb34f3510f7fe1a11af3e0533a3805821ba49cb7cbf1d40b1caf36b3f"; + sha512 = "fff62942c3836a730bfcc21939a3b1cf7c23208dabf688b5dcfdf3b28bd7cfc257440c22fba0af08a37d69f4ae3addf74eb50c96f360bc40b3e1d3fb65555f1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/eu/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/eu/firefox-77.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "a5d58868468f9ccf22afe78734121e1f81961efc9c7add2a065ec9b9d5d68d8fe96b5f563a85b960ea7ff94c70e1c3aa3a9f0f1bb23cd175df549375c1479072"; + sha512 = "8d31e248f711b920ba127f804b56a4f1675a535179e99a2ef8dccb4ebbdfde293042c002cf58e8771d327ca399e4d2e169539629e95407646156472957ddece5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/fa/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/fa/firefox-77.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "02a5d946542aff81bea82ec73fe30919fe4a1d1acbd18ef194a7c8879d9b70e319abaee2e4d8b3a2671cecd28fffaa37a182f7dfa06884f83d765b8701c60a9c"; + sha512 = "58fdbd2aae9fa87f00559063eddd27eb477a492ecb83592a16c22496e5bfd03900740d6a7b87913f9cb59b69954f1839dc38832b646716870a32dc510c276bf1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ff/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/ff/firefox-77.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "4ab405c47fbdb83eace54b0db61c734941d5ae6c5735d50dc6800271dc59cd82de9df9e1e98f238c4726ff9319c31a8879b2f0330792289db5e4b01cd3caf3da"; + sha512 = "cbbbdfe760395eb4cb5bf8ea3ec740f2db5a4660e9b9767ea0db898a8068327687c567da400ce47a6b3e40c22d77f6c6f2312f6d1d04116f7f3e1c33bc40a469"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/fi/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/fi/firefox-77.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "82f95d6462097fb2975285326ef6b35a572b4c25bf07517f3ad680a978aea95f5cd4ab946275dd74cd6aa98566d1a4288761c985c39e1cb3d9e963b892a37544"; + sha512 = "255d660b5cbd0a2fd01ab939d5ed22d450aaa5fe9b6daac2452b59b044c224e427e4f6e7a28328289d1ac86af938821f617a6fd33b64a53a1299e1fd0d7a2494"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/fr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/fr/firefox-77.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "a6df8eea8918292c18b281f5118a0373bc69aabc585d3a711ff77355a1aa95f5049d31df3bdb72087931dfc347050f4ccd791a9729f7bd3d95cab20c78da8a59"; + sha512 = "a2065174de7de61ddd147965cbf84b6e9910314bff4ca738b496f8c8b550cd75cd1d43c9011191ff93304f3c90e4fb21cd3cfdb68d8de9c329561e765ce706e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/fy-NL/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/fy-NL/firefox-77.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "d5cbb68867369a82d84ade5a847d8574ff687c0cada8714c8a072291aa02eef748dc109b42f1b246980f1ca14060b799098885bff2d7e4c55e7ff644ccc01e9f"; + sha512 = "c71194f5357a5288a1e580096c6b23aec403bbf28a554526d08d5948585e25ce2bde95e7924d5b47410fccfc05acaed9da41d247cbea0774c3197ccb60e770d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ga-IE/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/ga-IE/firefox-77.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "8d9a299c49949609f162f9bba7db369fe7c34f2b29d3075c607afd3c3bdb5ffa0ae0d9bb9d5ff5a5f0cd28556eeea5265b8f9809a2db36ae11209b9cbcb5b8c6"; + sha512 = "97b94e04b83eb62001ee6325e4fde3bae2b2c7d8e89bd35ead0e8b3c44593716734ead8369a479f65cdc5ca2eb719813d854976fc22ec62eb928de2d16a68758"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/gd/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/gd/firefox-77.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "4431eeb86c0e3920bd08db00c10185941bc7fb3f5b055b8ba114e63bdfd7b64ccb8cdffcb754453557bec011d08d87e08b6a2ce022c77fe32add49269f3ac6d6"; + sha512 = "8e57376b86e64ca4bdab0ba594ca3537b5a69442de76910f56317b1c104851636f23f44c1bcccf280a4d68722886b62a1f75b3899db2f57de312df6ab839832a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/gl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/gl/firefox-77.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "0963628808ab6f6ce65f70e09c12ca38c524992c82446a2654eb42917ee2d32dc1dae94b15578ac5209e12e0fc4cbd2f56265ae8c259336415d4a56b560be96e"; + sha512 = "bddd419b7340477887dae5b1b6609d06e7b3651ba43017203c7f6a5c760aeedf9d73570550bcb9947e472bf19b20b9cab808ad5cc62e33eaf1e47f4b295ff6f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/gn/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/gn/firefox-77.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "1b19d9ca238eb05709007ddf00ff40596b49ec771839f6b1ac21162796101701fb523c0b8ff18dc6d3428eca3ed2ac0fd3bf17c5ea91efac998ebe4b8ece6c9c"; + sha512 = "b910fd5cbd4c109a97dba57d28634c9352547557edbe783216aa2b6f1c5483571cc8f4360b7caf3794e2910171b8e6d181729781077f01ad59f963fec9bf24f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/gu-IN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/gu-IN/firefox-77.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "c0d2fa00166926927e1985ce112a035980ad24771d4ede83143c4bb9012006c811aed2612fb1f2c4b1bfc852a7c7799309f4b579aaf86fc5b11ab216239911b5"; + sha512 = "4afd88472d92ce718c2a7475eac23a06bd0ceca8bc36567bf386c967f238b18ef56ac992e8007c6d1db29ac19175ed34b35f28ace5b72f6f81e4d25aa4e61458"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/he/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/he/firefox-77.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "b2a5440b57ef85a3e3ee607e9e497e6b70e3652c7f258a2c7e98e18b5a95c8d34de908d64e464be9ad224aac7869efde785e38462fad3c284649bb9c524574b9"; + sha512 = "9e57471c3957b01284119342a75ac071dfe31444e5dca73ab2cc9560bcda4653d05615858d930c7bf88ed358e5c247b0f85a2e884a1c6c7015c953a49a2b3ba6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/hi-IN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/hi-IN/firefox-77.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "2ffeeb8d559097e9d67f7603c34585d8b4d1571a23ef5a9d04c47407b03c4db2d4633637e8352ad96989facbacf6796aa48eb94ad81b70b0be3f0955b8a0e32a"; + sha512 = "f1db8de06d1e085cca81b75165ab8a16a79c551ca2f36eded8acaf64dea5e715af0713ca575d4c32b7749cb14261340013cf4208a9f2f7464071ba6cc7a40eb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/hr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/hr/firefox-77.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "91ef9459edcf44b88e9bb6c5bdf1a1d5689c99e5a44f14f4700d0821e0274e9f8c3f79388c7a97e0aa235b8ffe1099ac80a523b4d62420eba5163a608d48aae6"; + sha512 = "2ee0e7d9f7d256633198dc9ec7729e0529b2ee22e4ab275f4f777d8bf722d0b240ebec9459b72cd81b179c77efb55ddff32e8d1959c20ae5bdf497863acfc27a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/hsb/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/hsb/firefox-77.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "8173f8c47566f7aa486266b8c0e83eadc11c484f597334aa48eebd3ed353f5910eef527bde508e98f082240d01804006ca4771aa7992290b254601d2eec6a206"; + sha512 = "ddffbac976e3978590b24b68cc642e43a8633156ec62f665b273233b960cfb7086cb2628cbd532e78d58092cdf24a72b3299862b06f3a863fd40213caa3d0243"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/hu/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/hu/firefox-77.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "7ceb26c11204ce6b1e6c3596d9dc3e6146422cc3eb0d1ef9c06251430e32f2353ee42b4363204852d6374cc845f8b84997958d2e66af3e770aad679d0ad3e66b"; + sha512 = "bf25d7817d68fa922c9763ee484f3cfcd28f2fdf92fa175f3c85f3c30f1ab095d4ab2b9328d23a3ffbc99f79a1d4656a9702e2a0df973c796c3b13ef543ec60f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/hy-AM/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/hy-AM/firefox-77.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "cbc66db54c574aca15f8e2726ff68910d19a67cbbed9e2b63518976e3f614b4f5f6928bb7cdfd5c357d7152ef04ffe1a311656125ff5cb62e471ae59213b79e9"; + sha512 = "45401697dc04cb113b5182abd6a3716c5f21d477edd8297f1b073cfd2624a4a410ec08d0e927fb1de9dcf70e714cdde13fd921866bae9b47c45eb5a142744600"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ia/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/ia/firefox-77.0b6.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "19325c8a1aa3067fa8df803b93f124427519020903ace8cf12585711634f8d546662166f11b3944880dca5eb79ae87a9e2d0e4e273d95543a4641e9cf4324ebd"; + sha512 = "73990b0658142040ab43692066ac1b9511bca1dc4c17d317b9015ed373ace16c49f41aaf45dface74949b2a862d7511192bd5d5cb5989f23a34b52a0371d8e11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/id/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/id/firefox-77.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "b74338470d7eb1aecfc75ead675e2408df33fd4841ab4953cadadfb9a7f6169f8a10c4896d4d48fe86113d3f1ff312c4298976ef8b997c26d6406f8598b19a5e"; + sha512 = "eb5617301fd091c376e95affea0ae79b7f85880cdc2bc7f6b7bd1d87bbe490b5018cf047c9955d23be5cb481a2a7549944caed09b20439fffe8fc1fcfd1a8919"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/is/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/is/firefox-77.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "cb3cae07b27f0d485f9eb70805671ae50325491d622dacace2a39606efd7a72e46220e4981ff012f115183641b8e00271ab06c5ab2e8bcf3baeda040546c8b12"; + sha512 = "c201c279bc337612f0c2bfe8656c40989b0081b226f2ad0db1fe63618a2376a1cb2b7dde7ab7bc9227c17f95e9f8f8dc3e51baaae0fd5a7899fe397207722a22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/it/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/it/firefox-77.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "83b7175ff91bad6733db2cd095172ef943867aa2dd911c6ec857dbeaad8cf4cd906278f3b8fd488e8905cd5d5574f727066ae73e92948d22804dabe16b4a11cf"; + sha512 = "c8785eeb316e4be84bd177120b54ee14324f8aa8476e0146cfadf12d673048753ef6c26417e9d20bbeb3bec17f0c0b68378166d41dfb2aa43e97b3de1c6dfb04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ja/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/ja/firefox-77.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "b97a3c637b1632b6a6285af946eb0a2c178d8fd901cb3a9b0fa5b62d14e3bc314acedd504153ae111557b78a2edbb056bd4a255f5971e1ebad3e335879dec40b"; + sha512 = "610a9508ab284ce0a8b75416165326e18a4dff7382a0aee544a0a65a7caa6e7477ac6f1407144a51c5f87e80898d5d970723e403c79d14db1d3adf6f78f66692"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ka/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/ka/firefox-77.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "2f5ae830c52bcdef8fb47880c6941d5aaf4830139b77c59c8e188e82036d315f57732633ea785c54a950d086ea02423e97ea2ac01105b5d2990821c7a15036be"; + sha512 = "5fc5a2d1b650809aeef7109a1aad6d19936bf2f1812f3ead113acae43e435399ae54ea5b573b9347f9e884a64b51a3faf054ee42fa554bf55bd1fd029565dd6d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/kab/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/kab/firefox-77.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "4be9c49a6b6203f2f3b3aa3b5ee2c3246d77409da5a7b7cde2c14a3fa592eba87715199447df96688e95d9905d6f1eadaf867ffe1d01be9a12feb03255848c84"; + sha512 = "4148eb8947d292ee4119165ace08451f6bf432d85fbdcb7442fc7558c56a5e2a1aaad48b0b5d904f1704b7fd507f9387a4ceeedd824d660f8b2fef86dad4d275"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/kk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/kk/firefox-77.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "d15c5f6fbbe9b16510e94d1cf49f36fb758a97af5e75069f38b33aab8be007812d88babdb8aa365fe3e4c17a822be234111885a2d71ff335bd7ec6703e81434b"; + sha512 = "c2a7080ff954f22154cef744bb5e300b1c20106c85546394cd2be2f40ff7182bb47694e700c0170bc347b5c7563763e5de9e9b6c2bfe24fbfcbb914629894671"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/km/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/km/firefox-77.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "351facfee64d07ffedd0e5509e8b796d0432c7b44ad29d109c50668adb8fb13f408026166a49f37a92f99bdbf7e032929a22088d4bc42c14169449234841dc90"; + sha512 = "cf82eb49d6d21561608a23e3627833c3f0358e4c9a59214f9ef3a7ff39cac4b153d85701efe3ad02b033149848ffac6fa5a4fef8e95bac3949cf1bca88ce45f0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/kn/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/kn/firefox-77.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "dab3f1437cea072c466c9407fdf647f368838bbb7c30177642bc1247a8002874f832d0661e8a3aa32df8c0017f8c664caf6125b6989a113cd08f9c874753dfa2"; + sha512 = "e477fcdc9bade0325e40dc765d7d41fa69620fa5976a6c9a8785d36270cf85beccced14d479d4ffb1bca4832294e3e134961caf334ae1f524709410da15aeb5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ko/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/ko/firefox-77.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "b62dde501b06b4d825d9ffa8008b45a40bbfc93123df07136128f22c7f6e1f1cc42a0ea7e97c1a962a7b1a1a23bccd5eb66785a246781769b22bb43b8ef451e3"; + sha512 = "a524a4a121915f69e84f63e4f4ecd8895289dadd9d5987e47d7ebd6cd4a3d5683e594e1aa6efa4dba41589042b3b802fb3e088afd73da285206265240503bed5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/lij/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/lij/firefox-77.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "9fe6488ed61c360ec1ba0d784409938159637c96abff94ebe18f198a8c0a72b052b5b0e6b5946339cdc5b5b3288c8e76811704366a4e9f9c498a9041955f7df8"; + sha512 = "71ae1dd537d967641947aea05165075cff17ecee0fabe0c7f3d4a40f645d0b83386aa74f23776bfeeca070c1bd635c7129e903ab3153ce00dd7554043e2e1213"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/lt/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/lt/firefox-77.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "804c3639ec0275d844f9ea37b1ccf5f259c50301cd5ee719b6be07a5097218937b5337a25d375c0d534d59143af3fdb338809fd9490a898d226e9cbddf39b6c8"; + sha512 = "fca434624a32b7daf9a62a1ac880f35b6f007901857a546f2b1c8998c93c4b719d1c9aea4a32349428b81cb15f46541f0af90463bca03bb0bb3305a2a380fef8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/lv/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/lv/firefox-77.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "14b263e7abfdad1ce738d58bc30f054f80099a7513ae443d32aa8dcde6b12f2daac56aefe9d3cbc2db9f9cab573a5ef2b046b8e8df9d5417cffea44d109d1403"; + sha512 = "964afab55c1d2a630fc4145b41b16f7b353d531aa5cbe77a0f2d6e26bb9451bb9aa3e4d816aede3422490586f09fec8d724f0d12c31dce7320203ad3fb5b3094"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/mk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/mk/firefox-77.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "068eae194df8e756a668b8e372a0790ab8fdcbd5c54b823c82106230a9cba32b5b6e530de7a981273c67af25e5d329da2c543c8a5c96c91f010d19b6ecb25bb9"; + sha512 = "e5d8a008bfcb0895c8048d38174086551a176c9210e3e8a9235eef35328708e470f6ab343e72dc9b06c76d15c5d4ed5ba2307ba639e8a65916823482e8e5033b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/mr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/mr/firefox-77.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "6775e61398e028c2a6dcf9171ffb3d8fd4746653beb58e8c012f3256685e545abf4a62d53d67aaed3a2f04f216dedbb14a09920f24c2b6bc288fd29caa1ce2f9"; + sha512 = "43e08ecdc054faee0a6a13e73cdc1878ab694bbdb7d054fb1704422ce3ae12d3191817811e1199117557a1ad81fb16a56d0012429ff571fafc64d09a7a9112c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ms/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/ms/firefox-77.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "b66a91988d816963731c823f16d001b89ce14928caa129ef90dfd1f01e3c54cea2ddcf0e5f7fe34ffe23b265c0a64715c3877fe0c5c8365f80b859d3e06e84ea"; + sha512 = "833cb1e12e108d574b9e359ceb3484b7b00078e482ffad0f3198b8e27d4940afa8055ee1f47f9313962295d129ce7370f3cdff2b34c12abc6cdddaa2899e721f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/my/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/my/firefox-77.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "29796ba9076ab6c46f16fc06119a267861b34652322397e77872a7570e8375e3efe88c3c08731cc8909d817d3eb71e269f7d245e691b8ba4778bb653a766914b"; + sha512 = "7b0b110972cdb5f2904b70fedc67ceecdb7d28aa345ed562cd2a1e6ca629b45331f55493c9ebcddef3a69b0d19b5279be0c9dc94745f9012a0d42972e57e9344"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/nb-NO/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/nb-NO/firefox-77.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "d7fe426dcbd53043a94d143a038fd901875630627e98547997be62b3319d5f2c2172ccf9315886d97d30c4a041a099e0ad8a229e840a0f4061faa9d6d3c64361"; + sha512 = "71e963a198774a42a5169c4d257963f750a10a50233daa05cc8f53cd8b5844a143114def8bda4c62157962e854202921e3fe60d4b844791e16bd376824be653f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ne-NP/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/ne-NP/firefox-77.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "093ee3c1d513adaff69bf84f5b9236c245c4580ae25f7caa642be239a591ad9242b329f15e2dde0969d12223cb6ab8decfc657ca440e344a87e42dd880450adb"; + sha512 = "e8199eac341f94cdf77cabb63d39fc6c3453044ecb418708761b14c55fb08d81746c57c167d3cb624b9a47d3c39d2bc96484666f316028bcc5014821599c4348"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/nl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/nl/firefox-77.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "e912de72ee10ac764cccf1243c0c1f8fcf159d6ade88c7ff575a5f7a5175efe8086d8b4ad4c9a72cd65d59186665d0e11abc4399b0692428bb8c93d025de2f9f"; + sha512 = "5e1b177f981db92ee2df2cdf1dc27d62491e922f1157a5f90301221ffb36cd497f04726e52d688c2dd59494dbc788556468092b67796435cb99cc78bb23e820d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/nn-NO/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/nn-NO/firefox-77.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "52c57e140593211af5abdf729d4dd45be242539aaad4688ab081d311804d56afe05ac6ae3e21c439a560f5213e49abd1ae0e5650f091215948ca514ad3eb7e20"; + sha512 = "056a928ed92402fa85e782f047c4e698a415e70c38d05dd572917d8ae84c4f15a4dfef479aa5dd297642546557771bbf86867209742aa301d9d4ddc04966c4e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/oc/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/oc/firefox-77.0b6.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "d249ab86026370ce7f417ddb7d7cc0a4fc58563a1c12388a4e1628938e3af8a1428f2e43cf7ace0c9e455e4b4999942221fc3d96723bd927c50f7e45c7bc1a1d"; + sha512 = "a2f6d7bf1b8833e934e6f109d7e972d139a99d22b9ed33fffa04a9f6629575d4db9876dc1c36dee15014e0507cc24827dc1071884cfcdb3e3185d7630c9b4fab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/pa-IN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/pa-IN/firefox-77.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "7d5d1861559627f9a77160106dd5c527d09656be5586791c2bf2a61292b1cb1150c545ff1f39a6744453af58bd44777b9668993a10e654ed4c8edddddec12467"; + sha512 = "d61f6171b1e7795e86187a9be8c42d5a1cf761558bf75cf5c6dc88cbaf9b9f73409d796f5087c82c99a5b11cdd957e24bd74ec6f2d6b3563b4d6c1df68b4835f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/pl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/pl/firefox-77.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "24a419ca7b8c82112bac80aa9d956f3198cb324991492f9f66bcf0d64fcbe5618a2e654849dcb5794399dad32de91bf48bd3bba70003e02b9bf28634b8d4b267"; + sha512 = "e39989accabef74c67a31b554daa3aa31c0e27f9360d002f2553b6692356b4e04c2cbfd95a47bbebb7009de9d567aaea2ecee90c36808ee8d0a50c2fcd1e4332"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/pt-BR/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/pt-BR/firefox-77.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "cf33be7018dfffc891e4cac9950ead0274957b9a44e27bd7924abd62f93e69b575dbaab1a663ebf829a05283f957dae0a7442abe76e8e1a8a6e35e12be6e2821"; + sha512 = "8a0f66dc7112c0f012bacbc0138e512f66b9dced497dee161488964f29e56080cce03f9fa71ea6bb6b05e1d72b2810f31301a134cf9207a2e5426440b3d29421"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/pt-PT/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/pt-PT/firefox-77.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "c368498ffa8eb48801634fa6b50a74a563a28d4fcd23e4634eea52fb6ecf2872e4cd91aef5799afd8dcbf6020c7f694dd3eeff1197c3cfdac63bd72acfa7d7cd"; + sha512 = "3c66792f9880458a237bc4baf31e401d5ea3551eaa8e984d69ce75f62fa7ce3518c56d461c5803dd37eba199d5d93c86ac1d31f3638196a631d89cf6a8095fb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/rm/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/rm/firefox-77.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "d2064ab0dba1c122a599954efb01e4a68f189a1ce1d5059d60373e8c4b89c860d6b6a68c1e58afebe65107c3f8c5c5f87e771cad61efe7449e86f8ce25bacc5a"; + sha512 = "9fe665eb9f3dae56fb332f8ecc0700f3fbc9da71ad34aee927a5b92d98e97f987419417ed610bcec94778e47758d03dd997da9c704857d517e7bc583d0999d75"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ro/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/ro/firefox-77.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "64d566ac3acb823cc062dddaa33e1ae321edd3a4e54b02e317a04595bbc145ee4cd06f3f84b20d1853ad6d0eb4cb7b13bb10bfc8383799264342a409e2254dd3"; + sha512 = "cb52dc74bc09a08fe7d53ec3a61c07f38e0644f78859b6c59d7e2cb11fab9d607642d32981143ce457604196f55a01199f57733e5eb91c67b6d70018904f596b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ru/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/ru/firefox-77.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "2240c612c9d746774fba47019068391d6e08fc4933b082670269cab1416ce538b2bf9b948aac994e81a31a52b91a11df6968b847ce0e843615a75b8841443c23"; + sha512 = "b69a543d0282f36eae49076b90efa8cb538a99df255d618d85231c7d150f93c26bf13ac5cecde54208bf425319477536b958a94f043baba9f27b5b5e9de065ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/si/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/si/firefox-77.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "f579d1d21cb45d91394b9a08e1b960a43ddadd7040e417c20e66e1dd4d3f7ea3a8963ab8334e49cb22ad6eb2ef81ba98eae1298acab3abfa512fffb6024da622"; + sha512 = "fd2b626896e0a8be67bd6c99d01f0144eae1d0adc8cb7cbd0062c2afe8ee902d09325eaebd762bfc56e89d969027e34ccb7209aa42e3088602f10796e5dadd7d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/sk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/sk/firefox-77.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "6d2436ef789404b6d7247ca222cda81ccf518b91bb854d7f53b6c2c1c68b96cf5785bf6b768e49a0b0a4db02fc899c72969ac0c1441ad6bfb8ddb944e2388d8d"; + sha512 = "6f0a31a83df05ea5770d21885d6783dfa5307dbe3ad63164f2dbd5117827ae3428358b1e4f02c6c9906f9c801418f8c51af1afd60e5f2255e1d1e4a5095e4958"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/sl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/sl/firefox-77.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "4ed452c03a08506498ec2663b6fab477b2aa52c9505085b493d799b19e5215ac72a90ab642ab2ba3520c609909b93a5b176d5f13c79066598492e7babd94ecaa"; + sha512 = "5e7d1fe3a3eb179d5a8ce578ce963b1d445e4d76758ec4a7e21f38e17b81046f15b9b5ffbdf9f83b665465cd938369e40da7d60919a05261a00012b2f4dc264b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/son/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/son/firefox-77.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "d3c77c8a85dbb280f75068ca49891de95fc081b4074cfbd569c773fcfd4d0b017e2b734a6531dabc41dfb3e3f7accb51d47e7cfcff2bae6f230fed8d69db2073"; + sha512 = "c9d8d31ec45fefac3c6fbe0d0acf845978e743330a526eb83f39bad1f0d5f9262d58dfe2cee7ef69fb959c3c41ca2dfcbc4dbc87633e1b58dcecfafb013e1306"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/sq/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/sq/firefox-77.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "94aa56c2d731533105c9e1c7d20862ca9cfd5729fd474b2ca784e2528f798915e9dc177e5966e2b5bb77d6eebc7962e6564f1494ecc284a91175565d25451cdf"; + sha512 = "55582b1ee4115e5ee22abf1576180e1a1ef90e48c7052fe6d296d8666879835519e42f6d21e79f848563bc71ab16502dcd81553445e7ce90d90182e06262fa9a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/sr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/sr/firefox-77.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "3785e6ba189c2ec41f56282ca8925c8eb14d68157c5c035e90fab09f27941e67c9286298c07c31ab0792488f2cba86bce166adf76259d10cc3007f5047847392"; + sha512 = "5040bd47f5aaf6373d723edbabfd0d34953f03a09c81671c9f0ffb0ed5051fa3b8de51d867f35a94f5897219422ddb68ac358ba4a3d4afa74b89a5526f275246"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/sv-SE/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/sv-SE/firefox-77.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "a98ea8c31d5e6ecf3d3c4b0def2d2921aacd901d095ab53aed1da202937022c073834fcb1d3ced826c294c18660d2e4888473b2f8f9e91083bbfd0e040fa6ae5"; + sha512 = "e59efb80bb3f0bed33c807482d3f23ca33e98bc18f41af5d31a7d1751ac6ccde677eda01521d1b2f39eda2276aa0530576341f51507c19aaca54c677d9ddec83"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ta/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/ta/firefox-77.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "5c64882b2fe34cbff29ebe7668ba96526abfe29cc599881331e048da2655ec735f8425d98f64475073e86508626b464364e3a7212b44ac297e6a50c7fdb5b4f9"; + sha512 = "d1f995570b54803c16820cb19ccb8a140c8f9df43779cfa7ad9b4a2e4cbfab7fb918701ba4ab3c135652e6d1cdaae59ea471796419bbcbb97bd5d2d6187f9670"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/te/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/te/firefox-77.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "1506161ae00a4fa203cce5b31779a38f0e7df94021123cbd57197cff807a4a6ab2ee9907240b70b55e6795574b4074a83bd692d2b4ae208438a12357d6a898d5"; + sha512 = "2467f5384f1c9f9e79b7fb5d831b3ae35d2d25edc0bd5dbd709a36f40839e6b3ce37c73289b8267156140f6857647063d44bd4423ff261d2f820a23adce38288"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/th/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/th/firefox-77.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "97950bd4c56df1defdcc7f6f1693dd6fd0065805d63145aca80242e2d5a83186585dc1a165e7fe9a0dde52a8f60fa6b32ee097fe0febdbac5937a410e654b20a"; + sha512 = "1685154cefd3acb7a7ba6d53b92bf57c90185902e0fafbc06b02c9da3c67c04c1c92e38135c2a00df83181d8e6a225aa184100c5d0076be9338e3b25af289608"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/tl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/tl/firefox-77.0b6.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "994980dc3ad618140b0b422db46cf19cdaeb99c4d3202c426c415494812b5cac525b43c4b290fcb58ea66ab9330680c4add11e8ed92a5e36b7daeab19c96b4bf"; + sha512 = "a027d423fa66d418597fcd97166160fc28bf4a825dff1f51fe93be1543c9fa441f1525798a08c4c5eb176d56a09e2f4e0399c87f27e82c5e1777baa1c729ab34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/tr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/tr/firefox-77.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "65558235961baf87812242607d8b77f6e843bc5828e79002d55dce462bb2d40a00ccc97a9e83de56777d1e0ca35991a2c577ce40217964c481930a4081955289"; + sha512 = "96f3f0865311ef647d4431f7a5c5890a59cd36cd7da926229425f5d66d4a83d9ed8d693937f41bd542ba4ae2df16cff8e72e7a2a188f783e0980de5a809654d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/trs/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/trs/firefox-77.0b6.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "cbc3c626919406af47ea8a00e01fc8146838042a8b7a04fde88f39e8b21bb3ec8c15b9ed2b327f5df1bae621427c8c2917837a29c95f27b1bade9d82e4eb93ef"; + sha512 = "63e235e001218ef291d7bf964ccbb04dc0ae60a7a6f938c4c51e9f981d3bd52f1e01d455bc6524a625fc7c4961c6d754810dc18a92d93f3aba3c34bfae718386"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/uk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/uk/firefox-77.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "70ac4bcb16191992de317cc6dbe2f3e8d6ccd0b7bee0568d7a2272429bf164610621f53d6d3817ab6b3c7643d63db243273f6e99dfc5c5133dab4645f9824174"; + sha512 = "a37000563c2f7db995871cc83ce351eb1f0d44e4960362f7501155c0815cad2e021eae2f3f227b58fe5113bc6f847c33dab9cf717a7da3c1bbdef2989c01173b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/ur/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/ur/firefox-77.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "e66011a9db9ff2512dd3b2a338440ecf268141200754b0dc09c484d1504534b109aeb83364181b3bee7b534ea078c879ebca1860af63c388689517397055f670"; + sha512 = "1360f66fdefc56f1a6a692c4ddbdba8ceb925d0a66690c37ca6cca5cc6488cef4fa17397e47f19c9f9f4cad719c03ca3df2028de78889ea34f421eef24584fa1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/uz/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/uz/firefox-77.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "e09d595c56d8fb54592a046a6e4f9868a1bcb2bb638cbecbb87f94000127d0f3acedca67ea7f8db15445cd2142052873bf73ddf4df2fcea16373c614d6501728"; + sha512 = "b0426590b2ce54acc4ff683c82f40110b6d2965aa32c4df4c17b7550ae412ac4f1c30b6a716a640c33a8ee53104c5a5013fc03b2f5ceb4172c85c7aa89f7e08d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/vi/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/vi/firefox-77.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "04d5647b360d52ddb714c25443b55558b3d54fdb31a385513832fba336e7db28a8dc27653ceef32e72a4dac7cb771e82178b6161b55917c07da839e80523a8bf"; + sha512 = "487854b40537bb3ee78f0163ef03f64e181f976c0b6c26def4d6e176eb661f8609cf7f941ddf5e07ab21a1559aa4ce8425da9d1373b62970e10a3b3146b03dce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/xh/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/xh/firefox-77.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "bc564788b8fa57981b7963b584a445d69e4c198ae83d8d6ae1a5e4402796492bc2cf92d0119a9db067f75577240b0e9d6afb2f38fa94e3e101ce6481b8406fe2"; + sha512 = "98391beead5f679c1e72213c81e304f3ea195e6497561388b80b3e1d2676a2396f38361c19063d7454f3261d54fd2174c0efc6b6ed5232f57a6e1fa4d5880d3d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/zh-CN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/zh-CN/firefox-77.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "38fc3b4eef5cc6ffe867665d82dae4156ea2676749a9dd0b15bfbd9e01798829570bba75e0023ffdcf9b104ebe85911586eaba95868ab0773b22e121fc75679e"; + sha512 = "43f495798c8b6f2be8694459bf1ae788985fcbb38ad4461e63ee521371dc9325f4b70bee6e961a1b7e8a214a2784859a61de5ac0b088f64df390548da06a2a5d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-x86_64/zh-TW/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-x86_64/zh-TW/firefox-77.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "73477a782280c18dd42d7d62e26cfc5674201d3904d155c2ac712251ef8b65f422b522804104d7374865cd7e8286a8ea9291cbf7da37d412a1cdf8d24d18a3ae"; + sha512 = "a1697017b04890bc8b789659cddf9b7d4750b329d87e5f80193fe95c0a7497cbc17a8b53074d35b44847a561d818aebfe38be93450cd72875dcfccc3d2df704c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ach/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/ach/firefox-77.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "a35694c831c424eda7b6e5069c1b03d1e6b2fba051b3a29a7e8ebbded9b3b12fc1fbd39131d86f1c0d28a728a9ef2b7c8f903f6ba792d522c5e96490cf68563f"; + sha512 = "6163b94abd9e800302132edd7401eabae6f854d32e86a9a7e422fc4796c4bd4ce41f65cc7506341d34618531fe48ce925103e1aef40778121d1bb98703c510d9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/af/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/af/firefox-77.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "9fdc8e1e39d2fb69d3afb64f676fa85fd674b45eb86d4d4735df403bca27eb499be9e7a6f5f9e67cd3e588352adb29ee805b403f35a859c3226507684a69ecc2"; + sha512 = "b0cea9990fa77380104a99eda971fe8d24162f8db807104d071aed1ebf799f8bea336858caf2af5547e143f018ada461f60769fc56ff85ea5457acd556983b13"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/an/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/an/firefox-77.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "1da6aa658841d59069bf57960f9c5888e879056777e4c227037c1745648417356bd87bf062de6afe41058a290998e7e080ea7fec895cbc86619d0466ab0bf64a"; + sha512 = "c62704c4e41fe1f48b84986a6810510400111b150bbdb8cac3c55f9dd810166c764cd41728f767c2792cd9d8d284b3a656064dd49095b05494bf8b4dde2ea125"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ar/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/ar/firefox-77.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "8cfc1c08b728727053277a60c19e289f0d0407e01cb2da5632cbbfe5ab48f751298f4f83930dfd5907d4be8973a4aeec3f3a719dae16827f48f0eb0d4151cd03"; + sha512 = "513794b8973338f232e6ef6f9b35430904253b13a2ff43d13810dfa4a2df01bab5d61df809bf31750860e87554cd91c63443adbe9ff2db92a4f7328e8002e9f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ast/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/ast/firefox-77.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "96c7451450e0d6e133a6576b098b37dfab5059240a6107fb95be17a82e9600ffc4003b60918f4ccd8907d8aef814d55a79a61107504f41fe086fe3d6c83232b1"; + sha512 = "aecf7d90148e172ca7fb040a1a6a55187b408a4deba555dce2db498944231805ca252c02da4f7812cebe98d6e1f9bfb3b39e16ed225930208088f9e6792dc0d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/az/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/az/firefox-77.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "0211b3ff84eb9e7e9f6a0c81a141273009a2afc7ff237bdad751bcd68a24b60c9e9c896a836068d3373f0a0e6469fc77ce8f502197cdf9701ba033ab63eb5e03"; + sha512 = "58b917f9327097681f007085895d5817a4a4eb08354d7934b84151e4c3f03a8cffeaef4030a62c6e3180a8f36a2ad7b037e6b84af131e8124808d8dbfb6601b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/be/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/be/firefox-77.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "e268741abb735b0425d42fb21a1a70b7035f915122c64e45418f2e61a3fb5f9c123b53e93979c96e7a183b8511cfeea4c3c6e3af87756622f4f8d049657a7a4f"; + sha512 = "c0f7867c4b4b7b42758c61c15cb322fe75dd1af1608bd9be19756c7dd161983fcf53894f21f7daea39017b662faf288821a725c84da1493cb86b1640fd8a3750"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/bg/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/bg/firefox-77.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "3de7753956fcee2d2697f2c8a3cde18719621ae4c728b190d43b7e936c39543d6d6dae3ca593698931fb17b0270a19840377ec9392d1eb8bc591dcc7fc915404"; + sha512 = "472ac4e5ead67bedb528bf9bc7ac5afa0bc0c03f5f5ad4b69d074909d1d5667a3045362d5255b97fabec291cb97779d903a6f7de058bcf3c3eb829eda22d92f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/bn/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/bn/firefox-77.0b6.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "ff9b2217e043c7cbba98f9993c729d23dea838e6f120c6adcbb4d03ff127484111ac2be2426de2134dc914aa765550ae62a464822ed31b24231fdfb50d295610"; + sha512 = "933d1c05260beffdf060c13f684dd641271511a5cd8ff9850c4e01e9aa49d09022e644f81f39559975ff2f47c1337c3b4f1593baeafa83925553ea8b06b97884"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/br/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/br/firefox-77.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "805d85cad7af9264c1e8e3534b6c6248573ae445410616a8d74402cda2273b68dfeae4d47240e0247fb29b56bcf6f2d627f4a872afa8eda3d8156f14bf8851af"; + sha512 = "f58f61cea065b732b54a90440af3acfdbfb0a47b2f320982670c279483b4d63238356d7eac8c3cc21f9069da038451b8cb91bb929eb9db63100fd281e8770ec1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/bs/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/bs/firefox-77.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "40f56cc3fa11d85b7e9e8d770ac5bec91ba5b8203e11a0cf898ef6bc94d58ddc73d6919e5c56a2e79a846393f28922233211784e693f3da63ae9315f3befc80d"; + sha512 = "e324b92fcf9bcd14b1550ce8ae5f679d7ee782dc0983d5deb979855cd02572bba3ceca5faddf19c084c48225536c60ce62b7cab707fd03807dc3c6c276221f8d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ca-valencia/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/ca-valencia/firefox-77.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "00dafbfb3095d7b76d1bf08bdbe5e99cfd207b39ae2a787eacb39ca412f1b2ea7c4fade4c99715f44cdd774823c4929d0efb65b40757f1b86faec738d4f11493"; + sha512 = "2c804886072e3749c95f9cfa2eefaf43a0318603aa1f3bc7c63e03b189c0c07d9397ae528bc39b5bfa1c0d71b348c9966ef4c8e9ce38e91e8cb5d5558eb569e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ca/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/ca/firefox-77.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "24c21262e498e8840cba3f8411d8f46108f736f10bba2a0c37ad9fab6e0bc773f38ac086334d3d572e19223309e9d106035d3458e05c9b7b8db237b7bb1e1984"; + sha512 = "02edf33f6f7c976ec344bc8f99af928a7f80a2d9d968ef81e64a92bc57492cd62540bc1c68221e73b08241dc55d522c364eb00643e62c813e4e23030110122b2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/cak/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/cak/firefox-77.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "fa849173b8af4d6be6a499734042763d2ac532e213cb863a611e66e405acb5df7a51649bb1f9509ec637e15c055fdaac63e380128290623b6d3818e528a9c532"; + sha512 = "5bf3c6ba3e8d9e9a9410eaf128bd5193152493b786d2b4e2fe04ab7cc58fd2500918cc11d3239848093eca0e46bab2a31cd845995d7a0d5f8254519f9443097d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/cs/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/cs/firefox-77.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "5b718c2dc82230343e35b8d45725e9f7c331cdf5716d973d671b7465e06d50e92e0a353c73c7c31c33cec1115b9332e2457f17f6e5fcf8f033bcf7e222802267"; + sha512 = "2ed0b57124fef0753ec20e726d0d07a8b949a5b5b0c07c34f62e7d9eb0e7ed8c39d4d7665e5252862d565b232a5608e96cd71bb949a970c5ae15fac84a778f6a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/cy/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/cy/firefox-77.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "7b037bdbe658d26c2ea75b8da80b4040b9a0c4cefc00784bb94512481de435463605c565eda38f0e958725adea11f09a9ec5a37d9513c16118214d0486db9031"; + sha512 = "dd051eb3f9998b30278474e9ec3b86793460094f741778f35ab87bef75e386ba2308121088f6a360b2c20538b9e65879993e4419a3a8f19e42e366c0ad02651a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/da/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/da/firefox-77.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "9752b73c59784ea54a95b0bbf63123ebbbfdfb7d2742e3418a872982c0d8198fc0450b3c33f4fc569fcd43a633cead3ea1893057b6d7e8c6ab78632fad3555cd"; + sha512 = "b104222194470fba31288adda0f46afec35d6be4af04dfdd59c224bc5c2a8a829fc7bda89b40496ee6d837078e5273b903b714dd8352198c7c85ffa5bd65755e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/de/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/de/firefox-77.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "067ad7a8a5a4c6120c1f1be2f9b4066f1ef830e3cb49ba850478d18693c8e4ab12d54a07036d23ddf3e138837320728f1fd6bbfffed760b530d8ab6addba6b20"; + sha512 = "203facbc30078ae089c8567b289f1c6a3cc8f0bbd93a36781cf5ba0a7dff60d47e63c73a9488eca2fe309cb3ffff8ab30d0930091fd9abafec29663c11d33f0c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/dsb/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/dsb/firefox-77.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "9f4b6f73a3966a7aa60c168c16d88382dcfb278f934f3fa485e691a6b6af43a14f49395a3f8177b4ca9802275706b2cf701aba2310262149b0bb42cf6d096c25"; + sha512 = "c51f672ec8b9f10bb2f1acb2d064a95d2a02957f3d2c4039b7d4c22acb8d4646e39dd1a7afc7b7452ff94ed7f678d988abc7d11b9c4ef668b0c7e6b94a7220b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/el/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/el/firefox-77.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "43a0710f463542a1389e98b5993d1d1b35f443f0a0ccabca65ec5505d19c28311d91cdddee4f9c102b6f4a25a87e4c2c6ad7be89252f60a724c7af935e30f675"; + sha512 = "4598e9929164e85f9b18c6052e7764295dfa8c64f14fa82ba7070f74f0c4aeccb5a80ce90988b0363269bfa9b880a1be1a2c755de19a133d804dae5526e049e3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/en-CA/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/en-CA/firefox-77.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "6717d9c590e5f06d3b02f643ad4eb27f48499ca759c41144aa5e0351e478bacc54163378faedd731042ce56ff5e8f55b2c6b6bde7768d3576b70a0abaf4c91bf"; + sha512 = "bcd6f5a064873bc300a447a57ec68b6a2019a117a3712d2f51d7a61ceedc42eb22b07e294a2b44fe55bacb6e3bc83e0a7bf9b64dadce8289ca8faaddd1c1eff9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/en-GB/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/en-GB/firefox-77.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "320a50b2461d617962093c1d7eea94517c56a93d6857a4d4efc4183e76f24dc9320619f9c3143c9dda017ec5e8e3d71c730a27d532bd7141c750598edbcb0121"; + sha512 = "b17ce17d3675598c72121d57386aba8f218724176a840ccbf3200503c62e56c19df89a2dba678fa7bc21f6354bc969a911562e94dabcc3d153f1a0b9cb203625"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/en-US/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/en-US/firefox-77.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "ea7f210807e2306d3578c39d1d58ce12525c47cb9dff3198dc9153683f8e49229e19dfd9fcfd3d76e109cda4f92392e4f9f1fac2cffbd59e6430105ebfc705f5"; + sha512 = "beb519bbb3b6497c497f23fb1c08f79d67175e91e39dd0039de5a4392c7f72986b150601dbb051028eeee811df35f099b8c906f0118e81e95db6547acc8cafec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/eo/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/eo/firefox-77.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "bd1dbf20cbd4aadef8bafa74f308f097b5dce955ba7f2299cddcb1cc9cc9d8805e399684cbca1af750535ba0ddc939757f4d38331035e4a708ffe1c252da9c82"; + sha512 = "44be964acb600756bc475922d3486745f1e53c7376b59fe87c3f289a09cfd7ec9d6829d6691f272d8cda8c4a30e8145373e35bb316dd62a86dd92343f8724ebf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/es-AR/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/es-AR/firefox-77.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "1e7a48ba49c4f96ff0d16efa3798e4254b7f38f0da8f51e62a4bb71c13e3f066a64c2c6d778da18b5db83da52684dc39067f6c765987d95921df2b3118de2c6e"; + sha512 = "2f787bea6daba52fc3d04567dc5e6bca75ac8dc77a9b72af98c08277fe53894444acbeefeb8eca8a1257534fb72ff65ffc9e5e67ea39812a9b7a4bd86cc361c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/es-CL/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/es-CL/firefox-77.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "9c7e6456459a4e2b6c7aba254afb145ca3c8efa4023f7e023c3cf326b0e0afd88149888265856e9f28179b686e1a458d453acace73f635a5fc8c90419e6fa043"; + sha512 = "32bc2c644bf940fa7eba3d857f12ff43e7fbf37f7051ac796731689551682c810038d4f3614f34b0c0c8e2410690ccfe56182395edffe16f9071a0066f59d7ba"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/es-ES/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/es-ES/firefox-77.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "95e2d89e0f94f9ac95489f8a084d0857aa5339c8257fc1bbe7c7ecba31694963831917461537cb12199fda05372e1304e6820683802efc0b4ec02324194ec2de"; + sha512 = "5bcd620fdce6ac1bf1a789cc5d7d490444f1e8999a0f133e4103df02d75f0f1f51a807b86f0bf07c1b743d84605d9fac7a2c25fae1b1206d7f98d6b1bbecfd4c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/es-MX/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/es-MX/firefox-77.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "5fc41cbecc716fb024df2d13e9fffb2b656e18f47adcb496d3f8f3d61580f97fe801435240576f1403805151c7183c208425e83a2ac56373051f0e82031115ba"; + sha512 = "9639a12dc3be3667558854143de6240b29fd368ffd959d14b3e8717e7cfb2918d770a040e9c9291c9c085ac0ac4b4bd95d4b5db212c64a769f3c8b56b8b16a31"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/et/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/et/firefox-77.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "16c5eb3e9739e100dbce0eb93f209fecb11b5b024ed62f18a47b00927452d8823b77a14fac1788d9c4bca9062e85e724a78c39630694b0d692b3867e4f62f7fa"; + sha512 = "6b5655d9ed90d612cb89009c280ba0a129ae5c3e7092b5dbbae0b76722743bff79e4fd738278992bc8dcb00e15ac7fd084ff2cecdcb1e720694d56fcc2674213"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/eu/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/eu/firefox-77.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "0352971bb2d43782052f20341f8fff0f6e919ced7909e6a860648e9772101e5f79bfdf0f912647d3593a0f6dc9dbe84fc193519c3b24ddcd13742f01ec59d1af"; + sha512 = "fafc506f9bf2cb94822cd7cb782dd1dcf65af46f3c3f0afb3d5b8717c75780e56dcd8a09882879208e5df1145c11ec9f3c8c93f81a01e63b1260871ee3497da8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/fa/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/fa/firefox-77.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "4856a0b482dd0676cdb5d46de7bcd96a4c9aa61bd976f3b46205019493b8933c78d7b253c41f4c2178e2f79b000dea8a9cf13e1fc7a31a5242432e1c9205d445"; + sha512 = "4b54eb3d7e903cd2571f85e001a6acae223240bfda2f9f7606a1816aebfa4e0fc6b433bb83c0cbb002bba08d3c1d18c894a59c0f0e79da5b2bd9aa29008baff2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ff/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/ff/firefox-77.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "e85757478feafe009085ff55492913944d5d8490426f93cfca481cbd97842bc3c6dbf709e17c372b5b51b14fea3b057415120b6fe145de928a108c7464de9af4"; + sha512 = "91b078d08b8320053a9bc41afdf567737eacc21019db4960b32e2371d1c7547c05c40204c33c32b284222c1655779ece8e66c7ad913ce2c5a235a3c58a204cfc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/fi/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/fi/firefox-77.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "f479d48fd6176baf30b0d648120669ba47ae2ec5d681ac6b610d6f0b0a617a0f259db863966625376b63a6b871d56049adc500ce8e8e0e27da3520a953bf1736"; + sha512 = "42eb28f46f07e0573dd74ce8e5deee96f5d1fca27afb6f8abb133ea7fb0f15dfebeae079bbee7cc22f6c17453ebf0da4f78a96fafc0ff9ed8f4d17cdba207dc0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/fr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/fr/firefox-77.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "4caa574275e5c0756ae787e73398f73a2702b36d4d3f49d3a3dfad8cda8393cef24ec0375d65d0cee4f41be8fc94b5419a3b613dda287d884f8e7b6317e3fe13"; + sha512 = "23eb239dd26d461f15383bf26a33ea4fa51f5ecbfa2a64ed2cf65adba4e56519ad0a84469776aaa023882f1387065214fee7a04e1c286232488fd33f2808f680"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/fy-NL/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/fy-NL/firefox-77.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "28d31bc60979c84d874f444555e6157b906b9d34399cb87608099e67127dc7480d6789b855c38615b075f5b07f8a6b222f04dd99e5690ae36d56490953135149"; + sha512 = "3e73aba91bbacd790c214b25214739c17f14ccd814bf117b8f80aa8a02f02d13cfdf0ace765dee41f0b9bc54759237d4ca48133732f4df22f14365ae888b8e15"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ga-IE/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/ga-IE/firefox-77.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "b83c50b728bb1e4febc53ceb3a4fb8a6589751b5ef77ef81f03941ff33d3e289c8986b501d95afeb56feb8f94be7d9a7b38e5330ca359543948d762e71402f75"; + sha512 = "0f1c6b131335490910f1fa66efde4755fa94f3315dddf586afeb8d99c9d90f0bef124aee5fd86e89d78e1f3e08e93e0a3c3f929dd951f6bab0eee750aefde2f6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/gd/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/gd/firefox-77.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "e1b2535e07364a29cedf36047b99dffeec8937b775a247b605532376b3a43a8c0037e2cc9a6a461a9b68e00eb67ac1d337bd40ee7110ce9890cf862dde3cfb60"; + sha512 = "6eb0476ba8d87b7243bd573a0d7af1d6ae5309b6987d728eaa4817e5012878c2093f7fc9581a5513f10cdbbfd0fb57e0f3d46c1a6f4c3fdc9d84384660ce47a1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/gl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/gl/firefox-77.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "776e2fb5cd75a8f5dd1e6340af21356141a24be87eeb6968ca926cb3d3aec1b48adde0881a7e4413a83fdf45f5caa3e829c0ca1754cf7176eebf2b9e3ccbb02f"; + sha512 = "33e18e89fe4af2fd66b438cda80bd9946b29aa36eb8e8a5e7f87cd2a614c714aa761ba29ffb6b0d7141a388f9e4a94e6577ee6aa28cae8711cf7dfff824fbcb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/gn/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/gn/firefox-77.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "bd3bb0d416557c94a57c8b364ad08ddcc1885bf55a2435f5a2f74f5af1607a828795fc68027a470cc95bf46d553d84eed1c0af3de1ae9d72546587b486a1bafa"; + sha512 = "e109b42999a56a2173a2d5aa9042ce3229e9e353d1126269f7cc3558c86419f22f449ec9940c5a7f61c0d0db0929f4d15d28c4c7929b8dfc5bee737d15fdd81e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/gu-IN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/gu-IN/firefox-77.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "b789f7adc37302354f797988e052957fd95f270dce838352636a367e03475ea92a740ab5ed49c9561eb5e90b106e38a767d6d3b4e8f1b3f07db7dada400b6aa6"; + sha512 = "2eebc24e19900eb9226cf9bc06fa9617fc6386da526e7a9b37be6bca047e81616d3b84610ca7923268241d79e256fb7d5d8fc0544d1b816d732d18681d11566b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/he/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/he/firefox-77.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "afbb11407ee19f4d3846673c451848ebd4efaf5795d1f864871c57f7e5d36d26e38c7107e326c5843109f89a315cbc38f25df1622f97d6c355f824d06986341b"; + sha512 = "ede805447b9c71fb1f311550d82b229e6de9df92c289a7e9e6f0765dd137eca893dd95f6ea91ea37af70ba4de4e1b44d4e2bb781f3b29395098233f7f185e27f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/hi-IN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/hi-IN/firefox-77.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "03c32d07601cf4b98d02495baf97b70a38a8e82abc8685ed507f0c9abb907468b1e8b8403b2272c9c06ea8b0cb020bb330f70f8abe5b5fe0c757fed710c912ce"; + sha512 = "10108407cf7aab5acf5c9bce0e01919badb7d6e5a79c2a33f32232f6afaad038f0e0abd1384eb3d5ac8eec938e931237845ac3ba195e8b7d18a009ec047767d6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/hr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/hr/firefox-77.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "47c923096c22e509063298e9229f3b74df60142aec4296d7008b5e49c69ee9542915e639b52ef8aa65a7ab9f118d1d23117874a3b717b37930d8a988386b6ae7"; + sha512 = "624032b07ce5e04a7a25a39a1e1dfca18df8be07d840e971f8ed95606edcf57e86425f3ccf048efc5e7d816c0242bd97c380f980e2fe2644851bc043b2bf56f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/hsb/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/hsb/firefox-77.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "2e2b3c390ad20fef9860c4e3516a32a66b091e1f60a0dc71916172de3a667cdeab3d712f8f2a5baef8857da3d9211fb7bea808b975cf3cce1920e8ef2d73614d"; + sha512 = "25f2ccaf7e43c83383d4b1fdc51e4ad0db715318adcc126defc209f07b2e7e12a3784ba37683365383b5637a45e47aeacdb2fa9e187c205b7a0e34195c04d229"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/hu/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/hu/firefox-77.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "4c5e5fc5e859751cfdbe1eea6217b92dcd3bf2a30b4967965d0242de72deb6d497823b0d17c170be1e7113a15f9d607a6890a5283c47c254ef2c94022397b977"; + sha512 = "c99cf77145c2a7473cfc094b3fb819bf46fd3919e18f776055185e497d19ba0e228b2741ccb973d5fdfb39ec0403f6ba43b5cb84169bc2ad8f94fd6f3c7c9d61"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/hy-AM/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/hy-AM/firefox-77.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "6953bf0ef7dfb0b703d4aa1ab9c26b85fc049c12a04d669121e9e98005ae870d92df9ce16bd567aa1586d02162ee94fd01800d4d291f5a0c1b6e0cfdafd89c8f"; + sha512 = "20f2a99725c111431b19c56c8afb174f30262e719cde9ce4f67b0768d630d39fcc19c4b4f8bb0eae6938fce205bb51f08108de38697033589290efaffc296a84"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ia/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/ia/firefox-77.0b6.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "e7bb763c2049dfb8081384059313e977ca44eb3d147caa2fbba755e288e45d6ee5e47b6aef1267e23d4e8c6a625f9dbdda7b938a9183a7012b3d943b857645af"; + sha512 = "ca1b9ee145b9a3f23522980256c9dd7e796ce5ba88329f7e64c78c98a26bb2379a58179fb34afc485dc507a133da2a161f96549d78c71c73e4b02175877d9163"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/id/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/id/firefox-77.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "a4139cd488a85cd70e595bcbd3f8fce96fdebcce2c61c04c06b70ea0f2a99348ab69590f1ccabbf803798952fd436a30bf6c103beb3006ecbd14f70d6c3ecf93"; + sha512 = "c7e7e6b8ce1ee969fa4412fdb0dea1dc91645b23dc7a62bef062873587b2bc54781da9796e349bec96aafeadf58d79378ae349bb938338632cddf8a71bdab7a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/is/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/is/firefox-77.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "e485e4b6f5a8ae5fda9be8ebcdfa102bad2c55ccee6d9dfbaf2778f92c68e68133a26a599998e134314186b296df68fc0dba7c849a109f699d3198a2c5a31001"; + sha512 = "a5bb8998ceae01b038569abbf1afc1c873529f1b99bdd2aab3886c269c291d5810b3505cc8e5dc2e961a64387e5e5911d88aa25e88dfd13c271a7eca55a015d7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/it/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/it/firefox-77.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "032e3e3b854a0be7ace835d71dfa864c0c84004c87ff09314615e633d64011f8676118ea73797b725bcb1c1e079fe632e16c15eeedf78602201c7ed371222e2f"; + sha512 = "75e511d103ba2d89ffc51210f2bdd92b75a55053055f88bfdef8b9c34abc54797093934c88a0cf1a10a3e81e596b373ba0b924f44d465152883fc37c7b2a2438"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ja/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/ja/firefox-77.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "dbdf163abdde2bfc22f5574d2be4e3daea52c7cca394a9b0f1f1b8af19c65593383a112a2fc7dc55e224ea6f5d63537f03be8d2cf02fd3d3566963bd0d51d204"; + sha512 = "a347b2a75b523d93bf2d4778bc9ef67203ee01c4f22a4e5881199f2fb74aa55faa4df79ce89c96cbdc5dbd708dfbc9cf4ca33c4d0c1ed3448914fe2088d20756"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ka/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/ka/firefox-77.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "2cd1446890227f1ba4d7f50ef778731b350f694646b6cf33e1407325784b071db4bc2fe43eeefef2ed98ffc5353538d42df48ff8e546f4495a366d5acbc2aace"; + sha512 = "31bd09c50ecc82445075fb193ff30a8087b0aacec75668b06228043055282013494c6a0c4d09b8a4f4111600a5e6ff886d039ee8e749a40371294a1d69f5629f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/kab/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/kab/firefox-77.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "87c131e32ad46194175e8ca8061cc1399813b2259c9c3e83e612c74bac27c9364cbbc63860c283eeb8416e3b108297ced4a1d9755c0a273c9143cc6b468f5cbc"; + sha512 = "25602f2aecede8972b7ea1316afb09cd288b4004884c3eb37613f66bd2541fdf21bd923e5aea23b110674d39a37f90827f32ccae8d0e9a0372e9931a6a3c04d1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/kk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/kk/firefox-77.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "6977a2478623dd8963121a1cb3da0a8669d1cf17357ed85475f61384a9e1ffc2c1b4286b3d7150386031786e365c33c188cded495036012a63dcf2db44e19d50"; + sha512 = "971acf4ef23a0dd3404370be3d11236b59e634e1960a13c953c8bd7e2f38c6e494a275720ac35d177236ab5e617f500f25e8ba5c9d76cc1455d5c84198193a66"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/km/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/km/firefox-77.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "4893ae9bb4695b227a6906db91c1df7997c866953ae3960a334856f9a1c99e05937518ecea2e59c5bdf12a4ccd3e644ce328e99294dae53d7a9d9a9f5e2e483a"; + sha512 = "9d1ee23d458fa637504fcfcbb2ce09c10c8f7b0459ab3e1aa956c4012054383bb5cc081df1652562ad236ef26c51293a534d2b1f38eea470d1b00d4c7e31ebb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/kn/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/kn/firefox-77.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "eb78a32ea736f139fe1c5cf0a1ae59df33272c6078e643a571968d0a5e4f3801c280aade938a5a714a7695700dbd2db84116f6e5ccbb7362d394ee929a2d9efe"; + sha512 = "af57f390cf12a7e93400a745dd739e98514a535fb88867f2e91a7c04f1e148ec6527baf2d031217d9066d14c852db4e70e82cc0422485444b23c755bd474f967"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ko/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/ko/firefox-77.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "3bc572b109fe9c5b14cb94d7705ab7fa972a99e914eabddfbef4901e5be9f058ee6412c59b2173fa0620166612c982ed6bccb1f4fd684189845a5446c93364ff"; + sha512 = "90561a209184560ed20122146324ebb63940b6237587699a0de8cbcc97938352698afc265ad18e9285ff81a77393855a89dc59eed180569d9059846bf2c8859b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/lij/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/lij/firefox-77.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "9364ab431f931727157b0722ed021736bb8a2771a01fd8e12e616c02d7ff8a2ad23add11ea720b1d462e727df51c985b5fcad908307af04ffb57af5d25674c24"; + sha512 = "43a08c17d0f6abbade205d630470cc56b4ef4d536fb10630f57f8baf816bb9b396409a61f83679f7fa04402cdd3a8c13c54e1d1f98aa705dad151a5e795e4d72"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/lt/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/lt/firefox-77.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "c2ebacf0d93c38d51d16cda493aa1152f8a682aa41b7f6626422596f21038ae16d3419873dd253f60f59971486568f3a71420df4d2c503a79aef80ec413adbc8"; + sha512 = "98b98383fff5a8ed92e8c2a71c742c953b9d534f22a546c8de961f919ea3027d8f9dfd8b1fa81dd3a1f97f320c653a74fd1a03e685cf09983f52a0c94d883bde"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/lv/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/lv/firefox-77.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "a1e0962bd4a10f1c1336650e97ce79fccfba6e752e2929156f60ae10a9b3a9e74b9e2cb8c265d7b1c242b2a34ec52f2368d07777bf7c687dbdd7914daae55c6c"; + sha512 = "5d687d8412313b37d47b2167eb6ffca92747abb450c910c8c0e9b755b8e651c61f5fd9acf2066d7d13a00878f48dc422f54b7f21eb30ad244dec86c4185700f7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/mk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/mk/firefox-77.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "e6b4cc5658ffdcc1a52979845abda4870917f8d036588daf1c1db93645696c85cbddc8a8dfcdb6f6166c43276ff52069c3c4289db38e9e98e7592b0d83fe3d08"; + sha512 = "6a27e2103582185acc901d4b62214a4793ddbcbd2a1ba782b5798c070992dd5395cbd4c2c4c6dfaf3b85842196da820fb337fae69f7b529dbfeae19b0c2f2d03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/mr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/mr/firefox-77.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "9d4cad2c1b192b199ac9a7c0ba233c0096546de7be31a21c4ee5789c82fa8fbaa5b9c5a37ac4001ef9bd774b62f57d33aa5760fbb0ee6ce60000f256e91f7054"; + sha512 = "8caee655cd45dc46c426262cee605a7e71e08f39a16e895180f4dbca8f6f70a15128a57d82160f70ef537f09f4d6de77b1d3842ca39be30069d5481bd0132d92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ms/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/ms/firefox-77.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "56d8a03ac84fab825c387ce84a45efd656abae43f9ea965ee45a09b417bb2634ed1f7fde0874294cb09ff3e3789782df7db19b6fce4598073a81854a91a6f800"; + sha512 = "d21a906a3c75ef3cea2d21c4249af4c43d04d2eae7b0f64c2b2949d8b7950468376dc6a888f38f4f7c949a40c95f86151735be41b63581ab3ac3e475eeb4673a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/my/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/my/firefox-77.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "a9768618490611f5073438986de4265bbc7bf3a2613f4314b78533430d1f830f83b7929c74d431d8bfaa2ee9d5ef64b189695ac838c52c5ee6dadde88d3a3606"; + sha512 = "8e62eb51a324251d1c33638be1c7ac35deb960b583c7040b4f87a22a03d9707ce82c72a49c026b03df32d5b666a30a58411a79a07a5f180b28d9d5cdb391df1c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/nb-NO/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/nb-NO/firefox-77.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "4a413a17a3796f4ba4b0b783c4226419f7fb800ce4965288129cae2f1f087a11226376764afe51e09c57a23a85df762bbe833d167a13b6c93c22fa378f0ae47d"; + sha512 = "0ea101855da1a81f5d6dbf30dc8793f42064e0bdbbc92a37c17f0b69a6b44f86c5107a74bce3a3b4eb3c8aaecf2f07334cdd66c910640594848db760a4fdbaab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ne-NP/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/ne-NP/firefox-77.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "899e26c0ab61e7dcd4ba97b4df082b13fd93d07c22e849a02dcbd887f870df0a6de4b05517b200a4917fda6f7cc83d7ff603d8e0bbd96a39ff016adacb669c32"; + sha512 = "e1a38ae9463c66444b9f15cd7707ddc28cb7fbda130dcaa83d65757e71175afa2412868674493792453bde9024f0d401e9ddbc1300523644f62e15d1139ec70b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/nl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/nl/firefox-77.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "59b6885bce4c6cb95288e1338d6df199e8710313bd569dcbfa2cd2029b02bdfee9e28d4aa11f561765ef9e51d982a999d689935e18fbdd0d60d8ec25cf4544e3"; + sha512 = "1421d90adfce08fe5f21276a3865de5f919f39e7420815f022416045b9df1fe2aa456982b1cc79ab5da90a9c8af9a3ccf49aa4b88a7a540503c896d6db601bd1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/nn-NO/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/nn-NO/firefox-77.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "40e62963d39f0b23498a438c3ad184d0367cdceff9a2674e565153c70bc450992d11145e5f651bbb53f389d5a74eb3d7413968c608b7d7650e9d553ee26d5cb7"; + sha512 = "b918c0463b5967599a00bacdfc6a69a943f43af312c7326150fa2aaa0b0ccdfc975db5e49c712384faf79f39bbfd541a79360916fd839ffadf1e19a0b27ad69c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/oc/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/oc/firefox-77.0b6.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "3ea480ff19ffafa1812069ef7dd1ff1852b10abf2ec4cc094912173937b82c744f29f1480de2e95dc65ee1062a766f0ec33d234e3e3d714f49972458a09705f7"; + sha512 = "243ddf2550c888b9e688931947b4587f21a971c786bef8ca914e511a4bad6bf359ba2aa5e1dc1aba84aa330c5e3e5cf91f31ad9a463ed55db10c2d6a9341585d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/pa-IN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/pa-IN/firefox-77.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "8a13731a6072abb0c34241f206898fb59d91dc26eb3f4c0627d2aee2e6a53fba8b3735d8f5f2b36dddca9609ff4c1d9c5d441c350e9164aecc2ce9a69b1f0c5e"; + sha512 = "d8198664bdd803e8cc39e4190e322a89626ff7c3463d1b0fb76ca2112745d02a8f60d06afa06e8aad6caf50dd0a541a452cfe9b3b88edffc1736d9360fe874d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/pl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/pl/firefox-77.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "853bd27d468111e512907ca3226f399ba0be48c3332836342ff15b4a8bc4e3253e31fe91a31f462863f9a6559273ad6693f1bf65a1763178aa3488185779da91"; + sha512 = "e2cd51b578f4f92e204a18a3173e0ecf9013b64fa2e30eb9bc0f046be20883c303166ac6978edfd8b7d5ad595b29a51048448f3369cc689e4528d3e186766169"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/pt-BR/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/pt-BR/firefox-77.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "d70bde7178c6ce76eedbd8a8e33617ddc7e7271aff41afae4d190e5f28bddec2094c1450c3782ae7dfe8ea7a6b844d50602e27294454946ab5c65a44b3553f9b"; + sha512 = "49296c51a717b8cbfc8cfd9ef0cc66a59e54a77418e9e9398168c86dcf8c6aa7e1c2a3cb17520e0533bd0b46f48aa9ec225e1dafecbc122ff984a509d9b9eb02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/pt-PT/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/pt-PT/firefox-77.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "6e8e2f7519e88809dd38d694f5a293379af1529afe7fdfd6f19e09e240bfd184291720ac48db382308c8d79c38c955916c57bf88d85ec2d220de7bd872954f43"; + sha512 = "b1e3d43898d41b871d7bc72f163b5209a79c7b5418f8c6c35420832cc200689fe47e91eb8e32eb337fe4c40c585109b8ff9c7a20ce6442a0c5b9b3e242790d71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/rm/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/rm/firefox-77.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "928018a321f1c0b86d13c092a5390652fe5d13bc63ee19274b6d3a107e2c5157fc969683e59055a13798c5982c75e02ae0e5cb40f5c94203a052c7898d1ad607"; + sha512 = "0f8397495c89e1221bd022e81f4e73a7e9c49e08c89d4ca997f3b087a67338b90661fdfaf19355ea44ffc9fee1ce8085d51056faec0135474c5160e45bee1a7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ro/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/ro/firefox-77.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "b2fe56c56cb25471fd7cd40d9fbdaad10d25438b94fdffbbd81ab93a7340befd1678d904a3629a28c8db6fa10d969243c27b003817ef3c9b38030d6f43f39f9c"; + sha512 = "cc71bb6e97a3723cd44016be6203bd6a7ca385bb64980068a3ba9e79ea83489258c4c3cdd1d75332e62e4656de0294216d4a40c8ac151498127640a3d84362c0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ru/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/ru/firefox-77.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "bb4745d61f87f6e7acae842be9068a7f7b9d9da3c44d2d32a45c4d4a0dcd127e4c98bf5c7cc9ce03c9dd1782e4d9d03f8c1c82a6008a2b9b93b5ce380020d98c"; + sha512 = "956b21a71edd2c7ddccfe74865ddbb96500d74ab2bcab07cbb5fd87a0e3d6d2ae8ec43997268fc54908af82a8ba341062f63fe506b1a05c8f7b4b2ab48112af9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/si/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/si/firefox-77.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "efa44e8a4e69d10feb35385ee01b171d08c46feffea0d74ea8ee9b7cf21a839b2cc43ff138752c50ad43db1923b264495b63a0d46b5b2e579c3ba61b6bdf3acb"; + sha512 = "c5ed97b608fdbf114a5a265a349b222cf673a78a0cb3dad69a1ea49efd3e4b7a78e77728d78b66ad77473002fb6b03f2c0e6998b1fb06cb19a46ad7885f5ca99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/sk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/sk/firefox-77.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "3f9e63ad4c1e8a4f6bfac97925e189c9b3888c2e952c1801e4fcf935a246a294f9b088eaad6c18bf7dd93c136579529605bad6bcd95fa7b68c89a0fb087a44f8"; + sha512 = "f3676c620815d50c419b70aa11218348f3cce696e4b94a064a9f3089f01de3b7d4bc5d57a1164a366a5027be4a100a2583f600212bd5748b7bddf3e7fc5a4de0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/sl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/sl/firefox-77.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "79d4a1aed3c9afab1c1847ed4365ab7e99d0982fdaf09d6d9652b9f95ce3c32b123b2389a1a9d6486e6141953d25c06fac0a06156bff8c2eff6e295c8f79c28e"; + sha512 = "e273703d04d4618706de48114e937284dabea89b659eeb4cca695db8ff2892430cf2155785d5515e2e5b65929e15a19c7a0229969cba26ede313be8dcb57812b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/son/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/son/firefox-77.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "5faec58c78ab2acb1fb5f3aa3aabdb9d5ad9df6168215f818967bc2b3575aeee1428ee8354aabfb36b37ed66137f8ca6b2ce9ce5fee0075562c618fc3cfba9e8"; + sha512 = "80cc8d5a7c735a85facde9884e85e8fe75ba84d67f064e638a8d120ee5c7aac5dbc90c78667b698f1fd9a266490b801d47a34a28ea80e80784b5c3793c5aaa86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/sq/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/sq/firefox-77.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "32c67a6ace809219fbd51775c421fa6a68e29bef9e908678b43b53e1bffc85d8bf773e2a5b9a00861b0a437d56ee3ad5ff1cd1e84504a48816cf74a69240b851"; + sha512 = "61ef5dd07356b4185a32bf58b074b3981039d052269739db95e660fd098d8dca3a467af312ceda6435add548678458eb127ab7ee0119754b74cbf9180d9ac537"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/sr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/sr/firefox-77.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "ea3aff47c7e428a445aea0ebd7fa98e8de3a41dad208cea39adcad84327d2181b862ecd977e9c7a6aa8fb21cc99ada9698be67c86c5a931b1b41edafb744450b"; + sha512 = "4e3c35108af4cade5fc476f369d81d420ec825916f309ba18f11a5d174b56e38bf36f699a0097362cc925908e0b894b408f99cb9991670ee6d688dc2657c07b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/sv-SE/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/sv-SE/firefox-77.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "dcef09b5dee93167dbe6bc87d1fbb6f0e472db6471b99815d38532f6d223ac7a12183b323b5e979fa7943e4db1fc25b48760caf4540afa111f9dfd0958568767"; + sha512 = "c31d3b258783bb861624e3e6c85550b29098c27ffa98db1d4666456e458122bd452ae3cfa6712ae910acab93b6f2adb1179064e54553461a93dacb31bb03d5c1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ta/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/ta/firefox-77.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "598e3169673ad39832fea1afe0c141070795d54636846b18fd7ccb4a9e66575f779789553550552f9a9786ebe691afb10b81f0d0ba127242827e2d11f941c115"; + sha512 = "3b8ccda6c57242b381e1bd7324a8543c9a2cfa34b559efbe296af5487b4fb5df741a2d1d4dbb1154a87aef48faa7398728ec49744e560f69ceb444b05e9293e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/te/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/te/firefox-77.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "a1501c3fe46adc0d29ea098aba2800c71f6eb14b33e44a367e33f5f9c705357cad8445e0980cc758102eb7c01c18a79f3007cfbd8d1b9c1ae9766e0e793ec3b3"; + sha512 = "aa69047d97f9cca826130eb5ebdb599a4fc78575635be97fcb58306bf56ed59f91414ba8b35bfba1cdce4e95f10f667cf6d58f81760aa0517c8dc45ecc920563"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/th/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/th/firefox-77.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "1bf0876237e5c8eea321970f86c3878770a3c54c7cbacf67bfb75904fd270ce88252d9844450086e00758cb2b1a0e1db40394246cb9ef8a7018c76bba03e3850"; + sha512 = "31a1ce5df66c1473fa1d9fe0c42507e4a564c1890a8ebc8afbad9a3767bb0c4121bd52335a5f45e0c721e984a4b3f5a639586d6b8cf1546678c57661e07cbcf4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/tl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/tl/firefox-77.0b6.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "5a0f3514e196803d7d6062cac1ec75342ffb49155624a0035eb49ddcaf829dfeaf37f7e26997b31cb85b9e43ee21fca9f7129ab6bf4a065fdade9bdb06573628"; + sha512 = "ce2f1e1bff6d93f9c7bd304fe16b28bc7115762372f1b3aa425bced85036c14dc907eda104babbeaafb70e6ff0d5855b5489869e70627dfdfe8c054636a68ba5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/tr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/tr/firefox-77.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "8b81e0479b60cad9b97f2108745445f584986fef5521c9ab88bb6ecd48dbc9a989b906122fad29c755dfbff859719c1c9da34452383dbf027d69288a32ea7af4"; + sha512 = "fcc98d0926a69526b029efa575a941a0c271defaf57c70f1a774b187b68b0b9989a11709449bdc433bd0d0f52af047ec5394f8b7f03144aab8b17bf5d80a9f04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/trs/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/trs/firefox-77.0b6.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "9b3d99608d163d860d0b123eddd794a2d3b44866e6b92bfc0f06c05fbdb59ebd1ade970850e5b1974332424886edfde04861abd1d47868e60970826846fc5b31"; + sha512 = "d098e4610f3ddf10198c5d800905409273436fc609684f3dfd83cdaa31025cc903d12e6118a4232dd094010dcd86cb3a2083e672a376c0a019ee759b93a2a89e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/uk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/uk/firefox-77.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "f056c542bd5b83bdfc7b2a8d7234d40b64e88063208ee4b0b1b7b27017ede66b8acbbaa9d835a6d2667a321d6b965002bb87b68e5aae0eeae27aba8dfc87164a"; + sha512 = "a36340c404fe340b952ae9bc6ca854aae10c98a9ac697ea92bfb4d3703ef18c597421caa50bd5c8d73c79c041bf13a1282f1e3d1e98b0ade43c2f8ea865f4b81"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/ur/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/ur/firefox-77.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "a36a8c25ebe88fcf086fd476619a657b1ff26364133d05b32bdc13cca81b61009c4f1afb760bae961942ed1396b178c2eb3cda9add8c6b502353a2ce8c486cd0"; + sha512 = "83a0e58f6bd65222ea565ffddfdeaa516f2258b8c018935915e90a53f1e56073bef440547342cda7d6dad724fb306444a3de82fb8a40a2cefabc9b250846d290"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/uz/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/uz/firefox-77.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "d07515f921caedca18f7661fad83ac772369a2f7f99d65fb827a0236818fd8eff211dbab90aa9525a6318374b1a2f84d8099667d1957f21c30e9dca35f97a111"; + sha512 = "49d55a9777d2c0357f52724ba8b050490eb8faf9cbb7890de7583e00d3ef0b295070d779b2193be1a243aa6d8f4a8a71dcf394f78af9564cbcbd30f731e8e50c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/vi/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/vi/firefox-77.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "de51d63ce79c249496222658ebbf53fa656916a753e6305d36047a99879b25e17a4ea4ebce1ccd07141cb507a7501362d0bb556aae97d115686d0d38db7742ab"; + sha512 = "409ab3b9c6c8505592dd22d590dba4b9e6c81c7eeffaf58ab5120346a376e175ff8362385ec823ea99084cc603e7b3df243b6b0ee74550acd16ffcfc21b6fcee"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/xh/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/xh/firefox-77.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "b01037ce68d8147dc79aeb0d540fe22a06d89ba5cf804951d16af3a896f592a00be7519b184de2f3aca7531d3026f78283b9f6b409c24031faf4859e92bfd1bd"; + sha512 = "b66e639f09a278243388c431dcc42fd270ed8e8c67c95abfa85ad6b40c9013f4ac3d33320ee5ff82af1e82efd7d942733951d2a0472ffc9743dbcec528d75ce0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/zh-CN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/zh-CN/firefox-77.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "0e6088a9b32ec76410fc45fc1433c514b1deb9fdab7f5249bd7ab3e1db9e0e5ad4294bffbfabf2f665bcfbedf8234ab64192ee50b34259e4133d7d035f6f4ff6"; + sha512 = "a63da6d53ecf5ade03be3c71059c476e71b96dfee18cfcaf73e953146d7c3da3daf7af4454d6744b0b6842fb56aedb35c547d6a0616b17c3c4319de47b2387c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/76.0b8/linux-i686/zh-TW/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/77.0b6/linux-i686/zh-TW/firefox-77.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "82042857b33d2dd642c8d6404bb864c79c2ffd91d2f8b342f39d9389e63ca59738b0083f192b607a391cf2fadac056760fd07c2b76a74172118eb44ed5724a1b"; + sha512 = "fbcae8653d1275ee4dd98d6d7e84da02e5447f3699613b9db5e9fb779f7659ed74c83d9b2df2b8128a7d365aa4ca8692df832d9c1b2b4e3586a15df20e867a56"; } ]; } -- cgit v1.2.3 From d65850e975eaef4766fda83e36c06ea25bf33578 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sat, 16 May 2020 15:06:32 +0200 Subject: palp: 2.1 -> 2.11 According to the homepage[1]: > Small change in Mori.h for compatibility with gcc_10 (thanks to J. Puydt) [May 15, 2020]. Disabling the strictoverflow seems to be no longer necessary (I'm relying on the check phase here). [1] http://hep.itp.tuwien.ac.at/~kreuzer/CY/CYpalp.html --- pkgs/applications/science/math/palp/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/math/palp/default.nix b/pkgs/applications/science/math/palp/default.nix index 409324d4abb..42259a2c689 100644 --- a/pkgs/applications/science/math/palp/default.nix +++ b/pkgs/applications/science/math/palp/default.nix @@ -9,16 +9,15 @@ let in stdenv.mkDerivation rec { pname = "palp"; - version = "2.1"; + version = "2.11"; src = fetchurl { url = "http://hep.itp.tuwien.ac.at/~kreuzer/CY/palp/palp-${version}.tar.gz"; - sha256 = "1s7s2lc5f0ig1yy7ygsh3sddm3sbq4mxwybqsj8lp9wjdxs7qfrs"; + sha256 = "09l4ysrdkqs91igg1faah75ay6ii684634ggvcxbkjsck65378l4"; }; hardeningDisable = [ "format" - "strictoverflow" # causes runtime failure (tested in checkPhase) ]; patchPhase = stdenv.lib.optionalString stdenv.isDarwin '' -- cgit v1.2.3 From 80a4efc3bd08341b5f5f02c5d4c65abc18294255 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sat, 16 May 2020 14:08:19 +0100 Subject: firefox-devedition-bin: 76.0b8 -> 77.0b6 --- .../browsers/firefox-bin/devedition_sources.nix | 770 ++++++++++----------- 1 file changed, 385 insertions(+), 385 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix index c2f92dc1e3d..39714be2268 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix @@ -1,965 +1,965 @@ { - version = "76.0b8"; + version = "77.0b6"; sources = [ - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ach/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/ach/firefox-77.0b6.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha512 = "0c2e0175eb3950098d7e13352d037f00b46edd7094e2978ed568d4bfe7c046b533d4c5473be6e28f84baa6eb3aaa6658b174da23409eaf34841ab7ac4aa244d9"; + sha512 = "d5b53535266e89b54bc163e8d3afe8b044261387774cfe28b6dfbe991fcfc3fa5e36c5c37ae0a5da7a5be99a27998f703b851a1d240777764cf844eb1752df6c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/af/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/af/firefox-77.0b6.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha512 = "3a10b739bb0ace8331190a9bd045cd4de78fa81fd18d271903db6a29828da814454751ff56dde9181786c81ecfc373a1bae05701f4982f5889dd6007ab2bde59"; + sha512 = "e7ec0978cb4697480f764b99e9a61fd1586f33fbc1656dc9e4727920a22e0af09ff2862559566720910cbd19cc7d53af01bda9b8fc7d56cbedddc7cf4d3f0f81"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/an/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/an/firefox-77.0b6.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha512 = "3a4d769aa9b123fcc5080bc877b6d29444926c5c7f45665e058bf7c4c9a7c87cd3c604eb56fb2a25b4a62a84360a3b6df51d123435f23b921b03e1bfdd65ef5a"; + sha512 = "3ff9772e4daa4ba81e41a08d419ddefa86c697edbea6502c0a2edf9ec68980ea620c76956b1707678c747857cb00b6e1faacfdb0fcc171a8d8ede3a3728bb406"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ar/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/ar/firefox-77.0b6.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha512 = "7febbf4429c33bdca13b978610e1f996d99e8db90290fa4c4ae5dded909d8fd60e416de328eb4b68b07af6af48b079232f9f85f64f30c751c2f877d7756d0c67"; + sha512 = "05f60c05a10fef0f9a84c528f5d21e7949277d3b5a8eb00c38f56caffef6c139fdedcbf6b894d5cfe881da0bfe1e739a223acaa8ec8dea517222277977f1e655"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ast/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/ast/firefox-77.0b6.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha512 = "6e6989857228793a3e3492a6f42b6c073c7ea58a9999daa5d88b465ecef5a0123d7607ede7c7297038747f4f0ea1c5fee70c2ff6436c6b7b642abe3f9a72be19"; + sha512 = "9342456d8567600c692f5e91d645465bfedc9c26520e4ed4492abd6c87ac4b5cdf4699d8fac4287705c9af7214b6be31b8823a7042243d5947ae4e8234acb6c6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/az/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/az/firefox-77.0b6.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha512 = "391becbf14940922f7a290840519af8ea5149058ae420738bb2bfa80ee057c16c04910f54660ee5eb3bc6067d6fd3b61053464eae4439eef708379bc220e4416"; + sha512 = "e4b5346d7a544821711e1f979b2e644ee3a83f2c8204cd9684202a526066bfed91295a535f9ce7cf78e668a19bae4ed6c75fe6e90bba6d586bdd9cad81bec22e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/be/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/be/firefox-77.0b6.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha512 = "c87ec6c520c9b47541e0b6ea2bd6a6916dc5a41e03affdf3caaee7247a8ad51925fbc7208725033518f03cab72a159cc5a75076bb9089ecf85210686cc704a60"; + sha512 = "1baeeeafc5a554f45d8f43b8690d0fb8def76a4f076b67dd02e63fbf5adfb4cbd3e37c39c97f44d2023c08380484e1de43391c3cc4aac8981da1d6a28235f997"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/bg/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/bg/firefox-77.0b6.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha512 = "f50f02c10d5c14756670aac99ccc909bcfc62d30ad7ab4ffdfa2870ded4b97ada7d21a78fe94610e01a448231d5a4b1decee47caf467978b667cd65b31d53dc5"; + sha512 = "5a726c17405ec59bea1617e9c510d3bdc6188f61c7d857371e09ca7eb9abacae42eef64d75b8bb7bd6f8e646a4b299bf7cbe08e3e2689b2209b295b4bab130c9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/bn/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/bn/firefox-77.0b6.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha512 = "f81e4f057defb28b57e218b74d115b140f595f17b40af00cacd4b46db1f45790e34a222c61551e8f9387c5dc505423f451904fc82adb2e18908786ca0e4a2ffd"; + sha512 = "64588c83d00dafe0df43ed2b29f8d3a4ab14c301d74e7bd035137e54356a0857ff8b6d0d45a3b46c5b33ee704c9e98a0093620443210e2ffa197f93e28ad9e3d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/br/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/br/firefox-77.0b6.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha512 = "2834602a86796ca65d278ad7e13d7e1722ef6d375d294d6623256c427eaa60691211244bc10a22b48c9831f832a9d2e948e814962464beaa430962e862000c78"; + sha512 = "b0a8b748b0cadf04f205852b4894ac26b50568528fa70bfa1ba7b9eba384864481cd9293e9b67a2fba4ad380a9e4fe9aa56ba5431d228198bdb1a6bd0ffbdd95"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/bs/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/bs/firefox-77.0b6.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha512 = "f4efa6b86bb314f850466d81e8fcffdd6b1fe4f8a372750edeecfda2fd5feb172251227ae8ead7d79bae3f3757b948e45200d779d8368fabc980ae73ef8c7b68"; + sha512 = "633a93e64f18ff4809ae955c1c6d2733a183a68666e711b2fb9da8702afbcc45c80c2f7e5d9c2c53d28be6d487c76b0848238f9ad2cb5738875df8f79a79ed6c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ca-valencia/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/ca-valencia/firefox-77.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha512 = "ec51ece975fa6e3fd4b3fe508c5ccacc62dc340562aefa8e22a74f2c818bbc81982ebb5d9b0f85a460ebf75030e3d25e084a554ff3ad8ea142a4bfd9b020ad96"; + sha512 = "28fc9b25dd5f4e71b52ae731096d516d1cc7e95008f15d702d842dfbda8c06068347037628600ee40cf16609bf252717bfde63fba6ed13d14095e0ac7eb0c756"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ca/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/ca/firefox-77.0b6.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha512 = "84cb922c3b7c61185fee0f08d6c6123efad63730a8be960b2087fd6074ed3486c1ead7081dba0a6cb0ea1799e14cd9a32f3690c31017e5ce2a3d2875d0368750"; + sha512 = "e9687cfb27f2866c510acd79b9c6f82c9ceb3ebf29924532b9677af58a4a373b1cbbcea73f187731ee83fb73118d841dde8b198cbce6df635c717300302f79b2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/cak/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/cak/firefox-77.0b6.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha512 = "7245add38d451e6dbad55140d9b2aee182df94b4285645ded8713f3c2c3aa4bf4c602a3f9a0a5f39ca091561cabde58aea18be3fe4247c53c742d03dc43c9858"; + sha512 = "385a8392fe634f722d5f8763c44bad55997d6aa3b94cbc42e727344f01247db8897e986a08426c54c6041514a4a99e7595fce034cdb772c8152b806384f6ef9e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/cs/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/cs/firefox-77.0b6.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha512 = "883a2c0ddd7cd826e6bfe6835c8ff33c135a9bc77962d9f1f67d49a0928ad9172c07974f0681769cb874ae7db4f6a1a96fbc78af3275262cffadb744ec6527fe"; + sha512 = "b63a464459e18807be18bbd4208a5e89c1b10b0c0577752bbfcb40716c494503950077b720264fb3a813908754a792af14d73a80b8a63d6c08210139cec08453"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/cy/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/cy/firefox-77.0b6.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha512 = "93b8379294b7a6ca49aa8b454f64de1f2df3db75f47c4bfe6e11e9317cbcea41da1ad8b73564a273c9343b4317329ee96f1f1ae7dee4a61f52b3a26e5790fc0c"; + sha512 = "8d3da83062a45d71828d53d53c25ce4fd84062d2052ec71e8b39460f401101a8adcbf8d735c6831efc348cc45d67580868ef062e6c7b233aade3a155ad036a02"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/da/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/da/firefox-77.0b6.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha512 = "6233c7a642883903c1e8054c6508dbc5cee01a5ee08baadc12ff388cf3353d879968a6cad59ea7458e93df9e1520e2a938a30c04b0f2e3c903857275bab801f7"; + sha512 = "7ac86f0f5f57c0cfbe8beb8cd8b6990ed852768007e718b0893623299f99ffdc2eb7aeb16c5f14156bc4d8921c50155d72d53a6c6505144a07520bf0f3121e7b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/de/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/de/firefox-77.0b6.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha512 = "41febc39a7ade5843b45a02950ddb1485fca32abd0a0bd8f8e017cf8f1503d4b4b20e7dfaf89e8833900aefad44f5119ec9c8d73f5f5fc7641dd3ae1e5d794ab"; + sha512 = "6b03cdbc4652822846903a3b5eb00d7bc30ae7b330f991d6e03794415dcb011a80f11d8106bde79be5424cb49186c6c67faf2f17012a24764dad6935bd777dc5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/dsb/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/dsb/firefox-77.0b6.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha512 = "3e4f96d7653f0cc4bec4de6c3eafea64c309f8dd88d54dc9fa27eca90c877d1f026b552fa755c0742a8537bc65a2ca831fd57adccda0c3f5573df95afbdf368f"; + sha512 = "102a90e5ae29c671e1e525e7504263489ed5ed8f39bd10dfb59f89269f66e6e668fef2bc804da188099f00462e54d875793095c905f6e280b1d921b14b9e1473"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/el/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/el/firefox-77.0b6.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha512 = "3fe9b14954d3774a389deccbe7d7b1e81c3f50f1e7b7b2e92f8c5bd55c3f4623f99f518e3fc8acf92473dc4c05e2ce316c370aa19d8d39e970a1f99bb9d221c6"; + sha512 = "94c46c9f183b9b7420bda72296f73a3a10b55f0e387867deebf85fc8fc48296dc7a9ab31b4bc5f961f6adaa27c715c6ad827e321e74997769600a4cd1e746444"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/en-CA/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/en-CA/firefox-77.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha512 = "d57062e3ca388a52485fb28eed924376f6decb324ba0cb9e9af2583f10447a24d129b1c0ae17dbeb9bcac829a4da09870eac22fd8aa378ffa2ca9dd2090292d4"; + sha512 = "0d642684898f25eea963c316e8bbacfe08075cd8a00382238afb12c04884dcb0402d53049a52f9c01106fca8191f0a90372cf0657f17065a781c47deac26b44a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/en-GB/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/en-GB/firefox-77.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha512 = "62d571af76baad53a699a7e80dcc7c7e60ba87aa3d6325cadbac7230b710180dcdd7ba058b7b502303067ee7fd590247d08278583e188394a1873ba9f5f23b2c"; + sha512 = "f7eb1764711d358091e8687515d0ac8cacbe0ad1c941ea26f97b03277af2e816baebd56027b532fa6bf08e1d7565acd60b023b3ee589e9106fde67e72697bef7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/en-US/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/en-US/firefox-77.0b6.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha512 = "b934ff6b86c84600fae27cd006606b26cea62a42c8c21bdc5472b776f95faaa8604acc9c7072a8ea5aa6bc7fee6a62375b75ca4b34ae7ad83d16e074445ed327"; + sha512 = "d8d7298c3f3d65fa4b6e44105d7e391dd3e7b9883e8d7a0323fcee9611b81c2b856d2facb08ba1f06348715f3fa6ef69ad4d4379f730bed4e19e936e105798f6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/eo/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/eo/firefox-77.0b6.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha512 = "7135b45b7424650933d579778130484b877766ddc7db83a5c4bf2f7faa662b127d475126d5fd67fffa3406f637128ced63693946e9ddfa4d33d57fe1396f3fe4"; + sha512 = "e206c36a0c44ce948c12c431b9a25403c52f92013c9b874c008c9f051641b817a199f21a3840bf6b85f23b12c6ea3d677232aae130acd50253f0346ecd82b735"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/es-AR/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/es-AR/firefox-77.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha512 = "0e66427df853ba3ba45880e45f466349bd4805812a879e6f654b2a02d4bcca71de27578140e4ae301b3bb329335453ddf3a756be6f49b1e92ca06abc58ff1654"; + sha512 = "f00f74555d8b965580f13af4dbf042d6a092e44e2c606d24340b8cb305ac432dc6502c6339d08d6e0b71f35101378eff90af464e2d3115f61bddd1f8a737ab7c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/es-CL/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/es-CL/firefox-77.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha512 = "36ed5cedcf9a2a75b19de328c5a5d89f07c09e9da728fb3431a31781a5c522b5a53a03fa5dfdcb079ce140f5bab3d7bedc79c0e3c79e3aaf672b5cce3eee2b1b"; + sha512 = "a81f7c5d615c0823936de89b65ca0fd449a83c1a19a8e9663fd77e74f79a872ae17bc34df4aa187d3f75f5330a75cea292e546972b149bc6308538d6df07e1be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/es-ES/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/es-ES/firefox-77.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha512 = "616477226b52076c86371cf1f1a548c2c95112685ab0e4b9835bef7b8bcf6c0ebb839ed3cee2f348cf26d990bd88b2dff46e20e38938421a6670cf66a82ee3b7"; + sha512 = "aaecd245ae626957fea435a7833f71acedeaa1a84a3434a469cfb379de848975d679aa036a538ea69a096d530ac9016b4266ea970d47eb2e3558e0377db4d168"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/es-MX/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/es-MX/firefox-77.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha512 = "87dcfd61c3e02515f772e02b182fdd465d34c79dea55d5fc125ad6f32e504c22aa3d7cc6f23a7b2905dc4f2fb73106ecd7c662758d218349fd6419ab889a98f4"; + sha512 = "8682de5d41e72376129cef7b23327bb67e003adc99877d340d52c1e8065a4155f72e8ea297f6d75072476a7107ff88cba7dbd2e198c8ff71d8bba86a409df215"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/et/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/et/firefox-77.0b6.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha512 = "81221fd364e6ba5e6300e93402dc727f9640b73015060d5a3fcb3d0d60f8fd031bcad94c9a5b35157bdb0ee2671fb2020656916fa2f5218d6e5cc1745d47629e"; + sha512 = "5919ccd61c93fccc7cc2cea49c1c297d4cf763266e92d6962b0ce6db8ac74dc00c6306f43978cf6f84b9a41d12be24e0f4104916e0f9b140309158b50d342dcb"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/eu/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/eu/firefox-77.0b6.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha512 = "58b0849c7df2d8d4cd5bc1e076728678b85adadcd504978356e6ac2810a4b1b9d2318e2ad9e056fd9598d3ddc829c16a1ab89102a11d17a8742021d9c8b5e293"; + sha512 = "bb4f98fb9f3311634b26d841aef405959a2035cb90562385c2a7ed4676f8d7a394884cc6b8008c7669cd9d11777e5c9b85f12b20a8abae732012498daea59715"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/fa/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/fa/firefox-77.0b6.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha512 = "9f8db5e7054f377e4672333c3f775dbec755e6096660d1d642080bd5e9bcd0c8d50a05bcc92bbb357555f60f8aceb21fbffacb019f8b3c901b1390ff3dcee034"; + sha512 = "b413cbffa2c03d511b115b48939c48657fd7bf40f7564bbb2930dd2e29a116e298d44626f5fa244dcf5912c391d1255091c74dece41480bdc691e1bb81ecb2dd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ff/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/ff/firefox-77.0b6.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha512 = "4fcad8469fc5c742e4b4c4dc838da969ec3ee4af5c8c856aeb2afce85e2de7927713acc1ab9c422814d51c1114917e131af7c1a9efb6b91b1e68a5c5b36a3c92"; + sha512 = "f88f87041976109f0e56c3dd7ff526c268cb3465ebb48476b46a7d0490bf7e5d607d51bbc6d43baa8de0e8576bb9c9ecad9d43e494e1b210423421cc6dea0c48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/fi/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/fi/firefox-77.0b6.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha512 = "a86ca2d70706f2c3aa8601372986525eddd8a268e47fdc7613223cc322fbfae68b86e8041c244366969cc1d5f09db7aa9c6cde9dccbd007fadcffc27b9310cc1"; + sha512 = "5e1eb153d76ae2c2e1d7a48c67de00bb5735896aebe979ad013e6b6f3ed9b3834eddd7a27f1196b1893715946b11b5fbe5f8d8e0be41bedb4fb7f77ae584109a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/fr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/fr/firefox-77.0b6.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha512 = "ec1c210cb0bafaaf14a6f8d79c81d2777d228ed31a7a4b1516227ce9c505574a2ad9a15bf72150439ddf32e5e2200f07471c92540d25bff31c6b9b3e123e8091"; + sha512 = "05a238d82d4af31a82c2a2318e04019e158a57bb96ae15075fab4ab86ea5e48e666942422d01468424f957c87ef5d0e033fde2655b6eb17c1d281793f4a1e2a5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/fy-NL/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/fy-NL/firefox-77.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha512 = "530c2e803501a91433401445badf6528ccb51b0459028c098d3708a33369e566f679702fbcb50190fc5236acc3aaf4ebb4acfabb529b86a47dceecedeea9e45b"; + sha512 = "6b8f569ef0c3c489909cea62a03a06f0d7ac7a1282a743941f0ce49a74730755710911e022452c78a461a9383573866a0b196c6c7eafc49a208cf4d26378474f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ga-IE/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/ga-IE/firefox-77.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha512 = "a81f82c5b4623afc3344eeded3d786f4e666627fbd40f64390dc21b728452cdca9f3510e21572d62e550c4e3b9230503eb771b615c3d4ef77e1a0211d79a5f08"; + sha512 = "c86f575e6a9235a6bf0fe152e698fcaae9ef34f35df2117f751b30f024f8a3dc01488102fd728f53417e9fb2aad97ee64837c9a3230ae351a81594ba5b87fcc9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/gd/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/gd/firefox-77.0b6.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha512 = "633b05aed902b9a655d22f45e5cb62d8978596e4d9b63f403a3f7f2a7db63b0dd2b9a1e5a82f7c9f5e8231edd15eda1ede415a80d9debfb96fc98058ed48472c"; + sha512 = "b5d84d2bdc14ae327ee66d3fdd7e3af18a5fbb1b8a6ab78210a6ced26170de736c31ee7b082f3d1d3e5506f534a70da979537ddb796b9dae6a108ddf762443c5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/gl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/gl/firefox-77.0b6.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha512 = "052141759e0bfebedc42a7c9209b122e4ef4bb15f83ea42b8559d7b2894544e26167a6935e854541082a60dde2b301e17f2fd3a5c659642f6a4c83828ea55273"; + sha512 = "59264bddbcf9249e92e438376204c335ce258182803c6174edc35a8454519b594c1bedb2f80d749e6ea6c45163746ef1ddef9f83203f2f601cdfaa671fedab45"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/gn/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/gn/firefox-77.0b6.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha512 = "74977e4afb2d61c01834cc63f0d4440012752254ee475f28e80d33c63148b7c43520e141f043d90e611be4268da89103ec6432af8beb96ae243b8acdf4f4e934"; + sha512 = "58ed98592e86d25703283da1cbf5f6e8a4b305fbdd56999d6bf0d513c936c72a0a4c65d9c999b91f3b96e0bfefbf2c4efbf4acc75bda59eeae28050b30632fea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/gu-IN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/gu-IN/firefox-77.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha512 = "bbe4e976026c98c7f32b83941841c3da8992495122e96954d550fc8263e989539372f120d8b359423ae9fce043e79421c096d8dbdea921ac7bea8133485ad62b"; + sha512 = "ac7ed1e434170a59b89b94f769f9cdd49603bab9efc69c416e5ad908b8cc295ca51985f4626e550f5194ef9c009c33552d5835acea51bfab538676e0ef020a6e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/he/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/he/firefox-77.0b6.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha512 = "cd7b957a983efe5cf9c4760f0dbfe35a06e6a7dd01702d94474eccc19b91fe136a3c14c5eb5d5a1dccbf02bece9535f059179afce15c42567a918c40cceba1aa"; + sha512 = "6e737714528f33ee2583bcc37c483005cb9ee7bfbca42af20d0339f7e0fa7723ea1f0c7a028cc014b40c0d793acc7a1e54884c928d2b570fa3e36833573f6310"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/hi-IN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/hi-IN/firefox-77.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha512 = "0a12a9cadbaaab40db835e5986d9211527d175a4724207af1e3ec6a22879a16054f4e9d7d5deb2c428f0b59b72b6f2d2d1c2d8ea5aaf10e20c0f4be1aaebc174"; + sha512 = "4295d972a080e3d9ba81419c70189ec1df1111f1739eef1aae1badad99b9424cdd8c4be87f6116f15267a5907d3e5bbeb3ca87582629f15bd3ca7ea919bb5950"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/hr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/hr/firefox-77.0b6.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha512 = "0d219e5bea0ac4d75fd7b6d1ec2819e6bae95ebdb6766a09e34eeae2f8de3a330b58f6292c3a00e9d1b255e8286858db39ecbffdedf7af588ef393bfc7cddb02"; + sha512 = "0434a805abe9e4df2c159d2ab22a969cee2ea91a1af34be97327115ab8c9202b75f558484e28f03008369e3ce68b26ff42009bcd3532c70352a58714af6588be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/hsb/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/hsb/firefox-77.0b6.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha512 = "ee2325e90ff0e3fa5128e9a13938afa532fedc7565cb9d26c016a37227dd9417bb78eca928c9c33bd2526cca0b2c3a6f469a76ac5d7685755aac29f06ef6c506"; + sha512 = "6440f678be4f449c32dc0e6ff5519c86d43b8f5f0bfce2651ad9e23b68fa2fab19905717cc3d0ec1d90e538040a7ac8a86327febf52526527ccf84418adb95fd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/hu/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/hu/firefox-77.0b6.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha512 = "df602af7bc01521ff5c37876db7deb0d25414cdeabf34346c7cdf61e9083a12784ff94ee647fb75fcc9bb33e7458371b137cf3400b4d07dad4064b32a7cab11c"; + sha512 = "5aae3cccccd3a3b99613bcc6d5fca10e30a5dc3995d4b3c912a76e928754f9ce0364bf310f46231c9434f8f14cebadeb7fcee0627ff1201d06b18135e2efd8ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/hy-AM/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/hy-AM/firefox-77.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha512 = "774ed56ff51c7ea363c81fc11dddf8e6d54fa7242d9c7dcfc6cc3678dfe032cbd70ca93f014299690ff461da6c8013b946fa9ed170ca755a33fb95a85eb726f4"; + sha512 = "66f34660e5f40a2259af2715ac2c98a6909557fb61fd9fe6be65a920ee0545bb6bad4c2a84b63c3cd6db79b72412a52da0ac8c79bcceb06d4ea12f6490810dd7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ia/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/ia/firefox-77.0b6.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha512 = "c2513985cd2d6f1d874eb4f28eee05f7f42e639f8dcbc4d2a39d331507cf6681dbaae35e400a1f8e876598e8a633d67cd51b133391db30e36db46f65ede1cca2"; + sha512 = "336f47492e85de44d423d398acada00ea04f43bda923a0cf9dc213fdac84641684624b01187a6ba335926edda91d33cfc1d8613139a82da0370e56d796828433"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/id/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/id/firefox-77.0b6.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha512 = "3bcad2477cfc42e2f01f5ef1bf3e907f80d96649fb5b2f143f58f6478939694fdfbab33bcd35b1f95023ad39ff807cf532faf43e1dac8aa66ca1e8d95c44ebbe"; + sha512 = "ea770b56f3459169e8b53de3fb2e1e028112346d706657dcc3e5ec8129ca3f51168dd39abaf5312732a1c5c12d948f10ba4a66398062e502f977fa35e335a028"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/is/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/is/firefox-77.0b6.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha512 = "f01ce9358446ed8ed4b01297fc175e2fc36804262905f2d5e6732827ffcccf2897d5daaa6464a4ca146fe46d9a1487164de3febb6a222343277cb26492e5a787"; + sha512 = "1bc364cf352d2330503c5ef4d461a09ed86ea40b2bfb3c0988d00ea7d93d543e32004fe4505926b037c7e891a0a9d99240b4d782d8c5aaa4d5b88ba9f0286f59"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/it/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/it/firefox-77.0b6.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha512 = "52f23996de3c4cd409cff547348757f48e421555c965a58dc43fa82c99b51260b1ec24a97a04b046f29455955d62bc28a41d67d8087e23b9c490032cc28402c4"; + sha512 = "f5c2b875393965c0b9ba086b41e276ebdbf45c3d895b6fcbcf934ccac00a53ce0239199e044d5713eb001dff8ebee9178f1cddbc387bf2a7083c68e6077ee5f2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ja/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/ja/firefox-77.0b6.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha512 = "490a950113acbc895226749335d8fbda813708ed916fb79719c0980920401871c632150bd2d88749cffd26bc7d3e7352b6706f379b37d11df6a8519d6a6642e4"; + sha512 = "4e564c984f6626061513c49264d400c730cae88d85463908ca08da2a2a688a1c9d104a0c43d4c95705db67f5d9e6fcd95b6eaea082fdb76a7eb74acec3d6b57f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ka/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/ka/firefox-77.0b6.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha512 = "12191f6adf723389595e7b9b3ff1ae20c3873b511a021205046c51f29e960db1faf45e74c055edfeaee506e6c8dcdadca7967da4b4421f892a88bc337c6b5046"; + sha512 = "26066038606c37502a9c069854feb84d08c13471fbea50ab1ef78d6dfd216bd981e6570bc954c86c23aa98a421afcec73d3e28fc3df45aa7fe5e413d35e4ea6c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/kab/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/kab/firefox-77.0b6.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha512 = "a21ab0cff70609b3aebc28ce34ab2e6404b53638135667c330915491d8cb5c5ed7f292385e118e03e1bf2b4cfd197ad114f98b41371f5641c02d8372a7682286"; + sha512 = "c5c66a3dea672364f3071095d8852e1e1721bb4bfe9bd7f10074ffd34ee3babc3d2fe447c8b006c3814fe4f2a3b1461d4da6e8ead7a7ba30d44aa7a8c49fc824"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/kk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/kk/firefox-77.0b6.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha512 = "93b2d1d091f9c14619d575eab5fa41ebe5a36f3278fa537f8143bd9fade793859d2d94e14d809e82fe037ecf2a05d0f84ef49c70970d00274d51beb2bc14fdc2"; + sha512 = "ed39b41fa881b9dfdfadb75337fe401f60b39168ae67e438a37246ca773b2eb20ea898e2e09c211319e0d93eca26944c7b54e42e9d9851aeca813c725a93299c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/km/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/km/firefox-77.0b6.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha512 = "184185ab33f3d73ea0a5f38b5e9931201ce3018e5060b72b0344211d11f8ebe9ee685e77c2160ce58a60b61e1377ba28f4bbdc2732f0a3ccef2190ce55072065"; + sha512 = "3ed03e8abcda61c48e13ae70c92196bb422bb9c06dc88045d550379adf8a9e99a03d43afe041aa18bbe6bc9d214c83ff53fe5e90e03f8da72afc7ea8982652ee"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/kn/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/kn/firefox-77.0b6.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha512 = "b0917c696844114ccfeb854d13e75d48038404e1221b13629dcd981b1272f7765cfc85a0843d85957a1f3ead2a98288ae28739da47d1186b762058213681eae3"; + sha512 = "d602152e38626e59053691aadbc972d4c33ef3b68914231f4754273332c19ed206f7358054d8c0000767435d56d4d8723c42ada7ca1ccc29622e9acb90e3c78e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ko/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/ko/firefox-77.0b6.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha512 = "4ce9e202f6d794585294d6bf664c999b88674d74d2b085109ad48f7f16737e26c89980c76e9d6ab34800e841bce9074fdde6c574b228116056922799369fa04e"; + sha512 = "de65ba5d5ac7eb34aac72dccad66734b983ca7c22f6e71c9fd3dd2577ba595842111922b3ae76379de31edc1dfaf98ae8b7cf6c3f53baaa38d06edeacc21d17a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/lij/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/lij/firefox-77.0b6.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha512 = "3138f5abddc0f49355c768fa84ec475bb3c013fad94bb4c87a2eae616b590244339236b112f03fe16dfd0b10ccb6d106cc1db0f73a5eb95df7e0dab9a247b496"; + sha512 = "a0a5e3ca1f3227fb583f5819329c84fd4010c1c4df003ad1eb4d7ff6cc5f8434893ccd11d41dfa26e79fae361b225ede07a134d93db79da1754e86715f448063"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/lt/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/lt/firefox-77.0b6.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha512 = "7080f9e7838c5ac076bcfd0e1192f1435b623c81144f53b1ee935aaa07c941ca8afb0cf399f161496bce02052d069033f6990bc9da16a1ab23f228417935d8ed"; + sha512 = "894863c47261e84cc394ccdf25aaf86ca74642cc020e285f50d78366cf4588b74ec982df7cafb1e9117b042b39fb4ead4ac7b3b79023f89d56e5e172a78a66b1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/lv/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/lv/firefox-77.0b6.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha512 = "c058a8c6b4ea8c48991ecba72cc4c5645410da2d9a8ef9175475fbe906f5bbb2fe82f2c4bcdd86aed73cc75aaa0fd5a2e00a6a780f394b843ce075fdd031f8be"; + sha512 = "44c3bfae1788f0244ca86ccdc3c76c5d0b41f7137f8b1e4c4c9b618af23c21dc2371f7f0ca3ec56ccf174d2fb4145bb89a468a691c7c38609d7825eb1849b7ad"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/mk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/mk/firefox-77.0b6.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha512 = "f64a6373a56c7ee37ccca43708ab33b3e001b477d2ce25870553eb96fd3c42f20206171f46c93513cb328203c4454461d808b6f888260b0c2df76450ba676fb8"; + sha512 = "abb2dface2e64fb60a052da92fa00121024b6e83c94ffc9565ced4245d0e703a517362e023e6b4cca910801e250adf9892d9c9afaa57a765fcf896ab9d043b0d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/mr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/mr/firefox-77.0b6.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha512 = "14f58b3f59e68b9692a6fc562888e7868becf95b53aa6be0de0d3ba6c883cfde4b56496fe017b5e6e38a89b0248794408402657a34a0db45eecae74d9ce7f9ef"; + sha512 = "ed98c83187ef20f2f7186119f5d046a71c3dece20be333a145632518def902ba15ca63e45e54cd24f3160030a4208f1873b17a492488050d2c4584c1fc611494"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ms/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/ms/firefox-77.0b6.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha512 = "238d2c63d4ffe36db493ef153c30a6e4b33e1403e456d2c02275786d3c13c8b2e0467a80916cb08f4676ed68c94b2127ee9876614909e4bece2577609f027ef3"; + sha512 = "18c2ff7208f9010185853c51a1d6a7915ff73e7dedd64c943be9c99cb8bba32a7f34be1e3a1fcfc32edb8f8f3a5c4922a4b70de1d6b74303f6e54f139303d29b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/my/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/my/firefox-77.0b6.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha512 = "843d4d67ed852b2d0f54dee78cbe3e27ef052537270357e71f3ee0643904c2d370d5e0d25cc2e1dcc150d5f999f2841b963df41c7a98493a5101132dc6ef9a77"; + sha512 = "9069b46c4fd4eb00a8e4ffc15fddd84f4ae4da4521856333dc7477febdd01ba400f27e935adf7eaab6a685a329b866ffb1e6d702d65730040b88896c6f7530ae"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/nb-NO/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/nb-NO/firefox-77.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha512 = "e8eff86060d9f6bc6fd0f13c6f1840c77b9282f8be07177cd6ffd5472ded9b55c3d4e7641a67c655c94fd72a21a100648ff1ccbdcf90b5e7543ac1ffeb604dae"; + sha512 = "ba7b7c4d653f0e33b2b258062783fa8e4c981b9a164b25e19ed1f2c03b180decee989b43840cc5a9deb0a3af50c3b79ed277ec9e71e883cf5273425f484ca7be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ne-NP/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/ne-NP/firefox-77.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha512 = "bb62e672ea5aabe57ab78dd37081922a67ea6471558c8a412bc5f6718b88439afb87debd23bc8e8076b7f0ca20083b79745ab0e85cfedbed024d82fee7a79986"; + sha512 = "e51ebc1e4b272f1125c68c3f22229790c1f792fb2b1a956c4237e9b54fad01b322abf86e208fa4ffcca312582bdc3c6b35aefca22485fdd2d07fe49023c1d00c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/nl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/nl/firefox-77.0b6.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha512 = "9e0ffb62fc391ffc0bee82e67c26fd24f22be3c9ab0d14d929cc0ddaaced27facebe49b55bbcb53dad9e27466d22a4edbcc1358cf38c4beb1f846278574fcf76"; + sha512 = "c5c90f846f85c734586aacf0351e7e3eb59d490dad964cd48a4347b462669618b5fb544b639808f2e37cefff8d290cc86b42d9061d9f08f05e416bd9110a4503"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/nn-NO/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/nn-NO/firefox-77.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha512 = "ea71229a06a26c13d436662336e5a9b52b290c2094561c3626bdda069930c3a5b4dd61a25f76d147fb152eaefa07fd1e032b7a739b5a2038a2c4360827322144"; + sha512 = "2d696e76864c082ed22a0ae57a018df16e1228d67d309bfc604603012b6606d3824c4a310dda7f7191c2228d0c90b2fb5835d7181df274d4d9dc923d30764b2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/oc/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/oc/firefox-77.0b6.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha512 = "f0ca79deb5450984e1f70bafddb2002f81adba022ffd2ae9c68c009fa559253f47a5fd66bb232afc5ed685721c78d7c81335e4e5e898e4a469019f98330bc602"; + sha512 = "5ede6791b2cef867ddd57bdeadba8539445aee3ee3961598817749844b9a2e530f31717f4f99ca351a65fe257f123fb5afb7cd779aaf2fff1850f21448eb9b0f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/pa-IN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/pa-IN/firefox-77.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha512 = "6e730c323889c7d889bac2cf7d4d2fe13347c4c9ed6251ce9e3f3825e99248c896740ee24557e9238e8fe4f5b29702f6344ba4a3210279a6e6432ab94774d990"; + sha512 = "3517dcbbbf072f8d13b785b00e26835f78878f1b3cbe53ba94293f08710821b54625e9b4ae7530b484b7959608a1b5edbe6f0a65833d36e5a096e289292596f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/pl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/pl/firefox-77.0b6.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha512 = "e48f82f35d338852abe3ddb1abcd1c06c5d401f464bed702b7b649fe29e1a8a3ae25f4a2d0b4d30615340021cc71784777eed114b1dde4a34928159b8d616ed9"; + sha512 = "69ad2f8d573f882f6db512a8c9cd9df65c70c12cf3d9ba77085596462a110f638c16e96892711b1e47ecbe4949236bd9c3a9f9e36a7d9879b64438d590e751f4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/pt-BR/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/pt-BR/firefox-77.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha512 = "cd84947d36f334740d2bc590ceaf8b052ef90c7b261712eef9c85580ee9d703e0b362ddd5d51ae24ae7bf56e2bddaf32f36081df2717e673c016ec91874f6b53"; + sha512 = "cc43ea037b9b72ae41a5ec2113954698d4c1e255232e5acddc2340d3d6adadf9d63fbdd623b037508b0848847df5c6c3f4cfc9ef03a5a597d54e83a6255ffef0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/pt-PT/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/pt-PT/firefox-77.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha512 = "6c59d46bb4b740098ec69c7a573233cf871d88ec1f9a9ecfbbf5f38a4ec1977cc7d8c7b9a6ed78dde2a795d6d078a2e505646704e91ad37b09fff564585b170d"; + sha512 = "646da74a56eaa5cacacb7f9d4628dd54e8040a06a3fbbc0cdb759ea2c3e9c26ade0148ce00cf3a4c6359c6e1fc4cb0761b123a0465bb8684f63507285a7df109"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/rm/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/rm/firefox-77.0b6.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha512 = "f700e667bb8bec958501dffb33bba8cffd4bbb84cdcc9f00ddee78d43676db9afddbdf6a3d9b2ab9e58c10d2b1a2727c47224e6e824f36bcf018f7bf53b45b43"; + sha512 = "bb53b3f1059c7a30e9dae4041c6a265a91cae56bb976d8b6549a5daffebb1448ef5bd24f0ce2c65da3808265121288a3b4147f657c35436eb975864cbe534587"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ro/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/ro/firefox-77.0b6.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha512 = "e40a8935b7ad0b0656783023c622dc357921eda21583b1ed46c85a7ad2de8972167196764e98f75ee0c15ef046ebf09c99a2fa4613106c5302de8a9ce6429b97"; + sha512 = "c2a6cc5f8a33fd2f1b2c5100fa50d170034c0dd9422c01894a8977b248ccc43a24bb6d8c64cfe6e9a82020c78ba5dce7d497c6679cbd81a72ee106221d328fd1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ru/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/ru/firefox-77.0b6.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha512 = "780f5df88cd75c306e725a48aaeae2b45ab5b30342ad74f5ce521f10dcf6b96affc92693fbc0dd1e95c927a21ec26e2fb9cfc74774040656459f2a7477520d61"; + sha512 = "10707d81c98c9376acadcd5be8b762d464b5250e477a71cda3abf670302afa7c2fd64a7b2527702c7501ee25a7e1d534877286ce1622bf99bd7f045c99576b2f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/si/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/si/firefox-77.0b6.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha512 = "59a20ec7a102830976fefad4f87fa4a59ce723541b069204c03728e4c7f19cddfd74e604844da72969439542bb67e404cf5d6a649372f85250cba4fb8fb42d7c"; + sha512 = "2dc44794aabc939f525b4ba91ec9caf53b7a4dab4b6765784774d40f47f54b3795412dcbb21bd20b8f72093c797709daa15ece01554f7f425bb7a1a290dc0c10"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/sk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/sk/firefox-77.0b6.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha512 = "56c540f1a5d46f7e67cfcf8c6197febb7e7c4761bdbd0d4250a0c79671f84ff87c3f146f549c8dab85392c7ee94d59a4fa2101d5d8b9c7379b0f39a24d37b5e8"; + sha512 = "7a2ae01b61043a00995dd987892a38117a0252d1e8a133fa14057aeddc99a26197fdd47ce7793b4d20f3e015cdbc9278818778e8e7c5273748f102de724a7faf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/sl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/sl/firefox-77.0b6.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha512 = "af3c4e96ca34c177fdfad0203daf1a85819e731b4137bd7685ca95d33583a04fbaf54097777c571fdc0ffafc4748f57b683cdf6773177ceef1e6ffe764f780ed"; + sha512 = "d2cd03f1c35a4e3c4b937a5c77929a7e66b8113354488efc7e4ddbd24b0c08e48afe3f99e20e5e96a941bce0ca5185bbf199415d4334c120ffba5b6181782f14"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/son/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/son/firefox-77.0b6.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha512 = "045767b189c1f8ba26bfbec61f841ae2c66c7e1b35569edb26ddbfc9169e1cb6122237d83808a87e3bb3ce4a6b1f080a9bd77bd6f8d7f731a87a894a559cab1d"; + sha512 = "3ac7346e38278b4a36871833c67ef5f59c681d2e05999fe8282abf5c19ee6ee7cae099870353bf58a615497d887c54ab3fa34489fd3e5642f26d4c306698547c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/sq/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/sq/firefox-77.0b6.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha512 = "4126eedaa46dca25e491e74ad788af4ded93127061219dade8be09cd18d807b4df549178c4e1d525ba1530ddd50dc4c6e35586e7762f550cc0381bb7d9c2d7ed"; + sha512 = "4c09eeb7a3f5d41fcc6b828d11e3aaecb41d9002cd48226f2b4bd5e7eeb72969e3b52e196d18b53be8f4ebe0af3fda9e569e2ddfd4116958ae30e9db81e0ada6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/sr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/sr/firefox-77.0b6.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha512 = "60ef4c3830baf02481d7371d4a55ad8da7b7cb059c1e7171b3aca0be159baeb287b2aeac15e0ef0936f452a12c8e6d2570f50a846af7b87f5d8e1779fcf8c8b6"; + sha512 = "30cf682895a49c7a8445928b553d1fee52e6ac6a69fd0e52d83bc48e08cc78eecb49533943a7b3f8d8be70c9b210756b5ffd0698683edc44097f87294624401e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/sv-SE/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/sv-SE/firefox-77.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha512 = "354e699c53e9b9e0a803824a4f5d00fc991adc3822a21f5842a1268e6d028c89951c943aa2461402d39b7345487bf74c73bcf1cb49ea2acbce5a24a49ace8b9c"; + sha512 = "f19635495ba442b6ee73d951962fce2166227978c7c3d2c27480b3654915525313a711c31402fadd93d6441c7ecc74e44f1d5bab85e05bc73a98060c216f8261"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ta/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/ta/firefox-77.0b6.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha512 = "ada3a7ee976f82841096b9cd80fc1af79000833cf65971b3c141f70cb9ede5a523c6e7e8f6be36d6a175c7b1e8415f95a84553d21b35bed90bf1865861ed9d19"; + sha512 = "5fe8e924435a8e6cb997b63204464bee269e07e3c554f60e8679c69d8dbe3153713ab3f815d2b9dbf504dfe2511122bb301f08d43123938d65ee9581691ff11e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/te/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/te/firefox-77.0b6.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha512 = "ec9d5f601856bdedfa4f005692911e4e9a5afc88d8c0a5551e507ccebe28f2280b2ee3f842df5255e1cca5b1e35308354827d8c6006c593366a08e917622366c"; + sha512 = "e2a5e369647e057a91573e156d48973663e648efe85588c78d9c596a58c32bbf58fd3e9cc2629d4ee585539eb2bf009cbdf046741ac9c54126c7a39a8b2fa5ed"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/th/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/th/firefox-77.0b6.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha512 = "e939d4888cb59e0a1f066c641c213bdf33ad56c60e73eb7b97983026249b223f2465703bf8df931b6b844ced18a8703b77310ac61c847be054eb83b8196dea6e"; + sha512 = "60e8f03f36370874264cd6f5ae893d1c1551cbbe440405c6a8a08ea1f56c350ccee64c4b2232f977e280c2d89d8a96916ddcec7a26cdc88f8015815484a5c9e7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/tl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/tl/firefox-77.0b6.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha512 = "4f269b9ce6f25e236f00374e68438d09cb30107babbe3fcaf88312b7abdcf8d4a5b619860e3e4010f367b341646cc9de027ee094f175cb144a00bef47f427806"; + sha512 = "8f97422c00f61bfc5ec2c3d1ddd43da137dad7eebb8c122d06e6341e1e0296434224235322e72e6c190ea62bb71d10fc0ffc40a2fa795962c185f6e1a0a727fc"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/tr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/tr/firefox-77.0b6.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha512 = "9275209304112ead1c200f9f62386de665922bedfe8501f5975a7598a6ab19ec6941fa61cec4904fabf75d76c42105f7abcf86d91c746b609bcbc6957b8c40b5"; + sha512 = "5f356c44a8a834873cf7f81bade31540e14df73741f6a12ff5d730d7efec7138cab3da86021f4b6da7201ec93df638d2ea0c7c98c5ffc96b750b4a01012ab153"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/trs/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/trs/firefox-77.0b6.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha512 = "4b06342ca02d40b6bf9de58e50d29ff2ffd3ffba60e79b6aafc7e59a1ff8bc28e1d32ef6fed7ab5d90d5224fb98ea11aee57c758938ae84015c52202be97a300"; + sha512 = "367d8efa0844df1775058a1ab6ccb90e0d16114cbcf7e09441e92f7d1f46313f815277b205589a5a117083d1feb371dcac153251e21f06d16ad9dc094f9548b3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/uk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/uk/firefox-77.0b6.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha512 = "02189417dac9ad1371fedf3a2909d3a1cb612566d653255a58402dd79656a56fdd859b23aa7b9872a928d2ac088e96bc9d24d97504ac183d6e3c7baec8c072a2"; + sha512 = "c26ec2172739c98ad6af7d2e4cf09665dc510ee63d3dabad29f424ced5ead94d32590f5e03f15341551f97d90a45eeaca00430adc4e025ad7c5623d1366dc053"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/ur/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/ur/firefox-77.0b6.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha512 = "6a629c7c06883c0cb3d62f69d996c6778a0929802bfa086fded6f7b5d3572e615f6280a68b3343c43a111c02ff6b18f77ed411029ce9c6084c98f418f9cf5fa9"; + sha512 = "832de71b4ae0165670d1bccef2097fae42e7d89fcefb2ea530438ef4a272050fcf5c04baf2a2fc9269b9fa787030db2020f1055db1ebb2fb8b0669162df7ef45"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/uz/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/uz/firefox-77.0b6.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha512 = "f890c9c046244c476250ec89821f5de5a2e0a2acf12be2ece12b192276163dd9c86c046e8d22280592fc0b22e799b3681a3138a624564f45e3ce3e17dab20119"; + sha512 = "80846a4c808d61d99791da0149094c17dffec21ba4062148d69c635908042271979b0533bbbc140922e5a20513fa0bac17d84b40200159ac37ad1f12c9069733"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/vi/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/vi/firefox-77.0b6.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha512 = "360cb88f79705ac8b6e50a52ef23b10923a15c952795f1bc885cff09d99e23f200b7e67ca8637fad0447abfdb07ee9526f26ffbc424cc6c9bda399da0e4ef0b6"; + sha512 = "ff11a27d6bef77de0af477b6f00873ca32f69ed8cfcfa05be2a09c1176e562fabd210d46aade91c82f5b05c95ee5148179b9c3d244ebdc304c54688a601c17a0"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/xh/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/xh/firefox-77.0b6.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha512 = "03cf616b1bcf80c2dda6a6eba15f28b9e5c8741aa37c383c3b16b6f1ddc834d51fd144ce3484709335e06119769bc021da6d1006cb385929451d6db1f1480a4e"; + sha512 = "dae063be0338c64b8374bf5f3b1477c6b490cb407c39cbe3858d78328344608d0257792361bcf319585aa34f826e80ef96c471876912f7550f7abd2787dd6ec7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/zh-CN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/zh-CN/firefox-77.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha512 = "de16b1013dba1726a146c3212310da5e51f6dc706ae1e5fbda60e1181ab19510a485908bad50b6a4d87ed1e56027627777bb005bfc2a5e104df9f7d1e95cd7db"; + sha512 = "b1d3609a01c8af6da1feb6f9fd50068a5edd0091b7540100743adc6ae61e79f7bbee8ee2d3a49a1f6ad4ad464b03b814de4673eda88061077101ee0bfa0c7b38"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-x86_64/zh-TW/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-x86_64/zh-TW/firefox-77.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha512 = "15826e8a03c1c0496a7d9ffcec580f283b789c594f6dfa64de2ac8bc86398d2cd267a84a274a94063d980cbf984741f1754c644451dcb1e56d06c1c8393d1294"; + sha512 = "3e90568d7c33866845b607c739a17d86e263520ce839792c655d323690d005395de65aa2463fe0d94f7192045a8b6c268ad668679d46fbcc0137962405fffb9c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ach/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/ach/firefox-77.0b6.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha512 = "619cef2ed7c9a8fa67723548aa826926f0dbe34996a1c6132571173a15c15dc7a8f9165296f4a94e1b8beebf67cdf79c388fdc898a013cf25985b4fdb4a5c200"; + sha512 = "55c69f623fabdcdf4a329c90b3057d9afdc9702ca7b068cf8ef830359c20360355057b73ce9b06257400add540fea792de931ec61e79999e82fe565b85b7f13f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/af/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/af/firefox-77.0b6.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha512 = "3815642e4bab2ffeab6208d9c6901c80c89a42dc8453a97ff288da7847f033402bd48c0eba8a8e62f0c696fba75f95e7dc9795089894e99c70306cf4e40d37fc"; + sha512 = "5cf97e176a3430707c20f8ae112eafa2f2e12edb5a87711b4a0b9767a0877df5978f9a82403931f3c9db0c99b3a156e2ab397b6fb767bc073d3737658c378b38"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/an/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/an/firefox-77.0b6.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha512 = "b6a740e7273be146958a99a5a4e16f7c1c7e21b8df76d22473c6ca16e510d7f37fd9fdcb672c2d6ad29aa354a20ee3a7c5a9aaa03b9332ea3f5b460e7d271565"; + sha512 = "f0bff20c46498775b8b3e5457cda3fd3923d4915b8036c4804ec57216f171057f976663441dba9600d453874a462c3c0862b401af5488a487173049c4cd8c6b1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ar/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/ar/firefox-77.0b6.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha512 = "e3fab302b21d5f6de8b41faec14cfd842def6f2a65259cd8d5b0b481fca33bece3e7fa4610c60013153b676dc9e53d790734d27837e4701b393e322c5eb0f602"; + sha512 = "629527a55abc13a3a90269cac9cc589911788026e8a0592c52ac37bcbcc470099fd09f2243c70db6d016ed33fd90c9f8c3875488b3b7b1958a18f6fe4cd1aaaf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ast/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/ast/firefox-77.0b6.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha512 = "28f62c0a906283c1ebfd47e598918349c066c33512d3fff2daa44885faadbfa8b00309254b754d758d86acf23bd4ebde9142e56302c23ffcdbbe2baac6fd6e47"; + sha512 = "e202db24fbaf57ed0f617b906128dbc668167bf389fb7df1282f620c50e7c2b089e804b9be69fe14c07b0edf92ad1b3db1ba01c7ffea76158661b509da3b22e8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/az/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/az/firefox-77.0b6.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha512 = "c9e00425a869501867f20b22c85e72dce9798437ee8afe718eb21c06acadd9d618d614e25463f84d0a31901261d92603374f9b2b91879e19973d50942ae6774a"; + sha512 = "2f6c0a261924556caa90f57a43fb36eab585288e78b56687836e151c0bbb1d8e2d7cd66c8034055293f44a29c939254f9d67097498a73c125460d814dbb88857"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/be/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/be/firefox-77.0b6.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha512 = "58811c55d4a5f41e3ef8b378c00a9a08adfbb48294eb20c32dbaffd972e1df1ae55191a8ad5c4705002f07d3b7d3eda90ec759b805995c14c29fdb8707517378"; + sha512 = "cd22c3525b21b467900b09d9dfd45aa9caa7bbaaf5bbacbe30d83676536f2960e60f81c09d6acff953e570f1608081fb109daa94dec294f6d5456dc86ad1107b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/bg/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/bg/firefox-77.0b6.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha512 = "428b34c8dd2c926dbbbd2a8ccd72ea7f023e5fb0e9cb664810d29df1008ab744eeefdd34f6f6de1596f3fd7da9d2e3b23d5c216c8a9ac94b96aefe5fe987828e"; + sha512 = "d2ba7879dfaac25c82a2da9511c56cac309994860b46f4c45289c254d34287682d1f586abafd2a62de7b31744fa2b7a1931c4a78e558ea0cfd1883fe620cd76e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/bn/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/bn/firefox-77.0b6.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha512 = "5f1d54165939ef8448a5abb734f8bb914626964493e9ace1a483f5d6003c0fb087e6cc1d76afdc15c1fe563ec64f022233204be92a5705d8456a6cf75219cb4a"; + sha512 = "5db7b7abf5a036dc11dbbd4144562bed1bcfa3770aa8e59ed1c4f87cd6c3a1ed9602121d83d38af5fd44cd3adebf3689f1bbb9e530c55f0690c441f074afd126"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/br/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/br/firefox-77.0b6.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha512 = "4eed64845ca603e21de1e60632b7d75e4bff5a5a2af792131de4141a2454fc8922109f67c13c9cd97032e3cb2cfa4d5a0ca3cb3e64faf2754fe44d8a161c464e"; + sha512 = "468b47d3d8db1080fc3ead510eb72457ffbcf38c11ffb4f9131e2b33b84b7dbbeebf78545b15992b9dab4b70dc12e506a623e5d416559708b75f90ead4a38843"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/bs/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/bs/firefox-77.0b6.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha512 = "7525926461a5e89d4aad85bf3176ff36c39fa18131ead378ddce015688830051dcabb4eb3dd05922d84ea2fdb666dc8a2f8751c6bb3405b4c6e1f7a5241dcfed"; + sha512 = "e5334b61e7ae329ea7fe6d4548c2fcbc7dd6b8b3e4536abf0b416b3ed98f601310cb72d28abe922584842f8fc2ec310c80c6d0865a887b2ee74c5504edfc3de5"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ca-valencia/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/ca-valencia/firefox-77.0b6.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha512 = "3ccda6fade937406e9ad8c609e1cbecc2ebc064d0793e9facf3910569ad5f8997d8e9165a60d59de645d29bf1411a439904af504a5daf519774bcd76a371b567"; + sha512 = "56a051acbc2f579b0d788fbdc2f1a86b109af8ec55cfbf1050c2180f0111ddda3d95caa84bc31cab1392508b1a79433d369b093d669298b521740613b214fc1c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ca/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/ca/firefox-77.0b6.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha512 = "d1a6c8a42fb947547d460d8d244f0b091f609aa3590fab7a785a5a9aebffcbb96fd6254797b19ea3b0bacc8ba086db210ead35260cac69d980432fc0a7a7b9e1"; + sha512 = "f9c085915ff628a720f676ea7fde9bc5da800494fbeb049e529c1cef96edab0a37aa693c74f9751b187890ed6580e6f6a47bc73682d8028ffe9ab7bec1a6b8a7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/cak/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/cak/firefox-77.0b6.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha512 = "b0052bbd85357bf6bd3d550021013d3f97cde943be85c08835e9d51b829f9fa66fb3a34937f806552373bcce2f36d949ea872f0eae115e7b1d13382502fd2c3b"; + sha512 = "98d0af8773fed2b326df37536f953f42d8133c267a7af684cd60ba494510ed94e0cad851cafa7c006bc4ca11a53555f80c2510083e71b3850ab0e9cdf5213d69"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/cs/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/cs/firefox-77.0b6.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha512 = "8f8f91ee726b3526b0d375f6075e466781fae463e55f8e7140b859e4418466c3653a3a39ef69c5395393840e8d09188d1be503ef7ac9cd2f34bce7fb6fc8719d"; + sha512 = "c0d71a84a7ecdfc3a0c6438a00295ffb71b6c4ddecac585ded3f8881df80be493efd80cfa233e78ea043b6979121f6f46c87bfa25de5f1c518e6de1c6ce5a279"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/cy/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/cy/firefox-77.0b6.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha512 = "895f1e28b998d27c99ae8cfd8f6bdb94dc526d5dfe39d537e5ece92a76b8ea3a9905197c40967e7e90bed60567628dfb23219843dcb313bc65b8dc1300dca51d"; + sha512 = "864da121f9f79c6b4b6a7ec4c2aa19ef14e89aaf30ace3d67fc354e50baef1dc74733743ddfc013d946f2ef8e1f73d691d7e997df81462a13d48f090eb116d7d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/da/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/da/firefox-77.0b6.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha512 = "3b206e9d0b2fea0fc445617fce9c9908d0d4ca15e68ac04fbab74dbb7239c986de7f5e0a5ab601f25b3481a20eb9fe1f39aaa535ba24fd6e1c76fefe81e26474"; + sha512 = "1d10186f68c1df5f6f2a4380a9deca3869f8e9e5db1f142e4788596760f0ba59698a4fffe4a299fced513c6aaf289536f524beafc1a88a82d48f5d7fc7ee3ed6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/de/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/de/firefox-77.0b6.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha512 = "8a9293278b5a426aeb3f1da45fc5c8d8508297a81534c33ed3d032fcb0a0c67eb4cac72b591f4fed9b159934b1e3f84a6996f665ec7955f37b6acef78886ac3c"; + sha512 = "7fa69416bd4080127292764f24e0693691fb02358e81f0cddb00ba5f235a167d779d5ddd954ccf87072cadfeed956a698fd9f5223951c7f6352177e70b6fbd48"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/dsb/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/dsb/firefox-77.0b6.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha512 = "edc302624c544c455f1799b271b0c6590131f0e01e4cf1691fb8f6fa3b470ff9a5b4db301ca87ae97ede4482782d802e24233d20d84dc8adc2b18deb25b249e5"; + sha512 = "edd239169eae85f1615707e3a0f6367d0d893a0cc4d0666fc1bcaaf8899b9d467362c43552507be1e9c7bfffe278d6a6a534d64976927498381c54640e92f7b7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/el/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/el/firefox-77.0b6.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha512 = "98259fefb0d9a3ff9d5e80afe251cb001c767736887d6c342d857536a031d013442a271b3aeb1c227c789a5695e134b31a81777ca7d13249451bce4325bc9a8e"; + sha512 = "f3292cdbda00c7970a4e2d5341f12369fc70da6fdd153f1d5e2ed5c4f5b2c207b424856d5db9753b11b421bae3cf75a8cc9d248c3f3a73ada4d258dee7e55400"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/en-CA/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/en-CA/firefox-77.0b6.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha512 = "f0f8d81d0700d8539a9697001a9bdbfc75a36e3f4a1786d46e5dbdb77f61d69df10097040ea8e5aaf722b7eb578a58300c2feb32bc010443fdbd2e5eeef1eff5"; + sha512 = "daa9b2cb25056c80e0174b7fea98e3ace4141d4e3d45e30615961e1957076a764ee9b14d192477613fac5c9a7e14782e281b4ddd676db4813df89d99f6c7dd59"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/en-GB/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/en-GB/firefox-77.0b6.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha512 = "97994f92d574726cf0553378f3a0a90d32cf92b8810b33a4c422355ae5dd5ce7f411352f8f45311c24caea005b727a2886bc60589231608604f97dd684e5e3db"; + sha512 = "1d490b1b2686820ac1973be1c435bb058ddab815a372c3dd08e21c2196860d672264010d24e21bd3dc3678659bab9921d588fa42052eeb0f8f8806b5bf706885"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/en-US/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/en-US/firefox-77.0b6.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha512 = "8e212c9b394d887ec8a27e47fab45f15e4d179b82332605360a951fc4bed5693be1136bddd8821ecbd31aca926a1277cf9f1fdcd07e365ada5ad35e19c64e213"; + sha512 = "0c2dcb2b9e2c20f3ee78d08b68a57b9d8001c8b2b963c81cc03584d96f64a1c759d1bbb480f1aeb138c6bc636e042b49d4f46d9354587837714311bae6e195da"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/eo/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/eo/firefox-77.0b6.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha512 = "f8ef36d7d4cb44a170fe575d6bf94854549eb311422ea5c6ce9220f6852d76c7d1d9b65f8f959526b6d91e88b1dc34bff6f30d8534fe565574b78b045a652662"; + sha512 = "4e37cd43ec8f24187115a1545895b50a9f665dd2f36a76a35dcd673b07ae8918381b718dbf1ce7b52c469729c95452e6860cb6b815d7297717374f9e4010c2fd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/es-AR/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/es-AR/firefox-77.0b6.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha512 = "6a6a67453a7b48f635b2ec0b6fd34ded5d1624a375ff526ec1693affb77d7c503215d91a29c0a266228f2f1780f0f5e6b8ab215e810faa8eb5bed5a36c998975"; + sha512 = "fdf9db53605f6053351353d13f22a0b5803340f8dd3629b9dbad48afb6cfaf881dce7c2595472f94c3e293124cf9759626370e3b86dbb228f79040e235830ece"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/es-CL/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/es-CL/firefox-77.0b6.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha512 = "7755a4cd53704f28a137d8588a969475df4ae444e1a15591941cb409528deda93b45bcd4cc0d8a10321402f01ca8439db6ee0d634a1a50f964d824e61cdc789c"; + sha512 = "5003551dc6aa3e1addcfeeebfb5dc90c508acadc3dc0e285a2af4b2f546494d1053f9206bea2b0312e062008696a11eeb37c25a152d62a8d687f768e5fa0fd68"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/es-ES/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/es-ES/firefox-77.0b6.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha512 = "88b173d9b150f4973fb59d3bc51c3cb5f9e2580805310a73f2de993f6cb053c2c8a09d97c6979a7a501610d924a97ed6cd848325ba5142680c2e7e83ed026c37"; + sha512 = "6a1153f8348632b4dbe33d7177f2bfdf31dc8a4000fb0a5103ab85801bd91d8a267a5ca8492e01aad521aa913a99a9088883408b56c52e5d20d4c2f225e8197a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/es-MX/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/es-MX/firefox-77.0b6.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha512 = "e84b113f5c8a4d5a242c174fb5752e23be54bdd79d19926ac46f29ffd7d0d5d2d35a7f2aba68967c0cf0a352a8bc8f5e7ff50883a1423a99d811a260323475af"; + sha512 = "c442cce18a63ef4f8c4973d318a93fccd8335a8d9b1fbbf7e57390de9e1e7b465f1fd086e8503b139bdf083e1353a7cb22c20d9e55cdb80aec41ea9b9ca5cdfe"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/et/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/et/firefox-77.0b6.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha512 = "6618cdd88ff48e3ab9b1d5f301d668c5ed1e659c3777cf1d87f7fb33c8698659766291b821f1fda11d13a72e50321a48afdc42438f96a8e827b2cb6712a60e66"; + sha512 = "dd4568b51811e6fe499be5e93df687aeda145933aad2ea18673ec3a279ca061ce394e1675b62e461a3a1732a857806ec3e28c21c0410df660ae86857fb5c5f43"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/eu/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/eu/firefox-77.0b6.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha512 = "56488e4dc90422b1df30265dedfbb2d0ed9e2569b989d642e83d68f71be8e5c45caa9e7df0849993b7763ed91dba937a66231288cc821cc753e9631ee1cc6118"; + sha512 = "d96272913159221a8b166984e4a556311aa9fb8ecb5917cbd7ca50869fadf96d229a96cf66f0df8b4cafb096a9ffdf03bb5430d5f2b88285c6c921dff456f0bd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/fa/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/fa/firefox-77.0b6.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha512 = "87c044f5b2e86c65f03b164b4875805c01fdbeb8cc1f1a431c3e8dc1c5f7cfe5e836e2c32cf4a6a26621c3a9f06a831edca828b5a343d8547e69684c6da23924"; + sha512 = "02b13fbb2db4fe8367c434dbf4c67f76655736bdaf4f86ebd96f756e117045fc547ec6c520433cfaa5a7d85b1dd47b88b37ed13c0762ad4573ea7aa8bdb6f37e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ff/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/ff/firefox-77.0b6.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha512 = "22722fb25b81ae05faad99a81af7aa21489c0fc031ce039c7f917f0d329160748f7ee6378c53e26846c466a472b19f88fb0a71080b37f16fc036f4199b75f67e"; + sha512 = "440a3e6cc6ce4564c3b6548b3823003c0f350fd323c3d4a9fcf7cec8e56f0903f9789362f04e14669f2ba73b752b77f63d9ae58db18e681ebd48b9617ba54705"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/fi/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/fi/firefox-77.0b6.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha512 = "680e8889e1b4b162118dd781cc43a928ab07359d31d61f0e2053223d5eb858d24a12a81dffa3ba562428d958940019b0a775867553cdc5156d2c380f1ff98d13"; + sha512 = "314a58c6c7a45185612dc75cdfacee29e71729ddcffcf36013b3269814d63d78ce53d71929d7ed728c68c0e04e4f7e8c972cdf289cf802f3be86026f7ebcb57c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/fr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/fr/firefox-77.0b6.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha512 = "45d39ff9ef3de3229e1a6799fbbfe8ea9e773041c9f98998aaf07a41146cf8a034a46927df8003d953ecc10ce50b375b311fef5b3cd532952761b6d05c4316db"; + sha512 = "b747529f86fad1141523e8d4d37c251061446790282ee7326197c06aa3f3a9b1818fc6bc21b752928463d8ccce28fbc1072f2f1a10acd95484aa62b4c2a7eedd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/fy-NL/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/fy-NL/firefox-77.0b6.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha512 = "5b6b196fcd7c1a23664e10a0351a5f13e2168ede27627a1aa66a6c6e586095c47de071e917b82092f6df72540e50a93fa95e0c81e0e06687517622ffcb9b8a6b"; + sha512 = "7995d5af91664d55f8b4edbb84cebd1d9dacc0d4bc7b8d3e95dbb7a5941a18bb7be39b0100ee2231f318eb238780cc59d8c67939f8bd96353b8464192ee836db"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ga-IE/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/ga-IE/firefox-77.0b6.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha512 = "44d1554d851e650f2121183059625f3c8f633c50b309cfbad2cd0dd3b3c7cfcda33c8a14ab74fbb3481725c530c5140363dca573a4e686d6921974c191da093a"; + sha512 = "26d2820c963ff80ef1953d6519678367ebab59cc551ebeaab95181d05221f340de902bf46370d04d2750cc256dfaef38c3199835c74982448d0b0ff9890cfb53"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/gd/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/gd/firefox-77.0b6.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha512 = "b8210e2afd5f13522dd367baf6724a0982ab0a98b548b1f2e6fc3af93d704a4e5929ed4e235f292ed666b6064beb5e1e463d715c8c14bfb47cf9b2687e321b1d"; + sha512 = "997b1410bc88cc1b2e5139b55b8c90c5d33b2bc160fae5bcb5395690c771b3c7047941159a54715906e2bafe7dae48b4985facfb032772a1c3b9d35d5bde1940"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/gl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/gl/firefox-77.0b6.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha512 = "96349751178a2cf264e1ec27c74ba725d2c3a9b54641bc4964e5d8237d3d6b6f98c116d44b883aad132ba7c4962c3c1b471fec08394e969dcff42598fdea6841"; + sha512 = "8739f296bc47bb7160841f2353c1ae43276b16bd4f81e55bab0a622aa810dbb83cbfe8ecc644f83102ff46beb2c8f10d2decffed86903bfead2906d80151b418"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/gn/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/gn/firefox-77.0b6.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha512 = "61b270273fae12b485d93707d358e5a3d7a9198ad147e31c2fac2465f65c9d6a803326fb042ec0a6de2d46cfc61e505b09f6093a7f62e3dd69b8e44e017d7b26"; + sha512 = "23e33de0f0d199927f208ad4b76f06887956ba6a8d06632d12aee55ba194fcd999ee90459e89e32c5133d01aef412451b29010805ff3bfbd25cd14eeb389ad6d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/gu-IN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/gu-IN/firefox-77.0b6.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha512 = "52e497831de58f7abb221b4906f0fb64182a04a93e8d7ee83d42a1391f029e4873dbe977b4e8a405d0acff537d98504f659971075b9b76e33c09a46607a6106a"; + sha512 = "a377f4e18c6fae6d008e705ae3e212e4a113e3279d3bb94889bbf60ef65f733b3526b8492e84ed4a1cfa3d55ef3ea22f9f8b43e1e7c9fed5590dd46c2353d17d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/he/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/he/firefox-77.0b6.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha512 = "8212b67f9447128a4cb9ee0864c50d07fd3595de15d8e3c6bf4a8f3b19bd2288ea1f55b7fe003f75249db6de0a8aa4ad6962b2913657bbdfbbf282cbc14a77e0"; + sha512 = "1f76e6217c36ce100d046fbb18aeb510f688aa87f6a23558f8e86667d79f14a5928948c38629c96e80c9643de65f325ff76ed9ea36eccdcb89bce84c5cb85e14"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/hi-IN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/hi-IN/firefox-77.0b6.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha512 = "61e8954d14b9b7f06919c23d60eba00213c57709a5013c4a9b3376f7823f5eec262ed891a24857fe5e5efcd0245bcfe474c3838f1463dfa38427c4335ce7f1e7"; + sha512 = "f44aba1aefc3707c5347083e1d44dd538ce68fe09a3ca1bb203a92a2b42d67f138e4727da89a43f322d17936810342eb26dba134e0c870a1b1c6b7776551d91e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/hr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/hr/firefox-77.0b6.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha512 = "a58c582cf0a9dd154ab53819197eb4c84fdacb2133e59b367df5111a5807c4ac63d1ca0b2567fa218a64f570b19dda9b70b13a2c15d2359cdf962f241d4ea275"; + sha512 = "a58132d1e512a5e2ee2f98952f8be3323fcd15be906c97f72a52c501fada75afe57f2933853f5c649bde0077c80818d9e9d8a0fcbae75655e348dc72c52cb840"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/hsb/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/hsb/firefox-77.0b6.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha512 = "fdd4d7618fda5b950fcdfba0c47c27311881bdd62d1ba2028ba13adabb4beda99351c97a3ac0d3e7c1d9b9fdbe5e32bd04c4863f24e76144f6b21725a5d5d8d2"; + sha512 = "3abc73eb9318eed2f26828bbc1e9a5409efa93722ec7fe8585674e65b05a3c93382890b6f1f91567fa23d8089badf72220405968c7e5d5d44b85bf734933411d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/hu/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/hu/firefox-77.0b6.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha512 = "2d6455843faa19b8fcd401a897eb03b76bcb5da784b6aa8598e88d1b3d44ffbccbcd01d9480fdfd61039197f8e6dba86353e400cfa9537568d81debd31428c50"; + sha512 = "666d16044ebabd1f57a917e5096e75abdf0b530c9ce367da14ee7d25fe74ef8f347d2e52efb21b0e11bce97d5b8e2845e770586f2bb3277b712ef3c9dfb7d5ce"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/hy-AM/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/hy-AM/firefox-77.0b6.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha512 = "6ea49a50bf8e22e6caffc95936cadf3e6373b131b10a5a96faffe786a9a9a4ca8737600cec76c071bab4a20f7c05003f25d3f573af6450a5c995e08e3b939acb"; + sha512 = "bbc062d8d441820885818cc9e5aab8e8bd203e1ac19bfebb51a08dce96a008195bcf7658b341ce0bba425b20b73d6bcc1176c48b624b000b34f78261ba89c611"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ia/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/ia/firefox-77.0b6.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha512 = "7f5bfb9d4c7debcfb8a19c59f464a47af4f729d780b3940420326303d129f93363a6b9d606285d6d1e87b51d538b8573911356be2318b72e9544adaa0c64cc83"; + sha512 = "5faa003395ebae3be88cda49a6b313629557d618e5cf2b64c46b8b75edb0d3505aebb00178f64780531549d8ff05375a030dc713635fe8ecc217d70e0a6bed41"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/id/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/id/firefox-77.0b6.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha512 = "f98fa51506a9c5f8da4ce090778eb675ab922970a94f7fcc93b2f0af20b08889238188f8def9f001ca757b68cc321f7f023023b53c2d2c1f87dc645d9a9489a8"; + sha512 = "058ee553514ef20a732b392acb701ad3caa6211e9cbb0b6de1ceb6b357cbfb950bc07bc3b7a66e073973cdd3c30f7da34c8c15ad49bb0c836bed93a6a7f1b3c4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/is/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/is/firefox-77.0b6.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha512 = "54a2ec07da6259d6fcbf38a9bda6636fda9a15dad5188c3a8cf5a80bd813ce5c399d44daba0ba49281a7d503ee38542753560ca322324d86bc528c509b34d3c8"; + sha512 = "b6261beb1e1f2f92debb3b5f4a1a95943849337e0b4d8d57254d16276753b0d6a9e52a7a978618a1cab82ddee323f53be2d669837bfae9ef4fd65db0f3bc58af"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/it/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/it/firefox-77.0b6.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha512 = "944dabeff41606eff6a49ff87142aab2934cbc658015a8ef05a8416252b8c8c64fd446f5f88516dbea67e269a6514ba7a59038b39b2bb21b909f5342e90b9fd6"; + sha512 = "7a18f158946114ec51256cb99a232e1a35f2fdc13378e0ee29968efeaa70686fdf68e097d5ddfece8183083b2ad0a119daddec7480528dc2e23f963f3d992b70"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ja/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/ja/firefox-77.0b6.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha512 = "22bf40ed5c37609dce3ed3ea4e88ab8bbbea31a2610697ca72446c201f874c7a4fde8c3f0f859e492869a8a3421e917d6eef37f71cba58658c584f30c683e9b8"; + sha512 = "5a8214f2c717ebe52e203ef449030ecae6fba41536420486dad8d30f676f22dd9e6a32468b3e0bad457f01187ce6cdc0a0d9413e06d1365ad04ec7d4544ed641"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ka/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/ka/firefox-77.0b6.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha512 = "b746405cd39c261ca7e18193fb0714520c59f58a595be513660d609ed3373b36f07444283d8ed1a6106ef0a48de45ba61fd5c8a1798d45088ac886917e883772"; + sha512 = "233449855a9ad3391f3ad81f2ec9c8f17a0c08db90e9ac2718ae540f436e2becba8a89382262e530da9487591c0fbdaddbaae9e222b0f4e98a4754f3fb77e0c8"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/kab/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/kab/firefox-77.0b6.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha512 = "eabc8a30e4683de833a73a49e2d3d6a25d92ca6fbddbab672f13a6ed5094edacda15ee85a1a8582a05b6e3382ad8a2063a6b1f9acd02771711d43a5e43da8f4d"; + sha512 = "f5821c982d7b92feeb43e27bb95c93e66c2a985398594763bd8934e403e0c89cdc92c9fe556e65e5aca8e403c7c999cf8235bea1b63b6bbf417fdaaf065c3a8e"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/kk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/kk/firefox-77.0b6.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha512 = "938991eaea630be2ad5818f97a9f43808ce7978c07177b5eaf10bfc74d495c1bbd5d66af79c25ad66ecf6b1d35acd94b04b70c5a8efbce5e26d53e45f3db0c7b"; + sha512 = "c5ebe21b1648e02eed76058dba33fc7bdcf01f2c5034ccb397534ddfb679f333f036ffcc0a554e96a3296741ee22102f9908ec80aa0bd2ba6efc58cf6a63604a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/km/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/km/firefox-77.0b6.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha512 = "ae6eeef2328c92c26b6eb9c2a600162d99c58fa04bfd526f8b0d3d1b147a9f19b7976342e17415d8cca2df65ef5335c5da0a68378e900c09c941fb18a92ea8ff"; + sha512 = "175eb9f150f9e77eb379a59a938b3e554ca3a84338669f10db1c0d014df6dbe1d5255489d70ecd7dc31f72441670f3889988ca75a77e5fef071016bd9651a040"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/kn/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/kn/firefox-77.0b6.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha512 = "af171a1f641c50b7f50794d6a1ea0b2d9d2230724c08774ab594b1c9d02ba0660e7f349de65dc4638191b855183b9a0a45fba1ecab5e87199522d6c36103e6f6"; + sha512 = "235a1c4fb9fc19839d0783287461c27a5ecf83f1fb1fe179fae4eeb5a7ff4b3a95da24d56cc130f4cc9dc80e1abaf015f7095ab104f300797068d83c7db1459c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ko/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/ko/firefox-77.0b6.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha512 = "7a2a61748c0f79f6e65da80e013dc9cc4550253298e6abf01b431db16a3373ba4fbdabba25dec3c994435b6e6330aac58067ed95003695bfb7e49fe6af70b094"; + sha512 = "cb3161cf2bd07d9b0d3b0018ccd3f0eb1d5c2df5919093188de536796a190a29bbccde8afd2c9dfc9e25b4f9b3098bdc7b2710dfcd4b34bf1f0c21c1abfc503a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/lij/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/lij/firefox-77.0b6.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha512 = "d06298f697163b89f7195393a660534080595b6630b8e2b5c67cb311001bdde4b69cf5a2bcecae4ca90a0abf275736842a33f6d57dbe021458599f0a531b5a13"; + sha512 = "8b4f4648252b1c1431cd77c13aca7a5ab35c7f94129166853b95545e8daefb2da1b8b02a7ae044cbd4e61229cde4630c0e360f41f8dc4b8dbe516acc185bb6be"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/lt/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/lt/firefox-77.0b6.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha512 = "b9ac847949d35872b0d56c41d58c26768afc1c6157d87a0e0059c4b4928e7eaeb6aa7564754b739dc757e049ed485a2c94085e8881515ebf18f250cd5c9e8ccd"; + sha512 = "91cefa757fe9a8dcb6dd6bbd05dcdb312d8a89c2769db0cfbf0df399ceeff13a607be37fcff95dd62099596d201c09d03b7d871c76dcff8ad602967b23736e2a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/lv/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/lv/firefox-77.0b6.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha512 = "88cd61ed1bb4eb1d871d1844e83acbc932685e10993ed64e84c63fea81fd1d5f79937ca9fff154a699334a4f10942415b6cbb90312d5be508d482de064cdbba6"; + sha512 = "994b6472ba47af34eb9903ca3fffd1d0477549f65d9da1162746c759c9129eb1ddf302e1fe1d94de00a37f07ee907048467fd3ed3db0216027e4ca972f3865ea"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/mk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/mk/firefox-77.0b6.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha512 = "6359356fe1c2eabb3757c6906d925b80a7a069e0dcd7a56b958f614879b942a295bb6345a84365fa21a2cd527bea48d6efe01a603d98571deb6141ae35ff59e6"; + sha512 = "9ac3dcfed283d2edc76f695fc0bcf8098364653a7e8375747c5cdc190baba738ac479d88bfdf28cec4f1d0307a1057cd57b29dac3a37515ee3a246487b8dd7c7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/mr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/mr/firefox-77.0b6.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha512 = "7b57efa8b87f662a56cd202102d220fe8f5a72d2e9838528384c4e40206df75e57a26df35544f595460daf471a565c5bfc7071f9a816b11cfeb48f84437d40a6"; + sha512 = "ef484f99119c8ef67cd73a2caebcec00cfba5f4c0d4b618326c2283c96953332902dd141809dcb08e2be393c23f92bb61b298715ae4dac8f1c289b58d96a3230"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ms/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/ms/firefox-77.0b6.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha512 = "fbdfe0a1f4ee6831a1d09d9349ddd43d6d540877c1272484429a7ac735a9b326ca5d99fc45a305fa1a36293a4e3eba3d03c4451b0f68a011e58c055d7e89ccee"; + sha512 = "8ff1084f3576632ed5bbc9a8ae0ccfbdec1ff2184770c7ae680f78206027f3c8590a988c6fd0f4a4e6b8f97f846589a85b8c71b0005976f409cbd0ae0a9b6c09"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/my/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/my/firefox-77.0b6.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha512 = "8106d80e99497435ffb5a58c0f4002fc1286e223688ebd7c9e406d4181c621abd831819339a6ce65c7a3ebec7a7e8963bf711d7fadc5b94653d83e1fdd13ea75"; + sha512 = "df169d7ec41420cd537178fd6a66fde8821b5cdebe4669031c640fed54c2d5b7fc82182e9ed8ef7b4307323e0a2b8b63f59660fc565777d60aa110e6a7853af9"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/nb-NO/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/nb-NO/firefox-77.0b6.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha512 = "165c134b673a2a9cfb38db68e5020a284bb087b21ae37a70ad8ab25808c1fd68c0f6385a433d4e16bf34cf7fb07510b36edd0563078a644d6c0a44633946be23"; + sha512 = "cb163e3db7f147c033234baae44dd4be1baa5255380bb08c2cfb61dfb926b8e5270155a4665ebc59cd5022861722f4d2c08ba4d8a757cd1ecbe18d1068e43003"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ne-NP/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/ne-NP/firefox-77.0b6.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha512 = "c0450269268b5e89de324c3e5fc6a864461a4b29d1fb8646846f8ebd87f661be2a340963a5ae8282cddcca5f05a3ca14f2b155eba99f4357983b5977eac808e7"; + sha512 = "ec9d780be883b4092c670c5a5239b57fbf12ee626f6d1943e5fe4769ad319d724655c4a0cdb7e06503e9e2f11924e2e6143c1e2f20e4fe621483bdbc17a16a30"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/nl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/nl/firefox-77.0b6.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha512 = "6cd6dc6545e481c28f9d63e5bf97e8dbeb275821c829c729c2dacae5e16d913424bff0e2c6b3cd65a566708f6b047a6eda29793acdf45de295911596bfa49ef9"; + sha512 = "779e823d48f70f9e9bcc4011e1c0959b9d1fe9515a3865c681f6bda5bff99b602d8a3427c11161e9d62ffbbd911ab5461e898fbc2251bccadcafa48a5b2a834d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/nn-NO/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/nn-NO/firefox-77.0b6.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha512 = "03865af4dd626a188682ce32b4e817af44cb3059bc8ed7620853234a15972556fa57a2b6c6046ae40cc9c714dc09e54c2111adacd2a0a315d347e4322233fd3a"; + sha512 = "6f458ae7e83fac25f14adada66b5e69998d138dd289c89993f74a0aa94ffc79c4400c1b244aa8756dce2436456a8c1f41bf9b9642d5a392b928d8d5e2a1af046"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/oc/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/oc/firefox-77.0b6.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha512 = "9a774f343442ee10b673cc9894fb8e4adb0a02d824dce5bfa8b3c699a1deb17dfc2ebff86126f9e0743075091c37ad170ed49f0c7818b602373f9fff20240b58"; + sha512 = "ba1eab5d8de36ada40941e9b0133f7acdab117cb0636d0d819fb98efe05f61228a8de1d602f9d5e08f34eb009df83d1e20c2f77ff7c193ddc9f2754a32285fbd"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/pa-IN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/pa-IN/firefox-77.0b6.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha512 = "6413054a66903741f6a50c8977dc61866067ea54f915f1d7eaf972dd26cba592945bda62348b3cb397d7e045cc7af36581e374deca2812a5112f0bcbd7703b43"; + sha512 = "f815e42e958235db42f8ebebfffb8e5a75d9f0c91ef0311c9fee6f692ceb5db16fb6bb551b84c07fbbc5602f79946980e274ece831190d936e8602db62759082"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/pl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/pl/firefox-77.0b6.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha512 = "98c9403b1567d02c1571aed5d6b1cdae7bdddc01ef16a2df44fb8efcb728b7c16dfa27231795fcb9ac3b1cdedbb66fcdda70a8971ed08caa89f8a0bb11dea5e9"; + sha512 = "3b3c610f3eb84efa83528e82f07821979f317517caa66fa642c2a569d58bb65ee5e32c6854423b1fc4c16652654f2516b7515ce084d83a4d75c9c750f4010200"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/pt-BR/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/pt-BR/firefox-77.0b6.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha512 = "ac721c8b4e104285cb8eb025916da8ba1c7c0481eeaba2b60e35ceed7d26afa7eea9a83168608daff25c025f2f06208cf36c56a4ece68b66b2baacefdb8b5d9f"; + sha512 = "97c1820edbb6273d16d6c3256ffbb6c099a517568cfc320d880eda88671c6bdca02ea33a95e3c0ba88693796ea6b1749f157c1aaa01d74add9701dd2a2d0fed1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/pt-PT/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/pt-PT/firefox-77.0b6.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha512 = "720d6a5c0bfeab99f4360e9e64c4bcfc49c987f1dd040eeb1ff580f1f4b1c4a29fb7a3c88a369574fd966237f817959baf9db7117bd515cd6458e13155128df1"; + sha512 = "02f1b7037ead02e594ed8bfef8d63384e05e8005d80fbc7823d0c46c1e2d6beb8c7815fedc11caa305f904b2f112ab2a482095c60e841817b16c7abd59dd9eb6"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/rm/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/rm/firefox-77.0b6.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha512 = "e06fd7a663dd341f8cc9f60de2edca6af622bbcfffb9b1d9e3b75c07fb6b27f3b0ca9eeccb6173a91f52ee8241f167c4a399160e20377b3738e4cf4b2dfb84b7"; + sha512 = "3780f9a1db1eb608b49b026ff990c60e3cce1cb9378389a371a092ceeb77d45def0fe0ae21e153807c8fdf475caddf3c629d383ba156d74c1e7a28c2601e2969"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ro/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/ro/firefox-77.0b6.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha512 = "d7738a3039202e9cd3b30652b4c069f9b73f88e5db1429e26324ef30f87af88f79452cb5dfa687bb988b513359ae65d7319c8a3dd59207af85b618d51519f335"; + sha512 = "5d8866a694b36ab911eee52633eb89990eb3e466cf056c514efeb900a602b048e68700464630fac44461064f1ec468308103f85303d036ca6d142b3b4826b3bf"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ru/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/ru/firefox-77.0b6.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha512 = "cd0c2ea6af241de3d382345fd783b75e15499e0d666df99bb6ec06ae9e9da233e5ebbd181bec6a3b044682456dd78f5405177e4a781160b9a3b110008782f32c"; + sha512 = "ed0be17aefaa9ca305596c2e47d2cf4575cc73cba1de028428c704bb8743ca104d7c31d210583dfd1c6777cb73b7d702a906049e068412b8646af7035cdcfe5c"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/si/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/si/firefox-77.0b6.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha512 = "94aff48579b1fff63decdc6640b853907abc508da23e3d7ec13ea01c2fae496e870261fc5616821bb0c2dd5279ceb1be054691f501dd183ee0ea9aae7d24d5b1"; + sha512 = "8eec828376a455ef21eb8ee8edbdd14acb16181858f8d9465a2f7ba830e1d18ad00ab1b530fdf9fb6436528fe11bcbb07b70fae74c0b1f6c53197740d0e7a697"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/sk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/sk/firefox-77.0b6.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha512 = "189f8bc5db155eb0f50d0b60d321ca0dd67e15cd30749d830a21397df0b314608393c08daf70712a6077ea5ac663d5e745a836483750fd26ec1e92dda265c061"; + sha512 = "80f7d44e00f571346cd4f05ce54236b1b9ca6ef7d75f20a0335dbc56da52cb72461b333b4dfec55cfa95cfc2ceb6afdfaded714243a10ad58120af38f68bc1e1"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/sl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/sl/firefox-77.0b6.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha512 = "f6f1d2ac3270e639bea54eb04c8f292d17ec2c4e70848a4104219800af1a17f78658eebc39d3c244e351d0511d681ab66a61358523d7edf93d4b317993cdb10c"; + sha512 = "0da796384b14bf299361bcc38c2dfd1d45cea3a396f7d7b9a8f2b7c347f1d9b6e15b7b3ecb0be591c385a20375122c7b34b1182b902ff3c6ff67e2481420be43"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/son/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/son/firefox-77.0b6.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha512 = "747f109672e47a6a344a09c32b5e2694de1ba125dd29d583a5f6a31859247e659b9ea204af31337dd5a635c0d1d7662efcf37d0d708e0936b59dfe3c975e9990"; + sha512 = "37eec862d1e7c9537b5dab811cf183238474c552b98cbdc81df67c5c42e5dc06b126c4c00b014287e282f490392823d83187bbebe7de992468d8137efc1c2d8d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/sq/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/sq/firefox-77.0b6.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha512 = "5f6ad0ccd20bcd09783de5307a1ac2b149cf63ab922162149d8c0632698de86b78170e378dca7103374ec356bbb03b373bf573512e6b27b95550ed95178dc1f7"; + sha512 = "468254163b0466858a10ba5869bd6434d96f083c192369e4b8741606bbba85bdc69179eb23d06b4dc30dbc8253bd623d258ce76b0c64366eefdd03309b21ea41"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/sr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/sr/firefox-77.0b6.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha512 = "01c8f958ff9c5e9e65459b20c7a42208bc985246445d6ed310f80fc0dae2c8bb5684e118baf1c3dc2947dfd66ca148537d94ae726e3b3d8cc01c4990e42e2f96"; + sha512 = "7f2f06762b82a3ae599955fccf26be9330ad4be0b8acd8596546e9d949a10b0a2f629df81338d5c3720af6dfadb1ddbf78da006fd70d90f6d7f3c42c6be498a2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/sv-SE/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/sv-SE/firefox-77.0b6.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha512 = "1fcece2f00f98e769fd7023b5cd80eeac27b8f987291bf4041dfd90538482e7184137471cff73aaaff1c307813efa26cea3f7e77082ebe08d11769b35cd21d12"; + sha512 = "4a44a34b833a04f918899af779408376f6d51229812155f88275597c8368a2865897bf6bdc44b5991ed3cbad40279a9ffa9b75a039eba77f82a3ba0f91697cb4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ta/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/ta/firefox-77.0b6.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha512 = "557646065e7370bfe43fffc9a57eec3da2ec8176e2371e948f70c92e54e3cd7d194022dab508c0b384545c121587e41ef19bda7ec8b1827118adf12aa82c653f"; + sha512 = "32c99716c32bcbdd55aaecbf9c7b9fa423bdb9324feb23831ce7454c9a01d57ed3b8ca7d662d730dfc7c9349221c7fc9b442b4c806b305c355762d6dab2eb0a4"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/te/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/te/firefox-77.0b6.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha512 = "d7f95cefdf312d4c3ec157208266c9eba7e394cc1deb83e4cb9baa98f99292f6d4996b4c6f663a303556769a8c6b81fa6ee127f84464fbabc8fa0f55763dced8"; + sha512 = "cb5f56172de7ed63ce9fca8ddb95c1840b6830d8e5e3af75a9ef3dc85256e711250758245cd10676dffcaf8ec7e01f7b027de4cee71ce839c923b7bec0b2017b"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/th/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/th/firefox-77.0b6.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha512 = "9c9d80fe8157f7f844c81a99439d9e35ccd51c8cb9dd4e8c1bc16591aa2e34654440e1b926f3737790c2fe4fa1ef9720180393260adf1dc1b6d22a805ed8edf8"; + sha512 = "c4cfad0ee45e19b15a797daa8d17c4cdbfd47433ff1a19f619ec8b4e4ed44203ee4b82308222debdf96a5e076fe77e15b5a29b115ac203364ceca643298a930a"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/tl/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/tl/firefox-77.0b6.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha512 = "21fc8ba0d1374fe0dbdba8a0f5ac940085f89886f0eb7ae28aae5e152ce7d68518172238042fd0287ec62127489ae3c9b750334d38676ecc7b60633187311fde"; + sha512 = "ca89a249ad4cc0262420f22d779fdabd402afbab1e0da5a7a3ce5d2cf44de9cfa4f67b4842203130a645bb15072c8dd249825569eeb0eacf08e265628177690f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/tr/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/tr/firefox-77.0b6.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha512 = "b91dca298f68ef9f1a9ff17ecd58d7fd2f0d47193fb03781027be26ecc75d3391ff47dbd1d9b6796617df00b28ff8b2610858188cd03d87efcf704f2ad4cb0df"; + sha512 = "6b6a487dbd9f0af02afb87463f1dc5129f59bae81bb90aac17e8bfd9feaf10be351f2afe541c6821778e41b20f323e3dddf2493b92d1fceaf3c22c0dee6aceaa"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/trs/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/trs/firefox-77.0b6.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha512 = "ff2b2be81f48758bd52a70ec6da9cf2950fa595bd7d3a26a4929ae28a6c612aa6ca1c127318587fe4adc03257e259a1b68ea39b9b4741e7edea53c55ccb9036a"; + sha512 = "407a8417e511bfd7e1cccecf1bf0192a33df1a9571b15e1b2df3b36d446acfd6e99af64b947f36c327f9374d592e0e8ca93ad97888373ad200dc041aa2c336f2"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/uk/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/uk/firefox-77.0b6.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha512 = "980175a00523c0ba2b4c67999e5afcc59946b45bc58d6b813e25dd0a5f1678d23d329dc70611bdb55d9ad9debe2adf0a5fb867a9d83d43ab5934ad2bcc132da0"; + sha512 = "47ee62e4604139148fc8a646b60e6907682db39e9b0061e5c9a63d756e20a61d8c41c4af49993648cf090fb877696cfc33e82d84b8bb648415fb9c773d1c8ee7"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/ur/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/ur/firefox-77.0b6.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha512 = "9648cb55f355c68852430f9a7c5486b0fb5be65c7f258b81906d19119f437e033121f46b884d65f1f64c33f511c605d8a42737a26ff7089306ed6bde4fd5ab4d"; + sha512 = "b7aa2bff473261985d101be07297ff488cc20ccf333bf6bef35f6c8522a7e3fe8f83c7b5b2b16019e53e7798feeb1f1754c1a9c3e31a72dc170aa6bc1619fd54"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/uz/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/uz/firefox-77.0b6.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha512 = "2fdc0572a32112310044936c9b81f7238172f9ef2c2e502813b82ac0f61fa96b9d1ec96d396c7baf79c27b44673a72bd9e484d6ab68087993ab44310a52d453d"; + sha512 = "3d60690ef0c74d91c134d1e2b348fcc469d528a7d166d1cdf65190fae2e97f058ddcedabdf1b0f9af9b1e31a369de6ef8c35b41f49e846cc0877f71fce12d77d"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/vi/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/vi/firefox-77.0b6.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha512 = "9b6b6ccaf74e4c3699605d43d51c02f7ccd3f4f28ed93e9b800fc0adcf662f08e554f081cc51e5706c73f308cc289976e5523d0424988b5ae3d5bb1ef6260503"; + sha512 = "fe7285022883e91f2584e43f77f8cfa3771c948ca970a2502df557144b6a33dacd746a7710becf249f2c1f0a8f90f4f19e66fba0571b1bd4ff8300ba883614d3"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/xh/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/xh/firefox-77.0b6.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha512 = "d417c0efde71e18f8dc04f5cb8b61c6b4410579051cf3816b55a52f3165ede2921691ed67307999ba48d6b46ea2acfdf82d063ea349fd7131402155f50dec01e"; + sha512 = "b6157fae9af3740da799696ccbe07ab9595e005538c962cd6049752fde01763557a2286b7bc094442d7f7dc15101708712eb43d06ffc1cc0dda9da8ce05c1527"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/zh-CN/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/zh-CN/firefox-77.0b6.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha512 = "d4da856a2b142d4a088a0a5b460eaa2466da9280890c62b178d1bcfc18e91e494d7be357915880a0369ecf578b00e087cdf47eb8591d605595e9cc2356cbd086"; + sha512 = "dfe844eb063beb53133fb6636674c26b0018436357926b1165c6eaa589da0f66bf95866488a2659a2774431d236260837733993051b093182d02ea3de4f6317f"; } - { url = "http://archive.mozilla.org/pub/devedition/releases/76.0b8/linux-i686/zh-TW/firefox-76.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/devedition/releases/77.0b6/linux-i686/zh-TW/firefox-77.0b6.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha512 = "6a43e2db9823f0ca86628b77df193183182208c27a7c0347fb0cb324b615bae58ca9319038c4ac642428f4ab0f1bea557ca46f313256d849cb10e8da87942247"; + sha512 = "45189cfc3c7ca6a1e04293422e36fbd7f6e09292101ce31c5c15cbfecbc1dd7c03c5410eb57ff77dfb85b1910749e51461688eb668128de814072b7e6bb7f13e"; } ]; } -- cgit v1.2.3 From 99e84dbdcb2f7072677c7791147a3c11ab14a83a Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sat, 16 May 2020 15:20:59 +0200 Subject: python.pkgs.google-pasta: add meta.changelog --- pkgs/development/python-modules/google-pasta/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/google-pasta/default.nix b/pkgs/development/python-modules/google-pasta/default.nix index 2b6394ae6ba..a7a25118478 100644 --- a/pkgs/development/python-modules/google-pasta/default.nix +++ b/pkgs/development/python-modules/google-pasta/default.nix @@ -20,6 +20,8 @@ buildPythonPackage rec { meta = { description = "An AST-based Python refactoring library"; homepage = "https://github.com/google/pasta"; + # Usually the tag message contains a one-line summary of the changes. + changelog = "https://github.com/google/pasta/releases/tag/v${version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ timokau ]; }; -- cgit v1.2.3 From 5ce2f6c5c922350eabf3f0082d839bc713634481 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sat, 16 May 2020 15:21:23 +0200 Subject: python.pkgs.google-pasta: 0.1.8 -> 0.2.0 From the release tag[1]: > Support for python 3.8 features [1] https://github.com/google/pasta/releases/tag/v0.2.0 --- pkgs/development/python-modules/google-pasta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-pasta/default.nix b/pkgs/development/python-modules/google-pasta/default.nix index a7a25118478..608ab9ccd1b 100644 --- a/pkgs/development/python-modules/google-pasta/default.nix +++ b/pkgs/development/python-modules/google-pasta/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "google-pasta"; - version = "0.1.8"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "713813a9f7d6589e5defdaf21e80e4392eb124662f8bd829acd51a4f8735c0cb"; + sha256 = "0vm1r1jlaiagj0l9yf7j6zn9w3733dr2169911c0svgrr3gwiwn9"; }; propagatedBuildInputs = [ -- cgit v1.2.3 From a807dfe1e31669db4eaf87f61b604c5c4fe79595 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 16 May 2020 18:20:30 +0200 Subject: php.packages.phpstan: 0.12.19 -> 0.12.25 Changelogs: - https://github.com/phpstan/phpstan/releases/tag/0.12.20 - https://github.com/phpstan/phpstan/releases/tag/0.12.21 - https://github.com/phpstan/phpstan/releases/tag/0.12.22 - https://github.com/phpstan/phpstan/releases/tag/0.12.23 - https://github.com/phpstan/phpstan/releases/tag/0.12.24 - https://github.com/phpstan/phpstan/releases/tag/0.12.25 --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 0fecf30e736..2214605b25e 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -232,12 +232,12 @@ in }; phpstan = mkDerivation rec { - version = "0.12.19"; + version = "0.12.25"; pname = "phpstan"; src = pkgs.fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "15fz7rixi9s46qqxpj26349aky7wxqnzmfsnwlh1f2p4jsfd85ki"; + sha256 = "1a864v7fxpv5kp24nkvczrir3ldl6wxvaq85rd391ppa8ahdhvdd"; }; phases = [ "installPhase" ]; -- cgit v1.2.3 From e683f5cbfa0e96da29514c8329217e2880a80a26 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Fri, 1 May 2020 21:32:25 +0200 Subject: php.extensions.rdkafka: init at 4.0.3 --- pkgs/top-level/php-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 0fecf30e736..de9ae52e9ef 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -709,6 +709,26 @@ in meta.broken = isPhp74; }; + rdkafka = buildPecl { + version = "4.0.3"; + pname = "rdkafka"; + + sha256 = "1g00p911raxcc7n2w9pzadxaggw5c564md6hjvqfs9ip550y5x16"; + + buildInputs = with pkgs; [ rdkafka pcre' ]; + + postPhpize = '' + substituteInPlace configure \ + --replace 'SEARCH_PATH="/usr/local /usr"' 'SEARCH_PATH=${pkgs.rdkafka}' + ''; + + meta = { + description = "Kafka client based on librdkafka"; + homepage = "https://github.com/arnaud-lb/php-rdkafka"; + maintainers = lib.teams.php.members; + }; + }; + redis = buildPecl { version = "5.1.1"; pname = "redis"; -- cgit v1.2.3 From 3ae7502199d68020cbda5239969ab88260a8e10a Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Sat, 16 May 2020 12:56:31 -0400 Subject: wabt: fix patch hash --- pkgs/development/tools/wabt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/wabt/default.nix b/pkgs/development/tools/wabt/default.nix index a755cecc60b..3da47f9a3f5 100644 --- a/pkgs/development/tools/wabt/default.nix +++ b/pkgs/development/tools/wabt/default.nix @@ -14,8 +14,8 @@ stdenv.mkDerivation rec { # https://github.com/WebAssembly/wabt/pull/1408 patches = [ (fetchpatch { - url = "https://github.com/WebAssembly/wabt/pull/1408/commits/9115d0c55067435ec9c55924e8a2bb151bac095d.patch"; - sha256 = "1iklbz630vih08brsgq2d5q91kialg255sgd1mxl7023pvrhi44g"; + url = "https://github.com/WebAssembly/wabt/pull/1408/commits/28505f4db6e4561cf6840af5c304a9aa900c4987.patch"; + sha256 = "1nh1ddsak6w51np17xf2r7i0czxrjslz1i4impmmp88h5bp2yjba"; }) ]; nativeBuildInputs = [ cmake ]; -- cgit v1.2.3 From 13c5bbbe2aaaeaa296a90fbf3d36104d0d0bda75 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Braun Date: Sat, 16 May 2020 19:15:28 +0200 Subject: cue: 0.1.1 -> 0.1.2 --- pkgs/development/tools/cue/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/cue/default.nix b/pkgs/development/tools/cue/default.nix index 0b9bc192c3e..d106ca3ef44 100644 --- a/pkgs/development/tools/cue/default.nix +++ b/pkgs/development/tools/cue/default.nix @@ -2,12 +2,12 @@ buildGoModule rec { pname = "cue"; - version = "0.1.1"; + version = "0.1.2"; src = fetchgit { url = "https://cue.googlesource.com/cue"; rev = "v${version}"; - sha256 = "1qbnm3qb8jz9bljw2gb5bb9g41s5lbq4xvcaj3zgi4fc3708hlji"; + sha256 = "0pmw7gnh4z5sbri8464rpwp3hbrz23zwig82nk9wdjkg1qahyy13"; }; vendorSha256 = "12w2rxp0s3i1ck0qvp2dkg9kk6pyymycdfnfxggcyg4fjshh8afg"; @@ -24,4 +24,4 @@ buildGoModule rec { maintainers = with stdenv.lib.maintainers; [ solson ]; license = stdenv.lib.licenses.asl20; }; -} \ No newline at end of file +} -- cgit v1.2.3 From 6e5b1a71eb0468fc66f181dc82fba2cc4ed00fb3 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 16 May 2020 19:08:04 +0200 Subject: tdesktop: 2.1.4 -> 2.1.6 --- .../networking/instant-messengers/telegram/tdesktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 1e1f952586c..f10c6b82ac2 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -19,12 +19,12 @@ with lib; mkDerivation rec { pname = "telegram-desktop"; - version = "2.1.4"; + version = "2.1.6"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "1swmmklw2mcgag0c8zh4rk5cjfx6z2yl0nxd5yc43hg9hx76yqqi"; + sha256 = "136c27pfipy9ikwm44nqxx9lqwq8qsfcs591qr8ac05ncgkh001v"; }; postPatch = '' -- cgit v1.2.3 From 347882f36ae2ba0c1da747e530deeab21c9799ed Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 16 May 2020 19:23:06 +0200 Subject: signal-desktop: 1.34.0 -> 1.34.1 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index be9cdbecc0b..309da8f296c 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -23,7 +23,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.34.0"; # Please backport all updates to the stable channel. + version = "1.34.1"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "175iir85qlign5ns8wk4x4mf7xw8sriq8jyj61n76is79jjk7b3d"; + sha256 = "0v9mqn43vn1w6wppzydkgpbx2752bp7mmpf50wqgvrmhchnywnkj"; }; nativeBuildInputs = [ -- cgit v1.2.3 From beaed5b544e8709dbc41dc64dd1bc2b66c029b18 Mon Sep 17 00:00:00 2001 From: Enno Lohmeier Date: Fri, 10 Jan 2020 14:36:46 +0100 Subject: portfolio: init at 0.46.3 --- pkgs/applications/office/portfolio/default.nix | 67 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 71 insertions(+) create mode 100644 pkgs/applications/office/portfolio/default.nix diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix new file mode 100644 index 00000000000..53f3b8a3150 --- /dev/null +++ b/pkgs/applications/office/portfolio/default.nix @@ -0,0 +1,67 @@ +{ stdenv +, autoPatchelfHook +, fetchurl +, glibc +, gcc-unwrapped +, gtk3 +, jre +, libsecret +, makeDesktopItem +, webkitgtk +, wrapGAppsHook +}: +let + desktopItem = makeDesktopItem { + name = "Portfolio"; + exec = "portfolio"; + icon = "portfolio"; + comment = "Calculate Investment Portfolio Performance"; + desktopName = "Portfolio Performance"; + categories = "Office;"; + }; + + runtimeLibs = stdenv.lib.makeLibraryPath [ gtk3 webkitgtk ]; +in +stdenv.mkDerivation rec { + pname = "PortfolioPerformance"; + version = "0.46.3"; + + src = fetchurl { + url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; + sha256 = "0263v0ymqmf7kcwys4smwx1p1gh8d20dh10canjfqgl4c5lfx966"; + }; + + nativeBuildInputs = [ + autoPatchelfHook + wrapGAppsHook + ]; + + buildInputs = [ + glibc + gcc-unwrapped + libsecret + ]; + + installPhase = '' + mkdir -p $out/portfolio + cp -av ./* $out/portfolio + + makeWrapper $out/portfolio/PortfolioPerformance $out/bin/portfolio \ + --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ + --prefix PATH : ${jre}/bin + + # Create desktop item + mkdir -p $out/share/applications + cp ${desktopItem}/share/applications/* $out/share/applications + mkdir -p $out/share/pixmaps + ln -s $out/portfolio/icon.xpm $out/share/pixmaps/portfolio.xpm + ''; + + meta = with stdenv.lib; { + description = "A simple tool to calculate the overall performance of an investment portfolio."; + homepage = "https://www.portfolio-performance.info/"; + license = licenses.epl10; + maintainers = with maintainers; [ elohmeier ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e32522158c..edb075facfd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20975,6 +20975,10 @@ in polyphone = libsForQt5.callPackage ../applications/audio/polyphone { }; + portfolio = callPackage ../applications/office/portfolio { + jre = openjdk11; + }; + ptex = callPackage ../development/libraries/ptex {}; qbec = callPackage ../applications/networking/cluster/qbec { }; -- cgit v1.2.3 From 3d3519e2c3af00fd75c58364ae93f8cac5879e43 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 16 May 2020 18:13:02 +0200 Subject: CODEOWNERS: Move code ownership to php maintainer team --- .github/CODEOWNERS | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 93688a326fe..5376d51a617 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -181,12 +181,12 @@ /nixos/modules/services/monitoring/prometheus/exporters.xml @WilliButz /nixos/tests/prometheus-exporters.nix @WilliButz -# PHP -/doc/languages-frameworks/php.section.md @etu -/nixos/tests/php @etu -/pkgs/build-support/build-pecl.nix @etu -/pkgs/development/interpreters/php @etu -/pkgs/top-level/php-packages.nix @etu +# PHP interpreter, packages, extensions, tests and documentation +/doc/languages-frameworks/php.section.md @NixOS/php +/nixos/tests/php @NixOS/php +/pkgs/build-support/build-pecl.nix @NixOS/php +/pkgs/development/interpreters/php @NixOS/php +/pkgs/top-level/php-packages.nix @NixOS/php # Podman, CRI-O modules and related /nixos/modules/virtualisation/containers.nix @NixOS/podman -- cgit v1.2.3 From 49436a7613b6412111322bc20b5602c10dae9fd3 Mon Sep 17 00:00:00 2001 From: Mathnerd314 Date: Fri, 15 May 2020 17:47:33 -0600 Subject: marathi-cursive: 1.2 -> 2.0 --- pkgs/data/fonts/marathi-cursive/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/data/fonts/marathi-cursive/default.nix b/pkgs/data/fonts/marathi-cursive/default.nix index 724d975e53a..8c228fd91a7 100644 --- a/pkgs/data/fonts/marathi-cursive/default.nix +++ b/pkgs/data/fonts/marathi-cursive/default.nix @@ -1,21 +1,19 @@ -{ lib, fetchzip, p7zip }: +{ lib, fetchzip }: let - version = "1.2"; + version = "2.0"; in fetchzip rec { name = "marathi-cursive-${version}"; - url = "https://github.com/MihailJP/MarathiCursive/releases/download/${version}/MarathiCursive-${version}.7z"; + url = "https://github.com/MihailJP/MarathiCursive/releases/download/v${version}/MarathiCursive-${version}.tar.xz"; postFetch = '' - ${p7zip}/bin/7z x $downloadedFile - cd MarathiCursive - + tar -xJf $downloadedFile --strip-components=1 install -m444 -Dt $out/share/fonts/marathi-cursive *.otf *.ttf - install -m444 -Dt $out/share/doc/${name} README *.txt + install -m444 -Dt $out/share/doc/${name} README *.txt ''; - sha256 = "0wq4w79x8r5w6ikm9amcmapf0jcdgifs9zf1pbnw3fk4ncz5s551"; + sha256 = "17pj60ajnjghxhxka8a046mz6vfwr79wnby7xd6pg5hgncin2hgg"; meta = with lib; { homepage = "https://github.com/MihailJP/MarathiCursive"; -- cgit v1.2.3 From 26cbda79292f229e703b75e307729f8f711e97da Mon Sep 17 00:00:00 2001 From: Mathnerd314 Date: Fri, 15 May 2020 17:47:49 -0600 Subject: oldsindshi: 0.1 -> 1.0 --- pkgs/data/fonts/oldsindhi/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/data/fonts/oldsindhi/default.nix b/pkgs/data/fonts/oldsindhi/default.nix index fbca0283d23..e0e783fd80a 100644 --- a/pkgs/data/fonts/oldsindhi/default.nix +++ b/pkgs/data/fonts/oldsindhi/default.nix @@ -1,26 +1,25 @@ -{ lib, fetchzip, p7zip }: +{ lib, fetchzip }: let - version = "0.1"; + version = "1.0"; in fetchzip rec { name = "oldsindhi-${version}"; - url = "https://github.com/MihailJP/oldsindhi/releases/download/0.1/OldSindhi-0.1.7z"; + url = "https://github.com/MihailJP/oldsindhi/releases/download/v${version}/OldSindhi-${version}.tar.xz"; postFetch = '' - ${p7zip}/bin/7z x $downloadedFile - - install -m444 -Dt $out/share/fonts/truetype OldSindhi/*.ttf - install -m444 -Dt $out/share/doc/${name} OldSindhi/README OldSindhi/*.txt + tar -xJf $downloadedFile --strip-components=1 + install -m444 -Dt $out/share/fonts/truetype *.ttf + install -m444 -Dt $out/share/doc/${name} README *.txt ''; - sha256 = "0d4l9cg2vmh2pvnqsla8mgcwvc7wjxzcabhlli6633h3ifj2yp7b"; + sha256 = "03c483vbrwz2fpdfbys42fmik9788zxfmjmc4fgq4s2d0mraa0j1"; meta = with lib; { homepage = "https://github.com/MihailJP/oldsindhi"; description = "Free Sindhi Khudabadi font"; maintainers = with maintainers; [ mathnerd314 ]; - license = licenses.bsd2; + license = with licenses; [mit ofl]; platforms = platforms.all; }; } -- cgit v1.2.3 From 96638775aa8fbca76ad6a88ffd52f1b076ae24d1 Mon Sep 17 00:00:00 2001 From: Enno Lohmeier Date: Mon, 11 May 2020 11:09:45 +0200 Subject: ffmpeg-full: setup addOpenGLRunpath --- pkgs/development/libraries/ffmpeg-full/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 120a309b656..089d5c4dcca 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, perl, texinfo, yasm +{ stdenv, addOpenGLRunpath, fetchurl, fetchpatch, pkgconfig, perl, texinfo, yasm /* * Licensing options (yes some are listed twice, filters and such are not listed) */ @@ -416,7 +416,7 @@ stdenv.mkDerivation rec { "--enable-cross-compile" ]; - nativeBuildInputs = [ perl pkgconfig texinfo yasm ]; + nativeBuildInputs = [ addOpenGLRunpath perl pkgconfig texinfo yasm ]; buildInputs = [ bzip2 celt dav1d fontconfig freetype frei0r fribidi game-music-emu gnutls gsm @@ -444,6 +444,13 @@ stdenv.mkDerivation rec { cp -a tools/qt-faststart $out/bin/ ''; + postFixup = optionalString stdenv.isLinux '' + # Set RUNPATH so that libnvcuvid and libcuda in /run/opengl-driver(-32)/lib can be found. + # See the explanation in addOpenGLRunpath. + addOpenGLRunpath $out/lib/libavcodec.so + addOpenGLRunpath $out/lib/libavutil.so + ''; + enableParallelBuilding = true; meta = with stdenv.lib; { -- cgit v1.2.3 From 70df85260b11534681f22379218d3de3825f0f1d Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Tue, 12 May 2020 16:57:58 +0000 Subject: gitAndTools.gitui: 0.2.2 -> 0.2.5 --- .../applications/version-management/git-and-tools/gitui/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/pkgs/applications/version-management/git-and-tools/gitui/default.nix index 5ed4b0d3727..ff2c9de5efa 100644 --- a/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "gitui"; - version = "0.2.2"; + version = "0.2.5"; src = fetchFromGitHub { owner = "extrawurst"; repo = pname; rev = "v${version}"; - sha256 = "1vcdgzr71m9rlkaq5pc2vnli3hdh7vv8g3ji5ancnlk3zcqc78xy"; + sha256 = "12zqsnkask2hhbvvyym4w21yx9rgwpqx2mnj6qds3y2qmcy1yhi4"; }; - cargoSha256 = "04g089y6k0p36h08v6swcg1ig2kcadkidnlc0rh04znmv0bkn84d"; + cargoSha256 = "1kbaqpfj7b9asyyqjdljyga3v428yzlsgpnn9187hf4ydhpr6zrz"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; -- cgit v1.2.3 From 4756e2eb0c3e712c7a815bc7417d3c10dce072a8 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 16 May 2020 19:18:59 +0200 Subject: python3Packages.google_api_python_client: 1.8.2 -> 1.8.3 --- pkgs/development/python-modules/google-api-python-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index ac7bcb5cd52..b787e08dbbf 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "1.8.2"; + version = "1.8.3"; src = fetchPypi { inherit pname version; - sha256 = "09g7v6yrf8p0kgmjnzy9d0fx9p1zngk2pmprf0bx19j1zc9jqj5z"; + sha256 = "10alijbbv3nsj7dfnv3fpx0gf1s9d4c7yjq0mv51szcx777qskmy"; }; # No tests included in archive -- cgit v1.2.3 From 6f15e3170286c04749ef287c31242a583475e81c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 16 May 2020 15:46:16 +0200 Subject: =?UTF-8?q?pipewire:=200.3.2=20=E2=86=92=200.3.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/002bcae856fbd9b11a1fa8c7a011a61b7de5f42a https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/33398d7de83fad1c67c691e0712e3e0108c5e966 https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/ba215efed0da8d6c9f3f2414d76a8e2c75352501 --- pkgs/development/libraries/pipewire/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix index d873555c0fa..f9cc7b56fff 100644 --- a/pkgs/development/libraries/pipewire/default.nix +++ b/pkgs/development/libraries/pipewire/default.nix @@ -1,6 +1,5 @@ { stdenv , fetchFromGitLab -, fetchpatch , meson , ninja , pkgconfig @@ -33,7 +32,7 @@ let in stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.2"; + version = "0.3.5"; outputs = [ "out" "lib" "dev" "doc" ]; @@ -42,7 +41,7 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "U7lqvn2vMIxARNplzNX9H3Ztlfv1IH8LozJsq7JSEKs="; + sha256 = "mgfhfKpUtHycXCUVKFs9A58E1D1pPKHvSoPqjQzWGfQ="; }; nativeBuildInputs = [ @@ -73,13 +72,6 @@ stdenv.mkDerivation rec { vulkan-loader xorg.libX11 ]; - patches = [ - # fix SIGILL in fmt-ops: https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/227 - (fetchpatch { - url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/1b3aaba206f48e75bb34ff0cd00321bd3d6db2b4.patch"; - sha256 = "08bmr9k2r0q4r7vhhm28k558nk3mz3jfnqswvq9mcj7p0srmfb4x"; - }) - ]; mesonFlags = [ "-Ddocs=true" -- cgit v1.2.3 From 33bb1d5161af54d91cfd869eae76aaaceec858ec Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Sat, 16 May 2020 22:23:11 +0200 Subject: testssl: 3.0.1 -> 3.0.2 Changelog: https://github.com/drwetter/testssl.sh/releases/tag/3.0.2 --- pkgs/applications/networking/testssl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix index 557e69b1ee1..197756d8ace 100644 --- a/pkgs/applications/networking/testssl/default.nix +++ b/pkgs/applications/networking/testssl/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "testssl.sh"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "drwetter"; repo = pname; rev = version; - sha256 = "13vvkn1hna1d1mj8ffg7psrv6ha2jcjrf50qrsb0v0p8hszibavy"; + sha256 = "0vfpj3g3il3imbydx3j8gx1pgzrxi0czcl9jmi749vnkf5mkmh8w"; }; nativeBuildInputs = [ makeWrapper ]; -- cgit v1.2.3 From ce90a304f1befb2e779b78c959ec77e236814c7c Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 16 May 2020 23:12:35 +0200 Subject: aliceml: do not use aliases --- pkgs/development/compilers/aliceml/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/aliceml/default.nix b/pkgs/development/compilers/aliceml/default.nix index db1a8640753..d3208b12dd6 100644 --- a/pkgs/development/compilers/aliceml/default.nix +++ b/pkgs/development/compilers/aliceml/default.nix @@ -1,4 +1,4 @@ -{stdenv, gcc, glibc, fetchurl, fetchgit, libtool, autoconf, automake, file, gnumake, which, zsh, m4, pkgconfig, perl, gnome2, pango, sqlite, libxml2, zlib, gmp, smlnj }: +{stdenv, gcc, glibc, fetchurl, fetchgit, libtool, autoconf, automake, file, gnumake, which, zsh, m4, pkg-config, perl, gnome2, gtk2, pango, sqlite, libxml2, zlib, gmp, smlnj }: stdenv.mkDerivation { name = "aliceml-1.4-7d44dc8e"; @@ -18,9 +18,9 @@ stdenv.mkDerivation { buildInputs = [ stdenv gcc glibc libtool gnumake autoconf automake - file which zsh m4 gnome2.gtk zlib gmp + file which zsh m4 gtk2 zlib gmp gnome2.libgnomecanvas pango sqlite - libxml2 pkgconfig perl smlnj + libxml2 pkg-config perl smlnj ]; makePatch = ./make.patch; -- cgit v1.2.3 From 021662cf1357b204af3f66f65d5c72876ebdc32c Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Sun, 10 May 2020 20:35:07 -0700 Subject: nix-build-uncached: init at 0.1.1 --- .../tools/misc/nix-build-uncached/default.nix | 31 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/tools/misc/nix-build-uncached/default.nix diff --git a/pkgs/development/tools/misc/nix-build-uncached/default.nix b/pkgs/development/tools/misc/nix-build-uncached/default.nix new file mode 100644 index 00000000000..11833816ec8 --- /dev/null +++ b/pkgs/development/tools/misc/nix-build-uncached/default.nix @@ -0,0 +1,31 @@ +{ lib, buildGoModule, fetchFromGitHub, nix, makeWrapper }: + +buildGoModule rec { + pname = "nix-build-uncached"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "Mic92"; + repo = "nix-build-uncached"; + rev = "v${version}"; + sha256 = "0jkpg3ab56lg2kdms9w9ka9ba89py3ajksjsi1rd3iqi74zz2mmh"; + }; + + goPackagePath = "github.com/Mic92/nix-build-uncached"; + vendorSha256 = null; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/nix-build-uncached \ + --prefix PATH ":" ${lib.makeBinPath [ nix ]} + ''; + + meta = with lib; { + description = "A CI friendly wrapper around nix-build"; + license = licenses.mit; + homepage = "https://github.com/Mic92/nix-build-uncached"; + maintainers = [ maintainers.mic92 ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e32522158c..c3d3fa04d75 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10668,6 +10668,8 @@ in pythonPackages = python3Packages; }; + nix-build-uncached = callPackage ../development/tools/misc/nix-build-uncached { }; + nexus = callPackage ../development/tools/repository-managers/nexus { }; nwjs = callPackage ../development/tools/nwjs { -- cgit v1.2.3 From 044e733e8dbb652984f0db45506b8eed514b267e Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 16 May 2020 23:14:53 +0200 Subject: bcompare: do not use aliases --- pkgs/applications/version-management/bcompare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/bcompare/default.nix b/pkgs/applications/version-management/bcompare/default.nix index d8a6ec05844..93c725db260 100644 --- a/pkgs/applications/version-management/bcompare/default.nix +++ b/pkgs/applications/version-management/bcompare/default.nix @@ -1,4 +1,4 @@ -{ autoPatchelfHook, bzip2, cairo, coreutils, fetchurl, gdk-pixbuf, gnome2, gtk2, kcoreaddons, ki18n, kio, kservice, lib, qt4, qtbase, stdenv, runtimeShell }: +{ autoPatchelfHook, bzip2, cairo, coreutils, fetchurl, gdk-pixbuf, pango, gtk2, kcoreaddons, ki18n, kio, kservice, lib, qt4, qtbase, stdenv, runtimeShell }: stdenv.mkDerivation rec { pname = "bcompare"; @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ stdenv.cc.cc.lib gtk2 - gnome2.pango + pango cairo kio kservice -- cgit v1.2.3 From 1241af5dd32beb5cdc9abbe670228b6c949ce309 Mon Sep 17 00:00:00 2001 From: ccellado Date: Sat, 16 May 2020 23:29:38 +0300 Subject: maintainers: add ccellado --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 72d20a5a702..5d49fc7b40c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1280,6 +1280,12 @@ githubId = 64804; name = "Dennis Gosnell"; }; + ccellado = { + email = "annplague@gmail.com"; + github = "ccellado"; + githubId = 44584960; + name = "Denis Khalmatov"; + }; ceedubs = { email = "ceedubs@gmail.com"; github = "ceedubs"; -- cgit v1.2.3 From 221e5eba47110ef9a174e2c5caf66351609c16ba Mon Sep 17 00:00:00 2001 From: ccellado Date: Sat, 16 May 2020 23:26:19 +0300 Subject: glpaper: init at unstable-2020-03-30 --- pkgs/development/tools/glpaper/default.nix | 29 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/tools/glpaper/default.nix diff --git a/pkgs/development/tools/glpaper/default.nix b/pkgs/development/tools/glpaper/default.nix new file mode 100644 index 00000000000..94d140552a1 --- /dev/null +++ b/pkgs/development/tools/glpaper/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchhg, meson, ninja, pkg-config, wlroots, wayland, wayland-protocols +, libX11, libGL }: + +stdenv.mkDerivation { + name = "glpaper"; + version = "unstable-2020-03-30"; + + src = fetchhg { + url = "https://hg.sr.ht/~scoopta/glpaper"; + rev = "a95db77088dfb5636a87f3743fc9b5eca70c1ae2"; + sha256 = "04y12910wvhy4aqx2sa63dy9l6nbs7b77yqpdhc96x2b3mgzgjfs"; + }; + + nativeBuildInputs = [ meson ninja pkg-config ]; + buildInputs = [ + wayland + libX11 # required by libglvnd + libGL + ]; + + meta = with stdenv.lib; { + description = + "Wallpaper program for wlroots based Wayland compositors such as sway that allows you to render glsl shaders as your wallpaper"; + homepage = "https://hg.sr.ht/~scoopta/glpaper"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ ccellado ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a22878b284e..d4e6c6df5ba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1856,6 +1856,8 @@ in gixy = callPackage ../tools/admin/gixy { }; + glpaper = callPackage ../development/tools/glpaper { }; + gllvm = callPackage ../development/tools/gllvm { }; glide = callPackage ../development/tools/glide { }; -- cgit v1.2.3 From bf311f1b97dd215bed713f7ae90abbf46d62fdd3 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 16 May 2020 22:14:06 +0200 Subject: pkger: init at 0.16.0 --- pkgs/development/libraries/pkger/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/libraries/pkger/default.nix diff --git a/pkgs/development/libraries/pkger/default.nix b/pkgs/development/libraries/pkger/default.nix new file mode 100644 index 00000000000..4a489127ca5 --- /dev/null +++ b/pkgs/development/libraries/pkger/default.nix @@ -0,0 +1,26 @@ +{ buildGoModule +, fetchFromGitHub +, lib +, stdenv +}: + +buildGoModule rec { + pname = "pkger"; + version = "0.16.0"; + + src = fetchFromGitHub { + owner = "markbates"; + repo = "pkger"; + rev = "v${version}"; + sha256 = "0fpvrgww5h40l2js7raarx6gpysafvj75x26ljx4qz925x8nb6zn"; + }; + + vendorSha256 = "1b9gpym6kb4hpdbrixphfh1qylmqr265jrmcd4vxb87ahvrsrvgp"; + + meta = with stdenv.lib; { + description = "Embed static files in Go binaries (replacement for gobuffalo/packr) "; + homepage = "https://github.com/markbates/pkger"; + license = licenses.mit; + maintainers = with maintainers; [ flokli ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e32522158c..aed020fbe49 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -302,6 +302,8 @@ in pet = callPackage ../development/tools/pet { }; + pkger = callPackage ../development/libraries/pkger { }; + run = callPackage ../development/tools/run { }; mod = callPackage ../development/tools/mod { }; -- cgit v1.2.3 From a26035f05f9385bc1d57209cef4d2b3aa8f767cf Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sun, 17 May 2020 09:15:28 +1000 Subject: cri-o: 1.18.0 -> 1.18.1 https://github.com/cri-o/cri-o/releases/tag/v1.18.1 --- pkgs/applications/virtualization/cri-o/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 3796b8857b7..95f8580cb39 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.18.0"; + version = "1.18.1"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "142flmv54pj48rjqkd26fbxrcbx2cv6pdmrc33jgyvn6r99zliah"; + sha256 = "1fd7ix329kqimysqfh8yl29c0hwrddlirq9bnz95mrllhsgn8kw2"; }; vendorSha256 = null; outputs = [ "out" "man" ]; -- cgit v1.2.3 From 3f4703424c55c2f68cca308760c0d0c65c84f339 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 16 May 2020 23:19:57 +0000 Subject: capstone: 4.0.1 -> 4.0.2 --- pkgs/development/libraries/capstone/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix index b8d00984cd6..5140205ebc8 100644 --- a/pkgs/development/libraries/capstone/default.nix +++ b/pkgs/development/libraries/capstone/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "capstone"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { url = "https://github.com/aquynh/capstone/archive/${version}.tar.gz"; - sha256 = "1isxw2qwy1fi3m3w7igsr5klzczxc5cxndz0a78dfss6ps6ymfvr"; + sha256 = "0sjjbqps48az4map0kmai7j7dak3gy0xcq0sgx8fg09g0acdg0bw"; }; # replace faulty macos detection -- cgit v1.2.3 From 8b3301c6fffac7d9cd41f410267f6c749c10c9ca Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 16 May 2020 23:28:37 +0000 Subject: cargo-about: 0.2.0 -> 0.2.2 --- pkgs/tools/package-management/cargo-about/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/cargo-about/default.nix b/pkgs/tools/package-management/cargo-about/default.nix index 82da6b7b93c..84bea234c20 100644 --- a/pkgs/tools/package-management/cargo-about/default.nix +++ b/pkgs/tools/package-management/cargo-about/default.nix @@ -1,16 +1,16 @@ { lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "cargo-about"; - version = "0.2.0"; + version = "0.2.2"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-about"; rev = "${version}"; - sha256 = "0bsay1vqi5b3z7qjwbkwx3ikmpjzc0kswbajm50xmcwlg8jrn420"; + sha256 = "00ing1v6vjqfvirp3mbayn8rwvxf72wnhz9249k2iifw8bl2r2hd"; }; - cargoSha256 = "1ynalwaqa70ihgras3frp5l3xniz58hwp108wkxn6zj8lwxbxfgx"; + cargoSha256 = "1wmw7knkx79fbwizaj9qkcnw0ld1lsfhca8mfpn5f0daxa5v5y97"; meta = with lib; { description = "Cargo plugin to generate list of all licenses for a crate"; -- cgit v1.2.3 From 89f69a2848025029609d035688b46ac608009570 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 17 May 2020 00:35:54 +0100 Subject: melpaPackages: Make all overrides shared --- .../editors/emacs-modes/melpa-packages.nix | 237 +++++++++++---------- 1 file changed, 121 insertions(+), 116 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index ed1550de768..f228d34a654 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -22,42 +22,50 @@ instantenous and formats commits for you. */ -{ lib, external, pkgs }: variant: self: let - - dontConfigure = pkg: if pkg != null then pkg.override (args: { - melpaBuild = drv: args.melpaBuild (drv // { - dontConfigure = true; - }); - }) else null; - - markBroken = pkg: if pkg != null then pkg.override (args: { - melpaBuild = drv: args.melpaBuild (drv // { - meta = (drv.meta or {}) // { broken = true; }; - }); - }) else null; - - externalSrc = pkg : epkg : if pkg != null then pkg.override (args : { - melpaBuild = drv : args.melpaBuild (drv // { - inherit (epkg) src version; - - propagatedUserEnvPkgs = [ epkg ]; - }); - }) else null; - - fix-rtags = pkg : if pkg != null then dontConfigure (externalSrc pkg external.rtags) - else null; - - generateMelpa = lib.makeOverridable ({ - archiveJson ? ./recipes-archive-melpa.json - }: let - - inherit (import ./libgenerated.nix lib self) melpaDerivation; - super = lib.listToAttrs (builtins.filter (s: s != null) - (map (melpaDerivation variant) - (lib.importJSON archiveJson))); - - overrides = rec { - shared = rec { +{ lib, external, pkgs }: variant: self: +let + dontConfigure = pkg: + if pkg != null then pkg.override (args: { + melpaBuild = drv: args.melpaBuild (drv // { + dontConfigure = true; + }); + }) else null; + + markBroken = pkg: + if pkg != null then pkg.override (args: { + melpaBuild = drv: args.melpaBuild (drv // { + meta = (drv.meta or { }) // { broken = true; }; + }); + }) else null; + + externalSrc = pkg: epkg: + if pkg != null then pkg.override (args: { + melpaBuild = drv: args.melpaBuild (drv // { + inherit (epkg) src version; + + propagatedUserEnvPkgs = [ epkg ]; + }); + }) else null; + + fix-rtags = pkg: + if pkg != null then dontConfigure (externalSrc pkg external.rtags) + else null; + + generateMelpa = lib.makeOverridable ({ archiveJson ? ./recipes-archive-melpa.json + }: + let + inherit (import ./libgenerated.nix lib self) melpaDerivation; + super = ( + lib.listToAttrs (builtins.filter + (s: s != null) + (map + (melpaDerivation variant) + (lib.importJSON archiveJson) + ) + ) + ); + + overrides = { # Expects bash to be at /bin/bash ac-rtags = fix-rtags super.ac-rtags; @@ -65,12 +73,11 @@ instantenous and formats commits for you. inherit (self.melpaPackages) powerline; }; - auto-complete-clang-async = super.auto-complete-clang-async.overrideAttrs(old: { + auto-complete-clang-async = super.auto-complete-clang-async.overrideAttrs (old: { buildInputs = old.buildInputs ++ [ external.llvmPackages.llvm ]; CFLAGS = "-I${external.llvmPackages.clang}/include"; LDFLAGS = "-L${external.llvmPackages.clang}/lib"; }); - emacsClangCompleteAsync = auto-complete-clang-async; # part of a larger package caml = dontConfigure super.caml; @@ -87,7 +94,7 @@ instantenous and formats commits for you. dune = dontConfigure super.dune; - emacsql-sqlite = super.emacsql-sqlite.overrideAttrs(old: { + emacsql-sqlite = super.emacsql-sqlite.overrideAttrs (old: { buildInputs = old.buildInputs ++ [ pkgs.sqlite ]; postBuild = '' @@ -116,12 +123,12 @@ instantenous and formats commits for you. evil-magit = super.evil-magit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); eopengrok = super.eopengrok.overrideAttrs (attrs: { nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); ess-R-data-view = super.ess-R-data-view.override { @@ -131,17 +138,17 @@ instantenous and formats commits for you. forge = super.forge.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); flycheck-rtags = fix-rtags super.flycheck-rtags; gnuplot = super.gnuplot.overrideAttrs (old: { nativeBuildInputs = - (old.nativeBuildInputs or []) ++ [ pkgs.autoreconfHook ]; + (old.nativeBuildInputs or [ ]) ++ [ pkgs.autoreconfHook ]; }); - pdf-tools = super.pdf-tools.overrideAttrs(old: { + pdf-tools = super.pdf-tools.overrideAttrs (old: { nativeBuildInputs = [ external.pkgconfig ]; buildInputs = with external; old.buildInputs ++ [ autoconf automake libpng zlib poppler ]; preBuild = "make server/epdfinfo"; @@ -158,7 +165,7 @@ instantenous and formats commits for you. }); irony = super.irony.overrideAttrs (old: { - cmakeFlags = old.cmakeFlags or [] ++ [ "-DCMAKE_INSTALL_BINDIR=bin" ]; + cmakeFlags = old.cmakeFlags or [ ] ++ [ "-DCMAKE_INSTALL_BINDIR=bin" ]; NIX_CFLAGS_COMPILE = "-UCLANG_RESOURCE_DIR"; preConfigure = '' cd server @@ -192,115 +199,115 @@ instantenous and formats commits for you. magit = super.magit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-find-file = super.magit-find-file.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-gh-pulls = super.magit-gh-pulls.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-imerge = super.magit-imerge.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-lfs = super.magit-lfs.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-org-todos = super.magit-org-todos.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-stgit = super.magit-stgit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-tbdiff = super.magit-tbdiff.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-topgit = super.magit-topgit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-vcsh = super.magit-vcsh.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-gerrit = super.magit-gerrit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-annex = super.magit-annex.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-todos = super.magit-todos.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-filenotify = super.magit-filenotify.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-gitflow = super.magit-gitflow.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magithub = super.magithub.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-svn = super.magit-svn.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); kubernetes = super.kubernetes.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); kubernetes-evil = super.kubernetes-evil.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); # upstream issue: missing file header @@ -323,7 +330,7 @@ instantenous and formats commits for you. }); # Telega has a server portion for it's network protocol - telega = super.telega.overrideAttrs(old: { + telega = super.telega.overrideAttrs (old: { buildInputs = old.buildInputs ++ [ pkgs.tdlib ]; postBuild = '' @@ -341,21 +348,24 @@ instantenous and formats commits for you. treemacs-magit = super.treemacs-magit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); vdiff-magit = super.vdiff-magit.overrideAttrs (attrs: { nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); - zmq = super.zmq.overrideAttrs(old: { + zmq = super.zmq.overrideAttrs (old: { stripDebugList = [ "share" ]; preBuild = '' make ''; nativeBuildInputs = [ - external.autoconf external.automake external.pkgconfig external.libtool + external.autoconf + external.automake + external.pkgconfig + external.libtool (external.zeromq.override { enableDrafts = true; }) ]; postInstall = '' @@ -377,9 +387,6 @@ instantenous and formats commits for you. markdown-mode-plus = super."markdown-mode+"; package-plus = super."package+"; rect-plus = super."rect+"; - }; - - stable = shared // { # upstream issue: missing file header bufshow = markBroken super.bufshow; @@ -390,9 +397,6 @@ instantenous and formats commits for you. # upstream issue: missing file header dictionary = markBroken super.dictionary; - # missing git - egg = markBroken super.egg; - # upstream issue: missing file header elmine = markBroken super.elmine; @@ -411,8 +415,6 @@ instantenous and formats commits for you. # upstream issue: doesn't build eterm-256color = markBroken super.eterm-256color; - helm-rtags = fix-rtags super.helm-rtags; - # upstream issue: missing file header qiita = markBroken super.qiita; @@ -431,9 +433,6 @@ instantenous and formats commits for you. # upstream issue: missing file header window-numbering = markBroken super.window-numbering; - }; - - unstable = shared // { editorconfig = super.editorconfig.overrideAttrs (attrs: { propagatedUserEnvPkgs = [ external.editorconfig-core-c ]; }); @@ -441,7 +440,7 @@ instantenous and formats commits for you. egg = super.egg.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); # missing dependencies @@ -452,85 +451,85 @@ instantenous and formats commits for you. kapacitor = super.kapacitor.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); gerrit = super.gerrit.overrideAttrs (attrs: { nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); gerrit-download = super.gerrit-download.overrideAttrs (attrs: { nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); github-pullrequest = super.github-pullrequest.overrideAttrs (attrs: { nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); helm-rtags = fix-rtags super.helm-rtags; jist = super.jist.overrideAttrs (attrs: { nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); mandoku = super.mandoku.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); mandoku-tls = super.mandoku-tls.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-p4 = super.magit-p4.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-rbr = super.magit-rbr.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-diff-flycheck = super.magit-diff-flycheck.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-reviewboard = super.magit-reviewboard.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-patch-changelog = super.magit-patch-changelog.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); magit-circleci = super.magit-circleci.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; }); orgit = (super.orgit.overrideAttrs (attrs: { # searches for Git at build time nativeBuildInputs = - (attrs.nativeBuildInputs or []) ++ [ external.git ]; - })); + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + })); # tries to write to $HOME php-auto-yasnippets = super.php-auto-yasnippets.overrideAttrs (attrs: { @@ -548,7 +547,7 @@ instantenous and formats commits for you. inherit (self.melpaPackages) powerline; }; - vterm = super.vterm.overrideAttrs(old: { + vterm = super.vterm.overrideAttrs (old: { buildInputs = old.buildInputs ++ [ self.emacs pkgs.cmake pkgs.libvterm-neovim ]; cmakeFlags = [ "-DEMACS_SOURCE=${self.emacs.src}" @@ -564,32 +563,38 @@ instantenous and formats commits for you. rm -rf $out/share/emacs/site-lisp/elpa/vterm-**/{CMake*,build,*.c,*.h} ''; }); - # Legacy alias - emacs-libvterm = unstable.vterm; - - # Map legacy renames from emacs2nix since code generation was ported to emacs lisp - _0xc = super."0xc"; - _2048-game = super."2048-game"; - _4clojure = super."4clojure"; - at = super."@"; - term-plus = super."term+"; - term-plus-key-intercept = super."term+key-intercept"; - term-plus-mux = super."term+mux"; - xml-plus = super."xml+"; w3m = super.w3m.override (args: { melpaBuild = drv: args.melpaBuild (drv // { prePatch = - let w3m = "${lib.getBin external.w3m}/bin/w3m"; in '' + let w3m = "${lib.getBin external.w3m}/bin/w3m"; in + '' substituteInPlace w3m.el \ - --replace 'defcustom w3m-command nil' \ - 'defcustom w3m-command "${w3m}"' + --replace 'defcustom w3m-command nil' \ + 'defcustom w3m-command "${w3m}"' ''; }); }); }; - }; - - in super // overrides.${variant}); -in generateMelpa { } + # Deprecated legacy aliases for backwards compat + aliases = lib.listToAttrs (lib.attrValues (lib.mapAttrs (n: v: { name = v; value = builtins.trace "Melpa attribute '${v}' is a legacy alias that will be removed in 21.03, use '${n}' instead" melpaPackages.${n}; }) (lib.filterAttrs (n: v: lib.hasAttr n melpaPackages) { + "auto-complete-clang-async" = "emacsClangCompleteAsync"; + "vterm" = "emacs-libvterm"; + "0xc" = "_0xc"; + "2048-game" = "_2048-game"; + "4clojure" = "_4clojure"; + "@" = "at"; + "term+" = "term-plus"; + "term+key-intercept" = "term-plus-key-intercept"; + "term+mux" = "term-plus-mux"; + "xml+" = "xml-plus"; + }))); + + melpaPackages = lib.mapAttrs (n: v: if lib.hasAttr n overrides then overrides.${n} else v) super; + + in + melpaPackages // aliases); + +in +generateMelpa { } -- cgit v1.2.3 From 7139d39cd3e842f35c51ddd335b1f8baeb388a49 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 17 May 2020 00:41:14 +0100 Subject: emacsPackages: Add org packages to update-from-overlay script --- pkgs/applications/editors/emacs-modes/update-from-overlay | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/update-from-overlay b/pkgs/applications/editors/emacs-modes/update-from-overlay index 26d2482e7ae..fc5657e4419 100755 --- a/pkgs/applications/editors/emacs-modes/update-from-overlay +++ b/pkgs/applications/editors/emacs-modes/update-from-overlay @@ -7,9 +7,13 @@ set -euxo pipefail curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/elpa/elpa-generated.nix nix-instantiate ../../../.. -A emacsPackagesNg.elpaPackages --show-trace -git diff --exit-code elpa-generated.nix > /dev/null || git commit -m "elpa-packages: $(date --iso)" -- elpa-generated.nix +git diff --exit-code elpa-generated.nix > /dev/null || git commit -m "emacsPackages.elpa-packages: $(date --iso)" -- elpa-generated.nix + +curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/org/org-generated.nix +nix-instantiate ../../../.. -A emacsPackagesNg.orgPackages --show-trace +git diff --exit-code org-generated.nix > /dev/null || git commit -m "emacsPackages.org-packages: $(date --iso)" -- org-generated.nix curl -s -O https://raw.githubusercontent.com/nix-community/emacs-overlay/master/repos/melpa/recipes-archive-melpa.json env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaStablePackages env NIXPKGS_ALLOW_BROKEN=1 nix-instantiate --show-trace ../../../../ -A emacsPackages.melpaPackages -git diff --exit-code recipes-archive-melpa.json > /dev/null || git commit -m "melpa-packages: $(date --iso)" -- recipes-archive-melpa.json +git diff --exit-code recipes-archive-melpa.json > /dev/null || git commit -m "emacsPackages.melpa-packages: $(date --iso)" -- recipes-archive-melpa.json -- cgit v1.2.3 From 6fe3d08fdf92537fd10cb77afe67f9e15c226b31 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 17 May 2020 00:43:11 +0100 Subject: emacsPackages.elpa-packages: 2020-05-17 --- .../editors/emacs-modes/elpa-generated.nix | 81 +++++++++++++++++----- 1 file changed, 63 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix index 4a9f1e9a2b0..b1b33dc9354 100644 --- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix +++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix @@ -39,10 +39,10 @@ elpaBuild { pname = "ada-mode"; ename = "ada-mode"; - version = "7.0.1"; + version = "7.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ada-mode-7.0.1.tar"; - sha256 = "0iqninv4wf4ap8axk9m0gi39j3kq4jpbpdc8hczd34xrp83ml46a"; + url = "https://elpa.gnu.org/packages/ada-mode-7.1.1.tar"; + sha256 = "11ch0dn478ddzkcjcyqf2rjim7w0fjb8xfijqxxi07847w4gkklp"; }; packageRequires = [ emacs uniquify-files wisi ]; meta = { @@ -1036,6 +1036,21 @@ license = lib.licenses.free; }; }) {}; + eldoc = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "eldoc"; + ename = "eldoc"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/eldoc-1.0.0.el"; + sha256 = "0jdqnndvpz929rbfgrm2bgw3z2vp7dvvgk3wnhvlhf63mdiza89m"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/eldoc.html"; + license = lib.licenses.free; + }; + }) {}; eldoc-eval = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "eldoc-eval"; @@ -1382,10 +1397,10 @@ elpaBuild { pname = "gnu-elpa"; ename = "gnu-elpa"; - version = "1.0"; + version = "1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnu-elpa-1.0.tar"; - sha256 = "0ywwlsyvl2g49k0krk35z15l2drqg3rdf26786rw65vz4ip2j3id"; + url = "https://elpa.gnu.org/packages/gnu-elpa-1.1.tar"; + sha256 = "0b0law1xwwqa42wb09b3w73psq2kx16lkiwxjxl0sshjcmarhv8r"; }; packageRequires = []; meta = { @@ -2470,10 +2485,10 @@ elpaBuild { pname = "phps-mode"; ename = "phps-mode"; - version = "0.3.46"; + version = "0.3.48"; src = fetchurl { - url = "https://elpa.gnu.org/packages/phps-mode-0.3.46.tar"; - sha256 = "1chyhfn90c23awxdmmg9z870ipbdrg47sglgid7n598dx84qyqyz"; + url = "https://elpa.gnu.org/packages/phps-mode-0.3.48.tar"; + sha256 = "1mnbrsgh6lx7kgkfsfq5zk78a97iwh8mxgxzyf1zq4jj6ziwd6bv"; }; packageRequires = [ emacs ]; meta = { @@ -2526,6 +2541,21 @@ license = lib.licenses.free; }; }) {}; + project = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "project"; + ename = "project"; + version = "0.1.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/project-0.1.2.el"; + sha256 = "0713hwim1chf6lxpg1rb234aa1gj92c153fjlc4jddp6dzzgn50d"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/project.html"; + license = lib.licenses.free; + }; + }) {}; psgml = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "psgml"; @@ -3360,10 +3390,10 @@ elpaBuild { pname = "uniquify-files"; ename = "uniquify-files"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/uniquify-files-1.0.2.tar"; - sha256 = "1vib79wsz5k94b9z0wiwhbzsdm70y9dla6szw2bb75245cx3kr0h"; + url = "https://elpa.gnu.org/packages/uniquify-files-1.0.3.tar"; + sha256 = "04yfys615ncz3jyh3hx5sg6x6szx028223184zv52skb4j99vkwq"; }; packageRequires = [ emacs ]; meta = { @@ -3674,10 +3704,10 @@ elpaBuild { pname = "wisi"; ename = "wisi"; - version = "3.0.1"; + version = "3.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wisi-3.0.1.tar"; - sha256 = "01961apbirdi4y8qx2wb01f04knkw3hyin3ndrkjlkfslqbsnzzv"; + url = "https://elpa.gnu.org/packages/wisi-3.1.1.tar"; + sha256 = "0abm9xfyk2izi0w9172sfhdq83abcxgbngngbh2gby54df0ycn0q"; }; packageRequires = [ emacs seq ]; meta = { @@ -3694,10 +3724,10 @@ elpaBuild { pname = "wisitoken-grammar-mode"; ename = "wisitoken-grammar-mode"; - version = "1.0.3"; + version = "1.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wisitoken-grammar-mode-1.0.3.tar"; - sha256 = "1vljnhi35vix30xch9mziczg56ss1r615yn2pgdcw8wa8sm14crw"; + url = "https://elpa.gnu.org/packages/wisitoken-grammar-mode-1.1.0.tar"; + sha256 = "123z9j76cm0p22d9n4kqvn2477fdkgp5jarw564nd71cxrrb52ms"; }; packageRequires = [ emacs mmm-mode wisi ]; meta = { @@ -3780,6 +3810,21 @@ license = lib.licenses.free; }; }) {}; + xref = callPackage ({ elpaBuild, emacs, fetchurl, lib, project }: + elpaBuild { + pname = "xref"; + ename = "xref"; + version = "1.0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/xref-1.0.1.el"; + sha256 = "17wlwilm2d1gvin8mkkqnpw2skjx0klxfs1pqpy8rrzdfpsb55li"; + }; + packageRequires = [ emacs project ]; + meta = { + homepage = "https://elpa.gnu.org/packages/xref.html"; + license = lib.licenses.free; + }; + }) {}; yasnippet = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }: elpaBuild { pname = "yasnippet"; -- cgit v1.2.3 From 3c5a9403293f3e829204a90b21412900112b108a Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 17 May 2020 00:43:12 +0100 Subject: emacsPackages.org-packages: 2020-05-17 --- pkgs/applications/editors/emacs-modes/org-generated.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/org-generated.nix b/pkgs/applications/editors/emacs-modes/org-generated.nix index 4ff1db1c743..4beb5750166 100644 --- a/pkgs/applications/editors/emacs-modes/org-generated.nix +++ b/pkgs/applications/editors/emacs-modes/org-generated.nix @@ -4,10 +4,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "20200504"; + version = "20200511"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20200504.tar"; - sha256 = "1nalr2jafhzfkaf4bn8kscxd7nm1wz7dbw2629j2msxknw76dwk1"; + url = "https://orgmode.org/elpa/org-20200511.tar"; + sha256 = "147k6nmq00milw5knyhw01z481rcdl6s30vk4fkjidw508nkmg9c"; }; packageRequires = []; meta = { @@ -19,10 +19,10 @@ elpaBuild { pname = "org-plus-contrib"; ename = "org-plus-contrib"; - version = "20200504"; + version = "20200511"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20200504.tar"; - sha256 = "1ykw3qspz18jgf3ngsvk2ys282489fcjrbk7pbv3ppxzjha4rmhb"; + url = "https://orgmode.org/elpa/org-plus-contrib-20200511.tar"; + sha256 = "1hsdp7n985404zdqj6gyfw1bxxbs0p3bf4fyizvgji21zxwnf63f"; }; packageRequires = []; meta = { -- cgit v1.2.3 From b47873026c7e356a340d0e1de7789d4e8428ac66 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 17 May 2020 00:43:39 +0100 Subject: emacsPackages.melpa-packages: 2020-05-17 --- .../editors/emacs-modes/recipes-archive-melpa.json | 1513 ++++++++++---------- 1 file changed, 760 insertions(+), 753 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json index d6015f4cbba..a10df779103 100644 --- a/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json @@ -960,8 +960,8 @@ "auto-complete", "yasnippet" ], - "commit": "05dfe7a2a48978971bce2f3d21027262e3a33916", - "sha256": "07sd5cxbx0sbnqznygj7j4daxc5zrbihrv21xjsz5q6af623ldpj" + "commit": "8db6d911f2e19bbef5fe915e42c4e12f283bfd41", + "sha256": "0yzad3bc48xdmkgcsffdj9zx9j853w1k2p2v586bcfl2vmvvq3zj" }, "stable": { "version": [ @@ -986,8 +986,8 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20200425, - 835 + 20200516, + 52 ], "deps": [ "dash", @@ -997,8 +997,8 @@ "s", "xcscope" ], - "commit": "05dfe7a2a48978971bce2f3d21027262e3a33916", - "sha256": "07sd5cxbx0sbnqznygj7j4daxc5zrbihrv21xjsz5q6af623ldpj" + "commit": "8db6d911f2e19bbef5fe915e42c4e12f283bfd41", + "sha256": "0yzad3bc48xdmkgcsffdj9zx9j853w1k2p2v586bcfl2vmvvq3zj" }, "stable": { "version": [ @@ -1360,14 +1360,14 @@ "repo": "abo-abo/ace-link", "unstable": { "version": [ - 20200509, - 1252 + 20200515, + 1854 ], "deps": [ "avy" ], - "commit": "c215d331cf65bf47ad0224480f1f916f64f2a955", - "sha256": "05cvm7zz2c116sr8a2p9rc771i8w4pqkwvwc2hw99g84kf2abaaf" + "commit": "b610dcb99510328d07ab1e1ea67b2f87ecb1cc5b", + "sha256": "0r7cyvrkbqq0dsm5963wn2i1wqgq0md5r8b2afjbr3m9b6v5lnq4" }, "stable": { "version": [ @@ -1817,14 +1817,14 @@ "repo": "Malabarba/aggressive-indent-mode", "unstable": { "version": [ - 20200421, - 1149 + 20200512, + 1207 ], "deps": [ "cl-lib" ], - "commit": "58348d29adf8d2f23da2798badd7f89ff59cd7cc", - "sha256": "1d9hi36ml449x7qqpvcgxqx0r88jpqf1pq9k38af66ny3vd6zwl6" + "commit": "12a64b4e5c1a1e124baa74336738b6ae1972607f", + "sha256": "1pkqjg30l9sjh5m8w4p8qrlw92sxr28c3d7mq6h8sfc8dkgivd33" }, "stable": { "version": [ @@ -1963,14 +1963,14 @@ "repo": "AnthonyDiGirolamo/airline-themes", "unstable": { "version": [ - 20200501, - 1837 + 20200511, + 1543 ], "deps": [ "powerline" ], - "commit": "5ea031bcbdf665afea7e47e519a49e2c33978833", - "sha256": "1jx17g8a6pxkw4zlx3fwhqgxfzcf3019k8fklykamfrkharzsc2l" + "commit": "a6a3bd55baee29bd372869c835aded0f7d5e5f76", + "sha256": "1yg9wdagysfa5xswdrnwngbzf7gmdhjsl40ivqnxxvb74adxcwp6" }, "stable": { "version": [ @@ -3238,11 +3238,11 @@ "repo": "emacsorphanage/anzu", "unstable": { "version": [ - 20200331, - 1717 + 20200514, + 1801 ], - "commit": "896b2be2ebb1408b8f6a49e12375229fc64fcf41", - "sha256": "047ipsyldkmpn1vw8rsnhqwc7j2cjbwb9nz0ms3r3gmyyrgc3k0g" + "commit": "7b8688c84d6032300d0c415182c7c1ad6cb7f819", + "sha256": "09x4hhycnv4sc472fqv7z8jpjx8viap5hb143yri3wkwa15bqd3b" }, "stable": { "version": [ @@ -4593,11 +4593,11 @@ "repo": "mina86/auto-dim-other-buffers.el", "unstable": { "version": [ - 20200510, - 1903 + 20200516, + 1608 ], - "commit": "a87cf772ac4517864bd11e6d053d7dcedd802012", - "sha256": "112hj631m8dv6hfip0s63kr42nwl8l5b1vzqi3dwsg2xddrsws85" + "commit": "f712de72d4618ce6c5d55ba20c848c83a87c5f32", + "sha256": "17dsdfs9l3g4jnna5b2pzifvxv13rr5rja76frl5wwp2brfmq8qv" } }, { @@ -5082,8 +5082,8 @@ 20190331, 2230 ], - "commit": "b3b85a1a4589430e9255a4ea28c4e94787c6b0fe", - "sha256": "148m78rlymxx5sr17xbvi5v864ki66jkg2hkszhyk9za4f0mgdx0" + "commit": "bcd3d76a47b4f0e7c382fb680b14f40208dae568", + "sha256": "0sgzjddd34icbbm4pc7v1662k6288pkr70ki4p2j3q4mh9qqc8q7" } }, { @@ -5902,11 +5902,11 @@ "repo": "bazelbuild/emacs-bazel-mode", "unstable": { "version": [ - 20200509, - 1902 + 20200515, + 1408 ], - "commit": "d0a0284575764cc9efdb3709fe3c320fd0c0873c", - "sha256": "0wbh06xsq9yqzvdfkmqbjggnfpspykyvahpcgmvrwg4kn3dlk3hd" + "commit": "39d4649f4a179e22fabbef1166afe1725c8dbea6", + "sha256": "0n5kqjcmwfbr58my3yisgfigh77rhy5b18jr4kh2b327r76ssqwl" }, "stable": { "version": [ @@ -6626,8 +6626,8 @@ "repo": "tmalsburg/helm-bibtex", "unstable": { "version": [ - 20200508, - 945 + 20200513, + 852 ], "deps": [ "biblio", @@ -6637,8 +6637,8 @@ "parsebib", "s" ], - "commit": "3e773f7957c1acabb8390c00cc8d49e192ee36bd", - "sha256": "0mmnrj0x6fdczm9acy5fqjrzd4iwzm6w8bcmhy1yx36f73d2whpl" + "commit": "8a0dd9841316793aacddea744d6b8ca4a7857a35", + "sha256": "1av058d7888kr3q15y1122r8jkarfw1s83gvkillj7kyzj3i53m5" }, "stable": { "version": [ @@ -7411,16 +7411,16 @@ "repo": "jyp/boon", "unstable": { "version": [ - 20200507, - 1851 + 20200514, + 1227 ], "deps": [ "dash", "expand-region", "multiple-cursors" ], - "commit": "6427c39ace4a1bd34d573773bc896a863e8503a2", - "sha256": "1gg6f9zaggqrb1cd258p3slv1rx083vpwlkgfgwlf8v8i8yr4bxp" + "commit": "57271ed2ddca96c77b83b282019852d1cffffd26", + "sha256": "0mmyxi75hlg1lkvpk4lq5nagmcsmjijmkcmmkkq25llf7nmik8as" }, "stable": { "version": [ @@ -7444,15 +7444,15 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20200430, - 2304 + 20200513, + 1954 ], "deps": [ "epkg", "magit" ], - "commit": "067aa52079c49ecca97ca2d5d870a883b040d53b", - "sha256": "1wiaxr529zyk2m2jvags412qx079b0fwdzgw3nrvhvhcs3bwfwkr" + "commit": "f6a2e0cb8c3db5840c717114caba93793f2e9661", + "sha256": "1sa0wk7xj3qsk9fr4z2av80gp8n0804zylx3d27pdwm8bjyfzf7b" }, "stable": { "version": [ @@ -8452,11 +8452,11 @@ "repo": "jorgenschaefer/emacs-buttercup", "unstable": { "version": [ - 20200412, - 1148 + 20200509, + 2224 ], - "commit": "532d082a363add4f6d9838ca3f924a773ce12136", - "sha256": "10ls012jy8ax43ldlvb86xjn9hsdayvw1k7wg4g8w5hmkd8x98wn" + "commit": "e71a40f1ffef4847df28c9d4ad7edc1e360ee52a", + "sha256": "0avmxbxxsazd14h5avsrqh2yyfnp8jan64sbp5ih2c9hm7xv5p1k" }, "stable": { "version": [ @@ -9571,15 +9571,15 @@ "repo": "ema2159/centaur-tabs", "unstable": { "version": [ - 20200325, - 1236 + 20200511, + 1242 ], "deps": [ "cl-lib", "powerline" ], - "commit": "e6bf9f5257fa5401695e0e33d0376a0821ac2f2f", - "sha256": "1gm06par7pglwj25ydvlp1n2vniq6283mm0g4s53ra77ywsz73jv" + "commit": "57afd81c7fd6449239af7adcda4cd2192976dbb8", + "sha256": "1sa4anfqvhidn7kxqnchk0d8kc2v0l3cxbf0bnwwx7nk04gjvshg" }, "stable": { "version": [ @@ -9706,8 +9706,8 @@ 20171115, 2108 ], - "commit": "57125f74cc91ed6890346eee7948300437b6cb5e", - "sha256": "1131hx3chpl8qsl33xmnmqkb62cwpzfc0dks52mhcx0xy8wzds6r" + "commit": "dc0e180cbaf73e86d22f1d2996c7582dd0eb07b5", + "sha256": "0n9f87syrj30dn5k4vq1l7i02hzwfnadanfjbwv4a9wfjl77xy53" }, "stable": { "version": [ @@ -10305,8 +10305,8 @@ "s", "seq" ], - "commit": "282c338c21d01932049392f271f66e1725562efd", - "sha256": "1ljjqzghcap4admv0hvw6asm148b80mfgjgxjjcw6qc95fkjjjlr" + "commit": "16f2ca86540001b40725c4099d04154aab0a6ba5", + "sha256": "19z8wmhsqbm12h0vvzfgjmzj7g3mcpa9qgcz3cnmrr4hgkx4b9a5" }, "stable": { "version": [ @@ -10379,8 +10379,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20200507, - 1639 + 20200511, + 1025 ], "deps": [ "clojure-mode", @@ -10391,8 +10391,8 @@ "sesman", "spinner" ], - "commit": "3a59fe046c9884573512dff88d140d37c0be7b2c", - "sha256": "0fs4mny2qg73nlnjr6ynaa7vqiyklp7mwfyph2195hrrac0f3dq4" + "commit": "25fb15d915117310069254016391c9d76abcebcc", + "sha256": "1hz2l2ryllwyv1zk0la376klg7yndz9q32pd1vypwymwnac93c0y" }, "stable": { "version": [ @@ -11464,8 +11464,8 @@ "repo": "atilaneves/cmake-ide", "unstable": { "version": [ - 20190731, - 1009 + 20200515, + 951 ], "deps": [ "cl-lib", @@ -11473,8 +11473,8 @@ "s", "seq" ], - "commit": "e3aa1ded10c079337826b40586111df7114f6379", - "sha256": "1s1z3m3qaf6ayp69w7h95ad3k4bs2iqqzsvjf94h5wd233mqlp2v" + "commit": "a8f9e83848b513f810170988679a9ef455025975", + "sha256": "1dzqqcj9l7hr73cj65rx5iy58bsiif5521d18jym4pajhzj3mkx0" }, "stable": { "version": [ @@ -11501,8 +11501,8 @@ 20190710, 1319 ], - "commit": "c2460c0e63e965c6315db666af27dc39bd5a0477", - "sha256": "19xk1m92kx50jqrbfjhklywlsv0rll9qaywkqkpg9cag1pd86bx2" + "commit": "135b5835a42d6e3c7efb85f80f3fe0885d45d644", + "sha256": "18mgkn5cy14f5l4qajhdphxvw66hhhw2yf12qfvpd2n5bx3b8dcs" }, "stable": { "version": [ @@ -13454,8 +13454,8 @@ "dash", "org-roam" ], - "commit": "b5af6f2e783bfb337c8f0ae33674e0963c71cea0", - "sha256": "16nh58ih73q014crlm3iw55h04klb76g80zf43lmxilbhxyxk9x4" + "commit": "674c2bd493f571c5323d69279557a6c18ccbd14e", + "sha256": "1x88kvxawbpg4sagi0kh4y7inyhy05dxcg8hl0ih4x40cwxyxrs5" }, "stable": { "version": [ @@ -13486,8 +13486,8 @@ "cl-lib", "company" ], - "commit": "05dfe7a2a48978971bce2f3d21027262e3a33916", - "sha256": "07sd5cxbx0sbnqznygj7j4daxc5zrbihrv21xjsz5q6af623ldpj" + "commit": "8db6d911f2e19bbef5fe915e42c4e12f283bfd41", + "sha256": "0yzad3bc48xdmkgcsffdj9zx9j853w1k2p2v586bcfl2vmvvq3zj" }, "stable": { "version": [ @@ -13584,15 +13584,15 @@ "repo": "tumashu/company-posframe", "unstable": { "version": [ - 20200408, - 400 + 20200514, + 2116 ], "deps": [ "company", "posframe" ], - "commit": "9b59cd679c4396cbfe8118a9dfa8a5acfe038ac6", - "sha256": "1z18libg2nplx8a8dcycdzm354gczqzg8r37agzz0jk1a7frxa7m" + "commit": "4e506d661ed9cd2e4cf16281f3a11009210e9c30", + "sha256": "1h6pls6vg593cbmvq2kh5z67jvcyljvwbdxypqqsls5d22hvvbh5" }, "stable": { "version": [ @@ -14837,14 +14837,14 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20200507, - 2247 + 20200512, + 1130 ], "deps": [ "swiper" ], - "commit": "84efa3a2cbb9c5b0bbcc8d2e90671434eed74f94", - "sha256": "1nijxgqhd357dnjbhqjwnb68lkdcd9hpcxsbv8dfiigmaw7k2wqq" + "commit": "04ca16420053a3a6d34a96f0d680dd449c2e5851", + "sha256": "1sjaf026zim28c9cld0w5hlk9inp1map70ip99smlk483ib6lbj3" }, "stable": { "version": [ @@ -14984,26 +14984,26 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20200501, - 540 + 20200514, + 1224 ], "deps": [ "counsel" ], - "commit": "b03f02e7838199895a7b11cc8b2915f4746f1eba", - "sha256": "08nij19m51vzw8gy2sjxzflsqlnh2ink1ickh9sc4zwifbryimyy" + "commit": "362fc857a271e509d05fa190212629dc6b0778f2", + "sha256": "0c9p6pfnzdbxaib1vgm1npp8lgyw0hpczi210c26x8p9d8xx19lw" }, "stable": { "version": [ 1, 9, - 7 + 8 ], "deps": [ "counsel" ], - "commit": "b03f02e7838199895a7b11cc8b2915f4746f1eba", - "sha256": "08nij19m51vzw8gy2sjxzflsqlnh2ink1ickh9sc4zwifbryimyy" + "commit": "362fc857a271e509d05fa190212629dc6b0778f2", + "sha256": "0c9p6pfnzdbxaib1vgm1npp8lgyw0hpczi210c26x8p9d8xx19lw" } }, { @@ -15280,8 +15280,8 @@ "deps": [ "counsel" ], - "commit": "da451df4c5f0ba32056ec600e8eb6a2c7ca4df08", - "sha256": "18qlwyjqxap2qfbz14ma6yqp4p3v4q2y8idc355s4szjdd2as2lr" + "commit": "719b38ba2242cc1c6d1d79cab106c8c8b1afa775", + "sha256": "1jjgyps59xiyqdi392cfbx19n0znw3kj3fxbc5v3l56i3qm24bd4" }, "stable": { "version": [ @@ -16482,8 +16482,8 @@ 20190111, 2150 ], - "commit": "9e04e1ee5b1ab67391bf461e9d1f0ef8d6049902", - "sha256": "013bhb4yb55525lvplnqhia5wlik807dvvh6zim3zimxzyv4b66c" + "commit": "d6e6de9237bde72e7878f7b1fe0e58fdccd36dd2", + "sha256": "0lac5lqina90w8mdjkqa9qk4b52lmh6kibcph1xcjghqlw7agjfn" }, "stable": { "version": [ @@ -16690,8 +16690,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20200511, - 425 + 20200514, + 1655 ], "deps": [ "bui", @@ -16702,8 +16702,8 @@ "lsp-treemacs", "s" ], - "commit": "3b8fd16cda74a4834594f487b7a540cc165470cf", - "sha256": "0jy70lj5krnj87icb1mgy30chr5jxhmiwy6cm2w2n7k8bp63jh6w" + "commit": "86fc65d525e30c0249e7ec6acac5e4e55cd7c3e2", + "sha256": "1jfrjrbjscjsa52wjvvmhcl4cqrw43wz4f34z8yzsxmsalgpf0nw" }, "stable": { "version": [ @@ -17107,30 +17107,30 @@ "repo": "jcs-elpa/dashboard-ls", "unstable": { "version": [ - 20200329, - 1443 + 20200515, + 1430 ], "deps": [ "dashboard", "f", "s" ], - "commit": "9026fd157f94b023a7b660a418b66ad638b14272", - "sha256": "1r78w47897qd9ki24mqxl3kgr2anzybfqv5x91y4xsvrk0siir64" + "commit": "8b2922abb75847787626fe241d609cff7eabf840", + "sha256": "19i6rd0yk90yw9cib2xg72mc667jarfwgh30xh4jfkpdl1j2481h" }, "stable": { "version": [ 0, 1, - 2 + 3 ], "deps": [ "dashboard", "f", "s" ], - "commit": "9026fd157f94b023a7b660a418b66ad638b14272", - "sha256": "1r78w47897qd9ki24mqxl3kgr2anzybfqv5x91y4xsvrk0siir64" + "commit": "8b2922abb75847787626fe241d609cff7eabf840", + "sha256": "19i6rd0yk90yw9cib2xg72mc667jarfwgh30xh4jfkpdl1j2481h" } }, { @@ -17774,11 +17774,11 @@ "repo": "jrblevin/deft", "unstable": { "version": [ - 20181226, - 1534 + 20200515, + 1513 ], - "commit": "f54e8a65a7e75a029657364055420374df45656d", - "sha256": "1vas6jgwli0jcxmxmcwvzwv4414q8kkmhqfz5m96r7l4lpgcrhdr" + "commit": "fca9ea05ef4fdac825e2ad3921baa7042f6b82c8", + "sha256": "0h5znwc4sa92l2472204yn60z30ysvkr9hphjga7kn4j4jgvqak1" }, "stable": { "version": [ @@ -20171,11 +20171,11 @@ "repo": "progfolio/doct", "unstable": { "version": [ - 20200504, - 2258 + 20200514, + 2215 ], - "commit": "992d14ca51ccc1e27c9c4a09f89b072cd6cb3fe3", - "sha256": "0ajyhric6008ik1mzlcmk0i856a3plhk0bri7chc9w7wz4lwshpv" + "commit": "1bcec209e12200c9b93b0d95f61b964b5de4439c", + "sha256": "03lbsww77vq1wrpj94jdx62zmjjhir9i50g85l8yadlp9696zh3s" } }, { @@ -20290,16 +20290,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20200502, - 434 + 20200513, + 1103 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "df56aad083243124cbd346c1b9ae38b5ebdd2340", - "sha256": "0zylvc8nfpgmss1j8rkln3z23vdav1cqfr2c9s59i9fwd9sv7q0k" + "commit": "2b308857677e983ca4eaedc36438ed94aadf9e65", + "sha256": "1c7mk26drz9yldy3kvcxxnabg8ph900pj1g029xhd1407x417vqc" }, "stable": { "version": [ @@ -20324,14 +20324,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20200507, - 524 + 20200514, + 2115 ], "deps": [ "cl-lib" ], - "commit": "34f181c290d2c9fb9628e4ec85c16e633931ede1", - "sha256": "161hp69n3zwnyb9f9pxpidx7jw3190v16j1fgsdsa08c1pq46q8m" + "commit": "95463eac68fe88535d9342c7b4c2cbaae3c80950", + "sha256": "0ccq6gzahpsxsgmmd9dl16mfnz1n9sgn0ns62n03s3xgmf4ay3ap" }, "stable": { "version": [ @@ -20536,11 +20536,11 @@ "repo": "david-christiansen/dr-racket-like-unicode", "unstable": { "version": [ - 20161021, - 1211 + 20200513, + 1642 ], - "commit": "a69e364532fffa451d1f12ade8fadb9cdbd8318c", - "sha256": "12pwfv0j54idvn061l3qxf0vrrl56085n517izh8x6jkgxjcx7k0" + "commit": "70bc1caea6b277e49e1cb29e1926a7b0c83c5ebc", + "sha256": "1an4hk9cjg1lhis0japdr371mnf1p4pl5mzl0l1cfkvprbxhzy65" }, "stable": { "version": [ @@ -20560,11 +20560,11 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20200429, - 1947 + 20200514, + 1527 ], - "commit": "e5cbc350f49a30ad78a84e68b4e1682d018c9b7f", - "sha256": "1gakipj027mncv3g18ap6lshj89s8cg5wscabr3afs9gavkp52py" + "commit": "c162aff5025a7e9f55785d7177d59f4a3aa60183", + "sha256": "11wlrvrz3q054nqkdbd4525kh50cspszrgmqd74plah6jc95wpa3" }, "stable": { "version": [ @@ -20890,17 +20890,16 @@ "repo": "jacktasia/dumb-jump", "unstable": { "version": [ - 20200423, - 1658 + 20200513, + 2014 ], "deps": [ "dash", - "f", "popup", "s" ], - "commit": "d760aa880fc1052570ab0fd7e586eeffb7636af6", - "sha256": "0a27fv2yi4c19g78hgflrp8vx135v74q6n8ak3g3b2gh66vkvq7p" + "commit": "194bfdbe305e21d8e6d29893d449686c85273207", + "sha256": "0lz5kajhkqh18xyg07bshvl0v5j5g5xj4q8p6min1mapm8shnv2i" }, "stable": { "version": [ @@ -20944,8 +20943,8 @@ 20191016, 1241 ], - "commit": "73a70c02aa569f92e7c7bda21ff1728e37af53cf", - "sha256": "1ifya6ri0yz8bbncs1qm5ip9pjzq6ykgv1ilya51hggxwf3fs1db" + "commit": "e5bec1a57fd4ebeedc848e76e0cf991db7e22fd0", + "sha256": "091z6p93sv3aqf7bcw41nwh4kvvpsfncjny2fwcv3vv7zlyj2px2" }, "stable": { "version": [ @@ -21411,8 +21410,8 @@ "popup", "request" ], - "commit": "9e923e32f21134bb89196a169f5a3f2aecfe45cb", - "sha256": "1r8s83dc3ibp687fywfsgs2kc95j2s153ncrgxldqvsp24k1wm8x" + "commit": "2dfdcdbcd8eb81c3fd631372d7dceb4f432d5f1e", + "sha256": "19j7r14qxh2cl4zi4vssbbqjhp6r53gjavnwyihk52llxcgrxrr7" }, "stable": { "version": [ @@ -21613,26 +21612,26 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20200419, - 2017 + 20200513, + 2326 ], "deps": [ "parsebib" ], - "commit": "87920ab793e6e854903eb101b80a0746f588dab6", - "sha256": "0mw5spmjn8yyjbdpas06rf9cmfsfa3k2z0yfrs7xvmaalpxz55xm" + "commit": "6499e4a67f2772a29128864a8f7606a78fb73b45", + "sha256": "0css7pfyqz834f8awc632mwlfcph3mrsqwbxvrlaw59bc3hgxjdv" }, "stable": { "version": [ 2, - 22, + 23, 1 ], "deps": [ "parsebib" ], - "commit": "cd37aaa9a11e3b2232b8aa12cfe9a8ae9b830b10", - "sha256": "0spiz5r2y4pdpyc4d3f9w228giq0j9rm8f5h5akzn5rwiq9pfkwz" + "commit": "6499e4a67f2772a29128864a8f7606a78fb73b45", + "sha256": "0css7pfyqz834f8awc632mwlfcph3mrsqwbxvrlaw59bc3hgxjdv" } }, { @@ -22409,8 +22408,8 @@ 20200107, 2333 ], - "commit": "9b17c3a0033d7a4dbcfb48e8fbc50a0d5e073057", - "sha256": "1f3sz0wfx60qv9b0ciqiwnvz46f8xbpnb5x3c9531mfccfhx71ix" + "commit": "1809fd4c001a4ae2fa5e2b721b67c1059fb8e9b8", + "sha256": "0ssh0chavas524jwj3r9bywkd8rgnbjz4xcgxhbnjfcl786pmyw7" }, "stable": { "version": [ @@ -22430,15 +22429,18 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20200507, - 2251 + 20200516, + 1013 ], "deps": [ + "eldoc", "flymake", - "jsonrpc" + "jsonrpc", + "package", + "xref" ], - "commit": "bb51d47dd6e59e5bef1bfb393a39a73a7811d0ee", - "sha256": "0rs15c1biaqjpkxx32dc59w1z9gnd31n13qb80gb9ib8li1cgnr1" + "commit": "bf75312b8e7ea5136905d7a55a6d705b51b2b6c9", + "sha256": "1xbisdraj04jns0vcpcvnqqiwib3b8jpbian1nnmllvscfdz6c7l" }, "stable": { "version": [ @@ -22461,28 +22463,28 @@ "repo": "non-Jedi/eglot-jl", "unstable": { "version": [ - 20200508, - 1552 + 20200514, + 2034 ], "deps": [ "eglot", "julia-mode" ], - "commit": "65c70b8203684a34de16868583e2424de41b9ab6", - "sha256": "16jmpkqhkxaqj37d5qax5b2x003pas71rw3k3rlzindhmqnhd0as" + "commit": "844f12d881a3305d319e959b032e01501be1e8ae", + "sha256": "0na70zn0s09nihzki6kfnb5hc2j2wqfffj50kwdzjfs53m4sl1s7" }, "stable": { "version": [ - 1, - 3, + 2, + 0, 0 ], "deps": [ "eglot", "julia-mode" ], - "commit": "65c70b8203684a34de16868583e2424de41b9ab6", - "sha256": "16jmpkqhkxaqj37d5qax5b2x003pas71rw3k3rlzindhmqnhd0as" + "commit": "844f12d881a3305d319e959b032e01501be1e8ae", + "sha256": "0na70zn0s09nihzki6kfnb5hc2j2wqfffj50kwdzjfs53m4sl1s7" } }, { @@ -22555,8 +22557,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20200508, - 1712 + 20200514, + 2040 ], "deps": [ "anaphora", @@ -22567,8 +22569,8 @@ "request", "websocket" ], - "commit": "e39a48334607cacd42011f21fa56ebf291258a1b", - "sha256": "1fk9aryjwh88jmb2a45rs0z7h6sy4r53h1qpairl5bi1jllgg3lb" + "commit": "ec3aa36bf37a78e99723563e38f81ee24b855524", + "sha256": "0pr14dv4bbxgpki8kd1z9i07x1khb0v2wr82483qf3hhqafv6lrm" }, "stable": { "version": [ @@ -22642,8 +22644,8 @@ "repo": "kostafey/ejc-sql", "unstable": { "version": [ - 20200502, - 36 + 20200516, + 1604 ], "deps": [ "auto-complete", @@ -22652,8 +22654,8 @@ "direx", "spinner" ], - "commit": "4aca86cea6b3120b10af52eab26cefdef2965574", - "sha256": "07gn75njy0hmiddymj4khw59mrnzwml0dqpzm0g5il697v4rpqgj" + "commit": "b02e0bbc6df08a4ae44d16ac57886e56cfb8095d", + "sha256": "0vs4kcdval7klzbs21jq2rcxs013r7rskpxgjc7lrq1qrsgyyq9d" }, "stable": { "version": [ @@ -23126,11 +23128,11 @@ "repo": "doublep/eldev", "unstable": { "version": [ - 20200510, - 1521 + 20200515, + 1905 ], - "commit": "f345065592b4bc9a5173b44e12a74400335d4e49", - "sha256": "0gf7sfdrnyndgbkpm2pz3056y0d06iy6pwhr63sbm7g4x79j9yjd" + "commit": "a76712621a4851fdb0bc3d76f454898afefedf6e", + "sha256": "1jc6l0pcsyv9wgp58ij9wvjj4x4a3zz4svsna2aq86pf8bbbyng9" }, "stable": { "version": [ @@ -24178,20 +24180,20 @@ "url": "git://thelambdalab.xyz/elpher.git", "unstable": { "version": [ - 20191212, - 1858 + 20200516, + 1232 ], - "commit": "c9175aedfaf3daeca6b2414f74ef703f2f6cbc1f", - "sha256": "18jps4rn9nmjxlkg2849rh7bp7pg5zfx7yhhmq078jkvnygv3m2l" + "commit": "bea10793f68037947b6fec30a86316ca2123bbfa", + "sha256": "0n5z9vf5yzmdccmzfvs7xb6gxvlvgsfcdfw8m25zi1lajpjajhq6" }, "stable": { "version": [ 2, - 5, - 2 + 7, + 1 ], - "commit": "12629c283e0e3e62561d1456a2f8842b3524df57", - "sha256": "023ih6bgqf98jgzqy03nplwxhabaj9x9dqk3c8bmd50ndgrspc7q" + "commit": "bea10793f68037947b6fec30a86316ca2123bbfa", + "sha256": "0n5z9vf5yzmdccmzfvs7xb6gxvlvgsfcdfw8m25zi1lajpjajhq6" } }, { @@ -25294,15 +25296,15 @@ "repo": "iqbalansari/emacs-emojify", "unstable": { "version": [ - 20200503, - 836 + 20200513, + 1627 ], "deps": [ "ht", "seq" ], - "commit": "20d4fc0ea45a53f7edbe99c83317a3e048e398ef", - "sha256": "1snlx70dy8kjknrydbpf3vkrdrzwsy0mb5vlj273vhm3nmjbs2mg" + "commit": "dfa3c6d060914c6082d6837da32df0c337330ee4", + "sha256": "0m963cn916m0xa8cb1yslkcla86a34dchwy3ism62a2r9swa7p6s" }, "stable": { "version": [ @@ -25813,25 +25815,25 @@ "repo": "atomontage/erc-crypt", "unstable": { "version": [ - 20200510, - 429 + 20200511, + 2235 ], "deps": [ "cl-lib" ], - "commit": "8165a5f1e0190a45029d610dc442c9eaa6e82c11", - "sha256": "0icrrps06j27v69pqglv3j7h4nc5mpcqqwziasv403lpm4bb8hcz" + "commit": "6d158b39ea2833b753858153eb110da9b8a40fc4", + "sha256": "0pj330x5j9rnwcv2la2yc6w3vsg53c9ij0f3q9zi2psxbr268xi0" }, "stable": { "version": [ 2, - 0 + 1 ], "deps": [ "cl-lib" ], - "commit": "0a820043490c47c60d2fc968a5120308eea3d7e7", - "sha256": "1427hlavz6j232clrh4vbgwjahm328kvj7hls3s6hziicf2kdczx" + "commit": "6d158b39ea2833b753858153eb110da9b8a40fc4", + "sha256": "0pj330x5j9rnwcv2la2yc6w3vsg53c9ij0f3q9zi2psxbr268xi0" } }, { @@ -26150,14 +26152,14 @@ "repo": "mhayashi1120/Emacs-erefactor", "unstable": { "version": [ - 20160121, - 959 + 20200513, + 1252 ], "deps": [ "cl-lib" ], - "commit": "bf68085e5635eb94fd85709f8e1355c1f5534745", - "sha256": "1v8x6qmhywfxs7crzv7hfl5n4zq5y3ar40l873946l4wyk0wclng" + "commit": "bfe27a1b8c7cac0fe054e76113e941efa3775fe8", + "sha256": "1071gqli1qd498syhysyj2wzyw1nya5070m82xd9qalqdh11b8is" }, "stable": { "version": [ @@ -26235,18 +26237,16 @@ 20200313, 1030 ], - "commit": "9639877ea11d6a32ca6e46410b8a48db245b72d8", - "sha256": "19sdribjxzn13drqv0jcjwbmddkjvnm1iyx1njdlfaaq0625q8w3" + "commit": "e5d476b5f22927d341caf1774355d9e69e390cfa", + "sha256": "1kcdl56qybvq4m5dp65n3nbg6xijb793xi25yckk5nc17n1nwrzb" }, "stable": { "version": [ 23, - 0, - -1, - 3 + 0 ], - "commit": "9f17d424ada5353db1e5b31296484d95679f8ca8", - "sha256": "0012fbf9a1whq2bzii73m645bvf4vww403fcd54j9k27916vcfx5" + "commit": "7a8d04dbcb388a5d837a213ad249c1b96e19e998", + "sha256": "0hw0js0man58m5mdrzrig5q1agifp92wxphnbxk1qxxbl6ccs6ls" } }, { @@ -27036,14 +27036,14 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20200503, - 1654 + 20200516, + 522 ], "deps": [ "julia-mode" ], - "commit": "2e7d36dc9b500ce21c5cb8534ea573669f93ee0b", - "sha256": "1kjpgspjpipirc48acb3d6bfsrmd8yrz35ck1sx0id7y8nni1d8k" + "commit": "8f04fa92a11cdb4a3777755fdbaaa65e076f04ef", + "sha256": "10cg90aqlr5y3vmp94zhkwj3l178l9f32igpl38bzxm9hmdgikfr" }, "stable": { "version": [ @@ -27368,22 +27368,22 @@ "dash", "paredit" ], - "commit": "0fe2d3fa0fd1739ec096f149dc067b586e05c75c", - "sha256": "0gswgn99pqikw44mp4v6b4bxvh6bj132gq5x3swvkmi3f56l0bry" + "commit": "c8e5f31a2476c922857d921e367b6a2320ce5a6f", + "sha256": "1mrssbl0wyc6iij8zk1y3h9bd3rv53nnrxsij7fn67l1m4z0clyn" }, "stable": { "version": [ 0, 9, - 6 + 7 ], "deps": [ "ace-window", "dash", "paredit" ], - "commit": "7e2b42570b449b2a3c2922f3036a027d1e393a60", - "sha256": "0x97flv356kd7j6wbhacz0lmsrdd9as87b0n6nliq5n0y30my8dy" + "commit": "c8e5f31a2476c922857d921e367b6a2320ce5a6f", + "sha256": "1mrssbl0wyc6iij8zk1y3h9bd3rv53nnrxsij7fn67l1m4z0clyn" } }, { @@ -27492,16 +27492,16 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20200417, - 1238 + 20200516, + 1740 ], "deps": [ "cl-lib", "goto-chg", "undo-tree" ], - "commit": "d243eae8649272799ec3864fde14c1164f036940", - "sha256": "0fpjcxyzql7fl904asxbff3gqdc1byhwn32i38r4zd4bqrqsqfw4" + "commit": "3f3b2fea87172f155e5f91d75f0fb69d8648acf2", + "sha256": "0ihb42v513c9jrh8d0v5a76ykhqi408cdnfpilrwq9499qr22jdg" }, "stable": { "version": [ @@ -27526,15 +27526,15 @@ "repo": "emacsorphanage/evil-anzu", "unstable": { "version": [ - 20170124, - 718 + 20200514, + 1902 ], "deps": [ "anzu", "evil" ], - "commit": "9bca6ca14d865e7e005bc02a28a09b4ae74facc9", - "sha256": "1y0jiglcazxnvggs5ljys2iizljsihlgr46svbbwgf45ibdrw392" + "commit": "d3f6ed4773b48767bd5f4708c7f083336a8a8a86", + "sha256": "0ribvnw2slaad4xlcyxhg3linvd810qqn52qpyrjsq0dnqrpmwyl" }, "stable": { "version": [ @@ -27695,16 +27695,16 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20200509, - 853 + 20200513, + 804 ], "deps": [ "annalist", "cl-lib", "evil" ], - "commit": "d062cc206d671fb5aefb1e0e679a9cb1d6c73e33", - "sha256": "1zizfqmfrxx3shgggwa74rg2qqbrs8704wf94ajx0k11dbm1dbrp" + "commit": "e998952dfe73d296259905e1bd8f96659bfe2661", + "sha256": "1r896jbshniaxxh15iw87yklnr2hq5as3a8w6xb202gxz5pvc4ym" }, "stable": { "version": [ @@ -29029,8 +29029,8 @@ "deps": [ "evil" ], - "commit": "d243eae8649272799ec3864fde14c1164f036940", - "sha256": "0fpjcxyzql7fl904asxbff3gqdc1byhwn32i38r4zd4bqrqsqfw4" + "commit": "3f3b2fea87172f155e5f91d75f0fb69d8648acf2", + "sha256": "0ihb42v513c9jrh8d0v5a76ykhqi408cdnfpilrwq9499qr22jdg" }, "stable": { "version": [ @@ -31410,8 +31410,8 @@ "string-utils", "tabulated-list" ], - "commit": "1b8b3460f1e3c3c1784b2a63fb9f4fb3bb4dc084", - "sha256": "1x4k8890pzdcizzl0p6v96ylrx5xid9ykgrmggx0b3y0gx0vhwic" + "commit": "5cddb64e0d52635e9a1529d80cb5cefa6f829341", + "sha256": "0kl2b4j93kk9lzw0qclib55ghcwznag3p022jkr0bq5z30m2gdj4" }, "stable": { "version": [ @@ -31944,8 +31944,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20200509, - 2127 + 20200516, + 1719 ], "deps": [ "dash", @@ -31953,8 +31953,8 @@ "pkg-info", "seq" ], - "commit": "33db306f3b8733592c170a5f7d7445465f47c10d", - "sha256": "0pl0ywg2aaifhj5gzj3ka5pklbbag2aa28gn7faaqwjhkknbka8n" + "commit": "309d37286729994094b931344c9a664dd7c6c08d", + "sha256": "1gsa4lik5f0dzn897lh369nmcn7n61if80ll5jc5qiymm1fx16cr" }, "stable": { "version": [ @@ -32821,25 +32821,25 @@ "url": "https://git.deparis.io/flycheck-grammalecte/", "unstable": { "version": [ - 20200510, - 1334 + 20200515, + 1120 ], "deps": [ "flycheck" ], - "commit": "1743f1dd935a7949cb81b543b98b8dfca7c58fd8", - "sha256": "0v6f15s5gr9ddxk2ya30gf8vk47m2zk0d1l102v87ll5d67f40ly" + "commit": "8608df3144714d79b93afcfe13400693ed763ed8", + "sha256": "1ibcalim4mp9676szbvrf69nhfbc8vy47anmpqi9idjvdf6bpm75" }, "stable": { "version": [ 1, - 1 + 2 ], "deps": [ "flycheck" ], - "commit": "1743f1dd935a7949cb81b543b98b8dfca7c58fd8", - "sha256": "0v6f15s5gr9ddxk2ya30gf8vk47m2zk0d1l102v87ll5d67f40ly" + "commit": "8608df3144714d79b93afcfe13400693ed763ed8", + "sha256": "1ibcalim4mp9676szbvrf69nhfbc8vy47anmpqi9idjvdf6bpm75" } }, { @@ -33697,15 +33697,15 @@ "repo": "flycheck/flycheck-pos-tip", "unstable": { "version": [ - 20180610, - 1615 + 20200516, + 1600 ], "deps": [ "flycheck", "pos-tip" ], - "commit": "909113977d37739387c7f099d74a724cfe6efcec", - "sha256": "0rfbhvl8n656a9d58bjyzki9r3si3ypylbyjn67rnla4jzzi22v8" + "commit": "dc57beac0e59669926ad720c7af38b27c3a30467", + "sha256": "15h4m5cfk0vh1g630vlwfxmcpa1jdalrrldnvijsqla99mb2jm1w" }, "stable": { "version": [ @@ -35317,8 +35317,8 @@ 20200215, 1408 ], - "commit": "fd8ac7a4f922ce5ea1cc5d4583a7d584847cb6b5", - "sha256": "1z7gcppp8nv4zm6giqwahc1svw1fa2ynjy5y3230dwcfn98m73c3" + "commit": "76b2b4bc9d6d8e9c6b1f41ed7f887eddb6ac6e13", + "sha256": "0zapn6508iafm61z2y2bxcydd45kg5hgx39zm6g6qhvq92ysj2cf" }, "stable": { "version": [ @@ -35345,8 +35345,8 @@ "avy-menu", "flyspell-correct" ], - "commit": "fd8ac7a4f922ce5ea1cc5d4583a7d584847cb6b5", - "sha256": "1z7gcppp8nv4zm6giqwahc1svw1fa2ynjy5y3230dwcfn98m73c3" + "commit": "76b2b4bc9d6d8e9c6b1f41ed7f887eddb6ac6e13", + "sha256": "0zapn6508iafm61z2y2bxcydd45kg5hgx39zm6g6qhvq92ysj2cf" }, "stable": { "version": [ @@ -35377,8 +35377,8 @@ "flyspell-correct", "helm" ], - "commit": "fd8ac7a4f922ce5ea1cc5d4583a7d584847cb6b5", - "sha256": "1z7gcppp8nv4zm6giqwahc1svw1fa2ynjy5y3230dwcfn98m73c3" + "commit": "76b2b4bc9d6d8e9c6b1f41ed7f887eddb6ac6e13", + "sha256": "0zapn6508iafm61z2y2bxcydd45kg5hgx39zm6g6qhvq92ysj2cf" }, "stable": { "version": [ @@ -35402,15 +35402,15 @@ "repo": "d12frosted/flyspell-correct", "unstable": { "version": [ - 20200215, - 1503 + 20200513, + 708 ], "deps": [ "flyspell-correct", "ivy" ], - "commit": "fd8ac7a4f922ce5ea1cc5d4583a7d584847cb6b5", - "sha256": "1z7gcppp8nv4zm6giqwahc1svw1fa2ynjy5y3230dwcfn98m73c3" + "commit": "76b2b4bc9d6d8e9c6b1f41ed7f887eddb6ac6e13", + "sha256": "0zapn6508iafm61z2y2bxcydd45kg5hgx39zm6g6qhvq92ysj2cf" }, "stable": { "version": [ @@ -35441,8 +35441,8 @@ "flyspell-correct", "popup" ], - "commit": "fd8ac7a4f922ce5ea1cc5d4583a7d584847cb6b5", - "sha256": "1z7gcppp8nv4zm6giqwahc1svw1fa2ynjy5y3230dwcfn98m73c3" + "commit": "76b2b4bc9d6d8e9c6b1f41ed7f887eddb6ac6e13", + "sha256": "0zapn6508iafm61z2y2bxcydd45kg5hgx39zm6g6qhvq92ysj2cf" }, "stable": { "version": [ @@ -35999,15 +35999,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20200422, - 1731 + 20200513, + 1930 ], "deps": [ "cl-lib", "language-id" ], - "commit": "c157b57e963da0b44a079b0477d6c742e9c5a10b", - "sha256": "15pqff80ydcvkvbiyi50aix5mnwgrhvvajk60i6cwgkb2xghs20r" + "commit": "0227e1aadeb18db397f03368d54cbefe4afd6112", + "sha256": "0p04xgswp269a17jpiwpj8qfj3c2zvkmr4vn0wa1dfrw5f5bfj2x" }, "stable": { "version": [ @@ -36144,14 +36144,14 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20200416, - 841 + 20200516, + 624 ], "deps": [ "seq" ], - "commit": "5998d977ca84930e124558007dc65370164ed960", - "sha256": "1hmc3pacscr0f02cw6hbbv444k07k5gf1909lyz8jpfr5r5wi2in" + "commit": "83d308b6fd26662bc8fb204c4d634616e03dca44", + "sha256": "0a068qfc969bvxyynrk2yakv2l3y31snnvcpdsbxd4m4m6drv3lw" }, "stable": { "version": [ @@ -36737,14 +36737,14 @@ "repo": "factor/factor", "unstable": { "version": [ - 20190611, - 1350 + 20200514, + 1516 ], "deps": [ "cl-lib" ], - "commit": "484d564b5d2a5e6dd9c3f522b35cfeef2164c437", - "sha256": "105x7mrip5xbyhimgqx1nb0lkyi68j5fpfhc6y0dzm4c4bf77jfm" + "commit": "68f6eeb3adbc7d9f71d24761600bf8538775c969", + "sha256": "16iz2wf8bn4mjcgbc5vj50snlgiqqdc495kxbd9mcld5rjhfs45q" }, "stable": { "version": [ @@ -37289,11 +37289,11 @@ "repo": "jaor/geiser", "unstable": { "version": [ - 20200510, - 1813 + 20200513, + 1219 ], - "commit": "95950e3bfb8407f8925dd8717053bf688bb4df7d", - "sha256": "03jhqzd22swyvg1ry4b4ssvyjqqq5sqh0xa9q3zs7cgm9jjhxbkg" + "commit": "7a39c8eb7ca2a0a4fe0ad307ea55578e11e6dfdd", + "sha256": "09lv9ixgrkb351nb67nas5yfa8vk0rz4ljhc1hxxn4g451hbd14f" }, "stable": { "version": [ @@ -37331,14 +37331,14 @@ "repo": "noctuid/general.el", "unstable": { "version": [ - 20200425, - 1425 + 20200516, + 50 ], "deps": [ "cl-lib" ], - "commit": "42e38034cd2305fa7432866323c923979d8f9b06", - "sha256": "0aalp4x5gp0yhv037ymspsj4n3vqzxld0c1nk8ihl50k6krl4kxy" + "commit": "a0b17d207badf462311b2eef7c065b884462cb7c", + "sha256": "0wn5rk3gkimdklip392mnjrmkymgrb7q9skifi03cbpjam1anzvv" } }, { @@ -38113,8 +38113,8 @@ "transient", "with-editor" ], - "commit": "9a388a61d95761b9c748dc186602ba7c691d580f", - "sha256": "00bsmb6n4n69ms1zz0axyhsa75j38v4ja3qam3qpbcr67arkcqpa" + "commit": "d05545ec2fd7edf915eaf1b9c15c785bb08975cc", + "sha256": "11aqyy4r9hrdi9nlypd70hn8384b6q89c7xavgv8c5q7f2g5z9qg" }, "stable": { "version": [ @@ -39198,11 +39198,11 @@ "url": "https://git.launchpad.net/global-tags.el", "unstable": { "version": [ - 20200427, - 1637 + 20200511, + 2146 ], - "commit": "8a273c9bfa57776b00095a648c2aa053cc418e91", - "sha256": "0msd5ffvhd44m129i03f04v7x6x0l667nxi435c4kp6m8h0za603" + "commit": "5239c1ba873eb907d5665964820b4a7ddbf75b5c", + "sha256": "0yp1hq849drkkbypaaak36i5s1q9ff549w21qswmi60nmiikabsg" } }, { @@ -39526,8 +39526,8 @@ "org", "s" ], - "commit": "053a4303b8e9d3b8a67fe58e6f87ba6c76c90a97", - "sha256": "1lygfkgmzvy7iwc8d55j6ypfhf5wfybch1ksqcndyjklhd2n0v5j" + "commit": "c5c057263ecc86f60b62a1e811e63cfb1c394c15", + "sha256": "1rfkc6pp2kkin87hbjz1192hb6hf24ygiyd6zigs3bfaxja313rp" }, "stable": { "version": [ @@ -39547,20 +39547,20 @@ "repo": "unhammer/gnus-recent", "unstable": { "version": [ - 20190423, - 1146 + 20200513, + 1038 ], - "commit": "d9375cfad0054a05c910c1210f0f37aa601aebba", - "sha256": "19ggfisfxq2bk62axdi0nipwxymrvnnvmijcrwc9yglbnhiigdb5" + "commit": "a7b131c5acd10df2949ef4f799af08ded013bc35", + "sha256": "0cx0764ksxmjnryjwya3h49r1c5npyipxv16amad1lyysm4a8q0a" }, "stable": { "version": [ 0, - 2, + 3, 0 ], - "commit": "df85e5810c02f613bfa6e236674de969d6e00ae1", - "sha256": "0hvsp9y0vzcr9c2wglh0wdavjmp2n2hbhlsr1bfvnfxk97ka0y5r" + "commit": "a7b131c5acd10df2949ef4f799af08ded013bc35", + "sha256": "0cx0764ksxmjnryjwya3h49r1c5npyipxv16amad1lyysm4a8q0a" } }, { @@ -40488,8 +40488,8 @@ 20180130, 1736 ], - "commit": "95d408ee1120e7b7a32d9e79dbdceb77e5787b7f", - "sha256": "05c7si8hp1n2jhcknab4qkdv9wkzpzb7355vr4cvh6l5aqi4qryr" + "commit": "7a59e424c8e641605e30eed68197859533ea6aaf", + "sha256": "1w9hf7bcdd5ddjavhj0ggnxipf5f5w3cfj52n9i46jmm6g2x2b5g" } }, { @@ -40851,8 +40851,8 @@ "magit-popup", "s" ], - "commit": "d3d5c59428e3f27a166d29641651b68690ba41d3", - "sha256": "1ixzjcca432xsi3f8pd7hs7js63xh84h3472xnd0qjk97bxhn995" + "commit": "0c56c1e833bc9e21b603539a19bdfe4836a197ed", + "sha256": "0iaa34hh0zpy9alf0d6bad7qwk565l9k5k09ig342pwnmigz1scs" }, "stable": { "version": [ @@ -41665,14 +41665,14 @@ "repo": "greduan/emacs-theme-gruvbox", "unstable": { "version": [ - 20200505, - 852 + 20200514, + 740 ], "deps": [ "autothemer" ], - "commit": "6e2fcbdb0608e6381ab86287ef84451d672bd3ef", - "sha256": "1z3dl9d6v1bl6b7mai8b6i8i2ywxjzbmfqjdhanb926mrkn5h22k" + "commit": "f1dfcd8bd50e4885cab71b174bbc6a620c2b9d7f", + "sha256": "106vkpm75s3s52bkmcnjlw8gx3qlh5hffwvj2bvkmqfcgnxpzgx0" }, "stable": { "version": [ @@ -42571,19 +42571,19 @@ "url": "https://git.spwhitton.name/haskell-tab-indent", "unstable": { "version": [ - 20170701, - 958 + 20200513, + 1950 ], - "commit": "b921c076c10ba996bcfb3b38654363d30567bfa5", - "sha256": "046wiccc4kg81jcqmxzxh5karfbdg2z1d8i4nzcbz7q3n27x0l5f" + "commit": "0482f0de774c58bd7f2e079f5bf01781eed709a3", + "sha256": "05hgxrmsrmg5i50zxs7pa2xnfn2sja09hdk8xjsalnbbjvn4mmxx" }, "stable": { "version": [ 0, - 2 + 3 ], - "commit": "6d3b878765b9ef7a4b2c1f5dfd47309d4ab7c419", - "sha256": "07pcn244alqaiqwj9a5jcyh4hp5n71bsnhpilqy3xv0sn6ci1v2q" + "commit": "1127f46eca40a48be9cd2380df2cfc5f0b694e63", + "sha256": "13c2z1i7icpwv60njn83qbla9i0qlq3m0yz88ach1mlvmsdfj9jz" } }, { @@ -42851,16 +42851,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20200510, - 1345 + 20200515, + 715 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "16403ddf8a172aca72421f199cf6058bb7a53ad4", - "sha256": "1xp1cjs36w5ahjaf565bjdr2y5f1fk6y6yimpvb4jqj6w9lajh6g" + "commit": "202bcb533e2feb25d63c64553afccefd9cfab262", + "sha256": "0vn6420qjs04cwiq1bry0cj14i53w3zkyib4y6wyrnd709dfyzgp" }, "stable": { "version": [ @@ -42974,14 +42974,14 @@ "repo": "emacsorphanage/helm-ag", "unstable": { "version": [ - 20200510, - 223 + 20200516, + 613 ], "deps": [ "helm" ], - "commit": "429d3d9d8d90d3b7e8d35032c42206e930f9e481", - "sha256": "0kl6x6igbynzl1x36nqz5wyrqq4wchw2qpvp3lm80av6bncx6i2s" + "commit": "ae1dbefa151544035272d04e56e0147185a847c5", + "sha256": "03q29x63v500b3h4mj99h619ayifb12rrqiyyihm84i9lmgp5r28" }, "stable": { "version": [ @@ -43126,8 +43126,8 @@ "cl-lib", "helm" ], - "commit": "3e773f7957c1acabb8390c00cc8d49e192ee36bd", - "sha256": "0mmnrj0x6fdczm9acy5fqjrzd4iwzm6w8bcmhy1yx36f73d2whpl" + "commit": "8a0dd9841316793aacddea744d6b8ca4a7857a35", + "sha256": "1av058d7888kr3q15y1122r8jkarfw1s83gvkillj7kyzj3i53m5" }, "stable": { "version": [ @@ -43733,14 +43733,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20200504, - 544 + 20200514, + 644 ], "deps": [ "async" ], - "commit": "16403ddf8a172aca72421f199cf6058bb7a53ad4", - "sha256": "1xp1cjs36w5ahjaf565bjdr2y5f1fk6y6yimpvb4jqj6w9lajh6g" + "commit": "202bcb533e2feb25d63c64553afccefd9cfab262", + "sha256": "0vn6420qjs04cwiq1bry0cj14i53w3zkyib4y6wyrnd709dfyzgp" }, "stable": { "version": [ @@ -45826,8 +45826,8 @@ "repo": "alphapapa/helm-org-rifle", "unstable": { "version": [ - 20190809, - 1831 + 20200512, + 1943 ], "deps": [ "dash", @@ -45835,14 +45835,14 @@ "helm", "s" ], - "commit": "abc14bb85427a6585aa354894eaef6926881d585", - "sha256": "1ggj84b8wgd8xj6a442wfccvyaqg605zpikx19vqzwymaqbay85f" + "commit": "263f56d70112f5d0496684c89a2aa07959e0a95f", + "sha256": "0pm6va26kadjvbai4qsnjc2bk379w2nk6h3b5f0c2yv3q5na0p49" }, "stable": { "version": [ 1, 7, - 0 + 1 ], "deps": [ "dash", @@ -45850,8 +45850,8 @@ "helm", "s" ], - "commit": "dbda48031bad6fec1e130ee6e0d1a3bfea8ad8b8", - "sha256": "058zvh7cdall7dl3xay9ibcjvs13fbqp8fli3lz980pinmsds3r2" + "commit": "263f56d70112f5d0496684c89a2aa07959e0a95f", + "sha256": "0pm6va26kadjvbai4qsnjc2bk379w2nk6h3b5f0c2yv3q5na0p49" } }, { @@ -46057,15 +46057,15 @@ "repo": "tumashu/helm-posframe", "unstable": { "version": [ - 20200118, - 2302 + 20200512, + 1146 ], "deps": [ "helm", "posframe" ], - "commit": "7970f9397ba7d148e590e4ffb340bf6c7c0602fc", - "sha256": "0106fsdzp3911spylrixqkgpnjnfg491f0rmbqmn4hc1shnc2sbk" + "commit": "b107e64eedef6292c49d590f30d320c29b64190b", + "sha256": "09y98ij4wkqh771ahwi3b7nsg6yb2b69n94v3ad41kp4q0c2rscd" } }, { @@ -46906,14 +46906,14 @@ "repo": "emacsorphanage/helm-swoop", "unstable": { "version": [ - 20200321, - 231 + 20200515, + 417 ], "deps": [ "helm" ], - "commit": "069dc0b3970f1e796e34b7789ae51b1b7979ee30", - "sha256": "1jf1573r8v4mda1xiszrz51qarb1ii31cyk0v3ci16bi9dpp8swb" + "commit": "2efc552591102ab8b4408ad60a3c4be991bb8e93", + "sha256": "0fbahbcgdcbmnhv3m2pmxy8n01qab5x0468bikygs80krch84qh5" }, "stable": { "version": [ @@ -47070,8 +47070,8 @@ "deps": [ "helm" ], - "commit": "924b5516270b3933e847562e8e14e3888dd24184", - "sha256": "19y97ia4zl50wd22gkb7kkhj713imd5jc92l2xnpw04b59b60di1" + "commit": "55e56975fe1456591a293bf60c183c3dda9f788f", + "sha256": "0py1k0r15frj67mazfjkdwi8sx5a51ykrrbzvfb73kakq2f55jap" }, "stable": { "version": [ @@ -49526,14 +49526,14 @@ "repo": "conao3/iceberg-theme.el", "unstable": { "version": [ - 20200510, - 552 + 20200515, + 934 ], "deps": [ "solarized-theme" ], - "commit": "50dc87567d450e32f91436badf25b45708126edf", - "sha256": "0r2v3x6gsqvvky66qcdzc7z1b4nj8wdz9nzhag2qv683sh1g82mg" + "commit": "9615307cbd37e698d6939a04128162ef893313cb", + "sha256": "02lsbzk5215z1rdvs6idnv2yff2487i4pqi1ljdjfn3g43ly5lr2" } }, { @@ -51177,19 +51177,19 @@ "repo": "dieter-wilhelm/inform", "unstable": { "version": [ - 20200510, - 1325 + 20200512, + 1351 ], - "commit": "9f9b98ead8aea4a50faf2bb4d60b28cab521c70e", - "sha256": "1i7ki31acn3y1mvsyn0rcnipmbj72n6s4n2fp8zy6228ss8kan18" + "commit": "54e0c51960c7f50de31a6831c034ea6adc5a8892", + "sha256": "0j3hc3f7yx9dklbvvwpcq0d2n3lp0z47l5066ngvmm52aihhhiyd" }, "stable": { "version": [ 1, - 2 + 3 ], - "commit": "3f0c6e05964ba65e6f452bf043feb1f0b9fd3eee", - "sha256": "0gmj64zskb7misz1l7ymjlh984l8ykp7g93vrjm5bq7xmg2726bx" + "commit": "5e096549632b2691fe1f975394d07a31cf603fc6", + "sha256": "0bs0z957cs240cacl3bl72dp1sqcpd0j60yrv972w6p1j9v0f3rn" } }, { @@ -51354,11 +51354,11 @@ "repo": "ideasman42/emacs-inkpot-theme", "unstable": { "version": [ - 20191218, - 2038 + 20200515, + 421 ], - "commit": "8b648afaaab5eaddb7afcd602b8a76cbfb12412b", - "sha256": "0zfv4cnj11i7lagfyqmy4ch01szj450458yqffjn84hfikbf4q78" + "commit": "0f289a3f465728ed41d532674166eef09ac7209b", + "sha256": "1bchvrmmcbw8ird7i1klz0ds2xkfmwccz2pp59ixgys0j8cxnq4b" } }, { @@ -52132,11 +52132,11 @@ "repo": "doublep/iter2", "unstable": { "version": [ - 20200510, - 1355 + 20200512, + 2111 ], - "commit": "e2d8622343cb4bbbd6211533007eff2f417034eb", - "sha256": "1808dsc2zyzsbqm7zkz0zkpidgkw0vz8klmy2354ggjhb1klmxwj" + "commit": "b87c1e8ac50f728e8d33b5b69bf4124ef90b88ba", + "sha256": "09yasj1vfakryjvs22a3gd27wwa866b2pkvajwp8hlngk11sc3p3" }, "stable": { "version": [ @@ -52211,11 +52211,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20200504, - 1931 + 20200515, + 1845 ], - "commit": "84efa3a2cbb9c5b0bbcc8d2e90671434eed74f94", - "sha256": "1nijxgqhd357dnjbhqjwnb68lkdcd9hpcxsbv8dfiigmaw7k2wqq" + "commit": "04ca16420053a3a6d34a96f0d680dd449c2e5851", + "sha256": "1sjaf026zim28c9cld0w5hlk9inp1map70ip99smlk483ib6lbj3" }, "stable": { "version": [ @@ -52243,8 +52243,8 @@ "cl-lib", "swiper" ], - "commit": "3e773f7957c1acabb8390c00cc8d49e192ee36bd", - "sha256": "0mmnrj0x6fdczm9acy5fqjrzd4iwzm6w8bcmhy1yx36f73d2whpl" + "commit": "8a0dd9841316793aacddea744d6b8ca4a7857a35", + "sha256": "1av058d7888kr3q15y1122r8jkarfw1s83gvkillj7kyzj3i53m5" }, "stable": { "version": [ @@ -52525,8 +52525,8 @@ "hydra", "ivy" ], - "commit": "84efa3a2cbb9c5b0bbcc8d2e90671434eed74f94", - "sha256": "1nijxgqhd357dnjbhqjwnb68lkdcd9hpcxsbv8dfiigmaw7k2wqq" + "commit": "04ca16420053a3a6d34a96f0d680dd449c2e5851", + "sha256": "1sjaf026zim28c9cld0w5hlk9inp1map70ip99smlk483ib6lbj3" }, "stable": { "version": [ @@ -53892,11 +53892,11 @@ "repo": "ljos/jq-mode", "unstable": { "version": [ - 20200510, - 1041 + 20200516, + 1606 ], - "commit": "8525416b6d166ea022192e6f694c8405edc94160", - "sha256": "180rlz6fzb947kxwpp37v244py5fapxfiag4ipxmf3ld8g55g3mn" + "commit": "85214664a9f20faab7c45087b28bedd0feabb560", + "sha256": "0kvi1cqn4hdcs2mc4lsddy01yyixvm2ykqq6j4yb9h07lixrxih6" }, "stable": { "version": [ @@ -54626,8 +54626,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20200505, - 1504 + 20200515, + 2010 ], "deps": [ "cl-lib", @@ -54638,8 +54638,8 @@ "spinner", "vterm" ], - "commit": "e2f1e60098b1a2b3e166130e989489f7b845f8e1", - "sha256": "1l9w8404jwj6dsr9q4zx5ij6mbyp9qyj8116hs83s6jxgidi6fp6" + "commit": "c9aff5ffe6df951dd5343f05d6e4170203a7032a", + "sha256": "065ix3jycsx3wvkq7a6060i93caxisdvgxgqb1l6rq15n4qln78y" }, "stable": { "version": [ @@ -54647,7 +54647,7 @@ 0, 0, -1, - 3 + 4 ], "deps": [ "cl-lib", @@ -54658,8 +54658,8 @@ "spinner", "vterm" ], - "commit": "483d088853584a9f1603a062bce5705f0a7d99fe", - "sha256": "0k3lwq6r1y23gmlqx7a70psgzncf4k1zcykc7plzl79xas28rbrz" + "commit": "c9aff5ffe6df951dd5343f05d6e4170203a7032a", + "sha256": "065ix3jycsx3wvkq7a6060i93caxisdvgxgqb1l6rq15n4qln78y" } }, { @@ -55549,11 +55549,11 @@ "repo": "chuntaro/emacs-keypression", "unstable": { "version": [ - 20200114, - 750 + 20200514, + 822 ], - "commit": "9ce977dabd8355ebe35d9d06821e4edb09060d2b", - "sha256": "0wrm5k1a9j90qqfx2w844nc9xd9a70x9krp1x3qm4zhal6mf0kzn" + "commit": "1e00bbdb451fd88bde9917526fd0b13b2a1bd26c", + "sha256": "06j8pqss8izhyahf0nw95mg34lbclhzk4f5vzfg35qcmjmbmqzg6" } }, { @@ -55842,8 +55842,8 @@ 20180702, 2029 ], - "commit": "db44e647c5e51251f0318b9b14e2c194163b4929", - "sha256": "19y8y66x4r4xmi3l1w79rp31pw17mmrxc8vcv6c49hd3js9jrx06" + "commit": "c0227c5ce4011033b5f0cf2815c352d123a13305", + "sha256": "1l3fjljm7abk29ibbbvds7nq72yqrgcsy5bv42s1czbffw62zcn6" }, "stable": { "version": [ @@ -55865,15 +55865,15 @@ "repo": "stardiviner/kiwix.el", "unstable": { "version": [ - 20200503, - 2312 + 20200512, + 1321 ], "deps": [ "cl-lib", "request" ], - "commit": "7fda4115d5f762f9a2c1db10406ab2562119050e", - "sha256": "0pz2gzf7czh0jfwal1bzpx3vi1iqycbv9s3nmb2z8i497zg42gw7" + "commit": "dd02284149027694e4cf16d6f4daf1f6dd011249", + "sha256": "0zhg9467id0jd516hnz4c6aqmjp5q1s95fkhjxbk3g9j11cnfjf0" }, "stable": { "version": [ @@ -56405,15 +56405,15 @@ "repo": "Deducteam/lambdapi", "unstable": { "version": [ - 20200508, - 437 + 20200513, + 1043 ], "deps": [ "eglot", "math-symbol-lists" ], - "commit": "f54599fe7656515320bec1e5e5fc16f7ee9c7a64", - "sha256": "01wvq0lpmsqffp1vxra4mj2g75k4lyblsb5mn0acwhhni369pa28" + "commit": "a3d4ae8863e268c88664ce869e9469c8a42d2e05", + "sha256": "1v8w70x1jnald6k22ipa7d9z1ggcf2imr97wbw3i48dp4iv21zqd" } }, { @@ -57362,11 +57362,11 @@ "repo": "fniessen/emacs-leuven-theme", "unstable": { "version": [ - 20200505, - 1811 + 20200513, + 1742 ], - "commit": "f25e4011fc30a35983ab08041f4e972daad4b106", - "sha256": "1vvqlmwmpzhqkhawabhvl6ns5083fk9g5ya7zzzrgqm7fxljnp16" + "commit": "afda2d80b0bc98d431a3ac7c1563c76b8ace3a65", + "sha256": "0fapzkjnm3w4fgc5464a9bz2sld3m81zzls7sy4h0yxq9rpb284d" } }, { @@ -57514,11 +57514,11 @@ "repo": "magit/libegit2", "unstable": { "version": [ - 20200223, - 1431 + 20200515, + 1759 ], - "commit": "6c3b89276a149b2d009882f756a9edf866671f05", - "sha256": "1r59bw0dggjf6ry2vbl0vddd5hxxh1mshr5h2bk9z74gy04cfi4y" + "commit": "0ef8b13aef011a98b7da756e4f1ce3bb18e4d55a", + "sha256": "0pnjr3bg6y6354dfjjxfj0g51swzgl1fncpprah75x4k94rd369f" } }, { @@ -58958,8 +58958,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20200509, - 1700 + 20200515, + 2152 ], "deps": [ "dap-mode", @@ -58971,14 +58971,14 @@ "lsp-treemacs", "pkg-info" ], - "commit": "16d7568f1a7993d32319002a3880af8dba97cc8d", - "sha256": "0yqdzkw6nd97x0llsbf1aay50xz8k955kqjd8850vmd5x8kza117" + "commit": "14d11f959dfab22a546525a0076fa3abd0d85c32", + "sha256": "0mxiy8myvk91b7r5ngidi2665vpqs87f8qraplyl0vcpywb2jm5n" }, "stable": { "version": [ 1, - 8, - 9 + 10, + 5 ], "deps": [ "dap-mode", @@ -58990,8 +58990,8 @@ "lsp-treemacs", "pkg-info" ], - "commit": "922389a2cc849852246c9f7e8bd7da1a907172d4", - "sha256": "01zqwqzkf6ib6b2wb306kyc6vm9xdjbxd65aa23n13a6kzk6c9m9" + "commit": "14d11f959dfab22a546525a0076fa3abd0d85c32", + "sha256": "0mxiy8myvk91b7r5ngidi2665vpqs87f8qraplyl0vcpywb2jm5n" } }, { @@ -59158,15 +59158,15 @@ "repo": "non-Jedi/lsp-julia", "unstable": { "version": [ - 20200408, - 1412 + 20200511, + 1444 ], "deps": [ "julia-mode", "lsp-mode" ], - "commit": "9f158a290168149fd301a1c1c2016600106ad5be", - "sha256": "077mrvxf8df4dppl3xqa7p3ksm3wcms64l306y7i5x878vyjgibv" + "commit": "b342e5f74f9b815d2a7db9fffee7b9c46850d293", + "sha256": "13haa9jvcq6wvj8g1bnqrrczg1j50lwk41pr4n7q0i7313r8f89v" }, "stable": { "version": [ @@ -59220,8 +59220,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20200511, - 424 + 20200515, + 2000 ], "deps": [ "dash", @@ -59232,8 +59232,8 @@ "markdown-mode", "spinner" ], - "commit": "232dd55a9790691a1598150c2396e8d4256a59cc", - "sha256": "1h19fda1p9cqkdqsjkvmnjf9wmj1xmq6c897fwi150qkknic2zjj" + "commit": "17614737b6ae881d0e94ad6f0b87a01950062dba", + "sha256": "0zh2mllm7n3gj0w5rn4y6491kx361mrf6w0fa46jgdck26fkazfw" }, "stable": { "version": [ @@ -59375,8 +59375,8 @@ "cl-lib", "lsp-mode" ], - "commit": "324a0bf50be2ebbdafcfb532c573ac22d5170d10", - "sha256": "08ysclhww0jc9fbxqn59qy05m4nsfgdgjzdb7pwfxp27p5c282a4" + "commit": "97ad997c6c2e3bc8d12c02b2809960d47ad316b0", + "sha256": "11jad58shbrxd1r2r4amlvddx0qlx3ikbmq598sfwz2253ndzny1" }, "stable": { "version": [ @@ -59469,8 +59469,8 @@ "lsp-mode", "markdown-mode" ], - "commit": "ab55e306af9dd9eb62fe7463e4e05d948ad3dfc6", - "sha256": "0z0pgp25hac6m2c58im05cqdyj3383672b3hnirxl5ky45c4rvhn" + "commit": "271b47cb33f11915295911f7cf8575f8a82a5e1c", + "sha256": "181j9anm3h5sfallls3sxik6cd7dw1fbi3q9mlfhk979wk6varjk" }, "stable": { "version": [ @@ -59498,8 +59498,8 @@ 20200508, 1316 ], - "commit": "a3a71b155ab63a64c077a48d1f83596b388bd564", - "sha256": "1k7i7vwn7nnia9dlgh7d3gqyzmvf1i3ipjlbfw8lwcdlzsly940y" + "commit": "35b6e4c20b8b4eaf783ccc8e613d0dd06dbd165c", + "sha256": "1bwyyp9fbvy0p4f3mmbqc0plxrcm0ag2r3zb74gb5k2vcxi2vdw4" }, "stable": { "version": [ @@ -59916,8 +59916,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20200503, - 1905 + 20200514, + 1330 ], "deps": [ "async", @@ -59926,8 +59926,8 @@ "transient", "with-editor" ], - "commit": "9a388a61d95761b9c748dc186602ba7c691d580f", - "sha256": "00bsmb6n4n69ms1zz0axyhsa75j38v4ja3qam3qpbcr67arkcqpa" + "commit": "d05545ec2fd7edf915eaf1b9c15c785bb08975cc", + "sha256": "11aqyy4r9hrdi9nlypd70hn8384b6q89c7xavgv8c5q7f2g5z9qg" }, "stable": { "version": [ @@ -60254,8 +60254,8 @@ "libgit", "magit" ], - "commit": "9a388a61d95761b9c748dc186602ba7c691d580f", - "sha256": "00bsmb6n4n69ms1zz0axyhsa75j38v4ja3qam3qpbcr67arkcqpa" + "commit": "d05545ec2fd7edf915eaf1b9c15c785bb08975cc", + "sha256": "11aqyy4r9hrdi9nlypd70hn8384b6q89c7xavgv8c5q7f2g5z9qg" } }, { @@ -60403,14 +60403,14 @@ "repo": "magit/magit", "unstable": { "version": [ - 20200425, - 2044 + 20200513, + 1503 ], "deps": [ "dash" ], - "commit": "9a388a61d95761b9c748dc186602ba7c691d580f", - "sha256": "00bsmb6n4n69ms1zz0axyhsa75j38v4ja3qam3qpbcr67arkcqpa" + "commit": "d05545ec2fd7edf915eaf1b9c15c785bb08975cc", + "sha256": "11aqyy4r9hrdi9nlypd70hn8384b6q89c7xavgv8c5q7f2g5z9qg" }, "stable": { "version": [ @@ -61277,11 +61277,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20200509, - 1525 + 20200514, + 16 ], - "commit": "f47a2e9796dfdde6fae7920af23647fe027dc34e", - "sha256": "0rz7gk7hwvi9ialkhbvh7lmxvjks1yp9ihrdx2kf4k3jyf1sb9s9" + "commit": "705c77b9533970a425b09fb4c2fabf3b406117c7", + "sha256": "0i40pp0157azw2jkkr08f4cbal9ansp9dbscdbdzmlp9lf27kqjs" }, "stable": { "version": [ @@ -63058,11 +63058,11 @@ "repo": "jabranham/mixed-pitch", "unstable": { "version": [ - 20200321, - 1331 + 20200511, + 2052 ], - "commit": "734fbdf2d2c17beee151faf39bd10174a87eea5d", - "sha256": "1i0yd7akkyqhkd8g2g793n6syiy0mbnlq9apg7p1s4xycmwxx684" + "commit": "1cad46fddf741ed7ec5fc477d70e079e908e9ce6", + "sha256": "062np4d7blbwjc1kciqcp6hngmwr8i540zsv5f8p2qki4804b8ng" }, "stable": { "version": [ @@ -63100,11 +63100,11 @@ "repo": "Mulling/mlso-theme", "unstable": { "version": [ - 20200329, - 1516 + 20200513, + 1751 ], - "commit": "a4bb7b55ce81d8dcc0ad8d92acbde309c7cc1ea0", - "sha256": "15fmzsf5rpgx5f1fr45j24hgzmz95zxkj1jihdb64p049ak2h5a9" + "commit": "059c5773403b73a14a1b04d62d1d5b077a3f6e06", + "sha256": "1a00mybf269hlfzfhpcvlkkqgwck73hz5w1qsspg5w9w78qlymkn" } }, { @@ -63495,11 +63495,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20200510, - 1103 + 20200513, + 601 ], - "commit": "a99bec324b712d9444fa1c2abd4ef083e6cba64d", - "sha256": "078vvx87mymgqj4n6dszw1f15k235cz522zpvxyavh5rhsf123fh" + "commit": "4b3f6a383642fb81a3407dde5d887e2d937ec471", + "sha256": "0adbyyfpwzcc1y2vlbdf5kxwxsspm1cnxpd21rjnvcc06pvxzq4s" }, "stable": { "version": [ @@ -63519,11 +63519,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20200507, - 1718 + 20200513, + 601 ], - "commit": "a99bec324b712d9444fa1c2abd4ef083e6cba64d", - "sha256": "078vvx87mymgqj4n6dszw1f15k235cz522zpvxyavh5rhsf123fh" + "commit": "4b3f6a383642fb81a3407dde5d887e2d937ec471", + "sha256": "0adbyyfpwzcc1y2vlbdf5kxwxsspm1cnxpd21rjnvcc06pvxzq4s" }, "stable": { "version": [ @@ -63821,11 +63821,11 @@ "repo": "tarsius/moody", "unstable": { "version": [ - 20200113, - 2321 + 20200514, + 1946 ], - "commit": "2751d36152abcc2ac1479225392182b53f1e02dd", - "sha256": "1xyw4l42053595r76lj8safsx6pj25as0107wd96by3h7dg9m586" + "commit": "f6bebfe6fe51b728ebd013b7084becad23cabad3", + "sha256": "0n8p864yj5m3n7f9qiq9hy24dwfvv0a0wchx2818rppff6vfq3hf" }, "stable": { "version": [ @@ -64504,11 +64504,11 @@ "repo": "cdominik/mu2tex", "unstable": { "version": [ - 20200506, - 754 + 20200512, + 704 ], - "commit": "fef2f2390c002e21811375ce4d7a1c7a308248b1", - "sha256": "1119l71z00syg0zcp330z1757hjf0p06cwc8a4id6alkmbk70jba" + "commit": "4b84cdac955cb36a8c44a2be48f3310252e3d3ad", + "sha256": "05rgx0nb028k1kmb9gbv4b0s20ksbjl0nksyrva2zpvd7xc1nyz9" } }, { @@ -64786,11 +64786,11 @@ "repo": "manateelazycat/multi-term", "unstable": { "version": [ - 20200112, - 533 + 20200514, + 428 ], - "commit": "7307ddd456db44045206253e5a905d3d8c143d5c", - "sha256": "0cqq6y7whx4zwwd8360vdmbvsmkrvmxnn7cvz6hafrh5mrcfqmvn" + "commit": "017c77c550115936860e2ea71b88e585371475d5", + "sha256": "043dqd8i8h6hbcg11rzprxin2yq5lb902zlrb7mxah44vyp8wrdi" }, "stable": { "version": [ @@ -64912,15 +64912,15 @@ "repo": "matsievskiysv/multistate", "unstable": { "version": [ - 20200506, - 1536 + 20200514, + 2206 ], "deps": [ "cl-lib", "ht" ], - "commit": "e1175bae0cac6c16e3533c7e82347f0f15796afa", - "sha256": "1qv3n2bhw2jxc9bg0q4c3mpj19k97bkp4zp78r1k3b6r1is7bjgb" + "commit": "eadd0df2745bf10500a9ad4ee8f66f3cb470bef0", + "sha256": "081rangw4iqk1lcahk01skh518ljdp6g4ww7zydjr813x7jzv2kv" } }, { @@ -65869,8 +65869,8 @@ 20161029, 2023 ], - "commit": "ae60dc55822ea1715b203775179080c5d62700d8", - "sha256": "0q46r9r2vc50vn3bh321l317lgbbmmbylhgbxllbjpyaidfqzvb9" + "commit": "f5fe5832889d7b6eab7d45724e051f4edbe1983f", + "sha256": "15ljrcmmpfwqxvci0ilmn3xgjxj19wq638zvij0wh2g0n6nil6xx" }, "stable": { "version": [ @@ -66292,8 +66292,8 @@ 20181024, 1439 ], - "commit": "9a77d919525a6f844a5c18a1bcf2c2eeb9393ad7", - "sha256": "1x5qwp8f12szfvw0x0qxlfz4ds0z9nc7fmsaaqqhsj9p2yzvkcd4" + "commit": "c6148b0c3377a7d12b679f99f35e09cc7f36e940", + "sha256": "088znrs8hygsfx0ndqhpfdgra3l3jf6dyfwz2l6h4s7w4kc8mlnk" }, "stable": { "version": [ @@ -66391,20 +66391,20 @@ "repo": "NixOS/nix-mode", "unstable": { "version": [ - 20200510, - 212 + 20200515, + 410 ], - "commit": "32b013cd622a37cd553c8899332064397c90105b", - "sha256": "0cg4kj8g08kiid6w5n55kc7kffl8rhccpa4xgs68d13isd70fdv2" + "commit": "e20afb51a48b5d014292d123487f53a678c7c3f7", + "sha256": "1gbq9pmz1wv6kc128pyzi2hrsv9ax20myjmq02bwc4x5sqg6rdzq" }, "stable": { "version": [ 1, 4, - 1 + 2 ], - "commit": "2f4bd0f09c829c2c5f49be2c5455352eaa4c2e3d", - "sha256": "04xpgg9nba5m1bl7ci5l456whcb8nfhsbvgxyx89bp0zqgr005q7" + "commit": "e20afb51a48b5d014292d123487f53a678c7c3f7", + "sha256": "1gbq9pmz1wv6kc128pyzi2hrsv9ax20myjmq02bwc4x5sqg6rdzq" } }, { @@ -68660,10 +68660,10 @@ "version": [ 1, 8, - 1 + 2 ], - "commit": "05bf3e4b39b765658a5be95d1db2a30084d1f564", - "sha256": "0h4ysh36q1fxc40inhsdq2swqpfm15lpilqqcafs5ska42pn7s68" + "commit": "9e26c0a2699b7076cebc04ece59fb354eb84c11c", + "sha256": "1dvcl108ir9nqkk4mjm9xhhj4p9dx9bmg8bnms54fizs1x3x8ar3" } }, { @@ -69731,14 +69731,14 @@ "repo": "Kungsgeten/org-brain", "unstable": { "version": [ - 20200510, - 1834 + 20200516, + 1343 ], "deps": [ "org" ], - "commit": "ed99f7e38dd687800fb898f8934a0da0541ebcd9", - "sha256": "1pb9l4gxjm8bfw2xny06iwbd7yfvdjxsvdj4lydpa0z0kgdwd8cs" + "commit": "3ce2a33b81ce611695ad74bf21cb911ef90d9a1a", + "sha256": "0br8mqhxfx9pf1nslvlqk4x5rdlpjagixi6il0i0xpxhca7z3fya" } }, { @@ -69836,14 +69836,14 @@ "repo": "Chobbes/org-chef", "unstable": { "version": [ - 20200427, - 1413 + 20200512, + 2102 ], "deps": [ "org" ], - "commit": "e8b4ba8a10b8f356a712a75a87f1fe38dac32d9f", - "sha256": "0q505lxzakbv524ychswhlp650fym86l9j0sjsh7idasnz01sc2q" + "commit": "1dd73fd3db0e9382fa34d3b48c8ec608e65f3bdc", + "sha256": "0wfl416hd7f42j1fidap0f9zlcm3vhgjs12k99k672fggl0459h1" } }, { @@ -70501,28 +70501,28 @@ "repo": "marcIhm/org-id-cleanup", "unstable": { "version": [ - 20200509, - 1615 + 20200516, + 1339 ], "deps": [ "dash", "org" ], - "commit": "dc0cc6b056aa9d820670e3c668f3bc2c6b3c1809", - "sha256": "0fikyhz08msn4zq1fb3a09s3lkrpv73669kvd72g1pqmy4fzgrjc" + "commit": "05d57840893d9ae8146ed41d29d1f0571c05ded8", + "sha256": "1rsw4zgvxp77ncq4z98hcy6qsg6j72glx1y69rwfblg87lz3mj6d" }, "stable": { "version": [ 1, 3, - 7 + 8 ], "deps": [ "dash", "org" ], - "commit": "dc0cc6b056aa9d820670e3c668f3bc2c6b3c1809", - "sha256": "0fikyhz08msn4zq1fb3a09s3lkrpv73669kvd72g1pqmy4fzgrjc" + "commit": "05d57840893d9ae8146ed41d29d1f0571c05ded8", + "sha256": "1rsw4zgvxp77ncq4z98hcy6qsg6j72glx1y69rwfblg87lz3mj6d" } }, { @@ -70557,20 +70557,28 @@ "repo": "marcIhm/org-index", "unstable": { "version": [ - 20200413, - 1609 + 20200516, + 1343 + ], + "deps": [ + "dash", + "org" ], - "commit": "f95dbec874f39aac3c8391a6e0b9796b981386f3", - "sha256": "1dylivz459a4d66rak9sipynyby01plhgjj2vvp9fqvia65yb2a4" + "commit": "f868df4aa4f49484cf818627251b7c7282d8d20e", + "sha256": "14mr03sjjkxix0sphnp7flr6f9z20g5x7ifv3hl2nvmh4794cf6n" }, "stable": { "version": [ 6, - 1, - 3 + 2, + 1 + ], + "deps": [ + "dash", + "org" ], - "commit": "f95dbec874f39aac3c8391a6e0b9796b981386f3", - "sha256": "1dylivz459a4d66rak9sipynyby01plhgjj2vvp9fqvia65yb2a4" + "commit": "f868df4aa4f49484cf818627251b7c7282d8d20e", + "sha256": "14mr03sjjkxix0sphnp7flr6f9z20g5x7ifv3hl2nvmh4794cf6n" } }, { @@ -70636,14 +70644,14 @@ "repo": "bastibe/org-journal", "unstable": { "version": [ - 20200424, - 1917 + 20200514, + 1648 ], "deps": [ "org" ], - "commit": "8bf06b28d6f14f52d4968123e2b4b91930c8f947", - "sha256": "0k70k07c4lq20rqljmfkx1pfp8gq4qr0y46n8mh1smzxdznk9nlb" + "commit": "2c43b10eed0659f8e47797e5e53d2973f939284d", + "sha256": "1ppzq6hx7nc2iy6pnpgxd39znc701mgqbi2v4v71a0yp8zl6kbgs" }, "stable": { "version": [ @@ -70901,8 +70909,8 @@ 20200128, 1208 ], - "commit": "8f9f4f978a3c40adf2ff00eebb56bccfe4caf4e1", - "sha256": "0v0q3qzz6fwh0y9c9ci46284msr0x69jfki2ng89hpz8aab90bli" + "commit": "4fb77d9bb876e368e596d18324115cef6c1c71f3", + "sha256": "02js518d8h2qp8dxmw479gw61bdj3019j183hz6x1nn49ljx000k" }, "stable": { "version": [ @@ -70922,14 +70930,14 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20200507, - 2043 + 20200513, + 1617 ], "deps": [ "htmlize" ], - "commit": "2d0540cbd659e6aaf1899f1e0b51f3850c83d5a6", - "sha256": "1slcg8mgdkn7cndmv5pkwqni0wm26jg3j0mds0rxf04w44ifvlql" + "commit": "d8a571c720b2b7dec9115fd85b114ae46d4ac4b7", + "sha256": "094nrd7fy7m7m758gks14kz7yfdcclcwvbz8p90dwg3dv311hii2" } }, { @@ -71586,8 +71594,8 @@ "deps": [ "alert" ], - "commit": "4f7677af740e8f3f7cfaf630ae2e594a125af760", - "sha256": "1xk4vp2138p58jdxn51vnmpnij5bzc2jbpq7y8avdcv0p7618fdc" + "commit": "a019c7186ec60c8c7c3657914cdce029811cf4e0", + "sha256": "0jyd7cbri0bmi0qzwm7d4fxdfa1224bg6izd63pqqg1x7s67x99z" }, "stable": { "version": [ @@ -71630,28 +71638,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20200413, - 856 + 20200512, + 1701 ], "deps": [ "htmlize", "org" ], - "commit": "61549f4c00284a30e34caa3d76001b233ea5d2ad", - "sha256": "00r324nnci2l0jwx4jhzcrbyai5wmj5cjrav4253c23aqdn5ny96" + "commit": "a9e9d4ef88417b3af7741a8d8f444ece820e7a3b", + "sha256": "0lkqq5n4dspnpiywaparn95wriwh7ffypdykz0a3mmlnv96rizyi" }, "stable": { "version": [ 2, 12, - 1 + 2 ], "deps": [ "htmlize", "org" ], - "commit": "14df7542f2a675f65501962e344e03d798cf0d39", - "sha256": "1mc01v257884pdsw37dghgddyyy6v6rd9cmnnpq45xvd5ibz1vaf" + "commit": "fa6f656f561ebb8377bfd904795aec90b4332bbd", + "sha256": "19nz77f2r49hqavz50ri222prhrd5890vhvc7jfazbascbcdjbqv" } }, { @@ -71902,8 +71910,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20200510, - 2117 + 20200516, + 1203 ], "deps": [ "dash", @@ -71913,8 +71921,8 @@ "org", "s" ], - "commit": "ad5fca5440e5c8a6b8078013684df43b3e43d773", - "sha256": "118dhbxf71cmx345hpi0lq7ycb75qg7bdvyqqqdkhl4v9fl9nxyy" + "commit": "265182a698be6babcbb11718c2821c747b1cff52", + "sha256": "159zi0a392p1f8bzlxvfkwmx12xm749cia5m0b3paz23mvvhgzgi" }, "stable": { "version": [ @@ -71942,7 +71950,7 @@ "repo": "org-roam/org-roam-bibtex", "unstable": { "version": [ - 20200510, + 20200516, 1742 ], "deps": [ @@ -71952,8 +71960,8 @@ "org-roam", "s" ], - "commit": "4f82a8de96ea1f31c24a3cc2acf3bf26e85269ff", - "sha256": "0pqamdc03l5zzdc7dcqwylhw45mzijfgd9070wv93qys9qs1b1ph" + "commit": "4d60c7824e028b4bcdbe5dd589e416ec682a63c8", + "sha256": "010vgf2dlafx3673dpcpy94273i65pffpn5rz5vqvh0k3wwxhqyn" }, "stable": { "version": [ @@ -72955,20 +72963,20 @@ "repo": "marcIhm/org-working-set", "unstable": { "version": [ - 20200501, - 1447 + 20200516, + 1341 ], - "commit": "9f180f037d632906a3043c4e14fafc8e6ed007a8", - "sha256": "0yczj42hl29snbh6g6r0w3ldr3vjg3i7448j55k3crm8b61rmwwv" + "commit": "c8c66a97e9adf84a4778f68e100259eaba67905b", + "sha256": "1h5ivbvzj46zkl3rgvcc0l50bn161g2q17miybm1mk70574q9fwn" }, "stable": { "version": [ 2, - 1, - 6 + 2, + 1 ], - "commit": "d6fff111930befa52a5cce128c986b0162ddf8c4", - "sha256": "1s9rqjn6c52kvz4v1ma6icdykvkvrvbyllpy5i1mg0pb4acbbwym" + "commit": "c8c66a97e9adf84a4778f68e100259eaba67905b", + "sha256": "1h5ivbvzj46zkl3rgvcc0l50bn161g2q17miybm1mk70574q9fwn" } }, { @@ -73091,8 +73099,8 @@ "repo": "ardumont/org2jekyll", "unstable": { "version": [ - 20200510, - 1951 + 20200516, + 1727 ], "deps": [ "dash-functional", @@ -73100,14 +73108,14 @@ "kv", "s" ], - "commit": "cdec8aa327096c63e0342d36a707165e518b5d18", - "sha256": "0jji70c38cssnmgsd9pmkz2mwfs413baxzr13f2mf98z52j6izf5" + "commit": "36d7789b7b3dfa2f4739a83692d322b601a0f4ea", + "sha256": "1j1cckvvghz9656bjkdxrc3gsfpz1wjvq3hlh6zblmnlbhhvbsan" }, "stable": { "version": [ 0, 2, - 0 + 2 ], "deps": [ "dash-functional", @@ -73115,8 +73123,8 @@ "kv", "s" ], - "commit": "24878ed965287d446af1289c33d50f639608d61b", - "sha256": "11f0nkyv3k6wra2753v6wa9jn38wrdkf0h0filliy40hqm7qqkfc" + "commit": "7be4a71ce55f2fdc7fe7f6414f03d58f19d43410", + "sha256": "0cxhmbbznvv9d3nmqfn0ggr164fa6yjbfac9wqi3c58vm3zri00k" } }, { @@ -73356,11 +73364,11 @@ "repo": "tbanel/orgaggregate", "unstable": { "version": [ - 20200511, - 618 + 20200516, + 1344 ], - "commit": "5847b4af6205de31bfd29c5fb11c49e2fec63063", - "sha256": "088xqmk5fwdf12pvfarp9b69km605a52iqmb3042kn0ci5h0ibjk" + "commit": "7426df13512f5eee921c26aa68cfc6e32e3061fc", + "sha256": "18n2xzwpqq8159qwqy7hy0b93a5qxdb5rjh0ls4jk8lmahk5jrqk" } }, { @@ -73386,14 +73394,14 @@ "repo": "tbanel/orgtbljoin", "unstable": { "version": [ - 20200511, - 636 + 20200512, + 721 ], "deps": [ "cl-lib" ], - "commit": "f88f8c09929b1780b8e4b3bbeb27c68389130209", - "sha256": "01z5vvcl3pmd3agcbi9bkc0g9ah1vi7qwlprss64vffh08l5cw8j" + "commit": "5bfe2f6d53798d0fe071f9990e03d7428623e4a7", + "sha256": "16xcps2qlzh5z8c20sl0cnc0mlj8153vk6j1dnfd6l3a6kni88af" } }, { @@ -73454,8 +73462,8 @@ "deps": [ "reformatter" ], - "commit": "5d991188b511e9d650c84fc578f2f49c9f995693", - "sha256": "1x5nx064cgcjj99xwp7drcvhfmmav1f72jnwwlxllhas2is458m0" + "commit": "3141f9b65f8a68b4cbd6df4e08c64d98ce3aa3c9", + "sha256": "1j7q9rmcn6fkhbcvfh8w4y9dir2y0hhhqmjpsafs8m4zm1rvffbn" } }, { @@ -75432,14 +75440,14 @@ "repo": "ajgrf/parchment", "unstable": { "version": [ - 20200424, - 1524 + 20200514, + 2047 ], "deps": [ "autothemer" ], - "commit": "766efdbd444cbefd9d01e7c6f55956d4c9a8db6c", - "sha256": "1jz9vf8wfjnnbbsnxzcpfvj19556w1z9887xvvwn6rsiqqlxgray" + "commit": "4fa14adbc043497fc942568fdb78505ca549e5b7", + "sha256": "1ply18yzdf1lxyia8knn6fk8wb4yzwicgdiscr2z87bpk8p5d2pb" }, "stable": { "version": [ @@ -75693,11 +75701,11 @@ "repo": "joostkremers/parsebib", "unstable": { "version": [ - 20200303, - 2324 + 20200513, + 2352 ], - "commit": "6537b4d2a8cf34455b769b95dfd65de6a4a0e1d3", - "sha256": "1gy5rqnfnyhfa44vxy7qqqh7xada1d1gg34msczcalhhy6lm59if" + "commit": "3497b6068d78ae15ba1eaf94e4315d18e9ae6b00", + "sha256": "0vf9qrkc4dna2f9l0ry1qhfxy7yw1dlilgh38dlp42kqdyp5qny8" }, "stable": { "version": [ @@ -76456,15 +76464,15 @@ "repo": "politza/pdf-tools", "unstable": { "version": [ - 20200427, - 2136 + 20200512, + 1524 ], "deps": [ "let-alist", "tablist" ], - "commit": "d9712989fc4715443f674459199bdffa987054ac", - "sha256": "0lrh1c37vfgjafsp3j73rjqlz0mbginwbw25vak1l6vycb3s6122" + "commit": "c510442ab89c8a9e9881230eeb364f4663f59e76", + "sha256": "17z3cpn76g9dp62drjrgrqpp1bgf4gl5k5gspylskpvd4kj4bq4d" }, "stable": { "version": [ @@ -76863,25 +76871,25 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20200418, - 1815 + 20200513, + 1416 ], "deps": [ "cl-lib" ], - "commit": "c3075b52db1f973202303fa306c56a24d9d47fc9", - "sha256": "0mcsrkga5y8sl05mv3n4lmjpgn9mcpy01w0qz55a6jv301rda3p0" + "commit": "1fc13646623f42e1d70cf1f651c4b154e12070ca", + "sha256": "1gdacw1gkng1dhm12lhfssmac0fijsh3wpbvcmsv2jz3gpnjin1g" }, "stable": { "version": [ 2, - 7 + 8 ], "deps": [ "cl-lib" ], - "commit": "c3075b52db1f973202303fa306c56a24d9d47fc9", - "sha256": "0mcsrkga5y8sl05mv3n4lmjpgn9mcpy01w0qz55a6jv301rda3p0" + "commit": "1fc13646623f42e1d70cf1f651c4b154e12070ca", + "sha256": "1gdacw1gkng1dhm12lhfssmac0fijsh3wpbvcmsv2jz3gpnjin1g" } }, { @@ -79114,11 +79122,11 @@ "repo": "TatriX/pomidor", "unstable": { "version": [ - 20200506, - 1041 + 20200513, + 1054 ], - "commit": "f93b09ee8e5420e728cb8be199ec06504d2df97e", - "sha256": "1b63w9fvgvmw8hr6s8ckhg62psd68rxgsii71kgis1j4v0s6l0sn" + "commit": "308a438550173685cb852a8aadef75c25701513e", + "sha256": "1w4sds6h6q80drqzkmiz51nvy942a88s99zfrvmyvfrvwv7wlqqb" }, "stable": { "version": [ @@ -80414,8 +80422,8 @@ "deps": [ "pkg-info" ], - "commit": "768f0570cad57b6885c4472df803906d097cbc1a", - "sha256": "15855a99as5xmqdzckway0rvlg81wq6fhi5afr7hli62mrc8sgxa" + "commit": "f650faecf699e4b4659374cf5a949f6927feff3e", + "sha256": "142is55cbyya511zp0yl5d1x6i8mvxqjn8zky4gxif15rmmqrk9n" }, "stable": { "version": [ @@ -80967,19 +80975,17 @@ 20170526, 1650 ], - "commit": "bf3eef94c1fc5470407c4f69bb17cbed2c75b508", - "sha256": "1fi8hvxd2nfkqg6s5yz0npbhhclpsqmyfd6jd0d7ivqqglk5h93j" + "commit": "63da77bc971e08c2241cc1d9e65ede4bf335c421", + "sha256": "0b0shac978n6djxid6z9h4mfb2ah4hc1vvb0rg8rf65gs4cxjzlz" }, "stable": { "version": [ 3, 12, - 0, - -1, - 1 + 0 ], - "commit": "ef7cc8111676076d8c2b6f9929096477cc868dc3", - "sha256": "0i06nk5v3nl0xgmi6pxyqgcps8h16a6mcdg2bnjnrrmz6cnq97j2" + "commit": "0dd036d675508a4ecf69e61626fd0c88235a661d", + "sha256": "0ac0v7mx2sf4hwf61074bgh2m1q0rs88c7gc6v910sd7cw7gql3a" } }, { @@ -81653,11 +81659,11 @@ "repo": "mattharrison/pycoverage.el", "unstable": { "version": [ - 20190607, - 2004 + 20200513, + 2047 ], - "commit": "01bd47171eefcab2e19d7cffd9a2dd3bd9bd6812", - "sha256": "1c7rdx5a7za0yg9c58255p4spq3zlc5pdgayrgv1mm80f3nc0sdk" + "commit": "3c69ed312121368f1b24cc04d54a29ce4ed4f743", + "sha256": "0vcg8sq8pbzary19xxdariz3kws93qd2agzssl9znw38sayj71wz" } }, { @@ -81947,8 +81953,8 @@ 20200503, 1624 ], - "commit": "f00144fb8faa81e1ce42516c2f58eb9fc797f7bd", - "sha256": "1hmrg1si9lf1xknfl4j4p2dg6iskaripy8k2askc8g0jjgmscq9f" + "commit": "1fc490c0a1d0df5d4d6a64da0ccf2dd711b9bf67", + "sha256": "0fkcn6dk67ljx73ww1zxxkmqp551xsshhz40z2fh1dxw00b470ga" } }, { @@ -82536,11 +82542,11 @@ "repo": "quelpa/quelpa", "unstable": { "version": [ - 20200329, - 719 + 20200514, + 1242 ], - "commit": "a3c4490a3bb08ee7819b330a93a284b2fd4cd70c", - "sha256": "1rm27y9zni9nscrvsmvi653nwkrlr4gd4cy5pyrynh3q32yhkqik" + "commit": "9ece62efa829c6b89ba61cb674f337764b266482", + "sha256": "1mvrpyiw53lrz6i7r7zlcfvksh8lsjb4vib6gnj5b849njzcjwhm" } }, { @@ -82649,11 +82655,11 @@ "repo": "emacsorphanage/quickrun", "unstable": { "version": [ - 20200427, - 337 + 20200514, + 1506 ], - "commit": "2e37ce9e4b13359344dbd67fbfd7e39d46b2c6b6", - "sha256": "0w9y8b76ias2dgzjsggd7z1mhv9dsaxrf20f95rq8zanfw2vr0pq" + "commit": "a8752887b81fc2f4f4e4bcd3d2cf8abafb85edbb", + "sha256": "0zjhpgg6zkqx8v0gv7h7z73i64ipzszm9cqs4wwaldlz228316ra" }, "stable": { "version": [ @@ -82811,15 +82817,15 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20200509, - 1405 + 20200513, + 1519 ], "deps": [ "faceup", "pos-tip" ], - "commit": "204845665cc4ec13edc59106b102fa251458e737", - "sha256": "0n376a48yjsd1ic8l31sg76aww3j1p5lriakljklzhf5s010vkss" + "commit": "0f1efa4a3cdcd26de1d2b002868ffc851cff25ac", + "sha256": "1zhn50apdrysm9d6ynv92slah78i39cismj88ym4ahrllwr1jnj4" } }, { @@ -83460,16 +83466,16 @@ "repo": "realgud/realgud", "unstable": { "version": [ - 20200418, - 1721 + 20200513, + 418 ], "deps": [ "load-relative", "loc-changes", "test-simple" ], - "commit": "e03446f54c7ee0b4ed3ec7300597046cf1de2bb8", - "sha256": "160pv9jx66ygl3z1g8yrw7f786403lbb182nz972yl4nyjchbdw7" + "commit": "1238d8e72945a84bb06cd39d7ded75f37105d4d2", + "sha256": "0gx5fivzksanyp9a0ijdzrcbgg8nw94mbilhdh1jkra5mw3ndr63" }, "stable": { "version": [ @@ -85049,8 +85055,8 @@ "deps": [ "helm" ], - "commit": "55d28321b480a095d29e5c6cd03c8dea9ad55553", - "sha256": "0f9h8vmfn8xi0c3qwigzbbvsck4wwxbflxl06m7ky2h5jnj6n0g3" + "commit": "88e6577a0e50f523f7da04de9f939b0bc168b514", + "sha256": "1k8330bgc9m7pnpvz3kjyjpjsmha43v4srnhns85xi0nv328g1iy" }, "stable": { "version": [ @@ -85073,16 +85079,16 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20200507, - 1417 + 20200516, + 1412 ], "deps": [ "s", "transient", "wgrep" ], - "commit": "4774ab1517f59fce998831671ef571a7b7ccd526", - "sha256": "1nyji041p0jxhzkz88p4x13l04sprw5736f7s45w8768iw9fqivf" + "commit": "f5456e006f22b6bc947e799261b36d55b075c5a2", + "sha256": "120n4vkw3c1l130932pziz9ivw85wyh6b75836w82dhx9d41h4cr" }, "stable": { "version": [ @@ -85357,14 +85363,14 @@ "repo": "thornjad/rivet-mode", "unstable": { "version": [ - 20191230, - 1842 + 20200514, + 1617 ], "deps": [ "web-mode" ], - "commit": "ac15de8c76978638e129c26869123c75d5b1f8c7", - "sha256": "19pv8qpcm0cllbbckzpjxrbkdavirq6b8p8jm274klkf4b7k32f8" + "commit": "9f2e6c4f777dbe306b715ab42663a6fc82a7e431", + "sha256": "09rsyq28caz4mrwm32i1f8wdzz35grigp7dilzxxqg0y4fpsf81f" }, "stable": { "version": [ @@ -86173,11 +86179,11 @@ "repo": "rust-lang/rust-mode", "unstable": { "version": [ - 20200509, - 954 + 20200513, + 812 ], - "commit": "eca55c068eb90aa5e1f36c6b31de589ce1df2ff1", - "sha256": "00vb53jzhnmwkw9bzcadyicplvp3x1jdcf4d0jnvfkhl4ln5d9j0" + "commit": "bfe40565753295a4cf8403f4124710acd2827d21", + "sha256": "1bx0hfilw48cz8n58lf427yg6sfi50wr91vcmj0w0m4s26zbdrr2" }, "stable": { "version": [ @@ -86220,8 +86226,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20200502, - 1247 + 20200516, + 759 ], "deps": [ "dash", @@ -86235,8 +86241,8 @@ "spinner", "xterm-color" ], - "commit": "cb2bfde237fd941f8c512e4d4f59ab5be53a5382", - "sha256": "1hv9py1jqn2pphcpdw1j4i1q4idm2mwz3gkyvimjm9w858sn5var" + "commit": "52b632d161b64bdca3f35e35180af63b668ce9fb", + "sha256": "1pcqm8463hjlv70bn6cpl2sv3z2h992yvkzrcz0w2rpz6jgrcfg1" } }, { @@ -86271,11 +86277,11 @@ "repo": "Kungsgeten/ryo-modal", "unstable": { "version": [ - 20191017, - 1323 + 20200515, + 1703 ], - "commit": "3a54312eea7023a86ca3f8eb3c03c872554bff2f", - "sha256": "1cyvp3bi6yhckbdnq98xvghmhdzghya5y9wd7hxjawibs75rza95" + "commit": "5d988e8b3a5d3d6f2f58d97031d2f500ef55473b", + "sha256": "0p7f02h5vsf4500gf4nl95myvh7pha47rdllscgs3b9jcx1kgyz2" } }, { @@ -86532,11 +86538,11 @@ "repo": "djcb/sauron", "unstable": { "version": [ - 20181216, - 1200 + 20200516, + 1406 ], - "commit": "e20eb21c93492a7c9e89579409ae5a07f77aa9fd", - "sha256": "0sm69gr05y44zxmdzyydbyf5yw4lhxszq3zgz4mflcnb544kkrj3" + "commit": "d2e06866d1045fa16015d135b8964d9caacc2985", + "sha256": "04z3hn46m6xy3jpfd00c7x24h27dgv5zcysci3lxzmmq9k4iqsg3" }, "stable": { "version": [ @@ -87398,11 +87404,11 @@ "repo": "raxod502/selectrum", "unstable": { "version": [ - 20200510, - 1557 + 20200514, + 1440 ], - "commit": "fec02b6e0c10dc865e22be8f46649f7078d2b137", - "sha256": "1mk60xp66xrrkarz48cm4cjr0vzrgsqi1s04cfg1zrqchh8408v2" + "commit": "392fb1ba8a594a291854c27d2b6824b04cd0c2e7", + "sha256": "1rr7w8jlxsfn2kpryb1ywn066qlc31px1dbwd42hafp6k5cl870n" }, "stable": { "version": [ @@ -88200,15 +88206,15 @@ "repo": "mhayashi1120/Emacs-shelldoc", "unstable": { "version": [ - 20151115, - 325 + 20200513, + 1206 ], "deps": [ "cl-lib", "s" ], - "commit": "5df2264eb60e45066f3633df4f34834751667346", - "sha256": "1mc7y79h5p9cxqwsl40b1j5la5bm8b70n6fn4rx9wr4bi7rwph5i" + "commit": "fa69f67b6229fad3f31d936955ca8d1982009b77", + "sha256": "0ma5j74vkwax9ha945dcgbmf3r4gajj4nvl63pbfyvxvy6svn84r" }, "stable": { "version": [ @@ -88717,11 +88723,11 @@ "repo": "webframp/sicp-info", "unstable": { "version": [ - 20200421, - 242 + 20200512, + 1137 ], - "commit": "3efcd37eb7888845c5f3292beeb18219f9993e92", - "sha256": "1qlgg7r9v62mcw07svdkzrf5ccm6n9vg64h4p704rfzkxys1cwfs" + "commit": "4002d83083d520c6b5ede2df36cc2cee885d450a", + "sha256": "0c9lknrhwhi4v3qnnzmy0k24d8pr3d3mpxi9xzcxq97f5w1x4fsk" } }, { @@ -89266,8 +89272,8 @@ "repo": "yuya373/emacs-slack", "unstable": { "version": [ - 20200402, - 1656 + 20200512, + 1702 ], "deps": [ "alert", @@ -89277,8 +89283,8 @@ "request", "websocket" ], - "commit": "d53a57a18fb7034182c3d02503f937761e6a2a64", - "sha256": "1xcfgyw9cky6msai2ap9fgcdasvmvn3k73rjmvnwcj4axh6vjvyx" + "commit": "b30525d63bb46882240de6f86e951305bcc7af10", + "sha256": "1f35lr19g5ci1jba6b9hkl7vajg4iy1yw6wb8bhg8dyppdkwnmvy" } }, { @@ -90331,8 +90337,8 @@ "deps": [ "org" ], - "commit": "0a6374493363d10826a8151d37fc461b08cc9b9a", - "sha256": "0vfhcnlz0p4dsnn7ac0fjqbk6xklanaa6jk0zbqcrlf2ww926v29" + "commit": "531957d7356f623b026aa45923e536421f682c1a", + "sha256": "0rb8vjnkn9pp0lrmmvsfslmw7xya4n18s82vs98545phwc4bjga5" } }, { @@ -92053,14 +92059,14 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20200504, - 2101 + 20200512, + 2217 ], "deps": [ "cl-lib" ], - "commit": "778bacc31773749dd76878e070051d49b7e6c450", - "sha256": "1sasnm0s3i1pj7r6bssgznfxiwlvvjgc0ijyk7xkv4n4588zcbcy" + "commit": "fd64b75f1051c4fe59209412f00a28625371588c", + "sha256": "1rh3nhwh75b698aq45cwmflv97r0596fq36w1rj08syfhmy3aari" }, "stable": { "version": [ @@ -92452,8 +92458,8 @@ 20171130, 1559 ], - "commit": "d185495d1ef2f8f1e343dc5a0d37e1fdbfd143a2", - "sha256": "0g39jyzrq451mh0k1ahs2svpddm5611lvj4gxcaz9iq02ich0jhc" + "commit": "fb180610de78c68736c963236afb28ee3ac952b4", + "sha256": "106jjrbjdgxp1s41h9vn877rq7a3m1jj9brlgdz1mrjgay266gcc" }, "stable": { "version": [ @@ -93337,16 +93343,16 @@ "repo": "danielmartin/swift-helpful", "unstable": { "version": [ - 20200321, - 10 + 20200516, + 1836 ], "deps": [ "dash", "lsp-mode", "swift-mode" ], - "commit": "e58f26b8ab9cf0522d52fe9890d39dc9e645577e", - "sha256": "1yx73wgvaf01wi26ahc9cblsk3sj98rgljb19dxc9ab7hjyncd46" + "commit": "e990ea6f5ea932763d002c3794dd9589add1532d", + "sha256": "1a4yrj3yjqgd5jssxd38dvx06cigsszrvs6hv7slfl60p729i0lw" }, "stable": { "version": [ @@ -93460,8 +93466,8 @@ "deps": [ "ivy" ], - "commit": "84efa3a2cbb9c5b0bbcc8d2e90671434eed74f94", - "sha256": "1nijxgqhd357dnjbhqjwnb68lkdcd9hpcxsbv8dfiigmaw7k2wqq" + "commit": "04ca16420053a3a6d34a96f0d680dd449c2e5851", + "sha256": "1sjaf026zim28c9cld0w5hlk9inp1map70ip99smlk483ib6lbj3" }, "stable": { "version": [ @@ -94385,11 +94391,11 @@ "repo": "saf-dmitry/taskpaper-mode", "unstable": { "version": [ - 20200416, - 2114 + 20200513, + 1728 ], - "commit": "eedf6a465b8ccc865c108a6f2715769300f5a499", - "sha256": "1p7wlv5i46f3d9kn3yiw6rga8mkln9m5xknzimzym2pyaclva41m" + "commit": "45625bd90cf5dbdcaed02b57baaa995e240ceb4c", + "sha256": "1s2xxscj675ps93hqczw1xcs3jsixblfzjcfpz74vbz9zkmq1ygm" }, "stable": { "version": [ @@ -94585,14 +94591,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20200423, - 1038 + 20200516, + 1007 ], "deps": [ + "rainbow-identifiers", "visual-fill-column" ], - "commit": "50ef9bf06cc162b39cf3553b89b02faf5bc87835", - "sha256": "1h5100vmgwy52zp7ryarj4xw3gb9paj1qpm39mc9h62s6n1zysw7" + "commit": "e2fd3b1b34ae659d306749ab3129ed498b3a2720", + "sha256": "0h851m3p9cqblr5wpl769g8dl5vxjgx62c6grkdk2g0ip2cm4vcf" }, "stable": { "version": [ @@ -95595,18 +95602,18 @@ 20200212, 1903 ], - "commit": "99612a3f69c0aecf6c2c4535a610e888aa923820", - "sha256": "17p6ip2na9629pdbrllrhrpnhlb9ngjdcs7g9ha3yhvk0sbgz4wf" + "commit": "81d2abd9097fc3497f77d830ebf8d8386beb7127", + "sha256": "0k9yr3dx12cl07dlz0zmaaf4zfr4zh54w5ix74b0kj1ny299f9q6" }, "stable": { "version": [ 2020, 5, - 4, + 11, 0 ], - "commit": "0580a039d7fe51d1c8f160985057e770c2cc7ae1", - "sha256": "1a4gdmcwn7msr2j98y4drlal2sk3fbs5jsy56b3j2njdyp7b5b98" + "commit": "99612a3f69c0aecf6c2c4535a610e888aa923820", + "sha256": "17p6ip2na9629pdbrllrhrpnhlb9ngjdcs7g9ha3yhvk0sbgz4wf" } }, { @@ -95662,8 +95669,8 @@ "deps": [ "haskell-mode" ], - "commit": "4a63723555fbbd427dba0606e6ba9e48afbc93da", - "sha256": "1hmdrx0wnv15gks432xa0ic971m39kj3fbhvjx14k1xh3zp010zp" + "commit": "f68e58cd7f8c483307573a96307f1f872a1921a0", + "sha256": "1rwc1vk0gl1sjnvzvwz4x25m6c61r8ghf6wrjclgifrm8zf1na5d" }, "stable": { "version": [ @@ -96142,8 +96149,8 @@ "deps": [ "cl-lib" ], - "commit": "b3b85a1a4589430e9255a4ea28c4e94787c6b0fe", - "sha256": "148m78rlymxx5sr17xbvi5v864ki66jkg2hkszhyk9za4f0mgdx0" + "commit": "bcd3d76a47b4f0e7c382fb680b14f40208dae568", + "sha256": "0sgzjddd34icbbm4pc7v1662k6288pkr70ki4p2j3q4mh9qqc8q7" } }, { @@ -96762,8 +96769,8 @@ "repo": "cyberthal/treefactor", "unstable": { "version": [ - 20200131, - 621 + 20200516, + 1631 ], "deps": [ "avy", @@ -96771,14 +96778,14 @@ "f", "org" ], - "commit": "273fe37aa4ba0fde084976f1b303ceec789a9f7b", - "sha256": "0bgbjkr81xrf4p9jcvdrb3d1nh6hyvdg6dgzbxsh7s73smal9kwk" + "commit": "75357757022a4399ab772ff0d92065bd114dabe9", + "sha256": "0ks7ilc01j1jli1p1lqmqwcr3bfzn5p6vhxybc9wn2sk2sqn2kv8" }, "stable": { "version": [ 3, 2, - 1 + 2 ], "deps": [ "avy", @@ -96786,8 +96793,8 @@ "f", "org" ], - "commit": "273fe37aa4ba0fde084976f1b303ceec789a9f7b", - "sha256": "0bgbjkr81xrf4p9jcvdrb3d1nh6hyvdg6dgzbxsh7s73smal9kwk" + "commit": "75357757022a4399ab772ff0d92065bd114dabe9", + "sha256": "0ks7ilc01j1jli1p1lqmqwcr3bfzn5p6vhxybc9wn2sk2sqn2kv8" } }, { @@ -96798,8 +96805,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20200506, - 1600 + 20200516, + 1204 ], "deps": [ "ace-window", @@ -96811,8 +96818,8 @@ "pfuture", "s" ], - "commit": "1ff0a8f0d3ce771d71c200e39b75d895acf35ec2", - "sha256": "0jkrykp1xg5vxipp8w3k42a9qyb1ckpm8211n3y449298zbff4kj" + "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7", + "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac" }, "stable": { "version": [ @@ -96848,8 +96855,8 @@ "evil", "treemacs" ], - "commit": "1ff0a8f0d3ce771d71c200e39b75d895acf35ec2", - "sha256": "0jkrykp1xg5vxipp8w3k42a9qyb1ckpm8211n3y449298zbff4kj" + "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7", + "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac" }, "stable": { "version": [ @@ -96879,8 +96886,8 @@ "cl-lib", "treemacs" ], - "commit": "1ff0a8f0d3ce771d71c200e39b75d895acf35ec2", - "sha256": "0jkrykp1xg5vxipp8w3k42a9qyb1ckpm8211n3y449298zbff4kj" + "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7", + "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac" }, "stable": { "version": [ @@ -96911,8 +96918,8 @@ "pfuture", "treemacs" ], - "commit": "1ff0a8f0d3ce771d71c200e39b75d895acf35ec2", - "sha256": "0jkrykp1xg5vxipp8w3k42a9qyb1ckpm8211n3y449298zbff4kj" + "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7", + "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac" }, "stable": { "version": [ @@ -96944,8 +96951,8 @@ "persp-mode", "treemacs" ], - "commit": "1ff0a8f0d3ce771d71c200e39b75d895acf35ec2", - "sha256": "0jkrykp1xg5vxipp8w3k42a9qyb1ckpm8211n3y449298zbff4kj" + "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7", + "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac" }, "stable": { "version": [ @@ -96976,8 +96983,8 @@ "projectile", "treemacs" ], - "commit": "1ff0a8f0d3ce771d71c200e39b75d895acf35ec2", - "sha256": "0jkrykp1xg5vxipp8w3k42a9qyb1ckpm8211n3y449298zbff4kj" + "commit": "1935108f683ac446e3d0add9467bc1adc4f744e7", + "sha256": "0b8r7wsjm3my1cgwv66lz53i4r6yklfpyhx1xq1cibixwxi1p1ac" }, "stable": { "version": [ @@ -97844,11 +97851,11 @@ "repo": "ideasman42/emacs-undo-fu", "unstable": { "version": [ - 20200510, - 425 + 20200512, + 19 ], - "commit": "ea41b40601e44409a0e1ee138fab628952cdae4c", - "sha256": "1wcqfrdy1iz6vb6m9qadd7x75iclrrry7il2w49a04dpqb7hcx99" + "commit": "2b1e53285a55ce50ca6fd60b050f2171e235d8f9", + "sha256": "0x7i7aj9fh8j0944xbym3hijr33mc0kfadl7v657k0d8nx00x3zh" } }, { @@ -98644,8 +98651,8 @@ 20190715, 1836 ], - "commit": "aa832e280cce7c5a7cb92e65609285932650bf49", - "sha256": "149a0h6mbgvkqcnkdz3npmkhr6qgnr1vjbyidajvi1agkxpfz7cl" + "commit": "952f97a46062bb3315d3ae20ecbfd58747019c25", + "sha256": "0bfi325y5yzjbwnmdww0l5bpf4h9ynwz4mwg60k8q3p3f82pkrrm" }, "stable": { "version": [ @@ -99283,11 +99290,11 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20200506, - 1850 + 20200515, + 1734 ], - "commit": "825baa8c241efe8d567bf096bb60f2543738c006", - "sha256": "1dmy3rngjpah6g5qlnii6yzf2b20brfcrdadx36d4prw5fzp2vnw" + "commit": "af1f250fd34d53ecdf31be1756c8693b4182d452", + "sha256": "0zk52ddlf11rwsd1f70i6jjc9z81jddqapfr2dv1d4ghn6j382x5" }, "stable": { "version": [ @@ -100024,11 +100031,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20200510, - 1856 + 20200515, + 1412 ], - "commit": "3decc51156e1b022955dc1333c3e358e20d94228", - "sha256": "1wqb3ajgzcwsvcvb6g6lmx3g2x4pi8g3vzp73a02h3lm52ljh6d1" + "commit": "8337e77520bcdb136eebb74837dc71ac8ec67601", + "sha256": "1wf8w8w0690mkih7c9xkk11i9f7r47abvfpyw4y576ansxlr5g1f" } }, { @@ -100039,14 +100046,14 @@ "repo": "jixiuf/vterm-toggle", "unstable": { "version": [ - 20200402, - 1516 + 20200516, + 1117 ], "deps": [ "vterm" ], - "commit": "15901e1e1eebd957ef18d38c920f944558ebd4fb", - "sha256": "1dcr242i9r7r4mr43qfv5ij254dnhf04gfi71y507zfpdr17zdix" + "commit": "fd55be72e8ad19e2284c8f73d5707c033dbde46d", + "sha256": "0q3459vpj5fp2i7nbk67mfd0nf78mpkgz771nhdj4a7xwghk6xgq" } }, { @@ -100970,8 +100977,8 @@ 20200217, 1030 ], - "commit": "5977b8e00051c9003ca96e9d35133e0dea68db2c", - "sha256": "0b6g8x9lzx4kr39h17g5impyvq1240iylk68jl55wamnb506gm4j" + "commit": "f0ef9bfa44db503cdb2f83fcfbd2fa4e2382ef1f", + "sha256": "1si1nng38ccciy0774gmf4wmz6x199cif357yjqibz1fk31lvk9p" }, "stable": { "version": [ @@ -100997,8 +101004,8 @@ "deps": [ "wgrep" ], - "commit": "5977b8e00051c9003ca96e9d35133e0dea68db2c", - "sha256": "0b6g8x9lzx4kr39h17g5impyvq1240iylk68jl55wamnb506gm4j" + "commit": "f0ef9bfa44db503cdb2f83fcfbd2fa4e2382ef1f", + "sha256": "1si1nng38ccciy0774gmf4wmz6x199cif357yjqibz1fk31lvk9p" }, "stable": { "version": [ @@ -101027,8 +101034,8 @@ "deps": [ "wgrep" ], - "commit": "5977b8e00051c9003ca96e9d35133e0dea68db2c", - "sha256": "0b6g8x9lzx4kr39h17g5impyvq1240iylk68jl55wamnb506gm4j" + "commit": "f0ef9bfa44db503cdb2f83fcfbd2fa4e2382ef1f", + "sha256": "1si1nng38ccciy0774gmf4wmz6x199cif357yjqibz1fk31lvk9p" }, "stable": { "version": [ @@ -101057,8 +101064,8 @@ "deps": [ "wgrep" ], - "commit": "5977b8e00051c9003ca96e9d35133e0dea68db2c", - "sha256": "0b6g8x9lzx4kr39h17g5impyvq1240iylk68jl55wamnb506gm4j" + "commit": "f0ef9bfa44db503cdb2f83fcfbd2fa4e2382ef1f", + "sha256": "1si1nng38ccciy0774gmf4wmz6x199cif357yjqibz1fk31lvk9p" }, "stable": { "version": [ @@ -101087,8 +101094,8 @@ "deps": [ "wgrep" ], - "commit": "5977b8e00051c9003ca96e9d35133e0dea68db2c", - "sha256": "0b6g8x9lzx4kr39h17g5impyvq1240iylk68jl55wamnb506gm4j" + "commit": "f0ef9bfa44db503cdb2f83fcfbd2fa4e2382ef1f", + "sha256": "1si1nng38ccciy0774gmf4wmz6x199cif357yjqibz1fk31lvk9p" }, "stable": { "version": [ @@ -101776,8 +101783,8 @@ 20191114, 2340 ], - "commit": "33b4fcdd8a17aa19d57971e4f6db5fcb7758843c", - "sha256": "09rrv89b17s4sklkqgci1pmzlnkjlrira22884dh10sbfij42vbp" + "commit": "91ec8dc32652811861116e6f750f0fb41b21b771", + "sha256": "0nc9c1agzhmlbh4ijjrsa9yx19hvxzk06gv6p4pgrlx1yg2khnli" } }, { @@ -102198,8 +102205,8 @@ "repo": "pashinin/workgroups2", "unstable": { "version": [ - 20141102, - 1922 + 20200516, + 1451 ], "deps": [ "anaphora", @@ -102207,8 +102214,8 @@ "dash", "f" ], - "commit": "bbefbb2579d463b243dcd4ecbfce82e1bdac3882", - "sha256": "0md6i2sawrzqza2br1g11zhhrda286abhlx0v9pgf65mafc4ilwi" + "commit": "239a5a3ba3b210be5d8fe527546d09241bd3185c", + "sha256": "16lzv61scc1iq1vsbfvyzla91cnxh5a7s84wx3x3kq9jggzh6hbs" }, "stable": { "version": [ @@ -102447,20 +102454,20 @@ "repo": "redguardtoo/wucuo", "unstable": { "version": [ - 20200421, - 441 + 20200516, + 1526 ], - "commit": "2b7632813fdbbfe5abddf7ce425dea607c9946cc", - "sha256": "1h3d7qqajwl9zm5j77y5s3s9sq0hpdakbapsd34xg2x87v0p1320" + "commit": "49d2ae558068954eb8c4324b8ee7a6b2b0a00ef9", + "sha256": "1zr9fp4y9459y97zh4dj6109wwk6lj7sjfffwapyjmirnpfkxirk" }, "stable": { "version": [ 0, 1, - 0 + 2 ], - "commit": "2b7632813fdbbfe5abddf7ce425dea607c9946cc", - "sha256": "1h3d7qqajwl9zm5j77y5s3s9sq0hpdakbapsd34xg2x87v0p1320" + "commit": "49d2ae558068954eb8c4324b8ee7a6b2b0a00ef9", + "sha256": "1zr9fp4y9459y97zh4dj6109wwk6lj7sjfffwapyjmirnpfkxirk" } }, { @@ -103099,11 +103106,11 @@ "repo": "atomontage/xterm-color", "unstable": { "version": [ - 20200510, - 1712 + 20200514, + 1932 ], - "commit": "137dfecedfdf6aff69b0f9b1c299aa0ae868fca0", - "sha256": "127lq50q62x06kd1xrf8lyc4rkqbfhfy86gsx1x4x169am2xk397" + "commit": "3d1a24ca84d26ad4507a79260107b010a1d6886b", + "sha256": "1qppbf4jidq6q8c7gby0syp4560xqc3kzgbdgdwl1jc5k08ln3cl" }, "stable": { "version": [ @@ -103306,11 +103313,11 @@ "repo": "drdv/yahtzee", "unstable": { "version": [ - 20171022, - 1412 + 20200511, + 2005 ], - "commit": "1ae37b1a949a6afcb6521e452588bf8a058f9e81", - "sha256": "0ya3injviifhrcsdfm9hkfw8xqfaa6hqvv5z0cfvfj7rcwjnbx9p" + "commit": "63b9b698fbb547603c3f66932c6d3e3bb217c443", + "sha256": "0v0lp2n0xdxfiasr3lcydj9q4krfvzqi568iyngq6zxlryc75wi0" } }, { @@ -103366,11 +103373,11 @@ "repo": "yoshiki/yaml-mode", "unstable": { "version": [ - 20200511, - 952 + 20200512, + 2141 ], - "commit": "41adb32b886352827c4d4b4ad15cdf18a00c8c50", - "sha256": "1sp507iphis91581f51j3kc29vn5qkwjfiv7ma06scg22fps9qis" + "commit": "0b33131664719c61f834e77ff3b91ded3de2cd3b", + "sha256": "0ig5hpk0wb46yz6gml6g7x9am0l3cay1bzxldms0g2qjh5swxrq4" }, "stable": { "version": [ @@ -103981,8 +103988,8 @@ 20200510, 1405 ], - "commit": "adea3fa881baebed4fd6a4e6653c9a1d16a1ed52", - "sha256": "04xmvc7i4p7s9j3dx55vcakps50r5a95n5j6vzby9qm6rc3vss3m" + "commit": "828323f9acb654d8f61ccbca510b471fb00879ee", + "sha256": "1zixqicpdywzdc2pkx9h08y3kphmn9zcx44bj2rqg3h8xsmjayk5" } }, { @@ -104245,14 +104252,14 @@ "repo": "efls/zetteldeft", "unstable": { "version": [ - 20200509, - 1040 + 20200516, + 1108 ], "deps": [ "deft" ], - "commit": "c0d36c5d1129a600bee51e0913ae2f851cc56b7b", - "sha256": "1l8lrgy3i0h174zvfcpc4h1v5h4vpxnmh963v32dh8jnj1vs0afx" + "commit": "f3503ec8fde88d733b7bbbd4431e85de396a3fe8", + "sha256": "0843k0i6szjvc7f51q0pm7vmxpfz68911d75m75rg54k1jbynazq" }, "stable": { "version": [ -- cgit v1.2.3 From ab0adc24cc51647e92035dccf74246fed3b1630f Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 17 May 2020 02:19:18 +0200 Subject: openbox: Use python3 instead of python2 (#87846) --- pkgs/applications/window-managers/openbox/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/openbox/default.nix b/pkgs/applications/window-managers/openbox/default.nix index a4ec6d067dc..39329e8004c 100644 --- a/pkgs/applications/window-managers/openbox/default.nix +++ b/pkgs/applications/window-managers/openbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, python2 +{ stdenv, fetchurl, autoreconfHook, pkgconfig, python3 , libxml2, libXinerama, libXcursor, libXau, libXrandr, libICE, libSM , imlib2, pango, libstartup_notification, makeWrapper }: @@ -7,22 +7,24 @@ stdenv.mkDerivation rec { version = "3.6.1"; nativeBuildInputs = [ + autoreconfHook pkgconfig makeWrapper - python2.pkgs.wrapPython + python3.pkgs.wrapPython ]; buildInputs = [ libxml2 libXinerama libXcursor libXau libXrandr libICE libSM libstartup_notification + python3 ]; propagatedBuildInputs = [ pango imlib2 ]; - pythonPath = with python2.pkgs; [ + pythonPath = with python3.pkgs; [ pyxdg ]; @@ -36,6 +38,15 @@ stdenv.mkDerivation rec { sha256 = "1ci9lq4qqhl31yz1jwwjiawah0f7x0vx44ap8baw7r6rdi00pyiv"; }; + patches = [ + # Use fetchurl to avoid "fetchpatch: ignores file renames" #32084 + # This patch adds python3 support + (fetchurl { + url = "https://git.archlinux.org/svntogit/community.git/plain/openbox/trunk/py3.patch?id=90cb57ef53d952bb6ab4c33a184f815bbe1791c0"; + sha256 = "1ks99awlkhd5ph9kz94s1r6m1bfvh42g4rmxd14dyg5b421p1ljc"; + }) + ]; + postBuild = "gcc -O2 -o setlayout $(pkg-config --cflags --libs x11) $setlayoutSrc"; # Openbox needs XDG_DATA_DIRS set or it can't find its default theme -- cgit v1.2.3 From 1fc8b73b34b5bf8a09cc3f6699d20bc33a3e7ca7 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 17 May 2020 00:34:04 +0000 Subject: adminer: 4.7.6 -> 4.7.7 --- pkgs/servers/adminer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/adminer/default.nix b/pkgs/servers/adminer/default.nix index 6d7b12df56d..c58d2e6c2ba 100644 --- a/pkgs/servers/adminer/default.nix +++ b/pkgs/servers/adminer/default.nix @@ -1,13 +1,13 @@ { stdenv, libbsd, fetchurl, phpPackages, php }: stdenv.mkDerivation rec { - version = "4.7.6"; + version = "4.7.7"; pname = "adminer"; # not using fetchFromGitHub as the git repo relies on submodules that are included in the tar file src = fetchurl { url = "https://github.com/vrana/adminer/releases/download/v${version}/adminer-${version}.tar.gz"; - sha256 = "1zgvscz7jk32qga8hp2dg89h7y72v05vz4yh4lq2ahhwwkbnsxpi"; + sha256 = "1rvvc7xml7ycpbpjgqbgkan8djplx67balrmfignk1b6h9cw3l4q"; }; nativeBuildInputs = with phpPackages; [ php composer ]; -- cgit v1.2.3 From a57176cab471b52e0010f07fb3272d967cade452 Mon Sep 17 00:00:00 2001 From: Ivar Date: Sun, 17 May 2020 02:26:34 +0200 Subject: ksuperkey: git-2015-07-21 -> 0.4 --- pkgs/tools/X11/ksuperkey/default.nix | 37 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/pkgs/tools/X11/ksuperkey/default.nix b/pkgs/tools/X11/ksuperkey/default.nix index 1472e39c83c..d5c2232dce1 100644 --- a/pkgs/tools/X11/ksuperkey/default.nix +++ b/pkgs/tools/X11/ksuperkey/default.nix @@ -1,27 +1,26 @@ -{ stdenv, fetchgit, libX11, libXtst, pkgconfig, xorgproto, libXi }: +{ stdenv, fetchFromGitHub, libX11, libXtst, pkgconfig, xorgproto, libXi }: -stdenv.mkDerivation { - name = "ksuperkey-git-2015-07-21"; +stdenv.mkDerivation rec { + pname = "ksuperkey"; + version = "0.4"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ - libX11 libXtst xorgproto libXi - ]; - - src = fetchgit { - url = "https://github.com/hanschen/ksuperkey"; - rev = "e75a31a0e3e80b14341e92799a7ce3232ac37639"; - sha256 = "0y4wkak9dvcm14g54ll1ln9aks2az63hx8fv7b8d3nscxjbkxl6g"; + src = fetchFromGitHub { + owner = "hanschen"; + repo = "ksuperkey"; + rev = "v${version}"; + sha256 = "1dvgf356fihfav8pjzww1q6vgd96c5h18dh8vpv022g9iipiwq8a"; }; - preConfigure = '' - makeFlags="$makeFlags PREFIX=$out" - ''; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ libX11 libXtst xorgproto libXi ]; - meta = { + meta = with stdenv.lib; { description = "A tool to be able to bind the super key as a key rather than a modifier"; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.vozz ]; - platforms = stdenv.lib.platforms.linux; + homepage = "https://github.com/hanschen/ksuperkey"; + license = licenses.gpl3; + maintainers = [ maintainers.vozz ]; + platforms = platforms.linux; }; } -- cgit v1.2.3 From d32d97b72020ed1ec2f16171db81f8406c0e239e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 17 May 2020 01:04:47 +0000 Subject: audacity: 2.3.3 -> 2.4.0 --- pkgs/applications/audio/audacity/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index f1e652cbcad..72669aa183b 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -7,12 +7,12 @@ with stdenv.lib; stdenv.mkDerivation rec { - version = "2.3.3"; + version = "2.4.0"; pname = "audacity"; src = fetchzip { url = "https://github.com/audacity/audacity/archive/Audacity-${version}.tar.gz"; - sha256 = "0ddc03dbm4ixy877czmwd03fpjgr3y68bxfgb6n2q6cv4prp30ig"; + sha256 = "1f0lbzisqaj4pr9xxsx105a9ibym2qbngalnsb7iwmcvyrpc0l6a"; }; preConfigure = /* we prefer system-wide libs */ '' -- cgit v1.2.3 From d4ca62607a397d0554cae763c88f71e6118bb7b3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 17 May 2020 02:13:22 +0000 Subject: cargo-flamegraph: 0.2.0 -> 0.3.0 --- pkgs/development/tools/cargo-flamegraph/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/cargo-flamegraph/default.nix b/pkgs/development/tools/cargo-flamegraph/default.nix index 26dd3a895ae..08b248dd0f6 100644 --- a/pkgs/development/tools/cargo-flamegraph/default.nix +++ b/pkgs/development/tools/cargo-flamegraph/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-flamegraph"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "flamegraph-rs"; repo = "flamegraph"; rev = "v${version}"; - sha256 = "1avjq36wnm0gd5zkkv1c8hj8j51ah1prlifadjhpaf788rsng9w1"; + sha256 = "0d6k2qr76p93na39j4zbcpc9kaswd806wrqhcwisqxdrcxrjbwhk"; }; - cargoSha256 = "10cw3qgc39id8rzziamvgm5s3yf8vgqrnx9v15dw9miapz88amcy"; + cargoSha256 = "1qz4a1b58j3bv3akqvc3bcgvqq4bi8cbm3gzws6a52dz7ycrgq46"; nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ]; buildInputs = lib.optionals stdenv.isDarwin [ -- cgit v1.2.3 From 873e114cf49c739529f90cc1a04413f85a340b76 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 11 May 2020 08:42:26 +0200 Subject: =?UTF-8?q?ocamlPackages.ocurl:=200.9.0=20=E2=86=92=200.9.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/ocurl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocurl/default.nix b/pkgs/development/ocaml-modules/ocurl/default.nix index a1e524a8642..4c2e4ee6a30 100644 --- a/pkgs/development/ocaml-modules/ocurl/default.nix +++ b/pkgs/development/ocaml-modules/ocurl/default.nix @@ -5,10 +5,10 @@ then throw "ocurl is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocurl-0.9.0"; + name = "ocurl-0.9.1"; src = fetchurl { url = "http://ygrek.org.ua/p/release/ocurl/${name}.tar.gz"; - sha256 = "0v5qzfazaynjv1xy3ds2z5iz0np5mz8g831l91l1mrqz6fr1ah0f"; + sha256 = "0n621cxb9012pj280c7821qqsdhypj8qy9qgrah79dkh6a8h2py6"; }; buildInputs = [ pkgconfig ocaml findlib ncurses ]; -- cgit v1.2.3 From 219382bf283274e0ad248e7dd1c21780e58b52cd Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 17 May 2020 08:40:30 +0200 Subject: wpa_supplicant_gui: fix build with Inkscape 1.0 --- pkgs/os-specific/linux/wpa_supplicant/gui.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/os-specific/linux/wpa_supplicant/gui.nix index d60ff7f364c..911b0331f4c 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/gui.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/gui.nix @@ -1,14 +1,23 @@ -{ stdenv, mkDerivation, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }: +{ stdenv, mkDerivation, fetchpatch, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }: mkDerivation { name = "wpa_gui-${wpa_supplicant.version}"; inherit (wpa_supplicant) src; + patches = [ + # Fix build with Inkscape 1.0 + # https://github.com/NixOS/nixpkgs/issues/86930 + (fetchpatch { + url = "https://w1.fi/cgit/hostap/patch/?id=0388992905a5c2be5cba9497504eaea346474754"; + sha256 = "YDSY7l/qEco+aZYcYHLf/rxCKvPw35ibGoMorjA5GhY="; + }) + ]; + buildInputs = [ qtbase ]; nativeBuildInputs = [ qmake inkscape imagemagick ]; - prePatch = '' + postPatch = '' cd wpa_supplicant/wpa_gui-qt4 ''; -- cgit v1.2.3 From b3e7e67a5e7fe812fed3fe3b83d22fa853eda2a4 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 17 May 2020 11:19:40 +0300 Subject: vdirsyncer: Convert to a python module (#87865) * vdirsyncer: standardize derivation Use toPythonApplication and use callPackage from python-packages.nix. Make vdirsyncerStable somewhat functional again, but mark it as broken for Python 3.6 or higher. * vdirsyncer: use buildPythonPackage as it's a package now * vdirsyncer: move to python-modules/ * vdirsyncer: Move disabled logic into expression --- .../python-modules/vdirsyncer/default.nix | 109 +++++++++++++++++++++ .../python-modules/vdirsyncer/stable.nix | 88 +++++++++++++++++ pkgs/tools/misc/vdirsyncer/default.nix | 77 --------------- pkgs/tools/misc/vdirsyncer/stable.nix | 52 ---------- pkgs/top-level/all-packages.nix | 6 +- pkgs/top-level/python-packages.nix | 7 ++ 6 files changed, 206 insertions(+), 133 deletions(-) create mode 100644 pkgs/development/python-modules/vdirsyncer/default.nix create mode 100644 pkgs/development/python-modules/vdirsyncer/stable.nix delete mode 100644 pkgs/tools/misc/vdirsyncer/default.nix delete mode 100644 pkgs/tools/misc/vdirsyncer/stable.nix diff --git a/pkgs/development/python-modules/vdirsyncer/default.nix b/pkgs/development/python-modules/vdirsyncer/default.nix new file mode 100644 index 00000000000..1a5494634bb --- /dev/null +++ b/pkgs/development/python-modules/vdirsyncer/default.nix @@ -0,0 +1,109 @@ +{ stdenv +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, fetchpatch +, rustPlatform +, pkg-config +, openssl +, CoreServices +, Security +, click +, click-log +, click-threading +, requests_toolbelt +, requests +, requests_oauthlib # required for google oauth sync +, atomicwrites +, milksnake +, shippai +, hypothesis +, pytest +, pytest-localserver +, pytest-subtesthack +, setuptools_scm +}: + +# Packaging documentation at: +# https://github.com/untitaker/vdirsyncer/blob/master/docs/packaging.rst +buildPythonPackage rec { + version = "unstable-2018-08-05"; + pname = "vdirsyncer"; + name = "${pname}-${version}"; + disabled = isPy27; + + src = fetchFromGitHub { + owner = "spk"; + repo = pname; + # fix-build-style branch, see https://github.com/pimutils/vdirsyncer/pull/798 + rev = "2c62d03bd73f8b44a47c2e769ade046697896ae9"; + sha256 = "1q6xvzz5rf5sqdaj3mdvhpgwy5b16isavgg7vardgjwqwv1yal28"; + }; + + native = rustPlatform.buildRustPackage { + name = "${name}-native"; + inherit src; + sourceRoot = "source/rust"; + cargoSha256 = "0cqy0s55pkg6hww86h7qip4xaidh6g8lcypdj84n2x374jq38c5d"; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; + }; + + propagatedBuildInputs = [ + click click-log click-threading + requests_toolbelt + requests + requests_oauthlib # required for google oauth sync + atomicwrites + milksnake + shippai + ]; + + nativeBuildInputs = [ + setuptools_scm + ]; + + checkInputs = [ + hypothesis + pytest + pytest-localserver + pytest-subtesthack + ]; + + patches = [ + (fetchpatch { + url = "https://github.com/pimutils/vdirsyncer/commit/7b636e8e40d69c495901f965b9c0686513659e44.patch"; + sha256 = "0vl942ii5iad47y63v0ngmhfp37n30nxyk4j7h64b95fk38vfwx9"; + }) + ]; + + postPatch = '' + # see https://github.com/pimutils/vdirsyncer/pull/805 + substituteInPlace setup.cfg --replace --duration --durations + + # for setuptools_scm: + echo 'Version: ${version}' >PKG-INFO + + sed -i 's/spec.add_external_build(cmd=cmd/spec.add_external_build(cmd="true"/g' setup.py + + # fixing test + sed -i "s/invalid value for \"--verbosity\"/invalid value for \\\'--verbosity\\\'/" tests/system/cli/test_sync.py + ''; + + preBuild = '' + mkdir -p rust/target/release + ln -s ${native}/lib/libvdirsyncer_rustext* rust/target/release/ + ''; + + checkPhase = '' + rm -rf vdirsyncer + make DETERMINISTIC_TESTS=true PYTEST_ARGS="--deselect=tests/unit/utils/test_vobject.py::test_replace_uid --deselect=tests/unit/sync/test_sync.py::TestSyncMachine" test + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/pimutils/vdirsyncer"; + description = "Synchronize calendars and contacts"; + maintainers = with maintainers; [ matthiasbeyer gebner ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/vdirsyncer/stable.nix b/pkgs/development/python-modules/vdirsyncer/stable.nix new file mode 100644 index 00000000000..cb90bfbc598 --- /dev/null +++ b/pkgs/development/python-modules/vdirsyncer/stable.nix @@ -0,0 +1,88 @@ +{ stdenv +, pythonAtLeast +, buildPythonPackage +, fetchPypi +, isPy27 +, fetchpatch +, click +, click-log +, click-threading +, requests_toolbelt +, requests +, requests_oauthlib # required for google oauth sync +, atomicwrites +, milksnake +, shippai +, hypothesis +, pytest +, pytest-localserver +, pytest-subtesthack +, setuptools_scm +}: + +# Packaging documentation at: +# https://github.com/pimutils/vdirsyncer/blob/0.16.7/docs/packaging.rst +buildPythonPackage rec { + version = "0.16.7"; + pname = "vdirsyncer"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "6c9bcfb9bcb01246c83ba6f8551cf54c58af3323210755485fc23bb7848512ef"; + }; + + propagatedBuildInputs = [ + click click-log click-threading + requests_toolbelt + requests + requests_oauthlib # required for google oauth sync + atomicwrites + ]; + + nativeBuildInputs = [ + setuptools_scm + ]; + + checkInputs = [ + 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 PYTEST_ARGS="--deselect=tests/system/cli/test_sync.py::test_verbosity" test + ''; + # Tests started to fail lately, for any python version even as low as 3.5 but + # if you enable the check, you'll see even severer errors with a higher then + # 3.5 python version. Hence it's marked as broken for higher then 3.5 and the + # checks are disabled unconditionally. As a general end user advice, use the + # normal "unstable" `vdirsyncer` derivation, not this one. + doCheck = false; + + meta = with stdenv.lib; { + homepage = "https://github.com/pimutils/vdirsyncer"; + description = "Synchronize calendars and contacts"; + license = licenses.mit; + # vdirsyncer (unstable) works with mainline python versions + broken = (pythonAtLeast "3.6"); + maintainers = with maintainers; [ loewenheim ]; + }; +} diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix deleted file mode 100644 index 61c9b9df877..00000000000 --- a/pkgs/tools/misc/vdirsyncer/default.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ stdenv, python3Packages, fetchFromGitHub, fetchpatch, rustPlatform, pkgconfig, openssl, CoreServices, Security }: - -# Packaging documentation at: -# https://github.com/untitaker/vdirsyncer/blob/master/docs/packaging.rst -python3Packages.buildPythonApplication rec { - version = "unstable-2018-08-05"; - pname = "vdirsyncer"; - name = "${pname}-${version}"; - - src = fetchFromGitHub { - owner = "spk"; - repo = pname; - # fix-build-style branch, see https://github.com/pimutils/vdirsyncer/pull/798 - rev = "2c62d03bd73f8b44a47c2e769ade046697896ae9"; - sha256 = "1q6xvzz5rf5sqdaj3mdvhpgwy5b16isavgg7vardgjwqwv1yal28"; - }; - - native = rustPlatform.buildRustPackage { - name = "${name}-native"; - inherit src; - sourceRoot = "source/rust"; - cargoSha256 = "0cqy0s55pkg6hww86h7qip4xaidh6g8lcypdj84n2x374jq38c5d"; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices Security ]; - }; - - propagatedBuildInputs = with python3Packages; [ - click click-log click-threading - requests_toolbelt - requests - requests_oauthlib # required for google oauth sync - atomicwrites - milksnake - shippai - ]; - - nativeBuildInputs = with python3Packages; [ setuptools_scm ]; - - checkInputs = with python3Packages; [ hypothesis pytest pytest-localserver pytest-subtesthack ]; - - patches = [ - (fetchpatch { - url = "https://github.com/pimutils/vdirsyncer/commit/7b636e8e40d69c495901f965b9c0686513659e44.patch"; - sha256 = "0vl942ii5iad47y63v0ngmhfp37n30nxyk4j7h64b95fk38vfwx9"; - }) - ]; - - postPatch = '' - # see https://github.com/pimutils/vdirsyncer/pull/805 - substituteInPlace setup.cfg --replace --duration --durations - - # for setuptools_scm: - echo 'Version: ${version}' >PKG-INFO - - sed -i 's/spec.add_external_build(cmd=cmd/spec.add_external_build(cmd="true"/g' setup.py - - # fixing test - sed -i "s/invalid value for \"--verbosity\"/invalid value for \\\'--verbosity\\\'/" tests/system/cli/test_sync.py - ''; - - preBuild = '' - mkdir -p rust/target/release - ln -s ${native}/lib/libvdirsyncer_rustext* rust/target/release/ - ''; - - checkPhase = '' - rm -rf vdirsyncer - make DETERMINISTIC_TESTS=true PYTEST_ARGS="--deselect=tests/unit/utils/test_vobject.py::test_replace_uid --deselect=tests/unit/sync/test_sync.py::TestSyncMachine" test - ''; - - meta = with stdenv.lib; { - homepage = "https://github.com/pimutils/vdirsyncer"; - description = "Synchronize calendars and contacts"; - maintainers = with maintainers; [ matthiasbeyer gebner ]; - license = licenses.mit; - }; -} diff --git a/pkgs/tools/misc/vdirsyncer/stable.nix b/pkgs/tools/misc/vdirsyncer/stable.nix deleted file mode 100644 index ada70678e34..00000000000 --- a/pkgs/tools/misc/vdirsyncer/stable.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ 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 PYTEST_ARGS="--deselect=tests/system/cli/test_sync.py::test_verbosity" 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/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e32522158c..fc8f53db0ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22369,11 +22369,9 @@ in vcv-rack = callPackage ../applications/audio/vcv-rack { }; - vdirsyncer = callPackage ../tools/misc/vdirsyncer { - inherit (darwin.apple_sdk.frameworks) CoreServices Security; - }; + vdirsyncer = with python3Packages; toPythonApplication vdirsyncer; - vdirsyncerStable = callPackage ../tools/misc/vdirsyncer/stable.nix { }; + vdirsyncerStable = with python3Packages; toPythonApplication vdirsyncerStable; vdpauinfo = callPackage ../tools/X11/vdpauinfo { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 513b5876bf0..c7c14cc95cf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1607,6 +1607,13 @@ in { vdf = callPackage ../development/python-modules/vdf { }; + vdirsyncer = callPackage ../development/python-modules/vdirsyncer { + inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices Security; + inherit (pkgs) pkg-config openssl rustPlatform; + }; + + vdirsyncerStable = callPackage ../development/python-modules/vdirsyncer/stable.nix { }; + vidstab = callPackage ../development/python-modules/vidstab { }; webapp2 = callPackage ../development/python-modules/webapp2 { }; -- cgit v1.2.3 From 8cdc8687bffd411f6f5b5e458071f18b4c9dd109 Mon Sep 17 00:00:00 2001 From: Jamie McClymont Date: Sun, 17 May 2020 20:11:41 +1200 Subject: redis: handle changes to systemd support The 6.0 changelog notes that systemd support was rewritten. The effects of that seem to be twofold: * Redis will silently fail to sd_notify if not built with libsystemd, breaking our unit configuration. * It also appears to misbehave if told to daemonize when running under systemd -- note that upstream's sample unit configuration does not daemonize: https://github.com/antirez/redis/blob/unstable/utils/systemd-redis_server.service --- nixos/modules/services/databases/redis.nix | 3 +-- pkgs/servers/nosql/redis/default.nix | 7 ++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index 5c817422aae..799c3db6216 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -11,12 +11,11 @@ let port ${toString cfg.port} ${condOption "bind" cfg.bind} ${condOption "unixsocket" cfg.unixSocket} - daemonize yes + daemonize no supervised systemd loglevel ${cfg.logLevel} logfile ${cfg.logfile} syslog-enabled ${redisBool cfg.syslog} - pidfile /run/redis/redis.pid databases ${toString cfg.databases} ${concatMapStrings (d: "save ${toString (builtins.elemAt d 0)} ${toString (builtins.elemAt d 1)}\n") cfg.save} dbfilename dump.rdb diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 16d985f6559..3678f028cfe 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lua, jemalloc, nixosTests }: +{ stdenv, fetchurl, lua, pkgconfig, systemd, jemalloc, nixosTests }: stdenv.mkDerivation rec { version = "6.0.1"; @@ -18,13 +18,14 @@ stdenv.mkDerivation rec { ''} ''; - buildInputs = [ lua ]; + buildInputs = [ lua pkgconfig ] ++ stdenv.lib.optional (stdenv.isLinux) systemd; # More cross-compiling fixes. # Note: this enables libc malloc as a temporary fix for cross-compiling. # Due to hardcoded configure flags in jemalloc, we can't cross-compile vendored jemalloc properly, and so we're forced to use libc allocator. # It's weird that the build isn't failing because of failure to compile dependencies, it's from failure to link them! makeFlags = [ "PREFIX=$(out)" ] - ++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" "MALLOC=libc" ]; + ++ stdenv.lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ "AR=${stdenv.cc.targetPrefix}ar" "RANLIB=${stdenv.cc.targetPrefix}ranlib" "MALLOC=libc" ] + ++ stdenv.lib.optional (stdenv.isLinux) ["USE_SYSTEMD=yes"]; enableParallelBuilding = true; -- cgit v1.2.3 From 68a09ca2d49396c25d962b460ea4d9f4b4f978dc Mon Sep 17 00:00:00 2001 From: Jamie McClymont Date: Sun, 17 May 2020 21:14:52 +1200 Subject: redis: 6.0.1 -> 6.0.3 ================================================================================ Redis 6.0.3 Released Sat May 16 18:10:21 CEST 2020 ================================================================================ Upgrade urgency CRITICAL: a crash introduced in 6.0.2 is now fixed. 1eab62f7e Remove the client from CLOSE_ASAP list before caching the master. ================================================================================ Redis 6.0.2 Released Fri May 15 22:24:36 CEST 2020 ================================================================================ Upgrade urgency MODERATE: many not critical bugfixes in different areas. Critical fix to client side caching when keys are evicted from the tracking table but no notifications are sent. The following are the most serious fix: * XPENDING should not update consumer's seen-time * optimize memory usage of deferred replies - fixed * Fix CRC64 initialization outside the Redis server itself. * stringmatchlen() should not expect null terminated strings. * Cluster nodes availability checks improved when there is high Pub/Sub load on the cluster bus. * Redis Benchmark: Fix coredump because of double free * Tracking: send eviction messages when evicting entries. * rax.c updated from upstream antirez/rax. * fix redis 6.0 not freeing closed connections during loading. New features: * Support setcpuaffinity on linux/bsd * Client Side Caching: Add Tracking Prefix Number Stats in Server Info * Add --user argument to redis-benchmark.c (ACL) --- pkgs/servers/nosql/redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index 3678f028cfe..8089fa46f92 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, lua, pkgconfig, systemd, jemalloc, nixosTests }: stdenv.mkDerivation rec { - version = "6.0.1"; + version = "6.0.3"; pname = "redis"; src = fetchurl { url = "http://download.redis.io/releases/${pname}-${version}.tar.gz"; - sha256 = "0wzjjcjy2pyd3fwwcb9g936ichrrmj4xqi4wp9ic3vbr0i1nwxdq"; + sha256 = "0fmvbhbgkrw75kqzgpklasylzff4zd0sxy2cvsrgg4pyh776v95w"; }; # Cross-compiling fixes -- cgit v1.2.3 From f3cd040e20fc7b46c30f662b3db9c1509ff7edc1 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sun, 17 May 2020 12:00:00 +0000 Subject: pdfarranger: 1.5.1 -> 1.5.3 changelog: https://github.com/jeromerobert/pdfarranger/releases --- pkgs/applications/misc/pdfarranger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/pdfarranger/default.nix b/pkgs/applications/misc/pdfarranger/default.nix index 4d2576aaadc..c43ae1de9a1 100644 --- a/pkgs/applications/misc/pdfarranger/default.nix +++ b/pkgs/applications/misc/pdfarranger/default.nix @@ -5,13 +5,13 @@ python3Packages.buildPythonApplication rec { pname = "pdfarranger"; - version = "1.5.1"; + version = "1.5.3"; src = fetchFromGitHub { owner = "jeromerobert"; repo = pname; rev = version; - sha256 = "0n4jw0dsqw929a34ff077kz8w89vkjkqf8dy4c356zh6gf23cdxr"; + sha256 = "0a9ap7p8iw57sn5nmhim7gp5as8gj6ir6l3p0bpmg4iqjsr4169h"; }; nativeBuildInputs = [ -- cgit v1.2.3 From b5742ab4937cac4fffbbc4c7439d9a7e27ecd4b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 17 May 2020 15:52:50 +0100 Subject: nvi: mark as broken --- pkgs/applications/editors/nvi/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/nvi/default.nix b/pkgs/applications/editors/nvi/default.nix index e28b2b43061..ed08954f8ba 100644 --- a/pkgs/applications/editors/nvi/default.nix +++ b/pkgs/applications/editors/nvi/default.nix @@ -51,5 +51,6 @@ stdenv.mkDerivation { homepage = "http://www.bostic.com/vi/"; description = "The Berkeley Vi Editor"; license = stdenv.lib.licenses.free; + broken = true; # since 2020-02-08 }; } -- cgit v1.2.3 From 4af94d0f21ae32a874081249bfe9bdc3a3f3d073 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 17 May 2020 10:56:00 -0500 Subject: pythonPackages.pdfminer: 20200402 -> 20200517 --- pkgs/development/python-modules/pdfminer_six/default.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/pdfminer_six/default.nix b/pkgs/development/python-modules/pdfminer_six/default.nix index ace2b618ef2..979b116b713 100644 --- a/pkgs/development/python-modules/pdfminer_six/default.nix +++ b/pkgs/development/python-modules/pdfminer_six/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, pycryptodome, chardet, nose, sortedcontainers, fetchpatch }: +{ stdenv, buildPythonPackage, fetchFromGitHub, isPy3k, pycryptodome, chardet, nose, sortedcontainers }: buildPythonPackage rec { pname = "pdfminer_six"; - version = "20200402"; + version = "20200517"; disabled = !isPy3k; @@ -11,18 +11,9 @@ buildPythonPackage rec { owner = "pdfminer"; repo = "pdfminer.six"; rev = version; - sha256 = "1wl64r3ifpwi7mm5pcxc0ji7w380nxcq3zrv66n95lglm4zqkf26"; + sha256 = "00272pxkh6djm37yvlvgd06w7ycf35srwk6n3p58ppw5hgmpkhc2"; }; - patches = [ - # Add shebang line to scripts. See: https://github.com/pdfminer/pdfminer.six/pull/408 - (fetchpatch { - url = "https://github.com/pdfminer/pdfminer.six/commit/0c2f44b6de064d9a3cea99bde5b8e9c6a525a69c.patch"; - sha256 = "1vml66grnvg4g26mya24kiyxsz809d4mr7wz8qmawjbn4ss65y21"; - excludes = [ "CHANGELOG.md" ]; - }) - ]; - propagatedBuildInputs = [ chardet pycryptodome sortedcontainers ]; checkInputs = [ nose ]; @@ -37,4 +28,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ psyanticy marsam ]; }; } - -- cgit v1.2.3 From 757d3ab21e81e643044de0defff5fc0ae84c1138 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 17 May 2020 10:57:00 -0500 Subject: pdfminer: make available as application --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 729f97d65a1..b5beb4fa289 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5882,6 +5882,8 @@ in fmodex = callPackage ../games/zandronum/fmod.nix { }; + pdfminer = with python3Packages; toPythonApplication pdfminer; + pdfmod = callPackage ../applications/misc/pdfmod { }; pdf-quench = callPackage ../applications/misc/pdf-quench { }; -- cgit v1.2.3 From e958afa0a9a12de3e623a464a922ac7f9455c0d0 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Fri, 10 Apr 2020 19:11:24 -0400 Subject: nixos/zoneminder: fix evaluation with php refactor --- nixos/modules/services/misc/zoneminder.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/misc/zoneminder.nix b/nixos/modules/services/misc/zoneminder.nix index d5b3537068d..d9d34b7fac9 100644 --- a/nixos/modules/services/misc/zoneminder.nix +++ b/nixos/modules/services/misc/zoneminder.nix @@ -63,10 +63,6 @@ let ${cfg.extraConfig} ''; - phpExtensions = with pkgs.phpPackages; [ - { pkg = apcu; name = "apcu"; } - ]; - in { options = { services.zoneminder = with lib; { @@ -289,11 +285,9 @@ in { phpfpm = lib.mkIf useNginx { pools.zoneminder = { inherit user group; + phpPackage = pkgs.php.withExtensions ({ enabled, all }: enabled ++ [ all.apcu ]); phpOptions = '' date.timezone = "${config.time.timeZone}" - - ${lib.concatStringsSep "\n" (map (e: - "extension=${e.pkg}/lib/php/extensions/${e.name}.so") phpExtensions)} ''; settings = lib.mapAttrs (name: lib.mkDefault) { "listen.owner" = user; -- cgit v1.2.3 From 2b5d59cbdc86731f0f4c85a9c21e1498e61e8bd5 Mon Sep 17 00:00:00 2001 From: Puck Meerburg Date: Sun, 17 May 2020 17:30:11 +0000 Subject: linux: Enable fbcon deferred takeover when possible This config value ensures that when booting through e.g. UEFI, the existing framebuffer contents stay put until the first character is printed. As the default NixOS stage-1 immediately outputs a welcome message on init, this does not impact it, but it will allow for a cleaner boot when configured as such. --- pkgs/os-specific/linux/kernel/common-config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 636d174b155..c715c7baf78 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -219,6 +219,7 @@ let FB_3DFX_ACCEL = yes; FB_VESA = yes; FRAMEBUFFER_CONSOLE = yes; + FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER = whenAtLeast "4.19" yes; FRAMEBUFFER_CONSOLE_ROTATION = yes; FB_GEODE = mkIf (stdenv.hostPlatform.system == "i686-linux") yes; }; -- cgit v1.2.3 From 0e2a4780df77327adc2acb69d1468ba938278773 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sun, 17 May 2020 11:05:01 -0400 Subject: oh-my-zsh: 2020-05-11 -> 2020-05-16 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 27add8e1d7c..45acd8bb03a 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2020-05-11"; + version = "2020-05-16"; pname = "oh-my-zsh"; - rev = "fd786291bab7468c7cdd5066ac436218a1fba9e2"; + rev = "cbd6fbe7a7c3ef260f497704092dc43f2e953c3f"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "197478z13m2ian2qfwn0bjz5nhv233w74vw4271a2r0kihbp6pp5"; + sha256 = "1h7q68n9nbmv9rgvzcx5ciisw8gh5p3ka0bz0abhmk00xsinhy09"; }; pathsToLink = [ "/share/oh-my-zsh" ]; -- cgit v1.2.3 From 4f35b7ec5ffe927f71d0d4dc8c5e37c90fa056dd Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Sat, 11 Apr 2020 13:28:52 -0400 Subject: nixos/zoneminder: add minimal test --- nixos/tests/all-tests.nix | 3 ++- nixos/tests/zoneminder.nix | 23 +++++++++++++++++++++++ pkgs/servers/zoneminder/default.nix | 7 +++++-- 3 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 nixos/tests/zoneminder.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 5caf1c958fb..525e97c039e 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -348,6 +348,7 @@ in yabar = handleTest ./yabar.nix {}; yggdrasil = handleTest ./yggdrasil.nix {}; zfs = handleTest ./zfs.nix {}; - zsh-history = handleTest ./zsh-history.nix {}; + zoneminder = handleTest ./zoneminder.nix {}; zookeeper = handleTest ./zookeeper.nix {}; + zsh-history = handleTest ./zsh-history.nix {}; } diff --git a/nixos/tests/zoneminder.nix b/nixos/tests/zoneminder.nix new file mode 100644 index 00000000000..a4e1a05ec0e --- /dev/null +++ b/nixos/tests/zoneminder.nix @@ -0,0 +1,23 @@ +import ./make-test-python.nix ({ lib, ...}: + +{ + name = "zoneminder"; + meta.maintainers = with lib.maintainers; [ danielfullmer ]; + + machine = { ... }: + { + services.zoneminder = { + enable = true; + database.createLocally = true; + database.username = "zoneminder"; + }; + time.timeZone = "America/New_York"; + }; + + testScript = '' + machine.wait_for_unit("zoneminder.service") + machine.wait_for_unit("nginx.service") + machine.wait_for_open_port(8095) + machine.succeed("curl --fail http://localhost:8095/") + ''; +}) diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix index 978893d28ff..8dcbe36850a 100644 --- a/pkgs/servers/zoneminder/default.nix +++ b/pkgs/servers/zoneminder/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchFromGitHub, fetchurl, substituteAll, cmake, makeWrapper, pkgconfig , curl, ffmpeg, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mysql, pcre, perl, perlPackages , polkit, utillinuxMinimal, x264, zlib -, coreutils, procps, psmisc }: +, coreutils, procps, psmisc, nixosTests }: # NOTES: # @@ -172,7 +172,10 @@ in stdenv.mkDerivation rec { "-DZM_WEB_GROUP=${user}" ]; - passthru = { inherit dirName; }; + passthru = { + inherit dirName; + tests = nixosTests.zoneminder; + }; postInstall = '' PERL5LIB="$PERL5LIB''${PERL5LIB:+:}$out/${perl.libPrefix}" -- cgit v1.2.3 From 0f8e972f019a92f3670af5eb7ca3eb3c928330bb Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Sun, 17 May 2020 11:25:04 -0700 Subject: doas: enable timestamp by default and set pamdir * `--with-timestamp` enables the usage of the `persist` setting in `doas.conf`. It is possible some people might not want this, so the flag `withTimestamp` was added to control this. * `--pamdir` copies the PAM files to `$out/etc/pam.d`. This may or may not have a use in the future, but it removes a some errors from the build (when it tries to copy these files to /etc/pam.d). --- pkgs/tools/security/doas/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/security/doas/default.nix b/pkgs/tools/security/doas/default.nix index 58ada1086bc..8cc9017a8fe 100644 --- a/pkgs/tools/security/doas/default.nix +++ b/pkgs/tools/security/doas/default.nix @@ -3,6 +3,8 @@ , fetchFromGitHub , bison , pam + +, withTimestamp ? true }: stdenv.mkDerivation rec { @@ -19,6 +21,11 @@ stdenv.mkDerivation rec { # otherwise confuses ./configure dontDisableStatic = true; + configureFlags = [ + (lib.optionalString withTimestamp "--with-timestamp") # to allow the "persist" setting + "--pamdir=${placeholder "out"}/etc/pam.d" + ]; + postPatch = '' sed -i '/\(chown\|chmod\)/d' bsd.prog.mk ''; -- cgit v1.2.3 From 9456522528a118d9eeb078a77064a4f85ae9b887 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Sat, 21 Mar 2020 00:52:59 -0400 Subject: Refactor Gambit support Refactor the build rule: - Put files in $out/gambit instead of $out. - Make the optimization setting easy to override. - Make use of gccStdenv more explicit at this level. - Support new-style runtime options for forcing UTF-8 I/O. - Override the PACKAGE_VERSION and PACKAGE_STRING with git version. - Note that the license is lgpl21, not lpgl2 (Note: also dual asl20). - Try and fail to meaningfully add missing runtimeDeps. - Build using NIX_BUILD_CORES. --- pkgs/development/compilers/gambit/bootstrap.nix | 22 ++++---- pkgs/development/compilers/gambit/build.nix | 63 +++++++++++++--------- pkgs/development/compilers/gambit/default.nix | 6 +-- .../compilers/gambit/gambit-support.nix | 33 ++++++++++++ pkgs/development/compilers/gambit/unstable.nix | 6 +-- pkgs/top-level/all-packages.nix | 3 +- 6 files changed, 89 insertions(+), 44 deletions(-) create mode 100644 pkgs/development/compilers/gambit/gambit-support.nix diff --git a/pkgs/development/compilers/gambit/bootstrap.nix b/pkgs/development/compilers/gambit/bootstrap.nix index 2fb9e3ce2fc..ec963ab3b8d 100644 --- a/pkgs/development/compilers/gambit/bootstrap.nix +++ b/pkgs/development/compilers/gambit/bootstrap.nix @@ -1,6 +1,10 @@ -{ stdenv, fetchurl, autoconf, gcc, coreutils, ... }: +# This derivation is a reduced-functionality variant of Gambit stable, +# used to compile the full version of Gambit stable *and* unstable. -stdenv.mkDerivation { +{ gccStdenv, lib, fetchurl, autoconf, gcc, coreutils, gambit-support, ... }: +# As explained in build.nix, GCC compiles Gambit 10x faster than Clang, for code 3x better + +gccStdenv.mkDerivation { pname = "gambit-bootstrap"; version = "4.9.3"; @@ -16,29 +20,25 @@ stdenv.mkDerivation { CPP=${gcc}/bin/cpp CXXCPP=${gcc}/bin/cpp LD=${gcc}/bin/ld \ XMKMF=${coreutils}/bin/false unset CFLAGS LDFLAGS LIBS CPPFLAGS CXXFLAGS - ./configure --prefix=$out + ./configure --prefix=$out/gambit ''; buildPhase = '' # Copy the (configured) sources now, not later, so we don't have to filter out # all the intermediate build products. - mkdir -p $out ; cp -rp . $out/ + mkdir -p $out/gambit ; cp -rp . $out/gambit/ # build the gsc-boot* compiler - make bootstrap + make -j$NIX_BUILD_CORES bootstrap ''; installPhase = '' - cp -fa ./ $out/ + cp -fa ./ $out/gambit/ ''; forceShare = [ "info" ]; - meta = { + meta = gambit-support.meta // { description = "Optimizing Scheme to C compiler, bootstrap step"; - homepage = "http://gambitscheme.org"; - license = stdenv.lib.licenses.lgpl2; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin fare ]; }; } diff --git a/pkgs/development/compilers/gambit/build.nix b/pkgs/development/compilers/gambit/build.nix index e17241b6d98..fc71128eb37 100644 --- a/pkgs/development/compilers/gambit/build.nix +++ b/pkgs/development/compilers/gambit/build.nix @@ -1,11 +1,13 @@ -{ stdenv, git, openssl, autoconf, pkgs, makeStaticLibraries, version, gcc, src, coreutils }: +{ gccStdenv, lib, git, openssl, autoconf, pkgs, makeStaticLibraries, gcc, coreutils, gnused, gnugrep, + src, version, git-version, + gambit-support, optimizationSetting ? "-O1", gambit-params ? pkgs.gambit-support.stable-params }: # Note that according to a benchmark run by Marc Feeley on May 2018, # clang is 10x (with default settings) to 15% (with -O2) slower than GCC at compiling # Gambit output, producing code that is 3x slower. IIRC the benchmarks from Gambit@30, # the numbers were still heavily in favor of GCC in October 2019. # Thus we use GCC over clang, even on macOS. - +# # Also note that I (fare) just ran benchmarks from https://github.com/ecraven/r7rs-benchmarks # with Gambit 4.9.3 with -O1 vs -O2 vs -Os on Feb 2020. Which wins depends on the benchmark. # The fight is unclear between -O1 and -O2, where -O1 wins more often, by up to 17%, @@ -13,29 +15,34 @@ # However, -Os seems more consistent in winning slightly against both -O1 and -O2, # and is overall 15% faster than -O2. As for compile times, -O1 is fastest, # -Os is about 29%-33% slower than -O1, while -O2 is about 40%-50% slower than -O1. -# Overall, -Os seems like the best choice, and that's what we now use. +# +# Overall, -Os seems like the best choice, but I care more about compile-time, +# so I stick with -O1 (in the defaults above), which is also the default for Gambit. -stdenv.mkDerivation rec { - pname = "gambit"; - inherit version; - inherit src; +gccStdenv.mkDerivation rec { - bootstrap = import ./bootstrap.nix ( pkgs ); + pname = "gambit"; + inherit src version git-version; + bootstrap = gambit-support.gambit-bootstrap; # TODO: if/when we can get all the library packages we depend on to have static versions, # we could use something like (makeStaticLibraries openssl) to enable creation # of statically linked binaries by gsc. buildInputs = [ git autoconf bootstrap openssl ]; + # TODO: patch gambit's source so it has the full path to sed, grep, fgrep? Is there more? + # Or wrap relevant programs to add a suitable PATH ? + #runtimeDeps = [ gnused gnugrep ]; + configureFlags = [ "--enable-single-host" - "--enable-c-opt=-Os" + "--enable-c-opt=${optimizationSetting}" "--enable-gcc-opts" "--enable-shared" "--enable-absolute-shared-libs" # Yes, NixOS will want an absolute path, and fix it. "--enable-poll" "--enable-openssl" - "--enable-default-runtime-options=f8,-8,t8" # Default to UTF-8 for source and all I/O + "--enable-default-runtime-options=${gambit-params.defaultRuntimeOptions}" # "--enable-debug" # Nope: enables plenty of good stuff, but also the costly console.log # "--enable-multiple-versions" # Nope, NixOS already does version multiplexing # "--enable-guide" @@ -53,11 +60,17 @@ stdenv.mkDerivation rec { ]; configurePhase = '' - export CC=${gcc}/bin/gcc CXX=${gcc}/bin/g++ \ - CPP=${gcc}/bin/cpp CXXCPP=${gcc}/bin/cpp LD=${gcc}/bin/ld \ + export CC=${gcc}/bin/gcc \ + CXX=${gcc}/bin/g++ \ + CPP=${gcc}/bin/cpp \ + CXXCPP=${gcc}/bin/cpp \ + LD=${gcc}/bin/ld \ XMKMF=${coreutils}/bin/false unset CFLAGS LDFLAGS LIBS CPPFLAGS CXXFLAGS - ./configure --prefix=$out ${builtins.concatStringsSep " " configureFlags} + + ${gambit-params.fix-stamp git-version} + + ./configure --prefix=$out/gambit ${builtins.concatStringsSep " " configureFlags} # OS-specific paths are hardcoded in ./configure substituteInPlace config.status \ @@ -69,28 +82,26 @@ stdenv.mkDerivation rec { buildPhase = '' # Make bootstrap compiler, from release bootstrap mkdir -p boot && - cp -rp ${bootstrap}/. boot/. && + cp -rp ${bootstrap}/gambit/. boot/. && chmod -R u+w boot && cd boot && - cp ../gsc/makefile.in ../gsc/*.scm gsc && # */ + cp ../gsc/makefile.in ../gsc/*.scm gsc/ && # */ ./configure && - for i in lib gsi gsc ; do (cd $i ; make ) ; done && + for i in lib gsi gsc ; do (cd $i ; make -j$NIX_BUILD_CORES) ; done && cd .. && cp boot/gsc/gsc gsc-boot && # Now use the bootstrap compiler to build the real thing! - make -j2 from-scratch + make -j$NIX_BUILD_CORES from-scratch + ''; + + postInstall = '' + mkdir $out/bin + cd $out/bin + ln -s ../gambit/bin/* . ''; doCheck = true; - meta = { - description = "Optimizing Scheme to C compiler"; - homepage = "http://gambitscheme.org"; - license = stdenv.lib.licenses.lgpl2; - # NB regarding platforms: only actually tested on Linux, *should* work everywhere, - # but *might* need adaptation e.g. on macOS. - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice raskin fare ]; - }; + meta = gambit-support.meta; } diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix index 303f6a30aad..8f77daa4173 100644 --- a/pkgs/development/compilers/gambit/default.nix +++ b/pkgs/development/compilers/gambit/default.nix @@ -1,10 +1,10 @@ -{ stdenv, callPackage, fetchurl }: +{ callPackage, fetchurl }: -callPackage ./build.nix { +callPackage ./build.nix rec { version = "4.9.3"; + git-version = version; src = fetchurl { url = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.9/source/gambit-v4_9_3.tgz"; sha256 = "1p6172vhcrlpjgia6hsks1w4fl8rdyjf9xjh14wxfkv7dnx8a5hk"; }; - inherit stdenv; } diff --git a/pkgs/development/compilers/gambit/gambit-support.nix b/pkgs/development/compilers/gambit/gambit-support.nix new file mode 100644 index 00000000000..0e78831f2e4 --- /dev/null +++ b/pkgs/development/compilers/gambit/gambit-support.nix @@ -0,0 +1,33 @@ +{ pkgs, lib }: + +rec { + stable-params = { + defaultRuntimeOptions = "f8,-8,t8"; + buildRuntimeOptions = "f8,-8,t8"; + fix-stamp = git-version : ""; + }; + + unstable-params = { + defaultRuntimeOptions = "iL,fL,-L,tL"; + buildRuntimeOptions = "i8,f8,-8,t8"; + fix-stamp = git-version : '' + substituteInPlace configure \ + --replace "$(grep '^PACKAGE_VERSION=.*$' configure)" 'PACKAGE_VERSION="v${git-version}"' \ + --replace "$(grep '^PACKAGE_STRING=.*$' configure)" 'PACKAGE_STRING="Gambit v${git-version}"' ; + ''; + }; + + export-gambopt = params : "export GAMBOPT=${params.buildRuntimeOptions} ;"; + + gambit-bootstrap = import ./bootstrap.nix ( pkgs ); + + meta = { + description = "Optimizing Scheme to C compiler"; + homepage = "http://gambitscheme.org"; + license = lib.licenses.lgpl21; # dual, also asl20 + # NB regarding platforms: continuously tested on Linux, + # tested on macOS once in a while, *should* work everywhere. + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ thoughtpolice raskin fare ]; + }; +} diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix index 4c33c83c67b..7c4434acdc3 100644 --- a/pkgs/development/compilers/gambit/unstable.nix +++ b/pkgs/development/compilers/gambit/unstable.nix @@ -1,13 +1,13 @@ -{ stdenv, callPackage, fetchFromGitHub }: +{ callPackage, fetchFromGitHub, gambit-support }: callPackage ./build.nix { version = "unstable-2020-02-24"; -# git-version = "4.9.3-979-gc69e9f70"; + git-version = "4.9.3-979-gc69e9f70"; src = fetchFromGitHub { owner = "feeley"; repo = "gambit"; rev = "c69e9f70dfdc6545353b135a5d5e2f9234f1e1cc"; sha256 = "1f69n7yzzdv3wpnjlrbck38xpa8115vbady43mc544l39ckklr0k"; }; - inherit stdenv; + gambit-params = gambit-support.unstable-params; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 729f97d65a1..8a26aea2beb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8203,7 +8203,8 @@ in fpc = callPackage ../development/compilers/fpc { }; gambit = callPackage ../development/compilers/gambit { stdenv = gccStdenv; }; - gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { stdenv = gccStdenv; }; + gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { }; + gambit-support = callPackage ../development/compilers/gambit/gambit-support.nix { }; gerbil = callPackage ../development/compilers/gerbil { stdenv = gccStdenv; }; gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { stdenv = gccStdenv; }; -- cgit v1.2.3 From 90835bc666881cfc9d4f632379f58684dea4a590 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Sat, 21 Mar 2020 00:53:33 -0400 Subject: Refactor Gerbil support - Use the new Gambit support. - Move files from $out to $out/gerbil. - Use new Gerbil configuration and installation scripts. - Move some fixups from preBuild to postPatch. - Give up on previous failed attempts at using static libraries. - Add support for compiling libraries written in Gerbil. - Build using NIX_BUILD_CORES. - Register all those things in all-packages. --- pkgs/development/compilers/gerbil/build.nix | 81 +++++++++------------- pkgs/development/compilers/gerbil/default.nix | 42 ++++++++++- .../compilers/gerbil/gerbil-support.nix | 63 +++++++++++++++++ pkgs/development/compilers/gerbil/unstable.nix | 27 ++++++-- pkgs/top-level/all-packages.nix | 8 ++- 5 files changed, 161 insertions(+), 60 deletions(-) create mode 100644 pkgs/development/compilers/gerbil/gerbil-support.nix diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix index 21c2936fa0f..0177e706af1 100644 --- a/pkgs/development/compilers/gerbil/build.nix +++ b/pkgs/development/compilers/gerbil/build.nix @@ -1,34 +1,35 @@ -{ stdenv, makeStaticLibraries, - coreutils, rsync, bash, +{ pkgs, gccStdenv, lib, coreutils, # makeStaticLibraries, openssl, zlib, sqlite, libxml2, libyaml, libmysqlclient, lmdb, leveldb, postgresql, - version, git-version, gambit, src }: + version, git-version, + gambit-support, + gambit ? pkgs.gambit, gambit-params ? pkgs.gambit-support.stable-params, + src, configurePhase, installPhase }: + +# We use Gambit, that works 10x better with GCC than Clang. See ../gambit/build.nix +let stdenv = gccStdenv; in stdenv.mkDerivation rec { pname = "gerbil"; inherit version; inherit src; - # Use makeStaticLibraries to enable creation of statically linked binaries buildInputs_libraries = [ openssl zlib sqlite libxml2 libyaml libmysqlclient lmdb leveldb postgresql ]; - buildInputs_staticLibraries = map makeStaticLibraries buildInputs_libraries; - buildInputs = [ gambit rsync bash ] - ++ buildInputs_libraries ++ buildInputs_staticLibraries; + # TODO: either fix all of Gerbil's dependencies to provide static libraries, + # or give up and delete all tentative support for static libraries. + #buildInputs_staticLibraries = map makeStaticLibraries buildInputs_libraries; + + buildInputs = [ gambit ] + ++ buildInputs_libraries; # ++ buildInputs_staticLibraries; NIX_CFLAGS_COMPILE = "-I${libmysqlclient}/include/mysql -L${libmysqlclient}/lib/mysql"; postPatch = '' - echo '(define (gerbil-version-string) "v${git-version}")' > src/gerbil/runtime/gx-version.scm - - patchShebangs . - + echo '(define (gerbil-version-string) "v${git-version}")' > src/gerbil/runtime/gx-version.scm ; + patchShebangs . ; grep -Fl '#!/usr/bin/env' `find . -type f -executable` | while read f ; do - substituteInPlace "$f" --replace '#!/usr/bin/env' '#!${coreutils}/bin/env' - done - grep -Fl '"gsc"' `find . -type f -name '*.s*'` | while read f ; do - substituteInPlace "$f" --replace '"gsc"' '"${gambit}/bin/gsc"' - done - substituteInPlace "etc/gerbil.el" --replace '"gxc"' "\"$out/bin/gxc\"" + substituteInPlace "$f" --replace '#!/usr/bin/env' '#!${coreutils}/bin/env' ; + done ; ''; ## TODO: make static compilation work. @@ -47,22 +48,20 @@ stdenv.mkDerivation rec { # LEVELDB=${makeStaticLibraries leveldb}/lib/libleveldb.a # EOF + inherit configurePhase installPhase; + buildPhase = '' runHook preBuild - # Enable all optional libraries - substituteInPlace "src/std/build-features.ss" --replace '#f' '#t' - - # Enable autodetection of a default GERBIL_HOME - for i in src/gerbil/boot/gx-init-exe.scm src/gerbil/boot/gx-init.scm ; do - substituteInPlace "$i" --replace '(getenv "GERBIL_HOME" #f)' "(getenv \"GERBIL_HOME\" \"$out\")" - done - for i in src/gerbil/boot/gxi-init.scm src/gerbil/compiler/driver.ss src/gerbil/runtime/gx-gambc.scm src/std/build.ss src/tools/build.ss ; do - substituteInPlace "$i" --replace '(getenv "GERBIL_HOME")' "(getenv \"GERBIL_HOME\" \"$out\")" - done - # gxprof testing uses $HOME/.cache/gerbil/gxc - export HOME=$$PWD + export HOME=$PWD + export GERBIL_BUILD_CORES=$NIX_BUILD_CORES + export GERBIL_GXC=$PWD/bin/gxc + export GERBIL_BASE=$PWD + export GERBIL_HOME=$PWD + export GERBIL_PATH=$PWD/lib + export PATH=$PWD/bin:$PATH + ${gambit-support.export-gambopt gambit-params} # Build, replacing make by build.sh ( cd src && sh build.sh ) @@ -70,33 +69,15 @@ stdenv.mkDerivation rec { runHook postBuild ''; - installPhase = '' - runHook preInstall - mkdir -p $out/ - cp -fa bin lib etc doc $out/ - - cat > $out/bin/gxi < $out/gerbil/bin/gxi < "${version-path}" + fi + patchShebangs . ; + ''; + + postConfigure = '' + export GERBIL_BUILD_CORES=$NIX_BUILD_CORES + export GERBIL_PATH=$PWD/.build + export GERBIL_LOADPATH=${gerbilLoadPath gerbilInputs} + ${pkgs.gambit-support.export-gambopt gambit-params} + ''; + + buildPhase = '' + runHook preBuild + ./build.ss + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/gerbil/lib + cp -fa .build/lib $out/gerbil/ + bins=(.build/bin/*) + if [ 0 -lt ''${#bins} ] ; then + cp -fa .build/bin $out/gerbil/ + mkdir $out/bin + cd $out/bin + ln -s ../gerbil/bin/* . + fi + runHook postInstall + ''; + + dontFixup = true; + }; +} diff --git a/pkgs/development/compilers/gerbil/unstable.nix b/pkgs/development/compilers/gerbil/unstable.nix index eb78eed35ee..d14b4f7d349 100644 --- a/pkgs/development/compilers/gerbil/unstable.nix +++ b/pkgs/development/compilers/gerbil/unstable.nix @@ -1,15 +1,34 @@ -{ stdenv, callPackage, fetchFromGitHub, gambit, gambit-unstable }: +{ callPackage, fetchFromGitHub, gambit-unstable, gambit-support, coreutils, bash }: callPackage ./build.nix { version = "unstable-2020-02-27"; git-version = "0.16-DEV-493-g1ffb74db"; - #gambit = gambit-unstable; - gambit = gambit; src = fetchFromGitHub { owner = "vyzo"; repo = "gerbil"; rev = "1ffb74db5ffd49b4bad751586cef5e619c891d41"; sha256 = "1szmdp8lvy5gpcwn5bpa7x383m6vywl35xa7hz9a5vs1rq4w2097"; }; - inherit stdenv; + inherit gambit-support; + gambit = gambit-unstable; + gambit-params = gambit-support.unstable-params; + configurePhase = '' + (cd src && ./configure \ + --prefix=$out/gerbil \ + --with-gambit=${gambit}/gambit \ + --enable-libxml \ + --enable-libyaml \ + --enable-zlib \ + --enable-sqlite \ + --enable-mysql \ + --enable-lmdb \ + --enable-leveldb) + ''; + installPhase = '' + runHook preInstall + mkdir -p $out/gerbil $out/bin + (cd src; ./install) + (cd $out/bin ; ln -s ../gerbil/bin/* .) + runHook postInstall + ''; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a26aea2beb..05a2f3ec5a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8202,11 +8202,13 @@ in fpc = callPackage ../development/compilers/fpc { }; - gambit = callPackage ../development/compilers/gambit { stdenv = gccStdenv; }; + gambit = callPackage ../development/compilers/gambit { }; gambit-unstable = callPackage ../development/compilers/gambit/unstable.nix { }; gambit-support = callPackage ../development/compilers/gambit/gambit-support.nix { }; - gerbil = callPackage ../development/compilers/gerbil { stdenv = gccStdenv; }; - gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { stdenv = gccStdenv; }; + gerbil = callPackage ../development/compilers/gerbil { }; + gerbil-unstable = callPackage ../development/compilers/gerbil/unstable.nix { }; + gerbil-support = callPackage ../development/compilers/gerbil/gerbil-support.nix { }; + gerbilPackages-unstable = gerbil-support.gerbilPackages-unstable; # NB: don't recurseIntoAttrs for (unstable!) libraries gccFun = callPackage (if stdenv.targetPlatform.isVc4 then ../development/compilers/gcc/6 else ../development/compilers/gcc/9); gcc = if stdenv.targetPlatform.isVc4 then gcc6 else gcc9; -- cgit v1.2.3 From da4aa17343f013c9b5e0873fbc1683e2d8496991 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Thu, 7 May 2020 17:21:17 -0400 Subject: gambit-unstable: 2020-02-24 -> 2020-05-13 --- pkgs/development/compilers/gambit/unstable.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/gambit/unstable.nix b/pkgs/development/compilers/gambit/unstable.nix index 7c4434acdc3..3ac4f536319 100644 --- a/pkgs/development/compilers/gambit/unstable.nix +++ b/pkgs/development/compilers/gambit/unstable.nix @@ -1,13 +1,13 @@ { callPackage, fetchFromGitHub, gambit-support }: callPackage ./build.nix { - version = "unstable-2020-02-24"; - git-version = "4.9.3-979-gc69e9f70"; + version = "unstable-2020-05-15"; + git-version = "4.9.3-1109-g3c4d40de"; src = fetchFromGitHub { owner = "feeley"; repo = "gambit"; - rev = "c69e9f70dfdc6545353b135a5d5e2f9234f1e1cc"; - sha256 = "1f69n7yzzdv3wpnjlrbck38xpa8115vbady43mc544l39ckklr0k"; + rev = "3c4d40de908ae03ca0e3d854edc2234ef401b36c"; + sha256 = "1c9a6rys2kiiqb79gvw29nv3dwwk6hmi1q4jk1whcx7mds7q5dvr"; }; gambit-params = gambit-support.unstable-params; } -- cgit v1.2.3 From 756c8a27d97efc87eaf65402f83495df949bf179 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Thu, 7 May 2020 17:22:24 -0400 Subject: gerbil-unstable: 2020-02-27 -> 2020-05-17 --- pkgs/development/compilers/gerbil/unstable.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/gerbil/unstable.nix b/pkgs/development/compilers/gerbil/unstable.nix index d14b4f7d349..e8bf18a6429 100644 --- a/pkgs/development/compilers/gerbil/unstable.nix +++ b/pkgs/development/compilers/gerbil/unstable.nix @@ -1,13 +1,13 @@ { callPackage, fetchFromGitHub, gambit-unstable, gambit-support, coreutils, bash }: -callPackage ./build.nix { - version = "unstable-2020-02-27"; - git-version = "0.16-DEV-493-g1ffb74db"; +callPackage ./build.nix rec { + version = "unstable-2020-05-17"; + git-version = "0.16-1-g36a31050"; src = fetchFromGitHub { owner = "vyzo"; repo = "gerbil"; - rev = "1ffb74db5ffd49b4bad751586cef5e619c891d41"; - sha256 = "1szmdp8lvy5gpcwn5bpa7x383m6vywl35xa7hz9a5vs1rq4w2097"; + rev = "36a31050f6c80e7e1a49dfae96a57b2ad0260698"; + sha256 = "0k3fypam9qx110sjxgzxa1mdf5b631w16s9p5v37cb8ll26vqfiv"; }; inherit gambit-support; gambit = gambit-unstable; -- cgit v1.2.3 From a311224450cd986ba297364b26848c09b87cdbe3 Mon Sep 17 00:00:00 2001 From: Enno Lohmeier Date: Tue, 28 Apr 2020 16:08:13 +0200 Subject: obs-studio: 25.0.3 -> 25.0.8 --- pkgs/applications/video/obs-studio/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index ceee3d022be..45ebf0beb44 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -38,13 +38,13 @@ let inherit (stdenv.lib) optional optionals; in mkDerivation rec { pname = "obs-studio"; - version = "25.0.3"; + version = "25.0.8"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; rev = version; - sha256 = "11hl3lxvbsm7ackl7qhzgy2x0jsz2dfpi2qxsf8pkp908lrh3b3r"; + sha256 = "0j2k65q3wfyfxhvkl6icz4qy0s3kfqhksizy2i3ah7yml266axbj"; }; nativeBuildInputs = [ addOpenGLRunpath cmake pkgconfig ]; @@ -83,6 +83,7 @@ in mkDerivation rec { postFixup = stdenv.lib.optionalString stdenv.isLinux '' addOpenGLRunpath $out/lib/lib*.so + addOpenGLRunpath $out/lib/obs-plugins/*.so ''; meta = with stdenv.lib; { -- cgit v1.2.3 From f9360e7974e6cb57d99995dbffabaef863c3917d Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Thu, 7 May 2020 17:24:11 -0400 Subject: gerbilPackages.gerbil-utils: init at 2020-05-16 --- .../compilers/gerbil/gerbil-support.nix | 1 + pkgs/development/compilers/gerbil/gerbil-utils.nix | 24 ++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/compilers/gerbil/gerbil-utils.nix diff --git a/pkgs/development/compilers/gerbil/gerbil-support.nix b/pkgs/development/compilers/gerbil/gerbil-support.nix index af83cfa4a60..4e94b6e65de 100644 --- a/pkgs/development/compilers/gerbil/gerbil-support.nix +++ b/pkgs/development/compilers/gerbil/gerbil-support.nix @@ -4,6 +4,7 @@ rec { # Gerbil libraries gerbilPackages-unstable = { + gerbil-utils = callPackage ./gerbil-utils.nix { }; }; # Use this function in any package that uses Gerbil libraries, to define the GERBIL_LOADPATH. diff --git a/pkgs/development/compilers/gerbil/gerbil-utils.nix b/pkgs/development/compilers/gerbil/gerbil-utils.nix new file mode 100644 index 00000000000..075a63d7bf4 --- /dev/null +++ b/pkgs/development/compilers/gerbil/gerbil-utils.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, gerbil-unstable, gerbil-support, gambit-support }: + +gerbil-support.gerbilPackage { + pname = "gerbil-utils"; + version = "unstable-2020-05-17"; + git-version = "33ef720"; + package = "clan"; + gerbil = gerbil-unstable; + gambit-params = gambit-support.unstable-params; + version-path = ""; + src = fetchFromGitHub { + owner = "fare"; + repo = "gerbil-utils"; + rev = "33ef720799ba98dc9eec773c662f070af4bac016"; + sha256 = "0dsb97magbxzjqqfzwq4qwf7i80llv0s1dsy9nkzkvkq8drxlmqf"; + }; + meta = { + description = "Gerbil Clan: Community curated Collection of Common Utilities"; + homepage = "https://github.com/fare/gerbil-utils"; + license = lib.licenses.lgpl21; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ fare ]; + }; +} -- cgit v1.2.3 From 0d0f475f27b0978490a44327bdd558947d62c1e9 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau Date: Sun, 17 May 2020 16:10:03 -0400 Subject: gerbil: 0.15.1 -> 0.16 Now that v0.16 was released at last, make the configurePhase and instalPhase the same again for default and unstable. --- pkgs/development/compilers/gerbil/build.nix | 26 ++++++++++++--- pkgs/development/compilers/gerbil/default.nix | 46 +++----------------------- pkgs/development/compilers/gerbil/unstable.nix | 21 +----------- 3 files changed, 27 insertions(+), 66 deletions(-) diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix index 0177e706af1..8297dafff8e 100644 --- a/pkgs/development/compilers/gerbil/build.nix +++ b/pkgs/development/compilers/gerbil/build.nix @@ -1,9 +1,8 @@ -{ pkgs, gccStdenv, lib, coreutils, # makeStaticLibraries, +{ pkgs, gccStdenv, lib, coreutils, bash, # makeStaticLibraries, openssl, zlib, sqlite, libxml2, libyaml, libmysqlclient, lmdb, leveldb, postgresql, version, git-version, gambit-support, - gambit ? pkgs.gambit, gambit-params ? pkgs.gambit-support.stable-params, - src, configurePhase, installPhase }: + gambit ? pkgs.gambit, gambit-params ? pkgs.gambit-support.stable-params, src }: # We use Gambit, that works 10x better with GCC than Clang. See ../gambit/build.nix let stdenv = gccStdenv; in @@ -48,7 +47,18 @@ stdenv.mkDerivation rec { # LEVELDB=${makeStaticLibraries leveldb}/lib/libleveldb.a # EOF - inherit configurePhase installPhase; + configurePhase = '' + (cd src && ./configure \ + --prefix=$out/gerbil \ + --with-gambit=${gambit}/gambit \ + --enable-libxml \ + --enable-libyaml \ + --enable-zlib \ + --enable-sqlite \ + --enable-mysql \ + --enable-lmdb \ + --enable-leveldb) + ''; buildPhase = '' runHook preBuild @@ -69,6 +79,14 @@ stdenv.mkDerivation rec { runHook postBuild ''; + installPhase = '' + runHook preInstall + mkdir -p $out/gerbil $out/bin + (cd src; ./install) + (cd $out/bin ; ln -s ../gerbil/bin/* .) + runHook postInstall + ''; + dontStrip = true; meta = { diff --git a/pkgs/development/compilers/gerbil/default.nix b/pkgs/development/compilers/gerbil/default.nix index d7b1fe3cf5e..3367ae581b2 100644 --- a/pkgs/development/compilers/gerbil/default.nix +++ b/pkgs/development/compilers/gerbil/default.nix @@ -1,50 +1,12 @@ -{ callPackage, fetchFromGitHub, gambit, bash }: +{ callPackage, fetchFromGitHub }: callPackage ./build.nix rec { - version = "0.15.1"; - git-version = "0.15.1"; + version = "0.16"; + git-version = version; src = fetchFromGitHub { owner = "vyzo"; repo = "gerbil"; rev = "v${version}"; - sha256 = "0qpqms66hz41wwhxb1z0fnzj96ivkm7qi9h9d7lhlr3fsxm1kp1n"; + sha256 = "0vng0kxpnwsg8jbjdpyn4sdww36jz7zfpfbzayg9sdpz6bjxjy0f"; }; - configurePhase = '' - grep -Fl '"gsc"' `find . -type f -name '*.s*'` | while read f ; do - substituteInPlace "$f" --replace '"gsc"' '"${gambit}/bin/gsc"' ; - done ; - for f in etc/gerbil.el src/std/make.ss ; do - substituteInPlace "$f" --replace '"gxc"' "\"$out/bin/gxc\"" ; - done ; - - # Enable all optional libraries - substituteInPlace "src/std/build-features.ss" --replace '#f' '#t' ; - - # Enable autodetection of a default GERBIL_HOME - for i in src/gerbil/boot/gx-init-exe.scm src/gerbil/boot/gx-init.scm ; do - substituteInPlace "$i" --replace '(define default-gerbil-home #f)' "(define default-gerbil-home \"$out/gerbil\")" ; - substituteInPlace "$i" --replace '(getenv "GERBIL_HOME" #f)' "(getenv \"GERBIL_HOME\" \"$out/gerbil\")" ; - done ; - for i in src/gerbil/boot/gxi-init.scm src/gerbil/compiler/driver.ss src/gerbil/runtime/gx-gambc.scm src/std/build.ss src/tools/build.ss ; do - substituteInPlace "$i" --replace '(getenv "GERBIL_HOME")' "(getenv \"GERBIL_HOME\" \"$out/gerbil\")" ; - done - ''; - installPhase = '' - runHook preInstall - mkdir -p $out/gerbil $out/bin - cp -fa bin lib etc doc $out/gerbil - cat > $out/gerbil/bin/gxi < Date: Sun, 17 May 2020 22:35:49 +0200 Subject: skaffold: 1.8.0 -> 1.9.1 --- pkgs/development/tools/skaffold/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index dce42380c50..7c673dea21b 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,9 +2,9 @@ buildGoPackage rec { pname = "skaffold"; - version = "1.8.0"; + version = "1.9.1"; # rev is the ${version} commit, mainly for skaffold version command output - rev = "bd280192092e28067f0f52584c8bcb4f4dc480e4"; + rev = "7bac6a150c9618465f5ad38cc0a5dbc4677c39ba"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; @@ -20,7 +20,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "0s1j1lij56idl981nq7dnvkil1ki283nfhcfqyl5g00payihlm73"; + sha256 = "0l0x89xv5brinafrvbz6hgs5kvmpl4ajcrsjdjh3myf7i0mvh3gm"; }; nativeBuildInputs = [ installShellFiles ]; -- cgit v1.2.3 From cf5dcbf49f8fa97cb5a1f02a9c3ff224ec392228 Mon Sep 17 00:00:00 2001 From: Michael Lingelbach Date: Sun, 17 May 2020 12:43:24 -0700 Subject: Bump cudatoolkit in pycuda derivation, remove boost dependency --- pkgs/development/python-modules/pycuda/default.nix | 6 +++--- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix index a03662aa961..b9a75734b8e 100644 --- a/pkgs/development/python-modules/pycuda/default.nix +++ b/pkgs/development/python-modules/pycuda/default.nix @@ -13,7 +13,6 @@ , python , mkDerivation , stdenv -, isPy3k }: let compyte = import ./compyte.nix { @@ -29,11 +28,12 @@ buildPythonPackage rec { sha256 = "ada56ce98a41f9f95fe18809f38afbae473a5c62d346cfa126a2d5477f24cc8a"; }; - preConfigure = '' + preConfigure = with stdenv.lib.versions; '' ${python.interpreter} configure.py --boost-inc-dir=${boost.dev}/include \ --boost-lib-dir=${boost}/lib \ --no-use-shipped-boost \ - --boost-python-libname=boost_python${stdenv.lib.optionalString isPy3k "3"} + --boost-python-libname=boost_python${major python.version}${minor python.version} \ + --cuda-root=${cudatoolkit} ''; postInstall = '' diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c7c14cc95cf..6c798eddbad 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3268,7 +3268,7 @@ in { pycares = callPackage ../development/python-modules/pycares { }; pycuda = callPackage ../development/python-modules/pycuda { - cudatoolkit = pkgs.cudatoolkit_7_5; + cudatoolkit = pkgs.cudatoolkit; inherit (pkgs.stdenv) mkDerivation; }; -- cgit v1.2.3 From 79083b4b75da0b3ec799e7e699d349fcecea77bb Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 17 May 2020 23:36:01 +0200 Subject: mutt: 1.14.0 -> 1.14.1 (#88027) Signed-off-by: Matthias Beyer --- pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 736d7530be1..e82769ad317 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "1.14.0"; + version = "1.14.1"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "1y7racrhz06k9mwxw5qspfjfyvbj5fmwai3gsfgrm36k7al84bnz"; + sha256 = "09a4hhl9h6y57yfq1gx83fzqxp3wb88y17rl8f54ndpp6p1n9m9m"; }; patches = optional smimeSupport (fetchpatch { -- cgit v1.2.3 From 0dea98463465cf0a3b25894ed3e6a6b6437042b9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 18 May 2020 01:25:33 +0200 Subject: =?UTF-8?q?ansible:=20v2.9.7=20=E2=86=92=20v2.9.9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/python-modules/ansible/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index b9c710e6888..829b4137d51 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "ansible"; - version = "2.9.7"; + version = "2.9.9"; src = fetchFromGitHub { owner = "ansible"; repo = "ansible"; rev = "v${version}"; - sha256 = "0miid7h720i630qljcjdmgdblflhrl2pwqjgiq5wm8jr61c3ld6s"; + sha256 = "06a9iq7w2cm0hsxaw5irsja8w44gffiw09ly27jxklpa8gv57rml"; }; prePatch = '' -- cgit v1.2.3 From c0e6848ad74964ec753fb4f758b0c9e8e246daaa Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 18 May 2020 01:25:58 +0200 Subject: =?UTF-8?q?ansible=5F2=5F8:=20v2.8.11=20=E2=86=92=20v2.8.12?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/admin/ansible/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index d0cb07197cd..adeaa22c360 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -7,11 +7,11 @@ rec { ansible_2_8 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { pname = "ansible"; - version = "2.8.11"; + version = "2.8.12"; src = fetchurl { url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "14f1m4jjkicadaz4d1dm8xhj53kdwksf0znmqzaz1fb0dj5slv0m"; + sha256 = "091id1da3hlnmf0hwvrhv2r0mnyna3mc6s7rwdg5kll7yfiy4k1a"; }; })); -- cgit v1.2.3 From 25233a5db7293c8ca876bfcda3fe35ff119adf2a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 18 May 2020 01:27:40 +0200 Subject: =?UTF-8?q?ansible=5F2=5F7:=20v2.7.17=20=E2=86=92=20v2.7.18?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/admin/ansible/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index adeaa22c360..b3ecaa3479a 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -17,11 +17,11 @@ rec { ansible_2_7 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { pname = "ansible"; - version = "2.7.17"; + version = "2.7.18"; src = fetchurl { url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "1k2cz4w3r3an37305f40vi93wqixapls9y6ggkf75nbs7z27knwz"; + sha256 = "0sgshaaqyjq3i035yi5hivmrrwrq05hxrbjrv1w3hfzmvljn41d1"; }; })); -- cgit v1.2.3 From cabcd8be104f02284f4ff195beb0860e858b85f6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 18 May 2020 01:29:02 +0200 Subject: ansible: default to ansible_2_9 Ansible 2.9 is the latest release and in full support since 2019/11/06. https://access.redhat.com/support/policy/updates/ansible-engine --- pkgs/tools/admin/ansible/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index b3ecaa3479a..23879c22710 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -1,7 +1,7 @@ { python3Packages, fetchurl }: rec { - ansible = ansible_2_8; + ansible = ansible_2_9; ansible_2_9 = python3Packages.toPythonApplication python3Packages.ansible; -- cgit v1.2.3 From 410fdbada38b3f5821621ac91fa5e59032baac4b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 18 May 2020 01:33:21 +0200 Subject: ansible_2_6: drop Went EOL 2019/11/06. https://access.redhat.com/support/policy/updates/ansible-engine --- pkgs/tools/admin/ansible/default.nix | 10 ---------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 11 deletions(-) diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix index 23879c22710..174aef7c4ba 100644 --- a/pkgs/tools/admin/ansible/default.nix +++ b/pkgs/tools/admin/ansible/default.nix @@ -24,14 +24,4 @@ rec { sha256 = "0sgshaaqyjq3i035yi5hivmrrwrq05hxrbjrv1w3hfzmvljn41d1"; }; })); - - ansible_2_6 = python3Packages.toPythonApplication (python3Packages.ansible.overridePythonAttrs (old: rec { - pname = "ansible"; - version = "2.6.20"; - - src = fetchurl { - url = "https://releases.ansible.com/ansible/${pname}-${version}.tar.gz"; - sha256 = "02ra9q2mifyawn0719y78wrbqzik73aymlzwi90fq71jgyfvkkqn"; - }; - })); } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f8b62553d01..51a758783e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9890,7 +9890,6 @@ in inherit (callPackage ../tools/admin/ansible { }) ansible - ansible_2_6 ansible_2_7 ansible_2_8 ansible_2_9; -- cgit v1.2.3 From 9f98f41854c1e8acb9365058cdd7db404cc475e0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 18 May 2020 01:40:20 +0200 Subject: ansible: add myself as maintainer --- pkgs/development/python-modules/ansible/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix index 829b4137d51..07ae08ada78 100644 --- a/pkgs/development/python-modules/ansible/default.nix +++ b/pkgs/development/python-modules/ansible/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { homepage = "http://www.ansible.com"; description = "Radically simple IT automation"; license = [ licenses.gpl3 ] ; - maintainers = with maintainers; [ joamaki costrouc ]; + maintainers = with maintainers; [ joamaki costrouc hexa ]; platforms = platforms.linux ++ platforms.darwin; }; } -- cgit v1.2.3 From 20b0143c113a7324c391d27f384b2defd0c2d585 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 11 May 2020 17:40:40 +0200 Subject: ocamlPackages.async_extra: remove at 112.24.00 This is a legacy version for OCaml 4.02 --- .../ocaml-modules/async_extra/default.nix | 26 ---------------------- .../ocaml-modules/janestreet/async-extra.nix | 17 -------------- pkgs/top-level/ocaml-packages.nix | 9 -------- 3 files changed, 52 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/async_extra/default.nix delete mode 100644 pkgs/development/ocaml-modules/janestreet/async-extra.nix diff --git a/pkgs/development/ocaml-modules/async_extra/default.nix b/pkgs/development/ocaml-modules/async_extra/default.nix deleted file mode 100644 index 53be875f4f3..00000000000 --- a/pkgs/development/ocaml-modules/async_extra/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{stdenv, buildOcaml, fetchurl, async_kernel_p4, async_unix_p4, - bin_prot_p4, core_p4, custom_printf, fieldslib_p4, herelib, pa_ounit, - pipebang, pa_test, sexplib_p4}: - -buildOcaml rec { - name = "async_extra"; - version = "112.24.00"; - - minimumSupportedOcamlVersion = "4.02"; - - src = fetchurl { - url = "https://github.com/janestreet/async_extra/archive/${version}.tar.gz"; - sha256 = "51f6f67a9ad56fe5dcf09faeeca6ec2fea53a7a975a72bc80504b90841212e28"; - }; - - buildInputs = [ pa_test pa_ounit ]; - propagatedBuildInputs = [ async_kernel_p4 async_unix_p4 core_p4 bin_prot_p4 custom_printf - fieldslib_p4 herelib pipebang sexplib_p4 ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/janestreet/async_extra"; - description = "Jane Street Capital's asynchronous execution library (extra)"; - license = licenses.asl20; - maintainers = [ maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/development/ocaml-modules/janestreet/async-extra.nix b/pkgs/development/ocaml-modules/janestreet/async-extra.nix deleted file mode 100644 index 3de02437dd9..00000000000 --- a/pkgs/development/ocaml-modules/janestreet/async-extra.nix +++ /dev/null @@ -1,17 +0,0 @@ -{stdenv, buildOcamlJane, async_kernel, async_unix, - bin_prot, core, ppx_custom_printf, fieldslib, herelib, - pipebang, sexplib, async_rpc_kernel}: - -buildOcamlJane { - name = "async_extra"; - hash = "1xdwab19fycr4cdm3dh9vmx42f8lvf9s4f9pjgdydxfrm7yzyrfh"; - propagatedBuildInputs = [ async_kernel async_unix core bin_prot ppx_custom_printf - fieldslib herelib pipebang sexplib async_rpc_kernel ]; - - meta = with stdenv.lib; { - homepage = "https://github.com/janestreet/async_extra"; - description = "Jane Street Capital's asynchronous execution library (extra)"; - license = licenses.asl20; - maintainers = [ maintainers.maurer maintainers.ericbmerritt ]; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 033e9239d3b..26d2d9fed47 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -36,8 +36,6 @@ let astring = callPackage ../development/ocaml-modules/astring { }; - async_extra_p4 = callPackage ../development/ocaml-modules/async_extra { }; - async_kernel_p4 = callPackage ../development/ocaml-modules/async_kernel { }; async_unix_p4 = callPackage ../development/ocaml-modules/async_unix { }; @@ -1187,13 +1185,6 @@ let then callPackage ../development/ocaml-modules/janestreet/async-unix.nix {} else async_unix_p4; - async_extra = - if lib.versionOlder "4.03" ocaml.version - then janeStreet.async_extra - else if lib.versionOlder "4.02" ocaml.version - then callPackage ../development/ocaml-modules/janestreet/async-extra.nix {} - else async_extra_p4; - # Apps / from all-packages ocamlnat = callPackage ../development/ocaml-modules/ocamlnat { }; -- cgit v1.2.3 From c3b743a6920f9caf9f7a0d165e216b9096097fd6 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Mon, 18 May 2020 10:17:39 +0200 Subject: oraclejdk8: 8u241 -> 8u251 --- pkgs/development/compilers/oraclejdk/jdk8-linux.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix index ed313a9d00e..3c4a2b7850f 100644 --- a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix @@ -1,10 +1,10 @@ import ./jdk-linux-base.nix { productVersion = "8"; - patchVersion = "241"; - sha256.i686-linux = "1niiwifby8zqvsh0ccdf3n21vlqfvvms223dc3kw2c2rksch3yg4"; - sha256.x86_64-linux = "1jz8d6663jspxgw8yxxx5ca6jaa3g67dbbi5d83pdxjmg1kk57a1"; - sha256.armv7l-linux = "1pjzyi1qd4nzfwvh0z5fpwga7j8mksiv5h8wzirv2ccdyy4wqw24"; - sha256.aarch64-linux = "1zliv4a0ygrsdpq36b89yl7jf7kidmxqbnp1sk2661y471x02p9l"; + patchVersion = "251"; + sha256.i686-linux = "0c6d25c09459e435570204f1a22a1cb765ce5d62c5bced92c9a9546b7be337f2"; + sha256.x86_64-linux = "777a8d689e863275a647ae52cb30fd90022a3af268f34fc5b9867ce32f1b374e"; + sha256.armv7l-linux = "f1b0c979e1b61ec52ebd5e1d0b754d7681d8623b09ac90c69718a553ef9b0cd1"; + sha256.aarch64-linux = "58baeaab7da97dd5a6b02ad2dcd77c14b3b6ba014029ee67dbc2bd5f0fa98d1b"; jceName = "jce_policy-8.zip"; sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk"; } -- cgit v1.2.3 From 09472fb9db040cf9b5bd100b6f52c638fabddf68 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Mon, 18 May 2020 12:11:11 +0300 Subject: cpu-x: 3.2.4 -> 4.0.0 --- pkgs/applications/misc/cpu-x/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/cpu-x/default.nix b/pkgs/applications/misc/cpu-x/default.nix index c058e6d5a98..fb81bbdd40c 100644 --- a/pkgs/applications/misc/cpu-x/default.nix +++ b/pkgs/applications/misc/cpu-x/default.nix @@ -1,22 +1,27 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig, gtk3, ncurses, curl -, json_c, libcpuid, pciutils, procps, wrapGAppsHook, nasm }: +{ stdenv, fetchFromGitHub, cmake, pkgconfig, gtk3, ncurses +, libcpuid, pciutils, procps, wrapGAppsHook, nasm, makeWrapper }: stdenv.mkDerivation rec { pname = "cpu-x"; - version = "3.2.4"; + version = "4.0.0"; src = fetchFromGitHub { owner = "X0rg"; repo = "CPU-X"; rev = "v${version}"; - sha256 = "03y49wh9v7x6brmavj5a2clihn0z4f01pypl7m8ymarv4y3a6xkl"; + sha256 = "00xngmlayblvkg3l0rcfpxmnkkdz49ydh4smlhpii23gqii0rds3"; }; - nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook nasm ]; + nativeBuildInputs = [ cmake pkgconfig wrapGAppsHook nasm makeWrapper ]; buildInputs = [ - gtk3 ncurses curl json_c libcpuid pciutils procps + gtk3 ncurses libcpuid pciutils procps ]; + postInstall = '' + wrapProgram $out/bin/cpu-x \ + --prefix PATH : ${stdenv.lib.makeBinPath [ stdenv.cc ]} + ''; + meta = with stdenv.lib; { description = "Free software that gathers information on CPU, motherboard and more"; homepage = src.meta.homepage; -- cgit v1.2.3 From 4e2715934e2c995554c5d70fe4eea12716425480 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 13 May 2020 16:29:34 +0200 Subject: nixos/binfmt: move systemd-binfmt.service to binfmt module Also, remove the dangling systemd.services.systemd-binfmt.wants = [ "proc-sys-fs-binfmt_misc.mount" ]; in systemd.nix. If boot.binfmt.registrations != {}, systemd will install proc-sys-fs-binfmt_misc.automount, which will auto-mount `/proc/sys/fs/binfmt_misc` as soon as systemd-binfmt tries to access it. Fixes https://github.com/NixOS/nixpkgs/issues/87687 Fixes https://github.com/NixOS/nixops/issues/574 --- nixos/modules/system/boot/binfmt.nix | 9 +++++---- nixos/modules/system/boot/systemd.nix | 2 -- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/nixos/modules/system/boot/binfmt.nix b/nixos/modules/system/boot/binfmt.nix index a677ab4cb71..9eeae0c3ef4 100644 --- a/nixos/modules/system/boot/binfmt.nix +++ b/nixos/modules/system/boot/binfmt.nix @@ -268,9 +268,10 @@ in { mkdir -p -m 0755 /run/binfmt ${lib.concatStringsSep "\n" (lib.mapAttrsToList activationSnippet config.boot.binfmt.registrations)} ''; - systemd.additionalUpstreamSystemUnits = lib.mkIf (config.boot.binfmt.registrations != {}) - [ "proc-sys-fs-binfmt_misc.automount" - "proc-sys-fs-binfmt_misc.mount" - ]; + systemd.additionalUpstreamSystemUnits = lib.mkIf (config.boot.binfmt.registrations != {}) [ + "proc-sys-fs-binfmt_misc.automount" + "proc-sys-fs-binfmt_misc.mount" + "systemd-binfmt.service" + ]; }; } diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 7c4dc93e2fb..99892a28115 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -164,7 +164,6 @@ let "systemd-timedated.service" "systemd-localed.service" "systemd-hostnamed.service" - "systemd-binfmt.service" "systemd-exit.service" "systemd-update-done.service" ] ++ optionals config.services.journald.enableHttpGateway [ @@ -1056,7 +1055,6 @@ in systemd.targets.local-fs.unitConfig.X-StopOnReconfiguration = true; systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true; systemd.targets.network-online.wantedBy = [ "multi-user.target" ]; - systemd.services.systemd-binfmt.wants = [ "proc-sys-fs-binfmt_misc.mount" ]; systemd.services.systemd-importd.environment = proxy_env; # Don't bother with certain units in containers. -- cgit v1.2.3 From 431106a17ea6ba67ecdb29d2bfa7572806603ad7 Mon Sep 17 00:00:00 2001 From: datafoo <34766150+datafoo@users.noreply.github.com> Date: Mon, 18 May 2020 11:25:00 +0200 Subject: nixos/zfs: add missing dependendy nettools Fix #87823 --- nixos/modules/tasks/filesystems/zfs.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 43347161a84..71eed4d6f1a 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -433,7 +433,16 @@ in services.zfs.zed.settings = { ZED_EMAIL_PROG = mkDefault "${pkgs.mailutils}/bin/mail"; - PATH = lib.makeBinPath [ packages.zfsUser pkgs.utillinux pkgs.gawk pkgs.gnused pkgs.gnugrep pkgs.coreutils pkgs.curl ]; + PATH = lib.makeBinPath [ + packages.zfsUser + pkgs.coreutils + pkgs.curl + pkgs.gawk + pkgs.gnugrep + pkgs.gnused + pkgs.nettools + pkgs.utillinux + ]; }; environment.etc = genAttrs -- cgit v1.2.3 From fd49155848a8ee8aa2f103fe765ddb9aed1b3d2d Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 18 May 2020 11:16:56 +0200 Subject: nixosTests.systemd-binfmt: init This adds a simple test running GNU Hello cross-compiled for armv7l and aarch64 inside a x86_64 VM with configured binfmt. We already build the cross toolchains in other invocations, and building hello itself is small. --- nixos/tests/all-tests.nix | 1 + nixos/tests/systemd-binfmt.nix | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 nixos/tests/systemd-binfmt.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 525e97c039e..0acded892c7 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -304,6 +304,7 @@ in syncthing-relay = handleTest ./syncthing-relay.nix {}; systemd = handleTest ./systemd.nix {}; systemd-analyze = handleTest ./systemd-analyze.nix {}; + systemd-binfmt = handleTestOn ["x86_64-linux"] ./systemd-binfmt.nix {}; systemd-boot = handleTestOn ["x86_64-linux"] ./systemd-boot.nix {}; systemd-confinement = handleTest ./systemd-confinement.nix {}; systemd-timesyncd = handleTest ./systemd-timesyncd.nix {}; diff --git a/nixos/tests/systemd-binfmt.nix b/nixos/tests/systemd-binfmt.nix new file mode 100644 index 00000000000..2a676f3da98 --- /dev/null +++ b/nixos/tests/systemd-binfmt.nix @@ -0,0 +1,24 @@ +# Teach the kernel how to run armv7l and aarch64-linux binaries, +# and run GNU Hello for these architectures. +import ./make-test-python.nix ({ pkgs, ... }: { + name = "systemd-binfmt"; + machine = { + boot.binfmt.emulatedSystems = [ + "armv7l-linux" + "aarch64-linux" + ]; + }; + + testScript = let + helloArmv7l = pkgs.pkgsCross.armv7l-hf-multiplatform.hello; + helloAarch64 = pkgs.pkgsCross.aarch64-multiplatform.hello; + in '' + machine.start() + assert "world" in machine.succeed( + "${helloArmv7l}/bin/hello" + ) + assert "world" in machine.succeed( + "${helloAarch64}/bin/hello" + ) + ''; +}) -- cgit v1.2.3 From 64decd9de6dfc9316fd69038b21cfbe98b1a8db8 Mon Sep 17 00:00:00 2001 From: Pavel Goran Date: Mon, 18 May 2020 08:01:29 +0000 Subject: gitea: fix wiki template incompatibility with go 1.14 Related to #87115. --- pkgs/applications/version-management/gitea/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 34a3d804707..fda47fb2d96 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -29,6 +29,10 @@ buildGoPackage rec { url = "https://github.com/go-gitea/gitea/commit/1830d0ed5f4a67e3360ecbb55933b5540b6affce.patch"; sha256 = "163531pcki28qfs56l64vv4xxaavxgksf038da1sn21j5l2jm81i"; }) + (fetchpatch { + url = "https://github.com/go-gitea/gitea/commit/e1c00bd6af677b944a102d84314eba8c487648b3.patch"; + sha256 = "1yf48fvky4as72w38lbrk4qpl4af31i2ckr90h3x5wf61yc105wv"; + }) ]; postPatch = '' -- cgit v1.2.3 From 64661c6ea0cc781d6aa01ebbf4aaa10461f5ad5f Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Mon, 18 May 2020 15:01:19 +0300 Subject: lazygit: 0.18 -> 0.20.3 --- pkgs/development/tools/lazygit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index 4b99cfb10e0..d08c9057c0f 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "lazygit"; - version = "0.18"; + version = "0.20.3"; goPackagePath = "github.com/jesseduffield/lazygit"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "1zc6y386w111ygyng5s74zg49iajzs77dbrcdy33igj0hbnkwq2x"; + sha256 = "1p05lfm74g28ci5575vr22q5db50h19fcvc3lzddp0vyiw570isl"; }; meta = with stdenv.lib; { -- cgit v1.2.3 From de77326db57287e2ddd80dccac2b68b548468a68 Mon Sep 17 00:00:00 2001 From: Oleksii Filonenko Date: Mon, 18 May 2020 16:17:37 +0300 Subject: ytop: 0.6.1 -> 0.6.2 (#88064) --- pkgs/tools/system/ytop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/ytop/default.nix b/pkgs/tools/system/ytop/default.nix index 08e227d2454..64c3bf93aaa 100644 --- a/pkgs/tools/system/ytop/default.nix +++ b/pkgs/tools/system/ytop/default.nix @@ -4,18 +4,18 @@ assert stdenv.isDarwin -> IOKit != null; rustPlatform.buildRustPackage rec { pname = "ytop"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "cjbassi"; repo = pname; rev = version; - sha256 = "1p746v9xrfm6avc6v9dvcnpckhvdizzf53pcg9bpcp0lw5sh85da"; + sha256 = "02cpn5257yrmbakx3mlqs97kfambbn9ljb60jbqr1b9w24kd6zgf"; }; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ IOKit ]; - cargoSha256 = "15cpi0b5yqjwi1liry2q17sn9hpc4xf9gn33ri3rs6ls5qs7j7pa"; + cargoSha256 = "0alqzy9gbj9m4l7xj1jsrnl09pv6z7c73gq787cqwn0gj93aaj19"; meta = with stdenv.lib; { description = "A TUI system monitor written in Rust"; -- cgit v1.2.3 From 311e883b23ce854862f2edd07891993c63eadbbd Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 14 May 2020 16:39:00 +0200 Subject: ocamlPackages.dune-private-libs: disable for OCaml < 4.07 --- pkgs/development/ocaml-modules/dune-private-libs/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/ocaml-modules/dune-private-libs/default.nix b/pkgs/development/ocaml-modules/dune-private-libs/default.nix index 14059070c9a..6161bd1fe8e 100644 --- a/pkgs/development/ocaml-modules/dune-private-libs/default.nix +++ b/pkgs/development/ocaml-modules/dune-private-libs/default.nix @@ -7,6 +7,8 @@ buildDunePackage rec { inherit (dune_2) src version; + minimumOCamlVersion = "4.07"; + dontAddPrefix = true; meta = with lib; { -- cgit v1.2.3 From f31adf28b7ac2cc31081ddbd566f94932740564e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 14 May 2020 16:39:04 +0200 Subject: ocamlPackages.dune_2: use pkgs.dune_2 for OCaml < 4.07 --- pkgs/top-level/ocaml-packages.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 26d2d9fed47..eafd4521707 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -217,7 +217,12 @@ let dune = callPackage ../development/tools/ocaml/dune { }; - dune_2 = callPackage ../development/tools/ocaml/dune/2.nix { }; + dune_2 = + if lib.versionAtLeast ocaml.version "4.07" + then callPackage ../development/tools/ocaml/dune/2.nix { } + else if lib.versionAtLeast ocaml.version "4.02" + then pkgs.dune_2 + else throw "dune_2 is not available for OCaml ${ocaml.version}"; dune-build-info = callPackage ../development/ocaml-modules/dune-build-info { }; -- cgit v1.2.3 From 4a873aa29ebd44601b86849d39648991939c32e2 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 12 May 2020 21:14:39 +0200 Subject: ocamlPackages.ppxlib: minor refactoring --- pkgs/development/ocaml-modules/ppxlib/default.nix | 29 ++++++++++++++--------- pkgs/top-level/ocaml-packages.nix | 18 +++++++------- 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix index bbaf9e27cf4..8821e562129 100644 --- a/pkgs/development/ocaml-modules/ppxlib/default.nix +++ b/pkgs/development/ocaml-modules/ppxlib/default.nix @@ -1,23 +1,30 @@ -{ stdenv, fetchFromGitHub, buildDunePackage -, version ? "0.8.1" +{ lib, fetchFromGitHub, buildDunePackage, ocaml +, legacy ? false , ocaml-compiler-libs, ocaml-migrate-parsetree, ppx_derivers, stdio }: -let sha256 = - { "0.8.1" = "0vm0jajmg8135scbg0x60ivyy5gzv4abwnl7zls2mrw23ac6kml6"; - "0.12.0" = "1cg0is23c05k1rc94zcdz452p9zn11dpqxm1pnifwx5iygz3w0a1"; - }."${version}" -; in +let param = + if legacy then { + version = "0.8.1"; + sha256 = "0vm0jajmg8135scbg0x60ivyy5gzv4abwnl7zls2mrw23ac6kml6"; + } else { + version = "0.12.0"; + sha256 = "1cg0is23c05k1rc94zcdz452p9zn11dpqxm1pnifwx5iygz3w0a1"; + }; in + +if lib.versionAtLeast ocaml.version "4.10" && legacy +then throw "ppxlib-${param.version} is not available for OCaml ${ocaml.version}" +else buildDunePackage rec { pname = "ppxlib"; - inherit version; + inherit (param) version; src = fetchFromGitHub { owner = "ocaml-ppx"; repo = pname; rev = version; - inherit sha256; + inherit (param) sha256; }; propagatedBuildInputs = [ @@ -26,8 +33,8 @@ buildDunePackage rec { meta = { description = "Comprehensive ppx tool set"; - license = stdenv.lib.licenses.mit; - maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; inherit (src.meta) homepage; }; } diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index eafd4521707..2ab0e100ada 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -413,9 +413,7 @@ let js_of_ocaml-ppx = callPackage ../development/tools/ocaml/js_of_ocaml/ppx.nix {}; - js_of_ocaml-ppx_deriving_json = callPackage ../development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix { - ppxlib = ppxlib.override { version = "0.12.0"; }; - }; + js_of_ocaml-ppx_deriving_json = callPackage ../development/tools/ocaml/js_of_ocaml/ppx_deriving_json.nix { }; js_of_ocaml-tyxml = callPackage ../development/tools/ocaml/js_of_ocaml/tyxml.nix {}; @@ -815,7 +813,9 @@ let ppx_deriving_protobuf = callPackage ../development/ocaml-modules/ppx_deriving_protobuf {}; - ppx_deriving_rpc = callPackage ../development/ocaml-modules/ppx_deriving_rpc {}; + ppx_deriving_rpc = callPackage ../development/ocaml-modules/ppx_deriving_rpc { + ppxlib = ppxlib.override { legacy = true; }; + }; ppx_deriving_yojson = callPackage ../development/ocaml-modules/ppx_deriving_yojson {}; @@ -824,7 +824,6 @@ let ppx_import = callPackage ../development/ocaml-modules/ppx_import {}; ppx_irmin = callPackage ../development/ocaml-modules/irmin/ppx.nix { - ppxlib = ppxlib.override { version = "0.12.0"; }; }; ppx_sqlexpr = callPackage ../development/ocaml-modules/sqlexpr/ppx.nix {}; @@ -965,20 +964,21 @@ let janeStreet = if lib.versionOlder "4.08" ocaml.version then import ../development/ocaml-modules/janestreet/0.13.nix { - inherit ctypes janePackage num octavius re; + inherit ctypes janePackage num octavius ppxlib re; inherit (pkgs) openssl; - ppxlib = ppxlib.override { version = "0.12.0"; }; } else if lib.versionOlder "4.07" ocaml.version then import ../development/ocaml-modules/janestreet/0.12.nix { - inherit ctypes janePackage num octavius ppxlib re; + inherit ctypes janePackage num octavius re; inherit (pkgs) openssl; + ppxlib = ppxlib.override { legacy = true; }; } else import ../development/ocaml-modules/janestreet { inherit janePackage ocamlbuild angstrom ctypes cryptokit; inherit magic-mime num ocaml-migrate-parsetree octavius ounit; - inherit ppx_deriving re ppxlib; + inherit ppx_deriving re; inherit (pkgs) openssl; + ppxlib = ppxlib.override { legacy = true; }; }; janeStreet_0_9_0 = import ../development/ocaml-modules/janestreet/old.nix { -- cgit v1.2.3 From 962f93c46b1eaaedbc118c06adfd439ce341a0db Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 11 May 2020 21:13:50 +0200 Subject: ocamlPackages.labltk: init at 8.06.8 for OCaml 4.10 --- pkgs/development/ocaml-modules/labltk/default.nix | 26 ++++++++++++++++------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/pkgs/development/ocaml-modules/labltk/default.nix b/pkgs/development/ocaml-modules/labltk/default.nix index 0677202fab9..e7b68b90713 100644 --- a/pkgs/development/ocaml-modules/labltk/default.nix +++ b/pkgs/development/ocaml-modules/labltk/default.nix @@ -7,13 +7,13 @@ then throw "labltk is not available for OCaml ${ocaml.version}" else let param = -if OCamlVersionAtLeast "4.08" then rec { - version = "8.06.7"; - src = fetchzip { - url = "https://github.com/garrigue/labltk/archive/${version}.tar.gz"; - sha256 = "1cqnxjv2dvw9csiz4iqqyx6rck04jgylpglk8f69kgybf7k7xk2h"; - }; -} else + let mkNewParam = { version, sha256 }: { + inherit version; + src = fetchzip { + url = "https://github.com/garrigue/labltk/archive/${version}.tar.gz"; + inherit sha256; + }; + }; in let mkOldParam = { version, key, sha256 }: { src = fetchurl { url = "https://forge.ocamlcore.org/frs/download.php/${key}/labltk-${version}.tar.gz"; @@ -21,7 +21,7 @@ if OCamlVersionAtLeast "4.08" then rec { }; inherit version; }; in - { + rec { "4.04" = mkOldParam { version = "8.06.2"; key = "1628"; @@ -42,6 +42,16 @@ if OCamlVersionAtLeast "4.08" then rec { key = "1764"; sha256 = "0wgx65y1wkgf22ihpqmspqfp95fqbj3pldhp1p3b1mi8rmc37zwj"; }; + _8_06_7 = mkNewParam { + version = "8.06.7"; + sha256 = "1cqnxjv2dvw9csiz4iqqyx6rck04jgylpglk8f69kgybf7k7xk2h"; + }; + "4.08" = _8_06_7; + "4.09" = _8_06_7; + "4.10" = mkNewParam { + version = "8.06.8"; + sha256 = "0lfjc7lscq81ibqb3fcybdzs2r1i2xl7rsgi7linq46a0pcpkinw"; + }; }.${builtins.substring 0 4 ocaml.version}; in -- cgit v1.2.3 From cd2a208bdbc8ccbb76b9d377910f44b6c8bd1bae Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Mon, 18 May 2020 20:00:43 +0200 Subject: nextcloud17: 17.0.4 -> 17.0.6 Changes: https://nextcloud.com/changelog/#latest17 Fixes: https://nvd.nist.gov/vuln/detail/CVE-2020-8154 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 3c82c1996ef..561dcbe25ae 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -28,8 +28,8 @@ let }; in { nextcloud17 = generic { - version = "17.0.4"; - sha256 = "0cj5mng0nmj3hz30pyz3g19kj3mkm5ca8si3sw3arv61dmw6c5g6"; + version = "17.0.6"; + sha256 = "0qq7lkgzsn1zakfym5bjqzpcisxmgfcdd927ddqlhddy3zvgxrxx"; }; nextcloud18 = generic { -- cgit v1.2.3 From ec1f8e266cb0094993792d0f770cc5929743b7ce Mon Sep 17 00:00:00 2001 From: Casey Ransom Date: Mon, 18 May 2020 14:02:35 -0400 Subject: redis-dump: add redis-load There's a companion script that will restore the dumped json. --- pkgs/development/tools/redis-dump/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/redis-dump/default.nix b/pkgs/development/tools/redis-dump/default.nix index 2c93ef47d69..2d4acd724d3 100644 --- a/pkgs/development/tools/redis-dump/default.nix +++ b/pkgs/development/tools/redis-dump/default.nix @@ -3,7 +3,7 @@ bundlerApp { pname = "redis-dump"; gemdir = ./.; - exes = [ "redis-dump" ]; + exes = [ "redis-dump" "redis-load" ]; passthru.updateScript = bundlerUpdateScript "redis-dump"; -- cgit v1.2.3 From ed301e7158e4713b247cdea65480866cd0df09ba Mon Sep 17 00:00:00 2001 From: Martin Milata Date: Mon, 18 May 2020 20:06:01 +0200 Subject: nextcloud18: 18.0.3 -> 18.0.4 Changes: https://nextcloud.com/changelog/#latest18 --- pkgs/servers/nextcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix index 561dcbe25ae..9a7cc077508 100644 --- a/pkgs/servers/nextcloud/default.nix +++ b/pkgs/servers/nextcloud/default.nix @@ -33,7 +33,7 @@ in { }; nextcloud18 = generic { - version = "18.0.3"; - sha256 = "0wpxa35zj81i541j3cjq6klsjwwc5slryzvjjl7zjc32004yfrvv"; + version = "18.0.4"; + sha256 = "0aa3f4xbkzacfw0h9aic0ywk5mqlwka83qaszizj8lmk68kf3n7s"; }; } -- cgit v1.2.3 From 09efe9dc0e8a06229e2727fa7ad64b91bd87a6bf Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Mon, 18 May 2020 22:59:48 +0200 Subject: fira-code: 3.1 -> 4 --- pkgs/data/fonts/fira-code/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/fira-code/default.nix b/pkgs/data/fonts/fira-code/default.nix index 37169d1548e..2048bc797c9 100644 --- a/pkgs/data/fonts/fira-code/default.nix +++ b/pkgs/data/fonts/fira-code/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchzip }: let - version = "3.1"; + version = "4"; in fetchzip { name = "fira-code-${version}"; - url = "https://github.com/tonsky/FiraCode/releases/download/${version}/FiraCode_${version}.zip"; + url = "https://github.com/tonsky/FiraCode/releases/download/${version}/Fira_Code_v${version}.zip"; postFetch = '' mkdir -p $out/share/fonts @@ -13,7 +13,7 @@ in fetchzip { unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype ''; - sha256 = "1rk5hiix282b1gsxq9kqma2q9fnydj0xl9vbrd88rf7ywvn75817"; + sha256 = "0n9qkng31ydvpdjc1an4ylpfy4x883c6czhyzvhjsmavd7bv4j9a"; meta = with stdenv.lib; { homepage = "https://github.com/tonsky/FiraCode"; -- cgit v1.2.3 From a5cbd4fa354b3f6d7bf07a031baedbbb3712ef4a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 19 May 2020 08:37:15 +1000 Subject: fwupdate: remove https://github.com/rhboot/fwupdate This project is no longer supported. All code has been merged directly into the fwupd project. Please switch to that. --- .../linux/firmware/fwupdate/default.nix | 66 ---------------------- .../fwupdate/do-not-create-sharedstatedir.patch | 10 ---- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 +- 4 files changed, 2 insertions(+), 79 deletions(-) delete mode 100644 pkgs/os-specific/linux/firmware/fwupdate/default.nix delete mode 100644 pkgs/os-specific/linux/firmware/fwupdate/do-not-create-sharedstatedir.patch diff --git a/pkgs/os-specific/linux/firmware/fwupdate/default.nix b/pkgs/os-specific/linux/firmware/fwupdate/default.nix deleted file mode 100644 index bcafa7f3376..00000000000 --- a/pkgs/os-specific/linux/firmware/fwupdate/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ efivar, fetchurl, gettext, gnu-efi, libsmbios, pkgconfig, popt, stdenv }: - -let - version = "12"; - - arch = - if stdenv.hostPlatform.isx86_32 - then "ia32" - else stdenv.hostPlatform.parsed.cpu.name; - -in stdenv.mkDerivation { - pname = "fwupdate"; - inherit version; - src = fetchurl { - url = "https://github.com/rhinstaller/fwupdate/releases/download/${version}/fwupdate-${version}.tar.bz2"; - sha256 = "00w7jsg7wrlq4cpfz26m9rbv2jwyf0sansf343vfq02fy5lxars1"; - }; - - patches = [ - ./do-not-create-sharedstatedir.patch - ]; - - NIX_CFLAGS_COMPILE = builtins.toString [ - "-I${gnu-efi}/include/efi" - "-I${gnu-efi}/include/efi/${arch}" - "-Wno-error=address-of-packed-member" - ]; - - # TODO: Just apply the disable to the efi subdir - hardeningDisable = [ "stackprotector" ]; - - makeFlags = [ - "EFIDIR=nixos" - "prefix=$(out)" - "LIBDIR=$(out)/lib" - "GNUEFIDIR=${gnu-efi}/lib" - "ESPMOUNTPOINT=$(out)/boot" - ]; - - nativeBuildInputs = [ - pkgconfig - gettext - ]; - - buildInputs = [ - gnu-efi - libsmbios - popt - ]; - - propagatedBuildInputs = [ - efivar - ]; - - postInstall = '' - rm -rf $out/src - rm -rf $out/lib/debug - ''; - - meta = with stdenv.lib; { - description = "Tools for using the ESRT and UpdateCapsule() to apply firmware updates"; - maintainers = with maintainers; [ ]; - license = licenses.gpl2; - platforms = platforms.linux; - }; -} diff --git a/pkgs/os-specific/linux/firmware/fwupdate/do-not-create-sharedstatedir.patch b/pkgs/os-specific/linux/firmware/fwupdate/do-not-create-sharedstatedir.patch deleted file mode 100644 index b8588ef2b11..00000000000 --- a/pkgs/os-specific/linux/firmware/fwupdate/do-not-create-sharedstatedir.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/linux/Makefile -+++ b/linux/Makefile -@@ -131,7 +131,6 @@ - ln -fs $(x) $(patsubst %.so.1.$(VERSION),%.so.1,$(DESTDIR)$(libdir)/$(x)) ;\ - ln -fs $(x) $(patsubst %.so.1.$(VERSION),%.so,$(DESTDIR)$(libdir)/$(x)) ;\ - ) -- $(INSTALL) -d -m 755 $(DESTDIR)$(sharedstatedir)/fwupdate/ - $(INSTALL) -d -m 755 $(DESTDIR)$(libexecdir)/fwupdate/ - $(INSTALL) -m 755 cleanup $(DESTDIR)$(libexecdir)/fwupdate/cleanup - $(INSTALL) -d -m 755 $(DESTDIR)$(libdatadir)/systemd/system diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 7bba5fb630b..1ef754ccba0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -149,6 +149,7 @@ mapAliases ({ fuse_exfat = exfat; # 2015-09-11 fuseki = apache-jena-fuseki; # added 2018-04-25 fusesmb = throw "fusesmb is abandoned by upstream"; # added 2019-10-15 + fwupdate = throw "fwupdate was merged into fwupd"; # added 2020-05-19 gccApple = throw "gccApple is no longer supported"; # added 2018-04-25 gdb-multitarget = gdb; # added 2017-11-13 gdk_pixbuf = gdk-pixbuf; # added 2019-05-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f95c26e5212..4a2e3a2cf4c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1863,7 +1863,7 @@ in gixy = callPackage ../tools/admin/gixy { }; glpaper = callPackage ../development/tools/glpaper { }; - + gllvm = callPackage ../development/tools/gllvm { }; glide = callPackage ../development/tools/glide { }; @@ -16523,8 +16523,6 @@ in fwupd = callPackage ../os-specific/linux/firmware/fwupd { }; - fwupdate = callPackage ../os-specific/linux/firmware/fwupdate { }; - fwts = callPackage ../os-specific/linux/fwts { }; libossp_uuid = callPackage ../development/libraries/libossp-uuid { }; -- cgit v1.2.3